diff --git a/upload/admin/api/api_core.php b/upload/admin/api/api_core.php
index 6857d239..b20b7a9e 100644
--- a/upload/admin/api/api_core.php
+++ b/upload/admin/api/api_core.php
@@ -1,83 +1,98 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * API: Core
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @file		api_core.php 	Core functions for the API classes
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-03-18 17:34:15 -0400 (Fri, 18 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8129 $
  */
 
+/**
+ *
+ * @class		apiCore
+ * @brief		Core functions for the API classes
+ */
 class apiCore
 {
 	/**
 	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
 	 */
+	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
-	protected $cache;	
-	protected $registry;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
 	
 	/**
-	 * API Error string
+	 * Array of the API errors
 	 *
-	 * @var array Errors
+	 * @var		$api_error
 	 */
 	public $api_error = array();
 
 	/**
-	 * API Path to IPB root (where init.php/index.php is)
+	 * API Path to IPB root (where initdata.php/index.php is)
 	 *
-	 * @var string Path to IPB root folder
+	 * @var 	$path_to_ipb
 	 */
 	public $path_to_ipb = '';
 
 	/**
-	 * Loads the API Classes
+	 * Loads the registry class
 	 *
-	 * @return void
+	 * @return @e void
 	 */
 	public function init()
 	{
+		/* Path not set? */
 		if( !$this->path_to_ipb )
 		{
+			/* Constant available? */
 			if( defined('DOC_IPS_ROOT_PATH') )
 			{
 				$this->path_to_ipb	= DOC_IPS_ROOT_PATH;
 			}
 			else
 			{
+				/* Fallback.. */
 				$this->path_to_ipb = dirname(__FILE__) . '/../../';
 			}
 		}
 		
 		/* Load the registry */
-		require_once( $this->path_to_ipb . 'initdata.php' );
-		require_once( $this->path_to_ipb . CP_DIRECTORY . '/sources/base/ipsRegistry.php' );
+		require_once( $this->path_to_ipb . 'initdata.php' );/*noLibHook*/
+		require_once( $this->path_to_ipb . CP_DIRECTORY . '/sources/base/ipsRegistry.php' );/*noLibHook*/
 		
 		$this->registry = ipsRegistry::instance();
 		$this->registry->init();
 		
-		/* Make Shortcuts */
-		$this->DB       = $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang     = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
+		/* Make registry shortcuts */
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
 		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache    = $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
 		
 		/* INIT Child? */
 		if( method_exists( $this, 'childInit' ) )
diff --git a/upload/admin/api/blog/api_blog.php b/upload/admin/api/blog/api_blog.php
deleted file mode 100644
index 92f6d7e0..00000000
--- a/upload/admin/api/blog/api_blog.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Blog API file
- * Last Updated: $Date: 2010-10-22 14:06:33 -0400 (Fri, 22 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7018 $
- * @since		2.2.0
- *
- */
-
-if ( ! class_exists( 'apiCore' ) )
-{
-	require_once( IPS_ROOT_PATH . 'api/api_core.php' );
-}
-
-/**
- * apiBlog class
- * @package	IP.Blog
- */
-class apiBlog extends apiCore
-{
-	/**
-	 * Constructor.  Calls parent init() method
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function __construct()
-	{
-		$this->init();
-		
-		if( ! ipsRegistry::isClassLoaded( 'blogFunctions' ) )
-		{
-			/* Load the Blog functions library */
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'blog' ) . '/sources/classes/blogFunctions.php', 'blogFunctions', 'blog' );
-			$this->registry->setClass( 'blogFunctions', new $classToLoad( $this->registry ) );
-		}
-	}
-	
-	/**
-	* Retrieve the Blog ID of a member
-	* THIS IS DEPRECATED - use fetchBlogIds
-	*
-	* @param	int		Member ID
-	* @return 	int		Blog ID ( 0 if no Blog found )
-	*/
-	public function getBlogID( $member_id=0 )
-	{
-		$member_id = intval( $member_id );
-
-		//-----------------------------------------
-		// We entered here on member id, find blog_id and redirect them to here
-		//-----------------------------------------
-		$blog = $this->DB->buildAndFetch( array( 
-												'select'	=> 'blog_id, blog_name',
-												'from'		=> 'blog_blogs',
-												'where'		=> "member_id={$member_id}" 
-										)	);
-		if( ! $blog['blog_id'] or ! $blog['blog_name'] )
-		{
-			return 0;
-   		}
-		else
-		{
-			return $blog['blog_id'];
-		}
-	}
-	
-	/**
-	 * Retrieve blog IDs this member can author in
-	 *
-	 * @access	public
-	 * @param	int		Member ID
-	 * @return	array	array of ids with basic information, like: array( blog_id => array( 'blog_name', 'blog_seo_name' )
-	 */
-	public function fetchBlogIds( $member_id=0 )
-	{
-		$return    = array();
-		$member_id = intval( $member_id );
-		$data      = $this->registry->getClass('blogFunctions')->fetchMyBlogs( IPSMember::load( $member_id ) );
-		
-		if ( is_array( $data ) AND count( $data ) )
-		{
-			foreach( $data as $id => $blog )
-			{
-				if ( $blog['_canPostIn'] )
-				{
-					$return[ $id ] = $blog;
-				}
-			}
-		}
-		
-		return $return;
-	}
-	
-	/**
-	* Retrieve the Blog ID of a member
-	*
-	* @param	int		Blog ID
-	* @return 	string	Blog URL
-	*/
-	public function getBlogUrl( $blog_id=0 )
-	{
-		$blog_id = intval( $blog_id );
-
-		//-----------------------------------------
-		// We entered here on member id, find blog_id and redirect them to here
-		//-----------------------------------------
-		$blog = $this->DB->buildAndFetch( array ( 
-												'select'	=> 'blog_id, blog_name, blog_seo_name',
-												'from'		=> 'blog_blogs',
-												'where'		=> "blog_id={$blog_id}" 
-										)	);
-		if( ! $blog['blog_id'] or ! $blog['blog_name'] )
-		{
-			return '';
-   		}
-		else
-		{
-			return $this->registry->output->buildSEOUrl( 'app=blog&amp;blogid=' . $blog_id, 'public', $blog['blog_seo_name'], 'showblog' );
-		}
-	}
-
-	/**
-	* Retrieve the last x entries of a Blog
-	* Only public publishes entries are returned
-	*
-	* @param	string	Either 'member' or 'blog'
-	* @param	int		Blog ID or Member ID
-	* @param	int		Number of entries (to return)
-	* @return 	array	Array of last X entries
-	*/
-	public function lastXEntries( $type, $id, $number_of_entries=10 )
-	{
-		/* INIT */
-		$id           = intval( $id );
-		$return_array = array();
-		$where		  = array();
-		
-        /* Build permissions */
-		$modData = $this->registry->blogFunctions->buildPerms();
-
-		/* Got permission to view blog entries? */
-		if ( $this->memberData['g_blog_settings']['g_blog_allowview'] )
-		{						
-			$this->DB->build( array( 'select'	=> "e.*, b.*",
-							         'from'		=> array('blog_entries' => 'e'),
-							         'where'    => ( $type == 'member' ? "b.member_id={$id}" : "b.blog_id={$id}" ) . " AND b.blog_type='local' AND e.entry_status='published'",
-									 'order'	=> 'e.entry_date DESC',
-									 'limit'	=> array( 0, intval( $number_of_entries ) ),
-						             'add_join' => array( array( 'select' => 'b.blog_name, b.blog_seo_name',
-																'from'   => array( 'blog_blogs' => 'b' ),
-																'where'  => "e.blog_id=b.blog_id",
-																'type'   => 'left' ) ) ) );
-										 
-			$outer = $this->DB->execute();
-			
-			while( $entry = $this->DB->fetch($outer) )
-			{
-				if ( !$this->memberData['member_id'] or !$modData['_blogmod']['moderate_can_view_private'] )
-				{
-					switch ( $entry['blog_view_level'] )
-					{
-						case 'public':
-							if ( !$this->memberData['member_id'] and !$entry['blog_allowguests'] )
-							{
-								continue 2;
-							}
-							break;
-							
-						case 'private':
-							if ( !$this->memberData['member_id'] or $this->memberData['member_id'] != $entry['member_id'] )
-							{
-								continue 2;
-							}
-							break;
-							
-						case 'privateclub':
-							if ( !$this->memberData['member_id'] or !in_array( $this->memberData['member_id'], explode( ',', $entry['blog_authorized_users'] ) ) )
-							{
-								continue 2;
-							}
-							break;
-					}
-				}
-			
-				$entry['blog_url']  = $this->registry->blogFunctions->getBlogUrl( $entry['blog_id'] );
-				$entry['entry_url'] = $entry['blog_url'] . 'showentry='.$entry['entry_id'];
-				
-				$return_array[] = $entry;
-			}
-			return $return_array;
-	  	}
-		else
-		{
-			return array();
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/admin/api/forums/api_topic_view.php b/upload/admin/api/forums/api_topic_view.php
index 9fdda218..27bc7bef 100644
--- a/upload/admin/api/forums/api_topic_view.php
+++ b/upload/admin/api/forums/api_topic_view.php
@@ -1,82 +1,67 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Forums topic view API file
- * Last Updated: $Date: 2010-10-25 11:20:47 -0400 (Mon, 25 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7036 $
+ * @file		api_topic_view.php 	Forums topic view API
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		2.2.0
- *
+ * $LastChangedDate: 2011-03-18 17:34:15 -0400 (Fri, 18 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8129 $
  */
 
 if ( ! class_exists( 'apiCore' ) )
 {
-	require_once( IPS_ROOT_PATH . 'api/api_core.php' );
+	require_once( IPS_ROOT_PATH . 'api/api_core.php' );/*noLibHook*/
 }
 
 /**
- * apiTopicView class
- * @package	IP.Board
- * @subpackage	Forums
+ *
+ * @class		apiTopicView
+ * @brief		Forums topic view API
  */
 class apiTopicView extends apiCore
 {
 	/**
-	 * Topic list config
+	 * Configuration array for the topic list
 	 *
-	 * @access	public
-	 * @var		array
+	 * @var		$topic_list_config
 	 */
-	public $topic_list_config = array( 'offset'			=> 0,
+	public $topic_list_config = array(  'offset'		=> 0,
 										'limit'			=> 5,
 										'forums'		=> '*',
 										'order_field'	=> 'last_post',
-										'order_by'		=> 'DESC' );
-
+										'order_by'		=> 'DESC'
+									  );
+	
 	/**
-	 * Attachment pids
+	 * Array of post IDs with attachments
 	 *
-	 * @access	protected
-	 * @var		array
+	 * @var		$attach_pids
 	 */
 	protected $attach_pids	= array();
 	
 	/**
-	 * Constructor.  Calls parent init() method
+	 * Constructor: calls parent init() method and runs other additional calls
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
 		$this->init();
 		
-		//-----------------------------------------
-		// Get some classes
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php', 'app_class_forums', 'forums' );
-		$appClass	 = new $classToLoad( $this->registry );
+		/* Load forums app main class */
+		ipsRegistry::getAppClass( 'forums' );
 	}
 	
 	/**
-	 * Returns an array of gallery data
+	 * Returns an array of topics
 	 *
-	 * @access	public
-	 * @param	bool	View as guest?
-	 * @return	mixed	Array of data, or void
+	 * @param	boolean		Load only topics viewable by guests?
+	 * @return	@e array	Array of topics data
 	 */
-	public function return_topic_list_data( $view_as_guest=0 )
+	public function return_topic_list_data( $view_as_guest=false )
 	{
 		//-----------------------------------------
 		// INIT
@@ -84,14 +69,14 @@ class apiTopicView extends apiCore
 		
 		$topics = array();
 		
-		if( !$view_as_guest )
+		if( $view_as_guest )
 		{
-			$this->registry->class_forums->strip_invisible	= false;
+			$this->registry->class_forums->strip_invisible	= true;
 			$this->registry->class_forums->forumsInit();
 		}
 		else
 		{
-			$this->registry->class_forums->strip_invisible	= true;
+			$this->registry->class_forums->strip_invisible	= false;
 			$this->registry->class_forums->forumsInit();
 		}
 
@@ -139,9 +124,11 @@ class apiTopicView extends apiCore
 		// Get from the DB
 		//-----------------------------------------
 		
+		$_approved	= $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), 't.' );
+		
 		$this->DB->build( array( 'select'   => 't.*',
 								 'from'     => array( 'topics' => 't' ),
-								 'where'    => 't.approved=1 AND t.forum_id IN (0,'.$this->topic_list_config['forums'].')',
+								 'where'    => $_approved . ' AND t.forum_id IN (0,'.$this->topic_list_config['forums'].')',
 							     'order'    => $this->topic_list_config['order_field'].' '.$this->topic_list_config['order_by'],
 								 'limit'    => array( $this->topic_list_config['offset'], $this->topic_list_config['limit'] ),
 								 'add_join' => array( 
@@ -292,5 +279,4 @@ class apiTopicView extends apiCore
 			return $topics;
 		}
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/api/forums/index.html b/upload/admin/api/forums/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/api/forums/index.html
+++ b/upload/admin/api/forums/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/api/gallery/api_gallery.php b/upload/admin/api/gallery/api_gallery.php
deleted file mode 100644
index 5bde56d1..00000000
--- a/upload/admin/api/gallery/api_gallery.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Gallery API file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Gallery
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- * @since		2.2.0
- *
- */
-
-if ( ! class_exists( 'apiCore' ) )
-{
-	require_once( IPS_ROOT_PATH . 'api/api_core.php' );
-}
-
-/**
- * apiGallery class
- * @package	IP.Gallery
- */
-class apiGallery extends apiCore
-{
-	/**
-	 * Gallery library object
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $glib;
-	
-	/**
-	 * Gallery category object
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $category;
-	
-	/**
-	 * Total images found for result
-	 *
-	 * @access	public
-	 * @var		integer
-	 */
-	public $total		= 0;
-	
-	/**
-	 * Database result resource
-	 *
-	 * @access	public
-	 * @var		resource
-	 */
-	public $res;
-	
-	/**
-	 * Constructor.  Calls parent init() method
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function __construct()
-	{
-		$this->init();
-	}
-	
-	/**
-	* Returns an array of gallery data
-	*
-	* @access	public
-	* @param	integer	Member id
-	* @param	integer	Limit
-	* @param	integer	true pulls the image results and returns them, false leaves the result set as $this->res
-	* @return   mixed	Array of gallery data, or void
-	*/
-	function return_gallery_data( $member_id=0, $limit=5, $do_pull=true )
-	{
-		if( !$member_id )
-		{
-			return array();
-		}
-		
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$images = array();
-		
-		$member_id = intval($member_id);
-
-		$categories = $this->category->getAllowedCats( 0 );
-		$albums		= $this->glib->getAllowedAlbums();
-
-		if( !count($categories) AND !count($albums) )
-		{
-			return array();
-		}
-		
-		$where 				= array();
-		$where_statement 	= "";
-		
-		if( count($categories) )
-		{
-			$where[] = "i.category_id IN (".implode( ',', $categories ).")";
-		}
-		
-		if( is_array($albums) AND count($albums) )
-		{
-			$where[] = "i.album_id IN (".implode( ",", $albums ).")";
-		}
-		else if( $albums == true AND count($categories) )
-		{
-			$dewhere .= " ( i.album_id > 0 AND a.category_id IN ( ".implode( ",", $categories )." ) ";
-			
-			if( !$this->memberData['g_mod_albums'] )
-			{
-				$dewhere .= " AND ( a.public_album=1 OR a.member_id={$this->memberData['member_id']} ) ";
-			}
-			
-			$dewhere .= ")";
-			
-			$where[] = $dewhere;
-		}
-		
-		if( !count($where) )
-		{
-			return array();
-		}
-		else
-		{
-			$where_statement = implode( " OR ", $where );
-		}
-		
-		
-		$this->DB->build( array( 
-								'select'	=> 'i.*',
-								'from'		=> array( 'gallery_images' => 'i' ),
-								'where'		=> "i.approved=1 AND i.member_id={$member_id} AND ({$where_statement})",
-								'add_join'	=> array( 
-									 				array( 
-									 							'type'		=> 'left',
-												 				'select'	=> 'a.name as album_name, a.public_album',
-												 				'from'		=> array( 'gallery_albums' => 'a' ),
-												 				'where'		=> 'a.id=i.album_id',
-												 		),
-												 	array( 
-												 				'type'		=> 'left',
-												 				'select'	=> 'c.name as category_name',
-												 				'from'		=> array( 'gallery_categories' => 'c' ),
-												 				'where'		=> "c.id=i.category_id",
-												 		),
-												 	array( 
-												 				'type'		=> 'left',
-												 				'select'	=> 'm.members_display_name',
-												 				'from'		=> array( 'members' => 'm' ),
-												 				'where'		=> "m.member_id=i.member_id",
-												 		),
-												 	array( 
-												 				'type'		=> 'left',
-												 				'select'	=> 'r.id as rated, r.rate as my_rate',
-												 				'from'		=> array( 'gallery_ratings' => 'r' ),
-												 				'where'		=> "r.img_id=i.id AND r.member_id={$this->memberData['member_id']}",
-												 		 )
-												 	),												 					
-								'order'	=> 'i.idate DESC',
-								'limit'	=> array( 0, $limit )
-						)	);
-										
-		$this->res = $this->DB->execute();
-		
-		$this->total = $this->DB->getTotalRows( $this->res );
-		
-		if( $do_pull )
-		{
-			while( $r = $this->DB->fetch() )
-			{
-				$r['_my_rate'] = $r['my_rate'];
-				
-				$images[] = $r;
-			}
-			
-			return $images;
-		}
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/upload/admin/api/index.html b/upload/admin/api/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/api/index.html
+++ b/upload/admin/api/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/admin/group_form.php b/upload/admin/applications/core/extensions/admin/group_form.php
new file mode 100644
index 00000000..45d3c176
--- /dev/null
+++ b/upload/admin/applications/core/extensions/admin/group_form.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @file		group_form.php 	Core group editing form
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-07-20 20:19:22 -0400 (Wed, 20 Jul 2011) $
+ * @version		v3.2.3
+ * $Revision: 9296 $
+ */
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @interface	admin_group_form__core
+ * @brief		Core group editing form
+ *
+ */
+class admin_group_form__core implements admin_group_form
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Tab name (leave it blank to use the default application title)
+	 *
+	 * @var		$tab_name
+	 */
+	public $tab_name = "";
+
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+
+		$this->registry		= ipsRegistry::instance();
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+
+		$this->tab_name		= ipsRegistry::getClass('class_localization')->words['tab_groupform_rc'];
+	}
+	
+	/**
+	 * Returns HTML tabs content for the page
+	 *
+	 * @param	array		$group		Group data
+	 * @param	integer		$tabsUsed	Number of tabs used so far (your ids should be this +1)
+	 * @return	@e array Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content), 'tabsUsed' (number of tabs you have used)
+	 */
+	public function getDisplayContent( $group=array(), $tabsUsed = 2 )
+	{
+		//-----------------------------------------
+		// Load skin
+		//-----------------------------------------
+		
+		$this->html = ipsRegistry::getClass('output')->loadTemplate( 'cp_skin_group_core', 'core' );
+		
+		//-----------------------------------------
+		// Get report center plugins and sort perms
+		//-----------------------------------------
+		
+		$_canView		= array();
+		$_canSend		= array();
+		$_plugins		= array();
+		
+		$this->DB->build( array( 'select' => '*', 'from' => 'rc_classes', 'order' => 'class_title' ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$senders	= explode( ',', IPSText::cleanPermString( $r['group_can_report'] ) );
+			$viewers	= explode( ',', IPSText::cleanPermString( $r['mod_group_perm'] ) );
+			
+			if( in_array( $group['g_id'], $senders ) )
+			{
+				$_canSend[]	= $r['com_id'];
+			}
+
+			if( in_array( $group['g_id'], $viewers ) )
+			{
+				$_canView[]	= $r['com_id'];
+			}
+			
+			$_plugins[ $r['com_id'] ]	= $r;
+		}
+
+		//-----------------------------------------
+		// Show...
+		//-----------------------------------------
+		
+		return array( 'tabs' => $this->html->acp_group_form_tabs( $group, ( $tabsUsed + 1 ) ), 'content' => $this->html->acp_group_form_main( $group, ( $tabsUsed + 1 ), $_plugins, $_canView, $_canSend ), 'tabsUsed' => 1 );
+	}
+	
+	/**
+	 * Process the entries for saving and return
+	 *
+	 * @return	@e array Array of keys => values for saving
+	 */
+	public function getForSave()
+	{
+		return array();
+	}
+	
+	/**
+	 * Post-process the entries for saving
+	 *
+	 * @author	Brandon Farber
+	 * @param	int		$groupId	Group id
+	 * @return	@e void
+	 */
+	public function postSave( $groupId )
+	{
+		$this->DB->build( array( 'select' => 'com_id, group_can_report, mod_group_perm', 'from' => 'rc_classes' ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$senders	= explode( ',', IPSText::cleanPermString( $r['group_can_report'] ) );
+			$viewers	= explode( ',', IPSText::cleanPermString( $r['mod_group_perm'] ) );
+			$canView	= 0;
+			$canSend	= 0;
+			
+			if( $this->request['rc_send_' . $r['com_id'] ] )
+			{
+				$canSend	= 1;
+			}
+
+			if( $this->request['rc_view_' . $r['com_id'] ] )
+			{
+				$canView	= 1;
+			}
+			
+			$_newSenders	= array();
+			$_newViewers	= array();
+			
+			foreach( $senders as $sender )
+			{
+				if( $sender == $groupId )
+				{
+					if( $canSend )
+					{
+						$_newSenders[ $sender ]	= $sender;
+					}
+				}
+				else
+				{
+					$_newSenders[ $sender ]	= $sender;
+				}
+			}
+			
+			if( $canSend )
+			{
+				$_newSenders[ $groupId ]	= $groupId;
+			}
+			
+			foreach( $viewers as $viewer )
+			{
+				if( $viewer == $groupId )
+				{
+					if( $canView )
+					{
+						$_newViewers[ $viewer ]	= $viewer;
+					}
+				}
+				else
+				{
+					$_newViewers[ $viewer ]	= $viewer;
+				}
+			}
+			
+			if( $canView )
+			{
+				$_newViewers[ $groupId ]	= $groupId;
+			}
+
+			$this->DB->update( 'rc_classes', array( 'group_can_report' => ',' . implode( ',', $_newSenders ) . ',', 'mod_group_perm' => ',' . implode( ',', $_newViewers ) . ',' ), 'com_id=' . $r['com_id'] );
+		}
+		
+		$this->cache->rebuildCache( 'report_plugins', 'global' );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/admin/index.html b/upload/admin/applications/core/extensions/admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/extensions/admin/index.html
+++ b/upload/admin/applications/core/extensions/admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/admin/member_form.php b/upload/admin/applications/core/extensions/admin/member_form.php
index b114cc7f..ab55b519 100644
--- a/upload/admin/applications/core/extensions/admin/member_form.php
+++ b/upload/admin/applications/core/extensions/admin/member_form.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member property updater (AJAX)
- * Last Updated: $Date: 2010-01-15 14:28:09 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 5715 $
+ * @version		$Revision: 7442 $
  *
  */
 
@@ -32,7 +32,6 @@ class admin_member_form__core implements admin_member_form
 	 * This can be left blank and the application title will
 	 * be used
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $tab_name = "";
@@ -51,7 +50,6 @@ class admin_member_form__core implements admin_member_form
 	 * Use the format:
 	 * $array[] = array( 'img' => '', 'url' => '', 'title' => '' );
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @param	array 			Member data
 	 * @return	array 			Array of links
@@ -64,7 +62,7 @@ class admin_member_form__core implements admin_member_form
 		{
 			$array[] = array( 'img'   => '', 
 							  'url'   => "app=members&amp;module=members&amp;section=tools&amp;do=do_locked&amp;auth_key=".ipsRegistry::member()->form_hash."&amp;mid_{$member['member_id']}=1&amp;type=unlock",
-							  'title' => $this->lang->words['reset_failed_logins'] );
+							  'title' => ipsRegistry::getClass('class_localization')->words['reset_failed_logins'] );
 		}
 	
 		return $array;
@@ -73,7 +71,6 @@ class admin_member_form__core implements admin_member_form
 	/**
 	 * Returns content for the page.
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @param	array 				Member data
 	 * @return	array 				Array of tabs, content
@@ -86,7 +83,6 @@ class admin_member_form__core implements admin_member_form
 	/**
 	 * Process the entries for saving and return
 	 *
-	 * @access	public
 	 * @author	Brandon Farber
 	 * @return	array 				Multi-dimensional array (core, extendedProfile) for saving
 	 */
diff --git a/upload/admin/applications/forums/extensions/portalPlugins/index.html b/upload/admin/applications/core/extensions/comments/index.html
similarity index 81%
rename from upload/admin/applications/forums/extensions/portalPlugins/index.html
rename to upload/admin/applications/core/extensions/comments/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/portalPlugins/index.html
+++ b/upload/admin/applications/core/extensions/comments/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/comments/reports.php b/upload/admin/applications/core/extensions/comments/reports.php
new file mode 100644
index 00000000..fdb5595a
--- /dev/null
+++ b/upload/admin/applications/core/extensions/comments/reports.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Report center comments class
+ *
+ * @author 		$author$
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Downloads
+ * @link		http://hatynka.in
+ * @version		$Rev: 9229 $ 
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class comments_core_reports extends classes_comments_renderer
+{
+	/**
+	 * Internal remap array
+	 *
+	 * @param	array
+	 */
+	protected $_remap = array(	'comment_id'			=> 'id',
+								'comment_author_id'		=> 'comment_by',
+								'comment_author_name'	=> 'author_name',
+								'comment_text'			=> 'comment',
+								'comment_ip_address'	=> 'ip_address',
+								'comment_edit_date'		=> 'edit_date',
+								'comment_date'			=> 'comment_date',
+								'comment_approved'		=> 'approved',
+								'comment_parent_id'		=> 'rid' );
+					 
+	/**
+	 * Internal parent remap array
+	 *
+	 * @param	array
+	 */
+	protected $_parentRemap = array(	'parent_id'			=> 'id',
+										'parent_owner_id'	=> 'updated_by',
+										'parent_parent_id'	=> 'uid',
+										'parent_title'		=> 'title',
+										'parent_seo_title'	=> 'seoname',
+										'parent_date'		=> 'date_created' );
+	
+	/**
+	 * Parent SEO template
+	 *
+	 * @return	string
+	 */
+	public function seoTemplate()
+	{
+		return '';
+	}
+
+	/**
+	 * Who am I?
+	 *
+	 * @return	string
+	 */
+	public function whoAmI()
+	{
+		return 'core-reports';
+	}
+	
+	/**
+	 * Comment table
+	 *
+	 * @return	string
+	 */
+	public function table()
+	{
+		return 'rc_comments';
+	}
+
+	/**
+	 * Enable reputation?
+	 *
+	 * @return	string
+	 */
+	public function reputationEnabled()
+	{
+		return false;
+	}
+	
+	/**
+	 * Fetch parent
+	 *
+	 * @return	array
+	 */
+	public function fetchParent( $id )
+	{
+		static $cachedReports	= array();
+		
+		if( !isset($cachedReports[ $id ]) )
+		{
+			$cachedReports[ $id ]	= $this->DB->buildAndFetch( array(
+																	'select'	=> 'i.*',
+																	'from'		=> array( 'rc_reports_index' => 'i' ),
+																	'where'		=> "i.id=" . intval($id),
+																	'add_join'	=> array(
+																						array(
+																							'select'	=> 'c.*',
+																							'from'		=> array( 'rc_classes' => 'c' ),
+																							'where'		=> 'c.com_id=i.rc_class',
+																							'type'		=> 'left',
+																							)
+																						)
+																)		);
+		}
+		
+		return $cachedReports[ $id ];
+	}
+	
+	/**
+	 * Fetch settings
+	 *
+	 * @return	array
+	 */
+	public function settings()
+	{
+		return array( 'urls-showParent' => "app=core&amp;module=reports&amp;do=show_report&amp;rid=%s",
+					  'urls-report'		=> '' );
+	}
+	
+	/**
+	 * Number of items per page
+	 *
+	 * @return	int
+	 */
+	public function perPage()
+	{
+		return 100;
+	}
+	
+	/**
+	 * Pre save
+	 * Accepts an array of GENERIC data and allows manipulation before it's added to DB
+	 *
+	 * @param	string	Type of save (edit/add)
+	 * @param	array	Array of GENERIC data (comment_xxxx)
+	 * @param	int		Comment id (if available)
+	 * @param	int		Parent id
+	 * @return 	array	Array of GENERIC data
+	 */
+	public function preSave( $type, array $array, $commentId=0, $parentId=0 )
+	{
+		return $array;
+	}
+	
+	/**
+	 * Post save
+	 * Accepts an array of GENERIC data and allows manipulation after it's added to DB
+	 *
+	 * @param	string	Type of action (edit/add)
+	 * @param	array	Array of GENERIC data (comment_xxxx)
+	 * @param	int		Comment id (if available)
+	 * @param	int		Parent id
+	 * @return 	array	Array of GENERIC data
+	 */
+	public function postSave( $type, array $array, $commentId=0, $parentId=0 )
+	{
+		$_cnt	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'rc_comments', 'where' => 'rid=' . $parentId ) );
+		$this->DB->update( 'rc_reports_index', array( 'num_comments' => $_cnt['total'], 'date_updated' => time(), 'updated_by' => $array['comment_author_id'] ), "id=" . $parentId );
+		
+		//$this->DB->setDataType( 'num_comments', 'int' );
+		//$this->DB->update( 'rc_reports_index', array( 'num_comments' => 'plus:1', 'date_updated' => time(), 'updated_by' => $array['comment_author_id'] ), "id=" . $parentId );
+
+		//-----------------------------------------
+		// Notify other moderators
+		//-----------------------------------------
+		
+		$report			= $this->fetchParent( $parentId );
+
+		$this->registry->class_localization->loadLanguageFile( array( 'public_reports' ) );
+
+		$this->DB->loadCacheFile( IPSLib::getAppDir('core') . '/sql/' . ips_DBRegistry::getDriverType() . '_report_queries.php', 'report_sql_queries' );
+		
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('core') .'/sources/classes/reportLibrary.php', 'reportLibrary' );
+		$this->registry->setClass( 'reportLibrary', new $classToLoad( $this->registry ) );
+		
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/reportNotifications.php', 'reportNotifications' );
+		$notify			= new $classToLoad( $this->registry );
+		
+		$this->registry->getClass('reportLibrary')->loadPlugin( $report['my_class'], $report['app'] );
+		
+		if( is_object($this->registry->getClass('reportLibrary')->plugins[ $report['my_class'] ]) )
+		{
+			if( $report['extra_data'] && $report['extra_data'] != 'N;' )
+			{
+				$this->registry->getClass('reportLibrary')->plugins[ $report['my_class'] ]->_extra = unserialize( $report['extra_data'] );
+			}
+			else
+			{
+				$this->registry->getClass('reportLibrary')->plugins[ $report['my_class'] ]->_extra = array();
+			}
+			
+			$report_data	= $this->registry->getClass('reportLibrary')->plugins[ $report['my_class'] ]->formatReportData( $report );
+
+			$notify->initNotify( $this->registry->getClass('reportLibrary')->plugins[ $report['my_class'] ]->getNotificationList( IPSText::cleanPermString( $report['mod_group_perm'] ), $report_data ), $report_data );
+			$notify->sendReplyNotifications( $array['comment_text'] );
+		}
+			
+		return $array;
+	}
+	
+	/**
+	 * Post delete. Can do stuff and that
+	 *
+	 * @param	array	Array of comment IDs to be deleted
+	 * @param	int		Parent ID
+	 * @return 	void
+	 */
+	public function postDelete( $commentIds, $parentId )
+	{
+		/* Determine most recent comment or report... */
+		$_comment	= $this->DB->buildAndFetch( array( 'select' => 'comment_by, comment_date', 'from' => 'rc_comments', 'where' => 'approved=1 AND rid=' . $parentId, 'order' => 'comment_date DESC', 'limit' => array( 1 ) ) );
+		$_report	= $this->DB->buildAndFetch( array( 'select' => 'report_by, date_reported', 'from' => 'rc_reports', 'where' => 'rid=' . $parentId, 'order' => 'date_reported DESC', 'limit' => array( 1 ) ) );
+		
+		$_date_updated	= 0;
+		$_updated_by	= 0;
+		
+		if( $_comment['comment_date'] )
+		{
+			$_date_updated	= $_comment['comment_date'];
+			$_updated_by	= $_comment['comment_by'];
+		}
+		
+		if( $_report['date_reported'] > $_date_updated )
+		{
+			$_date_updated	= $_report['date_reported'];
+			$_updated_by	= $_report['report_by'];
+		}
+		
+		$_cnt	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'rc_comments', 'where' => 'rid=' . $parentId ) );
+		$this->DB->update( 'rc_reports_index', array( 'num_comments' => $_cnt['total'], 'date_updated' => $_date_updated, 'updated_by' => $_updated_by ), "id=" . $parentId );
+		
+		//$this->DB->setDataType( 'num_comments', 'int' );
+		//$this->DB->update( 'rc_reports_index', array( 'num_comments' => 'minus:' . count($commentIds) ), "id=" . $parentId );
+	}
+	
+	/**
+	 * Toggles visibility
+	 * 
+	 * @param	string	on/off
+	 * @param	array	Array of comment IDs to be deleted
+	 * @param	int		Parent ID
+	 * @return 	void
+	 */
+	public function postVisibility( $toggle, $commentIds, $parentId )
+	{
+	}
+
+	/**
+	 * Fetch a total count of comments we can see
+	 *
+	 * @param	mixed	parent Id or parent array
+	 * @return	int
+	 */
+	public function count( $parent )
+	{
+		/* Get parent */
+		if ( is_numeric( $parent ) )
+		{
+			$parent	= $this->fetchParent( $parent );
+		}
+
+		return intval($parent['num_comments']);
+	}
+	
+	/**
+	 * Perform a permission check
+	 *
+	 * @param	string	Type of check (add/edit/delete/editall/deleteall/approve all)
+	 * @param	array 	Array of GENERIC data
+	 * @return	true or string to be used in exception
+	 */
+	public function can( $type, array $array )
+	{ 
+		/* Init */
+		$comment = array();
+		
+		/* Got data? */
+		if ( empty( $array['comment_parent_id'] ) )
+		{
+			trigger_error( "No parent ID passed to " . __FILE__, E_USER_WARNING );
+		}
+		
+		/* Get the file */
+		$event	= $this->fetchParent( $array['comment_parent_id'] );
+
+		/* Fetch comment */
+		if ( $array['comment_id'] )
+		{ 
+			$comment	= $this->fetchById( $array['comment_id'] );
+		}
+
+		/* Check permissions */
+		switch( $type )
+		{
+			case 'view':
+				return true;
+			break;
+			
+			case 'edit':
+				if( $this->memberData['g_is_supmod'] OR $this->memberData['member_id'] != $comment['comment_mid'] )
+				{
+					return true;
+				}
+
+				return 'NO_PERMISSION';
+			break;
+			
+			case 'add':
+				return true;
+			break;
+			
+			case 'delete':
+				return $this->memberData['g_is_supmod'] ? true : 'NO_PERMISSION';
+			break;
+			
+			case 'visibility':
+			case 'moderate':
+				return 'NO_PERMISSION';
+			break;
+		}
+	}
+
+	/**
+	 * Returns remap keys (generic => local)
+	 *
+	 * @return	array
+	 */
+	public function remapKeys( $type='comment' )
+	{
+		return ( $type == 'comment' ) ? $this->_remap : $this->_parentRemap;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/coreExtensions.php b/upload/admin/applications/core/extensions/coreExtensions.php
index bcd679eb..0b2ea3c1 100644
--- a/upload/admin/applications/core/extensions/coreExtensions.php
+++ b/upload/admin/applications/core/extensions/coreExtensions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core Sessions
- * Last Updated: $Date: 2010-01-21 03:39:17 -0500 (Thu, 21 Jan 2010) $
+ * Last Updated: $Date: 2011-09-15 17:04:35 -0400 (Thu, 15 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 5732 $
+ * @version		$Rev: 9495 $
  *
  */
 
@@ -25,6 +25,101 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Item Marking
+ * Last Updated: $Date: 2011-09-15 17:04:35 -0400 (Thu, 15 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Downloads
+ * @link		http://hatynka.in
+ * @version		$Rev: 9495 $
+ *
+ */
+
+class itemMarking__core
+{
+	/**#@+
+	 * Registry Object Shortcuts
+	 *
+	 * @var		object
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	/**
+	 * I'm a constructor, twisted constructor
+	 *
+	 * @param	object	ipsRegistry reference
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make objects */
+		$this->registry = $registry;
+		$this->DB	    = $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->lang	    = $this->registry->getClass('class_localization');
+		$this->member   = $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache	= $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+	}
+
+	/**
+	 * Convert Data
+	 * Takes an array of app specific data and remaps it to the DB table fields
+	 *
+	 * @param	array
+	 * @return	array
+	 */
+	public function convertData( $data )
+	{
+		return $data;
+	}
+	
+	/**
+	 * Fetch unread count
+	 *
+	 * Grab the number of items truly unread
+	 * This is called upon by 'markRead' when the number of items
+	 * left hits zero (or less).
+	 * 
+	 *
+	 * @param	array 	Array of data
+	 * @param	array 	Array of read itemIDs
+	 * @param	int 	Last global reset
+	 * @return	integer	Last unread count
+	 */
+	public function fetchUnreadCount( $data, $readItems, $lastReset )
+	{
+		$readItems	= is_array( $readItems ) ? $readItems : array( 0 );
+
+		$_count		= $this->DB->buildAndFetch( array( 
+														'select'	=> 'COUNT(*) as cnt, MIN(date_updated) AS lastItem',
+														'from'		=> 'rc_reports_index',
+														'where'		=> "id NOT IN(" . implode( ",", array_keys( $readItems ) ) . ") AND date_updated > " . intval($lastReset)
+												)	);
+
+		return array( 'count'    => intval( $_count['cnt'] ),
+					  'lastItem' => intval( $_count['lastItem'] ) );
+	}
+}
+
 /**
 * Main loader class
 */
@@ -36,7 +131,6 @@ class publicSessions__core
 	 * current_appcomponent, current_module and current_section are automatically
 	 * stored. This function allows you to add specific variables in.
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @return	array
 	 */
@@ -50,6 +144,12 @@ class publicSessions__core
 						'location_1_id'     => 0,
 						'location_2_type'   => '',
 						'location_2_id'     => 0 );
+
+		/* @link http://community.invisionpower.com/tracker/issue-33345-start-new-topic-reply-to-this-topic-online-list-location */
+		if( ipsRegistry::$request['module'] == 'attach' )
+		{
+			define( 'NO_SESSION_UPDATE', true );
+		}
 		
 		return $array;
 	}
@@ -57,7 +157,6 @@ class publicSessions__core
 	/**
 	 * Parse/format the online list data for the records
 	 *
-	 * @access	public
 	 * @author	Brandon Farber
 	 * @param	array 			Online list rows to check against
 	 * @return	array 			Online list rows parsed
diff --git a/upload/admin/applications/core/extensions/coreVariables.php b/upload/admin/applications/core/extensions/coreVariables.php
index 385701e8..de69e3b2 100644
--- a/upload/admin/applications/core/extensions/coreVariables.php
+++ b/upload/admin/applications/core/extensions/coreVariables.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core registered caches, redirect resets and bitwise settings
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-03-15 18:03:09 -0400 (Tue, 15 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6882 $
+ * @version		$Rev: 8085 $
  *
  */
 
@@ -29,6 +29,11 @@ if ( ! defined( 'IN_IPB' ) )
  */
 $_LOAD = array();
 
+if( IN_ACP AND ( !isset($_GET['module']) OR $_GET['module'] == 'mycp' ) )
+{
+	$_LOAD['stats']				= 1;
+}
+
 if( isset($_GET['module']) )
 {
 	if ( $_GET['module'] == 'search' )
@@ -45,6 +50,8 @@ if( isset($_GET['module']) )
 		$_LOAD['ranks']				= 1;
 		$_LOAD['bbcode']			= 1;
 		$_LOAD['emoticons']			= 1;
+		$_LOAD['reputation_levels']	= 1;
+		$_LOAD['moderators']		= 1;
 	}
 	
 	if( $_GET['module'] == 'usercp' )
@@ -53,6 +60,31 @@ if( isset($_GET['module']) )
 		$_LOAD['reputation_levels']	= 1;
 		$_LOAD['emoticons']         = 1;
 	}
+	
+	if ( $_GET['module'] == 'modcp' )
+	{
+		$_LOAD['moderators']		= 1;
+		$_LOAD['ranks']				= 1;
+		$_LOAD['bbcode']			= 1;
+		$_LOAD['emoticons']			= 1;
+		$_LOAD['reputation_levels']	= 1;
+		$_LOAD['attachtypes']		= 1;
+	}
+	
+	if( IN_ACP AND $_GET['module'] == 'applications' AND $_GET['section'] == 'hooks' )
+	{
+		$_LOAD['disabledHooksCache']	= 1;
+	}
+}
+else if( IN_ACP )
+{
+	$_LOAD['ranks']				= 1;
+	$_LOAD['reputation_levels']	= 1;
+	$_LOAD['emoticons']			= 1;
+	$_LOAD['moderators']		= 1;
+	$_LOAD['adminnotes']		= 1;
+	$_LOAD['performanceCache']	= 1;
+	$_LOAD['sphinx_config']		= 1;
 }
 
 
diff --git a/upload/admin/applications/core/extensions/dashboardNotifications.php b/upload/admin/applications/core/extensions/dashboardNotifications.php
index b4177d44..a2029330 100644
--- a/upload/admin/applications/core/extensions/dashboardNotifications.php
+++ b/upload/admin/applications/core/extensions/dashboardNotifications.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Dashboard Notifications
  * Last Updated: $Date
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6980 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9551 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -35,6 +35,7 @@ class dashboardNotifications__core
 	public $lang;
 	public $cache;
 	public $caches;
+	public $DB;
 	
 	public function __construct()
 	{
@@ -42,6 +43,7 @@ class dashboardNotifications__core
 		$this->lang		= ipsRegistry::getClass('class_localization');
 		$this->caches	=& ipsRegistry::cache()->fetchCaches();
 		$this->cache	= ipsRegistry::cache();
+		$this->DB		= ipsRegistry::DB();
 	}
 	
 	public function get()
@@ -49,15 +51,117 @@ class dashboardNotifications__core
 		/* INIT */
 		$entries = array();
 		
+		if( ! $this->settings['ipb_reg_number'] )
+		{
+			$entries[] = array( $this->lang->words['lc_title_nokey'], sprintf( $this->lang->words['lc_msg_nokey'], "{$this->settings['base_url']}module=tools&amp;section=licensekey" ) );
+		}
+		else
+		{
+			/* We need a classFileManagement object */
+			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+			$classFileManagement = new $classToLoad();
+			
+			/* Try to automatically update if expired */
+			$licenseData = $this->cache->getCache( 'licenseData' );
+			
+			if( ! $licenseData || ( $licenseData['key']['_expires'] != 9999999999 AND $licenseData['key']['_expires'] < IPS_UNIX_TIME_NOW ) )
+			{
+				/* Query the api */
+				$response = $classFileManagement->getFileContents( "http://myipb.in/license.php?lk={$this->settings['ipb_reg_number']}&url={$this->settings['board_url']}&flush=1" );
+	
+					/* Get License Data */
+					$licenseData = json_decode( $response, true );
+					
+					/* Copyright Removal? */
+					if ( $licenseData['cr'] )
+					{
+						IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
+					}
+					elseif ( $this->settings['ips_cp_purchase'] )
+					{
+						IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
+					}
+		
+					/* Save to cache */
+					$licenseData['_cached_date']	= time();
+					$licenseData['key']['_expires']	= $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
+					$licenseData['key']['expires']	= $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
+					
+					$this->cache->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
+
+			}
+			
+			/* Query the api */			
+			$response = $classFileManagement->getFileContents("http://myipb.in/license.php?api=checkService&service=ipb&lk={$this->settings['ipb_reg_number']}&domain={$this->settings['board_url']}" );
+
+			/* Get License Data */
+			$response = json_decode( $response, true );
+
+				/* Is the Spam Service Working? */
+				if ( $this->settings['spam_service_enabled'] )
+				{
+					//$lastLog = $this->DB->buildAndFetch( array( 'select' => 'log_code', 'from' => 'spam_service_log', 'order' => 'id DESC', 'limit' => 1 ) ); // Order on ID since log_date has no index
+					
+					//if ( $lastLog['log_code'] === '0' )
+					
+					/* Get last 5 logs, and if all 5 are errors, show message */
+					$_errors	= 0;
+					$_entries	= 0;
+					$_lastError	= '';
+					
+					$this->DB->build( array( 'select' => 'log_code, log_msg', 'from' => 'spam_service_log', 'order' => 'id DESC', 'limit' => 5 ) );
+					$this->DB->execute();
+					
+					while( $_r = $this->DB->fetch() )
+					{
+						$_entries++;
+						
+						if( $_r['log_code'] === '0' )
+						{
+							$_errors++;
+							
+							if( !$_lastError )
+							{
+								$_lastError	= $_r['log_msg'];
+							}
+						}
+					}
+					
+					if( $_entries > 0 && $_errors == $_entries )
+					{
+						$entries[] = array( $this->lang->words['spam_service_error'], sprintf( $this->lang->words['spam_service_error_msg'], $_lastError ) );
+					}
+				}
+				/* If it's disabled, are we entitiled to it? */
+				else
+				{
+					$licenseData = $this->cache->getCache( 'licenseData' );
+					
+					if ( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
+					{
+						foreach ( $licenseData['ipbMain'] as $data )
+						{
+							if ( $data['name'] == 'Spam Monitoring Service' && $data['status'] == 'Ok' )
+							{
+								$entries[] = array( $this->lang->words['spam_service_disabled'], $this->lang->words['spam_service_disabled_msg'] );
+								break;
+							}
+						}
+					}
+					
+				}
+			
+		}
+		
 		/* FURL cache OOD? */
-		if ( file_exists( IPS_CACHE_PATH . 'cache/furlCache.php' ) )
+		if ( is_file( IPS_CACHE_PATH . 'cache/furlCache.php' ) )
 		{
 			$mtime = intval( @filemtime( IPS_CACHE_PATH . 'cache/furlCache.php' ) );
 
 			/* Check mtimes on extensions.. */
 			foreach( ipsRegistry::$applications as $app_dir => $application )
 			{
-				if ( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/furlTemplates.php' ) )
+				if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/furlTemplates.php' ) )
 				{
 					$_mtime = intval( @filemtime( IPSLib::getAppDir( $app_dir ) . '/extensions/furlTemplates.php' ) );
 
@@ -69,30 +173,46 @@ class dashboardNotifications__core
 				}
 			}
 		}
+		
+		/* Sphinx cache OOD? */
+		if ( $this->settings['search_method'] == 'sphinx' )
+		{
+			$mtime = intval( $this->cache->getCache('sphinx_config') );
 
+			/* Check mtimes on extensions.. */
+			foreach( ipsRegistry::$applications as $app_dir => $application )
+			{
+				if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' ) )
+				{
+					$_mtime = intval( @filemtime( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' ) );
+
+					if ( !$mtime OR $_mtime > $mtime )
+					{
+						$entries[] = array( $this->lang->words['sphinxconfig_outofdate'], $this->lang->words['sphinxconfig_outofdate_desc'] . ' ' . "<a href='" . $this->settings['base_url'] . "app=core&amp;module=applications&amp;section=applications&amp;do=applications_overview'>{$this->lang->words['rebuild_sphinx_config']}</a>" );
+						break;
+					}
+				}
+			}
+		}
+		
 		/* Minify on but /cache/tmp not writeable? */
-		if ( isset( $this->settings['_use_minify'] ) AND $this->settings['_use_minify'] )
+		if ( !empty( $this->settings['_use_minify'] ) )
 		{
 			$entries[] = array( $this->lang->words['minifywrite_head'], $this->lang->words['minifynot_writeable'] );
 		}
 		
 		/* Installer Check */
-		if( @file_exists( IPS_ROOT_PATH . 'install/index.php' ) )
+		if( @is_file( IPS_ROOT_PATH . 'install/index.php' ) )
 		{
-			if ( ! @file_exists( DOC_IPS_ROOT_PATH . 'cache/installer_lock.php' ) )
+			if ( ! @is_file( DOC_IPS_ROOT_PATH . 'cache/installer_lock.php' ) )
 			{
 				$this->lang->words['cp_unlocked_warning'] = sprintf( $this->lang->words['cp_unlocked_warning'], CP_DIRECTORY );
 				$entries[] = array( $this->lang->words['cp_unlockedinstaller'], $this->lang->words['cp_unlocked_warning'] );
 			}
 		}
-		else if( @is_dir( IPS_ROOT_PATH . 'applications_addon/ips/convert/' ) and !@file_exists( DOC_IPS_ROOT_PATH . 'cache/converter_lock.php' ) and $this->caches['app_cache']['convert'] )
-		{
-			$this->lang->words['cp_warning_converter']	= sprintf( $this->lang->words['cp_warning_converter'], $this->settings['_base_url'] );
-			$entries[] = array( $this->lang->words['cp_unlocked_converter'], $this->lang->words['cp_warning_converter'] );
-		}
 
 		/* Unfinished Upgrade */
-		require_once( IPS_ROOT_PATH . '/setup/sources/base/setup.php' );
+		require_once( IPS_ROOT_PATH . '/setup/sources/base/setup.php' );/*noLibHook*/
 		$versions	= IPSSetUp::fetchAppVersionNumbers( 'core' );
 
 		if( $versions['current'][0] != $versions['latest'][0] )
@@ -108,16 +228,22 @@ class dashboardNotifications__core
 			$entries[] = array( sprintf( $this->lang->words['cp_yourphpversion'],  PHP_VERSION ), $this->lang->words['cp_php_warning'] );
 		}
 
+		/* Outgoing email address specified */
+		if ( !$this->settings['email_out'] OR !$this->settings['email_in'] )
+		{
+			$entries[] = array( $this->lang->words['cp_missingemail'], "{$this->lang->words['cp_missingemail1']}<br /><br />{$this->lang->words['_raquo']} <a href='" . $this->settings['base_url'] . "&amp;module=settings&amp;section=settings&amp;do=findsetting&amp;key=email'>{$this->lang->words['cp_missingemail2']}</a>" );
+		}
+		
 		/* Board Offline Check */
 		if ( $this->settings['board_offline'] )
 		{
-			$entries[] = array( $this->lang->words['cp_boardoffline'], "{$this->lang->words['cp_boardoffline1']}<br /><br />{$this->lang->words['_raquo']} <a href='" . $this->settings['base_url'] . "&amp;module=tools&amp;section=settings&amp;do=findsetting&amp;key=boardoffline'>{$this->lang->words['cp_boardoffline2']}</a>" );
+			$entries[] = array( $this->lang->words['cp_boardoffline'], "{$this->lang->words['cp_boardoffline1']}<br /><br />{$this->lang->words['_raquo']} <a href='" . $this->settings['base_url'] . "&amp;module=settings&amp;section=settings&amp;do=findsetting&amp;key=boardoffline'>{$this->lang->words['cp_boardoffline2']}</a>" );
 		}
 		
 		/* Fulltext Check */
 		if( $this->settings['search_method'] == 'traditional' AND !$this->settings['use_fulltext'] AND !$this->settings['hide_ftext_note'] )
 		{
-			$entries[] = array( $this->lang->words['fulltext_off'], "{$this->lang->words['fulltext_turnon']}<br /><br />{$this->lang->words['_raquo']} <a href='" . $this->settings['base_url'] . "&amp;module=tools&amp;section=settings&amp;do=findsetting&amp;key=searchsetup'>{$this->lang->words['fulltext_find']}</a>" );
+			$entries[] = array( $this->lang->words['fulltext_off'], "{$this->lang->words['fulltext_turnon']}<br /><br />{$this->lang->words['_raquo']} <a href='" . $this->settings['base_url'] . "&amp;module=settings&amp;section=settings&amp;do=findsetting&amp;key=searchsetup'>{$this->lang->words['fulltext_find']}</a>" );
 		}
 		
 		/* Make sure the profile directory is writable */
@@ -176,7 +302,7 @@ class dashboardNotifications__core
 		}
 		
 		/* SQL error check */
-		if ( file_exists( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' ) )
+		/*if ( is_file( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' ) )
 		{
 			$unix = @filemtime( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' );
 			
@@ -187,10 +313,10 @@ class dashboardNotifications__core
 				
 				if ( $mtime == $now )
 				{
-					/* Display a message */
+					// Display a message
 				}
 			}
-		}
+		}*/
 		
 		return $entries;
 	}
diff --git a/upload/admin/applications/core/extensions/dataHookLocations.php b/upload/admin/applications/core/extensions/dataHookLocations.php
new file mode 100644
index 00000000..a2435cce
--- /dev/null
+++ b/upload/admin/applications/core/extensions/dataHookLocations.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Define data hook locations (core)
+ * Last Updated: $Date: 2011-05-18 04:49:10 -0400 (Wed, 18 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @version		$Rev: 8812 $
+ */
+
+$dataHookLocations = array(
+
+	/* POSTING LIBRARY DATA LOCATIONS */
+	array( 'warnLogs', 'Insert Warn Log' ),
+
+	
+);
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/editorSections.php b/upload/admin/applications/core/extensions/editorSections.php
index 151ca348..eb35e4d3 100644
--- a/upload/admin/applications/core/extensions/editorSections.php
+++ b/upload/admin/applications/core/extensions/editorSections.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode Management : Determines if bbcode can be used in this section
- * Last Updated: $LastChangedDate: 2010-01-21 03:39:17 -0500 (Thu, 21 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-04-20 18:01:37 -0400 (Wed, 20 Apr 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5732 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8419 $
  *
  */
 
@@ -31,5 +31,6 @@ if ( ! defined( 'IN_IPB' ) )
  *
  */
 $BBCODE	= array(
-				'reports'			=> ipsRegistry::getClass('class_localization')->words['ctype__reports'],
+				'reports'				=> ipsRegistry::getClass('class_localization')->words['ctype__reports'],
+				'global_comments'		=> ipsRegistry::getClass('class_localization')->words['ctype__comments'],
 				);
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/furlIdTemplates.php b/upload/admin/applications/core/extensions/furlIdTemplates.php
index fd282df3..e1e9be09 100644
--- a/upload/admin/applications/core/extensions/furlIdTemplates.php
+++ b/upload/admin/applications/core/extensions/furlIdTemplates.php
@@ -9,10 +9,10 @@
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
  * @version		$Rev: 6596 $
  *
diff --git a/upload/admin/applications/core/extensions/furlTemplates.php b/upload/admin/applications/core/extensions/furlTemplates.php
index 510d709d..a6121f8b 100644
--- a/upload/admin/applications/core/extensions/furlTemplates.php
+++ b/upload/admin/applications/core/extensions/furlTemplates.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sets up SEO templates
- * Last Updated: $Date: 2010-07-01 18:13:46 -0400 (Thu, 01 Jul 2010) $
+ * Last Updated: $Date: 2011-09-16 07:16:26 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6596 $
+ * @version		$Rev: 9496 $
  *
  */
 
@@ -50,8 +50,12 @@ $_SEOTEMPLATES = array(
 							 'allowRedirect' => 0,
 							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=register(&amp;|&|$)#i', 'register/$3' ),
 						     'in'            => array( 'regex'   => "#/register(/|$|\?)#i",
-											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'register' ) ) ) ),
-											
+							 'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'register' ) ) ) ),
+'likeunsubscribe'  => array( 'app'		     => 'core',
+							 'allowRedirect' => 0,
+							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=like(&amp;|&)do=unsubscribe(&amp;|&)key=(\S+?)(&amp;|&|$)#i', 'unsubscribe/$5/' ),
+						     'in'            => array( 'regex'   => "#/unsubscribe/(\S+?)/$#i",
+											           'matches' => array( array( 'app', 'core' ), array( 'module', 'global' ), array( 'section', 'like' ), array( 'do', 'unsubscribe' ), array( 'key', '$1' ) ) ) ),											
 'section=rss'      => array( 'app'		     => 'core',
 							 'allowRedirect' => 0,
 							 'out'           => array( '#app=core(&amp;|&)module=global(&amp;|&)section=rss(&amp;|&)type=(\w+?)$#i', 'rss/$4/' ),
diff --git a/upload/admin/applications/core/extensions/index.html b/upload/admin/applications/core/extensions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/extensions/index.html
+++ b/upload/admin/applications/core/extensions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/navigation/generate.php b/upload/admin/applications/core/extensions/navigation/generate.php
new file mode 100644
index 00000000..4eb0e20f
--- /dev/null
+++ b/upload/admin/applications/core/extensions/navigation/generate.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @file		generate.php 	Navigation plugin: attachments
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		3/8/2011
+ * $LastChangedDate: 2011-05-12 22:28:10 -0400 (Thu, 12 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8754 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		navigation_core
+ * @brief		Provide ability to share attachments via editor
+ */
+class navigation_core
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct() 
+	{
+		$this->registry		=  ipsRegistry::instance();
+		$this->DB			=  $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		=  $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		=  $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			=  $this->registry->class_localization;
+	}
+	
+	/**
+	 * Return the tab title
+	 *
+	 * @return	@e string
+	 */
+	public function getTabName()
+	{ 
+		return $this->lang->words['quicknav_comm_link'];
+	}
+	
+	/**
+	 * Returns navigation data
+	 * 
+	 * @return	@e array	array( array( 0 => array( 'title' => 'x', 'url' => 'x' ) ) );
+	 */
+	public function getNavigationData()
+	{
+		$blocks = array();
+		$links  = array();
+		
+		$links[] = array( 'title' => $this->lang->words['view_new_posts']       , 'url' => $this->registry->output->buildUrl( 'app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=forums', 'public') );
+		$links[] = array( 'title' => $this->lang->words['online_user_link']     , 'url' => $this->registry->output->buildUrl( 'app=members&amp;module=online&amp;sort_order=desc', 'public') );
+		$links[] = array( 'title' => $this->lang->words['registered_users_link'], 'url' => $this->registry->output->buildSEOUrl( 'app=members&amp;module=list', 'public', 'false', 'members_list' ) );
+		$links[] = array( 'title' => $this->lang->words['status_updates_link']  , 'url' => $this->registry->output->buildSEOUrl( 'app=members&amp;module=profile&amp;section=status', 'public', 'false', 'members_status_all' ) );
+		
+		/* Add to blocks */
+		$blocks[] = array( 'title' => '', 'links' => $links );
+		
+		return $blocks;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/api/blog/index.html b/upload/admin/applications/core/extensions/navigation/index.html
similarity index 81%
rename from upload/admin/api/blog/index.html
rename to upload/admin/applications/core/extensions/navigation/index.html
index dfdb4ca9..bae2d5ed 100644
--- a/upload/admin/api/blog/index.html
+++ b/upload/admin/applications/core/extensions/navigation/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/notifications.php b/upload/admin/applications/core/extensions/notifications.php
index a2e32dc2..9133840c 100644
--- a/upload/admin/applications/core/extensions/notifications.php
+++ b/upload/admin/applications/core/extensions/notifications.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Define the core notification types
- * Last Updated: $Date: 2010-10-25 10:10:56 -0400 (Mon, 25 Oct 2010) $
+ * Last Updated: $Date: 2011-03-11 06:59:39 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 7030 $
+ * @version		$Rev: 8031 $
  *
  */
 
@@ -37,9 +37,9 @@ class core_notifications
 		$_NOTIFY	= array(
 							// Future...
 							// array( 'key' => 'reputation_received', 'default' => array( 'inline' ), 'disabled' => array() ),
-							array( 'key' => 'report_center', 'default' => array( 'email' ), 'disabled' => array(), 'show_callback' => TRUE , 'icon' => 'notify_reportcenter' ),
+							array( 'key' => 'report_center', 'default' => array( 'email' ), 'disabled' => array(), 'show_callback' => TRUE, 'icon' => 'notify_reportcenter' ),
 							array( 'key' => 'new_comment'  , 'default' => array( 'email' ), 'disabled' => array(), 'show_callback' => false, 'icon' => 'notify_profilecomment' ),
-							);
+							);/*noLibHook*/
 		return $_NOTIFY;
 	}
 	
diff --git a/upload/admin/applications/core/extensions/reportPlugins/default.php b/upload/admin/applications/core/extensions/reportPlugins/default.php
index a40c17dc..86ce4810 100644
--- a/upload/admin/applications/core/extensions/reportPlugins/default.php
+++ b/upload/admin/applications/core/extensions/reportPlugins/default.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Report Center :: Default plugin
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,25 +25,32 @@ if ( ! defined( 'IN_IPB' ) )
 
 class default_plugin
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/
+	protected $caches;
 	
 	/**
 	 * Holds extra data for the plugin
 	 *
-	 * @access	private
 	 * @var		array			Data specific to the plugin
 	 */
 	public $_extra;
@@ -51,9 +58,8 @@ class default_plugin
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -74,7 +80,6 @@ class default_plugin
 	/**
 	 * Display the form for extra data in the ACP
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data
 	 * @param	object		HTML object
 	 * @return	string		HTML to add to the form
@@ -122,12 +127,12 @@ EOF;
 		$return		.= $html->addRow(	"URL String",
 										"The formatted URL that is used to point to the reported content. If the URL does not contain 'http://' the board's base url will be inserted. You may also include input data: {input_id}",
 										$this->registry->output->formInput('string_url', $plugin_data['string_url'])
-									);
+									);/*noLibHook*/
 									
 		$return		.= $html->addRow(	"Title String",
 										"The formatted title that is shown on the reporting page and when reports are listed. You may include input data: {input_id}. If you would like the report center to pull the page title, use #PAGE_TITLE#",
 										$this->registry->output->formInput('string_title', $plugin_data['string_title'])
-									);
+									);/*noLibHook*/
 
 		return $return;
 	}
@@ -135,7 +140,6 @@ EOF;
 	/**
 	 * Process the plugin's form fields for saving
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data for save
 	 * @return	string		Error message
 	 */
@@ -176,7 +180,6 @@ EOF;
 	/**
 	 * Update timestamp for report
 	 *
-	 * @access	public
 	 * @param	array 		New reports
 	 * @param 	array 		New members cache
 	 * @return	boolean
@@ -189,7 +192,6 @@ EOF;
 	/**
 	 * Get report permissions
 	 *
-	 * @access	public
 	 * @param	string 		Type of perms to check
 	 * @param 	array 		Permissions data
 	 * @param 	array 		group ids
@@ -211,7 +213,6 @@ EOF;
 	/**
 	 * Show the report form for this module
 	 *
-	 * @access	public
 	 * @param 	array 		Application data
 	 * @return	string		HTML form information
 	 */
@@ -236,7 +237,6 @@ EOF;
 	/**
 	 * Process the basic forum data
 	 *
-	 * @access	public
 	 * @param 	array 		Application data
 	 * @param 	string		URL
 	 * @param 	string		Title
@@ -317,7 +317,6 @@ EOF;
 	/**
 	 * Get section and link
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Section/link
 	 */
@@ -332,7 +331,6 @@ EOF;
 	/**
 	 * Process a report and save the data appropriate
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Data from saving the report
 	 */
@@ -417,13 +415,28 @@ EOF;
 		
 		return $return_data;
 	}
+
+	/**
+	 * Accepts an array of data from rc_reports_index and returns an array formatted nearly identical to processReport()
+	 *
+	 * @param 	array 		Report data
+	 * @return	array 		Formatted report data
+	 */
+	public function formatReportData( $report_data )
+	{
+		return array(
+					'REDIRECT_URL'	=> $report_data['url'],
+					'REPORT_INDEX'	=> $report_data['id'],
+					'SAVED_URL'		=> $report_data['url'],
+					'REPORT'		=> '',
+					);
+	}
 	
 	/**
 	 * Where to send user after report is submitted
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reportRedirect( $report_data )
 	{
@@ -433,11 +446,10 @@ EOF;
 	/**
 	 * Loads an HTML page and grabs its title
 	 *
-	 * @access	private
 	 * @param	string   Web URL
 	 * @return	string
 	 */
-	private function _getPageTitle( $URL )
+	protected function _getPageTitle( $URL )
 	{
 		$html_code = file_get_contents( $URL );
 		
@@ -455,7 +467,6 @@ EOF;
 	/**
 	 * Retrieve list of users to send notifications to
 	 *
-	 * @access	public
 	 * @param 	string 		Group ids
 	 * @param 	array 		Report data
 	 * @return	array 		Array of users to PM/Email
@@ -465,16 +476,16 @@ EOF;
 		$notify = array();
 		
 		$this->DB->build( array(
-									'select'	=> 'noti.*',
-									'from'		=> array( 'rc_modpref' => 'noti' ),
-									'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
-									'add_join'	=> array(
-														array(
-															'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
-															'from'		=> array( 'members' => 'mem' ),
-															'where'		=> 'mem.member_id=noti.mem_id',
-															)
+								'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
+								'from'		=> array( 'members' => 'mem' ),
+								'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
+								'add_join'	=> array(
+													array(
+														'select'	=> 'noti.*',
+														'from'		=> array( 'rc_modpref' => 'noti' ),
+														'where'		=> 'mem.member_id=noti.mem_id',
 														)
+													)
 							)		);
 		$this->DB->execute();
 
diff --git a/upload/admin/applications/core/extensions/reportPlugins/index.html b/upload/admin/applications/core/extensions/reportPlugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/extensions/reportPlugins/index.html
+++ b/upload/admin/applications/core/extensions/reportPlugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/rssOutput.php b/upload/admin/applications/core/extensions/rssOutput.php
index 9552b2af..5048a4cd 100644
--- a/upload/admin/applications/core/extensions/rssOutput.php
+++ b/upload/admin/applications/core/extensions/rssOutput.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS output plugin :: report center
- * Last Updated: $Date: 2010-10-14 13:15:13 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 6980 $
+ * @version		$Revision: 8021 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,7 +30,7 @@ class rss_output_core
 	 *
 	 * @var		integer			Expiration timestamp
 	 */
-	private $expires			= 0;
+	protected $expires			= 0;
 	
 	/**
 	 * Grab the RSS links
diff --git a/upload/admin/applications/core/extensions/search/config.php b/upload/admin/applications/core/extensions/search/config.php
index fea89127..cba2e621 100644
--- a/upload/admin/applications/core/extensions/search/config.php
+++ b/upload/admin/applications/core/extensions/search/config.php
@@ -1,20 +1,21 @@
 <?php
+
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config file
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-04-13 23:15:13 -0400 (Wed, 13 Apr 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8333 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -23,13 +24,10 @@ if ( ! defined( 'IN_IPB' ) )
 }
 
 /* Can search with this app */
-$CONFIG['can_search']	      = 1;
+$CONFIG['can_search']			= 1;
 
 /* Can view new content with this app */
-$CONFIG['can_viewNewContent'] = 0;
-
-/* Can fetch active content with this app */
-$CONFIG['can_activeContent']  = 0;
+$CONFIG['can_viewNewContent']	= 0;
 
 /* Can fetch user generated content */
-$CONFIG['can_userContent'] = 0;
\ No newline at end of file
+$CONFIG['can_userContent']		= 0;
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/search/engines/index.html b/upload/admin/applications/core/extensions/search/engines/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/extensions/search/engines/index.html
+++ b/upload/admin/applications/core/extensions/search/engines/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/search/engines/sql.php b/upload/admin/applications/core/extensions/search/engines/sql.php
index 20f5cfc8..7fae8788 100644
--- a/upload/admin/applications/core/extensions/search/engines/sql.php
+++ b/upload/admin/applications/core/extensions/search/engines/sql.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Basic Forum Search
- * Last Updated: $Date: 2010-02-23 12:38:11 +0000 (Tue, 23 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5861 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -26,6 +26,9 @@ class search_engine_core extends search_engine
 {
 	/**
 	 * Constructor
+	 *
+	 * @param	object	ipsRegistry reference
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{		
@@ -39,78 +42,50 @@ class search_engine_core extends search_engine
 	 *
 	 * So if we had 1000 replies, and we are on page 2 of 25 per page, we'd return 25 items offset by 25
 	 *
-	 * @access public
 	 * @return array
 	 */
 	public function search()
 	{
-		/* INIT */ 
-		$count       		= 0;
-		$results     		= array();
-		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
-		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
-		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
-		$sortKey			= '';
-		$sortType			= '';
-		$rows               = array();
-		$got				= 0;
-		
-		if ( IPSSearchRegistry::get('opt.noPostPreview') OR IPSSearchRegistry::get('display.onlyTitles') )
-		{
-			$group_by = 'h.id';
-		}
-		
+		/* INIT */
+		$sort_by		= IPSSearchRegistry::get('in.search_sort_by');
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
+		$search_term	= IPSSearchRegistry::get('in.clean_search_term');
+		$sortKey		= '';
+		$rows			= array();
+
 		/* Sorting */
 		switch( $sort_by )
 		{
 			default:
 			case 'date':
-				$sortKey  = ( $content_title_only ) ? 'id' : 'id';
-				$sortType = 'numerical';
+				$sortKey  = 'id';
 			break;
 			case 'title':
 				$sortKey  = 'title';
-				$sortType = 'string';
 			break;
 		}
 		
 		/* Query the count */	
 		$count = $this->DB->buildAndFetch( array('select'   => 'COUNT(*) as total_results',
-												 'from'	    => array( 'faq' => 'h' ),
-		 										 'where'	=> $this->_buildWhereStatement( $search_term, $content_title_only ),
-		 										 'group'    => $group_by,
-												 'add_join' => array( array( 'from'   => array( 'permission_index' => 'i' ),
-																			 'where'  => "i.perm_type='help' AND i.perm_type_id=1",
-																			 'type'   => 'left' ) ) ) );
+												 'from'	    => 'faq',
+		 										 'where'	=> $this->_buildWhereStatement( $search_term ),
+										)		);
 		
 		
 		
 		/* Fetch data */
-		$this->DB->build( array( 'select'   => 'h.*',
-							     'from'	    => array( 'faq' => 'h' ),
-								 'where'	=> $this->_buildWhereStatement( $search_term, $content_title_only ),
-								 'group'    => $group_by,
+		$this->DB->build( array( 'select'   => '*',
+							     'from'	    => 'faq',
+								 'where'	=> $this->_buildWhereStatement( $search_term ),
 								 'order'    => $sortKey . ' ' . $sort_order,
 								 'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
-								 'add_join' => array( array( 'from'   => array( 'permission_index' => 'i' ),
-															 'where'  => "i.perm_type='help' AND i.perm_type_id=1",
-															 'type'   => 'left' ) ) ) );
-		
-		
-		
-		
-		
+						)		);
 		$this->DB->execute();
 
-		/* Sort */
+		/* Get results */
 		while ( $_row = $this->DB->fetch() )
 		{
-			$rows[ $got ] = $_row;
-							
-			$got++;
+			$rows[] = $_row;
 		}
 	
 		/* Return it */
@@ -120,25 +95,30 @@ class search_engine_core extends search_engine
 	/**
 	 * Builds the where portion of a search string
 	 *
-	 * @access	private
 	 * @param	string	$search_term		The string to use in the search
-	 * @param	bool	$content_title_only	Search only title records
 	 * @return	string
-	 **/
-	private function _buildWhereStatement( $search_term, $content_title_only=false )
+	 */
+	protected function _buildWhereStatement( $search_term )
 	{		
 		/* INI */
 		$where_clause = array();
 				
 		if( $search_term )
 		{
-			if( $content_title_only )
+			switch( IPSSearchRegistry::get('opt.searchType') )
 			{
-				$where_clause[] = "h.title LIKE '%{$search_term}%'";
-			}
-			else
-			{
-				$where_clause[] = "(h.title LIKE '%{$search_term}%' OR h.text LIKE '%{$search_term}%' OR h.description LIKE '%{$search_term}%')";
+				case 'both':
+				default:
+					$where_clause[] = "(title LIKE '%{$search_term}%' OR text LIKE '%{$search_term}%' OR description LIKE '%{$search_term}%')";
+				break;
+				
+				case 'titles':
+					$where_clause[] = "title LIKE '%{$search_term}%'";
+				break;
+				
+				case 'content':
+					$where_clause[] = "(text LIKE '%{$search_term}%' OR description LIKE '%{$search_term}%')";
+				break;
 			}
 		}
 
@@ -154,9 +134,6 @@ class search_engine_core extends search_engine
 			$where_clause[] = '( ' . implode( ' OR ', $this->whereConditions['OR'] ) . ' )';
 		}
 
-		/* Permissions */
-		$where_clause[] = $this->DB->buildRegexp( "i.perm_view", $this->member->perm_id_array );
-			
 		/* Build and return the string */
 		return implode( " AND ", $where_clause );
 	}
@@ -164,10 +141,9 @@ class search_engine_core extends search_engine
 	/**
 	 * Remap standard columns (Apps can override )
 	 *
-	 * @access	public
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
@@ -182,26 +158,17 @@ class search_engine_core extends search_engine
 	/**
 	 * Returns an array used in the searchplugin's setCondition method
 	 *
-	 * @access	public
 	 * @param	array 	$data	Array of forums to view
 	 * @return	array 	Array with column, operator, and value keys, for use in the setCondition call
-	 **/
+	 */
 	public function buildFilterSQL( $data )
 	{
-		/* INIT */
-		$return = array();
-		
-		/* Set up some defaults */
-		IPSSearchRegistry::set( 'opt.noPostPreview'  , false );
-		IPSSearchRegistry::set( 'opt.onlySearchPosts', false );
-		
 		return array();
 	}
 	
 	/**
 	 * Can handle boolean searching
 	 *
-	 * @access	public
 	 * @return	boolean
 	 */
 	public function isBoolean()
diff --git a/upload/admin/applications/core/extensions/search/form.php b/upload/admin/applications/core/extensions/search/form.php
index f3c7b98b..00ea6c3f 100644
--- a/upload/admin/applications/core/extensions/search/form.php
+++ b/upload/admin/applications/core/extensions/search/form.php
@@ -1,20 +1,21 @@
 <?php
+
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Returns HTML for the form (optional class, not required)
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -27,6 +28,7 @@ class search_form_core
 	/**
 	 * Construct
 	 *
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -45,8 +47,6 @@ class search_form_core
 	/**
 	 * Return sort drop down
 	 * 
-	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function fetchSortDropDown()
diff --git a/upload/admin/applications/core/extensions/search/format.php b/upload/admin/applications/core/extensions/search/format.php
index 4cf6323a..a092d4a5 100644
--- a/upload/admin/applications/core/extensions/search/format.php
+++ b/upload/admin/applications/core/extensions/search/format.php
@@ -1,20 +1,21 @@
 <?php
+
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Formats forum search results
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -26,6 +27,9 @@ class search_format_core extends search_format
 {
 	/**
 	 * Constructor
+	 *
+	 * @param	object	ipsRegistry
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -35,7 +39,6 @@ class search_format_core extends search_format
 	/**
 	 * Parse search results
 	 *
-	 * @access	private
 	 * @param	array 	$r				Search result
 	 * @return	array 	$html			Blocks of HTML
 	 */
@@ -47,20 +50,18 @@ class search_format_core extends search_format
 	/**
 	 * Formats the forum search result for display
 	 *
-	 * @access	public
 	 * @param	array   $search_row		Array of data
 	 * @return	mixed	Formatted content, ready for display, or array containing a $sub section flag, and content
-	 **/
+	 */
 	public function formatContent( $data )
 	{
-		return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->helpSearchResult( $data, IPSSearchRegistry::get('display.onlyTitles') ), 0 );
+		return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->helpSearchResult( $data, IPSSearchRegistry::get('opt.searchType') == 'titles' ? true : false ), 0 );
 	}
 
 	/**
 	 * Formats / grabs extra data for results
 	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
 	 *
-	 * @access public
 	 * @return array
 	 */
 	public function processResults( $ids )
@@ -80,7 +81,7 @@ class search_format_core extends search_format
 	 *
 	 * @param  array  $r
 	 * @return array
-	 **/
+	 */
 	public function genericizeResults( $r )
 	{
 		$r['app']                  = 'core';
@@ -92,5 +93,4 @@ class search_format_core extends search_format
 
 		return $r;
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/search/index.html b/upload/admin/applications/core/extensions/search/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/extensions/search/index.html
+++ b/upload/admin/applications/core/extensions/search/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/portalPlugins/index.html b/upload/admin/applications/core/extensions/sharedmedia/index.html
similarity index 81%
rename from upload/admin/applications/members/extensions/portalPlugins/index.html
rename to upload/admin/applications/core/extensions/sharedmedia/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/portalPlugins/index.html
+++ b/upload/admin/applications/core/extensions/sharedmedia/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/sharedmedia/plugin_attachments.php b/upload/admin/applications/core/extensions/sharedmedia/plugin_attachments.php
new file mode 100644
index 00000000..003ed72c
--- /dev/null
+++ b/upload/admin/applications/core/extensions/sharedmedia/plugin_attachments.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @file		plugin_attachments.php 	Shared media plugin: attachments
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: rtissier $
+ * @since		3/8/2011
+ * $LastChangedDate: 2011-03-16 19:10:59 -0400 (Wed, 16 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8108 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_core_attachments
+ * @brief		Provide ability to share attachments via editor
+ */
+class plugin_core_attachments
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Attachments class
+	 *
+	 * @var		object
+	 */
+	protected $attach;
+
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+	}
+	
+	/**
+	 * Return the tab title
+	 *
+	 * @return	@e string
+	 */
+	public function getTab()
+	{
+		if( $this->memberData['member_id'] )
+		{
+			return $this->lang->words['sharedmedia_attachments'];
+		}
+	}
+	
+	/**
+	 * Return the HTML to display the tab
+	 *
+	 * @return	@e string
+	 */
+	public function showTab( $string )
+	{
+		//-----------------------------------------
+		// Are we a member?
+		//-----------------------------------------
+		
+		if( !$this->memberData['member_id'] )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// How many attachments do we have?
+		//-----------------------------------------
+		
+		$mimes	= $this->cache->getCache('attachtypes');
+		$st		= intval($this->request['st']);
+		$each	= 30;
+		$where	= '';
+		
+		if( $string )
+		{
+			$where	= " AND attach_file LIKE '%{$string}%'";
+		}
+
+		$count	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as total', 'from' => 'attachments', 'where' => "attach_member_id={$this->memberData['member_id']}" . $where ) );
+		$rows	= array();
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $count['total'],
+																		'itemsPerPage'		=> $each,
+																		'currentStartValue'	=> $st,
+																		'seoTitle'			=> '',
+																		'method'			=> 'nextPrevious',
+																		'noDropdown'		=> true,
+																		'ajaxLoad'			=> 'mymedia_content',
+																		'baseUrl'			=> "app=core&amp;module=ajax&amp;section=media&amp;do=loadtab&amp;tabapp=core&amp;tabplugin=attachments&amp;search=" . urlencode($string) )	);
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_member_id={$this->memberData['member_id']}" . $where, 'order' => 'attach_date DESC', 'limit' => array( $st, $each ) ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			if( $r['attach_thumb_location'] )
+			{
+				$image	= $this->settings['upload_url'] . '/' . $r['attach_thumb_location'];
+
+				$dims	= IPSLib::scaleImage( array( 
+														'cur_width'		=> $r['attach_thumb_width'],
+														'cur_height'	=> $r['attach_thumb_height'],
+														'max_width'		=> 80,
+														'max_height'	=> 80,
+												)		);
+				$width	= $dims['img_width'];
+				$height	= $dims['img_height'];
+			}
+			else
+			{
+				$image	= $this->settings['public_dir'] . $mimes[ $r['attach_ext'] ]['atype_img'];
+				$width	= 0;
+				$height	= 0;
+			}
+
+			$rows[]	= array(
+							'image'		=> $image,
+							'width'		=> $width,
+							'height'	=> $height,
+							'title'		=> IPSText::truncate( $r['attach_file'], 25 ),
+							'desc'		=> '',
+							'insert'	=> "core:attachments:" . $r['attach_id'],
+							);
+		}
+
+		return $this->registry->output->getTemplate('editors')->mediaGenericWrapper( $rows, $pages, 'core', 'attachments' );
+	}
+
+	/**
+	 * Return the HTML output to display
+	 *
+	 * @param	int		$attachId	Attachment ID to show
+	 * @return	@e string
+	 */
+	public function getOutput( $attachId=0 )
+	{
+		$attachId	= intval($attachId);
+		
+		if( !$attachId )
+		{
+			return '';
+		}
+		
+		if( !is_object($this->attach) )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
+			$this->attach	=  new $classToLoad( $this->registry );
+		}
+		
+		$attachment	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'attachments', 'where' => 'attach_id=' . $attachId ) );
+		
+		$this->attach->type	= $attachment['attach_rel_module'];
+		$this->attach->init();
+		
+		$output	= $this->attach->renderSingleAttachment( $attachment );
+		
+		return $output;
+	}
+	
+	/**
+	 * Verify current user has permission to post this
+	 *
+	 * @param	int		$attachId	Attachment ID to show
+	 * @return	@e bool
+	 */
+	public function checkPostPermission( $attachId )
+	{
+		$attachId	= intval($attachId);
+		
+		if( !$attachId )
+		{
+			return '';
+		}
+		
+		if( $this->memberData['g_is_supmod'] OR $this->memberData['is_mod'] )
+		{
+			return '';
+		}
+		
+		$attachment	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'attachments', 'where' => 'attach_id=' . $attachId ) );
+		
+		if( $this->memberData['member_id'] AND $attachment['attach_member_id'] == $this->memberData['member_id'] )
+		{
+			return '';
+		}
+		
+		return 'no_permission_shared';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/extensions/sphinxTemplate.php b/upload/admin/applications/core/extensions/sphinxTemplate.php
index 2d2259ed..fdbb5ac9 100644
--- a/upload/admin/applications/core/extensions/sphinxTemplate.php
+++ b/upload/admin/applications/core/extensions/sphinxTemplate.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sphinx template file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-08-31 20:57:38 -0400 (Wed, 31 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @version		$Rev: 9438 $
  * @since		3.0.0
  *
  */
@@ -27,62 +27,64 @@ if ( ! defined( 'IN_IPB' ) )
 
 $appSphinxTemplate	= <<<EOF
 
-############################### --- CORE --- ################################
+############################### --- TAGS --- ################################
 
-source core_search_main : ipb_source_config
+source <!--SPHINX_CONF_PREFIX-->core_tags_search_main : <!--SPHINX_CONF_PREFIX-->ipb_source_config
 {
 	# Set our forum PID counter
-	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_core_counter', (SELECT max(id) FROM <!--SPHINX_DB_PREFIX-->faq), '', 0, UNIX_TIMESTAMP() )
+	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_core_tags_counter', (SELECT max(tag_id) FROM <!--SPHINX_DB_PREFIX-->core_tags), 0, UNIX_TIMESTAMP(), 0 )
 	
 	# Query posts for the main source
-	sql_query		= SELECT f.*, f.id as search_id, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view \
-					  FROM <!--SPHINX_DB_PREFIX-->faq f \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=1 AND pi.perm_type='help' ) \
-					  WHERE f.id <= ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_core_counter' )
+	sql_query		= SELECT t.tag_id, t.tag_id as search_id, t.tag_added, t.tag_member_id, t.tag_meta_id, t.tag_meta_parent_id, t.tag_text, t.tag_meta_app, t.tag_meta_area,  \
+							 p.tag_perm_text, p.tag_perm_visible \
+					  FROM <!--SPHINX_DB_PREFIX-->core_tags t \
+					  LEFT JOIN <!--SPHINX_DB_PREFIX-->core_tags_perms p ON ( t.tag_aai_lookup=p.tag_perm_aai_lookup ) \
+					  WHERE t.tag_id <= ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_core_tags_counter' )
 	
 	# Fields	
-	sql_attr_uint	= search_id
-	
+	sql_attr_uint	   = search_id
+	sql_attr_timestamp = tag_added
+	sql_attr_uint      = tag_member_id
+	sql_attr_uint      = tag_meta_id
+	sql_attr_uint      = tag_meta_parent_id
+	sql_attr_uint	   = tag_perm_visible
 	sql_ranged_throttle	= 0
 }
 
-source core_search_delta : core_search_main
+source <!--SPHINX_CONF_PREFIX-->core_tags_search_delta : <!--SPHINX_CONF_PREFIX-->core_tags_search_main
 {
 	# Override the base sql_query_pre
 	sql_query_pre	= 
 	
 	# Query posts for the main source
-	sql_query		= SELECT f.*, f.id as search_id, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view \
-					  FROM <!--SPHINX_DB_PREFIX-->faq f \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=1 AND pi.perm_type='help' ) \
-					  WHERE f.id > ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_core_counter' )
-	
-	# Fields	
-	sql_attr_uint	= search_id
-	
-	sql_ranged_throttle	= 0
+	sql_query		= SELECT t.tag_id, t.tag_id as search_id, t.tag_added, t.tag_member_id, t.tag_meta_id, t.tag_meta_parent_id, t.tag_text, t.tag_meta_app, t.tag_meta_area,  \
+							 p.tag_perm_text, p.tag_perm_visible \
+					  FROM <!--SPHINX_DB_PREFIX-->core_tags t \
+					  LEFT JOIN <!--SPHINX_DB_PREFIX-->core_tags_perms p ON ( t.tag_aai_lookup=p.tag_perm_aai_lookup ) \
+					  WHERE t.tag_id > ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_core_tags_counter' )
 }
 
-index core_search_main
+index <!--SPHINX_CONF_PREFIX-->core_tags_search_main
 {
-	source			= core_search_main
-	path			= <!--SPHINX_BASE_PATH-->/core_search_main
+	source			= <!--SPHINX_CONF_PREFIX-->core_tags_search_main
+	path			= <!--SPHINX_BASE_PATH-->/<!--SPHINX_CONF_PREFIX-->core_tags_search_main
 	
 	docinfo			= extern
 	mlock			= 0
 	morphology		= none
 	min_word_len	= 2
-	charset_type	= sbcs
-	html_strip		= 0	
+	charset_type    = utf-8
+	html_strip		= 0
+	#infix_fields    = tag_text
+	#min_infix_len   = 3
+	#enable_star     = 1
 }
 
-index core_search_delta : core_search_main
+index <!--SPHINX_CONF_PREFIX-->core_tags_search_delta : <!--SPHINX_CONF_PREFIX-->core_tags_search_main
 {
-   source			= core_search_delta
-   path				= <!--SPHINX_BASE_PATH-->/core_search_delta
+   source			= <!--SPHINX_CONF_PREFIX-->core_tags_search_delta
+   path				= <!--SPHINX_BASE_PATH-->/<!--SPHINX_CONF_PREFIX-->core_tags_search_delta
 }
 
-
 EOF;
+
diff --git a/upload/admin/applications/core/extensions/usercpForms.php b/upload/admin/applications/core/extensions/usercpForms.php
index b96019f3..96db61e4 100644
--- a/upload/admin/applications/core/extensions/usercpForms.php
+++ b/upload/admin/applications/core/extensions/usercpForms.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core user control panel plugin
- * Last Updated: $Date: 2010-10-25 06:54:59 -0400 (Mon, 25 Oct 2010) $
+ * Last Updated: $Date: 2011-10-10 16:21:29 -0400 (Mon, 10 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 7029 $
+ * @version		$Rev: 9590 $
  *
  */
 
@@ -36,6 +36,13 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	 */
 	public $tab_name = "�а�тройки";
 
+	/**
+	 * Default area code
+	 *
+	 * @var		string
+	 */
+	public $defaultAreaCode = 'profileinfo';
+	
 	/**
 	 * OK Message
 	 * This is an optional message to return back to the framework
@@ -48,7 +55,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	/**
 	 * Hide 'save' button and form elements
 	 * Useful if you have custom output that doesn't
-	 * require it
+	 * need to use it
 	 *
 	 * @var		bool
 	 */
@@ -67,11 +74,18 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	 * @var		boolean
 	 */
 	protected $_isFBUser = false;
+	
+	/**
+	 * Flag to indicate compatibility
+	 * 
+	 * @var		int
+	 */
+ 	public $version	= 32;
 
 	/**
 	 * Initiate this module
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function init( )
 	{
@@ -102,23 +116,26 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 
 		$array = array();
 
-		$array[] = array( 'url'    => 'area=settings',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['ucp_general_settings'],
-						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'settings' ? 1 : 0,
-						  'area'   => 'settings'
-						);
-
+		$array[] = array( 'url'    => 'area=profileinfo',
+						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['change_settings'],
+						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'profileinfo' ? 1 : 0,
+						  'area'   => 'profileinfo'
+						   );
+		
+		if ( $this->memberData['gbw_allow_customization'] AND ! $this->memberData['bw_disable_customization'] )
+		{
+			$array[] = array( 'url'    => 'area=customize',
+							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_customize'],
+							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'customize' ? 1 : 0,
+							  'area'   => 'customize'
+							 );
+		}
+		
 		$array[] = array( 'url'    => 'area=email',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['ucp_change_email'],
+						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_email_pass_change'],
 						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'email' ? 1 : 0,
 						  'area'   => 'email'
 						);
-
-		$array[] = array( 'url'    => 'area=password',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['ucp_change_password'],
-						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'password' ? 1 : 0,
-						  'area'   => 'password'
-						);
 		
 		if ( $this->settings['auth_allow_dnames'] == 1 AND $this->memberData['g_dname_changes'] > 0 )
 		{
@@ -128,13 +145,51 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 							  'area'   => 'displayname'
 							);
 		}
-
-		$array[] = array( 'url'    => 'area=notes',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_notes'],
-						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'notes' ? 1 : 0,
-						  'area'   => 'notes'
-						);
-
+		
+		$sig_restrictions	= explode( ':', $this->memberData['g_signature_limits'] );
+		
+		if ( ! $sig_restrictions[0] OR ( $sig_restrictions[0] AND $this->memberData['g_sig_unit'] ) )
+		{
+			$array[] = array( 'url'    => 'area=signature',
+							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_sig_info'],
+							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'signature' ? 1 : 0,
+							  'area'   => 'signature'
+							  );
+		}
+		
+		$array[] = array( 'url'    => 'area=ignoredusers',
+						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_ignore_users'],
+						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'ignoredusers' ? 1 : 0,
+						  'area'   => 'ignoredusers'
+						 );
+						
+		if ( IPSLib::fbc_enabled() === TRUE )
+		{
+			$array[] = array( 'url'    => 'area=facebook',
+							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_facebook'],
+							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'facebook' ? 1 : 0,
+							  'area'   => 'facebook'
+							 );
+		}
+		
+		if ( IPSLib::twitter_enabled() === TRUE )
+		{
+			$array[] = array( 'url'    => 'area=twitter',
+							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_twitter'],
+							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'twitter' ? 1 : 0,
+							  'area'   => 'twitter'
+							 );
+		}
+		
+		if ( IPSLib::vkontakte_enabled() === TRUE )
+		{
+			$array[] = array( 'url'    => 'area=vkontakte',
+							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_vkontakte'],
+							  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'vkontakte' ? 1 : 0,
+							  'area'   => 'vkontakte'
+							 );
+		}
+		
 		if ( $this->memberData['g_attach_max'] != -1 )
 		{
 			$array[] = array(
@@ -144,17 +199,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 							'area'   => 'attachments'
 							);
 		}
-		
-		if( IPSLib::haveAppsWithLike() )
-		{
-			$array[] = array(
-							'url'    => 'area=likes',
-							'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_likesystem'],
-							'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'likes' ? 1 : 0,
-							'area'   => 'likes'
-							);
-		}
-		
+
 		$array[] = array( 'url'    => 'area=notifications',
 						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_notifications'],
 						  'active' => $this->request['tab'] == 'core' && $this->request['area'] == 'notifications' ? 1 : 0,
@@ -200,6 +245,27 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 
 		switch( $currentArea )
 		{
+			case 'removeIgnoredUser':
+				return $this->customEvent_removeIgnoredUser();
+			break;
+			case 'toggleIgnoredUser':
+				return $this->customEvent_toggleIgnoredUser();
+			break;
+			case 'facebookSync':
+				$html = $this->customEvent_facebookSync();
+			break;
+			case 'facebookRemove':
+				$html = $this->customEvent_facebookRemove();
+			break;
+			case 'vkontakteRemove':
+				$html = $this->customEvent_vkontakteRemove();
+			break;
+			case 'twitterRemove':
+				$html = $this->customEvent_twitterRemove();
+			break;
+			case 'facebookLink':
+				$html = $this->customEvent_facebookLink();
+			break;
 			case 'updateAttachments':
 				return $this->customEvent_updateAttachments();
 			break;
@@ -215,10 +281,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			case 'removeNotifications':
 				return $this->customEvent_removeNotifications();
 			break;
-
-			case 'moderateLikes':
-				return $this->customEvent_moderateLikeList();
-			break;
 		}
 
 		//-----------------------------------------
@@ -233,119 +295,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 
 		return $html;
 	}
-	
-	/**
-	 * Moderate your list of liked content
-	 *
-	 * @author	bfarber
-	 * @return	string	HTML to display
-	 */
-	public function customEvent_moderateLikeList()
-	{
-		//-----------------------------------------
-		// Get the likes we selected
-		//-----------------------------------------
-		
-		$_likes	= array();
-		
-		if( is_array($this->request['likes']) AND count($this->request['likes']) )
-		{
-			foreach( $this->request['likes'] as $_like )
-			{
-				$_thisLike	= explode( '-', $_like );
-				$_likes[]	= array(
-									'app'	=> $_thisLike[0],
-									'area'	=> $_thisLike[1],
-									'id'	=> $_thisLike[2],
-									);
-			}
-		}
-		
-		//-----------------------------------------
-		// Got any?
-		//-----------------------------------------
-		
-		if( !count($_likes) OR !is_array($_likes) )
-		{
-			return $this->showLikeList( $this->lang->words['no_likes_for_del'] );
-		}
-		
-		//-----------------------------------------
-		// Get like helper class
-		//-----------------------------------------
-		
-		$bootstraps		= array();
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );
-		
-		//-----------------------------------------
-		// Loop over and moderate
-		//-----------------------------------------
-		
-		foreach( $_likes as $_like )
-		{
-			$_bootstrap		= classes_like::bootstrap( $_like['app'], $_like['area'] );
-			$_likeKey		= classes_like_registry::getKey( $_like['id'], $this->memberData['member_id'] );
-			$_frequencies	= $_bootstrap->allowedFrequencies();
-
-			//-----------------------------------------
-			// What action to take?
-			//-----------------------------------------
-			
-			switch( $this->request['modaction'] )
-			{
-				case 'delete':
-					$_bootstrap->remove( $_like['id'], $this->memberData['member_id'] );
-				break;
-
-				case 'change-donotify':
-					$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'immediate' ), "like_id='" . addslashes($_likeKey) . "'" );
-				break;
-
-				case 'change-donotnotify':
-					$this->DB->update( 'core_like', array( 'like_notify_do' => 0 ), "like_id='" . addslashes($_likeKey) . "'" );
-				break;
-
-				case 'change-immediate':
-					if( in_array( 'immediate', $_frequencies ) )
-					{
-						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'immediate' ), "like_id='" . addslashes($_likeKey) . "'" );
-					}
-				break;
-
-				case 'change-offline':
-					if( in_array( 'offline', $_frequencies ) )
-					{
-						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'offline' ), "like_id='" . addslashes($_likeKey) . "'" );
-					}
-				break;
-				
-				case 'change-daily':
-					if( in_array( 'daily', $_frequencies ) )
-					{
-						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'daily' ), "like_id='" . addslashes($_likeKey) . "'" );
-					}
-				break;
-				
-				case 'change-weekly':
-					if( in_array( 'weekly', $_frequencies ) )
-					{
-						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'weekly' ), "like_id='" . addslashes($_likeKey) . "'" );
-					}
-				break;
-
-				case 'change-anon':
-					$this->DB->update( 'core_like', array( 'like_is_anon' => 1 ), "like_id='" . addslashes($_likeKey) . "'" );
-				break;
-
-				case 'change-noanon':
-					$this->DB->update( 'core_like', array( 'like_is_anon' => 0 ), "like_id='" . addslashes($_likeKey) . "'" );
-				break;
-			}
-		}
-
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=core&amp;area=likes&amp;confirm=1" );
-	}
 
 	/**
 	 * Delete attachments
@@ -518,7 +467,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 				}
 				else
 				{
-					$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=usercp&amp;tab=notificationlog" );
+					$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" );
 				}
 			}
 	
@@ -531,7 +480,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 				}
 				else
 				{
-					$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=usercp&amp;tab=notificationlog" );
+					$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" );
 				}
 			}
 			
@@ -558,9 +507,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		}
 		else
 		{
-			$_returnTo	= $_SERVER['HTTP_REFERER'] ? $_SERVER['HTTP_REFERER'] : $this->settings['base_url'];
-			
-			$this->registry->output->silentRedirect( $_returnTo );
+			$this->registry->output->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" );
 		}
 	}
 	
@@ -637,7 +584,271 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		$this->_nav[] = array( $this->lang->words['m_arch_notify'], 'app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog' );
 		return $this->registry->getClass('output')->getTemplate('ucp')->showNotification( $notification );
 	}
+	
+	/**
+	 * Custom Event: Remove Twitter link
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_twitterRemove()
+	{
+		//-----------------------------------------
+		// Check secure hash...
+		//-----------------------------------------
+		
+		if ( $this->request['secure_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// Okay... 
+		//-----------------------------------------
+		
+		if ( $this->memberData['twitter_id'] )
+		{
+			/* Remove the link */
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'twitter_id' => 0, 'twitter_token' => '', 'twitter_secret' => '' ) ) );
+		}
+		
+		/* Log the user out */
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
+	}
+	
+	/**
+	 * Custom Event: Remove facebook link
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_vkontakteRemove()
+	{
+		//-----------------------------------------
+		// Check secure hash...
+		//-----------------------------------------
+		
+		if ( $this->request['secure_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
+		}
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+		$vkontakte    = new $classToLoad( $this->registry );
+			
+		//-----------------------------------------
+		// Okay...
+		//-----------------------------------------
+		
+		if ( $this->memberData['vk_uid'] )
+		{
+			/* Remove the link */
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'vk_uid' => 0, 'vk_token' => '' ) ) );
+		}
+		
+		/* Log the user out */
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
+	}
+	
+	/**
+	 * Custom Event: Create facebook link
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_facebookLink()
+	{
+		//-----------------------------------------
+		// Check secure hash...
+		//-----------------------------------------
+		
+		if ( $this->request['secure_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
+		}
+		
+		/* Load application */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+		$facebook    = new $classToLoad( $this->registry );
+		
+		try
+		{
+			$facebook->linkMember( $this->memberData['member_id'] );
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+		
+			switch( $msg )
+			{
+				default:
+				case 'NO_FACEBOOK_USER_LOGGED_IN':
+				case 'ALREADY_LINKED':
+					$this->registry->getClass('output')->showError( 'fbc_authorization_screwup', 1005.99, null, null, 403 );
+				break;
+			}
+		}
+		
+		//-----------------------------------------
+		// Return
+		//-----------------------------------------
 
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=core&amp;area=facebook&amp;do=show" );
+	}
+	
+	/**
+	 * Custom Event: Remove facebook link
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_facebookRemove()
+	{
+		//-----------------------------------------
+		// Check secure hash...
+		//-----------------------------------------
+		
+		if ( $this->request['secure_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
+		}
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+		$facebook    = new $classToLoad( $this->registry );
+			
+		//-----------------------------------------
+		// Okay...
+		//-----------------------------------------
+		
+		if ( $this->memberData['fb_uid'] )
+		{
+			/* Unauthorize application */
+			$facebook->revokeAuthorization();
+						
+			/* Remove the link */
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'fb_uid' => 0, 'fb_emailhash' => '', 'fb_token' => '', 'fb_lastsync' => 0 ) ) );
+		}
+		
+		/* Log the user out */
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
+	}
+	
+	/**
+	 * Custom Event: Sync up facebook
+	 * NO LONGER USED. LEFT FOR FIX CONFIRMATION
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_facebookSync()
+	{
+		if ( IPSLib::fbc_enabled() === TRUE )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$facebook    = new $classToLoad( $this->registry );
+			
+			try
+			{
+				$facebook->syncMember( $this->memberData );
+			}
+			catch( Exception $error )
+			{
+				$msg = $error->getMessage();
+				
+				switch( $msg )
+				{
+					case 'NOT_LINKED':
+					case 'NO_MEMBER':
+					default:
+						$this->registry->getClass('output')->showError( 'fbc_authorization_screwup', 1005, null, null, 403 );
+					break;
+				}
+			}
+			
+			//-----------------------------------------
+			// Return
+			//-----------------------------------------
+
+			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=core&amp;area=facebook&amp;do=show" );
+		}
+	}
+	
+	/**
+	 * Custom Event: Run the find user tool
+	 *
+	 * @return	@e void  
+	 */
+	public function customEvent_toggleIgnoredUser()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$member_id = intval( $this->request['id'] );
+		$field	   = $this->request['field'];
+		$update    = array();
+		
+		//-----------------------------------------
+		// Grab user
+		//-----------------------------------------
+		
+		$ignoredUser = $this->DB->buildAndFetch( array( 'select' => '*',
+														'from'   => 'ignored_users',
+													    'where'  => 'ignore_ignore_id=' . $member_id . ' AND ignore_owner_id=' . $this->memberData['member_id'] ) );
+														
+		if ( $ignoredUser['ignore_id'] )
+		{
+			switch( $field )
+			{
+				default:
+				case 'topics':
+					$update = array( 'ignore_topics' => ( $ignoredUser['ignore_topics'] == 1 ) ? 0 : 1 );
+				break;
+				case 'messages':
+					$update = array( 'ignore_messages' => ( $ignoredUser['ignore_messages'] == 1 ) ? 0 : 1 );
+				break;
+				case 'signatures':
+					$update = array( 'ignore_signatures' => ( $ignoredUser['ignore_signatures'] == 1 ) ? 0 : 1 );
+				break;
+				case 'chats':
+					$update = array( 'ignore_chats' => ( $ignoredUser['ignore_chats'] == 1 ) ? 0 : 1 );
+				break;
+			}
+			
+			//-----------------------------------------
+			// Update
+			//-----------------------------------------
+
+			$this->DB->update( 'ignored_users', $update, 'ignore_id=' . $ignoredUser['ignore_id'] );
+		
+			/* Rebuild cache */
+			IPSMember::rebuildIgnoredUsersCache( $this->memberData );
+		}
+	
+		//-----------------------------------------
+		// Return
+		//-----------------------------------------
+		
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=core&amp;area=ignoredusers&amp;do=show" );
+	}
+	
+	/**
+	 * Custom event: Remove ignored user
+	 *
+	 * @author	Matt Mecham
+	 * @return	string		Processed HTML
+	 */
+	public function customEvent_removeIgnoredUser()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$removeID = intval( $this->request['id'] );
+		
+		$this->DB->delete( 'ignored_users', 'ignore_owner_id=' . $this->memberData['member_id'] . ' AND ignore_ignore_id=' . $removeID );
+ 		
+		/* Rebuild cache */
+		IPSMember::rebuildIgnoredUsersCache( $this->memberData );
+		
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=core&amp;area=ignoredusers&amp;do=show" );
+	}
+	
 	/**
 	 * UserCP Form Show
 	 *
@@ -655,14 +866,32 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		switch( $current_area )
 		{
 			default:
-			case 'settings':
-				return $this->showFormSettings();
+			case 'profileinfo':
+				return $this->formProfileInfo();
+			break;
+			case 'signature':
+				return $this->formSignature();
+			break;
+			case 'photo':
+				return $this->formPhoto();
+			break;
+			case 'ignoredusers':
+				return $this->formIgnoredUsers();
+			break;
+			case 'facebook':
+				return $this->formFacebook();
+			break;
+			case 'twitter':
+				return $this->formTwitter();
+			break;
+			case 'vkontakte':
+				return $this->formVkontakte();
+			break;
+			case 'customize':
+				return $this->formCustomize();
 			break;
 			case 'email':
-				return $this->showFormEmail();
-			break;
-			case 'password':
-				return $this->showFormPassword();
+				return $this->showFormEmailPassword();
 			break;
 			case 'displayname':
 				return $this->showFormDisplayname();
@@ -670,83 +899,562 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			case 'attachments':
 				return $this->showFormAttachments();
 			break;
-			case 'notes':
-				return $this->showFormNotes();
-			break;
 			case 'notifications':
 				return $this->showFormNotifications();
 			break;
 			case 'notificationlog':
 				return $this->showInlineNotifications();
 			break;
-			case 'likes':
-				return $this->showLikeList();
-			break;
 		}
 	}
 	
 	/**
-	 * Show the logged inline notifications
+	 * Show the customization form
 	 *
-	 * @author	Brandon Farber
-	 * @param	string		Error message
+	 * @author	Matt Mecham
+	 * @param	string		Any inline message to show
 	 * @return	string		Processed HTML
 	 */
-	public function showLikeList( $error='' )
+	public function formCustomize( $inlineMsg='' )
 	{
-		/* Init */
-		$start		= intval( $this->request['st'] );
-		$perPage	= 50;
-
-		//-----------------------------------------
-		// Turn off normal form
-		//-----------------------------------------
+		/* Allow uploads */
+		$this->uploadFormMax = 10000 * 1024;
 		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// Get like helper class
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );
-		
-		//-----------------------------------------
-		// Get list of items user likes
-		//-----------------------------------------
-		
-		$_likes	= array();
-		
-		$count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as er',
-										  		  'from'   => 'core_like',
-										  		  'where'  => 'like_member_id=' . $this->memberData['member_id'] ) );
-		
-		$this->DB->build( array( 'select' => '*',
-								 'from'   => 'core_like',
-								 'where'  => 'like_member_id=' . $this->memberData['member_id'],
-								 'limit'  => array( $start, $perPage ),
-								 'order'  => 'like_added DESC' ) );
-		$outer	= $this->DB->execute();
-		
-		while( $r = $this->DB->fetch($outer) )
-		{
-			$_likes[ $r['like_id'] ] = $r;
+		if ( ! $this->memberData['gbw_allow_customization'] OR $this->memberData['bw_disable_customization'] )
+		{		
+			$this->registry->getClass('output')->showError( 'no_permission', 1005.5 );
 		}
 		
-		/* Process */
-		$_likes = classes_like_meta::get( $_likes );
+		/* Grab current options */
+		$options = unserialize( $this->memberData['pp_customization'] );
+		$options = is_array( $options ) ? $options : array();
 		
-		$pages = $this->registry->getClass('output')->generatePagination( array(  'totalItems'         => $count['er'],
-														   					 	  'itemsPerPage'       => $perPage,
-																				  'currentStartValue'  => $start,
-																				  'baseUrl'            => "app=core&amp;module=usercp&amp;tab=core&amp;area=likes" ) );
-																		  
+		/* Build input */
+		foreach( $options as $k => $v )
+		{
+			$input[ $k ] = ( $this->request[ $k ] ) ? $this->request[ $k ] : $v;
+		}
+		
+		/* Figure out preview URL */
+		if ( $options['type'] == 'url' AND $options['bg_url'] )
+		{
+			$input['_preview'] = $options['bg_url'];
+		}
+		else if ( $options['type'] == 'upload' AND $options['bg_url'] )
+		{
+			$input['_preview'] = $this->settings['upload_url'] . '/' . $options['bg_url'];
+			$input['bg_url']   = '';
+		}
+		
+		/* Show form */
+		return $this->registry->getClass('output')->getTemplate('ucp')->membersProfileCustomize( $options, $input, $inlineMsg );
+	}
+
+	/**
+	 * Show the vkontakte form
+	 *
+	 * @author	Matt Mecham
+	 * @param	string		Any inline message to show
+	 * @return	string		Processed HTML
+	 */
+	public function formVkontakte( $inlineMsg='' )
+	{
 		//-----------------------------------------
-		// Send to template
+		// INIT
 		//-----------------------------------------
 		
-		return $this->registry->getClass('output')->getTemplate('ucp')->likesList( $_likes, $error, $pages );
+		if( !IPSLib::vkontakte_enabled() )
+		{		
+			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.1 );
+		}
+		
+		//-----------------------------------------
+		// Twitter user logged in?
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+		$vkontakte	 = new $classToLoad( $this->registry, $this->memberData['vk_token'], $this->memberData['vk_uid'] );
+		
+		//-----------------------------------------
+		// Thaw bitfield options
+		//-----------------------------------------
+		
+		$bwOptions = IPSBWOptions::thaw( $this->memberData['vk_bwoptions'], 'vkontakte' );
+		
+		//-----------------------------------------
+		// Merge..
+		//-----------------------------------------
+		
+		if ( is_array( $bwOptions ) )
+		{
+			foreach( $bwOptions as $k => $v )
+			{
+				$this->memberData[ $k ] = $v;
+			}
+		}
+		
+		$this->hide_form_and_save_button = 1;
+
+		$userData = $vkontakte->fetchUserData();
+		
+		if ( isset( $userData['status']['text'] ) )
+		{	
+			if ( IPS_DOC_CHAR_SET != 'UTF-8' )
+			{
+				$userData['status']['text'] = IPSText::utf8ToEntities( $userData['status']['text'] );
+			}
+		}
+		
+		return $this->registry->getClass('output')->getTemplate('vkontakte')->membersVkontakteConnect( $this->memberData['vk_uid'], $userData );
 	}
 	
+	/**
+	 * Show the twitter form
+	 *
+	 * @author	Matt Mecham
+	 * @param	string		Any inline message to show
+	 * @return	string		Processed HTML
+	 */
+	public function formTwitter( $inlineMsg='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		if( !IPSLib::twitter_enabled() )
+		{		
+			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.1 );
+		}
+		
+		//-----------------------------------------
+		// Twitter user logged in?
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+		$twitter	 = new $classToLoad( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
+		
+		//-----------------------------------------
+		// Thaw bitfield options
+		//-----------------------------------------
+		
+		$bwOptions = IPSBWOptions::thaw( $this->memberData['tc_bwoptions'], 'twitter' );
+		
+		//-----------------------------------------
+		// Merge..
+		//-----------------------------------------
+		
+		if ( is_array( $bwOptions ) )
+		{
+			foreach( $bwOptions as $k => $v )
+			{
+				$this->memberData[ $k ] = $v;
+			}
+		}
+		
+		if( ! $twitter->isConnected() )
+		{
+			$this->hide_form_and_save_button = 1;
+		}
+		
+		$userData = $twitter->fetchUserData();
+		
+		if ( isset( $userData['status']['text'] ) )
+		{	
+			if ( IPS_DOC_CHAR_SET != 'UTF-8' )
+			{
+				$userData['status']['text'] = IPSText::utf8ToEntities( $userData['status']['text'] );
+			}
+			
+			/* Make safe */
+			$userData['status']['text'] = str_replace( array( '<', '>' ), array( '&lt;', '&gt;' ), $userData['status']['text'] );
+		}
+		
+		return $this->registry->getClass('output')->getTemplate('ucp')->membersTwitterConnect( $twitter->isConnected(), $userData );
+	}
+	
+	
+	/**
+	 * Show the member form
+	 *
+	 * @author	Matt Mecham
+	 * @param	string		Any inline message to show
+	 * @return	string		Processed HTML
+	 */
+	public function formFacebook( $inlineMsg='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		if( !IPSLib::fbc_enabled() )
+		{		
+			$this->registry->getClass('output')->showError( 'fbc_disabled', 1005.2 );
+		}
+		
+		//-----------------------------------------
+		// Shut off save button if not associated yet
+		//-----------------------------------------
+		
+		if( !$this->memberData['fb_uid'] )
+		{
+			$this->hide_form_and_save_button	= true;
+			$userData							= array();
+			$linkedMemberData					= array();
+			$perms								= array();
+		}
+		else
+		{
+			//-----------------------------------------
+			// FB user logged in?
+			//-----------------------------------------
+			
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$facebook    = new $classToLoad( $this->registry );
+			
+			/* Now get the linked user */
+			$linkedMemberData = IPSMember::load( intval($this->memberData['fb_uid']), 'all', 'fb_uid' );
+			
+			$userData = $facebook->fetchUserData();
+							
+			/* Email */
+			$perms['email']          = $facebook->fetchHasAppPermission( 'email' );
+			
+			/* Publish Stream */
+			$perms['publish_stream'] = $facebook->fetchHasAppPermission( 'publish_stream' );
+			
+			/* Read stream */
+			$perms['read_stream']    = $facebook->fetchHasAppPermission( 'read_stream' );
+			
+			/* Offline access */
+			$perms['offline_access'] = $facebook->fetchHasAppPermission( 'offline_access' );
+			
+			
+			//-----------------------------------------
+			// Thaw bitfield options
+			//-----------------------------------------
+			
+			$bwOptions = IPSBWOptions::thaw( $this->memberData['fb_bwoptions'], 'facebook' );
+			
+			//-----------------------------------------
+			// Merge..
+			//-----------------------------------------
+			
+			if ( is_array( $bwOptions ) )
+			{
+				foreach( $bwOptions as $k => $v )
+				{
+					$this->memberData[ $k ] = $v;
+				}
+			}
+			
+			//-----------------------------------------
+			// Able to update status?
+			//-----------------------------------------
+	
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
+			$this->registry->setClass( 'memberStatus', new $classToLoad( $this->registry ) );
+			
+			$this->registry->memberStatus->setAuthor( $this->memberData );
+			$this->memberData['can_updated_status'] = $this->registry->memberStatus->canCreate();
+			
+			$_updates = $facebook->fetchUserTimeline( $userData['id'], 0, true );
+						
+			/* Got any? */
+			if ( count( $_updates ) )
+			{
+				$update = array_shift( $_updates );
+				
+				if ( count( $update ) AND is_array( $update ) )
+				{
+					$userData['status'] = $update;
+				}
+			}
+			
+			if ( is_array( $userData ) AND $userData['status']['message'] AND IPS_DOC_CHAR_SET != 'UTF-8' )
+			{
+				$userData['status']['message'] = IPSText::utf8ToEntities( $userData['status']['message'] );
+			}
+			
+			/* Make safe */
+			$userData['status']['message'] = str_replace( array( '<', '>' ), array( '&lt;', '&gt;' ), $userData['status']['message'] );
+		}
+		
+		return $this->registry->getClass('output')->getTemplate('ucp')->membersFacebookConnect( trim($this->memberData['fb_uid']), $userData, $linkedMemberData, $perms );
+	}
+	
+	/**
+	 * Show the ignored users
+	 *
+	 * @author	Matt Mecham
+	 * @return	string		Processed HTML
+	 */
+	public function formIgnoredUsers()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$final_users  = array();
+ 		$temp_users   = array();
+ 		$uid          = intval( $this->request['uid'] );
+		$ignoredUsers = array();
+		
+ 		//-----------------------------------------
+ 		// Do we have incoming?
+ 		//-----------------------------------------
+ 		
+ 		if ( $uid )
+ 		{
+ 			$newmem = IPSMember::load( $uid );
+
+ 			$this->request['newbox_1']	= $newmem['members_display_name'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get ignored users
+ 		//-----------------------------------------
+ 		
+		$this->DB->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => 'ignore_owner_id=' . $this->memberData['member_id'] ) );
+ 		$this->DB->execute();
+
+		while( $row = $this->DB->fetch() )
+		{
+			$ignoredUsers[ $row['ignore_ignore_id'] ] = $row;
+		}
+ 		
+ 		//-----------------------------------------
+ 		// Get members and check to see if they've
+ 		// since been moved into a group that cannot
+ 		// be ignored
+ 		//-----------------------------------------
+ 		
+ 		foreach( $ignoredUsers as $_id => $data )
+ 		{
+ 			if ( intval($_id) )
+ 			{
+ 				$temp_users[] = $_id;
+ 			}
+ 		}
+ 		
+ 		if ( count($temp_users) )
+ 		{
+ 			$members = IPSMember::load( $temp_users, 'all' );
+		
+ 			foreach( $members as $m )
+ 			{
+ 				$m['g_title'] = IPSMember::makeNameFormatted( $this->caches['group_cache'][ $m['member_group_id'] ]['g_title'], $m['member_group_id'] );
+ 				
+ 				$final_users[ $m['member_id'] ] = IPSMember::buildDisplayData( $m );
+				$final_users[ $m['member_id'] ]['ignoreData'] = $ignoredUsers[ $m['member_id'] ];
+ 			}
+ 		}
+
+ 		$this->request['newbox_1'] = $this->request['newbox_1'] ? $this->request['newbox_1'] : '';
+ 		
+ 		return $this->registry->getClass('output')->getTemplate('ucp')->membersIgnoredUsersForm( $final_users );
+	}
+	
+	
+	/**
+	 * Show the signature page
+	 *
+	 * @author	Matt Mecham
+	 * @return	string		Processed HTML
+	 */
+	public function formSignature()
+	{
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		//-----------------------------------------
+		// Check to make sure that we can edit profiles..
+		//-----------------------------------------
+		
+		$sig_restrictions = explode( ':', $this->memberData['g_signature_limits'] );
+		
+		if ( ! $this->memberData['g_edit_profile'] OR ( $sig_restrictions[0] AND ! $this->memberData['g_sig_unit'] ) )
+		{
+			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1024, null, null, 403 );
+		}
+		
+		/* Signature Limits */
+	 	if ( $sig_restrictions[0] AND $this->memberData['g_sig_unit'] )
+		{
+			if ( $this->memberData['gbw_sig_unit_type'] )
+			{
+				/* days */
+				if ( $this->memberData['joined'] > ( time() - ( 86400 * $this->memberData['g_sig_unit'] ) ) )
+				{
+					$this->hide_form_and_save_button = 1;
+					$form['_noPerm'] = sprintf( $this->lang->words['sig_group_restrict_date'], $this->lang->getDate( $this->memberData['joined'] + ( 86400 * $this->memberData['g_sig_unit'] ), 'long' ) );
+				}
+			}
+			else
+			{
+				/* Posts */
+				if ( $this->memberData['posts'] < $this->memberData['g_sig_unit'] )
+				{
+					$this->hide_form_and_save_button = 1;
+					$form['_noPerm'] = sprintf( $this->lang->words['sig_group_restrict_posts'], $this->memberData['g_sig_unit'] - $this->memberData['posts'] );
+				}
+			}
+			
+			if( $form['_noPerm'] )
+			{
+				return $this->registry->getClass('output')->getTemplate('ucp')->membersSignatureFormError( $form );
+			}
+		}
+	
+ 		//-----------------------------------------
+ 		// Set max length
+ 		//-----------------------------------------
+
+ 		$current_sig	= '';
+ 		$t_sig			= '';
+ 		
+		/* Set content in editor */
+		$this->editor->setContent( $this->memberData['signature'] );
+		
+		/* Current signature preview */
+		IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
+		IPSText::getTextClass('bbcode')->parse_smilies				= 0;
+		IPSText::getTextClass('bbcode')->parse_html					= $this->caches['group_cache'][ $this->memberData['member_group_id'] ]['g_dohtml'];
+		IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
+		IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
+		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
+		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];				
+
+		$signature	= IPSText::getTextClass('bbcode')->preDisplayParse( $this->memberData['signature'] );
+
+	
+		return $this->registry->getClass('output')->getTemplate('ucp')->membersSignatureForm( $this->editor->show( 'Post', array( 'noSmilies' => true ) ), $sig_restrictions, $signature );
+	}
+
+	
+	/**
+	 * Show the profile information
+	 *
+	 * @author	Matt Mecham
+	 * @return	string		Processed HTML
+	 */
+	public function formProfileInfo()
+	{
+		/* Load Lang File */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
+		
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		/* INIT */
+	 	$required_output = "";
+		$optional_output = "";
+		
+		/* Permission Check */
+		if( ! $this->memberData['g_edit_profile'] )
+		{
+			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1026, null, null, 403 );
+		}
+		
+		/* Format the birthday drop boxes.. */
+		$date = getdate();
+		
+		$day   = array();
+		$mon   = array();
+		$year  = array();
+		$times = array();
+		
+		/* Build the day options */
+		$day[] = array( '0', '--' );
+		for ( $i = 1 ; $i < 32 ; $i++ )
+		{
+			$day[] = array( $i, $i );			
+		}
+		
+		/* Build the month options */
+		$mon[] = array( '0', '--' );
+		for( $i = 1 ; $i < 13 ; $i++ )
+		{
+			$mon[] = array( $i, $this->lang->words['M_' . $i ] );
+		}
+		
+		/* Build the years options */
+		$i = $date['year'] - 1;
+		$j = $date['year'] - 100;
+		
+		$year[] = array( '0', '--' );
+		for( $i ; $j < $i ; $i-- )
+		{
+			$year[] = array( $i, $i );
+		}
+	
+		/* Custom Fields */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields      = new $classToLoad();
+		
+		$fields->member_data = $this->member->fetchMemberData();
+		$fields->initData( 'edit' );
+		$fields->parseToEdit();
+		
+		$field_output = array();
+		
+		if ( count( $fields->out_fields ) )
+		{
+			foreach( $fields->out_fields as $id => $element )
+			{
+				$data = $fields->cache_data[ $id ];
+				$field_output[ $data['pf_group_key'] ][ $id ] = array(
+																		'field' => $this->registry->getClass('output')->getTemplate('ucp')->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $fields->out_fields[ $id ], $id ),
+																		'required' => $data['pf_not_null']
+																	);
+			}
+																		
+			/*foreach( $fields->out_fields as $id => $data )
+	    	{
+	    		if ( $fields->cache_data[ $id ]['pf_not_null'] == 1 )
+				{
+					$ftype = 'required_output';
+				}
+				else
+				{
+					$ftype = 'optional_output';
+				}
+
+				${$ftype} .= $this->registry->getClass('output')->getTemplate('ucp')->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $data, $id );
+	    	}*/
+		}
+		
+		/* About me */
+		$aboutme = $this->DB->buildAndFetch( array( 'select' => 'pp_about_me', 'from' => 'profile_portal', 'where' => 'pp_member_id=' . $this->memberData['member_id'] ) );
+	 	
+		/* Set content in editor */
+		$this->editor->setContent( $aboutme['pp_about_me'] );
+		
+		$amEditor = $this->editor->show( 'Post', array( 'noSmilies' => true, 'delayInit' => 1 ) );
+		
+		/* Times */
+		foreach ( $this->lang->words as $k => $v )
+		{
+			if ( strpos( $k, "time_" ) === 0 )
+			{
+				$k = str_replace( "time_", '', $k );
+
+				if( preg_match( '/^[\-\d\.]+$/', $k ) )
+				{
+					$times[ $k ]	= $v;
+				}
+			}
+		}
+
+		ksort( $times );
+		
+		/* Build and return the form */
+		$template = $this->registry->getClass('output')->getTemplate('ucp')->membersProfileForm( $field_output, $fields->fetchGroupTitles(), $day, $mon, $year, $amEditor, $times );
+
+		return $template;
+	}
+
 	/**
 	 * Show the logged inline notifications
 	 *
@@ -758,6 +1466,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	{
 		/* Init */
 		$start   = intval( $this->request['st'] );
+		$clear   = trim( $this->request['clear'] );
 		$perPage = 50;
 		
 		//-----------------------------------------
@@ -766,7 +1475,8 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		
 		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
 		$notifyLibrary		= new $classToLoad( $this->registry );
-				
+		$notifyLibrary->setMember( $this->memberData );	
+			
 		//-----------------------------------------
 		// Turn off normal form
 		//-----------------------------------------
@@ -778,6 +1488,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		//-----------------------------------------
 		
 		$_notifications	= array();
+		$mids			= array();
 		
 		$count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as er',
 										  		  'from'   => 'inline_notifications',
@@ -788,20 +1499,47 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 								 'where'  => 'notify_to_id=' . $this->memberData['member_id'],
 								 'limit'  => array( $start, $perPage ),
 								 'order'  => 'notify_sent DESC' ) );
-		$this->DB->execute();
+		$outer	= $this->DB->execute();
 		
-		while( $r = $this->DB->fetch() )
+		while( $r = $this->DB->fetch($outer) )
 		{
 			$r['notify_icon']	= $notifyLibrary->getNotificationIcon( $r['notify_type_key'] );
 			
 			$_notifications[]	= $r;
+
+			$mids[ $r['notify_from_id'] ] = $r['notify_from_id'];
 		}
-		
+
+		/* Get members */
+		if ( count( $mids ) )
+		{
+			$members = IPSMember::load( array_keys( $mids ), 'all' );
+			
+			if ( count( $members ) )
+			{
+				foreach( $_notifications as $key => $data )
+				{ 
+					if ( in_array( $data['notify_from_id'], array_keys( $members ) ) )
+					{
+						$_notifications[ $key ]['member'] = IPSMember::buildProfilePhoto( $members[ $data['notify_from_id'] ] );
+					}
+				}
+			}
+		}
+
 		$pages = $this->registry->getClass('output')->generatePagination( array(  'totalItems'         => $count['er'],
 														   					 	  'itemsPerPage'       => $perPage,
 																				  'currentStartValue'  => $start,
 																				  'baseUrl'            => "app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" ) );
 																		  
+		/* Clear them? - used in mobile skin */
+		if ( $clear == 'true' )
+		{
+			$this->DB->update( 'inline_notifications', array( 'notify_read' => 1 ), 'notify_to_id=' . $this->memberData['member_id'] );
+		
+			$notifyLibrary->rebuildUnreadCount();
+		}
+		
 		//-----------------------------------------
 		// Send to template
 		//-----------------------------------------
@@ -831,7 +1569,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		
 		$_basicOptions	= array( array( 'email', $this->lang->words['notopt__email'] ), array( 'pm', $this->lang->words['notopt__pm'] ), array( 'inline', $this->lang->words['notopt__inline'] ), array( 'mobile', $this->lang->words['notopt__mobile'] ) );
 		$_configOptions	= $notifyLibrary->getNotificationData( TRUE );
-		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig( $this->memberData );
 		$_defaultConfig	= $notifyLibrary->getDefaultNotificationConfig();
 		$_formOptions	= array();
 		
@@ -868,6 +1606,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			
 			$_formOptions[ $option['key'] ]					= array();
 			$_formOptions[ $option['key'] ]['key']			= $option['key'];
+			$_formOptions[ $option['key'] ]['app']			= $option['app'];
 			
 			//-----------------------------------------
 			// Rikki asked for this...
@@ -905,19 +1644,9 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		// Email settings...
 		//-----------------------------------------
 		
-		foreach( array('email_full', 'auto_track') as $k )
-		{
-			if ( $this->memberData[ $k ] )
-			{
-				$_emailData[ $k ] = 'checked="checked"';
-			}
-			else
-			{
-				$_emailData[ $k ] = '';
-			}
-		}
+		$_emailData['auto_track']	= $this->memberData['auto_track'] ? 'checked="checked"' : '';
 		
-		foreach( array( 'none', 'immediate', 'delayed', 'daily', 'weekly' ) as $_opt )
+		foreach( array( 'none', 'immediate', 'offline', 'daily', 'weekly' ) as $_opt )
 		{
 			$_emailData['trackOption'][ $_opt ] = ( $this->memberData['auto_track'] == $_opt ) ? 'selected="selected"' : '';
 		}
@@ -942,13 +1671,13 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
  		$perpage     = 15;
  		$sort_key    = "";
  		$attachments = array();
-
+		
 		$this->hide_form_and_save_button = 1;
-
+		
 		//-----------------------------------------
 		// Sort it
 		//-----------------------------------------
-
+		
  		switch ( $this->request['sort'] )
  		{
  			case 'date':
@@ -993,10 +1722,11 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
  		// Limit by forums
  		//-----------------------------------------
 
- 		$stats = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count, sum(attach_filesize) as sum',
+ 		$stats = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count, ' . $this->DB->buildCoalesce( array( 'sum(attach_filesize)', 0 ) ) . ' as sum',
  												  'from'   => 'attachments',
  												  'where'  => 'attach_member_id=' . $this->memberData['member_id'] . " AND attach_rel_module IN( 'post', 'msg' )" ) );
 
+ 		 		
  		if ( $maxspace > 0 )
  		{
 			//-----------------------------------------
@@ -1016,12 +1746,12 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			}
 
 			$info['attach_space_count'] = sprintf( $this->lang->words['attach_space_count'], intval($stats['count']), intval($info['full_percent']) );
-			$info['attach_space_used']  = sprintf( $this->lang->words['attach_space_used'] , IPSLib::sizeFormat(intval($stats['sum'])), IPSLib::sizeFormat($maxspace * 1024) );
+			$info['attach_space_used']  = sprintf( $this->lang->words['attach_space_used'] , IPSLib::sizeFormat($stats['sum']), IPSLib::sizeFormat($maxspace * 1024) );
  		}
  		else
  		{
  			$info['has_limit'] = 0;
- 			$info['attach_space_used']  = sprintf( $this->lang->words['attach_space_unl'] , IPSLib::sizeFormat(intval($stats['sum'])) );
+ 			$info['attach_space_used']  = sprintf( $this->lang->words['attach_space_unl'] , IPSLib::sizeFormat($stats['sum']) );
  		}
 
  		//-----------------------------------------
@@ -1038,94 +1768,73 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
  		// Get attachments...
  		//-----------------------------------------
 
- 		$this->DB->build( array(  'select'	=> 'a.*',
- 										'from'	=> array( 'attachments' => 'a' ),
- 										'where'	=> "a.attach_member_id=" . $this->memberData['member_id'] . " AND a.attach_rel_module IN( 'post', 'msg' )",
- 										'order'	=> $sort_key,
- 										'limit'	=> array( $start, $perpage ),
- 										'add_join'	=> array(
- 															array( 'select'	=> 'p.topic_id',
- 																	'from'	=> array( 'posts' => 'p' ),
- 																	'where'	=> 'p.pid=a.attach_rel_id',
- 																	'type'	=> 'left'
- 																),
- 															array( 'select'	=> 't.*',
- 																	'from'	=> array( 'topics' => 't' ),
- 																	'where'	=> 't.tid=p.topic_id',
- 																	'type'	=> 'left'
- 																) ) ) );
-    	$outer = $this->DB->execute();
-
-		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_topic'), 'forums' );
-
-		$cache = $this->cache->getCache('attachtypes');
-
-		while ( $row = $this->DB->fetch( $outer ) )
+		if( $stats['count'] )
 		{
-			if ( IPSMember::checkPermissions('read', $row['forum_id'] ) != TRUE )
+	 		$this->DB->build( array( 'select'	=> 'a.*',
+									 'from'		=> array( 'attachments' => 'a' ),
+									 'where'	=> "a.attach_member_id=" . $this->memberData['member_id'] . " AND a.attach_rel_module IN( 'post', 'msg' )",
+									 'order'	=> $sort_key,
+									 'limit'	=> array( $start, $perpage ),
+									 'add_join'	=> array(
+														array( 'select'	=> 'p.topic_id',
+																'from'	=> array( 'posts' => 'p' ),
+																'where'	=> 'p.pid=a.attach_rel_id',
+																'type'	=> 'left'
+															),
+														array( 'select'	=> 't.*',
+																'from'	=> array( 'topics' => 't' ),
+																'where'	=> 't.tid=p.topic_id',
+																'type'	=> 'left'
+															) )
+							 )		);
+	    	$outer = $this->DB->execute();
+	
+			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_topic' ), 'forums' );
+	
+			$cache = $this->cache->getCache('attachtypes');
+	
+			while ( $row = $this->DB->fetch( $outer ) )
 			{
-				$row['title'] = $this->lang->words['attach_topicmoved'];
+				if ( IPSMember::checkPermissions('read', $row['forum_id'] ) != TRUE )
+				{
+					$row['title'] = $this->lang->words['attach_topicmoved'];
+				}
+	
+				//-----------------------------------------
+				// Full attachment thingy
+				//-----------------------------------------
+	
+				if ( $row['attach_rel_module'] == 'post' )
+				{
+					$row['_type'] = 'post';
+				}
+				else if ( $row['attach_rel_module'] == 'msg' )
+				{
+					$row['_type'] = 'msg';
+					$row['title'] = $this->lang->words['attach_inpm'];
+				}
+	
+				/* IPB 2.x conversion */
+				$row['image']       = str_replace( 'folder_mime_types', 'mime_types', $cache[ $row['attach_ext'] ]['atype_img'] );
+				$row['short_name']  = IPSText::truncate( $row['attach_file'], 30 );
+				$row['attach_date'] = $this->registry->getClass( 'class_localization')->getDate( $row['attach_date'], 'SHORT' );
+				$row['real_size']   = IPSLib::sizeFormat( $row['attach_filesize'] );
+	
+				$attachments[]      = $row;
 			}
-
-			//-----------------------------------------
-			// Full attachment thingy
-			//-----------------------------------------
-
-			if ( $row['attach_rel_module'] == 'post' )
-			{
-				$row['_type'] = 'post';
-			}
-			else if ( $row['attach_rel_module'] == 'msg' )
-			{
-				$row['_type'] = 'msg';
-				$row['title'] = $this->lang->words['attach_inpm'];
-			}
-
-			/* IPB 2.x conversion */
-			$row['image']       = str_replace( 'folder_mime_types', 'mime_types', $cache[ $row['attach_ext'] ]['atype_img'] );
-			$row['short_name']  = IPSText::truncate( $row['attach_file'], 30 );
-			$row['attach_date'] = $this->registry->getClass( 'class_localization')->getDate( $row['attach_date'], 'SHORT' );
-			$row['real_size']   = IPSLib::sizeFormat( $row['attach_filesize'] );
-
-			$attachments[]      = $row;
 		}
 
     	return $this->registry->getClass('output')->getTemplate('ucp')->coreAttachments( $info, $pages, $attachments );
 	}
 
 	/**
-	 * Show the Password form
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function showFormPassword()
-	{
-		//-----------------------------------------
-    	// Do we have another URL for password resets?
-    	//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		$this->han_login   = new $classToLoad( $this->registry );
-    	$this->han_login->init();
-    	$this->han_login->checkMaintenanceRedirect();
-
-		if( $this->memberData['g_access_cp'] )
-		{
-			$this->hide_form_and_save_button	= true;
-		}
-
-		return $this->registry->getClass('output')->getTemplate('ucp')->passwordChangeForm();
-	}
-
-	/**
-	 * Show the Email form
+	 * Show the Email & Password form
 	 *
 	 * @author	Matt Mecham
 	 * @param	string		Returned error message (if any)
 	 * @return	string		Processed HTML
 	 */
-	public function showFormEmail( $_message='' )
+	public function showFormEmailPassword( $_message='' )
 	{
 		//-----------------------------------------
 		// Do not allow validating members to change
@@ -1147,18 +1856,13 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
     	$this->han_login->init();
     	$this->han_login->checkMaintenanceRedirect();
 
-		$txt = $this->lang->words['ce_current'] . $this->memberData['email'];
+		//$txt = $this->lang->words['ce_current'] . $this->memberData['email'];
 
  		if ( $this->settings['reg_auth_type'])
  		{
  			$txt .= $this->lang->words['ce_auth'];
  		}
-
- 		if ( $this->settings['bot_antispam_type'] != 'none' )
- 		{
-			$captchaHTML = $this->registry->getClass('class_captcha')->getTemplate();
-		}
-
+ 		
 		$_message = $_message ? $this->lang->words[$_message] : '';
 
 		if( $this->memberData['g_access_cp'] )
@@ -1166,7 +1870,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			$this->hide_form_and_save_button	= true;
 		}
 
- 		return $this->registry->getClass('output')->getTemplate('ucp')->emailChangeForm( $txt, $_message, $captchaHTML, $this->_isFBUser );
+ 		return $this->registry->getClass('output')->getTemplate('ucp')->emailPasswordChangeForm( $txt, $_message, $this->_isFBUser );
 	}
 
 	/**
@@ -1271,52 +1975,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		return $this->registry->getClass('output')->getTemplate('ucp')->displayNameForm( $form, $error, '', $this->_isFBUser );
 	}
 
-	/**
-	 * Show the Settings form
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function showFormSettings()
-	{
-		/* Sort the times */
-		$times		= array();
-
-		foreach( $this->lang->words as $k => $v )
-		{
-			if( strpos( $k, "time_" ) === 0 )
-			{
-				$k				= str_replace( "time_", '', $k );
-
-				if( preg_match( '/^[\-\d\.]+$/', $k ) )
-				{
-					$times[ $k ]	= $v;
-				}
-			}
-		}
-
-		ksort( $times );
-		//uksort( $this->lang->words, create_function( '$a, $b', '$a = str_replace( "time_", "", $a ); $b = str_replace( "time_", "", $b ); return $a > $b;' ) );
-
-		/* Show the form */
- 		return $this->registry->getClass('output')->getTemplate('ucp')->generalSettingsForm( $times );
-	}
-
-	/**
-	 * Show the Notes form
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function showFormNotes()
-	{
-		/* Show the form */
-		$member  = IPSMember::load( $this->memberData['member_id'], 'extendedProfile' );
-		$content = $member['notes'];
-
- 		return $this->registry->getClass('output')->getTemplate('ucp')->coreNotesForm( $content );
-	}
-
 	/**
 	 * UserCP Form Check
 	 *
@@ -1333,11 +1991,29 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		switch( $current_area )
 		{
 			default:
-			case 'settings':
-				return $this->saveFormSettings();
+			case 'profileinfo':
+				return $this->saveProfileInfo();
+			break;
+			case 'signature':
+				return $this->saveSignature();
+			break;
+			case 'photo':
+				return $this->savePhoto();
+			break;
+			case 'ignoredusers':
+				return $this->saveIgnoredUsers();
+			break;
+			case 'facebook':
+				return $this->saveFacebook();
+			break;
+			case 'twitter':
+				return $this->saveTwitter();
+			break;
+			case 'customize':
+				return $this->saveCustomize();
 			break;
 			case 'email':
-				return $this->saveFormEmail();
+				return $this->saveFormEmailPassword();
 			break;
 			case 'password':
 				return $this->saveFormPassword();
@@ -1345,15 +2021,632 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			case 'displayname':
 				return $this->saveFormDisplayname();
 			break;
-			case 'notes':
-				return $this->saveFormNotes();
-			break;
 			case 'notifications':
 				return $this->saveFormNotifications();
 			break;
 		}
 	}
 	
+	/**
+	 * UserCP Save Form: Customize
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveCustomize()
+	{
+		/* Init */
+		$errors   = array();
+		$custom   = array();
+		$bg_nix   = trim( $this->request['bg_nix'] );
+		$bg_url   = trim( $this->request['bg_url'] );
+		$bg_tile  = intval( $this->request['bg_tile'] );
+		$bg_color = trim( str_replace( '#', '', $this->request['bg_color'] ) );
+		
+		/* reset custom */
+		$custom   = unserialize( $this->memberData['pp_customization'] );
+		
+		/* Bug #21578 */
+		if( ! $bg_color && $custom['bg_color'] )
+		{
+			$bg_color = $custom['bg_color'];
+		}
+		
+		/* Delete all? */
+		if ( $bg_nix )
+		{
+			/* reset array */
+			$custom = array( 'bg_url' => '', 'type' => '', 'bg_color' => '', 'bg_tile' => '' );
+			
+			/* remove bg images */
+			IPSMember::getFunction()->removeUploadedBackgroundImages( $this->memberData['member_id'] );
+		}
+		else
+		{
+			if ( $bg_url AND $this->memberData['gbw_allow_url_bgimage'] )
+			{
+				/* Check */
+				if ( ! stristr( $bg_url, 'http://' ) OR preg_match( '#\(\*#', $bg_url ) )
+				{
+					return array( 0 => $this->lang->words['pp_bgimg_url_bad'] );
+				}
+				
+				$image_extension = strtolower( pathinfo( $bg_url, PATHINFO_EXTENSION ) );
+				
+				if( ! in_array( $image_extension, array( 'png', 'jpg', 'gif', 'jpeg'  ) ) )
+				{
+					return array( 0 => $this->lang->words['pp_bgimg_ext_bad'] );
+				}
+				
+				$custom['bg_url'] = $bg_url;
+				$custom['type']   = 'url';
+			}
+			else if ( $this->memberData['gbw_allow_upload_bgimage'] )
+			{
+				/* Load more lang strings */
+				$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
+		
+				/* Upload img */
+				$img = IPSMember::getFunction()->uploadBackgroundImage();
+		
+				if ( $img['status'] == 'fail' )
+				{
+					return array( 0 => $this->lang->words[ 'pp_' . $img['error'] ] );
+				}
+				else if ( $img['final_location'] )
+				{
+					$custom['bg_url'] = $img['final_location'];
+					$custom['type']   = 'upload';
+				}
+			}
+		}
+		
+		/* BG color */
+		$custom['bg_color'] = $bg_nix ? '' : IPSText::alphanumericalClean( $bg_color );
+		
+		/* Tile */
+		$custom['bg_tile']  = $bg_nix ? '' : $bg_tile;
+		
+		/* Save it */
+		if ( ! $this->memberData['bw_disable_customization'] AND $this->memberData['gbw_allow_customization'] )
+		{
+			IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pp_customization' => serialize( $custom ) ) ) );
+		}
+		
+		return TRUE;
+	}
+	
+	/**
+	 * UserCP Save Form: Twitter
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveTwitter()
+	{
+		if( !IPSLib::twitter_enabled() )
+		{		
+			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.2 );
+		}
+		
+		//-----------------------------------------
+		// Data
+		//-----------------------------------------
+		
+		$toSave = IPSBWOptions::thaw( $this->memberData['tc_bwoptions'], 'twitter' );
+		
+		//-----------------------------------------
+		// Loop and save... simple
+		//-----------------------------------------
+		
+		foreach( array( 'tc_s_pic', 'tc_s_status', 'tc_s_aboutme', 'tc_s_bgimg', 'tc_si_status' ) as $field )
+		{
+			$toSave[ $field ] = intval( $this->request[ $field ] );
+		}
+		
+		$this->memberData['tc_bwoptions'] = IPSBWOptions::freeze( $toSave, 'twitter' );		
+		$return = IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'tc_bwoptions' => $this->memberData['tc_bwoptions'] ) ) );
+		
+		//-----------------------------------------
+		// Now sync
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+		$twitter	 = new $classToLoad( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
+		
+		try
+		{
+			$twitter->syncMember( $this->memberData );
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+			
+			switch( $msg )
+			{
+				case 'NOT_LINKED':
+				case 'NO_MEMBER':
+				break;
+			}
+		}
+		
+		return TRUE;
+	}
+	
+	/**
+	 * UserCP Save Form: Facebook
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveFacebook()
+	{
+		if( !IPSLib::fbc_enabled() )
+		{		
+			$this->registry->getClass('output')->showError( 'fbc_disabled', 1005 );
+		}
+		
+		//-----------------------------------------
+		// Data
+		//-----------------------------------------
+		
+		$toSave = IPSBWOptions::thaw( $this->memberData['members_bitoptions'], 'members' );
+		
+		//-----------------------------------------
+		// Loop and save... simple
+		//-----------------------------------------
+		
+		foreach( array( 'fbc_s_pic', 'fbc_s_status', 'fbc_s_aboutme', 'fbc_si_status' ) as $field )
+		{
+			$toSave[ $field ] = intval( $this->request[ $field ] );
+		}
+		
+		$this->memberData['fb_bwoptions'] = IPSBWOptions::freeze( $toSave, 'facebook' );
+		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'fb_bwoptions' => $this->memberData['fb_bwoptions'] ) ) );
+		
+		//-----------------------------------------
+		// Now sync
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+		$facebook    = new $classToLoad( $this->registry );
+		
+		try
+		{
+			$facebook->syncMember( $this->memberData );
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+			
+			switch( $msg )
+			{
+				case 'NOT_LINKED':
+				case 'NO_MEMBER':
+				break;
+			}
+		}
+		
+		return TRUE;
+	}
+	
+	/**
+	 * UserCP Save Form: Ignore Users
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveIgnoredUsers()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$newName = $this->request['newbox_1'];
+		$dnvs    = intval( $this->request['donot_view_sigs'] );
+		
+		IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'view_sigs' => ( $dnvs ) ? 0 : 1 ) ) );
+		
+		if ( trim( $newName ) && $_POST['newbox_1'] != $this->lang->words['ucp_members_name'] )
+		{	
+			//-----------------------------------------
+			// Load
+			//-----------------------------------------
+			
+			$member = IPSMember::load( $newName, 'core', 'displayname' );
+			
+			if ( ! $member['member_id'] )
+			{
+				return array( 0 => $this->lang->words['ignoreuser_nomem'] );
+			}
+			
+			if ( $member['member_id'] == $this->memberData['member_id'] )
+			{
+				return array( 0 => $this->lang->words['ignoreuser_cannot'] );
+			}
+			
+			//-----------------------------------------
+			// Already ignoring?
+			//-----------------------------------------
+			
+			$ignoreMe = $this->DB->buildAndFetch( array( 
+														'select' => '*',
+														'from'   => 'ignored_users',
+														'where'  => 'ignore_owner_id=' . $this->memberData['member_id'] . ' AND ignore_ignore_id=' . $member['member_id'] 
+												)	 );
+			
+			if ( $ignoreMe['ignore_id'] )
+			{
+				return array( 0 => $this->lang->words['ignoreuser_already'] );
+			}
+			
+			//-----------------------------------------
+			// Can we ignore them?
+			//-----------------------------------------
+			
+			if ( $member['_canBeIgnored'] !== TRUE )
+			{
+				return array( 0 => $this->lang->words['ignoreuser_cannot'] );
+		 	}
+	
+			//-----------------------------------------
+			// Add it
+			//-----------------------------------------
+	
+			$this->DB->insert( 'ignored_users', array( 
+														'ignore_owner_id'	=> $this->memberData['member_id'],
+														'ignore_ignore_id'	=> $member['member_id'],
+														'ignore_messages'	=> !empty( $this->request['ignore_messages'] ) ? 1 : 0,
+														'ignore_topics'		=> !empty( $this->request['ignore_topics'] ) ? 1 : 0,
+														'ignore_signatures'	=> !empty( $this->request['ignore_signatures'] ) ? 1 : 0,
+														'ignore_chats'		=> !empty( $this->request['ignore_chats'] ) ? 1 : 0,
+													) 
+							);
+							
+			/* Rebuild cache */
+			IPSMember::rebuildIgnoredUsersCache( $this->memberData );
+		}
+		
+		return TRUE;
+	}
+	
+	
+	/**
+	 * UserCP Save Form: Signature
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveSignature()
+	{
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		//-----------------------------------------
+		// Check to make sure that we can edit profiles..
+		//-----------------------------------------
+
+		$sig_restrictions	= explode( ':', $this->memberData['g_signature_limits'] );
+		
+		if ( ! $this->memberData['g_edit_profile'] OR ( $sig_restrictions[0] AND ! $this->memberData['g_sig_unit'] ) )
+		{
+			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1028, null, null, 403 );
+		}
+
+		//-----------------------------------------
+		// Post process the editor
+		// Now we have safe HTML and bbcode
+		//-----------------------------------------
+		
+		$signature = $this->editor->process( $_POST['Post'] );
+
+		//-----------------------------------------
+		// Parse post
+		//-----------------------------------------
+		
+		IPSText::getTextClass( 'bbcode' )->parse_smilies    = 0;
+		IPSText::getTextClass( 'bbcode' )->parse_html       = $this->memberData['g_dohtml'];
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode     = 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'signatures';
+
+		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
+		$testSignature	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );		
+
+		if ( IPSText::getTextClass( 'bbcode' )->error )
+		{
+			$this->lang->loadLanguageFile( array( 'public_post' ), 'forums' );
+			
+			$this->registry->getClass('output')->showError( IPSText::getTextClass( 'bbcode' )->error, 10210 );
+		}
+		
+		//-----------------------------------------
+		// Signature restrictions...
+		//-----------------------------------------
+		
+		$sig_errors	= array();
+		
+		//-----------------------------------------
+		// Max number of images...
+		//-----------------------------------------
+		
+		if( isset($sig_restrictions[1]) and $sig_restrictions[1] !== '' )
+		{
+			if( mb_substr_count( mb_strtolower($signature), "[img]" ) > $sig_restrictions[1] )
+			{
+				$sig_errors[] = sprintf( $this->lang->words['sig_toomanyimages'], $sig_restrictions[1] );
+			}
+		}
+		
+		//-----------------------------------------
+		// Max number of urls...
+		//-----------------------------------------
+				
+		if( isset($sig_restrictions[4]) and $sig_restrictions[4] !== '' )
+		{
+			if( mb_substr_count( mb_strtolower($signature), "[url" ) > $sig_restrictions[4] )
+			{
+				$sig_errors[] = sprintf( $this->lang->words['sig_toomanyurls'], $sig_restrictions[4] );
+			}
+			else
+			{
+				preg_match_all( '#(^|\s|>)((http|https|news|ftp)://\w+[^\s\[\]\<]+)#is', $signature, $matches );
+				
+				if( count($matches[1]) > $sig_restrictions[4] )
+				{
+					$sig_errors[] = sprintf( $this->lang->words['sig_toomanyurls'], $sig_restrictions[4] );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Max number of lines of text...
+		//-----------------------------------------
+				
+		if( isset($sig_restrictions[5]) and $sig_restrictions[5] !== '' )
+		{
+			$this->settings['signature_line_length']	= $this->settings['signature_line_length'] > 0 ? $this->settings['signature_line_length'] : 200;
+
+			$testSig	= wordwrap( $signature, $this->settings['signature_line_length'], '<br />' );
+
+			if( substr_count( $testSig, "<br />" ) >= $sig_restrictions[5] )
+			{
+				$sig_errors[] = sprintf( $this->lang->words['sig_toomanylines'], $sig_restrictions[5] );
+			}
+		}
+		
+		//-----------------------------------------
+		// Now the crappy part..
+		//-----------------------------------------
+				
+		if( isset($sig_restrictions[2]) and $sig_restrictions[2] !== '' AND isset($sig_restrictions[3]) and $sig_restrictions[3] !== '' )
+		{
+			preg_match_all( '/\[img\](.+?)\[\/img\]/i', $signature, $allImages );
+
+			if( count($allImages[1]) )
+			{
+				foreach( $allImages[1] as $foundImage )
+				{
+					$imageProperties = @getimagesize( $foundImage );
+					
+					if( is_array($imageProperties) AND count($imageProperties) )
+					{
+						if( $imageProperties[0] > $sig_restrictions[2] OR $imageProperties[1] > $sig_restrictions[3] )
+						{
+							$sig_errors[] = sprintf( $this->lang->words['sig_imagetoobig'], $foundImage, $sig_restrictions[2], $sig_restrictions[3] );
+						}
+					}
+				}
+			}
+		}
+		
+		if( count($sig_errors) )
+		{
+			$this->registry->getClass('output')->showError( implode( '<br />', $sig_errors ), 10211 );
+		}
+		
+		//-----------------------------------------
+		// Write it to the DB.
+		//-----------------------------------------
+		
+		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'signature' => $signature ) ) );
+		
+		/* Update cache */
+		IPSContentCache::update( $this->memberData['member_id'], 'sig', $testSignature );
+		
+		return TRUE;
+	}
+	
+	
+	/**
+	 * UserCP Save Form: Profile Info
+	 *
+	 * @return	array	Errors
+	 */
+	public function saveProfileInfo()
+	{
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$pp_setting_moderate_comments = intval( $this->request['pp_setting_moderate_comments'] );
+		$pp_setting_moderate_friends  = intval( $this->request['pp_setting_moderate_friends'] );
+		$pp_setting_count_visitors    = intval( $this->request['pp_setting_count_visitors'] );
+		$pp_setting_count_comments    = intval( $this->request['pp_setting_count_comments'] );
+		$pp_setting_count_friends     = intval( $this->request['pp_setting_count_friends'] );
+		
+		//-----------------------------------------
+		// Check to make sure that we can edit profiles..
+		//-----------------------------------------
+		
+		if ( ! $this->memberData['g_edit_profile'] )
+		{
+			$this->registry->getClass('output')->showError( 'members_profile_disabled', 10214, null, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// make sure that either we entered
+		// all calendar fields, or we left them
+		// all blank
+		//-----------------------------------------
+		
+		$c_cnt = 0;
+		
+		foreach ( array('day','month','year') as $v )
+		{
+			if ( $this->request[ $v ] )
+			{
+				$c_cnt++;
+			}
+		}
+		
+		if( $c_cnt > 0 && $c_cnt < 2 )
+		{
+			$this->registry->getClass('output')->showError( 'member_bad_birthday', 10215 );
+		}
+		else if( $c_cnt > 0 )
+		{
+			//-----------------------------------------
+			// Make sure it's a legal date
+			//-----------------------------------------
+			
+			$_year = $this->request['year'] ? $this->request['year'] : 1999;
+			
+			if ( ! checkdate( $this->request['month'], $this->request['day'], $_year ) )
+			{
+				$this->registry->getClass('output')->showError( 'member_bad_birthday', 10216 );
+			}
+		}
+
+		//-----------------------------------------
+		// Start off our array
+		//-----------------------------------------
+		
+		$core = array( 'bday_day'    => $this->request['day'],
+					   'bday_month'  => $this->request['month'],
+					   'bday_year'   => $this->request['year'],
+					  );
+
+		$extendedProfile = array( 'pp_setting_moderate_comments' => $pp_setting_moderate_comments,
+								  'pp_setting_moderate_friends'  => $pp_setting_moderate_friends,
+								  'pp_setting_count_visitors'    => $pp_setting_count_visitors,
+								  'pp_setting_count_comments'    => $pp_setting_count_comments,
+								  'pp_setting_count_friends'     => $pp_setting_count_friends );
+		
+		//-----------------------------------------
+		// check to see if we can enter a member title
+		// and if one is entered, update it.
+		//-----------------------------------------
+		
+		if( isset( $this->request['member_title'] ) and ( $this->settings['post_titlechange'] ) and ( $this->memberData['posts'] >= $this->settings['post_titlechange']) )
+		{
+			$core['title'] = IPSText::getTextClass('bbcode')->stripBadWords( $this->request['member_title'] );
+		}
+		
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields      = new $classToLoad();
+		
+		$fields->member_data = $this->member->fetchMemberData();
+		$fields->initData( 'edit' );
+		/* Use $_POST and not ipsRegistry::$request as the custom profile field kernel class has its own cleaning routines for saving and showing
+		   which means we end up with double & -> &amp; conversion (&amp;lt;, etc) */
+		$fields->parseToSave( $_POST );
+		
+		if( $fields->error_messages )
+		{
+			return $fields->error_messages;
+		}
+		
+		/* Check the website url field */
+		$website_field = $fields->getFieldIDByKey( 'website' );
+
+		if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
+		{
+			if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
+			{
+				$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
+			}
+		}
+
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
+		
+		if ( count( $fields->error_fields['empty'] ) )
+		{
+			$this->registry->getClass('output')->showError( array( 'customfields_empty', $fields->error_fields['empty'][0]['pf_title'] ), 10217 );
+		}
+		
+		if ( count( $fields->error_fields['invalid'] ) )
+		{
+			$this->registry->getClass('output')->showError( array( 'customfields_invalid', $fields->error_fields['invalid'][0]['pf_title'] ), 10218 );
+		}
+		
+		if ( count( $fields->error_fields['toobig'] ) )
+		{
+			$this->registry->getClass('output')->showError( array( 'customfields_toobig', $fields->error_fields['toobig'][0]['pf_title'] ), 10219 );
+		}
+		
+		/* About me */	
+		$extendedProfile['pp_about_me'] = $this->editor->process( $_POST['Post'] );
+		
+		/* Open ID & times*/
+		$timeZone    = IPSText::alphanumericalClean( $this->request['timeZone'], '+.' );
+		$dst_correct = intval( $this->request['dst_correct'] );
+		
+		/* Ensure 1 account per openID */
+		if ( $this->request['identity_url'] )
+		{
+			$account	= $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "identity_url='" . trim($this->request['identity_url']) . "' AND member_id<>" . $this->memberData['member_id'] ) );
+
+			if( $account['member_id'] )
+			{
+				return array( 0 => $this->lang->words['identity_url_assoc'] );
+			}
+
+			$identityUrl	= trim($this->request['identity_url']);
+			$identityUrl	= rtrim( $identityUrl, "/" );
+
+			if( !strpos( $identityUrl, 'http://' ) === 0 AND !strpos( $identityUrl, 'https://' ) === 0 )
+			{
+				$identityUrl = 'http://' . $identityUrl;
+			}
+		}
+		
+		/* Add into array */
+		$core['time_offset']      = $timeZone;
+		$core['dst_in_use']       = $this->settings['time_dst_auto_correction'] ? ( ( $this->request['dstOption'] AND intval($this->request['dstCheck']) == 0 ) ? intval($this->request['dstOption']) : 0 ) : $this->memberData['dst_in_use'];
+		$core['members_auto_dst'] = $this->settings['time_dst_auto_correction'] ? intval($this->request['dstCheck']) : $this->memberData['members_auto_dst'];
+		$core['identity_url']	  = isset($identityUrl) ? $identityUrl : $this->memberData['identity_url'];
+		
+		//-----------------------------------------
+		// Update the DB
+		//-----------------------------------------
+		
+		IPSMember::save( $this->memberData['member_id'], array( 'core'            => $core,
+													 		    'customFields'    => $fields->out_fields,
+													 		    'extendedProfile' => $extendedProfile ) );
+
+		//-----------------------------------------
+		// Update birthdays cache if user set to today
+		// or if birthday was today but isn't now
+		//-----------------------------------------
+		
+		if( $core['bday_month'] == date('m') AND $core['bday_day'] == date('d') )
+		{
+			$this->cache->rebuildCache( 'birthdays', 'calendar' );
+		}
+		else if( $this->memberData['bday_month'] == date('m') AND $this->memberData['bday_day'] == date('d') AND ( $core['bday_month'] != date('m') OR $core['bday_day'] != date('d') ) )
+		{
+			$this->cache->rebuildCache( 'birthdays', 'calendar' );
+		}
+
+		return TRUE;
+	}
+	
 	/**
 	 * UserCP Save Form: Notifications config
 	 *
@@ -1375,7 +2668,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		
 		$_basicOptions		= array( array( 'email', $this->lang->words['notopt__email'] ), array( 'pm', $this->lang->words['notopt__pm'] ), array( 'inline', $this->lang->words['notopt__inline'] ), array( 'mobile' => $this->lang->words['notopt__mobile'] ) );
 		$_configOptions		= $notifyLibrary->getNotificationData();
-		$_notifyConfig		= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig		= $notifyLibrary->getMemberNotificationConfig( $this->memberData );
 		$_defaultConfig		= $notifyLibrary->getDefaultNotificationConfig();
 		$_noPrivateMessage	= array( 'new_private_message', 'reply_private_message' );
 		$_saveConfig		= array();
@@ -1466,7 +2759,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 		
 		if ( $this->request['auto_track'] )
 		{
- 			if ( in_array( $this->request['trackchoice'], array( 'none', 'immediate', 'delayed', 'daily', 'weekly' ) ) )
+ 			if ( in_array( $this->request['trackchoice'], array( 'none', 'immediate', 'offline', 'daily', 'weekly' ) ) )
  			{
  				$_trackChoice = $this->request['trackchoice'];
  			}
@@ -1476,33 +2769,13 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
  		// Profile preferences
  		//-----------------------------------------
 
-		IPSMember::save( $this->memberData['member_id'], array( 'core' => array(  'hide_email'			=> intval( $this->request['hide_email'] ),
+		IPSMember::save( $this->memberData['member_id'], array( 'core' => array(  
 													   							  'allow_admin_mails'	=> intval( $this->request['admin_send'] ),
-																				  'members_disable_pm'	=> intval( $this->request['disableMessenger'] ),
-																				  'email_full'			=> intval( $this->request['send_full_msg'] ),
 																				  'auto_track'			=> $_trackChoice
 																				) ) );
 
 		return TRUE;
 	}
-
-	/**
-	 * UserCP Save Form: Notes
-	 *
-	 * @return	boolean		Successful
-	 */
-	public function saveFormNotes()
-	{
-		//-----------------------------------------
-		// Write it to the DB.
-		//-----------------------------------------
-
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'notes' => htmlspecialchars($_POST['Post']) ) ) );
-
-		$this->ok_message	= $this->lang->words['notes_saved_msg'];
-		return TRUE;
-	}
-
 	/**
 	 * UserCP Save Form: Password
 	 *
@@ -1561,11 +2834,6 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 			$this->han_login   = new $classToLoad( $this->registry );
     		$this->han_login->init();
     	}
-		
-		/*if ( IPSText::mbstrlen( $new_pass ) > 32)
-		{
-			return array( 0 => $this->lang->words['new_pw_too_long'] );
-		}*/
 
  		//-----------------------------------------
  		// Create new password...
@@ -1693,327 +2961,312 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	 *
 	 * @return	mixed		Array of errors / boolean true
 	 */
-	public function saveFormEmail()
+	public function saveFormEmailPassword()
 	{
-		//-----------------------------------------
-		// Do not allow validating members to change
-		// email when admin validation is on
-		// @see	http://community.invisionpower.com/tracker/issue-19964-loophole-in-registration-procedure/
-		//-----------------------------------------
-		
-		if( $this->memberData['member_group_id'] == $this->settings['auth_group'] AND in_array( $this->settings['reg_auth_type'], array( 'admin', 'admin_user' ) ) )
-		{
-			$this->registry->output->showError( $this->lang->words['admin_val_no_email_chg'], 10190 );
-		}
-		
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 
-		$_emailOne         = mb_strtolower( trim($this->request['in_email_1']) );
-		$_emailTwo         = mb_strtolower( trim($this->request['in_email_2']) );
-		$captchaInput      = trim(ipsRegistry::$request['captchaInput']);
-		$captchaUniqueID   = trim(ipsRegistry::$request['captchaUniqueID']);
-
-		//-----------------------------------------
-		// Check input
-		//-----------------------------------------
-
-		if( $this->memberData['g_access_cp'] )
+		$_emailOne         = strtolower( trim($this->request['in_email_1']) );
+		$_emailTwo         = strtolower( trim($this->request['in_email_2']) );
+		$cur_pass = trim($this->request['current_pass']);
+ 		$new_pass = trim($this->request['new_pass_1']);
+ 		$chk_pass = trim($this->request['new_pass_2']);
+		$isRemote = ( ! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote'] ) ? true : false;
+		
+		if ( $_emailOne or $_emailTwo )
 		{
-			return array( 0 => $this->lang->words['admin_emailpassword'] );
-		}
-
-		if ( ! $_POST['in_email_1'] OR ! $_POST['in_email_2'] )
-		{
-			return array( 0 => $this->lang->words['complete_entire_form'] );
-		}
-
-		//-----------------------------------------
-		// Check password...
-		//-----------------------------------------
-
-		if ( ! $this->_isFBUser )
-		{
-			if ( $this->_checkPassword( $this->request['password'] ) === FALSE )
+			//-----------------------------------------
+			// Do not allow validating members to change
+			// email when admin validation is on
+			// @see	http://community.invisionpower.com/tracker/issue-19964-loophole-in-registration-procedure/
+			//-----------------------------------------
+			
+			if( $this->memberData['member_group_id'] == $this->settings['auth_group'] AND in_array( $this->settings['reg_auth_type'], array( 'admin', 'admin_user' ) ) )
 			{
-				return array( 0 => $this->lang->words['current_pw_bad'] );
+				$this->registry->output->showError( $this->lang->words['admin_val_no_email_chg'], 10190 );
 			}
-		}
-
-		//-----------------------------------------
-		// Test email addresses
-		//-----------------------------------------
-
-		if ( $_emailOne != $_emailTwo )
-		{
-			return array( 0 => $this->lang->words['emails_no_matchy'] );
-		}
-
-		if ( IPSText::checkEmailAddress( $_emailOne ) !== TRUE )
-		{
-			return array( 0 => $this->lang->words['email_not_valid'] );
-		}
-
-		//-----------------------------------------
-		// Is this email addy taken?
-		//-----------------------------------------
-
-		if ( IPSMember::checkByEmail( $_emailOne ) == TRUE )
-		{
-			return array( 0 => $this->lang->words['email_is_taken'] );
-		}
-
-		//-----------------------------------------
-		// Load ban filters
-		//-----------------------------------------
-		$banfilters = array();
-		$this->DB->build( array( 'select' => '*', 'from' => 'banfilters' ) );
-		$this->DB->execute();
-
-		while( $r = $this->DB->fetch() )
-		{
-			$banfilters[ $r['ban_type'] ][] = $r['ban_content'];
-		}
-
-		//-----------------------------------------
-		// Check in banned list
-		//-----------------------------------------
-
-		if ( isset($banfilters['email']) AND is_array( $banfilters['email'] ) and count( $banfilters['email'] ) )
-		{
-			foreach ( $banfilters['email'] as $email )
+			
+			//-----------------------------------------
+			// Check input
+			//-----------------------------------------
+	
+			if( $this->memberData['g_access_cp'] )
 			{
-				$email = str_replace( '\*', '.*' ,  preg_quote($email, "/") );
-
-				if ( preg_match( "/^{$email}$/i", $_emailOne ) )
+				return array( 0 => $this->lang->words['admin_emailpassword'] );
+			}
+	
+			if ( ! $_POST['in_email_1'] OR ! $_POST['in_email_2'] )
+			{
+				return array( 0 => $this->lang->words['complete_entire_form'] );
+			}
+	
+			//-----------------------------------------
+			// Check password...
+			//-----------------------------------------
+	
+			if ( ! $this->_isFBUser )
+			{
+				if ( $this->_checkPassword( $this->request['password'] ) === FALSE )
 				{
-					return array( 0 => $this->lang->words['email_is_taken'] );
+					return array( 0 => $this->lang->words['current_pw_bad'] );
 				}
 			}
-		}
-
-		//-----------------------------------------
-		// Anti bot flood...
-		//-----------------------------------------
-
-		if ( $this->settings['bot_antispam_type'] != 'none' )
-		{
-			if ( $this->registry->getClass('class_captcha')->validate() !== TRUE )
+	
+			//-----------------------------------------
+			// Test email addresses
+			//-----------------------------------------
+	
+			if ( $_emailOne != $_emailTwo )
 			{
-				return array( 0 => $this->lang->words['captcha_email_invalid'] );
+				return array( 0 => $this->lang->words['emails_no_matchy'] );
 			}
-		}
-
-		//-----------------------------------------
-		// Load handler...
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		$this->han_login   = new $classToLoad( $this->registry );
-		$this->han_login->init();
-
-		if ( $this->han_login->emailExistsCheck( $_emailOne ) !== FALSE )
-		{
-			return array( 0 => $this->lang->words['email_is_taken'] );
-		}
-
-		$this->han_login->changeEmail( $this->memberData['email'], $_emailOne, $this->memberData );
-
-		if ( $this->han_login->return_code AND $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
-		{
-		 	return array( 0 => $this->lang->words['email_is_taken'] );
-		}
-
-		//-----------------------------------------
-		// Require new validation? NON ADMINS ONLY
-		//-----------------------------------------
-
-		if ( $this->settings['reg_auth_type'] AND !$this->memberData['g_access_cp'] )
-		{
-			//-----------------------------------------
-			// Remove any existing entries
-			//-----------------------------------------
-			
-			$_previous	= $this->DB->buildAndFetch( array( 'select' => 'prev_email, real_group', 'from' => 'validating', 'where' => "member_id={$this->memberData['member_id']} AND email_chg=1" ) );
-			
-			if( $_previous['prev_email'] )
+	
+			if ( IPSText::checkEmailAddress( $_emailOne ) !== TRUE )
 			{
-				$this->DB->delete( 'validating', "member_id={$this->memberData['member_id']} AND email_chg=1" );
+				return array( 0 => $this->lang->words['email_not_valid'] );
+			}
+	
+			//-----------------------------------------
+			// Is this email addy taken?
+			//-----------------------------------------
+	
+			if ( IPSMember::checkByEmail( $_emailOne ) == TRUE )
+			{
+				return array( 0 => $this->lang->words['email_is_taken'] );
+			}
+	
+			//-----------------------------------------
+			// Load ban filters
+			//-----------------------------------------
+			$banfilters = array();
+			$this->DB->build( array( 'select' => '*', 'from' => 'banfilters' ) );
+			$this->DB->execute();
+	
+			while( $r = $this->DB->fetch() )
+			{
+				$banfilters[ $r['ban_type'] ][] = $r['ban_content'];
+			}
+	
+			//-----------------------------------------
+			// Check in banned list
+			//-----------------------------------------
+	
+			if ( isset($banfilters['email']) AND is_array( $banfilters['email'] ) and count( $banfilters['email'] ) )
+			{
+				foreach ( $banfilters['email'] as $email )
+				{
+					$email = str_replace( '\*', '.*' ,  preg_quote($email, "/") );
+	
+					if ( preg_match( "/^{$email}$/i", $_emailOne ) )
+					{
+						return array( 0 => $this->lang->words['email_is_taken'] );
+					}
+				}
+			}
+	
+			//-----------------------------------------
+			// Load handler...
+			//-----------------------------------------
+	
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$this->han_login   = new $classToLoad( $this->registry );
+			$this->han_login->init();
+	
+			if ( $this->han_login->emailExistsCheck( $_emailOne ) !== FALSE )
+			{
+				return array( 0 => $this->lang->words['email_is_taken'] );
+			}
+	
+			$this->han_login->changeEmail( $this->memberData['email'], $_emailOne, $this->memberData );
+	
+			if ( $this->han_login->return_code AND $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
+			{
+			 	return array( 0 => $this->lang->words['email_is_taken'] );
+			}
+	
+			//-----------------------------------------
+			// Want a new validation? NON ADMINS ONLY
+			//-----------------------------------------
+	
+			if ( $this->settings['reg_auth_type'] AND !$this->memberData['g_access_cp'] )
+			{
+				//-----------------------------------------
+				// Remove any existing entries
+				//-----------------------------------------
 				
-				$this->memberData['email']				= $_previous['prev_email'];
-				$this->memberData['member_group_id']	= $_previous['real_group'];
+				$_previous	= $this->DB->buildAndFetch( array( 'select' => 'prev_email, real_group', 'from' => 'validating', 'where' => "member_id={$this->memberData['member_id']} AND email_chg=1" ) );
+				
+				if( $_previous['prev_email'] )
+				{
+					$this->DB->delete( 'validating', "member_id={$this->memberData['member_id']} AND email_chg=1" );
+					
+					$this->memberData['email']				= $_previous['prev_email'];
+					$this->memberData['member_group_id']	= $_previous['real_group'];
+				}
+				
+				$validate_key = md5( IPSMember::makePassword() . time() );
+	
+				//-----------------------------------------
+				// Update the new email, but enter a validation key
+				// and put the member in "awaiting authorisation"
+				// and send an email..
+				//-----------------------------------------
+	
+				$db_str = array(
+								'vid'         => $validate_key,
+								'member_id'   => $this->memberData['member_id'],
+								'temp_group'  => $this->settings['auth_group'],
+								'entry_date'  => time(),
+								'coppa_user'  => 0,
+								'email_chg'   => 1,
+								'ip_address'  => $this->member->ip_address,
+								'prev_email'  => $this->memberData['email'],
+							   );
+	
+				if ( $this->memberData['member_group_id'] != $this->settings['auth_group'] )
+				{
+					$db_str['real_group'] = $this->memberData['member_group_id'];
+				}
+	
+				$this->DB->insert( 'validating', $db_str );
+				
+				IPSLib::runMemberSync( 'onEmailChange', $this->memberData['member_id'], strtolower( $_emailOne ), $this->memberData['email'] );
+	
+				IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'member_group_id' => $this->settings['auth_group'],
+																								  'email'           => $_emailOne ) ) );
+	
+				//-----------------------------------------
+				// Update their session with the new member group
+				//-----------------------------------------
+	
+				if ( $this->member->session_id  )
+				{
+					$this->member->sessionClass()->convertMemberToGuest();
+				}
+	
+				//-----------------------------------------
+				// Kill the cookies to stop auto log in
+				//-----------------------------------------
+	
+				IPSCookie::set( 'pass_hash'  , '-1', 0 );
+				IPSCookie::set( 'member_id'  , '-1', 0 );
+				IPSCookie::set( 'session_id' , '-1', 0 );
+	
+				//-----------------------------------------
+				// Dispatch the mail, and return to the activate form.
+				//-----------------------------------------
+	
+				IPSText::getTextClass( 'email' )->getTemplate("newemail");
+	
+				IPSText::getTextClass( 'email' )->buildMessage( array(
+													'NAME'         => $this->memberData['members_display_name'],
+													'THE_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=auto_validate&type=newemail&uid=".$this->memberData['member_id']."&aid=".$validate_key,
+													'ID'           => $this->memberData['member_id'],
+													'MAN_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=07",
+													'CODE'         => $validate_key,
+												  ) );
+	
+				IPSText::getTextClass( 'email' )->subject = $this->lang->words['lp_subject'].' '.$this->settings['board_name'];
+				IPSText::getTextClass( 'email' )->to      = $_emailOne;
+	
+				IPSText::getTextClass( 'email' )->sendMail();
+	
+				$this->registry->getClass('output')->redirectScreen( $this->lang->words['ce_redirect'], $this->settings['base_url'] . 'app=core&amp;module=global&amp;section=register&amp;do=07' );
 			}
+			else
+			{
+				//-----------------------------------------
+				// No authorisation needed, change email addy and return
+				//-----------------------------------------
+				
+				IPSLib::runMemberSync( 'onEmailChange', $this->memberData['member_id'], strtolower( $_emailOne ), $this->memberData['email'] );
+	
+				IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'email' => $_emailOne ) ) );
+	
+				//-----------------------------------------
+				// Add to OK message
+				//-----------------------------------------
+	
+				$this->ok_message = $this->lang->words['ok_email_changed'];
+			}
+		}
+		else if ( $cur_pass OR $new_pass )
+		{
+			if( $this->memberData['g_access_cp'] )
+			{
+				return array( 0 => $this->lang->words['admin_emailpassword'] );
+			}
+	
+			if ( $isRemote === false AND ( ! $_POST['current_pass'] OR ( empty($new_pass) ) or ( empty($chk_pass) ) ) )
+	 		{
+				return array( 0 => $this->lang->words['complete_entire_form'] );
+	 		}
+	
+	 		//-----------------------------------------
+	 		// Do the passwords actually match?
+	 		//-----------------------------------------
+	
+	 		if ( $new_pass != $chk_pass )
+	 		{
+	 			return array( 0 => $this->lang->words['passwords_not_matchy'] );
+	 		}
+	
+	 		//-----------------------------------------
+	 		// Check password...
+	 		//-----------------------------------------
 			
-			$validate_key = md5( IPSLib::makePassword() . time() );
-
-			//-----------------------------------------
-			// Update the new email, but enter a validation key
-			// and put the member in "awaiting authorisation"
-			// and send an email..
-			//-----------------------------------------
-
-			$db_str = array(
-							'vid'         => $validate_key,
-							'member_id'   => $this->memberData['member_id'],
-							'temp_group'  => $this->settings['auth_group'],
-							'entry_date'  => time(),
-							'coppa_user'  => 0,
-							'email_chg'   => 1,
-							'ip_address'  => $this->member->ip_address,
-							'prev_email'  => $this->memberData['email'],
-						   );
-
-			if ( $this->memberData['member_group_id'] != $this->settings['auth_group'] )
+			if ( $isRemote === false )
 			{
-				$db_str['real_group'] = $this->memberData['member_group_id'];
+				if ( $this->_checkPassword( $cur_pass ) !== TRUE )
+				{
+					return array( 0 => $this->lang->words['current_pw_bad'] );
+				}
 			}
-
-			$this->DB->insert( 'validating', $db_str );
-			
-			IPSLib::runMemberSync( 'onEmailChange', $this->memberData['member_id'], mb_strtolower( $_emailOne ), $this->memberData['email'] );
-
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'member_group_id' => $this->settings['auth_group'],
-																							  'email'           => $_emailOne ) ) );
-
-			//-----------------------------------------
-			// Update their session with the new member group
-			//-----------------------------------------
-
-			if ( $this->member->session_id  )
+			else
 			{
-				$this->member->sessionClass()->convertMemberToGuest();
-			}
-
-			//-----------------------------------------
-			// Kill the cookies to stop auto log in
-			//-----------------------------------------
-
-			IPSCookie::set( 'pass_hash'  , '-1', 0 );
-			IPSCookie::set( 'member_id'  , '-1', 0 );
-			IPSCookie::set( 'session_id' , '-1', 0 );
-
-			//-----------------------------------------
-			// Dispatch the mail, and return to the activate form.
-			//-----------------------------------------
-
-			IPSText::getTextClass( 'email' )->getTemplate("newemail");
-
-			IPSText::getTextClass( 'email' )->buildMessage( array(
-												'NAME'         => $this->memberData['members_display_name'],
-												'THE_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=auto_validate&type=newemail&uid=".$this->memberData['member_id']."&aid=".$validate_key,
-												'ID'           => $this->memberData['member_id'],
-												'MAN_LINK'     => $this->settings['base_url']."app=core&module=global&section=register&do=07",
-												'CODE'         => $validate_key,
-											  ) );
-
-			IPSText::getTextClass( 'email' )->subject = $this->lang->words['lp_subject'].' '.$this->settings['board_name'];
-			IPSText::getTextClass( 'email' )->to      = $_emailOne;
-
-			IPSText::getTextClass( 'email' )->sendMail();
-
-			$this->registry->getClass('output')->redirectScreen( $this->lang->words['ce_redirect'], $this->settings['base_url'] . 'app=core&amp;module=global&amp;section=register&amp;do=07' );
+				/* This is INIT in _checkPassword */
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+				$this->han_login   = new $classToLoad( $this->registry );
+	    		$this->han_login->init();
+	    	}
+	
+	 		//-----------------------------------------
+	 		// Create new password...
+	 		//-----------------------------------------
+	
+	 		$md5_pass = md5($new_pass);
+	
+	        //-----------------------------------------
+	    	// han_login was loaded during check_password
+	    	//-----------------------------------------
+	
+	    	$this->han_login->changePass( $this->memberData['email'], $md5_pass, $new_pass, $this->memberData );
+	
+	    	if ( $this->han_login->return_code AND $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
+	    	{
+				return array( 0 => $this->lang->words['hanlogin_pw_failed'] );
+	    	}
+	
+	 		//-----------------------------------------
+	 		// Update the DB
+	 		//-----------------------------------------
+	
+	 		IPSMember::updatePassword( $this->memberData['email'], $md5_pass );
+	
+	 		IPSLib::runMemberSync( 'onPassChange', $this->memberData['member_id'], $new_pass );
+	
+	 		//-----------------------------------------
+	 		// Update members log in key...
+	 		//-----------------------------------------
+	
+	 		$key  = IPSMember::generateAutoLoginKey();
+	
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'member_login_key' => $key, 'bw_local_password_set' => 1 ) ) );
+	
+			$this->ok_message = $this->lang->words['pw_change_successful'];
 		}
-		else
-		{
-			//-----------------------------------------
-			// No authorisation needed, change email addy and return
-			//-----------------------------------------
-			
-			IPSLib::runMemberSync( 'onEmailChange', $this->memberData['member_id'], mb_strtolower( $_emailOne ), $this->memberData['email'] );
-
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'email' => $_emailOne ) ) );
-
-			//-----------------------------------------
-			// Add to OK message
-			//-----------------------------------------
-
-			$this->ok_message = $this->lang->words['ok_email_changed'];
-
-			return TRUE;
-		}
-	}
-
-	/**
-	 * UserCP Save Form: Settings
-	 *
-	 * @param	array	Array of member / core_sys_login information (if we're editing)
-	 * @return	mixed	Array of errors / boolean true
-	 */
-	public function saveFormSettings( $member=array() )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$timeZone    = IPSText::alphanumericalClean( $this->request['timeZone'], '+.' );
-		$dst_correct = intval( $this->request['dst_correct'] );
-
-		//-----------------------------------------
-		// RTE
-		//-----------------------------------------
-
-		if ( ! $this->settings['posting_allow_rte'] )
-		{
-			$this->request['editorChoice'] = 0;
-		}
-
-		//-----------------------------------------
-		// PM Settings: 2 means admin says no.
-		//-----------------------------------------
-
-		if ( $this->memberData['members_disable_pm' ] == 2 )
-		{
-			$this->member->setProperty( 'members_disable_pm', 2 );
-		}
-		else
-		{
-			$this->member->setProperty( 'members_disable_pm', intval( $this->request[ 'disableMessenger' ] ) );
-		}
-
-		//-----------------------------------------
-		// Only one account per identity url
-		//-----------------------------------------
-
-		if( $this->request['identity_url'] )
-		{
-			$account	= $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "identity_url='" . trim($this->request['identity_url']) . "' AND member_id<>" . $this->memberData['member_id'] ) );
-
-			if( $account['member_id'] )
-			{
-				return array( 0 => $this->lang->words['identity_url_assoc'] );
-			}
-
-			//-----------------------------------------
-			// Need to clean up identity URL a little
-			//-----------------------------------------
-
-			$identityUrl	= trim($this->request['identity_url']);
-			$identityUrl	= rtrim( $identityUrl, "/" );
-
-			if( !strpos( $identityUrl, 'http://' ) === 0 AND !strpos( $identityUrl, 'https://' ) === 0 )
-			{
-				$identityUrl = 'http://' . $identityUrl;
-			}
-		}
-
-		/* Figure out BW options */
-		$toSave = IPSBWOptions::thaw( $this->memberData['members_bitoptions'], 'members' );
-
-		foreach( array( 'bw_vnc_type', 'bw_forum_result_type' ) as $field )
-		{
-			$toSave[ $field ] = intval( $this->request[ $field ] );
-		}
-
-		IPSMember::save( $this->memberData['member_id'], array( 'core' => array(
-																				  'time_offset'           => $timeZone,
-																				  'dst_in_use'            => $this->settings['time_dst_auto_correction'] ? ( ( $this->request['dstOption'] AND intval($this->request['dstCheck']) == 0 ) ? intval($this->request['dstOption']) : 0 ) : $this->memberData['dst_in_use'],
-																				  'members_auto_dst'      => $this->settings['time_dst_auto_correction'] ? intval($this->request['dstCheck']) : $this->memberData['members_auto_dst'],
-																				  'members_editor_choice' => $this->request['editorChoice'] ? 'rte' : 'std',
-																				  'member_uploader'		  => $this->request['member_uploader'] ? 'flash' : 'default',
-																				  'identity_url'		  => isset($identityUrl) ? $identityUrl : $this->memberData['identity_url'],
-																				  'members_bitoptions'	  => IPSBWOptions::freeze( $toSave, 'members' ) ) ) );
-
+		
 		return TRUE;
 	}
 
@@ -2023,7 +3276,7 @@ class usercpForms_core extends public_core_usercp_manualResolver implements inte
 	 * @param	string		Plain Text Password
 	 * @return	boolean		Password matched or not
 	 */
-	private function _checkPassword( $password_check )
+	protected function _checkPassword( $password_check )
 	{
 		//-----------------------------------------
 		// Ok, check password first
diff --git a/upload/admin/applications/core/index.html b/upload/admin/applications/core/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/index.html
+++ b/upload/admin/applications/core/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/js/IPB3TemplateDiffResults.js b/upload/admin/applications/core/js/IPB3TemplateDiffResults.js
index 7cdff5f7..b6d1d487 100644
--- a/upload/admin/applications/core/js/IPB3TemplateDiffResults.js
+++ b/upload/admin/applications/core/js/IPB3TemplateDiffResults.js
@@ -238,13 +238,13 @@ function IPB3TemplateDiffResults()
 								{
 									default:
 									case 'orig':
-										_text = 'Старый';
+										_text = ipb.lang['comparediff_oldd'];
 									break;
 									case 'new':
-										_text = '�овый';
+										_text = ipb.lang['comparediff_newd'];
 									break;
 									case 'custom':
-										_text = 'Пользователь�кий';
+										_text = ipb.lang['comparediff_cust'];
 									break;
 								}
 								
@@ -253,11 +253,11 @@ function IPB3TemplateDiffResults()
 								{
 									if ( json['data_type'] == 'css' )
 									{
-										content = '<h3>' + _text + ': ' + json['data_title'] + '.css</h3><div style="padding:4px;line-height:125%;overflow:auto"><pre>' + json['data_content'] + '</pre></div>';
+										content = '<div class="acp-box"><h3>' + _text + ': ' + json['data_title'] + '.css</h3><div style="padding:4px;line-height:125%;overflow:auto"><pre>' + json['data_content'] + '</pre></div></div>';
 									}
 									else
 									{
-										content = '<h3>' + _text + ': ' + json['data_group'] + ' &gt; ' + json['data_title'] + '</h3><div style="padding:4px;line-height:125%;overflow:auto"><pre>' + json['data_content'] + '</pre></div>';
+										content = '<div class="acp-box"><h3>' + _text + ': ' + json['data_group'] + ' &gt; ' + json['data_title'] + '</h3><div style="padding:4px;line-height:125%;overflow:auto"><pre>' + json['data_content'] + '</pre></div></div>';
 									}
 									
 									max = document.viewport.getHeight();
@@ -313,10 +313,10 @@ function IPB3TemplateDiffResults()
 								{
 									default:
 									case 'diff':
-										_text = 'Различи�';
+										_text = ipb.lang['comparediff_diff'];
 									break;
 									case 'merge':
-										_text = 'Препро�мотр объединени�';
+										_text = ipb.lang['comparediff_merg'];
 									break;
 								}
 								
@@ -326,7 +326,7 @@ function IPB3TemplateDiffResults()
 									/* Extra work for merge */
 									if ( type == 'merge' )
 									{
-										_qb = "<div class='acp-actionbar' style='text-align:left;'><div style='float:right'><input type='button' id='mergeEditCustom' class='button __re" + changeId + "' value='Изменить' /></div><input type='button' id='mergeResolveCustom' class='button __rc" + changeId + "' value='Решить в�е: в пользу пользователь�ких изменений' />&nbsp;<input type='button' id='mergeResolveNew' class='button __rn" + changeId + "' value='Решить в�е: в пользу новых изменений' /></div>";
+										_qb = "<div class='acp-actionbar' style='text-align:left;'><div style='float:right'><input type='button' id='mergeEditCustom' class='button __re" + changeId + "' value='" + ipb.lang['merge_edititem'] + "' /></div><input type='button' id='mergeResolveCustom' class='button __rc" + changeId + "' value='" + ipb.lang['resolveall_button'] + "' />&nbsp;<input type='button' id='mergeResolveNew' class='button __rn" + changeId + "' value='" + ipb.lang['resolveall_newwin'] + "' /></div>";
 									}
 									else
 									{
@@ -335,11 +335,11 @@ function IPB3TemplateDiffResults()
 
 									if ( json['change_data_type'] == 'css' )
 									{
-										content = '<h3>'+ _text + ': ' + json['change_data_title'] + '.css</h3><div style="padding:4px;line-height:125%;"><pre>' + json['change_data_content'] + '</pre></div>' + _qb;
+										content = '<div class="acp-box"><h3>'+ _text + ': ' + json['change_data_title'] + '.css</h3><div style="padding:4px;line-height:125%;"><pre>' + json['change_data_content'] + '</pre></div>' + _qb + "</div>";
 									}
 									else
 									{
-										content = '<h3>'+ _text + ': ' + json['change_data_group'] + ' &gt; ' + json['change_data_title'] + '</h3><div style="padding:4px;line-height:125%;"><pre>' + json['change_data_content'] + '</pre></div>' + _qb;
+										content = '<div class="acp-box"><h3>'+ _text + ': ' + json['change_data_group'] + ' &gt; ' + json['change_data_title'] + '</h3><div style="padding:4px;line-height:125%;"><pre>' + json['change_data_content'] + '</pre></div>' + _qb + "</div>";
 									}
 									
 									max = document.viewport.getHeight();
@@ -410,16 +410,16 @@ function IPB3TemplateDiffResults()
  									   <3 javascript */
  									var _tmp = Math.floor( Math.random() * 1001 );
  									
- 									_qb = "<div style='float:left; margin-top:6px'><input type='button' id='mergeResolveCustom_" + _tmp + "' class='button __rc" + changeId + "' value='Решить в�е: в пользу пользователь�ких изменений' />&nbsp;<input type='button' id='mergeResolveNew_" + _tmp + "' class='button __rn" + changeId + "' value='Решить в�е: в пользу новых изменений' /></div>";
-									_tb = '<textarea name="content" id="mergeContent" style="width:100%; height:700px; line-height:150%">' + json['change_merge_content'] + '</textarea>' + _qb + '<div style="text-align:right" class="acp-actionbar"><input type="button" id="mergeSubmit" value="Сохранить" class="button primary __i' + changeId + '" /></div>';
+									_qb = "<div style='float:left; margin-top:6px'><input type='button' id='mergeResolveCustom_" + _tmp + "' class='button __rc" + changeId + "' value='" + ipb.lang['resolveall_button'] + "' />&nbsp;<input type='button' id='mergeResolveNew_" + _tmp + "' class='button __rn" + changeId + "' value='" + ipb.lang['resolveall_newwin'] + "' /></div>";
+									_tb = '<textarea name="content" id="mergeContent" style="width:100%; height:700px; line-height:150%">' + json['change_merge_content'] + '</textarea>' + _qb + '<div style="text-align:right" class="acp-actionbar"><input type="button" id="mergeSubmit" value="' + ipb.lang['save_button'] + '" class="button primary __i' + changeId + '" /></div>';
 									
 									if ( json['change_data_type'] == 'css' )
 									{
-										content = '<h3>' + json['change_data_title'] + '.css' + '</h3><div style="padding:4px;">' + _tb + '</div>';
+										content = '<div class="acp-box"><h3>' + json['change_data_title'] + '.css' + '</h3><div style="padding:4px;">' + _tb + '</div></div>';
 									}
 									else
 									{
-										content = '<h3>' + json['change_data_group'] + ' &gt; ' + json['change_data_title'] + '</h3><div style="padding:4px;">' + _tb + '</div>';
+										content = '<div class="acp-box"><h3>' + json['change_data_group'] + ' &gt; ' + json['change_data_title'] + '</h3><div style="padding:4px;">' + _tb + '</div></div>';
 									}
 									
 									IPB3TemplateDiffResults.popUps['edit-' + changeId ] = new ipb.Popup('diffEditPopUp_' + _tmp, { type: 'pane', modal: false, hideAtStart: true, w: '800px', h: '600px', initial: '<div style="height:750px">&nbsp;</div>' } );
@@ -535,7 +535,7 @@ function IPB3TemplateDiffResults()
 									}
 									else
 									{
-										alert( "Ошибка: " + t.responseText );
+										alert( ipb.lang['oops'] + t.responseText );
 									}
 							},
 							onFailure: function()
@@ -567,7 +567,7 @@ function IPB3TemplateDiffResults()
 		/* Test to see if we've left in merge stuff */
 		if ( content.match( '<<<<<<<<<<' ) || content.match( '>>>>>>>>>' ) )
 		{
-			alert( '�ельз� �охранить пока не будут у�транены в�е конфликты' );
+			alert( ipb.lang['mustfixfirst'] );
 		}
 		else
 		{
@@ -608,7 +608,7 @@ function IPB3TemplateDiffResults()
 									}
 									else
 									{
-										alert( "Ошибка: " + t.responseText );
+										alert( ipb.lang['oops'] + t.responseText );
 									}
 								},
 								onException: function( f,e ){ alert( "И�ключение: " + e ); },
diff --git a/upload/admin/applications/core/js/index.html b/upload/admin/applications/core/js/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/js/index.html
+++ b/upload/admin/applications/core/js/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/js/ipb3CSS.js b/upload/admin/applications/core/js/ipb3CSS.js
index f9ed0c9b..d4078f7f 100644
--- a/upload/admin/applications/core/js/ipb3CSS.js
+++ b/upload/admin/applications/core/js/ipb3CSS.js
@@ -40,7 +40,7 @@ function IPBCSS()
 	* @var hash
 	*/
 	this.cssNames = { 
-					  'cssRow'          : 'tablerow2',
+					  'cssRow'          : 'row2',
 					  'cssHover'        : 'cssHover' };
 	
 	
@@ -85,7 +85,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Ooops. Something went wrong. Does this help?: " + t.responseText );
+									alert( "Похоже у на� проблемы: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "И�ключение: " + e ); },
@@ -143,7 +143,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Галектеко ОП�С�ОСТЕ! ПЫЩПЫЩ!11: " + t.responseText );
+									alert( "Похоже у на� проблемы: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "И�ключение: " + e ); },
@@ -196,13 +196,13 @@ function IPBCSS()
 										if ( json['errors'] )
 										{
 											/* Something inline would be very nice here.. rather than this ugly alert */
-											alert("Я СК�З�Л: " + json['errors'] );
+											alert("Ошибка: " + json['errors'] );
 										}
 									}
 								}
 								else
 								{
-									alert( "Галектеко ОП�С�ОСТЕ! ПЫЩПЫЩ!11: " + t.responseText );
+									alert( "Похоже у на� проблемы: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "И�ключение: " + e ); },
@@ -239,7 +239,7 @@ function IPBCSS()
 								}
 								else
 								{
-									alert( "Галектеко ОП�С�ОСТЕ! ПЫЩПЫЩ!11: " + t.responseText );
+									alert( "Похоже у на� проблемы: " + t.responseText );
 								}
 							},
 							onException: function( f,e ){ alert( "И�ключение: " + e ); },
diff --git a/upload/admin/applications/core/js/ipb3Hooks.js b/upload/admin/applications/core/js/ipb3Hooks.js
index 3737e1bc..726346e2 100644
--- a/upload/admin/applications/core/js/ipb3Hooks.js
+++ b/upload/admin/applications/core/js/ipb3Hooks.js
@@ -1,27 +1,74 @@
 
+function addAnotherRequirement()
+{
+	requireIndex = parseInt(requireIndex) + 1;
+
+	// Show the data location dropdown now
+
+	url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getApplications&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + requireIndex + "&name=requireApp";
+	url = url.replace( /&amp;/g, '&' );
+
+	new Ajax.Request( url,
+	{
+		method: 'GET',
+		onSuccess: function ( t )
+			{
+				var newApp = ipb.templates['new_app_require'].evaluate({ index: requireIndex, dropdown: t.responseText });
+				
+				if ( $('RequirementsContainer').down('tbody') )
+				{
+					$('RequirementsContainer').down('tbody').insert( newApp );
+				}
+				else
+				{
+					$('RequirementsContainer').insert( newApp );
+				}
+			},
+		onException: function( f,e ){ alert( "Exception: " + e ); },
+		onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
+	} );
+}
+
+function removeRequirement( idToRemove )
+{
+	idToRemove = parseInt(idToRemove);
+	
+	if( $('requirementTitleRow_' + idToRemove ) != null )
+	{
+		$('requirementTitleRow_' + idToRemove ).remove();
+	}
+
+	if( $('requirementRow_' + idToRemove ) != null )
+	{
+		$('requirementRow_' + idToRemove ).remove();
+	}
+}
+
+
 function addAnotherFile()
 {
 	elementIndex = parseInt(elementIndex) + 1;
 
-	var header		= new Element( 'div', { 'class': 'tablesubheader' } );
-	header.update( ipb.lang['hookfilenumber'] + elementIndex );
+	var newFile = ipb.templates['new_hook_file'].evaluate({ index: elementIndex });
 	
-	var list		= new Element( 'ul', { 'id': 'fileTable_' + elementIndex } );
-	list.addClassName( 'acp-form' );
-	list.addClassName( 'alternate_rows' );
-	
-	$('fileTableContainer').insert( header );
-	$('fileTableContainer').insert( list );
-	
-	var li1		= new Element( 'li' ).update( "<label>" + ipb.lang['hook_filename'] + "</label><input type='text' name='file[" + elementIndex + "]' value='' size='50' class='inputtext' />" );
-	var li2		= new Element( 'li' ).update( "<label>" + ipb.lang['hook_classname'] + "</label><input type='text' name='hook_classname[" + elementIndex + "]' value='' size='50' class='inputtext' />" );
-	var li3		= new Element( 'li' ).update( "<label>" + ipb.lang['hook_filetype'] + "</label><select name='hook_type[" + elementIndex + "]' id='hook_type[" + elementIndex + "]' onchange='selectHookType(" + elementIndex + ");'><option value='0'>" + ipb.lang['hook_filetype_select'] + "</option><option value='commandHooks'>" + ipb.lang['hook_filetype_action'] + "</option><option value='skinHooks'>" + ipb.lang['hook_filetype_skin'] + "</option><option value='templateHooks'>" + ipb.lang['hook_filetype_template'] + "</option><option value='dataHooks'>" + ipb.lang['hook_filetype_data'] + "</option><option value='libraryHooks'>" + ipb.lang['hook_filetype_library'] + "</option></select>" );
+	if ( $('fileTableContainer').down('tbody') )
+	{
+		$('fileTableContainer').down('tbody').insert( newFile );
+	}
+	else
+	{
+		$('fileTableContainer').insert( newFile );
+	}
+}
 
-	$('fileTable_' + elementIndex).insert( li1 );
-	$('fileTable_' + elementIndex).insert( li2 );
-	$('fileTable_' + elementIndex).insert( li3 );
-	
-	doStriping();
+function removeFile( elementIndex )
+{
+	elementIndex = parseInt(elementIndex);
+
+	if( $('fileRow_' + elementIndex ) != null )
+	{
+		$('fileRow_' + elementIndex ).remove();
+	}
 }
 
 function selectHookType( elementIndex )
@@ -63,7 +110,6 @@ function selectHookType( elementIndex )
 		$('tr_dataLocation[' + elementIndex + ']').remove();
 	}
 	
-	
 	if( $('tr_libApplication[' + elementIndex + ']') != null )
 	{
 		$('tr_libApplication[' + elementIndex + ']').remove();
@@ -81,9 +127,16 @@ function selectHookType( elementIndex )
 							method: 'GET',
 							onSuccess: function (t )
 							{
-								li1		= new Element( 'li', { 'id': 'tr_skinGroup[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_skingroup'] + "</label>" + t.responseText );
-								$('fileTable_' + elementIndex).insert( li1 );
-								doStriping();
+								var newRow = ipb.templates['hook_skinGroup'].evaluate({ index: elementIndex, dropdown: t.responseText });
+								
+								if ( $('fileTable_' + elementIndex).down('tbody') )
+								{
+									$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+								}
+								else
+								{
+									$('fileTable_' + elementIndex).insert( newRow );
+								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
 							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
@@ -101,9 +154,16 @@ function selectHookType( elementIndex )
 							method: 'GET',
 							onSuccess: function (t )
 							{
-								li1		= new Element( 'li', { 'id': 'tr_dataLocation[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_data_location'] + "</label>" + t.responseText );
-								$('fileTable_' + elementIndex).insert( li1 );
-								doStriping();
+								var newRow = ipb.templates['hook_dataLocation'].evaluate({ index: elementIndex, dropdown: t.responseText });
+								
+								if ( $('fileTable_' + elementIndex).down('tbody') )
+								{
+									$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+								}
+								else
+								{
+									$('fileTable_' + elementIndex).insert( newRow );
+								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
 							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
@@ -111,9 +171,6 @@ function selectHookType( elementIndex )
 	}
 	else if( type == 'libraryHooks' )
 	{
-		var li1		= new Element( 'li', { 'id': 'tr_classToOverload[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_extends'] + "</label><input type='text' name='classToOverload[" + elementIndex + "]' value='' size='50' class='inputtext' />" );
-		$('fileTable_' + elementIndex).insert( li1 );
-		
 		// Show the data location dropdown now
 
 		url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getApplications&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + elementIndex;
@@ -124,9 +181,17 @@ function selectHookType( elementIndex )
 							method: 'GET',
 							onSuccess: function (t )
 							{
-								li1		= new Element( 'li', { 'id': 'tr_libApplication[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_application'] + "</label>" + t.responseText );
-								$('fileTable_' + elementIndex).insert( li1 );
-								doStriping();
+								var replace = { index: elementIndex, dropdown: t.responseText };
+								var newRow  = ipb.templates['hook_classToOverload'].evaluate(replace) + ipb.templates['hook_libApplication'].evaluate(replace);
+								
+								if ( $('fileTable_' + elementIndex).down('tbody') )
+								{
+									$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+								}
+								else
+								{
+									$('fileTable_' + elementIndex).insert( newRow );
+								}
 							},
 							onException: function( f,e ){ alert( "Exception: " + e ); },
 							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
@@ -136,8 +201,16 @@ function selectHookType( elementIndex )
 	{
 		// Show the classToOverload field
 		
-		var li1		= new Element( 'li', { 'id': 'tr_classToOverload[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_extends'] + "</label><input type='text' name='classToOverload[" + elementIndex + "]' value='' size='50' class='inputtext' />" );
-		$('fileTable_' + elementIndex).insert( li1 );
+		var newRow = ipb.templates['hook_classToOverload'].evaluate({ index: elementIndex });
+		
+		if ( $('fileTable_' + elementIndex).down('tbody') )
+		{
+			$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+		}
+		else
+		{
+			$('fileTable_' + elementIndex).insert( newRow );
+		}
 	}
 }
 
@@ -165,27 +238,38 @@ function getTemplatesForAdd( elementIndex )
 		$('tr_position[' + elementIndex + ']').remove();
 	}
 	
-	url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getTemplatesForAdd&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + elementIndex + "&group=" + type;
-	url = url.replace( /&amp;/g, '&' );
-
-	new Ajax.Request( url,
-					  {
-						method: 'GET',
-						onSuccess: function (t )
-						{
-							li1		= new Element( 'li', { 'id': 'tr_skinFunction[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_skinfunc'] + "</label>" + t.responseText );
-							$('fileTable_' + elementIndex).insert( li1 );
-							doStriping();
-						},
-						onException: function( f,e ){ alert( "Exception: " + e ); },
-						onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
-					  } );
+	/* Got a type? */
+	if( type != '0' )
+	{
+		url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getTemplatesForAdd&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + elementIndex + "&group=" + type;
+		url = url.replace( /&amp;/g, '&' );
+	
+		new Ajax.Request( url,
+						  {
+							method: 'GET',
+							onSuccess: function (t )
+							{
+								var newRow = ipb.templates['hook_skinFunction'].evaluate({ index: elementIndex, dropdown: t.responseText });
+								
+								if ( $('fileTable_' + elementIndex).down('tbody') )
+								{
+									$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+								}
+								else
+								{
+									$('fileTable_' + elementIndex).insert( newRow );
+								}
+							},
+							onException: function( f,e ){ alert( "Exception: " + e ); },
+							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
+						  } );
+	}
 }
 
 function getTypeOfHook( elementIndex )
 {
-	var type = $F('skinFunction[' + elementIndex + ']');
-
+	var template = $F('skinFunction[' + elementIndex + ']');
+	
 	if( $('tr_type[' + elementIndex + ']') != null )
 	{
 		$('tr_type[' + elementIndex + ']').remove();
@@ -200,11 +284,21 @@ function getTypeOfHook( elementIndex )
 	{
 		$('tr_position[' + elementIndex + ']').remove();
 	}
-
-	li1		= new Element( 'li', { 'id': 'tr_type[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_temptype'] + "</label><select name='type[" + elementIndex + "]' id='type[" + elementIndex + "]' onchange='getHookIds(" + elementIndex + ");'><option value='0'>" + ipb.lang['hook_filetype_select'] + "</option><option value='foreach'>foreach loop</option><option value='if'>if statement</option></select>" );
-	$('fileTable_' + elementIndex).insert( li1 );
 	
-	doStriping();
+	/* Insert the new hook type row */
+	if ( template != '0' )
+	{
+		var newRow = ipb.templates['hook_pointTypes'].evaluate({ index: elementIndex });
+		
+		if ( $('fileTable_' + elementIndex).down('tbody') )
+		{
+			$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+		}
+		else
+		{
+			$('fileTable_' + elementIndex).insert( newRow );
+		}
+	}
 }
 
 function getHookIds( elementIndex )
@@ -222,34 +316,46 @@ function getHookIds( elementIndex )
 		$('tr_position[' + elementIndex + ']').remove();
 	}
 	
-	url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getHookIds&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + elementIndex + "&type=" + type + "&template=" + template;
-	url = url.replace( /&amp;/g, '&' );
-
-	new Ajax.Request( url,
-					  {
-						method: 'GET',
-						onSuccess: function (t )
-						{
-							li1		= new Element( 'li', { 'id': 'tr_id[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_hookid'] + "</label>" + t.responseText );
-							$('fileTable_' + elementIndex).insert( li1 );
-							doStriping();
-						},
-						onException: function( f,e ){ alert( "Exception: " + e ); },
-						onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
-					  } );
+	/* Got a type? */
+	if( type != '0' )
+	{
+		url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=hooks&amp;do=getHookIds&amp;secure_key=" + ipb.vars['md5_hash'] + "&i=" + elementIndex + "&type=" + type + "&template=" + template;
+		url = url.replace( /&amp;/g, '&' );
+	
+		new Ajax.Request( url,
+						  {
+							method: 'GET',
+							onSuccess: function (t )
+							{
+								var newRow = ipb.templates['hook_pointIds'].evaluate({ index: elementIndex, dropdown: t.responseText });
+								
+								if ( $('fileTable_' + elementIndex).down('tbody') )
+								{
+									$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+								}
+								else
+								{
+									$('fileTable_' + elementIndex).insert( newRow );
+								}
+							},
+							onException: function( f,e ){ alert( "Exception: " + e ); },
+							onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
+						  } );
+	}
 }
 
 function getHookEntryPoints( elementIndex )
 {
-	var type		= $F('type[' + elementIndex + ']');
-
+	var type = $F('type[' + elementIndex + ']');
+	
+	Debug.write( type );
+	
 	if( $('tr_position[' + elementIndex + ']') != null )
 	{
 		$('tr_position[' + elementIndex + ']').remove();
 	}
-
+	
 	var options = '';
-	options 	+= "<option value='0'>" + ipb.lang['hook_filetype_select'] + "</option>";
 	
 	if( type == 'foreach' )
 	{
@@ -267,9 +373,18 @@ function getHookEntryPoints( elementIndex )
 		options += "<option value='pre.endif'>(pre.endif) " + ipb.lang['a_preendif'] + "</option>";
 		options += "<option value='post.endif'>(post.endif) " + ipb.lang['a_postendif'] + "</option>";
 	}
-
-	var li1		= new Element( 'li', { 'id': 'tr_position[' + elementIndex + ']' } ).update( "<label>" + ipb.lang['hook_tempposi'] + "</label><select name='position[" + elementIndex + "]' id='position[" + elementIndex + "]'>" + options + "</select>" );
-	$('fileTable_' + elementIndex).insert( li1 );
-	
-	doStriping();
+	/* Insert the new hook type row */
+	//if ( type != '0' )
+	//{
+		var newRow = ipb.templates['hook_pointLocation'].evaluate({ index: elementIndex, hookPoints: options });
+		
+		if ( $('fileTable_' + elementIndex).down('tbody') )
+		{
+			$('fileTable_' + elementIndex).down('tbody').insert( newRow );
+		}
+		else
+		{
+			$('fileTable_' + elementIndex).insert( newRow );
+		}
+	//}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/js/ipb3Replacements.js b/upload/admin/applications/core/js/ipb3Replacements.js
index b8b6273f..0e7c0338 100644
--- a/upload/admin/applications/core/js/ipb3Replacements.js
+++ b/upload/admin/applications/core/js/ipb3Replacements.js
@@ -40,7 +40,7 @@ function IPBReplacements()
 	* @var hash
 	*/
 	this.cssNames = { 
-					  'replacementsRow'          : 'tablerow2',
+					  'replacementsRow'          : 'row2',
 					  'replacementsHover'        : 'replacementsHover' };
 	
 	
diff --git a/upload/admin/applications/core/js/ipb3TemplateSandR.js b/upload/admin/applications/core/js/ipb3TemplateSandR.js
index 9cf8d809..cef4010b 100644
--- a/upload/admin/applications/core/js/ipb3TemplateSandR.js
+++ b/upload/admin/applications/core/js/ipb3TemplateSandR.js
@@ -139,7 +139,7 @@ function IPBTemplateSandR()
 		url  = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=templatesandr&amp;do=replace&&sessionID=" + this.sessionID + '&secure_key=' + ipb.vars['md5_hash'];
 		
 		$('replaceButton').disabled = true;
-		$('replaceButton').value = "Сохранение...";
+		$('replaceButton').value = ipb.lang['tpl_savegeneric'];
 		
 		new Ajax.Request( url.replace( /&amp;/g, '&' ),
 						  {
@@ -189,7 +189,7 @@ function IPBTemplateSandR()
 		url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=templates&amp;do=saveTemplateBit&amp;setID=" + this.setData['set_id'] + '&template_id=' + template_id + '&secure_key=' + ipb.vars['md5_hash'];
 		
 		/* Set up params */
-		var params = { 'template_content' : $F('tplate_editBox_' + template_id ),
+		var params = { 'template_content' : $F('tplate_editBox_' + template_id ).encodeParam(), /* Need to run encodeParam or urlencoding is lost on save - same as acp.templates.js */
 					   'template_data'    : $F('tplate_dataBox_' + template_id ),
 				       'template_set'     : this.setData['set_id'],
 				       'template_group'   : IPB3TemplatesSandR.currentTemplateGroup,
@@ -259,10 +259,7 @@ function IPBTemplateSandR()
 		var _output = '';
 		var _tplate = new Template( $('tplate_groupRow').innerHTML );
 		var json    = IPB3TemplatesSandR.templateGroups;
-		
-		var ROW_ON_OFF  = true;
-		var CLASS_NAME  = '';
-		
+
 		var _groups = Object.keys( json['groups'] ).sort();
 		
 		/* Clear out any current listing */
@@ -271,18 +268,7 @@ function IPBTemplateSandR()
 		/* Format... */
 		_groups.each( function( i )
 		{
-			if( ROW_ON_OFF)
-			{
-				 ROW_ON_OFF = false;
-				 CLASS_NAME = 'acp-row-off';
-			}
-			else
-			{
-				 ROW_ON_OFF = true;
-				 CLASS_NAME = 'acp-row-on';
-			}
-		
-			_output += _tplate.evaluate( { 'groupName' : i, '_matches' : Object.keys( json['groups'][i] ).length, 'classname' : CLASS_NAME } );
+			_output += _tplate.evaluate( { 'groupName' : i, '_matches' : Object.keys( json['groups'][i] ).length } );
 		} );
 		
 		/* Write it out */
@@ -300,8 +286,6 @@ function IPBTemplateSandR()
 				$( 'groupRowCbox_' + i ).show();
 			}
 		} );
-		
-		doStriping();
 	};
 	
 	/**
@@ -315,17 +299,20 @@ function IPBTemplateSandR()
 		
 		IPB3TemplatesSandR.currentTemplateGroup = groupName;
 		
-		/* Clear out any current listing */
-		$( 'groupRowTemplates_' + groupName ).update('');
-		
 		/* Add in the new... */
 		for( i = 0 ; i < json['templates'].length; i++ )
 		{
 			_output += _tplate.evaluate( json['templates'][i] );
 		};
 		
+		/* Clear out any current listing */
+		$$( '#groupRowTemplates_' + groupName + " table.ipsTable" ).each( function(elem) {
+			elem.update( _output );
+		});
+		//$( 'groupRowTemplates_' + groupName ).update('');
+		
 		/* Write it out */
-		$( 'groupRowTemplates_' + groupName ).update( _output );
+		//$( 'groupRowTemplates_' + groupName ).update( _output );
 		
 		/* Post process */
 		for( i = 0 ; i < json['templates'].length; i++ )
diff --git a/upload/admin/applications/core/js/ipb3Templates.js b/upload/admin/applications/core/js/ipb3Templates.js
index 423938ad..ee6fd469 100644
--- a/upload/admin/applications/core/js/ipb3Templates.js
+++ b/upload/admin/applications/core/js/ipb3Templates.js
@@ -48,9 +48,9 @@ function IPBTemplates()
 	*/
 	this.cssNames = { 'groupRowLit'     : 'tplateLit',
 					  'groupHover'      : 'groupHover',
-					  'groupRowLitMain' : 'tablerow1',
-					  'groupRow'        : 'tablerow2',
-					  'templateRow'     : 'tablerow2',
+					  'groupRowLitMain' : 'row1',
+					  'groupRow'        : 'row2',
+					  'templateRow'     : 'row2',
 					  'templateHover'   : 'templateHover' };
 	
 	
diff --git a/upload/admin/applications/core/js/ipb3uAgents.js b/upload/admin/applications/core/js/ipb3uAgents.js
index b35358ab..819d2764 100644
--- a/upload/admin/applications/core/js/ipb3uAgents.js
+++ b/upload/admin/applications/core/js/ipb3uAgents.js
@@ -119,6 +119,8 @@ function IPBUAgents()
 										IPB3UAgents.uAgentsData = json;
 										IPB3UAgents.buildUAgentsList();
 										
+										ipb.global.showInlineNotification( ipb.lang['useragent_saved'], { showClose: true } );
+										
 										if ( json['errors'] )
 										{
 											/* Something inline would be very nice here.. rather than this ugly alert */
@@ -132,11 +134,11 @@ function IPBUAgents()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( ipb.lang['oops'] + t.responseText );
 								}
 							},
-							onException: function( f,e ){ alert( "И�ключение: " + e ); },
-							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); }
+							onException: function( f,e ){ alert( ipb.lang['oops'] + e ); },
+							onFailure: function( t ){ alert( ipb.lang['oops'] + t.responseText ); }
 						  } );
 	};
 	
@@ -146,7 +148,7 @@ function IPBUAgents()
 	this.removeuAgent = function( uagent_id )
 	{
 		/* Make sure we're mean it... */
-		if ( ! confirm( "Удалить user agent?\\nОн будет удален полно�тью из �и�темы" ) )
+		if ( ! confirm( ipb.lang['removeuseragent'] ) )
 		{
 			return false;
 		}
@@ -183,11 +185,11 @@ function IPBUAgents()
 								}
 								else
 								{
-									alert( "Ошибка: " + t.responseText );
+									alert( ipb.lang['oops'] + t.responseText );
 								}
 							},
-							onException: function( f,e ){ alert( "И�ключение: " + e ); },
-							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); }
+							onException: function( f,e ){ alert( ipb.lang['oops'] + e ); },
+							onFailure: function( t ){ alert( ipb.lang['oops'] + t.responseText ); }
 						  } );
 	};
 	
@@ -235,7 +237,7 @@ function IPBUAgents()
 		/* Adjust title */
 		if ( ! uagent_id )
 		{
-			$('tplate_title_' + uagent_id ).update("Добавление User Agent");
+			$('tplate_title_' + uagent_id ).update( ipb.lang['adduagenttitle'] );
 		}
 		
 		/* Select box type */
@@ -290,7 +292,7 @@ function IPBUAgents()
 		_groups.each( function( i )
 		{
 			json['uagents'][i]['_cssClass']  = IPB3UAgents.cssNames['uagentsRow'];
-			
+			json['uagents'][i]['uagent_name'] = json['uagents'][i]['uagent_name'].replace("%20", " ");
 			_output += _tplate.evaluate( json['uagents'][i] );
 			
 		} );
diff --git a/upload/admin/applications/core/modules_admin/ajax/compare.php b/upload/admin/applications/core/modules_admin/ajax/compare.php
index 6b1855f9..18426e36 100644
--- a/upload/admin/applications/core/modules_admin/ajax/compare.php
+++ b/upload/admin/applications/core/modules_admin/ajax/compare.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template comparison
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-07-12 10:53:25 -0400 (Tue, 12 Jul 2011) $
  * </pre>
   *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9208 $
  */
 
 
@@ -29,35 +29,32 @@ class admin_core_ajax_compare extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * HTML Skin object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $html;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
-    public function doExecute( ipsRegistry $registry )
-    {
+	public function doExecute( ipsRegistry $registry )
+	{
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinDifferences( $registry );
 		
@@ -73,68 +70,71 @@ class admin_core_ajax_compare extends ipsAjaxCommand
 		
 		$this->html			= $this->registry->output->loadTemplate('cp_skin_templates');
 		
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
-    		case 'css':
-    			$this->_getCssDifferences();
-    		break;
-    		
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			case 'css':
+				$this->_getCssDifferences();
+			break;
+			
 			default:
-    		case 'differences':
-    			$this->_getDifferences();
-    		break;
-    	}
-    }
-    
-    /**
-     * Get differences of a CSS file
-     *
-     * @access	private
-     * @return	void
-     */
-    private function _getCssDifferences()
-    {
-    	//-----------------------------------------
-    	// Init
-    	//-----------------------------------------
-    	
-    	$setID		= intval($this->request['setID']);
-    	$fileID		= intval($this->request['file_id']);
-    	
-    	//-----------------------------------------
-    	// Get requested
-    	//-----------------------------------------
-    	
-    	$current	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_css', 'where' => 'css_id=' . $fileID ) );
-    	
-    	if( $current['css_id'] )
-    	{
-	    	//-----------------------------------------
-	    	// Get the original
-	    	//-----------------------------------------
-	    	
-	    	$original	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_css', 'where' => "css_set_id=0 AND css_group='{$current['css_group']}'" ) );
-    	}
-    	else
-    	{
-    		$original['css_content']	= $current['css_content'];
-    	}
+			case 'differences':
+				$this->_getDifferences();
+			break;
+		}
+	}
+	
+	/**
+	 * Get differences of a CSS file
+	 *
+	 * @return	@e void
+	 */
+	protected function _getCssDifferences()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$setID		= intval($this->request['setID']);
+		$fileID		= intval($this->request['file_id']);
+		
+		//-----------------------------------------
+		// Get requested
+		//-----------------------------------------
+		
+		$current	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_css', 'where' => 'css_id=' . $fileID ) );
+		
+		if( $current['css_id'] )
+		{
+			//-----------------------------------------
+			// Get the original
+			//-----------------------------------------
+			
+			$set		= $this->DB->buildAndFetch( array( 'select' => 'set_master_key', 'from' => 'skin_collections', 'where' => 'set_id=' . $current['css_set_id'] ) );
+			
+			$set['set_master_key']	= $set['set_master_key'] ? $set['set_master_key'] : 'root';
+			
+			$original	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_css', 'where' => "css_set_id=0 AND css_master_key='{$set['set_master_key']}' AND css_group='{$current['css_group']}'" ) );
+		}
+		else
+		{
+			$original['css_content']	= $current['css_content'];
+		}
 
 		//-----------------------------------------
 		// Get Diff library
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classDifference.php' );
-		$classDifference         = new classDifference();
+		require_once( IPS_KERNEL_PATH . 'classDifference.php' );/*noLibHook*/
+		$classDifference		 = new classDifference();
 		$classDifference->method = 'PHP';
 		
 		
 		$difference = $classDifference->getDifferences( $original['css_content'], $current['css_content'] );
-    	
+		
 		if( $classDifference->diff_found )
 		{
 			$difference = str_replace( "\n", "<br>", $difference );
@@ -153,53 +153,56 @@ class admin_core_ajax_compare extends ipsAjaxCommand
 		}
 		
 		$this->returnHtml( $this->html->differenceResult( $difference ) );
-    }
-    
-    /**
-     * Get differences of a template
-     *
-     * @access	private
-     * @return	void
-     */
-    private function _getDifferences()
-    {
-    	//-----------------------------------------
-    	// Init
-    	//-----------------------------------------
-    	
-    	$setID		= intval($this->request['setID']);
-    	$templateID	= intval($this->request['template_id']);
-    	
-    	//-----------------------------------------
-    	// Get requested
-    	//-----------------------------------------
-    	
-    	$current	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'template_id=' . $templateID ) );
-    	
-    	if( $current['template_set_id'] )
-    	{
-	    	//-----------------------------------------
-	    	// Get the original
-	    	//-----------------------------------------
-	    	
-	    	$original	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "template_set_id=0 AND template_group='{$current['template_group']}' AND template_name='{$current['template_name']}'" ) );
-    	}
-    	else
-    	{
-    		$original['template_content']	= $current['template_content'];
-    	}
+	}
+	
+	/**
+	 * Get differences of a template
+	 *
+	 * @return	@e void
+	 */
+	protected function _getDifferences()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$setID		= intval($this->request['setID']);
+		$templateID	= intval($this->request['template_id']);
+		
+		//-----------------------------------------
+		// Get requested
+		//-----------------------------------------
+		
+		$current	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'template_id=' . $templateID ) );
+		
+		if( $current['template_set_id'] )
+		{
+			//-----------------------------------------
+			// Get the original
+			//-----------------------------------------
+			
+			$set		= $this->DB->buildAndFetch( array( 'select' => 'set_master_key', 'from' => 'skin_collections', 'where' => 'set_id=' . $current['template_set_id'] ) );
+			
+			$set['set_master_key']	= $set['set_master_key'] ? $set['set_master_key'] : 'root';
+			
+			$original	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "template_set_id=0 AND template_master_key='{$set['set_master_key']}' AND template_group='{$current['template_group']}' AND template_name='{$current['template_name']}'" ) );
+		}
+		else
+		{
+			$original['template_content']	= $current['template_content'];
+		}
 
 		//-----------------------------------------
 		// Get Diff library
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classDifference.php' );
-		$classDifference         = new classDifference();
+		require_once( IPS_KERNEL_PATH . 'classDifference.php' );/*noLibHook*/
+		$classDifference		 = new classDifference();
 		$classDifference->method = 'PHP';
 		
 		
 		$difference = $classDifference->getDifferences( $original['template_content'], $current['template_content'] );
-    	
+		
 		if( $classDifference->diff_found )
 		{
 			$difference = str_replace( "\n", "<br>", $difference );
@@ -218,6 +221,6 @@ class admin_core_ajax_compare extends ipsAjaxCommand
 		}
 		
 		$this->returnHtml( $this->html->differenceResult( $difference ) );
-    }
+	}
  
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/css.php b/upload/admin/applications/core/modules_admin/ajax/css.php
index a90bed41..7b213fb1 100644
--- a/upload/admin/applications/core/modules_admin/ajax/css.php
+++ b/upload/admin/applications/core/modules_admin/ajax/css.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3CSS.js file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 
@@ -30,46 +30,44 @@ class admin_core_ajax_css extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
-    {
-    	$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
-    	
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		$this->skinFunctions = new skinCaching( $registry );
 
 		/* Check... */
 		if ( ! $registry->getClass('class_permissions')->checkPermission( 'css_manage', ipsRegistry::$current_application, 'templates' ) )
 		{
 			$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-	    	exit();
+			exit();
 		}
 				
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
-    		case 'getCSSGroups':
-    			$this->_getCSSGroups();
-    		break;
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			case 'getCSSGroups':
+				$this->_getCSSGroups();
+			break;
 			case 'getCSSForEdit':
 				$this->_getCSSForEdit();
 			break;
@@ -81,38 +79,37 @@ class admin_core_ajax_css extends ipsAjaxCommand
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'css_delete', ipsRegistry::$current_application, 'templates' ) )
 				{
 					$this->returnJsonError( $registry->lang->words['sk_ajax_noperm'] );
-			    	exit();
+					exit();
 				}
 				$this->_revertCSS();
 			break;
-    	}
-    }
-    
+		}
+	}
+	
 	/**
 	 * Reverts CSS
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _revertCSS()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID      = intval( $this->request['setID'] );
-		$cssID      = intval( $this->request['css_id'] );
+	protected function _revertCSS()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID	  = intval( $this->request['setID'] );
+		$cssID	  = intval( $this->request['css_id'] );
 		$fromDelete = intval( $this->request['fromDelete'] );
 		
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $cssID  )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $cssID  )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+			exit();
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -121,40 +118,39 @@ class admin_core_ajax_css extends ipsAjaxCommand
 		$css = $this->skinFunctions->revertCSS( $cssID, $setID, $fromDelete );
 		
 		$this->returnJsonArray( array( 'cssData' => $css, 'errors' => $this->skinFunctions->fetchErrorMessages()  ) );
-    }
+	}
 
 	/**
 	 * Saves the CSS
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _saveCSS()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID              = intval( $this->request['setID'] );
-		$cssID              = intval( $this->request['css_id'] );
-		$type               = ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
-    	$css_content        = $_POST['css_content'];
-		$css_group          = IPSText::alphanumericalClean( $_POST['_css_group'] );
+	protected function _saveCSS()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID			  = intval( $this->request['setID'] );
+		$cssID			  = intval( $this->request['css_id'] );
+		$type			   = ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
+		$css_content		= $_POST['css_content'];
+		$css_group		  = IPSText::alphanumericalClean( $_POST['_css_group'] );
 		$css_position		= intval( $this->request['css_position'] );
 		$css_attributes		= $_POST['css_attributes'];
 		$css_app			= IPSText::alphanumericalClean( $_POST['css_app'] );
 		$css_app_hide		= intval( $this->request['css_app_hide'] );
 		$css_modules		= trim( $this->request['css_modules'] );
 		
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ( $type == 'edit' AND ! $cssID ) )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ( $type == 'edit' AND ! $cssID ) )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+			exit();
+		}
 
 		//-----------------------------------------
 		// Add checks
@@ -165,8 +161,8 @@ class admin_core_ajax_css extends ipsAjaxCommand
 			if ( ! $css_group )
 			{
 				$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-	    		exit();
-	    	}
+				exit();
+			}
 		}
 		
 		//-----------------------------------------
@@ -186,7 +182,7 @@ class admin_core_ajax_css extends ipsAjaxCommand
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $err->getMessage() );
-	    		exit();
+				exit();
 			}
 		}
 		
@@ -197,32 +193,31 @@ class admin_core_ajax_css extends ipsAjaxCommand
 		$css = $this->skinFunctions->fetchCSSForEdit( $css_id, $setID );
 		
 		$this->returnJsonArray( array( 'cssData' => $css, 'errors' => $this->skinFunctions->fetchErrorMessages() ) );
-    }
+	}
 
 	/**
 	 * Fetch a JSON list of template data ready for editing
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _getCSSForEdit()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID  = intval( $this->request['setID'] );
+	protected function _getCSSForEdit()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID  = intval( $this->request['setID'] );
 		$cssID  = intval( $this->request['css_id'] );
-    	
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $cssID  )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $cssID  )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+			exit();
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -231,31 +226,30 @@ class admin_core_ajax_css extends ipsAjaxCommand
 		$css = $this->skinFunctions->fetchCSSForEdit( $cssID, $setID );
 		
 		$this->returnJsonArray( array( 'cssData' => $css ) );
-    }
+	}
 
-    /**
+	/**
 	 * Fetch a JSON list of CSS group names
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _getCSSGroups()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID = intval( $this->request['setID'] );
-    	
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+	protected function _getCSSGroups()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID = intval( $this->request['setID'] );
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+			exit();
+		}
 
 		//-----------------------------------------
 		// Get CSS
@@ -276,5 +270,5 @@ class admin_core_ajax_css extends ipsAjaxCommand
 		ksort( $css, SORT_NUMERIC );
 	
 		$this->returnJsonArray( array( 'css' => $css ) );
-    }
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/findnames.php b/upload/admin/applications/core/modules_admin/ajax/findnames.php
index 80616282..160a7e23 100644
--- a/upload/admin/applications/core/modules_admin/ajax/findnames.php
+++ b/upload/admin/applications/core/modules_admin/ajax/findnames.php
@@ -3,24 +3,24 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : AJAX Find Names functions
- * Last Updated: $Date: 2010-02-22 08:06:40 -0500 (Mon, 22 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5857 $
+ * @version		$Revision: 8644 $
  * @see			public_core_ajax_findnames
  *
  */
 
-if ( ! defined( 'IN_IPB' ) )
+if ( ! defined( 'IN_ACP' ) )
 {
 	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
 	exit();
@@ -31,9 +31,8 @@ class admin_core_ajax_findnames extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -48,10 +47,9 @@ class admin_core_ajax_findnames extends ipsAjaxCommand
 	/**
 	 * Returns possible matches for the string input
 	 *
-	 * @access	private
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */
-	private function _getMemberNames()
+	protected function _getMemberNames()
 	{
     	//-----------------------------------------
     	// INIT
@@ -96,11 +94,16 @@ class admin_core_ajax_findnames extends ipsAjaxCommand
 
 		while( $r = $this->DB->fetch() )
 		{
-			$photo = IPSMember::buildProfilePhoto( $r );
-			$group = IPSLib::makeNameFormatted( '' , $r['member_group_id'] );
+			if( !$r['members_display_name'] )
+			{
+				continue;
+			}
+
+			$photo	= IPSMember::buildProfilePhoto( $r );
+			$group	= IPSMember::makeNameFormatted( '' , $r['member_group_id'] );
 			$return[ $r['member_id'] ] = array( 'name' 	=> $r['members_display_name'],
 												'showas'=> '<strong>' . $r['members_display_name'] . '</strong> (' . $group . ')',
-												'img'	=> $photo['pp_thumb_photo'],
+												'img'	=> $photo['pp_mini_photo'],
 												'img_w'	=> $photo['pp_mini_width'],
 												'img_h'	=> $photo['pp_mini_height']
 											);
diff --git a/upload/admin/applications/core/modules_admin/ajax/hooks.php b/upload/admin/applications/core/modules_admin/ajax/hooks.php
index a01b0a65..23c2900d 100644
--- a/upload/admin/applications/core/modules_admin/ajax/hooks.php
+++ b/upload/admin/applications/core/modules_admin/ajax/hooks.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Hooks (AJAX)
- * Last Updated: $Date: 2010-10-14 13:15:13 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-10-07 22:31:51 -0400 (Fri, 07 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6980 $
+ * @version		$Revision: 9588 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -58,13 +58,13 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	 *
 	 * @var		object			Hooks library
 	 */
-	private $hooksFunctions;
+	protected $hooksFunctions;
 
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -140,19 +140,29 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get applications
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getApplications()
 	{
-		$i				= intval( $this->request['i'] );
-		$apps			= array();
+		/* Init vars */
+		$i    = intval($this->request['i']);
+		$name = empty($this->request['name']) ? 'libApplication' : trim($this->request['name']);
+		$apps = array();
 		
 		foreach( ipsRegistry::$applications as $dir => $appdata )
 		{
 			$apps[]	= array( $dir, $appdata['app_title'] );
 		}
 		
-		$output			= $this->registry->output->formDropdown( "libApplication[{$i}]", $apps );
+		sort($apps);
+		
+		/* A bit hackish.. */
+		if ( $name != 'libApplication' )
+		{
+			array_unshift( $apps, array( 0, $this->lang->words['a_selectone'] ) );
+		}
+		
+		$output = $this->registry->output->formDropdown( "{$name}[{$i}]", $apps );
 
 		$this->returnHtml( $output );
 	}
@@ -160,14 +170,13 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get data hook locations
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getDataLocationsForAdd()
 	{
-		$i				= intval( $this->request['i'] );
-
-		$_locations		= IPSLib::getDataHookLocations();
-		$output			= $this->registry->output->formDropdown( "dataLocation[{$i}]", $_locations );
+		$i			= intval( $this->request['i'] );
+		$_locations	= IPSLib::getDataHookLocations();
+		$output		= $this->registry->output->formDropdown( "dataLocation[{$i}]", $_locations );
 
 		$this->returnHtml( $output );
 	}
@@ -175,24 +184,24 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get all hook ids for a template/type
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getHookIds()
 	{
-		$i				= intval( $this->request['i'] );
-		$template		= IPSText::alphanumericalClean( $this->request['template'] );
-		$type			= IPSText::alphanumericalClean( $this->request['type'] );
-		$return			= $this->hooksFunctions->getHookIds( $template, $type );
-
-		$output			= $this->registry->output->formDropdown( "id[{$i}]", $return, null, "id[{$i}]", "onchange='getHookEntryPoints({$i});'" );
-
+		$i			= intval( $this->request['i'] );
+		$template	= IPSText::alphanumericalClean( $this->request['template'] );
+		$type		= IPSText::alphanumericalClean( $this->request['type'] );
+		$return		= $this->hooksFunctions->getHookIds( $template, $type );
+		
+		$output		= ( count($return) > 1 ) ? $this->registry->output->formDropdown( "id[{$i}]", $return, '', "id[{$i}]", "onchange='getHookEntryPoints({$i});'" ) : $this->lang->words['hook_no_hook_ids_found'];
+		
 		$this->returnHtml( $output );
 	}
 	
 	/**
 	 * Get all skin files
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getGroupsForAdd()
 	{
@@ -207,7 +216,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get all skin templates
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getTemplatesForAdd()
 	{
@@ -223,7 +232,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get language strings in a given file
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getAjaxStrings()
 	{
@@ -244,7 +253,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get all language files
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getAjaxFiles()
 	{
@@ -264,7 +273,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get skin templates in a given file
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getAjaxTemplates()
 	{
@@ -285,7 +294,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Get all skin files
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _getAjaxSkins()
 	{
@@ -305,7 +314,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Save the form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function save()
 	{
@@ -370,8 +379,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					 }
 				}
 				
-				$this->data['settingGroups']		= $toSave['settingGroups'];
-				$this->data['settings']				= $toSave['settings'];
+				if( count($toSave['settingGroups']) )
+				{
+					$this->data['settingGroups']		= $toSave['settingGroups'];
+				}
+				else
+				{
+					unset($this->data['settingGroups']);
+				}
+				
+				if( count($toSave['settings']) )
+				{
+					$this->data['settings']				= $toSave['settings'];
+				}
+				else
+				{
+					unset($this->data['settings']);
+				}
 				
 				if( count($toDisplay['settingGroups']) )
 				{
@@ -388,7 +412,14 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= "{$this->lang->words['hook_settings']} " . implode( ', ', $toDisplay['settings'] );
 				}
 				
-				$this->data['display']['settings']	= $output;
+				if( $output )
+				{
+					$this->data['display']['settings']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['settings']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -425,12 +456,24 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					}
 				}
 
+				if( !count($this->data['language']) )
+				{
+					unset($this->data['language']);
+				}
+
 				if( count($toDisplay) )
 				{
 					$output .= implode( '<br />', $toDisplay );
 				}
 				
-				$this->data['display']['language']	= $output;
+				if( $output )
+				{
+					$this->data['display']['language']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['language']);
+				}
 
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -463,8 +506,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= "{$this->lang->words['hook_modules']} " . implode( ', ', $toDisplay );
 				}
 
-				$this->data['modules']				= $toSave;
-				$this->data['display']['modules']	= $output;
+				if( count($toSave) )
+				{
+					$this->data['modules']				= $toSave;
+				}
+				else
+				{
+					unset($this->data['modules']);
+				}
+				
+				if( $output )
+				{
+					$this->data['display']['modules']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['modules']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -497,8 +555,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= "{$this->lang->words['hook_help']} " . implode( ', ', $toDisplay );
 				}
 
-				$this->data['help']				= $toSave;
-				$this->data['display']['help']	= $output;
+				if( count($toSave) )
+				{
+					$this->data['help']				= $toSave;
+				}
+				else
+				{
+					unset($this->data['help']);
+				}
+				
+				if( $output )
+				{
+					$this->data['display']['help']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['help']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -521,7 +594,17 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					if( preg_match( "/^skin_(\d+)$/", $k, $matches ) )
 					{
 						$files[ $matches[1] ]		= $v;
-						$templates[ $matches[1] ]	= $this->request[ 'templates_' . $matches[1] ];
+						
+						$_templates		= array();
+						
+						foreach( $this->request[ 'templates_' . $matches[1] ] as $v )
+						{
+							if( $v )
+							{
+								$templates[ $matches[1] ][]	= $v;
+							}
+						}
+						
 						$ids[ $matches[1] ]			= $matches[1];
 					}
 				}
@@ -535,12 +618,24 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					}
 				}
 
+				if( !count($this->data['templates']) )
+				{
+					unset($this->data['templates']);
+				}
+
 				if( count($toDisplay) )
 				{
 					$output .= implode( '<br />', $toDisplay );
 				}
 
-				$this->data['display']['templates']	= $output;
+				if( $output )
+				{
+					$this->data['display']['templates']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['templates']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -577,8 +672,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 				}
 				
 				/* Save */
-				$this->data['css']				= $toSave;
-				$this->data['display']['css']	= $output;
+				if( count($toSave) )
+				{
+					$this->data['css']				= $toSave;
+				}
+				else
+				{
+					unset($this->data['css']);
+				}
+				
+				if( $output )
+				{
+					$this->data['display']['css']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['css']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize( $this->data ) ), 'hook_id=' . $this->hookId );
 				
@@ -612,8 +722,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= "{$this->lang->words['hook_tasks']} " . implode( ', ', $toDisplay );
 				}
 
-				$this->data['tasks']				= $toSave;
-				$this->data['display']['tasks']		= $output;
+				if( count($toSave) )
+				{
+					$this->data['tasks']				= $toSave;
+				}
+				else
+				{
+					unset($this->data['tasks']);
+				}
+				
+				if( $output )
+				{
+					$this->data['display']['tasks']		= $output;
+				}
+				else
+				{
+					unset($this->data['display']['tasks']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -683,7 +808,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 							
 							if( $tabletype )
 							{
-								$text .= " TYPE=" . $tabletype;
+								$text .= " ENGINE=" . $tabletype;
 							}
 							
 							$toDisplay[] = nl2br($text);
@@ -817,7 +942,19 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= implode( '<br />', $toDisplay );
 				}
 				
-				$this->data['display']['database'] = $output;
+				if( $output )
+				{
+					$this->data['display']['database'] = $output;
+				}
+				else
+				{
+					unset($this->data['display']['database']);
+				}
+				
+				if( !count($this->data['database']) )
+				{
+					unset($this->data['database']);
+				}
 
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -843,8 +980,23 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 					$output .= "install_" . $toDisplay;
 				}
 
-				$this->data['custom']				= $toSave;
-				$this->data['display']['custom']	= $output;
+				if( $toSave )
+				{
+					$this->data['custom']				= $toSave;
+				}
+				else
+				{
+					unset($this->data['custom']);
+				}
+				
+				if( $output )
+				{
+					$this->data['display']['custom']	= $output;
+				}
+				else
+				{
+					unset($this->data['display']['custom']);
+				}
 				
 				$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize($this->data) ), 'hook_id=' . $this->hookId );
 				
@@ -867,7 +1019,7 @@ class admin_core_ajax_hooks extends ipsAjaxCommand
 	/**
 	 * Show the form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function show()
 	{
diff --git a/upload/admin/applications/core/modules_admin/ajax/index.html b/upload/admin/applications/core/modules_admin/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/ajax/index.html
+++ b/upload/admin/applications/core/modules_admin/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/livesearch.php b/upload/admin/applications/core/modules_admin/ajax/livesearch.php
index b0e4bd8e..fd9cb297 100644
--- a/upload/admin/applications/core/modules_admin/ajax/livesearch.php
+++ b/upload/admin/applications/core/modules_admin/ajax/livesearch.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Live Search
- * Last Updated: $Date: 2010-08-17 11:38:47 -0400 (Tue, 17 Aug 2010) $
+ * Last Updated: $Date: 2011-08-23 10:24:47 -0400 (Tue, 23 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6763 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9404 $
  *
  */
 
@@ -26,28 +26,11 @@ if ( ! defined( 'IN_IPB' ) )
 
 class admin_core_ajax_livesearch extends ipsAjaxCommand 
 {
-	/**
-	 * HTML to output
-	 *
-	 * @access	private
-	 * @var		string
-	 */	
-	private $output;
-
-	/**
-	 * Skin object
-	 *
-	 * @access	private
-	 * @var		object			Skin templates
-	 */
-	private $html;
-	
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -55,170 +38,95 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 		// Load skin
 		//-----------------------------------------
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_ajax' ) );
-		$this->html = $this->registry->output->loadTemplate('cp_skin_livesearch');
 		
 		/* What to do */
 		switch( $this->request['do'] )
 		{
+			default:
 			case 'search':
 				$this->doSearchRequest();
 			break;
-			
-			case 'template':
-			default:
-				$this->getTemplate();
-			break;
-		}
-		
-		/* Output */
-		$this->returnHtml( $this->output );		
+		}	
 	}
-	
-	/**
-	 * Fetches the live search template
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function getTemplate()
-	{
-		$this->output .= $this->html->liveSearchTemplate();
-	}
-	
+
 	/**
 	 * Handles the live search
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doSearchRequest()
 	{
-		/* INI */
-		$search_term = $this->request['search_term'];
-		
-		$results	= array();
-		$return		= array( 'members' => null, 'groups' => false, 'settings' => null, 'forums' => null, 'location' => null );
-		
-		/* Do search here */
-		$results	= $this->_getSettings( $search_term, $results );
-		$results	= $this->_getFromXML( $search_term, $results );
-		$results	= $this->_getMembers( $search_term, $results );
-		$results	= $this->_checkGroups( $search_term, $results );
-		$results	= $this->_checkForums( $search_term, $results );
-		
 		//-----------------------------------------
-		// Members
+		// Init
 		//-----------------------------------------
 		
-		$secCount = 0;
+		$search_term	= $this->request['search_term'];
+		$results		= array();
+		$results		= array( 'members' => array(), 'groups' => array(), 'groupLangs' => false, 'settings' => array(), 'forums' => array(), 'location' => array() );
 		
-		if( isset( $results['members'] ) AND is_array( $results['members'] ) AND count($results['members']))
+		if ( IPSLib::appIsInstalled('nexus') )
 		{
-			foreach( $results['members'] as $members )
-			{
-				$secCount++;
-				$return['members'] .= $this->html->searchRowMember( $members, $secCount );
-			}
+			$results['nexus'] = array();
 		}
 		
 		//-----------------------------------------
-		// Group settings?
+		// Search
 		//-----------------------------------------
 		
-		$secCount = 0;
+		$results = $this->_getSettings( $search_term, $results );
+		$results = $this->_getFromXML( $search_term, $results );
+		$results = $this->_getMembers( $search_term, $results );
+		$results = $this->_checkGroups( $search_term, $results );
+		$results = $this->_checkForums( $search_term, $results );
 		
-		if( $results['groups'] )
+		if ( IPSLib::appIsInstalled('nexus') )
 		{
-			foreach( $results['groups'] as $group )
-			{
-				$secCount++;
-				$return['groups'] .= $this->html->searchRowGroupsTitles( $group, $secCount );
-			}
+			$results = $this->_checkNexus( $search_term, $results );
 		}
-		
-		if( $results['groupLangs'] )
-		{
-			$return['groups'] .= $this->html->searchRowGroups();
-		}
-		
+
 		//-----------------------------------------
-		// Settings
+		// Output
 		//-----------------------------------------
-		
-		$secCount	= 0;
-		
-		if( isset( $results['settings'] ) AND is_array( $results['settings'] ) AND count($results['settings']) )
-		{
-			foreach( $results['settings'] as $setting )
-			{
-				$secCount++;
-				$return['settings'] .= $this->html->searchRowSetting( $setting, $secCount );
-			}
-		}
-		
-		//-----------------------------------------
-		// Forums
-		//-----------------------------------------
-		
-		$secCount = 0;
-		
-		if( isset( $results['forums'] ) AND is_array( $results['forums'] ) AND count($results['forums']))
-		{
-			foreach( $results['forums'] as $forum )
-			{
-				$secCount++;
-				$return['forums'] .= $this->html->searchRowForums( $forum, $secCount );
-			}
-		}
-		
-		//-----------------------------------------
-		// Locations
-		//-----------------------------------------
-		
-		$secCount = 0;
-		
-		if( isset( $results['location'] ) AND is_array( $results['location'] ) AND count($results['location']))
-		{
-			foreach( $results['location'] as $location )
-			{
-				$secCount++;
-				$return['location'] .= $this->html->searchRowLocation( $location, $secCount );
-			}
-		}
-		
-		/* Output */
-		$this->output .= $this->html->liveSearchDisplay( $return, $search_term );
+				
+		$this->returnJsonArray( $results );
 	}
 	
 	/**
 	 * Searches for matching members
 	 *
-	 * @access	private
 	 * @param	string		Search term
 	 * @param	array 		Existing search results
 	 * @return	array 		New search results
 	 */
-	private function _getMembers( $term, $results )
+	protected function _getMembers( $term, $results )
 	{
 		$term	= mb_strtolower($term);
 		
-		$this->DB->build( array(
-									'select'	=> 'member_id, members_display_name, name, members_l_username, members_l_display_name, email',
-									'from'		=> 'members',
-									'where'		=> "members_l_username LIKE '%{$term}%' OR members_l_display_name LIKE '%{$term}%' OR " . $this->DB->buildLower('email') . " LIKE '%{$term}%'",
-							)		);
+		$this->DB->build( array('select'	=> 'm.*, pp.*, g.g_title',
+								'from'		=> array('members' => 'm'),
+								'where'		=> "members_l_username LIKE '%{$term}%' OR members_l_display_name LIKE '%{$term}%' OR " . $this->DB->buildLower('email') . " LIKE '%{$term}%'",
+								'limit'     => array(0, 250 ),
+								'add_join'	=> array( array( 'from'  => array( 'groups' => 'g' ),
+															 'where' => 'g.g_id=m.member_group_id',
+															 'type'  => 'left' ),
+													  array( 'from'  => array( 'profile_portal' => 'pp' ),
+															 'where' => 'pp.pp_member_id=m.member_id',
+															 'type'  => 'left' ) )
+						 )		);
 		
 		$this->DB->execute();
 		
-		while( $r = $this->DB->fetch() )
+		while( $member = $this->DB->fetch() )
 		{
 			$_matched	= '';
+			$member     = $r = IPSMember::buildProfilePhoto( $member );
+			$r			= array();
 			
-			if( $r['members_l_display_name'] AND mb_strpos( $r['members_l_display_name'], $term ) !== false )
+			if( $member['members_l_display_name'] AND mb_strpos( $term, $member['members_l_display_name'] ) !== false )
 			{
 				$r['_matched']	= 'members_display_name';
 			}
-			else if( $r['members_l_username'] AND mb_strpos( $r['members_l_username'], $term ) !== false )
+			else if( $member['members_l_username'] AND mb_strpos( $term, $member['members_l_username'] ) !== false )
 			{
 				$r['_matched']	= 'name';
 			}
@@ -226,7 +134,14 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			{
 				$r['_matched']	= 'email';
 			}
-
+			
+			$r['name']  = $member['members_display_name'];
+			$r['extra'] = $member['g_title'];
+			$r['img']   = $member['pp_mini_photo'];
+			$r['url']   = $this->settings['_base_url']."&amp;app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id=".$member['member_id'];
+			
+			/* Trim out what we don't need */
+			
 			$results['members'][] = $r;
 		}
 	
@@ -236,15 +151,13 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 	/**
 	 * Check if search term is found in groups language file or in the group_cache.g_title
 	 *
-	 * @access	private
 	 * @param	string		Search term
 	 * @param	array 		Existing search results
 	 * @return	array 		New search results
 	 */
-	private function _checkGroups( $term, $results )
+	protected function _checkGroups( $term, $results )
 	{
-		$term				= mb_strtolower($term);
-		$results['groups']	= false;
+		$term = mb_strtolower($term);
 		
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_groups' ), 'members' );
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_forums' ), 'forums' );
@@ -254,9 +167,11 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 		
 		foreach( $this->lang->words as $k => $v )
 		{
-			if( strpos( $k, 'gf_' ) !== false AND strpos( $v, $term ) !== false )
+			if( strpos( $k, 'gf_' ) !== false AND mb_strpos( $v, $term ) !== false )
 			{
-				$results['groupLangs']	= true;
+				IPSDebug::fireBug( 'info', array( 'Group key found: ' . $k . ': ' . $v ) );
+				
+				$results['groupLangs'] = true;
 				break;
 			}
 		}
@@ -272,7 +187,10 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 				
 				if ( preg_match( "#" . $_term . "#iu", $data['g_title'] ) )
 				{
-					$results['groups'][] = $data; 
+					$results['groups'][] = array(
+												'name'	=> IPSMember::makeNameFormatted( $data['g_title'], $data['g_id'] ),
+												'url'	=> $this->settings['_base_url'] . "&amp;app=members&amp;module=groups&amp;section=groups&amp;do=edit&amp;id=" . $data['g_id'],
+												); 
 				}
 			}
 		}
@@ -283,12 +201,11 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 	/**
 	 * Check if search term is found in groups language file
 	 *
-	 * @access	private
 	 * @param	string		Search term
 	 * @param	array 		Existing search results
 	 * @return	array 		New search results
 	 */
-	private function _checkForums( $term, $results )
+	protected function _checkForums( $term, $results )
 	{
 		$term				= mb_strtolower($term);
 		$results['forums']	= false;
@@ -306,6 +223,8 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 			
 			if ( preg_match( "#" . $_term . "#iu", $data['name'] ) )
 			{
+				$data['extra'] = ( ( $data['posts'] == null ) ? 0 : $data['posts'] ) . " �ообщений";
+				$data['url'] = $this->settings['_base_url']."&amp;app=forums&amp;module=forums&amp;section=forums&amp;do=edit&amp;f=".$data['id'];
 				$results['forums'][] = $data; 
 			}
 		}
@@ -316,43 +235,39 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 	/**
 	 * Searches the settings table
 	 *
-	 * @access	private
 	 * @param	string		Search term
 	 * @param	array 		Existing search results
 	 * @return	array 		New search results
 	 */
-	private function _getSettings( $term, $results )
+	protected function _getSettings( $term, $results )
 	{
 		$term	= mb_strtolower($term);
 		
 		if( !IN_DEV )
 		{
-			$this->DB->build( array(
-										'select'	=> 'c.conf_group, c.conf_title, c.conf_description, c.conf_keywords',
-										'from'		=> array( 'core_sys_conf_settings' => 'c' ),
-										'where'		=> 't.conf_title_noshow=0 AND (' . $this->DB->buildLower('c.conf_title') . " LIKE '%{$term}%' OR ". $this->DB->buildLower('c.conf_description') . " LIKE '%{$term}%' OR " . $this->DB->buildLower('c.conf_keywords') . " LIKE '%{$term}%')",
-										'add_join'	=> array(
-															array(
-																'from'	=> array( 'core_sys_settings_titles' => 't' ),
-																'where'	=> 't.conf_title_id=c.conf_group',
-																'type'	=> 'left'
-																)
-															)
-								)		);
+			$this->DB->build( array( 'select'	=> 'c.conf_group, c.conf_title, c.conf_description, c.conf_keywords',
+									 'from'		=> array( 'core_sys_conf_settings' => 'c' ),
+									 'where'	=> 't.conf_title_noshow=0 AND (' . $this->DB->buildLower('c.conf_title') . " LIKE '%{$term}%' OR ". $this->DB->buildLower('c.conf_description') . " LIKE '%{$term}%' OR " . $this->DB->buildLower('c.conf_keywords') . " LIKE '%{$term}%')",
+									 'add_join'	=> array( array( 'from'  => array( 'core_sys_settings_titles' => 't' ),
+																 'where' => 't.conf_title_id=c.conf_group',
+																 'type'  => 'left' ) )
+							 )		);
 		}
 		else
 		{
-			$this->DB->build( array(
-										'select'	=> 'conf_group, conf_title, conf_description, conf_keywords',
-										'from'		=> 'core_sys_conf_settings',
-										'where'		=> $this->DB->buildLower('conf_title') . " LIKE '%{$term}%' OR ". $this->DB->buildLower('conf_description') . " LIKE '%{$term}%' OR " . $this->DB->buildLower('conf_keywords') . " LIKE '%{$term}%'",
-								)		);
+			$this->DB->build( array( 'select'	=> 'conf_group, conf_title, conf_description, conf_keywords',
+									 'from'		=> 'core_sys_conf_settings',
+									 'where'	=> $this->DB->buildLower('conf_title') . " LIKE '%{$term}%' OR ". $this->DB->buildLower('conf_description') . " LIKE '%{$term}%' OR " . $this->DB->buildLower('conf_keywords') . " LIKE '%{$term}%'",
+							 )		);
 		}
 		
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
+			$r['name'] = $r['conf_title'];
+			$r['url'] = $this->settings['_base_url']."&amp;app=core&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_group=" . $r['conf_group'] . "&amp;search=" . $this->request['search_term'];
+			
 			$results['settings'][] = $r;
 		}
 	
@@ -360,44 +275,226 @@ class admin_core_ajax_livesearch extends ipsAjaxCommand
 	}
 	
 	/**
-	 * Searches the XML Files
+	 * Searches Nexus
 	 *
-	 * @access	private
 	 * @param	string		Search term
 	 * @param	array 		Existing search results
 	 * @return	array 		New search results
 	 */
-	private function _getFromXML( $term, $results )
+	protected function _checkNexus( $term, $results )
 	{
-		foreach( $this->cache->getCache('app_menu_cache') as $app => $cache )
+		$textTerm		= $this->DB->addSlashes( mb_strtolower( $term ) );
+		$intTerm		= intval( $term );
+		$encodedTerm	= urlencode( $encodedTerm );
+		
+		$tempResults = array();
+		
+		require_once( IPSLib::getAppDir('nexus') . '/sources/customer.php' );/*noLibHook*/
+		
+		//-----------------------------------------
+		// Is it a number?
+		//-----------------------------------------
+				
+		if ( (string) $term == (string) $intTerm )
 		{
-			if( IPSLib::appIsInstalled( $app ) )
+			/* Invoice? */
+			$invoice = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'nexus_invoices', 'where' => "i_id={$intTerm}" ) );
+			if ( $invoice['i_id'] )
 			{
-			foreach( $cache as $entry )
+				$tempResults['invoice'] = array( 'name' => $invoice['i_title'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=payments&amp;section=invoices&amp;do=view_invoice&amp;id={$invoice['i_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/invoice.png' );
+			}
+			
+			/* Purchase? */
+			$purchase = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'nexus_purchases', 'where' => "ps_id={$intTerm}" ) );
+			if ( $purchase['ps_id'] )
 			{
-				if( count($entry['items']) )
+				$tempResults['purchase'] = array( 'name' => $purchase['ps_name'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=payments&amp;section=purchases&amp;id={$purchase['ps_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/purchase.png' );
+			}
+			
+			/* Support */
+			$support = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'nexus_support_requests', 'where' => "r_id={$intTerm}" ) );
+			if ( $support['r_id'] )
+			{
+				$tempResults['support'] = array( 'name' => $support['r_title'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=tickets&amp;section=view&amp;id={$support['r_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/support.png' );
+			}
+			
+			/* Customer */
+			$customer = $this->DB->buildAndFetch( array( 'select' => 'member_id, members_display_name', 'from' => 'members', 'where' => "member_id={$intTerm}" ) );
+			if ( $customer['member_id'] )
+			{
+				if ( !preg_replace( '/\s/', '', $customer['members_display_name'] ) )
 				{
-					foreach( $entry['items'] as $item )
-					{
-						if( $item['section'] )
-						{
-							$item['url']	= "section={$item['section']}&amp;" . $item['url'];
-						}
+					$customer['members_display_name'] = '?????';
+				}
+			
+				$tempResults['member'] = array( 'name' => $customer['members_display_name'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=customers&amp;section=view&amp;id={$customer['member_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+			}
 
-						if( isset($item['keywords']) AND mb_stripos( $item['keywords'], $term ) !== false )
+		}
+		
+		//-----------------------------------------
+		// Nope - text
+		//-----------------------------------------
+		
+		else
+		{
+			/* License Key */
+			$lkey = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'nexus_licensekeys', 'where' => $this->DB->buildLower('lkey_key') ."='{$textTerm}'" ) );
+			if ( $lkey['lkey_key'] )
+			{
+				$tempResults['lkey'] = array( 'name' => $lkey['lkey_key'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=payments&amp;section=purchases&amp;id={$lkey['lkey_purchase']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/lkey.png' );
+			}
+			
+			/* Customers */
+			$customer = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'members', 'where' => $this->DB->buildLower('email') ." LIKE '%{$textTerm}%'" ) );
+			if ( $customer['count'] )
+			{
+				if ( $customer['count'] > 50 )
+				{
+					$tempResults['member'] = array( 'name' => sprintf( $this->lang->words['livesearch_more'], $customer['count'] ), 'url' => "{$this->settings['base_url']}app=nexus&amp;module=customers&amp;section=search&amp;searchpag=1&amp;option=email&amp;criteria=contains&amp;value={$encodedTerm}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+
+				}
+				else
+				{
+					$this->DB->build( array( 'select' => 'member_id, email', 'from' => 'members', 'where' => $this->DB->buildLower('email') ." LIKE '%{$textTerm}%'" ) );
+					$this->DB->execute();
+					while ( $row = $this->DB->fetch() )
+					{
+						$tempResults['member'][] = array( 'name' => $row['email'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=customers&amp;section=view&amp;id={$row['member_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+					}
+				}
+			}
+
+			$customer = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'members', 'where' => "members_l_display_name LIKE '%{$textTerm}%'" ) );
+			if ( $customer['count'] )
+			{
+				if ( $customer['count'] > 50 )
+				{
+					$tempResults['member'] = array( 'name' => sprintf( $this->lang->words['livesearch_more'], $customer['count'] ), 'url' => "{$this->settings['base_url']}app=nexus&amp;module=customers&amp;section=search&amp;searchpag=1&amp;option=email&amp;criteria=contains&amp;value={$encodedTerm}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+
+				}
+				else
+				{
+					$this->DB->build( array( 'select' => 'member_id, members_display_name', 'from' => 'members', 'where' => "members_l_display_name LIKE '%{$textTerm}%'" ) );
+					$this->DB->execute();
+					while ( $row = $this->DB->fetch() )
+					{
+						$tempResults['member'][] = array( 'name' => $row['members_display_name'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=customers&amp;section=view&amp;id={$row['member_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+					}
+				}
+			}
+			
+			/* Hosting Accounts */
+			if ( strpos( $textTerm, '.' ) === FALSE )
+			{
+				$hosting = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'nexus_hosting_accounts', 'where' => $this->DB->buildLower('account_username') . " LIKE '%{$textTerm}%'" ) );
+				if ( $hosting['count'] )
+				{
+					if ( $hosting['count'] > 50 )
+					{
+						$tempResults['hosting'] = array( 'name' => sprintf( $this->lang->words['livesearch_more'], $customer['count'] ), 'url' => "&amp;app=nexus&amp;module=search&amp;section=search&amp;nexus_search={$encodedTerm}&amp;nexus_searchby=username", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/nexus_icons/hosting.png' );
+	
+					}
+					else
+					{
+						$this->DB->build( array( 'select' => 'ps_id, account_username', 'from' => 'nexus_hosting_accounts', 'where' => $this->DB->buildLower('account_username') . " LIKE '%{$textTerm}%'" ) );
+						$this->DB->execute();
+						while ( $row = $this->DB->fetch() )
 						{
-							$item['url'] = "&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";
-							$results['location'][] = $item;
+							$tempResults['hosting'][] = array( 'name' => $row['account_username'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=payments&amp;section=purchases&amp;id={$row['ps_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/nexus_icons/hosting.png' );
 						}
-						else if( mb_stripos( $item['title'], $term ) !== false )
+					}
+				}
+			}
+			if ( empty( $tempResults['hosting'] ) )
+			{
+				$hosting = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'nexus_hosting_accounts', 'where' => $this->DB->buildLower('account_domain') . " LIKE '%{$textTerm}%'" ) );
+				if ( $hosting['count'] )
+				{
+					if ( $hosting['count'] > 50 )
+					{
+						$tempResults['hosting'] = array( 'name' => sprintf( $this->lang->words['livesearch_more'], $customer['count'] ), 'url' => "&amp;app=nexus&amp;module=search&amp;section=search&amp;nexus_search={$encodedTerm}&amp;nexus_searchby=domain", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/customers/info.png' );
+	
+					}
+					else
+					{
+						$this->DB->build( array( 'select' => 'ps_id, account_domain', 'from' => 'nexus_hosting_accounts', 'where' => $this->DB->buildLower('account_domain') . " LIKE '%{$textTerm}%'" ) );
+						$this->DB->execute();
+						while ( $row = $this->DB->fetch() )
 						{
-							$item['fullurl'] = "&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";
-							$results['location'][] = $item;
+							$tempResults['hosting'][] = array( 'name' => $row['account_domain'], 'url' => $this->settings['_base_url']."&amp;app=nexus&amp;module=payments&amp;section=purchases&amp;id={$row['ps_id']}", 'img' => $this->settings['base_acp_url'] . '/applications_addon/ips/nexus/skin_cp/images/nexus_icons/hosting.png' );
 						}
 					}
 				}
 			}
 		}
+				
+		//-----------------------------------------
+		// Return results
+		//-----------------------------------------
+		
+		
+		foreach ( array( 'invoice', 'purchase', 'lkey', 'support', 'member', 'hosting' ) as $k )
+		{
+			if ( isset( $tempResults[ $k ] ) )
+			{
+				if ( isset( $tempResults[ $k ][0] ) )
+				{
+					foreach ( $tempResults[ $k ] as $l )
+					{
+						$results['nexus'][] = $l;
+					}
+				}
+				else
+				{
+					$results['nexus'][] = $tempResults[ $k ];
+				}
+			}
+		}
+				
+		return $results;
+	}
+	
+	/**
+	 * Searches the XML Files
+	 *
+	 * @param	string		Search term
+	 * @param	array 		Existing search results
+	 * @return	array 		New search results
+	 */
+	protected function _getFromXML( $term, $results )
+	{
+		foreach( $this->cache->getCache('app_menu_cache') as $app => $cache )
+		{
+			if( IPSLib::appIsInstalled( $app ) )
+			{
+				foreach( $cache as $entry )
+				{
+					if( count($entry['items']) )
+					{
+						foreach( $entry['items'] as $item )
+						{
+							if( $item['section'] )
+							{
+								$item['url']	= "section={$item['section']}&amp;" . $item['url'];
+							}
+	
+							if( isset($item['keywords']) AND mb_stripos( $item['keywords'], $term ) !== false )
+							{
+								$item['name'] = $item['title'];
+								$item['url'] = $this->settings['_base_url']."&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";
+								$results['location'][] = $item;
+							}
+							else if( mb_stripos( $item['title'], $term ) !== false )
+							{
+								$item['name'] = $item['title'];
+								$item['url'] = $this->settings['_base_url']."&amp;app={$app}&amp;module={$item['module']}&amp;{$item['url']}";
+								$results['location'][] = $item;
+							}
+						}
+					}
+				}
+			}
 		}
 		
 		return $results;
diff --git a/upload/admin/applications/core/modules_admin/ajax/replacements.php b/upload/admin/applications/core/modules_admin/ajax/replacements.php
index e4f14045..d4d9ebf6 100644
--- a/upload/admin/applications/core/modules_admin/ajax/replacements.php
+++ b/upload/admin/applications/core/modules_admin/ajax/replacements.php
@@ -3,21 +3,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3CSS.js file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Author: Matt Mecham
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 
@@ -32,43 +32,41 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
-    public function doExecute( ipsRegistry $registry )
-    {
-    	$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
-    	
+	public function doExecute( ipsRegistry $registry )
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );
 		
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
 			case 'saveReplacement':
 				/* Check... */
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'replacements_manage', ipsRegistry::$current_application, 'templates' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
+					exit();
 				}
 				$this->_saveReplacement();
 			break;
@@ -77,7 +75,7 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'replacements_delete', ipsRegistry::$current_application, 'templates' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
+					exit();
 				}
 				$this->_revertReplacement();
 			break;
@@ -87,54 +85,52 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'easy_logo', ipsRegistry::$current_application, 'templates' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
+					exit();
 				}
 				$this->getEasyLogo();
 			break;
-    	}
-    }
-    
-    /**
-     * Get logo image replacement for a skin
-     *
-     * @access	public
-     * @return	void
-     */
-    public function getEasyLogo()
-    {
-    	$setID			= intval( $this->request['value'] );
-    	
+		}
+	}
+	
+	/**
+	 * Get logo image replacement for a skin
+	 *
+	 * @return	@e void
+	 */
+	public function getEasyLogo()
+	{
+		$setID			= intval( $this->request['value'] );
+		
 		$replacements	= $this->skinFunctions->fetchReplacements( $setID );
 		$currentUrl		= $replacements['logo_img']['replacement_content'];
 		$currentId		= $replacements['logo_img']['replacement_id'];
 		
 		$this->returnJsonArray( array( 'url' => $currentUrl, 'id' => $currentId ) );
-    }
-    
+	}
+	
 	/**
 	 * Reverts replacement
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _revertReplacement()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID         = intval( $this->request['setID'] );
+	protected function _revertReplacement()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID		 = intval( $this->request['setID'] );
 		$replacementID = intval( $this->request['replacement_id'] );
 
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $replacementID  )
-    	{ 
-    		$this->returnJsonError('Missing Data');
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $replacementID  )
+		{ 
+			$this->returnJsonError('Missing Data');
+			exit();
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -143,35 +139,34 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 		$replacements = $this->skinFunctions->revertReplacement( $replacementID, $setID );
 		
 		$this->returnJsonArray( array( 'replacements' => $replacements, 'errors' => $this->skinFunctions->fetchErrorMessages() ) );
-    }
+	}
 
 	/**
 	 * Saves the CSS
 	 *
-	 * @access	private
 	 * @return	string		Json
 	 */
-    private function _saveReplacement()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID               = intval( $this->request['setID'] );
-		$replacementID       = intval( $this->request['replacement_id'] );
-		$type                = ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
-    	$replacement_content = $this->convertUnicode( $_POST['replacement_content'] );
-		$replacement_key     = $this->convertUnicode( $_POST['_replacement_key'] );
+	protected function _saveReplacement()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
 		
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ( $type == 'edit' AND ! $replacementID ) )
-    	{ 
-    		$this->returnJsonError('Missing Data');
-    		exit();
-    	}
+		$setID			   = intval( $this->request['setID'] );
+		$replacementID	   = intval( $this->request['replacement_id'] );
+		$type				= ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
+		$replacement_content = $this->convertUnicode( $_POST['replacement_content'] );
+		$replacement_key	 = $this->convertUnicode( $_POST['_replacement_key'] );
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ( $type == 'edit' AND ! $replacementID ) )
+		{ 
+			$this->returnJsonError('Missing Data');
+			exit();
+		}
 
 		//-----------------------------------------
 		// Add checks
@@ -182,8 +177,8 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 			if ( ! $replacement_key )
 			{
 				$this->returnJsonError('Missing Data');
-	    		exit();
-	    	}
+				exit();
+			}
 		}
 		
 		//-----------------------------------------
@@ -203,7 +198,7 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $err->getMessage() );
-	    		exit();
+				exit();
 			}
 		}
 		
@@ -214,5 +209,5 @@ class admin_core_ajax_replacements extends ipsAjaxCommand
 		$replacements = $this->skinFunctions->fetchReplacements( $setID );
 		
 		$this->returnJsonArray( array( 'replacements' => $replacements, 'errors' => $this->skinFunctions->fetchErrorMessages() ) );
-    }
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/skinsets.php b/upload/admin/applications/core/modules_admin/ajax/skinsets.php
new file mode 100644
index 00000000..98e5c7d4
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/ajax/skinsets.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * AJAX Functions For applications/core/js/ipb3CSS.js file
+ * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @since		Friday 19th May 2006 17:33
+ * @version		$Revision: 8644 $
+ */
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class admin_core_ajax_skinsets extends ipsAjaxCommand 
+{
+	/**
+	 * Skin functions object handle
+	 *
+	 * @var		object
+	 */
+	protected $skinFunctions;
+	
+	/**
+	 * Main executable
+	 *
+	 * @param	object	registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
+		$this->html = $this->registry->output->loadTemplate('cp_skin_templates');
+		
+		$this->form_code	= $this->html->form_code	= 'module=templates&amp;section=skinsets';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=templates&section=skinsets';
+		
+		//-----------------------------------------
+		// Load functions and cache classes
+		//-----------------------------------------
+	
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$this->skinFunctions = new skinCaching( $registry );
+
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'showAddDialogue':
+				$this->_showAddDialogue();
+			break;
+		}
+	}
+	
+	/**
+	 * Displays the add dialogue
+	 *
+	 * @return	string		Json
+	 */
+	protected function _showAddDialogue()
+	{
+		$this->returnHtml( $this->html->newSkinSetPopUp( IPSLib::hasActiveLicense( false ) ) );
+	}
+
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/tabs.php b/upload/admin/applications/core/modules_admin/ajax/tabs.php
new file mode 100644
index 00000000..a76b21d5
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/ajax/tabs.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @file		tabs.php 	AJAX storage of tab order preference
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		8th Feb 2011
+ * $LastChangedDate: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8021 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		admin_core_ajax_tabs
+ * @brief		AJAX storage of tab order preference
+ *
+ */
+class admin_core_ajax_tabs extends ipsAjaxCommand 
+{
+	/**
+	 * Array of valid tab keys
+	 *
+	 * @var		$tabKeys
+	 */
+	protected $tabKeys	= array( 'core', 'forums', 'members', 'lookfeel', 'support', 'reports', 'other' );
+	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_tools' ), 'core' );
+
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'save':
+				$this->_saveTabs();
+			break;
+		}
+	}
+	
+	/**
+	 * Save tab preference order
+	 *
+	 * @return	@e void
+	 */
+	protected function _saveTabs()
+	{
+		//-----------------------------------------
+		// Store order
+		//-----------------------------------------
+		
+		$order	= array();
+		$append	= array();
+		
+		foreach( $this->tabKeys as $pos => $key )
+		{
+			if( $this->request['pos_' . $key ] )
+			{
+				$order[ $this->request['pos_' . $key ] ] = $key;
+			}
+			else
+			{
+				$append[] = $key;
+			}
+		}
+		
+		if( count($append) )
+		{
+			$order = array_merge( $order, $append );
+		}
+		
+		ksort($order);
+		
+		//-----------------------------------------
+		// Save preference
+		//-----------------------------------------
+		
+		ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'tabOrder', $order );
+		
+		//-----------------------------------------
+		// Return new order
+		//-----------------------------------------
+		
+		$this->returnJsonArray( array( 'order' => $order ) );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/templatediff.php b/upload/admin/applications/core/modules_admin/ajax/templatediff.php
index 5bcf1ea1..a5828574 100644
--- a/upload/admin/applications/core/modules_admin/ajax/templatediff.php
+++ b/upload/admin/applications/core/modules_admin/ajax/templatediff.php
@@ -3,21 +3,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3Templates.js file
- * Last Updated: $Date: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Author: Matt Mecham
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6863 $
+ * @version		$Revision: 8644 $
  */
 
 
@@ -32,17 +32,15 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
     /**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -52,9 +50,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinDifferences( $registry );
 
@@ -99,10 +97,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
     /**
 	 * Grab a version to show
 	 *
-	 * @access	private
-	 * @return	string	JSON
+	 * @return	@e void
 	 */
-	private function _viewVersion()
+	protected function _viewVersion()
 	{
 		$change_id = trim( $this->request['change_id'] );
 		$type      = trim( $this->request['type'] );
@@ -159,10 +156,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Save diff
 	 *
-	 * @access	private
-	 * @return	string	JSON
+	 * @return	@e void
 	 */
-	private function _saveEdit()
+	protected function _saveEdit()
 	{
 		$change_id = trim( $this->request['change_id'] );
 		$content   = $_POST['content'];
@@ -194,10 +190,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Save diff
 	 *
-	 * @access	private
-	 * @return	string	JSON
+	 * @return	@e void
 	 */
-	private function _resolveAllSingle()
+	protected function _resolveAllSingle()
 	{
 		$change_id = trim( $this->request['change_id'] );
 		$type      = trim( $this->request['type'] );
@@ -224,9 +219,8 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Build a desc string
 	 *
-	 * @access	private
 	 * @param	array		Item data
-	 * @param	string		String
+	 * @return	string		String
 	 */
 	public function _buildDescString( $item )
 	{
@@ -281,10 +275,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Grab a diff to edit
 	 *
-	 * @access	private
-	 * @return	string	JSON
+	 * @return	@e void
 	 */
-	private function _editDiff()
+	protected function _editDiff()
 	{
 		$change_id = trim( $this->request['change_id'] );
 		
@@ -315,10 +308,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Grab a diff to show
 	 *
-	 * @access	private
-	 * @return	string	JSON
+	 * @return	@e void
 	 */
-	private function _viewDiff()
+	protected function _viewDiff()
 	{
 		$change_id = trim( $this->request['change_id'] );
 		$type      = trim( $this->request['type'] );
@@ -358,10 +350,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 	/**
 	 * Process
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _process()
+    protected function _process()
     { 
     	/* INIT */
 		$pergo         = intval( $this->request['perGo'] ) ? intval( $this->request['perGo'] ) : 10;
@@ -556,10 +547,9 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
     /**
 	 * Process merge
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _merge()
+    protected function _merge()
     { 
     	/* INIT */
 		$pergo         = intval( $this->request['perGo'] ) ? intval( $this->request['perGo'] ) : 10;
@@ -575,11 +565,10 @@ class admin_core_ajax_templatediff extends ipsAjaxCommand
 		if ( $session === FALSE )
 		{
 			$this->returnJsonError( $this->lang->words['ajax_invalidsession'] );
-    		exit();
 		}
 		
 		/* Load merge class */
-		require_once( IPS_KERNEL_PATH . 'classMerge.php' );
+		require_once( IPS_KERNEL_PATH . 'classMerge.php' );/*noLibHook*/
 
 		/* Are we doing templates or CSS? */
 		if ( $session['merge_m_templates_togo'] )
diff --git a/upload/admin/applications/core/modules_admin/ajax/templates.php b/upload/admin/applications/core/modules_admin/ajax/templates.php
index 743d6481..3bc3ec07 100644
--- a/upload/admin/applications/core/modules_admin/ajax/templates.php
+++ b/upload/admin/applications/core/modules_admin/ajax/templates.php
@@ -3,21 +3,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3Templates.js file
- * Last Updated: $Date: 2010-05-18 20:12:44 -0400 (Tue, 18 May 2010) $
+ * Last Updated: $Date: 2011-07-12 17:54:40 -0400 (Tue, 12 Jul 2011) $
  * </pre>
  *
  * Author: Matt Mecham
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6314 $
+ * @version		$Revision: 9218 $
  */
 
 
@@ -32,28 +32,26 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
-    {
-    	$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
-    	
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );
 		
@@ -61,21 +59,20 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		if ( !$registry->getClass('class_permissions')->checkPermission( 'templates_manage', ipsRegistry::$current_application, 'templates' ) )
 		{
 			$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-	    	exit();
 		}
 						
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
-    		case 'getTemplateBitList':
-    			$this->_getTemplateBitList();
-    		break;
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			case 'getTemplateBitList':
+				$this->_getTemplateBitList();
+			break;
 			case 'getTemplateGroupList':
-    			$this->_getTemplateGroupList();
-    		break;
+				$this->_getTemplateGroupList();
+			break;
 			case 'getTemplateForEdit':
 				$this->_getTemplateForEdit();
 			break;
@@ -87,37 +84,35 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'templates_delete', ipsRegistry::$current_application, 'templates' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
+					exit();
 				}
 				$this->_revertTemplateBit();
 			break;
-    	}
-    }
-    
+		}
+	}
+	
 	/**
 	 * Reverts a template bit
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _revertTemplateBit()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID            = intval( $this->request['setID'] );
-		$templateID       = intval( $this->request['template_id'] );
+	protected function _revertTemplateBit()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID			= intval( $this->request['setID'] );
+		$templateID	   = intval( $this->request['template_id'] );
 
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $templateID  )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $templateID  )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -126,39 +121,39 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		$template = $this->skinFunctions->revertTemplateBit( $templateID, $setID );
 		
 		$this->returnJsonArray( array( 'templateData' => $template, 'errors' => $this->skinFunctions->fetchErrorMessages()  ) );
-    }
+	}
 
 	/**
 	 * Saves the template bit
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _saveTemplateBit()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
+	protected function _saveTemplateBit()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
 
 		$test				= $_POST['_template_name'];
-    	$setID              = intval( $this->request['template_set'] );
-		$templateID         = intval( $this->request['template_id'] );
-		$type               = ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
-    	$template_content   = $_POST['template_content'];
-		$template_group     = IPSText::alphanumericalClean( $_POST['template_group'] );
+		$setID			  = intval( $this->request['template_set'] );
+		$templateID		 = intval( $this->request['template_id'] );
+		$type			   = ( $this->request['type'] == 'add' ) ? 'add' : 'edit';
+		$template_content   = $_POST['template_content'];
+		$template_group	 = IPSText::alphanumericalClean( $_POST['template_group'] );
 		$ent_template_group = str_replace( "skin_", "", IPSText::alphanumericalClean( $_POST['_template_group'] ) );
-		$template_name      = IPSText::alphanumericalClean( $_POST['_template_name'] );
-		$template_data	    = $_POST['template_data'];
+		$template_name	  = IPSText::alphanumericalClean( $_POST['_template_name'] );
+		$template_data		= $_POST['template_data'];
 
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ( $type == 'edit' AND ! $templateID ) )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		IPSDebug::fireBug( 'info', array( 'Template content: ' . $template_content ) );
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ( $type == 'edit' AND ! $templateID ) )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Add checks
@@ -169,8 +164,7 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 			if ( ! $template_name )
 			{
 				$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-	    		exit();
-	    	}
+			}
 		}
 		
 		//-----------------------------------------
@@ -186,7 +180,6 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $this->lang->words[ 'templates_' . $err->getMessage() ] ? $this->lang->words[ 'templates_' . $err->getMessage() ] : $err->getMessage() );//. ' ' . implode( "\n", $this->skinFunctions->fetchMessages() ) );
-	    		exit();
 			}
 		}
 		else
@@ -195,12 +188,11 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 			
 			try
 			{
-				$template_id    = $this->skinFunctions->saveTemplateBitFromAdd( $setID, $template_content, $template_data, $template_group, $template_name );
+				$template_id	= $this->skinFunctions->saveTemplateBitFromAdd( $setID, $template_content, $template_data, $template_group, $template_name );
 			}
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $this->lang->words[ 'templates_' . $err->getMessage() ] ? $this->lang->words[ 'templates_' . $err->getMessage() ] : $err->getMessage() );// . ' ' . implode( "\n", $this->skinFunctions->fetchMessages() ) );
-	    		exit();
 			}
 		}
 		
@@ -215,32 +207,30 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		//-----------------------------------------
 				
 		$this->returnJsonArray( array( 'templateData' => $template, 'errors' => $this->skinFunctions->fetchErrorMessages() ) );
-    }
+	}
 
 	/**
 	 * Fetch a JSON list of template data ready for editing
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _getTemplateForEdit()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID      = intval( $this->request['setID'] );
+	protected function _getTemplateForEdit()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID	  = intval( $this->request['setID'] );
 		$templateID = intval( $this->request['template_id'] );
-    	
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $templateID  )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $templateID  )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -249,31 +239,29 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		$template = $this->skinFunctions->fetchTemplateBitForEdit( $templateID, $setID );
 		
 		$this->returnJsonArray( array( 'templateData' => $template ) );
-    }
+	}
 	
 	/**
 	 * Fetch a JSON list of template groups
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _getTemplateGroupList()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID         = intval( $this->request['setID'] );
-    	
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+	protected function _getTemplateGroupList()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID		 = intval( $this->request['setID'] );
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Get templates
@@ -294,32 +282,30 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		}
 		
 		$this->returnJsonArray( array( 'groups' => $templateGroups ) );
-    }
+	}
 
-    /**
+	/**
 	 * Fetch a JSON list of template bits for the template group
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _getTemplateBitList()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID         = intval( $this->request['setID'] );
+	protected function _getTemplateBitList()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID		 = intval( $this->request['setID'] );
 		$templateGroup = IPSText::alphanumericalClean( $this->request['templateGroup'] );
-    	
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $templateGroup  )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $templateGroup  )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Get templates
@@ -328,6 +314,6 @@ class admin_core_ajax_templates extends ipsAjaxCommand
 		$templates = $this->skinFunctions->fetchTemplates( $setID, 'groupTemplatesNoContent', $templateGroup );
 	
 		$this->returnJsonArray( array( 'templates' => array_values( $templates ),
-								       'groupData' => array( '_modCount' => $this->skinFunctions->fetchModifiedTemplateCount( $setID, $templateGroup ) ) ) );
-    }
+									   'groupData' => array( '_modCount' => $this->skinFunctions->fetchModifiedTemplateCount( $setID, $templateGroup ) ) ) );
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/templatesandr.php b/upload/admin/applications/core/modules_admin/ajax/templatesandr.php
index 769b8993..935c1720 100644
--- a/upload/admin/applications/core/modules_admin/ajax/templatesandr.php
+++ b/upload/admin/applications/core/modules_admin/ajax/templatesandr.php
@@ -3,21 +3,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3Templates.js file
- * Last Updated: $Date: 2010-05-18 20:12:44 -0400 (Tue, 18 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Author: Matt Mecham
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6314 $
+ * @version		$Revision: 8644 $
  */
 
 
@@ -32,29 +32,27 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 	/**
 	 * Skin functions object handle
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
-    {
-    	$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
-    	
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinDifferences( $registry );
 		
@@ -62,40 +60,38 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 		if ( !$registry->getClass('class_permissions')->checkPermission( 'templates_manage', ipsRegistry::$current_application, 'templates' ) )
 		{
 			$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-	    	exit();
 		}
 		
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
 			default:
-    		case 'getTemplateBitList':
-    			$this->_getTemplateBitList();
-    		break;
+			case 'getTemplateBitList':
+				$this->_getTemplateBitList();
+			break;
 			case 'replace':
 				$this->_replace();
 			break;
-    	}
-    }
-    
+		}
+	}
+	
 	/**
 	 * Fetch a JSON list of template bits for the template group
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _replace()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
+	protected function _replace()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
 		$finalIDs 	 = array();
 		$templates   = array();
-    	$sessionID	 = IPSText::md5Clean( $this->request['sessionID'] );
+		$sessionID	 = IPSText::md5Clean( $this->request['sessionID'] );
 
 		$sessionData = $this->DB->buildAndFetch( array( 'select' => '*',
 														'from'   => 'template_sandr',
@@ -107,7 +103,7 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 		{
 			foreach( $templateData as $_group => $_data )
 			{
-				if ( isset( $_POST['groups'][ $_group ] ) AND $_POST['groups'][ $_group ] )
+				if ( !empty( $_POST['groups'][ $_group ] ) )
 				{
 					foreach( $_data as $_name => $_id )
 					{
@@ -118,7 +114,7 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 				{
 					foreach( $_data as $_name => $_id )
 					{
-						if ( isset( $_POST['templates'][ $_id ] ) AND $_POST['templates'][ $_id ] )
+						if ( !empty( $_POST['templates'][ $_id ] ) )
 						{
 							$finalIDs[] = $_id;
 						}
@@ -131,7 +127,6 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 		if ( ! count( $finalIDs ) )
 		{
 			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-	    	exit();
 		}
 		
 		/* Load templates */
@@ -168,35 +163,32 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 		
 		/* Done */
 		$this->returnJsonArray( array( 'status' => 'ok' ) );
-    	exit();
 	}
 	
 	/**
 	 * Fetch a JSON list of template bits for the template group
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _getTemplateBitList()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$setID         = intval( $this->request['setID'] );
+	protected function _getTemplateBitList()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$setID		 = intval( $this->request['setID'] );
 		$templateGroup = IPSText::alphanumericalClean( $this->request['templateGroup'] );
-    	$sessionID	   = IPSText::md5Clean( $this->request['sessionID'] );
+		$sessionID	   = IPSText::md5Clean( $this->request['sessionID'] );
 		$templates	   = array();
 		
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $setID OR ! $templateGroup or ! $sessionID )
-    	{ 
-    		$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $setID OR ! $templateGroup or ! $sessionID )
+		{ 
+			$this->returnJsonError( $this->lang->words['ajax_missing_data'] );
+		}
 
 		//-----------------------------------------
 		// Get templates
@@ -221,5 +213,5 @@ class admin_core_ajax_templatesandr extends ipsAjaxCommand
 		}
 		
 		$this->returnJsonArray( array( 'templates' => $templates ) );
-    }
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/ajax/uagents.php b/upload/admin/applications/core/modules_admin/ajax/uagents.php
index e11532a5..371772bb 100644
--- a/upload/admin/applications/core/modules_admin/ajax/uagents.php
+++ b/upload/admin/applications/core/modules_admin/ajax/uagents.php
@@ -3,21 +3,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Functions For applications/core/js/ipb3CSS.js file
- * Last Updated: $Date: 2010-10-14 13:15:13 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Author: Matt Mecham
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6980 $
+ * @version		$Revision: 8644 $
  */
 
 
@@ -32,22 +32,20 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 	/**
 	 * User agent functions
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $userAgentFunctions;
+	protected $userAgentFunctions;
 	
-    /**
+	/**
 	 * Main executable
 	 *
-	 * @access	public
 	 * @param	object	registry object
-	 * @return	void
+	 * @return	@e void
 	 */
-    public function doExecute( ipsRegistry $registry )
-    {
-    	$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
-    	
+	public function doExecute( ipsRegistry $registry )
+	{
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
 		//-----------------------------------------
 		// Load functions and cache classes
 		//-----------------------------------------
@@ -55,17 +53,16 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php', 'userAgentFunctions' );
 		$this->userAgentFunctions = new $classToLoad( $registry );
 		
-    	//-----------------------------------------
-    	// What shall we do?
-    	//-----------------------------------------
-    	
-    	switch( $this->request['do'] )
-    	{
+		//-----------------------------------------
+		// What shall we do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
 			case 'saveuAgent':
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'ua_manage', ipsRegistry::$current_application, 'tools' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
 				}
 				$this->_saveuAgent();
 			break;
@@ -73,36 +70,33 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 				if ( !$registry->getClass('class_permissions')->checkPermission( 'ua_remove', ipsRegistry::$current_application, 'tools' ) )
 				{
 					$this->returnJsonError( $registry->getClass('class_localization')->words['sk_ajax_noperm'] );
-			    	exit();
 				}
 				$this->_removeuAgent();
 			break;
-    	}
-    }
-    
+		}
+	}
+	
 	/**
 	 * Reverts replacement
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _removeuAgent()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-    	$uagent_id				= intval( $this->request['uagent_id'] );
+	protected function _removeuAgent()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$uagent_id				= intval( $this->request['uagent_id'] );
 
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( ! $uagent_id )
-    	{ 
-    		$this->returnJsonError('Missing Data');
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( ! $uagent_id )
+		{ 
+			$this->returnJsonError('Missing Data');
+		}
 
 		//-----------------------------------------
 		// Get template data
@@ -111,38 +105,36 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 		$userAgents = $this->userAgentFunctions->removeUserAgent( $uagent_id );
 		
 		$this->returnJsonArray( array( 'uagents' => $userAgents, 'errors' => $this->userAgentFunctions->fetchErrorMessages() ) );
-    }
+	}
 
 	/**
 	 * Saves the user agent
 	 *
-	 * @access	private
-	 * @return	string		Json
+	 * @return	@e void
 	 */
-    private function _saveuAgent()
-    {
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
+	protected function _saveuAgent()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
 		$uagent_id				= intval( $this->request['uagent_id'] );
 		$uagent_key				= IPSText::alphanumericalClean( $this->request['uagent_key'] );
 		$uagent_name			= $this->convertAndMakeSafe( $_POST['uagent_name'] );
 		$uagent_regex			= $this->convertUnicode( $_POST['uagent_regex'] );
 		$uagent_regex_capture	= intval( $this->request['uagent_regex_capture'] );
 		$uagent_type			= IPSText::alphanumericalClean( $this->request['uagent_type'] );
-		$uagent_position	    = intval( $this->request['uagent_position'] );
+		$uagent_position		= intval( $this->request['uagent_position'] );
 		$type					= $this->request['type'];
 		
-    	//-----------------------------------------
-    	// Checks...
-    	//-----------------------------------------
-    	
-    	if ( $type == 'edit' AND ! $uagent_id )
-    	{ 
-    		$this->returnJsonError('Missing Data');
-    		exit();
-    	}
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+		
+		if ( $type == 'edit' AND ! $uagent_id )
+		{ 
+			$this->returnJsonError('Missing Data');
+		}
 
 		//-----------------------------------------
 		// Other checks
@@ -151,8 +143,7 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 		if ( ! $uagent_key OR ! $uagent_name OR ! $uagent_regex OR ! $uagent_type )
 		{
 			$this->returnJsonError('Missing Data');
-	    	exit();
-	    }
+		}
 		
 		//-----------------------------------------
 		// Save it
@@ -167,7 +158,6 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $err->getMessage() . ' ' . str_replace( "\n", "\\n", implode( ",", $this->userAgentFunctions->fetchMessages() ) ) );
-	    		exit();
 			}
 		}
 		else
@@ -179,16 +169,13 @@ class admin_core_ajax_uagents extends ipsAjaxCommand
 			catch( Exception $err )
 			{
 				$this->returnJsonError( $err->getMessage() );
-	    		exit();
 			}
 		}
 		
 		//-----------------------------------------
 		// Get Data
 		//-----------------------------------------
-		
-		$userAgents = $this->userAgentFunctions->fetchAgents();
-		
-		$this->returnJsonArray( array( 'uagents' => $userAgents, 'returnid' => $userAgentID, 'errors' => $this->userAgentFunctions->fetchErrorMessages() ) );
-    }
+
+		$this->returnJsonArray( array( 'uagents' => $this->userAgentFunctions->fetchAgents(), 'returnid' => $userAgentID, 'errors' => $this->userAgentFunctions->fetchErrorMessages() ) );
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/applications.php b/upload/admin/applications/core/modules_admin/applications/applications.php
index 5fd7f2a9..c8a5106f 100644
--- a/upload/admin/applications/core/modules_admin/applications/applications.php
+++ b/upload/admin/applications/core/modules_admin/applications/applications.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Group management
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-09-09 19:44:48 -0400 (Fri, 09 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 15th January 2007 (15:01)
- * @version		$Revision: 7195 $
+ * @version		$Revision: 9476 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,208 +30,283 @@ class admin_core_applications_applications extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	public $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	public $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	public $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	public function doExecute( ipsRegistry $registry ) 
+	public function doExecute( ipsRegistry $registry )
 	{
 		//-----------------------------------------
 		// Load skin
 		//-----------------------------------------
+		
 
-		$this->html = $this->registry->output->loadTemplate('cp_skin_applications');
+		$this->html = $this->registry->output->loadTemplate( 'cp_skin_applications' );
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_applications' ) );
 		
 		//-----------------------------------------
 		// Set up stuff
 		//-----------------------------------------
 		
-		$this->form_code    = $this->html->form_code = 'module=applications&amp;section=applications';
-		$this->form_code_js = $this->html->form_code_js = 'module=applications&section=applications';
+
+		$this->form_code = $this->html->form_code = 'module=applications&amp;section=applications&amp;';
+		$this->form_code_js = $this->html->form_code_js = 'module=applications&section=applications&';
 		
 		//-----------------------------------------
 		// What to do...
 		//-----------------------------------------
 		
-		switch($this->request['do'])
+
+		switch( $this->request['do'] )
 		{
-			default:
-			case 'applications_overview':
-				$this->request[ 'do'] =  'applications_overview' ;
+			default :
+			case 'applications_overview' :
+				$this->request['do'] = 'applications_overview';
 				$this->applicationsOverview();
-			break;
-			case 'application_manage_position':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
+				break;
+			case 'application_manage_position' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_manage' );
 				$this->applicationManagePosition();
-			break;
-			case 'application_edit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
+				break;
+			case 'application_edit' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_manage' );
 				$this->applicationForm( 'edit' );
-			break;
-			case 'application_add':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
+				break;
+			case 'application_add' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_install' );
 				$this->applicationForm( 'add' );
-			break;
-			case 'application_edit_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
+				break;
+			case 'application_edit_do' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_manage' );
 				$this->applicationSave( 'edit' );
-			break;
-			case 'application_add_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
+				break;
+			case 'application_add_do' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_install' );
 				$this->applicationSave( 'add' );
-			break;
-			case 'application_remove':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_delete' );
+				break;
+			case 'application_remove' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_delete' );
 				$this->applicationRemove();
-			break;
-			case 'application_remove_splash':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_delete' );
+				break;
+			case 'application_remove_splash' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_delete' );
 				$this->applicationRemoveSplash();
-			break;			
-			case 'application_export':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
-				$this->applicationExport();
-			break;
-			case 'toggle_app':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'app_manage' );
-				$this->toggleAppEnabled();
-			break;
-			case 'inDevRebuildAll':
+				break;
+			case 'toggle_app' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_manage' );
+				$this->applicationToggle();
+				break;
+			case 'inDevExportApps' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'app_manage' );
+				$this->inDevApplicationsExport();
+				break;
+			case 'inDevRebuildAll' :
 				$this->inDevRebuildAll();
-			break;
-			case 'inDevExportAll':
+				break;
+			case 'inDevExportAll' :
 				$this->inDevExportAll();
-			break;
-			case 'module_recache_all':
+				break;
+			case 'module_recache_all' :
 				$this->moduleRecacheAll();
-			break;
-			case 'modules_overview':
+				break;
+			case 'modules_overview' :
 				$this->modules_overview();
-			break;
-			case 'module_edit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_edit' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleForm( 'edit' );
-			break;
-			case 'module_add':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_add' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleForm( 'add' );
-			break;
-			case 'module_edit_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_edit_do' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleSave( 'edit' );
-			break;
-			case 'module_add_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_add_do' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleSave( 'add' );
-			break;
-			case 'module_manage_position':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_manage_position' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleManagePosition();
-			break;
-			case 'module_remove':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_delete' );
+				break;
+			case 'module_remove' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_delete' );
 				$this->moduleRemove();
-			break;
-			case 'module_export':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_export' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleExport();
-			break;
-			case 'module_import':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'module_manage' );
+				break;
+			case 'module_import' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'module_manage' );
 				$this->moduleImport();
-			break;
+				break;
 			
-			case 'build_sphinx':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'build_sphinx' );
-				$this->buildSphinx();
-			break;
+			case 'sphinxBuildConf' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'build_sphinx' );
+				$this->sphinxBuildConf();
+				break;
 			
-			case 'seoRebuild':
+			case 'sphinxBuildCron' :
+				$this->registry->getClass( 'class_permissions' )->checkPermissionAutoMsg( 'build_sphinx' );
+				$this->sphinxBuildCron();
+				break;
+			
+			case 'seoRebuild' :
 				$this->seoRebuild();
-			break;
+				break;
 		}
 		
 		//-----------------------------------------
 		// Pass to CP output hander
 		//-----------------------------------------
 		
-		$this->registry->getClass('output')->html_main .= $this->registry->getClass('output')->global_template->global_frame_wrapper();
-		$this->registry->getClass('output')->sendOutput();
+
+		$this->registry->getClass( 'output' )->html_main .= $this->registry->getClass( 'output' )->global_template->global_frame_wrapper();
+		$this->registry->getClass( 'output' )->sendOutput();
 	}
 	
 	/**
 	 * Toggle application enabled/disabled
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function toggleAppEnabled()
+	public function applicationToggle()
 	{
 		//--------------------------------------------
 		// INIT
 		//--------------------------------------------
-		
+
 		$app_id = intval( $this->request['app_id'] );
 		
 		//-----------------------------------------
 		// Got an application?
 		//-----------------------------------------
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
-		$application = $this->DB->buildAndFetch( array( 'select' => '*',
-																		 'from'   => 'core_applications',
-																		 'where'  => 'app_id=' . $app_id ) );
-		
-		if( !$application['app_id'] )	
+		if ( ! $application['app_id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['cannot_find_tog_app'], 111161 );
 		}
 		
-		if( in_array( $application['app_directory'], array( 'core', 'forums', 'members' ) ) AND $application['app_enabled'] )
+		if ( in_array( $application['app_directory'], array( 'core', 'forums', 'members' ) ) and $application['app_enabled'] )
 		{
 			$this->registry->output->showError( $this->lang->words['cannot_toggle_defaults'], 111161.1 );
 		}
 		
 		$this->DB->update( 'core_applications', array( 'app_enabled' => $application['app_enabled'] ? 0 : 1 ), 'app_id=' . $app_id );
 		
-		$this->moduleRecacheAll(1);
+		$this->moduleRecacheAll( 1 );
 		
 		//-----------------------------------------
 		// FURL templates
 		//-----------------------------------------
-		
+
 		try
 		{
 			IPSLib::cacheFurlTemplates();
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e )
+		{
 		}
-		catch( Exception $e ){}
 		
+		/* Check for possible hook warnings */
+		if ( $application['app_enabled'] )
+		{
+			// Switch the enabled value here or check will fail with the current cache! 
+			ipsRegistry::$applications[$application['app_directory']]['app_enabled'] = 0;
+			
+			$this->_checkHooksWarnings( $application['app_directory'] );
+		}
+		else
+		{
+			// Re-enable the tasks if we're re-activating the app
+			$this->DB->update( 'task_manager', array( 'task_enabled' => 1 ), "task_application='{$application['app_directory']}'" );
+		}
+		
+		/* All done, redirect */
 		$this->registry->output->global_message = $this->lang->words['app_toggled_ok'];
+		$this->applicationsOverview();
+	}
+	
+	/**
+	 * Checks if there are new warnings added in
+	 * the hooks after disabling an application
+	 * 
+	 * @param	string	$appDirectory	Application directory to be checked
+	 * @return	@e void [Adds text in the global message]
+	 */
+	public function _checkHooksWarnings( $appDirectory )
+	{
+		/* Error check */
+		if ( ! $appDirectory )
+		{
+			return;
+		}
 		
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
+		/* Init vars */
+		$warnings = 0;
+		
+		/*Get any possible application*/
+		$this->DB->build( array( 'select' => 'hook_id, hook_requirements',
+								 'from'   => 'core_hooks',
+								 //This is a bit hackish but there's no way around...
+								 'where'  => 'hook_enabled=1 AND hook_requirements LIKE \'%:"' . $this->DB->addSlashes( $appDirectory ) . '";a:%\''
+						 )		);
+		$outer = $this->DB->execute();
+		
+		/* Got results? */
+		if ( $this->DB->getTotalRows( $outer ) )
+		{
+			/* Get hooks file for update check */
+			$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'core' ) . '/modules_admin/applications/hooks.php', 'admin_core_applications_hooks' );
+			$hooksClass = new $classToLoad();
+			$hooksClass->makeRegistryShortcuts( $this->registry );
+			
+			/* Loop */
+			while ( $hook = $this->DB->fetch( $outer ) )
+			{
+				if ( count( $hooksClass->checkHookRequirements( $hook ) ) )
+				{
+					$warnings ++;
+				}
+			}
+		}
+		
+		/* Got warnings? */
+		if ( $warnings > 0 )
+		{
+			$this->registry->getClass( 'output' )->html_main .= $this->registry->output->global_template->warning_box( sprintf( $this->lang->words['app_disable_hook_warnings'], ipsRegistry::$applications[$appDirectory]['app_title'], $warnings, $this->settings['base_url'] . '&amp;module=applications&amp;section=hooks&amp;do=hooks_overview' ) ) . '<br />';
+		}
 	}
 	
 	/**
 	 * Build the FURL templates file into cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function seoRebuild()
 	{
@@ -246,54 +321,190 @@ class admin_core_applications_applications extends ipsCommand
 			
 			switch( $msg )
 			{
-				case 'CANNOT_WRITE':
+				case 'CANNOT_WRITE' :
 					$msg = $this->lang->words['seo_cannot_write'];
-				break;
-				case 'NO_DATA_TO_WRITE':
+					break;
+				case 'NO_DATA_TO_WRITE' :
 					$msg = $this->lang->words['seo_no_data'];
-				break;
+					break;
 			}
 		}
 		
 		$this->registry->output->global_message = $msg;
 		
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=tools&amp;section=cache' );
 	}
 	
-	
 	/**
-	 * Build the sphinx conf file and give for download
+	 * Rebuild the Sphinx conf and returns
+	 * a list of delta indexes too
 	 *
-	 * @return	void
+	 * @return	@e array Array of content and delta indexes
 	 */
-	public function buildSphinx()
+	public function rebuildSphinxConfig()
 	{
-		$sphinxContent	= IPSLib::rebuildSphinxConfig();
+		/* Init vars */
+		$sphinxTemplate = '';
+		$sphinxCompiled = '';
+		$sphinxIndexes = array();
 		
-		$this->registry->output->showDownload( $sphinxContent, 'sphinx.conf', '', 0 );
-	}
+		/* No main template? Something odd.. */
+		if ( is_file( IPS_ROOT_PATH . '/extensions/sphinxTemplate.php' ) )
+		{
+			require_once ( IPS_ROOT_PATH . '/extensions/sphinxTemplate.php' );/*noLibHook*/
+			
+			/* Template file found but empty? */
+			if ( $sphinxTemplate )
+			{
+				//-----------------------------------------
+				// Replace out the SQL details
+				//-----------------------------------------
+				
 
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_HOST-->", ipsRegistry::$settings['sql_host'], $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_USER-->", ipsRegistry::$settings['sql_user'], $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_PASS-->", ipsRegistry::$settings['sql_pass'], $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_DATABASE-->", ipsRegistry::$settings['sql_database'], $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_PORT-->", ipsRegistry::$settings['sql_port'] ? ipsRegistry::$settings['sql_port'] : 3306, $sphinxTemplate );
+				
+				//-----------------------------------------
+				// Loop over the applications and build
+				//-----------------------------------------
+				
+
+				foreach( ipsRegistry::$applications as $app_dir => $application )
+				{
+					$appSphinxTemplate = '';
+					
+					if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' ) )
+					{
+						require_once ( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' );/*maybeLibHook*/
+						
+						if ( $appSphinxTemplate )
+						{
+							$matches = array();
+							preg_match_all( '#source\s+<!--SPHINX_CONF_PREFIX-->(\w+_delta)\s:{1}#i', $appSphinxTemplate, $matches );
+							
+							if ( is_array( $matches[1] ) && count( $matches[1] ) )
+							{
+								foreach( $matches[1] as $idx )
+								{
+									$sphinxIndexes[] = ipsRegistry::$settings['sphinx_prefix'] . $idx;
+								}
+							}
+							
+							$sphinxCompiled .= $appSphinxTemplate;
+						}
+					}
+				}
+				
+				//-----------------------------------------
+				// Replace DB prefix
+				//-----------------------------------------
+				
+
+				$sphinxCompiled = str_replace( "<!--SPHINX_DB_PREFIX-->", ipsRegistry::$settings['sql_tbl_prefix'], $sphinxCompiled );
+				
+				//-----------------------------------------
+				// And replace out the content with the compilation
+				//-----------------------------------------
+				
+
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONTENT-->", $sphinxCompiled, $sphinxTemplate );
+				
+				//-----------------------------------------
+				// Replace out the /var/sphinx/ path
+				//-----------------------------------------
+				
+
+				$sphinxTemplate = str_replace( "<!--SPHINX_BASE_PATH-->", rtrim( ipsRegistry::$settings['sphinx_base_path'], '/' ), $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_PORT-->", ipsRegistry::$settings['search_sphinx_port'], $sphinxTemplate );
+				$sphinxTemplate = str_replace( "<!--SPHINX_CONF_PREFIX-->", ipsRegistry::$settings['sphinx_prefix'], $sphinxTemplate );
+				
+				//-----------------------------------------
+				// Wildcard support on?
+				//-----------------------------------------
+				
+
+				if ( ipsRegistry::$settings['sphinx_wildcard'] )
+				{
+					$sphinxTemplate = str_replace( '#infix_fields', 'infix_fields', $sphinxTemplate );
+					$sphinxTemplate = str_replace( '#min_infix_len', 'min_infix_len', $sphinxTemplate );
+					$sphinxTemplate = str_replace( '#enable_star', 'enable_star', $sphinxTemplate );
+				}
+			}
+			else
+			{
+				$sphinxTemplate = 'MAIN SPHINX TEMPLATE IS EMPTY';
+			}
+		}
+		else
+		{
+			$sphinxTemplate = 'MAIN SPHINX TEMPLATE NOT FOUND';
+		}
+		
+		/* Return our data */
+		return array( 'content' => $sphinxTemplate, 'deltas' => $sphinxIndexes );
+	}
+	
+	/**
+	 * Build the sphinx.conf file and return it for download
+	 *
+	 * @return	@e void
+	 */
+	public function sphinxBuildConf()
+	{
+		/* Get sphinx data */
+		$sphinxContent = $this->rebuildSphinxConfig();
+		
+		/* Download */
+		$this->cache->setCache( 'sphinx_config', time(), array( 'array' => 0 ) );
+		$this->registry->output->showDownload( $sphinxContent['content'], 'sphinx.conf', '', 0 );
+	}
+	
+	/**
+	 * Build and return the cronjobs strings to rebuild the indexes
+	 *
+	 * @return	@e void
+	 */
+	public function sphinxBuildCron()
+	{
+		/* Got a path? Get the data! */
+		$sphinxData = empty( $this->request['sphinx_conf_path'] ) ? array() : $this->rebuildSphinxConfig();
+		
+		/* Output */
+		$this->registry->output->extra_nav[] = array( $this->settings['base_url'] . $this->form_code . '&amp;do=sphinxBuildCron', $this->lang->words['sphinx_cronjob_title'] );
+		$this->registry->output->html .= $this->html->sphinxConfForm( $sphinxData );
+	}
+	
 	/**
 	 * IN DEV Tool to rebuild all data via XML
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function inDevRebuildAll()
+	protected function inDevRebuildAll()
 	{
+		/* Not IN_DEV? */
+		if ( ! IN_DEV )
+		{
+			$this->applicationsOverview();
+			return;
+		}
+		
 		$output = array();
 		
 		/* Do each app */
 		foreach( ipsRegistry::$applications as $app_dir => $data )
 		{
 			$this->request['_app'] = $app_dir;
-			$return   = $this->moduleImport('', 1, FALSE);
+			$return = $this->moduleImport( '', 1, FALSE );
 			$output[] = 'App - ' . $app_dir . " done: " . $return;
 			
 			/* In dev time stamp? */
 			if ( IN_DEV )
 			{
 				$cache = $this->caches['indev'];
-				$cache['import']['modules'][ $app_dir ] = time();
+				$cache['import']['modules'][$app_dir] = time();
 				$this->cache->setCache( 'indev', $cache, array( 'donow' => 1, 'array' => 1 ) );
 			}
 		}
@@ -303,7 +514,7 @@ class admin_core_applications_applications extends ipsCommand
 		$this->applicationsMenuDataRecache();
 		$this->moduleRecache();
 		
-		$this->registry->output->global_message = implode( "<br />", $output );
+		$this->registry->output->setMessage( implode( "<br />", $output ), 1 );
 		
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
 	}
@@ -311,30 +522,39 @@ class admin_core_applications_applications extends ipsCommand
 	/**
 	 * IN DEV Tool to rebuild all data via XML
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function inDevExportAll()
+	protected function inDevExportAll()
 	{
+		/* Not IN_DEV? */
+		if ( ! IN_DEV )
+		{
+			$this->applicationsOverview();
+			return;
+		}
+		
 		$output = array();
 		
 		/* Do each app */
 		foreach( ipsRegistry::$applications as $app_dir => $data )
 		{
-			if ( ! is_writeable( IPSLib::getAppDir( $app_dir ) . '/xml/' . $app_dir . '_modules.xml' ) )
+			$file = IPSLib::getAppDir( $app_dir ) . '/xml/' . $app_dir . '_modules.xml';
+			
+			if ( is_file( $file ) && ! is_writeable( $file ) )
 			{
-				$output[] = "Cannot write to " . IPSLib::getAppDir( $app_dir ) . '/xml/' . $app_dir . '_modules.xml';
+				$output[] = "Cannot write to " . $file;
 				continue;
 			}
 			
 			$this->request['app_dir'] = $app_dir;
 			$moduleXML = $this->moduleExport( 1 );
 			
-			file_put_contents( IPSLib::getAppDir( $app_dir ) . '/xml/' . $app_dir . '_modules.xml', $moduleXML['xml'] );
+			file_put_contents( $file, $moduleXML['xml'] );
 			
 			$output[] = $app_dir . " modules exported";
 		}
 		
-		$this->registry->output->global_message = implode( "<br />", $output );
+		$this->registry->output->setMessage( implode( "<br />", $output ), 1 );
 		
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
 	}
@@ -342,24 +562,24 @@ class admin_core_applications_applications extends ipsCommand
 	/**
 	 * Remove a module
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function moduleRemove()
+	public function moduleRemove()
 	{
 		//--------------------------------------------
 		// INIT
 		//--------------------------------------------
 		
-		$app_id                 = intval( $this->request['app_id'] );
-		$sys_module_id          = intval( $this->request['sys_module_id'] );
+
+		$app_id = intval( $this->request['app_id'] );
+		$sys_module_id = intval( $this->request['sys_module_id'] );
 		
 		//-----------------------------------------
 		// Got an application?
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select'	=> '*',
-																'from'	=> 'core_applications',
-																'where'	=> 'app_id=' . $app_id ) );
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
 		if ( ! $application['app_id'] )
 		{
@@ -372,10 +592,9 @@ class admin_core_applications_applications extends ipsCommand
 		// Got a module?
 		//-----------------------------------------
 		
-		$module = $this->DB->buildAndFetch( array( 'select'	=> '*',
-															'from'	=> 'core_sys_module',
-															'where'	=> 'sys_module_id='.$sys_module_id ) );
 
+		$module = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_module', 'where' => 'sys_module_id=' . $sys_module_id ) );
+		
 		if ( ! $module['sys_module_id'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_noid'];
@@ -387,6 +606,7 @@ class admin_core_applications_applications extends ipsCommand
 		// Protected?
 		//-----------------------------------------
 		
+
 		if ( ! IN_DEV and $module['sys_module_protected'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_protectedmod'];
@@ -398,21 +618,24 @@ class admin_core_applications_applications extends ipsCommand
 		// Remove...
 		//-----------------------------------------
 		
-		$this->DB->delete( 'core_sys_module', 'sys_module_id='.$sys_module_id );
+
+		$this->DB->delete( 'core_sys_module', 'sys_module_id=' . $sys_module_id );
 		
 		//-----------------------------------------
 		// Recache
 		//-----------------------------------------
 		
+
 		$this->moduleRecache();
 		
 		//-----------------------------------------
 		// Done...
 		//-----------------------------------------
 		
+
 		$this->registry->output->global_message = $this->lang->words['a_removed'];
 		
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id='.$app_id.'&amp;sys_module_admin=' . $module['sys_module_admin'] );
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id=' . $app_id . '&amp;sys_module_admin=' . $module['sys_module_admin'] );
 	}
 	
 	/**
@@ -420,51 +643,56 @@ class admin_core_applications_applications extends ipsCommand
 	 *
 	 * @param	string		[Optional] XML content
 	 * @param	integer		IN_DEV override
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	public function moduleImport( $content='', $in_dev=0, $return=TRUE )
+	public function moduleImport( $content = '', $in_dev = 0, $return = TRUE )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$updated     = 0;
-		$inserted    = 0;
-		$modules	 = array();
-		$apps        = array();
-		$app_id      = 0;
-		$app_dir     = '';
+
+		$updated = 0;
+		$inserted = 0;
+		$modules = array();
+		$apps = array();
+		$app_id = 0;
+		$app_dir = '';
 		
 		//-----------------------------------------
 		// Got content?
 		//-----------------------------------------
 		
+
 		if ( ! $content )
 		{
 			//-----------------------------------------
 			// INDEV?
 			//-----------------------------------------
+			
 
 			if ( $in_dev )
 			{
-				$_FILES['FILE_UPLOAD']['name']	= '';
-				$this->request['file_location']	= IPSLib::getAppDir( $this->request['_app'] ) . '/xml/' . $this->request['_app'] . '_modules.xml';
+				$_FILES['FILE_UPLOAD']['name'] = '';
+				$this->request['file_location'] = IPSLib::getAppDir( $this->request['_app'] ) . '/xml/' . $this->request['_app'] . '_modules.xml';
 			}
 			else
 			{
-				$this->request['file_location']	= IPS_ROOT_PATH . $this->request['file_location'] ;
+				$this->request['file_location'] = IPS_ROOT_PATH . $this->request['file_location'];
 			}
 			
 			//-----------------------------------------
 			// Uploaded file?
 			//-----------------------------------------
-		
-			if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+			
+
+			if ( ! isset( $_FILES['FILE_UPLOAD']['name'] ) or $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ! $_FILES['FILE_UPLOAD']['size'] or ( $_FILES['FILE_UPLOAD']['name'] == "none" ) )
 			{
 				//-----------------------------------------
 				// check and load from server
 				//-----------------------------------------
-			
+				
+
 				if ( ! $this->request['file_location'] )
 				{
 					if ( $return )
@@ -478,8 +706,8 @@ class admin_core_applications_applications extends ipsCommand
 						return 'Nothing to import';
 					}
 				}
-			
-				if ( ! file_exists( $this->request['file_location'] ) )
+				
+				if ( ! is_file( $this->request['file_location'] ) )
 				{
 					if ( $return )
 					{
@@ -492,8 +720,8 @@ class admin_core_applications_applications extends ipsCommand
 						return 'Nothing to import';
 					}
 				}
-			
-				if ( preg_match( "#\.gz$#", $this->request['file_location'] ) )
+				
+				if ( preg_match( '#\.gz$#', $this->request['file_location'] ) )
 				{
 					if ( $FH = @gzopen( $this->request['file_location'], 'rb' ) )
 					{
@@ -501,7 +729,7 @@ class admin_core_applications_applications extends ipsCommand
 						{
 							$content .= @gzread( $FH, 1024 );
 						}
-					
+						
 						@gzclose( $FH );
 					}
 				}
@@ -509,7 +737,7 @@ class admin_core_applications_applications extends ipsCommand
 				{
 					if ( $FH = @fopen( $this->request['file_location'], 'rb' ) )
 					{
-						$content = @fread( $FH, filesize($this->request['file_location']) );
+						$content = @fread( $FH, filesize( $this->request['file_location'] ) );
 						@fclose( $FH );
 					}
 				}
@@ -519,60 +747,59 @@ class admin_core_applications_applications extends ipsCommand
 				//-----------------------------------------
 				// Get uploaded schtuff
 				//-----------------------------------------
-			
+				
+
 				$tmp_name = $_FILES['FILE_UPLOAD']['name'];
-				$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
-			
-				$content  = ipsRegistry::getClass('adminFunctions')->importXml( $tmp_name );
+				$tmp_name = preg_replace( '#\.gz$#', "", $tmp_name );
+				
+				$content = ipsRegistry::getClass( 'adminFunctions' )->importXml( $tmp_name );
 			}
 		}
-	
+		
 		//-----------------------------------------
 		// Get current applications
 		//-----------------------------------------
+		
 
-		$this->DB->build( array( 'select'	=> 'app_id, app_directory',
-										'from'	=> 'core_applications',
-										'order'	=> 'app_id' ) );
-
+		$this->DB->build( array( 'select' => 'app_id, app_directory', 'from' => 'core_applications', 'order' => 'app_id' ) );
 		$this->DB->execute();
-
+		
 		while ( $r = $this->DB->fetch() )
 		{
-			$apps[ $r['app_directory'] ] = $r['app_id'];
+			$apps[$r['app_directory']] = $r['app_id'];
 		}
-			
+		
 		//-----------------------------------------
 		// Get current modules
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select'	=> '*',
-								 'from'		=> 'core_sys_module',
-								 'order'	=> 'sys_module_id' ) );
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_module', 'order' => 'sys_module_id' ) );
 		
 		$this->DB->execute();
 		
 		while ( $r = $this->DB->fetch() )
 		{
-			$modules[ $r['sys_module_application'] ][ intval( $r['sys_module_admin'] ) . '-' . $r['sys_module_key'] ] = $r['sys_module_id'];
+			$modules[$r['sys_module_application']][intval( $r['sys_module_admin'] ) . '-' . $r['sys_module_key']] = $r['sys_module_id'];
 		}
 		
 		//-----------------------------------------
 		// Continue
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
-		$xml    = new classXML( IPS_DOC_CHAR_SET );
 
+		require_once ( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+		$xml = new classXML( IPS_DOC_CHAR_SET );
+		
 		$xml->loadXML( $content );
 		
 		//-----------------------------------------
 		// pArse
 		//-----------------------------------------
 		
-		$fields = array( 'sys_module_title'    , 'sys_module_application', 'sys_module_key'   , 'sys_module_description', 'sys_module_version', 
-						 'sys_module_protected', 'sys_module_visible'    , 'sys_module_position', 'sys_module_admin' );
 
+		$fields = array( 'sys_module_title', 'sys_module_application', 'sys_module_key', 'sys_module_description', 'sys_module_version', 'sys_module_protected', 'sys_module_visible', 'sys_module_position', 'sys_module_admin' );
+		
 		foreach( $xml->fetchElements( 'module' ) as $xmlelement )
 		{
 			$data = $xml->fetchElementsFromRecord( $xmlelement );
@@ -581,31 +808,34 @@ class admin_core_applications_applications extends ipsCommand
 			{
 				if ( ! in_array( $k, $fields ) )
 				{
-					unset( $data[ $k ] );
+					unset( $data[$k] );
 				}
 			}
-		
+			
 			$app_dir = $data['sys_module_application'];
-			$_key    = intval( $data['sys_module_admin'] ) . '-' . $data['sys_module_key'];
+			$_key = intval( $data['sys_module_admin'] ) . '-' . $data['sys_module_key'];
 			
 			//-----------------------------------------
 			// Insert, or update...
 			//-----------------------------------------
 			
-			if ( $apps[ $app_dir ] )
+
+			if ( $apps[$app_dir] )
 			{
 				//-----------------------------------------
 				// Insert or update?
 				//-----------------------------------------
-			
-				if ( $modules[ $app_dir ][ $_key ] )
+				
+
+				if ( $modules[$app_dir][$_key] )
 				{
 					//-----------------------------------------
 					// Update
 					//-----------------------------------------
-				
-					$updated++;
-					$this->DB->update( 'core_sys_module', $data, "sys_module_id=" . $modules[ $data['sys_module_application'] ][ $_key ] );
+					
+
+					$updated ++;
+					$this->DB->update( 'core_sys_module', $data, "sys_module_id=" . $modules[$data['sys_module_application']][$_key] );
 				
 				}
 				else
@@ -613,28 +843,31 @@ class admin_core_applications_applications extends ipsCommand
 					//-----------------------------------------
 					// Insert
 					//-----------------------------------------
-				
-					$inserted++;
+					
+
+					$inserted ++;
 					$this->DB->insert( 'core_sys_module', $data );
 				}
 			}
 		}
-
+		
 		//-----------------------------------------
 		// Done...
 		//-----------------------------------------
 		
+
 		if ( $return )
 		{
 			$this->registry->output->global_message = sprintf( $this->lang->words['a_insertupdated'], $inserted, $updated );
-		
+			
 			//-----------------------------------------
 			// Recache
 			//-----------------------------------------
-		
+			
+
 			$this->moduleRecache();
-		
-			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id=' . $apps[ $app_dir ] );
+			
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id=' . $apps[$app_dir] );
 		}
 		else
 		{
@@ -648,31 +881,29 @@ class admin_core_applications_applications extends ipsCommand
 	 * @param	integer		Return the XML [1] or print to browser [0]
 	 * @return	mixed		XML content or outputs to screen
 	 */
-	public function moduleExport( $return_xml=0 )
+	public function moduleExport( $return_xml = 0 )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$app_id  = intval( $this->request['app_id'] );
+
+		$app_id = intval( $this->request['app_id'] );
 		$app_dir = trim( IPSText::alphanumericalClean( $this->request['app_dir'] ) );
-		$xml     = '';
+		$xml = '';
 		
 		//-----------------------------------------
 		// Get application
 		//-----------------------------------------
 		
+
 		if ( $app_id )
 		{
-			$application = $this->DB->buildAndFetch( array( 'select'	=> '*',
-																	'from'	=> 'core_applications',
-																	'where'	=> 'app_id='.$app_id ) );
+			$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		}
 		else if ( $app_dir )
 		{
-			$application = $this->DB->buildAndFetch( array( 'select'	=> '*',
-																	'from'	=> 'core_applications',
-																	'where'	=> "app_directory='" . $app_dir . "'") );
+			$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => "app_directory='" . $app_dir . "'" ) );
 		}
 		
 		if ( ! $application['app_id'] )
@@ -686,7 +917,8 @@ class admin_core_applications_applications extends ipsCommand
 		// Get xml mah-do-dah
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+
+		require_once ( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->newXMLDocument();
 		
@@ -694,18 +926,17 @@ class admin_core_applications_applications extends ipsCommand
 		// Start...
 		//-----------------------------------------
 		
+
 		$xml->addElement( 'moduleexport' );
 		
 		//-----------------------------------------
 		// Get applications
 		//-----------------------------------------
 		
+
 		$xml->addElement( 'modulegroup', 'moduleexport' );
 		
-		$this->DB->build( array( 'select' => '*',
-													  'from'   => 'core_sys_module',
-													  'where'  => "sys_module_application='".$application['app_directory']."'",
-													  'order'  => 'sys_module_admin, sys_module_position'  ) );
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_module', 'where' => "sys_module_application='" . $application['app_directory'] . "'", 'order' => 'sys_module_admin, sys_module_position' ) );
 		$this->DB->execute();
 		
 		while ( $r = $this->DB->fetch() )
@@ -714,12 +945,12 @@ class admin_core_applications_applications extends ipsCommand
 			
 			$xml->addElementAsRecord( 'modulegroup', 'module', $r );
 		}
-
-		if( $return_xml )
+		
+		if ( $return_xml )
 		{
 			return array( 'title' => $application['app_directory'] . '_modules.xml', 'xml' => $xml->fetchDocument() );
 		}
-		else 
+		else
 		{
 			$this->registry->output->showDownload( $xml->fetchDocument(), $application['app_directory'] . '_modules.xml', '', 0 );
 		}
@@ -729,32 +960,32 @@ class admin_core_applications_applications extends ipsCommand
 	 * Save a module
 	 *
 	 * @param 	string		Type [add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function moduleSave( $type='add' )
+	public function moduleSave( $type = 'add' )
 	{
 		//--------------------------------------------
 		// INIT
 		//--------------------------------------------
 		
-		$app_id                 = intval( $this->request['app_id'] );
-		$sys_module_admin       = intval( $this->request['sys_module_admin'] );
-		$sys_module_id          = intval( $this->request['sys_module_id'] );
-		$sys_module_title		= trim( $this->request['sys_module_title'] );
-		$sys_module_key		    = IPSText::alphanumericalClean( trim( $this->request['sys_module_key'] ) );
+
+		$app_id = intval( $this->request['app_id'] );
+		$sys_module_admin = intval( $this->request['sys_module_admin'] );
+		$sys_module_id = intval( $this->request['sys_module_id'] );
+		$sys_module_title = trim( $this->request['sys_module_title'] );
+		$sys_module_key = IPSText::alphanumericalClean( trim( $this->request['sys_module_key'] ) );
 		$sys_module_description = trim( $this->request['sys_module_description'] );
-		$sys_module_version	    = trim( $this->request['sys_module_version'] );
-		$sys_module_protected   = intval( $this->request['sys_module_protected'] );
-		$sys_module_visible     = intval( $this->request['sys_module_visible'] );
-		$application            = array();
+		$sys_module_version = trim( $this->request['sys_module_version'] );
+		$sys_module_protected = intval( $this->request['sys_module_protected'] );
+		$sys_module_visible = intval( $this->request['sys_module_visible'] );
+		$application = array();
 		
 		//-----------------------------------------
 		// Got an application?
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select'	=> '*',
-																'from'	=> 'core_applications',
-																'where'	=> 'app_id='.$app_id ) );
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
 		if ( ! $application['app_id'] )
 		{
@@ -767,12 +998,11 @@ class admin_core_applications_applications extends ipsCommand
 		// Check
 		//--------------------------------------------
 		
+
 		if ( $type == 'edit' )
 		{
-			$module = $this->DB->buildAndFetch( array( 'select' => '*',
-																		'from'   => 'core_sys_module',
-																		'where'  => 'sys_module_id='.$sys_module_id ) );
-
+			$module = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_module', 'where' => 'sys_module_id=' . $sys_module_id ) );
+			
 			if ( ! $module['sys_module_id'] )
 			{
 				$this->registry->output->global_message = $this->lang->words['a_noid'];
@@ -786,24 +1016,24 @@ class admin_core_applications_applications extends ipsCommand
 			// Make sure that we don't have a key already
 			//-----------------------------------------
 			
-			$test = $this->DB->buildAndFetch( array( 'select' => 'sys_module_id',
-																	  'from'   => 'core_sys_module',
-																	  'where'  => "sys_module_key='".$sys_module_key."' AND sys_module_application='".$application['app_directory']."' AND sys_module_admin=".$sys_module_admin ) );
-																	
+
+			$test = $this->DB->buildAndFetch( array( 'select' => 'sys_module_id', 'from' => 'core_sys_module', 'where' => "sys_module_key='" . $sys_module_key . "' AND sys_module_application='" . $application['app_directory'] . "' AND sys_module_admin=" . $sys_module_admin ) );
+			
 			if ( $test['sys_module_id'] )
 			{
 				$this->registry->output->global_message = sprintf( $this->lang->words['a_already'], $sys_module_key );
 				$this->modules_overview();
 				return;
 			}
-			
+		
 		}
 		
 		//-----------------------------------------
 		// Form checks...
 		//-----------------------------------------
 		
-		if ( ! $sys_module_title OR ! $sys_module_key )
+
+		if ( ! $sys_module_title or ! $sys_module_key )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_titlekey'];
 			$this->moduleForm( $type );
@@ -814,18 +1044,14 @@ class admin_core_applications_applications extends ipsCommand
 		// Check...
 		//--------------------------------------------
 		
-		$array = array( 'sys_module_title'       => $sys_module_title,
-						'sys_module_application' => $application['app_directory'],
-						'sys_module_key'	     => $sys_module_key,
-						'sys_module_description' => $sys_module_description,
-						'sys_module_version'	 => $sys_module_version,
-						'sys_module_visible'	 => $sys_module_visible,
-						'sys_module_admin'       => $sys_module_admin );
+
+		$array = array( 'sys_module_title' => $sys_module_title, 'sys_module_application' => $application['app_directory'], 'sys_module_key' => $sys_module_key, 'sys_module_description' => $sys_module_description, 'sys_module_version' => $sys_module_version, 'sys_module_visible' => $sys_module_visible, 'sys_module_admin' => $sys_module_admin );
 		
 		//-----------------------------------------
 		// IN DEV?
 		//-----------------------------------------
 		
+
 		if ( IN_DEV )
 		{
 			$array['sys_module_protected'] = $sys_module_protected;
@@ -835,18 +1061,19 @@ class admin_core_applications_applications extends ipsCommand
 		// Save...
 		//-----------------------------------------
 		
+
 		if ( $type == 'add' )
 		{
-			$max	= $this->DB->buildAndFetch( array( 'select' => 'MAX(sys_module_position) as position', 'from' => 'core_sys_module' ) );
+			$max = $this->DB->buildAndFetch( array( 'select' => 'MAX(sys_module_position) as position', 'from' => 'core_sys_module' ) );
 			
-			$array['sys_module_position']	= $max['position'] + 1;
+			$array['sys_module_position'] = $max['position'] + 1;
 			
 			$this->DB->insert( 'core_sys_module', $array );
 			$this->registry->output->global_message = $this->lang->words['a_added'];
 		}
 		else
 		{
-			$this->DB->update( 'core_sys_module', $array, 'sys_module_id='.$sys_module_id );
+			$this->DB->update( 'core_sys_module', $array, 'sys_module_id=' . $sys_module_id );
 			$this->registry->output->global_message = $this->lang->words['a_edited'];
 		}
 		
@@ -854,43 +1081,45 @@ class admin_core_applications_applications extends ipsCommand
 		// Recache
 		//-----------------------------------------
 		
+
 		$this->moduleRecache();
 		
 		//-----------------------------------------
 		// List...
 		//-----------------------------------------
 		
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id='.$app_id.'&amp;sys_module_admin='.$sys_module_admin );
+
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id=' . $app_id . '&amp;sys_module_admin=' . $sys_module_admin );
 	}
 	
 	/**
 	 * Add/Edit module form
 	 *
 	 * @param	string		Type [add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function moduleForm( $type='add' )
+	public function moduleForm( $type = 'add' )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
+
 		$sys_module_admin = intval( $this->request['sys_module_admin'] );
-		$sys_module_id    = intval( $this->request['sys_module_id'] );
-		$app_id		      = intval( $this->request['app_id'] );
-		$module           = array( 'sys_module_admin' => $sys_module_admin );
-		$modules          = array( 'root' => array() );
-		$application      = array();
-		$form             = array();
-		$module_type      = array( 0 => array( 0, $this->lang->words['a_public'] ), 1 => array( 1, $this->lang->words['a_admin'] ) );
+		$sys_module_id = intval( $this->request['sys_module_id'] );
+		$app_id = intval( $this->request['app_id'] );
+		$module = array( 'sys_module_admin' => $sys_module_admin );
+		$modules = array( 'root' => array() );
+		$application = array();
+		$form = array();
+		$module_type = array( 0 => array( 0, $this->lang->words['a_public'] ), 1 => array( 1, $this->lang->words['a_admin'] ) );
 		
 		//-----------------------------------------
 		// Get application
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select' => '*',
-																		 'from'   => 'core_applications',
-																		 'where'  => 'app_id='.$app_id ) );
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
 		if ( ! $application['app_id'] )
 		{
@@ -898,23 +1127,22 @@ class admin_core_applications_applications extends ipsCommand
 			$this->applicationsOverview();
 			return;
 		}
-
+		
 		//-----------------------------------------
 		// Add or edit?
 		//-----------------------------------------
 		
+
 		if ( $type == 'add' )
 		{
 			$formcode = 'module_add_do';
-			$title    = $this->lang->words['addnewmodule_apps'];
-			$button   = $this->lang->words['addnewmodule_apps'];
+			$title = $this->lang->words['addnewmodule_apps'];
+			$button = $this->lang->words['addnewmodule_apps'];
 		}
 		else
 		{
-			$module = $this->DB->buildAndFetch( array( 'select' => '*',
-																		'from'   => 'core_sys_module',
-																		'where'  => 'sys_module_id='.$sys_module_id ) );
-
+			$module = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_module', 'where' => 'sys_module_id=' . $sys_module_id ) );
+			
 			if ( ! $module['sys_module_id'] )
 			{
 				$this->registry->output->global_message = $this->lang->words['a_noid'];
@@ -923,27 +1151,29 @@ class admin_core_applications_applications extends ipsCommand
 			}
 			
 			$sys_module_admin = $module['sys_module_admin'];
-			$formcode         = 'module_edit_do';
-			$title            = $this->lang->words['a_editmod'] . $module['sys_module_title'];
-			$button           = $this->lang->words['a_savechanges'];
+			$formcode = 'module_edit_do';
+			$title = $this->lang->words['a_editmod'] . $module['sys_module_title'];
+			$button = $this->lang->words['a_savechanges'];
 		}
 		
 		//-----------------------------------------
 		// Form elements
 		//-----------------------------------------
 		
-		$form['sys_module_title']       = $this->registry->output->formInput(  'sys_module_title'      , $_POST['sys_module_title']         ? $_POST['sys_module_title']       : $module['sys_module_title'] );
-		$form['sys_module_description'] = $this->registry->output->formInput(  'sys_module_description', $_POST['sys_module_description']   ? $_POST['sys_module_description'] : $module['sys_module_description'] );
-		$form['sys_module_key']         = $this->registry->output->formInput(  'sys_module_key'        , $_POST['sys_module_key']           ? $_POST['sys_module_key']         : $module['sys_module_key'] );
-		$form['sys_module_version']     = $this->registry->output->formInput(  'sys_module_version'    , $_POST['sys_module_version']       ? $_POST['sys_module_version']     : $module['sys_module_version'] );
-		$form['sys_module_protected']   = $this->registry->output->formYesNo( 'sys_module_protected'  , $_POST['sys_module_protected']     ? $_POST['sys_module_protected']   : $module['sys_module_protected'] );
-		$form['sys_module_visible']     = $this->registry->output->formYesNo( 'sys_module_visible'    , $_POST['sys_module_visible']       ? $_POST['sys_module_visible']     : $module['sys_module_visible'] );
-		$form['sys_module_admin']      = $this->registry->output->formDropdown(  'sys_module_admin'    , $module_type, $_POST['sys_module_admin'] ? $_POST['sys_module_admin']        : $module['sys_module_admin'] );
+
+		$form['sys_module_title'] = $this->registry->output->formInput( 'sys_module_title', $_POST['sys_module_title'] ? $_POST['sys_module_title'] : $module['sys_module_title'] );
+		$form['sys_module_description'] = $this->registry->output->formInput( 'sys_module_description', $_POST['sys_module_description'] ? $_POST['sys_module_description'] : $module['sys_module_description'] );
+		$form['sys_module_key'] = $this->registry->output->formInput( 'sys_module_key', $_POST['sys_module_key'] ? $_POST['sys_module_key'] : $module['sys_module_key'] );
+		$form['sys_module_version'] = $this->registry->output->formInput( 'sys_module_version', $_POST['sys_module_version'] ? $_POST['sys_module_version'] : $module['sys_module_version'] );
+		$form['sys_module_protected'] = $this->registry->output->formYesNo( 'sys_module_protected', $_POST['sys_module_protected'] ? $_POST['sys_module_protected'] : $module['sys_module_protected'] );
+		$form['sys_module_visible'] = $this->registry->output->formYesNo( 'sys_module_visible', $_POST['sys_module_visible'] ? $_POST['sys_module_visible'] : $module['sys_module_visible'] );
+		$form['sys_module_admin'] = $this->registry->output->formDropdown( 'sys_module_admin', $module_type, $_POST['sys_module_admin'] ? $_POST['sys_module_admin'] : $module['sys_module_admin'] );
 		
 		//-----------------------------------------
 		// Nav
 		//-----------------------------------------
 		
+
 		$this->registry->output->extra_nav[] = array( $this->settings['base_url'] . $this->form_code . '&amp;do=modules_overview&amp;app_id=' . $application['app_id'] . '&amp;sys_module_admin=' . $module['sys_module_admin'], $application['app_title'] );
 		
 		$this->registry->output->html .= $this->html->module_form( $form, $title, $formcode, $button, $module, $application );
@@ -952,61 +1182,64 @@ class admin_core_applications_applications extends ipsCommand
 	/**
 	 * Move a module up/down
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function moduleManagePosition()
+	public function moduleManagePosition()
 	{
-		$app_id           = intval( $this->request['app_id'] );
+		$app_id = intval( $this->request['app_id'] );
 		
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
+		
 
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
-		$ajax		 = new $classToLoad();
+		$ajax = new $classToLoad();
 		
 		//-----------------------------------------
 		// Checks...
 		//-----------------------------------------
+		
 
-		if( !$app_id )
+		if ( ! $app_id )
 		{
 			$ajax->returnString( $this->lang->words['postform_badmd5'] );
 			exit();
 		}
 		
-		if( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
+		if ( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
 		{
 			$ajax->returnString( $this->lang->words['postform_badmd5'] );
 			exit();
 		}
- 		
- 		//-----------------------------------------
- 		// Save new position
- 		//-----------------------------------------
+		
+		//-----------------------------------------
+		// Save new position
+		//-----------------------------------------
+		
 
- 		$position	= 1;
- 		
- 		if( is_array($this->request['modules']) AND count($this->request['modules']) )
- 		{
- 			foreach( $this->request['modules'] as $this_id )
- 			{
- 				$this->DB->update( 'core_sys_module', array( 'sys_module_position' => $position ), 'sys_module_id=' . $this_id );
- 				
- 				$position++;
- 			}
- 		}
- 		
- 		$this->moduleRecache();
-
- 		$ajax->returnString( 'OK' );
- 		exit();
+		$position = 1;
+		
+		if ( is_array( $this->request['modules'] ) and count( $this->request['modules'] ) )
+		{
+			foreach( $this->request['modules'] as $this_id )
+			{
+				$this->DB->update( 'core_sys_module', array( 'sys_module_position' => $position ), 'sys_module_id=' . $this_id );
+				
+				$position ++;
+			}
+		}
+		
+		$this->moduleRecache();
+		
+		$ajax->returnString( 'OK' );
+		exit();
 	}
 	
 	/**
 	 * Recache modules
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function moduleRecache()
 	{
@@ -1015,19 +1248,13 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// Load known modules
 		//-----------------------------------------
+		
 
-		$this->DB->build( array( 'select'		=> 'm.*',
-										'from'		=> array( 'core_sys_module' => 'm' ),
-										'where'		=> 'm.sys_module_visible=1',
-										'order'		=> 'a.app_position, m.sys_module_position ASC',
-										'add_join'	=> array( 0 => array( 'select'	=> 'a.*',
-												 							'from'	=> array( 'core_applications' => 'a' ),
-																			'where'	=> 'm.sys_module_application=a.app_directory',
-																			'type'	=> 'inner' ) ) ) );
-
+		$this->DB->build( array( 'select' => 'm.*', 'from' => array( 'core_sys_module' => 'm' ), 'where' => 'm.sys_module_visible=1', 'order' => 'a.app_position, m.sys_module_position ASC', 'add_join' => array( array( 'select' => 'a.*', 'from' => array( 'core_applications' => 'a' ), 'where' => 'm.sys_module_application=a.app_directory', 'type' => 'inner' ) ) ) );
+		
 		$this->DB->execute();
-
-		while( $row = $this->DB->fetch() )
+		
+		while ( $row = $this->DB->fetch() )
 		{
 			$_row = array();
 			
@@ -1035,31 +1262,31 @@ class admin_core_applications_applications extends ipsCommand
 			{
 				if ( strpos( $k, "sys_" ) === 0 )
 				{
-					$_row[ $k ] = $v;
+					$_row[$k] = $v;
 				}
 			}
 			
-			$modules[ $row['sys_module_application'] ][] = $_row;
+			$modules[$row['sys_module_application']][] = $_row;
 		}
-
+		
 		$this->cache->setCache( 'module_cache', $modules, array( 'array' => 1 ) );
 	}
 	
 	/**
 	 * Recache apps, modules and menus
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	public function moduleRecacheAll( $return=0 )
+	public function moduleRecacheAll( $return = 0 )
 	{
 		$this->applicationsRecache();
 		$this->applicationsMenuDataRecache();
 		$this->moduleRecache();
 		
-		if( ! $return )
+		if ( ! $return )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_recachecomplete'];
-		
+			
 			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
 		}
 	}
@@ -1067,31 +1294,30 @@ class admin_core_applications_applications extends ipsCommand
 	/**
 	 * View al module
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function modules_overview()
+	public function modules_overview()
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$sys_module_admin	= intval( $this->request['sys_module_admin'] );
-		$app_id				= intval( $this->request['app_id'] );
-		$application		= array();
-		$modules			= array();
-		$_modules			= array();
-		$_parents			= array();
-		$seen_count			= 0;
-		$_modules_admin		= ( $sys_module_admin ) ? 'modules_admin' : 'modules_public';
+
+		$sys_module_admin = intval( $this->request['sys_module_admin'] );
+		$app_id = intval( $this->request['app_id'] );
+		$application = array();
+		$modules = array();
+		$_modules = array();
+		$_parents = array();
+		$_modules_admin = ( $sys_module_admin ) ? 'modules_admin' : 'modules_public';
 		
 		//-----------------------------------------
 		// Get application
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select' => '*',
-																		 'from'   => 'core_applications',
-																		 'where'  => 'app_id='.$app_id ) );
-																		
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
+		
 		if ( ! $application['app_id'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_noid'];
@@ -1103,102 +1329,98 @@ class admin_core_applications_applications extends ipsCommand
 		// Get modules
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select' => '*',
-													  'from'   => 'core_sys_module',
-													  'where'  => "sys_module_application='".$application['app_directory']."' AND sys_module_admin=".$sys_module_admin,
-													  'order'  => 'sys_module_position ASC' ) );
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_module', 'where' => "sys_module_application='" . $application['app_directory'] . "' AND sys_module_admin=" . $sys_module_admin, 'order' => 'sys_module_position ASC' ) );
 		$this->DB->execute();
 		
-		while( $row = $this->DB->fetch() )
+		while ( $row = $this->DB->fetch() )
 		{
 			//-----------------------------------------
 			// Enabled?
 			//-----------------------------------------
 			
-			$row['_sys_module_visible'] = ( $row['sys_module_visible'] ) ? 'tick.png' : 'cross.png';
 
-			//-----------------------------------------
-			// Exists...
-			//-----------------------------------------
-			
-			if ( ! file_exists( IPSLib::getAppDir(  $application['app_directory'] ) . '/'. $_modules_admin . '/'. $row['sys_module_key'] ) )
-			{
-				$row['_missing'] = 1;
-			}
+			$row['_sys_module_visible'] = ( $row['sys_module_visible'] ) ? 'tick.png' : 'cross.png';
 			
 			//-----------------------------------------
 			// Add to row
 			//-----------------------------------------
 			
-			$_modules[ $row['sys_module_id'] ] = $row;
-			
-			$_parents[ $row['sys_module_id'] ] = $row['sys_module_id'];
-		}
 
+			$_modules[$row['sys_module_id']] = $row;
+			
+			$_parents[$row['sys_module_id']] = $row['sys_module_id'];
+		}
+		
 		//-----------------------------------------
 		// Loop...
 		//-----------------------------------------
 		
+
 		foreach( $_parents as $_sys_module_id => $sys_module_id )
 		{
-			$row = $_modules[ $_sys_module_id ];
-			
-			$seen_count++;
+			$row = $_modules[$_sys_module_id];
 			
 			//-----------------------------------------
 			// Add to row
 			//-----------------------------------------
 			
+
 			$modules[] = $row;
 		}
-
+		
 		//-----------------------------------------
 		// List 'em
 		//-----------------------------------------
 		
+
 		$this->registry->output->html .= $this->html->modules_list( $modules, $application, $sys_module_admin );
 	}
 	
 	/**
 	 * Remove an application (confirm screen)
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationRemoveSplash()
+	public function applicationRemoveSplash()
 	{
 		//--------------------------------------------
 		// INIT
 		//--------------------------------------------
 		
+
 		$app_id = intval( $this->request['app_id'] );
 		
 		//-----------------------------------------
 		// Got an application?
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id='.$app_id ) );
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
-		$this->registry->output->html .= $this->html->application_remove_splash( $application );	
+		$this->registry->output->html .= $this->html->application_remove_splash( $application );
 	}
 	
 	/**
 	 * Remove an application
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationRemove()
+	public function applicationRemove()
 	{
 		//--------------------------------------------
 		// INIT
 		//--------------------------------------------
 		
+
 		$app_id = intval( $this->request['app_id'] );
 		
 		//-----------------------------------------
 		// Got an application?
 		//-----------------------------------------
 		
-		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id='.$app_id ) );
+
+		$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
 		
 		if ( ! $application['app_id'] )
 		{
@@ -1211,45 +1433,48 @@ class admin_core_applications_applications extends ipsCommand
 		// Protected?
 		//-----------------------------------------
 		
+
 		if ( ! IN_DEV and $application['app_protected'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_protectapp'];
 			$this->applicationsOverview();
 			return;
 		}
-				
+		
 		//-----------------------------------------
 		// Remove Settings
 		//-----------------------------------------				
-		
-		$this->DB->build( array( 'select' => '*', 'from'  => 'core_sys_settings_titles', 'where' => "conf_title_app='{$application['app_directory']}'" ) );
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_settings_titles', 'where' => "conf_title_app='{$application['app_directory']}'" ) );
 		$this->DB->execute();
 		
 		$conf_title_id = array();
-		while( $r = $this->DB->fetch() )
+
+		while ( $r = $this->DB->fetch() )
 		{
 			$conf_title_id[] = $r['conf_title_id'];
 		}
 		
-		if( count( $conf_title_id ) )
+		if ( count( $conf_title_id ) )
 		{
 			$this->DB->delete( 'core_sys_conf_settings', 'conf_group IN(' . implode( ',', $conf_title_id ) . ')' );
 		}
 		
 		$this->DB->delete( 'core_sys_settings_titles', "conf_title_app='{$application['app_directory']}'" );
-
+		
 		//-----------------------------------------
 		// Remove Application Caches
 		//-----------------------------------------		
 		
-		$_file = IPSLib::getAppDir( $application['app_directory'] ).'/extensions/coreVariables.php';
+
+		$_file = IPSLib::getAppDir( $application['app_directory'] ) . '/extensions/coreVariables.php';
 		
-		if ( file_exists( $_file ) )
+		if ( is_file( $_file ) )
 		{
 			$CACHE = array();
-			require( $_file );
+			require ( $_file );/*noLibHook*/
 			
-			if ( is_array( $CACHE ) AND count( $CACHE ) )
+			if ( is_array( $CACHE ) and count( $CACHE ) )
 			{
 				foreach( $CACHE as $key => $data )
 				{
@@ -1261,23 +1486,25 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// Remove tables
 		//-----------------------------------------
+		
 
 		$_file = IPSLib::getAppDir( $application['app_directory'] ) . '/setup/versions/install/sql/' . $application['app_directory'] . '_' . ipsRegistry::dbFunctions()->getDriverType() . '_tables.php';
-
-		if( file_exists( $_file ) )
+		
+		if ( is_file( $_file ) )
 		{
 			$TABLE = array();
-			require( $_file );
-
+			require ( $_file );/*noLibHook*/
+			
 			foreach( $TABLE as $q )
 			{
 				//-----------------------------------------
 				// Capture create tables first
 				//-----------------------------------------
 				
+
 				preg_match( "/CREATE TABLE (\S+)(\s)?\(/", $q, $match );
 				
-				if( $match[1] )
+				if ( $match[1] )
 				{
 					$this->DB->dropTable( preg_replace( '#^' . ipsRegistry::dbFunctions()->getPrefix() . "(\S+)#", "\\1", $match[1] ) );
 				}
@@ -1287,9 +1514,10 @@ class admin_core_applications_applications extends ipsCommand
 					// Then capture alter tables
 					//-----------------------------------------
 					
+
 					preg_match( "/ALTER TABLE (\S+)\sADD\s(\S+)\s/i", $q, $match );
 					
-					if( $match[1] AND $match[2] )
+					if ( $match[1] and $match[2] )
 					{
 						$this->DB->dropField( preg_replace( '#^' . ipsRegistry::dbFunctions()->getPrefix() . "(\S+)#", "\\1", $match[1] ), $match[2] );
 					}
@@ -1300,92 +1528,161 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// Check for uninstall sql
 		//-----------------------------------------
+		
 
 		/* Any "extra" configs required for this driver? */
-		if( file_exists( IPS_ROOT_PATH . 'setup/sql/' . $this->settings['sql_driver'] . '_install.php' ) )
+		if ( is_file( IPS_ROOT_PATH . 'setup/sql/' . $this->settings['sql_driver'] . '_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'setup/sql/' . $this->settings['sql_driver'] . '_install.php' );
-
+			require_once ( IPS_ROOT_PATH . 'setup/sql/' . $this->settings['sql_driver'] . '_install.php' );/*noLibHook*/
+			
 			$extra_install = new install_extra( $this->registry );
 		}
 		
-		$_file = IPSLib::getAppDir(  $application['app_directory'] ) . '/setup/versions/install/sql/' . $application['app_directory'] . '_' . ipsRegistry::dbFunctions()->getDriverType() . '_uninstall.php';
+		$_file = IPSLib::getAppDir( $application['app_directory'] ) . '/setup/versions/install/sql/' . $application['app_directory'] . '_' . ipsRegistry::dbFunctions()->getDriverType() . '_uninstall.php';
 		
-		if( file_exists( $_file ) )
+		if ( is_file( $_file ) )
 		{
 			$QUERY = array();
-			require( $_file );
+			require ( $_file );/*noLibHook*/
 			
-			if ( is_array( $QUERY ) AND count( $QUERY ) )
-			{			
+			if ( is_array( $QUERY ) and count( $QUERY ) )
+			{
 				foreach( $QUERY as $q )
 				{
-					if ( $extra_install AND method_exists( $extra_install, 'process_query_create' ) )
+					if ( $extra_install and method_exists( $extra_install, 'process_query_create' ) )
 					{
-						 $q = $extra_install->process_query_create( $q );
+						$q = $extra_install->process_query_create( $q );
 					}
 					
 					$this->DB->query( $q );
 				}
 			}
-		}				
+		}
 		
 		//-----------------------------------------
 		// Remove Misc Stuff
 		//-----------------------------------------		
 		
-		$this->DB->delete( 'core_sys_lang_words'	, "word_app='{$application['app_directory']}'" );
-		$this->DB->delete( 'task_manager'			, "task_application='{$application['app_directory']}'" );
-		$this->DB->delete( 'permission_index'		, "app='{$application['app_directory']}'" );
-		$this->DB->delete( 'reputation_index'		, "app='{$application['app_directory']}'" );
-		$this->DB->delete( 'tags_index'				, "app='{$application['app_directory']}'" );
-		$this->DB->delete( 'faq'					, "app='{$application['app_directory']}'" );
-		$this->DB->delete( 'custom_bbcode'			, "bbcode_app='{$application['app_directory']}'" );
 
+		$this->DB->delete( 'core_sys_lang_words', "word_app='{$application['app_directory']}'" );
+		$this->DB->delete( 'task_manager', "task_application='{$application['app_directory']}'" );
+		$this->DB->delete( 'permission_index', "app='{$application['app_directory']}'" );
+		$this->DB->delete( 'reputation_index', "app='{$application['app_directory']}'" );
+		$this->DB->delete( 'reputation_cache', "app='{$application['app_directory']}'" );
+		$this->DB->delete( 'tags_index', "app='{$application['app_directory']}'" );
+		$this->DB->delete( 'faq', "app='{$application['app_directory']}'" );
+		$this->DB->delete( 'custom_bbcode', "bbcode_app='{$application['app_directory']}'" );
+		$this->DB->delete( 'upgrade_history', "upgrade_app='{$application['app_directory']}'" );
+		$this->DB->delete( 'core_like_cache', "like_cache_app='{$application['app_directory']}'" );
+		$this->DB->delete( 'core_like', "like_app='{$application['app_directory']}'" );
+		$this->DB->delete( 'core_item_markers', "item_app='{$application['app_directory']}'" );
+		
+		//-----------------------------------------
+		// Report center..
+		//-----------------------------------------
+
+		$plugin = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'rc_classes', 'where' => "app='{$application['app_directory']}'" ) );
+		
+		if ( $plugin['com_id'] )
+		{
+			$this->DB->build( array( 'select' => '*', 'from' => 'rc_reports_index', 'where' => 'rc_class=' . $plugin['com_id'] ) );
+			$outer = $this->DB->execute();
+			
+			while ( $r = $this->DB->fetch( $outer ) )
+			{
+				$this->DB->delete( 'rc_reports', "rid=" . $r['id'] );
+				$this->DB->delete( 'rc_comments', "rid=" . $r['id'] );
+			}
+			
+			$this->DB->delete( 'rc_reports_index', 'rc_class=' . $plugin['com_id'] );
+		}
+		
+		//-----------------------------------------
+		// Attachments
+		//-----------------------------------------
+
+		$_plugins = array();
+		
+		try
+		{
+			foreach( new DirectoryIterator( IPSLib::getAppDir( $application['app_directory'] ) . '/extensions/attachments/' ) as $file )
+			{
+				if ( ! $file->isDot() && $file->isFile() )
+				{
+					if ( preg_match( "/^plugin_(.+?)\.php$/", $file->getFileName(), $matches ) )
+					{
+						$_plugins[] = $matches[1];
+					}
+				}
+			}
+			
+			if ( count( $_plugins ) )
+			{
+				foreach( $_plugins as $_plugin )
+				{
+					$this->DB->build( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_rel_module='{$_plugin}'" ) );
+					$outer = $this->DB->execute();
+					
+					while ( $r = $this->DB->fetch( $outer ) )
+					{
+						if ( is_file( $this->settings['upload_dir'] . "/" . $r['attach_location'] ) )
+						{
+							@unlink( $this->settings['upload_dir'] . "/" . $r['attach_location'] );
+						}
+					}
+					
+					$this->DB->delete( 'attachments', "attach_rel_module='{$_plugin}'" );
+				}
+			}
+		}
+		catch( Exception $e )
+		{
+		}
+		
 		//-----------------------------------------
 		// Get all hook files
 		//-----------------------------------------
-		
-		if( is_dir( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/hooks' ) )
+
+		if ( is_dir( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/hooks' ) )
 		{
-			$files	= scandir( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/hooks' );
-			$hooks	= array();
+			$files = scandir( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/hooks' );
+			$hooks = array();
 			
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
-			$xml    = new classXML( IPS_DOC_CHAR_SET );
+			require_once ( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+			$xml = new classXML( IPS_DOC_CHAR_SET );
 			
-			if( count($files) AND is_array($files) )
+			if ( count( $files ) and is_array( $files ) )
 			{
 				foreach( $files as $_hookFile )
 				{
-					if( $_hookFile != '.' AND $_hookFile != '..' AND preg_match( "/(\.xml)$/", $_hookFile ) )
+					if ( $_hookFile != '.' and $_hookFile != '..' and preg_match( "/(\.xml)$/", $_hookFile ) )
 					{
 						$xml->loadXML( file_get_contents( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/hooks/' . $_hookFile ) );
-				
-						foreach( $xml->fetchElements('config') as $data )
+						
+						foreach( $xml->fetchElements( 'config' ) as $data )
 						{
-							$config	= $xml->fetchElementsFromRecord( $data );
-				
-							if( !count($config) )
+							$config = $xml->fetchElementsFromRecord( $data );
+							
+							if ( ! count( $config ) )
 							{
 								continue;
 							}
 							else
 							{
-								$hooks[]	= $config['hook_key'];
+								$hooks[] = $config['hook_key'];
 							}
 						}
 					}
 				}
 			}
 			
-			if( count($hooks) )
+			if ( count( $hooks ) )
 			{
 				foreach( $hooks as $hook )
 				{
-					$hook		= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => "hook_key='" . $hook . "'" ) );
+					$hook = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => "hook_key='" . $hook . "'" ) );
 					
-					if( ! $hook['hook_id'] )
+					if ( ! $hook['hook_id'] )
 					{
 						continue;
 					}
@@ -1396,7 +1693,7 @@ class admin_core_applications_applications extends ipsCommand
 					$this->DB->build( array( 'select' => 'hook_file_stored', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id=' . $hook['hook_id'] ) );
 					$this->DB->execute();
 					
-					while( $r = $this->DB->fetch() )
+					while ( $r = $this->DB->fetch() )
 					{
 						@unlink( IPS_HOOKS_PATH . $r['hook_file_stored'] );
 					}
@@ -1412,19 +1709,19 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// Remove Files
 		//-----------------------------------------
-		
+
 		/* Languages */
 		try
 		{
 			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/lang_cache/' ) as $dir )
 			{
-				if( ! $dir->isDot() && intval( $dir->getFileName() ) )
+				if ( ! $dir->isDot() && intval( $dir->getFileName() ) )
 				{
 					foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/lang_cache/' . $dir->getFileName() . '/' ) as $file )
 					{
-						if( ! $file->isDot() )
+						if ( ! $file->isDot() )
 						{
-							if( preg_match( "/^({$application['app_directory']}_)/", $file->getFileName() ) )
+							if ( preg_match( "/^({$application['app_directory']}_)/", $file->getFileName() ) )
 							{
 								unlink( $file->getPathName() );
 							}
@@ -1432,103 +1729,112 @@ class admin_core_applications_applications extends ipsCommand
 					}
 				}
 			}
-		} catch ( Exception $e ) {}
+		}
+		catch( Exception $e )
+		{
+		}
 		
 		/* Remove Skins */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
-		$xml = new classXML( $this->settings['gb_char_set'] );
-		$xml->load( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/information.xml' );
-
-		if ( is_object( $xml->fetchElements( 'template' ) ) )
+		if( is_file( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/information.xml' ) )
 		{
-			foreach( $xml->fetchElements( 'template' ) as $template )
+			require_once ( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+			$xml = new classXML( $this->settings['gb_char_set'] );
+			$xml->load( IPSLib::getAppDir( $application['app_directory'] ) . '/xml/information.xml' );
+			
+			if ( is_object( $xml->fetchElements( 'template' ) ) )
 			{
-				$name  = $xml->fetchItem( $template );
-				$match = $xml->fetchAttribute( $template, 'match' );
-		
-				if ( $name )
+				foreach( $xml->fetchElements( 'template' ) as $template )
 				{
-					$templateGroups[ $name ] = $match;
+					$name = $xml->fetchItem( $template );
+					$match = $xml->fetchAttribute( $template, 'match' );
+					
+					if ( $name )
+					{
+						$templateGroups[$name] = $match;
+					}
 				}
 			}
-		}
-
-		if( is_array($templateGroups) AND count($templateGroups) )
-		{
-			/* Loop through skin directories */
-			try
+			
+			if ( is_array( $templateGroups ) and count( $templateGroups ) )
 			{
-				foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/skin_cache/' ) as $dir )
+				/* Loop through skin directories */
+				try
 				{
-					if( preg_match( "/^(cacheid_)/", $dir->getFileName() ) )
+					foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/skin_cache/' ) as $dir )
 					{
-						foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/skin_cache/' . $dir->getFileName() . '/' ) as $file )
+						if ( preg_match( "/^(cacheid_)/", $dir->getFileName() ) )
 						{
-							if( ! $file->isDot() )
+							foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache/skin_cache/' . $dir->getFileName() . '/' ) as $file )
 							{
-								foreach( $templateGroups as $name => $match )
+								if ( ! $file->isDot() )
 								{
-									if( $match == 'contains' )
+									foreach( $templateGroups as $name => $match )
 									{
-										if( stristr( $file->getFileName(), $name ) )
+										if ( $match == 'contains' )
+										{
+											if ( stristr( $file->getFileName(), $name ) )
+											{
+												unlink( $file->getPathName() );
+											}
+										}
+										else if ( $file->getFileName() == $name . '.php' )
 										{
 											unlink( $file->getPathName() );
 										}
 									}
-									else if( $file->getFileName() == $name . '.php' )
-									{
-										unlink( $file->getPathName() );
-									}
 								}
 							}
 						}
 					}
 				}
-			} catch ( Exception $e ) {}
-			
-			/* Delete from database */
-			foreach( $templateGroups as $name => $match )
-			{
-				if( $match == 'contains' )
+				catch( Exception $e )
 				{
-					$this->DB->delete( 'skin_templates', "template_group LIKE '%{$name}%'" );
 				}
-				else 
+				
+				/* Delete from database */
+				foreach( $templateGroups as $name => $match )
 				{
-					$this->DB->delete( 'skin_templates', "template_group='{$name}'" );
+					if ( $match == 'contains' )
+					{
+						$this->DB->delete( 'skin_templates', "template_group LIKE '%{$name}%'" );
+					}
+					else
+					{
+						$this->DB->delete( 'skin_templates', "template_group='{$name}'" );
+					}
 				}
 			}
 		}
 		
 		/* CSS files */
-		$css_files	= array();
+		$css_files = array();
 		
 		$this->DB->build( array( 'select' => '*', 'from' => 'skin_css', 'where' => "css_app='" . $application['app_directory'] . "'" ) );
 		$this->DB->execute();
 		
-		while( $r = $this->DB->fetch() )
+		while ( $r = $this->DB->fetch() )
 		{
-			$css_files[ $r['css_group'] ]	= $r['css_group'];
+			$css_files[$r['css_group']] = $r['css_group'];
 		}
 		
-		if( count($css_files) )
+		if ( count( $css_files ) )
 		{
 			$this->DB->delete( 'skin_css', "css_app='" . $application['app_directory'] . "'" );
 			$this->DB->delete( 'skin_cache', "cache_type='css' AND cache_value_1 IN('" . implode( "','", $css_files ) . "')" );
 			
 			try
 			{
-				foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_css/' ) as $dir )
+				foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/' ) as $dir )
 				{
-					if( preg_match( "/^(css_)/", $dir->getFileName() ) )
+					if ( preg_match( "/^(css_)/", $dir->getFileName() ) )
 					{
-						foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_css/' . $dir->getFileName() . '/' ) as $file )
+						foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/' . $dir->getFileName() . '/' ) as $file )
 						{
-							if( ! $file->isDot() )
+							if ( ! $file->isDot() )
 							{
 								foreach( $css_files as $css_file )
 								{
-									if( $file->getFileName() == $css_file . '.css' )
+									if ( $file->getFileName() == $css_file . '.css' )
 									{
 										unlink( $file->getPathName() );
 									}
@@ -1537,26 +1843,29 @@ class admin_core_applications_applications extends ipsCommand
 						}
 					}
 				}
-			} catch ( Exception $e ) {}
+			}
+			catch( Exception $e )
+			{
+			}
 		}
 		
 		//-----------------------------------------
 		// Remove Modules
 		//-----------------------------------------		
-		
+
 		$this->DB->delete( 'core_sys_module', "sys_module_application='{$application['app_directory']}'" );
 		
 		//-----------------------------------------
 		// Remove Application
 		//-----------------------------------------
-		
-		$this->DB->delete( 'core_applications', 'app_id='.$app_id );
+
+		$this->DB->delete( 'core_applications', 'app_id=' . $app_id );
 		
 		//-----------------------------------------
 		// Recache
 		//-----------------------------------------
-		
-		$this->moduleRecacheAll(1);
+
+		$this->moduleRecacheAll( 1 );
 		
 		$this->cache->rebuildCache( 'settings', 'global' );
 		$this->cache->rebuildCache( 'notifications', 'global' );
@@ -1567,117 +1876,175 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// FURL templates
 		//-----------------------------------------
-		
+
 		try
 		{
 			IPSLib::cacheFurlTemplates();
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e )
+		{
 		}
-		catch( Exception $e ){}
 		
 		//-----------------------------------------
 		// Sphinx involved?
 		//-----------------------------------------
-		
-		if( $this->settings['search_method'] == 'sphinx' )
+
+		if ( $this->settings['search_method'] == 'sphinx' )
 		{
 			$this->registry->output->global_message .= sprintf( $this->lang->words['rebuild_sphinx'], $this->settings['_base_url'] );
 		}
-
+		
 		//-----------------------------------------
 		// Done...
 		//-----------------------------------------
 		
-		$this->registry->output->global_message = $this->lang->words['a_appremoved'];
 
+		$this->registry->output->global_message = $this->lang->words['a_appremoved'];
+		
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
 	}
-
+	
 	/**
-	 * Export an application
+	 * Export information.xml files
+	 * for every application
 	 *
-	 * @param	integer		Return XML [1] or print to browser [0]
-	 * @return	mixed		XML content or void [Outputs to screen]
+	 * @return	@e void	[Returns to the applications list]
 	 */
-	private function applicationExport( $return_xml=0 )
+	protected function inDevApplicationsExport()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$xml = '';
-		
-		//-----------------------------------------
-		// Get xml mah-do-dah
-		//-----------------------------------------
-		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
-
-		$xml = new classXML( IPS_DOC_CHAR_SET );
-		
-		$xml->newXMLDocument();
-		$xml->addElement( 'applicationexport' );
-		$xml->addElement( 'applicationgroup', 'applicationexport' );
-
-		//-----------------------------------------
-		// Get applications
-		//-----------------------------------------
-
-		$this->DB->build( array( 'select'	=> '*',
-									'from'	=> 'core_applications'  ) );
-		$this->DB->execute();
-		
-		while ( $r = $this->DB->fetch() )
+		/* Not IN_DEV? */
+		if ( ! IN_DEV )
 		{
-			unset( $r['app_id'] );
+			$this->applicationsOverview();
+			return;
+		}
+		
+		/* Get our libs! */
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'setup/sources/base/setup.php' );/*noLibHook*/
+		
+		/* Do each app */
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_applications' ) );
+		$outer = $this->DB->execute();
+		
+		/* Loop */
+		while ( $app = $this->DB->fetch( $outer ) )
+		{
+			/* Set some vars */
+			$oldXml   = array();
+			$newXml   = null;
+			$infoFile = IPSLib::getAppDir( $app['app_directory'] ) . '/xml/information.xml';
 			
-			$xml->addElementAsRecord( 'applicationgroup', 'application', $r );
+			/* Got some 'old' template data to retain? */
+			if ( is_file( $infoFile ) )
+			{
+				if ( ! is_writeable( $infoFile ) )
+				{
+					$output[] = "Cannot write to {$infoFile}";
+					continue;
+				}
+				
+				$oldXml = IPSSetUp::fetchXmlAppInformation( $app['app_directory'], $this->settings['gb_char_set'] );
+			}
+			
+			$data = array( 'name'				=> trim( $app['app_title'] ),
+						   'public_name'		=> trim( $app['app_public_title'] ),
+						   'hide_tab'			=> intval( $app['app_hide_tab'] ),
+						   'author'				=> trim( $app['app_author'] ),
+						   'description'		=> trim( $app['app_description'] ),
+						   'disabledatinstall'	=> ( isset( $oldXml['disabledatinstall'] ) && $oldXml['disabledatinstall'] ) ? intval( $oldXml['disabledatinstall'] ) : 0,
+						   'ipskey'				=> '',
+						   'global_caches'		=> trim( $app['app_global_caches'] ),
+						   'website'			=> trim( $app['app_website'] ),
+						   'update_check'		=> trim( $app['app_update_check'] )
+						  );
+			
+			/* Got an IPS key to add? */
+			if ( $app['app_location'] == 'ips' )
+			{
+				$data['ipskey'] = md5( 'ips_' . $app['app_directory'] );
+			}
+			else
+			{
+				unset( $data['ipskey'] );
+			}
+			
+			/* Create xml object */
+			$newXml = new classXML( IPS_DOC_CHAR_SET );
+			$newXml->newXMLDocument();
+			
+			/* Create elements */
+			$newXml->addElement( 'information' );
+			$newXml->addElementAsRecord( 'information', 'data', $data );
+			
+			/* Get data till now */
+			$xmlData = $newXml->fetchDocument();
+			
+			/* Got templates? */
+			if ( isset( $oldXml['templates'] ) && count( $oldXml['templates'] ) )
+			{
+				$XML_TEMPLATES = <<<XML
+    <templategroups>\n
+XML;
+				
+				foreach( $oldXml['templates'] as $k => $v )
+				{
+					$XML_TEMPLATES .= <<<XML
+        <template match="{$v}">{$k}</template>\n
+XML;
+				}
+				
+				$XML_TEMPLATES .= <<<XML
+    </templategroups>
+XML;
+			}
+			else
+			{
+				$XML_TEMPLATES = <<<XML
+    <templategroups/>
+XML;
+			}
+			
+			/* Add templates into our XML - yeah I know.. a bit hackish.. */
+			if ( $data['update_check'] )
+			{
+				$xmlData = str_replace( '</update_check>', "</update_check>\n{$XML_TEMPLATES}", $xmlData );
+			}
+			else
+			{
+				$xmlData = str_replace( '<update_check/>', "<update_check/>\n{$XML_TEMPLATES}", $xmlData );
+			}
+			
+			file_put_contents( $infoFile, $xmlData );
+			
+			$output[] = $app['app_title'] . " information exported in '" . str_replace( DOC_IPS_ROOT_PATH, '', $infoFile ) . "'";
 		}
-
-		//-----------------------------------------
-		// Send to browser.
-		//-----------------------------------------
 		
-		if( $return_xml )
-		{
-			return array( 'title' => 'applications.xml', 'xml' => $xml->fetchDocument() );	
-		}
-		else 
-		{
-			$this->registry->output->showDownload( $xml->fetchDocument(), 'applications.xml', '', 0 );
-		}
+		/* Done, setup message and redirect */
+		$this->registry->output->setMessage( implode( "<br />", $output ), 1 );
+		
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
 	}
 	
 	/**
 	 * Save an application
 	 *
 	 * @param	string		Type [add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationSave( $type='add' )
+	public function applicationSave( $type = 'add' )
 	{
-		//--------------------------------------------
-		// INIT
-		//--------------------------------------------
-		
-		$app_id           = intval( $this->request['app_id'] );
-		$app_title	  	  = trim( $this->request['app_title'] );
-		$app_public_title = trim( $this->request['app_public_title'] );
-		$app_description  = trim( $this->request['app_description'] );
-		$app_author		  = trim( $this->request['app_author'] );
-		$app_version      = trim( $this->request['app_version'] );
-		$app_directory	  = trim( $this->request['app_directory'] );
-		$app_protected    = intval( $this->request['app_protected'] );
-		$app_enabled      = intval( $this->request['app_enabled'] );
-		$app_hide_tab     = intval( $this->request['app_hide_tab'] );
-		$application      = array();
-		
-		//--------------------------------------------
-		// Check
-		//--------------------------------------------
+		/* Init vars */
+		$app_title = trim( $this->request['app_title'] );
+		$app_directory = trim( $this->request['app_directory'] );
+		$app_enabled = intval( $this->request['app_enabled'] );
+		$application = array();
 		
+		/* Editing? */
 		if ( $type == 'edit' )
 		{
-			$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . $app_id ) );
+			$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . intval( $this->request['app_id'] ) ) );
 			
 			if ( ! $application['app_id'] )
 			{
@@ -1686,53 +2053,55 @@ class admin_core_applications_applications extends ipsCommand
 				return;
 			}
 		}
+		else
+		{
+			$_check = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => "app_directory='{$app_directory}'" ) );
+			
+			if ( $_check['app_id'] )
+			{
+				$this->registry->output->showError( $this->lang->words['app_already_added'], 111161.3 );
+			}
+		}
 		
-		if ( ! $app_title OR ! $app_directory )
+		/* Error check */
+		if ( ! $app_title or ! $app_directory )
 		{
 			$this->registry->output->global_message = $this->lang->words['a_titledirectory'];
 			$this->applicationForm( $type );
 			return;
 		}
 		
-		//--------------------------------------------
-		// Check...
-		//--------------------------------------------
+		if ( ! $app_enabled && in_array( $app_directory, array( 'core', 'forums', 'members' ) ) )
+		{
+			$this->registry->output->showError( $this->lang->words['cannot_toggle_defaults'], 111161.2 );
+		}
 		
-		$array = array( 'app_title'			=> $app_title,
-					    'app_public_title'	=> $app_public_title,
-						'app_description'	=> $app_description,
-						'app_author'		=> $app_author,
-						'app_version'		=> $app_version,
-						'app_directory'		=> $app_directory,
-						'app_enabled'		=> $app_enabled,
-						'app_hide_tab'		=> $app_hide_tab );
+		/* $setup update array */
+		$array = array( 'app_title' => $app_title, 'app_public_title' => trim( $this->request['app_public_title'] ), 'app_enabled' => $app_enabled, 'app_hide_tab' => intval( $this->request['app_hide_tab'] ), 'app_description' => trim( $this->request['app_description'] ), 'app_author' => trim( $this->request['app_author'] ), 'app_version' => trim( $this->request['app_version'] ), 'app_directory' => $app_directory, 'app_website' => trim( $this->request['app_website'] ), 'app_update_check' => trim( $this->request['app_update_check'] ), 'app_global_caches' => ( is_array( $this->request['app_global_caches'] ) && count( $this->request['app_global_caches'] ) ) ? implode( ',', $this->request['app_global_caches'] ) : '', 'app_tab_groups' => ( is_array( $this->request['app_tab_groups'] ) && count( $this->request['app_tab_groups'] ) ) ? implode( ',', $this->request['app_tab_groups'] ) : '' );
 		
 		//-----------------------------------------
 		// IN DEV?
 		//-----------------------------------------
 		
+
 		if ( IN_DEV )
 		{
-			$array['app_protected'] = $app_protected;
-		}
-		
-		if( in_array( $array['app_directory'], array( 'core', 'forums', 'members' ) ) AND !$array['app_enabled'] )
-		{
-			$this->registry->output->showError( $this->lang->words['cannot_toggle_defaults'], 111161.2 );
+			$array['app_protected'] = intval( $this->request['app_protected'] );
 		}
 		
 		//-----------------------------------------
 		// Save...
 		//-----------------------------------------
 		
+
 		if ( $type == 'add' )
 		{
-			$array['app_added']		= time();
-			$array['app_location']	= 'other';
+			$array['app_added'] = time();
+			$array['app_location'] = 'other';
 			
-			$max	= $this->DB->buildAndFetch( array( 'select' => 'MAX(app_position) as position', 'from' => 'core_applications' ) );
+			$max = $this->DB->buildAndFetch( array( 'select' => 'MAX(app_position) as position', 'from' => 'core_applications' ) );
 			
-			$array['app_position']	= $max['position'] + 1;
+			$array['app_position'] = $max['position'] + 1;
 			
 			$this->DB->insert( 'core_applications', $array );
 			$this->registry->output->global_message = $this->lang->words['a_newapp'];
@@ -1740,12 +2109,33 @@ class admin_core_applications_applications extends ipsCommand
 		else
 		{
 			/* Update the application record */
-			$this->DB->update( 'core_applications', $array, 'app_id='.$app_id );
+			$this->DB->update( 'core_applications', $array, 'app_id=' . $application['app_id'] );
 			
-			/* Update modules, if the application directory changed */
-			if( $application['app_directory'] != $app_directory )
+			/* Update modules and tasks, if the application directory changed */
+			if ( $application['app_directory'] != $app_directory )
 			{
+				$this->DB->update( 'task_manager', array( 'task_application' => $app_directory ), "task_application='{$application['app_directory']}'" );
 				$this->DB->update( 'core_sys_module', array( 'sys_module_application' => $app_directory ), "sys_module_application='{$application['app_directory']}'" );
+				$this->DB->update( 'admin_logs', array( 'appcomponent' => $app_directory ), "appcomponent='{$application['app_directory']}'" );
+				$this->DB->update( 'core_editor_autosave', array( 'eas_app' => $app_directory ), "eas_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_incoming_emails', array( 'rule_app' => $app_directory ), "rule_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_item_markers', array( 'item_app' => $app_directory ), "item_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_like', array( 'like_app' => $app_directory ), "like_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_like_cache', array( 'like_cache_app' => $app_directory ), "like_cache_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_share_links_log', array( 'log_data_app' => $app_directory ), "log_data_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_sys_lang_words', array( 'word_app' => $app_directory ), "word_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_sys_settings_titles', array( 'conf_title_app' => $app_directory ), "conf_title_app='{$application['app_directory']}'" );
+				$this->DB->update( 'core_tags', array( 'tag_meta_app' => $app_directory ), "tag_meta_app='{$application['app_directory']}'" );
+				$this->DB->update( 'custom_bbcode', array( 'bbcode_app' => $app_directory ), "bbcode_app='{$application['app_directory']}'" );
+				$this->DB->update( 'faq', array( 'app' => $app_directory ), "app='{$application['app_directory']}'" );
+				$this->DB->update( 'inline_notifications', array( 'notify_meta_app' => $app_directory ), "notify_meta_app='{$application['app_directory']}'" );
+				$this->DB->update( 'permission_index', array( 'app' => $app_directory ), "app='{$application['app_directory']}'" );
+				$this->DB->update( 'reputation_cache', array( 'app' => $app_directory ), "app='{$application['app_directory']}'" );
+				$this->DB->update( 'reputation_index', array( 'app' => $app_directory ), "app='{$application['app_directory']}'" );
+				$this->DB->update( 'skin_css', array( 'css_app' => $app_directory ), "css_app='{$application['app_directory']}'" );
+				$this->DB->update( 'skin_css_previous', array( 'p_css_app' => $app_directory ), "p_css_app='{$application['app_directory']}'" );
+				$this->DB->update( 'tags_index', array( 'app' => $app_directory ), "app='{$application['app_directory']}'" );
+				$this->DB->update( 'upgrade_history', array( 'upgrade_app' => $app_directory ), "upgrade_app='{$application['app_directory']}'" );
 			}
 			
 			/* Set the message */
@@ -1755,63 +2145,77 @@ class admin_core_applications_applications extends ipsCommand
 		//-----------------------------------------
 		// Recache
 		//-----------------------------------------
-		
+
 		$this->applicationsRecache();
 		$this->applicationsMenuDataRecache();
 		
 		try
 		{
 			IPSLib::cacheFurlTemplates();
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e )
+		{
+		}
+		
+		/**
+		 * Re-enable the tasks if app is active
+		 * (more effective than checking per-case)
+		 */
+		if ( $app_enabled )
+		{
+			$this->DB->update( 'task_manager', array( 'task_enabled' => 1 ), "task_application='{$app_directory}'" );
+		}
+		
+		/* Check for possible hook warnings */
+		if ( $type == 'edit' && $application['app_enabled'] && ! $app_enabled )
+		{
+			// Switch the enabled value here or check will fail with the current cache!
+			ipsRegistry::$applications[$application['app_directory']]['app_enabled'] = 0;
+			
+			$this->_checkHooksWarnings( $application['app_directory'] );
 		}
-		catch( Exception $e ){}
 		
 		//-----------------------------------------
 		// Sphinx involved?
 		//-----------------------------------------
 		
-		if( $this->settings['search_method'] == 'sphinx' )
+
+		if ( $this->settings['search_method'] == 'sphinx' )
 		{
 			$this->registry->output->global_message .= sprintf( $this->lang->words['rebuild_sphinx'], $this->settings['_base_url'] );
 		}
 		
-		//-----------------------------------------
-		// List...
-		//-----------------------------------------
-		
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=applications_overview' );
+		/* All done */
+		$this->applicationsOverview();
 	}
 	
 	/**
 	 * Add/edit application form
 	 *
 	 * @param	string		Type [add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationForm( $type='add' )
+	public function applicationForm( $type = 'add' )
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$app_id      = intval( $this->request['app_id'] );
+		/* Init vars */
 		$application = array();
-		$form        = array();
+		$form = array();
 		
 		//-----------------------------------------
 		// Add or edit?
 		//-----------------------------------------
 		
+
 		if ( $type == 'add' )
 		{
 			$formcode = 'application_add_do';
-			$title    = $this->lang->words['a_addnewapp'];
-			$button   = $this->lang->words['a_addnewapp'];
+			$title = $this->lang->words['a_addnewapp'];
+			$button = $this->lang->words['a_addnewapp'];
 		}
 		else
 		{
-			$application = $this->DB->buildAndFetch( array( 'select' => '*',
-																			 'from'   => 'core_applications',
-																			 'where'  => 'app_id='.$app_id ) );
+			$application = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_applications', 'where' => 'app_id=' . intval( $this->request['app_id'] ) ) );
 			
 			if ( ! $application['app_id'] )
 			{
@@ -1821,137 +2225,189 @@ class admin_core_applications_applications extends ipsCommand
 			}
 			
 			$formcode = 'application_edit_do';
-			$title    = $this->lang->words['a_editapp'] . $application['app_title'];
-			$button   = $this->lang->words['a_savechanges'];
+			$title = $this->lang->words['a_editapp'] . ': ' . $application['app_title'];
+			$button = $this->lang->words['a_savechanges'];
 		}
 		
 		//-----------------------------------------
 		// Form elements
 		//-----------------------------------------
 		
-		$form['app_title']        = $this->registry->output->formInput(  'app_title'      , $_POST['app_title']       ? $_POST['app_title']       : $application['app_title'] );
-		$form['app_public_title'] = $this->registry->output->formInput(  'app_public_title', $_POST['app_public_title'] ? $_POST['app_public_title'] : $application['app_public_title'] );
-		$form['app_description']  = $this->registry->output->formInput(  'app_description', $_POST['app_description'] ? $_POST['app_description'] : $application['app_description'] );
-		$form['app_author']       = $this->registry->output->formInput(  'app_author'     , $_POST['app_author']      ? $_POST['app_author']      : $application['app_author'] );
-		$form['app_version']      = $this->registry->output->formInput(  'app_version'    , $_POST['app_version']     ? $_POST['app_version']     : $application['app_version'] );
-		$form['app_directory']    = $this->registry->output->formInput(  'app_directory'  , $_POST['app_directory']   ? $_POST['app_directory']   : $application['app_directory'] );
-		$form['app_protected']    = $this->registry->output->formYesNo( 'app_protected'  , $_POST['app_protected']   ? $_POST['app_protected']   : $application['app_protected'] );
-		$form['app_enabled']      = $this->registry->output->formYesNo( 'app_enabled'    , $_POST['app_enabled']     ? $_POST['app_enabled']     : $application['app_enabled'] );
-		$form['app_hide_tab']     = $this->registry->output->formYesNo( 'app_hide_tab'    , $_POST['app_hide_tab']     ? $_POST['app_hide_tab']     : $application['app_hide_tab'] );
+
+		/* Input */
+		foreach( array( 'app_title', 'app_public_title', 'app_description', 'app_author', 'app_version', 'app_directory', 'app_website', 'app_update_check' ) as $_app_key )
+		{
+			$form[$_app_key] = $this->registry->output->formSimpleInput( $_app_key, isset( $_POST[$_app_key] ) ? $_POST[$_app_key] : $application[$_app_key], 60 );
+		}
 		
+		/* Y/N */
+		foreach( array( 'app_protected', 'app_enabled', 'app_hide_tab' ) as $_app_key )
+		{
+			$form[$_app_key] = $this->registry->output->formYesNo( $_app_key, isset( $_POST[$_app_key] ) ? $_POST[$_app_key] : $application[$_app_key] );
+		}
+		
+		/* Sort the tab permissions MDD */
+		$_groups = array();
+		
+		foreach( $this->cache->getCache( 'group_cache' ) as $gid => $gdata )
+		{
+			$_groups[] = array( $gid, $gdata['g_title'] );
+		}
+		
+		sort( $_groups );
+		
+		$form['app_tab_groups'] = $this->registry->output->formMultiDropdown( 'app_tab_groups[]', $_groups, isset( $_POST['app_tab_groups'] ) ? $_POST['app_tab_groups'] : explode( ',', $application['app_tab_groups'] ), 7 );
+		
+		/* Setup the global caches MDD */
+		$_caches = array();
+		
+		$this->DB->build( array( 'select' => 'cs_key', 'from' => 'cache_store', 'order' => 'cs_key ASC' ) );
+		$this->DB->execute();
+		
+		while ( $gc = $this->DB->fetch() )
+		{
+			$_caches[] = array( $gc['cs_key'], $gc['cs_key'] );
+		}
+		
+		sort( $_caches );
+		
+		$form['app_global_caches'] = $this->registry->output->formMultiDropdown( 'app_global_caches[]', $_caches, isset( $_POST['app_global_caches'] ) ? $_POST['app_global_caches'] : explode( ',', $application['app_global_caches'] ), 15 );
+		
+		/* Output */
 		$this->registry->output->html .= $this->html->application_form( $form, $title, $formcode, $button, $application );
 	}
 	
 	/**
 	 * Move an application up/down
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationManagePosition()
+	public function applicationManagePosition()
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
+		
 
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
-		$ajax		 = new $classToLoad();
+		$ajax = new $classToLoad();
 		
 		//-----------------------------------------
 		// Checks...
 		//-----------------------------------------
+		
 
-		if( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
+		if ( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
 		{
 			$ajax->returnString( $this->lang->words['postform_badmd5'] );
 			exit();
 		}
- 		
- 		//-----------------------------------------
- 		// Save new position
- 		//-----------------------------------------
+		
+		//-----------------------------------------
+		// Save new position
+		//-----------------------------------------
+		
 
- 		$position	= 1;
- 		
- 		if( is_array($this->request['apps']) AND count($this->request['apps']) )
- 		{
- 			foreach( $this->request['apps'] as $this_id )
- 			{
- 				$location = $this->DB->buildAndFetch( array( 'select' => 'app_location', 'from' => 'core_applications', 'where' => 'app_id=' . $this_id ) );
-				$buffer   = array( 'root' => 0, 'ips' => 100, 'other' => 200 );
- 				$this->DB->update( 'core_applications', array( 'app_position' => $position+$buffer[ $location['app_location'] ] ), 'app_id=' . $this_id );
- 				
- 				$position++;
- 			}
- 		}
- 		
+		$position = 1;
+		
+		if ( is_array( $this->request['apps'] ) and count( $this->request['apps'] ) )
+		{
+			foreach( $this->request['apps'] as $this_id )
+			{
+				$location = $this->DB->buildAndFetch( array( 'select' => 'app_location', 'from' => 'core_applications', 'where' => 'app_id=' . $this_id ) );
+				$buffer = array( 'root' => 0, 'ips' => 100, 'other' => 200 );
+				$this->DB->update( 'core_applications', array( 'app_position' => $position + $buffer[$location['app_location']] ), 'app_id=' . $this_id );
+				
+				$position ++;
+			}
+		}
+		
 		$this->applicationsRecache();
 		$this->applicationsMenuDataRecache();
-
- 		$ajax->returnString( 'OK' );
- 		exit();
+		
+		$ajax->returnString( 'OK' );
 	}
 	
 	/**
 	 * List applications
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function applicationsOverview()
+	public function applicationsOverview()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$folders		= array();
-		$application	= array();
-		$_apps			= array();
-		$seen_count		= 0;
-		$uninstalled	= array();
+		/* Init vars */
+		$folders = array();
+		$application = array();
+		$_apps = array();
+		$uninstalled = array();
+		$appsUpdates = 0;
+		$checkUpdates = ! empty( $this->request['checkUpdates'] ) ? true : false;
 		
 		/* Get the setup class */
-		require IPS_ROOT_PATH . "setup/sources/base/setup.php";
+		require_once ( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
+		
+		/* Get hooks file for update check */
+		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'core' ) . '/modules_admin/applications/hooks.php', 'admin_core_applications_hooks' );
+		$hooksClass = new $classToLoad();
+		$hooksClass->makeRegistryShortcuts( $this->registry );
 		
 		//-----------------------------------------
 		// Get DB applications
 		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => '*',
-								 'from'   => 'core_applications',
-								 'order'  => 'app_position' ) );
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_applications', 'order' => 'app_position' ) );
 		$this->DB->execute();
 		
-		while( $row = $this->DB->fetch() )
+		while ( $row = $this->DB->fetch() )
 		{
-			$_apps[ IPSLib::getAppFolder( $row['app_directory'] ) . '/' . $row['app_directory'] ] = $row;
+			/* Got updates? */
+			if ( $row['app_update_check'] && $checkUpdates === true )
+			{
+				$row['app_update_available'] = $hooksClass->_updateAvailable( $row['app_update_check'], $row['app_long_version'] );
+				
+				if ( $row['app_update_available'][0] )
+				{
+					$appsUpdates++;
+				}
+			}
+			else
+			{
+				$row['app_update_available'] = array( 0 );
+			}
+			
+			$_apps[IPSLib::getAppFolder( $row['app_directory'] ) . '/' . $row['app_directory']] = $row;
 		}
 		
 		//-----------------------------------------
 		// Get folder applications...
 		//-----------------------------------------
-		
+
 		foreach( array( 'applications', 'applications_addon/ips', 'applications_addon/other' ) as $folder )
 		{
 			try
 			{
 				foreach( new DirectoryIterator( IPS_ROOT_PATH . $folder ) as $file )
 				{
-					if ( ! $file->isDot() AND $file->isDir() )
+					if ( ! $file->isDot() and $file->isDir() )
 					{
 						$_name = $file->getFileName();
 						
 						if ( substr( $_name, 0, 1 ) != '.' )
 						{
-							$folders[ $folder . '/' . $_name ] = $_name;
+							$folders[$folder . '/' . $_name] = $_name;
 						}
 					}
 				}
-			} catch ( Exception $e ) {}
+			}
+			catch( Exception $e )
+			{
+			}
 		}
 		
 		//-----------------------------------------
 		// Installed Loop...
 		//-----------------------------------------
-		
+
 		foreach( $_apps as $_app_path => $row )
 		{
 			$app_dir = $row['app_directory'];
@@ -1959,39 +2415,52 @@ class admin_core_applications_applications extends ipsCommand
 			//-----------------------------------------
 			// Enabled?
 			//-----------------------------------------
-			
+
 			$row['_app_enabled'] = ( $row['app_enabled'] ) ? 'tick.png' : 'cross.png';
 			
 			/* Version numbers */
-			$_a = ( $app_dir == 'forums' OR $app_dir == 'members' ) ? 'core' : $app_dir;
-			$numbers  = IPSSetUp::fetchAppVersionNumbers( $_a );
-				
+			$_a = ( $app_dir == 'forums' or $app_dir == 'members' ) ? 'core' : $app_dir;
+			$numbers = IPSSetUp::fetchAppVersionNumbers( $_a );
+			
 			$row['_human_version'] = $numbers['latest'][1];
-			$row['_long_version']  = $numbers['latest'][0];
+			$row['_long_version'] = $numbers['latest'][0];
 			
 			$row['_human_current'] = $numbers['current'][1];
-			$row['_long_current']  = $numbers['current'][0];
+			$row['_long_current'] = $numbers['current'][0];
 			
-			/* Exists? */
-			if ( ! file_exists( IPSLib::getAppDir( $app_dir ) ) )
+			/* Nexus? */
+			if ( $row['app_directory'] == 'nexus' )
 			{
-				$row['_missing'] = 1;
+				$encoding = 'Unencoded';
+				
+				$file = file_get_contents( IPSLib::getAppDir('nexus') . '/app_class_nexus.php' );
+
+				if ( substr( $file, 6, 5 ) == '@Zend' )
+				{
+					$phpVersion = phpversion();
+					$phpVersion = str_replace( substr( $phpVersion, strrpos( $phpVersion, '.' ) ), '', $phpVersion );
+					$encoding = "Zend {$phpVersion}";
+				}
+				elseif ( substr( $file, 36, 7 ) == 'ionCube' )
+				{
+					$encoding = 'Ioncube';
+				}
+				
+				$row['_human_current'] .= " ({$encoding})";
 			}
 			
-			$seen_count++;
-			
 			$application[$row['app_location']][] = $row;
 		}
 		
 		/* Make sure they are in the proper order, hacky but it works :) */
 		$__apps = array();
 		
-		$__apps['root']  = $application['root']  ? $application['root']  : array();
-		$__apps['ips']   = $application['ips']   ? $application['ips']   : array();
+		$__apps['root'] = $application['root'] ? $application['root'] : array();
+		$__apps['ips'] = $application['ips'] ? $application['ips'] : array();
 		$__apps['other'] = $application['other'] ? $application['other'] : array();
 		
 		$application = $__apps;
-	
+		
 		//-----------------------------------------
 		// Uninstalled
 		//-----------------------------------------
@@ -2024,142 +2493,288 @@ class admin_core_applications_applications extends ipsCommand
 				
 				if ( $info['name'] )
 				{
-					$uninstalled[ $_file ] = array( 'title'     => $info['name'],
-												    'author'    => $info['author'],
-												    'path'      => $filepath,
-												    'okToGo'    => $okToGo,
-												    'directory' => $_file );
+					$uninstalled[$_file] = array( 'title' => $info['name'], 'author' => $info['author'], 'path' => $filepath, 'okToGo' => $okToGo, 'directory' => $_file );
 				}
 			}
 		}
-	
-		//-----------------------------------------
-		// Show it...
-		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->applications_list( $application, $uninstalled );
+		/* Got updates to show? */
+		$message = NULL;
+		if ( $checkUpdates === true )
+		{
+			$message = ( $appsUpdates == 1 ) ? $this->lang->words['updates_string_single'] : sprintf( $this->lang->words['updates_string_more'], $appsUpdates );
+		}
+		
+		/* Output */
+		$this->registry->output->html .= $this->html->applications_list( $application, $uninstalled, $message );
 	}
 	
 	/**
 	 * Recache applications
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function applicationsRecache()
 	{
-	 	$apps			= array();
-	 	$incomingEmails	= FALSE;
+		$apps = array();
+		$incomingEmails = FALSE;
 		
 		/* Rebuild Applications Cache */
-		$this->DB->build( array( 'select'	=> '*',
-								 'from'		=> 'core_applications',
-								 'order'	=> 'app_position ASC' ) );
-		$outer	= $this->DB->execute();
-
-		while( $row = $this->DB->fetch($outer) )
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_applications', 'order' => 'app_position ASC' ) );
+		$outer = $this->DB->execute();
+		
+		while ( $row = $this->DB->fetch( $outer ) )
 		{
-			$apps[ $row['app_directory'] ] = $row;
+			/* Sort out tab groups */
+			$row['app_tab_groups'] = IPSText::cleanPermString( $row['app_tab_groups'] );
+			
+			if ( $row['app_tab_groups'] )
+			{
+				$row['app_tab_groups'] = explode( ',', $row['app_tab_groups'] );
+			}
+			else
+			{
+				$row['app_tab_groups'] = array();
+			}
+			
+			$apps[$row['app_directory']] = $row;
 			
 			/* Search */
-			if( IPSSearchIndex::appIsSearchable( $row['app_directory'] ) )
-			{
+			// By checking if it's installed here, we don't build the search key properly during a fresh install.
+			// We should check if the app is installed at runtime instead.
+			//if ( IPSLib::appIsInstalled( $row['app_directory'] ) )
+			//{
 				$_file = IPSLib::getAppDir( $row['app_directory'] ) . '/extensions/search/config.php';
 				
-				if ( file_exists( $_file ) )
+				if ( is_file( $_file ) )
 				{
 					$CONFIG = array();
-					require( $_file );
+					require ( $_file );/*noLibHook*/
 					
-					if ( is_array( $CONFIG ) AND count( $CONFIG ) )
+					if ( is_array( $CONFIG ) and count( $CONFIG ) )
 					{
-						$apps[ $row['app_directory'] ]['search'] = $CONFIG;
-					
+						$apps[$row['app_directory']]['search'] = $CONFIG;
+						
 						unset( $CONFIG );
 					}
 				}
-			}
+			//}
 			
-			/* Supports like system? */
-			if ( is_dir( IPSLib::getAppDir( $row['app_directory'] ) . '/extensions/like' ) )
-			{
-				try
-				{
-					foreach( new DirectoryIterator( IPSLib::getAppDir( $row['app_directory'] ) . '/extensions/like' ) as $file )
-					{
-						if ( !$file->isDot() AND !$file->isDir() )
-						{
-							$_name = $file->getFileName();
-							
-							if ( substr( $_name, -4 ) == '.php' )
-							{
-								$apps[ $row['app_directory'] ]['_supports_likes']	= 1;
-								break;
-							}
-						}
-					}
-				} catch ( Exception $e ) {}
-			}
+			/* Fetch installed extensions */
+			$apps[$row['app_directory']]['extensions'] = array( 'itemMarking' => false, 'comments' => false, 'like' => false, 'search' => false, 'incomingEmail' => false );
+			
+			/* Now go */
+			$apps[$row['app_directory']]['extensions']['comments']      = $this->_getHasExtensionComments( $row['app_directory'] );
+			$apps[$row['app_directory']]['extensions']['itemMarking']   = $this->_getHasExtensionItemMarking( $row['app_directory'] );
+			$apps[$row['app_directory']]['extensions']['incomingEmail'] = $this->_getHasExtensionIncomingEmail( $row['app_directory'] );
+			$apps[$row['app_directory']]['extensions']['like']          = $this->_getHasExtensionLike( $row['app_directory'] );
+			$apps[$row['app_directory']]['extensions']['search']        = $this->_getHasExtensionSearch( $row['app_directory'] );
+			$apps[$row['app_directory']]['extensions']['groupOptions']  = $this->_getGroupExtensions( $row['app_directory'] );
 			
 			/* incomingEmails? */
-			if ( file_exists( IPSLib::getAppDir( $row['app_directory'] ) . '/extensions/incomingEmails.php' ) )
+			if ( $apps[$row['app_directory']]['extensions']['incomingEmail'] )
 			{
 				$incomingEmails = TRUE;
 			}
+			
+			/* Has custom header? */
+			$apps[ $row['app_directory'] ]['hasCustomHeader'] = ( method_exists( $this->registry->output->getTemplate( $row['app_directory'] . '_global' ), 'overwriteHeader' ) ) ? 1 : 0;
 		}
-				
+		
 		$this->cache->setCache( 'app_cache', $apps, array( 'array' => 1 ) );
 		
 		/* Do we have an incomingEmails extension anywhere? */
-		$systemvars = $this->cache->getCache('systemvars');
+		$systemvars = $this->cache->getCache( 'systemvars' );
 		$systemvars['incomingEmails'] = $incomingEmails;
 		$this->cache->setCache( 'systemvars', $systemvars, array( 'array' => 1 ) );
 		
 		/* Rebuild navigation tabs too */
 		$tabs = array();
-		foreach ( $apps as $dir => $data )
+		foreach( $apps as $dir => $data )
 		{
 			if ( ! $data['app_hide_tab'] )
-			{							
-				$tabs[] = array(
-						'app'	=> $dir,
-						'module'=> '',
-						'title'	=> $this->lang->words[ $data['app_public_title'] ] ? $this->lang->words[ $data['app_public_title'] ] : $data['app_public_title']
-					);
+			{
+				$tabs[] = array( 'app' => $dir, 'groups' => $data['app_tab_groups'], 'module' => '', // Can't use IPSLib::getAppTitle() because of the IN_ACP check in it
+				'title' => $this->lang->words[$data['app_public_title']] ? $this->lang->words[$data['app_public_title']] : $data['app_public_title'] );
 			}
 			
-			if ( file_exists( IPSLib::getAppDir( $dir ) . '/extensions/coreVariables.php' ) )
+			if ( is_file( IPSLib::getAppDir( $dir ) . '/extensions/coreVariables.php' ) )
 			{
 				$extraTabs = array();
-				require_once IPSLib::getAppDir( $dir ) . '/extensions/coreVariables.php';
+				require_once ( IPSLib::getAppDir( $dir ) . '/extensions/coreVariables.php' );/*noLibHook*/
 				
-				if ( is_array($extraTabs) && count($extraTabs) )
+				if ( is_array( $extraTabs ) && count( $extraTabs ) )
 				{
 					$this->registry->class_localization->loadLanguageFile( array( 'admin_' . $dir ), $dir );
 					
 					$_extraTabs = array();
-					foreach ( $extraTabs as $t )
+					foreach( $extraTabs as $t )
 					{
-						$t['title'] = $this->lang->words[ $t['title'] ];
+						$t['title'] = $this->lang->words[$t['title']];
 						$_extraTabs[] = $t;
 					}
 					
 					$tabs = array_merge( $tabs, $_extraTabs );
 				}
+				
 				unset( $extraTabs );
 			}
 		}
 		
 		$this->cache->setCache( 'navigation_tabs', $tabs, array( 'array' => 1 ) );
-	}
 		
+		$this->cache->rebuildCache( 'rss_output_cache', 'global' );
+	}
+	
+	/**
+	 * Has Incoming emails extension
+	 * @param string $appDir
+	 */
+	protected function _getHasExtensionIncomingEmail( $appDir )
+	{
+		if ( is_file( IPSLib::getAppDir( $appDir ) . '/extensions/incomingEmails.php' ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Has itemMarking extension
+	 * 
+	 * @param	string		$appDir		Application directory
+	 * @return	@e boolean
+	 */
+	protected function _getHasExtensionItemMarking( $appDir )
+	{
+		if ( is_file( IPSLib::getAppDir( $appDir ) . '/extensions/coreExtensions.php' ) )
+		{
+			require_once( IPSLib::getAppDir( $appDir ) . '/extensions/coreExtensions.php' );/*noLibHook*/
+			
+			if ( class_exists( 'itemMarking__' . $appDir ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Has Comments extension
+	 * 
+	 * @param	string		$appDir		Application directory
+	 * @return	@e boolean
+	 */
+	protected function _getHasExtensionComments( $appDir )
+	{
+		$return = false;
+		
+		if ( is_dir( IPSLib::getAppDir( $appDir ) . '/extensions/comments' ) )
+		{
+			try
+			{
+				foreach( new DirectoryIterator( IPSLib::getAppDir( $appDir ) . '/extensions/comments' ) as $file )
+				{
+					if ( ! $file->isDot() and ! $file->isDir() )
+					{
+						$_name = $file->getFileName();
+						
+						if ( substr( $_name, - 4 ) == '.php' )
+						{
+							$return = true;
+							break;
+						}
+					}
+				}
+			}
+			catch( Exception $e )
+			{
+			}
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Has Like extension
+	 * 
+	 * @param	string		$appDir		Application directory
+	 * @return	@e boolean
+	 */
+	protected function _getHasExtensionLike( $appDir )
+	{
+		$return = false;
+		
+		if ( is_dir( IPSLib::getAppDir( $appDir ) . '/extensions/like' ) )
+		{
+			try
+			{
+				foreach( new DirectoryIterator( IPSLib::getAppDir( $appDir ) . '/extensions/like' ) as $file )
+				{
+					if ( ! $file->isDot() and ! $file->isDir() )
+					{
+						$_name = $file->getFileName();
+						
+						if ( substr( $_name, - 4 ) == '.php' )
+						{
+							$return = true;
+							break;
+						}
+					}
+				}
+			}
+			catch( Exception $e )
+			{
+			}
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Retrieve group inheritence options
+	 * 
+	 * @param	string		$appDir		Application directory
+	 * @return	@e boolean
+	 */
+	protected function _getGroupExtensions( $appDir )
+	{
+		$_GROUP = array();
+		
+		if ( is_file( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' ) )
+		{
+			require( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' );/*noLibHook*/
+		}
+
+		return is_array($_GROUP) ? $_GROUP : array();
+	}
+	
+	/**
+	 * Has Search extension
+	 * 
+	 * @param	string		$appDir		Application directory
+	 * @return	@e boolean
+	 */
+	protected function _getHasExtensionSearch( $appDir )
+	{
+		if ( is_file( IPSLib::getAppDir( $appDir ) . '/extensions/search/config.php' ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * Recache main version number
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function versionNumbersRecache()
 	{
-	 	$numbers = IPSLib::fetchVersionNumber();
+		$numbers = IPSLib::fetchVersionNumber();
 		
 		$this->cache->setCache( 'vnums', $numbers, array( 'array' => 1, 'donow' => 1 ) );
 	}
@@ -2167,221 +2782,226 @@ class admin_core_applications_applications extends ipsCommand
 	/**
 	 * Recache menu data
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function applicationsMenuDataRecache()
-	{ 
+	{
 		$app_menu_cache = array();
+		$modules_cache = array();
+		
+		//-----------------------------------------
+		// Get module data first in one query
+		//-----------------------------------------
+		
 
-		$this->DB->build( array( 
-										'select' => '*',
-										'from'	 => 'core_applications',
-										'order'	 => 'app_position ASC' ) );
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_module', 'order' => 'sys_module_position ASC' ) );
+		$this->DB->execute();
+		
+		while ( $module = $this->DB->fetch() )
+		{
+			$modules_cache[$module['sys_module_application']][] = $module['sys_module_key'];
+		}
+		
+		//-----------------------------------------
+		// Now get applications and loop
+		//-----------------------------------------
+		
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_applications', 'order' => 'app_position ASC' ) );
 		$outer = $this->DB->execute();
-
-
-		while( $row = $this->DB->fetch( $outer ) )
+		
+		while ( $row = $this->DB->fetch( $outer ) )
 		{
 			$app_dir	= $row['app_directory'];
-			$main_items	= array();
-			
-			$this->DB->build( array( 'select'	=> '*',
-											'from'	=> 'core_sys_module',
-											'where'	=> "sys_module_application='" . $app_dir . "'",
-											'order'	=> 'sys_module_position ASC' ) );
-			$inner = $this->DB->execute();
-			
-			while( $module = $this->DB->fetch( $inner ) )
-			{
-				$main_items[] = $module['sys_module_key'];
-			}
+			$main_items	= $modules_cache[$app_dir];
 			
 			//-----------------------------------------
 			// Continue...
 			//-----------------------------------------
-			
-			foreach( $main_items as $_current_module )
+
+			if( count($main_items) )
 			{
-				$_file = IPSLib::getAppDir( $app_dir ) . "/modules_admin/" . $_current_module . '/xml/menu.xml';
-
-				if ( file_exists( $_file ) )				
+				foreach( $main_items as $_current_module )
 				{
-					//-----------------------------------------
-					// Get xml mah-do-dah
-					//-----------------------------------------
+					$_file = IPSLib::getAppDir( $app_dir ) . "/modules_admin/" . $_current_module . '/xml/menu.xml';
 					
-					require_once( IPS_KERNEL_PATH . 'classXML.php' );
-					$xml = new classXML( IPS_DOC_CHAR_SET );
-			
-					$content = @file_get_contents( $_file );					
-
-					if ( $content )
+					if ( is_file( $_file ) )
 					{
-						$xml->loadXML( $content );
-						$menu			= $xml->fetchXMLAsArray();
-						$item			= array();
-						$subItemIndex	= 0;
-						$itemIndex		= 0;
-
-						/**
-						 * Easiest way I could find to get the data in a proper multi-dimensional array
-						 */
-						 
-						foreach( $menu as $id => $data )
+						//-----------------------------------------
+						// Get xml mah-do-dah
+						//-----------------------------------------
+						
+	
+						require_once ( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+						$xml = new classXML( IPS_DOC_CHAR_SET );
+						
+						$content = @file_get_contents( $_file );
+						
+						if ( $content )
 						{
-							foreach( $data as $dataKey => $dataValue )
+							$xml->loadXML( $content );
+							$menu = $xml->fetchXMLAsArray();
+							$item = array();
+							$subItemIndex = 0;
+							$itemIndex = 0;
+							
+							/**
+							 * Easiest way I could find to get the data in a proper multi-dimensional array
+							 */
+							foreach( $menu as $id => $data )
 							{
-								if( $dataKey == 'tabitems' )
+								foreach( $data as $dataKey => $dataValue )
 								{
-									foreach( $dataValue as $tabitemsKey => $tabItemsValue )
+									if ( $dataKey == 'tabitems' )
 									{
-										if( $tabitemsKey == 'item' )
+										foreach( $dataValue as $tabitemsKey => $tabItemsValue )
 										{
-											foreach( $tabItemsValue as $itemKey => $itemValue )
+											if ( $tabitemsKey == 'item' )
 											{
-												if( is_int($itemKey) )
+												foreach( $tabItemsValue as $itemKey => $itemValue )
 												{
-													foreach( $itemValue as $_itemKey => $_itemValue )
+													if ( is_int( $itemKey ) )
 													{
-														$subItemIndex	= 0;
-														
-														if( $_itemKey == 'title' or $_itemKey == 'condition' )
+														foreach( $itemValue as $_itemKey => $_itemValue )
 														{
-															$item[ $itemIndex ][ $_itemKey ]	= $_itemValue['#alltext'];
-														}
-														else if( $_itemKey == 'subitems' )
-														{
-															foreach( $_itemValue as $subitemKey => $subitemValue )
+															$subItemIndex = 0;
+															
+															if ( $_itemKey == 'title' or $_itemKey == 'condition' )
 															{
-																if( $subitemKey != '#alltext' )
+																$item[$itemIndex][$_itemKey] = $_itemValue['#alltext'];
+															}
+															else if ( $_itemKey == 'subitems' )
+															{
+																foreach( $_itemValue as $subitemKey => $subitemValue )
 																{
-																	foreach( $subitemValue as $subitemRealKey => $subitemRealValue )
+																	if ( $subitemKey != '#alltext' )
 																	{
-																		if( is_int( $subitemRealKey ) )
+																		foreach( $subitemValue as $subitemRealKey => $subitemRealValue )
 																		{
-																			foreach( $subitemRealValue as $_subitemRealKey => $_subitemRealValue )
+																			if ( is_int( $subitemRealKey ) )
 																			{
-																				if( $_subitemRealKey != '#alltext' )
+																				foreach( $subitemRealValue as $_subitemRealKey => $_subitemRealValue )
 																				{
-																					$item[ $itemIndex ][ $_itemKey ][ $subitemKey ][ $subItemIndex ][ $_subitemRealKey ]	= $_subitemRealValue['#alltext'];
+																					if ( $_subitemRealKey != '#alltext' )
+																					{
+																						$item[$itemIndex][$_itemKey][$subitemKey][$subItemIndex][$_subitemRealKey] = $_subitemRealValue['#alltext'];
+																					}
 																				}
 																			}
-																		}
-																		else if( $subitemRealKey != '#alltext' )
-																		{
-																			$item[ $itemIndex ][ $_itemKey ][ $subitemKey ][ $subItemIndex ][ $subitemRealKey ]	= $subitemRealValue['#alltext'];
+																			else if ( $subitemRealKey != '#alltext' )
+																			{
+																				$item[$itemIndex][$_itemKey][$subitemKey][$subItemIndex][$subitemRealKey] = $subitemRealValue['#alltext'];
+																			}
+																			
+																			if ( is_int( $subitemRealKey ) )
+																			{
+																				$subItemIndex ++;
+																			}
 																		}
 																		
-																		if( is_int( $subitemRealKey ) )
+																		$subItemIndex ++;
+																	}
+																}
+															}
+														}
+														
+														$itemIndex ++;
+													}
+													else if ( $itemKey == 'title' )
+													{
+														$item[$itemIndex][$itemKey] = $itemValue['#alltext'];
+													}
+													else if ( $itemKey == 'subitems' )
+													{
+														foreach( $itemValue as $subitemKey => $subitemValue )
+														{
+															if ( $subitemKey != '#alltext' )
+															{
+																foreach( $subitemValue as $subitemRealKey => $subitemRealValue )
+																{
+																	if ( is_int( $subitemRealKey ) )
+																	{
+																		foreach( $subitemRealValue as $_subitemRealKey => $_subitemRealValue )
 																		{
-																			$subItemIndex++;
+																			if ( $_subitemRealKey != '#alltext' )
+																			{
+																				$item[$itemIndex][$itemKey][$subitemKey][$subItemIndex][$_subitemRealKey] = $_subitemRealValue['#alltext'];
+																			}
 																		}
 																	}
+																	else if ( $subitemRealKey != '#alltext' )
+																	{
+																		$item[$itemIndex][$itemKey][$subitemKey][$subItemIndex][$subitemRealKey] = $subitemRealValue['#alltext'];
+																	}
 																	
-																	$subItemIndex++;
-																}
-															}
-														}														
-													}
-													
-													$itemIndex++;
-												}
-												else if( $itemKey == 'title' )
-												{
-													$item[ $itemIndex ][ $itemKey ]	= $itemValue['#alltext'];
-												}
-												else if( $itemKey == 'subitems' )
-												{
-													foreach( $itemValue as $subitemKey => $subitemValue )
-													{
-														if( $subitemKey != '#alltext' )
-														{
-															foreach( $subitemValue as $subitemRealKey => $subitemRealValue )
-															{
-																if( is_int( $subitemRealKey ) )
-																{
-																	foreach( $subitemRealValue as $_subitemRealKey => $_subitemRealValue )
+																	if ( is_int( $subitemRealKey ) )
 																	{
-																		if( $_subitemRealKey != '#alltext' )
-																		{
-																			$item[ $itemIndex ][ $itemKey ][ $subitemKey ][ $subItemIndex ][ $_subitemRealKey ]	= $_subitemRealValue['#alltext'];
-																		}
+																		$subItemIndex ++;
 																	}
 																}
-																else if( $subitemRealKey != '#alltext' )
-																{
-																	$item[ $itemIndex ][ $itemKey ][ $subitemKey ][ $subItemIndex ][ $subitemRealKey ]	= $subitemRealValue['#alltext'];
-																}
 																
-																if( is_int( $subitemRealKey ) )
-																{
-																	$subItemIndex++;
-																}
+																$subItemIndex ++;
 															}
-															
-															$subItemIndex++;
 														}
 													}
 												}
+												
+												$itemIndex ++;
 											}
-											
-											$itemIndex++;
 										}
 									}
 								}
 							}
-						}
-						
-						foreach( $item as $id => $data )
-						{
-							//-----------------------------------------
-							// INIT
-							//-----------------------------------------
 							
-							if ( $data['condition'] )
-							{
-								$func = create_function( '', $data['condition'] );
-								if( ! $func() )
-								{
-									continue;
-								}
-							}
-					
-							$_cat_title     = $data['title'];
-							$_cat_title     = str_replace( '&', '&amp;', $_cat_title ); // Validation thing
-							$_nav_main_done = 0;
-					
-							if ( is_array( $data['subitems'] ) )
+							foreach( $item as $id => $data )
 							{
 								//-----------------------------------------
-								// Loop....
+								// INIT
 								//-----------------------------------------
-
-								foreach( $data['subitems'] as $__data )
+	
+								if ( $data['condition'] )
 								{
-									foreach( $__data as $_id => $_data )
+									$func = create_function( '', $data['condition'] );
+	
+									if ( ! $func() )
 									{
-										$_sub_item_title    = $_data['subitemtitle'];
-										$_sub_item_url      = $_data['subitemurl'];
-										$_sub_is_redirect   = $_data['subisredirect'];
-										$_sub_section       = $_data['subsection'];
-										$_sub_keywords      = $_data['subitemkeywords'];
-										$_sub_item_role_key = isset( $_data['subitemrolekey'] ) ? $_data['subitemrolekey'] : '';
-																			
-										//-----------------------------------------
-										// Continue...
-										//-----------------------------------------
+										continue;
+									}
+								}
 								
-										if ( $_sub_item_title AND $_sub_section )
+								$_cat_title = $data['title'];
+								$_cat_title = str_replace( '&', '&amp;', $_cat_title ); // Validation thing
+								$_nav_main_done = 0;
+								
+								if ( is_array( $data['subitems'] ) )
+								{
+									//-----------------------------------------
+									// Loop....
+									//-----------------------------------------
+									
+	
+									foreach( $data['subitems'] as $__data )
+									{
+										foreach( $__data as $_id => $_data )
 										{
-											$app_menu_cache[ $app_dir ][ $id . '_' . $_current_module ]['title']         = $_cat_title;
-											$app_menu_cache[ $app_dir ][ $id . '_' . $_current_module ]['items'][ $_id ] = array(  'title'    => $_sub_item_title,
-																																   'module'   => $_current_module,
-																																   'keywords' => $_sub_keywords,
-																									   						  	   'section'  => $_sub_section,
-																															   	   'url'      => $_sub_item_url,
-																															       'rolekey'  => $_sub_item_role_key,
-																								       							   'redirect' => $_sub_is_redirect );
+											$_sub_item_title	= $_data['subitemtitle'];
+											$_sub_item_url		= $_data['subitemurl'];
+											$_sub_is_redirect	= $_data['subisredirect'];
+											$_sub_section		= $_data['subsection'];
+											$_sub_keywords		= $_data['subitemkeywords'];
+											$_sub_item_role_key	= isset( $_data['subitemrolekey'] ) ? $_data['subitemrolekey'] : '';
+											$_sub_language		= $_data['subitemlang'];
+											
+											//-----------------------------------------
+											// Continue...
+											//-----------------------------------------
+											
+	
+											if ( $_sub_item_title and $_sub_section )
+											{
+												$app_menu_cache[$app_dir][$id . '_' . $_current_module]['title'] = $_cat_title;
+												$app_menu_cache[$app_dir][$id . '_' . $_current_module]['items'][$_id] = array( 'title' => $_sub_item_title, 'module' => $_current_module, 'langkey' => $_sub_language, 'keywords' => $_sub_keywords, 'section' => $_sub_section, 'url' => $_sub_item_url, 'rolekey' => $_sub_item_role_key, 'redirect' => $_sub_is_redirect );
+											}
 										}
 									}
 								}
@@ -2393,5 +3013,5 @@ class admin_core_applications_applications extends ipsCommand
 		}
 		
 		$this->cache->setCache( 'app_menu_cache', $app_menu_cache, array( 'array' => 1 ) );
-	}	
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/blog.php b/upload/admin/applications/core/modules_admin/applications/blog.php
index 9ae91163..9a9a5193 100644
--- a/upload/admin/applications/core/modules_admin/applications/blog.php
+++ b/upload/admin/applications/core/modules_admin/applications/blog.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Blog Application
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th Aug 2004
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,14 +30,13 @@ class admin_core_applications_blog extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://betscms.ws");
+		$this->registry->output->showInsideIframe("http://myipb.in/products/blog/");
 	}
 }
diff --git a/upload/admin/applications/core/modules_admin/applications/ccs.php b/upload/admin/applications/core/modules_admin/applications/ccs.php
index 8f24e0ac..db17a93c 100644
--- a/upload/admin/applications/core/modules_admin/applications/ccs.php
+++ b/upload/admin/applications/core/modules_admin/applications/ccs.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Blog Application
- * Last Updated: $Date: 2010-11-10 06:51:11 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7126 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -27,14 +27,13 @@ class admin_core_applications_ccs extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://betscms.ws");
+		$this->registry->output->showInsideIframe("http://myipb.in/products/content/");
 	}
 }
diff --git a/upload/admin/applications/core/modules_admin/applications/copyright.php b/upload/admin/applications/core/modules_admin/applications/copyright.php
index 152f1a8b..49ae3ac7 100644
--- a/upload/admin/applications/core/modules_admin/applications/copyright.php
+++ b/upload/admin/applications/core/modules_admin/applications/copyright.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Download Manager Application
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-11 12:57:46 -0400 (Wed, 11 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		17 February 2003
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8727 $
  *
  */
 
@@ -30,7 +30,6 @@ class admin_core_applications_copyright extends ipsCommand
 	/**
 	 * HTML skin
 	 *
-	 * @access	public
 	 * @var		object		Skin file
 	 */
 	public $html;
@@ -38,9 +37,8 @@ class admin_core_applications_copyright extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -65,6 +63,6 @@ class admin_core_applications_copyright extends ipsCommand
 		// Just redirect to the setting
 		//-----------------------------------------
 		
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . 'app=core&module=tools&section=settings&do=setting_view&conf_title_keyword=ipbcopyright' );
+		$this->registry->output->silentRedirect( $this->settings['base_url'] . 'app=core&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=ipbcopyright' );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/defaultSection.php b/upload/admin/applications/core/modules_admin/applications/defaultSection.php
index bc631329..6544fecb 100644
--- a/upload/admin/applications/core/modules_admin/applications/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/applications/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default applications section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'applications' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'applications';
\ No newline at end of file
+$DEFAULT_SECTION = 'applications';
diff --git a/upload/admin/applications/core/modules_admin/applications/downloads.php b/upload/admin/applications/core/modules_admin/applications/downloads.php
index 9da15c51..ee622500 100644
--- a/upload/admin/applications/core/modules_admin/applications/downloads.php
+++ b/upload/admin/applications/core/modules_admin/applications/downloads.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Download Manager Application
- * Last Updated: $Date: 2010-11-10 06:51:11 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 7126 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,14 +30,13 @@ class admin_core_applications_downloads extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://betscms.ws");
+		$this->registry->output->showInsideIframe("http://myipb.in/products/downloads/");
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/gallery.php b/upload/admin/applications/core/modules_admin/applications/gallery.php
index 67573dfb..e358991d 100644
--- a/upload/admin/applications/core/modules_admin/applications/gallery.php
+++ b/upload/admin/applications/core/modules_admin/applications/gallery.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Gallery Application
- * Last Updated: $Date: 2010-11-10 06:51:11 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 7126 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,14 +30,13 @@ class admin_core_applications_gallery extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://betscms.ws");
+		$this->registry->output->showInsideIframe("http://myipb.in/products/gallery/");
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/hooks.php b/upload/admin/applications/core/modules_admin/applications/hooks.php
index 0fea5cc6..50b6e3d5 100644
--- a/upload/admin/applications/core/modules_admin/applications/hooks.php
+++ b/upload/admin/applications/core/modules_admin/applications/hooks.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Hooks Management
- * Last Updated: $Date: 2010-10-19 08:45:58 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-10-07 22:31:51 -0400 (Fri, 07 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0.0
- * @version		$Revision: 6994 $
+ * @version		$Revision: 9588 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,7 +30,7 @@ class admin_core_applications_hooks extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Hooks library
@@ -46,11 +46,19 @@ class admin_core_applications_hooks extends ipsCommand
 	 */
 	protected $hooks;	
 	
+	/**
+	 * Array of all the cache versions
+	 * for the required applications
+	 * 
+	 * @var	$cachedVersions
+	 */
+	protected $cachedVersions = array();
+	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -67,14 +75,15 @@ class admin_core_applications_hooks extends ipsCommand
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/hooksFunctions.php', 'hooksFunctions' );
 		$this->hooksFunctions = new $classToLoad( $registry );
 		
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_applications' ) );
+		// lang already loaded by hookFunctions
+		//$this->registry->class_localization->loadLanguageFile( array( 'admin_applications' ), 'core' );
 
 		//-----------------------------------------
 		// Set up stuff
 		//-----------------------------------------
 		
-		$this->form_code	= $this->html->form_code	= 'module=applications&amp;section=hooks';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=applications&section=hooks';
+		$this->form_code	= $this->html->form_code	= 'module=applications&amp;section=hooks&amp;';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=applications&section=hooks&';
 		
 		//-----------------------------------------
 		// What to do...
@@ -155,11 +164,6 @@ class admin_core_applications_hooks extends ipsCommand
 				$this->_hookSave( 'edit' );
 			break;
 			
-			case 'skinsRebuild':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'hooks_manage' );
-				$this->_rebuildSkins();
-			break;
-			
 			case 'removeDeadCaches':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'hooks_manage' );
 				$this->removeDeadCaches();
@@ -189,7 +193,7 @@ class admin_core_applications_hooks extends ipsCommand
 	/**
 	 * Reimport all hooks for all installed applications
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function reimportAppHooks()
 	{
@@ -204,36 +208,31 @@ class admin_core_applications_hooks extends ipsCommand
 			$stats['skipped']	= $stats['skipped'] + $_stats['skipped'];
 		}
 		
-		//-----------------------------------------
-		// Message
-		//-----------------------------------------
-		
-		$this->registry->output->global_message = sprintf( $this->lang->words['app_hooks_rebuilt'], $stats['inserted'], $stats['updated'], $stats['skipped'] );
-		
-		//-----------------------------------------
-		// Recache hooks so templates know that there
-		// are comments to preserve
-		//-----------------------------------------
-		
+		/* Rebuild cache */
 		$this->rebuildHooksCache();
 		
-		/* Flag skins for recache */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		$skinCaching	= new skinCaching( $this->registry );
+		/* Rebuild global caches */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e ){}
 		
-		/* Flag all for recache */
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
 		$skinCaching->flagSetForRecache();
 		
-		/* Print message */
-		
-		$this->_hooksOverview();
+		/* Redirect */
+		$this->registry->output->global_message = sprintf( $this->lang->words['app_hooks_rebuilt'], $stats['inserted'], $stats['updated'], $stats['skipped'] );
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview' );
 	}
 	
 	/**
 	 * Rebuild skins following hook import that included a template
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function removeDeadCaches()
 	{
@@ -254,7 +253,7 @@ class admin_core_applications_hooks extends ipsCommand
 		
 		try
 		{
-			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'hooks' ) as $file )
+			foreach( new DirectoryIterator( IPS_HOOKS_PATH ) as $file )
 			{
 				if ( ! $file->isDot() )
 				{
@@ -276,79 +275,21 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			foreach( $unlink as $file )
 			{
-				@unlink( DOC_IPS_ROOT_PATH . 'hooks/' . $file );
+				@unlink( IPS_HOOKS_PATH . $file );
 			}
 		}
 		
 		/* Print message */
-		$this->registry->output->global_message = count( $unlink ) . " Cached Hook Files Removed<br />" . implode( "<br />", $unlink );
-		$this->_hooksOverview();
-	}
-	
-	/**
-	 * Rebuild skins following hook import that included a template
-	 *
-	 * @return	void
-	 */
-	protected function _rebuildSkins()
-	{
-		$setID = intval( $this->request['setID'] );
-		
-		if( $setID )
-		{
-			//-----------------------------------------
-			// Get the libs
-			//-----------------------------------------
-			
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-			$skinCaching	= new skinCaching( $this->registry );
-							
-			$skinCaching->rebuildPHPTemplates( $setID );
-			
-			/* Fetch next id */
-			$nextID = $setID;
-			
-			ksort( $this->registry->output->allSkins );
-		
-			foreach( $this->registry->output->allSkins as $id => $data )
-			{
-				if ( $id > $nextID )
-				{
-					$nextID = $id;
-					break;
-				}
-			}
-			
-			if ( $nextID != $setID )
-			{
-				$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ) );
-				
-				/* More to go.. */
-				$this->registry->output->redirect( $this->settings['base_url'] . 'app=core&module=applications&section=hooks&do=skinsRebuild&setID=' . $nextID, $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'] );
-			}
-		}
-		
-		//-----------------------------------------
-		// Must be all done!
-		//-----------------------------------------
-		
-		$message = ipsRegistry::getClass('adminFunctions')->staffGetCookie( 'hookResult' );
-		ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'hookResult', '' );
-		
-		$this->registry->output->global_message	= $message;
-		
-		$this->rebuildHooksCache();
-		
+		$this->registry->output->global_message = sprintf( $this->lang->words['hook_removed_files'], count( $unlink ) ) . '<br />' . implode( '<br />', $unlink );
 		$this->_hooksOverview();
 	}
 
 	/**
 	 * Reorder hooks
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _reorder()
+	protected function _reorder()
 	{
 		//-----------------------------------------
 		// INIT
@@ -375,6 +316,9 @@ class admin_core_applications_hooks extends ipsCommand
  		
  		if( is_array($this->request['hooks']) AND count($this->request['hooks']) )
  		{
+ 			/* Reset all hooks to 0 temporarily */
+ 			$this->DB->update( 'core_hooks', array( 'hook_position' => 0 ) );
+ 			
  			foreach( $this->request['hooks'] as $this_id )
  			{
  				$this->DB->update( 'core_hooks', array( 'hook_position' => $position ), 'hook_id=' . $this_id );
@@ -394,7 +338,7 @@ class admin_core_applications_hooks extends ipsCommand
 	 *
 	 * @return   void
 	 */
-	private function _installHook()
+	protected function _installHook()
 	{
 		//-----------------------------------------
 		// Get uploaded schtuff
@@ -410,11 +354,29 @@ class admin_core_applications_hooks extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['h_noxml'], 1110 );
 		}
 
-		$this->installHook( $content, TRUE );
+		$this->installHook( $content, TRUE, FALSE );
 		
+		/* Rebuild cache */
 		$this->rebuildHooksCache();
 		
-		$this->_hooksOverview();
+		/* Rebuild global caches */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e ){}
+		
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
+		$skinCaching->flagSetForRecache();
+		
+		/* Redirect */
+		$_msg	= $this->registry->output->global_message;
+		$this->registry->output->global_message	= '';
+		
+		$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview', $_msg );
 	}
 	
 	/**
@@ -422,18 +384,16 @@ class admin_core_applications_hooks extends ipsCommand
 	 * Inserts new hooks
 	 *
 	 * @param	string		Application to install hooks for
-	 * @todo 	Figure out how to upgrade hooks properly (db updates / template updates / file updates, etc)
 	 */
 	public function installAppHooks( $app )
 	{
 		static $hooks	= array();
 
 		$msgs    = array( 'inserted' => 0, 'updated' => 0, 'skipped' => 0 );
-		$hooks   = array();
 		$xmlData = array();
 		$path    = IPSLib::getAppDir( $app ) . '/xml';
 		
-		if ( file_exists( $path . '/hooks.xml' ) AND is_dir( $path . '/hooks' ) )
+		if ( is_file( $path . '/hooks.xml' ) AND is_dir( $path . '/hooks' ) )
 		{
 			if( !count($hooks) )
 			{
@@ -452,7 +412,7 @@ class admin_core_applications_hooks extends ipsCommand
 			}
 			
 			/* Alright. We're in. Read the XML file */
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPS_DOC_CHAR_SET );
 
 			/* Grab wrapper file */
@@ -468,7 +428,7 @@ class admin_core_applications_hooks extends ipsCommand
 			{
 				foreach( $xmlData as $x )
 				{
-					if ( file_exists( $path . '/hooks/' . $x['file'] ) )
+					if ( is_file( $path . '/hooks/' . $x['file'] ) )
 					{
 						$xml->load(  $path . '/hooks/' . $x['file'] );
 						
@@ -503,7 +463,7 @@ class admin_core_applications_hooks extends ipsCommand
 	 * @param	boolean		Add message to output->global_message
 	 * @param	boolean		Allow skins to recache
 	 * @param	int			Install enabled
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function installHook( $content, $addMessage=FALSE, $allowSkinRecache=TRUE, $enabled=1 )
 	{
@@ -540,7 +500,7 @@ class admin_core_applications_hooks extends ipsCommand
 		// Get xml mah-do-dah
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -563,34 +523,34 @@ class admin_core_applications_hooks extends ipsCommand
 		// Temp
 		//-----------------------------------------
 		
-		$tempExtraData	= unserialize( $config['hook_extra_data'] );
+		$tempExtraData = unserialize( $config['hook_extra_data'] );
 
 		//-----------------------------------------
 		// Set config
 		//-----------------------------------------
 		
-		$config			= array(
-								'hook_name'				=> $config['hook_name'],
-								'hook_desc'				=> $config['hook_desc'],
-								'hook_author'			=> $config['hook_author'],
-								'hook_email'			=> $config['hook_email'],
-								'hook_website'			=> $config['hook_website'],
-								'hook_update_check'		=> $config['hook_update_check'],
-								'hook_requirements'		=> $config['hook_requirements'],
-								'hook_version_human'	=> $config['hook_version_human'],
-								'hook_version_long'		=> $config['hook_version_long'],
-								'hook_key'				=> $config['hook_key'],
-								'hook_enabled'			=> $enabled,
-								'hook_updated'			=> time(),
-								);
+		$config = array('hook_name'				=> $config['hook_name'],
+						'hook_desc'				=> $config['hook_desc'],
+						'hook_author'			=> $config['hook_author'],
+						'hook_email'			=> $config['hook_email'],
+						'hook_website'			=> $config['hook_website'],
+						'hook_update_check'		=> $config['hook_update_check'],
+						'hook_requirements'		=> $config['hook_requirements'],
+						'hook_version_human'	=> $config['hook_version_human'],
+						'hook_version_long'		=> $config['hook_version_long'],
+						'hook_key'				=> $config['hook_key'],
+						'hook_global_caches'	=> $config['hook_global_caches'],
+						'hook_enabled'			=> $enabled,
+						'hook_updated'			=> IPS_UNIX_TIME_NOW,
+						);
 
-		$extra_data		= array();
+		$extra_data	= array();
 
 		//-----------------------------------------
 		// Set files
 		//-----------------------------------------
 		
-		$files			= array();
+		$files		= array();
 
 		foreach( $xml->fetchElements('hookfiles') as $node )
 		{
@@ -600,7 +560,7 @@ class admin_core_applications_hooks extends ipsCommand
 	
 				if( $file['hook_type'] )
 				{
-					$files[]	= array(
+					$files[] 	= array(
 										'hook_file_real'	=> $file['hook_file_real'],
 										'hook_type'			=> $file['hook_type'],
 										'hook_classname'	=> $file['hook_classname'],
@@ -625,9 +585,8 @@ class admin_core_applications_hooks extends ipsCommand
 				
 				if( count($file) )
 				{
-					$custom	= array(
-									'filename'	=> $file['filename'],
-									'source'	=> $file['source'],
+					$custom	= array( 'filename'	=> $file['filename'],
+									 'source'	=> $file['source'],
 									);
 				}
 			}
@@ -691,12 +650,12 @@ class admin_core_applications_hooks extends ipsCommand
 				$langbit	= $xml->fetchElementsFromRecord( $_langbit );
 				
 				$language[]	= array(
-									'word_app'			=> $langbit['word_app'],
-									'word_pack'			=> $langbit['word_pack'],
-									'word_key'			=> $langbit['word_key'],
-									'word_default'		=> $langbit['word_default'],
-									'word_custom'		=> $langbit['word_custom'],
-									'word_js'			=> $langbit['word_js'],
+									'word_app'		=> $langbit['word_app'],
+									'word_pack'		=> $langbit['word_pack'],
+									'word_key'		=> $langbit['word_key'],
+									'word_default'	=> $langbit['word_default'],
+									'word_custom'	=> $langbit['word_custom'],
+									'word_js'		=> $langbit['word_js'],
 									);
 			}
 		}
@@ -757,7 +716,6 @@ class admin_core_applications_hooks extends ipsCommand
 			foreach( $xml->fetchElements('templates', $node) as $_template )
 			{
 				$template		= $xml->fetchElementsFromRecord( $_template );
-				
 				$templates[]	= array(
 										'template_set_id'		=> 0,
 										'template_group'		=> $template['template_group'],
@@ -766,16 +724,16 @@ class admin_core_applications_hooks extends ipsCommand
 										'template_data'			=> $template['template_data'],
 										'template_updated'		=> $template['template_updated'],
 										'template_removable'	=> $template['template_removable'],
-										'template_added_to'		=> $template['template_added_to'],
+										'template_added_to'		=> intval($template['template_added_to']),
 										'template_user_added'	=> 1,
 										'template_user_edited'  => 0,
-										'template_master_key'   => ( $template['template_master_key'] ) ? $template['template_master_key'] : 'root',
+										'template_master_key'   => $template['template_master_key'] ? $template['template_master_key'] : 'root',
 										);
 			}
 		}
 		
 		//-----------------------------------------
-		// Set the tasks
+		// Set the CSS
 		//-----------------------------------------
 		
 		$css			= array();
@@ -784,7 +742,7 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			foreach( $xml->fetchElements('css', $node) as $_css )
 			{
-				$_css		= $xml->fetchElementsFromRecord( $_css );
+				$_css	= $xml->fetchElementsFromRecord( $_css );
 				$css[]	= array(
 									'css_set_id'		=> 0,
 									'css_group'			=> $_css['css_group'],
@@ -796,7 +754,7 @@ class admin_core_applications_hooks extends ipsCommand
 									'css_attributes'	=> $_css['css_attributes'],
 									'css_removed'		=> $_css['css_removed'],
 									'css_modules'		=> $_css['css_modules'],
-									'css_master_key'	=> ( $_css['css_master_key'] ) ? $_css['css_master_key'] : $_css['css_master_key']
+									'css_master_key'	=> $_css['css_master_key'],
 									);
 			}
 		}
@@ -813,20 +771,20 @@ class admin_core_applications_hooks extends ipsCommand
 			{
 				$task		= $xml->fetchElementsFromRecord( $_task );
 				$tasks[]	= array(
-									'task_title'			=> $task['task_title'],
-									'task_file'				=> $task['task_file'],
-									'task_week_day'			=> $task['task_week_day'],
-									'task_month_day'		=> $task['task_month_day'],
-									'task_hour'				=> $task['task_hour'],
-									'task_minute'			=> $task['task_minute'],
-									'task_cronkey'			=> $task['task_cronkey'],
-									'task_log'				=> $task['task_log'],
-									'task_description'		=> $task['task_description'],
-									'task_enabled'			=> $task['task_enabled'],
-									'task_key'				=> $task['task_key'],
-									'task_safemode'			=> $task['task_safemode'],
-									'task_locked'			=> $task['task_locked'],
-									'task_application'		=> $task['task_application'],
+									'task_title'		=> $task['task_title'],
+									'task_file'			=> $task['task_file'],
+									'task_week_day'		=> $task['task_week_day'],
+									'task_month_day'	=> $task['task_month_day'],
+									'task_hour'			=> $task['task_hour'],
+									'task_minute'		=> $task['task_minute'],
+									'task_cronkey'		=> $task['task_cronkey'],
+									'task_log'			=> $task['task_log'],
+									'task_description'	=> $task['task_description'],
+									'task_enabled'		=> $task['task_enabled'],
+									'task_key'			=> $task['task_key'],
+									'task_safemode'		=> $task['task_safemode'],
+									'task_locked'		=> $task['task_locked'],
+									'task_application'	=> $task['task_application'],
 									);
 			}
 		}
@@ -848,9 +806,9 @@ class admin_core_applications_hooks extends ipsCommand
 			{
 				$table		= $xml->fetchElementsFromRecord( $_table );
 				$database['create'][]	= array(
-											'name'			=> $table['name'],
-											'fields'		=> $table['fields'],
-											'tabletype'		=> $table['tabletype'],
+											'name'		=> $table['name'],
+											'fields'	=> $table['fields'],
+											'tabletype'	=> $table['tabletype'],
 											);
 			}
 		}
@@ -861,12 +819,12 @@ class admin_core_applications_hooks extends ipsCommand
 			{
 				$table		= $xml->fetchElementsFromRecord( $_table );
 				$database['alter'][]	= array(
-											'altertype'		=> $table['altertype'],
-											'table'			=> $table['table'],
-											'field'			=> $table['field'],
-											'newfield'		=> $table['newfield'],
-											'fieldtype'		=> $table['fieldtype'],
-											'default'		=> $table['default'],
+											'altertype'	=> $table['altertype'],
+											'table'		=> $table['table'],
+											'field'		=> $table['field'],
+											'newfield'	=> $table['newfield'],
+											'fieldtype'	=> $table['fieldtype'],
+											'default'	=> $table['default'],
 											);
 			}
 		}
@@ -892,9 +850,9 @@ class admin_core_applications_hooks extends ipsCommand
 			{
 				$table		= $xml->fetchElementsFromRecord( $_table );
 				$database['insert'][]	= array(
-											'table'			=> $table['table'],
-											'updates'		=> $table['updates'],
-											'fordelete'		=> $table['fordelete'],
+											'table'		=> $table['table'],
+											'updates'	=> $table['updates'],
+											'fordelete'	=> $table['fordelete'],
 											);
 			}
 		}
@@ -915,7 +873,7 @@ class admin_core_applications_hooks extends ipsCommand
 		$helpUpdated			= 0;
 		$templatesInserted		= 0;
 		$templatesUpdated		= 0;
-		$templateHooks		    = 0;
+		$templateHooks		    = false;
 		$tasksInserted			= 0;
 		$tasksUpdated			= 0;
 		$createQueries			= 0;
@@ -933,7 +891,8 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			if ( $_f['hook_type'] AND $_f['hook_type'] == 'templateHooks' )
 			{
-				$templateHooks++;
+				$templateHooks = true;
+				break;
 			}
 		}
 		
@@ -960,14 +919,14 @@ class admin_core_applications_hooks extends ipsCommand
 		}
 		else
 		{
-			$config['hook_installed']			= time();
+			$config['hook_installed']			= IPS_UNIX_TIME_NOW;
 			$this->hook[ $config['hook_key'] ]	= $config;
 			
 			$this->DB->insert( 'core_hooks', $config );
 			
 			$hook_id	= $this->DB->getInsertId();
 			
-			$this->hook[ $config['hook_key'] ]['hook_id']	= $hook_id;
+			$this->hook[ $config['hook_key'] ]['hook_id'] = $hook_id;
 			
 			$extra_data['display']	= $tempExtraData['display'];
 		}
@@ -999,7 +958,7 @@ class admin_core_applications_hooks extends ipsCommand
 				$filename	= $file['hook_classname'] . '_' . md5( uniqid( microtime(), true ) ) . '.php';
 				
 				file_put_contents( IPS_HOOKS_PATH . $filename, $file['hooks_source'] );
-				chmod( IPS_HOOKS_PATH . $filename, 0777 );
+				chmod( IPS_HOOKS_PATH . $filename, IPS_FILE_PERMISSION );
 				
 				$file['hook_file_stored']	= $filename;
 				$file['hook_hook_id']		= $hook_id;
@@ -1016,6 +975,7 @@ class admin_core_applications_hooks extends ipsCommand
 		if( $custom['source'] AND $custom['filename'] )
 		{
 			file_put_contents( IPS_HOOKS_PATH . "install_" . $custom['filename'], $custom['source'] );
+			chmod( IPS_HOOKS_PATH . "install_" . $custom['filename'], IPS_FILE_PERMISSION );
 		}
 		
 		//-----------------------------------------
@@ -1026,7 +986,7 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			$setting_groups = array();
 			
-			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_settings_titles', 'order' => 'conf_title_title' ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_settings_titles' ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -1039,10 +999,7 @@ class admin_core_applications_hooks extends ipsCommand
 			// Get current settings.
 			//-----------------------------------------
 			
-			$this->DB->build( array( 'select' => 'conf_id, conf_key',
-														  'from'   => 'core_sys_conf_settings',
-														  'order'  => 'conf_id' ) );
-			
+			$this->DB->build( array( 'select' => 'conf_id, conf_key', 'from' => 'core_sys_conf_settings' ) );
 			$this->DB->execute();
 			
 			while ( $r = $this->DB->fetch() )
@@ -1081,7 +1038,7 @@ class admin_core_applications_hooks extends ipsCommand
 						$this->DB->insert( 'core_sys_settings_titles', $save );
 						$conf_id = $this->DB->getInsertId();
 						$settingGroupsInserted++;
-						$extra_data['settingGroups'][] = $conf_id;
+						$extra_data['settingGroups'][] = $save['conf_title_keyword'];
 					}
 					else
 					{
@@ -1130,8 +1087,7 @@ class admin_core_applications_hooks extends ipsCommand
 				{
 					$this->DB->insert( 'core_sys_conf_settings', $data );
 					$settingsInserted++;
-					$conf_id = $this->DB->getInsertId();
-					$extra_data['settings'][] = $conf_id;
+					$extra_data['settings'][] = $data['conf_key'];
 				}
 			}
 		}
@@ -1144,7 +1100,7 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			foreach( $need_update as $i => $idx )
 			{
-				$conf = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'core_sys_conf_settings', 'where' => 'conf_group='.$idx ) );
+				$conf = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'core_sys_conf_settings', 'where' => 'conf_group=' . $idx ) );
 			
 				$count = intval($conf['count']);
 				
@@ -1244,7 +1200,7 @@ class admin_core_applications_hooks extends ipsCommand
 					$this->DB->insert( 'core_sys_module', $module );
 					$modulesInserted++;
 					$module_id = $this->DB->getInsertId();
-					$extra_data['modules'][] = $module_id;
+					$extra_data['modules'][] = ( $module['sys_module_admin'] ? 'admin' : 'public' ) . '-' . $module['sys_module_application'] . '-' . $module['sys_module_key'];
 				}
 			}
 			
@@ -1283,7 +1239,7 @@ class admin_core_applications_hooks extends ipsCommand
 					$this->DB->insert( 'faq', $entry );
 					$helpInserted++;
 					$help_id = $this->DB->getInsertId();
-					$extra_data['help'][] = $help_id;
+					$extra_data['help'][] = $entry['title'];
 				}
 			}
 		}
@@ -1297,27 +1253,52 @@ class admin_core_applications_hooks extends ipsCommand
 			$bits		= array();
 			
 			/* Root will always be updated */
-			$this->DB->build( array( 'select' => 'template_name,template_group', 'from' => 'skin_templates', 'where' => 'template_set_id=0 AND template_master_key=\'root\'' ) );
+			$this->DB->build( array( 'select' => 'template_name,template_group,template_master_key', 'from' => 'skin_templates' ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
 			{
-				$bits[ $r['template_group'] ][] = $r['template_name'];
+				$bits[ $r['template_master_key'] ][ $r['template_group'] ][] = $r['template_name'];
 			}
 
 			foreach( $templates as $template )
 			{
-				if( is_array($bits[ $template['template_group'] ]) AND in_array( $template['template_name'], $bits[ $template['template_group'] ] ) )
+				//-----------------------------------------
+				// If template is not in root set, add it to
+				// prevent fatal error selecting other skins
+				//-----------------------------------------
+				
+				if ( $template['template_master_key'] != 'root' && ( !isset($bits['root'][ $template['template_group'] ]) OR !in_array( $template['template_name'], $bits['root'][ $template['template_group'] ] ) ) )
 				{
-					$this->DB->update( 'skin_templates', $template, "template_group='{$template['template_group']}' AND template_name='{$template['template_name']}'" );
+					$this->DB->insert( 'skin_templates', array_merge( $template, array( 'template_set_id' => 0, 'template_master_key' => 'root', 'template_content' => '' ) ) );
+					
+					$extra_data['templates'][ $template['template_group'] ][ $template['template_name'] ]	= $template['template_name'];
+					$bits['root'][ $template['template_group'] ][]											= $template['template_name'];
+				}
+				
+				//-----------------------------------------
+				// Ignore unknown skin sets
+				//-----------------------------------------
+				
+				if ( !isset($bits[ $template['template_master_key'] ]) )
+				{
+					continue;
+				}
+				
+				if( isset($bits[ $template['template_master_key'] ][ $template['template_group'] ]) AND in_array( $template['template_name'], $bits[ $template['template_master_key'] ][ $template['template_group'] ] ) )
+				{
+					$template['template_updated'] = IPS_UNIX_TIME_NOW;
+
+					$this->DB->update( 'skin_templates', $template, "template_master_key='{$template['template_master_key']}' AND template_group='{$template['template_group']}' AND template_name='{$template['template_name']}'" );
 					$templatesUpdated++;
 				}
 				else
 				{	
 					$this->DB->insert( 'skin_templates', $template );
 					$templatesInserted++;
-					$template_id = $this->DB->getInsertId();
-					$extra_data['templates'][ $template['template_group'] ][]	= $template['template_name'];
+
+					$extra_data['templates'][ $template['template_group'] ][ $template['template_name'] ]	= $template['template_name'];
+					$bits[ $template['template_master_key'] ][ $template['template_group'] ][]				= $template['template_name'];
 				}
 			}
 		}
@@ -1330,27 +1311,39 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			$bits		= array();
 			
-			$this->DB->build( array( 'select' => '*', 'from' => 'skin_css', 'where' => 'css_set_id=0' ) );
+			$this->DB->build( array( 'select' => 'css_master_key, css_group', 'from' => 'skin_css' ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
 			{
-				$bits[ $r['css_group'] ] = $r;
+				$bits[ $r['css_master_key'] ][ $r['css_group'] ] = $r['css_group'];
 			}
 
 			foreach( $css as $entry )
 			{
-				if( is_array( $bits[ $entry['css_group'] ] ) AND in_array( $entry['css_group'], $bits[ $entry['css_group'] ] ) )
+				//-----------------------------------------
+				// Ignore unknown skin sets
+				//-----------------------------------------
+				
+				if ( !isset( $bits[ $entry['css_master_key'] ] ) )
 				{
-					$this->DB->update( 'skin_css', $entry, "css_group='{$entry['css_group']}'" );
+					continue;
+				}
+				
+				if( in_array( $entry['css_group'], $bits[ $entry['css_master_key'] ] ) )
+				{
+					$entry['css_updated']	= IPS_UNIX_TIME_NOW;
+
+					$this->DB->update( 'skin_css', $entry, "css_master_key='{$entry['css_master_key']}' AND css_group='{$entry['css_group']}'" );
 					$cssUpdated++;
 				}
 				else
 				{	
 					$this->DB->insert( 'skin_css', $entry );
 					$cssInserted++;
-					$css_id = $this->DB->getInsertId();
-					$extra_data['css'][] = $css_id;
+
+					$extra_data['css'][ $entry['css_group'] ]					= $entry['css_group'];
+					$bits[ $entry['css_master_key'] ][ $entry['css_group'] ]	= $entry['css_group'];
 				}
 			}
 		}
@@ -1383,7 +1376,7 @@ class admin_core_applications_hooks extends ipsCommand
 					$this->DB->insert( 'task_manager', $entry );
 					$tasksInserted++;
 					$task_id = $this->DB->getInsertId();
-					$extra_data['tasks'][] = $task_id;
+					$extra_data['tasks'][] = $entry['task_key'];
 				}
 			}
 		}
@@ -1396,21 +1389,23 @@ class admin_core_applications_hooks extends ipsCommand
 		{
 			foreach($database['create'] as $create )
 			{
-				$query	= "CREATE TABLE {$create['name']} (
+				$query	= "CREATE TABLE {$this->settings['sql_tbl_prefix']}{$create['name']} (
 							{$create['fields']}
 							)";
 				
 				if( $create['tabletype'] )
 				{
-					$query .= " TYPE=" . $create['tabletype'];
+					$query .= " ENGINE=" . $create['tabletype'];
+				}
+				else if( $this->settings['sql_driver'] == 'mysql' AND $this->settings['mysql_tbl_type'] )
+				{
+					$query .= " ENGINE=" . $this->settings['mysql_tbl_type'];
 				}
 				
 				//-----------------------------------------
 				// Fix prefix
 				//-----------------------------------------
-				
-				$query = preg_replace( "#^CREATE TABLE(?:\s+?)?(\S+?)#s", "CREATE TABLE " . $this->settings['sql_tbl_prefix']."\\1", $query );
-				
+
 				$this->DB->return_die = true;
 				$this->DB->query( $query );
 				$this->DB->return_die = false;
@@ -1496,9 +1491,9 @@ class admin_core_applications_hooks extends ipsCommand
 			}
 	//	}
 	
-		if( $custom['filename'] AND file_exists( IPS_HOOKS_PATH . 'install_' . $custom['filename'] ) )
+		if( $custom['filename'] AND is_file( IPS_HOOKS_PATH . 'install_' . $custom['filename'] ) )
 		{
-			require_once( IPS_HOOKS_PATH . 'install_' . $custom['filename'] );
+			require_once( IPS_HOOKS_PATH . 'install_' . $custom['filename'] );/*noLibHook*/
 			
 			$classname = str_replace( '.php', '', $custom['filename'] );
 			
@@ -1534,7 +1529,7 @@ class admin_core_applications_hooks extends ipsCommand
 
 		if ( $addMessage )
 		{
-			$this->registry->output->global_message = <<<EOF
+			$_tempMsg = <<<EOF
 		{$this->lang->words['h_followacts']}
 		<ul>
 			<li>{$this->lang->words['h_newhookin']}</li>
@@ -1561,30 +1556,23 @@ class admin_core_applications_hooks extends ipsCommand
 		</ul>
 EOF;
 
-			//-----------------------------------------
-			// Got some skin recaching to do...
-			//-----------------------------------------
+			$this->registry->output->setMessage( $_tempMsg, 1 );
+		}
+		
+		//-----------------------------------------
+		// Got some skin recaching to do...
+		//-----------------------------------------
+		
+		if( $allowSkinRecache === TRUE AND ( $templatesInserted OR $templatesUpdated OR $templateHooks OR $cssUpdated OR $cssInserted ) )
+		{
+			/* Rebuild cache */
+			$this->rebuildHooksCache();
 			
-			if( $allowSkinRecache === TRUE AND ( $templatesInserted OR $templatesUpdated OR $templateHooks ) )
-			{
-				//-----------------------------------------
-				// Recache hooks so templates know that there
-				// are comments to preserve
-				//-----------------------------------------
-				
-				$this->rebuildHooksCache();
-				
-				//-----------------------------------------
-				// Get the libs
-				//-----------------------------------------
-				
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-				$skinCaching	= new skinCaching( $this->registry );
-				
-				/* Flag all for recache */
-				$skinCaching->flagSetForRecache();
-			}
+			/* Flag skins for recache */
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+			$skinCaching = new skinCaching( $this->registry );
+			$skinCaching->flagSetForRecache();
 		}
 	}
 
@@ -1593,7 +1581,7 @@ EOF;
 	 *
 	 * @return   void
 	 */
-	private function _exportHook()
+	protected function _exportHook()
 	{
 		/* Get the hook */
 		$id	= intval($this->request['id']);
@@ -1603,7 +1591,7 @@ EOF;
 			$this->registry->output->showError( $this->lang->words['h_noexport'], 1112 );
 		}
 		
-		$hookData	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
+		$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
 		
 		if( !$hookData['hook_id'] )
 		{
@@ -1611,7 +1599,7 @@ EOF;
 		}
 		
 		/* Set defaults */
-		$hookData['hook_extra_data']	= unserialize( $hookData['hook_extra_data'] );
+		$hookData['hook_extra_data'] = unserialize( $hookData['hook_extra_data'] );
 
 		/* Output */
 		$this->registry->output->html .= $this->html->hooksExport( $hookData );
@@ -1621,9 +1609,9 @@ EOF;
 	 * Actually export the damn hook already
 	 * Sorry, it has been a long day...
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _doExportHook()
+	protected function _doExportHook()
 	{
 		//-----------------------------------------
 		// Get hook
@@ -1649,8 +1637,8 @@ EOF;
 		// Get hook files
 		//-----------------------------------------
 		
-		$files		= array();
-		$index		= 1;
+		$files = array();
+		$index = 1;
 		
 		$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id=' . $id ) );
 		$this->DB->execute();
@@ -1665,7 +1653,7 @@ EOF;
 		// Get XML class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -1711,7 +1699,7 @@ EOF;
 				$content[ $k ] = $v;
 			}
 			
-			$source	= file_exists( IPS_HOOKS_PATH . $r['hook_file_stored'] ) ? file_get_contents( IPS_HOOKS_PATH . $r['hook_file_stored'] ) : '';
+			$source	= is_file( IPS_HOOKS_PATH . $r['hook_file_stored'] ) ? file_get_contents( IPS_HOOKS_PATH . $r['hook_file_stored'] ) : '';
 			
 			if( $r['hook_type'] == 'commandHooks' || $r['hook_type'] == 'libraryHooks' )
 			{
@@ -1733,7 +1721,7 @@ EOF;
 			$xml->addElement( 'hookextras_custom', 'hookexport' );
 		
 			$content['filename']	= $extra_data['custom'];
-			$content['source']		= file_exists( IPS_HOOKS_PATH . 'install_' . $extra_data['custom'] ) ? file_get_contents( IPS_HOOKS_PATH . 'install_' . $extra_data['custom'] ) : '';
+			$content['source']		= is_file( IPS_HOOKS_PATH . 'install_' . $extra_data['custom'] ) ? file_get_contents( IPS_HOOKS_PATH . 'install_' . $extra_data['custom'] ) : '';
 			
 			$xml->addElementAsRecord( 'hookextras_custom', 'file', $content );
 		}
@@ -1754,37 +1742,59 @@ EOF;
 		if( is_array($extra_data['settingGroups']) AND count($extra_data['settingGroups']) )
 		{
 			$_groups	= $extra_data['settingGroups'];
+			$_groupIds	= array();
 			
-			$this->DB->build( array( 'select' => 'conf_id', 'from' => 'core_sys_conf_settings', 'where' => 'conf_group IN(' . implode( ',', $_groups ) . ')' ) );
+			$this->DB->build( array( 'select' => 'conf_title_id', 'from' => 'core_sys_settings_titles', 'where' => "conf_title_keyword IN('" . implode( "','", $_groups ) . "')" ) );
 			$this->DB->execute();
 			
-			while( $setting = $this->DB->fetch() )
+			while( $rr = $this->DB->fetch() )
 			{
-				$_settings[] = $setting['conf_id'];
+				$_groupIds[] = $rr['conf_title_id'];
+			}
+			
+			if( count($_groupIds) )
+			{
+				$this->DB->build( array( 'select' => 'conf_key', 'from' => 'core_sys_conf_settings', 'where' => 'conf_group IN(' . implode( ',', $_groupIds ) . ')' ) );
+				$this->DB->execute();
+				
+				while( $setting = $this->DB->fetch() )
+				{
+					$_settings[] = $setting['conf_key'];
+				}
 			}
 		}
 		
 		# Store group ids and setting ids for indvidual settings
 		if( is_array($extra_data['settings']) AND count($extra_data['settings']) )
 		{
-			foreach( $extra_data['settings'] as $settingId )
+			foreach( $extra_data['settings'] as $_aSetting )
 			{
-				$_settings[] = $settingId;
+				$_settings[] = $_aSetting;
 			}
 			
-			$this->DB->build( array( 'select' => 'conf_group', 'from' => 'core_sys_conf_settings', 'where' => 'conf_id IN(' . implode( ',', $extra_data['settings'] ) . ')' ) );
+			$this->DB->build( array( 'select'	=> 't.conf_title_keyword', 
+									 'from'		=> array( 'core_sys_settings_titles' => 't' ), 
+									 'where'	=> "c.conf_key IN('" . implode( "','", $extra_data['settings'] ) . "')",
+									 'add_join'	=> array(
+											 			array(
+											 				'from'	=> array( 'core_sys_conf_settings' => 'c' ),
+											 				'where'	=> 'c.conf_group=t.conf_title_id',
+											 				'type'	=> 'left',
+											 				)
+									 					)
+							)		);
 			$this->DB->execute();
 			
 			while( $group = $this->DB->fetch() )
 			{
-				$_groups[] = $group['conf_group'];
+				$_groups[] = $group['conf_title_keyword'];
 			}
 		}
 		
 		if( count($_groups) )
 		{
 			# Now get the group data for the XML file
-			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_settings_titles', 'where' => 'conf_title_id IN(' . implode( ',', $_groups ) . ')' ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_settings_titles', 'where' => "conf_title_keyword IN('" . implode( "','", $_groups ) . "')" ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -1810,7 +1820,7 @@ EOF;
 		if( count($_settings) )
 		{
 			# Now get the group data for the XML file
-			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => 'conf_id IN(' . implode( ',', $_settings ) . ')' ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_key IN('" . implode( "','", $_settings ) . "')" ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -1848,7 +1858,7 @@ EOF;
 					
 					foreach( $r as $k => $v )
 					{
-						if( in_array( $k, array( 'word_id', 'lang_id', 'word_default_version', 'word_custom_version' ) ) )
+						if( !in_array( $k, array( 'word_app', 'word_pack', 'word_key', 'word_default' ) ) )
 						{
 							continue;
 						}
@@ -1894,7 +1904,7 @@ EOF;
 		
 		if( is_array($extra_data['help']) AND count($extra_data['help']) )
 		{
-			$this->DB->build( array( 'select' => '*', 'from' => 'faq', 'where' => "id IN(" . implode( ",", $extra_data['help'] ) . ")" ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'faq', 'where' => "title IN('" . implode( "','", $extra_data['help'] ) . "')" ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -1909,21 +1919,21 @@ EOF;
 		// Skin templates
 		//-----------------------------------------
 
+		$remapData	= $this->registry->output->buildRemapData( true );
+
 		$xml->addElement( 'hookextras_templates', 'hookexport' );
 				
 		if( is_array($extra_data['templates']) AND count($extra_data['templates']) )
 		{
-			$templateSetIds = $this->registry->output->buildRemapData( true );
-
 			foreach( $extra_data['templates'] as $file => $templates )
 			{
-				$this->DB->build( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "template_set_id IN ('".implode( "','", $templateSetIds['export']) ."') AND template_group='{$file}' AND template_name IN('" . implode( "','", $templates ) . "')" ) );
+				$this->DB->build( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "template_set_id IN ('" . implode( "','", $remapData['export'] ) . "') AND template_master_key != '' AND template_group='{$file}' AND template_name IN('" . implode( "','", $templates ) . "')" ) );
 				$this->DB->execute();
 				
 				while( $r = $this->DB->fetch() )
 				{
 					unset($r['template_id']);
-					$r['template_set_type'] = $templateSetIds['templates'][$r['template_set_id']];
+					unset($r['template_set_id']);
 	
 					$xml->addElementAsRecord( 'hookextras_templates', 'templates', $r );
 				}
@@ -1938,7 +1948,7 @@ EOF;
 				
 		if( is_array( $extra_data['css'] ) AND count ( $extra_data['css'] ) )
 		{
-			$this->DB->build( array( 'select' => '*', 'from' => 'skin_css', 'where' => "css_id IN(" . implode( ",", $extra_data['css'] ) . ")" ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'skin_css', 'where' => "css_set_id IN ('" . implode( "','", $remapData['export'] ) . "') AND css_master_key != '' AND css_group IN('" . implode( "','", $extra_data['css'] ) . "')" ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -1958,7 +1968,7 @@ EOF;
 				
 		if( is_array($extra_data['tasks']) AND count($extra_data['tasks']) )
 		{
-			$this->DB->build( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_id IN(" . implode( ",", $extra_data['tasks'] ) . ")" ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_key IN('" . implode( "','", $extra_data['tasks'] ) . "')" ) );
 			$this->DB->execute();
 			
 			while( $r = $this->DB->fetch() )
@@ -2018,7 +2028,7 @@ EOF;
 		// Print to browser
 		//-----------------------------------------
 
-		$this->registry->output->showDownload( $xml->fetchDocument(), 'hook.xml', '', 0 );
+		$this->registry->output->showDownload( $xml->fetchDocument(), $hookData['hook_key'] . '.xml', '', 0 );
 	}
 	
 	/**
@@ -2027,7 +2037,7 @@ EOF;
 	 * @param	string			Hook source code
 	 * @return	string			"Cleaned" source code
 	 */
-	private function _cleanSource( $source )
+	protected function _cleanSource( $source )
 	{
 		$source = preg_replace( "/class\s+(\S+)\s+extends\s+(\S+)/i", "class \\1 extends (~extends~)", $source );
 		
@@ -2037,12 +2047,13 @@ EOF;
 	/**
 	 * Fix hook positions
 	 *
-	 * @return   void
+	 * @return   @e void
 	 */
-	private function _fixPositions()
+	protected function _fixPositions()
 	{
-		$new_order		= 0;
-		$usedActions	= array();
+		/* Init vars */
+		$new_order   = 0;
+		$usedActions = array();
 
 		$this->DB->build( array( 'select' => 'hook_id, hook_position', 'from' => 'core_hooks', 'where' => 'hook_enabled=1', 'order' => 'hook_position ASC' ) );
 		$qid = $this->DB->execute();
@@ -2052,7 +2063,7 @@ EOF;
 			$new_order++;
 			$this->DB->update( 'core_hooks', array ( 'hook_position' => $new_order ), "hook_id={$hook['hook_id']}" );
 			
-			$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => "(hook_type='commandHooks' OR hook_type='skinHooks' OR hook_type='libraryHooks') AND hook_hook_id=" . $hook['hook_id'] ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => "hook_type IN ('commandHooks', 'skinHooks', 'libraryHooks' ) AND hook_hook_id=" . $hook['hook_id'] ) );
 			$this->DB->execute();
 		
 			while( $file = $this->DB->fetch() )
@@ -2063,34 +2074,36 @@ EOF;
 				}
 				else
 				{
-					$source = file_exists( IPS_HOOKS_PATH . $file['hook_file_stored'] ) ? file_get_contents( IPS_HOOKS_PATH . $file['hook_file_stored'] ) : '';
+					$source = is_file( IPS_HOOKS_PATH . $file['hook_file_stored'] ) ? file_get_contents( IPS_HOOKS_PATH . $file['hook_file_stored'] ) : '';
 					
 					if( $source )
 					{
 						 $source = $this->_cleanSource( $source );
 					}
 				}
-
+				
 				if( $source )
 				{
 					$hook_data	= unserialize( $file['hook_data'] );
 					$overload	= $hook_data['classToOverload'];
 					$newClass	= $overload;
-
-					if( isset( $usedActions[ $overload ] ) )
+					
+					$app = ( $file['hook_type'] == 'libraryHooks' ) ? trim($hook_data['libApplication']) : '~_NO_APP_~';
+					
+					if( isset( $usedActions[ $app ][ $overload ] ) )
 					{
-						$newClass = $usedActions[ $overload ];
+						$newClass = $usedActions[ $app ][ $overload ];
 					}
 					else if( $file['hook_type'] == 'skinHooks' )
 					{
 						$newClass .= "(~id~)";
 					}
-
+					
 					$source = str_replace( "(~extends~)", $newClass, $source );
-			
+					
 					file_put_contents( IPS_HOOKS_PATH . $file['hook_file_stored'], $source );
 					
-					$usedActions[ $hook_data['classToOverload'] ] = $file['hook_classname'];
+					$usedActions[ $app ][ $hook_data['classToOverload'] ] = $file['hook_classname'];
 				}
 			}
 		}
@@ -2103,72 +2116,79 @@ EOF;
 	 * @param	string		Long version number
 	 * @return	bool
 	 */
-	private function _updateAvailable( $url, $version )
+	public function _updateAvailable( $url, $version )
 	{
-		if( !$version )
+		if( empty($url) || $version === '' )
 		{
-			//return false;
+			return false;
 		}
 		
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . '/classFileManagement.php', 'classFileManagement' );
 		$checker = new $classToLoad();
-		$checker->use_sockets	= $this->settings['enable_sockets'];
 		
-		//-----------------------------------------
-		// This is a low timeout to prevent page from taking too long
-		//-----------------------------------------
+		/* Timeout to prevent page from taking too long */
+		$checker->timeout = 5;
 		
-		$checker->timeout		= 5;
+		/* Setup url and check */
+		$url  = str_replace( 'php&', 'php?', $url );
+		$url .= '&boardVersion=' . IPB_LONG_VERSION . '&version=' . $version;
 		
-		$return	= $checker->getFileContents( str_replace( 'php&', 'php?', $url . '&version=' . $version ) );
-
-		return $return == 1 ? true : false;
+		$return = $checker->getFileContents( $url );
+		
+		/* Return the content (if valid) or return 'no update' */
+		return ( strpos( $return, '0' ) === 0 || strpos( $return, '1' ) === 0 ) ? explode( '|', $return ) : array( 0 );
 	}
 	
 	/**
 	 * Hooks overview
 	 *
-	 * @return	void		[Outputs to screen]
-	 * @todo 	[Future] Explore showing details/version requirements in a DHTML popup rather than a new page
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _hooksOverview()
+	public function _hooksOverview()
 	{
 		/* INI */
 		$installedHooks		= array();
 		$uninstalledHooks	= array();
-		$min_order			= 999999;
-		$max_order			= 0;
-		$checkUpdates		= ( isset( $this->request['checkUpdates'] ) AND $this->request['checkUpdates'] ) ? true : false;
+		$hookwarnings		= 0;
+		$hookUpdates		= 0;
+		$checkUpdates		= !empty( $this->request['checkUpdates'] ) ? true : false;
 		
 		/* Get current hooks */
 		$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks', 'order' => 'hook_position ASC' ) );
-		$this->DB->execute();
+		$outer	= $this->DB->execute();
 		
-		while( $r = $this->DB->fetch() )
+		while( $r = $this->DB->fetch($outer) )
 		{
-			$r['_updated']		= $this->registry->getClass('class_localization')->formatTime( $r['hook_updated'] );
-			$r['_installed']	= $this->registry->getClass('class_localization')->formatTime( $r['hook_installed'] );
+			/* Format some dates */
+			$r['_updated']   = $this->registry->getClass('class_localization')->formatTime( $r['hook_updated'] );
+			$r['_installed'] = $this->registry->getClass('class_localization')->formatTime( $r['hook_installed'] );
 			
-			$r['hook_update_available']	= '';
-			
-			if( $r['hook_update_check'] && $checkUpdates === true )
+			/* Got updates? */
+			if ( $r['hook_update_check'] && $checkUpdates === true )
 			{
-				if( $this->_updateAvailable( $r['hook_update_check'], $r['hook_version_long'] ) )
+				$r['hook_update_available'] = $this->_updateAvailable( $r['hook_update_check'], $r['hook_version_long'] );
+				
+				if ( $r['hook_update_available'][0] )
 				{
-					$r['hook_update_available']	= "<span class='hookupdate'>Update Available</span>";
-					
-					if( $r['hook_website'] )
-					{
-						$r['hook_update_available']	= "<a href='{$r['hook_website']}' target='_blank'>" . $r['hook_update_available'] . '</a>';
-					}
+					$hookUpdates++;
 				}
 			}
+			else
+			{
+				$r['hook_update_available']	= array( 0 );
+			}
 			
-			$min_order			= $r['hook_position'] < $min_order ? $r['hook_position'] : $min_order;
-			$max_order			= $r['hook_position'] > $max_order ? $r['hook_position'] : $max_order;
-
+			/* Check requirements */
+			$r['_require_errors'] = $this->checkHookRequirements( $r );
+			
+			/* Store */
 			if( $r['hook_enabled'] )
 			{
+				if ( count($r['_require_errors']) )
+				{
+					$hookwarnings++;
+				}
+				
 				$installedHooks[ $r['hook_id'] ]	= $r;
 			}
 			else
@@ -2176,29 +2196,24 @@ EOF;
 				$uninstalledHooks[ $r['hook_id'] ]	= $r;
 			}
 		}
-
-		if( count($installedHooks) )
+		
+		/* Got updates to show? */
+		$message = NULL;
+		if ( $checkUpdates === true )
 		{
-			foreach( $installedHooks as $id => $r )
-			{
-				$upButton	= $r['hook_position'] > $min_order ? 1 : 0;
-				$downButton	= $r['hook_position'] < $max_order ? 1 : 0;
-				
-				$installedHooks[ $id ]['upButton']		= $upButton;
-				$installedHooks[ $id ]['downButton']	= $downButton;
-			}
+			$message = ( $hookUpdates == 1 ) ? $this->lang->words['updates_string_single'] : sprintf( $this->lang->words['updates_string_more'], $hookUpdates );
 		}
-
+		
 		/* Output */
-		$this->registry->output->html .= $this->html->hooksOverview( $installedHooks, $uninstalledHooks );
+		$this->registry->output->html .= $this->html->hooksOverview( $installedHooks, $uninstalledHooks, $hookwarnings, $message );
 	}
 	
 	/**
 	 * Disables all hook
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _disableAllHooks()
+	protected function _disableAllHooks()
 	{
 		/* INIT */
 		$activeHookIds = array();
@@ -2234,7 +2249,12 @@ EOF;
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview' );
 	}
 	
-	private function _reenableAllHooks()
+	/**
+	 * Re-enable all hook
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _reenableAllHooks()
 	{
 		/* INIT */
 		$activeHookIds = $this->cache->getCache( 'disabledHooksCache' );
@@ -2257,8 +2277,8 @@ EOF;
 		$this->rebuildHooksCache();
 		
 		/* Flag skins for recache */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		$skinCaching	= new skinCaching( $this->registry );
 		
 		/* Flag all for recache */
@@ -2272,27 +2292,45 @@ EOF;
 	/**
 	 * Disables a hook
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _disableHook()
+	protected function _disableHook()
 	{
 		/* INI */
 		$hook_id = intval( $this->request['id'] );
-
-		/* Do update */
-		$this->DB->update( 'core_hooks', array( 'hook_enabled' => 0 ), "hook_id={$hook_id}" );
 		
+		if( !$hook_id )
+		{
+			$this->registry->output->showError( $this->lang->words['h_noedit'], '1118.D' );
+		}
+		
+		$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $hook_id ) );
+		
+		if( !$hookData['hook_id'] )
+		{
+			$this->registry->output->showError( $this->lang->words['h_noedit'], '1119.D' );
+		}
+		
+		/* Do update */
+		$this->DB->update( 'core_hooks', array( 'hook_enabled' => 0 ), "hook_id={$hookData['hook_id']}" );
+		
+		/* Rebuild cache */
 		$this->rebuildHooksCache();
 		
-		/* Flag skins for recache */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		$skinCaching	= new skinCaching( $this->registry );
+		/* Rebuild global caches */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e ){}
 		
-		/* Flag all for recache */
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
 		$skinCaching->flagSetForRecache();
 		
-		/* Done */
+		/* Redirect */
 		$this->registry->output->global_message = $this->lang->words['hook_disabled'];
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview' );
 	}	
@@ -2300,27 +2338,56 @@ EOF;
 	/**
 	 * Enables a hook
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _enableHook()
+	protected function _enableHook()
 	{
 		/* INI */
-		$hook_id = intval( $this->request['id'] );
-
-		/* Do update */
-		$this->DB->update( 'core_hooks', array( 'hook_enabled' => 1 ), "hook_id={$hook_id}" );
+		$hook_id = intval($this->request['id']);
 		
+		if( !$hook_id )
+		{
+			$this->registry->output->showError( $this->lang->words['h_noedit'], '1118.E' );
+		}
+		
+		$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $hook_id ) );
+		
+		if( !$hookData['hook_id'] )
+		{
+			$this->registry->output->showError( $this->lang->words['h_noedit'], '1119.E' );
+		}
+		
+		/* Check for requirements */
+		if ( empty($this->request['skipRequirements']) )
+		{
+			$errors = $this->checkHookRequirements( $hookData );
+			
+			if ( count($errors) )
+			{
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=check_requirements&amp;fromInstall=1&amp;id='.$hook_id );
+			}
+		}
+		
+		/* Do update */
+		$this->DB->update( 'core_hooks', array( 'hook_enabled' => 1 ), "hook_id={$hookData['hook_id']}" );
+		
+		/* Rebuild cache */
 		$this->rebuildHooksCache();
 		
-		/* Flag skins for recache */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		$skinCaching	= new skinCaching( $this->registry );
+		/* Rebuild global caches */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e ){}
 		
-		/* Flag all for recache */
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
 		$skinCaching->flagSetForRecache();
 		
-		/* Done */
+		/* Redirect */
 		$this->registry->output->global_message = $this->lang->words['h_hasbeenenabled'];
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview' );
 	}
@@ -2328,16 +2395,16 @@ EOF;
 	/**
 	 * Uninstall a hook
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _uninstallHook()
+	protected function _uninstallHook()
 	{
 		/* INI */
 		$hook_id	= intval( $this->request['id'] );
-
+		
 		$hook		= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $hook_id ) );
 		$extra_data	= unserialize( $hook['hook_extra_data'] );
-
+		
 		if ( ! $hook['hook_id'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['h_hasbeenun'];
@@ -2362,16 +2429,16 @@ EOF;
 		
 		if( count($extra_data['settingGroups']) )
 		{
-			$this->DB->delete( 'core_sys_settings_titles', 'conf_title_id IN(' . implode( ',', $extra_data['settingGroups'] ) . ')' );
+			$this->DB->delete( 'core_sys_settings_titles', "conf_title_keyword IN('" . implode( "','", $extra_data['settingGroups'] ) . "')" );
 		}
 		
 		if( count($extra_data['settings']) )
 		{
-			$this->DB->delete( 'core_sys_conf_settings', 'conf_id IN(' . implode( ',', $extra_data['settings'] ) . ')' );
+			$this->DB->delete( 'core_sys_conf_settings', "conf_key IN('" . implode( "','", $extra_data['settings'] ) . "')" );
 		}
 		
 		$this->cache->rebuildCache( 'settings', 'global' );
-
+		
 		//-----------------------------------------
 		// Language strings/files
 		//-----------------------------------------
@@ -2409,7 +2476,13 @@ EOF;
 		
 		if( count($extra_data['modules']) )
 		{
-			$this->DB->delete( 'core_sys_module', "sys_module_id IN('" . implode( "','", $extra_data['modules'] ) . "')" );
+			foreach( $extra_data['modules'] as $module )
+			{
+				list( $_side, $_app, $_module ) = explode( '-', $module );
+				$_is_admin = ( $_side == 'admin' ) ? 1 : 0;
+				
+				$this->DB->delete( 'core_sys_module', "sys_module_application='{$_app}' AND sys_module_key='{$_module}' AND sys_module_admin={$_is_admin}" );
+			}
 			
 			$this->cache->rebuildCache( 'module_cache', 'global' );
 			$this->cache->rebuildCache( 'app_menu_cache', 'global' );
@@ -2421,39 +2494,39 @@ EOF;
 		
 		if( count($extra_data['help']) )
 		{
-			$this->DB->delete( 'faq', 'id IN(' . implode( ',', $extra_data['help'] ) . ')' );
+			$this->DB->delete( 'faq', "title IN('" . implode( "','", $extra_data['help'] ) . "')" );
 		}
-
+		
 		//-----------------------------------------
 		// Skin templates
 		//-----------------------------------------
 		
 		if( count($extra_data['templates']) )
 		{
-			foreach( $extra_data['templates'] as $file => $bit )
+			foreach( $extra_data['templates'] as $group => $bits )
 			{
-				$this->DB->delete( 'skin_templates', "template_group='{$file}' AND template_name IN('" . implode( "','", $bit ) . "')" );
+				$this->DB->delete( 'skin_templates', "template_group='{$group}' AND template_name IN('" . implode( "','", $bits ) . "')" );
 			}
-			
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-			$skinCaching	= new skinCaching( $this->registry );
+
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+			$skinCaching = new skinCaching( $this->registry );
 			$skinCaching->rebuildPHPTemplates( 0 );
 		}
 		
 		//-----------------------------------------
 		// CSS
 		//-----------------------------------------
-
+		
 		if( count( $extra_data['css'] ) )
 		{
-			$this->DB->delete( 'skin_css', 'css_id IN(' . implode( ',', $extra_data['css'] ) . ')' );
+			$this->DB->delete( 'skin_css', "css_group IN('" . implode( "','", $extra_data['css'] ) . "')" );
 			
 			if( ! $skinCaching )
 			{
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-				$skinCaching	= new skinCaching( $this->registry );
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+				$skinCaching = new skinCaching( $this->registry );
 			}
 			
 			$skinCaching->rebuildCSSCache( 0 );
@@ -2465,7 +2538,7 @@ EOF;
 		
 		if( count($extra_data['tasks']) )
 		{
-			$this->DB->delete( 'task_manager', 'task_id IN(' . implode( ',', $extra_data['tasks'] ) . ')' );
+			$this->DB->delete( 'task_manager', "task_key IN('" . implode( "','", $extra_data['tasks'] ) . "')" );
 		}
 		
 		//-----------------------------------------
@@ -2481,7 +2554,7 @@ EOF;
 				$this->DB->return_die	= false;
 			}
 		}
-
+		
 		if( is_array($extra_data['database']['alter']) AND count($extra_data['database']['alter']) )
 		{
 			foreach( $extra_data['database']['alter'] as $alter_query )
@@ -2506,7 +2579,7 @@ EOF;
 				$this->DB->return_die	= false;
 			}
 		}
-
+		
 		if( is_array($extra_data['database']['update']) AND count($extra_data['database']['update']) )
 		{
 			foreach( $extra_data['database']['update'] as $update_query )
@@ -2516,7 +2589,7 @@ EOF;
 				$this->DB->return_die	= false;
 			}
 		}
-
+		
 		if( is_array($extra_data['database']['insert']) AND count($extra_data['database']['insert']) )
 		{
 			foreach( $extra_data['database']['insert'] as $insert_query )
@@ -2529,16 +2602,16 @@ EOF;
 				}
 			}
 		}
-
+		
 		//-----------------------------------------
 		// Custom install/uninstall script?
 		//-----------------------------------------
 		
 		if( $extra_data['display']['custom'] )
 		{
-			if( file_exists( IPS_HOOKS_PATH . 'install_' . $extra_data['display']['custom'] ) )
+			if( is_file( IPS_HOOKS_PATH . 'install_' . $extra_data['display']['custom'] ) )
 			{
-				require_once( IPS_HOOKS_PATH . 'install_' . $extra_data['display']['custom'] );
+				require_once( IPS_HOOKS_PATH . 'install_' . $extra_data['display']['custom'] );/*noLibHook*/
 				
 				$classname = str_replace( '.php', '', $extra_data['display']['custom'] );
 				
@@ -2551,12 +2624,14 @@ EOF;
 						$uninstall->uninstall();
 					}
 				}
+				
+				@unlink( IPS_HOOKS_PATH . 'install_' . $extra_data['display']['custom'] );
 			}
 		}
-
+		
 		/* Delete main hook entry */
 		$this->DB->delete( 'core_hooks', "hook_id={$hook_id}" );
-
+		
 		$this->rebuildHooksCache();
 		
 		/* Done */
@@ -2569,10 +2644,30 @@ EOF;
 	 * This dynamic form allows users to associate multiple files with a single hook.
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _hookForm( $type='add' )
+	protected function _hookForm( $type='add' )
 	{
+		/* Init vars */
+		$form			= array();
+		$files			= array();
+		$hookData		= array();
+		$requirements	= array();
+		$entryPoints	= array( 'foreach' => array( array( 'outer.pre', $this->lang->words['h_outerpre'] ),
+													 array( 'inner.pre', $this->lang->words['h_innerpre'] ),
+													 array( 'inner.post', $this->lang->words['h_innerpost'] ),
+													 array( 'outer.post', $this->lang->words['h_outerpost'] )
+													),
+								 'if' => array( array( 'pre.startif', $this->lang->words['h_prestartif'] ),
+												array( 'post.startif', $this->lang->words['h_poststartif'] ),
+												array( 'pre.else', $this->lang->words['h_preelse']),
+												array( 'post.else', $this->lang->words['h_postelse'] ),
+												array( 'pre.endif', $this->lang->words['h_preendif'] ),
+												array( 'post.endif', $this->lang->words['h_postendif'] )
+												)
+								);
+		
+		/* Edit time? */
 		if( $type == 'edit' )
 		{
 			$id	= intval($this->request['id']);
@@ -2582,36 +2677,34 @@ EOF;
 				$this->registry->output->showError( $this->lang->words['h_noedit'], 1116 );
 			}
 			
-			$hookData	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
+			$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
 			
 			if( !$hookData['hook_id'] )
 			{
 				$this->registry->output->showError( $this->lang->words['h_noedit'], 1117 );
 			}
 			
+			/* Sort out extra stuff and requirements */
 			$hookData['hook_extra_data']	= unserialize( $hookData['hook_extra_data'] );
 			$hookData['hook_requirements']	= unserialize( $hookData['hook_requirements'] );
 			
-			$files		= array();
+			/* Old data? - @todo: we should remove that around 3.3(4?) */
+			if ( ! isset($hookData['hook_requirements']['required_applications']['core']) && isset($hookData['hook_requirements']['hook_ipb_version_min']) && ( $hookData['hook_requirements']['hook_ipb_version_min'] > 0 || $hookData['hook_requirements']['hook_ipb_version_max'] > 0 ) )
+			{
+				$requirements['core'] = array( 'min_version' => intval($hookData['hook_requirements']['hook_ipb_version_min']), 'max_version' => intval($hookData['hook_requirements']['hook_ipb_version_max']) );
+			}
+			
+			if ( is_array($hookData['hook_requirements']['required_applications']) && count($hookData['hook_requirements']['required_applications']) )
+			{
+				foreach( $hookData['hook_requirements']['required_applications'] as $appKey => $versionData )
+				{
+					$requirements[ $appKey ] = $versionData;
+				}
+			}
+			
+			/* Sort out hook files */
 			$index		= 1;
 			$skinGroups = $this->hooksFunctions->getSkinGroups();
-			$entryPoint	= array();
-			
-			$entryPoint['foreach']	= array(
-											array( 'outer.pre', $this->lang->words['h_outerpre'] ),
-											array( 'inner.pre', $this->lang->words['h_innerpre'] ),
-											array( 'inner.post', $this->lang->words['h_innerpost'] ),
-											array( 'outer.post', $this->lang->words['h_outerpost'] ),
-											);
-
-			$entryPoint['if']		= array(
-											array( 'pre.startif', $this->lang->words['h_prestartif'] ),
-											array( 'post.startif', $this->lang->words['h_poststartif'] ),
-											array( 'pre.else', $this->lang->words['h_preelse']),
-											array( 'post.else', $this->lang->words['h_postelse'] ),
-											array( 'pre.endif', $this->lang->words['h_preendif'] ),
-											array( 'post.endif', $this->lang->words['h_postendif'] ),
-											);
 			
 			$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id=' . $id ) );
 			$outer = $this->DB->execute();
@@ -2628,11 +2721,11 @@ EOF;
 					$templates	= $this->hooksFunctions->getSkinMethods( $r['hook_data']['skinGroup'] );
 					$hookIds	= $this->hooksFunctions->getHookIds( $r['hook_data']['skinFunction'], $r['hook_data']['type'] );
 					
-					$r['_skinDropdown']			= $this->registry->output->formDropdown( "skinGroup[{$index}]", $skinGroups, $r['hook_data']['skinGroup'], "skinGroup[{$index}]", "onchange='getTemplatesForAdd({$index});'" );
-					$r['_templateDropdown']		= $this->registry->output->formDropdown( "skinFunction[{$index}]", $templates, $r['hook_data']['skinFunction'], "skinFunction[{$index}]", "onchange='getTypeOfHook({$index});'" );
-					$r['_hookTypeDropdown']		= $this->registry->output->formDropdown( "type[{$index}]", array( array( 'foreach', 'foreach loop' ), array( 'if', 'if statement' ) ), $r['hook_data']['type'], "type[{$index}]", "onchange='getHookIds({$index});'" );
-					$r['_hookIdsDropdown']		= $this->registry->output->formDropdown( "id[{$index}]", $hookIds, $r['hook_data']['id'], "id[{$index}]", "onchange='getHookEntryPoints({$index});'" );
-					$r['_hookEPDropdown']		= $this->registry->output->formDropdown( "position[{$index}]", $r['hook_data']['type'] == 'foreach' ? $entryPoint['foreach'] : $entryPoint['if'], $r['hook_data']['position'] );
+					$r['_skinDropdown']		= $this->registry->output->formDropdown( "skinGroup[{$index}]", $skinGroups, $r['hook_data']['skinGroup'], "skinGroup[{$index}]", "onchange='getTemplatesForAdd({$index});'" );
+					$r['_templateDropdown']	= $this->registry->output->formDropdown( "skinFunction[{$index}]", $templates, $r['hook_data']['skinFunction'], "skinFunction[{$index}]", "onchange='getTypeOfHook({$index});'" );
+					$r['_hookTypeDropdown']	= $this->registry->output->formDropdown( "type[{$index}]", array( array( 0, $this->lang->words['a_selectone'] ), array( 'foreach', $this->lang->words['hook_foreach_loop'] ), array( 'if', $this->lang->words['hook_if_statement'] ) ), $r['hook_data']['type'], "type[{$index}]", "onchange='getHookIds({$index});'" );
+					$r['_hookIdsDropdown']	= $this->registry->output->formDropdown( "id[{$index}]", $hookIds, $r['hook_data']['id'], "id[{$index}]", "onchange='getHookEntryPoints({$index});'" );
+					$r['_hookEPDropdown']	= $this->registry->output->formDropdown( "position[{$index}]", $r['hook_data']['type'] == 'foreach' ? $entryPoints['foreach'] : $entryPoints['if'], $r['hook_data']['position'] );
 				}
 				
 				if( $r['hook_type'] == 'dataHooks' )
@@ -2640,32 +2733,64 @@ EOF;
 					$r['_dataLocationDropdown']	= $this->registry->output->formDropdown( "dataLocation[{$index}]", $_dataHooks, $r['hook_data']['dataLocation'] );
 				}
 				
-				$files[ $index ]	= $r;
+				$files[ $index ] = $r;
 				$index++;
 			}
 			
-			$action		= 'do_edit_hook';
+			$action = 'do_edit_hook';
 		}
 		else
 		{
-			$hookData	= array();
-			
-			foreach( array( 'hook_enabled', 'hook_name', 'hook_desc', 'hook_author', 'hook_email', 'hook_website', 'hook_update_check', 'hook_requirements', 'hook_version_human', 'hook_version_long', 'hook_installed', 	'hook_updated', 'hook_position', 'hook_extra_data' ) as $_hook )
+			/* Format data for adding an hook.. */
+			/*foreach( array( 'hook_name', 'hook_desc', 'hook_key', 'hook_version_human', 'hook_version_long', 'hook_author', 'hook_email', 'hook_website', 'hook_update_check' ) as $_hook )
 			{
 				$hookData[ $_hook ] = $this->request[ $_hook ];
 			}
 			
-			foreach( array( 'hook_ipb_version_max', 'hook_ipb_version_min', 'hook_php_version_min', 'hook_php_version_max' ) as $_version )
+			foreach( array( 'hook_php_version_min', 'hook_php_version_max' ) as $_version )
 			{
 				$hookData['hook_requirements'][ $_version ] = $this->request[ $_version ];
-			}
-			
-			$files		= array();
-			$action		= 'do_create_hook';
-		}
+			}*/
 
+			$action = 'do_create_hook';
+		}
+		
+		/* Info */
+		foreach( array( 'hook_name', 'hook_desc', 'hook_key', 'hook_version_human', 'hook_version_long', 'hook_author', 'hook_email', 'hook_website', 'hook_update_check' ) as $_hook_key )
+		{
+			$form[ $_hook_key ] = $this->registry->output->formSimpleInput( $_hook_key , isset($_POST[ $_hook_key ]) ? $_POST[ $_hook_key ] : $hookData[ $_hook_key ], 60 );
+		}
+		
+		/* Requirements */
+		foreach( array( 'hook_php_version_min', 'hook_php_version_max' ) as $_version_key )
+		{
+			$form[ $_version_key ] = $this->registry->output->formSimpleInput( $_version_key , isset($_POST[ $_version_key ]) ? $_POST[ $_version_key ] : $hookData['hook_requirements'][ $_version_key ], 20 );
+		}
+		
+		/* Setup the global caches DD */
+		$_caches = array();
+		
+		$this->DB->build( array( 'select' => 'cs_key',
+								 'from'   => 'cache_store',
+								 'order'  => 'cs_key ASC'
+						 )		);
+		$this->DB->execute();
+		
+		while( $gc = $this->DB->fetch() )
+		{
+			$_caches[] = array( $gc['cs_key'], $gc['cs_key'] );
+		}
+		
+		sort( $_caches );
+		
+		$form['hook_global_caches'] = $this->registry->output->formMultiDropdown( 'hook_global_caches[]', $_caches, isset($_POST['hook_global_caches']) ? $_POST['hook_global_caches'] : explode(',',$hookData['hook_global_caches']), 15 );
+		
+		/* Get some data for the javascript */
+		$form['jsDataTypes']  = IPSText::br2nl( $this->registry->output->formDropdown( "type[#{index}]", array( array( 0, $this->lang->words['a_selectone'] ), array( 'foreach', $this->lang->words['hook_foreach_loop'] ), array( 'if', $this->lang->words['hook_if_statement'] ) ), '', "type[#{index}]", "onchange='getHookIds(#{index});'" ) );
+		$form['jsDataPoints'] = IPSText::br2nl( $this->registry->output->formDropdown( "position[#{index}]", $r['hook_data']['type'] == 'foreach' ? $entryPoints['foreach'] : $entryPoints['if'] ) );
+		
 		/* Output */
-		$this->registry->output->html .= $this->html->hookForm( $action, $hookData, $files );
+		$this->registry->output->html .= $this->html->hookForm( $form, $action, $hookData, $files, $requirements );
 	}
 
 	/**
@@ -2673,10 +2798,34 @@ EOF;
 	 * Save the new (or updated) hook record
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _hookSave( $type='add' )
+	protected function _hookSave( $type='add' )
 	{
+		/* Init vars */
+		$hookData   = array();
+		$newFiles	= array();
+		$requireApp	= array();
+		$_hookFiles	= array();
+		
+		/* Get data if we are editing */
+		if( $type == 'edit' )
+		{
+			$id	= intval($this->request['hook_id']);
+			
+			if( !$id )
+			{
+				$this->registry->output->showError( $this->lang->words['h_noedit'], 1118 );
+			}
+			
+			$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
+			
+			if( !$hookData['hook_id'] )
+			{
+				$this->registry->output->showError( $this->lang->words['h_noedit'], 1119 );
+			}
+		}
+		
 		/* Error Checking */
 		if( ! $this->request['hook_name'] )
 		{
@@ -2687,11 +2836,8 @@ EOF;
 		{
 			$errors[] = $this->lang->words['hook_form_no_key'];
 		}
-
-		$newFiles	= array();
-
-		$_hookFiles	= array();
 		
+		/* Not IN_DEV? */
 		if( !IN_DEV )
 		{
 			$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id=' . intval($this->request['hook_id']) ) );
@@ -2699,24 +2845,43 @@ EOF;
 			
 			while( $_r = $this->DB->fetch() )
 			{
-				$_hookFiles[ $_r['hook_classname'] ]	= $_r['hook_file_stored'];
+				$_hookFiles[ $_r['hook_classname'] ] = $_r['hook_file_stored'];
 			}
 		}
 		
+		/* Check for requirements */
+		if( is_array( $this->request['requireApp'] ) AND count( $this->request['requireApp'] ) )
+		{
+			foreach( $this->request['requireApp'] as $_index => $require )
+			{
+				if( $require )
+				{
+					$minVersion = intval($this->request['minVersion'][ $_index ]);/*noLibHook*/
+					$maxVersion = intval($this->request['maxVersion'][ $_index ]);
+					
+					// Let's not require a version, we can simply force an app to be installed regardless this way
+					//if ( $minVersion > 0 || $maxVersion > 0 )
+					//{
+						$requireApp[ $require ] = array( 'app_name'		=> ipsRegistry::$applications[ $require ]['app_title'],
+														 'min_version'	=> $minVersion,
+														 'max_version'	=> $maxVersion
+														 );/*noLibHook*/
+					//}
+				}
+			}
+		}
+		
+		/* Check for files */
 		if( is_array( $this->request['file'] ) AND count( $this->request['file'] ) )
 		{
 			foreach( $this->request['file'] as $index => $file )
 			{
 				if( $file )
 				{
-					$newFiles[ $index ]	= array(
-												'hook_file_real'		=> $file,
-												//'hook_file_stored'		=> $file,	
-												'hook_type'				=> $this->request['hook_type'][ $index ],
-												'hook_classname'		=> $this->request['hook_classname'][ $index ],
-												'hook_data'				=> serialize(
-																					array(
-																						'dataLocation'		=> trim( $this->request['dataLocation'][ $index ] ),
+					$newFiles[ $index ]	= array('hook_file_real'	=> $file,
+												'hook_type'			=> $this->request['hook_type'][ $index ],
+												'hook_classname'	=> $this->request['hook_classname'][ $index ],
+												'hook_data'			=> serialize( array('dataLocation'		=> trim( $this->request['dataLocation'][ $index ] ),
 																						'libApplication'	=> trim( $this->request['libApplication'][ $index ] ),
 																						'classToOverload'	=> trim($this->request['classToOverload'][ $index ]),
 																						'skinGroup'			=> $this->request['skinGroup'][ $index ],
@@ -2725,7 +2890,7 @@ EOF;
 																						'id'				=> $this->request['id'][ $index ],
 																						'position'			=> $this->request['position'][ $index ],
 																						)
-																					)
+																				 )
 												);
 
 					/**
@@ -2743,11 +2908,6 @@ EOF;
 				}
 			}
 		}
-
-		//if( !is_array( $newFiles ) OR !count( $newFiles ) )
-		//{
-		//	$errors[] = $this->lang->words['h_onefile'];
-		//}
 		
 		if( is_array( $errors ) )
 		{
@@ -2755,52 +2915,31 @@ EOF;
 			$this->_hookForm();
 			return;
 		}
-
-		/* Get data if we are editing */
-		if( $type == 'edit' )
-		{
-			$id	= intval($this->request['hook_id']);
-			
-			if( !$id )
-			{
-				$this->registry->output->showError( $this->lang->words['h_noedit'], 1118 );
-			}
-			
-			$hookData	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
-			
-			if( !$hookData['hook_id'] )
-			{
-				$this->registry->output->showError( $this->lang->words['h_noedit'], 1119 );
-			}
-		}
 		
 		/* Get new position */
-		$position	= $this->DB->buildAndFetch( array( 'select' => 'MAX(hook_position) as newPos', 'from' => 'core_hooks' ) );
+		$position = $this->DB->buildAndFetch( array( 'select' => 'MAX(hook_position) as newPos', 'from' => 'core_hooks' ) );
 
-		$mainHookRecord		= array(
-									'hook_name'				=> trim($this->request['hook_name']),
-									'hook_key'				=> substr( trim($this->request['hook_key']), 0, 32 ),
-									'hook_desc'				=> trim($this->request['hook_desc']),
-									'hook_version_human'	=> trim($this->request['hook_version_human']),
-									'hook_version_long'		=> trim($this->request['hook_version_long']),
-									'hook_author'			=> trim($this->request['hook_author']),
-									'hook_email'			=> trim($this->request['hook_email']),
-									'hook_website'			=> trim($this->request['hook_website']),
-									'hook_update_check'		=> trim($this->request['hook_update_check']),
-									'hook_enabled'			=> $type == 'add' ? 1 : $hookData['hook_enabled'],
-									'hook_installed'		=> $type == 'add' ? time() : $hookData['hook_installed'],
-									'hook_updated'			=> $type == 'add' ? 0 : time(),
-									'hook_position'			=> $type == 'add' ? $position['newPos'] + 1 : $hookData['hook_position'],
-									'hook_requirements'		=> serialize(
-																		array(
-																			'hook_ipb_version_min'	=> intval($this->request['hook_ipb_version_min']),
-																			'hook_ipb_version_max'	=> intval($this->request['hook_ipb_version_max']),
-																			'hook_php_version_min'	=> $this->request['hook_php_version_min'],
-																			'hook_php_version_max'	=> $this->request['hook_php_version_max'],
+		$mainHookRecord	= array('hook_name'				=> trim($this->request['hook_name']),
+								'hook_key'				=> substr( trim($this->request['hook_key']), 0, 32 ),
+								'hook_global_caches'	=> ( is_array($this->request['hook_global_caches']) && count($this->request['hook_global_caches']) ) ? implode(',', $this->request['hook_global_caches']) : '',
+								'hook_desc'				=> trim($this->request['hook_desc']),
+								'hook_version_human'	=> trim($this->request['hook_version_human']),
+								'hook_version_long'		=> trim($this->request['hook_version_long']),
+								'hook_author'			=> trim($this->request['hook_author']),
+								'hook_email'			=> trim($this->request['hook_email']),
+								'hook_website'			=> trim($this->request['hook_website']),
+								'hook_update_check'		=> trim($this->request['hook_update_check']),
+								'hook_enabled'			=> $type == 'add' ? 1 : $hookData['hook_enabled'],
+								'hook_installed'		=> $type == 'add' ? IPS_UNIX_TIME_NOW : $hookData['hook_installed'],
+								'hook_updated'			=> $type == 'add' ? 0 : IPS_UNIX_TIME_NOW,
+								'hook_position'			=> $type == 'add' ? $position['newPos'] + 1 : $hookData['hook_position'],
+								'hook_requirements'		=> serialize( array('required_applications'	=> $requireApp,
+																			'hook_php_version_min'	=> trim($this->request['hook_php_version_min']),
+																			'hook_php_version_max'	=> trim($this->request['hook_php_version_max'])
 																			)
-																		)
-									);
-
+																	 )
+								);
+		
 		if( $type == 'edit' )
 		{
 			$this->DB->update( 'core_hooks', $mainHookRecord, 'hook_id=' . $hookData['hook_id'] );
@@ -2811,34 +2950,43 @@ EOF;
 		{
 			$this->DB->insert( 'core_hooks', $mainHookRecord );
 			
-			$hookData['hook_id']	= $this->DB->getInsertId();
+			$hookData['hook_id'] = $this->DB->getInsertId();
 		}
 		
 		foreach( $newFiles as $index => $toInsert )
 		{
-			$toInsert['hook_hook_id']	= $hookData['hook_id'];
+			$toInsert['hook_hook_id'] = $hookData['hook_id'];
 			
 			$this->DB->insert( 'core_hooks_files', $toInsert );
 		}
 		
+		/* Rebuild cache */
 		$this->rebuildHooksCache();
 		
+		/* Rebuild global caches */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e ){}
+		
 		/* Flag skins for recache */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		$skinCaching	= new skinCaching( $this->registry );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
 		$skinCaching->flagSetForRecache();
 		
-		$this->registry->output->global_message = $this->lang->words['h_saved'];
-		$this->_hooksOverview();
+		/* Redirect */
+		$this->registry->output->setMessage( $this->lang->words['h_saved'] );
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=hooks_overview' );
 	}
 	
 	/**
 	 * View details about a hook
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _viewDetails()
+	protected function _viewDetails()
 	{
 		$id	= intval($this->request['id']);
 		
@@ -2847,58 +2995,41 @@ EOF;
 			$this->registry->output->showError( $this->lang->words['h_nodetails'], 11110 );
 		}
 		
-		$hookData	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
+		$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
 		
 		if( !$hookData['hook_id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['h_nodetails'], 11111 );
 		}
 		
-		$hookData['hook_extra_data']	= unserialize( $hookData['hook_extra_data'] );
-		$hookData['hook_requirements']	= unserialize( $hookData['hook_requirements'] );
+		/* Extra data */
+		$hookData['_updated']		 = $this->registry->getClass('class_localization')->formatTime( $hookData['hook_updated'] );
+		$hookData['hook_extra_data'] = unserialize( $hookData['hook_extra_data'] );
 		
-		if( $hookData['hook_requirements']['hook_ipb_version_min'] OR $hookData['hook_requirements']['hook_ipb_version_max'] )
+		/* Meets requirements? */
+		$hookData['_require_errors'] = $this->checkHookRequirements( $hookData );
+		
+		/* Got updates? */
+		if ( $hookData['hook_update_check'] )
 		{
-			/* Get the setup class */
-			require IPS_ROOT_PATH . "setup/sources/base/setup.php";
-			
-			/* Fetch numbers */
-			$versions  = IPSSetUp::fetchXmlAppVersions( 'core' );
-			
-			/* Ensure we match at least 3.0.0 */
-			$hookData['hook_requirements']['hook_ipb_version_min'] = ( $hookData['hook_requirements']['hook_ipb_version_min'] < 30000 ) ? 30000 : $hookData['hook_requirements']['hook_ipb_version_min'];
-			
-			foreach( $versions as $long => $human )
-			{
-				if( $hookData['hook_requirements']['hook_ipb_version_min'] <= $long )
-				{
-					$hookData['hook_requirements']['hook_ipb_version_min'] = $human;
-					break;
-				}
-			}
-			
-			krsort( $versions );
-			
-			foreach( $versions as $long => $human )
-			{
-				if( $hookData['hook_requirements']['hook_ipb_version_max'] >= $long )
-				{
-					$hookData['hook_requirements']['hook_ipb_version_max'] = $human;
-					break;
-				}
-			}
+			$hookData['hook_update_available']	= $this->_updateAvailable( $hookData['hook_update_check'], $hookData['hook_version_long'] );
+		}
+		else
+		{
+			$hookData['hook_update_available']	= array( 0 );
 		}
 		
-		$files		= array();
-		$index		= 1;
+		/* Get files */
+		$files = array();
+		$index = 1;
 		
 		$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id=' . $id ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$r['hook_data']		= unserialize( $r['hook_data'] );
-			$files[ $index ]	= $r;
+			$r['hook_data']  = unserialize( $r['hook_data'] );
+			$files[ $index ] = $r;
 			$index++;
 		}
 
@@ -2906,12 +3037,133 @@ EOF;
 		$this->registry->output->html .= $this->html->hookDetails( $hookData, $files );
 	}
 	
+	/**
+	 * Check if the hook meets all the requirements
+	 * 
+	 * @param	mixed	$hook	Can be an hook ID or an array of the hook data
+	 * @return	@e array Errors found
+	 */
+	public function checkHookRequirements( $hook )
+	{
+		/* Init vars */
+		$hookData = array();
+		$reqsData = array();
+		$errors   = array();
+		
+		/* We already have some data? */
+		if ( is_array($hook) && count($hook) )
+		{
+			$hookData = $hook;
+		}
+		elseif ( is_int($hook) )
+		{
+			$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $hook ) );
+		}
+			
+		/* Requirements are still serialized? */
+		if ( !is_array($hookData['hook_requirements']) )
+		{
+			$hookData['hook_requirements'] = unserialize($hookData['hook_requirements']);
+		}
+		
+		/* Make our var shorter... */
+		$reqsData = &$hookData['hook_requirements'];
+		
+		/* Old data? - @todo: remove this check around 3.3(4?) */
+		if ( ! isset($reqsData['required_applications']['core']) && isset($reqsData['hook_ipb_version_min']) && ( $reqsData['hook_ipb_version_min'] > 0 || $reqsData['hook_ipb_version_max'] > 0 ) )
+		{
+			$reqsData['hook_ipb_version_min'] = ( $reqsData['hook_ipb_version_min'] < 30000 ) ? 30000 : $reqsData['hook_ipb_version_min'];
+			
+			$reqsData['required_applications']['core'] = array( 'min_version'	=> intval($reqsData['hook_ipb_version_min']), 'max_version'	=> intval($reqsData['hook_ipb_version_max']) );
+		}
+		
+		//-----------------------------------------
+		// Let's start checking requirements
+		//-----------------------------------------
+		
+		/* PHP */
+		if( $reqsData['hook_php_version_min'] OR $reqsData['hook_php_version_max'] )
+		{
+			if( $reqsData['hook_php_version_min'] AND version_compare( PHP_VERSION, $reqsData['hook_php_version_min'], '<' ) == true )
+			{
+				$errors['php_min'] = sprintf( $this->lang->words['h_phpold'],$reqsData['hook_php_version_min'] );
+			}
+			
+			if( $reqsData['hook_php_version_max'] AND version_compare( PHP_VERSION, $reqsData['hook_php_version_max'], '>' ) == true )
+			{
+				$errors['php_max'] = sprintf( $this->lang->words['h_phpnew'], $reqsData['hook_php_version_max'] );
+			}
+		}
+		
+		/* Additional applications */
+		if ( is_array($reqsData['required_applications']) && count($reqsData['required_applications']) )
+		{
+			/* Get the setup class */
+			require_once( IPS_ROOT_PATH . 'setup/sources/base/setup.php' );/*noLibHook*/
+			
+			/* Loop through all apps */
+			foreach( $reqsData['required_applications'] as $appKey => $appData )
+			{
+				/* Versions file doesn't exist? */
+				if ( !is_file( IPSLib::getAppDir( $appKey ) . '/xml/versions.xml' ) )
+				{
+					$errors[ $appKey.'_app' ] = sprintf( $this->lang->words['hook_require_appnotfound'], $appData['app_name'] );
+				}
+				/* App not installed/enabled? */
+				elseif( !IPSLib::appIsInstalled( $appKey ) )
+				{
+					$errors[ $appKey.'_app' ] = sprintf( $this->lang->words['hook_require_appdisabled'], ipsRegistry::$applications[ $appKey ]['app_title'] );
+				}
+				elseif ( $appData['min_version'] OR $appData['max_version'] )
+				{
+					/* Fetch and check versions */
+					if ( !isset($this->cachedVersions[ $appKey ]) )
+					{
+						$this->cachedVersions[ $appKey ] = IPSSetUp::fetchXmlAppVersions( $appKey );
+					}
+					
+					$versions = $this->cachedVersions[ $appKey ];
+					
+					if ( is_array($versions) && count($versions) )
+					{
+						if( !isset($this->cachedUpgradeInfo[ $appKey ]) )
+						{
+							$_key	= in_array( $appKey, array( 'forums', 'members' ) ) ? 'core' : $appKey;
+							$this->cachedUpgradeInfo[ $_key ]	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'upgrade_history', 'where' => "upgrade_app='{$_key}'", 'order' => 'upgrade_version_id DESC', 'limit' => array( 1 ) ) );
+							
+							/* Extra caching for the three core apps */
+							if( in_array( $appKey, array( 'core', 'forums', 'members' ) ) )
+							{
+								$this->cachedUpgradeInfo['core']	= $this->cachedUpgradeInfo[ $_key ];
+								$this->cachedUpgradeInfo['forums']	= $this->cachedUpgradeInfo[ $_key ];
+								$this->cachedUpgradeInfo['members']	= $this->cachedUpgradeInfo[ $_key ];
+							}
+						}
+
+						/* Do we meet tha requirements? */
+						if( $appData['min_version'] AND $this->cachedUpgradeInfo[ $appKey ]['upgrade_version_id'] < $appData['min_version'] )
+						{
+							$errors[ $appKey.'_min' ] = sprintf( $this->lang->words['hook_require_tooold'], isset($versions[ $appData['min_version'] ]) ? $versions[ $appData['min_version'] ] : $appData['min_version'] );
+						}
+						
+						if( $appData['max_version'] AND $this->cachedUpgradeInfo[ $appKey ]['upgrade_version_id'] > $appData['max_version'] )
+						{
+							$errors[ $appKey.'_max' ] = sprintf( $this->lang->words['hook_require_toonew'], isset($versions[ $appData['max_version'] ]) ? $versions[ $appData['max_version'] ] : $appData['max_version'] );
+						}
+					}
+				}
+			}
+		}
+		
+		return $errors;
+	}
+	
 	/**
 	 * Check if you meet hook requirements
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _checkRequirements()
+	protected function _checkRequirements()
 	{
 		$id	= intval($this->request['id']);
 		
@@ -2920,129 +3172,74 @@ EOF;
 			$this->registry->output->showError( $this->lang->words['h_norequirements'], 11112 );
 		}
 		
-		$hookData	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
+		$hookData = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_hooks', 'where' => 'hook_id=' . $id ) );
 		
 		if( !$hookData['hook_id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['h_norequirements'], 11113 );
 		}
-
-		$hookData['hook_requirements']	= unserialize( $hookData['hook_requirements'] );
-		$hookIpbBad						= false;
-		$hookPhpBad						= false;
 		
-		/* Ensure we match at least 3.0.0 */
-		$hookData['hook_requirements']['hook_ipb_version_min'] = ( $hookData['hook_requirements']['hook_ipb_version_min'] < 30000 ) ? 30000 : $hookData['hook_requirements']['hook_ipb_version_min'];
+		/* Get requirements */
+		$hookData['hook_requirements'] = unserialize($hookData['hook_requirements']);
 		
-		if( $hookData['hook_requirements']['hook_ipb_version_min'] OR $hookData['hook_requirements']['hook_ipb_version_max'] )
-		{
-			/* Get the setup class */
-			require IPS_ROOT_PATH . "setup/sources/base/setup.php";
-			
-			/* Fetch numbers */
-			$versions  = IPSSetUp::fetchXmlAppVersions( 'core' );
-			
-			$currentIPB		= (int) IPB_LONG_VERSION;
-
-			if( $hookData['hook_requirements']['hook_ipb_version_min'] AND $currentIPB < $hookData['hook_requirements']['hook_ipb_version_min'] )
-			{
-				$hookIpbBad		= $this->lang->words['h_tooold'];
-			}
-
-			if( $hookData['hook_requirements']['hook_ipb_version_max'] AND $currentIPB > $hookData['hook_requirements']['hook_ipb_version_max'] )
-			{
-				$hookIpbBad		= $this->lang->words['h_toonew'];
-			}
-
-			foreach( $versions as $long => $human )
-			{
-				if( $hookData['hook_requirements']['hook_ipb_version_min'] <= $long )
-				{
-					$hookData['hook_requirements']['hook_ipb_version_min'] = $human;
-					break;
-				}
-			}
-			
-			krsort( $versions );
-		
-			foreach( $versions as $long => $human )
-			{
-				if( $hookData['hook_requirements']['hook_ipb_version_max'] >= $long )
-				{
-					$hookData['hook_requirements']['hook_ipb_version_max'] = $human;
-					break;
-				}
-			}
-		}
-		
-		if( $hookData['hook_requirements']['hook_php_version_min'] OR $hookData['hook_requirements']['hook_php_version_max'] )
-		{
-			if( $hookData['hook_requirements']['hook_php_version_min'] AND version_compare( PHP_VERSION, $hookData['hook_requirements']['hook_php_version_min'], '<' ) == true )
-			{
-				$hookPhpBad		= $this->lang->words['h_phpold'];
-			}
-			
-			if( $hookData['hook_requirements']['hook_php_version_max'] AND version_compare( PHP_VERSION, $hookData['hook_requirements']['hook_php_version_max'], '>' ) == true )
-			{
-				$hookPhpBad		= $this->lang->words['h_phpnew'];
-			}
-		}
+		/* Check requirements */
+		$errors = $this->checkHookRequirements( $hookData );
 		
 		/* Output */
-		$this->registry->output->html .= $this->html->hookRequirements( $hookData, $hookIpbBad, $hookPhpBad );
+		$this->registry->output->html .= $this->html->hookRequirements( $hookData, $errors, $this->cachedVersions );
 	}
 	
 	/**
 	 * Rebuild hooks cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildHooksCache()
 	{
 		/* INI */
-		$cache		= array( 'commandHooks' => array(), 'skinHooks' => array(), 'templateHooks' => array(), 'dataHooks' => array(), 'libraryHooks' => array() );
+		$cache = array( 'commandHooks' => array(), 'skinHooks' => array(), 'templateHooks' => array(), 'dataHooks' => array(), 'libraryHooks' => array() );
 
 		/* First fix positions */
 		$this->_fixPositions();
 
 		/* Get current hooks */
-		$this->DB->build( array( 'select'		=> 'f.*', 
-									'from'		=> array( 'core_hooks_files' => 'f' ), 
-									'where'		=> 'c.hook_enabled=1',
-									'order'		=> 'c.hook_position ASC',
-									'add_join'	=> array(
-														array(
-															'select' => 'c.hook_id, c.hook_key',
-															'from'	 => array( 'core_hooks' => 'c' ),
-															'where'	 => 'c.hook_id=f.hook_hook_id',
-															'type'	 => 'left',
-															)
-														)
+		$this->DB->build( array( 'select'	=> 'f.*', 
+								 'from'		=> array( 'core_hooks_files' => 'f' ), 
+								 'where'	=> 'c.hook_enabled=1',
+								 'order'	=> 'c.hook_position ASC',
+								 'add_join'	=> array( array( 'select' => 'c.hook_id',
+															 'from'   => array( 'core_hooks' => 'c' ),
+															 'where'  => 'c.hook_id=f.hook_hook_id',
+															 'type'   => 'left' ) )
 							)		);
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
+			/* Got no main hook id? Weird but skip.. */
+			if ( empty($r['hook_id']) )
+			{
+				continue;
+			}
+			
 			/* INIT */
 			$_cache	= array();
 			$data	= unserialize( $r['hook_data'] );
 			
 			/* General Stuff */
-			$_cache	= array(
-								'filename'	=> $r['hook_file_stored'],
-								'className'	=> $r['hook_classname'],
+			$_cache	= array( 'filename'  => $r['hook_file_stored'],
+							 'className' => $r['hook_classname']
 							);
 			
 			/* Hook type specific stuff */
 			if( $r['hook_type'] == 'templateHooks' )
 			{
 				$_cache['type']				= $data['type'];
-				//$_cache['skinGroup']		= $data['skinGroup'];
 				$_cache['skinFunction']		= $data['skinFunction'];
 				$_cache['id']				= $data['id'];
 				$_cache['position']			= $data['position'];
 			}
-			else if( $r['hook_type'] == 'dataHooks' OR $r['hook_type'] == 'libraryHooks' )
+			else if( /*$r['hook_type'] == 'dataHooks' OR*/ $r['hook_type'] == 'libraryHooks' )
 			{
 				$_cache['classToOverload']	= $data['classToOverload'];
 			}
@@ -3065,8 +3262,8 @@ EOF;
 				$cache[ $r['hook_type'] ][ $data['classToOverload'] ][] = $_cache;
 			}
 		}
-
+		
 		/* Update the cache */
 		$this->cache->setCache( 'hooks', $cache, array( 'array' => 1 ) );
-	}	
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/index.html b/upload/admin/applications/core/modules_admin/applications/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/applications/index.html
+++ b/upload/admin/applications/core/modules_admin/applications/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/nexus.php b/upload/admin/applications/core/modules_admin/applications/nexus.php
index 98f488e7..21840f2f 100644
--- a/upload/admin/applications/core/modules_admin/applications/nexus.php
+++ b/upload/admin/applications/core/modules_admin/applications/nexus.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Nexus Application
- * Last Updated: $Date: 2010-11-10 06:51:11 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7126 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,12 +28,12 @@ class admin_core_applications_nexus extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'purchase_app' );
 				
-		$this->registry->output->showInsideIframe("http://betscms.ws");
+		$this->registry->output->showInsideIframe("http://myipb.in/products/nexus/");
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/setup.php b/upload/admin/applications/core/modules_admin/applications/setup.php
index 07333dbf..e7a654fe 100644
--- a/upload/admin/applications/core/modules_admin/applications/setup.php
+++ b/upload/admin/applications/core/modules_admin/applications/setup.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Application Installation
- * Last Updated: $Date: 2010-10-19 11:43:08 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-08-01 09:21:24 -0400 (Mon, 01 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6996 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9340 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,41 +30,41 @@ class admin_core_applications_setup extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Current app path
 	 *
 	 * @var		object
 	 */
-	private $app_full_path;
+	protected $app_full_path;
 	
 	/**
 	 * Product information
 	 *
 	 * @var		array
 	 */
-	private $product_information;
+	protected $product_information;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -80,7 +80,7 @@ class admin_core_applications_setup extends ipsCommand
 		$this->form_code_js = $this->html->form_code_js = 'module=applications&section=setup';
 		
 		/* Get the setup class */
-		require IPS_ROOT_PATH . "setup/sources/base/setup.php";
+		require( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
 		
 		/* Set the path */
 		$this->app_full_path = IPSLib::getAppDir( $this->request['app_directory'] ) . '/';
@@ -105,7 +105,7 @@ class admin_core_applications_setup extends ipsCommand
 			# Settings
 			# Template Cache
 			# Caches / Done
-		*/		
+		*/
 		switch( $this->request['do'] )
 		{
 			default:
@@ -158,137 +158,27 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Rebuild PHP Templates Cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function recacheTemplates()
 	{
-		//-----------------------------------------
-		// Determine if we need to recache templates
-		//-----------------------------------------
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		$skinCaching = new skinCaching( $this->registry );
 		
-		$vars		= $this->getVars();
-		$hasSkin	= false;
+		/* Flag all for recache */
+		$skinCaching->flagSetForRecache();
 		
-		if ( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_replacements.xml' ) )
-		{
-			$hasSkin	= true;
-		}
+		$data = $this->getVars();
 		
-		if( !$hasSkin )
-		{
-			//-----------------------------------------
-			// We'll check for any of the default 3
-			//-----------------------------------------
-			
-			if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_root_templates.xml' ) OR
-				file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_lofi_templates.xml' ) OR
-				file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_xmlskin_templates.xml' ) )
-			{
-				$hasSkin	= true;
-			}
-		}
-
-		if( !$hasSkin )
-		{
-			//-----------------------------------------
-			// We'll check for any of the default 3
-			//-----------------------------------------
-			
-			if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_root_css.xml' ) OR
-				file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_lofi_css.xml' ) OR
-				file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_xmlskin_css.xml' ) )
-			{
-				$hasSkin	= true;
-			}
-		}
-		
-		//-----------------------------------------
-		// See if any hooks were installed..
-		//-----------------------------------------
-		
-		if( !$hasSkin )
-		{
-			if( is_dir( $this->app_full_path . 'xml/hooks' ) )
-			{
-				$files	= scandir( $this->app_full_path . 'xml/hooks' );
-				
-				foreach( $files as $file )
-				{
-					if( $file != '.' AND $file != '..' )
-					{
-						$hasSkin	= true;
-						break;
-					}
-				}
-			}
-		}
-		
-		if( !$hasSkin )
-		{
-			$this->showRedirectScreen( $vars['app_directory'], array( $this->lang->words['redir__no_template_re'] ) , '', $this->getNextURL( 'finish', $vars ) );
-			return;
-		}
-		
-		if( $this->request['_recache_done'] == 'true' )
-		{
-			$this->showRedirectScreen( $vars['app_directory'], array( $this->lang->words['to_recache_done'] ) , '', $this->getNextURL( 'finish', $vars ) );
-			return;
-		}
-		
-		/* INIT */
-		$setID = intval( $this->request['setID'] );
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
-		
-		$skinFunctions = new skinImportExport( $this->registry );
-		
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );	
-		
-		/* Get first set id */
-		if( ! $setID )
-		{
-			ksort( $this->registry->output->allSkins );
-			$_skins = $this->registry->output->allSkins;
-			$_set   = array_shift( $_skins );
-			$setID  = $_set['set_id'];
-		}
-
-		/* Rebuild */
-		$skinFunctions->rebuildPHPTemplates( $setID );
-		$skinFunctions->rebuildCSS( $setID );
-		$skinFunctions->rebuildReplacementsCache( $setID );
-		$skinFunctions->rebuildSkinSetsCache();
-				
-		/* Fetch next id */
-		$nextID = $setID;
-		
-		ksort( $this->registry->output->allSkins );
-		
-		foreach( $this->registry->output->allSkins as $id => $data )
-		{
-			if ( $id > $nextID )
-			{
-				$nextID = $id;
-				break;
-			}
-		}
-		if ( $nextID != $setID )
-		{
-			$this->showRedirectScreen( $vars['app_directory'], array( $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'] ), '', $this->getNextURL( 'tplcache&amp;setID=' . $nextID, $vars ) );
-		}
-		else
-		{
-			$this->showRedirectScreen( $vars['app_directory'], array( $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'] ), '', $this->getNextURL( 'tplcache&amp;_recache_done=true', $vars ) );			
-		}
-
+		$this->showRedirectScreen( $data['app_directory'], array( $this->lang->words['install_skins_flag_recache'] ), '', $this->getNextURL( 'finish', $data ) );			
 	}	
 	
 	/**
 	 * Finalizes installation and rebuilds caches
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function finish()
 	{
@@ -313,14 +203,15 @@ class admin_core_applications_setup extends ipsCommand
 		$this->cache->rebuildCache( 'app_menu_cache', 'global' );
 		$this->cache->rebuildCache( 'group_cache', 'global' );
 		$this->cache->rebuildCache( 'notifications', 'global' );
+		$this->cache->rebuildCache( 'report_plugins', 'global' );
 
 		/* Rebuild application specific caches */
 		$_file = $this->app_full_path . 'extensions/coreVariables.php';
 			
-		if( file_exists( $_file ) )
+		if( is_file( $_file ) )
 		{
 			$CACHE = array();
-			require( $_file );
+			require( $_file );/*noLibHook*/
 			
 			if( is_array( $CACHE ) AND count( $CACHE ) )
 			{
@@ -331,8 +222,18 @@ class admin_core_applications_setup extends ipsCommand
 			}
 		}
 		
+		/* Rebuild GLOBAL CACHES! */
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+		}
+		catch( Exception $e )
+		{
+			// Show an error?
+		}
+		
 		/* Rebuild FURLs */
-		if( file_exists( $this->app_full_path . 'extensions/furlTemplates.php' ) )
+		if( is_file( $this->app_full_path . 'extensions/furlTemplates.php' ) )
 		{
 			try
 			{
@@ -351,7 +252,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Next Check
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function nextCheck()
 	{
@@ -379,30 +280,32 @@ class admin_core_applications_setup extends ipsCommand
 			$new_pos = intval( $pos['pos'] ) + 1;
 			
 			/* Insert details into the DB */
-			$this->DB->insert( 'core_applications', array( 
-																'app_title'			=> $this->product_information['name'],
-																'app_public_title'	=> $this->product_information['public_name'],
-																'app_author'		=> $this->product_information['author'],
-																'app_description'	=> $this->product_information['description'],
-																'app_hide_tab'		=> intval($this->product_information['hide_tab']),
-																'app_version'		=> $_numbers['latest'][1],
-																'app_long_version'	=> $_numbers['latest'][0],
-																'app_directory'		=> $vars['app_directory'],
-																'app_location'		=> $vars['app_location'],
-																'app_added'			=> time(),
-																'app_position'		=> $new_pos,
-																'app_protected'		=> 0,
-																'app_enabled'		=> $this->product_information['disabledatinstall'] ? 0 : 1
+			$this->DB->insert( 'core_applications', array(  'app_title'			=> $this->product_information['name'],
+															'app_public_title'	=> $this->product_information['public_name'],
+															'app_author'		=> $this->product_information['author'],
+															'app_description'	=> $this->product_information['description'],
+															'app_hide_tab'		=> intval($this->product_information['hide_tab']),
+															'app_version'		=> $_numbers['latest'][1],
+															'app_long_version'	=> $_numbers['latest'][0],
+															'app_directory'		=> $vars['app_directory'],
+															'app_location'		=> $vars['app_location'],
+															'app_added'			=> time(),
+															'app_position'		=> $new_pos,
+															'app_protected'		=> 0,
+															'app_enabled'		=> $this->product_information['disabledatinstall'] ? 0 : 1,
+															'app_website'		=> trim($this->product_information['website']),
+															'app_update_check'	=> trim($this->product_information['update_check']),
+															'app_global_caches'	=> trim($this->product_information['global_caches']),
 															)
 								);
-								
+			
 			$this->DB->insert( 'upgrade_history', array( 
 														'upgrade_version_id'	=> $_numbers['latest'][0],
 														'upgrade_version_human'	=> $_numbers['latest'][1],
 														'upgrade_date'			=> time(),
 														'upgrade_notes'			=> '',
 														'upgrade_mid'			=> $this->memberData['member_id'],
-														'upgrade_app'			=> $vars['app_directory']
+														'upgrade_app'			=> $vars['app_directory'],
 												)	);
 			
 			/* Insert the modules */
@@ -413,14 +316,16 @@ class admin_core_applications_setup extends ipsCommand
 		}
 		else
 		{
-			$this->DB->update( 'core_applications', array( 
-															'app_title'			=> $this->product_information['name'],
+			$this->DB->update( 'core_applications', array(  'app_title'			=> $this->product_information['name'],
 															'app_public_title'	=> $this->product_information['public_name'],
 															'app_author'		=> $this->product_information['author'],
 															'app_description'	=> $this->product_information['description'],
 															'app_hide_tab'		=> intval($this->product_information['hide_tab']),
 															'app_version'		=> $_numbers['current'][1],
 															'app_long_version'	=> $_numbers['current'][0],
+															'app_website'		=> trim($this->product_information['website']),
+															'app_update_check'	=> trim($this->product_information['update_check']),
+															'app_global_caches'	=> trim($this->product_information['global_caches']),
 							), "app_directory='" . $vars['app_directory'] . "'" );
 			
 			/* Update the modules */
@@ -453,7 +358,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Import Hooks
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function hooks()
 	{
@@ -465,7 +370,7 @@ class admin_core_applications_setup extends ipsCommand
 		
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ) );
 		
-		if( file_exists( $this->app_full_path . 'xml/hooks.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/hooks.xml' ) )
 		{
 			/* Get the hooks class */
 			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php', 'admin_core_applications_hooks' );
@@ -494,7 +399,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Import Settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function settings()
 	{
@@ -504,12 +409,12 @@ class admin_core_applications_setup extends ipsCommand
 		$errors        = array();
 		$knownSettings = array();
 		
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ) );
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ), 'core' );
 		
-		if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_settings.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_settings.xml' ) )
 		{
 			/* Get the settings class */
-			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php', 'admin_core_tools_settings' );
+			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php', 'admin_core_settings_settings' );
 			$settings = new $classToLoad();
 			$settings->makeRegistryShortcuts( $this->registry );
 			
@@ -530,9 +435,9 @@ class admin_core_applications_setup extends ipsCommand
 			}
 			
 			/* Fetch known settings  */
-			if ( file_exists( IPSLib::getAppDir( $vars['app_directory'] ) . '/setup/versions/install/knownSettings.php' ) )
+			if ( is_file( IPSLib::getAppDir( $vars['app_directory'] ) . '/setup/versions/install/knownSettings.php' ) )
 			{
-				require( IPSLib::getAppDir( $vars['app_directory'] ) . '/setup/versions/install/knownSettings.php' );
+				require( IPSLib::getAppDir( $vars['app_directory'] ) . '/setup/versions/install/knownSettings.php' );/*noLibHook*/
 			}
 			
 			$settings->importAllSettings( 1, 1, $knownSettings );
@@ -555,7 +460,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Import tasks
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tasks()
 	{
@@ -564,7 +469,7 @@ class admin_core_applications_setup extends ipsCommand
 		$output    = array();
 		$errors    = array();
 		
-		if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_tasks.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_tasks.xml' ) )
 		{
 			/* Get the language class */
 			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php', 'admin_core_system_taskmanager' );
@@ -586,7 +491,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Import bbcode
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function bbcode()
 	{
@@ -595,7 +500,7 @@ class admin_core_applications_setup extends ipsCommand
 		$output    = array();
 		$errors    = array();
 		
-		if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_bbcode.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_bbcode.xml' ) )
 		{
 			/* Get the language class */
 			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php', 'admin_core_posts_bbcode' );
@@ -607,7 +512,7 @@ class admin_core_applications_setup extends ipsCommand
 			$output[] = $this->lang->words['bbcode_and_media'];
 		}
 		
-		if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_mediatag.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_mediatag.xml' ) )
 		{
 			/* Get the language class */
 			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php', 'admin_core_posts_media' );
@@ -634,7 +539,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Import help
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function help()
 	{
@@ -643,7 +548,7 @@ class admin_core_applications_setup extends ipsCommand
 		$output    = array();
 		$errors    = array();
 		
-		if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_help.xml' ) )
+		if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_help.xml' ) )
 		{
 			$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php', 'admin_core_tools_help' );
 			$help = new $classToLoad();
@@ -666,7 +571,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Language Import
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function languages()
 	{
@@ -710,7 +615,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Install templates
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function templates()
 	{
@@ -719,9 +624,9 @@ class admin_core_applications_setup extends ipsCommand
 		$output    = array();
 		$errors    = array();
 		
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 		$skinFunctions	= new skinImportExport( $this->registry );
 		$skinCaching	= new skinCaching( $this->registry );
 		
@@ -746,7 +651,7 @@ class admin_core_applications_setup extends ipsCommand
 		foreach( $skinSets as $skinKey => $skinData )
 		{
 			/* Skin files first */
-			if( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_' . $skinKey . '_templates.xml' ) )
+			if( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_' . $skinKey . '_templates.xml' ) )
 			{
 				$return = $skinFunctions->importTemplateAppXML( $vars['app_directory'], $skinKey, $skinData['set_id'], TRUE );
 				
@@ -754,7 +659,7 @@ class admin_core_applications_setup extends ipsCommand
 			}
 			
 			/* Then CSS files */
-			if ( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_' . $skinKey . '_css.xml' ) )
+			if ( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_' . $skinKey . '_css.xml' ) )
 			{
 				//-----------------------------------------
 				// Install
@@ -766,7 +671,7 @@ class admin_core_applications_setup extends ipsCommand
 			}
 			
 			/* And we can support replacements for good measure */
-			if ( file_exists( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_replacements.xml' ) )
+			if ( is_file( $this->app_full_path . 'xml/' . $vars['app_directory'] . '_replacements.xml' ) )
 			{
 				//-----------------------------------------
 				// Install
@@ -796,7 +701,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Runs any additional sql files
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlSteps()
 	{
@@ -809,16 +714,16 @@ class admin_core_applications_setup extends ipsCommand
 		$sql_files = array();
 		
 		/* Any "extra" configs required for this driver? */
-		if( file_exists( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' ) )
+		if( is_file( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' );
+			require_once( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' );/*noLibHook*/
 
 			$extra_install = new install_extra( $this->registry );
 		}
 		
 		
 		/* Run any sql files we found */
-		if( file_exists( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ips_DBRegistry::getDriverType() )  . '_sql_' . $id .'.php' ) )
+		if( is_file( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ips_DBRegistry::getDriverType() )  . '_sql_' . $id .'.php' ) )
 		{
 			/* INIT */
 			$new_id = $id + 1;
@@ -826,7 +731,7 @@ class admin_core_applications_setup extends ipsCommand
 			$SQL    = array();
 			
 			/* Get the sql file */
-			require_once( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ips_DBRegistry::getDriverType() )  . '_sql_' . $id .'.php' );
+			require_once( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ips_DBRegistry::getDriverType() )  . '_sql_' . $id .'.php' );/*noLibHook*/
 
 			$this->DB->return_die = 1;
 			
@@ -872,7 +777,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Creates Tables, Runs Inserts, and Indexes
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlBasics()
 	{
@@ -884,9 +789,9 @@ class admin_core_applications_setup extends ipsCommand
 		$count		= 0;
 
 		/* Any "extra" configs required for this driver? */
-		if( file_exists( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' ) )
+		if( is_file( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' );
+			require_once( IPS_ROOT_PATH . 'setup/sql/' . strtolower( $this->settings['sql_driver'] ) . '_install.php' );/*noLibHook*/
 
 			$extra_install = new install_extra( $this->registry );
 		}
@@ -897,10 +802,10 @@ class admin_core_applications_setup extends ipsCommand
 		
 		$this->DB->return_die = 1;
 
-		if ( file_exists( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_tables.php' ) )
+		if ( is_file( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_tables.php' ) )
 		{
 			$TABLE = array();
-			include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_tables.php' );
+			include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_tables.php' );/*noLibHook*/
 
 			if ( is_array( $TABLE ) and count( $TABLE ) )
 			{
@@ -910,7 +815,7 @@ class admin_core_applications_setup extends ipsCommand
 					// Is this a create?
 					//-----------------------------------------
 					
-					preg_match("/CREATE TABLE (\S+)(\s)?\(/", $q, $match);
+					preg_match("/CREATE TABLE\s+(\S+)(\s)?\(/", str_ireplace( 'if not exists', '', $q ), $match);
 
 					if( $match[1] AND $vars['dupe_tables'] == 'drop' )
 					{
@@ -972,10 +877,10 @@ class admin_core_applications_setup extends ipsCommand
 
 		if ( $this->DB->checkFulltextSupport() )
 		{
-			if ( file_exists( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_fulltext.php' ) )
+			if ( is_file( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_fulltext.php' ) )
 			{
 				$INDEX = array();
-				include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_fulltext.php' );
+				include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_fulltext.php' );/*noLibHook*/
 				
 				$count	= 0;
 	
@@ -1011,13 +916,13 @@ class admin_core_applications_setup extends ipsCommand
 		}
 		
 		/* INSERTS */
-		if ( file_exists( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_inserts.php' ) )
+		if ( is_file( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_inserts.php' ) )
 		{
 			$INSERT = array();
 			$count  = 0;
 			
 			/* Get the SQL File */
-			include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_inserts.php' );
+			include( $this->app_full_path . 'setup/versions/install/sql/' . $vars['app_directory']. '_' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '_inserts.php' );/*noLibHook*/
 			
 			foreach( $INSERT as $q )
 			{
@@ -1057,7 +962,7 @@ class admin_core_applications_setup extends ipsCommand
 	/**
 	 * Begin installation
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function start()
 	{
@@ -1112,7 +1017,7 @@ class admin_core_applications_setup extends ipsCommand
 			{
 				if ( $data['dir'] )
 				{
-					if ( ! @mkdir( $_path, 0777, TRUE ) )
+					if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
 					{
 						$info['notexist'][] = $_path;
 					}
@@ -1124,7 +1029,7 @@ class admin_core_applications_setup extends ipsCommand
 			}
 			else if ( ! is_writeable( $_path ) )
 			{
-				if ( ! @chmod( $_path, 0777 ) )
+				if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
 				{
 					$info['notwrite'][] = $_path;
 				}
@@ -1175,7 +1080,7 @@ class admin_core_applications_setup extends ipsCommand
 
 		foreach( $required_xml as $r )
 		{
-			if( ! file_exists( $this->app_full_path . "xml/{$r}.xml" ) )
+			if( ! is_file( $this->app_full_path . "xml/{$r}.xml" ) )
 			{
 				$errors[] = sprintf( $this->lang->words['error__file_needed'], $this->app_full_path . "xml/{$r}.xml" );
 			}
@@ -1190,7 +1095,7 @@ class admin_core_applications_setup extends ipsCommand
 	 *
 	 * @return	array
 	 */
-	private function getVars()
+	protected function getVars()
 	{
 		/* INIT */
 		$env = array();
@@ -1227,7 +1132,7 @@ class admin_core_applications_setup extends ipsCommand
 	 * @param	array	$env
 	 * @return	string
 	 */
-	private function getNextURL( $next_action, $env )
+	protected function getNextURL( $next_action, $env )
 	{
 		return $this->settings['base_url'] . $this->form_code . '&amp;do=' . $next_action . '&amp;app_directory=' . $env['app_directory'] . '&amp;type=' . $env['type'] . '&amp;version=' . $env['version'];
 	}
@@ -1239,9 +1144,9 @@ class admin_core_applications_setup extends ipsCommand
 	 * @param	string	$output
 	 * @param	string	$errors
 	 * @param	string	$next_url
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function showRedirectScreen( $app_directory, $output, $errors, $next_url )
+	protected function showRedirectScreen( $app_directory, $output, $errors, $next_url )
 	{
 		/* Init Data */
 		$data		= IPSSetUp::fetchXmlAppInformation( $app_directory, $this->settings['gb_char_set'] );
diff --git a/upload/admin/applications/core/modules_admin/applications/xml/index.html b/upload/admin/applications/core/modules_admin/applications/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/applications/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/applications/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/applications/xml/menu.xml b/upload/admin/applications/core/modules_admin/applications/xml/menu.xml
index 6e2f0b50..20e0e770 100644
--- a/upload/admin/applications/core/modules_admin/applications/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/applications/xml/menu.xml
@@ -6,22 +6,24 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Спи�ок модулей</subitemtitle>
+					<subitemlang>manage_apps_modules</subitemlang>
 					<subsection>applications</subsection>
 					<subitemurl>do=applications_overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>app_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
 		</item>
 		
-		<item>
+<item>
 			<title>Управление хуками (hooks)</title>
 			<subitems>
 				<subitem>
 					<subitemtitle>Спи�ок хуков</subitemtitle>
+					<subitemlang>manage_hooks</subitemlang>
 					<subsection>hooks</subsection>
 					<subitemurl>do=hooks_overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>hooks_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/applications/xml/permissions.xml b/upload/admin/applications/core/modules_admin/applications/xml/permissions.xml
index 71672b65..2767cf8a 100644
--- a/upload/admin/applications/core/modules_admin/applications/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/applications/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление приложени�ми</grouptitle>
+		<grouplang>core_manage_apps</grouplang>
 		<items>
 			<item>
 				<key>app_manage</key>
@@ -23,6 +24,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление модул�ми</grouptitle>
+		<grouplang>core_manage_modules</grouplang>
 		<items>
 			<item>
 				<key>module_manage</key>
@@ -36,6 +38,7 @@
 	</group>
 	<group>
 		<grouptitle>Покупка приложений</grouptitle>
+		<grouplang>core_purchase_app</grouplang>
 		<items>
 			<item>
 				<key>purchase_app</key>
@@ -45,6 +48,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление модификаци�ми</grouptitle>
+		<grouplang>core_manage_hooks</grouplang>
 		<items>
 			<item>
 				<key>hooks_manage</key>
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/defaultSection.php b/upload/admin/applications/core/modules_admin/diagnostics/defaultSection.php
index bcb84134..5843a48b 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/diagnostics/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default diagnostics section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'diagnostics' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'diagnostics';
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/diagnostics.php b/upload/admin/applications/core/modules_admin/diagnostics/diagnostics.php
index 71c74dac..5e70ceab 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/diagnostics.php
+++ b/upload/admin/applications/core/modules_admin/diagnostics/diagnostics.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Diagnostic tools
- * Last Updated: $Date: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6990 $
+ * @version		$Revision: 9487 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -31,62 +31,42 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
-	
-	/**
-	 * Directory separator
-	 *
-	 * @var		string			Directory separator
-	 */
-	private $dir_split			= "/";
+	protected $form_code_js;
 	
 	/**
 	 * Db tools
 	 *
 	 * @var		object
 	 */
-	private $dbTools;
+	protected $dbTools;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
-		//-----------------------------------------
-		// Load skin
-		//-----------------------------------------
-		
+		/* Load skin and setup stuff */
 		$this->html			= $this->registry->output->loadTemplate('cp_skin_diagnostics');
-		
-		//-----------------------------------------
-		// Set up stuff
-		//-----------------------------------------
-		
 		$this->form_code	= $this->html->form_code	= 'module=diagnostics&amp;section=diagnostics';
 		$this->form_code_js	= $this->html->form_code_js	= 'module=diagnostics&section=diagnostics';
 		
-		if( strpos( strtolower( PHP_OS ), 'win' ) === 0 )
-		{
-			$this->dir_split = "\\";
-		}
-		
 		//-----------------------------------------
 		// Some of these functions can take a while..
 		//-----------------------------------------
@@ -97,7 +77,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		// Load lang
 		//-----------------------------------------
 				
-		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_system' ) );
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_system' ), 'core' );
 
 		///----------------------------------------
 		// What to do...
@@ -162,9 +142,9 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	/**
 	 * Test outbound connections
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _checkConnections()
+	public function _checkConnections()
 	{
 		//-----------------------------------------
 		// Turn errors on so we can view them
@@ -175,188 +155,22 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
 		$_files = new $classToLoad();
-		$_files->use_sockets	= 1;
 		
-		$_test		= $_files->getFileContents( "http://yandex.ru/" );
+		$_test		= $_files->getFileContents( "http://www.google.com/" );
 		$_headers	= $_files->raw_headers;
 		
-		$_test1		= $_files->getFileContents( "https://yandex.ru/" );
+		$_test1		= $_files->getFileContents( "https://www.google.com/" );
 		$_headers1	= $_files->raw_headers;
-				
+		
 		$this->registry->output->html .= $this->html->connectionCheckerResult( $_headers, $_test, $_headers1, $_test1 );
 	}
 	
-	/**
-	 * Displays a log entry
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _tmViewLog()
-	{
-		/* INIT */
-		$member_id 		  = intval( $this->request['member_id'] );
-		$marker_microtime = base64_decode( trim( $this->request['_id'] ) );
-		
-		/* Fetch row */
-		$data = $this->DB->buildAndFetch( array( 'select' => '*',
-												 'from'   => 'core_topicmarker_debug',
-												 'where'  => 'marker_member_id=' . $member_id . ' AND marker_microtime=\'' . $marker_microtime . '\'' ) );
-												
-		/* Format date */
-		if ( $data )
-		{
-			$data['_marker_timestamp'] = $this->registry->class_localization->getDate( $data['marker_timestamp'], 'long' );
-		}
-		
-		/* unserialize */
-		if ( $data['marker_data_storage'] AND strstr( 'a:', $data['marker_data_storage'] ) )
-		{
-			$data['_marker_data_storage'] = unserialize( $data['marker_data_storage'] );
-		}
-		
-		/* unserialize */
-		if ( $data['marker_data_memory'] AND strstr( 'a:', $data['marker_data_memory'] ) )
-		{
-			$data['_marker_data_memory'] = unserialize( $data['marker_data_memory'] );
-		}
-		
-		/* unserialize */
-		if ( $data['marker_data_freezer'] AND strstr( 'a:', $data['marker_data_freezer'] ) )
-		{
-			$data['_marker_data_freezer'] = unserialize( $data['marker_data_freezer'] );
-		}
-		
-		/* unserialize */
-		foreach( array( 1,2,3,4,5 ) as $n )
-		{
-			if ( $data['marker_data_' . $n ] AND strstr( 'a:', $data['marker_data_' . $n ] ) )
-			{
-				$data['marker_data_' . $n ] = unserialize( $data['marker_data_' . $n ] );
-			}
-		}
-		
-		/* Print pop-up window */
-		$this->registry->output->html .= $this->html->topicMarkers_viewLog( $data );
-		$this->registry->output->printPopupWindow();
-	}
-	
-	/**
-	 * Displays a member's session
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _tmMemberIndex()
-	{
-		/* INIT */
-		$markers   			= array();
-		$member_id 			= intval( $this->request['member_id'] );
-		$marker_session_key = trim( $this->request['marker_session_key'] );
-		$st 	   			= intval( $this->request['st'] );
-		$perpage   			= 100;
-		$query     			= array();
-		$url       			= array();
-		
-		/* Load member */
-		$member    = IPSMember::buildDisplayData( $member_id );
-		
-		/* Generate SQL */
-		$query[]   = 't.marker_member_id=' . $member_id;
-		$url[]     = 'member_id=' . $member_id;
-		
-		if ( $marker_session_key )
-		{
-			$query[] = 't.marker_session_key=\'' . $marker_session_key. '\'';
-			$url[]   = 'marker_session_key=' . $marker_session_key;
-		}
-		
-		/* Fetch count */
-		$count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count',
-										  		  'from'   => 'core_topicmarker_debug t',
-										  		  'where'  => implode( " AND ", $query ) ) );
-										
-		$pages = $this->registry->output->generatePagination( array( 'totalItems'			=> $count['count'],
-																	 'itemsPerPage'			=> $perpage,
-																	 'currentStartValue'	=> $st,
-																	 'baseUrl'				=> $this->settings['base_url'] . "&{$this->form_code}&do=" . $this->request['do'] . '&' . implode( "&", $url ),
-														)		);
-		/* Grab members */
-		$this->DB->build( array( 'select' => '*',
-								 'from'   => 'core_topicmarker_debug t',
-								 'where'  => implode( " AND ", $query ),
-								 'limit'  => array( $st, $perpage ),
-								 'order'  => 't.marker_timestamp ASC, t.marker_microtime ASC' ) );
-		$this->DB->execute();
-		
-		/* Barney and Luke rule the world <-- Debbie typed that */
-		while( $row = $this->DB->fetch() )
-		{
-			$markers[] = $row;
-		}
-		
-		/* Send to output */
-		$this->registry->output->extra_nav[] = array( $this->settings['base_url'] . "&{$this->form_code}&do=tm_index", "Topic Marker Debugging" );
-		
-		if ( count( $query ) > 1 )
-		{
-			$this->registry->output->extra_nav[] = array( $this->settings['base_url'] . "&{$this->form_code}&do=tm_memberindex&member_id=" . $member_id, "Log Overview (Unfiltered)" );
-		}
-		
-		$this->registry->output->extra_nav[] = array( $this->settings['base_url'] . "&{$this->form_code}&do=tm_memberindex"  . '&' . implode( "&", $url ), "Log Overview" );
-		
-		$this->registry->output->html       .= $this->html->topicMarkers_membersIndex( $member, $markers, $pages );
-	}
-	
-	/**
-	 * List topic marking debugging index screen (shows members)
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _tmIndex()
-	{
-		/* INIT */
-		$_debug  = array();
-		$debug   = array();
-		$members = array();
-		
-		/* Grab members */
-		$this->DB->build( array( 'select' => 't.*, COUNT(*) as count, MAX(t.marker_timestamp) as max_ts',
-								 'from'   => array( 'core_topicmarker_debug' => 't' ),
-								 'group'  => 't.marker_member_id',
-								 'order'  => 'm.members_l_display_name',
-								 'add_join' => array( array( 'select' => 'm.*',
-															 'from'   => array( 'members' => 'm' ),
-															 'where'  => 'm.member_id=t.marker_member_id',
-															 'type'   => 'left' ) ) ) );
-		$this->DB->execute();
-		
-		/* Barney and Luke rule the world <-- Debbie typed that */
-		while( $row = $this->DB->fetch() )
-		{
-			$members[] = $row['marker_member_id'];
-			$_debug[]  = $row;
-		}
-		
-		/* Grab members */
-		$loadedMembers = IPSMember::load( $members );
-		
-		/* Parse 'em */
-		foreach( $_debug as $row )
-		{
-			$row['_memberData'] = IPSMember::buildDisplayData( $loadedMembers[ $row['marker_member_id'] ] );
-			
-			$debug[] = $row;
-		}
-		
-		/* Send to output */
-		$this->registry->output->html .= $this->html->topicMarkers_index( $debug );
-	}
-	
 	/**
 	 * Check file versions
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _versionCheck()
+	public function _versionCheck()
 	{
 		$file_versions		= array();
 		$upgrade_history	= array();
@@ -380,8 +194,8 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		// Got real version number?
 		//-----------------------------------------
 
-		$version['version']			= (IPB_VERSION == '3.1.4') ? $latest_version['upgrade_version_human'] : IPB_VERSION;
-		$version['version_full']	= (IPB_LONG_VERSION == '31007') ? $latest_version['upgrade_version_id'] : IPB_LONG_VERSION;
+		$version['version']			= ( IPB_VERSION == '3.2.3' ) ? $latest_version['upgrade_version_human'] : IPB_VERSION;
+		$version['version_full']	= ( IPB_LONG_VERSION == '32006' ) ? $latest_version['upgrade_version_id'] : IPB_LONG_VERSION;
 
 		//-----------------------------------------
 		// Version History
@@ -406,15 +220,17 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	 * @param	string		Directory to check
 	 * @return	array 		Files => Versions
 	 */
-	private function _versionDirRecurse($dir)
+	public function _versionDirRecurse($dir)
 	{
-		$skip_dirs	= array( 'public', 
+		/* Init some vars */
+		$files     = array();
+		$skip_dirs = array( PUBLIC_DIRECTORY, 
 							'cache',  
 							'uploads', 
 							'images', 
 							'i18n', 
 							'PEAR', 
-							'hooks', 
+							rtrim( str_replace( DOC_IPS_ROOT_PATH, '', IPS_HOOKS_PATH ), '/\\' ), 
 							'facebook-client', 
 							'FirePHPCore', 
 							'facebook', 
@@ -427,18 +243,15 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 							'Auth'
 							);
 
-		$skip_files	= array( 'conf_global.php', 
+		$skip_files	= array('conf_global.php', 
 							'conf.php',
 							$this->settings['sql_driver'] . '_updates.php',
 							$this->settings['sql_driver'] . '_install.php',
 							$this->settings['sql_driver'] . '_fulltext.php',
-							'versionnumbers.php',
-							'recaptcha.php',
 							'classGraph.php',		// This is Wizzy's
 							);
 		
-		$files		= array();
-
+		/* Check files */
 		try
 		{
 			foreach( new DirectoryIterator( $dir ) as $directory )
@@ -453,8 +266,8 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			    	continue;
 			    }
         	
-				$newpath	= $dir . $this->dir_split . $directory->getFilename();
-				$level		= explode( $this->dir_split, $newpath );
+				$newpath = $dir . '/' . $directory->getFilename();
+				$level   = explode( '/', $newpath );
         	
 				if ( is_dir($newpath) && !in_array( $directory->getFilename(), $skip_dirs ) )
 				{
@@ -466,7 +279,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 					{
 						$file = file_get_contents($newpath);
         	
-						preg_match( "#IP\.Board v([\d\.]+?)\\n#i", $file, $matches );
+						preg_match( "#@version\s+?v(.+?)\\n#i", $file, $matches );
 						
 						$files[ $newpath ] = isset($matches[1]) ? $matches[1] : '';
 					}
@@ -480,25 +293,23 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	/**
 	 * Check file permissions
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _permissionsCheck()
-	{		
-		$checkdirs	= array(
-							'public',
-							'public' . $this->dir_split . 'style_images', 
-							'public' . $this->dir_split . 'style_css', 
-							'public' . $this->dir_split . 'style_emoticons', 
+	public function _permissionsCheck()
+	{
+		$checkdirs = array( PUBLIC_DIRECTORY . '/style_images', 
+							PUBLIC_DIRECTORY . '/style_css', 
+							PUBLIC_DIRECTORY . '/style_emoticons', 
 							'cache', 
-							'cache' . $this->dir_split . 'skin_cache', 
-							'cache' . $this->dir_split . 'lang_cache', 
-							'cache' . $this->dir_split . 'tmp', 
-							'cache' . $this->dir_split . 'openid', 
+							'cache/skin_cache', 
+							'cache/lang_cache', 
+							'cache/tmp', 
+							'cache/openid', 
 							'uploads',
-							'uploads' . $this->dir_split . 'profile', 
-							'hooks',
+							'uploads/profile', 
+							rtrim( str_replace( DOC_IPS_ROOT_PATH, '', IPS_HOOKS_PATH ), '/\\' ),
 							);
-	
+		
 		//-----------------------------------------		
 		// Get language directories
 		//-----------------------------------------
@@ -507,16 +318,16 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		{
 			foreach( $this->cache->getCache('lang_data') as $v )
 			{
-				$this_lang		= 'cache' . $this->dir_split . 'lang_cache' . $this->dir_split . $v['lang_id'];
-				$checkdirs[]	= $this_lang;
+				$this_lang   = 'cache/lang_cache/' . $v['lang_id'];
+				$checkdirs[] = $this_lang;
 				
 				try
 				{
-					foreach( new DirectoryIterator( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $this_lang ) as $file )
+					foreach( new DirectoryIterator( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . '/' . $this_lang ) as $file )
 					{
 						if( $file->isFile() )
 						{
-							$checkdirs[] = $this_lang . $this->dir_split . $file->getFilename();
+							$checkdirs[] = $this_lang . '/' . $file->getFilename();
 						}
 					}
 				} catch ( Exception $e ) {}
@@ -529,16 +340,16 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			
 			while( $v = $this->DB->fetch() )
 			{
-				$this_lang		= 'cache' . $this->dir_split . 'lang_cache' . $this->dir_split . $v['lang_id'];
+				$this_lang		= 'cache/lang_cache/' . $v['lang_id'];
 				$checkdirs[]	= $this_lang;
 				
 				try
 				{
-					foreach( new DirectoryIterator( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $this_lang ) as $file )
+					foreach( new DirectoryIterator( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . '/' . $this_lang ) as $file )
 					{
 						if( $file->isFile() )
 						{
-							$checkdirs[] = $this_lang . $this->dir_split . $file->getFilename();
+							$checkdirs[] = $this_lang . '/' . $file->getFilename();
 						}
 					}
 				} catch ( Exception $e ) {}		
@@ -553,7 +364,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		{
 			foreach( $this->cache->getCache('emoticons') as $v )
 			{
-				$checkdirs[] = 'public' . $this->dir_split . 'style_emoticons' . $this->dir_split . $v['emo_set'];
+				$checkdirs[] = PUBLIC_DIRECTORY . '/style_emoticons/' . $v['emo_set'];
 			}
 		}
 		else
@@ -563,7 +374,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			
 			while( $v = $this->DB->fetch() )
 			{
-				$checkdirs[] = 'public' . $this->dir_split . 'style_emoticons' . $this->dir_split . $v['emo_set'];
+				$checkdirs[] = PUBLIC_DIRECTORY . '/style_emoticons/' . $v['emo_set'];
 			}
 		}
 		
@@ -582,7 +393,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 					continue;
 				}
 				
-				$checkdirs[]	= 'cache' . $this->dir_split . 'skin_cache' . $this->dir_split . 'cacheid_' . $v['set_id'];
+				$checkdirs[]	= 'cache/skin_cache/cacheid_' . $v['set_id'];
 				$skin_dirs[]	= $v['set_skin_set_id'];
 			}
 		}
@@ -593,7 +404,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			
 			while( $v = $this->DB->fetch() )
 			{
-				$checkdirs[]	= 'cache' . $this->dir_split . 'skin_cache' . $this->dir_split . 'cacheid_' . $v['set_id'];
+				$checkdirs[]	= 'cache/skin_cache/cacheid_' . $v['set_id'];
 				$skin_dirs[]	= $v['set_skin_set_id'];
 			}
 		}
@@ -602,18 +413,17 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		// Get skin files
 		//-----------------------------------------
 		
-		$this->DB->build( array(
-										'select'	=> $this->DB->buildDistinct( 'template_group' ),
-										'from'		=> 'skin_templates',
-										'group'		=> 'template_group',
-							)		);
+		$this->DB->build( array( 'select' => $this->DB->buildDistinct( 'template_group' ),
+								 'from'   => 'skin_templates',
+								 'group'  => 'template_group',
+						 )		);
 		$this->DB->execute();
 		
 		while( $v = $this->DB->fetch() )
 		{
 			foreach( $skin_dirs as $dir )
 			{
-				$checkdirs[] = 'cache' . $this->dir_split . 'skin_cache' . $this->dir_split . 'cacheid_' . $dir . $this->dir_split . $v['group_name'] . '.php';
+				$checkdirs[] = 'cache/skin_cache/cacheid_' . $dir . '/' . $v['group_name'] . '.php';
 			}
 		}
 		
@@ -622,7 +432,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		
 		foreach( $checkdirs as $dir_to_check )
 		{
-			if( !file_exists( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $dir_to_check ) )
+			if( !file_exists( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . '/' . $dir_to_check ) )
 			{
 				# Could be skin files from custom skins for components they don't own
 				# or they could be using safe_mode skins
@@ -630,56 +440,44 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 				
 				if( !strpos( $dir_to_check, 'skin_' ) OR !strpos( $dir_to_check, '.php' ) )
 				{
-					$output[] = "<span style='color:red;font-weight:bold;'>{$this->lang->words['d_p404']} ". rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $dir_to_check . "</span>";
+					$output[] = "<span style='color:red;font-weight:bold;'>{$this->lang->words['d_p404']} ". rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . "/{$dir_to_check}</span>";
 				}
 			}
-			else if( !is_writeable( DOC_IPS_ROOT_PATH . $this->dir_split . $dir_to_check ) )
+			else 
 			{
-				$output[] = "<span style='color:red;font-weight:bold;'>{$this->lang->words['d_pno']} ". rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $dir_to_check . "</span>";
-			}
-			else if( is_writeable( DOC_IPS_ROOT_PATH . $this->dir_split . $dir_to_check ) )
-			{
-				$output[] = "<span style='color:green;'>" . rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . $this->dir_split . $dir_to_check . " {$this->lang->words['d_pyes']}</span>";
+				$output[] = ( is_writable( DOC_IPS_ROOT_PATH . '/' . $dir_to_check ) ) ? "<span style='color:green;'>" . rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . "/{$dir_to_check} {$this->lang->words['d_pyes']}</span>" : "<span style='color:red;font-weight:bold;'>{$this->lang->words['d_pno']} ". rtrim( DOC_IPS_ROOT_PATH, '/\\' ) . "/{$dir_to_check}</span>";;
 			}
 		}
 		
 		$this->registry->output->html .= $this->html->permissionsResults( $output );
 	}
 	
-	
 	/**
 	 * Whitespace checking
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _whitespaceCheck()
+	public function _whitespaceCheck()
 	{
-		$files_with_junk	= array();
-		$files_with_junk	= $this->_whitespaceDirRecurse( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) );
-		//$files_with_junk	= $this->_whitespaceDirRecurse( '/var/' );
+		$files_with_junk = $this->_whitespaceDirRecurse( rtrim( DOC_IPS_ROOT_PATH, '/\\' ) );
 		
 		$this->registry->output->html .= $this->html->whitespaceResults( $files_with_junk );
 	}
 	
-	
 	/**
 	 * Recurse over a directory
 	 *
 	 * @param	string		Directory to check
 	 * @return	array 		Array of files with whitespace in them
 	 */
-	private function _whitespaceDirRecurse( $dir )
+	public function _whitespaceDirRecurse( $dir )
 	{
-		$skip_dirs	= array( 
-							'uploads', 
-							'gallery_setup', 
-							'blog_setup', 
-							'idm_setup',
-							'public', 
-							'js', 
-							'images', 
+		$skip_dirs = array( 'uploads',
+							PUBLIC_DIRECTORY,
+							'js',
+							'images',
 							);
-
+		
 		$files	= array();
 		
 		try
@@ -696,8 +494,8 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			    	continue;
 			    }
         	
-				$newpath	= $dir . $this->dir_split . $directory->getFilename();
-				$level		= explode( $this->dir_split, $newpath );
+				$newpath	= $dir . '/' . $directory->getFilename();
+				$level		= explode( '/', $newpath );
         	
 				if ( is_dir($newpath) && !in_array( $directory->getFilename(), $skip_dirs ) )
 				{
@@ -716,7 +514,14 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 						}
 						else if( substr( rtrim($file), -2 ) == '?>' AND substr( $file, -2 ) != '?>' )
 						{
-							$has_whitespace	= true;
+							//-----------------------------------------
+							// PHP explicitly allows one newline after closing tag
+							//-----------------------------------------
+							
+							if( substr( rtrim($file), -2 ) == '?>' AND substr( $file, -3 ) != "?>\n" )
+							{
+								$has_whitespace	= true;
+							}
 						}
         	
 						if( $has_whitespace )
@@ -737,7 +542,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	 * @param	void
 	 * @return	array 	Table files
 	 */
-	private function _getDbTools()
+	public function _getDbTools()
 	{
 		//-----------------------------------------
 		// First we get the SQL definitions for each app
@@ -749,7 +554,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		{
 			$_file = IPSLib::getAppDir( $app['app_directory'] ) . '/setup/versions/install/sql/' . $app['app_directory'] . '_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '_tables.php';
 			
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				$sql_table_files[ $app['app_title'] ] = $_file;
 			}
@@ -768,9 +573,9 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	/**
 	 * Check the database for missing indexes
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _indexCheck()
+	public function _indexCheck()
 	{
 		//-----------------------------------------
 		// First we get the SQL definitions for each app
@@ -788,7 +593,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		foreach( $sql_table_files as $app_title => $sql_file )
 		{
 			$TABLE = array();
-			require_once( $sql_file );
+			require_once( $sql_file );/*noLibHook*/
 			
 			if ( is_array( $TABLE ) AND count( $TABLE ) )
 			{
@@ -806,7 +611,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			
 				$tables_array[$app_title] = $output['results'];
 			}
-		}			
+		}
 
 		/* Output */
 		$this->registry->output->html .= $this->html->indexChecker( $errors_array, $tables_array );
@@ -815,10 +620,10 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	/**
 	 * Check the database for missing tables/columns
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 * @todo 	[Future] Functionality to show EXTRA columns/tables?
 	 */
-	private function _dbCheck()
+	public function _dbCheck()
 	{
 		//-----------------------------------------
 		// First we get the SQL definitions for each app
@@ -836,7 +641,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		foreach( $sql_table_files as $app_title => $sql_file )
 		{
 			$TABLE = array();
-			require_once( $sql_file );
+			require_once( $sql_file );/*noLibHook*/
 			
 			$output = $this->dbTools->dbTableDiag( $TABLE, $this->request['fix'] );
 
@@ -863,9 +668,9 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 	/**
 	 * Show the overview page
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _listFunctions()
+	public function _listFunctions()
 	{
 		//-----------------------------------------
 		// Stats
@@ -886,35 +691,31 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			$lock	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as mems'  , 'from' => 'members', 'where' => 'failed_login_count >= ' . $this->settings['ipb_bruteforce_attempts'] ) );
 		}
 
-		$coppa	 = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as coppa', 'from' => 'validating', 'where' => 'coppa_user=1' ) );
-
 		$my_timestamp = time() - $this->settings['au_cutoff'] * 60;
 
 		$online	 = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as sessions', 'from' => 'sessions', 'where' => 'running_time>' . $my_timestamp ) );
 
 		$pending = $this->DB->buildAndFetch( array( 'select' => 'SUM(queued_topics) as topics, SUM(queued_posts) as posts', 'from' => 'forums' ) );
 
-		$spammers = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count, MAX(joined) as joined',
+		$spammers = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count',
 													 'from'   => 'members',
-													 //'where'  => IPSBWOptions::sql( 'bw_is_spammer', 'members_bitoptions', 'members', 'global', 'has' ) ) );
 													 'where'  => "members_bitoptions = '1'" ) );
 
 		$statsbox = $this->html->acp_stats_wrapper( array( 'topics'      => ipsRegistry::getClass('class_localization')->formatNumber($this->caches['stats']['total_topics']),
-																   'replies'     => ipsRegistry::getClass('class_localization')->formatNumber($this->caches['stats']['total_replies']),
-																   'topics_mod'	 => ipsRegistry::getClass('class_localization')->formatNumber($pending['topics']),
-																   'posts_mod'	 => ipsRegistry::getClass('class_localization')->formatNumber($pending['posts']),
-																   'members'     => ipsRegistry::getClass('class_localization')->formatNumber($this->caches['stats']['mem_count']),
-																   'validate'    => ipsRegistry::getClass('class_localization')->formatNumber( $reg['reg'] ),
-																   'spammer'     => array( ipsRegistry::getClass('class_localization')->formatNumber( $spammers['count'] ), ipsRegistry::getClass('class_localization')->formatNumber( $spammers['joined'] ) ),
-																   'locked'		 => ipsRegistry::getClass('class_localization')->formatNumber( $lock['mems'] ),
-																   'coppa'       => ipsRegistry::getClass('class_localization')->formatNumber( $coppa['coppa'] ),
-																   'sql_driver'  => strtoupper(SQL_DRIVER),
-																   'sql_version' => $this->DB->true_version,
-																   'php_version' => phpversion(),
-																   'sessions'	 => ipsRegistry::getClass('class_localization')->formatNumber($online['sessions']),
-																   'php_sapi'    => @php_sapi_name(),
-																   'ipb_version' => ipsRegistry::$version,
-																   'ipb_id'      => ipsRegistry::$vn_full ) );
+														   'replies'     => ipsRegistry::getClass('class_localization')->formatNumber($this->caches['stats']['total_replies']),
+														   'topics_mod'	 => ipsRegistry::getClass('class_localization')->formatNumber($pending['topics']),
+														   'posts_mod'	 => ipsRegistry::getClass('class_localization')->formatNumber($pending['posts']),
+														   'members'     => ipsRegistry::getClass('class_localization')->formatNumber($this->caches['stats']['mem_count']),
+														   'validate'    => ipsRegistry::getClass('class_localization')->formatNumber( $reg['reg'] ),
+														   'spammer'     => ipsRegistry::getClass('class_localization')->formatNumber( $spammers['count'] ),
+														   'locked'		 => ipsRegistry::getClass('class_localization')->formatNumber( $lock['mems'] ),
+														   'sql_driver'  => strtoupper(SQL_DRIVER),
+														   'sql_version' => $this->DB->true_version,
+														   'php_version' => phpversion(),
+														   'sessions'	 => ipsRegistry::getClass('class_localization')->formatNumber($online['sessions']),
+														   'php_sapi'    => @php_sapi_name(),
+														   'ipb_version' => ipsRegistry::$version,
+														   'ipb_id'      => ipsRegistry::$vn_full ) );
 		
 		//-----------------------------------------
 		// PHP INFO?
@@ -946,7 +747,7 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 			#PREVENT WRAP: Cookie , split
 			$php_body  = preg_replace( "#,(\d+),#", ",<br />\\1," , $php_body );
 		  
-			$this->registry->output->html = $this->html->phpInfo( $php_body );
+			$this->registry->output->html .= $this->html->phpInfo( $php_body );
 			return;
 		}
 
@@ -1117,6 +918,4 @@ class admin_core_diagnostics_diagnostics extends ipsCommand
 		
 		$this->registry->output->html .= $this->html->acp_version_history_wrapper( $thiscontent );
 	}
-	
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/index.html b/upload/admin/applications/core/modules_admin/diagnostics/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/index.html
+++ b/upload/admin/applications/core/modules_admin/diagnostics/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/xml/index.html b/upload/admin/applications/core/modules_admin/diagnostics/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/diagnostics/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/xml/menu.xml b/upload/admin/applications/core/modules_admin/diagnostics/xml/menu.xml
index ab381a26..7f594bc6 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/diagnostics/xml/menu.xml
@@ -6,8 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Обзор �и�темы</subitemtitle>
+					<subitemlang>diag_overview</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl></subitemurl>
+					<subitemrolekey></subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -17,8 +19,10 @@
 			<subitems>		
 				<subitem>
 					<subitemtitle>Проверка вер�ий файлов</subitemtitle>
+					<subitemlang>version_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=fileversions</subitemurl>
+					<subitemrolekey>version_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -28,8 +32,10 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Пои�к файлов �одержащих лишние пробелы</subitemtitle>
+					<subitemlang>whitespace_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=whitespace</subitemurl>
+					<subitemrolekey>whitespace_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -39,8 +45,10 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Проверка прав до�тупа к файлам</subitemtitle>
+					<subitemlang>permissions_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=filepermissions</subitemurl>
+					<subitemrolekey>permission_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -50,8 +58,10 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Проверка �етевых �оединений</subitemtitle>
+					<subitemlang>connection_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=connections</subitemurl>
+					<subitemrolekey>connection_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -61,8 +71,10 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Проверка �труктуры базы данных</subitemtitle>
+					<subitemlang>db_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=dbchecker</subitemurl>
+					<subitemrolekey>database_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -72,8 +84,10 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Проверка индек�ов базы данных</subitemtitle>
+					<subitemlang>dbi_checker</subitemlang>
 					<subsection>diagnostics</subsection>
 					<subitemurl>do=dbindex</subitemurl>
+					<subitemrolekey>index_checker</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/diagnostics/xml/permissions.xml b/upload/admin/applications/core/modules_admin/diagnostics/xml/permissions.xml
index 1141f2d0..73acf1a1 100644
--- a/upload/admin/applications/core/modules_admin/diagnostics/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/diagnostics/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Ин�трументы диагно�тики</grouptitle>
+		<grouplang>core_diag_tools</grouplang>
 		<items>
 			<item>
 				<key>index_checker</key>
diff --git a/upload/admin/applications/core/modules_admin/help/defaultSection.php b/upload/admin/applications/core/modules_admin/help/defaultSection.php
index 03222b47..46589b3c 100644
--- a/upload/admin/applications/core/modules_admin/help/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/help/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default help section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'help' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'quickhelp';
diff --git a/upload/admin/applications/core/modules_admin/help/index.html b/upload/admin/applications/core/modules_admin/help/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/help/index.html
+++ b/upload/admin/applications/core/modules_admin/help/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/help/quickhelp.php b/upload/admin/applications/core/modules_admin/help/quickhelp.php
index bc59a30a..a93d5f45 100644
--- a/upload/admin/applications/core/modules_admin/help/quickhelp.php
+++ b/upload/admin/applications/core/modules_admin/help/quickhelp.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Quick help - shows popups with help information
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,18 +30,16 @@ class admin_core_help_quickhelp extends ipsCommand
 	/**
 	 * Array of help text
 	 *
-	 * @access	private
 	 * @var		array			Help texts
 	 */
-	private $help_text			= array();
+	protected $help_text			= array();
 	
 	/**
 	 * Initialize the help text array
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _initText()
+	protected function _initText()
 	{
 		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_system' ) );
 
@@ -82,9 +80,8 @@ class admin_core_help_quickhelp extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -110,41 +107,36 @@ class admin_core_help_quickhelp extends ipsCommand
 	/**
 	 * Redirect offsite for more help/options
 	 *
-	 * @access	private
 	 * @param	string		'key' to redirect to
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	private function _redirect( $id )
 	{
 		switch( $id )
 		{
 			case 'docs':
-				$url = "http://anonym.to/?http://external.iblink.ru/docs-ipb";
-			break;
-			
-			case 'kb':
-				$url = "http://anonym.to/?http://external.iblink.ru/wiki";
+				$url = "http://myipb.in/docs-ipb";
 			break;
 			
 			case 'resources':
-				$url = "http://anonym.to/?http://external.iblink.ru/forums";
+				$url = "http://myipb.in/forums";
 			break;
 			
 			case 'contact':
-				$url = "http://anonym.to/?http://external.iblink.ru/contact";
+				$url = "http://myipb.in/contact";
 			break;
 			
 			case 'features':
-				$url = "http://anonym.to/?http://external.iblink.ru/suggestfeatures";
+				$url = "http://myipb.in/suggestfeatures";
 			break;
 			
 			case 'bugs':
-				$url = "http://anonym.to/?http://external.iblink.ru/bugtrack";
+				$url = "http://myipb.in/bugtrack";
 			break;
 			
 			default:
 			case 'support':
-				$url = "http://anonym.to/?http://external.iblink.ru/clientarea";
+				$url = "http://myipb.in/clientarea";
 			break;
 		}
 			
diff --git a/upload/admin/applications/core/modules_admin/help/xml/index.html b/upload/admin/applications/core/modules_admin/help/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/help/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/help/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/help/xml/menu.xml b/upload/admin/applications/core/modules_admin/help/xml/menu.xml
index 95f29b30..6935841f 100644
--- a/upload/admin/applications/core/modules_admin/help/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/help/xml/menu.xml
@@ -6,28 +6,20 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Документаци�</subitemtitle>
+					<subitemlang>help_documentation</subitemlang>
 					<subsection>quickhelp</subsection>
 					<subitemurl>do=redirect&amp;id=docs</subitemurl>
 					<subisredirect>1</subisredirect>
 				</subitem>
 			</subitems>
 		</item>
-		<item>
-			<title>База знаний</title>
-			<subitems>					
-				<subitem>
-					<subitemtitle>База знаний</subitemtitle>
-					<subsection>quickhelp</subsection>
-					<subitemurl>do=redirect&amp;id=kb</subitemurl>
-					<subisredirect>1</subisredirect>
-				</subitem>
-			</subitems>
-		</item>				
-		<item>
+				
+<item>
 			<title>Тех. поддержка</title>
 			<subitems>				
 				<subitem>
 					<subitemtitle>Техниче�ка� поддержка</subitemtitle>
+					<subitemlang>help_support</subitemlang>
 					<subsection>quickhelp</subsection>
 					<subitemurl>do=redirect&amp;id=support</subitemurl>
 					<subisredirect>1</subisredirect>
@@ -39,6 +31,7 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Форумы IBResource</subitemtitle>
+					<subitemlang>help_resources</subitemlang>
 					<subsection>quickhelp</subsection>
 					<subitemurl>do=redirect&amp;id=resources</subitemurl>
 					<subisredirect>1</subisredirect>
@@ -50,6 +43,7 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Контактна� информаци�</subitemtitle>
+					<subitemlang>help_contact</subitemlang>
 					<subsection>quickhelp</subsection>
 					<subitemurl>do=redirect&amp;id=contact</subitemurl>
 					<subisredirect>1</subisredirect>
@@ -61,6 +55,7 @@
 			<subitems>				
 				<subitem>
 					<subitemtitle>Сообщить об ошибке</subitemtitle>
+					<subitemlang>help_bugs</subitemlang>
 					<subsection>quickhelp</subsection>
 					<subitemurl>do=redirect&amp;id=bugs</subitemurl>
 					<subisredirect>1</subisredirect>
diff --git a/upload/admin/applications/core/modules_admin/index.html b/upload/admin/applications/core/modules_admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/index.html
+++ b/upload/admin/applications/core/modules_admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/languages/defaultSection.php b/upload/admin/applications/core/modules_admin/languages/defaultSection.php
index 1c254e8c..8384e9a0 100644
--- a/upload/admin/applications/core/modules_admin/languages/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/languages/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default languages section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'languages' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'manage_languages';
diff --git a/upload/admin/applications/core/modules_admin/languages/index.html b/upload/admin/applications/core/modules_admin/languages/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/languages/index.html
+++ b/upload/admin/applications/core/modules_admin/languages/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/languages/manage_languages.php b/upload/admin/applications/core/modules_admin/languages/manage_languages.php
index 7f1c90d4..43269586 100644
--- a/upload/admin/applications/core/modules_admin/languages/manage_languages.php
+++ b/upload/admin/applications/core/modules_admin/languages/manage_languages.php
@@ -1,19 +1,20 @@
 <?php
+
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Language Pack Management
- * Last Updated: $LastChangedDate: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-19 20:56:02 -0400 (Mon, 19 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6990 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9511 $
  */
  
 if ( ! defined( 'IN_ACP' ) )
@@ -30,12 +31,40 @@ class admin_core_languages_manage_languages extends ipsCommand
 	 * @var		bool
 	 */
 	private $__daily	= false;
+
+	/**
+	 * Tab buttons
+	 *
+	 * @var		array
+	 */
+	public $tab_buttons     = array();
+
+	/**
+	 * Tabs
+	 *
+	 * @var		array
+	 */
+	public $tab_tabs        = array();
+
+	/**
+	 * Javascript action to execute on tab click
+	 *
+	 * @var		string
+	 */
+	public $tab_js_action   = '';
+
+	/**
+	 * Default tab
+	 *
+	 * @var		string
+	 */
+	public $default_tab     = '';
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -43,16 +72,15 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Get skin and language file
 		//-----------------------------------------
 		
-		$this->html = $this->registry->output->loadTemplate( 'cp_skin_system' );
-
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_system' ) );
+		$this->html = $this->registry->output->loadTemplate( 'cp_skin_system', 'core' );
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_system' ), 'core' );
 		
 		//-----------------------------------------
 		// Set urls
 		//-----------------------------------------
 		
-		$this->form_code    = $this->html->form_code = 'module=languages&amp;section=manage_languages';
-		$this->form_code_js = $this->html->form_code_js = 'module=languages&section=manage_languages';	
+		$this->form_code	= $this->html->form_code	= 'module=languages&amp;section=manage_languages&amp;';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=languages&section=manage_languages&';	
 
 		//-----------------------------------------
 		// Go
@@ -62,7 +90,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		{
 			case 'copy_lang_pack':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'lang_words' );
-				$this->languageCopy( 'edit' );
+				$this->languageCopy();
 			break;
 			
 			case 'edit_word_entry':
@@ -120,6 +148,11 @@ class admin_core_languages_manage_languages extends ipsCommand
 				$this->handleLanguageInformationForm( 'new' );
 			break;
 			
+			case 'language_swap':
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'lang_pack_info' );
+				$this->swapLanguages();
+			break;
+			
 			case 'revert':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'lang_words' );
 				$this->languageDoRevertWord();
@@ -198,10 +231,37 @@ class admin_core_languages_manage_languages extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 	
+	/**
+	 * Swap member language choice globally
+	 *
+	 * @return	@e void
+	 */
+	public function swapLanguages()
+	{
+		/* INIT */
+		$langFrom		= intval( $this->request['lang_from'] );
+		$langTo			= intval( $this->request['lang_to'] );
+		
+		/* Run query... */
+		if( !$langFrom )
+		{
+			$this->DB->update( 'members', array( 'language' => $langTo > 0 ? $langTo : '' ), "language='' OR language " . $this->DB->buildIsNull( true ) );
+		}
+		else
+		{
+			$this->DB->update( 'members', array( 'language' => $langTo > 0 ? $langTo : '' ), "language='{$langFrom}'" );
+		}
+
+		/* Done */
+		$this->registry->output->global_message = $this->lang->words['mem_lang_choice_swapped'];
+		$this->languagesList();
+		return;
+	}
+
 	/**
 	 * Finish a session and remove data
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function translateKill()
 	{
@@ -248,7 +308,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Translate externally import changed files
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function translateImport()
 	{
@@ -355,7 +415,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Translate externally splash
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function translateExtSplash()
 	{
@@ -480,7 +540,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 					{
 						fwrite( $fh, $to_write, strlen( $to_write ) );
 						fclose( $fh );
-						@chmod( $mainDir . '/' . $_file, 0777 );
+						@chmod( $mainDir . '/' . $_file, IPS_FILE_PERMISSION );
 						
 						$mtime = @filemtime( $mainDir . '/' . $_file );
 						
@@ -577,13 +637,13 @@ class admin_core_languages_manage_languages extends ipsCommand
 					
 					$counts[ $f ] = array();
 					
-					if ( ! file_exists( $mainDir . $f ) )
+					if ( ! is_file( $mainDir . $f ) )
 					{
 						continue;
 					}
 					
 					/* Require the file */
-					require( $mainDir . $f );
+					require( $mainDir . $f );/*noLibHook*/
 					
 					//-----------------------------------------
 					// Loop
@@ -771,7 +831,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Recaches a language pack
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function recacheLangPack()
 	{
@@ -785,15 +845,14 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		$this->cacheToDisk( $lang_id );
 		
-		$this->registry->output->global_message = $this->lang->words['language_recache_done'] . "<br />" . implode( "<br />", $this->cache_errors );
+		$this->registry->output->global_message = $this->lang->words['language_recache_done'] . ( !empty( $this->cache_errors ) ? ( "<br />" . implode( "<br />", $this->cache_errors ) ) : '' );
 		$this->languagesList();
 	}
 	
-	
 	/**
 	 * Remove a word entry
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function removeWordEntry()
 	{
@@ -828,7 +887,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Remove a word pack
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function removeWordPack()
 	{
@@ -853,7 +912,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 			
 			$_file	= IPS_CACHE_PATH . 'cache/lang_cache/' . $lang_id . '/' . $pack[0] . '_' . $pack[1] . '.php';
 			
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				@unlink( $_file );
 			}
@@ -877,7 +936,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Rebuilds language from XML files
 	 *
-	 * @return void
+	 * @return @e void
 	 */
 	public function rebuildFromXml()
 	{
@@ -897,7 +956,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		if ( ! is_writeable( IPS_CACHE_PATH . 'cache/lang_cache/' . $id ) )
 		{
-			$this->registry->output->global_message = "Cannot write to cache/lang_cache/" . $id;
+			$this->registry->output->global_error = $this->lang->words['cannot_write_to_cache'] ? sprintf( $this->lang->words['cannot_write_to_cache'], $id ) : "Cannot write to cache/lang_cache/" . $id;
 			$this->languagesList();
 			return;
 		}
@@ -906,7 +965,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Get setup class
 		//-----------------------------------------
 		
-		require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );
+		require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
 		
 		//-----------------------------------------
 		// Get apps
@@ -954,7 +1013,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 			// Off to next setp
 			//-----------------------------------------
 			
-			$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=rebuildFromXml&id={$id}&type={$type}&previous=" . $next['key'], $msg );
+			$this->registry->output->html	.= $this->registry->output->global_template->temporaryRedirect( $this->settings['base_url'] . $this->form_code . "do=rebuildFromXml&amp;id={$id}&amp;type={$type}&amp;previous=" . $next['key'], $msg . '<br>' . $this->registry->output->global_message );
+			$this->registry->output->global_message	= '';
+			return;
 		}
 		else
 		{
@@ -964,7 +1025,8 @@ class admin_core_languages_manage_languages extends ipsCommand
 				// Onto admin languages
 				//-----------------------------------------
 
-				$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=rebuildFromXml&id={$id}&type=admin", $this->lang->words['starting_admin_import'] );
+				$this->registry->output->html	.= $this->registry->output->global_template->temporaryRedirect( $this->settings['base_url'] . $this->form_code . "do=rebuildFromXml&amp;id={$id}&amp;type=admin", $this->lang->words['starting_admin_import'] );
+				return;
 			}
 			else
 			{
@@ -972,7 +1034,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 				// And we're done
 				//-----------------------------------------
 
-				$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages", $this->lang->words['lang_reimport_done'] );
+				$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code, $this->lang->words['lang_reimport_done'] );
 			}
 		}
 	}
@@ -1025,8 +1087,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 		//-----------------------------------------
 		
 		$this->cacheToDisk( $new_id );
-
-		$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages", $this->lang->words['l_copied'] );
+		$this->registry->class_localization->rebuildLanguagesCache();
+		
+		$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code, $this->lang->words['l_copied'] );
 	}
 	
 	/**
@@ -1069,7 +1132,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Delete from disk
 		//-----------------------------------------
 		
-		$this->registry->adminFunctions->removeDirectory( IPS_CACHE_PATH . 'cache/lang_cache/' . $id . '/' );
+		$classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . '/classFileManagement.php', 'classFileManagement' );
+		$fileManagement	= new $classToLoad();
+		$fileManagement->removeDirectory( IPS_CACHE_PATH . 'cache/lang_cache/' . $id . '/' );
 		
 		//-----------------------------------------
 		// Update member default choice
@@ -1078,22 +1143,17 @@ class admin_core_languages_manage_languages extends ipsCommand
 		$this->DB->update( 'members', array( 'language' => intval($default['lang_id']) ), "language={$id}" );
 		
 		//-----------------------------------------
-		// Update cache
+		// Update cache and redirect
 		//-----------------------------------------
 		
 		$this->registry->class_localization->rebuildLanguagesCache();
-		
-		//-----------------------------------------
-		// Redirect
-		//-----------------------------------------
-		
-		$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages", $this->lang->words['l_removed'] );
+		$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code, $this->lang->words['l_removed'] );
 	}
 	
 	/**
 	 * Revert a word pack entry to the default value
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function languageDoRevertWord()
 	{
@@ -1129,7 +1189,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Saves new language edits
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function languageEditWordPackValues()
 	{			
@@ -1170,14 +1230,14 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		$this->cacheToDisk( $id );
 
-		$this->registry->output->redirect( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=edit_word_pack&word_pack={$this->request['pack']}&id={$this->request['id']}&search={$this->request['search']}&filter={$this->request['filter']}&st={$this->request['st']}", $this->lang->words['language_word_pack_edited'] );
+		$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code . "&amp;do=edit_word_pack&amp;word_pack={$this->request['pack']}&amp;id={$this->request['id']}&amp;search={$this->request['search']}&amp;filter={$this->request['filter']}&amp;st={$this->request['st']}", $this->lang->words['language_word_pack_edited'] );
 	}
 		
 	/**
 	 * Handles the word entry form
 	 *
 	 * @param	string	$mode	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function handleWordEntryForm( $mode='add' )
 	{
@@ -1195,21 +1255,21 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		if( ! $this->request['word_pack_db'] )
 		{
-			$this->registry->output->global_message = $this->lang->words['l_packreq'];
+			$this->registry->output->global_error	= $this->lang->words['l_packreq'];
 			$this->languageWordEntryForm( $mode );
 			return;
 		}
 		
 		if( ! $this->request['word_key'] )
 		{
-			$this->registry->output->global_message = $this->lang->words['l_keyreq'];
+			$this->registry->output->global_error	= $this->lang->words['l_keyreq'];
 			$this->languageWordEntryForm( $mode );
 			return;
 		}
 		
 		if( ! $this->request['word_default'] )
 		{
-			$this->registry->output->global_message = $this->lang->words['l_textreq'];
+			$this->registry->output->global_error	= $this->lang->words['l_textreq'];
 			$this->languageWordEntryForm( $mode );
 			return;
 		}
@@ -1240,6 +1300,16 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		if( $mode == 'add' )
 		{
+			/* Check for a duplicate */
+			$_check	= $this->DB->buildAndFetch( array( 'select' => 'word_id', 'from' => 'core_sys_lang_words', 'where' => "lang_id={$lang_id} AND word_app='{$db_array['word_app']}' AND word_pack='{$db_array['word_pack']}' AND word_key='{$db_array['word_key']}'" ) );
+			
+			if( $_check['word_id'] )
+			{
+				$this->registry->output->global_error = $this->lang->words['l_textexistsalready'];
+				$this->languageWordEntryForm( $mode );
+				return;
+			}
+			
 			$this->DB->insert( 'core_sys_lang_words', $db_array );
 			
 			$text	= $this->lang->words['l_added'];
@@ -1264,7 +1334,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	 * Form for adding/editing a word entry
 	 *
 	 * @param	string	$mode	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function languageWordEntryForm( $mode='add' )
 	{
@@ -1306,10 +1376,10 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Set defaults
 		//-----------------------------------------
 		
-		$data['word_app']		= ( isset( $this->request['word_app'] )     && $this->request['word_app'] )     ? $this->request['word_app']     : $data['word_app'];
-		$data['word_pack']		= ( isset( $this->request['word_pack_db'] ) && $this->request['word_pack_db'] ) ? $this->request['word_pack_db'] : $data['word_pack'];
-		$data['word_key']		= ( isset( $this->request['word_key'] )     && $this->request['word_key'] )     ? $this->request['word_key']     : $data['word_key'];
-		$data['word_default']	= ( isset( $this->request['word_default'] ) && $this->request['word_default'] ) ? $this->request['word_default'] : $data['word_default'];
+		$data['word_app']		= !empty( $this->request['word_app'] )		? $this->request['word_app']		: $data['word_app'];
+		$data['word_pack']		= !empty( $this->request['word_pack_db'] )	? $this->request['word_pack_db']	: $data['word_pack'];
+		$data['word_key']		= !empty( $this->request['word_key'] )		? $this->request['word_key']		: $data['word_key'];
+		$data['word_default']	= !empty( $this->request['word_default'] )	? $this->request['word_default']	: $data['word_default'];
 
 		//-----------------------------------------
 		// Applications dropdown
@@ -1322,19 +1392,104 @@ class admin_core_languages_manage_languages extends ipsCommand
 			$_apps[] = array( $app, $appdata['app_title'] );
 		}
 		
-		$data['word_app'] = $this->registry->output->compileSelectOptions( $_apps, $data['word_app'] );
+		$data['word_app'] = $this->compileSelectOptions( $_apps, $data['word_app'] );
 		
 		//-----------------------------------------
 		// Output form
 		//-----------------------------------------
 		
 		$this->registry->output->html .= $this->html->languageWordEntryForm( $op, $word_id, $lang_id, $title, $header, $data, $button );
-	}	
+	}
 	
+	/**
+ 	 * Creates an option list for select tags
+	 *
+	 * @param	array	$options		Array of values/text for dropdown
+	 * @param	mixed	[$selected]		Selected value or array of selected values
+	 * @return	string
+	 */
+	public function compileSelectOptions( $options, $selected='' )
+	{
+		if( ! is_array( $selected ) )
+		{
+			$selected = array( $selected );
+		}
+
+		$html = '';
+		if( is_array( $options ) )
+		{
+			foreach( $options as $option )
+			{
+				$sel = ( $option[0] AND in_array( $option[0], $selected ) ) ? ' selected="selected"' : '';
+				$val = ( $option[0] == 'disabled'  ) ? 'disabled="disabled"' : "value='{$option[0]}'";
+
+				$html .= "<option {$val}{$sel}>{$option[1]}</option>";
+			}
+		}
+
+		return $html;
+	}
+	
+	/**
+ 	 * Adds the button and content to the tab list for this object
+	 *
+	 * @param	string	$button
+	 * @param	string	$content
+	 * @param	string	[$js_action]
+	 * @return	@e void
+	 */
+	public function addTab( $button, $content, $js_action='', $default_tab=0 )
+	{
+		$this->tab_buttons[]   = $button;
+		$this->tab_tabs[]      = $content;
+		$this->tab_js_action[] = $js_action;
+
+		if( $default_tab )
+		{
+			$this->default_tab = count( $this->tab_tabs ) - 1;
+		}
+	}
+	
+	/**
+ 	 * Builds the html for the tabbed area
+	 *
+	 * @return	string		Tab HTML
+	 */
+	public function buildTabs()
+	{
+		/* Buttons */
+		$i = 0;
+		$tabs = array();
+		foreach( $this->tab_buttons as $i => $button )
+		{
+			/* Tab Button */
+			$js    = ( $this->tab_js_action[$i] ) ? 'onmousedown="'.$this->tab_js_action[$i].'"' : '';
+			$class = ( $i == 0 ) ? 'mini_tab_on' : 'mini_tab_off';
+			$tabs[] = array( 'id' => $i, 'class' => $class, 'text' => $button, 'js' => $js );
+		}
+
+		/* Tab Contents */
+		$i = 0;
+		$content = array();
+		foreach( $this->tab_tabs as $tab )
+		{
+			/* Create the pane */
+			$content[] = array( 'id' => $i, 'content' => $tab );
+			$i++;
+		}
+
+		$default_tab = ( $this->default_tab ) ? $this->default_tab : '';
+
+		/* End of tab pane */
+		$tabs = $this->html->ui_content_tabs( $tabs, $content, $default_tab );
+
+		return $tabs;
+	}
+
 	/**
 	 * Edit the entries in a word pack
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function languageEditWordPack()
 	{	
@@ -1419,7 +1574,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * List the word packs available for the selected language set
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	Josh
 	 */
 	public function languageListWordPacks()
@@ -1449,10 +1604,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Some init before looping
 		//-----------------------------------------
 		
-		$_packs   = array();
-		$_missing = array();
-		$_stats   = array();
-		$_menus   = array();
+		$_packs		= array();
+		$_missing	= array();
+		$_stats		= array();
 
 		while( $r = $this->DB->fetch() )
 		{	
@@ -1476,11 +1630,6 @@ class admin_core_languages_manage_languages extends ipsCommand
 			if( ! in_array( $r['word_pack'], $_packs[$r['word_app']] ) )
 			{
 				$_packs[$r['word_app']][] = $r['word_pack'];
-				$_menus[$r['word_app']][$r['word_pack']] = $this->registry->output->buildJavascriptMenu( array(
-																						array( "{$this->settings['base_url']}{$this->form_code}&word_pack={$r['word_app']}/{$r['word_pack']}&do=edit_word_pack&id={$id}", $this->lang->words['edit'], 'edit' ),
-																						array( "{$this->settings['base_url']}{$this->form_code}&word_pack={$r['word_app']}/{$r['word_pack']}&do=add_word_entry&id={$id}&word_app={$r['word_app']}", "{$this->lang->words['l_addnew']}...", 'add' ),
-																						array( "{$this->settings['base_url']}{$this->form_code}&word_pack={$r['word_app']}/{$r['word_pack']}&do=remove_word_pack&id={$id}&word_app={$r['word_app']}", "{$this->lang->words['l_remove_pack']}...", 'delete' ),
-																				)	 );
 			}
 			
 			//-----------------------------------------
@@ -1515,7 +1664,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 				$default_tab = ( $app == $this->request['app'] ) ? 1 : 0;
 				asort($_packs[$app]);
 				
-				$this->registry->output->addTab( $data['app_title'], $this->html->languageAppPackList( $app, $_packs[$app], $_stats[$app], $_menus[$app] ), '', $default_tab );
+				$this->addTab( $data['app_title'], $this->html->languageAppPackList( $app, $_packs[$app], $_stats[$app] ), '', $default_tab );
 			}
 		}
 		
@@ -1523,14 +1672,14 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// And output
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->languageWordPackList( $id, $this->registry->output->buildTabs(), $data['app_title'] );
+		$this->registry->output->html .= $this->html->languageWordPackList( $id, $this->buildTabs(), $data['app_title'] );
 	}	
 	
 	/**
 	 * Handles the language information form submit
 	 *
 	 * @param	string	$mode	Either new or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function handleLanguageInformationForm( $mode='new' )
 	{
@@ -1597,9 +1746,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 			// Create directory
 			//-----------------------------------------
 			
-			@mkdir( IPS_CACHE_PATH . 'cache/lang_cache/' . $id, 0777 );
+			@mkdir( IPS_CACHE_PATH . 'cache/lang_cache/' . $id, IPS_FOLDER_PERMISSION );
 			@file_put_contents( IPS_CACHE_PATH . 'cache/lang_cache/' . $id . '/index.html', '' );
-			@chmod( IPS_CACHE_PATH . 'cache/lang_cache/' . $id, 0777 );
+			@chmod( IPS_CACHE_PATH . 'cache/lang_cache/' . $id, IPS_FOLDER_PERMISSION );
 			
 			//-----------------------------------------
 			// Copy over language bits from default lang
@@ -1665,7 +1814,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	 * Builds the language information form
 	 *
 	 * @param	string	$mode	new or edit
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function languageInformationForm( $mode='new' )
 	{
@@ -1706,10 +1855,10 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Set some defaults
 		//-----------------------------------------
 		
-		$data['lang_title']		= ( isset( $this->request['lang_title'] )   && $this->request['lang_title'] )   ? $this->request['lang_title']   : $data['lang_title'];
-		$data['lang_short']		= ( isset( $this->request['lang_short'] )   && $this->request['lang_short'] )   ? $this->request['lang_short']   : $data['lang_short'];
-		$data['lang_default']	= ( isset( $this->request['lang_default'] ) && $this->request['lang_default'] ) ? $this->request['lang_default'] : $data['lang_default'];
-		$data['lang_isrtl']		= ( isset( $this->request['lang_isrtl'] )   && $this->request['lang_isrtl'] )   ? $this->request['lang_isrtl']   : $data['lang_isrtl'];
+		$data['lang_title']		= !empty( $this->request['lang_title'] )	? $this->request['lang_title']   : $data['lang_title'];
+		$data['lang_short']		= !empty( $this->request['lang_short'] )	? $this->request['lang_short']   : $data['lang_short'];
+		$data['lang_default']	= !empty( $this->request['lang_default'] )	? $this->request['lang_default'] : $data['lang_default'];
+		$data['lang_isrtl']		= !empty( $this->request['lang_isrtl'] )	? $this->request['lang_isrtl']   : $data['lang_isrtl'];
 
 		$data['lang_default']	= $this->registry->output->formYesNo( 'lang_default', $data['lang_default'] );
 		$data['lang_isrtl']		= $this->registry->output->formYesNo( 'lang_isrtl', $data['lang_isrtl'] );
@@ -1725,13 +1874,13 @@ class admin_core_languages_manage_languages extends ipsCommand
 	/**
 	 * Lists currently installed languages
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function languagesList()
 	{
 		/* Do we have a valid translation session? */
 		$session      = $this->DB->buildandFetch( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='translate_session'" ) );
-		$sessionData  = ( strstr( $session['cs_value'], 'a:' ) ) ? unserialize( $session['cs_value'] ) : array();
+		$sessionData  = IPSLib::isSerialized($session['cs_value']) ? unserialize( $session['cs_value'] ) : array();
 		$hasTranslate = false;
 		
 		/* Check */
@@ -1765,58 +1914,48 @@ class admin_core_languages_manage_languages extends ipsCommand
 			$this->registry->class_localization->local_data = localeconv();
 			
 			$_menu = array();
-			
-			$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=edit_lang_info&id={$r['lang_id']}", $this->lang->words['edit'], 'edit' );
-			
+
 			if( $r['lang_protected'] && ! IN_DEV )
 			{
 				$_menu[] = array( "", $this->lang->words['lang_pack_protected'], 'edit' );
 			}
 			else
 			{
-				$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=list_word_packs&id={$r['lang_id']}", $this->lang->words['language_list_translate'], 'info' );
+				$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=list_word_packs&amp;id={$r['lang_id']}", $this->lang->words['language_list_translate'], 'info' );
 				
 				/* If we don't have a current session... */
 				if ( ! $hasTranslate )
 				{
-					$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=translateExtSplash&id={$r['lang_id']}", $this->lang->words['language_list_translate_ext'], 'info' );
-				}
-				
-				if( ! $r['lang_default'] )
-				{
-					$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=remove_language&id={$r['lang_id']}", $this->lang->words['delete'], 'delete', 1 );
+					$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=translateExtSplash&amp;id={$r['lang_id']}", $this->lang->words['language_list_translate_ext'], 'info' );
 				}
 			}
 			
-			$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=copy_lang_pack&id={$r['lang_id']}", $this->lang->words['language_list_copy'] );
-			$_menu[] = array( "{$this->settings['base_url']}&{$this->form_code}&do=recache_lang_pack&id={$r['lang_id']}", $this->lang->words['language_list_recache'] );
+			$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=copy_lang_pack&amp;id={$r['lang_id']}", $this->lang->words['language_list_copy'] );
 			
-			$_menu[] = array( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=export&id={$r['lang_id']}", $this->lang->words['l_xmlexportfull'] );
+			$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=export&amp;id={$r['lang_id']}", $this->lang->words['l_xmlexportfull'], 'export' );
 			
 			if ( $r['lang_id'] )
 			{
-				$_menu[] = array( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=rebuildFromXml&id={$r['lang_id']}&type=public", $this->lang->words['rebuild_lang_from_xml'] );
+				$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=rebuildFromXml&amp;id={$r['lang_id']}&amp;type=public", $this->lang->words['rebuild_lang_from_xml'] );
 			}
 			
 			foreach( ipsRegistry::$applications as $app_dir => $app_data )
 			{
-				$_menu[] = array( "{$this->settings['base_url']}&module=languages&section=manage_languages&do=export&id={$r['lang_id']}&app_dir={$app_dir}", $this->lang->words['l_xmlexport'] . $app_data['app_title'] );
+				$_menu[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=export&amp;id={$r['lang_id']}&amp;app_dir={$app_dir}", $this->lang->words['l_xmlexport'] . $app_data['app_title'], 'export' );
 			}
 
-			$menu = $this->registry->output->buildJavascriptMenu( $_menu );
-			
 			//-----------------------------------------
 			// Data for output
 			//-----------------------------------------
 			
-			$rows[] = array(
-								'title'		=> $r['lang_title'],
-								'local'		=> $r['lang_short'],
-								'date'		=> $this->registry->class_localization->getDate( time(), 'long', 1 ) . '<br />' . $this->registry->class_localization->getDate( time(), 'short', 1 ),
-								'money'		=> $this->registry->class_localization->formatMoney( '12345231.12', 0 ),
-								'default'	=> ( $r['lang_default'] ) ? "<img src='{$this->settings['skin_acp_url']}/_newimages/icons/tick.png' alt='{$this->lang->words['yes']}' />" : '',
-								'menu'		=> $menu,
-								'id'		=> $r['lang_id'],
+			$rows[] = array( 'title'	=> $r['lang_title'],
+							 'local'	=> $r['lang_short'],
+							 'date'		=> $this->registry->class_localization->getDate( time(), 'long', 1 ) . '<br />' . $this->registry->class_localization->getDate( time(), 'short', 1 ),
+							 'money'	=> $this->registry->class_localization->formatMoney( '12345231.12', 0 ),
+							 'default'	=> $r['lang_default'],
+							 'menu'		=> $_menu,
+							 'id'		=> $r['lang_id'],
+							 'protected'=> $r['lang_protected'],
 							);
 		}
 		
@@ -1839,7 +1978,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	 * Updates the cached language files from the database
 	 *
 	 * @param	integer	ID of the language pack to export
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function cacheToDisk( $lang_id )
 	{
@@ -1871,7 +2010,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		if( ! is_dir( IPS_CACHE_PATH . 'cache/lang_cache/' . $lang_id . '/' ) )
 		{
-			mkdir( IPS_CACHE_PATH . 'cache/lang_cache/' . $lang_id . '/', 0777 );
+			mkdir( IPS_CACHE_PATH . 'cache/lang_cache/' . $lang_id . '/', IPS_FOLDER_PERMISSION );
 		}
 
 		//-----------------------------------------
@@ -1904,6 +2043,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 					
 					foreach( $words as $word )
 					{
+						$word[1]	= str_replace( "\\", "\\\\", $word[1] );
 						$word[1]	= str_replace( '"', '\\"', $word[1] );
 						$to_write	.= "ipb.lang['{$word[0]}']	= \"{$word[1]}\";\n";
 					}					
@@ -1915,6 +2055,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 					
 					foreach( $words as $word )
 					{
+						$word[1]	= str_replace( "\\", "\\\\", $word[1] );
 						$word[1]	= str_replace( '"', '\\"', $word[1] );
 						$to_write	.= "ipb.lang['{$word[0]}']	= \"{$word[1]}\";\n";
 					}
@@ -1930,8 +2071,9 @@ class admin_core_languages_manage_languages extends ipsCommand
 					
 					foreach( $words as $word )
 					{
+						$word[1]	= str_replace( "\\", "\\\\", $word[1] );
 						$word[1]	= str_replace( '"', '\\"', $word[1] );
-						
+
 						//-----------------------------------------
 						// Protect swapped sprintf arguments
 						// @link	http://community.invisionpower.com/tracker/issue-22240-lang-strings-using-sprintf-argument-swapping/
@@ -1951,13 +2093,16 @@ class admin_core_languages_manage_languages extends ipsCommand
 				
 				$_dir = IPS_CACHE_PATH . 'cache/lang_cache/' . $lang_id . '/';
 				
-				@unlink( $_dir . $_file );
+				if( is_file($_dir . $_file) )
+				{
+					@unlink( $_dir . $_file );
+				}
 				
 				if ( $fh = @fopen( $_dir . $_file, 'wb' ) )
 				{
 					fwrite( $fh, $to_write, strlen( $to_write ) );
 					fclose( $fh );
-					@chmod( $_dir . $_file, 0777 );
+					@chmod( $_dir . $_file, IPS_FILE_PERMISSION );
 				}
 				else
 				{
@@ -2015,7 +2160,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 				return;
 			}
 			
-			if ( ! file_exists( $this->request['file_location'] ) )
+			if ( ! is_file( $this->request['file_location'] ) )
 			{
 				$this->registry->output->global_message = $this->lang->words['l_noopen'] . $this->request['file_location'];
 				$this->languagesList();
@@ -2045,7 +2190,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 			// Extract archive
 			//-----------------------------------------
 			
-			require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );
+			require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );/*noLibHook*/
 			$xmlarchive = new classXMLArchive();
 			
 			//-----------------------------------------
@@ -2121,7 +2266,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 			// Extract archive
 			//-----------------------------------------
 			
-			require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );
+			require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );/*noLibHook*/
 			$xmlarchive = new classXMLArchive();
 			
 			//-----------------------------------------
@@ -2176,7 +2321,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( $skip_charset ? 'utf-8' : IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -2227,7 +2372,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 				if( @mkdir( IPS_CACHE_PATH . '/cache/lang_cache/' . $insertId ) )
 				{
 					@file_put_contents( IPS_CACHE_PATH . 'cache/lang_cache/' . $insertId . '/index.html', '' );
-					@chmod( IPS_CACHE_PATH . '/cache/lang_cache/' . $insertId, 0777 );
+					@chmod( IPS_CACHE_PATH . '/cache/lang_cache/' . $insertId, IPS_FOLDER_PERMISSION );
 				}
 				
 				//-----------------------------------------
@@ -2308,6 +2453,8 @@ class admin_core_languages_manage_languages extends ipsCommand
 			
 			foreach( $lang_ids as $_lang_id )
 			{
+				$lang_entry	= array();
+				
 				//-----------------------------------------
 				// Build db array
 				//-----------------------------------------
@@ -2319,8 +2466,8 @@ class admin_core_languages_manage_languages extends ipsCommand
 									'word_key'				=> $lang['word_key'],
 									'word_default'			=> $lang['word_default'],
 									'word_custom'			=> $in_dev && !$ru ? '' : $lang['word_custom'],
-									'word_js'				=> $lang['word_js'],
-									'word_default_version'	=> ( $lang['word_default_version'] >= 30000 ) ? $lang['word_default_version'] : $LATESTVERSION['long'],
+									'word_js'				=> intval($lang['word_js']),
+									'word_default_version'	=> $lang['word_default_version'] ? $lang['word_default_version'] : $LATESTVERSION['long'],
 									'word_custom_version'	=> $lang['word_custom_version'],
 								);	
 
@@ -2389,7 +2536,10 @@ class admin_core_languages_manage_languages extends ipsCommand
 					// Don't update default version
 					//-----------------------------------------
 					
-					unset( $db_array['word_default_version'] );
+					// This causes no languages to show "out of date" on upgrade
+					// @link	http://community.invisionpower.com/tracker/issue-31637-no-out-of-date-entries-for-language-string-updates
+					// This WAS added to fix a previously reported bug, however, so need to watch out for this
+					// unset( $db_array['word_default_version'] );
 					
 					$counts['updates']++;
 					$this->DB->update( 'core_sys_lang_words', $db_array, "word_id={$lang_entry['word_id']}" );
@@ -2513,7 +2663,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		// Create the XML library
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->newXMLDocument();
 		$xml->addElement( 'languageexport' );
@@ -2553,16 +2703,35 @@ class admin_core_languages_manage_languages extends ipsCommand
 			$content = array();
 			$_strings++;
 			
-			$content = array( 
-							'word_app'				=> $r['word_app'],
-							'word_pack'				=> $r['word_pack'],
-							'word_key'				=> $r['word_key'],
-							'word_default'			=> $r['word_default'],
-							'word_custom'			=> $r['word_custom'],
-							'word_default_version'	=> ( $r['word_default_version'] >= 30000 ) ? $r['word_default_version'] : $LATESTVERSION['long'],
-							'word_custom_version'	=> $r['word_custom_version'],
-							'word_js'				=> $r['word_js']
-						);
+			if( $disk )
+			{
+				$content = array( 
+								'word_app'				=> $r['word_app'],
+								'word_pack'				=> $r['word_pack'],
+								'word_key'				=> $r['word_key'],
+								'word_default'			=> $r['word_default'],
+								//'word_default_version'	=> ( $r['word_default_version'] >= 30000 ) ? $r['word_default_version'] : $LATESTVERSION['long'],
+								//'word_js'				=> $r['word_js']
+							);
+
+				if( $r['word_js'] )
+				{
+					$content['word_js']	= $r['word_js'];
+				}
+			}
+			else
+			{
+				$content = array( 
+								'word_app'				=> $r['word_app'],
+								'word_pack'				=> $r['word_pack'],
+								'word_key'				=> $r['word_key'],
+								'word_default'			=> $r['word_default'],
+								'word_custom'			=> $r['word_custom'],
+								'word_default_version'	=> ( $r['word_default_version'] >= 30000 ) ? $r['word_default_version'] : $LATESTVERSION['long'],
+								'word_custom_version'	=> $r['word_custom_version'],
+								'word_js'				=> $r['word_js']
+							);
+			}
 
 			$xml->addElementAsRecord( 'languagegroup', 'lang', $content );
 		}
@@ -2601,7 +2770,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 			// Create xml archive
 			//-----------------------------------------
 			
-			require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+			require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 			$xmlArchive = new classXMLArchive();
 			
 			//-----------------------------------------
@@ -2623,7 +2792,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 	 * Builds the language db entries from cache
 	 *
 	 * @param	boolean			return as normal
-	 * @return	void
+	 * @return	@e void
 	 * @author	Josh
 	 */
 	public function importFromCacheFiles( $returnAsNormal=TRUE )
@@ -2701,7 +2870,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 								fclose( $stdout );
 							}
 							
-							require( $_dir . $f );
+							require( $_dir . $f );/*noLibHook*/
 						
 							//-----------------------------------------
 							// Loop
@@ -2724,7 +2893,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 								$this->DB->insert( 'core_sys_lang_words', $insert );
 							}
 							
-							$msg[] = "Imported {$f} ({$inserted} added, {$updated} updated)...";
+							$msg[] = sprintf( $this->lang->words['indev_lang_import'], $f, $inserted, $updated );
 						}
 						else if( preg_match( '/(\.js)$/', $f ) AND $app == 'core' )
 						{
@@ -2802,7 +2971,7 @@ class admin_core_languages_manage_languages extends ipsCommand
 		
 		if ( $returnAsNormal === TRUE )
 		{
-			$this->registry->output->global_message	= implode( "<br />", $msg );
+			$this->registry->output->setMessage( implode( "<br />", $msg ), true );
 		
 			if ( ! $this->__daily )
 			{
diff --git a/upload/admin/applications/core/modules_admin/languages/xml/index.html b/upload/admin/applications/core/modules_admin/languages/xml/index.html
index f093152b..d644dd98 100644
--- a/upload/admin/applications/core/modules_admin/languages/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/languages/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/languages/xml/menu.xml b/upload/admin/applications/core/modules_admin/languages/xml/menu.xml
index b4705197..94158fd4 100644
--- a/upload/admin/applications/core/modules_admin/languages/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/languages/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Языки �и�темы</subitemtitle>
+					<subitemlang>languages</subitemlang>
 					<subsection>manage_languages</subsection>
 					<subitemurl></subitemurl>
 					<subisredirect>0</subisredirect>
diff --git a/upload/admin/applications/core/modules_admin/languages/xml/permissions.xml b/upload/admin/applications/core/modules_admin/languages/xml/permissions.xml
index 669bd2fa..8584058e 100644
--- a/upload/admin/applications/core/modules_admin/languages/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/languages/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление �зыками</grouptitle>
+		<grouplang>core_languages</grouplang>
 		<items>
 			<item>
 				<key>lang_words</key>
diff --git a/upload/admin/applications/core/modules_admin/login/index.html b/upload/admin/applications/core/modules_admin/login/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/login/index.html
+++ b/upload/admin/applications/core/modules_admin/login/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/login/manualResolver.php b/upload/admin/applications/core/modules_admin/login/manualResolver.php
index 1815dc62..e6048ea4 100644
--- a/upload/admin/applications/core/modules_admin/login/manualResolver.php
+++ b/upload/admin/applications/core/modules_admin/login/manualResolver.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP Login/Logout Routines
- * Last Updated: $Date: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 17th August 2004
- * @version		$Revision: 6990 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -57,7 +57,7 @@ class admin_core_login_manualResolver extends ipsCommand
 	/**
 	 * Initiate login handler
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initHanLogin()
 	{
@@ -73,7 +73,7 @@ class admin_core_login_manualResolver extends ipsCommand
 	 *
 	 * @param	object		Registry reference
 	 * @param	string		Validation message
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry, $validationMessage='' )
 	{
@@ -114,7 +114,7 @@ class admin_core_login_manualResolver extends ipsCommand
 	/**
 	 * Check and verify the login was successful
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loginComplete()
 	{
@@ -216,6 +216,7 @@ class admin_core_login_manualResolver extends ipsCommand
 				$extra_query = str_replace(  "/admin"											, "" , $extra_query );
 				$extra_query = str_replace( '&amp;'												, '&', $extra_query );
 				$extra_query = preg_replace( "#&{1,}#"											, "&", $extra_query );
+				$extra_query = preg_replace( "#messageinabottleacp=(.*?)$#"						, "" , $extra_query );
 			}
 			
 			//-----------------------------------------
@@ -242,7 +243,7 @@ class admin_core_login_manualResolver extends ipsCommand
 																	'session_url'               => '',
 														  )        );
 					
-			$this->request[ 'adsess'] =  $sess_id ;
+			$this->request['adsess'] = $sess_id;
 
 			//-----------------------------------------
 			// Redirect...
@@ -252,14 +253,15 @@ class admin_core_login_manualResolver extends ipsCommand
 		
 			$this->_writeToLog( $this->request['username'], 'ok' );
 			
-			ipsRegistry::getClass('output')->redirect( $url, $this->lang->words['login_successful'] );
+			ipsRegistry::getClass('output')->global_message	= '';
+			ipsRegistry::getClass('output')->silentRedirect( $url );
 		}
 	}
 	
 	/**
 	 * Log the user out
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loginOut()
 	{
@@ -280,7 +282,7 @@ class admin_core_login_manualResolver extends ipsCommand
 	 * Log the user out
 	 *
 	 * @param	string		Message to show on the form
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loginForm( $message='' )
 	{
@@ -347,9 +349,9 @@ class admin_core_login_manualResolver extends ipsCommand
 			$this->lang->words['gl_signinname']	= $this->lang->words['enter_username'];
 		}
 
-		ipsRegistry::getClass('output')->html_title = $this->lang->words['ipb_login'];
-		ipsRegistry::getClass('output')->html_main  = str_replace( '<%CONTENT%>', ipsRegistry::getClass('output')->global_template->log_in_form( $qs, $message, $replace == 'replace' ? true : false, $data ), ipsRegistry::getClass('output')->global_template->global_main_wrapper_no_furniture() );
-		ipsRegistry::getClass('output')->html_main  = str_replace( '<%TITLE%>'  , ipsRegistry::getClass('output')->html_title, ipsRegistry::getClass('output')->html_main );
+		ipsRegistry::getClass('output')->html_title	= $this->lang->words['ipb_login'];
+		ipsRegistry::getClass('output')->html_main	= ipsRegistry::getClass('output')->global_template->log_in_form( $qs, $message, $replace == 'replace' ? true : false, $data );
+		ipsRegistry::getClass('output')->html_main	= str_replace( '<%TITLE%>'  , ipsRegistry::getClass('output')->html_title, ipsRegistry::getClass('output')->html_main );
 			
 		@header("Content-type: text/html");
 		print ipsRegistry::getClass('output')->html_main;
@@ -361,7 +363,8 @@ class admin_core_login_manualResolver extends ipsCommand
 	 *
 	 * @param	string		Username
 	 * @param	string		ok/fail flag
-	 * @return	void
+	 * @return	@e void
+	 * @note	This is private so that a hacker couldn't get into ACP, upload a new hook that lets them clear the log, and then clear the login log
 	 */
 	private function _writeToLog( $username='', $flag='fail' )
 	{
diff --git a/upload/admin/applications/core/modules_admin/logs/adminlogs.php b/upload/admin/applications/core/modules_admin/logs/adminlogs.php
index a867c787..535741b4 100644
--- a/upload/admin/applications/core/modules_admin/logs/adminlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/adminlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin logs
- * Last Updated: $LastChangedDate: 2010-06-15 21:25:19 -0400 (Tue, 15 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-06-01 22:13:27 -0400 (Wed, 01 Jun 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6539 $
+ * @version		$Rev: 8938 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -26,18 +26,9 @@ if ( ! defined( 'IN_ACP' ) )
 
 class admin_core_logs_adminlogs extends ipsCommand 
 {
-	/**
-	 * Generate some pretty colors for the logs
-	 *
-	 * @access	protected
-	 * @var		array			Different colors for different actions
-	 */
-	protected $colours			= array();
-	
 	/**
 	 * Skin object
 	 *
-	 * @access	protected
 	 * @var		object			Skin templates
 	 */
 	protected $html;
@@ -45,9 +36,8 @@ class admin_core_logs_adminlogs extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -79,22 +69,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=tools', $this->lang->words['nav_toolsmodule'] );
 		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=tools&section=logsSplash', $this->lang->words['nav_logssplash'] );
 		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=logs&section=adminlogs', $this->lang->words['alog_adminlogs'] );
-		
-		//-----------------------------------------
-		// Add some colors from the paintbucket
-		//-----------------------------------------
-		
-		$this->colours  = array(
-								"cat"		=> "green",
-								"forum"		=> "darkgreen",
-								"mem"		=> "red",
-								'group'		=> "purple",
-								'mod'		=> 'orange',
-								'op'		=> 'darkred',
-								'help'		=> 'darkorange',
-								'modlog'	=> 'steelblue',
-				   			   );
-		
+
 		///----------------------------------------
 		// What to do...
 		//-----------------------------------------
@@ -125,8 +100,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 	/**
 	 * View all logs for a given admin
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _view()
 	{
@@ -134,7 +108,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 		// Basic init
 		//-----------------------------------------
 		
-		$start = intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
+		$start	= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
 
 		///----------------------------------------
 		// No mid or search string?
@@ -147,17 +121,17 @@ class admin_core_logs_adminlogs extends ipsCommand
 			return;
 		}
 		
+		$this->request['mid']	= $this->request['mid'] == 'zero' ? 0 : $this->request['mid'];
+		
 		///----------------------------------------
 		// mid?
 		//-----------------------------------------
 		
 		if ( !$this->request['search_string'] )
 		{
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(id) as count', 'from' => 'admin_logs', 'where' => "member_id=" . intval($this->request['mid']) ) );
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(id) as count', 'from' => 'admin_logs', 'where' => "member_id=" . intval($this->request['mid']) ) );
 
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;mid=" . $this->request['mid'] . "&amp;do=view";
+			$query	= "{$this->form_code}&amp;mid=" . ( $this->request['mid'] ? $this->request['mid'] : 'zero' ) . "&amp;do=view";
 			
 			$this->DB->build( array( 'select'		=> 'm.*',
 											'from'		=> array( 'admin_logs' => 'm' ),
@@ -165,7 +139,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 											'order'		=> 'm.ctime DESC',
 											'limit'		=> array( $start, 20 ),
 											'add_join'	=> array(
-																array( 'select'	=> 'mem.member_id, mem.members_display_name',
+																array( 'select'	=> 'mem.members_display_name',
 																		'from'	=> array( 'members' => 'mem' ),
 																		'where'	=> 'mem.member_id=m.member_id',
 																		'type'	=> 'left'
@@ -181,7 +155,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 		
 		else
 		{
-			$this->request[ 'search_string'] = IPSText::parseCleanValue( urldecode($this->request['search_string'] ) );
+			$this->request['search_string'] = IPSText::parseCleanValue( urldecode($this->request['search_string'] ) );
 			
 			if( !$this->DB->checkForField( $this->request['search_type'], 'admin_logs' ) )
 			{
@@ -197,11 +171,9 @@ class admin_core_logs_adminlogs extends ipsCommand
 				$dbq = "m." . $this->request['search_type'] . " LIKE '%" . $this->request['search_string'] . "%'";
 			}
 			
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(m.member_id) as count', 'from' => 'admin_logs m', 'where' => $dbq ) );
-			
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=" . urlencode($this->request['search_string']);
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(m.member_id) as count', 'from' => 'admin_logs m', 'where' => $dbq ) );
+
+			$query	= "{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=" . urlencode($this->request['search_string']);
 			
 			$this->DB->build( array( 'select'		=> 'm.*',
 											'from'		=> array( 'admin_logs' => 'm' ),
@@ -209,7 +181,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 											'order'		=> 'm.ctime DESC',
 											'limit'		=> array( $start, 20 ),
 											'add_join'	=> array(
-																array( 'select'	=> 'mem.member_id, mem.members_display_name',
+																array( 'select'	=> 'mem.members_display_name',
 																		'from'	=> array( 'members' => 'mem' ),
 																		'where'	=> 'mem.member_id=m.member_id',
 																		'type'	=> 'left'
@@ -223,7 +195,7 @@ class admin_core_logs_adminlogs extends ipsCommand
 		// Page links
 		//-----------------------------------------
 		
-		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row_count,
+		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row['count'],
 																	 'itemsPerPage'			=> 20,
 																	 'currentStartValue'	=> $start,
 																	 'baseUrl'				=> $this->settings['base_url'] . $query,
@@ -236,9 +208,17 @@ class admin_core_logs_adminlogs extends ipsCommand
 		
 		while ( $row = $this->DB->fetch() )
 		{
-			$row['_time']	= $this->registry->class_localization->getDate( $row['ctime'], 'LONG' );
-			$row['color']	= $this->colours[ $row['act'] ];
+			if( !$row['member_id'] )
+			{
+				$row['member_id']	= 'zero';
+			}
+			
+			if( !$row['members_display_name'] )
+			{
+				$row['members_display_name']	= $this->lang->words['noname_availabl'];
+			}
 
+			$row['_time']	= $this->registry->class_localization->getDate( $row['ctime'], 'LONG' );
 			$rows[]			= $row;
 		}
 
@@ -247,32 +227,31 @@ class admin_core_logs_adminlogs extends ipsCommand
 		//-----------------------------------------
 		
 		$this->registry->output->html .= $this->html->adminlogsView( $rows, $links );
-
 	}
 	
 	/**
 	 * Remove logs by an admin
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _remove()
 	{
-		if ( $this->request['mid'] == "" )
+		if ( !$this->request['mid'] )
 		{
 			$this->registry->output->showError( $this->lang->words['alog_whoselog'], 11114 );
 		}
 		
+		$this->request['mid']	= $this->request['mid'] == 'zero' ? 0 : $this->request['mid'];
+		
 		$this->DB->delete( 'admin_logs', "member_id=" . intval($this->request['mid']) );
 		
-		$this->registry->output->silentRedirect( $this->settings['base_url']."&{$this->form_code}" );
+		$this->registry->output->silentRedirect( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	/**
 	 * List the current logs with links to view per-admin
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _listCurrent()
 	{
@@ -284,24 +263,22 @@ class admin_core_logs_adminlogs extends ipsCommand
 		//-----------------------------------------
 		
 		$this->DB->build( array( 'select'		=> 'm.*',
-										'from'		=> array( 'admin_logs' => 'm' ),
-										'order'		=> 'm.ctime DESC',
-										'limit'		=> array( 5 ),
-										'add_join'	=> array(
-															array( 'select'	=> 'mem.member_id, mem.members_display_name',
-																	'from'	=> array( 'members' => 'mem' ),
-																	'where'	=> 'mem.member_id=m.member_id',
-																	'type'	=> 'left'
-																)
+									'from'		=> array( 'admin_logs' => 'm' ),
+									'order'		=> 'm.ctime DESC',
+									'limit'		=> array( 5 ),
+									'add_join'	=> array(
+														array( 'select'	=> 'mem.members_display_name',
+																'from'	=> array( 'members' => 'mem' ),
+																'where'	=> 'mem.member_id=m.member_id',
+																'type'	=> 'left'
 															)
+														)
 							)		);
 		$this->DB->execute();
 
 		while ( $row = $this->DB->fetch() )
 		{
 			$row['_time']	= $this->registry->class_localization->getDate( $row['ctime'], 'LONG' );
-			$row['color']	= $this->colours[ $row['act'] ];
-
 			$rows[]			= $row;
 		}
 
@@ -310,34 +287,34 @@ class admin_core_logs_adminlogs extends ipsCommand
 		//-----------------------------------------
 		
 		$this->DB->build( array( 
-			'select'	=> 'member_id, count(member_id) as act_count',
-			'from'		=> 'admin_logs',
-			'group'		=> 'member_id',
-			'order'		=> 'act_count DESC'
-		) );
-		
+							'select'	=> 'count(l.member_id) as act_count, l.member_id',
+							'from'		=> array( 'admin_logs' => 'l' ),
+							'group'		=> 'l.member_id',
+							'order'		=> 'act_count DESC',
+							'add_join'	=> array(
+												array(
+													'select'	=> 'm.members_display_name',
+													'from'		=> array( 'members' => 'm' ),
+													'where'		=> 'm.member_id=l.member_id',
+													'type'		=> 'left',
+													),
+												),
+						)		);
 		$this->DB->execute();
-        
-        $_members = array();
-        $_store = array();
-        while ( $r = $this->DB->fetch() )
-        {
-			$_members[] = $r['member_id'];
-			$admins[ $r['member_id'] ] = $r;
-        }
-        
-		if ( !empty( $_members ) )
+
+		while ( $r = $this->DB->fetch() )
 		{
-			$this->DB->build( array( 'select'	=> 'member_id, members_display_name',
-									'from'		=> 'members',
-									'where'     => 'member_id IN (' . implode( ',', $_members ) . ')',
-								)		);
-			$this->DB->execute();
-			
-			while ( $r = $this->DB->fetch() )
+			if( !$r['member_id'] )
 			{
-				$admins[ $r['member_id'] ] = array_merge( $r, $admins[ $r['member_id'] ] );
+				$r['member_id']	= 'zero';
 			}
+			
+			if( !$r['members_display_name'] )
+			{
+				$r['members_display_name']	= $this->lang->words['noname_availabl'];
+			}
+
+			$admins[ $r['member_id'] ] = $r;
 		}
 
 		//-----------------------------------------
diff --git a/upload/admin/applications/core/modules_admin/logs/defaultSection.php b/upload/admin/applications/core/modules_admin/logs/defaultSection.php
index 11bd6227..00e35710 100644
--- a/upload/admin/applications/core/modules_admin/logs/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/logs/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default logs section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'logs' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'adminlogs';
diff --git a/upload/admin/applications/core/modules_admin/logs/emailerrorlogs.php b/upload/admin/applications/core/modules_admin/logs/emailerrorlogs.php
index f9e70ac2..52af9b14 100644
--- a/upload/admin/applications/core/modules_admin/logs/emailerrorlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/emailerrorlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Email error logs
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,17 +29,15 @@ class admin_core_logs_emailerrorlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -103,10 +101,9 @@ class admin_core_logs_emailerrorlogs extends ipsCommand
 	/**
 	 * Remove email logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _remove()
+	protected function _remove()
 	{
 		if ( $this->request['type'] == 'all' )
 		{
@@ -147,10 +144,9 @@ class admin_core_logs_emailerrorlogs extends ipsCommand
 	/**
 	 * List the current logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _listCurrent()
+	protected function _listCurrent()
 	{
 		$start = intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
 		
@@ -163,8 +159,6 @@ class admin_core_logs_emailerrorlogs extends ipsCommand
 		
 		if ( $this->request['type'] AND $this->request['type'] != "" )
 		{
-			$this->registry->output->html_help_title .= $this->lang->words['erlog_results'];
-		
 			$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
 			
 			if ( $string == "" )
@@ -245,12 +239,11 @@ class admin_core_logs_emailerrorlogs extends ipsCommand
 	/**
 	 * View an individual email
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _viewEmail()
+	protected function _viewEmail()
 	{
-		if ( $this->request['id'] == "" )
+		if ( !$this->request['id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['erlog_404'], 11117 );
 		}
diff --git a/upload/admin/applications/core/modules_admin/logs/emaillogs.php b/upload/admin/applications/core/modules_admin/logs/emaillogs.php
deleted file mode 100644
index 2020a1db..00000000
--- a/upload/admin/applications/core/modules_admin/logs/emaillogs.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Email logs
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
- */
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class admin_core_logs_emaillogs extends ipsCommand 
-{
-	/**
-	 * Skin object
-	 *
-	 * @access	private
-	 * @var		object			Skin templates
-	 */
-	private $html;
-
-	/**
-	 * Main class entry point
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		//-----------------------------------------
-		// Load skin
-		//-----------------------------------------
-		
-		$this->html			= $this->registry->output->loadTemplate('cp_skin_emaillogs');
-		
-		//-----------------------------------------
-		// Set up stuff
-		//-----------------------------------------
-		
-		$this->form_code	= $this->html->form_code	= 'module=logs&amp;section=emaillogs';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=logs&section=emaillogs';
-		
-		//-----------------------------------------
-		// Load lang
-		//-----------------------------------------
-				
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_logs' ) );
-
-		//-----------------------------------------
-		// Fix up navigation bar
-		//-----------------------------------------
-		
-		$this->registry->output->core_nav		= array();
-		$this->registry->output->ignoreCoreNav	= true;
-		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=tools', $this->lang->words['nav_toolsmodule'] );
-		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=tools&section=logsSplash', $this->lang->words['nav_logssplash'] );
-		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=logs&section=emaillogs', $this->lang->words['elog_emaillogs'] );
-		
-		///----------------------------------------
-		// What to do...
-		//-----------------------------------------
-		
-		switch( $this->request['do'] )
-		{
-			default:
-			case 'list':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'emaillogs_view' );
-				$this->_listCurrent();
-			break;
-				
-			case 'remove':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'emaillogs_delete' );
-				$this->_remove();
-			break;
-				
-		    case 'viewemail':
-		    	$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'emaillogs_view' );
-		    	$this->_viewEmail();
-		    break;
-		}
-		
-		/* Output */
-		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
-		$this->registry->output->sendOutput();	
-	}
-	
-	/**
-	 * Remove email logs
-	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _remove()
-	{
-		if ( $this->request['type'] == 'all' )
-		{
-			$this->DB->delete( 'email_logs' );
-		}
-		else
-		{
-			$ids = array();
-		
-			foreach ( $this->request as $k => $v )
-			{
-				if ( preg_match( "/^id_(\d+)$/", $k, $match ) )
-				{
-					if ($this->request[  $match[0] ] )
-					{
-						$ids[] = $match[1];
-					}
-				}
-			}
-
-			$ids = IPSLib::cleanIntArray( $ids );
-			
-			//-----------------------------------------
-			
-			if ( count($ids) < 1 )
-			{
-				$this->registry->output->showError( $this->lang->words['elog_noneselected'], 11119 );
-			}
-			
-			$this->DB->delete( 'email_logs', "email_id IN (" . implode( ',', $ids ) . ")" );
-		}
-		
-		$this->registry->getClass('adminFunctions')->saveAdminLog( $this->lang->words['elog_removed'] );
-		
-		$this->registry->output->silentRedirect( $this->settings['base_url']."&{$this->form_code}" );
-	}
-	
-	/**
-	 * List the current logs
-	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _listCurrent()
-	{
-		$start = intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
-
-		//-----------------------------------------
-		// Check URL parameters
-		//-----------------------------------------
-		
-		$url_query	= array();
-		$db_query	= array();
-		
-		if ( $this->request['type'] AND $this->request['type'] != "" )
-		{
-			$this->registry->output->html_help_title .= $this->lang->words['elog_results'];
-
-			switch( $this->request['type'] )
-			{
-				case 'fromid':
-					$url_query[]	= 'type=fromid';
-					$url_query[]	= 'id=' . intval($this->request['id']);
-					$db_query[]		= 'email.from_member_id=' . intval($this->request['id']);
-				break;
-
-				case 'toid':
-					$url_query[]	= 'type=toid';
-					$url_query[]	= 'id=' . intval($this->request['id']);
-					$db_query[]		= 'email.to_member_id=' . intval($this->request['id']);
-				break;
-
-				case 'subject':
-					$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
-
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11120 );
-					}
-
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-					$db_query[]		= $this->request['match'] == 'loose' ? "email.email_subject LIKE '%{$string}%'" : "email.email_subject='{$string}'";
-				break;
-
-				case 'content':
-					$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
-					
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11121 );
-					}
-					
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-					$db_query[]		= $this->request['match'] == 'loose' ? "email.email_content LIKE '%{$string}%'" : "email.email_content='{$string}'";
-				break;
-
-				case 'email_from':
-					$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
-					
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11122 );
-					}
-					
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-					$db_query[]		= $this->request['match'] == 'loose' ? "email.from_email_address LIKE '%{$string}%'" : "email.from_email_address='{$string}'";
-				break;
-
-				case 'email_to':
-					$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
-					
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11123 );
-					}
-					
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-					$db_query[]		= $this->request['match'] == 'loose' ? "email.to_email_address LIKE '%{$string}%'" : "email.to_email_address='{$string}'";
-				break;
-
-				case 'name_from':
-					$string = IPSText::parseCleanValue( urldecode($this->request['string']) );
-
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11124 );
-					}
-
-					if ( $this->request['match'] == 'loose' )
-					{
-						$this->DB->build( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_display_name LIKE '%{$string}%'" ) );
-						$this->DB->execute();
-
-						if ( ! $this->DB->getTotalRows() )
-						{
-							$this->registry->output->showError( $this->lang->words['elog_nomatches'], 111160 );
-						}
-						
-						$ids = array();
-						
-						while ( $r = $this->DB->fetch() )
-						{
-							$ids[] = $r['member_id'];
-						}
-						
-						$db_query[] = 'email.from_member_id IN(' . implode( ',', $ids ) . ')';
-					}
-					else
-					{
-						$r = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_display_name='{$string}'" ) );
-
-						if ( ! $r['member_id'] )
-						{
-							$this->registry->output->showError( $this->lang->words['elog_nomatches'], 11125 );
-						}
-
-						$db_query[] = 'email.from_member_id=' . $r['member_id'];
-					}
-					
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-				break;
-
-				case 'name_to':
-					$string = urldecode($this->request['string']);
-					
-					if ( $string == "" )
-					{
-						$this->registry->output->showError( $this->lang->words['elog_notsearched'], 11126 );
-					}
-
-					if ( $this->request['match'] == 'loose' )
-					{
-						$this->DB->build( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_display_name LIKE '%{$string}%'" ) );
-						$this->DB->execute();
-						
-						if ( ! $this->DB->getTotalRows() )
-						{
-							$this->registry->output->showError( $this->lang->words['elog_nomatches'], 11127 );
-						}
-
-						$ids = array();
-						
-						while ( $r = $this->DB->fetch() )
-						{
-							$ids[] = $r['member_id'];
-						}
-						
-						$db_query[] = 'email.to_member_id IN(' . implode( ',', $ids ) . ')';
-					}
-					else
-					{
-						$r = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_display_name='{$string}'" ) );
-
-						if ( ! $r['member_id'] )
-						{
-							$this->registry->output->showError( $this->lang->words['elog_nomatches'], 11128 );
-						}
-						
-						$db_query[] = 'email.to_member_id=' . $r['member_id'];
-					}
-					
-					$url_query[]	= 'type=' . $this->request['type'];
-					$url_query[]	= 'string=' . urlencode($string);
-				break;
-			}
-		}
-		
-		if( $this->request['match'] )
-		{
-			$url_query[]	= 'match=' . $this->request['match'];
-		}
-		
-		//-----------------------------------------
-		// LIST 'EM
-		//-----------------------------------------
-		
-		$dbe	= "";
-		$url	= "";
-		
-		if ( count($db_query) > 0 )
-		{
-			$dbe = implode(' AND ', $db_query );
-		}
-		
-		if ( count($url_query) > 0 )
-		{
-			$url = '&amp;' . implode( '&amp;', $url_query );
-		}
-		
-		$count = $this->DB->buildAndFetch( array( 'select'	=> 'count(email.email_id) as cnt',
-														'from'	=> 'email_logs email',
-														'where'	=> $dbe ) );
-
-		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $count['cnt'],
-																		'itemsPerPage'		=> 25,
-																		'currentStartValue'	=> $start,
-																		'baseUrl'			=> $this->settings['base_url'] . "&{$this->form_code}" . $url,
-														)
-												 );
-
-		$this->DB->build( array( 'select'		=> 'email.*',
-										'from'		=> array( 'email_logs' => 'email' ),
-										'where'		=> $dbe,
-										'order'		=> 'email.email_date DESC',
-										'limit'		=> array( $start, 25 ),
-										'add_join'	=> array(
-															array( 'select'	=> 'm.member_id, m.members_display_name',
-																	'from'	=> array( 'members' => 'm' ),
-																	'where'	=> 'm.member_id=email.from_member_id',
-																	'type'	=> 'left'
-																),
-															array( 'select'	=> 'mem.member_id as to_id, mem.members_display_name as to_name',
-																	'from'	=> array( 'members' => 'mem' ),
-																	'where'	=> 'mem.member_id=email.to_member_id',
-																	'type'	=> 'left'
-																),
-															)
-							)		);
-		$this->DB->execute();
-
-		while ( $row = $this->DB->fetch() )
-		{
-			$row['_date']	= $this->registry->class_localization->getDate( $row['email_date'], 'SHORT' );
-			
-			$rows[]			= $row;
-		}
-
-		$this->registry->output->html .= $this->html->emaillogsWrapper( $rows, $links );
-	}
-	
-	/**
-	 * View a single email
-	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _viewEmail()
-	{
-		if ( $this->request['id'] == "" )
-		{
-			$this->registry->output->showError( $this->lang->words['elog_log_404'], 11129 );
-		}
-		
-		$id = intval($this->request['id']);
-		
-		$row = $this->DB->buildAndFetch( array( 'select'		=> 'email.*',
-														'from'		=> array( 'email_logs' => 'email' ),
-														'where'		=> 'email.email_id=' . $id,
-														'add_join'	=> array(
-																			array( 'select'	=> 'm.member_id, m.members_display_name as name',
-																					'from'	=> array( 'members' => 'm' ),
-																					'where'	=> 'm.member_id=email.from_member_id',
-																					'type'	=> 'left'
-																				),
-																			array( 'select'	=> 'mem.member_id as to_id, mem.members_display_name as to_name',
-																					'from'	=> array( 'members' => 'mem' ),
-																					'where'	=> 'mem.member_id=email.to_member_id',
-																					'type'	=> 'left'
-																				),
-																			)
-											)		);
-
-		if ( ! $row['email_id'] )
-		{
-			$this->registry->output->showError( $this->lang->words['elog_log_404'], 11130 );
-		}
-		
-		$row['_date']			= $this->registry->class_localization->getDate( $row['email_date'], 'LONG' );
-		
-		$this->registry->output->html .= $this->html->emaillogsEmail( $row );
-		
-		$this->registry->output->printPopupWindow();
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/errorlogs.php b/upload/admin/applications/core/modules_admin/logs/errorlogs.php
index 2fdec191..78eade12 100644
--- a/upload/admin/applications/core/modules_admin/logs/errorlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/errorlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Error logs
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,17 +29,15 @@ class admin_core_logs_errorlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -98,10 +96,9 @@ class admin_core_logs_errorlogs extends ipsCommand
 	/**
 	 * Remove email logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _remove()
+	protected function _remove()
 	{
 		if( $this->request['type'] == 'all' )
 		{
@@ -142,10 +139,9 @@ class admin_core_logs_errorlogs extends ipsCommand
 	/**
 	 * List the current logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _listCurrent()
+	protected function _listCurrent()
 	{
 		$start = intval( $this->request['st'] ) >= 0 ? intval( $this->request['st'] ) : 0;
 		
diff --git a/upload/admin/applications/core/modules_admin/logs/index.html b/upload/admin/applications/core/modules_admin/logs/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/logs/index.html
+++ b/upload/admin/applications/core/modules_admin/logs/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/logsSplash.php b/upload/admin/applications/core/modules_admin/logs/logsSplash.php
new file mode 100644
index 00000000..509499fe
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/logs/logsSplash.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @file		logsSplash.php 	Logs splash screen
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		8th Feb 2011
+ * $LastChangedDate: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9483 $
+ */
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		admin_core_logs_logsSplash
+ * @brief		Logs splash screen
+ *
+ */
+class admin_core_logs_logsSplash extends ipsCommand 
+{
+	/**
+	 * Skin object shortcut
+	 *
+	 * @var		$html
+	 */
+	protected $html;
+	
+	/**
+	 * String for the screen url bit
+	 *
+	 * @var		$form_code
+	 */
+	public $form_code    = '';
+	
+	/**
+	 * String for the JS url bit
+	 *
+	 * @var		$form_code_js
+	 */
+	public $form_code_js = '';
+	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* Load Template */
+		$this->html	= $this->registry->output->loadTemplate( 'cp_skin_adminlogs' );
+		
+		/* Load Language */		
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_logs' ) );		
+		
+		/* URL Bits */
+		$this->form_code	= $this->html->form_code	= 'module=logs&amp;section=splash';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=logs&section=splash';
+		
+		/* Get the splash screen */
+		$this->registry->output->html .= $this->html->logSplashScreen();
+		
+		/* Output */
+		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
+		$this->registry->output->sendOutput();	
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/mobilelogs.php b/upload/admin/applications/core/modules_admin/logs/mobilelogs.php
index f96db259..fb6ac5f5 100644
--- a/upload/admin/applications/core/modules_admin/logs/mobilelogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/mobilelogs.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Mobile Notification logs
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,17 +28,15 @@ class admin_core_logs_mobilelogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -94,8 +92,7 @@ class admin_core_logs_mobilelogs extends ipsCommand
 	/**
 	 * Remove log
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _remove()
 	{
@@ -136,8 +133,7 @@ class admin_core_logs_mobilelogs extends ipsCommand
 	/**
 	 * List the current logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _listCurrent()
 	{
diff --git a/upload/admin/applications/core/modules_admin/logs/modlogs.php b/upload/admin/applications/core/modules_admin/logs/modlogs.php
index f54f477b..b2bdebb1 100644
--- a/upload/admin/applications/core/modules_admin/logs/modlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/modlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator logs
- * Last Updated: $LastChangedDate: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-15 17:04:35 -0400 (Thu, 15 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6915 $
+ * @version		$Rev: 9495 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,7 +29,6 @@ class admin_core_logs_modlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	protected
 	 * @var		object			Skin templates
 	 */
 	protected $html;
@@ -37,9 +36,8 @@ class admin_core_logs_modlogs extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -102,8 +100,7 @@ class admin_core_logs_modlogs extends ipsCommand
 	/**
 	 * View all logs for a given moderator
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _view()
 	{
@@ -111,7 +108,7 @@ class admin_core_logs_modlogs extends ipsCommand
 		// Basic init
 		//-----------------------------------------
 		
-		$start = intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
+		$start	= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
 
 		///----------------------------------------
 		// No mid or search string?
@@ -124,17 +121,17 @@ class admin_core_logs_modlogs extends ipsCommand
 			return;
 		}
 	
+		$this->request['mid']	= $this->request['mid'] == 'zero' ? 0 : $this->request['mid'];
+		
 		///----------------------------------------
 		// mid?
 		//-----------------------------------------
 		
 		if ( !$this->request['search_string'] )
 		{
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(id) as count', 'from' => 'moderator_logs', 'where' => "member_id=" . intval($this->request['mid']) ) );
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(id) as count', 'from' => 'moderator_logs', 'where' => "member_id=" . intval($this->request['mid']) ) );
 
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;mid=" . $this->request['mid'] . "&amp;do=view";
+			$query	= "{$this->form_code}&amp;mid=" . ( $this->request['mid'] ? $this->request['mid'] : 'zero' ) . "&amp;do=view";
 			
 			$this->DB->build( array( 'select'		=> 'm.*',
 											'from'		=> array( 'moderator_logs' => 'm' ),
@@ -156,6 +153,11 @@ class admin_core_logs_modlogs extends ipsCommand
 								)		);
 			$this->DB->execute();
 		}
+		
+		///----------------------------------------
+		// search string?
+		//-----------------------------------------
+		
 		else
 		{
 			$this->request['search_string'] = IPSText::parseCleanValue( urldecode($this->request['search_string'] ) );
@@ -174,29 +176,27 @@ class admin_core_logs_modlogs extends ipsCommand
 				$dbq = "m." . $this->request['search_type'] . " LIKE '%" . $this->request['search_string'] . "%'";
 			}
 
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(m.member_id) as count', 'from' => 'moderator_logs m', 'where' => $dbq ) );
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(m.member_id) as count', 'from' => 'moderator_logs m', 'where' => $dbq ) );
 
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=".urlencode($this->request['search_string']);
+			$query	= "{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=" . urlencode($this->request['search_string']);
 			
 			$this->DB->build( array( 'select'		=> 'm.*',
-											'from'		=> array( 'moderator_logs' => 'm' ),
-											'where'		=> $dbq,
-											'order'		=> 'm.ctime DESC',
-											'limit'		=> array( $start, 20 ),
-											'add_join'	=> array(
-																array( 'select'	=> 'mem.members_display_name',
-																		'from'	=> array( 'members' => 'mem' ),
-																		'where'	=> 'mem.member_id=m.member_id',
-																		'type'	=> 'left',
-																	),
-																array( 'select'	=> 'f.id as forum_id, f.name',
-																		'from'	=> array( 'forums' => 'f' ),
-																		'where'	=> 'f.id=m.forum_id',
-																		'type'	=> 'left',
-																	),
-																)
+										'from'		=> array( 'moderator_logs' => 'm' ),
+										'where'		=> $dbq,
+										'order'		=> 'm.ctime DESC',
+										'limit'		=> array( $start, 20 ),
+										'add_join'	=> array(
+															array( 'select'	=> 'mem.members_display_name',
+																	'from'	=> array( 'members' => 'mem' ),
+																	'where'	=> 'mem.member_id=m.member_id',
+																	'type'	=> 'left',
+																),
+															array( 'select'	=> 'f.id as forum_id, f.name',
+																	'from'	=> array( 'forums' => 'f' ),
+																	'where'	=> 'f.id=m.forum_id',
+																	'type'	=> 'left',
+																),
+															)
 								)		);
 			$this->DB->execute();
 		}
@@ -205,7 +205,7 @@ class admin_core_logs_modlogs extends ipsCommand
 		// Page links
 		//-----------------------------------------
 		
-		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row_count,
+		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row['count'],
 																	 'itemsPerPage'			=> 20,
 																	 'currentStartValue'	=> $start,
 																	 'baseUrl'				=> $this->settings['base_url'] . $query,
@@ -218,6 +218,16 @@ class admin_core_logs_modlogs extends ipsCommand
 		
 		while ( $row = $this->DB->fetch() )
 		{
+			if( !$row['member_id'] )
+			{
+				$row['member_id']	= 'zero';
+			}
+			
+			if( !$row['members_display_name'] )
+			{
+				$row['members_display_name']	= $this->lang->words['noname_availablm'];
+			}
+
 			$row['_time']			= $this->registry->class_localization->getDate( $row['ctime'], 'LONG' );
 			$row['topic']			= $row['topic_id'] ? $this->lang->words['mlog_topicid'] . $row['topic_id'] : '&nbsp;';
 			$row['http_referer']	= preg_replace( "/s=(\w){32}/" , "", $row['http_referer'] );
@@ -235,28 +245,28 @@ class admin_core_logs_modlogs extends ipsCommand
 	/**
 	 * Remove logs by a moderator
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _remove()
 	{
-		if ( $this->request['mid'] == "" )
+		if ( !$this->request['mid'] )
 		{
 			$this->registry->output->showError( $this->lang->words['mlog_noid'], 11131 );
 		}
 		
+		$this->request['mid']	= $this->request['mid'] == 'zero' ? 0 : $this->request['mid'];
+		
 		$this->DB->delete( 'moderator_logs', "member_id=" . intval($this->request['mid']) );
 		
 		$this->registry->getClass('adminFunctions')->saveAdminLog( $this->lang->words['mlog_removed'] . $this->request['mid'] );
 		
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . "&amp;{$this->form_code}" );
+		$this->registry->output->silentRedirect( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	/**
 	 * List the current logs with links to view per-admin
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _listCurrent()
 	{
@@ -298,36 +308,36 @@ class admin_core_logs_modlogs extends ipsCommand
 		//-----------------------------------------
 		// All mods
 		//-----------------------------------------
-		
+
 		$this->DB->build( array( 
-			'select'	=> 'member_id, count(member_id) as act_count',
-			'from'		=> 'moderator_logs',
-			'group'		=> 'member_id',
-			'order'		=> 'act_count DESC'
-		) );
-		
+							'select'	=> 'count(l.member_id) as act_count, l.member_id',
+							'from'		=> array( 'moderator_logs' => 'l' ),
+							'group'		=> 'l.member_id',
+							'order'		=> 'act_count DESC',
+							'add_join'	=> array(
+												array(
+													'select'	=> 'm.members_display_name',
+													'from'		=> array( 'members' => 'm' ),
+													'where'		=> 'm.member_id=l.member_id',
+													'type'		=> 'left',
+													),
+												),
+						)		);
 		$this->DB->execute();
-        
-        $_members = array();
-        $_store = array();
-        while ( $r = $this->DB->fetch() )
-        {
-			$_members[] = $r['member_id'];
-			$admins[ $r['member_id'] ] = $r;
-        }
-        
-		if ( !empty( $_members ) )
+
+		while ( $r = $this->DB->fetch() )
 		{
-			$this->DB->build( array( 'select'	=> 'member_id, members_display_name',
-									'from'		=> 'members',
-									'where'     => 'member_id IN (' . implode( ',', $_members ) . ')',
-								)		);
-			$this->DB->execute();
-			
-			while ( $r = $this->DB->fetch() )
+			if( !$r['member_id'] )
 			{
-				$admins[ $r['member_id'] ] = array_merge( $r, $admins[ $r['member_id'] ] );
+				$r['member_id']	= 'zero';
 			}
+			
+			if( !$r['members_display_name'] )
+			{
+				$r['members_display_name']	= $this->lang->words['noname_availablm'];
+			}
+			
+			$admins[ $r['member_id'] ] = $r;
 		}
 
 		//-----------------------------------------
diff --git a/upload/admin/applications/core/modules_admin/logs/spamlogs.php b/upload/admin/applications/core/modules_admin/logs/spamlogs.php
index 7c868a83..d117b410 100644
--- a/upload/admin/applications/core/modules_admin/logs/spamlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/spamlogs.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin logs
- * Last Updated: $LastChangedDate: 2010-09-30 21:47:05 -0400 (Thu, 30 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-12 22:28:10 -0400 (Thu, 12 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6929 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8754 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,17 +28,15 @@ class admin_core_logs_spamlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -94,8 +92,7 @@ class admin_core_logs_spamlogs extends ipsCommand
 	/**
 	 * Remove log
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _remove()
 	{
@@ -136,8 +133,7 @@ class admin_core_logs_spamlogs extends ipsCommand
 	/**
 	 * List the current logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _listCurrent()
 	{
diff --git a/upload/admin/applications/core/modules_admin/logs/spiderlogs.php b/upload/admin/applications/core/modules_admin/logs/spiderlogs.php
index 48bcfdda..315afef6 100644
--- a/upload/admin/applications/core/modules_admin/logs/spiderlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/spiderlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Search Engine Spider logs
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-11 22:11:30 -0400 (Wed, 11 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8734 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,25 +29,22 @@ class admin_core_logs_spiderlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Spider map
 	 *
-	 * @access	private
 	 * @var		array			Spider keys to values
 	 */
-	private $bot_map			= array();
+	protected $bot_map			= array();
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -119,10 +116,9 @@ class admin_core_logs_spiderlogs extends ipsCommand
 	/**
 	 * View all logs for a given moderator
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _view()
+	protected function _view()
 	{
 		///----------------------------------------
 		// Basic init
@@ -157,10 +153,10 @@ class admin_core_logs_spiderlogs extends ipsCommand
 			$query = "&amp;{$this->form_code}&amp;bid=" . $this->request['bid'] . "&amp;do=view";
 			
 			$this->DB->build( array( 'select'	=> '*',
-											'from'	=> 'spider_logs',
-											'where'	=> "bot='{$botty}'",
-											'order'	=> 'entry_date DESC',
-											'limit'	=> array( $start, 20 ) ) );
+										'from'	=> 'spider_logs',
+										'where'	=> "bot='{$botty}'",
+										'order'	=> 'entry_date DESC',
+										'limit'	=> array( $start, 20 ) ) );
 			$this->DB->execute();
 		}
 		else
@@ -174,10 +170,10 @@ class admin_core_logs_spiderlogs extends ipsCommand
 			$query = "&amp;{$this->form_code}&amp;do=view&amp;search_string=" . urlencode($this->request['search_string']);
 			
 			$this->DB->build( array( 'select'	=> '*',
-											'from'	=> 'spider_logs',
-											'where'	=> "query_string LIKE '%" . $this->request['search_string'] . "%'",
-											'order'	=> 'entry_date DESC',
-											'limit'	=> array( $start, 20 ) ) );
+										'from'	=> 'spider_logs',
+										'where'	=> "(query_string LIKE '%" . $this->request['search_string'] . "%') OR (request_addr LIKE '%" . $this->request['search_string'] . "%')",
+										'order'	=> 'entry_date DESC',
+										'limit'	=> array( $start, 20 ) ) );
 			$this->DB->execute();
 		}
 		
@@ -200,15 +196,22 @@ class admin_core_logs_spiderlogs extends ipsCommand
 		{
 			$extra = "";
 			
-			if ( stripos( '#lo-fi#i', $row['query_string'] ) !== false )
+			if( $row['query_string'] )
 			{
-				$extra = $this->lang->words['slog_lofi'];
-				
-				$query_string_html = $extra . ' ' . $row['query_string'];
+				if ( stripos( '#lo-fi#i', $row['query_string'] ) !== false )
+				{
+					$extra = $this->lang->words['slog_lofi'];
+					
+					$query_string_html = $extra . ' ' . $row['query_string'];
+				}
+				else
+				{
+					$query_string_html = "<a href='" . $this->settings['board_url'] . "/index." . $this->settings['php_ext'] . "?{$row['query_string']}' target='_blank'>" . IPSText::truncate($row['query_string']) . "</a>";
+				}
 			}
 			else
 			{
-				$query_string_html = "<a href='" . $this->settings['board_url'] . "/index." . $this->settings['php_ext'] . "?{$row['query_string']}' target='_blank'>" . IPSText::truncate($row['query_string']) . "</a>";
+				$query_string_html = "<a href='http://" . $_SERVER['HTTP_HOST'] . "{$row['request_addr']}' target='_blank'>" . IPSText::truncate($row['request_addr']) . "</a>";
 			}
 			
 			$row['_bot_name']		= $this->bot_map[ mb_strtolower($row['bot']) ];
@@ -228,10 +231,9 @@ class admin_core_logs_spiderlogs extends ipsCommand
 	/**
 	 * Remove logs by a moderator
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _remove()
+	protected function _remove()
 	{
 		if ( $this->request['bid'] == "" )
 		{
@@ -252,10 +254,9 @@ class admin_core_logs_spiderlogs extends ipsCommand
 	/**
 	 * List the current logs with links to view per-admin
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _listCurrent()
+	protected function _listCurrent()
 	{
 		$spiders = array();
 
@@ -264,9 +265,9 @@ class admin_core_logs_spiderlogs extends ipsCommand
 		//-----------------------------------------
 		
 		$this->DB->build( array( 'select'	=> 'count(*) as cnt, bot, max(entry_date) as entry_date',
-										'from'	=> 'spider_logs',
-										'group'	=> 'bot',
-										'order'	=> 'entry_date DESC',
+									'from'	=> 'spider_logs',
+									'group'	=> 'bot',
+									'order'	=> 'entry_date DESC',
 							)		);
 		$this->DB->execute();
 		
@@ -284,6 +285,5 @@ class admin_core_logs_spiderlogs extends ipsCommand
 		//-----------------------------------------
 		
 		$this->registry->output->html .= $this->html->spiderlogsWrapper( $spiders );
-
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/sqlerror.php b/upload/admin/applications/core/modules_admin/logs/sqlerror.php
index e7566453..0f259e33 100644
--- a/upload/admin/applications/core/modules_admin/logs/sqlerror.php
+++ b/upload/admin/applications/core/modules_admin/logs/sqlerror.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * SQL error logs
- * Last Updated: $LastChangedDate: 2010-06-16 02:25:19 +0100 (Wed, 16 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-07-26 04:00:17 -0400 (Tue, 26 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6539 $
+ * @version		$Rev: 9317 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -36,7 +36,7 @@ class admin_core_logs_sqlerror extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -84,6 +84,11 @@ class admin_core_logs_sqlerror extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'sqlerrorlogs_delete' );
 				$this->_remove();
 			break;
+			
+			case 'delete_all':
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'sqlerrorlogs_delete' );
+				$this->_remove( true );
+			break;
 
 			default:
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'sqlerrorlogs_view' );
@@ -99,7 +104,7 @@ class admin_core_logs_sqlerror extends ipsCommand
 	/**
 	 * View an SQL log
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _view()
 	{
@@ -107,7 +112,7 @@ class admin_core_logs_sqlerror extends ipsCommand
 		$file = trim( $this->request['file'] );
 		
 		/* Check file name */
-		if ( ! preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file ) OR ! file_exists( IPS_CACHE_PATH . 'cache/' . $file ) )
+		if ( ! preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file ) OR ! is_file( IPS_CACHE_PATH . 'cache/' . $file ) )
 		{
 			$this->registry->output->global_message = $this->lang->words['sqllog_nofile'];
 			$this->_listCurrent();
@@ -122,61 +127,100 @@ class admin_core_logs_sqlerror extends ipsCommand
 		$classFileManagement = new $classToLoad();
 		
 		/* Get some tail! */
-		$content = $classFileManagement->tailFile( IPS_CACHE_PATH . 'cache/' . $file, 300 );
+		$content  = $classFileManagement->tailFile( IPS_CACHE_PATH . 'cache/' . $file, 300 );
+		$tailSize = IPSLib::strlenToBytes( strlen( $content ) );
 		
 		/* Can't believe I typed that last comment */
-		$this->registry->output->html .= $this->html->sqlLogsView( $file, $size, $content );
+		$this->registry->output->html .= $this->html->sqlLogsView( $file, $size, htmlentities( $content ), $tailSize );
 	}
 	
 	/**
 	 * Remove logs by an admin
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @param	bool		$doAll	Whether to delete all logs or not
+	 * @return	@e void		[Outputs to screen]
 	 */
-	protected function _remove()
+	protected function _remove( $doAll=false )
 	{
-		/* INIT */
-		$file = trim( $this->request['file'] );
+		//-----------------------------------------
+		// Deleting all?
+		//-----------------------------------------
 		
-		/* Check file name */
-		if ( ! preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file ) OR ! file_exists( IPS_CACHE_PATH . 'cache/' . $file ) )
+		if( $doAll )
 		{
-			$this->registry->output->global_message = $this->lang->words['sqllog_nofile'];
-			$this->_listCurrent();
-			return;
+			$count	= 0;
+
+			try
+			{
+				foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'cache' ) as $file )
+				{
+					if ( $file->isDot() OR ! $file->isFile() )
+					{
+						continue;
+					}
+				
+					if ( preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file->getFilename() ) )
+					{
+						$count++;
+						
+						@unlink( IPS_CACHE_PATH . 'cache/' . $file->getFilename() );
+					}
+				}
+			} catch ( Exception $e ) {}
+		}
+		else
+		{
+			$file	= trim( $this->request['file'] );
+			$count	= 1;
+			
+			//-----------------------------------------
+			// Verify filename
+			//-----------------------------------------
+			
+			if ( ! preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file ) OR ! is_file( IPS_CACHE_PATH . 'cache/' . $file ) )
+			{
+				$this->registry->output->global_message = $this->lang->words['sqllog_nofile'];
+				$this->_listCurrent();
+				return;
+			}
+			
+			@unlink( IPS_CACHE_PATH . 'cache/' . $file );
 		}
 		
-		@unlink( IPS_CACHE_PATH . 'cache/' . $file  );
+		//-----------------------------------------
+		// Show list again
+		//-----------------------------------------
 		
-		$this->registry->output->global_message = $this->lang->words['sqllog_removed'];
+		$this->registry->output->global_message = sprintf( $this->lang->words['sqllog_removed'], $count );
 		$this->_listCurrent();
 	}
 	
 	/**
 	 * List the current SQL logs
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _listCurrent()
 	{
-		$rows = array();
+		$rows        = array();
+		$latestError = '';
 		
 		/* Got a latest? */
-		if ( file_exists( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' ) )
-		{
+		if ( is_file( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' ) )
+		{ 
 			$unix = @filemtime( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' );
 			
 			if ( $unix )
 			{
-				$mtime = gmdate( 'd-j-Y', $unix );
-				$now   = gmdate( 'd-j-Y', time() );
+				$mtime = gmdate( 'dmY', $unix );
+				$now   = gmdate( 'dmY', time() );
 				
 				if ( $mtime == $now )
 				{
-					$contents = file_get_contents( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' );
+					$contents = htmlentities( file_get_contents( IPS_CACHE_PATH . 'cache/sql_error_latest.cgi' ) );
 					
 					/* Display a message */
-					$this->registry->output->global_message = sprintf( $this->lang->words['sqllog_latest'], $this->registry->class_localization->getDate( $unix, 'LONG' ), $contents );
+					$latestError = sprintf( $this->lang->words['sqllog_latest'], $this->registry->class_localization->getDate( $unix, 'LONG' ), $contents );
 				}
 			}
 		}
@@ -203,6 +247,6 @@ class admin_core_logs_sqlerror extends ipsCommand
 		// And output
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->sqllogsWrapper( $rows );
+		$this->registry->output->html .= $this->html->sqllogsWrapper( $rows, $latestError );
 	}
-}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/warnlogs.php b/upload/admin/applications/core/modules_admin/logs/warnlogs.php
index 7fbc1888..a0d9a4e6 100644
--- a/upload/admin/applications/core/modules_admin/logs/warnlogs.php
+++ b/upload/admin/applications/core/modules_admin/logs/warnlogs.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Warn logs
- * Last Updated: $LastChangedDate: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-12 17:45:20 -0400 (Thu, 12 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6326 $
+ * @version		$Rev: 8752 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,17 +29,15 @@ class admin_core_logs_warnlogs extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -112,16 +110,15 @@ class admin_core_logs_warnlogs extends ipsCommand
 	/**
 	 * View all logs for a given moderator
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _view()
+	protected function _view()
 	{
 		///----------------------------------------
 		// Basic init
 		//-----------------------------------------
 		
-		$start = intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
+		$start	= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
 
 		///----------------------------------------
 		// No mid or search string?
@@ -140,11 +137,9 @@ class admin_core_logs_warnlogs extends ipsCommand
 		
 		if ( !$this->request['search_string'] )
 		{
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(wlog_id) as count', 'from' => 'warn_logs', 'where' => "wlog_mid=".intval($this->request['mid']) ) );
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(wlog_id) as count', 'from' => 'warn_logs', 'where' => "wlog_mid=".intval($this->request['mid']) ) );
 
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;mid=" . $this->request['mid'] . "&amp;do=view";
+			$query	= "{$this->form_code}&amp;mid=" . $this->request['mid'] . "&amp;do=view";
 			
 			$this->DB->build( array( 'select'		=> 'l.*',
 											'from'		=> array( 'warn_logs' => 'l' ),
@@ -179,11 +174,9 @@ class admin_core_logs_warnlogs extends ipsCommand
 				$dbq = "l.wlog_contact_content LIKE '%" . $this->request['search_string'] . "%'";
 			}
 			
-			$row = $this->DB->buildAndFetch( array( 'select' => 'COUNT(l.wlog_id) as count', 'from' => 'warn_logs l', 'where' => $dbq ) );
+			$row	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(l.wlog_id) as count', 'from' => 'warn_logs l', 'where' => $dbq ) );
 
-			$row_count = $row['count'];
-			
-			$query = "&amp;{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=" . urlencode($this->request['search_string']);
+			$query	= "{$this->form_code}&amp;do=view&amp;search_type=" . $this->request['search_type'] . "&amp;search_string=" . urlencode($this->request['search_string']);
 			
 			$this->DB->build( array( 'select'		=> 'l.*',
 											'from'		=> array( 'warn_logs' => 'l' ),
@@ -210,7 +203,7 @@ class admin_core_logs_warnlogs extends ipsCommand
 		// Page links
 		//-----------------------------------------
 		
-		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row_count,
+		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> $row['count'],
 																	 'itemsPerPage'			=> 20,
 																	 'currentStartValue'	=> $start,
 																	 'baseUrl'				=> $this->settings['base_url'] . $query,
@@ -240,30 +233,41 @@ class admin_core_logs_warnlogs extends ipsCommand
 			// Mod Q
 			//-----------------------------------------
 			
-			$mod				= preg_match( "#<mod>(.+?)</mod>#is"        , $row['wlog_notes'], $mm );
-			$mod				= trim($mm[1]);
-			list($v, $u, $i)	= explode( ',', $mod);
-			
-			$row['_mod']		= ( $i == 1 ) ? 'INDEF' : ( $v == "" ? 'None' : $v . ' ' . $days[$u] );
-			
-			///----------------------------------------
-			// Susp
-			//-----------------------------------------
-			
-			$susp				= preg_match( "#<susp>(.+?)</susp>#is"      , $row['wlog_notes'], $sm );
-			$susp				= trim($sm[1]);
-			list($v, $u)		= explode( ',', $susp );
-			$row['_susp']		= $v == '' ? 'None' : $v . ' ' . $days[$u];
+			if ( strstr( $row['wlog_notes'], '<content>' ) )
+			{
+				$mod				= preg_match( "#<mod>(.+?)</mod>#is"        , $row['wlog_notes'], $mm );
+				$mod				= trim($mm[1]);
+				list($v, $u, $i)	= explode( ',', $mod);
+				
+				$row['_mod']		= ( $i == 1 ) ? $this->lang->words['wlog_indef'] : ( $v == "" ? $this->lang->words['wlog_none'] : $v . ' ' . $days[$u] );
+				
+				///----------------------------------------
+				// Susp
+				//-----------------------------------------
+				
+				$susp				= preg_match( "#<susp>(.+?)</susp>#is"      , $row['wlog_notes'], $sm );
+				$susp				= trim($sm[1]);
+				list($v, $u)		= explode( ',', $susp );
+				$row['_susp']		= $v == '' ? $this->lang->words['wlog_none'] : $v . ' ' . $days[$u];
+	
+				///----------------------------------------
+				// Posting Susp
+				//-----------------------------------------
+	
+				$post				= preg_match( "#<post>(.+?)</post>#is"      , $row['wlog_notes'], $pm );
+				$post				= trim($pm[1]);
+				list($v, $u, $i)	= explode( ',', $post );
+				
+				$row['_post']		= ( $i == 1 ) ? $this->lang->words['wlog_indef'] : ( $v == "" ? $this->lang->words['wlog_none'] : $v . ' ' . $days[$u] );
+			}
+			else
+			{
+				$_wlog	= unserialize( $row['wlog_notes'] );
 
-			///----------------------------------------
-			// Posting Susp
-			//-----------------------------------------
-
-			$post				= preg_match( "#<post>(.+?)</post>#is"      , $row['wlog_notes'], $pm );
-			$post				= trim($pm[1]);
-			list($v, $u, $i)	= explode( ',', $post );
-			
-			$row['_post']		= ( $i == 1 ) ? 'INDEF' : ( $v == "" ? 'None' : $v . ' ' . $days[$u] );
+				$row['_mod']		= $_wlog['mod_indef'] ? $this->lang->words['wlog_indef'] : ( $_wlog['mod'] == 0 ? $this->lang->words['wlog_none'] : $_wlog['mod'] . ' ' . $days[ $_wlog['mod_unit'] ? $_wlog['mod_unit'] : 'd' ] );
+				$row['_susp']		= $_wlog['ban'] ? $this->lang->words['wlog_indef'] : ( $_wlog['susp'] == 0 ? $this->lang->words['wlog_none'] : $_wlog['susp'] . ' ' . $days[ $_wlog['susp_unit'] ? $_wlog['susp_unit'] : 'd' ] );
+				$row['_post']		= $_wlog['post_indef'] ? $this->lang->words['wlog_indef'] : ( $_wlog['post'] == 0 ? $this->lang->words['wlog_none'] : $_wlog['post'] . ' ' . $days[ $_wlog['post_unit'] ? $_wlog['post_unit'] : 'd' ] );
+			}
 
 			//-----------------------------------------
 			
@@ -280,10 +284,9 @@ class admin_core_logs_warnlogs extends ipsCommand
 	/**
 	 * Remove logs by a moderator
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _remove()
+	protected function _remove()
 	{
 		if ( $this->request['mid'] == "" )
 		{
@@ -300,10 +303,9 @@ class admin_core_logs_warnlogs extends ipsCommand
 	/**
 	 * List the current logs with links to view per-admin
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _listCurrent()
+	protected function _listCurrent()
 	{
 		$rows			= array();
 		$members		= array();
@@ -337,7 +339,7 @@ class admin_core_logs_warnlogs extends ipsCommand
 			$row['_date']		= $this->registry->class_localization->getDate( $row['wlog_date'], 'LONG' );
 			$row['_type']		= ( $row['wlog_type'] == 'pos' ) ? '<span style="color:green;font-weight:bold">-</span>' : '<span style="color:red;font-weight:bold">+</span>';
 			$row['_type']		= ( $row['wlog_type'] == 'custom' ) ? '<span style="color:grey;font-weight:bold">C</span>' : $row['_type'];
-			$row['_cont']		= ( $row['wlog_contact'] !=  'none' ) ? "<a title='{$this->lang->words['wlog_showmessage']}' href='#' onclick='return acp.openWindow(\"{$this->settings['base_url']}&{$this->form_code}&do=viewcontact&id={$row['wlog_id']}\",400,400,\"{$this->lang->words['wlog_log']}\"); return false;'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/tick.png' alt='{$this->lang->words['wlog_contacted']}'></a>" : '&nbsp;';
+			$row['_cont']		= ( $row['wlog_contact'] !=  'none' ) ? "<a title='{$this->lang->words['wlog_showmessage']}' href='#' onclick='return acp.openWindow(\"{$this->settings['base_url']}&{$this->form_code}&do=viewcontact&id={$row['wlog_id']}\",400,400,\"{$this->lang->words['wlog_log']}\"); return false;'><img src='{$this->settings['skin_acp_url']}/images/icons/tick.png' alt='{$this->lang->words['wlog_contacted']}'></a>" : '&nbsp;';
 
 			$rows[]				= $row;
 		}
@@ -345,36 +347,26 @@ class admin_core_logs_warnlogs extends ipsCommand
         //-----------------------------------------
 		// All members
 		//-----------------------------------------
-		
+
 		$this->DB->build( array( 
-			'select'	=> 'wlog_mid, count(wlog_mid) as act_count',
-			'from'		=> 'warn_logs',
-			'group'		=> 'wlog_mid',
-			'order'		=> 'act_count DESC'
-		) );
-		
+							'select'	=> 'count(l.wlog_mid) as act_count',
+							'from'		=> array( 'warn_logs' => 'l' ),
+							'group'		=> 'l.wlog_mid',
+							'order'		=> 'act_count DESC',
+							'add_join'	=> array(
+												array(
+													'select'	=> 'm.member_id, m.members_display_name',
+													'from'		=> array( 'members' => 'm' ),
+													'where'		=> 'm.member_id=l.wlog_mid',
+													'type'		=> 'left',
+													),
+												),
+						)		);
 		$this->DB->execute();
-        
-        $_members = array();
-        $_store = array();
-        while ( $r = $this->DB->fetch() )
-        {
-			$_members[] = $r['wlog_mid'];
-			$members[ $r['wlog_mid'] ] = $r;
-        }
-        
-		if ( !empty( $_members ) )
+
+		while ( $r = $this->DB->fetch() )
 		{
-			$this->DB->build( array( 'select'	=> 'member_id, members_display_name',
-									'from'		=> 'members',
-									'where'     => 'member_id IN (' . implode( ',', $_members ) . ')',
-								)		);
-			$this->DB->execute();
-			
-			while ( $r = $this->DB->fetch() )
-			{
-				$members[ $r['member_id'] ] = array_merge( $r, $members[ $r['member_id'] ] );
-			}
+			$members[ $r['member_id'] ] = $r;
 		}
 
 		//-----------------------------------------
@@ -383,17 +375,15 @@ class admin_core_logs_warnlogs extends ipsCommand
 		
 		$this->registry->output->html .= $this->html->warnlogsWrapper( $rows, $members );
 	}
-	
-	
+
 	/**
 	 * Popup window to view a note
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _viewNote()
+	protected function _viewNote()
 	{
-		if ( $this->request['id'] == "" )
+		if ( !$this->request['id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['wlog_nologs'], 11134 );
 		}
@@ -422,10 +412,24 @@ class admin_core_logs_warnlogs extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['wlog_cantresolve'], 11135 );
 		}
 
-		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cont );
+		$cont	= array();
+
+		if ( strstr( $row['wlog_notes'], '<content>' ) )
+		{
+			preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cont );
+		}
+		else
+		{
+			$_array = unserialize( $row['wlog_notes'] );
+			
+			if ( is_array( $_array ) AND $_array['content'] )
+			{
+				$cont[1] = $_array['content'];
+			}
+		}
 
 		$row['_date']		= $this->registry->class_localization->getDate( $row['wlog_date'], 'LONG' );
-		$row['a_name']		= $row['a_name'] ? $row['a_name'] : 'Deleted Member (ID:' . $row['wlog_mid'] . ')';
+		$row['a_name']		= $row['a_name'] ? $row['a_name'] : sprintf( $this->lang->words['deleted_member_warnlog'], $row['wlog_mid'] );
 		
 		IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
 		IPSText::getTextClass('bbcode')->parse_smilies				= 1;
@@ -445,12 +449,11 @@ class admin_core_logs_warnlogs extends ipsCommand
 	/**
 	 * Popup window to view a contact
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _viewContact()
+	protected function _viewContact()
 	{
-		if ( $this->request['id'] == "" )
+		if ( !$this->request['id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['wlog_nologs'], 11136 );
 		}
@@ -479,18 +482,26 @@ class admin_core_logs_warnlogs extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['wlog_nologs'], 11137 );
 		}
 		
-		$subject = preg_match( "#<subject>(.+?)</subject>#is", $row['wlog_contact_content'], $subj );
-		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_contact_content'], $cont );
+		if( strpos( $row['wlog_contact_content'], '<content>' ) )
+		{
+			$subject = preg_match( "#<subject>(.+?)</subject>#is", $row['wlog_contact_content'], $subj );
+			$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_contact_content'], $cont );
+			
+			$row['_subject']	= $subj[1];
+			$row['_text']		= $cont[1];
+		}
+		else
+		{
+			$row['_subject']	= $this->lang->words['subj_not_avail'];
+			$row['_text']		= $row['wlog_contact_content'];
+		}
 		
 		$row['_type']		= $row['wlog_contact'] == 'pm' ? $this->lang->words['wlog_pm'] : $this->lang->words['wlog_email'];
-		$row['_subject']	= $subj[1];
 		$row['_date']		= $this->registry->class_localization->getDate( $row['wlog_date'], 'LONG' );
 		$row['a_name']		= $row['a_name'] ? $row['a_name'] : sprintf( $this->lang->words['wlog_deleted'], $row['wlog_mid'] );
 
-		$row['_text']		= $cont[1];
-		
 		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
+		IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
 		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
 		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
 		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
@@ -503,5 +514,4 @@ class admin_core_logs_warnlogs extends ipsCommand
 		
 		$this->registry->output->printPopupWindow();
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/logs/xml/index.html b/upload/admin/applications/core/modules_admin/logs/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/logs/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/logs/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/menu.xml b/upload/admin/applications/core/modules_admin/logs/xml/menu.xml
similarity index 64%
rename from upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/menu.xml
rename to upload/admin/applications/core/modules_admin/logs/xml/menu.xml
index 3613fdf2..58fb1b0a 100644
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/logs/xml/menu.xml
@@ -2,11 +2,12 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Портал</title>
+			<title>Logs</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Управление порталом</subitemtitle>
-					<subsection>portal</subsection>
+					<subitemtitle>Logs</subitemtitle>
+					<subitemlang>splashlogs</subitemlang>
+					<subsection>logsSplash</subsection>
 					<subitemurl></subitemurl>
 					<subitemrolekey></subitemrolekey>
 					<subisredirect>0</subisredirect>
diff --git a/upload/admin/applications/core/modules_admin/logs/xml/permissions.xml b/upload/admin/applications/core/modules_admin/logs/xml/permissions.xml
index ac1ccbf8..f28dd0eb 100644
--- a/upload/admin/applications/core/modules_admin/logs/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/logs/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Журнал админи�тратор�ких дей�твий</grouptitle>
+		<grouplang>core_adminlogs</grouplang>
 		<items>
 			<item>
 				<key>adminlogs_view</key>
@@ -15,6 +16,7 @@
 	</group>
 	<group>
 		<grouptitle>Журнал модератор�ких дей�твий</grouptitle>
+		<grouplang>core_modlogs</grouplang>
 		<items>
 			<item>
 				<key>modlogs_view</key>
@@ -26,21 +28,9 @@
 			</item>
 		</items>
 	</group>
-	<group>
-		<grouptitle>Журнал Email отправлений</grouptitle>
-		<items>
-			<item>
-				<key>emaillogs_view</key>
-				<string>Может про�матривать журнал?</string>
-			</item>
-			<item>
-				<key>emaillogs_delete</key>
-				<string>Может удла�ть запи�и?</string>
-			</item>
-		</items>
-	</group>
 	<group>
 		<grouptitle>Журнал ошибок Email</grouptitle>
+		<grouplang>core_eelogs</grouplang>
 		<items>
 			<item>
 				<key>emailerrorlogs_view</key>
@@ -54,6 +44,7 @@
 	</group>
 	<group>
 		<grouptitle>Журнал дей�твий пои�ковых роботов</grouptitle>
+		<grouplang>core_spiderlogs</grouplang>
 		<items>
 			<item>
 				<key>spiderlogs_view</key>
@@ -67,6 +58,7 @@
 	</group>
 	<group>
 		<grouptitle>Журнал пользователь�ких предупреждений</grouptitle>
+		<grouplang>core_warnlogs</grouplang>
 		<items>
 			<item>
 				<key>warnlogs_view</key>
@@ -80,6 +72,7 @@
 	</group>
 	<group>
 		<grouptitle>Журнал ошибок �и�темы</grouptitle>
+		<grouplang>core_errorlogs</grouplang>
 		<items>
 			<item>
 				<key>errorlogs_view</key>
@@ -93,6 +86,7 @@
 	</group>
 	<group>
 		<grouptitle>SQL Error Logs</grouptitle>
+		<grouplang>core_selogs</grouplang>
 		<items>
 			<item>
 				<key>sqlerrorlogs_view</key>
diff --git a/upload/admin/applications/core/modules_admin/mycp/dashboard.php b/upload/admin/applications/core/modules_admin/mycp/dashboard.php
index d9541fc1..6b12de6e 100644
--- a/upload/admin/applications/core/modules_admin/mycp/dashboard.php
+++ b/upload/admin/applications/core/modules_admin/mycp/dashboard.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Dashboard
- * Last Updated: $Date: 2010-10-27 05:50:09 -0400 (Wed, 27 Oct 2010) $
+ * Last Updated: $Date: 2011-10-14 13:58:18 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		5th January 2005
- * @version		$Revision: 7049 $
+ * @version		$Revision: 9623 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -47,10 +47,10 @@ class admin_core_mycp_dashboard extends ipsCommand
 	protected $form_code_js;
 
 	/**
-	 * Main class entry point
+	 * Main function executed automatically by the controller
 	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -71,7 +71,40 @@ class admin_core_mycp_dashboard extends ipsCommand
 		   if the permission system automatically added permission for 'change my details' */
 		if( $this->registry->getClass('class_permissions')->editDetailsOnly )
 		{
-			ipsRegistry::getClass('output')->showError( 'no_permission', 1004 );
+			/* If they just don't have access to the dashboard, let's show them something we do have access to */
+			if ( !$this->request['app'] )
+			{
+				foreach( ipsRegistry::$applications as $k => $data )
+				{
+					if ( $this->registry->getClass('class_permissions')->checkForAppAccess( $k ) and ( $k != 'core' or !$this->registry->getClass('class_permissions')->editDetailsOnly ) )
+					{
+						foreach( ipsRegistry::$modules[ $k ] as $module )
+						{
+							if ( $this->registry->getClass('class_permissions')->checkForModuleAccess( $k, $module['sys_module_key'] ) )
+							{
+								$filepath  = IPSLib::getAppDir( $k ) . '/modules_admin/' . $module['sys_module_key'] . '/defaultSection.php';
+								if ( is_file( $filepath ) )
+								{
+									$DEFAULT_SECTION = '';
+									include( $filepath );/*noLibHook*/
+					
+									if ( $this->registry->getClass('class_permissions')->checkForSectionAccess( $k, $module['sys_module_key'], $DEFAULT_SECTION ) )
+									{
+										$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . "app={$k}&amp;module={$module['sys_module_key']}&amp;section={$DEFAULT_SECTION}" );
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			/* If all else fails, take them to the change details page */
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . "core&amp;module=mycp&amp;section=details" );
+		}
+		else if( !$this->registry->getClass('class_permissions')->checkPermission( 'dashboard', 'core', 'mycp' ) )
+		{
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . "core&amp;module=mycp&amp;section=details" );
 		}
 
 		//-----------------------------------------
@@ -85,11 +118,17 @@ class admin_core_mycp_dashboard extends ipsCommand
 		// INIT
 		//-----------------------------------------
 
+		define( 'IPS_VERSION_CHECK_URL'	, 'http://myipb.in/latestversioncheck/ipb30x.php' );
+
 		$content         	= array();
 		$thiscontent     	= "";
    		$latest_version  	= array();
    		$reg_end         	= "";
 		$unfinished_upgrade	= 0;
+		$urls               = array( 'news'          => '',
+									 'keiths_bits'   => '',
+									 'version_check' => IPS_VERSION_CHECK_URL,
+									 'blogs'         => '' );
 
 		//-----------------------------------------
 		// Get MySQL & PHP Version
@@ -132,12 +171,14 @@ class admin_core_mycp_dashboard extends ipsCommand
 		//-----------------------------------------
 
 		ipsRegistry::$version = 'v'.$latest_version['upgrade_version_human'];
-		ipsRegistry::$vn_full = ( isset($latest_version['upgrade_notes']) AND $latest_version['upgrade_notes'] ) ? $latest_version['upgrade_notes'] : ipsRegistry::$vn_full;
+		ipsRegistry::$vn_full = !empty($latest_version['upgrade_notes']) ? $latest_version['upgrade_notes'] : ipsRegistry::$vn_full;
 
 		//-----------------------------------------
 		// Licensed?
 		//-----------------------------------------
 
+		$urls['keiths_bits'] = IPS_BULLETINS_URL . '?v=' . ipsRegistry::$vn_full;
+
 		//-----------------------------------------
 		// Notepad
 		//-----------------------------------------
@@ -217,12 +258,14 @@ class admin_core_mycp_dashboard extends ipsCommand
 				$r['_click'] = sprintf("%0d", ($r['_click'] / 60) ) . $this->lang->words['cp_minutesago'];
 			}
 
-			$r['session_location'] = $r['session_location'] ? "<a href='" . preg_replace( '/&amp;app=([a-zA-Z0-9\-_]+)/', '', $this->settings['base_url'] ) . $r['session_url'] . "'>{$r['session_location']}</a>" : $this->lang->words['cp_index'];
-
-			$acponline .= $this->html->acp_onlineadmin_row( IPSMember::buildDisplayData( $r ) );
+			$r['session_location'] = $r['session_location'] ? $r['session_location'] : $this->lang->words['cp_index'];
+			
+			$r['seo_link'] = $this->registry->output->buildSEOUrl( $this->settings['board_url'] . '/index.php?showuser=' . $r['session_member_id'], 'none', $r['members_seo_name'], 'showuser' );
+				
+			$admins_online[] = $r;
 		}
 
-		$content['acp_online'] = $this->html->acp_onlineadmin_wrapper( $acponline );
+		$content['acp_online'] = $this->html->acp_onlineadmin_wrapper( $admins_online );
 
 		//-----------------------------------------
 		// Members awaiting admin validation?
@@ -298,12 +341,38 @@ class admin_core_mycp_dashboard extends ipsCommand
 		ksort( $groups );
 
 		$groups_html = implode( "\n", $groups );
+		
+		//-----------------------------------------
+		// Info for the stats bar
+		//-----------------------------------------
+
+		$stats	= array(
+						'performance'	=> false,
+						'active_users'	=> 0,
+						'server_load'	=> 0,
+						);
+		
+		$record = $this->cache->getCache('performanceCache');
+
+		if( is_array($record) AND count($record) )
+		{
+		     $stats['performance']	= true;
+		}
+		
+		list( $load, $time )	= explode( '-', $this->caches['systemvars']['loadlimit'] );
+		
+		$time	= time() - ( $this->settings['au_cutoff'] * 60 );
+		$online	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as rows', 'from' => 'sessions', 'where' => "running_time > {$time}" ) );
+		
+		$stats['active_users']	= $online['rows'];
+		$stats['server_load']	= $load;
 
 		//-----------------------------------------
 		// Piece it together
 		//-----------------------------------------
 
-		$this->registry->output->html .= $this->html->mainTemplate( $content, $forums, $groups_html, $urls, $this->getNotificationPanelEntries() );
+		$urls['version_check'] = IPS_VERSION_CHECK_URL . '?' . base64_encode( ipsRegistry::$vn_full.'|^|'.$this->settings['board_url'] );
+		$this->registry->output->html .= $this->html->mainTemplate( $content, $forums, $groups_html, $urls, $this->getNotificationPanelEntries(), $stats );
 
 		//-----------------------------------------
 		// Left log all on?
@@ -399,7 +468,7 @@ class admin_core_mycp_dashboard extends ipsCommand
 
 			if ( count( $content ) )
 			{
-				$_html = $this->html->warning_box( $this->lang->words['cp_settingsneedup'], implode( $content, "<br />" ) . "<br /><a href='" . $this->settings['base_url'] . "app=core&amp;module=tools&amp;section=settings&amp;do=settingsImportApps'>{$this->lang->words['cp_clickhere']}</a> {$this->lang->words['cp_clickhere_info']}.");
+				$_html = $this->html->warning_box( $this->lang->words['cp_settingsneedup'], implode( $content, "<br />" ) . "<br /><a href='" . $this->settings['base_url'] . "app=core&amp;module=settings&amp;section=settings&amp;do=settingsImportApps'>{$this->lang->words['cp_clickhere']}</a> {$this->lang->words['cp_clickhere_info']}.");
 			}
 
 			if ( count( $modContent ) )
@@ -423,14 +492,21 @@ class admin_core_mycp_dashboard extends ipsCommand
 			}
 
 			$this->registry->output->html = str_replace( '<!--in_dev_check-->', $_html, $this->registry->output->html );
-
-			if ( @file_exists( DOC_IPS_ROOT_PATH . '_dev_notes.txt' ) )
+			
+			/* Got notes!? */
+			if ( is_file( DOC_IPS_ROOT_PATH . '_dev_notes.txt' ) )
 			{
-				$_notes = @file_get_contents( DOC_IPS_ROOT_PATH . '_dev_notes.txt' );
-
+				/* file retains tabs, file_get_contents not! */
+				$_notes = file( DOC_IPS_ROOT_PATH . '_dev_notes.txt' );
+				
 				if ( $_notes )
 				{
-					$_html = $this->registry->output->global_template->information_box( $this->lang->words['cp_devnotes'], nl2br($_notes) ) . "<br />";
+					/* sanitize data and convert tabs! */
+					//$_notes = array_map( 'htmlentities', $_notes );
+					$_notes = implode( '', $_notes );
+					$_notes = str_replace( "\t", '&nbsp;&nbsp;&nbsp;&nbsp;', $_notes );
+					
+					$_html = $this->registry->output->global_template->warning_box( $this->lang->words['cp_devnotes'], nl2br($_notes) ) . "<br />";
 					$this->registry->output->html = str_replace( '<!--in_dev_notes-->', $_html, $this->registry->output->html );
 				}
 			}
@@ -447,9 +523,9 @@ class admin_core_mycp_dashboard extends ipsCommand
 			$this->DB->build( array(
 										'select' => '*',
 										'from'   => 'admin_login_logs',
-										'where'	 => 'admin_time > 0',		// This just helps mysql use the index properly, which is useful for sorting
+										'where'	 => 'admin_success = 0 AND admin_time > 0',		// This just helps mysql use the index properly, which is useful for sorting
 										'order'  => 'admin_time DESC',
-										'limit'  => array( 0, 5 )
+										'limit'  => array( 0, 4 )
 							)	);
 
 			$this->DB->execute();
@@ -457,11 +533,10 @@ class admin_core_mycp_dashboard extends ipsCommand
 			while ( $rowb = $this->DB->fetch() )
 			{
 				$rowb['_admin_time'] = $this->registry->class_localization->getDate( $rowb['admin_time'], 'long' );
-				$rowb['_admin_img']  = $rowb['admin_success'] ? 'aff_tick.png' : 'aff_cross.png';
 
 				$logins .= $this->html->acp_last_logins_row( $rowb );
 			}
-
+			
 			$this->registry->output->html = str_replace( '<!--acplogins-->', $this->html->acp_last_logins_wrapper( $logins ), $this->registry->output->html );
 		}
 
@@ -484,18 +559,13 @@ class admin_core_mycp_dashboard extends ipsCommand
 		$entries = array();
 		
 		/* Look for notification classes */
-		foreach( ipsRegistry::$applications as $r )
+		foreach( IPSLib::getEnabledApplications() as $r )
 		{
-			if ( ! IPSLib::appIsInstalled( $r['app_directory'] ) )
-			{
-				continue;
-			}
-			
 			/* Notification Class */
 			$_file	= IPSLib::getAppDir( $r['app_directory'] ) . '/extensions/dashboardNotifications.php';
 			
 			/* Look for the file */
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				/* Get the file */
 				$_class = IPSLib::loadLibrary( $_file, 'dashboardNotifications__' . $r['app_directory'], $r['app_directory'] );
diff --git a/upload/admin/applications/core/modules_admin/mycp/defaultSection.php b/upload/admin/applications/core/modules_admin/mycp/defaultSection.php
index 6c51b2f6..6cc44eec 100644
--- a/upload/admin/applications/core/modules_admin/mycp/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/mycp/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default mycp section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'mycp' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'dashboard';
diff --git a/upload/admin/applications/core/modules_admin/mycp/details.php b/upload/admin/applications/core/modules_admin/mycp/details.php
index a1561e9c..cebd5277 100644
--- a/upload/admin/applications/core/modules_admin/mycp/details.php
+++ b/upload/admin/applications/core/modules_admin/mycp/details.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin change email/password
- * Last Updated: $Date: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-05-31 16:58:52 -0400 (Tue, 31 May 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		5th January 2005
- * @version		$Revision: 6990 $
+ * @version		$Revision: 8932 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,13 +30,13 @@ class admin_core_mycp_details extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -86,7 +86,7 @@ class admin_core_mycp_details extends ipsCommand
 	/**
 	 * Show the form so admin can reset email/pass
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _showForm()
 	{
@@ -96,13 +96,13 @@ class admin_core_mycp_details extends ipsCommand
 	/**
 	 * Save new email and/or pass
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _saveForm()
 	{
 		if( !$this->request['email'] AND !$this->request['password'] )
 		{
-			$this->registry->output->global_message = $this->lang->words['change_nothing_update'];
+			$this->registry->output->global_error = $this->lang->words['change_nothing_update'];
 			$this->_showForm();
 			return;
 		}
@@ -111,29 +111,37 @@ class admin_core_mycp_details extends ipsCommand
 		{
 			if( !$this->request['email_confirm'] )
 			{
-				$this->registry->output->global_message = $this->lang->words['change_both_fields'];
+				$this->registry->output->global_error = $this->lang->words['change_both_fields'];
 				$this->_showForm();
 				return;
 			}
 			else if( $this->request['email'] != $this->request['email_confirm'] )
 			{
-				$this->registry->output->global_message = $this->lang->words['change_not_match'];
+				$this->registry->output->global_error = $this->lang->words['change_not_match'];
 				$this->_showForm();
 				return;
 			}
 			
 			$email		= trim($this->request['email']);
+			
+			if( ! IPSText::checkEmailAddress( $email ) )
+			{
+				$this->registry->output->global_error = $this->lang->words['bad_email_supplied'];
+				$this->_showForm();
+				return;
+			}
+			
 			$email_check = IPSMember::load( mb_strtolower($email) );
 			
 			if ( $email_check['member_id'] )
 			{
 				if ( $email_check['member_id'] == $this->memberData['member_id'] )
 				{
-					$this->registry->output->global_message = $this->lang->words['already_using_email'];
+					$this->registry->output->global_error = $this->lang->words['already_using_email'];
 				}
 				else
 				{
-					$this->registry->output->global_message = $this->lang->words['change_email_already_used'];
+					$this->registry->output->global_error = $this->lang->words['change_email_already_used'];
 				}
 				
 				$this->_showForm();
@@ -160,13 +168,13 @@ class admin_core_mycp_details extends ipsCommand
 		{
 			if( !$this->request['password_confirm'] )
 			{
-				$this->registry->output->global_message = $this->lang->words['change_both_fields'];
+				$this->registry->output->global_error = $this->lang->words['change_both_fields'];
 				$this->_showForm();
 				return;
 			}
 			else if( $this->request['password'] != $this->request['password_confirm'] )
 			{
-				$this->registry->output->global_message = $this->lang->words['change_not_match_pw'];
+				$this->registry->output->global_error = $this->lang->words['change_not_match_pw'];
 				$this->_showForm();
 				return;
 			}
diff --git a/upload/admin/applications/core/modules_admin/mycp/index.html b/upload/admin/applications/core/modules_admin/mycp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/mycp/index.html
+++ b/upload/admin/applications/core/modules_admin/mycp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/mycp/xml/index.html b/upload/admin/applications/core/modules_admin/mycp/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/mycp/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/mycp/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/mycp/xml/menu.xml b/upload/admin/applications/core/modules_admin/mycp/xml/menu.xml
index e9bc81b0..33d19a2d 100644
--- a/upload/admin/applications/core/modules_admin/mycp/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/mycp/xml/menu.xml
@@ -6,8 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Панель управлени�</subitemtitle>
+					<subitemlang>dashboard</subitemlang>
 					<subsection>dashboard</subsection>
 					<subitemurl></subitemurl>
+					<subitemrolekey>dashboard</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -17,6 +19,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Изменение �воих данных</subitemtitle>
+					<subitemlang>mydetails</subitemlang>
 					<subsection>details</subsection>
 					<subitemurl></subitemurl>
 					<subitemrolekey></subitemrolekey>
diff --git a/upload/admin/applications/core/modules_admin/mycp/xml/permissions.xml b/upload/admin/applications/core/modules_admin/mycp/xml/permissions.xml
new file mode 100644
index 00000000..8fef67e3
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/mycp/xml/permissions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<permissions>
+	<group>
+		<grouptitle>My Control Panel</grouptitle>
+		<grouplang>core_mycp</grouplang>
+		<items>
+			<item>
+				<key>dashboard</key>
+				<string>Can access the dashboard?</string>
+			</item>
+		</items>
+	</group>
+</permissions>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/posts/badwords.php b/upload/admin/applications/core/modules_admin/posts/badwords.php
index 026c81d0..9666c976 100644
--- a/upload/admin/applications/core/modules_admin/posts/badwords.php
+++ b/upload/admin/applications/core/modules_admin/posts/badwords.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bad Word Filters
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,7 +28,6 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * HTML skin object
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $html;
@@ -36,9 +35,8 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -98,8 +96,7 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Remove a badword filter
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function badwordRemove()
 	{
@@ -117,14 +114,13 @@ class admin_core_posts_badwords extends ipsCommand
 		/* Rebuild cache and bounce */
 		$this->badwordsRebuildCache();		
 		$this->registry->output->global_message = $this->lang->words['bwl_filter_removed'];
-		$this->badwordsOvervew();
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->html->form_code );
 	}	
 	
 	/**
 	 * Handles the badword edit form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function handleBadwordEdit()
 	{
@@ -146,28 +142,24 @@ class admin_core_posts_badwords extends ipsCommand
 		$this->request['match'] = $this->request['match'] ? 1 : 0;
 		
 		/* Swap Text */
-		$this->request['after'] = isset( $this->request['after'] ) && $this->request['after'] ? $this->request['after'] : "";
-		
-		$this->DB->force_data_type['type'] = 'string';
-		$this->DB->force_data_type['swop'] = 'string';
+		$this->DB->setDataType( array( 'type', 'swop' ), 'string' );
 			
 		$this->DB->update( 'badwords', array( 
 												'type'    => trim( $this->request['before'] ),
 												'swop'    => trim( $this->request['after'] ),
 												'm_exact' => $this->request['match']
-												), "wid={$id}" );
+												), "wid=" . $id );
 			  
 		/* Recache and bounce */
 		$this->badwordsRebuildCache();		
 		$this->registry->output->global_message = $this->lang->words['bwl_filter_edited'];		
-		$this->badwordsOvervew();
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->html->form_code );
 	}	
 	
 	/**
 	 * Edit Badword Form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 * @author	Josh
 	 */
 	public function badwordEditForm()
@@ -201,9 +193,8 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Handle add bad word request
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function badwordAdd()
 	{
 		/* Check for before text */
@@ -214,13 +205,9 @@ class admin_core_posts_badwords extends ipsCommand
 		
 		/* Match */		
 		$this->request['match'] = $this->request['match'] ? 1 : 0;
-		
-		/* Swap Text */
-		$this->request['after'] = isset( $this->request['after'] ) && $this->request['after'] ? $this->request['after'] : "";
-		
+
 		/* Insert filter */
-		$this->DB->force_data_type['type'] = 'string';
-		$this->DB->force_data_type['swop'] = 'string';
+		$this->DB->setDataType( array( 'type', 'swop' ), 'string' );
 		
 		$this->DB->insert( 'badwords', array( 
 												'type'    => trim( $this->request['before'] ),
@@ -234,14 +221,13 @@ class admin_core_posts_badwords extends ipsCommand
 		
 		/* Bounce */
 		$this->registry->output->global_message = $this->lang->words['bwl_filter_new'];
-		$this->badwordsOvervew();
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->html->form_code );
 	}	
 	
 	/**
 	 * Badword Overview Screen
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function badwordsOvervew()
 	{
@@ -267,7 +253,6 @@ class admin_core_posts_badwords extends ipsCommand
 				
 				$rows[] = $r;
 			}
-			
 		}
 		
 		/* Output */
@@ -278,8 +263,7 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Import badwords from an xml file
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function badwordsImport()
 	{
@@ -298,7 +282,7 @@ class admin_core_posts_badwords extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -353,8 +337,7 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Exports badwords to an xml file
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function badwordsExport()
 	{
@@ -362,7 +345,7 @@ class admin_core_posts_badwords extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -388,8 +371,7 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Rebuild badword cache
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function badwordsRebuildCache()
 	{
@@ -411,12 +393,11 @@ class admin_core_posts_badwords extends ipsCommand
 	/**
 	 * Custom sort operation
 	 *
-	 * @access	private
 	 * @param	string	A
 	 * @param	string	B
 	 * @return	integer
 	 */
-	private function _thisUsort($a, $b)
+	protected function _thisUsort($a, $b)
 	{
 		if ( IPSText::mbstrlen($a['type']) == IPSText::mbstrlen($b['type']) )
 		{
diff --git a/upload/admin/applications/core/modules_admin/posts/bbcode.php b/upload/admin/applications/core/modules_admin/posts/bbcode.php
index e840f51c..7d02ec07 100644
--- a/upload/admin/applications/core/modules_admin/posts/bbcode.php
+++ b/upload/admin/applications/core/modules_admin/posts/bbcode.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode Management
- * Last Updated: $LastChangedDate: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-08-23 18:01:24 -0400 (Tue, 23 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6925 $
+ * @version		$Rev: 9407 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,17 +28,15 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -132,15 +130,14 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Export all bbcode XML file
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeExportAll()
+	protected function _bbcodeExportAll()
 	{
 		/* Loop through apps */
 		$msg     = array();
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -185,7 +182,7 @@ class admin_core_posts_bbcode extends ipsCommand
 			}
 		}
                     
-		$this->registry->output->global_message = "Completed" . implode( "<br />", $msg );
+		$this->registry->output->setMessage( "Completed" . implode( "<br />", $msg ), 1 );
 		
 		$this->_bbcodeStart();
 	}
@@ -193,10 +190,9 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Import a bbcode XML file
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeImportAll()
+	protected function _bbcodeImportAll()
 	{
 		/* Loop through apps */
 		$msg     = array();
@@ -205,7 +201,7 @@ class admin_core_posts_bbcode extends ipsCommand
 		{
 			$file = IPSLib::getAppDir( $appDir ) . '/xml/' . $appDir . '_bbcode.xml';
 			
-			if ( file_exists( $file ) )
+			if ( is_file( $file ) )
 			{
 				$content = @file_get_contents( $file );
 				
@@ -226,7 +222,7 @@ class admin_core_posts_bbcode extends ipsCommand
 			}
 		}
                     
-		$this->registry->output->global_message = implode( "<br />", $msg );
+		$this->registry->output->setMessage( implode( "<br />", $msg ), 1 );
 		
 		$this->_bbcodeStart();
 	}
@@ -234,10 +230,9 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Import a bbcode XML file
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeImport()
+	protected function _bbcodeImport()
 	{
 		$content = $this->registry->getClass('adminFunctions')->importXml();
 		
@@ -247,7 +242,7 @@ class admin_core_posts_bbcode extends ipsCommand
 		
 		if ( ! $content )
 		{
-			$this->registry->output->global_message = $this->lang->words['upload_failed'];
+			$this->registry->output->global_error = $this->lang->words['upload_failed'];
 			$this->_bbcodeStart();
 			return;
 		}
@@ -264,7 +259,6 @@ class admin_core_posts_bbcode extends ipsCommand
 	 * Perform the BBcode import
 	 * Abstracted here so the installer can use it (and potentially other apps)
 	 *
-	 * @access	public
 	 * @param	string		Raw XML code
 	 * @return	array 		[ 'inserted' => int, 'updated' => int ]
 	 */
@@ -274,7 +268,7 @@ class admin_core_posts_bbcode extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -388,16 +382,15 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Export a bbcode XML file
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeExport()
+	protected function _bbcodeExport()
 	{
 		//-----------------------------------------
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -436,10 +429,9 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Delete a bbcode
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeDelete()
+	protected function _bbcodeDelete()
 	{
 		if ( ! $this->request['id'] )
 		{
@@ -458,11 +450,10 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Test a bbcode
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 * @todo 	[Future] Also show the resulting HTML alongside the formatted content
 	 */
-	private function _bbcodeTest()
+	protected function _bbcodeTest()
 	{
 		$t = IPSText::stripslashes(htmlspecialchars($_POST['bbtest']));
 
@@ -472,7 +463,6 @@ class admin_core_posts_bbcode extends ipsCommand
 		
 		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
 		IPSText::getTextClass('bbcode')->parse_smilies		= 0;
-		IPSText::getTextClass('bbcode')->parse_wordwrap		= 0;
 		IPSText::getTextClass('bbcode')->parsing_section	= 'global';
 		
 		//-----------------------------------------
@@ -495,7 +485,7 @@ class admin_core_posts_bbcode extends ipsCommand
 		
 		$this->settings['base_url'] = $_current;
 
-		$this->registry->output->global_message = $this->lang->words['bbcode_test'] . $t;
+		$this->registry->output->setMessage( $this->lang->words['bbcode_test'] . $t, true );
 		
 		$this->_bbcodeStart();
 	}
@@ -503,11 +493,10 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Save a bbcode [add|edit]
 	 *
-	 * @access	private
 	 * @param	string		[add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeSave($type='add')
+	protected function _bbcodeSave($type='add')
 	{
 		if ( $type == 'edit' )
 		{
@@ -665,7 +654,6 @@ class admin_core_posts_bbcode extends ipsCommand
 						'bbcode_optional_option'	=> intval( $this->request['bbcode_optional_option'] ),
 						'bbcode_aliases'			=> $this->request['bbcode_aliases'],
 						'bbcode_image'				=> $this->request['bbcode_image'],
-						'bbcode_strip_search'		=> intval( $this->request['bbcode_strip_search'] ),
 						'bbcode_app'				=> $this->request['bbcode_app'],
 						'bbcode_protected'			=> intval( $this->request['bbcode_protected'] ),
 						'bbcode_custom_regex'		=> str_replace( "&#092;", '\\', IPSText::stripslashes( $_POST['bbcode_custom_regex'] ) ),
@@ -714,11 +702,10 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Add/Edit bbcode form
 	 *
-	 * @access	private
 	 * @param	string		[add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeForm($type='add')
+	protected function _bbcodeForm($type='add')
 	{
 		$this->registry->output->nav[]				= array( '', $this->lang->words['add_edit'] );
 		
@@ -752,21 +739,21 @@ class admin_core_posts_bbcode extends ipsCommand
 		// Grab the 'sections'
 		//-----------------------------------------
 		
-		$sections	= array();
+		$sections = array();
 		
 		foreach( ipsRegistry::$applications as $_app_dir => $app_data )
 		{
 			$_file	= IPSLib::getAppDir( $_app_dir ) . '/extensions/editorSections.php';
 			
-			if( file_exists($_file) )
+			if( is_file($_file) )
 			{
-				$BBCODE		= array();
+				$BBCODE = array();
 				
-				include( $_file );
+				include( $_file );/*maybeLibHook*/
 				
 				if( is_array($BBCODE) AND count($BBCODE) )
 				{
-					$sections	= array_merge( $sections, $BBCODE );
+					$sections = array_merge( $sections, $BBCODE );
 				}
 			}
 		}
@@ -777,10 +764,9 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Bbcode splash page
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bbcodeStart()
+	protected function _bbcodeStart()
 	{
 		//-----------------------------------------
 		// Show the codes mahn!
@@ -820,8 +806,7 @@ class admin_core_posts_bbcode extends ipsCommand
 	/**
 	 * Rebuild bbcode cache
 	 *
-	 * @access	public
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function bbcodeRebuildCache()
 	{
@@ -832,10 +817,9 @@ class admin_core_posts_bbcode extends ipsCommand
 		
 		while ( $r = $this->DB->fetch() )
 		{
-			$cache[] = $r;
+			$cache[ $r['bbcode_tag'] ] = $r;
 		}
 		
 		$this->cache->setCache( 'bbcode', $cache, array( 'array' => 1 ) );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/posts/defaultSection.php b/upload/admin/applications/core/modules_admin/posts/defaultSection.php
index 9e05fed6..e2501327 100644
--- a/upload/admin/applications/core/modules_admin/posts/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/posts/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default posts section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'posts' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'emoticons';
diff --git a/upload/admin/applications/core/modules_admin/posts/emoticons.php b/upload/admin/applications/core/modules_admin/posts/emoticons.php
index b8217e27..9d785651 100644
--- a/upload/admin/applications/core/modules_admin/posts/emoticons.php
+++ b/upload/admin/applications/core/modules_admin/posts/emoticons.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Emoticon Management
- * Last Updated: $LastChangedDate: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6863 $
+ * @version		$Rev: 9520 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,17 +28,17 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Allowed file types
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $allowed_files = array( 'png', 'jpeg', 'jpg', 'gif' );
 	
+	protected $setCache   = array();
+	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -116,6 +116,9 @@ class admin_core_posts_emoticons extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'emoticons_manage' );
 				$this->emoticonsOverview();
 			break;
+			case 'reorder':
+				$this->_reorder();
+			break;
 		}
 		
 		/* Output */
@@ -123,14 +126,84 @@ class admin_core_posts_emoticons extends ipsCommand
 		$this->registry->output->sendOutput();		
 	}
 	
+	/**
+	 * Reorder hooks
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _reorder()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
+		$ajax		 = new $classToLoad();
+		$set         = trim( $this->request['id'] );
+		
+		//-----------------------------------------
+		// Checks...
+		//-----------------------------------------
+
+		if ( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
+		{
+			$ajax->returnString( $this->lang->words['postform_badmd5'] );
+			exit();
+		}
+ 		
+ 		//-----------------------------------------
+ 		// Save new position
+ 		//-----------------------------------------
+
+ 		$position	= 1;
+ 		
+ 		if ( is_array( $this->request['emoticons'] ) AND count( $this->request['emoticons'] ) )
+ 		{
+ 			/* Reset all emoticons to 0 temporarily */
+ 			$this->DB->update( 'emoticons', array( 'emo_position' => 0 ), 'emo_set=\'' . $this->DB->addSlashes( $set ) . "'" );
+ 			
+ 			foreach( $this->request['emoticons'] as $this_id )
+ 			{
+ 				$this->DB->update( 'emoticons', array( 'emo_position' => $position ), 'id=' . $this_id );
+ 				
+ 				$position++;
+ 			}
+ 		}
+ 		
+		$this->emoticonsRebuildCache();
+
+ 		$ajax->returnString( 'OK' );
+ 		exit();
+	}
+	
 	/**
 	 * Import an emoticon pack
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsPackImport()
 	{
+		/* Make sure all emoticon directories are writable */
+		$this->DB->build( array( 'select' => $this->DB->buildDistinct('emo_set') . ' as folder', 'from' => 'emoticons' ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$_folders[]	= $r['folder'];
+		}
+		
+		if( count($_folders) )
+		{
+			foreach( $_folders as $folder )
+			{
+				if( !IPSLib::isWritable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $folder ) )
+				{
+					$this->registry->output->global_message = sprintf( $this->lang->words['emodir_not_write'], PUBLIC_DIRECTORY . '/style_emoticons/' . $folder );
+					return $this->emoticonsPackSplash();
+				}
+			}
+		}
+			
 		/* Get the xml file */
 		$content = $this->registry->adminFunctions->importXml( 'ipb_emoticons.xml' );
 		
@@ -142,10 +215,10 @@ class admin_core_posts_emoticons extends ipsCommand
 		}
 		
 		/* Setup XML */
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
-		require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH.'classXMLArchive.php' );/*noLibHook*/
 		$xmlarchive = new classXMLArchive();
 		
 		/* Read the archive */
@@ -180,7 +253,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		$emo_set_dir = trim( $this->request['emo_set'] );
 		
 		/* New emoticon set directory */
-		$this->request['new_emo_set'] = preg_replace( "/[^a-zA-Z0-9\-_]/", "", $this->request['new_emo_set'] );
+		$this->request['new_emo_set'] = preg_replace( '/[^a-zA-Z0-9\-_]/', "", $this->request['new_emo_set'] );
 		
 		/* Create the new set */
 		if ( $this->request['new_emo_set'] )
@@ -188,17 +261,17 @@ class admin_core_posts_emoticons extends ipsCommand
 			$emo_set_dir = trim( $this->request['new_emo_set'] );
 			
 			/* Check to see if the directory already exists */
-			if ( file_exists( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $emo_set_dir ) )
+			if ( file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $emo_set_dir ) )
 			{
 				$this->registry->output->global_message = sprintf( $this->lang->words['emo_already'], $emo_set_dir ); 
 				return $this->emoticonsPackSplash();
 			}
 		
 			/* Create the directory */
-			if ( @mkdir( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $emo_set_dir, 0777 ) )
+			if ( @mkdir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $emo_set_dir, IPS_FOLDER_PERMISSION ) )
 			{
-				@chmod( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $emo_set_dir, 0777 );
-				@file_put_contents( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $emo_set_dir . '/index.html', '' );
+				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $emo_set_dir, IPS_FOLDER_PERMISSION );
+				@file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $emo_set_dir . '/index.html', '' );
 			}
 			else
 			{
@@ -213,7 +286,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		
 		if ( $this->request['overwrite'] != 1  )
 		{
-			$this->DB->build( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$emo_set_dir."'" ) );
+			$this->DB->build( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='" . $emo_set_dir . "'" ) );
 			$this->DB->execute();
 		
 			while( $r = $this->DB->fetch() )
@@ -240,7 +313,7 @@ class admin_core_posts_emoticons extends ipsCommand
 			}
 			
 			/* Get the extension */
-			$file_extension = preg_replace( "#^.*\.(.+?)$#si", "\\1", mb_strtolower( $image ) );
+			$file_extension = preg_replace( '#^.*\.(.+?)$#si', "\\1", mb_strtolower( $image ) );
 			
 			/* Make sure it's allowed */
 			if ( ! in_array( $file_extension, $this->allowed_files ) )
@@ -249,12 +322,12 @@ class admin_core_posts_emoticons extends ipsCommand
 			}
 			
 			/* Remove any existing emoticon */
-			@unlink( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $emo_set_dir . '/' . $image );
+			@unlink( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $emo_set_dir . '/' . $image );
 			
 			$this->DB->delete( 'emoticons', "typed='$typed' and image='$image' and emo_set='$emo_set_dir'" );
 			
 			/* Create the image in the file system */
-			if( $FH = fopen( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' .$emo_set_dir . '/' . $image, 'wb' ) )
+			if( $FH = fopen( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' .$emo_set_dir . '/' . $image, 'wb' ) )
 			{
 				if ( fwrite( $FH, $emoticons[ $image ] ) )
 				{
@@ -268,7 +341,7 @@ class admin_core_posts_emoticons extends ipsCommand
 			/* Add the emoticon to all the other directories */
 			try
 			{
-	 			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' ) as $file )
+	 			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' ) as $file )
 	 			{
 	 				if( ! $file->isDot() && $file->isDir() )
 	 				{
@@ -277,11 +350,11 @@ class admin_core_posts_emoticons extends ipsCommand
 							continue;
 						}
 						
-						if ( ! file_exists( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $file->getFilename() . '/' . $image ) )
+						if ( ! is_file( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $file->getFilename() . '/' . $image ) )
 						{
-							$this->DB->buildAndFetch( array( 'delete' => 'emoticons', 'where' => "typed='$typed' and image='$image' and emo_set='{$file->getFilename()}'" ) );
+							$this->DB->delete( 'emoticons', "typed='$typed' and image='$image' and emo_set='{$file->getFilename()}'" );
 							
-							if ( $FH = @fopen( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $file->getFilename() . '/' . $image, 'wb' ) )
+							if ( $FH = @fopen( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $file->getFilename() . '/' . $image, 'wb' ) )
 							{
 								if ( fwrite( $FH, $emoticons[ $image ] ) )
 								{
@@ -307,16 +380,15 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Export the specified emoticon directory
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsPackExport()
 	{
 		/* Setup XML */
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
-		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 		$xmlarchive = new classXMLArchive();
 		
 		/* Check the emoticon set */
@@ -345,13 +417,13 @@ class admin_core_posts_emoticons extends ipsCommand
 		
 		try
 		{
-			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $this->request['emo_set'] ) as $file )		
+			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $this->request['emo_set'] ) as $file )		
  			{
  				if( ! $file->isDot() )
  				{
  					if ( $emo_db[ $file->getFilename() ] != "" )
  					{
-						$files_to_add[] = DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $this->request['emo_set'] . '/' . $file->getFilename();
+						$files_to_add[] = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $this->request['emo_set'] . '/' . $file->getFilename();
 					}
  				}
  			}
@@ -392,13 +464,12 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Builds the emoticon import/export pack splash screen
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsPackSplash()
 	{
 		/* Check for the emoticon directory */
-		if( ! is_dir( DOC_IPS_ROOT_PATH . 'public/style_emoticons' ) )
+		if( ! is_dir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) )
 		{
 			$this->registry->output->showError( $this->lang->words['emo_nolocate'], 2110 );
 			
@@ -423,7 +494,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		
 		try
 		{
- 			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_emoticons' ) as $file )
+ 			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) as $file )
  			{
  				if( $file->isDir() && ! $file->isDot() )
  				{
@@ -446,8 +517,7 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Remove the specified emoticon
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsRemove()
 	{
@@ -493,13 +563,17 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Add emoticons to the default directory
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsAdd()
 	{
+		$image    = str_replace( '---', '.', trim( $this->request['emo_image'] ) );
+		$set      = trim( $this->request['id'] );
+		$typed    = $this->_getNameFromImg( $image, $set );
+		$position = $this->_getNextPosition( $set );
+		
 		/* Check the id */
-		if( $this->request['id'] == "" )
+		if ( empty( $set ) )
 		{
 			$this->registry->output->global_message = $this->lang->words['emo_nogid'];
 			$this->emoticonsOverview();
@@ -514,82 +588,65 @@ class admin_core_posts_emoticons extends ipsCommand
 			return;
 		}			
 		
-		/* Loop through the request and look for emoticons */
-		foreach( $this->request as $key => $value )
+		if ( ! $image OR ! $typed )
 		{
-			if( preg_match( "/^emo_type_(\d+)$/", $key, $match ) )
-			{
-				if( isset( $this->request[ $match[0] ] ) )
-				{
-					/* Get the emoticon info */
-					$typed = str_replace( '&quot;', "", $this->request[ $match[0] ] );
-					$click = $this->request[ 'emo_click_'.$match[1] ];
-					$add   = $this->request[ 'emo_add_'.$match[1] ];
-					$image = $this->request[ 'emo_image_'.$match[1] ];
-					$set   = trim( $this->request['id'] );					
-					$typed = str_replace( '&#092;', "", $typed );
-					
-					/* Check the add all flag */
-					if( $this->request['addall'] )
-					{
-						$add = 1;
-					}
-					
-					/* Add this emoticon if we have have the required info */
-					if( $add and $typed and $image )
-					{
-						/* Insert the emo record */
-						$this->DB->insert( 'emoticons', array( 'clickable' => intval( $click ), 'typed' => $typed, 'image' => $image, 'emo_set' => $set ) );
-						
-						/* Emoticon list */
-						$emodirs = array( 0 => '');
-						
-						/* Loop through all the emoticons */
-						try
-						{
-							foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_emoticons' ) as $file )				 		
-				 			{
-				 				if( ! $file->isDot() && $file->isDir() )
-				 				{
-									if( $file->getFilename() == 'default' )
-									{
-										$emodirs[0] = $file->getFilename();
-									}
-									else
-									{
-										$emodirs[] = $file->getFilename();
-									}
-				 				}
-				 			}
-						} catch ( Exception $e ) {}
-						
-				 		/* Add this emoticon to the other sets */				 		
-				 		foreach( $emodirs as $directory )
-				 		{
-					 		if( $directory == $set )
-					 		{
-						 		continue;
-					 		}
-					 		
-					 		$this->DB->insert( 'emoticons', array( 'clickable' => intval( $click ), 'typed' => $typed, 'image' => $image, 'emo_set' => $directory ) );
-				 		}
-					}
-				}
-			}
+			$this->registry->output->global_message = $this->lang->words['emo_nogid'];
+			$this->emoticonsOverview();
+			return;
 		}
 		
+		/* Insert the emo record */
+		$this->DB->insert( 'emoticons', array( 'typed' => $typed, 'image' => $image, 'emo_set' => $set, 'emo_position' => $position ) );
+		
+		/* Emoticon list */
+		$emodirs = array( 0 => '');
+		
+		/* Loop through all the emoticons */
+		try
+		{
+			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) as $file )				 		
+ 			{
+ 				if ( ! $file->isDot() && $file->isDir() && strpos( $file->getFilename(), '.' ) != 0 )
+ 				{
+					if( $file->getFilename() == 'default' )
+					{
+						$emodirs[0] = $file->getFilename();
+					}
+					else
+					{
+						$emodirs[] = $file->getFilename();
+					}
+ 				}
+ 			}
+		} catch ( Exception $e ) {}
+		
+ 		/* Add this emoticon to the other sets */				 		
+ 		foreach( $emodirs as $directory )
+ 		{
+	 		if ( $directory == $set )
+	 		{
+		 		continue;
+	 		}
+	 		
+	 		if ( empty( $directory ) )
+	 		{
+	 			continue;
+	 		}
+	 		
+	 		$this->DB->insert( 'emoticons', array( 'typed' => $typed, 'image' => $image, 'emo_set' => $directory, 'emo_position' => $position ) );
+ 		}
+		
 		/* Rebuild the cache and bounce */
 		$this->emoticonsRebuildCache();
 		
 		$this->registry->output->global_message = $this->lang->words['emo_updated'];	
-		$this->emoticonsManageDirectory();
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->html->form_code . '&amp;do=emo_manage&amp;id=' . $this->request['id'] );
 	}	
 	
 	/**
 	 * Handles the upload emoticon form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsUpload()
 	{
@@ -634,7 +691,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		
 		try
 		{
-			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . 'public/style_emoticons' ) as $file )
+			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) as $file )
  			{
  				if( ! $file->isDot() && $file->isDir() )
  				{
@@ -681,7 +738,7 @@ class admin_core_posts_emoticons extends ipsCommand
 			// Make sure it's not a NAUGHTY file
 			//-----------------------------------------
 			
-			$file_extension = preg_replace( "#^.*\.(.+?)$#si", "\\1", mb_strtolower( $_FILES[ $field ]['name'] ) );
+			$file_extension = preg_replace( '#^.*\.(.+?)$#si', "\\1", mb_strtolower( $_FILES[ $field ]['name'] ) );
 		
 			if ( ! in_array( $file_extension, $this->allowed_files ) )
 			{
@@ -694,7 +751,7 @@ class admin_core_posts_emoticons extends ipsCommand
 			// Copy the upload to the uploads directory
 			//-----------------------------------------
 			
-			if ( ! @move_uploaded_file( $_FILES[ $field ]['tmp_name'], DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $first_dir . "/" . $FILE_NAME) )
+			if ( ! @move_uploaded_file( $_FILES[ $field ]['tmp_name'], DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $first_dir . "/" . $FILE_NAME) )
 			{
 				$this->registry->output->global_message = "The upload failed, sorry!";
 				$this->emoticonsOverview();
@@ -702,7 +759,7 @@ class admin_core_posts_emoticons extends ipsCommand
 			}
 			else
 			{
-				@chmod( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $first_dir . "/" . $FILE_NAME, 0777 );
+				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $first_dir . "/" . $FILE_NAME, IPS_FILE_PERMISSION );
 				
 				//-----------------------------------------
 				// Copy to other folders
@@ -712,7 +769,7 @@ class admin_core_posts_emoticons extends ipsCommand
 				{
 					foreach ( $directories as $newdir )
 					{
-						if ( file_exists( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
+						if ( is_file( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
 						{
 							if ( $overwrite != 1 OR $newdir == 'default' )
 							{
@@ -720,9 +777,9 @@ class admin_core_posts_emoticons extends ipsCommand
 							}
 						}
 						
-						if ( @copy( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $first_dir . "/" . $FILE_NAME, DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
+						if ( @copy( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $first_dir . "/" . $FILE_NAME, DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
 						{
-							@chmod( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME, 0777 );
+							@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME, IPS_FILE_PERMISSION );
 						}
 					}
 				}
@@ -732,14 +789,14 @@ class admin_core_posts_emoticons extends ipsCommand
 				{
 					foreach ( $emodirs as $newdir )
 					{
-						if ( file_exists( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
+						if ( is_file( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
 						{
 							continue;
 						}
 						
-						if( @copy( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $first_dir . "/" .$FILE_NAME, DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
+						if( @copy( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $first_dir . "/" .$FILE_NAME, DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME ) )
 						{
-							@chmod( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $newdir . "/" . $FILE_NAME, 0777 );
+							@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $newdir . "/" . $FILE_NAME, IPS_FILE_PERMISSION );
 						}
 					}
 				}
@@ -763,8 +820,7 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Removes an emoticon set
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsSetRemove()
 	{
@@ -784,7 +840,9 @@ class admin_core_posts_emoticons extends ipsCommand
 		}
 		
 		/* Remove the directory */
-		$this->registry->adminFunctions->removeDirectory( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $this->request['id'] );
+		$classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . '/classFileManagement.php', 'classFileManagement' );
+		$fileManagement	= new $classToLoad();
+		$fileManagement->removeDirectory( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $this->request['id'] );
 		
 		/* Remove the database entry */
 		$this->DB->delete( 'emoticons', "emo_set='{$this->request['id']}'" );
@@ -800,14 +858,13 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Add/Edit an emoticon folder name
 	 *
-	 * @access	public
 	 * @param	string	Type (add or edit)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsSetAlter( $type='add' )
 	{
 		/* Get the name */
-		$name = preg_replace( "/[^a-zA-Z0-9\-_]/", "", $this->request['emoset'] );
+		$name = preg_replace( '/[^a-zA-Z0-9\-_]/', "", $this->request['emoset'] );
 		
 		/* Check th ename */
 		if( $name == "" )
@@ -824,7 +881,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		}
 		
 		/* Check to see if the directory already exists */
-		if( file_exists( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name ) )
+		if( file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name ) )
 		{
 			$this->registry->output->global_message = sprintf( $this->lang->words['emo_already'], $name ); 
 			return $this->emoticonsOverview();
@@ -833,20 +890,20 @@ class admin_core_posts_emoticons extends ipsCommand
 		if( $type == 'add' )
 		{
 			/* Create the directory */
-			if( @mkdir( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name, 0777 ) )
+			if( @mkdir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name, IPS_FOLDER_PERMISSION ) )
 			{
-				@chmod( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name, 0777 );
-				@file_put_contents( DOC_IPS_ROOT_PATH . 'public/style_emoticons/' . $name . '/index.html', '' );
+				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name, IPS_FOLDER_PERMISSION );
+				@file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name . '/index.html', '' );
 				
 				/* Copy default emoticons */
 				try
 				{
-					foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . '/public/style_emoticons/default/' ) as $file )
+					foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/default/' ) as $file )
 		 			{
 		 				if( ! $file->isDot() )
 		 				{
-							@copy( DOC_IPS_ROOT_PATH . '/public/style_emoticons/default/' . $file->getFilename(), DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name . '/' . $file->getFilename() );
-							@chmod( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name . '/' . $file->getFilename(), 0777 );
+							@copy( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/default/' . $file->getFilename(), DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name . '/' . $file->getFilename() );
+							@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name . '/' . $file->getFilename(), IPS_FILE_PERMISSION );
 		 				}
 		 			}
 				} catch ( Exception $e ) {}
@@ -892,10 +949,10 @@ class admin_core_posts_emoticons extends ipsCommand
 			}
 			
 			/* Rename the directory */
-			if ( @rename( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $this->request['id'], DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name ) )
+			if ( @rename( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $this->request['id'], DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name ) )
 			{
 				/* Check to see if the rename worked */
-				if ( file_exists( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $name ) )
+				if ( file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $name ) )
 				{
 					/* Update all the emoticons */
 					$this->DB->update( 'emoticons', array( 'emo_set' => $name ), "emo_set='{$this->request['id']}'" );
@@ -934,8 +991,7 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Process edit emoticons forum
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsEdit()
 	{
@@ -950,7 +1006,7 @@ class admin_core_posts_emoticons extends ipsCommand
 		foreach( $this->request as $key => $value )
 		{
 			/* Check to see if its an emoticon */
-			if ( preg_match( "/^emo_id_(\d+)$/", $key, $match ) )
+			if ( preg_match( '/^emo_id_(\d+)$/', $key, $match ) )
 			{
 				if ( $match[0] )
 				{
@@ -999,8 +1055,7 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Manage emoticons
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsManageDirectory()
 	{
@@ -1008,24 +1063,9 @@ class admin_core_posts_emoticons extends ipsCommand
 		$this->request['id'] = trim( $this->request['id'] );
 
 		/* Get emoticons for this group */
-		$emo_db   = array();
+		$emo_db   = $this->_getEmoSet( $this->request['id'] );
 		$emo_file = array();
 		
-		$this->DB->build( array( 
-								'select' => '*', 
-								'from'   => 'emoticons', 
-								'where'  => "emo_set='{$this->request['id']}'", 
-								'order'  => 'clickable DESC, image ASC' 
-						)	 );
-		$this->DB->execute();
-		
-		/* Loop through the emoticons */
-		while( $r = $this->DB->fetch() )
-		{
-			$emo_db[ $r['image'] ] = $r;
-		}
-		
-		
 		/* Get emoticons from the directory */
 		$emo_file  = array();
 		$emo_rfile = $this->_emoticonGetGolderContents( $this->request['id'] );
@@ -1034,10 +1074,6 @@ class admin_core_posts_emoticons extends ipsCommand
 		{
 			$emo_file[ $ef ] = $ef;
 		}
-
-		/* Number of emoticons to show per row */
-		$per_row    = 5;
-		$td_width   = 100 / $per_row;
 		
 		/* Loop through the database emoticons */		
 		$poss_names = array();
@@ -1046,23 +1082,10 @@ class admin_core_posts_emoticons extends ipsCommand
 		foreach( $emo_db as $image => $data )
 		{
 			/* Remove this from the file list, it's already added */
-			unset( $emo_file[ $image ] );
-			
-			/* Clickable? */
-			if ( $data['clickable'] )
-			{
-				$data['_click'] = 'checked="checked"';
-				$data['_class'] = 'tablerow1';
-			}
-			else
-			{
-				$data['_click'] = '';
-				$data['_class'] = 'tablerow2';
-			}
+			unset( $emo_file[ $data['image'] ] );
 			
 			/* Add image to array */
-			$data['image'] = $image;
-			
+			$data['image']    = $data['image'];
 			/* Addd array to output */
 			$db_rows[] = $data;
 			
@@ -1082,9 +1105,9 @@ class admin_core_posts_emoticons extends ipsCommand
 				$_fdata = array();
 				
 				/* Suggest an emoticon name */
-				$_fdata['poss_name'] = ':'.preg_replace( "/(.*)(\..+?)$/", "\\1", $image ).':';
+				$_fdata['poss_name'] = ':'.preg_replace( '/(.*)(\..+?)$/', "\\1", $image ).':';
 				
-				if ( isset($poss_names[ $_fdata['poss_name'] ]) AND $poss_names[ $_fdata['poss_name'] ] )
+				if ( ! empty($poss_names[ $_fdata['poss_name'] ]) )
 				{
 					$_fdata['poss_name'] = preg_replace( "/:$/", "2:", $_fdata['poss_name'] );
 				}
@@ -1100,19 +1123,18 @@ class admin_core_posts_emoticons extends ipsCommand
 		/* Output */
 
 		$this->registry->output->extra_nav[] = array( '', $this->lang->words['emo_manage_set'].$this->request['id'] );		
-		$this->registry->output->html .= $this->html->emoticonsDirectoryManagement( $db_rows, $file_rows, $td_width, $per_row );
+		$this->registry->output->html .= $this->html->emoticonsDirectoryManagement( $db_rows, $file_rows);
 	}	
 	
 	/**
 	 * Builds the emoticons overview screen
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsOverview()
 	{
 		/* Check for the emoticon directory */
-		if ( ! is_dir( DOC_IPS_ROOT_PATH . '/public/style_emoticons' ) )
+		if ( ! is_dir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) )
 		{
 			$this->registry->output->showError( $this->lang->words['emo_nolocate'], 2111 );
 			
@@ -1136,11 +1158,11 @@ class admin_core_posts_emoticons extends ipsCommand
 		
 		try
 		{
-			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . '/public/style_emoticons' ) as $_emoticon )
+			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons' ) as $_emoticon )
  			{
  				if ( $_emoticon->isDir() AND ! $_emoticon->isDot() AND $_emoticon->getFilename() != '.svn' )
  				{
-					if ( is_dir( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $_emoticon ) )
+					if ( is_dir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $_emoticon ) )
 					{
 						if( $_emoticon->getFilename() == 'default' )
 						{
@@ -1188,7 +1210,7 @@ class admin_core_posts_emoticons extends ipsCommand
 				}
 			}
 			
-			if ( is_writeable( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $dir ) )
+			if ( is_writeable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $dir ) )
 			{
 				if( $dir == 'default' )
 				{
@@ -1199,13 +1221,13 @@ class admin_core_posts_emoticons extends ipsCommand
 					$checked_def = "";
 				}
 				
-				$data['icon']     = 'icon_can_write.gif';
+				$data['icon']     = 'writable.png';
 				$data['title']    = $this->lang->words['emo_writeable'];
 				$data['checkbox'] = "<input type='checkbox' name='dir_{$dir}' {$checked_def}value='1' />";
 			}
 			else
 			{
-				$data['icon']     = 'icon_cannot_write.gif';
+				$data['icon']     = 'unwritable.png';
 				$data['title']    = $this->lang->words['emo_writeable_not'];
 				$data['checkbox'] = "-";
 			}
@@ -1222,14 +1244,13 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Rebuilds the emoticon cache
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function emoticonsRebuildCache()
 	{
 		$cache = array();
 			
-		$this->DB->build( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$this->DB->build( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons', 'order' => 'emo_position asc' ) );
 		$c = $this->DB->execute();
 	
 		while ( $r = $this->DB->fetch( $c ) )
@@ -1237,20 +1258,83 @@ class admin_core_posts_emoticons extends ipsCommand
 			$cache[] = $r;
 		}
 		
-		usort( $cache, array( $this, '_thisUsort' ) );
-
 		ipsRegistry::cache()->setCache( 'emoticons', $cache, array( 'array' => 1 ) );
 	}
 	
+	/**
+	 * Fetch next position
+	 * @param	string	Emo set ID (default)
+	 * 
+	 */
+	protected function _getNextPosition( $set )
+	{
+		$res = $this->DB->buildAndFetch( array( 'select' => 'MAX(emo_position) as max',
+		 										'from'   => 'emoticons', 
+									 			'where'  => "emo_set='" . $this->DB->addSlashes( $set ) . "'" ) );
+		
+		return intval( $res['max'] ) + 1;
+	}
+	
+	/**
+	 * Fetch possible name
+	 * @param	string	Image name (smile.gif)
+	 * @param	string	Emo set ID (default)
+	 * 
+	 */
+	protected function _getNameFromImg( $img, $set )
+	{
+		$emos = $this->_getEmoSet( $set );
+		$name = ':' . preg_replace( '/(.*)(\..+?)$/', "\\1", $img ).':';
+		
+		/* Ensure we're not doubling up */
+		foreach( $emos as $im => $data )
+		{
+			if ( $name == $data['typed'] )
+			{
+				$name = preg_replace( "/:$/", "2:", $name );
+				break;
+			}
+		}
+		
+		return $name;
+	}
+	
+	/**
+	 * Get all emos in a set
+	 * @param	string	Emo set ID (default)
+	 */
+	protected function _getEmoSet( $set )
+	{
+		if ( ! is_array( $this->setCache[ $set ] ) OR ! count( $this->setCache[ $set ] ) )
+		{
+			$this->setCache[ $set ] = array();
+			
+			$this->DB->build( array( 'select' => '*', 
+									 'from'   => 'emoticons', 
+									 'where'  => "emo_set='" . $this->DB->addSlashes( $set ) . "'", 
+									 'order'  => 'emo_position ASC' )	 );
+			$this->DB->execute();
+			
+			/* Loop through the emoticons */
+			while( $r = $this->DB->fetch() )
+			{
+				$this->setCache[ $set ][ $r['emo_position'] . '.' . rand(0, 10000 ) ] = $r;
+			}
+			
+			ksort( $this->setCache[ $set ] );
+		}
+		
+		return $this->setCache[ $set ];
+	}
+	
 	/**
 	 * Custom sort operation
 	 *
-	 * @access	private
 	 * @param	string		A
 	 * @param	string		B
 	 * @return	integer
 	 */
-	private static function _thisUsort($a, $b)
+	protected static function _thisUsort($a, $b)
 	{
 		if ( strlen($a['typed']) == strlen($b['typed']) )
 		{
@@ -1263,22 +1347,21 @@ class admin_core_posts_emoticons extends ipsCommand
 	/**
 	 * Gets all the emoticons from the specified directory
 	 *
-	 * @access	private
 	 * @param	string	$folder	Emoticon folder to pull emoticons from
 	 * @return	array
-	 **/
-	private function _emoticonGetGolderContents( $folder='default' )
+	 */
+	protected function _emoticonGetGolderContents( $folder='default' )
 	{
 		$files = array();
 		
 		/* Loop through the emoticon directory */
 		try
 		{
-			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . '/public/style_emoticons/' . $folder ) as $_emo )
+			foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons/' . $folder ) as $_emo )
  			{
  				if( $_emo->isFile() && ! $_emo->isDot() )
  				{
-					if ( preg_match( "/\.(?:gif|jpg|jpeg|png|swf)$/i", $_emo->getFilename() ) )
+					if ( preg_match( '/\.(?:gif|jpg|jpeg|png|swf)$/i', $_emo->getFilename() ) )
 					{
 						$files[] = $_emo->getFilename();
 					}
diff --git a/upload/admin/applications/core/modules_admin/posts/index.html b/upload/admin/applications/core/modules_admin/posts/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/posts/index.html
+++ b/upload/admin/applications/core/modules_admin/posts/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/posts/media.php b/upload/admin/applications/core/modules_admin/posts/media.php
index 2e27c71d..bcfd0412 100644
--- a/upload/admin/applications/core/modules_admin/posts/media.php
+++ b/upload/admin/applications/core/modules_admin/posts/media.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode Media Tag Management
- * Last Updated: $LastChangedDate: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-08-04 06:15:18 -0400 (Thu, 04 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 6990 $
+ * @version		$Rev: 9361 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,13 +30,13 @@ class admin_core_posts_media extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -121,9 +121,9 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * Reorder media tags
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _moveMediaTag()
+	protected function _moveMediaTag()
 	{
 		//-----------------------------------------
 		// INIT
@@ -165,9 +165,9 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * Import a mediaTag XML file
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _mediaTagImport()
+	protected function _mediaTagImport()
 	{
 		$content = $this->registry->getClass('adminFunctions')->importXml( 'mediatag.xml' );
 
@@ -193,7 +193,7 @@ class admin_core_posts_media extends ipsCommand
 	 * Abstracted import routine for installer
 	 *
 	 * @param	string		XML file content
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doMediaImport( $content )
 	{
@@ -201,7 +201,7 @@ class admin_core_posts_media extends ipsCommand
 		// Get xml mah-do-dah
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -257,15 +257,15 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * Export a mediaTag XML file
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _mediaTagExport()
+	protected function _mediaTagExport()
 	{
 		//-----------------------------------------
 		// Get xml mah-do-dah
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -300,9 +300,9 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * Delete a custom media tag
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */	
-	private function _mediaTagDelete()
+	protected function _mediaTagDelete()
 	{
 		/* ID */
 		$id = intval( $this->request['id'] );
@@ -321,9 +321,9 @@ class admin_core_posts_media extends ipsCommand
 	 * Save changes to a custom media tag
 	 *
 	 * @param	string [$type='add']
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _mediaTagSave( $type='add' )
+	protected function _mediaTagSave( $type='add' )
 	{
 		/* INI */
 		$errors = array();
@@ -367,7 +367,8 @@ class admin_core_posts_media extends ipsCommand
 	 		$this->recacheMediaTag();
 	 		
 	 		/* All done */
-			$this->registry->output->doneScreen( sprintf( $this->lang->words['m_tag_added'], $data['mediatag_name']), $this->lang->words['m_manager'], "{$this->form_code}&amp;do=overview", 'redirect' );
+			$this->registry->output->global_message	= sprintf( $this->lang->words['m_tag_added'], $data['mediatag_name'] );
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=overview" );
 	 	}
 	 	else
 	 	{
@@ -380,7 +381,8 @@ class admin_core_posts_media extends ipsCommand
 	 		$this->recacheMediaTag();
 	 		
 	 		/* Done and done */
-	 		$this->registry->output->doneScreen( sprintf( $this->lang->words['m_tag_updated'], $data['mediatag_name']), $this->lang->words['m_manager'], "{$this->form_code}&amp;do=overview", 'redirect' );
+			$this->registry->output->global_message	= sprintf( $this->lang->words['m_tag_updated'], $data['mediatag_name'] );
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=overview" );
 	 	}
 	 
 	}	
@@ -390,9 +392,9 @@ class admin_core_posts_media extends ipsCommand
 	 *
 	 * @param	string	[$type='add']
 	 * @param	array 	[Optional] array of errors
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _mediaTagForm( $type='add', $errors=array() )
+	protected function _mediaTagForm( $type='add', $errors=array() )
 	{
 		/* Check form type */
 		if( $type == 'add' )
@@ -411,9 +413,9 @@ class admin_core_posts_media extends ipsCommand
 			$data	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'bbcode_mediatag', 'where' => "mediatag_id={$id}" ) );
 			
 			/* Set Defaults */
-			$data['mediatag_name']    = ( isset( $this->request['mediatag_name']    ) && $this->request['mediatag_name']    ) ? $this->request['mediatag_name']    : $data['mediatag_name'];
-			$data['mediatag_match']   = ( isset( $this->request['mediatag_match']   ) && $this->request['mediatag_match']   ) ? IPSText::textToForm( $this->request['mediatag_match'] )   : IPSText::textToForm( $data['mediatag_match'] );
-			$data['mediatag_replace'] = ( isset( $this->request['mediatag_replace'] ) && $this->request['mediatag_replace'] ) ? IPSText::textToForm( $this->request['mediatag_replace'] ) : IPSText::textToForm( $data['mediatag_replace'] );
+			$data['mediatag_name']    = !empty( $this->request['mediatag_name'] )		? $this->request['mediatag_name']							: $data['mediatag_name'];
+			$data['mediatag_match']   = !empty( $this->request['mediatag_match'] )		? IPSText::textToForm( $this->request['mediatag_match'] )	: IPSText::textToForm( $data['mediatag_match'] );
+			$data['mediatag_replace'] = !empty( $this->request['mediatag_replace'] )	? IPSText::textToForm( $this->request['mediatag_replace'] )	: IPSText::textToForm( $data['mediatag_replace'] );
 		}
 		
 		/* Setup Form */
@@ -423,9 +425,9 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * List all the the current media tag types
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _mediaTagIndex()
+	protected function _mediaTagIndex()
 	{
 		/* Query Bookmarks */
 		$this->DB->build( array(
@@ -450,7 +452,7 @@ class admin_core_posts_media extends ipsCommand
 	/**
 	 * Recache the mediatag config
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function recacheMediaTag()
 	{
@@ -463,7 +465,7 @@ class admin_core_posts_media extends ipsCommand
 		while( $r = $this->DB->fetch() )
 		{
 			$media_config[$r['mediatag_name']] = array(
-														'match'   => preg_replace( "#{[0-9]}#", "(.*?)", str_replace( '.', '\.', str_replace( '?', '\?', $r['mediatag_match'] ) ) ),
+														'match'   => preg_replace( "#{[0-9]}#", "(.*?)", str_replace( '.', '\.', str_replace( '?', '?', $r['mediatag_match'] ) ) ),
 														'replace' => $r['mediatag_replace'],
 													);
 		}
diff --git a/upload/admin/applications/core/modules_admin/posts/xml/index.html b/upload/admin/applications/core/modules_admin/posts/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/posts/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/posts/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/posts/xml/menu.xml b/upload/admin/applications/core/modules_admin/posts/xml/menu.xml
index 97a8a600..fc17a667 100644
--- a/upload/admin/applications/core/modules_admin/posts/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/posts/xml/menu.xml
@@ -6,16 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление �майликами</subitemtitle>
+					<subitemlang>emoticons</subitemlang>
 					<subsection>emoticons</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-				<subitem>
-					<subitemtitle>Импорт / Эк�порт</subitemtitle>
-					<subsection>emoticons</subsection>
-					<subitemurl>do=emo_packsplash</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>emoticons_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -25,16 +19,23 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление BB-кодами</subitemtitle>
+					<subitemlang>bbcode</subitemlang>
 					<subsection>bbcode</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>bbcode_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>	
+				</subitems>
+		</item>
+		<item>
+			<title>Manage Media Tag</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Медиа BB-коды</subitemtitle>
+					<subitemlang>mediatag</subitemlang>
 					<subsection>media</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>media_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
@@ -44,9 +45,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление нецензурными �ловами</subitemtitle>
+					<subitemlang>badwords</subitemlang>
 					<subsection>badwords</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>badword_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/posts/xml/permissions.xml b/upload/admin/applications/core/modules_admin/posts/xml/permissions.xml
index a2a9c4c2..3f91347d 100644
--- a/upload/admin/applications/core/modules_admin/posts/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/posts/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление нецензурными �ловами</grouptitle>
+		<grouplang>core_badwords</grouplang>
 		<items>
 			<item>
 				<key>badword_manage</key>
@@ -15,6 +16,7 @@
 	</group>
 	<group>
 		<grouptitle>Смайлики</grouptitle>
+		<grouplang>core_emoticons</grouplang>
 		<items>
 			<item>
 				<key>emoticons_manage</key>
@@ -36,6 +38,7 @@
 	</group>
 	<group>
 		<grouptitle>BB-коды</grouptitle>
+		<grouplang>core_bbcode</grouplang>
 		<items>
 			<item>
 				<key>bbcode_manage</key>
@@ -49,6 +52,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление Media тегами</grouptitle>
+		<grouplang>core_media</grouplang>
 		<items>
 			<item>
 				<key>media_manage</key>
diff --git a/upload/admin/applications/core/modules_admin/report/defaultSection.php b/upload/admin/applications/core/modules_admin/report/defaultSection.php
index a9d8d636..df15f7b2 100644
--- a/upload/admin/applications/core/modules_admin/report/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/report/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default reports section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'report' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'reports';
\ No newline at end of file
+$DEFAULT_SECTION = 'reports';
diff --git a/upload/admin/applications/core/modules_admin/report/index.html b/upload/admin/applications/core/modules_admin/report/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/report/index.html
+++ b/upload/admin/applications/core/modules_admin/report/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/report/reports.php b/upload/admin/applications/core/modules_admin/report/reports.php
index 5ef00b34..bf2395bf 100644
--- a/upload/admin/applications/core/modules_admin/report/reports.php
+++ b/upload/admin/applications/core/modules_admin/report/reports.php
@@ -1,20 +1,15 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Management for reported content
- * Last Updated: $LastChangedDate: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
+ * @file		reports.php 	Management for reported content
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
  * @author		Based on original "Report Center" by Luke Scott
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6990 $
+ * @since		-
+ * $LastChangedDate: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9487 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -23,20 +18,39 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		admin_core_report_reports
+ * @brief		Management for reported content
+ */
 class admin_core_report_reports extends ipsCommand 
 {
 	/**
-	 * Skin object
+	 * Skin object shortcut
 	 *
-	 * @var		object			Skin templates
+	 * @var		$html
 	 */
-	private $html;
+	public $html;
 	
 	/**
-	 * Main class entry point
+	 * String for the screen url bit
 	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @var		$form_code
+	 */
+	public $form_code    = '';
+	
+	/**
+	 * String for the JS url bit
+	 *
+	 * @var		$form_code_js
+	 */
+	public $form_code_js = '';
+	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -149,25 +163,24 @@ class admin_core_report_reports extends ipsCommand
 	}
 	
 	/**
-	 * Displays the overview page with version info, blog, stats, etc...
+	 * Displays the overview page with statistics, graphs, etc...
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _mainScreen()
+	public function _mainScreen()
 	{
-		$this->DB->build( array( 'select' => 'id', 'from' => 'rc_reports' ) );
-		$this->DB->execute();
-		$num_reports = $this->DB->getTotalRows();
+		/* Get some data */
+		$_tmp = $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'rc_reports' ) );
+		$num_reports = intval($_tmp['total']);
 		
-		$this->DB->build( array( 'select' => 'id', 'from' => 'rc_comments' ) );
-		$this->DB->execute();
-		$num_comments = $this->DB->getTotalRows();
+		$_tmp = $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'rc_comments' ) );
+		$num_comments = intval($_tmp['total']);
 		
 		$this->DB->build( array( 'select' => 'onoff', 'from' => 'rc_classes' ) );
 		$this->DB->execute();
 		
-		$plug_on		= 0;
-		$plug_total		= 0;
+		$plug_on	= 0;
+		$plug_total	= 0;
 		
 		while( $plugs = $this->DB->fetch() )
 		{
@@ -179,7 +192,7 @@ class admin_core_report_reports extends ipsCommand
 			$plug_total++;
 		}
 
-		$this->registry->output->html .=  $this->html->overview_main_template( array(
+		$this->registry->output->html .= $this->html->overview_main_template( array(
 																					'reports_total'		=> $num_reports,
 																					'comments_total'	=> $num_comments,
 																					'active_plugins'	=> $plug_on,
@@ -191,9 +204,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This function is used when you disable/enable a report plugin
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _togglePlugin()
+	public function _togglePlugin()
 	{
 		$plugin_id = intval($this->request['plugin_id']);
 		
@@ -225,11 +238,11 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * Basics for creating a plugin (with only file name, title, and description)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _createPlugin()
+	public function _createPlugin()
 	{
-		$this->registry->output->extra_nav[]		= array( "{$this->settings['base_url']}{$this->form_code}&do=plugin" , $this->lang->words['r_plugmanager'] );
+		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=plugin" , $this->lang->words['r_plugmanager'] );
 		
 		if( $_POST['finish'] == 1 )
 		{
@@ -245,7 +258,7 @@ class admin_core_report_reports extends ipsCommand
 			{
 				$this->registry->output->global_message = $this->lang->words['r_incchar'];
 			}
-			elseif( ! file_exists( IPSLib::getAppDir( $this->request['appPlugin'] ) . '/extensions/reportPlugins/' . $this->request['plugi_file'] . '.php' ) )
+			elseif( ! is_file( IPSLib::getAppDir( $this->request['appPlugin'] ) . '/extensions/reportPlugins/' . $this->request['plugi_file'] . '.php' ) )
 			{
 				$this->registry->output->global_message = $this->lang->words['r_404file'];	
 			}
@@ -276,7 +289,8 @@ class admin_core_report_reports extends ipsCommand
 				// Redirect to edit the plugin for more
 				//-----------------------------------------
 				
-				$this->registry->output->doneScreen( $this->lang->words['r_plugincreate'], $this->lang->words['r_finishplugin'], "{$this->form_code}&amp;do=edit_plugin&amp;com_id=" . $plugin_id, 'redirect' );
+				$this->registry->output->global_message	= $this->lang->words['r_plugincreate'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=edit_plugin&amp;com_id=" . $plugin_id );
 			}
 		}
 
@@ -290,9 +304,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * Here we are editing a plugin's settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _editPlugin()
+	public function _editPlugin()
 	{
 		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&do=plugin" , $this->lang->words['r_plugmanager'] );
 		
@@ -384,21 +398,24 @@ class admin_core_report_reports extends ipsCommand
 			
 			if( $plug_data['lockd'] == 0 || IN_DEV == 1 )
 			{
-				$build_plugin['lockd'] = $this->request['plugi_lockd'];
+				$build_plugin['lockd'] = intval($this->request['plugi_lockd']);
 			}
 			
 			if( ! $this->registry->output->global_message )
-			{						
-				$this->DB->update( 'rc_classes', $build_plugin, "com_id={$plug_id}" );		
+			{
+				$this->DB->update( 'rc_classes', $build_plugin, "com_id={$plug_id}" );
 				
-				$this->registry->output->doneScreen($this->lang->words['r_plugupdated'], $this->lang->words['r_plugmanager'], "{$this->form_code}&amp;do=plugin", 'redirect' );
+				$this->cache->rebuildCache( 'report_plugins', 'global' );
+				
+				$this->registry->output->global_message	= $this->lang->words['r_plugupdated'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=plugin" );
 			}
 			else
 			{
 				$plug_data = $build_plugin;
 			}
 		}
-
+		
 		//-----------------------------------------
 		// Break up group perms into an array
 		//-----------------------------------------
@@ -425,9 +442,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * Lock/unlock a plugin
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _changePlugin()
+	public function _changePlugin()
 	{
 		$this->registry->output->extra_nav[]		= array( "{$this->settings['base_url']}{$this->form_code}&do=plugin" , $this->lang->words['r_plugmanager'] );
 		
@@ -503,7 +520,7 @@ class admin_core_report_reports extends ipsCommand
 								'author_url'	=> $this->request['plugi_author_url'],
 								'my_class'		=> $this->request['plugi_file'],
 								'pversion'		=> 'v'  . strval($this->request['plugi_version']),
-								'lockd'			=> $this->request['plugi_lockd'] 
+								'lockd'			=> intval($this->request['plugi_lockd']) 
 								);
 			
 			//-----------------------------------------
@@ -526,7 +543,8 @@ class admin_core_report_reports extends ipsCommand
 					// Plugin was changed, need settings now
 					//-----------------------------------------
 					
-					$this->registry->output->doneScreen($this->lang->words['r_plugupdated'], $this->lang->words['r_finishplugin'], "{$this->form_code}&amp;do=edit_plugin&amp;com_id=" . $plug_id, 'redirect' );
+					$this->registry->output->global_message	= $this->lang->words['r_plugupdated'];
+					$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=edit_plugin&amp;com_id=" . $plug_id );
 				}
 				else
 				{
@@ -534,7 +552,8 @@ class admin_core_report_reports extends ipsCommand
 					// File was not changed, no need to edit..
 					//-----------------------------------------
 					
-					$this->registry->output->doneScreen($this->lang->words['r_plugupdated'], $this->lang->words['r_plugmanager'], "{$this->form_code}&amp;do=plugin", 'redirect' );
+					$this->registry->output->global_message	= $this->lang->words['r_plugupdated'];
+					$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=plugin" );
 				}
 			}
 			else
@@ -553,9 +572,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This is when we want to remove a plugin, possibly cuz it's crap
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _removePlugin()
+	public function _removePlugin()
 	{
 		$com_id = intval( $this->request['com_id'] );
 		
@@ -597,15 +616,16 @@ class admin_core_report_reports extends ipsCommand
 		
 		$this->DB->delete( 'rc_classes', "com_id={$com_id}" );
 		
-		$this->registry->output->doneScreen( $this->lang->words['r_deleteplug'], $this->lang->words['r_plugmanager'], "{$this->form_code}&amp;do=plugin", 'redirect' );
+		$this->registry->output->global_message	= $this->lang->words['r_deleteplug'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=plugin" );
 	}
 
 	/**
 	 * This is where you view all the plugins in a list with options
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showPluginIndex()
+	public function _showPluginIndex()
 	{
 		$this->registry->output->extra_nav[]		= array( "{$this->settings['base_url']}{$this->form_code}&do=plugin" , $this->lang->words['r_plugmanager'] );
 		
@@ -619,15 +639,15 @@ class admin_core_report_reports extends ipsCommand
 			$plugin_rows .= $this->html->report_plugin_row( $row );
 		}
 		
-		$this->registry->output->html = $this->html->report_plugin_overview( $plugin_rows );
+		$this->registry->output->html .= $this->html->report_plugin_overview( $plugin_rows );
 	}
 	
 	/**
 	 * This is when you delete a status/severity image
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _removeImage()
+	public function _removeImage()
 	{
 		$img_id = intval( $this->request['id'] );
 		
@@ -640,15 +660,16 @@ class admin_core_report_reports extends ipsCommand
 		
 		$this->DB->delete( 'rc_status_sev', "id={$img_id}" );
 		
-		$this->registry->output->doneScreen( $this->lang->words['r_imgdel'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+		$this->registry->output->global_message	= $this->lang->words['r_imgdel'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 	}
 
 	/**
 	 * This is when I want to add a severity/status image
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _addImage()
+	public function _addImage()
 	{
 		$stat_id = intval( $this->request['id'] );
 		
@@ -688,7 +709,8 @@ class admin_core_report_reports extends ipsCommand
 				
 				$this->DB->insert( 'rc_status_sev', $build_image, "id='{$img_id}'" );	
 				
-				$this->registry->output->doneScreen($this->lang->words['r_imgsaved'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+				$this->registry->output->global_message	= $this->lang->words['r_imgsaved'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 			}
 		}
 		
@@ -719,9 +741,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This is for setting, in status index, which is New, Complete, and Active
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _setStatus()
+	public function _setStatus()
 	{
 		$stat_id = intval( $this->request['id'] );
 		
@@ -776,7 +798,7 @@ class admin_core_report_reports extends ipsCommand
 			// We can have as many active as we want
 			//-----------------------------------------
 			
-			$this->DB->update( 'rc_status', array( 'is_active' => ( ! $row['is_active'] ) ), "status={$stat_id}" );
+			$this->DB->update( 'rc_status', array( 'is_active' => intval( !$row['is_active'] ) ), "status={$stat_id}" );
 		}
 		else
 		{
@@ -793,9 +815,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This is the magic behind removing a status and the images behind it
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _removeStatus()
+	public function _removeStatus()
 	{
 		$stat_id = intval( $this->request['id'] );
 		
@@ -840,15 +862,16 @@ class admin_core_report_reports extends ipsCommand
 		$this->DB->delete( 'rc_status', "status='{$stat_id}'" );
 		$this->DB->delete( 'rc_status_sev', "status='{$stat_id}'" );
 		
-		$this->registry->output->doneScreen($this->lang->words['r_statdel'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+		$this->registry->output->global_message	= $this->lang->words['r_statdel'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 	}
 
 	/**
 	 * Here is where you create a status (before the added images)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _createStatus()
+	public function _createStatus()
 	{
 		if( $_POST['finish'] == 1 )
 		{
@@ -881,7 +904,8 @@ class admin_core_report_reports extends ipsCommand
 				
 				$this->DB->insert( 'rc_status', $build_status );
 
-				$this->registry->output->doneScreen( $this->lang->words['r_statcreated'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+				$this->registry->output->global_message	= $this->lang->words['r_statcreated'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 			}
 		}
 			 
@@ -891,9 +915,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This is when I want to edit a status
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _editStatus()
+	public function _editStatus()
 	{
 		$stat_id = intval( $this->request['id'] );
 		
@@ -932,7 +956,8 @@ class admin_core_report_reports extends ipsCommand
 					
 				$this->DB->update( 'rc_status', $build_status, "status='{$stat_id}'" );
 
-				$this->registry->output->doneScreen( $this->lang->words['r_statsaved'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+				$this->registry->output->global_message	= $this->lang->words['r_statsaved'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 			}
 		}
 		
@@ -955,9 +980,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * This is where you edit an image under a status
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _editImage()
+	public function _editImage()
 	{
 		$img_id = intval( $this->request['id'] );
 		
@@ -997,7 +1022,8 @@ class admin_core_report_reports extends ipsCommand
 				
 				$this->DB->update( 'rc_status_sev', $build_image, "id='{$img_id}'" );	
 				
-				$this->registry->output->doneScreen($this->lang->words['r_imgsaved'], $this->lang->words['r_statsever'], "{$this->form_code}&amp;do=status", 'redirect' );
+				$this->registry->output->global_message	= $this->lang->words['r_imgsaved'];
+				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . "&amp;do=status" );
 			}
 		}
 		
@@ -1026,9 +1052,9 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * When we want to move the status up or down (not sideways...)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _moveStatus()
+	public function _moveStatus()
 	{
 		//-----------------------------------------
 		// INIT
@@ -1070,11 +1096,13 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * Shows the status/severity index with all the special stuff
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showStatusIndex()
+	public function _showStatusIndex()
 	{
-		$this->registry->output->extra_nav[]		= array( "{$this->settings['base_url']}{$this->form_code}&do=status" , $this->lang->words['r_statsever'] );
+		/* Init vars */
+		$statusRows  = array();
+		$imagesCache = array();
 
 		//-----------------------------------------
 		// Get the default board skin...
@@ -1089,15 +1117,9 @@ class admin_core_report_reports extends ipsCommand
 		$this->DB->build( array( 'select' => '*', 'from' => 'rc_status_sev', 'order' => 'status ASC, points ASC' ) );
 		$this->DB->execute();
 		
-		//-----------------------------------------
-		// Store the status images in an array...
-		//-----------------------------------------
-		
-		$status_image_cache = array();
-
 		while( $srow = $this->DB->fetch() )
 		{
-			$status_image_cache[ $srow['status'] ] .= str_replace( '<#IMG_DIR#>', $skin['set_image_dir'], $this->html->report_status_image( $srow ) );
+			$imagesCache[ $srow['status'] ] .= str_replace( '<#IMG_DIR#>', $skin['set_image_dir'], $this->html->report_status_image( $srow ) );
 		}
 		
 		//-----------------------------------------
@@ -1106,8 +1128,6 @@ class admin_core_report_reports extends ipsCommand
 		
 		$this->DB->build( array( 'select' => '*', 'from' => 'rc_status', 'order' => 'rorder ASC' ) );
 		$this->DB->execute();
-
-		$total_statuses = $this->DB->getTotalRows();
 		
 		while( $row = $this->DB->fetch() )
 		{
@@ -1123,19 +1143,22 @@ class admin_core_report_reports extends ipsCommand
 			// Finish row with image cache...
 			//-----------------------------------------
 			
-			$row['status_images'] = $status_image_cache[ $row['status'] ];
-			$status_rows .= $this->html->report_status_row( $row );
+			$row['status_images'] = $imagesCache[ $row['status'] ];
+			
+			$statusRows[] = $row;
 		}
-
-		$this->registry->output->html = $this->html->report_status_overview( $status_rows );
+		
+		/* Output */
+		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=status" , $this->lang->words['r_statsever'] );
+		$this->registry->output->html .= $this->html->report_status_overview( $statusRows );
 	}
 
 	/**
 	 * Shows report stats in the last 24 hours using chart class
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _reportsChart()
+	public function _reportsChart()
 	{
 		//-----------------------------------------
 		// Let's build our data for the chart
@@ -1174,11 +1197,11 @@ class admin_core_report_reports extends ipsCommand
 		// Let's draw our pie chart now
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . '/classGraph.php' );
+		require_once( IPS_KERNEL_PATH . '/classGraph.php' );/*noLibHook*/
 		$graph = new classGraph();
 		$graph->options['title'] = $this->lang->words['r_last24'];
-		$graph->options['width'] = 400;
-		$graph->options['height'] = 250;
+		$graph->options['width'] = 500;
+		$graph->options['height'] = 300;
 		$graph->options['style3D'] = 1;
 
 		if( count($chart_data) )
@@ -1199,50 +1222,23 @@ class admin_core_report_reports extends ipsCommand
 	/**
 	 * Shows bar graph of top five moderators. Show's what's been done
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _moderatorsChart()
+	public function _moderatorsChart()
 	{
 		//-----------------------------------------
 		// Build data for the bar chart
 		//-----------------------------------------
 		
-		$this->DB->build( array(
-									'select'	=> 'rep.id',
-									'from'		=> array( 'rc_reports' => 'reps' ),
-									'where'		=> 'stat.is_complete=1',
-									'add_join'	=> array(
-														array(
-															'from'	=> array( 'rc_reports_index' => 'rep' ),
-															'where'	=> 'reps.rid=rep.id',
-															),
-														array(
-															'from'	=> array( 'rc_status' => 'stat' ),
-															'where'	=> 'stat.status=rep.status',
-															),
-														)
-							)		);
-		$this->DB->execute();
-		
-		$total_complete_reports = $this->DB->getTotalRows();
-		
 		$this->DB->build(
 								array(
 									'select'	=> 'mem.members_display_name as name, COUNT(*) as num_reports',
 									'from'		=> array( 'rc_reports_index' => 'rep' ),
-									'where'		=> "stat.is_complete=1",
+									'where'		=> "rep.updated_by > 0",
 									'group'		=> 'rep.updated_by',
 									'order'		=> 'num_reports DESC',
 									'limit'		=> array( 5 ),
 									'add_join'	=> array(
-														array(
-															'from'	=> array( 'rc_reports' => 'reps' ),
-															'where'	=> 'rep.id=reps.rid'
-															),
-														array(
-															'from'	=> array( 'rc_status' => 'stat' ),
-															'where'	=> 'stat.status=rep.status'
-															),
 														array(
 															'from'	=> array( 'members' => 'mem' ),
 															'where'	=> 'mem.member_id=rep.updated_by'
@@ -1265,11 +1261,11 @@ class admin_core_report_reports extends ipsCommand
 		// Let's draw our pie chart now
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . '/classGraph.php' );
+		require_once( IPS_KERNEL_PATH . '/classGraph.php' );/*noLibHook*/
 		$graph = new classGraph();
 		$graph->options['title'] = $this->lang->words['r_top5'];
-		$graph->options['width'] = 400;
-		$graph->options['height'] = 250;
+		$graph->options['width'] = 500;
+		$graph->options['height'] = 300;
 		$graph->options['style3D'] = 1;
 		
 		if( count($chart_data) )
@@ -1286,5 +1282,4 @@ class admin_core_report_reports extends ipsCommand
 		$graph->options['charttype'] = 'Pie';
 		$graph->display();
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/report/xml/index.html b/upload/admin/applications/core/modules_admin/report/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/report/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/report/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/report/xml/menu.xml b/upload/admin/applications/core/modules_admin/report/xml/menu.xml
index b737c955..48585ad0 100644
--- a/upload/admin/applications/core/modules_admin/report/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/report/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Обзор</subitemtitle>
+					<subitemlang>reports_overview</subitemlang>
 					<subsection>reports</subsection>
 					<subitemurl>do=show_main</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Плагины �и�темы жалоб</subitemtitle>
+					<subitemlang>reports_plugin</subitemlang>
 					<subsection>reports</subsection>
 					<subitemurl>do=plugin</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>plugins_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -30,9 +32,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стату�ы жалоб</subitemtitle>
+					<subitemlang>reports_ssl</subitemlang>
 					<subsection>reports</subsection>
 					<subitemurl>do=status</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>sands_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/report/xml/permissions.xml b/upload/admin/applications/core/modules_admin/report/xml/permissions.xml
index 29f0a135..858a555c 100644
--- a/upload/admin/applications/core/modules_admin/report/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/report/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Плагины �и�темы жалоб</grouptitle>
+		<grouplang>core_reports</grouplang>
 		<items>
 			<item>
 				<key>plugins_manage</key>
@@ -15,6 +16,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление �тату�ами жалоб</grouptitle>
+		<grouplang>core_statsev</grouplang>
 		<items>
 			<item>
 				<key>sands_manage</key>
@@ -28,6 +30,7 @@
 	</group>
 	<group>
 		<grouptitle>Стати�тика �и�темы жалоб</grouptitle>
+		<grouplang>core_rcstats</grouplang>
 		<items>
 			<item>
 				<key>stats_access</key>
diff --git a/upload/admin/applications/core/modules_admin/settings/defaultSection.php b/upload/admin/applications/core/modules_admin/settings/defaultSection.php
new file mode 100644
index 00000000..d58791ee
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/settings/defaultSection.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file		defaultSection.php 	Define the default section for the 'settings' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		20th February 2002
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
+ */
+
+$DEFAULT_SECTION = 'settings';
diff --git a/upload/admin/api/gallery/index.html b/upload/admin/applications/core/modules_admin/settings/index.html
similarity index 81%
rename from upload/admin/api/gallery/index.html
rename to upload/admin/applications/core/modules_admin/settings/index.html
index dfdb4ca9..bae2d5ed 100644
--- a/upload/admin/api/gallery/index.html
+++ b/upload/admin/applications/core/modules_admin/settings/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com/">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/settings.php b/upload/admin/applications/core/modules_admin/settings/settings.php
similarity index 88%
rename from upload/admin/applications/core/modules_admin/tools/settings.php
rename to upload/admin/applications/core/modules_admin/settings/settings.php
index e73af8f5..7dda983b 100644
--- a/upload/admin/applications/core/modules_admin/tools/settings.php
+++ b/upload/admin/applications/core/modules_admin/settings/settings.php
@@ -1,18 +1,18 @@
 <?php
 /**
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP : Settings
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Wed. 18th August 2004
- * @version		$Rev: 6995 $
+ * @version		$Rev: 9505 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -21,28 +21,28 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-class admin_core_tools_settings extends ipsCommand
+class admin_core_settings_settings extends ipsCommand
 {
 	/**
 	 * Key array
 	 *
 	 * @var		array				Array of keys
 	 */
-	private $key_array 				= array();
+	protected $key_array 				= array();
 
 	/**
 	 * Setting groups array
 	 *
 	 * @var		array				Array of setting groups
 	 */
-	private $setting_groups			= array();
+	protected $setting_groups			= array();
 	
 	/**
 	 * Setting groups array mapping
 	 *
 	 * @var		array				Array of setting groups
 	 */
-	private $setting_groups_by_key	= array();
+	protected $setting_groups_by_key	= array();
 
 	/**
 	 * Skin object
@@ -73,7 +73,7 @@ class admin_core_tools_settings extends ipsCommand
 	 *
 	 * @var		string				Application
 	 */
-	private $_app;
+	protected $_app;
 	
 	/**
 	 * Where to return to after save
@@ -89,11 +89,18 @@ class admin_core_tools_settings extends ipsCommand
 	 */
 	public $base_nav_url;
 	
+	/**
+	 * Object for the editor shortcut
+	 * 
+	 * @var		$editor
+	 */
+	public $editor = NULL; 
+	
 	/**
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */	
 	public function doExecute( ipsRegistry $registry ) 
 	{		
@@ -103,13 +110,14 @@ class admin_core_tools_settings extends ipsCommand
 		
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ) );
 
-		$this->html = $this->registry->output->loadTemplate('cp_skin_tools');
+		$this->html = $this->registry->output->loadTemplate('cp_skin_settings');
 		
-		$this->form_code    = $this->html->form_code    = 'module=tools&amp;section=settings';
-		$this->form_code_js = $this->html->form_code_js = 'module=tools&section=settings';
+		$this->form_code    = $this->html->form_code    = 'module=settings&amp;section=settings&amp;';
+		$this->form_code_js = $this->html->form_code_js = 'module=settings&section=settings&';
 		
 		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'settings_manage' );
 		
+		/* What to do? */
 		switch( $this->request['do'] )
 		{
 			case 'settinggroup_resync':
@@ -192,15 +200,14 @@ class admin_core_tools_settings extends ipsCommand
 			case 'settingsExportApps':
 				$messages = $this->exportAllApps();
 				
-				$this->registry->output->global_message = implode( "<br />", $messages );
-			
+				$this->registry->output->setMessage( implode( "<br />", $messages ), 1 );
 				$this->_settingsOverview();
 			break;
 					
 			case 'settingsImportApps':
 				$messages = $this->importAllApps();
 				
-				$this->registry->output->global_message = implode( "<br />", $messages );
+				$this->registry->output->setMessage( implode( "<br />", $messages ), 1 );
 				$this->_settingsOverview();
 			break;
 			default:
@@ -220,7 +227,7 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Reorder the settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reorder()
 	{
@@ -264,9 +271,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Setting group export
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportSettingsGroup()
+	protected function _exportSettingsGroup()
 	{
 		//-----------------------------------------
 		// INIT
@@ -290,7 +297,7 @@ class admin_core_tools_settings extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -361,7 +368,7 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Find setting group (don't rely on IDs)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _findSettingGroup()
 	{
@@ -391,7 +398,7 @@ class admin_core_tools_settings extends ipsCommand
 	 * @param	boolean		In development mode?
 	 * @param	boolean		Return (ignore the var name)
 	 * @param	array 		Array of known setting values
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function importAllSettings( $in_dev=0, $no_return=0, $known=array() )
 	{
@@ -440,14 +447,14 @@ class admin_core_tools_settings extends ipsCommand
 				return;
 			}
 			
-			if ( ! file_exists( $this->request['file_location'] ) )
+			if ( ! is_file( $this->request['file_location'] ) )
 			{
 				$this->registry->output->global_message = sprintf( $this->lang->words['s_noopen'], $this->request['file_location'] );
 				$this->_settingsOverview();
 				return;
 			}
 			
-			if ( preg_match( "#\.gz$#", $this->request['file_location'] ) )
+			if ( preg_match( '#\.gz$#', $this->request['file_location'] ) )
 			{
 				if ( $FH = @gzopen( $this->request['file_location'], 'rb' ) )
 				{
@@ -475,7 +482,7 @@ class admin_core_tools_settings extends ipsCommand
 			//-----------------------------------------
 			
 			$tmp_name = $_FILES['FILE_UPLOAD']['name'];
-			$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
+			$tmp_name = preg_replace( '#\.gz$#', "", $tmp_name );
 			
 			$content  = ipsRegistry::getClass('adminFunctions')->importXml( $tmp_name );
 		}
@@ -505,9 +512,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Delete a setting group
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _deleteSettingGroup()
+	protected function _deleteSettingGroup()
 	{
 		if ( $this->request['id'] )
 		{
@@ -536,9 +543,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Resynchronize settings in a group
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _resynchSettingGroup()
+	protected function _resynchSettingGroup()
 	{
 		//-----------------------------------------
 		// INIT
@@ -569,9 +576,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Does the resync
 	 *
 	 * @param	integer		Group id
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _resynchGroup( $id )
+	protected function _resynchGroup( $id )
 	{
 		if ( $id )
 		{
@@ -587,9 +594,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Form to add/edit a setting group
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingGroupForm( $type='add' )
+	protected function _settingGroupForm( $type='add' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -657,9 +664,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Save a setting group
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingGroupSave($type='add')
+	protected function _settingGroupSave($type='add')
 	{
 		//-----------------------------------------
 		// INIT
@@ -722,9 +729,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Form to add/edit a setting
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingForm( $type='add' )
+	protected function _settingForm( $type='add' )
 	{
 		if ( $type == 'add' )
 		{
@@ -825,7 +832,7 @@ class admin_core_tools_settings extends ipsCommand
 	 * View all settings (form) in a group
 	 * This is public so that portal can access it
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _viewSettings()
 	{
@@ -925,7 +932,7 @@ class admin_core_tools_settings extends ipsCommand
 			while( $r = $this->DB->fetch() )
 			{
 				$r['conf_start_group']       = "";
-				$r['conf_description']		.= '<br />' . $this->lang->words['conf_desc_search'] . "<a href='{$this->settings['base_url']}&amp;app=core&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_group={$r['conf_title_id']}'>" . $r['conf_title_title'] . "</a>";
+				$r['conf_description']		.= '<br />' . $this->lang->words['conf_desc_search'] . "<a href='{$this->settings['base_url']}&amp;app=core&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_group={$r['conf_title_id']}'>" . $r['conf_title_title'] . "</a>";
 				$conf_entry[ $r['conf_id'] ] = $r;
 			}
 			
@@ -993,7 +1000,12 @@ class admin_core_tools_settings extends ipsCommand
 		}
 		else if( $tab )
 		{
-			$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;_dtab={$tab}", ipsRegistry::$applications[ $this->setting_groups[$conf_group]['conf_title_app'] ]['app_title'] );
+			$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;_dtab={$tab}", $this->setting_groups[$conf_group]['conf_title_tab'] ? $this->setting_groups[$conf_group]['conf_title_tab'] : ipsRegistry::$applications[ $this->setting_groups[$conf_group]['conf_title_app'] ]['app_title'] );
+			$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=setting_view&amp;conf_group={$conf_group}", $title );
+		}
+		else
+		{
+			$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;_dtab=System", $this->setting_groups[$conf_group]['conf_title_tab'] ? $this->setting_groups[$conf_group]['conf_title_tab'] : ipsRegistry::$applications[ $this->setting_groups[$conf_group]['conf_title_app'] ]['app_title'] );
 			$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=setting_view&amp;conf_group={$conf_group}", $title );
 		}
 		
@@ -1006,13 +1018,20 @@ class admin_core_tools_settings extends ipsCommand
 	 * Process an individual setting for display
 	 *
 	 * @param	array 	Setting record
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _processSettingEntry($r)
+	protected function _processSettingEntry($r)
 	{
-		$tempSkinUrl		= $this->settings['skin_app_url'];
-		$this->settings[ 'skin_app_url'] =  $this->settings['_original_base_url'] . '/' . CP_DIRECTORY . '/applications/core/skin_cp/' ;
-
+		/* Init editor class */
+		if ( !is_object($this->editor) )
+		{
+			$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$this->editor = new $classToLoad();
+		}
+		
+		/* Init vars */
+		$tempSkinUrl	= $this->settings['skin_app_url'];
+		$this->settings['skin_app_url'] = $this->settings['_original_base_url'] . '/' . CP_DIRECTORY . '/applications/core/skin_cp/' ;
 		$form_element	= "";
 		$form_type		= 'normal';
 		$dropdown		= array();
@@ -1033,7 +1052,7 @@ class admin_core_tools_settings extends ipsCommand
 		
 		if ( $r['conf_value'] != "" and ( $r['conf_value'] != $r['conf_default'] ) )
 		{
-			$revert_button = "<a class='dropdown-button' href='" . $this->settings['_base_url'] . "&amp;app=core&amp;{$this->form_code}&amp;do=setting_revert&id={$r['conf_id']}&conf_group={$r['conf_group']}&search=" . $this->request['search'] . "' title='{$this->lang->words['s_revertback']}'><img src='".$this->settings['skin_acp_url']."/_newimages/icons/arrow_rotate_anticlockwise.png' alt='X' /></a></div>";
+			$revert_button = "<li class='i_revert'><a href='" . $this->settings['_base_url'] . "&amp;app=core&amp;{$this->form_code}&amp;do=setting_revert&id={$r['conf_id']}&conf_group={$r['conf_group']}&search=" . $this->request['search'] . "' title='{$this->lang->words['s_revertback']}'>{$this->lang->words['revert']}</a></li>";
 		}
 		
 		//-----------------------------------------------
@@ -1042,11 +1061,13 @@ class admin_core_tools_settings extends ipsCommand
 		
 		if ( $r['conf_evalphp'] )
 		{
-			$show = 1;
+		
+			$r['conf_evalphp']	= str_replace( '&#092;', '\\', $r['conf_evalphp'] );
+			$show				= 1;
 			
 			eval( $r['conf_evalphp'] );
 		}
-		
+
 		if( ! $show && ! IN_DEV )
 		{
 			return '';
@@ -1059,26 +1080,13 @@ class admin_core_tools_settings extends ipsCommand
 				break;
 			
 			case 'textarea':
-				$form_element = $this->registry->output->formTextarea( $key, $value, 45 );
+				$form_element = $this->registry->output->formTextarea( $key, str_replace( "&#38;#092;", "&#092;", IPSText::textToForm($value) ), 45 );
 				break;
 				
 			case 'editor':
-				IPSText::getTextClass('bbcode')->parse_html			= 1;
-				IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-				IPSText::getTextClass('bbcode')->parse_smilies		= 1;
-				IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-				IPSText::getTextClass('bbcode')->parsing_section	= 'global';
-
-				if ( IPSText::getTextClass('editor')->method == 'rte' )
-				{
-					$value = IPSText::getTextClass('bbcode')->convertForRTE( IPSText::getTextClass('bbcode')->preDbParse( $value ) );
-				}
-				else
-				{
-					$value = IPSText::getTextClass('bbcode')->preEditParse( $value );
-				}
-
-				$form_element = IPSText::getTextClass('editor')->showEditor( $value, $key );
+				$this->editor->setContent( $value );
+				
+				$form_element = $this->editor->show( $key, array( 'minimize' => 1 ) );
 				$form_type = 'rte';
 
 				break;
@@ -1102,7 +1110,7 @@ class admin_core_tools_settings extends ipsCommand
 						// (Not a building with books)
 						//-----------------------------------------
 						
-						$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) .'/sources/classes/forums/class_forums.php', 'class_forums', 'forums' );
+						require_once( IPSLib::getAppDir( 'forums' ) .'/sources/classes/forums/class_forums.php' );/*noLibHook*/
 						$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) .'/sources/classes/forums/admin_forum_functions.php', 'admin_forum_functions', 'forums' );
 						
 						$aff = new $classToLoad( $this->registry );
@@ -1159,10 +1167,10 @@ class admin_core_tools_settings extends ipsCommand
 			
 				break;
 		}
-				
-		$delete  = "&nbsp;<a class='dropdown-button' href='#' onclick='return acp.confirmDelete(\"{$this->settings['_base_url']}&amp;app=core&amp;{$this->form_code}&amp;do=setting_delete&id={$r['conf_id']}\");' title='key: {$r['conf_key']}'><img src='" . $this->settings['skin_acp_url'] . "/_newimages/icons/delete.png' alt='{$this->lang->words['s_delete']}' /></a>";
-		$edit    = "<a class='dropdown-button' href='" . $this->settings['_base_url'] . "&amp;app=core&amp;{$this->form_code}&amp;do=setting_showedit&id={$r['conf_id']}' title='id: {$r['conf_id']}'><img src='" . $this->settings['skin_acp_url'] . "/_newimages/icons/pencil.png' alt='{$this->lang->words['s_edit']}' /></a>";
-
+		
+		$delete  = "<li class='i_delete'><a href='#' onclick='return acp.confirmDelete(\"{$this->settings['_base_url']}&amp;app=core&amp;{$this->form_code}&amp;do=setting_delete&id={$r['conf_id']}\");' title='key: {$r['conf_key']}'>{$this->lang->words['delete']}</a></li>";
+		$edit    = "<li class='i_edit'><a href='" . $this->settings['_base_url'] . "&amp;app=core&amp;{$this->form_code}&amp;do=setting_showedit&id={$r['conf_id']}' title='id: {$r['conf_id']}'>{$this->lang->words['edit']}</a></li>";
+		
 		if ( $r['conf_protected'] and ! IN_DEV )
 		{
 			$delete  = "";
@@ -1194,7 +1202,7 @@ class admin_core_tools_settings extends ipsCommand
 				}
 			}
 
-			$r['conf_title']		= preg_replace( "/(".$this->request['search'].")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_title'] );
+			$r['conf_title']		= preg_replace( "/(". str_replace( '/', '\\/', $this->request['search'] ) .")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_title'] );
 			
 			if( count($matches[0]) )
 			{
@@ -1234,7 +1242,7 @@ class admin_core_tools_settings extends ipsCommand
 				}
 			}
 
-			$r['conf_description'] = preg_replace( "/(".$this->request['search'].")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_description'] );
+			$r['conf_description'] = preg_replace( "/(". str_replace( '/', '\\/', $this->request['search'] ) .")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_description'] );
 			
 			if( count($_replacements) )
 			{
@@ -1247,7 +1255,7 @@ class admin_core_tools_settings extends ipsCommand
 		
 		$html .= $start . $this->html->settings_view_row( $r, $edit, $delete, $form_element, $revert_button, $form_type );
 		
-		$this->key_array[] = preg_replace( "/\[\]$/", "", $key );
+		$this->key_array[] = preg_replace( '/\[\]$/', "", $key );
 
 		$this->settings[ 'skin_app_url'] =  $tempSkinUrl ;
 		
@@ -1258,9 +1266,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * View setting groups
 	 *
 	 * @param	string		Application to default to
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingsOverview( $start_app='' )
+	protected function _settingsOverview( $start_app='' )
 	{
 		$content   = "";
 		$title     = "";
@@ -1286,27 +1294,21 @@ class admin_core_tools_settings extends ipsCommand
 			$settings[ $r['conf_title_tab'] ][] = $r;
 		}
 
-		$this->registry->output->html .= $this->html->settings_titles_wrapper( $this->html->settings_titles_top_searchbox(), $settings, $start_app );
+		$this->registry->output->html .= $this->html->settings_titles_wrapper( $settings, $start_app );
 	}
 	
 	/**
 	 * Update setting values/ordering
 	 *
 	 * @param	boolean		Return afterwards?
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _updateSettings( $donothing="" )
+	protected function _updateSettings( $donothing="" )
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$bounceback = str_replace( '&amp;', '&', $this->request['bounceback'] );
 		
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-		
+		/* Check for something to save... */
 		if ( ! $this->request['id'] and ! $this->request['search'] AND !$this->request['settings_save'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['s_noid'];
@@ -1314,10 +1316,7 @@ class admin_core_tools_settings extends ipsCommand
 			return;
 		}
 		
-		//--------------------------------------------
-		// check...
-		//--------------------------------------------
-		
+		/* ...and check for fields */
 		$fields = explode( ",", trim($this->request['settings_save']) );
 		
 		if ( ! count($fields ) )
@@ -1327,6 +1326,13 @@ class admin_core_tools_settings extends ipsCommand
 			return;
 		}
 		
+		/* Init editor class */
+		if ( !is_object($this->editor) )
+		{
+			$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$this->editor = new $classToLoad();
+		}
+		
 		//--------------------------------------------
 		// Get info from DB
 		//--------------------------------------------
@@ -1360,7 +1366,9 @@ class admin_core_tools_settings extends ipsCommand
 			
 			if ( $data['conf_evalphp'] )
 			{
-				$save = 1;
+				$r['conf_evalphp']	= str_replace( '&#092;', '\\', $r['conf_evalphp'] );
+				$save				= 1;
+
 				eval( $data['conf_evalphp'] );
 				
 				/* Was value set? */
@@ -1381,19 +1389,19 @@ class admin_core_tools_settings extends ipsCommand
 				 
 		        //$_POST[ $key ]	= IPSText::getTextClass('bbcode')->preDbParse( IPSText::getTextClass('editor')->processRawPost( $key ) );
 		        
-		        if( trim($_POST[ $key ]) == '<br>' OR trim($_POST[ $key ]) == '<br />' )
+		        if( trim($value) == '<br>' OR trim($value) == '<br />' )
 		        {
-		        	$_POST[ $key ]	= '';
+		        	$value	= '';
 		        }
 				else
 				{
-					$_POST[ $key ] = IPSText::getTextClass('editor')->processRawPost( $key );
+					$value = $this->editor->process( $value );
 				}
 			}
 			
-			$_POST[ $key ]	= str_replace( "\r", "", $_POST[ $key ] );
+			$value	= str_replace( "\r", "", $value );
 			
-			if ( $_POST[ $key ] != $data['conf_default'] )
+			if ( $value != $data['conf_default'] )
 			{
 				$this->DB->update( 'core_sys_conf_settings', array( 'conf_value' => $value ), 'conf_id=' . $data['conf_id'] );
 			}
@@ -1402,7 +1410,7 @@ class admin_core_tools_settings extends ipsCommand
 				$this->DB->update( 'core_sys_conf_settings', array( 'conf_value' => '' ), 'conf_id=' . $data['conf_id'] );
 			}
 		}
-		
+
 		$this->request['conf_group'] = $this->request['id'];
 		
 		$this->registry->output->global_message = $this->lang->words['s_updated'];
@@ -1415,7 +1423,7 @@ class admin_core_tools_settings extends ipsCommand
 		
 		if ( $bounceback )
 		{
-			$this->registry->output->silentRedirect( $bounceback );
+			$this->registry->output->silentRedirectWithMessage( $bounceback );
 		}
 		
 		//-----------------------------------------
@@ -1432,9 +1440,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Save the settings form
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingSave($type='add')
+	protected function _settingSave($type='add')
 	{	
 		if ( $type == 'edit' )
 		{
@@ -1485,7 +1493,7 @@ class admin_core_tools_settings extends ipsCommand
 			// Is the key already in use?
 			//-----------------------------------------
 			
-			if( $this->settings[ $array['conf_key'] ] )
+			if ( $this->settings[ $array['conf_key'] ] )
 			{
 				$this->registry->output->global_message = $this->lang->words['s_keyinuse_already'];
 				$this->_settingForm();
@@ -1523,9 +1531,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Revert a setting to the default value
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _revertSettings()
+	protected function _revertSettings()
 	{
 		$this->request[ 'id'] =  intval($this->request['id'] );
 		
@@ -1554,9 +1562,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Delete a setting
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _deleteSettings()
+	protected function _deleteSettings()
 	{	
 		if ( ! $this->request['id'] )
 		{
@@ -1593,7 +1601,7 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Rebuild settings cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function settingsRebuildCache()
 	{
@@ -1621,9 +1629,9 @@ class admin_core_tools_settings extends ipsCommand
 	 * Grab all setting groups and store in an internal array
 	 *
 	 * @param	boolean		Pull all settings, not just visible ones
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingsGetGroups( $ignoreInDev=false )
+	protected function _settingsGetGroups( $ignoreInDev=false )
 	{
 		$this->setting_groups = array();
 		
@@ -1648,9 +1656,9 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Make sure all titles have keywords set
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _settingsTitlesCheck()
+	protected function _settingsTitlesCheck()
 	{
 		//-----------------------------------------
 		// Get 'em
@@ -1663,7 +1671,7 @@ class admin_core_tools_settings extends ipsCommand
 		{
 			if ( ! $row['conf_title_keyword'] )
 			{
-				$new_keyword = mb_strtolower( preg_replace( "#[^\d\w]#", "", $row['conf_title_title'] ) );
+				$new_keyword = mb_strtolower( preg_replace( '#[^\d\w]#', "", $row['conf_title_title'] ) );
 				$this->DB->update( 'core_sys_settings_titles', array( 'conf_title_keyword' => $new_keyword ), 'conf_title_id='.$row['conf_title_id'] );
 			}
 		}
@@ -1685,7 +1693,7 @@ class admin_core_tools_settings extends ipsCommand
 		{
 			$file = IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml';
 			
-			if ( file_exists( $file ) )
+			if ( is_file( $file ) )
 			{
 				$contents = file_get_contents( $file );
 				
@@ -1714,7 +1722,7 @@ class admin_core_tools_settings extends ipsCommand
 	 * @param	array 		Array of any known settings and their values
 	 * @return	array 		array( 'insertedCount' => x, 'updatedCount' => x, 'updatedKeys' => array(..), 'insertedKeys' => array() )
 	 */
-	private function _importXML( $content, $app='core', $knownSettings=array() )
+	protected function _importXML( $content, $app='core', $knownSettings=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -1752,7 +1760,7 @@ class admin_core_tools_settings extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -1954,28 +1962,28 @@ class admin_core_tools_settings extends ipsCommand
 		{
 			@unlink( IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml' );
 			
-			if ( ! file_exists( IPSLib::getAppDir(  $app_dir ) . '/xml' ) )
+			if ( ! is_dir( IPSLib::getAppDir(  $app_dir ) . '/xml' ) )
 			{
-				$errors[] = "Ошибка: " . IPSLib::getAppDir(  $app_dir ) . "/xml/ не �уще�твует";
+				$errors[] = "Error: " . IPSLib::getAppDir(  $app_dir ) . "/xml/ does not exist";
 				continue;
 			}
 			else if ( ! IPSLib::isWritable( IPSLib::getAppDir(  $app_dir ) . '/xml' ) )
 			{
 				if ( ! @chmod( IPSLib::isWritable( IPSLib::getAppDir(  $app_dir ) . '/xml', 0755 ) ) )
 				{
-					$errors[] = "Ошибка: " . IPSLib::getAppDir(  $app_dir ) . "/xml/ нет прав на запи�ь";
+					$errors[] = "Error: " . IPSLib::getAppDir(  $app_dir ) . "/xml/ is not writeable";
 					continue;
 				}
 			}
-			else if ( file_exists( IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml' ) AND ! IPSLib::isWritable( IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml' ) )
+			else if ( is_file( IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml' ) AND ! IPSLib::isWritable( IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_settings.xml' ) )
 			{
-				$errors[] = "Ошибка: " . IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . "_settings.xml нет прав на запи�ь";
+				$errors[] = "Error: " . IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . "_settings.xml is not writeable";
 				continue;
 			}
 				
 			$this->_exportXML( $app_dir );
 				
-			$messages[] = "�а�тройки приложени� " .  $app_data['app_title'] . " �к�портированы в директорию приложени�";
+			$messages[] = $app_data['app_title'] . " Settings written into the application's XML directory";
 			
 			/* In dev time stamp? */
 			if ( IN_DEV )
@@ -1996,7 +2004,7 @@ class admin_core_tools_settings extends ipsCommand
 	 * @param	string		Application directory
 	 * @return	boolean
 	 */
-	private function _exportXML( $app_dir='core' )
+	protected function _exportXML( $app_dir='core' )
 	{
 		//-----------------------------------------
 		// Get setting groups
@@ -2008,7 +2016,7 @@ class admin_core_tools_settings extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
@@ -2086,14 +2094,14 @@ class admin_core_tools_settings extends ipsCommand
 	/**
 	 * Load and parse settings delete list (IN_DEV)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadDeleteList()
+	protected function _loadDeleteList()
 	{
 		if ( IN_DEV )
 		{
 			/* Check for group settings */
-			if ( file_exists( DOC_IPS_ROOT_PATH . '_deleteGroupSettings.txt' ) )
+			if ( is_file( DOC_IPS_ROOT_PATH . '_deleteGroupSettings.txt' ) )
 			{
 				$notTheseGroups = file( DOC_IPS_ROOT_PATH . '_deleteGroupSettings.txt' );
 				
@@ -2123,7 +2131,7 @@ class admin_core_tools_settings extends ipsCommand
 			}
 			
 			/* Check for single settings */
-			if ( file_exists( DOC_IPS_ROOT_PATH . '_deleteSettings.txt' ) )
+			if ( is_file( DOC_IPS_ROOT_PATH . '_deleteSettings.txt' ) )
 			{
 				$notTheseSettings = file( DOC_IPS_ROOT_PATH . '_deleteSettings.txt' );
 				
diff --git a/upload/admin/applications/core/modules_admin/settings/xml/index.html b/upload/admin/applications/core/modules_admin/settings/xml/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/settings/xml/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/settings/xml/menu.xml b/upload/admin/applications/core/modules_admin/settings/xml/menu.xml
new file mode 100644
index 00000000..9018c226
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/settings/xml/menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<menu>
+	<tabitems>
+		<item>
+			<title>System Settings</title>
+			<subitems>
+				<subitem>
+					<subitemtitle>System Settings</subitemtitle>
+					<subitemlang>settings</subitemlang>
+					<subsection>settings</subsection>
+					<subitemurl>do=settingsview</subitemurl>
+					<subitemrolekey>settings_manage</subitemrolekey>
+					<subisredirect>0</subisredirect>
+				</subitem>
+			</subitems>
+		</item>
+	</tabitems>
+</menu>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/settings/xml/permissions.xml b/upload/admin/applications/core/modules_admin/settings/xml/permissions.xml
new file mode 100644
index 00000000..3ace6faf
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/settings/xml/permissions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<permissions>
+	<group>
+		<grouptitle>Manage Settings</grouptitle>
+		<grouplang>core_settings</grouplang>
+		<items>
+			<item>
+				<key>settings_manage</key>
+				<string>Can edit/add settings and setting groups?</string>
+			</item>
+			<item>
+				<key>settings_delete</key>
+				<string>Can delete settings and setting groups?</string>
+			</item>
+			<item>
+				<key>performance_toggle</key>
+				<string>Can toggle performance mode?</string>
+			</item>
+			<item>
+				<key>licensekey_manage</key>
+				<string>Can manage license key?</string>
+			</item>
+		</items>
+	</group>
+</permissions>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/sql/defaultSection.php b/upload/admin/applications/core/modules_admin/sql/defaultSection.php
index b3beb0f4..0d609686 100644
--- a/upload/admin/applications/core/modules_admin/sql/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/sql/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default sql section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'sql' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'toolbox';
diff --git a/upload/admin/applications/core/modules_admin/sql/index.html b/upload/admin/applications/core/modules_admin/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/sql/index.html
+++ b/upload/admin/applications/core/modules_admin/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/sql/mysql.php b/upload/admin/applications/core/modules_admin/sql/mysql.php
index 589aad03..7eb45ddf 100644
--- a/upload/admin/applications/core/modules_admin/sql/mysql.php
+++ b/upload/admin/applications/core/modules_admin/sql/mysql.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * mySQL Admin
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6917 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -31,7 +31,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * SQL version
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $sql_version		= "";
@@ -39,7 +38,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * True SQL version
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $true_version	= "";
@@ -47,7 +45,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * GZIP Header contents for backup
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $str_gzip_header	= "\x1f\x8b\x08\x00\x00\x00\x00\x00";
@@ -55,7 +52,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Flag that's set if there's problems
 	 *
-	 * @access	public
 	 * @var		boolean
 	 */
 	public $db_has_issues	 = false;
@@ -63,7 +59,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * HTML object
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $html;
@@ -71,7 +66,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Form code
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= "";
@@ -79,7 +73,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Form code js
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code_js	= "";
@@ -87,15 +80,14 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
 		/* Load HTML and Lang */
 		$this->html = $this->registry->output->loadTemplate( 'cp_skin_sql' );
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_sql' ) );
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_sql' ), 'core' );
 
 		/* URLs */
 		$this->form_code	= $this->html->form_code	= 'module=sql&amp;section=toolbox';
@@ -166,8 +158,7 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Run selected tool on selected tables
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlRunTool()
 	{
@@ -240,8 +231,7 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Safe backup splash screen
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlSafeBackupSplash()
 	{
@@ -253,9 +243,8 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Runs the database backup
 	 *
-	 * @access	public
 	 * @param	string	$tbl_name	Specify a table to backup, leave blank to backup all
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlDoSafeBackup($tbl_name="")
 	{
@@ -299,13 +288,13 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 		{
 			@ob_start();
 			@ob_implicit_flush(0);
-			header("Content-Type: text/x-delimtext; name=\"{$filename}.sql.gz\"");
-			header("Content-disposition: attachment; filename={$filename}.sql.gz");
+			header( "Content-Type: text/x-delimtext; name=\"{$filename}.sql.gz\"; charset=" . IPS_DOC_CHAR_SET );
+			header( "Content-disposition: attachment; filename={$filename}.sql.gz" );
 		}
 		else
 		{
-			header("Content-Type: text/x-delimtext; name=\"{$filename}.sql\"");
-			header("Content-disposition: attachment; filename={$filename}.sql");
+			header( "Content-Type: text/x-delimtext; name=\"{$filename}.sql\"; charset=" . IPS_DOC_CHAR_SET );
+			header( "Content-disposition: attachment; filename={$filename}.sql" );
 		}
 
 		/* Get tables to work on */
@@ -344,9 +333,7 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Displays the form for backing up an sql database
 	 *
-	 * @access	public
-	 * @return	void
-	 * @author	Josh
+	 * @return	@e void
 	 */
 	public function sqlBackupForm()
 	{
@@ -370,9 +357,8 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Run a mysql query and display results
 	 *
-	 * @access	public
 	 * @param	string	$sql	The query to run
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlViewResults( $sql )
 	{
@@ -390,7 +376,7 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 					);
 
 		/* Figure out the title */
-		if ( isset( $map[ $this->request['do'] ] ) AND $map[ $this->request['do'] ] != "" )
+		if ( !empty( $map[ $this->request['do'] ] ) )
 		{
 			$tbl_title = $map[ $this->request['do'] ];
 			$man_query = 0;
@@ -559,7 +545,14 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 								}
 							}
 
-							$row[] = nl2br( htmlspecialchars( wordwrap( $r[ $fields[$i]->name ] , 50, "\n", 1 ) ) );
+							if( ! $this->request['notruncate'] OR strlen($r[ $fields[$i]->name ]) < 201  )
+							{
+								$row[] = nl2br( htmlspecialchars( wordwrap( $r[ $fields[$i]->name ] , 50, "\n", 1 ) ) );
+							}
+							else
+							{
+								$row[] = htmlspecialchars( $r[ $fields[$i]->name ] );
+							}
 						}
 
 						/* Add to output array */
@@ -591,21 +584,13 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	 * SHOW ALL TABLES AND STUFF!
 	 * 5 hours ago this seemed like a damned good idea.
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sqlListIndex()
 	{
 		/* INIT */
 		$form_array = array();
-		$extra 		= "";
-
-		/* Check version */
-		if ( $this->sql_version < 3232 )
-		{
-			$extra = $this->lang->words['my_tooold'];
-		}
-
+		
 		/* Get a list of tables */
 		$this->DB->query( "SHOW TABLE STATUS FROM `{$this->settings['sql_database']}`" );
 
@@ -622,22 +607,20 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 			
 			/* Add to output array */
 			$rows[] = array(
-								'table' => $r['Name'],
-								'rows'  => $r['Rows'],
-								'query' => urlencode( "SELECT * FROM {$r['Name']}" )
+							'table' => $r['Name'],
+							'rows'  => $r['Rows'],
+							'query' => urlencode( "SELECT * FROM {$r['Name']}" )
 							);
 		}
 
 		/* Output */
-		$this->registry->output->html           .= $this->html->sqlListTables( $rows );
+		$this->registry->output->html .= $this->html->sqlListTables( $rows );
 	}
 	
 	/**
 	 * View table schematic
 	 *
-	 * @access	public
-	 * @return	void
-	 * @author	Josh
+	 * @return	@e void
 	 */
 	public function sqlViewTable()
 	{
@@ -664,7 +647,7 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 		}
 
 		/* Add Nav */
-		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=runsql&query=" . urlencode( "SELECT * FROM $table" ), $table );
+		$this->registry->output->extra_nav[] = array( "{$this->settings['base_url']}{$this->form_code}&amp;do=viewschematic&table=" . $table, $table );
 		
 		/* Output */
 		$this->registry->output->html .= $this->html->sqlViewTable( $table, $rows, $indexes );
@@ -673,12 +656,10 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Internal handler to return content from table
 	 *
-	 * @access	public
 	 * @param	string	Table
 	 * @param	boolean	Whether to show create table or not
 	 * @param	boolean	Whether to skip non-essential tables
-	 * @return	void
-	 * @author	Josh
+	 * @return	@e void
 	 */
 	public function sqlGetTableSQL($tbl, $create_tbl, $skip=0)
 	{
@@ -771,7 +752,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Strip tick marks from field names
 	 *
-	 * @access	public
 	 * @param	string	$data	String to strip tick marks from
 	 * @return	string
 	 */
@@ -783,7 +763,6 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Add slashes to single quotes to stop sql breaks
 	 *
-	 * @access	public
 	 * @param	string	$data	String to add slashes too
 	 * @return	string
 	 */
@@ -800,10 +779,9 @@ class admin_core_sql_toolbox_module extends ipsCommand {
 	/**
 	 * Gzip
 	 *
-	 * @access	public
 	 * @param	string	$val
 	 * @return	string
-	 **/
+	 */
     public function sqlGzipFourChars( $val )
 	{
 		for ($i = 0; $i < 4; $i ++)
diff --git a/upload/admin/applications/core/modules_admin/sql/toolbox.php b/upload/admin/applications/core/modules_admin/sql/toolbox.php
index d73d7dbd..59bc1928 100644
--- a/upload/admin/applications/core/modules_admin/sql/toolbox.php
+++ b/upload/admin/applications/core/modules_admin/sql/toolbox.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * SQL Admin
- * Last Updated: $Date: 2010-10-19 08:45:58 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-03-11 06:59:39 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6994 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8031 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -32,7 +32,7 @@ class admin_core_sql_toolbox extends ipsCommand
 	public function doExecute( ipsRegistry $registry )
 	{
 		/* Require the right driver file */
-		$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/sql/' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '.php', 'admin_core_sql_toolbox_module' );
+		$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/sql/' . strtolower( ipsRegistry::dbFunctions()->getDriverType() ) . '.php', 'admin_core_sql_toolbox_module' );/*noLibHook*/
 		$dbdriver = new $classToLoad();
 		$dbdriver->makeRegistryShortcuts( $registry );
 		$dbdriver->doExecute( $registry );
diff --git a/upload/admin/applications/core/modules_admin/sql/xml/index.html b/upload/admin/applications/core/modules_admin/sql/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/sql/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/sql/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/sql/xml/menu.xml b/upload/admin/applications/core/modules_admin/sql/xml/menu.xml
index 8256e7db..0d69889b 100644
--- a/upload/admin/applications/core/modules_admin/sql/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/sql/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Ин�трументы дл� управлени� SQL</subitemtitle>
+					<subitemlang>sql_toolbox</subitemlang>
 					<subsection>toolbox</subsection>
 					<subitemurl>do=overview</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -18,6 +19,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Резервна� копи� базы данных</subitemtitle>
+					<subitemlang>sql_backup</subitemlang>
 					<subsection>toolbox</subsection>
 					<subitemurl>do=backup</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -30,6 +32,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Информаци� о �о�то�нии �ервера</subitemtitle>
+					<subitemlang>sql_ri</subitemlang>
 					<subsection>toolbox</subsection>
 					<subitemurl>do=runtime</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -42,6 +45,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Значени� �и�темных на�троек</subitemtitle>
+					<subitemlang>sql_vars</subitemlang>
 					<subsection>toolbox</subsection>
 					<subitemurl>do=system</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -54,6 +58,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Выполн�ющие�� проце��ы</subitemtitle>
+					<subitemlang>sql_processes</subitemlang>
 					<subsection>toolbox</subsection>
 					<subitemurl>do=processes</subitemurl>
 					<subitemrolekey></subitemrolekey>
diff --git a/upload/admin/applications/core/modules_admin/system/charts.php b/upload/admin/applications/core/modules_admin/system/charts.php
new file mode 100644
index 00000000..34bb24a2
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/system/charts.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @file		charts.php 	Admin dashboard chart(s)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-09-28 17:57:13 -0400 (Wed, 28 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9563 $
+ */
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		admin_core_system_charts
+ * @brief		Admin dashboard chart(s)
+ *
+ */
+class admin_core_system_charts extends ipsCommand
+{
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* Language */
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_system' ), 'core' );
+
+		switch( $this->request['do'] )
+		{
+			case 'reg':
+			default:
+				$this->showRegistrationChart();
+			break;
+		}
+	}
+	
+	/**
+	 * Show chart of registrations over x days
+	 *
+	 * @return	@e void [Outputs to screen]
+	 */
+	public function showRegistrationChart()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$days	= intval( $this->request['days'] );
+		
+		if( !$days )
+		{
+			$days	= 7;
+		}
+		
+		$cutoff			= time() - ( $days * 86400 );
+		$_check			= time();
+		$registrations	= array();
+		$labels			= array();
+		$_ttl			= 0;
+		
+		while( $_check > $cutoff )
+		{
+			$_day	= strftime( '%b %d', $_check );
+			$_key	= strftime( '%Y-%m-%d', $_check );
+
+			$labels[ $_key ]		= $_day;
+			$registrations[ $_key ]	= 0;
+
+			$_check	-= 86400;
+		}
+
+		//-----------------------------------------
+		// Get the data
+		//-----------------------------------------
+
+		$this->DB->build( array( 'select' => 'member_id, joined', 'from' => 'members', 'where' => 'joined > ' . $cutoff ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			//$_day	= strftime( '%b %d', $r['joined'] );
+			$_key	= strftime( '%Y-%m-%d', $r['joined'] );
+
+			if( isset($registrations[ $_key ]) )
+			{
+				$registrations[ $_key ]	+= 1;
+				$_ttl++;
+			}
+		}
+		
+		ksort( $labels );
+		ksort( $registrations );
+
+		//-----------------------------------------
+		// Output chart
+		//-----------------------------------------
+
+		require_once( IPS_KERNEL_PATH . '/classGraph.php' );/*noLibHook*/
+		$graph	= new classGraph();
+		$graph->options['title']			= '';
+		$graph->options['font']				= DOC_IPS_ROOT_PATH . '/public/style_captcha/captcha_fonts/times.ttf';
+		$graph->options['width']			= 1024;
+		$graph->options['height']			= 400;
+		$graph->options['style3D']			= 1;
+		$graph->options['showlegend']		= 0;
+		//$graph->options['xaxisskip']		= 5;
+		$graph->options['showgridlinesx']	= 0;
+
+		if( $_ttl )
+		{
+			//ksort($labels);
+			//ksort($registrations);
+			
+			$graph->addLabels( array_values($labels) );
+			$graph->addSeries( 'test', array_values($registrations) );
+		}
+		else
+		{
+			$graph->options['title']	= sprintf( $this->lang->words['no_reg_x_days'], $days );
+			$graph->addLabels( array( 0 ) );
+			$graph->addSeries( 'test', array( 0 ) );
+		}
+
+		$graph->options['charttype'] = 'Line';
+		$graph->display();
+		exit;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/system/defaultSection.php b/upload/admin/applications/core/modules_admin/system/defaultSection.php
index c80d2948..786164a4 100644
--- a/upload/admin/applications/core/modules_admin/system/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/system/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default system section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'system' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'taskmanager';
diff --git a/upload/admin/applications/core/modules_admin/system/index.html b/upload/admin/applications/core/modules_admin/system/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/system/index.html
+++ b/upload/admin/applications/core/modules_admin/system/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/system/loginlog.php b/upload/admin/applications/core/modules_admin/system/loginlog.php
index 90be1773..843c716d 100644
--- a/upload/admin/applications/core/modules_admin/system/loginlog.php
+++ b/upload/admin/applications/core/modules_admin/system/loginlog.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin Login Logs
- * Last Updated: $LastChangedDate: 2010-10-08 08:06:02 -0400 (Fri, 08 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-01 08:16:37 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6955 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9439 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -27,9 +27,8 @@ class admin_core_system_loginlog extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -72,8 +71,7 @@ class admin_core_system_loginlog extends ipsCommand
 	/**
 	 * View Details of a Log in Attempt
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loginLogDetails()
 	{
@@ -102,7 +100,6 @@ class admin_core_system_loginlog extends ipsCommand
 		
 		$log['_admin_time'] 		= $this->registry->class_localization->getDate( $log['admin_time'], 'LONG' );
 		$log['_admin_post_details'] = unserialize( $log['admin_post_details'] );
-		$log['_admin_img']          = $log['admin_success'] ? 'aff_tick.png' : 'aff_cross.png';
 		
 		//-----------------------------------------
 		// Show...
@@ -115,8 +112,7 @@ class admin_core_system_loginlog extends ipsCommand
 	/**
 	 * View admin login logs
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loginLogsView()
 	{
@@ -150,7 +146,6 @@ class admin_core_system_loginlog extends ipsCommand
 		while( $row = $this->DB->fetch() )
 		{
 			$row['_admin_time'] = $this->registry->class_localization->getDate( $row['admin_time'], 'ACP' );
-			$row['_admin_img']  = $row['admin_success'] ? 'aff_tick.png' : 'aff_cross.png';
 			
 			$logins .= $this->html->acp_last_logins_row( $row );
 		}
diff --git a/upload/admin/applications/core/modules_admin/system/security.php b/upload/admin/applications/core/modules_admin/system/security.php
index 52d39f23..7f23d1b8 100644
--- a/upload/admin/applications/core/modules_admin/system/security.php
+++ b/upload/admin/applications/core/modules_admin/system/security.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Security center tools
- * Last Updated: $Date: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-06-22 11:54:21 -0400 (Wed, 22 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.2 IIRC
- * @version		$Revision: 6990 $
+ * @version		$Revision: 9077 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,13 +30,13 @@ class admin_core_system_security extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */	
-	private $html;
+	protected $html;
 
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -105,7 +105,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Virus checker
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function listAdmins()
 	{
@@ -184,7 +184,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Virus checker
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function virusCheck()
 	{
@@ -290,7 +290,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Security Overview Screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function securityOverview()
 	{
@@ -341,7 +341,7 @@ class admin_core_system_security extends ipsCommand
 		/* Get .htaccess settings */
 		if( strpos( strtolower( PHP_OS ), 'win' ) !== 0 )
 		{
-			if ( ! file_exists( IPS_ROOT_PATH . '/.htaccess' ) )
+			if ( ! is_file( IPS_ROOT_PATH . '/.htaccess' ) )
 			{
 				$content['ok'] .= $this->html->security_item_ok(    $this->lang->words['s_htaccess'],
 				 													sprintf( $this->lang->words['s_htaccess_bad'], CP_DIRECTORY ),
@@ -359,7 +359,7 @@ class admin_core_system_security extends ipsCommand
 			}
 			
 			/* Other htaccess protection */
-			if ( ! file_exists( IPS_CACHE_PATH . 'cache/.htaccess' ) )
+			if ( ! is_file( IPS_CACHE_PATH . 'cache/.htaccess' ) )
 			{
 				$content['ok'] .= $this->html->security_item_ok( $this->lang->words['s_phpcgi'],
 				 												 $this->lang->words['s_phpcgi_bad'],
@@ -422,7 +422,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * ACP HTACCESS: Step two
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	Josh
 	 */	
 	public function acpHtaccessDo()
@@ -456,7 +456,7 @@ class admin_core_system_security extends ipsCommand
 					   . "AuthType Basic\n"
 					   . "AuthName \"IP.Board CP\"\n"
 					   . "AuthUserFile " . IPS_ROOT_PATH . ".htpasswd\n"
-				       . "Require valid-user\n";
+				       . "Require valid-user\n";/*noLibHook*/
 				
 		$htaccess_pw   = $name . ":" . crypt( $pass, base64_encode( $pass ) );
 		
@@ -483,7 +483,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * ACP HTACCESS: Step One
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function acpHtaccessForm()
 	{
@@ -494,7 +494,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Rename ACP directory
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function doAcpRename()
 	{
@@ -506,7 +506,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Change conf global
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doConfGlobal()
 	{
@@ -535,7 +535,7 @@ class admin_core_system_security extends ipsCommand
 	/**
 	 * Add htaccess to non IPB dirs
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doHtaccess()
 	{
@@ -543,14 +543,12 @@ class admin_core_system_security extends ipsCommand
 		$name = '.htaccess';
 		$msg  = array();
 		$dirs = array( DOC_IPS_ROOT_PATH . 'cache/',
-					   DOC_IPS_ROOT_PATH . 'public/style_avatars',
-					   DOC_IPS_ROOT_PATH . 'public/style_captcha',
-					   DOC_IPS_ROOT_PATH . 'public/style_css',
-					   DOC_IPS_ROOT_PATH . 'public/style_emoticons',
-					   DOC_IPS_ROOT_PATH . 'public/style_extra',
-					   DOC_IPS_ROOT_PATH . 'public/style_images',
-					   DOC_IPS_ROOT_PATH . 'public/resources',
-					   DOC_IPS_ROOT_PATH . 'hooks',
+					   DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_captcha',
+					   DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css',
+					   DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_emoticons',
+					   DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_extra',
+					   DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_images',
+					   rtrim( IPS_HOOKS_PATH, '/' ),
 					   DOC_IPS_ROOT_PATH . 'uploads' );
 					
 		$towrite = <<<EOF
@@ -586,7 +584,7 @@ EOF;
 	/**
 	 * Deep Virus Scan
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function deepScan()
 	{
diff --git a/upload/admin/applications/core/modules_admin/system/taskmanager.php b/upload/admin/applications/core/modules_admin/system/taskmanager.php
index 827e969c..0cb3d0ff 100644
--- a/upload/admin/applications/core/modules_admin/system/taskmanager.php
+++ b/upload/admin/applications/core/modules_admin/system/taskmanager.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task Manager
- * Last Updated: $LastChangedDate: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6995 $
+ * @file		taskmanager.php 	Task manager
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * $LastChangedDate: 2011-08-26 11:38:16 -0400 (Fri, 26 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9420 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -22,20 +16,39 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		admin_core_system_taskmanager
+ * @brief		Task manager
+ */
 class admin_core_system_taskmanager extends ipsCommand
 {
 	/**
-	 * Skin object
+	 * Skin object shortcut
 	 *
-	 * @var		object			Skin templates
-	 */	
-	private $html;
+	 * @var		$html
+	 */
+	public $html;
+	
+	/**
+	 * String for the screen url bit
+	 *
+	 * @var		$form_code
+	 */
+	public $form_code    = '';
+	
+	/**
+	 * String for the JS url bit
+	 *
+	 * @var		$form_code_js
+	 */
+	public $form_code_js = '';
 
 	/**
-	 * Main class entry point
+	 * Main function executed automatically by the controller
 	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -138,10 +151,9 @@ class admin_core_system_taskmanager extends ipsCommand
 	}
 	
 	/**
-	 * Perform the task import
+	 * Perform the tasks import
 	 *
-	 * @param	string		Raw XML code
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskImport()
 	{
@@ -162,7 +174,7 @@ class admin_core_system_taskmanager extends ipsCommand
 		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->loadXML( $content );
@@ -218,9 +230,9 @@ class admin_core_system_taskmanager extends ipsCommand
 	}
 	
 	/**
-	 * Remove a task log
+	 * Remove logs for a specific task or all
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskLogsDelete()
 	{
@@ -248,7 +260,7 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Show task logs
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskLogsShow()
 	{
@@ -295,7 +307,7 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Builds the task log overview screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskLogsOverview()
 	{
@@ -350,16 +362,15 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Delete a task
 	 *
-	 * @param	string	$type	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function taskDelete( $type='add' )
+	public function taskDelete()
 	{
 		/* INIT */
 		$task_id = intval( $this->request['task_id'] );
 		
 		/* Check to see if this is a valid task */
-		$task = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_id=$task_id" ) );
+		$task = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_id={$task_id}" ) );
 			
 		if ( $task['task_safemode'] and ! IN_DEV )
 		{
@@ -369,7 +380,7 @@ class admin_core_system_taskmanager extends ipsCommand
 		}
 		
 		/* Delete this task */
-		$this->DB->delete( 'task_manager', 'task_id='.$task_id );
+		$this->DB->delete( 'task_manager', 'task_id='.$task['task_id'] );
 		
 		/* Save next date and bounce */
 		$this->func_taskmanager->saveNextRunStamp();
@@ -381,14 +392,12 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Unlock a task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskManagerUnlockTask()
 	{
-		/* INIT */
-		$task_id = intval( $this->request['task_id'] );
-		
-		$this->func_taskmanager->unlockTask( $task_id );
+		/* Unlock */
+		$this->func_taskmanager->unlockTask( intval($this->request['task_id']) );
 		
 		/* Bounce */
 		$this->registry->output->global_message = $this->lang->words['t_locknomore'];
@@ -399,7 +408,7 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Runs the selected task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskManagerRunTask()
 	{
@@ -449,7 +458,7 @@ class admin_core_system_taskmanager extends ipsCommand
 		$this->func_taskmanager->saveNextRunStamp();
 
 		/* Run the task file */
-		if( file_exists( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'] ) )
+		if( is_file( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'] ) )
 		{
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'], 'task_item', $this_task['task_application'] );
 			$myobj = new $classToLoad( $this->registry, $this->func_taskmanager, $this_task );
@@ -468,14 +477,13 @@ class admin_core_system_taskmanager extends ipsCommand
 			$this->taskManagerOverview();
 			return;
 		}
-		
-	}	
+	}
 	
 	/**
 	 * Save the add/edit task form
 	 *
-	 * @param	string	$type	Either add or edit	 
-	 * @return	void
+	 * @param	string		$type		Either add or edit data	 
+	 * @return	@e void
 	 */
 	public function taskManagerSave( $type='add' )
 	{
@@ -577,8 +585,8 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Builds the add/edit task form
 	 *
-	 * @param	string	$type	Either add or edit
-	 * @return	void
+	 * @param	string		$type		Either add or edit
+	 * @return	@e void
 	 */
 	public function taskManagerForm( $type='add' )
 	{
@@ -651,26 +659,26 @@ class admin_core_system_taskmanager extends ipsCommand
 			$dropdown['_mday'][] = array( $i, $i );
 		}
 		
-		$dropdown['_wday'][]  = array( '0', $this->lang->words['t_sunday']     );
-		$dropdown['_wday'][]  = array( '1', $this->lang->words['t_monday']     );
-		$dropdown['_wday'][]  = array( '2', $this->lang->words['t_tuesday']    );
-		$dropdown['_wday'][]  = array( '3', $this->lang->words['t_wednesday']  );
-		$dropdown['_wday'][]  = array( '4', $this->lang->words['t_thursday']   );
-		$dropdown['_wday'][]  = array( '5', $this->lang->words['t_friday']     );
-		$dropdown['_wday'][]  = array( '6', $this->lang->words['t_saturday']   );
+		$dropdown['_wday'][]  = array( '0', $this->lang->words['t_sunday']    );
+		$dropdown['_wday'][]  = array( '1', $this->lang->words['t_monday']    );
+		$dropdown['_wday'][]  = array( '2', $this->lang->words['t_tuesday']   );
+		$dropdown['_wday'][]  = array( '3', $this->lang->words['t_wednesday'] );
+		$dropdown['_wday'][]  = array( '4', $this->lang->words['t_thursday']  );
+		$dropdown['_wday'][]  = array( '5', $this->lang->words['t_friday']    );
+		$dropdown['_wday'][]  = array( '6', $this->lang->words['t_saturday']  );
 		
 		/* Form Elements */
-		$form['task_title']       = $this->registry->output->formInput(        'task_title'      , $this->request['task_title']       ? $this->request['task_title']       : $task['task_title'] );
-		$form['task_description'] = $this->registry->output->formInput(        'task_description', $this->request['task_description'] ? $this->request['task_description'] : $task['task_description'] );
+		$form['task_title']       = $this->registry->output->formInput(       'task_title'      , $this->request['task_title']       ? $this->request['task_title']       : $task['task_title'] );
+		$form['task_description'] = $this->registry->output->formInput(       'task_description', $this->request['task_description'] ? $this->request['task_description'] : $task['task_description'] );
 		$form['task_file']        = $this->registry->output->formSimpleInput( 'task_file'       , $this->request['task_file']        ? $this->request['task_file']        : $task['task_file']       , '20' );
-		$form['task_minute']      = $this->registry->output->formDropdown(     'task_minute'     , $dropdown['_minute']               , $this->request['task_minute']      ? $this->request['task_minute']    : $task['task_minute']  ,  '', 'onchange="updatepreview()"' );
-		$form['task_hour']        = $this->registry->output->formDropdown(     'task_hour'       , $dropdown['_hour']                 , $this->request['task_hour']        ? $this->request['task_hour']      : $task['task_hour']     , '', 'onchange="updatepreview()"' );
-	    $form['task_week_day']    = $this->registry->output->formDropdown(     'task_week_day'   , $dropdown['_wday']                 , $this->request['task_week_day']    ? $this->request['task_week_day']  : $task['task_week_day'] , '', 'onchange="updatepreview()"' );
-		$form['task_month_day']   = $this->registry->output->formDropdown(     'task_month_day'  , $dropdown['_mday']                 , $this->request['task_month_day']   ? $this->request['task_month_day'] : $task['task_month_day'], '', 'onchange="updatepreview()"' );
+		$form['task_minute']      = $this->registry->output->formDropdown(    'task_minute'     , $dropdown['_minute']               , $this->request['task_minute']      ? $this->request['task_minute']    : $task['task_minute']  ,  '', 'onchange="updatepreview()"' );
+		$form['task_hour']        = $this->registry->output->formDropdown(    'task_hour'       , $dropdown['_hour']                 , $this->request['task_hour']        ? $this->request['task_hour']      : $task['task_hour']     , '', 'onchange="updatepreview()"' );
+	    $form['task_week_day']    = $this->registry->output->formDropdown(    'task_week_day'   , $dropdown['_wday']                 , $this->request['task_week_day']    ? $this->request['task_week_day']  : $task['task_week_day'] , '', 'onchange="updatepreview()"' );
+		$form['task_month_day']   = $this->registry->output->formDropdown(    'task_month_day'  , $dropdown['_mday']                 , $this->request['task_month_day']   ? $this->request['task_month_day'] : $task['task_month_day'], '', 'onchange="updatepreview()"' );
 		$form['task_log']         = $this->registry->output->formYesNo(       'task_log'        , $this->request['task_log']         ? $this->request['task_log']         : $task['task_log'] );
 		$form['task_enabled']     = $this->registry->output->formYesNo(       'task_enabled'    , $this->request['task_enabled']     ? $this->request['task_enabled']     : $task['task_enabled'] );
-		$form['task_application'] = $this->registry->output->formDropdown(     'task_application', $apps, $this->request['task_application'] ? $this->request['task_application'] : $task['task_application'] );
-		$form['task_key']      = $this->registry->output->formInput(  'task_key'     , $this->request['task_key']      ? $this->request['task_key']      : $task['task_key'] );
+		$form['task_application'] = $this->registry->output->formDropdown(    'task_application', $apps, $this->request['task_application'] ? $this->request['task_application'] : $task['task_application'] );
+		$form['task_key']		  = $this->registry->output->formInput(       'task_key'        , $this->request['task_key']         ? $this->request['task_key']         : $task['task_key'] );
 		
 		if ( IN_DEV )
 		{
@@ -692,7 +700,7 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Builds the task mananger overview screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskManagerOverview()
 	{
@@ -751,11 +759,11 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Imports tasks from XML
 	 *
-	 * @param	string	$file		Filename to import tasks from
-	 * @param	bool	$no_return	Set to return true/false, instead of displaying results
-	 * @return	void
+	 * @param	string		$file			Filename to import tasks from
+	 * @param	boolean		$no_return		Set to return true/false, instead of displaying results
+	 * @return	@e mixed	True if $no_return is enabled, otherwise void
 	 */	
-	public function tasksImportFromXML( $file='', $no_return=0 )
+	public function tasksImportFromXML( $file='', $no_return=false )
 	{
 		/* INIT */
 		$file     = ( $file ) ? $file : IPS_PUBLIC_PATH . 'resources/tasks.xml';
@@ -764,15 +772,17 @@ class admin_core_system_taskmanager extends ipsCommand
 		$tasks    = array();
 		
 		/* Check to see if the file exists */
-		if ( ! file_exists( $file ) )
+		if ( ! is_file( $file ) )
 		{
 			$this->registry->output->global_message = sprintf( $this->lang->words['t_import404'], $file );
 			$this->taskManagerOverview();
 			return;
 		}
 		
+		$content	= @file_get_contents( $file );
+		
 		/* Grab current tasks */
-		$this->DB->build( array( 'select' => '*', 'from' => 'task_manager' ) );												
+		$this->DB->build( array( 'select' => '*', 'from' => 'task_manager' ) );
 		$this->DB->execute();
 		
 		while( $row = $this->DB->fetch() )
@@ -780,81 +790,37 @@ class admin_core_system_taskmanager extends ipsCommand
 			$tasks[ $row['task_key'] ] = $row;
 		}
 		
-		/* XML Class */
-		require_once( IPS_KERNEL_PATH.'class_xml.php' );		
-		$xml = new class_xml();		
+		/* Get the XML class */
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
+
+		$xml = new classXML( IPS_DOC_CHAR_SET );
+		$xml->loadXML( $content );
+
+		/* Loop through the tasks */
+		foreach( $xml->fetchElements('row') as $record )
+		{
+			$entry  = $xml->fetchElementsFromRecord( $record );
+			$_key	= $entry['task_key'];
+			
+			$entry['task_cronkey']		= $tasks[ $_key ]['task_cronkey'] ? $tasks[ $_key ]['task_cronkey'] : md5( uniqid( microtime() ) );
+			$entry['task_next_run']		= $tasks[ $_key ]['task_next_run'] ? $tasks[ $_key ]['task_next_run'] : time();
+			$entry['task_description']	= $entry['task_description'] ? $entry['task_description'] : '';
+			
+			unset( $entry['task_id'] );
 				
-		/* Read the xml file */
-		$skin_content = implode( '', file( $file ) );
-		
-		/* Parse the xml file contents */
-		$xml->xml_parse_document( $skin_content );
-		
-		/* Fix up */
-		if ( ! is_array( $xml->xml_array['export']['group']['row'][0]  ) )
-		{
-			/* Ensure [0] is populated */
-			$tmp = $xml->xml_array['export']['group']['row'];
-			unset($xml->xml_array['export']['group']['row']);
-			$xml->xml_array['export']['group']['row'][0] = $tmp;
-		}
-		
-		/* Make sure we have some task data */
-		if ( ! is_array( $xml->xml_array['export']['group']['row'][0] ) OR ! count( $xml->xml_array['export']['group']['row'][0] ) )
-		{
-			if ( $no_return )
+			if ( $tasks[ $_key ]['task_key'] )
 			{
-				return FALSE;
+				unset($entry['task_cronkey']);
+				unset($entry['task_enabled']);
+
+				$updated++;
+				$this->DB->update( 'task_manager', $entry, "task_key='" . $tasks[ $_key ]['task_key'] . "'" );
 			}
 			else
 			{
-				$this->registry->output->global_message = $this->lang->words['t_noupdate'];
-				$this->taskManagerOverview();
-			}
-		}
-		
-		/* Loop through the tasks */
-		if ( is_array( $xml->xml_array['export']['group']['row'] ) AND count( $xml->xml_array['export']['group']['row'] ) )
-		{
-			foreach( $xml->xml_array['export']['group']['row'] as $id => $entry )
-			{
-				$newrow = array();
-			
-				$_key = $entry['task_key']['VALUE'];
-		
-				foreach( $entry as $f => $data )
-				{
-					if ( $f == 'VALUE' or $f == 'task_id' )
-					{
-						continue;
-					}
-				
-					if ( $f == 'task_cronkey' )
-					{
-						$entry[ $f ]['VALUE'] = $tasks[ $_key ]['task_cronkey'] ? $tasks[ $_key ]['task_cronkey'] : md5( uniqid( microtime() ) );
-					}
-				
-					if ( $f == 'task_next_run' )
-					{
-						$entry[ $f ]['VALUE'] = $tasks[ $_key ]['task_next_run'] ? $tasks[ $_key ]['task_next_run'] : time();
-					}
-				
-					$newrow[$f] = $entry[ $f ]['VALUE'];
-				}
-				
-				$newrow['task_description'] = ( $newrow['task_description'] ) ? $newrow['task_description'] : '';
-			
-				if ( $tasks[ $_key ]['task_key'] )
-				{
-					$updated++;
-					$this->DB->update( 'task_manager', $newrow, "task_key='" . $tasks[ $_key ]['task_key'] . "'" );
-				}
-				else
-				{
-					$inserted++;
-					$this->DB->insert( 'task_manager', $newrow );
-					$tasks[ $_key ] = $newrow;
-				}
+				$inserted++;
+				$this->DB->insert( 'task_manager', $entry );
+				$tasks[ $_key ] = $entry;
 			}
 		}
 		
@@ -874,13 +840,13 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Import all tasks from XML
 	 *
-	 * @param	bool	$no_return
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tasksImportAllApps()
 	{
 		/* INIT */
 		$tasks = array();
+		$_gmsg = array();
 		
 		/* Grab current tasks */
 		$this->DB->build( array( 'select' => '*', 'from' => 'task_manager' ) );
@@ -892,7 +858,7 @@ class admin_core_system_taskmanager extends ipsCommand
 		}
 		
 		/* Grab XML class */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		
 		/* Loop through all the applications */
 		foreach( $this->registry->getApplications() as $app => $__data )
@@ -901,7 +867,7 @@ class admin_core_system_taskmanager extends ipsCommand
 			$xml   = new classXML( IPS_DOC_CHAR_SET );
 			$file  = IPSLib::getAppDir(  $app ) . '/xml/' . $app . '_tasks.xml';
 			
-			if( file_exists( $file ) )
+			if( is_file( $file ) )
 			{
 				$xml->load( $file );
 				
@@ -916,10 +882,14 @@ class admin_core_system_taskmanager extends ipsCommand
 					/* Update */
 					$entry['task_cronkey']     = ( $entry['task_cronkey'] )     ? $entry['task_cronkey']     : md5( uniqid( microtime() ) );
 					$entry['task_next_run']    = ( $entry['task_next_run'] )    ? $entry['task_next_run']    : time();
-					$entry['task_description'] = ( $entry['task_description'] ) ? $entry['task_description'] : '';	
+					$entry['task_description'] = ( $entry['task_description'] ) ? $entry['task_description'] : '';
+					$entry['task_locked']      = intval( $entry['task_locked'] );	
 						
 					if ( $tasks[ $entry['task_key'] ]['task_key'] )
 					{
+						unset($entry['task_cronkey']);
+						unset($entry['task_enabled']);
+
 						$stats['updated']++;
 						$this->DB->update( 'task_manager', $entry, "task_key='" . $entry['task_key'] . "'" );
 					}
@@ -933,7 +903,7 @@ class admin_core_system_taskmanager extends ipsCommand
 				}
 			}
 			
-			$this->registry->output->global_message .= $app . ': ' . sprintf( $this->lang->words['t_inserted'], $stats['inserted'], $stats['updated'] ) . '<br />';
+			$_gmsg[] = $app . ': ' . sprintf( $this->lang->words['t_inserted'], $stats['inserted'], $stats['updated'] );
 			
 			/* In dev time stamp? */
 			if ( IN_DEV )
@@ -943,7 +913,13 @@ class admin_core_system_taskmanager extends ipsCommand
 				$this->cache->setCache( 'indev', $cache, array( 'donow' => 1, 'array' => 1 ) );
 			}
 		}
-	
+		
+		/* Got a global message? */
+		if ( count($_gmsg) )
+		{
+			$this->registry->output->setMessage( implode( '<br />', $_gmsg ), 1 );
+		}
+		
 		/* Return */
 		$this->taskManagerOverview();
 	}
@@ -951,7 +927,7 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Export a single task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function taskExport()
 	{
@@ -959,7 +935,7 @@ class admin_core_system_taskmanager extends ipsCommand
 		$entry	= array();
 		$id		= intval($this->request['task_id']);
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		$xml->newXMLDocument();
@@ -971,7 +947,7 @@ class admin_core_system_taskmanager extends ipsCommand
 
 		$xml->addElementAsRecord( 'group', 'row', $r );
 			
-		/* Finish XML */	
+		/* Finish XML */
 		$doc = $xml->fetchDocument();
 
 		$this->registry->output->showDownload( $doc, 'task.xml', '', 0 );
@@ -980,14 +956,14 @@ class admin_core_system_taskmanager extends ipsCommand
 	/**
 	 * Export tasks to XML
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tasksExportToXML()
 	{
 		/* INIT */
 		$entry = array();
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		
 		/* Loop through all the applications */
 		foreach( $this->registry->getApplications() as $app => $__data )
@@ -997,7 +973,7 @@ class admin_core_system_taskmanager extends ipsCommand
 			$xml->newXMLDocument();
 			$xml->addElement( 'export' );
 			$xml->addElement( 'group', 'export' );
-
+			
 			/* Query tasks */
 			$this->DB->build( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_application='{$app}'" ) );		
 			$this->DB->execute();
@@ -1009,20 +985,17 @@ class admin_core_system_taskmanager extends ipsCommand
 				$xml->addElementAsRecord( 'group', 'row', $r );
 			}
 			
-			/* Finish XML */	
+			/* Finish XML */
 			$doc = $xml->fetchDocument();
 			
 			/* Write */
-			if ( $doc  AND $_c)
+			if ( $doc  AND $_c )
 			{
-				@unlink( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_tasks.xml' );
-				$fh = fopen( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_tasks.xml', 'w' );
-				fwrite( $fh, $doc );
-				fclose( $fh );
+				file_put_contents( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_tasks.xml', $doc );
 			}
 		}
 		
-		$this->registry->output->global_message = $this->lang->words['t_exported'];
-		$this->taskManagerOverview();		
+		$this->registry->output->setMessage( $this->lang->words['t_exported'], 1 );
+		$this->taskManagerOverview();
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/system/xml/index.html b/upload/admin/applications/core/modules_admin/system/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/system/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/system/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/system/xml/menu.xml b/upload/admin/applications/core/modules_admin/system/xml/menu.xml
index 22e8a825..97e6f26a 100644
--- a/upload/admin/applications/core/modules_admin/system/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/system/xml/menu.xml
@@ -6,8 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление планировщиком задач</subitemtitle>
+					<subitemlang>taskmanager</subitemlang>
 					<subsection>taskmanager</subsection>
 					<subitemurl>do=overview</subitemurl>
+					<subitemrolekey>task_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -17,14 +19,23 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Ин�трументы безопа�но�ти</subitemtitle>
+					<subitemlang>security</subitemlang>
 					<subsection>security</subsection>
 					<subitemurl></subitemurl>
+					<subitemrolekey>security_center</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+				</subitems>
+		</item>
+		<item>
+			<title>Спи�ок админи�траторов</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Спи�ок админи�траторов</subitemtitle>
+					<subitemlang>listadmins</subitemlang>
 					<subsection>security</subsection>
 					<subitemurl>do=list_admins</subitemurl>
+					<subitemrolekey>list_admins</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/system/xml/permissions.xml b/upload/admin/applications/core/modules_admin/system/xml/permissions.xml
index 5f89747e..7da2013e 100644
--- a/upload/admin/applications/core/modules_admin/system/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/system/xml/permissions.xml
@@ -2,7 +2,12 @@
 <permissions>
 	<group>
 		<grouptitle>Центр безопа�но�ти</grouptitle>
+		<grouplang>core_security</grouplang>
 		<items>
+			<item>
+				<key>security_center</key>
+				<string>Может про�матривать центр безопа�но�ти?</string>
+			</item>
 			<item>
 				<key>acplink_remove</key>
 				<string>Может удалить ��ылку на �Ц?</string>
@@ -39,6 +44,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление задачами планировщика</grouptitle>
+		<grouplang>core_tasks</grouplang>
 		<items>
 			<item>
 				<key>task_manage</key>
@@ -65,6 +71,7 @@
 	
 	<group>
 		<grouptitle>Журнал авторизаций админи�траторов</grouptitle>
+		<grouplang>core_acp_loginlogs</grouplang>
 		<items>
 			<item>
 				<key>acplogin_log</key>
diff --git a/upload/admin/applications/core/modules_admin/templates/css.php b/upload/admin/applications/core/modules_admin/templates/css.php
deleted file mode 100644
index 0dd95d98..00000000
--- a/upload/admin/applications/core/modules_admin/templates/css.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * CSS editing
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		Who knows...
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class admin_core_templates_css extends ipsCommand
-{
-	/**
-	 * Skin Functions Class
-	 *
-	 * @access	private
-	 * @var		object
-	 */
-	private $skinFunctions;
-
-	/**
-	 * Skin object
-	 *
-	 * @access	private
-	 * @var		object			Skin templates
-	 */
-	private $html;
-	
-	/**
-	 * Main class entry point
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		//-----------------------------------------
-		// Load skin
-		//-----------------------------------------
-		
-		$this->html			= $this->registry->output->loadTemplate('cp_skin_templates');
-	
-		//-----------------------------------------
-		// Set up stuff
-		//-----------------------------------------
-		
-		$this->form_code	= $this->html->form_code	= 'module=templates&amp;section=css';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=templates&section=css';
-		
-		//-----------------------------------------
-		// Load lang
-		//-----------------------------------------
-				
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ) );
-		
-		//-----------------------------------------
-		// Load functions and cache classes
-		//-----------------------------------------
-	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		
-		$this->skinFunctions = new skinCaching( $registry );
-		
-		///----------------------------------------
-		// What to do...
-		//-----------------------------------------
-		
-		switch( $this->request['do'] )
-		{
-			case 'list':
-			default:
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'css_manage' );
-				$this->_listCSS();
-			break;
-		}
-		
-		/* Output */
-		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
-		$this->registry->output->sendOutput();
-	}
-	
-	/**
-	 * List available CSS for this skin set
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	private function _listCSS()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$setID    = intval( $this->request['setID'] );
-		$css      = array();
-		$setData  = array();
-		
-		//-----------------------------------------
-		// Get template set data
-		//-----------------------------------------
-	
-		$setData = $this->skinFunctions->fetchSkinData( $setID );
-		
-		//-----------------------------------------
-		// Get CSS
-		//-----------------------------------------
-	
-		$_css = $this->skinFunctions->fetchCSS( $setID );
-		
-		//-----------------------------------------
-		// Fix up positioning
-		//-----------------------------------------
-		
-		foreach( $_css as $_id => $_data )
-		{
-			$css[ $_data['css_position'] . '.' . $_data['css_id'] ] = $_data;
-		}
-		
-		ksort( $css, SORT_NUMERIC );
-		
-		//-----------------------------------------
-		// Navvy Gation
-		//-----------------------------------------
-		
-		$this->registry->output->extra_nav[] = array( $this->settings['base_url'].'module=templates&amp;section=skinsets&amp;do=overview', $this->lang->words['cs_nav1'] );
-		$this->registry->output->extra_nav[] = array( $this->settings['base_url'].'module=templates&amp;section=css&amp;do=list&amp;setID=' . $setID, $this->lang->words['cs_nav2'] . $setData['set_name'] );
-		
-		//-----------------------------------------
-		// Print it...
-		//-----------------------------------------
-		
-		$this->registry->output->html .= $this->html->css_listCSS( $css, $setData );
-	}
-}
diff --git a/upload/admin/applications/core/modules_admin/templates/defaultSection.php b/upload/admin/applications/core/modules_admin/templates/defaultSection.php
index faf2ce84..544a9a74 100644
--- a/upload/admin/applications/core/modules_admin/templates/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/templates/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default templates section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'templates' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'skinsets';
diff --git a/upload/admin/applications/core/modules_admin/templates/easylogo.php b/upload/admin/applications/core/modules_admin/templates/easylogo.php
index 030f0dc8..2f1cea2b 100644
--- a/upload/admin/applications/core/modules_admin/templates/easylogo.php
+++ b/upload/admin/applications/core/modules_admin/templates/easylogo.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Easy Logo Changer
- * Last Updated: $Date: 2010-07-16 14:28:53 -0400 (Fri, 16 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 17th August 2004
- * @version		$Revision: 6664 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,7 +31,6 @@ class admin_core_templates_easylogo extends ipsCommand
 	/**
 	 * HTML Skin object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $html;
@@ -39,17 +38,15 @@ class admin_core_templates_easylogo extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -76,8 +73,8 @@ class admin_core_templates_easylogo extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );		
 	
@@ -106,8 +103,7 @@ class admin_core_templates_easylogo extends ipsCommand
 	/**
 	 * Finish changing the logo
 	 *
-	 * @access	public
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function complete()
 	{
@@ -180,7 +176,7 @@ class admin_core_templates_easylogo extends ipsCommand
 			
 			if ( move_uploaded_file( $_FILES[ 'FILE_UPLOAD' ]['tmp_name'], DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . "/style_images/{$this->request['skin']}_" . $FILE_NAME ) )
 			{
-				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . "/style_images/{$this->requestt['skin']}_".$FILE_NAME, 0777 );
+				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . "/style_images/" . $this->requestt['skin'] . "_" . $FILE_NAME, IPS_FILE_PERMISSION );
 			}
 			else
 			{
@@ -222,8 +218,7 @@ class admin_core_templates_easylogo extends ipsCommand
 	/**
 	 * Show the form to change the logo
 	 *
-	 * @access	public
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function splash()
 	{
diff --git a/upload/admin/applications/core/modules_admin/templates/external.php b/upload/admin/applications/core/modules_admin/templates/external.php
new file mode 100644
index 00000000..b7be234f
--- /dev/null
+++ b/upload/admin/applications/core/modules_admin/templates/external.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Externally edit templates and css
+ * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @since		Tuesday 17th August 2004
+ * @version		$Revision: 8644 $
+ *
+ */
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class admin_core_templates_external extends ipsCommand
+{
+	/**
+	 * HTML Skin object
+	 *
+	 * @var		object
+	 */
+	protected $html;
+	
+	/**
+	 * Skin Functions Class
+	 *
+	 * @var		object
+	 */
+	protected $skinFunctions;
+	
+	/**
+	 * Class entry point
+	 *
+	 * @param	object		Registry reference
+	 * @return	@e void		[Outputs to screen/redirects]
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		//-----------------------------------------
+		// Load lang
+		//-----------------------------------------
+		
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'admin_templates' ), 'core' );
+		
+		//-----------------------------------------
+		// Load skin
+		//-----------------------------------------
+		
+		$this->html			= $this->registry->output->loadTemplate('cp_skin_templates');
+		
+		//-----------------------------------------
+		// Set up stuff
+		//-----------------------------------------
+		
+		$this->form_code	= $this->html->form_code	= 'module=templates&amp;section=external';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=templates&section=external';
+		
+		//-----------------------------------------
+		// Load functions and cache classes
+		//-----------------------------------------
+	
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinCaching( $registry );		
+	
+		//-----------------------------------------
+		// What to do?
+		//-----------------------------------------
+
+		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'settemplates_external' );
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'overview':
+				$this->_overview();
+				break;
+			case 'save':
+				$this->_save();
+				break;
+		}
+		
+		/* Output */
+		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
+		$this->registry->output->sendOutput();
+	}
+	
+	/**
+	 * Saves um.. it
+	 *
+	 * @return	@e void		[Outputs to screen/redirects]
+	 */
+	protected function _save()
+	{
+		/* Init */
+		$webdav_on = intval( $this->request['webdav_on'] );
+		
+		/* Save */
+		IPSLib::updateSettings( array( 'webdav_on' => $webdav_on ) );
+		
+		/* Relist */
+		$this->registry->output->silentRedirect( "{$this->settings['base_url']}{$this->html->form_code}" );
+	}
+	
+	/**
+	 * Shows the current state of the external edit system 
+	 *
+	 * @return	@e void		[Outputs to screen/redirects]
+	 */
+	protected function _overview()
+	{
+		/* Init */
+		$form = array();
+		
+		$form['webdav_on']= $this->registry->getClass('output')->formYesNo( 'webdav_on', $this->settings['webdav_on'] );
+		
+		$this->registry->output->html .= $this->html->externalEditOverview( $form );
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/templates/importexport.php b/upload/admin/applications/core/modules_admin/templates/importexport.php
index d9efc77a..b74010cf 100644
--- a/upload/admin/applications/core/modules_admin/templates/importexport.php
+++ b/upload/admin/applications/core/modules_admin/templates/importexport.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Import and export skin sets
- * Last Updated: $Date: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-09-01 23:02:38 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6863 $
+ * @version		$Revision: 9442 $
  *
  */
 
@@ -30,31 +30,27 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Recursive depth guide
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_depthGuide = array();
+	protected $_depthGuide = array();
 	
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -64,9 +60,8 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -93,9 +88,9 @@ class admin_core_templates_importexport extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinImportExport( $registry );
 		
@@ -145,10 +140,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Import an XMLarchive skin set
 	 *
-	 * @access	private
 	 * @return	string		HTML to show
 	 */
-	private function _importReplacements()
+	protected function _importReplacements()
 	{
 		$importLocation = trim( $this->request['importLocation'] );
 		$setID          = intval( $this->request['setID'] );
@@ -184,10 +178,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Import an XMLarchive skin set
 	 *
-	 * @access	private
 	 * @return	string		HTML to show
 	 */
-	private function _importImages()
+	protected function _importImages()
 	{
 		$importName     = trim( $this->request['importName'] );
 		$importLocation = trim( $this->request['importLocation'] );
@@ -199,10 +192,10 @@ class admin_core_templates_importexport extends ipsCommand
 
 		if( ! $importName )
 		{
-			$importName = isset( $_FILES['FILE_UPLOAD']['name'] ) && $_FILES['FILE_UPLOAD']['name'] ? $_FILES['FILE_UPLOAD']['name'] : $this->request['importLocation'];
+			$importName = !empty( $_FILES['FILE_UPLOAD']['name'] ) ? $_FILES['FILE_UPLOAD']['name'] : $this->request['importLocation'];
 		}
 		
-		$importName = str_ireplace( array( '.xml', '.gz', 'images-' ), '', $importName );
+		$importName = preg_replace( "/[^a-zA-Z0-9_]/", "_", str_ireplace( array( '.xml', '.gz', 'images-' ), '', $importName ) );
 
 		//-----------------------------------------
 		// Attempt to get contents
@@ -235,10 +228,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Import an XMLarchive skin set
 	 *
-	 * @access	private
 	 * @return	string		HTML to show
 	 */
-	private function _importSet()
+	protected function _importSet()
 	{
 		$importName     = trim( $this->request['importName'] );
 		$importUpgrade  = intval( $this->request['importUpgrade'] ) ? TRUE : FALSE;
@@ -308,10 +300,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Export replacements to an XMLArchive
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportReplacements()
+	protected function _exportReplacements()
 	{
 		//-----------------------------------------
 		// INIT
@@ -330,10 +321,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Export an image set to an XMLArchive
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportImages()
+	protected function _exportImages()
 	{
 		//-----------------------------------------
 		// INIT
@@ -361,10 +351,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Export the entire set to an XMLArchive
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportSet()
+	protected function _exportSet()
 	{
 		//-----------------------------------------
 		// INIT
@@ -385,8 +374,6 @@ class admin_core_templates_importexport extends ipsCommand
 					$apps[] = 'core';
 					$apps[] = 'forums';
 					$apps[] = 'members';
-					$apps[] = 'calendar';
-					$apps[] = 'portal';
 				}
 				else if ( $v )
 				{
@@ -414,10 +401,9 @@ class admin_core_templates_importexport extends ipsCommand
 	/**
 	 * Show the main form
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showForm()
+	protected function _showForm()
 	{
 		//-----------------------------------------
 		// INIT
@@ -511,13 +497,12 @@ class admin_core_templates_importexport extends ipsCommand
 	 * I did debate moving it into a function elsewhere
 	 * But it's only used here also, so...
 	 *
-	 * @access	private
 	 * @param	int			Set ID to be 'selected'
 	 * @param	int			Parent id
 	 * @param	int			Iteration
 	 * @return	string		HTML
 	 */
-	private function _fetchSetsDropDown( $skinID=NULL, $parent=0, $iteration=0 )
+	protected function _fetchSetsDropDown( $skinID=NULL, $parent=0, $iteration=0 )
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/modules_admin/templates/index.html b/upload/admin/applications/core/modules_admin/templates/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/templates/index.html
+++ b/upload/admin/applications/core/modules_admin/templates/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/templates/replacements.php b/upload/admin/applications/core/modules_admin/templates/replacements.php
index 6d581328..4a3b45ab 100644
--- a/upload/admin/applications/core/modules_admin/templates/replacements.php
+++ b/upload/admin/applications/core/modules_admin/templates/replacements.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Macros/replacements
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,25 +30,22 @@ class admin_core_templates_replacements extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -75,8 +72,8 @@ class admin_core_templates_replacements extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );
 		
@@ -101,10 +98,9 @@ class admin_core_templates_replacements extends ipsCommand
 	/**
 	 * List available CSS for this skin set
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _listReplacements()
+	protected function _listReplacements()
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/modules_admin/templates/searchandreplace.php b/upload/admin/applications/core/modules_admin/templates/searchandreplace.php
index 572c4c57..897374be 100644
--- a/upload/admin/applications/core/modules_admin/templates/searchandreplace.php
+++ b/upload/admin/applications/core/modules_admin/templates/searchandreplace.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin search and replace tool
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9487 $
  *
  */
 
@@ -30,39 +30,34 @@ class admin_core_templates_searchandreplace extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Recursive depth guide
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_depthGuide = array();
+	protected $_depthGuide = array();
 	
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Amount of items per go
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_bitsPerRound = 50;
+	protected $_bitsPerRound = 50;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -72,9 +67,8 @@ class admin_core_templates_searchandreplace extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -101,9 +95,9 @@ class admin_core_templates_searchandreplace extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinDifferences( $registry );
 		
@@ -132,10 +126,9 @@ class admin_core_templates_searchandreplace extends ipsCommand
 	/**
 	 * Processes the template bits...
 	 *
-	 * @access	private
 	 * @return	string	HTML
 	 */
-	private function _start()
+	protected function _start()
 	{
 		//-----------------------------------------
 		// INIT
@@ -215,16 +208,15 @@ class admin_core_templates_searchandreplace extends ipsCommand
 	/**
 	 * Displays the search form
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showForm()
+	protected function _showForm()
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$this->registry->output->html = $this->html->searchandreplace_form( $this->skinFunctions->getTiersFunction()->fetchAllsItemDropDown(), $this->skinFunctions->fetchNumberTemplateBits(), $this->_bitsPerRound );
+		$this->registry->output->html .= $this->html->searchandreplace_form( $this->skinFunctions->getTiersFunction()->fetchAllsItemDropDown(), $this->skinFunctions->fetchNumberTemplateBits(), $this->_bitsPerRound );
 	}
 
 }
diff --git a/upload/admin/applications/core/modules_admin/templates/skindiff.php b/upload/admin/applications/core/modules_admin/templates/skindiff.php
index 6a4059a3..d0d3a102 100644
--- a/upload/admin/applications/core/modules_admin/templates/skindiff.php
+++ b/upload/admin/applications/core/modules_admin/templates/skindiff.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin diff report tools
- * Last Updated: $Date: 2010-07-22 04:20:07 -0400 (Thu, 22 Jul 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6694 $
+ * @version		$Revision: 9487 $
  *
  */
 
@@ -30,39 +30,34 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Recursive depth guide
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_depthGuide = array();
+	protected $_depthGuide = array();
 	
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Amount of items per go
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_bitsPerRound = 10;
+	protected $_bitsPerRound = 10;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -72,9 +67,8 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -101,9 +95,9 @@ class admin_core_templates_skindiff extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinDifferences.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinDifferences( $registry );
 		
@@ -146,10 +140,9 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * Action a report drop down
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _multiManage()
+	protected function _multiManage()
 	{
 		$merge_id    = $this->request['sessionID'] = intval( $this->request['merge_id'] );
 		$mergeOption = trim( $this->request['mergeOption'] );
@@ -192,10 +185,9 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * Remove a report
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _removeReport()
+	protected function _removeReport()
 	{
 		//-----------------------------------------
 		// Init
@@ -231,10 +223,9 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * Export a report
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportReport()
+	protected function _exportReport()
 	{
 		//-----------------------------------------
 		// Init
@@ -267,10 +258,9 @@ class admin_core_templates_skindiff extends ipsCommand
 	/**
 	 * View a diff report
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _viewReport()
+	protected function _viewReport()
 	{
 		//-----------------------------------------
 		// Init
@@ -302,15 +292,14 @@ class admin_core_templates_skindiff extends ipsCommand
 		$this->registry->output->extra_nav[]	= array( $this->settings['base_url'].'module=templates&amp;section=skindiff&amp;do=overview', $this->lang->words['sk_skindiffreports'] );
 		$this->registry->output->extra_nav[]	= array( $this->settings['base_url'].'module=templates&amp;section=skindiff&amp;do=viewReport&amp;sessionID=' . $session['merge_id'], $this->skinFunctions->fetchReportTitle( $session ) );
 		
-		$this->registry->output->html = $this->html->skindiff_reportOverview( $session, $data['data'], $data['counts']['missing'], $data['counts']['changed'] );
+		$this->registry->output->html .= $this->html->skindiff_reportOverview( $session, $data['data'], $data['counts']['missing'], $data['counts']['changed'] );
 	}
 
 	/**
 	 * Compare skin differences (XML files)
 	 *
 	 * @since	2.1.0.2005-07-22
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _start()
 	{
@@ -356,17 +345,16 @@ class admin_core_templates_skindiff extends ipsCommand
 		
 		$items   = intval( $session['merge_templates_togo'] ) + intval( $session['merge_css_togo'] );
 		
-		$this->registry->output->html = $this->html->skindiff_ajaxScreen( $sessionId, $items, $this->_bitsPerRound );
+		$this->registry->output->html .= $this->html->skindiff_ajaxScreen( $sessionId, $items, $this->_bitsPerRound );
 	}
 	
 	
 	/**
 	 * List all current difference 'sets'
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _list()
+	protected function _list()
 	{
 		//-----------------------------------------
 		// Do it
diff --git a/upload/admin/applications/core/modules_admin/templates/skinsets.php b/upload/admin/applications/core/modules_admin/templates/skinsets.php
index 4fa5367d..4d368e81 100644
--- a/upload/admin/applications/core/modules_admin/templates/skinsets.php
+++ b/upload/admin/applications/core/modules_admin/templates/skinsets.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin set management
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-10-14 09:43:08 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6995 $
+ * @version		$Revision: 9617 $
  *
  */
 
@@ -32,21 +32,21 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Recursive depth guide
 	 *
 	 * @var		array
 	 */
-	private $_depthGuide = array();
+	protected $_depthGuide = array();
 	
 	/**
 	 * Skin object
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
@@ -61,7 +61,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -88,10 +88,11 @@ class admin_core_templates_skinsets extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinGenerator.php' );/*noLibHook*/
 		
-		$this->skinFunctions = new skinCaching( $registry );
+		$this->skinFunctions = new skinGenerator( $registry );
 		
 		///----------------------------------------
 		// What to do...
@@ -156,6 +157,24 @@ class admin_core_templates_skinsets extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'settemplates_manage' );
 				$this->reorder();
 			break;
+			case 'skinGenStepOne':
+				$this->_skinGenStepOne();
+			break;
+			case 'skinGenStepOneComplete':
+				$this->_skinGenStepOneComplete();
+			break;
+			case 'skinGenStepTwoStart':
+				$this->_skinGenStepTwoStart();
+			break;
+			case 'launchVisualEditor':
+				$this->_launchVisualEditor();
+			break;
+			case 'cancelVisualEditor':
+				$this->_cancelVisualEditor();
+			break;
+			case 'convertVisEditToFull':
+				$this->_convertVisEditToFull();
+			break;
 		}
 		
 		/* Output */
@@ -163,10 +182,204 @@ class admin_core_templates_skinsets extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 	
+	/**
+	 * Convert a skin from vissy eddy to full
+	 */
+	protected function _convertVisEditToFull()
+	{
+		$skinSetId = intval( $this->request['set_id'] );
+		
+		/* Set this user session */
+		$this->skinFunctions->convertToFull( $skinSetId );
+		
+		$this->skinFunctions->rebuildSkinSetsCache();
+		
+		$this->registry->output->global_message = $this->lang->words['skin_gen_convert_done'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=overview' );
+	}
+	
+	/**
+	 * Close the visual editor
+	 *
+	 * @return	@e void
+	 */
+	protected function _cancelVisualEditor()
+	{
+		$skinSet = intval( $this->request['set_id'] );
+		
+		/* Set this user session */
+		$this->skinFunctions->deleteUserSession( $this->memberData['member_id'] );
+		
+		/* Onto step two */
+		$this->registry->output->silentRedirect( "{$this->settings['base_url']}{$this->html->form_code}" );
+	}
+	
+	/**
+	 * Launch the visual editor
+	 *
+	 * @return	@e void
+	 */
+	protected function _launchVisualEditor()
+	{
+		$skinSet = intval( $this->request['set_id'] );
+		
+		/* Build the local cache */
+		try
+		{
+			$this->skinFunctions->buildLocalJsonCache();
+		}
+		catch ( Exception $e )
+		{
+			die( $e->getMessage );
+		}
+		
+		/* Set this user session */
+		$this->skinFunctions->setUserSession( $this->memberData['member_id'], array( 'skin_set_id' => $skinSet ) );
+		
+		/* Onto step two */
+		$this->registry->output->silentRedirect( $this->settings['public_url'] );
+	}
+	
+	/**
+	 * Step Two: Start
+	 *
+	 * @return	@e void
+	 */
+	protected function _skinGenStepTwoStart()
+	{
+		$skinSetId = intval( $this->request['set_id'] );
+		
+		$this->_listSets( $this->html->skinGeneratorReady( $skinSetId ) );
+	}
+	
+	/**
+	 * Step One: Save
+	 *
+	 * @return	@e void
+	 */
+	protected function _skinGenStepOneComplete()
+	{
+		$set_name            = $this->request['set_name'];
+		$set_author_name     = $this->request['set_author_name'];
+		$set_author_url      = $this->request['set_author_url'];
+		$skinSet             = array();
+		$set_key			 = IPS_UNIX_TIME_NOW;
+		$messages = $errors  = array();
+		
+		/* Fetch default skin to set some defaults for this skin */
+		$default = $this->skinFunctions->fetchSkinData( $this->skinFunctions->fetchSetIdByKey('default') );
+		
+		/* Check */
+		if ( ! $set_name )
+		{
+			$this->registry->getClass('output')->global_message = $this->lang->words['ss_specifyname'];
+			$this->_start();
+			return;
+		}
+		
+		/* Build save array */
+		$save = array(  'set_name'			=> $set_name,
+					    'set_key'			=> $set_key,
+						'set_parent_id'  	=> 0,
+						'set_permissions'	=> '*',
+						'set_is_default'	=> 0,
+						'set_author_name'	=> $set_author_name,
+						'set_author_url'	=> $set_author_url,
+						'set_image_dir'		=> $default['set_image_dir'],
+						'set_emo_dir'		=> $default['set_emo_dir'],
+						'set_css_inline'	=> 0,
+						'set_output_format' => 'html',
+						'set_hide_from_list'=> 1,
+						'set_minify'		=> $this->settings['use_minify'],
+						'set_master_key'    => 'root',
+						'set_updated'       => IPS_UNIX_TIME_NOW,
+						'set_added'			=> IPS_UNIX_TIME_NOW,
+						'set_by_skin_gen'   => 1,
+						'set_skin_gen_data' => serialize( array() ) );
+		
+		/* Add position */
+		$curPos = $this->skinFunctions->fetchHighestSetPosition();
+		$save['set_order'] = (int)$curPos++;
+			
+		$this->DB->insert( 'skin_collections', $save );
+		$set_id = $this->DB->getInsertId();
+		
+		/* Caches need to be rebuilt first, so that the parent tree is setup. Bug #21008 */
+		$this->skinFunctions->rebuildSkinSetsCache();
+		$messages   = array_merge( $messages, $this->skinFunctions->fetchMessages( TRUE ) );
+		$errors     = array_merge( $errors  , $this->skinFunctions->fetchErrorMessages( TRUE ) );
+		
+		/* Rebuild tree info */
+		$this->skinFunctions->rebuildTreeInformation( $set_id );
+		
+		/* Flush the data */
+		$this->skinFunctions->flushSkinData();
+		
+		/* Rebuild caches */
+		$this->skinFunctions->rebuildCSS( $set_id );
+		$messages   = array_merge( $messages, $this->skinFunctions->fetchMessages( TRUE ) );
+		$errors     = array_merge( $errors  , $this->skinFunctions->fetchErrorMessages( TRUE ) );
+		
+		$this->skinFunctions->rebuildPHPTemplates( $set_id );
+		$messages   = array_merge( $messages, $this->skinFunctions->fetchMessages( TRUE ) );
+		$errors     = array_merge( $errors  , $this->skinFunctions->fetchErrorMessages( TRUE ) );
+		
+		$this->skinFunctions->rebuildReplacementsCache( $set_id );
+		$messages   = array_merge( $messages, $this->skinFunctions->fetchMessages( TRUE ) );
+		$errors     = array_merge( $errors  , $this->skinFunctions->fetchErrorMessages( TRUE ) );
+		
+		/* Build the local cache */
+		try
+		{
+			$this->skinFunctions->buildLocalJsonCache();
+		}
+		catch ( Exception $e )
+		{
+			die( $e->getMessage );
+		}
+		
+		/* Set this user session */
+		$this->skinFunctions->setUserSession( $this->memberData['member_id'], array( 'skin_set_id' => $set_id ) );
+		
+		/* Onto step two */
+		$this->registry->output->silentRedirect( "{$this->settings['base_url']}{$this->html->form_code}&do=skinGenStepTwoStart&amp;set_id=" . $set_id );
+	}
+	
+	/**
+	 * Start. No really.
+	 *
+	 * @return	@e void		[Outputs to screen/redirects]
+	 */
+	protected function _skinGenStepOne()
+	{
+		/* Basic checks and tests */
+		$warnings = $this->skinFunctions->healthCheck();
+		$errors   = array();
+		$form     = array();
+		
+		if ( $warnings !== true )
+		{
+			$errors = $warnings;
+		}
+		
+		/* Perform license check */
+		if ( IPSLib::hasActiveLicense() !== true )
+		{
+			$errors[] = "License key out of date";
+		}
+		
+		/* Form */
+		$form['set_name']          = $this->registry->getClass('output')->formInput( 'set_name'         , $_POST['set_name'] );
+		$form['set_author_name']   = $this->registry->getClass('output')->formInput( 'set_author_name'  , $_POST['set_author_name'] );
+		$form['set_author_url']    = $this->registry->getClass('output')->formInput( 'set_author_url'   , $_POST['set_author_url'] );		
+
+		$this->registry->output->html .= $this->html->skinGenerator( $form, $errors );
+	}
+	
 	/**
 	 * AJAX Action: Reorder Skin Sets
 	 */
-	private function reorder()
+	protected function reorder()
 	{			
 		//-----------------------------------------
 		// INIT
@@ -213,7 +426,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _toggleHidden()
+	protected function _toggleHidden()
 	{
 		/* INIT */
 		$set_id  = intval( $this->request['set_id'] );
@@ -233,17 +446,12 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _makeDefault()
+	protected function _makeDefault()
 	{
 		/* INIT */
 		$set_id  = intval( $this->request['set_id'] );
-		$skinSet = $this->skinFunctions->fetchSkinData( $set_id );
 		
-		/* Make none default.. */
-		$this->DB->update( 'skin_collections', array( 'set_is_default' => 0 ), 'set_output_format=\'' . $skinSet['set_output_format'] . '\'' );
-		
-		/* Make this one default.. */
-		$this->DB->update( 'skin_collections', array( 'set_is_default' => 1 ), 'set_id=' . $set_id );
+		$this->skinFunctions->makeDefault( $set_id );
 		
 		$this->skinFunctions->rebuildSkinSetsCache();
 		
@@ -256,7 +464,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _setRevert()
+	protected function _setRevert()
 	{
 		$set_id       = intval( $this->request['setID'] );
 		$authKey      = $this->request['authKey'];
@@ -283,7 +491,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _revertSplash()
+	protected function _revertSplash()
 	{
 		/* INIT */
 		$setId   = intval( $this->request['setID'] );
@@ -301,7 +509,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _setWriteMasterCss()
+	protected function _setWriteMasterCss()
 	{
 		$set_id = intval( $this->request['set_id'] );
 
@@ -329,7 +537,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _setWriteMaster()
+	protected function _setWriteMaster()
 	{
 		$set_id = intval( $this->request['set_id'] );
 		
@@ -357,11 +565,10 @@ class admin_core_templates_skinsets extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _setRemove()
+	protected function _setRemove()
 	{
 		$set_id  = intval( $this->request['set_id'] );
 		$authKey = $this->request['authKey'];
-		$setData = $this->skinFunctions->fetchSkinData( $set_id );
 		
 		/* Auth check */
 		if ( $authKey != $this->member->form_hash )
@@ -386,9 +593,9 @@ class admin_core_templates_skinsets extends ipsCommand
 	/**
 	 * Remove splash
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _setRemoveSplash()
+	protected function _setRemoveSplash()
 	{
 		$set_id  = intval( $this->request['set_id'] );
 		$setData = $this->skinFunctions->fetchSkinData( $set_id );
@@ -406,9 +613,9 @@ class admin_core_templates_skinsets extends ipsCommand
 	 * Form: Save
 	 *
 	 * @param	string 		Type of form to show (add/edit)
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _setSave( $type='' )
+	protected function _setSave( $type='' )
 	{
 		$set_id              = intval( $this->request['set_id'] );
 		$set_name            = $this->request['set_name'];
@@ -421,10 +628,8 @@ class admin_core_templates_skinsets extends ipsCommand
 		$set_author_url      = $this->request['set_author_url'];
 		$set_image_dir       = $this->request['set_image_dir'];
 		$set_emo_dir         = $this->request['set_emo_dir'];
-		$set_css_inline      = intval( $this->request['set_css_inline'] );
 		$set_output_format   = IPSText::alphanumericalClean( $this->request['set_output_format'] );
 		$set_hide_from_list  = intval( $this->request['set_hide_from_list'] );
-		$set_minify			 = intval( $this->request['set_minify'] );
 		$skinSet             = array();
 	
 		//-----------------------------------------
@@ -519,7 +724,7 @@ class admin_core_templates_skinsets extends ipsCommand
 				return;
 			}
 		}
-			
+		
 		//-----------------------------------------
 		// Build Save Array
 		//-----------------------------------------
@@ -533,10 +738,10 @@ class admin_core_templates_skinsets extends ipsCommand
 						'set_author_url'	=> $set_author_url,
 						'set_image_dir'		=> $set_image_dir,
 						'set_emo_dir'		=> $set_emo_dir,
-						'set_css_inline'	=> $set_css_inline,
+						'set_css_inline'	=> 1,
 						'set_output_format' => $set_output_format,
 						'set_hide_from_list'=> ( $set_is_default ) ? 0 : $set_hide_from_list,
-						'set_minify'		=> $set_minify,
+						'set_minify'		=> $this->settings['use_minify'],
 						'set_master_key'    => ( isset( $skinSet['set_master_key'] ) ) ? $skinSet['set_master_key'] : ( ( $set_output_format == 'xml' ) ? 'xmlskin' : 'root' ),
 						'set_updated'       => time() );
 		
@@ -564,7 +769,7 @@ class admin_core_templates_skinsets extends ipsCommand
 		
 		if ( $set_is_default )
 		{
-			$this->DB->update( 'skin_collections', array( 'set_is_default' => 0 ), 'set_id != ' . $set_id . ' AND set_output_format=\'' . $set_output_format . '\'' );
+			$this->skinFunctions->makeDefault( $set_id );
 		}
 		
 		$messages = array();
@@ -611,7 +816,7 @@ class admin_core_templates_skinsets extends ipsCommand
 		// Done...
 		//-----------------------------------------
 		
-		$this->registry->getClass('output')->global_message = $this->lang->words['ss_skinsetsaved'] . '<br />' . implode( '<br />', $messages ) . '<br />' . implode( '<br />', $errors );
+		$this->registry->output->setMessage( $this->lang->words['ss_skinsetsaved'] . '<br />' . implode( '<br />', $messages ) . '<br />' . implode( '<br />', $errors ), true );
 		
 		$this->_listSets();
 	}
@@ -620,9 +825,9 @@ class admin_core_templates_skinsets extends ipsCommand
 	 * Form
 	 *
 	 * @param	string 		Type of form to show (add/edit)
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _setForm( $type='' )
+	protected function _setForm( $type='' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -688,19 +893,6 @@ class admin_core_templates_skinsets extends ipsCommand
 			$emoDirs[] = array( $_dir, $_dir );
 		}
  		
-		//-----------------------------------------
-		// Can we write into the images directory?
-		//-----------------------------------------
-		
-		if ( is_writeable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css' ) )
-		{
-			$form['set_css_inline'] = $this->registry->getClass('output')->formYesNo('set_css_inline', $skinSet['set_css_inline']);
-		}
-		else
-		{
-			$form['set_css_inline'] = $this->lang->words['ss_unavailable'];
-		}
-		
 		//-----------------------------------------
 		// Check (please?)
 		//-----------------------------------------
@@ -732,8 +924,7 @@ class admin_core_templates_skinsets extends ipsCommand
 		$form['set_emo_dir']       = $this->registry->getClass('output')->formDropdown( 'set_emo_dir'      , $emoDirs, ( $_POST['set_emo_dir'] ) ? $_POST['set_emo_dir'] : $skinSet['set_emo_dir'] );
 		$form['set_output_format'] = $this->registry->getClass('output')->formDropdown( 'set_output_format', $outputFormats, ( $_POST['set_output_format'] ) ? $_POST['set_output_format'] : $skinSet['set_output_format'] );
 		$form['set_hide_from_list']= $this->registry->getClass('output')->formYesNo(   'set_hide_from_list', ( $_POST['set_hide_from_list'] ) ? $_POST['set_hide_from_list'] : $skinSet['set_hide_from_list'] );
-		$form['set_minify']        = $this->registry->getClass('output')->formYesNo(   'set_minify'        , ( $_POST['set_minify'] ) ? $_POST['set_minify'] : $skinSet['set_minify'] );
-		
+				
 		//-----------------------------------------
 		// Get group permissions
 		//-----------------------------------------
@@ -761,19 +952,20 @@ class admin_core_templates_skinsets extends ipsCommand
 	/**
 	 * List template sets
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _listSets()
+	protected function _listSets( $html='' )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$root_id   = 'root';
-		$sets      = array();
-		$cacheData = array();
-		$hasData   = array();
-		$canMerge  = $this->skinFunctions->canUseMergeSystem();
+		$root_id   		 = 'root';
+		$sets      		 = array();
+		$cacheData 		 = array();
+		$hasData   		 = array();
+		$canMerge  		 = $this->skinFunctions->canUseMergeSystem();
+		$skinGenSessions = array();
 		
 		//-----------------------------------------
 		// See if we have any cached data
@@ -821,6 +1013,17 @@ class admin_core_templates_skinsets extends ipsCommand
 			}
 		}
 		
+		/* Fetch skin gen sessions */
+		$this->DB->build( array( 'select' => '*',
+								 'from'   => 'skin_generator_sessions') );
+								 
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$skinGenSessions[ $row['sg_skin_set_id'] ] = $row;
+		}
+		
 		//-----------------------------------------
 		// Recurse through and gather data
 		//-----------------------------------------
@@ -850,7 +1053,7 @@ class admin_core_templates_skinsets extends ipsCommand
 		// Print it...
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->skinsets_listSkinSets( $sets, $cacheData, $hasData, $canMerge );
+		$this->registry->output->html .= $this->html->skinsets_listSkinSets( $sets, $cacheData, $hasData, $canMerge, $skinGenSessions, $html );
 	}
 	
 	/**
@@ -861,7 +1064,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 * @param	int			Depth gauge count
 	 * @return	array 		Array of skin set entries
 	 */
-	private function _listSetsRecurse($id, $sets, $depth=0)
+	protected function _listSetsRecurse($id, $sets, $depth=0)
 	{
 		if ( is_array( $this->skinFunctions->recursiveTiers->getData( $id ) ) and count( $this->skinFunctions->recursiveTiers->getData( $id ) ) )
 		{
@@ -884,7 +1087,7 @@ class admin_core_templates_skinsets extends ipsCommand
 	 * @param	int			Depth gauge count
 	 * @return	array 		Modified skin set entry
 	 */
-	private function _listSetsFormatData( $set_data, $depth=0 )
+	protected function _listSetsFormatData( $set_data, $depth=0 )
 	{ 
 		//-----------------------------------------
 		// Get last modified date
@@ -898,8 +1101,7 @@ class admin_core_templates_skinsets extends ipsCommand
 
 		$set_data['_canRemove']   = ( ! $set_data['set_is_default'] AND ( ! in_array( $set_data['set_key'], $this->skinFunctions->remapData['masterKeys'] ) ) ) ? 1 : 0;
 		
-		$set_data['_setImg']   = ( $set_data['set_parent_id'] > 0 ) ? 'package.png' : 'folder_palette.png';
-		$set_data['_cssClass'] = ( $set_data['set_parent_id'] > 0 ) ? 'tablerow2' : 'tablerow1';
+		$set_data['_setImg']   = ( $set_data['set_by_skin_gen'] ) ? 'palette.png' : ( ( $set_data['set_parent_id'] > 0 ) ? 'package.png' : 'folder_palette.png' );
 		
 		$set_data['_canWriteMaster']    = ( isset( $this->skinFunctions->remapData['templates'][ $set_data['set_id'] ] ) );
 		$set_data['_canWriteMasterCss'] = ( isset( $this->skinFunctions->remapData['css'][ $set_data['set_id'] ] ) );
diff --git a/upload/admin/applications/core/modules_admin/templates/templates.php b/upload/admin/applications/core/modules_admin/templates/templates.php
index 1f42a9e9..cc46316c 100644
--- a/upload/admin/applications/core/modules_admin/templates/templates.php
+++ b/upload/admin/applications/core/modules_admin/templates/templates.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template editing
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-06-30 07:54:38 -0400 (Thu, 30 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9128 $
  *
  */
 
@@ -30,31 +30,27 @@ class admin_core_templates_templates extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Recursive depth guide
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_depthGuide = array();
+	protected $_depthGuide = array();
 	
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -64,9 +60,8 @@ class admin_core_templates_templates extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -93,8 +88,8 @@ class admin_core_templates_templates extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );
 		
@@ -119,10 +114,9 @@ class admin_core_templates_templates extends ipsCommand
 	/**
 	 * List template sets
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _listTemplateGroups()
+	protected function _listTemplateGroups()
 	{
 		//-----------------------------------------
 		// INIT
@@ -139,6 +133,12 @@ class admin_core_templates_templates extends ipsCommand
 	
 		$setData = $this->skinFunctions->fetchSkinData( $setID );
 		
+		/* is this a vised skin? */
+		if ( $setData['set_by_skin_gen'] )
+		{
+			$this->registry->output->silentRedirect( $this->settings['base_url'] . '&amp;app=core&amp;module=templates&amp;section=skinsets&amp;do=setEdit&amp;set_id=' . $setID );
+		}
+		
 		//-----------------------------------------
 		// Fetch Template Groups
 		//-----------------------------------------
diff --git a/upload/admin/applications/core/modules_admin/templates/tools.php b/upload/admin/applications/core/modules_admin/templates/tools.php
index 5b43823e..8458ee1c 100644
--- a/upload/admin/applications/core/modules_admin/templates/tools.php
+++ b/upload/admin/applications/core/modules_admin/templates/tools.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin tools
- * Last Updated: $Date: 2010-10-11 20:21:22 -0400 (Mon, 11 Oct 2010) $
+ * Last Updated: $Date: 2011-05-27 15:29:26 -0400 (Fri, 27 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6962 $
+ * @version		$Revision: 8913 $
  *
  */
 
@@ -32,14 +32,14 @@ class admin_core_templates_tools extends ipsCommand
 	 *
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Skin object
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
@@ -80,9 +80,9 @@ class admin_core_templates_tools extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinImportExport( $registry );
 		
@@ -159,7 +159,7 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Cleans out CSS DB
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _toolCacheClean()
 	{
@@ -186,7 +186,7 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Cleans out CSS DB
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _cssDbClean()
 	{
@@ -198,7 +198,7 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Cleans out template DB
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _templateDbClean()
 	{
@@ -210,16 +210,16 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Creates the master skin
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _createMasterSkin()
 	{
 		/* No dir? create */
 		if ( ! is_dir( IPS_CACHE_PATH . 'cache/skin_cache/master_skin' ) )
 		{
-			if ( @mkdir( IPS_CACHE_PATH . 'cache/skin_cache/master_skin', 0777 ) )
+			if ( @mkdir( IPS_CACHE_PATH . 'cache/skin_cache/master_skin', IPS_FOLDER_PERMISSION ) )
 			{
-				@chmod( IPS_CACHE_PATH . 'cache/skin_cache/master_skin', 0777 );
+				@chmod( IPS_CACHE_PATH . 'cache/skin_cache/master_skin', IPS_FOLDER_PERMISSION );
 			}
 			else
 			{
@@ -236,9 +236,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Rebuild everything for a release
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rebuildForRelease()
+	protected function _rebuildForRelease()
 	{
 		//-----------------------------------------
 		// INIT
@@ -254,7 +254,7 @@ class admin_core_templates_tools extends ipsCommand
 		// Can do .. stuff?
 		//-----------------------------------------
 		
-		if ( ! is_writable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins' ) )
+		if ( ! is_writable( IPS_ROOT_PATH . 'setup/xml/skins' ) )
 		{
 			$this->registry->output->global_error = $this->lang->words['to_writetoprs'];
 			return $this->_splash();
@@ -323,17 +323,17 @@ class admin_core_templates_tools extends ipsCommand
 			/* Build and write XML files for replacements and CSS */
 			$replacementsXML = $this->skinFunctions->generateReplacementsXML( $id, FALSE );
 			
-			@unlink( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml', $replacementsXML );
+			@unlink( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml', $replacementsXML );
 			
 			if ( $replacementsXML )
 			{
-				if ( ! @file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml', $replacementsXML ) )
+				if ( ! @file_put_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml', $replacementsXML ) )
 				{
-					$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml';
+					$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml';
 				}
 				else
 				{
-					$messages[] = "{$this->lang->words['to_wrote']} " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml';
+					$messages[] = "{$this->lang->words['to_wrote']} " . IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml';
 				}
 			}
 			
@@ -360,15 +360,15 @@ class admin_core_templates_tools extends ipsCommand
 		/* Generate skin sets XML */
 		$skinSetXML = $this->skinFunctions->generateMasterSkinSetXML( $skinIDs );
 		
-		@unlink( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/setsData.xml' );
+		@unlink( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
 		
-		if ( ! @file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/setsData.xml', $skinSetXML ) )
+		if ( ! @file_put_contents( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml', $skinSetXML ) )
 		{
-			$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/setsData.xml';
+			$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml';
 		}
 		else
 		{
-			$messages[] = "{$this->lang->words['to_wrote']} " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/setsData.xml';
+			$messages[] = "{$this->lang->words['to_wrote']} " . IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml';
 		}
 		
 		$messages[] = $this->lang->words['to_alldone'];
@@ -386,7 +386,7 @@ class admin_core_templates_tools extends ipsCommand
 	 * @param	int			[Set ID to import, default is all]
 	 * @return	string		HTML
 	 */
-	private function _inDevMasterCSS( $setId=false )
+	protected function _inDevMasterCSS( $setId=false )
 	{
 		/* This is which skins we want to export for default installations */
 		$skinIDs  = array_keys( $this->skinFunctions->remapData['css'] );
@@ -422,7 +422,7 @@ class admin_core_templates_tools extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _inDevMasterReplacements()
+	protected function _inDevMasterReplacements()
 	{
 		$skinIDs  = array_keys( $this->skinFunctions->remapData['templates'] );
 		$messages = array();
@@ -450,9 +450,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Imports all APP templates
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _importAPPTemplates()
+	protected function _importAPPTemplates()
 	{
 		//-----------------------------------------
 		// Easy one this...
@@ -470,9 +470,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Exports all APP templates
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportAPPTemplates()
+	protected function _exportAPPTemplates()
 	{
 		//-----------------------------------------
 		// Easy one this...
@@ -490,9 +490,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Exports all APP templates
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportAPPCSS()
+	protected function _exportAPPCSS()
 	{
 		//-----------------------------------------
 		// Easy one this...
@@ -510,9 +510,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Exports Replacements to XML
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _exportReplacements()
+	protected function _exportReplacements()
 	{
 		//-----------------------------------------
 		// INIT
@@ -542,15 +542,15 @@ class admin_core_templates_tools extends ipsCommand
 			/* Build and write XML files for replacements and CSS */
 			$replacementsXML = $this->skinFunctions->generateReplacementsXML( $id, FALSE );
 			
-			@unlink( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml', $replacementsXML );
+			@unlink( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml', $replacementsXML );
 			
-			if ( ! @file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml', $replacementsXML ) )
+			if ( ! @file_put_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml', $replacementsXML ) )
 			{
-				$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml';
+				$errors[] = "{$this->lang->words['to_couldnotwrite']}: " . IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml';
 			}
 			else
 			{
-				$messages[] = "{$this->lang->words['to_wrote']} " . DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins/replacements_' . $key . '.xml';
+				$messages[] = "{$this->lang->words['to_wrote']} " . IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $key . '.xml';
 			}
 			
 			/* Got any errors? */
@@ -573,9 +573,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Rebuild PHP Templates Cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rebuildMasterSkin()
+	protected function _rebuildMasterSkin()
 	{
 		$messages = array();
 		$errors   = array();
@@ -620,7 +620,7 @@ class admin_core_templates_tools extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _resetSkin()
+	protected function _resetSkin()
 	{
 		//-----------------------------------------
 		// INIT
@@ -662,7 +662,7 @@ class admin_core_templates_tools extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _rebuildMaster()
+	protected function _rebuildMaster()
 	{
 		//-----------------------------------------
 		// INIT
@@ -733,9 +733,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Rebuild PHP Templates Cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _recache()
+	protected function _recache()
 	{
 		//-----------------------------------------
 		// INIT
@@ -754,6 +754,8 @@ class admin_core_templates_tools extends ipsCommand
 		
 		if( $setID == -1 )
 		{
+			$this->registry->output->global_message = $this->lang->words['to_recache_done'];
+
 			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=overview', TRUE );
 		}
 		
@@ -819,24 +821,24 @@ class admin_core_templates_tools extends ipsCommand
 				}
 				
 				/* More to go.. */
-				$this->registry->output->redirect( $this->settings['base_url'] . 'app=core&module=templates&section=tools&do=toolsRecache&type=all&setID=' . $nextID, $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'], 2, TRUE );
+				$this->registry->output->html	.= $this->registry->output->global_template->temporaryRedirect( $this->settings['base_url'] . 'app=core&module=templates&section=tools&do=toolsRecache&type=all&setID=' . $nextID, $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'] );
+				return;
 			}
 			else
 			{
-				/* All done */
-				$this->registry->output->global_message = $this->lang->words['to_recache_done'];
-				
 				if ( count( $errors ) )
 				{
 					$this->registry->output->global_error = implode( '<br />', $errors );
 				}
-				$this->registry->output->redirect( $this->settings['base_url'] . 'app=core&module=templates&section=tools&do=toolsRecache&type=all&setID=-1', $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'], 2, TRUE );
+				
+				$this->registry->output->html	.= $this->registry->output->global_template->temporaryRedirect( $this->settings['base_url'] . 'app=core&module=templates&section=tools&do=toolsRecache&type=all&setID=-1', $this->lang->words['to_recachedset'] . $this->registry->output->allSkins[ $setID ]['set_name'] );
+				return;
 			}
 		}
 		else
 		{
 			/* All done */
-			$this->registry->output->global_message = $this->lang->words['to_recache_done']  . '<br />' . implode( '<br />', $messages );
+			$this->registry->output->setMessage( $this->lang->words['to_recache_done']  . '<br />' . implode( '<br />', $messages ), true );
 			
 			if ( count( $errors ) )
 			{
@@ -850,9 +852,9 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Rebuild PHP Templates Cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rebuildPHPTemplates()
+	protected function _rebuildPHPTemplates()
 	{
 		//-----------------------------------------
 		// INIT
@@ -882,7 +884,7 @@ class admin_core_templates_tools extends ipsCommand
 	/**
 	 * Shows a list of available tools
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function _splash()
 	{
diff --git a/upload/admin/applications/core/modules_admin/templates/urlmap.php b/upload/admin/applications/core/modules_admin/templates/urlmap.php
index fac786dd..3bfd8a28 100644
--- a/upload/admin/applications/core/modules_admin/templates/urlmap.php
+++ b/upload/admin/applications/core/modules_admin/templates/urlmap.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin URL mapping
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.3.x
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,23 +30,20 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Skin Functions Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -56,9 +53,8 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -85,8 +81,8 @@ class admin_core_templates_urlmap extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		
 		$this->skinFunctions = new skinCaching( $registry );
 		
@@ -131,10 +127,9 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Remove a remap
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _remapRemove()
+	protected function _remapRemove()
 	{
 		//--------------------------------------------
 		// INIT
@@ -166,11 +161,10 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Save the form
 	 *
-	 * @access	private
 	 * @param	string		Type of form
 	 * @return	string		HTML
 	 */
-	private function _remapSave( $type='add' )
+	protected function _remapSave( $type='add' )
 	{
 		//--------------------------------------------
 		// INIT
@@ -247,11 +241,10 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Remap form
 	 *
-	 * @access	private
 	 * @param	string	Type of form
 	 * @return	string	HTML
 	 */
-	private function _remapForm( $type='add' )
+	protected function _remapForm( $type='add' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -304,9 +297,9 @@ class admin_core_templates_urlmap extends ipsCommand
 		// Form elements
 		//-----------------------------------------
 		
-		$form['map_title']       = $this->registry->getClass('output')->formInput(    'map_title'           , IPSText::htmlspecialchars( ( isset($_POST['map_title']) AND $_POST['map_title'] ) ? $_POST['map_title'] : $remap['map_title'] ) );
-		$form['map_match_type']  = $this->registry->getClass('output')->formDropdown( 'map_match_type'      , $map_match_type, ( isset($_POST['map_match_type']) AND $_POST['map_match_type'] ) ? $_POST['map_match_type'] : $remap['map_match_type'] );
-		$form['map_url']         = $this->registry->getClass('output')->formInput(    'map_url'             , IPSText::htmlspecialchars( ( isset($_POST['map_url']) AND $_POST['map_url'] ) ? $_POST['map_url'] : $remap['map_url'] ) );
+		$form['map_title']       = $this->registry->getClass('output')->formInput(    'map_title'           , IPSText::htmlspecialchars( !empty($_POST['map_title']) ? $_POST['map_title'] : $remap['map_title'] ) );
+		$form['map_match_type']  = $this->registry->getClass('output')->formDropdown( 'map_match_type'      , $map_match_type, !empty($_POST['map_match_type']) ? $_POST['map_match_type'] : $remap['map_match_type'] );
+		$form['map_url']         = $this->registry->getClass('output')->formInput(    'map_url'             , IPSText::htmlspecialchars( !empty($_POST['map_url']) ? $_POST['map_url'] : $remap['map_url'] ) );
 		
 		//-----------------------------------------
 		// Navvy Gation
@@ -325,10 +318,9 @@ class admin_core_templates_urlmap extends ipsCommand
 	/**
 	 * Show URL maps for this skin set
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showURLMappingList()
+	protected function _showURLMappingList()
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/modules_admin/templates/useragents.php b/upload/admin/applications/core/modules_admin/templates/useragents.php
index 18b3fa62..758ceddf 100644
--- a/upload/admin/applications/core/modules_admin/templates/useragents.php
+++ b/upload/admin/applications/core/modules_admin/templates/useragents.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Gallery Application
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-07-28 05:42:41 -0400 (Thu, 28 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6995 $
+ * @version		$Revision: 9328 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,21 +30,21 @@ class admin_core_templates_useragents extends ipsCommand
 	 *
 	 * @var		object
 	 */
-	private $skinFunctions;
+	protected $skinFunctions;
 	
 	/**
 	 * User agent functions
 	 *
 	 * @var		object			UA functions
 	 */
-	private $userAgentFunctions;
+	protected $userAgentFunctions;
 	
 	/**
 	 * Skin object
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
@@ -59,7 +59,7 @@ class admin_core_templates_useragents extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -86,8 +86,8 @@ class admin_core_templates_useragents extends ipsCommand
 		// Load functions and cache classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 		$this->skinFunctions = new skinCaching( $registry );
 		
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php', 'userAgentFunctions' );
@@ -120,7 +120,7 @@ class admin_core_templates_useragents extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _saveAgents()
+	protected function _saveAgents()
 	{
 		//-----------------------------------------
 		// INIT
@@ -203,9 +203,9 @@ class admin_core_templates_useragents extends ipsCommand
 	/**
 	 * Show useragents for this skin set
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _showUserAgentMapping()
+	protected function _showUserAgentMapping()
 	{
 		//-----------------------------------------
 		// INIT
@@ -247,4 +247,4 @@ class admin_core_templates_useragents extends ipsCommand
 		
 		$this->registry->output->html .= $this->html->useragents_showUserAgents( $userAgents, $userAgentGroups, $setData );
 	}
-}
\ No newline at end of file
+}
diff --git a/upload/admin/applications/core/modules_admin/templates/xml/index.html b/upload/admin/applications/core/modules_admin/templates/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/templates/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/templates/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/templates/xml/menu.xml b/upload/admin/applications/core/modules_admin/templates/xml/menu.xml
index 45b5181f..c987cef1 100644
--- a/upload/admin/applications/core/modules_admin/templates/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/templates/xml/menu.xml
@@ -6,8 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление �тил�ми</subitemtitle>
+					<subitemlang>skins_manage</subitemlang>
 					<subsection>skinsets</subsection>
 					<subitemurl>do=overview</subitemurl>
+					<subitemrolekey>settemplates_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -17,32 +19,75 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Ин�трументы �тилей</subitemtitle>
+					<subitemlang>skins_tools</subitemlang>
 					<subsection>tools</subsection>
 					<subitemurl>do=splash</subitemurl>
+					<subitemrolekey>template_tools</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+				</subitems>
+		</item>
+		<item>
+			<title>Сравнение �тилей</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Сравнение</subitemtitle>
+					<subitemlang>skins_merge</subitemlang>
 					<subsection>skindiff</subsection>
 					<subitemurl>do=overview</subitemurl>
+					<subitemrolekey>skindiff_reports</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+				</subitems>
+		</item>
+		<item>
+			<title>Пои�к и замена</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Пои�к и замена</subitemtitle>
+					<subitemlang>skins_sar</subitemlang>
 					<subsection>searchandreplace</subsection>
 					<subitemurl>do=showform</subitemurl>
+					<subitemrolekey>templates_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+				</subitems>
+		</item>
+		<item>
+			<title>Смена логотипа</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Смена логотипа</subitemtitle>
+					<subitemlang>skins_logo</subitemlang>
 					<subsection>easylogo</subsection>
 					<subitemurl></subitemurl>
+					<subitemrolekey>easy_logo</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+				</subitems>
+		</item>
+		<item>
+			<title>Импорт / Эк�порт</title>
+			<subitems>
 				<subitem>
 					<subitemtitle>Импорт / Эк�порт</subitemtitle>
+					<subitemlang>skins_ie</subitemlang>
 					<subsection>importexport</subsection>
 					<subitemurl>do=overview</subitemurl>
+					<subitemrolekey>settemplates_export</subitemrolekey>
+					<subisredirect>0</subisredirect>
+				</subitem>
+			</subitems>
+		</item>
+		<item>
+			<title>Внешнее редактирование</title>
+			<subitems>
+				<subitem>
+					<subitemtitle>Внешнее редактирование</subitemtitle>
+					<subitemlang>skins_external</subitemlang>
+					<subsection>external</subsection>
+					<subitemurl>do=overview</subitemurl>
+					<subitemrolekey>settemplates_external</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/templates/xml/permissions.xml b/upload/admin/applications/core/modules_admin/templates/xml/permissions.xml
index b756f2d5..ce4d0acf 100644
--- a/upload/admin/applications/core/modules_admin/templates/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/templates/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление �тил�ми</grouptitle>
+		<grouplang>core_templates</grouplang>
 		<items>
 			<item>
 				<key>css_manage</key>
@@ -63,6 +64,10 @@
 				<key>easy_logo</key>
 				<string>Может во�пользовать�� ин�трументом �мены логотипа?</string>
 			</item>
+			<item>
+				<key>settemplates_external</key>
+				<string>Может редактировать �тиль?</string>
+			</item>
 		</items>
 	</group>
 </permissions>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/api.php b/upload/admin/applications/core/modules_admin/tools/api.php
index 3f09bfdf..02d25402 100644
--- a/upload/admin/applications/core/modules_admin/tools/api.php
+++ b/upload/admin/applications/core/modules_admin/tools/api.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * API Users
- * Last Updated: $Date: 2010-10-11 20:21:22 -0400 (Mon, 11 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6962 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,33 +30,29 @@ class admin_core_tools_api extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -127,12 +123,11 @@ class admin_core_tools_api extends ipsCommand
 	 * API Logs View
 	 * View API Log
 	 *
-	 * @access	private
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function logViewDetail()
+	public function logViewDetail()
 	{
 		//-----------------------------------------
 		// Fix up navigation bar
@@ -189,12 +184,11 @@ class admin_core_tools_api extends ipsCommand
 	 * API Logs List
 	 * List API Logs
 	 *
-	 * @access	private
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function logList()
+	public function logList()
 	{
 		//-----------------------------------------
 		// Fix up navigation bar
@@ -226,7 +220,7 @@ class admin_core_tools_api extends ipsCommand
 		$links = $this->registry->output->generatePagination( array( 'totalItems'			=> intval( $count['count'] ),
 																	 'itemsPerPage'			=> $perpage,
 																	 'currentStartValue'	=> $start,
-																	 'baseUrl'				=> $this->settings['base_url'].'&'.$this->form_code ) );
+																	 'baseUrl'				=> $this->settings['base_url'] . $this->form_code . '&amp;do=log_list' ) );
 									  
 		//-----------------------------------------
 		// Get from DB
@@ -255,12 +249,11 @@ class admin_core_tools_api extends ipsCommand
 	 * API User Remove
 	 * Removes an API User
 	 *
-	 * @access	private
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function apiRemove()
+	public function apiRemove()
 	{
 		$api_user_id   = $this->request['api_user_id'] ? intval($this->request['api_user_id']) : 0;
 		
@@ -292,13 +285,12 @@ class admin_core_tools_api extends ipsCommand
 	 * API Save
 	 * Save API user
 	 *
-	 * @access	private
 	 * @param	string		Type
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function apiSave( $type='add' )
+	public function apiSave( $type='add' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -406,20 +398,19 @@ class admin_core_tools_api extends ipsCommand
 			$this->DB->update( 'api_users', $save, 'api_user_id=' . $api_user_id );
 		}
 		
-		$this->apiList();
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	/**
 	 * API Form
 	 * Shows the add/edit form
 	 *
-	 * @access	private
 	 * @param	string		Type
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function apiForm( $type='add' )
+	public function apiForm( $type='add' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -465,8 +456,8 @@ class admin_core_tools_api extends ipsCommand
 		// Form
 		//-----------------------------------------
 		
-		$form['api_user_name'] = $this->registry->output->formInput( 'api_user_name', ( isset($_POST['api_user_name']) AND $_POST['api_user_name'] ) ? stripslashes($_POST['api_user_name']) : $api_user['api_user_name'] );
-		$form['api_user_ip']   = $this->registry->output->formInput( 'api_user_ip', ( isset($_POST['api_user_ip']) AND $_POST['api_user_ip'] ) ? stripslashes($_POST['api_user_ip']) : $api_user['api_user_ip'] );
+		$form['api_user_name'] = $this->registry->output->formInput( 'api_user_name', !empty($_POST['api_user_name']) ? stripslashes($_POST['api_user_name']) : $api_user['api_user_name'] );
+		$form['api_user_ip']   = $this->registry->output->formInput( 'api_user_ip', !empty($_POST['api_user_ip']) ? stripslashes($_POST['api_user_ip']) : $api_user['api_user_ip'] );
 		
 		//-----------------------------------------
 		// Get all modules and stuff and other things
@@ -482,12 +473,12 @@ class admin_core_tools_api extends ipsCommand
 			{
 				if ( is_dir( $path . '/' . $file ) )
 				{
-					if ( file_exists( $path . '/' . $file . '/config.php' ) )
+					if ( is_file( $path . '/' . $file . '/config.php' ) )
 					{
 						$CONFIG = array();
 						$_name  = $file;
 				
-						require_once( $path . "/" . $file . '/config.php' );
+						require_once( $path . "/" . $file . '/config.php' );/*noLibHook*/
 									
 						if ( $CONFIG['api_module_title'] )
 						{
@@ -501,10 +492,10 @@ class admin_core_tools_api extends ipsCommand
 							// Get all available methods
 							//-----------------------------------------
 							
-							if ( file_exists( $path . '/' . $file . '/methods.php' ) )
+							if ( is_file( $path . '/' . $file . '/methods.php' ) )
 							{
 								$ALLOWED_METHODS = array();
-								require_once( $path . '/' . $file . '/methods.php' );
+								require_once( $path . '/' . $file . '/methods.php' );/*noLibHook*/
 								
 								$permissions[ $_name ]['perms'] = array_keys( $ALLOWED_METHODS );
 							}
@@ -551,12 +542,11 @@ class admin_core_tools_api extends ipsCommand
 	 * API LIST
 	 * List all currently stored API users
 	 *
-	 * @access	private
-	 * @return	void		[Outputs]
+	 * @return	@e void		[Outputs]
 	 * @author 	Matt Mecham
 	 * @since  	2.3.2
 	 */
-	private function apiList()
+	public function apiList()
 	{
 		//-----------------------------------------
 		// INIT
@@ -576,19 +566,10 @@ class admin_core_tools_api extends ipsCommand
 			$users[] = $row;
 		}
 		
-		//-----------------------------------------
-		// XML RPC Enabled?
-		//-----------------------------------------
-		
-		if ( ! $this->settings['xmlrpc_enable'] )
-		{
-			$this->registry->output->html .= $this->registry->output->global_template->warning_box( $this->lang->words['a_disabled'], sprintf( $this->lang->words['a_msg3'], $this->settings['base_url'] ) ) .  "<br >";
-		}
-		
 		//-----------------------------------------
 		// Dun...
 		//-----------------------------------------
 		
 		$this->registry->output->html .= $this->html->api_list( $users );
 	}
-}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/cache.php b/upload/admin/applications/core/modules_admin/tools/cache.php
index c1cc082d..14372509 100644
--- a/upload/admin/applications/core/modules_admin/tools/cache.php
+++ b/upload/admin/applications/core/modules_admin/tools/cache.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP : Cache management
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		26th January 2004
- * @version		$Revision: 6995 $
+ * @version		$Revision: 9487 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -50,7 +50,7 @@ class admin_core_tools_cache extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -58,7 +58,7 @@ class admin_core_tools_cache extends ipsCommand
 		// Load language
 		//-----------------------------------------
 		
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ) );
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_tools' ), 'core' );
 		
 		//-----------------------------------------
 		// Load skin
@@ -95,6 +95,10 @@ class admin_core_tools_cache extends ipsCommand
 				$this->cacheRecache();
 			break;
 			
+			case 'globalCachesRecache':
+				$this->globalCachesRecache();
+			break;
+			
 			case 'cache_update_all_process':
 				$this->cacheUpdateAllProcess();
 			break;
@@ -115,9 +119,9 @@ class admin_core_tools_cache extends ipsCommand
 	/**
 	 * View an individual cache store contents
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _contentCache()
+	protected function _contentCache()
 	{
 		$type   = $this->request['type'];
 		$method = $this->request['method'];
@@ -139,7 +143,7 @@ class admin_core_tools_cache extends ipsCommand
 	/**
 	 * View an individual cache store contents
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function cacheView()
 	{
@@ -183,7 +187,7 @@ class admin_core_tools_cache extends ipsCommand
 		
 		ob_end_clean();
 		
-		$this->registry->output->html = $this->html->cache_pop_up( $id, htmlspecialchars($out) );
+		$this->registry->output->html .= $this->html->cache_pop_up( $id, htmlspecialchars($out) );
 		
 		$this->registry->output->printPopupWindow();
 	}
@@ -191,7 +195,7 @@ class admin_core_tools_cache extends ipsCommand
 	/**
 	 * Rebuild all caches
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function cacheUpdateAllProcess()
 	{
@@ -220,10 +224,10 @@ class admin_core_tools_cache extends ipsCommand
 		{
 			$_file = IPSLib::getAppDir( $app_dir ) . '/extensions/coreVariables.php';
 		
-			if ( file_exists( $_file ) )
+			if ( is_file( $_file ) )
 			{
 				$CACHE = array();
-				require( $_file );
+				require( $_file );/*maybeLibHook*/
 				
 				foreach( $CACHE as $k => $v )
 				{
@@ -271,7 +275,7 @@ class admin_core_tools_cache extends ipsCommand
 	/**
 	 * Recache an individual cache
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function cacheRecache()
 	{
@@ -293,11 +297,42 @@ class admin_core_tools_cache extends ipsCommand
 		$this->registry->output->global_message = $this->lang->words['c_recachethecachegetitgotitgood'];
 		$this->cacheOverview();
 	}
+
+	/**
+	 * Recache the global caches
+	 *
+	 * @return	@e void [Outputs to screen]
+	 */
+	public function globalCachesRecache()
+	{
+		try
+		{
+			IPSLib::cacheGlobalCaches();
+			$msg = $this->lang->words['gcaches_cache_rebuilt'];
+		}
+		catch( Exception $e )
+		{
+			$msg = $e->getMessage();
+			
+			switch( $msg )
+			{
+				case 'CANNOT_WRITE':
+					$msg = $this->lang->words['gcaches_cannot_write'];
+				break;
+				case 'NO_DATA_TO_WRITE':
+					$msg = $this->lang->words['gcaches_no_data'];
+				break;
+			}
+		}
+		
+		$this->registry->output->global_message = $msg;
+		$this->cacheOverview();
+	}
 	
 	/**
 	 * List all of the current caches
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function cacheOverview()
 	{
@@ -342,19 +377,14 @@ class admin_core_tools_cache extends ipsCommand
 		// Get all application's cache lists
 		//-----------------------------------------
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if( !IPSLib::appIsInstalled( $app_dir ) )
-			{
-				continue;
-			}
-			
 			$_file = IPSLib::getAppDir(  $app_dir ) . '/extensions/coreVariables.php';
 		
-			if ( file_exists( $_file ) )
+			if ( is_file( $_file ) )
 			{
 				$CACHE = array();
-				require( $_file );
+				require( $_file );/*maybeLibHook*/
 			
 				foreach( $CACHE as $cache_name => $cache_data )
 				{
@@ -379,19 +409,6 @@ class admin_core_tools_cache extends ipsCommand
 		/* Content Cache Stuffs */
 		if ( IPSContentCache::isEnabled() )
 		{
-			/* Monitor? */
-			if ( $this->settings['cc_monitor'] )
-			{
-				$cache = $this->cache->getCache('ccMonitor');
-			
-				$cacheContent['m_posts'] = sprintf( $this->lang->words['served_data'], intval( $cache['post']['raw'] ), intval( $cache['post']['cached'] ) );
-				$cacheContent['m_sigs']  = sprintf( $this->lang->words['served_data'], intval( $cache['sig']['raw'] ), intval( $cache['sig']['cached'] ) );
-			}
-			else
-			{
-				$cacheContent['m_posts'] = $cacheContent['m_sigs'] = $this->lang->words['no_monitoring_data'];
-			}
-			
 			/* Get all posts */
 			$cacheContent['posts'] = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count',
 													  				  'from'   => 'posts' ) );
@@ -429,22 +446,22 @@ class admin_core_tools_cache extends ipsCommand
 	 */
 	public function rebuildRssCache( $app='' )
 	{
-		$retrieved	= array( time() + 60*60 );
+		if( defined('IPS_IS_UPGRADER') AND IPS_IS_UPGRADER )
+		{
+			return array();
+		}
 
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		$retrieved	= array();
+
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
 			if ( ( ! empty( $app ) AND $app == $app_dir ) || empty( $app ) )
 			{
-				if ( ! IPSLib::appIsInstalled( $app_dir ) )
-				{
-					continue;
-				}
-				
 				//-----------------------------------------
 				// Retrieve the RSS links for the header
 				//-----------------------------------------
 		
-				if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/rssOutput.php' ) )
+				if( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/rssOutput.php' ) )
 				{
 					$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/rssOutput.php', 'rss_output_' . $app_dir, $app_dir );
 					
diff --git a/upload/admin/applications/core/modules_admin/tools/defaultSection.php b/upload/admin/applications/core/modules_admin/tools/defaultSection.php
index 1019dd48..549af6ce 100644
--- a/upload/admin/applications/core/modules_admin/tools/defaultSection.php
+++ b/upload/admin/applications/core/modules_admin/tools/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default tools section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'tools' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9373 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'settings';
\ No newline at end of file
+$DEFAULT_SECTION = 'licensekey';
diff --git a/upload/admin/applications/core/modules_admin/tools/help.php b/upload/admin/applications/core/modules_admin/tools/help.php
index 54d1c8f7..73201329 100644
--- a/upload/admin/applications/core/modules_admin/tools/help.php
+++ b/upload/admin/applications/core/modules_admin/tools/help.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Help Files
- * Last Updated: $LastChangedDate: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-20 08:16:45 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6995 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9513 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,13 +30,13 @@ class admin_core_tools_help extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -52,7 +52,7 @@ class admin_core_tools_help extends ipsCommand
 		switch( $this->request['do'] )
 		{
 			case 'edit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'help_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'helpfiles_manage' );
 				$this->helpFileForm( 'edit' );
 			break;
 			
@@ -67,7 +67,7 @@ class admin_core_tools_help extends ipsCommand
 			break;
 				
 			case 'doreorder':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'help_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'helpfiles_manage' );
 				$this->helpFilesReorder();
 			break;				
 				
@@ -82,18 +82,18 @@ class admin_core_tools_help extends ipsCommand
 			break;
 				
 			case 'exportXml':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'help_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'helpfiles_manage' );
 				$this->helpFilesXMLExport();
 			break;
 			
 			case 'importXml':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'help_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'helpfiles_manage' );
 				$this->helpFilesXMLImport();
 			break;
 			
 			case 'help_overview':
 			default:
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'help_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'helpfiles_manage' );
 				$this->helpFilesList();
 			break;
 		}
@@ -106,7 +106,7 @@ class admin_core_tools_help extends ipsCommand
 	/**
 	 * Import help files XML
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function helpFilesXMLImport()
 	{
@@ -128,7 +128,7 @@ class admin_core_tools_help extends ipsCommand
 			}
 		}
 		
-		$this->registry->output->global_message = $this->lang->words['h_imported'] . "<br />" . implode( "<br />",  $messages );
+		$this->registry->output->setMessage( $this->lang->words['h_imported'] . "<br />" . implode( "<br />",  $messages ), 1 );
 		$this->helpFilesList();
 	}
 	
@@ -147,9 +147,9 @@ class admin_core_tools_help extends ipsCommand
 		$processed = array( 'added' => 0, 'updated' => 0 );
 		
 		/* Got anything to import? */
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
-			require_once( IPS_KERNEL_PATH.'classXML.php' );
+			require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 			
 			$xml = new classXML( IPS_DOC_CHAR_SET );
 			$xml->load( $file );
@@ -192,14 +192,14 @@ class admin_core_tools_help extends ipsCommand
 	/**
 	 * Export help files XML
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function helpFilesXMLExport()
 	{
 		/* INIT */
 		$entry = array();
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		
 		/* Loop through all the applications */
 		foreach( $this->registry->getApplications() as $app => $__data )
@@ -232,11 +232,11 @@ class admin_core_tools_help extends ipsCommand
 			@unlink( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_help.xml' );
 			
 			/* Write */
-			if( $doc and $c)
+			if( $doc and $c )
 			{
-				$fh = fopen( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_help.xml', 'w' );
-				fwrite( $fh, $doc );
-				fclose( $fh );
+				$fh = @fopen( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_help.xml', 'w' );
+				@fwrite( $fh, $doc );
+				@fclose( $fh );
 			}
 			
 			/* In dev time stamp? */
@@ -255,7 +255,7 @@ class admin_core_tools_help extends ipsCommand
 	/**
 	 * Removes a help file
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	Josh
 	 */
 	public function helpFileRemove()
@@ -279,7 +279,7 @@ class admin_core_tools_help extends ipsCommand
 	 * Handles the add/edit help file form
 	 *
 	 * @param	string	$type	Either new or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function handleHelpFileForm( $type='new' )
 	{
@@ -337,7 +337,7 @@ class admin_core_tools_help extends ipsCommand
 	 * Form for adding/editing help files
 	 *
 	 * @param	string	$type	New or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function helpFileForm( $type='new' )
 	{
@@ -392,7 +392,7 @@ class admin_core_tools_help extends ipsCommand
 		$form['title']       = $this->registry->output->formInput('title'  , $r['title'] );
 		$form['description'] = $this->registry->output->formTextarea('description', $r['description'] );
 		$form['appDir']		 = $this->registry->output->formDropdown( 'appDir', $dropdown, $r['app'] );
-		$form['text']        = $r['text'];
+		$form['text']        = IPSText::textToForm( $r['text'] );
 		
 		/* Ouput */
 		$this->registry->output->html .= $this->html->helpFileForm( $code, $id, $form, $button );
@@ -401,7 +401,7 @@ class admin_core_tools_help extends ipsCommand
 	/**
 	 * Reorders help files
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function helpFilesReorder()
 	{
@@ -446,7 +446,7 @@ class admin_core_tools_help extends ipsCommand
 	/**
 	 * List current help files
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function helpFilesList()
 	{
diff --git a/upload/admin/applications/core/modules_admin/tools/incomingEmails.php b/upload/admin/applications/core/modules_admin/tools/incomingEmails.php
index e37cae2f..31be1b50 100644
--- a/upload/admin/applications/core/modules_admin/tools/incomingEmails.php
+++ b/upload/admin/applications/core/modules_admin/tools/incomingEmails.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Incoming Email Routing
- * Last Updated: $LastChangedDate: 2010-10-04 11:44:10 -0400 (Mon, 04 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6938 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,9 +28,8 @@ class admin_core_tools_incomingEmails extends ipsCommand
 	/**
 	 * Main entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -39,6 +38,8 @@ class admin_core_tools_incomingEmails extends ipsCommand
 		$this->html = $this->registry->output->loadTemplate( 'cp_skin_tools' );
 		
 		$this->form_code    = $this->html->form_code = 'module=tools&amp;section=incomingEmails';
+		
+		$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'incomingemail_manage' );
 				
 		/* What to do */
 		switch( $this->request['do'] )
@@ -74,12 +75,11 @@ class admin_core_tools_incomingEmails extends ipsCommand
 	/**
 	 * Test POP3
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function test()
 	{
-		require_once( IPS_KERNEL_PATH . '/pop3class/pop3.php' );
+		require_once( IPS_KERNEL_PATH . '/pop3class/pop3.php' );/*noLibHook*/
 		$pop3 = new pop3_class;
 		
 		$pop3->hostname							= $this->settings['pop3_server'];
@@ -126,8 +126,7 @@ class admin_core_tools_incomingEmails extends ipsCommand
 	/**
 	 * Manage Rules
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function manage()
 	{
@@ -149,8 +148,7 @@ class admin_core_tools_incomingEmails extends ipsCommand
 	/**
 	 * Show Form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function form( $type )
 	{
@@ -168,7 +166,7 @@ class admin_core_tools_incomingEmails extends ipsCommand
 		$applications = array();
 		foreach ( ipsRegistry::$applications as $dir => $app )
 		{
-			if ( file_exists( IPSLib::getAppDir( $dir ) . '/extensions/incomingEmails.php' ) )
+			if ( is_file( IPSLib::getAppDir( $dir ) . '/extensions/incomingEmails.php' ) )
 			{
 				$applications[] = array( $dir, $this->lang->words['ie_sendto'] . $app['app_title'] );
 			}
diff --git a/upload/admin/applications/core/modules_admin/tools/index.html b/upload/admin/applications/core/modules_admin/tools/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/tools/index.html
+++ b/upload/admin/applications/core/modules_admin/tools/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/licensekey.php b/upload/admin/applications/core/modules_admin/tools/licensekey.php
index d6afa4c4..eab1f498 100644
--- a/upload/admin/applications/core/modules_admin/tools/licensekey.php
+++ b/upload/admin/applications/core/modules_admin/tools/licensekey.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * License Manager
- * Last Updated: $LastChangedDate$
+ * Last Updated: $LastChangedDate: 2011-09-26 16:02:02 -0400 (Mon, 26 Sep 2011) $
  * </pre>
  *
- * @author 		$Author$
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev$
+ * @link		http://hatynka.in
+ * @version		$Rev: 9551 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,8 +29,8 @@ class admin_core_tools_licensekey extends ipsCommand
 	 * HTML object
 	 *
 	 * @var		object
-	 **/
-	private $html;
+	 */
+	protected $html;
 	
 	/**#@+
 	 * URL bits
@@ -45,7 +45,7 @@ class admin_core_tools_licensekey extends ipsCommand
 	 * Main entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -56,6 +56,10 @@ class admin_core_tools_licensekey extends ipsCommand
 		/* URLs */
 		$this->form_code    = $this->html->form_code    = 'module=tools&amp;section=licensekey';
 		$this->form_code_js = $this->html->form_code_js = 'module=tools&section=licensekey';
+		
+		/* We need a classFileManagement object */
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$this->classFileManagement = new $classToLoad();
 
 		/* What to do */
 		switch( $this->request['do'] )
@@ -78,10 +82,11 @@ class admin_core_tools_licensekey extends ipsCommand
 		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
 		$this->registry->output->sendOutput();
 	}
+
 	/**
 	 * Removes a license key
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remove()
 	{
@@ -99,21 +104,19 @@ class admin_core_tools_licensekey extends ipsCommand
 	/**
 	 * Activates a license
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function activate()
 	{
-		/* Get the file managemnet class */
-		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
-		$query = new $classToLoad();
-		$query->use_sockets = 1;
-
 		/* Query the api */
+		$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?api=activateKey&lk={$this->request['license_key']}&domain=".urlencode($this->request['domain_key']) );
 
 		/* Decode */
-			$this->DB->update( 'core_sys_conf_settings', array( 'conf_value' => $this->request['license_key'] ), "conf_key='ipb_reg_number'" );
-			$this->cache->rebuildCache( 'settings', 'global' );
-			$this->cache->setCache( 'licenseData', array(), array( 'array' => 1 ) );
+		$response = json_decode( $response, true );
+
+		$this->DB->update( 'core_sys_conf_settings', array( 'conf_value' => $this->request['license_key'] ), "conf_key='ipb_reg_number'" );
+		$this->cache->rebuildCache( 'settings', 'global' );
+		$this->cache->setCache( 'licenseData', array(), array( 'array' => 1 ) );
 
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
@@ -121,7 +124,7 @@ class admin_core_tools_licensekey extends ipsCommand
 	/**
 	 * Displays license information
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function overview()
 	{
@@ -137,17 +140,27 @@ class admin_core_tools_licensekey extends ipsCommand
 		
 		if( ! $licenseData || $this->request['refresh'] == 1 || ( IPS_UNIX_TIME_NOW - $licenseData['_cached_date'] ) > 86400 )
 		{
-			/* Get the file managemnet class */
-			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
-			$query = new $classToLoad();
-			$query->use_sockets = 1;
-
 			/* Query the api */
-		
-			/* Get License Data */
+			$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?lk={$this->settings['ipb_reg_number']}&url={$this->settings['board_url']}&flush=1" );
 			
+			/* Get License Data */
+			$licenseData = json_decode( $response, true );
+			
+			/* Copyright Removal? */
+			if ( $licenseData['cr'] )
+			{
+				IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
+			}
+			elseif ( $this->settings['ips_cp_purchase'] )
+			{
+				IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
+			}
+
 			/* Save to cache */
-			$licenseData['_cached_date'] = time();
+			$licenseData['_cached_date']	= time();
+			$licenseData['key']['_expires']	= $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
+			$licenseData['key']['expires']	= $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
+			
 			$this->cache->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
 		}
 
@@ -161,7 +174,7 @@ class admin_core_tools_licensekey extends ipsCommand
 	/**
 	 * Displays license key status
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function activateForm()
 	{		
diff --git a/upload/admin/applications/core/modules_admin/tools/login.php b/upload/admin/applications/core/modules_admin/tools/login.php
index 67a1dd10..0ed94cb9 100644
--- a/upload/admin/applications/core/modules_admin/tools/login.php
+++ b/upload/admin/applications/core/modules_admin/tools/login.php
@@ -2,19 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login Manager Administration
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-09-08 15:22:26 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thursday 26th January 2006 (11:03)
- * @version		$Revision: 6995 $
+ * @version		$Revision: 9469 $
+ *
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,27 +31,27 @@ class admin_core_tools_login extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -148,7 +149,7 @@ class admin_core_tools_login extends ipsCommand
 	 *
 	 * @return	boolean	Saved or not
 	 */
-	private function _loginSaveConf()
+	protected function _loginSaveConf()
 	{
 		//-----------------------------------------
 		// Init Vars
@@ -168,44 +169,23 @@ class admin_core_tools_login extends ipsCommand
 			$this->_loginList();
 			return false;
 		}
-		
-		//-----------------------------------------
-		// Generate file path
-		//-----------------------------------------
-		
-		$mypath = IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'];
-		
+
 		//-----------------------------------------
 		// Check (still waiting)
 		//-----------------------------------------
 		
-		if( !file_exists( $mypath . '/acp.php' ) )
+		if( !is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/acp.php' ) )
 		{
 			ipsRegistry::getClass('output')->global_message = $this->lang->words['l_noconfig'];
 			$this->_loginList();
 			return false;
 		}
-		
-		if( !file_exists( $mypath . '/conf.php' ) )
-		{
-			ipsRegistry::getClass('output')->global_message = $this->lang->words['l_noconfigfile'];
-			$this->_loginList();
-			return false;
-		}
-		
-		if( !is_writable( $mypath . '/conf.php' ) )
-		{
-			ipsRegistry::getClass('output')->global_message = $mypath . $this->lang->words['l_confwrite'];
-			$this->_loginList();
-			return false;
-		}
-		
+
 		//-----------------------------------------
-		// We all good?
+		// Check our ACP options file
 		//-----------------------------------------
 		$config = array();
-		require_once( $mypath . '/acp.php' );
-		require_once( $mypath . '/conf.php' );
+		require_once( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/acp.php' );/*noLibHook*/
 		
 		if( !is_array($config) OR !count($config) )
 		{
@@ -215,7 +195,7 @@ class admin_core_tools_login extends ipsCommand
 		}
 		
 		//-----------------------------------------
-		// Teh form
+		// Save
 		//-----------------------------------------
 		
 		$save = array();
@@ -228,26 +208,17 @@ class admin_core_tools_login extends ipsCommand
 			}
 		}
 		
-		$conf_file = '<' . '?php' . "\n\n";
+		$this->DB->update( 'login_methods', array( 'login_custom_config' => serialize( $save ) ), 'login_id=' . $login_id );
 		
-		foreach( $save as $k => $v )
-		{
-			$conf_file .= '$LOGIN_CONF[' . "'" . $k . "']	= " . '"' . addslashes( $v ) . '";' . "\n";
-		}
+		//-----------------------------------------
+		// Recache
+		//-----------------------------------------
 		
-		$conf_file .= "\n\n?" . '>';
-		
-		if( $fh = @fopen( $mypath . '/conf.php', 'w' ) )
-		{
-			fwrite( $fh, $conf_file );
-			fclose( $fh );
-		}
-		else
-		{
-			ipsRegistry::getClass('output')->global_message = $mypath . $this->lang->words['l_confwrite'];
-			$this->_loginACPConf();
-			return false;
-		}
+		$this->loginsRecache();
+
+		//-----------------------------------------
+		// And then show list
+		//-----------------------------------------
 		
 		ipsRegistry::getClass('output')->global_message = sprintf($this->lang->words['l_confup'], $login['login_title'] );
 		$this->_loginList();
@@ -258,8 +229,9 @@ class admin_core_tools_login extends ipsCommand
 	 * Configure details specific to a login method
 	 *
 	 * @return	mixed		Outputs, or return false
+	 * @todo 	[Future] Remove legacy check for conf.php file in IPB 3.4 or higher
 	 */
-	private function _loginACPConf()
+	protected function _loginACPConf()
 	{
 		//-----------------------------------------
 		// Init Vars
@@ -271,7 +243,7 @@ class admin_core_tools_login extends ipsCommand
 		// Check (please?)
 		//-----------------------------------------
 		
-		$login = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'login_methods', 'where' => 'login_id=' . $login_id ) );
+		$login	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'login_methods', 'where' => 'login_id=' . $login_id ) );
 			
 		if ( ! $login['login_id'] )
 		{
@@ -280,44 +252,38 @@ class admin_core_tools_login extends ipsCommand
 			return false;
 		}
 		
+		$LOGIN_CONF	= $login['login_custom_config'] ? @unserialize($login['login_custom_config']) : array();
+		
 		//-----------------------------------------
-		// Generate file path
+		// If not populated, check for flat file config (legacy)
 		//-----------------------------------------
 		
-		$mypath = IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'];
-		
+		if( !count($LOGIN_CONF) )
+		{
+			if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/conf.php' ) )
+			{
+				require( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/conf.php' );/*noLibHook*/
+			}
+		}
+
 		//-----------------------------------------
 		// Check (still waiting)
 		//-----------------------------------------
 		
-		if( !file_exists( $mypath . '/acp.php' ) )
+		if( !is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/acp.php' ) )
 		{
 			ipsRegistry::getClass('output')->global_message = $this->lang->words['l_noconfig'];
 			$this->_loginList();
 			return false;
 		}
-		
-		if( !file_exists( $mypath . '/conf.php' ) )
-		{
-			ipsRegistry::getClass('output')->global_message = $this->lang->words['l_noconfigfile'];
-			$this->_loginList();
-			return false;
-		}
-		
-		if( !is_writable( $mypath . '/conf.php' ) )
-		{
-			ipsRegistry::getClass('output')->global_message = $mypath . $this->lang->words['l_confwrite'];
-			$this->_loginList();
-			return false;
-		}
-		
+
 		//-----------------------------------------
-		// We all good?
+		// Get config
 		//-----------------------------------------
-		$config     = array();
-		$LOGIN_CONF = array();
-		require_once( $mypath . '/acp.php' );
-		require_once( $mypath . '/conf.php' );
+
+		$config		= array();
+
+		require_once( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/acp.php' );/*noLibHook*/
 		
 		if( !is_array($config) OR !count($config) )
 		{
@@ -329,6 +295,7 @@ class admin_core_tools_login extends ipsCommand
 		//-----------------------------------------
 		// Teh form
 		//-----------------------------------------
+
 		$form = array();
 		
 		foreach( $config as $option )
@@ -365,7 +332,7 @@ class admin_core_tools_login extends ipsCommand
 	 * @param	array 		Entries to add
 	 * @return	string		XML Document
 	 */
-	private function _buildXML( $data=array() )
+	protected function _buildXML( $data=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -376,22 +343,22 @@ class admin_core_tools_login extends ipsCommand
 		//-----------------------------------------
 		// Get XML class
 		//-----------------------------------------
-		
-		require_once( IPS_KERNEL_PATH . 'class_xml.php' );
-		$xml = new class_xml();
-		$xml->doc_type = IPS_DOC_CHAR_SET;
 
-		$xml->xml_set_root( 'export', array( 'exported' => time() ) );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+
+		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
+		$xml->newXMLDocument();
+		$xml->addElement( 'export' );
+		$xml->addElement( 'group', 'export' );
+
 		//-----------------------------------------
 		// Set group
 		//-----------------------------------------
-		
-		$xml->xml_add_group( 'group' );
-		
+
 		foreach( $data as $thisentry => $r )
 		{
-			$content = array();
+			$r['login_enabled']			= 0;
 			
 			if ( $r['login_folder_name'] == 'internal' )
 			{
@@ -405,42 +372,22 @@ class admin_core_tools_login extends ipsCommand
 				$r['login_logout_url']		= '';
 				$r['login_enabled']			= 0;
 			}
-			else
-			{
-				$r['login_enabled']			= 0;
-			}
 			
-			//-----------------------------------------
-			// Sort the fields...
-			//-----------------------------------------
+			unset($r['login_id']);
 			
-			foreach( $r as $k => $v )
-			{
-				if( in_array( $k, array( 'login_id' ) ) )
-				{
-					continue;
-				}
-				
-				$content[] = $xml->xml_build_simple_tag( $k, $v );
-			}
-			
-			$entry[] = $xml->xml_build_entry( 'row', $content );
+			$xml->addElementAsRecord( 'group', 'row', $r );
 		}
-		
-		$xml->xml_add_entry_to_group( 'group', $entry );
-		
-		$xml->xml_format_document();
-		
-		return $xml->xml_document;
+
+		return $xml->fetchDocument();
 	}
 	
 	/**
 	 * Export master XML file for installer
 	 *
 	 * @param	integer		[Optional] Login ID
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _masterXmlExport( $login_id=0 )
+	protected function _masterXmlExport( $login_id=0 )
 	{		
 		//-----------------------------------------
 		// INIT
@@ -485,7 +432,7 @@ class admin_core_tools_login extends ipsCommand
 	 *
 	 * @return	mixed		Outputs, or returns false
 	 */
-	private function _loginDiagnostics()
+	protected function _loginDiagnostics()
 	{
 		//-----------------------------------------
 		// Init Vars
@@ -505,51 +452,19 @@ class admin_core_tools_login extends ipsCommand
 			$this->_loginList();
 			return false;
 		}
-		
-		//-----------------------------------------
-		// Generate file
-		//-----------------------------------------
-		
-		$mypath = IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'];
-		
-		//-----------------------------------------
-		// Generate General Info
-		//-----------------------------------------
-		
-		$login['_enabled_img']   = $login['login_enabled']   ? 'tick.png' : 'cross.png';
-		$login['_has_settings']  = $login['login_settings']  ? 'tick.png' : 'cross.png';
-		
-		//-----------------------------------------
-		// File based info
-		//-----------------------------------------
-		
-		$login['_file_auth_exists'] = @file_exists( $mypath . '/auth.php' )	? 'tick.png' : 'cross.png';
-		$login['_file_conf_exists'] = @file_exists( $mypath . '/conf.php' )	? 'tick.png' : 'cross.png';
-		$login['_file_acp_exists']  = @file_exists( $mypath . '/acp.php' )	? 'tick.png' : 'cross.png';
-		
-		$login['_file_conf_write']  = @is_writable( $mypath.'/conf.php' )	? 'tick.png' : 'cross.png';
-		
-		/* Try to setup the module */
-		require_once( IPS_PATH_CUSTOM_LOGIN . '/login_core.php' );
-    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_interface.php' );
 
-		if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/auth.php' ) )
+		/* Try to setup the module */
+		require_once( IPS_PATH_CUSTOM_LOGIN . '/login_core.php' );/*noLibHook*/
+    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_interface.php' );/*noLibHook*/
+
+		if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/auth.php' ) )
 		{
-			$classFile 	= IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/auth.php';
-			$config		= IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/conf.php';
+			$LOGIN_CONF	= $login['login_custom_config'] ? @unserialize($login['login_custom_config']) : array();	
 			
-			if( file_exists( $config ) )
-			{
-				$LOGIN_CONF	= array();				
-				require( $config );
-			}
+			$classToLoad = IPSLib::loadLibrary( IPS_PATH_CUSTOM_LOGIN . '/' . $login['login_folder_name'] . '/auth.php', 'login_' . $login['login_folder_name'] );
+			$module		 = new $classToLoad( $this->registry, $login, $LOGIN_CONF );
 			
-			$classname	= "login_" . $login['login_folder_name'];
-        
-			require_once( $classFile );
-			$module = new $classname( $this->registry, $login, $LOGIN_CONF );
-			
-			if( $module->missingModules )
+			if( isset($module->missingModules) && is_array($module->missingModules) && count($module->missingModules) )
 			{
 				$login['_missingModules'] = implode( ', ', $module->missingModules );
 			}
@@ -562,9 +477,9 @@ class admin_core_tools_login extends ipsCommand
 	 * Saves the login method to the database [add,edit]
 	 *
 	 * @param	string		Add or Edit flag
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginSave($type='add')
+	protected function _loginSave($type='add')
 	{
 		//--------------------------------------------
 		// INIT
@@ -671,9 +586,9 @@ class admin_core_tools_login extends ipsCommand
 	 * Shows the login method form [add,edit]
 	 *
 	 * @param	string		Add or Edit flag
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginForm( $type='add' )
+	protected function _loginForm( $type='add' )
 	{
 		//-----------------------------------------
 		// Init Vars
@@ -740,41 +655,48 @@ class admin_core_tools_login extends ipsCommand
 	/**
 	 * Lists the login method overview screen
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginList()
+	protected function _loginList()
 	{
 		//-----------------------------------------
 		// Output
 		//-----------------------------------------
 		
-		ipsRegistry::getClass('output')->nav[] = array( $this->form_code, $this->lang->words['l_nav'] );
-				
+		ipsRegistry::getClass('output')->nav[]	= array( $this->form_code, $this->lang->words['l_nav'] );
+
+		//-----------------------------------------
+		// Get xml class
+		//-----------------------------------------
+		
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
+
+		$xml = new classXML( IPS_DOC_CHAR_SET );
+		
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
-		
-		require_once( IPS_KERNEL_PATH . 'class_xml.php' );
-		$xml			= new class_xml();
-		$xml->doc_type	= IPS_DOC_CHAR_SET;
+
 		$content		= "";
 		$db_methods		= array();
 		$dir_methods	= array();
 		$installed		= array();
-		$missing        = array();
 		
 		//-----------------------------------------
 		// Get login methods from database
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select' => '*', 'from' => 'login_methods' ) );
+		$i	= 0;
+		
+		$this->DB->build( array( 'select' => '*', 'from' => 'login_methods', 'order' => 'login_order ASC' ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
 			$r['login_installed'] 				= 1;
-			$db_methods[ $r['login_order'] ]	= $r;
+			$db_methods[ $i ]					= $r;
 			$installed[]						= $r['login_folder_name'];
+			$i++;
 		}
 
 		ksort( $db_methods );
@@ -793,45 +715,19 @@ class admin_core_tools_login extends ipsCommand
 				{
 					$data = array( 'login_title' => $file, 'login_folder_name' => $file );
 					
-					if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' ) )
+					if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' ) )
 					{
 						$file_content = file_get_contents( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' );
 						
-						$xml->xml_parse_document( $file_content );
+						$xml->loadXML( $file_content );
 
-						if( is_array($xml->xml_array['export']['group']['row']) )
+						foreach( $xml->fetchElements('row') as $record )
 						{
-							foreach( $xml->xml_array['export']['group']['row'] as $f => $entry )
-							{
-								if( is_array($entry) )
-								{
-									foreach( $entry as $k => $v )
-									{
-										if ( $f == 'VALUE' or $f == 'login_id' )
-										{
-											continue;
-										}
-										
-										$data[ $f ] = $v;
-									}
-								}
-							}
+							$data	= $xml->fetchElementsFromRecord( $record );
 						}
 					}
 					
-					$data['acp_plugin']	= 0;
-
-					if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/acp.php' ) )
-					{
-						if ( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/conf.php' ) )
-						{
-							$data['acp_plugin']	= 1;
-						}
-						else if ( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/conf.dist.php' ) )
-						{
-							$missing[] = IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/';
-						}
-					}
+					$data['acp_plugin']	= is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/acp.php' ) ? 1 : 0;
 
 					$dir_methods[ $file ] = $data;
 				}
@@ -839,15 +735,6 @@ class admin_core_tools_login extends ipsCommand
 			
 			closedir( $dh );
 		}
-		
-		//-----------------------------------------
-		// Got some folders with the .dist.php files?
-		//-----------------------------------------
-		
-		if ( count( $missing ) )
-		{
-			$this->registry->output->showError( sprintf( $this->lang->words['l_rename_conf'], implode( "</li><li>", $missing ) ) );
-		}
 
 		//-----------------------------------------
 		// First...we show installed methods
@@ -912,9 +799,9 @@ class admin_core_tools_login extends ipsCommand
 	/**
 	 * Toggle login method enabled/disabled
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginToggle()
+	protected function _loginToggle()
 	{
 		//--------------------------------------------
 		// INIT
@@ -968,9 +855,9 @@ class admin_core_tools_login extends ipsCommand
 	/**
 	 * Uninstall a login method
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginUninstall()
+	protected function _loginUninstall()
 	{
 		//--------------------------------------------
 		// INIT
@@ -1008,18 +895,17 @@ class admin_core_tools_login extends ipsCommand
 	/**
 	 * Install a login method
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginInstall()
+	protected function _loginInstall()
 	{
-		//--------------------------------------------
-		// INIT
-		//--------------------------------------------
-		
-		require_once( IPS_KERNEL_PATH . 'class_xml.php' );
-		$xml			= new class_xml();
-		$xml->doc_type	= IPS_DOC_CHAR_SET;
+		//-----------------------------------------
+		// Get xml class
+		//-----------------------------------------
 		
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
+
+		$xml		= new classXML( IPS_DOC_CHAR_SET );
 		$login_id	= basename(ipsRegistry::$request['login_folder']);
 		
 		//-----------------------------------------
@@ -1034,29 +920,15 @@ class admin_core_tools_login extends ipsCommand
 			{
 				if( is_dir( IPS_PATH_CUSTOM_LOGIN . '/' . $file ) AND $file == $login_id )
 				{
-					if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' ) )
+					if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' ) )
 					{
 						$file_content = file_get_contents( IPS_PATH_CUSTOM_LOGIN . '/' . $file . '/loginauth_install.xml' );
 						
-						$xml->xml_parse_document( $file_content );
+						$xml->loadXML( $file_content );
 
-						if( is_array($xml->xml_array['export']['group']['row']) )
+						foreach( $xml->fetchElements('row') as $record )
 						{
-							foreach( $xml->xml_array['export']['group']['row'] as $f => $entry )
-							{
-								if( is_array($entry) )
-								{
-									foreach( $entry as $k => $v )
-									{
-										if ( $f == 'VALUE' or $f == 'login_id' )
-										{
-											continue;
-										}
-										
-										$data[ $f ] = $v;
-									}
-								}
-							}
+							$data  = $xml->fetchElementsFromRecord( $record );
 						}
 					}
 					else
@@ -1121,9 +993,9 @@ class admin_core_tools_login extends ipsCommand
 	/**
 	 * Reorder a login method
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _loginReorder()
+	protected function _loginReorder()
 	{
 		//-----------------------------------------
 		// INIT
@@ -1147,14 +1019,17 @@ class admin_core_tools_login extends ipsCommand
  		//-----------------------------------------
 
  		$position	= 1;
- 		
+
  		if( is_array($this->request['logins']) AND count($this->request['logins']) )
  		{
  			foreach( $this->request['logins'] as $this_id )
  			{
- 				$this->DB->update( 'login_methods', array( 'login_order' => $position ), 'login_id=' . $this_id );
- 				
- 				$position++;
+ 				if( intval($this_id) == $this_id )
+ 				{
+	 				$this->DB->update( 'login_methods', array( 'login_order' => $position ), 'login_id=' . intval($this_id) );
+	 				
+	 				$position++;
+ 				}
  			}
  		}
  		
diff --git a/upload/admin/applications/core/modules_admin/tools/logsSplash.php b/upload/admin/applications/core/modules_admin/tools/logsSplash.php
index 4f8a78a7..0faee912 100644
--- a/upload/admin/applications/core/modules_admin/tools/logsSplash.php
+++ b/upload/admin/applications/core/modules_admin/tools/logsSplash.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Log Splash Screen
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 9487 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,15 +29,13 @@ class admin_core_tools_logsSplash extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -47,9 +45,8 @@ class admin_core_tools_logsSplash extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -64,7 +61,7 @@ class admin_core_tools_logsSplash extends ipsCommand
 		$this->form_code_js	= $this->html->form_code_js	= 'module=logs&section=splash';
 		
 		/* Get the splash screen */
-		$this->registry->output->html = $this->html->logSplashScreen();
+		$this->registry->output->html .= $this->html->logSplashScreen();
 		
 		/* Output */
 		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
diff --git a/upload/admin/applications/core/modules_admin/tools/performance.php b/upload/admin/applications/core/modules_admin/tools/performance.php
index 294d768c..d74a22f8 100644
--- a/upload/admin/applications/core/modules_admin/tools/performance.php
+++ b/upload/admin/applications/core/modules_admin/tools/performance.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Toggle performance mode on/off
- * Last Updated: $LastChangedDate: 2010-06-01 18:11:37 -0400 (Tue, 01 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-07-19 19:39:43 -0400 (Tue, 19 Jul 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6435 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9291 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,64 +28,56 @@ class admin_core_tools_performance extends ipsCommand
 	/**
 	 * Settings to ENABLE
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $settingsEnable		= array( 'live_search_disable', 'no_au_forum', 'no_au_topic', 'disable_summary', 'topic_marking_noquery' );
+	protected $settingsEnable		= array( 'live_search_disable', 'no_au_forum', 'no_au_topic', 'disable_summary', 'topic_marking_noquery' );
 	
 	/**
 	 * Settings to DISABLE
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $settingsDisable	= array( 'spider_visit', 'custom_profile_topic', 'update_topic_views_immediately', 'show_user_posted',
+	protected $settingsDisable	= array( 'spider_visit', 'custom_profile_topic', 'update_topic_views_immediately', 'show_user_posted',
 										 'show_active', 'allow_search', 'topic_marking_enable' );
 	
 	/**
 	 * Group settings to ENABLE
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $groupEnable		= array();
+	protected $groupEnable		= array();
 	
 	/**
 	 * Group settings to DISABLE
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $groupDisable		= array( 'g_mem_info', 'g_can_add_friends', 'g_email_friend' );
+	protected $groupDisable		= array( 'g_mem_info', 'g_can_add_friends' );
 	
 	/**
 	 * Other stuff to do...(custom coded)
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $otherDisable		= array( 'module__disable_pms', 'module__disable_online', 'disable_calendar', 'disable_hooks' );
+	protected $otherDisable		= array( 'module__disable_pms', 'module__disable_online', 'disable_calendar', 'disable_hooks' );
 	
 	/**
 	 * HTML object
 	 *
-	 * @access	private
 	 * @var		object
-	 **/
-	private $html;
+	 */
+	protected $html;
 	
 	/**
 	 * Current performance settings
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $current		= array();
+	protected $current		= array();
 
 	/**#@+
 	 * URL bits
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $form_code		= '';
@@ -95,9 +87,8 @@ class admin_core_tools_performance extends ipsCommand
 	/**
 	 * Main entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -133,8 +124,7 @@ class admin_core_tools_performance extends ipsCommand
 	/**
 	 * Toggle on/off
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 * @author	Brandon
 	 */
 	public function toggle()
@@ -255,12 +245,12 @@ class admin_core_tools_performance extends ipsCommand
 							if( $app['app_directory'] == 'calendar' )
 							{
 								$stored['other']['disable_calendar']	= $app['app_enabled'];
+
+								$this->DB->update( 'core_applications', array( 'app_enabled' => 0 ), "app_directory='calendar'" );
+								$results[]	= $this->lang->words['perf_discal'];
 								break;
 							}
 						}
-						
-						$this->DB->update( 'core_applications', array( 'app_enabled' => 0 ), "app_directory='calendar'" );
-						$results[]	= $this->lang->words['perf_discal'];
 					break;
 					
 					case 'disable_hooks':
@@ -382,7 +372,7 @@ class admin_core_tools_performance extends ipsCommand
 					case 'disable_calendar':
 						$previous	= $this->current['other']['disable_calendar'];
 						
-						if( $previous )
+						if( $previous && IPSLib::appIsInstalled('calendar') )
 						{
 							$this->DB->update( 'core_applications', array( 'app_enabled' => 1 ), "app_directory='calendar'" );
 							$results[]	= $this->lang->words['perf_encal'];
@@ -431,8 +421,7 @@ class admin_core_tools_performance extends ipsCommand
 	/**
 	 * List current status/data
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function overview()
 	{	
@@ -444,10 +433,9 @@ class admin_core_tools_performance extends ipsCommand
 	 * Retrieve current cached performance settings. 
 	 * Leaves array blank if currently "off"
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function getSettings()
+	protected function getSettings()
 	{
 		$record	= $this->cache->getCache('performanceCache');
 		
diff --git a/upload/admin/applications/core/modules_admin/tools/qanda.php b/upload/admin/applications/core/modules_admin/tools/qanda.php
index 8f4fc0d4..5a466eb7 100644
--- a/upload/admin/applications/core/modules_admin/tools/qanda.php
+++ b/upload/admin/applications/core/modules_admin/tools/qanda.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Registration question and answer challenges
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,17 +28,15 @@ class admin_core_tools_qanda extends ipsCommand
 	/**
 	 * HTML object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -74,16 +72,13 @@ class admin_core_tools_qanda extends ipsCommand
 			break;
 				
 			case 'remove':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'qa_remove' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'qa_manage' );
 				$this->remove();
 			break;
-			
-			case 'switchOn':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'qa_manage' );
-				$this->_switchOn();
+
 			case 'overview':
 			default:
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'qa_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'qanda_view' );
 				$this->overview();
 			break;
 		}
@@ -93,28 +88,10 @@ class admin_core_tools_qanda extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 
-	
-	/**
-	 * Toggles the setting 'registration_qanda'
-	 *
-	 * @access	private
-	 * @return	void
-	 * @author	Brandon
-	 */
-	private function _switchOn()
-	{
-		/* Switch it on */
-		IPSLib::updateSettings( array( 'registration_qanda' => 1 ) );
-		
-		/* Done */
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . $this->form_code );
-	}
-	
 	/**
 	 * Removes a question
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 * @author	Brandon
 	 */
 	public function remove()
@@ -138,8 +115,7 @@ class admin_core_tools_qanda extends ipsCommand
 	/**
 	 * List current questions
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function overview()
 	{
@@ -166,9 +142,8 @@ class admin_core_tools_qanda extends ipsCommand
 	/**
 	 * Form for adding/editing questions
 	 *
-	 * @access	public
 	 * @param	string		Type [new|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showForm( $type='new' )
 	{
@@ -211,7 +186,7 @@ class admin_core_tools_qanda extends ipsCommand
 		/* Form Elements */
 		$form = array();		
 		
-		$form['question']		= $this->registry->output->formTextarea( 'question', htmlspecialchars( $r['qa_question'], ENT_QUOTES ) );
+		$form['question']		= $this->registry->output->formInput( 'question', htmlspecialchars( $r['qa_question'], ENT_QUOTES ) );
 		$form['answers']		= $this->registry->output->formTextarea( 'answers', htmlspecialchars( $r['qa_answers'], ENT_QUOTES ) );
 
 		/* Ouput */	
@@ -221,9 +196,8 @@ class admin_core_tools_qanda extends ipsCommand
 	/**
 	 * Save the questions from the form
 	 *
-	 * @access	public
 	 * @param	string		Type [new|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveForm( $type='new' )
 	{
@@ -233,7 +207,11 @@ class admin_core_tools_qanda extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['qa_no_question'], 11150 );
 		}
 		
-		if( ! $this->request['answers'] )
+		//-----------------------------------------
+		// We use strlen so '0' is still supported
+		//-----------------------------------------
+		
+		if( !strlen($this->request['answers']) )
 		{
 			$this->registry->output->showError( $this->lang->words['qa_no_answer'], 11150 );
 		}		
diff --git a/upload/admin/applications/core/modules_admin/tools/rebuild.php b/upload/admin/applications/core/modules_admin/tools/rebuild.php
index 952aa48c..68ec1720 100644
--- a/upload/admin/applications/core/modules_admin/tools/rebuild.php
+++ b/upload/admin/applications/core/modules_admin/tools/rebuild.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Rebuild & Other Tools
- * Last Updated: $LastChangedDate: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7023 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9520 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,7 +29,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**#@+
 	 * URL bits
@@ -44,7 +44,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -117,11 +117,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 				$this->cleanAttachments();
 			break;
 
-			case 'cleanavatars':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_orphana' );
-				$this->cleanAvatars();
-			break;
-
 			case 'cleanphotos':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_orphanp' );
 				$this->cleanPhotos();
@@ -136,53 +131,59 @@ class admin_core_tools_rebuild  extends ipsCommand
 			// Tools
 			//-----------------------------------------
 			
+			case '320photos':
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
+				$this->tools320Photos();
+			break;
+			
 			case '300pms':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->tools300Pms();
 			break;
 			
 			case '220tool_contacts':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->tools220Contacts();
 			break;
 
 			case '210polls':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->tools210Polls();
 			break;
 
 			case '210calevents':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->tools210Calevents();
 			break;
 
 			case '210tool_settings':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->tools210DupeSettings();
 			break;
 
 			case 'tool_settings':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->toolsDupeSettings();
 			break;
 
 			case 'tool_converge':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->toolsConverge();
 			break;
 
 			case 'tool_bansettings':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->toolBanSettings();
 			break;
 
 			case 'tools':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'tools_220' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'cleanup_manage' );
 				$this->toolsSplashScreen();
 			break;
 
 			case 'rebuild_overview':
 			default:
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'rebuild_manage' );
 				$this->rebuildSplashScreen();
 			break;
 		}
@@ -192,10 +193,121 @@ class admin_core_tools_rebuild  extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 	
+	/**
+	 * 3.2.x Tools: Convert photos
+	 *
+	 * @return	@e void
+	 */
+	public function tools320photos()
+	{
+		/* INIT */
+		$convertFrom	= $this->request['from'] == 'avatars' ? 'avatars' : 'photos';
+		$st				= intval($this->request['st']);
+		$did			= 0;
+		$each			= 200;
+
+		/* Photo library */
+		require_once( IPS_ROOT_PATH . 'sources/classes/member/photo.php' );/*noLibHook*/
+		$photo	= new classes_member_photo( $this->registry );
+
+		/* Loop over members */
+		$this->DB->build( array( 'select' => '*', 'from' => 'profile_portal', 'order' => 'pp_member_id ASC', 'limit' => array( $st, $each ) ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$did++;
+
+			$update	= array();
+			
+			if( $r['fb_photo'] )
+			{
+				$update['pp_photo_type']	= 'facebook';
+			}
+			else if( $r['tc_photo'] )
+			{
+				$update['pp_photo_type']	= 'twitter';
+			}
+			else
+			{
+				if( $convertFrom == 'avatars' )
+				{
+					if( $r['avatar_type'] == 'upload' AND $r['avatar_location'] )
+					{
+						$update['pp_photo_type']	= 'custom';
+						$update['pp_main_photo']	= $r['avatar_location'];
+						$_dims						= @getimagesize( $this->settings['upload_dir'] . '/' . $r['avatar_location'] );
+						$update['pp_main_width']	= $_dims[0];
+						$update['pp_main_height']	= $_dims[1];
+					}
+					else if( $r['avatar_type'] == 'gravatar' )
+					{
+						$update['pp_photo_type']	= 'gravatar';
+						$update['pp_gravatar']		= $r['avatar_location'];
+						
+						$md5Gravatar = md5( $update['pp_gravatar'] );
+						
+						$_url	= "http://www.gravatar.com";
+						
+						if( $this->registry->output->isHTTPS )
+						{
+							$_url	= "https://secure.gravatar.com";
+						}
+						
+						$update['pp_main_photo']	= $_url . "/avatar/" .$md5Gravatar . "?s=100";
+						$update['pp_main_width']	= 100;
+						$update['pp_main_height']	= 100;
+						$update['pp_thumb_photo']	= $_url . "/avatar/" .$md5Gravatar . "?s=100";
+						$update['pp_thumb_width']	= 100;
+						$update['pp_thumb_height']	= 100;
+					}
+				}
+				else
+				{
+					if( $r['pp_main_photo'] )
+					{
+						$update['pp_photo_type']	= 'custom';
+						$update['pp_main_photo']	= $r['pp_main_photo'];
+					}
+				}
+			}
+			
+			if( $update['pp_photo_type'] == 'custom' )
+			{
+				$info	= $photo->buildSizedPhotos( str_replace( 'upload:', '', $update['pp_main_photo'] ), $r['pp_member_id'], true );
+
+				$update['pp_main_width']	= intval( $info['final_width'] );
+				$update['pp_main_height']	= intval( $info['final_height'] );
+				$update['pp_thumb_photo']	= $info['t_final_location'] ? $info['t_final_location'] : $info['final_location'];
+				$update['pp_thumb_width']	= intval( $info['t_final_width'] );
+				$update['pp_thumb_height']	= intval( $info['t_final_height'] );
+			}
+			
+			if( count($update) )
+			{
+				$this->DB->update( 'profile_portal', $update, 'pp_member_id=' . $r['pp_member_id'] );
+			}
+		}
+
+		/* Show message and redirect */
+		if( $did > 0 )
+		{
+			$this->request['st']		= ( $st + $did );
+			
+			$url  = "{$this->settings['base_url']}{$this->form_code}&do=" . $this->request['do'] . '&from=' . $this->request['from'] . '&st=' . $this->request['st'];
+			
+			$this->_specialRedirect( $url, sprintf( $this->lang->words['tools320photos'], $this->request['st'], $did ) );
+		}
+		else
+		{
+			$this->registry->output->redirect( $this->settings['base_url'] . $this->form_code . '&do=tools', $this->lang->words['re_photosconverted'] );
+		}
+	}
+	
 	/**
 	 * 3.0.x Tools: PM Conversion
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tools300pms()
 	{
@@ -302,7 +414,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 				/* Build invited - does not include 'to' person */
 				if ( $data['mt_owner_id'] AND ( $post['msg_author_id'] != $data['mt_owner_id'] ) AND ( $topicData['mt_to_id'] != $data['mt_owner_id'] ) )
 				{
-					$_invited[ $data['mt_owner_id'] ] = $data['mt_owner_id'];
+					$_invited[ $data['mt_owner_id'] ] = $data['mt_owner_id'];/*noLibHook*/
 				}
 				
 				$_isSent  = ( $data['mt_vid_folder'] == 'sent' )   ? 1 : 0;
@@ -376,34 +488,25 @@ class admin_core_tools_rebuild  extends ipsCommand
 		if ( $seen )
 		{
 			$this->request['st'] = $start + $pergo;
-			
-			/* We did some, go check again.. */
-			$this->registry->output->global_message = sprintf( $this->lang->words['tools300pms'], $this->request['st'], $converted );
-			
+
 			/* Re-do Page */
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do=".$this->request['do'].'&st=' . $this->request['st'];
+			
+			$this->_specialRedirect( $url, sprintf( $this->lang->words['tools300pms'], $this->request['st'], $converted ) );
 		}
 		else
 		{
 			/* Update all members */
 			$this->DB->update( 'members', array( 'msg_count_reset' => 1 ) );
-			
-			$this->registry->output->global_message = $this->lang->words['re_pmsconverted'];
 
-			$url  = "{$this->settings['base_url']}{$this->form_code}&do=tools";
+			$this->registry->output->redirect( "{$this->settings['base_url']}{$this->form_code}&do=tools", $this->lang->words['re_pmsconverted'], 1 );
 		}
-		
-		//-----------------------------------------
-		// Bye....
-		//-----------------------------------------
-
-		$this->registry->output->redirect( $url, $this->registry->output->global_message, 1 );
 	}
 
 	/**
 	 * Tools: Ban Settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function toolBanSettings()
 	{
@@ -433,7 +536,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 		// Get $INFO (again) ip email name
 		//-----------------------------------------
 		$INFO = array();
-		require( DOC_IPS_ROOT_PATH."conf_global.php" );
+		require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 
 		//-----------------------------------------
 		// IP
@@ -511,7 +614,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	/**
 	 * 2.0.0 Tools: Converge
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function toolsConverge()
 	{
@@ -554,7 +657,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	/**
 	 * 2.0.0 Tools: Dupe Settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function toolsDupeSettings()
 	{
@@ -583,7 +686,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		if ( count( $title_id_to_delete ) )
 		{
-			$this->DB->buildAndFetch( array( 'delete' => 'conf_settings_titles', 'where' => 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' ) );
+			$this->DB->delete( 'conf_settings_titles', 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' );
 		}
 
 		$title_deleted_count = intval( count($title_id_to_delete) );
@@ -613,7 +716,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		if ( count( $setting_id_to_delete ) )
 		{
-			$this->DB->buildAndFetch( array( 'delete' => 'conf_settings', 'where' => 'conf_id IN ('.implode( ',', $setting_id_to_delete ).')' ) );
+			$this->DB->delete( 'conf_settings', 'conf_id IN ('.implode( ',', $setting_id_to_delete ).')' );
 		}
 
 		$setting_deleted_count = intval( count($setting_id_to_delete) );
@@ -629,7 +732,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	/**
 	 * 2.1.0 Tools: Dupe Settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tools210DupeSettings()
 	{
@@ -678,7 +781,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	/**
 	 * 2.1.0 Tools: Calendar Events
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tools210Calevents()
 	{
@@ -806,13 +909,13 @@ class admin_core_tools_rebuild  extends ipsCommand
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $this->registry->output->global_message, 1 );
+		$this->registry->output->redirect( $url, $this->registry->output->global_message );
 	}
 
 	/**
 	 * 2.1.0 Tools: Polls
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tools210Polls()
 	{
@@ -956,14 +1059,14 @@ class admin_core_tools_rebuild  extends ipsCommand
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $this->registry->output->global_message, 1 );
+		$this->registry->output->redirect( $url, $this->registry->output->global_message );
 	}
 
 	/**
 	 * 2.2.0 Tools: Contacts
 	 * DEPRECATED
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function tools220Contacts()
 	{
@@ -1065,13 +1168,13 @@ class admin_core_tools_rebuild  extends ipsCommand
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $this->registry->output->global_message, 1 );
+		$this->registry->output->redirect( $url, $this->registry->output->global_message );
 	}
 
 	/**
 	 * Cleanup Tools Splash Screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function toolsSplashScreen()
 	{
@@ -1082,7 +1185,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 	/**
 	 * Count stats
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doCount()
 	{
@@ -1099,11 +1202,11 @@ class admin_core_tools_rebuild  extends ipsCommand
 		{
 			$topics = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as tcount',
 																 	 'from'   => 'topics',
-												 				 	 'where'  => 'approved=1' ) );
+												 				 	 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) ) );
 
 			$posts  = $this->DB->buildAndFetch( array( 'select' => 'SUM(posts) as replies',
 																	 'from'   => 'topics',
-																	 'where'  => 'approved=1' ) );
+																	 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) ) );
 
 			$stats['total_topics']  = $topics['tcount'];
 			$stats['total_replies'] = $posts['replies'];
@@ -1148,31 +1251,26 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['re_nothing'], 11155 );
 		}
 
-		$this->registry->output->global_message = $this->lang->words['re_statsrecount'];
-
-		$this->registry->output->doneScreen($this->lang->words['re_statsrecount'], $this->lang->words['re_statscenter'], "{$this->form_code}", 'redirect' );
+		$this->registry->output->global_message	= $this->lang->words['re_statsrecount'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 
 	/**
 	 * Clean out photos
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function cleanPhotos()
 	{
-		/* Upload Class */
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
-		$upload = new classUpload();
-
 		//-----------------------------------------
 		// Set up
 		//-----------------------------------------
 
-		$done   = 0;
-		$start  = intval($this->request['st']) >=0 ? intval($this->request['st']) : 0;
-		$end    = intval( $this->request['pergo'] ) ? intval( $this->request['pergo'] ) : 100;
-		$display = $end + $start;
-		$output = array();
+		$done		= 0;
+		$start		= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
+		$end		= intval( $this->request['pergo'] ) ? intval( $this->request['pergo'] ) : 100;
+		$display	= $end + $start;
+		$output		= array();
 
 		//-----------------------------------------
 		// Pop open the directory and
@@ -1183,7 +1281,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 		
 		try
 		{
-			foreach( new DirectoryIterator( $this->settings['upload_dir']  ) as $file )
+			foreach( new DirectoryIterator( $this->settings['upload_dir'] . '/profile' ) as $file )
  			{
  				if ( strstr( $file->getFilename(), 'photo-' ) )
  				{
@@ -1240,7 +1338,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -1250,25 +1347,24 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $display );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$display}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
-	 * Clean out avatars
+	 * Clean out attachments
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function cleanAvatars()
+	public function cleanAttachments()
 	{
 		/* Upload Class */
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
+		require_once( IPS_KERNEL_PATH.'classUpload.php' );/*noLibHook*/
 		$upload = new classUpload();
 
 		//-----------------------------------------
@@ -1288,112 +1384,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		$i = 0;
 		
-		try
-		{
- 			foreach( new DirectoryIterator( $this->settings['upload_dir'] ) as $file )
- 			{
- 				if ( strstr( $file->getFilename(), 'av-' ) )
- 				{
- 					$fullfile = $this->settings['upload_dir'].'/'.$file->getFilename();
-        	
- 					$i++;
-        	
- 					//-----------------------------------------
- 					// Already started?
- 					//-----------------------------------------
-        	
- 					if ( $start > $i )
- 					{
- 						continue;
- 					}
-        	
- 					//-----------------------------------------
- 					// Done for this iteration?
- 					//-----------------------------------------
-        	
- 					if ( $i > $dis )
- 					{
- 						break;
- 					}
-        	
- 					//-----------------------------------------
- 					// Try and get attach row
- 					//-----------------------------------------
-        	
- 					$found = $this->DB->buildAndFetch( array( 'select' => 'pp_member_id', 'from' => 'profile_portal', 'where' => "avatar_location='{$file->getFilename()}' or avatar_location='upload:{$file->getFilename()}'" ) );
-        	
- 					if ( ! $found['pp_member_id'] )
- 					{
- 						@unlink( $fullfile );
- 						$output[] = "<span style='color:red'>{$this->lang->words['re_removedorph']} $file</span>";
- 					}
- 					else
- 					{
- 						$output[] = "<span style='color:gray'>{$this->lang->words['re_attachedok']} $file</span>";
- 					}
-				}
- 			}
-		} catch ( Exception $e ) {}
-
-		//-----------------------------------------
-		// Finish - or more?...
-		//-----------------------------------------
-
-		if ( $i < $dis)
-		{
-		 	//-----------------------------------------
-			// Done..
-			//-----------------------------------------
-
-			$text = $this->lang->words['re_rebuildcomplete'] . '<br />' . implode( "<br />", $output );
-			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
-		}
-		else
-		{
-			//-----------------------------------------
-			// More..
-			//-----------------------------------------
-			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
-			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
-			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
-		}
-
-		//-----------------------------------------
-		// Bye....
-		//-----------------------------------------
-
-		$this->registry->output->redirect( $url, $text, $time );
-	}
-
-	/**
-	 * Clean out attachments
-	 *
-	 * @return	void
-	 */
-	public function cleanAttachments()
-	{
-		/* Upload Class */
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
-		$upload = new classUpload();
-
-		//-----------------------------------------
-		// Set up
-		//-----------------------------------------
-
-		$done   = 0;
-		$start  = intval($this->request['st']) >=0 ? intval($this->request['st']) : 0;
-		$end    = intval( $this->request['pergo'] ) ? intval( $this->request['pergo'] ) : 100;
-		$dis    = $end + $start;
-		$output = array();
-
-		//-----------------------------------------
-		// Pop open the directory and
-		// peek inside...
-		//-----------------------------------------
-
-		$i = 0;
 		try
 		{
  			foreach( new DirectoryIterator( $this->settings['upload_dir'] ) as $file )
@@ -1458,6 +1448,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 							}
 						}
     				} catch ( Exception $e ) {}
+    				
 					closedir( $ndh );
 				}
  				else if ( strstr( $file, 'post-' ) )
@@ -1511,37 +1502,35 @@ class admin_core_tools_rebuild  extends ipsCommand
 			// Done..
 			//-----------------------------------------
 
-			$text = $this->lang->words['re_rebuidcomp'] . '<br />' . implode( "<br />", $output );
+			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
 			//-----------------------------------------
 			// More..
 			//-----------------------------------------
-			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
-			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
+
+			$text = sprintf( $this->lang->words['re_thisgoeshere'], $dis ) . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Rebuild Attachment Data
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildAttachdata()
 	{
 		/* Upload Class */
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
+		require_once( IPS_KERNEL_PATH.'classUpload.php' );/*noLibHook*/
 		$upload = new classUpload();
 
 		//-----------------------------------------
@@ -1580,11 +1569,11 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$update = array();
 
-			$update['attach_ext'] = $upload->_getFileExtension( $r['attach_file'] );
+			$update['attach_ext'] = IPSText::getFileExtension( $r['attach_file'] );
 
 			if ( $r['attach_location'] )
 			{
-				if ( file_exists( $this->settings['upload_dir'].'/'.$r['attach_location'] ) )
+				if ( is_file( $this->settings['upload_dir'].'/'.$r['attach_location'] ) )
 				{
 					$update['attach_filesize'] = @filesize( $this->settings['upload_dir'].'/'.$r['attach_location'] );
 
@@ -1621,7 +1610,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -1631,26 +1619,25 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Rebuild Photos
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildPhotos()
 	{
 		/* Image Class */
-		require_once( IPS_KERNEL_PATH . 'classImage.php' );
-		require_once( IPS_KERNEL_PATH . 'classImageGd.php' );
+		$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+		$photoClass = new $classToLoad( $this->registry );
 
 		//-----------------------------------------
 		// Set up
@@ -1682,47 +1669,36 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		while( $r = $this->DB->fetch( $outer ) )
 		{
-			if ( $r['pp_thumb_photo'] and ( $r['pp_thumb_photo'] != $r['pp_main_photo'] ) )
+			/* Preserve FB, Twitter and Gravatar photos */
+			if( $r['pp_photo_type'] != 'custom' )
 			{
-				if ( file_exists( $this->settings['upload_dir'].'/'.$r['pp_thumb_photo'] ) )
-				{
-					if ( ! @unlink( $this->settings['upload_dir'].'/'.$r['pp_thumb_photo'] ) )
-					{
-						$output[] = $this->lang->words['re_noremove'].$r['pp_thumb_photo'];
-						continue;
-					}
-				}
-			}
-			
-			if( !file_exists( $this->settings['upload_dir'] . '/' . $r['pp_main_photo'] ) )
-			{
-				$output[] = $this->lang->words['re_noresizefound'] . $r['pp_main_photo'];
 				continue;
 			}
 
-			$photo_data = array();
-			$thumb_data = array();
+			$update = array();
+						
+			$info	= $photoClass->buildSizedPhotos( str_replace( 'upload:', '', $r['pp_main_photo'] ), $r['pp_member_id'], true );
 
-			$image = new classImageGd();
-
-			$image->init( array( 'image_path' => $this->settings['upload_dir'], 'image_file' => $r['pp_main_photo'] ) );
-
-			$thumb_data = $image->resizeImage( 50, 50 );
-			$image->writeImage( $this->settings['upload_dir'] . '/' . $r['pp_thumb_photo'] );
-
-			$photo_data['pp_thumb_width']   = intval($thumb_data['newWidth']);
-			$photo_data['pp_thumb_height']  = intval($thumb_data['newHeight']);
-			$photo_data['pp_thumb_photo'] 	= $r['pp_thumb_photo'];
-
-			if ( count( $photo_data ) )
+			if( $info['status'] == 'missing_image' )
 			{
-				$this->DB->update( 'profile_portal', $photo_data, 'pp_member_id='.$r['pp_member_id'] );
-
-				$output[] = $this->lang->words['re_resized'].$r['pp_main_photo'];
+				$update['pp_main_photo']	= '';
+				$update['pp_main_width']	= 0;
+				$update['pp_main_height']	= 0;
+				$update['pp_thumb_photo']	= '';
+				$update['pp_thumb_width']	= 0;
+				$update['pp_thumb_height']	= 0;
+			}
+			else
+			{
+				$update['pp_main_width']	= intval( $info['final_width'] );
+				$update['pp_main_height']	= intval( $info['final_height'] );
+				$update['pp_thumb_photo']	= $info['t_final_location'] ? $info['t_final_location'] : $info['final_location'];
+				$update['pp_thumb_width']	= intval( $info['t_final_width'] );
+				$update['pp_thumb_height']	= intval( $info['t_final_height'] );
 			}
 
-			unset($image);
-
+			$this->DB->update( 'profile_portal', $update, 'pp_member_id=' . $r['pp_member_id'] );
+			
 			$done++;
 		}
 
@@ -1738,7 +1714,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -1748,25 +1723,24 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Rebuild Post Thumbnails
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildThumbnails()
 	{
-		require_once( IPS_KERNEL_PATH . 'classImage.php' );
-		require_once( IPS_KERNEL_PATH . 'classImageGd.php' );
+		require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+		require_once( IPS_KERNEL_PATH . 'classImageGd.php' );/*noLibHook*/
 
 		//-----------------------------------------
 		// Set up
@@ -1802,19 +1776,20 @@ class admin_core_tools_rebuild  extends ipsCommand
 			{
 				if ( $r['attach_thumb_location'] and ( $r['attach_thumb_location'] != $r['attach_location'] ) )
 				{
-					if ( file_exists( $this->settings['upload_dir'].'/'.$r['attach_thumb_location'] ) )
+					if ( is_file( $this->settings['upload_dir'] . '/' . $r['attach_thumb_location'] ) )
 					{
-						if ( ! @unlink( $this->settings['upload_dir'].'/'.$r['attach_thumb_location'] ) )
+						if ( ! @unlink( $this->settings['upload_dir'] . '/' . $r['attach_thumb_location'] ) )
 						{
-							$output[] = $this->lang->words['re_noremove'].$r['attach_thumb_location'];
+							$r['attach_thumb_location']	= '';
+
+							$output[] = $this->lang->words['re_noremove'] . $r['attach_thumb_location'];
 							continue;
 						}
 					}
 				}
 
 				$attach_data	= array();
-				$thumbnail		= $r['attach_thumb_location'] ? $r['attach_thumb_location']
-									: preg_replace( "/^(.*)\.(.+?)$/", "\\1_thumb.\\2", $r['attach_location'] );
+				$thumbnail		= preg_replace( "/^(.*)\.(.+?)$/", "\\1_thumb.\\2", $r['attach_location'] );
 
 				$image = new classImageGd();
 
@@ -1823,18 +1798,25 @@ class admin_core_tools_rebuild  extends ipsCommand
 				                         'image_file'     => $r['attach_location'],
 				               )          );
 
+				$image->force_resize	= false;
+
 				$return = $image->resizeImage( $this->settings['siu_width'], $this->settings['siu_height'] );
-				$image->writeImage( $this->settings['upload_dir'] . '/' . $thumbnail );
+				
+				if( !$return['noResize'] )
+				{
+					$image->writeImage( $this->settings['upload_dir'] . '/' . $thumbnail );
+
+					$attach_data['attach_thumb_location'] = $thumbnail;
+				}
 
 				$attach_data['attach_thumb_width']    = intval($return['newWidth'] ? $return['newWidth'] : $image->cur_dimensions['width']);
 				$attach_data['attach_thumb_height']   = intval($return['newHeight'] ? $return['newHeight'] : $image->cur_dimensions['height']);
-				$attach_data['attach_thumb_location'] = $thumbnail;
 
 				if ( count( $attach_data ) )
 				{
 					$this->DB->update( 'attachments', $attach_data, 'attach_id='.$r['attach_id'] );
 
-					$output[] = $this->lang->words['re_resized'].$r['attach_location'];
+					$output[] = $this->lang->words['re_resized'] . $r['attach_location'];
 				}
 
 				unset($image);
@@ -1855,7 +1837,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -1865,20 +1846,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 	
 	/**
 	 * Rebuild Messenger Totals
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildMsgCounts()
 	{
@@ -1938,7 +1918,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -1948,20 +1927,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Rebuild Post Count
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildPostCount()
 	{
@@ -2009,15 +1987,17 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		while( $r = $this->DB->fetch( $outer ) )
 		{
+			$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+
 			if ( ! count( $forums ) )
 			{
-				$count = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'posts', 'where' => 'queued != 1 AND author_id='.$r['member_id'] ) );
+				$count = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'posts p', 'where' => $_queued . ' AND p.author_id=' . $r['member_id'] ) );
 			}
 			else
 			{
 				$this->DB->build( array( 'select' 	=> 'count(p.pid) as count',
 														 'from'		=> array( 'posts' => 'p' ),
-														 'where'	=> 'p.queued <> 1 AND p.author_id='.$r['member_id'].' AND t.forum_id NOT IN ('.implode(",",$forums).')',
+														 'where'	=> $_queued . ' AND p.author_id=' . $r['member_id'] . ' AND t.forum_id NOT IN (' . implode( ",", $forums ) . ')',
 														 'add_join'	=> array( 1 => array( 'type'	=> 'left',
 														 								  'from'	=> array( 'topics' => 't' ),
 														 								  'where'	=> 't.tid=p.topic_id'
@@ -2047,7 +2027,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -2057,20 +2036,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 	
 	/**
 	 * Rebuild Seo User Names
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildSeoUserNames()
 	{
@@ -2120,7 +2098,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -2130,21 +2107,20 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 	
 	
 	/**
 	 * Rebuild Post Names
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildPostNames()
 	{
@@ -2197,7 +2173,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -2207,20 +2182,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Rebuild posts
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildPosts()
 	{
@@ -2266,7 +2240,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 		$output = array();
 		$plugin	= null;
 
-		$types	= array( 'posts', 'pms', 'cal', 'announce', 'sigs', 'aboutme', 'rules' );
+		$types	= array( 'posts', 'pms', 'announce', 'sigs', 'aboutme', 'rules' );
 		
 		foreach( ipsRegistry::$applications as $app_dir => $app_data )
 		{
@@ -2274,7 +2248,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 			// Retrieve the RSS links for the header
 			//-----------------------------------------
 		
-			if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php' ) )
+			if( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php' ) )
 			{
 				$className = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php', 'postRebuild_'.$app_dir, $app_dir );
 				
@@ -2312,11 +2286,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		switch( $type )
 		{
-			case 'cal':
-				$tmp = $this->DB->buildAndFetch( array( 'select' => 'event_id', 'from' => 'cal_events', 'limit' => array($dis,1)  ) );
-				$max = intval( $tmp['event_id'] );
-			break;
-
 			case 'announce':
 				$tmp = $this->DB->buildAndFetch( array( 'select' => 'announce_id', 'from' => 'announcements', 'limit' => array($dis,1)  ) );
 				$max = intval( $tmp['announce_id'] );
@@ -2359,20 +2328,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 		switch( $type )
 		{
-			case 'cal':
-				$this->DB->build( array( 'select' 	=> 'e.*',
-														 'from' 	=> array( 'cal_events' => 'e' ),
-														 'order' 	=> 'e.event_id ASC',
-														 'where'	=> 'e.event_id > ' . $start,
-														 'limit' 	=> array($end),
-														 'add_join'	=> array( 	1 => array( 'type'		=> 'left',
-														  									'select'	=> 'm.member_group_id, m.mgroup_others',
-														  								  	'from'		=> array( 'members' => 'm' ),
-														  								  	'where' 	=> "m.member_id=e.event_member_id"
-														  						)	)
-												) 		);
-			break;
-
 			case 'announce':
 				$this->DB->build( array( 'select' 	=> 'a.*',
 														 'from' 	=> array( 'announcements' => 'a' ),
@@ -2463,8 +2418,23 @@ class admin_core_tools_rebuild  extends ipsCommand
 		// Process...
 		//-----------------------------------------
 
+		/* On mssql, the select query blocks all the updates.  Doing this causes the engine not to lock */
+		if ( method_exists( $this->DB, 'setQueryRowLocking' ) )
+		{
+			$this->DB->setQueryRowLocking( 'OFF' );
+		}
+		
 		while( $r = $this->DB->fetch( $outer ) )
 		{
+			//-----------------------------------------
+			// Group
+			//-----------------------------------------
+			
+			if( $r['member_group_id'] )
+			{
+				$r	= array_merge( $r, $this->caches['group_cache'][ $r['member_group_id'] ] );
+			}
+
 			//-----------------------------------------
 			// Reset
 			//-----------------------------------------
@@ -2481,15 +2451,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			switch( $type )
 			{
-				case 'cal':
-					$parser->parse_smilies	= $oldparser->parse_smilies	= $r['event_smilies'];
-					$parser->parse_html		= $oldparser->parse_html	= 0;
-					$parser->parse_bbcode	= $oldparser->parse_bbcode	= 1;
-					$parser->parsing_section		= 'calendar';
-
-					$rawpost = $oldparser->preEditParse( $r['event_content'] );
-				break;
-
 				case 'announce':
 					$parser->parse_smilies	= $oldparser->parse_smilies	= 1;
 					$parser->parse_html		= $oldparser->parse_html	= $r['announce_html_enabled'];
@@ -2502,8 +2463,8 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 				case 'pms':
 					$parser->parse_smilies	= $oldparser->parse_smilies	= 1;
-					$parser->parse_html		= $oldparser->parse_html	= $this->settings['msg_allow_html'];
-					$parser->parse_bbcode	= $oldparser->parse_bbcode	= $this->settings['msg_allow_code'];
+					$parser->parse_html		= $oldparser->parse_html	= $r['g_dohtml'];
+					$parser->parse_bbcode	= $oldparser->parse_bbcode	= 1;
 					$parser->parse_nl2br	= $oldparser->parse_nl2br	= 1;
 					$parser->parsing_section		= 'pms';
 
@@ -2512,8 +2473,8 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 				case 'sigs':
 					$parser->parse_smilies	= $oldparser->parse_smilies	= 0;
-					$parser->parse_html		= $oldparser->parse_html	= $this->settings['sig_allow_html'];
-					$parser->parse_bbcode	= $oldparser->parse_bbcode	= $this->settings['sig_allow_ibc'];
+					$parser->parse_html		= $oldparser->parse_html	= $r['g_dohtml'];
+					$parser->parse_bbcode	= $oldparser->parse_bbcode	= 1;
 					$parser->parse_nl2br	= $oldparser->parse_nl2br	= 1;
 					$parser->parsing_section		= 'signatures';
 
@@ -2521,9 +2482,9 @@ class admin_core_tools_rebuild  extends ipsCommand
 				break;
 
 				case 'aboutme':
-					$parser->parse_smilies	= $oldparser->parse_smilies	= $this->settings['aboutme_emoticons'];
-					$parser->parse_html		= $oldparser->parse_html	= intval($this->settings['aboutme_html']);
-					$parser->parse_bbcode	= $oldparser->parse_bbcode	= $this->settings['aboutme_bbcode'];
+					$parser->parse_smilies	= $oldparser->parse_smilies	= 1;
+					$parser->parse_html		= $oldparser->parse_html	= $r['g_dohtml'];
+					$parser->parse_bbcode	= $oldparser->parse_bbcode	= 1;
 					$parser->parse_nl2br	= $oldparser->parse_nl2br	= 1;
 					$parser->parsing_section		= 'aboutme';
 
@@ -2532,9 +2493,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 				case 'posts':
 					$parser->parse_smilies	= $oldparser->parse_smilies	= $r['use_emo'];
-					$parser->parse_html		= $oldparser->parse_html	= ( $this->registry->class_forums->forum_by_id[ $r['forum_id'] ]['use_html'] AND
-																		   $this->caches['group_cache'][ $r['member_group_id'] ]['g_dohtml'] AND
-																		   $r['post_htmlstate'] > 0 ) ? 1 : 0;
+					$parser->parse_html		= $oldparser->parse_html	= ( $this->registry->class_forums->forum_by_id[ $r['forum_id'] ]['use_html'] AND $r['g_dohtml'] AND $r['post_htmlstate'] > 0 ) ? 1 : 0;
 					$parser->parse_bbcode	= $oldparser->parse_bbcode	= $this->registry->class_forums->forum_by_id[ $r['forum_id'] ]['use_ibc'];
 					$parser->parse_nl2br	= $oldparser->parse_nl2br	= ( $r['post_htmlstate'] != 1 ) ? 1 : 0;
 					$parser->parsing_section		= 'topics';
@@ -2623,11 +2582,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 						$last = $r['pp_member_id'];
 					break;
 
-					case 'cal':
-						$this->DB->update( 'cal_events', array( 'event_content' => $newpost ), 'event_id='.$r['event_id'] );
-						$last = $r['event_id'];
-					break;
-
 					case 'announce':
 						$this->DB->update( 'announcements', array( 'announce_post' => $newpost ), 'announce_id='.$r['announce_id'] );
 						$last = $r['announce_id'];
@@ -2647,6 +2601,11 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$done++;
 		}
 
+		if ( method_exists( $this->DB, 'setQueryRowLocking' ) )
+		{
+			$this->DB->setQueryRowLocking( 'ON' );
+		}
+		
 		//-----------------------------------------
 		// Finish - or more?...
 		//-----------------------------------------
@@ -2659,7 +2618,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 
 			$sections[]	= $type;
 			$this->DB->replace( 'cache_store', array( 'cs_key' => 'isRebuilt', 'cs_value' => implode( ',', $sections ) ), array( "cs_key" ) );
@@ -2683,20 +2641,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&type={$type}&pergo={$this->request['pergo']}&st={$last}&dis={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Resyncronize Topics
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function resyncTopics()
 	{
@@ -2757,7 +2714,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -2767,20 +2723,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Resyncronize forum data
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function resyncForums()
 	{
@@ -2834,7 +2789,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 
 			$text = $this->lang->words['re_rebuildcomp'] . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}";
-			$time = 2;
 		}
 		else
 		{
@@ -2844,20 +2798,19 @@ class admin_core_tools_rebuild  extends ipsCommand
 			$thisgoeshere = sprintf( $this->lang->words['re_thisgoeshere'], $dis );
 			$text = $thisgoeshere . '<br />' . implode( "<br />", $output );
 			$url  = "{$this->settings['base_url']}{$this->form_code}&do={$this->request['do']}&pergo={$this->request['pergo']}&st={$dis}";
-			$time = 0;
 		}
 
 		//-----------------------------------------
 		// Bye....
 		//-----------------------------------------
 
-		$this->registry->output->redirect( $url, $text, $time );
+		$this->_specialRedirect( $url, $text );
 	}
 
 	/**
 	 * Splash screen with rebuild options
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildSplashScreen()
 	{
@@ -2876,7 +2829,6 @@ class admin_core_tools_rebuild  extends ipsCommand
 		$todo 		= array(
 							array( 'posts'	 , $this->lang->words['remenu_posts'] ),
 							array( 'pms'	 , $this->lang->words['remenu_pms'] ),
-							array( 'cal'	 , $this->lang->words['remenu_events'] ),
 							array( 'announce', $this->lang->words['remenu_announce'] ),
 							array( 'sigs'	 , $this->lang->words['remenu_sigs'] ),
 							array( 'aboutme' , $this->lang->words['remenu_aboutme'] ),
@@ -2889,7 +2841,7 @@ class admin_core_tools_rebuild  extends ipsCommand
 			// Retrieve the RSS links for the header
 			//-----------------------------------------
 		
-			if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php' ) )
+			if( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php' ) )
 			{
 				$className = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/upgradePostRebuild.php', 'postRebuild_'.$app_dir, $app_dir );
 				
@@ -2920,4 +2872,16 @@ class admin_core_tools_rebuild  extends ipsCommand
 		/* Output */
 		$this->registry->output->html           .= $this->html->rebuildSplashScreen( $form, $todo, $sections );
 	}
+	
+	/**
+	 * Redirect via a temporary page
+	 *
+	 * @param	string	$url	URL to redirect to
+	 * @param	string	$text	Text to display
+	 * @return	@e void
+	 */
+	protected function _specialRedirect( $url, $text )
+	{
+		$this->registry->output->html	.= $this->registry->output->global_template->temporaryRedirect( $url, $text );
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/sharelinks.php b/upload/admin/applications/core/modules_admin/tools/sharelinks.php
index 960b4b86..52c76dcc 100644
--- a/upload/admin/applications/core/modules_admin/tools/sharelinks.php
+++ b/upload/admin/applications/core/modules_admin/tools/sharelinks.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bookmarks
- * Last Updated: $LastChangedDate: 2010-01-15 15:18:44 +0000 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-07-01 08:57:21 -0400 (Fri, 01 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Blog
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 9140 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,27 +30,27 @@ class admin_core_tools_sharelinks extends ipsCommand
 	*
 	* @var		object			Skin templates
 	*/
-	private $html;
+	protected $html;
 	
 	/**
 	* Shortcut for url
 	*
 	* @var		string			URL shortcut
 	*/
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	* Shortcut for url (javascript)
 	*
 	* @var		string			JS URL shortcut
 	*/
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	* Main class entry point
 	*
 	* @param	object		ipsRegistry reference
-	* @return	void		[Outputs to screen]
+	* @return	@e void		[Outputs to screen]
 	*/	
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -110,9 +110,9 @@ class admin_core_tools_sharelinks extends ipsCommand
 	/**
 	 * Reorder
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function shareLinksReorder()
+	protected function shareLinksReorder()
 	{
 		/* AJAX Class */
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
@@ -149,7 +149,7 @@ class admin_core_tools_sharelinks extends ipsCommand
 	 * sharelinksDelete
 	 *
 	 * @return void
-	 **/	
+	 */	
 	function sharelinksDelete()
 	{
 		/* ID */
@@ -169,7 +169,7 @@ class admin_core_tools_sharelinks extends ipsCommand
 	 *
 	 * @param  string [$type='add']
 	 * @return void
-	 **/
+	 */
 	function sharelinksSave( $type='add' )
 	{
 		/* INI */
@@ -237,7 +237,7 @@ class admin_core_tools_sharelinks extends ipsCommand
 	 *
 	 * @param  string [$type='add']
 	 * @return void
-	 **/
+	 */
 	public function sharelinksForm( $type='add' )
 	{
 		/* Check form type */
@@ -269,10 +269,10 @@ class admin_core_tools_sharelinks extends ipsCommand
 			$data   = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_share_links', 'where' => "share_id={$id}" ) );
 
 			/* Set Defaults */
-			$data['share_title']		= ( isset( $this->request['share_title'] ) 		&& $this->request['share_title'] )		? $this->request['share_title']		: $data['share_title'];
-			$data['share_key']			= ( isset( $this->request['share_key'] )		&& $this->request['share_key'] )		? $this->request['share_key']		: $data['share_key'];
-			$data['share_enabled']		= ( isset( $this->request['share_enabled'] )	&& $this->request['share_enabled'] )	? $this->request['share_enabled']	: $data['share_enabled'];
-			$data['share_canonical']	= ( isset( $this->request['share_canonical'] )	&& $this->request['share_canonical'] )	? $this->request['share_canonical']	: $data['share_canonical'];
+			$data['share_title']		= !empty( $this->request['share_title'] )		? $this->request['share_title']		: $data['share_title'];
+			$data['share_key']			= !empty( $this->request['share_key'] )			? $this->request['share_key']		: $data['share_key'];
+			$data['share_enabled']		= !empty( $this->request['share_enabled'] )		? $this->request['share_enabled']	: $data['share_enabled'];
+			$data['share_canonical']	= !empty( $this->request['share_canonical'] )	? $this->request['share_canonical']	: $data['share_canonical'];
 		}
 		
 		/* Form Elements */
@@ -290,8 +290,8 @@ class admin_core_tools_sharelinks extends ipsCommand
 	 * List all the the current bookmark types
 	 *
 	 * @return void
-	 **/
-	private function _sharelinksIndex()
+	 */
+	protected function _sharelinksIndex()
 	{
 		/* Init */
 		$rows = array();
@@ -315,12 +315,13 @@ class admin_core_tools_sharelinks extends ipsCommand
 	/**
 	 * Recaches share links
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildCache()
 	{
 		/* INIT */
 		$cache = array();
+		$path  = IPS_ROOT_PATH . 'sources/classes/share/plugins/';
 		
 		/* Fetch */
 		$this->DB->build( array( 'select' => '*',
@@ -331,6 +332,19 @@ class admin_core_tools_sharelinks extends ipsCommand
 	
 		while( $row = $this->DB->fetch() )
 		{
+			$_file = $path . IPSText::alphanumericalClean( $row['share_key'] ) . '.php';
+			
+			if ( is_file( $_file ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $_file, 'sl_' . $row['share_key'] );
+				$test        = new $classToLoad( $this->registry );
+				
+				if ( method_exists( $test, 'customOutput' ) )
+				{
+					$row['customOutput'] = $test->customOutput();
+				}
+			}
+			
 			$cache[ $row['share_key'] ] = $row;
 		}
 		
diff --git a/upload/admin/applications/core/modules_admin/tools/uagents.php b/upload/admin/applications/core/modules_admin/tools/uagents.php
index 15e33f16..c47209bb 100644
--- a/upload/admin/applications/core/modules_admin/tools/uagents.php
+++ b/upload/admin/applications/core/modules_admin/tools/uagents.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * User agent management
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6995 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,14 +30,14 @@ class admin_core_tools_uagents extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * User agent functions
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $userAgentFunctions;
+	protected $userAgentFunctions;
 	
 	/**#@+
 	 * URL bits
@@ -52,7 +52,7 @@ class admin_core_tools_uagents extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -66,8 +66,8 @@ class admin_core_tools_uagents extends ipsCommand
 		// Set up stuff
 		//-----------------------------------------
 		
-		$this->form_code	= $this->html->form_code	= 'module=tools&amp;section=uagents';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=tools&section=uagents';
+		$this->form_code	= $this->html->form_code	= 'module=tools&amp;section=uagents&amp;';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=tools&section=uagents&';
 		
 		//-----------------------------------------
 		// Load lang
@@ -90,15 +90,15 @@ class admin_core_tools_uagents extends ipsCommand
 		{
 			case 'list':
 			default:
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'ua_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'uagents' );
 				$this->_listUagents();
 			break;
 			case 'reorder':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'ua_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'uagents' );
 				$this->_uagentsReorder();
 			break;			
 			case 'groupsList':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'ua_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'uagents' );
 				$this->_listGroups();
 			break;
 			case 'groupAdd':
@@ -122,7 +122,7 @@ class admin_core_tools_uagents extends ipsCommand
 				$this->_groupRemove();
 			break;
 			case 'rebuildMaster':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'ua_manage' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'uagents' );
 				$this->_rebuildMasterUserAgents();
 			break;
 		}
@@ -137,7 +137,7 @@ class admin_core_tools_uagents extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _groupRemove()
+	protected function _groupRemove()
 	{
 		//-----------------------------------------
 		// INIT
@@ -160,7 +160,7 @@ class admin_core_tools_uagents extends ipsCommand
 	 * @param	string 		Type of form to show (add/edit)
 	 * @return	string		HTML
 	 */
-	private function _groupSave( $type )
+	protected function _groupSave( $type )
 	{
 		//-----------------------------------------
 		// INIT
@@ -188,9 +188,9 @@ class admin_core_tools_uagents extends ipsCommand
 	 * Form type
 	 *
 	 * @param	string 		Type of form to show (add/edit)
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _groupForm( $type='' )
+	protected function _groupForm( $type='' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -252,9 +252,9 @@ class admin_core_tools_uagents extends ipsCommand
 	/**
 	 * List available user agent groups
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _listGroups()
+	protected function _listGroups()
 	{
 		//-----------------------------------------
 		// INIT
@@ -293,7 +293,7 @@ class admin_core_tools_uagents extends ipsCommand
 	 *
 	 * @return	string	HTML
 	 */
-	private function _rebuildMasterUserAgents()
+	protected function _rebuildMasterUserAgents()
 	{
 		$this->userAgentFunctions->rebuildMasterUserAgents();
 		
@@ -303,9 +303,9 @@ class admin_core_tools_uagents extends ipsCommand
 	/**
 	 * List available user agents
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _listUagents()
+	protected function _listUagents()
 	{
 		//-----------------------------------------
 		// INIT
@@ -335,9 +335,9 @@ class admin_core_tools_uagents extends ipsCommand
 	/**
 	 * Reorder useragents
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _uagentsReorder()
+	protected function _uagentsReorder()
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/modules_admin/tools/xml/index.html b/upload/admin/applications/core/modules_admin/tools/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_admin/tools/xml/index.html
+++ b/upload/admin/applications/core/modules_admin/tools/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_admin/tools/xml/menu.xml b/upload/admin/applications/core/modules_admin/tools/xml/menu.xml
index 92a474c5..21bf1ceb 100644
--- a/upload/admin/applications/core/modules_admin/tools/xml/menu.xml
+++ b/upload/admin/applications/core/modules_admin/tools/xml/menu.xml
@@ -2,17 +2,11 @@
 <menu>
 	<tabitems>
 		<item>
-			<title>Си�темные на�тройки</title>
+			<title>Режим производительно�ти</title>
 			<subitems>
-				<subitem>
-					<subitemtitle>В�е на�тройки</subitemtitle>
-					<subsection>settings</subsection>
-					<subitemurl>do=settingsview</subitemurl>
-					<subitemrolekey>settings_manage</subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
 				<subitem>
 					<subitemtitle>Режим производительно�ти</subitemtitle>
+					<subitemlang>performance</subitemlang>
 					<subsection>performance</subsection>
 					<subitemurl></subitemurl>
 					<subitemrolekey>performance_toggle</subitemrolekey>
@@ -20,50 +14,65 @@
 				</subitem>
 			</subitems>
 		</item>
+		<item>
+			<title>Ключ лицензии</title>
+			<subitems>
+				<subitem>
+					<subitemtitle>Ключ лицензии</subitemtitle>
+					<subitemlang>licensekey</subitemlang>
+					<subsection>licensekey</subsection>
+					<subitemurl></subitemurl>
+					<subitemrolekey>licensekey_manage</subitemrolekey>
+					<subisredirect>0</subisredirect>
+				</subitem>
+			</subitems>
+		</item>
 		<item>
 			<title>Управление User Agent</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Спи�ок User Agents</subitemtitle>
+					<subitemtitle>Управление User Agent</subitemtitle>
+					<subitemlang>uagents</subitemlang>
 					<subsection>uagents</subsection>
 					<subitemurl>do=list</subitemurl>
 					<subitemrolekey>uagents</subitemrolekey>
 					<subisredirect>0</subisredirect>
 					<subitemkeywords>spiders</subitemkeywords>
 				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок групп User Agent</subitemtitle>
-					<subsection>uagents</subsection>
-					<subitemurl>do=groupsList</subitemurl>
-					<subitemrolekey>uagents</subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
 			</subitems>
 		</item>
 		<item>
-			<title>Пере�чет и обновление</title>
+			<title>Пере�чет и пере�троение</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Ин�трументы пере�чета и обновлени�</subitemtitle>
+					<subitemtitle>Пере�чет и пере�троение</subitemtitle>
+					<subitemlang>recount_rebuild</subitemlang>
 					<subsection>rebuild</subsection>
 					<subitemurl>do=rebuild_overview</subitemurl>
 					<subitemrolekey>rebuild_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
+			</subitems>
+		</item>
+		<item>
+			<title>Ин�трументы очи�тки</title>
+			<subitems>
 				<subitem>
-					<subitemtitle>Ин�трументы очи�тки</subitemtitle>
+					<subitemtitle>И�нтрументы очи�тки</subitemtitle>
+					<subitemlang>cleanup_tools</subitemlang>
 					<subsection>rebuild</subsection>
 					<subitemurl>do=tools</subitemurl>
-					<subitemrolekey>recount_manage</subitemrolekey>
+					<subitemrolekey>cleanup_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
 		</item>
 		<item>
-			<title>Разделы помощи</title>
+			<title>Управление разделами помощи</title>
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление разделами помощи</subitemtitle>
+					<subitemlang>manage_help</subitemlang>
 					<subsection>help</subsection>
 					<subitemurl>do=help_overview</subitemurl>
 					<subitemrolekey>helpfiles_manage</subitemrolekey>
@@ -75,7 +84,8 @@
 			<title>Управление кешем</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Кеши �и�темы</subitemtitle>
+					<subitemtitle>Управление кешем</subitemtitle>
+					<subitemlang>caches</subitemlang>
 					<subsection>cache</subsection>
 					<subitemurl>do=cache_overview</subitemurl>
 					<subitemrolekey>cache_manage</subitemrolekey>
@@ -84,33 +94,37 @@
 			</subitems>
 		</item>
 		<item>
-			<title>Вопро�ы при реги�трации</title>
+			<title>Управление �и�темой «Вопро�-ответ»</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Спи�ок вопро�ов при реги�трации</subitemtitle>
+					<subitemtitle>Управление �и�темой «Вопро�-ответ»</subitemtitle>
+					<subitemlang>qanda</subitemlang>
 					<subsection>qanda</subsection>
 					<subitemurl></subitemurl>
-					<subitemrolekey>qanda_manage</subitemrolekey>
+					<subitemrolekey>qanda_view</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
 		</item>			
 		<item>
-			<title>�а�тройки API</title>
+			<title>Пользователи API</title>
 			<subitems>
 				<subitem>
 					<subitemtitle>Пользователи API</subitemtitle>
+					<subitemlang>api_users</subitemlang>
 					<subsection>api</subsection>
 					<subitemurl></subitemurl>
+					<subitemrolekey>api_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
 		</item>
 		<item>
-			<title>Модули авторизации</title>
+			<title>Управление модул�ми авторизации</title>
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление модул�ми авторизации</subitemtitle>
+					<subitemlang>login_modules</subitemlang>
 					<subsection>login</subsection>
 					<subitemurl>do=login_overview</subitemurl>
 					<subitemrolekey>login_manage</subitemrolekey>
@@ -118,38 +132,28 @@
 				</subitem>
 			</subitems>
 		</item>
-		<item>
-			<title>Си�темные журналы</title>
-			<subitems>
-				<subitem>
-					<subitemtitle>Спи�ок журналов</subitemtitle>
-					<subsection>logsSplash</subsection>
-					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-			</subitems>
-		</item>
 		<item>
 			<title>Серви�ы публикации ��ылок</title>
 			<subitems>
 				<subitem>
 					<subitemtitle>Серви�ы публикации ��ылок</subitemtitle>
+					<subitemlang>sharelinks</subitemlang>
 					<subsection>sharelinks</subsection>
 					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>sharelinks_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
 		</item>
 		<item>
-			<title>Правила вход�щих email</title>
+			<title>Правила вход�щей почты</title>
 			<subitems>
 				<subitem>
-					<subitemtitle>Правила вход�щих email</subitemtitle>
+					<subitemtitle>Правила вход�щей почты</subitemtitle>
+					<subitemlang>incoming_emails</subitemlang>
 					<subsection>incomingEmails</subsection>
 					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>incomingemail_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/core/modules_admin/tools/xml/permissions.xml b/upload/admin/applications/core/modules_admin/tools/xml/permissions.xml
index 1d9fded8..eb104e03 100644
--- a/upload/admin/applications/core/modules_admin/tools/xml/permissions.xml
+++ b/upload/admin/applications/core/modules_admin/tools/xml/permissions.xml
@@ -1,172 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <permissions>
 	<group>
-		<grouptitle>�а�тройки</grouptitle>
-		<items>
-			<item>
-				<key>settings_manage</key>
-				<string>Может измен�ть/добавл�ть на�тройки или группы на�троек?</string>
-			</item>
-			<item>
-				<key>settings_delete</key>
-				<string>Может удал�ть на�тройки или группы на�троек?</string>
-			</item>
-			<item>
-				<key>performance_toggle</key>
-				<string>Может управл�ть режимом производительно�ти?</string>
-			</item>
-		</items>
-	</group>
-	<group>
-		<grouptitle>Кеши</grouptitle>
+		<grouptitle>Управление кешем</grouptitle>
+		<grouplang>core_caches</grouplang>
 		<items>
 			<item>
 				<key>cache_manage</key>
-				<string>Может про�матривать и обновл�ть кеши?</string>
+				<string>Может по�матривать и обновл�ть кеш?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Методы авторизации</grouptitle>
+		<grouptitle>Управление модул�ми авторизации</grouptitle>
+		<grouplang>core_login_modules</grouplang>
 		<items>
 			<item>
 				<key>login_manage</key>
-				<string>Может управл�ть методами авторизации?</string>
+				<string>Может управл�ть модул�ми авторизации?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Си�тема вопро�ов и ответов</grouptitle>
+		<grouptitle>Си�тема вопро�ов при реги�трации</grouptitle>
+		<grouplang>core_qanda</grouplang>
 		<items>
 			<item>
-				<key>qanda_manage</key>
-				<string>Может про�матривать �пи�ок вопро�ов и ответов?</string>
+				<key>qanda_view</key>
+				<string>Может про�матривать?</string>
 			</item>
 			<item>
 				<key>qa_manage</key>
-				<string>Может добавл�ть/измен�ть вопро�ы и ответы?</string>
-			</item>
-			<item>
-				<key>qa_remove</key>
-				<string>Может удал�ть вопро�ы и ответы?</string>
+				<string>Может измен�ть, добавл�ть и удал�ть?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Разделы помощи</grouptitle>
+		<grouptitle>Управление разделами помощи</grouptitle>
+		<grouplang>core_helpfiles</grouplang>
 		<items>
 			<item>
 				<key>helpfiles_manage</key>
-				<string>Может про�матривать разделы помощи?</string>
+				<string>Может про�матривать?</string>
 			</item>
 			<item>
 				<key>help_manage</key>
-				<string>Может добавл�ть/измен�ть запи�и помощи?</string>
+				<string>Может измен�ть/добавл�ть?</string>
 			</item>
 			<item>
 				<key>help_remove</key>
-				<string>Может удал�ть запи�и помощи?</string>
+				<string>Может удал�ть?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>API</grouptitle>
+		<grouptitle>Пользователи API</grouptitle>
+		<grouplang>core_apiusers</grouplang>
 		<items>
 			<item>
 				<key>api_manage</key>
-				<string>Может добавл�ть/измен�ть API пользователей?</string>
+				<string>Может измен�ть/добавл�ть?</string>
 			</item>
 			<item>
 				<key>api_remove</key>
-				<string>Может удал�ть API пользователей?</string>
+				<string>Может удал�ть?</string>
 			</item>
 			<item>
 				<key>api_logs</key>
-				<string>Может про�матривать журнал API?</string>
+				<string>Может про�матривать логи?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>С�ылки публикации</grouptitle>
+		<grouptitle>Серви�ы публикации ��ылок</grouptitle>
+		<grouplang>core_sharelinks</grouplang>
 		<items>
 			<item>
 				<key>sharelinks_manage</key>
-				<string>Может добавл�ть/измен�ть/удал�ть ��ылки?</string>
-			</item>
-		</items>
-    </group>
-	<group>
-		<grouptitle>User Agents</grouptitle>
-		<items>
-			<item>
-				<key>uagents</key>
-				<string>Может про�матривать �пи�ок user agent?</string>
-			</item>
-			<item>
-				<key>ua_manage</key>
-				<string>Может добавл�ть/измен�ть user agent и их группы?</string>
-			</item>
-			<item>
-				<key>ua_remove</key>
-				<string>Может удал�ть user agent и их группы?</string>
+				<string>Может измен�ть/добавл�ть/удал�ть?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Ин�трументы очи�тки и обновлени�</grouptitle>
+		<grouptitle>Управление User Agents</grouptitle>
+		<grouplang>core_uagents</grouplang>
+		<items>
+			<item>
+				<key>uagents</key>
+				<string>Может управл�ть?</string>
+			</item>
+			<item>
+				<key>ua_manage</key>
+				<string>Может измен�ть/добавл�ть группы и агенты?</string>
+			</item>
+			<item>
+				<key>ua_remove</key>
+				<string>Может удал�ть группы и агенты?</string>
+			</item>
+		</items>
+	</group>
+	<group>
+		<grouptitle>Ин�трументы очи�тки и пере�троени�</grouptitle>
+		<grouplang>core_cleanuprebuild</grouplang>
 		<items>
 			<item>
 				<key>rebuild_manage</key>
-				<string>Имеет до�туп к ин�трументам обновлени�?</string>
+				<string>Имеет до�туп к ин�трументам пере�троени�?</string>
 			</item>
 			<item>
-				<key>recount_manage</key>
+				<key>cleanup_manage</key>
 				<string>Имеет до�туп к ин�трументам пере�чета?</string>
 			</item>
 			<item>
 				<key>tools_recount</key>
-				<string>Может запу�тить пере�чет �тати�тики форума?</string>
+				<string>Может производить пере�чет �тати�тики форума?</string>
 			</item>
 			<item>
 				<key>tools_resynch</key>
-				<string>Может запу�тить �инхронизацию форумов?</string>
+				<string>Может производить пере�чет �тати�тики форумов?</string>
 			</item>
 			<item>
 				<key>tools_resyncht</key>
-				<string>Может запу�тить �инхронизацию тем?</string>
+				<string>Может производить пере�чет �тати�тики тем?</string>
 			</item>
 			<item>
 				<key>tools_rebuild</key>
-				<string>Может запу�тить пере�троение �одержимого �ообщений?</string>
+				<string>Может производить пере�троение �одержимого �ообщений?</string>
 			</item>
 			<item>
 				<key>tools_postcounts</key>
-				<string>Может запу�тить обновление �четчиков �ообщений у пользоватлей?</string>
+				<string>Может производить пере�чет �ообщений пользователей?</string>
 			</item>
 			<item>
 				<key>tools_thumbs</key>
-				<string>Может запу�тить пере�троение ��кизов прикрепленных файлов?</string>
+				<string>Может производить обновление изображений предпро�мотра?</string>
 			</item>
 			<item>
 				<key>tools_attach</key>
-				<string>Может запу�тить обновление информации о прикрепленных файлов?</string>
+				<string>Может производить пере�троение прикреплений?</string>
 			</item>
 			<item>
 				<key>tools_orphaned</key>
-				<string>Может запу�тить удаление потер�нных прикрепленных файлов?</string>
-			</item>
-			<item>
-				<key>tools_orphana</key>
-				<string>Может запу�тить удаление потер�нных аватаров?</string>
+				<string>Может удал�ть потер�нные файлы?</string>
 			</item>
 			<item>
 				<key>tools_orphanp</key>
-				<string>Может запу�тить удаление потер�нных фотографий пользователей?</string>
+				<string>Может удал�ть потер�нные фотографии?</string>
 			</item>
+		</items>
+	</group>
+	<group>
+		<grouptitle>Правила вход�щей почты</grouptitle>
+		<grouplang>core_emailrules</grouplang>
+		<items>
 			<item>
-				<key>tools_220</key>
-				<string>Может запу�тить различные ин�трументы обновлени� и пере�чета дл� 2.1.x и 2.2.x?</string>
-			</item>			
+				<key>incomingemail_manage</key>
+				<string>Может управл�ть правилами?</string>
+			</item>
 		</items>
 	</group>
 </permissions>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/attach.php b/upload/admin/applications/core/modules_public/ajax/attach.php
new file mode 100644
index 00000000..dba8a868
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/attach.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @file		attach.php 	Provides ajax methods to switch uploader type
+ *
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-05-25 10:30:28 -0400 (Wed, 25 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8887 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_attach
+ * @brief		Provides ajax methods for the attach functions
+ */
+class public_core_ajax_attach extends ipsAjaxCommand
+{
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* Guest? */
+		if ( !$this->memberData['member_id'] )
+		{
+			$this->returnJsonError('no_permission');
+		}
+		
+		/* What to do? */
+		switch( $this->request['do'] )
+		{
+			case 'setPref':
+				$this->_setPref();
+				break;
+        }
+    }
+    
+	/**
+     * Sets uploader preference
+     *
+     * @return	@e void
+     */
+    protected function _setPref()
+    {
+    	/* Init */
+    	$uploader = ( $this->request['pref'] == 'flash' ) ? 'flash' : 'default';
+    
+    	IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'member_uploader' => $uploader ) ) );
+    		
+ 		/* Fetch data */
+ 		return $this->returnJsonArray( array( 'status' => 'ok' ) );
+    }
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/captcha.php b/upload/admin/applications/core/modules_public/ajax/captcha.php
index 6dcbd9ec..ff4f329d 100644
--- a/upload/admin/applications/core/modules_public/ajax/captcha.php
+++ b/upload/admin/applications/core/modules_public/ajax/captcha.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Update captcha image
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.3
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,9 +29,8 @@ class public_core_ajax_captcha extends ipsAjaxCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -48,8 +47,7 @@ class public_core_ajax_captcha extends ipsAjaxCommand
 	/**
 	 * Refresh the captcha image
 	 *
-	 * @access	public
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function refresh()
 	{
diff --git a/upload/admin/applications/core/modules_public/ajax/comments.php b/upload/admin/applications/core/modules_public/ajax/comments.php
index 4bcf386e..2c43dade 100644
--- a/upload/admin/applications/core/modules_public/ajax/comments.php
+++ b/upload/admin/applications/core/modules_public/ajax/comments.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Image Ajax
- * Last Updated: $LastChangedDate: 2010-08-18 16:55:30 +0100 (Wed, 18 Aug 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-21 05:45:37 -0400 (Wed, 21 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Gallery
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6767 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9521 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -27,7 +27,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */	
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -35,7 +35,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 		$fromApp = trim( $this->request['fromApp'] );
 		
 		/* Init some data */
-		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );/*noLibHook*/
 		$this->_comments = classes_comments_bootstrap::controller( $fromApp );
 
 		/* What to do? */
@@ -65,7 +65,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
     /**
      * Moderate
      *
-     * @return	void
+     * @return	@e void
      */
     protected function _moderate()
     {
@@ -91,7 +91,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
     /**
 	 * Reply
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _fetchReply()
 	{
@@ -105,12 +105,18 @@ class public_core_ajax_comments extends ipsAjaxCommand
 			$this->returnString( 'error' );
 		}
 		
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
 		# Get Edit form
 		try
 		{
 			$html = $this->_comments->fetchReply( $parentId, $commentId, $this->memberData );
 
-			$this->returnString( $html );
+			$this->editor->setContent( $html, 'topics', true );
+		
+			$this->returnHtml( $this->editor->getContent() );
 		}
 		catch ( Exception $error )
 		{
@@ -122,7 +128,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 	/**
 	 * Deletes a comment
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _delete()
 	{
@@ -151,7 +157,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 	/**
 	 * Shows the edit box
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _showEdit()
 	{
@@ -183,7 +189,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 		/**
 	 * Saves the post
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _saveEdit()
 	{
@@ -214,7 +220,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 	/**
 	 * Add a comment via the magic and mystery of ajax
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _add()
 	{
@@ -226,8 +232,16 @@ class public_core_ajax_comments extends ipsAjaxCommand
 		{
 			try
 			{
-				$newCommentId = $this->_comments->add( $parentId, $_POST['Post'] );
-				return $this->returnHtml( $this->_comments->fetchFormattedSingle( $parentId, $newCommentId ) );
+				$newComment = $this->_comments->add( $parentId, $_POST['Post'] );
+				
+				if( $newComment['comment_approved'] )
+				{
+					return $this->returnHtml( $this->_comments->fetchFormattedSingle( $parentId, $newComment['comment_id'] ) );
+				}
+				else
+				{
+					$this->returnJsonError( 'comment_requires_approval' );
+				}	
 			}
 			catch( Exception $e )
 			{
@@ -236,7 +250,7 @@ class public_core_ajax_comments extends ipsAjaxCommand
 		}
 		else
 		{
-			$this->returnJsonError( 'no_permission');
+			$this->returnJsonError( 'no_permission' );
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/defaultSection.php b/upload/admin/applications/core/modules_public/ajax/defaultSection.php
index 053d4be8..68584462 100644
--- a/upload/admin/applications/core/modules_public/ajax/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/ajax/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default ajax section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'ajax' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'login';
\ No newline at end of file
+$DEFAULT_SECTION = 'login';
diff --git a/upload/admin/applications/core/modules_public/ajax/editor.php b/upload/admin/applications/core/modules_public/ajax/editor.php
new file mode 100644
index 00000000..48dc18ca
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/editor.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Handles ajax functions for IP.Board Text Editor
+ * Author: Matt "Matt Mecham" Mecham
+ * Last Updated: $LastChangedDate: 2011-09-26 10:20:55 -0400 (Mon, 26 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Gallery
+ * @link		http://hatynka.in
+ * @version		$Rev: 9547 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_core_ajax_editor extends ipsAjaxCommand
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */	
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* From App */
+		$autoSaveKey = trim( $this->request['autoSaveKey'] );
+		
+		if ( ! $autoSaveKey )
+		{
+			trigger_error( "Missing data in " . __FILE__ . ' ' . __LINE__ );
+		}
+		
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		/* What to do? */
+		switch( $this->request['do'] )
+		{
+			case 'autoSave':
+				$this->_autoSave( $autoSaveKey );
+			break;
+			case 'switch':
+				$this->_switch();
+			break;
+			case 'showSettings':
+				$this->_showSettings();
+			break;
+			case 'getEmoticons':
+				$this->_getEmoticons();
+			break;
+			case 'saveSettings':
+				$this->_saveSettings();
+			break;
+        }
+    }
+    
+    /**
+     * Show settings box
+     *
+     * @return	json
+     */
+    protected function _getEmoticons()
+    {
+    	return $this->returnJsonArray( $this->editor->fetchEmoticons( 250 ) );
+    }
+    
+    /**
+     * Show settings box
+     *
+     * @return	@e void
+     */
+    protected function _showSettings()
+    {
+    	$this->returnHtml( $this->registry->getClass('output')->getTemplate('editors')->editorSettings() );
+    }
+    
+	/**
+     * Save settings
+     *
+     * @return	@e void
+     */
+    protected function _saveSettings()
+    {
+    	if( !$this->memberData['member_id'] )
+    	{
+    		$this->returnJsonError( 'nopermission' );
+    	}
+    	
+    	$clearSavedContent  = intval( $this->request['clearSavedContent'] );
+    	$bw_cke_contextmenu = intval( $this->request['bw_cke_contextmenu'] );
+    	
+    	if ( $clearSavedContent )
+    	{
+    		$this->DB->delete( 'core_editor_autosave', 'eas_member_id=' . $this->memberData['member_id'] );
+    	}
+    	
+    	IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'bw_cke_contextmenu' => $bw_cke_contextmenu ) ) );
+    	$member = IPSMember::load( $this->memberData['member_id'] );
+    	
+    	
+    	/* return if no errors occurred */
+		return $this->returnJsonArray( array( 'status' => 'ok' ) );
+    }
+    
+	/**
+     * Switch between bbcode and rte on the fly, man
+     *
+     * @return	@e void
+     */
+    protected function _switch()
+    { 
+    	$content = $_POST['content'];
+    	
+    	IPSDebug::fireBug( 'info', array( 'Content received: ' . $content ) );
+    	
+		if ( $content )
+		{
+ 			$content = $this->editor->switchContent( $content, intval( $_POST['isRte'] ) );
+		}
+		
+		IPSDebug::fireBug( 'info', array( 'Content after conversion: ' . $content ) );
+		
+		/* return if no errors occurred */
+		return $this->returnString( $content );
+    }
+    
+	/**
+     * Show more dialogue
+     *
+     * @param	string		App
+     * @param 	string		Area
+     * @param	int			Relationship ID
+     * @return	@e void
+     */
+    protected function _autoSave( $autoSaveKey )
+    {
+		if ( $_POST['content'] && $autoSaveKey )
+		{
+ 			$this->editor->autoSave( $_POST['content'], $autoSaveKey );
+		}
+		
+		/* return if no errors occurred */
+		return $this->returnJsonArray( array( 'status' => 'ok' ) );
+    }
+    
+	
+}
diff --git a/upload/admin/applications/core/modules_public/ajax/facebook.php b/upload/admin/applications/core/modules_public/ajax/facebook.php
index ebd8d57f..c6025caf 100644
--- a/upload/admin/applications/core/modules_public/ajax/facebook.php
+++ b/upload/admin/applications/core/modules_public/ajax/facebook.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : AJAX login
- * Last Updated: $Date: 2010-01-25 11:58:04 -0500 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5747 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_core_ajax_facebook extends ipsAjaxCommand
 	/**
 	 * Login handler object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $han_login;
@@ -38,7 +37,6 @@ class public_core_ajax_facebook extends ipsAjaxCommand
 	/**
 	 * Flag : Logged in
 	 *
-	 * @access	protected
 	 * @var		boolean
 	 */
 	protected $logged_in		= false;
@@ -46,9 +44,8 @@ class public_core_ajax_facebook extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -68,10 +65,9 @@ class public_core_ajax_facebook extends ipsAjaxCommand
 	/**
 	 * Main AJAX log in routine
 	 *
-	 * @access	private
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
-	private function _getUserByFbId()
+	protected function _getUserByFbId()
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/modules_public/ajax/findnames.php b/upload/admin/applications/core/modules_public/ajax/findnames.php
index 3f024d3e..290b85da 100644
--- a/upload/admin/applications/core/modules_public/ajax/findnames.php
+++ b/upload/admin/applications/core/modules_public/ajax/findnames.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : AJAX Find Names functions
- * Last Updated: $Date: 2010-04-14 19:25:27 -0400 (Wed, 14 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6118 $
+ * @version		$Revision: 8644 $
  * @see			admin_core_ajax_findnames
  *
  */
@@ -31,9 +31,8 @@ class public_core_ajax_findnames extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -48,10 +47,9 @@ class public_core_ajax_findnames extends ipsAjaxCommand
 	/**
 	 * Returns possible matches for the string input
 	 *
-	 * @access	private
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */
-	private function _getMemberNames()
+	protected function _getMemberNames()
 	{
     	//-----------------------------------------
     	// INIT
@@ -97,10 +95,10 @@ class public_core_ajax_findnames extends ipsAjaxCommand
 		while( $r = $this->DB->fetch() )
 		{
 			$photo = IPSMember::buildProfilePhoto( $r );
-			$group = IPSLib::makeNameFormatted( '' , $r['member_group_id'] );
+			$group = IPSMember::makeNameFormatted( '' , $r['member_group_id'] );
 			$return[ $r['member_id'] ] = array( 'name' 	=> $r['members_display_name'],
 												'showas'=> '<strong>' . $r['members_display_name'] . '</strong> (' . $group . ')',
-												'img'	=> $photo['pp_thumb_photo'],
+												'img'	=> $photo['pp_mini_photo'],
 												'img_w'	=> $photo['pp_mini_width'],
 												'img_h'	=> $photo['pp_mini_height']
 											);
diff --git a/upload/admin/applications/core/modules_public/ajax/index.html b/upload/admin/applications/core/modules_public/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/ajax/index.html
+++ b/upload/admin/applications/core/modules_public/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/like.php b/upload/admin/applications/core/modules_public/ajax/like.php
index 6ff65489..c2727ed2 100644
--- a/upload/admin/applications/core/modules_public/ajax/like.php
+++ b/upload/admin/applications/core/modules_public/ajax/like.php
@@ -1,19 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Like Ajax
- * Last Updated: $LastChangedDate: 2010-08-18 16:55:30 +0100 (Wed, 18 Aug 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Gallery
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6767 $
- *
+ * @file		like.php 	Provides ajax methods for the central like/follow class
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9373 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -22,20 +17,25 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		public_core_ajax_like
+ * @brief		Provides ajax methods for the central like/follow class
+ */
 class public_core_ajax_like extends ipsAjaxCommand
 {
 	/**
-	 * Main class entry point
+	 * Main function executed automatically by the controller
 	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */	
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
 	public function doExecute( ipsRegistry $registry )
 	{
 		/* From App */
-		$app   = trim( $this->request['f_app'] );
-		$area  = trim( $this->request['f_area'] );
-		$relid = intval( $this->request['f_relid'] );
+		$app	= trim( $this->request['f_app'] );
+		$area	= trim( $this->request['f_area'] );
+		$relid	= intval( $this->request['f_relid'] );
 		
 		if ( ! $app OR ! $area OR empty( $relid ) )
 		{
@@ -43,7 +43,7 @@ class public_core_ajax_like extends ipsAjaxCommand
 		}
 		
 		/* Init some data */
-		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
 		$this->_like = classes_like::bootstrap( $app, $area );
 		
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_like' ), 'core' );
@@ -53,42 +53,38 @@ class public_core_ajax_like extends ipsAjaxCommand
 		{
 			case 'setDialogue':
 				$this->_setDialogue( $app, $area, $relid );
-			break;
+				break;
 			case 'save':
-				$this->_save( $app, $area, $relid );
-			break;
+				$this->_save( $relid );
+				break;
 			case 'unset':
-				$this->_unset( $app, $area, $relid );
-			break;
+				$this->_unset( $relid );
+				break;
 			case 'more':
-				$this->_more( $app, $area, $relid );
-			break;	
+				$this->_more( $relid );
+				break;	
         }
     }
     
 	/**
      * Show more dialogue
      *
-     * @param	string		App
-     * @param 	string		Area
-     * @param	int			Relationship ID
-     * @return	void
+     * @param	integer		$relid		Relationship ID
+     * @return	@e void
      */
-    protected function _more( $app, $area, $relid )
+    protected function _more( $relid )
     {   			
  		/* Fetch data */
  		return $this->returnHtml( $this->_like->render( 'more', $relid ) );
     }
     
 	/**
-     * Do unset
+     * Do unset like
      *
-     * @param	string		App
-     * @param 	string		Area
-     * @param	int			Relationship ID
-     * @return	void
+     * @param	integer		$relid		Relationship ID
+     * @return	@e void
      */
-    protected function _unset( $app, $area, $relid )
+    protected function _unset( $relid )
     {
 		if( !$this->memberData['member_id'] )
 		{
@@ -103,14 +99,12 @@ class public_core_ajax_like extends ipsAjaxCommand
     }
     
 	/**
-     * Save form
+     * Save like
      *
-     * @param	string		App
-     * @param 	string		Area
-     * @param	int			Relationship ID
-     * @return	void
+     * @param	integer		$relid		Relationship ID
+     * @return	@e void
      */
-    protected function _save( $app, $area, $relid )
+    protected function _save( $relid )
     {
 		if( !$this->memberData['member_id'] )
 		{
@@ -125,16 +119,17 @@ class public_core_ajax_like extends ipsAjaxCommand
  		$this->_like->add( $relid, $this->memberData['member_id'], array( 'like_notify_do' => $like_notify, 'like_notify_freq' => $like_freq ), $like_anon );
  		
  		/* Fetch data */
- 		return $this->returnHtml( $this->_like->render( 'summary', $relid ) );
+ 		return $this->returnHtml( $this->_like->render( 'summary', $relid ) ); 
+		/* This used to force response as UTF-8, but that caused this bug: @link http://community.invisionpower.com/tracker/issue-32255-character-conversion-bug-with-follow-this-x */
     }
     
     /**
      * Show set form
      *
-     * @param	string		App
-     * @param 	string		Area
-     * @param	int			Relationship ID
-     * @return	void
+     * @param	string		$app		Application
+     * @param 	string		$area		Area
+     * @param	integer		$relid		Relationship ID
+     * @return	@e void
      */
     protected function _setDialogue( $app, $area, $relid )
     {
@@ -147,5 +142,4 @@ class public_core_ajax_like extends ipsAjaxCommand
  		
  		return $this->returnHtml( $this->registry->getClass('output')->getTemplate('global_other')->likeSetDialogue( $app, $area, $relid, $data ) );
     }
-    
-}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/login.php b/upload/admin/applications/core/modules_public/ajax/login.php
index 670c9292..81bec3ad 100644
--- a/upload/admin/applications/core/modules_public/ajax/login.php
+++ b/upload/admin/applications/core/modules_public/ajax/login.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : AJAX login
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6995 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -43,7 +43,7 @@ class public_core_ajax_login extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -88,9 +88,9 @@ class public_core_ajax_login extends ipsAjaxCommand
 	/**
 	 * Authenticate a user, returns a JSON array
 	 *
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
-	private function _authenticateUser()
+	protected function _authenticateUser()
 	{
 		//-----------------------------------------
 		// INIT
@@ -117,9 +117,9 @@ class public_core_ajax_login extends ipsAjaxCommand
 	/**
 	 * Main AJAX log in routine
 	 *
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
-	private function _doLogIn()
+	protected function _doLogIn()
 	{
 		//-----------------------------------------
     	// Use central method
diff --git a/upload/admin/applications/core/modules_public/ajax/media.php b/upload/admin/applications/core/modules_public/ajax/media.php
new file mode 100644
index 00000000..2bc73e27
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/media.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Handles ajax functions for IP.Board Text Editor
+ * Author: Matt "Matt Mecham" Mecham
+ * Last Updated: $LastChangedDate: 2011-08-18 17:50:15 -0400 (Thu, 18 Aug 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Gallery
+ * @link		http://hatynka.in
+ * @version		$Rev: 9399 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_core_ajax_media extends ipsAjaxCommand
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */	
+	public function doExecute( ipsRegistry $registry )
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$this->lang->loadLanguageFile( array( 'public_editors' ), 'core' );
+
+		//-----------------------------------------
+		// Route action
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			case 'loadtab':
+				$this->_showTab();
+			break;
+
+			case 'show':
+			default:
+				$this->_showPane();
+			break;
+		}
+	}
+
+	/**
+	 * Show a tab
+	 *
+	 * @return	@e void
+	 */
+	protected function _showTab()
+	{
+		$app	= trim($this->request['tabapp']);
+		$plugin	= trim($this->request['tabplugin']);
+		$output	= '';
+		$string	= $this->convertAndMakeSafe( $this->request['search'], TRUE );
+		
+		if( $app AND is_file( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php' ) )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php', 'plugin_' . $app . '_' . $plugin, $app );
+			$_plugin		= new $classToLoad( $this->registry );
+			$output			= $_plugin->showTab( $string );
+		}
+		else
+		{
+			$output			= $this->registry->output->getTemplate('editors')->sharedMediaDefault();
+		}
+		
+		return $this->returnHtml( $output );
+	}
+
+	/**
+	 * Show the panel to select your media
+	 *
+	 * @return	@e void
+	 */
+	protected function _showPane()
+	{
+		//-----------------------------------------
+		// Loop through apps and collect tabs
+		//-----------------------------------------
+		
+		$_plugins	= array();
+		$_tabs		= array();
+
+		foreach( ipsRegistry::$applications as $application )
+		{
+			if( is_dir( IPSLib::getAppDir( $application['app_directory'] ) . '/extensions/sharedmedia' ) )
+			{
+				try
+				{
+					foreach( new DirectoryIterator( IPSLib::getAppDir( $application['app_directory'] ) . '/extensions/sharedmedia' ) as $file )
+					{
+						if( ! $file->isDot() && $file->isFile() )
+						{
+							if( preg_match( '/^plugin_(.+?)\.php$/', $file->getFileName(), $matches ) )
+							{
+								$classToLoad	= IPSLib::loadLibrary( $file->getPathName(), 'plugin_' . $application['app_directory'] . '_' . $matches[1], $application['app_directory'] );
+								$_plugins[ $application['app_directory'] ][ $matches[1] ]	= new $classToLoad( $this->registry );
+
+								if( $_plugins[ $application['app_directory'] ][ $matches[1] ]->getTab() )
+								{
+									$_tabs[]	= array( 'app' => $application['app_directory'], 'plugin' => $matches[1], 'title' => $_plugins[ $application['app_directory'] ][ $matches[1] ]->getTab() );
+								}
+							}
+						}
+					}
+				} catch ( Exception $e ) {}
+			}
+		}
+
+		return $this->returnJsonArray( array( 'html' => $this->registry->output->getTemplate('editors')->sharedMedia( $_tabs ) ) );
+	}
+
+}
diff --git a/upload/admin/applications/core/modules_public/ajax/modcp.php b/upload/admin/applications/core/modules_public/ajax/modcp.php
new file mode 100644
index 00000000..d9030c66
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/modcp.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @file		modcp.php 	Moderator control panel AJAX retrieve tab
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8644 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_modcp
+ * @brief		Moderator control panel
+ * 
+ */
+class public_core_ajax_modcp extends ipsAjaxCommand
+{	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Load basic things
+		//-----------------------------------------
+
+		$this->registry->class_localization->loadLanguageFile( array( 'public_modcp' ) );
+
+		//-----------------------------------------
+		// Which road are we going to take?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'index':
+				$this->_getTab();
+			break;
+			
+			case 'getmembers':
+				$this->_getMembers();
+			break;
+		}
+
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+
+		$this->registry->getClass('output')->addContent( $this->output );
+		$this->registry->output->sendOutput();
+	}
+	
+	/**
+	 * Returns possible matches for the string input
+	 *
+	 * @return	@e void		Outputs to screen
+	 */
+	protected function _getMembers()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+	
+		$name	= IPSText::convertUnicode( $this->convertAndMakeSafe( ipsRegistry::$request['name'], 0 ) );
+	
+		//-----------------------------------------
+		// Check length
+		//-----------------------------------------
+	
+		if ( IPSText::mbstrlen( $name ) < 3 )
+		{
+			$this->returnJsonError( 'requestTooShort' );
+		}
+	
+		//-----------------------------------------
+		// Try query...
+		//-----------------------------------------
+	
+		$this->DB->build( array( 'select'	=> 'm.members_display_name, m.member_id, m.members_seo_name',
+								 'from'	    => array( 'members' => 'm' ),
+								 'where'	=> "m.members_l_display_name LIKE '" . $this->DB->addSlashes( mb_strtolower( $name ) ) . "%'",
+								 'order'	=> $this->DB->buildLength( 'm.members_display_name' ) . ' ASC',
+								 'limit'	=> array( 0, 15 ),
+									 'add_join' => array( array( 'select' => 'p.*',
+														     'from'   => array( 'profile_portal' => 'p' ),
+														     'where'  => 'p.pp_member_id=m.member_id',
+														     'type'   => 'left' ) ) ) );
+		$this->DB->execute();
+	
+		//-----------------------------------------
+		// Got any results?
+		//-----------------------------------------
+	
+		if ( ! $this->DB->getTotalRows() )
+		{
+			$this->returnJsonArray( array( ) );
+		}
+	
+		$return = array();
+	
+		while( $r = $this->DB->fetch() )
+		{
+			$url	= $this->registry->output->buildSEOUrl( "app=core&amp;module=modcp&amp;section=editmember&amp;mid={$r['member_id']}", 'public' );
+			$photo	= IPSMember::buildProfilePhoto( $r );
+			$group	= IPSMember::makeNameFormatted( '' , $r['member_group_id'] );
+	
+			$return[ $r['member_id'] ] = array( 'name' 	=> $r['members_display_name'],
+												'showas'=> $r['members_display_name'],
+												'img'	=> $photo['pp_thumb_photo'],
+												'img_w'	=> $photo['pp_mini_width'],
+												'img_h'	=> $photo['pp_mini_height'],
+												'url'	=> $url,
+											);
+		}
+	
+		$this->returnJsonArray( $return );
+	}
+	
+	/**
+	 * Retrieve modcp tab based
+	 *
+	 * @return	@e void
+	 */
+	protected function _getTab()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		ipsRegistry::getAppClass( 'forums' );
+		
+		$app		= trim($this->request['fromapp']);
+		$plugin		= trim($this->request['tab']);
+		$moderator	= $this->registry->class_forums->getModerator();
+		$_output	= '';
+		
+		//-----------------------------------------
+		// Get plugin output
+		//-----------------------------------------
+
+		if( is_file( IPSLib::getAppDir( $app ) . '/extensions/modcp/plugin_' . $app . '_' . $plugin . '.php' ) )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/modcp/plugin_' . $app . '_' . $plugin . '.php', 'plugin_' . $app . '_' . $plugin, $app );
+			$_thisPlugin	= new $classToLoad( $this->registry );
+			
+			$_output		= $_thisPlugin->executePlugin( $moderator );
+		}
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		if( $_output )
+		{
+			$this->returnJsonArray( array( 'html' => $_output ) );
+		}
+		else
+		{
+			$this->returnJsonError( $this->lang->words['plugin_not_found'] );
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/navigation.php b/upload/admin/applications/core/modules_public/ajax/navigation.php
new file mode 100644
index 00000000..90ae65b3
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/navigation.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @file		navigation.php 	navigation AJAX retrieve (Matt Mecham)
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-04-27 19:56:50 -0400 (Wed, 27 Apr 2011) $
+ * @version		v3.2.3
+ * $Revision: 8514 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_navigation
+ * @brief		Navigation builder
+ * 
+ */
+class public_core_ajax_navigation extends ipsAjaxCommand
+{	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Set up */
+		$inapp = trim( $this->request['inapp'] );
+		$do    = ( ! empty( $this->request['do'] ) ) ? $this->request['do'] : 'all';
+		
+		/* Load navigation stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/navigation/build.php', 'classes_navigation_build' );
+		$navigation = new $classToLoad( $inapp );
+		
+		/* Show warning if offline */
+		if ( $this->settings['board_offline'] AND !$this->memberData['g_access_offline'] )
+		{
+			$row = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_key='offline_msg'" ) );
+			
+			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+			IPSText::getTextClass('bbcode')->parse_html			= 1;
+			IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
+			IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
+			IPSText::getTextClass('bbcode')->parsing_section	= 'global';
+			
+			$row['conf_value']	= IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $row['conf_value'] ) );
+
+			return $this->returnHtml( $this->registry->output->getTemplate( 'global_other' )->quickNavigationOffline( $row['conf_value'] ) );
+		}
+				
+		/* Return */
+		if ( $do == 'all' )
+		{
+			return $this->returnHtml( $this->registry->output->getTemplate( 'global_other' )->quickNavigationWrapper( $navigation->loadApplicationTabs(), $navigation->loadNavigationData(), $navigation->getApp() ) );
+		}
+		else
+		{
+			return $this->returnHtml( $this->registry->output->getTemplate( 'global_other' )->quickNavigationPanel( $navigation->loadNavigationData(), $navigation->getApp() ) );
+		}
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/notifications.php b/upload/admin/applications/core/modules_public/ajax/notifications.php
index bae41893..1a79b74a 100644
--- a/upload/admin/applications/core/modules_public/ajax/notifications.php
+++ b/upload/admin/applications/core/modules_public/ajax/notifications.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Notification AJAX methods
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-09-21 09:23:48 -0400 (Wed, 21 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9524 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_core_ajax_notifications extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -56,9 +55,8 @@ class public_core_ajax_notifications extends ipsAjaxCommand
 	/**
 	 * Retrieve next notification for user
 	 *
-	 * @access	protected
 	 * @param	string		Database order (asc/desc)
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
 	protected function getMoreNotifications( $dir='DESC' )
 	{
@@ -139,8 +137,7 @@ class public_core_ajax_notifications extends ipsAjaxCommand
 	/**
 	 * Retrieve user's last x notifications
 	 *
-	 * @access	protected
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
 	protected function getMyNotifications()
 	{
@@ -148,7 +145,7 @@ class public_core_ajax_notifications extends ipsAjaxCommand
 		// We logged in?
 		//-----------------------------------------
 		
-		if( !$this->memberData['member_id'] )
+		if ( ! $this->memberData['member_id'] )
 		{
 			$this->returnJsonError( $this->lang->words['notifylogin_error'] );
 		}
@@ -161,20 +158,18 @@ class public_core_ajax_notifications extends ipsAjaxCommand
 		$notifyLibrary		= new $classToLoad( $this->registry );
 		$notifyLibrary->setMember( $this->memberData );
 
-		$_data = $notifyLibrary->fetchUnreadNotifications( 10, 'notify_sent', 'DESC', false );
+		$_data = $notifyLibrary->fetchLatestNotifications( 10 );
 
 		//-----------------------------------------
 		// Now mark them all read
 		//-----------------------------------------
 		
-		$this->DB->update( 'inline_notifications', array( 'notify_read' => 1 ), 'notify_to_id=' . $this->memberData['member_id'] );
-		
-		$notifyLibrary->rebuildUnreadCount();
+		$notifyLibrary->markNotificationsAsReadByMemberId( $this->memberData['member_id'] );
 		
 		//-----------------------------------------
 		// Return results
 		//-----------------------------------------
 
-    	$this->returnJsonArray( array( 'html' => $this->registry->output->getTemplate('global_other')->notificationsList( $_data ) ) );
+    	$this->returnJsonArray( array( 'html' => $this->cleanOutput( $this->registry->output->getTemplate('global_other')->notificationsList( $_data ) ) ) );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/register.php b/upload/admin/applications/core/modules_public/ajax/register.php
index 78561048..8177977b 100644
--- a/upload/admin/applications/core/modules_public/ajax/register.php
+++ b/upload/admin/applications/core/modules_public/ajax/register.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Registration AJAX routines
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6995 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,7 +29,7 @@ class public_core_ajax_register extends ipsAjaxCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -50,7 +50,7 @@ class public_core_ajax_register extends ipsAjaxCommand
 	/**
 	 * Check the email address
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function checkEmail()
     {
@@ -136,7 +136,7 @@ class public_core_ajax_register extends ipsAjaxCommand
 	/**
 	 * Check the name or display name
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function checkDisplayName( $field='members_display_name' )
     {
diff --git a/upload/admin/applications/core/modules_public/ajax/reports.php b/upload/admin/applications/core/modules_public/ajax/reports.php
index b056638a..a6024afb 100644
--- a/upload/admin/applications/core/modules_public/ajax/reports.php
+++ b/upload/admin/applications/core/modules_public/ajax/reports.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reports AJAX options
- * Last Updated: $Date: 2010-10-19 10:40:05 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6995 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_core_ajax_reports extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -51,9 +51,9 @@ class public_core_ajax_reports extends ipsAjaxCommand
 	/**
 	 * Adds a rating to the index
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _changeStatus()
+	protected function _changeStatus()
 	{
 		//-----------------------------------------
 		// Get status's and flags
diff --git a/upload/admin/applications/core/modules_public/ajax/reputation.php b/upload/admin/applications/core/modules_public/ajax/reputation.php
index 5e4528d3..253840e8 100644
--- a/upload/admin/applications/core/modules_public/ajax/reputation.php
+++ b/upload/admin/applications/core/modules_public/ajax/reputation.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reputation
- * Last Updated: $Date: 2010-10-14 17:24:55 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6982 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_core_ajax_reputation extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -36,19 +36,97 @@ class public_core_ajax_reputation extends ipsAjaxCommand
 		switch( $this->request['do'] )
 		{
 			case 'add_rating':
-				$this->doRating();
+				$this->_doRating();
+			break;
+			
+			case 'more':
+				$this->_more();
+			break;
+			
+			case 'view':
+				$this->_viewRep();
 			break;
 		}
 		
 		exit();
 	}
 	
+	/**
+	 * Displays reputation popup
+	 *
+	 * @return	@e void
+	 */
+	protected function _viewRep()
+	{
+		$this->lang->loadLanguageFile( array( 'public_topic' ), 'forums' );
+		
+		if ( !$this->memberData['gbw_view_reps'] )
+		{
+			$this->returnJsonError('no_permission');
+		}
+
+		$repApp		= $this->request['repApp'];
+		$repType	= $this->request['repType'];
+		$repId		= intval($this->request['repId']);
+		
+		/* Get data */
+		$reps		= array();
+		$members	= array();
+
+		$this->DB->build( array(
+								'select'	=> 'member_id, rep_rating',
+								'from'		=> 'reputation_index',
+								'where'		=> "app='{$repApp}' AND type='{$repType}' AND type_id='{$repId}'",
+								'order'		=> 'rep_date',
+						)		);
+		$q = $this->DB->execute();
+
+		while ( $r = $this->DB->fetch( $q ) )
+		{
+			$reps[ $r['member_id'] ]	= $r;
+			$members[ $r['member_id'] ]	= $r['member_id'];
+		}
+		
+		if( count($members) AND count($reps) )
+		{
+			$_members	= IPSMember::load( $members );
+			
+			foreach( $reps as $memId => $repData )
+			{
+				$reps[ $memId ]['member']	= $_members[ $memId ];
+			}
+		}
+		
+		return $this->returnHtml( $this->registry->output->getTemplate('global_other')->reputationPopup( $reps ) );
+	}
+	
 	/**
 	 * Adds a rating to the index
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function doRating()
+	protected function _more()
+	{
+		$app   = trim( $this->request['f_app'] );
+		$type  = trim( $this->request['f_type'] );
+		$id    = intval( $this->request['f_id'] );
+		
+		/* Get the rep library */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
+		$repCache = new $classToLoad();
+		
+		/* Fetch members who have wanted to favorite this item */
+		$data = $repCache->getDataByRelationshipId( array( 'app' => $app, 'type' => $type, 'id' => $id, 'rating' => 1 ) );
+		
+		return $this->returnHtml( $this->registry->output->getTemplate( 'global_other' )->repMoreDialogue( $data, $id ) );
+	}
+	
+	/**
+	 * Adds a rating to the index
+	 *
+	 * @return	@e void
+	 */
+	protected function _doRating()
 	{
 		/* INIT */
 		$app     = $this->request['app_rate'];
@@ -67,12 +145,21 @@ class public_core_ajax_reputation extends ipsAjaxCommand
 		$repCache = new $classToLoad();
 		
 		/* Add the rating */
-		if( $repCache->addRate( $type, $type_id, $rating, '', 0, $app ) === false )
+		if ( $repCache->addRate( $type, $type_id, $rating, '', 0, $app ) !== false )
 		{
-			$this->returnString( $repCache->error_message );	
+			$formatted = $repCache->getLikeFormatted( array( 'id' => $type_id, 'app' => $app, 'type' => $type ) );
+			$current   = $repCache->getCurrentMemberRating( array( 'id' => $type_id, 'app' => $app, 'type' => $type, 'memberId' => $this->memberData['member_id'] ) );
+			$rating    = $repCache->getCurrentRating( array( 'id' => $type_id, 'app' => $app, 'type' => $type ) );
+			
+			$this->returnJsonArray( array( 'status' => 'ok', 'rating' => $rating, 'likeData' => $formatted, 'canRepUp' => IPSMember::canRepUp( $current, $this->memberData ), 'canRepDown' => IPSMember::canRepDown( $current, $this->memberData ) ) );	
 		}
 		else
 		{
+			if ( $repCache->error_message )
+			{
+				$this->returnJsonError( $repCache->error_message );
+			}
+			
 			$this->returnString( 'done' );
 		}
 	}
diff --git a/upload/admin/applications/core/modules_public/ajax/search.php b/upload/admin/applications/core/modules_public/ajax/search.php
new file mode 100644
index 00000000..223bd531
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/search.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @file		search.php 	AJAX configure VNC filters
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-05-25 10:30:28 -0400 (Wed, 25 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8887 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_search
+ * @brief		Search VNC configurator
+ * 
+ */
+class public_core_ajax_search extends ipsAjaxCommand
+{	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Get forums class
+		//-----------------------------------------
+		
+		if ( ! $this->registry->isClassLoaded('class_forums' ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+			$this->registry->getClass('class_forums')->strip_invisible = 1;
+			$this->registry->getClass('class_forums')->forumsInit();
+		}
+		
+		$this->lang->loadLanguageFile( array( 'public_search' ) );
+
+		//-----------------------------------------
+		// What to do?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'showForumsVncFilter':
+				$this->showForm();
+			break;
+			
+			case 'saveForumsVncFilter':
+				$this->saveForm();
+			break;
+		}
+	}
+
+	/**
+	 * Save the form to configure VNC forum filters
+	 *
+	 * @return	@e void
+	 */
+	public function saveForm()
+	{
+		$vncPrefs	= IPSMember::getFromMemberCache( $this->memberData, 'vncPrefs' );
+
+		/* Filter forums for VNC */
+		if( !empty($this->request['saveVncFilters']) )
+		{
+			$this->request['saveVncFilters']	= rtrim( $this->request['saveVncFilters'], ',' );
+			
+			if( $this->request['saveVncFilters'] == 'all' )
+			{
+				unset($vncPrefs['forums']['vnc_forum_filter']);
+			}
+			else if( strpos( $this->request['saveVncFilters'], ',' ) !== false )
+			{
+				$vncPrefs['forums']['vnc_forum_filter']	= explode( ',', $this->request['saveVncFilters'] );
+			}
+			else if( !empty($this->request['saveVncFilters']) )
+			{
+				$vncPrefs['forums']['vnc_forum_filter']	= array( $this->request['saveVncFilters'] );
+			}
+		}
+		
+		IPSMember::setToMemberCache( $this->memberData, array( 'vncPrefs' => $vncPrefs ) );
+		
+		$this->returnJsonArray( array( 'ok' => true ) );
+	}
+	
+	/**
+	 * Show the form to configure VNC forum filters
+	 *
+	 * @return	@e void
+	 */
+	public function showForm()
+	{
+		$_data		= $this->_getData();
+		$vncPrefs	= IPSMember::getFromMemberCache( $this->memberData, 'vncPrefs' );
+		$fFP		= $vncPrefs == null ? null : ( empty($vncPrefs['forums']['vnc_forum_filter']) ? null : $vncPrefs['forums']['vnc_forum_filter'] );
+		
+		$this->returnHtml( $this->registry->output->getTemplate('search')->forumsVncFilters( $_data, $fFP ) );
+	}
+
+	/**
+	 * Fetches forum jump data
+	 *
+	 * @return	string
+	 */
+	private function _getData()
+	{
+		$depth_guide = 0;
+		$links		 = array();
+		
+		if( is_array($this->registry->class_forums->forum_cache['root'] ) AND count($this->registry->class_forums->forum_cache['root'] ) )
+		{
+			foreach($this->registry->class_forums->forum_cache['root'] as $forum_data )
+			{
+				if ( $forum_data['sub_can_post'] or ( isset($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) AND is_array($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) AND count($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) ) )
+				{
+					$forum_data['redirect_on'] = isset( $forum_data['redirect_on'] ) ? $forum_data['redirect_on'] : 0;
+					
+					if ( $forum_data['redirect_on'] == 1 )
+					{
+						continue;
+					}
+					
+					$links[] = array( 'important' => true, 'depth' => $depth_guide, 'title' => $forum_data['name'], 'id' => $forum_data['id'] );
+					
+					if ( isset($this->registry->class_forums->forum_cache[ $forum_data['id'] ]) AND is_array($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) )
+					{
+						$depth_guide++;
+						
+						foreach($this->registry->class_forums->forum_cache[ $forum_data['id'] ] as $forum_data )
+						{
+							if ( $forum_data['redirect_on'] == 1 )
+							{
+								continue;
+							}						
+						
+							$links[] = array( 'depth' => $depth_guide, 'title' => $forum_data['name'], 'id' => $forum_data['id'] );
+					
+							$links = $this->_getDataRecursively( $forum_data['id'], $links, $depth_guide );			
+						}
+						
+						$depth_guide--;
+					}
+				}
+			}
+		}
+		
+		return $links;
+	}
+	
+	/**
+	 * Internal helper function for forumsForumJump
+	 *
+	 * @param	integer	$root_id
+	 * @param	array	$links
+	 * @param	string	$depth_guide
+	 * @return	string
+	 */
+	private function _getDataRecursively( $root_id, $links=array(), $depth_guide=0 )
+	{
+		if ( isset( $this->registry->class_forums->forum_cache[ $root_id ] ) AND is_array($this->registry->class_forums->forum_cache[ $root_id ] ) )
+		{
+			$depth_guide++;
+			
+			foreach($this->registry->class_forums->forum_cache[ $root_id ] as $forum_data )
+			{
+				if ( $forum_data['redirect_on'] == 1 )
+				{
+					continue;
+				}
+				
+				$links[] = array( 'depth' => $depth_guide, 'title' => $forum_data['name'], 'id' => $forum_data['id'] );
+				
+				$links = $this->_getDataRecursively( $forum_data['id'], $links, $depth_guide );
+			}
+		}
+
+		return $links;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/sharelinks.php b/upload/admin/applications/core/modules_public/ajax/sharelinks.php
index a384c639..2c92ef23 100644
--- a/upload/admin/applications/core/modules_public/ajax/sharelinks.php
+++ b/upload/admin/applications/core/modules_public/ajax/sharelinks.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX Sharelinks
- * Last Updated: $Date: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-09-08 03:56:43 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Revision: 6997 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9465 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -56,16 +56,16 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 	/**
 	 * Displays a form of facebook stuff. It's really that exciting.
 	 *
-	 * @return	void		[Outputs HTML to browser AJAX call]
+	 * @return	@e void		[Outputs HTML to browser AJAX call]
 	 */
-	private function _facebookForm()
+	protected function _facebookForm()
 	{
 		/* Ensure we have a twitter account and that */
 		if ( $this->memberData['member_id'] AND $this->memberData['fb_uid'] AND $this->memberData['fb_token'] )
 		{
 			/* Connect to the Facebook */
-			require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-			$connect = new facebook_connect( $this->registry );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$connect	 = new $classToLoad( $this->registry );
 			
 			try
 			{
@@ -80,22 +80,23 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 		}
 		else
 		{
-			/* Bog off @todo probably grab the URL and doc title and forward to normal twitter.com/submit link */
-			$this->returnHtml( 'x' );
+			/* Oh go on then */
+			$this->returnHtml( $this->registry->output->getTemplate('global_other')->facebookPop( array() ) );
 		}
 	}
 	
 	/**
 	 * Go go Facebook go
 	 * 
-	 * @return	void		[Outputs HTML to browser AJAX call]
+	 * @return	@e void		[Outputs HTML to browser AJAX call]
 	 */
-	private function _facebookGo()
+	protected function _facebookGo()
 	{
 		/* INIT */
 		$comment = trim( urldecode( $_POST['comment'] ) );
 		$url     = trim( urldecode( $_POST['url'] ) );
 		$title   = trim( urldecode( $_POST['title'] ) );
+		$comment = ( $comment == $this->lang->words['fb_share_default'] ) ? '' : $comment;
 		
 		/* Ensure title is correctly de-html-ized */
 		$title = IPSText::UNhtmlspecialchars( $title );
@@ -104,8 +105,8 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 		if ( $this->memberData['member_id'] AND $this->memberData['fb_uid'] AND $this->memberData['fb_token'] )
 		{
 			/* Connect to the Facebook */
-			require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-			$connect = new facebook_connect( $this->registry );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$connect	 = new $classToLoad( $this->registry );
 			
 			try
 			{
@@ -144,9 +145,9 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 	/**
 	 * Go go twitter go
 	 * 
-	 * @return	void		[Outputs HTML to browser AJAX call]
+	 * @return	@e void		[Outputs HTML to browser AJAX call]
 	 */
-	private function _twitterGo()
+	protected function _twitterGo()
 	{
 		/* INIT */
 		$tweet = trim( urldecode( $_POST['tweet'] ) );
@@ -160,8 +161,8 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 		if ( $this->memberData['member_id'] AND $this->memberData['twitter_id'] AND $this->memberData['twitter_token'] AND $this->memberData['twitter_secret'] )
 		{
 			/* Connect to the twitter */
-			require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-			$connect = new twitter_connect( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+			$connect = new $classToLoad( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
 			$user    = $connect->fetchUserData();
 			
 			if ( $user['id'] )
@@ -200,16 +201,16 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 	/**
 	 * Displays a form of twitter stuff. It's really that exciting.
 	 *
-	 * @return	void		[Outputs HTML to browser AJAX call]
+	 * @return	@e void		[Outputs HTML to browser AJAX call]
 	 */
-	private function _twitterForm()
+	protected function _twitterForm()
 	{
 		/* Ensure we have a twitter account and that */
 		if ( $this->memberData['member_id'] AND $this->memberData['twitter_id'] AND $this->memberData['twitter_token'] AND $this->memberData['twitter_secret'] )
 		{
 			/* Connect to the twitter */
-			require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-			$connect = new twitter_connect( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+			$connect = new $classToLoad( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
 			$user    = $connect->fetchUserData();
 			
 			if ( $user['id'] )
@@ -218,13 +219,13 @@ class public_core_ajax_sharelinks extends ipsAjaxCommand
 			}
 			else
 			{
-				/* Bog off @todo probably grab the URL and doc title and forward to normal twitter.com/submit link */
-				$this->returnHtml( '.' );
+				/* Bog off */
+				$this->returnHtml( 'x' );
 			}
 		}
 		else
 		{
-			/* Bog off @todo probably grab the URL and doc title and forward to normal twitter.com/submit link */
+			/* Bog off */
 			$this->returnHtml( 'x' );
 		}
 	}
diff --git a/upload/admin/applications/core/modules_public/ajax/skingen.php b/upload/admin/applications/core/modules_public/ajax/skingen.php
new file mode 100644
index 00000000..2ee497d1
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/skingen.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Like Ajax
+ * Last Updated: $LastChangedDate: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Gallery
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_core_ajax_skingen extends ipsAjaxCommand
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */	
+	public function doExecute( ipsRegistry $registry )
+	{
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinGenerator.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinGenerator( $registry );
+		
+		/* What to do? */
+		switch( $this->request['do'] )
+		{
+			case 'save':
+				$this->_save();
+			break;
+        }
+    }
+    
+	/**
+     * Find tags
+     *
+     * @return	@e void
+     */
+    protected function _save()
+    {  
+    	/* Init */
+    	$storedClasses  = json_decode( $_POST['storedClasses'], true );
+    	$storedSettings = json_decode( $_POST['storedSettings'], true );
+    	$css			= $_POST['css'];
+    	
+    	/* Build it, ship it, wiggle your hips a bit */
+    	try
+    	{
+    		/* Apologies for the previous comment */
+    		$this->skinFunctions->resetMemberAndSwitchSkin( $this->memberData['member_id'] );
+    	
+    		$this->skinFunctions->save( array( 'css' => $css, 'storedSettings' => $storedSettings, 'storedClasses' => $storedClasses ), $this->memberData['member_id'] );
+    	}
+    	catch( Exception $e )
+    	{
+    		return $this->returnJsonArray( array('status' => 'error', 'msg' => $e->getMessage() ) );
+    	}
+    	
+    	/* Done */
+		return $this->returnJsonArray( array('status' => 'ok' ) );
+    }
+   
+}
diff --git a/upload/admin/applications/core/modules_public/ajax/tags.php b/upload/admin/applications/core/modules_public/ajax/tags.php
new file mode 100644
index 00000000..d1bed59d
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/tags.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Like Ajax
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Gallery
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_core_ajax_tags extends ipsAjaxCommand
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */	
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* What to do? */
+		switch( $this->request['do'] )
+		{
+			case 'find':
+				$this->_find();
+			break;
+        }
+    }
+    
+	/**
+     * Find tags
+     *
+     * @return	@e void
+     */
+    protected function _find()
+    {  
+    	/* init */
+    	$app 	  = $this->request['meta_app'];
+    	$area 	  = $this->request['meta_area'];
+    	$parentId = intval( $this->request['meta_parent_id'] );
+    	$metaId   = intval( $this->request['meta_id'] );
+    	$find     = trim( $this->request['find'] );
+		$tags     = array();
+		$sort	  = array();
+		
+    	/* Checks */
+    	if ( empty( $app ) OR empty( $area ) )
+    	{
+    		return $this->returnJsonArray( array() );
+    	}
+    	
+    	/* Init tags */	
+    	require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+		$tagClass = classes_tags_bootstrap::run( $app, $area );
+		
+		/* Get tags by whut */
+		if ( ! empty( $metaId ) )
+		{
+			$tags = $tagClass->getRawTagsByMetaId( $metaId, $find );
+		}
+		else if ( ! empty( $parentId ) )
+		{
+			$tags = $tagClass->getRawTagsByParentId( $parentId, $find );
+		}
+ 		
+		/* format */
+		if ( is_array( $tags ) && count( $tags ) )
+		{
+			foreach( $tags as $id => $t )
+			{
+				$sort[ strlen( $t['tag_text'] ) . '.' . md5( $t['tag_text'] ) ] = $t['tag_text'];
+			}
+		}
+		
+		ksort( $sort );
+		
+		return $this->returnJsonArray( array_values( $sort ) );
+		
+    }
+   
+}
diff --git a/upload/admin/applications/core/modules_public/ajax/templates.php b/upload/admin/applications/core/modules_public/ajax/templates.php
new file mode 100644
index 00000000..c060241d
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/ajax/templates.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @file		templates.php 	Retrieve a template bit
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
+ * @since		Friday 19th May 2006 17:33
+ * $LastChangedDate: 2011-05-03 04:53:04 -0400 (Tue, 03 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8588 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_templates
+ * @brief		Retrieve a template bit
+ *
+ */
+class public_core_ajax_templates extends ipsAjaxCommand
+{
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		//-----------------------------------------
+		// Fetch template bit
+		//-----------------------------------------
+		
+		$templateBit	= trim($this->request['template_bit']);
+		$group			= trim($this->request['template_group']);
+		$_lang 			= trim($this->request['lang_module']);
+		$_app			= trim($this->request['lang_app']);
+		
+		if( !$templateBit OR !$group )
+		{
+			$this->returnJsonError( $this->lang->words['missing_template_bit'] );
+		}
+		
+		$templateBit	= 'ajax__' . $templateBit;
+		
+		if( !is_object( $this->registry->output->getTemplate( $group ) ) OR !method_exists( $this->registry->output->getTemplate( $group ), $templateBit ) )
+		{
+			$this->returnJsonError( $this->lang->words['missing_template_bit'] );
+		}
+		
+		if( $_lang && $_app )
+		{
+			$this->registry->class_localization->loadLanguageFile( array( 'public_' . $_lang ), $_app );
+		}
+		
+		$this->returnJsonArray( array( 'html' => $this->registry->output->getTemplate( $group )->$templateBit() ), true );
+    }
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/ajax/usercp.php b/upload/admin/applications/core/modules_public/ajax/usercp.php
index 04c7b610..6d950a25 100644
--- a/upload/admin/applications/core/modules_public/ajax/usercp.php
+++ b/upload/admin/applications/core/modules_public/ajax/usercp.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : AJAX UserCP functions
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_core_ajax_usercp extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -47,10 +46,9 @@ class public_core_ajax_usercp extends ipsAjaxCommand
 	/**
 	 * Checks a display name
 	 *
-	 * @access	private
-	 * @return	void		[Outputs JSON to browser AJAX call]
+	 * @return	@e void		[Outputs JSON to browser AJAX call]
 	 */
-	private function displayNameCheck()
+	protected function displayNameCheck()
 	{
 		//-----------------------------------------
     	// INIT
diff --git a/upload/admin/applications/core/modules_public/ajax/vkontakte.php b/upload/admin/applications/core/modules_public/ajax/vkontakte.php
deleted file mode 100644
index 084d6f88..00000000
--- a/upload/admin/applications/core/modules_public/ajax/vkontakte.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * Invision Power Services
- * IP.Board v3.1.0
- * Vkontakte auth : AJAX
- *
- * @author      $Author: giv $
- * @copyright   (c) 2010 IBResource, LTD.
- * @license     http://www.ibresource.ru/products/ipboard/
- * @package     IP.Board
- * @subpackage  Core
- * @since       1st June 2010 
- * @link        http://www.ibresource.ru
- * @version     $Rev: 6242 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-    print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-    exit();
-}
-
-class public_core_ajax_vkontakte extends ipsAjaxCommand 
-{
-    /**
-     * Login handler object
-     *
-     * @access  protected
-     * @var     object
-     */
-    protected $han_login;
-    
-    /**
-     * Flag : Logged in
-     *
-     * @access  protected
-     * @var     boolean
-     */
-    protected $logged_in        = false;
-    
-    /**
-     * Class entry point
-     *
-     * @access  public
-     * @param   object      Registry reference
-     * @return  void        [Outputs to screen]
-     */
-    public function doExecute( ipsRegistry $registry ) 
-    {
-
-        /* What to do */
-        switch( $this->request['do'] )
-        {
-            case 'getUserByVkId':
-                $return = $this->_getUserByVkId();
-            break;
-        }
-        
-        /* Output */
-        $this->returnHtml( $return );
-    }
-        
-    /**
-     * Main AJAX log in routine
-     *
-     * @access  private
-     * @return  void        [Outputs JSON to browser AJAX call]
-     */
-    private function _getUserByVkId()
-    {
-        require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-        $vk = new Vkontakte_Request_Validator( $this->settings['vk_api_id'], $this->settings['vk_secret'] );
-        
-        //-----------------------------------------
-        // INIT
-        //-----------------------------------------
-        
-        $vkUid = is_numeric( $vk->mid ) ? $vk->mid : -1;
-        $member = array( 'member_id' => 0 );
-        
-        if ( $vkUid )
-        {
-            $_mid = $this->DB->buildAndFetch( array( 'select' => 'member_id',
-                                                     'from'   => 'members',
-                                                     'where'  => 'vk_uid=' . $vkUid ) );
-                                                    
-            if ( $_mid['member_id'] )
-            {
-                $member = IPSMember::load( $_mid['member_id'], 'all' );
-            }
-        }
-
-        /* Create validating account for the member */
-        $key = md5( uniqid( microtime() ) );
-        $member['key'] = $key;
-
-        if ( $vkUid == $this->request['id'] )
-        {
-            
-            $this->DB->delete( 'vkontakte_connect', 'v_id = ' . $vkUid );
-            
-            $name = IPSMember::getFunction()->cleanAndCheckName( $this->request['name'], array(), 'name' );
-            
-            $photo = '';
-            
-            if ( IPSText::xssCheckUrl( $this->request['photo'] ) && preg_match('~^http://.+?\.vkontakte\.ru/u' . $vkUid. '~is', $this->request['photo']))
-            {
-                $photo = $this->request['photo'];
-            }
-            
-            $this->DB->insert( 'vkontakte_connect', array( 'v_key'   => $key,
-                                                           'v_user'  => $name['username'],
-                                                           'v_data' => $photo,
-                                                           'v_id'   => $vkUid ) );
-                                                         
-        }
-        
-        $this->returnJsonArray( $member );
-    }
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/ajax/warn.php b/upload/admin/applications/core/modules_public/ajax/warn.php
similarity index 51%
rename from upload/admin/applications/members/modules_public/ajax/warn.php
rename to upload/admin/applications/core/modules_public/ajax/warn.php
index 405b1b95..bf48ac21 100644
--- a/upload/admin/applications/members/modules_public/ajax/warn.php
+++ b/upload/admin/applications/core/modules_public/ajax/warn.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Retrieve member warn log
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 7007 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,23 +23,24 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
-class public_members_ajax_warn extends ipsAjaxCommand 
+class public_core_ajax_warn extends ipsAjaxCommand 
 {
 	/**
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_mod' ), 'forums' );
-
-		if ( ! $this->settings['warn_on'] )
+		/* System disabled? */
+		if ( !$this->settings['warn_on'] )
 		{
+			$this->lang->loadLanguageFile( array( 'public_profile' ), 'members' );
 			$this->returnJsonError( $this->lang->words['ajax_no_warn'] );
 		}
 		
+		/* What to do? */
 		switch( $this->request['do'] )
 		{
 			case 'view':
@@ -51,24 +52,28 @@ class public_members_ajax_warn extends ipsAjaxCommand
 	/**
 	 * Retieve warn logs and return them
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
- 	private function _viewWarnLogs()
+ 	protected function _viewWarnLogs()
  	{
- 		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir('members') . '/modules_public/warn/warn.php', 'public_members_warn_warn' );
- 		$warn        = new $classToLoad();
+		/* Get library and load */
+ 		$classToLoad	= IPSLib::loadActionOverloader( IPSLib::getAppDir('core') . '/modules_public/modcp/editmember.php', 'public_core_modcp_editmember' );
+ 		$warn			= new $classToLoad();
 		$warn->makeRegistryShortcuts( $this->registry );
 		$warn->loadData();
 		
-		$warnHTML	= $warn->viewLog();
+		$this->lang->loadLanguageFile( array( 'public_modcp' ), 'core' );
 		
-		if ( !$warnHTML )
+		$warnHTML	= $warn->viewLog( true );
+		
+		if ( $warnHTML )
 		{
-			$this->returnJsonError( $this->lang->words['ajax_bad_html'] );
+			$this->returnHtml( $warnHTML );
 		}
 		else
 		{
-			$this->returnHtml( $this->registry->getClass('output')->getTemplate('mod')->warnLogsAjaxWrapper( $warnHTML ) );
+			$this->lang->loadLanguageFile( array( 'public_profile' ), 'members' );
+			$this->returnJsonError( $this->lang->words['ajax_bad_html'] );
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/attach/attach.php b/upload/admin/applications/core/modules_public/attach/attach.php
index 9598e0bc..c0f3711a 100644
--- a/upload/admin/applications/core/modules_public/attach/attach.php
+++ b/upload/admin/applications/core/modules_public/attach/attach.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachment Poster
- * Last Updated: $Date: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-09-07 14:34:13 -0400 (Wed, 07 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6997 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9462 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -42,7 +42,7 @@ class public_core_attach_attach extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -86,7 +86,7 @@ class public_core_attach_attach extends ipsCommand
 	/**
 	 * View Post Attachment
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showPostAttachment()
 	{
@@ -103,7 +103,7 @@ class public_core_attach_attach extends ipsCommand
 	/**
 	 * Remove an upload
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function attachmentUploadRemove()
 	{
@@ -137,7 +137,7 @@ class public_core_attach_attach extends ipsCommand
 	/**
 	 * Perform the actual upload
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function attachmentUploadProcess()
 	{
@@ -173,8 +173,8 @@ class public_core_attach_attach extends ipsCommand
 	 * @param	string	$msg
 	 * @param	bool	$is_error
 	 * @param	integer	$insert_id
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentUploadShow( $msg="ready", $is_error=0, $insert_id=0 )
 	{
 		/* INIT JSON */
@@ -278,7 +278,7 @@ class public_core_attach_attach extends ipsCommand
 		$JSON['attach_stats'] = $this->class_attach->attach_stats;
 		
 		/* Formatting nonsense for special char sets */
-		array_walk_recursive( $JSON, create_function( '&$value, $key', '$value = IPSText::convertCharsets($value, "' . IPS_DOC_CHAR_SET . '", "UTF-8");' ) ); 
+		array_walk_recursive( $JSON, array( 'IPSText', 'arrayWalkCallbackConvert' ) ); 
 		$result = json_encode( $JSON ); 
 		$result = IPSText::convertCharsets( $result, "UTF-8", IPS_DOC_CHAR_SET );
 
@@ -294,7 +294,7 @@ class public_core_attach_attach extends ipsCommand
 	 * @param	string	$msg
 	 * @param	bool	$is_error
 	 * @param	integer	$insert_id
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function attachiFrame( $msg="ready", $is_error=0, $insert_id=0 )
 	{
@@ -309,7 +309,7 @@ class public_core_attach_attach extends ipsCommand
 	/**
 	 * Perform the actual upload
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function attachUploadiFrame()
 	{
diff --git a/upload/admin/applications/core/modules_public/attach/defaultSection.php b/upload/admin/applications/core/modules_public/attach/defaultSection.php
index 580ab9c1..bbd060b0 100644
--- a/upload/admin/applications/core/modules_public/attach/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/attach/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default attachments section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'attach' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'attach';
\ No newline at end of file
+$DEFAULT_SECTION = 'attach';
diff --git a/upload/admin/applications/core/modules_public/attach/index.html b/upload/admin/applications/core/modules_public/attach/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/attach/index.html
+++ b/upload/admin/applications/core/modules_public/attach/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/global/captcha.php b/upload/admin/applications/core/modules_public/global/captcha.php
index eeb1b786..9c989f16 100644
--- a/upload/admin/applications/core/modules_public/global/captcha.php
+++ b/upload/admin/applications/core/modules_public/global/captcha.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Captcha
- * Last Updated: $Date: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6997 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,7 +29,7 @@ class public_core_global_captcha extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -53,16 +53,13 @@ class public_core_global_captcha extends ipsCommand
 	 * Show the captcha image
 	 * Shows the captcha image. Good god, that was a waste of time
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showImage()
 	{
 		/* INIT */
 		$captcha_unique_id = trim( $this->request['captcha_unique_id'] );
 
-		/*  GD installed? */
-		$this->class_captcha->show_error_gd_img = TRUE;
-		
 		/* Show Image... */
 		$this->class_captcha->showImage( $captcha_unique_id );
 	}
@@ -71,7 +68,7 @@ class public_core_global_captcha extends ipsCommand
 	 * Show the captcha image
 	 * Refreshes the captcha image.
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function refreshImage()
 	{
diff --git a/upload/admin/applications/core/modules_public/global/comments.php b/upload/admin/applications/core/modules_public/global/comments.php
index 2a92307a..4534d4d3 100644
--- a/upload/admin/applications/core/modules_public/global/comments.php
+++ b/upload/admin/applications/core/modules_public/global/comments.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Image Ajax
- * Last Updated: $LastChangedDate: 2010-08-18 16:55:30 +0100 (Wed, 18 Aug 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-07 21:50:25 -0400 (Wed, 07 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Gallery
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6767 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9464 $
  *
  */
 
@@ -27,17 +27,21 @@ class public_core_global_comments extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */	
 	public function doExecute( ipsRegistry $registry )
 	{
 		/* From App */
 		$fromApp = trim( $this->request['fromApp'] );
 		
+		if( !$fromApp )
+		{
+			$this->registry->output->showError( 'noappcomments', 100135.8 );
+		}
+		
 		/* Init some data */
-		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );/*noLibHook*/
 		$this->_comments = classes_comments_bootstrap::controller( $fromApp );
 
 		/* What to do? */
@@ -73,8 +77,7 @@ class public_core_global_comments extends ipsCommand
 	/**
 	 * Find last page of comments
 	 *
-	 * @access	protected
-	 * @return	void		[Redirects]
+	 * @return	@e void		[Redirects]
 	 */
 	protected function _findLastComment()
 	{
@@ -87,8 +90,7 @@ class public_core_global_comments extends ipsCommand
 	/**
 	 * Find last page of comments
 	 *
-	 * @access	protected
-	 * @return	void		[Redirects]
+	 * @return	@e void		[Redirects]
 	 */
 	protected function _findComment()
 	{
@@ -102,8 +104,7 @@ class public_core_global_comments extends ipsCommand
    /**
      * Moderate
      *
-     * @access	protected
-     * @return	void
+     * @return	@e void
      */
     protected function _moderate()
     {
@@ -129,8 +130,7 @@ class public_core_global_comments extends ipsCommand
     /**
 	 * Reply
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _fetchReply()
 	{
@@ -153,16 +153,14 @@ class public_core_global_comments extends ipsCommand
 		}
 		catch ( Exception $error )
 		{
-			$this->returnString( 'Error ' . $error->getMessage() );
+			$this->returnString( $error->getMessage() );
 		}
 	}
 
-	
 	/**
 	 * Deletes a comment
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _delete()
 	{
@@ -198,8 +196,7 @@ class public_core_global_comments extends ipsCommand
 	/**
 	 * Shows the edit box
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _showEdit()
 	{
@@ -213,12 +210,12 @@ class public_core_global_comments extends ipsCommand
 			$this->returnString( 'error' );
 		}
 		
-		array( 'parent_id'			=> 'id',
-							 	   'parent_owner_id'	=> 'member_id',
-							       'parent_parent_id'   => 'img_album_id',
-							       'parent_title'	    => 'caption',
-							       'parent_seo_title'   => 'caption_seo',
-							       'parent_date'	    => 'idate' );
+		array(	'parent_id'			=> 'id',
+				'parent_owner_id'	=> 'member_id',
+				'parent_parent_id'	=> 'img_album_id',
+				'parent_title'		=> 'caption',
+				'parent_seo_title'	=> 'caption_seo',
+				'parent_date'		=> 'idate' );
 		
 		# Get Edit form
 		try
@@ -229,10 +226,10 @@ class public_core_global_comments extends ipsCommand
 			$parent = $this->_comments->remapFromLocal( $this->_comments->fetchParent( $parentId ), 'parent' );
 		
 			/* Output */
-			$this->registry->getClass('output')->setTitle( $this->title );
+			$this->registry->getClass('output')->setTitle( $this->lang->words['edit_comment'] . ' ' . $parent['parent_title'] );
 			$this->registry->getClass('output')->addContent( $html );
 			
-			$this->registry->getClass('output')->addNavigation( $this->lang->words['edit_comment'] . $parent['parent_title'], sprintf( $this->_comments->fetchSetting('urls-showParent'), $parentId ), $parent['parent_seo_title'] );
+			$this->registry->getClass('output')->addNavigation( $this->lang->words['edit_comment'] . ' ' . $parent['parent_title'], sprintf( $this->_comments->fetchSetting('urls-showParent'), $parentId ), $parent['parent_seo_title'] );
 	
 			$this->registry->getClass('output')->sendOutput();
 		}
@@ -242,11 +239,10 @@ class public_core_global_comments extends ipsCommand
 		}
 	}
 	
-		/**
+	/**
 	 * Saves the post
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _saveEdit()
 	{
@@ -283,8 +279,7 @@ class public_core_global_comments extends ipsCommand
 	/**
 	 * Add a comment via the magic and mystery of NORMAL POSTING FOOL
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _add()
 	{
@@ -297,15 +292,25 @@ class public_core_global_comments extends ipsCommand
 		{
 			$this->registry->getClass('output')->showError( 'posting_bad_auth_key', '1-global-comments-_add-0', null, null, 403 );
 		}
-			
+		
+		/* If we are a guest, verify captcha */
+		if( !$this->memberData['member_id'] AND $this->settings['guest_captcha'] )
+		{
+			if ( !$this->registry->getClass('class_captcha')->validate() )
+			{
+				$this->registry->getClass('output')->showError( 'posting_bad_captcha', '1-global-comments-_add-3', null, null, 403 );
+			}
+		}
+
+		/* Save the comment */
 		if ( $post AND $parentId )
 		{
 			try
 			{
-				$newCommentId = $this->_comments->add( $parentId, $_POST['Post'] );
+				$newComment = $this->_comments->add( $parentId, $_POST['Post'] );
 				
 				/* Redirect to find latest */
-				$this->_comments->redirectToComment( 'last', $parentId );
+				$this->_comments->redirectToComment( 'last', $parentId, $newComment['comment_approved'] ? false : true );
 			}
 			catch( Exception $e )
 			{
diff --git a/upload/admin/applications/core/modules_public/global/defaultSection.php b/upload/admin/applications/core/modules_public/global/defaultSection.php
index 9d6a6500..240ce53a 100644
--- a/upload/admin/applications/core/modules_public/global/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/global/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default global section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'global' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'login';
\ No newline at end of file
+$DEFAULT_SECTION = 'login';
diff --git a/upload/admin/applications/core/modules_public/global/favorites.php b/upload/admin/applications/core/modules_public/global/favorites.php
deleted file mode 100644
index 2a92307a..00000000
--- a/upload/admin/applications/core/modules_public/global/favorites.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Image Ajax
- * Last Updated: $LastChangedDate: 2010-08-18 16:55:30 +0100 (Wed, 18 Aug 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Gallery
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6767 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_core_global_comments extends ipsCommand
-{
-	/**
-	 * Main class entry point
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */	
-	public function doExecute( ipsRegistry $registry )
-	{
-		/* From App */
-		$fromApp = trim( $this->request['fromApp'] );
-		
-		/* Init some data */
-		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );
-		$this->_comments = classes_comments_bootstrap::controller( $fromApp );
-
-		/* What to do? */
-		switch( $this->request['do'] )
-		{
-			case 'add':
-				$this->_add();
-			break;
-			case 'delete':
-				$this->_delete();
-			break;
-			case 'showEdit':
-				$this->_showEdit();
-			break;
-			case 'saveEdit':
-				$this->_saveEdit();
-			break;
-			case 'fetchReply':
-				$this->_fetchReply();
-			break;
-			case 'moderate':
-				$this->_moderate();
-			break;
-			case 'findLastComment':
-				$this->_findLastComment();
-			break;
-			case 'findComment':
-				$this->_findComment();
-			break;
-        }
-    }
-		
-	/**
-	 * Find last page of comments
-	 *
-	 * @access	protected
-	 * @return	void		[Redirects]
-	 */
-	protected function _findLastComment()
-	{
-		/* Init */
-		$parentId = intval( $this->request['parentId'] );
-		
-		$this->_comments->redirectToComment( 'last', $parentId );
-	}
-	
-	/**
-	 * Find last page of comments
-	 *
-	 * @access	protected
-	 * @return	void		[Redirects]
-	 */
-	protected function _findComment()
-	{
-		/* Init */
-		$parentId   = intval( $this->request['parentId'] );
-		$comment_id = intval( $this->request['comment_id'] );
-		
-		$this->_comments->redirectToComment( $comment_id, $parentId );
-	}
-	
-   /**
-     * Moderate
-     *
-     * @access	protected
-     * @return	void
-     */
-    protected function _moderate()
-    {
-    	$parentId   = intval( $this->request['parentId'] );
- 		$commentIds = ( is_array( $_POST['commentIds'] ) ) ? IPSLib::cleanIntArray( $_POST['commentIds'] ) : array();
- 		$modact	 	= trim( $this->request['modact'] );
- 		
- 		if ( count( $commentIds ) )
- 		{
- 			try
-			{
- 				$this->_comments->moderate( $modact, $parentId, $commentIds, $this->memberData );	
- 			
- 				$this->returnJsonArray( array( 'msg' => 'ok' ) );
-			}
-			catch( Exception $error )
-			{
-				$this->returnJsonError( 'Error ' . $error->getMessage() . ' line: ' . $error->getFile() . '.' . $error->getLine() );
-			}
- 		}
-    }
-    
-    /**
-	 * Reply
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	protected function _fetchReply()
-	{
-		/* INIT */
-		$commentId = intval( $this->request['comment_id'] );
-		$parentId  = intval( $this->request['parentId'] );
-		
-		/* Quick error checko */
-		if ( ! $commentId OR ! $parentId )
-		{
-			$this->returnString( 'error' );
-		}
-		
-		# Get Edit form
-		try
-		{
-			$html = $this->_comments->fetchReply( $parentId, $commentId, $this->memberData );
-
-			$this->returnString( $html );
-		}
-		catch ( Exception $error )
-		{
-			$this->returnString( 'Error ' . $error->getMessage() );
-		}
-	}
-
-	
-	/**
-	 * Deletes a comment
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	protected function _delete()
-	{
-		/* INIT */
-		$commentId = intval( $this->request['comment_id'] );
-		$parentId  = intval( $this->request['parentId'] );
-		
-		/* Perm check (looks nice) */
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->getClass('output')->showError( 'posting_bad_auth_key', '1-global-comments-_delete-0', null, null, 403 );
-		}
-		
-		/* Quick error checko */
-		if ( ! $commentId OR ! $parentId )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', '1-global-comments-_delete-2', null, null, 403 );
-		}
-		
-		try
-		{
-			$this->_comments->delete( $parentId, $commentId, $this->memberData );
-			
-			/* Redirect to find latest */
-			$this->_comments->redirectToComment( 'last', $parentId );
-		}
-		catch ( Exception $error )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', '1-global-comments-_delete-2', null, null, 403 );
-		}
-	}
-	
-	/**
-	 * Shows the edit box
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	protected function _showEdit()
-	{
-		/* INIT */
-		$commentId = intval( $this->request['comment_id'] );
-		$parentId  = intval( $this->request['parentId'] );
-		
-		/* Quick error checko */
-		if ( ! $commentId OR ! $parentId )
-		{
-			$this->returnString( 'error' );
-		}
-		
-		array( 'parent_id'			=> 'id',
-							 	   'parent_owner_id'	=> 'member_id',
-							       'parent_parent_id'   => 'img_album_id',
-							       'parent_title'	    => 'caption',
-							       'parent_seo_title'   => 'caption_seo',
-							       'parent_date'	    => 'idate' );
-		
-		# Get Edit form
-		try
-		{
-			$html = $this->_comments->displayEditForm( $parentId, $commentId, $this->memberData );
-			
-			/* Get nav */
-			$parent = $this->_comments->remapFromLocal( $this->_comments->fetchParent( $parentId ), 'parent' );
-		
-			/* Output */
-			$this->registry->getClass('output')->setTitle( $this->title );
-			$this->registry->getClass('output')->addContent( $html );
-			
-			$this->registry->getClass('output')->addNavigation( $this->lang->words['edit_comment'] . $parent['parent_title'], sprintf( $this->_comments->fetchSetting('urls-showParent'), $parentId ), $parent['parent_seo_title'] );
-	
-			$this->registry->getClass('output')->sendOutput();
-		}
-		catch ( Exception $error )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', '1-global-comments-_showEdit-0', null, null, 403 );
-		}
-	}
-	
-		/**
-	 * Saves the post
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	protected function _saveEdit()
-	{
-		/* INIT */
-		$commentId = intval( $this->request['comment_id'] );
-		$parentId  = intval( $this->request['parentId'] );
-		$post      = IPSText::parseCleanValue( $_POST['Post'] );
-		
-		/* Perm check (looks nice) */
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->getClass('output')->showError( 'posting_bad_auth_key', '1-global-comments-_saveEdit-0', null, null, 403 );
-		}
-		
-		/* Quick error checko */
-		if ( ! $parentId OR ! $commentId )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', '1-global-comments-_saveEdit-1', null, null, 403 );
-		}
-
-		/* Edit */
-		try
-		{
-			$this->_comments->edit( $parentId, $commentId, $_POST['Post'], $this->memberData );
-			
-			$this->_comments->redirectToComment( $commentId, $parentId );
-		}
-		catch ( Exception $error )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', '1-global-comments-_saveEdit-2', null, null, 403 );
-		}
-	}
-	
-	/**
-	 * Add a comment via the magic and mystery of NORMAL POSTING FOOL
-	 *
-	 * @access	protected
-	 * @return	void
-	 */
-	protected function _add()
-	{
-		/* init */
-		$post     = IPSText::parseCleanValue( $_POST['Post'] );
-		$parentId = intval( $this->request['parentId'] );
-		
-		/* Perm check (looks nice) */
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->getClass('output')->showError( 'posting_bad_auth_key', '1-global-comments-_add-0', null, null, 403 );
-		}
-			
-		if ( $post AND $parentId )
-		{
-			try
-			{
-				$newCommentId = $this->_comments->add( $parentId, $_POST['Post'] );
-				
-				/* Redirect to find latest */
-				$this->_comments->redirectToComment( 'last', $parentId );
-			}
-			catch( Exception $e )
-			{
-				$this->registry->output->showError( 'no_permission', '1-global-comments-_add-1', null, null, 403 );
-			}
-		}
-		else
-		{
-			$this->registry->output->showError( 'no_permission', '1-global-comments-_add-2', null, null, 403 );
-		}
-	}
-	
-	
-}
diff --git a/upload/admin/applications/core/modules_public/global/index.html b/upload/admin/applications/core/modules_public/global/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/global/index.html
+++ b/upload/admin/applications/core/modules_public/global/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/global/like.php b/upload/admin/applications/core/modules_public/global/like.php
new file mode 100644
index 00000000..9a5064df
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/global/like.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @file		like.php 	Provides ajax methods for the central like/follow class
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-08-06 01:51:01 +0100 (Sat, 06 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9373 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_ajax_like
+ * @brief		Provides ajax methods for the central like/follow class
+ */
+class public_core_global_like extends ipsCommand
+{
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		/* Init some data */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_like' ), 'core' );
+		
+		/* What to do? */
+		switch( $this->request['do'] )
+		{
+			case 'unsubscribe':
+				$html = $this->_unsubscribe();
+			break;
+			case 'doUnsubscribe':
+				$html = $this->_doUnsubscribe();
+			break;
+        }
+        
+        /* Output */
+		$this->registry->output->addContent( $html );
+		$this->registry->output->sendOutput();	
+    }
+    
+    /**
+     * Perform the unsubscribe
+     *
+     * @return	@e void
+     */
+    protected function _doUnsubscribe()
+    {
+    	$like_rel_id = trim( $this->request['like_rel_id'] );
+    	$like_area   = trim( $this->request['like_area'] );
+    	$like_app    = trim( $this->request['like_app'] );
+    	$like_id	 = trim( $this->request['like_id'] );
+    	
+   	 	/* Member? */
+ 		if ( ! $this->memberData['member_id'] )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-d-1' );
+ 		}
+ 		
+    	if ( $this->request['auth_key'] !=  $this->member->form_hash )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-d-2' );
+ 		}
+ 		
+ 		/* Think we're safe... */
+ 		$this->_like = classes_like::bootstrap( $like_app, $like_area );
+ 		
+ 		/* Get data */
+ 		$data = $this->_like->getDataByRelationshipId( $like_rel_id, false );
+ 		
+ 		if ( $data[ $this->memberData['member_id'] ]['like_member_id'] != $this->memberData['member_id'] )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-d-3' );
+ 		}
+ 		
+ 		/* Remove it */
+ 		$this->_like->remove( $like_rel_id, $this->memberData['member_id'] );
+		
+ 		/* Boing it */
+ 		$this->registry->getClass('output')->redirectScreen( $this->lang->words['pg_unlike_done'], $this->registry->getClass('output')->buildUrl( 'app=core&amp;module=search&amp;do=followed', 'public' ) );
+    }
+    
+	/**
+     * Show unsubscribe dialogue
+     *
+     * @return	@e void
+     */
+    protected function _unsubscribe()
+    {
+    	/* Fetch data */
+    	$key = trim( IPSText::base64_decode_urlSafe( $this->request['key'] ) );
+    	
+    	list( $app, $area, $relId, $likeMemberId, $memberId, $email ) = explode( ';', $key );
+    	
+ 		/* Member? */
+ 		if ( ! $this->memberData['member_id'] )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-1' );
+ 		}
+ 		
+    	if ( ! $app || ! $area || ! $relId )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-1' );
+ 		}
+ 		
+   		if ( ( $memberId != $likeMemberId ) || ( $memberId != $this->memberData['member_id'] ) )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-2' );
+ 		}
+ 		
+ 		if ( $email != $this->memberData['email'] )
+ 		{
+ 			$this->registry->output->showError( 'no_permission', 'pcgl-3' );
+ 		}
+ 		
+ 		/* Think we're safe... */
+ 		$this->_like = classes_like::bootstrap( $app, $area );
+ 		
+ 		/* Get data */
+ 		$data = $this->_like->getDataByRelationshipId( $relId, false );
+ 		
+ 		if ( ! is_array( $data[ $this->memberData['member_id'] ] ) )
+ 		{
+ 			$this->registry->output->showError( $this->lang->words['pg_no_longer_following'], 'pcgl-4' );
+ 		}
+ 		
+ 		/* Get meta */
+ 		$meta = $this->_like->getMeta( $relId );
+ 		
+ 		/* Display box, then */
+ 		$this->registry->output->setTitle( $this->lang->words['pg_unfollow_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
+		$this->registry->output->addNavigation( $this->lang->words['pg_unfollow_title'], '' );
+		
+		return $this->registry->output->getTemplate('global_other')->followUnsubscribe( $data, $meta );
+    }
+    
+
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/global/login.php b/upload/admin/applications/core/modules_public/global/login.php
index f617b5c5..c92ad011 100644
--- a/upload/admin/applications/core/modules_public/global/login.php
+++ b/upload/admin/applications/core/modules_public/global/login.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction
- * Last Updated: $Date: 2010-10-07 18:12:54 -0400 (Thu, 07 Oct 2010) $
+ * Last Updated: $Date: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6954 $
+ * @version		$Revision: 9505 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Login handler object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $han_login;
@@ -38,16 +37,14 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Facebook connect class
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
-	private $_facebook;
+	protected $_facebook;
 	
 	/**
 	 * Initiate login handler
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initHanLogin()
 	{
@@ -59,9 +56,8 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -117,7 +113,7 @@ class public_core_global_login extends ipsCommand
 				}
 				else
 				{
-    				$this->registry->getClass('output')->redirectScreen( $return[0], $return[1], 'false' );
+    				$this->registry->getClass('output')->redirectScreen( $return[0], $return[1] );
 				}
     		break;
     		
@@ -133,7 +129,7 @@ class public_core_global_login extends ipsCommand
 				}
 				else
 				{
-					$this->registry->getClass('output')->redirectScreen( $return[1], $return[2], 'false' );
+					$this->registry->getClass('output')->redirectScreen( $return[1], $return[2] );
 				}
     		break;
     	
@@ -163,7 +159,6 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Attempt to automatically log a user in
 	 *
-	 * @access	public
 	 * @return	array		[0=Words to display,1=URL to send to]
 	 */
  	public function autoLogin()
@@ -198,7 +193,7 @@ class public_core_global_login extends ipsCommand
  			$method = 'show';
  		}
  		
- 		if( $this->memberData[ 'member_id' ] )
+ 		if( $this->memberData['member_id'] )
  		{
 			/* Member Sync */
 			IPSLib::runMemberSync( 'onLogin', $this->memberData );
@@ -233,7 +228,6 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Delete a user's cookies
 	 *
-	 * @access	public
 	 * @param	boolean		Check the key
 	 * @return	mixed		Output error page if key checking fails, else boolean true
 	 */
@@ -288,7 +282,6 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Show the login form
 	 *
-	 * @access	public
 	 * @param	string		Message to show on login form
 	 * @return	string		Login form HTML
 	 */
@@ -340,10 +333,13 @@ class public_core_global_login extends ipsCommand
 			switch ($serviceClick)
 			{
 				case 'facebook':
-					$this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'] . "/interface/facebook/index.php?reg=1" );
+					$this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'] . "/interface/facebook/index.php?_reg=1" );
 				break;
 				case 'twitter':
-					$this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'] . "/interface/twitter/index.php?reg=1" );
+					$this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'] . "/interface/twitter/index.php?_reg=1" );
+				break;
+				case 'vkontakte':
+				    $this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'] . "/interface/vkontakte/index.php?reg=1" );
 				break;
 			}
 		}
@@ -380,7 +376,15 @@ class public_core_global_login extends ipsCommand
 			}
 			else
 			{
-				$http_referrer = my_getenv('HTTP_REFERER');
+				/* @link	http://community.invisionpower.com/tracker/issue-32302-login-redirect-when-activating */
+				if( strpos( my_getenv('HTTP_REFERER'), $this->settings['board_url'] ) === 0 )
+				{
+					$http_referrer = my_getenv('HTTP_REFERER');
+				}
+				else
+				{
+					$http_referrer	= '';
+				}					
 			}
 			
 			$facebookOpts 	= array();
@@ -429,14 +433,16 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Verify login form submission and log user in
 	 *
-	 * @access	public
 	 * @return	mixed		array [0=Words to show, 1=URL to send to, 2=error array]
 	 */
     public function doLogin()
     {
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->getClass('output')->showError( 'login_no_authkey', 10193, null, null, 403 );
+    	if( !defined('IGNORE_AUTH_KEY') OR !IGNORE_AUTH_KEY )
+    	{
+			if ( $this->request['auth_key'] != $this->member->form_hash )
+			{
+				$this->registry->getClass('output')->showError( 'login_no_authkey', 10193, null, null, 403 );
+			}
 		}
 
 		return $this->han_login->verifyLogin();
@@ -445,7 +451,6 @@ class public_core_global_login extends ipsCommand
 	/**
 	 * Log a user out
 	 *
-	 * @access	public
 	 * @param	integer		Flag to check md5 key
 	 * @return	mixed		Error message or array [0=immediate|redirect, 1=words to show, 2=URL to send to]
 	 */
diff --git a/upload/admin/applications/core/modules_public/global/lostpass.php b/upload/admin/applications/core/modules_public/global/lostpass.php
index 6fa72105..62e725d0 100644
--- a/upload/admin/applications/core/modules_public/global/lostpass.php
+++ b/upload/admin/applications/core/modules_public/global/lostpass.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Recover Lost Password
- * Last Updated: $Date: 2010-09-06 12:10:04 -0400 (Mon, 06 Sep 2010) $
+ * Last Updated: $Date: 2011-07-22 20:10:44 -0400 (Fri, 22 Jul 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6832 $
+ * @version		$Rev: 9306 $
  *
  */
 
@@ -29,9 +29,8 @@ class public_core_global_lostpass extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -73,8 +72,7 @@ class public_core_global_lostpass extends ipsCommand
 	/**
 	 * Validates a lost password request
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function lostPasswordValidate()
 	{
@@ -149,7 +147,7 @@ class public_core_global_lostpass extends ipsCommand
 				// Generate a new random password
 				//-----------------------------------------
 				
-				$new_pass = IPSLib::makePassword();
+				$new_pass = IPSMember::makePassword();
 				
 				//-----------------------------------------
 				// Generate a new salt
@@ -184,13 +182,16 @@ class public_core_global_lostpass extends ipsCommand
 		    	$this->han_login->init();
 		    	$this->han_login->changePass( $member['email'], md5( $new_pass ), $new_pass, $member );
 		    	
-		    	if ( $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
-		    	{
-					$this->registry->output->showError( $this->lang->words['lostpass_external_fail'], 2013 );
-		    	}
+		    	//if ( $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
+		    	//{
+				//	$this->registry->output->showError( $this->lang->words['lostpass_external_fail'], 2013 );
+		    	//}
 				
 		    	IPSMember::save( $member['member_id'], array( 'members' => $save_array ) );
 				
+				/* Password has been changed! */
+				IPSLib::runMemberSync( 'onPassChange', $member['member_id'], $new_pass );
+				
 				//-----------------------------------------
 				// Send out the email...
 				//-----------------------------------------
@@ -199,9 +200,9 @@ class public_core_global_lostpass extends ipsCommand
 					
 				IPSText::getTextClass('email')->buildMessage( array(
 																'NAME'		=> $member['members_display_name'],
-																'THE_LINK'	=> $this->settings['base_url'] . 'app=core&module=usercp&tab=core&area=password',
+																'THE_LINK'	=> $this->registry->getClass('output')->buildUrl( 'app=core&module=usercp&tab=core&area=password', 'publicNoSession' ),
 																'PASSWORD'	=> $new_pass,
-																'LOGIN'		=> $this->settings['base_url'] . 'app=core&module=global&section=login',
+																'LOGIN'		=> $this->registry->getClass('output')->buildUrl( 'app=core&module=global&section=login', 'publicNoSession' ),
 																'USERNAME'	=> $member['name'],
 																'EMAIL'		=> $member['email'],
 																'ID'		=> $member['member_id'],
@@ -265,24 +266,27 @@ class public_core_global_lostpass extends ipsCommand
 		    	$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
 		    	$this->han_login =  new $classToLoad( $this->registry );
 		    	$this->han_login->init();
-				$this->han_login->changePass( $member['email'], md5( $new_pass ), $new_pass, $member );
+				$this->han_login->changePass( $member['email'], $new_pass, $pass_a, $member );
 		    	
 				//-----------------------------------------
 				// We'll ignore any remote errors
 				//-----------------------------------------
 				
-		    	if( $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
+		    	/*if( $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'SUCCESS' )
 		    	{
 					// Pass not changed remotely
-		    	}
+		    	}*/
 		    	
 		    	/* Update the member */
 		    	IPSMember::save( $member['member_id'], array( 'members' => $save_array ) );
+				
+				/* Password has been changed! */
+				IPSLib::runMemberSync( 'onPassChange', $member['member_id'], $pass_a );
 			
 				/* Remove "dead" validation */
 				$this->DB->delete( 'validating', "vid='{$validate['vid']}' OR (member_id={$member['member_id']} AND lost_pass=1)" );
 				
-				$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=core&module=global&section=login&do=autologin&frompass=1' );
+				$this->registry->output->silentRedirect( $this->registry->getClass('output')->buildUrl( 'app=core&module=global&section=login&do=autologin&frompass=1' ) );
 			}
 		}
 	} 	
@@ -290,8 +294,7 @@ class public_core_global_lostpass extends ipsCommand
 	/**
 	 * Completes the lost password request form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function lostPasswordEnd()
 	{
@@ -345,14 +348,13 @@ class public_core_global_lostpass extends ipsCommand
 				$this->registry->output->showError( 'lostpass_no_mid', 2014 );
 			}
 			
-			$validate_key = md5( IPSLib::makePassword() . uniqid( mt_rand(), TRUE ) );
+			$validate_key = md5( IPSMember::makePassword() . uniqid( mt_rand(), TRUE ) );
 			
 			/* Get rid of old entries for this member */
 			$this->DB->delete( 'validating', "member_id={$member['member_id']} AND lost_pass=1" );
 			
 			/* Update the DB for this member. */
-			$db_str = array(
-							'vid'         => $validate_key,
+			$db_str = array('vid'         => $validate_key,
 							'member_id'   => $member['member_id'],
 							'temp_group'  => $member['member_group_id'],
 							'entry_date'  => time(),
@@ -374,8 +376,8 @@ class public_core_global_lostpass extends ipsCommand
 				
 			IPSText::getTextClass('email')->buildMessage( array(
 											'NAME'         => $member['members_display_name'],
-											'THE_LINK'     => $this->settings['base_url']."app=core&module=global&section=lostpass&do=sendform&uid=".$member['member_id']."&aid=".$validate_key,
-											'MAN_LINK'     => $this->settings['base_url']."app=core&module=global&section=lostpass&do=sendform",
+											'THE_LINK'     => $this->registry->getClass('output')->buildUrl( "app=core&module=global&section=lostpass&do=sendform&uid={$member['member_id']}&aid={$validate_key}", 'publicNoSession' ),
+											'MAN_LINK'     => $this->registry->getClass('output')->buildUrl( 'app=core&module=global&section=lostpass&do=sendform', 'publicNoSession' ),
 											'EMAIL'        => $member['email'],
 											'ID'           => $member['member_id'],
 											'CODE'         => $validate_key,
@@ -396,9 +398,8 @@ class public_core_global_lostpass extends ipsCommand
 	/**
 	 * Displays the lost password form
 	 *
-	 * @access	public
 	 * @param	string	$errors
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function lostPasswordForm( $errors="" )
 	{
@@ -432,9 +433,8 @@ class public_core_global_lostpass extends ipsCommand
 	/**
 	 * Shows the form for validating a lost password request
 	 *
-	 * @access	public
 	 * @param	string	$msg
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function lostPasswordValidateForm( $msg='' )
 	{
diff --git a/upload/admin/applications/core/modules_public/global/navigation.php b/upload/admin/applications/core/modules_public/global/navigation.php
new file mode 100644
index 00000000..0c7a7035
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/global/navigation.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Captcha
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @since		20th February 2002
+ * @version		$Rev: 8644 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_core_global_navigation extends ipsCommand
+{
+	/**
+	 * Class entry point
+	 *
+	 * @param	object		Registry reference
+	 * @return	@e void		[Outputs to screen/redirects]
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Set up */
+		$inapp = trim( $this->request['inapp'] );
+		
+		/* Load navigation stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/navigation/build.php', 'classes_navigation_build' );
+		$navigation = new $classToLoad( $inapp );
+		
+		/* Return */
+		$html = $this->registry->output->getTemplate( 'global_other' )->quickNavigationWrapper( $navigation->loadApplicationTabs(), $navigation->loadNavigationData(), $inapp );
+		
+		$this->registry->getClass('output')->setTitle( $this->lang->words['navigation_title'] );
+		$this->registry->getClass('output')->addContent( $html );
+        $this->registry->getClass('output')->sendOutput();
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/global/register.php b/upload/admin/applications/core/modules_public/global/register.php
index c3794b3f..65c2d9bf 100644
--- a/upload/admin/applications/core/modules_public/global/register.php
+++ b/upload/admin/applications/core/modules_public/global/register.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Register
- * Last Updated: $Date: 2010-10-05 21:26:08 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-09-02 09:58:08 -0400 (Fri, 02 Sep 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6945 $
+ * @version		$Rev: 9447 $
  *
  */
 
@@ -29,9 +29,8 @@ class public_core_global_register extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -47,7 +46,22 @@ class public_core_global_register extends ipsCommand
 		/* What to do */
 		switch( $this->request['do'] )
 		{
+			default:
+			case 'form':
+				if( $this->settings['no_reg'] > 0 )
+				{
+					$this->registry->output->showError( 'registration_disabled', 10123, FALSE, '', 200 );
+				}
+				
+				$this->registerForm();
+			break;
+			
 			case 'process_form':
+				if( $this->settings['no_reg'] > 0 )
+				{
+					$this->registry->output->showError( 'registration_disabled', 2016, true );
+				}
+
 				$this->registerProcessForm();
 			break;
 			
@@ -63,6 +77,10 @@ class public_core_global_register extends ipsCommand
 				$this->registerCoppaPermsForm();
 			break;
 			
+			//-----------------------------------------
+			// Validation (i.e. registration, pw change, etc.)
+			//-----------------------------------------
+			
     		case '05':
     			$this->_showManualForm();
     			break;
@@ -70,7 +88,7 @@ class public_core_global_register extends ipsCommand
     		case '07':
     			$this->_showManualForm('newemail');
     			break;
-    			
+
     		case 'reval':
     			$this->_revalidateForm();
     			break;
@@ -79,29 +97,16 @@ class public_core_global_register extends ipsCommand
     			$this->_revalidateComplete();
     			break;
 			
+    		//-----------------------------------------
+    		// Complete a partial login
+    		//-----------------------------------------
+    		
 			case 'complete_login':
 				$this->_completeRegistration();
 				break;
 			case 'complete_login_do':
 				$this->_completeRegistrationSave();
 				break;
-			
-			default:
-			case 'form':
-				if( $this->settings['no_reg'] > 0 )
-				{
-					$this->registry->output->showError( 'registration_disabled', 10123, FALSE, '', 200 );
-				}
-		
-    			if( $this->settings['use_coppa'] == 1 and $this->request['coppa_pass'] != 1 )
-    			{
-    				$this->registerCoppaStart();
-    			}
-    			else
-    			{
-    				$this->registerForm();
-    			}			
-			break;
 		}
 		
 		/* Output */
@@ -109,14 +114,440 @@ class public_core_global_register extends ipsCommand
 		$this->registry->output->sendOutput();		
 	}
 	
+	/**
+	 * Reset a member if they are logged in
+	 *
+	 * @return	@e void
+	 */
+	protected function _resetMember()
+	{
+		if( $this->memberData['member_id'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$this->han_login =  new $classToLoad( $this->registry );
+			$this->han_login->init();
+			
+			//-----------------------------------------
+			// Set some cookies
+			//-----------------------------------------
+			
+			IPSCookie::set( "member_id" , "0"  );
+			IPSCookie::set( "pass_hash" , "0"  );
+			IPSCookie::set( "anonlogin" , "-1" );
+			
+			if ( is_array($_COOKIE) )
+			{
+				foreach( $_COOKIE as $cookie => $value)
+				{
+					if ( stripos( $cookie, $this->settings['cookie_id']."ipbforum" ) !== false )
+					{
+						IPSCookie::set( str_replace( $this->settings['cookie_id'], "", $cookie ) , '-', -1 );
+					}
+				}
+			}
+		
+			//-----------------------------------------
+			// Logout callbacks...
+			//-----------------------------------------
+			
+			$this->han_login->logoutCallback();
+			
+			//-----------------------------------------
+			// Do it..
+			//-----------------------------------------
+			
+			$this->member->sessionClass()->convertMemberToGuest();
+		
+			list( $privacy, $loggedin ) = explode( '&', $this->memberData['login_anonymous'] );
+		
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'login_anonymous' => "{$privacy}&0",
+																							  'last_activity'   => time() ) ) );
+		}
+	}
+
+	/**
+	 * Displays the registration form
+	 *
+	 * @param	array 	$form_errors
+	 * @return	@e void
+	 */
+	public function registerForm( $form_errors=array() )
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+
+		$final_errors	= array();
+		$coppa			= IPSCookie::get( 'coppa' );
+		$step			= $this->request['step'] ? intval($this->request['step']) : 1;
+		
+		$this->settings['username_errormsg'] =  str_replace( '{chars}', $this->settings['username_characters'], $this->settings['username_errormsg'] );
+		
+		if( $coppa == 'yes' )
+		{
+			$this->registry->output->showError( 'awaiting_coppa', 10124 );
+		}
+		
+		$this->_resetMember();
+		
+		//-----------------------------------------
+		// COPPA swapout
+		//-----------------------------------------
+		
+		if( $this->settings['use_coppa'] )
+		{
+			$this->lang->words['confirm_over_thirteen']	= str_replace( "<#FORM_LINK#>", "{$this->settings['base_url']}app=core&amp;module=global&amp;section=register&amp;do=12", $this->lang->words['confirm_over_thirteen'] );
+		}
+		
+		//-----------------------------------------
+		// T & C
+		//-----------------------------------------
+
+		$cache	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_key='reg_rules'" ) );
+		$text	= $cache['conf_value'] ? $cache['conf_value'] : $cache['conf_default'];
+
+		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'global';
+		
+		$this->settings['_termsAndConditions']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $text );
+		
+		//-----------------------------------------
+		// Page title / navigation
+		//-----------------------------------------
+		
+		$this->registry->output->setTitle( $this->lang->words['registration_form'] . ' - ' . ipsRegistry::$settings['board_name'] );
+		$this->registry->output->addNavigation( $this->lang->words['registration_form'], '' );
+		
+		//-----------------------------------------
+		// If Nexus is installed, that is the first step
+		//-----------------------------------------
+		
+		if( IPSLib::appIsInstalled('nexus') AND $this->settings['nexus_reg_show'] AND $this->settings['nexus_store_online'] )
+		{
+			//-----------------------------------------
+			// We just submitted the form
+			//-----------------------------------------
+			
+			if( $this->request['nexus_pass'] )
+			{
+				$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'nexus' ) . '/sources/hooks.php', 'nexusHooks', 'nexus' );
+				$hookGateway	= new $classToLoad( $this->registry );
+				
+				//-----------------------------------------
+				// Check for errors
+				//-----------------------------------------
+				
+				if ( $this->settings['nexus_reg_force'] and !IPSCookie::get( 'cm_reg' ) and empty( $this->request['cm_package'] ) )
+				{
+					$nexusError = $this->lang->words['forceby_no_sel'];
+				}
+				
+			}
+				
+			//-----------------------------------------
+			// If no errors, create invoice and set cookie
+			//-----------------------------------------
+			
+			if ( !$nexusError and $this->request['nexus_pass'] )
+			{			
+				//-----------------------------------------
+				// Did we buy a package?
+				//-----------------------------------------
+			
+				$chosenPackages  = ipsRegistry::$request['cm_package'];
+										
+				if ( !empty( $chosenPackages ) )
+				{
+					// Get our package data
+					$imploded = implode( ',', ipsRegistry::$request['cm_package'] );
+					$packages = array();
+					ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'nexus_packages', 'where' => "p_id IN({$imploded})" ) );
+					ipsRegistry::DB()->execute();
+					while ( $row = ipsRegistry::DB()->fetch() )
+					{
+						$packages[ $row['p_id'] ] = $row;
+					}
+									
+					// Bundle 'em all up
+					foreach ( $chosenPackages as $itemID )
+					{
+						// Add title to the array
+						$titles[] = $packages[ $itemID ]['p_name'];
+						
+						// Process information
+						$shippingData = package::load( $itemID )->shippingData();
+						$items[] = array(
+							'act'			=> 'new',
+							'app'			=> 'nexus',
+							'type'			=> $packages[ $itemID ]['p_type'],
+							'cost'			=> $packages[ $itemID ]['p_base_price'],
+							'renew_term'	=> $packages[ $itemID ]['p_renewals'],
+							'renew_units'	=> $packages[ $itemID ]['p_renewal_unit'],
+							'renew_cost'	=> $packages[ $itemID ]['p_renewal_price'] ? $packages[ $itemID ]['p_renewal_price'] : $packages[ $itemID ]['p_base_price'],
+							'itemName'		=> $packages[ $itemID ]['p_name'],
+							'itemID'		=> $itemID,
+							'physical'		=> is_null( $shippingData ) ? FALSE : TRUE,
+							'shipping'		=> is_null( $shippingData ) ? array() : $shippingData['shipping'],
+							'weight'		=> is_null( $shippingData ) ? 0 : $shippingData['weight'],
+							);
+					}
+					
+					// What are we calling this invoice?
+					if ( count( $titles ) == 1 )
+					{
+						$title = $titles[0];
+					}
+					else
+					{
+						$title = implode( ', ', $titles );
+						if ( strlen( $title ) > 50 )
+						{
+							array_pop( $titles );
+							$title = implode( ', ', $titles );
+							while ( strlen( $title ) > 47 and count( $titles ) > 1 )
+							{
+								array_pop( $titles );
+								$title = implode( ', ', $titles );
+							}
+							$title .= '...';
+						}
+					}
+					
+					// Generate it
+					require_once( IPSLib::getAppDir('nexus') . '/sources/nexusApi.php' );/*noLibHook*/
+					$invoiceID = nexusApi::generateInvoice( $title, $this->memberData['member_id'], $items );
+					
+					IPSCookie::set( 'cm_reg', $invoiceID );
+				}
+			}
+			else
+			{
+				//-----------------------------------------
+				// "step 1" if Nexus is set to show packages on registration
+				//-----------------------------------------
+				
+				require_once( IPSLib::getAppDir('nexus') . '/sources/packageCore.php' );/*noLibHook*/
+				
+				$packages = array();
+				$this->DB->build( array( 'select' => '*', 'from' => 'nexus_packages', 'where' => 'p_reg=1', 'order' => 'p_position' ) );
+				$e = $this->DB->execute();
+				while ( $row = $this->DB->fetch( $e ) )
+				{
+					$packages[ $row['p_id'] ] = package::load( $row['p_id'] )->buildDisplayData();
+				}
+				
+				if ( isset( $this->request['cm_package'] ) )
+				{
+					foreach ( $this->request['cm_package'] as $packageID )
+					{
+						$packages[ $packageID ]['checked'] = "checked='checked'";
+					}
+				}
+								
+				$this->output .= $this->registry->output->getTemplate('nexus_payments')->regForm32( $packages, $nexusError );
+				
+				return;
+			}
+		}
+
+		//-----------------------------------------
+		// Send to an alternate registration URL?
+		//-----------------------------------------
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'login_methods', 'where' => 'login_enabled=1' ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			if( $r['login_register_url'] )
+			{
+				$this->registry->output->silentRedirect( $r['login_register_url'] );
+			}
+		}
+
+		//-----------------------------------------
+		// Adjust text as needed based on validation type
+		//-----------------------------------------
+		
+		if( $this->settings['reg_auth_type'] )
+		{
+			if( $this->settings['reg_auth_type'] == 'admin_user' OR $this->settings['reg_auth_type'] == 'user' )
+			{
+				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['email_validate_text'];
+			}
+			
+			/* User then admin? */
+			if( $this->settings['reg_auth_type'] == 'admin_user' )
+			{
+				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['user_admin_validation'];
+			}
+			
+			if( $this->settings['reg_auth_type'] == 'admin' )
+			{
+				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['just_admin_validation'];
+			}
+		}
+    	
+		//-----------------------------------------
+		// Captcha / Q&A
+		//-----------------------------------------
+		
+		$captchaHTML	= '';
+		$qandaHTML		= '';
+
+		$question	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'question_and_answer', 'order' => $this->DB->buildRandomOrder(), 'limit' => array(1) ) );
+		
+		if( $question AND count($question) )
+		{
+			$qandaHTML		= $this->registry->output->getTemplate('global_other')->questionAndAnswer( $question );
+		}
+
+		if( $this->settings['bot_antispam_type'] != 'none' )
+		{
+			$captchaHTML	= $this->registry->getClass('class_captcha')->getTemplate();
+		}
+
+		//-----------------------------------------
+		// Custom fields
+		//-----------------------------------------
+		
+		$custom_fields_out	= array( 'required', 'optional' );
+		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$custom_fields		= new $classToLoad();
+		
+		$custom_fields->member_data = $this->memberData;
+		$custom_fields->initData( 'edit' );
+		$custom_fields->parseToEdit( 'register' );
+		
+		if ( count( $custom_fields->out_fields ) )
+		{
+			foreach( $custom_fields->out_fields as $id => $form_element )
+	    	{
+				if ( $custom_fields->cache_data[ $id ]['pf_not_null'] == 1 )
+				{
+					$ftype = 'required';
+				}
+				else
+				{
+					$ftype = 'optional';
+				}
+				
+				$custom_fields_out[$ftype][] = array( 
+														'name'  => $custom_fields->field_names[ $id ], 
+														'desc'  => $custom_fields->field_desc[ $id ], 
+														'field' => $form_element, 
+														'id'    => $id,
+														'error' => '',
+														'type'	=> $custom_fields->cache_data[ $id ]['pf_type']
+														);
+	    	}
+		}
+		
+		//-----------------------------------------
+		// If Nexus is installed, also add billing information
+		//-----------------------------------------
+		
+		$nexusFields = array();
+		$nexusStates = array();
+		if( IPSLib::appIsInstalled('nexus') AND $this->settings['nexus_reg_show'] AND $this->settings['nexus_store_online'] )
+		{
+			ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_countries' ), 'nexus' );
+
+			$fields = array();
+			$_fields = ipsRegistry::cache()->getCache('customer_fields');
+			
+			if( is_array($_fields) AND count($_fields) )
+			{
+				foreach ( $_fields['reg'] as $k )
+				{
+					$nexusFields[] = $_fields['fields'][ $k ];
+				}
+			}
+			
+			$nexusStates = customer::generateStateDropdown( TRUE );
+		}
+				
+		//-----------------------------------------
+		// Got errors to show?
+		//-----------------------------------------
+		
+		$final_errors = array( 'dname' => NULL, 'password' => NULL, 'email' => NULL, 'tos' => NULL );
+
+		foreach( array( 'dname', 'password', 'email', 'tos' ) as $thing )
+		{
+			if ( isset($form_errors[ $thing ]) AND is_array( $form_errors[ $thing ] ) AND count( $form_errors[ $thing ] ) )
+			{
+				$final_errors[ $thing ] = implode( "<br />", $form_errors[ $thing ] );
+			}
+		}
+		
+		$this->request['PassWord'] =				$this->request['PassWord']				? $this->request['PassWord']				: '' ;
+		$this->request['EmailAddress'] =			$this->request['EmailAddress']			? $this->request['EmailAddress']			: '' ;
+		$this->request['EmailAddress_two'] =		$this->request['EmailAddress_two']		? $this->request['EmailAddress_two']		: '' ;
+		$this->request['PassWord_Check'] =			$this->request['PassWord_Check']		? $this->request['PassWord_Check']			: '' ;
+		$this->request['members_display_name'] =	$this->request['members_display_name']	? $this->request['members_display_name']	: '' ;
+		$this->request['time_offset'] =				$this->request['time_offset']			? $this->request['time_offset']				: '' ;
+		
+		//-----------------------------------------
+		// Create time zone dropdown array
+		//-----------------------------------------
+		
+		$this->registry->class_localization->loadLanguageFile( array( 'public_usercp' ), 'core' );
+		
+		$time_select		= array();
+		
+		foreach( $this->lang->words as $k => $v )
+		{
+			if( strpos( $k, "time_" ) === 0 )
+			{
+				$k	= str_replace( "time_", '', $k );
+
+				if( preg_match( '/^[\-\d\.]+$/', $k ) )
+				{
+					$time_select[ $k ]	= $v;
+				}
+			}
+		}
+		
+		ksort( $time_select );
+		
+		$this->request['time_offset'] = ( $this->request['time_offset'] ) ? $this->request['time_offset'] : $this->settings['time_offset'];
+
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+
+		$this->output .= $this->registry->output->getTemplate('register')->registerForm(
+																					$form_errors['general'],
+																					array( 
+																							'TEXT'			=> $this->lang->words['std_text'], 
+																							'coppa_user'	=> $coppa,
+																							'captchaHTML'   => $captchaHTML,
+																							'qandaHTML'		=> $qandaHTML,
+																							'showCOPPA'		=> $this->settings['use_coppa'] AND !(IPSLib::appIsInstalled('nexus') AND $this->settings['nexus_reg_show'] AND $this->settings['nexus_store_online']),
+																						), 
+																					$final_errors, 
+																					$time_select,
+																					$custom_fields_out,
+																					$nexusFields,
+																					$nexusStates );
+		
+		//-----------------------------------------
+		// Member sync module
+		//-----------------------------------------
+		
+		IPSLib::runMemberSync( 'onRegisterForm' );
+	}
 	
 	/**
 	 * Save the data to complete the partial member record login/registration
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _completeRegistrationSave()
+	public function _completeRegistrationSave()
 	{
 		//-----------------------------------------
 		// INIT
@@ -197,7 +628,7 @@ class public_core_global_register extends ipsCommand
 		}
 		
 		/* Are we trying to connect to an existing account */
-		if ( $connectService AND $login_user AND $login_pass AND ( $this->settings['fb_realname'] == 'enforced' OR !$members_display_name ) )
+		if ( $connectService AND $login_user AND $login_pass AND ( $this->settings['fb_realname'] == 'enforced' OR ! $members_display_name ) )
 		{
 			/* Load Full Member */
 			$member = IPSMember::load( $mid, 'all' );
@@ -206,7 +637,7 @@ class public_core_global_register extends ipsCommand
 			$han_login->setForceEmailCheck( TRUE );
 		
 			/* Now attempt to authorize member */
-    		$return = $han_login->loginPasswordCheck( '', $login_user, $login_pass );
+    		$return = $han_login->loginPasswordCheck( $login_user, $login_user, $login_pass );
     		
     		if ( $return !== TRUE )
 			{
@@ -228,8 +659,8 @@ class public_core_global_register extends ipsCommand
 						$form_errors['serviceLogIn'][] = sprintf( $this->lang->words['connect_already_linked'], $login_user, ucfirst( $connectService ) );
 					}
 			
-					require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-					$facebook = new facebook_connect( $this->registry, $member['fb_token'], $member['fb_uid'] );
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+					$facebook = new $classToLoad( $this->registry, $member['fb_token'], $member['fb_uid'] );
 					
 					if ( $facebook->finishNewConnection( $logInMember['member_id'], $member['member_id'] ) !== true )
 					{
@@ -239,15 +670,15 @@ class public_core_global_register extends ipsCommand
 				}
 				else if ( $connectService == 'twitter' AND $member['twitter_id'] )
 				{
-					/* Already FBd? */
+					/* Already Twitterd? */
 					if ( $logInMember['twitter_id'] AND ( $member['twitter_id'] != $logInMember['twitter_id'] ) )
 					{
 						/* User already has facebook link */
 						$form_errors['serviceLogIn'][] = sprintf( $this->lang->words['connect_already_linked'], $login_user, ucfirst( $connectService ) );
 					}
 			
-					require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-					$twitter = new twitter_connect( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+					$twitter = new $classToLoad( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
 					
 					if ( $twitter->finishNewConnection( $logInMember['member_id'], $member['member_id'] ) !== true )
 					{
@@ -264,8 +695,8 @@ class public_core_global_register extends ipsCommand
 						$form_errors['serviceLogIn'][] = sprintf( $this->lang->words['connect_already_linked'], $login_user, ucfirst( $connectService ) );
 					}
 			
-					require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-					$vk = new vkontakte_connect( $this->registry, $key );
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+					$vk = new $classToLoad( $this->registry, $key );
 					
 					if ( $vk->finishNewConnection( $logInMember['member_id'], $member['member_id'] ) !== true )
 					{
@@ -285,7 +716,7 @@ class public_core_global_register extends ipsCommand
 					/* Boing */
 					if ( is_array( $r ) )
 					{
-						$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&section=register&tab=members&area=' . $connectService );
+						$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&section=register&tab=core&area=' . $connectService );
 					}
 				}
 			}
@@ -430,18 +861,13 @@ class public_core_global_register extends ipsCommand
 		//-----------------------------------------
 		
 		$this->DB->delete( 'members_partial', 'partial_member_id=' . $mid );
-		$this->DB->delete( 'vkontakte_connect', "v_key='" . $key . "'" );
 		
 		//-----------------------------------------
 		//  Update: Profile fields
 		//-----------------------------------------
 
-		$this->DB->force_data_type = array();
-		
-		foreach( $custom_fields->out_fields as $_field => $_data )
-		{
-			$this->DB->force_data_type[ $_field ] = 'string';
-		}
+		$this->DB->resetDataTypes();
+		$this->DB->setDataType( array_keys( $custom_fields->out_fields ), 'string' );
 
 		if ( is_array($custom_fields->out_fields) and count($custom_fields->out_fields) )
 		{
@@ -452,6 +878,70 @@ class public_core_global_register extends ipsCommand
 		// Pass twitter/facebook via spam service
 		//-----------------------------------------
 		
+		if ( $connectService AND ! $login_user AND $this->settings['spam_service_enabled'] )
+		{
+			/* Load all member data */
+			$member = IPSMember::load( $mid, 'all' );
+			
+			/* Spam Service */
+			$spamCode 	= 0;
+			$_spamFlag	= 0;
+			
+			/* Query the service */
+			$spamCode = IPSMember::querySpamService( $member['email'] );
+        
+			/* Action to perform */
+			$action = $this->settings[ 'spam_service_action_' . $spamCode ];
+        
+			/* Perform Action */
+			switch( $action )
+			{
+				/* Proceed with registration */
+				case 1:
+				break;
+        
+				/* Flag for admin approval */
+				case 2:
+        			$member['member_group_id']       = $this->settings['auth_group'];
+					$this->settings['reg_auth_type'] = 'admin';
+					$_spamFlag	= 1;
+				break;
+        
+				/* Approve the account, but ban it */
+				case 3:
+        			$member['member_banned']			= 1;
+					$member['member_group_id']			= $this->settings['banned_group'];
+					$member['bw_is_spammer']			= 1;
+					$this->settings['reg_auth_type']	= '';
+				break;
+			}
+			
+			/* Update member */
+			IPSMember::save( $member['member_id'], array( 'core' => array( 'member_group_id' => $member['member_group_id'],
+																		   'member_banned'   => intval( $member['member_banned'] ),
+																		   'bw_is_spammer'   => intval( $member['bw_is_spammer'] ) ) ) );
+			
+			/* Did we put them in validating? */
+			if ( $_spamFlag )
+			{
+				$validate_key = md5( IPSMember::makePassword() . time() );
+				$time         = time();
+				
+				$this->DB->insert( 'validating', array( 'vid'         => $validate_key,
+													    'member_id'   => $member['member_id'],
+													    'real_group'  => $this->settings['member_group'],
+													    'temp_group'  => $this->settings['auth_group'],
+													    'entry_date'  => $time,
+													    'coppa_user'  => 0,
+													    'new_reg'     => 1,
+													    'ip_address'  => $member['ip_address'],
+													    'spam_flag'	  => $_spamFlag ) );
+				
+				$this->output = $this->registry->output->getTemplate('register')->showPreview( $member );
+				return; #Goes back to doExecute which sends $this->output to output class
+			}
+		}
+
 		//-----------------------------------------
 		// Send out admin email
 		//-----------------------------------------
@@ -468,7 +958,7 @@ class public_core_global_register extends ipsCommand
 																 'IP'			=> $tmp_member['ip_address'],
 																 'DISPLAY_NAME'	=> $members_display_name ) );
 										
-			IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email'] . $this->settings['board_name'];
+			IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['new_registration_email'], $this->settings['board_name'] );
 			IPSText::getTextClass('email')->to      = $this->settings['email_in'];
 			IPSText::getTextClass('email')->sendMail();
 		}
@@ -514,7 +1004,10 @@ class public_core_global_register extends ipsCommand
 		$this->cache->setCache( 'stats', $cache, array( 'array' => 1 ) );
 		
 		/* Complete account */
-		IPSLib::runMemberSync( 'onCompleteAccount', IPSMember::load( $mid ) );
+		$memberData	= IPSMember::load( $mid );
+		
+		IPSLib::runMemberSync( 'onCompleteAccount', $memberData );
+		IPSLib::runMemberSync( 'onLogin', $memberData );
 		
 		//-----------------------------------------
 		// Go to the board index
@@ -529,11 +1022,10 @@ class public_core_global_register extends ipsCommand
 	 * form upon first visit by member (usually immediately after login) to complete the
 	 * login/registration.
 	 *
-	 * @access	private
 	 * @param 	array 		Errors
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _completeRegistration( $form_errors=array() )
+	protected function _completeRegistration( $form_errors=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -548,8 +1040,8 @@ class public_core_global_register extends ipsCommand
 		//-----------------------------------------
 		
 		$reg = $this->DB->buildAndFetch( array( 'select'	=> '*',
-												'from'	=> 'members_partial',
-												'where'	=> "partial_member_id={$mid} AND partial_date={$key}" ) );
+												'from'		=> 'members_partial',
+												'where'		=> "partial_member_id={$mid} AND partial_date={$key}" ) );
 		
 		//-----------------------------------------
 		// Got it?
@@ -567,10 +1059,10 @@ class public_core_global_register extends ipsCommand
 		if ( $member['fb_uid'] AND $member['fb_token'] )
 		{
 			/* Attempt to fetch user details */
-			require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-			$facebook = new facebook_connect( $this->registry, $member['fb_token'], $member['fb_uid'] );
+			$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$facebook		= new $classToLoad( $this->registry, $member['fb_token'], $member['fb_uid'] );
 		
-			$userData = $facebook->fetchUserData();
+			$userData		= $facebook->fetchUserData();
 			
 			if ( $userData['id'] )
 			{
@@ -608,10 +1100,10 @@ class public_core_global_register extends ipsCommand
 		else if ( $member['twitter_id'] AND $member['twitter_token'] AND $member['twitter_secret'] )
 		{
 			/* Attempt to fetch user details */
-			require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-			$twitter = new twitter_connect( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
+			$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+			$twitter		= new $classToLoad( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
 		
-			$userData = $twitter->fetchUserData();
+			$userData		= $twitter->fetchUserData();
 			
 			if ( $userData['id'] )
 			{
@@ -621,23 +1113,30 @@ class public_core_global_register extends ipsCommand
 				$userData['_sImage'] = $this->settings['public_dir'] . 'style_status/twitter.png';
 			}
 		}
-		else if ( $member['vk_uid'] )
+		else if ( $member['vk_uid'] AND $member['vk_token'] )
 		{
 			/* Attempt to fetch user details */
-			require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-			$vk = new vkontakte_connect( $this->registry, $key );
+			$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+			$vk             = new $classToLoad( $this->registry, $member['vk_token'], $member['vk_uid'] );
 		
-			$userData = $vk->fetchUserData();
+			$userData       = $vk->fetchUserData();
 			
-			if ( $userData['id'] )
+			if ( $userData['uid'] )
 			{
 				$userData['service'] = 'vkontakte';
-				$userData['_name']   = $userData['name'];
+				$userData['_name']   = $userData['first_name'] . ' ' . $userData['last_name'];
 				$userData['_pic']    = $userData['photo'];
 				$userData['_sImage'] = $this->settings['public_dir'] . 'style_status/vkontakte.png';
 			}
 		}
-
+		else
+		{
+			/* Set defaults for any we have */
+			$this->request['members_display_name']	= !empty($this->request['members_display_name'])	? $this->request['members_display_name']	: $member['members_display_name'];
+			$this->request['EmailAddress']			= !empty($this->request['EmailAddress'])			? $this->request['EmailAddress']			: $member['email'];
+			$this->request['EmailAddress_two']		= !empty($this->request['EmailAddress_two'])		? $this->request['EmailAddress_two']		: $member['email'];
+		}
+		
 		/* Remote registrations disabled? */
 		if ( $this->settings['no_reg'] == 2 )
 		{
@@ -647,8 +1146,7 @@ class public_core_global_register extends ipsCommand
 		//-----------------------------------------
 		// Custom profile fields stuff
 		//-----------------------------------------
-		
-		/* Custom Profile Fields */
+
 		$custom_fields_out = array( 'required', 'optional' );
 				
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
@@ -686,7 +1184,7 @@ class public_core_global_register extends ipsCommand
     	// Other errors
     	//-----------------------------------------
 
-    	foreach( array( 'username', 'dname', 'password', 'email', 'general', 'serviceLogIn' ) as $thing )
+    	foreach( array( 'dname', 'password', 'email', 'general', 'serviceLogIn' ) as $thing )
     	{
 			if ( is_array( $form_errors[ $thing ] ) AND count( $form_errors[ $thing ] ) )
 			{
@@ -716,11 +1214,10 @@ class public_core_global_register extends ipsCommand
 	/**
 	 * Show the form to request validation email to be resent
 	 *
-	 * @access	private
 	 * @param 	string 		Errors
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _revalidateForm( $errors="" )
+	protected function _revalidateForm( $errors="" )
 	{
 		$uses_name		= false;
 		$uses_email		= false;
@@ -762,10 +1259,9 @@ class public_core_global_register extends ipsCommand
 	/**
 	 * Resend email validation request for lost password, email change and new registration
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _revalidateComplete()
+	protected function _revalidateComplete()
 	{
 		//-----------------------------------------
 		// Check in the DB for entered member name
@@ -847,7 +1343,7 @@ class public_core_global_register extends ipsCommand
 											  )
 										);
 										
-			IPSText::getTextClass('email')->subject = $this->lang->words['email_reg_subj'] . " " . $this->settings['board_name'];
+			IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['email_reg_subj'], $this->settings['board_name'] );
 			IPSText::getTextClass('email')->to      = $member['email'];
 			
 			IPSText::getTextClass('email')->sendMail();
@@ -865,7 +1361,7 @@ class public_core_global_register extends ipsCommand
 											  )
 										);
 										
-			IPSText::getTextClass('email')->subject = $this->lang->words['ne_subject'] . ' ' . $this->settings['board_name'];
+			IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['ne_subject'], $this->settings['board_name'] );
 			IPSText::getTextClass('email')->to      = $member['email'];
 			
 			IPSText::getTextClass('email')->sendMail();
@@ -885,12 +1381,11 @@ class public_core_global_register extends ipsCommand
 	/**
 	 * Show the form to manually enter in validation info if auto-validation failed.
 	 *
-	 * @access	private
 	 * @param 	string		Type of validation
 	 * @param 	string 		Error messages
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _showManualForm($type='reg', $errors="")
+	protected function _showManualForm($type='reg', $errors="")
 	{
 		//-----------------------------------------
 		// In IPB3 this is handled by another section
@@ -914,14 +1409,13 @@ class public_core_global_register extends ipsCommand
 	/**
 	 * Show coppa form.  This is the downloadable/printable form, and as such is just printed to the browser directly
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function registerCoppaPermsForm()
+	protected function registerCoppaPermsForm()
 	{
 		/* Keith said to strip these out - it's all his fault :( */
-		$this->settings[ 'coppa_address'] =  str_replace( array( '<br />', '<br>' ), '', $this->settings['coppa_address'] );
-		$this->settings[ 'coppa_address'] =  nl2br( $this->settings['coppa_address']  );
+		$this->settings['coppa_address']	= str_replace( array( '<br />', '<br>' ), '', $this->settings['coppa_address'] );
+		$this->settings['coppa_address']	= nl2br( $this->settings['coppa_address'] );
 
 		echo( $this->registry->output->getTemplate('register')->registerCoppaForm() );
 		exit();
@@ -932,27 +1426,18 @@ class public_core_global_register extends ipsCommand
 	 * we just continue with registration form.  Otherwise we show the coppa validation required message with link
 	 * to download/print coppa compliance sheet for parents to fill in.
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
- 	private function registerCoppaTwo()
+ 	protected function registerCoppaTwo()
 	{
-		if( ! $this->request['m'] OR ! $this->request['d'] OR ! $this->request['y'] )
-		{
-			$this->registry->output->showError( 'coppa_form_fill', 10119 );
-		}
-		
-		$birthday	= mktime( 0, 0, 0, intval( $this->request['m'] ), intval( $this->request['d'] ), intval( $this->request['y'] ) );
-		$coppa		= mktime( 0, 0, 0, date( "m" ), date ("d" ), date( "Y" ) - 13 );
-		
-		if( $birthday <= $coppa )
+		if( $this->request['coppa'] == 1 )
 		{
+			IPSCookie::set( 'coppa', 'no', 0, 1 );
 			$this->registerForm();
 			return;
 		}
 		
 		IPSCookie::set( 'coppa', 'yes', 0, 1 );
-		IPSCookie::set( 'coppabday', $this->request['m'] . '-' . $this->request['d'] . '-' . $this->request['y'], 0, 1 );
 
 		$this->lang->words['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=register&amp;do=12'>" . $this->lang->words['coppa_link_form'] . "</a>", $this->lang->words['coppa_form_text']);
 		
@@ -961,31 +1446,14 @@ class public_core_global_register extends ipsCommand
 		$this->registry->output->setTitle( $this->lang->words['coppa_title']  . ' - ' . ipsRegistry::$settings['board_name']);
 		$this->registry->output->addNavigation( $this->lang->words['coppa_title'], '' );
  	}	
-	
-	/**
-	 * First COPPA screen.  Shows form for visitor to enter birthday in and then submits to registerCoppaTwo
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	private function registerCoppaStart()
-	{
-		$this->lang->words['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=register&amp;do=12'>{$this->lang->words['coppa_link_form']}</a>", $this->lang->words['coppa_form_text']);
-		
-		$this->output .= $this->registry->output->getTemplate('register')->registerCoppaStart();
-		
-		$this->registry->output->setTitle( $this->lang->words['coppa_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->output->addNavigation( $this->lang->words['coppa_title'], '' );
- 	}
-	
+
 	/**
 	 * Validation completion.  This is the action hit when a user clicks a validation link from their email for
 	 * lost password, email change and new registration.
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _autoValidate()
+	protected function _autoValidate()
  	{
 		//-----------------------------------------
 		// INIT
@@ -1067,14 +1535,17 @@ class public_core_global_register extends ipsCommand
 		
 		if ( $validate['new_reg'] == 1 )
 		{
+			if( $member['member_group_id'] == $this->settings['auth_group'] )
+			{
 			if ( ! $validate['real_group'] )
 			{
 				$validate['real_group'] = $this->settings['member_group'];
 			}
-			else if( ! array_key_exists( $validate['real_group'], $this->caches['group_cache'] ) )
+				else if( !isset( $this->caches['group_cache'][ $validate['real_group'] ] ) )
 			{
 				$validate['real_group'] = $this->settings['member_group'];
 			}
+			}
 			
 			//-----------------------------------------
 			// SELF-VERIFICATION...
@@ -1084,7 +1555,10 @@ class public_core_global_register extends ipsCommand
 			
 			if ( $this->settings['reg_auth_type'] == 'user' )
 			{
+				if( $member['member_group_id'] == $this->settings['auth_group'] )
+				{
 				IPSMember::save( $member['member_id'], array( 'members' => array( 'member_group_id' => $validate['real_group'] ) ) );
+				}
 				
 				/* Reset newest member */
 				$stat_cache	 = $this->caches['stats'];
@@ -1106,6 +1580,8 @@ class public_core_global_register extends ipsCommand
 
 				$this->DB->delete( 'validating', "vid='" . $validate['vid'] . "'" );
 				
+				IPSLib::runMemberSync( 'onCompleteAccount', $member );
+				
 				$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=core&module=global&section=login&do=autologin&fromreg=1' );
 			}
 			
@@ -1147,7 +1623,7 @@ class public_core_global_register extends ipsCommand
 			// Generate a new random password
 			//-----------------------------------------
 			
-			$new_pass = IPSLib::makePassword();
+			$new_pass = IPSMember::makePassword();
 			
 			//-----------------------------------------
 			// Generate a new salt
@@ -1230,7 +1706,7 @@ class public_core_global_register extends ipsCommand
 			{
 				$validate['real_group'] = $this->settings['member_group'];
 			}
-			else if( !array_key_exists( $validate['real_group'], $this->caches['group_cache'] ) )
+			else if( !isset( $this->caches['group_cache'][ $validate['real_group'] ] ) )
 			{
 				$validate['real_group'] = $this->settings['member_group'];
 			}
@@ -1250,336 +1726,24 @@ class public_core_global_register extends ipsCommand
 		}
 	}
 	
-	/**
-	 * Displays the registration form
-	 *
-	 * @access	public
-	 * @param	array 	$form_errors
-	 * @return	void
-	 */
-	public function registerForm( $form_errors=array() )
-	{
-		/* INIT */
-		$final_errors = array();
-
-		if( $this->settings['no_reg'] > 0 )
-		{
-			$this->registry->output->showError( 'registration_disabled', 10123, FALSE, '', 200  );
-		}
-		
-		$coppa = IPSCookie::get( 'coppa' );
-		
-		if( $coppa == 'yes' )
-		{
-			$this->registry->output->showError( 'awaiting_coppa', 10124 );
-		}
-		
-		$this->settings[ 'username_errormsg'] =  str_replace( '{chars}', $this->settings['username_characters'], $this->settings['username_errormsg']  );
-		
-		/* Read T&Cs yet? */
-		if( ! $this->request['termsread'] )
-		{	
-			if( $this->memberData['member_id'] )
-			{
-		    	$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		    	$this->han_login =  new $classToLoad( $this->registry );
-		    	$this->han_login->init();
-		    	
-				//-----------------------------------------
-				// Set some cookies
-				//-----------------------------------------
-				
-				IPSCookie::set( "member_id" , "0"  );
-				IPSCookie::set( "pass_hash" , "0"  );
-				IPSCookie::set( "anonlogin" , "-1" );
-				
-				if ( is_array($_COOKIE) )
-		 		{
-		 			foreach( $_COOKIE as $cookie => $value)
-		 			{
-		 				if ( stripos( $cookie, $this->settings['cookie_id']."ipbforum" ) !== false )
-		 				{
-		 					IPSCookie::set( str_replace( $this->settings['cookie_id'], "", $cookie ) , '-', -1 );
-		 				}
-		 			}
-		 		}
-		
-				//-----------------------------------------
-				// Logout callbacks...
-				//-----------------------------------------
-				
-				$this->han_login->logoutCallback();
-				
-				//-----------------------------------------
-				// Do it..
-				//-----------------------------------------
-				
-				$this->member->sessionClass()->convertMemberToGuest();
-
-				list( $privacy, $loggedin ) = explode( '&', $this->memberData['login_anonymous'] );
-		
-				IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'login_anonymous' => "{$privacy}&0",
-																								  'last_activity'   => time() ) ) );
-			}
-			
-			/* Continue */
-			$cache = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_key='reg_rules'" ) );
-			
-			$text  = $cache['conf_value'] ? $cache['conf_value'] : $cache['conf_default'];
-			
-			/* Load the Parser */
-			IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_html		= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section	= 'global';
-			
-			$text	= IPSText::getTextClass('bbcode')->preDbParse( $text );
-			$text	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $text );
-			
-			$this->registry->output->setTitle( $this->lang->words['registration_form'] . ' - ' . ipsRegistry::$settings['board_name'] );
-			$this->registry->output->addNavigation( $this->lang->words['registration_form'], '' );
-
-			$this->output .= $this->registry->output->getTemplate('register')->registerShowTerms( $text, $coppa );
-			return;
-		}
-		else
-		{
-			/* Did we agree to the t&c? */
-			if( ! $this->request['agree_to_terms'] )
-			{
-				$this->registry->output->showError( 'must_agree_to_terms', 10125 );
-			}
-    	}
-
-		/* Do we have another URL that one needs to visit to register? */
-		$this->DB->build( array( 'select' => '*', 'from' => 'login_methods', 'where' => 'login_enabled=1' ) );
-		$this->DB->execute();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			if( $r['login_register_url'] )
-			{
-				$this->registry->output->silentRedirect( $r['login_register_url'] );
-				exit();
-			}
-		}
-
-		/* Continue... */
-		if( $this->settings['reg_auth_type'] )
-		{
-			if( $this->settings['reg_auth_type'] == 'admin_user' OR $this->settings['reg_auth_type'] == 'user' )
-			{
-				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['email_validate_text'];
-			}
-			
-			/* User then admin? */
-			if( $this->settings['reg_auth_type'] == 'admin_user' )
-			{
-				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['user_admin_validation'];
-			}
-			
-			if( $this->settings['reg_auth_type'] == 'admin' )
-			{
-				$this->lang->words['std_text'] .= "<br />" . $this->lang->words['just_admin_validation'];
-			}
-		}
-    	
-		$captchaHTML	= '';
-		$qandaHTML		= '';
-		$this->cache->updateCacheWithoutSaving('_hasStep3', 0);
-		
-		/* Q and A Challenge */
-		if( $this->settings['registration_qanda'] )
-		{
-			// Grab a random question...
-			$question	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'question_and_answer', 'order' => $this->DB->buildRandomOrder(), 'limit' => array(1) ) );
-			
-			if( count($question) )
-			{
-				$qandaHTML	= $this->registry->output->getTemplate('global_other')->questionAndAnswer( $question );
-			}
-		}
-    	
-		/* Custom Profile Fields */
-		$custom_fields_out = array( 'required', 'optional' );
-				
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$custom_fields = new $classToLoad();
-		
-		$custom_fields->member_data = $this->memberData;
-		$custom_fields->initData( 'edit' );
-		$custom_fields->parseToEdit( 'register' );
-		
-		if ( count( $custom_fields->out_fields ) )
-		{
-			$this->cache->updateCacheWithoutSaving('_hasStep3', 1);
-			
-			foreach( $custom_fields->out_fields as $id => $form_element )
-	    	{
-				if ( $custom_fields->cache_data[ $id ]['pf_not_null'] == 1 )
-				{
-					$ftype = 'required';
-				}
-				else
-				{
-					$ftype = 'optional';
-				}
-				
-				$custom_fields_out[$ftype][] = array( 
-														'name'  => $custom_fields->field_names[ $id ], 
-														'desc'  => $custom_fields->field_desc[ $id ], 
-														'field' => $form_element, 
-														'id'    => $id,
-														'error' => '',
-														'type'	=> $custom_fields->cache_data[ $id ]['pf_type']
-														);
-	    	}
-		}
-		
-		/* CAPTCHA */
-		if( $this->settings['bot_antispam_type'] != 'none' )
-		{
-			$captchaHTML = $this->registry->getClass('class_captcha')->getTemplate();
-		}
-		
-		$this->registry->output->setTitle( $this->lang->words['registration_form'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->output->addNavigation( $this->lang->words['registration_form'], '' );
-		
-		/* Other errors */
-		$final_errors = array( 'username' => NULL, 'dname' => NULL, 'password' => NULL, 'email' => NULL );
-
-		foreach( array( 'username', 'dname', 'password', 'email' ) as $thing )
-		{
-			if ( isset($form_errors[ $thing ]) AND is_array( $form_errors[ $thing ] ) AND count( $form_errors[ $thing ] ) )
-			{
-				$final_errors[ $thing ] = implode( "<br />", $form_errors[ $thing ] );
-			}
-		}
-		
-		$this->request['UserName'] = 				$this->request['UserName']				? $this->request['UserName'] 				: '' ;
-		$this->request['PassWord'] = 				$this->request['PassWord'] 				? $this->request['PassWord'] 				: '' ;
-		$this->request['EmailAddress'] = 			$this->request['EmailAddress'] 			? $this->request['EmailAddress'] 			: '' ;
-		$this->request['EmailAddress_two'] = 		$this->request['EmailAddress_two']		? $this->request['EmailAddress_two']		: '' ;
-		$this->request['PassWord_Check'] = 			$this->request['PassWord_Check'] 		? $this->request['PassWord_Check'] 			: '' ;
-		$this->request['members_display_name'] = 	$this->request['members_display_name']	? $this->request['members_display_name']	: '' ;
-		$this->request['time_offset'] = 			$this->request['time_offset'] 			? $this->request['time_offset'] 			: '' ;
-		$this->request['allow_member_mail'] = 		$this->request['allow_member_mail']		? $this->request['allow_member_mail']		: '' ;
-		$this->request['dst'] = 					$this->request['dst']					? $this->request['dst']						: '' ;
-		
-		/* Time zone... */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_usercp' ), 'core' );
-		
-		$time_select		= array();
-		
-		foreach( $this->lang->words as $k => $v )
-		{
-			if( strpos( $k, "time_" ) === 0 )
-			{
-				$k				= str_replace( "time_", '', $k );
-
-				if( preg_match( '/^[\-\d\.]+$/', $k ) )
-				{
-					$time_select[ $k ]	= $v;
-				}
-			}
-		}
-		
-		ksort( $time_select );
-		
-		/* set default.. */
-		$this->request['time_offset'] = ( $this->request['time_offset'] ) ? $this->request['time_offset'] : $this->settings['time_offset'];
-		
-		/* Need username? */
-		$uses_name	= false;
-		
-		foreach( $this->cache->getCache('login_methods') as $method )
-		{
-			if( $method['login_user_id'] == 'username' )
-			{
-				$uses_name	= true;
-			}
-		}
-
- 		/* Get form HTML */
-		$this->output .= $this->registry->output->getTemplate('register')->registerForm(
-																					$form_errors['general'],
-																					array( 
-																							'TEXT'			=> $this->lang->words['std_text'], 
-																							'coppa_user'	=> $coppa,
-																							'captchaHTML'   => $captchaHTML,
-																							'qandaHTML'		=> $qandaHTML,
-																							'requireName'	=> $uses_name,
-																						), 
-																					$final_errors, 
-																					$time_select,
-																					$custom_fields_out );
-		
-		/* Run the member sync module */
-		IPSLib::runMemberSync( 'onRegisterForm' );
-	}
-	
 	/**
 	 * Processes the registration form
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
  	public function registerProcessForm()
  	{
-		if( $this->memberData['member_id'] )
-		{
-	    	$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-	    	$this->han_login =  new $classToLoad( $this->registry );
-	    	$this->han_login->init();
-	    	
-			//-----------------------------------------
-			// Set some cookies
-			//-----------------------------------------
-			
-			IPSCookie::set( "member_id" , "0"  );
-			IPSCookie::set( "pass_hash" , "0"  );
-			IPSCookie::set( "anonlogin" , "-1" );
-			
-			if ( is_array($_COOKIE) )
-	 		{
-	 			foreach( $_COOKIE as $cookie => $value)
-	 			{
-	 				if ( stripos( $cookie, $this->settings['cookie_id']."ipbforum" ) !== false )
-	 				{
-	 					IPSCookie::set( str_replace( $this->settings['cookie_id'], "", $cookie ) , '-', -1 );
-	 				}
-	 			}
-	 		}
-	
-			//-----------------------------------------
-			// Logout callbacks...
-			//-----------------------------------------
-			
-			$this->han_login->logoutCallback();
-			
-			//-----------------------------------------
-			// Do it..
-			//-----------------------------------------
-			
-			$this->member->sessionClass()->convertMemberToGuest();
-
-			list( $privacy, $loggedin ) = explode( '&', $this->memberData['login_anonymous'] );
-	
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'login_anonymous' => "{$privacy}&0",
-																							  'last_activity'   => time() ) ) );
-		}
+		$this->_resetMember();
 			
 		$form_errors			= array();
 		$coppa					= ( $this->request['coppa_user'] == 1 ) ? 1 : 0;
 		$in_password			= trim( $this->request['PassWord'] );
-		$in_email				= mb_strtolower( trim( $this->request['EmailAddress'] ) );
-		$_SFS_FOUND             = FALSE;
+		$in_email		= strtolower( trim( $this->request['EmailAddress'] ) );
 
-		/* Check */
-		if( $this->settings['no_reg'] > 0 )
+		/* Did we agree to the t&c? */
+		if( ! $this->request['agree_tos'] )
     	{
-    		$this->registry->output->showError( 'registration_disabled', 2016, true );
+			$form_errors['tos']	= array( $this->lang->words['must_agree_to_terms'] );
     	}
     	
 		/* Custom profile field stuff */
@@ -1606,51 +1770,15 @@ class public_core_global_register extends ipsCommand
 			$form_errors['password'][$this->lang->words['passwords_not_match']] = $this->lang->words['passwords_not_match'];
 		}
 		
-		/* Test email address */
-		$this->request['EmailAddress_two'] = mb_strtolower( trim( $this->request['EmailAddress_two'] ) );
-		$this->request['EmailAddress']     = mb_strtolower( trim( $this->request['EmailAddress'] ) );
-		
-		if( !IPSText::checkEmailAddress( $this->request['EmailAddress_two'] ) )
-		{
-			$form_errors['email'][$this->lang->words['reg_error_email_invalid']] = $this->lang->words['reg_error_email_invalid'];
-		}
-		else
-		{		
-			if ( $in_email AND $this->request['EmailAddress_two'] != $in_email )
-			{
-				$form_errors['email'][$this->lang->words['reg_error_email_nm']] = $this->lang->words['reg_error_email_nm'];
-			}
-		}
-		
-		/* Need username? */
-		$uses_name	= false;
-		
-		foreach( $this->cache->getCache('login_methods') as $method )
-		{
-			if( $method['login_user_id'] == 'username' )
-			{
-				$uses_name	= true;
-			}
-		}
-		
-		if( !$uses_name )
-		{
-			$_REQUEST['UserName']		= $_REQUEST['members_display_name'];
-			$this->request['UserName']	= $this->request['members_display_name'];
-		}
-		
-		/* Set the display name, if empty */
-		$this->request['members_display_name'] = $this->request['members_display_name'] ? $this->request['members_display_name'] : $this->request['UserName'];
-		
 		/* Check the username */
-		$user_check = IPSMember::getFunction()->cleanAndCheckName( $this->request['UserName'], array(), 'name' );
+		$user_check = IPSMember::getFunction()->cleanAndCheckName( $this->request['members_display_name'], array(), 'name' );
 		$disp_check = IPSMember::getFunction()->cleanAndCheckName( $this->request['members_display_name'], array(), 'members_display_name' );
 
 		if( is_array( $user_check['errors'] ) && count( $user_check['errors'] ) )
 		{
 			foreach( $user_check['errors'] as $key => $error )
 			{
-				$form_errors[ $key ][]	= isset($this->lang->words[ $error ]) ? $this->lang->words[ $error ] : $error;
+				$form_errors['dname'][ $error ]	= isset($this->lang->words[ $error ]) ? $this->lang->words[ $error ] : $error;
 			}
 		}
 
@@ -1658,12 +1786,8 @@ class public_core_global_register extends ipsCommand
 		{
 			foreach( $disp_check['errors'] as $key => $error )
 			{
-				if( !$this->settings['auth_allow_dnames'] AND !( is_array( $user_check['errors'] ) && count( $user_check['errors'] ) ) )
-				{
-					$key	= 'username';
-				}
-				
-				$form_errors[ $key ][]	= isset($this->lang->words[ $error ]) ? $this->lang->words[ $error ] : $error;
+				/* this duplicates username error above */
+				//$form_errors['dname'][ $error ]	= isset($this->lang->words[ $error ]) ? $this->lang->words[ $error ] : $error;
 			}
 		}
 
@@ -1707,13 +1831,12 @@ class public_core_global_register extends ipsCommand
 		}
 		
 		/* Check the Q and A */
-		if( $this->settings['registration_qanda'] )
-		{
 			$qanda	= intval($this->request['qanda_id']);
-			$pass	= false;
+		$pass	= true;
 			
 			if( $qanda )
 			{
+			$pass	= false;
 				$data	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'question_and_answer', 'where' => 'qa_id=' . $qanda ) );
 				
 				if( $data['qa_id'] )
@@ -1724,7 +1847,9 @@ class public_core_global_register extends ipsCommand
 					{
 						foreach( $answers as $answer )
 						{
-							if( mb_strtolower($answer) == mb_strtolower($this->request['qa_answer']) )
+						$answer	= trim($answer);
+
+						if( strlen($answer) AND strtolower($answer) == strtolower($this->request['qa_answer']) )
 							{
 								$pass	= true;
 								break;
@@ -1741,9 +1866,9 @@ class public_core_global_register extends ipsCommand
 				
 				$data	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as questions', 'from' => 'question_and_answer' ) );
 				
-				if( !$data['questions'] )
+			if( $data['questions'] )
 				{
-					$pass	= true;
+				$pass	= false;
 				}
 			}
 			
@@ -1751,7 +1876,6 @@ class public_core_global_register extends ipsCommand
 			{
 				$form_errors['general'][$this->lang->words['err_q_and_a']] = $this->lang->words['err_q_and_a'];
 			}
-		}
 
 		/* CHECK 2: Any errors ? */		
 		if ( count( $form_errors ) )
@@ -1775,24 +1899,55 @@ class public_core_global_register extends ipsCommand
 				
 		/* Create member */
 		$member = array(
-						 'name'						=> $this->request['UserName'],
+						 'name'						=> $this->request['members_display_name'],
 						 'password'					=> $in_password,
-						 'members_display_name'		=> $this->settings['auth_allow_dnames'] ? $this->request['members_display_name'] : $this->request['UserName'],
+						 'members_display_name'		=> $this->request['members_display_name'],
 						 'email'					=> $in_email,
 						 'member_group_id'			=> $mem_group,
 						 'joined'					=> time(),
 						 'ip_address'				=> $this->member->ip_address,
 						 'time_offset'				=> $this->request['time_offset'],
 						 'coppa_user'				=> $coppa,
-						 'members_auto_dst'			=> intval($this->request['dst']),
+						 'members_auto_dst'			=> intval($this->settings['time_dst_auto_detection']),
 						 'allow_admin_mails'		=> intval( $this->request['allow_admin_mail'] ),
-						 'hide_email'				=> $this->request['allow_member_mail'] ? 0 : 1,
 					   );
 	
 		/* Spam Service */
 		$spamCode 	= 0;
 		$_spamFlag	= 0;
-						
+		
+		if( $this->settings['spam_service_enabled'] )
+		{
+			/* Query the service */
+			$spamCode = IPSMember::querySpamService( $in_email );
+        
+			/* Action to perform */
+			$action = $this->settings[ 'spam_service_action_' . $spamCode ];
+        
+			/* Perform Action */
+			switch( $action )
+			{
+				/* Proceed with registration */
+				case 1:
+				break;
+        
+				/* Flag for admin approval */
+				case 2:
+        			$member['member_group_id'] = $this->settings['auth_group'];
+					$this->settings['reg_auth_type'] = 'admin';
+					$_spamFlag	= 1;
+				break;
+        
+				/* Approve the account, but ban it */
+				case 3:
+        			$member['member_banned']			= 1;
+					$member['member_group_id']			= $this->settings['banned_group'];
+					$member['bw_is_spammer']			= 1;
+					$this->settings['reg_auth_type']	= '';
+				break;
+			}
+		}
+				
 		//-----------------------------------------
 		// Create the account
 		//-----------------------------------------
@@ -1823,7 +1978,7 @@ class public_core_global_register extends ipsCommand
 		// Validation
 		//-----------------------------------------
 		
-		$validate_key = md5( IPSLib::makePassword() . time() );
+		$validate_key = md5( IPSMember::makePassword() . time() );
 		$time         = time();
 		
 		if( $coppa != 1 )
@@ -1839,7 +1994,7 @@ class public_core_global_register extends ipsCommand
 				$this->DB->insert( 'validating', array(
 													  'vid'         => $validate_key,
 													  'member_id'   => $member['member_id'],
-													  'real_group'  => /*$this->settings['subsm_enforce'] ? $this->settings['subsm_nopkg_group'] :*/ $this->settings['member_group'],
+													  'real_group'  => $this->settings['member_group'],
 													  'temp_group'  => $this->settings['auth_group'],
 													  'entry_date'  => $time,
 													  'coppa_user'  => $coppa,
@@ -1861,7 +2016,7 @@ class public_core_global_register extends ipsCommand
 														'CODE'         => $validate_key,
 													  ) );
 												
-					IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email'] . $this->settings['board_name'];
+					IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['new_registration_email'], $this->settings['board_name'] );
 					IPSText::getTextClass('email')->to      = $member['email'];
 					
 					IPSText::getTextClass('email')->sendMail();
@@ -1874,7 +2029,8 @@ class public_core_global_register extends ipsCommand
 					$this->output     = $this->registry->output->getTemplate('register')->showPreview( $member );
 				}
 				
-				if( $this->settings['new_reg_notify'] )
+				/* Only send new registration email if the member wasn't banned */
+				if( $this->settings['new_reg_notify'] AND $member['member_group_id'] != $this->settings['banned_group'] )
 				{
 					$date = $this->registry->class_localization->getDate( time(), 'LONG', 1 );
 					
@@ -1886,7 +2042,7 @@ class public_core_global_register extends ipsCommand
 																		 'IP'			=> $member['ip_address'],
 																		 'DISPLAY_NAME'	=> $member['members_display_name'] ) );
 																 
-					IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email1'] . $this->settings['board_name'];
+					IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['new_registration_email1'], $this->settings['board_name'] );
 					IPSText::getTextClass('email')->to      = $this->settings['email_in'];
 					IPSText::getTextClass('email')->sendMail();
 				}
@@ -1910,7 +2066,8 @@ class public_core_global_register extends ipsCommand
 				
 				$this->cache->setCache( 'stats', $stat_cache, array( 'array' => 1 ) );
 				
-				if( $this->settings['new_reg_notify'] )
+				/* Only send new registration email if the member wasn't banned */
+				if( $this->settings['new_reg_notify'] AND $member['member_group_id'] != $this->settings['banned_group'] )
 				{
 					$date = $this->registry->class_localization->getDate( time(), 'LONG', 1 );
 					
@@ -1922,7 +2079,7 @@ class public_core_global_register extends ipsCommand
 																		 'IP'			=> $member['ip_address'],
 																		 'DISPLAY_NAME'	=> $member['members_display_name'] ) );
 												
-					IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email1'] . $this->settings['board_name'];
+					IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['new_registration_email1'], $this->settings['board_name'] );
 					IPSText::getTextClass('email')->to      = $this->settings['email_in'];
 					IPSText::getTextClass('email')->sendMail();
 				}
@@ -1946,6 +2103,8 @@ class public_core_global_register extends ipsCommand
 																			'member_group'  => $member['member_group_id'],
 																			'login_type'	  => $privacy ) );
 				
+				IPSLib::runMemberSync( 'onCompleteAccount', $member );
+
 				$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=core&module=global&section=login&do=autologin&fromreg=1');
 			}
 		}
diff --git a/upload/admin/applications/core/modules_public/global/reputation.php b/upload/admin/applications/core/modules_public/global/reputation.php
index 3ce09fde..b7d68a73 100644
--- a/upload/admin/applications/core/modules_public/global/reputation.php
+++ b/upload/admin/applications/core/modules_public/global/reputation.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reputation
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-10-14 10:30:53 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9620 $
  *
  */
 
@@ -28,9 +28,8 @@ class public_core_global_reputation extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -46,8 +45,7 @@ class public_core_global_reputation extends ipsCommand
 	/**
 	 * Adds a rating to the index
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doRating()
 	{
@@ -60,13 +58,13 @@ class public_core_global_reputation extends ipsCommand
 		/* Check */
 		if( ! $app || ! $type || ! $type_id || ! $rating )
 		{
-			$this->registry->output->showError( 'reputation_missing_data', 10126 );
+			$this->registry->output->showError( 'reputation_missing_data', 10126, false, false, 403 );
 		}
 		
 		/* Check the secure key. Needed here to prevent direct URLs from increasing reps */
 		if ( $this->request['secure_key'] != $this->member->form_hash )
 		{
-			$this->registry->output->showError( 'reputation_missing_data', 10126 );
+			$this->registry->output->showError( 'reputation_missing_data', 10126, false, false, 403 );
 		}
 			
 		/* Get the rep library */
@@ -76,14 +74,14 @@ class public_core_global_reputation extends ipsCommand
 		/* Add the rating */
 		if( ! $repCache->addRate( $type, $type_id, $rating, '', 0, $app ) )
 		{
-			$this->registry->output->showError( $repCache->error_message, 10127 );
+			$this->registry->output->showError( $repCache->error_message, 10127, false, false, 403 );
 		}
 		else
 		{
 			/* Redirect to */
 			$return_url = '';
 			
-			if( isset( $this->request['post_return'] ) && $this->request['post_return'] )
+			if( !empty( $this->request['post_return'] ) )
 			{
 				$return_url = $this->settings['base_url'] . 'app=forums&module=forums&section=findpost&pid=' . intval( $this->request['post_return'] );
 			}
diff --git a/upload/admin/applications/core/modules_public/global/rss.php b/upload/admin/applications/core/modules_public/global/rss.php
index 549ecc28..417f0c99 100644
--- a/upload/admin/applications/core/modules_public/global/rss.php
+++ b/upload/admin/applications/core/modules_public/global/rss.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS output functionality
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 18th March 2005
- * @version		$Revision: 7003 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,13 +30,13 @@ class public_core_global_rss extends ipsCommand
 	 *
 	 * @var		string			XML document content
 	 */
-	private $to_print			= '';
+	protected $to_print			= '';
 
 	/**
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -78,7 +78,7 @@ class public_core_global_rss extends ipsCommand
 		{
 			if( IPSLib::appIsInstalled( IPSText::alphanumericalClean( $this->request['type'] ) ) )
 			{
-				if( file_exists( IPSLib::getAppDir( IPSText::alphanumericalClean( $this->request['type'] ) ) . '/extensions/rssOutput.php' ) )
+				if( is_file( IPSLib::getAppDir( IPSText::alphanumericalClean( $this->request['type'] ) ) . '/extensions/rssOutput.php' ) )
 				{
 					$type = IPSText::alphanumericalClean( $this->request['type'] );
 				}
@@ -91,8 +91,8 @@ class public_core_global_rss extends ipsCommand
 		
 		if( IPSLib::appIsInstalled($type) )
 		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $type ) . '/extensions/rssOutput.php', 'rss_output_'.$type, $type );
-			$rss_library = new $classToLoad( $this->registry );
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $type ) . '/extensions/rssOutput.php', 'rss_output_'.$type, $type );
+			$rss_library	= new $classToLoad( $this->registry );
 			
 			$this->to_print	= $rss_library->returnRSSDocument();
 			$expires		= $rss_library->grabExpiryDate();
diff --git a/upload/admin/applications/core/modules_public/global/share.php b/upload/admin/applications/core/modules_public/global/share.php
index e06ef60b..174e3a03 100644
--- a/upload/admin/applications/core/modules_public/global/share.php
+++ b/upload/admin/applications/core/modules_public/global/share.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Captcha
- * Last Updated: $Date: 2010-01-15 15:18:44 +0000 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-06-02 18:58:10 -0400 (Thu, 02 Jun 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8954 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,10 +29,22 @@ class public_core_global_share extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
+		/* Disabled? */
+		if ( ! $this->settings['sl_enable'] )
+		{
+			$this->registry->output->showError( 'no_permission', 100234.1, false, null, 403 );
+		}
+		
+		/* Disable for bots */
+		if( $this->member->is_not_human )
+		{
+			$this->registry->output->showError( 'no_permission', 100234.2, false, null, 403 );
+		}
+		
 		$url   = IPSText::base64_decode_urlSafe( $this->request['url'] );
 		$title = IPSText::base64_decode_urlSafe( $this->request['title'] );
 		$key   = trim( $this->request['key'] );
diff --git a/upload/admin/applications/core/modules_public/help/defaultSection.php b/upload/admin/applications/core/modules_public/help/defaultSection.php
index 4a082572..adcead3c 100644
--- a/upload/admin/applications/core/modules_public/help/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/help/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default help section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'help' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'help';
\ No newline at end of file
+$DEFAULT_SECTION = 'help';
diff --git a/upload/admin/applications/core/modules_public/help/help.php b/upload/admin/applications/core/modules_public/help/help.php
index c3ed85f3..317e59b5 100644
--- a/upload/admin/applications/core/modules_public/help/help.php
+++ b/upload/admin/applications/core/modules_public/help/help.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Help File System
- * Last Updated: $Date: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6997 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -35,7 +35,7 @@ class public_core_help_help extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -62,7 +62,7 @@ class public_core_help_help extends ipsCommand
 	/**
 	 * Show help topics
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
  	public function helpShowTitles()
  	{
@@ -71,7 +71,7 @@ class public_core_help_help extends ipsCommand
 		
 		
 		/* Query the help topics */
-		$this->DB->build( array( 'select' => 'id, title, description', 'from' => 'faq', 'order'  => 'position ASC' ) );
+		$this->DB->build( array( 'select' => 'id, title, description, app', 'from' => 'faq', 'order'  => 'position ASC' ) );
 		$this->DB->execute();
 		
 		/* Loop through topics */		
@@ -79,6 +79,11 @@ class public_core_help_help extends ipsCommand
 
 		while( $row = $this->DB->fetch() )
 		{
+			if( !IPSLib::appIsInstalled( $row['app'] ) )
+			{
+				continue;
+			}
+
 			if( isset( $seen[ $row['title'] ] ) )
 			{
 				continue;
@@ -93,7 +98,7 @@ class public_core_help_help extends ipsCommand
 		}
 		
 		/* Output */
-		$this->output .= $this->registry->output->getTemplate( 'help' )->helpShowTopics( 
+		$this->output .= $this->registry->output->getTemplate('help')->helpShowTopics( 
 																						$this->lang->words['page_title'], 
 																						$this->lang->words['help_txt'], 
 																						$this->lang->words['choose_file'], 
@@ -108,7 +113,7 @@ class public_core_help_help extends ipsCommand
 	/**
 	 * Displays a help file
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
  	public function helpShowSection()
  	{
@@ -128,18 +133,17 @@ class public_core_help_help extends ipsCommand
 		{
 			$this->registry->output->showError( 'help_no_id', 10128 );
 		}
-		
-		/* Load the Parser */
-		IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_html		= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'help';
-		
-		$topic['text']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $topic['text'] );
-		
+
 		/* Parse out board URL */
 		$topic['text'] = str_replace( '{board_url}', $this->settings['base_url'], $topic['text'] );
+
+		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'global';
+		
+		$topic['text']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $topic['text'] );
 		
 		if ( $this->request['hl'] )
 		{
diff --git a/upload/admin/applications/core/modules_public/help/index.html b/upload/admin/applications/core/modules_public/help/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/help/index.html
+++ b/upload/admin/applications/core/modules_public/help/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/index.html b/upload/admin/applications/core/modules_public/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/index.html
+++ b/upload/admin/applications/core/modules_public/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/modcp/defaultSection.php b/upload/admin/applications/core/modules_public/modcp/defaultSection.php
new file mode 100644
index 00000000..1b447f47
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/modcp/defaultSection.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file		defaultSection.php 	Define the default section for the 'modcp' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
+ */
+
+$DEFAULT_SECTION = 'modcp';
diff --git a/upload/admin/applications/core/modules_public/modcp/editmember.php b/upload/admin/applications/core/modules_public/modcp/editmember.php
new file mode 100644
index 00000000..9e2394c8
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/modcp/editmember.php
@@ -0,0 +1,1457 @@
+<?php
+/**
+ * @file		editmember.php 	Moderator ability to edit members
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/16/2011
+ * $LastChangedDate: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9520 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_modcp_editmember
+ * @brief		Moderator ability to edit members
+ * 
+ */
+class public_core_modcp_editmember extends ipsCommand
+{
+	/**
+	 * Temporary stored output HTML
+	 *
+	 * @var		string
+	 */
+	public $output;
+	
+	/**
+	 * Editor engine
+	 *
+	 * @var		object
+	 */
+	protected $editor;
+
+	/**
+	 * Moderator information
+	 *
+	 * @var		array
+	 */
+	protected $moderator		= array();
+
+	/**
+	 * Can ban member from warn panel
+	 *
+	 * @var		bool
+	 */
+	protected $canSuspend		= 0;
+
+	/**
+	 * Can mod queue member from warn panel
+	 *
+	 * @var		bool
+	 */
+	protected $canModQueue		= 0;
+
+	/**
+	 * Can remove posting rights from member from warn panel
+	 *
+	 * @var		bool
+	 */
+	protected $canRemovePostAbility	= 0;
+
+	/**
+	 * Number of times per day member can be warned
+	 *
+	 * @var		integer
+	 */
+	protected $restrictWarnsPerDay	= 0;
+
+	/**
+	 * Type of member
+	 *
+	 * @var		string
+	 */
+	protected $type			= 'mod';
+	
+	/**
+	 * Data for the member being warned
+	 *
+	 * @var		array
+	 */
+	protected $warn_member	= array();
+
+	/**
+	 * Error message
+	 *
+	 * @var		string
+	 */
+	protected $_error		= '';
+
+	/**
+	 * Class entry point
+	 *
+	 * @param	object		$registry	Registry reference
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		if( $this->request['do'] != 'setAsSpammer' )
+		{
+			$this->loadData();
+		}
+
+		$this->lang->loadLanguageFile( array( 'public_modcp' ) );
+
+		//-----------------------------------------
+		// Bouncy, bouncy!
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'index':
+				$this->_moderatorIndex();
+			break;
+
+			case 'doeditmember':
+				$this->_doEditMember();
+			break;
+			
+			case 'setAsSpammer':
+				$this->_setAsSpammer();
+			break;
+
+			case 'dowarn':
+				$this->_doWarn();
+			break;
+			
+			case 'add_note':
+				$this->_addNoteform();
+				$this->registry->output->addNavigation( $this->lang->words['w_title'], '' );
+			break;
+			
+			case 'save_note':
+				$this->_saveNote();
+			break;
+				
+			case 'view':
+				$this->viewLog();
+				$this->registry->output->addNavigation( $this->lang->words['w_title'], '' );
+			break;
+		}
+
+		$this->registry->output->addContent( $this->output );
+
+		if( $this->request['popup'] )
+		{
+			$this->registry->getClass('output')->popUpWindow( $this->output );
+		}
+		else
+		{
+			$this->registry->output->sendOutput();
+		}
+	}
+	
+	/**
+	 * Index page to moderator controls
+	 *
+	 * @return	@e void
+	 */
+	protected function _moderatorIndex()
+	{
+		//-----------------------------------------
+		// Get tab contents
+		//-----------------------------------------
+		
+		$editMember	= '';
+		$warnForm	= '';
+		$logs		= '';
+		$noteForm	= '';
+		
+		if ( $this->memberData['g_is_supmod'] )
+		{
+			$editMember	= $this->_editMember();
+		}
+
+		if ( $this->settings['warn_on'] )
+		{
+			$warnForm	= $this->_showForm();
+			$logs		= $this->viewLog( true );
+			$noteForm	= $this->_addNoteForm( true );
+		}
+		
+		if( !$editMember AND !$warnForm AND !$logs AND !$noteForm )
+		{
+			$this->registry->output->showError( 'warn_no_access', 2025.1, null, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// Figure out return URL stuff
+		//-----------------------------------------
+		
+		$return	= array();
+		
+		if( $this->request['pf'] )
+		{
+			$return	= $this->warn_member;
+		}
+		else if( $this->request['t'] )
+		{
+			$return	= $this->DB->buildAndFetch( array( 'select' => 'tid, title_seo, title', 'from' => 'topics', 'where' => 'tid=' . intval($this->request['t']) ) );
+		}
+		
+		if ( !$return['members_display_name'] )
+		{
+			$return['members_display_name'] = $this->warn_member['members_display_name'];
+		}
+
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$this->output	.= $this->registry->getClass('output')->getTemplate('modcp')->modControls( $editMember, $warnForm, $logs, $noteForm, $return );
+
+		$this->registry->getClass('output')->setTitle( $this->lang->words['cp_em_title'] . ' - ' . $this->settings['board_name'] );
+		$this->registry->getClass('output')->addNavigation( sprintf( $this->lang->words['cp_vp_title'], $this->warn_member['members_display_name'] ), "showuser={$this->warn_member['member_id']}", $this->warn_member['members_seo_name'], 'showuser' );
+		$this->registry->getClass('output')->addNavigation( $this->lang->words['cp_em_title'], '' );
+	}
+
+	/**
+	 * Load all necessary properties
+	 *
+	 * @return	@e void
+	 */
+	public function loadData()
+	{
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$this->settings['warn_min']	= $this->settings['warn_min'] ? $this->settings['warn_min'] : 0;
+		$this->settings['warn_max']	= $this->settings['warn_max'] ? $this->settings['warn_max'] : 10;
+
+		//-----------------------------------------
+		// Get forum libraries
+		//-----------------------------------------
+		
+		ipsRegistry::getAppClass( 'forums' );
+
+		//-----------------------------------------
+		// Make sure we're a moderator...
+		//-----------------------------------------
+		
+		$pass = 0;
+
+		if( $this->memberData['member_id'] )
+		{
+			if( $this->memberData['g_is_supmod'] == 1 )
+			{
+				$pass				        = 1;
+				$this->canSuspend	        = $this->settings['warn_gmod_ban'];
+				$this->canModQueue	        = $this->settings['warn_gmod_modq'];
+				$this->canRemovePostAbility	= $this->settings['warn_gmod_post'];
+				$this->restrictWarnsPerDay	= intval($this->settings['warn_gmod_day']);
+				$this->canApprovePosts      = 1;
+				$this->canApproveTopics     = 1;
+				$this->canDeletePosts       = 1;
+				$this->canDeleteTopics      = 1;
+				$this->type		   	        = 'supmod';
+			}
+			else if( $this->memberData['is_mod'] )
+			{
+				$other_mgroups	= array();
+				$_other_mgroups	= IPSText::cleanPermString( $this->memberData['mgroup_others'] );
+				
+				if( $_other_mgroups )
+				{
+					$other_mgroups	= explode( ",", $_other_mgroups );
+				}
+				
+				$other_mgroups[] = $this->memberData['member_group_id'];
+
+				$this->DB->build( array( 
+										'select' => '*',
+										'from'   => 'moderators',
+										'where'  => "(member_id='" . $this->memberData['member_id'] . "' OR (is_group=1 AND group_id IN(" . implode( ",", $other_mgroups ) . ")))" 
+								)	);
+											  
+				$this->DB->execute();
+				
+				while ( $this->moderator = $this->DB->fetch() )
+				{
+					if ( $this->moderator['allow_warn'] )
+					{
+						$pass				        = 1;
+						$this->canSuspend		    = $this->settings['warn_mod_ban'];
+						$this->canModQueue	        = $this->settings['warn_mod_modq'];
+						$this->canRemovePostAbility	= $this->settings['warn_mod_post'];
+						$this->restrictWarnsPerDay	= intval($this->settings['warn_mod_day']);
+						$this->canApprovePosts      = $this->moderator['post_q'];
+						$this->canApproveTopics     = $this->moderator['topic_q'];
+						$this->canDeletePosts       = $this->moderator['delete_post'];
+						$this->canDeleteTopics      = $this->moderator['delete_topic'];
+						$this->type			        = 'mod';
+					}
+				}
+			}			
+			
+			if( $this->settings['warn_show_own'] and $this->memberData['member_id'] == $this->request['mid'] and !$pass )
+			{
+				$pass				        = 1;
+				$this->canSuspend           = 0;
+				$this->canModQueue	        = 0;
+				$this->canRemovePostAbility	= 0;
+				$this->restrictWarnsPerDay	= 0;
+				$this->canApprovePosts      = 0;
+				$this->canApproveTopics     = 0;
+				$this->canDeletePosts       = 0;
+				$this->canDeleteTopics      = 0;
+				$this->type			        = 'member';
+			}			
+		}
+			
+		if ( !$pass )
+		{
+			$this->registry->output->showError( 'warn_no_access', 2025, null, null, 403 );
+		}
+
+		//-----------------------------------------
+		// Ensure we have a valid member
+		//-----------------------------------------
+		
+		$mid	= intval($this->request['mid']);
+		
+		if ( $mid < 1 )
+		{
+			$this->registry->output->showError( 'warn_no_user', 10249, null, null, 404 );
+		}
+		
+		$this->warn_member	= IPSMember::load( $mid, 'all' );
+
+		if ( ! $this->warn_member['member_id'] )
+		{
+			$this->registry->output->showError( 'warn_no_user', 10250, null, null, 404 );
+		}
+		
+		//-----------------------------------------
+		// Get editor
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor	= new $classToLoad();
+	}
+	
+	/**
+	 * View the warn logs
+	 *
+	 * @param	bool	$return	Return output instead of printing
+	 * @return	@e mixed
+	 */
+	public function viewLog( $return=false )
+	{
+		$perpage	= 50;
+		$start		= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
+		$row		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as cnt', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['member_id']}" ) );
+		$rows		= array();
+		$match		= array();
+
+		if( $this->request['do'] == 'view' )
+		{
+			$url	= "app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$this->warn_member['member_id']}";
+		}
+		else
+		{
+			$url	= "app=core&amp;module=modcp&amp;section=editmember&amp;_tab=warnlogs&amp;mid={$this->warn_member['member_id']}";
+		}
+		
+		$links		= $this->registry->output->generatePagination( array(
+																		'totalItems'		=> $row['cnt'],
+																		'itemsPerPage'		=> $perpage,
+																		'currentStartValue'	=> $start,
+																		'baseUrl'			=> $url,
+												 )	  );
+				
+		if ( $row['cnt'] > 0 )
+		{
+			$this->DB->build( array( 
+									'select'	=> 'l.*',
+									'from'		=> array( 'warn_logs' => 'l' ),
+									'where'		=> 'l.wlog_mid=' . $this->warn_member['member_id'],
+									'order'		=> 'l.wlog_date DESC ',
+									'limit'		=> array( $start, $perpage ),
+									'add_join'	=> array(
+														array( 
+															'select'	=> 'p.member_id as punisher_id, p.members_display_name as punisher_name, p.members_seo_name, p.member_group_id, p.mgroup_others',
+															'from'		=> array( 'members' => 'p' ),
+															'where'		=> 'p.member_id=l.wlog_addedby',
+															'type'		=> 'left',
+															)
+														)
+							)		);
+			$q =$this->DB->execute();
+		
+			while ( $r = $this->DB->fetch( $q ) )
+			{
+				if ( strstr( $r['wlog_notes'], '<content>' ) )
+				{
+					preg_match( "#<content>(.+?)</content>#is", $r['wlog_notes'], $match );
+				}
+				else
+				{
+					$_array = unserialize( $r['wlog_notes'] );
+					
+					if ( is_array( $_array ) AND $_array['content'] )
+					{
+						$match[1] = $_array['content'];
+					}
+				}
+				
+				IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+				IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
+				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $r['member_group_id'];
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $r['mgroup_others'];
+		
+				$r['content'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $match[1] );
+				
+				$rows[] = $r;
+			}
+		}
+		
+		$this->registry->getClass('output')->setTitle( $this->lang->words['warn_popup_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
+		
+		if( $return )
+		{
+			return $this->registry->getClass('output')->getTemplate('modcp')->warn_view_log( $this->warn_member, $rows, $links );
+		}
+		else
+		{
+			$this->output .= $this->registry->getClass('output')->getTemplate('modcp')->warn_view_log( $this->warn_member, $rows, $links );
+		}
+	}
+
+	/**
+	 * Form to add a new note
+	 *
+	 * @param	bool	$return	Return output instead of printing
+	 * @return	@e mixed
+	 */
+	protected function _addNoteForm( $return=false )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		if ( $this->type == 'member' )
+		{
+			if( $return )
+			{
+				return false;
+			}
+
+			$this->registry->output->showError( 'warn_member_notes', 2027, null, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+
+		if( $return )
+		{
+			return $this->registry->getClass('output')->getTemplate('modcp')->warn_add_note_form( $this->warn_member );
+		}
+
+		$this->registry->getClass('output')->setTitle( $this->lang->words['warn_popup_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
+		$this->registry->getClass('output')->popUpWindow( $this->registry->getClass('output')->getTemplate('modcp')->warn_add_note_form( $this->warn_member ) );
+	}
+
+	/**
+	 * Save a new note
+	 *
+	 * @return	@e void
+	 */
+	protected function _saveNote()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		if ( $this->type == 'member' )
+		{
+			$this->registry->output->showError( 'warn_member_notes', 2026, null, null, 403 );
+		}
+
+		if ( $this->request['auth_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'no_permission', 3021, null, null, 403 );
+		}
+
+		$content	= '';
+		$note		= trim( $this->request['note'] );
+		$save		= array();
+
+		if ( $note )
+		{
+			//-----------------------------------------
+			// Ready to save?
+			//-----------------------------------------
+		
+			$save['wlog_notes']		= "<content>{$note}</content>";
+			$save['wlog_notes']		.= "<mod></mod>";
+			$save['wlog_notes']		.= "<post></post>";
+			$save['wlog_notes']		.= "<susp></susp>";
+		
+			$save['wlog_mid']		= $this->warn_member['member_id'];
+			$save['wlog_addedby']	= $this->memberData['member_id'];
+			$save['wlog_type']		= 'note';
+			$save['wlog_date']		= time();
+			
+			//-----------------------------------------
+			// Anything to add?
+			//-----------------------------------------
+			
+			IPSLib::doDataHooks( $save , 'warnLogs' );
+			
+			//-----------------------------------------
+			// Enter into warn loggy poos (eeew - poo)
+			//-----------------------------------------
+		
+			$this->DB->insert( 'warn_logs', $save );
+		}
+		
+		//-----------------------------------------
+		// Done...
+		//-----------------------------------------
+		
+		$popup	= $this->request['popup'] ? '&amp;popup=1' : '';
+						
+		$this->registry->output->silentRedirect( $this->settings['base_url'] . "app=core&amp;module=modcp&amp;section=editmember&amp;mid={$this->warn_member['member_id']}" . $popup );
+	}
+
+	/**
+	 * Show the add new warn form
+	 *
+	 * @return	@e string
+	 */
+	protected function _showForm()
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+		
+		if ( ! $this->settings['warn_on'] )
+		{
+			return '';
+		}
+		
+		if ( $this->type == 'member' )
+		{
+			$this->registry->output->showError( 'warn_member_notes', 10255, null, null, 403 );
+		}
+
+		//-----------------------------------------
+		// Editor
+		//-----------------------------------------
+		
+		$this->editor->setAllowBbcode( true );
+		$this->editor->setAllowSmilies( true );
+		$this->editor->setAllowHtml( true );
+		$this->editor->setContent( $this->request['contact'], 'warn' );
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$this->warn_member['warn_level']	= intval($this->warn_member['warn_level']);
+		$this->request['contact']			= $this->request['contact'] ? IPSText::getTextClass( 'bbcode' )->preEditParse( $this->request['contact'] ) : '';
+
+		return $this->registry->getClass('output')->getTemplate('modcp')->warnForm( IPSMember::buildDisplayData( $this->warn_member, '__all__' ),
+																							$this->_error ? $this->lang->words[ $this->_error ] : '',
+																							$this->canModQueue,
+																							$this->canRemovePostAbility,
+																							$this->canSuspend,
+																							$this->editor->show( 'contact' ) );
+	}
+	
+	/**
+	 * Checking method access
+	 *
+	 * @return	@e void
+	 */
+	protected function _checkAccess()
+	{
+		//-----------------------------------------
+		// I've already warned you!!
+		//-----------------------------------------
+		
+		if ( $this->restrictWarnsPerDay > 0 )
+		{
+			$time_to_check = time() - 86400;
+			
+			$check = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as warn_times', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['member_id']} AND wlog_date > {$time_to_check}" ) );
+			
+			if ( $check['warn_times'] >= $this->restrictWarnsPerDay )
+			{
+				$this->registry->output->showError( 'warned_already', 10257, null, null, 403 );
+			}
+		}
+	}
+
+	/**
+	 * Add a new arn entry
+	 *
+	 * @return	@e void
+	 */
+	protected function _doWarn()
+	{
+		//-----------------------------------------
+		// Enabled?
+		//-----------------------------------------
+		
+		if ( ! $this->settings['warn_on'] )
+		{
+			$this->registry->output->showError( 'warn_system_off', 10248 );
+		}
+		
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$save					= array();
+		$err 					= 0;
+		$topicPosts_type		= trim( $this->request['topicPosts_type'] );
+		$topicPosts_topics		= intval( $this->request['topicPosts_topics'] );
+		$topicPosts_replies		= intval( $this->request['topicPosts_replies'] );
+		$topicPosts_lastx		= intval( $this->request['topicPosts_lastx'] );
+		$topicPosts_lastxunits	= trim( $this->request['topicPosts_lastxunits'] );
+		$level_custom			= intval( $this->request['level_custom'] );
+		$ban_indef				= intval( $this->request['ban_indef'] );
+		$member_banned			= intval( $this->warn_member['member_banned'] );
+		$warn_level				= intval( $this->warn_member['warn_level']) ;
+		
+		$this->request['_tab']	= 'warn';
+		
+		//-----------------------------------------
+		// Protected member? Really? o_O
+		//-----------------------------------------
+		
+		if ( strstr( ',' . $this->settings['warn_protected'] . ',', ',' . $this->warn_member['member_group_id'] . ',' ) )
+		{
+			$this->registry->output->showError( 'warn_protected_member', 10256, null, null, 403 );
+		}
+
+		//--------------------------------------
+		// Are we allowed to do this?
+		//--------------------------------------
+		
+		if ( $this->request['level'] == 'add' or ( $this->request['level'] == 'custom' and $level_custom > $warn_level ) )
+		{
+			$this->_checkAccess();
+		}
+
+		if ( $this->type == 'member' )
+		{
+			$this->registry->output->showError( 'warn_member_notes', 2028, null, null, 403 );
+		}
+
+		if ( $this->request['key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'warn_bad_key', 3020, null, null, 403 );
+		}
+
+		//-----------------------------------------
+		// As Celine Dion once squawked, "Show me the reason"
+		//-----------------------------------------
+		
+		if ( trim($this->request['reason']) == "" )
+		{
+			$this->_error	= 'we_no_reason';
+			$this->_moderatorIndex();
+			return;
+		}
+		
+		//-----------------------------------------
+		// Other checks
+		//-----------------------------------------
+		
+		if ( ! $this->settings['warn_past_max'] && $this->request['level'] != 'nochange' )
+		{
+			if ( $this->request['level'] == 'custom' )
+			{
+				if ( $level_custom > $this->settings['warn_max'] )
+				{
+					$err = 1;
+				}
+				else if( $level_custom < $this->settings['warn_min'] )
+				{
+					$err = 2;
+				}
+			}
+			else if ( $this->request['level'] == 'add' )
+			{
+				if ( $warn_level >= $this->settings['warn_max'] )
+				{
+					$err = 1;
+				}
+			}
+			else
+			{
+				if ( $warn_level <= $this->settings['warn_min'] )
+				{
+					$err = 2;
+				}
+			}
+			
+			if ( $err )
+			{
+				$this->registry->output->showError( $err == 1 ? 'warn_past_max_high' : 'warn_past_max_low', 10251 );
+			}
+		}
+
+		//-----------------------------------------
+		// Load Mod Squad
+		//-----------------------------------------
+		
+		$classToLoad		= IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+		$moderatorLibrary	= new $classToLoad( $this->registry );
+
+		//-----------------------------------------
+		// Plussy - minussy?
+		//-----------------------------------------
+		
+		if( $this->request['level'] == 'nochange' )
+		{
+			$save['wlog_type']	= 'nochan';
+		}
+		else
+		{
+			$save['wlog_type']	= ( $this->request['level'] == 'custom' ) ? 'custom' : ( ( $this->request['level'] == 'add' ) ? 'neg' : 'pos' );
+		}
+
+		$save['wlog_date']	= time();
+		
+		//-----------------------------------------
+		// Contacting the member?
+		//-----------------------------------------
+		
+		$test_content = trim( IPSText::br2nl( $_POST['contact'] ) ) ;
+
+		if ( $test_content != "" )
+		{
+			if ( trim($this->request['subject']) == "" )
+			{
+				$this->_error	= 'we_no_subject';
+				$this->_moderatorIndex();
+				return;
+			}
+		
+			unset($test_content);
+			
+			$contact	= $this->editor->process( $_POST['contact'] );
+		
+			IPSText::getTextClass('bbcode')->parse_smilies			= 1;
+			IPSText::getTextClass('bbcode')->parse_html				= 0;
+			IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
+			IPSText::getTextClass('bbcode')->parsing_section		= 'warn';
+			IPSText::getTextClass('bbcode')->parsing_mgroup			= $this->memberData['member_group_id'];
+			IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $this->memberData['mgroup_others'];
+			
+			$contact	= IPSText::getTextClass( 'bbcode' )->preDbParse( $contact );
+
+			$save['wlog_contact']			= $this->request['contactmethod'];
+			$save['wlog_contact_content']	= "<subject>" . $this->request['subject'] . "</subject><content>" . $contact . "</content>";
+
+			if ( $this->request['contactmethod'] == 'email' )
+			{
+				IPSText::getTextClass( 'bbcode' )->parse_smilies			= 0;
+				IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
+				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
+				
+				$contact = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $contact );
+				
+				//-----------------------------------------
+				// Send the email
+				//-----------------------------------------
+				
+				IPSText::getTextClass( 'email' )->getTemplate("email_member");
+					
+				IPSText::getTextClass( 'email' )->buildMessage( array(
+																		'MESSAGE'		=> $contact,
+																		'MEMBER_NAME'	=> $this->warn_member['members_display_name'],
+																		'FROM_NAME'		=> $this->memberData['members_display_name']
+																		)
+																);
+
+				IPSText::getTextClass( 'email' )->subject	= $this->request['subject'];
+				IPSText::getTextClass( 'email' )->to		= $this->warn_member['email'];
+				IPSText::getTextClass( 'email' )->from		= $this->settings['email_out'];
+				IPSText::getTextClass( 'email' )->sendMail();
+			}
+			else
+			{
+				//-----------------------------------------
+				// Grab PM class
+				//-----------------------------------------
+				
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
+				$messengerFunctions = new $classToLoad( $this->registry );
+ 				
+				try
+				{
+				 	$messengerFunctions->sendNewPersonalTopic( $this->warn_member['member_id'],
+															$this->memberData['member_id'], 
+															array(), 
+															$this->request['subject'], 
+															$contact, 
+															array( 'forcePm' => 1 )
+															);
+				}
+				catch( Exception $error )
+				{
+					$msg		= $error->getMessage();
+					$toMember	= IPSMember::load( $this->warn_member['member_id'], 'core' );
+				   
+					if ( strstr( $msg, 'BBCODE_' ) )
+				    {
+						$msg = str_replace( 'BBCODE_', '', $msg );
+	
+						$this->registry->output->showError( $msg, 10252 );
+					}
+					else if ( isset($this->lang->words[ 'err_' . $msg ]) )
+					{
+						$this->lang->words[ 'err_' . $msg ] = $this->lang->words[ 'err_' . $msg ];
+						$this->lang->words[ 'err_' . $msg ] = str_replace( '#NAMES#'   , implode( ",", $messengerFunctions->exceptionData ), $this->lang->words[ 'err_' . $msg ] );
+						$this->lang->words[ 'err_' . $msg ] = str_replace( '#TONAME#'  , $toMember['members_display_name']    , $this->lang->words[ 'err_' . $msg ] );
+						$this->lang->words[ 'err_' . $msg ] = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $this->lang->words[ 'err_' . $msg ] );
+						
+						$this->registry->output->showError( 'err_' . $msg, 10253 );
+					}
+					else if( $msg != 'CANT_SEND_TO_SELF' )
+					{
+						$_msgString = $this->lang->words['err_UNKNOWN'] . ' ' . $msg;
+						$this->registry->output->showError( $_msgString, 10254 );
+					}
+				}
+			}
+		}
+		else
+		{
+			unset($test_content);
+		}
+		
+		//-----------------------------------------
+		// Right - is we banned or wha?
+		//-----------------------------------------
+			
+		$restrict_post						= '';
+		$mod_queue							= '';
+		$susp								= '';
+		$_notes								= array();
+		$_notes['content']					= $this->request['reason'];
+		$_notes['mod']						= $this->request['mod_value'];
+		$_notes['mod_unit']					= $this->request['mod_unit'];
+		$_notes['mod_indef']				= $this->request['mod_indef'];
+		$_notes['post']						= $this->request['post_value'];
+		$_notes['post_unit']				= $this->request['post_unit'];
+		$_notes['post_indef']				= $this->request['post_indef'];
+		$_notes['susp']						= $this->request['susp_value'];
+		$_notes['susp_unit']				= $this->request['susp_unit'];
+		$_notes['ban']						= $ban_indef;
+		$_notes['topicPosts_type']			= $topicPosts_type;
+		$_notes['topicPosts_topics']		= $topicPosts_topics;
+		$_notes['topicPosts_replies']		= $topicPosts_replies;
+		$_notes['topicPosts_lastx']			= $topicPosts_lastx;
+		$_notes['topicPosts_lastxunits']	= $topicPosts_lastxunits;
+		
+		$save['wlog_notes']	= serialize( $_notes );
+
+		//-----------------------------------------
+		// Member Content
+		//-----------------------------------------
+		
+		if ( $topicPosts_type == 'unapprove' OR $topicPosts_type == 'approve' )
+		{
+			$time		= ( $topicPosts_lastxunits == 'd' ) ? ( $topicPosts_lastx * 24 ) : $topicPosts_lastx;
+			$approve	= ( $topicPosts_type == 'approve' ) ? TRUE : FALSE;
+			
+			if ( ( $topicPosts_topics AND $this->canApproveTopics ) AND ( $topicPosts_replies AND $this->canApprovePosts ) )
+			{
+				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'all', $time );
+			}
+			else if ( $topicPosts_topics AND $this->canApproveTopics )
+			{
+				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'topics', $time );
+			}
+			else if ( $topicPosts_replies AND $this->canApprovePosts )
+			{
+				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'replies', $time );
+			}
+		}
+		else if ( $topicPosts_type == 'delete')
+		{
+			$time = ( $topicPosts_lastxunits == 'd' ) ? ( $topicPosts_lastx * 24 ) : $topicPosts_lastx;
+			
+			if ( ( $topicPosts_topics AND $this->canDeleteTopics ) AND ( $topicPosts_replies AND $this->canDeletePosts ) )
+			{
+				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'all', $time );
+			}
+			else if ( $topicPosts_topics AND $this->canDeleteTopics )
+			{
+				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'topics', $time );
+			}
+			else if ( $topicPosts_replies AND $this->canDeletePosts )
+			{
+				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'replies', $time );
+			}
+		}
+
+		//-----------------------------------------
+		// Member Suspension
+		//-----------------------------------------
+		
+		if ( $this->canModQueue )
+		{
+			if ( $this->request['mod_indef'] == 1 )
+			{
+				$mod_queue = 1;
+			}
+			elseif ( $this->request['mod_value'] > 0 )
+			{
+				$mod_queue = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['mod_value']), 'unit' => $this->request['mod_unit']  ) );
+			}
+		}
+		
+		if ( $this->canRemovePostAbility )
+		{
+			if ( $this->request['post_indef'] == 1 )
+			{
+				$restrict_post = 1;
+			}
+			elseif ( $this->request['post_value'] > 0 )
+			{
+				$restrict_post = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['post_value']), 'unit' => $this->request['post_unit']  ) );
+			}
+		}
+		
+		if ( $this->canSuspend )
+		{
+			if ( $ban_indef )
+			{
+				$member_banned = 1;
+			}
+			else if ( $this->request['susp_value'] > 0 )
+			{
+				$susp = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['susp_value']), 'unit' => $this->request['susp_unit']  ) );
+			}
+			
+			//-----------------------------------------
+			// Removing ban?
+			//-----------------------------------------
+			
+			if ( ! $ban_indef AND $member_banned )
+			{
+				$member_banned = 0;
+			}
+		}
+		
+		$save['wlog_mid']		= $this->warn_member['member_id'];
+		$save['wlog_addedby']	= $this->memberData['member_id'];
+		
+		//-----------------------------------------
+		// Anything to add?
+		//-----------------------------------------
+		
+		IPSLib::doDataHooks( $save , 'warnLogs' );
+			
+		//-----------------------------------------
+		// Enter into warn loggy poos (eeew - poo)
+		//-----------------------------------------
+
+		$this->DB->insert( 'warn_logs', $save );
+		
+		//-----------------------------------------
+		// Update member
+		//-----------------------------------------
+		
+		if( $this->request['level'] != 'nochange' )
+		{
+			if ( $this->request['level'] == 'custom' )
+			{
+				$warn_level = $level_custom;
+			}
+			else if ( $this->request['level'] == 'add' )
+			{
+				$warn_level++;
+			}
+			else
+			{
+				$warn_level--;
+			}
+			
+			if ( $warn_level > $this->settings['warn_max'] )
+			{
+				$warn_level = $this->settings['warn_max'];
+			}
+			
+			if ( $warn_level < intval($this->settings['warn_min']) )
+			{
+				$warn_level = intval($this->settings['warn_min']);
+			}
+		}
+		
+		IPSMember::save( $this->warn_member['member_id'], array( 'core' => array(	'mod_posts'		=> $mod_queue,
+																					'restrict_post'	=> $restrict_post,
+																					'temp_ban'		=> $susp,
+																					'member_banned'	=> $member_banned,
+																					'warn_level'	=> $warn_level,
+																					'warn_lastwarn'	=> time() ) ) );
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+
+		$this->_redirect( sprintf( $this->lang->words['w_done_te'], $this->warn_member['members_display_name'] ) );
+	}
+
+	/**
+	 * Flag a user account as a spammer
+	 *
+	 * @return	@e void
+	 */
+	protected function _setAsSpammer()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$member_id	= intval( $this->request['member_id'] );
+		$toSave		= array( 'core' => array( 'bw_is_spammer' => 1 ) );
+		$topicId	= intval($this->request['t']);
+		$topic		= array();
+		
+		if( $topicId )
+		{
+			$topic	= $this->DB->buildAndFetch( array( 'select' => 'tid, title_seo, forum_id', 'from' => 'topics', 'where' => 'tid=' . $topicId ) );
+		}
+		
+		//-----------------------------------------
+		// Load member
+		//-----------------------------------------
+		
+		$member	= IPSMember::load( $member_id );
+		
+		if ( ! $member['member_id'] )
+		{
+			$this->registry->output->showError( 'moderate_no_permission', 10311900, true, null, 404 );
+		}
+		
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+		
+		if( !$this->memberData['g_is_supmod'] AND !$this->memberData['forumsModeratorData'][ $topic['forum_id'] ]['bw_flag_spammers'] )
+		{
+			$this->registry->output->showError( 'moderate_no_permission', 103119, true, null, 403 );
+		}
+
+		if ( strstr( ',' . $this->settings['warn_protected'] . ',', ',' . $member['member_group_id'] . ',' ) )
+		{
+			$this->registry->output->showError( 'moderate_no_permission', 10311901, true, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// How to treat
+		//-----------------------------------------
+
+		if ( $this->settings['spm_option'] )
+		{
+			switch( $this->settings['spm_option'] )
+			{
+				case 'disable':
+					$toSave['core']['restrict_post']      = 1;
+					$toSave['core']['members_disable_pm'] = 2;
+				break;
+
+				case 'unapprove':
+					$toSave['core']['restrict_post']      = 1;
+					$toSave['core']['members_disable_pm'] = 2;
+					
+					//-----------------------------------------
+					// Unapprove posts and topics
+					//-----------------------------------------
+					
+					$this->getModLibrary()->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
+				break;
+
+				case 'ban':
+					//-----------------------------------------
+					// Unapprove posts and topics
+					//-----------------------------------------
+					
+					$this->getModLibrary()->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
+					
+					$toSave	= array(
+									'core'				=> array(
+																'member_banned'		=> 1,
+																'title'				=> '',
+																'bw_is_spammer'		=> 1,
+																),
+									'extendedProfile'	=> array(
+																'signature'			=> '',
+																'pp_about_me'		=> '',
+																)
+									);
+
+					//-----------------------------------------
+					// Photo
+					//-----------------------------------------
+					
+					$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+					$photos			= new $classToLoad( $this->registry );
+					$photos->remove( $member['member_id'] );
+
+					//-----------------------------------------
+					// Profile fields
+					//-----------------------------------------
+			
+					$classToLoad			= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+					$fields					= new $classToLoad();
+					$fields->member_data	= $member;
+					$fields->initData( 'edit' );
+					$fields->parseToSave( array() );
+					
+					if ( count( $fields->out_fields ) )
+					{
+						$toSave['customFields']	= $fields->out_fields;
+					}
+
+					//-----------------------------------------
+					// Update signature content cache
+					//-----------------------------------------
+					
+					IPSContentCache::update( $member['member_id'], 'sig', '' );
+				break;
+			}
+		}
+		
+		//-----------------------------------------
+		// Shut off status imports
+		//-----------------------------------------
+		
+		$bwOptions	= IPSBWOptions::thaw( $member['tc_bwoptions'], 'twitter' );
+		$bwOptions['tc_si_status']	= 0;
+		$twitter	= IPSBWOptions::freeze( $bwOptions, 'twitter' );
+
+		$bwOptions = IPSBWOptions::thaw( $member['fb_bwoptions'], 'facebook' );
+		$bwOptions['fbc_si_status']	= 0;			
+		$facebook	= IPSBWOptions::freeze( $bwOptions, 'facebook' );
+		
+		$toSave['extendedProfile']['tc_bwoptions']	= $twitter;
+		$toSave['extendedProfile']['fb_bwoptions']	= $facebook;
+		
+		//-----------------------------------------
+		// Send email if configured to do so
+		//-----------------------------------------
+		
+		if ( $this->settings['spm_notify'] AND ( $this->settings['email_in'] != $this->memberData['email'] ) )
+		{
+			IPSText::getTextClass('email')->getTemplate( 'possibleSpammer' );
+
+			IPSText::getTextClass('email')->buildMessage( array( 'DATE'			=> $this->registry->class_localization->getDate( $member['joined'], 'LONG', 1 ),
+																 'MEMBER_NAME'	=> $member['members_display_name'],
+																 'IP'			=> $member['ip_address'],
+																 'EMAIL'		=> $member['email'],
+																 'LINK'			=> $this->registry->getClass('output')->buildSEOUrl( "showuser=" . $member['member_id'], 'public', $member['members_seo_name'], 'showuser') ) );
+
+			IPSText::getTextClass('email')->subject	= sprintf( $this->lang->words['new_registration_email_spammer'], $this->settings['board_name'] );
+			IPSText::getTextClass('email')->to		= $this->settings['email_in'];
+			IPSText::getTextClass('email')->sendMail();
+		}
+		
+		//-----------------------------------------
+		// Save member
+		//-----------------------------------------
+		
+		IPSMember::save( $member_id, $toSave );
+		
+		//-----------------------------------------
+		// Notify spam service
+		//-----------------------------------------
+		
+		if( $this->settings['spam_service_send_to_ips'] )
+		{
+			IPSMember::querySpamService( $member['email'], $member['ip_address'], 'markspam' );
+		}
+		
+		//-----------------------------------------
+		// Member sync
+		//-----------------------------------------
+		
+		IPSLib::runMemberSync( 'onSetAsSpammer', $member );
+		
+		//-----------------------------------------
+		// Mod log
+		//-----------------------------------------
+		
+		$this->getModLibrary()->addModerateLog( 0, 0, 0, 0, $this->lang->words['flag_spam_done'] . ': ' . $member['member_id'] . ' - ' . $member['email'] );
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		if( $topicId )
+		{
+			$this->registry->output->redirectScreen( $this->lang->words['flag_spam_done'], $this->settings['base_url'] . "showtopic=" . $topic['tid'] . "&amp;st=" . intval($this->request['st']), $topic['title_seo'], 'showtopic' );
+		}
+		else
+		{
+			$this->registry->output->redirectScreen( $this->lang->words['flag_spam_done'], $this->settings['base_url'] . "showuser=" . $member['member_id'], $member['members_seo_name'], 'showuser' );
+		}
+	}
+	
+	/**
+	 * Save the member updates
+	 *
+	 * @return	@e void
+	 * @todo 	[Future] Determine what items should be editable and allow moderators to edit them
+	 */
+	protected function _doEditMember()
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+		
+		if ( ! $this->memberData['g_is_supmod'] )
+		{
+			$this->registry->output->showError( 'mod_only_supermods', 10370, true, null, 403 );
+		}
+
+		if ( ! $this->memberData['g_access_cp'] AND $this->warn_member['g_access_cp'] )
+		{
+			$this->registry->output->showError( 'mod_admin_edit', 3032, true, null, 403 );
+		}
+
+		if ( $this->request['auth_key'] != $this->member->form_hash )
+		{
+			$this->registry->output->showError( 'no_permission', 3032.1, null, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$editable	= array();
+
+		//-----------------------------------------
+		// Signature and about me
+		//-----------------------------------------
+		
+		$signature	= $this->editor->process( $_POST['Post'] );
+		$aboutme	= $this->editor->process( $_POST['aboutme'] );
+
+		//-----------------------------------------
+		// Parse signature
+		//-----------------------------------------
+		
+		IPSText::getTextClass('bbcode')->parse_smilies			= 0;
+		IPSText::getTextClass('bbcode')->parse_html				= $this->caches['group_cache'][ $this->warn_member['member_group_id'] ]['g_dohtml'];
+		IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
+		IPSText::getTextClass('bbcode')->parsing_section		= 'signatures';
+		IPSText::getTextClass('bbcode')->parsing_mgroup			= $this->warn_member['member_group_id'];
+		IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $this->warn_member['mgroup_others'];
+
+		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
+		$signatureCache	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );
+		
+		//-----------------------------------------
+		// Parse about me
+		//-----------------------------------------
+		
+		IPSText::getTextClass('bbcode')->parse_smilies			= 0;
+		IPSText::getTextClass('bbcode')->parse_html				= $this->caches['group_cache'][ $this->warn_member['member_group_id'] ]['g_dohtml'];
+		IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
+		IPSText::getTextClass('bbcode')->parsing_section		= 'aboutme';
+		IPSText::getTextClass('bbcode')->parsing_mgroup			= $this->warn_member['member_group_id'];
+		IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $this->warn_member['mgroup_others'];
+
+		$aboutme	= IPSText::getTextClass('bbcode')->preDbParse( $aboutme );	
+		
+		//-----------------------------------------
+		// Add to array to save
+		//-----------------------------------------
+		
+		$save['extendedProfile']	= array( 'signature' => $signature, 'pp_about_me' => $aboutme );
+		$save['members']			= array( 'title' => $this->request['title'] );
+
+		if ( $this->request['photo'] == 1 )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+			$photos			= new $classToLoad( $this->registry );
+			$photos->remove( $this->warn_member['member_id'] );
+		}
+		
+		//-----------------------------------------
+		// Profile fields
+		//-----------------------------------------
+
+		$classToLoad			= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields					= new $classToLoad();
+		$fields->member_data	= $this->warn_member;
+		$fields->initData( 'edit' );
+		$fields->parseToSave( $_POST );
+		
+		if ( count( $fields->out_fields ) )
+		{
+			$save['customFields']	= $fields->out_fields;
+		}
+
+		//-----------------------------------------
+		// Write it to the DB.
+		//-----------------------------------------
+		
+		IPSMember::save( $this->warn_member['member_id'], $save );
+		
+		//-----------------------------------------
+		// Update signature content cache
+		//-----------------------------------------
+		
+		IPSContentCache::update( $this->warn_member['member_id'], 'sig', $signatureCache );
+
+		//-----------------------------------------
+		// Add a mod log entry and redirect
+		//-----------------------------------------
+		
+		$this->getModLibrary()->addModerateLog( 0, 0, 0, 0, $this->lang->words['acp_edited_profile'] . " " . $this->warn_member['members_display_name'] );
+
+		$this->_redirect( $this->lang->words['acp_edited_profile'] . " " . $this->warn_member['members_display_name'] );
+	}
+	
+	/**
+	 * Redirect back to where we came from
+	 *
+	 * @param	string	$message	Redirect message
+	 * @return	@e void
+	 */
+	protected function _redirect( $message )
+	{
+		if( $this->request['pf'] )
+		{
+			$this->registry->output->redirectScreen( $message, $this->settings['base_url'] . "showuser=" . $this->warn_member['member_id'], $this->warn_member['members_seo_name'], 'showuser' );
+		}
+		else if( $this->request['t'] )
+		{
+			$topic	= $this->DB->buildAndFetch( array( 'select' => 'tid, title_seo', 'from' => 'topics', 'where' => 'tid=' . intval($this->request['t']) ) );
+
+			$this->registry->output->redirectScreen( $message, $this->settings['base_url'] . "showtopic=" . $topic['tid'] . '&amp;st=' . $this->request['_st'], $topic['title_seo'], 'showtopic' );
+		}
+		else
+		{
+			$this->registry->output->redirectScreen( $message, $this->settings['base_url'] . "app=core&amp;module=modcp" );
+		}
+	}
+
+	/**
+	 * Form to edit a member
+	 *
+	 * @return	@e void
+	 * @todo 	[Future] Determine what items should be editable and allow moderators to edit them
+	 */
+	protected function _editMember()
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if ( ! $this->memberData['g_is_supmod'] )
+		{
+			return '';
+		}
+
+		if ( ! $this->memberData['g_access_cp'] AND $this->warn_member['g_access_cp'] )
+		{
+			return '';
+		}
+		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$editable	= array();
+		
+		//-----------------------------------------
+		// Show about me and signature editors
+		//-----------------------------------------
+		
+		$this->editor->setAllowBbcode( true );
+		$this->editor->setAllowSmilies( false );
+		$this->editor->setAllowHtml( $this->caches['group_cache'][ $this->warn_member['member_group_id'] ]['g_dohtml'] );
+		$this->editor->setContent( $this->warn_member['signature'], 'signatures' );
+		$editable['signature']	= $this->editor->show( 'Post', array( 'noSmilies' => true ) );
+
+		$this->editor->setAllowBbcode( true );
+		$this->editor->setAllowSmilies( false );
+		$this->editor->setAllowHtml( $this->caches['group_cache'][ $this->warn_member['member_group_id'] ]['g_dohtml'] );
+		$this->editor->setContent( $this->warn_member['pp_about_me'], 'aboutme' );
+		$editable['aboutme']	= $this->editor->show( 'aboutme', array( 'noSmilies' => true ) );
+
+		//-----------------------------------------
+		// Other fields
+		//-----------------------------------------
+		
+		$editable['member_id']				= $this->warn_member['member_id'];
+		$editable['members_display_name']	= $this->warn_member['members_display_name'];
+		$editable['title']					= $this->warn_member['title'];
+
+		//-----------------------------------------
+		// Profile fields
+		//-----------------------------------------
+
+		$classToLoad			= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields					= new $classToLoad();
+		$fields->member_data	= $this->warn_member;
+		$fields->initData( 'edit' );
+		$fields->parseToEdit();
+		
+		$editable['_parsedMember']	= IPSMember::buildDisplayData( $this->warn_member );
+
+		//-----------------------------------------
+		// Return the HTML
+		//-----------------------------------------
+		
+		return $this->registry->getClass('output')->getTemplate('modcp')->editUserForm( $editable, $fields );
+	}
+	
+	/**
+	 * Get the moderator library and return it
+	 *
+	 * @return	@e object
+	 */
+	protected function getModLibrary()
+	{
+		static $modLibrary	= null;
+		
+		if( !$modLibrary )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+			$modLibrary		= new $classToLoad( $this->registry );
+			$modLibrary->init( array() );
+		}
+		
+		return $modLibrary;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/modcp/index.html b/upload/admin/applications/core/modules_public/modcp/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/modcp/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/modcp/modcp.php b/upload/admin/applications/core/modules_public/modcp/modcp.php
new file mode 100644
index 00000000..f0192925
--- /dev/null
+++ b/upload/admin/applications/core/modules_public/modcp/modcp.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @file		modcp.php 	Moderator control panel
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-04-20 04:18:03 -0400 (Wed, 20 Apr 2011) $
+ * @version		v3.2.3
+ * $Revision: 8400 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_core_modcp_modcp
+ * @brief		Moderator control panel
+ * 
+ */
+class public_core_modcp_modcp extends ipsCommand
+{	
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Load basic things
+		//-----------------------------------------
+
+		$this->registry->class_localization->loadLanguageFile( array( 'public_modcp' ) );
+		
+		$this->registry->output->setTitle( $this->lang->words['modcp_page_title'] );
+
+		//-----------------------------------------
+		// Which road are we going to take?
+		//-----------------------------------------
+		
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'index':
+				$this->_indexPage();
+			break;
+		}
+
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+
+		$this->registry->getClass('output')->addNavigation( $this->lang->words['modcp_navbar'], "app=core&amp;module=modcp" );
+		$this->registry->getClass('output')->addContent( $this->output );
+		$this->registry->output->sendOutput();
+	}
+	
+	/**
+	 * Show the mod CP portal
+	 *
+	 * @return	@e void
+	 */
+	protected function _indexPage()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		ipsRegistry::getAppClass('forums');
+		$this->request['tab']     = empty($this->request['tab'])	 ? 'index' : trim($this->request['tab']);
+		$this->request['fromapp'] = empty($this->request['fromapp']) ? 'index' : trim($this->request['fromapp']);
+		
+		$_plugins	= array();
+		$_tabs		= array();
+		$_activeNav = array( 'primary' => 'index', 'secondary' => 'index' );
+		$_output	= '';
+		$moderator	= $this->registry->class_forums->getModerator();
+		$tab		= $this->request['tab'];
+		$app		= $this->request['fromapp'];
+		
+		/**
+		 * Loop through all apps and get plugins
+		 * 
+		 * @note	When updating this code below remember to update also the core in public_core_reports_reports
+		 */
+		foreach( IPSLib::getEnabledApplications() as $appDir => $appData )
+		{
+			if( is_dir( IPSLib::getAppDir( $appDir ) . '/extensions/modcp' ) )
+			{
+				try
+				{
+					foreach( new DirectoryIterator( IPSLib::getAppDir( $appDir ) . '/extensions/modcp' ) as $file )
+					{
+						if( ! $file->isDot() && $file->isFile() )
+						{
+							if( preg_match( "/^plugin_(.+?)\.php$/", $file->getFileName(), $matches ) )
+							{
+								//-----------------------------------------
+								// We load each plugin so it can determine
+								// if it should show based on permissions
+								//-----------------------------------------
+								
+								$classToLoad = IPSLib::loadLibrary( $file->getPathName(), 'plugin_' . $appDir . '_' . $matches[1], $appDir );
+								$_plugins[ $appDir ][ $matches[1] ] = new $classToLoad( $this->registry );
+
+								if( $_plugins[ $appDir ][ $matches[1] ]->canView( $moderator ) )
+								{
+									//-----------------------------------------
+									// Hacky solution - we want forum plugins to
+									// come first as they're the most used
+									//-----------------------------------------
+									
+									if( $appDir == 'forums' AND !empty($_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ]) )
+									{
+										array_unshift( $_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ], array( $_plugins[ $appDir ][ $matches[1] ]->getSecondaryTab(), $appDir, $matches[1] ) );
+									}
+									else
+									{
+										$_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ][] = array( $_plugins[ $appDir ][ $matches[1] ]->getSecondaryTab(), $appDir, $matches[1] );
+									}
+									
+									/* Sort active tab */
+									if ( $appDir == $app && $tab == $matches[1] )
+									{
+										$_activeNav = array( 'primary' => $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab(), 'secondary' => $_plugins[ $appDir ][ $matches[1] ]->getSecondaryTab() );
+									}
+								}
+							}
+						}
+					}
+				} catch ( Exception $e ) {}
+			}
+		}
+		
+		//-----------------------------------------
+		// If we can't view any tabs, show an error
+		//-----------------------------------------
+		
+		if( !count($_tabs) )
+		{
+			$this->registry->output->showError( $this->lang->words['modcp_no_access'], 10194.12, false, null, 403 );
+		}
+		
+		//-----------------------------------------
+		// Pass the necessary template variables into the plugin
+		//-----------------------------------------
+
+		$this->registry->output->getTemplate('modcp')->templateVars['tabs'] = $_tabs;
+		$this->registry->output->getTemplate('modcp')->templateVars['activeNav'] = $_activeNav;
+
+		//-----------------------------------------
+		// Get appropriate content to show
+		//-----------------------------------------
+
+		if( $tab AND $app AND isset($_plugins[ $app ][ $tab ]) )
+		{
+			$_output = $_plugins[ $app ][ $tab ]->executePlugin( $moderator );
+		}
+		else
+		{
+			$_output = $this->registry->output->getTemplate('modcp')->memberLookup();
+		}
+
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$this->output .= $this->registry->output->getTemplate('modcp')->portalPage( $_output, $_tabs, $_activeNav );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/reports/defaultSection.php b/upload/admin/applications/core/modules_public/reports/defaultSection.php
index a9d8d636..0bcc9a21 100644
--- a/upload/admin/applications/core/modules_public/reports/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/reports/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default reports section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'reports' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'reports';
\ No newline at end of file
+$DEFAULT_SECTION = 'reports';
diff --git a/upload/admin/applications/core/modules_public/reports/index.html b/upload/admin/applications/core/modules_public/reports/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/reports/index.html
+++ b/upload/admin/applications/core/modules_public/reports/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/reports/reports.php b/upload/admin/applications/core/modules_public/reports/reports.php
index 6baf63b5..9b99e3bc 100644
--- a/upload/admin/applications/core/modules_public/reports/reports.php
+++ b/upload/admin/applications/core/modules_public/reports/reports.php
@@ -1,21 +1,15 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Reports content central management
- * Last Updated: $LastChangedDate: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
+ * @file		reports.php 	Reports content central management
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @author		Based on original "Report Center" by Luke Scott
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6925 $
- *
+ * @since		-
+ * $LastChangedDate: 2011-09-26 15:52:07 -0400 (Mon, 26 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9550 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,14 +18,18 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		public_core_reports_reports
+ * @brief		Reports content central management
+ */
 class public_core_reports_reports extends ipsCommand
 {	
 	/**
-	 * Execute selected method
+	 * Main function executed automatically by the controller
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -49,22 +47,8 @@ class public_core_reports_reports extends ipsCommand
 		//-----------------------------------------
 		// Check permissions...
 		//-----------------------------------------
-		
-		$showReportCenter	= false;
-		
-		$this->member_group_ids	= array( $this->memberData['member_group_id'] );
-		$this->member_group_ids	= array_diff( array_merge( $this->member_group_ids, explode( ',', $this->memberData['mgroup_others'] ) ), array('') );
-		$report_center		= array_diff( explode( ',', $this->settings['report_mod_group_access'] ), array('') );
 
-		foreach( $report_center as $groupId )
-		{
-			if( in_array( $groupId, $this->member_group_ids ) )
-			{
-				$showReportCenter	= true;
-			}
-		}
-		
-		if( ($this->request['do'] AND $this->request['do'] != 'report') AND !$showReportCenter )
+		if( $this->request['do'] AND $this->request['do'] != 'report' AND !IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $this->settings['report_mod_group_access'] ) ) ) )
 		{
 			$this->registry->output->showError( 'no_reports_permission', 2018, true, null, 403 );
 		}
@@ -80,31 +64,87 @@ class public_core_reports_reports extends ipsCommand
 			default:
 			case 'report':
 				$this->_initReportForm();
-			break;
+				break;
 			
 			case 'showMessage':
 				$this->_viewReportedMessage();
-			break;
+				break;
 			
 			case 'index':
 				$this->_displayReportCenter();
-			break;
+				break;
 			
 			case 'process':
 				$this->_processReports();
-			break;
+				break;
 			
 			case 'findfirst':
 				$this->findFirstReport();
-			break;
+				break;
 
 			case 'show_report':
 				$this->_displayReport();
-			break;
+				break;
+		}
+		
+		if( $this->request['do'] AND $this->request['do'] != 'report' )
+		{
+			/* Init some data */
+			$_tabs		= array();
+			$_activeNav = array( 'primary' => 'reported_content', 'secondary' => 'reports' );
+			$moderator	= $this->registry->class_forums->getModerator();
 			
-			case 'save_comment':
-				$this->_saveComment();
-			break;
+			$this->registry->class_localization->loadLanguageFile( array( 'public_modcp' ), 'core' );
+
+			/**
+			 * Loop through all apps and get plugins
+			 * 
+			 * @note	When updating this code below remember to update also the core in public_core_modcp_modcp
+			 */
+			foreach( IPSLib::getEnabledApplications() as $appDir => $appData )
+			{
+				if( is_dir( IPSLib::getAppDir( $appDir ) . '/extensions/modcp' ) )
+				{
+					try
+					{
+						foreach( new DirectoryIterator( IPSLib::getAppDir( $appDir ) . '/extensions/modcp' ) as $file )
+						{
+							if( ! $file->isDot() && $file->isFile() )
+							{
+								if( preg_match( "/^plugin_(.+?)\.php$/", $file->getFileName(), $matches ) )
+								{
+									//-----------------------------------------
+									// We load each plugin so it can determine
+									// if it should show based on permissions
+									//-----------------------------------------
+									
+									$classToLoad = IPSLib::loadLibrary( $file->getPathName(), 'plugin_' . $appDir . '_' . $matches[1], $appDir );
+									$_plugins[ $appDir ][ $matches[1] ] = new $classToLoad( $this->registry );
+	
+									if( $_plugins[ $appDir ][ $matches[1] ]->canView( $moderator ) )
+									{
+										//-----------------------------------------
+										// Hacky solution - we want forum plugins to
+										// come first as they're the most used
+										//-----------------------------------------
+										
+										if( $appDir == 'forums' AND !empty($_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ]) )
+										{
+											array_unshift( $_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ], array( $_plugins[ $appDir ][ $matches[1] ]->getSecondaryTab(), $appDir, $matches[1] ) );
+										}
+										else
+										{
+											$_tabs[ $_plugins[ $appDir ][ $matches[1] ]->getPrimaryTab() ][] = array( $_plugins[ $appDir ][ $matches[1] ]->getSecondaryTab(), $appDir, $matches[1] );
+										}
+									}
+								}
+							}
+						}
+					} catch ( Exception $e ) {}
+				}
+			}
+			
+			$this->output = $this->registry->output->getTemplate('modcp')->portalPage( $this->output, $_tabs, $_activeNav );
 		}
 
 		//-----------------------------------------
@@ -118,10 +158,9 @@ class public_core_reports_reports extends ipsCommand
 	/**
 	 * View a reported private message as it shows in the messenger
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _viewReportedMessage()
+	public function _viewReportedMessage()
 	{
 		//-----------------------------------------
 		// Do we have permission?
@@ -129,7 +168,7 @@ class public_core_reports_reports extends ipsCommand
 		
 		$this->registry->getClass('reportLibrary')->buildQueryPermissions();
 
-		if( !in_array( $this->memberData['member_group_id'], explode( ',', $this->registry->getClass('reportLibrary')->plugins['messages']->_extra['plugi_messages_add'] ) ) )
+		if( !IPSMember::isInGroup( $this->memberData, explode( ',', $this->registry->getClass('reportLibrary')->plugins['messages']->_extra['plugi_messages_add'] ) ) )
 		{
 			$this->registry->getClass('output')->showError( 'no_permission_addreport', 20115, null, null, 403 );
 		}
@@ -207,10 +246,9 @@ class public_core_reports_reports extends ipsCommand
 	/**
 	 * Main function for displaying reports in a list
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _displayReportCenter()
+	public function _displayReportCenter()
 	{
 		//-----------------------------------------
 		// Check for rss key and if none make one
@@ -230,48 +268,94 @@ class public_core_reports_reports extends ipsCommand
 		
 		$COM_PERM = $this->registry->getClass('reportLibrary')->buildQueryPermissions();
 		
-		$reports		= array();
+		$reports = array();
+		
+		//-----------------------------------------
+		// By default we will only show active reports.
+		// If there are no active reports, show all instead.
+		// Alternatively, user can click a show all link we need to honor.
+		//-----------------------------------------
+		
+		$_where	= $COM_PERM . ' AND stat.is_active=1';
+
+		if( $this->request['showall'] )
+		{
+			$_where	= $COM_PERM;
+		}
 
 		//-----------------------------------------
 		// Show me the money! err.. Reports!
 		//-----------------------------------------
 		
 		$total = $this->DB->buildAndFetch( array(
-														'select'	=> 'COUNT(*) as reports',
-														'from'		=> array( 'rc_reports_index' => 'rep' ),
-														'where'		=> $COM_PERM,
-														'add_join'	=> array(
-																			array(
-																				'from'	=> array( 'rc_classes' => 'rcl' ),
-																				'where'	=> 'rcl.com_id=rep.rc_class'
-																				)
+												'select'	=> 'COUNT(*) as reports',
+												'from'		=> array( 'rc_reports_index' => 'rep' ),
+												'where'		=> $_where,
+												'add_join'	=> array(
+																	array(
+																		'from'	=> array( 'rc_classes' => 'rcl' ),
+																		'where'	=> 'rcl.com_id=rep.rc_class'
+																		),
+																	array(
+																		'from'	=> array( 'rc_status' => 'stat' ),
+																		'where'	=> 'stat.status=rep.status'
+																		)
+																	)
+										)		);
+
+		if( !$total['reports'] AND !$this->request['showall'] )
+		{
+			$this->request['showall']	= 1;
+
+			$_where	= $COM_PERM;
+			$total	= $this->DB->buildAndFetch( array(
+													'select'	=> 'COUNT(*) as reports',
+													'from'		=> array( 'rc_reports_index' => 'rep' ),
+													'where'		=> $_where,
+													'add_join'	=> array(
+																		array(
+																			'from'	=> array( 'rc_classes' => 'rcl' ),
+																			'where'	=> 'rcl.com_id=rep.rc_class'
+																			),
+																		array(
+																			'from'	=> array( 'rc_status' => 'stat' ),
+																			'where'	=> 'stat.status=rep.status'
 																			)
-												)		);
-
-
+																		)
+											)		);
+		}
 		
-		$this->DB->buildFromCache( 'reports_index', array( 'WHERE' => $COM_PERM, 'START' => intval($this->request['st']), 'LIMIT' => 10 ), 'report_sql_queries' );
+		$this->DB->buildFromCache( 'reports_index', array( 'WHERE' => $_where, 'START' => intval($this->request['st']), 'LIMIT' => 10 ), 'report_sql_queries' );
 		$res = $this->DB->execute();
 		
 		while( $row = $this->DB->fetch($res) )
 		{
+			$row['_isRead']		= $this->registry->classItemMarking->isRead( array( 'forumID' => 0, 'itemID' => $row['id'], 'itemLastUpdate' => $row['date_updated'] ), 'core' );
 			$sec_data			= $this->registry->getClass('reportLibrary')->plugins[$row['my_class']]->giveSectionLinkTitle( $row );
 			$sec_data['url']	= $this->registry->getClass('reportLibrary')->processUrl( $sec_data['url'], $sec_data['seo_title'], $sec_data['seo_template'] );
 			$row['points']		= isset( $row['points'] ) ? $row['points'] :  $this->settings['_tmpPoints'][ $row['id'] ];
 			$row['section']		= $sec_data;
-			$row['status_icon']	= $this->_buildStatusIcon( $row );
+			$row['status_icon']	= $this->registry->getClass('reportLibrary')->buildStatusIcon( $row );
 			
 			$reports[ $row['id'] ]	= $row;
+			
+			$members_to_load[] = $row['updated_by'];
+		}
+		
+		$members = IPSMember::load( $members_to_load );
+		
+		foreach( $reports as $id => $data )
+		{
+			$reports[ $id ]['member'] = IPSMember::buildDisplayData( $members[ $data['updated_by'] ] );
 		}
 		
 		//-----------------------------------------
-		// Statuses
+		// Manually build status array without severities
 		//-----------------------------------------
 		
 		$stats	= array();
 		$_tmp	= $this->registry->getClass('reportLibrary')->flag_cache;
-		
-		// Manually build array get just the statuses, not severities
+
 		foreach( $_tmp as $sid => $sta )
 		{
 			if( is_array( $sta ) && count( $sta ) )
@@ -292,23 +376,29 @@ class public_core_reports_reports extends ipsCommand
 		// Display Page Navigation
 		//-----------------------------------------
 
-		$pages = $this->registry->output->generatePagination( array( 'totalItems'			=> $total['reports'],
-																		'itemsPerPage'		=> 10,
-																		'currentStartValue'	=> $this->request['st'],
-																		'baseUrl'			=> 'app=core&amp;module=reports&amp;do=index'
+		$_url	= 'app=core&amp;module=reports&amp;do=index';
+		
+		if( $this->request['showall'] )
+		{
+			$_url	.= '&amp;showall=1';
+		}
+
+		$pages	= $this->registry->output->generatePagination( array( 'totalItems'			=> $total['reports'],
+																	  'itemsPerPage'		=> 10,
+																	  'currentStartValue'	=> $this->request['st'],
+																	  'baseUrl'				=> $_url
 									  )
 							   );
 		
-		$this->output .= $this->registry->getClass('output')->getTemplate('reports')->reportsIndex( $reports, $this->registry->getClass('reportLibrary')->buildStatuses(), $pages, $this->_getStats( 1 ), $stats );
+		$this->output .= $this->registry->getClass('output')->getTemplate('reports')->reportsIndex( $reports, $this->registry->getClass('reportLibrary')->buildStatuses(), $pages, $stats );
 	}
 	
 	/**
 	 * Basic functions for processing actions on 'Report Index' page (Drop Down)
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _processReports()
+	public function _processReports()
 	{
 		//-----------------------------------------
 		// Check form key
@@ -339,11 +429,11 @@ class public_core_reports_reports extends ipsCommand
 			
 			if( $total_pruned )
 			{
-				$this->registry->output->redirectScreen( $this->lang->words['report_prune_message_done'],  $this->settings['base_url'] . "app=core&module=reports&do=index&st=" . $this->request['st'] );
+				$this->registry->output->redirectScreen( $this->lang->words['report_prune_message_done'],  $this->settings['base_url'] . "app=core&module=reports&do=index" );
 			}
 			else
 			{
-				$this->registry->output->redirectScreen( $this->lang->words['report_prune_message_none'],  $this->settings['base_url'] . "app=core&module=reports&do=index&st=" . $this->request['st'] );
+				$this->registry->output->redirectScreen( $this->lang->words['report_prune_message_none'],  $this->settings['base_url'] . "app=core&module=reports&do=index" );
 			}
 		}
 		
@@ -371,7 +461,7 @@ class public_core_reports_reports extends ipsCommand
 					$this->_deleteReports( $ids, true );
 					$this->registry->getClass('reportLibrary')->updateCacheTime();
 					
-					$this->registry->output->redirectScreen( $this->lang->words['redirect_delete_report'],  $this->settings['base_url'] . "app=core&module=reports&do=index&st=" . $this->request['st'] );
+					$this->registry->output->redirectScreen( $this->lang->words['redirect_delete_report'],  $this->settings['base_url'] . "app=core&module=reports&do=index" );
 				}
 				else
 				{
@@ -389,7 +479,7 @@ class public_core_reports_reports extends ipsCommand
 					
 					$this->registry->getClass('reportLibrary')->updateCacheTime();
 					
-					$this->registry->output->redirectScreen( $this->lang->words['redirect_mark_status'],  $this->settings['base_url'] . "app=core&module=reports&do=index&st=" . $this->request['st'] );
+					$this->registry->output->redirectScreen( $this->lang->words['redirect_mark_status'],  $this->settings['base_url'] . "app=core&module=reports&do=index" );
 				}
 			}
 		}
@@ -411,8 +501,7 @@ class public_core_reports_reports extends ipsCommand
 	/**
 	 * Finds first post reported using topic-id
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function findFirstReport()
 	{
@@ -439,10 +528,9 @@ class public_core_reports_reports extends ipsCommand
 	/**
 	 * Main function for making reports and uses the custom plugins
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _initReportForm()
+	public function _initReportForm()
 	{
 		//-----------------------------------------
 		// Make sure we have an rcom
@@ -459,7 +547,7 @@ class public_core_reports_reports extends ipsCommand
 		// Request plugin info from database
 		//-----------------------------------------
 
-		$row = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'rc_classes', 'where' => "my_class='{$rcom}' AND onoff=1" ) );
+		$row = $this->caches['report_plugins'][ $rcom ];
 		
 		if( !$row['com_id'] )
 		{
@@ -471,7 +559,7 @@ class public_core_reports_reports extends ipsCommand
 			// Can this group report this type of page?
 			//-----------------------------------------
 			
-			if( $row['my_class'] == '' || count( array_diff($this->member_group_ids, explode(',', $row['group_can_report'])) ) >= count( $this->member_group_ids ) )
+			if( !$row['my_class'] OR !IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $row['group_can_report'] ) ) ) )
 			{
 				$this->registry->output->showError( 'reports_cant_report', 10136, null, null, 403 );
 			}
@@ -544,7 +632,7 @@ class public_core_reports_reports extends ipsCommand
 				//-----------------------------------------
 				// Send out notfications...
 				//-----------------------------------------
-				
+
 				$notify->initNotify( $this->registry->getClass('reportLibrary')->plugins[ $row['my_class'] ]->getNotificationList( IPSText::cleanPermString( $row['mod_group_perm'] ), $report_data ), $report_data );
 				$notify->sendNotifications();
 				
@@ -558,21 +646,18 @@ class public_core_reports_reports extends ipsCommand
 	}
 	
 	/**
-	 * Handles ajax/non-ajax window for reports and comments linked from reports
+	 * Displays a report
 	 *
-	 * @access	private
-	 * @return	boolean
+	 * @return	@e void
 	 */
-	private function _displayReport()
+	public function _displayReport()
 	{
 		//-----------------------------------------
 		// Lets make sure this report exists...
 		//-----------------------------------------
 		
 		$rid		= intval($this->request['rid']);
-		$options	= array(
-							'rid'	=> $rid
-							);
+		$options	= array( 'rid'	=> $rid );
 		$reports	= array();
 		$comments	= array();
 
@@ -592,7 +677,7 @@ class public_core_reports_reports extends ipsCommand
 		$this->registry->output->addNavigation( $this->lang->words['main_title'], 'app=core&amp;module=reports&amp;do=index' );
 		$this->registry->output->addNavigation( $report_index['title'], '' );
 
-		if( $this->DB->getTotalRows() == 0 )
+		if ( !$report_index['id'] )
 		{
 			$this->registry->output->showError( 'reports_no_rid', 10138 );
 		}
@@ -636,15 +721,10 @@ class public_core_reports_reports extends ipsCommand
 			
 			$options['title'] = $row['title'];
 			$options['status_id'] = $row['status'];
-			
-			if( !$options['image'] && $row['img_preview'] )
-			{
-				$options['image'] = $this->registry->getClass('reportLibrary')->processUrl( $row['img_preview'], $row['seoname'], $row['seotemplate'] );
-			}
-			
+
 			if( !$options['status_icon'] )
 			{
-				$options['status_icon']	= $this->_buildStatusIcon( $row );
+				$options['status_icon']	= $this->registry->getClass('reportLibrary')->buildStatusIcon( $row );
 				$options['status_text']	= $this->registry->getClass('reportLibrary')->flag_cache[ $row['status'] ][ $row['points'] ]['title'];
 			}
 			
@@ -656,7 +736,6 @@ class public_core_reports_reports extends ipsCommand
 			
 			$row['title']   = $row['_title'];
 			$row['report']	= IPSText::getTextClass('bbcode')->preDisplayParse( $row['report'] );
-			$row['report']	= IPSText::getTextClass( 'bbcode' )->memberViewImages( $row['report'] );
 
 			$reports[]	= $row;
 		}
@@ -688,57 +767,19 @@ class public_core_reports_reports extends ipsCommand
 		//-----------------------------------------
 		// Get comments
 		//-----------------------------------------
-		
-		$ids = array( 0 => 0 );
-		
-		$this->DB->build( array( 'select'	=> 'id',
-								 'from'		=> 'rc_comments',
-								 'where'	=> 'rid=' . $rid,
-								 'group'	=> 'id' ) );
-		
-		$this->DB->execute();
-		
-		while( $row = $this->DB->fetch() )
-		{
-			$ids[ $row['id'] ] = $row['id'];
-		}		 
-				
-		$this->DB->build( array(
-									'select'	=> 'comm.*',
-									'from'		=> array( 'rc_comments' => 'comm' ),
-									'where'		=> 'comm.id IN (' . implode( ',', $ids ) . ')',
-									'order'		=> 'comm.comment_date ASC',
-									'add_join'	=> array(
-														array(
-															'select'	=> 'mem.*',
-															'from'		=> array( 'members' => 'mem' ),
-															'where'		=> 'mem.member_id=comm.comment_by',
-															),
-														array(
-															'select'	=> 'grop.*,grop.g_is_supmod as iscop',
-															'from'		=> array( 'groups' => 'grop' ),
-															'where'		=> 'grop.g_id=mem.member_group_id',
-															),
-														array(
-															'select'	=> 'pp.*',
-															'from'		=> array( 'profile_portal' => 'pp' ),
-															'where'		=> 'pp.pp_member_id=mem.member_id',
-															),
-														)
-							)		);
-		$outer = $this->DB->execute();
 
-		while($row = $this->DB->fetch($outer))
-		{
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];
+		require_once( IPS_ROOT_PATH . 'sources/classes/comments/bootstrap.php' );/*noLibHook*/
+		$this->_comments = classes_comments_bootstrap::controller( 'core-reports' );
+		
+		$comments = array( 'html'  => $this->_comments->fetchFormatted( $report_index, array( 'offset' => intval( $this->request['st'] ) ) ),
+						   'count' => $this->_comments->count( $report_index ),
+						  );
 
-			$row['author'] = IPSMember::buildDisplayData( $row['member_id'] );
-			$row['comment']	= IPSText::getTextClass('bbcode')->preDisplayParse( $row['comment'] );
-			$row['comment']	= IPSText::getTextClass( 'bbcode' )->memberViewImages( $row['comment'] );
-			
-			$comments[ $row['id'] ]	= $row;
-		}
+		//-----------------------------------------
+		// Mark as read
+		//-----------------------------------------
+
+		$this->registry->classItemMarking->markRead( array( 'forumID' => 0, 'itemID' => $rid ), 'core' );
 		
 		//-----------------------------------------
 		// And output
@@ -746,93 +787,35 @@ class public_core_reports_reports extends ipsCommand
 
 		$this->output .= $this->registry->getClass('output')->getTemplate('reports')->viewReport( $options, $reports, $comments );
 	}
-	
-	/**
-	 * Recieves comment, submits to database, and redirects user
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	private function _saveComment()
-	{
-		//-----------------------------------------
-		// Make sure we have a report id...
-		//-----------------------------------------
-		
-		$rid = intval($this->request['rid']);
-		
-		if( $rid < 1 )
-		{
-			$this->registry->output->showError( 'reports_no_comment', 10139 );
-		}
-		
-		//-----------------------------------------
-		// Lets make sure we even have this report
-		//-----------------------------------------
-		
-		$report = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'rc_reports_index', 'where' => "id=" . $rid ) );
-
-		if( $report['id'] )
-		{
-			$postContent = IPSText::getTextClass( 'editor' )->processRawPost( $_POST['comment'] );
-			
-			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-			IPSText::getTextClass('bbcode')->parse_html			= 0;
-			IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
-			IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-			IPSText::getTextClass('bbcode')->parsing_section	= 'reports';
-
-			$postContent = IPSText::getTextClass( 'bbcode' )->preDbParse( $postContent );
-
-			if( !trim( IPSText::br2nl($postContent) ) )
-			{
-				$this->registry->output->showError( 'reports_no_comment_text', 10188 );
-			}
-
-			$build_comment = array(
-									'rid'			=> $rid,
-									'comment'		=> $postContent,
-									'comment_by'	=> $this->memberData['member_id'],
-									'comment_date'	=> time()
-								);
-			
-			$this->DB->insert( 'rc_comments', $build_comment );
-			$this->DB->update( 'rc_reports_index', array( 'num_comments' => $report['num_comments'] + 1, 'date_updated' => time(), 'updated_by' => $this->memberData['member_id'] ), "id=" . $report['id'] );
-		}
-		
-		$this->registry->output->redirectScreen( $this->lang->words['report_comment_saved'], $this->settings['base_url'] . "app=core&amp;module=reports&rid={$report['id']}&do=show_report" );
-	}
 
 	/**
 	 * Responsible for pruning reports. Uses the delete reports function to finish
 	 *
-	 * @access	private
-	 * @param	integer   seconds used for pruning reports
-	 * @return	void
+	 * @param	integer   $stamp	Seconds used for pruning reports
+	 * @return	@e void
 	 */
-	private function _pruneReports( $stamp )
+	public function _pruneReports( $stamp )
 	{
-		$ids	= array();
+		$ids = array();
 
 		//--------------------------------------------------
 		// Let's grab a list of reports and check stuff...
 		//--------------------------------------------------
 		
-		$this->DB->build( array(
-									'select'	=> 'rep.id',
-									'from'		=> array( 'rc_reports_index' => 'rep' ),
-									'where'		=> $this->registry->getClass('reportLibrary')->buildQueryPermissions() . ' AND stat.is_complete=1 And rep.date_updated<' . $stamp,
-									'add_join'	=> array(
-														array(
-															'from'	=> array( 'rc_classes' => 'rcl' ),
-															'where'	=> 'rcl.com_id=rep.rc_class'
-															),
-														array(
-															'from'	=> array( 'rc_status' => 'stat' ),
-															'where'	=> 'stat.status=rep.status'
-															),
-														)
-							)		);
+		$this->DB->build( array('select'	=> 'rep.id',
+								'from'		=> array( 'rc_reports_index' => 'rep' ),
+								'where'		=> $this->registry->getClass('reportLibrary')->buildQueryPermissions() . ' AND stat.is_complete=1 And rep.date_updated<' . $stamp,
+								'add_join'	=> array(
+													array(
+														'from'	=> array( 'rc_classes' => 'rcl' ),
+														'where'	=> 'rcl.com_id=rep.rc_class'
+														),
+													array(
+														'from'	=> array( 'rc_status' => 'stat' ),
+														'where'	=> 'stat.status=rep.status'
+														),
+													)
+						)		);
 		$this->DB->execute();
 
 		while( $row = $this->DB->fetch() )
@@ -855,12 +838,11 @@ class public_core_reports_reports extends ipsCommand
 	/**
 	 * Responsible for deleting reports
 	 *
-	 * @access	private
-	 * @param	string   Report IDS (#,#,#,...)
-	 * @param	boolean  Security check?
-	 * @return	boolean
+	 * @param	string   $rids		Report IDS (#,#,#,...)
+	 * @param	boolean  $toCheck	Security check?
+	 * @return	@e boolean TRUE if all is fine otherwise FALSE
 	 */
-	private function _deleteReports( $rids='', $toCheck=false )
+	public function _deleteReports( $rids='', $toCheck=false )
 	{
 		if( $this->memberData['g_access_cp'] != 1 )
 		{
@@ -882,21 +864,14 @@ class public_core_reports_reports extends ipsCommand
 		
 		if( $toCheck == true )
 		{
-			$this->DB->build( array(
-										'select'	=> 'rep.id, rep.status',
-										'from'		=> array( 'rc_reports_index' => 'rep' ),
-										'where'		=> $this->registry->getClass('reportLibrary')->buildQueryPermissions() . ' AND rep.id IN(' . $rids . ')',
-										'add_join'	=> array(
-															array(
-																'from'	=> array( 'rc_classes' => 'rcl' ),
-																'where'	=> 'rcl.com_id=rep.rc_class'
-																)
-															)
-								)		);
-			$res = $this->DB->execute();
-			$num = $this->DB->getTotalRows();
+			$num = $this->DB->buildAndFetch( array( 'select'	=> 'count(rep.id) as total',
+													'from'		=> array( 'rc_reports_index' => 'rep' ),
+													'where'		=> $this->registry->getClass('reportLibrary')->buildQueryPermissions() . ' AND rep.id IN(' . $rids . ')',
+													'add_join'	=> array( array('from'	=> array( 'rc_classes' => 'rcl' ),
+																				'where'	=> 'rcl.com_id=rep.rc_class' ) )
+												)		);
 
-			if( count( explode( ',' , $rids ) ) != $this->DB->getTotalRows() )
+			if( count( explode( ',' , $rids ) ) != intval($num['total']) )
 			{
 				$this->registry->output->showError( 'reports_like_whoa', 20111, true );
 			}
@@ -918,194 +893,4 @@ class public_core_reports_reports extends ipsCommand
 		
 		return true;
 	}
-
-	/**
-	 * Returns the correct status icon / flag to display for a report row
-	 *
-	 * @access	private
-	 * @param	array    Report Row
-	 * @return	string
-	 */
-	private function _buildStatusIcon( $row )
-	{
-		$this->registry->getClass('reportLibrary')->buildStatuses( true );
-		
-		//-----------------------------------------
-		// Pick the right flag.. or else!
-		//-----------------------------------------
-
-		$row['img']		= str_replace( '<#IMG_DIR#>', $this->registry->output->skin['set_image_dir'], $this->registry->getClass('reportLibrary')->flag_cache[ $row['status'] ][ $row['points'] ]['img'] );
-		$row['width']	= $this->registry->getClass('reportLibrary')->flag_cache[ $row['status'] ][ $row['points'] ]['width'];
-		$row['height']	= $this->registry->getClass('reportLibrary')->flag_cache[ $row['status'] ][ $row['points'] ]['height'];
-		$row['is_png']	= $this->registry->getClass('reportLibrary')->flag_cache[ $row['status'] ][ $row['points'] ]['is_png'];
-
-		//-----------------------------------------
-		// Image? PNG? Using 'Is-Evil' machine?
-		//-----------------------------------------
-		
-		if( $row['img'] != '' )
-		{
-			return $this->registry->getClass('output')->getTemplate('reports')->statusIcon( $row['img'], $row['width'], $row['height'] );
-		}
-		else
-		{
-			return '&nbsp;';
-		}
-	}
-
-	/**
-	 * Builds the "who's viewing" strip
-	 *
-	 * @access	private
-	 * @param	integer  Section ID
-	 * @return	string
-	 */
-	private function _getStats( $id=1 )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$ar_time = time();
-		$cached = array();
-		$guests = array();
-		$active = array( 'guests' => 0, 'anon' => 0, 'members' => 0, 'names' => array() );
-		$rows   = array( $ar_time => array( 'login_type'   => substr($this->memberData['login_anonymous'],0, 1),
-											'running_time' => $ar_time,
-											'id'		   => $this->member->session_id,
-											'seo_name'     => $this->memberData['members_seo_name'],
-											'member_id'	   => $this->memberData['member_id'],
-											'member_name'  => $this->memberData['members_display_name'],
-											'member_group' => $this->memberData['member_group_id'] ) );
-		
-		//-----------------------------------------
-		// Process users active in this forum
-		//-----------------------------------------
-		
-		if ($this->settings['no_au_topic'] != 1)
-		{	
-			//-----------------------------------------
-			// Get the users
-			//-----------------------------------------
-			
-			$cut_off = ($this->settings['au_cutoff'] != "") ? $this->settings['au_cutoff'] * 60 : 900;
-
-			$this->DB->build( array( 
-									'select' => '*',
-									'from'	 => 'sessions',
-									'where'	=> "current_appcomponent='core' AND current_module='reports' AND running_time > " . $cut_off,
-						)		);	 
-			$this->DB->execute();
-					   
-			//-----------------------------------------
-			// FETCH...
-			//-----------------------------------------
-			
-			while ($r = $this->DB->fetch() )
-			{
-				$rows[ $r['running_time'].'.'.$r['id'] ] = $r;
-			}
-			
-			krsort( $rows );
-
-			//-----------------------------------------
-			// PRINT...
-			//-----------------------------------------
-			
-			foreach( $rows as $result )
-			{
-				$result['member_name'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
-				
-				$last_date = $this->registry->class_localization->getTime( $result['running_time'] );
-				
-				if ( $result['member_id'] == 0 OR ! $result['member_name'] )
-				{
-					if ( in_array( $result['id'], $guests ) )
-					{
-						continue;
-					}
-					
-					//-----------------------------------------
-					// Bot?
-					//-----------------------------------------
-
-					if ( $result['uagent_type'] == 'search' )
-					{
-						//-----------------------------------------
-						// Seen bot of this type yet?
-						//-----------------------------------------
-
-						if ( ! $cached[ $result['member_name'] ] )
-						{
-							if ( $this->settings['spider_anon'] )
-							{
-								if ( $this->memberData['g_access_cp'] )
-								{
-									$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-								}
-							}
-							else
-							{
-								$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-							}
-
-							$cached[ $result['member_name'] ] = 1;
-						}
-						else
-						{
-							$active['guests']++;
-							$guests[] = $result['id'];
-						}
-					}
-					else
-					{
-						$active['guests']++;
-						$guests[] = $result['id'];
-					}
-				}
-				else
-				{
-					if (empty( $cached[ $result['member_id'] ] ) )
-					{
-						$cached[ $result['member_id'] ] = 1;
-						
-						$p_start = "";
-						$p_end   = "";
-						$p_title = sprintf( $this->lang->words['au_reading'], $last_date );
-						
-						if ( strstr( $result['current_module'], 'post' ) and $result['member_id'] != $this->memberData['member_id'] )
-						{
-							$p_start = "<span class='activeuserposting'>";
-							$p_end   = "</span>";
-							$p_title = sprintf( $this->lang->words['au_posting'], $last_date );
-						}
-						
-						if ( ! $this->settings['disable_anonymous'] AND $result['login_type'] )
-						{
-							if ( $this->memberData['g_access_cp'] and ($this->settings['disable_admin_anon'] != 1) )
-							{
-								$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'] . '*', 'p_start' => $p_start, 'p_title' => $p_title, 'p_end' => $p_end, 'seo' => $result['seo_name'] );
-								$active['anon']++;
-							}
-							else
-							{
-								$active['anon']++;
-							}
-						}
-						else
-						{
-							$active['members']++;
-							$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'p_start' => $p_start, 'p_title' => $p_title, 'p_end' => $p_end, 'seo' => $result['seo_name'] );
-						}
-					}
-				}
-			}
-						
-			//$active['active_users_title']   = sprintf( $this->lang->words['active_users_title']  , ($active['members'] + $active['guests'] + $active['anon'] ) );
-			//$active['active_users_detail']  = sprintf( $this->lang->words['active_users_detail'] , $active['guests'],$active['anon'] );
-			$active['active_users_members'] = sprintf( $this->lang->words['active_users_members'], $active['members'] );
-			
-			return $active;
-		}
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/search/defaultSection.php b/upload/admin/applications/core/modules_public/search/defaultSection.php
index d2a6005c..3d944e44 100644
--- a/upload/admin/applications/core/modules_public/search/defaultSection.php
+++ b/upload/admin/applications/core/modules_public/search/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default section section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'search' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'search';
\ No newline at end of file
+$DEFAULT_SECTION = 'search';
diff --git a/upload/admin/applications/core/modules_public/search/index.html b/upload/admin/applications/core/modules_public/search/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/search/index.html
+++ b/upload/admin/applications/core/modules_public/search/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/search/search.php b/upload/admin/applications/core/modules_public/search/search.php
index 05191cbe..6772035c 100644
--- a/upload/admin/applications/core/modules_public/search/search.php
+++ b/upload/admin/applications/core/modules_public/search/search.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Global Search
- * Last Updated: $Date: 2010-11-17 03:11:07 -0500 (Wed, 17 Nov 2010) $
+ * Last Updated: $Date: 2011-09-21 16:54:20 -0400 (Wed, 21 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7200 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9532 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,43 +29,43 @@ class public_core_search_search extends ipsCommand
 	 *
 	 * @var		string
 	 */		
-	private $output			= '';
+	protected $output			= '';
 	
 	/**
 	 * Page Title
 	 *
 	 * @var		string
 	 */		
-	private $title			= '';
+	protected $title			= '';
 	
 	/**
 	 * Object to handle searches
 	 *
 	 * @var		string
 	 */	
-	private $search_plugin	= '';
+	protected $search_plugin	= '';
 	
 	/**
 	 * Topics array
 	 *
 	 * @var		array
 	 */
-	private	$_topicArray	= array();
-	private $_removedTerms  = array();
+	protected	$_topicArray	= array();
+	protected $_removedTerms  = array();
 	
 	/**
 	 * Search controller
 	 *
 	 * @var		obj
 	 */		
-	private $searchController;
-	private $_session;
+	protected $searchController;
+	protected $_session;
 
 	/**
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -76,6 +76,12 @@ class public_core_search_search extends ipsCommand
 		/* Reset engine type */
 		$this->settings['search_method'] = ( $this->settings['search_method'] == 'traditional' ) ? 'sql' : $this->settings['search_method'];
 		
+		/* Force SQL for view new content? */
+		if ( ! empty( $this->settings['force_sql_vnc'] ) && $this->request['do'] == 'viewNewContent' )
+		{
+			$this->settings['search_method'] = 'sql';
+		}
+		
 		/* Special consideration for contextual search */
 		if ( isset( $this->request['search_app'] ) AND strstr( $this->request['search_app'], ':' ) )
 		{
@@ -104,7 +110,7 @@ class public_core_search_search extends ipsCommand
 		/* Sanitzie */
 		if ( ! is_string( $this->request['search_app'] ) )
 		{
-			$this->request['search_app'] = '';
+			$this->request['search_app'] = 'forums';
 		}
 		
 		try
@@ -128,10 +134,16 @@ class public_core_search_search extends ipsCommand
 			}
 		}
 		
+		/* Log type */
+		IPSDebug::addMessage( "Search type: " . $this->settings['search_method'] );
+		
 		/* Set up some defaults */
+		IPSSearchRegistry::set('opt.noPostPreview', false );
 		IPSSearchRegistry::set('in.start', intval( $this->request['st'] ) );
 		IPSSearchRegistry::set('opt.search_per_page', intval( $this->settings['search_per_page'] ) ? intval( $this->settings['search_per_page'] ) : 25 );
 		
+		$this->settings['search_ucontent_days']	= ( $this->settings['search_ucontent_days'] ) ? $this->settings['search_ucontent_days'] : 365;
+		
 		/* Contextuals */
 		if ( isset( $this->request['cType'] ) )
 		{
@@ -142,16 +154,14 @@ class public_core_search_search extends ipsCommand
 		/* What to do */
 		switch( $this->request['do'] )
 		{
-			case 'active':
-				$this->activeContent();
-			break;
-			
 			case 'user_activity':
 				$this->viewUserContent();
 			break;
 		
 			case 'new_posts':
-				$this->viewNewPosts();
+			case 'viewNewContent':
+			case 'active':
+				$this->viewNewContent();
 			break;
 			
 			case 'search':
@@ -159,6 +169,14 @@ class public_core_search_search extends ipsCommand
 				$this->searchResults();
 			break;
 			
+			case 'followed':
+				$this->viewFollowedContent();
+			break;
+			
+			case 'manageFollowed':
+				$this->updateFollowedContent();
+			break;
+			
 			default:
 			case 'search_form':	
 				$this->searchAdvancedForm();
@@ -174,11 +192,245 @@ class public_core_search_search extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 	
+	/**
+	 * Moderate your list of liked content
+	 *
+	 * @author	bfarber
+	 * @return	string	HTML to display
+	 */
+	public function updateFollowedContent()
+	{
+		IPSSearchRegistry::set( 'in.search_app', $this->request['search_app'] );
+		
+		//-----------------------------------------
+		// Get the likes we selected
+		//-----------------------------------------
+		
+		$_likes	= array();
+		
+		if( is_array($this->request['likes']) AND count($this->request['likes']) )
+		{
+			foreach( $this->request['likes'] as $_like )
+			{
+				$_thisLike	= explode( '-', $_like );
+				$_likes[]	= array(
+									'app'	=> $_thisLike[0],
+									'area'	=> $_thisLike[1],
+									'id'	=> $_thisLike[2],
+									);
+			}
+		}
+		
+		//-----------------------------------------
+		// Got any?
+		//-----------------------------------------
+		
+		if( !count($_likes) OR !is_array($_likes) )
+		{
+			return $this->viewFollowedContent( $this->lang->words['no_likes_for_del'] );
+		}
+		
+		//-----------------------------------------
+		// Get like helper class
+		//-----------------------------------------
+		
+		$bootstraps		= array();
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		
+		//-----------------------------------------
+		// Loop over and moderate
+		//-----------------------------------------
+		
+		foreach( $_likes as $_like )
+		{
+			$_bootstrap		= classes_like::bootstrap( $_like['app'], $_like['area'] );
+			$_likeKey		= classes_like_registry::getKey( $_like['id'], $this->memberData['member_id'] );
+			$_frequencies	= $_bootstrap->allowedFrequencies();
+
+			//-----------------------------------------
+			// What action to take?
+			//-----------------------------------------
+			
+			switch( $this->request['modaction'] )
+			{
+				case 'delete':
+					$_bootstrap->remove( $_like['id'], $this->memberData['member_id'] );
+				break;
+
+				case 'change-donotify':
+					$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'immediate' ), "like_id='" . addslashes($_likeKey) . "'" );
+				break;
+
+				case 'change-donotnotify':
+					$this->DB->update( 'core_like', array( 'like_notify_do' => 0 ), "like_id='" . addslashes($_likeKey) . "'" );
+				break;
+
+				case 'change-immediate':
+					if( in_array( 'immediate', $_frequencies ) )
+					{
+						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'immediate' ), "like_id='" . addslashes($_likeKey) . "'" );
+					}
+				break;
+
+				case 'change-offline':
+					if( in_array( 'offline', $_frequencies ) )
+					{
+						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'offline' ), "like_id='" . addslashes($_likeKey) . "'" );
+					}
+				break;
+				
+				case 'change-daily':
+					if( in_array( 'daily', $_frequencies ) )
+					{
+						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'daily' ), "like_id='" . addslashes($_likeKey) . "'" );
+					}
+				break;
+				
+				case 'change-weekly':
+					if( in_array( 'weekly', $_frequencies ) )
+					{
+						$this->DB->update( 'core_like', array( 'like_notify_do' => 1, 'like_notify_freq' => 'weekly' ), "like_id='" . addslashes($_likeKey) . "'" );
+					}
+				break;
+
+				case 'change-anon':
+					$this->DB->update( 'core_like', array( 'like_is_anon' => 1 ), "like_id='" . addslashes($_likeKey) . "'" );
+				break;
+
+				case 'change-noanon':
+					$this->DB->update( 'core_like', array( 'like_is_anon' => 0 ), "like_id='" . addslashes($_likeKey) . "'" );
+				break;
+			}
+		}
+
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=search&amp;do=followed&amp;search_app={$this->request['search_app']}&amp;contentType={$this->request['contentType']}&amp;confirm=1" );
+	}
+
+	/**
+	 * View content you are following
+	 *
+	 * @author	Brandon Farber
+	 * @param	string	$error	Error message
+	 * @return	@e void
+	 */
+	public function viewFollowedContent( $error='' )
+	{
+		IPSSearchRegistry::set( 'in.search_app', $this->request['search_app'] );
+		IPSSearchRegistry::set( 'opt.searchType', 'titles' );
+		IPSSearchRegistry::set( 'opt.noPostPreview', true );
+		
+		$results	= array();
+		$formatted	= array();
+		$count		= 0;
+
+		//-----------------------------------------
+		// Determine content type
+		//-----------------------------------------
+		
+		$contentTypes	= IPSSearchRegistry::get('config.followContentTypes');
+
+		//-----------------------------------------
+		// Verify likes are available
+		//-----------------------------------------
+		
+		if( count( IPSLib::getEnabledApplications('like') ) AND count( $contentTypes ) )
+		{
+			//-----------------------------------------
+			// What content type?
+			//-----------------------------------------
+			
+			$_type	= '';
+			
+			if( $this->request['contentType'] AND in_array( $this->request['contentType'], $contentTypes ) )
+			{
+				$_type	= $this->request['contentType'];
+			}
+			else
+			{
+				$_type	= $contentTypes[0];
+			}
+			
+			$this->request['contentType']	= $_type;
+			
+			IPSSearchRegistry::set( 'in.followContentType', $this->request['contentType'] );
+
+			/* Fetch like class */
+			try
+			{
+				require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+				$this->_like = classes_like::bootstrap( IPSSearchRegistry::get('in.search_app'), $_type );
+			}
+			catch ( Exception $e)
+			{
+				/* Fail safe... */
+				$this->registry->output->addNavigation( $this->lang->words['followed_ct_title'], '' );
+				$this->title	= $this->lang->words['followed_ct_title'];
+				$this->output	.= $this->registry->output->getTemplate( 'search' )->followedContentView( array(), '', 0, $error, $contentTypes );
+			}
+					
+			/* Get a count of likes */
+			$count	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as er',
+											  		   'from'   => 'core_like',
+											  		   'where'  => 'like_member_id=' . $this->memberData['member_id'] . " AND like_visible=1 AND like_app='" . IPSSearchRegistry::get('in.search_app') . "' AND like_area='" . $_type . "'" ) );
+			$count	= $count['er'];
+			
+			/* Do we have some custom join and sort data? */
+			if ( method_exists( $this->_like, 'getSearchJoinAndSortBy' ) )
+			{
+				$custom = $this->_like->getSearchJoinAndSortBy();
+				
+				$this->DB->build( array( 'select'   => 'l.*',
+										 'from'     => array('core_like' => 'l'),
+										 'where'    => 'l.like_member_id=' . $this->memberData['member_id'] . " AND l.like_visible=1 AND l.like_app='" . IPSSearchRegistry::get('in.search_app') . "' AND l.like_area='" . $_type . "'",
+										 'add_join' => array( array( 'from' => $custom['from'],
+																	 'where' => $custom['where'] ) ),
+										 'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
+										 'order'    => $custom['order'] . ' DESC' ) );
+			}
+			else
+			{
+				$this->DB->build( array( 'select' => '*',
+										 'from'   => 'core_like',
+										 'where'  => 'like_member_id=' . $this->memberData['member_id'] . " AND like_visible=1 AND like_app='" . IPSSearchRegistry::get('in.search_app') . "' AND like_area='" . $_type . "'",
+										 'limit'  => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
+										 'order'  => 'like_added DESC' ) );
+			}
+			
+			$outer	= $this->DB->execute();
+			
+			while( $r = $this->DB->fetch($outer) )
+			{
+				$results[]	= $r['like_rel_id'];
+
+				$formatted[ $r['like_id'] ]	= $r;
+			}
+
+			/* Process */
+			$results	= $this->searchController->fetchFollowedContentOutput( $results, $formatted );
+	
+			$pages = $this->registry->getClass('output')->generatePagination( array(  'totalItems'			=> $count,
+															   					 	  'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
+																					  'currentStartValue'	=> IPSSearchRegistry::get('in.start'),
+																					  'baseUrl'				=> "app=core&amp;module=search&amp;do=followed&amp;search_app=" . IPSSearchRegistry::get('in.search_app')  . '&amp;sid=' . $this->request['_sid'] ) );
+		}
+		else
+		{
+			$count		= 0;
+			$results	= array();
+		}
+
+		/* Output */
+		$this->registry->output->addNavigation( $this->lang->words['followed_ct_title'], '' );
+		$this->title	= $this->lang->words['followed_ct_title'];
+		$this->output	.= $this->registry->output->getTemplate( 'search' )->followedContentView( $results, $pages, $count, $error, $contentTypes );
+	}
+	
 	/**
 	 * Builds the advanced search form
 	 *
 	 * @param	string	Message
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function searchAdvancedForm( $msg='', $removed_search_terms=array() )
 	{
@@ -188,17 +440,18 @@ class public_core_search_search extends ipsCommand
 		/* Get any application specific filters */
 		$appHtml   = $this->searchController->getHtml();
 		$isBoolean = $this->searchController->isBoolean();
+		$canTag = ( $this->settings['tags_enabled'] && IPSSearchRegistry::get( 'config.can_searchTags' ) ) ? true : false;
 		
 		/* Output */
 		$this->title   = $this->lang->words['search_form'];
 		$this->registry->output->addNavigation( $this->lang->words['search_form'], '' );
-		$this->output .= $this->registry->output->getTemplate( 'search' )->searchAdvancedForm( $appHtml, $msg, $this->request['search_app'], $removed_search_terms, $isBoolean );
+		$this->output .= $this->registry->output->getTemplate( 'search' )->searchAdvancedForm( $appHtml, $msg, $this->request['search_app'], $removed_search_terms, $isBoolean, $canTag );
 	}
 	
 	/**
 	 * Processes a search request
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function searchResults()
 	{
@@ -228,10 +481,11 @@ class public_core_search_search extends ipsCommand
 		IPSSearchRegistry::set('in.search_app'		 , $this->request['search_app'] );
 		IPSSearchRegistry::set('in.raw_search_term'  , trim( $this->request['search_term'] ) );
 		IPSSearchRegistry::set('in.clean_search_term', $search_term );
+		IPSSearchRegistry::set('in.raw_search_tags'  , str_replace( '&amp;', '&', trim( IPSText::parseCleanValue( urldecode( $_REQUEST['search_tags'] ) ) ) ) );
 		IPSSearchRegistry::set('in.search_higlight'  , str_replace( '.', '', $this->request['search_term'] ) );
 		IPSSearchRegistry::set('in.search_date_end'  , ( $this->request['search_date_start'] && $this->request['search_date_end'] )  ? $this->request['search_date_end'] : 'now' );
 		IPSSearchRegistry::set('in.search_date_start', ( $this->request['search_date_start']  )  ? $this->request['search_date_start'] : '' );
-		IPSSearchRegistry::set('in.search_author'    , ( isset( $this->request['search_author'] ) && $this->request['search_author'] ) ? $this->request['search_author'] : '' );
+		IPSSearchRegistry::set('in.search_author'    , !empty( $this->request['search_author'] ) ? $this->request['search_author'] : '' );
 		
 		/* Set sort filters */
 		$this->_setSortFilters();
@@ -242,8 +496,7 @@ class public_core_search_search extends ipsCommand
 		IPSSearchRegistry::set('set.resultsAsForum'   , false );
 		
 		/* Are we option to show titles only / search in titles only */
-		IPSSearchRegistry::set('opt.searchTitleOnly', ( isset( $this->request['content_title_only'] ) && $this->request['content_title_only']  ) ? true : false );
-		IPSSearchRegistry::set('display.onlyTitles' , ( ( $this->request['show_as_titles'] AND $this->settings['enable_show_as_titles'] ) OR ( IPSSearchRegistry::get('opt.searchTitleOnly') ) ) ? true : false );
+		IPSSearchRegistry::set('opt.searchType', ( !empty( $this->request['search_content'] ) AND in_array( $this->request['search_content'], array( 'both', 'titles', 'content' ) ) ) ? $this->request['search_content'] : 'both' );
 		
 		/* Time check */
 		if ( IPSSearchRegistry::get('in.search_date_start') AND strtotime( IPSText::monthNameRu2En(IPSSearchRegistry::get('in.search_date_start')) ) > time() )
@@ -264,17 +517,22 @@ class public_core_search_search extends ipsCommand
 		}
 		
 		/**
-		 * Ok this is an upper limit.
-		 * If you needed to change this, you could do so via conf_global.php by adding:
-		 * $INFO['max_search_word'] = #####;
+		 * Lower limit
 		 */
-		if ( $this->settings['min_search_word'] && ! IPSSearchRegistry::get('in.search_author') )
+		if ( $this->settings['min_search_word'] && ! IPSSearchRegistry::get('in.search_author') && ! IPSSearchRegistry::get('in.raw_search_tags') )
 		{
-			$_words	= explode( ' ', IPSSearchRegistry::get('in.raw_search_term') );
-			$_ok	= true;
-			
+			$_words	= explode( ' ', preg_replace( "#\"(.*?)\"#", '', $search_term ) );
+			$_ok	= $search_term ? true : false;
+
 			foreach( $_words as $_word )
 			{
+				$_word	= preg_replace( '#^\+(.+?)$#', "\\1", $_word );
+
+				if( !$_word )
+				{
+					continue;
+				}
+
 				if( strlen( $_word ) < $this->settings['min_search_word'] )
 				{
 					$_ok	= false;
@@ -287,8 +545,13 @@ class public_core_search_search extends ipsCommand
 				$this->searchAdvancedForm( sprintf( $this->lang->words['search_term_short'], $this->settings['min_search_word'] ), $removedTerms );
 				return;
 			}
-		}
+		}	
 		
+		/**
+		 * Ok this is an upper limit.
+		 * If you needed to change this, you could do so via conf_global.php by adding:
+		 * $INFO['max_search_word'] = #####;
+		 */
 		if ( $this->settings['max_search_word'] && strlen( IPSSearchRegistry::get('in.raw_search_term') ) > $this->settings['max_search_word'] )
 		{
 			$this->searchAdvancedForm( sprintf( $this->lang->words['search_term_long'], $this->settings['max_search_word'] ) );
@@ -327,10 +590,15 @@ class public_core_search_search extends ipsCommand
 		}
 		
 		/* Clean search term for results view */
-		$_search_term = trim( preg_replace( "#(^|\s)(\+|\-|\||\~)#", " ", $search_term ) );
+		$_search_term = trim( preg_replace( '#(^|\s)(\+|\-|\||\~)#', " ", $search_term ) );
 		
-		/* Can we do this? */
-		if ( IPSLib::appisSearchable( IPSSearchRegistry::get('in.search_app'), 'search' ) )
+		/* Got tag search only but app doesn't support tags */
+		if ( IPSSearchRegistry::get('in.raw_search_tags') && ! IPSSearchRegistry::get( 'config.can_searchTags' ) && ! IPSSearchRegistry::get('in.raw_search_term') )
+		{
+			$count   = 0;
+			$results = array();
+		}
+		else if ( IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'search' ) )
 		{
 			/* Perform the search */
 			$this->searchController->search();
@@ -346,21 +614,40 @@ class public_core_search_search extends ipsCommand
 						
 			/* Fetch sort details */
 			$sortDropDown = $this->searchController->fetchSortDropDown();
+
+			/* Set default sort option */
+			$_a	= IPSSearchRegistry::get('in.search_app');
+			$_k	= IPSSearchRegistry::get( $_a . '.searchInKey') ? IPSSearchRegistry::get( $_a . '.searchInKey') : '';
+
+			if( $_k AND !$this->request['search_app_filters'][ $_a ][ $_k ]['sortKey'] AND is_array($sortDropDown) AND count($sortDropDown) )
+			{
+				$this->request['search_app_filters'][ $_a ][ $_k ]['sortKey']	= key( $sortDropDown );
+			}
+			else if( !$_k AND !$this->request['search_app_filters'][ $_a ]['sortKey'] AND is_array($sortDropDown) AND count($sortDropDown) )
+			{
+				$this->request['search_app_filters'][ $_a ]['sortKey']	= key( $sortDropDown );
+			}
 			
 			/* Fetch sort details */
 			$sortIn       = $this->searchController->fetchSortIn();
 			
 			/* Build pagination */
 			$links = $this->registry->output->generatePagination( array( 'totalItems'		=> $count,
-																		'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
-																		'currentStartValue'	=> IPSSearchRegistry::get('in.start'),
-																		'baseUrl'			=> $this->_buildURLString() . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app') . '' )	);
+																		 'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
+																		 'currentStartValue'=> IPSSearchRegistry::get('in.start'),
+																		 'baseUrl'			=> $this->_buildURLString() . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app') . '' )	);
 	
 			/* Showing */
 			$showing = array( 'start' => IPSSearchRegistry::get('in.start') + 1, 'end' => ( IPSSearchRegistry::get('in.start') + IPSSearchRegistry::get('opt.search_per_page') ) > $count ? $count : IPSSearchRegistry::get('in.start') + IPSSearchRegistry::get('opt.search_per_page') );
 						
 			/* Parse result set */
-			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('display.onlyTitles') || IPSSearchRegistry::get( 'opt.noPostPreview') ) ? 1 : 0 );
+			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('opt.searchType') == 'titles' || IPSSearchRegistry::get('opt.noPostPreview') ) ? 1 : 0 );
+			
+			/* Check for sortIn */
+			if( count( $sortIn ) && !$this->request['search_app_filters'][ $this->request['search_app'] ]['searchInKey'] )
+			{
+				$this->request['search_app_filters'][ $this->request['search_app'] ]['searchInKey'] = $sortIn[0][0];
+			}
 		}
 		else
 		{
@@ -370,7 +657,7 @@ class public_core_search_search extends ipsCommand
 		
 		/* Output */
 		$this->title   = $this->lang->words['search_results'];
-		$this->output .= $this->registry->output->getTemplate( 'search' )->searchResultsWrapper( $results, $sortDropDown, $sortIn, $links, $count, $showing, $_search_term, $this->_buildURLString(), $this->request['search_app'], $removedTerms, IPSSearchRegistry::get('set.hardLimit'), IPSSearchRegistry::get('set.resultsCutToLimit') );
+		$this->output .= $this->registry->output->getTemplate( 'search' )->searchResultsWrapper( $results, $sortDropDown, $sortIn, $links, $count, $showing, $_search_term, $this->_buildURLString(), $this->request['search_app'], $removedTerms, IPSSearchRegistry::get('set.hardLimit'), IPSSearchRegistry::get('set.resultsCutToLimit'), IPSSearchRegistry::get('in.raw_search_tags') );
 	}
 	
 	/**
@@ -401,7 +688,7 @@ class public_core_search_search extends ipsCommand
 				
 				if ( isset( $this->_session['_session_data']['search_app_filters'] ) )
 				{
-					$this->request['search_app_filters'] = $this->_session['_session_data']['search_app_filters'];
+					$this->request['search_app_filters'] = is_array( $this->request['search_app_filters'] ) ? array_merge( $this->_session['_session_data']['search_app_filters'], $this->request['search_app_filters'] ) : $this->_session['_session_data']['search_app_filters'];
 				}
 			}
 			
@@ -457,7 +744,7 @@ class public_core_search_search extends ipsCommand
 	/**
 	 * Set the search order and key
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _setSortFilters()
 	{
@@ -494,76 +781,41 @@ class public_core_search_search extends ipsCommand
 				$dir = $this->request['search_sort_order'];
 			}
 		}
-	
+		
 		/* Numeric? */
 		if ( is_numeric( $dir ) )
 		{
 			$dir = ( $dir == 0 ) ? 'desc' : 'asc';
 		}
+		else
+		{
+			$dir = 'desc';
+		}
 		
 		IPSSearchRegistry::set('in.search_sort_by'   , trim( $key ) );
 		IPSSearchRegistry::set('in.search_sort_order', ( $dir != 'desc' ) ? 'asc' : 'desc' );
 	}
 	
-	/**
-	 * Displays the active topics screen
-	 *
-	 * @return	void
-	 */
-	public function activeContent()
-	{
-		IPSSearchRegistry::set('in.search_app', $this->request['search_app'] );
-		IPSSearchRegistry::set('in.period'    , ( empty( $this->request['period'] ) ) ? 'today' : $this->request['period'] );
-		
-		/* Can we do this? */
-		if ( IPSLib::appisSearchable( IPSSearchRegistry::get('in.search_app'), 'active' ) )
-		{
-			/* Perform the search */
-			$this->searchController->viewActiveContent();
-			
-			/* Get count */
-			$count = $this->searchController->getResultCount();
-			
-			/* Get results which will be array of IDs */
-			$results = $this->searchController->getResultSet();
-			
-			/* Get templates to use */
-			$template = $this->searchController->fetchTemplates();
-			
-			/* Fetch sort details */
-			$sortIn       = $this->searchController->fetchSortIn();
-			
-			/* Parse result set */
-			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('display.onlyTitles') || IPSSearchRegistry::get( 'opt.noPostPreview') ) ? 1 : 0 );
-			
-			/* Build pagination */
-			$links = $this->registry->output->generatePagination( array( 'totalItems'		=> $count,
-																		'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
-																		'currentStartValue'	=> IPSSearchRegistry::get('in.start'),
-																		'baseUrl'			=> 'app=core&amp;module=search&amp;do=active&amp;period=' . IPSSearchRegistry::get('in.period') . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app') . '&amp;sid=' . $this->request['_sid'] ) );
-		}
-		else
-		{
-			$count   = 0;
-			$results = array();
-		}
-		
-		/* Output */
-		$this->title   = $this->lang->words['active_posts_title'];
-		$this->registry->output->addNavigation( $this->lang->words['active_posts_title'], '' );
-		$this->output .= $this->registry->output->getTemplate( 'search' )->activePostsView( $results, $links, $count, $sortIn );
-	}
-	
 	/**
 	 * Displays latest user content
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function viewUserContent()
 	{
 		/* INIT */
 		$id 	    = $this->request['mid'] ? intval( trim( $this->request['mid'] ) ) : $this->memberData['member_id'];
-		$member	    = IPSMember::load( $id, 'core' );
+		
+		/* Save query if we are viewing our own content */
+		if( $this->memberData['member_id'] AND $id == $this->memberData['member_id'] )
+		{
+			$member	= $this->memberData;
+		}
+		else
+		{
+			$member	    = IPSMember::load( $id, 'core' );
+		}
+		
 		$beginStamp = 0;
 		
 		if ( ! $member['member_id'] )
@@ -571,11 +823,16 @@ class public_core_search_search extends ipsCommand
 			$this->registry->output->showError( 'search_invalid_id', 10147, null, null, 403 );
 		}
 		
+		$this->request['userMode']	= !empty($this->request['userMode']) ? $this->request['userMode'] : 'all';
+		
 		IPSSearchRegistry::set('in.search_app', $this->request['search_app'] );
-		IPSSearchRegistry::set('in.userMode'  , ( $this->request['userMode'] ) ? $this->request['userMode'] : 'all' );
+		IPSSearchRegistry::set('in.userMode'  , $this->request['userMode'] );
+
+		/* Set sort filters */
+		$this->_setSortFilters();
 		
 		/* Can we do this? */
-		if ( IPSLib::appisSearchable( IPSSearchRegistry::get('in.search_app'), 'usercontent' ) )
+		if ( IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'usercontent' ) )
 		{
 			/* Perform the search */
 			$this->searchController->viewUserContent( $member );
@@ -589,17 +846,38 @@ class public_core_search_search extends ipsCommand
 			/* Get templates to use */
 			$template = $this->searchController->fetchTemplates();
 			
+			/* Fetch sort details */
+			$sortDropDown = $this->searchController->fetchSortDropDown();
+
+			/* Set default sort option */
+			$_a	= IPSSearchRegistry::get('in.search_app');
+			$_k	= IPSSearchRegistry::get( $_a . '.searchInKey') ? IPSSearchRegistry::get( $_a . '.searchInKey') : '';
+
+			if( $_k AND !$this->request['search_app_filters'][ $_a ][ $_k ]['sortKey'] AND is_array($sortDropDown) )
+			{
+				$this->request['search_app_filters'][ $_a ][ $_k ]['sortKey']	= key( $sortDropDown );
+			}
+			else if( !$_k AND !$this->request['search_app_filters'][ $_a ]['sortKey'] AND is_array($sortDropDown) )
+			{
+				$this->request['search_app_filters'][ $_a ]['sortKey']	= key( $sortDropDown );
+			}
+			
 			/* Fetch sort details */
 			$sortIn       = $this->searchController->fetchSortIn();
 			
+			/* Reset for template */
+			$this->_resetRequestParameters();
+			
 			/* Parse result set */
-			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('display.onlyTitles') || IPSSearchRegistry::get( 'opt.noPostPreview') ) ? 1 : 0 );
+			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('opt.searchType') == 'titles' || IPSSearchRegistry::get('opt.noPostPreview') ) ? 1 : 0 );
 			
 			/* Build pagination */
 			$links = $this->registry->output->generatePagination( array( 'totalItems'		=> $count,
 																		'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
 																		'currentStartValue'	=> IPSSearchRegistry::get('in.start'),
-																		'baseUrl'			=> 'app=core&amp;module=search&amp;do=user_activity&amp;mid=' . $id . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app') . '&amp;userMode=' . IPSSearchRegistry::get('in.userMode')  . '&amp;sid=' . $this->request['_sid'] ) );
+																		'baseUrl'			=> 'app=core&amp;module=search&amp;do=user_activity&amp;mid=' . $id . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app') . '&amp;userMode=' . IPSSearchRegistry::get('in.userMode')  . '&amp;sid=' . $this->request['_sid'] . 
+																								'&amp;search_app_filters[' . IPSSearchRegistry::get('in.search_app') . '][searchInKey]=' . $this->request['search_app_filters'][ IPSSearchRegistry::get('in.search_app') ]['searchInKey'] . '&amp;search_app_filters[' . IPSSearchRegistry::get('in.search_app') . '][sortKey]=' .
+																								$this->request['search_app_filters'][ IPSSearchRegistry::get('in.search_app') ]['sortKey'] . '&amp;search_app_filters[' . IPSSearchRegistry::get('in.search_app') . '][sortDir]=' . $this->request['search_app_filters'][ IPSSearchRegistry::get('in.search_app') ]['sortDir'] ) );
 		}
 		else
 		{
@@ -609,21 +887,67 @@ class public_core_search_search extends ipsCommand
 		
 		$this->title   = sprintf( $this->lang->words['s_participation_title'], $member['members_display_name'] );
 		$this->registry->output->addNavigation( $this->title, '' );
-		$this->output .= $this->registry->output->getTemplate( 'search' )->userPostsView( $results, $links, $count, $member, IPSSearchRegistry::get('set.hardLimit'), IPSSearchRegistry::get('set.resultsCutToLimit'), $beginStamp, $sortIn );
+		$this->output .= $this->registry->output->getTemplate( 'search' )->userPostsView( $results, $links, $count, $member, IPSSearchRegistry::get('set.hardLimit'), IPSSearchRegistry::get('set.resultsCutToLimit'), $beginStamp, $sortIn, $sortDropDown );
 	}
 	
 	/**
 	 * View new posts since your last visit
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function viewNewPosts()
+	public function viewNewContent()
 	{	
 		IPSSearchRegistry::set('in.search_app', $this->request['search_app'] );
 		
-		/* Can we do this? */
-		if ( IPSLib::appisSearchable( IPSSearchRegistry::get('in.search_app'), 'vnc' ) )
+		/* Fetch member cache to see if we have a value set */
+		$vncPrefs = IPSMember::getFromMemberCache( $this->memberData, 'vncPrefs' );
+		
+		/* Guests */
+		if ( ! $this->memberData['member_id'] AND ( !$this->request['period'] OR $this->request['period'] == 'unread' ) )
 		{
+			$this->request['period'] = 'today';
+		}
+		
+		/* In period */
+		if ( $vncPrefs === null OR ! isset( $vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['view'] ) OR isset( $this->request['period'] ) )
+		{
+			$vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['view'] = ( ! empty( $this->request['period'] ) ) ? $this->request['period'] : $this->settings['default_vnc_method'];
+		}
+		
+		/* Follow filter enabled */
+		if ( $vncPrefs === null OR ! isset( $vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['view'] ) OR isset( $this->request['followedItemsOnly'] ) )
+		{
+			$vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['vncFollowFilter'] = ( ! empty( $this->request['followedItemsOnly'] ) ) ? 1 : 0;
+		}
+		
+		/* Filtering VNC by forum? */
+		IPSSearchRegistry::set('forums.vncForumFilters', $vncPrefs['forums']['vnc_forum_filter'] );
+
+		/* Set period up */
+		IPSSearchRegistry::set('in.period'           , $vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['view'] );
+		IPSSearchRegistry::set('in.vncFollowFilterOn', $vncPrefs[ IPSSearchRegistry::get('in.search_app') ]['vncFollowFilter'] );
+		
+		$this->request['userMode']	= !empty($this->request['userMode']) ? $this->request['userMode'] : '';
+		IPSSearchRegistry::set('in.userMode'  , $this->request['userMode'] );
+		
+		/* Update member cache */
+		if ( isset( $this->request['period'] ) )
+		{
+			IPSMember::setToMemberCache( $this->memberData, array( 'vncPrefs' => $vncPrefs ) );
+		}
+		
+		IPSDebug::addMessage( var_export( $vncPrefs, true ) );
+		IPSDebug::addMessage( 'Using: ' . IPSSearchRegistry::get('in.period') );
+		
+		/* Can we do this? */
+		if ( IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'vnc' ) || IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'active' ) )
+		{
+			/* Can't do a specific unread search, so */
+			if ( IPSSearchRegistry::get('in.period') == 'unread' && ! IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'vncWithUnreadContent' ) )
+			{
+				IPSSearchRegistry::set( 'in.period', 'lastvisit' );
+			}
+			
 			/* Perform the search */
 			$this->searchController->viewNewContent();
 			
@@ -642,14 +966,26 @@ class public_core_search_search extends ipsCommand
 			/* Fetch sort details */
 			$sortIn       = $this->searchController->fetchSortIn();
 			
+			/* Reset for template */
+			$this->_resetRequestParameters();
+			
+			if( IPSSearchRegistry::get('in.start') > 0 AND !count($results) )
+			{
+				$new_url	= 'app=core&amp;module=search&amp;do=viewNewContent&amp;period=' . IPSSearchRegistry::get('in.period') . '&amp;userMode=' . IPSSearchRegistry::get('in.userMode') . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app')  . '&amp;sid=' . $this->request['_sid'];
+				$new_url	.= '&amp;st=' . ( IPSSearchRegistry::get('in.start') - IPSSearchRegistry::get('opt.search_per_page') ) . '&amp;search_app_filters[' . IPSSearchRegistry::get('in.search_app') . '][searchInKey]=' . $this->request['search_app_filters'][ IPSSearchRegistry::get('in.search_app') ]['searchInKey'];
+				
+				$this->registry->output->silentRedirect( $this->settings['base_url'] . $new_url );
+			}
+			
 			/* Parse result set */
-			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('display.onlyTitles') || IPSSearchRegistry::get( 'opt.noPostPreview') ) ? 1 : 0 );
+			$results = $this->registry->output->getTemplate( $template['group'] )->$template['template']( $results, ( IPSSearchRegistry::get('opt.searchType') == 'titles' || IPSSearchRegistry::get('opt.noPostPreview') ) ? 1 : 0 );
 			
 			/* Build pagination */
-			$links = $this->registry->output->generatePagination( array( 'totalItems'		=> $count,
-																		'itemsPerPage'		=> IPSSearchRegistry::get('opt.search_per_page'),
-																		'currentStartValue'	=> IPSSearchRegistry::get('in.start'),
-																		'baseUrl'			=> 'app=core&amp;module=search&amp;do=new_posts&amp;search_app=' . IPSSearchRegistry::get('in.search_app')  . '&amp;sid= ' . $this->request['_sid'] ) );
+			$links = $this->registry->output->generatePagination( array( 'totalItems'		 => $count,
+																		 'itemsPerPage'		 => IPSSearchRegistry::get('opt.search_per_page'),
+																		 'currentStartValue' => IPSSearchRegistry::get('in.start'),
+																		 //'method'			 => 'nextPrevious',
+																		 'baseUrl'			 => 'app=core&amp;module=search&amp;do=viewNewContent&amp;period=' . IPSSearchRegistry::get('in.period') . '&amp;userMode=' . IPSSearchRegistry::get('in.userMode') . '&amp;search_app=' . IPSSearchRegistry::get('in.search_app')  . '&amp;sid=' . $this->request['_sid'] . '&amp;search_app_filters[' . IPSSearchRegistry::get('in.search_app') . '][searchInKey]=' . $this->request['search_app_filters'][ IPSSearchRegistry::get('in.search_app') ]['searchInKey'] ) );
 	
 			/* Showing */
 			$showing = array( 'start' => IPSSearchRegistry::get('in.start') + 1, 'end' => ( IPSSearchRegistry::get('in.start') + IPSSearchRegistry::get('opt.search_per_page') ) > $count ? $count : IPSSearchRegistry::get('in.start') + IPSSearchRegistry::get('opt.search_per_page') );
@@ -660,10 +996,19 @@ class public_core_search_search extends ipsCommand
 			$results = array();
 		}
 		
+		/* Add Debug message */
+		IPSDebug::addMessage( "View New Content Matches: " . $count );
+		
+		/* Check for sortIn */
+		if( count( $sortIn ) && !$this->request['search_app_filters'][ $this->request['search_app'] ]['searchInKey'] )
+		{
+			$this->request['search_app_filters'][ $this->request['search_app'] ]['searchInKey'] = $sortIn[0][0];
+		}
+		
 		/* Output */
 		$this->title   = $this->lang->words['new_posts_title'];
 		$this->registry->output->addNavigation( $this->lang->words['new_posts_title'], '' );
-		$this->output .= $this->registry->output->getTemplate( 'search' )->newPostsView( $results, $links, $count, $sortDropDown, $sortIn, IPSSearchRegistry::get('set.resultCutToDate') );
+		$this->output .= $this->registry->output->getTemplate( 'search' )->newContentView( $results, $links, $count, $sortDropDown, $sortIn, IPSSearchRegistry::get('set.resultCutToDate') );
 	}
 	
 
@@ -679,27 +1024,31 @@ class public_core_search_search extends ipsCommand
 		$url_string .= '&amp;sid=' . $this->request['_sid'];
 		
 		/* Add author name */
-		if( isset( $this->request['search_author'] ) AND $this->request['search_author'] )
+		if( !empty( $this->request['search_author'] ) )
 		{
 			$url_string .= "&amp;search_author=" . urlencode($this->request['search_author']);
 		}
-		
-		/* Add titles only */
-		if( isset( $this->request['show_as_titles'] ) AND $this->request['show_as_titles'] )
-		{
-			$url_string .= "&amp;show_as_titles={$this->request['show_as_titles']}";
-		}
-		
+
 		/* Search Range */
-		if( isset( $this->request['search_date_start'] ) AND $this->request['search_date_start'] )
+		if( !empty( $this->request['search_date_start'] ) )
 		{
 			$url_string .= "&amp;search_date_start={$this->request['search_date_start']}";
 		}
 		
-		if( isset( $this->request['search_date_end'] ) AND $this->request['search_date_end'] )
+		if( !empty( $this->request['search_date_end'] ) )
 		{
 			$url_string .= "&amp;search_date_end={$this->request['search_date_end']}";
 		}
+
+		if( !empty( $this->request['search_app_filters'][ $this->request['search_app'] ]['sortKey'] ) )
+		{
+			$url_string .= "&amp;search_app_filters[{$this->request['search_app']}][sortKey]=" . $this->request['search_app_filters'][ $this->request['search_app'] ]['sortKey'];
+		}
+
+		if( !empty( $this->request['search_app_filters'][ $this->request['search_app'] ]['sortDir'] ) )
+		{
+			$url_string .= "&amp;search_app_filters[{$this->request['search_app']}][sortDir]=" . $this->request['search_app_filters'][ $this->request['search_app'] ]['sortDir'];
+		}
 		
 		/* Contextual Type */
 		if ( IPSSearchRegistry::get('contextual.type') )
@@ -708,9 +1057,14 @@ class public_core_search_search extends ipsCommand
 		}
 		
 		/* Content Only */
-		if( isset( $this->request['content_title_only'] ) && $this->request['content_title_only'] )
+		if( !empty( $this->request['search_content'] ) )
 		{
-			$url_string .= "&amp;content_title_only=1";
+			$url_string .= "&amp;search_content=" . $this->request['search_content'];
+		}
+		
+		if ( IPSSearchRegistry::get('in.raw_search_tags') )
+		{
+			$url_string .= "&amp;search_tags=" . urlencode( IPSSearchRegistry::get('in.raw_search_tags') );
 		}
 		
 		/* Types */
@@ -724,6 +1078,30 @@ class public_core_search_search extends ipsCommand
 			$url_string .= "&amp;type_2={$this->request['type_2']}&amp;type_id_2={$this->request['type_id_2']}";
 		}
 		
+		if( isset($this->request['search_app_filters']) AND $this->request['search_app_filters'] )
+		{
+			foreach( $this->request['search_app_filters'] as $app => $filters )
+			{
+				if( $app == $this->request['search_app'] AND count($filters) )
+				{
+					foreach( $filters as $_filterKey => $_filterValue )
+					{
+						if( is_array($_filterValue) )
+						{
+							foreach( $_filterValue as $_filterValueKey => $_filterValueValue )
+							{
+								$url_string .= "&amp;search_app_filters[{$app}][{$_filterKey}][{$_filterValueKey}]={$_filterValueValue}";
+							}
+						}
+						else
+						{
+							$url_string .= "&amp;search_app_filters[{$app}][{$_filterKey}]={$_filterValue}";
+						}
+					}
+				}
+			}
+		}
+		
 		/* Fix up the search term a bit */
 		$_search_term = str_replace( '&amp;', '&', $this->request['search_term'] );
 		$_search_term = str_replace( '&quot;', '"', $_search_term );
@@ -739,7 +1117,7 @@ class public_core_search_search extends ipsCommand
 	/**
 	 * Checks to see if the logged in user is allowed to use the search system
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _canSearch()
 	{
@@ -772,5 +1150,17 @@ class public_core_search_search extends ipsCommand
 				$this->registry->output->showError( 'no_permission_to_search', 10146, null, null, 403 );
 			}
 		}		
-	} 
+	}
+	
+	/**
+	 * Resets params for template
+	 */
+	protected function _resetRequestParameters()
+	{
+		$this->request['period']			= IPSSearchRegistry::get('in.period');
+		$this->request['search_app']		= IPSSearchRegistry::get('in.search_app');
+		$this->request['vncFollowFilterOn']	= IPSSearchRegistry::get('in.vncFollowFilterOn');
+		$this->request['followedItemsOnly']	= IPSSearchRegistry::get('in.vncFollowFilterOn');
+	}
+	 
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/task/index.html b/upload/admin/applications/core/modules_public/task/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/task/index.html
+++ b/upload/admin/applications/core/modules_public/task/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/task/manualResolver.php b/upload/admin/applications/core/modules_public/task/manualResolver.php
index daedf07a..2389332f 100644
--- a/upload/admin/applications/core/modules_public/task/manualResolver.php
+++ b/upload/admin/applications/core/modules_public/task/manualResolver.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Task Manager
- * Last Updated: $Date: 2010-07-12 18:26:09 -0400 (Mon, 12 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6635 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -28,9 +28,8 @@ class public_core_task_manualResolver extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -38,8 +37,8 @@ class public_core_task_manualResolver extends ipsCommand
 		// Require and run
 		//-----------------------------------------
 		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_taskmanager.php', 'class_taskmanager' );
-		$functions = new $classToLoad( $registry );
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_taskmanager.php', 'class_taskmanager' );/*noLibHook*/
+		$functions   = new $classToLoad( $registry );
 		
 		//-----------------------------------------
 		// Check shutdown functions
diff --git a/upload/admin/applications/core/modules_public/usercp/index.html b/upload/admin/applications/core/modules_public/usercp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/modules_public/usercp/index.html
+++ b/upload/admin/applications/core/modules_public/usercp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/modules_public/usercp/manualResolver.php b/upload/admin/applications/core/modules_public/usercp/manualResolver.php
index 9a593b76..0f955fad 100644
--- a/upload/admin/applications/core/modules_public/usercp/manualResolver.php
+++ b/upload/admin/applications/core/modules_public/usercp/manualResolver.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * User control panel resolver
- * Last Updated: $Date: 2010-10-21 14:02:34 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-06-09 18:03:22 -0400 (Thu, 09 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 7011 $
+ * @version		$Revision: 9021 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -32,7 +32,6 @@ class public_core_usercp_manualResolver extends ipsCommand
 	/**
 	 * Page Title set by sub classes
 	 *
-	 * @access	protected
 	 * @var		string
 	 */
 	protected $_pageTitle;
@@ -40,7 +39,6 @@ class public_core_usercp_manualResolver extends ipsCommand
 	/**
 	* Navigation array set by sub classes
 	 *
-	 * @access	protected
 	 * @var		array
 	 */
 	protected $_nav = array();
@@ -48,9 +46,8 @@ class public_core_usercp_manualResolver extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -101,9 +98,9 @@ class public_core_usercp_manualResolver extends ipsCommand
 		
 		IPSLib::loadInterface( 'interface_usercp.php' );
 		
-		$EXT_DIR  = IPSLib::getAppDir(  $_TAB ) . '/extensions';
+		$EXT_DIR  = IPSLib::getAppDir( $_TAB ) . '/extensions';
 
-		if ( ! file_exists($EXT_DIR . '/usercpForms.php') )
+		if ( ! is_file($EXT_DIR . '/usercpForms.php') )
 		{
 			$this->registry->getClass('output')->showError( 'usercp_bad_tab', 10147 );
 			exit();
@@ -113,24 +110,25 @@ class public_core_usercp_manualResolver extends ipsCommand
 		// Cycle through applications and load
 		// usercpForm extensions
 		//-----------------------------------------
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			// Check that the application is installed.
-			if ( !IPSLib::appIsInstalled( $app_dir ) )
-			{
-				continue;
-			}
-
 			$ext_dir  = IPSLib::getAppDir( $app_dir ) . '/extensions';
 
 			// Make sure the extension exists
-			if ( !file_exists( $ext_dir . '/usercpForms.php' ) )
+			if ( !is_file( $ext_dir . '/usercpForms.php' ) )
 			{
 				continue;
 			}
 			
 			$__class        = IPSLib::loadLibrary( $ext_dir . '/usercpForms.php', 'usercpForms_' . $app_dir, $app_dir );
 			$_usercp_module = new $__class();
+			
+			/* Block based on version to prevent old files showing up/causing an error */
+			if( !$_usercp_module->version OR $_usercp_module->version < 32 )
+			{
+				continue;
+			}
+
 			$_usercp_module->makeRegistryShortcuts( $this->registry );
 
 			if ( is_callable( array( $_usercp_module, 'init' ) ) )
@@ -149,17 +147,21 @@ class public_core_usercp_manualResolver extends ipsCommand
 
 			if ( is_callable( array( $_usercp_module, 'getLinks' ) ) )
 			{
-				$tabs[ $app_dir ]['_name'] = $_usercp_module->tab_name ? $_usercp_module->tab_name : IPSLib::getAppTitle( $app_dir );
 				$tabs[ $app_dir ]['_menu'] = $_usercp_module->getLinks();
-
-				if ( ! $tabs[ $app_dir ]['_menu'] )
+				
+				/* Got any links? */
+				if ( !is_array($tabs[ $app_dir ]['_menu']) || !count($tabs[ $app_dir ]['_menu']) )
 				{
 					unset( $tabs[ $app_dir ] );
+					continue;
 				}
-
+				
+				/* Get title */
+				$tabs[ $app_dir ]['_name'] = $_usercp_module->tab_name ? $_usercp_module->tab_name : IPSLib::getAppTitle( $app_dir );
+				
 				/* Add in 'last' element */
 				$tabs[ $app_dir ]['_menu'][ count( $tabs[ $app_dir ]['_menu'] ) - 1 ]['last'] = 1;
-
+				
 				/* This nav? */
 				if ( ! count( $_thisNav ) AND $app_dir == $_TAB )
 				{
@@ -276,7 +278,7 @@ class public_core_usercp_manualResolver extends ipsCommand
 		// Pass to CP output hander
 		//-----------------------------------------
 
-		$this->registry->getClass('output')->setTitle( ( $this->_pageTitle ) ? $this->settings['board_name'] . " {$this->lang->words['pagetitle_bit']} : " . $this->_pageTitle : $this->settings['board_name'] . " {$this->lang->words['pagetitle_bit']}" );
+		$this->registry->getClass('output')->setTitle( ( $this->_pageTitle ) ? "{$this->lang->words['pagetitle_bit']} : " . $this->_pageTitle . ' - ' . $this->settings['board_name'] : "{$this->lang->words['pagetitle_bit']} - " . $this->settings['board_name'] );
 		$this->registry->getClass('output')->addContent( $template );
 
 		if ( is_array( $this->_nav ) AND count( $this->_nav ) )
diff --git a/upload/admin/applications/core/setup/index.html b/upload/admin/applications/core/setup/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/index.html
+++ b/upload/admin/applications/core/setup/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/index.html b/upload/admin/applications/core/setup/versions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/versions/index.html
+++ b/upload/admin/applications/core/setup/versions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/install/index.html b/upload/admin/applications/core/setup/versions/install/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/versions/install/index.html
+++ b/upload/admin/applications/core/setup/versions/install/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/install/knownSettings.php b/upload/admin/applications/core/setup/versions/install/knownSettings.php
index 8e601775..9869b4e9 100644
--- a/upload/admin/applications/core/setup/versions/install/knownSettings.php
+++ b/upload/admin/applications/core/setup/versions/install/knownSettings.php
@@ -17,9 +17,16 @@ $knownSettings = array(
 	 'email_in'          => IPSSetUp::getSavedData('admin_email'),
 	 'email_out'         => IPSSetUp::getSavedData('admin_email'),
 	 'base_dir'          => IPSSetUp::getSavedData('install_dir'),
-	 'css_cache_url'     => IPSSetUp::getSavedData('install_url') . '/public/style_images',
+	 'css_cache_url'     => IPSSetUp::getSavedData('install_url') . PUBLIC_DIRECTORY . '/style_images',
 	 'upload_url'        => IPSSetUp::getSavedData('install_url') . '/uploads',
 	 'upload_dir'        => IPSSetUp::getSavedData('install_dir') . '/uploads',
 	 'search_sql_method' => ipsRegistry::DB()->checkFulltextSupport() ? 'ftext' : 'man',
 	 'safe_mode_skins'   => ( @ini_get("safe_mode") ) ? 1 : 0,
-);
\ No newline at end of file
+	 'ipb_reg_number'	 => IPSSetUp::getSavedData('lkey'),
+);
+
+/* Minify requires.. */
+if( !function_exists('gzencode') )
+{
+	$knownSettings['use_minify']	= 0;
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_fulltext.php b/upload/admin/applications/core/setup/versions/install/sql/core_mysql_fulltext.php
deleted file mode 100644
index c6f3e7b7..00000000
--- a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_fulltext.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-/**
-* Installation Schematic File
-* Generated on Thu, 19 Feb 2009 08:15:49 +0000 GMT
-*/
diff --git a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_inserts.php b/upload/admin/applications/core/setup/versions/install/sql/core_mysql_inserts.php
index 90417b78..81c467e6 100644
--- a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_inserts.php
+++ b/upload/admin/applications/core/setup/versions/install/sql/core_mysql_inserts.php
@@ -22,29 +22,27 @@ $INSERT[] = "INSERT INTO cache_store (cs_key, cs_value, cs_array) VALUES ('rss_e
 $INSERT[] = "INSERT INTO cache_store (cs_key, cs_value, cs_array) VALUES ('rss_calendar', 'a:0:{}', 1);";
 $INSERT[] = "INSERT INTO cache_store (cs_key, cs_value, cs_array) VALUES ('announcements', 'a:0:{}', 1);";
 $INSERT[] = "INSERT INTO cache_store (cs_key, cs_value, cs_array) VALUES ('hooks', 'a:0:{}', 1);";
-$INSERT[] = "INSERT INTO cache_store (cs_key, cs_value, cs_array) VALUES ('portal', 'a:6:{s:5:\"blogs\";a:5:{s:8:\"pc_title\";s:30:\"Invision Power Community Blogs\";s:7:\"pc_desc\";s:40:\"Shows IPB Blog information on the portal\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:25:\"blogs_show_last_updated_x\";a:2:{i:0;s:25:\"blogs_show_last_updated_x\";i:1;s:30:\"Shows the last X updated blogs\";}}s:6:\"pc_key\";s:5:\"blogs\";}s:8:\"calendar\";a:5:{s:8:\"pc_title\";s:29:\"Invision Power Board Calendar\";s:7:\"pc_desc\";s:46:\"Displays a mini calendar for the current month\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:27:\"calendar_show_current_month\";a:2:{i:0;s:27:\"calendar_show_current_month\";i:1;s:38:\"Shows a calendar for the current month\";}}s:6:\"pc_key\";s:8:\"calendar\";}s:7:\"gallery\";a:5:{s:8:\"pc_title\";s:22:\"Invision Power Gallery\";s:7:\"pc_desc\";s:54:\"Shows Invision Power Gallery information on the portal\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:25:\"gallery_show_random_image\";a:2:{i:0;s:25:\"gallery_show_random_image\";i:1;s:44:\"Shows a random image from a member\'s gallery\";}}s:6:\"pc_key\";s:7:\"gallery\";}s:12:\"online_users\";a:5:{s:8:\"pc_title\";s:33:\"Invision Power Board Online Users\";s:7:\"pc_desc\";s:49:\"Shows the current name and number of online users\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:17:\"online_users_show\";a:2:{i:0;s:17:\"online_users_show\";i:1;s:22:\"Shows the online users\";}}s:6:\"pc_key\";s:12:\"online_users\";}s:4:\"poll\";a:5:{s:8:\"pc_title\";s:25:\"Invision Power Board Poll\";s:7:\"pc_desc\";s:23:\"Shows the selected poll\";s:19:\"pc_settings_keyword\";s:11:\"portal_poll\";s:18:\"pc_exportable_tags\";a:1:{s:14:\"poll_show_poll\";a:2:{i:0;s:14:\"poll_show_poll\";i:1;s:22:\"Shows the request poll\";}}s:6:\"pc_key\";s:4:\"poll\";}s:13:\"recent_topics\";a:5:{s:8:\"pc_title\";s:34:\"Invision Power Board Recent Topics\";s:7:\"pc_desc\";s:47:\"Shows IPB recent topics with topic\'s first post\";s:19:\"pc_settings_keyword\";s:20:\"portal_recent_topics\";s:18:\"pc_exportable_tags\";a:2:{s:20:\"recent_topics_last_x\";a:2:{i:0;s:20:\"recent_topics_last_x\";i:1;s:63:\"Shows the last X topics with full post from the selected forums\";}s:32:\"recent_topics_discussions_last_x\";a:2:{i:0;s:32:\"recent_topics_discussions_last_x\";i:1;s:54:\"Shows the last X topic titles from ALL viewable forums\";}}s:6:\"pc_key\";s:13:\"recent_topics\";}}', 1);";
 
-
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (1, ':mellow:', 'mellow.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (2, ':huh:', 'huh.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (3, '^_^', 'happy.gif', 0, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (4, ':o', 'ohmy.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (5, ';)', 'wink.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (6, ':P', 'tongue.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (7, ':D', 'biggrin.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (8, ':lol:', 'laugh.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (9, 'B)', 'cool.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (10, ':rolleyes:', 'rolleyes.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (11, '-_-', 'sleep.gif', 0, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (12, '&lt;_&lt;', 'dry.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (13, ':)', 'smile.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (14, ':wub:', 'wub.gif', 0, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (15, ':angry:', 'angry.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (16, ':(', 'sad.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (17, ':unsure:', 'unsure.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (18, ':wacko:', 'wacko.gif', 0, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (19, ':blink:', 'blink.gif', 1, 'default');";
-$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set) VALUES (20, ':ph34r:', 'ph34r.gif', 0, 'default');";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (1, ':)', 'smile.png', 1, 'default', 1);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (2, ';)', 'wink.png', 1, 'default', 2);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (3, ':P', 'tongue.png', 1, 'default', 3);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (4, ':D', 'biggrin.png', 1, 'default', 4);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (5, ':lol:', 'laugh.png', 1, 'default', 5);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (6, ':(', 'sad.png', 1, 'default', 6);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (7, ':angry:', 'angry.png', 1, 'default', 7);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (8, ':mellow:', 'mellow.png', 1, 'default', 8);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (9, ':huh:', 'huh.png', 1, 'default', 9);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (10, '^_^', 'happy.png', 0, 'default', 10);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (11, ':o', 'ohmy.png', 1, 'default', 11);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (12, 'B)', 'cool.png', 1, 'default', 12);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (13, ':rolleyes:', 'rolleyes.gif', 1, 'default', 13);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (14, '-_-', 'sleep.png', 0, 'default', 14);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (15, '&lt;_&lt;', 'dry.png', 1, 'default', 15);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (16, ':wub:', 'wub.png', 0, 'default', 16);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (17, ':unsure:', 'unsure.png', 1, 'default', 17);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (18, ':wacko:', 'wacko.png', 0, 'default', 18);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (19, ':blink:', 'blink.png', 1, 'default', 19);";
+$INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_position) VALUES (20, ':ph34r:', 'ph34r.png', 0, 'default', 20);";
 
 # Profile fields stuff
 $INSERT[] = "INSERT INTO pfields_data (pf_id, pf_title, pf_desc, pf_content, pf_type, pf_not_null, pf_member_hide, pf_max_input, pf_member_edit, pf_position, pf_show_on_reg, pf_input_format, pf_admin_only, pf_topic_format, pf_group_id, pf_icon, pf_key) VALUES
@@ -75,16 +73,16 @@ $INSERT[] ="INSERT INTO permission_index VALUES(2, 'core', 'help', 1, '*', '', '
 /* Report center stuff */
 
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Пример плагина', 'Плагин, не требующий напи�ани� кода, но требующий на�тройки.', 'Invision Power Services, Inc', '', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1, 'core');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Пример плагина', 'Плагин, не требующий напи�ани� кода, но требующий на�тройки.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1, 'core');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин форума', 'Плагин жалоб на �ообщени� и темы в форумах.', 'Invision Power Services, Inc', '', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1, 'forums');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин форума', 'Плагин жалоб на �ообщени� и темы в форумах.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1, 'forums');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин личных �ообщений', 'Плагин жалоб на личные �ообщени�', 'Invision Power Services, Inc', '', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1, 'members');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин личных �ообщений', 'Плагин жалоб на личные �ообщени�', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1, 'members');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин пользователь�ких профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', '', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1, 'members');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин пользователь�ких профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1, 'members');
 EOF;
 
 $INSERT[] = "INSERT INTO rc_status VALUES(1, '�ова�', 1, 5, 1, 0, 1, 1);";
@@ -112,16 +110,16 @@ $INSERT[] = "INSERT INTO reputation_levels VALUES(3, 0, 'Обычный', '');";
 $INSERT[] = "INSERT INTO reputation_levels VALUES(4, 10, 'Хороший', '');";
 $INSERT[] = "INSERT INTO reputation_levels VALUES(5, 20, 'Очень хороший', '');";
 
-$INSERT[] = "INSERT INTO core_share_links VALUES(1, 'Twitter', 'twitter', 1, 1, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(2, 'Facebook', 'facebook', 1, 2, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(3, 'Digg', 'digg', 1, 3, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(4, 'Del.icio.us', 'delicious', 1, 4, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(5, 'Вконтакте', 'vkontakte', 1, 5, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(6, 'Мемори', 'memori', 1, 6, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(7, 'БобрДобр', 'bobrdobr', 1, 7, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(8, 'Email', 'email', 1, 7, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(9, 'Buzz', 'buzz', 1, 3, 1);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(10, 'Печать', 'print', 1, 10, 0);";
-$INSERT[] = "INSERT INTO core_share_links VALUES(11, 'Скачать', 'download', 1, 11, 0);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(1, 'Twitter', 'twitter', 1, 1, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(2, 'Facebook', 'facebook', 1, 2, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(3, 'Digg', 'digg', 1, 3, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(4, 'Del.icio.us', 'delicious', 1, 4, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(5, 'Вконтакте', 'vkontakte', 1, 5, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(6, 'Мемори', 'memori', 1, 6, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(7, 'БобрДобр', 'bobrdobr', 1, 7, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(8, 'Email', 'email', 1, 7, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(9, 'Google+', 'googleplusone', 1, 3, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(10, 'Печать', 'print', 1, 10, 0);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(11, 'Скачать', 'download', 1, 11, 0);";
 
 
diff --git a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_tables.php b/upload/admin/applications/core/setup/versions/install/sql/core_mysql_tables.php
index bd3e0a70..ec00d9e4 100644
--- a/upload/admin/applications/core/setup/versions/install/sql/core_mysql_tables.php
+++ b/upload/admin/applications/core/setup/versions/install/sql/core_mysql_tables.php
@@ -3,25 +3,9 @@
 * Installation Schematic File
 * Generated on Thu, 19 Feb 2009 08:15:47 +0000 GMT
 */
-$TABLE[] = "CREATE TABLE search_results (
-  id varchar(32) NOT NULL default '',
-  topic_id text,
-  search_date int(12) NOT NULL default 0,
-  topic_max int(3) NOT NULL default 0,
-  sort_key varchar(32) NOT NULL default 'last_post',
-  sort_order varchar(4) NOT NULL default 'desc',
-  member_id mediumint(10) default 0,
-  ip_address varchar(64) default NULL,
-  post_id text,
-  post_max int(10) NOT NULL default 0,
-  query_cache text,
-  PRIMARY KEY  (id),
-  KEY search_date (search_date)
-);";
-
 $TABLE[] = "CREATE TABLE admin_login_logs (
   admin_id int(10) NOT NULL auto_increment,
-  admin_ip_address varchar(16) NOT NULL default '0.0.0.0',
+  admin_ip_address varchar(46) NOT NULL default '0.0.0.0',
   admin_username varchar(40) NOT NULL default '',
   admin_time int(10) unsigned NOT NULL default 0,
   admin_success int(1) unsigned NOT NULL default 0,
@@ -35,7 +19,7 @@ $TABLE[] = "CREATE TABLE admin_logs (
   member_id int(10) default 0,
   ctime int(10) default 0,
   note text,
-  ip_address varchar(255) default NULL,
+  ip_address varchar(46) default NULL,
   appcomponent varchar(255) NOT NULL default '',
   module varchar(255) NOT NULL default '',
   section varchar(255) NOT NULL default '',
@@ -69,7 +53,7 @@ $TABLE[] = "CREATE TABLE announcements (
 $TABLE[] = "CREATE TABLE api_log (
   api_log_id int(10) unsigned NOT NULL auto_increment,
   api_log_key varchar(32) NOT NULL,
-  api_log_ip varchar(16) NOT NULL,
+  api_log_ip varchar(46) NOT NULL,
   api_log_date int(10) NOT NULL,
   api_log_query text NOT NULL,
   api_log_allowed tinyint(1) unsigned NOT NULL,
@@ -81,7 +65,7 @@ $TABLE[] = "CREATE TABLE api_users (
   api_user_key char(32) NOT NULL,
   api_user_name varchar(32) NOT NULL,
   api_user_perms text NOT NULL,
-  api_user_ip varchar(16) NOT NULL,
+  api_user_ip varchar(46) NOT NULL,
   PRIMARY KEY  (api_user_id)
 );";
 $TABLE[] = "CREATE TABLE attachments (
@@ -102,20 +86,21 @@ $TABLE[] = "CREATE TABLE attachments (
   attach_rel_module varchar(100) NOT NULL default '0',
   attach_img_width int(5) NOT NULL default 0,
   attach_img_height int(5) NOT NULL default 0,
+  attach_parent_id INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (attach_id),
   KEY attach_pid (attach_rel_id),
   KEY attach_post_key (attach_post_key),
-  KEY attach_mid_size (attach_member_id,attach_rel_module,attach_filesize)
+  KEY attach_mid_size (attach_member_id,attach_rel_module,attach_filesize),
+  KEY attach_parent_id ( attach_parent_id, attach_rel_module )
 );";
 $TABLE[] = "CREATE TABLE attachments_type (
   atype_id int(10) NOT NULL auto_increment,
   atype_extension varchar(18) NOT NULL default '',
   atype_mimetype varchar(255) NOT NULL default '',
   atype_post tinyint(1) NOT NULL default 1,
-  atype_photo tinyint(1) NOT NULL default 0,
   atype_img text,
   PRIMARY KEY  (atype_id),
-  KEY atype (atype_post,atype_photo),
+  KEY atype (atype_post),
   KEY atype_extension (atype_extension)
 );";
 $TABLE[] = "CREATE TABLE badwords (
@@ -130,10 +115,9 @@ $TABLE[] = "CREATE TABLE banfilters (
   ban_type varchar(10) NOT NULL default 'ip',
   ban_content text,
   ban_date int(10) NOT NULL default 0,
-  ban_nocache INT(1) NOT NULL default 0,
+  ban_reason VARCHAR(255) NULL DEFAULT NULL,
   PRIMARY KEY  (ban_id),
-  KEY ban_content (ban_content(200)),
-  KEY ban_nocache (ban_nocache)
+  KEY ban_content (ban_content(200))
 );";
 $TABLE[] = "CREATE TABLE bbcode_mediatag (
   mediatag_id smallint(10) unsigned NOT NULL auto_increment,
@@ -175,9 +159,22 @@ $TABLE[] = "CREATE TABLE content_cache_posts (
 	KEY date_index (cache_updated )
 );";
 
+$TABLE[] = "CREATE TABLE core_editor_autosave (
+	eas_key			CHAR(32) NOT NULL,
+	eas_member_id	INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	eas_app			VARCHAR(50) NOT NULL DEFAULT '',
+	eas_section		VARCHAR(100) NOT NULL DEFAULT '',
+	eas_updated	INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	eas_content	MEDIUMTEXT,
+	UNIQUE KEY eas_key (eas_key),
+	KEY eas_member_lookup (eas_member_id, eas_app, eas_section),
+	KEY eas_updated (eas_updated)
+);";
+
 $TABLE[] = "CREATE TABLE core_like (
-  like_id binary(16) NOT NULL default '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0',
-  like_lookup_id binary(16) default NULL,
+  like_id VARCHAR(32),
+  like_lookup_id VARCHAR(32) default NULL,
+  like_lookup_area VARCHAR(32) NOT NULL DEFAULT '',
   like_app varchar(150) NOT NULL default '',
   like_area varchar(200) NOT NULL default '',
   like_rel_id bigint(20) unsigned NOT NULL default '0',
@@ -188,13 +185,16 @@ $TABLE[] = "CREATE TABLE core_like (
   like_notify_meta text,
   like_notify_freq varchar(200) NOT NULL default '',
   like_notify_sent int(10) unsigned NOT NULL default '0',
+  like_visible TINYINT NOT NULL DEFAULT '1',
   PRIMARY KEY  (like_id),
-  KEY find_rel_favs (like_lookup_id,like_is_anon,like_added),
-  KEY like_member_id (like_member_id,like_added)
-)";
+  KEY find_rel_likes (like_lookup_id,like_visible,like_is_anon,like_added),
+  KEY like_member_id (like_member_id , like_visible , like_added),
+  KEY like_lookup_area (like_lookup_area , like_visible),
+  KEY notification_task ( like_notify_do, like_app (50), like_area (50), like_visible, like_notify_sent, like_notify_freq (50) )
+);";
 
 $TABLE[] = "CREATE TABLE core_like_cache (
-  like_cache_id binary(16) NOT NULL default '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0',
+  like_cache_id VARCHAR(32),
   like_cache_app varchar(150) NOT NULL default '',
   like_cache_area varchar(200) NOT NULL default '',
   like_cache_rel_id bigint(20) unsigned NOT NULL default '0',
@@ -203,18 +203,72 @@ $TABLE[] = "CREATE TABLE core_like_cache (
   PRIMARY KEY  (like_cache_id)
 );";
 
+$TABLE[] = "CREATE TABLE IF NOT EXISTS core_geolocation_cache (
+  geocache_key varchar(32) NOT NULL,
+  geocache_lat varchar(100) NOT NULL,
+  geocache_lon varchar(100) NOT NULL,
+  geocache_raw text,
+  geocache_country varchar(255) NOT NULL default '',
+  geocache_district varchar(255) NOT NULL default '',
+  geocache_district2 varchar(255) NOT NULL default '',
+  geocache_locality varchar(255) NOT NULL default '',
+  geocache_type varchar(255) NOT NULL default '',
+  geocache_engine varchar(255) NOT NULL default '',
+  geocache_added int(10) NOT NULL default '0',
+  geocache_short text,
+  PRIMARY KEY  (geocache_key),
+  KEY geo_lat_lon (geocache_lat,geocache_lon)
+);";
+
+$TABLE[] = "CREATE TABLE core_tags (
+	tag_id 				BIGINT(20) NOT NULL auto_increment,
+	tag_aai_lookup		CHAR(32) NOT NULL DEFAULT '',
+	tag_aap_lookup		CHAR(32) NOT NULL DEFAULT '',
+	tag_meta_app		VARCHAR(200) NOT NULL default '',		
+	tag_meta_area		VARCHAR(200) NOT NULL default '',
+	tag_meta_id			INT(10) NOT NULL DEFAULT 0,
+	tag_meta_parent_id	INT(10) NOT NULL DEFAULT 0,
+	tag_member_id		INT(10) NOT NULL DEFAULT 0,
+	tag_added			INT(10) NOT NULL DEFAULT 0,
+	tag_prefix			INT(1) NOT NULL DEFAULT 0,
+	tag_text			VARCHAR(255),
+	PRIMARY KEY (tag_id),
+	KEY tag_aai_lookup (tag_aai_lookup),
+	KEY tag_app (tag_meta_app (100), tag_meta_area (100)),
+	KEY tag_member_id (tag_member_id),
+	KEY tag_aap_lookup (tag_aap_lookup, tag_text (200)),
+	KEY tag_added (tag_added )
+);";
+
+$TABLE[] = "CREATE TABLE core_tags_perms (
+	tag_perm_aai_lookup CHAR(32) NOT NULL DEFAULT '',
+	tag_perm_aap_lookup CHAR(32) NOT NULL DEFAULT '',
+	tag_perm_text VARCHAR(255) NOT NULL DEFAULT '',
+	tag_perm_visible INT(1) NOT NULL DEFAULT 1,		
+	UNIQUE KEY tag_perm_aai_lookup (tag_perm_aai_lookup),
+	KEY tag_perm_aap_lookup( tag_perm_aap_lookup ),
+	KEY tag_lookup (tag_perm_text, tag_perm_visible) 
+);";
+	
+$TABLE[] = "CREATE TABLE core_tags_cache (
+	tag_cache_key	CHAR(32) NOT NULL DEFAULT '',
+	tag_cache_text	text,
+	tag_cache_date	INT(10) NOT NULL DEFAULT 0,
+	UNIQUE KEY (tag_cache_key ) 
+);";
+	
 $TABLE[] = "CREATE TABLE cache_store (
   cs_key varchar(255) NOT NULL default '',
   cs_value mediumtext,
-  cs_extra varchar(255) NOT NULL DEFAULT '',
   cs_array tinyint(1) NOT NULL default 0,
   cs_updated int(10) NOT NULL default 0,
+  cs_rebuild TINYINT( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY  (cs_key)
 );";
 $TABLE[] = "CREATE TABLE captcha (
   captcha_unique_id varchar(32) NOT NULL default '',
   captcha_string varchar(100) NOT NULL default '',
-  captcha_ipaddress varchar(16) NOT NULL default '',
+  captcha_ipaddress varchar(46) NOT NULL default '',
   captcha_date int(10) NOT NULL default 0,
   PRIMARY KEY  (captcha_unique_id),
   KEY captcha_date ( captcha_date )
@@ -224,7 +278,7 @@ $TABLE[] = "CREATE TABLE converge_local (
   converge_api_code varchar(32) NOT NULL default '',
   converge_product_id int(10) NOT NULL default 0,
   converge_added int(10) NOT NULL default 0,
-  converge_ip_address varchar(16) NOT NULL default '',
+  converge_ip_address varchar(46) NOT NULL default '',
   converge_url varchar(255) NOT NULL default '',
   converge_active int(1) NOT NULL default 0,
   converge_http_user varchar(255) NOT NULL default '',
@@ -247,6 +301,10 @@ $TABLE[] = "CREATE TABLE core_applications (
   app_enabled int(1) NOT NULL default 0,
   app_location varchar(32) NOT NULL default '',
   app_hide_tab TINYINT(1) NOT NULL DEFAULT 0,
+  app_tab_groups TEXT NULL DEFAULT NULL,
+  app_website VARCHAR(255) NULL DEFAULT NULL,
+  app_update_check VARCHAR(255) NULL DEFAULT NULL,
+  app_global_caches VARCHAR(255) NULL DEFAULT NULL,
   PRIMARY KEY  (app_id),
   KEY app_directory (app_directory)
 );";
@@ -267,6 +325,7 @@ $TABLE[] = "CREATE TABLE core_hooks (
   hook_position mediumint(9) NOT NULL default 0,
   hook_extra_data text,
   hook_key varchar(32) default NULL,
+  hook_global_caches VARCHAR(255) NULL DEFAULT NULL,
   PRIMARY KEY  (hook_id)
 );";
 $TABLE[] = "CREATE TABLE core_hooks_files (
@@ -290,6 +349,22 @@ $TABLE[] = "CREATE TABLE core_incoming_emails (
 	rule_added_by MEDIUMINT( 8 ) NOT NULL ,
 	rule_added_date INT( 10 ) NOT NULL
 );";
+
+$TABLE[] = "CREATE TABLE core_incoming_email_log (
+  log_id int(11) NOT NULL AUTO_INCREMENT,
+  log_email varchar(255) DEFAULT NULL,
+  log_time int(10) DEFAULT NULL,
+  PRIMARY KEY (log_id)
+);";
+
+$TABLE[] = "CREATE TABLE core_inline_messages (
+inline_msg_id		INT(10) NOT NULL auto_increment,
+inline_msg_date		INT(10) NOT NULL DEFAULT 0,
+inline_msg_content	TEXT,
+PRIMARY KEY (inline_msg_id),
+KEY inline_msg_date (inline_msg_date)
+);";
+
 $TABLE[] = "CREATE TABLE core_item_markers (
   item_key char(32) NOT NULL,
   item_member_id int(8) NOT NULL default 0,
@@ -346,7 +421,7 @@ $TABLE[] = "CREATE TABLE core_share_links_log (
 	log_data_type		  VARCHAR(50) NOT NULL default '',
 	log_data_primary_id   INT(10) NOT NULL default 0,
 	log_data_secondary_id INT(10) NOT NULL default 0,
-	log_ip_address		  VARCHAR(16) NOT NULL DEFAULT '',
+	log_ip_address		  VARCHAR(46) NOT NULL DEFAULT '',
 	PRIMARY KEY log_id (log_id),
 	KEY findstuff (log_data_app, log_data_type, log_data_primary_id),
 	KEY log_date (log_date),
@@ -399,8 +474,8 @@ $TABLE[] = "CREATE TABLE core_sys_conf_settings (
 
 $TABLE[] = "CREATE TABLE core_sys_cp_sessions (
   session_id varchar(32) NOT NULL default '',
-  session_ip_address varchar(32) NOT NULL default '',
-  session_member_name varchar(250) NOT NULL default '',
+  session_ip_address varchar(46) NOT NULL default '',
+  session_member_name varchar(255) NOT NULL default '',
   session_member_id mediumint(8) NOT NULL default 0,
   session_member_login_key varchar(32) NOT NULL default '',
   session_location varchar(64) NOT NULL default '',
@@ -414,7 +489,7 @@ $TABLE[] = "CREATE TABLE core_sys_cp_sessions (
 );";
 $TABLE[] = "CREATE TABLE core_sys_lang (
   lang_id mediumint(4) unsigned NOT NULL auto_increment,
-  lang_short varchar(25) NOT NULL default '',
+  lang_short varchar(32) NOT NULL default '',
   lang_title varchar(255) NOT NULL default '',
   lang_default tinyint(1) unsigned NOT NULL default 0,
   lang_isrtl tinyint(1) unsigned NOT NULL default 0,
@@ -514,7 +589,6 @@ $TABLE[] = "CREATE TABLE custom_bbcode (
   bbcode_aliases varchar(255) default NULL,
   bbcode_optional_option tinyint(1) NOT NULL default 0,
   bbcode_image varchar(255) default NULL,
-  bbcode_strip_search tinyint(1) NOT NULL default 0,
   bbcode_app varchar(50) NOT NULL default '',
   bbcode_custom_regex TEXT NULL DEFAULT NULL,
   PRIMARY KEY  (bbcode_id)
@@ -523,7 +597,7 @@ $TABLE[] = "CREATE TABLE dnames_change (
   dname_id int(10) NOT NULL auto_increment,
   dname_member_id int(8) NOT NULL default 0,
   dname_date int(10) NOT NULL default 0,
-  dname_ip_address varchar(16) NOT NULL default '',
+  dname_ip_address varchar(46) NOT NULL default '',
   dname_previous varchar(255) NOT NULL default '',
   dname_current varchar(255) NOT NULL default '',
   PRIMARY KEY  (dname_id),
@@ -531,26 +605,14 @@ $TABLE[] = "CREATE TABLE dnames_change (
   KEY date_id (dname_member_id,dname_date),
   KEY dname_ip_address (dname_ip_address)
 );";
-$TABLE[] = "CREATE TABLE email_logs (
-  email_id int(10) NOT NULL auto_increment,
-  email_subject varchar(255) NOT NULL default '',
-  email_content text,
-  email_date int(10) NOT NULL default 0,
-  from_member_id mediumint(8) NOT NULL default 0,
-  from_email_address varchar(250) NOT NULL default '',
-  from_ip_address varchar(16) NOT NULL default '127.0.0.1',
-  to_member_id mediumint(8) NOT NULL default 0,
-  to_email_address varchar(250) NOT NULL default '',
-  PRIMARY KEY  (email_id),
-  KEY from_member_id (from_member_id),
-  KEY email_date (email_date)
-);";
+
 $TABLE[] = "CREATE TABLE emoticons (
   id smallint(3) NOT NULL auto_increment,
   typed varchar(32) NOT NULL default '',
   image varchar(128) NOT NULL default '',
   clickable smallint(2) NOT NULL default 1,
   emo_set varchar(64) NOT NULL default 'default',
+  emo_position INT(5) NOT NULL DEFAULT '0',
   PRIMARY KEY  (id),
   KEY emo_set (emo_set)
 );";
@@ -560,7 +622,7 @@ $TABLE[] = "CREATE TABLE error_logs (
   log_date int NOT NULL default 0,
   log_error text,
   log_error_code varchar(24) NOT NULL DEFAULT 0,
-  log_ip_address varchar(32) default NULL,
+  log_ip_address varchar(46) default NULL,
   log_request_uri text,
   PRIMARY KEY  (log_id),
   KEY log_date (log_date),
@@ -582,7 +644,6 @@ $TABLE[] = "CREATE TABLE groups (
   g_mem_info tinyint(1) default NULL,
   g_other_topics tinyint(1) default NULL,
   g_use_search tinyint(1) default NULL,
-  g_email_friend tinyint(1) default NULL,
   g_edit_profile tinyint(1) default NULL,
   g_post_new_topics tinyint(1) default NULL,
   g_reply_own_topics tinyint(1) default NULL,
@@ -603,7 +664,6 @@ $TABLE[] = "CREATE TABLE groups (
   g_avoid_flood tinyint(1) default NULL,
   g_icon text,
   g_attach_max bigint(20) default NULL,
-  g_avatar_upload tinyint(1) default 0,
   prefix varchar(250) default NULL,
   suffix varchar(250) default NULL,
   g_max_messages int(5) default 50,
@@ -614,10 +674,9 @@ $TABLE[] = "CREATE TABLE groups (
   g_hide_from_list tinyint(1) default 0,
   g_post_closed tinyint(1) default 0,
   g_perm_id varchar(255) NOT NULL default '',
-  g_photo_max_vars varchar(200) default '100:150:150',
+  g_photo_max_vars varchar(200) default '100:200:300',
   g_dohtml tinyint(1) NOT NULL default 0,
   g_edit_topic tinyint(1) NOT NULL default 0,
-  g_email_limit varchar(15) NOT NULL default '10:15',
   g_bypass_badwords tinyint(1) NOT NULL default 0,
   g_can_msg_attach tinyint(1) NOT NULL default 0,
   g_attach_per_post int(10) NOT NULL default 0,
@@ -648,11 +707,21 @@ $TABLE[] = "CREATE TABLE ignored_users (
   ignore_ignore_id int(8) NOT NULL default 0,
   ignore_messages int(1) NOT NULL default 0,
   ignore_topics int(1) NOT NULL default 0,
+  ignore_signatures INT(1) NOT NULL DEFAULT '0',
+  ignore_chats INT( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY  (ignore_id),
   KEY ignore_owner_id (ignore_owner_id),
   KEY ignore_ignore_id (ignore_ignore_id)
 );";
 
+$TABLE[] = "CREATE TABLE cache_simple (
+	cache_id	   VARCHAR(32) NOT NULL DEFAULT '',
+	cache_perm_key VARCHAR(32) NOT NULL DEFAULT '',
+	cache_time	   INT(10) NOT NULL DEFAULT 0,
+	cache_data	   MEDIUMTEXT NULL DEFAULT NULL,
+	UNIQUE KEY lookup ( cache_id, cache_perm_key )
+);";
+
 $TABLE[] = "CREATE TABLE inline_notifications (
  notify_id INT NOT NULL AUTO_INCREMENT,
  notify_to_id INT NOT NULL DEFAULT 0,
@@ -663,9 +732,14 @@ $TABLE[] = "CREATE TABLE inline_notifications (
  notify_from_id INT NOT NULL DEFAULT 0,
  notify_type_key VARCHAR( 255 ) NULL DEFAULT NULL ,
  notify_url text,
+ notify_meta_app VARCHAR(50) NULL DEFAULT NULL,
+ notify_meta_area VARCHAR(100) NULL DEFAULT NULL,
+ notify_meta_id INT(10) NOT NULL DEFAULT 0,
+ notify_meta_key VARCHAR(32) NULL DEFAULT NULL,
  PRIMARY KEY  (notify_id),
- KEY ( notify_to_id, notify_sent ),
- KEY grabber (notify_to_id, notify_read, notify_sent)
+ KEY notify_to_id ( notify_to_id, notify_sent ),
+ KEY grabber (notify_to_id, notify_read, notify_sent),
+ KEY notify_meta_key (notify_meta_key)
 );";
 
 $TABLE[] = "CREATE TABLE login_methods (
@@ -685,6 +759,7 @@ $TABLE[] = "CREATE TABLE login_methods (
   login_login_url varchar(255) NOT NULL default '',
   login_logout_url varchar(255) NOT NULL default '',
   login_order smallint(3) NOT NULL default 0,
+  login_custom_config TEXT NULL DEFAULT NULL,
   PRIMARY KEY  (login_id)
 );";
 $TABLE[] = "CREATE TABLE mail_error_logs (
@@ -707,6 +782,7 @@ $TABLE[] = "CREATE TABLE mail_queue (
   mail_subject text,
   mail_content text,
   mail_html_on int(1) NOT NULL default 0,
+  mail_cc TEXT NULL DEFAULT NULL,
   PRIMARY KEY  (mail_id)
 );";
 $TABLE[] = "CREATE TABLE members (
@@ -715,13 +791,11 @@ $TABLE[] = "CREATE TABLE members (
   member_group_id smallint(3) NOT NULL default 0,
   email varchar(150) NOT NULL default '',
   joined int(10) NOT NULL default 0,
-  ip_address varchar(16) NOT NULL default '',
+  ip_address varchar(46) NOT NULL default '',
   posts mediumint(7) default 0,
   title varchar(64) default NULL,
   allow_admin_mails tinyint(1) default NULL,
   time_offset varchar(10) default NULL,
-  hide_email varchar(8) default NULL,
-  email_full tinyint(1) default NULL,
   skin smallint(5) default NULL,
   warn_level int(10) default NULL,
   warn_lastwarn int(10) NOT NULL default 0,
@@ -730,7 +804,6 @@ $TABLE[] = "CREATE TABLE members (
   restrict_post varchar(100) NOT NULL default '0',
   view_sigs tinyint(1) default 1,
   view_img tinyint(1) default 1,
-  view_avs tinyint(1) default 1,
   bday_day int(2) default NULL,
   bday_month int(2) default NULL,
   bday_year int(4) default NULL,
@@ -742,7 +815,6 @@ $TABLE[] = "CREATE TABLE members (
   last_visit int(10) default 0,
   last_activity int(10) default 0,
   dst_in_use tinyint(1) default 0,
-  view_prefs varchar(64) default '-1&-1',
   coppa_user tinyint(1) default 0,
   mod_posts varchar(100) NOT NULL default '0',
   auto_track varchar(50) default '0',
@@ -780,6 +852,7 @@ $TABLE[] = "CREATE TABLE members (
   fb_lastsync int(10) NOT NULL default 0,
   members_day_posts VARCHAR(32) NOT NULL default '0,0',
   vk_uid bigint(20) unsigned NOT NULL default '0',
+  vk_token TEXT NULL, 
   live_id VARCHAR( 32 ) NULL,
   twitter_id VARCHAR(255) NOT NULL DEFAULT '',
   twitter_token VARCHAR(255) NOT NULL DEFAULT '',
@@ -792,7 +865,7 @@ $TABLE[] = "CREATE TABLE members (
   PRIMARY KEY  (member_id),
   KEY members_l_display_name (members_l_display_name),
   KEY members_l_username (members_l_username),
-  KEY mgroup (member_group_id),
+  KEY mgroup ( member_group_id , member_id ),
   KEY bday_day (bday_day),
   KEY bday_month (bday_month),
   KEY member_banned (member_banned),
@@ -860,10 +933,15 @@ $TABLE[] = "CREATE TABLE member_status_updates (
   status_hash varchar(32) NOT NULL DEFAULT '',
   status_imported int(1) NOT NULL DEFAULT 0,
   status_creator varchar(100) NOT NULL DEFAULT '',
+  status_author_id INT(10) NOT NULL DEFAULT '0',
+  status_author_ip VARCHAR(46) NOT NULL DEFAULT '',
+  status_approved INT(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (status_id),
   KEY status_date (status_date),
-  KEY s_hash (status_member_id,status_hash,status_imported),
-  KEY status_is_latest ( status_is_latest , status_date )
+  KEY s_hash (status_member_id , status_hash , status_date),
+  KEY status_is_latest ( status_is_latest , status_date ),
+  KEY status_author_lookup (status_author_id, status_member_id, status_date),
+  KEY status_member_id ( status_member_id, status_approved, status_date )
 );";
 
 $TABLE[] = "CREATE TABLE openid_temp (
@@ -880,12 +958,12 @@ $TABLE[] = "CREATE TABLE permission_index (
   perm_type varchar(32) NOT NULL,
   perm_type_id int(10) unsigned NOT NULL,
   perm_view text NOT NULL,
-  perm_2 text NOT NULL,
-  perm_3 text NOT NULL,
-  perm_4 text NOT NULL,
-  perm_5 text NOT NULL,
-  perm_6 text NOT NULL,
-  perm_7 text NOT NULL,
+  perm_2 text NULL DEFAULT NULL,
+  perm_3 text NULL DEFAULT NULL,
+  perm_4 text NULL DEFAULT NULL,
+  perm_5 text NULL DEFAULT NULL,
+  perm_6 text NULL DEFAULT NULL,
+  perm_7 text NULL DEFAULT NULL,
   owner_only tinyint(1) NOT NULL default 0,
   friend_only tinyint(1) NOT NULL default 0,
   authorized_users varchar(255) default NULL,
@@ -935,18 +1013,7 @@ $TABLE[] = "CREATE TABLE pfields_groups (
   pf_group_key varchar(255) NOT NULL,
   PRIMARY KEY  (pf_group_id)
 );";
-$TABLE[] = "CREATE TABLE profile_comments (
-  comment_id int(10) NOT NULL auto_increment,
-  comment_for_member_id int(10) unsigned NOT NULL default 0,
-  comment_by_member_id int(10) unsigned NOT NULL default 0,
-  comment_date int(10) unsigned NOT NULL default 0,
-  comment_ip_address varchar(16) NOT NULL default '0',
-  comment_content text,
-  comment_approved tinyint(1) NOT NULL default 0,
-  PRIMARY KEY  (comment_id),
-  KEY my_comments (comment_for_member_id,comment_date),
-  KEY comment_ip_address (comment_ip_address)
-);";
+
 $TABLE[] = "CREATE TABLE profile_friends (
   friends_id int(10) NOT NULL auto_increment,
   friends_member_id int(10) unsigned NOT NULL default 0,
@@ -980,10 +1047,11 @@ $TABLE[] = "CREATE TABLE profile_portal (
   pp_setting_moderate_friends tinyint(1) NOT NULL default 0,
   pp_setting_count_friends int(2) NOT NULL default 0,
   pp_setting_count_comments int(2) NOT NULL default 0,
-  pp_setting_count_visitors int(2) NOT NULL default 0,
+  pp_setting_count_visitors tinyint(1) NOT NULL default 0,
   pp_about_me mediumtext,
   pp_reputation_points int(10) NOT NULL default 0,
-  notes text,
+  pp_gravatar VARCHAR(255) NOT NULL DEFAULT '',
+  pp_photo_type VARCHAR(20) NOT NULL DEFAULT '',
   signature text,
   avatar_location varchar(255) default NULL,
   avatar_size varchar(9) NOT NULL default '0',
@@ -992,9 +1060,10 @@ $TABLE[] = "CREATE TABLE profile_portal (
   fb_photo text,
   fb_photo_thumb text,
   fb_bwoptions int(10) unsigned NOT NULL default 0,
-  tc_last_sid_import BIGINT(20) UNSIGNED NOT NULL default 0,
+  tc_last_sid_import VARCHAR(50) NULL DEFAULT '0',
   tc_photo text,
   tc_bwoptions int(10) unsigned NOT NULL default 0,
+  vk_bwoptions int(10) unsigned NOT NULL default 0,
   pp_customization mediumtext,
   PRIMARY KEY  (pp_member_id)
 );";
@@ -1007,7 +1076,7 @@ $TABLE[] = "CREATE TABLE profile_ratings (
   rating_id int(10) NOT NULL auto_increment,
   rating_for_member_id int(10) NOT NULL default 0,
   rating_by_member_id int(10) NOT NULL default 0,
-  rating_ip_address varchar(16) NOT NULL default '',
+  rating_ip_address varchar(46) NOT NULL default '',
   rating_value int(2) NOT NULL default 0,
   PRIMARY KEY  (rating_id),
   KEY rating_for_member_id (rating_for_member_id),
@@ -1042,6 +1111,10 @@ $TABLE[] = "CREATE TABLE rc_comments (
   comment text NOT NULL,
   comment_by mediumint(8) NOT NULL default 0,
   comment_date int(10) NOT NULL default 0,
+  approved TINYINT NOT NULL DEFAULT '1',
+  edit_date INT NOT NULL DEFAULT '0',
+  author_name VARCHAR( 255 ) NULL DEFAULT NULL,
+  ip_address VARCHAR( 46 ) NULL DEFAULT NULL,
   PRIMARY KEY  (id)
 );";
 $TABLE[] = "CREATE TABLE rc_modpref (
@@ -1077,7 +1150,8 @@ $TABLE[] = "CREATE TABLE rc_reports_index (
   seoname varchar(255) default NULL,
   seotemplate varchar(255) default NULL,
   PRIMARY KEY  (id),
-  KEY uid (uid)
+  KEY uid (uid),
+  KEY (status)
 );";
 $TABLE[] = "CREATE TABLE rc_status (
   status tinyint(2) NOT NULL auto_increment,
@@ -1106,9 +1180,11 @@ $TABLE[] = "CREATE TABLE reputation_cache (
   app varchar(32) NOT NULL,
   type varchar(32) NOT NULL,
   type_id int(10) unsigned NOT NULL,
-  rep_points int(10) NOT NULL,
+  rep_points int(10) NOT NULL DEFAULT '0',
+  rep_like_cache MEDIUMTEXT,
   PRIMARY KEY  (id),
-  KEY app (app,type,type_id)
+  UNIQUE KEY app (app, type, type_id),
+  KEY (type, type_id)
 );";
 $TABLE[] = "CREATE TABLE reputation_index (
   id bigint(10) unsigned NOT NULL auto_increment,
@@ -1161,7 +1237,6 @@ $TABLE[] = "CREATE TABLE rss_import (
   rss_import_topic_hide tinyint(1) NOT NULL default 0,
   rss_import_inc_pcount tinyint(1) NOT NULL default 0,
   rss_import_topic_pre varchar(50) NOT NULL default '',
-  rss_import_charset varchar(200) NOT NULL default '',
   rss_import_allow_html tinyint(1) NOT NULL default 0,
   rss_import_auth tinyint(1) NOT NULL default 0,
   rss_import_auth_user varchar(255) NOT NULL default 'Not Needed',
@@ -1189,16 +1264,15 @@ $TABLE[] = "CREATE TABLE search_sessions (
 );";
 $TABLE[] = "CREATE TABLE sessions (
   id varchar(60) NOT NULL default '0',
-  member_name varchar(64) default NULL,
+  member_name varchar(255) default NULL,
   seo_name varchar(255) NOT NULL default '',
   member_id mediumint(8) NOT NULL default 0,
-  ip_address varchar(16) default NULL,
+  ip_address varchar(46) default NULL,
   browser varchar(200) NOT NULL default '',
   running_time int(10) default NULL,
   login_type tinyint(1) default 0,
   member_group smallint(3) default NULL,
   in_error tinyint(1) NOT NULL default 0,
-  location varchar(40) default NULL,
   location_1_type varchar(255) NOT NULL default '',
   location_1_id int(10) NOT NULL default 0,
   location_2_type varchar(255) NOT NULL default '',
@@ -1214,6 +1288,7 @@ $TABLE[] = "CREATE TABLE sessions (
   uagent_bypass int(1) NOT NULL default 0,
   search_thread_id int(11) NOT NULL default 0,
   search_thread_time int NOT NULL default 0,
+  session_msg_id INT(10) NOT NULL DEFAULT 0,
   PRIMARY KEY  (id),
   KEY location1 (location_1_type,location_1_id),
   KEY location2 (location_2_type,location_2_id),
@@ -1221,6 +1296,13 @@ $TABLE[] = "CREATE TABLE sessions (
   KEY running_time (running_time),
   KEY member_id (member_id)
 );";
+$TABLE[] = "CREATE TABLE core_inline_messages (
+inline_msg_id		INT(10) NOT NULL auto_increment,
+inline_msg_date		INT(10) NOT NULL DEFAULT 0,
+inline_msg_content	TEXT,
+PRIMARY KEY (inline_msg_id),
+KEY inline_msg_date (inline_msg_date)
+);";
 $TABLE[] = "CREATE TABLE skin_cache (
   cache_id int(10) NOT NULL auto_increment,
   cache_updated int(10) NOT NULL default 0,
@@ -1250,7 +1332,7 @@ $TABLE[] = "CREATE TABLE skin_collections (
   set_parent_id int(5) NOT NULL default '-1',
   set_parent_array mediumtext,
   set_child_array mediumtext,
-  set_permissions text NOT NULL,
+  set_permissions text NULL,
   set_is_default int(1) NOT NULL default 0,
   set_author_name varchar(255) NOT NULL default '',
   set_author_url varchar(255) NOT NULL default '',
@@ -1266,6 +1348,8 @@ $TABLE[] = "CREATE TABLE skin_collections (
   set_minify	INT(1) NOT NULL default 0,
   set_master_key VARCHAR(100) NOT NULL DEFAULT '',
   set_order INT(10) NOT NULL,
+  set_by_skin_gen INT(1) NOT NULL DEFAULT 0,
+  set_skin_gen_data MEDIUMTEXT,
   PRIMARY KEY  (set_id),
   KEY parent_set_id ( set_parent_id, set_id ),
   KEY set_is_default (set_is_default),
@@ -1289,6 +1373,15 @@ $TABLE[] = "CREATE TABLE skin_css (
   KEY css_set_id (css_set_id)
 );";
 
+$TABLE[] = "CREATE TABLE skin_generator_sessions (
+	sg_session_id	VARCHAR(32) NOT NULL DEFAULT '',
+	sg_member_id	INT(10) NOT NULL DEFAULT 0,
+	sg_skin_set_id	INT(10) NOT NULL DEFAULT 0,
+	sg_date_start	INT(10) NOT NULL DEFAULT 0,
+	sg_data			MEDIUMTEXT,
+	PRIMARY KEY (sg_session_id)
+);";
+
 $TABLE[] = "CREATE TABLE skin_merge_session (
 	merge_id				INT(10) NOT NULL auto_increment,
 	merge_date				INT(10) NOT NULL DEFAULT 0,
@@ -1409,7 +1502,8 @@ $TABLE[] = "CREATE TABLE spider_logs (
   bot varchar(255) NOT NULL default '',
   query_string text,
   entry_date int(10) NOT NULL default 0,
-  ip_address varchar(16) NOT NULL default '',
+  ip_address varchar(46) NOT NULL default '',
+  request_addr TEXT NULL DEFAULT NULL,
   PRIMARY KEY  (sid),
   KEY entry_date (entry_date)
 );";
@@ -1433,7 +1527,7 @@ $TABLE[] = "CREATE TABLE task_logs (
   log_id int(10) NOT NULL auto_increment,
   log_title varchar(255) NOT NULL default '',
   log_date int(10) NOT NULL default 0,
-  log_ip varchar(16) NOT NULL default '0',
+  log_ip varchar(46) NOT NULL default '0',
   log_desc text,
   PRIMARY KEY  (log_id),
   KEY log_date (log_date)
@@ -1508,7 +1602,7 @@ $TABLE[] = "CREATE TABLE upgrade_sessions (
   session_member_key varchar(32) NOT NULL default '',
   session_start_time int(10) NOT NULL default 0,
   session_current_time int(10) NOT NULL default 0,
-  session_ip_address varchar(16) NOT NULL default '',
+  session_ip_address varchar(46) NOT NULL default '',
   session_section varchar(32) NOT NULL default '',
   session_post text,
   session_get text,
@@ -1526,7 +1620,7 @@ $TABLE[] = "CREATE TABLE validating (
   lost_pass tinyint(1) NOT NULL default 0,
   new_reg tinyint(1) NOT NULL default 0,
   email_chg tinyint(1) NOT NULL default 0,
-  ip_address varchar(16) NOT NULL default '0',
+  ip_address varchar(46) NOT NULL default '0',
   user_verified tinyint(1) NOT NULL default 0,
   prev_email varchar(150) NOT NULL default '0',
   spam_flag TINYINT NOT NULL DEFAULT 0,
@@ -1540,7 +1634,7 @@ $TABLE[] = "CREATE TABLE validating (
 );";
 $TABLE[] = "CREATE TABLE voters (
   vid int(10) NOT NULL auto_increment,
-  ip_address varchar(16) NOT NULL default '',
+  ip_address varchar(46) NOT NULL default '',
   vote_date int(10) NOT NULL default 0,
   tid int(10) NOT NULL default 0,
   member_id int(11) NOT NULL default 0,
@@ -1559,7 +1653,8 @@ $TABLE[] = "CREATE TABLE warn_logs (
   wlog_date int(10) NOT NULL default 0,
   wlog_type varchar(6) NOT NULL default 'pos',
   wlog_addedby mediumint(8) NOT NULL default 0,
-  PRIMARY KEY  (wlog_id)
+  PRIMARY KEY  (wlog_id),
+  KEY wlog_mid (wlog_mid, wlog_date)
 );";
 $TABLE[] = "CREATE TABLE spam_service_log (
   id int(10) unsigned NOT NULL auto_increment,
@@ -1567,15 +1662,9 @@ $TABLE[] = "CREATE TABLE spam_service_log (
   log_code smallint(1) unsigned NOT NULL,
   log_msg varchar(32) NOT NULL,
   email_address varchar(255) NOT NULL,
-  ip_address varchar(32) NOT NULL,
+  ip_address varchar(46) NOT NULL,
   PRIMARY KEY  (id)
 );";
-$TABLE[] = "CREATE TABLE vkontakte_connect (
-  v_key varchar(32) NOT NULL default '',
-  v_user varchar(255) NOT NULL default '',
-  v_data varchar(255) NOT NULL default '',
-  v_id bigint(20) NOT NULL
-);";
 $TABLE[] = "CREATE TABLE mobile_notifications (
   id int(10) unsigned NOT NULL AUTO_INCREMENT,
   notify_title text NOT NULL,
diff --git a/upload/admin/applications/core/setup/versions/install/sql/index.html b/upload/admin/applications/core/setup/versions/install/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/versions/install/sql/index.html
+++ b/upload/admin/applications/core/setup/versions/install/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_10002/index.html b/upload/admin/applications/core/setup/versions/upg_10002/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_10002/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_10002/version_upgrade_mysql.php b/upload/admin/applications/core/setup/versions/upg_10002/version_upgrade_mysql.php
index cca0b7d1..90b43b07 100644
--- a/upload/admin/applications/core/setup/versions/upg_10002/version_upgrade_mysql.php
+++ b/upload/admin/applications/core/setup/versions/upg_10002/version_upgrade_mysql.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|  IP.Board v3.1.2
+|  IP.Board v3.2.3
 |  ========================================
 |  by Matthew Mecham
 |  (c) 2001 - 2004 Invision Power Services
-|  http://www.invisionpower.com
+|  http://hatynka.in
 |  ========================================
-|  Web: http://www.invisionboard.com
-|  Email: matt@invisionpower.com
-|  Licence Info: http://www.invisionboard.com/?license
+|  Web: http://hatynka.in
+|  Email: info@hatynka.in
+|  Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |  > IPB UPGRADE 1.1 -> 2.0 SQL STUFF!
@@ -25,17 +25,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +42,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -143,7 +140,7 @@ class version_upgrade
 		}
 		if ( $this->request['workact'] )
 		{
-			IPSSetUp::getSavedData('vid', $this->install->current_version );
+			IPSSetUp::setSavedData('vid', $this->install->current_version );
 			
 			return false;
 		}
@@ -1065,7 +1062,7 @@ class version_upgrade
   											  'rules_text'			    => $r['rules_text'],
 											  'notify_modq_emails'      => $r['notify_modq_emails'],
 											  'permission_array'        => $perm_array,
-											  'permission_showtopic'    => '',
+											  'permission_showtopic'    => 1,
 											  'permission_custom_error' => '',
 									)       );
 		}
@@ -1179,7 +1176,6 @@ class version_upgrade
 													  'attach_pid'       => $r['pid'],
 													  'attach_post_key'  => $postkey,
 													  'attach_member_id' => $r['author_id'],
-													  'attach_approved'  => 1,
 													  'attach_filesize'  => @filesize( IPS_ROOT_PATH.'uploads/'.$r['attach_id'] ),
 							 )                      );
 							 
@@ -1412,9 +1408,9 @@ class version_upgrade
 				{
 					// Reset loginkey
 					
-					IPSSetUp::getSavedData('loginkey', $member_login_key );
+					IPSSetUp::setSavedData('loginkey', $member_login_key );
 					$this->install->ipsclass->member['member_login_key']	= $member_login_key;
-					IPSSetUp::getSavedData('securekey', $this->install->ipsclass->return_md5_check() );
+					IPSSetUp::setSavedData('securekey', $this->install->ipsclass->return_md5_check() );
 				}
 			}
 			
@@ -1874,8 +1870,8 @@ class version_upgrade
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
 
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
-		//$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, '', 'Invision Power Services', '', '', '', '', 1074679074, '', '', 'default');";
-		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, '', 'Invision Power Services', '', '', '', '', 1074679074, '', '', 'default');";
+		//$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
 		
 		
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
@@ -1906,7 +1902,7 @@ class version_upgrade
 		
 	
 		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br>\r<br>In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');";
-		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.test.ru/forums/index.php\' you would enter \'test.ru\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.test.ru/forums/index.php\' look for \'test.ru\' or \'www.test.ru\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
+		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
 		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&do=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotton it.');";
 		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (4, 'Your Control Panel (My Controls)', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Subscriptions</b>\r<br>\r<br>This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Change Personal Photo</b>\r<br>\r<br>This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br>You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br>\r<br><b>Skins and Languages</b>\r<br>\r<br>If available, you can choose a skin style and language choice. This affects how the board is displayed so you may wish to preview the skin before submitting the form.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');";
 		$SQL[] = "REPLACE INTO ".ipsRegistry::dbFunctions()->getPrefix()."faq VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>There are three ways to subscribe to a topic:\r<br>\r<br><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track\r<br><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox\r<br><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to\r<br>\r<br>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br>\r<br>You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br>\r<br>To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do this from there.', 'How to get emailed when a new reply is added to a topic.');";
diff --git a/upload/admin/applications/core/setup/versions/upg_10004/index.html b/upload/admin/applications/core/setup/versions/upg_10004/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_10004/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_10004/version_upgrade_mysql.php b/upload/admin/applications/core/setup/versions/upg_10004/version_upgrade_mysql.php
index b4f7f4d1..187ea769 100644
--- a/upload/admin/applications/core/setup/versions/upg_10004/version_upgrade_mysql.php
+++ b/upload/admin/applications/core/setup/versions/upg_10004/version_upgrade_mysql.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE 1.1 -> 2.0 SQL STUFF!
@@ -25,17 +25,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 
 	/**
-	* fetchs output
-	*
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +42,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -826,7 +823,7 @@ class version_upgrade
   											  'rules_text'			    => $r['rules_text'],
 											  'notify_modq_emails'      => $r['notify_modq_emails'],
 											  'permission_array'        => $perm_array,
-											  'permission_showtopic'    => '',
+											  'permission_showtopic'    => 1,
 											  'permission_custom_error' => '',
 									)       );
 		}
@@ -940,7 +937,6 @@ class version_upgrade
 													  'attach_pid'       => $r['pid'],
 													  'attach_post_key'  => $postkey,
 													  'attach_member_id' => $r['author_id'],
-													  'attach_approved'  => 1,
 													  'attach_filesize'  => @filesize( DOC_IPS_ROOT_PATH.'uploads/'.$r['attach_id'] ),
 							 )                      );
 
@@ -1660,8 +1656,8 @@ class version_upgrade
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
 
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
-		//$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, '', 'Invision Power Services', '', '', '', '', 1074679074, '', '', 'default');";
-		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, '', 'Invision Power Services', '', '', '', '', 1074679074, '', '', 'default');";
+		//$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
 
 
 		$SQL[] = "INSERT INTO ".ipsRegistry::dbFunctions()->getPrefix()."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
diff --git a/upload/admin/applications/core/setup/versions/upg_20004/index.html b/upload/admin/applications/core/setup/versions/upg_20004/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20004/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20004/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20004/mysql_updates.php
index 86ef875d..8d661411 100644
--- a/upload/admin/applications/core/setup/versions/upg_20004/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20004/mysql_updates.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
diff --git a/upload/admin/applications/core/setup/versions/upg_20005/index.html b/upload/admin/applications/core/setup/versions/upg_20005/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20005/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20005/mysql_updates.php
index 44337dba..925397e4 100644
--- a/upload/admin/applications/core/setup/versions/upg_20005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20005/mysql_updates.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
diff --git a/upload/admin/applications/core/setup/versions/upg_20007/index.html b/upload/admin/applications/core/setup/versions/upg_20007/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20007/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20007/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20007/mysql_updates.php
index 648394c0..d3d83a2a 100644
--- a/upload/admin/applications/core/setup/versions/upg_20007/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20007/mysql_updates.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.0 PF1 -> PF 2
diff --git a/upload/admin/applications/core/setup/versions/upg_20009/index.html b/upload/admin/applications/core/setup/versions/upg_20009/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20009/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20009/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20009/mysql_updates.php
index b44f64aa..4af90c8a 100644
--- a/upload/admin/applications/core/setup/versions/upg_20009/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20009/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_20010/index.html b/upload/admin/applications/core/setup/versions/upg_20010/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20010/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20010/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20010/mysql_updates.php
index 91e412b4..4731d9a2 100644
--- a/upload/admin/applications/core/setup/versions/upg_20010/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20010/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_20012/index.html b/upload/admin/applications/core/setup/versions/upg_20012/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_20012/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_20012/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_20012/mysql_updates.php
index af46de01..979cccf5 100644
--- a/upload/admin/applications/core/setup/versions/upg_20012/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_20012/mysql_updates.php
@@ -1,30 +1,35 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 # Fix bug where unread PM count not incremented
 
-$SQL[] = "ALTER TABLE members change msg_total msg_total smallint(5) default '0'";
-$SQL[] = "ALTER TABLE members change new_msg new_msg smallint(5) default '0'";
-$SQL[] = "UPDATE members SET new_msg=0";
+$SQL[] = "ALTER TABLE members change msg_total msg_total smallint(5) default '0';";
+$SQL[] = "ALTER TABLE members change new_msg new_msg smallint(5) default '0';";
+$SQL[] = "UPDATE members SET new_msg=0;";
 
 
-# Add WIZZY Blog hook
+# Add has_blog
 
-//$SQL[] = "ALTER TABLE members add has_blog TINYINT(1) NOT NULL default '0'";
+$DB  = ipsRegistry::DB();
+
+if( !$DB->checkForField( 'has_blog', 'members' ) )
+{
+	$SQL[] = "ALTER TABLE members add has_blog TINYINT(1) NOT NULL default '0';";
+}
 
 # Efficiency
 
-$SQL[] = "ALTER TABLE members_converge ADD INDEX converge_email(converge_email)";
-$SQL[] = "ALTER TABLE polls ADD INDEX tid(tid)";
+$SQL[] = "ALTER TABLE members_converge ADD INDEX converge_email(converge_email);";
+$SQL[] = "ALTER TABLE polls ADD INDEX tid(tid);";
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/index.html b/upload/admin/applications/core/setup/versions/upg_21003/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21003/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates.php
index 3b9983e3..9e606d6c 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -39,7 +39,8 @@ $SQL[] = "CREATE TABLE components (
 
 
 $SQL[] = "CREATE TABLE topic_views (
-	views_tid int(10) NOT NULL default '0'
+	views_tid int(10) NOT NULL default '0',
+	KEY views_tid (views_tid)
 );";
 
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_1.php b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_1.php
index f3f13a60..b759dc76 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_1.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_1.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_2.php b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_2.php
index 8b8bcac1..641285e1 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_2.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_2.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_3.php b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_3.php
index 367265ea..a4519693 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_3.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_3.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_4.php b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_4.php
index 92f925fd..d83ecd5f 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_4.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/mysql_updates_4.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -17,25 +17,23 @@
 # Nothing of interest!
 $SQL	= array();
 
-$SQL[]	= "INSERT INTO cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('portal', 'a:6:{s:5:\"blogs\";a:5:{s:8:\"pc_title\";s:30:\"Invision Power Community Blogs\";s:7:\"pc_desc\";s:40:\"Shows IPB Blog information on the portal\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:25:\"blogs_show_last_updated_x\";a:2:{i:0;s:25:\"blogs_show_last_updated_x\";i:1;s:30:\"Shows the last X updated blogs\";}}s:6:\"pc_key\";s:5:\"blogs\";}s:8:\"calendar\";a:5:{s:8:\"pc_title\";s:29:\"Invision Power Board Calendar\";s:7:\"pc_desc\";s:46:\"Displays a mini calendar for the current month\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:27:\"calendar_show_current_month\";a:2:{i:0;s:27:\"calendar_show_current_month\";i:1;s:38:\"Shows a calendar for the current month\";}}s:6:\"pc_key\";s:8:\"calendar\";}s:7:\"gallery\";a:5:{s:8:\"pc_title\";s:22:\"Invision Power Gallery\";s:7:\"pc_desc\";s:54:\"Shows Invision Power Gallery information on the portal\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:25:\"gallery_show_random_image\";a:2:{i:0;s:25:\"gallery_show_random_image\";i:1;s:44:\"Shows a random image from a member\'s gallery\";}}s:6:\"pc_key\";s:7:\"gallery\";}s:12:\"online_users\";a:5:{s:8:\"pc_title\";s:33:\"Invision Power Board Online Users\";s:7:\"pc_desc\";s:49:\"Shows the current name and number of online users\";s:19:\"pc_settings_keyword\";s:0:\"\";s:18:\"pc_exportable_tags\";a:1:{s:17:\"online_users_show\";a:2:{i:0;s:17:\"online_users_show\";i:1;s:22:\"Shows the online users\";}}s:6:\"pc_key\";s:12:\"online_users\";}s:4:\"poll\";a:5:{s:8:\"pc_title\";s:25:\"Invision Power Board Poll\";s:7:\"pc_desc\";s:23:\"Shows the selected poll\";s:19:\"pc_settings_keyword\";s:11:\"portal_poll\";s:18:\"pc_exportable_tags\";a:1:{s:14:\"poll_show_poll\";a:2:{i:0;s:14:\"poll_show_poll\";i:1;s:22:\"Shows the request poll\";}}s:6:\"pc_key\";s:4:\"poll\";}s:13:\"recent_topics\";a:5:{s:8:\"pc_title\";s:34:\"Invision Power Board Recent Topics\";s:7:\"pc_desc\";s:47:\"Shows IPB recent topics with topic\'s first post\";s:19:\"pc_settings_keyword\";s:20:\"portal_recent_topics\";s:18:\"pc_exportable_tags\";a:2:{s:20:\"recent_topics_last_x\";a:2:{i:0;s:20:\"recent_topics_last_x\";i:1;s:63:\"Shows the last X topics with full post from the selected forums\";}s:32:\"recent_topics_discussions_last_x\";a:2:{i:0;s:32:\"recent_topics_discussions_last_x\";i:1;s:54:\"Shows the last X topic titles from ALL viewable forums\";}}s:6:\"pc_key\";s:13:\"recent_topics\";}}', '', 1);";
-
 $SQL[]	= "INSERT INTO cal_calendars (cal_id, cal_title, cal_moderate, cal_position, cal_event_limit, cal_bday_limit, cal_rss_export, cal_rss_export_days, cal_rss_export_max, cal_rss_update, cal_rss_update_last, cal_rss_cache, cal_permissions) VALUES (1, 'Community Calendar', 1, 0, 2, 1, 1, 14, 20, 1440, <%time%>, '', 'a:3:{s:9:\"perm_read\";s:1:\"*\";s:9:\"perm_post\";s:3:\"4,3\";s:10:\"perm_nomod\";s:0:\"\";}');";
 
 $SQL[]	= "INSERT INTO login_methods (login_id, login_title, login_description, login_folder_name, login_maintain_url, login_register_url, login_type, login_alt_login_html, login_date, login_settings, login_enabled, login_safemode, login_installed, login_replace_form, login_allow_create) VALUES (1, 'IPB Internal', 'The standard method of authentication', 'internal', '', '', 'passthrough', '', <%time%>, 0, 1, 1, 1, 0, 1);";
 $SQL[]	= "INSERT INTO login_methods (login_id, login_title, login_description, login_folder_name, login_maintain_url, login_register_url, login_type, login_alt_login_html, login_date, login_settings, login_enabled, login_safemode, login_installed, login_replace_form, login_allow_create) VALUES (2, 'LDAP Authentication', 'LDAP / Active Directory Authentication', 'ldap', '', '', 'passthrough', '', <%time%>, 0, 0, 1, 0, 0, 1);";
 $SQL[]	= "INSERT INTO login_methods (login_id, login_title, login_description, login_folder_name, login_maintain_url, login_register_url, login_type, login_alt_login_html, login_date, login_settings, login_enabled, login_safemode, login_installed, login_replace_form, login_allow_create) VALUES (3, 'External Database', 'Authentication via an external database', 'external', '', '', 'passthrough', '', <%time%>, 0, 0, 1, 0, 0, 1);";
 
-$SQL[]	= "INSERT INTO task_manager VALUES ('', 'Update Topic Views Counter', 'updateviews.php', <%time%>, -1, -1, 3, -1, 'ddce954b5ba1c163bc627ca20725b595', 0, 'Used when topic views are not incremented immediately', 1, 'updateviews', 0, 0);";
-$SQL[]	= "INSERT INTO task_manager VALUES ('', 'Subscription Expiration Notification', 'expiresubs.php', <%time%>, -1, -1, 1, 0, '21fa5f52cf9122c6fe940e1c6dac0b5a', 1, 'Sends out an email to all members who have a subscription due to expire', 1, 'expiresubs', 0, 0);";
-$SQL[]	= "INSERT INTO task_manager VALUES ('', 'RSS Import Update', 'rssimport.php', <%time%>, -1, -1, -1, 30, '8f17dc0ba334e5f18e762f154365a578', 0, 'Imports any new RSS articles', 1, 'rssimport', 1, 0);";
+$SQL[]	= "INSERT INTO task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Update Topic Views Counter', 'updateviews.php', <%time%>, -1, -1, 3, -1, 'ddce954b5ba1c163bc627ca20725b595', 0, 'Used when topic views are not incremented immediately', 1, 'updateviews', 0);";
+$SQL[]	= "INSERT INTO task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Subscription Expiration Notification', 'expiresubs.php', <%time%>, -1, -1, 1, 0, '21fa5f52cf9122c6fe940e1c6dac0b5a', 1, 'Sends out an email to all members who have a subscription due to expire', 1, 'expiresubs', 0);";
+$SQL[]	= "INSERT INTO task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('RSS Import Update', 'rssimport.php', <%time%>, -1, -1, -1, 30, '8f17dc0ba334e5f18e762f154365a578', 0, 'Imports any new RSS articles', 1, 'rssimport', 1);";
 
 $SQL[]	= "INSERT INTO task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Expire Paid Subscriptions', 'doexpiresubs.php', 1121212800, -1, -1, 0, 0, 'bb57399ea05eb9240b42d5d5f53575fb', 1, 'Unsubscribes members from their subscribed packages', 1, 'doexpiresubs', 1)";
 
 
-$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (1, 'Invision Gallery', 'Invision Power Services', '', '1.3.0', 1113309894, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'gallery', 'gallery', 'Complete gallery system for your members', '{ipb.lang[\'gallery\']}', '{ipb.base_url}act=module&module=gallery', 1);";
-$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (2, 'Invision Community Blog', 'Invision Power Services', '', '1.1.2', 1113310263, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'blog', 'blog', 'Blogging addition for your members', '{ipb.lang[\'blog\']}', '{ipb.base_url}automodule=blog', -1);";
-$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (3, 'Invision Chat (ParaChat)', 'Invision Power Services', '', '2.1', 1113313895, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'chatpara', 'chatpara', 'Full real-time chat system for your members', '{ipb.lang[\'live_chat\']}', '{ipb.base_url}autocom=chatpara', 2);";
-$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (4, 'Invision Copyright Removal', 'Invision Power Services', '', '2.1', 1113314009, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 1, 1, 'copyright', 'copyright', 'Allows the copyright notices to be removed from the board\'s output', '', '', 3);";
+$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (1, 'Invision Gallery', 'Invision Power Services', 'http://www.invisiongallery.com', '1.3.0', 1113309894, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'gallery', 'gallery', 'Complete gallery system for your members', '{ipb.lang[\'gallery\']}', '{ipb.base_url}act=module&module=gallery', 1);";
+$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (2, 'Invision Community Blog', 'Invision Power Services', 'http://www.invisionblog.com', '1.1.2', 1113310263, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'blog', 'blog', 'Blogging addition for your members', '{ipb.lang[\'blog\']}', '{ipb.base_url}automodule=blog', -1);";
+$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (3, 'Invision Chat (ParaChat)', 'Invision Power Services', 'http://chat.invisionsitetools.com', '2.1', 1113313895, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 0, 1, 'chatpara', 'chatpara', 'Full real-time chat system for your members', '{ipb.lang[\'live_chat\']}', '{ipb.base_url}autocom=chatpara', 2);";
+$SQL[]	= "INSERT INTO components (com_id, com_title, com_author, com_url, com_version, com_date_added, com_menu_data, com_enabled, com_safemode, com_section, com_filename, com_description, com_url_title, com_url_uri, com_position) VALUES (4, 'Invision Copyright Removal', 'Invision Power Services', 'http://www.invisionboard.com', '2.1', 1113314009, 'a:1:{i:1;a:5:{s:9:\"menu_text\";s:24:\"Purchase and Information\";s:8:\"menu_url\";s:9:\"code=show\";s:13:\"menu_redirect\";i:0;s:12:\"menu_permbit\";s:0:\"\";s:13:\"menu_permlang\";s:0:\"\";}}', 1, 1, 'copyright', 'copyright', 'Allows the copyright notices to be removed from the board\'s output', '', '', 3);";
 
 $SQL[]	= "DELETE FROM conf_settings WHERE conf_key IN ( 'csite_article_forum'     , 'csite_article_max', 'csite_article_recent_on',
 														   'csite_article_recent_max', 'csite_article_len', 'csite_discuss_on',
@@ -43,12 +41,12 @@ $SQL[]	= "DELETE FROM conf_settings WHERE conf_key IN ( 'csite_article_forum'
 														   'csite_online_show', 'poll_disable_noreply' );";
 
 # UPDATE KNOWN CONF_TITLE KEYS
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='general' WHERE conf_title_id=1";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='boardoffline' WHERE conf_title_id=15";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='calendar' WHERE conf_title_id=9";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='converge' WHERE conf_title_id=18";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='coppa' WHERE conf_title_id=8";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='cpusaving' WHERE conf_title_id=2";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='date' WHERE conf_title_id=3";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='email' WHERE conf_title_id=12";
-$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='searchsetup' WHERE conf_title_id=19";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='general' WHERE conf_title_id=1;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='boardoffline' WHERE conf_title_id=15;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='calendar' WHERE conf_title_id=9;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='converge' WHERE conf_title_id=18;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='coppa' WHERE conf_title_id=8;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='cpusaving' WHERE conf_title_id=2;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='date' WHERE conf_title_id=3;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='email' WHERE conf_title_id=12;";
+$SQL[]	= "UPDATE conf_settings_titles SET conf_title_keyword='searchsetup' WHERE conf_title_id=19;";
diff --git a/upload/admin/applications/core/setup/versions/upg_21003/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_21003/version_upgrade.php
index a562c3cb..a8867564 100644
--- a/upload/admin/applications/core/setup/versions/upg_21003/version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_21003/version_upgrade.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.2 -> IPB 2.0.3
@@ -32,17 +32,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -51,9 +49,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -126,9 +123,9 @@ class version_upgrade
 		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_21003/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
 		$prefix  = $this->registry->dbFunctions()->getPrefix();
 	
-		if ( file_exists( $path ) )
+		if ( is_file( $path ) )
 		{
-			require( $path );
+			require( $path );/*noLibHook*/
 		
 			$this->error   = array();
 			$this->sqlcount 		= 0;
@@ -458,12 +455,4 @@ class version_upgrade
 		unset($this->request['workact']);
 		return TRUE;
 	}
-	
-
-
-
-	
-}
-	
-	
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21005/index.html b/upload/admin/applications/core/setup/versions/upg_21005/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21005/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21005/mysql_updates.php
index 6d1021bf..2f775d26 100644
--- a/upload/admin/applications/core/setup/versions/upg_21005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21005/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21007/index.html b/upload/admin/applications/core/setup/versions/upg_21007/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21007/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21007/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21007/mysql_updates.php
index b56ffcfb..bb49f502 100644
--- a/upload/admin/applications/core/setup/versions/upg_21007/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21007/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21007/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_21007/version_upgrade.php
index 7e82e54e..c98253bc 100644
--- a/upload/admin/applications/core/setup/versions/upg_21007/version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_21007/version_upgrade.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -25,17 +25,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +42,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -84,7 +81,7 @@ class version_upgrade
 		
 		if ( count( $title_id_to_delete ) )
 		{
-			$this->DB->buildAndFetch( array( 'delete' => 'conf_settings_titles', 'where' => 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' ) );
+			$this->DB->delete( 'conf_settings_titles', 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' );
 		}
 		
 		$title_deleted_count = intval( count($title_id_to_delete) );
@@ -93,9 +90,4 @@ class version_upgrade
 		
 		return true;
 	}
-	
-
-}
-	
-	
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21008/index.html b/upload/admin/applications/core/setup/versions/upg_21008/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21008/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21008/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21008/mysql_updates.php
index 946e450f..49660b74 100644
--- a/upload/admin/applications/core/setup/versions/upg_21008/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21008/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21009/index.html b/upload/admin/applications/core/setup/versions/upg_21009/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21009/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21009/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21009/mysql_updates.php
index e1f04534..0af6fa2e 100644
--- a/upload/admin/applications/core/setup/versions/upg_21009/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21009/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -28,10 +28,10 @@ $SQL[] = "ALTER TABLE rss_import ADD rss_import_auth TINYINT( 1 ) DEFAULT '0' NO
 				ADD rss_import_auth_pass VARCHAR( 255 ) DEFAULT 'Not Needed' NOT NULL"; 
 				
 				
-$UPDATES[] = "UPDATE faq SET title='Registration benefits', text='To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br />\r<br />During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br />\r<br />In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br />\r<br />Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br />\r<br />For more information on these items, please see the relevant sections in this documentation.', description='How to register and the added benefits of being a registered member.' WHERE id=1";
-$UPDATES[] = "UPDATE faq SET title='Cookies and cookie usage', text='Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br />\r<br />If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br />\r<br /><b>Clearing Cookies</b>\r<br />\r<br />You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br />\r<br /><u>Removing Cookies in Internet Explorer for Windows</u>\r<br />\r<br /><ul>\r<br /><li> Close all open Internet Explorer Windows\r<br /><li> Click on the \'start\' button\r<br /><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br /><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.test.ru/forums/index.php\' you would enter \'test.ru\' without the quotes)\r<br /><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br /><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br /></ul>\r<br />\r<br /><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br />\r<br /><ul>\r<br /><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br /><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br /><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.test.ru/forums/index.php\' look for \'test.ru\' or \'www.test.ru\'\r<br /><li> For each cookie, click on the entry and press the delete button.\r<br /></ul>\r<br />\r<br />Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', description='The benefits of using cookies and how to remove cookies set by this board.' WHERE id=2";
+$UPDATES[] = "UPDATE faq SET title='Registration benefits', text='To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br />\r<br />During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br />\r<br />In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br />\r<br />Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br />\r<br />For more information on these items, please see the relevant sections in this documentation.', description='How to register and the added benefits of being a registered member.' WHERE id=1";/*noLibHook*/
+$UPDATES[] = "UPDATE faq SET title='Cookies and cookie usage', text='Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br />\r<br />If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br />\r<br /><b>Clearing Cookies</b>\r<br />\r<br />You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br />\r<br /><u>Removing Cookies in Internet Explorer for Windows</u>\r<br />\r<br /><ul>\r<br /><li> Close all open Internet Explorer Windows\r<br /><li> Click on the \'start\' button\r<br /><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br /><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br /><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br /><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br /></ul>\r<br />\r<br /><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br />\r<br /><ul>\r<br /><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br /><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br /><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br /><li> For each cookie, click on the entry and press the delete button.\r<br /></ul>\r<br />\r<br />Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', description='The benefits of using cookies and how to remove cookies set by this board.' WHERE id=2";
 $UPDATES[] = "UPDATE faq SET title='Recovering lost or forgotten passwords', text='Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br />This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br />\r<br />To do this, click on the <a href=\'index.php?act=Reg&amp;do=10\'>Lost Password link</a> found on the log in page.\r<br />\r<br />Further instruction is available from there.', description='How to reset your password if you\'ve forgotten it.' WHERE id=3";
-$UPDATES[] = "UPDATE faq SET title='Your Control Panel (My Controls)', text='Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br />\r<br /><b>Subscriptions</b>\r<br />\r<br />This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br />\r<br /><b>Edit Profile Info</b>\r<br />\r<br />This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br />\r<br /><b>Edit Signature</b>\r<br />\r<br />A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br />\r<br /><b>Edit Avatar Settings</b>\r<br />\r<br />An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br />\r<br /><b>Change Personal Photo</b>\r<br />\r<br />This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br />\r<br /><b>Email Settings</b>\r<br />\r<br /><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br /><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br /><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br /><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br /><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br />\r<br /><b>Board Settings</b>\r<br />\r<br />From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br />You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br />You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br />\r<br /><b>Change Email Address</b>\r<br />\r<br />At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br />\r<br /><b>Change Password</b>\r<br />\r<br />You may change your password from this section. Please note that you will need to know your current password before you can change your password.', description='Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.' WHERE id=4";
+$UPDATES[] = "UPDATE faq SET title='Your Control Panel (My Controls)', text='Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br />\r<br /><b>Subscriptions</b>\r<br />\r<br />This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br />\r<br /><b>Edit Profile Info</b>\r<br />\r<br />This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br />\r<br /><b>Edit Signature</b>\r<br />\r<br />A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br />\r<br /><b>Edit Avatar Settings</b>\r<br />\r<br />An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br />\r<br /><b>Change Personal Photo</b>\r<br />\r<br />This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br />\r<br /><b>Email Settings</b>\r<br />\r<br /><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br /><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br /><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br /><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br /><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br />\r<br /><b>Board Settings</b>\r<br />\r<br />From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br />You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br />You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br />\r<br /><b>Change Email Address</b>\r<br />\r<br />At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br />\r<br /><b>Change Password</b>\r<br />\r<br />You may change your password from this section. Please note that you will need to know your current password before you can change your password.', description='Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.' WHERE id=4";/*noLibHook*/
 $UPDATES[] = "UPDATE faq SET title='Email Notification of new messages', text='This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br />\r<br />There are three ways to subscribe to a topic:\r<br /><ul>\r<br /><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track</li>\r<br /><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox</li>\r<br /><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to</li>\r<br /></ul>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br />\r<br />You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br />\r<br />To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do thi from there.', description='How to get emailed when a new reply is added to a topic.' WHERE id=5";
 $UPDATES[] = "UPDATE faq SET title='Your Personal Messenger', text='Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br />\r<br /><b>Compose a New PM</b>\r<br />\r<br />This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the member list or a post). If allowed, you may also be able to enter in multiple names in the box provided, will need to add one username per line.\r<br />If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you tick the \'Track this message?\' box, then the details of the message will be available in your \'Message Tracker\' where you will be able to see if/when it has been read.\r<br />\r<br /><bInbox</b>\r<br />\r<br />Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br />\r<br /><b>Empty PM Folders</b>\r<br />\r<br />This option provides you with a quick and easy way to clear out all of your PM folders.\r<br />\r<br /><b>Edit Storage Folders</b>\r<br />\r<br />You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br />\r<br /><b>PM Buddies/Block List</b>\r<br />\r<br />You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br />Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br />\r<br /><b>Archive Messages</b>\r<br />\r<br />If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft © Excel Format. This page is then emailed to your registered email address for your convenience.\r<br />\r<br /><b>Saved (Unsent) PMs</b>\r<br />\r<br />This area will allow you to go back to any PM\'s that you have chosen to save to be sent later.\r<br />\r<br /><b>Message Tracker</B>\r<br />\r<br />This is the page that any messages that you have chosen to track will appear. Details of if and when they have been read by the recipient will appear here. This also gives you the chance to delete any messages that you have sent and not yet been read by the intended recipient.', description='How to send personal messages, track them, edit your messenger folders and archive stored messages.' WHERE id=6";
 $UPDATES[] = "UPDATE faq SET title='Contacting the moderating team &amp; reporting posts', text='<b>Contacting the moderating team</b>\r<br />\r<br />If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the bottom of the main board page (the first page you see when visiting the board), or from \'My Assistant\'.\r<br />\r<br />This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br />\r<br />If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.\r<br />\r<br /><b>Reporting a post</b>\r<br />\r<br />If the administrator has enabled this function on the board, you\'ll see a \'Report\' button in a post, next to the \'Quote\' button. This function will let you report the post to the forum moderator (or the administrator(s), if there isn\'t a specific moderator available). You can use this function when you think the moderator(s) should be aware of the existance of that post. However, <b>do not use this to chat with the moderator(s)!</b>. You can use the email function or the Personal Messenger function for that.', description='Where to find a list of the board moderators and administrators.' WHERE id=7";
@@ -39,7 +39,7 @@ $UPDATES[] = "UPDATE faq SET title='Viewing members profile information', text='
 $UPDATES[] = "UPDATE faq SET title='Viewing active topics and new posts', text='You can view which new topics have new replies today by clicking on the \'Today\'s Active Topics\' link found at the bottom of the main board page (the first page you see when visiting the board). You can set your own date criteria, choosing to view all topics  with new replies during several date choices.\r<br />\r<br />The \'View New Posts\' link in the member bar at the top of each page, will allow you to view all of the topics which have new replies in since your last visit to the board.', description='How to view all the topics which have a new reply today and the new posts made since your last visit.' WHERE id=9";
 $UPDATES[] = "UPDATE faq SET title='Searching Topics and Posts', text='The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br />\r<br />There are two types of search form available, simple search and advanced search. You may switch between the two using the \'More Options\' and \'Simple Mode\' buttons.\r<br />\r<br /><b>Simple Mode</b>\r<br />\r<br />All you need to do here is enter in a keyword into the search box, and select a forum(s) to search in. (to select multiple forums, hold down the control key on a PC, or the Shift/Apple key on a Mac) choose a sorting order and search.\r<br />\r<br /><b>Advanced Mode</b>\r<br />\r<br />The advanced search screen, will give you a much greater range of options to choose from to refine your search. In addition to searching by keyword, you are able to search by a members username or a combination of both. You can also choose to refine your search by selecting a date range, and there are a number of sorting options available. There are also two ways of displaying the search results, can either show the post text in full or just show a link to the topic, can choose this using the radio buttons available.\r<br />\r<br />If the administrator has enabled it, you may have a minimum amount of time to wait between searches, this is known as search flood control.\r<br />\r<br />There are also search boxes available at the bottom of each forum, to allow you to carry out a quick search of all of the topics within that particular forum.', description='How to use the search feature.' WHERE id=10";
 $UPDATES[] = "UPDATE faq SET title='Logging in and out', text='If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br />\r<br />When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br />\r<br />You can also choose to hide - this will keep your name from appearing in the active users list.\r<br />\r<br />Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', description='How to log in and out from the board and how to remain anonymous and not be shown on the active users list.' WHERE id=11";
-$UPDATES[] = "UPDATE faq SET title='My Assistant', text='This feature is sometimes referred to as a \'Browser Buddy\'. \r<br />\r<br />At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br />Click on the \'View\' link on either of the two sentences to see the posts.\r<br />\r<br />The next section is five links to useful features:\r<br /><ul>\r<br /><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.</li>\r<br /><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.</li>\r<br /><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.</li>\r<br /><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.</li>\r<br /><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.</li>\r<br /></ul>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br />\r<br />The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', description='A comprehensive guide to use this handy little feature.' WHERE id=12";
+$UPDATES[] = "UPDATE faq SET title='My Assistant', text='This feature is sometimes referred to as a \'Browser Buddy\'. \r<br />\r<br />At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br />Click on the \'View\' link on either of the two sentences to see the posts.\r<br />\r<br />The next section is five links to useful features:\r<br /><ul>\r<br /><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.</li>\r<br /><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.</li>\r<br /><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.</li>\r<br /><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.</li>\r<br /><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.</li>\r<br /></ul>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br />\r<br />The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', description='A comprehensive guide to use this handy little feature.' WHERE id=12";/*noLibHook*/
 $UPDATES[] = "UPDATE faq SET title='Posting', text='There are three different posting screens available. The new topic button, visible in forums and in topics allows you to add a new topic to that particular forum. The new poll button (if the admin has enabled it) will also be viewable in topics and forums allowing you to create a new poll in the forum. When viewing a topic, there will be an add reply button, allowing you to add a new reply onto that particular topic. \r\n<br />\r\n<br /><b>Posting new topics and replying</b>\r\n<br />\r\n<br />When making a post, you will most likely have the option to use IBF code when posting. This will allow you to add various types of formatting to your messages. For more information on this, click the \'BB Code Help\' link under the emoticon box to launch the help window.\r\n<br />\r\n<br />On the left of the text entry box, there is the clickable emoticons box - you can click on these to add them to the content of your message (these are sometimes known as \'smilies\').\r\n<br />\r\n<br />There are three options available when making a post or a reply. \'Enable emoticons?\' if this is unchecked, then any text that would normally be converted into an emoticon will not be. \'Enable signature?\' allows you to choose whether or not you would like your signature to appear on that individual post. \'Enable email notification of replies?\' ticking this box will mean that you will receive e-mail updates to the topic, see the \'Email Notification of new messages\' help topic for more information on this.\r\n<br />\r\n<br />You also have the option to choose a post icon for the topic/post when creating one. This icon will appear next to the topic name on the topic listing in that forum, or will appear next to the date/time of the message if making a reply to a topic.\r\n<br />\r\n<br />If the admin has enabled it, you will also see a file attachments option, this will allow you to attach a file to be uploaded when making a post. Click the browse button to select a file from your computer to be uploaded. If you upload an image file, it may be shown in the content of the post, all other file types will be linked to.\r\n<br />\r\n<br /><b>Poll Options</b>\r\n<br />\r\n<br />If you have chosen to post a new poll, there will be an extra two option boxes at the top of the help screen. The first input box will allow you to enter the question that you are asking in the poll. The text field underneath is where you will input the choices for the poll. Simply enter a different option on each line. The maximum number of choices is set by the board admin, and this figure is displayed on the left.\r\n<br />\r\n<br /><b>Quoting Posts</b>\r\n<br />\r\n<br />Displayed below each post in a topic, there is a \'Quote\' button. Pressing this button will allow you to reply to a topic, and have the text from a particular reply quoted in your own reply. When you choose to do this, an extra text field will appear below the main text input box to allow you to edit the content of the post being quoted.\r\n<br />\r\n<br /><b>Editing Posts</b>\r\n<br />\r\n<br />Above any posts that you have made, you may see an \'Edit\' button. Pressing this will allow you to edit the post that you had previously made. \r\n<br />\r\n<br />When editing you may see an option to \'Add the \'Edit by\' line in this post?\'. If you tick this then it will show up in the posts that it has been edited and the time at which it was edited. If this option does not appear, then the edit by line will always be added to the post.\r\n<br />\r\n<br />If you are unable to see the edit button displayed on each post that you have made, then the administrator may have prevented you from editing posts, or the time limit for editing may have expired.\r\n<br />\r\n<br /><b>Fast Reply</b>\r\n<br />\r\n<br />Where it has been enabled, there will be a fast reply button on each topic. Clicking this will open up a posting box on the topic view screen, cutting down on the time required to load the main posting screen. Click the fast reply button to expand the reply box and type the post inside of there. Although the fast reply box is not expanded by default, you can choose the option to have it expanded by default, from the board settings section of your control panel. Pressing the \'More Options\' button will take you to the normal posting screen.', description='A guide to the features avaliable when posting on the boards.' WHERE id=13";
 $UPDATES[] = "UPDATE faq SET title='Member List', text='The member list, accessed via the \'Members\' link at the top of each page, is basically a listing of all of the members that have registered on the board. \r\n<br />\r\n<br />If you are looking to search for a particular member by all/part of their username, then in the drop down box at the bottom of the page, change the selection from \'Search All Available\' to \'Name Begins With\' or \'Name Contains\' and input all/part of their name in the text input field and press the \'Go!\' button. \r\n<br />\r\n<br />Also, at the bottom of the member list page, there are a number of sorting options available to alter the way in which the list is displayed. \r\n<br />\r\n<br />If a member has chosen to add a photo to their profile information, then a camera icon will appear next to their name, and you may click this to view the photo.', description='Explaining the different ways to sort and search through the list of members.' WHERE id=14";
 $UPDATES[] = "UPDATE faq SET title='Topic Options', text='At the bottom of each topic, there is a \'Topic Options\' button. Pressing this button will expand the topic options box. \r<br />\r<br />From this box, you can select from the following options: \r<br /><ul>\r<br /><li>Track this topic - this option will allow you to receive e-mail updates for the topic, see the \'Email Notification of new messages\' help file for more information on this</li>\r<br /><li>Subscribe to this forum - will allow you to receive e-mail updates for any new topics posted in the forum, see the Notification of new messages\' help file for more information on this</li>\r<br /><li>Download / Print this Topic - will show the topic in a number of different formats. \'Printer Friendly Version\' will display a version of the topic that is suitable for printing out. \'Download HTML Version\' will download a copy of the topic to your hard drive, and this can then be viewed in a web browser, without having to visit the board. \'Download Microsoft Word Version\' will allow you to download the file to your hard drive and open it up in the popular word processing application, Microsoft Word, for viewing offline.</li>\r<br /></ul>', description='A guide to the options avaliable when viewing a topic.' WHERE id=15";
diff --git a/upload/admin/applications/core/setup/versions/upg_21010/index.html b/upload/admin/applications/core/setup/versions/upg_21010/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21010/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21010/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21010/mysql_updates.php
index afd0ed20..b652085c 100644
--- a/upload/admin/applications/core/setup/versions/upg_21010/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21010/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_21011/index.html b/upload/admin/applications/core/setup/versions/upg_21011/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_21011/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_21011/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_21011/mysql_updates.php
index 754cd8f4..6676ee2d 100644
--- a/upload/admin/applications/core/setup/versions/upg_21011/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_21011/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates.php
index d9e5ea27..deed625e 100644
--- a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -116,7 +116,8 @@ $SQL[] = "CREATE TABLE profile_portal (
 );";
 
 $SQL[] = "CREATE TABLE profile_portal_views (
-  views_member_id int(10) NOT NULL default '0'
+	views_member_id int(10) NOT NULL default '0',
+	KEY views_member_id (views_member_id)
 );";
 
 $SQL[] = "DROP TABLE calendar_events;";
diff --git a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_1.php b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_1.php
index 683d9be5..0c3a9d05 100644
--- a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_1.php
+++ b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_1.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_2.php b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_2.php
index 2d75427d..4862017f 100644
--- a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_2.php
+++ b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_2.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_3.php b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_3.php
index fa1709c9..948dcbd8 100644
--- a/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_3.php
+++ b/upload/admin/applications/core/setup/versions/upg_22005/mysql_updates_3.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22005/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_22005/version_upgrade.php
index e7394365..a274e49c 100644
--- a/upload/admin/applications/core/setup/versions/upg_22005/version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_22005/version_upgrade.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -25,17 +25,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
 	private $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +42,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -125,9 +122,9 @@ class version_upgrade
 		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_22005/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
 		$prefix  = $this->registry->dbFunctions()->getPrefix();
 		
-		if ( file_exists( $path ) )
+		if ( is_file( $path ) )
 		{
-			require_once( $path );
+			require_once( $path );/*noLibHook*/
 		
 			$this->sqlcount 		= 0;
 			$output					= "";
@@ -145,7 +142,7 @@ class version_upgrade
 				{
 					if( preg_match( "/^create table(.+?)/i", $query ) )
 					{
-						$query = preg_replace( "/^(.+?)\);$/is", "\\1) TYPE={$this->settings['mysql_tbl_type']};", $query );
+						$query = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $query );
 					}
 				}					
 				
@@ -225,7 +222,7 @@ class version_upgrade
 		
 		$ignore_me = array( 'redirect_url', 'redirect_loc', 'rules_text', 'permission_custom_error', 'notify_modq_emails' );
 		
-		if ( isset($this->settings['forum_cache_minimum']) AND $this->settings['forum_cache_minimum'] )
+		if ( !empty($this->settings['forum_cache_minimum']) )
 		{
 			$ignore_me[] = 'description';
 			$ignore_me[] = 'rules_title';
@@ -382,11 +379,8 @@ class version_upgrade
 	{
 		$this->registry->output->addMessage("Добавление �тил� 2.2.0 пропущено...");
 		unset($this->request['workact']);
-
+		
 		return TRUE;	
 	}
 	
-}
-	
-	
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_22006/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22006/mysql_updates.php
index aa7c07f2..a74f221a 100644
--- a/upload/admin/applications/core/setup/versions/upg_22006/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22006/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22007/index.html b/upload/admin/applications/core/setup/versions/upg_22007/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_22007/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_22007/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22007/mysql_updates.php
index 030526ac..a787495d 100644
--- a/upload/admin/applications/core/setup/versions/upg_22007/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22007/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22009/index.html b/upload/admin/applications/core/setup/versions/upg_22009/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_22009/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_22009/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22009/mysql_updates.php
index ad432b16..c9cc5190 100644
--- a/upload/admin/applications/core/setup/versions/upg_22009/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22009/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22010/index.html b/upload/admin/applications/core/setup/versions/upg_22010/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_22010/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_22010/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22010/mysql_updates.php
index b9e21a96..5c809c2d 100644
--- a/upload/admin/applications/core/setup/versions/upg_22010/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22010/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -18,7 +18,10 @@
 
 // $SQL[] = "";
 
-$SQL[] = "ALTER TABLE forums CHANGE last_title last_title varchar(128) NOT NULL default '';";
+// Fix an SQL error if last_id is null and strict mode is enabled
+$SQL[] = "UPDATE forums SET last_id=(CASE WHEN last_id IS NULL THEN 0 ELSE last_id END);";
+
+$SQL[] = "ALTER TABLE forums CHANGE last_title last_title varchar(250) NOT NULL default '';";
 $SQL[] = "ALTER TABLE forums CHANGE last_id last_id int(10) NOT NULL default '0';";
 $SQL[] = "UPDATE components SET com_title='AddOnChat' WHERE com_section='chatsigma';";
 
diff --git a/upload/admin/applications/core/setup/versions/upg_22011/index.html b/upload/admin/applications/core/setup/versions/upg_22011/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_22011/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_22011/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_22011/mysql_updates.php
index 45ee6acc..b286d3db 100644
--- a/upload/admin/applications/core/setup/versions/upg_22011/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_22011/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23000/index.html b/upload/admin/applications/core/setup/versions/upg_23000/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23000/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23000/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23000/mysql_updates.php
index d9c6f8f5..7280f3ce 100644
--- a/upload/admin/applications/core/setup/versions/upg_23000/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23000/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23002/index.html b/upload/admin/applications/core/setup/versions/upg_23002/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23002/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23002/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23002/mysql_updates.php
index faef63e0..1649181c 100644
--- a/upload/admin/applications/core/setup/versions/upg_23002/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23002/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23003/index.html b/upload/admin/applications/core/setup/versions/upg_23003/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23003/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23003/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23003/mysql_updates.php
index 54c58ccc..a38b2590 100644
--- a/upload/admin/applications/core/setup/versions/upg_23003/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23003/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23005/index.html b/upload/admin/applications/core/setup/versions/upg_23005/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23005/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23005/mysql_updates.php
index cd7379f5..91db69e8 100644
--- a/upload/admin/applications/core/setup/versions/upg_23005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23005/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23008/index.html b/upload/admin/applications/core/setup/versions/upg_23008/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23008/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23008/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23008/mysql_updates.php
index 0166fe30..308e968b 100644
--- a/upload/admin/applications/core/setup/versions/upg_23008/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23008/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_23010/index.html b/upload/admin/applications/core/setup/versions/upg_23010/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_23010/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_23010/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_23010/mysql_updates.php
index 86a90edb..f06d22dd 100644
--- a/upload/admin/applications/core/setup/versions/upg_23010/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_23010/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates.php
index 1b9f81c4..6f5558bc 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -194,6 +194,10 @@ $SQL[] = "CREATE TABLE mod_queued_items (
   KEY type_id (type_id)
 );";
 
+/* This index makes the PM conversion run much quicker
+	@link http://community.invisionpower.com/tracker/issue-30484-ipb2-upgrades */
+$SQL[] = "ALTER TABLE message_topics ADD INDEX mt_msg_id(mt_msg_id);";
+
 $SQL[] = "RENAME TABLE message_topics TO message_topics_old;";
 
 $SQL[] = "CREATE TABLE message_topics (
@@ -574,19 +578,6 @@ $SQL[] = "CREATE TABLE ignored_users (
   KEY ignore_ignore_id (ignore_ignore_id)
 );";
 
-$SQL[] = "CREATE TABLE search_index (
-  app varchar(255) NOT NULL,
-  content text NOT NULL,
-  content_title varchar(255) NOT NULL,
-  `type` varchar(32) NOT NULL,
-  type_id bigint(10) unsigned NOT NULL,
-  type_2 varchar(32) NOT NULL,
-  type_id_2 bigint(10) unsigned NOT NULL,
-  updated int(10) unsigned NOT NULL,
-  misc text NOT NULL,
-  member_id mediumint(8) unsigned NOT NULL,
-  KEY app (app)
-);";
 
 $SQL[] = "CREATE TABLE captcha (
   captcha_unique_id varchar(32) NOT NULL default '',
@@ -640,6 +631,10 @@ $SQL[] = "CREATE TABLE core_applications (
   app_enabled int(1) NOT NULL default '0',
   app_location varchar(32) NOT NULL default '',
   app_hide_tab TINYINT(1) NOT NULL DEFAULT '0',
+  app_tab_groups TEXT NULL DEFAULT NULL,
+  app_website VARCHAR(255) NULL DEFAULT NULL,
+  app_update_check VARCHAR(255) NULL DEFAULT NULL,
+  app_global_caches VARCHAR(255) NULL DEFAULT NULL,
   PRIMARY KEY  (app_id)
 );";
 
@@ -705,7 +700,6 @@ $SQL[] = "CREATE TABLE core_sys_login (
 
 if ( ipsRegistry::DB()->checkFulltextSupport() )
 {
-	$SQL[] = "ALTER TABLE search_index ADD FULLTEXT KEY content (content,content_title);";
 	$SQL[] = "ALTER TABLE message_posts ADD FULLTEXT KEY msg_post (msg_post);";
 	$SQL[] = "ALTER TABLE message_topics ADD FULLTEXT KEY mt_title (mt_title);";
 }
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_1.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_1.php
index 3a81c902..991c906b 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_1.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_1.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -63,4 +63,6 @@ $SQL[] = "UPDATE groups SET g_icon=REPLACE(g_icon,'style_images/<#IMG_DIR#>/fold
 /* Adding this here so permsBbcode section doesn't throw error */
 $SQL[] = "ALTER TABLE bbcode_mediatag ADD mediatag_position SMALLINT NOT NULL DEFAULT '0';";
 
+$SQL[] = "ALTER TABLE custom_bbcode ADD bbcode_custom_regex TEXT NULL DEFAULT NULL;";
+
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_2.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_2.php
index 3a6952a4..8c941493 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_2.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_2.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -28,4 +28,6 @@ $SQL[] = "ALTER TABLE polls ADD poll_view_voters	INT(1) NOT NULL default '0';";
 $SQL[] = "ALTER TABLE tracker ADD KEY tm_id (topic_id, member_id);";
 $SQL[] = "ALTER TABLE forum_tracker ADD KEY member_id (member_id), ADD KEY fm_id (member_id, forum_id );";
 
+$SQL[] = "UPDATE forums SET skin_id=0";
+
 ?>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_3.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_3.php
index 3c6f78ad..c5cce721 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_3.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_3.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_4.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_4.php
index d1f16381..47b7b1b5 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_4.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_4.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_5.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_5.php
index 933c3244..332fc9d8 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_5.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_5.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -24,16 +24,16 @@ INSERT INTO cache_store ( cs_key , cs_value , cs_extra , cs_array , cs_updated )
 EOF;
 
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Пример плагина', 'Плагин, не требующий напи�ани� кода, но требующий на�тройки.', 'Invision Power Services, Inc', '', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Пример плагина', 'Плагин, не требующий напи�ани� кода, но требующий на�тройки.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин форума', 'Плагин жалоб на �ообщени� и темы в форумах.', 'Invision Power Services, Inc', '', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин форума', 'Плагин жалоб на �ообщени� и темы в форумах.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин личных �ообщений', 'Плагин жалоб на личные �ообщени�', 'Invision Power Services, Inc', '', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин личных �ообщений', 'Плагин жалоб на личные �ообщени�', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин пользователь�ких профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', '', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин пользователь�ких профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1);
 EOF;
 
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_6.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_6.php
index 1fb10dd2..c55b6d99 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_6.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_updates_6.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/mysql_version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_30001/mysql_version_upgrade.php
index 20eb616e..2b3e5a59 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/mysql_version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/mysql_version_upgrade.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/version_class.php b/upload/admin/applications/core/setup/versions/upg_30001/version_class.php
index 7117c152..5d7f07e9 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/version_class.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/version_class.php
@@ -3,30 +3,29 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.2
+ * IP.Board v3.2.3
  * Upgrade Class
  *
  * Class to add options and notices for IP.Board upgrade
- * Last Updated: $Date: 2010-05-03 19:34:02 -0400 (Mon, 03 May 2010) $
+ * Last Updated: $Date: 2011-05-24 15:40:20 -0400 (Tue, 24 May 2011) $
  * </pre>
  * 
- * @author		Matt Mecham <matt@invisionpower.com>
- * @version		$Rev: 6205 $
+ * @author		Matt Mecham
+ * @version		$Rev: 8884 $
  * @since		3.0
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @link		http://www.invisionpower.com
+ * @license		This is NULLED!
+ * @link		http://hatynka.in
  * @package		IP.Board
  */ 
 
-class version_class_30001
+class version_class_core_30001
 {
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry ) 
 	{
@@ -42,7 +41,6 @@ class version_class_30001
 	/**
 	 * Add pre-upgrade options: Form
 	 * 
-	 * @access	public
 	 * @return	string	 HTML block
 	 */
 	public function preInstallOptionsForm()
@@ -76,7 +74,6 @@ EOF;
 	 *
 	 * Data will be saved in saved data array as: appOptions[ app ][ versionLong ] = ( key => value );
 	 * 
-	 * @access	public
 	 * @return	array	 Key / value pairs to save
 	 */
 	public function preInstallOptionsSave()
@@ -92,7 +89,6 @@ EOF;
 	/**
 	 * Return any post-installation notices
 	 * 
-	 * @access	public
 	 * @return	array	 Array of notices
 	 */
 	public function postInstallNotices()
@@ -149,7 +145,6 @@ EOF;
 	/**
 	 * Return any pre-installation notices
 	 * 
-	 * @access	public
 	 * @return	array	 Array of notices
 	 */
 	public function preInstallNotices()
diff --git a/upload/admin/applications/core/setup/versions/upg_30001/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_30001/version_upgrade.php
index 8e48b39c..444b60ce 100644
--- a/upload/admin/applications/core/setup/versions/upg_30001/version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_30001/version_upgrade.php
@@ -1,16 +1,15 @@
 <?php
-
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -25,17 +24,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +41,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -131,11 +127,11 @@ class version_upgrade
 	}
 	
 	/**
-	* Run SQL files
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Run SQL files
+	 * 
+	 * @param	int
+	 * @return	@e void
+	 */
 	public function upgradeSql( $id=1 )
 	{
 		$cnt        = 0;
@@ -146,9 +142,9 @@ class version_upgrade
 		$prefix     = $this->registry->dbFunctions()->getPrefix();
 		$sourceFile = '';
 		
-		if ( file_exists( $path ) )
+		if ( is_file( $path ) )
 		{
-			require( $path );
+			require( $path );/*noLibHook*/
 			
 			/* Set DB driver to return any errors */
 			$this->DB->return_die = 1;
@@ -164,7 +160,7 @@ class version_upgrade
 				{
 					if ( preg_match( "/^create table(.+?)/i", $query ) )
 					{
-						$query = preg_replace( "/^(.+?)\);$/is", "\\1) TYPE={$this->settings['mysql_tbl_type']};", $query );
+						$query = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $query );
 					}
 				}
 				
@@ -231,11 +227,10 @@ class version_upgrade
 	
 	
 	/**
-	* Add Applications
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Add Applications
+	 * 
+	 * @return	@e void
+	 */
 	public function addApplications()
 	{
 		/* Add applications.. */
@@ -257,7 +252,7 @@ class version_upgrade
 						// Get it!
 						//-----------------------------------------
 					
-						if ( ! file_exists( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
+						if ( ! is_file( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
 						{
 							continue;		
 						}
@@ -365,6 +360,24 @@ class version_upgrade
 		//$apps['ips']['chat']['_currentLong']  = '30003';
 		//$apps['ips']['chat']['_currentHuman'] = '3.0.0';
 		
+		/* If we are upgrading from 2.3 and did not upload the calendar files, we still need to insert
+			the applications table entry, otherwise you won't be able to upgrade down the road.  We will
+			insert it as disabled, however, as calendar won't function since files are not available 
+			@link http://community.invisionpower.com/tracker/issue-33543-ipb2-upgrades */
+		if( !isset($apps['ips']['calendar']['name']) )
+		{
+			$apps['ips']['calendar']	= array(
+												'name'				=> 'Calendar',
+												'public_name'		=> 'Calendar',
+												'description'		=> "",
+												'author'			=> "Invision Power Services, Inc.",
+												'hide_tab'			=> 0,
+												'key'				=> 'calendar',
+												'disabledatinstall'	=> 1,
+												'ipskey'			=> "fa038db69fa627d8e8e034d65f554d1f",
+												);
+		}
+		
 		$apps['ips']['calendar']['_currentLong']  = '30003';
 		$apps['ips']['calendar']['_currentHuman'] = '3.0.0';
 		
@@ -395,19 +408,23 @@ class version_upgrade
 				
 				$this->registry->output->addMessage("Добавление приложени�: {$appData['name']}....");
 				
-				$this->DB->insert( 'core_applications', array(   'app_title'        => $appData['name'],
-																 'app_public_title' => ( $appData['public_name'] ) ? $appData['public_name'] : '',	// Allow blank in case it's an admin-only app
-																 'app_description'  => $appData['description'],
-																 'app_author'       => $appData['author'],
-																 'app_hide_tab'		=> intval($appData['hide_tab']),
-																 'app_version'      => $appData['_currentHuman'],
-																 'app_long_version' => $appData['_currentLong'],
-																 'app_directory'    => $appData['key'],
-																 'app_added'        => time(),
-																 'app_position'     => $num,
-																 'app_protected'    => $_protected,
-																 'app_location'     => IPSLib::extractAppLocationKey( $appData['key'] ),
-																 'app_enabled'      => $_enabled ) );
+				$this->DB->insert( 'core_applications', array(  'app_title'			=> $appData['name'],
+																'app_public_title'	=> ( $appData['public_name'] ) ? $appData['public_name'] : '',	// Allow blank in case it's an admin-only app
+																'app_description'	=> $appData['description'],
+																'app_author'		=> $appData['author'],
+																'app_hide_tab'		=> intval($appData['hide_tab']),
+																'app_version'		=> $appData['_currentHuman'],
+																'app_long_version'	=> $appData['_currentLong'],
+																'app_directory'		=> $appData['key'],
+																'app_added'			=> time(),
+																'app_position'		=> $num,
+																'app_protected'		=> $_protected,
+																'app_location'		=> IPSLib::extractAppLocationKey( $appData['key'] ),
+																'app_enabled'		=> $_enabled,
+																'app_website'		=> $appData['website'],
+																'app_update_check'	=> $appData['update_check'],
+																'app_global_caches'	=> $appData['global_caches'],
+															  ) );
 			}
 		}
 		
@@ -416,11 +433,10 @@ class version_upgrade
 	}
 	
 	/**
-	* Add Settings
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Add Settings
+	 * 
+	 * @return	@e void
+	 */
 	public function addSettings()
 	{
 		/* INIT */
@@ -477,10 +493,10 @@ class version_upgrade
 		/* Add 'em */
 		foreach( $apps as $dir => $data )
 		{
-			if ( file_exists( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_settings.xml' ) )
+			if ( is_file( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_settings.xml' ) )
 			{
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php' );
-				$settings =  new admin_core_tools_settings();
+				$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php', 'admin_core_settings_settings' );
+				$settings    = new $classToLoad();
 				$settings->makeRegistryShortcuts( $this->registry );
 		
 				$this->request['app_dir'] = $dir;
@@ -495,11 +511,10 @@ class version_upgrade
 	}
 	
 	/**
-	* Sort out profile fields
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Sort out profile fields
+	 * 
+	 * @return	@e void
+	 */
 	public function addProfile()
 	{
 		/* INIT */
@@ -508,7 +523,7 @@ class version_upgrade
 		$sourceFile = '';
 		
 		/* Get DB driver file */
-		require_once( IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_30001/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_version_upgrade.php' );
+		require_once( IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_30001/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_version_upgrade.php' );/*noLibHook*/
 		
 		/* First off, move all current profile fields to group ID 3 */
 		$this->DB->update( 'pfields_data', array( 'pf_group_id' => 3 ), 'pf_group_id=0' );
@@ -664,11 +679,10 @@ class version_upgrade
 	}
 	
 	/**
-	* Sort out bbcode and permissions
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Sort out bbcode and permissions
+	 * 
+	 * @return	@e void
+	 */
 	public function permsAndBbcode()
 	{
 		/* INIT */
@@ -703,27 +717,27 @@ class version_upgrade
 		/* Add 'em */
 		foreach( $apps as $dir => $data )
 		{
-			if ( file_exists( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_bbcode.xml' ) )
+			if ( is_file( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_bbcode.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
-			
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );
-				$bbcode = new admin_core_posts_bbcode();
+				
+				$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php', 'admin_core_posts_bbcode' );
+				$bbcode = new $classToLoad();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
 				$bbcode->bbcodeImportDo( file_get_contents( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_bbcode.xml' ) );
 			}
 		
-			if ( file_exists( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_mediatag.xml' ) )
+			if ( is_file( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_mediatag.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
-			
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );
-				$bbcode = new admin_core_posts_media();
+				
+				$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php', 'admin_core_posts_media' );
+				$bbcode = new $classToLoad();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
 				$bbcode->doMediaImport( file_get_contents( IPSLib::getAppDir( $dir ) .  '/xml/' . $dir . '_mediatag.xml' ) );
@@ -1021,8 +1035,8 @@ class version_upgrade
 	
 	/**
 	 * Export skin and languages
-	 *
-	 * @access	public
+	 * 
+	 * @return	@e void
 	 */
 	public function exportSkinLang()
 	{
@@ -1051,9 +1065,9 @@ class version_upgrade
 			{
 				if ( ! is_dir( IPS_CACHE_PATH . 'cache/previousLangFiles' ) )
 				{
-					if ( @mkdir( IPS_CACHE_PATH . 'cache/previousLangFiles', 0777 ) )
+					if ( @mkdir( IPS_CACHE_PATH . 'cache/previousLangFiles', IPS_FOLDER_PERMISSION ) )
 					{
-						@chmod( IPS_CACHE_PATH . 'cache/previousLangFiles', 0777 );
+						@chmod( IPS_CACHE_PATH . 'cache/previousLangFiles', IPS_FOLDER_PERMISSION );
 					}
 				}
 				
@@ -1105,42 +1119,42 @@ class version_upgrade
 			{
 				if ( ! is_dir( IPS_CACHE_PATH . 'cache/previousSkinFiles' ) )
 				{
-					if ( @mkdir( IPS_CACHE_PATH . 'cache/previousSkinFiles', 0777 ) )
+					if ( @mkdir( IPS_CACHE_PATH . 'cache/previousSkinFiles', IPS_FOLDER_PERMISSION ) )
 					{
-						@chmod( IPS_CACHE_PATH . 'cache/previousSkinFiles', 0777 );
+						@chmod( IPS_CACHE_PATH . 'cache/previousSkinFiles', IPS_FOLDER_PERMISSION );
 					}
 				}
 				
 				$safeName = IPSText::alphanumericalClean( $set['set_name'] );
 				$dirPath  = IPS_CACHE_PATH . 'cache/previousSkinFiles/' . $safeName;
 				
-				if ( @mkdir( $dirPath, 0777 ) )
+				if ( @mkdir( $dirPath, IPS_FOLDER_PERMISSION ) )
 				{
-					@chmod( $dirPath, 0777 );
+					@chmod( $dirPath, IPS_FOLDER_PERMISSION );
 				}
 				
 				if ( is_dir( $dirPath ) )
 				{
 					/* Export CSS */
-					if ( @mkdir( $dirPath . '/css', 0777 ) )
+					if ( @mkdir( $dirPath . '/css', IPS_FOLDER_PERMISSION ) )
 					{
-						@chmod( $dirPath . '/css', 0777 );
+						@chmod( $dirPath . '/css', IPS_FOLDER_PERMISSION );
 					}
 					
 					@file_put_contents( $dirPath . '/css/css.css', $set['set_cache_css'] );
 					
 					/* Export Wrapper */
-					if ( @mkdir( $dirPath . '/wrapper', 0777 ) )
+					if ( @mkdir( $dirPath . '/wrapper', IPS_FOLDER_PERMISSION ) )
 					{
-						@chmod( $dirPath . '/wrapper', 0777 );
+						@chmod( $dirPath . '/wrapper', IPS_FOLDER_PERMISSION );
 					}
 					
 					@file_put_contents( $dirPath . '/wrapper/wrapper.html', $set['set_wrapper'] );
 					
 					/* Export Templates */
-					if ( @mkdir( $dirPath . '/templates', 0777 ) )
+					if ( @mkdir( $dirPath . '/templates', IPS_FOLDER_PERMISSION ) )
 					{
-						@chmod( $dirPath . '/templates', 0777 );
+						@chmod( $dirPath . '/templates', IPS_FOLDER_PERMISSION );
 					}
 					
 					$this->DB->build( array( 'select' => '*',
@@ -1156,9 +1170,9 @@ class version_upgrade
 						$_bitName   = IPSText::alphanumericalClean( $row['func_name'] );
 						
 						/* Make section dir */
-						if ( @mkdir( $dirPath . '/templates/' . $_groupName, 0777 ) )
+						if ( @mkdir( $dirPath . '/templates/' . $_groupName, IPS_FOLDER_PERMISSION ) )
 						{
-							@chmod( $dirPath . '/templates/' . $_groupName, 0777 );
+							@chmod( $dirPath . '/templates/' . $_groupName, IPS_FOLDER_PERMISSION );
 						}
 						
 						@file_put_contents( $dirPath . '/templates/' . $_groupName . '/' . $_bitName . '.html', $row['section_content'] );
@@ -1186,10 +1200,10 @@ class version_upgrade
 	}
 	
 	/**
-	* Convert PMs
-	* 
-	* @access	public
-	*/
+	 * Convert PMs
+	 * 
+	 * @return	@e void
+	 */
 	public function convertPms()
 	{
 		/* INIT */
@@ -1303,7 +1317,7 @@ class version_upgrade
 				/* Build invited - does not include 'to' person */
 				if ( $data['mt_owner_id'] AND ( $post['msg_author_id'] != $data['mt_owner_id'] ) AND ( $topicData['mt_to_id'] != $data['mt_owner_id'] ) )
 				{
-					$_invited[ $data['mt_owner_id'] ] = $data['mt_owner_id'];
+					$_invited[ $data['mt_owner_id'] ] = $data['mt_owner_id'];/*noLibHook*/
 				}
 				
 				$_isSent  = ( $data['mt_vid_folder'] == 'sent' )   ? 1 : 0;
@@ -1397,18 +1411,31 @@ class version_upgrade
 	}
 	
 	/**
-	* Convert Block lists
-	* 
-	* @access	public
-	*/
+	 * Convert Block lists
+	 * 
+	 * @return	@e void
+	 */
 	public function convertBlockLists()
 	{
 		/* INIT */
 		$pergo     = 200;
 		$start     = intval( $this->request['st'] );
+		$options   = IPSSetUp::getSavedData('custom_options');
+		$skipPms	= $options['core'][30001]['skipPms'];
 		$converted = 0;
 		$seen      = 0;
 		
+		/* Skipping? */
+		if ( $skipPms )
+		{
+			/* add a message */
+			$this->registry->output->addMessage( "Skipping Block List Conversion" );
+			
+			$this->request['workact'] = 'pmblock';
+			$this->request['st']      = 0;
+			return;
+		}
+		
 		$this->DB->build( array( 'select' => '*',
 								 'from'   => 'members',
 								 'where'  =>  method_exists( $this->DB, 'setTableIdentityInsert' ) ? 'ignored_users NOT LIKE \'\'' : $this->DB->buildLength('ignored_users') . ' > 0',
@@ -1469,10 +1496,10 @@ class version_upgrade
 	}
 	
 	/**
-	* Convert Block lists
-	* 
-	* @access	public
-	*/
+	 * Convert Block lists
+	 * 
+	 * @return	@e void
+	 */
 	public function convertPmBlockLists()
 	{
 		/* INIT */
@@ -1480,6 +1507,19 @@ class version_upgrade
 		$start     = intval( $this->request['st'] );
 		$converted = 0;
 		$seen      = 0;
+		$options   = IPSSetUp::getSavedData('custom_options');
+		$skipPms   = $options['core'][30001]['skipPms'];
+		
+		/* Skipping? */
+		if ( $skipPms )
+		{
+			/* add a message */
+			$this->registry->output->addMessage( "Skipping PM Block List Conversion" );
+			
+			$this->request['workact'] = 'finish';
+			$this->request['st']      = 0;
+			return;
+		}
 		
 		$this->DB->build( array( 'select' => '*',
 								 'from'   => 'contacts',
@@ -1554,11 +1594,10 @@ class version_upgrade
 
 	
 	/**
-	* Finish up conversion stuff
-	* 
-	* @access	public
-	* @param	int
-	*/
+	 * Finish up conversion stuff
+	 * 
+	 * @return	@e void
+	 */
 	public function finish()
 	{
 		$options	= IPSSetUp::getSavedData('custom_options');
@@ -1614,7 +1653,7 @@ class version_upgrade
 						  'external'   => 5 );
 						
 		/* Fetch XML */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 		
 		$xml->load( IPS_ROOT_PATH . 'setup/xml/loginauth.xml' );
@@ -1684,6 +1723,4 @@ class version_upgrade
 		/* Last function, so unset workact */
 		$this->request['workact'] = '';
 	}
-}
-	
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30003/index.html b/upload/admin/applications/core/setup/versions/upg_30003/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30003/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30003/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30003/mysql_updates.php
index 708f6954..cf3ab69c 100644
--- a/upload/admin/applications/core/setup/versions/upg_30003/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30003/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30004/index.html b/upload/admin/applications/core/setup/versions/upg_30004/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30004/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30004/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30004/mysql_updates.php
index d4c978b7..a375f1ca 100644
--- a/upload/admin/applications/core/setup/versions/upg_30004/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30004/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30005/index.html b/upload/admin/applications/core/setup/versions/upg_30005/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30005/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30005/mysql_updates.php
index 6796300c..319d157f 100644
--- a/upload/admin/applications/core/setup/versions/upg_30005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30005/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30006/index.html b/upload/admin/applications/core/setup/versions/upg_30006/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30006/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30006/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30006/mysql_updates.php
index ed0ee4d1..dfe044e9 100644
--- a/upload/admin/applications/core/setup/versions/upg_30006/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30006/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30007/index.html b/upload/admin/applications/core/setup/versions/upg_30007/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30007/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30007/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30007/mysql_updates.php
index 9161a19f..1d62c59a 100644
--- a/upload/admin/applications/core/setup/versions/upg_30007/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30007/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30008/index.html b/upload/admin/applications/core/setup/versions/upg_30008/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30008/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30008/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30008/mysql_updates.php
index e07185af..00d88323 100644
--- a/upload/admin/applications/core/setup/versions/upg_30008/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30008/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30008/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_30008/version_upgrade.php
index 37e058bd..3fe85a14 100644
--- a/upload/admin/applications/core/setup/versions/upg_30008/version_upgrade.php
+++ b/upload/admin/applications/core/setup/versions/upg_30008/version_upgrade.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -25,17 +25,15 @@ class version_upgrade
 	/**
 	 * Custom HTML to show
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_output = '';
+	protected $_output = '';
 	
 	/**
-	* fetchs output
-	* 
-	* @access	public
-	* @return	string
-	*/
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
 	public function fetchOutput()
 	{
 		return $this->_output;
@@ -44,9 +42,8 @@ class version_upgrade
 	/**
 	 * Execute selected method
 	 *
-	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/applications/core/setup/versions/upg_30009/index.html b/upload/admin/applications/core/setup/versions/upg_30009/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30009/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30009/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30009/mysql_updates.php
index a4e1dfae..823b45a5 100644
--- a/upload/admin/applications/core/setup/versions/upg_30009/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30009/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30010/index.html b/upload/admin/applications/core/setup/versions/upg_30010/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30010/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30010/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30010/mysql_updates.php
index f8fa7526..cf749f5f 100644
--- a/upload/admin/applications/core/setup/versions/upg_30010/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30010/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30011/index.html b/upload/admin/applications/core/setup/versions/upg_30011/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30011/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30011/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30011/mysql_updates.php
index 6089e086..12028ba2 100644
--- a/upload/admin/applications/core/setup/versions/upg_30011/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30011/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_30012/index.html b/upload/admin/applications/core/setup/versions/upg_30012/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_30012/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_30012/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_30012/mysql_updates.php
index 6d9a7712..d6834c5b 100644
--- a/upload/admin/applications/core/setup/versions/upg_30012/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_30012/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -21,8 +21,6 @@ $DB  = ipsRegistry::DB();
 if ( ! $DB->checkForField( 'tag_hidden', 'tags_index' ) )
 {
 	$SQL[] = "ALTER TABLE tags_index ADD tag_hidden INT(1) NOT NULL default '0', ADD INDEX tag_grab (app, type, type_id, type_2, type_id_2, tag_hidden);";
-	//$SQL[] = "CREATE INDEX tag_grab ON tags_index (app, type, type_id, type_2, type_id_2, tag_hidden);";
-	// ^^ This is a mssql query..
 }
 
 $SQL[] = "ALTER TABLE message_topic_user_map ADD INDEX ( map_topic_id );";
@@ -54,9 +52,9 @@ $SQL[] = "ALTER TABLE polls ADD INDEX ( tid );";
 
 
 $SQL[] = "CREATE TABLE core_rss_imported (
-			rss_guid			CHAR(32) NOT NULL,
-			rss_foreign_id 		INT(10) NOT NULL default '0',
-			rss_foreign_key		VARCHAR(100) NOT NULL default '',
+			rss_guid CHAR(32) NOT NULL,
+			rss_foreign_id INT(10) NOT NULL default '0',
+			rss_foreign_key VARCHAR(100) NOT NULL default '',
 			PRIMARY KEY (rss_guid),
 			KEY rss_grabber (rss_guid, rss_foreign_key)
 		);";
diff --git a/upload/admin/applications/core/setup/versions/upg_31000/index.html b/upload/admin/applications/core/setup/versions/upg_31000/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_31000/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31000/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31000/mysql_updates.php
index fe710bfa..dada0f36 100644
--- a/upload/admin/applications/core/setup/versions/upg_31000/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31000/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
@@ -202,20 +202,20 @@ $SQL[] = "CREATE TABLE core_soft_delete_log (
 );";
 
 $SQL[] = "CREATE TABLE twitter_connect (
-	t_key		VARCHAR(32) NOT NULL default '',
-	t_token		VARCHAR(255) NOT NULL default '',
-	t_secret	VARCHAR(255) NOT NULL default '',
-	t_time		INT(10) NOT NULL default '0'
+	t_key VARCHAR(32) NOT NULL default '',
+	t_token VARCHAR(255) NOT NULL default '',
+	t_secret VARCHAR(255) NOT NULL default '',
+	t_time INT(10) NOT NULL default '0'
 );";
 
 $SQL[] = "CREATE TABLE core_share_links (
-	share_id		INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-	share_title		VARCHAR(255) NOT NULL DEFAULT '',
-	share_url		TEXT,
-	share_key		VARCHAR(50) NOT NULL DEFAULT '',
-	share_enabled	INT(1) NOT NULL DEFAULT '0',
-	share_position	INT(3) NOT NULL DEFAULT '0',
-	share_markup	TEXT,
+	share_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	share_title VARCHAR(255) NOT NULL DEFAULT '',
+	share_url TEXT,
+	share_key VARCHAR(50) NOT NULL DEFAULT '',
+	share_enabled INT(1) NOT NULL DEFAULT '0',
+	share_position INT(3) NOT NULL DEFAULT '0',
+	share_markup TEXT,
 	share_canonical INT(1) NOT NULL DEFAULT '1',
 	PRIMARY KEY share_id (share_id)
 );";
@@ -241,10 +241,10 @@ $SQL[] = "CREATE TABLE core_share_links_log (
 );";
 
 $SQL[] = "CREATE TABLE core_share_links_caches (
-	cache_id		INT(10) NOT NULL auto_increment,
-	cache_key		VARCHAR(255) NOT NULL default '',
-	cache_data		MEDIUMTEXT,
-	cache_date		INT(10) NOT NULL default '0',
+	cache_id INT(10) NOT NULL auto_increment,
+	cache_key VARCHAR(255) NOT NULL default '',
+	cache_data MEDIUMTEXT,
+	cache_date INT(10) NOT NULL default '0',
 	PRIMARY KEY cache_id( cache_id )
 );";
 
@@ -259,65 +259,65 @@ $SQL[] = "CREATE TABLE core_incoming_emails (
 );";
 
 $SQL[] = "CREATE TABLE search_sessions (
-	session_id			VARCHAR(32) NOT NULL DEFAULT '',
-	session_created		INT(10) NOT NULL DEFAULT '0',
-	session_updated 	INT(10) NOT NULL DEFAULT '0',
-	session_member_id	INT(10) NOT NULL DEFAULT '0',
-	session_data		MEDIUMTEXT,
+	session_id VARCHAR(32) NOT NULL DEFAULT '',
+	session_created INT(10) NOT NULL DEFAULT '0',
+	session_updated  INT(10) NOT NULL DEFAULT '0',
+	session_member_id INT(10) NOT NULL DEFAULT '0',
+	session_data MEDIUMTEXT,
 	KEY session_updated (session_updated),
 	PRIMARY KEY (session_id)
 );";
 
 $SQL[] = "CREATE TABLE skin_merge_session (
-	merge_id				INT(10) NOT NULL auto_increment,
-	merge_date				INT(10) NOT NULL DEFAULT '0',
-	merge_set_id			INT(10) NOT NULL DEFAULT '0',
-	merge_master_key		VARCHAR(200) NOT NULL DEFAULT '',
-	merge_old_version		VARCHAR(200) NOT NULL DEFAULT '',
-	merge_new_version		VARCHAR(200) NOT NULL DEFAULT '',
-	merge_templates_togo	INT(10) NOT NULL DEFAULT '0',
-	merge_css_togo			INT(10) NOT NULL DEFAULT '0',
-	merge_templates_done	INT(10) NOT NULL DEFAULT '0',
-	merge_css_done			INT(10) NOT NULL DEFAULT '0',
-	merge_m_templates_togo	INT(10) NOT NULL DEFAULT '0',
-	merge_m_css_togo		INT(10) NOT NULL DEFAULT '0',
-	merge_m_templates_done	INT(10) NOT NULL DEFAULT '0',
-	merge_m_css_done		INT(10) NOT NULL DEFAULT '0',
-	merge_diff_done			INT(1) NOT NULL DEFAULT '0',
+	merge_id INT(10) NOT NULL auto_increment,
+	merge_date INT(10) NOT NULL DEFAULT '0',
+	merge_set_id INT(10) NOT NULL DEFAULT '0',
+	merge_master_key VARCHAR(200) NOT NULL DEFAULT '',
+	merge_old_version VARCHAR(200) NOT NULL DEFAULT '',
+	merge_new_version VARCHAR(200) NOT NULL DEFAULT '',
+	merge_templates_togo INT(10) NOT NULL DEFAULT '0',
+	merge_css_togo INT(10) NOT NULL DEFAULT '0',
+	merge_templates_done INT(10) NOT NULL DEFAULT '0',
+	merge_css_done INT(10) NOT NULL DEFAULT '0',
+	merge_m_templates_togo INT(10) NOT NULL DEFAULT '0',
+	merge_m_css_togo INT(10) NOT NULL DEFAULT '0',
+	merge_m_templates_done INT(10) NOT NULL DEFAULT '0',
+	merge_m_css_done INT(10) NOT NULL DEFAULT '0',
+	merge_diff_done INT(1) NOT NULL DEFAULT '0',
 	PRIMARY KEY (merge_id)
 );";
 
 $SQL[] = "CREATE TABLE skin_merge_changes (
-	change_id				INT(10) NOT NULL auto_increment,
-	change_key				VARCHAR(255) NOT NULL DEFAULT '',
-	change_session_id		INT(10) NOT NULL DEFAULT '0',
-	change_updated			INT(10) NOT NULL DEFAULT '0',
-	change_data_group		VARCHAR(255) NOT NULL DEFAULT '',
-	change_data_title		VARCHAR(255) NOT NULL DEFAULT '',
-	change_data_content		MEDIUMTEXT,
-	change_data_type		VARCHAR(10) NOT NULL DEFAULT 'template',
-	change_is_new			INT(1) NOT NULL DEFAULT '0',
-	change_is_diff			INT(1) NOT NULL DEFAULT '0',
-	change_can_merge		INT(1) NOT NULL DEFAULT '0',
-	change_merge_content	MEDIUMTEXT,
-	change_is_conflict		INT(1) NOT NULL DEFAULT '0',
-	change_final_content	MEDIUMTEXT,
-	change_changes_applied	INT(1) NOT NULL DEFAULT '0',
+	change_id INT(10) NOT NULL auto_increment,
+	change_key VARCHAR(255) NOT NULL DEFAULT '',
+	change_session_id INT(10) NOT NULL DEFAULT '0',
+	change_updated INT(10) NOT NULL DEFAULT '0',
+	change_data_group VARCHAR(255) NOT NULL DEFAULT '',
+	change_data_title VARCHAR(255) NOT NULL DEFAULT '',
+	change_data_content MEDIUMTEXT,
+	change_data_type VARCHAR(10) NOT NULL DEFAULT 'template',
+	change_is_new INT(1) NOT NULL DEFAULT '0',
+	change_is_diff INT(1) NOT NULL DEFAULT '0',
+	change_can_merge INT(1) NOT NULL DEFAULT '0',
+	change_merge_content MEDIUMTEXT,
+	change_is_conflict INT(1) NOT NULL DEFAULT '0',
+	change_final_content MEDIUMTEXT,
+	change_changes_applied INT(1) NOT NULL DEFAULT '0',
 	change_original_content MEDIUMTEXT,
 	PRIMARY KEY (change_id),
 	KEY (change_key, change_data_type)
 );";
 
 $SQL[] = "CREATE TABLE facebook_oauth_temp (
-	f_key		VARCHAR(32) NOT NULL default '',
-	f_token		VARCHAR(255) NOT NULL default '',
-	f_time		INT(10) NOT NULL default '0'
+	f_key VARCHAR(32) NOT NULL default '',
+	f_token VARCHAR(255) NOT NULL default '',
+	f_time INT(10) NOT NULL default '0'
 );";
 
 $SQL[] = "INSERT INTO member_status_updates (status_member_id, status_date, status_content, status_replies, status_is_latest ) SELECT pp_member_id, pp_status_update, pp_status, 0, 1 FROM `{$PRE}profile_portal` WHERE LENGTH(pp_status) > 0;";
 	
 
-$SQL[] = "ALTER TABLE members ADD twitter_id	   VARCHAR(255) NOT NULL DEFAULT '';";
+$SQL[] = "ALTER TABLE members ADD twitter_id VARCHAR(255) NOT NULL DEFAULT '';";
 $SQL[] = "ALTER TABLE members ADD twitter_token  VARCHAR(255) NOT NULL DEFAULT '';";
 $SQL[] = "ALTER TABLE members ADD twitter_secret VARCHAR(255) NOT NULL DEFAULT '';";
 $SQL[] = "ALTER TABLE members ADD notification_cnt MEDIUMINT NOT NULL DEFAULT '0';";
@@ -331,9 +331,9 @@ $SQL[] = "ALTER TABLE members ADD INDEX twitter_id (twitter_id);";
 
 
 $SQL[] = "ALTER TABLE profile_portal ADD tc_last_sid_import BIGINT(20) UNSIGNED NOT NULL default '0';";
-$SQL[] = "ALTER TABLE profile_portal ADD tc_photo	text;";
+$SQL[] = "ALTER TABLE profile_portal ADD tc_photo text;";
 $SQL[] = "ALTER TABLE profile_portal ADD tc_bwoptions  int(10) unsigned NOT NULL default '0';";
-$SQL[] = "ALTER TABLE profile_portal ADD pp_customization	mediumtext;";
+$SQL[] = "ALTER TABLE profile_portal ADD pp_customization mediumtext;";
 
 $SQL[] = "ALTER TABLE groups ADD g_max_notifications MEDIUMINT NOT NULL DEFAULT '0';";
 $SQL[] = "ALTER TABLE groups ADD g_max_bgimg_upload INT(10) NOT NULL default '0';";
@@ -342,8 +342,8 @@ $SQL[] = "ALTER TABLE rc_classes ADD app VARCHAR( 32 ) NOT NULL;";
 $SQL[] = "ALTER TABLE forums ADD disable_sharelinks INT(1) NOT NULL default '0';";
 
 $SQL[] = "ALTER TABLE topics ADD topic_deleted_posts INT(10) NOT NULL default '0';";
-$SQL[] = "ALTER TABLE forums ADD deleted_posts	INT(10) NOT NULL default '0';";
-$SQL[] = "ALTER TABLE forums ADD deleted_topics	INT(10) NOT NULL default '0';";
+$SQL[] = "ALTER TABLE forums ADD deleted_posts INT(10) NOT NULL default '0';";
+$SQL[] = "ALTER TABLE forums ADD deleted_topics INT(10) NOT NULL default '0';";
 
 $SQL[] = "ALTER TABLE forums ADD rules_raw_html tinyint(1) NOT NULL default '0';";
 
@@ -398,7 +398,7 @@ if ( ! $skins['default'] )
 											'set_permissions'    => '*',
 											'set_is_default'     => 0,
 											'set_author_name'	 => "Invision Power Services, Inc",
-										    'set_author_url'	 => 'http://bestcms.ws',
+										    'set_author_url'	 => 'http://www.invisionpower.com',
 										    'set_image_dir'		 => 'master',
 										    'set_emo_dir'		 => 'default',
 										    'set_hide_from_list' => 1,
@@ -418,7 +418,7 @@ if ( ! $skins['lofi'] )
 											'set_permissions'    => '*',
 											'set_is_default'     => 0,
 											'set_author_name'	 => "Invision Power Services, Inc",
-										    'set_author_url'	 => 'http://bestcms.ws',
+										    'set_author_url'	 => 'http://www.invisionpower.com',
 										    'set_image_dir'		 => 'master',
 										    'set_emo_dir'		 => 'default',
 										    'set_hide_from_list' => 1,
@@ -436,9 +436,12 @@ if ( ! $skin['set_id'] )
 	$DB->update( 'skin_collections', array( 'set_is_default' => 1, 'set_hide_from_list' => 0 ), "set_key='default'" );
 }
 
-$SQL[] = "ALTER TABLE custom_bbcode ADD bbcode_custom_regex TEXT NULL DEFAULT NULL;";
+if ( ! $DB->checkForField( 'bbcode_custom_regex', 'custom_bbcode' ) )
+{
+	$SQL[] = "ALTER TABLE custom_bbcode ADD bbcode_custom_regex TEXT NULL DEFAULT NULL;";
+}
 
-$SQL[] = "ALTER TABLE skin_templates ADD template_master_key	VARCHAR(100) NOT NULL DEFAULT '';";
+$SQL[] = "ALTER TABLE skin_templates ADD template_master_key VARCHAR(100) NOT NULL DEFAULT '';";
 $SQL[] = "ALTER TABLE skin_templates ADD INDEX template_master_key (template_master_key);";
 
 $SQL[] = "ALTER TABLE skin_css ADD css_master_key VARCHAR(100) NOT NULL DEFAULT '';";
diff --git a/upload/admin/applications/core/setup/versions/upg_31003/index.html b/upload/admin/applications/core/setup/versions/upg_31003/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_31003/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31003/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31003/mysql_updates.php
index e948192f..ba93bcc5 100644
--- a/upload/admin/applications/core/setup/versions/upg_31003/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31003/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_31004/index.html b/upload/admin/applications/core/setup/versions/upg_31004/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_31004/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31004/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31004/mysql_updates.php
index f06ed975..e5e6dc37 100644
--- a/upload/admin/applications/core/setup/versions/upg_31004/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31004/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_31005/index.html b/upload/admin/applications/core/setup/versions/upg_31005/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_31005/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31005/mysql_updates.php
index 7d5de29d..97373e2c 100644
--- a/upload/admin/applications/core/setup/versions/upg_31005/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31005/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.2
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_31006/index.html b/upload/admin/applications/core/setup/versions/upg_31006/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/versions/upg_31006/index.html
+++ b/upload/admin/applications/core/setup/versions/upg_31006/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31006/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31006/mysql_updates.php
index eb8f8386..51aa0afa 100644
--- a/upload/admin/applications/core/setup/versions/upg_31006/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31006/mysql_updates.php
@@ -1,48 +1,20 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.3
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
 $DB = ipsRegistry::DB();
 
-$SQL[] = "CREATE TABLE core_like (
-  like_id binary(16) NOT NULL default '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0',
-  like_lookup_id binary(16) default NULL,
-  like_app varchar(150) NOT NULL default '',
-  like_area varchar(200) NOT NULL default '',
-  like_rel_id bigint(20) unsigned NOT NULL default '0',
-  like_member_id int(10) unsigned NOT NULL default '0',
-  like_is_anon int(1) NOT NULL default '0',
-  like_added int(10) unsigned NOT NULL default '0',
-  like_notify_do int(1) NOT NULL default '0',
-  like_notify_meta text,
-  like_notify_freq varchar(200) NOT NULL default '',
-  like_notify_sent int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (like_id),
-  KEY find_rel_favs (like_lookup_id,like_is_anon,like_added),
-  KEY like_member_id (like_member_id,like_added)
-)";
-
-$SQL[] = "CREATE TABLE core_like_cache (
-  like_cache_id binary(16) NOT NULL default '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0',
-  like_cache_app varchar(150) NOT NULL default '',
-  like_cache_area varchar(200) NOT NULL default '',
-  like_cache_rel_id bigint(20) unsigned NOT NULL default '0',
-  like_cache_data text,
-  like_cache_expire int(10) NOT NULL default '0',
-  PRIMARY KEY  (like_cache_id)
-);";
-
 $SQL[] = "ALTER TABLE pfields_data ADD pf_filtering TINYINT( 1 ) NOT NULL DEFAULT '0'";
 
 if ( $DB->checkForTable('cal_events') )
@@ -50,6 +22,10 @@ if ( $DB->checkForTable('cal_events') )
 	$SQL[] = "ALTER TABLE cal_events CHANGE event_tz event_tz VARCHAR( 4 ) NOT NULL DEFAULT '0'";
 }
 
+/* @link http://community.invisionpower.com/tracker/issue-32451-calendar-upgrade-issue-warning-and-then-driver-error
+	This may cause two entries for calendar for this version number, but that doesn't matter */
+$SQL[] = "INSERT INTO upgrade_history (upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_app) VALUES (31006, '3.1.3', " . time() . ", 1, 'calendar');";
+
 $SQL[] = "ALTER TABLE mobile_notifications DROP INDEX id;";
 $SQL[] = "ALTER TABLE profile_friends DROP INDEX friends_member_id;";
 $SQL[] = "ALTER TABLE member_status_updates DROP INDEX status_member_id;";
diff --git a/upload/admin/applications/core/setup/versions/upg_31007/index.html b/upload/admin/applications/core/setup/versions/upg_31007/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/setup/versions/upg_31007/index.html
+++ b/upload/admin/applications/core/setup/versions/upg_31007/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_31007/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_31007/mysql_updates.php
index 0e11fea0..fdb347f8 100644
--- a/upload/admin/applications/core/setup/versions/upg_31007/mysql_updates.php
+++ b/upload/admin/applications/core/setup/versions/upg_31007/mysql_updates.php
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.1.4
+|   IP.Board v3.2.3
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://www.invisionpower.com
+|   http://hatynka.in
 |   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
 +---------------------------------------------------------------------------
 */
 
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/index.html b/upload/admin/applications/core/setup/versions/upg_32000/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates.php
new file mode 100644
index 00000000..0f586cdb
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates.php
@@ -0,0 +1,72 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+
+/* Disable non-IPS hooks */
+$SQL[] = "UPDATE core_hooks SET hook_enabled=0 WHERE hook_author!='Invision Power Services, Inc.' AND hook_author!='Invision Power Services, Inc';";
+
+/* Cleanup some old CSS files */
+$SQL[] = "DELETE FROM skin_cache WHERE cache_value_1 in ('ipb_reset','ipb_bbcode','lightbox');";
+$SQL[] = "DELETE FROM skin_css WHERE css_group in ('ipb_reset','ipb_bbcode','lightbox');";
+$SQL[] = "DELETE FROM skin_css_previous WHERE p_css_group in ('ipb_reset','ipb_bbcode','lightbox');";
+
+/* Remove old settings and setting groups */
+$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key IN( 'threaded_per_page', 'spider_anon', 'enable_sockets', 'spam_service_api_key', 'news_forum_id', 'index_news_link', 
+	'csite_title', 'csite_article_date', 'csite_nav_show', 'csite_nav_contents', 'csite_fav_show', 'csite_fav_contents', 'blogs_portal_lastx', 'poll_poll_url', 'recent_topics_article_forum', 
+	'recent_topics_article_max', 'portal_exclude_pinned', 'recent_topics_discuss_number', 'forum_trash_can_enable', 'forum_trash_can_id', 'forum_trash_can_use_admin', 'forum_trash_can_use_smod', 
+	'forum_trash_can_use_mod', 'guests_ava', 'avatars_on', 'avatar_url', 'avatar_ext', 'avatar_def', 'avup_size_max', 'avatar_dims', 'disable_ipbsize', 'registration_qanda',
+	'disable_reportpost', 'captcha_allow_fonts', 'gd_version', 'login_page_info', 'register_page_info', 'cache_calendar', 'disable_online_ip', 'topicmode_default', 'allow_skins',
+	'ipb_disable_group_psformat', 'max_sig_length', 'aboutme_emoticons', 'login_change_key', 'disable_flash', 'disable_admin_anon', 'msg_allow_code', 'warn_show_rating', 'short_forum_jump',
+	'ips_default_editor', 'poll_tags', 'ipb_reg_show', 'cpu_watch_update', 'report_nemail_enabled', 'report_pm_enabled', 'enable_show_as_titles', 'pre_pinned', 'pre_moved', 'pre_polls', 
+	'max_bbcodes_per_post', 'post_wordwrap', 'aboutme_bbcode', 'sig_allow_ibc', 'aboutme_html', 'sig_allow_html', 'msg_allow_html', 'postpage_contents', 'topicpage_contents', 'use_mail_form',
+	'resize_linked_img', 'cc_monitor' );";
+$SQL[] = "DELETE FROM core_sys_settings_titles WHERE conf_title_keyword in ( 'ipbportal', 'portal_poll', 'portal_recent_topics', 'portal_blogs', 'newssetup', 'trashcansetup',
+	'cookies', 'ipbreg', 'twitterconnect' );";
+
+/* Remove portal application - cache will be rebuilt by upgrader automatically */
+$SQL[] = "DELETE FROM core_applications WHERE app_directory='portal';";
+$SQL[] = "DELETE FROM core_sys_module WHERE sys_module_application='portal';";
+$SQL[] = "DELETE FROM upgrade_history WHERE upgrade_app='portal';";
+$SQL[] = "DELETE FROM cache_store WHERE cs_key='portal';";
+$SQL[] = "DELETE FROM core_sys_lang_words WHERE word_app='portal';";
+
+/* Ensure engine isn't added */
+ipsRegistry::$settings['mysql_tbl_type'] = '';
+
+/* Ensure reputation_cache does not have duplicates for new unique key to be added */
+$SQL[]	= "CREATE TABLE reputation_cache2 (SELECT * FROM `{$PRE}reputation_cache` WHERE id > 0 GROUP BY app, type, type_id);";
+$SQL[]	= "DROP TABLE reputation_cache;";
+$SQL[]	= "RENAME TABLE reputation_cache2 TO reputation_cache;";
+$SQL[]	= "ALTER TABLE reputation_cache CHANGE id id bigint NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY(id), ADD UNIQUE KEY (app, type, type_id);";
+
+/* This, too, causes many issues.  Have seen several customers where the delete query cannot finish, even after 8 hours. */
+/*$SQL[]	= "CREATE TABLE reputation_cache_tempforupgrade SELECT id, CONCAT( app, '-', type, '-', type_id ) as cct, count( CONCAT( app, '-', type, '-', type_id ) ) AS count FROM {$PRE}reputation_cache GROUP BY cct;";
+$SQL[]	= "CREATE INDEX tmpIDX ON reputation_cache_tempforupgrade ( count );";
+$SQL[]	= "DELETE FROM reputation_cache WHERE id IN( select id from {$PRE}reputation_cache_tempforupgrade WHERE count > 1 );";
+$SQL[]	= "DROP TABLE reputation_cache_tempforupgrade;";*/
+
+/*
+The original query can take 5+ minutes with a lot of records.  Changed to the above based on feedback in bug report.  Didn't use temp tables due to problems with some shared hosts.
+@link	http://community.invisionpower.com/tracker/issue-31514-upgrade-query-taking-huge-amount-of-time
+
+$SQL[] = "DELETE FROM reputation_cache WHERE id IN(
+	SELECT id FROM (
+		SELECT x.id, CONCAT( x.app, '-', x.type, '-', x.type_id ) as cct, count( CONCAT( x.app, '-', x.type, '-', x.type_id ) ) as count FROM {$PRE}reputation_cache x GROUP BY cct ORDER BY count DESC
+		) as q WHERE count > 1 );";*/
+
+/* Delete old cache store records */
+$SQL[] = "delete from cache_store where cs_key IN( 'ccMonitor', 'portal' );";
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_1.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_1.php
new file mode 100644
index 00000000..38bbfa41
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_1.php
@@ -0,0 +1,197 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Generic changes */
+$SQL[] = "ALTER TABLE login_methods ADD login_custom_config TEXT NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE reputation_cache ADD rep_like_cache MEDIUMTEXT,
+	CHANGE rep_points rep_points INT( 10 ) NOT NULL DEFAULT '0';";
+
+$SQL[] = "ALTER TABLE core_like ADD like_lookup_area CHAR(32) NOT NULL DEFAULT '' AFTER like_lookup_id,
+	ADD like_visible TINYINT NOT NULL DEFAULT '1',
+	DROP INDEX find_rel_favs,
+	ADD INDEX find_rel_likes ( like_lookup_id , like_visible , like_is_anon , like_added ),
+	DROP INDEX like_member_id,
+	ADD INDEX like_member_id ( like_member_id , like_visible , like_added ),
+	ADD INDEX like_lookup_area ( like_lookup_area , like_visible ),
+	ADD INDEX notification_task ( like_notify_do, like_app (50), like_area (50), like_visible, like_notify_sent, like_notify_freq (50) );";
+$SQL[] = "UPDATE core_like SET like_lookup_area = MD5(CONCAT(like_app, ';', like_area, ';', like_member_id ) );";
+
+if( !$DB->checkForField( 'app_tab_groups', 'core_applications' ) )
+{
+	$SQL[] = "ALTER TABLE core_applications ADD app_website VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_update_check VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_global_caches VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_tab_groups TEXT NULL DEFAULT NULL AFTER app_hide_tab;";
+}
+	
+$SQL[] = "ALTER TABLE cache_store DROP cs_extra,
+	ADD cs_rebuild TINYINT( 1 ) NOT NULL DEFAULT '0';";
+	
+$SQL[] = "ALTER TABLE banfilters DROP ban_nocache, 
+	ADD ban_reason VARCHAR(255) NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE rc_reports_index ADD INDEX ( status );";
+
+$SQL[] = "ALTER TABLE rc_comments ADD approved TINYINT NOT NULL DEFAULT '1',
+	ADD edit_date INT NOT NULL DEFAULT '0',
+	ADD author_name VARCHAR( 255 ) NULL DEFAULT NULL ,
+	ADD ip_address VARCHAR( 46 ) NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE inline_notifications ADD notify_meta_app VARCHAR(50) NULL DEFAULT NULL,
+	ADD notify_meta_area VARCHAR(100) NULL DEFAULT NULL,
+	ADD notify_meta_id INT(10) DEFAULT 0,
+	ADD notify_meta_key VARCHAR(32) NULL DEFAULT NULL,
+	ADD KEY notify_meta_key (notify_meta_key);";
+
+$SQL[] = "ALTER TABLE ignored_users ADD ignore_signatures INT(1) NOT NULL DEFAULT '0',
+	ADD ignore_chats INT(1) NOT NULL DEFAULT '0';";
+
+$SQL[] = "ALTER TABLE mail_queue ADD mail_cc TEXT DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE permission_index CHANGE perm_2 perm_2 TEXT NULL DEFAULT NULL,
+	CHANGE perm_3 perm_3 TEXT NULL DEFAULT NULL,
+	CHANGE perm_4 perm_4 TEXT NULL DEFAULT NULL,
+	CHANGE perm_5 perm_5 TEXT NULL DEFAULT NULL,
+	CHANGE perm_6 perm_6 TEXT NULL DEFAULT NULL,
+	CHANGE perm_7 perm_7 TEXT NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE forums DROP quick_reply,
+	ADD tag_predefined TEXT NULL;";
+
+$SQL[] = "ALTER TABLE captcha CHANGE captcha_ipaddress captcha_ipaddress VARCHAR( 46 ) NOT NULL;";
+$SQL[] = "ALTER TABLE converge_local CHANGE converge_ip_address converge_ip_address VARCHAR( 46 ) NOT NULL;";
+$SQL[] = "ALTER TABLE api_log CHANGE api_log_ip api_log_ip VARCHAR( 46 ) NOT NULL;";
+$SQL[] = "ALTER TABLE api_users CHANGE api_user_ip api_user_ip VARCHAR( 46 ) NOT NULL;";
+$SQL[] = "ALTER TABLE core_sys_cp_sessions CHANGE session_ip_address session_ip_address VARCHAR( 46 ) NOT NULL;";
+
+$SQL[] = "ALTER TABLE sessions DROP location,
+	CHANGE ip_address ip_address VARCHAR( 46 ) NULL DEFAULT NULL,
+	CHANGE member_name member_name VARCHAR( 255 ) NULL DEFAULT NULL,
+	CHANGE search_thread_time search_thread_time INT( 10 ) NOT NULL DEFAULT '0';";
+
+$SQL[] = "ALTER TABLE upgrade_sessions CHANGE session_ip_address session_ip_address VARCHAR( 46 ) NOT NULL;";
+
+$SQL[] = "ALTER TABLE validating CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL DEFAULT '0';";
+
+$SQL[] = "ALTER TABLE core_sys_lang CHANGE lang_short lang_short varchar(32) NOT NULL;";
+
+$SQL[] = "CREATE TABLE core_editor_autosave (
+	eas_key			CHAR(32) NOT NULL,
+	eas_member_id	INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	eas_app			VARCHAR(50) NOT NULL DEFAULT '',
+	eas_section		VARCHAR(100) NOT NULL DEFAULT '',
+	eas_updated	INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	eas_content	MEDIUMTEXT,
+	UNIQUE KEY eas_key (eas_key),
+	KEY eas_member_lookup (eas_member_id, eas_app, eas_section),
+	KEY eas_updated (eas_updated)
+);";
+
+$SQL[] = "CREATE TABLE core_tags (
+	tag_id 				BIGINT(20) UNSIGNED NOT NULL auto_increment,
+	tag_aai_lookup		CHAR(32) NOT NULL DEFAULT '',
+	tag_aap_lookup		CHAR(32) NOT NULL DEFAULT '',
+	tag_meta_app		VARCHAR(200) NOT NULL default '',		
+	tag_meta_area		VARCHAR(200) NOT NULL default '',
+	tag_meta_id			INT(10) UNSIGNED NOT NULL DEFAULT 0,
+	tag_meta_parent_id	INT(10) UNSIGNED NOT NULL DEFAULT 0,
+	tag_member_id		INT(10) UNSIGNED NOT NULL DEFAULT 0,
+	tag_added			INT(10) UNSIGNED NOT NULL DEFAULT 0,
+	tag_prefix			INT(1)  UNSIGNED NOT NULL DEFAULT 0,
+	tag_text			VARCHAR(255),
+	PRIMARY KEY (tag_id),
+	KEY tag_aai_lookup (tag_aai_lookup),
+	KEY tag_app (tag_meta_app (100), tag_meta_area (100)),
+	KEY tag_member_id (tag_member_id),
+	KEY tag_aap_lookup (tag_aap_lookup, tag_text (200)),
+	KEY tag_added (tag_added ) );";
+
+$SQL[] = "CREATE TABLE core_tags_perms (
+	tag_perm_aai_lookup CHAR(32) NOT NULL DEFAULT '',
+	tag_perm_aap_lookup CHAR(32) NOT NULL DEFAULT '',
+	tag_perm_text VARCHAR(255) NOT NULL DEFAULT '',
+	tag_perm_visible INT(1) UNSIGNED NOT NULL DEFAULT 1,		
+	UNIQUE KEY tag_perm_aai_lookup (tag_perm_aai_lookup),
+	KEY tag_perm_aap_lookup( tag_perm_aap_lookup ),
+	KEY tag_lookup (tag_perm_text, tag_perm_visible) );";
+	
+$SQL[] = "CREATE TABLE core_tags_cache (
+	tag_cache_key	CHAR(32) NOT NULL DEFAULT '',
+	tag_cache_text	text,
+	tag_cache_date	INT(10) NOT NULL DEFAULT 0,
+	UNIQUE KEY (tag_cache_key ) );";
+
+$SQL[] = "CREATE TABLE cache_simple (
+	cache_id	   VARCHAR(32) NOT NULL DEFAULT '',
+	cache_perm_key VARCHAR(32) NOT NULL DEFAULT '',
+	cache_time	   INT(10) NOT NULL DEFAULT 0,
+	cache_data	   MEDIUMTEXT NOT NULL,
+	UNIQUE KEY lookup ( cache_id, cache_perm_key )
+);";
+
+$SQL[] = "CREATE TABLE core_incoming_email_log (
+  log_id int(11) NOT NULL AUTO_INCREMENT,
+  log_email varchar(255) DEFAULT NULL,
+  log_time int(10) DEFAULT NULL,
+  PRIMARY KEY (log_id)
+);";
+
+if ( ! $DB->checkForTable('core_geolocation_cache') )
+{
+	$SQL[] = "CREATE TABLE core_geolocation_cache (
+  geocache_key varchar(32) NOT NULL,
+  geocache_lat varchar(100) NOT NULL,
+  geocache_lon varchar(100) NOT NULL,
+  geocache_raw text,
+  geocache_country varchar(255) NOT NULL default '',
+  geocache_district varchar(255) NOT NULL default '',
+  geocache_district2 varchar(255) NOT NULL default '',
+  geocache_locality varchar(255) NOT NULL default '',
+  geocache_type varchar(255) NOT NULL default '',
+  geocache_engine varchar(255) NOT NULL default '',
+  geocache_added int(10) NOT NULL default '0',
+  geocache_short text,
+  PRIMARY KEY  (geocache_key),
+  KEY geo_lat_lon (geocache_lat,geocache_lon)
+);";
+}
+
+if ( ! $DB->checkForTable('skin_generator_sessions') )
+{
+/* Skin generator */
+	$SQL[] = "CREATE TABLE skin_generator_sessions (
+	sg_session_id	VARCHAR(32) NOT NULL DEFAULT '',
+	sg_member_id	INT(10) NOT NULL DEFAULT 0,
+	sg_skin_set_id	INT(10) NOT NULL DEFAULT 0,
+	sg_date_start	INT(10) NOT NULL DEFAULT 0,
+	sg_data			MEDIUMTEXT,
+	PRIMARY KEY (sg_session_id)
+);";
+}
+
+$SQL[] = "DROP TABLE search_results;";
+$SQL[] = "ALTER TABLE attachments_type DROP atype_photo;";
+$SQL[] = "ALTER TABLE groups DROP g_avatar_upload;";
+$SQL[] = "ALTER TABLE custom_bbcode DROP bbcode_strip_search;";
+
+$SQL[] = "ALTER TABLE emoticons ADD emo_position INT(5) NOT NULL DEFAULT '0';";
+
+$SQL[] = "UPDATE emoticons SET image=REPLACE(image, '.gif', '.png') WHERE emo_set='default' AND image IN ( 'angry.gif', 'biggrin.gif', 'blink.gif', 'blush.gif', 'cool.gif', 'dry.gif', 'excl.gif', 
+	'happy.gif', 'huh.gif', 'laugh.gif', 'mellow.gif', 'ohmy.gif', 'ph34r.gif', 'sad.gif', 'sleep.gif', 'smile.gif', 'tongue.gif', 'unsure.gif', 'wacko.gif', 'wink.gif', 'wub.gif' );";
+	
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_2.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_2.php
new file mode 100644
index 00000000..ed06047a
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_2.php
@@ -0,0 +1,36 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Change to potentially large tables */
+
+$SQL[] = "DROP TABLE email_logs;";
+	
+$SQL[] = "ALTER TABLE profile_ratings CHANGE rating_ip_address rating_ip_address VARCHAR( 46 ) NOT NULL;";
+
+$SQL[] = "ALTER TABLE topic_ratings CHANGE rating_ip_address rating_ip_address VARCHAR( 46 ) NOT NULL;";
+
+$SQL[] = "ALTER TABLE voters CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL;";
+
+$SQL[] = "ALTER TABLE core_hooks CHANGE hook_installed hook_installed INT( 10 ) NOT NULL DEFAULT '0',
+	CHANGE hook_updated hook_updated INT( 10 ) NOT NULL DEFAULT '0',
+	ADD hook_global_caches VARCHAR(255) NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE attachments ADD attach_parent_id INT NOT NULL DEFAULT '0',
+	ADD INDEX ( attach_parent_id, attach_rel_module );";
+	
+$SQL[] = "UPDATE attachments a SET a.attach_parent_id=CASE WHEN (select p.topic_id from {$PRE}posts p WHERE p.pid=a.attach_rel_id) IS NULL THEN 0 ELSE (select p.topic_id from {$PRE}posts p WHERE p.pid=a.attach_rel_id) END WHERE a.attach_rel_module='post';";
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_3.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_3.php
new file mode 100644
index 00000000..0c7e105a
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_3.php
@@ -0,0 +1,36 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Status update and messenger changes */
+
+$SQL[] = "ALTER TABLE member_status_updates ADD status_author_id INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	ADD status_author_ip VARCHAR(46) NOT NULL DEFAULT '',
+	ADD status_approved INT(1) NOT NULL DEFAULT 1,
+	ADD INDEX status_author_lookup (status_author_id, status_member_id, status_date),
+	ADD INDEX ( status_member_id, status_approved, status_date );";
+
+$SQL[] = "UPDATE member_status_updates SET status_author_id=status_member_id;";
+
+$SQL[] = "INSERT INTO member_status_updates (status_member_id, status_author_id, status_date, status_content, status_replies, status_last_ids, status_is_latest, status_is_locked, status_hash, status_imported, status_creator, status_author_ip, status_approved)
+	SELECT comment_for_member_id, comment_by_member_id, comment_date, comment_content, 0, '', 0, 0, MD5(comment_content), 0, '', comment_ip_address, comment_approved FROM {$PRE}profile_comments;";
+
+$SQL[] = "DROP TABLE profile_comments;";
+
+$SQL[] = "ALTER TABLE message_posts CHANGE msg_ip_address msg_ip_address VARCHAR( 46 ) NOT NULL DEFAULT '0';";
+
+$SQL[] = "UPDATE groups SET g_view_board=1 WHERE g_id=" . ipsRegistry::$settings['guest_group'] . ";";
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_4.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_4.php
new file mode 100644
index 00000000..0cec3994
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_4.php
@@ -0,0 +1,37 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Member and profile_portal table changes */
+
+$SQL[] = "ALTER TABLE members CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL,
+	DROP hide_email,
+	DROP email_full,
+	DROP view_prefs,
+	DROP view_avs,
+	DROP INDEX mgroup,
+	ADD INDEX mgroup ( member_group_id , member_id );";
+
+
+$SQL[] = "UPDATE profile_portal SET pp_setting_count_visitors=1 WHERE pp_setting_count_visitors > 1;";
+
+$SQL[] = "ALTER TABLE profile_portal CHANGE tc_last_sid_import tc_last_sid_import VARCHAR(50) NULL DEFAULT '0',
+	ADD pp_gravatar VARCHAR(255) NOT NULL DEFAULT '' AFTER pp_reputation_points,
+	ADD pp_photo_type VARCHAR(20) NOT NULL DEFAULT '' AFTER pp_gravatar,
+	CHANGE pp_setting_count_visitors pp_setting_count_visitors TINYINT(1) NOT NULL DEFAULT '0';";
+
+$SQL[] = "TRUNCATE TABLE content_cache_sigs;";
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_5.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_5.php
new file mode 100644
index 00000000..6080092e
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_5.php
@@ -0,0 +1,42 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Topic table changes */
+
+$SQL[] = "ALTER TABLE topics ADD tdelete_time INT NOT NULL DEFAULT 0,
+	ADD moved_on INT NOT NULL DEFAULT '0',
+	ADD INDEX approved (approved,tdelete_time),
+	ADD INDEX moved_redirects ( moved_on, moved_to, pinned ),
+	DROP INDEX starter_id,
+	ADD INDEX starter_id ( starter_id, forum_id, approved, start_date );";
+
+/* Populate 'like' from tracker */
+$SQL[] = "INSERT IGNORE INTO {$PRE}core_like
+				(like_id, like_lookup_id, like_lookup_area, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq, like_notify_sent, like_visible)
+				SELECT MD5(CONCAT('forums;forums;', forum_id, ';', member_id)), MD5(CONCAT('forums;forums;', forum_id)), MD5(CONCAT('forums;forums;', member_id)), 'forums', 'forums', forum_id, member_id, 0, start_date, CASE WHEN forum_track_type='none' THEN 0 ELSE 1 END, forum_track_type, last_sent, 1
+				FROM {$PRE}forum_tracker;";
+
+$SQL[] = "INSERT IGNORE INTO {$PRE}core_like
+				(like_id, like_lookup_id, like_lookup_area, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq, like_notify_sent, like_visible)
+				SELECT MD5(CONCAT('forums;topics;', topic_id, ';', member_id)), MD5(CONCAT('forums;topics;', topic_id)), MD5(CONCAT('forums;topics;', member_id)), 'forums', 'topics', topic_id, member_id, 0, start_date, CASE WHEN topic_track_type='none' THEN 0 ELSE 1 END, topic_track_type, last_sent, 1
+				FROM {$PRE}tracker;";
+
+$SQL[] = "DROP TABLE forum_tracker;";
+$SQL[] = "DROP TABLE tracker;";
+
+$SQL[] = "TRUNCATE TABLE content_cache_posts;";
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_6.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_6.php
new file mode 100644
index 00000000..b9f0b031
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_6.php
@@ -0,0 +1,34 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* Posts table */
+
+$SQL[] = "ALTER TABLE posts CHANGE author_name author_name VARCHAR( 255 ) NULL DEFAULT NULL,
+	CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL,
+	ADD post_bwoptions INT(10) UNSIGNED NOT NULL DEFAULT 0,
+	ADD pdelete_time INT NOT NULL DEFAULT 0,
+	ADD post_field_int INT(10) NOT NULL DEFAULT 0,
+	ADD post_field_t1 TEXT NULL DEFAULT NULL,
+	ADD post_field_t2 TEXT NULL DEFAULT NULL,
+	DROP post_parent,
+	DROP INDEX author_id,
+	ADD INDEX author_id ( author_id , post_date , queued ),
+	ADD INDEX queued (queued,pdelete_time);";
+
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_1.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_1.php
new file mode 100644
index 00000000..ed8786fc
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_1.php
@@ -0,0 +1,25 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* spider logs table */
+
+$TABLE	= 'spider_logs';
+$SQL[]	= "ALTER TABLE spider_logs CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL,
+	ADD request_addr TEXT NULL DEFAULT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_10.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_10.php
new file mode 100644
index 00000000..48b8b0cb
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_10.php
@@ -0,0 +1,23 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+
+$TABLE	= 'task_logs';
+$SQL[]	= "ALTER TABLE task_logs CHANGE log_ip log_ip VARCHAR( 46 ) NOT NULL DEFAULT '0';";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_2.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_2.php
new file mode 100644
index 00000000..9c0b850f
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_2.php
@@ -0,0 +1,24 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+/* warn logs table */
+
+$TABLE	= 'warn_logs';
+$SQL[]	= "ALTER TABLE warn_logs ADD INDEX ( wlog_mid, wlog_date );";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_3.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_3.php
new file mode 100644
index 00000000..0a6ae70e
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_3.php
@@ -0,0 +1,22 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+$TABLE	= 'admin_login_logs';
+$SQL[]	= "ALTER TABLE admin_login_logs CHANGE admin_ip_address admin_ip_address VARCHAR( 46 ) NOT NULL DEFAULT '0.0.0.0';";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_4.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_4.php
new file mode 100644
index 00000000..19d40fa6
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_4.php
@@ -0,0 +1,22 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+$TABLE	= 'admin_logs';
+$SQL[]	= "ALTER TABLE admin_logs CHANGE ip_address ip_address VARCHAR( 46 ) NULL DEFAULT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_5.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_5.php
new file mode 100644
index 00000000..e01ece0e
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_5.php
@@ -0,0 +1,23 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+
+$TABLE	= 'core_share_links_log';
+$SQL[]	= "ALTER TABLE core_share_links_log CHANGE log_ip_address log_ip_address VARCHAR( 46 ) NOT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_6.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_6.php
new file mode 100644
index 00000000..f8016d68
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_6.php
@@ -0,0 +1,22 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+$TABLE	= 'dnames_change';
+$SQL[]	= "ALTER TABLE dnames_change CHANGE dname_ip_address dname_ip_address VARCHAR( 46 ) NOT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_7.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_7.php
new file mode 100644
index 00000000..215fb4e2
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_7.php
@@ -0,0 +1,24 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+
+$TABLE	= 'error_logs';
+$SQL[]	= "ALTER TABLE error_logs CHANGE log_ip_address log_ip_address VARCHAR( 46 ) NULL DEFAULT NULL, 
+	CHANGE log_date log_date INT( 10 ) NOT NULL DEFAULT '0';";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_8.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_8.php
new file mode 100644
index 00000000..36ab8fd5
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_8.php
@@ -0,0 +1,24 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+
+$TABLE	= 'moderator_logs';
+$SQL[]	= "ALTER TABLE moderator_logs CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL DEFAULT '0', 
+	CHANGE member_name member_name VARCHAR( 255 ) NOT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_9.php b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_9.php
new file mode 100644
index 00000000..cf00e5aa
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/mysql_updates_logs_9.php
@@ -0,0 +1,23 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+
+$TABLE	= 'spam_service_log';
+$SQL[]	= "ALTER TABLE spam_service_log CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL;";
+
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/version_class.php b/upload/admin/applications/core/setup/versions/upg_32000/version_class.php
new file mode 100644
index 00000000..ae78801f
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/version_class.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Upgrade Class
+ *
+ * Class to add options and notices for IP.Board upgrade
+ * Last Updated: $Date: 2011-05-25 14:58:10 -0400 (Wed, 25 May 2011) $
+ * </pre>
+ * 
+ * @author		Matt Mecham
+ * @version		$Rev: 8891 $
+ * @since		3.0
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @link		http://hatynka.in
+ * @package		IP.Board
+ */ 
+
+class version_class_core_32000
+{
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Add pre-upgrade options: Form
+	 * 
+	 * @return	string	 HTML block
+	 */
+	public function preInstallOptionsForm()
+	{
+		$_wrapper	= "<ul>%s</ul>";
+		$_html		= '';
+		$posts		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'posts' ) );
+		
+		/* Got more than 100K posts? */
+		if( $posts['total'] > 100000 )
+		{
+$_html	.= <<<EOF
+		<li>
+			<input type='checkbox' name='manualPostsTableQuery' value='1' checked='checked' />
+			Вне�ти изменение в �труктуру таблицы �ообщений вручную?  Ваш форум �одержит более 100,000 �ообщений.  Мы <b>крайне рекомендуем</b> чтобы вы включили �ту опцию дл� предотвращени� возможных проблем при обновлении ма�тером обновлени�. В проце��е обновлени� ма�тер на необходимом шаге выведет запро�ы, которые вы должны будете выполнить напр�мую в базе данных, по�ле чего вам до�таточно будет обновить �траницу и проце�� будет продолжен.
+		</li>
+EOF;
+		}
+
+		if( $_html )
+		{
+			return sprintf( $_wrapper, $_html );
+		}
+		else
+		{
+			return '';
+		}
+	}
+	
+	/**
+	 * Add pre-upgrade options: Save
+	 *
+	 * Data will be saved in saved data array as: appOptions[ app ][ versionLong ] = ( key => value );
+	 * 
+	 * @return	array	 Key / value pairs to save
+	 */
+	public function preInstallOptionsSave()
+	{
+		return array( 'manualPostsTableQuery'	=> intval( $_REQUEST['manualPostsTableQuery'] )
+					);
+	}
+	
+	/**
+	 * Return any post-installation notices
+	 * 
+	 * @return	array	 Array of notices
+	 */
+	public function postInstallNotices()
+	{
+		return array();
+	}
+	
+	
+	/**
+	 * Return any pre-installation notices
+	 * 
+	 * @return	array	 Array of notices
+	 */
+	public function preInstallNotices()
+	{
+		$notices = array();
+		
+		$notices[] = "При обновлении будут удалены в�е XML �тили.";
+		
+		return $notices;
+		
+	}
+}
+	
diff --git a/upload/admin/applications/core/setup/versions/upg_32000/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_32000/version_upgrade.php
new file mode 100644
index 00000000..ca1fcde4
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32000/version_upgrade.php
@@ -0,0 +1,980 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	protected $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+	
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+
+		switch( $this->request['workact'] )
+		{
+			case 'sql':
+			case 'sql1':
+			default:
+				$this->upgradeSql(1);
+				break;
+			case 'sql2':
+				$this->upgradeSql(2);
+				break;
+			case 'sql3':
+				$this->upgradeSql(3);
+				break;
+			case 'sql4':
+				$this->upgradeSql(4);
+				break;
+			case 'sql5':
+				$this->upgradeSql(5);
+				break;
+			case 'sql6':
+				$this->upgradeSql(6);
+				break;
+				
+			case 'logs':
+			case 'logs1':
+				$this->upgradeLogs(1);
+				break;
+			case 'logs2':
+				$this->upgradeLogs(2);
+				break;
+			case 'logs3':
+				$this->upgradeLogs(3);
+				break;
+			case 'logs4':
+				$this->upgradeLogs(4);
+				break;
+			case 'logs5':
+				$this->upgradeLogs(5);
+				break;
+			case 'logs6':
+				$this->upgradeLogs(6);
+				break;
+			case 'logs7':
+				$this->upgradeLogs(7);
+				break;
+			case 'logs8':
+				$this->upgradeLogs(8);
+				break;
+			case 'logs9':
+				$this->upgradeLogs(9);
+				break;
+			case 'logs10':
+				$this->upgradeLogs(10);
+				break;
+				
+			case 'forums':
+				$this->fixArchiveForums();
+				break;
+
+			case 'loginmethods':
+				$this->fixLoginMethods();
+				break;
+
+			case 'oldhooks':
+				$this->removeOldHooks();
+				break;
+
+			case 'xmlskin':
+				$this->removeXMLSkin();
+				break;
+
+			case 'setdefaultskin':
+				$this->setDefaultSkin();
+				break;
+				
+			case 'hooks':
+				$this->convertHooks();
+				break;
+
+			case 'photos':
+				$this->convertPhotos();
+				break;
+		}
+		
+		/* Workact is set in the function, so if it has not been set, then we're done. The last function should unset it. */
+		if ( $this->request['workact'] )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	/**
+	 * Run SQL files
+	 * 
+	 * @param	int
+	 * @return	@e void
+	 */
+	public function upgradeSql( $id=1 )
+	{
+		$cnt		= 0;
+		$file		= '_updates_'.$id.'.php';
+		$output		= "";
+		$path		= IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_32000/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
+		$prefix		= $this->registry->dbFunctions()->getPrefix();
+		$sourceFile	= '';
+		$options	= IPSSetUp::getSavedData('custom_options');
+		$postTable	= $options['core'][32000]['manualPostsTableQuery'];
+		
+		if ( is_file( $path ) )
+		{
+			$SQL		= array();
+			
+			require( $path );/*noLibHook*/
+			
+			/* Set DB driver to return any errors */
+			$this->DB->return_die = 1;
+			
+			foreach( $SQL as $query )
+			{
+				$this->DB->allow_sub_select 	= 1;
+				$this->DB->error				= '';
+				
+				$query  = str_replace( "<%time%>", time(), $query );
+				
+				if ( $this->settings['mysql_tbl_type'] )
+				{
+					if ( preg_match( "/^create table(.+?)/i", $query ) )
+					{
+						$query = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $query );
+					}
+				}
+				
+				/* Need to tack on a prefix? */
+				if ( $prefix )
+				{
+					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
+				}
+				
+				if( IPSSetUp::getSavedData('man') OR ( $id == 6 AND $postTable ) )
+				{
+					$query = trim( $query );
+					
+					/* Ensure the last character is a semi-colon */
+					if ( substr( $query, -1 ) != ';' )
+					{
+						$query .= ';';
+					}
+					
+					$output .= $query . "\n\n";
+				}
+				else
+				{			
+					$this->DB->query( $query );
+					
+					if ( $this->DB->error )
+					{
+						$this->registry->output->addError( "<br />" . $query . "<br />" . $this->DB->error );
+					}
+					else
+					{
+						$cnt++;
+					}
+				}
+			}
+		
+			$this->registry->output->addMessage("{$cnt} запро�ов выполнено....");
+		}
+		
+		/* Next Page */
+		if ( $id < 6 )
+		{
+			$nextid = $id + 1;
+			$this->request['workact'] = 'sql' . $nextid;	
+		}
+		else
+		{
+			$this->request['workact'] = 'logs';	
+		}
+		
+		if ( $output )
+		{
+			/* Create source file */
+			if ( $this->registry->dbFunctions()->getDriverType() == 'mysql' )
+			{
+				$sourceFile = IPSSetUp::createSqlSourceFile( $output, '32000', $id );
+			}
+			
+			$this->_output = $this->registry->output->template()->upgrade_manual_queries( $output, $sourceFile );
+		}
+	}	
+	
+	/**
+	 * Upgrade log file tables
+	 * 
+	 * @param	int
+	 * @return	@e void
+	 */
+	public function upgradeLogs( $id=1 )
+	{
+		/* Verify posts alter table query has run */
+		if( $id == 1 )
+		{
+			if( !$this->DB->checkForField( 'post_bwoptions', 'posts' ) )
+			{
+				$this->_output	= ' ';
+				$this->registry->output->addError( "Вы должны выполнить запро� измен�ющий таблицу posts.  По�ле того как вы выполните �то, про�то обновите данную �траницу и обновление будет продолжено." );
+				return;
+			}
+		}
+
+		$cnt		= 0;
+		$file		= '_updates_logs_'.$id.'.php';
+		$output		= "";
+		$path		= IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_32000/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
+		$prefix		= $this->registry->dbFunctions()->getPrefix();
+		
+		if ( is_file( $path ) )
+		{
+			$SQL		= array();
+			$TABLE		= '';
+			
+			require( $path );/*noLibHook*/
+			
+			/* Set DB driver to return any errors */
+			$this->DB->return_die = 1;
+			
+			foreach( $SQL as $query )
+			{
+				$this->DB->allow_sub_select 	= 1;
+				$this->DB->error				= '';
+
+				/* Need to tack on a prefix? */
+				if ( $prefix )
+				{
+					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
+				}
+				
+				/* Chose to prune and run? */
+				if( $this->request['pruneAndRun'] )
+				{
+					$this->DB->delete( $TABLE );
+					
+					$man	= false;
+				}
+				else
+				{
+					/* Show alter table / prune option? */
+					$man	= IPSSetUp::getSavedData('man');
+					
+					if( $TABLE )
+					{
+						$count	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as logs', 'from' => $TABLE ) );
+						
+						if( $count['logs'] > 100000 )
+						{
+							$man	= true;
+						}
+					}
+				}
+
+				/* Show option to run manually or prune ? */
+				if( $man )
+				{
+					$query = trim( $query );
+					
+					/* Ensure the last character is a semi-colon */
+					if ( substr( $query, -1 ) != ';' )
+					{
+						$query .= ';';
+					}
+					
+					$output .= $query . "\n\n";
+				}
+				else
+				{			
+					$this->DB->query( $query );
+					
+					if ( $this->DB->error )
+					{
+						$this->registry->output->addError( "<br />" . $query . "<br />" . $this->DB->error );
+					}
+					else
+					{
+						$cnt++;
+					}
+				}
+			}
+		
+			$this->registry->output->addMessage("{$cnt} запро�ов выполнено....");
+		}
+		
+		/* Next Page */
+		if ( $id < 10 )
+		{
+			$nextid = $id + 1;
+			$this->request['workact'] = 'logs' . $nextid;	
+		}
+		else
+		{
+			$this->request['workact'] = 'forums';	
+		}
+		
+		if ( $output )
+		{
+			$this->_output = $this->registry->output->template()->upgrade_manual_queries_logs( $output, $id, $TABLE );
+		}
+	}
+	
+	/**
+	 * Convert archive forums to read-only forums
+	 * 
+	 * @return	@e void
+	 */
+	public function fixArchiveForums()
+	{
+		/* Update array for archive forums */
+		$_total		= 0;
+		$_update	= array(
+							'perm_3'	=> '',
+							'perm_4'	=> '',
+							'perm_5'	=> '',
+							);
+
+		/* Get 'archive' forums */
+		$this->DB->build( array( 'select' => '*', 'from' => 'forums', 'where' => 'status=0' ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$this->DB->update( 'permission_index', $_update, "app='forums' AND perm_type='forum' AND perm_type_id={$r['id']}" );
+			
+			$_total++;
+		}
+		
+		/* Now drop the status field in forums table */
+		$this->DB->dropField( 'forums', 'status' );
+
+		/* Message */
+		$this->registry->output->addMessage("{$_total} форумов �о �тату�ом 'архивный' переведено в форумы только дл� чтени�....");
+		
+		/* Next Page */
+		$this->request['workact'] = 'loginmethods';
+	}
+	
+	/**
+	 * Pull login method conf to DB
+	 * 
+	 * @return	@e void
+	 */
+	public function fixLoginMethods()
+	{
+		/* Init */
+		$_total	= 0;
+		
+		if( !defined('IPS_PATH_CUSTOM_LOGIN') )
+		{
+			define( 'IPS_PATH_CUSTOM_LOGIN' , IPS_ROOT_PATH . 'sources/loginauth' );
+		}
+		
+		/* Try to loop over all login methods to grab current configs */
+		try
+		{
+			foreach( new DirectoryIterator( IPS_PATH_CUSTOM_LOGIN ) as $file )
+			{
+				if ( $file->isDir() )
+				{
+					if( file_exists( $file->getPathname() . '/conf.php' ) )
+					{
+						$LOGIN_CONF = array();
+						
+						include( $file->getPathname() . '/conf.php' );/*noLibHook*/
+
+						if( is_array($LOGIN_CONF) AND count($LOGIN_CONF) )
+						{
+							$this->DB->update( 'login_methods', array( 'login_custom_config' => @serialize($LOGIN_CONF) ), "login_folder_name='" . $this->DB->addSlashes( $file->getFilename() ) . "'" );
+							
+							$_total++;
+						}
+					}
+				}
+			}
+		}
+		catch( Exception $e )
+		{
+		}
+
+		/* Message */
+		$this->registry->output->addMessage("{$_total} login method configs imported....");
+		
+		/* Next Page */
+		$this->request['workact'] = 'oldhooks';
+	}
+	
+	/**
+	 * Remove old hooks
+	 * 
+	 * @return	@e void
+	 */
+	public function removeOldHooks()
+	{
+		/* Hooks to remove */
+		$hooks		= array( 'watched_content', 'todays_top_posters', 'unread_notifications' );
+		$_hookIds	= array();
+		$_total		= 0;
+
+		/* Get hook records */
+		$this->DB->build( array( 'select' => 'hook_id', 'from' => 'core_hooks', 'where' => "hook_key IN('" . implode( "','", $hooks ) . "')" ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$_hookIds[]	= $r['hook_id'];
+		}
+		
+		/* Remove associated files */
+		if( count($_hookIds) )
+		{
+			$this->DB->build( array( 'select' => 'hook_file_stored', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id IN(' . implode( ',', $_hookIds ) . ')' ) );
+			$this->DB->execute();
+			
+			while( $r = $this->DB->fetch() )
+			{
+				@unlink( IPS_HOOKS_PATH . $r['hook_file_stored'] );
+			}
+			
+			/* Remove hook records */
+			$this->DB->delete( 'core_hooks_files', 'hook_hook_id IN(' . implode( ',', $_hookIds ) . ')' );
+			$this->DB->delete( 'core_hooks', 'hook_id IN(' . implode( ',', $_hookIds ) . ')' );
+			
+			$_total++;
+		}
+
+		/* Message */
+		$this->registry->output->addMessage("{$_total} у�таревших хуков удалено....");
+		
+		/* Next Page */
+		$this->request['workact'] = 'xmlskin';
+	}
+	
+	/**
+	 * Remove the XML skin
+	 * 
+	 * @return	@e void
+	 */
+	public function removeXMLSkin()
+	{
+		/* Get skin functions library */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$skinFunctions = new skinCaching( $this->registry );
+		
+		/* Uninstall any XML skins */
+		$this->DB->build( array( 'select' => 'set_id', 'from' => 'skin_collections', 'where' => "set_output_format='xml'" ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$skinFunctions->removeSet( $r['set_id'], true );
+		}
+		
+		/* Some extra cleanup */
+		$this->DB->delete( 'skin_css', "css_group='ipb_board_index'" );
+		$this->DB->delete( 'skin_css', "css_master_key='xmlskin'" );
+		$this->DB->delete( 'skin_css_previous', "p_css_master_key='xmlskin'" );
+		$this->DB->delete( 'skin_templates', "template_master_key='xmlskin'" );
+		$this->DB->delete( 'skin_templates_previous', "p_template_master_key='xmlskin'" );
+		
+		/* Message */
+		$this->registry->output->addMessage("У�таревшие XML �тили удалены...");
+		
+		/* Next Page */
+		$this->request['workact'] = 'setdefaultskin';
+	}
+
+	/**
+	 * Restore IPB default skin as default
+	 * 
+	 * @return	@e void
+	 */
+	public function setDefaultSkin()
+	{
+		/* Get skin functions library */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$skinFunctions = new skinCaching( $this->registry );
+		
+		/* Update members to use default skin */
+		$this->DB->update( 'members', array( 'skin' => 0 ) );
+
+		/* Update forums to use default skin */
+		$this->DB->update( 'forums', array( 'skin_id' => 0 ) );
+		
+		/* Reset any default skin(s) */
+		$this->DB->update( 'skin_collections', array( 'set_is_default' => 0 ) );
+		
+		/* Set IPB default skin as default */
+		$this->DB->update( 'skin_collections', array( 'set_is_default' => 1 ), "set_key='default'" );
+		
+		/* Verify we have a skin set as default */
+		$_check	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'skin_collections', 'where' => 'set_is_default=1' ) );
+		
+		if( $_check['total'] < 1 )
+		{
+			$this->DB->build( array( 'update' => 'skin_collections', 'set' => 'set_is_default=1', 'where' => "set_output_format='html'", 'limit' => array( 0, 1 ) ) );
+			$this->DB->execute();
+		}
+		
+		/* Check for any modifications in IPB default skin */
+		$_master			= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'skin_collections', 'where' => "set_key='default'" ) );
+		$_master['set_id']	= intval($_master['set_id']);
+		$_modifiedTemplates	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'skin_templates', 'where' => "template_set_id={$_master['set_id']} AND template_removable=1 OR template_user_edited=1" ) );
+		$_modifiedCSS		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'skin_css', 'where' => "css_set_id={$_master['set_id']} AND css_master_key=''" ) );
+		
+		if( $_modifiedTemplates['total'] OR $_modifiedCSS['total'] )
+		{
+			/* Create a new skin with IPB default as parent */
+			$curPos = $skinFunctions->fetchHighestSetPosition();
+			
+			$_master['set_key']			= 'default_modified';
+			$_master['set_parent_id']	= $_master['set_id'];
+			$_master['set_is_default']	= 0;
+			$_master['set_name']		= $_master['set_name'] . ' (Pre 3.2)';
+			$_master['set_order']		= (int)$curPos++;
+			unset($_master['set_id']);
+			
+			$this->DB->insert( 'skin_collections', $_master );
+			$set_id = $this->DB->getInsertId();
+			
+			$this->DB->update( 'skin_templates', array( 'template_set_id' => $set_id ), "template_set_id={$_master['set_parent_id']} AND template_removable=1 OR template_user_edited=1" );
+			$this->DB->update( 'skin_css', array( 'css_set_id' => $set_id ), "css_set_id={$_master['set_parent_id']} AND css_master_key=''" );
+			
+			$skinFunctions->rebuildSkinSetsCache();
+			$skinFunctions->rebuildTreeInformation( $set_id );
+			//$skinFunctions->flushSkinData();
+			
+			$skinFunctions->rebuildCSS( $set_id );
+			$skinFunctions->rebuildPHPTemplates( $set_id );
+			$skinFunctions->rebuildReplacementsCache( $set_id );
+		}
+
+		/* Message */
+		$this->registry->output->addMessage("Во��тановлен новый базовый �тиль....");
+		
+		/* Next Page */
+		$this->request['workact'] = 'hooks';
+	}
+	
+	/**
+	 * Convert stored hook data
+	 * 
+	 * @return	@e void
+	 */
+	public function convertHooks()
+	{
+		$_total	= 0;
+		
+		/* Grab all hooks */
+		$this->DB->build( array( 'select' => '*', 'from' => 'core_hooks' ) );
+		$outer	= $this->DB->execute();
+		
+		while( $hook = $this->DB->fetch($outer) )
+		{
+			$_extraData	= unserialize($hook['hook_extra_data']);
+			
+			/* Fix setting groups */
+			if( is_array($_extraData['settingGroups']) AND count($_extraData['settingGroups']) )
+			{
+				$_settingGroups	= array();
+				
+				foreach( $_extraData['settingGroups'] as $_group )
+				{
+					if( intval($_group) == $_group )
+					{
+						$_settingGroups[ $_group ]	= intval($_group);
+					}
+				}
+				
+				if( count($_settingGroups) )
+				{
+					$_extraData['settingGroups']	= array();
+
+					$this->DB->build( array( 'select' => 'conf_title_id, conf_title_keyword', 'from' => 'core_sys_settings_titles' ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						if( in_array( $r['conf_title_id'], $_settingGroups ) )
+						{
+							$_extraData['settingGroups'][]	= $r['conf_title_keyword'];
+						}
+					}
+				}
+			}
+			
+			/* Fix settings */
+			if( is_array($_extraData['settings']) AND count($_extraData['settings']) )
+			{
+				$_settings	= array();
+				
+				foreach( $_extraData['settings'] as $_id )
+				{
+					if( intval($_id) == $_id )
+					{
+						$_settings[ $_id ]	= intval($_id);
+					}
+				}
+				
+				if( count($_settings) )
+				{
+					$_extraData['settings']	= array();
+
+					$this->DB->build( array( 'select' => 'conf_id, conf_key', 'from' => 'core_sys_conf_settings' ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						if( in_array( $r['conf_id'], $_settings ) )
+						{
+							$_extraData['settings'][]	= $r['conf_key'];
+						}
+					}
+				}
+			}
+			
+			/* Fix tasks */
+			if( is_array($_extraData['tasks']) AND count($_extraData['tasks']) )
+			{
+				$_tasks	= array();
+				
+				foreach( $_extraData['tasks'] as $_id )
+				{
+					if( intval($_id) == $_id )
+					{
+						$_tasks[ $_id ]	= intval($_id);
+					}
+				}
+				
+				if( count($_tasks) )
+				{
+					$_extraData['tasks'] = array();
+					
+					$this->DB->build( array( 'select' => 'task_id, task_key', 'from' => 'task_manager' ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						if( in_array( $r['task_id'], $_tasks ) )
+						{
+							$_extraData['tasks'][]	= $r['task_key'];
+						}
+					}
+				}
+			}
+			
+			/* Fix help files */
+			if( is_array($_extraData['help']) AND count($_extraData['help']) )
+			{
+				$_help = array();
+				
+				foreach( $_extraData['help'] as $_id )
+				{
+					if( intval($_id) == $_id )
+					{
+						$_help[ $_id ]	= intval($_id);
+					}
+				}
+				
+				if( count($_help) )
+				{
+					$_extraData['help']	= array();
+					
+					$this->DB->build( array( 'select' => 'id, title', 'from' => 'faq' ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						if( in_array( $r['id'], $_help ) )
+						{
+							$_extraData['help'][]	= $r['title'];
+						}
+					}
+				}
+			}
+			
+			/* Fix modules */
+			if( is_array($_extraData['modules']) AND count($_extraData['modules']) )
+			{
+				$_modules	= array();
+				
+				foreach( $_extraData['modules'] as $_id )
+				{
+					if( intval($_id) == $_id )
+					{
+						$_modules[ $_id ]	= intval($_id);
+					}
+				}
+				
+				if( count($_modules) )
+				{
+					$_extraData['modules']	= array();
+
+					$this->DB->build( array( 'select' => 'sys_module_id, sys_module_admin, sys_module_application, sys_module_key', 'from' => 'core_sys_module' ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						if( in_array( $r['sys_module_id'], $_modules ) )
+						{
+							$_extraData['modules'][]	= ( $r['sys_module_admin'] ? 'admin' : 'public' ) . '-' . $r['sys_module_application'] . '-' . $r['sys_module_key'];
+						}
+					}
+				}
+			}
+
+			/* Fix templates */
+			if( is_array($_extraData['templates']) AND count($_extraData['templates']) )
+			{
+				$_newTemplates	= array();
+
+				foreach( $_extraData['templates'] as $file => $templates )
+				{
+					foreach( $templates as $template )
+					{
+						$_newTemplates[ $file ][ $template ]	= $template;
+					}
+				}
+				
+				$_extraData['templates']	= $_newTemplates;
+			}
+
+			/* Fix CSS */
+			if( is_array($_extraData['css']) AND count($_extraData['css']) )
+			{
+				$_css	= array();
+				
+				foreach( $_extraData['css'] as $_id )
+				{
+					if( intval($_id) == $_id )
+					{
+						$_css[ $_id ]	= intval($_id);
+					}
+				}
+				
+				if( count($_css) )
+				{
+					$_extraData['css']	= array();
+
+					$this->DB->build( array( 'select' => 'css_group', 'from' => 'skin_css', 'where' => "css_id IN(" . implode( ',', $_css ) . ")" ) );
+					$this->DB->execute();
+					
+					while( $r = $this->DB->fetch() )
+					{
+						$_extraData['css'][ $r['css_group'] ]	= $r['css_group'];
+					}
+				}
+			}
+			
+			$this->DB->update( 'core_hooks', array( 'hook_extra_data' => serialize( $_extraData ) ), 'hook_id=' . $hook['hook_id'] );
+			
+			$_total++;
+		}
+
+		/* Message */
+		$this->registry->output->addMessage("{$_total} хуков обновлено....");
+		
+		/* Next Page */
+		$this->request['workact'] = 'photos';
+	}
+
+	/**
+	 * Convert and rebuild photos
+	 * 
+	 * @param	int
+	 * @return	@e void
+	 */
+	public function convertPhotos()
+	{
+		/* Is this the first cycle? */
+		if( !$this->request['from'] )
+		{
+			$this->_output	= <<<EOF
+<h2>Конвертаци� фотографий</h2>
+<div class='message unspecified'>
+	IP.Board 3.2 теперь и�пользует только одно изображение дл� идентификации пользовател�. Вы должны выбрать, что именно (аватар или фотографи� из профил�) будет �охранено и и�пользовано новой вер�ией.
+	<br />
+	<select name='from'>
+		<option value='avatars'>И�пользвать аватары</option>
+		<option value='photos'>И�пользовать фотографии из профил�</option>
+	</select>
+	<br />
+	В проце��е конвертации также будут изменены размеры �уще�твующих изображений и �озданы новые превью. Вы можете отложить �тот проце��, отметив чекбок�. Проце�� пере�троени� изображений может быть запущен вами по�ле обновлени� в админ-центре форума.
+	<br /><br />
+	<input type='radio' name='skip' value='0' checked='checked' /> Пере�троить �ейча�<br />
+	<input type='radio' name='skip' value='1' /> Пропу�тить
+EOF;
+
+			return;
+		}
+
+		/* Our options */
+		$convertFrom	= $this->request['from'] == 'avatars' ? 'avatars' : 'photos';
+		$skipRebuild	= intval($this->request['skip']);
+
+		/* Init */
+		$st		= intval($this->request['st']);
+		$did	= 0;
+		$each	= 200;
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/member/photo.php' );/*noLibHook*/
+		$photo	= new classes_member_photo( $this->registry );
+
+		/* Loop over members */
+		$this->DB->build( array( 'select' => '*', 'from' => 'profile_portal', 'order' => 'pp_member_id ASC', 'limit' => array( $st, $each ) ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$did++;
+
+			$update	= array();
+			
+			if( $r['fb_photo'] )
+			{
+				$update['pp_photo_type']	= 'facebook';
+			}
+			else if( $r['tc_photo'] )
+			{
+				$update['pp_photo_type']	= 'twitter';
+			}
+			else
+			{
+				if( $convertFrom == 'avatars' )
+				{
+					if( $r['avatar_type'] == 'upload' AND $r['avatar_location'] )
+					{
+						$update['pp_photo_type']	= 'custom';
+						$update['pp_main_photo']	= $r['avatar_location'];
+						$_dims						= @getimagesize( $this->settings['upload_dir'] . '/' . $r['avatar_location'] );
+						$update['pp_main_width']	= $_dims[0] ? $_dims[0] : 1;
+						$update['pp_main_height']	= $_dims[1] ? $_dims[1] : 1;
+					}
+					else if( $r['avatar_type'] == 'gravatar' )
+					{
+						$update['pp_photo_type']	= 'gravatar';
+						$update['pp_gravatar']		= $r['avatar_location'];
+						
+						$md5Gravatar = md5( $update['pp_gravatar'] );
+						
+						$_url	= "http://www.gravatar.com";
+						
+						if( $this->registry->output->isHTTPS )
+						{
+							$_url	= "https://secure.gravatar.com";
+						}
+						
+						$update['pp_main_photo']	= $_url . "/avatar/" .$md5Gravatar . "?s=100";
+						$update['pp_main_width']	= 100;
+						$update['pp_main_height']	= 100;
+						$update['pp_thumb_photo']	= $_url . "/avatar/" .$md5Gravatar . "?s=100";
+						$update['pp_thumb_width']	= 100;
+						$update['pp_thumb_height']	= 100;
+					}
+				}
+				else
+				{
+					if( $r['pp_main_photo'] )
+					{
+						$update['pp_photo_type']	= 'custom';
+						$update['pp_main_photo']	= $r['pp_main_photo'];
+					}
+				}
+			}
+			
+			if( !$skipRebuild AND $update['pp_photo_type'] == 'custom' )
+			{
+				$info	= $photo->buildSizedPhotos( str_replace( 'upload:', '', $update['pp_main_photo'] ), $r['pp_member_id'], true );
+
+				$update['pp_main_width']	= intval( $info['final_width'] );
+				$update['pp_main_height']	= intval( $info['final_height'] );
+				$update['pp_thumb_photo']	= $info['t_final_location'] ? $info['t_final_location'] : $info['final_location'];
+				$update['pp_thumb_width']	= intval( $info['t_final_width'] );
+				$update['pp_thumb_height']	= intval( $info['t_final_height'] );
+			}
+			
+			if( count($update) )
+			{
+				$this->DB->update( 'profile_portal', $update, 'pp_member_id=' . $r['pp_member_id'] );
+			}
+		}
+
+		/* Show message and redirect */
+		if( $did > 0 )
+		{
+			$this->request['st']		= ( $st + $did );
+			$this->request['workact']	= 'photos';
+			
+			$message					= $skipRebuild ? "{$this->request['st']} фотографий �конвертировано ..." : "{$this->request['st']} фотографий �конвертировано и пере�троено...";
+			$this->registry->output->addMessage( $message );
+
+			/* Yes, we are being sneaky here.  Shhhhh */
+			$this->request['st']		= $this->request['st'] . '&amp;from=' . $this->request['from'] . '&amp;skip=' . $skipRebuild;
+		}
+		else
+		{
+			$this->request['st']		= 0;
+			$this->request['workact']	= '';
+			
+			$this->registry->output->addMessage( "В�е фотографии �конвертированы..." );
+		}
+
+		/* Next Page */
+		return;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32001/index.html b/upload/admin/applications/core/setup/versions/upg_32001/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32001/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32001/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32001/mysql_updates.php
new file mode 100644
index 00000000..75032822
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32001/mysql_updates.php
@@ -0,0 +1,42 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$PRE = trim(ipsRegistry::dbFunctions()->getPrefix());
+$DB  = ipsRegistry::DB();
+
+$SQL[] = "ALTER TABLE cache_simple CHANGE cache_data cache_data MEDIUMTEXT NULL DEFAULT NULL;";
+$SQL[] = "UPDATE groups SET g_photo_max_vars=REPLACE(g_photo_max_vars, ':150:150', ':200:300') WHERE g_photo_max_vars LIKE '%:150:150';";
+
+if ( ! $DB->checkForTable('skin_generator_sessions') )
+{
+	/* Skin generator */
+	$SQL[] = "CREATE TABLE skin_generator_sessions (
+	sg_session_id	VARCHAR(32) NOT NULL DEFAULT '',
+	sg_member_id	INT(10) NOT NULL DEFAULT 0,
+	sg_skin_set_id	INT(10) NOT NULL DEFAULT 0,
+	sg_date_start	INT(10) NOT NULL DEFAULT 0,
+	sg_data			MEDIUMTEXT,
+	PRIMARY KEY (sg_session_id)
+);";
+}
+
+$SQL[] = "ALTER TABLE skin_collections ADD set_by_skin_gen INT(1) NOT NULL DEFAULT 0, ADD set_skin_gen_data MEDIUMTEXT;";
+
+$SQL[] = "INSERT INTO core_share_links (share_title, share_key, share_enabled, share_position, share_canonical) VALUES('Google Plus One', 'googleplusone', 1, 2, 1);";
+$SQL[] = "DELETE FROM core_share_links WHERE share_key='buzz';";
+
+$SQL[] = "DROP TABLE IF EXISTS vkontakte_connect;";
+$SQL[] = "ALTER TABLE members ADD vk_token TEXT NULL;";
+$SQL[] = "ALTER TABLE profile_portal ADD vk_bwoptions INT UNSIGNED NOT NULL DEFAULT '0';";
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32001/version_upgrade.php b/upload/admin/applications/core/setup/versions/upg_32001/version_upgrade.php
new file mode 100644
index 00000000..b502e502
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32001/version_upgrade.php
@@ -0,0 +1,117 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	protected $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+	
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+
+		switch( $this->request['workact'] )
+		{
+			default:
+			case 'oldhooks':
+				$this->removeOldHooks();
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove old hooks
+	 * 
+	 * @return	@e void
+	 */
+	public function removeOldHooks()
+	{
+		/* Hooks to remove */
+		$hooks		= array( 'sharelinks', 'fb_like' );
+		$_hookIds	= array();
+		$_total		= 0;
+
+		/* Get hook records */
+		$this->DB->build( array( 'select' => 'hook_id', 'from' => 'core_hooks', 'where' => "hook_key IN('" . implode( "','", $hooks ) . "')" ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$_hookIds[]	= $r['hook_id'];
+		}
+		
+		/* Remove associated files */
+		if( count($_hookIds) )
+		{
+			$this->DB->build( array( 'select' => 'hook_file_stored', 'from' => 'core_hooks_files', 'where' => 'hook_hook_id IN(' . implode( ',', $_hookIds ) . ')' ) );
+			$this->DB->execute();
+			
+			while( $r = $this->DB->fetch() )
+			{
+				@unlink( IPS_HOOKS_PATH . $r['hook_file_stored'] );
+			}
+			
+			/* Remove hook records */
+			$this->DB->delete( 'core_hooks_files', 'hook_hook_id IN(' . implode( ',', $_hookIds ) . ')' );
+			$this->DB->delete( 'core_hooks', 'hook_id IN(' . implode( ',', $_hookIds ) . ')' );
+			
+			$_total++;
+		}
+
+		/* Message */
+		$this->registry->output->addMessage("{$_total} outdated hook(s) uninstalled....");
+		
+		/* Next Page */
+		$this->request['workact'] = '';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32002/index.html b/upload/admin/applications/core/setup/versions/upg_32002/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32002/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32002/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32002/mysql_updates.php
new file mode 100644
index 00000000..2f84c780
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32002/mysql_updates.php
@@ -0,0 +1,17 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key='topic_attach_no_per_row';";
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32003/index.html b/upload/admin/applications/core/setup/versions/upg_32003/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32003/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32003/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32003/mysql_updates.php
new file mode 100644
index 00000000..cb8e4394
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32003/mysql_updates.php
@@ -0,0 +1,17 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key='fbc_api_id';";
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32004/index.html b/upload/admin/applications/core/setup/versions/upg_32004/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32004/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32004/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32004/mysql_updates.php
new file mode 100644
index 00000000..119a92bc
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32004/mysql_updates.php
@@ -0,0 +1,22 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key IN( 'posting_allow_rte', 'spider_group' );";
+$SQL[] = "UPDATE core_sys_conf_settings SET conf_key='member_photo_gif_animate' WHERE conf_key='member_photo_gif_no_animate';";
+$SQL[] = "ALTER TABLE groups DROP g_email_friend, DROP g_email_limit;";
+$SQL[] = "ALTER TABLE reputation_cache ADD INDEX ( type , type_id ) ;";
+$SQL[] = "ALTER TABLE skin_collections CHANGE set_permissions set_permissions TEXT NULL;";
+$SQL[] = "ALTER TABLE member_status_updates DROP INDEX s_hash , ADD INDEX s_hash ( status_member_id , status_hash , status_date );";
+
diff --git a/upload/admin/applications/core/setup/versions/upg_32005/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32005/mysql_updates.php
new file mode 100644
index 00000000..31e7a68b
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32005/mysql_updates.php
@@ -0,0 +1,16 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key IN ('guests_img');";
\ No newline at end of file
diff --git a/upload/admin/applications/core/setup/versions/upg_32006/mysql_updates.php b/upload/admin/applications/core/setup/versions/upg_32006/mysql_updates.php
new file mode 100644
index 00000000..8b6986b1
--- /dev/null
+++ b/upload/admin/applications/core/setup/versions/upg_32006/mysql_updates.php
@@ -0,0 +1,25 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2009 Invision Power Services
+|   http://hatynka.in
+|   ========================================
+|   Web: http://hatynka.in
+|   Email: info@hatynka.in
+|   Licence Info: This is NULLED!
++---------------------------------------------------------------------------
+*/
+
+$SQL[] = "ALTER TABLE rss_import DROP rss_import_charset;";
+$SQL[] = "ALTER TABLE sessions ADD session_msg_id INT(10) NOT NULL DEFAULT 0;";
+
+$SQL[] = "CREATE TABLE core_inline_messages (
+inline_msg_id		INT(10) NOT NULL auto_increment,
+inline_msg_date		INT(10) NOT NULL DEFAULT 0,
+inline_msg_content	TEXT,
+PRIMARY KEY (inline_msg_id),
+KEY inline_msg_date (inline_msg_date)
+);";
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_adminlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_adminlogs.php
index ad9cb61e..8c4f1612 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_adminlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_adminlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin log skin file
- * Last Updated: $Date: 2010-06-24 05:36:05 -0400 (Thu, 24 Jun 2010) $
+ * Last Updated: $Date: 2011-07-26 04:00:17 -0400 (Tue, 26 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6570 $
+ * @version		$Revision: 9317 $
  */
  
-class cp_skin_adminlogs extends output
+class cp_skin_adminlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the splash screen for the logs
  *
- * @access	public
  * @return	string		HTML
  */
 public function logSplashScreen() {
@@ -44,20 +74,58 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['choose_splash']}</h3>
 	
-	<table width='100%' class='alternate_rows'>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=errorlogs'>{$this->lang->words['error_log_thelogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=adminlogs'>{$this->lang->words['alog_adminlogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=modlogs'>{$this->lang->words['mlog_modlogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=emaillogs'>{$this->lang->words['elog_emaillogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=emailerrorlogs'>{$this->lang->words['elog_email_err_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=spiderlogs'>{$this->lang->words['slog_spider_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=warnlogs'>{$this->lang->words['wlog_warn_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=api&amp;do=log_list'>{$this->lang->words['api_error_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=system&amp;section=taskmanager&amp;do=task_logs'>{$this->lang->words['sched_error_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=system&amp;section=loginlog&amp;do=show'>{$this->lang->words['al_error_logs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=spamlogs&amp;do=show'>{$this->lang->words['slog_spamlogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=mobilelogs&amp;do=show'>{$this->lang->words['mlog_mobilelogs']}</a></td></tr>
-		<tr><td><a href='{$this->settings['base_url']}&amp;module=logs&amp;section=sqlerror&amp;do=show'>{$this->lang->words['mlog_sqlerrors']}</a></td></tr>
+	<table class='ipsTable'>
+HTML;
+if ( $this->registry->class_permissions->checkPermission( 'errorlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=errorlogs'>{$this->lang->words['error_log_thelogs']}</a></td></tr>
+HTML;
+}
+if ( $this->registry->class_permissions->checkPermission( 'adminlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=adminlogs'>{$this->lang->words['alog_adminlogs']}</a></td></tr>
+HTML;
+}
+if ( $this->registry->class_permissions->checkPermission( 'modlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=modlogs'>{$this->lang->words['mlog_modlogs']}</a></td></tr>
+HTML;
+}
+if ( $this->registry->class_permissions->checkPermission( 'emailerrorlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=emailerrorlogs'>{$this->lang->words['elog_email_err_logs']}</a></td></tr>
+HTML;
+}
+if ( $this->registry->class_permissions->checkPermission( 'spiderlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=spiderlogs'>{$this->lang->words['slog_spider_logs']}</a></td></tr>
+HTML;
+}
+if ( $this->registry->class_permissions->checkPermission( 'warnlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=warnlogs'>{$this->lang->words['wlog_warn_logs']}</a></td></tr>
+HTML;
+}
+$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=tools&amp;section=api&amp;do=log_list'>{$this->lang->words['api_error_logs']}</a></td></tr>
+		<tr><td><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_logs'>{$this->lang->words['sched_error_logs']}</a></td></tr>
+		<tr><td><a href='{$this->settings['base_url']}module=system&amp;section=loginlog&amp;do=show'>{$this->lang->words['al_error_logs']}</a></td></tr>
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=spamlogs&amp;do=show'>{$this->lang->words['slog_spamlogs']}</a></td></tr>
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=mobilelogs&amp;do=show'>{$this->lang->words['mlog_mobilelogs']}</a></td></tr>
+HTML;
+if ( $this->registry->class_permissions->checkPermission( 'sqlerrorlogs_view' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr><td><a href='{$this->settings['base_url']}module=logs&amp;section=sqlerror&amp;do=show'>{$this->lang->words['mlog_sqlerrors']}</a></td></tr>
+HTML;
+}
+	$IPBHTML .= <<<HTML
 	</table>
 </div>
 HTML;
@@ -69,7 +137,6 @@ return $IPBHTML;
 /**
  * Show the splash screen for the admin logs
  *
- * @access	public
  * @param	array 		Rows
  * @param	array 		Admins
  * @return	string		HTML
@@ -100,7 +167,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['alog_last5']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='20%'>{$this->lang->words['alog_member']}</th>
 			<th width='40%'>{$this->lang->words['alog_performed']}</th>
@@ -115,8 +182,8 @@ if( count($rows) AND is_array($rows) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
-			<td><span style='color:{$row['color']}'>{$row['note']}</span></td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
+			<td>{$row['note']}</td>
 			<td>{$row['_time']}</td>
 			<td>{$row['ip_address']}</td>
 		</tr>
@@ -139,12 +206,12 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['alog_saved']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<th width='30%'>{$this->lang->words['alog_member']}</th>
-			<th width='20%'>{$this->lang->words['alog_performed']}</th>
+			<th width='20%'>{$this->lang->words['alog_member']}</th>
+			<th width='40%'>{$this->lang->words['alog_performed']}</th>
 			<th width='20%'>{$this->lang->words['alog_viewall']}</th>
-			<th width='30%'>{$this->lang->words['alog_removeall']}</th>
+			<th width='20%'>{$this->lang->words['alog_removeall']}</th>
 		</tr>
 HTML;
 
@@ -154,10 +221,10 @@ if( count($admins) AND is_array($admins) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
 			<td>{$row['act_count']}</td>
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;mid={$row['member_id']}'>{$this->lang->words['alog_view']}</a></td>
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove&amp;mid={$row['member_id']}'>{$this->lang->words['alog_remove']}</a></td>
+			<td><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=view&amp;mid={$row['member_id']}'>{$this->lang->words['alog_view']}</a></td>
+			<td><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;mid={$row['member_id']}'>{$this->lang->words['alog_remove']}</a></td>
 		</tr>
 HTML;
 	}
@@ -182,16 +249,16 @@ $IPBHTML .= <<<HTML
 
 	<div class="acp-box">
 		<h3>{$this->lang->words['alog_search']}</h3>
-		<ul class="acp-form alternate_rows">
-			<li>	
-				<label>{$this->lang->words['alog_searchfor']}</label>
-				{$form['search_for']}
-			</li>
-			<li>
-				<label>{$this->lang->words['alog_searchin']}</label>
-				{$form['search_in']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>	
+				<td class='field_title'><strong class='title'>{$this->lang->words['alog_searchfor']}</strong></td>
+				<td class='field_field'>{$form['search_for']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['alog_searchin']}</strong></td>
+				<td class='field_field'>{$form['search_in']}</td>
+			</tr>
+		</table>
 		<div class="acp-actionbar">
 			<input value="{$this->lang->words['alog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
 		</div>
@@ -207,12 +274,11 @@ return $IPBHTML;
 /**
  * SQL log RAPPER LIKE ICE T BUT MORE LIKE COFFEE
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
  */
-public function sqllogsWrapper( $rows ) {
+public function sqllogsWrapper( $rows, $latestError ) {
 
 $IPBHTML = "";
 //--starthtml--//
@@ -220,11 +286,30 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['sqllog_title']}</h2>
+	<ul class='context_menu'>
+		<li>
+			<a href="#" onclick="acp.confirmDelete( '{$this->settings['base_url']}{$this->form_code}&amp;do=delete_all');">
+				<img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='' />
+				{$this->lang->words['delete_all_sqllogs']}
+			</a>
+		</li>
+	</ul>
 </div>
+HTML;
+if ( $latestError )
+{
+	$IPBHTML .= <<<HTML
+	<div class='information-box'>
+		$latestError
+	</div>
+	<br />
+HTML;
+}
 
+$IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$this->lang->words['sqllog_title']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width="1%">&nbsp;</th>
 			<th width='49%'>{$this->lang->words['sqllog_name']}</th>
@@ -243,11 +328,11 @@ if( count($rows) AND is_array($rows) )
 		
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/page_red.png' /></td>
-			<td><a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;file={$row['name']}">{$row['name']}</a></td>
+			<td><img src='{$this->settings['skin_acp_url']}/images/icons/page_red.png' /></td>
+			<td><a href="{$this->settings['base_url']}{$this->form_code}&amp;do=view&amp;file={$row['name']}">{$row['name']}</a></td>
 			<td>{$mtime}</td>
 			<td>{$size}</td>
-			<td><a href="#" onclick="acp.confirmDelete( '{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove&amp;file={$row['name']}' )"><img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' /></a></td>
+			<td><a href="#" onclick="acp.confirmDelete( '{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;file={$row['name']}' )"><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' /></a></td>
 		</tr>
 HTML;
 	}
@@ -278,11 +363,8 @@ return $IPBHTML;
 /**
  * View a log
  *
- * @access	public
  */
-public function sqlLogsView( $file, $size, $content ) {
-
-$tailSize = IPSLib::strlenToBytes( strlen( $content ) );
+public function sqlLogsView( $file, $size, $content, $tailSize ) {
 
 /* Display a message? */
 if ( $tailSize < $size )
@@ -300,7 +382,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$file}</h3>
-	<div class='acp-row-off' style='padding:8px'>
+	<div style='padding:8px'>
 		<div style="width:100%; height:400px; background-color:white;font-family:monospace;white-space:pre;overflow:auto">{$content}</div>
 	</div>
 </div>
@@ -313,7 +395,6 @@ return $IPBHTML;
 /**
  * View an individual admin's logs
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
@@ -330,7 +411,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['alog_saved']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='20%'>{$this->lang->words['alog_member']}</th>
 			<th width='40%'>{$this->lang->words['alog_performed']}</th>
@@ -365,7 +446,8 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-		<div class="leftaction">{$pages}</div>
+		<div class="left">{$pages}</div>
+		<br class='clear' />
 	</div>
 </div>
 <br />
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_api.php b/upload/admin/applications/core/skin_cp/cp_skin_api.php
index 403dba6e..025c8698 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_api.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_api.php
@@ -2,39 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * API users skin file
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-05-11 12:57:46 -0400 (Wed, 11 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6925 $
+ * @version		$Revision: 8727 $
  */
  
-class cp_skin_api extends output
+class cp_skin_api
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * View api log details
  *
- * @access	public
  * @param	array 		Log record
  * @return	string		HTML
  */
@@ -45,41 +74,38 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <div class='acp-box'>
- <h3>{$this->lang->words['a_detail']}</h3>
-	<table class='alternate_rows'>
+	<h3>{$this->lang->words['a_detail']}</h3>
+	<table class='ipsTable'>
 		<tr>
-		<td>
-			<fieldset>
-				<legend>{$this->lang->words['a_basics']}</legend>
-				<table width='100%' cellpadding='4' cellspacing='0'>
-				 <tr>
-					<td width='30%'>{$this->lang->words['a_key']}</td>
-					<td width='70%'><strong>{$log['api_log_key']}</strong></td>
-				</tr>
-				<tr>
-					<td>{$this->lang->words['a_ip']}</td>
-					<td>{$log['api_log_ip']}</td>
-				</tr>
-				<tr>
-					<td>{$this->lang->words['a_time']}</td>
-					<td>{$log['_api_log_date']}</td>
-				</tr>
-				<tr>
-					<td>{$this->lang->words['a_success']}</td>
-					<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$log['_api_log_allowed']}' alt='-' /></td>
-				</tr>
-				</table>
-			</fieldset>
-		<br />
-		<fieldset>
-			<legend>{$this->lang->words['a_formdata']}</legend>
-			<div style='border:1px solid black;background-color:#FFF;padding:4px;white-space:pre;height:400px;overflow:auto'>
-				{$log['_api_log_query']}
-			</div>
-		</fieldset>
-	</td>
-</tr>
-</table>
+			<th colaspan='2'>{$this->lang->words['a_basics']}</th>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['a_key']}</strong></td>
+			<td class='field_field'>{$log['api_log_key']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['a_ip']}</strong></td>
+			<td class='field_field'>{$log['api_log_ip']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['a_time']}</strong></td>
+			<td class='field_field'>{$log['_api_log_date']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['a_success']}</strong></td>
+			<td class='field_field'><img src='{$this->settings['skin_acp_url']}/images/icons/{$log['_api_log_allowed']}' alt='-' /></td>
+		</tr>
+		<tr>
+			<th colaspan='2'>{$this->lang->words['a_formdata']}</th>
+		</tr>
+		<tr>
+			<td colspan='2' class='field_field'>
+				<div style='border:1px solid black;background-color:#FFF;padding:4px;white-space:pre;height:400px;overflow:auto'>
+					{$log['_api_log_query']}
+				</div>
+			</td>
+		</tr>
+	</table>
 </div>
 EOF;
 
@@ -90,7 +116,6 @@ return $IPBHTML;
 /**
  * View API login logs
  *
- * @access	public
  * @param	array 		Rows
  * @param	string 		Page links
  * @return	string		HTML
@@ -107,7 +132,7 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['a_requestlog']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</th>
 			<th width='30%'>{$this->lang->words['a_key']}</th>
@@ -130,7 +155,7 @@ $IPBHTML .= <<<EOF
 			<td><strong>{$r['api_log_key']}</strong></td>
 			<td><div class='desctext'>{$r['api_log_ip']}</div></td>
 			<td>{$r['_api_log_date']}</td>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_api_log_allowed']}' alt='-' /></td>
+			<td><img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_api_log_allowed']}' alt='-' /></td>
 			<td width='1' valign='middle'>
 				<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=log_view_detail&amp;api_log_id={$r['api_log_id']}', 800, 600)" title='{$this->lang->words['a_viewdetails']}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/index/view.png' alt='-' /></a>
 			</td>
@@ -140,7 +165,10 @@ EOF;
 }
 $IPBHTML .= <<<EOF
 	</table>
-	<div class='acp-actionbar'>{$links}</div>
+	<div class='acp-actionbar'>
+		<div class="left">{$links}</div>
+		<br class='clear' />
+	</div>
 </div>
 EOF;
 
@@ -151,7 +179,6 @@ return $IPBHTML;
 /**
  * List the api users
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -160,25 +187,37 @@ public function api_list( $api_users ) {
 $IPBHTML = "";
 //--starthtml--//
 
+if ( ! $this->settings['xmlrpc_enable'] ){
+	$status = "<a href='{$this->settings['base_url']}&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=xmlrpcapi'><span class='ipsBadge badge_red'>{$this->lang->words['perf_off']}</span></a>";
+} else {
+	$status = "<span class='ipsBadge badge_green'>{$this->lang->words['perf_on']}</span>";
+}
+
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['a_users']}</h2>
 	
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['a_create']}</a></li>
-	</ul>
+	<div class='ipsActionBar clearfix'>	
+		<ul>
+			<li class='right non_button' style='margin-left: 15px; float: right !important;'>
+				{$status} &nbsp;<strong>{$this->lang->words['xmlrpc_status']}</strong>&nbsp;&nbsp;
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['a_create']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['a_users']}</h3>
 	
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 	<tr>
-		<th width='1%'>&nbsp;</th>
 		<th width='40%'>{$this->lang->words['a_user']}</th>
 		<th width='30%'>{$this->lang->words['a_key']}</th>
 		<th width='20%'>{$this->lang->words['a_ip']}</th>
-		<th width='5%'>{$this->lang->words['a_options']}</th>
+		<th class='col_buttons'></th>
 	</tr>
 EOF;
 
@@ -187,16 +226,23 @@ if ( count( $api_users ) )
 	foreach( $api_users as $user )
 	{
 $IPBHTML .= <<<EOF
- <tr>
-	<td><img src='{$this->settings['skin_acp_url']}/images/folder_components/xmlrpc/api_user.png' class='ipb' /></td>
+ <tr class='ipsControlRow'>
 	<td><strong>{$user['api_user_name']}</strong>
 	<td><strong style='font-size:14px'>{$user['api_user_key']}</strong>
 	<td><strong>{$user['api_user_ip']}</strong>
-	<td width='5%'>
-		<img class='ipbmenu' id="menu_{$user['api_user_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-		<ul class='acp-menu' id='menu_{$user['api_user_id']}_menucontent'>
-			<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_edit&amp;api_user_id={$user['api_user_id']}'>{$this->lang->words['a_edit']}</a></li>
-			<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_remove&amp;api_user_id={$user['api_user_id']}");'>{$this->lang->words['a_remove']}</a></li>
+	<td class='col_buttons'>
+		<ul class='ipsControlStrip'>
+			<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_edit&amp;api_user_id={$user['api_user_id']}'>{$this->lang->words['a_edit']}</a></li>
+EOF;
+	
+	if ( $this->registry->class_permissions->checkPermission( 'api_remove' ) )
+	{
+		$IPBHTML .= <<<EOF
+			<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_remove&amp;api_user_id={$user['api_user_id']}");'>{$this->lang->words['a_remove']}</a></li>
+EOF;
+	}
+	
+	$IPBHTML .= <<<EOF
 		</ul>
 	</td>
 </tr>
@@ -206,8 +252,9 @@ EOF;
 else
 {
 $IPBHTML .= <<<EOF
- <tr>
-	<td colspan='5' align='center'>{$this->lang->words['a_nousers']}<br /><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_add'>{$this->lang->words['a_createone']}</a></td>
+<tr>
+	<td colspan='5' class='no_messages'>
+		{$this->lang->words['a_nousers']} <a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=api_add' class='mini_button'>{$this->lang->words['a_createone']}</a></td>
  </tr>
 EOF;
 }
@@ -224,7 +271,6 @@ return $IPBHTML;
 /**
  * Form to add/edit an API user
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Form title
  * @param	string		Action code
@@ -241,98 +287,117 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 
-<form id='mainform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;api_user_id={$api_user['api_user_id']}' method='post'>
+<form id='mainform' action='{$this->settings['base_url']}{$this->form_code}&amp;do={$formcode}&amp;api_user_id={$api_user['api_user_id']}' method='post'>
 	<div class='acp-box'>
- 		<h3>$title</h3>
+ 		<h3>{$title}</h3>
 		
- 		<ul class='acp-form alternate_rows'>
-			<li><label class='head'>{$this->lang->words['a_userbasics']}</label></li>
+ 		<table class='ipsTable double_pad'>
+			<tr>
+				<th colspan='2'>{$this->lang->words['a_userbasics']}</th>
+			</tr>
 EOF;
 if ( $type == 'add' )
 {
 $IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['a_userkey']}<span class='desctext'>{$this->lang->words['a_key_info']}</span></label>
-				<input type='hidden' name='api_user_key' value='{$form['_api_user_key']}' />
-				{$form['_api_user_key']}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['a_userkey']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='hidden' name='api_user_key' value='{$form['_api_user_key']}' />
+					<strong>{$form['_api_user_key']}</strong><br />
+					<span class='desctext'>{$this->lang->words['a_key_info']}</span>
+				</td>
+			</tr>
 EOF;
 }
 
 $IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['a_usertitle']}<span class='desctext'>{$this->lang->words['a_usertitle_info']}</span></label>
-				{$form['api_user_name']}
-			</li>
-			<li>
-				<label>{$this->lang->words['a_restrictip']}<span class='desctext'>{$this->lang->words['a_restrictip_info']}</span></label>
-				{$form['api_user_ip']}
-			</li>
-		</ul>
-	</div>
-	<br />
-	<div class='acp-box'>		
-		<ul id='tabstrip_apiperms' class='tab_bar no_title'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['a_usertitle']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['api_user_name']}<br />
+					<span class='desctext'>{$this->lang->words['a_usertitle_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['a_restrictip']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['api_user_ip']}<br />
+					<span class='desctext'>{$this->lang->words['a_restrictip_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<th colspan='2'>Select functions to which you grant access</th>
+			</tr>
+		</table>
 EOF;
 
 if ( is_array( $permissions ) AND count( $permissions ) )
 {
+	$IPBHTML .= <<<HTML
+		<div id='tabstrip_api' class='ipsTabBar with_left with_right'>
+			<span class='tab_left'>&laquo;</span>
+			<span class='tab_right'>&raquo;</span>
+			<ul>
+HTML;
+
 	foreach( $permissions as $key => $data )
 	{
 $IPBHTML .= <<<EOF
-			<li id='tabtab-{$key}'>{$data['title']}</li>
+				<li id='tab_{$key}'>{$data['title']}</li>
 EOF;
 	}
-}
 
-$IPBHTML .= <<<EOF
-		</ul>
-		
-		<script type="text/javascript" defer="defer">
-		//<![CDATA[
-			document.observe("dom:loaded",function() 
-			{
-			ipbAcpTabStrips.register('tabstrip_apiperms');
-			ipbAcpTabStrips.doToggle($('tabtab-ipb'));
-			});
-		 //]]>
-		</script>
+	$IPBHTML .= <<<EOF
+			</ul>
+		</div>
 		
+		<div id='tabstrip_api_content' class='ipsTabBar_content'>
 EOF;
 
-if ( is_array( $permissions ) AND count( $permissions ) )
-{
 	foreach( $permissions as $key => $data )
 	{
 $IPBHTML .= <<<EOF
-		<div id='tabpane-{$key}'>
-			<ul class='acp-form alternate_rows'>
+			<div id='tab_{$key}_content'>
+				<table class='ipsTable'>
 EOF;
 		if ( is_array( $permissions[ $key ]['form_perms'] ) AND ( $permissions[ $key ]['form_perms'] ) )
 		{
 			foreach( $permissions[ $key ]['form_perms'] as $perm => $_data )
 			{
 $IPBHTML .= <<<EOF
-				<li>
-					<label>{$this->lang->words['a_allowaccess']} {$_data['title']}</label>
-					{$_data['form']}
-				</li>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'><!--{$this->lang->words['a_allowaccess']} --></strong>
+						</td>
+						<td class='field_field'>
+							{$_data['form']} &nbsp;&nbsp;<strong>{$_data['title']}</strong>
+						</td>
+					</tr>
 EOF;
 			}
 		}
 $IPBHTML .= <<<EOF
-			</ul>
-		</div>
+				</table>
+			</div>
 EOF;
 	}
+
 }
 
 $IPBHTML .= <<<EOF
-
+		</div>
+		<script type='text/javascript'>
+			jQ("#tabstrip_api").ipsTabBar({tabWrap: "#tabstrip_api_content"});
+		</script>
+		</script>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value=' $button ' class='button primary' />
-			</div>
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_applications.php b/upload/admin/applications/core/skin_cp/cp_skin_applications.php
index 2ebd5ed2..ec11780b 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_applications.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_applications.php
@@ -2,38 +2,67 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Applications skin file
- * Last Updated: $Date: 2010-11-17 08:24:42 -0500 (Wed, 17 Nov 2010) $
+ * Last Updated: $Date: 2011-09-01 17:55:10 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 7205 $
+ * @version		$Revision: 9441 $
  */
  
-class cp_skin_applications extends output
+class cp_skin_applications
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 /**
  * Add/edit module form
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Form title
  * @param	string		Action code
@@ -58,47 +87,77 @@ $IPBHTML .= <<<EOF
 	<div class='acp-box'>
 	<h3>{$this->lang->words['a_modules']}</h3>
  
- 	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['a_modtype']}</label>
-			{$form['sys_module_admin']}
-		</li>
-		<li>
-			<label>{$this->lang->words['a_modtitle']}<span class='desctext'>{$this->lang->words['a_modtitle_info']}</span></label>
-			{$form['sys_module_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['a_moddesc']}<span class='desctext'>{$this->lang->words['a_moddesc_info']}</span></label>
-			{$form['sys_module_description']}
-		</li>
-		<li>
-			<label>{$this->lang->words['a_modkey']}<span class='desctext'>{$this->lang->words['a_modkey_info']}</span></label>
-			{$form['sys_module_key']}
-		</li>
-		<li>
-			<label>{$this->lang->words['a_modver']}<span class='desctext'>{$this->lang->words['a_modver_info']}</span></label>
-			{$form['sys_module_version']}
-		</li>
-		<li>
-			<label>{$this->lang->words['a_moden']}<span class='desctext'>{$this->lang->words['a_moden_info']}</span></label>
-			{$form['sys_module_visible']}
-		</li>
+ 	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_modtype']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_admin']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_modtitle']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_title']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_moddesc']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_description']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_modkey']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_key']}<br />
+				<span class='desctext'>{$this->lang->words['a_modkey_info']}</span>
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_modver']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_version']}<br />
+				<span class='desctext'>{$this->lang->words['a_modver_info']}</span>
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['a_moden']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['sys_module_visible']}<br />
+				<span class='desctext'>{$this->lang->words['a_moden_info']}</span>
+			</td>
+		</tr>
 EOF;
 if ( IN_DEV )
 {
 $IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['a_modprot']}<span class='desctext'>{$this->lang->words['a_modprot_info']}</span></label>
-				{$form['sys_module_protected']}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['a_modprot']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['sys_module_protected']}<br />
+					<span class='desctext'>{$this->lang->words['a_modprot_info']}</span>
+				</td>
+			</tr>
 EOF;
 }
 $IPBHTML .= <<<EOF
-		</ul>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value=' {$button} ' class='button primary' />
-			</div>
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
 	</div>
 </form>
@@ -111,7 +170,6 @@ return $IPBHTML;
 /**
  * List the modules
  *
- * @access	public
  * @param	array 		Modules
  * @param	array 		Application
  * @param	boolean		Is an admin module?
@@ -129,14 +187,14 @@ $IPBHTML .= <<<EOF
 	<h2>{$_type} {$this->lang->words['a_modules']} «{$application['app_title']}»</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_add&amp;app_id={$this->request['app_id']}&amp;sys_module_admin={$this->request['sys_module_admin']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/plugin_add.png' alt='' /> {$this->lang->words['add_new_mod_' . $_add_new_mod]}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_export&amp;app_id={$this->request['app_id']}&amp;sys_module_admin={$this->request['sys_module_admin']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/export.png' alt='' /> {$this->lang->words['export_mods_as_xml']}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_add&amp;app_id={$this->request['app_id']}&amp;sys_module_admin={$this->request['sys_module_admin']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/plugin_add.png' alt='' /> {$this->lang->words['add_new_mod_' . $_add_new_mod]}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_export&amp;app_id={$this->request['app_id']}&amp;sys_module_admin={$this->request['sys_module_admin']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['export_mods_as_xml']}</a></li>
 	</ul>
 </div>
 
 <div class='acp-box'>
 	<h3>{$application['app_title']} &gt; {$_type} {$this->lang->words['a_modules']}</h3>
- 	<ul id='sortable_handle' class='alternate_rows'>
+ 	<table class='ipsTable' id='module_list'>
 EOF;
 
 if( count( $modules ) )
@@ -144,17 +202,15 @@ if( count( $modules ) )
 	foreach( $modules as $module )
 	{
 		$IPBHTML .= <<<EOF
-		<li id='module_{$module['sys_module_id']}' class='isDraggable'>
-			<table width='100%' class='double_pad'>
-				<tr>
-					<td style='width: 3%' style='text-align: center;'>
-						<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-					</td>
-					<td style='width: 3%' style='text-align: center'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/plugin.png' alt='' />
-					</td>
-					<td style='width: 70%'>
-						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=module_edit&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin'><strong>{$module['sys_module_title']}</strong></a>
+		<tr id='modules_{$module['sys_module_id']}' class='ipsControlRow isDraggable'>
+			<td class='col_drag'>
+				<div class='draghandle'>&nbsp;</div>
+			</td>
+			<td style='width: 3%' style='text-align: center'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/plugin.png' alt='' />
+			</td>
+			<td style='width: 70%'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=module_edit&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin'><strong>{$module['sys_module_title']}</strong></a>
 EOF;
 					if( $module['sys_module_description'] )
 					{
@@ -164,90 +220,80 @@ EOF;
 					}
 			
 					$IPBHTML .= <<<EOF
-					</td>
-					<td style='width: 10%'>
-						{$module['sys_module_version']}
-					</td>
-					<td style='width: 10%'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$module['_sys_module_visible']}' />
-					</td>
-					<td style='width: 3%'>
-						<img class='ipbmenu' id="menu_{$module['sys_module_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-						<ul class='acp-menu' id='menu_{$module['sys_module_id']}_menucontent'>
+			</td>
+			<td style='width: 10%'>
+				{$module['sys_module_version']}
+			</td>
+			<td style='width: 10%'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/{$module['_sys_module_visible']}' />
+			</td>
+			<td class='col_buttons'>
 EOF;
 				if ( $module['sys_module_protected'] != 1 OR IN_DEV )
 				{
 					$IPBHTML .= <<<EOF
-							<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=module_edit&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin'>{$this->lang->words['a_editmod']}</a></li>
-							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=module_remove&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin");'>{$this->lang->words['a_removemod']}</a></li>
+					<ul class='ipsControlStrip'>
+						<li class='i_edit'>
+							<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=module_edit&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin' title='{$this->lang->words['a_editmod']}'>{$this->lang->words['a_editmod']}</a>
+						</li>
+						<li class='i_delete'>
+							<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=module_remove&amp;sys_module_id={$module['sys_module_id']}&amp;app_id={$application['app_id']}&amp;sys_module_admin=$sys_module_admin");' title='{$this->lang->words['a_removemod']}'>{$this->lang->words['a_removemod']}</a>
+						</li>
+					</ul>
 EOF;
 				}
 				else
 				{
 					$IPBHTML .= <<<EOF
-							<li class='icon view'>{$this->lang->words['a_protectedmod']}</li>
+							<!--<li class='icon view'>{$this->lang->words['a_protectedmod']}</li>-->
 EOF;
 				}
 
 				$IPBHTML .= <<<EOF
-						</ul>
-					</td>
-				</tr>
-			</table>
-		</li>
+				</ul>
+			</td>
+		</tr>
 EOF;
 	}
 }
 else 
 {
 	$IPBHTML .= <<<EOF
-		<li class='no_items'>
-			{$this->lang->words['a_nomods']}
-		</li>
+		<tr>
+			<td class='no_messages'>
+				{$this->lang->words['a_nomods']}
+			</td>
+		</tr>
 EOF;
 }
 
 $IPBHTML .= <<<EOF
- </ul>
+</table>
 </div>
 <br />
-<script type="text/javascript">
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { only: 'isDraggable', revert: true, format: 'module_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'modules' } )
-				};
-
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=module_manage_position&app_id={$application['app_id']}&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
+<script type='text/javascript'>
+	jQ("#module_list").ipsSortable('table', { 
+		url: "{$this->settings['base_url']}{$this->form_code_js}&do=module_manage_position&app_id={$application['app_id']}&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )
+	});
 </script>
+
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=module_import' enctype='multipart/form-data' method='post'>
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_importxml']}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['a_uploadxml']}<span class='desctext'>{$this->lang->words['a_uploadxml_info']}</span></label>
-				<input class='textinput' type='file' size='30' name='FILE_UPLOAD' />
-			</li>
-			<li>
-				<label>{$this->lang->words['a_filexml']}<span class='desctext'>{$this->lang->words['a_filexml_info']}</span></label>
-				<input class='textinput' type='text' size='30' name='file_location' />
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['a_uploadxml']}</strong></td>
+				<td class='field_field'><input class='textinput' type='file' size='30' name='FILE_UPLOAD' /><br /><span class='desctext'>{$this->lang->words['a_uploadxml_info']}</span></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['a_filexml']}</strong></td>
+				<td class='field_field'><input class='textinput' type='text' size='30' name='file_location' /><br /><span class='desctext'>{$this->lang->words['a_filexml_info']}</span></td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['a_import']}' />
-			</div>
+			<input type='submit' class='button primary' value='{$this->lang->words['a_import']}' />
 		</div>
 	</div>
 </form>
@@ -260,7 +306,6 @@ return $IPBHTML;
 /**
  * Form to add/edit an application
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Form title
  * @param	string		Action code
@@ -278,98 +323,165 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['a_apps']}</h2>
 </div>
 
-<form id='mainform' action='{$this->settings['base_url']}{$this->form_code}&amp;do={$formcode}&amp;app_id={$application['app_id']}' method='POST'>
+<form id='mainform' action='{$this->settings['base_url']}{$this->form_code}do={$formcode}&amp;app_id={$application['app_id']}' method='POST'>
 	<div class='acp-box'>
-		<h3>$title</h3>
-		<table class='form_table double_pad alternate_rows' cellspacing='0' cellpadding='0'>
-			<tr>
-		 		<td style='width: 40%;'>
-					<label>{$this->lang->words['a_apptitle']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_apptitle_info']}</span>
-				</td>
-		 		<td style='width: 60%'>
-		 			{$form['app_title']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appptitle']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_appptitle_info']}</span>
-				</td>
-		 		<td>
-		 			{$form['app_public_title']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appphide']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_appphide_desc']}</span>
-				</td>
-		 		<td>
-		 			{$form['app_hide_tab']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appdesc']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_appdesc_info']}</span>
-				</td>
-		 		<td>
-		 			{$form['app_description']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appauthor']}</label>
-				</td>
-		 		<td>
-		 			{$form['app_author']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appver']}</label>
-				</td>
-		 		<td>
-		 			{$form['app_version']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appdir']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_appdir_info']}</span>
-				</td>
-		 		<td>
-		 			{$form['app_directory']}
-		 		</td>
-		 	</tr>
-			<tr>
-		 		<td>
-					<label>{$this->lang->words['a_appen']}</label>
-				</td>
-		 		<td>
-		 			{$form['app_enabled']}
-		 		</td>
-		 	</tr>		
+		<h3>{$title}</h3>
+		
+		<div id='tabstrip_appform' class='ipsTabBar'>
+			<ul>
+				<li id='tab_AppInfo'>{$this->lang->words['app_tab_info']}</li>
+				<li id='tab_AppTab'>{$this->lang->words['app_tab_permissions']}</li>
+				<li id='tab_AppCaches'>{$this->lang->words['app_tab_gcaches']}</li>
+			</ul>
+		</div>
+		
+		<div id='tabstrip_appform_content' class='ipsTabBar_content'>
+		
+			<!-- INFORMATION -->
+			<div id='tab_AppInfo_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_apptitle']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_title']}
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appptitle']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_public_title']}<br />
+							<span class='desctext'>{$this->lang->words['a_appptitle_info']}</span>
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appen']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_enabled']}
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appdesc']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_description']}
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appauthor']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_author']}
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appver']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_version']}
+				 		</td>
+				 	</tr>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appdir']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_directory']}<br />
+							<span class='desctext'>{$this->lang->words['a_appdir_info']}</span>
+				 		</td>
+				 	</tr>
 EOF;
-if ( IN_DEV )
-{
-$IPBHTML .= <<<EOF
-			<tr>
-				<td>
-					<label>{$this->lang->words['a_appprot']}</label><br />
-					<span class='desctext'>{$this->lang->words['a_appprot_info']}</span>
-				</td>
-		 		<td>
-		 			{$form['app_protected']}
-		 		</td>
-			</tr>
+		if ( IN_DEV )
+		{
+			$IPBHTML .= <<<EOF
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appprot']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_protected']}<br />
+							<span class='desctext'>{$this->lang->words['a_appprot_info']}</span>
+				 		</td>
+					</tr>
 EOF;
-}
+		}
+
 $IPBHTML .= <<<EOF
-		</table>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hooksite']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['app_website']}<br />
+							<span class='desctext'>{$this->lang->words['a_hooksite_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookurl']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['app_update_check']}<br />
+							<span class='desctext'>{$this->lang->words['a_appurl_info']}</span>
+						</td>
+					</tr>
+				</table>
+			</div>
+			
+			<!-- TAB PERMISSIONS -->
+			<div id='tab_AppTab_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+				 		<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_appphide']}</strong>
+						</td>
+				 		<td class='field_field'>
+				 			{$form['app_hide_tab']}<br />
+							<span class='desctext'>{$this->lang->words['a_appphide_desc']}</span>
+				 		</td>
+				 	</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['app_form_tabgroups']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['app_tab_groups']}<br />
+							<span class='desctext'>{$this->lang->words['app_form_tabgroups_desc']}</span>
+						</td>
+					</tr>
+				</table>
+			</div>
+			
+			<!-- GLOBAL CACHES -->
+			<div id='tab_AppCaches_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_caches']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['app_global_caches']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_caches_desc']}</span>
+						</td>
+					</tr>
+				</table>
+			</div>
+			
+			<script type='text/javascript'>
+				jQ("#tabstrip_appform").ipsTabBar({ tabWrap: "#tabstrip_appform_content" });
+			</script>
+		</div>
+				 	
 		<div class='acp-actionbar'>
-				<input type='submit' value=' $button ' class='realbutton' />
+				<input type='submit' value='{$button}' class='realbutton' />
 		</div>
 	</div>
 </form>
@@ -384,86 +496,88 @@ return $IPBHTML;
 /**
  * List the applications
  *
- * @access	public
  * @param	array 		Application
  * @param	array 		Uninstalled applications
  * @return	string		HTML
  */
-public function applications_list( $applications, $uninstalled=array() ) {
+public function applications_list( $applications, $uninstalled=array(), $message=NULL ) {
 
 $IPBHTML = "";
 //--starthtml--//
 
-if( !IPSLib::appIsInstalled('nexus', false) OR !IPSLib::appIsInstalled('blog', false) OR !IPSLib::appIsInstalled('gallery', false) OR !IPSLib::appIsInstalled('ccs', false) OR !IPSLib::appIsInstalled('downloads', false) OR !$this->settings['ips_cp_purchase'] )
-{
+$canInstall = $this->registry->class_permissions->checkPermission( 'app_install' );
+
 	$IPBHTML .= <<<EOF
-<div class='section_title'>
- 	<h2>{$this->lang->words['purchase_additional']}</h2>
-</div>
-EOF;
-
-foreach( array('nexus','blog','gallery','ccs','downloads') as $__app )
-{
-	if( !IPSLib::appIsInstalled( $__app, false ) )
-	{
-		$_app_name = $__app == 'ccs' ? 'Content' : ucfirst($__app);
-		
-		$IPBHTML .= <<<EOF
-<div class='menulinkwrap'>
-	<img src='{$this->settings['skin_acp_url']}/images/icon_components/{$__app}/{$__app}.png' alt='' style='vertical-align:bottom' />
-	<a href='{$this->settings['base_url']}&amp;module=applications&amp;section={$__app}' style='text-decoration:none'>IP.{$_app_name}</a>
-</div>
-EOF;
-	}
-}
-	
-	if( !$this->settings['ips_cp_purchase'] )
-	{
-		$IPBHTML .= <<<EOF
-<div class='menulinkwrap'>
-	<img src='{$this->settings['skin_acp_url']}/_newimages/icons/package.png' alt='' style='vertical-align:bottom' />
-	<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=copyright' style='text-decoration:none'>Удаление копирайта</a>
-</div>
-EOF;
-	}
-}
-
-$IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['a_apps']}</h2>
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=application_add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/application_add.png' /> {$this->lang->words['a_addnewapp']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_recache_all'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_refresh.png' /> {$this->lang->words['recache_link']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=seoRebuild' title='{$this->lang->words['rebuild_furl_title']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_refresh.png' /> {$this->lang->words['rebuild_furl_link']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=application_export'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/page_white_code.png' /> {$this->lang->words['export_xml']}</a></li>
+	
+	<div class='ipsActionBar clearfix'>
+		<ul>
 EOF;
 
-if( $this->settings['search_method'] == 'sphinx' )
-{
-	$IPBHTML .= <<<EOF
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=build_sphinx'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['build_sphinx_link']}</a></li>
+	if( $canInstall )
+	{
+		$IPBHTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=application_add'><img src='{$this->settings['skin_acp_url']}/images/icons/application_add.png' alt='' /> {$this->lang->words['a_addnewapp']}</a>
+			</li>
 EOF;
+	}
+	
+	$IPBHTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=module_recache_all'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' /> {$this->lang->words['recache_link']}</a>
+			</li>
+EOF;
+				
+	if( $this->settings['search_method'] == 'sphinx' && $this->registry->class_permissions->checkPermission( 'build_sphinx' ) )
+	{
+		$IPBHTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='#' class='ipbmenu' id='sphinx_conf' title='{$this->lang->words['sphinx_menu_desc']}'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['sphinx_menu_title']} <img src='{$this->settings['skin_acp_url']}/images/useropts_arrow.png' /></a>
+				<ul class='ipbmenu_content' id='sphinx_conf_menucontent' style='display: none'>
+					<li>
+						<img src='{$this->settings['skin_acp_url']}/images/icons/page_white_code.png' alt='' /> <a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=sphinxBuildConf'>{$this->lang->words['sphinx_build_conf']}</a>
+					</li>
+					<li>
+						<img src='{$this->settings['skin_acp_url']}/images/icons/page_white_code.png' alt='' /> <a href="{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=sphinxBuildCron">{$this->lang->words['sphinx_build_cronjob']}</a>
+					</li>
+				</ul>
+			</li>
+EOF;
+	}
+
+	$IPBHTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=applications_overview&amp;checkUpdates=1'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['hook_check_updates']}</a>
+			</li>
+EOF;
+
+$IPBHTML .= <<<EOF
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=inDevExportApps'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_rotate_anticlockwise.png' alt='' /> {$this->lang->words['export_apps_xml']}</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=inDevExportAll'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['export_modules_xml']}</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=inDevRebuildAll'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['import_modules_xml']}</a>
+			</li>
+	</ul>
+</div>
+</div>
+
+EOF;
+
+if ( $message )
+{
+	$IPBHTML .= "<div class='information-box'>{$message}</div><br />";
 }
 
 $IPBHTML .= <<<EOF
-	</ul>
-</div>
-
-<div class='acp-box'>
+<div class='acp-box left' style='width: 69%'>
  	<h3>{$this->lang->words['a_installedapps']}</h3>
-	<div>
-		<table width='100%'>
-			<tr>
-				<td class='tablesubheader' style='width: 2%'>&nbsp;</td>
-				<td class='tablesubheader' style='width: 2%'>&nbsp;</td>
-				<td class='tablesubheader' style='width: 38%'>{$this->lang->words['a_app']}</td>
-				<td class='tablesubheader' style='width: 20%; text-align: center;'>{$this->lang->words['a_status']}</td>
-				<td class='tablesubheader' style='width: 18%; text-align: center;'>{$this->lang->words['a_version']}</td>
-				<td class='tablesubheader' style='width: 5%; text-align: center;'>{$this->lang->words['a_enabled']}</td>
-				<td class='tablesubheader' style='width: 5%; text-align: center;'>&nbsp;</td>
-			</tr>
-		</table>
-	</div>
+ 	
 EOF;
 
 $incrementer	= 1;
@@ -488,118 +602,118 @@ foreach( $applications as $local => $apps )
 		$app['titlePrefix'] = $this->lang->words['a_rootapps'];
 	}
 
-
-$IPBHTML .= <<<EOF
-	<ul id='handle_{$incrementer}' class='alternate_rows'>
-		<li class='tablesubsubheader'>
-			<strong>{$app['titlePrefix']}</strong>
-		</li>
-
+	$IPBHTML .= <<<EOF
+	<table class='ipsTable' id='app_table_{$local}'>
+		<tr>
+			<th class='col_drag'>&nbsp;</th>
+			<th colspan='4'>
+				<strong>{$app['titlePrefix']}</strong>
+			</th>
+		</tr>
 EOF;
 
-	foreach( $apps as $app )
-	{
-		$img = file_exists( IPSLib::getAppDir( $app['app_directory'] ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_acp_url'] . '/' . IPSLib::getAppFolder( $app['app_directory'] ) . '/' . $app['app_directory'] . '/skin_cp/appIcon.png' : "{$this->settings['skin_acp_url']}/_newimages/applications/{$app['app_directory']}.png";
-		
-$IPBHTML .= <<<EOF
-		<li class='isDraggable' style='width:100%;' id='app_{$app['app_id']}'>
-			<table width='100%' class='double_pad'>
-				<tr>
-					<td style='width: 2%'>
-						<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-					</td>
-					<td style='width: 2%'>
-						<img src='{$img}' />
-					</td>
-					<td style='width: 38%'>
-						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=1'><strong>{$app['titlePrefix']}{$app['app_title']}</strong></a>
-					</td>
-					<td style='width: 20%; text-align: center;'>
+foreach( $apps as $app )
+{
+	$img = is_file( IPSLib::getAppDir( $app['app_directory'] ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_acp_url'] . '/' . IPSLib::getAppFolder( $app['app_directory'] ) . '/' . $app['app_directory'] . '/skin_cp/appIcon.png' : "{$this->settings['skin_acp_url']}/images/applications/{$app['app_directory']}.png";
+	
+	$IPBHTML .= <<<EOF
+		<tr id='apps_{$app['app_id']}' class='ipsControlRow isDraggable'>
+			<td class='col_drag'>
+				<div class='draghandle'>&nbsp;</div>
+			</td>
+			<td style='width: 55%'>
+				<img src='{$img}' alt='' /> &nbsp;&nbsp;<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=1'><strong>{$app['titlePrefix']}{$app['app_title']}</strong></a>
+				<span class='desctext'>&nbsp;&nbsp;v{$app['_human_current']}</span>
+			</td>
+			<td style='text-align: center; width: 25%'>
 EOF;
 
-	if ( isset( $app['_long_version'] ) && $app['_long_version'] > $app['_long_current'] )
+/* Update available? */
+if( $app['app_update_available'][0] )
+{
+	$_update = "<span class='ipsBadge badge_purple'>{$this->lang->words['hook_update_available']}</span>";
+	
+	if ( !empty($app['app_update_available'][1]) )
 	{
-		$IPBHTML .= "<a href='{$this->settings['board_url']}/" . CP_DIRECTORY . "/upgrade/' style='color:green; font-weight: bold;'>{$this->lang->words['a_upgradeavail']}</a>";
+		$_update = "<a href='{$app['app_update_available'][1]}' target='_blank'>{$_update}</a>";
 	}
-	else
+	elseif( $app['app_website'] )
 	{
-		$IPBHTML .= "<span class='desctext'>{$this->lang->words['a_oh_kay']}</span>";
+		$_update = "<a href='{$app['app_website']}' target='_blank'>{$_update}</a>";
 	}
 	
-$IPBHTML .= <<<EOF
-					</td>
-					<td style='width: 18%; text-align: center;'>
-						{$app['_human_current']}
-					</td>
-					<td style='width: 5%; text-align: center;'>
-						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggle_app&amp;app_id={$app['app_id']}' title='{$this->lang->words['toggle_app_enabled']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$app['_app_enabled']}' alt='-' /></a>
-					</td>
-					<td style='width: 5%; text-align: center;'>
-						<img class='ipbmenu' id="menu_{$app['app_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-						<ul class='acp-menu' id='menu_{$app['app_id']}_menucontent'>
-EOF;
-	if ( $app['app_protected'] != 1 OR IN_DEV )
-	{
-$IPBHTML .= <<<EOF
-							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=application_remove_splash&amp;app_id={$app['app_id']}");'>{$this->lang->words['a_removeapp']}</a></li>
-							<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=application_edit&amp;app_id={$app['app_id']}'>{$this->lang->words['a_editapp']}</a></li>
-EOF;
-	}
+	$IPBHTML .= $_update;
+}
+elseif ( isset( $app['_long_version'] ) && $app['_long_version'] > $app['_long_current'] )
+{
+	$IPBHTML .= "<a href='{$this->settings['board_url']}/" . CP_DIRECTORY . "/upgrade/' class='ipsBadge badge_green'>{$this->lang->words['a_upgradeavail']}</a>";
+}
+else
+{
+	$IPBHTML .= "<span class='desctext'>{$this->lang->words['a_oh_kay']}</span>";
+}
 
-$IPBHTML .= <<<EOF
-							<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=1'>{$this->lang->words['a_manageadmin']}</a></li>
-							<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=0'>{$this->lang->words['a_managepublic']}</a></li>
-						</ul>
-   					</td>
-				</tr>
-			</table>
-		</li>
+	$IPBHTML .= <<<EOF
+			</td>
+			<td style='text-align: center; width: 5%'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggle_app&amp;app_id={$app['app_id']}' title='{$this->lang->words['toggle_app_enabled']}'><img src='{$this->settings['skin_acp_url']}/images/icons/{$app['_app_enabled']}' alt='-' /></a>
+			</td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=application_edit&amp;app_id={$app['app_id']}' title='{$this->lang->words['a_editapp_details']}'>{$this->lang->words['a_editapp_details']}</a>
+					</li>		
+EOF;
+
+if ( $app['app_protected'] != 1 OR IN_DEV )
+{
+	$IPBHTML .= <<<EOF
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=application_remove_splash&amp;app_id={$app['app_id']}");' title='{$this->lang->words['a_removeapp']}'>{$this->lang->words['a_removeapp']}</a>
+					</li>
+EOF;
+}
+
+	$IPBHTML .= <<<EOF
+					<li class='ipsControlStrip_more ipbmenu' id='menu_{$app['app_id']}'>
+						<a href='#'>{$this->lang->words['more']}</a>
+					</li>
+				</ul>
+				<ul class='acp-menu' id='menu_{$app['app_id']}_menucontent' style='display: none'>
+					<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=1'>{$this->lang->words['a_manageadmin']}</a></li>
+					<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=modules_overview&amp;app_id={$app['app_id']}&amp;sys_module_admin=0'>{$this->lang->words['a_managepublic']}</a></li>
+				</ul>
+			</td>
+		</tr>
 EOF;
 
 	}
 
 
 	$IPBHTML .= <<<EOF
-</ul>
-		<script type="text/javascript">
-		dropItLikeItsHot{$incrementer} = function( draggableObject, mouseObject )
-		{
-			var options = {
-							method : 'post',
-							parameters : Sortable.serialize( 'handle_{$incrementer}', { tag: 'li', name: 'apps' } )
-						};
-
-			new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=application_manage_position&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-			return false;
-		};
-
-		Sortable.create( 'handle_{$incrementer}', { only: 'isDraggable', revert: true, format: 'app_([0-9]+)', onUpdate: dropItLikeItsHot{$incrementer}, handle: 'draghandle' } );
-
-		</script>
+	</table>
+	<script type='text/javascript'>
+		jQ("#app_table_{$local}").ipsSortable( 'table', { 
+			url: "{$this->settings['base_url']}&{$this->form_code_js}&do=application_manage_position&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ),
+			serializeOptions: { key: 'apps[]' }
+		});
+	</script>
 EOF;
 
-		$incrementer++;
-
+	$incrementer++;
 }
+
 $IPBHTML .= <<<EOF
- <div class='tablefooter'>&nbsp;</div>
 </div>
+<div class='right' style='width: 30%'>
 EOF;
 
 if ( is_array( $uninstalled ) AND count( $uninstalled ) )
 {
 $IPBHTML .= <<<EOF
-<br />
-<div class='acp-box'>
-	<h3>{$this->lang->words['a_unapps']}</h3>
- 	<table width='100%'>
- 		<tr>
-   			<td width='1%' class='tablesubheader'>&nbsp;</td>
-   			<td width='44%' class='tablesubheader'>{$this->lang->words['a_app']}</td>
-   			<td width='30%' align='center' class='tablesubheader'>{$this->lang->words['a_author']}</td>
-   			<td width='15%' align='center' class='tablesubheader'>&nbsp;</td>
- 		</tr>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['a_unapps']}</h3>
+	 	<table class='ipsTable'>
 EOF;
 
 foreach( $uninstalled as $app )
@@ -608,62 +722,117 @@ foreach( $uninstalled as $app )
 	{
 		$app['titlePrefix'] = $this->lang->words['a__ips'];
 		$app['_location']   = 'ips';
+		$img = "<img src='{$this->settings['skin_acp_url']}/images/icons/medal.png' title='{$this->lang->words['a_officialapp']}' />";
 	}
 	else if ( strstr( $app['path'], 'applications_addon/other' ) )
 	{
-		$app['titlePrefix'] = $this->lang->words['a__thidparty'];
+		$app['titlePrefix'] = $this->lang->words['a__thirdparty'];
 		$app['_location']   = 'other';
+		$img = '';
 	}
 	else
 	{
 		$app['titlePrefix'] = $this->lang->words['a__rootapp'];
 		$app['_location']   = 'root';
+		$img = "<img src='{$this->settings['skin_acp_url']}/images/icons/medal.png' title='{$this->lang->words['a_officialapp']}' />";
 	}
 
 	if ( $app['okToGo'] )
 	{
 		$warning = '';
 		$install = <<<EOF
-		<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=setup&amp;do=install&amp;app_directory={$app['directory']}&amp;app_location={$app['_location']}' style='color:red'>{$this->lang->words['a_install']}</a>
+		<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=setup&amp;do=install&amp;app_directory={$app['directory']}&amp;app_location={$app['_location']}' class='ipsBadge badge_purple'>{$this->lang->words['a_install']}</a>
 EOF;
 	}
 	else
 	{
-		$install = $this->lang->words['a_cannotinstall'];
+		$install = "<span class='ipsBadge badge_grey'>{$this->lang->words['a_cannotinstall']}</span>";
 		$warning = <<<EOF
-				<div class='ok-box' style='margin-top:3px'>{$this->lang->words['a_cantinstall_info']}</div>
+				<br /><span style='color: red'>{$this->lang->words['a_cantinstall_info']}</span>
 EOF;
 	}
 
+$install = $canInstall ? $install : '';
+
 $IPBHTML .= <<<EOF
  <tr>
-   <td align='center' class='tablerow1'><img src='{$this->settings['skin_acp_url']}/images/folder_components/applications/app_row_uninstalled.png' /></td>
-   <td class='tablerow1'><strong>{$app['titlePrefix']}{$app['title']}</strong>{$warning}</td>
-   <td align='center' class='tablerow2'>{$app['author']}</td>
-   <td align='center' class='tablerow2'>{$install}</td>
+		<td style='width: 16px; padding: 10px 0 10px 6px; text-align: center; vertical-align: top'>
+			{$img}
+		</td>
+		<td>
+			<strong>{$app['title']}</strong><br />
+			<span class='desctext'>{$app['author']}</span>
+			{$warning}
+		</td>
+		<td style='width: 20%'>
+			{$install}
+		</td>
  </tr>
 EOF;
 }
 
 $IPBHTML .= <<<EOF
  </table>
- <div align='center' class='tablefooter'>&nbsp;</div>
 </div>
 EOF;
-
 }
 
-if ( IN_DEV )
+if( 
+	( !IPSLib::appIsInstalled('nexus', false) AND !isset($uninstalled['nexus']) ) OR 
+	( !IPSLib::appIsInstalled('blog', false) AND !isset($uninstalled['blog']) ) OR 
+	( !IPSLib::appIsInstalled('gallery', false) AND !isset($uninstalled['gallery']) ) OR 
+	( !IPSLib::appIsInstalled('ccs', false) AND !isset($uninstalled['ccs']) ) OR 
+	( !IPSLib::appIsInstalled('downloads', false) AND !isset($uninstalled['downloads']) ) OR 
+	!$this->settings['ips_cp_purchase'] )
 {
 	$IPBHTML .= <<<EOF
-<ul>
-<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=inDevExportAll'>In Dev: Эк�порт XML в�ех приложений</a></li>
-	<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=inDevRebuildAll'>In Dev: Импорт XML в�ех приложений</a></li>
-</ul>
+	<br />
+	<div class='acp-box'>
+		<table class='ipsTable'>
+EOF;
+	foreach( array('nexus','blog','gallery','ccs','downloads') as $__app )
+	{
+		if( !IPSLib::appIsInstalled( $__app, false ) AND !isset($uninstalled[ $__app ]) )
+		{
+			$_app_name = $__app == 'ccs' ? 'Content' : ucfirst($__app);
+
+			$IPBHTML .= <<<EOF
+			<tr>
+				<td style='width: 16px;'>
+					<img src='{$this->settings['skin_acp_url']}/images/icon_components/{$__app}.png' alt='' />
+				</td>
+				<td>
+					<a href='{$this->settings['base_url']}&amp;module=applications&amp;section={$__app}' style='text-decoration:none'>IP.{$_app_name}</a>
+				</td>
+			</tr>
+EOF;
+		}
+}
+
+	if( !$this->settings['ips_cp_purchase'] )
+{
+	$IPBHTML .= <<<EOF
+			<tr>
+				<td style='width: 16px'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/package.png' alt='' />
+				</td>
+				<td>
+					<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=copyright' style='text-decoration:none'>Copyright Removal</a>
+				</td>
+			</tr>
+EOF;
+	}
 	
+	$IPBHTML .= <<<EOF
+		</table>
+	</div>
 EOF;
 }
 
+$IPBHTML .= <<<EOF
+</div>
+EOF;
+
 //--endhtml--//
 return $IPBHTML;
 }
@@ -671,7 +840,6 @@ return $IPBHTML;
 /**
  * Splash screen to remove an application
  *
- * @access	public
  * @param	array 		Application
  * @return	string		HTML
  */
@@ -681,7 +849,7 @@ return <<<EOF
 <div class='acp-box'>
 	<h3>{$this->lang->words['a_remove']} {$data['app_title']} {$this->lang->words['a_app']}</h3>
 
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<td width='40%'>
 				<strong>{$this->lang->words['a_currentver']}:</strong>
@@ -710,7 +878,7 @@ return <<<EOF
 
 	 <div class='acp-actionbar'>
 	 	<div class='rightaction'>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/tick.png' alt='{$this->lang->words['a_continue']}' title='{$this->lang->words['a_continue']}' />
+			<img src='{$this->settings['skin_acp_url']}/images/icons/tick.png' alt='{$this->lang->words['a_continue']}' title='{$this->lang->words['a_continue']}' />
 			<strong><a href='{$this->settings['base_url']}{$this->form_code}&do=application_remove&app_id={$data['app_id']}'>{$this->lang->words['a_clickremove']}</a></strong>	 		
 	 	</div>
 	 </div>
@@ -721,271 +889,316 @@ EOF;
 /**
  * List the hooks
  *
- * @access	public
  * @param	array 		Installed hooks
  * @param	array 		Uninstalled hooks
+ * @param	integer		Number of enabled hooks with warnings
+ * @param	string|null	Message to display
  * @return	string		HTML
  */
-public function hooksOverview( $installedHooks, $uninstalledHooks )
+public function hooksOverview( $installedHooks, $uninstalledHooks, $warnings, $message )
 {
 $HTML = "";
 
-$leSigh = ( $this->request['checkUpdates'] ) ? ' class="closed"' : '';
-$leBigh = ( $this->request['checkUpdates'] ) ? 0 : 1;
-$cache  = $this->cache->getCache( 'disabledHooksCache' );
+/* Sort out some data */
+$warningBadge= "<span class='ipsBadge badge_red'>{$this->lang->words['hook_badge_warning']}</span>&nbsp;";
+$updateBadge = "<span class='ipsBadge badge_purple'>{$this->lang->words['hook_update_available']}</span>";
+$cache		 = $this->cache->getCache('disabledHooksCache');
+
 
 $HTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['a_hooks']}</h2>
 	
-	<ul class='context_menu'>
-EOF;
-
-if ( IN_DEV )
-{
-	$HTML .= <<<EOF
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=hooks&amp;do=removeDeadCaches' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' alt='' /> {$this->lang->words['remove_dead_caches']}</a></li>
-EOF;
-}
-
-
-$HTML .= <<<EOF
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=hooks&amp;do=create_hook' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['create_hook_link']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=hooks&amp;do=reimport_apps' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' /> {$this->lang->words['rebuild_app_hooks']}</a></li>
-		<li{$leSigh}><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=hooks_overview&amp;checkUpdates={$leBigh}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['hook_check_updates']}</a></li>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=create_hook'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['create_hook_link']}</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=reimport_apps'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['rebuild_app_hooks']}</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=hooks_overview&amp;checkUpdates=1'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['hook_check_updates']}</a>
+			</li>
 EOF;
 
 if( is_array( $cache ) && count( $cache ) )
 {
-$HTML .= <<<EOF
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=hooks&amp;do=reenable_all_hooks' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' /> {$this->lang->words['hook_reenable_all']}</a></li>
-EOF;
-}
-else
-{
-$HTML .= <<<EOF
-		<li><a href='{$this->settings['base_url']}&amp;module=applications&amp;section=hooks&amp;do=disable_all_hooks' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' /> {$this->lang->words['hook_disable_all']}</a></li>
-EOF;
-}
-$HTML .= <<<EOF
-	</ul>
-</div>
-
-<ul id='tabstrip_hookOverview' class='tab_bar no_title'>
-	<li id='tabtab-HookInstalled'>{$this->lang->words['a_installedhooks']}</li> 
-	<li id='tabtab-HookDisabled'>{$this->lang->words['a_disabledhook']}</li> 
-</ul> 
- 
-<script type="text/javascript"> 
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_hookOverview');
-ipbAcpTabStrips.doToggle($('tabtab-HookInstalled'));
-});
- //]]>
-</script>
-
-<div class='acp-box'>
-<div id='tabpane-HookInstalled'>
-	<div>
-		<table width='100%' class='double_pad'>
-			<tr>
-				<td class='tablesubheader' style='width: 2%'>&nbsp;</td>
-				<td class='tablesubheader' style='width: 25%'>{$this->lang->words['a_hook']}</td>
-				<td class='tablesubheader' style='width: 25%'>{$this->lang->words['a_author']}</td>
-				<td class='tablesubheader' style='width: 25%'>{$this->lang->words['a_lastupdated']}</td>
-				<td class='tablesubheader' style='width: 18%;'>{$this->lang->words['a_version']}</td>
-				<td class='tablesubheader' style='width: 5%; text-align: center;'>&nbsp;</td>
-			</tr>
-		</table>
-	</div>
-	<ul id='sortable_handle' class='alternate_rows'>
-EOF;
-
-if( count( $installedHooks ) )
-{
-	foreach( $installedHooks as $r )
-	{
-		$_se = ( isset( $r['hook_update_available'] ) AND $r['hook_update_available'] ) ? ' _amber' : '';
-		
-		$HTML .= <<<EOF
-			<li class='isDraggable{$_se}' style='width:100%;' id='hook_{$r['hook_id']}'>
-				<table width='100%' cellpadding='0' cellspacing='0' class='double_pad'>
-					<tr>
-						<td style='width: 2%'>
-							<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-						</td>
-						<td style='width: 25%'>
-EOF;
-						if( IN_DEV )
-						{
-							$HTML .= <<<EOF
-							<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_hook&amp;id={$r['hook_id']}'>
-								<strong>{$r['hook_name']}</strong>
-							</a>
-EOF;
-						}
-						else
-						{
-							$HTML .= <<<EOF
-							<strong>{$r['hook_name']}</strong>
-EOF;
-						}
-							
-						if( $r['hook_desc'] )
-						{
-							$HTML .= <<<EOF
-								<br /><span class='desctext'>{$r['hook_desc']}</span>
-EOF;
-						}
-						
-						$HTML .= <<<EOF
-						</td>
-						<td style='width: 25%'>
-							{$r['hook_author']}
-						</td>
-						<td style='width: 25%'>
-							{$r['_updated']}<br />
-							{$r['hook_update_available']}
-						</td>
-						<td style='width: 18%'>
-							{$r['hook_version_human']}
-						</td>
-						<td style='width: 5%'>
-							<img class='ipbmenu' id="menu_{$r['hook_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-							<ul class='acp-menu' id='menu_{$r['hook_id']}_menucontent'>
-								<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=view_details&amp;id={$r['hook_id']}'>{$this->lang->words['a_viewhook']}</a></li>
-								<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=disable_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_disablehook']}</a></li>
-								<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=uninstall_hook&amp;id={$r['hook_id']}");'>{$this->lang->words['a_uninstallhook']}</a></li>
-								<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_edithook']}</a></li>
-EOF;
-
-		if( IN_DEV )
-		{
-			$HTML .= <<<EOF
-								<li class='icon export'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=export_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_exporthook']}</a></li>
-EOF;
-		}
-
-		$HTML .= <<<EOF
-								<li class='icon manage'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=check_requirements&amp;id={$r['hook_id']}'>{$this->lang->words['a_checkhook']}</a></li>
-							</ul>
-						</td>
-					</tr>
-				</table>
+	$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=reenable_all_hooks'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['hook_reenable_all']}</a>
 			</li>
 EOF;
-	}
 }
 else
 {
 	$HTML .= <<<EOF
-	<li class='no_items'>{$this->lang->words['a_nohooks']}</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=disable_all_hooks'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['hook_disable_all']}</a>
+			</li>
 EOF;
 }
 
 $HTML .= <<<EOF
-	</ul>
-</div></div>
-
-
-<script type="text/javascript">
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'hooks' } )
-				};
-
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
-Sortable.create( 'sortable_handle', { only: 'isDraggable', revert: true, format: 'hook_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-
-</script>
-
-<div class="acp-box" style='clear:both;'>
-<div id='tabpane-HookDisabled'>
-	<table class='alternate_rows' width="100%">
-		<tr>
-			<th width="50%">{$this->lang->words['a_hook']}</th>
-			<th width="20%" style='text-align: center;'>{$this->lang->words['a_author']}</th>
-			<th width="10%" style='text-align: center;'>{$this->lang->words['a_uptodate']}</th>
-			<th width="10%" style='text-align: center;'>{$this->lang->words['a_version']}</th>
-			<th width="10%">&nbsp;</th>
-		</tr>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=removeDeadCaches'><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='' /> {$this->lang->words['remove_dead_caches']}</a>
+			</li>
+		</ul>
+	</div>
+</div>
 EOF;
 
-if( count( $uninstalledHooks ) )
+if ( $message )
 {
-	foreach( $uninstalledHooks as $r )
-	{
-		$HTML .= <<<EOF
+	$HTML .= "<div class='information-box'>{$message}</div><br />";
+}
+
+/* Got warnings? */
+if( $warnings > 0 )
+{
+	$_text = ( $warnings == 1 ) ? $this->lang->words['hook_overview_warning'] : sprintf( $this->lang->words['hook_overview_warnings'], $warnings );
+	
+	$HTML .= '<br />' . $this->registry->output->global_template->warning_box( $_text ) . '<br />';
+}
+
+$HTML .= <<<EOF
+<div class='acp-box'>
+	<h3>{$this->lang->words['a_hooks']}</h3>
+	
+	<div id='tabstrip_hookOverview' class='ipsTabBar with_left with_right'>
+		<span class='tab_left'>&laquo;</span>
+		<span class='tab_right'>&raquo;</span>
+		<ul>
+			<li id='tab_HookInstall'>{$this->lang->words['a_installhook']}</li>
+			<li id='tab_HookInstalled'>{$this->lang->words['a_installedhooks']}</li>
+			<li id='tab_HookDisabled'>{$this->lang->words['a_disabledhook']}</li>
+		</ul>
+	</div>
+	
+	<div id='tabstrip_hookOverview_content' class='ipsTabBar_content'>
+		
+		<div id='tab_HookInstall_content'>
+			<form action='{$this->settings['base_url']}{$this->form_code}do=install_hook' method='post' enctype='multipart/form-data'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookxml']}</strong>
+						</td>
+					    <td class='field_field'>
+							<input type='file' name='FILE_UPLOAD' />
+						</td>
+					</tr>
+				</table>
+				
+				<div class='acp-actionbar'>
+					<input type='submit' value='{$this->lang->words['a_install']}' class='button primary' />
+				</div>
+			</form>
+		</div>
+		
+		<div id='tab_HookInstalled_content'>
+			<table class='ipsTable' id='hooks_enabled'>
 				<tr>
-					<td width="35%">
-						<strong>{$r['hook_name']}</strong>
-						<div class='desctext'>{$r['hook_desc']}</div>
+					<th width='2%'>&nbsp;</th>
+					<th width='55%'>{$this->lang->words['a_hook']}</th>
+					<th width='20%'>{$this->lang->words['a_author']}</th>
+					<th width='20%'>{$this->lang->words['a_lastupdated']}</th>
+					<th class="col_buttons">&nbsp;</th>
+				</tr>
+EOF;
+		
+		if( count( $installedHooks ) )
+		{
+			foreach( $installedHooks as $r )
+			{
+				$HTML .= <<<EOF
+				<tr class='ipsControlRow isDraggable' id='hooks_{$r['hook_id']}'>
+					<td class='col_drag'>
+						<span class='draghandle'>&nbsp;</span>
 					</td>
-					<td align="center" width="20%">{$r['hook_author']}</td>
-					<td align="center" width="10%">{$r['hook_update_available']}</td>
-					<td align="center" width="15%">{$r['hook_version_human']}</td>
-					<td align="center" width="10%">
-						<img class='ipbmenu' id="menu_{$r['hook_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-						<ul class='acp-menu' id='menu_{$r['hook_id']}_menucontent'>
-							<li class='icon add'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=enable_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_enablehook']}</a></li>
-							<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=view_details&amp;id={$r['hook_id']}'>{$this->lang->words['a_viewhook']}</a></li>
-							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=uninstall_hook&amp;id={$r['hook_id']}");'>{$this->lang->words['a_uninstallhook']}</a></li>
+					<td>
+EOF;
+					
+					$_warning = count($r['_require_errors']) ? "<a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$r['hook_id']}'>{$warningBadge}</a>" : '';
+					
+					$r['hook_name'] = IN_DEV ? "<a href='{$this->settings['base_url']}{$this->form_code}do=edit_hook&amp;id={$r['hook_id']}'>{$r['hook_name']}</a>" : $r['hook_name'];
+					
+					$HTML .= "{$_warning}<strong><span class='larger_text'>{$r['hook_name']}</span></strong><span class='desctext'>&nbsp;&nbsp;v{$r['hook_version_human']}</span>";
+					
+					if( $r['hook_desc'] )
+					{
+						$HTML .= "<br /><span class='desctext'>{$r['hook_desc']}</span>";
+					}
+					
+					/* Update available? */
+					if( $r['hook_update_available'][0] )
+					{
+						$r['_updated'] = $updateBadge;
+						
+						if ( !empty($r['hook_update_available'][1]) )
+						{
+							$r['_updated'] = "<a href='{$r['hook_update_available'][1]}' target='_blank'>{$r['_updated']}</a>";
+						}
+						elseif( $r['hook_website'] )
+						{
+							$r['_updated'] = "<a href='{$r['hook_website']}' target='_blank'>{$r['_updated']}</a>";
+						}
+					}
+					
+					$HTML .= <<<EOF
+					</td>
+					<td>
+						{$r['hook_author']}
+					</td>
+					<td>
+						{$r['_updated']}
+					</td>
+					<td class='col_buttons'>
+						<ul class='ipsControlStrip'>
+							<li class='i_disable'><a href='{$this->settings['base_url']}{$this->form_code}do=disable_hook&amp;id={$r['hook_id']}' title='{$this->lang->words['a_disablehook']}'>{$this->lang->words['a_disablehook']}</a></li>
+							<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit_hook&amp;id={$r['hook_id']}' title='{$this->lang->words['a_edithook']}'>{$this->lang->words['a_edithook']}</a></li>
+							<li class='ipsControlStrip_more ipbmenu' id='menu_{$r['hook_id']}'><a href='#'>&nbsp;</a></li>
+						</ul>
+						
+						<ul class='acp-menu' id='menu_{$r['hook_id']}_menucontent' style='display: none'>
+							<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}do=view_details&amp;id={$r['hook_id']}'>{$this->lang->words['a_viewhook']}</a></li>
+							<li class='icon manage'><a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$r['hook_id']}'>{$this->lang->words['a_checkhook']}</a></li>
 EOF;
 
 	if( IN_DEV )
 	{
 		$HTML .= <<<EOF
-							<li class='icon export'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=export_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_exporthook']}</a></li>
+							<li class='icon export'><a href='{$this->settings['base_url']}{$this->form_code}do=export_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_exporthook']}</a></li>
 EOF;
 	}
 
 	$HTML .= <<<EOF
-							<li class='icon manage'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=check_requirements&amp;id={$r['hook_id']}'>{$this->lang->words['a_checkhook']}</a></li>
+							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=uninstall_hook&amp;id={$r['hook_id']}");'>{$this->lang->words['a_uninstallhook']}</a></li>
 						</ul>
 					</td>
 				</tr>
 EOF;
-	}
-}
-else
-{
-	$HTML .= <<<EOF
-	<tr>
-		<td colspan='7' class='no_items'>{$this->lang->words['a_nodishooks']}</td>
-	</tr>
+			}
+		}
+		else
+		{
+			$HTML .= <<<EOF
+				<tr>
+					<td colspan='6'>{$this->lang->words['a_nohooks']}</td>
+				</tr>
 EOF;
-}
-
-$HTML .= <<<EOF
-	</table>
-</div></div>
-<br />
-<form action='{$this->settings['base_url']}{$this->form_code}&amp;do=install_hook' method='post' enctype='multipart/form-data'>
-	<div class="acp-box">
-		<h3>{$this->lang->words['a_installhook']}</h3>
+		}
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['a_hookxml']}</label>
-				<input type='file' name='FILE_UPLOAD' />
-			</li>
-		<ul>
-		
-		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['a_install']}' class='button primary' />
-			</div>
+		$HTML .= <<<EOF
+			</table>
 		</div>
+		
+		<script type='text/javascript'>
+			jQ("#hooks_enabled").ipsSortable('table', { 
+				url: "{$this->settings['base_url']}{$this->form_code_js}do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ),
+				serializeOptions: { key: 'hooks[]' }
+			} );
+		</script>
+		
+		<div id='tab_HookDisabled_content'>
+			<table class='ipsTable'>
+				<tr>
+					<th width="55%">{$this->lang->words['a_hook']}</th>
+					<th width="20%">{$this->lang->words['a_author']}</th>
+					<th width="20%">{$this->lang->words['a_uptodate']}</th>
+					<th class="col_buttons">&nbsp;</th>
+				</tr>
+EOF;
+		
+		if( count( $uninstalledHooks ) )
+		{
+			foreach( $uninstalledHooks as $r )
+			{
+				$HTML .= <<<EOF
+				<tr class='ipsControlRow'>
+					<td>
+EOF;
+					
+					$_warning = count($r['_require_errors']) ? "<a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$r['hook_id']}'>{$warningBadge}</a>" : '';
+					
+					$r['hook_name'] = IN_DEV ? "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_hook&amp;id={$r['hook_id']}'>{$r['hook_name']}</a>" : $r['hook_name'];
+					
+					$HTML .= "{$_warning}<strong><span class='larger_text'>{$r['hook_name']}</span></strong><span class='desctext'>&nbsp;&nbsp;v{$r['hook_version_human']}</span>";
+					
+					if( $r['hook_desc'] )
+					{
+						$HTML .= <<<EOF
+							<br /><span class='desctext'>{$r['hook_desc']}</span>
+EOF;
+					}
+						
+					$HTML .= <<<EOF
+					</td>
+					<td>{$r['hook_author']}</td>
+EOF;
+					
+					/* Update available? */
+					if( $r['hook_update_available'][0] )
+					{
+						$r['_updated'] = $updateBadge;
+						
+						if ( !empty($r['hook_update_available'][1]) )
+						{
+							$r['_updated'] = "<a href='{$r['hook_update_available'][1]}' target='_blank'>{$r['_updated']}</a>";
+						}
+						elseif( $r['hook_website'] )
+						{
+							$r['_updated'] = "<a href='{$r['hook_website']}' target='_blank'>{$r['_updated']}</a>";
+						}
+					}
+					
+					$HTML .= <<<EOF
+					<td>{$r['_updated']}</td>
+					<td class='col_buttons'>
+						<ul class='ipsControlStrip'>
+							<li class='i_add'><a href='{$this->settings['base_url']}{$this->form_code}do=enable_hook&amp;id={$r['hook_id']}' title='{$this->lang->words['a_enablehook']}' >{$this->lang->words['a_enablehook']}</a></li>
+							<li class='i_cog'><a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$r['hook_id']}' title='{$this->lang->words['a_checkhook']}'>{$this->lang->words['a_checkhook']}</a></li>
+							<li class='ipsControlStrip_more ipbmenu' id='menu_{$r['hook_id']}'><a href='#'>&nbsp;</a></li>
+						</ul>
+						
+						<ul class='acp-menu' id='menu_{$r['hook_id']}_menucontent'>
+							<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_edithook']}</a></li>
+							<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}do=view_details&amp;id={$r['hook_id']}'>{$this->lang->words['a_viewhook']}</a></li>
+EOF;
+
+					if( IN_DEV )
+					{
+						$HTML .= <<<EOF
+							<li class='icon export'><a href='{$this->settings['base_url']}{$this->form_code}do=export_hook&amp;id={$r['hook_id']}'>{$this->lang->words['a_exporthook']}</a></li>
+EOF;
+					}
+					
+					$HTML .= <<<EOF
+							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=uninstall_hook&amp;id={$r['hook_id']}");'>{$this->lang->words['a_uninstallhook']}</a></li>
+						</ul>
+					</td>
+				</tr>
+EOF;
+			}
+		}
+		else
+		{
+			$HTML .= <<<EOF
+				<tr>
+					<td colspan='5' class='no_items'>{$this->lang->words['a_nodishooks']}</td>
+				</tr>
+EOF;
+		}
+		
+		$HTML .= <<<EOF
+			</table>
+		</div>
+		
+		<script type='text/javascript'>
+			jQ("#tabstrip_hookOverview").ipsTabBar({ tabWrap: "#tabstrip_hookOverview_content", defaultTab: "tab_HookInstalled" });
+		</script>
 	</div>
-</form>
+</div>
 EOF;
 
 return $HTML;
@@ -995,35 +1208,39 @@ return $HTML;
 /**
  * Form to add/edit a hook
  *
- * @access	public
+ * @param	array 		Form elements
  * @param	string		Action code
  * @param	array 		Hook data
  * @param	array 		Files in this hook
  * @return	string		HTML
  */
-public function hookForm( $action, $hookData, $files=array() )
+public function hookForm( $form, $action, $hookData, $files=array(), $requirements=array() )
 {
+
+/* Hook types */
+$hookTypes = array( array( 0, $this->lang->words['a_selectone'] ),
+				    array( 'commandHooks', $this->lang->words['a_aoverloader'] ),
+				    array( 'skinHooks', $this->lang->words['a_soverloader'] ),
+				    array( 'templateHooks', $this->lang->words['a_templatehook'] ),
+				    array( 'dataHooks', $this->lang->words['a_datahook'] ),
+				    array( 'libraryHooks', $this->lang->words['a_libraryhook'] )
+				   );
+
+/* Get apps to use for library hooks */
+$appsArray = array( array( 0, $this->lang->words['a_selectone'] ) );
+
+foreach( ipsRegistry::$applications as $dir => $appdata )
+{
+	$appsArray[] = array( $dir, $appdata['app_title'] );
+}
+
+$_removeInDev = IN_DEV ? '' : 'display: none;';
+
 $HTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['a_setuphook']}</h2>
 </div>
 
-<ul id='tabstrip_hookform' class='tab_bar no_title'>
-	<li id='tabtab-HookInfo'>{$this->lang->words['hook_form_info']}</li> 
-	<li id='tabtab-HookReq'>{$this->lang->words['a_hookrequirements']}</li> 
-	<li id='tabtab-HookFiles'>{$this->lang->words['a_hookfiles']}</li> 
-</ul> 
- 
-<script type="text/javascript"> 
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_hookform');
-ipbAcpTabStrips.doToggle($('tabtab-HookInfo'));
-});
- //]]>
-</script>
-
 <script type='text/javascript' src='{$this->settings['js_app_url']}ipb3Hooks.js'></script>
 <form name='theForm' method='post' action='{$this->settings['base_url']}{$this->form_code}' id='mainform'>
 	<input type='hidden' name='do' value='{$action}' />
@@ -1031,70 +1248,187 @@ ipbAcpTabStrips.doToggle($('tabtab-HookInfo'));
 	<input type='hidden' name='secure_key' value='{$this->member->form_hash}' />
 
 		<div class='acp-box'>
-			<div id='tabpane-HookInfo'> 
-				<ul class='acp-form alternate_rows'>
-					<li>
-						<label>{$this->lang->words['hook_form_title']}<span class='desctext'>{$this->lang->words['hook_form_title_help']}</span></label>
-						<input type='text' name='hook_name' value='{$hookData['hook_name']}' size='50' class='inputtext' />
-			 		</li>
+		<h3>{$this->lang->words['a_setuphook']}</h3>
 			 		
-					<li>
-						<label>{$this->lang->words['hook_form_desc']}<span class='desctext'>{$this->lang->words['hook_form_desc_help']}</span></label>
-						<input type='text' name='hook_desc' value='{$hookData['hook_desc']}' size='50' class='inputtext' />
-			 		</li>
+		<div id='tabstrip_hookform' class='ipsTabBar with_left with_right'>
+			<span class='tab_left'>&laquo;</span>
+			<span class='tab_right'>&raquo;</span>
+			<ul>
+				<li id='tab_HookInfo'>{$this->lang->words['hook_form_info']}</li>
+				<li id='tab_HookReq'>{$this->lang->words['a_hookrequirements']}</li>
+				<li id='tab_HookCaches'>{$this->lang->words['hook_globalcaches']}</li>
+				<li id='tab_HookFiles'>{$this->lang->words['a_hookfiles']}</li>
+			</ul>
+		</div>
 	
-					<li>
-						<label>{$this->lang->words['hook_form_key']}<span class='desctext'>{$this->lang->words['hook_form_key_desc']}</span></label>
-						<input type='text' name='hook_key' value='{$hookData['hook_key']}' size='50' class='inputtext' />
-			 		</li>
+		<div id='tabstrip_hookform_content' class='ipsTabBar_content'>
 	
-					<li>
-						<label>{$this->lang->words['hook_form_version']}<span class='desctext'>{$this->lang->words['hook_form_version_help']}</span></label>
-						<input type='text' name='hook_version_human' value='{$hookData['hook_version_human']}' size='50' class='inputtext' />
-			 		</li>
-			 		
-					<li>
-						<label>{$this->lang->words['a_hookversion']}<span class='desctext'>{$this->lang->words['a_hookversion_info']}</span></label>
-						<input type='text' name='hook_version_long' value='{$hookData['hook_version_long']}' size='50' class='inputtext' />
-			 		</li>
-			 		
-					<li>
-						<label>{$this->lang->words['a_hookauthor']}<span class='desctext'>{$this->lang->words['a_hookauthor_info']}</span></label>
-						<input type='text' name='hook_author' value='{$hookData['hook_author']}' size='50' class='inputtext' />
-			 		</li>			 		
-	
-					<li>
-						<label>{$this->lang->words['a_hookemail']}<span class='desctext'>{$this->lang->words['a_hookemail_info']}</span></label>
-						<input type='text' name='hook_email' value='{$hookData['hook_email']}' size='50' class='inputtext' />
-			 		</li>
-			 		
-					<li>
-						<label>{$this->lang->words['a_hooksite']}<span class='desctext'>{$this->lang->words['a_hooksite_info']}</span></label>
-						<input type='text' name='hook_website' value='{$hookData['hook_website']}' size='50' class='inputtext' />
-			 		</li>			 		
-	
-					<li>
-						<label>{$this->lang->words['a_hookurl']}<span class='desctext'>{$this->lang->words['a_hookurl_info']}</span></label>
-						<input type='text' name='hook_update_check' value='{$hookData['hook_update_check']}' size='50' class='inputtext' />
-			 		</li>
-		 		</ul>
+			<!-- INFORMATION -->
+			<div id='tab_HookInfo_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<th colspan='2'>&nbsp;</th>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_title']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_name']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_title_help']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_desc']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_desc']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_desc_help']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_key']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_key']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_key_desc']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_version']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_version_human']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_version_help']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookversion']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_version_long']}<br />
+							<span class='desctext'>{$this->lang->words['a_hookversion_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookauthor']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_author']}<br />
+							<span class='desctext'>{$this->lang->words['a_hookauthor_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookemail']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_email']}<br />
+							<span class='desctext'>{$this->lang->words['a_hookemail_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hooksite']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_website']}<br />
+							<span class='desctext'>{$this->lang->words['a_hooksite_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_hookurl']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_update_check']}<br />
+							<span class='desctext'>{$this->lang->words['a_hookurl_info']}</span>
+						</td>
+					</tr>
+		 		</table>
 			</div>
-			<div id='tabpane-HookReq'>
-				<ul class='acp-form alternate_rows'>
-					<li>
-						<label>{$this->lang->words['a_boardversion']}<span class='desctext'>{$this->lang->words['a_enterzero']}  {$this->lang->words['a_longversionid']}</span></label>
-						{$this->lang->words['a_min']}: <input type='text' name='hook_ipb_version_min' value='{$hookData['hook_requirements']['hook_ipb_version_min']}' size='50' class='inputtext' /><br />
-						{$this->lang->words['a_max']}: <input type='text' name='hook_ipb_version_max' value='{$hookData['hook_requirements']['hook_ipb_version_max']}' size='50' class='inputtext' />
-			 		</li>
-					<li>
-						<label>{$this->lang->words['a_phpver']}<span class='desctext'>{$this->lang->words['a_enterzero']}  {$this->lang->words['a_phpminmax']}</span></label>
-						{$this->lang->words['a_min']}: <input type='text' name='hook_php_version_min' value='{$hookData['hook_requirements']['hook_php_version_min']}' size='50' class='inputtext' /><br />
-						{$this->lang->words['a_max']}: <input type='text' name='hook_php_version_max' value='{$hookData['hook_requirements']['hook_php_version_max']}' size='50' class='inputtext' />
-			 		</li>
-		 		</ul>
+			 		
+			<!-- REQUIREMENTS -->
+			<div id='tab_HookReq_content'>
+				<table class='ipsTable double_pad' id='RequirementsContainer'>
+					<tr>
+						<th colspan='2'>{$this->lang->words['a_phpver']}</th>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['a_phpver']}</strong>
+						</td>
+						<td class='field_field'>
+							{$this->lang->words['a_min']}: {$form['hook_php_version_min']}<br /><br />
+							{$this->lang->words['a_max']}: {$form['hook_php_version_max']}<br />
+							<span class='desctext'>{$this->lang->words['a_enterzero']}  {$this->lang->words['a_phpminmax']}</span>
+						</td>
+					</tr>
+EOF;
+			 		
+			$latestReqIndex = 0;
+	
+			if( is_array( $requirements ) && count( $requirements ) )
+			{
+				foreach( $requirements as $appKey => $require )
+				{
+					$_requiredApp = $this->registry->output->formDropdown( "requireApp[{$latestReqIndex}]", $appsArray, $appKey );/*noLibHook*/
+			 		
+					$HTML .= <<<EOF
+					<tr id='requirementTitleRow_{$latestReqIndex}'>
+						<th colspan='2'>{$this->lang->words['hook_require_apptitle']}<span class='ipsBadge badge_red right' style='cursor: pointer;{$_removeInDev}' onclick='removeRequirement({$latestReqIndex})'>{$this->lang->words['hook_remove_requirement']}</span></th>
+					</tr>
+					<tr id='requirementRow_{$latestReqIndex}'>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_require_apptitle']}</strong>
+						</td>
+						<td class='field_field'>
+							{$_requiredApp}<br /><br />
+							{$this->lang->words['a_min']}: <input type='text' name='minVersion[{$latestReqIndex}]' value='{$require['min_version']}' size='20' class='input_text' /><br /><br />
+							{$this->lang->words['a_max']}: <input type='text' name='maxVersion[{$latestReqIndex}]' value='{$require['max_version']}' size='20' class='input_text' /><br />
+							<span class='desctext'>{$this->lang->words['a_enterzero']}  {$this->lang->words['a_longversionid']}</span>
+						</td>
+					</tr>
+EOF;
+	
+					$latestReqIndex++;
+				}
+			}
+			
+			$HTML .= <<<EOF
+		 		</table>
+		 		
+		 		<div class='acp-actionbar'>
+					<input type='button' value='{$this->lang->words['hook_require_addanother']}' onclick='addAnotherRequirement()' class='button primary' />
 			</div>
-			<div id='tabpane-HookFiles'>
-			<div id='fileTableContainer'>
+			</div>
+			
+			<!-- GLOBAL CACHES -->
+			<div id='tab_HookCaches_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<th colspan='2'>{$this->lang->words['hook_globalcaches']}</th>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['hook_form_caches']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['hook_global_caches']}<br />
+							<span class='desctext'>{$this->lang->words['hook_form_caches_desc']}</span>
+						</td>
+					</tr>
+		 		</table>
+			</div>
+			
+			<!-- FILES -->
+			<div id='tab_HookFiles_content'>
+				<table class='ipsTable double_pad' id='fileTableContainer'>
 EOF;
 
 			$latestIndex	= 0;
@@ -1103,185 +1437,268 @@ EOF;
 			{
 				foreach( $files as $index => $file )
 				{
-					$hook_type_command		= $file['hook_type']	== 'commandHooks' ? " selected='selected'" : '';
-					$hook_type_skin			= $file['hook_type']	== 'skinHooks' ? " selected='selected'" : '';
-					$hook_type_template		= $file['hook_type']	== 'templateHooks' ? " selected='selected'" : '';
-					$hook_type_data			= $file['hook_type']	== 'dataHooks' ? " selected='selected'" : '';
-					$hook_type_library		= $file['hook_type']	== 'libraryHooks' ? " selected='selected'" : '';
-
 					$latestIndex			= $index > $latestIndex ? $index : $latestIndex;
 
 					$HTML .= <<<EOF
-			<div class='tablesubheader'>{$this->lang->words['a_hookfile']} #{$index}</div>
-			<ul class='acp-form alternate_rows' id='fileTable_{$index}'>
+					<tr id='fileRow_{$index}'>
+						<td style='margin:0px; padding:0px;'>
+							<table class='ipsTable' id='fileTable_{$index}'>
+								<tr>
+									<th colspan='2'>{$this->lang->words['a_hookfile']} #{$index}<span class='ipsBadge badge_red right' style='cursor: pointer;{$_removeInDev}' onclick='removeFile({$index})'>{$this->lang->words['hook_remove_file']}</span></th>
+								</tr>
 EOF;
 
 if( IN_DEV )
 {
 $HTML .= <<<EOF
-				<li>
-					<label>{$this->lang->words['a_filenamedir']}</label>
-					<input type='text' name='file[{$index}]' value='{$file['hook_file_real']}' size='50' class='inputtext' />
-				</li>
-
-				<li>
-					<label>{$this->lang->words['a_fileclassname']}</label>
-					<input type='text' name='hook_classname[{$index}]' value='{$file['hook_classname']}' size='50' class='inputtext' />
-				</li>
+								<tr>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_filenamedir']}</strong>
+									</td>
+									<td class='field_field'>
+										<input type='text' name='file[{$index}]' value='{$file['hook_file_real']}' size='50' class='input_text' />
+									</td>
+								</tr>
+								<tr>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_fileclassname']}</strong>
+									</td>
+									<td class='field_field'>
+										<input type='text' name='hook_classname[{$index}]' value='{$file['hook_classname']}' size='50' class='input_text' />
+									</td>
+								</tr>
 EOF;
 }
 else
 {
 $HTML .= <<<EOF
+								<tr style='display:none'>
+									<td colspan='2'>
 	<input type='hidden' name='file[{$index}]' value='{$file['hook_file_real']}' />
 	<input type='hidden' name='hook_classname[{$index}]' value='{$file['hook_classname']}' />
+									</td>
+								</tr>
 EOF;
 }
+
+$_hookTypes = $this->registry->output->formDropdown( "hook_type[{$index}]", $hookTypes, $file['hook_type'], "hook_type[{$index}]", "onchange='selectHookType({$index});'" );
+
 $HTML .= <<<EOF
-				<li>
-					<label>{$this->lang->words['a_filehooktype']}</label>
-					<select name='hook_type[{$index}]' id='hook_type[{$index}]' onchange='selectHookType({$index});'>
-						<option value='0'>{$this->lang->words['a_selectone']}</option>
-						<option value='commandHooks'{$hook_type_command}>{$this->lang->words['a_aoverloader']}</option>
-						<option value='skinHooks'{$hook_type_skin}>{$this->lang->words['a_soverloader']}</option>
-						<option value='templateHooks'{$hook_type_template}>{$this->lang->words['a_templatehook']}</option>
-						<option value='dataHooks'{$hook_type_data}>{$this->lang->words['a_datahook']}</option>
-						<option value='libraryHooks'{$hook_type_library}>{$this->lang->words['a_libraryhook']}</option>
-					</select>
-				</li>
+								<tr>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_filehooktype']}</strong>
+									</td>
+									<td class='field_field'>
+										{$_hookTypes}
+									</td>
+								</tr>
 EOF;
 				if( $file['hook_type'] == 'dataHooks' )
 				{
 					$HTML .= <<<EOF
-				<li id='tr_classToOverload[{$index}]'>
-					<label>{$this->lang->words['a_datalocation']}</label>
+								<tr id='tr_dataLocation[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_datalocation']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_dataLocationDropdown']}
-				</li>
+									</td>
+								</tr>
 EOF;
 				}
 				else if( $file['hook_type'] == 'libraryHooks' )
 				{
-					$apps			= array();
-					
-					foreach( ipsRegistry::$applications as $dir => $appdata )
-					{
-						$apps[]	= array( $dir, $appdata['app_title'] );
-					}
-		
-					$_applications	= $this->registry->output->formDropdown( "libApplication[{$index}]", $apps, $file['hook_data']['libApplication'] );
+						$_applications = $this->registry->output->formDropdown( "libApplication[{$index}]", $appsArray, $file['hook_data']['libApplication'] );
 					
 					$HTML .= <<<EOF
-				<li id='tr_classToOverload[{$index}]'>
-					<label>{$this->lang->words['a_classextend']}</label>
-					<input type='text' name='classToOverload[{$index}]' value='{$file['hook_data']['classToOverload']}' size='50' class='inputtext' />
-				</li>
-				<li id='tr_hookApplication[{$index}]'>
-					<label>{$this->lang->words['a_hookapp']}</label>
+								<tr id='tr_classToOverload[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_classextend']}</strong>
+									</td>
+									<td class='field_field'>
+										<input type='text' name='classToOverload[{$index}]' value='{$file['hook_data']['classToOverload']}' size='50' class='input_text' />
+									</td>
+								</tr>
+								<tr id='tr_libApplication[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_hookapp']}</strong>
+									</td>
+									<td class='field_field'>
 					{$_applications}
-				</li>
+									</td>
+								</tr>
 EOF;
 				}
 				else if( $file['hook_type'] != 'templateHooks' )
 				{
 					$HTML .= <<<EOF
-				<li id='tr_classToOverload[{$index}]'>
-					<label>{$this->lang->words['a_classextend']}</label>							
-					<input type='text' name='classToOverload[{$index}]' value='{$file['hook_data']['classToOverload']}' size='50' class='inputtext' />
-				</li>
+								<tr id='tr_classToOverload[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_classextend']}</strong>
+									</td>
+									<td class='field_field'>
+										<input type='text' name='classToOverload[{$index}]' value='{$file['hook_data']['classToOverload']}' size='50' class='input_text' />
+									</td>
+								</tr>
 EOF;
 				}
 				else
 				{
 			 		$HTML .= <<<EOF
-				<li id='tr_skinGroup[{$index}]'>
-					<label>{$this->lang->words['a_skingroup']}</label>
+								<tr id='tr_skinGroup[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_skingroup']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_skinDropdown']}
-				</li>
-
-				<li id='tr_skinFunction[{$index}]'>
-					<label>{$this->lang->words['a_skinfunc']}</label>
+									</td>
+								</tr>
+								<tr id='tr_skinFunction[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_skinfunc']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_templateDropdown']}
-				</li>
-
-				<li id='tr_type[{$index}]'>
-					<label>{$this->lang->words['a_typeoftemp']}</label>
+									</td>
+								</tr>
+								<tr id='tr_type[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_typeoftemp']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_hookTypeDropdown']}
-				</li>
-
-				<li id='tr_id[{$index}]'>
-					<label>{$this->lang->words['a_hookid']}</label>
+									</td>
+								</tr>
+								<tr id='tr_id[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_hookid']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_hookIdsDropdown']}
-				</li>
-
-				<li id='tr_position[{$index}]'>
-					<label>{$this->lang->words['a_hookloc']}</label>
+									</td>
+								</tr>
+								<tr id='tr_position[{$index}]'>
+									<td class='field_title'>
+										<strong class='title'>{$this->lang->words['a_hookloc']}</strong>
+									</td>
+									<td class='field_field'>
 					{$file['_hookEPDropdown']}
-				</li>
+									</td>
+								</tr>
 EOF;
 				}
 
 				$HTML .= <<<EOF
-			</ul>
+							</table>
+						</td>
+					</tr>
 EOF;
 				}
 			}
 			$HTML .= <<<EOF
-			</div>
+				</table>
+				
 				<div class='acp-actionbar'>
-					<div class='centeraction'>
 						<input type='button' value=' {$this->lang->words['a_addanother']} ' onclick='addAnotherFile()' class='button primary' />
 					</div>
 				</div>
-			</div>
+			
 			<script type='text/javascript'>
 				elementIndex = {$latestIndex};
+				requireIndex = {$latestReqIndex};
+				
+				jQ("#tabstrip_hookform").ipsTabBar({ tabWrap: "#tabstrip_hookform_content" });
+				
+				// Requirements templates
+				ipb.templates['new_app_require']      = new Template("<tr id='requirementTitleRow_#{index}'><th colspan='2'>{$this->lang->words['hook_require_apptitle']}<span class='ipsBadge badge_red right' style='cursor: pointer;{$_removeInDev}' onclick='removeRequirement(#{index})'>{$this->lang->words['hook_remove_requirement']}</span></th></tr><tr id='requirementRow_#{index}'><td class='field_title'><strong class='title'>{$this->lang->words['hook_require_apptitle']}</strong></td><td class='field_field'>#{dropdown}<br /><br />{$this->lang->words['a_min']}: <input type='text' name='minVersion[#{index}]' value='' size='20' class='input_text' /><br /><br />{$this->lang->words['a_max']}: <input type='text' name='maxVersion[#{index}]' value='' size='20' class='input_text' /><br /><span class='desctext'>{$this->lang->words['a_enterzero']}  {$this->lang->words['a_longversionid']}</span></td></tr>");
+				
+				// Hook templates
+				ipb.templates['new_hook_file']        = new Template("<tr id='fileRow_#{index}'><td style='margin:0px; padding:0px;'><table class='ipsTable' id='fileTable_#{index}'><tr><th colspan='2'>{$this->lang->words['a_hookfile']} ##{index}<span class='ipsBadge badge_red right' style='cursor: pointer;{$_removeInDev}' onclick='removeFile(#{index})'>{$this->lang->words['hook_remove_file']}</span></th></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['a_filenamedir']}</strong></td><td class='field_field'><input type='text' name='file[#{index}]' value='' size='50' class='input_text' /></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['a_fileclassname']}</strong></td><td class='field_field'><input type='text' name='hook_classname[#{index}]' value='' size='50' class='input_text' /></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['a_filehooktype']}</strong></td><td class='field_field'><select name='hook_type[#{index}]' id='hook_type[#{index}]' onchange='selectHookType(#{index});'><option value='0'>{$this->lang->words['a_selectone']}</option><option value='commandHooks'>{$this->lang->words['a_aoverloader']}</option><option value='skinHooks'>{$this->lang->words['a_soverloader']}</option><option value='templateHooks'>{$this->lang->words['a_templatehook']}</option><option value='dataHooks'>{$this->lang->words['a_datahook']}</option><option value='libraryHooks'>{$this->lang->words['a_libraryhook']}</option></select></td></tr></table></td></tr>");
+				ipb.templates['hook_skinGroup']       = new Template("<tr id='tr_skinGroup[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_skingroup']}</strong></td><td class='field_field'>#{dropdown}</td></tr>");
+				ipb.templates['hook_classToOverload'] = new Template("<tr id='tr_classToOverload[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_classextend']}</strong></td><td class='field_field'><input type='text' name='classToOverload[#{index}]' value='' size='50' class='input_text' /></td></tr>");
+				ipb.templates['hook_dataLocation']    = new Template("<tr id='tr_dataLocation[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_datalocation']}</strong></td><td class='field_field'>#{dropdown}</td></tr>");
+				ipb.templates['hook_libApplication']  = new Template("<tr id='tr_libApplication[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_hookapp']}</strong></td><td class='field_field'>#{dropdown}</td></tr>");
+				ipb.templates['hook_skinFunction']    = new Template("<tr id='tr_skinFunction[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_skinfunc']}</strong></td><td class='field_field'>#{dropdown}</td></tr>");
+				ipb.templates['hook_pointTypes']      = new Template("<tr id='tr_type[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_typeoftemp']}</strong></td><td class='field_field'>{$form['jsDataTypes']}</td></tr>");
+				ipb.templates['hook_pointIds']        = new Template("<tr id='tr_id[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_hookid']}</strong></td><td class='field_field'>#{dropdown}</td></tr>");
+				ipb.templates['hook_pointLocation']   = new Template("<tr id='tr_position[#{index}]'><td class='field_title'><strong class='title'>{$this->lang->words['a_hookloc']}</strong></td><td class='field_field'><select name='position[#{index}]' id='position[#{index}]'>#{hookPoints}</select></td></tr>");
 			</script>
+		</div>
 			
 			<div class='acp-actionbar'>
-				<div class='centeraction'>
 					<input type='submit' value='{$this->lang->words['hook_form_button']}' class='button primary' />
 				</div>
 			</div>
-		</div>
 </form>
-
 EOF;
 
 return $HTML;
 }
 
-
 /**
  * Show the hook details
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Files in this hook
  * @return	string		HTML
  */
 public function hookDetails( $hookData, $files=array() )
 {
+$HTML = '';
+
+/* Menu */
 $HTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['hook_view_details']}</h2>
+	
+	<div class='ipsActionBar clearfix'>
+		<ul>
+EOF;
+
+if( $hookData['hook_enabled'] )
+{
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=disable_hook&amp;id={$hookData['hook_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='' /> {$this->lang->words['a_disablehook']}</a>
+			</li>
+EOF;
+}
+else
+{
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=enable_hook&amp;id={$hookData['hook_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['a_enablehook']}</a>
+			</li>
+EOF;
+}
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$hookData['hook_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['hook_view_requirements']}</a>
+			</li>
+		</ul>
+	</div>
+</div>
+<br />
 
 <div class='acp-box'>
 	<h3>{$hookData['hook_name']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th colspan='2'>{$hookData['hook_desc']}</th>
 		</tr>
 		<tr>
-			<td width='40%' valign='top'>
-				<b>{$this->lang->words['a_hookver']}</b>
+			<td width='40%'>
+				<strong class='title'>{$this->lang->words['a_hookver']}</strong> 
 			</td>
-			<td width='60%' valign='top'>
+			<td width='60%'>
 				{$hookData['hook_version_human']}
 			</td>
  		</tr>
 		<tr>
-			<td width='40%' valign='top'>
-				<b>{$this->lang->words['a_hookauthor']}</b>
+			<td>
+				<strong class='title'>{$this->lang->words['a_hookauthor']}</strong> 
 			</td>
-			<td width='60%' valign='top'>
+			<td>
 				{$hookData['hook_author']}
 			</td>
  		</tr>
@@ -1291,10 +1708,10 @@ EOF;
 	{
 		$HTML .= <<<EOF
 		<tr>
-			<td width='40%' valign='top'>
-				<b>{$this->lang->words['a_hookemail']}</b>
+			<td>
+				<strong class='title'>{$this->lang->words['a_hookemail']}</strong> 
 			</td>
-			<td width='60%' valign='top'>
+			<td>
 				<a href='mailto:{$hookData['hook_email']}'>{$hookData['hook_email']}</a>
 			</td>
  		</tr>
@@ -1305,63 +1722,65 @@ EOF;
 	{
 		$HTML .= <<<EOF
 		<tr>
-			<td width='40%' valign='top'>
-				<b>{$this->lang->words['a_authorsite']}</b>
+			<td>
+				<strong class='title'>{$this->lang->words['a_authorsite']}</strong> 
 			</td>
-			<td width='60%' valign='top'>
+			<td>
 				<a href='{$hookData['hook_website']}'>{$hookData['hook_website']}</a>
 			</td>
  		</tr>
 EOF;
 	}
 
-	$HTML .= <<<EOF
-		</table>
-	</div>
-	<br />
-EOF;
-
-	if( $hookData['hook_requirements']['hook_ipb_version_min'] > 0 OR $hookData['hook_requirements']['hook_ipb_version_max'] > 0
-		OR $hookData['hook_requirements']['hook_php_version_min'] OR $hookData['hook_requirements']['hook_php_version_max'] )
+	/* Update available? */
+	if( $hookData['hook_update_available'][0] )
 	{
-		$HTML .= <<<EOF
-	<div class='acp-box'>
-		<h3>{$this->lang->words['a_hookrequirements']}</h3>
+		$hookData['_updated'] = "<span class='ipsBadge badge_purple'>{$this->lang->words['hook_update_available']}</span>";;
 
-		<table class='acp-form alternate_rows' width='100%'>
-EOF;
-
-		if( $hookData['hook_requirements']['hook_ipb_version_min'] > 0 OR $hookData['hook_requirements']['hook_ipb_version_max'] > 0 )
+		if ( !empty($hookData['hook_update_available'][1]) )
 		{
-			$hookData['hook_requirements']['hook_ipb_version_min'] = $hookData['hook_requirements']['hook_ipb_version_min'] ? $hookData['hook_requirements']['hook_ipb_version_min'] : 'нет';
-			$hookData['hook_requirements']['hook_ipb_version_max'] = $hookData['hook_requirements']['hook_ipb_version_max'] ? $hookData['hook_requirements']['hook_ipb_version_max'] : 'нет';
+			$hookData['_updated'] = "<a href='{$hookData['hook_update_available'][1]}' target='_blank'>{$hookData['_updated']}</a>";
+		}
+		if( $hookData['hook_website'] )
+		{
+			$hookData['_updated'] = "<a href='{$hookData['hook_website']}' target='_blank'>{$hookData['_updated']}</a>";
+		}
+	}
 
 			$HTML .= <<<EOF
 			<tr>
-				<td width='40%' valign='top'>
-					<b>{$this->lang->words['a_boardversion']}</b>
+			<td>
+				<strong class='title'>{$this->lang->words['a_lastupdated']}</strong> 
 				</td>
-				<td width='60%' valign='top'>
-					{$this->lang->words['a_minimum']}: {$hookData['hook_requirements']['hook_ipb_version_min']}<br />
-					{$this->lang->words['a_maximum']}: {$hookData['hook_requirements']['hook_ipb_version_max']}
+			<td>
+				{$hookData['_updated']}
 				</td>
 	 		</tr>
+		<tr>
+			<td>
+				<strong class='title'>{$this->lang->words['a_hookrequirements']}</strong> 
+			</td>
+			<td>
 EOF;
-		}
 
-		if( $hookData['hook_requirements']['hook_php_version_min'] OR $hookData['hook_requirements']['hook_php_version_max'] )
+	$HTML .= ( is_array($hookData['_require_errors']) && count($hookData['_require_errors']) ) ? "<a href='{$this->settings['base_url']}{$this->form_code}do=check_requirements&amp;id={$hookData['hook_id']}'><span class='ipsBadge badge_red'>{$this->lang->words['hook_require_error']}</span></a>" : "<span class='ipsBadge badge_green'>{$this->lang->words['hook_require_ok']}</span>";
+	
+	$HTML .= <<<EOF
+			</td>
+ 		</tr>
+EOF;
+	
+	if ( $hookData['hook_global_caches'] )
 		{
-			$hookData['hook_requirements']['hook_php_version_min'] = $hookData['hook_requirements']['hook_php_version_min'] ? $hookData['hook_requirements']['hook_php_version_min'] : 'нет';
-			$hookData['hook_requirements']['hook_php_version_max'] = $hookData['hook_requirements']['hook_php_version_max'] ? $hookData['hook_requirements']['hook_php_version_max'] : 'нет';
+		$cachesCount = count( explode(',', $hookData['hook_global_caches']) );
 
 			$HTML .= <<<EOF
 			<tr>
-				<td width='40%' valign='top'>
-					<b>{$this->lang->words['a_phpver']}</b>
+			<td>
+				<strong class='title'>{$this->lang->words['hook_globalcaches']}</strong> 
 				</td>
-				<td width='60%' valign='top'>
-					{$this->lang->words['a_minimum']}: {$hookData['hook_requirements']['hook_php_version_min']}<br />
-					{$this->lang->words['a_maximum']}: {$hookData['hook_requirements']['hook_php_version_max']}
+			<td>
+				{$cachesCount}&nbsp;&nbsp;( {$hookData['hook_global_caches']} )
 				</td>
 	 		</tr>
 EOF;
@@ -1371,13 +1790,9 @@ EOF;
  		</table>
 	</div>
 	<br />
-EOF;
-	}
-
-	$HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_fileuses']}</h3>
-		<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 			<tr>
 				<th width='20%'>{$this->lang->words['a_realfile']}</th>
 				<th width='20%'>{$this->lang->words['a_storedfile']}</th>
@@ -1447,6 +1862,14 @@ EOF;
 
 				$showsAt .= $this->lang->words['a_labeled'] . $data['hook_data']['id'];
 			}
+			elseif ( $data['hook_type'] == 'libraryHooks' )
+			{
+				$showsAt = sprintf( $this->lang->words['a_libraryhookfor'], $data['hook_data']['classToOverload'], $data['hook_data']['libApplication'] );
+			}
+			elseif ( $data['hook_type'] == 'dataHooks' )
+			{
+				$showsAt = $this->lang->words['a_datahookfor'] . $data['hook_data']['dataLocation'];
+			}
 			else
 			{
 				$showsAt = $this->lang->words['a_willoverload'] . $data['hook_data']['classToOverload'];
@@ -1456,28 +1879,33 @@ EOF;
 			{
 				case 'templateHooks':
 					$hookType = $this->lang->words['a_templatehook'];
-				break;
+					break;
 				case 'commandHooks':
 					$hookType = $this->lang->words['a_aoverloader'];
-				break;
+					break;
 				case 'skinHooks':
 					$hookType = $this->lang->words['a_soverloader'];
-				break;
+					break;
+				case 'libraryHooks':
+					$hookType = $this->lang->words['a_libraryhook'];
+					break;
+				case 'dataHooks':
+					$hookType = $this->lang->words['a_datahook'];
+					break;
 			}
 
 			$HTML .= <<<EOF
-			<tr>
-				<td>{$data['hook_file_real']}</td>
-				<td>{$data['hook_file_stored']}</td>
-				<td>{$hookType}</td>
-				<td>{$showsAt}</td>
-	 		</tr>
+		<tr>
+			<td>{$data['hook_file_real']}</td>
+			<td>{$data['hook_file_stored']}</td>
+			<td>{$hookType}</td>
+			<td>{$showsAt}</td>
+ 		</tr>
 EOF;
 		}
 		$HTML .= <<<EOF
  	</table>
 </div>
-
 EOF;
 
 return $HTML;
@@ -1486,111 +1914,244 @@ return $HTML;
 /**
  * Show the hook requirements
  *
- * @access	public
  * @param	array 		Hook data
- * @param	boolean		True if you don't meet IPB min requirements, otherwise false
- * @param	boolean		True if you don't meet PHP min requirements, otherwise false
+ * @param	array		Array of errors found
+ * @param	array		Array of the app versions
  * @return	string		HTML
  */
-public function hookRequirements( $hookData, $hookIpbBad, $hookPhpBad )
+public function hookRequirements( $hookData, $errors, $versions=array() )
 {
-	if( $hookIpbBad OR $hookPhpBad )
-	{
-		$HTML .= $this->registry->output->global_template->warning_box( $hookData['hook_name'], $this->lang->words['a_noyoucant'] ) . '<br />';
-	}
+$HTML = '';
 
+/* Let's sort out the badges... */
+$forceEnable = empty($this->request['fromInstall']) ? '' : '&amp;skipRequirements=1';
+$_goodBadge  = "<span class='ipsBadge badge_green'>{$this->lang->words['hook_require_ok']}</span>";
+$_errorBadge = "<span class='ipsBadge badge_red'>{$this->lang->words['hook_require_error']}</span>";
+
+/* Menu */
 $HTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['a_hookrequirements']}</h2>
+	
+	<div class='ipsActionBar clearfix'>
+		<ul>
+EOF;
 
+if( $hookData['hook_enabled'] )
+{
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=disable_hook&amp;id={$hookData['hook_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='' /> {$this->lang->words['a_disablehook']}</a>
+			</li>
+EOF;
+}
+else
+{
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=enable_hook&amp;id={$hookData['hook_id']}{$forceEnable}'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['a_enablehook']}</a>
+			</li>
+EOF;
+}
+$HTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=view_details&amp;id={$hookData['hook_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/view.png' alt='' /> {$this->lang->words['a_viewhook']}</a>
+			</li>
+		</ul>
+	</div>
+</div>
+<br />
+EOF;
+
+/* Check if we got any requirements... */
+if ( !$hookData['hook_requirements']['hook_php_version_min'] && !$hookData['hook_requirements']['hook_php_version_min'] && ( ( !is_array($hookData['hook_requirements']['required_applications']) || !count($hookData['hook_requirements']['required_applications']) ) ) )
+{
+$HTML .= <<<EOF
+<div class="information-box">
+	{$this->lang->words['hook_require_noreqs']}
+</div>
+EOF;
+
+return $HTML;
+}
+
+
+/* Got errors? */
+if( count($errors) )
+{
+	$HTML .= $this->registry->output->global_template->warning_box( $this->lang->words['a_noyoucant'], empty($this->request['fromInstall']) ? '' : '<br />'.$this->lang->words['hook_require_skip_reqs'] ) . '<br />';
+	
+	/* Replacement time? */
+	if ( isset($errors['php_min']) )
+	{
+		$hookData['hook_requirements']['hook_php_version_min'] = $errors['php_min'];
+	}
+	if ( isset($errors['php_max']) )
+	{
+		$hookData['hook_requirements']['hook_php_version_max'] = $errors['php_max'];
+	}
+}
+
+/* Still here? We do have some requirements then! */
+$HTML .= <<<EOF
 <div class='acp-box'>
 	<h3>{$hookData['hook_name']}</h3>
-	<table class='alternate_rows' width='100%'>
-		<tr><th colspan='2'>&nbsp;</th></tr>
-EOF;
-
-	if( $hookData['hook_requirements']['hook_ipb_version_min'] )
-	{
-		$HTML .= <<<EOF
+	<table class='ipsTable'>
 		<tr>
-			<td><strong>{$this->lang->words['a_minipb']}</strong></td>
-			<td>{$hookData['hook_requirements']['hook_ipb_version_min']}</td>
+			<th width='21%'>{$this->lang->words['a_phpver']}</th>
+			<th width='5%'>&nbsp;</th>
+			<th width='70%'>&nbsp;</th>
 		</tr>
-EOF;
-	}
-
-	if( $hookData['hook_requirements']['hook_ipb_version_max'] )
-	{
-		$HTML .= <<<EOF
 		<tr>
-			<td><strong>{$this->lang->words['a_maxipb']}</strong></td>
-			<td>{$hookData['hook_requirements']['hook_ipb_version_max']}</td>
-		</tr>
-EOF;
-	}
-
-	if( $hookData['hook_requirements']['hook_ipb_version_min'] OR $hookData['hook_requirements']['hook_ipb_version_max'] )
-	{
-		$HTML .= <<<EOF
-		<tr>
-			<td><strong>{$this->lang->words['a_youripb']}</strong></td>
 			<td>
-EOF;
-
-$HTML .= IPB_VERSION;
-
-$hookIpbBad	= $hookIpbBad ? "<span style='color:red;font-weight:bold;'>" . $hookIpbBad . "</span>" : "<span style='color:green;'>{$this->lang->words['a_willworkipb']}</span>";
-
-$HTML .= <<<EOF
+				<strong class='title'>{$this->lang->words['hook_require_current']}</strong>
+			</td>
+			<td>
+				&nbsp;
 			</td>
-		</tr>
-		<tr>
-			<td><strong>{$this->lang->words['a_ipbstatus']}</strong></td>
-			<td>{$hookIpbBad}</td>
-		</tr>
-EOF;
-	}
-
-	if( $hookData['hook_requirements']['hook_php_version_min'] )
-	{
-		$HTML .= <<<EOF
-		<tr>
-			<td><strong>{$this->lang->words['a_minphp']}</strong></td>
-			<td>{$hookData['hook_requirements']['hook_php_version_min']}</td>
-		</tr>
-EOF;
-	}
-
-	if( $hookData['hook_requirements']['hook_php_version_max'] )
-	{
-		$HTML .= <<<EOF
-		<tr>
-			<td><strong>{$this->lang->words['a_maxphp']}</strong></td>
-			<td>{$hookData['hook_requirements']['hook_php_version_max']}</td>
-		</tr>
-EOF;
-	}
-
-	if( $hookData['hook_requirements']['hook_php_version_min'] OR $hookData['hook_requirements']['hook_php_version_max'] )
-	{
-		$HTML .= <<<EOF
-		<tr>
-			<td><strong>{$this->lang->words['a_yourphp']}</strong></td>
 			<td>
 EOF;
 
 $HTML .= PHP_VERSION;
 
-$hookPhpBad	= $hookPhpBad ? "<span style='color:red;font-weight:bold;'>" . $hookPhpBad . "</span>" : "<span style='color:green;'>{$this->lang->words['a_willworkphp']}</span>";
-
 $HTML .= <<<EOF
 			</td>
 		</tr>
+EOF;
+
+if ( $hookData['hook_requirements']['hook_php_version_min'] )
+{
+
+	$HTML .= <<<EOF
 		<tr>
-			<td><strong>{$this->lang->words['a_phpstatus']}</strong></td>
-			<td>{$hookPhpBad}</td>
+			<td>
+				<strong class='title'>{$this->lang->words['hook_require_min']}</strong>
+			</td>
+			<td class='center'>
+EOF;
+	
+	$HTML .= isset($errors['php_min']) ? $_errorBadge : $_goodBadge;
+	
+	$HTML .= <<<EOF
+			</td>
+			<td>
+				{$hookData['hook_requirements']['hook_php_version_min']}
+			</td>
 		</tr>
 EOF;
-	}
+}
 
+if ( $hookData['hook_requirements']['hook_php_version_max'] )
+{
+
+	$HTML .= <<<EOF
+		<tr>
+			<td>
+				<strong class='title'>{$this->lang->words['hook_require_max']}</strong>
+			</td>
+			<td class='center'>
+EOF;
+	
+	$HTML .= isset($errors['php_max']) ? $_errorBadge : $_goodBadge;
+	
+	$HTML .= <<<EOF
+			</td>
+			<td>
+				{$hookData['hook_requirements']['hook_php_version_max']}
+			</td>
+		</tr>
+EOF;
+}
+	
+	if ( is_array($hookData['hook_requirements']['required_applications']) && count($hookData['hook_requirements']['required_applications']) )
+	{
+		foreach( $hookData['hook_requirements']['required_applications'] as $appKey => $appData )
+		{
+			$_appName = ipsRegistry::$applications[ $appKey ]['app_title'];
+			
+			$HTML .= <<<EOF
+					<tr>
+						<th colspan='3'>{$this->lang->words['hook_require_apptitle']}: {$_appName}</th>
+					</tr>
+					<tr>
+						<td>
+							<strong class='title'>{$this->lang->words['hook_require_current']}</strong>
+						</td>
+						<td class='center'>
+EOF;
+				
+				$HTML .= isset($errors[ $appKey.'_app' ]) ? $_errorBadge : $_goodBadge;
+				
+				$HTML .= <<<EOF
+						</td>
+						<td>
+EOF;
+			
+			$HTML .= isset($errors[ $appKey.'_app' ]) ? $errors[ $appKey.'_app' ] : ipsRegistry::$applications[ $appKey ]['app_version'];
+			
+			$HTML .= <<<EOF
+						</td>
+					</tr>
+EOF;
+			/* Got a min version? */
+			if ( ! isset($errors[ $appKey.'_app' ]) && $appData['min_version'] )
+			{
+			
+				$HTML .= <<<EOF
+					<tr>
+						<td>
+							<strong class='title'>{$this->lang->words['hook_require_min']}</strong>
+						</td>
+						<td class='center'>
+EOF;
+				
+				$appData['min_version'] = isset($errors[ $appKey.'_min' ]) ? $errors[ $appKey.'_min' ] : $appData['min_version'];
+				
+				$HTML .= isset($errors[ $appKey.'_min' ]) ? $_errorBadge : $_goodBadge;
+				
+				$HTML .= <<<EOF
+						</td>
+						<td>
+EOF;
+				
+				$HTML .= isset($versions[ $appKey ][ $appData['min_version'] ]) ? $versions[ $appKey ][ $appData['min_version'] ] : $appData['min_version'];
+				
+				$HTML .= <<<EOF
+						</td>
+					</tr>
+EOF;
+}
+			/* Got a max version? */
+			if ( ! isset($errors[ $appKey.'_app' ]) && $appData['max_version'] )
+			{
+			
+				$HTML .= <<<EOF
+					<tr>
+						<td>
+							<strong class='title'>{$this->lang->words['hook_require_max']}</strong>
+						</td>
+						<td class='center'>
+EOF;
+				
+				$appData['max_version'] = isset($errors[ $appKey.'_max' ]) ? $errors[ $appKey.'_max' ] : $appData['max_version'];
+				
+				$HTML .= isset($errors[ $appKey.'_max' ]) ? $_errorBadge : $_goodBadge;
+				
+				$HTML .= <<<EOF
+						</td>
+						<td>
+EOF;
+				
+				$HTML .= isset($versions[ $appKey ][ $appData['max_version'] ]) ? $versions[ $appKey ][ $appData['max_version'] ] : $appData['max_version'];
+				
+				$HTML .= <<<EOF
+						</td>
+					</tr>
+EOF;
+			}
+		}
+	}
+	
 	$HTML .= <<<EOF
  	</table>
 </div>
@@ -1603,7 +2164,6 @@ return $HTML;
 /**
  * Page to export a hook
  *
- * @access	public
  * @param	array 		Hook data
  * @return	string		HTML
  */
@@ -1624,7 +2184,10 @@ $hookData['hook_extra_data']['display']['css']			= $hookData['hook_extra_data'][
 
 $HTML .= <<<EOF
 
-<h2>{$this->lang->words['hook_h2_exporting']} {$hookData['hook_name']}</h2>
+<div class='section_title'>
+	<h2>{$this->lang->words['hook_h2_exporting']} {$hookData['hook_name']}</h2>
+</div>
+
 <script type='text/javascript' src='{$this->settings['js_main_url']}acp.inlineforms.js'></script>
 <script type='text/javascript' src='{$this->settings['js_main_url']}acp.hooks.js'></script>
 
@@ -1640,12 +2203,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportsettings']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_settings_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_settings_info']}</th>
+			</tr>
 			<tr>
 				<td>
 					<p id='MF__settings'>{$hookData['hook_extra_data']['display']['settings']}</p>
-					<div id='MF__settings_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addsettings']}</div>
+					<div id='MF__settings_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addsettings']}</span></div>
 				</td>
  			</tr>
  		</table>
@@ -1658,12 +2223,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportlang']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_lang_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_lang_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__language'>{$hookData['hook_extra_data']['display']['language']}</p>
-					<div id='MF__language_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addlang']}</div>
+					<div id='MF__language_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addlang']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1676,12 +2243,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportmod']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_mod_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_mod_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__modules'>{$hookData['hook_extra_data']['display']['modules']}</p>
-					<div id='MF__modules_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addmod']}</div>
+					<div id='MF__modules_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addmod']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1694,12 +2263,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exporthelp']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_help_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_help_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__help'>{$hookData['hook_extra_data']['display']['help']}</p>
-					<div id='MF__help_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addhelp']}</div>
+					<div id='MF__help_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addhelp']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1713,12 +2284,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportskin']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_skin_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_skin_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__templates'>{$hookData['hook_extra_data']['display']['templates']}</p>
-					<div id='MF__templates_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addskin']}</div>
+					<div id='MF__templates_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addskin']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1731,12 +2304,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportcss']}</h3>
 
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_css_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_css_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__css'>{$hookData['hook_extra_data']['display']['css']}</p>
-					<div id='MF__css_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addcss']}</div>
+					<div id='MF__css_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addcss']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1749,12 +2324,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exporttasks']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_tasks_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_tasks_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__tasks'>{$hookData['hook_extra_data']['display']['tasks']}</p>
-					<div id='MF__tasks_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addtasks']}</div>
+					<div id='MF__tasks_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addtasks']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1767,12 +2344,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportdb']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_db_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_db_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__database'>{$hookData['hook_extra_data']['display']['database']}</p>
-					<div id='MF__database_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_adddb']}</div>
+					<div id='MF__database_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_adddb']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1785,12 +2364,14 @@ $HTML .= <<<EOF
 	<div class='acp-box'>
 		<h3>{$this->lang->words['a_exportscript']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
-			<tr><th>{$this->lang->words['a_script_info']}</th></tr>
+		<table class='ipsTable'>
+			<tr>
+				<th>{$this->lang->words['a_script_info']}</th>
+			</tr>
 			<tr>
 				<td valign='top'>
 					<p id='MF__custom'>{$hookData['hook_extra_data']['display']['custom']}</p>
-					<div id='MF__custom_popup' class='form_help' style='width:auto;text-align:center;cursor:pointer'>{$this->lang->words['a_addscript']}</div>
+					<div id='MF__custom_popup' style='text-align:center;'><span class='button'>{$this->lang->words['a_addscript']}</span></div>
 				</td>
 	 		</tr>
 	 	</table>
@@ -1801,9 +2382,93 @@ $HTML .= <<<EOF
 	 <br />
 	 <div class='acp-box'>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['a_export']}' class='button primary'/>
-			</div>
+			<input type='submit' value='{$this->lang->words['a_export']}' class='button primary'/>
+		</div>
+	</div>
+</form>
+EOF;
+
+return $HTML;
+}
+
+/**
+ * Show a form to create sphinx cronjobs strings
+ *
+ * @param	array 		$sphinxData		Sphinx data
+ * @return	@e string	HTML
+ */
+public function sphinxConfForm( $sphinxData=array() )
+{
+$HTML = '';
+
+/* Form path */
+$sphinxPath = $this->registry->output->formInput( 'sphinx_conf_path', $this->request['sphinx_conf_path'] );
+
+/* Init template */
+$HTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['sphinx_cronjob_title']}</h2>
+</div>
+EOF;
+
+
+/* Got a path? */
+if ( $this->request['sphinx_conf_path'] && count($sphinxData) )
+{
+	/* Sort out some variables.. */
+	$this->request['sphinx_conf_path'] = rtrim( $this->request['sphinx_conf_path'], '/' );
+	$_file		= $this->request['sphinx_conf_path'] . '/sphinx.conf';
+	$cronJobs	= "*/15 * * * * /usr/local/bin/indexer --config {$_file} " . implode( ' ', $sphinxData['deltas'] ) . " --rotate
+0 4 * * * /usr/local/bin/indexer --config {$_file} --all --rotate";
+	
+	/* Doesn't exist? */
+	if( !@is_file( $_file ) )
+	{
+		$HTML .= $this->registry->output->global_template->warning_box( $this->lang->words['sphinx_cronjob_nofile'], '<br />' . sprintf( $this->lang->words['sphinx_cronjob_nofiledesc'], $_file ) ) . '<br />';
+	}
+	
+$HTML .= <<<EOF
+<div class='information-box'>
+	{$this->lang->words['sphinx_cronjob_details']}
+	<br /><br />
+	<textarea name='sphinx_cronjobs' rows='3' wrap='soft' class='multitext' style='width: 80%;'>{$cronJobs}</textarea>
+	<br /><br />
+	<strong>{$this->lang->words['sphinx_cronjob_note']}</strong>
+</div>
+<br /><br />
+EOF;
+	
+	
+	/*echo "<pre>";print_r(
+	
+	$this->request
+	#$sphinxData['deltas']
+	
+	);echo '</pre>';
+	/**/
+	#exit;
+	#print nl2br( htmlentities( $sphinxData['content'] ) ); exit;
+}
+
+
+$HTML .= <<<EOF
+<form action='{$this->settings['base_url']}{$this->form_code}do=sphinxBuildCron' method='post' enctype='multipart/form-data'>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['sphinx_cronjob_title']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sphinx_cronjob_path']}</strong> 
+				</td>
+				<td class='field_field'>
+					{$sphinxPath}<br />
+					<span class='desctext'>{$this->lang->words['sphinx_cronjob_path_desc']}</span>
+				</td>
+	 		</tr>
+		</table>
+		
+		<div class='acp-actionbar'>
+			<input type='submit' value='{$this->lang->words['sphinx_build_cronjob']}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_badwords.php b/upload/admin/applications/core/skin_cp/cp_skin_badwords.php
index 5dc9d30b..31ab1b0b 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_badwords.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_badwords.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Badwords skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_badwords extends output
+class cp_skin_badwords
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
+	
 /**
  * Edit badwords
  *
- * @access	public
  * @param	int			ID
  * @param	array 		Form elements
  * @return	string		HTML
@@ -55,20 +85,20 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['bwl_edit_filter']}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['bwl_before']}</label>
-			{$form['before']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bwl_after']}</label>
-			{$form['after']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bwl_method']}</label>
-			{$form['match']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bwl_before']}</title></td>
+			<td class='field_field'>{$form['before']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bwl_after']}</strong></td>
+			<td class='field_field'>{$form['after']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bwl_method']}</strong></td>
+			<td class='field_field'>{$form['match']}</td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['bwl_edit_filter']}' class='button primary' accesskey='s'>
 	</div>
@@ -84,7 +114,6 @@ return $IPBHTML;
 /**
  * Badwords wrapper
  *
- * @access	public
  * @param	array 		Badword rows
  * @return	string		HTML
  */
@@ -99,7 +128,7 @@ $IPBHTML .= <<<HTML
 	<ul class='context_menu'>
 		<li>
 			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=badword_export'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/exclamation_go.png' alt='' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' />
 				{$this->lang->words['bwl_export']}
 			</a>
 		</li>
@@ -112,7 +141,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['bwl_current']}</h3>
-	<table class="alternate_rows">
+	<table class="ipsTable">
 		<tr>
 			<th width='40%'>{$this->lang->words['bwl_before']}</th>
 			<th width='40%'>{$this->lang->words['bwl_after']}</th>
@@ -124,15 +153,14 @@ HTML;
 foreach( $rows as $row )
 {
 $IPBHTML .= <<<HTML
-			<tr>
+			<tr class='ipsControlRow'>
 				<td>{$row['type']}</td>
 				<td>{$row['replace']}</td>
 				<td>{$row['method']}</td>
-				<td style='text-align: center'>
-					<img class='ipbmenu' id="menu_{$row['wid']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['bwl_options']}' />
-					<ul class='acp-menu' id='menu_{$row['wid']}_menucontent'>
-						<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=badword_edit&id={$row['wid']}'>{$this->lang->words['bwl_filter_edit']}</a></li>
-						<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=badword_remove&id={$row['wid']}");'>{$this->lang->words['bwl_filter_remove']}</a></li>
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
+						<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=badword_edit&id={$row['wid']}' title='{$this->lang->words['bwl_filter_edit']}'>{$this->lang->words['bwl_filter_edit']}</a></li>
+						<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=badword_remove&id={$row['wid']}");' title='{$this->lang->words['bwl_filter_remove']}'>{$this->lang->words['bwl_filter_remove']}</a></li>
 					</ul>
 				</td>
 			</tr>
@@ -146,7 +174,7 @@ $IPBHTML .= <<<HTML
 	
 <div class="acp-box">
 	<h3>{$this->lang->words['bwl_filter_add']}</h3>
-	<table class="alternate_rows">
+	<table class="ipsTable">
 		<tr>
 			<th width="40%">{$this->lang->words['bwl_before']}</th>
 			<th width="40%">{$this->lang->words['bwl_after']}</th>
@@ -178,12 +206,12 @@ $IPBHTML .= <<<HTML
 	
 <div class="acp-box">
 	<h3>{$this->lang->words['bwl_import']}</h3>
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['bwl_import_upload']}<span class="desctext">{$this->lang->words['bwl_import_info']}</span></label>
-				<input class='textinput' type='file' size='30' name='FILE_UPLOAD'>
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['bwl_import_upload']}</strong></td>
+				<td class='field_field'><input class='textinput' type='file' size='30' name='FILE_UPLOAD'><br /><span class="desctext">{$this->lang->words['bwl_import_info']}</span></td>
+			</tr>
+		</table>
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['bwl_import']}' class='button primary' accesskey='s'>
 	</div>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_bbcode.php b/upload/admin/applications/core/skin_cp/cp_skin_bbcode.php
index ce9e8958..63a70c6e 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_bbcode.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_bbcode.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBcode skin file
- * Last Updated: $Date: 2010-07-13 19:56:23 -0400 (Tue, 13 Jul 2010) $
+ * Last Updated: $Date: 2011-06-07 18:56:57 -0400 (Tue, 07 Jun 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6644 $
+ * @version		$Revision: 8999 $
  */
  
-class cp_skin_bbcode extends output
+class cp_skin_bbcode
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * BBCode wrapper
  *
- * @access	public
  * @param	string		Content (compiled HTML rows)
  * @return	string		HTML
  */
@@ -55,41 +85,43 @@ $IPBHTML .= <<<EOF
 	
 <div class='section_title'>
 	<h2>{$this->lang->words['bbcode_header']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_add'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/style_add.png' alt='' />
-				{$this->lang->words['addnew_bbcode']}
-			</a>
-		</li>
-		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/style_go.png' alt='' />
-				{$this->lang->words['export_bbcode']}
-			</a>
-		</li>
-		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_import_all'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/style_add.png' alt='' />
-				{$this->lang->words['import_bbcode_all']}
-			</a>
-		</li>
-		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export_all'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/style_go.png' alt='' />
-				{$this->lang->words['export_bbcode_all']}
-			</a>
-		</li>
-	</ul>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_add'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/style_add.png' alt='' />
+					{$this->lang->words['addnew_bbcode']}
+				</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/style_go.png' alt='' />
+					{$this->lang->words['export_bbcode']}
+				</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_import_all'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/style_add.png' alt='' />
+					{$this->lang->words['import_bbcode_all']}
+				</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export_all'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/style_go.png' alt='' />
+					{$this->lang->words['export_bbcode_all']}
+				</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 <div class="acp-box">
 	<h3>{$this->lang->words['your_bbcodes']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='45%'>{$this->lang->words['bbcode_title']}</th>
 			<th width='50%'>{$this->lang->words['bbcode_tag']}</th>
-			<th width='5%'>{$this->lang->words['bbcode_options']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 		{$content}
 	</table>
@@ -99,7 +131,7 @@ $IPBHTML .= <<<EOF
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_test' method='post'>
 <div class="acp-box">
 	<h3>{$this->lang->words['test_parse']}</h3>
-	<p align="center"><textarea name='bbtest' rows='10' cols='70'>
+	<p class="pad" align="center"><textarea name='bbtest' rows='10' cols='70'>
 EOF;
 
 $IPBHTML .= isset($_POST['bbtest']) ? $_POST['bbtest'] : $this->lang->words['enter_test_parse'];
@@ -115,18 +147,20 @@ $IPBHTML .= <<<EOF
 <br />
 
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_import' method='post' enctype='multipart/form-data'>
-<div class="acp-box">
-	<h3>{$this->lang->words['import_new_bbcode']}</h3>
-			<ul class="acp-form alternate_rows">
-				<li>
-					<label>{$this->lang->words['upload_bbcode_xml']}<span class='desctext'>{$this->lang->words['upload_bbcode_dupe']}</span></label>
-					<input type='file' name='FILE_UPLOAD' />
-				</li>
-			<ul>
-	<div class="acp-actionbar">
-		<input type='submit' value='{$this->lang->words['bbcode_import']}' class="button primary" />
+	<div class="acp-box">
+		<h3>{$this->lang->words['import_new_bbcode']}</h3>
+		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['upload_bbcode_xml']}</strong></td>
+				<td class='field_field'><input type='file' name='FILE_UPLOAD' /> <br /><span class='desctext'>{$this->lang->words['upload_bbcode_dupe']}</span></td>
+			</tr>
+		</table>
+		
+		<div class="acp-actionbar">
+			<input type='submit' value='{$this->lang->words['bbcode_import']}' class="button primary" />
+		</div>
 	</div>
-</div>
 </form>
 EOF;
 
@@ -137,7 +171,6 @@ return $IPBHTML;
 /**
  * BBCode record
  *
- * @access	public
  * @param	array		BBCode info
  * @return	string		HTML
  */
@@ -147,25 +180,26 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<tr>
+<tr class='ipsControlRow'>
  <td>{$row['bbcode_title']}</td>
  <td><pre>{$row['bbcode_fulltag']}</pre></td>
- <td style='text-align: center'>
-	<img class='ipbmenu' id="menu_{$row['bbcode_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['bbcode_options']}' />
-	<ul class='acp-menu' id='menu_{$row['bbcode_id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_edit&id={$row['bbcode_id']}'>{$this->lang->words['edit_bbcode']}</a></li>
-		<li class='icon export'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export&id={$row['bbcode_id']}'>{$this->lang->words['export_bbcode']}</a></li>
+ <td class='col_buttons'>
+ 	<ul class='ipsControlStrip'>
+ 		<li class='i_edit'> 
+			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_edit&id={$row['bbcode_id']}' title='{$this->lang->words['edit_bbcode']}'>{$this->lang->words['edit_bbcode']}</a>
+		</li> 
+ 		<li class='i_new_folder'> 
+			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_export&id={$row['bbcode_id']}' title='{$this->lang->words['export_bbcode']}'>{$this->lang->words['export_bbcode']}</a>
+		</li> 
 EOF;
-
-if( IN_DEV OR !$row['bbcode_protected'] )
-{
-$IPBHTML .= <<<EOF
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_delete&id={$row['bbcode_id']}");'>{$this->lang->words['delete_bbcode']}</a></li>
+  if( IN_DEV OR !$row['bbcode_protected'] ) { $IPBHTML .= <<<EOF
+ 		<li class='i_delete'> 
+			<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=bbcode_delete&id={$row['bbcode_id']}");' title='{$this->lang->words['delete_bbcode']}'>{$this->lang->words['delete_bbcode']}</a>
+		</li> 
 EOF;
-}
-
-$IPBHTML .= <<<EOF
-	</ul>
+ } $IPBHTML .= 
+<<<EOF
+ </ul>
  </td>
 </tr>
 EOF;
@@ -177,7 +211,6 @@ return $IPBHTML;
 /**
  * BBCode add/edit form
  *
- * @access	public
  * @param	string		Type (add|edit)
  * @param	array 		BBcode info
  * @param	array 		Sections to edit in
@@ -226,7 +259,6 @@ $form['bbcode_sections']			= $this->registry->output->formMultiDropdown( "bbcode
 $form['bbcode_php_plugin']			= $this->registry->output->formInput( 'bbcode_php_plugin', $this->request['bbcode_php_plugin'] ? $this->request['bbcode_php_plugin'] : $bbcode['bbcode_php_plugin'] );
 $form['bbcode_no_parsing']			= $this->registry->output->formYesNo( 'bbcode_no_parsing', $this->request['bbcode_no_parsing'] ? $this->request['bbcode_no_parsing'] : $bbcode['bbcode_no_parsing'] );
 $form['bbcode_protected']			= $this->registry->output->formYesNo( 'bbcode_protected', $this->request['bbcode_protected'] ? $this->request['bbcode_protected'] : $bbcode['bbcode_protected'] );
-$form['bbcode_strip_search']		= $this->registry->output->formYesNo( 'bbcode_strip_search', $this->request['bbcode_strip_search'] ? $this->request['bbcode_strip_search'] : $bbcode['bbcode_strip_search'] );
 $form['bbcode_custom_regex']		= $this->registry->output->formTextarea( 'bbcode_custom_regex', htmlspecialchars($_POST['bbcode_custom_regex'] ? $_POST['bbcode_custom_regex'] : $bbcode['bbcode_custom_regex']) );
 
 $apps     = array();
@@ -279,105 +311,100 @@ EOF;
 $IPBHTML .= <<<EOF
 <div class="acp-box">
 	<h3>{$button}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['bbcode_title']}</label>
-			{$form['bbcode_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_description']}<span class='desctext'>{$this->lang->words['bbcode_usedinguide']}</span></label>
-			{$form['bbcode_desc']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_example']}<span class='desctext'>{$this->lang->words['bbcode_usedinguide']}<br />{$this->lang->words['bbcode_example_info']}</span></label>
-			{$form['bbcode_example']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_tag']}<span class='desctext'>{$this->lang->words['bbcode_tag_info']}</span></label>
-			{$form['bbcode_tag']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_aliases']}<span class='desctext'>{$this->lang->words['bbcode_aliases_info']}</span></label>
-			{$form['bbcode_aliases']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_singletag']}<span class='desctext'>{$this->lang->words['bbcode_singletag_info']}</span></label>
-			{$form['bbcode_single_tag']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_useoption']}<span class='desctext'>{$this->lang->words['bbcode_useoption_info']}</span></label>
-			{$form['bbcode_useoption']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_customregex']}<span class='desctext'>{$this->lang->words['bbcode_customregex_info']}</span></label>
-			{$form['bbcode_custom_regex']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_optional']}<span class='desctext'>{$this->lang->words['bbcode_optional_info']}</span></label>
-			{$form['bbcode_optional_option']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_switch']}<span class='desctext'>{$this->lang->words['bbcode_switch_info']}</span></label>
-			{$form['bbcode_switch_option']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_noparse']}<span class='desctext'>{$this->lang->words['bbcode_noparse_info']}</span></label>
-			{$form['bbcode_no_parsing']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_stripsearch']}<span class='desctext'>{$this->lang->words['bbcode_stripsearch_info']}</span></label>
-			{$form['bbcode_strip_search']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_replace']}<span class='desctext'>{$this->lang->words['bbcode_replace_info']}</span></label>
-			{$form['bbcode_replace']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_php']}<span class='desctext'>{$this->lang->words['bbcode_php_info']}</span></label>
-			{$form['bbcode_php_plugin']}<br />
-			{$this->lang->words['bbcode_php_info_loc']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_groups']}<span class='desctext'>{$this->lang->words['bbcode_groups_info']}</span></label>
-			{$form['bbcode_groups']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_whereused']}<span class='desctext'>{$this->lang->words['bbcode_whereused_info']}</span></label>
-			{$form['bbcode_sections']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_assoc_app']}</label>
-			{$form['bbcode_app']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_image']}<span class='desctext'>{$this->lang->words['bbcode_image_info']}</span></label>
-			{$form['bbcode_image']}<br />
-			{$this->lang->words['bbcode_image_info_loc']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_optdial']}<span class='desctext'>{$this->lang->words['bbcode_optdial_info']}</span></label>
-			{$form['bbcode_menu_option_text']}
-		</li>
-		<li>
-			<label>{$this->lang->words['bbcode_contdial']}<span class='desctext'>{$this->lang->words['bbcode_contdial_infp']}</span></label>
-			{$form['bbcode_menu_content_text']}
-		</li>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_title']}</span></td>
+			<td class='field_field'>{$form['bbcode_title']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_description']}</strong></td>
+			<td class='field_field'>{$form['bbcode_desc']} <br /><span class='desctext'>{$this->lang->words['bbcode_usedinguide']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_example']}</strong>
+			<td class='field_field'>{$form['bbcode_example']}<span class='desctext'>{$this->lang->words['bbcode_usedinguide']}<br />{$this->lang->words['bbcode_example_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_tag']}</strong></td>
+			<td class='field_field'>{$form['bbcode_tag']} <br /><span class='desctext'>{$this->lang->words['bbcode_tag_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_aliases']}</strong></td>
+			<td class='field_field'>{$form['bbcode_aliases']} <br /><span class='desctext'>{$this->lang->words['bbcode_aliases_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_singletag']}</strong></td>
+			<td class='field_field'>{$form['bbcode_single_tag']} <br /><span class='desctext'>{$this->lang->words['bbcode_singletag_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_useoption']}</strong></td>
+			<td class='field_field'>{$form['bbcode_useoption']} <br /><span class='desctext'>{$this->lang->words['bbcode_useoption_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_customregex']}</strong></td>
+			<td class='field_field'>{$form['bbcode_custom_regex']} <br /><span class='desctext'>{$this->lang->words['bbcode_customregex_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_optional']}</strong></td>
+			<td class='field_field'>{$form['bbcode_optional_option']} <br /><span class='desctext'>{$this->lang->words['bbcode_optional_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_switch']}</strong></td>
+			<td class='field_field'>{$form['bbcode_switch_option']} <br /><span class='desctext'>{$this->lang->words['bbcode_switch_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_noparse']}</strong></td>
+			<td class='field_field'>{$form['bbcode_no_parsing']} <br /><span class='desctext'>{$this->lang->words['bbcode_noparse_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_replace']}</strong></td>
+			<td class='field_field'>{$form['bbcode_replace']} <br /><span class='desctext'>{$this->lang->words['bbcode_replace_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_php']}</strong></td>
+			<td class='field_field'>{$form['bbcode_php_plugin']}<br /><span class='desctext'>{$this->lang->words['bbcode_php_info_loc']} <br />{$this->lang->words['bbcode_php_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_groups']}</strong></td>
+			<td class='field_field'>{$form['bbcode_groups']} <br /><span class='desctext'>{$this->lang->words['bbcode_groups_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_whereused']}</strong></td>
+			<td class='field_field'>{$form['bbcode_sections']} <br /><span class='desctext'>{$this->lang->words['bbcode_whereused_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_assoc_app']}</strong></td>
+			<td class='field_field'>{$form['bbcode_app']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_image']}</strong></td>
+			<td class='field_field'>{$form['bbcode_image']}<br /> <span class='desctext'>{$this->lang->words['bbcode_image_info_loc']} <br />{$this->lang->words['bbcode_image_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_optdial']}</strong></td>
+			<td class='field_field'>{$form['bbcode_menu_option_text']} <br /><span class='desctext'>{$this->lang->words['bbcode_optdial_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_contdial']}</strong></td>
+			<td class='field_field'>{$form['bbcode_menu_content_text']} <br /><span class='desctext'>{$this->lang->words['bbcode_contdial_infp']}</span></td>
+		</tr>
 EOF;
 
+
 if( IN_DEV )
 {
 	$IPBHTML .= <<<EOF
-		<li>
-			<label>{$this->lang->words['bbcode_protected']}<span class='desctext'>{$this->lang->words['bbcode_protected_info']}</span></label>
-			{$form['bbcode_protected']}
-		</li>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['bbcode_protected']}</strong></td>
+			<td class='field_field'>{$form['bbcode_protected']} <br /><span class='desctext'>{$this->lang->words['bbcode_protected_info']}</span></td>
+		</tr>
 EOF;
 }
 
 	$IPBHTML .= <<<EOF
-	</ul>
+	</table>
 	<div class="acp-actionbar">
-		<input type='submit' value=' {$button} ' class="button primary" />
+		<input type='submit' value='{$button}' class="button primary" />
 	</div>
 </div>	
 </form>
@@ -390,7 +417,6 @@ return $IPBHTML;
 /**
  * Media tag add/edit form
  *
- * @access	public
  * @param	string		Type (add|edit)
  * @param	array 		Tag info
  * @param	array 		Errors
@@ -430,22 +456,22 @@ $IPBHTML .= <<<EOF
 <input type='hidden' name='id' value='{$data['mediatag_id']}' />
 <div class="acp-box">
 	<h3>{$title}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['media_title']}<span class='desctext'>{$this->lang->words['media_title_info']}</span></label>			
-			{$form['mediatag_name']}
-		</li>
-		<li>
-			<label>{$this->lang->words['media_match']}<span class='desctext'>{$this->lang->words['media_match_info']}</span></label>
-			{$form['mediatag_match']}
-		</li>
-		<li>
-			<label>{$this->lang->words['media_html']}<span class='desctext'>{$this->lang->words['media_html_info']}</span></label>
-			{$form['mediatag_replace']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['media_title']}</strong></td>
+			<td class='field_field'>{$form['mediatag_name']} <br /><span class='desctext'>{$this->lang->words['media_title_info']}</span></td>			
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['media_match']}</strong></td>
+			<td class='field_field'>{$form['mediatag_match']} <br /><span class='desctext'>{$this->lang->words['media_match_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['media_html']}</strong></td>
+			<td class='field_field'>{$form['mediatag_replace']} <br /><span class='desctext'>{$this->lang->words['media_html_info']}</span></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$button} ' class="button primary" />
+		<input type='submit' value='{$button}' class="button primary" />
 	</div>
 </div>
 </form>
@@ -458,7 +484,6 @@ return $IPBHTML;
 /**
  * Media tags wrapper
  *
- * @access	public
  * @param	string		Content (compiled HTML rows)
  * @return	string		HTML
  */
@@ -472,23 +497,20 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['media_tag_title']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=form_add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['media_add']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=mediatag_export'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_switch.png' alt='' /> {$this->lang->words['media_exports']}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=form_add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['media_add']}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=mediatag_export'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['media_exports']}</a></li>
 	</ul>
 </div>
 
 <div class="acp-box">
 	<h3>{$this->lang->words['media_current']}</h3>
-	<table width='100%'>
+	<table id='mediatag_container' class='ipsTable'>
 		<tr>
+		    <th class='col_drag'>&nbsp;</th>
 			<th width='95%'>{$this->lang->words['media_name']}</th>
 			<th width='5%'>{$this->lang->words['bbcode_options']}</th>
 		</tr>
-		<td colspan='2'>
-			<ul id='sortable_handle' class='alternate_rows'>
-				{$content}
-			</ul>
-		</td>
+		{$content}
 	</table>
 </div>
 <br />
@@ -496,35 +518,24 @@ $IPBHTML .= <<<EOF
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=mediatag_import' method='post' enctype='multipart/form-data'>
 <div class="acp-box">
 	<h3>{$this->lang->words['media_import']}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['media_upload']}<span class='desctext'>{$this->lang->words['media_upload_desc']}</span></label>
-			<input type='file' name='FILE_UPLOAD' />
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['media_upload']}</strong></td>
+			<td class='field_field'><input type='file' name='FILE_UPLOAD' /> <br /><span class='desctext'>{$this->lang->words['media_upload_desc']}</span></td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['media_import_button']}' class="button primary" />
 	</div>
 </div>
 </form>
-<script type="text/javascript">
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { revert: true, format: 'media_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'media' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
 
+<script type='text/javascript'>
+	jQ("#mediatag_container").ipsSortable( 'table', { 
+		url: "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )
+	});
 </script>
+
 EOF;
 
 //--endhtml--//
@@ -534,7 +545,6 @@ return $IPBHTML;
 /**
  * Media tag record
  *
- * @access	public
  * @param	array		Row
  * @return	string		HTML
  */
@@ -544,24 +554,21 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<li id='media_{$row['mediatag_id']}'>
-	<table width='100%' class='hierarchy double_pad'>
-		<tr>
-			<td style='width: 2%; text-align: center'>
-				<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
+
+		<tr id='media_{$row['mediatag_id']}' class='ipsControlRow isDraggable'>
+			<td class='col_drag'>
+				<div class='draghandle'>&nbsp;</div>
 			</td>
-			<td style='width: 93%;'>{$row['mediatag_name']}</td>
-			<td align='right'>
-				<img class="ipbmenu" id="menu{$row['mediatag_id']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">
-				<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id='menu{$row['mediatag_id']}_menucontent'>
-					<li style="z-index: 10000;" class='icon edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=form_edit&id={$row['mediatag_id']}'>{$this->lang->words['media_edit']}</a></li>
-					<li style="z-index: 10000;" class='icon export'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=mediatag_export&id={$row['mediatag_id']}'>{$this->lang->words['media_export']}</a></li>
-					<li style="z-index: 10000;" class='icon delete'><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=do_del&amp;id={$row['mediatag_id']}")'>{$this->lang->words['media_delete']}</a></li>
+			<td style='width: 93%;'><strong class='title'>{$row['mediatag_name']}</td></td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=form_edit&id={$row['mediatag_id']}' title='{$this->lang->words['media_edit']}'>{$this->lang->words['media_edit']}</a></li>
+					<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=do_del&amp;id={$row['mediatag_id']}")' title='{$this->lang->words['media_delete']}'>{$this->lang->words['media_delete']}</a></li>
+					<li class='i_new_folder'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=mediatag_export&id={$row['mediatag_id']}' title='{$this->lang->words['media_export']}'>{$this->lang->words['export_bbcode']}</a></li>
 				</ul>
 			</td>
 		</tr>
-	</table>
-</li>
+
 EOF;
 
 //--endhtml--//
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_diagnostics.php b/upload/admin/applications/core/skin_cp/cp_skin_diagnostics.php
index 6eb64149..2702c0c8 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_diagnostics.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_diagnostics.php
@@ -2,39 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Diagnostics skin file
- * Last Updated: $Date: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6863 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_diagnostics extends output
+class cp_skin_diagnostics
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Connection checker
  *
- * @access	public
  * @param	string		Raw HTTP headers
  * @param	string		Request result
  * @param	string		Raw HTTPS headers
@@ -51,24 +80,29 @@ $output_ssl	= IPSText::mbsubstr( htmlspecialchars($output_ssl), 0, 2000 );
 
 $IPBHTML .= <<<EOF
 <div class='information-box'>
- <h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/information.png' alt='' />&nbsp; {$this->lang->words['ipb_message']}</h4>
- {$this->lang->words['connections__message']}
+	{$this->lang->words['connections__message']}
 </div>
 <br />
 <div class='section_title'>
 	<h2>{$this->lang->words['connectionchecker']}</h2>
 </div>
 
-<div class="acp-box">
+<div class='acp-box'>
 	<h3>{$this->lang->words['connections__headers']}</h3>
 	<pre style='overflow: auto;'>{$headers}</pre>
-	<br />
+</div>
+<br />
+<div class='acp-box'>
 	<h3>{$this->lang->words['connections__output']}</h3>
 	<pre style='overflow: auto;'>{$output}</pre>
-	<br />
+</div>
+<br />
+<div class='acp-box'>
 	<h3>{$this->lang->words['connections__headers1']}</h3>
 	<pre style='overflow: auto;'>{$headers_ssl}</pre>
-	<br />
+</div>
+<br />
+<div class='acp-box'>
 	<h3>{$this->lang->words['connections__output1']}</h3>
 	<pre style='overflow: auto;'>{$output_ssl}</pre>
 </div>
@@ -81,7 +115,6 @@ return $IPBHTML;
 /**
  * DB Index checker
  *
- * @access	public
  * @param	array 		Errors
  * @param	array 		Tables
  * @return	string		HTML
@@ -99,22 +132,18 @@ HTML;
 if( count( $errors ) )
 {
 $IPBHTML .= <<<HTML
-<div class='acp-box alternate_rows'>
-	<table width='100%'>
-		<th>{$this->lang->words['d_ierrors']}</th>
-		<tr>
-			<td><span class='rss-feed-invalid'>{$this->lang->words['d_ifixall']}<a href='{$this->settings['base_url']}{$this->form_code}&amp;section=diagnostics&amp;do=dbindex&amp;fix=all'>{$this->lang->words['d_ifixall_link']}</a></span></td>
-		</tr>
-	</table>
-</div><br />
+<div class='warning'>
+	{$this->lang->words['d_ifixall']} <a href='{$this->settings['base_url']}{$this->form_code}&amp;section=diagnostics&amp;do=dbindex&amp;fix=all'>{$this->lang->words['d_ifixall_link']}</a>
+</div>
+<br />
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-<div class='acp-box alternate_rows'>
+<div class='acp-box'>
 	<h3>{$this->lang->words['d_dnav']}</h3>
 
-	<table width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th>{$this->lang->words['chckr_table']}</th>
 			<th>{$this->lang->words['chckr_status']}</th>
@@ -212,7 +241,6 @@ return $IPBHTML;
 /**
  * DB checker
  *
- * @access	public
  * @param	array 		Errors
  * @param	array 		Tables
  * @return	string		HTML
@@ -230,22 +258,18 @@ HTML;
 if( count( $errors ) )
 {
 $IPBHTML .= <<<HTML
-<div class='acp-box alternate_rows'>
-	<table width='100%'>
-		<th>{$this->lang->words['d_ierrors']}</th>
-		<tr>
-			<td><span class='rss-feed-invalid'>{$this->lang->words['d_ifixall']}<a href='{$this->settings['base_url']}{$this->form_code}&amp;section=diagnostics&amp;do=dbchecker&amp;fix=all'>{$this->lang->words['d_ifixall_link']}</a></span></td>
-		</tr>
-	</table>
-</div><br />
+<div class='warning'>
+	{$this->lang->words['d_ifixall']} <a href='{$this->settings['base_url']}{$this->form_code}&amp;section=diagnostics&amp;do=dbchecker&amp;fix=all'>{$this->lang->words['d_ifixall_link']}</a>
+</div>
+<br />
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-<div class='acp-box alternate_rows'>
+<div class='acp-box'>
 	<h3>{$this->lang->words['d_dnav']}</h3>
 
-	<table width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th>{$this->lang->words['d_dtbl']}</th>
 			<th>{$this->lang->words['d_dstatus']}</th>
@@ -326,7 +350,6 @@ return $IPBHTML;
 /**
  * Version history record
  *
- * @access	public
  * @param	array 		Version info
  * @return	string		HTML
  */
@@ -337,8 +360,8 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <tr>
- <td class='tablerow1'>{$r['upgrade_version_human']} ({$r['upgrade_version_id']})</td>
- <td class='tablerow2'>{$r['_date']}</td>
+	<td class='field_title'><strong class='title'>{$r['upgrade_version_human']} ({$r['upgrade_version_id']})</strong></td>
+	<td class='field_field'>{$r['_date']}</td>
 </tr>
 EOF;
 
@@ -349,7 +372,6 @@ return $IPBHTML;
 /**
  * Version history wrapper
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -360,11 +382,11 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <a name='versions'></a>
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['last_5_version_history']}</div>
- <table width='100%' cellpadding='4' cellspacing='0'>
- {$content}
- </table>
+<div class="acp-box">
+	<h3>{$this->lang->words['last_5_version_history']}</h3>
+	<table class='ipsTable'>
+		{$content}
+	</table>
 </div>
 <br />
 EOF;
@@ -376,7 +398,6 @@ return $IPBHTML;
 /**
  * Diagnostics overview
  *
- * @access	public
  * @param	array 		Data
  * @return	string		HTML
  */
@@ -392,7 +413,7 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['cp_systemstats']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 		{$statsbox}
 	</table>
 </div>
@@ -400,67 +421,67 @@ $IPBHTML .= <<<EOF
 
 <div class="acp-box">
 	<h3>{$this->lang->words['sys_system_overview']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<td><strong>{$this->lang->words['sys_ipboard_version']}</strong></td>
-			<td>{$data['version']} (ID:{$data['version_full']})</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_ipboard_version']}</strong></td>
+			<td class='field_field'>{$data['version']} (ID:{$data['version_full']})</td>
 		</tr>
 		<tr>
-			<td><strong>{$data['driver_type']} {$this->lang->words['sys_version']}</strong></td>
-			<td>{$data['version_sql']}</td>
+			<td class='field_title'><strong class='title'>{$data['driver_type']} {$this->lang->words['sys_version']}</strong></td>
+			<td class='field_field'>{$data['version_sql']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_php_version']}</strong></td>
-			<td>{$data['version_php']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_php_version']}</strong></td>
+			<td class='field_field'>{$data['version_php']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_disabled_funcs']}</strong></td>
-			<td>{$data['disabled']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_disabled_funcs']}</strong></td>
+			<td class='field_field'>{$data['disabled']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_loaded_ext']}</strong></td>
-			<td>{$data['extensions']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_loaded_ext']}</strong></td>
+			<td class='field_field'>{$data['extensions']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_safe_mod']}</strong></td>
-			<td>{$data['safe_mode']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_safe_mod']}</strong></td>
+			<td class='field_field'>{$data['safe_mode']}</td>
 		</tr>
 EOF;
 	if ( defined( 'IPS_TOPICMARKERS_DEBUG' ) and IPS_TOPICMARKERS_DEBUG === TRUE )
 	{
 		$IPBHTML .= <<<EOF
 		<tr>
-			<td><strong>От�леживание прочитанно�ти тем</strong></td>
-			<td>ON ( <a href='{$this->settings['base_url']}{$this->form_code}&amp;do=tm_index'>Про�мотр журнала</a> )</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['topicmarkingdebug']}</strong></td>
+			<td class='field_field'>{$this->lang->words['tmdebug_on']} ( <a href='{$this->settings['base_url']}{$this->form_code}&amp;do=tm_index'>{$this->lang->words['tmdebug_logs']}</a> )</td>
 		</tr>
 EOF;
 	}
 
 $IPBHTML .= <<<EOF
 		<tr>
-			<td><strong>{$this->lang->words['sys_sys_software']}</strong></td>
-			<td>{$data['server']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_sys_software']}</strong></td>
+			<td class='field_field'>{$data['server']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_current_load']}</strong></td>
-			<td>{$data['load']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_current_load']}</strong></td>
+			<td class='field_field'>{$data['load']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_total_mem']}</strong></td>
-			<td>{$data['total_memory']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_total_mem']}</strong></td>
+			<td class='field_field'>{$data['total_memory']}</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['sys_avail_mem']}</strong></td>
-			<td>{$data['avail_memory']}</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_avail_mem']}</strong></td>
+			<td class='field_field'>{$data['avail_memory']}</td>
 		</tr>
 	</table>
 </div>
 <br />
-<div class="tableborder">
-	<div class="tableheaderalt">{$this->lang->words['system_processes']}</div>
-	<table cellpadding='0' cellspacing='0' width='100%'>
+<div class="acp-box">
+	<h3>{$this->lang->words['system_processes']}</h3>
+	<table class='ipsTable'>
 		<tr>
-			<td class='tablerow1' width='100%'>{$data['tasks']}</td>
+			<td width='100%'>{$data['tasks']}</td>
 		</tr>
 	</table>
 </div>
@@ -474,7 +495,6 @@ return $IPBHTML;
 /**
  * Version checker
  *
- * @access	public
  * @param	array 		Versions
  * @param	string		History info
  * @param	array 		Results
@@ -492,34 +512,18 @@ $IPBHTML .= <<<EOF
 
 <div class="acp-box">
 	<h3>{$this->lang->words['d_vinfo']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<td class='tablerow1' width='30%'>{$this->lang->words['sys_ipboard_version']}</td>
-			<td class='tablerow2' width='70%'>{$versions['version']} (ID:{$versions['version_full']})</td>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_ipboard_version']}</strong></td>
+			<td class='field_field'>{$versions['version']} (ID:{$versions['version_full']})</td>
 		</tr>
-EOF;
-
-if( !$history )
-{
-	$IPBHTML .= <<<EOF
-		<tr>
-			<td class='tablerow1' width='30%'>И�тори� обновлений</td>
-			<td class='tablerow2' width='70%'><i>Обновлений не было или и�тори� от�ут�твует</i></td>
-		</tr>
-EOF;
-}
-else
-{
-	$IPBHTML .= $history;
-}
-
-$IPBHTML .= <<<EOF
+		{$history}
 	</table>
 </div>
 <br />
 <div class="acp-box">
 	<h3>{$this->lang->words['d_vnav']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 EOF;
 
 if( count($results) AND is_array($results) )
@@ -537,8 +541,8 @@ if( count($results) AND is_array($results) )
 
 		$IPBHTML .= <<<EOF
 			<tr>
-				<td width="90%">{$file}</td>
-				<td>{$version}</td>
+				<td width="90%" style='padding: 5px;'>{$file}</td>
+				<td style='padding: 5px;'>{$version}</td>
 			</tr>
 EOF;
 	}
@@ -557,7 +561,6 @@ return $IPBHTML;
 /**
  * Permission checker results
  *
- * @access	public
  * @param	array 		Results from permission checking
  * @return	string		HTML
  */
@@ -573,7 +576,7 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['perm_check_results']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 EOF;
 
 if( count($results) AND is_array($results) )
@@ -600,7 +603,6 @@ return $IPBHTML;
 /**
  * Whitespace checker
  *
- * @access	public
  * @param	array 		Results from checking for whitespace
  * @return	string		HTML
  */
@@ -616,7 +618,7 @@ $IPBHTML .= <<<EOF
 
 <div class="acp-box">
 	<h3>{$this->lang->words['d_wnav']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 EOF;
 
 if( count($results) AND is_array($results) )
@@ -625,7 +627,7 @@ if( count($results) AND is_array($results) )
 	{
 		$IPBHTML .= <<<EOF
 			<tr>
-				<td>{$result} {$this->lang->words['d_wfound']}</td>
+				<td><strong>{$result} {$this->lang->words['d_wfound']}</strong></td>
 			</tr>
 EOF;
 	}
@@ -648,279 +650,9 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * view log entry in pop-up window
- */
-function topicMarkers_viewLog( $data ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='acp-box'>
-<h3>{$data['marker_message']} - ID пользовател�: {$data['marker_member_id']}</h3>
-<table class='alternate_rows' width='100%'>
-	<thead>
-		<tr>
-			<th width='15%'>Ключ</th>
-			<th width='85%'>Значение</th>
-			</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td><strong>Врем�</strong></td>
-			<td>{$data['_marker_timestamp']}</td>
-	    </tr>
-		<tr>
-			<td><strong>URL</strong></td>
-			<td>{$data['marker_url']}</td>
-	    </tr>
-		<tr>
-			<td><strong>Се��и�</strong></td>
-			<td>{$data['marker_session_key']}</td>
-	    </tr>
-EOF;
-	
-	foreach( array( 1,2,3,4,5 ) as $n )
-	{
-		if ( $data['marker_data_' . $n ] )
-		{
-			$IPBHTML .= <<<EOF
-			<tr>
-				<td valign='top'><strong>marker_data_{$n}</strong></td>
-				<td>{$this->topicMarkers_arrayLoop($data['marker_data_' . $n ])}</td>
-		    </tr>
-EOF;
-		}
-	}
-	
-	foreach( array( 'storage', 'memory', 'freezer' ) as $n )
-	{
-		if ( $data['marker_data_' . $n ] )
-		{
-			$IPBHTML .= <<<EOF
-			<tr>
-				<td valign='top' onclick="$('tm__{$n}').toggle();"><strong><a href='javascript:void(0)' title='Скрыть/Показать'>marker_data_{$n}</a></strong></td>
-				<td id='tm__{$n}'>{$this->topicMarkers_arrayLoop($data['marker_data_' . $n ])}</td>
-		    </tr>
-EOF;
-		}
-	}
-
-$IPBHTML .=<<<EOF
-		<tbody>
-	</table>
-</div>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Topic marker array loop
- *
- * @access	public
- * @param	array 		Results
- * @return	string		HTML
- */
-/**
- * view log entry in pop-up window
- */
-function topicMarkers_arrayLoop( $data ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-if ( ! is_array( $data ) AND substr( $data, 0, 2 ) == 'a:' )
-{
-	$data = unserialize( $data );
-}
-
-$this->_indexLoop++;
-
-$IPBHTML .= <<<EOF
-<table class='alternate_rows' width='100%'>
-	<thead>
-		<tr>
-			<th width='20%'>Ключ</th>
-			<th width='80%'>Значение</th>
-			</tr>
-		</thead>
-		<tbody>
-EOF;
-	if ( is_array( $data ) AND count( $data ) )
-	{
-		foreach( $data as $k => $v )
-		{
-			if ( ! is_array( $v ) AND substr( $v, 0, 2 ) == 'a:' )
-			{
-				$v = unserialize( $v );
-			}
-			
-			if ( is_array( $v ) and count( $v ) )
-			{
-				$_key = md5( $k . serialize( $v ) . '__' . $this->_indexLoop );
-				
-				$IPBHTML .= "
-				<tr>
-					<td valign='top' onclick=\"$('tmi__{$_key}').toggle();\"><strong><a href='javascript:void(0)' title='Скрыть/Показать'>{$k}</a></strong></td>
-					<td id='tmi__{$_key}'>" . $this->topicMarkers_arrayLoop( $v ) . "</td>
-			    </tr>\n";
-			}
-			else
-			{
-				if ( is_int( $v ) AND strlen( $v ) == 10 )
-				{
-					$_t = $this->registry->class_localization->getDate( $v, 'long' );
-				}
-				
-				$IPBHTML .= <<<EOF
-					<tr>
-						<td valign='top'><strong>{$k}</strong></td>
-						<td><span title='$_t'>{$v}</span></td>
-				    </tr>
-EOF;
-			}
-		}
-	}
-$IPBHTML .=<<<EOF
-		<tbody>
-	</table>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-/**
- * Topic marker main index
- *
- * @access	public
- * @param	array 		Results
- * @return	string		HTML
- */
-public function topicMarkers_membersIndex( $member, $markers, $pages ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-{$pages}
-<br style='clear: both' />
-<div class='section_title'>
-	<h2><img src='{$member['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /> Прочитанные темы: {$member['members_display_name']}'s logs</h2>
-</div>
-
-<div class='acp-box'>
-	<h3>Прочитанные темы</h3>
-	<table class='alternate_rows'>
-	<tr>
-		<th style='width: 5%'></th>
-		<th style='width: 20%'>Сообщение</th>
-		<th style='width: 30%'>Верм�</th>
-		<th style='width: 45%'>URL</th>
-		<th style='width: 20%'>Дей�тви�</th>
-	</tr>
-EOF;
-
-if( count($markers) AND is_array($markers) )
-{
-	$lastSessionKey = '';
-	
-	foreach( $markers as $marker )
-	{
-		$style = ( $lastSessionKey AND $lastSessionKey != $marker['marker_session_key'] ) ? 'border-top:1px dotted #999' : '';
-		$time  = $this->registry->class_localization->getDate( $marker['marker_timestamp'], 'long' );
-		$url   = str_replace( str_replace( 'http://', '', $this->settings['_original_base_url'] ), '', $marker['marker_url'] );
-		$_key  = base64_encode( $marker['marker_microtime'] );
-		
-		$IPBHTML .= <<<EOF
-			<tr style='$style'>
-				<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/disk.png' alt='' /></td>
-				<td><strong>{$marker['marker_message']}</strong></td>
-				<td>{$time}</td>
-				<td><span style='font-size:0.9em;color:gray'>{$url}</span></td>
-				<td>
-					<img class='ipbmenu' id="menu-{$_key}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-					<ul class='acp-menu' id='menu-{$_key}_menucontent'>
-						<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=tm_memberindex&amp;member_id={$marker['marker_member_id']}&amp;marker_session_key={$marker['marker_session_key']}'>Про�мотр �е��ий</a></li>
-						<li class='icon view'><a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=tm_viewLog&amp;member_id={$marker['marker_member_id']}&amp;_id={$_key}', 800, 800, 'log-{$_key}');">Про�мотр в�его журнала</a></li>
-					</ul>
-				</td>
-			</tr>
-EOF;
-
-		$lastSessionKey = $marker['marker_session_key'];
-	}
-}
-
-$IPBHTML .= <<<EOF
-	</table>
-</div>
-<br style='clear: both' />
-{$pages}
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Topic marker main index
- *
- * @access	public
- * @param	array 		Results
- * @return	string		HTML
- */
-public function topicMarkers_index( $results=array() ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>Отметка прочтенно�ти тем</h2>
-</div>
-
-<div class='acp-box'>
-	<h3>Се��ии</h3>
-	<table class='alternate_rows'>
-EOF;
-
-if( count($results) AND is_array($results) )
-{
-	foreach( $results as $result )
-	{
-		$time = $this->registry->class_localization->getDate( $result['max_ts'], 'short' );
-		$IPBHTML .= <<<EOF
-			<tr>
-				<td width='5%'>
-					<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$result['_memberData']['member_id']}'><img src='{$result['_memberData']['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /></a>
-				</td>			
-				<td width='40%' class='member_name'>
-					<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$result['_memberData']['member_id']}'>{$result['_memberData']['members_display_name']}</a>
-					<div style='font-weight:normal'>{$result['_memberData']['_group_formatted']}</div>
-				</td>
-				<td width='30%'>По�леднее: {$time}</td>
-				<td width='25%' align='right'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=tm_memberindex&amp;member_id={$result['_memberData']['member_id']}'>Запи�и журнала ({$result['count']})</a></td>
-			</tr>
-EOF;
-	}
-}
-
-$IPBHTML .= <<<EOF
-	</table>
-</div>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * phpinfo() output
  *
- * @access	public
  * @param	string		Content from running phpinfo()
  * @return	string		HTML
  */
@@ -952,7 +684,6 @@ return $IPBHTML;
 /**
  * ACP Statistics wrapper
  *
- * @access	public
  * @param	array		Content
  * @return	string		HTML
  */
@@ -963,44 +694,42 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 	<tr>
-		<td>
-			<strong>{$this->lang->words['cp_totalmembers']}</strong>
+		<td class='field_title'>
+			<strong class='title'>{$this->lang->words['cp_totalmembers']}</strong>
 			<div class='sub desctext'>
 				{$this->lang->words['cp_onlinenow']}<br />
 				{$this->lang->words['cp_awaitingvalidation']}<br />
 				{$this->lang->words['cp_lockedaccounts']}<br />
-				{$this->lang->words['cp_coppaaccounts']}<br />
 				{$this->lang->words['cp_spammeraccounts']}
 			</div>				
 		</td>
-		<td>
+		<td class='field_field' style='vertical-align: top;'>
 			{$content['members']}
-			<div class='desctext'>
+			<div class='sub desctext'>
 				<a href='{$this->settings['board_url']}/index.php?app=members&amp;section=online&amp;module=online' target='_blank' title='{$this->lang->words['cp_onlinenow_info']}'>{$this->lang->words['cp_view']}</a> ({$content['sessions']})<br />
-				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=validating'>{$this->lang->words['cp_manage']}</a> ({$content['validate']})<br />
-				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=locked'>{$this->lang->words['cp_manage']}</a> ({$content['locked']})<br />
-				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=validating&amp;filter=coppa'>{$this->lang->words['cp_manage']}</a> ({$content['coppa']})<br />
-				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=spam'>{$this->lang->words['cp_manage']}</a> ({$content['spammer'][0]})
+				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=members_overview&amp;type=validating'>{$this->lang->words['cp_manage']}</a> ({$content['validate']})<br />
+				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=members_overview&amp;type=locked'>{$this->lang->words['cp_manage']}</a> ({$content['locked']})<br />
+				<a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=members_overview&amp;type=spam'>{$this->lang->words['cp_manage']}</a> ({$content['spammer']})
 			</div>
 		</td>
 	</tr>
 	<tr>
-		<td>
-			<strong>{$this->lang->words['cp_topics']}</strong>
+		<td class='field_title'>
+			<strong class='title'>{$this->lang->words['cp_topics']}</strong>
 			<div class='sub desctext'>
 				{$this->lang->words['cp_awaitingmoderation']}
 			</div>
 		</td>
-		<td>{$content['topics']}<br /><span class='desctext'>{$content['topics_mod']}</span></td>
+		<td class='field_field'>{$content['topics']}<br /><span class='desctext'>{$content['topics_mod']}</span></td>
 	</tr>
 	<tr>
-		<td>
-			<strong>{$this->lang->words['cp_posts']}</strong>
+		<td class='field_title'>
+			<strong class='title'>{$this->lang->words['cp_posts']}</strong>
 			<div class='sub desctext'>
 				{$this->lang->words['cp_awaitingmoderation']}
 			</div>
 		</td>
-		<td>{$content['replies']}<br /><span class='desctext'>{$content['posts_mod']}</span></td>
+		<td class='field_field'>{$content['replies']}<br /><span class='desctext'>{$content['posts_mod']}</span></td>
 	</tr>
 EOF;
 
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_emailerrorlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_emailerrorlogs.php
index aff0fe4d..22a6199c 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_emailerrorlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_emailerrorlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Email error logs
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_emailerrorlogs extends output
+class cp_skin_emailerrorlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the splash screen for the email error logs
  *
- * @access	public
  * @param	array 		Records
  * @param	string		Page links
  * @return	string		HTML
@@ -71,7 +101,7 @@ $IPBHTML .= <<<HTML
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['erlog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='25%'>{$this->lang->words['erlog_to']}</th>
 			<th width='25%'>{$this->lang->words['erlog_subject']}</th>
@@ -108,10 +138,11 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class="acp-actionbar">
-		<div class="leftaction">{$links}</div>
-		<div class="rightaction">
+		<div class="right">
 			<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;{$this->lang->words['erlog_removeall']}&nbsp;<input type="submit" value="{$this->lang->words['erlog_removechecked']}" class="button primary" />
 		</div>
+		<div class="left">{$links}</div>
+		<br class='clear' />
 	</div>
 </div>
 </form>
@@ -123,7 +154,13 @@ $IPBHTML .= <<<HTML
 
 	<div class="acp-box">
 		<h3>{$this->lang->words['erlog_search']}</h3>
-		<p align="center">{$this->lang->words['erlog_searchwhere']} {$form['type']} {$form['match']} {$form['string']}</p>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['erlog_searchwhere']}</strong></td>
+				<td class='field_field'>{$form['type']} {$form['match']} {$form['string']}</td>
+			</tr>
+		</table>
+		
 		<div class="acp-actionbar">
 			<input value="{$this->lang->words['erlog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
 		</div>
@@ -139,7 +176,6 @@ return $IPBHTML;
 /**
  * Record for an email error log entry
  *
- * @access	public
  * @param	array 		Email error log record
  * @return	string		HTML
  */
@@ -151,7 +187,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$row['mlog_subject']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<td width='15%'>{$this->lang->words['erlog_log_from']}</td>
 			<td>&lt;{$row['mlog_from']}&gt;</td>
@@ -173,8 +209,9 @@ $IPBHTML .= <<<HTML
 		</tr>
 		<tr>
 			<td colspan='2'>{$this->lang->words['erlog_ipberror']} {$row['mlog_msg']}
-											  <br />{$this->lang->words['erlog_smtpcode']} {$row['mlog_code']}
-											  <br />{$this->lang->words['erlog_smtperror']} {$row['mlog_smtp_error']}</td>
+				<br />{$this->lang->words['erlog_smtpcode']} {$row['mlog_code']}
+				<br />{$this->lang->words['erlog_smtperror']} {$row['mlog_smtp_error']}
+			</td>
 		</tr>
 	</table>
 </div>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_emaillogs.php b/upload/admin/applications/core/skin_cp/cp_skin_emaillogs.php
deleted file mode 100644
index 36c089ec..00000000
--- a/upload/admin/applications/core/skin_cp/cp_skin_emaillogs.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Email logs skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6326 $
- */
- 
-class cp_skin_emaillogs extends output
-{
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Email logs wrapper
- *
- * @access	public
- * @param	array 		Email log rows
- * @param	string		Page links
- * @return	string		HTML
- */
-public function emaillogsWrapper( $rows, $links ) {
-
-$form_array = array(
-					  0 => array( 'subject'    , $this->lang->words['elog_subject']    ),
-					  1 => array( 'content'    , $this->lang->words['elog_body'] ),
-					  2 => array( 'email_from' , $this->lang->words['elog_from'] ),
-					  3 => array( 'email_to'   , $this->lang->words['elog_to']   ),
-					  4 => array( 'name_from'  , $this->lang->words['elog_from_name'] ),
-					  5 => array( 'name_to'    , $this->lang->words['elog_to_name'] ),
-				   );
-				   
-$type_array = array(
-					  0 => array( 'exact'      , $this->lang->words['elog_exactly'] ),
-					  1 => array( 'loose'      , $this->lang->words['elog_loose']   ),
-				   );
-$form				= array();
-
-$form['type']		= $this->registry->output->formDropdown( "type" , $form_array, $this->request['type'] );
-$form['match']		= $this->registry->output->formDropdown( "match", $type_array, $this->request['match'] );
-$form['string']		= $this->registry->output->formInput( "string", $this->request['string'] );
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<script type='text/javascript' src='{$this->settings['js_main_url']}acp.forms.js'></script>
-
-<div class='section_title'>
-	<h2>{$this->lang->words['elog_title']}</h2>
-</div>
-
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
-<input type='hidden' name='do' value='remove' />
-<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
-<div class="acp-box">
-	<h3>{$this->lang->words['elog_theemails']}</h3>
-	<table class="alternate_rows" width='100%'>
-		<tr>
-			<th width='25%'>{$this->lang->words['elog_from_name']}</th>
-			<th width='25%'>{$this->lang->words['elog_subject']}</th>
-			<th width='27%'>{$this->lang->words['elog_to_name']}</th>
-			<th width='20%'>{$this->lang->words['elog_date']}</th>
-			<th width='3%'><input type='checkbox' title="{$this->lang->words['my_checkall']}" id='checkAll' /></th>
-		</tr>
-HTML;
-
-if( count($rows) AND is_array($rows) )
-{
-	foreach( $rows as $row )
-	{
-		$IPBHTML .= <<<HTML
-		<tr>
-			<!--ACPNOTE: Missing acp_search.gif -->
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=list&amp;type=fromid&amp;id={$row['member_id']}' title='{$this->lang->words['elog_show_title']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/view.png' alt='{$this->lang->words['elog_byid']}'></a>&nbsp;<b><a href='{$this->settings['board_url']}/index.{$this->settings['php_ext']}?showuser={$row['member_id']}' title='{$this->lang->words['elog_profile']}' target='_blank'>{$row['members_display_name']}</a></b></td>
-			<td><a href='#' onclick='return acp.openWindow("{$this->settings['base_url']}&{$this->form_code_js}&do=viewemail&id={$row['email_id']}",400,350,"{$row['email_id']}")' title='{$this->lang->words['elog_read']}'>{$row['email_subject']}</a></td>
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=list&amp;type=toid&amp;id={$row['to_id']}' title='{$this->lang->words['elog_show_title']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/view.png' alt='{$this->lang->words['elog_byid']}'></a>&nbsp;<b><a href='{$this->settings['board_url']}/index.{$this->settings['php_ext']}?showuser={$row['to_id']}' title='{$this->lang->words['elog_profile']}' target='_blank'>{$row['to_name']}</a></b></td>
-			<td>{$row['_date']}</td>
-			<td><input type='checkbox' name='id_{$row['email_id']}' value='1' class='checkAll' /></td>
-		</tr>
-HTML;
-	}
-}
-else
-{
-	$IPBHTML .= <<<HTML
-		<tr>
-			<td colspan='5' align='center'>{$this->lang->words['elog_noresults']}</td>
-		</tr>
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-	</table>
-	<div class="acp-actionbar">
-		<div class="leftaction">{$links}</div>
-		<div class="rightaction">
-			<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;{$this->lang->words['elog_removeall']}&nbsp;<input type="submit" value="{$this->lang->words['elog_removechecked']}" class="button primary" />
-		</div>
-	</div>
-</div>
-</form>
-<br />
-
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
-	<input type='hidden' name='do' value='list' />
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
-
-	<div class="acp-box">
-		<h3>{$this->lang->words['elog_search']}</h3>
-		<p align="center">{$this->lang->words['elog_searchwhere']} {$form['type']} {$form['match']} {$form['string']}</p>
-		<div class="acp-actionbar">
-			<input value="{$this->lang->words['elog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
-		</div>
-	</div>
-</form>
-
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Email log entry
- *
- * @access	public
- * @param	array 		Email log entry
- * @return	string		HTML
- */
-public function emaillogsEmail( $row ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class="acp-box">
-	<h3>{$row['email_subject']}</h3>
-	<table class="alternate_rows" width='100%'>
-		<tr>
-			<td width='15%'>{$this->lang->words['elog_log_from']}</td>
-			<td>{$row['members_display_name']} &lt;{$row['from_email_address']}&gt;</td>
-		</tr>
-		<tr>
-			<td width='15%'>{$this->lang->words['elog_log_to']}</td>
-			<td>{$row['to_name']} &lt;{$row['to_email_address']}&gt;</td>
-		</tr>
-		<tr>
-			<td width='15%'>{$this->lang->words['elog_log_sent']}</td>
-			<td>{$row['_date']}</td>
-		</tr>
-		<tr>
-			<td width='15%'>{$this->lang->words['elog_log_ip']}</td>
-			<td>{$row['from_ip_address']}</td>
-		</tr>
-		<tr>
-			<td width='15%'>{$this->lang->words['elog_log_subject']}</td>
-			<td>{$row['email_subject']}</td>
-		</tr>	
-		<tr>
-			<td colspan='2'>{$row['email_content']}</td>
-		</tr>
-	</table>
-</div>
-<br />
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_emoticons.php b/upload/admin/applications/core/skin_cp/cp_skin_emoticons.php
index 4ffe626c..33970028 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_emoticons.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_emoticons.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Emoticon manager skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-09-27 21:33:45 -0400 (Tue, 27 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6326 $
+ * @version		$Revision: 9556 $
  */
  
-class cp_skin_emoticons extends output
+class cp_skin_emoticons
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Emoticon pack splash page
  *
- * @access	public
  * @param	array 		Form elements
  * @return	string		HTML
  */
@@ -54,17 +84,20 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['emote_export']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['emote_export_which']}<span class='desctext'>{$this->lang->words['emote_xml_pack']}</span></label>
-				{$form['emo_set']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['emote_export_which']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['emo_set']}<br />
+					<span class='desctext'>{$this->lang->words['emote_xml_pack']}</span>
+				</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['emote_export_button']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['emote_export_button']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
@@ -77,39 +110,48 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['emote_import']}</h3>
 
-		<table width='100%' class='alternate_rows'>
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td width='60%' valign='middle'>
-					{$this->lang->words['emote_import_which']}<br />
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['emote_import_which']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['emo_set']}<br />
 					<span class='desctext'>{$this->lang->words['emote_xml_export']}</span>					
 				</td>
-				<td width='40%' valign='middle'>{$form['emo_set']}</td>
 			</tr>
 			
 			<tr>
-				<td  width='60%' valign='middle'>
-					{$this->lang->words['emote_import_newgroup']}<br />
-					<span class='desctext'>{$this->lang->words['emote_import_name']}</span>					
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['emote_import_newgroup']}</strong>				
+				</td>
+				<td class='field_field'>
+					{$form['new_emo_set']}<br />
+					<span class='desctext'>{$this->lang->words['emote_import_name']}</span>
 				</td>
-				<td width='40%' valign='middle'>{$form['new_emo_set']}</td>
 			</tr>
 			<tr>
-				<td width='60%' valign='middle'>
-					{$this->lang->words['emote_import_over']}<br />
-					<span class='desctext'>{$this->lang->words['emote_import_replace']}</span>					
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['emote_import_over']}</strong>					
+				</td>
+				<td class='field_field'>
+					{$form['overwrite']}<br />
+					<span class='desctext'>{$this->lang->words['emote_import_replace']}</span>
 				</td>
-				<td width='40%' valign='middle'>{$form['overwrite']}</td>
 			</tr>
 			<tr>
-				<td width='60%' valign='middle'>{$this->lang->words['emote_import_upload']}<br /><span class='desctext'>{$this->lang->words['emote_import_browse']}</span></td>
-				<td width='40%' valign='middle'><input class='textinput' type='file' size='30' name='FILE_UPLOAD'></td>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['emote_import_upload']}</strong>
+				</td>
+				<td class='field_field'>
+					<input class='textinput' type='file' size='30' name='FILE_UPLOAD'><br />
+					<span class='desctext'>{$this->lang->words['emote_import_browse']}</span>
+				</td>
 			</tr>
 		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['emote_import_button']}' class='button primary' accesskey='s'>
-			</div>
-		</div>		
+			<input type='submit' value='{$this->lang->words['emote_import_button']}' class='button primary' accesskey='s'>
+		</div>
 	</div>
 </form>
 HTML;
@@ -120,14 +162,13 @@ return $IPBHTML;
 /**
  * Show the splash screen for the logs
  *
- * @access	public
  * @param	array 		Db records
  * @param	array 		File records
  * @param	string		Width for table cells
  * @param	int			Number of emoticons per row
  * @return	string		HTML
  */
-public function emoticonsDirectoryManagement( $db_rows, $file_rows, $td_width, $per_row )
+public function emoticonsDirectoryManagement( $db_rows, $file_rows )
 {
 $IPBHTML = "";
 //--starthtml--//
@@ -142,72 +183,45 @@ $IPBHTML .= <<<HTML
 	
 	<form action='{$this->settings['base_url']}{$this->form_code}do=emo_doedit&id={$this->request['id']}' method='post'>
 		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-		
-		<table class='alternate_rows' width='100%'>
-			<tr align='center'>
+		<table class='ipsTable' id='emoticons_table'>
 HTML;
 
 /* Loop through the database emoticons */
-$count = 0;
+$count   = 0;
+$_public = PUBLIC_DIRECTORY;
 
 foreach( $db_rows as $r )
-{
-	$count++;
-	
+{	
 $IPBHTML .= <<<HTML
-				<td width='{$td_width}%' align='center'>
-					<fieldset>
-						<legend><strong>{$r['image']}</strong></legend>
-						
-						<input type='hidden' name='emo_id_{$r['id']}' value='{$r['id']}' />					
-						<img src='../public/style_emoticons/{$this->request['id']}/{$r['image']}' />&nbsp;&nbsp;&nbsp;&nbsp;
+			<tr class='ipsControlRow isDraggable' id='emoticons_{$r['id']}'>
+				<td class='col_drag'><div class='draghandle'>&nbsp;</div></td>
+				<td width='60%'>
+					<input type='hidden' name='emo_id_{$r['id']}' value='{$r['id']}' />	
+					<img src='../{$_public}/style_emoticons/{$this->request['id']}/{$r['image']}' />
+					&nbsp; &nbsp; <span class='ipsBadge badge_grey'>{$r['image']}</span>	
+				</td>
+				<td width='30%' align='right'>
 HTML;
 			if( $this->request['id'] == 'default' )
 			{
 $IPBHTML .= <<<HTML
-						<a href='{$this->settings['base_url']}{$this->form_code}do=emo_remove&eid={$r['id']}&id={$this->request['id']}' title='{$this->lang->words['emote_delete_title']}'>
-							<img src='{$this->settings['skin_acp_url']}/images/emo_delete.gif' alt='{$this->lang->words['emote_delete_title']}' />						
-						</a>
-						<br />
-						<input type='textinput' class='realbutton' size='10' name='emo_type_{$r['id']}' value='{$r['typed']}' />
+						<input type='textinput' class='input_text' size='20' name='emo_type_{$r['id']}' value='{$r['typed']}' />
 HTML;
 			}
 			else
 			{
 $IPBHTML .= <<<HTML
-						<br /><br /><span style='font-family:Verdana,Arial;font-size:10px;font-weight:bold;'>{$r['typed']}</span>
+						<span class='button'>{$r['typed']}</span>
 HTML;
 			}
 
 $IPBHTML .= <<<HTML
-						<br /><br />{$this->lang->words['emote_clickable']} <input type='checkbox'  name='emo_click_{$r['id']}' value='1' {$r['_click']} />
-					</fieldset>
 				</td>
-HTML;
-
-	if( $count == $per_row )
-	{
-$IPBHTML .= <<<HTML
-			</tr>
-			
-			<tr align='center'>
-HTML;
-		$count = 0;
-	}
-
-}
-
-/* Finish off a row in progress */
-if( $count > 0 and $count != $per_row )
-{
-	for( $i = $count ; $i < $per_row ; ++$i )
-	{
-$IPBHTML .= <<<HTML
-				<td>&nbsp;</td>
-HTML;
-	}
-	
-$IPBHTML .= <<<HTML
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
+						<li class='i_delete'><a href='{$this->settings['base_url']}{$this->form_code}do=emo_remove&eid={$r['id']}&id={$this->request['id']}' title='{$this->lang->words['emote_delete_title']}'>{$this->lang->words['emote_delete_title']}</a></li>
+					</ul>
+				</td>
 			</tr>
 HTML;
 
@@ -216,92 +230,62 @@ HTML;
 $IPBHTML .= <<<HTML
 		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['emote_update_button']}' />
-			</div>
+			<input type='submit' class='button primary' value='{$this->lang->words['emote_update_button']}' />
 		</div>
 	</form>
-</div><br />
+</div>
+<script type='text/javascript'>
+	jQ("#emoticons_table").ipsSortable('table', { 
+		url: "{$this->settings['base_url']}{$this->form_code_js}do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}&id={$this->request['id']}".replace( /&amp;/g, '&' ),
+		serializeOptions: { key: 'emoticons[]' }
+	} );
+</script>
+<br />
+
+<div class='acp-box'>
+	<h3>{$this->lang->words['emote_unassigned']}'{$this->request['id']}'</h3>	
+	<table class='ipsTable'>
 HTML;
 
 /* Display unassigned emoticons */
 if( is_array( $file_rows ) && count( $file_rows ) )
 {
-$IPBHTML .= <<<HTML
-<div class='acp-box'>
-	<h3>{$this->lang->words['emote_unassigned']}'{$this->request['id']}'</h3>
-	
-	<form action='{$this->settings['base_url']}{$this->form_code}do=emo_doadd&id={$this->request['id']}' method='post'>
-		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-		
-		<table class='alternate_rows' width='100%'>
-			<tr>
-HTML;
-	
-	/* Loop through the unassigned emoticons */
-	$master_count = 0;
-	$count        = 0;
-
 	foreach( $file_rows as $r )
 	{
-		$master_count++;
-		$count++;
+		$safeName = str_replace( '.', '---', $r['image'] );
 		
-$IPBHTML .= <<<HTML
-				<td width='{$td_width}%' align='center'>
-					<fieldset>
-						<legend><strong>{$r['image']}</strong></legend>
-						<img src='../public/style_emoticons/{$this->request['id']}/{$r['image']}' />&nbsp;&nbsp;
-						{$this->lang->words['emote_add']}<input name='emo_add_{$master_count}' type='checkbox' value='1' /><br />
-						{$this->lang->words['emote_text']}<input type='textinput' class='realbutton' size='10' name='emo_type_{$master_count}' value='{$r['poss_name']}' /><br /><br />
-						{$this->lang->words['emote_clickable']} <input type='checkbox' name='emo_click_{$master_count}' value='1' />
-						<input type='hidden' name='emo_image_{$master_count}' value='{$r['image']}' />
-					</fieldset>
-				</td>
+		$IPBHTML .= <<<HTML
+		<tr class='ipsControlRow'>
+			<td class='col_drag _amber'><div class='draghandle'>&nbsp;</div></td>
+			<td width='60%' class='_amber'>
+				<img src='../{$_public}/style_emoticons/{$this->request['id']}/{$r['image']}' />
+				&nbsp; &nbsp; <span class='ipsBadge badge_grey'>{$r['image']}</span>	
+			</td>
+			<td width='30%' align='right' class='_amber'>
+				<input type='textinput' disabled="disabled" class='input_text' size='20' name='emo_type_{$safeName}' value='{$r['poss_name']}' />
+			</td>
+			<td class='col_buttons _amber'>
+				<ul class='ipsControlStrip'>
+					<li class='i_add'><a href='{$this->settings['base_url']}{$this->form_code}do=emo_doadd&id={$this->request['id']}&emo_image={$safeName}'>{$this->lang->words['emote_delete_title']}</a></li>
+				</ul>
+			</td>
+		</tr>
 HTML;
-
-		if( $count == $per_row )
-		{
-$IPBHTML .= <<<HTML
-			</tr>
-			
-			<tr align='center'>
-HTML;
-		$count = 0;
-		}
 	}
-	
-	/* Finish off a row in progress */
-	if( $count > 0 and $count != $per_row )
-	{
-		for( $i = $count ; $i < $per_row ; ++$i )
-		{
-$IPBHTML .= <<<HTML
-				<td>&nbsp;</td>
+}
+else
+{
+	$IPBHTML .= <<<HTML
+		<tr class='ipsControlRow'>
+			<td class='no_messages'>{$this->lang->words['emote_unassigned_none']}</td>
+		</tr>
 HTML;
-		}
-		
-$IPBHTML .= <<<HTML
-			</tr>
-HTML;
-	
-	}
-	
-$IPBHTML .= <<<HTML
-		</table>
-			
-		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['emote_add_button']}' />&nbsp;&nbsp;
-				<input type='submit' name='addall' class='button primary' value='{$this->lang->words['emote_addall_button']}' />	
-			</div>
-		</div>
-	</form>			
-</div>
-HTML;
-
 }
 
+$IPBHTML .= <<<HTML
+	</table>
+</div>
+HTML;
 
 return $IPBHTML;
 }
@@ -309,7 +293,6 @@ return $IPBHTML;
 /**
  * Overview of emoticon packs
  *
- * @access	public
  * @param	array 		Records
  * @return	string		HTML
  */
@@ -327,7 +310,7 @@ $IPBHTML .= <<<HTML
 												"<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />" +
 												"<input type='hidden' name='do' value='#{form_do}' />" +
 												"<input type='hidden' name='id' value='#{form_id}' />" +
-												"<div class='acp-box'><h3>{$this->lang->words['emoticon_folder']}</h3><ul class='acp-form'><li><label for='name_#{form_id}'>{$this->lang->words['emoticon_folder_name']}</label><input type='text' size='30' class='input_text' id='name_#{form_id}' value='#{folder_name}' name='emoset'></li></ul><div class='acp-actionbar'><input type='submit' value='#{form_value}' class='realbutton' id='save_folder_#{id}' /></div></div>" + 
+												"<div class='acp-box'><h3>{$this->lang->words['emoticon_folder']}</h3><table class='ipsTable double_pad'><tr><td class='field_title'><strong class='title'>{$this->lang->words['emoticon_folder_name']}</strong></td><td class='field_field'><input type='text' size='30' class='input_text' id='name_#{form_id}' value='#{folder_name}' name='emoset'></td></tr></table><div class='acp-actionbar'><input type='submit' value='#{form_value}' class='realbutton' id='save_folder_#{id}' /></div></div>" + 
 												"</form>" );
 	
 	ipb.lang['emoticons'] = [];								
@@ -339,7 +322,8 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['emo_control']}</h2>
 	<ul class='context_menu'>
-		<li><a href='#' id='folder_edit_0' return false;'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/table_add.png' alt='' /> {$this->lang->words['emote_createnew']}</a></li>
+		<li><a href='#' id='folder_edit_0'><img src='{$this->settings['skin_acp_url']}/images/icons/folder_add.png' alt='' /> {$this->lang->words['emote_createnew']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=emo_packsplash'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['emote_impexpo']}</a></li>
 	</ul>
 	<script type='text/javascript'>
 		$('folder_edit_0').observe('click', acp.emoticons.folder.bindAsEventListener( this, 0 ) );
@@ -355,7 +339,7 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['emote_current']}</h3>
 		
-		<table width='100%' class='alternate_rows'>
+		<table class='ipsTable'>
 			<tr>
 				<th width='50%' align='center'>{$this->lang->words['emote_emofolder']}</th>
 				<th width='5%' align='center'>{$this->lang->words['emote_upload']}</th>
@@ -368,38 +352,41 @@ HTML;
 foreach( $rows as $data )
 {
 $IPBHTML .= <<<HTML
-			<tr>
+			<tr class='ipsControlRow'>
 	 			<td valign='middle'>
 					<div style='width:auto;float:right;'><img src='{$this->settings['skin_acp_url']}/images/{$data['icon']}' title='{$data['title']}' alt='{$data['icon']}' /></div>
-					{$data['line_image']}<img src='{$this->settings['skin_acp_url']}/images/emoticon_folder.gif' />&nbsp;
+					{$data['line_image']}<img src='{$this->settings['skin_acp_url']}/images/emoticon_folder.png' />&nbsp;
 					<a href='{$this->settings['base_url']}{$this->form_code}do=emo_manage&amp;id={$data['dir']}' title='{$this->lang->words['emote_manageset']}'><b>{$data['dir']}</b></a>
 				</td>
 
 				<td valign='middle'><center>{$data['checkbox']}</center></td>
 				<td valign='middle'><center>{$data['count']}</center></td>
 				<td valign='middle'><center>{$data['dir_count']}</td>
-				<td align='right'>
-					<img class="ipbmenu" id="menu{$data['dir']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">
-					<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id='menu{$data['dir']}_menucontent'>
-						<li style="z-index: 10000;" class='icon view'><a style="z-index: 10000;" href='{$this->settings['base_url']}{$this->form_code_js}do=emo_manage&amp;id={$data['dir']}'>{$data['link_text']}</a></li>
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
+						<li class='i_edit'>
+							<a href='{$this->settings['base_url']}{$this->form_code_js}do=emo_manage&amp;id={$data['dir']}' title='{$data['link_text']}'>{$data['link_text']}</a>
+						</li>
 HTML;
 
 if( $data['dir'] != 'default' OR IN_DEV == 1 )
 {
 $IPBHTML .= <<<HTML
-						<li style="z-index: 10000;" class='icon edit'>
-							<a style="z-index: 10000;" href='#' id="folder_edit_{$data['dir']}">{$this->lang->words['emote_editfolder']}</a>
+						<li class='i_new_folder'>
+							<a href='#' id="folder_edit_{$data['dir']}" title='{$this->lang->words['emote_editfolder']}'>{$this->lang->words['emote_editfolder']}</a>
 							<script type='text/javascript'>
 								$("folder_edit_{$data['dir']}").observe('click', acp.emoticons.folder.bindAsEventListener( this, "{$data['dir']}" ) );
 							</script>
 						</li>
-						<li style="z-index: 10000;" class='icon delete'><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code_js}do=emo_setremove&amp;id={$data['dir']}");'>{$this->lang->words['emote_deletefolder']}</a></li>
+						<li class='i_delete'>
+							<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code_js}do=emo_setremove&amp;id={$data['dir']}");' title='{$this->lang->words['emote_deletefolder']}'>{$this->lang->words['emote_deletefolder']}</a>
+						</li>
 HTML;
 }
 else
 {
 $IPBHTML .= <<<HTML
-						<li style="z-index: 10000;" class='icon delete'>{$this->lang->words['emote_dontdeletedef']}</li>
+						<li class='i_delete disabled'><a title='{$this->lang->words['emote_dontdeletedef']}'><em>{$this->lang->words['emote_dontdeletedef']}</em></a></li>
 HTML;
 }
 
@@ -427,21 +414,19 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['emote_uploademos']}</h3>
 		
-		<table width='100%' class='alternate_rows'>
+		<table class='ipsTable'>
 			<tr>
-				<td width='50%' align='center'><input type='file' value='' class='realbutton' name='upload_1' size='30' /></td>
-				<td width='50%' align='center'><input type='file' class='realbutton' name='upload_2' size='30' /></td>
+				<td class='field_title'><input type='file' value='' name='upload_1' size='30' /></td>
+				<td class='field_field'><input type='file' name='upload_2' size='30' /></td>
 			</tr>
 			<tr>
-				<td width='50%' align='center'><input type='file' class='realbutton' name='upload_3' size='30' /></td>
-				<td width='50%' align='center'><input type='file' class='realbutton' name='upload_4' size='30' /></td>
+				<td class='field_title'><input type='file' name='upload_3' size='30' /></td>
+				<td class='field_field'><input type='file' name='upload_4' size='30' /></td>
 			</tr>
 		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['emote_uploadtofolders']}' class='button primary' />
-			</div>
+			<input type='submit' value='{$this->lang->words['emote_uploadtofolders']}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_errorlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_errorlogs.php
index 3e87911d..7e8d1c89 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_errorlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_errorlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Error log skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-07-18 04:43:37 -0400 (Mon, 18 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9261 $
  */
  
-class cp_skin_errorlogs extends output
+class cp_skin_errorlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Error log wrapper
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
@@ -66,12 +96,12 @@ $IPBHTML .= <<<HTML
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['error_log_thelogs']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='10%'>{$this->lang->words['error_log_code']}</th>
 			<th width='30%'>{$this->lang->words['error_log_error']}</th>
 			<th width='15%'>{$this->lang->words['error_log_ip']}</th>
-			<th width='20%'>{$this->lang->words['error_log_uri']}</th>
+			<th width='22%'>{$this->lang->words['error_log_uri']}</th>
 			<th width='10%'>{$this->lang->words['error_log_member']}</th>
 			<th width='10%'>{$this->lang->words['error_log_date']}</th>
 			<th width='3%'><input type='checkbox' title="{$this->lang->words['my_checkall']}" id='checkAll' /></th>
@@ -82,12 +112,14 @@ if( count( $rows ) AND is_array( $rows ) )
 {
 	foreach( $rows as $row )
 	{
+		$row['log_request_uri']	= htmlentities( $row['log_request_uri'], ENT_QUOTES );
+
 		$IPBHTML .= <<<HTML
 		<tr>
 			<td>{$row['log_error_code']}</td>
 			<td>{$row['log_error']}</td>
 			<td>{$row['log_ip_address']}</td>
-			<td>{$row['log_request_uri']}</td>
+			<td><textarea style='width: 100%'>{$row['log_request_uri']}</textarea></td>
 			<td>{$row['members_display_name']}</td>
 			<td>{$row['_date']}</td>
 			<td><input type='checkbox' name='id_{$row['log_id']}' value='1' class='checkAll' /></td>
@@ -107,12 +139,11 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-        <div class='leftaction'>
-			{$links}
-        </div>
-        <div class='rightaction'>
+        <div class='right'>
 			<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;{$this->lang->words['erlog_removeall']}&nbsp;<input type="submit" value="{$this->lang->words['erlog_removechecked']}" class="button primary" />
         </div>
+        <div class='left'>{$links}</div>
+        <br class='clear' />
 	</div>
 </div>
 </form>
@@ -123,11 +154,13 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 	<div class='acp-box'>
 		<h3>{$this->lang->words['error_log_search']}</h3>
-		<p align="center">
-			<label>{$this->lang->words['erlog_searchwhere']}</label>
-			{$form['type']} {$form['match']} {$form['string']}
-		</p>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['erlog_searchwhere']}</td>
+			    <td class='field_field'>{$form['type']} {$form['match']} {$form['string']}</td>
+			</tr>
+		</table>
+
 		<div class='acp-actionbar'>
 			<input value="{$this->lang->words['erlog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
 		</div>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_group_core.php b/upload/admin/applications/core/skin_cp/cp_skin_group_core.php
new file mode 100644
index 00000000..3836b918
--- /dev/null
+++ b/upload/admin/applications/core/skin_cp/cp_skin_group_core.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Group plugin skin functions
+ * Last Updated: $LastChangedDate: 2011-09-01 08:16:37 -0400 (Thu, 01 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @since		14th May 2003
+ * @version		$Rev: 9439 $
+ */
+ 
+class cp_skin_group_core
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
+
+/**
+ * Show forums group form
+ *
+ * @param	array 	Group data
+ * @param	string	Tab ID
+ * @param	array 	Plugins
+ * @param	array 	Plugins we can view
+ * @param	array 	Plugins we can send
+ * @return	string	HTML
+ */
+public function acp_group_form_main( $group, $tabId, $plugins, $canView, $canSend ) {
+
+
+$IPBHTML = "";
+
+$IPBHTML .= <<<EOF
+<div id='tab_GROUPS_{$tabId}_content'>
+	<div>
+		<table class='ipsTable double_pad'>
+EOF;
+
+foreach( $plugins as $id => $data )
+{
+	$formSend	= $this->registry->output->formYesNo( "rc_send_" . $id, in_array( $id, $canSend ) );
+	$formView	= $this->registry->output->formYesNo( "rc_view_" . $id, in_array( $id, $canView ) );
+	
+	$IPBHTML .= <<<EOF
+			<tr>
+				<th colspan='2' class='head'><strong>{$this->lang->words['gf_rc_perms_for']} {$data['class_title']}</strong></th>
+			</tr>
+			<tr>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_can_send_report']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$formSend}
+				</td>
+		 	</tr>
+			<tr>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_can_view_report']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$formView}
+				</td>
+		 	</tr>
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+		</table>
+	</div>
+</div>
+
+EOF;
+
+return $IPBHTML;
+}
+
+/**
+ * Display forum group form tabs
+ *
+ * @param	array 	Group data
+ * @param	string	Tab id
+ * @return	string	HTML
+ */
+public function acp_group_form_tabs( $group, $tabId ) {
+
+$IPBHTML = "";
+
+$IPBHTML .= <<<EOF
+	<li id='tab_GROUPS_{$tabId}'>{$this->lang->words['tab_groupform_rc']}</li>
+EOF;
+
+return $IPBHTML;
+}
+
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_help_files.php b/upload/admin/applications/core/skin_cp/cp_skin_help_files.php
index adee75ed..7009811e 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_help_files.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_help_files.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Manage help files skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_help_files extends output
+class cp_skin_help_files
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Form to add/edit a help file
  *
- * @access	public
  * @param	string		Action
  * @param	int			ID
  * @param	array 		Form elements
@@ -57,33 +87,43 @@ $IPBHTML .= <<<HTML
 	
 	<div class='acp-box'>
 		<h3>{$button}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['h_filetitle']}</label>
-				{$form['title']}
-			</li>
-
-			<li>
-				<label>{$this->lang->words['h_filedesc']}</label>
-				{$form['description']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['h_fileapp']}</label>
-				{$form['appDir']}
-			</li>
-		
-			<li>
-				<label>{$this->lang->words['h_filetext']}</label>
-				<div class='clear'><textarea id='editor_main' name='editor_main' style='width: 100%; height: 500px;'>{$form['text']}</textarea></div>
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['h_filetitle']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['h_filedesc']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['description']}
+				</td>
+			</tr>			
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['h_fileapp']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['appDir']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['h_filetext']}</strong>
+				</td>
+				<td class='field_field'>
+					<textarea id='editor_main' name='editor_main' style='width: 100%; height: 300px;'>{$form['text']}</textarea>
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$button}' class='button primary' accesskey='s'>
-			</div>
-		</div>	
+			<input type='submit' value='{$button}' class='button primary' accesskey='s'>
+		</div>
 	</div>
 </form>
 HTML;
@@ -95,7 +135,6 @@ return $IPBHTML;
 /**
  * List the current help files
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -107,91 +146,100 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['h_title']}</h2>
-	<ul class='context_menu'>
-		<li>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+HTML;
+
+if ( $this->registry->class_permissions->checkPermission( 'help_manage' ) )
+{
+	$IPBHTML .= <<<HTML
+		<li class='ipsActionButton'>
 			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=new' title='{$this->lang->words['h_addnew']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/help_add.png' alt='' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/help_add.png' alt='' />
 				{$this->lang->words['h_addnew']}
 			</a>
 		</li>
-		<li>
-			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=exportXml' title='{$this->lang->words['h_export']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/export.png' alt='' />
-				{$this->lang->words['h_export']}
-			</a>
-		</li>
-		<li>
-			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=importXml' title='{$this->lang->words['h_import']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/import.png' alt='' />
-				{$this->lang->words['h_import']}
-			</a>
-		</li>
-	</ul>
+HTML;
+}
+
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=exportXml' title='{$this->lang->words['h_export']}'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' />
+					{$this->lang->words['h_export']}
+				</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=importXml' title='{$this->lang->words['h_import']}'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/import.png' alt='' />
+					{$this->lang->words['h_import']}
+				</a>
+			</li>
+		</ul>
+	</div>
 </div>
+HTML;
 
-<script type="text/javascript">
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { revert: true, format: 'faq_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'faq' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=doreorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
-</script>
-
+$IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['h_current']}</h3>
-
-		<ul id='sortable_handle' class='alternate_rows'>
+		
+		<table class='ipsTable' id='helpfiles_list'>
 HTML;
 
 foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
-			<li id='faq_{$r['id']}'>
-				<table style='width: 100%'>
-					<tr>
-						<td style='width: 3%'>
-							<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt=''></div>
-						</td>
-						<td style='width: 93%'>
-							<strong><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['id']}'>{$r['title']}</a></strong><br />
-							<span class='desctext'>{$r['description']}</span>
-						</td>
-						<td style='width: 4%'>
-							<img class='ipbmenu' id="menu-{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-							<ul class='acp-menu' id='menu-{$r['id']}_menucontent'>
-								<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['id']}'>{$this->lang->words['h_edit']}</a></li>
-								<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;id={$r['id']}");'>{$this->lang->words['h_remove']}</a></li>
-							</ul>
-						</td>
-					</tr>
-				</table>
-			</li>
+			<tr id='faq_{$r['id']}' class='ipsControlRow isDraggable'>
+				<td class='col_drag'>
+					<span class='draghandle'>&nbsp;</span>
+				</td>
+				<td>
+					<strong class='larger_text'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['id']}'>{$r['title']}</a></strong><br />
+					<span class='desctext'>{$r['description']}</span>
+				</td>
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
+HTML;
+	
+	if ( $this->registry->class_permissions->checkPermission( 'help_manage' ) )
+	{
+					$IPBHTML .= <<<HTML
+						<li class='i_edit'>
+							<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['id']}' title='{$this->lang->words['h_edit']}'>{$this->lang->words['h_edit']}</a>
+						</li>
+HTML;
+	}
+	if ( $this->registry->class_permissions->checkPermission( 'help_remove' ) )
+	{
+					$IPBHTML .= <<<HTML
+						<li class='i_delete'>
+							<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;id={$r['id']}");' title='{$this->lang->words['h_remove']}'>{$this->lang->words['h_remove']}</a>
+						</li>
+HTML;
+	}
+					$IPBHTML .= <<<HTML
+					</ul>
+				</td>
+			</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-		</ul>
-
+		</table>
 	</div>
 	<br />
 </form>
+<script type='text/javascript'>
+	jQ("#helpfiles_list").ipsSortable( 'table', { 
+		url: "{$this->settings['base_url']}&{$this->form_code_js}&do=doreorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )
+	});
+</script>
 HTML;
 
 //--endhtml--//
 return $IPBHTML;
 
-
 }
 
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_hooks_export.php b/upload/admin/applications/core/skin_cp/cp_skin_hooks_export.php
index fbd1f98a..9b908285 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_hooks_export.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_hooks_export.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Hooks export skin file
- * Last Updated: $Date: 2010-10-18 13:10:17 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-10-07 22:31:51 -0400 (Fri, 07 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6990 $
+ * @version		$Revision: 9588 $
  */
  
-class cp_skin_hooks_export extends output
+class cp_skin_hooks_export
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Inline css dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -55,16 +85,18 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addcss']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['selectoneomorecss']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['css']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['selectoneomorecss']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['css']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__css_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__css_save' />
 	</div>
 </div>
 
@@ -77,7 +109,6 @@ return $IPBHTML;
 /**
  * Inline settings dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -99,22 +130,26 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addsettings']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['exportonesettings']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['groups']}
-		</li>
-		<li>
-			{$this->lang->words['indivsettingsex']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['settings']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['exportonesettings']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['groups']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['indivsettingsex']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['settings']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__settings_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__settings_save' />
 	</div>
 </div>
 
@@ -126,7 +161,6 @@ return $IPBHTML;
 /**
  * Inline modules dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -148,16 +182,18 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addmodules']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['exportmodules']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['modules']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['exportmodules']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['modules']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__modules_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__modules_save' />
 	</div>
 </div>
 
@@ -169,7 +205,6 @@ return $IPBHTML;
 /**
  * Inline custom script dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -177,7 +212,9 @@ return $IPBHTML;
 public function inline_custom( $hook, $form=array() )
 {
 $IPBHTML = "";
-													
+
+$pathcustomscript = sprintf( $this->lang->words['pathcustomscript'], rtrim( str_replace( DOC_IPS_ROOT_PATH, '', IPS_HOOKS_PATH ), '/' ) );
+
 $IPBHTML .= <<<EOF
 <script type='text/javascript'>
 	acp.hooks.fields['MF__custom'] = {};
@@ -191,16 +228,18 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addcustomscript']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['pathcustomscript']}
-		</li>
-		<li style='padding-left: 15px'>
-			install_ {$form['custom']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$pathcustomscript}</strong>
+			</td>
+			<td class='field_field'>
+				install_ {$form['custom']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__custom_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__custom_save' />
 	</div>
 </div>
 EOF;
@@ -211,7 +250,6 @@ return $IPBHTML;
 /**
  * Inline help files dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -233,16 +271,18 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addhelpfiles']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['selectoneormorehelp']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['help']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['selectoneormorehelp']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['help']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__help_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__help_save' />
 	</div>
 </div>
 EOF;
@@ -253,7 +293,6 @@ return $IPBHTML;
 /**
  * Inline tasks dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @return	string		HTML
@@ -275,16 +314,18 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['addtasks']}</h3>
-	<ul class='acp-form'>
-		<li>
-			{$this->lang->words['oneormtasks']}
-		</li>
-		<li style='padding-left: 15px'>
-			{$form['tasks']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['oneormtasks']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['tasks']}
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__tasks_save' />
+		<input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__tasks_save' />
 	</div>
 </div>
 
@@ -296,7 +337,6 @@ return $IPBHTML;
 /**
  * Inline language bits dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @param	int			Current index
@@ -316,7 +356,7 @@ $IPBHTML .= <<<EOF
 		new Effect.Pulsate( $('MF__language'), { pulses: 3 } );
 	}
 	
-	ipb.templates['lang_row'] = new Template("<li><table width='100%' cellpadding='0' cellspacing='0'><tr><td style='width: 30%; vertical-align: top;'>#{control}<br /><span class='desctext langdesc' id='container_desc_#{containerid}' style='display: none'>{$this->lang->words['nowselectstrings']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='container_#{containerid}' style='display: none'></div></td></tr></table></li>");
+	ipb.templates['lang_row'] = new Template("<li><table class='ipsTable'><tr><td style='width: 30%; vertical-align: top;'>#{control}<br /><span class='desctext langdesc' id='container_desc_#{containerid}' style='display: none'>{$this->lang->words['nowselectstrings']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='container_#{containerid}' style='display: none'></div></td></tr></table></li>");
 	
 	acp.hooks.languageMax = $i;
 </script>
@@ -338,7 +378,7 @@ EOF;
 		{
 			$IPBHTML .= <<<EOF
 			<li>
-				<table width='100%' cellpadding='0' cellspacing='0'>
+				<table class='ipsTable'>
 					<tr>
 						<td style='width: 30%; vertical-align: top;'>
 							{$form['language_file_' . $k ]}<br />
@@ -362,7 +402,7 @@ EOF;
 	
 	$IPBHTML .= <<<EOF
 		<li>
-			<table width='100%' cellpadding='0' cellspacing='0'>
+			<table class='ipsTable'>
 				<tr>
 					<td style='width: 30%; vertical-align: top;'>
 						{$form['language_file_' . $i ]}<br />
@@ -383,7 +423,7 @@ EOF;
 	</ul>
 	</div>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['addanotherfile']}' class='realbutton' id='addLanguage' /> <input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__language_save' />
+		<input type='submit' value='{$this->lang->words['addanotherfile']}' class='realbutton' id='addLanguage' /> <input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__language_save' />
 		<script type='text/javascript'>
 			$('addLanguage').observe('click', acp.hooks.addAnotherLanguage);
 		</script>
@@ -397,7 +437,6 @@ return $IPBHTML;
 /**
  * Inline skin bits dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @param	int			Current index
@@ -417,7 +456,7 @@ $IPBHTML .= <<<EOF
 		new Effect.Pulsate( $('MF__templates'), { pulses: 3 } );
 	}
 	
-	ipb.templates['skin_row'] = new Template("<li><table width='100%' cellpadding='0' cellspacing='0'><tr><td style='width: 35%; vertical-align: top;'>#{control}<br /><span class='desctext skindesc' id='s_container_desc_#{containerid}' style='display: none'>{$this->lang->words['nowselectbits']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='s_container_#{containerid}' style='display: none'></div></td></tr></table></li>");
+	ipb.templates['skin_row'] = new Template("<li><table class='ipsTable'><tr><td style='width: 35%; vertical-align: top;'>#{control}<br /><span class='desctext skindesc' id='s_container_desc_#{containerid}' style='display: none'>{$this->lang->words['nowselectbits']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='s_container_#{containerid}' style='display: none'></div></td></tr></table></li>");
 	
 	acp.hooks.skinMax = $i;
 </script>
@@ -440,7 +479,7 @@ if( $i )
 	{
 		$IPBHTML .= <<<EOF
 		<li>
-			<table width='100%' cellpadding='0' cellspacing='0'>
+			<table class='ipsTable'>
 				<tr>
 					<td style='width: 35%; vertical-align: top;'>
 						{$form['skin_file_' . $k ]}<br />
@@ -464,7 +503,7 @@ EOF;
 }
 	$IPBHTML .= <<<EOF
 		<li>
-			<table width='100%' cellpadding='0' cellspacing='0'>
+			<table class='ipsTable'>
 				<tr>
 					<td style='width: 35%; vertical-align: top;'>
 						{$form['skin_file_' . $i ]}<br />
@@ -485,7 +524,7 @@ EOF;
 	</ul>
 	</div>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['addanothertemplate']}' class='realbutton' id='addTemplates' /> <input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__templates_save' />
+		<input type='submit' value='{$this->lang->words['addanothertemplate']}' class='realbutton' id='addTemplates' /> <input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__templates_save' />
 		<script type='text/javascript'>
 			$('addTemplates').observe('click', acp.hooks.addAnotherTemplate);
 		</script>
@@ -499,7 +538,6 @@ return $IPBHTML;
 /**
  * Inline database changes dhtml box
  *
- * @access	public
  * @param	array 		Hook data
  * @param	array 		Form elements
  * @param	int			Current index
@@ -519,7 +557,7 @@ $IPBHTML .= <<<EOF
 		new Effect.Pulsate( $('MF__database'), { pulses: 3 } );
 	}
 	
-	ipb.templates['db_row'] = new Template("<li><table width='100%' cellpadding='0' cellspacing='0'><tr><td style='width: 35%; vertical-align: top;'><select name='type_#{id}' onchange='acp.hooks.generateFields(#{id});' id='type_#{id}' class='dropdown'><option value='0'>{$this->lang->words['selectone']}</option><option value='create'>{$this->lang->words['hook_db_create']}</option><option value='alter'>{$this->lang->words['hook_db_alter']}</option><option value='update'>{$this->lang->words['hook_db_update']}</option><option value='insert'>{$this->lang->words['hook_db_insert']}</option></select><br /><span class='desctext dbdesc' id='d_container_desc_#{id}' style='display: none'>{$this->lang->words['nowselectstrings']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='d_container_#{id}' style='display: none' class='dbcontainer'></div></td></tr></table></li>");
+	ipb.templates['db_row'] = new Template("<li><table class='ipsTable'><tr><td style='width: 35%; vertical-align: top;'><select name='type_#{id}' onchange='acp.hooks.generateFields(#{id});' id='type_#{id}' class='dropdown'><option value='0'>{$this->lang->words['selectone']}</option><option value='create'>{$this->lang->words['hook_db_create']}</option><option value='alter'>{$this->lang->words['hook_db_alter']}</option><option value='update'>{$this->lang->words['hook_db_update']}</option><option value='insert'>{$this->lang->words['hook_db_insert']}</option></select><br /><span class='desctext dbdesc' id='d_container_desc_#{id}' style='display: none'>{$this->lang->words['nowselectstrings']} {$this->lang->words['_rarr']}</span></td><td style='vertical-align: top;'><div id='d_container_#{id}' style='display: none' class='dbcontainer'></div></td></tr></table></li>");
 	
 	ipb.templates['db_create'] = new Template("{$this->lang->words['desc_newtable']}<br /><input name='name_#{id}' id='name_#{id}' type='input' /><br /><br />{$this->lang->words['desc_fieldnames']}<br /><textarea name='fields_#{id}' id='fields_#{id}'></textarea><br /><br />{$this->lang->words['desc_tabletype']}<br /><input name='tabletype_#{id}' id='tabletype_#{id}' type='input' />");
 	
@@ -558,7 +596,7 @@ if( $i )
 	{	
 		$IPBHTML .= <<<EOF
 		<li>
-			<table width='100%' cellpadding='0' cellspacing='0'>
+			<table class='ipsTable'>
 				<tr>
 					<td style='width: 35%; vertical-align: top;'>
 						{$form['type_' . $k ]}<br />
@@ -645,7 +683,7 @@ EOF;
 }
 $IPBHTML .= <<<EOF
 		<li>
-			<table width='100%' cellpadding='0' cellspacing='0'>
+			<table class='ipsTable'>
 				<tr>
 					<td style='width: 35%; vertical-align: top;'>
 						{$form['type_' . $i ]}<br />
@@ -679,7 +717,7 @@ $IPBHTML .= <<<EOF
 	</ul>
 	</div>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['addanotherchange']}' class='realbutton' id='addDB' /> <input type='submit' value=' {$this->lang->words['hookssavebutton']} ' class='realbutton' id='MF__database_save' />
+		<input type='submit' value='{$this->lang->words['addanotherchange']}' class='realbutton' id='addDB' /> <input type='submit' value='{$this->lang->words['hookssavebutton']}' class='realbutton' id='MF__database_save' />
 		<script type='text/javascript'>
 			$('addDB').observe('click', acp.hooks.addAnotherDB);
 		</script>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_livesearch.php b/upload/admin/applications/core/skin_cp/cp_skin_livesearch.php
deleted file mode 100644
index 975fe1f3..00000000
--- a/upload/admin/applications/core/skin_cp/cp_skin_livesearch.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * ACP live search skin file
- * Last Updated: $Date: 2010-07-06 11:07:25 -0400 (Tue, 06 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6604 $
- */
- 
-class cp_skin_livesearch extends output
-{
-	/**
-	 * Currently hiding settings
-	 *
-	 * @access	private
-	 * @var		bool
-	 */
-	private $startedHideSettings	= false;
-	
-	/**
-	 * Currently hiding page links
-	 *
-	 * @access	private
-	 * @var		bool
-	 */
-	private $startedHidePages		= false;
-	
-	/**
-	 * Currently hiding members
-	 *
-	 * @access	private
-	 * @var		bool
-	 */
-	private $startedHideMembers		= false;
-	
-	/**
-	 * Entries until hidden
-	 *
-	 * @access	private
-	 * @var		bool
-	 */
-	private $displayRows		   = 8;
-	
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Display the live search results
- *
- * @access	public
- * @param	array 		Results
- * @param	string		Current search term
- * @return	string		HTML
- */
-public function liveSearchDisplay( $results, $search_term ) {
-	
-$IPBHTML = "";
-//--starthtml--//
-$IPBHTML .= <<<EOF
-	<ul>
-EOF;
-
-if( count($results) )
-{
-	foreach( $results as $key => $output )
-	{
-		if( $key == 'settings' )
-		{
-			$text	= $this->lang->words['ls_settings'];
-		}
-		else if( $key == 'location' )
-		{
-			$text	= $this->lang->words['ls_acppages'];
-		}
-		else if( $key == 'members' )
-		{
-			$text	= $this->lang->words['ls_members'];
-		}
-		else if( $key == 'groupLangs' )
-		{
-			$text	= $this->lang->words['ls_groups'];
-		}
-		else if( $key == 'groups' )
-		{
-			$text	= $this->lang->words['ls_grouptitles'];
-		}
-		else if( $key == 'forums' )
-		{
-			$text	= $this->lang->words['ls_forums'];
-		}
-		
-		if( !$output )
-		{
-			continue;
-		}
-		
-		$IPBHTML .= <<<EOF
-		<li>
-			<span class='section'>{$text} <img src='{$this->settings['skin_acp_url']}/_newimages/icons_livesearch/{$key}.png' alt='{$this->lang->words['icon']}' /></span>
-			<ol>
-				{$output}
-			</ol>
-EOF;
-
-
-// If we started hidding members, we need to stop hiding them now...
-if( $key == 'members' AND $this->startedHideMembers )
-{
-	$this->startedHideMembers = false;
-	$IPBHTML .= <<<EOF
-	</div>
-	<div style='text-align: center;' id='hideMembersShow'>
-		<a href='#' onclick="$('hideMembersShow').hide();$('hideMembers').show();clearTimeout( ACPLiveSearch.searchTimer['hide'] );return false;">{$this->lang->words['ls_view_more_mem']}</a>
-	</div>
-EOF;
-}
-// If we started hiding forums, we need to stop hiding them now...
-else if( $key == 'forums' AND $this->startedHideForums )
-{
-	$this->startedHideForums = false;
-	$IPBHTML .= <<<EOF
-	</div>
-	<div style='text-align: center;' id='hideForumsShow'>
-		<a href='#' onclick="$('hideForumsShow').hide();$('hideForums').show();clearTimeout( ACPLiveSearch.searchTimer['hide'] );return false;">{$this->lang->words['ls_view_more_forums']}</a>
-	</div>
-EOF;
-}
-// If we started hidding groups, we need to stop hiding them now...
-else if( $key == 'groups' AND $this->startedHideGroups )
-{
-	$this->startedHideGroups = false;
-	$IPBHTML .= <<<EOF
-	</div>
-	<div style='text-align: center;' id='hideGroupsShow'>
-		<a href='#' onclick="$('hideGroupsShow').hide();$('hideGroups').show();clearTimeout( ACPLiveSearch.searchTimer['hide'] );return false;">{$this->lang->words['ls_view_more_groups']}</a>
-	</div>
-EOF;
-}
-// If we started hidding settings, we need to stop hiding them now...
-else if( $key == 'settings' AND $this->startedHideSettings )
-{
-	$this->startedHideSettings = false;
-	$IPBHTML .= <<<EOF
-	</div>
-	<div style='text-align: center;' id='hideSettingsShow'>
-		<a href='#' onclick="$('hideSettingsShow').hide();$('hideSettings').show();clearTimeout( ACPLiveSearch.searchTimer['hide'] );return false;">{$this->lang->words['ls_view_more_settings']}</a>
-	</div>
-EOF;
-}
-// If we started hidding pages, we need to stop hiding them now...
-else if( $key == 'location' AND $this->startedHidePages )
-{
-	$this->startedHidePages = false;
-	$IPBHTML .= <<<EOF
-	</div>
-	<div style='text-align: center;' id='hidePagesShow'>
-		<a href='#' onclick="$('hidePagesShow').hide();$('hidePages').show();clearTimeout( ACPLiveSearch.searchTimer['hide'] );return false;">{$this->lang->words['ls_view_more_acp']}</a>
-	</div>
-EOF;
-}
-
-$IPBHTML .= <<<EOF
-		</li>
-EOF;
-	}
-}
-else
-{
-	$IPBHTML .= <<<EOF
-	<li><em>{$this->lang->words['lsnoresults']}</em></li>
-EOF;
-}
-
-$IPBHTML .= <<<EOF
-	</ul>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Group language results
- *
- * @access	public
- * @return	string		HTML
- */
-public function searchRowGroups() {
-$IPBHTML = "";
-
-//--starthtml--//
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}app=members&amp;module=groups&amp;section=groups&amp;do=groups_overview'>{$this->lang->words['ls_groupresults']}</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Group title results
- *
- * @access	public
- * @param	array 		Result
- * @param	int			Section count
- * @return	string		HTML
- */
-public function searchRowGroupsTitles( $r, $secCount ) {
-$IPBHTML = "";
-
-if( $secCount > 10 )
-{
-	if( !$this->startedHideGroups )
-	{
-		$this->startedHideGroups = true;
-		
-		$IPBHTML .= <<<EOF
-		</ol>
-		<div id='hideGroups' style='display:none;'>
-		<ol style='margin-top:0px;'>
-EOF;
-	}
-}
-
-//--starthtml--//
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}&amp;app=members&amp;module=groups&amp;section=groups&amp;do=edit&id={$r['g_id']}'>{$r['g_title']}</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Result for member
- *
- * @access	public
- * @param	array 		Result
- * @param	int			Section count
- * @return	string		HTML
- */
-public function searchRowMember( $r, $secCount ) {
-$IPBHTML = "";
-//--starthtml--//
-
-if( $secCount > $this->displayRows )
-{
-	if( !$this->startedHideMembers )
-	{
-		$this->startedHideMembers = true;
-		
-		$IPBHTML .= <<<EOF
-		</ol>
-		<div id='hideMembers' style='display:none;'>
-		<ol style='margin-top:0px;'>
-EOF;
-	}
-}
-
-$text	= $r[ $r['_matched'] ];
-
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'>{$text} ({$this->lang->words['livesearchmemid']} {$r['member_id']})</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Result for forums
- *
- * @access	public
- * @param	array 		Result
- * @param	int			Section count
- * @return	string		HTML
- */
-public function searchRowForums( $r, $secCount ) {
-$IPBHTML = "";
-//--starthtml--//
-
-if( $secCount > $this->displayRows )
-{
-	if( !$this->startedHideForums )
-	{
-		$this->startedHideForums = true;
-		
-		$IPBHTML .= <<<EOF
-		</ol>
-		<div id='hideForums' style='display:none;'>
-		<ol style='margin-top:0px;'>
-EOF;
-	}
-}
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}&amp;app=forums&amp;module=forums&amp;section=forums&amp;do=edit&amp;f={$r['id']}'>{$r['name']}</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-	
-/**
- * Result for settings
- *
- * @access	public
- * @param	array 		Result
- * @param	int			Section count
- * @return	string		HTML
- */
-public function searchRowSetting( $r, $secCount ) {
-$IPBHTML = "";
-//--starthtml--//
-
-if( $secCount > $this->displayRows )
-{
-	if( !$this->startedHideSettings )
-	{
-		$this->startedHideSettings = true;
-		
-		$IPBHTML .= <<<EOF
-		</ol>
-		<div id='hideSettings' style='display:none;'>
-		<ol style='margin-top:0px;'>
-EOF;
-	}
-}
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}&amp;app=core&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_group={$r['conf_group']}&amp;search={$this->request['search_term']}'>{$r['conf_title']}</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Result for acp pages
- *
- * @access	public
- * @param	array 		Result
- * @param	int			Section count
- * @return	string		HTML
- */
-public function searchRowLocation( $r, $secCount ) {
-$IPBHTML = "";
-
-if( $secCount > $this->displayRows )
-{
-	if( !$this->startedHidePages )
-	{
-		$this->startedHidePages = true;
-		
-		$IPBHTML .= <<<EOF
-		</ol>
-		<div id='hidePages' style='display:none;'>
-		<ol style='margin-top:0px;'>
-EOF;
-	}
-}
-
-//--starthtml--//
-$IPBHTML .= <<<EOF
-<li><a href='{$this->settings['_base_url']}{$r['fullurl']}'>{$r['title']}</a></li>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Live search template
- *
- * @access	public
- * @return	string		HTML
- */
-public function liveSearchTemplate() {
-$IPBHTML = "";
-//--starthtml--//
-$IPBHTML .= <<<EOF
-	<div id='search_stem'></div>
-	<div id='search_inner'>
-		<h3 class='bar'>{$this->lang->words['ls_quick_search']}</h3>
-		<div id='ajax_result'></div>
-	</div>
-EOF;
-//--endhtml--//
-return $IPBHTML;
-}
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_mobilelogs.php b/upload/admin/applications/core/skin_cp/cp_skin_mobilelogs.php
index 858e51fa..627e6ece 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_mobilelogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_mobilelogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Error log skin file
- * Last Updated: $Date: 2010-02-18 20:29:54 -0500 (Thu, 18 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5855 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_mobilelogs extends output
+class cp_skin_mobilelogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Mobile log wrapper
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
@@ -50,7 +80,7 @@ $IPBHTML .= <<<HTML
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['mlog_mobilelogs']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='5%'>{$this->lang->words['mlog_list_id']}</th>
 			<th width='20%'>{$this->lang->words['mlog_list_date']}</th>
@@ -89,12 +119,11 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-        <div class='leftaction'>
-			{$links}
-        </div>
-        <div class='rightaction'>
+        <div class='right'>
 			<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;{$this->lang->words['erlog_removeall']}&nbsp;<input type="submit" value="{$this->lang->words['erlog_removechecked']}" class="button primary" />
         </div>
+        <div class='left'>{$links}</div>
+        <br class='clear' />
 	</div>
 </div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_modlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_modlogs.php
index 9bb51fa6..8d826b0a 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_modlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_modlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator log skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9505 $
  */
  
-class cp_skin_modlogs extends output
+class cp_skin_modlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Moderator logs wrapper
  *
- * @access	public
  * @param	array 		Rows
  * @param	array 		Moderators
  * @return	string		HTML
@@ -56,6 +86,8 @@ $form['search_in']	= $this->registry->output->formDropdown( "search_type", $form
 $IPBHTML = "";
 //--starthtml--//
 
+$this->registry->output->setMessage( $this->lang->words['stop_being_alarmed'], true );
+
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['mlog_title']}</h2>
@@ -63,7 +95,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['mlog_last5']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='15%'>{$this->lang->words['mlog_member']}</th>
 			<th width='15%'>{$this->lang->words['mlog_action']}</th>
@@ -78,9 +110,11 @@ if( count($rows) AND is_array($rows) )
 {
 	foreach( $rows as $row )
 	{
+		$row['members_display_name']	= $row['members_display_name'] ? $row['members_display_name'] : $this->lang->words['noname_availablm'];
+		
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
 			<td><span style='font-weight:bold;color:red'>{$row['action']}</span></td>
 			<td><b>{$row['name']}</b></td>
 			<td>{$row['topic_title']}{$row['topic']}</td>
@@ -106,7 +140,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['mlog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='30%'>{$this->lang->words['mlog_member']}</th>
 			<th width='20%'>{$this->lang->words['mlog_action']}</th>
@@ -121,7 +155,7 @@ if( count($admins) AND is_array($admins) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
 			<td>{$row['act_count']}</td>
 			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;mid={$row['member_id']}'>{$this->lang->words['mlog_view']}</a></td>
 			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove&amp;mid={$row['member_id']}'>{$this->lang->words['mlog_remove']}</a></td>
@@ -150,16 +184,16 @@ $IPBHTML .= <<<HTML
 	<div class="acp-box">
 		<h3>{$this->lang->words['mlog_search']}</h3>
 	
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['mlog_searchfor']}</label>
-				{$form['search_for']}
-			</li>
-			<li>
-				<label>{$this->lang->words['mlog_searchin']}</label>
-				{$form['search_in']}
-			</li>
-		</ul>	
+		<table class="ipsTable double_pad">
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['mlog_searchfor']}</strong></td>
+				<td class='field_field'>{$form['search_for']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['mlog_searchin']}</strong></td>
+				<td class='field_field'>{$form['search_in']}</td>
+			</tr>
+		</table>	
 
 		<div class="acp-actionbar">
 			<input value="{$this->lang->words['mlog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
@@ -176,7 +210,6 @@ return $IPBHTML;
 /**
  * View a single moderator log entry
  *
- * @access	public
  * @param	array 		Records
  * @param	string		Page links
  * @return	string		HTML
@@ -193,7 +226,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['mlog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='15%'>{$this->lang->words['mlog_member']}</th>
 			<th width='15%'>{$this->lang->words['mlog_action']}</th>
@@ -210,7 +243,7 @@ if( count($rows) AND is_array($rows) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
 			<td><span style='font-weight:bold;color:red'>{$row['action']}</span></td>
 			<td><b>{$row['name']}</b></td>
 			<td>{$row['topic_title']}{$row['topic']}</td>
@@ -232,7 +265,8 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-		<div class="leftaction">{$pages}</div>
+		<div class="left">{$pages}</div>
+		<br class='clear' />
 	</div>
 </div>
 <br />
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_mycp.php b/upload/admin/applications/core/skin_cp/cp_skin_mycp.php
index a6f550f9..0cd056a6 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_mycp.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_mycp.php
@@ -3,100 +3,234 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Dashboard skin file
- * Last Updated: $Date: 2010-06-30 09:58:05 -0400 (Wed, 30 Jun 2010) $
+ * Last Updated: $Date: 2011-10-14 12:56:17 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6590 $
+ * @version		$Revision: 9622 $
  */
  
-class cp_skin_mycp extends output
+class cp_skin_mycp
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Main dashboard template
  *
- * @access	public
  * @param	array 		Content blocks
  * @param	array 		Forums
  * @param	array 		Groups
  * @param	array 		URLs
  * @return	string		HTML
  */
-public function mainTemplate( $content, $forums, $groups, $urls=array(), $nagEntries=array() ) {
+public function mainTemplate( $content, $forums, $groups, $urls=array(), $nagEntries=array(), $stats = array() ) {
 
-$welcome = sprintf( $this->lang->words['cp_welcomeipb3'], IPB_VERSION );
+$version = IPB_VERSION;
+
+if( $stats['performance'] ){
+	$stats_html['performance'] = "<span class='ipsBadge badge_red'>{$this->lang->words['gbl_on']}</span>";
+} else {
+	$stats_html['performance'] = "<span class='ipsBadge badge_green'>{$this->lang->words['gbl_off']}</span>";
+}
+
+// 5 is nothing on a quad-core server, and red scares customers who don't understand the value
+//if( $stats['server_load'] > 5 ){
+//	$stats_html['server_load'] = "<span class='ipsBadge badge_red'>" . floatval($stats['server_load']) . "</span>";
+//} else {
+	$stats_html['server_load'] = "<span class='ipsBadge badge_green'>" . floatval($stats['server_load']) . "</span>";
+//}
 
 $IPBHTML = "";
 //--starthtml--//
-
 $IPBHTML .= <<<EOF
 <div class='section_title'>
-	<h2>{$welcome}</h2>
+	<h2><p class='right' id='dashboard_online'>{$content['acp_online']}</p> {$this->lang->words['welcome']} {$this->memberData['members_display_name']}</h2>
 </div>
+
+<div id='dash_server_stats' class='clearfix'>
+	<div class='left'>
+		<h3>{$this->lang->words['version']}</h3>
+		IP.Board {$version}
+	</div>
+	<div class='right'>
+		<h3>{$this->lang->words['server_status']}</h3>
+		<ul class='ipsList_inline'>
+			<!--<li>
+				<a href='{$this->settings['base_url']}&amp;module=tools&amp;section=performance' title='{$this->lang->words['toggle_perf_mode']}'>
+					{$stats_html['performance']}
+				</a>
+				&nbsp;{$this->lang->words['cp_performance']}
+			</li>-->
+			<li>
+				{$stats_html['server_load']}
+				&nbsp;{$this->lang->words['cp_serverload']}
+			</li>
+			<li>
+				<span class='ipsBadge badge_grey'>{$stats['active_users']}</span>
+				&nbsp;{$this->lang->words['cp_onlineusers']}
+			</li>
+		</ul>
+	</div>
+</div>
+
 <!--in_dev_notes-->
 <!--in_dev_check-->
 
+<!-- Version Check -->
+<div id='ips_update' style='display:none'>
+	<div class='warning'>
+		<h4>{$this->lang->words['cp_newversion']}: <span id='acp-update-version'></span></h4>
+		{$this->lang->words['cp_newversion_info']} <a href='' id='acp-update-link' target='_blank'>{$this->lang->words['cp_newversion_link']}</a>
+	</div>
+	<br />
+</div>
+
+<div id='ips_bulletin' style='display:none'>
+	<div class='warning'>
+		<h4>{$this->lang->words['cp_ipsbulletin']}</h4>
+		<p id='ips_supportbox_content'></p>
+	</div>
+	<br />
+</div>
+
+<div>
+	<div style='width: 69%;' class='left' id='dashboard'>
 EOF;
 
 if( is_array( $nagEntries ) && count( $nagEntries ) )
 {
+	$count = count( $nagEntries );
+	
+	$IPBHTML .= <<<EOF
+	<div class='acp-box alt' id='notification_table'>
+		<h3>{$count} {$this->lang->words['items_requiring_action']}</h3>
+		<table class='ipsTable hover_rows'>
+EOF;
+
 	foreach( $nagEntries as $r )
 	{
 $IPBHTML .= <<<EOF
-		<div class='information-box'>
-			<h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_error.png' />{$r[0]}</h4> 
-			{$r[1]}
-		</div>
-		<br />
+		<tr>
+			<td style='width: 0px; vertical-align: top''><img src='{$this->settings['skin_acp_url']}/images/icons/warning.png' /></td>
+			<td>
+				<strong class='larger_text'>{$r[0]}</strong>
+				<div style='line-height: 1.5; display: none' class='notice_info'>
+					{$r[1]}
+				</div>
+			</td>
+			<td style='width: 80px; vertical-align: top'>
+				<spsn class='desctext'><a href='#' class='notice_link'>{$this->lang->words['more_detailslink']}</a></span>
+			</td>
+		</tr>
 EOF;
 	}
+	
+	$IPBHTML .= <<<EOF
+		</table>
+	</div>
+	<script type='text/javascript'>
+		jQ(document).ready(function() {
+			jQ("#notification_table .notice_link").click( function(e){
+				e.preventDefault();
+				jQ(this).hide().closest("tr").find(".notice_info").slideDown();
+			});
+		});	
+	</script>	
+	<br /><br />
+EOF;
 }
 
+$total_posts	= $this->registry->getClass('class_localization')->formatNumber( $this->caches['stats']['total_replies'] + $this->caches['stats']['total_topics'] );
+$total_members	= $this->registry->getClass('class_localization')->formatNumber( $this->caches['stats']['mem_count'] );
+
+$_lang			= sprintf( $this->lang->words['reg_chart_stats'], 7 );
+
 $IPBHTML .= <<<EOF
-<div id='dashboard'>
-	
-	<div id='admin_boxes'>
-		<div style='float:left; width:49%'>
-			<div class='acp-box'>
-				<h3>{$this->lang->words['cp_activeadmins']}</h3>
-				{$content['acp_online']}
-			</div>
-			<br />
-			<div class='acp-box'>
-				<h3>{$this->lang->words['cp_adminnotes']}</h3>
-				<form action='{$this->settings['base_url']}&amp;app=core&amp;module=mycp&amp;section=dashboard&amp;save=1' method='post'>
-					<table width='100%'>
-						{$content['ad_notes']}
-					</table>
-				</form>
-			</div>
 
+		<div class='acp-box' style='background: #FFF'>
+			<div class='center section_title'><h2>{$_lang}</h2></div>
+			<div class='center' id='dashboard_graph' style='padding: 1px;'><img src="{$this->settings['base_url']}module=system&amp;section=charts&amp;days=7" alt="{$this->lang->words['reg_trends_chart']}" style='width:98%;' /></div>
 		</div>
-		
-
+		<br /><br />
+		<div class='acp-box'>
+			<h3>{$this->lang->words['cp_adminnotes']}</h3>
+			<form action='{$this->settings['base_url']}&amp;app=core&amp;module=mycp&amp;section=dashboard&amp;save=1' method='post'>
+				{$content['ad_notes']}
+			</form>
+		</div>
+	</div>
+	<div style='width: 29%;' class='right'>
+		<div class='acp-box'>
+			<table class='ipsTable'>
+				<tr>
+					<td style='width: 40%'><strong>{$this->lang->words['details__members']}</strong></td>
+					<td style='width: 60%'>{$total_members}</td>
+				</tr>
+				<tr>
+					<td><strong>{$this->lang->words['details__posts']}</strong></td>
+					<td>{$total_posts}</td>
+				</tr>
+			</table>
+		</div>
+		<br /><br />
 		<!--acplogins-->
 	</div>
 </div>
 
+<script type='text/javascript'>
+	jQ(".dashboard_note h4").css( { cursor: 'pointer' } ).click( function(e){
+		$( e.target ).next(".note_content:first").toggle();
+	});
+</script>
+
 <br />
 <script type="text/javascript" src='{$this->settings['js_app_url']}acp.homepage.js'></script>
 
@@ -114,6 +248,156 @@ $IPBHTML .= <<<EOF
 </div>
 <!-- / HIDDEN "INFORMATION" DIV -->
 
+
+<script type='text/javascript'>
+function upgradeMoreInfo()
+{
+	curPop = new ipb.Popup( 'acpVersionInfo', {
+							type: 'pane',
+							modal: true,
+							initial: $('acp-update-info-wrapper').innerHTML,
+							hideAtStart: false,
+							w: '400px',
+							h: '150px'
+						});
+						
+	return false;
+}
+
+function upgradeContinue()
+{
+	acp.openWindow( IPSSERVER_download_link, 800, 600 );
+}
+
+/* Warning CONTINUE / CANCEL */
+function resetContinue()
+{
+	if ( confirm( "{$this->lang->words['cp_wannareset']}" ) )
+	{
+		acp.redirect( ipb.vars['base_url'] + "&amp;app=core&amp;module=mycp&amp;section=dashboard&amp;reset_security_flag=1&amp;new_build=" + IPSSERVER_download_ve + "&amp;new_reason=" + IPSSERVER_download_vt, 1 );
+	}
+}
+
+
+/* Set up global vars */
+var _newsFeed     = null;
+var _blogFeed     = null;
+var _versionCheck = null;
+var _keithFeed    = null;
+/* ---------------------- */
+/* ONLOAD: IPS widgets    */
+/* ---------------------- */
+
+function onload_ips_widgets()
+{
+	var head = $$('head')[0];
+	
+	/* Grab files */
+	head.insert( new Element('script', { src: "{$urls['news']}", 'type': 'text/javascript' } ) );
+	head.insert( new Element('script', { src: "{$urls['version_check']}", 'type': 'text/javascript' } ) );
+	head.insert( new Element('script', { src: "{$urls['keiths_bits']}", 'type': 'text/javascript' } ) );
+	
+	/* ---------------------- */
+	/* Feeds                  */
+	/* ---------------------- */
+	
+	_newsFeed = setTimeout( '_newsFeedFunction()', 1000 );
+	
+	/* ---------------------- */
+	/* Update boxes           */
+	/* ---------------------- */
+	
+	_versionCheck = setTimeout( '_versionCheckFunction()', 1000 );
+	
+	/* ---------------------- */
+	/* Load Keith             */
+	/* ---------------------- */
+	
+	_keithFeed = setTimeout( '_keithFeedFunction()', 1000 );
+}
+
+/* ---------------------- */
+/* Keith Feed YumYum      */
+/* ---------------------- */
+
+function _keithFeedFunction()
+{
+	if ( typeof( IPS_KEITH_CONTENT ) != 'undefined' )
+	{
+		clearTimeout( _keithFeed );
+		
+		if ( IPS_KEITH_CONTENT && IPS_KEITH_CONTENT != 'none' )
+		{
+			/* Show version numbers */
+			$( 'ips_bulletin' ).style.display = '';
+			$( 'ips_supportbox_content' ).innerHTML = IPS_KEITH_CONTENT.replace( /&#0039;/g, "'" );
+		}
+	}
+	else
+	{
+		_keithFeed = setTimeout( '_keithFeedFunction()', 1000 );
+	}
+}
+
+/* ---------------------- */
+/* Version Check          */
+/* ---------------------- */
+
+function _versionCheckFunction()
+{
+	if ( typeof( IPSSERVER_update_type ) != 'undefined' )
+	{
+		clearTimeout( _versionCheck );
+		
+		if ( IPSSERVER_update_type && IPSSERVER_update_type != 'none' )
+		{
+			$( 'ips_update' ).style.display                = '';
+
+			/* Show version numbers */
+			$( 'acp-update-version' ).innerHTML = IPSSERVER_download_vh;
+			$( 'acp-update-link' ).href = IPSSERVER_link;
+		}
+	}
+}
+
+/* ---------------------- */
+/* NEWS FEED              */
+/* ---------------------- */
+
+
+function _newsFeedFunction()
+{
+	if ( typeof( ipsNewsFeed ) != 'undefined' )
+	{
+		clearTimeout( _newsFeed );
+		
+		eval( ipsNewsFeed );
+		var finalString = [];
+		var _len        = ipsNewsFeed['items'].length;
+
+		if( typeof( ipsNewsFeed['error'] ) == 'undefined' )
+		{
+			for( i = 0; i < _len; i++ )
+			{
+				var _title   = ( ipsNewsFeed['items'][i]['title'].length > 50 ) ? ipsNewsFeed['items'][i]['title'].substr( 0, 47 ) + '...' : ipsNewsFeed['items'][i]['title'];
+				$('ips_news_content').insert( (new Element("tr")).insert( new Element("td", { style: "padding: 5px" }).update("<img src='{$this->settings['skin_acp_url']}/images/icons/ipsnews_item.gif' /> <a href='" + ipsNewsFeed['items'][i]['link'] + "' target='_blank' style='text-decoration:none' title='" + ipsNewsFeed['items'][i]['title'] + "'>" + _title + "</a>")));
+			}
+		}
+		
+		if( !_len ){
+			$('ips_news_content').hide();
+		}
+	}
+	else
+	{
+		_newsFeed = setTimeout( '_newsFeedFunction()', 1000 );
+	}
+}
+
+/* Set up onload event */
+Event.observe( window, 'load', onload_ips_widgets );
+//]]>
+</script>
 EOF;
 
 //--endhtml--//
@@ -124,7 +408,6 @@ return $IPBHTML;
 /**
  * Wrapper for validating users
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -151,7 +434,6 @@ return $IPBHTML;
 /**
  * Validating users row
  *
- * @access	public
  * @param	array 		Data
  * @return	string		HTML
  */
@@ -185,7 +467,6 @@ return $IPBHTML;
 /**
  * Show the ACP notes block
  *
- * @access	public
  * @param	string		Current notes
  * @return	string		HTML
  */
@@ -195,16 +476,21 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<tr>
-	<td class='notes acp-row-on'>
-		<textarea name='notes' class="dashboard_notes" rows='8' cols='25'>{$notes}</textarea>
-	</td>
-</tr>
-<tr>
-	<td class='acp-actionbar'>
+<div style='padding: 5px;'>
+	<div id='notes_wrap'>
+		<textarea name='notes' id='dashboard_notes' class="dashboard_notes" rows='8' cols='25'>{$notes}</textarea>
+	</div>
+	<div style='text-align: left; margin-top: 5px; display: none' id='notes_save'>
 		<input type='submit' value='{$this->lang->words['cp_savenotes']}' class='realbutton' />
-	</td>
-</tr>
+	</div>
+</div>
+<script type='text/javascript'>
+	jQ(document).ready(function() {
+		jQ("#dashboard_notes").focus( function(e){
+			jQ("#notes_save").slideDown();
+		});
+	});
+</script>
 EOF;
 
 //--endhtml--//
@@ -214,7 +500,6 @@ return $IPBHTML;
 /**
  * Show a latest login record
  *
- * @access	public
  * @param	array 		Record
  * @return	string		HTML
  */
@@ -222,20 +507,25 @@ public function acp_last_logins_row( $r ) {
 
 $IPBHTML = "";
 //--starthtml--//
+if( empty( $r['admin_username'] ) )
+{
+	$r['admin_username'] = "<em class='desctext'>" . $this->lang->words['cp_none_entered'] . "</em>";
+}
 
 $IPBHTML .= <<<EOF
-<tr>
-	<td width='1' valign='middle'>
-		<img src='{$this->settings['skin_acp_url']}/images/{$r['_admin_img']}' alt='-' />
-	</td>
- 	<td class=''>
-		<strong>{$r['admin_username']}</strong>
-		<div class='desctext'>
+<tr class='ipsControlRow'>
+ 	<td>
+		<strong>{$r['admin_username']}</strong><br />
+		<span class='desctext'>
 			{$r['_admin_time']}
-		</div>
+		</span>
  	</td>
- 	<td class=''>
- 		<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}module=system&amp;section=loginlog&amp;do=view_detail&amp;detail={$r['admin_id']}', 400, 400)" title='Подробнее'><img src='{$this->settings['skin_acp_url']}/images/folder_components/index/view.png' alt='-' title='{$this->lang->words['cp_view']}' /></a>
+ 	<td class='col_buttons'>
+		<ul class='ipsControlStrip'>
+			<li class='i_cog'>
+ 				<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}module=system&amp;section=loginlog&amp;do=view_detail&amp;detail={$r['admin_id']}', 600, 400)" title='{$this->lang->words['failedlogin_viewdetails']}'>{$this->lang->words['cp_view']}</a>
+			</li>
+		</ul>
     </td>
 </tr>
 EOF;
@@ -247,7 +537,6 @@ return $IPBHTML;
 /**
  * Wrapper for latest ACP logins
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -257,46 +546,29 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<div class="acp-box" style='float:right; width:49%'>
-    <h3>{$this->lang->words['cp_latestadminlogins']}</h3>
-	<table width='100%'>
-		{$content}
-	</table>
-	<div class="more">
-		<a href='{$this->settings['base_url']}&amp;app=core&amp;module=system&amp;section=loginlog' style='text-decoration:none'>{$this->lang->words['cp_more']} {$this->lang->words['_raquo']}</a>
-	</div>
-</div>
+<div class="acp-box">
+    <h3>
+		<a href='{$this->settings['base_url']}&amp;app=core&amp;module=system&amp;section=loginlog' class='ipsBlock_titlelink'>{$this->lang->words['cp_seeall_logins']} {$this->lang->words['_raquo']}</a>
+		{$this->lang->words['cp_latestadminlogins']}
+	</h3>
+	<table class='ipsTable'>
 EOF;
 
-//--endhtml--//
-return $IPBHTML;
-}
-
-
-/**
- * Show the admins online record
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function acp_onlineadmin_row( $r ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$r['url']	= $this->registry->output->buildSEOUrl( $this->settings['board_url'] . '/index.php?showuser=' . $r['session_member_id'], 'none', $r['members_seo_name'], 'showuser' );
-
-$IPBHTML .= <<<EOF
-<tr>
-    <td class=''>
-    	<strong style='font-size:12px'><a href='{$r['url']}' target='_blank'>{$r['members_display_name']}</a></strong>
-    	<div class='desctext'>{$r['session_location']} (IP: {$r['session_ip_address']})</div>
-    </td> 
-	<td class=''>
-	 	<img src='{$r['pp_thumb_photo']}' width='{$r['pp_thumb_width']}' height='{$r['pp_thumb_height']}' />
- 	</td>
-</tr>
+	if( $content ){
+		$IPBHTML .= $content;
+	} else {
+		$IPBHTML .= <<<EOF
+		<tr>
+			<td class='no_messages'>
+				{$this->lang->words['cp_no_failed_logins']}
+			</td>
+		</tr>
+EOF;
+	}
+	
+	$IPBHTML .= <<<EOF
+	</table>
+</div>
 EOF;
 
 //--endhtml--//
@@ -306,7 +578,6 @@ return $IPBHTML;
 /**
  * Admins online wrapper
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -315,11 +586,14 @@ public function acp_onlineadmin_wrapper($content) {
 $IPBHTML = "";
 //--starthtml--//
 
-$IPBHTML .= <<<EOF
- <table width='100%' cellpadding='4' cellspacing='0'>
-  {$content}
- </table>
-EOF;
+if( count( $content ) )
+{	
+	foreach( $content as $r ){
+		$data[] = "<a href='{$r['seo_link']}' target='_blank' title='{$r['session_location']} {$this->lang->words['cp_from']} {$r['session_ip_address']}'>{$r['members_display_name']}</a>";
+	}
+	
+	$IPBHTML .= "<span class='desctext' style='font-size: 12px'>({$this->lang->words['admins_online']} " . implode(", ", $data) . ")</span>";
+}
 
 //--endhtml--//
 return $IPBHTML;
@@ -328,7 +602,6 @@ return $IPBHTML;
 /**
  * Show latest actions record
  *
- * @access	public
  * @param	array 		Record
  * @return	string		HTML
  */
@@ -354,45 +627,9 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * Latest actions wrapper
- *
- * @access	public
- * @param	string		Content
- * @return	string		HTML
- */
-public function acp_lastactions_wrapper($content) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['cp_lastacpactions']}</div>
- <table width='100%' cellpadding='4' cellspacing='0'>
- <tr>
-  <td class='tablesubheader' width='1%'>&nbsp;</td>
-  <td class='tablesubheader' width='44'>{$this->lang->words['cp_membername']}</td>
-  <td class='tablesubheader' width='55%'>{$this->lang->words['cp_timeofaction']}</td>
- </tr>
- $content
- </table>
- <div class='tablefooter' align='right'>
-   <a href='{$this->settings['base_url']}&amp;app=core&amp;module=logs&amp;section=adminlogs' style='text-decoration:none'>{$this->lang->words['cp_more']} {$this->lang->words['_raquo']}</a>
- </div>
-</div>
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
 /**
  * Show a warning box
  *
- * @access	public
  * @param	string		Title
  * @param	string		Content
  * @return	string		HTML
@@ -403,9 +640,11 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<div class='warning'>
-	<h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_error.png' alt='{$this->lang->words['cp_error']}' /> {$title}</h4>
-	{$content}
+<div class='warning dashboard_note'>
+	<h4>{$title}</h4>
+	<div class='note_content' style='display: none'>
+		{$content}
+	</div>
 </div>
 EOF;
 
@@ -413,30 +652,9 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * Show a warning that an emergency skin rebuild has occurred
- *
- * @access	public
- * @return	string		HTML
- * @deprecated	Don't think this is done/called anymore
- */
-public function warning_rebuild_emergency() {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-	{$this->lang->words['cp_emergency']}
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * Show a warning that the rebuild following the upgrade hasn't been completed
  *
- * @access	public
  * @return	string		HTML
  */
 public function warning_rebuild_upgrade() {
@@ -455,7 +673,6 @@ return $IPBHTML;
 /**
  * Show form to change details
  *
- * @access	public
  * @return	string		HTML
  */
 public function showChangeForm() {
@@ -468,32 +685,34 @@ $IPBHTML .= <<<EOF
 	<div class='acp-box'>
  		<h3>{$this->lang->words['mycp_change_details']}</h3>
 		
- 		<ul class='acp-form'>
- 			<li class='head'><label>{$this->lang->words['change_email_details']}</label></li>
-			<li class='acp-row-on'>
-				<label>{$this->lang->words['change__email']}</label>
-				<input class='textinput' type='text' name='email' size='30' />
-			</li>
-			<li class='acp-row-off'>
-				<label>{$this->lang->words['change__email_confirm']}</label>
-				<input class='textinput' type='text' name='email_confirm' size='30' />
-			</li>
-			
-			<li class='head'><label>{$this->lang->words['change_pass_details']}</label></li>
-			<li class='acp-row-on'>
-				<label>{$this->lang->words['change__pass']}<!--<span class='desctext'>{$this->lang->words['pw_will_logout']}</span>--></label>
-				<input class='textinput' type='password' name='password' size='30' />
-			</li>
-			<li class='acp-row-off'>
-				<label>{$this->lang->words['change__pass_confirm']}</label>
-				<input class='textinput' type='password' name='password_confirm' size='30' />
-			</li>
-		</ul>
-
+		<div class='acp_box'>
+			<table class='ipsTable double_pad'>
+				<tr>
+				   <th colspan='2'>{$this->lang->words['change_email_details']}</th>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['change__email']}</strong></td>
+					<td class='field_field'><input class='textinput' type='text' name='email' size='30' /></td>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['change__email_confirm']}</strong></td>
+					<td class='field_field'><input class='textinput' type='text' name='email_confirm' size='30' /></td>
+				</tr>
+				
+				<tr><th colspan='2'>{$this->lang->words['change_pass_details']}</th></tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['change__pass']}</strong></td>
+					<td class='field_field'><input class='textinput' type='password' name='password' size='30' /></td>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['change__pass_confirm']}</strong></td>
+					<td class='field_field'><input class='textinput' type='password' name='password_confirm' size='30' /></td>
+				</tr>
+			</table>
+		</div>
+		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value=' {$this->lang->words['change__confirm']} ' class='button primary' />
-			</div>
+			<input type='submit' value='{$this->lang->words['change__confirm']}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_performance.php b/upload/admin/applications/core/skin_cp/cp_skin_performance.php
index 584e2719..6901fdbb 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_performance.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_performance.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Performance mode skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_performance extends output
+class cp_skin_performance
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the results from toggling the mode
  *
- * @access	public
  * @param	bool		Currently on or off
  * @param	array 		Actions that were taken
  * @return	string		HTML
@@ -89,7 +119,6 @@ return $IPBHTML;
 /**
  * Show the overview page
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_qanda.php b/upload/admin/applications/core/skin_cp/cp_skin_qanda.php
index 692ef624..e9df06b4 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_qanda.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_qanda.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Question and answer skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-08-01 17:58:16 -0400 (Mon, 01 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9346 $
  */
  
-class cp_skin_qanda extends output
+class cp_skin_qanda
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the q&a form
  *
- * @access	public
  * @param	string		Action
  * @param	int			ID
  * @param	array 		Form elements
@@ -57,16 +87,25 @@ $IPBHTML .= <<<HTML
 	
 	<div class='acp-box'>
 		<h3>{$button}</h3>
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['qa_form_question']}</label>
-				{$form['question']}
-			</li>
-			<li>
-				<label>{$this->lang->words['qa_form_answers']}</label>
-				{$form['answers']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['qa_form_question']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['question']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['qa_form_answers']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['answers']}<br />
+					<span class='desctext'>{$this->lang->words['qa_form_answers_extra']}</span>
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$button}' class='realbutton' accesskey='s'>
 		</div>		
@@ -81,7 +120,6 @@ return $IPBHTML;
 /**
  * Show the overview page
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -90,52 +128,81 @@ public function overview( $rows )
 $IPBHTML = "";
 //--starthtml--//
 
+
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['qa_help_title']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=new' title='{$this->lang->words['qa_addlink']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/help_add.png' alt='' />
-				{$this->lang->words['qa_addlink']}
-			</a>
-		</li>
-	</ul>
+	<div class='section_info'>
+		{$this->lang->words['qahelp_infos']}
+	</div>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+HTML;
+
+		if ( $this->registry->class_permissions->checkPermission( 'qa_manage' ) )
+		{
+			$IPBHTML .= <<<HTML
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=new' title='{$this->lang->words['qa_addlink']}'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/help_add.png' alt='' />
+					{$this->lang->words['qa_addlink']}
+				</a>
+			</li>
+HTML;
+		}
+		
+		$IPBHTML .= <<<HTML
+		</ul>
+	</div>
 </div>
 HTML;
 
-if ( count( $rows ) AND ! $this->settings['registration_qanda'] )
-{
-	$this->lang->words['qa_not_on_desc'] = sprintf( $this->lang->words['qa_not_on_desc'], $this->settings['base_url'] . $this->form_code .'&amp;do=switchOn' );
-	
-	$IPBHTML .= $this->registry->output->global_template->warning_box( $this->lang->words['qa_not_on_title'], $this->lang->words['qa_not_on_desc'] ) . "<br />";
-}
+
 
 $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['qa_current']}</h3>
-		<table class='alternate_rows'>
+		<table class='ipsTable alternate_rows'>
 HTML;
 
 if( count($rows) )
 {		
 $IPBHTML .= <<<HTML
 			<tr>
-				<th width='95%'>{$this->lang->words['qa_form_question']}</th>
-				<th width='5%'>{$this->lang->words['qa_options']}</th>
+				<th>{$this->lang->words['qa_form_question']}</th>
+				<th class='col_buttons'>&nbsp;</th>
 			</tr>
 HTML;
 foreach( $rows as $r )
 {
+	$r['_answers'] = IPSText::truncate( str_replace("\r", ", ", $r['qa_answers']), 50 );
+
 $IPBHTML .= <<<HTML
-			<tr>
-				<td>{$r['qa_question']}</td>
+			<tr class='ipsControlRow'>
 				<td>
-					<img class='ipbmenu' id="menu-{$r['qa_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-					<ul class='acp-menu' id='menu-{$r['qa_id']}_menucontent'>
-						<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['qa_id']}'>{$this->lang->words['qa_edit']}</a></li>
-						<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;id={$r['qa_id']}");'>{$this->lang->words['qa_delete']}</a></li>
+					<p class='larger_text'>
+						{$r['qa_question']}
+					</p>
+					<span class='desctext'>{$r['_answers']}</span>
+				</td>
+				<td>
+HTML;
+
+		if ( $this->registry->class_permissions->checkPermission( 'qa_manage' ) )
+		{
+			$IPBHTML .= <<<HTML
+					<ul class='ipsControlStrip'>
+						<li class='i_edit'>
+							<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;id={$r['qa_id']}'>{$this->lang->words['qa_edit']}</a>
+						</li>
+						<li class='i_delete'>
+							<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove&amp;id={$r['qa_id']}");'>{$this->lang->words['qa_delete']}</a>
+						</li>
 					</ul>
+HTML;
+		}
+		
+			$IPBHTML .= <<<HTML
 				</td>
 			</tr>
 HTML;
@@ -144,7 +211,17 @@ HTML;
 else
 {
 	$IPBHTML .= <<<HTML
-	<tr><td>{$this->lang->words['qa_none']}</td></tr>
+	<tr><td class='no_messages'>{$this->lang->words['qa_none']}.
+HTML;
+	if ( $this->registry->class_permissions->checkPermission( 'qa_manage' ) )
+	{
+		$IPBHTML .= <<<HTML
+ <a href='{$this->settings['base_url']}{$this->form_code}&amp;do=new' title='{$this->lang->words['qa_addlink']}' class='mini_button'>{$this->lang->words['qa_createonenow']}</a>
+HTML;
+	}
+	
+	$IPBHTML .= <<<HTML
+	</td></tr>
 HTML;
 }
 
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_rebuild.php b/upload/admin/applications/core/skin_cp/cp_skin_rebuild.php
index 247ec03b..0a8dd351 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_rebuild.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_rebuild.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Cleanup and rebuild tools skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-26 11:36:44 -0400 (Thu, 26 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8899 $
  */
  
-class cp_skin_rebuild extends output
+class cp_skin_rebuild
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Splash screen of available tools
  *
- * @access	public
  * @return	string		HTML
  */
 public function toolsSplashScreen()
@@ -42,6 +72,28 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
+<div class='section_title'>
+	<h2>{$this->lang->words['re_310to320']}</h2>	
+</div>
+
+<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm' id='theAdminForm'>
+	<input type='hidden' name='do' value='320photos' />
+	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
+	<div class='acp-box'>
+		<h3>{$this->lang->words['re_320photos']}</h3>
+
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_320photos_info']}</strong></td>
+			</tr>
+		</table>
+		
+		<div class='acp-actionbar'>
+			{$this->lang->words['re_convertfromphotos']} <select name='from'><option value='avatars'>{$this->lang->words['re_cp_avatars']}</option><option value='photos'>{$this->lang->words['re_cp_photos']}</option></select> <input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
+		</div>
+	</div>
+</form><br />
+
 <div class='section_title'>
 	<h2>{$this->lang->words['re_230to300']}</h2>	
 </div>
@@ -52,14 +104,17 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_300pms']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_300pms_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_300pms_info']}</strong></td>
+			</tr>
+		</table>
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
-</form>
+</form><br />
 	
 <div class='section_title'>
 	<h2>{$this->lang->words['re_20to21']}</h2>	
@@ -70,10 +125,13 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_dupe2']}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_dupe2_info']}</li>
-		</ul>
+		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_dupe2_info']}</strong></td>
+			</tr>
+		</table>
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -87,9 +145,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_events']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_events_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='field'>{$this->lang->words['re_events_info']}</strong></td>
+			</tr>
+		</table>
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -103,9 +164,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_polls']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_polls_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_polls_info']}</strong></td>
+			</tr>
+		</table>
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -123,9 +187,11 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_dupe1']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_dupe1_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_dupe1_info']}</strong></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -139,9 +205,11 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_converge']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_converge_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_converge_info']}</strong></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -155,9 +223,11 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_ban']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>{$this->lang->words['re_ban_info']}</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_field'><strong class='title'>{$this->lang->words['re_ban_info']}</strong></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_runtool']}' class='button primary' accesskey='s'>
 		</div>
@@ -173,7 +243,6 @@ return $IPBHTML;
 /**
  * Rebuild content splash screen
  *
- * @access	public
  * @param	array 		Form elements
  * @param	array 		Sections we can rebuild
  * @param	array 		Sections we have rebuilt
@@ -189,6 +258,12 @@ $IPBHTML .= <<<HTML
 	<h2>{$this->lang->words['re_title']}</h2>
 </div>
 
+HTML;
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_recount' ) )
+{
+
+$IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='docount' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
@@ -196,34 +271,40 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_stats']}</h3>
 
-		<ul class='acp-form alternate_rows'>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_s_total']}</strong></td>
+				<td class='field_field'>{$form['posts']}</td>
+            </tr>
 			
-			<li>
-				<label>{$this->lang->words['re_s_total']}</label>
-				{$form['posts']}
-			</li>
-
-			<li>
-				<label>{$this->lang->words['re_s_members']}</label>
-				{$form['members']}
-			</li>
-
-			<li>
-				<label>{$this->lang->words['re_s_last']}</label>
-				{$form['lastreg']}
-			</li>
-
-			<li>
-				<label>{$this->lang->words['re_s_most']}</label>
-				{$form['online']}
-			</li>
-		</ul>		
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_s_members']}</strong></td>
+				<td class='field_field'>{$form['members']}</td>
+			</tr>
+			
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_s_last']}</strong></td>
+				<td class='field_field'>{$form['lastreg']}</td>
+			</tr>
+			
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_s_most']}</strong></td>
+				<td class='field_field'>{$form['online']}</td>
+			</tr>
+		</table>		
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_stats']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
 
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_resyncht' ) )
+{
+$IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='doresynctopics' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
@@ -231,18 +312,26 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_topics']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_topics']}<span class='desctext'>{$this->lang->words['re_topics_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_topics']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_topics_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_topics']}' class='button primary' accesskey='s'>
 		</div>	
 	</div>
 </form><br />
 
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_resynch' ) )
+{
+
+$IPBHTML .= <<<HTML
+
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='doresyncforums' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
@@ -250,12 +339,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_forums']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_forums']}<span class='desctext'>{$this->lang->words['re_forums_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_forums']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_forums_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_forums']}' class='button primary' accesskey='s'>
 		</div>
@@ -263,7 +352,9 @@ $IPBHTML .= <<<HTML
 </form><br />
 HTML;
 
-if( count($rebuildSections) )
+}
+
+if( count($rebuildSections) and $this->registry->class_permissions->checkPermission( 'tools_rebuild' ) )
 {
 	$IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
@@ -273,12 +364,13 @@ if( count($rebuildSections) )
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_rebuild']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_rebuildbutton']}<span class='desctext'>{$this->lang->words['re_rebuild_info']}</span></label>
+		<table class='ipsTable double_pad'>
+			<tr>
 				<div style='overflow:auto'>
-				<ul>
-					<li><input type='radio' name='type' id='type_none' checked='checked' value='0' /> <label style='float:none;' for='type_none'>{$this->lang->words['remenu_none']}</label></li>
+				<tr>
+				    <td class='field_title'><strong class='title'>{$this->lang->words['re_rebuildbutton']}</strong></td>
+					<td class='field_field'><input type='radio' name='type' id='type_none' checked='checked' value='0' /> <label style='float:none;' for='type_none'>{$this->lang->words['remenu_none']}</label></td>
+				</tr>
 HTML;
 
 				foreach( $rebuildSections as $section )
@@ -291,15 +383,23 @@ HTML;
 					}
 					
 					$IPBHTML .= <<<HTML
-					<li><input type='radio' name='type' id='type_{$section[0]}' value='{$section[0]}' /> <label style='float:none;' for='type_{$section[0]}'>{$section[1]}</label>{$description}</li>
+					<tr>
+					    <td class='field_title'>&nbsp;</td>
+						<td class='field_field'><input type='radio' name='type' id='type_{$section[0]}' value='{$section[0]}' /> <label style='float:none;' for='type_{$section[0]}'>{$section[1]}</label>{$description}</td>
+					</tr>
 HTML;
 				}
 				
 				$IPBHTML .= <<<HTML
-				</ul>&nbsp;&nbsp;{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}</div>
+				</tr>
+				
+				<tr>
+				    <td class='field_title'><strong class='title'>{$this->lang->words['re_percycle']}</strong></td>
+					<td class='field_field'>{$form['pergo']}</td>
+				</tr>
 
-			</li>
-		</ul>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_rebuildbutton']}' class='button primary' accesskey='s'>
 		</div>
@@ -308,6 +408,8 @@ HTML;
 HTML;
 }
 
+if ( $this->registry->class_permissions->checkPermission( 'tools_postcounts' ) )
+{
 $IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='dopostnames' />
@@ -316,12 +418,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_user']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_user']}<span class='desctext'>{$this->lang->words['re_user_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_user']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_user_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_user']}' class='button primary' accesskey='s'>
 		</div>
@@ -335,12 +437,13 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_seouser']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_seouser']}<span class='desctext'>{$this->lang->words['re_seouser_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_seouser']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_seouser_info']}</span></td>
+			</tr>
+		</table>	
+		
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_seouser']}' class='button primary' accesskey='s'>
 		</div>
@@ -354,12 +457,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_msgcount']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_msgcount']}<span class='desctext'>{$this->lang->words['re_msgcount_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_msgcount']}
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_msgcount_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_msgcount']}' class='button primary' accesskey='s'>
 		</div>
@@ -373,18 +476,24 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_count']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_count']}<span class='desctext'>{$this->lang->words['re_count_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_count']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_count_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_count']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
 
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_thumbs' ) )
+{
+$IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='dophotos' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
@@ -392,12 +501,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_pphoto']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_pphoto']}<span class='desctext'>{$this->lang->words['re_pphoto_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_pphoto']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_pphoto_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_pphoto']}' class='button primary' accesskey='s'>
 		</div>
@@ -411,17 +520,23 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_thumb']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_thumb']}<span class='desctext'>{$this->lang->words['re_thumb_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_thumb']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_thumb_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_thumb']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_attach' ) )
+{
+$IPBHTML .= <<<HTML
 
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='doattachdata' />
@@ -430,18 +545,25 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_data']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_data']}<span class='desctext'>{$this->lang->words['re_data_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_data']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_data_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_data']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
 
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_orphaned' ) )
+{
+$IPBHTML .= <<<HTML
+
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='cleanattachments' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
@@ -449,36 +571,24 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_orph']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_orph']}<span class='desctext'>{$this->lang->words['re_orph_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_orph']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_orph_info']}</span></td>
+			</td>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_orph']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form><br />
 
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
-	<input type='hidden' name='do' value='cleanavatars' />
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
-	
-	<div class='acp-box'>
-		<h3>{$this->lang->words['re_av']}</h3>
-	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_av']}<span class='desctext'>{$this->lang->words['re_av_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
-		<div class='acp-actionbar'>
-			<input type='submit' value='{$this->lang->words['re_av']}' class='button primary' accesskey='s'>
-		</div>
-	</div>
-</form><br />
+HTML;
+}
+
+if ( $this->registry->class_permissions->checkPermission( 'tools_orphanp' ) )
+{
+$IPBHTML .= <<<HTML
 
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='cleanphotos' />
@@ -487,12 +597,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['re_uphoto']}</h3>
 
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['re_uphoto']}<span class='desctext'>{$this->lang->words['re_uphoto_info']}</span></label>
-				{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['re_uphoto']}</strong></td>
+				<td class='field_field'>{$form['pergo']}&nbsp;{$this->lang->words['re_percycle']}<br /><span class='desctext'>{$this->lang->words['re_uphoto_info']}</span></td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['re_uphoto']}' class='button primary' accesskey='s'>
 		</div>	
@@ -500,6 +610,8 @@ $IPBHTML .= <<<HTML
 </form>
 HTML;
 
+}
+
 //--endhtml--//
 return $IPBHTML;
 }
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_reports.php b/upload/admin/applications/core/skin_cp/cp_skin_reports.php
index 570bc8b1..b69cf75e 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_reports.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_reports.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Report center skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6326 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_reports extends output
+class cp_skin_reports
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the plugins overview page
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -44,8 +74,8 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['r_plugmanager']}</h2>
 	<ul class='context_menu'>
 		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=create_plugin' title='{$this->lang->words['r_regnew']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/plugin_add.png' alt='' />
+			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=create_plugin' title='{$this->lang->words['r_regnew']}'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/plugin_add.png' alt='' />
 				{$this->lang->words['r_regnew']}
 			</a>
 		</li>
@@ -54,7 +84,7 @@ $IPBHTML .= <<<EOF
 
 <div class="acp-box">
 	<h3>{$this->lang->words['r_regplugins']}</h3>
-	<table class="alternate_rows">
+	<table class="ipsTable">
 		<tr>
 			<th width='35%'>{$this->lang->words['r_name']}</th>
 			<th width='20%'>{$this->lang->words['r_author']}</th>
@@ -72,14 +102,13 @@ return $IPBHTML;
 /**
  * Show a report plugin row
  *
- * @access	public
  * @param	array 		Data for the plugin record
  * @return	string		HTML
  */
 public function report_plugin_row( $data ) {
 
 $IPBHTML .= <<<EOF
-<tr>
+<tr class='ipsControlRow'>
 	<td><strong>{$data['class_title']}
 EOF;
 if( $data['pversion'] )
@@ -87,7 +116,7 @@ if( $data['pversion'] )
 $IPBHTML .= ' ' . $data['pversion'];
 }
 $IPBHTML .= <<<EOF
-</strong><div class='desctext'>{$data['class_desc']}</td>
+</strong><br /><span class='desctext'>{$data['class_desc']}</span></td>
  <td>
 EOF;
 if( $data['author_url'] != '' )
@@ -101,18 +130,20 @@ $IPBHTML .= $data['author'];
 $IPBHTML .= <<<EOF
 </td>
  <td style='text-align: center'>
-  <a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=plugin_toggle&amp;plugin_id={$data['com_id']}" title='{$this->lang->words['r_toggleendis']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$data['_enabled_img']}' alt='YN' /></a>
+  <a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=plugin_toggle&amp;plugin_id={$data['com_id']}" title='{$this->lang->words['r_toggleendis']}'><img src='{$this->settings['skin_acp_url']}/images/icons/{$data['_enabled_img']}' alt='YN' /></a>
  </td>
- <td style='text-align: center'>
-	<img class='ipbmenu' id="menu{$data['com_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['r_options']}' />
-	<ul class='acp-menu' id='menu{$data['com_id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=edit_plugin&amp;com_id={$data['com_id']}'>{$this->lang->words['r_editsettings']}</a></li>
+ <td class='col_buttons'>
+ 	<ul class='ipsControlStrip'>
+		<li class='i_edit'>
+		   <a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit_plugin&amp;com_id={$data['com_id']}' title='{$this->lang->words['r_editsettings']}'>{$this->lang->words['r_editsettings']}</a>
+		</li>
 EOF;
 if( $data['lockd'] != 1 || IN_DEV == 1 )
 {
 $IPBHTML .= <<<EOF
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=change_plugin&amp;com_id={$data['com_id']}'>{$this->lang->words['r_plugindetails']}</a></li>
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=remove_plugin&amp;com_id={$data['com_id']}");'>{$this->lang->words['r_removeplugin']}</a></li>
+		<li class='i_delete'>
+			<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove_plugin&amp;com_id={$data['com_id']}");' title='{$this->lang->words['r_removeplugin']}'>{$this->lang->words['r_removeplugin']}</a>
+		</li>
 EOF;
 }
 $IPBHTML .= <<<EOF
@@ -127,87 +158,76 @@ return $IPBHTML;
 /**
  * Show the status overview page
  *
- * @access	public
- * @param	string		Content
- * @return	string		HTML
+ * @param	array		$statusRows		Statuses data
+ * @return	@e string	HTML
  */
-public function report_status_overview($content) {
+public function report_status_overview($statusRows) {
 
 $IPBHTML .= <<<EOF
-<script type="text/javascript">
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { revert: true, format: 'status_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'status' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
-</script>
-
 <div class='section_title'>
 	<h2>{$this->lang->words['r_statmanager']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=create_status'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/page_add.png' alt=''>{$this->lang->words['r_createnew']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=create_status'><img src='{$this->settings['skin_acp_url']}/images/icons/page_add.png' alt=''>{$this->lang->words['r_createnew']}</a></li>
 	</ul>
 </div>
 
 <div class="acp-box">
 	<h3>{$this->lang->words['r_repstatsev']}</h3>
-    <ul id='sortable_handle'>
-    	{$content}
-    </ul>
-</div>
+	<table class='ipsTable' id='statuses_list'>
 EOF;
 
-return $IPBHTML;
+if ( is_array($statusRows) && count($statusRows) )
+{
+	foreach( $statusRows as $data )
+	{
+		$IPBHTML .= <<<EOF
+		<tr id='status_{$data['status']}' class='ipsControlRow isDraggable'>
+			<td class='col_drag' valign='top' style='padding-top: 20px;'>
+				<span class='draghandle'>&nbsp;</span>
+			</td>
+			<td>
+				<table class='ipsTable'>
+					<tr>
+						<td style='width: 61%'>
+							<strong>{$data['title']}</strong>
+						</td>
+						<td style='width: 34%; text-align: right'>
+							<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=set_status&amp;status=new&amp;id={$data['status']}" title="{$this->lang->words['r_new_report']}"><img src='{$this->settings['skin_acp_url']}/images/report_new_{$data['_is_new']}.png' alt='{$this->lang->words['r_new_report']}' /></a>
+							<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=set_status&amp;status=complete&amp;id={$data['status']}" title="{$this->lang->words['r_complete_report']}"><img src='{$this->settings['skin_acp_url']}/images/report_complete_{$data['_is_complete']}.png' alt='{$this->lang->words['r_complete_report']}' /></a>
+							<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=set_status&amp;status=active&amp;id={$data['status']}" title="{$this->lang->words['r_active_report']}"><img src='{$this->settings['skin_acp_url']}/images/report_active_{$data['_is_active']}.png' alt='{$this->lang->words['r_active_report']}' /></a>
+						</td>
+						<td class='col_buttons'>
+						    <ul class='ipsControlStrip'>
+				    			<li class='i_add'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=add_image&amp;id={$data['status']}' title='{$this->lang->words['r_addimg']}' title='{$this->lang->words['r_addimg']}'>{$this->lang->words['r_addimg']}</a></li>
+								<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_status&amp;id={$data['status']}' title='{$this->lang->words['r_editstatus']}' title='{$this->lang->words['r_editstatus']}'>{$this->lang->words['r_editstatus']}</a></li>
+								<li class='ipsControlStrip_more ipbmenu' id="stat_menu{$data['status']}">
+									<a href='#'>&nbsp;</a>
+								</li>
+						    </ul>
+						
+							<ul class='acp-menu' id='stat_menu{$data['status']}_menucontent'>
+								<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove_status&amp;id={$data['status']}");' title='{$this->lang->words['r_removestatus']}'>{$this->lang->words['r_removestatus']}</a></li>
+							</ul>
+						</td>
+					</tr>
+					{$data['status_images']}
+				</table>
+			</td>
+		</tr>
+EOF;
+	}
 }
 
-/**
- * Show a status row
- *
- * @access	public
- * @param	array 		Status data
- * @return	string		HTML
- */
-public function report_status_row( $data ) {
-
 $IPBHTML .= <<<EOF
-<li id='status_{$data['status']}'>
-		<table width='100%' class='hierarchy double_pad'>
-			<tr class='parent'>
-				<td style='width: 2%; text-align: center'>
-					<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
-				</td>
-				<td style='width: 61%'>
-					<strong>{$data['title']}</strong>
-				</td>
-				<td style='width: 34%; text-align: right'>
-					<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=set_status&amp;status=new&amp;id={$data['status']}" title="{$this->lang->words['r_new_report']}"><img src='{$this->settings['skin_acp_url']}/_newimages/report_new_{$data['_is_new']}.png' alt='{$this->lang->words['r_new_report']}' /></a>
-					 <a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=set_status&amp;status=complete&amp;id={$data['status']}" title="{$this->lang->words['r_complete_report']}"><img src='{$this->settings['skin_acp_url']}/_newimages/report_complete_{$data['_is_complete']}.png' alt='{$this->lang->words['r_complete_report']}' /></a>
-					 <a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=set_status&amp;status=active&amp;id={$data['status']}" title="{$this->lang->words['r_active_report']}"><img src='{$this->settings['skin_acp_url']}/_newimages/report_active_{$data['_is_active']}.png' alt='{$this->lang->words['r_active_report']}' /></a>
-				</td>
-				<td style='width: 3%'>
-					<img class='ipbmenu' id="stat_menu{$data['status']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-					<ul class='acp-menu' id='stat_menu{$data['status']}_menucontent'>
-						<li class='icon add'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=add_image&amp;id={$data['status']}'>{$this->lang->words['r_addimg']}</a></li>
-						<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=edit_status&amp;id={$data['status']}'>{$this->lang->words['r_editstatus']}</a></li>
-						<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=remove_status&amp;id={$data['status']}");'>{$this->lang->words['r_removestatus']}</a></li>
-					</ul>
-				</td>
-			</tr>
-			{$data['status_images']}
-		</table>
-</li>
+	</table>
+</div>
+
+<script type='text/javascript'>
+	jQ("#statuses_list").ipsSortable( 'table', { 
+		url: "{$this->settings['base_url']}{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )
+	});
+</script>
 EOF;
 
 return $IPBHTML;
@@ -216,25 +236,23 @@ return $IPBHTML;
 /**
  * Show a report status image
  *
- * @access	public
  * @param	array 		Status image data
  * @return	string		HTML
  */
 public function report_status_image( $data ) {
 
 $IPBHTML .= <<<EOF
-<tr class='child'>
-	<td>&nbsp;</td>
-	<td style='padding-left: 20px;' colspan='3'>
-		<img class='ipbmenu' id="statimg{$data['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
+<tr>
+	<td colspan='2'>
 		<img src='{$this->settings['public_dir']}{$data['img']}' alt='{$data['points']}' title="{$data['points']}{$this->lang->words['r_points_sufix']}" width="{$data['width']}" height="{$data['height']}" /> {$data['points']} {$this->lang->words['pointssuffix']}
-		<ul class='acp-menu' id='statimg{$data['id']}_menucontent'>
-			<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=edit_image&amp;id={$data['id']}'>{$this->lang->words['r_editimg']}</a></li>
-			<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=remove_image&amp;id={$data['id']}");'>{$this->lang->words['r_removeimg']}</a></li>
+	</td>
+	<td class='col_buttons'>
+		<ul class='ipsControlStrip' id='statimg{$data['id']}_menucontent'>
+			<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit_image&amp;id={$data['id']}' title='{$this->lang->words['r_editimg']}'>{$this->lang->words['r_editimg']}</a></li>
+			<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove_image&amp;id={$data['id']}");' title='{$this->lang->words['r_removeimg']}'>{$this->lang->words['r_removeimg']}</a></li>
 		</ul>
 	</td>
 </tr>
-
 EOF;
 
 return $IPBHTML;
@@ -243,7 +261,6 @@ return $IPBHTML;
 /**
  * Show the main overview template
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -254,8 +271,8 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['r_overview_title']}</h2>
 	<ul class='context_menu'>
 		<li>
-			<a href='{$this->settings['_base_url']}&amp;app=core&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=warnsetup'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' />
+			<a href='{$this->settings['_base_url']}&amp;app=core&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=warnsetup'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' />
 				{$this->lang->words['config_rc_settings']}
 			</a>
 		</li>
@@ -263,29 +280,29 @@ $IPBHTML .= <<<EOF
 </div>
 <div class="acp-box">
 	<h3>{$this->lang->words['r_overview']}</h3>
-    <table class="alternate_rows">
+    <table class="ipsTable">
         <tr>
-            <td class='tablerow1' width='40%'>{$this->lang->words['r_totalreports']}</td>
-            <td class='tablerow2'>{$content['reports_total']}</td>
+            <td width='40%'><strong>{$this->lang->words['r_totalreports']}</strong></td>
+            <td>{$content['reports_total']}</td>
         </tr>
         <tr>
-            <td class='tablerow1'>{$this->lang->words['r_totalcomments']}</td>
-            <td class='tablerow2'>{$content['comments_total']}</td>
+            <td><strong>{$this->lang->words['r_totalcomments']}</strong></td>
+            <td>{$content['comments_total']}</td>
         </tr>
         <tr>
-            <td class='tablerow1'>{$this->lang->words['r_activeplugins']}</td>
-            <td class='tablerow2'>{$content['active_plugins']} / {$content['total_plugins']}</td>
+            <td><strong>{$this->lang->words['r_activeplugins']}</strong></td>
+            <td>{$content['active_plugins']} / {$content['total_plugins']}</td>
         </tr>
     </table>
 </div>
 <br />
 <div class="acp-box">
 	<h3>{$this->lang->words['r_graphstats']}</h3>
-    <table class="alternate_rows">
+    <table class="ipsTable">
         <tr>
-            <td>
-                <img src='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=chart_report_stats' />
-                <img src='{$this->settings['base_url']}&amp;{$this->form_code}&amp;code=chart_top_moderator' />
+            <td class='center'>
+                <img src='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=chart_report_stats' />
+                <img src='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=chart_top_moderator' />
             </td>
         </tr>
     </table>
@@ -298,7 +315,6 @@ return $IPBHTML;
 /**
  * Show the form to add/edit a plugin
  *
- * @access	public
  * @param	array 		Plugin data
  * @return	string		HTML
  */
@@ -347,7 +363,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <div class='section_title'>
-	<h2>Плагины �и�темы жалоб</h2>
+	<h2>{$this->lang->words['r_rcpluginstitle']}</h2>
 </div>
 
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$code}&amp;secure_key={$secure_key}' method='post'>
@@ -355,38 +371,38 @@ $IPBHTML .= <<<EOF
 <input type='hidden' name='com_id' value='{$plug_data['com_id']}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['r_registernew']}</h3>
-	<ul class='acp-form alternate_rows'>
-	<li>
-		<label>{$this->lang->words['r_app']}</label>
-		{$form['plugi_app']}
-	</li>
-		<li>
-			<label>{$this->lang->words['r_plugintitle']}<span class="desctext">{$this->lang->words['r_whatcall']}</span></label>
-			{$form['plugi_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_version']}</label>
-			{$form['plugi_version']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_description']}</label>
-			{$form['plugi_desc']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_authorname']}</label>
-			{$form['plugi_author']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_authorurl']}</label>
-			{$form['plugi_author_url']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_pluginfile']}</label>
-			/admin/applications/YOURAPP/extensions/reportPlugins/&nbsp;{$form['plugi_file']}&nbsp;.php
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_app']}</strong></td>
+			<td class='field_field'>{$form['plugi_app']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_plugintitle']}</strong></td>
+			<td class='field_field'>{$form['plugi_title']}<br /><span class="desctext">{$this->lang->words['r_whatcall']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_version']}</strong></td>
+			<td class='field_field'>{$form['plugi_version']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_description']}</strong></td>
+			<td class='field_field'>{$form['plugi_desc']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_authorname']}</strong></td>
+			<td class='field_field'>{$form['plugi_author']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_authorurl']}</strong></td>
+			<td class='field_field'>{$form['plugi_author_url']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_pluginfile']}</strong></td>
+			<td class='field_field'>/admin/applications/YOURAPP/extensions/reportPlugins/&nbsp;{$form['plugi_file']}&nbsp;.php</td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
-    	<input type='submit' value=' {$this->lang->words['r_save']} ' class="button primary" />
+    	<input type='submit' value='{$this->lang->words['r_save']}' class="button primary" />
 	</div>
 </div>
 </form>
@@ -399,7 +415,6 @@ return $IPBHTML;
 /**
  * Add a row
  *
- * @access	public
  * @param	string		Title
  * @param	string		Description
  * @param	string		Form field
@@ -411,22 +426,24 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-		<li>
-			<label>{$title}
+		<tr><td class='field_title'>
+			<strong class='title'>{$title}</strong></td>
+EOF;
+
+$IPBHTML .= <<<EOF
+        <td class='field_field'>{$form_field}
 EOF;
 
 if( $desc )
 {
 $IPBHTML .= <<<EOF
-	<span class='desctext'>{$desc}</span>
+	<br /><span class='desctext'>{$desc}</span>
 EOF;
-}
 
 $IPBHTML .= <<<EOF
-        </label>
-        {$form_field}
-	</li>
+        </td></tr>
 EOF;
+}
 
 //--endhtml--//
 return $IPBHTML;
@@ -435,7 +452,6 @@ return $IPBHTML;
 /**
  * Show the form to "finish" adding the plugin
  *
- * @access	public
  * @param	array 		Plugin data
  * @param	array 		Groups that can report
  * @param	array 		Groups that can moderate
@@ -480,40 +496,40 @@ $IPBHTML .= <<<EOF
 <input type='hidden' name='finish' value='1' />
 <div class="acp-box">
 	<h3>{$this->lang->words['r_editplugin']}: {$plug_data['class_title']}</h3>
-	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['r_app']}</label>
-			{$form['plugi_app']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_groups_submit']}<span class="desctext">{$this->lang->words['r_groups_submit_info']}</span></label>
-			{$form['plugi_can_report']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_groups']}<span class="desctext">{$this->lang->words['r_groups_info']}</span></label>
-			{$form['plugi_gperm']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_pluginenabled']}</label>
-			{$form['plugi_enabled']}
-		</li>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_app']}</strong></td>
+			<td class='field_field'>{$form['plugi_app']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_groups_submit']}</strong></td>
+			<td class='field_field'>{$form['plugi_can_report']}<br /><span class="desctext">{$this->lang->words['r_groups_submit_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_groups']}</strong></td>
+			<td class='field_field'>{$form['plugi_gperm']}<br /><span class="desctext">{$this->lang->words['r_groups_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_pluginenabled']}</strong></td>
+			<td class='field_field'>{$form['plugi_enabled']}</td>
+		</tr>
 EOF;
 
 		if( IN_DEV == 1 )
 		{
 			$IPBHTML .= <<<EOF
-		<li>
-			<label>{$this->lang->words['r_safemode']}</label>
-			{$form['plugi_lockd']}
-		</li>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_safemode']}</strong></td>
+			<td class='field_field'>{$form['plugi_lockd']}</td>
+		</tr>
 EOF;
 		}
 		
 		$IPBHTML .= <<<EOF
 		{$extraForm}
-	</ul>
+	</table>
     <div class='acp-actionbar'>
-        <input type='submit' value=' {$this->lang->words['r_save']} ' class="button primary" />
+        <input type='submit' value='{$this->lang->words['r_save']}' class="button primary" />
     </div>
 </div>
 </form>
@@ -526,7 +542,6 @@ return $IPBHTML;
 /**
  * Form to add/edit a status image
  *
- * @access	public
  * @param	string		Code
  * @param	array 		Status record
  * @param	array 		Image data
@@ -557,26 +572,26 @@ $IPBHTML .= <<<EOF
 <input type='hidden' name='id' value='{$image_data['id']}' />
 <div class="acp-box">
 	<h3>{$status['title']} : {$this->lang->words['r_confimage']}</h3>
-	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['r_image']}<span class='desctext'>{$this->lang->words['r_image_info']}</span></label>
-			{$form['img_filename']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_width']}</label>
-			{$form['img_width']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_height']}</label>
-			{$form['img_height']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_points']}<span class='desctext'>{$this->lang->words['r_points_info']}</span></label>
-			{$form['img_points']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_image']}</strong></td>
+			<td class='field_field'>{$form['img_filename']}<br /><span class='desctext'>{$this->lang->words['r_image_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_width']}</strong></td>
+			<td class='field_field'>{$form['img_width']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_height']}</strong></td>
+			<td class='field_field'>{$form['img_height']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_points']}</strong></td>
+			<td class='field_field'>{$form['img_points']}<br /><span class='desctext'>{$this->lang->words['r_points_info']}</span></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-    	<input type='submit' value=' {$this->lang->words['r_save']} ' class='button primary' />
+    	<input type='submit' value='{$this->lang->words['r_save']}' class='button primary' />
 	</div>
 </div>
 </form>
@@ -589,7 +604,6 @@ return $IPBHTML;
 /**
  * Form to add/edit a status
  *
- * @access	public
  * @param	string		Code
  * @param	array 		Status data
  * @return	string		HTML
@@ -618,22 +632,22 @@ $IPBHTML .= <<<EOF
 <input type='hidden' name='id' value='{$status['status']}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['r_' . $code ]}</h3>
-	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['r_name']}<span class='desctext'>{$this->lang->words['r_name_info']}</span></label>
-			{$form['stat_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_pointsper']}<span class='desctext'>{$this->lang->words['r_pointsper_info']}</span></label>
-			{$form['stat_ppr']}
-		</li>
-		<li>
-			<label>{$this->lang->words['r_minutes']}<span class='desctext'>{$this->lang->words['r_minutes_info']}</span></label>
-			{$form['stat_pph']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_name']}</strong></td>
+			<td class='field_field'>{$form['stat_title']}<br /><span class='desctext'>{$this->lang->words['r_name_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_pointsper']}</strong></td>
+			<td class='field_field'>{$form['stat_ppr']}<br /><span class='desctext'>{$this->lang->words['r_pointsper_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['r_minutes']}</strong></td>
+			<td class='field_field'>{$form['stat_pph']}<br /><span class='desctext'>{$this->lang->words['r_minutes_info']}</span></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-    	<input type='submit' value=' {$this->lang->words['r_save']} ' class="button primary"/>
+    	<input type='submit' value='{$this->lang->words['r_save']}' class="button primary"/>
 	</div>
 </div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_security.php b/upload/admin/applications/core/skin_cp/cp_skin_security.php
index d9700c89..6568aced 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_security.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_security.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Security skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6326 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_security extends output
+class cp_skin_security
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * List administrators
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -45,7 +75,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['skin_header_admins']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='20%'>{$this->lang->words['skin_th_name']}</th>
 			<th width='15%'>{$this->lang->words['skin_th_primary_group']}</th>
@@ -62,14 +92,18 @@ if( count( $rows ) AND is_array( $rows ) )
 	foreach( $rows as $row )
 	{
 		$IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
 			<td><strong>{$row['members_display_name']}</strong><div class='desctext'>{$row['_joined']}</div></td>
 			<td>{$row['_mgroup']}</td>
 			<td>{$row['_mgroup_others']}&nbsp;</td>
 			<td><div class='desctext'>{$row['ip_address']}</div></td>
 			<td>{$row['email']}</td>
 			<td>{$row['posts']}</td>
-			<td><a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$row['member_id']}'>{$this->lang->words['skin_edit_member']}</a></td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'><a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$row['member_id']}'>{$this->lang->words['skin_edit_member']}</a></li>
+				</ul>
+			</td>
 		</tr>
 HTML;
 	}
@@ -92,55 +126,9 @@ HTML;
 return $IPBHTML;
 }
 
-/**
- * Row for list administrator
- *
- * @access	public
- * @param	array 		Member data
- * @return	string		HTML
- * @deprecated	Seems this is handled by list_admin_overview, maybe?
- */
-public function list_admin_row( $member ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<tr>
- <td class='tablerow1'>
-	<strong>{$member['members_display_name']}</strong>
-	<div class='desctext'>{$member['_joined']}</div>
- </td>
- <td class='tablerow1'>
-	{$member['_mgroup']}
- </td>
- <td class='tablerow2'>
-	{$member['_mgroup_others']}&nbsp;
- </td>
- <td class='tablerow1'>
-	<div class='desctext'>{$member['ip_address']}</div>
- </td>
- <td class='tablerow2'>
-	{$member['email']}
- </td>
- <td class='tablerow2'>
-	{$member['posts']}
- </td>
- <td class='tablerow1'>
-	<a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}'>{$this->lang->words['skin_edit_member']}</a>
- </td>
-</tr>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
 /**
  * Wrapper to show files checked for anti-virus
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -151,12 +139,11 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <br />
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['skin_header_virus']}</div>
- <table cellpadding='0' cellspacing='0' width='100%'>
-	$content
+<div class='acp-box'>
+ <h3>{$this->lang->words['skin_header_virus']}</h3>
+ <table class='ipsTable'>
+	{$content}
  </table>
- <div align='center' class='tablefooter'>&nbsp;</div>
 </div>
 EOF;
 
@@ -167,7 +154,6 @@ return $IPBHTML;
 /**
  * Anti-virus checked file row
  *
- * @access	public
  * @param	string		Path to file
  * @return	string		HTML
  */
@@ -178,7 +164,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <tr>
- <td class='tablerow1'>
+ <td>
 	<img src='{$this->settings['skin_acp_url']}/images/folder_components/security/checked_folder.png' alt='-' />
 	{$file_path}
  </td>
@@ -194,7 +180,6 @@ return $IPBHTML;
 /**
  * Wrapper for bad files from AV checker
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -204,17 +189,12 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['skin_suspicious_files']}</div>
- <div class='tablesubheader' style='padding-right:0px'>
-  <div align='right' style='padding-right:10px'>
-     {$this->lang->words['skin_th_filesize']}
-    </div>
-  </div>
- <table cellpadding='0' cellspacing='0' width='100%'>
-	$content
+<div class='acp-box'>
+ <h3>{$this->lang->words['skin_suspicious_files']}</h3>
+ <table class='ipsTable'>
+    <th><span class='right'>{$this->lang->words['skin_th_filesize']}</span></th>
+	{$content}
  </table>
- <div align='center' class='tablefooter'>&nbsp;</div>
 </div>
 EOF;
 
@@ -225,7 +205,6 @@ return $IPBHTML;
 /**
  * Row for bad files in AV checker
  *
- * @access	public
  * @param	string		File path
  * @param	string		File name
  * @param	array 		Data about the file
@@ -238,7 +217,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <tr>
- <td class='tablerow1'>
+ <td>
 	<div style='float:right'>
 		<div class='desctext'>({$data['human']}k) &nbsp; {$data['mtime']}</div>
 	</div>
@@ -261,7 +240,6 @@ return $IPBHTML;
 /**
  * Wrapper for files from deep scan
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -272,7 +250,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=deep_scan' method='POST'>
-<div style='padding-bottom:10px'>{$this->lang->words['sec_show']}: 
+<div class='information-box'>{$this->lang->words['sec_show']}: 
 	<select name='filter'>
 	    <option value='all'>{$this->lang->words['sec_show_all']}</option>
 		<option value='score-5'>{$this->lang->words['sec_score_5_or_more']}</option>
@@ -283,20 +261,18 @@ $IPBHTML .= <<<EOF
 		<option value='large'>{$this->lang->words['sec_files_55k_or_larger']}</option>
 		<option value='recent'>{$this->lang->words['sec_modified_in_the_past_30_days']}</option>
 	</select>
-	<input type='submit' value=' Фильтровать ' />
+	<input type='submit' value='{$this->lang->words['sec_filter']}' class='button primary' />
 </div>
 </form>
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['sec_executable_files']}</div>
- <div class='tablesubheader' style='padding-right:0px'>
-  <div align='right' style='padding-right:10px'>
-     {$this->lang->words['sec_file_size']} &nbsp; {$this->lang->words['sec_last_modified']}
-    </div>
-  </div>
- <table cellpadding='0' cellspacing='0' width='100%'>
+<br />
+
+<div class='acp-box'>
+ <h3>{$this->lang->words['sec_executable_files']}</h3>
+
+ <table class='ipsTable'>
+     <th><span class='right'>{$this->lang->words['sec_file_size']} &nbsp; {$this->lang->words['sec_last_modified']}</span></th>
 	$content
  </table>
- <div align='center' class='tablefooter'>&nbsp;</div>
 </div>
 EOF;
 
@@ -307,7 +283,6 @@ return $IPBHTML;
 /**
  * Show the row for the bad file from deep scan
  *
- * @access	public
  * @param	string		File path
  * @param	string		File name
  * @param	array 		Data about the bad file record
@@ -320,7 +295,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <tr>
- <td class='tablerow1'>
+ <td>
 	<div style='float:right'>
 		<div class='desctext'>({$data['human']}k) &nbsp; {$data['mtime']}</div>
 	</div>
@@ -343,7 +318,6 @@ return $IPBHTML;
 /**
  * Security tools overview page
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -364,7 +338,7 @@ $IPBHTML .= <<<EOF
 <br />
 <div class='acp-box'>
 	<h3>{$this->lang->words['h3_title_security']}</h3>
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable'>
 		{$content['bad']}
 		{$content['ok']}
 		{$content['good']}
@@ -380,7 +354,6 @@ return $IPBHTML;
 /**
  * "Bad" security item
  *
- * @access	public
  * @param	string		Title
  * @param	string		Description
  * @param	string		Button text
@@ -396,14 +369,14 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <tr>
 	<td style='width: 3%'>
-		<img src='{$this->settings['skin_acp_url']}/_newimages/icons/exclamation.png' alt='{$this->lang->words['sec_information']}' />
+		<img src='{$this->settings['skin_acp_url']}/images/icons/exclamation.png' alt='{$this->lang->words['sec_information']}' />
 	</td>
 	<td style='width: 77%'>
 		<strong>{$title}</strong><br />
 		<span class='desctext'>{$desc}</span>
 	</td>
 	<td style='width: 20%'>
-		<a href='{$this->settings['base_url']}&amp;$url' class='realbutton'>$button</a>
+		<a href='{$this->settings['base_url']}{$url}' class='realbutton'>{$button}</a>
 	</td>
 </tr>
 
@@ -416,7 +389,6 @@ return $IPBHTML;
 /**
  * "Good" security item
  *
- * @access	public
  * @param	string		Title
  * @param	string		Description
  * @param	string		Button text
@@ -432,14 +404,14 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <tr>
 	<td style='width: 3%'>
-		<img src='{$this->settings['skin_acp_url']}/_newimages/icons/accept.png' alt='{$this->lang->words['sec_information']}' />
+		<img src='{$this->settings['skin_acp_url']}/images/icons/accept.png' alt='{$this->lang->words['sec_information']}' />
 	</td>
 	<td style='width: 77%'>
 		<strong>{$title}</strong><br />
 		<span class='desctext'>{$desc}</span>
 	</td>
 	<td style='width: 20%'>
-		<a href='{$this->settings['base_url']}&amp;$url' class='realbutton'>$button</a>
+		<a href='{$this->settings['base_url']}{$url}' class='realbutton'>{$button}</a>
 	</td>
 </tr>
 
@@ -452,7 +424,6 @@ return $IPBHTML;
 /**
  * "Ok" security item
  *
- * @access	public
  * @param	string		Title
  * @param	string		Description
  * @param	string		Button text
@@ -468,14 +439,14 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <tr>
 	<td style='width: 3%'>
-		<img src='{$this->settings['skin_acp_url']}/_newimages/icons/warning.png' alt='{$this->lang->words['sec_information']}' />
+		<img src='{$this->settings['skin_acp_url']}/images/icons/warning.png' alt='{$this->lang->words['sec_information']}' />
 	</td>
 	<td style='width: 77%'>
 		<strong>{$title}</strong><br />
 		<span class='desctext'>{$desc}</span>
 	</td>
 	<td style='width: 20%'>
-		<a href='{$this->settings['base_url']}&amp;$url' class='realbutton'>$button</a>
+		<a href='{$this->settings['base_url']}{$url}' class='realbutton'>{$button}</a>
 	</td>
 </tr>
 
@@ -488,7 +459,6 @@ return $IPBHTML;
 /**
  * Form to add the htaccess file
  *
- * @access	public
  * @return	string		HTML
  */
 public function htaccess_form() {
@@ -526,7 +496,7 @@ $IPBHTML .= <<<EOF
 					<input type='password' name='pass' size='40' value='{$_POST['pass']}' />
 				</fieldset>
 				<br />
-				<input type='submit' value=' {$this->lang->words['sec_proceed']} ' />
+				<input type='submit' value='{$this->lang->words['sec_proceed']}' />
 			 </p>
 		</td>
 	</tr>
@@ -542,7 +512,6 @@ return $IPBHTML;
 /**
  * Show details to manually set htaccess file
  *
- * @access	public
  * @param	string		.htaccess password
  * @param	string		.htaccess auth
  * @return	string		HTML
@@ -590,7 +559,6 @@ return $IPBHTML;
 /**
  * Rename admin directory details
  *
- * @access	public
  * @return	string		HTML
  */
 public function rename_admin_dir() {
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_settings.php b/upload/admin/applications/core/skin_cp/cp_skin_settings.php
new file mode 100644
index 00000000..bd49cae3
--- /dev/null
+++ b/upload/admin/applications/core/skin_cp/cp_skin_settings.php
@@ -0,0 +1,638 @@
+<?php
+/**
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * ACP settings skin file
+ * Last Updated: $Date: 2011-09-28 15:36:03 -0400 (Wed, 28 Sep 2011) $
+ *
+ * @author 		$Author: rtissier $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @since		Friday 19th May 2006 17:33
+ * @version		$Revision: 9562 $
+ */
+ 
+class cp_skin_settings
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
+
+/**
+ * Setting titles wrapper
+ *
+ * @param	array 		Setting groups
+ * @param	string		Application tab to start on
+ * @return	string		HTML
+ */
+public function settings_titles_wrapper($settings, $start_app='') {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$_default_tab = !empty( $this->request['_dtab'] ) ? $this->request['_dtab'] : 'System';
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['tol_settings']}</h2>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=settinggroup_new'><img src='{$this->settings['skin_acp_url']}/images/icons/table_add.png' alt='' /> {$this->lang->words['tol_add_new_setting_group']}</a>
+			</li>
+			<!--<li class='ipsActionButton'>
+				<a href='#'><img src='{$this->settings['skin_acp_url']}/images/icons/import.png' alt='' /> {$this->lang->words['tol_import_xml_settings']}</a>
+			</li>-->
+			<li class='ipsActionButton inDev'><a href='{$this->settings['base_url']}{$this->form_code}&do=settingsImportApps'><img src='{$this->settings['skin_acp_url']}/images/icons/import.png' alt='' /> Import All XML Settings</a></li>
+			<li class='ipsActionButton inDev'><a href='{$this->settings['base_url']}{$this->form_code}&do=settingsExportApps'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> Export All XML Settings</a></li>
+		</ul>
+	</div>
+</div>
+
+<div class='acp-box'>
+<h3>{$this->lang->words['tol_settings_groups']}</h3>	
+<div id='tabstrip_settings' class='ipsTabBar with_left with_right'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+	<ul>
+EOF;
+
+$tab_names = array( 'System' => 'Си�тема', 'Performance' => 'Производительно�ть', 'IPS Apps' => 'Приложени�', 'Members' => 'Пользователи', 'Advanced' => 'Дополнительно', 'Forums' => 'Форумы', 'Hooks' => 'Модификации');
+
+foreach( $settings as $tab => $group )
+{
+	$tab_name = ($tab_names[ $tab ]) ? $tab_names[ $tab ] : $tab;
+
+	if ( ipsRegistry::$request['app'] AND $tab == ipsRegistry::$request['app'] )
+	{
+		$_default_tab = $tab;
+	}
+	
+	$_tab	= IPSText::md5Clean( $tab );
+	
+$IPBHTML .= <<<EOF
+	<li id='tab_{$_tab}'>{$tab_name}</li>
+	
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+	</ul>
+</div>
+
+<div id='tabstrip_settings_content' class='ipsTabBar_content'>
+EOF;
+
+
+foreach( $settings as $tab => $app_data )
+{
+	$_tab	= IPSText::md5Clean( $tab );
+$IPBHTML .= <<<EOF
+	<div id='tab_{$_tab}_content'>
+		<table class='ipsTable double_pad'>
+		
+EOF;
+		foreach( $app_data as $r )
+		{
+			
+			if(IN_DEV)
+			{
+				$export_settings_group = "<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=MOD_export_setting&amp;conf_group={$r['conf_title_id']}' title='{$this->lang->words['export_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/export_settings_group.png' alt='' /> {$this->lang->words['export_group']}</a>
+				</li>";
+			}
+			
+			$img = is_file( IPSLib::getAppDir( $r['conf_title_app'] ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_acp_url'] . '/' . IPSLib::getAppFolder( $r['conf_title_app'] ) . '/' . $r['conf_title_app'] . '/skin_cp/appIcon.png' : "{$this->settings['skin_acp_url']}/images/applications/{$r['conf_title_app']}.png";
+			
+$IPBHTML .= <<<EOF
+		<tr class='ipsControlRow'>
+		 	<td width='3%' style='text-align: center'><img src='{$img}' alt='{$this->lang->words['tol_folder']}' /></td>
+		 	<td width='80%'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setting_view&amp;conf_group={$r['conf_title_id']}' class='larger_text'><b>{$r['conf_title_title']}</b></a>
+				<span class='desctext'>({$r['conf_title_count']} {$this->lang->words['settings_suffix']})</span>
+EOF;
+
+if( $r['conf_title_desc'] )
+{
+	$IPBHTML .= <<<EOF
+				<br /><span class='desctext'>{$r['conf_title_desc']}</span>
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+			</td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_showedit&amp;id={$r['conf_title_id']}' title='{$this->lang->words['tol_edit_settings_group']}'>{$this->lang->words['tol_edit_settings_group']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_delete&amp;id={$r['conf_title_id']}");' title='{$this->lang->words['tol_delete_settings_group']}'>{$this->lang->words['tol_delete_settings_group']}</a>
+					</li>
+					<li class='ipsControlStrip_more'>
+						<a href='#' id="menu{$r['conf_title_id']}" class='ipbmenu'>{$this->lang->words['frm_options']}</a>
+					</li>
+				</ul>	
+				<ul class='acp-menu' id='menu{$r['conf_title_id']}_menucontent' style='display: none'>
+					<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_resync&amp;id={$r['conf_title_id']}' title='{$this->lang->words['tol_recount_settings_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/rebuild_settings_group.png' alt='Icon' /> {$this->lang->words['tol_recount_settings_group']}</a></li>
+					{$export_settings_group}
+				</ul>
+			</td>
+		</tr>
+EOF;
+		}
+$IPBHTML .= <<<EOF
+		</table>
+	</div>
+	
+EOF;
+
+}
+	
+$IPBHTML .= <<<EOF
+</div>
+</div>
+
+<script type='text/javascript'>
+	jQ("#tabstrip_settings").ipsTabBar({tabWrap: "#tabstrip_settings_content", defaultTab: "tab_{$_default_tab}" });
+</script>
+
+<br />
+
+<form action='{$this->settings['base_url']}&{$this->form_code}&do=settings_do_import' enctype='multipart/form-data' method='post'>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['tol_import_xml_settings']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['tol_upload_xml_settings_file_from_']}</strong></td>
+				<td class='field_field'><input class='textinput' type='file' size='30' name='FILE_UPLOAD' /><br /><span class='desctext'>{$this->lang->words['tol_duplicate_entries_will_not_be_']}</span></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['tol_or_enter_the_filename_of_the_x']}</strong></td>
+				<td class='field_field'><input class='textinput' type='text' size='30' name='file_location' /><br /><span class='desctext'>{$this->lang->words['tol_the_file_must_be_uploaded_into']}</span></td>
+			</tr>
+		</table>
+		<div class='acp-actionbar'>
+			<input type='submit' class='button primary' value='{$this->lang->words['t_import']}' />
+		</div>
+	</div>
+</form>
+
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Form to add/edit a setting group
+ *
+ * @param	array 		Form elements
+ * @param	string		Form title
+ * @param	string		Action code
+ * @param	string		Button text
+ * @return	string		HTML
+ */
+public function settings_title_form($form, $title, $formcode, $button) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['s_title']}</h2>
+</div>
+
+<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;id={$this->request['id']}' method='post'>
+	<div class='acp-box'>
+		<h3>{$title}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group_title']}</strong>
+				</td>
+				<td class='field_field'>{$form['conf_title_title']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group_application']}</strong>
+				</td>
+				<td>{$form['conf_title_app']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group_tab']}</strong>
+				</td>
+				<td>{$form['conf_title_tab']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group_description']}</strong>
+				</td>
+				<td>{$form['conf_title_desc']}</td>
+			</tr>
+EOF;
+//startif
+if ( $form['conf_title_keyword'] != '' )
+{		
+$IPBHTML .= <<<EOF
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group_keyword']}</strong>
+				</td>
+				<td>
+					{$form['conf_title_keyword']}<br />
+					<span class='desctext'>{$this->lang->words['tol_used_to_pull_this_from_the_db_']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_hide_from_main_settings_list']}</strong>
+				</td>
+				<td>{$form['conf_title_noshow']}</td>
+			</tr>
+EOF;
+}//endif
+$IPBHTML .= <<<EOF
+		</table>
+		<div class='acp-actionbar'>
+			<input type='submit' class='button primary' value='{$button}' />
+		</div>
+	</div>
+</form>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * View settings wrapper
+ *
+ * @param	string		Page title
+ * @param	string		Content
+ * @param	string		Search button
+ * @param	string		Bounceback URL
+ * @return	string		HTML
+ */
+public function settings_view_wrapper( $title, $content, $searchbutton, $bounceback='' ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['settings_h_prefix']} {$title}</h2>
+EOF;
+
+	if ( ipsRegistry::$request['search'] == '' AND $bounceback == '' )
+	{
+		if ( $searchbutton )
+		{
+	$IPBHTML .= <<<EOF
+		<div class='ipsActionBar clearfix'>
+			<ul>
+				<li class='ipsActionButton'>
+					<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settingnew&amp;conf_group={$this->request['conf_group']}'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' />{$this->lang->words['add_setting_button']}</a>
+				</li>
+				
+			</ul>
+		</div>
+EOF;
+		}
+	}//endif
+	
+$IPBHTML .= <<<EOF
+</div>
+<form action='{$this->settings['_base_url']}app=core&amp;module=settings&amp;section=settings&amp;do=setting_update&amp;id={$this->request['conf_group']}&amp;search={$this->request['search']}' method='post'>
+	<!--HIDDEN.FIELDS-->
+	<input type='hidden' name='bounceback' value='{$bounceback}' />
+	<div class='acp-box'>
+		<h3>{$title}</h3>
+		<table class='ipsTable' id='settings_table'>
+			{$content}
+		</table>
+		<div class='acp-actionbar'>
+			<input type='submit' value='{$this->lang->words['tol_update_settings']}' class='button primary' />
+		</div>
+	</div>
+</form>
+<script type='text/javascript'>
+	jQ("#settings_table").ipsSortable( 'table', { 
+		url: "{$this->settings['base_url']}{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ),
+		serializeOptions: { key: 'settings[]' }
+	});
+</script>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Setting that starts a setting group
+ *
+ * @param	array 		Setting
+ * @return	string		HTML
+ */
+public function settings_row_start_group($r) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+	<tr class='isDraggable' id='setting_{$r['conf_id']}'>
+		<td colspan='4' style='padding:0px;'>
+			<table class='ipsTable'>
+				<tr>
+					<th colspan='4'>{$r['conf_start_group']}</th>
+				</tr>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * View a setting row
+ *
+ * @param	array 		Setting
+ * @param	string		Edit button
+ * @param	string		Delete button
+ * @param	string		Form element
+ * @param	string		Revert button
+ * @return	string		HTML
+ */
+public function settings_view_row($r, $edit, $delete, $form_element, $revert_button, $elem_type) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$_isClass	= !$r['conf_start_group'] ? "isDraggable" : '';
+
+$IPBHTML .= <<<EOF
+  		<tr class='ipsControlRow {$_isClass}' id='setting_{$r['conf_id']}'>
+  			<td class='col_drag'><div class='draghandle'>&nbsp;</div></td>
+			
+			<td class='field_title'>
+				<strong class='title'>{$r['conf_title']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form_element}<br />
+				<span class='desctext'>{$r['conf_description']}</span>
+			</td>
+				<td class='col_buttons' nowrap="true">
+EOF;
+				//startif
+				if ( $edit or $delete or $revert_button )
+				{		
+				$IPBHTML .= <<<EOF
+					
+					<ul class='ipsControlStrip'>
+						{$revert_button}
+						{$edit}
+						{$delete}
+					</ul>
+EOF;
+				}//endif
+$IPBHTML .= <<<EOF
+			</td>
+		</tr>
+EOF;
+
+if( $r['conf_start_group'] )
+{
+	$IPBHTML .= <<<EOF
+		</table>
+	</td>
+</tr>
+EOF;
+}
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Automcplete field
+ *
+ * @return	string		HTML
+ */
+public function nameAutoCompleteField( $key, $val ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+	<input type='text' id='{$key}' name='{$key}' value='{$val}' autocomplete='off' style='width:210px;' class='textinput' />
+
+	<script type="text/javascript" defer="defer">
+	document.observe("dom:loaded", function(){
+		var search = new ipb.Autocomplete( $('{$key}'), { multibox: false, url: acp.autocompleteUrl, templates: { wrap: acp.autocompleteWrap, item: acp.autocompleteItem } } );
+	});
+	</script>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Form to add/edit a setting
+ *
+ * @param	array 		Setting
+ * @param	string		Form title
+ * @param	string		Action code
+ * @param	string		Button text
+ * @return	string		HTML
+ */
+public function settings_form($form, $title, $formcode, $button) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['add_setting_button']}</h2>
+</div>
+
+<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;id={$this->request['id']}' method='post'>
+	<div class='acp-box'>
+		<h3>{$title}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_position']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_position']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_description']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_description']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_group']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_group']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_type']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_type']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_key']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_key']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_current_value']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_value']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_default_value']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_default']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_setting_extra']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_extra']}<br />
+					<span class='desctext'>{$this->lang->words['tol_use_for_creating_form_element_']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_raw_php_code_to_eval_before_sh']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_evalphp']}<br />
+					<span class='desctext'>{$this->lang->words['tol_036show_1_is_set_when_showing_']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['setting_keywords']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_keywords']}<br />
+					<span class='desctext'>{$this->lang->words['setting_keywords_desc']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_start_setting_group']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_start_group']}<br />
+					<span class='desctext'>{$this->lang->words['tol_enter_title_here_or_leave_blan']}</span>
+				</td>
+			</tr>
+EOF;
+//startif
+if ( $form['conf_protected'] != '' )
+{		
+$IPBHTML .= <<<EOF
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_make_a_default_setting_cannot_']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_protected']}
+				</td>
+			</tr>
+EOF;
+}//endif
+$IPBHTML .= <<<EOF
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_add_this_option_into_the_setti']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['conf_add_cache']}
+				</td>
+			</tr>
+		</table>
+		<div class='acp-actionbar'>
+			<input type='submit' class='button primary' value='{$button}' />
+		</div>
+	</div>
+</form>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_setup.php b/upload/admin/applications/core/skin_cp/cp_skin_setup.php
index eee67752..43d856ad 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_setup.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_setup.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Setup skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_setup extends output
+class cp_skin_setup
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Redirect screen for app setup
  *
- * @access	public
  * @param	array 		Output pieces
  * @param	array 		Error pieces
  * @param	string		Next URL to redirect to
@@ -122,7 +152,6 @@ return $IPBHTML;
 /**
  * Show the finished screen for app setup
  *
- * @access	public
  * @param	array 		Data
  * @param	string		Type of setup
  * @return	string		HTML
@@ -157,7 +186,6 @@ return $IPBHTML;
 /**
  * Show the splash start screen for app setup
  *
- * @access	public
  * @param	array 		Data
  * @param	array 		Errors
  * @param	string		Setup type
@@ -198,36 +226,36 @@ $IPBHTML .= <<<EOF
 <form action="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=sql&amp;app_directory={$data['app_directory']}&amp;type={$type}&amp;version={$data['next_version']}" method='post'>
 	<div class='acp-box'>
 		<h3>{$prefix} {$data['title']} {$this->lang->words['applications_title']}</h3>
-		<table class='form_table alternate_rows double_pad'>
+		<table class='ipsTable'>
 			<tr>
-				<td style='width: 40%'>
-					<strong>{$this->lang->words['current_version']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['current_version']}</strong>
 				</td>
-				<td style='width: 60%'>
+				<td class='field_field'>
 					{$data['current_version']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$prefix} {$this->lang->words['version_suffix']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$prefix} {$this->lang->words['version_suffix']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$data['latest_version']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['author_suffix']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['author_suffix']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$data['author']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['duplicate_tables']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['duplicate_tables']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					<select name='dupe_tables' id='dupeTables'>
 						<option value='skip'>{$this->lang->words['dup__skip']}</option>
 						<option value='drop'>{$this->lang->words['dup__drop']}</option>
@@ -240,7 +268,7 @@ EOF;
 		{
 			$IPBHTML .= <<<EOF
 				<div class='acp-actionbar'>
-					<input type='submit' value='{$this->lang->words['continue_button']}' class='realbutton' />
+					<input type='submit' value='{$this->lang->words['continue_button']}' class='button primary' />
 				</div>
 EOF;
 		}
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_spamlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_spamlogs.php
index 8fa0e53f..49cf6da4 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_spamlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_spamlogs.php
@@ -2,33 +2,64 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Error log skin file
- * Last Updated: $Date: 2010-09-30 21:47:05 -0400 (Thu, 30 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6929 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_spamlogs extends output
+class cp_skin_spamlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 public function spamServiceTest( $result )
 {
@@ -57,7 +88,6 @@ return $IPBHTML;
 /**
  * Spam log wrapper
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
@@ -68,12 +98,9 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<div class='acp-box'>
-	<h3>{$this->lang->words['spamlog_searchh3']}</h3>
-	<form action='{$this->settings['base_url']}{$this->form_code}' method='post'>
+<form action='{$this->settings['base_url']}{$this->form_code}' method='post' class='information-box'>
 	<p><label for="search_term">{$this->lang->words['spamlog_searchlabel']}</label> <input type='text' name='search_term' id='search_term' class='input_text' value='{$this->request['search_term']}' /> <input type='submit' class='input_submit' value='{$this->lang->words['spamlog_searchbutton']}' /></p>
-	</form>
-</div>
+</form>
 <br />
 <script type='text/javascript' src='{$this->settings['js_main_url']}acp.forms.js'></script>
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
@@ -81,7 +108,7 @@ $IPBHTML .= <<<HTML
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->generated_acp_hash}' />
 <div class="acp-box">
 	<h3>{$this->lang->words['slog_spamlogs']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='5%'>{$this->lang->words['slog_list_id']}</th>
 			<th width='25%'>{$this->lang->words['slog_list_date']}</th>
@@ -122,12 +149,11 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-        <div class='leftaction'>
-			{$links}
-        </div>
-        <div class='rightaction'>
+        <div class='right'>
 			<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;{$this->lang->words['erlog_removeall']}&nbsp;<input type="submit" value="{$this->lang->words['erlog_removechecked']}" class="button primary" />
         </div>
+        <div class='left'>{$links}</div>
+        <br class='clear' />
 	</div>
 </div>
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_spiderlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_spiderlogs.php
index 8f4d31f1..3eb5c4d3 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_spiderlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_spiderlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Spiderlogs skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_spiderlogs extends output
+class cp_skin_spiderlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Spider logs wrapper
  *
- * @access	public
  * @param	array 		Spider log rows
  * @return	string		HTML
  */
@@ -53,7 +83,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['slog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='20%'>{$this->lang->words['slog_botname']}</th>
 			<th width='20%'>{$this->lang->words['slog_hits']}</th>
@@ -69,7 +99,7 @@ if( count($rows) AND is_array($rows) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['_bot_name']}</td>
+			<td><span class='larger_text'>{$row['_bot_name']}</span></td>
 			<td>{$row['cnt']}</td>
 			<td>{$row['_time']}</td>
 			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;bid={$row['_bot_url']}'>{$this->lang->words['slog_view']}</a></td>
@@ -98,7 +128,12 @@ $IPBHTML .= <<<HTML
 
 	<div class="acp-box">
 		<h3>{$this->lang->words['slog_search']}</h3>
-		<p align="center">{$this->lang->words['slog_searchfor']} {$form['search_for']}{$this->lang->words['slog_searchquery']}</p>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['slog_searchfor']}</strong></td>
+				<td class='field_field'>{$form['search_for']} <br />{$this->lang->words['slog_searchquery']}</td>
+			</tr>
+		</table>
 		<div class="acp-actionbar">
 			<input value="{$this->lang->words['slog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
 		</div>
@@ -114,7 +149,6 @@ return $IPBHTML;
 /**
  * View a single spider's log entry
  *
- * @access	public
  * @param	array 		Rows
  * @param	string		Page links
  * @return	string		HTML
@@ -131,7 +165,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['slog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='25%'>{$this->lang->words['slog_botname']}</th>
 			<th width='25%'>{$this->lang->words['slog_querystring']}</th>
@@ -146,7 +180,7 @@ if( count($rows) AND is_array($rows) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['_bot_name']}</td>
+			<td><span class='larger_text'>{$row['_bot_name']}</span></td>
 			<td>{$row['_query_string']}</td>
 			<td>{$row['_time']}</td>
 			<td>{$row['ip_address']}</td>
@@ -166,7 +200,8 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-		<div class="actionleft">{$pages}</div>
+		<div class="left">{$pages}</div>
+		<br class='clear' />
 	</div>
 </div>
 <br />
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_sql.php b/upload/admin/applications/core/skin_cp/cp_skin_sql.php
index 0724d95f..af307a3b 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_sql.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_sql.php
@@ -2,39 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * SQL Toolbox skin file
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6917 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_sql extends output
+class cp_skin_sql
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Result from running an SQL tool
  *
- * @access	public
  * @param	string		Page title
  * @param	array 		Columns
  * @param	array 		Rows
@@ -48,14 +77,14 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$title}</h3>
 
-	<table class='alternate_rows real-table'>
+	<table class='ipsTable'>
 		<tr>
 HTML;
 
 foreach( $columns as $r )
 {
 $IPBHTML .= <<<HTML
-			<th width='*'>{$r}</th>
+			<th>{$r}</th>
 HTML;
 }
 
@@ -87,7 +116,6 @@ return $IPBHTML;
 /**
  * Show the header for an SQL tool result
  *
- * @access	public
  * @return	string		HTML
  */
 public function sqlToolResultHeader() {
@@ -109,7 +137,6 @@ return $IPBHTML;
 /**
  * Splash screen to create an SQL backup
  *
- * @access	public
  * @return	string		HTML
  */
 public function sqlSafeBackupSplashScreen() {
@@ -139,7 +166,6 @@ return $IPBHTML;
 /**
  * Show the form to create an SQL backup
  *
- * @access	public
  * @param	array 		Form elements
  * @return	string		HTML
  */
@@ -167,27 +193,27 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['my_simple_backup']}</h3>
 
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['my_createtable']}</label>
-				{$form['create_tbl']}
-			</li>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_createtable']}</strong></td>
+				<td class='field_field'>{$form['create_tbl']}</td>
+			</tr>
 			
-			<li>
-				<label>{$this->lang->words['my_backticks']} <span class='desctext'>{$this->lang->words['my_iferror']}</span></label>
-				<input type='checkbox' name='addticks' value='1' />
-			</li>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_backticks']}</strong></td>
+				<td class='field_field'><input type='checkbox' name='addticks' value='1' /><br /><span class='desctext'>{$this->lang->words['my_iferror']}</span></td>
+			</tr>
 			
-			<li>
-				<label>{$this->lang->words['my_skinnoness']} <span class='desctext'>{$this->lang->words['my_skinnoness_notes']}</span></label>
-				{$form['skip']}
-			</li>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_skinnoness']}</strong></td>
+				<td class='field_field'>{$form['skip']}<br /><span class='desctext'>{$this->lang->words['my_skinnoness_notes']}</span></td>
+			</tr>
 			
-			<li>
-				<label>{$this->lang->words['my_gzipcontent']} <span class='desctext'>{$this->lang->words['my_gzipnotes']}</span></label>
-				{$form['enable_gzip']}
-			</li>
-		</ul>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_gzipcontent']}</strong></td>
+				<td class='field_field'>{$form['enable_gzip']}<br /><span class='desctext'>{$this->lang->words['my_gzipnotes']}</span></td>
+			</tr>
+		</table>
 		
 		<div class="acp-actionbar"><input type='submit' value='{$this->lang->words['my_start_backup']}' class='realbutton' accesskey='s' /></div>		
 	</div>
@@ -201,7 +227,6 @@ return $IPBHTML;
 /**
  * View results from executing an SQL query
  *
- * @access	public
  * @param	array 		Queries
  * @param	array 		Headers for the queries
  * @param	array 		Rows from the queries
@@ -240,7 +265,7 @@ if( $this->form_code )
 		
 		<div class='acp-box with_bg'>
 			<h3>{$this->lang->words['my_run']}</h3>
-			<div style='text-align:center;padding:10px'><textarea name='query' cols='40' style="width:80%;height:200px;font-family:monospace;" rows='5'>{$query}</textarea></div>
+			<div style='text-align:center;padding:10px'><textarea name='query' id='raw-query' style="width:80%;height:200px;font-family:monospace;">{$query}</textarea></div>
 			<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['my_runnew']}' class='realbutton' accesskey='s' /></div>	
 		</div>
 	</form>
@@ -256,7 +281,7 @@ foreach( $queries as $index => $aQuery )
 <div class='acp-box clear'>
 	<h3>{$this->lang->words['my_results']}</h3>
 
-	<table class='alternate_rows real-table'>
+	<table class='ipsTable'>
 		<tr>
 HTML;
 
@@ -266,11 +291,11 @@ if( count($headers[ $index ]) )
 	{
 		if ( ! $this->request['notruncate'] AND in_array( $r, $truncated ) )
 		{
-			$r = '<div style="float:right"><a href="#" onclick="window.location=window.location+\'&notruncate=1\'; return false;" title=""><img src="' .  $this->settings['skin_acp_url'] . '/_newimages/icons/viewmore.png" /></a></div><div style="margin-top:1px;">' . $r . "</div>";
+			$r = '<div style="float:right"><a href="#" onclick="return goNoTruncate();" title=""><img src="' .  $this->settings['skin_acp_url'] . '/images/icons/viewmore.png" /></a></div><div style="margin-top:1px;">' . $r . "</div>";
 		}
 		
 	$IPBHTML .= <<<HTML
-			<th width='*'>{$r}</th>
+			<th>{$r}</th>
 HTML;
 	}
 }
@@ -280,7 +305,7 @@ $IPBHTML .= <<<HTML
 HTML;
 
 if( count($rows[ $index ]) )
-{ 
+{
 	foreach( $rows[ $index ] as $r )
 	{
 	$IPBHTML .= <<<HTML
@@ -317,6 +342,23 @@ $IPBHTML .= <<<HTML
 </div>
 <div style='margin-top: 2px;'>{$pages}</div>
 <br />
+<script type='text/javascript'>
+function goNoTruncate()
+{
+	var currentlocation	= window.location.toString();
+
+	if( currentlocation.match( /query=/ ) )
+	{
+		window.location	= currentlocation + '&notruncate=1';
+	}
+	else
+	{
+		window.location	= currentlocation.replace( /#$/, '' ) + '&do=runsql&query=' + escape( $('raw-query').value ) + '&notruncate=1';
+	}
+
+	return false;
+}
+</script>
 HTML;
 }
 
@@ -327,7 +369,6 @@ return $IPBHTML;
 /**
  * Show the database tables (SQL Toolbox homepage)
  *
- * @access	public
  * @param	array 		Tables
  * @return	string		HTML
  */
@@ -351,7 +392,7 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['my_tables']}</h3>
 
-		<table class='alternate_rows'>
+		<table class='ipsTable'>
 			<tr>
 				<th width='1%'>&nbsp;</th>
 				<th width='20%'>{$this->lang->words['my_table']}</th>
@@ -365,7 +406,7 @@ foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
 			<tr>
-				<td><img src="{$this->settings['skin_acp_url']}/_newimages/icons/table.png" /></td>
+				<td><img src="{$this->settings['skin_acp_url']}/images/icons/table.png" /></td>
 				<td>
 					<b><span style='font-size:12px'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=viewschematic&table={$r['table']}'>{$r['table']}</a></span></b>
 HTML;
@@ -411,12 +452,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['my_run']}</h3>
 
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['my_manadvanced']}</label>
-				<textarea name='query' cols='40' rows='5'></textarea>
-			</li>
-		</ul>		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_manadvanced']}</strong></td>
+				<td class='field_field'><textarea name='query' style="width:80%;height:150px;font-family:monospace;"></textarea></td>
+			</tr>
+		</table>		
 		
 		<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['my_run']}' class='realbutton' accesskey='s' /></div>
 	</div>
@@ -430,7 +471,6 @@ return $IPBHTML;
 /**
  * Show the table schematic (SQL Toolbox homepage)
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -450,7 +490,7 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['view_structure']}: {$table}</h3>
 
-		<table class='alternate_rows'>
+		<table class='ipsTable'>
 			<tr>
 HTML;
 
@@ -498,7 +538,7 @@ if ( is_array( $indexes ) AND count( $indexes ) )
 	<div class='acp-box'>
 		<h3>{$this->lang->words['view_indexes']}: {$table}</h3>
 
-		<table class='alternate_rows'>
+		<table class='ipsTable'>
 			<tr>
 HTML;
 
@@ -552,12 +592,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['my_run']}</h3>
 
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['my_manadvanced']}</label>
-				<textarea name='query' cols='40' rows='5'></textarea>
-			</li>
-		</ul>		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['my_manadvanced']}</strong></td>
+				<td class='field_field'><textarea name='query' style="width:80%;height:150px;font-family:monospace;"></textarea></td>
+			</tr>
+		</table>		
 		
 		<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['my_run']}' class='realbutton' accesskey='s' /></div>
 	</div>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_system.php b/upload/admin/applications/core/skin_cp/cp_skin_system.php
index a8141ded..2a690e72 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_system.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_system.php
@@ -2,38 +2,127 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * System tools skin file
- * Last Updated: $Date: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
+ * Last Updated: $Date: 2011-09-01 08:16:37 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6915 $
+ * @version		$Revision: 9439 $
  */
  
-class cp_skin_system extends output
+class cp_skin_system
 {
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
- * Prevent our main destructor being called by this class
+ * User interface content tabs
  *
- * @access	public
- * @return	void
+ * @param	array 		Tabs
+ * @param	array 		Content blocks to show
+ * @param	string		Default tab
+ * @return	string		HTML
  */
-public function __destruct()
+public function ui_content_tabs( $tabs, $contents, $default_tab='' )
 {
+$HTML = <<<EOF
+
+<a name='#tabpane'></a>
+<div class='ipsTabBar' id='tabstrip'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+	<ul>
+EOF;
+
+foreach( $tabs as $t )
+{
+$HTML .= <<<EOF
+			<li id='tab_{$t['id']}' class='{$t['class']}' {$t['js']}>
+				{$t['text']}
+			</li>
+EOF;
+
+}
+
+$HTML .= <<<EOF
+	</ul>
+</div>
+
+<div id='tabContent' class='ipsTabBar_content'>
+EOF;
+
+foreach( $contents as $c )
+{
+$HTML .= <<<EOF
+	<div id='tab_{$c['id']}_content'>
+		{$c['content']}
+	</div>
+EOF;
+}
+
+$HTML .= <<<EOF
+</div>
+
+<script type='text/javascript'>
+	jQ("#tabstrip").ipsTabBar({tabWrap: "#tabContent"});
+</script>
+
+
+EOF;
+
+return $HTML;
+
 }
 
 /**
  * View task manager logs
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -45,12 +134,12 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='acp-box'>
  <h3>{$this->lang->words['sys_task_manager_logs']}</h3>
- <table class='alternate_rows'>
- <tr>
-  <th>{$this->lang->words['sys_task_run']}</th>
-  <th>{$this->lang->words['sys_date_run']}</th>
-  <th>{$this->lang->words['sys_log_info']}</th>
- </tr>
+ <table class='ipsTable'>
+ 	<tr>
+  		<th>{$this->lang->words['sys_task_run']}</th>
+  		<th>{$this->lang->words['sys_date_run']}</th>
+  		<th>{$this->lang->words['sys_log_info']}</th>
+ 	</tr>
 HTML;
 
 foreach( $rows as $data )
@@ -76,7 +165,6 @@ return $IPBHTML;
 /**
  * Task manager logs overview
  *
- * @access	public
  * @param	array 		Last 5 log rows
  * @param	array 		Form elements
  * @return	string		HTML
@@ -89,7 +177,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['sys_last_5_run_tasks']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 		<tr>
 			<th>{$this->lang->words['sys_task_run']}</th>
 			<th>{$this->lang->words['sys_date_run']}</th>
@@ -117,16 +205,16 @@ $IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=task_log_show' method='post'>
 <div class="acp-box">
 	<h3>{$this->lang->words['sys_view_task_manager_logs']}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['sys_view_logs_for_task']}</label>
-			{$form['task_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_show_n_log_entries']}</label>
-			{$form['task_count']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_view_logs_for_task']}</strong></td>
+			<td class='field_field'>{$form['task_title']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_show_n_log_entries']}</strong></td>
+			<td class='field_field'>{$form['task_count']}</td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input class='button primary' type='submit' value='{$this->lang->words['sys_view_logs']}' />
 	</div>
@@ -138,16 +226,16 @@ $IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=task_log_delete' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sys_delete_task_manager_logs']}</h3>
-	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['sys_delete_logs_for_task']}</label>
-			{$form['task_title_delete']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_delete_logs_older_than_n_days']}</label>
-			{$form['task_prune']}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_delete_logs_for_task']}</strong></td>
+			<td class='field_field'>{$form['task_title_delete']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_delete_logs_older_than_n_days']}</strong></td>
+			<td class='field_field'>{$form['task_prune']}</td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input class='button primary' type='submit' value='{$this->lang->words['sys_delete_logs']}' />
 	</div>
@@ -162,7 +250,6 @@ return $IPBHTML;
 /**
  * Task manager last 5 row entry
  *
- * @access	public
  * @param	array 		Log data
  * @return	string		HTML
  */
@@ -186,7 +273,6 @@ return $IPBHTML;
 /**
  * Form to add/edit a task
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Button text
  * @param	string		Form action
@@ -313,70 +399,71 @@ function formatnumber(num)
 <div class="acp-box">
 	<h3>{$title}</h3>
   	
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['sys_task_title']}</label>
-			{$form['task_title']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_short_description']}</label>
-			{$form['task_description']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_application']}</label>
-			{$form['task_application']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_php_file_to_run']}<span class="desctext">{$this->lang->words['sys_this_is_the_php_file_that_is_r']}</span></label>
-			/admin/applications/{task_application}/tasks/{$form['task_file']}
-		</li>
-		<li>
-   			<label class='head'>{$this->lang->words['sys_time_options']}</label>
-		</li>
-	    <li>
-			<label>{$this->lang->words['sys_task_time_minutes']}<span class="desctext">{$this->lang->words['sys_choose_every_minute_to_run_eac']}</span></label>
-			{$form['task_minute']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_time_hours']}<span class="desctext">{$this->lang->words['sys_choose_every_hour_to_run_each_']}</span></label>
-			{$form['task_hour']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_time_week_day']}<span class="desctext">{$this->lang->words['sys_choose_every_day_to_run_each_d']}</span></label>
-			{$form['task_week_day']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_time_month_day']}<span class="desctext">{$this->lang->words['sys_choose_every_day_to_run_each_d_1']}</span></label>
-			{$form['task_month_day']}
-		</li>
-		<li>
-			<label>{$this->lang->words['taskthereforrun']}</label><em id='handy_hint'><span style='color: gray;'>{$this->lang->words['selectimeunitsabove']}</span></em>
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_enable_task_logging']}<span class="desctext">{$this->lang->words['sys_will_write_to_the_task_log_eac']}</span></label>
-			{$form['task_log']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_enable_task']}<span class="desctext">{$this->lang->words['sys_if_you_are_using_cron_you_migh']}</span></label>
-			{$form['task_enabled']}
-		</li>
-		<li>
-			<label>{$this->lang->words['sys_task_key']}<span class="desctext">{$this->lang->words['sys_this_is_used_to_call_a_task_wh']}</span></label>
-			{$form['task_key']}
-		</li>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_title']}</strong></td>
+			<td class='field_field'>{$form['task_title']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_short_description']}</strong></td>
+			<td class='field_field'>{$form['task_description']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_application']}</strong></td>
+			<td class='field_field'>{$form['task_application']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_php_file_to_run']}</strong></td>
+			<td class='field_field'>/admin/applications/{task_application}/tasks/{$form['task_file']}<br /><span class="desctext">{$this->lang->words['sys_this_is_the_php_file_that_is_r']}</span></td>
+		</tr>
+		<tr>
+			<th colspan='2'>{$this->lang->words['sys_time_options']}</th>
+		</tr>
+	    <tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_time_minutes']}</strong></td>
+			<td class='field_field'>{$form['task_minute']}<br /><span class="desctext">{$this->lang->words['sys_choose_every_minute_to_run_eac']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_time_hours']}</strong></td>
+			<td class='field_field'>{$form['task_hour']}<br /><span class="desctext">{$this->lang->words['sys_choose_every_hour_to_run_each_']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_time_week_day']}</strong></td>
+			<td class='field_field'>{$form['task_week_day']}<br /> <span class="desctext">{$this->lang->words['sys_choose_every_day_to_run_each_d']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_time_month_day']}</strong></td>
+			<td class='field_field'>{$form['task_month_day']}<br /><span class="desctext">{$this->lang->words['sys_choose_every_day_to_run_each_d_1']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['taskthereforrun']}</strong></td>
+			<td class='field_field'><em id='handy_hint'><span style='color: gray;'>{$this->lang->words['selectimeunitsabove']}</span></em></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_enable_task_logging']}</strong></td>
+			<td class='field_field'>{$form['task_log']}<br /><span class="desctext">{$this->lang->words['sys_will_write_to_the_task_log_eac']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_enable_task']}</strong></td>
+			<td class='field_field'>{$form['task_enabled']}<br /><span class="desctext">{$this->lang->words['sys_if_you_are_using_cron_you_migh']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_key']}</strong></td>
+			<td class='field_field'>{$form['task_key']}<br /><span class="desctext">{$this->lang->words['sys_this_is_used_to_call_a_task_wh']}</span></td>
+		</tr>
 HTML;
 //startif
 if ( IN_DEV )
 {		
 $IPBHTML .= <<<HTML
-		<li>
-			<label>{$this->lang->words['sys_task_safe_mode']}<span class="desctext">{$this->lang->words['sys_if_set_to_yes_this_will_not_be']}</span></label>
-			{$form['task_safemode']}
-		</li>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sys_task_safe_mode']}</strong></td>
+			<td class='field_field'>{$form['task_safemode']}<br /><span class="desctext">{$this->lang->words['sys_if_set_to_yes_this_will_not_be']}</span></td>
+		</tr>
 HTML;
 }//endif
 $IPBHTML .= <<<HTML
-	</ul>
+	</table>
 	<div class='acp-actionbar'>
 		<input type='submit' class='button primary' value='{$button}' />
 	</div>
@@ -395,7 +482,6 @@ return $IPBHTML;
 /**
  * Task manager overview
  *
- * @access	public
  * @param	array 		Tasks
  * @param	string		Current date
  * @return	string		HTML
@@ -409,47 +495,41 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['sys_system_schedular']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_task']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_export_xml'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/export.png' alt='' /> {$this->lang->words['sym_export_tasksxml']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_rebuild_xml'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/import.png' alt='' /> {$this->lang->words['sym_import_tasksxml']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_task']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_export_xml'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> {$this->lang->words['sym_export_tasksxml']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=system&amp;section=taskmanager&amp;do=task_rebuild_xml'><img src='{$this->settings['skin_acp_url']}/images/icons/import.png' alt='' /> {$this->lang->words['sym_import_tasksxml']}</a></li>
 	</ul>
 </div>
 
-<ul id='tab_taskmanager' class='tab_bar no_title'>
-
+<div class='acp-box'>
+	
+<div id='tabstrip_taskmanager' class='ipsTabBar with_left with_right'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+    <ul>
 HTML;
 
+$_default_tab = 'tab_core';
+
 foreach( ipsRegistry::$applications as $app_dir => $app_data )
 {
 	if ( ipsRegistry::$request['tab'] AND $app_dir == ipsRegistry::$request['tab'] )
 	{
-		$_default_tab = $app_dir;
+		$_default_tab = 'tab_' . $app_dir;
 	}
 	
 	if ( isset( $tasks[ $app_dir ] ) && is_array( $tasks[ $app_dir ] ) and count( $tasks[ $app_dir ] ) )
 	{
 $IPBHTML .= <<<HTML
-	<li id='tabtab-{$app_dir}' class=''>{$app_data['app_title']}</li>
-	
+	<li id='tab_{$app_dir}'>{$app_data['app_title']}</li>
 HTML;
 	}
 }
 
 $IPBHTML .= <<<HTML
-</ul>
-
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tab_taskmanager');
-ipbAcpTabStrips.doToggle($('tabtab-{$_default_tab}'));
-});
- //]]>
-</script>
-
-<div class='acp-box alternate_rows'>
-
+   </ul>
+</div>
+<div id='tabstrip_taskmanager_content' class='ipsTabBar_content'>
 HTML;
 
 foreach( ipsRegistry::$applications as $app_dir => $app_data )
@@ -457,8 +537,8 @@ foreach( ipsRegistry::$applications as $app_dir => $app_data )
 	if ( isset( $tasks[ $app_dir ] ) && is_array( $tasks[ $app_dir ] ) and count( $tasks[ $app_dir ] ) )
 	{
 $IPBHTML .= <<<HTML
-	<div id='tabpane-{$app_dir}'>
-		<table class='double_pad alternate_rows'>
+	<div id='tab_{$app_dir}_content'>
+		<table class='ipsTable'>
 		 <tr>
 		  <th>{$this->lang->words['sys_title']}</th>
 		  <th>{$this->lang->words['sys_next_run']}</th>
@@ -468,41 +548,65 @@ $IPBHTML .= <<<HTML
 		  <th width='5%'>{$this->lang->words['sys_wday']}</th>
 		  <th width='1%'>{$this->lang->words['sys_options']}</th>
 		 </tr>
-		
 HTML;
 		foreach( $tasks[ $app_dir ] as $row )
 		{
-			$row['_class'] = isset( $row['_class'] ) ? $row['_class'] : '';
-			$row['_title'] = isset( $row['_title'] ) ? $row['_title'] : '';
+			$row['_class']	= isset( $row['_class'] ) ? $row['_class'] : '';
+			$row['_title']	= isset( $row['_title'] ) ? $row['_title'] : '';
+			$row['_lock']	= $row['task_locked'] ? " class='_red'" : '';
 			
 $IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
 		 <td>
-			
 		  	<strong{$row['_class']}>{$row['task_title']}{$row['_title']}</strong>
-		
 			<div style='float: right'>
 				<a href='#' onclick="$('pop{$row['task_id']}').toggle();return false;" title='{$this->lang->words['sys_how_curl_to_use_in_a_cron']}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/tasks/task_cron.gif' alt='-' /></a>
-				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_run_now&amp;task_id={$row['task_id']}&amp;tab={$app_dir}' title='{$this->lang->words['run_task_now']}{$row['task_id']}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/tasks/{$row['_image']}'  alt='{$this->lang->words['sys_run']}' /></a>
+HTML;
+
+if( $row['task_locked'] )
+{
+	$IPBHTML .= <<<HTML
+	<img src='{$this->settings['skin_acp_url']}/images/icons/lock.png'  alt='{$this->lang->words['sys_taskislocked']}' />
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+		<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_run_now&amp;task_id={$row['task_id']}&amp;tab={$app_dir}' title='{$this->lang->words['run_task_now']}{$row['task_id']}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/tasks/{$row['_image']}'  alt='{$this->lang->words['sys_run']}' /></a>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
 			</div>
 			 <div style='color:gray'><em>{$row['task_description']}</em></div>
-			   <div align='center' style='position:absolute;width:auto;display:none;text-align:center;background:#EEE;border:2px outset #555;padding:4px' id='pop{$row['task_id']}'>
+			<div align='center' style='position:absolute;width:auto;display:none;text-align:center;background:#EEE;border:2px outset #555;padding:4px' id='pop{$row['task_id']}'>
 				curl -s -o /dev/null "{$this->settings['board_url']}/index.{$this->settings['php_ext']}?app=core&amp;module=task&amp;ck={$row['task_cronkey']}"
-			   </div>
-		
-			
+			</div>
 		 </td>
 		 <td>{$row['_next_run']}</td>
 		 <td>{$row['task_minute']}</td>
 		 <td>{$row['task_hour']}</td>
 		 <td>{$row['task_month_day']}</td>
 		 <td>{$row['task_week_day']}</td>
-		 <td>
-		 	<img class='ipbmenu' id="menu{$row['task_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['sys_options']}' />
-			<ul class='acp-menu' id='menu{$row['task_id']}_menucontent'>
-				<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_edit&amp;task_id={$row['task_id']}'>{$this->lang->words['sys_edit_task']}</a></li>
-				<li class='icon manage'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_unlock&amp;task_id={$row['task_id']}'>{$this->lang->words['sys_unlock_task']}</a></li>
-				<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=task_delete&amp;task_id={$row['task_id']}");'>{$this->lang->words['sys_delete_task']}</a></li>
+		 <td class='col_buttons'>
+            <ul class='ipsControlStrip'>
+				<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_edit&amp;task_id={$row['task_id']}' title='{$this->lang->words['sys_edit_task']}'>{$this->lang->words['sys_edit_task']}</a></li>
+HTML;
+
+	if( $row['task_locked'] )
+	{
+		$IPBHTML .= <<<HTML
+		<li class='i_unlock'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_unlock&amp;task_id={$row['task_id']}&amp;tab={$app_dir}'>{$this->lang->words['sys_unlock_task']}</a></li>
+HTML;
+	}
+	
+	$IPBHTML .= <<<HTML
+				<li class='ipsControlStrip_more ipbmenu' id='menu_{$row['task_id']}'>
+					<a href='#'>&nbsp;</a>
+				</li>
+	        </ul>
+			<ul class='acp-menu' id='menu_{$row['task_id']}_menucontent'>
+				<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=task_delete&amp;task_id={$row['task_id']}");' title='{$this->lang->words['sys_delete_task']}'>{$this->lang->words['sys_delete_task']}</a></li>
 				<li class='icon export'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=task_export&amp;task_id={$row['task_id']}'>{$this->lang->words['t_export_single']}</a></li>
 			</ul>
 		 </td>
@@ -512,13 +616,17 @@ HTML;
 $IPBHTML .= <<<HTML
 		</table>
 	</div>
-	
 HTML;
 	}
 }
-	
+
 $IPBHTML .= <<<HTML
 </div>
+</div>
+
+<script type='text/javascript'>
+	jQ("#tabstrip_taskmanager").ipsTabBar({tabWrap: "#tabstrip_taskmanager_content", defaultTab: "{$_default_tab}" });
+</script>
 <br />
 <div align='center' class='desctext'><em>{$this->lang->words['sys_all_times_gmt_gmt_time_now_is']} {$date}</em></div>
 <br />
@@ -526,12 +634,12 @@ $IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=task_import' method='post' enctype='multipart/form-data'>
 <div class="acp-box">
 	<h3>{$this->lang->words['t_import_single']}</h3>
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['upload_task_xml']}<span class='desctext'>{$this->lang->words['upload_task_dupe']}</span></label>
-			<input type='file' name='FILE_UPLOAD' />
-		</li>
-	<ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['upload_task_xml']}</strong></td>
+			<td class='field_field'><input type='file' name='FILE_UPLOAD' /><br /><span class='desctext'>{$this->lang->words['upload_task_dupe']}</span></td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['task_import_button']}' class="button primary" />
 	</div>
@@ -546,7 +654,6 @@ return $IPBHTML;
 /**
  * ACP latest logins row
  *
- * @access	public
  * @param	array 		Log records
  * @return	string		HTML
  */
@@ -555,10 +662,12 @@ public function acp_last_logins_row( $r ) {
 $IPBHTML = "";
 //--starthtml--//
 
+$image = $r['admin_success'] ? 'tick' : 'cross';
+
 $IPBHTML .= <<<HTML
 <tr>
     <td>
-    	<img src='{$this->settings['skin_acp_url']}/_newimages/icons/user.png' alt='-' />
+    	<img src='{$this->settings['skin_acp_url']}/images/icons/user.png' alt='-' />
     </td>
 	<td>
 		<strong>{$r['admin_username']}</strong>
@@ -566,7 +675,7 @@ $IPBHTML .= <<<HTML
 	</td>
     <td>{$r['_admin_time']}</td>
     <td>
-    	<img src='{$this->settings['skin_acp_url']}/images/{$r['_admin_img']}' alt='-' />
+    	<img src='{$this->settings['skin_acp_url']}/images/icons/{$image}.png' alt='' />
     </td>
     <td>
 		<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}module=system&amp;section=loginlog&amp;do=view_detail&amp;detail={$r['admin_id']}', 700, 500)" title='{$this->lang->words['sys_view_details']}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/index/view.png' alt='-' /></a>
@@ -581,7 +690,6 @@ return $IPBHTML;
 /**
  * ACP latest logins wrapper
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -593,10 +701,10 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$this->lang->words['sys_last_5_acp_log_in_attempts']}</h3>
-    <table class="alternate_rows" width='100%'>
+    <table class="ipsTable">
         <tr>
             <th width='1%'>&nbsp;</th>
-            <th width='40%'>{$this->lang->words['sys_name']}</th>
+            <th width='40%'><span class='larger_text'>{$this->lang->words['sys_name']}</th>
             <th width='49%'>{$this->lang->words['sys_date']}</th>
             <th width='5%'>{$this->lang->words['sys_status']}</th>
             <th width='5%'>{$this->lang->words['sys_log']}</th>
@@ -604,9 +712,8 @@ $IPBHTML .= <<<HTML
     	{$content}
     </table>
 	<div class='acp-actionbar'>
-    	<div class="rightaction">
-			{$links}
-        </div>
+		<div class="left">{$links}</div>
+		<br class='clear' />
 	</div>
 </div>
 </form>
@@ -619,7 +726,6 @@ return $IPBHTML;
 /**
  * Latest logins detail
  *
- * @access	public
  * @param	array 		Log data
  * @return	string		HTML
  */
@@ -628,10 +734,12 @@ public function acp_last_logins_detail( $log ) {
 $IPBHTML = "";
 //--starthtml--//
 
+$image = $log['admin_success'] ? 'tick' : 'cross';
+
 $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['logindetails']}</h3>
-	<table width='100%' class='alternate_rows'>
+	<table class='ipsTable'>
 		<tr>
 			<th colspan='2'>{$this->lang->words['logindetail_basic']}</th>
 		</tr>
@@ -649,7 +757,7 @@ $IPBHTML .= <<<HTML
 		</tr>
 		<tr>
 			<td>{$this->lang->words['logindetail_success']}</td>
-			<td><img src='{$this->settings['skin_acp_url']}/images/{$log['_admin_img']}' alt='-' /></td>
+			<td><img src='{$this->settings['skin_acp_url']}/images/icons/{$image}.png' alt='' /></td>
 		</tr>
 		<tr>
 			<th colspan='2'>{$this->lang->words['logindetail_post']}</th>
@@ -689,74 +797,9 @@ HTML;
 return $IPBHTML;
 }
 
-/**
- * System module welcome page
- *
- * @access	public
- * @param	array 		Log data
- * @param	string		ACP latest logins
- * @return	string		HTML
- * @deprecated	 Don't think this is used, mycp is used now instead
- */
-public function system_welcome_page($data, $acplogins) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class="acp-box">
-	<h3>{$this->lang->words['sys_system_overview']}</h3>
-	<table class='alternate_rows' width='100%'>
-		<tr>
-			<td>
-				<strong>{$this->lang->words['sys_php_version']}</strong>
-			</td>
-			<td>
-			<a href='#' onclick='return acp.openWindow( "{$this->settings['base_url']}module=palette&amp;section=system&amp;do=phpinfo", 800, 600 );'>{$data['phpversion']} ({$data['phpsapi']})</a>
-			</td>
-			<td>
-				<strong>{$this->lang->words['sys_sql_version']}</strong>
-			</td>
-			<td>
-				{$data['sqldriver']} {$data['sqlversion']}
-			</td>		
-		</tr>
-	</table>
-</div>
- <br />
- {$acplogins}
-HTML;
-
-if ( IN_DEV )
-{
-$IPBHTML .= <<<HTML
-<br />
-<div class='tableborder'>
- <div class='tableheader'>{$this->lang->words['sy_devexport']}</div>
- 	<div class='tablepad'>
-		<a href='{$this->settings['base_url']}&amp;module=content&amp;section=tools&amp;do=tools-email-export'>{$this->lang->words['sy_devemail']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=content&amp;section=tools&amp;do=tools-export-xml'>{$this->lang->words['sy_devtemplate']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=content&amp;section=tools&amp;do=tools-export-content-xml'>{$this->lang->words['sy_devcontent']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=content&amp;section=tools&amp;do=tools-export-masterskin'>{$this->lang->words['sy_devskin']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=system&amp;section=filetypes&amp;do=master_xml_export'>{$this->lang->words['sy_devfile']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=content&amp;section=pages&amp;do=master_xml_export'>{$this->lang->words['sy_devpages']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=system&amp;section=staff&amp;do=master_xml_export'>{$this->lang->words['sy_devgroups']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=tools&amp;section=login&amp;do=master_xml_export'>{$this->lang->words['sy_devlogin']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=system&amp;section=taskmanager&amp;do=master_xml_export'>{$this->lang->words['sy_devtasks']}</a>
-		&middot; <a href='{$this->settings['base_url']}&amp;module=system&amp;section=components&amp;do=master_xml_export'>{$this->lang->words['sy_devcomponents']}</a>
-	</div>
-</div>
-HTML;
-}
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * Online user record entry
  *
- * @access	public
  * @param	string		Name
  * @param	string		IP address
  * @param	string		Login time/date
@@ -786,7 +829,6 @@ return $IPBHTML;
 /**
  * Translation Session
  *
- * @access	public
  * @param	array 		Languages
  * @return	string		HTML
  */
@@ -795,7 +837,7 @@ public function languages_translateExt( $data, $lang )
 $HTML = <<<HTML
 <script type="text/javascript" src="{$this->settings['js_main_url']}acp.languages.js"></script>
 <div class='information-box'>
- <h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/information.png' alt='' />&nbsp; {$this->lang->words['ext_top_title']}</h4>
+ <h4><img src='{$this->settings['skin_acp_url']}/images/icons/information.png' alt='' />&nbsp; {$this->lang->words['ext_top_title']}</h4>
  {$this->lang->words['ext_top_desc']}
 </div>
 <br />
@@ -803,23 +845,23 @@ $HTML = <<<HTML
 	<h2>{$data['lang_title']}</h2>
 	<ul class='context_menu'>
 		<li class='closed'>
-			<a id='langKill' href='#'> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/cross.png' alt='' />{$this->lang->words['ext_button_finish']}</a>
+			<a id='langKill' href='#'> <img src='{$this->settings['skin_acp_url']}/images/icons/cross.png' alt='' />{$this->lang->words['ext_button_finish']}</a>
 		</li>
 		<li>
-			<a id='sel__none' href='#'> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/template.png' alt='' /> {$this->lang->words['ext_button_unselect']}</a>
+			<a id='sel__none' href='#'> <img src='{$this->settings['skin_acp_url']}/images/icons/template.png' alt='' /> {$this->lang->words['ext_button_unselect']}</a>
 		</li>
 		<li>
-			<a id='sel__all' href='#'> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/page_add.png' alt='' /> {$this->lang->words['ext_button_selectall']}</a>
+			<a id='sel__all' href='#'> <img src='{$this->settings['skin_acp_url']}/images/icons/page_add.png' alt='' /> {$this->lang->words['ext_button_selectall']}</a>
 		</li>
 		<li>
-			<a id='sel__modified' href='#'> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='' />{$this->lang->words['ext_button_smodified']}</a>
+			<a id='sel__modified' href='#'> <img src='{$this->settings['skin_acp_url']}/images/icons/pencil.png' alt='' />{$this->lang->words['ext_button_smodified']}</a>
 		</li>
 	</ul>
 </div>
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=translateImport' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['ext_title_for']} {$data['lang_title']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</th>
 			<th width='1%'>&nbsp;</th>
@@ -840,7 +882,7 @@ foreach( $data['files'] as $name => $data )
 	
 $HTML .= <<<HTML
 		<tr{$style} id='tr-$jsname'>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/template.png' alt='' /></td>
+			<td><img src='{$this->settings['skin_acp_url']}/images/icons/template.png' alt='' /></td>
 			<td><input type='checkbox' name='cb[$name]' value='1' id='cb-$jsname' class='cbox{$class}' /></td>
 			<td><div>{$name}</div>
 			<td>{$mtime}</td>
@@ -851,8 +893,8 @@ HTML;
 }
 $HTML .= <<<HTML
  	</table>
- 	<div class='acp-actionbar'>
- 		<input class='button primary right' type='submit' value=' {$this->lang->words['ext_tbl_submit']} ' />
+ 	<div class='acp-actionbar clearfix'>
+ 		<input class='button primary right' type='submit' value='{$this->lang->words['ext_tbl_submit']}' />
  	</div>
 </div>
 </form>
@@ -865,7 +907,6 @@ return $HTML;
 /**
  * List installed languages
  *
- * @access	public
  * @param	array 		Languages
  * @return	string		HTML
  */
@@ -878,7 +919,7 @@ if ( $hasTranslate )
 	
 $HTML .= <<<HTML
 <div class='information-box'>
- <h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/information.png' alt='' />&nbsp; {$this->lang->words['ext_top_title']}</h4>
+ <h4><img src='{$this->settings['skin_acp_url']}/images/icons/information.png' alt='' />&nbsp; {$this->lang->words['ext_top_title']}</h4>
  {$this->lang->words['ext_translation_detected']}
 </div>
 <br />
@@ -892,7 +933,7 @@ $HTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['language_list_page_title']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='30%' align=''>{$this->lang->words['language_list_title']}</th>
 			<th width='10%' align='center'>{$this->lang->words['language_list_local']}</th>
@@ -905,14 +946,61 @@ HTML;
 
 foreach( $rows as $r )
 {
-$HTML .= <<<HTML
-		<tr>
+	$_default = $r['default'] ? "<img src='{$this->settings['skin_acp_url']}/images/icons/tick.png' alt='{$this->lang->words['yes']}' />" : '';
+	
+	$HTML .= <<<HTML
+		<tr class='ipsControlRow'>
 			<td width='30%'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=list_word_packs&amp;id={$r['id']}'>{$r['title']}</a></td>
 			<td width='10%'>{$r['local']}</td>
 			<td width='20%'>{$r['date']}</td>
 			<td width='20%'>{$r['money']}</td>
-			<td width='10%' style='text-align: center'>{$r['default']}</td>			
-			<td width='10%' align="right">{$r['menu']}</td>
+			<td width='10%' style='text-align: center'>{$_default}</td>			
+			<td width='10%' class='col_buttons'>
+			 	<ul class='ipsControlStrip'>
+			 		<li class='i_edit'> 
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_lang_info&amp;id={$r['id']}' title='{$this->lang->words['edit']}'>{$this->lang->words['edit']}</a>
+					</li>
+			 		<li class='i_refresh'> 
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=recache_lang_pack&amp;id={$r['id']}' title='{$this->lang->words['language_list_recache']}'>{$this->lang->words['language_list_recache']}</a>
+					</li>
+HTML;
+
+$HTML .= <<<HTML
+					<li class='ipsControlStrip_more ipbmenu' id='menu_{$r['id']}'><a href='#'>&nbsp;</a></li>
+				</ul>
+				<ul class='acp-menu' id='menu_{$r['id']}_menucontent'>
+HTML;
+
+if( ( IN_DEV OR !$r['protected'] ) AND !$r['default'] )
+{
+	$HTML .= <<<HTML
+			 		<li class='icon delete'>
+						<a href='#' onclick="return acp.confirmDelete('{$this->settings['base_url']}{$this->form_code}&amp;do=remove_language&amp;id={$r['id']}');" title='{$this->lang->words['delete']}'>{$this->lang->words['delete']}</a>
+					</li>
+HTML;
+}
+
+				foreach( $r['menu'] as $_menu )
+				{
+					$cssClass	= $_menu[2] ? $_menu[2] : 'manage';
+
+					if( !$_menu[0] )
+					{
+						$HTML .= <<<HTML
+						<li class='icon {$cssClass}'><em>{$_menu[1]}</em></li>
+HTML;
+					}
+					else
+					{
+						$HTML .= <<<HTML
+						<li class='icon {$cssClass}'><a href='{$_menu[0]}'>{$_menu[1]}</a></li>
+HTML;
+					}
+				}
+
+$HTML .= <<<HTML
+				</ul>
+			</td>
  		</tr>
 HTML;
 }
@@ -920,19 +1008,62 @@ $HTML .= <<<HTML
  	</table>
 </div>
 <br />
+<form action='{$this->settings['base_url']}{$this->form_code}&amp;do=language_swap' method='post'>
+<div class='acp-box'>
+	<h3>{$this->lang->words['sys_lang_choice_swap']}</h3>
+    <table class='ipsTable double_pad'>
+        <tr>
+            <td class='field_title'><strong class='title'>{$this->lang->words['where_user_lang_choice']}</strong></td>
+            <td class='field_field'>
+            	<select name='lang_from'>
+            		<option value='def'>{$this->lang->words['def_lang_sel']}</option>
+HTML;
+foreach( $rows as $r )
+{
+    $HTML .= "<option value='{$r['id']}'>{$r['title']}</option>\n";
+}
+
+$HTML .= <<<HTML
+        		</select>
+            	<br /><span class='desctext'>{$this->lang->words['where_user_lang_choice_desc']}</span>
+           	</td>
+        </tr>
+        <tr>
+            <td class='field_title'><strong class='title'>{$this->lang->words['where_touser_lang_choice']}</strong></td>
+			<td class='field_field'>
+            	<select name='lang_to'>
+            		<option value='def'>{$this->lang->words['def_lang_sel']}</option>
+HTML;
+foreach( $rows as $r )
+{
+    $HTML .= "<option value='{$r['id']}'>{$r['title']}</option>\n";
+}
+
+$HTML .= <<<HTML
+        		</select>
+				<br /><span class='desctext'>{$this->lang->words['where_touser_lang_choice_desc']}</span>
+			</td>
+        </tr>
+    </table>
+    <div class="acp-actionbar">
+        <input type='submit' class='button primary' value='{$this->lang->words['update_lang_prefs']}' />
+    </div>
+</div>
+</form>
+<br />
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=language_do_import' enctype='multipart/form-data' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sys_import_language_xml']}</h3>
-    <ul class='acp-form alternate_rows'>
-        <li>
-            <label>{$this->lang->words['sys_upload_xml_language_file_from_']}<span class='desctext'>{$this->lang->words['sys_duplicate_entries_will_not_be_']}</span></label>
-            <input class='textinput' type='file' size='30' name='FILE_UPLOAD' />
-        </li>
-        <li>
-            <label>{$this->lang->words['sys_or_enter_the_filename_of_the_x']}<span class='desctext'>{$this->lang->words['sys_the_file_must_be_uploaded_into']}</span></label>
-            <input class='textinput' type='text' size='30' name='file_location' />
-        </li>
-    </ul>
+    <table class='ipsTable'>
+        <tr>
+            <td class='field_title'><strong class='title'>{$this->lang->words['sys_upload_xml_language_file_from_']}</strong></td>
+            <td class='field_field'><input class='textinput' type='file' size='30' name='FILE_UPLOAD' /><br /><span class='desctext'>{$this->lang->words['sys_duplicate_entries_will_not_be_']}</span></td>
+        </tr>
+        <tr>
+            <td class='field_title'><strong class='title'>{$this->lang->words['sys_or_enter_the_filename_of_the_x']}</strong></td>
+            <td class='field_field'><input class='textinput' type='text' size='30' name='file_location' /><br /><span class='desctext'>{$this->lang->words['sys_the_file_must_be_uploaded_into']}</span></td>
+        </tr>
+    </table>
     <div class="acp-actionbar">
         <input type='submit' class='button primary' value='{$this->lang->words['sys_import']}' />
     </div>
@@ -947,14 +1078,19 @@ $HTML .= <<<HTML
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=language_do_indev_import' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sys_developers_language_cache_impo']}</h3>
-    <ul class='acp-form alternate_rows'>
-        <ul>
-        	<li class='acp-row-on'>
-        		<label>{$this->lang->words['sys_indev_export']}</label>
-        		<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=language_do_indev_export'>{$this->lang->words['sys_indev_export_go']}</a>
-        	</li>
-        	<li class='acp-row-off'>
-				<label>{$this->lang->words['sys_select_the_application_languag']}<span class='desctext'>{$this->lang->words['sys_this_will_examine_the_corecach']}</span></label>
+    <table class='ipsTable'>
+        <tr>
+        	<td class='field_title'>
+        		<strong class='title'>{$this->lang->words['sys_indev_export']}</strong>
+        	</td>
+        	<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}{$this->form_code}&amp;do=language_do_indev_export'>{$this->lang->words['sys_indev_export_go']}</a></td>
+        </tr>
+        <tr>
+        	<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sys_select_the_application_languag']}</strong>
+			</td>
+			
+			<td class='field_field'>
 	            <select name='apps[]' multiple='multiple' size=5>
 HTML;
 foreach( ipsRegistry::$applications as $app => $data )
@@ -963,13 +1099,14 @@ foreach( ipsRegistry::$applications as $app => $data )
 }
 
 $HTML .= <<<HTML
-        	</select>
-    	</li>
-	</ul>
+				</select><br />
+				<span class='desctext'>{$this->lang->words['sys_this_will_examine_the_corecach']}</span>
+    	</td>
+	</tr>
+	</table>
 	<div class="acp-actionbar">
     	<input type='submit' class='button primary' value='{$this->lang->words['sys_import']}' />
 	</div>
-</div>
 </form>
 HTML;
 }
@@ -980,7 +1117,6 @@ return $HTML;
 /**
  * List word packs in a language
  *
- * @access	public
  * @param	int			Language id
  * @param	array 		Word packs
  * @param	string		Page title
@@ -993,21 +1129,24 @@ $HTML = <<<HTML
 	<h2>{$this->lang->words['sym_manage_languages']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=list_word_packs&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/view.png' alt='' /> {$this->lang->words['sym_view_word_packs']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_lang_info&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='' /> {$this->lang->words['sym_edit_language_pack_information']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=add_word_entry&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_language_entry']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=list_word_packs&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/view.png' alt='' /> {$this->lang->words['sym_view_word_packs']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_lang_info&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/pencil.png' alt='' /> {$this->lang->words['sym_edit_language_pack_information']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=add_word_entry&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_language_entry']}</a></li>
 	</ul>
 </div>
 
-<form name='theForm' method='post' action='{$this->settings['base_url']}module=languages&amp;section=manage_languages' id='searchform' enctype='multipart/form-data'>
+<form class='information-box' style='margin-bottom: 10px;' name='theForm' method='post' action='{$this->settings['base_url']}module=languages&amp;section=manage_languages' id='searchform' enctype='multipart/form-data'>
 	<input type='hidden' name='do' value='edit_word_pack' />
 	<input type='hidden' name='id' value='{$this->request['id']}' />
 	<input type='hidden' name='secure_key' value='{this->registry->adminFunctions->generated_acp_hash}' />
 
 	{$this->lang->words['sym_find']}: <input type='text' name='search' value='{$this->request['search']}' class='inputtext' /> <input type='image' src='{$this->settings['skin_acp_url']}/images/search_icon.gif' value='{$this->lang->words['sym_submit']}' alt='{$this->lang->words['sym_find']}' />
 </form>	
-
-{$packs}
+	
+	<div class='acp-box'>
+		<h3>{$this->lang->words['lang_sections_title']}</h3>
+		{$packs}
+	</div>
 HTML;
 
 return $HTML;
@@ -1016,7 +1155,6 @@ return $HTML;
 /**
  * Edit a word pack
  *
- * @access	public
  * @param	int			Word pack id
  * @param	array 		Language bits
  * @param	string		Page links
@@ -1031,10 +1169,10 @@ $HTML = <<<HTML
 	<h2>{$this->lang->words['sym_manage_languages']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=list_word_packs&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/view.png' alt='' /> {$this->lang->words['sym_view_word_packs']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_lang_info&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='' /> {$this->lang->words['sym_edit_language_pack_information']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=add_word_entry&amp;id={$this->request['id']}&amp;word_pack={$this->request['word_pack']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_language_entry']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_word_pack&amp;id={$this->request['id']}&amp;word_pack={$this->request['word_pack']}&amp;filter=outofdate' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' /> {$this->lang->words['sym_word_out_of_date_check']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=list_word_packs&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/view.png' alt='' /> {$this->lang->words['sym_view_word_packs']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_lang_info&amp;id={$this->request['id']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/pencil.png' alt='' /> {$this->lang->words['sym_edit_language_pack_information']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=add_word_entry&amp;id={$this->request['id']}&amp;word_pack={$this->request['word_pack']}' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sym_add_new_language_entry']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=languages&amp;section=manage_languages&amp;do=edit_word_pack&amp;id={$this->request['id']}&amp;word_pack={$this->request['word_pack']}&amp;filter=outofdate' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['sym_word_out_of_date_check']}</a></li>
 	</ul>
 </div>
 <form name='theForm' method='post' action='{$this->settings['base_url']}{$this->form_code}' id='mainform' enctype='multipart/form-data'>
@@ -1050,7 +1188,7 @@ $HTML = <<<HTML
 	<br style='clear: both' />
 	<div class='acp-box'>		
 		<h3>{$title}</h3>
-		<table class='form_table triple_pad alternate_rows' cellpadding='0' cellspacing='0'>
+		<table class='ipsTable'>
 			<tr>
 				<th style='width: 42%'>{$this->lang->words['language_word_pack_current']}</th>
 				<th style='width: 42%'>{$this->lang->words['language_word_pack_new']}</th>
@@ -1062,15 +1200,14 @@ $tabIndex	= 1;
 
 foreach( $lang as $l )
 {
-	$css    = ( $l['custom'] ) ? 'tablerow2queued' : 'tablerow2';
-	$revert = ( $l['custom'] ) ? "<a href='{$this->settings['base_url']}{$this->form_code}&do=revert&word_id={$l['id']}&word_pack={$l['pack']}&id={$id}&st={$this->request['st']}' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_rotate_anticlockwise.png' /></a>&nbsp;" : '';
-	$edit   = IN_DEV ? "<a href='{$this->settings['base_url']}{$this->form_code}&do=edit_word_entry&&word_id={$l['id']}&word_pack={$l['pack']}&id={$id}' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' /></a>&nbsp;" : '';
+	$revert = ( $l['custom'] ) ? "<li class='i_refresh'><a href='{$this->settings['base_url']}{$this->form_code}&do=revert&word_id={$l['id']}&word_pack={$l['pack']}&id={$id}&st={$this->request['st']}' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_rotate_anticlockwise.png' /></a></li>" : '';
+	$edit   = IN_DEV ? "<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}&do=edit_word_entry&&word_id={$l['id']}&word_pack={$l['pack']}&id={$id}' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/images/icons/pencil.png' /></a></li>" : '';
 	$pack	= $this->request['search'] ? 
 				"<span class='desctext'>{$this->lang->words['l_wordpack_prefix']}<a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$l['pack']}&amp;do=edit_word_pack&amp;id={$id}'><strong>{$l['pack']}</strong></a></span>" : 
 				'';
 	
 $HTML .= <<<HTML
-			<tr class='language_editor'>
+			<tr class='language_editor ipsControlRow'>
 				<td>
 					<div class='information-box' style='width:400px; overflow:auto'>
 						<h4>{$l['key']}</h4>
@@ -1082,10 +1219,12 @@ $HTML .= <<<HTML
 					<br />
 					<textarea tabindex='{$tabIndex}' name='lang[{$l['id']}]' cols='50' id='word_{$l['id']}_new' class='new_lang' style='width:95%'>{$l['custom']}</textarea>
 				</td>
-				<td style='text-align: right'>
-					{$revert}
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
 					{$edit}
-					<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove_word_entry&amp;word_id={$l['id']}&amp;word_pack={$l['pack']}&amp;id={$id}&amp;st={$this->request['st']}");' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' /></a>
+					{$revert}
+					<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove_word_entry&amp;word_id={$l['id']}&amp;word_pack={$l['pack']}&amp;id={$id}&amp;st={$this->request['st']}");' class='dropdown-button'><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' /></a></li>
+					</ul>
 				</td>
 			</tr>
 HTML;
@@ -1096,7 +1235,7 @@ HTML;
 $HTML .= <<<HTML
 		</table>
 		<div class='acp-actionbar'>
-			<input type='submit' value=' {$this->lang->words['language_word_pack_go']} ' class='button primary' />
+			<input type='submit' value='{$this->lang->words['language_word_pack_go']}' class='button primary' />
 		</div>		
 	</div>
 	<br />
@@ -1110,7 +1249,6 @@ return $HTML;
 /**
  * Language information form
  *
- * @access	public
  * @param	string		Action code
  * @param	int			Language pack id
  * @param	string		Form title
@@ -1135,30 +1273,28 @@ $HTML = <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['language_form_title']}</label>
-				<input type='text' name='lang_title' value='{$data['lang_title']}' size='50' class='inputtext' />
-		 	</li>
-			<li>
-				<label>{$this->lang->words['language_form_locale']}</label>
-				<input type='text' name='lang_short' value='{$data['lang_short']}' size='50' class='inputtext' />
-		 	</li>
-			<li>
-				<label>{$this->lang->words['language_is_rtl']}</label>
-				{$data['lang_isrtl']}
-		 	</li>	
-			<li>
-				<label>{$this->lang->words['language_form_default']}</label>
-				{$data['lang_default']}
-		 	</li>		 		
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_form_title']}</strong></td>
+				<td class='field_field'><input type='text' name='lang_title' value='{$data['lang_title']}' size='50' class='inputtext' /></td>
+		 	</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_form_locale']}</strong></td>
+				<td class='field_field'><input type='text' name='lang_short' value='{$data['lang_short']}' size='50' class='inputtext' /></td>
+		 	</tr
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_is_rtl']}</strong></td>
+				<td class='field_field'>{$data['lang_isrtl']}</td>
+		 	</tr>	
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_form_default']}</strong></td>
+				<td class='field_field'>{$data['lang_default']}</td>
+		 	</tr>		 		
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value=' {$button} ' class='button primary' />
-			</div>
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
-	</div>	 	
+	</div>
 </form>
 HTML;
 
@@ -1168,24 +1304,22 @@ return $HTML;
 /**
  * Show the application languages list
  *
- * @access	public
  * @param	string		Application
  * @param	array 		Packs
  * @param	array 		Stats
- * @param	array 		Menus
  * @return	string		HTML
  */
-public function languageAppPackList( $app, $packs, $stats, $menus )
+public function languageAppPackList( $app, $packs, $stats )
 {
 $HTML = <<<HTML
-<div class='acp-box'>
-	<table class='alternate_rows' width='100%'>
+
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%' align=''>{$this->lang->words['language_pack_name']}</th>
-			<th width='25%' align='center'>{$this->lang->words['language_total_entries']}</th>
-			<th width='25%' align='center'>{$this->lang->words['language_customized_entries']}</th>
-			<th width='30%' align='center'>{$this->lang->words['language_out_of_date_entries']}</th>
-			<th width='10%' align='center'>&nbsp;</th>
+			<th width='20%' align='center'>{$this->lang->words['language_total_entries']}</th>
+			<th width='20%' align='center'>{$this->lang->words['language_customized_entries']}</th>
+			<th width='20%' align='center'>{$this->lang->words['language_out_of_date_entries']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 HTML;
 
@@ -1193,14 +1327,27 @@ if( count( $packs ) )
 {
 	foreach( $packs as $r )
 	{
+																				
 		$stats[$r]['custom'] = isset( $stats[$r]['custom'] ) ? $stats[$r]['custom'] : '&nbsp;';
 $HTML .= <<<HTML
-		<tr>
-			<td width='30%' valign='middle'><a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=edit_word_pack&amp;id={$this->request['id']}'>{$r}</a></td>
-			<td width='25%' valign='middle' align='center'>{$stats[$r]['total']}</td>
-			<td width='25%' valign='middle' align='center'>{$stats[$r]['custom']}</td>
-			<td width='30%' valign='middle' align='center'><a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=edit_word_pack&amp;id={$this->request['id']}&amp;filter=1'>{$stats[$r]['outofdate']}</a></td>
-			<td width='10%' align='center' valign='middle'>{$menus[$r]}</td>
+		<tr class='ipsControlRow'>
+			<td width='30%' valign='middle'><a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=edit_word_pack&amp;id={$this->request['id']}' class='larger_text'>{$r}</a></td>
+			<td width='20%' valign='middle' align='center'>{$stats[$r]['total']}</td>
+			<td width='20%' valign='middle' align='center'>{$stats[$r]['custom']}</td>
+			<td width='20%' valign='middle' align='center'><a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=edit_word_pack&amp;id={$this->request['id']}&amp;filter=1'>{$stats[$r]['outofdate']}</a></td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_add'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=add_word_entry&amp;id={$this->request['id']}&amp;word_app={$app}' title='{$this->lang->words['l_addnew']}'>{$this->lang->words['l_addnew']}</a>
+					</li>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=edit_word_pack&amp;id={$this->request['id']}' title='{$this->lang->words['edit']}'>{$this->lang->words['edit']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick="return acp.confirmDelete('{$this->settings['base_url']}{$this->form_code}&amp;word_pack={$app}/{$r}&amp;do=remove_word_pack&amp;id={$this->request['id']}&amp;word_app={$app}');" title='{$this->lang->words['l_remove_pack']}'>{$this->lang->words['l_remove_pack']}</a>
+					</li>
+				</ul>
+			</td>
  		</tr>
 HTML;
 	}
@@ -1209,13 +1356,12 @@ else
 {
 $HTML .= <<<HTML
 	<tr>
-		<td colspan='4'><i>{$this->lang->words['nolangpacksgroup']}</i></td>
+		<td colspan='4' class='no_messages'>{$this->lang->words['nolangpacksgroup']}</td>
 	</tr>
 HTML;
 }
 $HTML .= <<<HTML
  	</table>
-</div>
 HTML;
 
 return $HTML;
@@ -1224,7 +1370,6 @@ return $HTML;
 /**
  * Add/edit a word in a language pack
  *
- * @access	public
  * @param	string		Action
  * @param	int			Word id
  * @param	int			Language pack id
@@ -1246,27 +1391,27 @@ $HTML = <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li id='language_appselector'>
-				<label>{$this->lang->words['langpackaddapp']}</label>
-				<select name='word_app' class='inputtext'>{$data['word_app']}</select>
-	 		</li>
-			<li>
-				<label>{$this->lang->words['language_pack_name']}</label>
-				<input type='text' name='word_pack_db' id='word_pack_db' value='{$data['word_pack']}' size='50' class='inputtext' />
-	 		</li>
-			<li>
-				<label>{$this->lang->words['language_key']}</label>
-				<input type='text' name='word_key' value='{$data['word_key']}' size='50' class='inputtext' />
-	 		</li>
-			<li>
-				<label>{$this->lang->words['language_default']}</label>
-				<textarea name='word_default' class='inputtext' cols='50'>{$data['word_default']}</textarea>
-	 		</li>  			
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td id='language_appselector' class='field_title'><strong class='title'>{$this->lang->words['langpackaddapp']}</strong></td>
+				<td class='field_field'><select name='word_app' class='inputtext'>{$data['word_app']}</select></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_pack_name']}</strong></td>
+				<td class='field_field'><input type='text' name='word_pack_db' id='word_pack_db' value='{$data['word_pack']}' size='50' class='inputtext' /></td>
+	 		</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_key']}</strong></td>
+				<td class='field_field'><input type='text' name='word_key' value='{$data['word_key']}' size='50' class='inputtext' /></td>
+	 		</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['language_default']}</strong></td>
+				<td class='field_field'><textarea name='word_default' class='inputtext' cols='50'>{$data['word_default']}</textarea></td>
+	 		</tr>  			
+		</table>
 		
 		<div class='acp-actionbar'>
-			<input type='submit' value=' {$button} ' class='button primary' />
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
 	</div>	 	
 </form>
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_templates.php b/upload/admin/applications/core/skin_cp/cp_skin_templates.php
index ffed5738..6f462116 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_templates.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_templates.php
@@ -2,38 +2,330 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Look and feel skin file
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-10-14 09:43:08 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 7195 $
+ * @version		$Revision: 9617 $
  */
  
-class cp_skin_templates extends output
+class cp_skin_templates
 {
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
+
 
 /**
- * Prevent our main destructor being called by this class
+ * Externally edit form
  *
- * @access	public
- * @return	void
+ * @param	array		Form array
+ * @return	string		HTML
  */
-public function __destruct()
+public function externalEditOverview( $form )
 {
+$IPBHTML = "";
+//--starthtml--//
+
+$url   = str_replace( array( 'http://', 'https://' ), '', $this->settings['_original_base_url'] );
+$parts = explode( '/', $url );
+$host  = array_shift( $parts );
+$path  = ltrim( implode( '/', $parts ) . '/dav.php', '/' );
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['sk_ee_main_title']}</h2>
+	<p class='section_info'>{$this->lang->words['sk_ee_main_desc']}</p>
+</div>
+EOF;
+
+if ( stristr( @php_sapi_name(), 'fcgi' ) OR isset( $_SERVER['FCGI_ROLE'] ) )
+{
+	$IPBHTML .= <<<EOF
+	<div class='information-box'>
+		<strong>{$this->lang->words['sk_ee_webdav_fgci_title']}</strong>
+		<p>{$this->lang->words['sk_ee_webdav_fgci_desc']}</p>
+		<br />
+		<pre>
+&lt;IfModule mod_rewrite.c&gt;
+RewriteEngine on
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+&lt;/IfModule&gt;
+		</pre>
+	</div>
+	<br />
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=save' method='post' enctype='multipart/form-data'>
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_ee_title']}</h3>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_ee_enable']}</strong>
+			</td>
+			<td class='field_field'>{$form['webdav_on']}</td>
+		</tr>
+	</table>
+	<div class="acp-actionbar">
+		<input type='submit' value='{$this->lang->words['sk_submit']}' class='realbutton' />
+	</div>
+</div>
+<br />
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_ee_webdav_title']}</h3>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_ee_webdav_host']}</strong>
+			</td>
+			<td class='field_field'>{$host}</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_ee_webdav_path']}</strong>
+			</td>
+			<td class='field_field'>{$path}</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_ee_webdav_username']}</strong>
+			</td>
+			<td class='field_field'>{$this->memberData['name']}</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_ee_webdav_password']}</strong>
+			</td>
+			<td class='field_field desctext'>{$this->lang->words['sk_ee_webdav_ur_password']}</td>
+		</tr>
+	</table>
+</div>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+	
+/**
+ * Show form to add/edit skin set
+ *
+ * @param	array 		Form bits
+ * @param	string		Form title
+ * @param	string		Action code
+ * @param	string		Button text
+ * @param	array 		Skin set data
+ * @return	string		HTML
+ */
+public function skinGenerator( $form, $errors ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['skin_gen_new_vis_skin_title']}</h2>
+	<p class='section_info'>{$this->lang->words['skin_gen_new_vis_skin_desc']}</p>
+</div>
+
+<form id='skinGen' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=skinGenStepOneComplete' method='post'>
+<div class='acp-box'>
+	<h3>Basic Settings</h3>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<th colspan='2'>{$this->lang->words['sk_basics']}</th>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_settitle']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['set_name']}
+			</td>
+		</tr>
+		<tr>
+			<th colspan='2'>{$this->lang->words['sk_setauthor']}</th>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_setauthorname']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['set_author_name']}
+				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_setauthorurl']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['set_author_url']}
+				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+			</td>
+		</tr>				
+	</table>
+	<div class='acp-actionbar'>
+		<input type='submit' value='{$this->lang->words['skin_gen_next']}' class='button primary' />
+    </div>
+</div>
+</form>
+EOF;
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Skin generator Ready
+ *
+ * @param	int 		Skin set
+ * @return	string		HTML
+ */
+public function skinGeneratorReady( $skinSetId ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<div class='acp-box' id='ipsSkinMessage'>
+	<h3>{$this->lang->words['skin_gen_ready_title']}</h3>
+	<div class='pad fixed_inner'>
+		{$this->lang->words['skin_gen_ready_desc']}
+		<br />
+		<br />
+		<a href='../' class='button redbutton primary' target='_blank'>{$this->lang->words['skin_gen_ready_button_launch']}</a>
+		<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setEdit&amp;set_id={$skinSetId}' class='button'>{$this->lang->words['skin_gen_ready_button_edit']}</a>
+		<br />&nbsp;
+	</div>
+</div>
+<script type="text/javascript">
+setTimeout( function() { $('ipsSkinMessage').fade() }, 12000 );
+</script>
+<br />
+EOF;
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * New skin popup dialogue
+ *
+ * @param	array		$album		Album data
+ * @param	array		$last10		Last 10 album images
+ * @return	@e string	HTML
+ */
+public function newSkinSetPopUp( $hasActiveLicense ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<HTML
+<div class='acp-box'>
+	<h3>{$this->lang->words['skin_gen_new_title']}</h3>
+	<table class='ipsTable'>
+		<tr>
+HTML;
+
+	if ( $hasActiveLicense )
+	{
+		$IPBHTML .= <<<HTML
+			<td><img src='{$this->settings['skin_acp_url']}/images/skins/visual.png' alt='' style='width:100px;height:100px' /></td>
+			<td valign='top'>
+				<strong>{$this->lang->words['skin_gen_new_visual_title']}</strong>
+				<p class='desctext'>{$this->lang->words['skin_gen_new_visual_desc']}</p>
+				<br /><br />
+				<p><a href="{$this->settings['base_url']}{$this->form_code}&amp;do=skinGenStepOne" class="button primary">{$this->lang->words['skin_gen_next_dotdotdot']}</a></p>
+			</td>
+HTML;
+	}
+	else
+	{
+		$url  = "{$this->settings['base_url']}&amp;app=core&amp;module=tools&amp;section=licensekey";
+		$lang = sprintf( $this->lang->words['vse_disabled_why'], $url );
+		
+		$IPBHTML .= <<<HTML
+			<td><img src='{$this->settings['skin_acp_url']}/images/skins/visual.png' alt='' style='width:100px;height:100px' /></td>
+			<td valign='top'>
+				<strong>{$this->lang->words['skin_gen_new_visual_title']}</strong>
+				<div class='warning'>
+					<h4>{$this->lang->words['vse_disabled']}</h4>
+					<p>$lang</p>
+				</div>
+			</td>
+HTML;
+	}
+	
+$IPBHTML .= <<<HTML
+		</tr>
+		<tr>
+			<td><img src='{$this->settings['skin_acp_url']}/images/skins/manual.png' alt='' style='width:100px;height:100px' /></td>
+			<td valign='top'>
+				<strong>{$this->lang->words['skin_gen_manual_title']}</strong>
+				<p class='desctext'>{$this->lang->words['skin_gen_manual_desc']}</p>
+				<br /><br />
+				<p><a href="{$this->settings['base_url']}{$this->form_code}&amp;do=setAdd" class="button primary">{$this->lang->words['skin_gen_next_dotdotdot']}</a></p>
+			</td>
+		</tr>
+	</table>
+</div>
+
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
 }
 
 /**
  * Show the skin differences result
  *
- * @access	public
  * @param	string 		Differences result
  * @return	string		HTML
  */
@@ -43,11 +335,13 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<h3>{$this->lang->words['sk_temp_diff']}</h3>
-<div style='background-color: #fff; overflow: auto; padding: 10px;'>
-	{$difference}
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_temp_diff']}</h3>
+	<div class='pad fixed_inner'>
+		{$difference}
+	</div>
+	<div style='padding: 4px;'><span class='diffred'>{$this->lang->words['sk_removedhtml']}</span> &middot; <span class='diffgreen'>{$this->lang->words['sk_addedhtml']}</span></div>
 </div>
-<div style='padding: 4px;'><span class='diffred'>{$this->lang->words['sk_removedhtml']}</span> &middot; <span class='diffgreen'>{$this->lang->words['sk_addedhtml']}</span></div>
 EOF;
 
 //--endhtml--//
@@ -57,7 +351,6 @@ return $IPBHTML;
 /**
  * Easy logo changer
  *
- * @access	public
  * @param	string		Warning
  * @param	string		Current URL
  * @param	int			Current id
@@ -73,7 +366,7 @@ array_unshift( $_skin_list, array( 0, $this->lang->words['sm_skinnone'] ) );
 
 $skinList		= ipsRegistry::getClass('output')->formDropdown( "skin", $_skin_list );
 
-$urlField		= $this->registry->output->formInput( 'logo_url', ( isset($_POST['logo_url']) AND $_POST['logo_url'] ) ? htmlspecialchars( $_POST['logo_url'], ENT_QUOTES ) : $currentUrl );
+$urlField		= $this->registry->output->formInput( 'logo_url', !empty($_POST['logo_url']) ? htmlspecialchars( $_POST['logo_url'], ENT_QUOTES ) : $currentUrl );
 $uploadField	= $this->registry->output->formUpload();
 
 $IPBHTML .= <<<EOF
@@ -92,29 +385,26 @@ EOF;
 }
 
 $IPBHTML .= <<<EOF
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>
-				{$this->lang->words['sk_applywhichset']}
-				<span class="desctext">{$this->lang->words['sk_applywhichset_info']}</span>
-			</label>
-			{$skinList}
-		</li>
-		<li>
-			<label>
-				{$this->lang->words['sk_urlnewlogo']}
-				<span class="desctext">{$this->lang->words['sk_urlnewlogo_info']}</span>
-			</label>
-			{$urlField}
-		</li>
-		<li>
-			<label>
-				{$this->lang->words['sk_uploadlogo']}
-				<span class="desctext">{$this->lang->words['sk_uploadlogo_info']}</span>
-			</label>
-			{$uploadField}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_applywhichset']}</strong>
+			</td>
+			<td class='field_field'>{$skinList}<br /><span class="desctext">{$this->lang->words['sk_applywhichset_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_urlnewlogo']}</strong>
+			</td>
+			<td class='field_field'>{$urlField}<br /><span class="desctext">{$this->lang->words['sk_urlnewlogo_info']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_uploadlogo']}</strong>
+			</td>
+			<td class='field_field'>{$uploadField}<br /><span class="desctext">{$this->lang->words['sk_uploadlogo_info']}</span></td>
+		</tr>
+	</table>
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['sk_submit']}' class='realbutton' />
 	</div>
@@ -129,7 +419,6 @@ return $IPBHTML;
 /**
  * Search and replace list template groups
  *
- * @access	public
  * @param	array 		Template groups
  * @param	array 		Skin set data
  * @param	array 		Session data
@@ -150,7 +439,7 @@ $IPBHTML .= <<<EOF
 <form id='sandrForm' name='sandrForm'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sandr_search_results_for']} {$setData['set_name']}</h3>
-	<div class='alternate_rows double_pad' id='tplate_groupList'></div>
+	<table class='ipsTable' id='tplate_groupList'></table>
 EOF;
 
 if ( ! $sessionData['sandr_search_only'] )
@@ -168,38 +457,54 @@ $IPBHTML .=<<<EOF
 
 <!-- templates -->
 <div style='display:none'>
-	<div id='tplate_groupRow'>
-		<div id='groupRow_#{groupName}' class='#{classname}' style='padding:8px';>
-			<div id='groupRowCbox_#{groupName}' style='float:right;display:none'>
-				<input type='checkbox' id='cbox_group_#{groupName}' value='1' name='groups[#{groupName}]' onclick="IPB3TemplatesSandR.toggleGroupBox('#{groupName}')" />
-			</div>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/folder.png' />
-			<span style='font-weight:bold'><a href='javascript:void(0);' onclick="IPB3TemplatesSandR.toggleTemplates('#{groupName}')">#{groupName}</a></span> <span style='font-size:9px'>(#{_matches} matches)</span>
-			<div id='groupRowTemplates_#{groupName}' style='display:none'></div>
-		</div>
-	</div>
+	<table id='tplate_groupRow'>
+		<tr>
+			<td id='groupRow_#{groupName}' style='width:30%;'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/folder.png' />
+				<span style='font-weight:bold'><a href='javascript:void(0);' onclick="IPB3TemplatesSandR.toggleTemplates('#{groupName}')">#{groupName}</a></span>
+			</td>
+			<td>
+				<span style='font-size:9px'>(#{_matches} matches)</span>
+			</td>
+			<td>
+				<div id='groupRowCbox_#{groupName}' style='float:right;display:none'>
+					<input type='checkbox' id='cbox_group_#{groupName}' value='1' name='groups[#{groupName}]' onclick="IPB3TemplatesSandR.toggleGroupBox('#{groupName}')" />
+				</div>
+			</td>
+		</tr>
+		<tr id='groupRowTemplates_#{groupName}' style='display:none'>
+			<td colspan='3'>
+				<table class='ipsTable'>
+				</table>
+			</td>
+		</tr>
+	</table>
 
-	<div id='tplate_templateRow'>
-		<div id='tplate_templaterow_#{template_id}' style='padding:10px 0px 8px 8px;margin-left:20px'>
-			<div id='templateRowCbox_#{template_id}' style='float:right;display:none'>
-				<input type='checkbox' id='cbox_template_#{template_group}_#{template_id}' class='cboxGroup#{template_group}' onclick="IPB3TemplatesSandR.checkGroupBox('#{template_group}')" value='1' name='templates[#{template_id}]' />
-			</div>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/template.png' />
-			<span style='font-weight:bold'><a href='javascript:void(0);' onclick="IPB3TemplatesSandR.loadTemplateEditor('#{template_id}')">#{template_name}</a></span>
-		</div>
-	</div>
+	<table id='tplate_templateRow'>
+		<tr>
+			<td style='padding-left: 28px;' id='tplate_templaterow_#{template_id}'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/template.png' />
+				<span style='font-weight:bold'><a href='javascript:void(0);' onclick="IPB3TemplatesSandR.loadTemplateEditor('#{template_id}')">#{template_name}</a></span>
+			</td>
+			<td>
+				<div id='templateRowCbox_#{template_id}' style='float:right;display:none'>
+					<input type='checkbox' id='cbox_template_#{template_group}_#{template_id}' class='cboxGroup#{template_group}' onclick="IPB3TemplatesSandR.checkGroupBox('#{template_group}')" value='1' name='templates[#{template_id}]' />
+				</div>
+			</td>
+		</tr>
+	</table>
 
 	<div id='tplate_templateEditor'>
-		<div id='tplate_editor_#{template_id}' class='tableborder' style='padding:0px;margin:0px;width:800px'>
-			<div id='inlineFormInnerTitle' style='padding:0px'><h4>Editing "#{template_name}" in "#{template_group}"</h4></div>
-			<div id='inlineFormInnerContent' style='padding:10px'>
+		<div id='tplate_editor_#{template_id}' class='acp-box' style='padding:0px;margin:0px;width:800px'>
+			<div id='inlineFormInnerTitle' style='padding:0px'><h3>{$this->lang->words['sk_editing']} "#{template_name}" {$this->lang->words['in']} "#{template_group}"</h3></div>
+			<div id='inlineFormInnerContent' class='pad'>
 				<input type='text' id='tplate_dataBox_#{template_id}' value='#{template_data}' style='width:100%;font-size:14px' />
 				<br /><br />
 				<textarea id='tplate_editBox_#{template_id}' style='width:100%;height:400px'>#{template_content}</textarea>
 				<div style='text-align:right;padding:6px;'>
 					<input type='button' class='realbutton' value='{$this->lang->words['sk_save']}' onclick="IPB3TemplatesSandR.saveTemplateBit('#{template_id}')" />
 					&nbsp;
-					<input type='button' class='realbutton' value=' {$this->lang->words['sk_close']} ' onclick="IPB3TemplatesSandR.cancelTemplateBit('#{template_id}')" />
+					<input type='button' class='realbutton' value='{$this->lang->words['sk_close']}' onclick="IPB3TemplatesSandR.cancelTemplateBit('#{template_id}')" />
 				</div>
 			</div>
 			
@@ -227,7 +532,6 @@ return $IPBHTML;
 /**
  * Form to perform a search and replace
  *
- * @access	public
  * @param	string		Skin options list
  * @param	int			Number of bits
  * @param	int			Number to do per refresh
@@ -238,6 +542,10 @@ public function searchandreplace_form( $skinOptionList, $numberbits, $pergo ) {
 $IPBHTML = "";
 //--starthtml--//
 
+/* Removed option :
+<p><input type='checkbox' value='1' name='searchParents' /> {$this->lang->words['sk_searchininfo']}</p>
+*/
+
 $IPBHTML .= <<<EOF
 <div class='information-box'>
  {$this->lang->words['sk_searchreplaceinfo']}
@@ -247,21 +555,22 @@ $IPBHTML .= <<<EOF
 	<h3>{$this->lang->words['sk_searchandreplace']}</h3>
 	<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=start' enctype='multipart/form-data' method='POST'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<table class='alternate_rows triple_pad'>
+	<input type='hidden' value='1' name='searchParents' />
+	<table class='ipsTable double_pad'>
 	<tr>
-		<td width='30%'>{$this->lang->words['sk_selectskinset']}</td>
-		<td width='70%'>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_selectskinset']}</strong>
+		<td class='field_field'>
 			<select name='setID'>{$skinOptionList}</select>
-			<p><input type='checkbox' value='1' name='searchParents' /> {$this->lang->words['sk_searchininfo']}</p>
+			<!-- Option removed -->
 		</td>
 	</tr>
 	<tr>
-		<td width='30%'>{$this->lang->words['sk_searchfor']}</td>
-		<td width='70%'><textarea name='searchFor' id='searchFor' style='height:100px;width:100%'></textarea></td>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_searchfor']}</strong></td>
+		<td class='field_field'><textarea name='searchFor' id='searchFor' style='height:100px;width:100%'></textarea></td>
 	</tr>
 	<tr>
-		<td width='30%'>{$this->lang->words['sk_replacewith']}<p>{$this->lang->words['sk_replacewith_info']}</p></td>
-		<td width='70%'>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_replacewith']}</strong><p>{$this->lang->words['sk_replacewith_info']}</td>
+		<td class='field_field'>
 			<textarea name='replaceWith' id='replaceWith' style='height:100px;width:100%'></textarea>
 			<p><input type='checkbox' value='1' id='isRegex' name='isRegex'> {$this->lang->words['sk_regularexpression']}</p>
 		</td>
@@ -282,7 +591,6 @@ return $IPBHTML;
 /**
  * Export a skin difference result
  *
- * @access	public
  * @param	array 		Session data
  * @param	array 		Reports
  * @param	array 		Missing parts
@@ -352,7 +660,7 @@ EOF;
 				$report['change_data_content'] = str_replace( "\n", "<br>", $report['change_data_content']);
 				$report['change_data_content'] = str_replace( "&gt;&lt;", "&gt;\n&lt;" ,$report['change_data_content']);
 				$report['change_data_content'] = str_replace( "\t", "&nbsp; &nbsp; ", $report['change_data_content'] );
-				$report['change_data_content'] = preg_replace( "#(?<!(\<del|\<ins)) {1}(?!:style)#i", "&nbsp;" ,$report['change_data_content']);
+				$report['change_data_content'] = preg_replace( '#(?<!(\<del|\<ins)) {1}(?!:style)#i', "&nbsp;" ,$report['change_data_content']);
 			
 				//$prefix = ( $report['change_is_new'] ) ? $this->lang->words['mergeexportprefix'] : '';
 				//removed {$prefix} from the html below since this line above is commented (terabyte)
@@ -385,7 +693,6 @@ return $IPBHTML;
 /**
  * Overview of completed skin diff reports
  *
- * @access	public
  * @param	array 		Session data
  * @param	array 		Reports
  * @param	array 		Missing bits
@@ -405,17 +712,17 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['mergereporttitle']}</h2>
 	<ul class='context_menu'>
 		<li>
-			<a href='#' class='ipbmenu' id='mOptions'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['mergerepoptions']} <img src='{$this->settings['skin_acp_url']}/_newimages/useropts_arrow.png' /></a>
+			<a href='#' class='ipbmenu' id='mOptions'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['mergerepoptions']} <img src='{$this->settings['skin_acp_url']}/images/useropts_arrow.png' /></a>
 		</li>		
 	</ul>
 </div>
 
 <ul class='ipbmenu_content' id='mOptions_menucontent' style='display: none'>
-	<li><input type="checkbox" class='__cbx' id='_cb_nocustom' /> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/page_white_magnify.png' /> {$this->lang->words['merge__showall']}</li>
-	<li><input type="checkbox" class='__cbx' id='_cb_merged' /> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/shape_move_front.png' /> {$this->lang->words['merge__showmerged']}</li>
-	<li><input type="checkbox" class='__cbx' id='_cb_conflicted' /> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/exclamation.png' /> {$this->lang->words['merge__showconflict']}</li>
-	<li><input type="checkbox" class='__cbx' id='_cb_uncommitted' /> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_red.png' /> {$this->lang->words['merge__showcommit']}</li>
-	<li><input type="checkbox" class='__cbx' id='_cb_committed' /> <img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_green.png' /> {$this->lang->words['merge__showcommita']}</li>
+	<li><input type="checkbox" class='__cbx' id='_cb_nocustom' /> <img src='{$this->settings['skin_acp_url']}/images/icons/page_white_magnify.png' /> {$this->lang->words['merge__showall']}</li>
+	<li><input type="checkbox" class='__cbx' id='_cb_merged' /> <img src='{$this->settings['skin_acp_url']}/images/icons/shape_move_front.png' /> {$this->lang->words['merge__showmerged']}</li>
+	<li><input type="checkbox" class='__cbx' id='_cb_conflicted' /> <img src='{$this->settings['skin_acp_url']}/images/icons/exclamation.png' /> {$this->lang->words['merge__showconflict']}</li>
+	<li><input type="checkbox" class='__cbx' id='_cb_uncommitted' /> <img src='{$this->settings['skin_acp_url']}/images/icons/bullet_red.png' /> {$this->lang->words['merge__showcommit']}</li>
+	<li><input type="checkbox" class='__cbx' id='_cb_committed' /> <img src='{$this->settings['skin_acp_url']}/images/icons/bullet_green.png' /> {$this->lang->words['merge__showcommita']}</li>
 </ul>
 <script type="text/javascript" src="{$this->settings['js_app_url']}IPB3TemplateDiffResults.js"></script>
 <script type="text/javascript">
@@ -423,9 +730,9 @@ ipb.templates['resolve_box'] = "<div class='mergeResolveBox'><ul><li class='_mrb
 </script>
 <form id='diffForm' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=multiManage&amp;merge_id={$sessionData['merge_id']}' method='post'>
 <div class='acp-box'>
-	<div style="float:right;padding-right:32px;padding-top:8px"><input type="checkbox" id="cboxall" /></div>
+	<div style="float:right;padding-right:32px;padding-top:11px"><input type="checkbox" id="cboxall" /></div>
 	<h3>{$sessionData['_title']}</h3>
-	<table class='alternate_rows pad'>
+	<table class='ipsTable double_pad'>
 
 EOF;
 
@@ -520,23 +827,27 @@ EOF;
 			}
 			
 			$IPBHTML .= <<<EOF
-				<tr class='__diffRow __rowId{$report['change_id']} __xx{$report['_is']} {$_mergeClass} {$_comClass} _xgid{$_group} {$_mainClass} {$_isMergeClass}'>
-				<td width='1%'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$_icon}' /></td>
+				<tr class='ipsControlRow __diffRow __rowId{$report['change_id']} __xx{$report['_is']} {$_mergeClass} {$_comClass} _xgid{$_group} {$_mainClass} {$_isMergeClass}'>
+				<td width='1%'><img src='{$this->settings['skin_acp_url']}/images/icons/{$_icon}' /></td>
 				 <td width='84%'>
-				   <img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$_comIcon}' /> <strong>{$report['change_data_title']}</strong>
+				   <img src='{$this->settings['skin_acp_url']}/images/icons/{$_comIcon}' /> <strong>{$report['change_data_title']}</strong>
 				   <div class='desctext' style='font-size:0.8em' id='mDesc-{$report['change_id']}'>{$_desc}</div>
 				 </td>
-				 <td width='1%' nowrap='nowrap' align='center'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$_mergeIcon}' title='{$_mergeTitle}' id='mMergeImage-{$report['change_id']}' class='__whenHasMerge{$report['change_id']}' /></td>
-				 <td width='1%' nowrap='nowrap' align='center'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$_diffIcon}' title='{$_diffTitle}' /></td>
+				 <td width='1%' nowrap='nowrap' align='center'><img src='{$this->settings['skin_acp_url']}/images/icons/{$_mergeIcon}' title='{$_mergeTitle}' id='mMergeImage-{$report['change_id']}' class='__whenHasMerge{$report['change_id']}' /></td>
+				 <td width='1%' nowrap='nowrap' align='center'><img src='{$this->settings['skin_acp_url']}/images/icons/{$_diffIcon}' title='{$_diffTitle}' /></td>
 				 <td width='5%' nowrap='nowrap' align='center'>{$report['_size']}</td>
 				 <td width='1%' nowrap='nowrap' align='center'><input type='checkbox' value='1' class='__cBox{$report['change_id']} __xBox' name='changeIds[{$report['change_id']}]' {$_cbExtra} /></td>
-				 <td width='1%'>
-				 	<img class='ipbmenu' id="menu{$_safe}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-					<ul class='acp-menu' id='menu{$_safe}_menucontent'>
+				 <td class='col_buttons'>
+				 	<ul class='ipsControlStrip'>
+					 	<li class='i_view'><a href='javascript:void(0);' onclick="return IPB3TemplateDiffResults.viewDiff({$report['change_id']}, 'diff')">{$this->lang->words['sk_viewdiffs']} {$this->lang->words['menu__oldnew']}...</a></li>
+						<li class='ipsControlStrip_more ipbmenu' id='menu_{$report['change_id']}'>
+							<a href='#'>&nbsp;</a>
+						</li>
+					</ul>
+					<ul class='acp-menu' id='menu_{$report['change_id']}_menucontent'>
 						<li class='icon view'><a href='javascript:void(0);' onclick="return IPB3TemplateDiffResults.viewVersion({$report['change_id']}, 'orig')">{$this->lang->words['menu__vieworigdef']} ({$sessionData['_oldHumanVersion']})...</a></li>
 						<li class='icon view'><a href='javascript:void(0);' onclick="return IPB3TemplateDiffResults.viewVersion({$report['change_id']}, 'custom')">{$this->lang->words['menu__viewcustomized']} ({$sessionData['_oldHumanVersion']})...</a></li>
 						<li class='icon view'><a href='javascript:void(0);' onclick="return IPB3TemplateDiffResults.viewVersion({$report['change_id']}, 'new')">{$this->lang->words['menu__viewnewdef']} ({$sessionData['_newHumanVersion']})...</a></li>
-						<li class='icon view'><a href='javascript:void(0);' onclick="return IPB3TemplateDiffResults.viewDiff({$report['change_id']}, 'diff')">{$this->lang->words['sk_viewdiffs']} {$this->lang->words['menu__oldnew']}...</a></li>
 EOF;
 			if ( intval( $report['_conflicts'] ) > 0 )
 			{
@@ -601,7 +912,6 @@ return $IPBHTML;
 /**
  * Show an ajax-style refresh screen for difference report
  *
- * @access	public
  * @param	string		Session ID
  * @param	int			Total skin bits
  * @param	int			Skin bits per refresh
@@ -619,7 +929,7 @@ $IPBHTML .= <<<EOF
 <script type="text/javascript" src="{$this->settings['js_app_url']}ipb3TemplateDiff.js"></script>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sk_processing']}</h3>
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable double_pad'>
 	<tr>
 		<td>
 			<div id='diffLogDraw'>
@@ -673,7 +983,6 @@ return $IPBHTML;
 /**
  * Overview screen for skin diff reports
  *
- * @access	public
  * @param	array 		Skin diff sessions
  * @return	string		HTML
  */
@@ -685,7 +994,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <div class='acp-box'>
 	<h3>{$this->lang->words['sk_skindiffreports']}</h3>
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable double_pad'>
 	<tr>
 		<th width='1%'>&nbsp;</th>
 		<th width='89%'><strong>{$this->lang->words['sk_difftitle']}</strong></th>
@@ -700,16 +1009,15 @@ if ( count( $sessions ) )
 	foreach( $sessions as $id => $data )
 	{
 		$IPBHTML .= <<<EOF
-		<tr>
-		 <td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/folder.png' /></td>
+		<tr class='ipsControlRow'>
+		 <td><img src='{$this->settings['skin_acp_url']}/images/icons/folder.png' /></td>
 		 <td><strong>{$data['_title']}</strong></td>
 		 <td nowrap='nowrap' align='center'>{$data['_date']}</td>
-		 <td width='5%'>
-		 	<img class='ipbmenu' id="menu{$data['merge_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-			<ul class='acp-menu' id='menu{$data['merge_id']}_menucontent'>
-				<li class='icon view'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=viewReport&amp;sessionID={$data['merge_id']}'>{$this->lang->words['sk_viewdiffresults']}...</a></li>
-				<!--<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=removeReport&amp;sessionID={$data['merge_id']}");'>{$this->lang->words['sk_removediffresults']}...</a></li>-->
-				<li class='icon export'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=exportReport&amp;sessionID={$data['merge_id']}'>{$this->lang->words['sk_createhtmlexport']}...</a></li>
+		 <td class='col_buttons'>
+		 	<ul class='ipsControlStrip'>
+				<li class='i_view'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=viewReport&amp;sessionID={$data['merge_id']}'>{$this->lang->words['sk_viewdiffresults']}...</a></li>
+				<!--<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=removeReport&amp;sessionID={$data['merge_id']}");'>{$this->lang->words['sk_removediffresults']}...</a></li>-->
+				<li class='i_export'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=exportReport&amp;sessionID={$data['merge_id']}'>{$this->lang->words['sk_createhtmlexport']}...</a></li>
 			</ul>
 		 </td>
 		</tr>
@@ -761,7 +1069,6 @@ return $IPBHTML;
 /**
  * Show form to add/edit a skin url mapping
  *
- * @access	public
  * @param	array 		Form bits
  * @param	string		Form title
  * @param	string		Action code
@@ -781,41 +1088,41 @@ $IPBHTML .= <<<EOF
 </div>
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;map_id={$remap['map_id']}&amp;setID={$setData['set_id']}' id='mainform' method='POST'>
 <div class='acp-box'>
-	<h3>$title</h3>
-	<table width='100%' class='form_table alternate_rows'>
+	<h3>{$title}</h3>
+	<table class='ipsTable double_pad'>
 		<tr>
 			<th colspan='2'>{$this->lang->words['sk_generalsettings']}</th>
 		</tr>
 		<tr>
-			<td style='width: 40%'>
-				<label>{$this->lang->words['sk_title']}</label><br />
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_title']}</strong></td>
+			</td>
+			<td class='field_field'>
+				{$form['map_title']}<br />
 				<span class='desctext'>{$this->lang->words['sk_title_info']}</span>
 			</td>
-			<td style='width: 60%'>
-				{$form['map_title']}
-			</td>
 		</tr>
 		<tr>
-			<td style='width: 40%'>
-				<label>{$this->lang->words['sk_type']}</label><br />
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_type']}</strong></td>
+			</td>
+			<td class='field_field'>
+				{$form['map_match_type']}<br />
 				<span class='desctext'>{$this->lang->words['sk_type_info']}</span>
 			</td>
-			<td style='width: 60%'>
-				{$form['map_match_type']}
-			</td>
 		</tr>
 		<tr>
-			<td style='width: 40%'>
-				<label>{$this->lang->words['sk_url']}</label><br />
-				<span class='desctext'>{$this->lang->words['sk_url_info']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_url']}</strong>
 			</td>
-			<td style='width: 60%'>
-				{$form['map_url']}
+			<td class='field_field'>
+				{$form['map_url']}<br />
+				<span class='desctext'>{$this->lang->words['sk_url_info']}</span>
 			</td>
 		</tr>
 	</table>
 	<div class='acp-actionbar'>
- 		<input type='submit' value=' $button ' class='button primary'/>
+ 		<input type='submit' value='{$button}' class='button primary' />
 	</div>
 </div>
 </form>
@@ -828,7 +1135,6 @@ return $IPBHTML;
 /**
  * List current URL mappings
  *
- * @access	public
  * @param	array 		Current remaps
  * @param	array 		Skin set data
  * @return	string		HTML
@@ -843,14 +1149,14 @@ $IPBHTML .= <<<EOF
 	<h2>{$this->lang->words['sk_urlremappingfor']} {$skinSetData['set_name']}</h2>
 	<ul class='context_menu'>
 		<li>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapAdd&amp;setID={$skinSetData['set_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sk_addnewurl']}</a>
+			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapAdd&amp;setID={$skinSetData['set_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sk_addnewurl']}</a>
 		</li>
 	</ul>
 </div>
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['sk_mappedurls']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 		<tr>
             <th width='5%'>&nbsp;</th>
             <th width='45%'>{$this->lang->words['sk_title']}</th>
@@ -863,15 +1169,14 @@ if ( count( $remaps ) )
 	foreach( $remaps as $data )
 	{
 $IPBHTML .= <<<EOF
-        <tr>
+        <tr class='ipsControlRow'>
             <td><img src='{$this->settings['skin_acp_url']}/images/folder_components/skinremap/remap_row.png' /></td>
             <td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapEdit&amp;map_id={$data['map_id']}&amp;setID={$skinSetData['set_id']}'><strong>{$data['map_title']}</strong></a></td>
             <td>{$data['_date']}</td>
-            <td>
-            	<img class='ipbmenu' id="menu{$data['map_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-                <ul class='acp-menu' id='menu{$data['map_id']}_menucontent'>
-                    <li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapEdit&amp;map_id={$data['map_id']}&amp;setID={$skinSetData['set_id']}'>{$this->lang->words['sk_editmapping']}...</a></li>
-                    <li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapRemove&amp;map_id={$data['map_id']}&amp;setID={$skinSetData['set_id']}");'>{$this->lang->words['sk_removemapping']}...</a></li>
+            <td class='col_buttons'>
+                <ul class='ipsControlStrip'>
+                    <li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapEdit&amp;map_id={$data['map_id']}&amp;setID={$skinSetData['set_id']}' title="{$this->lang->words['sk_editmapping']}...">{$this->lang->words['sk_editmapping']}...</a></li>
+                    <li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remapRemove&amp;map_id={$data['map_id']}&amp;setID={$skinSetData['set_id']}");' title="{$this->lang->words['sk_removemapping']}...">{$this->lang->words['sk_removemapping']}...</a></li>
                 </ul>
             </td>
         </tr>
@@ -899,7 +1204,6 @@ return $IPBHTML;
 /**
  * User agent skin mappings
  *
- * @access	public
  * @param	array 		User agent configs
  * @param	array		User agent groups
  * @param	array 		Skin set data
@@ -920,7 +1224,7 @@ $IPBHTML .= <<<EOF
 <form id='uAgentsForm' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=saveAgents&amp;setID={$setData['set_id']}' method='post'>
 	<div class='acp-box'>
 		<h3>{$this->lang->words['sk_uagentmappingfor']} {$setData['set_name']}</h3>
-		<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad'>
+		<table class='ipsTable double_pad'>
 			<tr>
 				<th colspan='4'>{$this->lang->words['sk_groups']}</th>
 			</tr>
@@ -951,8 +1255,8 @@ EOF;
 			<tr>
 				<td style='width: 2%; text-align: center'><input type='checkbox' name='uAgents[{$data['uagent_id']}]' value='1' {$_selected} /></td>
 				<td style='width: 2%; text-align: center'><img src="{$this->settings['skin_acp_url']}/images/folder_components/uagents/type_{$data['uagent_type']}.png" /></td>
-				<td style='width: 56%;'><strong>{$data['uagent_name']}</strong></td>
-				<td style='width: 40%'>{$this->lang->words['sk_versions']}: <input type='text' name='uAgentVersion[{$data['uagent_id']}]' value='{$setData['_userAgents']['uagents'][ $data['uagent_key'] ]}' /></td>
+				<td style='width: 56%;'><strong class='title'>{$data['uagent_name']}</strong></td>
+				<td style='width: 40%'><strong class='title'>{$this->lang->words['sk_versions']}:</strong> <input type='text' name='uAgentVersion[{$data['uagent_id']}]' value='{$setData['_userAgents']['uagents'][ $data['uagent_key'] ]}' /></td>
 			</tr>
 EOF;
 	}
@@ -972,7 +1276,6 @@ return $IPBHTML;
 /**
  * Show form to add/edit skin set
  *
- * @access	public
  * @param	array 		Form bits
  * @param	string		Form title
  * @param	string		Action code
@@ -989,27 +1292,46 @@ $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>$title</h2>
 </div>
+EOF;
 
+if ( $skinSet['set_by_skin_gen'] )
+{
+	$IPBHTML .= <<<EOF
+<div class='acp-box'>
+	<h3>{$this->lang->words['skin_gen_convert_title']}</h3>
+	<div class='pad fixed_inner'>
+		{$this->lang->words['skin_gen_convert_desc']}
+		<br />
+		<br />
+		<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=convertVisEditToFull&amp;set_id={$skinSet['set_id']}' class='button redbutton primary'>{$this->lang->words['skin_gen_convert_go']}</a>
+		<br />&nbsp;
+	</div>
+</div>
+<br />
+EOF;
+}
+
+$IPBHTML .= <<<EOF
 <form id='uAgentsForm' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;set_id={$skinSet['set_id']}' method='post'>
 <div class='acp-box'>
 	<h3>$title</h3>
-	<table class='form_table double_pad alternate_rows'>
+	<table class='ipsTable double_pad'>
 		<tr>
 			<th colspan='2'>{$this->lang->words['sk_basics']}</th>
 		</tr>
 		<tr>
-			<td style='width: 40%'>
-				<label>{$this->lang->words['sk_settitle']}</label>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_settitle']}</strong>
 			</td>
-			<td style='width: 60%'>
+			<td class='field_field'>
 				{$form['set_name']}
 			</td>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_setoutputformat']}</label>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_setoutputformat']}</strong>
 			</td>
-			<td>
+			<td class='field_field'>
 				{$form['set_output_format']}
 			</td>
 		</tr>
@@ -1017,144 +1339,130 @@ $IPBHTML .= <<<EOF
 			<th colspan='2'>{$this->lang->words['sk_setperms']}</th>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_selectallgroups']}</label>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_selectallgroups']}</strong>
 			</td>
-			<td>
+			<td class='field_field'>
 				<input type='checkbox' onclick="checkPermTickBox()" id='setPermissionsAll' name='set_permissions_all' value='1' {$form['set_permissions_all']} />
 			</td>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_selectwhichgroups']}</label>
-				<br /><span class='desctext'>{$this->lang->words['sk_selectmorethanone']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_selectwhichgroups']}</strong>
 			</td>
-			<td>
-				{$form['set_permissions']}
+			<td class='field_field'>
+				{$form['set_permissions']} <br /><span class='desctext'>{$this->lang->words['sk_selectmorethanone']}</span>
 			</td>
 		</tr>
 EOF;
-		if ( $skinSet['set_default'] )
+		if ( $skinSet['set_is_default'] )
 		{
 			$IPBHTML .= <<<EOF
 	        <tr>
-				<td>
-					<label>{$this->lang->words['sk_setasdefault_info']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sk_setasdefault_info']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 	            	<em>{$this->lang->words['sk_defaultalready']}</em>
 				</td>
 	        </tr>
 EOF;
 		}
-		else
+		else if ( $skinSet['set_key'] != 'mobile' )
 		{
 			$IPBHTML .= <<<EOF
 	        <tr>
-				<td>
-					<label>{$this->lang->words['sk_setasdefault_info']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sk_setasdefault_info']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 	            	{$form['set_is_default']}
 				</td>
 	        </tr>
 EOF;
 		}
 	
+	$_public	= PUBLIC_DIRECTORY;
+	
 	$IPBHTML .= <<<EOF
 	
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_skinsetparent']}</label>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_skinsetparent']}</strong>
 			</td>
-			<td>
+			<td class='field_field'>
 				<select name='set_parent_id'>{$form['set_parent_id']}</select>
 			</td>
 		</tr>
+EOF;
+		if ( $skinSet['set_key'] != 'mobile' && $skinSet['set_key'] != 'default' )
+		{
+			$IPBHTML .= <<<EOF
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sk_skinsetkey']}</strong>
+				</td>
+				<td class='field_field'>
+		            {$form['set_key']}<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+				</td>
+			</tr>
+EOF;
+		}
+		$IPBHTML .= <<<EOF
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_skinsetkey']}</label>
-				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_hideskin']}</strong>
 			</td>
-			<td>
-	            {$form['set_key']}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label>{$this->lang->words['sk_hideskin']}</label>
-				<br /><span class='desctext'>{$this->lang->words['sk_hideskin_info']}</span>
-			</td>
-			<td>
+			<td class='field_field'>
 				{$form['set_hide_from_list']}
-			</td>
-		</tr>
-		<tr>
-			<th colspan='2'>{$this->lang->words['sk_cssoptions']}</th>
-		</tr>
-		<tr>
-			<td>
-				<label>{$this->lang->words['sk_cachecss']}</label>
-				<br /><span class='desctext'>{$this->lang->words['sk_cachecss_info']}</span>
-			</td>
-			<td>
-	            {$form['set_css_inline']}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label>{$this->lang->words['ss_minify']}</label>
-				<br /><span class='desctext'>{$this->lang->words['ss_minify_desc']}</span>
-			</td>
-			<td>
-	            {$form['set_minify']}
+				<br /><span class='desctext'>{$this->lang->words['sk_hideskin_info']}</span>
 			</td>
 		</tr>
 		<tr>
 			<th colspan='2'>{$this->lang->words['sk_imageoptions']}</th>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_useimgdir']}</label>
-				<br /><span class='desctext'>{$this->lang->words['sk_useimgdir_info']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_useimgdir']}</strong>
 			</td>
-			<td>
-	            public/style_images/ {$form['set_image_dir']}
+			<td class='field_field'>
+	            {$_public}/style_images/ {$form['set_image_dir']}
+				<br /><span class='desctext'>{$this->lang->words['sk_useimgdir_info']}</span>
 			</td>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_useemoset']}</label>
-				<br /><span class='desctext'>{$this->lang->words['sk_useemoset_info']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_useemoset']}</strong>
 			</td>
-			<td>
-	            public/style_emoticons/ {$form['set_emo_dir']}
+			<td class='field_field'>
+	            {$_public}/style_emoticons/ {$form['set_emo_dir']}
+				<br /><span class='desctext'>{$this->lang->words['sk_useemoset_info']}</span>
 			</td>
 		</tr>
 		<tr>
 			<th colspan='2'>{$this->lang->words['sk_setauthor']}</th>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_setauthorname']}</label>
-				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_setauthorname']}</strong>
 			</td>
-			<td>
+			<td class='field_field'>
 				{$form['set_author_name']}
+				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
 			</td>
 		</tr>
 		<tr>
-			<td>
-				<label>{$this->lang->words['sk_setauthorurl']}</label>
-				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['sk_setauthorurl']}</strong>
 			</td>
-			<td>
+			<td class='field_field'>
 				{$form['set_author_url']}
+				<br /><span class='desctext'>*{$this->lang->words['sk_optional']}</span>
 			</td>
 		</tr>				
 	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' $button ' class='button primary' />
+		<input type='submit' value='{$button}' class='button primary' />
     </div>
 </div>
 </form>
@@ -1201,7 +1509,6 @@ return $IPBHTML;
 /**
  * Skin tools splash page
  *
- * @access	public
  * @param	string		Skin options dropdown
  * @param	array 		App data
  * @param	array 		IN_DEV remap data
@@ -1213,50 +1520,54 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
+<style type='text/css'>
+	.override_title { text-align: left !important; }
+		.override_title .title { display: inline !important; font-size: 14px; font-weight: bold; }
+	
+	.tools_list { margin: 5px 0 0 15px; line-height: 1.5; }
+</style>
 <div class='section_title'>
 	<h2>{$this->lang->words['to_templatetools']}</h2>
 </div>
 
 <div class='acp-box'>
-	<h3>{$this->lang->words['sk_skintools']}</h3>
+	<h3>{$this->lang->words['sk_recacheskinsets']}</h3>
 	<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=toolsRecache' enctype='multipart/form-data' method='POST'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable double_pad'>
 	<tr>
-		<th colspan='2'>{$this->lang->words['sk_recacheskinsets']}</th>
-	</tr>
-	<tr>
-		<td width='30%'>{$this->lang->words['sk_selectskinset']}</td>
-		<td width='70%'><select name='setID'><option value='0'>&lt; {$this->lang->words['sk_allskinsets']}&gt;</option>{$skinOptionList}</select></td>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_selectskinset']}</strong></td>
+		<td class='field_field'><select name='setID'><option value='0'>&lt; {$this->lang->words['sk_allskinsets']}&gt;</option>{$skinOptionList}</select></td>
 	</tr>
 	</table>
 	 <div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['sk_recacheskinsets']}' class='button primary' />
+		<input type='submit' value='{$this->lang->words['sk_recacheskinsets']}' class='button primary' />
 	 </div>
 	</form>
+</div>
+<br />
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_resetskinusage']}</h3>
 	<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=toolsResetSkin' enctype='multipart/form-data' method='POST'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable double_pad'>
 	<tr>
-		<th colspan='2'>{$this->lang->words['sk_resetskinusage']}</th>
-	</tr>
-	<tr>
-		<td width='30%' valign='top'>
-			<strong>{$this->lang->words['reset_for']}</strong>
-			<p>
-				<p><input type='checkbox' value='1' name='resetMembers' /> {$this->lang->words['sk_members']}</p>
-				<p><input type='checkbox' value='1' name='resetForums' /> {$this->lang->words['sk_forums']}</p>
+		<td class='field_title override_title'>
+			<strong class='title'>{$this->lang->words['reset_for']}</strong>
+			<p class='tools_list'>
+				<input type='checkbox' value='1' name='resetMembers' /> {$this->lang->words['sk_members']}<br />
+				<input type='checkbox' value='1' name='resetForums' /> {$this->lang->words['sk_forums']}
 			</p>
 			<br />
-			<strong>{$this->lang->words['sk_resetto']}:</strong>
-			<p>
-			<select name='resetSkinID'><option value='0'>&lt; {$this->lang->words['sk_usedefault']} &gt;</option>{$skinOptionList}</select>
+			<strong class='title'>{$this->lang->words['sk_resetto']}</strong>
+			<p class='tools_list'>
+				<select name='resetSkinID'><option value='0'>&lt; {$this->lang->words['sk_usedefault']} &gt;</option>{$skinOptionList}</select>
 			</p>
 		</td>
-		<td width='70%'>
-			<strong>{$this->lang->words['sk_wheretheyuse']}:</strong>
-			<p>
-				<select name='setID[]' multiple="multiple" size="10">{$skinOptionList}</select>
+		<td class='field_field override_title'>
+			<strong class='title'>{$this->lang->words['sk_wheretheyuse']}</strong>
+			<p class='tools_list'>
+				<select name='setID[]' multiple="multiple" size="6" style='width: 150px'>{$skinOptionList}</select>
 			</p>
 		</td>
 	</tr>
@@ -1265,29 +1576,30 @@ $IPBHTML .= <<<EOF
 		<input type='submit' value='{$this->lang->words['sk_reset']}' class='button primary' />
 	 </div>
 	</form>
+</div>
+<br />
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_rebuildmasterdata']}</h3>
 	<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=toolsRebuildMaster' enctype='multipart/form-data' method='POST'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<table class='alternate_rows triple_pad'>
+	<table class='ipsTable double_pad'>
 	<tr>
-		<th colspan='2'>{$this->lang->words['sk_rebuildmasterdata']}</th>
-	</tr>
-	<tr>
-		<td width='30%' valign='top'>
-			<strong>{$this->lang->words['sk_rebuild']}:</strong>
-			<p>
-				<p><input type='checkbox' value='1' name='rebuildHTML' /> {$this->lang->words['sk_rebuildhtml']}</p>
-				<p><input type='checkbox' value='1' name='rebuildCSS' /> {$this->lang->words['sk_rebuildcss']}</p>
-				<p><input type='checkbox' value='1' name='rebuildReplacements' /> {$this->lang->words['sk_rebuildreplacements']}</p>
+		<td class='field_title override_title'>
+			<strong class='title'>{$this->lang->words['sk_rebuild']}:</strong>
+			<p class='tools_list'>
+				<input type='checkbox' value='1' name='rebuildHTML' /> {$this->lang->words['sk_rebuildhtml']}<br />
+				<input type='checkbox' value='1' name='rebuildCSS' /> {$this->lang->words['sk_rebuildcss']}<br />
+				<input type='checkbox' value='1' name='rebuildReplacements' /> {$this->lang->words['sk_rebuildreplacements']}
 			</p>
 		</td>
-		<td width='70%'>
-			<strong>{$this->lang->words['sk_forapps']}:</strong>
-			<p>
+		<td class='field_field override_title'>
+			<strong class='title'>{$this->lang->words['sk_forapps']}:</strong>
+			<p class='tools_list'>
 EOF;
 	foreach( $appData as $appDir => $_appData )
 	{
 		$IPBHTML .= <<<EOF
-				<p><input type='checkbox' value='1' name='apps[$appDir]'> <strong>{$_appData['app_title']}</strong> <span style='color:gray;font-size:0.9em'>({$this->lang->words['sk_templatexmllast']} - {$_appData['lastmTimeFormatted']})</span></p>
+				<input type='checkbox' value='1' name='apps[$appDir]'> <strong>{$_appData['app_title']}</strong> <span style='color:gray;font-size:0.9em'>({$this->lang->words['sk_templatexmllast']} - {$_appData['lastmTimeFormatted']})</span><br />
 EOF;
 	}
 $IPBHTML .= <<<EOF
@@ -1299,73 +1611,78 @@ $IPBHTML .= <<<EOF
 		<input type='submit' value='{$this->lang->words['sk_rebuild']}' class='button primary' />
 	 </div>
 	</form>
-	</table>
-	<table class='alternate_rows triple_pad'>
+</div>
+<br />
+<div class='acp-box'>
+	<h3>{$this->lang->words['sk_cleanup_title']}</h3>
+	<table class='ipsTable double_pad'>
 	<tr>
-		<th colspan='2'>{$this->lang->words['sk_cleanup_title']}</th>
-	</tr>
-	<tr>
-		<td width='70%'>
-			{$this->lang->words['sk_cleanup_templates']}
-			<div style='color:gray;font-size:0.9em'>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_cleanup_templates']}</strong></td>
+		<td class='field_field'>
+			<a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=templateDbClean' class='realbutton'>{$this->lang->words['sk_run_tool']}</a>
+			<br /><br />
+			<span class='desctext'>
 				{$this->lang->words['sk_cleanup_templates_exp']}
-			</div>
+			</span>
 		</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=templateDbClean'>{$this->lang->words['sk_run_tool']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'>
-			{$this->lang->words['sk_cleanup_css']}
-			<div style='color:gray;font-size:0.9em'>
+		<td class='field_title'><strong class='title'>{$this->lang->words['sk_cleanup_css']}</strong></td>
+		<td class='field_field'>
+			<a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=cssDbClean' class='realbutton'>{$this->lang->words['sk_run_tool']}</a>
+			<br /><br />
+			<span class='desctext'>
 				{$this->lang->words['sk_cleanup_css_exp']}
-			</div>
+			</span>
 		</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=cssDbClean'>{$this->lang->words['sk_run_tool']}</a></td>
 	</tr>
-	</table>
-	
+	<tr>
+		<td class='field_title'>
+			<strong class='title'>{$this->lang->words['sk_clean_caches']}</strong>
+		</td>
+		<td class='field_field'>
 	<form action='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=toolCacheClean' method='POST'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<table class='alternate_rows triple_pad'>
-	<tr>
-		<td width='30%'>
-			{$this->lang->words['sk_clean_caches']}
-			<p>
-				<p><input type='checkbox' name='cleanCss' value='1' /> {$this->lang->words['sk_clean_caches_cb_css']}</p>
-				<p><input type='checkbox' name='cleanTemplates' value='1' /> {$this->lang->words['sk_clean_caches_cb_tem']}</p>
+			<p style='float: left; margin-right: 10px;'>
+				<input type='checkbox' name='cleanCss' value='1' /> {$this->lang->words['sk_clean_caches_cb_css']}<br />
+				<input type='checkbox' name='cleanTemplates' value='1' /> {$this->lang->words['sk_clean_caches_cb_tem']}
 			</p>
+			<select name='setID'>{$skinOptionList}</select> &nbsp; <input type='submit' value='{$this->lang->words['sk_run_tool']}' class='button primary' />
+			</form>
 		</td>
-		<td width='70%'><select name='setID'>{$skinOptionList}</select> &nbsp; <input type='submit' value=' {$this->lang->words['sk_run_tool']}' class='button primary' /></td>
 	</tr>
 	</table>
-	</form>
-	
+</div>
 EOF;
-/**** IN DEV ****/
+
 if  (IN_DEV )
 {
 	$IPBHTML .= <<<EOF
+<br />
+<div class='acp-box'>
+	<h3>IPS Developer's Tools</h3>
 	<!-- IN DEV -->
- 	<table class='alternate_rows triple_pad'>
+ 	<table class='ipsTable double_pad'>
 	<tr>
-		<th colspan='2'>Ин�трументы разработчика</th>
-	</tr>
-	<tr>
-		<td width='70%'>
-			<strong>Создать</strong> файлы �тил� дл� релиза
-			<div style='color:gray;font-size:0.9em'>
-				Ин�трумент делает:
+		<td class='field_title'>
+			<strong class='title'>Build Skin Files For Release</strong>
+		</td>
+		<td class='field_field'>
+			<div class='right'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=rebuildForRelease' class='realbutton'>{$this->lang->words['sk_run']}</a></div>
+			<div class='desctext'>
+				This tool:
 				<ul>
-				 	<li>Обновление в�ех HTML/CSS/Макро�ов из файлов директории master_*/.</li>
-					<li>Эк�порт XML шаблонов в директории приложений</li>
-					<li>Эк�порт skinsData.xml, css.xml и replacements.xml дл� каждого �тил�</li>
+				 	<li>Rebuilds your HTML/CSS/Replacements from the master_*/ disk files.</li>
+					<li>Exports all template XML into the application directories</li>
+					<li>Exports skinsData.xml, css.xml and replacements.xml for each default skin</li>
 				</ul>
 EOF;
-	if ( ! is_writable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins' ) )
+	if ( ! is_writable( IPS_ROOT_PATH . 'setup/xml/skins' ) )
 	{
-		$_file = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/resources/skins';
+		$_file = IPS_ROOT_PATH . 'setup/xml/skins';
+
 		$IPBHTML .= <<<EOF
-		<div style='color:red'>�е удало�ь запи�ать $_file</div>
+		<div style='color:red'>Cannot write to {$_file}</div>
 EOF;
 	}
 	foreach( $appData as $appDir => $_appData )
@@ -1375,27 +1692,29 @@ EOF;
 			$_file = IPSLib::getAppDir( $appDir ) . '/xml';
 			
 		$IPBHTML .= <<<EOF
-				<div style='color:red'>�е удало�ь запи�ать $_file</div>
+				<div style='color:red'>Cannot write to {$_file}</div>
 EOF;
 		}
 	}
 $IPBHTML .= <<<EOF
 			</div>
 		</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=rebuildForRelease'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'>
-			Создание <strong>PHP ма�тер</strong> директории
-			<div style='color:gray;font-size:0.9em'>
-				Ин�трумент позвол�ет отредактировать базовый �тиль (id 0). И�пользуйте ин�трументы дл� �тилей (подробнее /cache/skin_cache/masterMap.php) дл� изменени� ваших �тилей.
+		<td class='field_title'>
+			<strong class='title'>Create Master PHP Templates Directory</strong>
+		</td>
+		<td class='field_field'>
+			<div class='right'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=createMasterSkin&amp;set_id=0' class='realbutton'>{$this->lang->words['sk_run']}</a></div>
+			<div class='desctext'>
+				Note, this tool is for editing master set 0, not your own skin sets. Use the per-skin tool instead (see /cache/skin_cache/masterMap.php)
 			</div>
 EOF;
 	if ( is_dir( IPS_CACHE_PATH . 'cache/skin_cache/master_skin' ) )
 	{
 		$IPBHTML .= <<<EOF
-			<div style='color:gray;font-size:0.9em'>
-				Уже �оздана директори� master_skin directory. При и�пользовании �того ин�трумента в�е файлы �той директории будут перезапи�аны!
+			<div class='desctext' style='color:red'>
+				You already have a master_skin directory. Using this tool will overwrite the contents. Use with caution!
 			</div>
 EOF;
 
@@ -1403,47 +1722,39 @@ EOF;
 
 $IPBHTML .= <<<EOF
 		</td>
-		<td width='30%'>
-			<a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=createMasterSkin&amp;set_id=0'>{$this->lang->words['sk_run']}</a>
-		</td>
 	</tr>
 	<tr>
-		<td width='70%'>Пере�троить базовые шаблоны <strong>HTML</strong> из PHP кешей</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=rebuildMasterSkin&amp;set_id=0'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Rebuild Master HTML From PHP Caches</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=rebuildMasterSkin&amp;set_id=0'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'>Пере�троить базовый <strong>CSS</strong> из ди�кового кеша</td>
-		<td width='30%'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=inDevMasterCSS'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Rebuild Master CSS From Disk Files</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=inDevMasterCSS'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'>Пере�троить базовые <strong>макро�ы</strong> из ди�кового кеша</td>
-		<td width='30%'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=inDevMasterReplacements'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Rebuild Master Replacements From Disk File</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=inDevMasterReplacements'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'><strong>Эк�портировать</strong> HTML шаблоны в директории приложений</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportAPPTemplates'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Export HTML Templates Into Application Directories</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportAPPTemplates'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'><strong>Эк�портировать</strong> CSS в директории приложений</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportAPPCSS'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Export CSS Into Application Directories</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportAPPCSS'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'><strong>Эк�портировать</strong> макро�ы в XML файлы</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportMasterReplacements'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Export Replacements To XML Files</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=exportMasterReplacements'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	<tr>
-		<td width='70%'><strong>Импортировать</strong> HTML шаблоны из директорий приложений</td>
-		<td width='30%'><a href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=importAPPTemplates'>{$this->lang->words['sk_run']}</a></td>
+		<td class='field_title'><strong class='title'>Import HTML Templates From Application Directories</strong></td>
+		<td class='field_field'><a class='realbutton' href='{$this->settings['base_url']}module=templates&amp;section=tools&amp;do=importAPPTemplates'>{$this->lang->words['sk_run']}</a></td>
 	</tr>
 	</table>
-	 <div class='acp-actionbar'>
-		&nbsp;
 	 </div>
 EOF;
 }
-$IPBHTML .= <<<EOF
-</div>
-EOF;
 
 //--endhtml--//
 return $IPBHTML;
@@ -1452,7 +1763,6 @@ return $IPBHTML;
 /**
  * Results from running a skin tool
  *
- * @access	public
  * @param	string		Page title
  * @param	array		Ok messages
  * @param	array 		Error messages
@@ -1464,10 +1774,10 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<div class='tableborder'>
-	<div class='tableheaderalt'>$title</div>
-	<table width='100%' cellpadding='0' cellspacing='0' class='triple_pad'>
-	<tr class='acp-row-off'>
+<div class='acp-box'>
+	<h3>{$title}</h3>
+	<table class='ipsTable'>
+	<tr>
 		<td>
 EOF;
 	if ( is_array( $errorMessages ) )
@@ -1475,7 +1785,7 @@ EOF;
 		foreach( $errorMessages as $entry )
 		{
 			$IPBHTML .= <<<EOF
-				<div class='input-warn-content' style='color:red'>$entry</div>
+				<div class='input-warn-content' style='color:red'>{$entry}</div>
 EOF;
 		}
 	}
@@ -1485,7 +1795,7 @@ EOF;
 		foreach( $okMessages as $entry )
 		{
 			$IPBHTML .= <<<EOF
-				<div class='input-ok-content'>$entry</div>
+				<div class='input-ok-content'>{$entry}</div>
 EOF;
 		}
 	}
@@ -1504,7 +1814,6 @@ return $IPBHTML;
 /**
  * Splash page to remove customizations from a skin set
  *
- * @access	public
  * @param	array 		Skin set data
  * @return	string		HTML
  */
@@ -1519,8 +1828,8 @@ $IPBHTML .= <<<EOF
 </div>
 <div class='acp-box'>
 	<h3>{$this->lang->words['sk_pleaseconfirm']}</h3>
-	<table width='100%' cellpadding='0' cellspacing='0' class='triple_pad'>
-		<tr class='acp-row-off'>
+	<table class='ipsTable'>
+		<tr>
 			<td>
 				<p>
 					<p>{$this->lang->words['sk_revert_desc']}</p>
@@ -1532,7 +1841,7 @@ $IPBHTML .= <<<EOF
 		</tr>
 	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value=' {$this->lang->words['sk_revert_button']} ' class='realbutton redbutton' />
+		<input type='submit' value='{$this->lang->words['sk_revert_button']}' class='realbutton redbutton' />
 	</div>
 </div>
 </form>
@@ -1546,7 +1855,6 @@ return $IPBHTML;
 /**
  * Splash page to remove a skin set
  *
- * @access	public
  * @param	array 		Skin set data
  * @return	string		HTML
  */
@@ -1555,6 +1863,7 @@ public function skinsets_removeSplash( $setData ) {
 $IPBHTML = "";
 //--starthtml--//
 $pleaseconfirmthatyoureallywanttoremovethisskinset = sprintf( $this->lang->words['sk_pleaseconfirm_info'], $setData['set_name'] );
+
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['sk_removingset']} '{$setData['set_name']}'</h2>
@@ -1562,15 +1871,15 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['sk_pleaseconfirm']}</h3>
-	<table width='100%' cellpadding='0' cellspacing='0' class='triple_pad'>
-		<tr class='acp-row-off'>
+	<table class='ipsTable double_pad'>
+		<tr>
 			<td>
 				{$pleaseconfirmthatyoureallywanttoremovethisskinset}
 			</td>
 		</tr>
 	</table>
 	<div class='acp-actionbar'>
-		<input type='button' value=' {$this->lang->words['sk_removeskinset']} ' class='realbutton redbutton' onclick='acp.redirect( "{$this->settings['base_url']}{$this->form_code}&do=setRemove&set_id={$setData['set_id']}&authKey={$this->member->form_hash}", 1 )' />
+		<input type='button' value='{$this->lang->words['sk_removeskinset']}' class='realbutton redbutton' onclick='acp.redirect( "{$this->settings['base_url']}{$this->form_code}&do=setRemove&set_id={$setData['set_id']}&authKey={$this->member->form_hash}", 1 )' />
 	</div>
 </div>
 	
@@ -1583,28 +1892,28 @@ return $IPBHTML;
 /**
  * Skin sets overview (tab homepage)
  *
- * @access	public
  * @param	array 		Skin sets
  * @param	array 		Caching data
  * @return	string		HTML
  */
-public function skinsets_listSkinSets( $sets, $cacheData, $hasData, $canMerge ) {
+public function skinsets_listSkinSets( $sets, $cacheData, $hasData, $canMerge, $skinGenSessions, $html ) {
 
 $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
+<script type="text/javascript" src="{$this->settings['js_main_url']}acp.skinsets.js"></script>
+{$html}
 <div class='section_title'>
 	<h2>{$this->lang->words['sk_skinmanagement']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=setAdd' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sk_addnewrootskin']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=templates&amp;section=importexport&amp;do=overview' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['sk_importnewskin']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=setAdd' id='ipsNewSkin' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sk_addnewrootskin']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=templates&amp;section=importexport&amp;do=overview' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['sk_importnewskin']}</a></li>
 	</ul>
 </div>
-
-<div class='acp-box' id='forum_wrapper'>
+<div class='acp-box' id="forum_wrapper">
 	<h3>{$this->lang->words['sk_skinsets']}</h3>
-	<table style='width: 100%' cellspacing='0' class='double_pad'>
+	<table class='ipsTable double_pad'>
 		<tr>
 			<th width='3px'>&nbsp;</th>
 			<th style='width: 81%'>{$this->lang->words['sk_setname']}</th>
@@ -1613,37 +1922,57 @@ $IPBHTML .= <<<EOF
 			<th style='width: 3%'>&nbsp;</th>
 		</tr>
 	</table>
-	<ul class='sortable_handle' id='sort_root'>
+	<ul class='sortable_handle alternate_rows' id='sort_root'>
 EOF;
 	
-	$children = array( 'root' => array() );
-	$ended = array();
+	$children		= array( 'root' => array() );
+	$ended			= array();
+	$javascripts	= array();
+	
 	foreach( $sets as $idx => $data )
 	{	
 		$subskin = ( $data['depthguide'] ) ? 'subforum' : '';
 		
 		/* on off stuffs */
+		$isVisEditSkin = ( $data['set_by_skin_gen'] ) ? true : false;
 		$preOFImage   = 'off_';
 		$titleOFImage = $this->lang->words['tt_ss_of_off'];
-		$formatImage = '';
-		$hiddenImage = "<img title='{$this->lang->words['ss_canttoggle']}' src='{$this->settings['skin_acp_url']}/_newimages/skinset_canthide.png' />";
+		$formatImage  = '';
+		$desc		  = '';
+		$hiddenImage  = "<img title='{$this->lang->words['ss_canttoggle']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/skinset_canthide.png' />";
+		$canDelete    = true;
 		
 		if ( $data['set_is_default'] )
 		{
-			$formatImage = "<img title='{$this->lang->words['tt_ss_of']}' src='{$this->settings['skin_acp_url']}/_newimages/output_{$data['set_output_format']}.png' />";
+			$formatImage = "<img title='{$this->lang->words['tt_ss_of']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/output_{$data['set_output_format']}.png' />";
 		}
 		else
 		{
-			$formatImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=makeDefault&amp;set_id={$data['set_id']}' title='{$this->lang->words['tt_ss_of_off']}'><img title='{$this->lang->words['tt_ss_of_off']}' src='{$this->settings['skin_acp_url']}/_newimages/output_off_{$data['set_output_format']}.png' /></a>";
+			$formatImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=makeDefault&amp;set_id={$data['set_id']}' title='{$this->lang->words['tt_ss_of_off']}'><img title='{$this->lang->words['tt_ss_of_off']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/output_off_{$data['set_output_format']}.png' /></a>";
 		}
 		
 		if ( $data['set_hide_from_list'] )
 		{
-			$hiddenImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggleHidden&amp;set_id={$data['set_id']}' title='{$this->lang->words['ss_hidden']}'><img title='{$this->lang->words['ss_hidden']}' src='{$this->settings['skin_acp_url']}/_newimages/skinset_hidden.png' /></a>";
+			$hiddenImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggleHidden&amp;set_id={$data['set_id']}' title='{$this->lang->words['ss_hidden']}'><img title='{$this->lang->words['ss_hidden']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/skinset_hidden.png' /></a>";
 		}
 		else if ( ! $data['set_is_default'] )
 		{
-			$hiddenImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggleHidden&amp;set_id={$data['set_id']}' title='{$this->lang->words['ss_not_hidden']}'><img title='{$this->lang->words['ss_not_hidden']}' src='{$this->settings['skin_acp_url']}/_newimages/skinset_visible.png' /></a>";
+			$hiddenImage = "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=toggleHidden&amp;set_id={$data['set_id']}' title='{$this->lang->words['ss_not_hidden']}'><img title='{$this->lang->words['ss_not_hidden']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/skinset_visible.png' /></a>";
+		}
+		
+		if ( $data['set_by_skin_gen'] )
+		{
+			$desc = '<span class="desctext">' . $this->lang->words['skin_gen_desc'] . '</span>';
+			
+			if ( ! empty( $skinGenSessions[ $data['set_id'] ] ) )
+			{
+				$canDelete = false;
+				$desc .= "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=cancelVisualEditor&amp;set_id={$data['set_id']}' class='mini_button secondary right ipsCancelEditor'>Закрыть визуальный редактор</a>";
+			}
+			else
+			{
+				$desc .= "<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=launchVisualEditor&amp;set_id={$data['set_id']}' target='_blank' class='mini_button right'>Запу�тить визуальный редактор</a>";
+			}
 		}
 		
 		$children[ $data['set_id'] ] = unserialize( $data['set_child_array'] );
@@ -1674,16 +2003,16 @@ EOF;
 								
 		$IPBHTML .= <<<EOF
 		<li id='set_{$data['set_id']}' class='isDraggable'>
-		<ul class='sortable_handle' id='sort_{$data['set_id']}'>
-		<table style='width: 100%' cellspacing='0' class='double_pad'>
-		<tr>
-			<td class='{$data['_cssClass']} forum_row {$subskin}' width='1%' style='text-align: center'>
-				<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
+		<table class='double_pad' id='sort_{$data['set_id']}'>
+		<tr class='ipsControlRow'>
+			<td class='forum_row {$subskin}' width='1%' style='text-align: center'>
+				<div class='draghandle'>&nbsp;</div>
 			</td>
-			 <td class='{$data['_cssClass']} forum_row {$subskin}' style='width: 81%'>
+			 <td class='forum_row {$subskin}' style='width: 81%'>
 				{$data['depthguide']}
-			 	<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$data['_setImg']}' />&nbsp;
+			 	<img src='{$this->settings['skin_acp_url']}/images/icons/{$data['_setImg']}' />&nbsp;
 			 	<strong><a title='{$data['bit_desc']}' href='{$this->settings['base_url']}module=templates&amp;section=templates&amp;do=list&amp;setID={$data['set_id']}'>{$data['set_name']}</a></strong>
+			 	{$desc}
 EOF;
 		if ( ! $cacheData[ $data['set_id'] ]['db'] AND ! $cacheData[ $data['set_id'] ]['php'] )
 		{
@@ -1691,40 +2020,51 @@ EOF;
 			$IPBHTML .= <<<EOF
 			<br />
 				<span class='desctext' style='margin-left: {$_depth}px'>
-					{$this->lang->words['sk_notempcache']} <a href='{$this->settings['base_url']}&amp;module=templates&amp;section=tools&amp;do=rebuildPHPTemplates&amp;setID={$data['set_id']}'>{$this->lang->words['sk_pleasebuildnow']}</a>
+					{$this->lang->words['sk_notempcache']} <a href='{$this->settings['base_url']}&amp;module=templates&amp;section=tools&amp;do=rebuildPHPTemplates&amp;setID={$data['set_id']}'>{$this->lang->words['sk_pleasebuildthem']}</a>
 				</span>
 EOF;
 		}
 		
 		$IPBHTML .= <<<EOF
 			</td>
-			<td class='{$data['_cssClass']} forum_row {$subskin}' style='text-align: center' style='width: 3%'>
-				$hiddenImage
+			<td class='forum_row {$subskin}' style='text-align: center' style='width: 3%'>
+				{$hiddenImage}
 			</td>
-			<td class='{$data['_cssClass']} forum_row {$subskin}' style='text-align: center' style='width: 12%'>
-				$formatImage
+			<td class='forum_row {$subskin}' style='text-align: center' style='width: 12%'>
+				{$formatImage}
 			</td>
-			<td class='{$data['_cssClass']} forum_row {$subskin}' style='width: 3%'>
-				<img class='ipbmenu' id="menubit{$data['set_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-				<ul class='acp-menu' id='menubit{$data['set_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setEdit&amp;set_id={$data['set_id']}'>{$this->lang->words['sk_editsettings']}</a></li>
+			<td class='forum_row {$subskin} col_buttons' style='width: 3%'>
+				<ul class='ipsControlStrip'>
+				    <li class='ipsControlStrip_more ipbmenu' id="menu_{$data['set_id']}">
+						<a href='#'>&nbsp;</a>
+					</li>
+				</ul>
+				<ul class='acp-menu' id='menu_{$data['set_id']}_menucontent'>
+ 					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setEdit&amp;set_id={$data['set_id']}' title='{$this->lang->words['sk_editsettings']}'>{$this->lang->words['sk_editsettings']}</a></li>
+EOF;
+
+			if ( ! $isVisEditSkin )
+			{
+				$IPBHTML .= <<<EOF
 					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=templates&amp;do=list&amp;setID={$data['set_id']}'>{$this->lang->words['sk_managetempcss']}</a></li>
 					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=replacements&amp;do=list&amp;setID={$data['set_id']}'>{$this->lang->words['sk_managereplacements']}</a></li>
 					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=useragents&amp;do=show&amp;setID={$data['set_id']}'>{$this->lang->words['sk_manageuagentmapping']}</a></li>
 					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=urlmap&amp;do=show&amp;setID={$data['set_id']}'>{$this->lang->words['sk_manageurlmapping']}</a></li>
 					<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=revertSplash&amp;setID={$data['set_id']}'>{$this->lang->words['sk_revert_customizations']}</a></li>
 EOF;
-			if ( $canMerge )
+			}
+			
+			if ( $canMerge && ! $isVisEditSkin )
 			{		
-			$IPBHTML .= <<<EOF
-					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=skindiff&amp;do=skinDiffStart&amp;setID={$data['set_id']}'>{$this->lang->words['runmergereports']}</a></li>
+				$IPBHTML .= <<<EOF
+					<li class='icon view'><a href='{$this->settings['base_url']}&amp;module=templates&amp;section=skindiff&amp;do=skinDiffStart&amp;setID={$data['set_id']}'>{$this->lang->words['runmergereports']}</a></li>
 EOF;
 			}
 
-			if ( $data['_canRemove'] )
+			if ( $data['_canRemove'] && $canDelete )
 			{		
 			$IPBHTML .= <<<EOF
-					<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setRemoveSplash&amp;set_id={$data['set_id']}");'>{$this->lang->words['sk_removeskinset']}...</a></li>
+					<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setRemoveSplash&amp;set_id={$data['set_id']}'>{$this->lang->words['sk_removeskinset']}...</a></li>
 EOF;
 			}
 			if ( $data['_canWriteMaster'] AND IN_DEV )
@@ -1752,24 +2092,21 @@ EOF;
 		
 		if ( empty( $children[ $data['set_id'] ] ) and !in_array( $data['set_id'], $ended ) )
 		{
+			$IPBHTML .= "</li>";
 			$ended[] = $children[ $data['set_id'] ];
-			$IPBHTML .= <<<EOF
-			</ul>
-			</li>
-			<script type="text/javascript">
+			$javascripts[] = <<<EOF
 				dropItLikeItsHot{$data['set_id']} = function( draggableObject, mouseObject )
 				{
 					var options = {
 									method : 'post',
 									parameters : Sortable.serialize( 'sort_{$data['set_id']}', { tag: 'li', name: 'skin_sets' } )
 								};
-				
+
 					new Ajax.Request( "{$this->settings['base_url']}&app=core&module=templates&section=skinsets&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
 					return false;
 				};
 
 				Sortable.create( 'sort_{$data['set_id']}', { only: 'isDraggable', revert: true, format: 'set_([0-9]+)', onUpdate: dropItLikeItsHot{$data['set_id']}, handle: 'draghandle' } );
-			</script>
 EOF;
 		}
 		
@@ -1779,11 +2116,9 @@ EOF;
 			{		
 				if ( empty( $children[ $pid ] ) and !in_array( $pid, $ended ) )
 				{
+					$IPBHTML .= "</li>";
 					$ended[] = $pid;
-					$IPBHTML .= <<<EOF
-					</ul>
-					</li>
-					<script type="text/javascript">
+					$javascripts[] = <<<EOF
 						dropItLikeItsHot{$pid} = function( draggableObject, mouseObject )
 						{
 							var options = {
@@ -1796,7 +2131,6 @@ EOF;
 						};
 	
 						Sortable.create( 'sort_{$pid}', { only: 'isDraggable', revert: true, format: 'set_([0-9]+)', onUpdate: dropItLikeItsHot{$pid}, handle: 'draghandle' } );
-					</script>
 EOF;
 				}
 			}
@@ -1807,18 +2141,27 @@ EOF;
 $IPBHTML .= <<<EOF
 	</ul>
 	<script type="text/javascript">
+		var cancelEditorDialogue = new Template("<div class='acp-box'><h3>Закрыть визуальный редактор</h3><div class='pad'><p>Данное дей�твие закроет активную �е��ию визуального редактора, при �том будут потер�ны в�е не�охраненные изменени� в �тиле.<br /><br /><a href='#{url}' class='button'>Закрыть</a></p></div></div>" );
 		dropItLikeItsHotroot = function( draggableObject, mouseObject )
 		{
 			var options = {
 							method : 'post',
 							parameters : Sortable.serialize( 'sort_root', { tag: 'li', name: 'skin_sets' } )
 						};
-		
+
 			new Ajax.Request( "{$this->settings['base_url']}&app=core&module=templates&section=skinsets&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
 			return false;
 		};
 
 		Sortable.create( 'sort_root', { only: 'isDraggable', revert: true, format: 'set_([0-9]+)', onUpdate: dropItLikeItsHotroot, handle: 'draghandle' } );
+EOF;
+
+if( count($javascripts) )
+{
+	$IPBHTML .= implode( "\n", $javascripts );
+}
+
+$IPBHTML .= <<<EOF
 	</script>
 </div>
 EOF;
@@ -1827,136 +2170,9 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * List CSS files ina  skin set
- *
- * @access	public
- * @param	array 		CSS data
- * @param	array 		Skin set data
- * @return	string		HTML
- */
-public function css_listCSS( $cssData, $setData ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$_keys    = array_keys( $cssData );
-$_json    = json_encode( array( 'css' => $cssData ) );
-$_first   = array_shift( $_keys );
-$_setData = json_encode( $setData );
-
-$this->lang->words['sk_usestyleurl'] = sprintf( $this->lang->words['sk_usestyleurl'], "{$this->settings['img_url_no_dir']}{$setData['set_image_dir']}" );
-
-$IPBHTML .= <<<EOF
-<style type='text/css'>
-/*
-ALL THESE ARE USED WITHIN ipb3CSS.js
-*/
-
-.cssHover
-{
-	background-color: #D3DAE4;
-	background-image: url("{$this->settings['skin_acp_url']}/images/acpMenuMore.png");
-	background-repeat: no-repeat;
-	background-position: center right;
-	cursor: pointer;
-}
-
-/* Normal template row */
-.tplateRow_def
-{
-	background: #fafafa;
-}
-
-/* Inherited template row */
-.tplateRow_inh
-{
-	background: yellow;
-}
-
-
-/* Modified template row */
-.tplateRow_mod
-{
-	background: red;
-}
-
-/* Modified template row */
-.tplateRow_new
-{
-	background: lightgreen;
-}
-
-</style>
-<script type="text/javascript" src="{$this->settings['js_app_url']}ipb3CSS.js"></script>
-<div class='tablerow1' style='margin-left:auto;text-align:center;width:200px;padding:10px'><a href='javascript:void(0)' onclick='IPB3CSS.addCSSForm()'>{$this->lang->words['sk_addnewcss']}</a></div>
-<div class='tableborder'>
-	<div class='tableheaderalt'>{$this->lang->words['sk_cssfor']}: {$setData['set_name']}</div>
-	<div id='tplate_wrapperDiv'>
-		<div id='tplate_cssList'></div>
-	</div>
-</div>
-<br />
-<div class='tplateRow_def'>{$this->lang->words['sk_unmodifiedcss']}</div>
-<div class='tplateRow_inh'>{$this->lang->words['sk_unmodifiedcss2']}</div>
-<div class='tplateRow_mod'>{$this->lang->words['sk_modifiedcss']}</div>
-<div class='tplateRow_new'>{$this->lang->words['sk_newcss']}</div>
-<!-- templates -->
-<div style='display:none'>
-
-<div id='tplate_cssRow'>
-	<div id='tplate_cssRow_#{css_id}' onmouseover='IPB3CSS.mouseEvent(event)' onmouseout='IPB3CSS.mouseEvent(event)' onclick='IPB3CSS.mouseEvent(event)' class='tablerow2 #{_cssClass}'>
-		<div style='float:right'>
-			#{_cssSize}
-		</div>
-		<div id='tplate_cssRow_#{css_id}_differences' style='float:right;margin-right:10px;cursor:pointer'>{$this->lang->words['sk_comparediff']}</div>
-		<div>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/template.png' />
-			<span style='font-weight:bold'>#{css_group}</span>.css
-		</div>
-	</div>	
-</div>
-<div id='tplate_cssEditor'>
-	<div id='tplate_editor_#{css_id}' class='tableborder' style='width:500px'>
-		<div class='tableheaderalt'>{$this->lang->words['sk_editing']} "#{css_group}.css"</div>
-		<div class='tablerow2' style='padding:10px'>
-			<div style='padding:6px'>
-				{$this->lang->words['sk_usestyleurl']}
-			</div>
-			<div id='tplate_groupBoxWrap_#{css_id}' style='display:none'>{$this->lang->words['sk_cssfilename']}: <input type='text' size='30' value='#{css_group}' id='tplate_groupBox_#{css_id}' />.css</div>
-			<div>{$this->lang->words['sk_position']}: <input type='text' size='5' id='tplate_posBox_#{css_id}' value='#{css_position}' /></div>
-			<textarea id='tplate_editBox_#{css_id}' style='width:100%;height:400px'>#{css_content}</textarea>
-		</div>
-		<div class='tablerow2' style='text-align:right;'>
-			<input type='button' value='{$this->lang->words['sk_save']}' onclick='IPB3CSS.saveCSS(#{css_id})' />
-			&nbsp;
-			<input type='button' value='{$this->lang->words['sk_close']}' onclick='IPB3CSS.cancelCSS(#{css_id})' />
-		</div>
-	</div>
-</div>
-
-</div>
-<!-- / templates -->
-<script type='text/javascript'>
-	var IPB3CSS                  = new IPBCSS();
-	IPB3CSS.CSSData              = $_json;
-	IPB3CSS.currentCSS           = '{$cssData[$_first]['css_group']}';
-	IPB3CSS.currentSetData       = $_setData;
-	IPB3CSS.init();
-</script>
-
-<br />
-<textarea id='tplate_debug' style='font-family:"Courier New";font-size:12px;width:100%;height:500px'></textarea>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * List replacements in a skin set
  *
- * @access	public
  * @param	array 		Replacements data
  * @param	array 		Skin set data
  * @return	string		HTML
@@ -1977,21 +2193,21 @@ $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['sk_replaceinset']}: {$setData['set_name']}</h2>
 	<ul class='context_menu'>
-		<li><a href='#' id='add_replacement'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_replacementadd']}</a></li>
-		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=skinsets&amp;do=setEdit&amp;set_id={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/palette_edit.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editskinsettings']}</a></li>
-		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=templates&amp;do=list&amp;setID={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/folder_palette.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_edittempcss']}</a></li>
+		<li><a href='#' id='add_replacement'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_replacementadd']}</a></li>
+		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=skinsets&amp;do=setEdit&amp;set_id={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/palette_edit.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editskinsettings']}</a></li>
+		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=templates&amp;do=list&amp;setID={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/folder_palette.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_edittempcss']}</a></li>
 	</ul>
 </div>
-<div class='section_info'>
+<div class='information-box'>
 	{$this->lang->words['sk_replace_info']}
 </div>
-
+<br />
 <script type='text/javascript'>
 	acp.replacements.allReplacements = $_json;
 	acp.replacements.currentSetData = $_setData;
 	acp.replacements.realImgDir  = '{$this->settings['public_dir']}style_images/{$setData['set_image_dir']}';
-	acp.replacements.iconUrl     = '{$this->settings['skin_acp_url']}/_newimages/icons/';
-	acp.replacements.templateUrl = '{$this->settings['skin_acp_url']}/_newimages/templates/';
+	acp.replacements.iconUrl     = '{$this->settings['skin_acp_url']}/images/icons/';
+	acp.replacements.templateUrl = '{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/';
 	acp.replacements.icons       = { 'del-new'      : 'cross.png',
 									 'del-modified' : 'arrow_rotate_anticlockwise.png',
 									 'del-inherit'  : 'arrow_rotate_anticlockwise.png' };
@@ -1999,9 +2215,9 @@ $IPBHTML .= <<<EOF
 	
 	ipb.templates['edit_box'] = new Template("<textarea id='r_#{id}_textbox' class='input_text' style='width: 70%; font-family: arial; font-size: 12px;' rows='2'>#{content}</textarea><div class='replacement_save'><input type='submit' value='{$this->lang->words['sk_save']}' id='r_#{id}_save' class='realbutton' /> <input type='submit' value='{$this->lang->words['sk_cancel']}' id='r_#{id}_cancel' class='realbutton' /></div>");
 	
-	ipb.templates['add_replacement'] = "<div class='acp-box'><h3>{$this->lang->words['add_repl_f_tpl']}</h3><ul class='acp-form'><li><label for='popup_key'>{$this->lang->words['rep_key_f_tpl']}</label><input type='text' class='input_text' id='popup_key' /></li><li><label for'popup_content'>{$this->lang->words['rep_ctn_f_tpl']}</label><textarea id='popup_content' style='width: 45%' rows='7' class='input_text'></textarea></li></ul><div class='acp-actionbar'><input type='submit' class='realbutton' value='{$this->lang->words['addrep_btn_f_tpl']}' id='popup_submit' /></div></div>";	
+	ipb.templates['add_replacement'] = "<div class='acp-box'><h3>{$this->lang->words['add_repl_f_tpl']}</h3><table class='ipsTable'><tr><td class='field_title'><strong class='title'>{$this->lang->words['rep_key_f_tpl']}</strong></td><td class='field_field'><input type='text' class='input_text' id='popup_key' /></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['rep_ctn_f_tpl']}</strong></td><td class='field_field'><textarea id='popup_content' style='width: 45%' rows='7' class='input_text'></textarea></td></tr></table><div class='acp-actionbar'><input type='submit' class='realbutton' value='{$this->lang->words['addrep_btn_f_tpl']}' id='popup_submit' /></div></div>";
 	
-	ipb.templates['revert_button'] = new Template("<span class='dropdown-button' title='{$this->lang->words['sk_revertreplace']}' id='r_#{id}_revert'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></span>");
+	ipb.templates['revert_button'] = new Template("<a href='#' onclick='return false;' title='{$this->lang->words['sk_revertreplace']}' id='r_#{id}_revert'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></a>");
 	
 	$('add_replacement').observe( 'click', acp.replacements.addReplacement );
 </script>
@@ -2009,7 +2225,7 @@ $IPBHTML .= <<<EOF
 <div class="acp-box">
 	<h3>{$this->lang->words['sk_replacements']}</h3>
 	
-	<table class='alternate_rows double_pad' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='2%'>&nbsp;</td>
 			<th width='20%'>{$this->lang->words['sk_replacekey']}</th>
@@ -2027,15 +2243,19 @@ foreach( $replacementsData as $replacement )
 	{
 		if( $replacement['replacement_added_to'] == $setData['set_id'] ){
 			$status = 'new';
-			$revert = "<span class='dropdown-button' title='{$this->lang->words['sk_removereplace']}' id='r_{$replacement['replacement_key']}_delete'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cross.png' alt='{$this->lang->words['sk_icon']}' /></span>";
+			$revert = "<li class='i_refresh' id='r_revert_wrap_{$replacement['replacement_key']}'><a href='#' onclick='return false;' title='{$this->lang->words['sk_removereplace']}' id='r_{$replacement['replacement_key']}_delete'><img src='{$this->settings['skin_acp_url']}/images/icons/cross.png' alt='{$this->lang->words['sk_icon']}' /></a></li>";
 		}
 		elseif( $replacement['replacement_set_id'] == $setData['set_id'] ){
 			$status = 'modified';
-			$revert = "<span class='dropdown-button' title='{$this->lang->words['sk_revertreplace']}' id='r_{$replacement['replacement_key']}_revert'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></span>";
+			$revert = "<li class='i_refresh' id='r_revert_wrap_{$replacement['replacement_key']}'><a href='#' onclick='return false;' title='{$this->lang->words['sk_revertreplace']}' id='r_{$replacement['replacement_key']}_revert'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></a></li>";
 		}
 		elseif( in_array( $replacement['replacement_set_id'], array_values( $setData['_parentTree'] ) ) ){
 			$status = 'inherit';
-			$revert = "<span class='dropdown-button' title='{$this->lang->words['sk_revertreplace']}' id='r_{$replacement['replacement_key']}_revert'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></span>";
+			$revert = "<li class='i_refresh' id='r_revert_wrap_{$replacement['replacement_key']}'><a href='#' onclick='return false;' title='{$this->lang->words['sk_revertreplace']}' id='r_{$replacement['replacement_key']}_revert'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_rotate_anticlockwise.png' alt='{$this->lang->words['sk_icon']}' /></a></li>";
+		}
+		else
+		{
+			$revert = "<li class='i_refresh' id='r_revert_wrap_{$replacement['replacement_key']}'></li>";
 		}
 	}
 	
@@ -2043,13 +2263,15 @@ foreach( $replacementsData as $replacement )
 	
 	$IPBHTML .= <<<EOF
 	
-		<tr>
-			<td style='vertical-align: top'><img id='r_status_{$replacement['replacement_key']}' src='{$this->settings['skin_acp_url']}/_newimages/templates/{$status}.png' alt='{$this->lang->words['sk_icon']}' /></td>
+		<tr class='ipsControlRow'>
+			<td style='vertical-align: top'><img id='r_status_{$replacement['replacement_key']}' src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/{$status}.png' alt='{$this->lang->words['sk_icon']}' /></td>
 			<td style='vertical-align: top'><strong>{$replacement['replacement_key']}</strong></td>
 			<td style='text-align: center' id='r_{$replacement['replacement_key']}_content'>{$replacement['real_content']}</td>
-			<td style='text-align: right; vertical-align: top;'>
-				<span id='r_revert_wrap_{$replacement['replacement_key']}'>{$revert}</span>
-				<span class='dropdown-button' title='{$this->lang->words['sk_editreplace']}' id='r_{$replacement['replacement_key']}_edit'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='{$this->lang->words['sk_icon']}' /></span>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					{$revert}
+					<li class='i_edit'><a href='#' onclick='return false;' title='{$this->lang->words['sk_editreplace']}' id='r_{$replacement['replacement_key']}_edit'><img src='{$this->settings['skin_acp_url']}/images/icons/pencil.png' alt='{$this->lang->words['sk_icon']}' /></a></li>	
+				</ul>
 				<script type='text/javascript'>
 					acp.replacements.register('{$replacement['replacement_key']}');
 				</script>
@@ -2060,11 +2282,11 @@ EOF;
 
 $IPBHTML .= <<<EOF
 	</table>
-	<div id='template_footer'>
-		<strong>{$this->lang->words['sk_legend']}:</strong> <img src='{$this->settings['skin_acp_url']}/_newimages/templates/default.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_default']}' />{$this->lang->words['sk_l_default_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/modified.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_modified']}' />{$this->lang->words['sk_l_modified_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/inherit.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_inherited']}' />{$this->lang->words['sk_l_inherited_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/new.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_new']}' />{$this->lang->words['sk_l_new_full']}
+	<div class='acp-actionbar'>
+		<strong>{$this->lang->words['sk_legend']}:</strong> <img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/default.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_default']}' />{$this->lang->words['sk_l_default_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/modified.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_modified']}' />{$this->lang->words['sk_l_modified_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/inherit.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_inherited']}' />{$this->lang->words['sk_l_inherited_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/new.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_new']}' />{$this->lang->words['sk_l_new_full']}
 	</div>
 </div>
 
@@ -2078,7 +2300,6 @@ return $IPBHTML;
 /**
  * List template groups (skin files)
  *
- * @access	public
  * @param	array 		Template groups
  * @param	array		CSS files
  * @param	array 		Skin set data
@@ -2099,8 +2320,8 @@ $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['sk_editingset']}: {$setData['set_name']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=skinsets&amp;do=setEdit&amp;set_id={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/palette_edit.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editskinsettings']}</a></li>
-		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=replacements&amp;do=list&amp;setID={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_switch.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editreplacevar']}</a></li>
+		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=skinsets&amp;do=setEdit&amp;set_id={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/palette_edit.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editskinsettings']}</a></li>
+		<li><a href='{$this->settings['base_url']}app=core&amp;module=templates&amp;section=replacements&amp;do=list&amp;setID={$setData['set_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_switch.png' alt='{$this->lang->words['sk_icon']}' /> {$this->lang->words['sk_editreplacevar']}</a></li>
 	</ul>
 </div>
 
@@ -2180,28 +2401,28 @@ $IPBHTML .= <<<EOF
 		<div id='template_editor'></div>
 	</div>
 	
-	<div id='template_footer'>
-		<strong>{$this->lang->words['sk_legend']}:</strong> <img src='{$this->settings['skin_acp_url']}/_newimages/templates/default.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_default']}' />{$this->lang->words['sk_l_default_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/modified.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_modified']}' />{$this->lang->words['sk_l_modified_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/inherit.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_inherited']}' />{$this->lang->words['sk_l_inherited_full']}&nbsp;&nbsp;&nbsp;
-		<img src='{$this->settings['skin_acp_url']}/_newimages/templates/new.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_new']}' />{$this->lang->words['sk_l_new_full']}
+	<div id='template_footer' class='acp-actionbar'>
+		<strong>{$this->lang->words['sk_legend']}:</strong> <img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/default.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_default']}' />{$this->lang->words['sk_l_default_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/modified.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_modified']}' />{$this->lang->words['sk_l_modified_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/inherit.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_inherited']}' />{$this->lang->words['sk_l_inherited_full']}&nbsp;&nbsp;&nbsp;
+		<img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/new.png' alt='{$this->lang->words['sk_icon']}' title='{$this->lang->words['sk_l_new']}' />{$this->lang->words['sk_l_new_full']}
 	</div>
 	
 </div>
 
 <script type='text/javascript'>
 	ipb.templates['template_group'] = new Template("<li id='#{id}'>#{title}</li>");
-	ipb.templates['template_bit'] = new Template("<li id='#{id}'><img src='{$this->settings['skin_acp_url']}/_newimages/templates/#{icon}.png' alt='{$this->lang->words['sk_icon']}' title='#{icon}' /> #{title} <img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_delete.png' alt='{$this->lang->words['sk_icon']}' class='delete_icon' style='display: none' id='delete_bit_#{id}' /></li>");
-	ipb.templates['css_file'] = new Template("<li id='#{id}'><img src='{$this->settings['skin_acp_url']}/_newimages/templates/#{icon}.png' alt='{$this->lang->words['sk_icon']}' title='#{icon}' /> #{name} <img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_delete.png' alt='{$this->lang->words['sk_icon']}' class='delete_icon' style='display: none' id='delete_css_#{id}' /></li>");
+	ipb.templates['template_bit'] = new Template("<li id='#{id}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/#{icon}.png' alt='{$this->lang->words['sk_icon']}' title='#{icon}' /> #{title} <img src='{$this->settings['skin_acp_url']}/images/icons/bullet_delete.png' alt='{$this->lang->words['sk_icon']}' class='delete_icon' style='display: none' id='delete_bit_#{id}' /></li>");
+	ipb.templates['css_file'] = new Template("<li id='#{id}'><img src='{$this->settings['skin_acp_url']}/images/folder_components/templates/templates/#{icon}.png' alt='{$this->lang->words['sk_icon']}' title='#{icon}' /> #{name} <img src='{$this->settings['skin_acp_url']}/images/icons/bullet_delete.png' alt='{$this->lang->words['sk_icon']}' class='delete_icon' style='display: none' id='delete_css_#{id}' /></li>");
 	
 	/* TEMPLATES FOR POPUPS */
-	ipb.templates['form_add_bit'] = "<div class='acp-box'><h3>{$this->lang->words['sk_addbit']}</h3><ul class='acp-form'><li><label for='add_bit_name'>{$this->lang->words['sk_bitname']}:<br /><span class='desctext'>{$this->lang->words['sk_alphanumericonly']}</span></label><input type='text' class='input_text' id='add_bit_name'></li><li><label for='add_bit_group'>{$this->lang->words['sk_group']}:</label><select id='add_bit_group' class='input_select'></select></li><li><label for='add_bit_new_group'>{$this->lang->words['sk_newgroup']}:</label>skin_<input type='text' class='input_text' id='add_bit_new_group'></li><li><label for='add_bit_variables'>{$this->lang->words['sk_datavariables']}</label><input type='text' id='add_bit_variables' class='input_text' /></li></ul><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_add']}' class='realbutton' id='add_bit_submit' /></div></div>";
+	ipb.templates['form_add_bit'] = "<div class='acp-box'><h3>{$this->lang->words['sk_addbit']}</h3><table class='ipsTable'><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_bitname']}:</strong></td><td class='field_field'><input type='text' class='input_text' id='add_bit_name' /><br /><span class='desctext'>{$this->lang->words['sk_alphanumericonly']}</span></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_group']}:</strong></td><td class='field_field'><select id='add_bit_group' class='input_select'></select></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_newgroup']}:</strong></td><td class='field_field'>skin_<input type='text' class='input_text' id='add_bit_new_group' /></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_datavariables']}</strong></td><td class='field_field'><input type='text' id='add_bit_variables' class='input_text' /></td></tr></table><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_add']}' class='realbutton' id='add_bit_submit' /></div></div>";
 	
-	ipb.templates['form_add_css'] = "<div class='acp-box'><h3>{$this->lang->words['sk_addcssfile']}</h3><ul class='acp-form'><li><label for='add_css_name'>{$this->lang->words['sk_cssname']}:<br /><span class='desctext'>{$this->lang->words['sk_alphanumericonly']}</span></label><input type='text' class='input_text' id='add_css_name' />.css</li></ul><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_add']}' class='realbutton' id='add_css_submit' /></div></div>";
+	ipb.templates['form_add_css'] = "<div class='acp-box'><h3>{$this->lang->words['sk_addcssfile']}</h3><table class='ipsTable'><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_cssname']}:</strong></td><td class='field_field'><input type='text' class='input_text' id='add_css_name' />.css<br /><span class='desctext'>{$this->lang->words['sk_alphanumericonly']}</span></td></tr></table><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_add']}' class='realbutton' id='add_css_submit' /></div></div>";
 	
-	ipb.templates['edit_variables'] = new Template("<div class='acp-box'><h3>{$this->lang->words['sk_editvariables']}</h3><ul class='acp-form'><li><textarea class='input_text' id='variables_#{id}' rows='5' cols='30' style='width: 98%'>#{value}</textarea></li></ul><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['um_savechanges']}' class='realbutton' id='edit_variables_#{id}' /></div></div>");
+	ipb.templates['edit_variables'] = new Template("<div class='acp-box'><h3>{$this->lang->words['sk_editvariables']}</h3><table class='ipsTable'><tr><td><textarea class='input_text' id='variables_#{id}' rows='5' cols='30' style='width: 98%'>#{value}</textarea></td></tr></table><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['um_savechanges']}' class='realbutton' id='edit_variables_#{id}' /></div></div>");
 	
-	ipb.templates['css_properties'] = new Template("<div class='acp-box'><h3>{$this->lang->words['sk_editcssprops']}</h3><ul class='acp-form'><li><label for='cssposition_#{id}'>{$this->lang->words['sk_cssposition']}</label><select id='cssposition_#{id}'>#{cssposition}</select><br /><span class='desctext' style='margin-left: 10px;'>{$this->lang->words['sk_cssposition_desc']}</span></li><li><label for='cssattributes_#{id}'>{$this->lang->words['sk_cssattributes']}</label><input type='text' class='input_text' size='35' id='cssattributes_#{id}' value='#{attributes}' /><br /><span class='desctext' style='margin-left: 10px;'>{$this->lang->words['sk_cssattributes_desc']}</span></li><li><label for='cssapp_#{id}'>{$this->lang->words['sk_cssapp']}</label><input type='text' class='input_text' size='15' id='cssapp_#{id}' value='#{app}' /><br /><span class='desctext' style='margin-left: 10px;'>{$this->lang->words['sk_cssapp_desc']}</span></li><li><label for='cssmodules_#{id}'>{$this->lang->words['sk_cssmodules']}</label><input type='text' class='input_text' size='15' id='cssmodules_#{id}' value='#{modules}' /><br /><span class='desctext' style='margin-left: 10px;'>{$this->lang->words['sk_cssmodules_desc']}</span></li><li style='padding-left: 15px;'><input type='checkbox' id='cssapphide_#{id}' value='1' #{apphide} /> &nbsp;<strong>{$this->lang->words['sk_cssapphide']}</strong><br /><span class='desctext'>{$this->lang->words['sk_cssapphide_desc']}</span></li></ul><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_updateproperties']}' class='realbutton' id='save_properties_#{id}' /></div></div>");
+	ipb.templates['css_properties'] = new Template("<div class='acp-box'><h3>{$this->lang->words['sk_editcssprops']}</h3><table class='ipsTable'><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_cssposition']}</strong></td><td class='field_field'><select id='cssposition_#{id}'>#{cssposition}</select><br /><span class='desctext'>{$this->lang->words['sk_cssposition_desc']}</span></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_cssattributes']}</strong></td><td class='field_field'><input type='text' class='input_text' size='35' id='cssattributes_#{id}' value='#{attributes}' /><br /><span class='desctext'>{$this->lang->words['sk_cssattributes_desc']}</span></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_cssapp']}</strong></td><td class='field_field'><input type='text' class='input_text' size='15' id='cssapp_#{id}' value='#{app}' /><br /><span class='desctext'>{$this->lang->words['sk_cssapp_desc']}</span></td></tr><tr><td class='field_title'><strong class='title'>{$this->lang->words['sk_cssmodules']}</strong></td><td class='field_field'><input type='text' class='input_text' size='15' id='cssmodules_#{id}' value='#{modules}' /><br /><span class='desctext'>{$this->lang->words['sk_cssmodules_desc']}</span></td></tr><tr><td class='field_title'></td><td class='field_field'><input type='checkbox' id='cssapphide_#{id}' value='1' #{apphide} /> &nbsp;<strong>{$this->lang->words['sk_cssapphide']}</strong><br /><span class='desctext'>{$this->lang->words['sk_cssapphide_desc']}</span></td></tr></table><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_updateproperties']}' class='realbutton' id='save_properties_#{id}' /></div></div>");
 	
 	acp.tabbedEditor.wrapId = 'right_pane';
 	acp.tabbedEditor.callbacks['open']   = acp.template_editor.CALLBACK_editor_loaded;
@@ -2228,7 +2449,6 @@ return $IPBHTML;
 /**
  * Form to import/export skin sets, replacements, images
  *
- * @access	public
  * @param	array 		Skin sets
  * @param	array		Form data
  * @param	array 		Warnings
@@ -2240,34 +2460,30 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_importexport');
-ipbAcpTabStrips.doToggle($('tabtab-1'));
-});
- //]]>
-</script>
-
 <div class='section_title'>
 	<h2>{$this->lang->words['ss_importexport']}</h2>
 </div>
 
-<ul id='tabstrip_importexport' class='tab_bar no_title'>
-	<li id='tabtab-1'>{$this->lang->words['sk_import']}</li>
-	<li id='tabtab-2'>{$this->lang->words['sk_export']}</li>
-</ul>
-
-<div id='tabpane-1'>
-	<div class='acp-box'>
+<a name='#tabpane'></a>
+<div class='acp-box'>
+	<h3>{$this->lang->words['ss_importexport']}</h3>
+<div class='ipsTabBar' id='tabstrip'>
+	<ul>
+		<li id='tab_1' class='active'>
+			{$this->lang->words['sk_import']}
+		</li>
+		<li id='tab_2'>
+			{$this->lang->words['sk_export']}
+		</li>
+	</ul>
+</div></div>
+<br /><br />
+<div id='tabContent' class='ipsTabBar_content'>
+	<div id='tab_1_content'>
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=importSet' enctype="multipart/form-data" id='import1' method='POST'>
-			<input name="MAX_FILE_SIZE" value="10000000000" type="hidden">
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad' style='margin-bottom: 10px;'>
-				<tr>
-					<th colspan='2'>{$this->lang->words['sk_importskinset']}</th>
-				</tr>
+			<h3>{$this->lang->words['sk_importskinset']}</h3>
+			<table class='ipsTable double_pad'>
 EOF;
 				if ( $warnings['importSkinCacheDir'] )
 				{
@@ -2280,62 +2496,61 @@ EOF;
 				
 				$IPBHTML .= <<<EOF
 				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_uploadxmlarchive']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_uploadxmlarchive']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['uploadField']}<br />
 						<span class='desctext'>{$this->lang->words['sk_xmlorxmlgz']}</span>
 					</td>
-					<td style='width: 60%'>
-						{$form['uploadField']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_ornamearchive']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_ornamearchive']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importLocation']}<br />
 						<span class='desctext'>{$this->lang->words['sk_intoroot']}</span>
 					</td>
-					<td>
-						{$form['importLocation']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_newsetname']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_newsetname']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importName']}<br />
 						<span class='desctext'>{$this->lang->words['sk_leaveblank']}</span>
 					</td>
-					<td>
-						{$form['importName']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_upgrade']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_upgrade']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importUpgrade']}<br />
 						<span class='desctext'>{$this->lang->words['sk_doupgrade']}</span>
 					</td>
-					<td>
-						{$form['importUpgrade']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_useimageset']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_useimageset']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importImgDirs']}<br />
 						<span class='desctext'>{$this->lang->words['sk_useimageset_info']}</span>
 					</td>
-					<td>
-						{$form['importImgDirs']}
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_importskinset']}' class='realbutton' /></td>
 				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_importskinset']}' class='realbutton' />
+			</div>
 		</form>
-		
+		</div>
+		<br />
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=importImages' enctype="multipart/form-data" id='import1' method='POST'>
-			<input name="MAX_FILE_SIZE" value="10000000000" type="hidden">
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad' style='margin-bottom: 10px;'>
-				<tr>
-					<th colspan='2'>{$this->lang->words['sk_importimgset']}</th>
-				</tr>
+			<h3>{$this->lang->words['sk_importimgset']}</h3>
+			<table class='ipsTable double_pad'>
 EOF;
 				if ( $warnings['importImgDir'] )
 				{
@@ -2348,115 +2563,111 @@ EOF;
 				
 				$IPBHTML .= <<<EOF
 				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_uploadimgxml']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_uploadimgxml']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['uploadField']}<br />
 						<span class='desctext'>{$this->lang->words['sk_xmlorxmlgz']}</span>
 					</td>
-					<td style='width: 60%'>
-						{$form['uploadField']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_ornamearchive']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_ornamearchive']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importLocation']}<br />
 						<span class='desctext'>{$this->lang->words['sk_intoroot']}</span>
 					</td>
-					<td>
-						{$form['importLocation']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_newimgsetname']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_newimgsetname']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importName']}<br />
 						<span class='desctext'>{$this->lang->words['sk_leaveblank']}</span>
 					</td>
-					<td>
-						{$form['importName']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_applytoskin']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_applytoskin']}</strong>
+					</td>
+					<td class='field_field'>
+						<select name='setID'><option value='0'>-{$this->lang->words['sk_none']}-</option>{$sets}</select><br />
 						<span class='desctext'>{$this->lang->words['sk_applytoskin_info']}</span>
 					</td>
-					<td>
-						<select name='setID'><option value='0'>-{$this->lang->words['sk_none']}-</option>{$sets}</select>
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_importimgset']}' class='realbutton'/></td>
 				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_importimgset']}' class='realbutton' />
+			</div>
 		</form>
-		
+		</div>
+		<br />
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=importReplacements' enctype="multipart/form-data" id='import1' method='POST'>
-			<input name="MAX_FILE_SIZE" value="10000000000" type="hidden">
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad'>
+			<h3>{$this->lang->words['sk_importreplacements']}</h3>
+			<table class='ipsTable double_pad'>
 				<tr>
-					<th colspan='2'>{$this->lang->words['sk_importreplacements']}</th>
-				</tr>
-				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_uploadxmlreplace']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_uploadxmlreplace']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['uploadField']}<br />
 						<span class='desctext'>{$this->lang->words['sk_xmlorxmlgz']}</span>
 					</td>
-					<td style='width: 60%'>
-						{$form['uploadField']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_ornamearchive']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_ornamearchive']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['importLocation']}<br />
 						<span class='desctext'>{$this->lang->words['sk_intoroot']}</span>
 					</td>
-					<td>
-						{$form['importLocation']}
-					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['sk_applytoskin']}</strong>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_applytoskin']}</strong>
 					</td>
-					<td>
+					<td class='field_field'>
 						<select name='setID'>{$sets}</select>
 					</td>
 				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_importreplacements']}' class='realbutton'/></td>
-				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_importreplacements']}' class='realbutton' />
+			</div>
 		</form>
+		</div>
 	</div>
-</div>
-	
-<div id='tabpane-2' class='formmain-background'>
-	<div class='acp-box'>
+	<div id='tab_2_content'>
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=exportSet' id='export1' method='POST'>
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad' style='margin-bottom: 10px;'>
+			<h3>{$this->lang->words['sk_exporttemplates']}</h3>
+			<table class='ipsTable double_pad'>
 				<tr>
-					<th colspan='2'>{$this->lang->words['sk_exporttemplates']}</th>
-				</tr>
-				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_skinset']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_skinset']}</strong>
+					</td>
+					<td class='field_field'>
+						<select name='setID'>{$sets}</select><br />
 						<span class='desctext'>{$this->lang->words['sk_xs_info']}</span>
 					</td>
-					<td style='width: 60%'>
-						<select name='setID'>{$sets}</select>
-					</td>
 				</tr>
 				<tr>
-					<td valign='top'>
-						<strong>{$this->lang->words['sk_for_apps']}</strong><br />
-						<span class='desctext'>{$this->lang->words['sk_for_apps_desc']}</span>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_for_apps']}</strong>
 					</td>
-					<td>
-						<p><input type='checkbox' name='exportApps[core]' value='1' checked='checked' /> IP.Board <em>({$this->lang->words['export_inc_cal_etc']})</em></p>
+					<td class='field_field'>
+						<p><input type='checkbox' name='exportApps[core]' value='1' checked='checked' /> IP.Board</p><br />
+						<span class='desctext'>{$this->lang->words['sk_for_apps_desc']}</span>
 EOF;
 
 foreach( ipsRegistry::$applications as $appDir => $app_data )
 {
-	if ( $appDir != 'core' AND $appDir != 'forums' AND $appDir != 'members'  AND $appDir != 'calendar'  AND $appDir != 'portal' AND $appDir != 'chat' )
+	if ( $appDir != 'core' AND $appDir != 'forums' AND $appDir != 'members' )
 	{
 		$IPBHTML .= "<p><input type='checkbox' name='exportApps[{$appDir}]' value='1'  checked='checked' /> {$app_data['app_title']}</p>\n";
 	}
@@ -2466,62 +2677,65 @@ $IPBHTML .= <<<EOF
 					</td>
 				</tr>
 				<tr>
-					<td>
-						<strong>{$this->lang->words['a_options']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['a_options']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['exportSetOptions']}<br />
 						<span class='desctext'>{$this->lang->words['sk_xs_info2']}</span>
 					</td>
-					<td>
-						{$form['exportSetOptions']}
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_exporttemplates']}' class='realbutton'/></td>
 				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_exporttemplates']}' class='realbutton' />
+			</div>
 		</form>
-		
+		</div>
+		<br />
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=exportImages' id='export2' method='POST'>
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad' style='margin-bottom: 10px;'>
+			<h3>{$this->lang->words['sk_exportimages']}</h3>
+			<table class='ipsTable double_pad'>
 				<tr>
-					<th colspan='2'>{$this->lang->words['sk_exportimages']}</th>
-				</tr>
-				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_imageset']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_imageset']}</strong>
+					</td>
+					<td class='field_field'>
+						<select name='setID'>{$sets}</select><br />
 						<span class='desctext'>{$this->lang->words['sk_xr_info']}</span>
 					</td>
-					<td style='width: 60%'>
-						<select name='setID'>{$sets}</select>
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_exportimages']}' class='realbutton'/></td>
 				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_exportimages']}' class='realbutton' />
+			</div>
 		</form>
-		
+		</div>
+		<br />
+		<div class='acp-box'>
 		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=exportReplacements' id='export3' method='POST'>
-			<table width='100%' cellpadding='0' cellspacing='0' class='alternate_rows double_pad'>
+			<h3>{$this->lang->words['sk_exportreplaces']}</h3>
+			<table class='ipsTable double_pad'>
 				<tr>
-					<th colspan='2'>{$this->lang->words['sk_exportreplaces']}</th>
-				</tr>
-				<tr>
-					<td style='width: 40%'>
-						<strong>{$this->lang->words['sk_fromskinset']}</strong><br />
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['sk_fromskinset']}</strong>
+					</td>
+					<td class='field_field'>
+						<select name='setID'>{$sets}</select><br />
 						<span class='desctext'>{$this->lang->words['sk_xr_info']}</span>
 					</td>
-					<td style='width: 60%'>
-						<select name='setID'>{$sets}</select>
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' class='acp-actionbar'><input type='submit' value='{$this->lang->words['sk_exportreplaces']}' class='realbutton'/></td>
 				</tr>
 			</table>
+			<div class="acp-actionbar">
+				<input type='submit' value='{$this->lang->words['sk_exportreplaces']}' class='realbutton' />
+			</div>
 		</form>
+		</div>
 	</div>
 </div>
-
+<script type='text/javascript'>
+	jQ("#tabstrip").ipsTabBar({tabWrap: "#tabContent"});
+</script>
 EOF;
 
 //--endhtml--//
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_tools.php b/upload/admin/applications/core/skin_cp/cp_skin_tools.php
index f07d1f14..20d9fd07 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_tools.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_tools.php
@@ -1,32 +1,63 @@
 <?php
 /**
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP Tools skin file
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-09-08 18:01:45 -0400 (Thu, 08 Sep 2011) $
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6925 $
+ * @version		$Revision: 9470 $
  */
  
-class cp_skin_tools extends output
+class cp_skin_tools
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 //===========================================================================
 // Manage EMail Rules
@@ -39,28 +70,34 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['ie_title']}</h2>
 	
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' /> {$this->lang->words['ie_add']}</a></li>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='{$this->lang->words['ie_add']}' />{$this->lang->words['ie_add']}</a>
+			</li>
 HTML;
 	if ( $this->settings['pop3_user'] )
 	{
 		$IPBHTML .= <<<HTML
-		<li><a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=test'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['ie_test_pop3']}</a></li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=test'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' />{$this->lang->words['ie_test_pop3']}</a>
+			</li>
 HTML;
 	}
 	$IPBHTML .= <<<HTML
-	</ul>
+		</ul>
+	</div>
 </div>
 
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['ie_title']}</h3>
-	<table width='100%' class='alternate_rows'>
+	<table class='ipsTable double_pad'>
 		<tr>
 			<th width='2%'>&nbsp;</th>
 			<th>{$this->lang->words['ie_criteria']}</th>
 			<th>{$this->lang->words['ie_action']}</th>
-			<th width='1%'>&nbsp;</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 HTML;
 
@@ -70,16 +107,19 @@ if ( !empty( $rows ) )
 	foreach( $rows as $r )
 	{
 	$IPBHTML .= <<<HTML
-			<tr>
+			<tr class='ipsControlRow'>
 				<td>&nbsp;</td>
 				<td>{$r['criteria']}</td>
 				<td>{$r['action']}</td>
-				<td>
-					<img id="tbmenu{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' class='ipbmenu' />
-					<ul class='acp-menu' id='tbmenu{$r['id']}_menucontent'>
-						<li class='icon edit'><a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=edit&amp;id={$r['id']}'>{$this->lang->words['edit']}</a></li>
-						<li class='icon delete'><a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=delete&amp;id={$r['id']}'>{$this->lang->words['delete']}</a></li>
-					</ul>	
+				<td class='col_buttons'>
+					<ul class='ipsControlStrip'>
+						<li class='i_edit'>
+							<a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=edit&amp;id={$r['id']}' title='{$this->lang->words['edit']}'>{$this->lang->words['edit']}</a>
+						</li>
+						<li class='i_delete'>
+							<a href='{$this->settings['base_url']}module=tools&amp;section=incomingEmails&amp;do=delete&amp;id={$r['id']}' title='{$this->lang->words['delete']}'>{$this->lang->words['delete']}</a>
+						</li>
+					</ul>
 				</td>
 			</tr>
 HTML;
@@ -153,16 +193,24 @@ $IPBHTML .= <<<HTML
 	<h3>{$title}</h3>
 	<form action='{$this->settings['base_url']}{$this->form_code}&amp;do=save' method='post'>
 	<input type='hidden' name='id' value='{$id}' />
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label><strong>{$this->lang->words['ie_rule']}</strong></label>
-			{$form['criteria_field']} {$form['criteria_type']} {$form['criteria_value']}
-		</li>
-		<li>
-			<label><strong>{$this->lang->words['ie_action']}</strong></label>
-			{$form['action']}
-		</li>
-	</ul>	
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['ie_rule']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['criteria_field']} {$form['criteria_type']} {$form['criteria_value']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['ie_action']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['action']}
+			</td>
+		</tr>
+	</table>	
 	<div class="acp-actionbar">
 		<input type='submit' value='{$this->lang->words['ie_save']}' class='realbutton'>
 	</div>
@@ -177,6 +225,157 @@ return $IPBHTML;
 //===========================================================================
 // License Activation Form
 //===========================================================================
+public function activateForm( $keyInput, $domainInput ){
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<HTML
+<div class='section_title'>
+	<h2>{$this->lang->words['ipssoftware_license']}</h2>
+</div>
+
+<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm' id='theAdminForm'>
+	<input type='hidden' name='do' value='activate'>
+	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
+
+	<div class='acp-box'>
+		<h3>{$this->lang->words['license_activate']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['license_key']}</strong>
+				</td>
+				<td class='field_field'>
+					{$keyInput}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['license_url']}</strong>
+				</td>
+				<td class='field_field'>
+					{$domainInput}
+				</td>
+			</tr>
+		</table>
+		<div class='acp-actionbar'>
+			<input type='submit' value='{$this->lang->words['license_activate']}' class='button primary' accesskey='s'>
+		</div>
+	</div>
+</form>
+<br />
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+//===========================================================================
+// License Key Status
+//===========================================================================
+public function licenseKeyStatusScreen( $licenseKey, $licenseData ){
+$IPBHTML = "";
+//--starthtml--//
+
+$cacheStr	= sprintf( $this->lang->words['license_cache'], $licenseData['_cached_date'], "{$this->settings['base_url']}{$this->form_code}&refresh=1" );
+$expires	= ( $licenseData['key']['_expires'] == 9999999999 ) ? $this->lang->words['license_lifetime'] : $this->registry->class_localization->getDate( $licenseData['key']['_expires'], 'DATE', true );
+
+$IPBHTML .= <<<HTML
+<div class='information-box'>{$cacheStr}</div>
+<br />
+	<div class='section_title'>
+		<h2>{$this->lang->words['license_key']}</h2>
+		
+		<div class='ipsActionBar clearfix'>
+			<ul>
+				<li class='ipsActionButton'>
+					<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=remove");'><img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='' />{$this->lang->words['removelicensekey']}</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+<div class='acp-box'> 
+	<h3>{$this->lang->words['license_key']}: {$licenseKey}</h3> 
+	<table class='ipsTable alternate_rows double_pad'> 
+		<tr> 
+			<td style='width: 3%'> 
+				<img src='{$this->settings['skin_acp_url']}/images/icons/{$licenseData['key']['status_icon']}' /> 
+			</td> 
+			<td style='width: 77%'> 
+				<strong>{$licenseData['key']['name']}</strong><br /> 
+				<span class='desctext'>{$licenseData['key']['msg']}</span> 
+			</td> 
+			<td style='width: 20%;'> 
+				{$this->lang->words['expires_prefix']} {$expires}
+			</td> 
+		</tr>
+HTML;
+
+if( is_array( $licenseData['ipbMain'] ) && count( $licenseData['ipbMain'] ) )
+{
+$IPBHTML .= <<<HTML
+		<tr>
+			<th colspan='3'>{$this->lang->words['license_services']}</td>
+		</tr>
+HTML;
+
+	foreach( $licenseData['ipbMain'] as $r )
+	{
+		$r['expires']	= $r['_expires'] ? $this->lang->words['expires_prefix'] . ' ' . $this->registry->class_localization->getDate( $r['_expires'], 'DATE', true ) : $r['expires'];
+		
+$IPBHTML .= <<<HTML
+	<tr> 
+		<td style='width: 3%'> 
+			<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['status_icon']}' /> 
+		</td> 
+		<td style='width: 77%'> 
+			<strong>{$r['name']}</strong><br /> 
+			<span class='desctext'>{$r['msg']}</span> 
+		</td> 
+		<td style='width: 20%'> 
+			{$r['expires']}
+		</td> 
+	</tr>
+HTML;
+	}
+}
+
+if( is_array( $licenseData['addons'] ) && count( $licenseData['addons'] ) )
+{
+$IPBHTML .= <<<HTML
+		<tr>
+			<th colspan='3'>{$this->lang->words['license_addons']}</td>
+		</tr>
+HTML;
+
+	foreach( $licenseData['addons'] as $r )
+	{
+		$r['expires']	= $r['_expires'] ? $this->lang->words['expires_prefix'] . ' ' . $this->registry->class_localization->getDate( $r['_expires'], 'DATE', true ) : $r['expires'];
+
+$IPBHTML .= <<<HTML
+	<tr> 
+		<td style='width: 3%'> 
+			<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['status_icon']}' alt='information' /> 
+		</td> 
+		<td style='width: 77%'> 
+			<strong>{$r['name']}</strong><br /> 
+			<span class='desctext'>{$r['msg']}</span> 
+		</td> 
+		<td style='width: 20%'> 
+			{$r['expires']}
+		</td> 
+	</tr>
+HTML;
+	}
+}
+
+$IPBHTML .= <<<HTML
+	</table> 
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
 
 //===========================================================================
 // Sharelinks Form
@@ -186,36 +385,54 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
+<div class='section_title'>
+	<h2>{$title}</h2>
+</div>
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm' id='theAdminForm'>
 	<input type='hidden' name='do' value='{$do}' />
 	<input type='hidden' name='id' value='{$id}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	
 	<div class='acp-box'>
-		<h3>{$title}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['sl_form_enabled']}</label>
-				{$form['share_enabled']}
-			</li>
-			<li>
-				<label>{$this->lang->words['sl_form_title']}</label>
-				{$form['share_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['sl_form_key']}<span class='desctext'>{$this->lang->words['sl_form_key_info']}</span></label>
-				{$form['share_key']}
-			</li>
-			<li>
-				<label>{$this->lang->words['sl_form_canonical']}</label>
-				{$form['share_canonical']}
-			</li>
-		</ul>
+		<h3>{$this->lang->words['sl_form_main_title']}</h3>
+		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sl_form_enabled']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['share_enabled']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sl_form_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['share_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sl_form_key']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['share_key']}<br />
+					<span class='desctext'>{$this->lang->words['sl_form_key_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['sl_form_canonical']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['share_canonical']}
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$button}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$button}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form>
@@ -236,9 +453,13 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['sl_m_title']}</h2>
 	
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}do=add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' /> {$this->lang->words['sl_add']}</a></li>
-	</ul>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' />{$this->lang->words['sl_add']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 
@@ -246,58 +467,52 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['sl_current_title']}</h3>
 	
-	<table width='100%' class='alternate_rows'>
+	<table id='share_services' class='ipsTable alternate_rows'>
 		<tr>
+			<th class='col_drag'>&nbsp;</th>
 			<th width='2%'>&nbsp;</th>
-			<th width='2%'>&nbsp;</th>
-			<th width='95%'>{$this->lang->words['sl_title']}</th>
-			<th width='1%'>&nbsp;</th>
+			<th>{$this->lang->words['sl_title']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
-	</table>
-	<ul id='share_handle' class='alternate_rows'>
+	<!--<ul id='share_handle' class='alternate_rows'>-->
 HTML;
 
+$_public	= PUBLIC_DIRECTORY;
+
 foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
-		<li class='isDraggable' style='width:100%;' id='share_{$r['share_id']}'>
-			<table width='100%' class='alternate_rows'>
-				<tr>
-					<td width='2%'><div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' /></div></td>
-					<td width='2%'><img src='{$this->settings['board_url']}/public/style_extra/sharelinks/{$r['share_key']}.png'></td>
-					<td width='95%'>{$r['share_title']}</td>
-					<td width='1%'>
-						<img id="tbmenu{$r['share_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' class='ipbmenu' />
-						<ul class='acp-menu' id='tbmenu{$r['share_id']}_menucontent'>
-							<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;share_id={$r['share_id']}'>{$this->lang->words['sl_editbook']}...</a></li>
-							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=delete&amp;share_id={$r['share_id']}");'>{$this->lang->words['sl_deletebook']}...</a></li>
-						</ul>	
-					</td>
-				</tr>
-			</table>
-		</li>
+		<tr class='ipsControlRow isDraggable' id='share_{$r['share_id']}'>
+			<td class='col_drag'>
+				<span class='draghandle'></span>
+			</td>
+			<td>
+				<img src='{$this->settings['board_url']}/{$_public}/style_extra/sharelinks/{$r['share_key']}.png'>
+			</td>
+			<td style='width: 100%'>
+				<strong>{$r['share_title']}</strong>
+			</td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit&amp;share_id={$r['share_id']}' title='{$this->lang->words['sl_editbook']}...'>{$this->lang->words['sl_editbook']}...</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=delete&amp;share_id={$r['share_id']}");' title='{$this->lang->words['sl_deletebook']}...'>{$this->lang->words['sl_deletebook']}...</a>
+					</li>
+				</ul>
+			</td>
+		</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-	</ul>
+	</table>
 </div>
-
-<script type="text/javascript">
-	dragDropper = function( draggableObject, mouseObject )
-	{
-		var options = {
-						method : 'post',
-						parameters : Sortable.serialize( 'share_handle', { tag: 'li', name: 'share' } )
-					};
-		 
-		new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-		
-		return false;
-	};
-		
-	Sortable.create( 'share_handle', { only: 'isDraggable', revert: true, format: 'share_([0-9]+)', onUpdate: dragDropper, handle: 'draghandle' } );
-		
+<script type='text/javascript'>
+	jQ("#share_services").ipsSortable('table', { 
+		url: "{$this->settings['base_url']}&{$this->form_code_js}do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )
+	} );
 </script>
 HTML;
 
@@ -308,7 +523,6 @@ return $IPBHTML;
 /**
  * User agents group form
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Form title
  * @param	string		Action code
@@ -326,70 +540,45 @@ $_json      = json_encode( array( 'uagents' => $userAgents ) );
 $_groupJSON = ( is_array( $ugroup['_groupArray'] ) AND count( $ugroup['_groupArray'] ) ) ? json_encode( $ugroup['_groupArray'] ) : '{}';
 
 $IPBHTML .= <<<EOF
-<!--SKINNOTE: CSS directly in skin file here-->
-<style type='text/css'>
-/*
-ALL THESE ARE USED WITHIN ipb3uAgents.js
-*/
+<div class='section_title'>
+	<h2>{$title}</h2>
+</div>
 
-/*.uAgentsGHover
-{
-	background-color: #D3DAE4;
-	background-image: url("{$this->settings['skin_acp_url']}/images/acpMenuMore.png");
-	background-repeat: no-repeat;
-	background-position: center right;
-	cursor: pointer;
-	padding:8px;
-}
-
-.uAgentsGRow
-{
-	padding:8px;
-	border-bottom:1px solid #ddd;
-}
-
-.uAgentsGRHover
-{
-	background-color: #D3DAE4;
-	cursor: pointer;
-	padding:8px;
-}
-
-.uAgentsGRRow
-{
-	padding:8px;
-	border-bottom:1px solid #ddd;
-}*/
-</style>
 <script type="text/javascript" src="{$this->settings['js_app_url']}ipb3uAgents.js"></script>
-<form id='uAgentsForm' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;ugroup_id={$ugroup['ugroup_id']}' method='post'>
-<input id='uAgentsData' type='hidden' name='uAgentsData' value='$_groupJSON' />
+<form id='uAgentsForm' action='{$this->settings['base_url']}{$this->form_code}&amp;do={$formcode}&amp;ugroup_id={$ugroup['ugroup_id']}' method='post'>
+<input id='uAgentsData' type='hidden' name='uAgentsData' value='{$_groupJSON}' />
 <div class='acp-box'>
-	<h3>$title</h3>
-	<ul class='acp-form alternate_rows'>
-		<li>
-			<label>{$this->lang->words['t_uatitle']}</label>
-			{$form['ugroup_title']}
-		</li>
-	</ul>
-	<div class='acp-row-off' id='uagents_groups'>
-		<table width='100%' cellpadding='0' cellspacing='0'>
-			<tr>
-				<th style='width: 50%'>{$this->lang->words['t_uaallavail']}</th>
-				<th style='width: 50%'>{$this->lang->words['t_uagroups']}</th>
-			</tr>
-			<tr>
-				<td style='padding: 8px'>
-					<div id='tplate_agentsList' class='uagent_list'></div>
-				</td>
-				<td>
-					<div id='tplate_groupList' class='uagent_list'></div>
-				</td>
-			</tr>
-		</table>
-	</div>
+	<h3>{$title}</h3>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['t_uatitle']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['ugroup_title']}
+			</td>
+		</tr>
+		<tr>
+			<td colspan='2' class='no_pad'>
+					<table class='ipsTable'>
+						<tr>
+							<th style='width: 50%'>{$this->lang->words['t_uaallavail']}</th>
+							<th style='width: 50%'>{$this->lang->words['t_uagroups']}</th>
+						</tr>
+						<tr>
+							<td style='padding: 8px; vertical-align: top;'>
+								<div id='tplate_agentsList' class='uagent_list'></div>
+							</td>
+							<td style='vertical-align: top;'>
+								<div id='tplate_groupList' class='uagent_list'></div>
+							</td>
+						</tr>
+					</table>
+			</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-	 	<input type='button'  class="button primary" value=' $button ' onclick='IPB3UAgents.saveGroupForm()' />
+	 	<input type='button'  class="button primary" value='{$button}' onclick='IPB3UAgents.saveGroupForm()' />
 	</div>
 </div>
 </form>
@@ -414,19 +603,19 @@ ALL THESE ARE USED WITHIN ipb3uAgents.js
 		</div>	
 	</div>
 	<div id='tplate_versionsEditor'>
-		<div id='tplate_versions_#{uagent_id}' class='tableborder' style='width:500px'>
-			<div class='tableheaderalt'>{$this->lang->words['t_uaediting']} #{uagent_name}</div>
-			<div class='tablerow2' style='padding:10px'>
+		<div id='tplate_versions_#{uagent_id}' class='acp-box' style='width:500px'>
+			<h3>{$this->lang->words['t_uaediting']} #{uagent_name}</h3>
+			<div class='row2' style='padding:10px'>
 				<div>
 					{$this->lang->words['t_ua_info']}
 				</div>
 				{$this->lang->words['uaversions']}
 				<input type='text' id='tplate_versionsBox_#{uagent_id}' value='#{uagent_versions}' style='width:100%;' />
 			</div>
-			<div class='tablerow2' style='text-align:right;'>
-				<input type='button'  class="button primary" value=' {$this->lang->words['t_uasave']} ' onclick='IPB3UAgents.saveAgentVersion(#{uagent_id})' />
+			<div class='acp-actionbar' style='text-align:right;'>
+				<input type='button' class="button primary" value='{$this->lang->words['t_uasave']}' onclick='IPB3UAgents.saveAgentVersion(#{uagent_id})' />
 				&nbsp;
-				<input type='button'  class="button primary" value=' {$this->lang->words['t_uaclose']} ' onclick='IPB3UAgents.cancelAgentVersion(#{uagent_id})' />
+				<input type='button' class="button" value='{$this->lang->words['t_uaclose']}' onclick='IPB3UAgents.cancelAgentVersion(#{uagent_id})' />
 			</div>
 		</div>
 	</div>
@@ -434,8 +623,8 @@ ALL THESE ARE USED WITHIN ipb3uAgents.js
 <!-- /templates -->
 <script type='text/javascript'>
 	var IPB3UAgents              = new IPBUAgents();
-	IPB3UAgents.uAgentsData      = $_json;
-	IPB3UAgents.uAgentsGroupData = $_groupJSON;
+	IPB3UAgents.uAgentsData      = {$_json};
+	IPB3UAgents.uAgentsGroupData = {$_groupJSON};
 	IPB3UAgents.groupFormInit();
  //]]>
 </script>
@@ -448,7 +637,6 @@ return $IPBHTML;
 /**
  * User agents groups wrapper
  *
- * @access	public
  * @param	array 		User agent groups
  * @return	string		HTML
  */
@@ -460,14 +648,22 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['t_ua_groups']}</h2>
-	
+EOF;
+
+if ( $this->registry->class_permissions->checkPermission( 'ua_manage' ) )
+{
+	$IPBHTML .= <<<EOF
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=uagents&amp;do=groupAdd' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['ua_addnewbutton']}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=uagents&amp;do=groupAdd' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['ua_addnewbutton']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}' title='{$this->lang->words['tua_manage']}'><img src='{$this->settings['skin_acp_url']}/images/icons/world.png' alt='' />{$this->lang->words['tua_manage']}</a></li>
 	</ul>
+EOF;
+}
+$IPBHTML .= <<<EOF
 </div>
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ua_groups']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable double_pad alternate_rows'>
 		
 EOF;
 
@@ -476,20 +672,29 @@ if ( is_array( $userAgentGroups ) AND count( $userAgentGroups ) )
 	foreach( $userAgentGroups as $ugroup_id => $data )
 	{
 		$IPBHTML .= <<<EOF
-		<tr>
+		<tr class='ipsControlRow'>
 			<td>
-				<div style='float:left;padding-top:2px;'>
-					<img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/group.png' />
-					<strong>{$data['ugroup_title']}</strong>
-				</div>
+				<img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/group.png' style='vertical-align: bottom;' />
+				<strong>{$data['ugroup_title']}</strong>
 				
-				<div align='right' style='height:20px;padding:0px 5px 0px 0px;'>
+				<div class='col_buttons right'>
 					<span class='desctext'>{$data['_arrayCount']}</span> &nbsp;
 					&nbsp; 
-					<img class="ipbmenu" id="menu{$data['ugroup_id']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">
-					<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id='menu{$data['ugroup_id']}_menucontent'>
-						<li class='icon edit' style="z-index: 10000;" class="acp-row-off"><a style="z-index: 10000;" href='{$this->settings['base_url']}{$this->form_code}&amp;do=groupEdit&amp;ugroup_id={$data['ugroup_id']}'>{$this->lang->words['t_ua_editg']}</a></li>
-						<li class='icon delete' style="z-index: 10000;" class="acp-row-off"><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=groupRemove&amp;ugroup_id={$data['ugroup_id']}");'>{$this->lang->words['t_ua_removeg']}</a></li>
+					<ul class='ipsControlStrip'>
+EOF;
+				if ( $this->registry->class_permissions->checkPermission( 'ua_manage' ) )
+				{
+					$IPBHTML .= <<<EOF
+						<li class='i_edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}{$this->form_code}&amp;do=groupEdit&amp;ugroup_id={$data['ugroup_id']}' title='{$this->lang->words['t_ua_editg']}'>{$this->lang->words['t_ua_editg']}</a></li>
+EOF;
+				}
+				if ( $this->registry->class_permissions->checkPermission( 'ua_remove' ) )
+				{
+					$IPBHTML .= <<<EOF
+						<li class='i_delete'><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=groupRemove&amp;ugroup_id={$data['ugroup_id']}");' title='{$this->lang->words['t_ua_removeg']}'>{$this->lang->words['t_ua_removeg']}</a></li>
+EOF;
+				}
+					$IPBHTML .= <<<EOF
 					</ul>
 				</div>
 			</td>
@@ -502,7 +707,17 @@ else
  	$nonesetup = sprintf( $this->lang->words['t_ua_none'], $this->settings['base_url'] );
 	$IPBHTML .= <<<EOF
 		<tr>
-			<td>{$nonesetup}</td>
+			<td class='no_messages'>
+				{$nonesetup}
+EOF;
+			if ( $this->registry->class_permissions->checkPermission( 'ua_manage' ) )
+			{
+				$IPBHTML .= <<<EOF
+				 <a href='{$this->settings['base_url']}&amp;module=tools&amp;section=uagents&amp;do=groupAdd' class='mini_button'>{$this->lang->words['ua_addnewbutton']}</a>
+EOF;
+			}
+				$IPBHTML .= <<<EOF
+			</td>
 		</tr>
 EOF;
 
@@ -520,7 +735,6 @@ return $IPBHTML;
 /**
  * List the user agents
  *
- * @access	public
  * @param	array 		User agents
  * @return	string		HTML
  */
@@ -533,14 +747,25 @@ $_json    = json_encode( array( 'uagents' => $userAgents ) );
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['t_uamanagement']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='#' id='add_uagent' title='{$this->lang->words['t_uaaddnew']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/world_add.png' alt='' />
-				{$this->lang->words['t_uaaddnew']}
-			</a>
-		</li>
-	</ul>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='#' id='add_uagent' title='{$this->lang->words['t_uaaddnew']}'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/world_add.png' alt='' />
+					{$this->lang->words['t_uaaddnew']}
+				</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=groupsList' title='{$this->lang->words['t_uamanagegroup']}'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' />
+					{$this->lang->words['t_uamanagegroup']}
+				</a>
+			</li>
+			<li class='ipsActionButton inDev'>
+				<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rebuildMaster"><img src='{$this->settings['skin_acp_url']}/images/icons/import.png' alt='' /> {$this->lang->words['ua_rebuild_master']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 EOF;
@@ -570,20 +795,26 @@ EOF;
 			{
 			$IPBHTML .= <<<EOF
 				<li id='uagent_{$agent['uagent_id']}' class='isDraggable'>
-					<table width='100%' class='double_pad'>
-						<tr>
-							<td style='width: 2%; text-align: center'>
-								<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
+					<table class='ipsTable'>
+						<tr class='ipsControlRow'>
+							<td>
+								<div class='draghandle'>&nbsp;</div>
 							</td>
 							<td style='width: 2%; text-align: center'>
-								<img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/type_{$agent['uagent_type']}.png' alt='Icon' />
+								<img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/type_{$agent['uagent_type']}.png' alt='' />
 							</td>
 							<td style='width: 78%'>
 								<strong>{$agent['uagent_name']}</strong>
 							</td>
-							<td style='width: 18%; text-align: right'>
-								<span class='dropdown-button' title='{$this->lang->words['t_uaedit']}: {$agent['uagent_name']}' id='agent_{$agent['uagent_id']}_edit'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='{$this->lang->words['sk_icon']}' /></span>
-								<span class='dropdown-button' title='{$this->lang->words['t_uaremove']}: {$agent['uagent_name']}' id='agent_{$agent['uagent_id']}_delete'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cross.png' alt='{$this->lang->words['sk_icon']}' /></span>
+							<td class='col_buttons'>
+								<ul class='ipsControlStrip'>
+									<li class='i_edit'>
+										<a href='#' title='{$this->lang->words['t_uaedit']}: {$agent['uagent_name']}' id='agent_{$agent['uagent_id']}_edit' title='{$this->lang->words['t_uaedit']}: {$agent['uagent_name']}'>{$this->lang->words['t_uaedit']}: {$agent['uagent_name']}</a>
+									</li>
+									<li class='i_delete'>
+										<a href='#' title='{$this->lang->words['t_uaremove']}: {$agent['uagent_name']}' id='agent_{$agent['uagent_id']}_delete' title='{$this->lang->words['t_uaremove']}: {$agent['uagent_name']}'>{$this->lang->words['t_uaremove']}: {$agent['uagent_name']}</a>
+									</li>
+								</ul>
 							</td>
 						</tr>
 					</table>
@@ -601,9 +832,9 @@ EOF;
 					acp.uagents.updateURL = "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}";
 					acp.uagents.json = {$_json};
 					
-					ipb.templates['add_uagent'] = new Template("<div class='acp-box'><h3>#{box_title}</h3><ul class='acp-form'><li><label for='uagent_name_#{id}'>{$this->lang->words['t_uaname']}</label><input type='text' class='input_text' id='uagent_name_#{id}' value='#{a_name}' /><br /><span class='desctext'>{$this->lang->words['t_uaname_desc']}</span></li><li><label for='uagent_key_#{id}'>{$this->lang->words['t_uakey']}</label><input type='text' class='input_text' id='uagent_key_#{id}' value='#{a_key}' /><br /><span class='desctext'>{$this->lang->words['t_uakey_desc']}</span></li><li><label for='uagent_type_#{id}'>{$this->lang->words['t_uatype']}</label><select id='uagent_type_#{id}'><option value='browser' #{type_browser}>{$this->lang->words['t_uabrowser']}</option><option value='search' #{type_search}>{$this->lang->words['t_uasearchengine']}</option><option value='other' #{type_other}>{$this->lang->words['t_uaother']}</option></select></li><li><label for='uagent_regex_#{id}'>{$this->lang->words['t_uaregex']}</label><textarea id='uagent_regex_#{id}' class='input_text' style='width: 40%' rows='5'>#{a_regex}</textarea></li><li><label for='uagent_capture_#{id}'>{$this->lang->words['t_uacapture']}</label><input type='text' class='input_text' id='uagent_capture_#{id}' value='#{a_capture}' /><br /><span class='desctext'>{$this->lang->words['t_uacapture_desc']}</span></li></ul><div class='acp-actionbar'><input type='hidden' id='uagent_position_#{id}' value='#{a_position}' /><input type='submit' class='realbutton' value='{$this->lang->words['t_uasave']}' id='uagent_#{id}_save' /></div></div>");
+					ipb.templates['add_uagent'] = new Template("<div class='acp-box'><h3>#{box_title}</h3><table class='ipsTable double_pad'><tr><td class='field_title' ><strong class='title'><label for='uagent_capture_#{id}'>{$this->lang->words['t_uaname']}</label></strong></td><td class='field_field'><input type='text' class='input_text' id='uagent_name_#{id}' value='#{a_name}' /><br /><span class='desctext'>{$this->lang->words['t_uaname_desc']}</span></td></tr><tr><td class='field_title'><strong class='field_title'><label for='uagent_capture_#{id}'>{$this->lang->words['t_uakey']}</value></strong></td><td class='field_field'><input type='text' class='input_text' id='uagent_key_#{id}' value='#{a_key}' /><br /><span class='desctext'>{$this->lang->words['t_uakey_desc']}</span></td></tr><tr><td class='field_title'><strong class='title'><label for='uagent_capture_#{id}'>{$this->lang->words['t_uatype']}</value></strong></td><td class='field_field'><select id='uagent_type_#{id}'><option value='browser' #{type_browser}>{$this->lang->words['t_uabrowser']}</option><option value='search' #{type_search}>{$this->lang->words['t_uasearchengine']}</option><option value='other' #{type_other}>{$this->lang->words['t_uaother']}</option></select></td></tr><tr><td class='field_title'><strong class='title'><label for='uagent_capture_#{id}'>{$this->lang->words['t_uaregex']}</label></strong></td><td class='field_field'><textarea id='uagent_regex_#{id}' class='input_text' style='width: 40%' rows='5'>#{a_regex}</textarea></td></tr><tr><td class='field_title'><strong class='title'><label for='uagent_capture_#{id}'>{$this->lang->words['t_uacapture']}</label></strong></td><td class='field_field'><input type='text' class='input_text' id='uagent_capture_#{id}' value='#{a_capture}' /><br /><span class='desctext'>{$this->lang->words['t_uacapture_desc']}</span></td></tr></table><div class='acp-actionbar'><input type='hidden' id='uagent_position_#{id}' value='#{a_position}' /><input type='submit' class='realbutton' value='{$this->lang->words['t_uasave']}' id='uagent_#{id}_save' /></div></div>");
 					
-					ipb.templates['agent_row'] = new Template("<li id='uagent_#{id}' class='isDraggable'><table width='100%' class='double_pad'><tr><td style='width: 2%; text-align: center'><div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div></td><td style='width: 2%; text-align: center'><img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/type_#{type}.png' alt='{$this->lang->words['icon']}' /></td><td style='width: 78%'><strong>#{name}</strong></td><td style='width: 18%; text-align: right;'><span class='dropdown-button' title='{$this->lang->words['t_uaedit']}' id='agent_#{id}_edit'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/pencil.png' alt='{$this->lang->words['sk_icon']}' /></span> <span class='dropdown-button' title='{$this->lang->words['t_uaremove']}' id='agent_#{id}_delete'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cross.png' alt='{$this->lang->words['sk_icon']}' /></span></td></tr></table></li>");
+					ipb.templates['agent_row'] = new Template("<li id='uagent_#{id}' class='isDraggable'><table class='ipsTable'><tr class='ipsControlRow'><td><div class='draghandle'>&nbsp;</div></td><td style='width: 2%; text-align: center'><img src='{$this->settings['skin_acp_url']}/images/folder_components/uagents/type_#{type}.png' alt='{$this->lang->words['icon']}' /></td><td style='width: 78%'><strong>#{name}</strong></td><td class='col_buttons'><ul class='ipsControlStrip'><li class='i_edit'><a href='#' title='{$this->lang->words['t_uaedit']}' id='agent_#{id}_edit'>{$this->lang->words['t_uaedit']}</a></li><li class='i_delete'><a href='#' title='{$this->lang->words['t_uaremove']}: #{name}' id='agent_#{id}_delete'>{$this->lang->words['t_uaremove']}: #{name}</a></li></ul></td></tr></table></li>");
 				</script>
 EOF;
 		}
@@ -612,15 +843,6 @@ EOF;
 	</div>
 EOF;
 
-if ( IN_DEV )
-{
-	$IPBHTML .= <<<EOF
-	<div>
-		<a href="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rebuildMaster">{$this->lang->words['ua_rebuild_master']}</a>
-	</div>
-EOF;
-}
-
 //--endhtml--//
 return $IPBHTML;
 }
@@ -629,7 +851,6 @@ return $IPBHTML;
 /**
  * Form to configure login method 
  *
- * @access	public
  * @param	array 		Login method
  * @param	array 		Form elements
  * @return	string		HTML
@@ -642,33 +863,36 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <form id='mainform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_save_conf&amp;login_id={$login['login_id']}' method='post'>
 <div class='acp-box'>
- <h3>{$this->lang->words['t_configdetails']} {$login['login_title']}</h3>
- <ul class='acp-form alternate_rows'>
+	<h3>{$this->lang->words['t_configdetails']} {$login['login_title']}</h3>
+	<table class='ipsTable double_pad'>
 EOF;
 
 foreach( $form as $form_entry )
 {
 	$IPBHTML .= <<<EOF
- <li>
-   <label>{$form_entry['title']}
+		<tr>
+			<td class='field_title'>
+   				<strong class='title'>{$form_entry['title']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form_entry['control']}
 EOF;
 
 	if( $form_entry['description'] )
 	{
-		$IPBHTML .= "<span class='desctext'>{$form_entry['description']}</span>";
+		$IPBHTML .= "<br /><span class='desctext'>{$form_entry['description']}</span>";
 	}
 	
 $IPBHTML .= <<<EOF
-</label>
-   {$form_entry['control']}
-</li>
+			</td>
+		</tr>
 EOF;
 }
 
 $IPBHTML .= <<<EOF
- </ul>
+	</table>
 	<div class='acp-actionbar'>
- 		<input type='submit' value=' {$this->lang->words['t_uasave']} ' class='button primary' /></div>
+ 		<input type='submit' value='{$this->lang->words['t_uasave']}' class='button primary' />
 	</div>
 </div>
 </form>
@@ -681,7 +905,6 @@ return $IPBHTML;
 /**
  * Login methods overview page
  *
- * @access	public
  * @param	string		Login method rows
  * @return	string		HTML
  */
@@ -690,39 +913,26 @@ public function login_overview( $content ) {
 $IPBHTML = "";
 //--starthtml--//
 $IPBHTML .= <<<EOF
-<script type="text/javascript">
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { only: 'isDraggable', revert: true, format: 'login_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'logins' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=login_reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
-</script>
-
 <div class='section_title'>
 	<h2>{$this->lang->words['l_title']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=login&amp;do=login_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['tol_register_new_log_in_method']}</a></li>
+		<li><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=login&amp;do=login_add' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['tol_register_new_log_in_method']}</a></li>
 	</ul>	
 </div>
 
 <div class='acp-box'>
     <h3>{$this->lang->words['tol_registered_log_in_authenticati']}</h3>
-    <ul id='sortable_handle' class='alternate_rows'>
-    	$content
-    </ul>
+	<table class='ipsTable' id='login_sortable'>
+    	{$content}
+    </table>
 </div>
+<script type='text/javascript'>
+	jQ("#login_sortable").ipsSortable('table', { 
+		url: "{$this->settings['base_url']}&{$this->form_code_js}&do=login_reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ),
+		sendType: 'post'
+	} );
+</script>
 EOF;
 
 //--endhtml--//
@@ -732,7 +942,6 @@ return $IPBHTML;
 /**
  * Login method diagnostic results
  *
- * @access	public
  * @param	array 		Login method
  * @return	string		HTML
  */
@@ -740,6 +949,10 @@ public function login_diagnostics( $login=array() ) {
 
 $IPBHTML = "";
 //--starthtml--//
+
+$enabled = ( $login['login_enabled'] ) ? "<span class='ipsBadge badge_green'>{$this->lang->words['perf_on']}</span>" : "<span class='ipsBadge badge_red'>{$this->lang->words['perf_off']}</span>";
+$file_exists = ( $login['_file_auth_exists'] == 'tick.png' ) ? "<span class='ipsBadge badge_green'>{$this->lang->words['login_exists']}</span>" : "<span class='ipsBadge badge_red'>{$this->lang->words['login_notexists']}</span>";
+
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['tol_diagnostics_title']}</h2>
@@ -747,27 +960,23 @@ $IPBHTML .= <<<EOF
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['tol_diagnostics_for']}: {$login['login_title']}</h3>
-	<table class='alternate_rows'>
+	<table class='ipsTable double_pad'>
 		<tr>
-			<th></th>
-			<th class='right-border'></th>
-			<th>{$this->lang->words['tol_file_name']}</th>
-			<th>{$this->lang->words['tol_exists']}</th>
-			<th>{$this->lang->words['tol_writeable']}</th>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['tol_log_in_enabled']}</strong>
+			</td>
+			<td class='field_field'>
+				{$enabled}
+			</td>
 		</tr>
 		<tr>
-			<td><strong>{$this->lang->words['tol_log_in_enabled']}</strong></td>
-			<td class='right-border'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$login['_enabled_img']}' alt='*' /></td>
-			<td><strong>./sources/loginauth/{$login['login_folder_name']}/auth.php</strong></td>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$login['_file_auth_exists']}' alt='*' /></td>
-			<td>-</td>
-		</tr>
-		<tr>
-			<td><strong>{$this->lang->words['tol_log_in_has_settings']}</strong></td>
-			<td class='right-border'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$login['_has_settings']}' alt='*' /></td>
-			<td><strong>./sources/loginauth/{$login['login_folder_name']}/conf.php</strong></td>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$login['_file_conf_exists']}' alt='*' /></td>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$login['_file_conf_write']}' alt='*' /></td>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['tol_auth_exists']}</strong>
+			</td>
+			<td class='field_field'>
+				{$file_exists}<br />
+				<span class='desctext'>./sources/loginauth/{$login['login_folder_name']}/auth.php</span>
+			</td>
 		</tr>
 EOF;
 
@@ -776,7 +985,7 @@ if( $login['_missingModules'] )
 	$_missing = sprintf( $this->lang->words['login_method_missing_functions'], $login['_missingModules'] );
 $IPBHTML .= <<<EOF
 	<tr>
-		<td colspan='5'><strong>{$_missing}</strong></td>
+		<td colspan='5' class='no_messages' style='color:red;'><strong>{$_missing}</strong></td>
 	</tr>
 EOF;
 }
@@ -794,7 +1003,6 @@ return $IPBHTML;
 /**
  * Form to add/edit a login method
  *
- * @access	public
  * @param	array 		Form elements
  * @param	string		Form title
  * @param	string		Action code
@@ -808,76 +1016,140 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
+<div class='section_title'>
+	<h2>{$this->lang->words['l_title']}</h2>
+</div>
+
 <form id='mainform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;login_id={$login['login_id']}' method='post'>
 	<div class='acp-box'>
-		<h3>$title</h3>
-		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['tol_log_in_title']}</label>
-				{$form['login_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_description']}<span class='desctext'>{$this->lang->words['tol_a_short_description_for_this_l']}</span></label>
-				{$form['login_description']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_files_folder_name']}<span class='desctext'>{$this->lang->words['tol_the_main_folder_the_php_files_']}</span></label>
-				{$form['login_folder_name']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_enabled']}<span class='desctext'>{$this->lang->words['tol_if_yes_this_log_in_will_be_ena']}</span></label>
-				{$form['login_enabled']}
-			</li>
-			<li>
-				<label>{$this->lang->words['t_l_type']}</label>
-				{$form['login_user_id']}
-			</li>
-			<li>
-				<label>{$this->lang->words['t_l_html']}<span class='desctext'>{$this->lang->words['t_l_html_info']}</span></label>
-				{$form['login_alt_login_html']}
-			</li>
-			<li>
-				<label>{$this->lang->words['t_l_html2']}<span class='desctext'>{$this->lang->words['t_l_html2_info']}</span></label>
-				{$form['login_alt_acp_html']}
-			</li>
-			<li>
-				<label>{$this->lang->words['t_l_html3']}<span class='desctext'>{$this->lang->words['t_l_html3_info']}</span></label>
-				{$form['login_replace_form']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_user_maintenance_url']}<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_they_can']}</span></label>
-				{$form['login_maintain_url']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_user_register_url']}<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_regis']}</span></label>
-				{$form['login_register_url']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_user_log_in_url']}<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_log_i']}</span></label>
-				{$form['login_login_url']} <div class='desctext'></div>
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_log_in_user_log_out_url']}<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_log_o']}</span></label>
-				{$form['login_logout_url']} <div class='desctext'></div>
-			</li>
+		<h3>{$title}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_description']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_description']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_files_folder_name']}</strong>
+				</td>
+				<td class='field_field'>	
+					{$form['login_folder_name']}<br />
+					<span class='desctext'>{$this->lang->words['tol_the_main_folder_the_php_files_']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_enabled']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_enabled']}<br />
+					<span class='desctext'>{$this->lang->words['tol_if_yes_this_log_in_will_be_ena']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['t_l_type']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_user_id']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['t_l_html']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_alt_login_html']}<br />
+					<span class='desctext'>{$this->lang->words['t_l_html_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['t_l_html2']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_alt_acp_html']}<br />
+					<span class='desctext'>{$this->lang->words['t_l_html2_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['t_l_html3']}</strong>
+				</td>
+				<td class='field_field'>	
+					{$form['login_replace_form']}<br />
+					<span class='desctext'>{$this->lang->words['t_l_html3_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_user_maintenance_url']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_maintain_url']}<br />
+					<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_they_can']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_user_register_url']}</strong>
+				</td>
+				<td class='field_field'>	
+					{$form['login_register_url']}<br />
+					<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_regis']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_user_log_in_url']}</strong>
+				</td>
+				<td class='field_field'>	
+					{$form['login_login_url']}<br />
+					<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_log_i']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_log_in_user_log_out_url']}</strong>
+				</td>
+				<td class='field_field'>		
+					{$form['login_logout_url']}<br />
+					<span class='desctext'>{$this->lang->words['tol_the_url_for_the_place_to_log_o']}</span>
+				</td>
+			</tr>
+			
 EOF;
 //startif
 if ( $form['login_safemode'] != '' )
 {		
 $IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['tol_enable_safemode']}<span class='desctext'>{$this->lang->words['tol_cannot_be_deleted_or_edited_by']}</span></label>
-				{$form['login_safemode']}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['tol_enable_safemode']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['login_safemode']}<br />
+					<span class='desctext'>{$this->lang->words['tol_cannot_be_deleted_or_edited_by']}</span>
+				</td>
+			</tr>
 EOF;
 }//endif
 $IPBHTML .= <<<EOF
-		</ul>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value=' $button ' class='button primary' />
-			</div>
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
 	</div>
 </form>
@@ -890,7 +1162,6 @@ return $IPBHTML;
 /**
  * Sub header for login methods
  *
- * @access	public
  * @param	string		Subheader label
  * @return	string		HTML
  */
@@ -900,16 +1171,9 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-<li class='notDraggable'>
-	<table width='100%' cellpadding='0' cellspacing='0'>
-		<th style='width: 83%'>
-			{$label}
-		</th>
-		<th style='width: 17%'>
-			{$this->lang->words['login_manage_enabled']}
-		</th>
-	</table>
-</li>
+<tr>
+	<th colspan='4'>{$label}</th>
+</tr>
 EOF;
 
 //--endhtml--//
@@ -919,7 +1183,6 @@ return $IPBHTML;
 /**
  * No login methods of this type row
  *
- * @access	public
  * @param	string		Row label
  * @return	string		HTML
  */
@@ -929,13 +1192,11 @@ $IPBHTML = "";
 //--starthtml--//
 $nomethods = sprintf( $this->lang->words['t_l_nomethods'], $label ); 
 $IPBHTML .= <<<EOF
-<li class='notDraggable'>
-	<table width='100%' cellpadding='0' cellspacing='0'>
-		<tr>
-			<td>{$nomethods}</td>
-		</tr>
-	</table>
-</li>
+<tr>
+	<td colspan='2' class='no_messages'>
+		{$nomethods}
+	</td>
+</tr>
 EOF;
 
 //--endhtml--//
@@ -945,7 +1206,6 @@ return $IPBHTML;
 /**
  * Login method row
  *
- * @access	public
  * @param	array 		Login method data
  * @return	string		HTML
  */
@@ -958,32 +1218,30 @@ $className	= '';
 
 if( $data['login_installed'] )
 {
-	$className = "class='isDraggable'";
+	$dragbit = "<div class='draghandle'>&nbsp;</div>";
 }
 
 $IPBHTML .= <<<EOF
-<li id='login_{$data['login_id']}' {$className}>
-	<table width='100%' class='double_pad'>
-		<tr>
-			<td style='width: 3%'>
+<tr id='logins_{$data['login_id']}' class='ipsControlRow isDraggable'>
+	<td class='col_drag'>
 EOF;
 		if( $data['login_installed'] )
 		{
 			$IPBHTML .= <<<EOF
-			 		<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
+			 		<div class='draghandle'>&nbsp;</div>
 EOF;
 		}
 		else
 		{
 			$IPBHTML .= <<<EOF
-					<img src='{$this->settings['skin_acp_url']}/_newimages/icons/lock.png' alt='--' />
+					<img src='{$this->settings['skin_acp_url']}/images/icons/lock.png' alt='--' />
 EOF;
 		}
 		
 		$IPBHTML .= <<<EOF
-			</td>
-			<td style='width: 80%'>
-				<strong>{$data['login_title']}</strong>
+	</td>
+	<td style='width: 80%'>
+		<strong class='larger_text'>{$data['login_title']}</strong>
 EOF;
 			if( $data['login_description'] )
 			{
@@ -993,63 +1251,79 @@ EOF;
 			}
 		
 		$IPBHTML .= <<<EOF
-			</td>
-			<td style='width: 14%'>
+	</td>
+	<td style='width: 14%; text-align: center'>
 EOF;
 			if( $data['login_installed'] )
 			{
 				$toggle_text = $data['login_enabled'] ? $this->lang->words['t_l_disable'] : $this->lang->words['t_l_enable'];
-
 				$IPBHTML .= "<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_toggle&amp;login_id={$data['login_id']}' title='{$toggle_text}'>";
-			}
-
-			$IPBHTML .= "<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$data['_enabled_img']}' alt='YN' />";
-
-			if( $data['login_installed'] )
-			{
+				
+				if( $data['login_enabled'] ){
+					$IPBHTML .= "<span class='ipsBadge badge_green'>{$this->lang->words['perf_on']}</span>";
+				} else {
+					$IPBHTML .= "<span class='ipsBadge badge_red'>{$this->lang->words['perf_off']}</span>";
+				}
+				
 				$IPBHTML .= "</a>";
 			}
 			
 			$IPBHTML .= <<<EOF
-			</td>
-			<td style='width: 3%'>
-							<img class="ipbmenu" id="menu{$data['login_id']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">	 		
-							<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id="menu{$data['login_id']}_menucontent">
+	</td>
+	<td class='col_buttons'>
+		<ul class='ipsControlStrip'>
+EOF;
+		if ( $data['login_installed'] )
+		{		
+		$IPBHTML .= <<<EOF
+			<li class='i_edit'>
+				<a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_edit_details&amp;login_id={$data['login_id']}' title='{$this->lang->words['tol_edit_details']}'>{$this->lang->words['tol_edit_details']}</a>
+			</li>
 EOF;
 
+			if( $data['acp_plugin'] )
+			{
+				$IPBHTML .= <<<EOF
+						<li class='i_cog'>
+							<a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_acp_conf&amp;login_id={$data['login_id']}' title='{$this->lang->words['t_l_configdetails']}'>{$this->lang->words['t_l_configdetails']}</a>
+						</li>
+EOF;
+			}
+			
+			$IPBHTML .= <<<EOF
+				<li class='ipsControlStrip_more ipbmenu' id="menu{$data['login_id']}">
+					<a href='#'>{$this->lang->words['t_l_moredetails']}</a>
+				</li>
+EOF;
+		}
+		else
+		{
+			$IPBHTML .= <<<EOF
+				<li class='i_add'>
+					<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_install&amp;login_folder={$data['login_folder_name']}' title='{$this->lang->words['tol_install']}'>{$this->lang->words['tol_install']}</a>
+				</li>
+EOF;
+		}
+		
+		$IPBHTML .= <<<EOF
+		</ul>
+		
+EOF;
 				//startif
 				if ( $data['login_installed'] )
 				{		
-				$IPBHTML .= <<<EOF
-								<li style="z-index: 10000;"class='icon edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_edit_details&amp;login_id={$data['login_id']}'>{$this->lang->words['tol_edit_details']}</a></li>
-EOF;
-
-					if( $data['acp_plugin'] )
-					{
-						$IPBHTML .= <<<EOF
-								<li style="z-index: 10000;"class='icon edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_acp_conf&amp;login_id={$data['login_id']}'>{$this->lang->words['t_l_configdetails']}</a></li>
-EOF;
-					}
 
 				$IPBHTML .= <<<EOF
-								<li style="z-index: 10000;"class='icon manage'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_export&amp;login_id={$data['login_id']}'>{$this->lang->words['t_l_export']}</a></li>
-								<li style="z-index: 10000;"class='icon manage'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_uninstall&amp;login_id={$data['login_id']}'>{$this->lang->words['t_l_uninstall']}</a></li>
-								<li style="z-index: 10000;"class='icon view'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_diagnostics&amp;login_id={$data['login_id']}'>{$this->lang->words['tol_diagnostics']}</a></li>
-EOF;
-				}//endif
-				//startif
-				if ( $data['login_installed'] != 1 )
-				{		
-				$IPBHTML .= <<<EOF
-								<li style="z-index: 10000;" class='icon manage'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_install&amp;login_folder={$data['login_folder_name']}'>{$this->lang->words['tol_install']}</a></li>
+					<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id="menu{$data['login_id']}_menucontent">
+						<li style="z-index: 10000;"class='icon export'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_export&amp;login_id={$data['login_id']}'>{$this->lang->words['t_l_export']}</a></li>
+						<li style="z-index: 10000;"class='icon delete'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_uninstall&amp;login_id={$data['login_id']}'>{$this->lang->words['t_l_uninstall']}</a></li>
+						<li style="z-index: 10000;"class='icon view'><a style="z-index: 10000;" href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=login_diagnostics&amp;login_id={$data['login_id']}'>{$this->lang->words['tol_diagnostics']}</a></li>
+					</ul>
 EOF;
 				}//endif
 				$IPBHTML .= <<<EOF
-							</ul>
 			</td>
 		</tr>
-	</table>
-</li>
 EOF;
 
 //--endhtml--//
@@ -1060,7 +1334,6 @@ return $IPBHTML;
 /**
  * Cache manager popup screen
  *
- * @access	public
  * @param	string		Title
  * @param	string		Cache content
  * @return	string		HTML
@@ -1072,9 +1345,9 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <div style='padding:4px'>
-<h2>$title</h2>
-<div class='acp-row-off' style='padding: 10px'>
-	<pre>$content</pre>
+<h2>{$title}</h2>
+<div style='padding: 10px'>
+	<pre>{$content}</pre>
 </div>
 </div>
 EOF;
@@ -1086,7 +1359,6 @@ return $IPBHTML;
 /**
  * Wrapper for a cache entry
  *
- * @access	public
  * @param	array 		Caches
  * @param	int			Total caches
  * @return	string		HTML
@@ -1102,15 +1374,31 @@ $__default_tab = 'global';
 $IPBHTML .= <<<EOF
 <div class='section_title'>
 	<h2>{$this->lang->words['tol_cache_management']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}module=tools&amp;section=cache&amp;do=cache_recache&amp;id=__all__&amp;__notabsave=1'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/database_refresh.png' alt='' />
-				{$this->lang->words['tol_recache_all']}
-			</a>
-		</li>
-	</ul>
+	
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=cache_recache&amp;id=__all__&amp;__notabsave=1'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' /> {$this->lang->words['tol_recache_all']}</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=globalCachesRecache'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' /> {$this->lang->words['gcaches_rebuild_cache']}</a>
+			</li>
+EOF;
+
+if( ALLOW_FURLS )
+{
+$IPBHTML .= <<<EOF
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}&amp;module=applications&amp;section=applications&amp;do=seoRebuild'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' /> {$this->lang->words['rebuild_furl_link']}</a>
+			</li>
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+		</ul>
+	</div>
 </div>
+<br />
 EOF;
 
 /* CONTENT CACHE */
@@ -1120,42 +1408,43 @@ if ( count( $cacheContent ) )
 	$this->lang->words['cc_remove_y_posts'] = sprintf( $this->lang->words['cc_remove_seven'], $this->settings['cc_sigs'] );
 	
 	$IPBHTML .= <<<EOF
-	<div class='acp-box alternate_rows'>
-	<table class='double_pad alternate_rows'>
-	<tr>
-		<th colspan='4'>{$this->lang->words['cc_header']}</th>
-	</tr>
-	<tr>
-		<td width='20%'>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['cc_header']}</h3>
+		
+		<table class='ipsTable double_pad'>
+			<tr class='ipsControlRow'>
+				<td width='40%'>
 			<strong>{$this->lang->words['cc_posts']}</strong>
 		</td>
 		<td width='35%'>
 			<strong>{$cacheContent['cachedPosts']['count']}</strong>{$this->lang->words['cache__of']}<strong>{$cacheContent['posts']['count']}</strong>{$this->lang->words['cache__posts']}({$cacheContent['postPercent']}%)
 		</td>
-		<td width='40%'>
-		  	{$cacheContent['m_posts']}
-		</td>
 		<td style='text-align: center'>
-			<img class='ipbmenu' id="menu-cc_posts" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' />
-			<ul class='acp-menu' id='menu-cc_posts_menucontent'>
+					<ul class='ipsControlStrip'>
+						<li class='i_delete ipbmenu' id='menu-cc_posts'>
+						<a href='#'>&nbsp;</a>
+						</li>
+					</ul>
+					<ul class='acp-menu' id='menu-cc_posts_menucontent' style='display: none'>
 				<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}do=contentCache&amp;type=post&amp;method=seven'>{$this->lang->words['cc_remove_x_posts']}</a></li>
 				<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=contentCache&amp;type=post&amp;method=all")'>{$this->lang->words['cc_remove_all']}...</a></li>
 			</ul>
 		</td>
 	</tr>
-	<tr>
-		<td width='20%'>
+			<tr class='ipsControlRow'>
+				<td width='40%'>
 			<strong>{$this->lang->words['cc_sigs']}</strong>
 		</td>
 		<td>
-			<strong>{$cacheContent['cachedSigs']['count']}</strong> из <strong>{$cacheContent['members']['count']}</strong> подпи�ей ({$cacheContent['sigPercent']}%)
-		</td>
-		<td width='40%'>
-		  	{$cacheContent['m_sigs']}
+					<strong>{$cacheContent['cachedSigs']['count']}</strong> of <strong>{$cacheContent['members']['count']}</strong> signatures ({$cacheContent['sigPercent']}%)
 		</td>
 		<td style='text-align: center'>
-			<img class='ipbmenu' id="menu-cc_sigs" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' />
-			<ul class='acp-menu' id='menu-cc_sigs_menucontent'>
+					<ul class='ipsControlStrip'>
+						<li class='i_delete ipbmenu' id='menu-cc_sigs'>
+							<a href='#'>&nbsp;</a>
+						</li>
+					</ul>
+					<ul class='acp-menu' id='menu-cc_sigs_menucontent' style='display: none'>
 				<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}do=contentCache&amp;type=sig&amp;method=seven'>{$this->lang->words['cc_remove_y_posts']}</a></li>
 				<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=contentCache&amp;type=sig&amp;method=all")'>{$this->lang->words['cc_remove_all']}...</a></li>
 			</ul>
@@ -1168,7 +1457,12 @@ EOF;
 }
 
 $IPBHTML .= <<<EOF
-	<ul id='tabstrip_settings' class='tab_bar no_title'>
+<div class='acp-box'>
+	<h3>{$this->lang->words['tol_caches']}</h3>
+	<div id='tabstrip_caches' class='ipsTabBar with_left with_right'>
+		<span class='tab_left'>&laquo;</span>
+		<span class='tab_right'>&raquo;</span>
+		<ul>
 EOF;
 
 foreach( $_applications as $app_dir => $app_data )
@@ -1181,27 +1475,16 @@ foreach( $_applications as $app_dir => $app_data )
 	if ( is_array( $caches[ $app_dir ] ) and count( $caches[ $app_dir ] ) )
 	{
 $IPBHTML .= <<<EOF
-	<li id='tabtab-{$app_dir}' class=''>{$app_data['app_title']}</li>
-	
+		<li id='tab_{$app_dir}'>{$app_data['app_title']}</li>
 EOF;
 	}
 }
 
 $IPBHTML .= <<<EOF
-</ul>
-
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_settings');
-ipbAcpTabStrips.doToggle($('tabtab-{$_default_tab}'));
-});
- //]]>
-</script>
-
-<div class='acp-box alternate_rows'>
+		</ul>
+	</div>
 
+<div id='tabContent' class='ipsTabBar_content'>
 EOF;
 
 foreach( $_applications as $app_dir => $app_data )
@@ -1209,33 +1492,37 @@ foreach( $_applications as $app_dir => $app_data )
 	if ( is_array( $caches[ $app_dir ] ) and count( $caches[ $app_dir ] ) )
 	{
 $IPBHTML .= <<<EOF
-	<div id='tabpane-{$app_dir}'>
-		<table class='double_pad alternate_rows'>
-		<tr>
-			<th width='1px'></th>
-			<th>Cache</th>
-			<th style='width: 60px'>{$this->lang->words['tol_size']}</th>
-			<th style='width: 80px'>{$this->lang->words['tol_init_state']}</th>
-			<th width='1px'>{$this->lang->words['tol_options']}</th>
-		</tr>
+	<div id='tab_{$app_dir}_content'>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<th style='width: 60%'>Cache</th>
+				<th style='width: 10%; text-align: center'>{$this->lang->words['tol_size']}</th>
+				<th>{$this->lang->words['tol_init_state']}</th>
+				<th class='col_buttons'>&nbsp;</th>
+			</tr>
 			
 EOF;
 		foreach( $caches[ $app_dir ] as $data )
 		{
 $IPBHTML .= <<<EOF
-<tr>
-	<td><img src='{$this->settings['skin_acp_url']}/images/folder_components/cache/cache-row.png' /></td>
-	<td><strong>{$data['cache_name']}</strong></td>
-	<td>{$data['_cache_size']}</td>
+<tr class='ipsControlRow'>
+	<td>
+		<img src='{$this->settings['skin_acp_url']}/images/icons/database.png' />&nbsp;&nbsp;
+		<a href='#' onclick='return acp.openWindow("{$this->settings['base_url']}{$this->form_code}do=cache_view&amp;id={$data['cache_name']}&amp;cache_app={$app_dir}", 400, 600)'>
+			<strong class='larger_text'>{$data['cache_name']}</strong>
+		</a>
+	</td>
+	<td style='text-align: center'><span class='desctext'>{$data['_cache_size']}</span></td>
 	<td>
 EOF;
-if ( $data['_cs_init_load'] AND $data['allow_unload'] )
+
+if ( $data['default_load'] AND $data['allow_unload'] )
 {
 $IPBHTML .= <<<EOF
 <img src='{$this->settings['skin_acp_url']}/images/folder_components/cache/cache-loadtime.png' title='{$this->lang->words['tol_loaded_on_initialization']}' />
 EOF;
 }
-else if ( $data['_cs_init_load'] AND ! $data['allow_unload'] )
+else if ( $data['default_load'] AND ! $data['allow_unload'] )
 {
 $IPBHTML .= <<<EOF
 <img src='{$this->settings['skin_acp_url']}/images/folder_components/cache/cache-loadtime-set.png' title='{$this->lang->words['tol_loaded_on_initialization_canno']}' />
@@ -1250,11 +1537,11 @@ EOF;
 $IPBHTML .= <<<EOF
 
 	 </td>
-	<td style='text-align: center'>
-		<img class='ipbmenu' id="menu-{$data['cache_name']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' />
-		<ul class='acp-menu' id='menu-{$data['cache_name']}_menucontent'>
-			<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=cache_recache&amp;id={$data['cache_name']}&amp;cacheapp={$app_dir}'>{$this->lang->words['tol_recache_cache']}</a></li>
-			<li class='icon view'><a href='#' onclick='return acp.openWindow("{$this->settings['base_url']}{$this->form_code}do=cache_view&amp;id={$data['cache_name']}&amp;cache_app={$app_dir}", 400, 600)'>{$this->lang->words['tol_view_cache']}.</a></li>
+	<td class='col_buttons'>
+		<ul class='ipsControlStrip'>
+			<li class='i_refresh'>
+				<a href='{$this->settings['base_url']}{$this->form_code}do=cache_recache&amp;id={$data['cache_name']}&amp;cacheapp={$app_dir}' title='{$this->lang->words['tol_recache_cache']}'>{$this->lang->words['tol_recache_cache']}</a>
+			</li>
 		</ul>
 	</td>
  </tr>
@@ -1271,393 +1558,14 @@ EOF;
 }
 
 $IPBHTML .= <<<EOF
-	<div class='acp-actionbar'>
-	{$this->lang->words['tol_total_cache_size']}: $total
-	</div>
 </div>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Setting titles wrapper
- *
- * @access	public
- * @param	string		Title
- * @param	array 		Setting groups
- * @param	string		Application tab to start on
- * @return	string		HTML
- */
-public function settings_titles_wrapper($title, $settings, $start_app='') {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$_default_tab = ( isset( $this->request['_dtab'] ) && $this->request['_dtab'] ) ? $this->request['_dtab'] : 'System';
-
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>{$this->lang->words['tol_settings']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}module=tools&amp;section=settings&amp;do=settinggroup_new' style='text-decoration:none'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/table_add.png' alt='' /> {$this->lang->words['tol_add_new_setting_group']}</a>
-		</li>
-	</ul>
-</div>
-<br />
-<ul id='tabstrip_settings' class='tab_bar no_title'>
-EOF;
-
-$tab_names = array( 'System' => 'Си�тема', 'Performance' => 'Производительно�ть', 'IPS Apps' => 'Приложени�', 'Members' => 'Пользователи', 'Advanced' => 'Дополнительно', 'Forums' => 'Форумы', 'Hooks' => 'Модификации');
-
-foreach( $settings as $tab => $group )
-{
-	$tab_name = ($tab_names[ $tab ]) ? $tab_names[ $tab ] : $tab;
-
-	if ( ipsRegistry::$request['app'] AND $tab == ipsRegistry::$request['app'] )
-	{
-		$_default_tab = $tab;
-	}
-	
-	$_tab	= IPSText::md5Clean( $tab );
-	
-$IPBHTML .= <<<EOF
-	<li id='tabtab-{$_tab}'>{$tab_name}</li>
-	
-EOF;
-}
-
-$IPBHTML .= <<<EOF
-</ul>
-
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_settings');
-ipbAcpTabStrips.doToggle($('tabtab-{$_default_tab}'));
-});
- //]]>
-</script>
-
-<div class='acp-box'>
-
-EOF;
-
-
-foreach( $settings as $tab => $app_data )
-{
-	$_tab	= IPSText::md5Clean( $tab );
-$IPBHTML .= <<<EOF
-	<div id='tabpane-{$_tab}'>
-		<table width='100%' class='alternate_rows double_pad'>
-		
-EOF;
-		foreach( $app_data as $r )
-		{
-			
-			if(IN_DEV)
-			{
-				$export_settings_group = "<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=MOD_export_setting&amp;conf_group={$r['conf_title_id']}' title='{$this->lang->words['export_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/export_settings_group.png' alt='Icon' /> {$this->lang->words['export_group']}</a>
-				</li>";
-			}
-			
-			$img = file_exists( IPSLib::getAppDir( $r['conf_title_app'] ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_acp_url'] . '/' . IPSLib::getAppFolder( $r['conf_title_app'] ) . '/' . $r['conf_title_app'] . '/skin_cp/appIcon.png' : "{$this->settings['skin_acp_url']}/_newimages/applications/{$r['conf_title_app']}.png";
-			
-$IPBHTML .= <<<EOF
-		<tr>
-		 	<td width='3%' style='text-align: center'><img src='{$img}' alt='{$this->lang->words['tol_folder']}' /></td>
-		 	<td width='90%'>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setting_view&amp;conf_group={$r['conf_title_id']}'><b>{$r['conf_title_title']}</b></a>
-				<span style='color:gray'>({$r['conf_title_count']} на�троек)</span><br />
-				<span class='desctext'>{$r['conf_title_desc']}</span>
-			</td>
-			<td style='width: 3%'>
-				<img class='ipbmenu' id="menu{$r['conf_title_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' />
-				<ul class='acp-menu' id='menu{$r['conf_title_id']}_menucontent'>
-					<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=setting_view&amp;conf_group={$r['conf_title_id']}' title='{$this->lang->words['tol_manage_settings']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/manage_settings.png' alt='Icon' /> {$this->lang->words['tol_manage_settings']}</a></li>
-
-					<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_showedit&amp;id={$r['conf_title_id']}' title='{$this->lang->words['tol_edit_settings_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/edit_settings_group.png' alt='Icon' /> {$this->lang->words['tol_edit_settings_group']}</a></li>
-
-					<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_delete&amp;id={$r['conf_title_id']}' title='{$this->lang->words['tol_delete_settings_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/delete_settings_group.png' alt='Icon' /> {$this->lang->words['tol_delete_settings_group']}</a></li>
-
-					<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settinggroup_resync&amp;id={$r['conf_title_id']}' title='{$this->lang->words['tol_recount_settings_group']}'><img src='{$this->settings['skin_acp_url']}/images/options_menu/rebuild_settings_group.png' alt='Icon' /> {$this->lang->words['tol_recount_settings_group']}</a></li>
-
-					{$export_settings_group}
-				</ul>
-			</td>
-		</tr>
-EOF;
-		}
-$IPBHTML .= <<<EOF
-		</table>
-	</div>
-	
-EOF;
-
-}
-	
-$IPBHTML .= <<<EOF
-</div>
-
-<br />
-
-<form action='{$this->settings['base_url']}&{$this->form_code}&do=settings_do_import' enctype='multipart/form-data' method='post'>
-	<div class='acp-box'>
-		<h3>{$this->lang->words['tol_import_xml_settings']}</h3>
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['tol_upload_xml_settings_file_from_']}<span class='desctext'>{$this->lang->words['tol_duplicate_entries_will_not_be_']}</span></label>
-				<input class='textinput' type='file' size='30' name='FILE_UPLOAD' />
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_or_enter_the_filename_of_the_x']}<span class='desctext'>{$this->lang->words['tol_the_file_must_be_uploaded_into']}</span></label>
-				<td class='tablerow2'><input class='textinput' type='text' size='30' name='file_location' /></td>
-			</li>
-		</ul>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['t_import']}' />
-			</div>
+	{$this->lang->words['tol_total_cache_size']}: {$total}
 		</div>
 	</div>
-</form>
 
-EOF;
-//startif
-if ( IN_DEV != 0 )
-{		
-$IPBHTML .= <<<EOF
-<br />
-<div align='center'>
- <ul>
-	<li><a href='{$this->settings['base_url']}&{$this->form_code}&do=settingsImportApps'>Импортровать в�е на�тройки приложений из XML</a></li>
-	<li><a href='{$this->settings['base_url']}&{$this->form_code}&do=settingsExportApps'>Эк�портировать в�е на�тройки приложений в XML</a></li>
- </ul>
-EOF;
-}//endif
-$IPBHTML .= <<<EOF
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Search box at the top of the settings
- *
- * @access	public
- * @return	string		HTML
- * @deprecated	Livesearch handles this now
- */
-public function settings_titles_top_searchbox() {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div style="float:right; margin: 3px 5px 0 0">
-<form method='post' action='{$this->settings['base_url']}{$this->form_code}&do=setting_view'><input type='text' size='25' onclick='this.value=""' value='{$this->lang->words['tol_search_settings']}' name='search' class='realbutton' />&nbsp;<input type='submit' class='realbutton' value='{$this->lang->words['tol_go']}' /></form>
-</div>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
-/**
- * Form to add/edit a setting group
- *
- * @access	public
- * @param	array 		Form elements
- * @param	string		Form title
- * @param	string		Action code
- * @param	string		Button text
- * @return	string		HTML
- */
-public function settings_title_form($form, $title, $formcode, $button) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>{$this->lang->words['s_title']}</h2>
-</div>
-
-<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;id={$this->request['id']}' method='post'>
-	<div class='acp-box'>
-		<h3>$title</h3>
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['tol_setting_group_title']}</label>
-				{$form['conf_title_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_group_application']}</label>
-				{$form['conf_title_app']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_group_tab']}</label>
-				{$form['conf_title_tab']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_group_description']}</label>
-				{$form['conf_title_desc']}
-			</li>
-EOF;
-//startif
-if ( $form['conf_title_keyword'] != '' )
-{		
-$IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['tol_setting_group_keyword']}<span class='desctext'>{$this->lang->words['tol_used_to_pull_this_from_the_db_']}</span></label>
-				{$form['conf_title_keyword']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_hide_from_main_settings_list']}</label>
-				{$form['conf_title_noshow']}
-			</li>
-EOF;
-}//endif
-$IPBHTML .= <<<EOF
-		</ul>
-		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='$button' />
-			</div>
-		</div>
-	</div>
-</form>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * View settings wrapper
- *
- * @access	public
- * @param	string		Page title
- * @param	string		Content
- * @param	string		Search button
- * @param	string		Bounceback URL
- * @return	string		HTML
- */
-public function settings_view_wrapper($title, $content, $searchbutton, $bounceback='' ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>Группа: $title</h2>
-EOF;
-
-	if ( ipsRegistry::$request['search'] == '' AND $bounceback == '' )
-	{
-		if( $searchbutton )
-		{		
-	$IPBHTML .= <<<EOF
-		<ul class='context_menu'>
-			<li>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=settingnew&amp;conf_group={$this->request['conf_group']}' title='Добавить на�тройку'>
-					<img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' />
-					Добавить на�тройку
-				</a>
-			</li>
-		</ul>
-EOF;
-		}
-	}//endif
-	
-$IPBHTML .= <<<EOF
-</div>
-<br />
-<form action='{$this->settings['_base_url']}app=core&amp;module=tools&amp;section=settings&amp;do=setting_update&amp;id={$this->request['conf_group']}&amp;search={$this->request['search']}' method='post'>
-	<!--HIDDEN.FIELDS-->
-	<input type='hidden' name='bounceback' value='$bounceback' />
-	<div class='acp-box'>
-		<h3>{$title}</h3>
-		<ul class='alternate_rows' id='sortable_handle'>
-			{$content}
-		</ul>
-		<div class='acp-actionbar'>
-			<input type='submit' value='{$this->lang->words['tol_update_settings']}' class='realbutton' />
-		</div>
-	</div>
-</form>
-<script type="text/javascript">
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'settings' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-
-Sortable.create( 'sortable_handle', { tag: 'li', only: 'isDraggable', revert: true, format: 'setting_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-
-</script>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Setting that starts a setting group
- *
- * @access	public
- * @param	array 		Setting
- * @return	string		HTML
- */
-public function settings_row_start_group($r) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<li class='isDraggable' id='setting_{$r['conf_id']}'>
-	<table width='100%' cellpadding='0' cellspacing='0'>
-		<tr>
-			<th>{$r['conf_start_group']}</th>
-		</tr>
-	</table>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Automcplete field
- *
- * @access	public
- * @return	string		HTML
- */
-public function nameAutoCompleteField( $key, $val ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-	<input type='text' id='{$key}' name='{$key}' value='{$val}' autocomplete='off' style='width:210px;' class='textinput' />
-
-	<script type="text/javascript" defer="defer">
-	document.observe("dom:loaded", function(){
-		var search = new ipb.Autocomplete( $('{$key}'), { multibox: false, url: acp.autocompleteUrl, templates: { wrap: acp.autocompleteWrap, item: acp.autocompleteItem } } );
-	});
+<script type='text/javascript'>
+	jQ("#tabstrip_caches").ipsTabBar({tabWrap: "#tabContent", defaultTab: 'tab_{$__default_tab}'});
 	</script>
 EOF;
 
@@ -1665,191 +1573,4 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * View a setting row
- *
- * @access	public
- * @param	array 		Setting
- * @param	string		Edit button
- * @param	string		Delete button
- * @param	string		Form element
- * @param	string		Revert button
- * @return	string		HTML
- */
-public function settings_view_row($r, $edit, $delete, $form_element, $revert_button, $elem_type) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-if( !$r['conf_start_group'] )
-{
-	$IPBHTML .= <<<EOF
-	<li class='isDraggable' id='setting_{$r['conf_id']}'>
-EOF;
-}
-
-$IPBHTML .= <<<EOF
-	<table class='double_pad' width='100%'>
-  		<tr>
-  			<td style='width: 3%'><div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='-' /></div></td>
-  			<td style='width: 50%; padding-right: 35px;'><b>{$r['conf_title']}</b><div class='desctext'>{$r['conf_description']}</div></td>
-EOF;
-			if( $elem_type != 'rte' )
-			{
-				$IPBHTML .= <<<EOF
-				<td style='width: 40%'>
-					{$form_element}
-				</td>
-EOF;
-			}
-			else
-			{
-				$IPBHTML .= <<<EOF
-				<td style='width: 40%'>
-					&nbsp;
-				</td>
-EOF;
-			}
-			
-			$IPBHTML .= <<<EOF
-				<td style='width: 7%; text-align: right' nowrap="true">
-EOF;
-				//startif
-				if ( $edit or $delete or $revert_button )
-				{		
-				$IPBHTML .= <<<EOF
-
-								{$revert_button}
-				   				{$edit}
-								{$delete}
-EOF;
-				}//endif
-$IPBHTML .= <<<EOF
-			</td>
-		</tr>
-EOF;
-		if( $elem_type == 'rte' )
-		{
-			$IPBHTML .= <<<EOF
-				<tr>
-					<td colspan='4'>
-						{$form_element}
-					</td>
-				</tr>
-EOF;
-		}
-		
-		$IPBHTML .= <<<EOF
-	</table>
-</li>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Form to add/edit a setting
- *
- * @access	public
- * @param	array 		Setting
- * @param	string		Form title
- * @param	string		Action code
- * @param	string		Button text
- * @return	string		HTML
- */
-public function settings_form($form, $title, $formcode, $button) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>{$this->lang->words['add_setting_button']}</h2>
-</div>
-
-<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;id={$this->request['id']}' method='post'>
-	<div class='acp-box'>
-		<h3>$title</h3>
-		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['tol_setting_title']}</label>
-				{$form['conf_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_position']}</label>
-				{$form['conf_position']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_description']}</label>
-				{$form['conf_description']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_group']}</label>
-				{$form['conf_group']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_type']}</label>
-				{$form['conf_type']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_key']}</label>
-				{$form['conf_key']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_current_value']}</label>
-				{$form['conf_value']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_default_value']}</label>
-				{$form['conf_default']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_setting_extra']}<span class='desctext'>{$this->lang->words['tol_use_for_creating_form_element_']}</span></label>
-				{$form['conf_extra']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_raw_php_code_to_eval_before_sh']}<span class='desctext'>{$this->lang->words['tol_036show_1_is_set_when_showing_']}</span></label>
-				{$form['conf_evalphp']}
-			</li>
-			<li>
-				<label>{$this->lang->words['setting_keywords']}<span class='desctext'>{$this->lang->words['setting_keywords_desc']}</span></label>
-				{$form['conf_keywords']}
-			</li>
-			<li>
-				<label>{$this->lang->words['tol_start_setting_group']}<span class='desctext'>{$this->lang->words['tol_enter_title_here_or_leave_blan']}</span></label>
-				{$form['conf_start_group']}
-			</li>
-EOF;
-//startif
-if ( $form['conf_protected'] != '' )
-{		
-$IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['tol_make_a_default_setting_cannot_']}</label>
-				{$form['conf_protected']}
-			</li>
-EOF;
-}//endif
-$IPBHTML .= <<<EOF
-			<li>
-				<label>{$this->lang->words['tol_add_this_option_into_the_setti']}</label>
-				{$form['conf_add_cache']}
-			</li>
-		</ul>
-		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value='$button' />
-			</div>
-		</div>
-	</div>
-</form>
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/skin_cp/cp_skin_warnlogs.php b/upload/admin/applications/core/skin_cp/cp_skin_warnlogs.php
index 855c4e8e..23a6348d 100644
--- a/upload/admin/applications/core/skin_cp/cp_skin_warnlogs.php
+++ b/upload/admin/applications/core/skin_cp/cp_skin_warnlogs.php
@@ -2,38 +2,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Warn log skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
  
-class cp_skin_warnlogs extends output
+class cp_skin_warnlogs
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Warn logs wrapper
  *
- * @access	public
  * @param	array 		Records
  * @param	array 		Members
  * @return	string		HTML
@@ -59,7 +89,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['wlog_last10']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='10%'>{$this->lang->words['wlog_type']}</th>
 			<th width='25%'>{$this->lang->words['wlog_warned']}</th>
@@ -75,7 +105,7 @@ if( count($rows) AND is_array($rows) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['_type']}</td>
+			<td><span class='larger_text'>{$row['_type']}</span></td>
 			<td>{$row['_a_name']}</td>
 			<td style='text-align: center'>{$row['_cont']}</td>
 			<td>{$row['_date']}</td>
@@ -100,7 +130,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['wlog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='30%'>{$this->lang->words['wlog_member']}</th>
 			<th width='20%'>{$this->lang->words['wlog_times']}</th>
@@ -115,10 +145,10 @@ if( count($members) AND is_array($members) )
 	{
 		$IPBHTML .= <<<HTML
 		<tr>
-			<td>{$row['members_display_name']}</td>
+			<td><span class='larger_text'>{$row['members_display_name']}</span></td>
 			<td>{$row['act_count']}</td>
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;mid={$row['wlog_mid']}'>{$this->lang->words['wlog_viewlog']}</a></td>
-			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove&amp;mid={$row['wlog_mid']}'>{$this->lang->words['wlog_remove']}</a></td>
+			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=view&amp;mid={$row['member_id']}'>{$this->lang->words['wlog_viewlog']}</a></td>
+			<td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=remove&amp;mid={$row['member_id']}'>{$this->lang->words['wlog_remove']}</a></td>
 		</tr>
 HTML;
 	}
@@ -143,16 +173,16 @@ $IPBHTML .= <<<HTML
 
 	<div class="acp-box">
 		<h3>{$this->lang->words['wlog_search']}</h3>
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['wlog_searchfor']}</label>
-				{$form['search_for']}
-			</li>
-			<li>
-				<label>{$this->lang->words['wlog_searchin']}</label>
-				{$form['search_in']}
-			</li>
-		</ul>	
+		<table class="ipsTable double_pad">
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['wlog_searchfor']}</strong></td>
+				<td class='field_field'>{$form['search_for']}</td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['wlog_searchin']}</strong></td>
+				<td class='field_field'>{$form['search_in']}</td>
+			</tr>
+		</table>	
 		<div class="acp-actionbar">
 			<input value="{$this->lang->words['wlog_searchbutton']}" class="button primary" accesskey="s" type="submit" />
 		</div>
@@ -168,7 +198,6 @@ return $IPBHTML;
 /**
  * View an individual member's log
  *
- * @access	public
  * @param	array 		Log rows
  * @param	string		Page links
  * @return	string		HTML
@@ -185,7 +214,7 @@ $IPBHTML .= <<<HTML
 
 <div class="acp-box">
 	<h3>{$this->lang->words['wlog_thelogs']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<th width='5%'>{$this->lang->words['wlog_type']}</th>
 			<th width='15%'>{$this->lang->words['wlog_member']}</th>
@@ -230,7 +259,8 @@ HTML;
 $IPBHTML .= <<<HTML
 	</table>
 	<div class='acp-actionbar'>
-		<div class="leftaction">{$pages}</div>
+		<div class="left">{$pages}</div>
+		<br class='clear' />
 	</div>
 </div>
 <br />
@@ -243,7 +273,6 @@ return $IPBHTML;
 /**
  * View a member's warn log note
  *
- * @access	public
  * @param	array 		Note data
  * @return	string		HTML
  */
@@ -255,7 +284,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$this->lang->words['wlog_warnnotes']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<td width='15%'>{$this->lang->words['wlog_log_from']}</td>
 			<td>{$row['p_name']}</td>
@@ -283,7 +312,6 @@ return $IPBHTML;
 /**
  * View contact information for a warn log
  *
- * @access	public
  * @param	array 		Warn log details
  * @return	string		HTML
  */
@@ -295,7 +323,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$row['_type']}: {$row['_subject']}</h3>
-	<table class="alternate_rows" width='100%'>
+	<table class="ipsTable">
 		<tr>
 			<td width='15%'><strong>{$this->lang->words['wlog_log_from']}</strong></td>
 			<td>{$row['p_name']}</td>
diff --git a/upload/admin/applications/core/skin_cp/index.html b/upload/admin/applications/core/skin_cp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/skin_cp/index.html
+++ b/upload/admin/applications/core/skin_cp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/classes/attach/class_attach.php b/upload/admin/applications/core/sources/classes/attach/class_attach.php
index 41187019..5a7519e9 100644
--- a/upload/admin/applications/core/sources/classes/attach/class_attach.php
+++ b/upload/admin/applications/core/sources/classes/attach/class_attach.php
@@ -2,9 +2,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachments
- * Last Updated: $Date: 2010-11-15 11:39:10 -0500 (Mon, 15 Nov 2010) $
+ * Last Updated: $Date: 2011-09-09 19:44:48 -0400 (Fri, 09 Sep 2011) $
  * </pre>
  *
  * <code>
@@ -17,13 +17,13 @@
  * - no_upload_dir_perms  (Upload dir is not writeable)
  * </code>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Core 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7185 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9476 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -60,14 +60,21 @@ class class_attach
 	 *
 	 * @var		string
 	 */
-	public $attach_post_key = '';
+	public $attach_post_key		= '';
 	
 	/**
 	 * Relationship ID
 	 *
 	 * @var		integer
 	 */
-	public $attach_rel_id   = '';
+	public $attach_rel_id		= 0;
+	
+	/**
+	 * Relationship parent ID
+	 *
+	 * @var		int
+	 */
+	public $attach_parent_id	= 0;
 	
 	/**
 	 * Return variables
@@ -144,7 +151,7 @@ class class_attach
 	 * CONSTRUCTOR
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -161,7 +168,7 @@ class class_attach
 	/**
 	 * Initiates class
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function init()
 	{
@@ -218,7 +225,7 @@ class class_attach
 	 * Show the attachment (or force download)
 	 *
 	 * @param	int		Attachment ID (The main attach id)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showAttachment( $attach_id )
 	{
@@ -285,7 +292,7 @@ class class_attach
 
 	        $file = $this->_upload_path . "/" . $attach['attach_location'];
 
-			if( file_exists( $file ) and ( $attach_cache[ $attach['attach_ext'] ]['atype_mimetype'] != "" ) )
+			if( is_file( $file ) and ( $attach_cache[ $attach['attach_ext'] ]['atype_mimetype'] != "" ) )
 			{
 				/* Update the "hits".. */
 				$this->DB->buildAndFetch( array( 'update' => 'attachments', 'set' => "attach_hits=attach_hits+1", 'where' => "attach_id={$attach_id}" ) );
@@ -360,8 +367,164 @@ class class_attach
 			/*  No permission? */
 			$this->registry->getClass('output')->showError( 'no_permission_to_download', 10174, null, null, 403 );
 		}
-	}	
+	}
+
+	/**
+	 * Retrieve the HTML for a single attachment
+	 *
+	 * @param	mixed 	Array of attachment data, or an attachment ID
+	 * @param	string	Skin group to use
+	 * @param	bool	Whether to wrap with the attachment block wrapper or not
+	 * @return	string	Attachment HTML
+	 */
+	public function renderSingleAttachment( $attachment, $skin_name='topic', $use_wrapper=false )
+	{
+		if( is_int($attachment) )
+		{
+			$row	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'attachments', 'where' => 'attach_id=' . intval($attachment) ) );
+		}
+		else
+		{
+			$row	= $attachment;
+		}
+		
+		if( !$row['attach_id'] )
+		{
+			return '';
+		}
+		
+		$attachtypes	= $this->getAttachTypes();
+		$type			= '';
+
+		//-----------------------------------------
+		// Is it an image, and are we viewing the image in the post?
+		//-----------------------------------------
+		
+		if ( $this->settings['show_img_upload'] and $row['attach_is_image'] )
+		{
+			if ( $this->attach_settings['siu_thumb'] AND $row['attach_thumb_location'] AND $row['attach_thumb_width'] )
+			{
+				//-----------------------------------------
+				// Make sure we've not seen this ID
+				//-----------------------------------------
+				
+				$row['_attach_id'] = $row['attach_id'] . '-' . str_replace( array( '.', ' ' ), "-", microtime() );
+
+				$type	= 'thumb';
+				$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments_img_thumb( array(
+																															't_location'	=> $row['attach_thumb_location'],
+																															't_width'		=> $row['attach_thumb_width'],
+																															't_height'		=> $row['attach_thumb_height'],
+																															'o_width'		=> $row['attach_img_width'],
+																															'o_height'		=> $row['attach_img_height'],
+																															'attach_id'		=> $row['attach_id'],
+																															'_attach_id'	=> $row['_attach_id'],
+																															'file_size'		=> IPSLib::sizeFormat( $row['attach_filesize'] ),
+																															'attach_hits'	=> $row['attach_hits'],
+																															'location'		=> $row['attach_file'],
+																															'type'			=> $this->type,
+																															'notinline'		=> 1,
+																															'attach_rel_id'	=> $row['attach_rel_id']
+																					)		);
+			}
+			else
+			{
+				//-----------------------------------------
+				// Standard size..
+				//-----------------------------------------
+				
+				$type	= 'image';
+				$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments_img( array(
+																															'o_location'  => $row['attach_location'],
+																															'o_width'		=> $row['attach_img_width'],
+																															'o_height'		=> $row['attach_img_height'],
+																															'attach_id'		=> $row['attach_id'],
+																															'_attach_id'	=> $row['_attach_id'],
+																															'file_size'		=> IPSLib::sizeFormat( $row['attach_filesize'] ),
+																															'attach_hits'	=> $row['attach_hits'],
+																															'location'		=> $row['attach_file'],
+																															'type'			=> $this->type,
+																															'notinline'		=> 1,
+																															'attach_rel_id'	=> $row['attach_rel_id']
+																					)	);
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Full attachment thingy
+			//-----------------------------------------
+
+			$type	= 'attach';
+			$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments( array (
+																								'attach_hits'	=> $row['attach_hits'],
+																								'mime_image'	=> $attachtypes[ $row['attach_ext'] ]['atype_img'],
+																								'attach_file'	=> $row['attach_file'],
+																								'attach_id'		=> $row['attach_id'],
+																								'type'			=> $this->type,
+																								'file_size'		=> IPSLib::sizeFormat( $row['attach_filesize'] ),
+																					)		);
+		}
+
+		//-----------------------------------------
+		// Wrap?
+		//-----------------------------------------
+		
+		if ( $use_wrapper )
+		{
+			switch( $type )
+			{
+				case 'thumb':
+					$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->show_attachment_title( $this->lang->words['attach_thumbs'], $tmp, 'thumb' );
+				break;
+				
+				case 'image':
+					$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->show_attachment_title( $this->lang->words['attach_images'], $tmp, 'image' );
+				break;
+				
+				default:
+				case 'attach':
+					$tmp	= $this->registry->getClass('output')->getTemplate( $skin_name )->show_attachment_title( $this->lang->words['attach_normal'], $tmp, 'attach' );
+				break;
+			}
+		}
+
+		return $tmp;
+	}
 	
+	/**
+	 * Retrieve attachment types from cache
+	 *
+	 * @return	@e array
+	 */
+	protected function getAttachTypes()
+	{
+		//-----------------------------------------
+		// Got attachment types?
+		//-----------------------------------------
+
+		if ( ! is_array( $this->registry->cache()->getCache('attachtypes') ) )
+		{
+			$attachtypes = array();
+			
+			$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_img', 'from' => 'attachments_type' ) );
+			$outer = $this->DB->execute();
+
+			while ( $r = $this->DB->fetch( $outer ) )
+			{
+				$attachtypes[ $r['atype_extension'] ] = $r;
+			}
+			
+			$this->registry->cache()->updateCacheWithoutSaving( 'attachtypes', $attachtypes );
+		}
+		else
+		{
+			$attachtypes	= $this->registry->cache()->getCache('attachtypes');
+		}
+		
+		return $attachtypes;
+	}
+
 	/**
 	 * Swaps the HTML for the nice attachments.
 	 *
@@ -410,7 +573,7 @@ class class_attach
 		{
 			$returnArray[ $id ] = array( 'html' => $html, 'attachmentHtml' => '' );
 			
-			preg_match_all( "#\[attachment=(\d+?)\:(?:[^\]]+?)\]#is", $html, $match );
+			preg_match_all( '#\[attachment=(\d+?)\:(?:[^\]]+?)\]#is', $html, $match );
 			
 			if ( is_array( $match[0] ) and count( $match[0] ) )
 			{
@@ -437,27 +600,8 @@ class class_attach
 		
 		if ( is_array( $rows ) AND count( $rows ) )
 		{
-			//-----------------------------------------
-			// Got attachment types?
-			//-----------------------------------------
+			$attachtypes	= $this->getAttachTypes();
 
-			if ( ! is_array( $this->registry->cache()->getCache('attachtypes') ) )
-			{
-				$attachtypes = array();
-
-				$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_img', 'from' => 'attachments_type' ) );
-				$outer = $this->DB->execute();
-
-				while ( $r = $this->DB->fetch( $outer ) )
-				{
-					$attachtypes[ $r['atype_extension'] ] = $r;
-				}
-				
-				$this->registry->cache()->updateCacheWithoutSaving( 'attachtypes', $attachtypes );
-			}
-			
-			$_seen_rows = 0;
-		
 			foreach( $rows as $_attach_id => $row )
 			{
 				//-----------------------------------------
@@ -465,12 +609,6 @@ class class_attach
 				//-----------------------------------------
 				
 				$row = $rows[ $_attach_id ];
-				
-				if( $this->attach_rel_id != $row['attach_rel_id'] )
-				{
-					// Reset if we are onto a new post..
-					$_seen_rows = 0;
-				}
 
 				$this->attach_rel_id = $row['attach_rel_id'];
 				
@@ -492,9 +630,7 @@ class class_attach
 						//-----------------------------------------
 						
 						$row['_attach_id'] = $row['attach_id'] . '-' . str_replace( array( '.', ' ' ), "-", microtime() );
-						
-						$not_inline = $_seen_rows > 0 ? $_seen_rows%$this->settings['topic_attach_no_per_row'] : 1;
-						
+
 						$tmp = $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments_img_thumb( array( 't_location'  => $row['attach_thumb_location'],
 																											  		 't_width'     => $row['attach_thumb_width'],
 																											  		 't_height'    => $row['attach_thumb_height'],
@@ -506,7 +642,6 @@ class class_attach
 																											  		 'attach_hits' => $row['attach_hits'],
 																											  		 'location'    => $row['attach_file'],
 																													 'type'        => $this->type,
-																													 'notinline'   => $not_inline,
 																													 'attach_rel_id' => $row['attach_rel_id']
 																										)	);
 
@@ -527,24 +662,15 @@ class class_attach
 															 'row'       => $row,
 															 'skin_name' => $skin_name );
 							
-									$returnArray[ $_rel_id ]['html'] = preg_replace_callback( "#\[attachment=".$row['attach_id']."\:(?:[^\]]+?)[\n|\]]#is", array( &$this, '_parseThumbnailInline' ), $returnArray[ $_rel_id ]['html'] );
+									$returnArray[ $_rel_id ]['html'] = preg_replace_callback( '#\[attachment='.$row['attach_id'].'\:(?:[^\]]+?)[\n|\]]#is', array( &$this, '_parseThumbnailInline' ), $returnArray[ $_rel_id ]['html'] );
 								}
 								else if ( $_count )
 								{
 									# Just the one, then?
-									$returnArray[ $_rel_id ]['html'] = preg_replace( "#\[attachment=".$row['attach_id']."\:(?:[^\]]+?)[\n|\]]#is", $tmp, $returnArray[ $_rel_id ]['html'] );
+									$returnArray[ $_rel_id ]['html'] = preg_replace( '#\[attachment='.$row['attach_id'].'\:(?:[^\]]+?)[\n|\]]#is', $tmp, $returnArray[ $_rel_id ]['html'] );
 								}
 								else
 								{
-									# None. :(
-									$_seen++;
-							
-									if ( $_seen == $this->settings['topic_attach_no_per_row'] )
-									{
-										$tmp .= "\n<br />\n";
-										$_seen = 0;
-									}
-								
 									$final_blocks[ $_rel_id ]['thumb'][] = $tmp;
 								}
 							}
@@ -560,7 +686,19 @@ class class_attach
 						// Standard size..
 						//-----------------------------------------
 						
-						$tmp = $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments_img( $row['attach_location'] );
+						$tmp = $this->registry->getClass('output')->getTemplate( $skin_name )->Show_attachments_img( array(
+																															'o_location'  => $row['attach_location'],
+																															'o_width'		=> $row['attach_img_width'],
+																															'o_height'		=> $row['attach_img_height'],
+																															'attach_id'		=> $row['attach_id'],
+																															'_attach_id'	=> $row['_attach_id'],
+																															'file_size'		=> IPSLib::sizeFormat( $row['attach_filesize'] ),
+																															'attach_hits'	=> $row['attach_hits'],
+																															'location'		=> $row['attach_file'],
+																															'type'			=> $this->type,
+																															'notinline'		=> 1,
+																															'attach_rel_id'	=> $row['attach_rel_id']
+																					)	);
 						
 						if ( is_array( $map_attach_id_to_rel_id[ $_attach_id ] ) AND count( $map_attach_id_to_rel_id[ $_attach_id ] ) )
 						{
@@ -568,7 +706,7 @@ class class_attach
 							{
 								if ( strstr( $htmlArray[ $_rel_id ], '[attachment='.$row['attach_id'].':' ) )
 								{
-									$returnArray[ $_rel_id ]['html'] = preg_replace( "#\[attachment=".$row['attach_id']."\:(?:[^\]]+?)[\n|\]]#is", $tmp, $returnArray[ $_rel_id ]['html'] );
+									$returnArray[ $_rel_id ]['html'] = preg_replace( '#\[attachment='.$row['attach_id'].'\:(?:[^\]]+?)[\n|\]]#is', $tmp, $returnArray[ $_rel_id ]['html'] );
 								}
 								else
 								{
@@ -604,7 +742,7 @@ class class_attach
 						{
 							if ( strstr( $htmlArray[ $_rel_id ], '[attachment='.$row['attach_id'].':' ) )
 							{
-								$returnArray[ $_rel_id ]['html'] = preg_replace( "#\[attachment=".$row['attach_id']."\:(?:[^\]]+?)[\n|\]]#is", $tmp, $returnArray[ $_rel_id ]['html'] );
+								$returnArray[ $_rel_id ]['html'] = preg_replace( '#\[attachment='.$row['attach_id'].'\:(?:[^\]]+?)[\n|\]]#is', $tmp, $returnArray[ $_rel_id ]['html'] );
 							}
 							else
 							{
@@ -722,7 +860,7 @@ class class_attach
 	/**
 	 * Removes an attachment.
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function removeAttachment()
 	{
@@ -758,8 +896,7 @@ class class_attach
 			// Remove from the DB
 			//-----------------------------------------
 			
-			$this->DB->buildAndFetch( array( 'delete' => 'attachments',
-															  'where'  => 'attach_id='.$attachment['attach_id'] ) );
+			$this->DB->delete( 'attachments', 'attach_id='.$attachment['attach_id'] );
 			
 			//-----------------------------------------
 			// Remove from the filesystem
@@ -806,8 +943,9 @@ class class_attach
 		// Got any to update?
 		//-----------------------------------------
 		
-		$this->DB->update( 'attachments', array( 'attach_rel_id'     => $this->attach_rel_id,
-			  										'attach_rel_module' => $this->type ), "attach_post_key='{$this->attach_post_key}'" );
+		$this->DB->update( 'attachments', array(	'attach_rel_id'		=> $this->attach_rel_id,
+													'attach_parent_id'	=> intval($this->attach_parent_id),
+			  										'attach_rel_module'	=> $this->type ), "attach_post_key='{$this->attach_post_key}'" );
 			
 		//-----------------------------------------
 		// Update module specific?
@@ -843,6 +981,16 @@ class class_attach
 			}
 		}
 
+		//-----------------------------------------
+		// Can upload?
+		//-----------------------------------------
+		
+		if ( ! $this->attach_stats['allow_uploads'] )
+		{
+			$this->error = 'upload_failed';
+			return;
+		}
+
 		//-----------------------------------------
 		// Got attachment types?
 		//-----------------------------------------
@@ -852,9 +1000,9 @@ class class_attach
 			$attachtypes = array();
 
 			$this->DB->build( array(
-											'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img',
-											'from'   => 'attachments_type',
-											'where'  => "atype_photo=1 OR atype_post=1" 
+									'select'	=> 'atype_extension,atype_mimetype,atype_post,atype_img',
+									'from'		=> 'attachments_type',
+									'where'		=> "atype_post=1" 
 								)	);
 			$this->DB->execute();
 	
@@ -865,16 +1013,6 @@ class class_attach
 			
 			$this->registry->cache()->updateCacheWithoutSaving( 'attachtypes', $attachtypes );
 		}
-
-		//-----------------------------------------
-		// Can upload?
-		//-----------------------------------------
-		
-		if ( ! $this->attach_stats['allow_uploads'] )
-		{
-			$this->error = 'upload_failed';
-			return;
-		}
 		
 		//-----------------------------------------
 		// Set up array
@@ -898,7 +1036,7 @@ class class_attach
 		// Load the library
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
+		require_once( IPS_KERNEL_PATH.'classUpload.php' );/*noLibHook*/
 		$upload = new classUpload();
 		
 		//-----------------------------------------
@@ -974,7 +1112,7 @@ class class_attach
 		// Still here?
 		//-----------------------------------------
 
-		if ( $upload->saved_upload_name and @file_exists( $upload->saved_upload_name ) )
+		if ( $upload->saved_upload_name and @is_file( $upload->saved_upload_name ) )
 		{
 			//-----------------------------------------
 			// Strip off { } and [ ]
@@ -999,30 +1137,66 @@ class class_attach
 			
 			if ( $attach_data['attach_is_image'] == 1 )
 			{
-				require_once( IPS_KERNEL_PATH."classImage.php" ); 
-				require_once( IPS_KERNEL_PATH."classImageGd.php" );
+				require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+				require_once( IPS_KERNEL_PATH . 'classImageGd.php' );/*noLibHook*/
+				
+				/* Main attachment */
+				if ( ! empty( $this->settings['attach_img_max_w'] ) AND ! empty( $this->settings['attach_img_max_h'] ) )
+				{
+					$image = new classImageGd();
+					
+					$image->init( array( 'image_path' => $this->upload_path, 
+				                         'image_file' => $upload->parsed_file_name ) );
+    				
+					$image->force_resize	= false;
+					
+					if ( $imgData = $image->resizeImage( $this->settings['attach_img_max_w'], $this->settings['attach_img_max_h'], false, true ) )
+					{
+						if( !$imgData['noResize'] )
+						{
+							$image->writeImage( $this->upload_path . '/' . $upload->parsed_file_name );
+						}
+						
+						if ( is_array( $imgData ) )
+						{
+							$attach_data['attach_img_width']  = $imgData['newWidth'];
+							$attach_data['attach_img_height'] = $imgData['newHeight'];
+						}
+					}
+				}
+				
+				/* Thumb nail */
 				$image = new classImageGd();
-
 				$image->force_resize = true;
 				
-				$image->init( array( 
-				                         'image_path'     => $this->upload_path, 
-				                         'image_file'     => $upload->parsed_file_name, 
-				               )          );
+				$image->init( array( 'image_path' => $this->upload_path, 
+				                     'image_file' => $upload->parsed_file_name ) );
 				
 				if ( $this->attach_settings['siu_thumb'] )
 				{
-					$_thumbName = preg_replace( "#^(.*)\.(\w+?)$#", "\\1_thumb.\\2", $upload->parsed_file_name );
-					
-					if( $thumb_data = $image->resizeImage( $this->attach_settings['siu_width'], $this->attach_settings['siu_height'] ) )
+					if( $this->attach_settings['siu_width'] < $attach_data['attach_img_width'] OR $this->attach_settings['siu_height'] < $attach_data['attach_img_height'] )
 					{
-						$image->writeImage( $this->upload_path . '/' . $_thumbName );
+						$_thumbName = preg_replace( '#^(.*)\.(\w+?)$#', "\\1_thumb.\\2", $upload->parsed_file_name );
 						
-						if ( is_array( $thumb_data ) )
+						if( $thumb_data = $image->resizeImage( $this->attach_settings['siu_width'], $this->attach_settings['siu_height'] ) )
 						{
-							$thumb_data['thumb_location'] = $_thumbName;
+							$image->writeImage( $this->upload_path . '/' . $_thumbName );
+							
+							if ( is_array( $thumb_data ) )
+							{
+								$thumb_data['thumb_location'] = $_thumbName;
+							}
 						}
 					}
+					else
+					{
+						/* Instead of building a thumb the same size as the main image, just copy the details */
+						$thumb_data	= array(
+											'thumb_location'	=> $upload->parsed_file_name,
+											'newWidth'			=> $attach_data['attach_img_width'],
+											'newHeight'			=> $attach_data['attach_img_height'],
+											);
+					}
 				}
 				
 				if ( $thumb_data['thumb_location'] )
@@ -1032,9 +1206,19 @@ class class_attach
 					$attach_data['attach_thumb_width']    = $thumb_data['newWidth'];
 					$attach_data['attach_thumb_height']   = $thumb_data['newHeight'];
 					$attach_data['attach_thumb_location'] = $this->upload_dir . $thumb_data['thumb_location'];
-				}
+				}			
 			}
 			
+			//-----------------------------------------
+			// Make sure we send integers
+			// @link	http://community.invisionpower.com/tracker/issue-32511-attachments-mysql-strict-mode
+			//-----------------------------------------
+			
+			$attach_data['attach_img_width']	= intval( $attach_data['attach_img_width'] );
+			$attach_data['attach_img_height']	= intval( $attach_data['attach_img_height'] );
+			$attach_data['attach_thumb_width']	= intval( $attach_data['attach_thumb_width'] );
+			$attach_data['attach_thumb_height']	= intval( $attach_data['attach_thumb_height'] );
+			
 			//-----------------------------------------
 			// Add into Database
 			//-----------------------------------------
@@ -1080,10 +1264,9 @@ class class_attach
 		{
 			$attachtypes = array();
 
-			$this->DB->build( array( 
-											'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img',
-											'from'   => 'attachments_type',
-											'where'  => "atype_photo=1 OR atype_post=1" 
+			$this->DB->build( array('select'	=> 'atype_extension,atype_mimetype,atype_post,atype_img',
+									'from'		=> 'attachments_type',
+									'where'		=> "atype_post=1" 
 									)	 );
 			$this->DB->execute();
 	
@@ -1096,7 +1279,7 @@ class class_attach
 		}
 				
 		/* Attachment Library */
-		require_once( IPS_KERNEL_PATH.'classUpload.php' );
+		require_once( IPS_KERNEL_PATH . 'classUpload.php' );/*noLibHook*/
 		$upload = new classUpload();
 		
 		/* Set up the library */
@@ -1188,7 +1371,7 @@ class class_attach
 				}
 				
 				/* Still Here */
-				if( $upload->saved_upload_name and @file_exists( $upload->saved_upload_name ) )
+				if( $upload->saved_upload_name and @is_file( $upload->saved_upload_name ) )
 				{
 					/* Strip off { } and [ ] */
 					$upload->original_file_name = str_replace( array( '[', ']', '{', '}' ), "", $upload->original_file_name );
@@ -1199,24 +1382,50 @@ class class_attach
 					$attach_data['attach_is_image'] = $upload->is_image;
 					$attach_data['attach_ext']      = $upload->real_file_extension;
 					
-					if( $attach_data['attach_is_image'] == 1 )
+					if ( $attach_data['attach_is_image'] == 1 )
 					{
-						require_once( IPS_KERNEL_PATH."classImage.php" ); 
-						require_once( IPS_KERNEL_PATH."classImageGd.php" );
+						require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+						require_once( IPS_KERNEL_PATH . 'classImageGd.php' );/*noLibHook*/
+						
+						/* Main attachment */
+						if ( ! empty( $this->settings['attach_img_max_w'] ) AND ! empty( $this->settings['attach_img_max_h'] ) )
+						{
+							$image = new classImageGd();
+							
+							$image->init( array( 'image_path' => $this->upload_path, 
+						                         'image_file' => $upload->parsed_file_name ) );
+							
+							if ( $imgData = $image->resizeImage( $this->settings['attach_img_max_w'], $this->settings['attach_img_max_h'] ) )
+							{
+								$image->writeImage( $this->upload_path . '/' . $upload->parsed_file_name );
+								
+								if ( is_array( $imgData ) )
+								{
+									$attach_data['attach_img_width']  = $imgData['newWidth'];
+									$attach_data['attach_img_height'] = $imgData['newHeight'];
+								}
+							}
+						}
+						
+						/* Thumb nail */
 						$image = new classImageGd();
 						$image->force_resize = true;
 						
-						$image->init( array( 'image_path' => $this->upload_path, 'image_file' => $upload->parsed_file_name ) );
+						$image->init( array( 'image_path' => $this->upload_path, 
+						                     'image_file' => $upload->parsed_file_name ) );
 						
 						if ( $this->attach_settings['siu_thumb'] )
 						{
-							$_thumbName = preg_replace( "#^(.*)\.(\w+?)$#", "\\1_thumb.\\2", $upload->parsed_file_name );
-							$thumb_data = $image->resizeImage( $this->attach_settings['siu_width'], $this->attach_settings['siu_height'] );
-							$image->writeImage( $this->upload_path . '/' . $_thumbName );
+							$_thumbName = preg_replace( '#^(.*)\.(\w+?)$#', "\\1_thumb.\\2", $upload->parsed_file_name );
 							
-							if ( is_array( $thumb_data ) )
+							if( $thumb_data = $image->resizeImage( $this->attach_settings['siu_width'], $this->attach_settings['siu_height'] ) )
 							{
-								$thumb_data['thumb_location'] = $_thumbName;
+								$image->writeImage( $this->upload_path . '/' . $_thumbName );
+								
+								if ( is_array( $thumb_data ) )
+								{
+									$thumb_data['thumb_location'] = $_thumbName;
+								}
 							}
 						}
 						
@@ -1229,7 +1438,7 @@ class class_attach
 							$attach_data['attach_thumb_location'] = $this->upload_dir . $thumb_data['thumb_location'];
 						}
 					}
-					
+			
 					/* Add into Database */
 					$this->DB->insert( 'attachments', $attach_data );
 	
@@ -1244,7 +1453,7 @@ class class_attach
 	/**
 	 * Gets stuff required for the upload form
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function getUploadFormSettings()
 	{
@@ -1275,19 +1484,19 @@ class class_attach
 			/* Unlimited... */
 			$this->attach_stats['allow_uploads']             = 1;
 			$this->attach_stats['space_allowed']             = 'unlimited';
-			$this->attach_stats['space_allowed_human']       = $this->language[ 'unlimited' ];
+			$this->attach_stats['space_allowed_human']       = $this->language['unlimited'];
 			$this->attach_stats['space_left']                = 'unlimited';
-			$this->attach_stats['space_left_human']          = $this->language[ 'unlimited' ];
-			$this->attach_stats['total_space_allowed_human'] = $this->language[ 'unlimited' ];
+			$this->attach_stats['space_left_human']          = $this->language['unlimited'];
+			$this->attach_stats['total_space_allowed_human'] = $this->language['unlimited'];
 		}
 		else if ( $stats['space_allowed'] == -1 )
 		{
 			/* None */
 			$this->attach_stats['allow_uploads']       = 0;
 			$this->attach_stats['space_allowed']       = 'not_allowed';
-			$this->attach_stats['space_allowed_human'] = $this->language[ 'not_allowed' ];
+			$this->attach_stats['space_allowed_human'] = $this->language['not_allowed'];
 			$this->attach_stats['space_left']          = 'not_allowed';
-			$this->attach_stats['space_left_human']    = $this->language[ 'not_allowed' ];
+			$this->attach_stats['space_left_human']    = $this->language['not_allowed'];
 		}
 		else
 		{
@@ -1308,10 +1517,10 @@ class class_attach
 		/* Check dir exists... */
 		if( ! file_exists( $this->upload_path ) )
 		{
-			if( @mkdir( $this->upload_path, 0777 ) )
+			if( @mkdir( $this->upload_path, IPS_FOLDER_PERMISSION ) )
 			{
 				@file_put_contents( $this->upload_path . '/index.html', '' );
-				@chmod( $this->upload_path, 0777 );
+				@chmod( $this->upload_path, IPS_FOLDER_PERMISSION );
 			}
 			else
 			{
@@ -1335,10 +1544,10 @@ class class_attach
 
 			if( ! file_exists( $path ) )
 			{
-				if( @mkdir( $path, 0777 ) )
+				if( @mkdir( $path, IPS_FOLDER_PERMISSION ) )
 				{
 					@file_put_contents( $path . '/index.html', '' );
-					@chmod( $path, 0777 );
+					@chmod( $path, IPS_FOLDER_PERMISSION );
 				
 					# Set path and dir correct
 					$this->upload_path .= '/' . $this_month;
@@ -1366,8 +1575,7 @@ class class_attach
 	/**
 	 * Loads child extends class.
 	 *
-	 * @return	void
-	 * @todo	Should we add a check here in the foreach to see if the application is enabled?
+	 * @return	@e void
 	 */
 	public function loadAttachmentPlugin()
 	{
@@ -1378,9 +1586,9 @@ class class_attach
 		if( ! is_object( $this->plugin ) && $this->type )
 		{
 			/* Load... */
-			foreach( ipsRegistry::$applications as $app )
+			foreach( IPSLIb::getEnabledApplications() as $app )
 			{
-				if( file_exists( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/attachments/plugin_' . $this->type . '.php' ) )
+				if( is_file( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/attachments/plugin_' . $this->type . '.php' ) )
 				{
 					$classToLoad  = IPSLib::loadLibrary( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/attachments/plugin_' . $this->type . '.php', 'plugin_'.$this->type, $app['app_directory'] );
 					$this->plugin = new $classToLoad( $this->registry );
@@ -1406,7 +1614,7 @@ class class_attach
 	 * @param	array	Array of matches from preg_replace_callback
 	 * @return	string	HTML
 	 */
-	private function _parseThumbnailInline( $matches )
+	protected function _parseThumbnailInline( $matches )
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/core/sources/classes/attach/index.html b/upload/admin/applications/core/sources/classes/attach/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/sources/classes/attach/index.html
+++ b/upload/admin/applications/core/sources/classes/attach/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/classes/hooks/gateway.php b/upload/admin/applications/core/sources/classes/hooks/gateway.php
index 26d678a5..7c8d3afe 100644
--- a/upload/admin/applications/core/sources/classes/hooks/gateway.php
+++ b/upload/admin/applications/core/sources/classes/hooks/gateway.php
@@ -2,28 +2,36 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Subscriptions Hooks Gateway "Handler"
  * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
- * Last Updated: $Date: 2010-01-15 15:18:44 +0000 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-06-10 13:49:21 -0400 (Fri, 10 Jun 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9029 $
  */
 
 class core_hookGateway
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
@@ -33,13 +41,12 @@ class core_hookGateway
 	protected $memberData;
 	protected $cache;
 	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Method constructor
 	 *
 	 * @param	object		Registry Object
-	 * @return	void
+	 * @return	@e void
 	 */
 	function __construct( ipsRegistry $registry )
 	{
@@ -55,131 +62,4 @@ class core_hookGateway
 		$this->caches		=& $this->registry->cache()->fetchCaches();
 		
 	}
-    
-
-    /**
-     * Shows board index recent entries
-     *
-     */
-    public function shareLinks()
-    {
-    	/* System enabled? */
-    	if ( ! $this->settings['sl_enable'] OR ! $this->settings['sl_publicdata'] OR ! $this->memberData['member_id'] )
-    	{
-    		return '';
-    	}
-    	
-    	/* INIT */
-    	$fetchData 			  = array();
-    	$finalData			  = array();
-    	$noThisIsFinalReally  = array();
-    	
-    	/* Fetch cached data */
-    	$this->DB->build( array( 'select' => '*',
-    							 'from'   => 'core_share_links_caches',
-    							 'where'  => "cache_key IN ('mostitems', 'mostrecent', 'mosttypes')" ) );
-    							 
-    	$this->DB->execute();
-    	
-    	while( $row = $this->DB->fetch() )
-    	{
-    		$caches[ $row['cache_key'] ] = ( $row['cache_data'] ) ? unserialize( $row['cache_data'] ) : array();
-    	}
-    	
-    	foreach( array( 'mostrecent', 'mostitems' ) as $items )
-    	{
-    		/* Build an array of data up */
-    		if ( is_array( $caches[ $items ] ) AND count( $caches[ $items ] ) )
-    		{
-    			foreach( $caches[ $items ] as $data )
-    			{
-    				if ( $data['log_data_app'] AND $data['log_data_type'] AND $data['log_data_primary_id'] )
-    				{
-    					$key = $data['log_data_app'] . '--' . $data['log_data_type'] . '--' . $data['log_data_primary_id'];
-    					
-    					$fetchData[ $data['log_data_app'] ][ $key ] = $data;
-    				}
-    			}
-    		}
-    	}
-    	
-    	/* Now go and fetch the data for the grabbed stuff */
-    	if ( is_array( $fetchData ) AND count( $fetchData ) )
-    	{
-    		foreach( $fetchData as $app => $data )
-    		{
-    			$finalData[ $app ] = $this->_fetchAppData( $app, $data );
-    		}
-    	}
-    	
-    	/* Now to mash it all back */
-    	if ( is_array( $finalData ) AND count( $finalData ) )
-    	{
-    		foreach( array( 'mostrecent', 'mostitems' ) as $items )
-	    	{
-	    		/* Build an array of data up */
-	    		if ( is_array( $caches[ $items ] ) AND count( $caches[ $items ] ) )
-	    		{
-	    			foreach( $caches[ $items ] as $data )
-	    			{
-	    				if ( $data['log_data_app'] AND $data['log_data_type'] AND $data['log_data_primary_id'] )
-	    				{
-	    					$key = $data['log_data_app'] . '--' . $data['log_data_type'] . '--' . $data['log_data_primary_id'];
-	    					
-	    					if ( is_array( $finalData[ $data['log_data_app'] ][ $key ] ) )
-	    					{
-	    						$noThisIsFinalReally[ $items ][] = array_merge( $data, $finalData[ $data['log_data_app'] ][ $key ] );
-	    					}
-	    				}
-	    			}
-	    		}
-	    	}
-    	}
-    	
-		return $this->registry->getClass('output')->getTemplate('boards')->hookBoardIndexShareLinks( $noThisIsFinalReally );
-    }
-    
-    /**
-     * Fetch application data
-     *
-     * @param	string		App
-     * @param	array		Array of incoming data
-     * @return	array		Array of outgoing data
-     */
-    protected function _fetchAppData( $appKey, $data )
-    {
-    	if ( $appKey )
-    	{
-    		$app_cache = $this->cache->getCache('app_cache');
-			$app       = $app_cache[ $appKey ];
-			
-			/* Only if app enabled... */
-			if ( $app['app_enabled'] )
-			{
-				/* Setup */
-				$_file  = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/coreExtensions.php';
-					
-				/* Check for the file */
-				if( file_exists( $_file ) )
-				{
-					/* Get the file */
-					$_class = IPSLib::loadLibrary( $_file, $app['app_directory'] . 'ShareLinks', $app['app_directory'] );
-					
-					/* Check for the class */
-					if( class_exists( $_class ) )
-					{
-						/* Create an object */
-						$_obj = new $_class();
-
-						/* Check for the module */
-						if( method_exists( $_obj, 'processData' ) )
-						{
-							/* Call it */
-							return $_obj->processData( $data );
-						}
-					}
-				}
-			}
-		}
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/classes/hooks/index.html b/upload/admin/applications/core/sources/classes/hooks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/sources/classes/hooks/index.html
+++ b/upload/admin/applications/core/sources/classes/hooks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/classes/hooksFunctions.php b/upload/admin/applications/core/sources/classes/hooksFunctions.php
index 44066789..45f7d0ab 100644
--- a/upload/admin/applications/core/sources/classes/hooksFunctions.php
+++ b/upload/admin/applications/core/sources/classes/hooksFunctions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Library of shared methods for hooks installation/configuration
- * Last Updated: $LastChangedDate: 2010-10-14 13:15:13 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-07-22 06:21:22 -0400 (Fri, 22 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6980 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9303 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,11 +24,19 @@ if ( ! defined( 'IN_IPB' ) )
 
 class hooksFunctions
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
@@ -38,13 +46,12 @@ class hooksFunctions
 	protected $memberData;
 	protected $cache;
 	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -62,7 +69,7 @@ class hooksFunctions
 		$this->caches		=& $this->registry->cache()->fetchCaches();
 		$this->lang 		= $this->registry->class_localization;
 		
-		$this->lang->loadLanguageFile( array( 'admin_applications' ) );
+		$this->lang->loadLanguageFile( array( 'admin_applications' ), 'core' );
 	}
 	
 	/**
@@ -79,20 +86,17 @@ class hooksFunctions
 			return array();
 		}
 
-		$type		= $type ? $type : 'foreach';
-
-		$return		= array( array( 0, $this->lang->words['h_selectid'] ) );
-		$seenids	= array();
-		$presort	= array();
+		$type    = $type ? $type : 'foreach';
+		$return = array();
 		
-		$this->DB->build( array( 'select' => 'template_content', 'from' => 'skin_templates', 'where' => "template_set_id=0 AND template_master_key='root' AND template_name='{$template}'" ) );
+		$this->DB->build( array( 'select' => 'template_content', 'from' => 'skin_templates', 'where' => "template_set_id=0 AND template_name='{$template}'" ) );
 		$this->DB->execute();
 
 		while( $r = $this->DB->fetch() )
 		{
 			/* Use regex to try to find the ids */
 			
-			$matches	= array();
+			$matches = array();
 			
 			if( $type == 'foreach' )
 			{
@@ -100,25 +104,23 @@ class hooksFunctions
 			}
 			else
 			{
-				preg_match_all( "#\<if\s+test=\"(.+?)\:\|\:(.+?)\"\>#i", $r['template_content'], $matches );
+				preg_match_all( "#\<if\s+test=\"([^\>]+?)\:\|\:(.+?)\"\>#i", $r['template_content'], $matches );
 			}
-			
+
 			if( is_array($matches[1]) AND count($matches[1]) )
 			{
 				foreach( $matches[1] as $match )
 				{
-					$presort[ $match ] = array( $match, $match );
+					$return[ $match ] = array( $match, $match );
 				}
 			}
 		}
 		
 		/* Put the ids in alphabetical order, kinda hacky, oh well ;) */
-		ksort( $presort );
-		foreach( $presort as $k => $v )
-		{
-			$return[$k] = $v;
-		}
-				
+		ksort( $return );
+		
+		array_unshift( $return, array( 0, $this->lang->words['h_selectid'] ) );
+		
 		return $return;
 	}
 	
@@ -176,7 +178,7 @@ class hooksFunctions
 	public function getCSSFiles()
 	{
 		/* Query CSS Files */
-		$this->DB->build( array( 'select' => '*', 'from' => 'skin_css', 'order' => 'css_set_id ASC' ) );
+		$this->DB->build( array( 'select' => $this->DB->buildDistinct('css_group'), 'from' => 'skin_css', 'order' => 'css_group ASC' ) );
 		$this->DB->execute();
 		
 		/* Loop through CSS Files and add to array */
@@ -184,7 +186,7 @@ class hooksFunctions
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$cssFiles[] = array( $r['css_id'], $r['css_set_id'] . ': ' . $r['css_group'] );
+			$cssFiles[] = array( $r['css_group'], $r['css_group'] );
 		}
 		
 		return $cssFiles;
@@ -199,12 +201,12 @@ class hooksFunctions
 	{
 		$return		= array();
 		
-		$this->DB->build( array( 'select' => 'conf_title_id, conf_title_title', 'from' => 'core_sys_settings_titles', 'order' => 'conf_title_title ASC' ) );
+		$this->DB->build( array( 'select' => 'conf_title_keyword, conf_title_title', 'from' => 'core_sys_settings_titles', 'order' => 'conf_title_title ASC' ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$return[] = array( $r['conf_title_id'], $r['conf_title_title'] );
+			$return[] = array( $r['conf_title_keyword'], $r['conf_title_title'] );
 		}
 		
 		return $return;
@@ -219,12 +221,12 @@ class hooksFunctions
 	{
 		$return		= array();
 		
-		$this->DB->build( array( 'select' => 'conf_id, conf_title', 'from' => 'core_sys_conf_settings', 'order' => 'conf_title ASC' ) );
+		$this->DB->build( array( 'select' => 'conf_key, conf_title', 'from' => 'core_sys_conf_settings', 'order' => 'conf_title ASC' ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$return[] = array( $r['conf_id'], $r['conf_title'] );
+			$return[] = array( $r['conf_key'], $r['conf_title'] );
 		}
 		
 		return $return;
@@ -259,7 +261,7 @@ class hooksFunctions
 		while( $r = $this->DB->fetch() )
 		{
 			$admin  = $r['sys_module_admin'] ? $this->lang->words['hook_admin_module']     : $this->lang->words['hook_public_module'];
-			$prefix = $r['sys_module_admin'] ? mb_strtolower( $this->lang->words['a_admin'] ) : mb_strtolower( $this->lang->words['a_public'] );
+			$prefix = $r['sys_module_admin'] ? 'admin' : 'public';
 			
 			$return[] = array( $prefix.'-'.$r['sys_module_application'].'-'.$r['sys_module_key'], $r['app_title'] . ':: ' . $r['sys_module_title'] . $admin );
 		}
@@ -281,7 +283,7 @@ class hooksFunctions
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$return[] = array( $r['id'], $r['title'] );
+			$return[] = array( $r['title'], $r['title'] );
 		}
 		
 		return $return;
@@ -296,12 +298,12 @@ class hooksFunctions
 	{
 		$return		= array();
 		
-		$this->DB->build( array( 'select' => 'task_id, task_title', 'from' => 'task_manager', 'order' => 'task_title ASC' ) );
+		$this->DB->build( array( 'select' => 'task_key, task_title', 'from' => 'task_manager', 'order' => 'task_title ASC' ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$return[] = array( $r['task_id'], $r['task_title'] );
+			$return[] = array( $r['task_key'], $r['task_title'] );
 		}
 		
 		return $return;
@@ -321,7 +323,7 @@ class hooksFunctions
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$return[] = array( $r['word_app'].'_'.$r['word_pack'], $r['word_app'].'_'.$r['word_pack'] );
+			$return[] = array( $r['word_app'] . '_' . $r['word_pack'], $r['word_app'] . '_' . $r['word_pack'] );
 		}
 		
 		return $return;
@@ -340,11 +342,10 @@ class hooksFunctions
 			return array();
 		}
 		
-		$bits = explode( '_', $file );
-		$app  = $bits[0];
-		$pack = str_replace( $app.'_', '', $file );
-		
-		$return		= array();
+		$bits	= explode( '_', $file );
+		$app	= $bits[0];
+		$pack	= str_replace( $app . '_', '', $file );
+		$return	= array();
 		
 		$this->DB->build( array( 'select' => $this->DB->buildDistinct( 'word_key' ), 'from' => 'core_sys_lang_words', 'where' => "word_app='{$app}' AND word_pack='{$pack}'", 'order' => 'word_key ASC' ) );
 		$this->DB->execute();
diff --git a/upload/admin/applications/core/sources/classes/index.html b/upload/admin/applications/core/sources/classes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/sources/classes/index.html
+++ b/upload/admin/applications/core/sources/classes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/classes/reportLibrary.php b/upload/admin/applications/core/sources/classes/reportLibrary.php
index 885a43ee..8869e028 100644
--- a/upload/admin/applications/core/sources/classes/reportLibrary.php
+++ b/upload/admin/applications/core/sources/classes/reportLibrary.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Library for reported content
- * Last Updated: $LastChangedDate: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-08-19 20:27:50 -0400 (Fri, 19 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6997 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9401 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,19 +25,28 @@ if ( ! defined( 'IN_IPB' ) )
 
 class reportLibrary
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/
+	protected $caches;
 	
 	/**
 	 * Group Ids
@@ -84,8 +93,8 @@ class reportLibrary
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -105,6 +114,62 @@ class reportLibrary
 		$this->member_group_ids	= array( $this->memberData['member_group_id'] );
 		$this->member_group_ids	= array_diff( array_merge( $this->member_group_ids, explode( ',', $this->memberData['mgroup_others'] ) ), array('') );
 	}
+	
+	/**
+	 * Recache report center plugins
+	 *
+	 * @return	@e void
+	 */
+	public function rebuildReportCache()
+	{
+		$_classes	= array();
+		
+		$this->DB->build( array( 'select' => '*', 'from' => 'rc_classes', 'where' => 'onoff=1' ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			if( IPSLib::appIsInstalled( $r['app'] ) )
+			{
+				$_classes[ $r['my_class'] ]	= $r;
+			}
+		}
+		
+		$this->cache->setCache( 'report_plugins' , $_classes, array( 'array' => 1 ) );
+	}
+
+	/**
+	 * Returns the correct status icon / flag to display for a report row
+	 *
+	 * @param	array    Report Row
+	 * @return	string
+	 */
+	public function buildStatusIcon( $row )
+	{
+		$this->buildStatuses( true );
+		
+		//-----------------------------------------
+		// Pick the right flag.. or else!
+		//-----------------------------------------
+
+		$row['img']		= str_replace( '<#IMG_DIR#>', $this->registry->output->skin['set_image_dir'], $this->flag_cache[ $row['status'] ][ $row['points'] ]['img'] );
+		$row['width']	= $this->flag_cache[ $row['status'] ][ $row['points'] ]['width'];
+		$row['height']	= $this->flag_cache[ $row['status'] ][ $row['points'] ]['height'];
+		$row['is_png']	= $this->flag_cache[ $row['status'] ][ $row['points'] ]['is_png'];
+
+		//-----------------------------------------
+		// Image? PNG? Using 'Is-Evil' machine?
+		//-----------------------------------------
+		
+		if( $row['img'] != '' )
+		{
+			return $this->registry->getClass('output')->getTemplate('reports')->statusIcon( $row['img'], $row['width'], $row['height'] );
+		}
+		else
+		{
+			return '&nbsp;';
+		}
+	}
 
 	/**
 	 * Rebuild the member cache array if it is outdated
@@ -147,7 +212,7 @@ class reportLibrary
 															'where'		=> 'stat.status=rep.status'
 															),
 														array(
-															'select'	=> 'rcl.com_id, rcl.com_id, rcl.my_class, rcl.extra_data',
+															'select'	=> 'rcl.com_id, rcl.com_id, rcl.my_class, rcl.extra_data, rcl.app',
 															'from'		=> array( 'rc_classes' => 'rcl' ),
 															'where'		=> 'rcl.com_id=rep.rc_class'
 															),
@@ -168,10 +233,13 @@ class reportLibrary
 		
 		foreach( $reports_by_plugin as $app => $plugins )
 		{
-			foreach( $plugins as $plugin_name => $reports_array )
+			if( IPSLib::appIsInstalled( $app ) )
 			{
-				$this->loadPlugin( $plugin_name, $app );
-				$this->plugins[ $plugin_name ]->updateReportsTimestamp( $reports_array, $build_member_cache_array );
+				foreach( $plugins as $plugin_name => $reports_array )
+				{
+					$this->loadPlugin( $plugin_name, $app );
+					$this->plugins[ $plugin_name ]->updateReportsTimestamp( $reports_array, $build_member_cache_array );
+				}
 			}
 		}
 		
@@ -182,7 +250,7 @@ class reportLibrary
 		{
 			IPSMember::packMemberCache( $this->memberData['member_id'], $build_member_cache_array );
 		}
-			
+	
 		return $total['reports'];
 	}
 	
@@ -211,52 +279,73 @@ class reportLibrary
 		// Get components we have access to...
 		//-----------------------------------------
 		
-		$this->DB->buildFromCache( 'get_class_permissions', array( 'COL' => $col, 'GROUP_IDS' => $this->member_group_ids ), 'report_sql_queries' );
-		$res = $this->DB->execute(); 
-
-		while( $row = $this->DB->fetch( $res ) )
+		foreach( $this->cache->getCache('report_plugins') as $_className => $row )
 		{
-			if( $row['my_class'] != '' )
+			if( !IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $row[ $col ] ) ) ) )
 			{
-				$spec_perm = '';	
-				
-				$this->loadPlugin( $row['my_class'], $row['app'] );
-				
-				if( !$this->plugins[ $row['my_class'] ] )
-				{
-					continue;
-				}
-				
-				if( $row['extra_data'] && $row['extra_data'] != 'N;' )
-				{
-					$this->plugins[ $row['my_class'] ]->_extra = unserialize( $row['extra_data'] );
-				}
-				else
-				{
-					$this->plugins[ $row['my_class'] ]->_extra = array();
-				}
+				continue;
+			}
 
-				if( $this->plugins[ $row['my_class'] ]->getReportPermissions( $check, $row, $this->member_group_ids, $spec_perm ) )
-				{
-					$cids[ $row['com_id'] ] = $spec_perm;
-				}
+			$spec_perm = '';
+
+			$this->loadPlugin( $row['my_class'], $row['app'] );
+			
+			if( !$this->plugins[ $row['my_class'] ] )
+			{
+				continue;
+			}
+			
+			if( $row['extra_data'] && $row['extra_data'] != 'N;' )
+			{
+				$this->plugins[ $row['my_class'] ]->_extra = unserialize( $row['extra_data'] );
+			}
+			else
+			{
+				$this->plugins[ $row['my_class'] ]->_extra = array();
+			}
+
+			if( $this->plugins[ $row['my_class'] ]->getReportPermissions( $check, $row, $this->member_group_ids, $spec_perm ) )
+			{
+				$cids[ $row['com_id'] ] = $spec_perm;
 			}
 		}
 
 		return $this->DB->fetchLoadedClass('report_sql_queries')->join_com_permissions( array( 'NOTCACHE' => 1, 'COMS' => $cids ) );
 	}
 	
+	/**
+	 * Check permissions for "can report"
+	 *
+	 * @param	string	$className	Report center class name
+	 * @return	@e bool
+	 */
+	public function canReport( $className )
+	{
+		if( !$this->caches['report_plugins'][ $className ]['com_id'] )
+		{
+			return false;
+		}
+		
+		if( IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $this->caches['report_plugins'][ $className ]['group_can_report'] ) ) ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * Loads plugins into $this->plugins object for later use
 	 *
-	 * @param	string	plugin name (>name<.php)
-	 * @return	void
+	 * @param	string	$plugin_name	plugin name (>name<.php)
+	 * @param	string	$app			App name
+	 * @return	@e void
 	 */
 	public function loadPlugin( $plugin_name, $app )
 	{
 		if( ! $this->plugins[ $plugin_name ] )
 		{
-			if( file_exists( IPSLib::getAppDir( $app ) . '/extensions/reportPlugins/' . $plugin_name . '.php' ) )
+			if( IPSLib::appIsInstalled( $app ) AND is_file( IPSLib::getAppDir( $app ) . '/extensions/reportPlugins/' . $plugin_name . '.php' ) )
 			{
 				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/reportPlugins/' . $plugin_name . '.php', $plugin_name . '_plugin', $app );
 				
@@ -291,7 +380,7 @@ class reportLibrary
 	/**
 	 * Fixes the member's RSS Key if none set
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function checkMemberRSSKey()
 	{
@@ -345,7 +434,7 @@ class reportLibrary
 	/**
 	 * Updates global 'cache time' which forces 'mod caches' to re-cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function updateCacheTime()
 	{
diff --git a/upload/admin/applications/core/sources/classes/reportNotifications.php b/upload/admin/applications/core/sources/classes/reportNotifications.php
index bb2b3071..97e74fec 100644
--- a/upload/admin/applications/core/sources/classes/reportNotifications.php
+++ b/upload/admin/applications/core/sources/classes/reportNotifications.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Notifications class for reported content
- * Last Updated: $LastChangedDate: 2010-10-19 11:56:25 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-30 05:21:05 -0400 (Fri, 30 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6997 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9571 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,19 +25,28 @@ if ( ! defined( 'IN_IPB' ) )
 
 class reportNotifications
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/
+	protected $caches;
 	
 	/**
 	 * Messenger object
@@ -63,8 +72,8 @@ class reportNotifications
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -91,7 +100,7 @@ class reportNotifications
 	 *
 	 * @param	array 		Member data
 	 * @param	array 		Reported content	
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initNotify( $data, $report_data )
 	{
@@ -99,10 +108,82 @@ class reportNotifications
 		$this->my_report_data	= $report_data;
 	}
 	
+	/**
+	 * Send the notifications for comments/replies to a report
+	 *
+	 * @param	string	$comment	Comment string
+	 * @return	@e void
+	 */
+	public function sendReplyNotifications( $postContent )
+	{
+		//-----------------------------------------
+		// Notifications library
+		//-----------------------------------------
+		
+		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary		= new $classToLoad( $this->registry );
+		
+		$_memberIds		= array();
+		
+		foreach( $this->my_data as $_data )
+		{
+			$_memberIds[]	= $_data['member_id'];
+		}
+
+		$_memberData	= IPSMember::load( $_memberIds );
+		
+		foreach( $this->my_data as $user )
+		{
+			//-----------------------------------------
+			// Don't send notification to self
+			//-----------------------------------------
+			
+			if( $user['member_id'] == $this->memberData['member_id'] )
+			{
+				continue;
+			}
+
+			$user	= array_merge( $user, $_memberData[ $user['member_id'] ] );
+
+			IPSText::getTextClass( 'email' )->getTemplate( "report_reply", $user['language'] );
+			
+			IPSText::getTextClass( 'email' )->buildMessage( array(
+																'MOD_NAME'	=> $user['members_display_name'],
+																'COMMENTER'	=> $this->memberData['members_display_name'],
+																'LINK'		=> $this->registry->getClass('reportLibrary')->processUrl( $this->my_report_data['SAVED_URL'], $this->my_report_data['SEOTITLE'], $this->my_report_data['TEMPLATE'] ),
+																'REPORTLINK'=> $this->settings['base_url'] . 'app=core&module=reports&do=show_report&rid=' . $this->my_report_data['REPORT_INDEX'],
+																'COMMENT'	=> $postContent,
+																	)
+															);
+
+			$_subject	= sprintf(
+									$this->lang->words['subject_reportreply'],
+									$this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'public', $this->memberData['members_seo_name'], 'showuser' ), 
+									$this->memberData['members_display_name'],
+									$this->settings['base_url'] . 'app=core&module=reports&do=show_report&rid=' . $this->my_report_data['REPORT_INDEX'],
+									$this->registry->getClass('reportLibrary')->processUrl( $this->my_report_data['SAVED_URL'], $this->my_report_data['SEOTITLE'], $this->my_report_data['TEMPLATE'] )
+									);
+			$notifyLibrary->setMember( $user );
+			$notifyLibrary->setFrom( $this->memberData );
+			$notifyLibrary->setNotificationKey( 'report_center' );
+			$notifyLibrary->setNotificationUrl( $this->settings['base_url'] . 'app=core&module=reports&do=show_report&rid=' . $this->my_report_data['REPORT_INDEX'] );
+			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+			$notifyLibrary->setNotificationTitle( $_subject );
+			
+			try
+			{
+				$notifyLibrary->sendNotification();
+			}
+			catch( Exception $e ){}
+		}
+
+		$this->_buildRSSFeed( $this->my_data, $this->my_report_data );
+	}
+	
 	/**
 	 * Send the notifications
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sendNotifications()
 	{
@@ -173,13 +254,15 @@ class reportNotifications
 	/**
 	 * Build a private RSS feed for the member to monitor reports
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _buildRSSFeed( $data=array(), $report_data )
+	protected function _buildRSSFeed( $data=array(), $report_data )
 	{
-		$ids = array();
+		//-----------------------------------------
+		// Check member ids
+		//-----------------------------------------
 		
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_reports' ), 'core' );
+		$ids = array();
 
 		if( is_array($data) AND count($data) )
 		{
@@ -194,13 +277,24 @@ class reportNotifications
 			return;
 		}
 		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
 		$rssClassToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
 		
-		$status = array();
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_reports' ), 'core' );
+		
+		//-----------------------------------------
+		// Get status data
+		//-----------------------------------------
+		
+		$status	= array();
+		$active	= array( 0 );
 		
 		$this->DB->build( array( 'select' 	=> 'status, is_new, is_complete', 
-										 'from'		=> 'rc_status', 
-										 'where'	=> "is_new=1 OR is_complete=1",
+								 'from'		=> 'rc_status', 
+								 'where'	=> "is_new=1 OR is_complete=1 OR is_active=1",
 								) 		);
 		$this->DB->execute();
 
@@ -214,6 +308,69 @@ class reportNotifications
 			{
 				$status['complete'] = $row['status'];
 			}
+			
+			if( $row['is_active'] )
+			{
+				$active[]	= $row['status'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Now we need to find all open reports
+		//-----------------------------------------
+		
+		$_reports	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'i.*',
+								'from'		=> array( 'rc_reports_index' => 'i' ),
+								'where'		=> 'i.status IN(' . implode( ',', $active ) . ')',
+								'add_join'	=> array(
+													array(
+														'from'		=> array( 'rc_status' => 's' ),
+														'where'		=> 's.status=i.status',
+														'type'		=> 'left',
+														),
+													array(
+														'select'	=> 'c.my_class, c.mod_group_perm, c.app',
+														'from'		=> array( 'rc_classes' => 'c' ),
+														'where'		=> 'c.com_id=i.rc_class',
+														'type'		=> 'left',
+														),
+													)
+						)		);
+		$outer = $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			//-----------------------------------------
+			// Skip deleted plugins
+			//-----------------------------------------
+			
+			if( $r['my_class'] == '' )
+			{
+				continue;
+			}
+
+			//-----------------------------------------
+			// Fix stuff....this is hackish :(
+			//-----------------------------------------
+			
+			if( $r['my_class'] == 'post' )
+			{
+				$r['FORUM_ID']	= $r['exdat1'];
+			}
+			
+			//-----------------------------------------
+			// Get notify list
+			//-----------------------------------------
+			
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $r['app'] ) . '/extensions/reportPlugins/' . $r['my_class'] . '.php', $r['my_class'] . '_plugin', $r['app'] );
+			$object			= new $classToLoad( $this->registry );
+			
+			$notify			= $object->getNotificationList( IPSText::cleanPermString( $r['mod_group_perm'] ), $r );
+			
+			$_reports[]		= array( 'data' => $r, 'notify' => $notify );
 		}
 
 		//-----------------------------------------
@@ -231,93 +388,52 @@ class reportNotifications
 			// Clear out for new RSS doc and add channel
 			//-----------------------------------------
 			
-			$rss			=  new $rssClassToLoad();
-			$channel_id = $rss->createNewChannel( array( 'title'			=> $this->lang->words['rss_feed_title'],
+			$rss		=  new $rssClassToLoad();
+			$channel_id	= $rss->createNewChannel( array( 'title'			=> $this->lang->words['rss_feed_title'],
 															'link'			=> $this->settings['board_url'],
 															'description'	=> $this->lang->words['reports_rss_desc'],
 															'pubDate'		=> $rss->formatDate( time() )
 												)		);
 
 			//-----------------------------------------
-			// Now we need to find all open reports for
-			// this member
+			// What reports can we access?
 			//-----------------------------------------
 			
-			$this->DB->build( array(
-									'select'	=> 'i.*',
-									'from'		=> array( 'rc_reports_index' => 'i' ),
-									'where'		=> 's.is_active=1',
-									'add_join'	=> array(
-														array(
-															'from'		=> array( 'rc_status' => 's' ),
-															'where'		=> 's.status=i.status',
-															'type'		=> 'left',
-															),
-														array(
-															'select'	=> 'c.my_class, c.mod_group_perm, c.app',
-															'from'		=> array( 'rc_classes' => 'c' ),
-															'where'		=> 'c.com_id=i.rc_class',
-															'type'		=> 'left',
-															),
-														)
-							)		);
-			$outer = $this->DB->execute();
-			
-			while( $r = $this->DB->fetch($outer) )
+			if( count($_reports) )
 			{
-				/* Deleted report plugin, skip */
-				if( $r['my_class'] == '' )
+				foreach( $_reports as $_report )
 				{
-					continue;
-				}
-
-				//-----------------------------------------
-				// Fix stuff....this is hackish :(
-				//-----------------------------------------
-				
-				if( $r['my_class'] == 'post' )
-				{
-					$r['FORUM_ID']	= $r['exdat1'];
-				}
-				
-				//-----------------------------------------
-				// Found all open reports, can we access?
-				//-----------------------------------------
-				
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $r['app'] ) . '/extensions/reportPlugins/' . $r['my_class'] . '.php', $r['my_class'] . '_plugin', $r['app'] );
-				$object	= new $classToLoad( $this->registry );
-				
-				$notify	= $object->getNotificationList( IPSText::cleanPermString( $r['mod_group_perm'] ), $r );
-				$pass	= false;
-				
-				if( is_array($notify['RSS']) AND count($notify['RSS']) )
-				{
-					foreach( $notify['RSS'] as $memberAccount )
+					$pass	= false;
+					
+					if( is_array($_report['notify']) AND count($_report['notify']) )
 					{
-						if( $memberAccount['mem_id'] == $id )
+						foreach( $_report['notify'] as $memberAccount )
 						{
-							$pass = true;
-							break;
+							if( $memberAccount['mem_id'] == $id )
+							{
+								$pass = true;
+								break;
+							}
 						}
 					}
-				}
-				
-				if( $pass )
-				{
-					$url = $this->registry->getClass('reportLibrary')->processUrl( str_replace( '&amp;', '&', $r['url'] ) );
 					
-					$rss->addItemToChannel( $channel_id, array( 'title'			=> $url,
-																'link'			=> $url,
-																'description'	=> $r['title'],
-																'content'		=> $r['title'],
-																'pubDate'		=> $rss->formatDate( $r['date_updated'] )
-										)					);
+					if( $pass )
+					{
+						$url = $this->registry->getClass('reportLibrary')->processUrl( str_replace( '&amp;', '&', $_report['data']['url'] ) );
+						
+						$rss->addItemToChannel( $channel_id, array( 'title'			=> $url,
+																	'link'			=> $url,
+																	'description'	=> $_report['data']['title'],
+																	'content'		=> $_report['data']['title'],
+																	'pubDate'		=> $rss->formatDate( $_report['data']['date_updated'] )
+											)					);
+					}
 				}
 			}
 
 			$rss->createRssDocument();
 	
-			$this->DB->update( 'rc_modpref', array( 'rss_cache' => $rss->rss_document ), "mem_id=" . $id );
+			$this->DB->replace( 'rc_modpref', array( 'rss_cache' => $rss->rss_document ), "mem_id=" . $id, array( 'mem_id' ) );
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/sources/index.html b/upload/admin/applications/core/sources/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/sources/index.html
+++ b/upload/admin/applications/core/sources/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sql/index.html b/upload/admin/applications/core/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/sql/index.html
+++ b/upload/admin/applications/core/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/sql/mysql_report_queries.php b/upload/admin/applications/core/sql/mysql_report_queries.php
index c1935bf9..47f25eae 100644
--- a/upload/admin/applications/core/sql/mysql_report_queries.php
+++ b/upload/admin/applications/core/sql/mysql_report_queries.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reports content SQL query cache file
- * Last Updated: $LastChangedDate: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-06-02 18:58:10 -0400 (Thu, 02 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6863 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8954 $
  *
  */
 
@@ -24,16 +24,14 @@ class report_sql_queries
 	 * Database object handle
 	 *
 	 * @var		object
-	 * @access	private
 	 */
 	private	$db;
 	
 	/**
 	 * Constructor
 	 *
- 	 * @access	public
 	 * @param	object	Database reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( &$database )
 	{
@@ -43,7 +41,6 @@ class report_sql_queries
 	/**
 	 * Creates a permissions where clause - repeated often, so cached to save us from typing
 	 *
- 	 * @access	public
 	 * @param	array 	Parameters
 	 * @return	sting	Where clause
 	 */
@@ -114,7 +111,6 @@ class report_sql_queries
 	/**
 	 * Grab the reports for the reported content index page
 	 *
- 	 * @access	public
 	 * @param	array 	Parameters
 	 * @return	string	Database query
 	 */
@@ -123,22 +119,21 @@ class report_sql_queries
 		$time = time();
 		
 		return "SELECT rep.*, rcl.my_class, rcl.extra_data, mem.members_display_name as n_updated_by, mem.members_seo_name as n_updated_seoname, mem.member_group_id, MAX(star.points) as points, "
-			 . "((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/stat.minutes_to_apoint)) as built_points "
+			 . "((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/ CASE WHEN stat.minutes_to_apoint > 0 THEN stat.minutes_to_apoint ELSE 100 END )) as built_points "
 			 . "FROM " . $this->db->obj['sql_tbl_prefix'] . "rc_reports_index rep "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "members mem ON (mem.member_id=rep.updated_by) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status stat ON (stat.status=rep.status) "
-			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/stat.minutes_to_apoint))>=star.points AND star.status=rep.status) "
+			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/ CASE WHEN stat.minutes_to_apoint > 0 THEN stat.minutes_to_apoint ELSE 100 END ))>=star.points AND star.status=rep.status) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_classes rcl ON (rcl.com_id=rep.rc_class) "
 			 . "WHERE ".$data['WHERE']." "
 			 . "GROUP BY rep.id "
-			 . "ORDER BY stat.rorder ASC, built_points DESC, rep.date_updated DESC "
+			 . "ORDER BY rep.date_updated DESC, stat.rorder ASC, built_points DESC "
 			 . "LIMIT ".$data['START'].", ".$data['LIMIT'] ;
 	}
 	
 	/**
 	 * Grab a report
 	 *
- 	 * @access	public
 	 * @param	array 	Parameters
 	 * @return	string	Database query
 	 */
@@ -148,7 +143,7 @@ class report_sql_queries
 		
 		return "SELECT mem.*, mem.title as member_title, reps.*, rcl.my_class, MAX(star.points) as points, "
 			 . "rep.*, grop.g_is_supmod as iscop, s.id as session_id, pf.*, "
-			 . "((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/stat.minutes_to_apoint)) as built_points "
+			 . "((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/ CASE WHEN stat.minutes_to_apoint > 0 THEN stat.minutes_to_apoint ELSE 100 END )) as built_points "
 			 . "FROM " . $this->db->obj['sql_tbl_prefix'] . "rc_reports reps "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "members mem ON (mem.member_id=reps.report_by) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "profile_portal pf ON (mem.member_id=pf.pp_member_id) "
@@ -156,7 +151,7 @@ class report_sql_queries
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "groups grop ON (grop.g_id=mem.member_group_id) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "sessions s ON (s.member_id=mem.member_id) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status stat ON (stat.status=rep.status) "
-			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/stat.minutes_to_apoint))>=star.points AND star.status=rep.status) "
+			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/ CASE WHEN stat.minutes_to_apoint > 0 THEN stat.minutes_to_apoint ELSE 100 END ))>=star.points AND star.status=rep.status) "
 			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_classes rcl ON (rcl.com_id=rep.rc_class) "
 			 . "WHERE " . $data['COM'] . " AND reps.rid= " . $data['rid'] . " "
 			 . "GROUP BY reps.id "
@@ -166,7 +161,6 @@ class report_sql_queries
 	/**
 	 * Grab the new status based on points, etc.
 	 *
- 	 * @access	public
 	 * @param	array 	Parameters
 	 * @return	string	Database query
 	 */
@@ -176,20 +170,8 @@ class report_sql_queries
 		
 		return "SELECT rep.status, MAX(star.points) as points FROM " . $this->db->obj['sql_tbl_prefix'] . "rc_reports_index rep "
 			. "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status stat ON (stat.status=rep.status) "
-			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/stat.minutes_to_apoint))>=star.points AND star.status=rep.status) "
+			 . "LEFT JOIN " . $this->db->obj['sql_tbl_prefix'] . "rc_status_sev star ON (((rep.num_reports * stat.points_per_report)+FLOOR((({$time}-rep.date_created)/60)/ CASE WHEN stat.minutes_to_apoint > 0 THEN stat.minutes_to_apoint ELSE 100 END ))>=star.points AND star.status=rep.status) "
 			 . "WHERE rep.id=".$data['ID']." "
 			 . "GROUP BY rep.id LIMIT 1";
 	}
-	
-	/**
-	 * Get permissions to access a class
-	 *
- 	 * @access	public
-	 * @param	array 	Parameters
-	 * @return	string	Database query
-	 */
-	public function get_class_permissions( $data=array() )
-	{
-		return "SELECT com_id, my_class, extra_data, app FROM " . $this->db->obj['sql_tbl_prefix'] . "rc_classes WHERE onoff=1 AND " . $data['COL'] . " REGEXP '.*,(" . implode( '|' , $data['GROUP_IDS'] ) . "),.*'";
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/sql/mysql_tag_queries.php b/upload/admin/applications/core/sql/mysql_tag_queries.php
new file mode 100644
index 00000000..3e8c2cf2
--- /dev/null
+++ b/upload/admin/applications/core/sql/mysql_tag_queries.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging Queries
+ * Last Updated: $LastChangedDate: 2011-08-08 04:56:34 -0400 (Mon, 08 Aug 2011) $
+ * </pre>
+ *
+ * @copyright	(c) 2001 - 20011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @version		$Rev: 9375 $
+ *
+ */
+
+class public_tag_sql_queries extends db_driver_mysql
+{	
+	/**
+	 * Database object handle
+	 *
+	 * @var		object
+	 */
+	private	$db;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object	Database reference
+	 * @return	@e void
+	 */
+	public function __construct( &$obj )
+	{
+		$reg          = ipsRegistry::instance();
+    	$this->member = $reg->member();
+    	$this->DB     = $reg->DB();
+    	$this->tbl	  = ips_DBRegistry::getPrefix();
+	}
+
+	/*========================================================================*/
+
+	/**
+     * Fetches a single random image (few holes)
+     * @param array $album
+     * @return string
+     */
+	public function getCloudData( $data )
+    {
+    	$where  = $data['where'];
+    	$limit  = $data['limit'];
+    	
+    	$where  = ( count( $where ) ) ? ' ' . implode( ' AND ', $where )  : ' 1=1 ';
+  		$prefix = $this->tbl;
+  		
+  		$this->DB->allow_sub_select = true;
+		
+		$query = "SELECT t.tag_text, COUNT(t.tag_text) as times
+					FROM {$prefix}core_tags t WHERE " . $where . "
+					AND t.tag_aai_lookup IN( SELECT p.tag_perm_aai_lookup FROM {$prefix}core_tags_perms p WHERE
+				 " . $this->DB->buildWherePermission( $this->member->perm_id_array, 'p.tag_perm_text', true ) . " AND p.tag_perm_visible=1 ) GROUP BY t.tag_text";
+				 
+		if ( ! empty( $limit[0] ) || ! empty( $limit[1] ) )
+		{
+			$query .= "\n ORDER BY times DESC\nLIMIT " . $limit[0] . ", " . $limit[1];
+		}
+		else
+		{
+			$query .= "\n ORDER BY NULL";
+		}
+		
+    	return $query;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/cleanout.php b/upload/admin/applications/core/tasks/cleanout.php
index 3a25d0bc..e38e85ef 100644
--- a/upload/admin/applications/core/tasks/cleanout.php
+++ b/upload/admin/applications/core/tasks/cleanout.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Clean out 'dead' sessions, validations, registration image entires, etc
- * Last Updated: $LastChangedDate: 2010-07-28 05:00:44 -0400 (Wed, 28 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 6708 $
+ * @file		cleanout.php 	Task to clean out 'dead' sessions, validations, registration image entires, etc
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-09-26 16:02:02 -0400 (Mon, 26 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9551 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,78 +17,67 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to clean out 'dead' sessions, validations, registration image entires, etc
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	  = $registry;
-		$this->DB		  = $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang		  = $this->registry->getClass('class_localization');
-		$this->member	  = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	  = $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-
+		$this->registry	= $registry;
+		$this->DB		= $this->registry->DB();
+		$this->settings	=& $this->registry->fetchSettings();
+		$this->lang		= $this->registry->getClass('class_localization');
+		$this->caches	=& ipsRegistry::cache()->fetchCaches();
+		$this->cache	= ipsRegistry::cache();
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
 	
 	/**
 	 * Run this task
-	 * 1235503784
-	 * @access	public
-	 * @return	void
+	 * 
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -121,6 +103,58 @@ class task_item
 		
 		$this->DB->delete( 'validating', 'lost_pass=1 AND entry_date < ' . $_cutoff );
 		
+		/* Delete old saved content */
+		$this->DB->delete( 'core_editor_autosave', 'eas_updated < '  . ( IPS_UNIX_TIME_NOW - 86400 ) );
+		
+		/* Delete old cached content */
+		$this->DB->delete( 'cache_simple', 'cache_time < '  . ( IPS_UNIX_TIME_NOW - 86400 ) );
+		
+		//-----------------------------------------
+		// Delete core_incoming_email_logs
+		//-----------------------------------------
+		
+		if ( $this->DB->checkForTable('core_incoming_email_log') )
+		{
+			$this->DB->delete( 'core_incoming_email_log', 'log_time < ' . ( IPS_UNIX_TIME_NOW - 60 ) );
+		}
+		
+		/* Delete old inline messages (5 mins) */
+		$this->DB->delete( 'core_inline_messages', 'inline_msg_date < ' . ( IPS_UNIX_TIME_NOW - 300 ) );
+		
+		/* Update license key if needed */
+		$licenseData = $this->cache->getCache( 'licenseData' );
+		
+		if( ! $licenseData || ( $licenseData['key']['_expires'] != 9999999999 AND $licenseData['key']['_expires'] < IPS_UNIX_TIME_NOW ) )
+		{
+			/* We need a classFileManagement object */
+			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+			$classFileManagement = new $classToLoad();
+		
+			/* Query the api */
+			$response = $classFileManagement->getFileContents("http://myipb.in/license.php?lk={$this->settings['ipb_reg_number']}&url={$this->settings['board_url']}&flush=1" );
+	
+				/* Get License Data */
+				$licenseData = json_decode( $response, true );
+				
+				/* Copyright Removal? */
+				if ( $licenseData['cr'] )
+				{
+					IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
+				}
+				elseif ( $this->settings['ips_cp_purchase'] )
+				{
+					IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
+				}
+	
+				/* Save to cache */
+				$licenseData['_cached_date']	= time();
+				$licenseData['key']['_expires']	= $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
+				$licenseData['key']['expires']	= $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
+				
+				$this->cache->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
+			
+		}
+		
 		//-----------------------------------------
 		// Log to log table - modify but dont delete
 		//-----------------------------------------
@@ -133,5 +167,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/contentcache.php b/upload/admin/applications/core/tasks/contentcache.php
index 276c76dd..fe932b62 100644
--- a/upload/admin/applications/core/tasks/contentcache.php
+++ b/upload/admin/applications/core/tasks/contentcache.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Prune back content cache
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		contentcache.php 	Task to prune the content cache (posts & signatures)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-03-18 21:17:06 -0400 (Fri, 18 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8131 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,51 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to prune the content cache (posts & signatures)
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	  =  $registry;
-		$this->DB		  =  $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang		  =  $this->registry->getClass('class_localization');
-		$this->member	  =  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	  =  $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-
+		$this->registry		= $registry;
+		$this->lang			= $this->registry->getClass('class_localization');
+		
 		$this->class	= $class;
 		$this->task		= $task;
 		
@@ -96,17 +71,17 @@ class task_item
 	/**
 	 * Run this task
 	 * 
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		/* Run it */
 		$itemsRemoved = IPSContentCache::prune();
 		
-		$this->class->appendTaskLog( $this->task, "Cleaned up content cache - " . $itemsRemoved . " items removed" );
+		$log = ( $itemsRemoved === FALSE ) ? $this->lang->words['errorcleaningcontentcache'] : sprintf( $this->lang->words['contentcache_cleaned'], $itemsRemoved );
+		
+		$this->class->appendTaskLog( $this->task, $log );
 	
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/index.html b/upload/admin/applications/core/tasks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/tasks/index.html
+++ b/upload/admin/applications/core/tasks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/itemmarkers.php b/upload/admin/applications/core/tasks/itemmarkers.php
index 6b9b1de2..3967f120 100644
--- a/upload/admin/applications/core/tasks/itemmarkers.php
+++ b/upload/admin/applications/core/tasks/itemmarkers.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Update 'dead' markers
- * Last Updated: $LastChangedDate: 2010-07-29 08:08:48 -0400 (Thu, 29 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		itemmarkers.php 	Task to prune dead item markers
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
  * @since		27th January 2004
- * @version		$Rev: 6711 $
+ * $LastChangedDate: 2011-06-03 09:45:07 -0400 (Fri, 03 Jun 2011) $
+ * @version		v3.2.3
+ * $Revision: 8957 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,101 +17,90 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to prune dead item markers
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	  =  $registry;
-		$this->DB		  =  $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang		  =  $this->registry->getClass('class_localization');
-		$this->member	  =  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	  =  $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-
+		$this->registry	= $registry;
+		$this->DB		= $this->registry->DB();
+		$this->lang		= $this->registry->getClass('class_localization');
+		
 		$this->class	= $class;
 		$this->task		= $task;
-		
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 	}
 	
 	/**
 	 * Run this task
 	 * 
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		/* INIT */
 		if ( ! $this->registry->isClassLoaded( 'classItemMarking' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php' );
-			$this->registry->setClass( 'classItemMarking', new classItemMarking( $this->registry ) );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php', 'classItemMarking' );
+			$this->registry->setClass( 'classItemMarking', new $classToLoad( $this->registry ) );
 		}
 		
+		$time         = time() - ( 86400 * 30 );
 		$itemsRemoved = $this->registry->getClass('classItemMarking')->manualCleanUp( 50, 6 );
 		
 		/* Remove 'deleted' items */
 		$this->DB->delete( 'core_item_markers', 'item_is_deleted=1' );
 		$c = $this->DB->getAffectedRows();
 		
+		/* Now delete old markers - we use a separate query because there are separate indexes */
+		$this->DB->delete( 'core_item_markers', 'item_last_saved < ' . $time );
+		$c += $this->DB->getAffectedRows();
+		
 		IPSDebug::addLogMessage( "$c item markers removed", 'markers_cleanout' );
 		
-		$this->class->appendTaskLog( $this->task, "Cleaned up " . $itemsRemoved . " markers, removed " . $c . " unused rows" );
-	
+		/* Log task */
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
+		$this->class->appendTaskLog( $this->task, sprintf( $this->lang->words['itemmarkers_task_log'], $itemsRemoved, $c ) );
+		
+		/* UNLOCK TASK */
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/logprune.php b/upload/admin/applications/core/tasks/logprune.php
index 6f36f3a6..4bbf2bab 100644
--- a/upload/admin/applications/core/tasks/logprune.php
+++ b/upload/admin/applications/core/tasks/logprune.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Prune old logs
- * Last Updated: $LastChangedDate: 2010-06-08 20:53:45 -0400 (Tue, 08 Jun 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 6485 $
+ * @file		logprune.php 	Task to prune old logs from the cache folder
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
+ * @since		-
+ * $LastChangedDate: 2011-04-19 11:20:55 -0400 (Tue, 19 Apr 2011) $
+ * @version		v3.2.3
+ * $Revision: 8383 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,65 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to prune old logs from the cache folder
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Integer value (seconds) used to delete old records
+	 * By default 1 month: 2592000 (60*60*24*30)
+	 * 
+	 * @var		$deleteTime
+	 */
+	protected $deleteTime = 2592000;
+	
+	/**
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,8 +83,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -103,84 +91,79 @@ class task_item
 		
 		//-----------------------------------------
 		// Spider Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if( $this->settings['ipb_prune_spider'] )
 		{
-			$this->DB->delete( "spider_logs", "entry_date < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "spider_logs", "entry_date < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Spam Logs
-		//-----------------------------------------		
+		//-----------------------------------------
+		
+		if( $this->settings['ipb_prune_spam'] )
+		{
+			$this->DB->delete( "spam_service_log", "log_date < " . (time() - $this->deleteTime) );
+		}
 		
 		//-----------------------------------------
 		// Admin Login Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if( $this->settings['prune_admin_login_logs'] )
 		{
-			$this->DB->delete( "admin_login_logs", "admin_time < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "admin_login_logs", "admin_time < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Task Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if( $this->settings['ipb_prune_task'] )
 		{
-			$this->DB->delete( "task_logs", "log_date < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "task_logs", "log_date < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Admin Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if( $this->settings['ipb_prune_admin'] )
 		{
-			$this->DB->delete( "admin_logs", "ctime < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "admin_logs", "ctime < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Mod Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if ( $this->settings['ipb_prune_mod'] )
 		{
-			$this->DB->delete( "moderator_logs", "ctime < " . (time() - (60*60*24*30)) );
-		}
-		
-		//-----------------------------------------
-		// Email Logs
-		//-----------------------------------------		
-		
-		if ( $this->settings['ipb_prune_email'] )
-		{
-			$this->DB->delete( "email_logs", "email_date < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "moderator_logs", "ctime < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Email Error Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if ( $this->settings['ipb_prune_emailerror'] )
 		{
-			$this->DB->delete( "mail_error_logs", "mlog_date < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "mail_error_logs", "mlog_date < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
 		// Error Logs
-		//-----------------------------------------		
+		//-----------------------------------------
 		
 		if ( $this->settings['prune_error_logs'] )
 		{
-			$this->DB->delete( "error_logs", "log_date < " . (time() - (60*60*24*30)) );
+			$this->DB->delete( "error_logs", "log_date < " . (time() - $this->deleteTime) );
 		}
 		
 		//-----------------------------------------
-		// SQL Error Logs
-		// --Only prune older than 30 days
-		//-----------------------------------------		
+		// SQL Logs
+		//-----------------------------------------
 		
 		if ( $this->settings['ipb_prune_sql'] )
 		{
@@ -193,9 +176,9 @@ class task_item
 						continue;
 					}
             	
-					if( preg_match( "#^sql_error_log_(\d+)_(\d+)_(\d+).cgi$#", $file->getFilename(), $matches ) )
+					if( preg_match( "#^sql_(error|debug|upgrade)_log_(\d+)_(\d+)_(\d+).cgi$#", $file->getFilename(), $matches ) )
 					{
-						if( $file->getMTime() < (time() - (60*60*24*30)) )
+						if( $file->getMTime() < (time() - $this->deleteTime) )
 						{
 							@unlink( $file->getPathname() );
 						}
@@ -216,5 +199,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/mysqlcleanup.php b/upload/admin/applications/core/tasks/mysqlcleanup.php
index 63df7900..6b7d6289 100644
--- a/upload/admin/applications/core/tasks/mysqlcleanup.php
+++ b/upload/admin/applications/core/tasks/mysqlcleanup.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Simple task to clean out sleeping mysql queries
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		mysqlcleanup.php 	Task to prune dead item markers
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,57 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to prune dead item markers
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,13 +75,10 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
-		
 		//-----------------------------------------
 		// This is mysql only
 		//-----------------------------------------
@@ -124,11 +102,9 @@ class task_item
 			// Make sure we're only killing stuff on our db
 			//-----------------------------------------
 			
-			if( $r['db'] == $this->settings['sql_database']
-				AND $r['Command'] == 'Sleep' 
-				AND $r['Time'] > 60 )
+			if( $r['db'] == $this->settings['sql_database'] AND $r['Command'] == 'Sleep' AND $r['Time'] > 60 )
 			{
-				$this->DB->return_die	= true;
+				$this->DB->return_die = true;
 				$this->DB->query( "KILL {$r['Id']}" );
 				
 				/* Log */
@@ -136,12 +112,14 @@ class task_item
 			}
 		}
 		
-		$this->DB->return_die	= false;
+		$this->DB->return_die = false;
 
 		//-----------------------------------------
 		// Log to log table - modify but dont delete
 		//-----------------------------------------
 		
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
+		
 		$this->class->appendTaskLog( $this->task, $this->lang->words['task_mysqlcleanup'] );
 		
 		//-----------------------------------------
@@ -150,5 +128,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/openidcleanup.php b/upload/admin/applications/core/tasks/openidcleanup.php
index e22d03f5..9d6313a6 100644
--- a/upload/admin/applications/core/tasks/openidcleanup.php
+++ b/upload/admin/applications/core/tasks/openidcleanup.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Cleanup for uncleared OpenID caches
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		openidcleanup.php 	Task to cleanup uncleared OpenID caches
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,53 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to cleanup uncleared OpenID caches
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,23 +71,12 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 		
-		//-----------------------------------------
-		// This is mysql only
-		//-----------------------------------------
-		
-		if ( strtolower( $this->settings['sql_driver'] ) != 'mysql' )
-		{
-			$this->class->unlockTask( $this->task );
-			return;
-		}
-		
 		//-----------------------------------------
 		// Clean out openid caches older than 24 hours
 		// For whatever reason the OpenID libraries
@@ -173,5 +139,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/optimize.php b/upload/admin/applications/core/tasks/optimize.php
index 7684ce2a..7daac752 100644
--- a/upload/admin/applications/core/tasks/optimize.php
+++ b/upload/admin/applications/core/tasks/optimize.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Optimizes database tables daily
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		optimize.php 	Task to optimize database tables daily
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,96 +17,76 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to optimize database tables daily
+ *
+ */
 class task_item
 {
-	/**
-	 * Parent task manager class
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
-	
 	/**
 	 * Tables to optimize.  Initially I was just going to run
 	 * optimize tables query against all tables, but Charles
 	 * prefers this static list of tables, and so it shall be.
 	 *
-	 * @access	protected
-	 * @var		array
+	 * @var		$charlesTables
 	 */
-	protected $charlesTables	= array(
-										'core_item_markers',
-										'core_item_markers_storage',
-										'inline_notifications',
-										'cache_store',
-										'content_cache_posts',
-										);
+	protected $charlesTables = array( 'core_item_markers',
+									  'core_item_markers_storage',
+									  'inline_notifications',
+									  'cache_store',
+									  'content_cache_posts',
+									 );
 	
-	/**#@+
+	/**
+	 * Object that stores the parent task manager class
+	 *
+	 * @var		$class
+	 */
+	protected $class;
+	
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	  =  $registry;
-		$this->DB		  =  $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang		  =  $this->registry->getClass('class_localization');
-		$this->member	  =  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	  =  $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-
+		$this->registry	= $registry;
+		$this->DB		= $this->registry->DB();
+		$this->lang		= $this->registry->getClass('class_localization');
+		
 		$this->class	= $class;
 		$this->task		= $task;
-		
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 	}
 	
 	/**
 	 * Run this task
 	 * 
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -124,18 +97,8 @@ class task_item
 			return;
 		}
 		
-		//$_tables	= $this->DB->getTableNames();
-		
-		//if( is_array($_tables) AND count($_tables) )
-		//{
-		//	foreach( $_tables as $_table )
-		//	{
-		//		$this->DB->query( "OPTIMIZE TABLE {$_table}" );
-		//		$this->DB->query( "ANALYZE TABLE {$_table}" );
-		//	}
-		//}
-		
-		$_tables	= $this->charlesTables;
+		/* Get tables and optimize */
+		$_tables = $this->charlesTables;
 		
 		if( is_array($_tables) AND count($_tables) )
 		{
@@ -150,10 +113,12 @@ class task_item
 			
 			ipsRegistry::dbFunctions()->prefix_changed = false;
 		}
-
+		
+		/* Log to log table - modify but dont delete */
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 		$this->class->appendTaskLog( $this->task, sprintf( $this->lang->words['task__optimizedtables'], count($_tables) ) );
-	
+		
+		/* Unlock Task: DO NOT MODIFY! */
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/pop3email.php b/upload/admin/applications/core/tasks/pop3email.php
index 70c4fce6..46e73ed6 100644
--- a/upload/admin/applications/core/tasks/pop3email.php
+++ b/upload/admin/applications/core/tasks/pop3email.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Incoming Email Handler - POP3
- * Last Updated: $LastChangedDate: 2010-06-25 07:37:32 -0400 (Fri, 25 Jun 2010) $
- * </pre>
- *
- * @author 		$Author: mark $
- * @copyright	(c) 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @file		pop3mail.php 	Task to handle incoming emails through POP3
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mark $
  * @since		25th June 2010
- * @version		$Rev: 6575 $
+ * $LastChangedDate: 2011-08-23 10:24:47 -0400 (Tue, 23 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9404 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,54 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to handle incoming emails through POP3
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,17 +72,15 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
-	
 		//--------------------------------------
 		// Init
 		//--------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . '/pop3class/pop3.php' );
+		require_once( IPS_KERNEL_PATH . '/pop3class/pop3.php' );/*noLibHook*/
 		$this->pop3 = new pop3_class;
 		
 		$this->pop3->hostname							= $this->settings['pop3_server'];
@@ -147,6 +123,14 @@ class task_item
 				
 		if ( !$messages )
 		{
+			$this->pop3->Close();
+			
+			/* Log to log table - modify but dont delete */
+			$this->class->appendTaskLog( $this->task, $this->lang->words['task_pop3email'] );
+			
+			/* Unlock Task: DO NOT MODIFY! */
+			$this->class->unlockTask( $this->task );
+			
 			return;
 		}
 		
@@ -154,10 +138,10 @@ class task_item
 		// Well get them then!
 		//--------------------------------------
 		
-		require_once ( IPS_KERNEL_PATH . 'classIncomingEmail.php' );
+		require_once ( IPS_KERNEL_PATH . 'classIncomingEmail.php' );/*noLibHook*/
 		
 		$result = $this->pop3->ListMessages( '', TRUE );
-				
+						
 		if ( is_array( $result ) and !empty( $result ) )
 		{
 			foreach ( $result as $id => $messageID )
@@ -171,7 +155,13 @@ class task_item
 				}
 				
 				$incomingEmail = new classIncomingEmail( $getMessage );
-				$incomingEmail->route();
+				if ( !$incomingEmail->ignore )
+				{
+					$incomingEmail->route();
+				}
+				
+				// And delete
+				$this->pop3->DeleteMessage( $id );
 			}
 		}
 		
@@ -181,11 +171,10 @@ class task_item
 		
 		$this->pop3->Close();
 		
-		//-----------------------------------------
-		// Cleanup
-		//-----------------------------------------
-		
+		/* Log to log table - modify but dont delete */
 		$this->class->appendTaskLog( $this->task, $this->lang->words['task_pop3email'] );
+		
+		/* Unlock Task: DO NOT MODIFY! */
 		$this->class->unlockTask( $this->task );
 	}
 	
@@ -197,7 +186,7 @@ class task_item
 		}
 		
 		$response = $this->pop3->GetLine();
-		if ( $response != "+OK message follows" )
+		if ( substr( $response, 0, 3 ) != '+OK' )
 		{
 			return NULL;
 		}
@@ -215,5 +204,4 @@ class task_item
 		
 		return $message;
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/core/tasks/rebuildstats.php b/upload/admin/applications/core/tasks/rebuildstats.php
index 1dd1b63f..a378619b 100644
--- a/upload/admin/applications/core/tasks/rebuildstats.php
+++ b/upload/admin/applications/core/tasks/rebuildstats.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Rebuild stats
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		rebuildstats.php 	Task to rebuild the board statistics
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,54 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to rebuild the board statistics
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$lang
+	 * @var		$cache
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
 	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		$this->registry		= $registry;
+		$this->lang			= $this->registry->getClass('class_localization');
+		$this->cache		= $this->registry->cache();
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,8 +72,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
diff --git a/upload/admin/applications/core/xml/admin_core_language_pack.xml b/upload/admin/applications/core/xml/admin_core_language_pack.xml
index 974167ce..37046d42 100644
--- a/upload/admin/applications/core/xml/admin_core_language_pack.xml
+++ b/upload/admin/applications/core/xml/admin_core_language_pack.xml
@@ -4,102 +4,9 @@
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_ajax</word_pack>
-      <word_key>ls_grouptitles</word_key>
-      <word_default>Groups</word_default>
-      <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_view_more_groups</word_key>
-      <word_default>View more groups</word_default>
-      <word_custom>Показать в�е группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_groupresults</word_key>
-      <word_default><![CDATA[There are per-group settings that matched your search term &raquo;]]></word_default>
-      <word_custom><![CDATA[Групповые на�тройки, �оответ�твующие пои�ковому запро�у &raquo;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_view_more_mem</word_key>
-      <word_default>View more members</word_default>
-      <word_custom>Показать в�ех пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>lsnoresults</word_key>
-      <word_default>No results</word_default>
-      <word_custom>�ет результатов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_members</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_acppages</word_key>
-      <word_default>ACP Pages</word_default>
-      <word_custom>Разделы �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>livesearchmemid</word_key>
-      <word_default>ID: </word_default>
-      <word_custom>ID: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_settings</word_key>
-      <word_default>Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_help</word_key>
-      <word_default>Help Files</word_default>
-      <word_custom>Разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ls_view_more_help</word_key>
+      <word_default>View more help files</word_default>
+      <word_custom>Показать в�е разделы помощи</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -107,9 +14,6 @@
       <word_key>ls_quick_search</word_key>
       <word_default>Quick Search</word_default>
       <word_custom>Бы�трый пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -117,29 +21,13 @@
       <word_key>ls_view_more_acp</word_key>
       <word_default>View more ACP Pages</word_default>
       <word_custom>Показать в�е разделы �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_ajax</word_pack>
-      <word_key>ls_groups</word_key>
-      <word_default>Groups Form</word_default>
-      <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_ajax</word_pack>
-      <word_key>ls_view_more_help</word_key>
-      <word_default>View more help files</word_default>
-      <word_custom>Показать в�е разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ls_settings</word_key>
+      <word_default>Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -147,9 +35,55 @@
       <word_key>ls_view_more_settings</word_key>
       <word_default>View more settings</word_default>
       <word_custom>Показать в�е на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_help</word_key>
+      <word_default>Help Files</word_default>
+      <word_custom>Разделы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_acppages</word_key>
+      <word_default>ACP Pages</word_default>
+      <word_custom>Разделы �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>lsnoresults</word_key>
+      <word_default>No results</word_default>
+      <word_custom>�ет результатов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>livesearchmemid</word_key>
+      <word_default>ID: </word_default>
+      <word_custom>ID: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_grouptitles</word_key>
+      <word_default>Groups</word_default>
+      <word_custom>Группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_view_more_mem</word_key>
+      <word_default>View more members</word_default>
+      <word_custom>Показать в�ех пользователей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -157,9 +91,6 @@
       <word_key>ls_forums</word_key>
       <word_default>Forums</word_default>
       <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -167,3159 +98,370 @@
       <word_key>ls_view_more_forums</word_key>
       <word_default>View more forums</word_default>
       <word_custom>Показать в�е форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_groups</word_key>
+      <word_default>Groups Form</word_default>
+      <word_custom>Группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_groupresults</word_key>
+      <word_default><![CDATA[There are per-group settings that matched your search term &raquo;]]></word_default>
+      <word_custom><![CDATA[Групповые на�тройки, �оответ�твующие пои�ковому запро�у &raquo;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_ajax</word_pack>
+      <word_key>ls_view_more_groups</word_key>
+      <word_default>View more groups</word_default>
+      <word_custom>Показать в�е группы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_selectid</word_key>
-      <word_default>Select a Hook ID</word_default>
-      <word_custom>Выберите ID хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_menu_title</word_key>
+      <word_default>Sphinx</word_default>
+      <word_custom>Sphinx</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_preendif</word_key>
-      <word_default>(pre.endif) Before the if statement ends</word_default>
-      <word_custom>(pre.endif) Перед завершением выражени� if</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_menu_desc</word_key>
+      <word_default>View Sphinx related tasks</word_default>
+      <word_custom>Про�мотр задач, �в�занных �о Sphinx</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_postendif</word_key>
-      <word_default>(post.endif) After the if statement ends</word_default>
-      <word_custom>(post.endif) По�ле завершени� выражени� if</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_build_cronjob</word_key>
+      <word_default>Build Cronjobs</word_default>
+      <word_custom>Создать задачи дл� cron</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_postelse</word_key>
-      <word_default>(post.else) After the else statement starts</word_default>
-      <word_custom>(post.else) По�ле начала выражени� else</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_path</word_key>
+      <word_default>Path to sphinx.conf</word_default>
+      <word_custom>Путь к sphinx.conf</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_preelse</word_key>
-      <word_default>(pre.else) Before the else statement starts</word_default>
-      <word_custom>(pre.else) Перед началом выражени� else</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_title</word_key>
+      <word_default>Build Sphinx Cronjobs</word_default>
+      <word_custom>Создание cron-задач дл� Sphinx</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_poststartif</word_key>
-      <word_default>(post.startif) After the if statement starts</word_default>
-      <word_custom>(post.startif) По�ле начала выражени� if</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_build_conf</word_key>
+      <word_default>Build sphinx.conf</word_default>
+      <word_custom>Создать sphinx.conf</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_outerpost</word_key>
-      <word_default>(outer.post) After the foreach loop ends</word_default>
-      <word_custom>(outer.post) По�ле завершени� цикла foreach</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_details</word_key>
+      <word_default><![CDATA[You can find the cronjobs you should set up on your server for Sphinx below.<br />If you have already added these cronjobs to your server previously, please be sure to edit the old ones instead of adding duplicates.]]></word_default>
+      <word_custom><![CDATA[�иже приведены задачи дл� крона, которые необходимы дл� правильной индек�ации базы sphinx.<br/>Е�ли вы уже добавл�ли задачи в cron, то убедите�ь, что прежде чем добавить новые, вы удалили �тарые.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_prestartif</word_key>
-      <word_default>(pre.startif) Before the if statement starts</word_default>
-      <word_custom>(pre.startif) Перед началом выражени� if</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_nofiledesc</word_key>
+      <word_default><![CDATA[The file '%s' may not exist on your server. If you still need to upload it, ignore this warning, otherwise please double-check the path.]]></word_default>
+      <word_custom><![CDATA[Файла '%s' не �уще�твует. Е�ли вы еще не загрузили его, то проигнорируйте данное предупреждение, в противном �лучае убедите�ь в правильно�ти пути.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_innerpost</word_key>
-      <word_default>(inner.post) Before the foreach loop ends</word_default>
-      <word_custom>(inner.post) Перед завершением цикла foreach</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_nofile</word_key>
+      <word_default>File not found</word_default>
+      <word_custom>Файл не найден</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_innerpre</word_key>
-      <word_default>(inner.pre) After the foreach loop starts</word_default>
-      <word_custom>(inner.pre) По�ле начала цикла foreach</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_path_desc</word_key>
+      <word_default>Enter the path to your sphinx.conf file on the server (no trailing slash)</word_default>
+      <word_custom>Введите путь до вашего файла sphinx.php (без �леша на конце)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_outerpre</word_key>
-      <word_default>(outer.pre) Before the foreach loop starts</word_default>
-      <word_custom>(outer.pre) Перед началом цикла foreach</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinx_cronjob_note</word_key>
+      <word_default>NOTE: these cronjobs should work with most servers, but if you experience issues with them please contat your hosting company for support.</word_default>
+      <word_custom>ПРИМЕЧ��ИЕ: данное опи�ание задач подходит дл� большин�тва �ерверов, однако, е�ли у ва� возникли проблемы � добавлением задач, то во�пользуйте�ь помощью вашего хо�тинг-провайдера. </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_noedit</word_key>
-      <word_default>We could not find the hook you were attempting to edit.</word_default>
-      <word_custom>Хук, который вы хотите изменить, не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>updates_string_single</word_key>
+      <word_default>There is 1 update available</word_default>
+      <word_custom>До�тупно одно обновление</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_hasbeenun</word_key>
-      <word_default>The hook has been uninstalled.</word_default>
-      <word_custom>Хук удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_hasbeenenabled</word_key>
-      <word_default>The hook has been enabled.</word_default>
-      <word_custom>Хук включен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_noexport</word_key>
-      <word_default>We could not find the hook you were attempting to export.</word_default>
-      <word_custom>Хук, который вы пытаете�ь �к�портировать, не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_insertran</word_key>
-      <word_default>insert queries run</word_default>
-      <word_custom>INSERT запро�ов выполнено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_updateran</word_key>
-      <word_default>update queries run</word_default>
-      <word_custom>UPDATE запро�ов выполнено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_dbcreated</word_key>
-      <word_default>database tables created</word_default>
-      <word_custom>таблиц �оздано в базе данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_dbaltered</word_key>
-      <word_default>database tables altered</word_default>
-      <word_custom>таблиц базы данных изменено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_taskup</word_key>
-      <word_default>tasks updated</word_default>
-      <word_custom>задач обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_cssup</word_key>
-      <word_default>CSS updated</word_default>
-      <word_custom>CSS обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_taskin</word_key>
-      <word_default>tasks inserted</word_default>
-      <word_custom>задач добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_cssin</word_key>
-      <word_default>CSS inserted</word_default>
-      <word_custom>CSS добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_tempup</word_key>
-      <word_default>templates updated</word_default>
-      <word_custom>шаблонов обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_tempin</word_key>
-      <word_default>templates inserted</word_default>
-      <word_custom>шаблонов добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_acpin</word_key>
-      <word_default>ACP help files inserted</word_default>
-      <word_custom>файлов помощи �дминцентра добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_acpup</word_key>
-      <word_default>ACP help files updated</word_default>
-      <word_custom>файлов помощи �дминцентра обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_modup</word_key>
-      <word_default>modules updated</word_default>
-      <word_custom>модулей обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_helpin</word_key>
-      <word_default>help files inserted</word_default>
-      <word_custom>файлов помощи добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_helpup</word_key>
-      <word_default>help files updated</word_default>
-      <word_custom>файлов помощи обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_modin</word_key>
-      <word_default>modules inserted</word_default>
-      <word_custom>модулей добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_langbitin</word_key>
-      <word_default>language bits inserted</word_default>
-      <word_custom>�зыковых �трок добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_langbitup</word_key>
-      <word_default>language bits updated</word_default>
-      <word_custom>�зыковых �трок обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_settingup</word_key>
-      <word_default>settings updated</word_default>
-      <word_custom>на�троек обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_settingin</word_key>
-      <word_default>settings inserted</word_default>
-      <word_custom>на�троек добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_filesin</word_key>
-      <word_default>files inserted</word_default>
-      <word_custom>Файлы добавлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_settinggin</word_key>
-      <word_default>setting groups inserted</word_default>
-      <word_custom>групп на�троек добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_newhookin</word_key>
-      <word_default>New hook record inserted</word_default>
-      <word_custom>�овый хук добавлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_followingacts</word_key>
-      <word_default>The collowing actions were done:</word_default>
-      <word_custom>Выполнены �ледующие дей�тви�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_xmlwrong</word_key>
-      <word_default>The uploaded XML file does not appear to be a valid hook installation file.</word_default>
-      <word_custom>Загруженный XML-файл не �вл�ет�� у�тановочным файлом хука.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_noxml</word_key>
-      <word_default>There was no XML file uploaded. Please try again.</word_default>
-      <word_custom>XML файл не загружен. Пожалуй�та, попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_disable_all</word_key>
-      <word_default>Disable all hooks</word_default>
-      <word_custom>Отключить в�е хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_reenable_all</word_key>
-      <word_default>Reenable all hooks</word_default>
-      <word_custom>Включить в�е хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_key_desc</word_key>
-      <word_default>This is a unique key for your hook</word_default>
-      <word_custom>Это уникальный ключ дл� хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_key</word_key>
-      <word_default>Hook Key</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_no_key</word_key>
-      <word_default>You must supply a hook key for your hook</word_default>
-      <word_custom>�еобходимо вве�ти ключ хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_button</word_key>
-      <word_default>Save Hook</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_no_title</word_key>
-      <word_default>The hook title field can not be blank</word_default>
-      <word_custom>�азвание хука не может быть пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_version_help</word_key>
-      <word_default>Current version of this hook</word_default>
-      <word_custom>Текуща� вер�и� хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_version</word_key>
-      <word_default>Hook Version (human-readable)</word_default>
-      <word_custom>Вер�и� хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_desc_help</word_key>
-      <word_default>Brief description of what this hook does, this is for your reference only</word_default>
-      <word_custom>Краткое опи�ание того, что делает хук. (Дл� ��ылки)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_desc</word_key>
-      <word_default>Hook Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_title</word_key>
-      <word_default>Hook Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_title_help</word_key>
-      <word_default>Title of the hook, this is for your reference only.</word_default>
-      <word_custom>�азвание хука (дл� �правки).</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_info</word_key>
-      <word_default>Hook Information</word_default>
+      <word_key>app_tab_info</word_key>
+      <word_default>Application Information</word_default>
       <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_basic_info</word_key>
-      <word_default>Basic Hook Information</word_default>
-      <word_custom>О�новна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_disable_hook_warnings</word_key>
+      <word_default><![CDATA[Disabling the %s application has caused %s warning(s) for the <a href='%s'>enabled hooks</a> !]]></word_default>
+      <word_custom><![CDATA[Отключение приложени� «%s» вызовит %s предупреждений у <a href='%s'>включенных хуков</a> !]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_page_info</word_key>
-      <word_default><![CDATA[You can use this form to genereate a new hook 'skeleton' for you.]]></word_default>
-      <word_custom>И�пользуйте �ту форму дл� �оздани� заготовки хука.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_already_added</word_key>
+      <word_default>The specified application directory already exists, please use a different directory</word_default>
+      <word_custom>Указанна� директори� уже �уще�твует, пожалуй�та выберите другую директорию</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_export</word_key>
-      <word_default>Export</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>updates_string_more</word_key>
+      <word_default>There are %s updates available</word_default>
+      <word_custom>До�тупно %s обновлений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>hook_form_page_title</word_key>
-      <word_default>Create Hook</word_default>
-      <word_custom>Создать хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_tab_permissions</word_key>
+      <word_default>Tab Permissions</word_default>
+      <word_custom>Права до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addscript</word_key>
-      <word_default>Add Custom Script</word_default>
-      <word_custom>Добавить �крипт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_form_tabgroups</word_key>
+      <word_default>Hide for groups...</word_default>
+      <word_custom>Скрыть от групп</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_script_info</word_key>
-      <word_default>You can include a custom script which will be executed upon installation and uninstallation</word_default>
-      <word_custom>Вы можете добавить �крипт, который будет выполнен в ходе у�тановки и удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>import_modules_xml</word_key>
+      <word_default>Import Modules XML</word_default>
+      <word_custom>Импортировать XML модулей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportscript</word_key>
-      <word_default>Export Custom Script</word_default>
-      <word_custom>Эк�порт �крипта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>export_modules_xml</word_key>
+      <word_default>Export Modules XML</word_default>
+      <word_custom>Эк�портировать XML модулей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_adddb</word_key>
-      <word_default>Add Database Changes</word_default>
-      <word_custom>Добавить изменени� базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>export_apps_xml</word_key>
+      <word_default>Export Applications XML</word_default>
+      <word_custom>Эк�портировать XML приложений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_db_info</word_key>
-      <word_default>You can include new database tables, changes to existing tables, insertions, and updates to be run</word_default>
-      <word_custom>Вы можете добавить новые таблицы базы данных, изменени� в �уще�твующих таблицах и обновлени� дл� запу�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_tab_gcaches</word_key>
+      <word_default>Global Caches</word_default>
+      <word_custom>Глобальные кеши</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportdb</word_key>
-      <word_default>Export Database Changes</word_default>
-      <word_custom>Эк�порт изменений базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>app_form_tabgroups_desc</word_key>
+      <word_default><![CDATA[Chosen groups won't see the tab in the header but will still be able to access the application, doesn't apply if the setting above is 'Yes']]></word_default>
+      <word_custom>Укажите группы, которые ну будут видеть закладки в меню, но при �том будут иметь возможно�ть работы � приложением. Параметр не имеет �илы, е�ли предедуща� на�тройка вы�тавлена в значение «Да»</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addtasks</word_key>
-      <word_default>Add Tasks</word_default>
-      <word_custom>Добавить задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_appurl_info</word_key>
+      <word_default><![CDATA[(Optional) Enter the URL the system can check against for update notifications.<br />"&amp;boardVersion=(ipb-long-version-id)&amp;version=(app-long-version-id)" will be appended to the URL.]]></word_default>
+      <word_custom><![CDATA[(Дополнительно) Введите URL по которому �итема �может провер�ть наличие обновлений. <br />"&amp;boardVersion=(ipb-long-version-id)&amp;version=(app-long-version-id)" будет добавлено к данному URL.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exporttasks</word_key>
-      <word_default>Export Tasks</word_default>
-      <word_custom>Эк�порт задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_apptitle</word_key>
+      <word_default>Additional Application</word_default>
+      <word_custom>Дополнительное приложение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_tasks_info</word_key>
-      <word_default>You can include tasks to be exported with your hook</word_default>
-      <word_custom>Вы можете добавить задачи дл� �к�порта � хуком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>h_phpnew</word_key>
+      <word_default>Your PHP version is too new to support this hook. Maximum: %s</word_default>
+      <word_custom>И�пользуема� вер�и� PHP не подходит дл� �того хука.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_nocss</word_key>
-      <word_default>There are no css files being expored</word_default>
-      <word_custom>�ет файлов css дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>h_phpold</word_key>
+      <word_default>Your PHP version is too old to support this hook. Minimum: %s</word_default>
+      <word_custom>И�пользуема� вер�и� PHP не подходит дл� �того хука.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addcss</word_key>
-      <word_default>Add CSS Files</word_default>
-      <word_custom>Добавить файл CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_noreqs</word_key>
+      <word_default>This hook has no requirements</word_default>
+      <word_custom>Хук не имеет об�зательных требований</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportcss</word_key>
-      <word_default>Export Skin CSS</word_default>
-      <word_custom>Эк�порт CSS �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_skip_reqs</word_key>
+      <word_default><![CDATA[The hook you are trying to install does not meet all the requirements, please review them below.<br />If you still want to go ahead and enable it press the 'Enable Hook' button above but BE CAREFUL as you might get errors!]]></word_default>
+      <word_custom><![CDATA[Хук не может быть у�тановлен на вашей �и�теме, так как она не удовлетвор�ет требовани�м хука. <br />Вы вправе проигнорировать данное предупреждение и включит хук, нажав кнопку "Включить", но при �том могут возникнуть проблемы в работе в�ей �и�темы.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_css_info</word_key>
-      <word_default>You can include css files to be added with your hook</word_default>
-      <word_custom>Вы можете включить css файлы добавив вашу хук.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_addanother</word_key>
+      <word_default>Add another application</word_default>
+      <word_custom>Добавить другое приложение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addskin</word_key>
-      <word_default>Add Skin Templates</word_default>
-      <word_custom>Добавить шаблон �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_appdisabled</word_key>
+      <word_default>%s application is disabled, please enable the application</word_default>
+      <word_custom>Приложение %s отключено, пожалуй�та включите его</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_skin_info</word_key>
-      <word_default>You can include entire skin files or individual skin templates</word_default>
-      <word_custom>Вы можете добавить как ве�ь файл �тил� так и отдельные шаблоны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_appnotfound</word_key>
+      <word_default>%s Application not found, please install the application</word_default>
+      <word_custom>Приложение %s не найдено в �и�теме, пожалуй�та у�тановите его</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addacp</word_key>
-      <word_default>Add ACP Help Files</word_default>
-      <word_custom>Добавить файлы помощи �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_tooold</word_key>
+      <word_default>Your version of the application is too old to support this hook. Minimum: %s</word_default>
+      <word_custom>Вер�и� у�тановленного в вашей �и�теме приложени� не поддерживает�� данным хуком. Требует��: %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportskin</word_key>
-      <word_default>Export Skin Templates</word_default>
-      <word_custom>Эк�порт шаблонов �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_current</word_key>
+      <word_default>Your version</word_default>
+      <word_custom>Ваша вер�и�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_acp_info</word_key>
-      <word_default>You can include ACP help files to be exported with your hook</word_default>
-      <word_custom>Вы можете добавить файлы помощи �дминцентра дл� �к�порта � хуком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_toonew</word_key>
+      <word_default>Your version of the application is too new to support this hook. Maximum: %s</word_default>
+      <word_custom>Вер�и� у�тановленного в вашей �и�теме приложени� не поддерживает�� данным хуком. Требует��: %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addhelp</word_key>
-      <word_default>Add Help Files</word_default>
-      <word_custom>Добавить файлы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_min</word_key>
+      <word_default>Minimum version</word_default>
+      <word_custom>Минимальна� вер�и�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportacp</word_key>
-      <word_default>Export ACP Help Files</word_default>
-      <word_custom>Эк�порт файлов помощи �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_max</word_key>
+      <word_default>Maximum version</word_default>
+      <word_custom>Мак�имальна� вер�и�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_help_info</word_key>
-      <word_default>You can include help files to be exported with your hook</word_default>
-      <word_custom>Вы можете добавить файлы помощи дл� �к�порта � хуков</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_ok</word_key>
+      <word_default>OK</word_default>
+      <word_custom>ОК</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addmod</word_key>
-      <word_default>Add Modules</word_default>
-      <word_custom>Добавить модули</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_require_error</word_key>
+      <word_default>ERROR</word_default>
+      <word_custom>ОШИБК�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exporthelp</word_key>
-      <word_default>Export Help Files</word_default>
-      <word_custom>Эк�порт файлов помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_overview_warnings</word_key>
+      <word_default>There are %s warnings in the enabled hooks!</word_default>
+      <word_custom>�айдено %s проблем дл� включенных хуков</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_mod_info</word_key>
-      <word_default>You can include modules to be added to existing applications</word_default>
-      <word_custom>Вы можете модули дл� добавлени� к �уще�твующим приложени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_overview_warning</word_key>
+      <word_default>There is 1 warning in the enabled hooks!</word_default>
+      <word_custom>�айдена одна проблема дл� включенных хуков</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_exportmod</word_key>
-      <word_default>Export Modules</word_default>
-      <word_custom>Эк�порт модулей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_badge_warning</word_key>
+      <word_default>WARNING</word_default>
+      <word_custom>В�ИМ��ИЕ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_addlang</word_key>
-      <word_default>Add Language Bits</word_default>
-      <word_custom>Добавить �зыковые �троки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_lang_info</word_key>
-      <word_default>You can include entire language files, or language strings to add to existing files</word_default>
-      <word_custom>Вы можете включить как отдельные �зыковые �троки так и целые файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_exportlang</word_key>
-      <word_default>Export Language Strings</word_default>
-      <word_custom>Э�порт �зыковых �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_addsettings</word_key>
-      <word_default>Add Settings</word_default>
-      <word_custom>Добавить на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_settings_info</word_key>
-      <word_default>You can include groups of settings and individual settings you wish to export with this hook</word_default>
-      <word_custom>Вы можете выбрать как отдельные на�тройки так и их группы дл� �к�порта � �тим хуком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_exportsettings</word_key>
-      <word_default>Export Settings</word_default>
-      <word_custom>Эк�порт на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noskin</word_key>
-      <word_default>There are no skin templates being exported</word_default>
-      <word_custom>�ет шаблонов �тилей дл� �кпорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nolang</word_key>
-      <word_default>There are no language strings being exported</word_default>
-      <word_custom>�ет �зыковых �трок дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noinun</word_key>
-      <word_default>There is no custom install/uninstall script configured</word_default>
-      <word_custom>�ет на�троенных �криптов у�тановки/удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nodbchanges</word_key>
-      <word_default>There are no database changes being exported</word_default>
-      <word_custom>�ет изменений базы данных дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_notasks</word_key>
-      <word_default>There are no tasks being exported</word_default>
-      <word_custom>�ет задач дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noacp</word_key>
-      <word_default>There are no ACP help files being exported</word_default>
-      <word_custom>�ет файлов �дминцентра дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nohelp</word_key>
-      <word_default>There are no help files being exported</word_default>
-      <word_custom>�ет файлов помощи дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_willworkphp</word_key>
-      <word_default>This hook will work on the version of PHP you are using</word_default>
-      <word_custom>Этот хук будет работать � и�пользуемой вер�ией PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nosettings</word_key>
-      <word_default>There are no settings being exported</word_default>
-      <word_custom>�ет на�троек дл� �кпорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nomodules</word_key>
-      <word_default>There are no modules being exported</word_default>
-      <word_custom>�ет модулей дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_phpstatus</word_key>
-      <word_default>PHP Version Status</word_default>
-      <word_custom>Со�то�ние вер�ии PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_yourphp</word_key>
-      <word_default>Your PHP Version</word_default>
-      <word_custom>Ваша вер�и� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_maxphp</word_key>
-      <word_default>Maximum PHP Version</word_default>
-      <word_custom>Мак�имальна� вер�и� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_ipbstatus</word_key>
-      <word_default>IP.Board Version Status</word_default>
-      <word_custom>Со�то�ние вер�ии IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_minphp</word_key>
-      <word_default>Minimum PHP Version</word_default>
-      <word_custom>Минимальна� вер�и� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_willworkipb</word_key>
-      <word_default>This hook will work with the version of IP.Board you are using</word_default>
-      <word_custom>Этот хук будет работать � данной вер�ией IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_youripb</word_key>
-      <word_default>Your IP.Board Version</word_default>
-      <word_custom>И�пользуема� вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_minipb</word_key>
-      <word_default>Minimum IP.Board Version</word_default>
-      <word_custom>Минимальна� вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_maxipb</word_key>
-      <word_default>Maximum IP.Board Version</word_default>
-      <word_custom>Мак�имальна� вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_checkrequirements</word_key>
-      <word_default>Checking system requirements...</word_default>
-      <word_custom>Проверка �и�темных требований...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_yesyoucan</word_key>
-      <word_default>You are able to use this hook</word_default>
-      <word_custom>Вы можете и�пользовать �тот хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noyoucant</word_key>
-      <word_default>This hook is not supported on your system</word_default>
-      <word_custom>Хук не поддерживает�� �и�темой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_outerpost</word_key>
-      <word_default>after the end of the foreach statement </word_default>
-      <word_custom>по�ле завершени� выражени� foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_innerpost</word_key>
-      <word_default>before the end of the foreach statement </word_default>
-      <word_custom>перед завершением выражени� foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_innerpre</word_key>
-      <word_default>after the start of the foreach statement </word_default>
-      <word_custom>по�ле начала выражени� foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_outerpre</word_key>
-      <word_default>before the start of the foreach statement </word_default>
-      <word_custom>перед началом выражени� foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_postendif</word_key>
-      <word_default>after the end of the if statement </word_default>
-      <word_custom>по�ле завершени� выражени� if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_preendif</word_key>
-      <word_default>before the end of the if statement </word_default>
-      <word_custom>перед завершением выражени� if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_postelse</word_key>
-      <word_default>after the start of the else statement </word_default>
-      <word_custom>по�ле начала выражени� else </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_preelse</word_key>
-      <word_default>before the start of the else statement </word_default>
-      <word_custom>до начала выражени� else </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_poststartif</word_key>
-      <word_default>after the start of the if statement </word_default>
-      <word_custom>по�ле начала выражени� if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_prestartif</word_key>
-      <word_default>before the start of the if statement </word_default>
-      <word_custom>до начала выражени� if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_labeled</word_key>
-      <word_default>labeled </word_default>
-      <word_custom> � меткой </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_willoverload</word_key>
-      <word_default>This hook will overload </word_default>
-      <word_custom>Этот хук перегружает </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_fileuses</word_key>
-      <word_default>Files that this hook uses</word_default>
-      <word_custom>Файлы и�пользуемые хуком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_realfile</word_key>
-      <word_default>Real file name</word_default>
-      <word_custom>Им� файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_storedfile</word_key>
-      <word_default>Stored file name</word_default>
-      <word_custom>Сохраненное им� файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_wherehook</word_key>
-      <word_default>Where this hook shows</word_default>
-      <word_custom>Где отображает�� хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_showsin</word_key>
-      <word_default>This hook shows in </word_default>
-      <word_custom>Этот хук отображает�� в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_maximum</word_key>
-      <word_default>Maximum</word_default>
-      <word_custom>Мак�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookid</word_key>
-      <word_default><![CDATA[The hook 'ID']]></word_default>
-      <word_custom>ID хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookloc</word_key>
-      <word_default>The hook location</word_default>
-      <word_custom>Ра�положение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_addanother</word_key>
-      <word_default>Add Another File</word_default>
-      <word_custom>Добавить файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookver</word_key>
-      <word_default>Hook Version</word_default>
-      <word_custom>Вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_authorsite</word_key>
-      <word_default>Author Website</word_default>
-      <word_custom>Сайт автора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_minimum</word_key>
-      <word_default>Minimum</word_default>
-      <word_custom>Мин.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_typeoftemp</word_key>
-      <word_default>Type of template hook</word_default>
-      <word_custom>Тип хука дл� шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_classextend</word_key>
-      <word_default>The class this file extends</word_default>
-      <word_custom>Кла�� ра�шир�емый �тим файлом</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_datalocation</word_key>
-      <word_default>Data Location</word_default>
-      <word_custom>Данные ра�положени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_skingroup</word_key>
-      <word_default>The skin group this hook is in</word_default>
-      <word_custom>Группа шаблонов, к которой принадлежит хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_skinfunc</word_key>
-      <word_default>The skin function this hook is in</word_default>
-      <word_custom>Шаблон, в котором находит�� хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_datahook</word_key>
-      <word_default>Data hook</word_default>
-      <word_custom>Данные хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_libraryhook</word_key>
-      <word_default>Library hook</word_default>
-      <word_custom>Библиотека хуков</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_templatehook</word_key>
-      <word_default>Template hook</word_default>
-      <word_custom>Хук дл� шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_soverloader</word_key>
-      <word_default>Skin overloader</word_default>
-      <word_custom>Перегрузчик �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_aoverloader</word_key>
-      <word_default>Action overloader</word_default>
-      <word_custom>Перегрузчик дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_selectone</word_key>
-      <word_default>Select One</word_default>
-      <word_custom>Выберите</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_filehooktype</word_key>
-      <word_default>File hook type</word_default>
-      <word_custom>Тип файла хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_fileclassname</word_key>
-      <word_default><![CDATA[This file's class name]]></word_default>
-      <word_custom>Им� кла��а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_filenamedir</word_key>
-      <word_default>File name in hooks directory</word_default>
-      <word_custom>Им� файла в директории хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookfiles</word_key>
-      <word_default>Hook Files</word_default>
-      <word_custom>Файлы хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookfile</word_key>
-      <word_default>File</word_default>
-      <word_custom>Файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_phpminmax</word_key>
-      <word_default>Use the regular PHP version numbers to set the minimum or maximum versions.</word_default>
-      <word_custom>И�пользуйте �тандартное напи�ание вер�ии PHP.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_max</word_key>
-      <word_default>Max</word_default>
-      <word_custom>Мак�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_phpver</word_key>
-      <word_default>PHP Version</word_default>
-      <word_custom>Вер�и� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_min</word_key>
-      <word_default>Min</word_default>
-      <word_custom>Мин.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_longversionid</word_key>
-      <word_default>Use the long version ID to set minimum or maximum versions.</word_default>
-      <word_custom>И�пользуйте ID вер�ии в длинном формате.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_enterzero</word_key>
-      <word_default>Enter 0 for no requirement limits.</word_default>
-      <word_custom>Введите 0 дл� отмены ограничений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_boardversion</word_key>
-      <word_default>IP.Board Version</word_default>
-      <word_custom>Вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookrequirements</word_key>
-      <word_default>Hook Requirements</word_default>
+      <word_key>hook_view_requirements</word_key>
+      <word_default>View Hook Requirements</word_default>
       <word_custom>Требовани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hookurl</word_key>
-      <word_default>Update URL</word_default>
-      <word_custom>URL дл� обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_globalcaches</word_key>
+      <word_default>Global Caches</word_default>
+      <word_custom>Глобальные кеши</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hookurl_info</word_key>
-      <word_default><![CDATA[(Optional) Enter the URL the system can check against for update notifications.  "&amp;version=(long-version-id)" will be appended to the URL, with (long-version-id) being replaced with the value configured above.]]></word_default>
-      <word_custom><![CDATA[(�еоб�зательно) Введете URL дл� проверки обновлений. К адре�у будет добавлена �трока "&amp;version=(long-version-id)", где (long-version-id) будет заменено значением указанным выше.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_view_details</word_key>
+      <word_default>Hook Details</word_default>
+      <word_custom>Данные</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hooksite_info</word_key>
-      <word_default>(Optional) Enter your homepage so users can contact you</word_default>
-      <word_custom>(�еоб�зательно) Введите адре� вашего �айта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_form_caches</word_key>
+      <word_default>Global Caches</word_default>
+      <word_custom>Глобальные кеши</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hooksite</word_key>
-      <word_default>Website</word_default>
-      <word_custom>Веб-�айт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_remove_file</word_key>
+      <word_default>REMOVE FILE</word_default>
+      <word_custom>УД�ЛИТЬ Ф�ЙЛ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hookemail_info</word_key>
-      <word_default>(Optional) Enter your email address so the user can contact you</word_default>
-      <word_custom>(�еоб�зательно) Введите ваш e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_form_caches_desc</word_key>
+      <word_default>The caches selected here will be loaded on each page at startup without the need for additional queries</word_default>
+      <word_custom>Кеши перечи�ленные зде�ь будут загружены при запро�е любой �траницы �и�темы.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>a_hookemail</word_key>
-      <word_default>Author Email</word_default>
-      <word_custom>E-mail автора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookauthor_info</word_key>
-      <word_default>Enter the author name to display for the user</word_default>
-      <word_custom>Введите им� автора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookversion_info</word_key>
-      <word_default>This is the version used to check for update available notifications</word_default>
-      <word_custom>Эта вер�и� и�пользует�� дл� проверки обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookauthor</word_key>
-      <word_default>Hook Author</word_default>
-      <word_custom>�втор хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookxml</word_key>
-      <word_default>Select a hook XML file</word_default>
-      <word_custom>Выбрать XML-файл хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hookversion</word_key>
-      <word_default>Hook Version (long-version)</word_default>
-      <word_custom>Вер�и� (длинный формат)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_installhook</word_key>
-      <word_default>Install a New Hook</word_default>
-      <word_custom>У�тановить хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nodishooks</word_key>
-      <word_default>There are currently no disabled hooks</word_default>
-      <word_custom>Отключенных хуков нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_uninstallhook</word_key>
-      <word_default>Uninstall Hook</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_setuphook</word_key>
-      <word_default>Hook Setup</word_default>
-      <word_custom>�а�троить хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_disabledhook</word_key>
-      <word_default>Disabled Hooks</word_default>
-      <word_custom>Отключенные хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_enablehook</word_key>
-      <word_default>Enable Hook</word_default>
-      <word_custom>Включить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_exporthook</word_key>
-      <word_default>Export Hook</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_checkhook</word_key>
-      <word_default>Check Requirements</word_default>
-      <word_custom>Проверить требовани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_deletehook</word_key>
-      <word_default>Delete Hook</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_edithook</word_key>
-      <word_default>Edit Hook</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nohooks</word_key>
-      <word_default>There are currently no hooks enabled</word_default>
-      <word_custom>�ет включенных хуков</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_disablehook</word_key>
-      <word_default>Disable Hook</word_default>
-      <word_custom>Отключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_viewhook</word_key>
-      <word_default>View Full Details</word_default>
-      <word_custom>Полна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_move</word_key>
-      <word_default>Move</word_default>
-      <word_custom>Переме�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_lastupdated</word_key>
-      <word_default>Last Updated</word_default>
-      <word_custom>По�леднее обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_uptodate</word_key>
-      <word_default>Up to Date</word_default>
-      <word_custom>�ет обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_installed</word_key>
-      <word_default>Installed</word_default>
-      <word_custom>У�тановлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hook</word_key>
-      <word_default>Hook</word_default>
-      <word_custom>Хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_installedhooks</word_key>
-      <word_default>Installed Hooks</word_default>
-      <word_custom>У�тановленные хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hooks_info</word_key>
-      <word_default>Hooks can be used to modify your IP.Board installation to enhance or add new functionality. You should only install hooks from sources that you trust, as they have full PHP execution capabilities on your server.</word_default>
-      <word_custom>Хуки (модификации) и�пользуют�� дл� изменени� или добавлени� функционально�ти в форум. Вам �ледует у�танавливать хуки только из тех и�точников, которым вы довер�ете.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_hooks</word_key>
-      <word_default>Hooks</word_default>
-      <word_custom>Хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_clickremove</word_key>
-      <word_default>Click here to remove this application</word_default>
-      <word_custom>�ажмите дл� удалени� приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_warning</word_key>
-      <word_default>WARNING, PLEASE READ</word_default>
-      <word_custom>ПРЕДУПРЕЖДЕ�ИЕ, ПОЖ�ЛУЙСТ� ПРОЧТИТЕ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_warning_info</word_key>
-      <word_default><![CDATA[All application data, settings, and caches will be removed and <b>CAN NOT be recovered</b>.  Only proceed if you are sure you do not need any of the data associated with the application.  If you would like to keep this data but not use the application, you can disable the application instead of removing it.]]></word_default>
-      <word_custom><![CDATA[В�е данные приложени�, на�тройки и кеш будут удалены <b>БЕЗ ВОЗМОЖ�ОСТИ ВОССТ��ОВЛЕ�ИЯ</b>. Продолжайте только в том �лучае, е�ли уверены, что данные �в�занные � приложением вам не понадоб�т��. Е�ли приложение более не нужно, но требует�� �охранить данные, то вы можно про�то отключить его.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_continue</word_key>
-      <word_default>Continue</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_currentver</word_key>
-      <word_default>Current Version</word_default>
-      <word_custom>Текуща� вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_cantinstall_info</word_key>
-      <word_default>This application cannot be installed. Is it in the correct directory? You cannot install third party applications into the IPS directory or vice-versa.</word_default>
-      <word_custom>Это приложение не может быть у�тановлено. Убедите�ь что оно в правильной директории. �ельз� у�танавливать �торонние приложени� в директорию IPS и наоборот.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_cannotinstall</word_key>
-      <word_default><![CDATA[<em>Cannot Install</em>]]></word_default>
-      <word_custom><![CDATA[<em>�е может быть у�тановлено</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_install</word_key>
-      <word_default>Install</word_default>
-      <word_custom>У�тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a__rootapp</word_key>
-      <word_default>Root / </word_default>
-      <word_custom>Корень / </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a__ips</word_key>
-      <word_default>IPS Add On / </word_default>
-      <word_custom>Дополнение IPS / </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a__thirdparty</word_key>
-      <word_default>Third Party Add On / </word_default>
-      <word_custom>Стороннее дополнение / </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_author</word_key>
-      <word_default>Authors</word_default>
-      <word_custom>�вторы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_managepublic</word_key>
-      <word_default>Manage PUBLIC Modules...</word_default>
-      <word_custom>Публичные модули</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_unapps</word_key>
-      <word_default>Applications Not Installed</word_default>
-      <word_custom>�еу�тановленные приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_manageadmin</word_key>
-      <word_default>Manage ADMIN Modules...</word_default>
-      <word_custom>�дмини�тратор�кие модули</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_oh_kay</word_key>
-      <word_default>Up to date</word_default>
-      <word_custom>�ет обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_removeapp</word_key>
-      <word_default>Remove Application...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_upgradeavail</word_key>
-      <word_default>Upgrade Available</word_default>
-      <word_custom>До�тупно обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_rootapps</word_key>
-      <word_default>Root Applications</word_default>
-      <word_custom>Базовые приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_thirdparty</word_key>
-      <word_default>Third Party Add Ons</word_default>
-      <word_custom>Сторонние дополнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_installedapps</word_key>
-      <word_default>Installed Applications</word_default>
-      <word_custom>У�тановленные приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_ips</word_key>
-      <word_default>IPS Add Ons</word_default>
-      <word_custom>Дополнени� IPS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_app</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_status</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appprot_info</word_key>
-      <word_default>A protected application cannot be removed or edit by mere humans</word_default>
-      <word_custom>Защищенное приложение не может быть удалено или изменено обычным пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appprot</word_key>
-      <word_default>Application Protected</word_default>
-      <word_custom>Приложение защищено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appen</word_key>
-      <word_default>Application Enabled</word_default>
-      <word_custom>Приложение до�тупно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appdir_info</word_key>
-      <word_default>This directory must exist in the /admin/applications_addon/other directory</word_default>
-      <word_custom>Эта директори� должна �уще�твовать в /admin/applications_addon/other </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appdir</word_key>
-      <word_default>Application Directory</word_default>
-      <word_custom>Директори� приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appver</word_key>
-      <word_default>Application Version</word_default>
-      <word_custom>Вер�и� приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appdesc_info</word_key>
-      <word_default>A short description</word_default>
-      <word_custom>Краткое опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appauthor</word_key>
-      <word_default>Application Author</word_default>
-      <word_custom>�втор приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appdesc</word_key>
-      <word_default>Application Description</word_default>
-      <word_custom>Опи�ание приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appphide_desc</word_key>
-      <word_default>Allows access to the application on the public side, but does not show a tab in the header</word_default>
-      <word_custom>Разрешить до�туп к приложению дл� пользователей, но �крыть вкладку в шапке форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appphide</word_key>
-      <word_default>Hide Tab</word_default>
-      <word_custom>Скрыть вкладку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appptitle_info</word_key>
-      <word_default><![CDATA[A short descriptive title that is viewable on the public side.<br/><strong>Leaving this field blank will cause the application to not be shown on the front end, making it an admin only application.</strong>]]></word_default>
-      <word_custom><![CDATA[Короткое опи�ание, которое видно в�ем.<br/><strong>Е�ли �то поле не заполнено, то приложение не будет показано, и будет до�тупно только в �дминцентре.</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appptitle</word_key>
-      <word_default><![CDATA[Application <em>Public</em> Title]]></word_default>
-      <word_custom><![CDATA[ <em>Публичное</em> им� приложени� ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_apptitle_info</word_key>
-      <word_default>A short descriptive title</word_default>
-      <word_custom>Краткий заголовок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_import</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_apptitle</word_key>
-      <word_default>Application Title</word_default>
-      <word_custom>Им� приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_filexml</word_key>
-      <word_default><![CDATA[<u>OR</u> enter the filename of the XML file]]></word_default>
-      <word_custom><![CDATA[<u>ИЛИ</u> введите им� XML-файла]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_filexml_info</word_key>
-      <word_default><![CDATA[The file must be uploaded into the './admin' folder]]></word_default>
-      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_uploadxml_info</word_key>
-      <word_default>Duplicate entries will not be overwritten but the default setting and other options will be updated.</word_default>
-      <word_custom>Суще�твующие на�тройки будут обновлены, другие — добавлены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_uploadxml</word_key>
-      <word_default>Upload XML file from your computer</word_default>
-      <word_custom>Загрузить XML-файл � компьютера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nomods</word_key>
-      <word_default>This application does not yet have any modules.</word_default>
-      <word_custom>Это приложение еще не имеет ни одного модул�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_importxml</word_key>
-      <word_default>Import XML File</word_default>
-      <word_custom>Импортировать в XML-файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_removemod</word_key>
-      <word_default>Remove Module...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_protectedmod</word_key>
-      <word_default>This is a protected module</word_default>
-      <word_custom>Это защищенный модуль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_position</word_key>
-      <word_default>Position</word_default>
-      <word_custom>Позици�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_thedir</word_key>
-      <word_default>The directory </word_default>
-      <word_custom>Директори� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_couldnotbefound</word_key>
-      <word_default>could not be found.</word_default>
-      <word_custom>не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_version</word_key>
-      <word_default>Version</word_default>
-      <word_custom>Вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_enabled</word_key>
-      <word_default>Enabled</word_default>
-      <word_custom>Включен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modprot_info</word_key>
-      <word_default>A protected application cannot be removed or edited by administrators.</word_default>
-      <word_custom>Защищенное приложение не может быть удалено или изменено админи�тратором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modprot</word_key>
-      <word_default>Module Protected</word_default>
-      <word_custom>Защищенный модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_moden_info</word_key>
-      <word_default>If you disable the module, it will not appear in the menu.</word_default>
-      <word_custom>Е�ли вы отключите �тот модуль, он не будет показан в меню.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_moden</word_key>
-      <word_default>Module Enabled</word_default>
-      <word_custom>Модуль включен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modpar</word_key>
-      <word_default>Module Parent</word_default>
-      <word_custom>Родитель�кий модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modpar_info</word_key>
-      <word_default>If you choose a parent module, it will appear under that main menu link. If you choose no parent, it will become a main menu link.</word_default>
-      <word_custom>Е�ли вы выберите родитель�кий модуль, то ��ылка по�вит�� под ним. Е�ли родитель�кий модуль не выбран, то ��ылка будет в главном меню.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modver_info</word_key>
-      <word_default>The current version of this module.</word_default>
-      <word_custom>Текуща� вер�и� модул�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modver</word_key>
-      <word_default>Module Version</word_default>
-      <word_custom>Вер�и� модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modkey</word_key>
-      <word_default>Module Key</word_default>
-      <word_custom>Ключ модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modkey_info</word_key>
-      <word_default>The name of the directory containing the module files. This should be alphanumeric only with no spaces or special characters.</word_default>
-      <word_custom>Им� директории, �одержащей файлы модул�. Могут и�пользовать�� только цифры и буквы без пробелов и �пециальных �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_moddesc_info</word_key>
-      <word_default>A short description for this module.</word_default>
-      <word_custom>Краткое опи�ание модул�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_moddesc</word_key>
-      <word_default>Module Description</word_default>
-      <word_custom>Опи�ание модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modtitle_info</word_key>
-      <word_default>A short descriptive title.</word_default>
-      <word_custom>Краткий заголовок.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modtitle</word_key>
-      <word_default>Module Title</word_default>
-      <word_custom>Им� модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modtype</word_key>
-      <word_default>Module Type</word_default>
-      <word_custom>Тип модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_settings</word_key>
-      <word_default>Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_apps</word_key>
-      <word_default>Applications</word_default>
-      <word_custom>Приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_editmod</word_key>
-      <word_default>Edit Module Details...</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_savechanges</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_editappdone</word_key>
-      <word_default>Application edited</word_default>
-      <word_custom>Приложение отредактировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_addnewapp</word_key>
-      <word_default>Add New Application</word_default>
-      <word_custom>Добавить приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_editapp</word_key>
-      <word_default>Edit Application Details...</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appadded</word_key>
-      <word_default>Application Added</word_default>
-      <word_custom>Приложение добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_newapp</word_key>
-      <word_default>New Application Added</word_default>
-      <word_custom>�овое приложение добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_titledirectory</word_key>
-      <word_default>You must enter a title AND a directory name.</word_default>
-      <word_custom>Вы должны вве�ти заголовок и им� директории.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_appremoved</word_key>
-      <word_default>Application Removed</word_default>
-      <word_custom>Приложение удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_protectapp</word_key>
-      <word_default>This is a protected application. You cannot remove this module.</word_default>
-      <word_custom>�евозможно удалить защищенное приложение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_recachecomplete</word_key>
-      <word_default>Recache complete</word_default>
-      <word_custom>Обновление кешей завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_mod_reposition</word_key>
-      <word_default>Module position change completed</word_default>
-      <word_custom>Позици� модул� изменена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_admin</word_key>
-      <word_default>Admin</word_default>
-      <word_custom>�дмини�тратор�кие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_modules</word_key>
-      <word_default>Modules</word_default>
-      <word_custom>модули</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_public</word_key>
-      <word_default>Public</word_default>
-      <word_custom>Публичные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noparent</word_key>
-      <word_default><![CDATA[&lt; No Parent &gt;]]></word_default>
-      <word_custom><![CDATA[&lt; �ет родител� &gt; ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_edited</word_key>
-      <word_default>Module Edited</word_default>
-      <word_custom>Модуль отредактирован.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_added</word_key>
-      <word_default>New Module Added</word_default>
-      <word_custom>�овый модуль добавлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_titlekey</word_key>
-      <word_default>You must enter a title AND a module key.</word_default>
-      <word_custom>Вы должны вве�ти им� и ключ модул�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_already</word_key>
-      <word_default>A module already exists in this application with a key of %s.</word_default>
-      <word_custom>В данном приложении модуль уже �уще�твует � ключом %.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_insertupdated</word_key>
-      <word_default>%s items inserted, %s updated.</word_default>
-      <word_custom>% объектов добавлено, % обновлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_file404</word_key>
-      <word_default>Could not find the file to open at: </word_default>
-      <word_custom>�евозможно найти файл: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_nofile</word_key>
-      <word_default>No upload file was found or no filename was specified.</word_default>
-      <word_custom>Файл не загружен или им� файла не корректно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_removed</word_key>
-      <word_default>Module Removed</word_default>
-      <word_custom>Модуль удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_protectmod</word_key>
-      <word_default>This is a protected module. You cannot remove it.</word_default>
-      <word_custom>�евозможно удалить защищенный модуль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>a_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не задан. Попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>purchase_additional</word_key>
-      <word_default>Purchase Additional Applications</word_default>
-      <word_custom>Приобре�ти дополнительные приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>add_new_mod_public</word_key>
-      <word_default>Add New Public Module</word_default>
-      <word_custom>Добавить публичный модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>create_hook_link</word_key>
-      <word_default>Create New Hook</word_default>
-      <word_custom>Создать хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>export_mods_as_xml</word_key>
-      <word_default>Export All As XML</word_default>
-      <word_custom>Эк�портировать в�е в XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>add_new_mod_admin</word_key>
-      <word_default>Add New Admin Module</word_default>
-      <word_custom>Добавить админи�тратор�кий модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>build_sphinx_link</word_key>
-      <word_default>Build Sphinx Config</word_default>
-      <word_custom>Создать конфигурацию Sphinx</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>export_xml</word_key>
-      <word_default>Export As XML</word_default>
-      <word_custom>Эк�порт в XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>rebuild_furl_link</word_key>
-      <word_default>Rebuild FURL Cache</word_default>
-      <word_custom>Обновить кеш ЧПУ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>rebuild_furl_title</word_key>
-      <word_default>Rebuilds the friendly URL cache file from all apps</word_default>
-      <word_custom>Обновить кеш друже�твенных URL в�ех приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>recache_link</word_key>
-      <word_default><![CDATA[Recache Apps &amp; Modules]]></word_default>
-      <word_custom>Обновить кеш приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>seo_no_data</word_key>
-      <word_default>An error occurred; could not locate any data to write</word_default>
-      <word_custom>Произошла ошибка: не обнаружены данные дл� запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>seo_cannot_write</word_key>
-      <word_default>Could not write to the cache file, please check permissions on /cache and /cache/furlCache.php</word_default>
-      <word_custom>�евозможна запи�ь в файл кеша, пожалуй�та, проверьте права до�тупа к /cache и /cache/furlCache.php </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>module_form_add_title</word_key>
-      <word_default>Add module</word_default>
-      <word_custom>Добавить модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>module_form_edit_title</word_key>
-      <word_default>Edit module</word_default>
-      <word_custom>Редактировать модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>app_toggled_ok</word_key>
-      <word_default>The application status has been toggled</word_default>
-      <word_custom>Стату� приложени� изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>cannot_find_tog_app</word_key>
-      <word_default>We could not find the application you were attempting to enable or disable.</word_default>
-      <word_custom>Мы не можем найти приложение, � которым вы хотите произве�ти дей�твие.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>toggle_app_enabled</word_key>
-      <word_default>Toggle enabled/disabled</word_default>
-      <word_custom>Включить/отключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>furl_cache_rebuilt</word_key>
-      <word_default>FURL Cache Rebuilt</word_default>
-      <word_custom>Обновление кеша ЧПУ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>remove_dead_caches</word_key>
-      <word_default>Remove Dead Caches</word_default>
-      <word_custom>Удалить �тарые кеши</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>app_hooks_rebuilt</word_key>
-      <word_default>%s hooks installed, %s hooks updated, and %s hooks skipped</word_default>
-      <word_custom>%s хуков у�тановлено, %s хуков обновлено, и %s хуков пропущено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>rebuild_app_hooks</word_key>
-      <word_default>Reimport Application Hooks</word_default>
-      <word_custom>Переимпортировать хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_check_updates</word_key>
-      <word_default>Check For Updates</word_default>
-      <word_custom>Проверить обновлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>hook_h2_exporting</word_key>
-      <word_default>Exporting</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>addnewmodule_apps</word_key>
-      <word_default>Add New Module</word_default>
-      <word_custom>Добавить модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>cannot_toggle_defaults</word_key>
-      <word_default>You cannot disable the default System, Forum and Member applications.</word_default>
-      <word_custom>Вы не можете отключить приложени� Си�тема, Форум и Пользователи.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_remove_requirement</word_key>
+      <word_default>REMOVE REQUIREMENT</word_default>
+      <word_custom>УД�ЛИТЬ ТРЕБОВ��ИЕ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -3327,39 +469,2141 @@
       <word_key>a_hookapp</word_key>
       <word_default>Application</word_default>
       <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_selectfile</word_key>
-      <word_default>Select a File</word_default>
-      <word_custom>Выберите файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_officialapp</word_key>
+      <word_default>Official IPS Application</word_default>
+      <word_custom>Официальные приложени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_selecttemp</word_key>
-      <word_default>Select a Template</word_default>
-      <word_custom>Выберите шаблон</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>addnewmodule_apps</word_key>
+      <word_default>Add New Module</word_default>
+      <word_custom>Добавить модуль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_onefile</word_key>
-      <word_default>You must apply at least one file to this hook.</word_default>
-      <word_custom>�еобходимо приложить хот� бы один файл к �тому хуку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hook_if_statement</word_key>
+      <word_default>if statement</word_default>
+      <word_custom>у�ловие if</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>cannot_toggle_defaults</word_key>
+      <word_default>You cannot disable the default System, Forum and Member applications.</word_default>
+      <word_custom>Вы не можете отключить приложени� Си�тема, Форум и Пользователи.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_check_updates</word_key>
+      <word_default>Check For Updates</word_default>
+      <word_custom>Проверить обновлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_h2_exporting</word_key>
+      <word_default>Exporting</word_default>
+      <word_custom>Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_update_available</word_key>
+      <word_default>Update Available</word_default>
+      <word_custom>До�тупно обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_titlekey</word_key>
+      <word_default>You must enter a title AND a module key.</word_default>
+      <word_custom>Вы должны вве�ти им� и ключ модул�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>rebuild_app_hooks</word_key>
+      <word_default>Reimport Application Hooks</word_default>
+      <word_custom>Переимпортировать хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>app_hooks_rebuilt</word_key>
+      <word_default>%s hooks installed, %s hooks updated, and %s hooks skipped</word_default>
+      <word_custom>%s хуков у�тановлено, %s хуков обновлено, и %s хуков пропущено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>remove_dead_caches</word_key>
+      <word_default>Remove Dead Caches</word_default>
+      <word_custom>Удалить �тарые кеши</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>furl_cache_rebuilt</word_key>
+      <word_default>FURL Cache Rebuilt</word_default>
+      <word_custom>Обновление кеша ЧПУ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>cannot_find_tog_app</word_key>
+      <word_default>We could not find the application you were attempting to enable or disable.</word_default>
+      <word_custom>Мы не можем найти приложение, � которым вы хотите произве�ти дей�твие.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>toggle_app_enabled</word_key>
+      <word_default>Toggle enabled/disabled</word_default>
+      <word_custom>Включить/отключить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>module_form_edit_title</word_key>
+      <word_default>Edit module</word_default>
+      <word_custom>Редактировать модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>app_toggled_ok</word_key>
+      <word_default>The application status has been toggled</word_default>
+      <word_custom>Стату� приложени� изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>seo_cannot_write</word_key>
+      <word_default>Could not write to the cache file, please check permissions on /cache and /cache/furlCache.php</word_default>
+      <word_custom>�евозможна запи�ь в файл кеша, пожалуй�та, проверьте права до�тупа к /cache и /cache/furlCache.php </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>module_form_add_title</word_key>
+      <word_default>Add module</word_default>
+      <word_custom>Добавить модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>recache_link</word_key>
+      <word_default><![CDATA[Recache Apps &amp; Modules]]></word_default>
+      <word_custom>Обновить кеш приложений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>seo_no_data</word_key>
+      <word_default>An error occurred; could not locate any data to write</word_default>
+      <word_custom>Произошла ошибка: не обнаружены данные дл� запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>add_new_mod_admin</word_key>
+      <word_default>Add New Admin Module</word_default>
+      <word_custom>Добавить админи�тратор�кий модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не задан. Попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_protectmod</word_key>
+      <word_default>This is a protected module. You cannot remove it.</word_default>
+      <word_custom>�евозможно удалить защищенный модуль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_removed</word_key>
+      <word_default>Module Removed</word_default>
+      <word_custom>Модуль удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nofile</word_key>
+      <word_default>No upload file was found or no filename was specified.</word_default>
+      <word_custom>Файл не загружен или им� файла не корректно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_insertupdated</word_key>
+      <word_default>%s items inserted, %s updated.</word_default>
+      <word_custom>% объектов добавлено, % обновлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_file404</word_key>
+      <word_default>Could not find the file to open at: </word_default>
+      <word_custom>�евозможно найти файл: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_no_hook_ids_found</word_key>
+      <word_default>No hook IDs found for the chosen option</word_default>
+      <word_custom>�е найдены ID хуков дл� выполнени� операции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_foreach_loop</word_key>
+      <word_default>foreach loop</word_default>
+      <word_custom>цикл foreach</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>purchase_additional</word_key>
+      <word_default>Purchase Additional Applications</word_default>
+      <word_custom>Приобре�ти дополнительные приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>add_new_mod_public</word_key>
+      <word_default>Add New Public Module</word_default>
+      <word_custom>Добавить публичный модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>create_hook_link</word_key>
+      <word_default>Create New Hook</word_default>
+      <word_custom>Создать хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>export_mods_as_xml</word_key>
+      <word_default>Export All As XML</word_default>
+      <word_custom>Эк�портировать в�е в XML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_already</word_key>
+      <word_default>A module already exists in this application with a key of %s.</word_default>
+      <word_custom>В данном приложении модуль уже �уще�твует � ключом %.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_added</word_key>
+      <word_default>New Module Added</word_default>
+      <word_custom>�овый модуль добавлен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_edited</word_key>
+      <word_default>Module Edited</word_default>
+      <word_custom>Модуль отредактирован.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_admin</word_key>
+      <word_default>Admin</word_default>
+      <word_custom>�дмини�тратор�кие</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_public</word_key>
+      <word_default>Public</word_default>
+      <word_custom>Публичные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noparent</word_key>
+      <word_default><![CDATA[&lt; No Parent &gt;]]></word_default>
+      <word_custom><![CDATA[&lt; �ет родител� &gt; ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_mod_reposition</word_key>
+      <word_default>Module position change completed</word_default>
+      <word_custom>Позици� модул� изменена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modules</word_key>
+      <word_default>Modules</word_default>
+      <word_custom>модули</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_recachecomplete</word_key>
+      <word_default>Recache complete</word_default>
+      <word_custom>Обновление кешей завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_protectapp</word_key>
+      <word_default>This is a protected application. You cannot remove this module.</word_default>
+      <word_custom>�евозможно удалить защищенное приложение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_newapp</word_key>
+      <word_default>New Application Added</word_default>
+      <word_custom>�овое приложение добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_titledirectory</word_key>
+      <word_default>You must enter a title AND a directory name.</word_default>
+      <word_custom>Вы должны вве�ти заголовок и им� директории.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appremoved</word_key>
+      <word_default>Application Removed</word_default>
+      <word_custom>Приложение удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appadded</word_key>
+      <word_default>Application Added</word_default>
+      <word_custom>Приложение добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_editapp</word_key>
+      <word_default>Edit Application</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addnewapp</word_key>
+      <word_default>Add New Application</word_default>
+      <word_custom>Добавить приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_editappdone</word_key>
+      <word_default>Application edited</word_default>
+      <word_custom>Приложение отредактировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_apps</word_key>
+      <word_default>Applications</word_default>
+      <word_custom>Приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_editmod</word_key>
+      <word_default>Edit Module Details...</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modtype</word_key>
+      <word_default>Module Type</word_default>
+      <word_custom>Тип модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_settings</word_key>
+      <word_default>Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modtitle</word_key>
+      <word_default>Module Title</word_default>
+      <word_custom>Им� модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modtitle_info</word_key>
+      <word_default>A short descriptive title.</word_default>
+      <word_custom>Краткий заголовок.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_moddesc</word_key>
+      <word_default>Module Description</word_default>
+      <word_custom>Опи�ание модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modkey</word_key>
+      <word_default>Module Key</word_default>
+      <word_custom>Ключ модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modkey_info</word_key>
+      <word_default>The name of the directory containing the module files. This should be alphanumeric only with no spaces or special characters.</word_default>
+      <word_custom>Им� директории, �одержащей файлы модул�. Могут и�пользовать�� только цифры и буквы без пробелов и �пециальных �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_moddesc_info</word_key>
+      <word_default>A short description for this module.</word_default>
+      <word_custom>Краткое опи�ание модул�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_moden</word_key>
+      <word_default>Module Enabled</word_default>
+      <word_custom>Модуль включен?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modver</word_key>
+      <word_default>Module Version</word_default>
+      <word_custom>Вер�и� модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modver_info</word_key>
+      <word_default>The current version of this module.</word_default>
+      <word_custom>Текуща� вер�и� модул�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modpar</word_key>
+      <word_default>Module Parent</word_default>
+      <word_custom>Родитель�кий модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modpar_info</word_key>
+      <word_default>If you choose a parent module, it will appear under that main menu link. If you choose no parent, it will become a main menu link.</word_default>
+      <word_custom>Е�ли вы выберите родитель�кий модуль, то ��ылка по�вит�� под ним. Е�ли родитель�кий модуль не выбран, то ��ылка будет в главном меню.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modprot_info</word_key>
+      <word_default>A protected application cannot be removed or edited by administrators.</word_default>
+      <word_custom>Защищенное приложение не может быть удалено или изменено админи�тратором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_modprot</word_key>
+      <word_default>Module Protected</word_default>
+      <word_custom>Защищенный модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_moden_info</word_key>
+      <word_default>If you disable the module, it will not appear in the menu.</word_default>
+      <word_custom>Е�ли вы отключите �тот модуль, он не будет показан в меню.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_position</word_key>
+      <word_default>Position</word_default>
+      <word_custom>Позици�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_thedir</word_key>
+      <word_default>The directory </word_default>
+      <word_custom>Директори� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_removemod</word_key>
+      <word_default>Remove Module...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_couldnotbefound</word_key>
+      <word_default>could not be found.</word_default>
+      <word_custom>не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_uploadxml_info</word_key>
+      <word_default>Duplicate entries will not be overwritten but the default setting and other options will be updated.</word_default>
+      <word_custom>Суще�твующие на�тройки будут обновлены, другие — добавлены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_uploadxml</word_key>
+      <word_default>Upload XML file from your computer</word_default>
+      <word_custom>Загрузить XML-файл � компьютера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_importxml</word_key>
+      <word_default>Import XML File</word_default>
+      <word_custom>Импортировать в XML-файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nomods</word_key>
+      <word_default>This application does not yet have any modules.</word_default>
+      <word_custom>Это приложение еще не имеет ни одного модул�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appen</word_key>
+      <word_default>Application Enabled</word_default>
+      <word_custom>Приложение до�тупно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_protectedmod</word_key>
+      <word_default>This is a protected module</word_default>
+      <word_custom>Это защищенный модуль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appprot</word_key>
+      <word_default>Application Protected</word_default>
+      <word_custom>Приложение защищено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appprot_info</word_key>
+      <word_default>A protected application cannot be removed or edited by administrators</word_default>
+      <word_custom>Защищенное приложение не может быть удалено или изменено обычным пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appdir_info</word_key>
+      <word_default>This directory must exist in the /admin/applications_addon/other directory</word_default>
+      <word_custom>Эта директори� должна �уще�твовать в /admin/applications_addon/other </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appver</word_key>
+      <word_default>Application Version</word_default>
+      <word_custom>Вер�и� приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appdir</word_key>
+      <word_default>Application Directory</word_default>
+      <word_custom>Директори� приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appauthor</word_key>
+      <word_default>Application Author</word_default>
+      <word_custom>�втор приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appdesc</word_key>
+      <word_default>Application Description</word_default>
+      <word_custom>Опи�ание приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appdesc_info</word_key>
+      <word_default>A short description</word_default>
+      <word_custom>Краткое опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appphide_desc</word_key>
+      <word_default>Allows access to the application on the public side, but does not show a tab in the header</word_default>
+      <word_custom>Разрешить до�туп к приложению дл� пользователей, но �крыть вкладку в шапке форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appphide</word_key>
+      <word_default>Hide for all current and future groups?</word_default>
+      <word_custom>Скрыть вкладку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appptitle_info</word_key>
+      <word_default><![CDATA[A short descriptive title that is viewable on the public side.<br/><strong>Leaving this field blank will cause the application to not be shown on the front end, making it an admin only application.</strong>]]></word_default>
+      <word_custom><![CDATA[Короткое опи�ание, которое видно в�ем.<br/><strong>Е�ли �то поле не заполнено, то приложение не будет показано, и будет до�тупно только в �дминцентре.</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_appptitle</word_key>
+      <word_default><![CDATA[Application <em>Public</em> Title]]></word_default>
+      <word_custom><![CDATA[ <em>Публичное</em> им� приложени� ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_apptitle_info</word_key>
+      <word_default>A short descriptive title</word_default>
+      <word_custom>Краткий заголовок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_import</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импортировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_apptitle</word_key>
+      <word_default>Application Title</word_default>
+      <word_custom>Им� приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_filexml</word_key>
+      <word_default><![CDATA[<u>OR</u> enter the filename of the XML file]]></word_default>
+      <word_custom><![CDATA[<u>ИЛИ</u> введите им� XML-файла]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_filexml_info</word_key>
+      <word_default><![CDATA[The file must be uploaded into the './admin' folder]]></word_default>
+      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_rootapps</word_key>
+      <word_default>Root Applications</word_default>
+      <word_custom>Базовые приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_thirdparty</word_key>
+      <word_default>Third Party Add Ons</word_default>
+      <word_custom>Сторонние дополнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_ips</word_key>
+      <word_default>IPS Add Ons</word_default>
+      <word_custom>Дополнени� IPS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_installedapps</word_key>
+      <word_default>Installed Applications</word_default>
+      <word_custom>У�тановленные приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_app</word_key>
+      <word_default>Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_oh_kay</word_key>
+      <word_default>Up to date</word_default>
+      <word_custom>�ет обновлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_upgradeavail</word_key>
+      <word_default>Upgrade Available</word_default>
+      <word_custom>До�тупно обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_removeapp</word_key>
+      <word_default>Remove Application...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_editapp_details</word_key>
+      <word_default>Edit Application Details...</word_default>
+      <word_custom>Редактировать приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_manageadmin</word_key>
+      <word_default>Manage ADMIN Modules...</word_default>
+      <word_custom>�дмини�тратор�кие модули</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_managepublic</word_key>
+      <word_default>Manage PUBLIC Modules...</word_default>
+      <word_custom>Публичные модули</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_author</word_key>
+      <word_default>Authors</word_default>
+      <word_custom>�вторы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_unapps</word_key>
+      <word_default>Applications Not Installed</word_default>
+      <word_custom>�еу�тановленные приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a__rootapp</word_key>
+      <word_default>Root / </word_default>
+      <word_custom>Корень / </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a__ips</word_key>
+      <word_default>IPS Add On / </word_default>
+      <word_custom>Дополнение IPS / </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a__thirdparty</word_key>
+      <word_default>Third Party Add On / </word_default>
+      <word_custom>Стороннее дополнение / </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_install</word_key>
+      <word_default>Install</word_default>
+      <word_custom>У�тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_cannotinstall</word_key>
+      <word_default><![CDATA[Can't Install]]></word_default>
+      <word_custom><![CDATA[<em>�е может быть у�тановлено</em>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_cantinstall_info</word_key>
+      <word_default>This application cannot be installed. Is it in the correct directory? You cannot install third party applications into the IPS directory or vice-versa.</word_default>
+      <word_custom>Это приложение не может быть у�тановлено. Убедите�ь что оно в правильной директории. �ельз� у�танавливать �торонние приложени� в директорию IPS и наоборот.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_currentver</word_key>
+      <word_default>Current Version</word_default>
+      <word_custom>Текуща� вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hooks</word_key>
+      <word_default>Hooks</word_default>
+      <word_custom>Хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_clickremove</word_key>
+      <word_default>Click here to remove this application</word_default>
+      <word_custom>�ажмите дл� удалени� приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_warning_info</word_key>
+      <word_default><![CDATA[All application data, settings, and caches will be removed and <b>CAN NOT be recovered</b>.  Only proceed if you are sure you do not need any of the data associated with the application.  If you would like to keep this data but not use the application, you can disable the application instead of removing it.]]></word_default>
+      <word_custom><![CDATA[В�е данные приложени�, на�тройки и кеш будут удалены <b>БЕЗ ВОЗМОЖ�ОСТИ ВОССТ��ОВЛЕ�ИЯ</b>. Продолжайте только в том �лучае, е�ли уверены, что данные �в�занные � приложением вам не понадоб�т��. Е�ли приложение более не нужно, но требует�� �охранить данные, то вы можно про�то отключить его.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_continue</word_key>
+      <word_default>Continue</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_warning</word_key>
+      <word_default>WARNING, PLEASE READ</word_default>
+      <word_custom>ПРЕДУПРЕЖДЕ�ИЕ, ПОЖ�ЛУЙСТ� ПРОЧТИТЕ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hook</word_key>
+      <word_default>Hook</word_default>
+      <word_custom>Хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hooks_info</word_key>
+      <word_default>Hooks can be used to modify your IP.Board installation to enhance or add new functionality. You should only install hooks from sources that you trust, as they have full PHP execution capabilities on your server.</word_default>
+      <word_custom>Хуки (модификации) и�пользуют�� дл� изменени� или добавлени� функционально�ти в форум. Вам �ледует у�танавливать хуки только из тех и�точников, которым вы довер�ете.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_installedhooks</word_key>
+      <word_default>Installed Hooks</word_default>
+      <word_custom>У�тановленные хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_installed</word_key>
+      <word_default>Installed</word_default>
+      <word_custom>У�тановлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_uptodate</word_key>
+      <word_default>Up to Date</word_default>
+      <word_custom>�ет обновлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_lastupdated</word_key>
+      <word_default>Last Updated</word_default>
+      <word_custom>По�леднее обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nohooks</word_key>
+      <word_default>There are currently no hooks enabled</word_default>
+      <word_custom>�ет включенных хуков</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_move</word_key>
+      <word_default>Move</word_default>
+      <word_custom>Переме�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_viewhook</word_key>
+      <word_default>View Full Details</word_default>
+      <word_custom>Полна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_disablehook</word_key>
+      <word_default>Disable Hook</word_default>
+      <word_custom>Отключить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_deletehook</word_key>
+      <word_default>Delete Hook</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_edithook</word_key>
+      <word_default>Edit Hook</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_checkhook</word_key>
+      <word_default>Check Requirements</word_default>
+      <word_custom>Проверить требовани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exporthook</word_key>
+      <word_default>Export Hook</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_disabledhook</word_key>
+      <word_default>Disabled Hooks</word_default>
+      <word_custom>Отключенные хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_enablehook</word_key>
+      <word_default>Enable Hook</word_default>
+      <word_custom>Включить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_uninstallhook</word_key>
+      <word_default>Uninstall Hook</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_setuphook</word_key>
+      <word_default>Hook Setup</word_default>
+      <word_custom>�а�троить хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nodishooks</word_key>
+      <word_default>There are currently no disabled hooks</word_default>
+      <word_custom>Отключенных хуков нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookxml</word_key>
+      <word_default>Select a hook XML file</word_default>
+      <word_custom>Выбрать XML-файл хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_installhook</word_key>
+      <word_default>Install a New Hook</word_default>
+      <word_custom>У�тановить хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookversion</word_key>
+      <word_default>Hook Version (long-version)</word_default>
+      <word_custom>Вер�и� (длинный формат)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookversion_info</word_key>
+      <word_default>This is the version used to check for update available notifications</word_default>
+      <word_custom>Эта вер�и� и�пользует�� дл� проверки обновлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookemail</word_key>
+      <word_default>Author Email</word_default>
+      <word_custom>E-mail автора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookauthor</word_key>
+      <word_default>Hook Author</word_default>
+      <word_custom>�втор хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookemail_info</word_key>
+      <word_default>(Optional) Enter your email address so the user can contact you</word_default>
+      <word_custom>(�еоб�зательно) Введите ваш e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookauthor_info</word_key>
+      <word_default>Enter the author name to display for the user</word_default>
+      <word_custom>Введите им� автора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_filenamedir</word_key>
+      <word_default>File name in hooks directory</word_default>
+      <word_custom>Им� файла в директории хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookfile</word_key>
+      <word_default>File</word_default>
+      <word_custom>Файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookfiles</word_key>
+      <word_default>Files</word_default>
+      <word_custom>Файлы хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_phpminmax</word_key>
+      <word_default>Use the regular PHP version numbers to set the minimum or maximum versions.</word_default>
+      <word_custom>И�пользуйте �тандартное напи�ание вер�ии PHP.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_min</word_key>
+      <word_default>Min</word_default>
+      <word_custom>Мин.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_max</word_key>
+      <word_default>Max</word_default>
+      <word_custom>Мак�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_phpver</word_key>
+      <word_default>PHP Version</word_default>
+      <word_custom>Вер�и� PHP</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_enterzero</word_key>
+      <word_default>Enter 0 for no requirement limits.</word_default>
+      <word_custom>Введите 0 дл� отмены ограничений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_longversionid</word_key>
+      <word_default>Use the long version ID to set minimum or maximum versions.</word_default>
+      <word_custom>И�пользуйте ID вер�ии в длинном формате.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookrequirements</word_key>
+      <word_default>Requirements</word_default>
+      <word_custom>Требовани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookurl_info</word_key>
+      <word_default><![CDATA[(Optional) Enter the URL the system can check against for update notifications.<br />"&amp;boardVersion=(ipb-long-version-id)&amp;version=(hook-long-version-id)" will be appended to the URL.]]></word_default>
+      <word_custom><![CDATA[(�еоб�зательно) Введете URL дл� проверки обновлений. К адре�у будет добавлена �трока "&amp;version=(long-version-id)", где (long-version-id) будет заменено значением указанным выше.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hooksite_info</word_key>
+      <word_default>(Optional) Enter your homepage so users can contact you</word_default>
+      <word_custom>(�еоб�зательно) Введите адре� вашего �айта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookurl</word_key>
+      <word_default>Update URL</word_default>
+      <word_custom>URL дл� обновлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hooksite</word_key>
+      <word_default>Website</word_default>
+      <word_custom>Веб-�айт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_filehooktype</word_key>
+      <word_default>File hook type</word_default>
+      <word_custom>Тип файла хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_fileclassname</word_key>
+      <word_default><![CDATA[This file's class name]]></word_default>
+      <word_custom>Им� кла��а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_soverloader</word_key>
+      <word_default>Skin overloader</word_default>
+      <word_custom>Перегрузчик �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_selectone</word_key>
+      <word_default>Select one</word_default>
+      <word_custom>Выберите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_aoverloader</word_key>
+      <word_default>Action overloader</word_default>
+      <word_custom>Перегрузчик дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_templatehook</word_key>
+      <word_default>Template hook</word_default>
+      <word_custom>Хук дл� шаблона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_libraryhook</word_key>
+      <word_default>Library hook</word_default>
+      <word_custom>Библиотека хуков</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_datahook</word_key>
+      <word_default>Data hook</word_default>
+      <word_custom>Данные хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_datalocation</word_key>
+      <word_default>Data Location</word_default>
+      <word_custom>Данные ра�положени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_classextend</word_key>
+      <word_default>The class this file extends</word_default>
+      <word_custom>Кла�� ра�шир�емый �тим файлом</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_skingroup</word_key>
+      <word_default>The skin group this hook is in</word_default>
+      <word_custom>Группа шаблонов, к которой принадлежит хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_fileuses</word_key>
+      <word_default>Files that this hook uses</word_default>
+      <word_custom>Файлы и�пользуемые хуком</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_authorsite</word_key>
+      <word_default>Author Website</word_default>
+      <word_custom>Сайт автора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addanother</word_key>
+      <word_default>Add Another File</word_default>
+      <word_custom>Добавить файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookver</word_key>
+      <word_default>Hook Version</word_default>
+      <word_custom>Вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookid</word_key>
+      <word_default><![CDATA[The hook 'ID']]></word_default>
+      <word_custom>ID хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_hookloc</word_key>
+      <word_default>Position of template hook</word_default>
+      <word_custom>Ра�положение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_skinfunc</word_key>
+      <word_default>The skin function this hook is in</word_default>
+      <word_custom>Шаблон, в котором находит�� хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_typeoftemp</word_key>
+      <word_default>Type of template hook</word_default>
+      <word_custom>Тип хука дл� шаблона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_libraryhookfor</word_key>
+      <word_default>This is a library hook for %s in the %s application</word_default>
+      <word_custom>Это хук библиотеки %s приложени� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_willoverload</word_key>
+      <word_default>This hook will overload </word_default>
+      <word_custom>Этот хук перегружает </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_showsin</word_key>
+      <word_default>This hook shows in </word_default>
+      <word_custom>Этот хук отображает�� в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_storedfile</word_key>
+      <word_default>Stored file name</word_default>
+      <word_custom>Сохраненное им� файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_wherehook</word_key>
+      <word_default>Where this hook shows</word_default>
+      <word_custom>Где отображает�� хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_realfile</word_key>
+      <word_default>Real file name</word_default>
+      <word_custom>Им� файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_datahookfor</word_key>
+      <word_default>This is a data hook for </word_default>
+      <word_custom>Данные хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_labeled</word_key>
+      <word_default>labeled </word_default>
+      <word_custom> � меткой </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_prestartif</word_key>
+      <word_default>before the start of the if statement </word_default>
+      <word_custom>до начала выражени� if </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_poststartif</word_key>
+      <word_default>after the start of the if statement </word_default>
+      <word_custom>по�ле начала выражени� if </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_postelse</word_key>
+      <word_default>after the start of the else statement </word_default>
+      <word_custom>по�ле начала выражени� else </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_preelse</word_key>
+      <word_default>before the start of the else statement </word_default>
+      <word_custom>до начала выражени� else </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_preendif</word_key>
+      <word_default>before the end of the if statement </word_default>
+      <word_custom>перед завершением выражени� if </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_postendif</word_key>
+      <word_default>after the end of the if statement </word_default>
+      <word_custom>по�ле завершени� выражени� if </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_outerpre</word_key>
+      <word_default>before the start of the foreach statement </word_default>
+      <word_custom>перед началом выражени� foreach </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_innerpre</word_key>
+      <word_default>after the start of the foreach statement </word_default>
+      <word_custom>по�ле начала выражени� foreach </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_innerpost</word_key>
+      <word_default>before the end of the foreach statement </word_default>
+      <word_custom>перед завершением выражени� foreach </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_outerpost</word_key>
+      <word_default>after the end of the foreach statement </word_default>
+      <word_custom>по�ле завершени� выражени� foreach </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noyoucant</word_key>
+      <word_default>This hook is not supported on your system</word_default>
+      <word_custom>Хук не поддерживает�� �и�темой</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_yesyoucan</word_key>
+      <word_default>You are able to use this hook</word_default>
+      <word_custom>Вы можете и�пользовать �тот хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_checkrequirements</word_key>
+      <word_default>Checking system requirements...</word_default>
+      <word_custom>Проверка �и�темных требований...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportmod</word_key>
+      <word_default>Export Modules</word_default>
+      <word_custom>Эк�порт модулей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_mod_info</word_key>
+      <word_default>You can include modules to be added to existing applications</word_default>
+      <word_custom>Вы можете модули дл� добавлени� к �уще�твующим приложени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addlang</word_key>
+      <word_default>Add Language Bits</word_default>
+      <word_custom>Добавить �зыковые �троки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_lang_info</word_key>
+      <word_default>You can include entire language files, or language strings to add to existing files</word_default>
+      <word_custom>Вы можете включить как отдельные �зыковые �троки так и целые файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addsettings</word_key>
+      <word_default>Add Settings</word_default>
+      <word_custom>Добавить на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportlang</word_key>
+      <word_default>Export Language Strings</word_default>
+      <word_custom>Э�порт �зыковых �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_settings_info</word_key>
+      <word_default>You can include groups of settings and individual settings you wish to export with this hook</word_default>
+      <word_custom>Вы можете выбрать как отдельные на�тройки так и их группы дл� �к�порта � �тим хуком</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportsettings</word_key>
+      <word_default>Export Settings</word_default>
+      <word_custom>Эк�порт на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noskin</word_key>
+      <word_default>There are no skin templates being exported</word_default>
+      <word_custom>�ет шаблонов �тилей дл� �кпорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nolang</word_key>
+      <word_default>There are no language strings being exported</word_default>
+      <word_custom>�ет �зыковых �трок дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nodbchanges</word_key>
+      <word_default>There are no database changes being exported</word_default>
+      <word_custom>�ет изменений базы данных дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noinun</word_key>
+      <word_default>There is no custom install/uninstall script configured</word_default>
+      <word_custom>�ет на�троенных �криптов у�тановки/удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_notasks</word_key>
+      <word_default>There are no tasks being exported</word_default>
+      <word_custom>�ет задач дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_noacp</word_key>
+      <word_default>There are no ACP help files being exported</word_default>
+      <word_custom>�ет файлов �дминцентра дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nohelp</word_key>
+      <word_default>There are no help files being exported</word_default>
+      <word_custom>�ет файлов помощи дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nomodules</word_key>
+      <word_default>There are no modules being exported</word_default>
+      <word_custom>�ет модулей дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nosettings</word_key>
+      <word_default>There are no settings being exported</word_default>
+      <word_custom>�ет на�троек дл� �кпорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exporthelp</word_key>
+      <word_default>Export Help Files</word_default>
+      <word_custom>Эк�порт файлов помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addmod</word_key>
+      <word_default>Add Modules</word_default>
+      <word_custom>Добавить модули</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_help_info</word_key>
+      <word_default>You can include help files to be exported with your hook</word_default>
+      <word_custom>Вы можете добавить файлы помощи дл� �к�порта � хуков</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportskin</word_key>
+      <word_default>Export Skin Templates</word_default>
+      <word_custom>Эк�порт шаблонов �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportacp</word_key>
+      <word_default>Export ACP Help Files</word_default>
+      <word_custom>Эк�порт файлов помощи �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addhelp</word_key>
+      <word_default>Add Help Files</word_default>
+      <word_custom>Добавить файлы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_acp_info</word_key>
+      <word_default>You can include ACP help files to be exported with your hook</word_default>
+      <word_custom>Вы можете добавить файлы помощи �дминцентра дл� �к�порта � хуком</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addskin</word_key>
+      <word_default>Add Skin Templates</word_default>
+      <word_custom>Добавить шаблон �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportcss</word_key>
+      <word_default>Export Skin CSS</word_default>
+      <word_custom>Эк�порт CSS �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_css_info</word_key>
+      <word_default>You can include css files to be added with your hook</word_default>
+      <word_custom>Вы можете включить css файлы добавив вашу хук.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_nocss</word_key>
+      <word_default>There are no css files being exported</word_default>
+      <word_custom>�ет файлов css дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addcss</word_key>
+      <word_default>Add CSS Files</word_default>
+      <word_custom>Добавить файл CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exporttasks</word_key>
+      <word_default>Export Tasks</word_default>
+      <word_custom>Эк�порт задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_tasks_info</word_key>
+      <word_default>You can include tasks to be exported with your hook</word_default>
+      <word_custom>Вы можете добавить задачи дл� �к�порта � хуком</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addtasks</word_key>
+      <word_default>Add Tasks</word_default>
+      <word_custom>Добавить задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportdb</word_key>
+      <word_default>Export Database Changes</word_default>
+      <word_custom>Эк�порт изменений базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_skin_info</word_key>
+      <word_default>You can include entire skin files or individual skin templates</word_default>
+      <word_custom>Вы можете добавить как ве�ь файл �тил� так и отдельные шаблоны</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_db_info</word_key>
+      <word_default>You can include new database tables, changes to existing tables, insertions, and updates to be run</word_default>
+      <word_custom>Вы можете добавить новые таблицы базы данных, изменени� в �уще�твующих таблицах и обновлени� дл� запу�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_adddb</word_key>
+      <word_default>Add Database Changes</word_default>
+      <word_custom>Добавить изменени� базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addacp</word_key>
+      <word_default>Add ACP Help Files</word_default>
+      <word_custom>Добавить файлы помощи �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_exportscript</word_key>
+      <word_default>Export Custom Script</word_default>
+      <word_custom>Эк�порт �крипта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_script_info</word_key>
+      <word_default>You can include a custom script which will be executed upon installation and uninstallation</word_default>
+      <word_custom>Вы можете добавить �крипт, который будет выполнен в ходе у�тановки и удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_page_title</word_key>
+      <word_default>Create Hook</word_default>
+      <word_custom>Создать хук</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_page_info</word_key>
+      <word_default><![CDATA[You can use this form to genereate a new hook 'skeleton' for you.]]></word_default>
+      <word_custom>И�пользуйте �ту форму дл� �оздани� заготовки хука.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_export</word_key>
+      <word_default>Export</word_default>
+      <word_custom>Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>a_addscript</word_key>
+      <word_default>Add Custom Script</word_default>
+      <word_custom>Добавить �крипт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_version</word_key>
+      <word_default>Hook Version (human-readable)</word_default>
+      <word_custom>Вер�и� хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_version_help</word_key>
+      <word_default>Current version of this hook</word_default>
+      <word_custom>Текуща� вер�и� хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_desc_help</word_key>
+      <word_default>Brief description of what this hook does, this is for your reference only</word_default>
+      <word_custom>Краткое опи�ание того, что делает хук. (Дл� ��ылки)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_desc</word_key>
+      <word_default>Hook Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_title_help</word_key>
+      <word_default>Title of the hook, this is for your reference only.</word_default>
+      <word_custom>�азвание хука (дл� �правки).</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_title</word_key>
+      <word_default>Hook Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_basic_info</word_key>
+      <word_default>Basic Hook Information</word_default>
+      <word_custom>О�новна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_info</word_key>
+      <word_default>Hook Information</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_button</word_key>
+      <word_default>Save Hook</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_no_title</word_key>
+      <word_default>The hook title field can not be blank</word_default>
+      <word_custom>�азвание хука не может быть пу�тым</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_no_key</word_key>
+      <word_default>You must supply a hook key for your hook</word_default>
+      <word_custom>�еобходимо вве�ти ключ хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_key</word_key>
+      <word_default>Hook Key</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_key_desc</word_key>
+      <word_default>This is a unique key for your hook</word_default>
+      <word_custom>Это уникальный ключ дл� хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_noxml</word_key>
+      <word_default>There was no XML file uploaded. Please try again.</word_default>
+      <word_custom>XML файл не загружен. Пожалуй�та, попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_removed_files</word_key>
+      <word_default>%s Cached Hook Files Removed</word_default>
+      <word_custom>%s кеш-файлов хуков удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_reenable_all</word_key>
+      <word_default>Reenable all hooks</word_default>
+      <word_custom>Включить в�е хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_disable_all</word_key>
+      <word_default>Disable all hooks</word_default>
+      <word_custom>Отключить в�е хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>hook_form_noapp_dd</word_key>
+      <word_default>No Application</word_default>
+      <word_custom>�ет приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_followingacts</word_key>
+      <word_default>The following actions were done:</word_default>
+      <word_custom>Выполнены �ледующие дей�тви�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_settinggin</word_key>
+      <word_default>setting groups inserted</word_default>
+      <word_custom>групп на�троек добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_xmlwrong</word_key>
+      <word_default>The uploaded XML file does not appear to be a valid hook installation file.</word_default>
+      <word_custom>Загруженный XML-файл не �вл�ет�� у�тановочным файлом хука.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_filesin</word_key>
+      <word_default>files inserted</word_default>
+      <word_custom>Файлы добавлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_newhookin</word_key>
+      <word_default>New hook record inserted</word_default>
+      <word_custom>�овый хук добавлен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_langbitin</word_key>
+      <word_default>language bits inserted</word_default>
+      <word_custom>�зыковых �трок добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_modin</word_key>
+      <word_default>modules inserted</word_default>
+      <word_custom>модулей добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_settingin</word_key>
+      <word_default>settings inserted</word_default>
+      <word_custom>на�троек добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_settingup</word_key>
+      <word_default>settings updated</word_default>
+      <word_custom>на�троек обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_langbitup</word_key>
+      <word_default>language bits updated</word_default>
+      <word_custom>�зыковых �трок обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_acpin</word_key>
+      <word_default>ACP help files inserted</word_default>
+      <word_custom>файлов помощи �дминцентра добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_helpup</word_key>
+      <word_default>help files updated</word_default>
+      <word_custom>файлов помощи обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_helpin</word_key>
+      <word_default>help files inserted</word_default>
+      <word_custom>файлов помощи добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_modup</word_key>
+      <word_default>modules updated</word_default>
+      <word_custom>модулей обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_acpup</word_key>
+      <word_default>ACP help files updated</word_default>
+      <word_custom>файлов помощи �дминцентра обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_tempup</word_key>
+      <word_default>templates updated</word_default>
+      <word_custom>шаблонов обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_cssin</word_key>
+      <word_default>CSS inserted</word_default>
+      <word_custom>CSS добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_tempin</word_key>
+      <word_default>templates inserted</word_default>
+      <word_custom>шаблонов добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_insertran</word_key>
+      <word_default>insert queries run</word_default>
+      <word_custom>INSERT запро�ов выполнено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_cssup</word_key>
+      <word_default>CSS updated</word_default>
+      <word_custom>CSS обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_updateran</word_key>
+      <word_default>update queries run</word_default>
+      <word_custom>UPDATE запро�ов выполнено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_dbaltered</word_key>
+      <word_default>database tables altered</word_default>
+      <word_custom>таблиц базы данных изменено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_noexport</word_key>
+      <word_default>We could not find the hook you were attempting to export.</word_default>
+      <word_custom>Хук, который вы пытаете�ь �к�портировать, не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_taskup</word_key>
+      <word_default>tasks updated</word_default>
+      <word_custom>задач обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_dbcreated</word_key>
+      <word_default>database tables created</word_default>
+      <word_custom>таблиц �оздано в базе данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_hasbeenun</word_key>
+      <word_default>The hook has been uninstalled.</word_default>
+      <word_custom>Хук удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_hasbeenenabled</word_key>
+      <word_default>The hook has been enabled.</word_default>
+      <word_custom>Хук включен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_noedit</word_key>
+      <word_default>We could not find the hook you were attempting to edit.</word_default>
+      <word_custom>Хук, который вы хотите изменить, не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_taskin</word_key>
+      <word_default>tasks inserted</word_default>
+      <word_custom>задач добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_outerpre</word_key>
+      <word_default>(outer.pre) Before the foreach loop starts</word_default>
+      <word_custom>(outer.pre) Перед началом цикла foreach</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_innerpre</word_key>
+      <word_default>(inner.pre) After the foreach loop starts</word_default>
+      <word_custom>(inner.pre) По�ле начала цикла foreach</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_innerpost</word_key>
+      <word_default>(inner.post) Before the foreach loop ends</word_default>
+      <word_custom>(inner.post) Перед завершением цикла foreach</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_outerpost</word_key>
+      <word_default>(outer.post) After the foreach loop ends</word_default>
+      <word_custom>(outer.post) По�ле завершени� цикла foreach</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_prestartif</word_key>
+      <word_default>(pre.startif) Before the if statement starts</word_default>
+      <word_custom>(pre.startif) Перед началом выражени� if</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_preelse</word_key>
+      <word_default>(pre.else) Before the else statement starts</word_default>
+      <word_custom>(pre.else) Перед началом выражени� else</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_poststartif</word_key>
+      <word_default>(post.startif) After the if statement starts</word_default>
+      <word_custom>(post.startif) По�ле начала выражени� if</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_preendif</word_key>
+      <word_default>(pre.endif) Before the if statement ends</word_default>
+      <word_custom>(pre.endif) Перед завершением выражени� if</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_postelse</word_key>
+      <word_default>(post.else) After the else statement starts</word_default>
+      <word_custom>(post.else) По�ле начала выражени� else</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_selectid</word_key>
+      <word_default>Select a Hook ID</word_default>
+      <word_custom>Выберите ID хука</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_postendif</word_key>
+      <word_default>(post.endif) After the if statement ends</word_default>
+      <word_custom>(post.endif) По�ле завершени� выражени� if</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -3367,69 +2611,20 @@
       <word_key>h_saved</word_key>
       <word_default>Your hook has been successfully saved</word_default>
       <word_custom>Хук у�пешно �охранен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_nodetails</word_key>
-      <word_default>We could not find the hook you were attempting to view details for.</word_default>
-      <word_custom>Хук, детали которого вы хотите про�мотреть, не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>h_selecttemp</word_key>
+      <word_default>Select a Template</word_default>
+      <word_custom>Выберите шаблон</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_applications</word_pack>
-      <word_key>h_norequirements</word_key>
-      <word_default>We could not find the hook you were attempting to check the requirements for.</word_default>
-      <word_custom>Хук, дл� которого вы хотели проверить требовани�, не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_tooold</word_key>
-      <word_default>Your version of IP.Board is too old to support this hook.</word_default>
-      <word_custom>Ваша вер�и� форума �лишком �тара дл� и�пользовани� �того хука.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_toonew</word_key>
-      <word_default>Your version of IP.Board is too new to support this hook.</word_default>
-      <word_custom>Хук не поддерживает вашу вер�ию форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_phpold</word_key>
-      <word_default>Your PHP version is older than the minimum required version for this hook.</word_default>
-      <word_custom>И�пользуема� вер�и� PHP не подходит дл� �того хука.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_applications</word_pack>
-      <word_key>h_phpnew</word_key>
-      <word_default>Your PHP version is newer than the maximum allowed version for this hook.</word_default>
-      <word_custom>И�пользуема� вер�и� PHP не подходит дл� �того хука.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>h_selectfile</word_key>
+      <word_default>Select a File</word_default>
+      <word_custom>Выберите файл</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -3437,9 +2632,20 @@
       <word_key>h_dir_notwritable</word_key>
       <word_default>Your hooks directory is not writable.</word_default>
       <word_custom>Директори� hooks не имеет прав на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_norequirements</word_key>
+      <word_default>We could not find the hook you were attempting to check the requirements for.</word_default>
+      <word_custom>Хук, дл� которого вы хотели проверить требовани�, не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_applications</word_pack>
+      <word_key>h_nodetails</word_key>
+      <word_default>We could not find the hook you were attempting to view details for.</word_default>
+      <word_custom>Хук, детали которого вы хотите про�мотреть, не найден.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -3447,1479 +2653,272 @@
       <word_key>postform_badmd5</word_key>
       <word_default>Bad key supplied</word_default>
       <word_custom>Указан не верный ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_getsupport</word_key>
-      <word_default>Get Support</word_default>
-      <word_custom>Поддержка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_off</word_key>
+      <word_default>Off</word_default>
+      <word_custom>Выкл</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_subsmanager</word_key>
-      <word_default>Subscriptions</word_default>
-      <word_custom>Подпи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_on</word_key>
+      <word_default>On</word_default>
+      <word_custom>Вкл</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_blog</word_key>
-      <word_default>Blog</word_default>
-      <word_custom>Блоги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>server_status</word_key>
+      <word_default>Server Status:</word_default>
+      <word_custom>Со�то�ние �и�темы:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_downloads</word_key>
-      <word_default>Downloads</word_default>
-      <word_custom>Файловый менеджер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>toggle_perf_mode</word_key>
+      <word_default>Toggle performance mode</word_default>
+      <word_custom>Переключить режим производительно�ти</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_livesearch</word_key>
-      <word_default>Live Search in ACP</word_default>
-      <word_custom>Пои�к по �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>welcome</word_key>
+      <word_default>Welcome, </word_default>
+      <word_custom>Здрав�твуйте,</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_gallery</word_key>
-      <word_default>Gallery</word_default>
-      <word_custom>Галере�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_ok</word_key>
+      <word_default>Ok</word_default>
+      <word_custom>Ок</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_portal</word_key>
-      <word_default>Portal</word_default>
-      <word_custom>Портал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>version</word_key>
+      <word_default>Version:</word_default>
+      <word_custom>Вер�и�:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_myapps</word_key>
-      <word_default>My Apps</word_default>
-      <word_custom>Приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>items_requiring_action</word_key>
+      <word_default>Items Requiring Attention</word_default>
+      <word_custom>�и�темных �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_lookandfeel</word_key>
-      <word_default><![CDATA[Look &amp; Feel]]></word_default>
-      <word_custom>Внешний вид</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_settings</word_key>
+      <word_default>Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_support</word_key>
-      <word_default>Support</word_default>
-      <word_custom>Поддержка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gotomarketplace</word_key>
+      <word_default>Go to IPS Marketplace</word_default>
+      <word_custom>Перейти в IPS Marketplace</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_members</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>other_applications</word_key>
+      <word_default>Other Apps</word_default>
+      <word_custom>Другие приложени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_system</word_key>
-      <word_default>System</word_default>
-      <word_custom>Си�тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_ipsmarketplace</word_key>
+      <word_default>Search IPS Marketplace</word_default>
+      <word_custom>Пои�кать в IPS Marketplace</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_forums</word_key>
+      <word_key>search_marketplace_more</word_key>
+      <word_default>Search the IPS Marketplace for applications, hooks, skins and more.</word_default>
+      <word_custom>Пои�кать в IPS Marketplace дополнени�, �тили, хуки и т.д.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>ipsmarketplace_is_best</word_key>
+      <word_default>The IPS Marketplace is the best place to find new skins, applications and hooks for your community.</word_default>
+      <word_custom>IPS Marketplace - лучшее ме�то дл� загрузки новых �тилей, приложений и хуков дл� вашего �ообще�тва.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>reg_trends_chart</word_key>
+      <word_default>Registration Trends</word_default>
+      <word_custom>Тенденции реги�траций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>livesearch_forums</word_key>
       <word_default>Forums</word_default>
       <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_icon</word_key>
-      <word_default>Icon</word_default>
-      <word_custom>Иконка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_groups</word_key>
+      <word_default>Groups</word_default>
+      <word_custom>Группы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_ipbadminarea</word_key>
-      <word_default>IPB3 Admin Area</word_default>
-      <word_custom>�дминцентр IPB3</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_logo</word_key>
-      <word_default>Logo</word_default>
-      <word_custom>Логотип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_more</word_key>
+      <word_default>%d results...</word_default>
+      <word_custom>%d результатов...</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_loggedinas</word_key>
-      <word_default>Logged in as</word_default>
-      <word_custom>Вы вошли под учетной запи�ью</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_nexus</word_key>
+      <word_default>Nexus</word_default>
+      <word_custom>�ек�у�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_loading</word_key>
-      <word_default>Loading...</word_default>
-      <word_custom>Загрузка...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>livesearch_pages</word_key>
+      <word_default>Pages</word_default>
+      <word_custom>Страницы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_pleasewait</word_key>
-      <word_default>Please Wait</word_default>
-      <word_custom>Пожалуй�та подождите</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gl_reportsmenu</word_key>
+      <word_default><![CDATA[Stats &amp; Logs]]></word_default>
+      <word_custom>Стати�тика</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_insertmedia</word_key>
-      <word_default>Insert Media</word_default>
-      <word_custom>Добавить ролик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>enabled</word_key>
+      <word_default>Enabled</word_default>
+      <word_custom>Включено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_error</word_key>
-      <word_default>Error</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wiz_next</word_key>
+      <word_default><![CDATA[Next &rarr;]]></word_default>
+      <word_custom><![CDATA[След. &rarr;]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_insertemail</word_key>
-      <word_default>Insert Email</word_default>
-      <word_custom>В�тавить e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wiz_prev</word_key>
+      <word_default><![CDATA[&larr; Previous]]></word_default>
+      <word_custom><![CDATA[&larr; Пред.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_insertlink</word_key>
-      <word_default>Insert Link</word_default>
-      <word_custom>В�тавить ��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>admin_step</word_key>
+      <word_default>Step</word_default>
+      <word_custom>Шаг</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_insertimage</word_key>
-      <word_default>Insert Image</word_default>
-      <word_custom>В�тавить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_expired_info</word_key>
+      <word_default><![CDATA[It appears that your license key is expired.  Your license key opens up access to many more services and offerings from Invision Power Services, Inc., including access to our chat service, our spam monitoring service, and technical support and updates.  If you are interested in renewing your license, please visit your client center.]]></word_default>
+      <word_custom><![CDATA[Срок дей�тви� вашего лицензионного ключа закончил��. �ктивный ключ дает до�туп к множе�тву дополнительных у�луг и �ерви�ов, включа� анти�пам �ерви�, техниче�кую поддержку и до�туп к новым вер�и�м продукта. Е�ли вам интере�но продлить вашу лицензию, пожалуй�та, зайдите в ваш клиент-центр и продлите лицензию в меню Покупки.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_mediaurl</word_key>
-      <word_default>Media URL</word_default>
-      <word_custom>С�ылка на ролик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_expired_header</word_key>
+      <word_default>License Key Expired</word_default>
+      <word_custom>И�текло врем� активно�ти лицензии </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_missing_info</word_key>
+      <word_default><![CDATA[It appears that you have not yet entered your license key.  Providing your license key opens up access to many more services and offerings from Invision Power Services, Inc., including access to our chat service and our spam monitoring service.  You should take a moment to <a href='%s'>provide your license key</a>]]></word_default>
+      <word_custom><![CDATA[Ваш лицензионный ключ еще не введен. �ктивный ключ дает до�туп к множе�тву дополнительных у�луг и �ерви�ов, включа� анти�пам �ерви� и т.д. Вве�ти ключ вы можете на <a href='%s'>�транице по ��ылке</a>.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_cancel_edit</word_key>
-      <word_default>Cancel Source Edit</word_default>
-      <word_custom>Отменить редактирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_missing_header</word_key>
+      <word_default>License Key Missing</word_default>
+      <word_custom>От�у�твует ключ лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_add</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_inc_files</word_key>
+      <word_default> Included Files</word_default>
+      <word_custom>Подключено файлов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_emailme</word_key>
-      <word_default>Email me</word_default>
-      <word_custom>Отравить мне пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>disabled</word_key>
+      <word_default>Disabled</word_default>
+      <word_custom>Отключено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_example</word_key>
-      <word_default>Example</word_default>
-      <word_custom>Пример</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ttlmemoryused</word_key>
+      <word_default>Total Memory Used:</word_default>
+      <word_custom>И�пользовано пам�ти:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_emailaddress</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>Е-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_memory</word_key>
+      <word_default>MEMORY USAGE</word_default>
+      <word_custom>ИСПОЛЬЗОВ��ИЕ П�МЯТИ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_mylink</word_key>
-      <word_default>My link</word_default>
-      <word_custom>Мо� ��ылка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>peakmemoryused</word_key>
+      <word_default>Peak:</word_default>
+      <word_custom>Пик:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_imageurl</word_key>
-      <word_default>Image URL</word_default>
-      <word_custom>URL изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pg_next</word_key>
+      <word_default>Next</word_default>
+      <word_custom>Следующа�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_url</word_key>
-      <word_default>URL</word_default>
-      <word_custom>�дре� (URL)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pg_prev</word_key>
+      <word_default>Prev</word_default>
+      <word_custom>Предыдуща�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_linktext</word_key>
-      <word_default>Link text</word_default>
-      <word_custom>Тек�т ��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gl_gotohome</word_key>
-      <word_default>Go to: Administration Home</word_default>
-      <word_custom>Перейти на главную админцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_11</word_key>
-      <word_default>November</word_default>
-      <word_custom>�о�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_12</word_key>
-      <word_default>December</word_default>
-      <word_custom>Декабрь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_9</word_key>
-      <word_default>September</word_default>
-      <word_custom>Сент�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_10</word_key>
-      <word_default>October</word_default>
-      <word_custom>Окт�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_7</word_key>
-      <word_default>July</word_default>
-      <word_custom>Июль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_8</word_key>
-      <word_default>August</word_default>
-      <word_custom>�вгу�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_5</word_key>
-      <word_default>May</word_default>
-      <word_custom>Май</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_6</word_key>
-      <word_default>June</word_default>
-      <word_custom>Июнь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_4</word_key>
-      <word_default>April</word_default>
-      <word_custom>�прель</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_2</word_key>
-      <word_default>February</word_default>
-      <word_custom>Февраль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_3</word_key>
-      <word_default>March</word_default>
-      <word_custom>Март</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_prev</word_key>
-      <word_default>Previous Page</word_default>
-      <word_custom>Предыдуща� �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>M_1</word_key>
-      <word_default>January</word_default>
-      <word_custom>Январь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_next</word_key>
-      <word_default>Next page</word_default>
-      <word_custom>Следующа� �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_isfirst</word_key>
-      <word_default>First</word_default>
-      <word_custom>Перва�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_islast</word_key>
-      <word_default>Last</word_default>
-      <word_custom>По�ледн��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_gotofirst</word_key>
-      <word_default>Go to first page</word_default>
-      <word_custom>Перейти на первую �траницу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>tpl_gotolast</word_key>
-      <word_default>Go to last page</word_default>
-      <word_custom>Перейти к по�ледней �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_14</word_key>
-      <word_default>(GMT + 14:00 hours) Kiritimati</word_default>
-      <word_custom>(GMT + 14:00) Киритимати (о�тров Рожде�тва)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_13</word_key>
-      <word_default>(GMT + 13:00 hours) Kamchatka, Anadyr</word_default>
-      <word_custom>(GMT + 13:00) Камчатка, �надырь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_12.75</word_key>
-      <word_default>(GMT + 12:45 hours) Chatham Islands</word_default>
-      <word_custom>(GMT + 12:45) О�трова Чатем </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_11.5</word_key>
-      <word_default>(GMT + 11:30 hours) Burnt Pine, Kingston</word_default>
-      <word_custom>(GMT + 11:30) Бернт Пайн, Кинг�тон </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_12</word_key>
-      <word_default>(GMT + 12:00 hours) Auckland, Fiji, Marshall Islands</word_default>
-      <word_custom>(GMT + 12:00) Окленд, Фиджи, Камчатка, Веллингтон, Маршалловы о�трова</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_11</word_key>
-      <word_default>(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Is.</word_default>
-      <word_custom>(GMT + 11:00) Магадан, �ова� Каледони�, Соломоновы о-ва</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_10.5</word_key>
-      <word_default>(GMT + 10:30 hours) Lord Howe Island</word_default>
-      <word_custom>(GMT + 10:30) О�тров Лорд-Хау</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_10</word_key>
-      <word_default>(GMT + 10:00 hours) Melbourne, Papua New Guinea, Sydney</word_default>
-      <word_custom>(GMT + 10:00) Канберра, Мельбурн, Гуам, Сидней, Владиво�ток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_9</word_key>
-      <word_default>(GMT + 9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk</word_default>
-      <word_custom>(GMT + 9:00) О�ака, Саппоро, Сеул, Токио, Якут�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_9.5</word_key>
-      <word_default>(GMT + 9:30 hours) Adelaide, Darwin</word_default>
-      <word_custom>(GMT + 9:30) �делаида, Дарвин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_8.75</word_key>
-      <word_default>(GMT + 8:45 hours) Caiguna, Eucla</word_default>
-      <word_custom>(GMT + 8:45) Кейгуна, Юкла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_8</word_key>
-      <word_default>(GMT + 8:00 hours) Hong Kong, Perth, Singapore, Taipei</word_default>
-      <word_custom>(GMT + 8:00) Пекин, Гонконг, Перт, Сингапур, Тайпей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_7</word_key>
-      <word_default>(GMT + 7:00 hours) Bangkok, Hanoi, Jakarta</word_default>
-      <word_custom>(GMT + 7:00) Бангкок, Ханой, Джакарта, Кра�но�р�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_6.5</word_key>
-      <word_default>(GMT + 6:30 hours) Yangon, Naypyidaw, Bantam</word_default>
-      <word_custom>GMT + 6:30) Янгон, �айпьидо, Бантам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_5.75</word_key>
-      <word_default>(GMT + 5:45 hours) Kathmandu</word_default>
-      <word_custom>(GMT + 5:45) Катманду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_6</word_key>
-      <word_default>(GMT + 6:00 hours) Almaty, Bangladesh, Dhakra</word_default>
-      <word_custom>(GMT + 6:00) �лма-�та, Коломбо, Дхака, �ово�ибир�к, Ом�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_5.5</word_key>
-      <word_default>(GMT + 5:30 hours) Bombay, Calcutta, Madras, New Delhi</word_default>
-      <word_custom>(GMT + 5:30) Бомбей, Калькутта, Мадра�, �ью-Дели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_5</word_key>
-      <word_default>(GMT + 5:00 hours) Ekaterinburg, Karachi, Tashkent</word_default>
-      <word_custom>(GMT + 5:00) Екатеринбург, И�ламабад, Карачи, Ташкент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_4.5</word_key>
-      <word_default>(GMT + 4:30 hours) Kabul</word_default>
-      <word_custom>(GMT + 4:30) Кабул</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_4</word_key>
-      <word_default>(GMT + 4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi</word_default>
-      <word_custom>(GMT + 4:00) �бу-Даби, Баку, Му�кат, Тбили�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_3.5</word_key>
-      <word_default>(GMT + 3:30 hours) Tehran</word_default>
-      <word_custom>(GMT + 3:30) Тегеран</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_3</word_key>
-      <word_default>(GMT + 3:00 hours) Baghdad, Riyadh, Moscow, Nairobi</word_default>
-      <word_custom>(GMT + 3:00) Багдад, Эр-Ри�д, Мо�ква, �айроби</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_1</word_key>
-      <word_default>(GMT + 1:00 hours) Brussels, Copenhagen, Madrid, Paris</word_default>
-      <word_custom>(GMT + 1:00) �м�тердам, Берлин, Брю��ель, Мадрид, Париж, Рим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_2</word_key>
-      <word_default>(GMT + 2:00 hours) Kaliningrad, South Africa</word_default>
-      <word_custom>(GMT + 2:00) Каир, Хель�инки, Калининград, Южна� �фрика, Варшава</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_0</word_key>
-      <word_default>(GMT) Casablanca, Dublin, London, Lisbon, Monrovia</word_default>
-      <word_custom>(GMT) Ка�абланка, Дублин, Эдинбург, Ли��абон, Лондон, Монрови�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-1</word_key>
-      <word_default>(GMT - 1:00 hours) Azores, Cape Verde Islands</word_default>
-      <word_custom>(GMT - 1:00) �зор�кие о-ва, о-ва Зеленого мы�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-2</word_key>
-      <word_default>(GMT - 2:00 hours) Mid-Atlantic, Ascention Is., St Helena</word_default>
-      <word_custom>(GMT - 2:00) Среднеатлантиче�кое врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-3</word_key>
-      <word_default>(GMT - 3:00 hours) Brazil, Buenos Aires, Falkland Is.</word_default>
-      <word_custom>(GMT - 3:00) Бразили�, Бу�но�-�йре�, Джорджтаун, Гренланди�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-3.5</word_key>
-      <word_default>(GMT - 3:30 hours) Newfoundland</word_default>
-      <word_custom>(GMT - 3:30) �ьюфаундленд</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-4</word_key>
-      <word_default>(GMT - 4:00 hours) Atlantic Time (Canada), Caracas, La Paz</word_default>
-      <word_custom>(GMT - 4:00) �тлантиче�кое врем� (Канада), Карака�, Ла Па�, Санть�го</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-5</word_key>
-      <word_default><![CDATA[(GMT - 5:00 hours) Eastern Time (US & Canada), Bogota, Lima]]></word_default>
-      <word_custom>(GMT - 5:00) Во�точное врем� (СШ� и Канада), Богота, Лима, Кито</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-6</word_key>
-      <word_default><![CDATA[(GMT - 6:00 hours) Central Time (US & Canada), Mexico City]]></word_default>
-      <word_custom>(GMT - 6:00) Центральное врем� (СШ� и Канада), Мехико</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-7</word_key>
-      <word_default><![CDATA[(GMT - 7:00 hours) Mountain Time (US & Canada)]]></word_default>
-      <word_custom>(GMT - 7:00) Горное врем� (СШ� и Канада), �ризона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-9.5</word_key>
-      <word_default>(GMT - 9:30 hours) French Polynesia</word_default>
-      <word_custom>(GMT - 9:30) Француз�ка� Полинези�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-9</word_key>
-      <word_default>(GMT - 9:00 hours) Alaska</word_default>
-      <word_custom>(GMT - 9:00) �л��ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-8</word_key>
-      <word_default><![CDATA[(GMT - 8:00 hours) Pacific Time (US & Canada)]]></word_default>
-      <word_custom>(GMT - 8:00) Тихоокеан�кое врем� (СШ� и Канада), Тихуана</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-10</word_key>
-      <word_default>(GMT - 10:00 hours) Hawaii</word_default>
-      <word_custom>(GMT - 10:00) Гавайи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-11</word_key>
-      <word_default>(GMT - 11:00 hours) Midway Island, Samoa</word_default>
-      <word_custom>(GMT - 11:00) о.Миду�й, Самоа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>time_-12</word_key>
-      <word_default>(GMT - 12:00 hours) Enitwetok, Kwajalien</word_default>
-      <word_custom>(GMT - 12:00) Эневеток, Кваджалейн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>ASC</word_key>
-      <word_default>Ascending</word_default>
-      <word_custom>По возра�танию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>DESC</word_key>
-      <word_default>Descending</word_default>
-      <word_custom>По убыванию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>yes</word_key>
-      <word_default>Yes</word_default>
-      <word_custom>Да</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>invalid_id</word_key>
-      <word_default>Invalid ID</word_default>
-      <word_custom>�еверный ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>edit</word_key>
-      <word_default>Edit...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_go_back</word_key>
-      <word_default>Go Back</word_default>
-      <word_custom>�азад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_go_to_dashboard</word_key>
-      <word_default>Go to Dashboard</word_default>
-      <word_custom>Перейти в панель управлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_go_to_module_home</word_key>
-      <word_default>Go to Module Home</word_default>
-      <word_custom>Перейти на �траницу модулей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_initializing</word_key>
-      <word_default>Initializing...</word_default>
-      <word_custom>Инициализаци�...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>ipb_message</word_key>
-      <word_default>IP.Board Message</word_default>
-      <word_custom>Сообщение Invision Power Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_system_error</word_key>
-      <word_default>System Error</word_default>
-      <word_custom>Си�темна� ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>redirecting_to</word_key>
-      <word_default>Redirecting to:</word_default>
-      <word_custom>Перемещение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>refresh_dont_wait</word_key>
-      <word_default>( Click here if you do not wish to wait )</word_default>
-      <word_custom>( �ажмите зде�ь, е�ли не хотите ждать )</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_page_redirecting</word_key>
-      <word_default>Please wait while this action executes</word_default>
-      <word_custom>Подождите, �ейча� Вы будете перенаправлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>page_will_refresh</word_key>
-      <word_default>The page will refresh automatically</word_default>
-      <word_custom>Страница будет обновлена автоматиче�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_log_out</word_key>
-      <word_default>Log Out</word_default>
-      <word_custom>Выйти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_queries</word_key>
-      <word_default>Queries</word_default>
-      <word_custom>запро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_view_site</word_key>
-      <word_default>Go to board</word_default>
-      <word_custom>Перейти к �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>ajax_please_wait</word_key>
-      <word_default>Loading Data. Please Wait...</word_default>
-      <word_custom>Загрузка. Подождите...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>in</word_key>
-      <word_default>in</word_default>
-      <word_custom>в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gbl_no_info</word_key>
-      <word_default>No Information</word_default>
-      <word_custom>�ет данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>and</word_key>
-      <word_default>and</word_default>
-      <word_custom>и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>or</word_key>
-      <word_default>or</word_default>
-      <word_custom>или</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>func_security_mismatch</word_key>
-      <word_default>Security Mismatch - please go back and reload the form before attempting to submit the form / press the button again</word_default>
-      <word_custom>Проблема безопа�но�ти - пожалуй�та верните�ь назад обновите форму и попытайте�ь отправить ее �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>my_checkall</word_key>
-      <word_default>Check all rows</word_default>
-      <word_custom>Отметить в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>a_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>sort_asc</word_key>
-      <word_default>Sort in ascending order</word_default>
-      <word_custom>По возра�танию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>sort_desc</word_key>
-      <word_default>Sort in descending order</word_default>
-      <word_custom>По убыванию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gl_getsupport_title</word_key>
-      <word_default>Get support by submitting a ticket to our technicians</word_default>
-      <word_custom>Отправьте запро� в нашу �лужбу поддержки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>rebuild_sphinx</word_key>
-      <word_default><![CDATA[<br /><br />You should now <a href='%sapp=core&amp;module=applications&amp;section=applications&amp;do=build_sphinx'>rebuild your sphinx.conf file</a> and upload the new one to your server.]]></word_default>
-      <word_custom><![CDATA[<br /><br />Следующим шагом вы должны <a href='%sapp=core&amp;module=applications&amp;section=applications&amp;do=build_sphinx'>вне�ти изменени� в файл sphinx.conf</a> и загрузить его на �ервер. Так же, веро�тно, вам нужно будет �нова пере�троить пои�ковый индек�, чтобы изменени� в�тупили в �илу. Пожалуй�та ознакомьте�ь � <a href='http://kb.invisionpower.com/questions/60/Configuring+and+Installing+Sphinx'>knowledgebase article</a> дл� дополнительной информации.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>close_help</word_key>
-      <word_default>Close Help</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>help_new_window</word_key>
-      <word_default>Open this help topic in a new window</word_default>
-      <word_custom>Открыть в новом окне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>get_help_title</word_key>
-      <word_default>Toggles inline help, providing assistance with the features on this page.</word_default>
-      <word_custom>Переключить режим отображени� помощи.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>get_help</word_key>
-      <word_default>Get Help With This Page</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>page_1_of_1</word_key>
-      <word_default>Page 1 of 1</word_default>
-      <word_custom>Страница 1 из 1</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>no_login_methods</word_key>
-      <word_default>Could not load any login handlers</word_default>
-      <word_custom>�е удало�ь загрузить модули авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>no_permission</word_key>
-      <word_default>You do not have permission to access this page</word_default>
-      <word_custom>У ва� нет прав дл� до�тупа к �той �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>yesno_no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>yesno_yes</word_key>
-      <word_default>Yes</word_default>
-      <word_custom>Да</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>acp_quick_help</word_key>
-      <word_default>Quick Help</word_default>
-      <word_custom>Бы�тра� помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>redirect_page_text</word_key>
-      <word_default>Redirecting...</word_default>
-      <word_custom>Перенаправление...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>reset_failed_logins</word_key>
-      <word_default>Reset Failed Logins...</word_default>
-      <word_custom>Сбро�ить неудачные попытки входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>redirect_repeat_step</word_key>
-      <word_default>Repeat this step</word_default>
-      <word_custom>Повторить шаг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>redirect_halt_continue</word_key>
-      <word_default>Continue Anyway...</word_default>
-      <word_custom>В�е равно продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>redirect_halt_title</word_key>
-      <word_default>Redirect Halted Due To Errors</word_default>
-      <word_custom>Перенаправление о�тановлено из-за ошибок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>session_timeout</word_key>
-      <word_default>You have been inactive for too long and your session has timed out</word_default>
-      <word_custom>Врем� �е��ии и�текло из-за бездей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>session_mismatchip</word_key>
-      <word_default>Your current IP address does not match the one in our records</word_default>
-      <word_custom>IP адре� не �оответ�твует адре�у в �е��ии админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>session_noaccess</word_key>
-      <word_default>You do not have access to the administrative CP</word_default>
-      <word_custom>Вы не имеете до�тупа к панеле админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>session_nomemberid</word_key>
-      <word_default>Could not retrieve a valid member id</word_default>
-      <word_custom>�е удало�ь получить id пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>session_invalidmid</word_key>
-      <word_default>Member ID invalid</word_default>
-      <word_custom>ID пользовател� неверное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>optgroup_other</word_key>
-      <word_default>Other</word_default>
-      <word_custom>Другие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>_laquo</word_key>
-      <word_default><![CDATA[&laquo;]]></word_default>
-      <word_custom><![CDATA[&laquo;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tpl_pages_acp</word_key>
+      <word_default>Page %s of %s</word_default>
+      <word_custom>Страница %s из %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -4927,19 +2926,6 @@
       <word_key>_raquo</word_key>
       <word_default><![CDATA[&raquo;]]></word_default>
       <word_custom><![CDATA[&raquo;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>_larr</word_key>
-      <word_default><![CDATA[&larr;]]></word_default>
-      <word_custom><![CDATA[&larr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -4947,9 +2933,6 @@
       <word_key>_rarr</word_key>
       <word_default><![CDATA[&rarr;]]></word_default>
       <word_custom><![CDATA[&rarr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -4957,9 +2940,1049 @@
       <word_key>notemplatefiletoload</word_key>
       <word_default>Could not locate template: %s</word_default>
       <word_custom>�е удало�ь загрузить шаблон: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>optgroup_other</word_key>
+      <word_default>Other</word_default>
+      <word_custom>Другие</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>_laquo</word_key>
+      <word_default><![CDATA[&laquo;]]></word_default>
+      <word_custom><![CDATA[&laquo;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>_larr</word_key>
+      <word_default><![CDATA[&larr;]]></word_default>
+      <word_custom><![CDATA[&larr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>session_nomemberid</word_key>
+      <word_default>Could not retrieve a valid member id</word_default>
+      <word_custom>�е удало�ь получить id пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>session_invalidmid</word_key>
+      <word_default>Member ID invalid</word_default>
+      <word_custom>ID пользовател� неверное</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>session_noaccess</word_key>
+      <word_default>You do not have access to the administrative CP</word_default>
+      <word_custom>Вы не имеете до�тупа к панеле админи�тратора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>session_timeout</word_key>
+      <word_default>You have been inactive for too long and your session has timed out</word_default>
+      <word_custom>Врем� �е��ии и�текло из-за бездей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>redirect_halt_title</word_key>
+      <word_default>Redirect Halted Due To Errors</word_default>
+      <word_custom>Перенаправление о�тановлено из-за ошибок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>session_mismatchip</word_key>
+      <word_default>Your current IP address does not match the one in our records</word_default>
+      <word_custom>IP адре� не �оответ�твует адре�у в �е��ии админи�тратора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>redirect_halt_continue</word_key>
+      <word_default>Continue Anyway...</word_default>
+      <word_custom>В�е равно продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>reset_failed_logins</word_key>
+      <word_default>Reset Failed Logins...</word_default>
+      <word_custom>Сбро�ить неудачные попытки входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>redirect_repeat_step</word_key>
+      <word_default>Repeat this step</word_default>
+      <word_custom>Повторить шаг</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>redirect_page_text</word_key>
+      <word_default>Redirecting...</word_default>
+      <word_custom>Перенаправление...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>yesno_yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>acp_quick_help</word_key>
+      <word_default>Quick Help</word_default>
+      <word_custom>Бы�тра� помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>yesno_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>no_permission</word_key>
+      <word_default>You do not have permission to access this page</word_default>
+      <word_custom>У ва� нет прав дл� до�тупа к �той �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>page_1_of_1</word_key>
+      <word_default>Page 1 of 1</word_default>
+      <word_custom>Страница 1 из 1</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>no_login_methods</word_key>
+      <word_default>Could not load any login handlers</word_default>
+      <word_custom>�е удало�ь загрузить модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>get_help</word_key>
+      <word_default>Get Help With This Page</word_default>
+      <word_custom>Помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>get_help_title</word_key>
+      <word_default>Toggles inline help, providing assistance with the features on this page.</word_default>
+      <word_custom>Переключить режим отображени� помощи.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>help_new_window</word_key>
+      <word_default>Open this help topic in a new window</word_default>
+      <word_custom>Открыть в новом окне</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>sort_asc</word_key>
+      <word_default>Sort in ascending order</word_default>
+      <word_custom>По возра�танию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>sort_desc</word_key>
+      <word_default>Sort in descending order</word_default>
+      <word_custom>По убыванию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>rebuild_sphinx</word_key>
+      <word_default><![CDATA[<br /><br />You should now <a href='%sapp=core&amp;module=applications&amp;section=applications&amp;do=build_sphinx'>rebuild your sphinx.conf file</a> and upload the new one to your server.]]></word_default>
+      <word_custom><![CDATA[<br /><br />Следующим шагом вы должны <a href='%sapp=core&amp;module=applications&amp;section=applications&amp;do=build_sphinx'>вне�ти изменени� в файл sphinx.conf</a> и загрузить его на �ервер. Так же, веро�тно, вам нужно будет �нова пере�троить пои�ковый индек�, чтобы изменени� в�тупили в �илу. Пожалуй�та ознакомьте�ь � knowledgebase article дл� дополнительной информации.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>close_help</word_key>
+      <word_default>Close Help</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>a_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>my_checkall</word_key>
+      <word_default>Check all rows</word_default>
+      <word_custom>Отметить в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>and</word_key>
+      <word_default>and</word_default>
+      <word_custom>и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>or</word_key>
+      <word_default>or</word_default>
+      <word_custom>или</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_no_info</word_key>
+      <word_default>No Information</word_default>
+      <word_custom>�ет данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>ajax_please_wait</word_key>
+      <word_default>Loading Data. Please Wait...</word_default>
+      <word_custom>Загрузка. Подождите...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>in</word_key>
+      <word_default>in</word_default>
+      <word_custom>в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_log_out</word_key>
+      <word_default>Sign Out</word_default>
+      <word_custom>Выйти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>func_security_mismatch</word_key>
+      <word_default>Security Mismatch - please go back and reload the form before attempting to submit the form / press the button again</word_default>
+      <word_custom>Проблема безопа�но�ти - пожалуй�та верните�ь назад обновите форму и попытайте�ь отправить ее �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_dashboard</word_key>
+      <word_default>Dashboard</word_default>
+      <word_custom>Панель управлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_queries</word_key>
+      <word_default>Queries</word_default>
+      <word_custom>запро�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_view_site</word_key>
+      <word_default>Community</word_default>
+      <word_custom>Перейти к �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>redirecting_to</word_key>
+      <word_default>Redirecting to:</word_default>
+      <word_custom>Перемещение:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_page_redirecting</word_key>
+      <word_default>Please wait while this action executes</word_default>
+      <word_custom>Подождите, �ейча� Вы будете перенаправлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>refresh_dont_wait</word_key>
+      <word_default>( Click here if you do not wish to wait )</word_default>
+      <word_custom>( �ажмите зде�ь, е�ли не хотите ждать )</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>page_will_refresh</word_key>
+      <word_default>The page will refresh automatically</word_default>
+      <word_custom>Страница будет обновлена автоматиче�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_initializing</word_key>
+      <word_default>Initializing...</word_default>
+      <word_custom>Инициализаци�...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_go_back</word_key>
+      <word_default>Go Back</word_default>
+      <word_custom>�азад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_system_error</word_key>
+      <word_default>System Error</word_default>
+      <word_custom>Си�темна� ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>ipb_message</word_key>
+      <word_default>IP.Board Message</word_default>
+      <word_custom>Сообщение IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_go_to_dashboard</word_key>
+      <word_default>Go to Dashboard</word_default>
+      <word_custom>Перейти в панель управлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gbl_go_to_module_home</word_key>
+      <word_default>Go to Module Home</word_default>
+      <word_custom>Перейти на �траницу модулей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>invalid_id</word_key>
+      <word_default>Invalid ID</word_default>
+      <word_custom>�еверный ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>ASC</word_key>
+      <word_default>Ascending</word_default>
+      <word_custom>По возра�танию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>DESC</word_key>
+      <word_default>Descending</word_default>
+      <word_custom>По убыванию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-12</word_key>
+      <word_default>(GMT - 12:00 hours) Enitwetok, Kwajalien</word_default>
+      <word_custom>(GMT - 12:00) Эневеток, Кваджалейн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-9.5</word_key>
+      <word_default>(GMT - 9:30 hours) French Polynesia</word_default>
+      <word_custom>(GMT - 9:30) Француз�ка� Полинези�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-9</word_key>
+      <word_default>(GMT - 9:00 hours) Alaska</word_default>
+      <word_custom>(GMT - 9:00) �л��ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-11</word_key>
+      <word_default>(GMT - 11:00 hours) Midway Island, Samoa</word_default>
+      <word_custom>(GMT - 11:00) о.Миду�й, Самоа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-10</word_key>
+      <word_default>(GMT - 10:00 hours) Hawaii</word_default>
+      <word_custom>(GMT - 10:00) Гавайи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-8</word_key>
+      <word_default><![CDATA[(GMT - 8:00 hours) Pacific Time (US & Canada)]]></word_default>
+      <word_custom>(GMT - 8:00) Тихоокеан�кое врем� (СШ� и Канада), Тихуана</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-7</word_key>
+      <word_default><![CDATA[(GMT - 7:00 hours) Mountain Time (US & Canada)]]></word_default>
+      <word_custom>(GMT - 7:00) Горное врем� (СШ� и Канада), �ризона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-5</word_key>
+      <word_default><![CDATA[(GMT - 5:00 hours) Eastern Time (US & Canada), Bogota, Lima]]></word_default>
+      <word_custom>(GMT - 5:00) Во�точное врем� (СШ� и Канада), Богота, Лима, Кито</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-6</word_key>
+      <word_default><![CDATA[(GMT - 6:00 hours) Central Time (US & Canada), Mexico City]]></word_default>
+      <word_custom>(GMT - 6:00) Центральное врем� (СШ� и Канада), Мехико</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-4</word_key>
+      <word_default>(GMT - 4:00 hours) Atlantic Time (Canada), Caracas, La Paz</word_default>
+      <word_custom>(GMT - 4:00) �тлантиче�кое врем� (Канада), Карака�, Ла Па�, Санть�го</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-3.5</word_key>
+      <word_default>(GMT - 3:30 hours) Newfoundland</word_default>
+      <word_custom>(GMT - 3:30) �ьюфаундленд</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-3</word_key>
+      <word_default>(GMT - 3:00 hours) Brazil, Buenos Aires, Falkland Is.</word_default>
+      <word_custom>(GMT - 3:00) Бразили�, Бу�но�-�йре�, Джорджтаун, Гренланди�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-2</word_key>
+      <word_default>(GMT - 2:00 hours) Mid-Atlantic, Ascention Is., St Helena</word_default>
+      <word_custom>(GMT - 2:00) Среднеатлантиче�кое врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_-1</word_key>
+      <word_default>(GMT - 1:00 hours) Azores, Cape Verde Islands</word_default>
+      <word_custom>(GMT - 1:00) �зор�кие о-ва, о-ва Зеленого мы�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_0</word_key>
+      <word_default>(GMT) Casablanca, Dublin, London, Lisbon, Monrovia</word_default>
+      <word_custom>(GMT) Ка�абланка, Дублин, Эдинбург, Ли��абон, Лондон, Монрови�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_1</word_key>
+      <word_default>(GMT + 1:00 hours) Brussels, Copenhagen, Madrid, Paris, Rome</word_default>
+      <word_custom>(GMT + 1:00) �м�тердам, Берлин, Брю��ель, Мадрид, Париж</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_2</word_key>
+      <word_default>(GMT + 2:00 hours) Kaliningrad, South Africa</word_default>
+      <word_custom>(GMT + 2:00) Каир, Хель�инки, Калининград, Южна� �фрика, Варшава</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_3</word_key>
+      <word_default>(GMT + 3:00 hours) Baghdad, Riyadh, Moscow, Nairobi</word_default>
+      <word_custom>(GMT + 3:00) Багдад, Эр-Ри�д, Мо�ква, �айроби</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_3.5</word_key>
+      <word_default>(GMT + 3:30 hours) Tehran</word_default>
+      <word_custom>(GMT + 3:30) Тегеран</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_4</word_key>
+      <word_default>(GMT + 4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi</word_default>
+      <word_custom>(GMT + 4:00) �бу-Даби, Баку, Му�кат, Тбили�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_4.5</word_key>
+      <word_default>(GMT + 4:30 hours) Kabul</word_default>
+      <word_custom>(GMT + 4:30) Кабул</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_5</word_key>
+      <word_default>(GMT + 5:00 hours) Ekaterinburg, Karachi, Tashkent</word_default>
+      <word_custom>(GMT + 5:00) Екатеринбург, И�ламабад, Карачи, Ташкент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_5.5</word_key>
+      <word_default>(GMT + 5:30 hours) Bombay, Calcutta, Madras, New Delhi</word_default>
+      <word_custom>(GMT + 5:30) Бомбей, Калькутта, Мадра�, �ью-Дели</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_6</word_key>
+      <word_default>(GMT + 6:00 hours) Almaty, Bangladesh, Dhakra</word_default>
+      <word_custom>(GMT + 6:00) �лма-�та, Коломбо, Дхака, �ово�ибир�к, Ом�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_5.75</word_key>
+      <word_default>(GMT + 5:45 hours) Kathmandu</word_default>
+      <word_custom>(GMT + 5:45) Катманду</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_7</word_key>
+      <word_default>(GMT + 7:00 hours) Bangkok, Hanoi, Jakarta</word_default>
+      <word_custom>(GMT + 7:00) Бангкок, Ханой, Джакарта, Кра�но�р�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_6.5</word_key>
+      <word_default>(GMT + 6:30 hours) Yangon, Naypyidaw, Bantam</word_default>
+      <word_custom>GMT + 6:30) Янгон, �айпьидо, Бантам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_8</word_key>
+      <word_default>(GMT + 8:00 hours) Hong Kong, Perth, Singapore, Taipei</word_default>
+      <word_custom>(GMT + 8:00) Пекин, Гонконг, Перт, Сингапур, Тайпей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_8.75</word_key>
+      <word_default>(GMT + 8:45 hours) Caiguna, Eucla</word_default>
+      <word_custom>(GMT + 8:45) Кейгуна, Юкла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_9</word_key>
+      <word_default>(GMT + 9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk</word_default>
+      <word_custom>(GMT + 9:00) О�ака, Саппоро, Сеул, Токио, Якут�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_11.5</word_key>
+      <word_default>(GMT + 11:30 hours) Burnt Pine, Kingston</word_default>
+      <word_custom>(GMT + 11:30) Бернт Пайн, Кинг�тон </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_10</word_key>
+      <word_default>(GMT + 10:00 hours) Melbourne, Papua New Guinea, Sydney</word_default>
+      <word_custom>(GMT + 10:00) Канберра, Мельбурн, Гуам, Сидней, Владиво�ток</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_9.5</word_key>
+      <word_default>(GMT + 9:30 hours) Adelaide, Darwin</word_default>
+      <word_custom>(GMT + 9:30) �делаида, Дарвин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_11</word_key>
+      <word_default>(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Is.</word_default>
+      <word_custom>(GMT + 11:00) Магадан, �ова� Каледони�, Соломоновы о-ва</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_10.5</word_key>
+      <word_default>(GMT + 10:30 hours) Lord Howe Island</word_default>
+      <word_custom>(GMT + 10:30) О�тров Лорд-Хау</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_12</word_key>
+      <word_default>(GMT + 12:00 hours) Auckland, Fiji, Marshall Islands</word_default>
+      <word_custom>(GMT + 12:00) Окленд, Фиджи, Камчатка, Веллингтон, Маршалловы о�трова</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_8</word_key>
+      <word_default>August</word_default>
+      <word_custom>�вгу�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_6</word_key>
+      <word_default>June</word_default>
+      <word_custom>Июнь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_7</word_key>
+      <word_default>July</word_default>
+      <word_custom>Июль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_5</word_key>
+      <word_default>May</word_default>
+      <word_custom>Май</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_4</word_key>
+      <word_default>April</word_default>
+      <word_custom>�прель</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_3</word_key>
+      <word_default>March</word_default>
+      <word_custom>Март</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_1</word_key>
+      <word_default>January</word_default>
+      <word_custom>Январь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_2</word_key>
+      <word_default>February</word_default>
+      <word_custom>Февраль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_prev</word_key>
+      <word_default>Previous Page</word_default>
+      <word_custom>Предыдуща� �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_next</word_key>
+      <word_default>Next page</word_default>
+      <word_custom>Следующа� �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_gotofirst</word_key>
+      <word_default>Go to first page</word_default>
+      <word_custom>Перейти на первую �траницу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_isfirst</word_key>
+      <word_default>First</word_default>
+      <word_custom>Перва�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_islast</word_key>
+      <word_default>Last</word_default>
+      <word_custom>По�ледн��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>tpl_gotolast</word_key>
+      <word_default>Go to last page</word_default>
+      <word_custom>Перейти к по�ледней �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_14</word_key>
+      <word_default>(GMT + 14:00 hours) Kiritimati</word_default>
+      <word_custom>(GMT + 14:00) Киритимати (о�тров Рожде�тва)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_13</word_key>
+      <word_default>(GMT + 13:00 hours) Kamchatka, Anadyr</word_default>
+      <word_custom>(GMT + 13:00) Камчатка, �надырь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_9</word_key>
+      <word_default>September</word_default>
+      <word_custom>Сент�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>time_12.75</word_key>
+      <word_default>(GMT + 12:45 hours) Chatham Islands</word_default>
+      <word_custom>(GMT + 12:45) О�трова Чатем </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_11</word_key>
+      <word_default>November</word_default>
+      <word_custom>�о�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_10</word_key>
+      <word_default>October</word_default>
+      <word_custom>Окт�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>M_12</word_key>
+      <word_default>December</word_default>
+      <word_custom>Декабрь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_url</word_key>
+      <word_default>URL</word_default>
+      <word_custom>�дре� (URL)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_gotohome</word_key>
+      <word_default>Go to: Administration Home</word_default>
+      <word_custom>Перейти на главную админцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_mylink</word_key>
+      <word_default>My link</word_default>
+      <word_custom>Мо� ��ылка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_linktext</word_key>
+      <word_default>Link text</word_default>
+      <word_custom>Тек�т ��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_imageurl</word_key>
+      <word_default>Image URL</word_default>
+      <word_custom>URL изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_emailaddress</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>Е-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_emailme</word_key>
+      <word_default>Email me</word_default>
+      <word_custom>Отравить мне пи�ьмо</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_example</word_key>
+      <word_default>Example</word_default>
+      <word_custom>Пример</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_insertimage</word_key>
+      <word_default>Insert Image</word_default>
+      <word_custom>В�тавить изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_insertlink</word_key>
+      <word_default>Insert Link</word_default>
+      <word_custom>В�тавить ��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_mediaurl</word_key>
+      <word_default>Media URL</word_default>
+      <word_custom>С�ылка на ролик</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_cancel_edit</word_key>
+      <word_default>Cancel Source Edit</word_default>
+      <word_custom>Отменить редактирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_insertmedia</word_key>
+      <word_default>Insert Media</word_default>
+      <word_custom>Добавить ролик</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_insertemail</word_key>
+      <word_default>Insert Email</word_default>
+      <word_custom>В�тавить e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_logo</word_key>
+      <word_default>Logo</word_default>
+      <word_custom>Логотип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_loggedinas</word_key>
+      <word_default>Logged in as</word_default>
+      <word_custom>Вы вошли под учетной запи�ью</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_loading</word_key>
+      <word_default>Loading...</word_default>
+      <word_custom>Загрузка...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_pleasewait</word_key>
+      <word_default>Please Wait</word_default>
+      <word_custom>Пожалуй�та подождите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_error</word_key>
+      <word_default>Error</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_ipbadminarea</word_key>
+      <word_default>IPB3 Admin Area</word_default>
+      <word_custom>�дминцентр IPB3</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_icon</word_key>
+      <word_default>Icon</word_default>
+      <word_custom>Иконка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_system</word_key>
+      <word_default>System</word_default>
+      <word_custom>Си�тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_lookandfeel</word_key>
+      <word_default><![CDATA[Look &amp; Feel]]></word_default>
+      <word_custom>Внешний вид</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_livesearch</word_key>
+      <word_default>Live search ACP...</word_default>
+      <word_custom>Пои�к по �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_myapps</word_key>
+      <word_default>My Apps</word_default>
+      <word_custom>Приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_support</word_key>
+      <word_default>Support</word_default>
+      <word_custom>Поддержка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_portal</word_key>
+      <word_default>Portal</word_default>
+      <word_custom>Портал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_downloads</word_key>
+      <word_default>Downloads</word_default>
+      <word_custom>Файловый менеджер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_gallery</word_key>
+      <word_default>Gallery</word_default>
+      <word_custom>Галере�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_blog</word_key>
+      <word_default>Blog</word_default>
+      <word_custom>Блоги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_subsmanager</word_key>
+      <word_default>Subscriptions</word_default>
+      <word_custom>Подпи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_getsupport</word_key>
+      <word_default>Get Support</word_default>
+      <word_custom>Поддержка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_getsupport_title</word_key>
+      <word_default>Get support by submitting a ticket to our technicians</word_default>
+      <word_custom>Отправьте запро� в нашу �лужбу поддержки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -4967,9 +3990,6 @@
       <word_key>gl_resources</word_key>
       <word_default>Visit IPS Resources</word_default>
       <word_custom>По�етить форумы IBR</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -4977,29 +3997,6 @@
       <word_key>gl_resources_title</word_key>
       <word_default>Our resource site provides free and premium skins, modifications, articles and languages for your IP.Board</word_default>
       <word_custom>�а нашем �айте вы �можете найти бе�платные �тили, модификации и дополнительные �зыковые пакеты дл� вашего форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gl_ipsapp</word_key>
-      <word_default>Official IPS Application</word_default>
-      <word_custom>Официальные приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_global</word_pack>
-      <word_key>gl_signinname</word_key>
-      <word_default>Sign In Name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5007,9 +4004,6 @@
       <word_key>gl_password</word_key>
       <word_default>Password</word_default>
       <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5017,9 +4011,6 @@
       <word_key>gl_signin</word_key>
       <word_default>Log In</word_default>
       <word_custom>Вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5027,19 +4018,20 @@
       <word_key>gl_manageapps</word_key>
       <word_default>Manage Applications</word_default>
       <word_custom>Управление приложени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_global</word_pack>
-      <word_key>gl_pagejump</word_key>
-      <word_default>Jump To Page</word_default>
-      <word_custom>Перейти к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gl_signinname</word_key>
+      <word_default>Sign In Name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_ipsapp</word_key>
+      <word_default>IPS</word_default>
+      <word_custom>Официальные приложени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5047,679 +4039,580 @@
       <word_key>show_all_emotes</word_key>
       <word_default>Show All</word_default>
       <word_custom>В�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_where</word_key>
-      <word_default>Specify an optional where clause if needed</word_default>
-      <word_custom>Укажите значение выражени� WHERE е�ли �то необходимо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>gl_pagejump</word_key>
+      <word_default>Jump To Page</word_default>
+      <word_custom>Перейти к</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_newvalue</word_key>
-      <word_default>Specify the new value</word_default>
-      <word_custom>Укажите новое значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_hooks</word_key>
+      <word_default>Manage Hooks</word_default>
+      <word_custom>Управление хуками</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_oldvalue</word_key>
-      <word_default>Specify the old value (useful to revert data during uninstall)</word_default>
-      <word_custom>Укажите �тарое значение (удобно дл� во��тановлени� �о�то�ни� �и�темы при удалении мода)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_apps_modules</word_key>
+      <word_default><![CDATA[Manage Applications &amp; Modules]]></word_default>
+      <word_custom>Управление приложени�ми</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_definition</word_key>
-      <word_default>Specify the field definition (e.g. varchar(255))</word_default>
-      <word_custom>Введите тип пол� (например varchar(255))</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__settemplates_external</word_key>
+      <word_default><![CDATA[Externally Edit Templates &amp; CSS]]></word_default>
+      <word_custom>Внешнее изменение шаблонов и CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_defaultvalue</word_key>
-      <word_default>Specify the default value</word_default>
-      <word_custom>Укажите значение по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__whitespace_checker</word_key>
+      <word_default>Whitespace Checker</word_default>
+      <word_custom>Пои�к файлов �одержащих лишние пробелы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_changefield</word_key>
-      <word_default>(Only if this is a change alter) specify the new field name</word_default>
-      <word_custom>(В �лучае е�ли прои�ходит изменение) укажите новое им� пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__permissions_checker</word_key>
+      <word_default>Permissions Checker</word_default>
+      <word_custom>Проверка прав до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_field</word_key>
-      <word_default>Specify the field name</word_default>
-      <word_custom>Введите название пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__diag_overview</word_key>
+      <word_default>Overview</word_default>
+      <word_custom>Обзор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_altertype</word_key>
-      <word_default>Specify the type of alter statement</word_default>
-      <word_custom>Введите тип измен�ющего выражени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__connection_checker</word_key>
+      <word_default>Connection Checker</word_default>
+      <word_custom>Проверка �оединений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_tabletype</word_key>
-      <word_default>Specify the table type (e.g. myisam or innodb)</word_default>
-      <word_custom>Введите тип новой таблицы (напр-р, myisam, innodb)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__version_checker</word_key>
+      <word_default>Version Checker</word_default>
+      <word_custom>Проверка вер�ий файлов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_fieldnames</word_key>
-      <word_default>Specify the fields and indexes to add to the table, just as they appear in a SQL create table statement</word_default>
-      <word_custom>Укажите какие пол� и индек�ы необходимо добавить в таблицу, чтобы они по�вили�ь в ее �труктуре</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__dbi_checker</word_key>
+      <word_default>Database Index Checker</word_default>
+      <word_custom>Проверка индек�ов базы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_existtable</word_key>
-      <word_default>Specify the table name (no prefix)</word_default>
-      <word_custom>Введите название таблицы (без префик�а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__db_checker</word_key>
+      <word_default>Database Checker</word_default>
+      <word_custom>Проверка базы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>desc_newtable</word_key>
-      <word_default>Specify the new table name (no prefix)</word_default>
-      <word_custom>Введите название новой таблицы (без префик�а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_resources</word_key>
+      <word_default>Additional Resources</word_default>
+      <word_custom>Дополнительные ре�ур�ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_reenable_all</word_key>
-      <word_default>Reenabled all hooks</word_default>
-      <word_custom>Хуки включены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_support</word_key>
+      <word_default>Technical Support</word_default>
+      <word_custom>Техниче�ка� поддержка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_disable_all_none</word_key>
-      <word_default>There were no active hooks to disable</word_default>
-      <word_custom>�ет активных хуков дл� отключени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_kb</word_key>
+      <word_default>IPS Knowledgebase</word_default>
+      <word_custom>База знаний</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_disabled_all</word_key>
-      <word_default>Disabled all hooks</word_default>
-      <word_custom>Отключены в�е хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_documentation</word_key>
+      <word_default>Documentation</word_default>
+      <word_custom>Документаци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_public_module</word_key>
-      <word_default> (PUBLIC)</word_default>
-      <word_custom> (ПОЛЬЗ)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_features</word_key>
+      <word_default>Feature Requests</word_default>
+      <word_custom>Предложени� о развитии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_disabled</word_key>
-      <word_default>The hook has been disabled</word_default>
-      <word_custom>Хук отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_contact</word_key>
+      <word_default>IPS Contact Information</word_default>
+      <word_custom>Контактна� информаци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_admin_module</word_key>
-      <word_default> (ADMIN)</word_default>
-      <word_custom> (�ДМИ�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__splashlogs</word_key>
+      <word_default>Logs</word_default>
+      <word_custom>Журналы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_custom</word_key>
-      <word_default>There is no custom install/uninstall script configured</word_default>
-      <word_custom>�ет �пециального �крипта у�тановки/удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__help_bugs</word_key>
+      <word_default>Report a Bug</word_default>
+      <word_custom>Сообщить об ошибке</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_db</word_key>
-      <word_default>There are no database changes being exported</word_default>
-      <word_custom>�ет изменений в базе данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__languages</word_key>
+      <word_default>Manage Languages</word_default>
+      <word_custom>Языки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_change</word_key>
-      <word_default>Change a Column</word_default>
-      <word_custom>Изменить �толбец</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__dashboard</word_key>
+      <word_default>My Dashboard</word_default>
+      <word_custom>Панель управлени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_drop</word_key>
-      <word_default>Remove a Column</word_default>
-      <word_custom>Удалить �толбец</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mydetails</word_key>
+      <word_default>Change My Details</word_default>
+      <word_custom>Изменение данных</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_insert</word_key>
-      <word_default>Insert Data</word_default>
-      <word_custom>В�тавить данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mediatag</word_key>
+      <word_default>Manage Media Tag</word_default>
+      <word_custom>Медиа-теги</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_addnew</word_key>
-      <word_default>Add New Column</word_default>
-      <word_custom>Добавить �толбец</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__emoticons</word_key>
+      <word_default>Emoticon Management</word_default>
+      <word_custom>Смайлики</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_alter</word_key>
-      <word_default>Alter Table</word_default>
-      <word_custom>Изменить таблицу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__badwords</word_key>
+      <word_default>Bad Word Filters</word_default>
+      <word_custom>�ецензурные �лова</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_update</word_key>
-      <word_default>Update Data</word_default>
-      <word_custom>Обновить данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__bbcode</word_key>
+      <word_default>BBCode Management</word_default>
+      <word_custom>BB-коды</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_create</word_key>
-      <word_default>Create Table</word_default>
-      <word_custom>Создать таблицу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__reports_ssl</word_key>
+      <word_default><![CDATA[Status &amp; Severity Levels]]></word_default>
+      <word_custom>Стату�ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_css</word_key>
-      <word_default>There are no CSS files being exported</word_default>
-      <word_custom>�ет CSS файлов дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__reports_plugin</word_key>
+      <word_default>Plugin Manager</word_default>
+      <word_custom>Плагины</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_db_select</word_key>
-      <word_default>Select One</word_default>
-      <word_custom>Выберите</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__reports_overview</word_key>
+      <word_default>Overview</word_default>
+      <word_custom>Обзор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_tasks</word_key>
-      <word_default>There are no tasks being exported</word_default>
-      <word_custom>�ет новых задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__settings</word_key>
+      <word_default>System Settings</word_default>
+      <word_custom>Си�темные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_tasks</word_key>
-      <word_default>Tasks:</word_default>
-      <word_custom>Задачи:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sql_backup</word_key>
+      <word_default>SQL Back Up</word_default>
+      <word_custom>Резервирование базы данных</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_css</word_key>
-      <word_default>CSS Files: </word_default>
-      <word_custom>CSS файлы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sql_toolbox</word_key>
+      <word_default>SQL Toolbox</word_default>
+      <word_custom>Ин�трументы управлени� SQL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_skin</word_key>
-      <word_default>There are no skin templates being exported</word_default>
-      <word_custom>�ет новых шаблонов �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sql_processes</word_key>
+      <word_default>SQL Processes</word_default>
+      <word_custom>Выполн�ющие�� проце��ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_help</word_key>
-      <word_default>There are no help files being exported</word_default>
-      <word_custom>�ет новых разделов помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sql_vars</word_key>
+      <word_default>SQL System Vars</word_default>
+      <word_custom>Значени� �и�темных на�троек</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_modules</word_key>
-      <word_default>There are no modules being exported</word_default>
-      <word_custom>�ет новых модулей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sql_ri</word_key>
+      <word_default>SQL Runtime Info</word_default>
+      <word_custom>Информаци� о �о�то�нии �ервера</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_help</word_key>
-      <word_default>Help Files:</word_default>
-      <word_custom>Помощь:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__listadmins</word_key>
+      <word_default>List Admins</word_default>
+      <word_custom>Спи�ок админи�траторов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_modules</word_key>
-      <word_default>Modules:</word_default>
-      <word_custom>Модули:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__security</word_key>
+      <word_default>Security Center</word_default>
+      <word_custom>Центр безопа�но�ти</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_language</word_key>
-      <word_default>There are no language strings being exported</word_default>
-      <word_custom>�ет новых �зыковых кон�трукций</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__taskmanager</word_key>
+      <word_default>System Scheduler</word_default>
+      <word_custom>Планировщик задач</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_from</word_key>
-      <word_default>From</word_default>
-      <word_custom>От</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_tools</word_key>
+      <word_default>Template Tools</word_default>
+      <word_custom>Ин�трументы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_settings</word_key>
-      <word_default>Settings:</word_default>
-      <word_custom>�а�тройки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_manage</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_no_settings</word_key>
-      <word_default>There are no settings being exported</word_default>
-      <word_custom>�ет новых на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_sar</word_key>
+      <word_default>Search and Replace</word_default>
+      <word_custom>Пои�к и замена</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_setting_groups</word_key>
-      <word_default>Setting groups:</word_default>
-      <word_custom>Группа на�троек:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_merge</word_key>
+      <word_default>Template Merge Center</word_default>
+      <word_custom>Сравнение и �ли�ние �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addanotherchange</word_key>
-      <word_default>Add Another Change</word_default>
-      <word_custom>Добавить другие изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__performance</word_key>
+      <word_default>Performance Mode</word_default>
+      <word_custom>Режим производительно�ти</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hook_cannot_load</word_key>
-      <word_default>The hook could not be loaded</word_default>
-      <word_custom>Хук не может быть загружен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_ie</word_key>
+      <word_default>Import / Export</word_default>
+      <word_custom>Импорт / �к�порт</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addanothertemplate</word_key>
-      <word_default>Add Another Template</word_default>
-      <word_custom>Добавить другой шаблон</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__skins_logo</word_key>
+      <word_default>Easy Logo Changer</word_default>
+      <word_custom>Смена логотипа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>selectone</word_key>
-      <word_default>Select One</word_default>
-      <word_custom>Выберите один</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__uagents</word_key>
+      <word_default>User Agent Management</word_default>
+      <word_custom>Управление User Agent</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>adddbchanges</word_key>
-      <word_default>Add Database Changes</word_default>
-      <word_custom>Добавить изменение базы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__licensekey</word_key>
+      <word_default>License Key</word_default>
+      <word_custom>Ключ лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>nomodifyset</word_key>
-      <word_default>Now modify the settings</word_default>
-      <word_custom>Сейча� измените на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mem_tools</word_key>
+      <word_default>Member Management Tools</word_default>
+      <word_custom>Дополнительные ин�трументы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addtemplates</word_key>
-      <word_default>Add Templates</word_default>
-      <word_custom>Добавить шаблоны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__recount_rebuild</word_key>
+      <word_default><![CDATA[Recount &amp; Rebuild]]></word_default>
+      <word_custom>Пере�чет и обновление</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>hookssavebutton</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__banfilters</word_key>
+      <word_default>Ban Filters</word_default>
+      <word_custom>Бан фильтр</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addanotherfile</word_key>
-      <word_default>Add Another File</word_default>
-      <word_custom>Добавить другой файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mem_add</word_key>
+      <word_default>Add New Member</word_default>
+      <word_custom>Создание пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>nowselectbits</word_key>
-      <word_default>Now select template bits to add</word_default>
-      <word_custom>Сейча� выберите шаблоны дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__notifications</word_key>
+      <word_default>Notification Defaults</word_default>
+      <word_custom>�а�тройки уведомлений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addtasks</word_key>
-      <word_default>Add Tasks</word_default>
-      <word_custom>Добавить задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mem_rep</word_key>
+      <word_default>Member Reputation</word_default>
+      <word_custom>Репутаци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>oneormtasks</word_key>
-      <word_default>Select one or more tasks to export (do not forget to include the task PHP file for the user to upload)</word_default>
-      <word_custom>Выберите одну или не�колько задач дл� �к�порта (не забудьте включить задачу в PHP файл дл� загрузки пользователем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__restrictions</word_key>
+      <word_default>Manage ACP Restrictions</word_default>
+      <word_custom>Ограничение до�тупа к �Ц</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>nowselectstrings</word_key>
-      <word_default>Now select strings to add</word_default>
-      <word_custom>Сейча� выберите �троки дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__customfields</word_key>
+      <word_default>Custom Profile Fields</word_default>
+      <word_custom>Дополнительные пол� профил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addlanguage</word_key>
-      <word_default>Add Language</word_default>
-      <word_custom>Добавить �зык</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_groups</word_key>
+      <word_default>Manage Member Groups</word_default>
+      <word_custom>Управление группами</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>selectoneormorehelp</word_key>
-      <word_default>Select one or more help files to export</word_default>
-      <word_custom>Выберите один или не�колько файлов помощи дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_perms</word_key>
+      <word_default>Manage Member Permissions</word_default>
+      <word_custom>Права до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addhelpfiles</word_key>
-      <word_default>Add Help Files</word_default>
-      <word_custom>Добавить файлы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_members</word_key>
+      <word_default>Manage Members</word_default>
+      <word_custom>Управление пользовател�ми</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>pathcustomscript</word_key>
-      <word_default><![CDATA[Enter in the filename of the custom install/uninstall script.  The file must be prefixed with &quot;install_&quot; and be placed in the hooks/ directory, but you should not enter this prefix into the form field.]]></word_default>
-      <word_custom><![CDATA[Введите им� файла пользователь�кого �крипта у�тановки/удалени�. Файл должен иметь префик� &quot;install_&quot; и размещен в директории hooks/. При вводе имени префик� не указывает��.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__mem_ranks</word_key>
+      <word_default>Member Ranks</word_default>
+      <word_custom>Звани�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addcustomscript</word_key>
-      <word_default>Add Custom Script</word_default>
-      <word_custom>Добавить пользователь�кий �крипт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__rssexports</word_key>
+      <word_default>RSS Export</word_default>
+      <word_custom>Эк�порт</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>exportmodules</word_key>
-      <word_default>Select one or more modules to export</word_default>
-      <word_custom>Выберите один или не�колько модулей дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_reg</word_key>
+      <word_default>Registration Stats</word_default>
+      <word_custom>Реги�траций</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addmodules</word_key>
-      <word_default>Add Modules</word_default>
-      <word_custom>Добавить модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_topics</word_key>
+      <word_default>New Topic Stats</word_default>
+      <word_custom>�овых тем</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>indivsettingsex</word_key>
-      <word_default>Select one or more individual settings to export (any necessary group data will be included).  If you need to export all settings in a group, use the previous option instead.</word_default>
-      <word_custom>Выберете одну или не�колько индивидуальных на�троек дл� �к�порта (в�е необходимые данные группы будут включены). Е�ли необходимо �к�портировать в�е на�тройки группы и�пользуйте предыдущую опцию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_posts</word_key>
+      <word_default>Post Stats</word_default>
+      <word_custom>Сообщений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>exportonesettings</word_key>
-      <word_default>Select one or more setting groups to export (all settings in the group will be exported)</word_default>
-      <word_custom>Выберите одну или не�колько на�троек групп дл� �к�порта (в�е на�тройки группы будут �к�портированы) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_pms</word_key>
+      <word_default>Personal Message</word_default>
+      <word_custom>Личных �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>addsettings</word_key>
-      <word_default>Add Settings</word_default>
-      <word_custom>Добавить на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_tviews</word_key>
+      <word_default>Topic Views</word_default>
+      <word_custom>Про�мотров тем</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>selectoneomorecss</word_key>
-      <word_default>Select one or more css files to export</word_default>
-      <word_custom>Выберите один или не�колько css файлов дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__stats_spam</word_key>
+      <word_default>Spam Service</word_default>
+      <word_custom>Работы анти�пам-�ерви�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_hooks</word_pack>
-      <word_key>selectafile</word_key>
-      <word_default>Select a File</word_default>
-      <word_custom>Выберите файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__bulkmail</word_key>
+      <word_default>Bulk Mail</word_default>
+      <word_custom>Ра��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__forums</word_key>
+      <word_default>Manage Forums</word_default>
+      <word_custom>Управление форумами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__multimod</word_key>
+      <word_default>Topic Multi-Moderation</word_default>
+      <word_custom>Мульти-модераци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__rssimports</word_key>
+      <word_default>RSS Import</word_default>
+      <word_custom>Импорт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__attachment_stats</word_key>
+      <word_default>Attachment Stats</word_default>
+      <word_custom>Стати�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__attachment_search</word_key>
+      <word_default>Attachment Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__attachment_types</word_key>
+      <word_default>Attachment Types</word_default>
+      <word_custom>Типы прикрепл�емых файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__sharelinks</word_key>
+      <word_default>Share Links</word_default>
+      <word_custom>Серви�ы публикации ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__incoming_emails</word_key>
+      <word_default>Incoming Email Rules</word_default>
+      <word_custom>Правила вход�щий почты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__login_modules</word_key>
+      <word_default>Log In Management</word_default>
+      <word_custom>Модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__manage_help</word_key>
+      <word_default>Manage Help Files</word_default>
+      <word_custom>Разделы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__caches</word_key>
+      <word_default>Cache Management</word_default>
+      <word_custom>Управление кешем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__qanda</word_key>
+      <word_default><![CDATA[Question &amp; Answer Challenge]]></word_default>
+      <word_custom>Си�тема «Вопро�-ответ»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__api_users</word_key>
+      <word_default>API Users</word_default>
+      <word_custom>Пользователи API</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>menu__cleanup_tools</word_key>
+      <word_default>Clean Up Tools</word_default>
+      <word_custom>Ин�трументы очи�тки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_global</word_pack>
+      <word_key>revert</word_key>
+      <word_default>Revert</word_default>
+      <word_custom>Отменить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5727,9 +4620,433 @@
       <word_key>addcss</word_key>
       <word_default>Add CSS</word_default>
       <word_custom>Добавить CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>selectoneomorecss</word_key>
+      <word_default>Select one or more css files to export</word_default>
+      <word_custom>Выберите один или не�колько css файлов дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>selectafile</word_key>
+      <word_default>Select a File</word_default>
+      <word_custom>Выберите файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>exportonesettings</word_key>
+      <word_default>Select one or more setting groups to export (all settings in the group will be exported)</word_default>
+      <word_custom>Выберите одну или не�колько на�троек групп дл� �к�порта (в�е на�тройки группы будут �к�портированы) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addsettings</word_key>
+      <word_default>Add Settings</word_default>
+      <word_custom>Добавить на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>indivsettingsex</word_key>
+      <word_default>Select one or more individual settings to export (any necessary group data will be included).  If you need to export all settings in a group, use the previous option instead.</word_default>
+      <word_custom>Выберете одну или не�колько индивидуальных на�троек дл� �к�порта (в�е необходимые данные группы будут включены). Е�ли необходимо �к�портировать в�е на�тройки группы и�пользуйте предыдущую опцию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addmodules</word_key>
+      <word_default>Add Modules</word_default>
+      <word_custom>Добавить модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addhelpfiles</word_key>
+      <word_default>Add Help Files</word_default>
+      <word_custom>Добавить файлы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>pathcustomscript</word_key>
+      <word_default><![CDATA[Enter in the filename of the custom install/uninstall script.  The file must be prefixed with &quot;install_&quot; and be placed in the '%s' directory, but you should not enter this prefix into the form field.]]></word_default>
+      <word_custom><![CDATA[Введите им� файла пользователь�кого �крипта у�тановки/удалени�. Файл должен иметь префик� &quot;install_&quot; и размещен в директории hooks/. При вводе имени префик� не указывает��.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addcustomscript</word_key>
+      <word_default>Add Custom Script</word_default>
+      <word_custom>Добавить пользователь�кий �крипт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>exportmodules</word_key>
+      <word_default>Select one or more modules to export</word_default>
+      <word_custom>Выберите один или не�колько модулей дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>selectoneormorehelp</word_key>
+      <word_default>Select one or more help files to export</word_default>
+      <word_custom>Выберите один или не�колько файлов помощи дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>nowselectstrings</word_key>
+      <word_default>Now select strings to add</word_default>
+      <word_custom>Сейча� выберите �троки дл� добавлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hookssavebutton</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>oneormtasks</word_key>
+      <word_default>Select one or more tasks to export (do not forget to include the task PHP file for the user to upload)</word_default>
+      <word_custom>Выберите одну или не�колько задач дл� �к�порта (не забудьте включить задачу в PHP файл дл� загрузки пользователем)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>nowselectbits</word_key>
+      <word_default>Now select template bits to add</word_default>
+      <word_custom>Сейча� выберите шаблоны дл� добавлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addanotherfile</word_key>
+      <word_default>Add Another File</word_default>
+      <word_custom>Добавить другой файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addlanguage</word_key>
+      <word_default>Add Language</word_default>
+      <word_custom>Добавить �зык</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addtasks</word_key>
+      <word_default>Add Tasks</word_default>
+      <word_custom>Добавить задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addtemplates</word_key>
+      <word_default>Add Templates</word_default>
+      <word_custom>Добавить шаблоны</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>adddbchanges</word_key>
+      <word_default>Add Database Changes</word_default>
+      <word_custom>Добавить изменение базы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>selectone</word_key>
+      <word_default>Select One</word_default>
+      <word_custom>Выберите один</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addanothertemplate</word_key>
+      <word_default>Add Another Template</word_default>
+      <word_custom>Добавить другой шаблон</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>nomodifyset</word_key>
+      <word_default>Now modify the settings</word_default>
+      <word_custom>Сейча� измените на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>addanotherchange</word_key>
+      <word_default>Add Another Change</word_default>
+      <word_custom>Добавить другие изменени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_cannot_load</word_key>
+      <word_default>The hook could not be loaded</word_default>
+      <word_custom>Хук не может быть загружен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_setting_groups</word_key>
+      <word_default>Setting groups:</word_default>
+      <word_custom>Группа на�троек:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_from</word_key>
+      <word_default>From</word_default>
+      <word_custom>От</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_settings</word_key>
+      <word_default>Settings:</word_default>
+      <word_custom>�а�тройки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_settings</word_key>
+      <word_default>There are no settings being exported</word_default>
+      <word_custom>�ет новых на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_modules</word_key>
+      <word_default>Modules:</word_default>
+      <word_custom>Модули:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_language</word_key>
+      <word_default>There are no language strings being exported</word_default>
+      <word_custom>�ет новых �зыковых кон�трукций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_modules</word_key>
+      <word_default>There are no modules being exported</word_default>
+      <word_custom>�ет новых модулей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_help</word_key>
+      <word_default>There are no help files being exported</word_default>
+      <word_custom>�ет новых разделов помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_help</word_key>
+      <word_default>Help Files:</word_default>
+      <word_custom>Помощь:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_skin</word_key>
+      <word_default>There are no skin templates being exported</word_default>
+      <word_custom>�ет новых шаблонов �тилей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_tasks</word_key>
+      <word_default>Tasks:</word_default>
+      <word_custom>Задачи:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_tasks</word_key>
+      <word_default>There are no tasks being exported</word_default>
+      <word_custom>�ет новых задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_select</word_key>
+      <word_default>Select One</word_default>
+      <word_custom>Выберите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_css</word_key>
+      <word_default>There are no CSS files being exported</word_default>
+      <word_custom>�ет CSS файлов дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_css</word_key>
+      <word_default>CSS Files: </word_default>
+      <word_custom>CSS файлы:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_create</word_key>
+      <word_default>Create Table</word_default>
+      <word_custom>Создать таблицу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_alter</word_key>
+      <word_default>Alter Table</word_default>
+      <word_custom>Изменить таблицу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_update</word_key>
+      <word_default>Update Data</word_default>
+      <word_custom>Обновить данные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_addnew</word_key>
+      <word_default>Add New Column</word_default>
+      <word_custom>Добавить �толбец</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_insert</word_key>
+      <word_default>Insert Data</word_default>
+      <word_custom>В�тавить данные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_change</word_key>
+      <word_default>Change a Column</word_default>
+      <word_custom>Изменить �толбец</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_db</word_key>
+      <word_default>There are no database changes being exported</word_default>
+      <word_custom>�ет изменений в базе данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_db_drop</word_key>
+      <word_default>Remove a Column</word_default>
+      <word_custom>Удалить �толбец</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_admin_module</word_key>
+      <word_default> (ADMIN)</word_default>
+      <word_custom> (�ДМИ�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_no_custom</word_key>
+      <word_default>There is no custom install/uninstall script configured</word_default>
+      <word_custom>�ет �пециального �крипта у�тановки/удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_public_module</word_key>
+      <word_default> (PUBLIC)</word_default>
+      <word_custom> (ПОЛЬЗ)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_disabled</word_key>
+      <word_default>The hook has been disabled</word_default>
+      <word_custom>Хук отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_disabled_all</word_key>
+      <word_default>Disabled all hooks</word_default>
+      <word_custom>Отключены в�е хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_disable_all_none</word_key>
+      <word_default>There were no active hooks to disable</word_default>
+      <word_custom>�ет активных хуков дл� отключени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_fieldnames</word_key>
+      <word_default>Specify the fields and indexes to add to the table, just as they appear in a SQL create table statement</word_default>
+      <word_custom>Укажите какие пол� и индек�ы необходимо добавить в таблицу, чтобы они по�вили�ь в ее �труктуре</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_existtable</word_key>
+      <word_default>Specify the table name (no prefix)</word_default>
+      <word_custom>Введите название таблицы (без префик�а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>hook_reenable_all</word_key>
+      <word_default>Reenabled all hooks</word_default>
+      <word_custom>Хуки включены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_newtable</word_key>
+      <word_default>Specify the new table name (no prefix)</word_default>
+      <word_custom>Введите название новой таблицы (без префик�а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_tabletype</word_key>
+      <word_default>Specify the table type (e.g. myisam or innodb)</word_default>
+      <word_custom>Введите тип новой таблицы (напр-р, myisam, innodb)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_altertype</word_key>
+      <word_default>Specify the type of alter statement</word_default>
+      <word_custom>Введите тип измен�ющего выражени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_where</word_key>
+      <word_default>Specify an optional where clause if needed</word_default>
+      <word_custom>Укажите значение выражени� WHERE е�ли �то необходимо</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5737,9 +5054,6 @@
       <word_key>desc_data</word_key>
       <word_default>Specify data to insert in format of column=value, column=value</word_default>
       <word_custom>Укажите данные дл� добавлени� в формате �толбец=значение, �толбец=значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5747,1068 +5061,175 @@
       <word_key>desc_revert</word_key>
       <word_default><![CDATA[Specify a column=value pair to look for on delete (e.g. uniqueKeyColumn='myvalue')]]></word_default>
       <word_custom><![CDATA[Укажите пару �толбец=значение дл� удалени� (например uniqueKeyColumn='значение')]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_add_string</word_key>
-      <word_default>Add User Agent</word_default>
-      <word_custom>Добавить User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_newvalue</word_key>
+      <word_default>Specify the new value</word_default>
+      <word_custom>Укажите новое значение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_edit_string</word_key>
-      <word_default>Edit User Agent</word_default>
-      <word_custom>Изменить User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_oldvalue</word_key>
+      <word_default>Specify the old value (useful to revert data during uninstall)</word_default>
+      <word_custom>Укажите �тарое значение (удобно дл� во��тановлени� �о�то�ни� �и�темы при удалении мода)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_error_remove</word_key>
-      <word_default>There was an error deleting this user agent</word_default>
-      <word_custom>Произошла ошибка при удалении User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_defaultvalue</word_key>
+      <word_default>Specify the default value</word_default>
+      <word_custom>Укажите значение по умолчанию</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_error_remove2</word_key>
-      <word_default>There was an error deleting this user agent: </word_default>
-      <word_custom>Произошла ошибка при удалении User Agent: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_field</word_key>
+      <word_default>Specify the field name</word_default>
+      <word_custom>Введите название пол�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>sk_error</word_key>
-      <word_default>Error: </word_default>
-      <word_custom>Ошибка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_changefield</word_key>
+      <word_default>(Only if this is a change alter) specify the new field name</word_default>
+      <word_custom>(В �лучае е�ли прои�ходит изменение) укажите новое им� пол�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_perm_remove</word_key>
-      <word_default>Are you sure you want to permanently remove this User Agent?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �тот User Agent?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>cannot_compare_css</word_key>
-      <word_default>You do not have permission to compare CSS files.</word_default>
-      <word_custom>Вы не можете �равнивать CSS файлы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>cannot_compare_templates</word_key>
-      <word_default>You do not have permission to compare templates.</word_default>
-      <word_custom>Вы не можете �равнивать шаблоны.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>unsaved_css_warn</word_key>
-      <word_default>This css file has unsaved changes! Are you sure you want to close it?</word_default>
-      <word_custom>CSS файл имеет не �охраненные изменени�! Вы дей�твительно хотите закрыть его?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>tpl_savegeneric</word_key>
-      <word_default>Saving...</word_default>
-      <word_custom>Сохранение...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>unsaved_template_war</word_key>
-      <word_default>This template bit has unsaved changes! Are you sure you want to close it?</word_default>
-      <word_custom>Шаблон имеет не �охраненные изменени�! Вы дей�твительно хотите закрыть его?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>tpl_savingvars</word_key>
-      <word_default>Saving variables...</word_default>
-      <word_custom>Сохранение переменных...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>revert_mesg</word_key>
-      <word_default>Reverting...</word_default>
-      <word_custom>Отмена...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>tpl_savingproperties</word_key>
-      <word_default>Saving properties...</word_default>
-      <word_custom>Сохранение на�троек...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>revert_css_file</word_key>
-      <word_default>Are you sure you want to remove ALL customizations to this CSS file in this set? THIS CANNOT BE UNDONE.</word_default>
-      <word_custom>Вы дей�твительно хотите отменить в�е изменени� в CSS дл� �того �тил�? ОПЕР�ЦИЯ �Е МОЖЕТ БЫТЬ ОТМЕ�Е��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>revert_template_bit</word_key>
-      <word_default>Are you sure you want to remove ALL customizations to this bit in this set? THIS CANNOT BE UNDONE.</word_default>
-      <word_custom>Вы дей�твительно хотите отменить в�е изменени� в шаблонах дл� �того �тил�? ОПЕР�ЦИЯ �Е МОЖЕТ БЫТЬ ОТМЕ�Е��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>delete_template_bit</word_key>
-      <word_default>Are you sure you want to delete this template bit from this set and all child sets? THIS CANNOT BE UNDONE.</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �тот шаблон из �тил� и в�ех его на�ледников? ДЕЙСТВИЕ �Е МОЖЕТ БЫТЬ ОТМЕ�Е�О.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>delete_css_file</word_key>
-      <word_default>Are you sure that you want to delete this CSS file from this set and all child sets?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �тот CSS файл из �того �тил� и в�ех его на�ледников?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_blankcss</word_key>
-      <word_default>The css name cannot be blank</word_default>
-      <word_custom>Им� CSS не может быть пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_servererror</word_key>
-      <word_default>The server returned an error: </word_default>
-      <word_custom>Сервер �ообщил об ошибке: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_navigate</word_key>
-      <word_default><![CDATA[Navigating away from this page will cause the changes you've made to be lost.]]></word_default>
-      <word_custom>Переход � данной �траницы приведет к потере в�ех �деланных вами изменений. Продолжить?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_loading</word_key>
-      <word_default>Loading...</word_default>
-      <word_custom>Загрузка...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_noblank</word_key>
-      <word_default>The template name cannot be blank</word_default>
-      <word_custom>Им� шаблона не может быть пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_error_group</word_key>
-      <word_default>An error occurred generating the template groups</word_default>
-      <word_custom>Произошла ошибка при �оздании групп шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_error_add2</word_key>
-      <word_default>There was an error adding this template bit: </word_default>
-      <word_custom>Произошла ошибка при добавлении шаблона: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_error_add</word_key>
-      <word_default>There was an error adding this template bit</word_default>
-      <word_custom>Произошла ошибка при добавлении шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>templates_adding</word_key>
-      <word_default>Adding...</word_default>
-      <word_custom>Добавление...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>page_multijump</word_key>
-      <word_default>Please enter a page number to jump to between 1 and </word_default>
-      <word_custom>Введите номер �траницы дл� перехода к ней </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ok_to_delete</word_key>
-      <word_default>PLEASE CONFIRM:\nOK to proceed with delete?</word_default>
-      <word_custom>�ажмите ОК, дл� подтверждени� удалени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_outerpost</word_key>
-      <word_default>after the end of the foreach statement </word_default>
-      <word_custom>по�ле кон�трукции foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>admin_hooks</word_pack>
+      <word_key>desc_definition</word_key>
+      <word_default>Specify the field definition (e.g. varchar(255))</word_default>
+      <word_custom>Введите тип пол� (например varchar(255))</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
       <word_key>a_innerpost</word_key>
-      <word_default>before the end of the foreach statement </word_default>
+      <word_default>Before the end of the foreach statement</word_default>
       <word_custom>перед концом кон�трукции foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_innerpre</word_key>
-      <word_default>after the start of the foreach statement </word_default>
-      <word_custom>по�ле начала кон�трукции foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
       <word_key>a_outerpre</word_key>
-      <word_default>before the start of the foreach statement </word_default>
+      <word_default>Before the start of the foreach statement</word_default>
       <word_custom>перед началом кон�трукции foreach </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>a_postendif</word_key>
-      <word_default>after the end of the if statement </word_default>
-      <word_custom>по�ле кон�трукции if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_preendif</word_key>
-      <word_default>before the end of the if statement </word_default>
-      <word_custom>перед концом кон�трукции if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_postelse</word_key>
-      <word_default>after the start of the else statement </word_default>
-      <word_custom>по�ле начала кон�трукции else </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_preelse</word_key>
-      <word_default>before the start of the else statement </word_default>
-      <word_custom>перед началом кон�трукции else </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>a_poststartif</word_key>
-      <word_default>after the start of the if statement </word_default>
-      <word_custom>по�ле начала кон�трукции if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>hook_hookid</word_key>
-      <word_default><![CDATA[The hook 'id']]></word_default>
-      <word_custom>ID хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_innerpre</word_key>
+      <word_default>After the start of the foreach statement</word_default>
+      <word_custom>по�ле начала кон�трукции foreach </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
       <word_key>a_prestartif</word_key>
-      <word_default>before the start of the if statement </word_default>
+      <word_default>Before the start of the if statement</word_default>
       <word_custom>перед началом кон�трукции if </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_tempposi</word_key>
-      <word_default>Position of template hook</word_default>
-      <word_custom>Ра�положение хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_outerpost</word_key>
+      <word_default>After the start of the foreach statement</word_default>
+      <word_custom>по�ле кон�трукции foreach </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_skinfunc</word_key>
-      <word_default>The skin function this hook is in</word_default>
-      <word_custom>Шаблон, в котором находит�� хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_preelse</word_key>
+      <word_default>Before the start of the else statement</word_default>
+      <word_custom>перед началом кон�трукции else </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_temptype</word_key>
-      <word_default>Type of template hook</word_default>
-      <word_custom>Тип хука дл� шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_poststartif</word_key>
+      <word_default>After the start of the if statement</word_default>
+      <word_custom>по�ле начала кон�трукции if </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_data_location</word_key>
-      <word_default>Data Location</word_default>
-      <word_custom>Ра�положение данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_postelse</word_key>
+      <word_default>After the start of the else statement</word_default>
+      <word_custom>по�ле начала кон�трукции else </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_extends</word_key>
-      <word_default>The class this file extends</word_default>
-      <word_custom>Кла�� ра�шир�емый �тим файлом</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_preendif</word_key>
+      <word_default>Before the end of the if statement</word_default>
+      <word_custom>перед концом кон�трукции if </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_skingroup</word_key>
-      <word_default>The skin group this hook is in</word_default>
-      <word_custom>Группа шаблонов, к которой принадлежит хук</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>confirm_delete_single_mem</word_key>
+      <word_default>Are you sure you want to delete this member?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �того пользовател�?</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_data</word_key>
-      <word_default>Data hook</word_default>
-      <word_custom>Хук дл� данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>useragent_saved</word_key>
+      <word_default>The user agent has been saved</word_default>
+      <word_custom>User Agent �охранен</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_library</word_key>
-      <word_default>Library hook</word_default>
-      <word_custom>Хук дл� библиотеки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>a_postendif</word_key>
+      <word_default>After the end of the if statement</word_default>
+      <word_custom>по�ле кон�трукции if </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_template</word_key>
-      <word_default>Template hook</word_default>
-      <word_custom>Хук дл� шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>confirm_delete_multiple_mem</word_key>
+      <word_default>Are you sure you want to delete these members?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тих пользователей?</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_skin</word_key>
-      <word_default>Skin overloader</word_default>
-      <word_custom>Перезагрузчик �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>adduagenttitle</word_key>
+      <word_default>Adding User Agent</word_default>
+      <word_custom>Добавление User Agent</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_select</word_key>
-      <word_default>Select One</word_default>
-      <word_custom>Выберите</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>livesearchnoresults</word_key>
+      <word_default>No results</word_default>
+      <word_custom>�ет результатов</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype_action</word_key>
-      <word_default>Action overloader</word_default>
-      <word_custom>Перезагрузчик дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>hook_filetype</word_key>
-      <word_default><![CDATA[This file's hook type]]></word_default>
-      <word_custom>Тип файла хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>hook_classname</word_key>
-      <word_default><![CDATA[This file's class name]]></word_default>
-      <word_custom>Им� кла��а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>hook_filename</word_key>
-      <word_default>File name in hooks directory</word_default>
-      <word_custom>Им� файла в директории хука</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_user</word_key>
-      <word_default>(Gallery) View User</word_default>
-      <word_custom>(Галере�) Про�мотр пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_post</word_key>
-      <word_default>(Gallery) Post Image</word_default>
-      <word_custom>(Галере�) Добавление изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_img</word_key>
-      <word_default>(Gallery) Show Image</word_default>
-      <word_custom>(Галере�) Про�мотр изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_imagelisting</word_key>
-      <word_default>(Gallery) Image Listing</word_default>
-      <word_custom>(Галере�) Спи�ок изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_global</word_key>
-      <word_default>(Gallery) Global</word_default>
-      <word_custom>(Галере�) Общие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_comments</word_key>
-      <word_default>(Gallery) Comments</word_default>
-      <word_custom>(Галере�) Комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_favs</word_key>
-      <word_default>(Gallery) Favorites</word_default>
-      <word_custom>(Галере�) Избранное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_cats</word_key>
-      <word_default>(Gallery) Categories</word_default>
-      <word_custom>(Галере�) Категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_gallery_albums</word_key>
-      <word_default>(Gallery) Albums</word_default>
-      <word_custom>(Галере�) �льбомы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_downloads_ucp</word_key>
-      <word_default>(Downloads) User Control Panel</word_default>
-      <word_custom>(Файлы) Панель пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_downloads_submit</word_key>
-      <word_default>(Downloads) Submit Download</word_default>
-      <word_custom>(Файлы) Загрузка файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_downloads_external</word_key>
-      <word_default>(Downloads) External Downloads</word_default>
-      <word_custom>(Файлы) Внешние файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_downloads</word_key>
-      <word_default>(Downloads) Download Manager</word_default>
-      <word_custom>(Файлы) Файловый архив</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_chatsigma</word_key>
-      <word_default>(Chat) Sigmachat</word_default>
-      <word_custom>(Чат) Sigmachat</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_chatpara</word_key>
-      <word_default>(Chat) Parachat</word_default>
-      <word_custom>(Чат) Parachat </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_xml</word_key>
-      <word_default>(Blog) XML Output</word_default>
-      <word_custom>(Блог) Вывод XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_ucp</word_key>
-      <word_default>(Blog) User Control Panel</word_default>
-      <word_custom>(Блог) Панель управлени� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_trackback</word_key>
-      <word_default>(Blog) Trackbacks</word_default>
-      <word_custom>(Блог) Трекбеки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_show</word_key>
-      <word_default>(Blog) Blog View</word_default>
-      <word_custom>(Блог) Про�мотр блога</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_post</word_key>
-      <word_default>(Blog) Post Screen</word_default>
-      <word_custom>(Блог) Экран �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_portal</word_key>
-      <word_default>(Blog) Portal Plugin</word_default>
-      <word_custom>(Блог) Дополнение портала</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_list</word_key>
-      <word_default>(Blog) Listing</word_default>
-      <word_custom>(Блог) Спи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_global</word_key>
-      <word_default>(Blog) Global</word_default>
-      <word_custom>(Блог) Общие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_cblocks</word_key>
-      <word_default>(Blog) Content Blocks</word_default>
-      <word_custom>(Блог) Дополнительные блоки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_blog_actions</word_key>
-      <word_default>(Blog) Actions</word_default>
-      <word_custom>(Блог) Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_ucp</word_key>
-      <word_default>User Control Panel</word_default>
-      <word_custom>Панель пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_topic</word_key>
-      <word_default>Topic View</word_default>
-      <word_custom>Темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_subscriptions</word_key>
-      <word_default>Subscription Manager</word_default>
-      <word_custom>Менеджер подпи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_stats</word_key>
-      <word_default>Statistics</word_default>
-      <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_search</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_reports</word_key>
-      <word_default>Report Center</word_default>
-      <word_custom>Си�тема жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_register</word_key>
-      <word_default>Registration Screen</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_profile</word_key>
-      <word_default>Profiles</word_default>
-      <word_custom>Профили пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_printpage</word_key>
-      <word_default>Print View</word_default>
-      <word_custom>Вер�и� дл� печати</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_post</word_key>
-      <word_default>Post Screen</word_default>
-      <word_custom>Страница отправки тем/�ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_portal</word_key>
-      <word_default>Portal</word_default>
-      <word_custom>Портал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_online</word_key>
-      <word_default>Online List</word_default>
-      <word_custom>Кто в онлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_poll</word_key>
-      <word_default>Polls</word_default>
-      <word_custom>Опро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_mod</word_key>
-      <word_default>Moderation</word_default>
-      <word_custom>Си�тема модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_messaging</word_key>
-      <word_default>Messenger</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_mlist</word_key>
-      <word_default>Member List</word_default>
-      <word_custom>Спи�ок пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_login</word_key>
-      <word_default>Login Screen</word_default>
-      <word_custom>Страница входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_help</word_key>
-      <word_default>Help</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_legends</word_key>
-      <word_default>Legends</word_default>
-      <word_custom>Попапы BBкодов и �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_global_other</word_key>
-      <word_default>Other Global Templates</word_default>
-      <word_custom>Прочие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_global</word_key>
-      <word_default>Global Templates</word_default>
-      <word_custom>Глобальные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_forum</word_key>
-      <word_default>Forum View</word_default>
-      <word_custom>Спи�ок тем форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_editors</word_key>
-      <word_default>Editor</word_default>
-      <word_custom>Редактор �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_emails</word_key>
-      <word_default>Emails</word_default>
-      <word_custom>Си�тема e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_boards</word_key>
-      <word_default>Board Index</word_default>
-      <word_custom>Спи�ок форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_calendar</word_key>
-      <word_default>Calendar</word_default>
-      <word_custom>Календарь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>group_settings_match</word_key>
+      <word_default><![CDATA[<span class='livesearch-groups'>There are per-group settings that match your search</span>]]></word_default>
+      <word_custom><![CDATA[<span class='livesearch-groups'>�айдены на�тройки групп, удовлетвор�ющие критерию</span>]]></word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -6817,28 +5238,766 @@
       <word_key>session_timed_out</word_key>
       <word_default>Your Admin CP session has expired, please refresh the page and log back in</word_default>
       <word_custom>Ваша �е��и� и�текла, пожалуй�та обновите �траницу и выполните вход повторно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hook_application</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>bit_skin_calendar</word_key>
+      <word_default>Calendar</word_default>
+      <word_custom>Календарь</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>hookfilenumber</word_key>
-      <word_default>File #</word_default>
-      <word_custom>Файл # </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>bit_skin_boards</word_key>
+      <word_default>Board Index</word_default>
+      <word_custom>Спи�ок форумов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_forum</word_key>
+      <word_default>Forum View</word_default>
+      <word_custom>Спи�ок тем форума</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_emails</word_key>
+      <word_default>Emails</word_default>
+      <word_custom>Си�тема e-mail</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_global</word_key>
+      <word_default>Global Templates</word_default>
+      <word_custom>Глобальные</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_editors</word_key>
+      <word_default>Editor</word_default>
+      <word_custom>Редактор �ообщений</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_global_comments</word_key>
+      <word_default>Global Comments Templates</word_default>
+      <word_custom>Шаблоны комментариев</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_login</word_key>
+      <word_default>Login Screen</word_default>
+      <word_custom>Страница входа</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_global_other</word_key>
+      <word_default>Other Global Templates</word_default>
+      <word_custom>Прочие</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_legends</word_key>
+      <word_default>Legends</word_default>
+      <word_custom>Попапы BBкодов и �майликов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_help</word_key>
+      <word_default>Help</word_default>
+      <word_custom>Помощь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_mlist</word_key>
+      <word_default>Member List</word_default>
+      <word_custom>Спи�ок пользователей</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_messaging</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_mod</word_key>
+      <word_default>Moderation</word_default>
+      <word_custom>Си�тема модерации</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_online</word_key>
+      <word_default>Online List</word_default>
+      <word_custom>Кто в онлайн</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_portal</word_key>
+      <word_default>Portal</word_default>
+      <word_custom>Портал</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_poll</word_key>
+      <word_default>Polls</word_default>
+      <word_custom>Опро�ы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_post</word_key>
+      <word_default>Post Screen</word_default>
+      <word_custom>Страница отправки тем/�ообщений</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_profile</word_key>
+      <word_default>Profiles</word_default>
+      <word_custom>Профили пользователей</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_register</word_key>
+      <word_default>Registration Screen</word_default>
+      <word_custom>Реги�траци�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_search</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_reports</word_key>
+      <word_default>Report Center</word_default>
+      <word_custom>Си�тема жалоб</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_stats</word_key>
+      <word_default>Statistics</word_default>
+      <word_custom>Стати�тика</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_subscriptions</word_key>
+      <word_default>Subscription Manager</word_default>
+      <word_custom>Менеджер подпи�ок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_ucp</word_key>
+      <word_default>User Control Panel</word_default>
+      <word_custom>Панель пользовател�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_topic</word_key>
+      <word_default>Topic View</word_default>
+      <word_custom>Темы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_cblocks</word_key>
+      <word_default>(Blog) Content Blocks</word_default>
+      <word_custom>(Блог) Дополнительные блоки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_actions</word_key>
+      <word_default>(Blog) Actions</word_default>
+      <word_custom>(Блог) Дей�тви�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_global</word_key>
+      <word_default>(Blog) Global</word_default>
+      <word_custom>(Блог) Общие</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_list</word_key>
+      <word_default>(Blog) Listing</word_default>
+      <word_custom>(Блог) Спи�ок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_hooks</word_key>
+      <word_default>(Blog) Hooks</word_default>
+      <word_custom>(Блог) Хуки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_manage</word_key>
+      <word_default>(Blog) Manage</word_default>
+      <word_custom>(Блог) Управление</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_portal</word_key>
+      <word_default>(Blog) Portal Plugin</word_default>
+      <word_custom>(Блог) Дополнение портала</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_post</word_key>
+      <word_default>(Blog) Post Screen</word_default>
+      <word_custom>(Блог) Экран �ообщени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_show</word_key>
+      <word_default>(Blog) Blog View</word_default>
+      <word_custom>(Блог) Про�мотр блога</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_blog_trackback</word_key>
+      <word_default>(Blog) Trackbacks</word_default>
+      <word_custom>(Блог) Трекбеки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_downloads</word_key>
+      <word_default>(Downloads) Download Manager</word_default>
+      <word_custom>(Файлы) Файловый архив</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_downloads_external</word_key>
+      <word_default>(Downloads) External Downloads</word_default>
+      <word_custom>(Файлы) Внешние файлы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_downloads_other</word_key>
+      <word_default>(Downloads) Other Templates</word_default>
+      <word_custom>(Файлы) Прочие шаблоны</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_downloads_submit</word_key>
+      <word_default>(Downloads) Submit Download</word_default>
+      <word_custom>(Файлы) Загрузка файла</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_ccs_global</word_key>
+      <word_default>(Content) Global Templates</word_default>
+      <word_custom>(Контент) Глобальные шаблоны</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_albums</word_key>
+      <word_default>(Gallery) Albums</word_default>
+      <word_custom>(Галере�) �льбомы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_global</word_key>
+      <word_default>(Gallery) Global</word_default>
+      <word_custom>(Галере�) Общие</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_home</word_key>
+      <word_default>(Gallery) Homepage</word_default>
+      <word_custom>(Галере�) Главна�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_imagelisting</word_key>
+      <word_default>(Gallery) Image Listing</word_default>
+      <word_custom>(Галере�) Спи�ок изображений</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_img</word_key>
+      <word_default>(Gallery) Show Image</word_default>
+      <word_custom>(Галере�) Про�мотр изображени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_post</word_key>
+      <word_default>(Gallery) Post Image</word_default>
+      <word_custom>(Галере�) Добавление изображени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_ipchat</word_key>
+      <word_default>(Chat) Global</word_default>
+      <word_custom>(Чат) Глобальные</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_gallery_user</word_key>
+      <word_default>(Gallery) View User</word_default>
+      <word_custom>(Галере�) Про�мотр пользовател�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_nexus_clients</word_key>
+      <word_default>(Nexus) Clients</word_default>
+      <word_custom>(�ек�у�) Клиенты</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>generic_ajax_error</word_key>
+      <word_default>There was an error processing this action.</word_default>
+      <word_custom>Произошла ошибка при выполнении дей�тви�.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_nexus_payments</word_key>
+      <word_default>(Nexus) Payments</word_default>
+      <word_custom>(�ек�у�) Платежи</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>bit_skin_nexus_support</word_key>
+      <word_default>(Nexus) Support</word_default>
+      <word_custom>(�ек�у�) Поддержка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>removeuseragent</word_key>
+      <word_default>Remove user agent? This will be removed permanently</word_default>
+      <word_custom>Удалить user agent?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>page_multijump</word_key>
+      <word_default>Please enter a page number to jump to between 1 and </word_default>
+      <word_custom>Введите номер �траницы дл� перехода к ней </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_adding</word_key>
+      <word_default>Adding...</word_default>
+      <word_custom>Добавление...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ok_to_delete</word_key>
+      <word_default>PLEASE CONFIRM: Proceed with delete?</word_default>
+      <word_custom>�ажмите ОК, дл� подтверждени� удалени�.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_error_add2</word_key>
+      <word_default>There was an error adding this template bit: </word_default>
+      <word_custom>Произошла ошибка при добавлении шаблона: </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_error_add</word_key>
+      <word_default>There was an error adding this template bit</word_default>
+      <word_custom>Произошла ошибка при добавлении шаблона</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_error_group</word_key>
+      <word_default>An error occurred generating the template groups</word_default>
+      <word_custom>Произошла ошибка при �оздании групп шаблонов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_noblank</word_key>
+      <word_default>The template name cannot be blank</word_default>
+      <word_custom>Им� шаблона не может быть пу�тым</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_loading</word_key>
+      <word_default>Loading...</word_default>
+      <word_custom>Загрузка...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_blankcss</word_key>
+      <word_default>The css name cannot be blank</word_default>
+      <word_custom>Им� CSS не может быть пу�тым</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>missingurlforsave</word_key>
+      <word_default>Cannot save form; url missing</word_default>
+      <word_custom>�е возможно �охранить форму; от�ут�вует URL</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>delete_template_bit</word_key>
+      <word_default>Are you sure you want to delete this template bit from this set and all child sets? THIS CANNOT BE UNDONE.</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тот шаблон из �тил� и в�ех его на�ледников? ДЕЙСТВИЕ �Е МОЖЕТ БЫТЬ ОТМЕ�Е�О.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_navigate</word_key>
+      <word_default><![CDATA[Navigating away from this page will cause the changes you've made to be lost.]]></word_default>
+      <word_custom>Переход � данной �траницы приведет к потере в�ех �деланных вами изменений. Продолжить?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>templates_servererror</word_key>
+      <word_default>The server returned an error: </word_default>
+      <word_custom>Сервер �ообщил об ошибке: </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>revert_css_file</word_key>
+      <word_default>Are you sure you want to remove ALL customizations to this CSS file in this set? THIS CANNOT BE UNDONE.</word_default>
+      <word_custom>Вы дей�твительно хотите отменить в�е изменени� в CSS дл� �того �тил�? ОПЕР�ЦИЯ �Е МОЖЕТ БЫТЬ ОТМЕ�Е��</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>revert_mesg</word_key>
+      <word_default>Reverting...</word_default>
+      <word_custom>Отмена...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>revert_template_bit</word_key>
+      <word_default>Are you sure you want to remove ALL customizations to this bit in this set? THIS CANNOT BE UNDONE.</word_default>
+      <word_custom>Вы дей�твительно хотите отменить в�е изменени� в шаблонах дл� �того �тил�? ОПЕР�ЦИЯ �Е МОЖЕТ БЫТЬ ОТМЕ�Е��</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>delete_css_file</word_key>
+      <word_default>Are you sure that you want to delete this CSS file from this set and all child sets?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тот CSS файл из �того �тил� и в�ех его на�ледников?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>tpl_savegeneric</word_key>
+      <word_default>Saving...</word_default>
+      <word_custom>Сохранение...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>unsaved_template_war</word_key>
+      <word_default>This template bit has unsaved changes! Are you sure you want to close it?</word_default>
+      <word_custom>Шаблон имеет не �охраненные изменени�! Вы дей�твительно хотите закрыть его?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>tpl_savingvars</word_key>
+      <word_default>Saving variables...</word_default>
+      <word_custom>Сохранение переменных...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>tpl_savingproperties</word_key>
+      <word_default>Saving properties...</word_default>
+      <word_custom>Сохранение на�троек...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>cannot_compare_templates</word_key>
+      <word_default>You do not have permission to compare templates.</word_default>
+      <word_custom>Вы не можете �равнивать шаблоны.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>cannot_compare_css</word_key>
+      <word_default>You do not have permission to compare CSS files.</word_default>
+      <word_custom>Вы не можете �равнивать CSS файлы.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>comparediff_oldd</word_key>
+      <word_default>Old default</word_default>
+      <word_custom>Старые по умолчанию</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>comparediff_newd</word_key>
+      <word_default>New default</word_default>
+      <word_custom>�овые по умолчанию</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>unsaved_css_warn</word_key>
+      <word_default>This css file has unsaved changes! Are you sure you want to close it?</word_default>
+      <word_custom>CSS файл имеет не �охраненные изменени�! Вы дей�твительно хотите закрыть его?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>comparediff_diff</word_key>
+      <word_default>Difference</word_default>
+      <word_custom>Различи�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>comparediff_cust</word_key>
+      <word_default>Customized</word_default>
+      <word_custom>Измененные</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>comparediff_merg</word_key>
+      <word_default>Merge Preview</word_default>
+      <word_custom>Предпро�мотр объединени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>merge_edititem</word_key>
+      <word_default>Edit Item</word_default>
+      <word_custom>Изменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_error_remove</word_key>
+      <word_default>There was an error deleting this user agent</word_default>
+      <word_custom>Произошла ошибка при удалении User Agent</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_perm_remove</word_key>
+      <word_default>Are you sure you want to permanently remove this User Agent?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тот User Agent?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>sk_error</word_key>
+      <word_default>Error: </word_default>
+      <word_custom>Ошибка:</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>mustfixfirst</word_key>
+      <word_default>You cannot save this item until you have remove all conflicts</word_default>
+      <word_custom>Вы не можете удалить, пока не разрешите в�е конфликты</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>oops</word_key>
+      <word_default>Ooops. Something went wrong. Does this help?: </word_default>
+      <word_custom>Возникла ошибка:</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>resolveall_button</word_key>
+      <word_default>Resolve All: Custom Wins</word_default>
+      <word_custom>Разрешить в�е в пользу пользователь�ких изменений</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>resolveall_newwin</word_key>
+      <word_default>Resolve All: New Wins</word_default>
+      <word_custom>Разрешить в�е в пользу новых изменений</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>save_button</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_edit_string</word_key>
+      <word_default>Edit User Agent</word_default>
+      <word_custom>Изменить User Agent</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_add_string</word_key>
+      <word_default>Add User Agent</word_default>
+      <word_custom>Добавить User Agent</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_error_remove2</word_key>
+      <word_default>There was an error deleting this user agent: </word_default>
+      <word_custom>Произошла ошибка при удалении User Agent: </word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -6847,48 +6006,6 @@
       <word_key>ua_form_incomplete</word_key>
       <word_default>You must complete: User Agent Name, User Agent Key and Regex</word_default>
       <word_custom>�еобходимо заполнить: �авзание User Agent, Ключ и Регул�рное выражение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_error_save</word_key>
-      <word_default>An error occurred while saving this user agent</word_default>
-      <word_custom>Произошла ошибка при �охранении User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_exists</word_key>
-      <word_default>User Agent Exists</word_default>
-      <word_custom>Такой User Agent уже �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>ua_error_save2</word_key>
-      <word_default>An error occurred while saving this user agent: </word_default>
-      <word_custom>Произошла ошибка при �охранении User Agent: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>forums_showmod</word_key>
-      <word_default>Show Moderator Options</word_default>
-      <word_custom>Показать модератор�кие опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -6897,8 +6014,46 @@
       <word_key>forums_hidemod</word_key>
       <word_default>Hide Moderator Options</word_default>
       <word_custom>Скрыть модератор�кие опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_error_save</word_key>
+      <word_default>An error occurred while saving this user agent</word_default>
+      <word_custom>Произошла ошибка при �охранении User Agent</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>forums_showmod</word_key>
+      <word_default>Show Moderator Options</word_default>
+      <word_custom>Показать модератор�кие опции</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_error_save2</word_key>
+      <word_default>An error occurred while saving this user agent: </word_default>
+      <word_custom>Произошла ошибка при �охранении User Agent: </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>ua_exists</word_key>
+      <word_default>User Agent Exists</word_default>
+      <word_custom>Такой User Agent уже �уще�твует</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_js</word_pack>
+      <word_key>unlimited_text</word_key>
+      <word_default>Unlimited</word_default>
+      <word_custom>�еограничено</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -6907,79 +6062,15 @@
       <word_key>editor_enter_list</word_key>
       <word_default>Enter list item (or hit Cancel to finish list)</word_default>
       <word_custom>Введите объект �пи�ка (или нажмите Отмена дл� завершени� �пи�ка)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_vkontakte</word_key>
-      <word_default>Формы дл� Вконтакте</word_default>
-      <word_custom>Формы дл� Вконтакте</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>1</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>enter_username</word_key>
-      <word_default>Username</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>enter_useremail</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>enter_name_and_email</word_key>
-      <word_default>Username or Email Address</word_default>
-      <word_custom>Логин или Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>ipb_login</word_key>
-      <word_default>Invision Power Board: Log in</word_default>
-      <word_custom>Invision Power Board: Вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>logout_complete</word_key>
-      <word_default>Log out complete</word_default>
-      <word_custom>Вы вышли</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_login</word_pack>
-      <word_key>login_successful</word_key>
-      <word_default>Log in successful</word_default>
-      <word_custom>Вы вошли</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_ban_to_delete</word_key>
+      <word_default>You did not select any ban filters to delete.</word_default>
+      <word_custom>Вы не выбрали ни одного правла бан-фильтра дл� удалени�.</word_custom>
+      <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -6987,9 +6078,6 @@
       <word_key>no_acp_access</word_key>
       <word_default>You do not have permission to access the ACP</word_default>
       <word_custom>У ва� не до�таточно прав дл� до�тупа в админцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -6997,629 +6085,937 @@
       <word_key>bad_email_password</word_key>
       <word_default>Your login credentials were not valid</word_default>
       <word_custom>�еверные данные дл� входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_login</word_pack>
+      <word_key>logout_complete</word_key>
+      <word_default>Log out complete</word_default>
+      <word_custom>Вы вышли</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_login</word_pack>
+      <word_key>ipb_login</word_key>
+      <word_default>IP.Board: Log in</word_default>
+      <word_custom>Invision Power Board: Вход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_login</word_pack>
+      <word_key>enter_useremail</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>Email</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_login</word_pack>
+      <word_key>enter_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_login</word_pack>
+      <word_key>enter_name_and_email</word_key>
+      <word_default>Username / Email</word_default>
+      <word_custom>Логин или Email</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_response_1</word_key>
-      <word_default>Probably not spam</word_default>
-      <word_custom>�е �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>noname_availabl</word_key>
+      <word_default><![CDATA[<em>Deleted admin</em>]]></word_default>
+      <word_custom><![CDATA[<em>Удаленный админи�тратор</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_response_0</word_key>
-      <word_default>Service Error</word_default>
-      <word_custom>Ошибка �ерви�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subj_not_avail</word_key>
+      <word_default><![CDATA[<em>Not available</em>]]></word_default>
+      <word_custom><![CDATA[<em>�едо�тупно</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>sslog_noresults</word_key>
-      <word_default>No spam log entries</word_default>
-      <word_custom>Запи�ей не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>spamlog_searchlabel</word_key>
+      <word_default>Search spam logs for: </word_default>
+      <word_custom>�айти:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_ip</word_key>
+      <word_key>delete_all_sqllogs</word_key>
+      <word_default>Delete All</word_default>
+      <word_custom>Удалить в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>deleted_member_warnlog</word_key>
+      <word_default>Deleted Member (ID: %s)</word_default>
+      <word_custom>Удален пользователь (ID: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>spamlog_searchbutton</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>spamlog_searchh3</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>spamlog_sresults</word_key>
+      <word_default>We found %s records that matched your search term</word_default>
+      <word_custom>�айдено %s запи�ей, удовлетвор�ющих вашему запро�у</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_more_file</word_key>
+      <word_default><![CDATA[Due to the size of this file, this is just the most recent 300 lines. You can download the full '%s' from your /cache directory]]></word_default>
+      <word_custom><![CDATA[Выведено только 300 по�ледних �трок из журнала. Получить полный журнал вы можете загрузив файл '%s' из директории /cache на вашем �ервере]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_nofile</word_key>
+      <word_default>Could not locate a log to open</word_default>
+      <word_custom>�е удало�ь найти файл журнала</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_removed</word_key>
+      <word_default>%s SQL error log file(s) removed</word_default>
+      <word_custom>Файл журнала ошибок удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_sqlerrors</word_key>
+      <word_default>SQL Error Logs</word_default>
+      <word_custom>Журнал SQL ошибок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_title</word_key>
+      <word_default>SQL Error Logs</word_default>
+      <word_custom>Журнал ошибок SQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_name</word_key>
+      <word_default>File Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_date</word_key>
+      <word_default>File Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_latest</word_key>
+      <word_default><![CDATA[<strong>Latest SQL Error Today</strong> (%s)<div style='white-space:pre;font-family:Monospace;overflow:auto'>%s</div>]]></word_default>
+      <word_custom><![CDATA[<strong>По�ледн�� SQL ошибка</strong> (%s)<div style='white-space:pre;font-family:Monospace;overflow:auto'>%s</div>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_size</word_key>
+      <word_default>File Size</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sqllog_noresults</word_key>
+      <word_default><![CDATA[There are no SQL logs to view. Don't be sad. It's a good thing.]]></word_default>
+      <word_custom>Хорошие ново�ти - в журнале нет запи�ей об ошибках в базе!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>choose_splash</word_key>
+      <word_default>Choose a log type to view</word_default>
+      <word_custom>Выберите журнал дл� про�мотра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>error_log_uri</word_key>
+      <word_default>Error URI</word_default>
+      <word_custom>URI</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>nav_logssplash</word_key>
+      <word_default>Logs</word_default>
+      <word_custom>Журнал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>error_log_code</word_key>
+      <word_default>Error Code</word_default>
+      <word_custom>Код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>nav_toolsmodule</word_key>
+      <word_default><![CDATA[Tools &amp; Settings]]></word_default>
+      <word_custom>Ин�трументы и на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>error_log_ip</word_key>
       <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>IP-адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_email</word_key>
-      <word_default>E-Mail Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_member</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_msg</word_key>
-      <word_default>Error Message</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_date</word_key>
+      <word_key>error_log_date</word_key>
       <word_default>Date</word_default>
       <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_code</word_key>
-      <word_default>Response</word_default>
-      <word_custom>Ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_noresults</word_key>
+      <word_default><![CDATA[<strong>No Error Logs Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Ошибки не найдены</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_list_id</word_key>
-      <word_default>ID</word_default>
-      <word_custom>ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_removed</word_key>
+      <word_default>Error Log(s) Removed</word_default>
+      <word_custom>Журнал ошибок удален</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_spamlogs</word_key>
-      <word_default>Spam Service Logs</word_default>
-      <word_custom>Журнал �пам-�ерви�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_search</word_key>
+      <word_default>Search Error Logs</word_default>
+      <word_custom>Пои�к</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>al_error_logs</word_key>
-      <word_default>Admin Login Logs</word_default>
-      <word_custom>Журнал авторизации админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_thelogs</word_key>
+      <word_default>Error Logs</word_default>
+      <word_custom>Журнал ошибок</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>api_error_logs</word_key>
-      <word_default>XML-RPC API Logs</word_default>
-      <word_custom>Журнал XML-RPC API</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>error_log_error</word_key>
+      <word_default>Error Message</word_default>
+      <word_custom>Сообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>sched_error_logs</word_key>
-      <word_default>Scheduler Logs</word_default>
-      <word_custom>Журнал задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_title</word_key>
+      <word_default>Search Engine Logs Manager</word_default>
+      <word_custom>Управление журналом пои�ковых ботов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_searchbutton</word_key>
-      <word_default>Search</word_default>
-      <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_nostring</word_key>
+      <word_default>You must enter a search string.</word_default>
+      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_adminlogs</word_key>
-      <word_default>Admin Logs</word_default>
-      <word_custom>Журнал админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_lofi</word_key>
+      <word_default>(Lo-Fi) </word_default>
+      <word_custom>Тек�това� вер�и� </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_searchin</word_key>
-      <word_default>Search in...</word_default>
-      <word_custom>И�кать в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_botname</word_key>
+      <word_default>Bot Name</word_default>
+      <word_custom>Пои�ковый робот</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_searchfor</word_key>
-      <word_default>Search for...</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_thelogs</word_key>
+      <word_default>Saved Search Engine Spider Logs</word_default>
+      <word_custom>Спи�ок дей�твий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_saved</word_key>
-      <word_default>Saved Administration Logs</word_default>
-      <word_custom>Журнал админи�трировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_nologs</word_key>
+      <word_default>We could not find the bot logs you wish to remove. Please try again.</word_default>
+      <word_custom>�евозможно найти дей�тви� пои�кового робота.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_search</word_key>
-      <word_default>Search Admin Logs</word_default>
-      <word_custom>Пои�к дей�твий в журнале</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_removeall</word_key>
+      <word_default>Remove All</word_default>
+      <word_custom>Удалить в�е</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_viewall</word_key>
-      <word_default>View All By Member</word_default>
-      <word_custom>Про�мотр в�ех дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_adminlog</word_key>
+      <word_default>Removed Search Engine Logs</word_default>
+      <word_custom>Удаленные дей�тви�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_removeall</word_key>
-      <word_default>Remove All By Member</word_default>
-      <word_custom>Удаление в�ех дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_last</word_key>
+      <word_default>Last Hit</word_default>
+      <word_custom>Запущен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_viewall</word_key>
+      <word_default>View All</word_default>
+      <word_custom>В�е дей�тви�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_noresults</word_key>
-      <word_default>No Results</word_default>
-      <word_custom>�ет результатов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_hits</word_key>
+      <word_default>Logged Hits</word_default>
+      <word_custom>Хитов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_view</word_key>
+      <word_key>slog_view</word_key>
       <word_default>View</word_default>
       <word_custom>Про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_noresults</word_key>
+      <word_default><![CDATA[<strong>No Spider Logs Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дей�тви� не найдены</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>alog_last5</word_key>
-      <word_default>Last 5 Admin Actions</word_default>
-      <word_custom>По�ледние 5 дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_sec</word_key>
-      <word_default>Section</word_default>
-      <word_custom>Раздел</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_do</word_key>
-      <word_default>do= {URL parameter}</word_default>
-      <word_custom>do= {URL параметр} </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_mod</word_key>
-      <word_default>Module</word_default>
-      <word_custom>Модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_id</word_key>
-      <word_default>Member ID</word_default>
-      <word_custom>ID админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_app</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_performed</word_key>
-      <word_default>Action(s) Performed</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_whoselog</word_key>
-      <word_default>We could not determine whose logs you were attempting to remove. Please try again.</word_default>
-      <word_custom>�евозможно определить, чью запи�ь в журнале вы пытаете�ь удалить. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_nostring</word_key>
-      <word_default>You must enter a search string. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти �троку пои�ка. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_whatfield</word_key>
-      <word_default>We could not determine what field you were attempting to search.</word_default>
-      <word_custom>�евозможно определить поле дл� пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>alog_title</word_key>
-      <word_default>Administration Logs Manager</word_default>
-      <word_custom>Управление журналом дей�твий админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_smtperror</word_key>
-      <word_default>SMTP Error Message: </word_default>
-      <word_custom>SMTP �ообщение ошибки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_smtpcode</word_key>
-      <word_default>SMTP Error Code: </word_default>
-      <word_custom>SMTP код ошибки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_ipberror</word_key>
-      <word_default>IP.Board Error Message: </word_default>
-      <word_custom>IP.Board �ообщение ошибки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_log_subject</word_key>
-      <word_default><![CDATA[<strong>Subject</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тема</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_log_sent</word_key>
-      <word_default><![CDATA[<strong>Sent:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дата:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_log_to</word_key>
-      <word_default><![CDATA[<strong>To:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Кому:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_searchbutton</word_key>
+      <word_key>slog_searchbutton</word_key>
       <word_default>Search</word_default>
       <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_log_from</word_key>
-      <word_default><![CDATA[<strong>From:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>От:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_search</word_key>
+      <word_default>Search Spider Logs</word_default>
+      <word_custom>Пои�к дей�твий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_searchwhere</word_key>
-      <word_default><![CDATA[<strong>Search where...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пои�к в</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_querystring</word_key>
+      <word_default>Query String</word_default>
+      <word_custom>Строка запро�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_removeall</word_key>
-      <word_default>Remove All?</word_default>
-      <word_custom>Удалить в�е?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_searchquery</word_key>
+      <word_default> in query string</word_default>
+      <word_custom> в �троке запро�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_search</word_key>
-      <word_default>Search Email Error Logs</word_default>
-      <word_custom>Пои�к запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_searchfor</word_key>
+      <word_default>Search for...</word_default>
+      <word_custom>И�кать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_removechecked</word_key>
-      <word_default>Remove Checked</word_default>
-      <word_custom>Удалить отмеченные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP-адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_noresults</word_key>
-      <word_default><![CDATA[<strong>No Email Error Logs Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Ошибки не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_time</word_key>
+      <word_default>Time of Action</word_default>
+      <word_custom>Врем� дей�тви�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_to</word_key>
-      <word_default>To</word_default>
-      <word_custom>Кому</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_spider_logs</word_key>
+      <word_default>Spider Logs</word_default>
+      <word_custom>Журнал по�ещений пои�ковых ботов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_date</word_key>
+      <word_key>wlog_title</word_key>
+      <word_default>Warn Logs Manager</word_default>
+      <word_custom>Журнал предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_deleted</word_key>
+      <word_default>Deleted Member (ID:%s)</word_default>
+      <word_custom>Удаленный пользователь (ID:%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_nostring</word_key>
+      <word_default>You must enter a search string. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_days</word_key>
+      <word_default>Days</word_default>
+      <word_custom>Дни</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_hours</word_key>
+      <word_default>Hours</word_default>
+      <word_custom>Ча�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_log</word_key>
+      <word_default>Log</word_default>
+      <word_custom>Журнал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_nofind</word_key>
+      <word_default>We could not find the member whose warn logs you were attempting to remove. Please try again.</word_default>
+      <word_custom>�евозможно найти пользовател�, запи�и которого вы пытаете�ь удалить. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_showmessage</word_key>
+      <word_default>Show message</word_default>
+      <word_custom>По�мотреть �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_removelogs</word_key>
+      <word_default>Removed warn logs for member ID:(%s)</word_default>
+      <word_custom>Удалены запи�и дл� пользовател� №: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_cantresolve</word_key>
+      <word_default>We cannot resolve the warn log ID. Please try again.</word_default>
+      <word_custom>�евозможно определить ID запи�и в журнале. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_pm</word_key>
+      <word_default>PM</word_default>
+      <word_custom>ЛС</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_contacted</word_key>
+      <word_default>View email</word_default>
+      <word_custom>По�мотреть e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_nologs</word_key>
+      <word_default>We could not find the warn log entry. Please try again.</word_default>
+      <word_custom>�евозможно найти запи�и в журнале. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_emailpm</word_key>
+      <word_default>Email/PM Sent</word_default>
+      <word_custom>Отправлено e-mail/ЛС</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_notes</word_key>
+      <word_default>Entry Notes</word_default>
+      <word_custom>Заметки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_email</word_key>
+      <word_default>Email</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_type</word_key>
+      <word_default>Type</word_default>
+      <word_custom>Тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_last10</word_key>
+      <word_default>Last 10 Warn Entries</word_default>
+      <word_custom>По�ледние 10 предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_warned</word_key>
+      <word_default>Warned Member</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_date</word_key>
       <word_default>Date</word_default>
       <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_reademail</word_key>
-      <word_default>Read Email</word_default>
-      <word_custom>Читать пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_wascontacted</word_key>
+      <word_default>Contacted?</word_default>
+      <word_custom>Уведомлен?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_exact</word_key>
-      <word_default>is exactly</word_default>
-      <word_custom>точно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_warnedby</word_key>
+      <word_default>Warned By</word_default>
+      <word_custom>Предупредил</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_loose</word_key>
-      <word_default>contains</word_default>
-      <word_custom>�одержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_thelogs</word_key>
+      <word_default>Saved Warn Logs</word_default>
+      <word_custom>Журнал</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_thelogs</word_key>
-      <word_default>Logged Email Errors</word_default>
-      <word_custom>Спи�ок неотправленных пи�ем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_noresults</word_key>
+      <word_default><![CDATA[<strong>No Warn Logs Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Предупреждени� не найдены</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_toemail</word_key>
-      <word_default>To Email Address</word_default>
-      <word_custom>Кому (E-mail)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_times</word_key>
+      <word_default>Times Warned</word_default>
+      <word_custom>Кол-во предупреждений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_error</word_key>
-      <word_default>Error Message</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Пользователь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_fromemail</word_key>
-      <word_default>From Email Address</word_default>
-      <word_custom>От (E-mail)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_viewall</word_key>
+      <word_default>View All By Member</word_default>
+      <word_custom>Про�мотр запи�ей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_subject</word_key>
-      <word_default>Email Subject</word_default>
-      <word_custom>Тема пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_viewlog</word_key>
+      <word_default>View</word_default>
+      <word_custom>По�мотреть</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>erlog_noinfo</word_key>
-      <word_default><![CDATA[<em>No Info</em>]]></word_default>
-      <word_custom><![CDATA[<em>�ет информации</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>wlog_removeall</word_key>
+      <word_default>Remove All By Member</word_default>
+      <word_custom>Удаление запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_searchin</word_key>
+      <word_default>Search for...</word_default>
+      <word_custom>И�кать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_search</word_key>
+      <word_default>Search Warn Logs</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_searchfor</word_key>
+      <word_default>Search in...</word_default>
+      <word_custom>И�кать в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_searchbutton</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_warnnotes</word_key>
+      <word_default>Warn Notes</word_default>
+      <word_custom>Заметка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_viewnotes</word_key>
+      <word_default>View Notes</word_default>
+      <word_custom>Заметка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_nopost</word_key>
+      <word_default>Disabled Posting</word_default>
+      <word_custom>Запрет отправки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_susp</word_key>
+      <word_default>Suspended</word_default>
+      <word_custom>Блокировка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_modq</word_key>
+      <word_default>Mod Queue</word_default>
+      <word_custom>Премодераци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_log_from</word_key>
+      <word_default><![CDATA[<strong>From:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>От:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_warn_logs</word_key>
+      <word_default>Warn Logs</word_default>
+      <word_custom>Журнал предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_log_sent</word_key>
+      <word_default><![CDATA[<strong>Sent:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дата:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_none</word_key>
+      <word_default>None</word_default>
+      <word_custom><![CDATA[<i>�ет</i>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_log_to</word_key>
+      <word_default><![CDATA[<strong>To:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Кому:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_log_subject</word_key>
+      <word_default><![CDATA[<strong>Subject:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тема:</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_noid</word_key>
+      <word_default>You did not select a member ID to remove by. Please try again.</word_default>
+      <word_custom>Вы не указали номер (ID) пользовател�, которого хотите удалить. Пожалуй�та, попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_title</word_key>
+      <word_default>Moderator Logs Manager</word_default>
+      <word_custom>Управление журналом модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>wlog_indef</word_key>
+      <word_default>INDEF</word_default>
+      <word_custom>INDEF</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_removed</word_key>
+      <word_default>Removed Moderator Logs for member ID: </word_default>
+      <word_custom>Удаленные дей�тви� модерировани� дл� ID пользовател�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_whatfield</word_key>
+      <word_default>We could not determine what field you were attempting to search. Please try again.</word_default>
+      <word_custom>�евозможно определить поле дл� пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_topicid</word_key>
+      <word_default><![CDATA[<br />Topic ID: ]]></word_default>
+      <word_custom><![CDATA[<br />ID темы: ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_nostring</word_key>
+      <word_default>You must enter a search string. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_tid</word_key>
+      <word_default>Topic ID</word_default>
+      <word_custom>ID темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_fid</word_key>
+      <word_default>Forum ID</word_default>
+      <word_custom>ID форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Модератор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Модератор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_last5</word_key>
+      <word_default>Last 5 Moderator Actions</word_default>
+      <word_custom>По�ледние 5 дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_forum</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_action</word_key>
+      <word_default>Action Performed</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_thelogs</word_key>
+      <word_default>Saved Moderator Logs</word_default>
+      <word_custom>Журнал модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_topictitle</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_removeall</word_key>
+      <word_default>Remove All By Member</word_default>
+      <word_custom>Удаление в�ех дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_viewall</word_key>
+      <word_default>View All By Member</word_default>
+      <word_custom>Про�мотр в�ех дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_noresults</word_key>
+      <word_default><![CDATA[<strong>No Moderator Logs Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�ет запи�ей</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_searchfor</word_key>
+      <word_default>Search for...</word_default>
+      <word_custom>И�кать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотреть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_searchin</word_key>
+      <word_default>Search in...</word_default>
+      <word_custom>И�кать в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_search</word_key>
+      <word_default>Search Moderator Logs</word_default>
+      <word_custom>Пои�к дей�твий в журнале</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>elog_email_err_logs</word_key>
+      <word_default>Email Error Logs</word_default>
+      <word_custom>Журнал ошибок e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_modlogs</word_key>
+      <word_default>Moderator Logs</word_default>
+      <word_custom>Журнал модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>mlog_searchbutton</word_key>
+      <word_default>Search</word_default>
+      <word_custom>И�кать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -7628,59 +7024,6 @@
       <word_default>You must enter something to search by. Please try again.</word_default>
       <word_custom>Вы должны вве�ти что-либо дл� пои�ка. Попробуйте еще раз.&#13;
 </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_404</word_key>
-      <word_default>We could not find the email error log entry you requested. Please try again.</word_default>
-      <word_custom>�евозможно найти запи�и в журнале. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_results</word_key>
-      <word_default> (Search Results)</word_default>
-      <word_custom> (Результаты пои�ка)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_title</word_key>
-      <word_default>Email Error Log Manager</word_default>
-      <word_custom>Управление журналом ошибок e-mail �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>erlog_removed</word_key>
-      <word_default>Removed email error log entries.</word_default>
-      <word_custom>Запи�и в журнале удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_email_err_logs</word_key>
-      <word_default>Email Error Logs</word_default>
-      <word_custom>Журнал ошибок e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -7688,1549 +7031,384 @@
       <word_key>erlog_noneselected</word_key>
       <word_default>You did not select any email error log entries to remove. Please try again.</word_default>
       <word_custom>Вы не выбрали запи�и в журнале дл� удалени�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_emaillogs</word_key>
-      <word_default>Email Logs</word_default>
-      <word_custom>Журнал e-mail �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_title</word_key>
+      <word_default>Email Error Log Manager</word_default>
+      <word_custom>Управление журналом ошибок e-mail �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_subject</word_key>
-      <word_default><![CDATA[<strong>Subject:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тема:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_ip</word_key>
-      <word_default><![CDATA[<strong>From IP:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>IP:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_to</word_key>
-      <word_default><![CDATA[<strong>To:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Кому:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_sent</word_key>
-      <word_default><![CDATA[<strong>Sent:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дата:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_searchbutton</word_key>
-      <word_default>Search</word_default>
-      <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_from</word_key>
-      <word_default><![CDATA[<strong>From:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>От:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_searchwhere</word_key>
-      <word_default><![CDATA[<strong>Search where</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пои�к в</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_removeall</word_key>
-      <word_default>Remove All?</word_default>
-      <word_custom>Удалить в�е?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_search</word_key>
-      <word_default>Search Email Logs</word_default>
-      <word_custom>Пои�к запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_removechecked</word_key>
-      <word_default>Remove Checked</word_default>
-      <word_custom>Удалить отмеченные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_noresults</word_key>
-      <word_default><![CDATA[<strong>No Email Logs Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пи�ьма не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_byid</word_key>
-      <word_default>..by ID</word_default>
-      <word_custom>по ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_profile</word_key>
-      <word_default><![CDATA[Member's Profile (New Window)]]></word_default>
-      <word_custom>Профиль пользовател� (В новом окне))</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_read</word_key>
-      <word_default>Read email...</word_default>
-      <word_custom>Проче�ть пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_show_title</word_key>
-      <word_default>Show all from this member</word_default>
-      <word_custom>Показать в�е от �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_loose</word_key>
-      <word_default>contains</word_default>
-      <word_custom>�одержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_theemails</word_key>
-      <word_default>Logged Emails</word_default>
-      <word_custom>Спи�ок отправленных пи�ем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_exactly</word_key>
-      <word_default>is exactly</word_default>
-      <word_custom>точно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_to_name</word_key>
-      <word_default>To Member</word_default>
-      <word_custom>Кому</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_to</word_key>
-      <word_default>To Email Address</word_default>
-      <word_custom>Кому (E-mail)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_from_name</word_key>
-      <word_default>From Member</word_default>
-      <word_custom>От</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_from</word_key>
-      <word_default>From Email Address</word_default>
-      <word_custom>От (E-mail)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_body</word_key>
-      <word_default>Email Body</word_default>
-      <word_custom>Сообщение об ошибке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_subject</word_key>
-      <word_default>Email Subject</word_default>
-      <word_custom>Тема пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_log_404</word_key>
-      <word_default>We could not find the email error log entry you requested.</word_default>
-      <word_custom>�евозможно найти запи�ь в журнале.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_nomatches</word_key>
-      <word_default>No matches found in the email logs.</word_default>
-      <word_custom>Совпадений не найдено в журнале.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>elog_results</word_key>
+      <word_key>erlog_results</word_key>
       <word_default> (Search Results)</word_default>
       <word_custom> (Результаты пои�ка)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_notsearched</word_key>
-      <word_default>You must enter something to search by. Please try again.</word_default>
-      <word_custom>Дл� пои�ка вы должны вве�ти что-либо. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_toemail</word_key>
+      <word_default>To Email Address</word_default>
+      <word_custom>Кому (E-mail)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_title</word_key>
-      <word_default>Email Logs Manager</word_default>
-      <word_custom>Управление журналом e-mail �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_removed</word_key>
+      <word_default>Removed email error log entries.</word_default>
+      <word_custom>Запи�и в журнале удалены</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_removed</word_key>
-      <word_default>Removed email log entreis.</word_default>
-      <word_custom>Запи�и в журнале удалены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_noinfo</word_key>
+      <word_default><![CDATA[<em>No Info</em>]]></word_default>
+      <word_custom><![CDATA[<em>�ет информации</em>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>mlog_modlogs</word_key>
-      <word_default>Moderator Logs</word_default>
-      <word_custom>Журнал модерировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_subject</word_key>
+      <word_default>Email Subject</word_default>
+      <word_custom>Тема пи�ьма</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>elog_noneselected</word_key>
-      <word_default>You did not select any email log entries to remove. Please try again.</word_default>
-      <word_custom>Вы не выбрали запи�и в журнале дл� удалени�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_fromemail</word_key>
+      <word_default>From Email Address</word_default>
+      <word_custom>От (E-mail)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>mlog_searchbutton</word_key>
-      <word_default>Search</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_searchin</word_key>
-      <word_default>Search in...</word_default>
-      <word_custom>И�кать в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_searchfor</word_key>
-      <word_default>Search for...</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_search</word_key>
-      <word_default>Search Moderator Logs</word_default>
-      <word_custom>Пои�к дей�твий в журнале</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_removeall</word_key>
-      <word_default>Remove All By Member</word_default>
-      <word_custom>Удаление в�ех дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_viewall</word_key>
-      <word_default>View All By Member</word_default>
-      <word_custom>Про�мотр в�ех дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_thelogs</word_key>
-      <word_default>Saved Moderator Logs</word_default>
-      <word_custom>Журнал модерировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_topictitle</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_noresults</word_key>
-      <word_default>No mobile notification log entries</word_default>
-      <word_custom><![CDATA[<strong>Дей�тви� не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_forum</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_action</word_key>
-      <word_default>Action Performed</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Модератор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_last5</word_key>
-      <word_default>Last 5 Moderator Actions</word_default>
-      <word_custom>По�ледние 5 дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_fid</word_key>
-      <word_default>Forum ID</word_default>
-      <word_custom>ID форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Модератор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_tid</word_key>
-      <word_default>Topic ID</word_default>
-      <word_custom>ID темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_removed</word_key>
-      <word_default>Removed Moderator Logs for member ID: </word_default>
-      <word_custom>Удаленные дей�тви� модерировани� дл� ID пользовател�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_noid</word_key>
-      <word_default>You did not select a member ID to remove by. Please try again.</word_default>
-      <word_custom>Вы не указали номер (ID) пользовател�, которого хотите удалить. Пожалуй�та, попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_topicid</word_key>
-      <word_default><![CDATA[<br />Topic ID: ]]></word_default>
-      <word_custom><![CDATA[<br />ID темы: ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_whatfield</word_key>
-      <word_default>We could not determine what field you were attempting to search. Please try again.</word_default>
-      <word_custom>�евозможно определить поле дл� пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_nostring</word_key>
-      <word_default>You must enter a search string. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_warn_logs</word_key>
-      <word_default>Warn Logs</word_default>
-      <word_custom>Журнал предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_title</word_key>
-      <word_default>Moderator Logs Manager</word_default>
-      <word_custom>Управление журналом модерировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_log_subject</word_key>
-      <word_default><![CDATA[<strong>Subject:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тема:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_log_sent</word_key>
-      <word_default><![CDATA[<strong>Sent:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дата:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_log_to</word_key>
-      <word_default><![CDATA[<strong>To:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Кому:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_log_from</word_key>
-      <word_default><![CDATA[<strong>From:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>От:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_warnnotes</word_key>
-      <word_default>Warn Notes</word_default>
-      <word_custom>Заметка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_viewnotes</word_key>
-      <word_default>View Notes</word_default>
-      <word_custom>Заметка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_susp</word_key>
-      <word_default>Suspended</word_default>
-      <word_custom>Блокировка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_nopost</word_key>
-      <word_default>Disabled Posting</word_default>
-      <word_custom>Запрет отправки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_modq</word_key>
-      <word_default>Mod Queue</word_default>
-      <word_custom>Премодераци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_searchfor</word_key>
-      <word_default>Search in...</word_default>
-      <word_custom>И�кать в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_searchbutton</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_searchin</word_key>
-      <word_default>Search for...</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_search</word_key>
-      <word_default>Search Warn Logs</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_viewlog</word_key>
-      <word_default>View</word_default>
-      <word_custom>По�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_removeall</word_key>
-      <word_default>Remove All By Member</word_default>
-      <word_custom>Удаление запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_times</word_key>
-      <word_default>Times Warned</word_default>
-      <word_custom>Кол-во предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_viewall</word_key>
-      <word_default>View All By Member</word_default>
-      <word_custom>Про�мотр запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_thelogs</word_key>
-      <word_default>Saved Warn Logs</word_default>
-      <word_custom>Журнал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_warnedby</word_key>
-      <word_default>Warned By</word_default>
-      <word_custom>Предупредил</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_noresults</word_key>
-      <word_default><![CDATA[<strong>No Warn Logs Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Предупреждени� не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_wascontacted</word_key>
-      <word_default>Contacted?</word_default>
-      <word_custom>Уведомлен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_warned</word_key>
-      <word_default>Warned Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_type</word_key>
-      <word_default>Type</word_default>
-      <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_last10</word_key>
-      <word_default>Last 10 Warn Entries</word_default>
-      <word_custom>По�ледние 10 предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_notes</word_key>
-      <word_default>Entry Notes</word_default>
-      <word_custom>Заметки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_emailpm</word_key>
-      <word_default>Email/PM Sent</word_default>
-      <word_custom>Отправлено e-mail/ЛС</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_email</word_key>
-      <word_default>Email</word_default>
-      <word_custom>E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_cantresolve</word_key>
-      <word_default>We cannot resolve the warn log ID. Please try again.</word_default>
-      <word_custom>�евозможно определить ID запи�и в журнале. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_pm</word_key>
-      <word_default>PM</word_default>
-      <word_custom>ЛС</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_contacted</word_key>
-      <word_default>View email</word_default>
-      <word_custom>По�мотреть e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>wlog_nologs</word_key>
-      <word_default>We oculd not find the warn log entry. Please try again.</word_default>
+      <word_key>erlog_404</word_key>
+      <word_default>We could not find the email error log entry you requested. Please try again.</word_default>
       <word_custom>�евозможно найти запи�и в журнале. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_showmessage</word_key>
-      <word_default>Show message</word_default>
-      <word_custom>По�мотреть �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_error</word_key>
+      <word_default>Error Message</word_default>
+      <word_custom>Ошибка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_removelogs</word_key>
-      <word_default>Removed warn logs for member ID:(%s)</word_default>
-      <word_custom>Удалены запи�и дл� пользовател� №: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_loose</word_key>
+      <word_default>contains</word_default>
+      <word_custom>�одержит</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_nofind</word_key>
-      <word_default>We could not find the member whose warn logs you were attempting to remove. Please try again.</word_default>
-      <word_custom>�евозможно найти пользовател�, запи�и которого вы пытаете�ь удалить. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_exact</word_key>
+      <word_default>is exactly</word_default>
+      <word_custom>точно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_log</word_key>
-      <word_default>Log</word_default>
-      <word_custom>Журнал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_to</word_key>
+      <word_default>To</word_default>
+      <word_custom>Кому</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_hours</word_key>
-      <word_default>Hours</word_default>
-      <word_custom>Ча�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_thelogs</word_key>
+      <word_default>Logged Email Errors</word_default>
+      <word_custom>Спи�ок неотправленных пи�ем</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_deleted</word_key>
-      <word_default>Deleted Member (ID:%s)</word_default>
-      <word_custom>Удаленный пользователь (ID:%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_noresults</word_key>
+      <word_default><![CDATA[<strong>No Email Error Logs Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Ошибки не найдены</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_reademail</word_key>
+      <word_default>Read Email</word_default>
+      <word_custom>Читать пи�ьмо</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_days</word_key>
-      <word_default>Days</word_default>
-      <word_custom>Дни</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_title</word_key>
-      <word_default>Warn Logs Manager</word_default>
-      <word_custom>Журнал предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_removechecked</word_key>
+      <word_default>Remove Checked</word_default>
+      <word_custom>Удалить отмеченные</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>wlog_nostring</word_key>
-      <word_default>You must enter a search string. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_removeall</word_key>
+      <word_default>Remove All?</word_default>
+      <word_custom>Удалить в�е?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_spider_logs</word_key>
-      <word_default>Spider Logs</word_default>
-      <word_custom>Журнал по�ещений пои�ковых ботов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP-адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_time</word_key>
-      <word_default>Time of Action</word_default>
-      <word_custom>Врем� дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_querystring</word_key>
-      <word_default>Query String</word_default>
-      <word_custom>Строка запро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_searchbutton</word_key>
+      <word_key>erlog_searchbutton</word_key>
       <word_default>Search</word_default>
       <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_searchquery</word_key>
-      <word_default> in query string</word_default>
-      <word_custom> в �троке запро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_searchwhere</word_key>
+      <word_default><![CDATA[<strong>Search where...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Пои�к в</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_searchfor</word_key>
-      <word_default>Search for...</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_search</word_key>
+      <word_default>Search Email Error Logs</word_default>
+      <word_custom>Пои�к запи�ей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_search</word_key>
-      <word_default>Search Spider Logs</word_default>
-      <word_custom>Пои�к дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_log_from</word_key>
+      <word_default><![CDATA[<strong>From:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>От:</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_noresults</word_key>
-      <word_default><![CDATA[<strong>No Spider Logs Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дей�тви� не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_log_subject</word_key>
+      <word_default><![CDATA[<strong>Subject</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тема</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>erlog_log_sent</word_key>
+      <word_default><![CDATA[<strong>Sent:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дата:</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_view</word_key>
+      <word_key>erlog_log_to</word_key>
+      <word_default><![CDATA[<strong>To:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Кому:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>erlog_ipberror</word_key>
+      <word_default>IP.Board Error Message: </word_default>
+      <word_custom>IP.Board �ообщение ошибки: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>erlog_smtperror</word_key>
+      <word_default>SMTP Error Message: </word_default>
+      <word_custom>SMTP �ообщение ошибки: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>erlog_smtpcode</word_key>
+      <word_default>SMTP Error Code: </word_default>
+      <word_custom>SMTP код ошибки: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_nostring</word_key>
+      <word_default>You must enter a search string. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти �троку пои�ка. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_title</word_key>
+      <word_default>Administration Logs Manager</word_default>
+      <word_custom>Управление журналом дей�твий админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_whoselog</word_key>
+      <word_default>We could not determine whose logs you were attempting to remove. Please try again.</word_default>
+      <word_custom>�евозможно определить, чью запи�ь в журнале вы пытаете�ь удалить. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_whatfield</word_key>
+      <word_default>We could not determine what field you were attempting to search.</word_default>
+      <word_custom>�евозможно определить поле дл� пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_id</word_key>
+      <word_default>Member ID</word_default>
+      <word_custom>ID админи�тратора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_performed</word_key>
+      <word_default>Action(s) Performed</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_view</word_key>
       <word_default>View</word_default>
       <word_custom>Про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_removeall</word_key>
-      <word_default>Remove All</word_default>
-      <word_custom>Удалить в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alog_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>slog_viewall</word_key>
-      <word_default>View All</word_default>
-      <word_custom>В�е дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_last</word_key>
-      <word_default>Last Hit</word_default>
-      <word_custom>Запущен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_hits</word_key>
-      <word_default>Logged Hits</word_default>
-      <word_custom>Хитов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_botname</word_key>
-      <word_default>Bot Name</word_default>
-      <word_custom>Пои�ковый робот</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_thelogs</word_key>
-      <word_default>Saved Search Engine Spider Logs</word_default>
-      <word_custom>Спи�ок дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_adminlog</word_key>
-      <word_default>Removed Search Engine Logs</word_default>
-      <word_custom>Удаленные дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_nologs</word_key>
-      <word_default>We could not find the bot logs you wish to remove. Please try again.</word_default>
-      <word_custom>�евозможно найти дей�тви� пои�кового робота.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_lofi</word_key>
-      <word_default>(Lo-Fi) </word_default>
-      <word_custom>Тек�това� вер�и� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_nostring</word_key>
-      <word_default>You must enter a search string.</word_default>
-      <word_custom>Вы должны вве�ти �троку пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_title</word_key>
-      <word_default>Search Engine Logs Manager</word_default>
-      <word_custom>Управление журналом пои�ковых ботов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>error_log_noresults</word_key>
-      <word_default><![CDATA[<strong>No Error Logs Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Ошибки не найдены</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>error_log_removed</word_key>
-      <word_default>Error Log(s) Removed</word_default>
-      <word_custom>Журнал ошибок удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>error_log_search</word_key>
-      <word_default>Search Error Logs</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>error_log_thelogs</word_key>
-      <word_default>Error Logs</word_default>
-      <word_custom>Журнал ошибок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>error_log_error</word_key>
+      <word_key>slog_list_msg</word_key>
       <word_default>Error Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Ошибка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>error_log_date</word_key>
+      <word_key>slog_list_code</word_key>
+      <word_default>Response</word_default>
+      <word_custom>Ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_list_date</word_key>
       <word_default>Date</word_default>
       <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>error_log_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP-адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sched_error_logs</word_key>
+      <word_default>Scheduler Logs</word_default>
+      <word_custom>Журнал задач</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>error_log_member</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>al_error_logs</word_key>
+      <word_default>Admin Login Logs</word_default>
+      <word_custom>Журнал авторизации админи�траторов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>error_log_uri</word_key>
-      <word_default>Error URI</word_default>
-      <word_custom>URI</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_spamlogs</word_key>
+      <word_default>Spam Service Logs</word_default>
+      <word_custom>Журнал �пам-�ерви�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>error_log_code</word_key>
-      <word_default>Error Code</word_default>
-      <word_custom>Код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>slog_list_id</word_key>
+      <word_default>ID</word_default>
+      <word_custom>ID</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>nav_logssplash</word_key>
-      <word_default>Logs</word_default>
-      <word_custom>Журнал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>api_error_logs</word_key>
+      <word_default>XML-RPC API Logs</word_default>
+      <word_custom>Журнал XML-RPC API</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>nav_toolsmodule</word_key>
-      <word_default><![CDATA[Tools &amp; Settings]]></word_default>
-      <word_custom>Ин�трументы и на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alog_searchin</word_key>
+      <word_default>Search in...</word_default>
+      <word_custom>И�кать в</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>choose_splash</word_key>
-      <word_default>Choose a log type to view</word_default>
-      <word_custom>Выберите журнал дл� про�мотра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_latest</word_key>
-      <word_default><![CDATA[<strong>Latest SQL Error Today</strong> (%s)<div style='white-space:pre;font-family:Monospace;overflow:auto'>%s</div>]]></word_default>
-      <word_custom><![CDATA[<strong>По�ледн�� SQL ошибка</strong> (%s)<div style='white-space:pre;font-family:Monospace;overflow:auto'>%s</div>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_noresults</word_key>
-      <word_default><![CDATA[There are no SQL logs to view. Don't be sad. It's a good thing.]]></word_default>
-      <word_custom>Хорошие ново�ти - в журнале нет запи�ей об ошибках в базе!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_size</word_key>
-      <word_default>File Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_date</word_key>
-      <word_default>File Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_name</word_key>
-      <word_default>File Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_title</word_key>
-      <word_default>SQL Error Logs</word_default>
-      <word_custom>Журнал ошибок SQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>mlog_sqlerrors</word_key>
-      <word_default>SQL Error Logs</word_default>
-      <word_custom>Журнал SQL ошибок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_nofile</word_key>
-      <word_default>Could not locate a log to open</word_default>
-      <word_custom>�е удало�ь найти файл журнала</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_more_file</word_key>
-      <word_default><![CDATA[Due to the size of this file, this is just the most recent 300 lines. You can download the full '%s' from your /cache directory]]></word_default>
-      <word_custom><![CDATA[Выведено только 300 по�ледних �трок из журнала. Получить полный журнал вы можете загрузив файл '%s' из директории /cache на вашем �ервере]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>sqllog_removed</word_key>
-      <word_default>SQL error log file removed</word_default>
-      <word_custom>Файл журнала ошибок удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>spamlog_sresults</word_key>
-      <word_default>We found %s records that matched your search term</word_default>
-      <word_custom>�айдено %s запи�ей, удовлетвор�ющих вашему запро�у</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>spamlog_searchbutton</word_key>
+      <word_key>alog_searchbutton</word_key>
       <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>�айти</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>spamlog_searchlabel</word_key>
-      <word_default>Search spam logs for: </word_default>
-      <word_custom>�айти:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alog_adminlogs</word_key>
+      <word_default>Admin Logs</word_default>
+      <word_custom>Журнал админи�траторов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_logs</word_pack>
-      <word_key>spamlog_searchh3</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alog_searchfor</word_key>
+      <word_default>Search for...</word_default>
+      <word_custom>И�кать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_saved</word_key>
+      <word_default>Saved Administration Logs</word_default>
+      <word_custom>Журнал админи�трировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_search</word_key>
+      <word_default>Search Admin Logs</word_default>
+      <word_custom>Пои�к дей�твий в журнале</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_removeall</word_key>
+      <word_default>Remove All By Member</word_default>
+      <word_custom>Удаление в�ех дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_viewall</word_key>
+      <word_default>View All By Member</word_default>
+      <word_custom>Про�мотр в�ех дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_list_email</word_key>
+      <word_default>E-Mail Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9238,9 +7416,34 @@
       <word_key>slog_response_2</word_key>
       <word_default>Possibly spam</word_default>
       <word_custom>Веро�тно �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_response_1</word_key>
+      <word_default>Probably not spam</word_default>
+      <word_custom>�е �памер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_response_0</word_key>
+      <word_default>Service Error</word_default>
+      <word_custom>Ошибка �ерви�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>sslog_noresults</word_key>
+      <word_default>No spam log entries</word_default>
+      <word_custom>Запи�ей не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_list_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9248,9 +7451,6 @@
       <word_key>slog_response_3</word_key>
       <word_default>Likely spam</word_default>
       <word_custom>Возможно �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9258,29 +7458,6 @@
       <word_key>slog_response_4</word_key>
       <word_default>Known spammer</word_default>
       <word_custom>Изве�тный �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_api_connected</word_key>
-      <word_default>Test Spam API Connection Successfull!</word_default>
-      <word_custom>Проверка �оединени� � Antispam у�пешна</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_logs</word_pack>
-      <word_key>slog_api_failed</word_key>
-      <word_default>Test Spam API Connection Failed</word_default>
-      <word_custom>Проверка �оединени� � Antispam неудачна</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9288,9 +7465,20 @@
       <word_key>mlog_mobilelogs</word_key>
       <word_default>Mobile Notifications Log</word_default>
       <word_custom>Журнал уведомлений мобильных клиентов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_api_failed</word_key>
+      <word_default>Test Spam API Connection Failed</word_default>
+      <word_custom>Проверка �оединени� � Antispam неудачна</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>slog_api_connected</word_key>
+      <word_default>Test Spam API Connection Successfull!</word_default>
+      <word_custom>Проверка �оединени� � Antispam у�пешна</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9298,9 +7486,6 @@
       <word_key>mlog_list_id</word_key>
       <word_default>ID</word_default>
       <word_custom>ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9308,9 +7493,6 @@
       <word_key>mlog_list_date</word_key>
       <word_default>Date</word_default>
       <word_custom>Врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9318,9 +7500,62 @@
       <word_key>mlog_list_notification</word_key>
       <word_default>Notification</word_default>
       <word_custom>Уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_last5</word_key>
+      <word_default>Last 5 Admin Actions</word_default>
+      <word_custom>По�ледние 5 дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_noresults</word_key>
+      <word_default>No Results</word_default>
+      <word_custom>�ет результатов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_sec</word_key>
+      <word_default>Section</word_default>
+      <word_custom>Раздел</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_do</word_key>
+      <word_default>do= {URL parameter}</word_default>
+      <word_custom>do= {URL параметр} </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_mod</word_key>
+      <word_default>Module</word_default>
+      <word_custom>Модуль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>alog_app</word_key>
+      <word_default>Application</word_default>
+      <word_custom>Приложение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9328,9 +7563,6 @@
       <word_key>mlog_list_member</word_key>
       <word_default>Sent To</word_default>
       <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9338,9 +7570,6 @@
       <word_key>mlog_list_sent</word_key>
       <word_default>Sent</word_default>
       <word_custom>Введенные данные неверны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -9348,1316 +7577,111 @@
       <word_key>mobilog_noresults</word_key>
       <word_default>No mobile notification log entries</word_default>
       <word_custom>�ет запи�ей в журнале</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>stop_being_alarmed</word_key>
+      <word_default>Certain tasks can perform moderator actions, which will result in a log being generated here.  The task can be kicked off by any user, including search engine spiders and guests.  Please do not be alarmed if you notice unrecognizable IP addresses or logs from guests.</word_default>
+      <word_custom>�екоторые задачи могут выполн�ть модератор�кие дей�тви�. Задачи запу�кают�� любым пользователей, в том чи�ле и пои�ковыми роботами. Пожалуй�та не паникуйте, е�ли увидели в журнале неизве�тные IP адре�а у некоторых модератор�ких дей�твий.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_logs</word_pack>
+      <word_key>noname_availablm</word_key>
+      <word_default><![CDATA[<em>Deleted moderator or task-initiated</em>]]></word_default>
+      <word_custom><![CDATA[<em>Удаленный модератор или задача</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_newversion</word_key>
-      <word_default>New Version Available</word_default>
-      <word_custom>До�тупна нова� вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cp_missingemail</word_key>
+      <word_default>Email Address Missing</word_default>
+      <word_custom>�е указаны email адре�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_version</word_key>
-      <word_default>Version</word_default>
-      <word_custom>Вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cp_missingemail1</word_key>
+      <word_default>Your community incoming or outgoing email address is currently not specified.</word_default>
+      <word_custom>�дре�а почтовых �щиков дл� вход�щей и и�ход�щей почты � форума не указаны.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_updateavailable</word_key>
-      <word_default>Update Available Now</word_default>
-      <word_custom>Обновление до�тупно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>spam_service_disabled</word_key>
+      <word_default>Spam Monitoring Service Disabled</word_default>
+      <word_custom>�нти-�пам �ерви� отключен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_securityupdate</word_key>
-      <word_default>Security Update Available</word_default>
-      <word_custom>До�тупно обновление безопа�но�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>spam_service_disabled_msg</word_key>
+      <word_default><![CDATA[You are entitled to the Spam Monitoring Service, but it is currently disabled. The Spam Monitoring Service helps prevent spam registrations from your community. <a href='http://myipb.in/products/spammonitor/' target='_blank'>More Information</a>.]]></word_default>
+      <word_custom>Вам до�тупен �ерви� анти-�пама дл� вашего �ообще�тва, однако, он �ейча� выключен. Серви� позвол�ет улучшить защиту от �памеров.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_moreinformation</word_key>
-      <word_default>More Information</word_default>
+      <word_key>spam_service_error_msg</word_key>
+      <word_default>The last call to the Spam Monitoring Service resulted in an error (%s). If the problem persists, you may wish to contact technical support for assistance.</word_default>
+      <word_custom>По�леднее обращение к �ерви�у анти-�пама было � ошибкой (%s). Е�ли проблема повторит��, пожалуй�та, �в�жите�ь � техниче�кой поддержкой дл� проверки �оединени� и решени� проблемы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>spam_service_error</word_key>
+      <word_default>Spam Monitoring Service Error</word_default>
+      <word_custom>Ошибка при работе � анти-�пам �ерви�ом</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>details__posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>more_detailslink</word_key>
+      <word_default>More Details</word_default>
       <word_custom>Подробнее</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_resetwarning</word_key>
-      <word_default>Reset Warning</word_default>
-      <word_custom>Сбро�ить предупреждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>details__members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_warning_rebuild</word_key>
-      <word_default><![CDATA[You'll need to update all your skin caches to ensure the new template bits have been added correctly.<br /><br /><b>&gt;&gt; <a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>REBUILD ALL SKIN CACHES & REMOVE THIS WARNING</a> &lt;&lt;</b>]]></word_default>
-      <word_custom><![CDATA[�еобходимо о�уще�твить обновление в�ех кешей шаблонов,чтобы убедить��, что в�е изменени� в�тупили в �илу.<br /><br /><b>&gt;&gt; <a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>Обновить кеши в�ех �тилей</a> &lt;&lt;</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>admins_online</word_key>
+      <word_default>Admins online:</word_default>
+      <word_custom>�дмини�траторы в онлайне:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_upgrade_warning</word_key>
-      <word_default><![CDATA[IPB has detected that an upgrade has not been completed.  Your current version is %s, but you have the upgrade routines on your server for %s. Click <a href='%s/upgrade/index.php'>here</a> to complete.]]></word_default>
-      <word_custom><![CDATA[IPB обнаружил что обновление не закончено. Ваша текуща� вер�и� %s, но вы начали обновление до вер�ии %s. �ажмите <a href='%s/upgrade/index.php'>here</a> дл� завершени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>reg_chart_stats</word_key>
+      <word_default>Registrations over past %s days</word_default>
+      <word_custom>Реги�траций за по�ледние %s дней</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_emergency</word_key>
-      <word_default><![CDATA[Either you or one of your members encountered a skin error. The following took place automatically:<ul><li>They were asked to clear their skin settings</li><li>They were asked to click a link to attempt access in the ACP</li><li>The ACP picked up the skin error and rebuilt the skin ID cache, the default skin and it may have turned on safe mode skins</li></ul><b>What to do now</b><ul><li>Firstly, if you don't wish to use safe mode skins, check the CHMOD value of the 'skin_cache' directory to make sure IPB can write into that directory</li><li>If the permissions are correct, check your 'System Settings -&gt; General Configuration' settings to check the value of 'Safe Mode Skins' - disable if not required</li><li>As a precaution, rebuild all your skins by following the link below</li></ul><b>&gt;&gt; <a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>REBUILD ALL SKIN CACHES & REMOVE THIS WARNING</a> &lt;&lt;</b>]]></word_default>
-      <word_custom><![CDATA[У ва� или у одного из пользователей возникла ошибка �о �тилем. Были предприн�ты �ледующие дей�тви�:<ul>
-<li>Было предложено очи�тить на�тройки �тил�</li>
-<li>Было предложено перейти в админцентр</li>
-<li>Был обновлен кеш �тил� � ошибкой и, возможно, включены �тили безопа�ного режима</li></ul>
-<b>Что �ледует �делать ?</b><ul>
-<li>Во-первых, е�ли вы не хотите и�пользовать �тили безопа�ного режима, проверьте права до�тупа к директории 'skin_cache' и убедите�ь, что IPB может производить запи�ь файлов в нее.</li>
-<li>Е�ли права до�тупа верны, то проверьте на�тройку "Стили безопа�ного режима" в "Общих на�тройках" и выключите ее при необходимо�ти.</li>
-<li><b><a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>Обновите кеш �тилей дл� удалени� �того предупреждени�</a></li></ul>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cp_missingemail2</word_key>
+      <word_default>Configure Email Addresses</word_default>
+      <word_custom>�а�троить адре�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_installer_warning</word_key>
-      <word_default><![CDATA[Although the installer appears to be locked, we recommend you remove it from your server for security.<br />Simply remove <b>admin/install/index.php</b> from your installation to remove this message.]]></word_default>
-      <word_custom><![CDATA[�е �мотр� на то, что �крипт ин�талл�ции �и�темы заблокирован �и�темно, мы рекомендуем вам полно�тью удалить его � �ервера.<br />Сделать �то можно про�то удалив <b>admin/install/index.php</b> � �ервера.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_unlocked_warning</word_key>
-      <word_default><![CDATA[Remove <b>%s/install/index.php</b> from your server at once!<br />Leaving it on your server WILL compromise the security of your system.]]></word_default>
-      <word_custom><![CDATA[Удалите <b>admin/install/index.php</b> c вашего �ервера!<br />О�тавив �тот файл вы ри�куете безопа�но�тью.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_error</word_key>
-      <word_default>Error</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_php_warning</word_key>
-      <word_default><![CDATA[Invision Power Board requires at least PHP 5.0.0 to operate fully.<br />Some sections of the ACP may not operate until you upgrade.]]></word_default>
-      <word_custom><![CDATA[Дл� полноценного функционировани� Invision Power Board требует�� вер�и� не ниже PHP 5.0.0<br />�екоторые разделы �Ц могут не работать, пока вы не обновите вашу вер�ию PHP.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_timeofaction</word_key>
-      <word_default>Time of action</word_default>
-      <word_custom>Врем� дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_from</word_key>
-      <word_default>from</word_default>
-      <word_custom>из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_lastacpactions</word_key>
-      <word_default>Last 5 ACP Actions</word_default>
-      <word_custom>По�ледние 5 дей�твий �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_membername</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_latestadminlogins</word_key>
-      <word_default>Latest Admin Logins</word_default>
-      <word_custom>По�ледние по�ещени� �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_savenotes</word_key>
-      <word_default>Save Admin Notes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_registered</word_key>
-      <word_default>Registered</word_default>
-      <word_custom>Зареги�трирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_warning_converter</word_key>
-      <word_default><![CDATA[We recommend you lock the Converter System for security.<br />Simply visit <a href='%sapp=convert&amp;module=setup&amp;section=lock'>this page</a> to lock the converter and remove this message.]]></word_default>
-      <word_custom><![CDATA[Мы на�то�тельно рекомендуем вам удалить �и�тему конвертировани� форумов � �ервера.<br />Про�то удалите директорию <b>admin/applications_addon/ips/convert</b> � �ервера и данное предупреждение пропадет.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_ip</word_key>
-      <word_default>IP</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_yes</word_key>
-      <word_default>Yes</word_default>
-      <word_custom>Да</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_ipslatestnews</word_key>
-      <word_default>IPS Latest News</word_default>
-      <word_custom>По�ледние ново�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_adminvalidationqueue</word_key>
-      <word_default>Admin Validation Queue</word_default>
-      <word_custom>Очередь на активацию админи�тратором</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_more</word_key>
-      <word_default>MORE</word_default>
-      <word_custom>БОЛЬШЕ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_adminnotes</word_key>
-      <word_default>Admin Notes</word_default>
-      <word_custom>Заметки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_ipaddresses</word_key>
-      <word_default>IP addresses</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_usergroup</word_key>
-      <word_default>user group</word_default>
-      <word_custom>группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_systemsettings</word_key>
-      <word_default>system settings</word_default>
-      <word_custom>�и�темные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_members</word_key>
-      <word_default>members</word_default>
-      <word_custom>пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_find</word_key>
-      <word_default>Find</word_default>
-      <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_emoticonmanager</word_key>
-      <word_default>Emoticon Manager</word_default>
-      <word_custom>Смайлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_quicksearch</word_key>
-      <word_default>Quick Search</word_default>
-      <word_custom>Бы�трый пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_bulkmailer</word_key>
-      <word_default>Bulk Mailer</word_default>
-      <word_custom>Ра��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_langmanager</word_key>
-      <word_default>Language Manager</word_default>
-      <word_custom>Языки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_manageforums</word_key>
-      <word_default>Manage Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_skinmanager</word_key>
-      <word_default>Skin Manager</word_default>
-      <word_custom>Стили</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_managegroups</word_key>
-      <word_default>Manage User Groups</word_default>
-      <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_managevalidating</word_key>
-      <word_default>Manage Validation Queue</word_default>
-      <word_custom>Ожидающие активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_editsettings</word_key>
-      <word_default>Edit System Settings</word_default>
-      <word_custom>�а�тройки �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_managemembers</word_key>
-      <word_default>Manage Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_welcomeipb3</word_key>
-      <word_default>Welcome to IP.Board 3</word_default>
-      <word_custom>Панель управлени� IP.Board 3</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_bbcodeneedup</word_key>
-      <word_default>BBCodes Need Updating</word_default>
-      <word_custom>Приложение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_helpneedup</word_key>
-      <word_default>Help Files Need Updating</word_default>
-      <word_custom>Приложение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_clickhere_info</word_key>
-      <word_default>to reimport all apps to make sure your settings are up-to-date</word_default>
-      <word_custom>дл� импортировани� по�ледних на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_devnotes</word_key>
-      <word_default>Developer Notes</word_default>
-      <word_custom>Заметки разработчика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_clickhere</word_key>
-      <word_default>Click Here</word_default>
-      <word_custom>�ажмите зде�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_lastxmlexport</word_key>
-      <word_default>Last XML export</word_default>
-      <word_custom>По�леднее �к�портирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_settingsneedup</word_key>
-      <word_default>Settings Need Updating</word_default>
-      <word_custom>Обновите на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_modulessneedup</word_key>
-      <word_default>Modules Need Updating</word_default>
-      <word_custom>Приложение: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_taskssneedup</word_key>
-      <word_default>Tasks Need Updating</word_default>
-      <word_custom>Приложение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_lastimportrun</word_key>
-      <word_default>Last import run</word_default>
-      <word_custom>По�леднее импортирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_settingsupdated</word_key>
-      <word_default>settings.xml has been updated</word_default>
-      <word_custom><![CDATA["settings.xml" обновлен]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_boardoffline</word_key>
-      <word_default>Board Offline</word_default>
-      <word_custom>Форум закрыт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_boardoffline1</word_key>
-      <word_default>Your board is currently offline</word_default>
-      <word_custom>Форум в на�то�щее врем� закрыт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_boardoffline2</word_key>
-      <word_default>Turn Board Online</word_default>
-      <word_custom>Открыть форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_yourphpversion</word_key>
-      <word_default>Your PHP Version (%s) is insufficient</word_default>
-      <word_custom>�е�оответ�твующа� вер�и� PHP (%s) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_unfinishedupgrade</word_key>
-      <word_default>Unfinished Upgrade</word_default>
-      <word_custom>�езаконченное обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_unlocked_converter</word_key>
-      <word_default>Unlocked Converter Present</word_default>
-      <word_custom>�айден незаблокированный �крипт конвертации форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_converterpresent</word_key>
-      <word_default>Converter Present</word_default>
-      <word_custom>�айден �крипт конвертации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_unlockedinstaller</word_key>
-      <word_default>Unlocked Installer</word_default>
-      <word_custom>�езаблокированный ма�тер у�тановки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_installerpresent</word_key>
-      <word_default>Installer Present</word_default>
-      <word_custom>�айден у�тановщик �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_secondsago</word_key>
-      <word_default> seconds ago</word_default>
-      <word_custom> �екунд назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_minutesago</word_key>
-      <word_default> minutes ago</word_default>
-      <word_custom> минут назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_index</word_key>
-      <word_default>Index</word_default>
-      <word_custom>Главна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_spammeraccounts</word_key>
-      <word_default>Spammers</word_default>
-      <word_custom>Спамеры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_acpnotes</word_key>
-      <word_default>You can use this section to keep notes for all members who access the Admin CP. It is globally editable by all admins who have access to the dashboard.</word_default>
-      <word_custom>Вы можете и�пользовать �тот раздел, чтобы о�тавл�ть заметки в�ем пользовател�м, имеющим до�туп в �Ц. Эта функци� до�тупна в�ем админи�траторам, имеющим до�туп в �Ц.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>ds_log_all_desc</word_key>
-      <word_default><![CDATA[You have 'IPS_LOG_ALL' enabled which writes debug log files into /cache. This can quickly fill up a drive and affect performance. Please edit your initdata.php to turn this off when you have finished debugging]]></word_default>
-      <word_custom><![CDATA[В �и�теме включена на�тройка 'IPS_LOG_ALL'. Это может приве�ти к переполнению ди�ка, а также �казать�� на производительно�ти форума. Пожалуй�та отключите на�тройку в initdata.php, когда журналирование вам будет ненужно.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>fulltext_find</word_key>
-      <word_default>Enable Fulltext Searching...</word_default>
-      <word_custom>Включить полнотек�товый пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>ds_log_all_title</word_key>
-      <word_default>Log To File Enabled</word_default>
-      <word_custom>Включено журналирование в файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>fulltext_turnon</word_key>
-      <word_default>You are using the traditional search method but have disabled fulltext searching.  Fulltext searching provides for improved performance over traditional MySQL search lookups and should usually be enabled.</word_default>
-      <word_custom>Сейча� форум и�пользует обычный тип пои�к, полнотек�товый отключен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>rebuild_furl_cache</word_key>
-      <word_default>Rebuild FURL Cache</word_default>
-      <word_custom>Обновить кеш ЧПУ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>furlcache_outofdate_desc</word_key>
-      <word_default>The rule definitions for the %s application may be out of date.  </word_default>
-      <word_custom>Правила ЧПУ дл� %s приложени� могут быть у�таревшими.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>fulltext_off</word_key>
-      <word_default>Fulltext Search Disabled</word_default>
-      <word_custom>Полнотек�товый пои�к отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>furlcache_outofdate</word_key>
-      <word_default>FURL Cache Out Of Date</word_default>
-      <word_custom>Кеш ЧПУ у�тарел</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>minifywrite_head</word_key>
-      <word_default>Minify Disabled</word_default>
-      <word_custom>Minify отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>minifynot_writeable</word_key>
-      <word_default>You have Minify switched on in your settings but IP.Board cannot write to /cache/tmp. Please check permissions on that directory. If this message persists, please turn off minify.</word_default>
-      <word_custom>Minify включен в на�тройках вашего форума, но не может запи�ывать данные в папку /cache/tmp. Пожалуй�та, проверьте CHMOD права к ней. Е�ли �ообщение не уберет��, выключите Minify.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>pw_will_logout</word_key>
-      <word_default>Changing your password will log you out of the ACP upon submitting this form</word_default>
-      <word_custom>При изменении парол�, вам прийдет�� повторно войти в �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>changed_password</word_key>
-      <word_default>Administrator updated his password</word_default>
-      <word_custom>�дмини�тратор изменил пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>details_updated</word_key>
-      <word_default>Your details have been updated successfully</word_default>
-      <word_custom>Ваши данные у�пешно обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>changed_email</word_key>
-      <word_default>Administrator updated his email address to %s</word_default>
-      <word_custom>�дмини�тратор изменил e-mail адре� на %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_not_match_pw</word_key>
-      <word_default>The two passwords supplied did not match</word_default>
-      <word_custom>Введенные пароли не �оответ�твуют друг другу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_not_match</word_key>
-      <word_default>The email addresses supplied did not match</word_default>
-      <word_custom>Введенные e-mail адре�а не �оответ�твуют друг другу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_email_already_used</word_key>
-      <word_default>The email address you supplied is already in use</word_default>
-      <word_custom>Введенный e-mail адре� уже и�пользует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>already_using_email</word_key>
-      <word_default>You are already using that email address</word_default>
-      <word_custom>Вы уже и�пользуете �тот e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change__pass</word_key>
-      <word_default>New Password</word_default>
-      <word_custom>�овый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change__pass_confirm</word_key>
-      <word_default>Confirm New Password</word_default>
-      <word_custom>Подтверждение нового парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_nothing_update</word_key>
-      <word_default>You did not specify to change your email or password</word_default>
-      <word_custom>Вы не ввели ничего дл� изменени�  e-mail адре�а или парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_both_fields</word_key>
-      <word_default>You must fill in both fields</word_default>
-      <word_custom>Вы должны заполнить оба пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_pass_details</word_key>
-      <word_default>Only fill in the fields if you wish to change your password</word_default>
-      <word_custom>Заполните пол�, е�ли вы хотите изменить пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change__email</word_key>
-      <word_default>New Email Address</word_default>
-      <word_custom>�овый е-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change__email_confirm</word_key>
-      <word_default>Confirm New Email Address</word_default>
-      <word_custom>Подтверждение нового е-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change__confirm</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>change_email_details</word_key>
-      <word_default>Only fill in the fields if you wish to change your email address</word_default>
-      <word_custom>Заполните пол�, е�ли вы хотите изменить е-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>mycp_change_details</word_key>
-      <word_default>Change Details</word_default>
-      <word_custom>Изменение данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_title_expired</word_key>
-      <word_default>Support License Expired</word_default>
-      <word_custom>Лицензи� не активна</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_msg_expired</word_key>
-      <word_default>Your support license has expired, to continue receiving support and other services, please renew your license.</word_default>
-      <word_custom>Срок активно�ти вашей лицензии и�тек. Дл� возобновлени� �ерви�а поддержки и до�тупа к ди�трибутивам необходимо продлить лицензию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_title_notfound</word_key>
-      <word_default>URL License Missing</word_default>
-      <word_custom>От�ут�твует URL лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_msg_notfound</word_key>
-      <word_default><![CDATA[Your community is reporting a URL of '<b>%s</b>' which is not found in our system, please remove your key and then readd it with the correct URL, you can do this via the License Key section of the ACP.]]></word_default>
-      <word_custom><![CDATA[Ваше �ообще�тво '<b>%s</b>' не зареги�трировано в нашей �и�теме, пожалуй�та, �в�жите�ь � нашими менеджерами.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_title_nokey</word_key>
-      <word_default>License Key Missing</word_default>
-      <word_custom>От�ут�твует ключ лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>lc_msg_nokey</word_key>
-      <word_default><![CDATA[You have not entered your license key, <a href='%s'>click here</a> to enter it now and receive access to the services provided by your license!]]></word_default>
-      <word_custom><![CDATA[Вы не ввели ключ лицензии, <a href='%s'>нажмите зде�ь</a>, чтобы заполнить его �ейча�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_profilephotoerr_title</word_key>
-      <word_default>Your profile photo directory is not writable</word_default>
-      <word_custom>Директори� фотографий дл� профил� не имеет прав на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_profilephotoerr_msg</word_key>
-      <word_default><![CDATA[Please check the permissions on the profile photo directory '<b>%s</b>' and make sure that it is writable.]]></word_default>
-      <word_custom><![CDATA[Проверьте права до�тупа к директории '<b>%s</b>' и убедите�ь, что е�ть права на запи�ь]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_perfmodeon_title</word_key>
-      <word_default>Performance Mode Enabled</word_default>
-      <word_custom>Режим производительно�ти включен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_perfmodeon_msg</word_key>
-      <word_default>Some features, such as messenger, are disabled while performance mode is enabled.</word_default>
-      <word_custom>�екоторый возможно�ти, такие как личные �ообщени�, отключены в режиме производительно�ти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_gdnotinstalled_title</word_key>
-      <word_default>GD is not installed</word_default>
-      <word_custom>GD не у�тановлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_gdnotinstalled_msg</word_key>
-      <word_default>It appears that GD is not installed on your server, in order to use certain functionality, such as thumbnail generation, you will need to have it installed.</word_default>
-      <word_custom>Это значит, что GD не у�тановлена на вашем �ервере, дл� того чтобы и�пользовать функционал �оздани� иконок, необходимо у�тановить GD.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_availablenow</word_key>
-      <word_default>Available Now</word_default>
-      <word_custom>До�тупно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_ipsblogs</word_key>
-      <word_default>IPS Latest Blogs</word_default>
-      <word_custom>По�ледние блоги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_ipsbulletin</word_key>
-      <word_default>IP.Board Bulletin</word_default>
-      <word_custom>Сообщени� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_activeadmins</word_key>
-      <word_default>Active Admins</word_default>
-      <word_custom>По�ледние дей�тви� в �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_noticeupdate</word_key>
-      <word_default>NOTICE: UPDATE INFORMATION</word_default>
-      <word_custom>Информаци� по обновлению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_update_info</word_key>
-      <word_default><![CDATA[To download the latest update, please log into the <strong>IPS Client Center</strong> and navigate to <strong>Your Downloads</strong>]]></word_default>
-      <word_custom><![CDATA[Дл� �качивани� по�леднего обновлени�, войдите в <strong>клиент-центр IBResource</strong> и перейдите на �траницу <strong>Покупки</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_visitcc</word_key>
-      <word_default>VISIT IPS CLIENT AREA</word_default>
-      <word_custom>ПОСЕТИТЬ КЛИЕ�Т-ЦЕ�ТР</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_wannareset</word_key>
-      <word_default><![CDATA[Only proceed if you wish to reset this warning.<br />Resetting the warning will NOT perform the upgrade for you!]]></word_default>
-      <word_custom>Продолжение удалит �то предупреждение. Удаление �того предупреждени� �Е приведет к обновлению �и�темы!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_newversion_info</word_key>
-      <word_default>A new version of IP.Board is available now.</word_default>
-      <word_custom>До�тупна нова� вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>notificationcenter</word_key>
-      <word_default>Notification Center</word_default>
-      <word_custom>Уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>ipboardlicenseerror</word_key>
-      <word_default>IP.Board License Message</word_default>
-      <word_custom>Лицензи� на IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>licensenocomm</word_key>
-      <word_default>There was a problem communicating with the license verification server.</word_default>
-      <word_custom>Возникла проблема при �оединении � �ервером проверки лицензии.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>suhosin_badvalue4</word_key>
-      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.request.max_value_length' is 1000000, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
-      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.request.max_value_length' - 1000000, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>suhosin_badvalue3</word_key>
-      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.post.max_value_length' is 1000000, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
-      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.post.max_value_length' - 1000000, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>suhosin_badvalue2</word_key>
-      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.request.max_vars' is 4096, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
-      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.request.max_vars' - 4096, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>suhosin_badvalue1</word_key>
-      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.post.max_vars' is 4096, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
-      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.post.max_vars' - 4096, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>suhosin_notification</word_key>
-      <word_default>Suhosin Enabled</word_default>
-      <word_custom>Включен Suhosin патч дл� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_mycp</word_pack>
-      <word_key>cp_upgradefinishfolder_msg</word_key>
-      <word_default>We have detected that %s is present on your server.  You should remove this folder to prevent potential abuse.</word_default>
-      <word_custom>Обнаружено наличие директории %s на вашем �ервере. Вам необходимо удалить �ту директорию в цел�х безопа�но�ти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sphinxconfig_outofdate</word_key>
+      <word_default>Sphinx Config Out Of Date</word_default>
+      <word_custom>Файл конфигурации пои�кового индек�атора Sphinx у�тарел</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10665,29 +7689,867 @@
       <word_key>cp_upgradefinishfolder</word_key>
       <word_default>upgradeFinish Folder Detected</word_default>
       <word_custom>Обнаружена директори� upgradeFinish</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_newversion_link</word_key>
-      <word_default>Click here for more information.</word_default>
-      <word_custom>Подробнее</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rebuild_sphinx_config</word_key>
+      <word_default>Rebuild sphinx.conf file and cronjobs</word_default>
+      <word_custom>Обновить конфигурационный файл sphinx.conf и задачи cron</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_mycp</word_pack>
-      <word_key>cp_validations</word_key>
-      <word_default>Pending Validations</word_default>
+      <word_key>suhosin_notification</word_key>
+      <word_default>Suhosin Enabled</word_default>
+      <word_custom>Включен Suhosin патч дл� PHP</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_upgradefinishfolder_msg</word_key>
+      <word_default>We have detected that %s is present on your server. You should remove this folder to prevent potential abuse.</word_default>
+      <word_custom>Обнаружено наличие директории %s на вашем �ервере. Вам необходимо удалить �ту директорию в цел�х безопа�но�ти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>sphinxconfig_outofdate_desc</word_key>
+      <word_default><![CDATA[You have not downloaded the updated sphinx configuration file since you last installed or updated an application in IP.Board. This may cause your sphinx indexes to be out of date and potentially lead to issues with searching.<br /><br/>You should update your sphinx configuration file and cronjobs following any update:]]></word_default>
+      <word_custom><![CDATA[Ваш форум имеет не �амую по�леднюю вер�ию конфигурационного файла sphinx. Это может вызвать возможные потери или ошибки в пои�ке.<br /><br />Вы должны обновить sphinx конфигурационный файл и cronjobs:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>suhosin_badvalue1</word_key>
+      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.post.max_vars' is 4096, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
+      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.post.max_vars' - 4096, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_msg_notfound</word_key>
+      <word_default><![CDATA[Your community is reporting a URL of '<b>%s</b>' which is not found in our system, please remove your key and then readd it with the correct URL, you can do this via the License Key section of the ACP.]]></word_default>
+      <word_custom><![CDATA[Ваше �ообще�тво '<b>%s</b>' не зареги�трировано в нашей �и�теме, пожалуй�та, �в�жите�ь � нашими менеджерами.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>suhosin_badvalue2</word_key>
+      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.request.max_vars' is 4096, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
+      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.request.max_vars' - 4096, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change__confirm</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>mycp_change_details</word_key>
+      <word_default>Change Details</word_default>
+      <word_custom>Изменение данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change__email_confirm</word_key>
+      <word_default>Confirm New Email Address</word_default>
+      <word_custom>Подтверждение нового е-mail адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_pass_details</word_key>
+      <word_default>Only fill in the fields if you wish to change your password</word_default>
+      <word_custom>Заполните пол�, е�ли вы хотите изменить пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_msg_expired</word_key>
+      <word_default>Your support license has expired, to continue receiving support and other services, please renew your license.</word_default>
+      <word_custom>Срок активно�ти вашей лицензии и�тек. Дл� возобновлени� �ерви�а поддержки и до�тупа к ди�трибутивам необходимо продлить лицензию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_title_expired</word_key>
+      <word_default>Support License Expired</word_default>
+      <word_custom>Лицензи� не активна</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change__email</word_key>
+      <word_default>New Email Address</word_default>
+      <word_custom>�овый е-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_email_details</word_key>
+      <word_default>Only fill in the fields if you wish to change your email address</word_default>
+      <word_custom>Заполните пол�, е�ли вы хотите изменить е-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>details_updated</word_key>
+      <word_default>Your details have been updated successfully</word_default>
+      <word_custom>Ваши данные у�пешно обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>changed_password</word_key>
+      <word_default>Administrator updated their password</word_default>
+      <word_custom>�дмини�тратор изменил пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_not_match_pw</word_key>
+      <word_default>The two passwords supplied did not match</word_default>
+      <word_custom>Введенные пароли не �оответ�твуют друг другу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>changed_email</word_key>
+      <word_default>Administrator updated their email address to %s</word_default>
+      <word_custom>�дмини�тратор изменил e-mail адре� на %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_both_fields</word_key>
+      <word_default>You must fill in both fields</word_default>
+      <word_custom>Вы должны заполнить оба пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_email_already_used</word_key>
+      <word_default>The email address you supplied is already in use</word_default>
+      <word_custom>Введенный e-mail адре� уже и�пользует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>already_using_email</word_key>
+      <word_default>You are already using that email address</word_default>
+      <word_custom>Вы уже и�пользуете �тот e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_not_match</word_key>
+      <word_default>The email addresses supplied did not match</word_default>
+      <word_custom>Введенные e-mail адре�а не �оответ�твуют друг другу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>bad_email_supplied</word_key>
+      <word_default>You supplied an invalid email address</word_default>
+      <word_custom>Вы ввели неверный e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change_nothing_update</word_key>
+      <word_default>You did not specify to change your email or password</word_default>
+      <word_custom>Вы не ввели ничего дл� изменени�  e-mail адре�а или парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change__pass</word_key>
+      <word_default>New Password</word_default>
+      <word_custom>�овый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>change__pass_confirm</word_key>
+      <word_default>Confirm New Password</word_default>
+      <word_custom>Подтверждение нового парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>fulltext_off</word_key>
+      <word_default>Fulltext Search Disabled</word_default>
+      <word_custom>Полнотек�товый пои�к отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>furlcache_outofdate_desc</word_key>
+      <word_default>The rule definitions for the %s application may be out of date.  </word_default>
+      <word_custom>Правила ЧПУ дл� %s приложени� могут быть у�таревшими.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>rebuild_furl_cache</word_key>
+      <word_default>Rebuild FURL Cache</word_default>
+      <word_custom>Обновить кеш ЧПУ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>furlcache_outofdate</word_key>
+      <word_default>FURL Cache Out Of Date</word_default>
+      <word_custom>Кеш ЧПУ у�тарел</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>minifynot_writeable</word_key>
+      <word_default>You have Minify switched on in your settings but IP.Board cannot write to /cache/tmp. Please check permissions on that directory. If this message persists, please turn off minify.</word_default>
+      <word_custom>Minify включен в на�тройках вашего форума, но не может запи�ывать данные в папку /cache/tmp. Пожалуй�та, проверьте CHMOD права к ней. Е�ли �ообщение не уберет��, выключите Minify.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>minifywrite_head</word_key>
+      <word_default>Minify Disabled</word_default>
+      <word_custom>Minify отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>fulltext_turnon</word_key>
+      <word_default>You are using the traditional search method but have disabled fulltext searching.  Fulltext searching provides for improved performance over traditional MySQL search lookups and should usually be enabled.</word_default>
+      <word_custom>Сейча� форум и�пользует обычный тип пои�к, полнотек�товый отключен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>ds_log_all_desc</word_key>
+      <word_default><![CDATA[You have 'IPS_LOG_ALL' enabled which writes debug log files into /cache. This can quickly fill up a drive and affect performance. Please edit your initdata.php to turn this off when you have finished debugging]]></word_default>
+      <word_custom><![CDATA[В �и�теме включена на�тройка 'IPS_LOG_ALL'. Это может приве�ти к переполнению ди�ка, а также �казать�� на производительно�ти форума. Пожалуй�та отключите на�тройку в initdata.php, когда журналирование вам будет ненужно.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>ds_log_all_title</word_key>
+      <word_default>Log To File Enabled</word_default>
+      <word_custom>Включено журналирование в файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>fulltext_find</word_key>
+      <word_default>Enable Fulltext Searching...</word_default>
+      <word_custom>Включить полнотек�товый пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_acpnotes</word_key>
+      <word_default>You can use this section to keep notes for all members who access the Admin CP. It is globally editable by all admins who have access to the dashboard.</word_default>
+      <word_custom>Вы можете и�пользовать �тот раздел, чтобы о�тавл�ть заметки в�ем пользовател�м, имеющим до�туп в �Ц. Эта функци� до�тупна в�ем админи�траторам, имеющим до�туп в �Ц.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_spammeraccounts</word_key>
+      <word_default>Spammers</word_default>
+      <word_custom>Спамеры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_unlockedinstaller</word_key>
+      <word_default>Unlocked Installer</word_default>
+      <word_custom>�езаблокированный ма�тер у�тановки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_index</word_key>
+      <word_default>Index</word_default>
+      <word_custom>Главна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_unlocked_converter</word_key>
+      <word_default>Unlocked Converter Present</word_default>
+      <word_custom>�айден незаблокированный �крипт конвертации форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_secondsago</word_key>
+      <word_default> seconds ago</word_default>
+      <word_custom> �екунд назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_minutesago</word_key>
+      <word_default> minutes ago</word_default>
+      <word_custom> минут назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_installerpresent</word_key>
+      <word_default>Installer Present</word_default>
+      <word_custom>�айден у�тановщик �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_converterpresent</word_key>
+      <word_default>Converter Present</word_default>
+      <word_custom>�айден �крипт конвертации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_settingsupdated</word_key>
+      <word_default>settings.xml has been updated</word_default>
+      <word_custom><![CDATA["settings.xml" обновлен]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_boardoffline2</word_key>
+      <word_default>Turn Community Online</word_default>
+      <word_custom>Открыть форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_unfinishedupgrade</word_key>
+      <word_default>Unfinished Upgrade</word_default>
+      <word_custom>�езаконченное обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_yourphpversion</word_key>
+      <word_default>Your PHP Version (%s) is insufficient</word_default>
+      <word_custom>�е�оответ�твующа� вер�и� PHP (%s) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_helpneedup</word_key>
+      <word_default>Help Files Need Updating</word_default>
+      <word_custom>�еобходимо обновление разделов помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_devnotes</word_key>
+      <word_default>Developer Notes</word_default>
+      <word_custom>Заметки разработчика</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_boardoffline1</word_key>
+      <word_default>Your community is currently offline</word_default>
+      <word_custom>Форум в на�то�щее врем� закрыт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_bbcodeneedup</word_key>
+      <word_default>BBCodes Need Updating</word_default>
+      <word_custom>�еобходимо обновление BB-кодов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_boardoffline</word_key>
+      <word_default>Community Offline</word_default>
+      <word_custom>Форум закрыт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_clickhere_info</word_key>
+      <word_default>to reimport all apps to make sure your settings are up-to-date</word_default>
+      <word_custom>дл� импортировани� по�ледних на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_clickhere</word_key>
+      <word_default>Click Here</word_default>
+      <word_custom>�ажмите зде�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_taskssneedup</word_key>
+      <word_default>Tasks Need Updating</word_default>
+      <word_custom>�еобходимо обновление задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_modulessneedup</word_key>
+      <word_default>Modules Need Updating</word_default>
+      <word_custom>�еобходимо обновление модулей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_settingsneedup</word_key>
+      <word_default>Settings Need Updating</word_default>
+      <word_custom>�еобходимо обновление на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_performance</word_key>
+      <word_default>Performance Mode</word_default>
+      <word_custom>Режим производительно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_lastimportrun</word_key>
+      <word_default>Last import run</word_default>
+      <word_custom>По�леднее импортирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_lastxmlexport</word_key>
+      <word_default>Last XML export</word_default>
+      <word_custom>По�леднее �к�портирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_onlineusers</word_key>
+      <word_default>Online Users</word_default>
+      <word_custom>пользователей в онлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_serverload</word_key>
+      <word_default>Server Load</word_default>
+      <word_custom>загрузка �ервера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_welcomeipb3</word_key>
+      <word_default>Welcome to IP.Board %s</word_default>
+      <word_custom>Панель управлени� IP.Board 3</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_managemembers</word_key>
+      <word_default>Manage Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_editsettings</word_key>
+      <word_default>Edit System Settings</word_default>
+      <word_custom>�а�тройки �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_managevalidating</word_key>
+      <word_default>Manage Validation Queue</word_default>
       <word_custom>Ожидающие активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_skinmanager</word_key>
+      <word_default>Skin Manager</word_default>
+      <word_custom>Стили</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_managegroups</word_key>
+      <word_default>Manage User Groups</word_default>
+      <word_custom>Группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_langmanager</word_key>
+      <word_default>Language Manager</word_default>
+      <word_custom>Языки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_quicksearch</word_key>
+      <word_default>Quick Search</word_default>
+      <word_custom>Бы�трый пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_find</word_key>
+      <word_default>Find</word_default>
+      <word_custom>�айти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_bulkmailer</word_key>
+      <word_default>Bulk Mailer</word_default>
+      <word_custom>Ра��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_emoticonmanager</word_key>
+      <word_default>Emoticon Manager</word_default>
+      <word_custom>Смайлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_manageforums</word_key>
+      <word_default>Manage Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_systemsettings</word_key>
+      <word_default>system settings</word_default>
+      <word_custom>�и�темные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_members</word_key>
+      <word_default>members</word_default>
+      <word_custom>пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_adminnotes</word_key>
+      <word_default>Admin Notes</word_default>
+      <word_custom>Заметки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_ipaddresses</word_key>
+      <word_default>IP addresses</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_ipslatestnews</word_key>
+      <word_default>IPS Latest News</word_default>
+      <word_custom>По�ледние ново�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_usergroup</word_key>
+      <word_default>user group</word_default>
+      <word_custom>группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_more</word_key>
+      <word_default>MORE</word_default>
+      <word_custom>БОЛЬШЕ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_adminvalidationqueue</word_key>
+      <word_default>Admin Validation Queue</word_default>
+      <word_custom>Очередь на активацию админи�тратором</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_ip</word_key>
+      <word_default>IP</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_registered</word_key>
+      <word_default>Registered</word_default>
+      <word_custom>Зареги�трирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_savenotes</word_key>
+      <word_default>Save Admin Notes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_warning_converter</word_key>
+      <word_default><![CDATA[We recommend you lock the Converter System for security.<br />Simply visit <a href='%sapp=convert&amp;module=setup&amp;section=lock'>this page</a> to lock the converter and remove this message.]]></word_default>
+      <word_custom><![CDATA[Мы на�то�тельно рекомендуем вам удалить �и�тему конвертировани� форумов � �ервера.<br />Про�то удалите директорию <b>admin/applications_addon/ips/convert</b> � �ервера и данное предупреждение пропадет.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_latestadminlogins</word_key>
+      <word_default>Failed Admin Logins</word_default>
+      <word_custom>По�ледние по�ещени� �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_no_failed_logins</word_key>
+      <word_default>No failed logins to show</word_default>
+      <word_custom>�ет неудачных попыток входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_none_entered</word_key>
+      <word_default>None entered</word_default>
+      <word_custom>�ичего не введено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_seeall_logins</word_key>
+      <word_default>See All Logins</word_default>
+      <word_custom>В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_seeall</word_key>
+      <word_default>See All</word_default>
+      <word_custom>В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_from</word_key>
+      <word_default>from</word_default>
+      <word_custom>из</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_lastacpactions</word_key>
+      <word_default>Last 5 ACP Actions</word_default>
+      <word_custom>По�ледние 5 дей�твий �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_timeofaction</word_key>
+      <word_default>Time of action</word_default>
+      <word_custom>Врем� дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_error</word_key>
+      <word_default>Error</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_membername</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_php_warning</word_key>
+      <word_default><![CDATA[IP.Board requires at least PHP 5.0.0 to operate fully.<br />Some sections of the ACP may not operate until you upgrade.]]></word_default>
+      <word_custom><![CDATA[Дл� полноценного функционировани� Invision Power Board требует�� вер�и� не ниже PHP 5.0.0<br />�екоторые разделы �Ц могут не работать, пока вы не обновите вашу вер�ию PHP.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_unlocked_warning</word_key>
+      <word_default><![CDATA[Remove <b>%s/install/index.php</b> from your server at once!<br />Leaving it on your server WILL compromise the security of your system.]]></word_default>
+      <word_custom><![CDATA[Удалите <b>admin/install/index.php</b> c вашего �ервера!<br />О�тавив �тот файл вы ри�куете безопа�но�тью.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_upgrade_warning</word_key>
+      <word_default><![CDATA[IPB has detected that an upgrade has not been completed.  Your current version is %s, but you have the upgrade routines on your server for %s. Click <a href='%s/upgrade/index.php'>here</a> to complete.]]></word_default>
+      <word_custom><![CDATA[IPB обнаружил что обновление не закончено. Ваша текуща� вер�и� %s, но вы начали обновление до вер�ии %s. �ажмите <a href='%s/upgrade/index.php'>here</a> дл� завершени�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_installer_warning</word_key>
+      <word_default><![CDATA[Although the installer appears to be locked, we recommend you remove it from your server for security.<br />Simply remove <b>admin/install/index.php</b> from your installation to remove this message.]]></word_default>
+      <word_custom><![CDATA[�е �мотр� на то, что �крипт ин�талл�ции �и�темы заблокирован �и�темно, мы рекомендуем вам полно�тью удалить его � �ервера.<br />Сделать �то можно про�то удалив <b>admin/install/index.php</b> � �ервера.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_warning_rebuild</word_key>
+      <word_default><![CDATA[You'll need to update all your skin caches to ensure the new template bits have been added correctly.<br /><br /><b>&gt;&gt; <a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>REBUILD ALL SKIN CACHES & REMOVE THIS WARNING</a> &lt;&lt;</b>]]></word_default>
+      <word_custom><![CDATA[�еобходимо о�уще�твить обновление в�ех кешей шаблонов,чтобы убедить��, что в�е изменени� в�тупили в �илу.<br /><br /><b>&gt;&gt; <a href='%s&amp;app=core&amp;module=templates&amp;section=tools&amp;do=rebuildalltemplates&amp;removewarning=1'>Обновить кеши в�ех �тилей</a> &lt;&lt;</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_resetwarning</word_key>
+      <word_default>Reset Warning</word_default>
+      <word_custom>Сбро�ить предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_securityupdate</word_key>
+      <word_default>Security Update Available</word_default>
+      <word_custom>До�тупно обновление безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_moreinformation</word_key>
+      <word_default>More Information</word_default>
+      <word_custom>Подробнее</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_newversion</word_key>
+      <word_default>New Version Available</word_default>
+      <word_custom>До�тупна нова� вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_version</word_key>
+      <word_default>Version</word_default>
+      <word_custom>Вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_updateavailable</word_key>
+      <word_default>Update Available Now</word_default>
+      <word_custom>Обновление до�тупно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_availablenow</word_key>
+      <word_default>Available Now</word_default>
+      <word_custom>До�тупно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_ipsblogs</word_key>
+      <word_default>IPS Latest Blogs</word_default>
+      <word_custom>По�ледние блоги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_activeadmins</word_key>
+      <word_default>Active Admins</word_default>
+      <word_custom>По�ледние дей�тви� в �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_ipsbulletin</word_key>
+      <word_default>IP.Board Bulletin</word_default>
+      <word_custom>Сообщени� IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_noticeupdate</word_key>
+      <word_default>NOTICE: UPDATE INFORMATION</word_default>
+      <word_custom>Информаци� по обновлению</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_update_info</word_key>
+      <word_default><![CDATA[To download the latest update, please log into the <strong>IPS Client Center</strong> and navigate to <strong>Your Downloads</strong>]]></word_default>
+      <word_custom><![CDATA[Дл� �качивани� по�леднего обновлени�, войдите в <strong>клиент-центр IBResource</strong> и перейдите на �траницу <strong>Покупки</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_newversion_info</word_key>
+      <word_default>A new version of IP.Board is available now.</word_default>
+      <word_custom>До�тупна нова� вер�и� IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_wannareset</word_key>
+      <word_default><![CDATA[Only proceed if you wish to reset this warning.<br />Resetting the warning will NOT perform the upgrade for you!]]></word_default>
+      <word_custom>Продолжение удалит �то предупреждение. Удаление �того предупреждени� �Е приведет к обновлению �и�темы!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10695,9 +8557,13 @@
       <word_key>cp_validations_info</word_key>
       <word_default>There are %d accounts awaiting validation.</word_default>
       <word_custom>�а данный момент %s учетных запи�ей, ожидающих активации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_visitcc</word_key>
+      <word_default>VISIT IPS CLIENT AREA</word_default>
+      <word_custom>ПОСЕТИТЬ КЛИЕ�Т-ЦЕ�ТР</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10705,9 +8571,125 @@
       <word_key>cp_validations_review</word_key>
       <word_default>Click here to review.</word_default>
       <word_custom>Перейти к �пи�ку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_newversion_link</word_key>
+      <word_default>Click here for more information.</word_default>
+      <word_custom>Подробнее</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_validations</word_key>
+      <word_default>Pending Validations</word_default>
+      <word_custom>Ожидающие активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_title_notfound</word_key>
+      <word_default>URL License Missing</word_default>
+      <word_custom>От�ут�твует URL лицензии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>suhosin_badvalue3</word_key>
+      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.post.max_value_length' is 1000000, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
+      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.post.max_value_length' - 1000000, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_title_nokey</word_key>
+      <word_default>License Key Missing</word_default>
+      <word_custom>От�ут�твует ключ лицензии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>lc_msg_nokey</word_key>
+      <word_default><![CDATA[You have not entered your license key, <a href='%s'>click here</a> to enter it now and receive access to the services provided by your license!]]></word_default>
+      <word_custom><![CDATA[Вы не ввели ключ лицензии, <a href='%s'>нажмите зде�ь</a>, чтобы заполнить его �ейча�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_profilephotoerr_msg</word_key>
+      <word_default><![CDATA[Please check the permissions on the profile photo directory '<b>%s</b>' and make sure that it is writable.]]></word_default>
+      <word_custom><![CDATA[Проверьте права до�тупа к директории '<b>%s</b>' и убедите�ь, что е�ть права на запи�ь]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_profilephotoerr_title</word_key>
+      <word_default>Your profile photo directory is not writable</word_default>
+      <word_custom>Директори� фотографий дл� профил� не имеет прав на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_gdnotinstalled_msg</word_key>
+      <word_default>It appears that GD is not installed on your server, in order to use certain functionality, such as thumbnail generation, you will need to have it installed.</word_default>
+      <word_custom>Это значит, что GD не у�тановлена на вашем �ервере, дл� того чтобы и�пользовать функционал �оздани� иконок, необходимо у�тановить GD.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_gdnotinstalled_title</word_key>
+      <word_default>GD is not installed</word_default>
+      <word_custom>GD не у�тановлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_perfmodeon_msg</word_key>
+      <word_default>Some features, such as messenger, are disabled while performance mode is enabled.</word_default>
+      <word_custom>�екоторый возможно�ти, такие как личные �ообщени�, отключены в режиме производительно�ти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>cp_perfmodeon_title</word_key>
+      <word_default>Performance Mode Enabled</word_default>
+      <word_custom>Режим производительно�ти включен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>licensenocomm</word_key>
+      <word_default><![CDATA[There was a problem communicating with the license verification server.  Please <a href='%s'>click here</a> to test your connectivity.]]></word_default>
+      <word_custom>Возникла проблема при �оединении � �ервером проверки лицензии.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>notificationcenter</word_key>
+      <word_default>Notification Center</word_default>
+      <word_custom>Уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>ipboardlicenseerror</word_key>
+      <word_default>IP.Board License Message</word_default>
+      <word_custom>Лицензи� на IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>suhosin_badvalue4</word_key>
+      <word_default><![CDATA[The minimum recommended value for the configuration option 'suhosin.request.max_value_length' is 1000000, however your value is %s. <strong>Your host will need to change this in the php.ini file.</strong>]]></word_default>
+      <word_custom><![CDATA[Минимальное значение, рекомендуемое дл� опции 'suhosin.request.max_value_length' - 1000000, на вашей �и�теме значение %s. <strong>�еобходимо приве�ти значение в �оответ�твии � рекомендуемым, и�правив его в php.ini файле.</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_mycp</word_pack>
+      <word_key>failedlogin_viewdetails</word_key>
+      <word_default>View Details</word_default>
+      <word_custom>Подробнее</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10715,9 +8697,6 @@
       <word_key>pal_attach_attach_removal</word_key>
       <word_default>Removing Attachment...</word_default>
       <word_custom>Удаление прикрепленного файла...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10725,29 +8704,6 @@
       <word_key>pal_attach_attach_removed</word_key>
       <word_default>Attachment Removed</word_default>
       <word_custom>Прикрепленный файл удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_attach_insert</word_key>
-      <word_default>Insert attachment into text editor</word_default>
-      <word_custom>Добавить прикрепленный файл в �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_remove_warn</word_key>
-      <word_default>Proceed with attachment removal?</word_default>
-      <word_custom>Удалить прикрепленный файл ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10755,9 +8711,20 @@
       <word_key>pal_attach_ready</word_key>
       <word_default>Attachment system ready</word_default>
       <word_custom>Си�тема загрузки файлов готова</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_remove_warn</word_key>
+      <word_default>Proceed with attachment removal?</word_default>
+      <word_custom>Удалить прикрепленный файл ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_attach_insert</word_key>
+      <word_default>Insert attachment into text editor</word_default>
+      <word_custom>Добавить прикрепленный файл в �ообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10765,9 +8732,6 @@
       <word_key>pal_attach_attach_remove</word_key>
       <word_default>Delete attachment</word_default>
       <word_custom>Удалить прикрепленный файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10775,29 +8739,6 @@
       <word_key>pal_attach_no_upload_dir</word_key>
       <word_default>Upload failed. Please ask the administrator to ensure the uploads directory is available</word_default>
       <word_custom>Загрузка не удала�ь. Сообщите админи�тратору о неверных правах до�тупа к директории загружаемых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_no_upload_dir_perms</word_key>
-      <word_default>Upload failed. Please ask the administrator to ensure the uploads directory is writeable</word_default>
-      <word_custom>Загрузка не удала�ь. Пожалуй�та, �ообщите админи�тратору о неверных правах до�тупа к директории загружаемых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_invalid_mime_type</word_key>
-      <word_default>Upload failed. You are not permitted to upload this type of file</word_default>
-      <word_custom>Загрузка не удала�ь. Вам не разрешено загружать �тот тип файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10805,9 +8746,20 @@
       <word_key>pal_attach_no_upload</word_key>
       <word_default>Upload failed. You did not select a file to upload</word_default>
       <word_custom>Загрузка не удала�ь. �е выбран файл дл� загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_invalid_mime_type</word_key>
+      <word_default>Upload failed. You are not permitted to upload this type of file</word_default>
+      <word_custom>Загрузка не удала�ь. Вам не разрешено загружать �тот тип файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_no_upload_dir_perms</word_key>
+      <word_default>Upload failed. Please ask the administrator to ensure the uploads directory is writeable</word_default>
+      <word_custom>Загрузка не удала�ь. Пожалуй�та, �ообщите админи�тратору о неверных правах до�тупа к директории загружаемых файлов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10815,59 +8767,6 @@
       <word_key>pal_attach_upload_too_big</word_key>
       <word_default>Upload failed. The file was larger than the available space</word_default>
       <word_custom>Загрузка не удала�ь. Размер файла больше чем до�тупное про�тран�тво на ди�ке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_upload_failed</word_key>
-      <word_default>Upload failed. Please ask the administrator to check the settings and permissions</word_default>
-      <word_custom>Загрузка неудачна. Попро�ите админи�тратора проверить на�тройки и права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_upload_ok</word_key>
-      <word_default><![CDATA[Upload successful and is available from the 'Manage Current Attachments' menu]]></word_default>
-      <word_custom>Загрузка завершена у�пешно. Загруженные файлы до�тупны в «Управление текущими файлами»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_init_progress</word_key>
-      <word_default>Initializing Attachments...</word_default>
-      <word_custom>Инициализаци� прикрепленных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_no_items</word_key>
-      <word_default>There are no items currently</word_default>
-      <word_custom>В на�то�щее врем� �лементов нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_attach_uploading_file</word_key>
-      <word_default>Uploading File...</word_default>
-      <word_custom>Загрузка файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10875,29 +8774,41 @@
       <word_key>pal_view_raw_html</word_key>
       <word_default>View Raw HTML</word_default>
       <word_custom>�еобработанный HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_palette</word_pack>
-      <word_key>pal_view_wrapped_html</word_key>
-      <word_default>View Wrapped HTML</word_default>
-      <word_custom>Обработанный HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pal_attach_uploading_file</word_key>
+      <word_default>Uploading File...</word_default>
+      <word_custom>Загрузка файла</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_palette</word_pack>
-      <word_key>pal_extract_media</word_key>
-      <word_default>Extract Media...</word_default>
-      <word_custom>Извлечь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pal_attach_no_items</word_key>
+      <word_default>There are no items currently</word_default>
+      <word_custom>В на�то�щее врем� �лементов нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_init_progress</word_key>
+      <word_default>Initializing Attachments...</word_default>
+      <word_custom>Инициализаци� прикрепленных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_upload_ok</word_key>
+      <word_default><![CDATA[Upload successful and is available from the 'Manage Current Attachments' menu]]></word_default>
+      <word_custom>Загрузка завершена у�пешно. Загруженные файлы до�тупны в «Управление текущими файлами»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_attach_upload_failed</word_key>
+      <word_default>Upload failed. Please ask the administrator to check the settings and permissions</word_default>
+      <word_custom>Загрузка неудачна. Попро�ите админи�тратора проверить на�тройки и права до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10905,9 +8816,20 @@
       <word_key>pal_close_library</word_key>
       <word_default>Close Library</word_default>
       <word_custom>Закрыть библиотеку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_extract_media</word_key>
+      <word_default>Extract Media...</word_default>
+      <word_custom>Извлечь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_view_wrapped_html</word_key>
+      <word_default>View Wrapped HTML</word_default>
+      <word_custom>Обработанный HTML</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10915,9 +8837,6 @@
       <word_key>pal_bgroups</word_key>
       <word_default>B.Groups</word_default>
       <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10925,9 +8844,6 @@
       <word_key>pal_options</word_key>
       <word_default>Options</word_default>
       <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10935,19 +8851,6 @@
       <word_key>pal_blocks</word_key>
       <word_default>Blocks</word_default>
       <word_custom>Блоки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_templates</word_key>
-      <word_default>Templates</word_default>
-      <word_custom>Шаблоны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10955,9 +8858,13 @@
       <word_key>pal_urls</word_key>
       <word_default>URLs</word_default>
       <word_custom>URLs</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_templates</word_key>
+      <word_default>Templates</word_default>
+      <word_custom>Шаблоны</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10965,9 +8872,6 @@
       <word_key>pal_images</word_key>
       <word_default>Images</word_default>
       <word_custom>Изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10975,9 +8879,6 @@
       <word_key>pal_preview</word_key>
       <word_default>Preview</word_default>
       <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10985,19 +8886,6 @@
       <word_key>pal_no_open_editors_to_extract_med</word_key>
       <word_default>No open editors to extract media from</word_default>
       <word_custom>�и один редактор не открыт дл� загрузки видео из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_delete_item</word_key>
-      <word_default>Delete Item...</word_default>
-      <word_custom>Удалить �лемент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11005,9 +8893,13 @@
       <word_key>pal_url</word_key>
       <word_default>URL</word_default>
       <word_custom>URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_delete_item</word_key>
+      <word_default>Delete Item...</word_default>
+      <word_custom>Удалить �лемент</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11015,9 +8907,6 @@
       <word_key>pal_show_item</word_key>
       <word_default>Show Item...</word_default>
       <word_custom>Показать �лемент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11025,9 +8914,6 @@
       <word_key>pal_green_added_text</word_key>
       <word_default>Green: Added Text</word_default>
       <word_custom>Зеленый: добавленный тек�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11035,9 +8921,6 @@
       <word_key>pal_red_removed_text</word_key>
       <word_default>Red: Removed Text</word_default>
       <word_custom>Кра�ный: удаленный тек�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11045,9 +8928,6 @@
       <word_key>pal_template</word_key>
       <word_default>template</word_default>
       <word_custom>шаблон</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11055,9 +8935,6 @@
       <word_key>pal_back</word_key>
       <word_default>Back</word_default>
       <word_custom>�азад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11065,9 +8942,6 @@
       <word_key>pal_pages</word_key>
       <word_default>Pages</word_default>
       <word_custom>Страницы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11075,19 +8949,6 @@
       <word_key>pal_insert</word_key>
       <word_default>Insert...</word_default>
       <word_custom>В�тавить...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_legend</word_key>
-      <word_default>Legend</word_default>
-      <word_custom>Подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11095,9 +8956,13 @@
       <word_key>pal_insert_item</word_key>
       <word_default>Insert Item...</word_default>
       <word_custom>В�тавить �лемент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_legend</word_key>
+      <word_default>Legend</word_default>
+      <word_custom>Подпи�ь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11105,9 +8970,6 @@
       <word_key>pal_item</word_key>
       <word_default>Item</word_default>
       <word_custom>Элемент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11115,19 +8977,6 @@
       <word_key>pal_max_single_upload_size_1</word_key>
       <word_default>Max. single upload size</word_default>
       <word_custom>Мак�имальный размер загружаемого файла:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_palette</word_pack>
-      <word_key>pal_file_space_used</word_key>
-      <word_default>File space used</word_default>
-      <word_custom>Файловое про�тран�тво и�пользовано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11135,9 +8984,13 @@
       <word_key>pal_of</word_key>
       <word_default>of</word_default>
       <word_custom>из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_palette</word_pack>
+      <word_key>pal_file_space_used</word_key>
+      <word_default>File space used</word_default>
+      <word_custom>Файловое про�тран�тво и�пользовано</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11145,9 +8998,6 @@
       <word_key>pal_max_single_upload_size</word_key>
       <word_default>Max. single upload size:</word_default>
       <word_custom>Мак�имальный размер загружаемого файла:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11155,9 +9005,6 @@
       <word_key>pal_attachment_space_used</word_key>
       <word_default>Attachment space used</word_default>
       <word_custom>Ме�то под прикрепленные файлы и�пользовано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11165,9 +9012,6 @@
       <word_key>pal_upload</word_key>
       <word_default>UPLOAD</word_default>
       <word_custom>З�ГРУЗИТЬ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11175,1259 +9019,1329 @@
       <word_key>pal_select_a_file</word_key>
       <word_default>Select a file</word_default>
       <word_custom>Выберите файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>ctype__reports</word_key>
-      <word_default>Reported Content</word_default>
-      <word_custom>Проблемный контент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>emote_impexpo</word_key>
+      <word_default>Import / Export</word_default>
+      <word_custom>Импорт / Эк�порт</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>config_rc_settings</word_key>
-      <word_default>Configure Settings</word_default>
-      <word_custom>Изменить на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tag_already_alias</word_key>
+      <word_default><![CDATA[The tag %s is in use as an alias of <strong>%s</strong>]]></word_default>
+      <word_custom><![CDATA[Тег %s уже и�пользует�� как �иноним <strong>%s</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_menter_desc</word_key>
-      <word_default>Specify which groups can add themselves to reported conversations</word_default>
-      <word_custom>Выберите группы пользователей, которые �могут добавл�ть �еб� в об�уждени� жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_messages_enter</word_key>
-      <word_default>Groups that can add themselves to conversations</word_default>
-      <word_custom>Группы пользователей, которые могут добавл�ть �ебе в об�уждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_nostattitle</word_key>
-      <word_default>You must enter a status title</word_default>
-      <word_custom>Вы должны вве�ти название �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_minutes_info</word_key>
-      <word_default>How many minutes it takes to gain a single point. Points are used in displaying severity images.</word_default>
-      <word_custom>Количе�тво минут на один балл. Баллы и�пользуют�� дл� показа �оответ�твующего изображени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_minutes</word_key>
-      <word_default>Minutes to one point</word_default>
-      <word_custom>Минут на один балл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_pointsper</word_key>
-      <word_default>Points per report</word_default>
-      <word_custom>Баллов на жалобу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_pointsper_info</word_key>
-      <word_default>How many points a single report worth. Points are used in displaying severity images.</word_default>
-      <word_custom>Количе�тво баллов на жалобу. Баллы и�пользуют�� дл� показа �оответ�твующего изображени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_name_info</word_key>
-      <word_default>What would you like to call this status?</word_default>
-      <word_custom>Как бы вы назвали �тот �тату�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_create_status</word_key>
-      <word_default>Create Status</word_default>
-      <word_custom>Создать �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_edit_status</word_key>
-      <word_default>Edit Status</word_default>
-      <word_custom>Изменение �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_height</word_key>
-      <word_default>Height</word_default>
-      <word_custom>Вы�ота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_points</word_key>
+      <word_key>pointssuffix</word_key>
       <word_default>Points</word_default>
-      <word_custom>Баллы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>баллов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_points_info</word_key>
-      <word_default>How many points are needed to display graphic.</word_default>
-      <word_custom>Сколько необходимо баллов дл� показа изображени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_alpha_num</word_key>
+      <word_default>You may only use alpha-numeric characters in the bbcode tag and aliases</word_default>
+      <word_custom>В теге bb-кода можно и�пользовать только цифры и буквы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_confimage</word_key>
-      <word_default>Configure Image</word_default>
-      <word_custom>�а�тройка изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>must_use_unique_btag</word_key>
+      <word_default>You must supply a unique bbcode tag.</word_default>
+      <word_custom>�еобходимо и�пользовать уникальное значение дл� bb-код тега.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_width</word_key>
-      <word_default>Width</word_default>
-      <word_custom>Ширина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>import_complete</word_key>
+      <word_default>BBCode XML file import completed.</word_default>
+      <word_custom>Импорт XML файла BB-кода завершен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_image_info</word_key>
-      <word_default><![CDATA[Full path of image. You can use <i>&lt;&#35;IMG_DIR&#35;&gt;</i> to use a graphic from the user skin]]></word_default>
-      <word_custom><![CDATA[Полный путь к изображению. Вы можете и�пользовать <i>&lt;&#35;IMG_DIR&#35;&gt;</i> дл� и�пользовани� изображени� из пользователь�кого �тил�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_bbcode_found_delete</word_key>
+      <word_default>We could not find the BBCode you were attempting to delete.</word_default>
+      <word_custom>�е удало�ь определить какой код вы хотите удалить.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_safemode</word_key>
-      <word_default>Enable Safemode? (Cannot be deleted or edited by user)</word_default>
-      <word_custom>Включить безопа�ный режим ? (�е может быть изменен или удален пользователем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_import_app</word_key>
+      <word_default>%s: %s BBcode inserted, %s updated</word_default>
+      <word_custom>%s: %s BB-кодов добавлено, %s обновлено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_image</word_key>
-      <word_default>Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>upload_failed</word_key>
+      <word_default>Upload failed.  The BBCode XML file was missing, empty, or corrupted.</word_default>
+      <word_custom>Загрузка не удала�ь. XML файл � BB-кодами либо пу�т, либо �одержит неверную �труктуру.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_pluginenabled</word_key>
-      <word_default>Plugin Enabled</word_default>
-      <word_custom>Включить плагин?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_customregex_info</word_key>
+      <word_default>Use this field to define a regular expression to filter the option content through before outputting to the page.  If option value does not match expression, tag will not be parsed.</word_default>
+      <word_custom>И�пользуйте данное поле, чтобы указать регул�рное выражение, при помощи которого будет о�уще�твл�ть�� фильтраци� �одержимого, заключенного в теги бб-кода, при выводе. Е�ли �одержимое не удовлетвор�ет выражению, тег не будет обработан.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_groups_submit</word_key>
-      <word_default>Groups that can submit reports</word_default>
-      <word_custom>Группы пользователей, которые могут отправл�ть жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tag_already</word_key>
+      <word_default>The tag you entered is already in use.</word_default>
+      <word_custom>Тег уже и�пользует�� в �и�теме.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_groups_submit_info</word_key>
-      <word_default>Control which groups can submit reports in this plugin</word_default>
-      <word_custom>Выберите группы пользователей, которые �могут отправл�ть жалобы �того плагина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>must_use_content</word_key>
+      <word_default><![CDATA[You must use {content} somewhere in the BBCode replacement section unless 'Custom BBCode Single Tag Only' is set to 'yes'.]]></word_default>
+      <word_custom>Дл� не одиночных BB-кодов необходимо и�пользовать тег {content}</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_groups_info</word_key>
-      <word_default>Specify what groups can view and manage reports by this plugin. Specific permissions are handled by the plugin itself.</word_default>
-      <word_custom>Выберите группы пользователей, которые �могут про�матривать и управл�ть жалобами �того плагина. Специальные разрешени� плагин обрабатывает �ам.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>complete_form</word_key>
+      <word_default>You must complete the form fully.</word_default>
+      <word_custom>Вы должны заполнить форму полно�тью.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_groups</word_key>
-      <word_default>Groups that can view reports</word_default>
-      <word_custom>Группы пользователей, которые могут про�матривать жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_customregex</word_key>
+      <word_default>Option Regular Expression Filter</word_default>
+      <word_custom>Фильтр � и�пользованием регул�рных выражений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_editplugin</word_key>
-      <word_default>Edit Report Plugin</word_default>
-      <word_custom>Изменение плагина жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_bbcode_found_edit</word_key>
+      <word_default>We could not determine which BBCode you were attempting to edit.</word_default>
+      <word_custom>�е удало�ь определить какой код вы хотите отредактировать.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_authorurl</word_key>
-      <word_default>Author URL</word_default>
-      <word_custom>URL адре� �траницы автора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_test</word_key>
+      <word_default><![CDATA[<strong>BBCode Test:</strong><br /><br />]]></word_default>
+      <word_custom><![CDATA[<strong>Те�т BBCode:</strong><br /><br />  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_pluginfile</word_key>
-      <word_default>Plugin File</word_default>
-      <word_custom>Файл плагина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>new_bbcode</word_key>
+      <word_default>New BBCode Added</word_default>
+      <word_custom>Дополнительный BB-код добавлен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>must_use_option</word_key>
+      <word_default><![CDATA[You must use {option} somewhere in the BBCode replacement section or set 'Use Option in tag?' to 'no'.]]></word_default>
+      <word_custom>Дл� BB-кодов � опци�ми необходимо и�пользовать тег {option}</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_authorname</word_key>
-      <word_default>Author Name</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>edited_bbcode</word_key>
+      <word_default>Custom BBCode Edited</word_default>
+      <word_custom>Дополнительный BB-код изменен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_description</word_key>
-      <word_default>Brief Description</word_default>
-      <word_custom>Краткое опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_upload_failed</word_key>
+      <word_default>Upload failed.  The Media Tag XML file was missing, empty, or corrupted.</word_default>
+      <word_custom>Загрузка не удала�ь. XML файл не найден или поврежден.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_version</word_key>
-      <word_default>Version</word_default>
-      <word_custom>Вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_import_complete</word_key>
+      <word_default>Media Tag XML file import completed</word_default>
+      <word_custom>Импорт XML файла медиа-тегов завершен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_whatcall</word_key>
-      <word_default>If you categorized reports by plugin, what would you call this section?</word_default>
-      <word_custom>Как бы вы назвали жалобы �того плагина?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_replace_removed</word_key>
+      <word_default>Media Tag replacement removed.</word_default>
+      <word_custom>Медиа-тег удален</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_plugintitle</word_key>
-      <word_default>Plugin Title</word_default>
-      <word_custom>�азвание плагина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_error_name</word_key>
+      <word_default><![CDATA[<li>You must specify a Media Tag replacement title.</li>]]></word_default>
+      <word_custom><![CDATA[<li>Вы должны вве�ти название медиа-тега</li>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_registernew</word_key>
-      <word_default>Register New Report Plugin</word_default>
-      <word_custom>Реги�траци� нового плагина �и�темы жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_error_match</word_key>
+      <word_default><![CDATA[<li>You must specify a Media Tag match string.</li>]]></word_default>
+      <word_custom><![CDATA[<li>�еобходимо указать �троку �овпадени� медиа-тега.</li>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_activeplugins</word_key>
-      <word_default>Active Plugins</word_default>
-      <word_custom>Включенных плагинов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_error_replace</word_key>
+      <word_default><![CDATA[<li>You must specify Media Tag replacement HTML.</li>]]></word_default>
+      <word_custom><![CDATA[<li>Вы должны вве�ти шаблон замены медиа-тега.</li>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_graphstats</word_key>
-      <word_default>Graph Stats</word_default>
-      <word_custom>Стати�тиче�кий график </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_manager</word_key>
+      <word_default>Media Tag Manager</word_default>
+      <word_custom>Управление медиа-тегами</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_totalcomments</word_key>
-      <word_default>Total Comments</word_default>
-      <word_custom>В�его комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_edit</word_key>
+      <word_default>Add/Edit BBCode</word_default>
+      <word_custom>Добавить/Изменить BB-код</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_removeimg</word_key>
-      <word_default>Remove Image...</word_default>
-      <word_custom>Удалить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_title</word_key>
+      <word_default>Custom BBCode</word_default>
+      <word_custom>BB-код</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_totalreports</word_key>
-      <word_default>Total Reports</word_default>
-      <word_custom>В�его жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_tag_updated</word_key>
+      <word_default><![CDATA[Media Tag replacement '%s' updated]]></word_default>
+      <word_custom><![CDATA[Медиа-тег '%s' обновлен]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_editimg</word_key>
-      <word_default>Edit Image...</word_default>
-      <word_custom>Изменить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_tag_added</word_key>
+      <word_default><![CDATA[Media Tag replacement '%s' added.]]></word_default>
+      <word_custom><![CDATA[Медиа-тег '%s' добавлен]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_addimg</word_key>
-      <word_default>Add Image...</word_default>
-      <word_custom>Добавить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_editstatus</word_key>
-      <word_default>Edit Status...</word_default>
-      <word_custom>Изменить �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_removestatus</word_key>
-      <word_default>Remove Status...</word_default>
-      <word_custom>Удалить �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_active_report</word_key>
-      <word_default>Active Report</word_default>
-      <word_custom>�ктивна� жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_complete_report</word_key>
-      <word_default>Complete Report</word_default>
-      <word_custom>Завершить жалобу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_new_report</word_key>
-      <word_default>New Report</word_default>
-      <word_custom>�ова� жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_newstatus</word_key>
-      <word_default>Create New Status...</word_default>
-      <word_custom>Добавить �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_images</word_key>
-      <word_default>Images</word_default>
-      <word_custom>Изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_position</word_key>
-      <word_default>Position</word_default>
-      <word_custom>Позици�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_repstatsev</word_key>
-      <word_default><![CDATA[Report Statuses &amp; Severity]]></word_default>
-      <word_custom>Стату�ы жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_removeplugin</word_key>
-      <word_default>Remove Plugin...</word_default>
-      <word_custom>Удалить плагин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugindetails</word_key>
-      <word_default>Change Plugin Details...</word_default>
-      <word_custom>Изменить плагин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_editsettings</word_key>
-      <word_default>Edit Settings...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_toggleendis</word_key>
-      <word_default>Toggle Enabled/Disabled</word_default>
-      <word_custom>Переключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_enabled</word_key>
-      <word_default>Enabled</word_default>
-      <word_custom>Включен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_regnew</word_key>
-      <word_default>Register New Plugin...</word_default>
-      <word_custom>Зареги�трировать новый плагин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_author</word_key>
-      <word_default>Author</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_options</word_key>
+      <word_key>bbcode_options</word_key>
       <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Параметры</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_regplugins</word_key>
-      <word_default>Registered Report Plugins</word_default>
-      <word_custom>Зареги�трированные плагины жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>your_bbcodes</word_key>
+      <word_default>Your Custom BBcodes</word_default>
+      <word_custom>Пользователь�кие BB-коды</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_app</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_tag</word_key>
+      <word_default>Custom BBCode Tag</word_default>
+      <word_custom>Тег</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_points_sufix</word_key>
-      <word_default> Points</word_default>
-      <word_custom> Баллов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>test_parse</word_key>
+      <word_default>Test BBCode Parsing</word_default>
+      <word_custom>Проверка работы BB-кодов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>postform_badmd5</word_key>
-      <word_default>Key did not match</word_default>
-      <word_custom>Ключ не �овпадает �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_import</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импортировать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_supermod</word_key>
-      <word_default>Super moderators can view all the reports?</word_default>
-      <word_custom>Супермодераторы могут про�матривать в�е жалобы плагина?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>enter_test_parse</word_key>
+      <word_default>Enter the post content to test parse here</word_default>
+      <word_custom>Введите тек�т дл� проверки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_supermod_info</word_key>
-      <word_default>This plugin uses moderator assignments to determine what reports a moderator can see and manage. By default if a member is a super moderator he/she can see all the reports. Turning this off means moderator assignments are used exclusively.</word_default>
-      <word_custom>Плагин и�пользует ограничени� модераторов дл� определени� какие жалобы они могут видеть. По умолчанию, е�ли пользователь �вл�ет�� �упермодератором, то он может видеть в�е жалобы. Отключение �того приведет и�пользованию ограничений модераторов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>import_new_bbcode</word_key>
+      <word_default>Import New BBCodes</word_default>
+      <word_custom>Импортировать новые BB-коды</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_dlmod</word_key>
-      <word_default>Respect Download Manager moderator rights?</word_default>
-      <word_custom>Включить права Download Manager ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>upload_bbcode_dupe</word_key>
+      <word_default>Duplicate entries will not be imported</word_default>
+      <word_custom>Суще�твующие запи�и импортированы не будут.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_galmod</word_key>
-      <word_default>Respect Gallery moderator rights?</word_default>
-      <word_custom>Включить права Gallery ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>addnew_bbcode</word_key>
+      <word_default>Add BBCode</word_default>
+      <word_custom>Добавить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_last24</word_key>
-      <word_default>Reports in the last 24 hours</word_default>
-      <word_custom>Жалобы за по�ледние 24 ча�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>upload_bbcode_xml</word_key>
+      <word_default>Upload XML BBCode List</word_default>
+      <word_custom><![CDATA[ <strong>Загрузка XML �пи�ка BB-кодов </strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_top5</word_key>
-      <word_default>Top Five Moderators</word_default>
-      <word_custom>Топ 5 модераторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>export_bbcode_all</word_key>
+      <word_default>Export (Apps)</word_default>
+      <word_custom>Эк�порт в приложени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_statmanager</word_key>
-      <word_default>Status Manager</word_default>
-      <word_custom>Управление �тату�ами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>custom_bbcode_head</word_key>
+      <word_default>Custom BBCode</word_default>
+      <word_custom>Пользователь�кий BB-код</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_movedno</word_key>
-      <word_default>Report Status cannot be respositioned.</word_default>
-      <word_custom>Стату� жалобы не может быть изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>export_bbcode</word_key>
+      <word_default>Export (XML)</word_default>
+      <word_custom>Эк�портировать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_movedyes</word_key>
-      <word_default>Report Status Repositioned</word_default>
-      <word_custom>Стату� жалобы изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>edit_bbcode</word_key>
+      <word_default>Edit BBCode...</word_default>
+      <word_custom>Изменить BB-код</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>r_statsaved</word_key>
-      <word_default>Status Saved</word_default>
-      <word_custom>Стату� �охранен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_mtp</word_key>
-      <word_default><![CDATA['Minutes to Posts' must be numeric.]]></word_default>
-      <word_custom><![CDATA["Минут дл� �ообщени�" должно быть чи�лом]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_statcreated</word_key>
-      <word_default>Status Created</word_default>
-      <word_custom>Стату� �оздан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_ppr</word_key>
-      <word_default><![CDATA['Points Per Report' must be a non-decimal number.]]></word_default>
-      <word_custom>«Баллов на жалобу» должно быть целым чи�лом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_createnew</word_key>
-      <word_default>Create new status</word_default>
-      <word_custom>Добавить �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_statdel</word_key>
-      <word_default>Status Deleted</word_default>
-      <word_custom>Стату� удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_onecomplete</word_key>
-      <word_default><![CDATA[You need at least one 'Complete' status.]]></word_default>
-      <word_custom><![CDATA[�еобходим по крайней мере один  �тату� "Завершен".]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_invpar</word_key>
-      <word_default>Invalid Parameter</word_default>
-      <word_custom>�еверный параметр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_onenew</word_key>
-      <word_default><![CDATA[You need at least one 'New' status.]]></word_default>
-      <word_custom><![CDATA[�еобходим по крайней мере один "�овый" �тату�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_completenew</word_key>
-      <word_default><![CDATA[Cannot mark status as 'Complete' when it is already marked 'New']]></word_default>
-      <word_custom>�евозможно у�тановить �тату� «Завершена», когда у�тановлен �тату� «�ова�»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_newcomplete</word_key>
-      <word_default><![CDATA[Cannot mark status as 'New' when it is already marked 'Complete']]></word_default>
-      <word_custom>�евозможно у�тановить �тату� «�ова�», когда у�тановлен �тату� «Завершена»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_404status</word_key>
-      <word_default>You must enter a title for the status.</word_default>
-      <word_custom>�ужно вве�ти название дл� �того �тату�а.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_imgsaved</word_key>
-      <word_default>Image Saved</word_default>
-      <word_custom>Изображение �охранено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_changepoints</word_key>
-      <word_default>There is an image under this status using the same number of points. Please change the number of points.</word_default>
-      <word_custom>Другое изображение уже и�пользует�� � �тим количе�твом очков. Измените количе�тво очков.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_imgdel</word_key>
-      <word_default>Image Deleted</word_default>
-      <word_custom>Изображение удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_statsever</word_key>
-      <word_default><![CDATA[Statuses & Severity]]></word_default>
-      <word_custom>Стату�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugin_title</word_key>
-      <word_default>You can setup and manage your report center plugins in this section.</word_default>
-      <word_custom>В �том разделе вы можете управл�ть плагинами жалоб, а также у�тановить новые.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugmanager</word_key>
-      <word_default>Plugin Manager</word_default>
-      <word_custom>Управление плагинами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_deleteplug</word_key>
-      <word_default>Plugin Deleted</word_default>
-      <word_custom>Плагин удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_dellocked</word_key>
-      <word_default>This plugin is locked. It cannot be deleted.</word_default>
-      <word_custom>Плагин заблокирован и не может быть удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugin404</word_key>
-      <word_default>We could not find that plugin ID. Please try again.</word_default>
-      <word_custom>�евозможно найти ID плагина.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_deleteair</word_key>
-      <word_default><![CDATA[You can't delete air! For Shame...]]></word_default>
-      <word_custom>�ельз� удалить то, чего и так нет!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_pluglocked</word_key>
-      <word_default>This plugin is locked. You cannot change this file.</word_default>
-      <word_custom>Плагин заблокирован. Вы не можете изменить �тот файл.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugnoexist</word_key>
-      <word_default><![CDATA[Plugin doesn't exist.]]></word_default>
-      <word_custom>Плагин не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugupdated</word_key>
-      <word_default>Plugin Updated</word_default>
-      <word_custom>Плагин обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_finishplugin</word_key>
-      <word_default>Finish Plugin Settings</word_default>
-      <word_custom>Закончить на�тройку плагина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_plugincreate</word_key>
-      <word_default>Plugin Created</word_default>
-      <word_custom>Плагин �оздан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_404file</word_key>
-      <word_default>Plugin file does not exist.</word_default>
-      <word_custom>Файл плагина не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_missingfield</word_key>
-      <word_default>Missing required fields.</word_default>
-      <word_custom>�езаполнены об�зательные пол�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_incchar</word_key>
-      <word_default><![CDATA[Incorrect characters in 'Plugin File' box.]]></word_default>
-      <word_custom><![CDATA[�еверный �имвол в �троке 'Файл плагина'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_toggle</word_key>
-      <word_default>Plugin Toggled</word_default>
-      <word_custom>Плагин переключен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_overview_title</word_key>
-      <word_default>Report Center Overview</word_default>
-      <word_custom>Обзор жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_nodata</word_key>
-      <word_default>No Data</word_default>
-      <word_custom>�ет данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>r_overview</word_key>
-      <word_default>Overview</word_default>
-      <word_custom>Обзор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_import_info</word_key>
-      <word_default><![CDATA[Browse your computer for 'ipb_badwords.xml' or 'ipb_badwords.xml.gz'. Duplicate entries will not be imported.]]></word_default>
-      <word_custom><![CDATA[Выберите файл 'ipb_badwords.xml' или 'ipb_badwords.xml.gz' на вашем компьютере. Суще�твующие запи�и импортированы не будут..]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_import</word_key>
-      <word_default>Import Badword List</word_default>
-      <word_custom>Импортировать фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_import_upload</word_key>
-      <word_default><![CDATA[<b>Upload XML Badword List</b>]]></word_default>
-      <word_custom><![CDATA[<b>Загрузка XML-файла � фильтрами</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_export</word_key>
-      <word_default>Export Badword List</word_default>
-      <word_custom>Эк�портировать фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_before</word_key>
-      <word_default>Before</word_default>
-      <word_custom>Слово</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_after</word_key>
-      <word_default>After</word_default>
-      <word_custom>Замена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_method</word_key>
-      <word_default>Method</word_default>
-      <word_custom>Метод</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_current</word_key>
-      <word_default>Current Filters</word_default>
-      <word_custom>Спи�ок фильтров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_edit</word_key>
-      <word_default>Edit Badword Filter...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_remove</word_key>
-      <word_default>Remove Badword Filter...</word_default>
+      <word_key>delete_bbcode</word_key>
+      <word_default>Delete BBCode...</word_default>
       <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_add</word_key>
-      <word_default>Add New Filter</word_default>
-      <word_custom>Добавить фильтр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcode_header</word_key>
+      <word_default>Custom BBCodes</word_default>
+      <word_custom>Пользователь�кие BB-коды</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_edit_filter</word_key>
-      <word_default>Edit Filter</word_default>
-      <word_custom>Изменить фильтр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>import_bbcode_all</word_key>
+      <word_default>Import (Apps)</word_default>
+      <word_custom>Импорт из приложений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_upload_good</word_key>
-      <word_default>The badword list has been imported!</word_default>
-      <word_custom>Спи�ок фильтров у�пешно импортирован!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcache_title</word_key>
+      <word_default>Content Cache Enabled</word_default>
+      <word_custom>Кеширование �одержимого включено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_upload_wrong</word_key>
-      <word_default>The import failed. The XML file is either empty or in the wrong format. Please try again.</word_default>
-      <word_custom>�евозможно выполнить импортирование, по�кольку в XML файле ошибка или он не имеет запи�ей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcache_action</word_key>
+      <word_default>Drop all %s cached items?</word_default>
+      <word_custom>Удалить кеш в�ех %s объектов?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_upload_failed</word_key>
-      <word_default>Upload failed. The XML file is either missing or empty. Please try again.</word_default>
-      <word_custom>Загрузка не удала�ь. XML файл не найден либо пу�т. Попробуйте ещё раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>available_sections</word_key>
+      <word_default>Available in all sections</word_default>
+      <word_custom>До�тупен во в�ех разделах</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_exact</word_key>
-      <word_default>Exact</word_default>
-      <word_custom>Точный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bbcache_desc</word_key>
+      <word_default>The content cache is enabled which means that any changes to this BBCode will not be automatically applied to previous posts unless you remove all cached content.</word_default>
+      <word_custom>Задей�твовано кеширование �одержимого, �то значит, что любые изменени� �того BB-кода не будут автоматиче�ки применены к предыдущим �ообщени�м до тех пор пока не будет удалено кешированное �одержимое.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>all_groups</word_key>
+      <word_default>All current and future groups</word_default>
+      <word_custom>В�е текущие и будущие группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_useinguide</word_key>
+      <word_default>Used on the BBCode help guides</word_default>
+      <word_custom>И�пользует�� на �траницах помощи по BB-кодам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_title_title</word_key>
+      <word_default>Custom BBCode Title</word_default>
+      <word_custom>BB-код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_description</word_key>
+      <word_default>Custom BBCode Description</word_default>
+      <word_custom>Полное опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_tag_info</word_key>
+      <word_default><![CDATA[Example: For [tag] enter <b>tag</b>]]></word_default>
+      <word_custom><![CDATA[Пример: Дл� [tag] введите <b>tag</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_example</word_key>
+      <word_default>Custom BBCode Example</word_default>
+      <word_custom>Пример и�пользовани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_aliases_info</word_key>
+      <word_default><![CDATA[Comma-separated list of other aliases for 'Custom BBCode Tag']]></word_default>
+      <word_custom>Спи�ок п�евдонимов дл� данного тега (разделитель зап�та�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_aliases</word_key>
+      <word_default>Custom BBCode Aliases (Optional)</word_default>
+      <word_custom>П�евдонимы (опционально)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_useoption</word_key>
+      <word_default>Use Option in tag?</word_default>
+      <word_custom>И�пользовать опции в теге?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_singletag_info</word_key>
+      <word_default><![CDATA[Only the 'opening' tag is required<br />Example: [hr] to create a &lt;hr /&gt; HTML tag]]></word_default>
+      <word_custom><![CDATA[Со�тоит из одного открывающего тега<br />Пример: [hr] дл� HTML тега &lt;hr /&gt;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_useoption_info</word_key>
+      <word_default><![CDATA[Use to create [tag=option] style tags]]></word_default>
+      <word_custom><![CDATA[И�пользует�� дл� �оздани� BB-кода � опци�ми: [tag=option]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_optional</word_key>
+      <word_default>Option is optional?</word_default>
+      <word_custom>option об�зательно ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_singletag</word_key>
+      <word_default>Single Tag Only</word_default>
+      <word_custom>Одиночный тег?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_example_info</word_key>
+      <word_default><![CDATA[Use the tag in the example: [tag]This is an example![/tag]]]></word_default>
+      <word_custom><![CDATA[И�пользует�� во в�плывающей под�казке BB-кода<br />Тег дл� примера: [tag]Зде�ь ваш пример![/tag]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_noparse</word_key>
+      <word_default>Prevent other codes parsing?</word_default>
+      <word_custom>Предотвращать разбор вложенных кодов ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_optional_info</word_key>
+      <word_default><![CDATA[Is the option value optional?  If 'yes', when the 'option' is omitted, the 'content' value is used instead.]]></word_default>
+      <word_custom>Значение option необ�зательно?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_noparse_info</word_key>
+      <word_default>Prevents parsing of other BBCodes within this BBCode</word_default>
+      <word_custom>Предотвращает обработку других BB-кодов внутри �того BB-кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_replace</word_key>
+      <word_default>Custom BBCode Replacement</word_default>
+      <word_custom>Шаблон замены BB-кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_replace_info</word_key>
+      <word_default><![CDATA[&lt;tag&gt;{content}&lt;/tag&gt;<br />&lt;tag thing='{option}'&gt;{content}&lt;/tag&gt;<br />Note: Javascript cannot be used.]]></word_default>
+      <word_custom><![CDATA[HTML-код, которым должен быть заменен BB-код.<br />&lt;tag&gt;{content}&lt;/tag&gt;<br />&lt;tag thing='{option}'&gt;{content}&lt;/tag&gt;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_php</word_key>
+      <word_default>OR PHP file to execute</word_default>
+      <word_custom>ИЛИ PHP файл дл� и�полнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_switch_info</word_key>
+      <word_default><![CDATA[Use this if you wish to swap the {content} for {option} (i.e. when using tags like [tag={content}]{option}[/tag])]]></word_default>
+      <word_custom><![CDATA[И�пользует�� дл� �оздани� тега вида [tag={content}]{option}[/tag]. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_switch</word_key>
+      <word_default>Switch option and content?</word_default>
+      <word_custom>Помен�ть option и content ме�тами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_groups</word_key>
+      <word_default>Which groups can use this BBCode?</word_default>
+      <word_custom>Каким группам разрешено и�пользовать �тот код ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_php_info_loc</word_key>
+      <word_default><![CDATA[File should be placed in 'admin/sources/classes/bbcode/custom/']]></word_default>
+      <word_custom><![CDATA[Файл должен быть помещен в директорию 'admin/sources/classes/bbcode/custom/']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_assoc_app</word_key>
+      <word_default>BBCode Application</word_default>
+      <word_custom>Приложение BB-кодов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_whereused_info</word_key>
+      <word_default>You can enable and disable this BBCode in different sections individually</word_default>
+      <word_custom>Можно включать или отключать �тот BB-код в разных разделах по отдельно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_image</word_key>
+      <word_default>BBCode Image</word_default>
+      <word_custom>Изображение BB-кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_image_info</word_key>
+      <word_default>Button is used if populated, else bbcode is placed into editor other styles menu.</word_default>
+      <word_custom>Е�ли изображение указано, то оно будет отображать�� в виде кнопки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_image_info_loc</word_key>
+      <word_default>Image should be in public/style_extra/bbcode_icons</word_default>
+      <word_custom>Изображение должно находить�� в директории public/style_extra/bbcode_icons</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_optdial</word_key>
+      <word_default><![CDATA[Enter 'option' dialogue text]]></word_default>
+      <word_custom><![CDATA[Под�казка дл� 'option']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_optdial_info</word_key>
+      <word_default><![CDATA[Help text to use above the 'Option' text field.]]></word_default>
+      <word_custom><![CDATA[Тек�т дл� помощи по и�пользованию пол� 'Option'.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_contdial</word_key>
+      <word_default><![CDATA[Enter 'content' dialogue text]]></word_default>
+      <word_custom><![CDATA[Под�казка дл� 'content']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_contdial_info</word_key>
+      <word_default><![CDATA[Help text to use above the 'Content' text field.]]></word_default>
+      <word_custom><![CDATA[Тек�т дл� помощи по и�пользованию пол� 'Content']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_protected_info</word_key>
+      <word_default>Prevents users from being able to delete this BBCode</word_default>
+      <word_custom>�е позвол�ть пользовател�м удал�ть �тот BB-код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_protected</word_key>
+      <word_default>BBCode protected?</word_default>
+      <word_custom>Защищенный BB-код ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_php_info</word_key>
+      <word_default><![CDATA[If used, overrides previous setting<br />Useful if you need to perform regular expressions or conditional parsing]]></word_default>
+      <word_custom><![CDATA[Введенное значение отмен�ет предыдущую на�тройку<br />И�пользуйте когда необходимо и�пользовать регул�рные выражени� или у�ловную обработку]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_whereused</word_key>
+      <word_default>Where can the BBCode be used?</word_default>
+      <word_custom>Где BB-код может и�пользовать�� ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bbcode_groups_infp</word_key>
+      <word_default>If none selected, no groups can use the BBCode</word_default>
+      <word_custom>Е�ли ни одной группы не выбрано, то ни одна группа не �может и�пользовать BB-код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_add_replace</word_key>
+      <word_default>Add Media Tag replacement</word_default>
+      <word_custom>Добавить замену медиа-тега</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_edit</word_key>
+      <word_default>Edit Media Tag...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_add</word_key>
+      <word_default>Add Media Tag...</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_match</word_key>
+      <word_default>Media Replacement Match</word_default>
+      <word_custom>Медиа-тег</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_match_info</word_key>
+      <word_default><![CDATA[You can use {1}, {2}, etc as variable replacements or any regex statement.<br /><br />Ex: http://www.test.com/23423/<br />Match: http://www.test.com/{1}/]]></word_default>
+      <word_custom><![CDATA[Вы можете и�пользовать {1}, {2}, и т.д. как переменные дл� замены или другое регул�рное выражение.<br /><br />Пример: http://www.test.com/23423/<br />Совпадение: http://www.test.com/{1}/]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_title_info</word_key>
+      <word_default>Used as a reference for the tag</word_default>
+      <word_custom>И�пользует�� во в�плывающей под�казке медиа-тега</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_title</word_key>
+      <word_default>Media Replacement Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_error</word_key>
+      <word_default><![CDATA[<h2>Form Error</h2>]]></word_default>
+      <word_custom><![CDATA[<h2>Ошибка формы</h2>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_edit_replace</word_key>
+      <word_default>Edit Media Tag replacement</word_default>
+      <word_custom>Изменить медиа-тег</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_html</word_key>
+      <word_default>Media Replacement HTML</word_default>
+      <word_custom>Шаблон замены медиа-тега</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_html_info</word_key>
+      <word_default><![CDATA[You can use $1, $2, etc as variable replacements.<br /><br />Ex: &lt;a href="http://www.testm.com/$1/"&gt;$1&lt;/a&gt;<br />Result: &lt;a href="http://www.testm.com/23423/"&gt;23423&lt;/a&gt;]]></word_default>
+      <word_custom><![CDATA[Вы можете и�пользовать $1, $2, и т.д. как переменные дл� замены или другое регул�рное выражение.<br /><br />Пример: &lt;a href="http://www.testm.com/$1/"&gt;$1&lt;/a&gt;<br />Совпадение: &lt;a href="http://www.testm.com/23423/"&gt;23423&lt;/a&gt;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_fail</word_key>
+      <word_default>Upload failed, ipb_emoticons.xml was either missing or empty.</word_default>
+      <word_custom><![CDATA[Импортирование не удало�ь, по�кольку в файле 'ipb_emoticons.xml' ошибка или он не имеет запи�ей. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emoticon_folder_name</word_key>
+      <word_default>Folder name:</word_default>
+      <word_custom>Им� директории:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emoticon_folder</word_key>
+      <word_default>Emoticon Folder</word_default>
+      <word_custom>Директори� �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_tag_title</word_key>
+      <word_default>Media Tag</word_default>
+      <word_custom>Медиа-теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_delete</word_key>
+      <word_default>Delete Media Tag...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_exports</word_key>
+      <word_default>Export Media Tags...</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_export</word_key>
+      <word_default>Export Media Tag...</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_import_button</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импортировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_upload_desc</word_key>
+      <word_default>Duplicate entries will not be imported</word_default>
+      <word_custom>Суще�твующие запи�и импортированы не будут.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_import</word_key>
+      <word_default>Import New Media Tags</word_default>
+      <word_custom>Импортировать новые медиа-теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_upload</word_key>
+      <word_default>Upload XML Media Tags</word_default>
+      <word_custom><![CDATA[<strong>Загрузка XML �пи�ка медиа-тегов</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_name</word_key>
+      <word_default>Media</word_default>
+      <word_custom>Медиа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>media_current</word_key>
+      <word_default>Current Media Tag Replacements</word_default>
+      <word_custom>Медиа-теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_specify</word_key>
+      <word_default>You must specify which emoticon group you wish to import into.</word_default>
+      <word_custom>Вы должны указать в какую группу �майликов вы хотите о�уще�твить импорт.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_ftp</word_key>
+      <word_default><![CDATA[IP.Board cannot create a new folder for you, please create the folder manually using FTP in 'style_emoticons'.]]></word_default>
+      <word_custom><![CDATA[�евозможно �оздать директорию. Пожалуй�та, �оздайте директорию в 'style_emoticons' �амо�то�тельно, � помощью FTP.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_already</word_key>
+      <word_default><![CDATA['style_emoticons/%s' already exists, please choose another name.]]></word_default>
+      <word_custom><![CDATA[Директори� 'style_emoticons/%s' уже �уще�твует. Выберите другое им�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_specify_ex</word_key>
+      <word_default>You must specify which emoticon group you wish to export.</word_default>
+      <word_custom>Вы должны указать какую группу �майликов вы хотите �к�портировать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_xml_good</word_key>
+      <word_default>Emoticon XML archive import completed.</word_default>
+      <word_custom>Импорт XML файла �майликов завершен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_title</word_key>
+      <word_default>Emoticon Management</word_default>
+      <word_custom>Управление �майликами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_nolocate</word_key>
+      <word_default><![CDATA[Could not locate the emoticons directory - make sure the 'style_emoticons' path is set correctly.]]></word_default>
+      <word_custom>�евозможно найти директорию �майликов. Убедите�ь, что путь к директории �майликов корректен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_noset</word_key>
+      <word_default>No emoticon set was passed.</word_default>
+      <word_custom>�абор �майликов не найден</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>no_emo_selected</word_key>
+      <word_default>You did not select any files to upload</word_default>
+      <word_custom>Вы не выбрали ни одного файла дл� загрузки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_complete</word_key>
+      <word_default>Uploads Complete!</word_default>
+      <word_custom>Загрузка завершена!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_nogid</word_key>
+      <word_default>No emoticon group ID was passed</word_default>
+      <word_custom>ID группы �майликов не найден</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_mimes</word_key>
+      <word_default>You can only upload image files (jpeg, jpg, gif and png)</word_default>
+      <word_custom>Возможна загрузка только файлов изображений (jpeg, jpg, gif и png) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_pickanother</word_key>
+      <word_default><![CDATA[You must choose a folder other than 'default' to upload into.]]></word_default>
+      <word_custom><![CDATA[�еобходимо выбрать директорию отличную от 'default' дл� загрузки.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_updated</word_key>
+      <word_default>Emoticons Updated!</word_default>
+      <word_custom>Смайлики обновлены!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_removed</word_key>
+      <word_default>Emoticon Removed!</word_default>
+      <word_custom>Смайлики удалены!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_onlydothis</word_key>
+      <word_default>You may only add, edit, and remove emoticons from the default set</word_default>
+      <word_custom>В наборе по умолчанию возможно только добавление, изменение и удаление �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_noid</word_key>
+      <word_default>No emoticon ID was passed</word_default>
+      <word_custom>ID �майлика не найден</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_safemode</word_key>
+      <word_default><![CDATA[SAFE MODE DETECTED: IP.Board cannot create or edit folders for you, please create or edit the folder manually using FTP in 'style_emoticons']]></word_default>
+      <word_custom><![CDATA[БЕЗОП�С�ЫЙ РЕЖИМ: IP.Board не может �оздавать или измен�ть директории. Пожалуй�та, �оздайте или измените директорию в 'style_emoticons'  вручную � помощью FTP.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_a_to_z</word_key>
+      <word_default>No valid folder name was entered, please try again using only alphanumerics (A-Z, a-z, 0-9)</word_default>
+      <word_custom>Введено неверное им� директории. И�пользуйте только буквы и цифры (A-Z, a-z, 0-9)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_folder_rem</word_key>
+      <word_default>Emoticon folder removed.</word_default>
+      <word_custom>Директори� �майликов удалена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_norename</word_key>
+      <word_default>You cannot rename the default folder.</word_default>
+      <word_custom><![CDATA[�евозможно переименовать директорию 'default'.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_folder_new</word_key>
+      <word_default>New folder added.</word_default>
+      <word_custom>Директори� добавлена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_export</word_key>
+      <word_default>Export an Emoticon Pack</word_default>
+      <word_custom>Эк�порт директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_export_which</word_key>
+      <word_default>Export which emoticon group?</word_default>
+      <word_custom><![CDATA[<strong>Какую директорию �майликов �к�портировать?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_does_NOT_describe</word_key>
+      <word_default>Keith J. Kacin</word_default>
+      <word_custom>Keith J. Kacin</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_setclickable</word_key>
+      <word_default>Set Clickable...</word_default>
+      <word_custom>�ажимаемый</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_manageemos</word_key>
+      <word_default>Manage Emoticons...</word_default>
+      <word_custom>Менеджер �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_writeable_not</word_key>
+      <word_default>This folder is NOT writeable and the CHMOD must be changed</word_default>
+      <word_custom>Запи�ь в �ту директорию невозможна. Пожалуй�та, измените права до�тупа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_writeable</word_key>
+      <word_default>This folder is writeable and new emoticons can be added</word_default>
+      <word_custom>Возможно добавление �майликов в �ту директорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_manage_set</word_key>
+      <word_default>Managing Set </word_default>
+      <word_custom>Управление �майликами </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_control</word_key>
+      <word_default>Emoticon Control</word_default>
+      <word_custom>Менеджер �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_wecantdoit</word_key>
+      <word_default>IP.Board cannot rename this folder for you.</word_default>
+      <word_custom>IP.Board не может переименовать �ту директорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_folder_rename</word_key>
+      <word_default>Folder renamed.</word_default>
+      <word_custom>Директори� переименована.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emo_miss_dir</word_key>
+      <word_default>Missing directory name, please try again.</word_default>
+      <word_custom>�е хватает названи� директории. Попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_which</word_key>
+      <word_default>Import into which emoticon group?</word_default>
+      <word_custom><![CDATA[<strong>В какую �уще�твующую директорию произве�ти импортирование?</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import</word_key>
+      <word_default>Import an Emoticon Pack</word_default>
+      <word_custom>Импортирование директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_xml_pack</word_key>
+      <word_default>An IP.Board Emoticon Pack is an XML archive file of the images and activation words (i.e. :smile:)</word_default>
+      <word_custom>Содержимое директории будет упаковано в XML-архив � изображени�ми и маркерами вызова �майликов (например :smile:)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_export_button</word_key>
+      <word_default>Export</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_name</word_key>
+      <word_default>Enter the name of the new emoticon group.</word_default>
+      <word_custom>Введите название новой директории �майликов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_newgroup</word_key>
+      <word_default><![CDATA[<u>OR</u> Import into a new group named:]]></word_default>
+      <word_custom><![CDATA[<b><u>ИЛИ</u> Импортировать в новую директорию:</b> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_over</word_key>
+      <word_default>Overwrite existing images and activation words?</word_default>
+      <word_custom><![CDATA[<b>Перезапи�ать �уще�твующие изображение и маркеры вызова �майликов?</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_replace</word_key>
+      <word_default>If yes, new images replace old images.</word_default>
+      <word_custom>Е�ли выбрано «Да», новые изображени� замен�т �тарые.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_upload</word_key>
+      <word_default>Upload XML Emoticon Archive</word_default>
+      <word_custom><![CDATA[<b>Загрузка XML �пи�ка �майликов</b>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_assigned</word_key>
+      <word_default>Assigned Emoticons in set: </word_default>
+      <word_custom>Спи�ок у�тановленных �майликов в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_browse</word_key>
+      <word_default><![CDATA[Browse your computer for 'ipb_emoticons.xml' or 'ipb_emoticons.xml.gz']]></word_default>
+      <word_custom><![CDATA[Выберите файл дл� загрузки � вашего компьютера 'ipb_emoticons.xml' или 'ipb_emoticons.xml.gz']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_import_button</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импортировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_clickable</word_key>
+      <word_default>Clickable?</word_default>
+      <word_custom>�ажимаемый?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_delete_title</word_key>
+      <word_default>Remove this emoticon...</word_default>
+      <word_custom>Удалить �тот �майлик</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_update_button</word_key>
+      <word_default>Update Emoticons</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_unassigned</word_key>
+      <word_default>Unassigned Emoticons in set: </word_default>
+      <word_custom>Спи�ок неу�тановленных �майликов в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_unassigned_none</word_key>
+      <word_default>No unassigned emoticons</word_default>
+      <word_custom>�ет неу�тановленных �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_add</word_key>
+      <word_default><![CDATA[<strong>Add?</strong> ]]></word_default>
+      <word_custom><![CDATA[<strong>Добавить?</strong> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_addall_button</word_key>
+      <word_default>Add All Emoticons</word_default>
+      <word_custom>Добавить в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_add_button</word_key>
+      <word_default>Add Checked Emoticons</word_default>
+      <word_custom>Добавить выбранные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_addfolder</word_key>
+      <word_default>Add Folder</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_close</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_editfolder</word_key>
+      <word_default>Edit Folder Name...</word_default>
+      <word_custom>Переименовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_current</word_key>
+      <word_default>Current Emoticon Folders</word_default>
+      <word_custom>Текущие директории �о �майликами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_foldername</word_key>
+      <word_default><![CDATA[<b>Folder name (alphanumerics only)</b>]]></word_default>
+      <word_custom><![CDATA[<b>�азвание директории (только буквы и цифры)</b>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_emofolder</word_key>
+      <word_default>Emoticon Folder</word_default>
+      <word_custom>�азвание директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_num_disk</word_key>
+      <word_default># in Emoticon Folder</word_default>
+      <word_custom>№ директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_num_group</word_key>
+      <word_default># in Emoticon Group</word_default>
+      <word_custom>№ группы �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_upload</word_key>
+      <word_default>Upload?</word_default>
+      <word_custom>Загрузка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_uploadtofolders</word_key>
+      <word_default>Upload Emoticons into checked folders</word_default>
+      <word_custom>Загрузить �майлики в выбранные директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_createnew</word_key>
+      <word_default>Create New Folder</word_default>
+      <word_custom>Создать новую директорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_uploademos</word_key>
+      <word_default>Upload Emoticons</word_default>
+      <word_custom>Загрузка �майликов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_dontdeletedef</word_key>
+      <word_default>The default emoticon set cannot be deleted</word_default>
+      <word_custom><![CDATA[<i>�евозможно удалить набор по умолчанию</i>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_nofilter</word_key>
+      <word_default>No filter ID passed. Please try again.</word_default>
+      <word_custom>ID фильтра не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_deletefolder</word_key>
+      <word_default>Delete Folder...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emote_manageset</word_key>
+      <word_default>Manage this emoticon set</word_default>
+      <word_custom>Управление �майликами �того набора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_title</word_key>
+      <word_default>Badword List</word_default>
+      <word_custom>Спи�ок нецензурных �лов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_edited</word_key>
+      <word_default>Filter Edited!</word_default>
+      <word_custom>Фильтр изменен!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_404</word_key>
+      <word_default>We could not find that filter in the database.</word_default>
+      <word_custom>Фильтр не найден в базе данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_noword</word_key>
+      <word_default>You must enter a word to replace. Please try again.</word_default>
+      <word_custom>�еобходимо вве�ти �лово дл� замены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_removed</word_key>
+      <word_default>Filter Removed!</word_default>
+      <word_custom>Фильтр удален!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -12435,9 +10349,118 @@
       <word_key>bwl_loose</word_key>
       <word_default>Loose</word_default>
       <word_custom>Ма�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_exact</word_key>
+      <word_default>Exact</word_default>
+      <word_custom>Точный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_upload_failed</word_key>
+      <word_default>Upload failed. The XML file is either missing or empty. Please try again.</word_default>
+      <word_custom>Загрузка не удала�ь. XML файл не найден либо пу�т. Попробуйте ещё раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_upload_wrong</word_key>
+      <word_default>The import failed. The XML file is either empty or in the wrong format. Please try again.</word_default>
+      <word_custom>�евозможно выполнить импортирование, по�кольку в XML файле ошибка или он не имеет запи�ей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_upload_good</word_key>
+      <word_default>The badword list has been imported!</word_default>
+      <word_custom>Спи�ок фильтров у�пешно импортирован!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_before</word_key>
+      <word_default>Before</word_default>
+      <word_custom>Слово</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_method</word_key>
+      <word_default>Method</word_default>
+      <word_custom>Метод</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_edit_filter</word_key>
+      <word_default>Edit Filter</word_default>
+      <word_custom>Изменить фильтр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_current</word_key>
+      <word_default>Current Filters</word_default>
+      <word_custom>Спи�ок фильтров</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_after</word_key>
+      <word_default>After</word_default>
+      <word_custom>Замена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_remove</word_key>
+      <word_default>Remove Badword Filter...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_edit</word_key>
+      <word_default>Edit Badword Filter...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_add</word_key>
+      <word_default>Add New Filter</word_default>
+      <word_custom>Добавить фильтр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_import_upload</word_key>
+      <word_default><![CDATA[<b>Upload XML Badword List</b>]]></word_default>
+      <word_custom><![CDATA[<b>Загрузка XML-файла � фильтрами</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_export</word_key>
+      <word_default>Export Badword List</word_default>
+      <word_custom>Эк�портировать фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_filter_new</word_key>
+      <word_default>New badword filter has been added.</word_default>
+      <word_custom>Фильтр добавлен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -12449,1399 +10472,783 @@
 <b>Фильтр по ма�ке</b>: Е�ли вы ввели �лово 'ад' как нецензурное, то �лова 'ад' и 'админи�тратор' будут заменены либо �ловом заменой либо решетками.<br /><br />
 <b>Точное �овпадение</b>: Е�ли вы ввели �лово 'ад' как нецензурное,  то только �лово 'ад' будет заменено.
 <br />Реги�тр �имволов не важен.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_new</word_key>
-      <word_default>New badword filter has been added.</word_default>
-      <word_custom>Фильтр добавлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bwl_import_info</word_key>
+      <word_default><![CDATA[Browse your computer for 'ipb_badwords.xml' or 'ipb_badwords.xml.gz'. Duplicate entries will not be imported.]]></word_default>
+      <word_custom><![CDATA[Выберите файл 'ipb_badwords.xml' или 'ipb_badwords.xml.gz' на вашем компьютере. Суще�твующие запи�и импортированы не будут..]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_title</word_key>
-      <word_default>Badword List</word_default>
-      <word_custom>Спи�ок нецензурных �лов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_changepoints</word_key>
+      <word_default>There is an image under this status using the same number of points. Please change the number of points.</word_default>
+      <word_custom>Другое изображение уже и�пользует�� � �тим количе�твом очков. Измените количе�тво очков.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_404</word_key>
-      <word_default>We could not find that filter in the database.</word_default>
-      <word_custom>Фильтр не найден в базе данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_imgdel</word_key>
+      <word_default>Image Deleted</word_default>
+      <word_custom>Изображение удалено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_edited</word_key>
-      <word_default>Filter Edited!</word_default>
-      <word_custom>Фильтр изменен!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_statsever</word_key>
+      <word_default><![CDATA[Statuses & Severity]]></word_default>
+      <word_custom>Стату�ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_noword</word_key>
-      <word_default>You must enter a word to replace. Please try again.</word_default>
-      <word_custom>�еобходимо вве�ти �лово дл� замены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugin_title</word_key>
+      <word_default>You can setup and manage your report center plugins in this section.</word_default>
+      <word_custom>В �том разделе вы можете управл�ть плагинами жалоб, а также у�тановить новые.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_nofilter</word_key>
-      <word_default>No filter ID passed. Please try again.</word_default>
-      <word_custom>ID фильтра не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugmanager</word_key>
+      <word_default>Plugin Manager</word_default>
+      <word_custom>Управление плагинами</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bwl_filter_removed</word_key>
-      <word_default>Filter Removed!</word_default>
-      <word_custom>Фильтр удален!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_deleteplug</word_key>
+      <word_default>Plugin Deleted</word_default>
+      <word_custom>Плагин удален</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_deletefolder</word_key>
-      <word_default>Delete Folder...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_dellocked</word_key>
+      <word_default>This plugin is locked. It cannot be deleted.</word_default>
+      <word_custom>Плагин заблокирован и не может быть удален.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_manageset</word_key>
-      <word_default>Manage this emoticon set</word_default>
-      <word_custom>Управление �майликами �того набора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugin404</word_key>
+      <word_default>We could not find that plugin ID. Please try again.</word_default>
+      <word_custom>�евозможно найти ID плагина.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_dontdeletedef</word_key>
-      <word_default><![CDATA[ <i>The default emoticon set cannot be deleted</i>]]></word_default>
-      <word_custom><![CDATA[<i>�евозможно удалить набор по умолчанию</i>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_deleteair</word_key>
+      <word_default><![CDATA[You can't delete air! For Shame...]]></word_default>
+      <word_custom>�ельз� удалить то, чего и так нет!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_uploademos</word_key>
-      <word_default>Upload Emoticons</word_default>
-      <word_custom>Загрузка �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_pluglocked</word_key>
+      <word_default>This plugin is locked. You cannot change this file.</word_default>
+      <word_custom>Плагин заблокирован. Вы не можете изменить �тот файл.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_uploadtofolders</word_key>
-      <word_default>Upload Emoticons into checked folders</word_default>
-      <word_custom>Загрузить �майлики в выбранные директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugupdated</word_key>
+      <word_default>Plugin Updated</word_default>
+      <word_custom>Плагин обновлен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_createnew</word_key>
-      <word_default>Create New Folder</word_default>
-      <word_custom>Создать новую директорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugnoexist</word_key>
+      <word_default><![CDATA[Plugin doesn't exist.]]></word_default>
+      <word_custom>Плагин не �уще�твует.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_num_group</word_key>
-      <word_default># in Emoticon Group</word_default>
-      <word_custom>№ группы �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugincreate</word_key>
+      <word_default>Plugin Created</word_default>
+      <word_custom>Плагин �оздан</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_upload</word_key>
-      <word_default>Upload?</word_default>
-      <word_custom>Загрузка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_finishplugin</word_key>
+      <word_default>Finish Plugin Settings</word_default>
+      <word_custom>Закончить на�тройку плагина</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_num_disk</word_key>
-      <word_default># in Emoticon Folder</word_default>
-      <word_custom>№ директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_404file</word_key>
+      <word_default>Plugin file does not exist.</word_default>
+      <word_custom>Файл плагина не �уще�твует.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_current</word_key>
-      <word_default>Current Emoticon Folders</word_default>
-      <word_custom>Текущие директории �о �майликами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_incchar</word_key>
+      <word_default><![CDATA[Incorrect characters in 'Plugin File' box.]]></word_default>
+      <word_custom><![CDATA[�еверный �имвол в �троке 'Файл плагина'.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_options</word_key>
+      <word_key>r_missingfield</word_key>
+      <word_default>Missing required fields.</word_default>
+      <word_custom>�езаполнены об�зательные пол�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_toggle</word_key>
+      <word_default>Plugin Toggled</word_default>
+      <word_custom>Плагин переключен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_overview_title</word_key>
+      <word_default>Report Center Overview</word_default>
+      <word_custom>Обзор жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_overview</word_key>
+      <word_default>Overview</word_default>
+      <word_custom>Обзор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_imgsaved</word_key>
+      <word_default>Image Saved</word_default>
+      <word_custom>Изображение �охранено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_nodata</word_key>
+      <word_default>No Data</word_default>
+      <word_custom>�ет данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_404status</word_key>
+      <word_default>You must enter a title for the status.</word_default>
+      <word_custom>�ужно вве�ти название дл� �того �тату�а.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_newcomplete</word_key>
+      <word_default><![CDATA[Cannot mark status as 'New' when it is already marked 'Complete']]></word_default>
+      <word_custom>�евозможно у�тановить �тату� «�ова�», когда у�тановлен �тату� «Завершена»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_completenew</word_key>
+      <word_default><![CDATA[Cannot mark status as 'Complete' when it is already marked 'New']]></word_default>
+      <word_custom>�евозможно у�тановить �тату� «Завершена», когда у�тановлен �тату� «�ова�»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_onecomplete</word_key>
+      <word_default><![CDATA[You need at least one 'Complete' status.]]></word_default>
+      <word_custom><![CDATA[�еобходим по крайней мере один  �тату� "Завершен".]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_onenew</word_key>
+      <word_default><![CDATA[You need at least one 'New' status.]]></word_default>
+      <word_custom><![CDATA[�еобходим по крайней мере один "�овый" �тату�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_statcreated</word_key>
+      <word_default>Status Created</word_default>
+      <word_custom>Стату� �оздан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_invpar</word_key>
+      <word_default>Invalid Parameter</word_default>
+      <word_custom>�еверный параметр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_statdel</word_key>
+      <word_default>Status Deleted</word_default>
+      <word_custom>Стату� удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_createnew</word_key>
+      <word_default>Create new status</word_default>
+      <word_custom>Добавить �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_statsaved</word_key>
+      <word_default>Status Saved</word_default>
+      <word_custom>Стату� �охранен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_mtp</word_key>
+      <word_default><![CDATA['Minutes to Posts' must be numeric.]]></word_default>
+      <word_custom><![CDATA["Минут дл� �ообщени�" должно быть чи�лом]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_ppr</word_key>
+      <word_default><![CDATA['Points Per Report' must be a non-decimal number.]]></word_default>
+      <word_custom>«Баллов на жалобу» должно быть целым чи�лом.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_movedno</word_key>
+      <word_default>Report Status cannot be repositioned.</word_default>
+      <word_custom>Стату� жалобы не может быть изменен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_movedyes</word_key>
+      <word_default>Report Status Repositioned</word_default>
+      <word_custom>Стату� жалобы изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_statmanager</word_key>
+      <word_default>Status Manager</word_default>
+      <word_custom>Управление �тату�ами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_last24</word_key>
+      <word_default>Reports in the last 24 hours</word_default>
+      <word_custom>Жалобы за по�ледние 24 ча�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_supermod</word_key>
+      <word_default>Super moderators can view all the reports?</word_default>
+      <word_custom>Супермодераторы могут про�матривать в�е жалобы плагина?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_top5</word_key>
+      <word_default>Top Five Moderators</word_default>
+      <word_custom>Топ 5 модераторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_supermod_info</word_key>
+      <word_default>This plugin uses moderator assignments to determine what reports a moderator can see and manage. By default if a member is a super moderator he/she can see all the reports. Turning this off means moderator assignments are used exclusively.</word_default>
+      <word_custom>Плагин и�пользует ограничени� модераторов дл� определени� какие жалобы они могут видеть. По умолчанию, е�ли пользователь �вл�ет�� �упермодератором, то он может видеть в�е жалобы. Отключение �того приведет и�пользованию ограничений модераторов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_points_sufix</word_key>
+      <word_default> Points</word_default>
+      <word_custom> Баллов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>postform_badmd5</word_key>
+      <word_default>Key did not match</word_default>
+      <word_custom>Ключ не �овпадает �</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>bwl_import</word_key>
+      <word_default>Import Badword List</word_default>
+      <word_custom>Импортировать фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_app</word_key>
+      <word_default>Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_galmod</word_key>
+      <word_default>Respect Gallery moderator rights?</word_default>
+      <word_custom>Включить права Gallery ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_options</word_key>
       <word_default>Options</word_default>
       <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_emofolder</word_key>
-      <word_default>Emoticon Folder</word_default>
-      <word_custom>�азвание директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_dlmod</word_key>
+      <word_default>Respect Download Manager moderator rights?</word_default>
+      <word_custom>Включить права Download Manager ?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_close</word_key>
-      <word_default>Close</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_regplugins</word_key>
+      <word_default>Registered Report Plugins</word_default>
+      <word_custom>Зареги�трированные плагины жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_foldername</word_key>
-      <word_default><![CDATA[<b>Folder name (alphanumerics only)</b>]]></word_default>
-      <word_custom><![CDATA[<b>�азвание директории (только буквы и цифры)</b>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_author</word_key>
+      <word_default>Author</word_default>
+      <word_custom>�втор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>emote_editfolder</word_key>
-      <word_default>Edit Folder Name...</word_default>
-      <word_custom>Переименовать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_addall_button</word_key>
-      <word_default>Add All Emoticons</word_default>
-      <word_custom>Добавить в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_addfolder</word_key>
-      <word_default>Add Folder</word_default>
-      <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_text</word_key>
-      <word_default>Activation Text: </word_default>
-      <word_custom>Тек�т активации: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_add_button</word_key>
-      <word_default>Add Checked Emoticons</word_default>
-      <word_custom>Добавить выбранные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_add</word_key>
-      <word_default><![CDATA[<strong>Add?</strong> ]]></word_default>
-      <word_custom><![CDATA[<strong>Добавить?</strong> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_unassigned</word_key>
-      <word_default>Unassigned Emoticons in set: </word_default>
-      <word_custom>Спи�ок неу�тановленных �майликов в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_update_button</word_key>
-      <word_default>Update Emoticons</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_clickable</word_key>
-      <word_default>Clickable?</word_default>
-      <word_custom>�ажимаемый?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_assigned</word_key>
-      <word_default>Assigned Emoticons in set: </word_default>
-      <word_custom>Спи�ок у�тановленных �майликов в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_delete_title</word_key>
-      <word_default>Remove this emoticon...</word_default>
-      <word_custom>Удалить �тот �майлик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_button</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_upload</word_key>
-      <word_default><![CDATA[<b>Upload XML Emoticon Archive</b>]]></word_default>
-      <word_custom><![CDATA[<b>Загрузка XML �пи�ка �майликов</b>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_browse</word_key>
-      <word_default><![CDATA[Browse your computer for 'ipb_emoticons.xml' or 'ipb_emoticons.xml.gz']]></word_default>
-      <word_custom><![CDATA[Выберите файл дл� загрузки � вашего компьютера 'ipb_emoticons.xml' или 'ipb_emoticons.xml.gz']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_over</word_key>
-      <word_default><![CDATA[<b>Overwrite existing images and activation words?</b>]]></word_default>
-      <word_custom><![CDATA[<b>Перезапи�ать �уще�твующие изображение и маркеры вызова �майликов?</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_replace</word_key>
-      <word_default>If yes, new images replace old images.</word_default>
-      <word_custom>Е�ли выбрано «Да», новые изображени� замен�т �тарые.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_name</word_key>
-      <word_default>Enter the name of the new emoticon group.</word_default>
-      <word_custom>Введите название новой директории �майликов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import</word_key>
-      <word_default>Import an Emoticon Pack</word_default>
-      <word_custom>Импортирование директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_which</word_key>
-      <word_default><![CDATA[<strong>Import into which emoticon group?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>В какую �уще�твующую директорию произве�ти импортирование?</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_import_newgroup</word_key>
-      <word_default><![CDATA[<b><u>OR</u> Import into a new group named:</b>]]></word_default>
-      <word_custom><![CDATA[<b><u>ИЛИ</u> Импортировать в новую директорию:</b> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_xml_pack</word_key>
-      <word_default>An IP.Board Emoticon Pack is an XML archive file of the images and activation words (i.e. :smile:)</word_default>
-      <word_custom>Содержимое директории будет упаковано в XML-архив � изображени�ми и маркерами вызова �майликов (например :smile:)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_export_button</word_key>
-      <word_default>Export</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_export</word_key>
-      <word_default>Export an Emoticon Pack</word_default>
-      <word_custom>Эк�порт директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emote_export_which</word_key>
-      <word_default><![CDATA[<strong>Export which emoticon group?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Какую директорию �майликов �к�портировать?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_does_NOT_describe</word_key>
-      <word_default>Keith J. Kacin</word_default>
-      <word_custom>Keith J. Kacin</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_setclickable</word_key>
-      <word_default>Set Clickable...</word_default>
-      <word_custom>�ажимаемый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_manageemos</word_key>
-      <word_default>Manage Emoticons...</word_default>
-      <word_custom>Менеджер �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_writeable_not</word_key>
-      <word_default>This folder is NOT writeable and the CHMOD must be changed</word_default>
-      <word_custom>Запи�ь в �ту директорию невозможна. Пожалуй�та, измените права до�тупа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_manage_set</word_key>
-      <word_default>Managing Set </word_default>
-      <word_custom>Управление �майликами </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_writeable</word_key>
-      <word_default>This folder is writeable and new emoticons can be added</word_default>
-      <word_custom>Возможно добавление �майликов в �ту директорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_control</word_key>
-      <word_default>Emoticon Control</word_default>
-      <word_custom>Менеджер �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_wecantdoit</word_key>
-      <word_default>IP.Board cannot rename this folder for you.</word_default>
-      <word_custom>IP.Board не может переименовать �ту директорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_folder_rename</word_key>
-      <word_default>Folder renamed.</word_default>
-      <word_custom>Директори� переименована.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_folder_new</word_key>
-      <word_default>New folder added.</word_default>
-      <word_custom>Директори� добавлена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_miss_dir</word_key>
-      <word_default>Missing directory name, please try again.</word_default>
-      <word_custom>�е хватает названи� директории. Попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_safemode</word_key>
-      <word_default><![CDATA[SAFE MODE DETECTED: IP.Board cannot create or edit folders for you, please create or edit the folder manually using FTP in 'style_emoticons']]></word_default>
-      <word_custom><![CDATA[БЕЗОП�С�ЫЙ РЕЖИМ: IP.Board не может �оздавать или измен�ть директории. Пожалуй�та, �оздайте или измените директорию в 'style_emoticons'  вручную � помощью FTP.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_a_to_z</word_key>
-      <word_default>No valid folder name was entered, please try again using only alphanumerics (A-Z, a-z, 0-9)</word_default>
-      <word_custom>Введено неверное им� директории. И�пользуйте только буквы и цифры (A-Z, a-z, 0-9)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_noset</word_key>
-      <word_default>No emoticon set was passed.</word_default>
-      <word_custom>�абор �майликов не найден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_norename</word_key>
-      <word_default>You cannot rename the default folder.</word_default>
-      <word_custom><![CDATA[�евозможно переименовать директорию 'default'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_folder_rem</word_key>
-      <word_default>Emoticon folder removed.</word_default>
-      <word_custom>Директори� �майликов удалена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_complete</word_key>
-      <word_default>Uploads Complete!</word_default>
-      <word_custom>Загрузка завершена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>no_emo_selected</word_key>
-      <word_default>You did not select any files to upload</word_default>
-      <word_custom>Вы не выбрали ни одного файла дл� загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_mimes</word_key>
-      <word_default>You can only upload image files (jpeg, jpg, gif and png)</word_default>
-      <word_custom>Возможна загрузка только файлов изображений (jpeg, jpg, gif и png) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_updated</word_key>
-      <word_default>Emoticons Updated!</word_default>
-      <word_custom>Смайлики обновлены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_pickanother</word_key>
-      <word_default><![CDATA[You must choose a folder other than 'default' to upload into.]]></word_default>
-      <word_custom><![CDATA[�еобходимо выбрать директорию отличную от 'default' дл� загрузки.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_removed</word_key>
-      <word_default>Emoticon Removed!</word_default>
-      <word_custom>Смайлики удалены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_onlydothis</word_key>
-      <word_default>You may only add, edit, and remove emoticons from the default set</word_default>
-      <word_custom>В наборе по умолчанию возможно только добавление, изменение и удаление �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_nogid</word_key>
-      <word_default>No emoticon group ID was passed</word_default>
-      <word_custom>ID группы �майликов не найден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_noid</word_key>
-      <word_default>No emoticon ID was passed</word_default>
-      <word_custom>ID �майлика не найден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_title</word_key>
-      <word_default>Emoticon Management</word_default>
-      <word_custom>Управление �майликами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_nolocate</word_key>
-      <word_default><![CDATA[Could not locate the emoticons directory - make sure the 'style_emoticons' path is set correctly.]]></word_default>
-      <word_custom>�евозможно найти директорию �майликов. Убедите�ь, что путь к директории �майликов корректен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_specify_ex</word_key>
-      <word_default>You must specify which emoticon group you wish to export.</word_default>
-      <word_custom>Вы должны указать какую группу �майликов вы хотите �к�портировать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_xml_good</word_key>
-      <word_default>Emoticon XML archive import completed.</word_default>
-      <word_custom>Импорт XML файла �майликов завершен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_already</word_key>
-      <word_default><![CDATA['style_emoticons/%s' already exists, please choose another name.]]></word_default>
-      <word_custom><![CDATA[Директори� 'style_emoticons/%s' уже �уще�твует. Выберите другое им�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_ftp</word_key>
-      <word_default><![CDATA[IP.Board cannot create a new folder for you, please create the folder manually using FTP in 'style_emoticons'.]]></word_default>
-      <word_custom><![CDATA[�евозможно �оздать директорию. Пожалуй�та, �оздайте директорию в 'style_emoticons' �амо�то�тельно, � помощью FTP.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_specify</word_key>
-      <word_default>You must specify which emoticon group you wish to import into.</word_default>
-      <word_custom>Вы должны указать в какую группу �майликов вы хотите о�уще�твить импорт.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emo_fail</word_key>
-      <word_default>Upload failed, ipb_emoticons.xml was either missing or empty.</word_default>
-      <word_custom><![CDATA[Импортирование не удало�ь, по�кольку в файле 'ipb_emoticons.xml' ошибка или он не имеет запи�ей. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_tag_title</word_key>
-      <word_default>Media Tag</word_default>
-      <word_custom>Медиа-теги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emoticon_folder</word_key>
-      <word_default>Emoticon Folder</word_default>
-      <word_custom>Директори� �майликов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>emoticon_folder_name</word_key>
-      <word_default>Folder name:</word_default>
-      <word_custom>Им� директории:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_exports</word_key>
-      <word_default>Export Media Tags...</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_delete</word_key>
-      <word_default>Delete Media Tag...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_export</word_key>
-      <word_default>Export Media Tag...</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_import_button</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_upload</word_key>
-      <word_default><![CDATA[<strong>Upload XML Media Tags</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Загрузка XML �пи�ка медиа-тегов</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_upload_desc</word_key>
-      <word_default>Duplicate entries will not be imported</word_default>
-      <word_custom>Суще�твующие запи�и импортированы не будут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_import</word_key>
-      <word_default>Import New Media Tags</word_default>
-      <word_custom>Импортировать новые медиа-теги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_name</word_key>
-      <word_default>Media</word_default>
-      <word_custom>Медиа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_current</word_key>
-      <word_default>Current Media Tag Replacements</word_default>
-      <word_custom>Медиа-теги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_html_info</word_key>
-      <word_default><![CDATA[You can use $1, $2, etc as a variable replacements or any regex statement.<br /><br />Ex: &lt;a href="http://www.testm.com/$1/"&gt;$1&lt;/a&gt;<br />Result: &lt;a href="http://www.testm.com/23423/"&gt;23423&lt;/a&gt;]]></word_default>
-      <word_custom><![CDATA[Вы можете и�пользовать $1, $2, и т.д. как переменные дл� замены или другое регул�рное выражение.<br /><br />Пример: &lt;a href="http://www.testm.com/$1/"&gt;$1&lt;/a&gt;<br />Совпадение: &lt;a href="http://www.testm.com/23423/"&gt;23423&lt;/a&gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_match_info</word_key>
-      <word_default><![CDATA[You can use {1}, {2}, etc as a variable replacements or any regex statement.<br /><br />Ex: http://www.test.com/23423/<br />Match: http://www.test.com/{1}/]]></word_default>
-      <word_custom><![CDATA[Вы можете и�пользовать {1}, {2}, и т.д. как переменные дл� замены или другое регул�рное выражение.<br /><br />Пример: http://www.test.com/23423/<br />Совпадение: http://www.test.com/{1}/]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_html</word_key>
-      <word_default>Media Replacement HTML</word_default>
-      <word_custom>Шаблон замены медиа-тега</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_title_info</word_key>
-      <word_default>Used as a reference for the tag</word_default>
-      <word_custom>И�пользует�� во в�плывающей под�казке медиа-тега</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_match</word_key>
-      <word_default>Media Replacement Match</word_default>
-      <word_custom>Медиа-тег</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>media_title</word_key>
-      <word_default>Media Replacement Title</word_default>
+      <word_key>r_name</word_key>
+      <word_default>Name</word_default>
       <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>media_error</word_key>
-      <word_default><![CDATA[<h2>Form Error</h2>]]></word_default>
-      <word_custom><![CDATA[<h2>Ошибка формы</h2>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_regnew</word_key>
+      <word_default>Register New Plugin...</word_default>
+      <word_custom>Зареги�трировать новый плагин</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>media_edit_replace</word_key>
-      <word_default>Edit Media Tag replacement</word_default>
-      <word_custom>Изменить медиа-тег</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_enabled</word_key>
+      <word_default>Enabled</word_default>
+      <word_custom>Включен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>media_edit</word_key>
-      <word_default>Edit Media Tag...</word_default>
+      <word_key>r_editsettings</word_key>
+      <word_default>Edit Settings...</word_default>
       <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>media_add_replace</word_key>
-      <word_default>Add Media Tag replacement</word_default>
-      <word_custom>Добавить замену медиа-тега</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_toggleendis</word_key>
+      <word_default>Toggle Enabled/Disabled</word_default>
+      <word_custom>Переключить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>media_add</word_key>
-      <word_default>Add Media Tag...</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugindetails</word_key>
+      <word_default>Change Plugin Details...</word_default>
+      <word_custom>Изменить плагин</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_stripsearch_info</word_key>
-      <word_default>Removes content within this bbcode from the search results entirely.</word_default>
-      <word_custom>Удал�ет �одержимое BB-кода из результатов пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_removeplugin</word_key>
+      <word_default>Remove Plugin...</word_default>
+      <word_custom>Удалить плагин</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_stripsearch</word_key>
-      <word_default>Strip from search results</word_default>
-      <word_custom>Вырезать из результатов пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_repstatsev</word_key>
+      <word_default><![CDATA[Report Statuses &amp; Severity]]></word_default>
+      <word_custom>Стату�ы жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_protected_info</word_key>
-      <word_default>Prevents users from being able to delete this BBCode</word_default>
-      <word_custom>�е позвол�ть пользовател�м удал�ть �тот BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_images</word_key>
+      <word_default>Images</word_default>
+      <word_custom>Изображени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_protected</word_key>
-      <word_default>BBCode protected?</word_default>
-      <word_custom>Защищенный BB-код ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_position</word_key>
+      <word_default>Position</word_default>
+      <word_custom>Позици�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_contdial_info</word_key>
-      <word_default><![CDATA[Help text to use above the 'Content' text field.]]></word_default>
-      <word_custom><![CDATA[Тек�т дл� помощи по и�пользованию пол� 'Content']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_complete_report</word_key>
+      <word_default>Complete Report</word_default>
+      <word_custom>Завершить жалобу</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_contdial</word_key>
-      <word_default><![CDATA[Enter 'content' dialogue text]]></word_default>
-      <word_custom><![CDATA[Под�казка дл� 'content']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_newstatus</word_key>
+      <word_default>Create New Status...</word_default>
+      <word_custom>Добавить �тату�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_optdial_info</word_key>
-      <word_default><![CDATA[Help text to use above the 'Option' text field.]]></word_default>
-      <word_custom><![CDATA[Тек�т дл� помощи по и�пользованию пол� 'Option'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_active_report</word_key>
+      <word_default>Active Report</word_default>
+      <word_custom>�ктивна� жалоба</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_optdial</word_key>
-      <word_default><![CDATA[Enter 'option' dialogue text]]></word_default>
-      <word_custom><![CDATA[Под�казка дл� 'option']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_addimg</word_key>
+      <word_default>Add Image...</word_default>
+      <word_custom>Добавить изображение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_image_info_loc</word_key>
-      <word_default>Image should be in public/style_images/(skin_directory)/rte_icons/</word_default>
-      <word_custom>Изображение должно находить�� в директории public/style_images/(директори�_�тил�)/rte_icons/ </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_editstatus</word_key>
+      <word_default>Edit Status...</word_default>
+      <word_custom>Изменить �тату�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_image_info</word_key>
-      <word_default>Button is used if populated, else bbcode is placed into editor other styles menu.</word_default>
-      <word_custom>Е�ли изображение указано, то оно будет отображать�� в виде кнопки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_new_report</word_key>
+      <word_default>New Report</word_default>
+      <word_custom>�ова� жалоба</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_image</word_key>
-      <word_default>BBCode Image</word_default>
-      <word_custom>Изображение BB-кода</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_editimg</word_key>
+      <word_default>Edit Image...</word_default>
+      <word_custom>Изменить изображение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_whereused_info</word_key>
-      <word_default>You can enable and disable this BBCode in different sections individually</word_default>
-      <word_custom>Можно включать или отключать �тот BB-код в разных разделах по отдельно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_removestatus</word_key>
+      <word_default>Remove Status...</word_default>
+      <word_custom>Удалить �тату�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_whereused</word_key>
-      <word_default>Where can the BBCode be used?</word_default>
-      <word_custom>Где BB-код может и�пользовать�� ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_totalcomments</word_key>
+      <word_default>Total Comments</word_default>
+      <word_custom>В�его комментариев</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_assoc_app</word_key>
-      <word_default>BBCode Application</word_default>
-      <word_custom>Приложение BB-кодов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_totalreports</word_key>
+      <word_default>Total Reports</word_default>
+      <word_custom>В�его жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_groups</word_key>
-      <word_default>Which groups can use this BBCode?</word_default>
-      <word_custom>Каким группам разрешено и�пользовать �тот код ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_activeplugins</word_key>
+      <word_default>Active Plugins</word_default>
+      <word_custom>Включенных плагинов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_groups_infp</word_key>
-      <word_default>If none selected, no groups can use the BBCode</word_default>
-      <word_custom>Е�ли ни одной группы не выбрано, то ни одна группа не �может и�пользовать BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_removeimg</word_key>
+      <word_default>Remove Image...</word_default>
+      <word_custom>Удалить изображение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_php_info_loc</word_key>
-      <word_default><![CDATA[File should be placed in 'admin/sources/classes/bbcode/custom/']]></word_default>
-      <word_custom><![CDATA[Файл должен быть помещен в директорию 'admin/sources/classes/bbcode/custom/']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_graphstats</word_key>
+      <word_default>Graph Stats</word_default>
+      <word_custom>Стати�тиче�кий график </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_php_info</word_key>
-      <word_default><![CDATA[If used, overrides previous setting<br />Useful if you need to perform regular expressions or conditional parsing]]></word_default>
-      <word_custom><![CDATA[Введенное значение отмен�ет предыдущую на�тройку<br />И�пользуйте когда необходимо и�пользовать регул�рные выражени� или у�ловную обработку]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_rcpluginstitle</word_key>
+      <word_default>Report Center Plugins</word_default>
+      <word_custom>Дополнени� центра уведомлений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_php</word_key>
-      <word_default>OR PHP file to execute</word_default>
-      <word_custom>ИЛИ PHP файл дл� и�полнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_registernew</word_key>
+      <word_default>Register New Report Plugin</word_default>
+      <word_custom>Реги�траци� нового плагина �и�темы жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_noparse_info</word_key>
-      <word_default>Prevents parsing of other BBCodes within this BBCode</word_default>
-      <word_custom>Предотвращает обработку других BB-кодов внутри �того BB-кода</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_plugintitle</word_key>
+      <word_default>Plugin Title</word_default>
+      <word_custom>�азвание плагина</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_replace</word_key>
-      <word_default>Custom BBCode Replacement</word_default>
-      <word_custom>Шаблон замены BB-кода</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_version</word_key>
+      <word_default>Version</word_default>
+      <word_custom>Вер�и�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_replace_info</word_key>
-      <word_default><![CDATA[&lt;tag&gt;{content}&lt;/tag&gt;<br />&lt;tag thing='{option}'&gt;{content}&lt;/tag&gt;<br />Note: Javascript cannot be used.]]></word_default>
-      <word_custom><![CDATA[HTML-код, которым должен быть заменен BB-код.<br />&lt;tag&gt;{content}&lt;/tag&gt;<br />&lt;tag thing='{option}'&gt;{content}&lt;/tag&gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_description</word_key>
+      <word_default>Brief Description</word_default>
+      <word_custom>Краткое опи�ание</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_noparse</word_key>
-      <word_default>Prevent other codes parsing?</word_default>
-      <word_custom>Предотвращать разбор вложенных кодов ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_whatcall</word_key>
+      <word_default>If you categorized reports by plugin, what would you call this section?</word_default>
+      <word_custom>Как бы вы назвали жалобы �того плагина?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_switch_info</word_key>
-      <word_default><![CDATA[Use this if you wish to swap the {content} for {option} (i.e. when using tags like [tag={content}]{option}[/tag])]]></word_default>
-      <word_custom><![CDATA[И�пользует�� дл� �оздани� тега вида [tag={content}]{option}[/tag]. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_groups_info</word_key>
+      <word_default>Specify what groups can view and manage reports by this plugin. Specific permissions are handled by the plugin itself.</word_default>
+      <word_custom>Выберите группы пользователей, которые �могут про�матривать и управл�ть жалобами �того плагина. Специальные разрешени� плагин обрабатывает �ам.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_optional_info</word_key>
-      <word_default>Is the option value optional?</word_default>
-      <word_custom>Значение option необ�зательно?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_groups</word_key>
+      <word_default>Groups that can view reports</word_default>
+      <word_custom>Группы пользователей, которые могут про�матривать жалобы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_switch</word_key>
-      <word_default>Switch option and content?</word_default>
-      <word_custom>Помен�ть option и content ме�тами?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_editplugin</word_key>
+      <word_default>Edit Report Plugin</word_default>
+      <word_custom>Изменение плагина жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_optional</word_key>
-      <word_default>Option is optional?</word_default>
-      <word_custom>option об�зательно ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_useoption</word_key>
-      <word_default>Use Option in tag?</word_default>
-      <word_custom>И�пользовать опции в теге?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_pluginfile</word_key>
+      <word_default>Plugin File</word_default>
+      <word_custom>Файл плагина</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_useoption_info</word_key>
-      <word_default><![CDATA[Use to create [tag=option] style tags]]></word_default>
-      <word_custom><![CDATA[И�пользует�� дл� �оздани� BB-кода � опци�ми: [tag=option]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_groups_submit</word_key>
+      <word_default>Groups that can submit reports</word_default>
+      <word_custom>Группы пользователей, которые могут отправл�ть жалобы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_aliases_info</word_key>
-      <word_default><![CDATA[Comma-separated list of other aliases for 'Custom BBCode Tag']]></word_default>
-      <word_custom>Спи�ок п�евдонимов дл� данного тега (разделитель зап�та�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_groups_submit_info</word_key>
+      <word_default>Control which groups can submit reports in this plugin</word_default>
+      <word_custom>Выберите группы пользователей, которые �могут отправл�ть жалобы �того плагина</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_singletag</word_key>
-      <word_default>Single Tag Only</word_default>
-      <word_custom>Одиночный тег?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_pluginenabled</word_key>
+      <word_default>Plugin Enabled</word_default>
+      <word_custom>Включить плагин?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_singletag_info</word_key>
-      <word_default><![CDATA[Only the 'opening' tag is required<br />Example: [hr] to create a &lt;hr /&gt; HTML tag]]></word_default>
-      <word_custom><![CDATA[Со�тоит из одного открывающего тега<br />Пример: [hr] дл� HTML тега &lt;hr /&gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_safemode</word_key>
+      <word_default>Enable Safemode? (Cannot be deleted or edited by user)</word_default>
+      <word_custom>Включить безопа�ный режим ? (�е может быть изменен или удален пользователем)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_aliases</word_key>
-      <word_default>Custom BBCode Aliases (Optional)</word_default>
-      <word_custom>П�евдонимы (опционально)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_authorname</word_key>
+      <word_default>Author Name</word_default>
+      <word_custom>�втор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_example_info</word_key>
-      <word_default><![CDATA[Use the tag in the example: [tag]This is an example![/tag]]]></word_default>
-      <word_custom><![CDATA[И�пользует�� во в�плывающей под�казке BB-кода<br />Тег дл� примера: [tag]Зде�ь ваш пример![/tag]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_authorurl</word_key>
+      <word_default>Author URL</word_default>
+      <word_custom>URL адре� �траницы автора</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_tag_info</word_key>
-      <word_default><![CDATA[Example: For [tag] enter <b>tag</b>]]></word_default>
-      <word_custom><![CDATA[Пример: Дл� [tag] введите <b>tag</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_image_info</word_key>
+      <word_default><![CDATA[Full path of image. You can use <i>&lt;&#35;IMG_DIR&#35;&gt;</i> to use a graphic from the user skin]]></word_default>
+      <word_custom><![CDATA[Полный путь к изображению. Вы можете и�пользовать <i>&lt;&#35;IMG_DIR&#35;&gt;</i> дл� и�пользовани� изображени� из пользователь�кого �тил�.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_useinguide</word_key>
-      <word_default>Used on the BBCode help guides</word_default>
-      <word_custom>И�пользует�� на �траницах помощи по BB-кодам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_image</word_key>
+      <word_default>Image</word_default>
+      <word_custom>Изображение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_description</word_key>
-      <word_default>Custom BBCode Description</word_default>
-      <word_custom>Полное опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_width</word_key>
+      <word_default>Width</word_default>
+      <word_custom>Ширина</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_example</word_key>
-      <word_default>Custom BBCode Example</word_default>
-      <word_custom>Пример и�пользовани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>r_height</word_key>
+      <word_default>Height</word_default>
+      <word_custom>Вы�ота</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_confimage</word_key>
+      <word_default>Configure Image</word_default>
+      <word_custom>�а�тройка изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_points_info</word_key>
+      <word_default>How many points are needed to display graphic.</word_default>
+      <word_custom>Сколько необходимо баллов дл� показа изображени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_points</word_key>
+      <word_default>Points</word_default>
+      <word_custom>Баллы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_create_status</word_key>
+      <word_default>Create Status</word_default>
+      <word_custom>Создать �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_edit_status</word_key>
+      <word_default>Edit Status</word_default>
+      <word_custom>Изменение �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_name_info</word_key>
+      <word_default>What would you like to call this status?</word_default>
+      <word_custom>Как бы вы назвали �тот �тату�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_pointsper</word_key>
+      <word_default>Points per report</word_default>
+      <word_custom>Баллов на жалобу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_pointsper_info</word_key>
+      <word_default>How many points a single report worth. Points are used in displaying severity images.</word_default>
+      <word_custom>Количе�тво баллов на жалобу. Баллы и�пользуют�� дл� показа �оответ�твующего изображени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_minutes</word_key>
+      <word_default>Minutes to one point</word_default>
+      <word_custom>Минут на один балл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_minutes_info</word_key>
+      <word_default>How many minutes it takes to gain a single point. Points are used in displaying severity images.</word_default>
+      <word_custom>Количе�тво минут на один балл. Баллы и�пользуют�� дл� показа �оответ�твующего изображени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_nostattitle</word_key>
+      <word_default>You must enter a status title</word_default>
+      <word_custom>Вы должны вве�ти название �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_messages_enter</word_key>
+      <word_default>Groups that can add themselves to conversations</word_default>
+      <word_custom>Группы пользователей, которые могут добавл�ть �ебе в об�уждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>r_menter_desc</word_key>
+      <word_default>Specify which groups can add themselves to reported conversations</word_default>
+      <word_custom>Выберите группы пользователей, которые �могут добавл�ть �еб� в об�уждени� жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>config_rc_settings</word_key>
+      <word_default>Configure Settings</word_default>
+      <word_custom>Изменить на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>ctype__reports</word_key>
+      <word_default>Reported Content</word_default>
+      <word_custom>Проблемный контент</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -13849,549 +11256,6 @@
       <word_key>ctype__topics</word_key>
       <word_default>Topics and Replies</word_default>
       <word_custom>Темы и ответы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>ctype__announcement</word_key>
-      <word_default>Announcements</word_default>
-      <word_custom>Объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>ctype__rules</word_key>
-      <word_default>Forum Rules</word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_title_title</word_key>
-      <word_default>Custom BBCode Title</word_default>
-      <word_custom>BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>available_sections</word_key>
-      <word_default>Available in all sections</word_default>
-      <word_custom>До�тупен во в�ех разделах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>all_groups</word_key>
-      <word_default>All current and future groups</word_default>
-      <word_custom>В�е текущие и будущие группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcache_action</word_key>
-      <word_default>Drop all %s cached items?</word_default>
-      <word_custom>Удалить кеш в�ех %s объектов?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcache_desc</word_key>
-      <word_default>The content cache is enabled which means that any changes to this BBCode will not be automatically applied to previous posts unless you remove all cached content.</word_default>
-      <word_custom>Задей�твовано кеширование �одержимого, �то значит, что любые изменени� �того BB-кода не будут автоматиче�ки применены к предыдущим �ообщени�м до тех пор пока не будет удалено кешированное �одержимое.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcache_title</word_key>
-      <word_default>Content Cache Enabled</word_default>
-      <word_custom>Кеширование �одержимого включено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>custom_bbcode_head</word_key>
-      <word_default>Custom BBCode</word_default>
-      <word_custom>Пользователь�кий BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>export_bbcode_all</word_key>
-      <word_default>Export (Apps)</word_default>
-      <word_custom>Эк�порт в приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>import_bbcode_all</word_key>
-      <word_default>Import (Apps)</word_default>
-      <word_custom>Импорт из приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_header</word_key>
-      <word_default>Custom BBCodes</word_default>
-      <word_custom>Пользователь�кие BB-коды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>delete_bbcode</word_key>
-      <word_default>Delete BBCode...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>edit_bbcode</word_key>
-      <word_default>Edit BBCode...</word_default>
-      <word_custom>Изменить BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>export_bbcode</word_key>
-      <word_default>Export (XML)</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>addnew_bbcode</word_key>
-      <word_default>Add BBCode</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>upload_bbcode_dupe</word_key>
-      <word_default>Duplicate entries will not be imported</word_default>
-      <word_custom>Суще�твующие запи�и импортированы не будут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>upload_bbcode_xml</word_key>
-      <word_default><![CDATA[<strong>Upload XML BBCode List</strong>]]></word_default>
-      <word_custom><![CDATA[ <strong>Загрузка XML �пи�ка BB-кодов </strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>import_new_bbcode</word_key>
-      <word_default>Import New BBCodes</word_default>
-      <word_custom>Импортировать новые BB-коды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_import</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>enter_test_parse</word_key>
-      <word_default>Enter the post content to test parse here</word_default>
-      <word_custom>Введите тек�т дл� проверки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>test_parse</word_key>
-      <word_default>Test BBCode Parsing</word_default>
-      <word_custom>Проверка работы BB-кодов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_tag</word_key>
-      <word_default>Custom BBCode Tag</word_default>
-      <word_custom>Тег</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Параметры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>your_bbcodes</word_key>
-      <word_default>Your Custom BBcodes</word_default>
-      <word_custom>Пользователь�кие BB-коды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>add_edit</word_key>
-      <word_default>Add/Edit BBCode</word_default>
-      <word_custom>Добавить/Изменить BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_title</word_key>
-      <word_default>Custom BBCode</word_default>
-      <word_custom>BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_tag_updated</word_key>
-      <word_default><![CDATA[Media Tag replacement '%s' updated]]></word_default>
-      <word_custom><![CDATA[Медиа-тег '%s' обновлен]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_tag_added</word_key>
-      <word_default><![CDATA[Media Tag replacement '%s' added.]]></word_default>
-      <word_custom><![CDATA[Медиа-тег '%s' добавлен]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_error_replace</word_key>
-      <word_default><![CDATA[<li>You must specify Media Tag replacement HTML.</li>]]></word_default>
-      <word_custom><![CDATA[<li>Вы должны вве�ти шаблон замены медиа-тега.</li>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_manager</word_key>
-      <word_default>Media Tag Manager</word_default>
-      <word_custom>Управление медиа-тегами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_error_match</word_key>
-      <word_default><![CDATA[<li>You must specify a Media Tag match string.</li>]]></word_default>
-      <word_custom><![CDATA[<li>�еобходимо указать �троку �овпадени� медиа-тега.</li>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_error_name</word_key>
-      <word_default><![CDATA[<li>You must specify a Media Tag replacement title.</li>]]></word_default>
-      <word_custom><![CDATA[<li>Вы должны вве�ти название медиа-тега</li>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_replace_removed</word_key>
-      <word_default>Media Tag replacement removed.</word_default>
-      <word_custom>Медиа-тег удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_import_complete</word_key>
-      <word_default>Media Tag XML file import completed</word_default>
-      <word_custom>Импорт XML файла медиа-тегов завершен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>m_upload_failed</word_key>
-      <word_default>Upload failed.  The Media Tag XML file was missing, empty, or corrupted.</word_default>
-      <word_custom>Загрузка не удала�ь. XML файл не найден или поврежден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>edited_bbcode</word_key>
-      <word_default>Custom BBCode Edited</word_default>
-      <word_custom>Дополнительный BB-код изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>new_bbcode</word_key>
-      <word_default>New BBCode Added</word_default>
-      <word_custom>Дополнительный BB-код добавлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>must_use_option</word_key>
-      <word_default><![CDATA[You must use {option} somewhere in the BBCode replacement section or set 'Use Option in tag?' to 'no'.]]></word_default>
-      <word_custom>Дл� BB-кодов � опци�ми необходимо и�пользовать тег {option}</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>must_use_content</word_key>
-      <word_default><![CDATA[You must use {content} somewhere in the BBCode replacement section unless 'Custom BBCode Single Tag Only' is set to 'yes'.]]></word_default>
-      <word_custom>Дл� не одиночных BB-кодов необходимо и�пользовать тег {content}</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>complete_form</word_key>
-      <word_default>You must complete the form fully.</word_default>
-      <word_custom>Вы должны заполнить форму полно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>tag_already</word_key>
-      <word_default>The tag you entered is already in use.</word_default>
-      <word_custom>Тег уже и�пользует�� в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>no_bbcode_found_edit</word_key>
-      <word_default>We could not determine which BBCode you were attempting to edit.</word_default>
-      <word_custom>�е удало�ь определить какой код вы хотите отредактировать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_test</word_key>
-      <word_default><![CDATA[<strong>BBCode Test:</strong><br /><br />]]></word_default>
-      <word_custom><![CDATA[<strong>Те�т BBCode:</strong><br /><br />  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>no_bbcode_found_delete</word_key>
-      <word_default>We could not find the BBCode you were attempting to delete.</word_default>
-      <word_custom>�е удало�ь определить какой код вы хотите удалить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>import_complete</word_key>
-      <word_default>BBCode XML file import completed.</word_default>
-      <word_custom>Импорт XML файла BB-кода завершен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>upload_failed</word_key>
-      <word_default>Upload failed.  The BBCode XML file was missing, empty, or corrupted.</word_default>
-      <word_custom>Загрузка не удала�ь. XML файл � BB-кодами либо пу�т, либо �одержит неверную �труктуру.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_import_app</word_key>
-      <word_default>%s: %s BBcode inserted, %s updated</word_default>
-      <word_custom>%s: %s BB-кодов добавлено, %s обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_customregex_info</word_key>
-      <word_default>Use this field to define a regular expression to filter the option content through before outputting to the page.  If option value does not match expression, tag will not be parsed.</word_default>
-      <word_custom>И�пользуйте данное поле, чтобы указать регул�рное выражение, при помощи которого будет о�уще�твл�ть�� фильтраци� �одержимого, заключенного в теги бб-кода, при выводе. Е�ли �одержимое не удовлетвор�ет выражению, тег не будет обработан.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_customregex</word_key>
-      <word_default>Option Regular Expression Filter</word_default>
-      <word_custom>Фильтр � и�пользованием регул�рных выражений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>must_use_unique_btag</word_key>
-      <word_default>You must supply a unique bbcode tag.</word_default>
-      <word_custom>�еобходимо и�пользовать уникальное значение дл� bb-код тега.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>bbcode_alpha_num</word_key>
-      <word_default>You may only use alpha-numeric characters in the bbcode tag and aliases</word_default>
-      <word_custom>В теге bb-кода можно и�пользовать только цифры и буквы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>tag_already_alias</word_key>
-      <word_default><![CDATA[The tag %s is in use as an alias of <strong>%s</strong>]]></word_default>
-      <word_custom><![CDATA[Тег %s уже и�пользует�� как �иноним <strong>%s</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>pointssuffix</word_key>
-      <word_default>Points</word_default>
-      <word_custom>баллов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14399,19 +11263,20 @@
       <word_key>ctype__signatures</word_key>
       <word_default>Signatures</word_default>
       <word_custom>Подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>ctype__aboutme</word_key>
-      <word_default>About Me</word_default>
-      <word_custom>Обо мне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ctype__rules</word_key>
+      <word_default>Forum Rules</word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>ctype__announcement</word_key>
+      <word_default>Announcements</word_default>
+      <word_custom>Объ�влени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14419,9 +11284,13 @@
       <word_key>ctype__pms</word_key>
       <word_default>Private Messages</word_default>
       <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>ctype__aboutme</word_key>
+      <word_default>About Me</word_default>
+      <word_custom>Обо мне</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14429,9 +11298,6 @@
       <word_key>ctype__warn</word_key>
       <word_default>Warn logs/notes</word_default>
       <word_custom>Журналы предупреждений/заметок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14439,29 +11305,6 @@
       <word_key>ctype__calendar</word_key>
       <word_default>Calendar</word_default>
       <word_custom>Календарь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>ctype__galimg</word_key>
-      <word_default>Submitting Images in IP.Gallery</word_default>
-      <word_custom>Добавление изображений IP.Gallery</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>ctype__galcom</word_key>
-      <word_default>Submitting Comments in IP.Gallery</word_default>
-      <word_custom>Добавление комментариев IP.Gallery</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14469,29 +11312,13 @@
       <word_key>ctype__blogent</word_key>
       <word_default>Submitting entries in IP.Blog</word_default>
       <word_custom>Добавление запи�ей в IP.Blog</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>ctype__blogcom</word_key>
-      <word_default>Submitting comments in IP.Blog</word_default>
-      <word_custom>Добавление комментариев в IP.Blog</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_posts</word_pack>
-      <word_key>ctype__blogblc</word_key>
-      <word_default>IP.Blog Custom Blocks</word_default>
-      <word_custom>Пользователь�кие блоки IP.Blog</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ctype__galimg</word_key>
+      <word_default>Submitting Images in IP.Gallery</word_default>
+      <word_custom>Добавление изображений IP.Gallery</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14499,19 +11326,20 @@
       <word_key>ctype__idmfile</word_key>
       <word_default>Submitting Files in IP.Downloads</word_default>
       <word_custom>Добавление файлов в IP.Downloads</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_posts</word_pack>
-      <word_key>ctype__idmcom</word_key>
-      <word_default>Submitting Comments in IP.Downloads</word_default>
-      <word_custom>Добавление комментариев IP.Downloads</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ctype__blogblc</word_key>
+      <word_default>IP.Blog Custom Blocks</word_default>
+      <word_custom>Пользователь�кие блоки IP.Blog</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>ctype__comments</word_key>
+      <word_default>Submitting Comments</word_default>
+      <word_custom>Добавление комментариев</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14519,439 +11347,20 @@
       <word_key>ctype__support</word_key>
       <word_default>Support Requests in IP.Nexus</word_default>
       <word_custom>Запро� поддержки в IP.Commerce </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_posts</word_pack>
+      <word_key>emodir_not_write</word_key>
+      <word_default>All of your emoticon directories must be writable in order to import an emoticon pack.  The following folder is not writable: %s</word_default>
+      <word_custom>В�е директории дл� размещени� �майликов должны иметь право на запи�ь. Следующа� директори� таких прав не имеет: %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_security</word_pack>
-      <word_key>skin_th_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_th_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_th_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_th_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_th_primary_group</word_key>
-      <word_default>Primary Group</word_default>
-      <word_custom>О�новна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_th_secondary_group</word_key>
-      <word_default>Secondary Groups</word_default>
-      <word_custom>Второ�тепенна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>skin_header_admins</word_key>
-      <word_default>Members With ACP Access</word_default>
-      <word_custom>Пользователи, имеющие до�туп в �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_your_cp_directory_has_now_been</word_key>
-      <word_default>Your ACP directory has now been renamed.</word_default>
-      <word_custom>Теперь директори� вашего админцентра изменена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_change_the_line_define_cp_dire</word_key>
-      <word_default><![CDATA[Change the line: <pre>define( 'CP_DIRECTORY', '<strong>admin</strong>' );</pre> to <pre>define( 'CP_DIRECTORY', '<strong>admin_secret</strong>' );</pre>]]></word_default>
-      <word_custom><![CDATA[Измените �троку: <pre>define( 'CP_DIRECTORY', '<strong>admin</strong>' );</pre> на <pre>define( 'CP_DIRECTORY', '<strong>admin_secret</strong>' );</pre>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_locate_the_initdataphp_file_th</word_key>
-      <word_default><![CDATA[Locate the 'initdata.php' file. This is in your root IP.Board folder. Download it and open it in a text editor.]]></word_default>
-      <word_custom><![CDATA[�айдите файл 'initdata.php'. Он находит�� в корневой директории IPB. Скачайте его и откройте в тек�товом редакторе.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_near_the_top_of_this_file_youl</word_key>
-      <word_default><![CDATA[Near the top of this file, you'll see:]]></word_default>
-      <word_custom>В �амом верху файла вы увидите �ледующие �троки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_locate_the_admin_directory_cho</word_key>
-      <word_default><![CDATA[Locate the 'admin' directory. Choose 'rename' from your FTP client menu and rename it. For the purposes of this 				tutorial, we'll rename it 'admin_secret'.]]></word_default>
-      <word_custom><![CDATA[�айдите директорию 'admin'. Он �одержит один файл - 'index.php'. Выберите команду «Переименовать» в вашей FTP-программе и укажите новое название. В �той ин�трукции мы будем и�пользовать название 'admin_secret'. Е�ли у ва� в указанной директории �оздан файл защиты '.htaccess', вы ДОЛЖ�Ы его удалить. В противном �лучае вы не �можете авторизовать�� в админцентр. Вы �можете �оздать �тот файл заново по�ле выполнени� �ледующего шага.  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_ipboard_has_a_dedicated_direct</word_key>
-      <word_default>IP.Board has a dedicated directory for the administration center. To further enhance security, you can rename this ACP directory.</word_default>
-      <word_custom>Invision Power Board обнаружил директорию админцентра. В цел�х повышени� безопа�но�ти, вы можете изменить �ту директорию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_step_1</word_key>
-      <word_default>Step 1:</word_default>
-      <word_custom>Шаг 1:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_first_youll_need_to_physically</word_key>
-      <word_default><![CDATA[First, you'll need to physically rename the directory. Connect to your server via FTP and then browse to your IP.Board directory (this is the one that has your 				index.php file in it).]]></word_default>
-      <word_custom><![CDATA[Во-первых, вы должны переименовать директорию. Подключите�ь к �ерверу при помощи FTP и найдите директорию � IPB (директори�, в котором находит�� файл 'index.php').]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_renaming_the_cp_sitecontrol_di</word_key>
-      <word_default><![CDATA[Renaming the ACP "admin" directory]]></word_default>
-      <word_custom>Изменение директории �Ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_please_create_a_file_called_ht</word_key>
-      <word_default><![CDATA[Please create a file called ".htpasswd" and copy the contents below into it. Once saved, upload this new file into your 'admin' folder.]]></word_default>
-      <word_custom><![CDATA[Пожалуй�та �оздайте файл � названием ".htpasswd". Добавьте ниже�ледующие �троки в него и загрузите его в директорию 'admin' на �ервере.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_please_create_a_file_called_ht_1</word_key>
-      <word_default><![CDATA[Please create a file called ".htaccess" and copy the contents below into it. Once saved, upload this new file into your 'admin' folder.]]></word_default>
-      <word_custom><![CDATA[Пожалуй�та �оздайте файл � названием ".htaccess". Добавьте ниже�ледующие �троки в него и загрузите его в директорию 'admin' на �ервере.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_password</word_key>
-      <word_default>Password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_proceed</word_key>
-      <word_default>Proceed</word_default>
-      <word_custom>Создать файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_cp_htaccess_protection</word_key>
-      <word_default>ACP .htaccess protection</word_default>
-      <word_custom><![CDATA[Защита файлом '.htaccess' �Ц]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_ipboard_is_unable_to_write_int</word_key>
-      <word_default>IP.Board is unable to write into your admin directory</word_default>
-      <word_custom>IP.Board не может �оздать файл в директории админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_username</word_key>
-      <word_default>Username</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_using_this_tool_will_overwrite</word_key>
-      <word_default>Using this tool will overwrite any current protection in your admin directory. You will also be required to enter the username and password immediately after saving.</word_default>
-      <word_custom>И�пользу� �тот ин�трумент, вы перезапишите любой имеющий�� файл защиты в директории админцентра. По�ле �охранени� данных, вам будет предложено вве�ти указанные им� пользовател� и пароль. Хотим заметить, что е�ли вы переименуете директорию админцентра, вам так же будет необходимо удалить �тот файл при помощи FTP-клиента — в противном �лучае до�туп в админцентр дл� ва� будет заблокирован.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_please_note</word_key>
-      <word_default>Please note</word_default>
-      <word_custom>Помните</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_invision_power_board_can_write</word_key>
-      <word_default>Invision Power Board can write .htaccess protection into your admin directory.</word_default>
-      <word_custom><![CDATA[Invision Power Board может �оздать файл '.htaccess', который защитит директорию админцентра. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_information</word_key>
-      <word_default>information</word_default>
-      <word_custom>информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_acp_htaccess_protection</word_key>
-      <word_default>ACP .htaccess protection</word_default>
-      <word_custom><![CDATA[Защита файлом '.htaccess' �Ц]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_your_installation_is_checked_a</word_key>
-      <word_default>Your installation is checked and suggestions are made on how to improve the security of your board.</word_default>
-      <word_custom>При помощи на�троек и ин�трументов ниже вы �можете проверить и повы�ить безопа�но�ть вашего IPB.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_the_security_center_is_a_centr</word_key>
-      <word_default>The Security Center is a centralized repository of security tools and settings.</word_default>
-      <word_custom>Центр безопа�но�ти — �то хранилище ин�трументов и на�троек, отвечающих за безопа�но�ть форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_ipboard_security_center</word_key>
-      <word_default>IP.Board Security Center</word_default>
-      <word_custom>Центр безопа�но�ти IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_last_modified</word_key>
-      <word_default>Last Modified</word_default>
-      <word_custom>По�леднее изменение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_file_size</word_key>
-      <word_default>(File Size)</word_default>
-      <word_custom>(размер файла)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_executable_files</word_key>
-      <word_default>Executable Files</word_default>
-      <word_custom>И�полн�емые файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_modified_in_the_past_30_days</word_key>
-      <word_default>Modified in the past 30 days</word_default>
-      <word_custom>измененные за по�ледние 30 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_files_55k_or_larger</word_key>
-      <word_default>Files 55k or larger</word_default>
-      <word_custom>файлы размером �выше 55k</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_score_9_or_more</word_key>
-      <word_default>Score 9 or more</word_default>
-      <word_custom>� рейтингом 9 или выше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_score_8_or_more</word_key>
-      <word_default>Score 8 or more</word_default>
-      <word_custom>� рейтингом 8 или выше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_score_7_or_more</word_key>
-      <word_default>Score 7 or more</word_default>
-      <word_custom>� рейтингом 7 или выше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_score_6_or_more</word_key>
-      <word_default>Score 6 or more</word_default>
-      <word_custom>� рейтингом 6 или выше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_score_5_or_more</word_key>
-      <word_default>Score 5 or more</word_default>
-      <word_custom>� рейтингом 5 или выше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_show_all</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_security</word_pack>
-      <word_key>sec_show</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sec_filter</word_key>
+      <word_default>Filter</word_default>
+      <word_custom>Фильтр</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14959,39 +11368,279 @@
       <word_key>h3_title_security</word_key>
       <word_default>Security Tools Available</word_default>
       <word_custom>До�тупные ин�трументы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_security</word_pack>
-      <word_key>skin_edit_member</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sec_show</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Показать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_security</word_pack>
-      <word_key>skin_header_virus</word_key>
-      <word_default>Unauthorized File Checked Folders</word_default>
-      <word_custom>Проверенные директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sec_score_9_or_more</word_key>
+      <word_default>Score 9 or more</word_default>
+      <word_custom>� рейтингом 9 или выше</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_security</word_pack>
-      <word_key>skin_suspicious_files</word_key>
-      <word_default>Suspicious Files</word_default>
-      <word_custom>Подозрительные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sec_files_55k_or_larger</word_key>
+      <word_default>Files 55k or larger</word_default>
+      <word_custom>файлы размером �выше 55k</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_show_all</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_score_5_or_more</word_key>
+      <word_default>Score 5 or more</word_default>
+      <word_custom>� рейтингом 5 или выше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_score_6_or_more</word_key>
+      <word_default>Score 6 or more</word_default>
+      <word_custom>� рейтингом 6 или выше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_score_7_or_more</word_key>
+      <word_default>Score 7 or more</word_default>
+      <word_custom>� рейтингом 7 или выше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_score_8_or_more</word_key>
+      <word_default>Score 8 or more</word_default>
+      <word_custom>� рейтингом 8 или выше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_modified_in_the_past_30_days</word_key>
+      <word_default>Modified in the past 30 days</word_default>
+      <word_custom>измененные за по�ледние 30 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_your_installation_is_checked_a</word_key>
+      <word_default>Your installation is checked and suggestions are made on how to improve the security of your community.</word_default>
+      <word_custom>При помощи на�троек и ин�трументов ниже вы �можете проверить и повы�ить безопа�но�ть вашего IPB.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_last_modified</word_key>
+      <word_default>Last Modified</word_default>
+      <word_custom>По�леднее изменение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_ipboard_security_center</word_key>
+      <word_default>IP.Board Security Center</word_default>
+      <word_custom>Центр безопа�но�ти IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_the_security_center_is_a_centr</word_key>
+      <word_default>The Security Center is a centralized repository of security tools and settings.</word_default>
+      <word_custom>Центр безопа�но�ти — �то хранилище ин�трументов и на�троек, отвечающих за безопа�но�ть форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_executable_files</word_key>
+      <word_default>Executable Files</word_default>
+      <word_custom>И�полн�емые файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_file_size</word_key>
+      <word_default>(File Size)</word_default>
+      <word_custom>(размер файла)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_acp_htaccess_protection</word_key>
+      <word_default>ACP .htaccess protection</word_default>
+      <word_custom><![CDATA[Защита файлом '.htaccess' �Ц]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_invision_power_board_can_write</word_key>
+      <word_default>IP.Board can write .htaccess protection into your admin directory.</word_default>
+      <word_custom><![CDATA[Invision Power Board может �оздать файл '.htaccess', который защитит директорию админцентра. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_information</word_key>
+      <word_default>information</word_default>
+      <word_custom>информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_please_note</word_key>
+      <word_default>Please note</word_default>
+      <word_custom>Помните</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_using_this_tool_will_overwrite</word_key>
+      <word_default>Using this tool will overwrite any current protection in your admin directory. You will also be required to enter the username and password immediately after saving.</word_default>
+      <word_custom>И�пользу� �тот ин�трумент, вы перезапишите любой имеющий�� файл защиты в директории админцентра. По�ле �охранени� данных, вам будет предложено вве�ти указанные им� пользовател� и пароль. Хотим заметить, что е�ли вы переименуете директорию админцентра, вам так же будет необходимо удалить �тот файл при помощи FTP-клиента — в противном �лучае до�туп в админцентр дл� ва� будет заблокирован.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_cp_htaccess_protection</word_key>
+      <word_default>ACP .htaccess protection</word_default>
+      <word_custom><![CDATA[Защита файлом '.htaccess' �Ц]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_ipboard_is_unable_to_write_int</word_key>
+      <word_default>IP.Board is unable to write into your admin directory</word_default>
+      <word_custom>IP.Board не может �оздать файл в директории админи�тратора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_proceed</word_key>
+      <word_default>Proceed</word_default>
+      <word_custom>Создать файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_step_1</word_key>
+      <word_default>Step 1:</word_default>
+      <word_custom>Шаг 1:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_renaming_the_cp_sitecontrol_di</word_key>
+      <word_default><![CDATA[Renaming the ACP "admin" directory]]></word_default>
+      <word_custom>Изменение директории �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_please_create_a_file_called_ht</word_key>
+      <word_default><![CDATA[Please create a file called ".htpasswd" and copy the contents below into it. Once saved, upload this new file into your 'admin' folder.]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та �оздайте файл � названием ".htpasswd". Добавьте ниже�ледующие �троки в него и загрузите его в директорию 'admin' на �ервере.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_please_create_a_file_called_ht_1</word_key>
+      <word_default><![CDATA[Please create a file called ".htaccess" and copy the contents below into it. Once saved, upload this new file into your 'admin' folder.]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та �оздайте файл � названием ".htaccess". Добавьте ниже�ледующие �троки в него и загрузите его в директорию 'admin' на �ервере.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_ipboard_has_a_dedicated_direct</word_key>
+      <word_default>IP.Board has a dedicated directory for the administration center. To further enhance security, you can rename this ACP directory.</word_default>
+      <word_custom>Invision Power Board обнаружил директорию админцентра. В цел�х повышени� безопа�но�ти, вы можете изменить �ту директорию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_locate_the_admin_directory_cho</word_key>
+      <word_default><![CDATA[Locate the 'admin' directory. Choose 'rename' from your FTP client menu and rename it. For the purposes of this 				tutorial, we'll rename it 'admin_secret'.]]></word_default>
+      <word_custom><![CDATA[�айдите директорию 'admin'. Он �одержит один файл - 'index.php'. Выберите команду «Переименовать» в вашей FTP-программе и укажите новое название. В �той ин�трукции мы будем и�пользовать название 'admin_secret'. Е�ли у ва� в указанной директории �оздан файл защиты '.htaccess', вы ДОЛЖ�Ы его удалить. В противном �лучае вы не �можете авторизовать�� в админцентр. Вы �можете �оздать �тот файл заново по�ле выполнени� �ледующего шага.  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_first_youll_need_to_physically</word_key>
+      <word_default><![CDATA[First, you'll need to physically rename the directory. Connect to your server via FTP and then browse to your IP.Board directory (this is the one that has your 				index.php file in it).]]></word_default>
+      <word_custom><![CDATA[Во-первых, вы должны переименовать директорию. Подключите�ь к �ерверу при помощи FTP и найдите директорию � IPB (директори�, в котором находит�� файл 'index.php').]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_locate_the_initdataphp_file_th</word_key>
+      <word_default><![CDATA[Locate the 'initdata.php' file. This is in your root IP.Board folder. Download it and open it in a text editor.]]></word_default>
+      <word_custom><![CDATA[�айдите файл 'initdata.php'. Он находит�� в корневой директории IPB. Скачайте его и откройте в тек�товом редакторе.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_change_the_line_define_cp_dire</word_key>
+      <word_default><![CDATA[Change the line: <pre>define( 'CP_DIRECTORY', '<strong>admin</strong>' );</pre> to <pre>define( 'CP_DIRECTORY', '<strong>admin_secret</strong>' );</pre>]]></word_default>
+      <word_custom><![CDATA[Измените �троку: <pre>define( 'CP_DIRECTORY', '<strong>admin</strong>' );</pre> на <pre>define( 'CP_DIRECTORY', '<strong>admin_secret</strong>' );</pre>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_near_the_top_of_this_file_youl</word_key>
+      <word_default><![CDATA[Near the top of this file, you'll see:]]></word_default>
+      <word_custom>В �амом верху файла вы увидите �ледующие �троки: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_header_admins</word_key>
+      <word_default>Members With ACP Access</word_default>
+      <word_custom>Пользователи, имеющие до�туп в �Ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>sec_your_cp_directory_has_now_been</word_key>
+      <word_default>Your ACP directory has now been renamed.</word_default>
+      <word_custom>Теперь директори� вашего админцентра изменена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_secondary_group</word_key>
+      <word_default>Secondary Groups</word_default>
+      <word_custom>Второ�тепенна� группа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14999,469 +11648,55 @@
       <word_key>skin_th_filesize</word_key>
       <word_default><![CDATA[(File Size) &nbsp; Last Modified]]></word_default>
       <word_custom><![CDATA[(Размер) &nbsp; По�леднее изменение]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>bbcode_and_media</word_key>
-      <word_default>BBCode and Media Tags imported</word_default>
-      <word_custom>Добавлены теги bb-кода и медиа-теги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_suspicious_files</word_key>
+      <word_default>Suspicious Files</word_default>
+      <word_custom>Подозрительные файлы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__no_templates</word_key>
-      <word_default>No skin templates added...</word_default>
-      <word_custom>�ет шаблонов дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>continue_button</word_key>
-      <word_default>Continue</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__no_template_re</word_key>
-      <word_default>No skin templates added for this application, skipping template rebuild...</word_default>
-      <word_custom>�ет шаблонов дл� добавлени�. Пропу�каем обновление �тилей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>dup__skip</word_key>
-      <word_default><![CDATA[Skip - don't create those tables]]></word_default>
-      <word_custom>Пропу�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_edit_member</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>dup__drop</word_key>
-      <word_default>Drop original tables and overwrite</word_default>
-      <word_custom>Удалить оригинальные и �оздать новые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_header_virus</word_key>
+      <word_default>Unauthorized File Checked Folders</word_default>
+      <word_custom>Проверенные директории</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>duplicate_tables</word_key>
-      <word_default>Duplicate Tables:</word_default>
-      <word_custom>Суще�твующие таблицы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>version_suffix</word_key>
-      <word_default>Version:</word_default>
-      <word_custom>Вер�и�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>author_suffix</word_key>
-      <word_default>Author:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>applications_title</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>current_version</word_key>
-      <word_default>Current Version:</word_default>
-      <word_custom>Текуща� вер�и�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>please_correct_errors</word_key>
-      <word_default>Please correct these errors before attempting to continue:</word_default>
-      <word_custom>Прежде чем продолжить необходимо и�править �ледующие ошибки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>upgrade_latest</word_key>
-      <word_default>upgrade to the latest version</word_default>
-      <word_custom>обновление до по�ледней вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>install_latest</word_key>
-      <word_default>install the latest version</word_default>
-      <word_custom>у�тановка по�ледней вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>return_to_overview</word_key>
-      <word_default><![CDATA[Click here to return to Applications &amp; Modules overview]]></word_default>
-      <word_custom>�ажмите зде�ь дл� возвращени� к �пи�ку приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>ipboard_setup_title</word_key>
-      <word_default>IP.Board Set Up Utility</word_default>
-      <word_custom>Ин�трумент у�тановки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>ipboard_welcome_setup</word_key>
-      <word_default>Welcome to the IP.Board application set up utility.</word_default>
-      <word_custom>Ва� привет�твует у�тановщик IP.Board.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>progress_report</word_key>
-      <word_default>Progress Report:</word_default>
-      <word_custom>Прогре��:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__text_finished</word_key>
-      <word_default>This %s is now complete</word_default>
-      <word_custom>%s завершен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__upgradet</word_key>
-      <word_default>upgrade</word_default>
-      <word_custom>обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__text</word_key>
-      <word_default>This %s is in progress...</word_default>
-      <word_custom>%s выполн�ет��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__installation</word_key>
-      <word_default>installation</word_default>
-      <word_custom>у�тановка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__continue</word_key>
-      <word_default>Click here to continue (if not automatically redirected)</word_default>
-      <word_custom>Дл� продолжени� нажмите �юда, е�ли ва� не переме�тило автоматиче�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__continue</word_key>
-      <word_default>Click here to continue regardless</word_default>
-      <word_custom>�ажмите зде�ь, е�ли в�е равно хотите продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__display</word_key>
-      <word_default>The following errors have been found:</word_default>
-      <word_custom>Возникли �ледующие ошибки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>cur_version_none</word_key>
-      <word_default>None</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__install</word_key>
-      <word_default>Install</word_default>
-      <word_custom>У�тановка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>type__upgrade</word_key>
-      <word_default>Upgrade</word_default>
-      <word_custom>Обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__nolanguages</word_key>
-      <word_default>There were no language bits to insert</word_default>
-      <word_custom>�ет �зыковых фраз дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__sql_indexes</word_key>
-      <word_default>%s indexes created</word_default>
-      <word_custom>%s индек�ов добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__sql_inserts</word_key>
-      <word_default>%s inserts added</word_default>
-      <word_custom>%s данных добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__sql_tables</word_key>
-      <word_default>%s tables installed, %s skipped</word_default>
-      <word_custom>%s таблиц добавлено, %s пропущено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__nomore_sql</word_key>
-      <word_default>No more SQL queries to run</word_default>
-      <word_custom>SQL запро�ов больше нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__sql_run</word_key>
-      <word_default>%s SQL queries run...</word_default>
-      <word_custom>%s SQL запро�ов выполнено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__appmodule_run</word_key>
-      <word_default>Application module run...</word_default>
-      <word_custom>Запу�к модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__replacements</word_key>
-      <word_default>Replacements inserted</word_default>
-      <word_custom>Макро�ов добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__cssfiles</word_key>
-      <word_default>%s css files added, %s updated in set %s</word_default>
-      <word_custom>%s css добавлено, %s обновлено в �тиле %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__hooks</word_key>
-      <word_default>%s hooks added, %s updated</word_default>
-      <word_custom>%s хуков добавлено, %s обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__templates</word_key>
-      <word_default>%s templates added, %s updated in set %s</word_default>
-      <word_custom>%s шаблонов добавлено, %s обновлено в �тиле %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__upgraded_to</word_key>
-      <word_default>Upgraded to %s, running next module...</word_default>
-      <word_custom>Обновлено до вер�ии %s, запу�к �ледующего модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>redir__nomore_modules</word_key>
-      <word_default>No more modules to run...</word_default>
-      <word_custom>Больше нет модулей дл� запу�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__file_needed</word_key>
-      <word_default>File does not exist: %s</word_default>
-      <word_custom>Файл %s не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__file_missing</word_key>
-      <word_default>File does not exist: %s</word_default>
-      <word_custom>Файл %s не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__file_chmod</word_key>
-      <word_default>File is not writeable: %s</word_default>
-      <word_custom>�ельз� запи�ать в файл %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__up_to_date</word_key>
-      <word_default>This application is already up-to-date</word_default>
-      <word_custom>Приложение по�ледней вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_setup</word_pack>
-      <word_key>error__cannot_init</word_key>
-      <word_default>Cannot initiate the set up class</word_default>
-      <word_custom>�е удало�ь инициировать у�тановочный кла��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_security</word_pack>
+      <word_key>skin_th_primary_group</word_key>
+      <word_default>Primary Group</word_default>
+      <word_custom>О�новна� группа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -15469,9 +11704,6 @@
       <word_key>hooks_nofile</word_key>
       <word_default>No hooks to install</word_default>
       <word_custom>�ет хуков дл� у�тановки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -15479,9 +11711,321 @@
       <word_key>no_tasks_for_import</word_key>
       <word_default>No tasks to import</word_default>
       <word_custom>�ет задач дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>install_skins_flag_recache</word_key>
+      <word_default>All skins flagged for recaching</word_default>
+      <word_custom>В�е �тили помечены дл� пере�оздани� кешей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__file_needed</word_key>
+      <word_default>File does not exist: %s</word_default>
+      <word_custom>Файл %s не �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__nomore_modules</word_key>
+      <word_default>No more modules to run...</word_default>
+      <word_custom>Больше нет модулей дл� запу�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__templates</word_key>
+      <word_default>%s templates added, %s updated in set %s</word_default>
+      <word_custom>%s шаблонов добавлено, %s обновлено в �тиле %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__upgraded_to</word_key>
+      <word_default>Upgraded to %s, running next module...</word_default>
+      <word_custom>Обновлено до вер�ии %s, запу�к �ледующего модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__cannot_init</word_key>
+      <word_default>Cannot initiate the set up class</word_default>
+      <word_custom>�е удало�ь инициировать у�тановочный кла��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__up_to_date</word_key>
+      <word_default>This application is already up-to-date</word_default>
+      <word_custom>Приложение по�ледней вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__file_missing</word_key>
+      <word_default>File does not exist: %s</word_default>
+      <word_custom>Файл %s не �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__file_chmod</word_key>
+      <word_default>File is not writeable: %s</word_default>
+      <word_custom>�ельз� запи�ать в файл %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__hooks</word_key>
+      <word_default>%s hooks added, %s updated</word_default>
+      <word_custom>%s хуков добавлено, %s обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__cssfiles</word_key>
+      <word_default>%s css files added, %s updated in set %s</word_default>
+      <word_custom>%s css добавлено, %s обновлено в �тиле %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__sql_run</word_key>
+      <word_default>%s SQL queries run...</word_default>
+      <word_custom>%s SQL запро�ов выполнено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__appmodule_run</word_key>
+      <word_default>Application module run...</word_default>
+      <word_custom>Запу�к модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__replacements</word_key>
+      <word_default>Replacements inserted</word_default>
+      <word_custom>Макро�ов добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__sql_tables</word_key>
+      <word_default>%s tables installed, %s skipped</word_default>
+      <word_custom>%s таблиц добавлено, %s пропущено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__nomore_sql</word_key>
+      <word_default>No more SQL queries to run</word_default>
+      <word_custom>SQL запро�ов больше нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__sql_indexes</word_key>
+      <word_default>%s indexes created</word_default>
+      <word_custom>%s индек�ов добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__sql_inserts</word_key>
+      <word_default>%s inserts added</word_default>
+      <word_custom>%s данных добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__nolanguages</word_key>
+      <word_default>There were no language bits to insert</word_default>
+      <word_custom>�ет �зыковых фраз дл� добавлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__upgrade</word_key>
+      <word_default>Upgrade</word_default>
+      <word_custom>Обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__install</word_key>
+      <word_default>Install</word_default>
+      <word_custom>У�тановка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>cur_version_none</word_key>
+      <word_default>None</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__display</word_key>
+      <word_default>The following errors have been found:</word_default>
+      <word_custom>Возникли �ледующие ошибки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__continue</word_key>
+      <word_default>Click here to continue (if not automatically redirected)</word_default>
+      <word_custom>Дл� продолжени� нажмите �юда, е�ли ва� не переме�тило автоматиче�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>error__continue</word_key>
+      <word_default>Click here to continue regardless</word_default>
+      <word_custom>�ажмите зде�ь, е�ли в�е равно хотите продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__upgradet</word_key>
+      <word_default>upgrade</word_default>
+      <word_custom>обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__text</word_key>
+      <word_default>This %s is in progress...</word_default>
+      <word_custom>%s выполн�ет��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__installation</word_key>
+      <word_default>installation</word_default>
+      <word_custom>у�тановка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>type__text_finished</word_key>
+      <word_default>This %s is now complete</word_default>
+      <word_custom>%s завершен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>progress_report</word_key>
+      <word_default>Progress Report:</word_default>
+      <word_custom>Прогре��:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>install_latest</word_key>
+      <word_default>install the latest version</word_default>
+      <word_custom>у�тановка по�ледней вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>applications_title</word_key>
+      <word_default>Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>please_correct_errors</word_key>
+      <word_default>Please correct these errors before attempting to continue:</word_default>
+      <word_custom>Прежде чем продолжить необходимо и�править �ледующие ошибки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>current_version</word_key>
+      <word_default>Current Version:</word_default>
+      <word_custom>Текуща� вер�и�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>upgrade_latest</word_key>
+      <word_default>upgrade to the latest version</word_default>
+      <word_custom>обновление до по�ледней вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>ipboard_setup_title</word_key>
+      <word_default>IP.Board Set Up Utility</word_default>
+      <word_custom>Ин�трумент у�тановки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>return_to_overview</word_key>
+      <word_default><![CDATA[Click here to return to Applications &amp; Modules overview]]></word_default>
+      <word_custom>�ажмите зде�ь дл� возвращени� к �пи�ку приложений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>ipboard_welcome_setup</word_key>
+      <word_default>Welcome to the IP.Board application set up utility.</word_default>
+      <word_custom>Ва� привет�твует у�тановщик IP.Board.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>duplicate_tables</word_key>
+      <word_default>Duplicate Tables:</word_default>
+      <word_custom>Суще�твующие таблицы:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>dup__skip</word_key>
+      <word_default><![CDATA[Skip - don't create those tables]]></word_default>
+      <word_custom>Пропу�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>dup__drop</word_key>
+      <word_default>Drop original tables and overwrite</word_default>
+      <word_custom>Удалить оригинальные и �оздать новые</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>version_suffix</word_key>
+      <word_default>Version:</word_default>
+      <word_custom>Вер�и�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>author_suffix</word_key>
+      <word_default>Author:</word_default>
+      <word_custom>�втор:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>continue_button</word_key>
+      <word_default>Continue</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>bbcode_and_media</word_key>
+      <word_default>BBCode and Media Tags imported</word_default>
+      <word_custom>Добавлены теги bb-кода и медиа-теги</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -15489,19 +12033,20 @@
       <word_key>no_bbcode_media</word_key>
       <word_default>No bbcode or media tags to import</word_default>
       <word_custom>�ет bb-кодов и медиа-тегов дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_setup</word_pack>
-      <word_key>imported_no_help</word_key>
-      <word_default>No help files to import</word_default>
-      <word_custom>�ет разделов помощи дл� добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>redir__no_templates</word_key>
+      <word_default>No skin templates added...</word_default>
+      <word_custom>�ет шаблонов дл� добавлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_setup</word_pack>
+      <word_key>redir__no_template_re</word_key>
+      <word_default>No skin templates added for this application, skipping template rebuild...</word_default>
+      <word_custom>�ет шаблонов дл� добавлени�. Пропу�каем обновление �тилей.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -15509,719 +12054,13 @@
       <word_key>imported_x_help</word_key>
       <word_default>Imported %s help files</word_default>
       <word_custom>Добавлено %s разделов помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlSysvar</word_key>
-      <word_default>SQL System Variables</word_default>
-      <word_custom>Си�темные переменные SQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlRuntime</word_key>
-      <word_default>SQL Runtime Information</word_default>
-      <word_custom>Стати�тика SQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlProcesses</word_key>
-      <word_default>SQL Processes</word_default>
-      <word_custom>Проце��ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlTotalSize</word_key>
-      <word_default>Totals</word_default>
-      <word_custom>В�его</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlIndexSize</word_key>
-      <word_default>Index Size</word_default>
-      <word_custom>Размер индек�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlTables</word_key>
-      <word_default>IP.Board MySQL Tables</word_default>
-      <word_custom>IP.Board SQL таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlTableSize</word_key>
-      <word_default>Table Size</word_default>
-      <word_custom>Размер таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>mssqlTitle</word_key>
-      <word_default>MSSQL %s Toolbox</word_default>
-      <word_custom>MSSQL %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_manadvanced</word_key>
-      <word_default><![CDATA[<strong>Manual Query</strong><br />Advanced Users Only]]></word_default>
-      <word_custom>SQL-запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_analyze</word_key>
-      <word_default>Analyze Selected Tables</word_default>
-      <word_custom>�нализировать выбранные таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_go</word_key>
-      <word_default>Go!</word_default>
-      <word_custom>Выполнить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_check</word_key>
-      <word_default>Check Selected Tables</word_default>
-      <word_custom>Проверить выбранные таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_repair</word_key>
-      <word_default>Repair Selected Tables</word_default>
-      <word_custom>Во��тановить выбранные таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_optimize</word_key>
-      <word_default>Optimize Selected Tables</word_default>
-      <word_custom>Оптимизировать выбранные таблицы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_checkall</word_key>
-      <word_default>Check All</word_default>
-      <word_custom>Отметить в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_tables</word_key>
-      <word_default>IP.Board MySQL Tables</word_default>
-      <word_custom>MySQL таблицы IP.Board </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_table</word_key>
-      <word_default>Table</word_default>
-      <word_custom>Таблица</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_rows</word_key>
-      <word_default>Rows</word_default>
-      <word_custom>Р�ды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_export</word_key>
-      <word_default>Export</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_runnew</word_key>
-      <word_default>Run a New Query</word_default>
-      <word_custom>Выполнить новый запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_results</word_key>
-      <word_default>Results: Manual Query</word_default>
-      <word_custom>Результаты ручного запро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_run</word_key>
-      <word_default>Run Query</word_default>
-      <word_custom>Выполнить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_gzipcontent</word_key>
-      <word_default>GZIP Content?</word_default>
-      <word_custom>GZIP?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_gzipnotes</word_key>
-      <word_default>Compresses content if possible, but can timeout on larger databases</word_default>
-      <word_custom>Сжимать �одержимое при возможно�ти. Дл� больших баз возможно прерывание проце��а по таймауту.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_skinnoness_notes</word_key>
-      <word_default>Will not produce insert rows for sessions, admin_sessions, captcha.</word_default>
-      <word_custom>�е будет включать данные дл� таблиц �е��ий, админи�тратор�ких �е��ий, captcha</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_skinnoness</word_key>
-      <word_default>Skip non essential data?</word_default>
-      <word_custom>Пропу�тить �лужебную информацию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_iferror</word_key>
-      <word_default>(If you get an SQL error, try checking this)</word_default>
-      <word_custom>(Е�ли возникает ошибка SQL, попробуйте �то)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_start_backup</word_key>
-      <word_default>Start MySQL Backup</word_default>
-      <word_custom>�ачать резервирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_createtable</word_key>
-      <word_default><![CDATA[Add 'CREATE TABLE' statements?]]></word_default>
-      <word_custom><![CDATA[Добавить 'CREATE TABLE' ?]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_backticks</word_key>
-      <word_default>Add backticks around the table name?</word_default>
-      <word_custom>Добавить backticks (`) вокруг имен таблиц?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_simple_text</word_key>
-      <word_default>Once you have clicked the link below, please wait until your browser prompts you with a dialogue box. This may take some time depending on the size of the database you are backing up.</word_default>
-      <word_custom>По�ле нажати� ��ылки, дождите�ь пока браузер не выведет вам диалоговое окно. Это может зан�ть какое-то врем� в зави�имо�ти от размера базы данных, которую вы резервируете.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_clickrebuild</word_key>
-      <word_default><![CDATA[Click here</a> to rebuild this applications search index.]]></word_default>
-      <word_custom><![CDATA[�ажмите зде�ь</a> дл� пере�тройки пои�кового индек�а �тих приложений]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_simple_backup</word_key>
-      <word_default><![CDATA[<strong>Simple Backup</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Про�тое резервирование</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_entries</word_key>
-      <word_default>Entries</word_default>
-      <word_custom>Запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_searchable</word_key>
-      <word_default>Searchable Applications</word_default>
-      <word_custom>Приложени� дл� пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_indexsize</word_key>
-      <word_default><![CDATA[<strong>MySQL Index Size</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Размер индек�а</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_rows</word_key>
-      <word_default><![CDATA[<strong>Rows</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Р�ды</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_datasize</word_key>
-      <word_default><![CDATA[<strong>Data Size</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Размер данных</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_data</word_key>
-      <word_default>Search Inded Table Data</word_default>
-      <word_custom>Пои�к данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>manual_notallowed</word_key>
-      <word_default>Sorry, those queries are not allowed for your safety</word_default>
-      <word_custom>К �ожалению, данные запро�ы запрещены дл� и�полнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>manual_loginlogs</word_key>
-      <word_default><![CDATA[Sorry, you can't delete from or update that table]]></word_default>
-      <word_custom>К �ожалению, вы не можете удал�ть или обновл�ть данные в �той таблице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>manual_invalid</word_key>
-      <word_default>This query appears to be invalid: </word_default>
-      <word_custom>�еверный запро�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>manual_noquery</word_key>
-      <word_default>No queries were found to run</word_default>
-      <word_custom>�е удало�ь найти запро�ы дл� выполнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>manual_error</word_key>
-      <word_default>Error</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_automatically</word_key>
-      <word_default><![CDATA[<strong>Fix Automatically</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>И�править автоматиче�ки</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_manually</word_key>
-      <word_default><![CDATA[<strong>Fix Manually</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>И�править вручную</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_manual</word_key>
-      <word_default>Manual Query</word_default>
-      <word_custom>Запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_sqlerror</word_key>
-      <word_default>MySQL Error</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_successfully</word_key>
-      <word_default><![CDATA[Query: %s<br />Executed Successfully<br />]]></word_default>
-      <word_custom><![CDATA[Запро�: %s<br />Выполнен<br />]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_sysvar</word_key>
-      <word_default>MySQL System Variables</word_default>
-      <word_custom>Значени� �и�темных параметров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_runtime</word_key>
-      <word_default>MySQL Runtime Information</word_default>
-      <word_custom>Информаци� о MySQL проце��е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_processes</word_key>
-      <word_default>MySQL Processes</word_default>
-      <word_custom>Проце��ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_tooold</word_key>
-      <word_default><![CDATA[Sorry, your MySQL version is less than 3.23.21, and does not work with many sections of this MySQL Toolbox. In honesty, you should not even being seeing this message if you are using 3.23.21. The board just doesn't work! I am just adding this language file in for the heck of it.]]></word_default>
-      <word_custom>К �ожалению вер�и� MySQL, у�тановленна� у ва� ниже чем 3.23.21. Управление MySQL не до�тупно. Да и вообще �и�тема не должна работать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_backuptitle</word_key>
-      <word_default>MySQL %s Backup</word_default>
-      <word_custom>Резервирование %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_backupnav</word_key>
-      <word_default>MySQL Database Backup</word_default>
-      <word_custom>Б�кап базы MySQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_title</word_key>
-      <word_default>MySQL %s Toolbox</word_default>
-      <word_custom>MySQL %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_noloc</word_key>
-      <word_default><![CDATA[Could not locate '%s']]></word_default>
-      <word_custom><![CDATA[�е удает�� найти '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_cantdo</word_key>
-      <word_default>Sorry, we do not allow one or more of those queries. Please run them from a seperate database management tool outside of IP.Board.</word_default>
-      <word_custom>К �ожалению наша �и�тема не позвол�ет выполн�ть подобные запро�ы. Вы можете выполнить их, и�пользу� иные �ред�тва управлени� базой данных.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_seltables</word_key>
-      <word_default>You must choose some tables to run this tool on! If not, that is just plain outright silly!</word_default>
-      <word_custom>�еобходимо выбрать таблицы, дл� которых будет запущен ин�трумент!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_noloc_class</word_key>
-      <word_default><![CDATA[Could not locate the class '%s']]></word_default>
-      <word_custom><![CDATA[�е удает�� найти кла�� '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_progress</word_key>
-      <word_default> search index rebuild in progress</word_default>
-      <word_custom> обновление пои�кового индек�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_processed</word_key>
-      <word_default>processed</word_default>
-      <word_custom>обработано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_si_complete</word_key>
-      <word_default> search index rebuild complete</word_default>
-      <word_custom> обновление пои�кового индек�а завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>my_noapp</word_key>
-      <word_default>The application you selected does not appear to be installed.</word_default>
-      <word_custom>Приложение, которое вы выбрали, не у�тановлено в �и�теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>query_executed_successfully</word_key>
-      <word_default>Query executed successfully</word_default>
-      <word_custom>Запро� выполнен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>not_supported_desc</word_key>
-      <word_default>This tool is not supported for your SQL engine</word_default>
-      <word_custom>Эта утилита не поддерживает�� вашим SQL �ервером.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>not_supported</word_key>
-      <word_default>Unsupported</word_default>
-      <word_custom>�е поддерживает��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>backup_tool_warning_text</word_key>
-      <word_default>If you have access to phpMyAdmin or a similar tool, we recommend that you use that instead of the ACP backup utility.</word_default>
-      <word_custom>Е�ли у ва� е�ть до�туп к phpMyAdmin или другим подобным ин�трументам, то мы рекомендуем дл� �оздани� резервной копии во�пользовать�� ими.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>backup_tool_warning_title</word_key>
-      <word_default>SQL Backup Warning</word_default>
-      <word_custom>Предупреждение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>resultprefix</word_key>
-      <word_default>Result: </word_default>
-      <word_custom>Результат: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_sql</word_pack>
-      <word_key>view_schematic</word_key>
-      <word_default>Table: %s</word_default>
-      <word_custom>Таблица: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_setup</word_pack>
+      <word_key>imported_no_help</word_key>
+      <word_default>No help files to import</word_default>
+      <word_custom>�ет разделов помощи дл� добавлени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16229,9 +12068,6 @@
       <word_key>view_indexes</word_key>
       <word_default>Indexes</word_default>
       <word_custom>Индек�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16239,9 +12075,6 @@
       <word_key>view_structure</word_key>
       <word_default>Fields</word_default>
       <word_custom>Пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16249,19 +12082,482 @@
       <word_key>crashed_table_ohnoes</word_key>
       <word_default><![CDATA[This table is not returning a row count and may be crashed and marked for repair. You can repair this table by checking the checkbox for this row and selecting 'Repair Selected Tables' from the drop down below]]></word_default>
       <word_custom><![CDATA[Таблица не вернула количе�тво р�дов, а значит она может быть помечена как неи�правна�. Вы можете и�править таблицу по�тавив галочку напротив имени таблицы и выбрав опцию "Во��тановить выбранные таблицы" внизу �той �траницы]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_sql</word_pack>
-      <word_key>mssql_backupnav</word_key>
-      <word_default>MSSQL Database Backup</word_default>
-      <word_custom>Резервна� копи� MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>view_schematic</word_key>
+      <word_default>Table: %s</word_default>
+      <word_custom>Таблица: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>resultprefix</word_key>
+      <word_default>Result: </word_default>
+      <word_custom>Результат: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>backup_tool_warning_title</word_key>
+      <word_default>SQL Backup Warning</word_default>
+      <word_custom>Предупреждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>not_supported_desc</word_key>
+      <word_default>This tool is not supported for your SQL engine</word_default>
+      <word_custom>Эта утилита не поддерживает�� вашим SQL �ервером.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>not_supported</word_key>
+      <word_default>Unsupported</word_default>
+      <word_custom>�е поддерживает��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>backup_tool_warning_text</word_key>
+      <word_default>If you have access to phpMyAdmin or a similar tool, we recommend that you use that instead of the ACP backup utility.</word_default>
+      <word_custom>Е�ли у ва� е�ть до�туп к phpMyAdmin или другим подобным ин�трументам, то мы рекомендуем дл� �оздани� резервной копии во�пользовать�� ими.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_noapp</word_key>
+      <word_default>The application you selected does not appear to be installed.</word_default>
+      <word_custom>Приложение, которое вы выбрали, не у�тановлено в �и�теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>query_executed_successfully</word_key>
+      <word_default>Query executed successfully</word_default>
+      <word_custom>Запро� выполнен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_noloc</word_key>
+      <word_default><![CDATA[Could not locate '%s']]></word_default>
+      <word_custom><![CDATA[�е удает�� найти '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_seltables</word_key>
+      <word_default>You must choose some tables to run this tool on! If not, that is just plain outright silly!</word_default>
+      <word_custom>�еобходимо выбрать таблицы, дл� которых будет запущен ин�трумент!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_noloc_class</word_key>
+      <word_default><![CDATA[Could not locate the class '%s']]></word_default>
+      <word_custom><![CDATA[�е удает�� найти кла�� '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_processed</word_key>
+      <word_default>processed</word_default>
+      <word_custom>обработано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_complete</word_key>
+      <word_default> search index rebuild complete</word_default>
+      <word_custom> обновление пои�кового индек�а завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_backupnav</word_key>
+      <word_default>MySQL Database Backup</word_default>
+      <word_custom>Б�кап базы MySQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_progress</word_key>
+      <word_default> search index rebuild in progress</word_default>
+      <word_custom> обновление пои�кового индек�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_cantdo</word_key>
+      <word_default>Sorry, we do not allow one or more of those queries. Please run them from a seperate database management tool outside of IP.Board.</word_default>
+      <word_custom>К �ожалению наша �и�тема не позвол�ет выполн�ть подобные запро�ы. Вы можете выполнить их, и�пользу� иные �ред�тва управлени� базой данных.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_title</word_key>
+      <word_default>MySQL %s Toolbox</word_default>
+      <word_custom>MySQL %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_backuptitle</word_key>
+      <word_default>MySQL %s Backup</word_default>
+      <word_custom>Резервирование %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_processes</word_key>
+      <word_default>MySQL Processes</word_default>
+      <word_custom>Проце��ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_runtime</word_key>
+      <word_default>MySQL Runtime Information</word_default>
+      <word_custom>Информаци� о MySQL проце��е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_tooold</word_key>
+      <word_default><![CDATA[Sorry, your MySQL version is less than 3.23.21, and does not work with many sections of this MySQL Toolbox. In honesty, you should not even being seeing this message if you are using 3.23.21. The community just doesn't work! I am just adding this language file in for the heck of it.]]></word_default>
+      <word_custom>К �ожалению вер�и� MySQL, у�тановленна� у ва� ниже чем 3.23.21. Управление MySQL не до�тупно. Да и вообще �и�тема не должна работать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_manual</word_key>
+      <word_default>Manual Query</word_default>
+      <word_custom>Запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_sysvar</word_key>
+      <word_default>MySQL System Variables</word_default>
+      <word_custom>Значени� �и�темных параметров</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_automatically</word_key>
+      <word_default><![CDATA[<strong>Fix Automatically</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>И�править автоматиче�ки</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_manually</word_key>
+      <word_default><![CDATA[<strong>Fix Manually</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>И�править вручную</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_sqlerror</word_key>
+      <word_default>MySQL Error</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_successfully</word_key>
+      <word_default><![CDATA[Query: %s<br />Executed Successfully<br />]]></word_default>
+      <word_custom><![CDATA[Запро�: %s<br />Выполнен<br />]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>manual_noquery</word_key>
+      <word_default>No queries were found to run</word_default>
+      <word_custom>�е удало�ь найти запро�ы дл� выполнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>manual_invalid</word_key>
+      <word_default>This query appears to be invalid: </word_default>
+      <word_custom>�еверный запро�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>manual_error</word_key>
+      <word_default>Error</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>manual_notallowed</word_key>
+      <word_default>Sorry, those queries are not allowed for your safety</word_default>
+      <word_custom>К �ожалению, данные запро�ы запрещены дл� и�полнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>manual_loginlogs</word_key>
+      <word_default><![CDATA[Sorry, you can't delete from or update that table]]></word_default>
+      <word_custom>К �ожалению, вы не можете удал�ть или обновл�ть данные в �той таблице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_data</word_key>
+      <word_default>Search Index Table Data</word_default>
+      <word_custom>Пои�к данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_simple_backup</word_key>
+      <word_default><![CDATA[<strong>Simple Backup</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Про�тое резервирование</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_clickrebuild</word_key>
+      <word_default><![CDATA[Click here</a> to rebuild this applications search index.]]></word_default>
+      <word_custom><![CDATA[�ажмите зде�ь</a> дл� пере�тройки пои�кового индек�а �тих приложений]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_rows</word_key>
+      <word_default><![CDATA[<strong>Rows</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Р�ды</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_datasize</word_key>
+      <word_default><![CDATA[<strong>Data Size</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Размер данных</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_indexsize</word_key>
+      <word_default><![CDATA[<strong>MySQL Index Size</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Размер индек�а</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_searchable</word_key>
+      <word_default>Searchable Applications</word_default>
+      <word_custom>Приложени� дл� пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_si_entries</word_key>
+      <word_default>Entries</word_default>
+      <word_custom>Запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_simple_text</word_key>
+      <word_default>Once you have clicked the link below, please wait until your browser prompts you with a dialogue box. This may take some time depending on the size of the database you are backing up.</word_default>
+      <word_custom>По�ле нажати� ��ылки, дождите�ь пока браузер не выведет вам диалоговое окно. Это может зан�ть какое-то врем� в зави�имо�ти от размера базы данных, которую вы резервируете.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_start_backup</word_key>
+      <word_default>Start MySQL Backup</word_default>
+      <word_custom>�ачать резервирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_createtable</word_key>
+      <word_default><![CDATA[Add 'CREATE TABLE' statements?]]></word_default>
+      <word_custom><![CDATA[Добавить 'CREATE TABLE' ?]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_skinnoness</word_key>
+      <word_default>Skip non essential data?</word_default>
+      <word_custom>Пропу�тить �лужебную информацию?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_backticks</word_key>
+      <word_default>Add backticks around the table name?</word_default>
+      <word_custom>Добавить backticks (`) вокруг имен таблиц?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_skinnoness_notes</word_key>
+      <word_default>Will not produce insert rows for sessions, admin_sessions, captcha.</word_default>
+      <word_custom>�е будет включать данные дл� таблиц �е��ий, админи�тратор�ких �е��ий, captcha</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_iferror</word_key>
+      <word_default>(If you get an SQL error, try checking this)</word_default>
+      <word_custom>(Е�ли возникает ошибка SQL, попробуйте �то)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_runnew</word_key>
+      <word_default>Run a New Query</word_default>
+      <word_custom>Выполнить новый запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_run</word_key>
+      <word_default>Run Query</word_default>
+      <word_custom>Выполнить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_gzipcontent</word_key>
+      <word_default>GZIP Content?</word_default>
+      <word_custom>GZIP?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_gzipnotes</word_key>
+      <word_default>Compresses content if possible, but can timeout on larger databases</word_default>
+      <word_custom>Сжимать �одержимое при возможно�ти. Дл� больших баз возможно прерывание проце��а по таймауту.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_rows</word_key>
+      <word_default>Rows</word_default>
+      <word_custom>Р�ды</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_tables</word_key>
+      <word_default>IP.Board MySQL Tables</word_default>
+      <word_custom>MySQL таблицы IP.Board </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_results</word_key>
+      <word_default>Results: Manual Query</word_default>
+      <word_custom>Результаты ручного запро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_analyze</word_key>
+      <word_default>Analyze Selected Tables</word_default>
+      <word_custom>�нализировать выбранные таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_optimize</word_key>
+      <word_default>Optimize Selected Tables</word_default>
+      <word_custom>Оптимизировать выбранные таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_table</word_key>
+      <word_default>Table</word_default>
+      <word_custom>Таблица</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_export</word_key>
+      <word_default>Export</word_default>
+      <word_custom>Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_checkall</word_key>
+      <word_default>Check All</word_default>
+      <word_custom>Отметить в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_repair</word_key>
+      <word_default>Repair Selected Tables</word_default>
+      <word_custom>Во��тановить выбранные таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_check</word_key>
+      <word_default>Check Selected Tables</word_default>
+      <word_custom>Проверить выбранные таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlTables</word_key>
+      <word_default>IP.Board MySQL Tables</word_default>
+      <word_custom>IP.Board SQL таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_go</word_key>
+      <word_default>Go!</word_default>
+      <word_custom>Выполнить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>my_manadvanced</word_key>
+      <word_default><![CDATA[<strong>Manual Query</strong><br />Advanced Users Only]]></word_default>
+      <word_custom>SQL-запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlTitle</word_key>
+      <word_default>MSSQL %s Toolbox</word_default>
+      <word_custom>MSSQL %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlIndexSize</word_key>
+      <word_default>Index Size</word_default>
+      <word_custom>Размер индек�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlTableSize</word_key>
+      <word_default>Table Size</word_default>
+      <word_custom>Размер таблицы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlTotalSize</word_key>
+      <word_default>Totals</word_default>
+      <word_custom>В�его</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16269,29 +12565,27 @@
       <word_key>mssql_backuptitle</word_key>
       <word_default>MSSQL %s Backup</word_default>
       <word_custom>Резервана� копи� %s MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_sql</word_pack>
-      <word_key>mssql_processes</word_key>
-      <word_default>MSSQL Processes</word_default>
-      <word_custom>Проце��ы MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mssqlSysvar</word_key>
+      <word_default>SQL System Variables</word_default>
+      <word_custom>Си�темные переменные SQL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_sql</word_pack>
-      <word_key>mssql_runtime</word_key>
-      <word_default>MSSQL Runtime Information</word_default>
-      <word_custom>Стати�тика MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mssqlRuntime</word_key>
+      <word_default>SQL Runtime Information</word_default>
+      <word_custom>Стати�тика SQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssqlProcesses</word_key>
+      <word_default>SQL Processes</word_default>
+      <word_custom>Проце��ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16299,9 +12593,27 @@
       <word_key>mssql_sysvar</word_key>
       <word_default>MSSQL System Variables</word_default>
       <word_custom>Си�темные переменные MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssql_runtime</word_key>
+      <word_default>MSSQL Runtime Information</word_default>
+      <word_custom>Стати�тика MSSQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssql_processes</word_key>
+      <word_default>MSSQL Processes</word_default>
+      <word_custom>Проце��ы MSSQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_sql</word_pack>
+      <word_key>mssql_backupnav</word_key>
+      <word_default>MSSQL Database Backup</word_default>
+      <word_custom>Резервна� копи� MSSQL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -16309,3843 +12621,97 @@
       <word_key>mssql_sqlerror</word_key>
       <word_default>MSSQL Error</word_default>
       <word_custom>Ошибка MSSQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_editentry</word_key>
-      <word_default><![CDATA[<h2>Edit Entry</h2><p><br />You can change the information for a word pack entry here.</p>]]></word_default>
-      <word_custom><![CDATA[ <h2>Редактирование запи�и</h2><p><br />Зде�ь вы можете изменить запи�ь из набора �лов .</p>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>l_textexistsalready</word_key>
+      <word_default>The language string that you are attempting to add already exists.</word_default>
+      <word_custom>Языкова� �трока, которую вы хотите добавить, уже �уще�твует.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_edit</word_key>
-      <word_default>Edit entry</word_default>
-      <word_custom>Редактировать запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cannot_write_to_cache</word_key>
+      <word_default>Cannot write to cache/lang_cache/%s</word_default>
+      <word_custom>�ет до�тупа к запи�и в /cache/lang_cache/%s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_addthis</word_key>
-      <word_default>Add this entry</word_default>
-      <word_custom>Добавить �ту запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>indev_lang_import</word_key>
+      <word_default>Imported %s (%s added, %s updated)...</word_default>
+      <word_custom>импортировано %s (%s добавлено, %s обновлено)...</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_addnewfull</word_key>
-      <word_default><![CDATA[<h2>Add New Entry</h2><p><br />You can add a new entry to the word pack here.</p>]]></word_default>
-      <word_custom><![CDATA[ <h2>Добавление новой запи�и</h2><p><br />Зде�ь вы можете добавить новую запи�ь в �пи�ок �лов.</p>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_reg_x_days</word_key>
+      <word_default>No registrations in the last %s days</word_default>
+      <word_custom>�ет реги�траций за по�ледние %s дней</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_updated</word_key>
-      <word_default>Language entry update</word_default>
-      <word_custom>Обновление запи�и �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>where_user_lang_choice</word_key>
+      <word_default>If using...</word_default>
+      <word_custom>И�пользует��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_addnew</word_key>
-      <word_default>Add new entry</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>where_user_lang_choice_desc</word_key>
+      <word_default>Select the language you want to switch FROM</word_default>
+      <word_custom>Выберите �зыковой пакет � которого необходимо преключить пользователей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_keydup</word_key>
-      <word_default>The word key you entered is already in this word pack, please use a different key.</word_default>
-      <word_custom>Ключ уже �уще�твует в наборе. Пожалуй�та, и�пользуйте другое �лово.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sys_lang_choice_swap</word_key>
+      <word_default>Swap Member Language Choice</word_default>
+      <word_custom>Изменение �зыка дл� пользователей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_added</word_key>
-      <word_default>New language entry added</word_default>
-      <word_custom>�ова� запи�ь �зыка добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>where_touser_lang_choice</word_key>
+      <word_default>Switch to...</word_default>
+      <word_custom>Переключить на</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_textreq</word_key>
-      <word_default>Default Text is a required fields</word_default>
-      <word_custom>Тек�т по умолчанию - �то об�зательное поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>where_touser_lang_choice_desc</word_key>
+      <word_default>Select the language you want to switch TO</word_default>
+      <word_custom>Выберите �зыковой пакет, на который должно произойти переключение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_removed</word_key>
-      <word_default>Language pack removed</word_default>
-      <word_custom>Язык удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sys_taskislocked</word_key>
+      <word_default>The task is currently locked</word_default>
+      <word_custom>Задача заблокирована</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_packreq</word_key>
-      <word_default>Word Pack is a required field</word_default>
-      <word_custom>�абор �лов - �то об�зательное поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_lang_choice_swapped</word_key>
+      <word_default>The member language choice has been swapped</word_default>
+      <word_custom>Язык изменен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_keyreq</word_key>
-      <word_default>Word Key is a required field</word_default>
-      <word_custom>Ключевое �лово - �то об�зательное поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>def_lang_sel</word_key>
+      <word_default>(Default Language)</word_default>
+      <word_custom>(По-умолчанию)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>tupload_failed</word_key>
-      <word_default>The task upload failed.</word_default>
-      <word_custom>Загрузка задачи не удала�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_simport_success</word_key>
-      <word_default>The task has been imported successfully</word_default>
-      <word_custom>Задача у�пешно импортирована</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_nolangbits</word_key>
-      <word_default>There were no language bits for that language pack</word_default>
-      <word_custom>В �том �зыковом пакете нет фраз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>task_import_button</word_key>
-      <word_default>Upload</word_default>
-      <word_custom>Загрузить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>upload_task_xml</word_key>
-      <word_default>Upload a task.xml file</word_default>
-      <word_custom>Загрузить tasks.xml файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>upload_task_dupe</word_key>
-      <word_default>If the task already exists it will be updated</word_default>
-      <word_custom>Е�ли задача уже �уще�твует, она будет обновлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_exported</word_key>
-      <word_default>All tasks have been exported to the xml folder for their application</word_default>
-      <word_custom>В�е задачи были �к�портированы в xml и размещены в директори�х приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_export_single</word_key>
-      <word_default>Export task</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_import_single</word_key>
-      <word_default>Import a task</word_default>
-      <word_custom>Импортировать задачу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_inserted</word_key>
-      <word_default>%s tasks added, %s updated</word_default>
-      <word_custom>%s заданий добавлено, %s обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_lockedcaps</word_key>
-      <word_default> (LOCKED)</word_default>
-      <word_custom> (З�БЛОКИРОВ���)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_import404</word_key>
-      <word_default>%s could not be found. Please check the file and try again.</word_default>
-      <word_custom>%s не найден. Пожалуй�та, проверьте файл и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_noupdate</word_key>
-      <word_default>No task information to update</word_default>
-      <word_custom>�ет информации дл� обновлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_editing</word_key>
-      <word_default>Editing Task: %s</word_default>
-      <word_custom>Изменение задачи: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_disabledcaps</word_key>
-      <word_default> (DISABLED)</word_default>
-      <word_custom> (ОТКЛЮЧЕ��)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_saturday</word_key>
-      <word_default>Saturday</word_default>
-      <word_custom>Суббота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_adding</word_key>
-      <word_default>Adding Task</word_default>
-      <word_custom>Добавление задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_friday</word_key>
-      <word_default>Friday</word_default>
-      <word_custom>П�тница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_tuesday</word_key>
-      <word_default>Tuesday</word_default>
-      <word_custom>Вторник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_wednesday</word_key>
-      <word_default>Wednesday</word_default>
-      <word_custom>Среда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_thursday</word_key>
-      <word_default>Thursday</word_default>
-      <word_custom>Четверг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_monday</word_key>
-      <word_default>Monday</word_default>
-      <word_custom>Понедельник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_midday</word_key>
-      <word_default>Midday</word_default>
-      <word_custom>Полдень</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_am</word_key>
-      <word_default> am</word_default>
-      <word_custom> am</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_pm</word_key>
-      <word_default> pm</word_default>
-      <word_custom> pm</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_sunday</word_key>
-      <word_default>Sunday</word_default>
-      <word_custom>Во�кре�енье</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_dayweek</word_key>
-      <word_default>Every Week Day</word_default>
-      <word_custom>Каждый день недели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_daymonth</word_key>
-      <word_default>Every Day of the Month</word_default>
-      <word_custom>Каждый день ме��ца</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_midnight</word_key>
-      <word_default>0 - Midnight</word_default>
-      <word_custom>0 - Полночь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_enterfile</word_key>
-      <word_default>You must enter a filename for the task to run.</word_default>
-      <word_custom>Вы должны вве�ти им� PHP файла запу�ка задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_edited</word_key>
-      <word_default>Task Edited Successfully</word_default>
-      <word_custom>Задача у�пешно изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_saved</word_key>
-      <word_default>Task Saved Successfully</word_default>
-      <word_custom>Задача у�пешно �охранена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_noedit</word_key>
-      <word_default>You are unable to edit this task.</word_default>
-      <word_custom>Вам не позволено измен�ть �ту задачу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_create</word_key>
-      <word_default>Create New Task</word_default>
-      <word_custom>Создать новую задачу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_creating</word_key>
-      <word_default>Creating New Task</word_default>
-      <word_custom>Создание новой задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>task_edit_title</word_key>
-      <word_default>Editing Task: %s</word_default>
-      <word_custom>Редактирование задачи: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>edittask_button</word_key>
-      <word_default>Edit Task</word_default>
+      <word_key>update_lang_prefs</word_key>
+      <word_default>Swap Language Choice</word_default>
       <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_minute</word_key>
-      <word_default>Every Minute</word_default>
-      <word_custom>Каждую минуту</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_hour</word_key>
-      <word_default>Every Hour</word_default>
-      <word_custom>Каждый ча�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_nolocate</word_key>
-      <word_default>Cannot locate: %s/tasks/%s</word_default>
-      <word_custom>�е возможно найти: %s/tasks/%s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_entertitle</word_key>
-      <word_default>You must enter a task title.</word_default>
-      <word_custom>Вы должны вве�ти название задачи.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_nolocated</word_key>
-      <word_default><![CDATA[The unauthorized file scan did not identify any suspicious files.<br />Please scan regularly to ensure that your system is secure.]]></word_default>
-      <word_custom><![CDATA[Сканер не обнаружил подозрительных файлов.<br />Пожалуй�та, выполн�йте проверку как можно чаще, чтобы �одержать �и�тему в безопа�но�ти.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_removed</word_key>
-      <word_default>Selected Task Logs Removed</word_default>
-      <word_custom>Выбранное запи�и удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_nodelete</word_key>
-      <word_default>You are unable to delete this task.</word_default>
-      <word_custom>Вам не позволено удал�ть �ту задачу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_deleted</word_key>
-      <word_default>Task deleted</word_default>
-      <word_custom>Задача удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_locknomore</word_key>
-      <word_default>Task lock removed</word_default>
-      <word_custom>Задача разблокирована</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>�е указан ID. Пожалуй�та, попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_notask</word_key>
-      <word_default>No task to run.</word_default>
-      <word_custom>�ет задачи дл� запу�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_disabled</word_key>
-      <word_default>This task has been disabled. Please enable the task before running it.</word_default>
-      <word_custom>Эта задача была отключена. Пожалуй�та, включите задачу перед запу�ком.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_locked</word_key>
-      <word_default>This task was locked at %s and cannot be ran until unlocked.</word_default>
-      <word_custom>Эта задача была заблокирована в %s и не может быть запущена до разблокировани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>t_ran</word_key>
-      <word_default>Task ran successfully</word_default>
-      <word_custom>Задача у�пешно запущена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_bad</word_key>
-      <word_default><![CDATA[The IPB unauthorized file checker will check your IPB installation for suspicious files.<br />The unauthorized file checker has not been run in over a week]]></word_default>
-      <word_custom><![CDATA[Сканер проверит наиболее ча�то и�пользуемые директории дл� загрузки файлов на подозрительные файлы.<br />Сканер на подозрительные файлы не запу�кали более недели.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus</word_key>
-      <word_default>IP.Board Unauthorized File Checker</word_default>
-      <word_custom>Сканер подозрительных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_found</word_key>
-      <word_default>Suspicious Files Detected</word_default>
-      <word_custom>Обнаружены подозрительные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_none</word_key>
-      <word_default>No Suspicious Files Detected</word_default>
-      <word_custom>Подозрительных файлов не обнаружено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_located</word_key>
-      <word_default><![CDATA[The unauthorized file scan located the following suspicious files.<br />If you're unsure of their origin, please remove them immediately.]]></word_default>
-      <word_custom><![CDATA[Сканер обнаружил �ледующие подозрительные файлы.<br />Е�ли вы не уверены в их прои�хождении, то немедленно удалите их.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_skipped</word_key>
-      <word_default>Skipped %s, could not write into it...</word_default>
-      <word_custom>Пропущен %s, запи�ь в него невозможна...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_deep_nav</word_key>
-      <word_default>Deep Scan</word_default>
-      <word_custom>Глубокое �канирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_allex</word_key>
-      <word_default>All Executables</word_default>
-      <word_custom>В�е и�полн�емые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_allex_good</word_key>
-      <word_default><![CDATA[The deep scanner has found %s files.<br />If you're unsure of their origin, please investigate them immediately.]]></word_default>
-      <word_custom>Глубокое �канирование обнаружило %s файлов. Е�ли вы не уверены в прои�хождении �тих файлов, то немедленно про�мотрите их.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_allex_bad</word_key>
-      <word_default><![CDATA[The deep scanner has found the following files.<br /><strong>%s</strong> of %s files are rating 7/10 or more.<br />If you're unsure of their origin, please investigate them immediately.]]></word_default>
-      <word_custom><![CDATA[Глубокое �канирование обнаружило �ледующие файлы. <br /><strong>%s</strong> из %s файлов имеют рейтинг 7/10 или более. Е�ли вы не уверены в прои�хождении �тих файлов, то немедленно про�мотрите их.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_virus_good</word_key>
-      <word_default><![CDATA[The IPB unauthorized file checker will check your IPB installation for suspicious files.<br />The unauthorized file checker was last run: ]]></word_default>
-      <word_custom><![CDATA[Сканер проверит наиболее ча�то и�пользуемые директории дл� загрузки файлов на подозрительные файлы.<br />Сканер на подозрительные файлы по�ледний раз запу�кали:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_written_to</word_key>
-      <word_default>Written .htaccess to %s...</word_default>
-      <word_custom>.htaccess запи�ан в %s...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_completeform</word_key>
-      <word_default>You must complete the form. Please try again.</word_default>
-      <word_custom>Вы должны полно�тью заполнить форму.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_written</word_key>
-      <word_default>Authentication files written</word_default>
-      <word_custom>Файл аутентификации запи�ан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_htaccess_nav</word_key>
-      <word_default>ACP .htaccess</word_default>
-      <word_custom>.htaccess �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_rename_nav</word_key>
-      <word_default>Rename the admin directory</word_default>
-      <word_custom>Переименовать директорию �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_chmod_good</word_key>
-      <word_default>CHMOD change completed.</word_default>
-      <word_custom>Изменение прав до�тупа к файлам завершено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_chmod_bad</word_key>
-      <word_default><![CDATA[<strong>Could not complete the process.</strong><br />Please use your FTP client to change the CHMOD value of 'conf_global.php' to 0444.]]></word_default>
-      <word_custom><![CDATA[<strong>�евозможно выполнить операцию.</strong><br />Во�пользуйте�ь  FTP клиентом и измените атрибуты до�тупа к файлу 'conf_global.php' на 0444.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_rename_bad</word_key>
-      <word_default><![CDATA[The default 'admin' directory can be renamed to make it hard to find.<br />The admin directory has not been renamed.]]></word_default>
-      <word_custom><![CDATA[Стандартную директорию админцентра ('/admin/') можно переименовать — тем �амым злоумышленнику будет �ложнее нарушить работу форума в �лучае взлома учетной запи�и какого-либо из админи�траторов.<br />Директори� админцентра не переименована.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_conf</word_key>
-      <word_default><![CDATA[Make "conf_global.php" Un-writable]]></word_default>
-      <word_custom><![CDATA[Запретить запи�ь в  "conf_global.php"]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_conf_good</word_key>
-      <word_default><![CDATA[After installation, you should change the CHMOD on the "conf_global.php" file to prevent others from reading and writing to it.<br />"conf_global.php" is NOT writeable.]]></word_default>
-      <word_custom><![CDATA[По�ле у�тановки IPB рекомендует�� изменить атрибуты до�тупа к файлу "conf_global.php", чтобы другие пользователи не могли произве�ти чтение или запи�ь.<br />"conf_global.php" не до�тупен дл� запи�и.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_conf_bad</word_key>
-      <word_default><![CDATA[After installation, you should change the CHMOD on the "conf_global.php" file to prevent others from reading and writing to it.<br />"conf_global.php" is writeable.]]></word_default>
-      <word_custom><![CDATA[По�ле у�тановки IPB рекомендует�� изменить атрибуты до�тупа к файлу "conf_global.php", чтобы другие пользователи не могли произве�ти чтение или запи�ь.<br />"conf_global.php" до�тупен дл� запи�и.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_rename</word_key>
-      <word_default><![CDATA[Rename The 'admin' Directory]]></word_default>
-      <word_custom>�азвание директории �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_rename_good</word_key>
-      <word_default><![CDATA[The default 'admin' directory can be renamed to make it hard to find.<br />The admin directory HAS been renamed.]]></word_default>
-      <word_custom><![CDATA[Стандартную директорию админцентра ('/admin/') можно переименовать — тем �амым злоумышленнику будет �ложнее нарушить работу форума в �лучае взлома учетной запи�и какого-либо из админи�траторов.<br />Директори� админцентра ПЕРЕИМЕ�ОВ���.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_toggle</word_key>
-      <word_default>Toggle Now</word_default>
-      <word_custom>Переключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_phpcgi</word_key>
-      <word_default>IP.Board PHP/CGI .htaccess Protection</word_default>
-      <word_custom>Защита PHP/CGI файлом .htaccess </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_phpcgi_good</word_key>
-      <word_default><![CDATA[IP.Board can write .htaccess files to non-PHP directories to prevent PHP and CGI files from executing.<br />IP.Board has located some .htaccess files.]]></word_default>
-      <word_custom><![CDATA[IPB может запи�ать файл .htaccess в директории, где не �одержат�� php-файлы, преп�т�тву� тем �амым запу�ку файлов PHP и CGI в �тих директори�х.<br />IPB обнаружил .htaccess файлы.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_phpcgi_bad</word_key>
-      <word_default><![CDATA[IP.Board can write .htaccess files to non-PHP directories to prevent PHP and CGI files from executing.<br />IP.Board <strong>cannot</strong> locate any .htaccess files.]]></word_default>
-      <word_custom><![CDATA[IPB может запи�ать файл .htaccess в директории, где не �одержат�� php-файлы, преп�т�тву� тем �амым запу�ку файлов PHP и CGI в �тих директори�х.<br />IPB <strong>не обнаружил</strong> какие-либо .htaccess файлы.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_nohelp</word_key>
-      <word_default>No help information is available for this function at present.</word_default>
-      <word_custom>�ет дополнительно информации дл� �той функции в данное врем�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_deep</word_key>
-      <word_default>IP.Board Executables Deep Scan</word_default>
-      <word_custom>Глубокое �канирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_deep_bad</word_key>
-      <word_default><![CDATA[The IP.Board deep scanner will pick out and list every single executable file in your installation.<br />The scanner has not been run in over a month]]></word_default>
-      <word_custom><![CDATA[Сканер проверит и выведет �пи�ок в�ех файлов вашей �и�темы.<br />Сканер не запу�кали более ме��ца.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_runtool</word_key>
-      <word_default>Run Tool Now</word_default>
-      <word_custom>Запу�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_deep_good</word_key>
-      <word_default><![CDATA[The IP.Board deep scanner will pick out and list every single executable file in your installation.<br />The scanner was last run: ]]></word_default>
-      <word_custom><![CDATA[Сканер проверит и выведет �пи�ок в�ех файлов вашей �и�темы.<br />Сканер по�ледний раз запу�кали:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_learnmore</word_key>
-      <word_default>Learn More</word_default>
-      <word_custom>Подробнее</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_htaccess</word_key>
-      <word_default>IP.Board ACP .htaccess Protection</word_default>
-      <word_custom>Защита файлом .htaccess �дминцентра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_htaccess_good</word_key>
-      <word_default><![CDATA[To make your ACP even more secure, you can take add HTTP authentication in your "/%s/" directory.<br />IP.Board has located an ACP .htaccess file.]]></word_default>
-      <word_custom><![CDATA[Дл� повышени� безопа�но�ти вы можете добавить HTTP-аутентификацию на директорию админцентра ("/%s/").<br />IPB обнаружил .htaccess файл в директории админцентра.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>s_htaccess_bad</word_key>
-      <word_default><![CDATA[To make your ACP even more secure, you can add HTTP authentication in your "/%s/" directory.<br />IP.Board <strong>cannot</strong> locate an ACP .htaccess file.]]></word_default>
-      <word_custom><![CDATA[Дл� повышени� безопа�но�ти вы можете добавить HTTP-аутентификацию на директорию админцентра ("/%s/").<br />IPB не обнаружил .htaccess файл в директории админцентра.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_components_info</word_key>
-      <word_default><![CDATA[<strong>Menu text</strong> is the actual menu item text. <em>IE: Tools and Settings.</em><br /><strong>Menu URL</strong> is the final part of the URL. No need to add the full URL or the 'section=components&act=blog' part unless this is a redirect. <em>IE: code={code}</em><br /><strong>Menu Redirect</strong> if yes, complete the 'act={}&section={}&do={}' part of the URL in the URL box or the redirect may not work.<br /><strong>Perm Bit and Perm Lang</strong> is the ACP restriction perm bit. Entries: add, remove, edit, rebuild, recount, recache all have language entries. Any other bit names will require adding into the Perm Bit Language box. Eg: If the perm bit was 'tools', you may enter 'Allow TOOLS Access'.<br />]]></word_default>
-      <word_custom><![CDATA[<strong>Тек�т меню</strong> �то тек�т которы будет отображать�� � меню.<em>�апример, �а�тройки.</em><br />
-<strong>URL пункта</strong> - �то по�ледна�� ча�ть ��ылки. Зде�ь не требует�� задавать полную ��ылку.<em>IE: code={code}</em><br />
-<strong>Перенаправление</strong>. Заполните 'act={}&section={}&do={}' в URL иначе перенаправление не �работает. 
-<br /><strong>Ключ до�тупа и �зыка</strong> �лужат дл� до�тупа к меню в �дминцентре. �апример, е�ли ключ 'tools', то тек�т может быть 'Разрешить до�туп к TOOLS'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_components</word_key>
-      <word_default>Components Menu System</word_default>
-      <word_custom>Си�тема меню компонентов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_captcha</word_key>
-      <word_default>Registration CAPTCHA</word_default>
-      <word_custom>CAPTHCA при реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_captcha_info</word_key>
-      <word_default><![CDATA[To prevent robots from registering (such as a malicious denial of service attack registering thousands of new accounts and forcing thousands of emails to be sent from your server) you can enable this option.<br><br>When enabled, a random 6 digit numerical string is generated and shown in a graphical format (to prevent advanced bots from reading the source page). The user must enter this string exactly when registering or the account will not be created.]]></word_default>
-      <word_custom><![CDATA[Дл� предотвращение автоматиче�ких реги�траций вы можете включить �ту опцию.<br/><br/>6 произвольных цифр показывает�� в виде картинки. Пользователь должен точно вве�ти показанные цифры дл� продолжени� реги�трации. <br/><br/>Это поможет защитить форум от атак и ра��ылки нежелательных пи�ем.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_bulk_info</word_key>
-      <word_default><![CDATA[<b>Overview</b><br>Bulk emailing allows you to target a specific section of your community or email all your registered members.<br><br><b>Settings</b><br>You can choose which user groups will receive the email and elect to override the user set 'Allow Admin Emails' function. It is NOT recommended that you do override this however.<hr><b>Allowed Tags</b><br>Although the email system sends the mail via BCC to preserve system resources, you can add in dynamic content with the following tags.<br>{board_name} will return the name of your board<br>{reg_total} will return the total number of registered members<br>{total_posts} will return the total number of posts<br>{busy_count} will return the most number of online users<br>{busy_time} will return the date of the most online users<br>{board_url} will return the URL to the board<br><br>As the email is sent via BCC, it is not possible to include the members username, password or other user profile data.]]></word_default>
-      <word_custom><![CDATA[<b>Обзор</b><br/>
-Ма��ова� ра��ылка позвол�ет отправл�ть в�ем пользовател�м форума или отдельным группам.
-<br/><br/><b>�а�тройки</b><br/>
-Вы можете выбрать какие группы пользователей получат пи�ьма. Пи�ьма можно отправл�ть в обход опции "Получать пи�ьма от админи�трации", однако делать �то не рекомендует��.
-<hr /><b>Разрешены теги</b><br />
-Хот� почтова� �и�тема ра��ылает пи�ьма через BCC дл� �кономии �и�темных ре�ур�ов, вы можете добавл�ть динамиче�кое �одержимое � помощью некоторых тегов.<br/>
-{board_name} - будет заменено на название вашего форума;<br />{reg_total} - вернет чи�ло зареги�трированных пользователей;<br />{total_posts} - общее чи�ло �ообщений;<br />{busy_count} - мак�имум пользователей онлайн;<br />{busy_time} - врем�, когда был зареги�трирован мак�имум пользователей;<br />{board_url} - ��ылка на форум
-<br/><br/>
-Так как пи�ьма ра��ылают�� через BCC, нет возможно�ти включить в пи�ьма им� пользовател�, пароль или другие данные профил�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_bulk</word_key>
-      <word_default>Bulk Emailing</word_default>
-      <word_custom>Ма��ова� ра��ылка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_promote_info</word_key>
-      <word_default><![CDATA[If enabled (by choosing a member group to promote your members to and by entering a number of posts to achieve this) when your members meet or exceed the number of posts set they will be 'promoted' to the specified group.<br><br>Many administrators use this feature to set up a 'Senior Members' group with more functionality (such as a longer edit time, larger post uploads) and even allow access to otherwise hidden forums - when your members have made enough posts, they are promoted to this group allowing you to intice more posting and allow for a more restrictive set of permissions for newcomers.<br><br><b>Warning!</b><br>Use this feature carefully and always check the information before proceeding.<br>It is possible to advance to an Admin group - you have been warned.]]></word_default>
-      <word_custom><![CDATA[Е�ли �та опци� включена (выбрана группа дл� продвижении�), то когда пользователь набирает указанное количе�тво �ообщений, он будет перемещен в другую группу.<br><br>
-Многие админи�траторы и�пользуют �ту опцию дл� выделени� "опытных" пользователей � набором ра�ширенных прав (таких как больший объем загружаемых файлов, более длинное врем� редактировани�) и разрешени� до�тупа к �крытым форумам.
-<br/><br/><b>Внимание!</b><br/>
-И�пользуйте �ту функцию внимательно и проверьте на�тройки перед продолжением.<br />Возможно продвижение в группу �дмини�траторов!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_promote</word_key>
-      <word_default>Group Promotion</word_default>
-      <word_custom>Продвижение группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_upload_info</word_key>
-      <word_default><![CDATA[If you wish to allow this group to attach files (upload) when posting, you will have to ensure you have completed the following: <ul> <li>You have entered a reasonable numerical figure in the groups 'Max upload file size' field. <li>You have edited the forum permissions for this group and checked the 'Upload' checkbox. </ul> This allows you to control in which forums this group can upload to.<br><br><b>Warning!</b><br>If, when posting, no post is made and you are returned back to the board index, disable this groups upload by entering 0 into this field. This will turn off the mutli-part form the uploads use.]]></word_default>
-      <word_custom><![CDATA[Е�ли вы хотите разрешить �той группе прикрепл�ть файлы к �ообщени�м, вам �ледует убедить�� в �ледующем: <ul> <li>Вы ввели до�таточное значение в поле «Ди�кова� квота на хранение в�ех файлов (включа� личные �ообщени� и �ообщени� в темах)»</li><li>Вы изменили права до�тупа к форумам и отметили поле "Загрузка"</li></ul> <br/><br/><b>Внимание!</b><br/>Е�ли при добавлении �ообщени� ва� перебра�ывает на главную �траницу, укажите значение 0 дл� �того пол�. Это приведет к отключению формы загрузки.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_upload</word_key>
-      <word_default>Upload Permissions</word_default>
-      <word_custom>Права до�тупа загрузки файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_bots_info</word_key>
-      <word_default><![CDATA[Search engines such as Google 'spider' the web by using special programs to find and add links to the search engine database.<br />Invision Power can take advantage of separating the bots from the real users and you can then ensure that they are getting adequate information to help with search engine ranking.<br /><br /><b>Warning!</b><br />Invision Power Board recognises the search engine spiders and crawlers by their user_agent. Please keep in mind that it's not impossible to fake this and a malicious user could pose as a harmless search engine spider.<br />This is not a problem as by default the spider will have guest permissions, but it's something that you should keep in mind when allowing permissions.<br /><br />Also keep in mind that most search engines do NOT search dynamically generated website for fear of crashing the server with the constant reading of topics.]]></word_default>
-      <word_custom><![CDATA[Пои�ковые �и�темы, такие как Google, и��ледуют �еть � и�пользованием �пециальных программ, чтобы найти и добавить ��ылки в базу данных.<br/>Форум может отдел�ть роботов от реальных пользователей и предо�тавл�ть им только необходимую информацию, тем �амым повыша� форум в выдаче пои�ковика.<br /><br /><b>Внимание!</b><br />Invision Power Board ра�познает пои�ковых роботов по их user_agent. Так как его легко подделать, злоумышленник может выдать �еб� за пои�кового робота.<br />Имейте �то ввиду при изменении прав пои�ковых роботов.<br /><br />Так же имейте ввиду, что многие пои�ковые �и�темы не индек�ируют динамиче�кий �оздаваемый �айт, чтобы не нарушать работу �ервера по�то�нными запро�ами.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_bots</word_key>
-      <word_default>What are Search Engine Spiders?</word_default>
-      <word_custom>Кто такие Пои�ковые роботы ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_multi_info</word_key>
-      <word_default><![CDATA[If you allow your moderators access to the forums' multi-moderation then you must be aware that they have full use.<br />For example, if one of your multi-moderation actions allowed the topic to be moved and you do not allow move permissions the moderator will still be able to use the topic multi-moderation and move the topic.]]></word_default>
-      <word_custom><![CDATA[Имейте ввиду, что при допу�ке модераторов к мультимодерации тем, они �могут полно�тью во�пользовать�� �той функцией.<br />�апример, е�ли одно из Ваших правил мультимодерации, на�троено на перемещение тем, но Вы запретили в на�тройках одного из модераторов перемещать темы, данный модератор в�ё равно �может перемещать темы при помощи функции мультимодерации.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_multi</word_key>
-      <word_default>Moderators and Topic Multi-Moderation</word_default>
-      <word_custom>Модераци� и мультимодераци� тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_html_info</word_key>
-      <word_default><![CDATA[This will allow all members of the group to post pure HTML in forums that have the ability to accept raw HTML. You can turn this on and off for each forum via the edit forum settings function. Note: When HTML in posts in quoted by a member who does not have the permission to post HTML, the post will be shown in unparsed HTML format with most of the formatting removed.<br /><br /><b>Warning!</b><br />Allowing a member to post HTML is a very dangerous thing, you should not enable this functionality on any group that will use it maliciously. Although IPB tries to filter some of the more harmful content, it is NOT foolproof and this tag CAN be used to steal session cookies, redirect members and destroy the topic view layout.<br />Invision Power Board and Invision Power Services will not be held responsible for any misfortune that occurs from the usage of this tag.<br /><br /><b>Use it wisely!</b>]]></word_default>
-      <word_custom><![CDATA[Это позволит пользовател�м и�пользовать чи�тый HTML в форумах, в которых разрешено и�пользовать HTML. Вы можете включить или выключить �ту возможно�ть дл� каждого форума через функции управлени� форумами. Заметка: Когда HTML и�пользует�� в �оообщении пользователем, которому не разрешено и�пользовать HTML, �ообщение будет показано в необработанном HTML, где большин�тво тегов будет удалены.<br /><br /><b>Внимание!</b><br />Разрешение пользовател�м и�пользовать HTML очень опа�но, не �ледует разрешать �то делать группам, которые могут и�пользовать �то в плохих цел�х. Хот� IPB пытает�� удалить вредоно�ное �одержимое, �то �Е �вл�ет�� гарантией безопа�но�ти. Это может быть и�пользовано дл� кражи �е��ионных куки, перенаправлени� на другую �траницу или дл� нарушени� вывода �траницы темы.<br />Invision Power Board и Invision Power Services не не�ут никакой ответ�твенно�ти за не правильное и�пользование �той опции.<br /><br /><b>И�пользуйте � умом!</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>q_html</word_key>
-      <word_default>Posting HTML</word_default>
-      <word_custom>Отправка HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>w_nav</word_key>
-      <word_default>Welcome</word_default>
-      <word_custom>Добро пожаловать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ll_msg</word_key>
-      <word_default><![CDATA[This page shows all the recorded ACP log in attempts.<br />The red cross indicates an error when logging in and a green tick indicates a successful log in.]]></word_default>
-      <word_custom><![CDATA[�а �той �транице отображены в�е запи�анные попытки входа в �дминцентр.<br />Кра�ный кре�т показывает ошибку входа, а зелена� галочка  показывает у�пешный вход.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ll_title</word_key>
-      <word_default>ACP Log-in Attempts</word_default>
-      <word_custom>Попытки входа в админцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_aunable</word_key>
-      <word_default><![CDATA[<em>Unable to obtain process information</em>]]></word_default>
-      <word_custom><![CDATA[<em>�е возможно получить информацию о проце��е</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ll_noid</word_key>
-      <word_default>No log for that ID found.</word_default>
-      <word_custom>�е найдено запи�ей дл� �того ID.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_aon</word_key>
-      <word_default>ON</word_default>
-      <word_custom>ВКЛЮЧЕ�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_aoff</word_key>
-      <word_default>OFF</word_default>
-      <word_custom>ВЫКЛЮЧЕ�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_anoinfo</word_key>
-      <word_default><![CDATA[<em>No Information</em>]]></word_default>
-      <word_custom><![CDATA[<em>�ет данных</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_aavail</word_key>
-      <word_default>Available Physical Memory</word_default>
-      <word_custom>До�тупно физиче�кой пам�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_atotal</word_key>
-      <word_default>Total Physical Memory</word_default>
-      <word_custom>В�его физиче�кой пам�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_dfix</word_key>
-      <word_default>Fix</word_default>
-      <word_custom>И�править</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_atitle</word_key>
-      <word_default>IP.Board Diagnostics</word_default>
-      <word_custom>Диагно�тика IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_aphpinfo</word_key>
-      <word_default>PHP INFO</word_default>
-      <word_custom>PHP INFO</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_dstatus</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Со�то�ние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_dtbl</word_key>
-      <word_default>Table</word_default>
-      <word_custom>Таблица</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_dnav</word_key>
-      <word_default>Database Structure Results</word_default>
-      <word_custom>Результат проверки �труктуры базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_dtitle</word_key>
-      <word_default>IP.Board Diagnostics - Database Structure Checker</word_default>
-      <word_custom>Диагно�тика IP.Board - Проверка �труктуры базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iman</word_key>
-      <word_default>, or you can run the following queries manually:</word_default>
-      <word_custom>или вы можете выполнить �ледующие запро�ы вручную.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_inauto</word_key>
-      <word_default><![CDATA[<strong>Click here to fix this table's indexes</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�ажмите зде�ь дл� и�правлени� индек�ов �той таблицы</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iauto</word_key>
-      <word_default><![CDATA[<strong>Click here to fix this table</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�ажмите зде�ь дл� и�правлени� таблицы</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iresults</word_key>
-      <word_default>Database Index Results</word_default>
-      <word_custom>Результаты проверки индек�ов базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_itable</word_key>
-      <word_default>Table</word_default>
-      <word_custom>Таблица</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iindex</word_key>
-      <word_default>Index Name</word_default>
-      <word_custom>�азвание индек�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ifix</word_key>
-      <word_default>Fix</word_default>
-      <word_custom>И�править</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ifixall_link</word_key>
-      <word_default>Would you like us to attempt to fix them for you?</word_default>
-      <word_custom>Хотите попытать�� и�править в�е в автоматиче�ком режиме ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_icongrats</word_key>
-      <word_default>There were no errors found with your database indexes.</word_default>
-      <word_custom>Ошибок в индек�ах базы данных не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ifixall</word_key>
-      <word_default>We have found problems with your database, and have listed them below. </word_default>
-      <word_custom>В базе данных обнаружены ошибки. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ierrors</word_key>
-      <word_default>WARNING: ERRORS FOUND</word_default>
-      <word_custom>В�ИМ��ИЕ: ��ЙДЕ�Ы ОШИБКИ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_inoerrors</word_key>
-      <word_default>No Errors Found</word_default>
-      <word_custom>Ошибок не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_inoprocess</word_key>
-      <word_default>There was an error and we could not process your %s_tables.php file. Please reupload it.</word_default>
-      <word_custom>Произошла ошибка и ваш файл %s_tables.php не был обработан. Пожалуй�та, перезагрузите его.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iupload</word_key>
-      <word_default>You must upload: /install/sql/%s_tables.php from the IP.Board installation package for your current version to run this tool.</word_default>
-      <word_custom>Вы должны загрузить: /install/sql/%s_tables.php из ди�трибутива IP.Board вашей текущей вер�ии дл� запу�ка �того ин�трумента.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_iexecuted</word_key>
-      <word_default><![CDATA[Query: %s<br />Executed Successfully<br />]]></word_default>
-      <word_custom><![CDATA[Запро�: %s<br />У�пешно выполнен<br />  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ierror</word_key>
-      <word_default>SQL Error:</word_default>
-      <word_custom>Ошибка SQL:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_idomanual</word_key>
-      <word_default><![CDATA[ Please use the 'Fix Manually' option for this query.]]></word_default>
-      <word_custom><![CDATA[Пожалуй�та, и�пользуйте ��ылку 'И�править вручную' дл� �того запро�а.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_inav</word_key>
-      <word_default>Database Index Results</word_default>
-      <word_custom>Результаты проверки индек�ов базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_isorry</word_key>
-      <word_default>Sorry, those queries are not allowed for your safety.</word_default>
-      <word_custom>Извините, �ти запро�ы запрещены в цел�х безопа�но�ти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ititle</word_key>
-      <word_default>IP.Board Diagnostics -  Database Index Checker</word_default>
-      <word_custom>Диагно�тика IP.Board - Проверка индек�ов базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_wfound</word_key>
-      <word_default>has whitespace at the beginning or end of the file</word_default>
-      <word_custom>имеет пробелы в начале или конце файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_wclear</word_key>
-      <word_default>All files appear to be in good order</word_default>
-      <word_custom>Похоже, что в�е файлы в пор�дке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_wtitle</word_key>
-      <word_default>IP.Board Diagnostics - Whitespace Checker</word_default>
-      <word_custom>Диагно�тика IP.Board - Проверка на пробелы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_wnav</word_key>
-      <word_default>Whitespace Check Results</word_default>
-      <word_custom>Результаты проверки на пробелы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_pyes</word_key>
-      <word_default>is writable</word_default>
-      <word_custom>имеет права на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_pno</word_key>
-      <word_default>The following file or folder is not writable</word_default>
-      <word_custom>�е возможна запи�ь в �ледующую директорию или файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_p404</word_key>
-      <word_default>We could not find the file or folder</word_default>
-      <word_custom>Файл или директори� не найдены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_pnav</word_key>
-      <word_default>Permission Check Results</word_default>
-      <word_custom>Результаты проверки прав до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_ptitle</word_key>
-      <word_default>IP.Board Diagnostics - Permission Checker</word_default>
-      <word_custom>Диагно�тика IP.Board - Проверка прав до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_vinfo</word_key>
-      <word_default>Version Information</word_default>
-      <word_custom>Информаци� о вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_vnav</word_key>
-      <word_default>Version Check Results</word_default>
-      <word_custom>Результаты проверки вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>d_vtitle</word_key>
-      <word_default>IP.Board Diagnostics - Version Checker</word_default>
-      <word_custom>Диагно�тика IP.Board - Проверка вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>chckr_fix</word_key>
-      <word_default>Fix</word_default>
-      <word_custom>И�править</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>chckr_table</word_key>
-      <word_default>Table</word_default>
-      <word_custom>Таблица</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>chckr_status</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Со�то�ние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>last_5_version_history</word_key>
-      <word_default>Version History (Last 5)</word_default>
-      <word_custom>И�тори� обновлений (по�ледние 5)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>system_processes</word_key>
-      <word_default>System Processes</word_default>
-      <word_custom>Проце��ы �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devtaks</word_key>
-      <word_default>Tasks</word_default>
-      <word_custom>Задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devcomponents</word_key>
-      <word_default>Components</word_default>
-      <word_custom>Компоненты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devlogin</word_key>
-      <word_default>Log In Auth</word_default>
-      <word_custom>�вторизаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devgroups</word_key>
-      <word_default>Groups</word_default>
-      <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devfile</word_key>
-      <word_default>File Types</word_default>
-      <word_custom>Типы файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devpages</word_key>
-      <word_default>Pages</word_default>
-      <word_custom>Страницы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devskin</word_key>
-      <word_default>Skin Set</word_default>
-      <word_custom>Стиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devcontent</word_key>
-      <word_default>Content Templates</word_default>
-      <word_custom>Шаблоны �одержани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devtemplate</word_key>
-      <word_default>Template HTML</word_default>
-      <word_custom>Шаблон HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devemail</word_key>
-      <word_default>Email Templates</word_default>
-      <word_custom>Шаблоны E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sy_devexport</word_key>
-      <word_default>Export Installer XML</word_default>
-      <word_custom>Эк�портировать XML у�тановщика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_total_entries</word_key>
-      <word_default>Total Entries</word_default>
-      <word_custom>В�его запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_out_of_date_entries</word_key>
-      <word_default>Out of Date Entries</word_default>
-      <word_custom>У�таревшие запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_default</word_key>
-      <word_default>Default Text</word_default>
-      <word_custom>Тек�т по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_customized_entries</word_key>
-      <word_default>Customized Entries</word_default>
-      <word_custom>Измененные запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_pack_name</word_key>
-      <word_default>Pack Name</word_default>
-      <word_custom>�абор �лов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_key</word_key>
-      <word_default>Key</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_revert</word_key>
-      <word_default>Language customization has been reverted</word_default>
-      <word_custom>Изменени� в �зыке отменены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_pack_updated</word_key>
-      <word_default>Language pack information updated</word_default>
-      <word_custom>�а�тройки �зыка обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_title_missing</word_key>
-      <word_default>Language title can not be blank</word_default>
-      <word_custom>�азвание �зыка не может быть пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_locale_missing</word_key>
-      <word_default>Language locale can not be blank</word_default>
-      <word_custom>Локаль �зыка не может быть пу�той</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_default</word_key>
-      <word_default>Default Language?</word_default>
-      <word_custom>И�пользовать по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_title</word_key>
-      <word_default>Language Title</word_default>
-      <word_custom>�азвание �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_locale</word_key>
-      <word_default>Language Locale</word_default>
-      <word_custom>Локаль �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_new_info</word_key>
-      <word_default><![CDATA[<h2>Language Pack Information</h2><p><br />You can configure basic language pack settings here</p>]]></word_default>
-      <word_custom><![CDATA[<h2>�а�тройки �зыка</h2><p><br />Зде�ь вы можете на�троить о�новные параметры �зыкового пакета</p>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_pack_created</word_key>
-      <word_default>Language pack created</word_default>
-      <word_custom>Язык �оздан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_new_button</word_key>
-      <word_default>Add this language</word_default>
-      <word_custom>Добавить �тот �зык</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_new_title</word_key>
-      <word_default>Create a new language pack</word_default>
-      <word_custom>Создать новый �зык</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_edit_info</word_key>
-      <word_default><![CDATA[<h2>Language Pack Information</h2><p><br />You can configure basic language pack settings here</p>]]></word_default>
-      <word_custom><![CDATA[<h2>�а�тройки �зыка</h2><p><br />Зде�ь вы можете на�троить о�новные параметры �зыкового пакета</p>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_edit_button</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_pack_edited</word_key>
-      <word_default>Word pack updated</word_default>
-      <word_custom>Слова обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_form_edit_title</word_key>
-      <word_default>Edit Language Pack Information</word_default>
-      <word_custom>Редактирование �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_pack_current</word_key>
-      <word_default>Default Value</word_default>
-      <word_custom>Значение по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_pack_new</word_key>
-      <word_default>New Value</word_default>
-      <word_custom>�овое значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_pack_edit</word_key>
-      <word_default>Edit word pack</word_default>
-      <word_custom>Редактирование �лов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_pack_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_default</word_key>
-      <word_default>Default</word_default>
-      <word_custom>По умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_translate_ext</word_key>
-      <word_default>Translate Externally...</word_default>
-      <word_custom>Переве�ти через файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_translate</word_key>
-      <word_default>Translate in Admin CP...</word_default>
-      <word_custom>Переве�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_date</word_key>
-      <word_default>Date Example</word_default>
-      <word_custom>Формат даты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_money</word_key>
-      <word_default>Currency Example</word_default>
-      <word_custom>Формат валюты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_local</word_key>
-      <word_default>Locale</word_default>
-      <word_custom>Локаль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_title</word_key>
-      <word_default>Language</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_page_title</word_key>
-      <word_default>Localization Manager</word_default>
-      <word_custom>Управление �зыками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_this_will_examine_the_corecach</word_key>
-      <word_default><![CDATA[This will examine the cache/lang_cache/master_lang/ directory<br />for {app}_language.php files and import them into the database.]]></word_default>
-      <word_custom><![CDATA[Провер�ет директорию cache/lang_cache/master_lang/<br />на наличие файлов {app}_language.php и импортирует их в базу данных.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>indev_lang_export_done</word_key>
-      <word_default>All language files exported to application directories</word_default>
-      <word_custom>В�е �зыковые файлы �к�портированы в директории приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>lang_upload_other_error</word_key>
-      <word_default>An error occurred while attempting to upload the language pack.</word_default>
-      <word_custom>В ходе загрузки �зыка произошла ошибка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>lang_upload_too_large</word_key>
-      <word_default><![CDATA[The uploaded file was too large, the maximum allowed upload size for your system is currently <b>%s</b>.]]></word_default>
-      <word_custom><![CDATA[Загруженный файл �лишком велик, мак�имальный допу�тимый размер загружаемых файлов дл� вашей �и�темы �о�тавл�ет <b>%s</b>.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_indev_export_go</word_key>
-      <word_default>Export</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_indev_export</word_key>
-      <word_default>Export language files to application directories</word_default>
-      <word_custom>Эк�портировать �зыковые файлы в директории приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_select_the_application_languag</word_key>
-      <word_default>Select the application language files to import</word_default>
-      <word_custom>Выберите �зыковой файл приложени� дл� импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_developers_language_cache_impo</word_key>
-      <word_default><![CDATA[Developer's Language Cache Import]]></word_default>
-      <word_custom>Ин�трументы разработчика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_badfile</word_key>
-      <word_default>There was no language pack information in the file you uploaded</word_default>
-      <word_custom>Информаци� о �зыковом пакете в загруженном файле не найдена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_import</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импорт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_the_file_must_be_uploaded_into</word_key>
-      <word_default><![CDATA[The file must be uploaded into the './admin' folder]]></word_default>
-      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_or_enter_the_filename_of_the_x</word_key>
-      <word_default><![CDATA[<u>OR</u> enter the filename of the xml.gz language pack]]></word_default>
-      <word_custom><![CDATA[<u>ИЛИ</u> введите название XML-архива]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_duplicate_entries_will_not_be_</word_key>
-      <word_default>Duplicate entries will not be overwritten but the default setting and other options will be updated.</word_default>
-      <word_custom>Суще�твующие на�тройки будут обновлены, другие — добавлены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_upload_xml_language_file_from_</word_key>
-      <word_default>Upload language pack from your computer</word_default>
-      <word_custom>Загрузка XML-архива � �зыковыми на�тройками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_import_language_xml</word_key>
-      <word_default>Import Language XML</word_default>
-      <word_custom>Импортирование XML-файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_version</word_key>
-      <word_default>Version</word_default>
-      <word_custom>Вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_sql_version</word_key>
-      <word_default>SQL Version</word_default>
-      <word_custom>Вер�и� SQL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_avail_mem</word_key>
-      <word_default>Available Server Memory</word_default>
-      <word_custom>До�тупна� пам�ть �ервера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_total_mem</word_key>
-      <word_default>Total Server Memory</word_default>
-      <word_custom>Обща� пам�ть �ервера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_current_load</word_key>
-      <word_default>Current Server Load</word_default>
-      <word_custom>Текуща� загрузка �ервера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_safe_mod</word_key>
-      <word_default>Safe Mode</word_default>
-      <word_custom>Безопа�ный режим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_sys_software</word_key>
-      <word_default>System Software</word_default>
-      <word_custom>Программное обе�печение �ервера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_disabled_funcs</word_key>
-      <word_default>Disabled PHP Functions</word_default>
-      <word_custom>Отключенные PHP функции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_php_version</word_key>
-      <word_default>PHP Version</word_default>
-      <word_custom>Вер�и� PHP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_ipboard_version</word_key>
-      <word_default>IP.Board Version</word_default>
-      <word_custom>Вер�и� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_status</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Со�то�ние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_log</word_key>
-      <word_default>Log</word_default>
-      <word_custom>Журнал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_system_overview</word_key>
-      <word_default>System Overview</word_default>
-      <word_custom>Обзор �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_last_5_acp_log_in_attempts</word_key>
-      <word_default>Last 5 ACP Log in Attempts</word_default>
-      <word_custom>По�ледние 5 попыток входа в �дминцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_view_details</word_key>
-      <word_default>View Details</word_default>
-      <word_custom>Подробно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_all_times_gmt_gmt_time_now_is</word_key>
-      <word_default>All times GMT. GMT time now is:</word_default>
-      <word_custom>Врем� по Гринвичу:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_delete_task</word_key>
-      <word_default>Delete Task...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_unlock_task</word_key>
-      <word_default>Unlock Task...</word_default>
-      <word_custom>Разблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_edit_task</word_key>
-      <word_default>Edit Task...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_run</word_key>
-      <word_default>Run</word_default>
-      <word_custom>Запу�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_how_curl_to_use_in_a_cron</word_key>
-      <word_default>Show CURL to use in a cron</word_default>
-      <word_custom>Показать �троку CURL дл� запу�ка задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_wday</word_key>
-      <word_default>WDay</word_default>
-      <word_custom>День недели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_mday</word_key>
-      <word_default>MDay</word_default>
-      <word_custom>День ме��ца</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_min</word_key>
-      <word_default>Min</word_default>
-      <word_custom>Минута</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_hour</word_key>
-      <word_default>Hour</word_default>
-      <word_custom>Ча�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_system_schedular</word_key>
-      <word_default>System Scheduler</word_default>
-      <word_custom>Менеджер задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_next_run</word_key>
-      <word_default>Next Run</word_default>
-      <word_custom>Следующий запу�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_if_set_to_yes_this_will_not_be</word_key>
-      <word_default><![CDATA[If set to 'yes', this will not be editable by admins]]></word_default>
-      <word_custom><![CDATA[Е�ли вы выберете 'Да', админи�траторы не �могут редактировать задачу]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_safe_mode</word_key>
-      <word_default>Task Safe Mode</word_default>
-      <word_custom>Безопа�ный режим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_this_is_used_to_call_a_task_wh</word_key>
-      <word_default>This is used to call a task where the ID of the task might change</word_default>
-      <word_custom>Это �лово и�пользует�� дл� задани�, у которого ID может изменить��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_key</word_key>
-      <word_default>Task Key</word_default>
-      <word_custom>Ключ задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_enable_task</word_key>
-      <word_default>Enable Task?</word_default>
-      <word_custom>Включить задачу?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_if_you_are_using_cron_you_migh</word_key>
-      <word_default>If you are using CRON, you might wish to disable this task from the internal manager.</word_default>
-      <word_custom>Е�ли вы и�пользуете CRON, вы должны отключить вызов �той задачи зде�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_will_write_to_the_task_log_eac</word_key>
-      <word_default>Will write to the task log each time the task is run, not recommended for regular tasks run every few minutes.</word_default>
-      <word_custom>При включенной опции в�е выполнени� задач будут запи�аны в базу данных, не рекомендует�� дл� о�новных задач, выполн�емых каждые 5-10 минут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_enable_task_logging</word_key>
-      <word_default>Enable Task Logging</word_default>
-      <word_custom>Включить запи�ь журнала дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_choose_every_day_to_run_each_d_1</word_key>
-      <word_default><![CDATA[Choose 'Every Day' to run each day or a month day for a specific month day of a month]]></word_default>
-      <word_custom><![CDATA[Выберите 'Каждый день ме��ца' дл� запу�ка каждый день или точное чи�ло]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_time_month_day</word_key>
-      <word_default>Task Time: Month Day</word_default>
-      <word_custom>Врем� задачи: день ме��ца</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_choose_every_hour_to_run_each_</word_key>
-      <word_default><![CDATA[Choose 'Every Hour' to run each hour or a number for a specific hour of a day]]></word_default>
-      <word_custom><![CDATA[Выберите 'Каждый ча�' дл� запу�ка каждый ча� или точное значение ча�а в день]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_time_week_day</word_key>
-      <word_default>Task Time: Week Day</word_default>
-      <word_custom>Врем� задачи: день недели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_choose_every_day_to_run_each_d</word_key>
-      <word_default><![CDATA[Choose 'Every Day' to run each day or a week day for a specific week day of a month]]></word_default>
-      <word_custom><![CDATA[Выберите 'Каждый день недели' дл� запу�ка каждый день недели или про�то укажите день недели]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_time_hours</word_key>
-      <word_default>Task Time: Hours</word_default>
-      <word_custom>Врем� задачи: ча�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_choose_every_minute_to_run_eac</word_key>
-      <word_default><![CDATA[Choose 'Every Minute' to run each minute or a number for a specific minute of an hour]]></word_default>
-      <word_custom><![CDATA[Выберите 'Каждую минуту' дл� запу�ка каждую минуту или точное значение минуты в ча�у]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_time_options</word_key>
-      <word_default>Time Options</word_default>
-      <word_custom>Опции времени</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_time_minutes</word_key>
-      <word_default>Task Time: Minutes</word_default>
-      <word_custom>Врем� задачи: минуты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_this_is_the_php_file_that_is_r</word_key>
-      <word_default>This is the PHP file that is run when the task is run.</word_default>
-      <word_custom>Это PHP файл, который будет запу�кать�� при запу�ке задачи.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_title</word_key>
-      <word_default>Task Title</word_default>
-      <word_custom>�азвание задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_short_description</word_key>
-      <word_default>Task Short Description</word_default>
-      <word_custom>Краткое опи�ание задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_application</word_key>
-      <word_default>Task Application</word_default>
-      <word_custom>Задача приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_php_file_to_run</word_key>
-      <word_default>Task PHP File To Run</word_default>
-      <word_custom>PHP файл задачи дл� запу�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_every_minute</word_key>
-      <word_default>Every minute</word_default>
-      <word_custom>Каждую минуту</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_every</word_key>
-      <word_default>Every</word_default>
-      <word_custom>Каждые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_minutes</word_key>
-      <word_default>minutes</word_default>
-      <word_custom>минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_minutes_past_the_first_availab</word_key>
-      <word_default>minutes past the first available hour</word_default>
-      <word_custom>минут �пу�т� первого до�тупного ча�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_hours</word_key>
-      <word_default>hours</word_default>
-      <word_custom>ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_on_every_hour</word_key>
-      <word_default>On every hour</word_default>
-      <word_custom>Каждый ча�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_at</word_key>
-      <word_default>At</word_default>
-      <word_custom> Ð’ </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_tuesday</word_key>
-      <word_default>Tuesday</word_default>
-      <word_custom>Вторник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_wednesday</word_key>
-      <word_default>Wednesday</word_default>
-      <word_custom>Среда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_thursday</word_key>
-      <word_default>Thursday</word_default>
-      <word_custom>Четверг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_friday</word_key>
-      <word_default>Friday</word_default>
-      <word_custom>П�тница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_saturday</word_key>
-      <word_default>Saturday</word_default>
-      <word_custom>Суббота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_on_day</word_key>
-      <word_default>On day</word_default>
-      <word_custom>День</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_on</word_key>
-      <word_default>On</word_default>
-      <word_custom>Ð’ </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_monday</word_key>
-      <word_default>Monday</word_default>
-      <word_custom>Понедельник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_sunday</word_key>
-      <word_default>Sunday</word_default>
-      <word_custom>Во�кре�енье</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_delete_logs</word_key>
-      <word_default>DELETE Logs</word_default>
-      <word_custom>УД�ЛИТЬ запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_delete_logs_older_than_n_days</word_key>
-      <word_default><![CDATA[Delete logs older than <em>n</em> days]]></word_default>
-      <word_custom><![CDATA[Удалить запи�и �тарше чем <em>n</em> дней]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_delete_logs_for_task</word_key>
-      <word_default>Delete logs for task</word_default>
-      <word_custom>Удаление запи�ей задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_view_task_manager_logs</word_key>
-      <word_default>View Task Manager Logs</word_default>
-      <word_custom>Про�мотр журнала менеджера задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_view_logs_for_task</word_key>
-      <word_default>View logs for task</word_default>
-      <word_custom>Про�мотр журнала задачи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_show_n_log_entries</word_key>
-      <word_default><![CDATA[Show <em>n</em> log entries]]></word_default>
-      <word_custom><![CDATA[Показать <em>n</em> запи�ей ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_view_logs</word_key>
-      <word_default>View Logs</word_default>
-      <word_custom>Про�мотр запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_delete_task_manager_logs</word_key>
-      <word_default>Delete Task Manager Logs</word_default>
-      <word_custom>Удалить запи�и менеджера задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_last_5_run_tasks</word_key>
-      <word_default>Last 5 Run Tasks</word_default>
-      <word_custom>По�ледние 5 запущенных задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_log_info</word_key>
-      <word_default>Log Info</word_default>
-      <word_custom>Результаты запу�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_date_run</word_key>
-      <word_default>Date Run</word_default>
-      <word_custom>Дата запу�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_manager_logs</word_key>
-      <word_default>Task Manager Logs</word_default>
-      <word_custom>Журнал менеджера задач</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_task_run</word_key>
-      <word_default>Task Run</word_default>
-      <word_custom>Задача</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_loaded_ext</word_key>
-      <word_default>Loaded Extensions</word_default>
-      <word_custom>Загруженные дополнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_get</word_key>
-      <word_default>GET Data (URL Data)</word_default>
-      <word_custom>Данные GET (данные из URL)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_post</word_key>
-      <word_default>POST Data (Form Data)</word_default>
-      <word_custom>Данные POST (данные формы)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_time</word_key>
-      <word_default>Log in Time</word_default>
-      <word_custom>Врем� входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_success</word_key>
-      <word_default>Success</word_default>
-      <word_custom>У�пешно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_username</word_key>
-      <word_default>Username</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetail_basic</word_key>
-      <word_default>Basics</word_default>
-      <word_custom>О�новные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cannot_delete_default_lang</word_key>
-      <word_default>You cannot delete the default language pack</word_default>
-      <word_custom>Вы не можете удалить �зыковой пакет, и�пользующий�� по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>lang_reimport_done</word_key>
-      <word_default>Language Re-Import Done</word_default>
-      <word_custom>Повторное импортирование �зыка завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>importing_x_langs</word_key>
-      <word_default>: Importing %s languages...</word_default>
-      <word_custom>: Импортирование %s �зыков...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>starting_admin_import</word_key>
-      <word_default>Starting Admin import...</word_default>
-      <word_custom>Запу�к импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>rebuild_lang_from_xml</word_key>
-      <word_default>Rebuild From XML...</word_default>
-      <word_custom>Обновить из XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>run_task_now</word_key>
-      <word_default>Run task now -- id: </word_default>
-      <word_custom>Запу�ть задачу �ейча� -- id: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_submit</word_key>
-      <word_default>Submit</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sys_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>Задача</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_word_out_of_date_check</word_key>
-      <word_default>Outdated Strings</word_default>
-      <word_custom>У�таревшие �троки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_add_new_language_entry</word_key>
-      <word_default>Add String</word_default>
-      <word_custom>Добавить �троку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_find</word_key>
-      <word_default>Find</word_default>
-      <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_view_word_packs</word_key>
-      <word_default>View Word Packs</word_default>
-      <word_custom>Про�мотр �лов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_edit_language_pack_information</word_key>
-      <word_default>Edit Language Info</word_default>
-      <word_custom>�а�тройки �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_import_tasksxml</word_key>
-      <word_default>Import tasks.xml</word_default>
-      <word_custom>Импортировать tasks.xml </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_manage_languages</word_key>
-      <word_default>Manage Languages</word_default>
-      <word_custom>Управление �зыками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_export_tasksxml</word_key>
-      <word_default>Export tasks.xml</word_default>
-      <word_custom>Эк�портировать tasks.xml </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>sym_add_new_task</word_key>
-      <word_default>Add New Task</word_default>
-      <word_custom>Добавить задачу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_list_recache</word_key>
-      <word_default>Recache all...</word_default>
-      <word_custom>Перекешировать в�е...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_recache_done</word_key>
-      <word_default>Recache complete</word_default>
-      <word_custom>Кеширование завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_all_killed</word_key>
-      <word_default>Translation Session Removed</word_default>
-      <word_custom>Се��и� перевода удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_translation_detected</word_key>
-      <word_default><![CDATA[A file translation session has been detected. Click <a href='%s'>here to go there now</a>.<br />You will not be able to start a new session until you finish the current one.]]></word_default>
-      <word_custom><![CDATA[�айдена �е��и� перевода. �ажмите <a href='%s'>�юда</a> чтобы вернуть�� к ней.<br /> Вы не можете начинать новый перевод, пока не завершите �тарый.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_tbl_submit</word_key>
-      <word_default>Import Selected Files</word_default>
-      <word_custom>Импортировать выбранные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_tbl_db</word_key>
-      <word_default>Last DB Update</word_default>
-      <word_custom>По�леднее изменение в базе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_tbl_local</word_key>
-      <word_default>Last Local Edit</word_default>
-      <word_custom>По�леднее локальное изменение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_tbl_file</word_key>
-      <word_default>File</word_default>
-      <word_custom>Файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_button_smodified</word_key>
-      <word_default>Select Modified</word_default>
-      <word_custom>Выбрать измененные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_button_selectall</word_key>
-      <word_default>Select All</word_default>
-      <word_custom>Выбрать в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_button_unselect</word_key>
-      <word_default>Unselect All</word_default>
-      <word_custom>Сн�ть в�е отметки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_button_finish</word_key>
-      <word_default>Finish And Remove</word_default>
-      <word_custom>Завершить и удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_top_desc</word_key>
-      <word_default><![CDATA[You can edit the files in the 'translate' directory. Once you have translated the file you can import these changes directly into the database.<br /><strong>Before editing, please set your text editor to save files as UTF-8 regardless of the character set your board uses.</strong>]]></word_default>
-      <word_custom><![CDATA[Вы можете измен�ть файлы в директории /translate/. По�ле перевода вы можете импортировать изменени� в базу данных.  <br /><strong>Перед редактированием на�тройте в вашем тек�товом редакторе кодировку UTF-8, потому что форум и�пользует ее.</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_top_title</word_key>
-      <word_default>External File Translation</word_default>
-      <word_custom>Перевод через файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_recache</word_key>
-      <word_default><![CDATA[Note: you will need to <a href='%s'>recache this set</a> to view the changes throughout the board.]]></word_default>
-      <word_custom><![CDATA[Замечание: вы должны <a href='%s'>перекешировать</a>  дл� того, чтобы увидеть изменени� на форуме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_title_for</word_key>
-      <word_default>External Translation For</word_default>
-      <word_custom>Перевод дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_file_written</word_key>
-      <word_default>Imported %s (%s added entries, %s updated)</word_default>
-      <word_custom>Импортировано %s (%s добавленных запи�ей, %s обновленных) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_no_selected_files</word_key>
-      <word_default>You did not select any files to import!</word_default>
-      <word_custom>Вы не выбрали ни одного файла дл� импортировани�!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_no_translate_files</word_key>
-      <word_default>Could not locate a valid translate session. This could be because there are no files in the translate directory anymore</word_default>
-      <word_custom>�евозможно найти корректную �е��ию перевода. Это могло пройзойти, потому что там нет файлов дл� перевода.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_chmod_translate_dir</word_key>
-      <word_default><![CDATA[Please make sure PHP has write permissions into your 'translate' directory. CHMOD 0777 if in doubt.]]></word_default>
-      <word_custom>Сделайте, чтобы PHP могло запи�ывать данные в директорию /translate/. CHMOD 777.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ext_no_translate_dir</word_key>
-      <word_default><![CDATA[Please create a directory called 'translate' in the <em>root</em> forum directory (the same directory that contains your 'initdata.php' file and 'admin' folder). Please make sure PHP has write permissions into this directory. CHMOD 0777 if in doubt.]]></word_default>
-      <word_custom>Пожалуй�та, �оздайте директорию /translate/ в корневой директории форума. И �делайте права CHMOD на нее 0777.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>perm_check_results</word_key>
-      <word_default>Permissions Check Results</word_default>
-      <word_custom>Результаты проверки прав</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>lang_pack_protected</word_key>
-      <word_default>Can not translate protected language pack</word_default>
-      <word_custom>�евозможно переве�ти защищенный пакет �зыков</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cannot_delete_protected_lang</word_key>
-      <word_default>Can not delete protected language pack</word_default>
-      <word_custom>�евозможно удалить защищенный пакет �зыков</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>langpackaddapp</word_key>
-      <word_default>Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>nolangpacksgroup</word_key>
-      <word_default>There are no word packs for this application</word_default>
-      <word_custom>�ет �зыковых пакетов дл� данного приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>logindetails</word_key>
-      <word_default>Log in Details</word_default>
-      <word_custom>Данные авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>ipaddyprefix</word_key>
-      <word_default>IP: </word_default>
-      <word_custom>IP:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>selectimeunitsabove</word_key>
-      <word_default>Select time units above</word_default>
-      <word_custom>Выберите единицу времени</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>taskthereforrun</word_key>
-      <word_default>Task will therefore run: </word_default>
-      <word_custom>Задача будет запущена:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connections__output1</word_key>
-      <word_default>Output (first 2000 characters):</word_default>
-      <word_custom>Ответ (первые 2000 �имволов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connections__headers1</word_key>
-      <word_default>HTTPS Headers (https://www.invisionpower.com/)</word_default>
-      <word_custom>HTTPS заголовки (https://www.invisionpower.com/)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connections__message</word_key>
-      <word_default>This tool is designed to verify that your server can make outbound connections to another server.  Many features in IP.Board require outbound connection capability (such as IP.Chat, License verification, and Facebook Connect), and this tool verifies the underlying outbound connectivity is functioning correctly.</word_default>
-      <word_custom>Данный ин�трумент позвол�ет проверить возможно�ть �оздание внешних �етевых �оединений на вашем �и�теме. Большое количе�тво функций в IP.Board требуют возможно�ти у�танавливать такие �оединени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connections__output</word_key>
-      <word_default>Output (first 2000 characters):</word_default>
-      <word_custom>Ответ (первые 2000 �имволов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connections__headers</word_key>
-      <word_default>HTTP Headers (http://www.invisionpower.com/)</word_default>
-      <word_custom>HTTP заголовки (http://www.invisionpower.com/) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>connectionchecker</word_key>
-      <word_default>Connection Checker</word_default>
-      <word_custom>Проверка �етевых �оединений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_topics</word_key>
-      <word_default>Topics</word_default>
-      <word_custom>Тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_awaitingmoderation</word_key>
-      <word_default>Awaiting Moderation</word_default>
-      <word_custom>Ожидающих подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_manage</word_key>
-      <word_default>Manage</word_default>
-      <word_custom>Управление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_onlinenow_info</word_key>
-      <word_default>(Includes Members and Guests)</word_default>
-      <word_custom>(включа� го�тей и пользователей)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_spammeraccounts</word_key>
-      <word_default>Spammers</word_default>
-      <word_custom>Спамеры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_coppaaccounts</word_key>
-      <word_default>COPPA Accounts</word_default>
-      <word_custom>COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_lockedaccounts</word_key>
-      <word_default>Locked Accounts</word_default>
-      <word_custom>Заблокированных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>cp_awaitingvalidation</word_key>
-      <word_default>Awaiting Validation</word_default>
-      <word_custom>Ожидающих подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20153,9 +12719,6 @@
       <word_key>cp_onlinenow</word_key>
       <word_default>Online Now</word_default>
       <word_custom>Онлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20163,9 +12726,6 @@
       <word_key>cp_totalmembers</word_key>
       <word_default>Total Members</word_default>
       <word_custom>Пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20173,19 +12733,2701 @@
       <word_key>cp_systemstats</word_key>
       <word_default>System Statistics</word_default>
       <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_savechanges</word_key>
+      <word_key>cp_coppaaccounts</word_key>
+      <word_default>COPPA Accounts</word_default>
+      <word_custom>COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_awaitingvalidation</word_key>
+      <word_default>Awaiting Validation</word_default>
+      <word_custom>Ожидающих подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_lockedaccounts</word_key>
+      <word_default>Locked Accounts</word_default>
+      <word_custom>Заблокированных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_spammeraccounts</word_key>
+      <word_default>Spammers</word_default>
+      <word_custom>Спамеры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_onlinenow_info</word_key>
+      <word_default>(Includes Members and Guests)</word_default>
+      <word_custom>(включа� го�тей и пользователей)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_manage</word_key>
+      <word_default>Manage</word_default>
+      <word_custom>Управление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_topics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connections__headers</word_key>
+      <word_default>HTTP Headers</word_default>
+      <word_custom>HTTP заголовки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_awaitingmoderation</word_key>
+      <word_default>Awaiting Moderation</word_default>
+      <word_custom>Ожидающих подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cp_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connectionchecker</word_key>
+      <word_default>Connection Checker</word_default>
+      <word_custom>Проверка �етевых �оединений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connections__message</word_key>
+      <word_default>This tool is designed to verify that your server can make outbound connections to another server.  Many features in IP.Board require outbound connection capability (such as IP.Chat, License verification, and Facebook Connect), and this tool verifies the underlying outbound connectivity is functioning correctly.</word_default>
+      <word_custom>Данный ин�трумент позвол�ет проверить возможно�ть �оздание внешних �етевых �оединений на вашем �и�теме. Большое количе�тво функций в IP.Board требуют возможно�ти у�танавливать такие �оединени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connections__output</word_key>
+      <word_default>Output (first 2000 characters):</word_default>
+      <word_custom>Ответ (первые 2000 �имволов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connections__headers1</word_key>
+      <word_default>HTTPS Headers</word_default>
+      <word_custom>HTTPS заголовки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>connections__output1</word_key>
+      <word_default>Output (first 2000 characters):</word_default>
+      <word_custom>Ответ (первые 2000 �имволов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>selectimeunitsabove</word_key>
+      <word_default>Select time units above</word_default>
+      <word_custom>Выберите единицу времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>taskthereforrun</word_key>
+      <word_default>Task will therefore run: </word_default>
+      <word_custom>Задача будет запущена:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ipaddyprefix</word_key>
+      <word_default>IP: </word_default>
+      <word_custom>IP:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_chmod_translate_dir</word_key>
+      <word_default><![CDATA[Please make sure PHP has write permissions into your 'translate' directory. CHMOD 0777 if in doubt.]]></word_default>
+      <word_custom>Сделайте, чтобы PHP могло запи�ывать данные в директорию /translate/. CHMOD 777.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_no_selected_files</word_key>
+      <word_default>You did not select any files to import!</word_default>
+      <word_custom>Вы не выбрали ни одного файла дл� импортировани�!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_file_written</word_key>
+      <word_default>Imported %s (%s added entries, %s updated)</word_default>
+      <word_custom>Импортировано %s (%s добавленных запи�ей, %s обновленных) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetails</word_key>
+      <word_default>Log in Details</word_default>
+      <word_custom>Данные авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>nolangpacksgroup</word_key>
+      <word_default>There are no word packs for this application</word_default>
+      <word_custom>�ет �зыковых пакетов дл� данного приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>langpackaddapp</word_key>
+      <word_default>Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cannot_delete_protected_lang</word_key>
+      <word_default>Can not delete protected language pack</word_default>
+      <word_custom>�евозможно удалить защищенный пакет �зыков</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_pack_protected</word_key>
+      <word_default>Can not translate protected language pack</word_default>
+      <word_custom>�евозможно переве�ти защищенный пакет �зыков</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>perm_check_results</word_key>
+      <word_default>Permissions Check Results</word_default>
+      <word_custom>Результаты проверки прав</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_no_translate_dir</word_key>
+      <word_default><![CDATA[Please create a directory called 'translate' in the <em>root</em> forum directory (the same directory that contains your 'initdata.php' file and 'admin' folder). Please make sure PHP has write permissions into this directory. CHMOD 0777 if in doubt.]]></word_default>
+      <word_custom>Пожалуй�та, �оздайте директорию /translate/ в корневой директории форума. И �делайте права CHMOD на нее 0777.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_no_translate_files</word_key>
+      <word_default>Could not locate a valid translate session. This could be because there are no files in the translate directory anymore</word_default>
+      <word_custom>�евозможно найти корректную �е��ию перевода. Это могло пройзойти, потому что там нет файлов дл� перевода.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_button_unselect</word_key>
+      <word_default>Unselect All</word_default>
+      <word_custom>Сн�ть в�е отметки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_button_selectall</word_key>
+      <word_default>Select All</word_default>
+      <word_custom>Выбрать в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_button_smodified</word_key>
+      <word_default>Select Modified</word_default>
+      <word_custom>Выбрать измененные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_title_for</word_key>
+      <word_default>External Translation For</word_default>
+      <word_custom>Перевод дл� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_recache</word_key>
+      <word_default><![CDATA[Note: you will need to <a href='%s'>recache this set</a> to view the changes throughout the community.]]></word_default>
+      <word_custom><![CDATA[Замечание: вы должны <a href='%s'>перекешировать</a>  дл� того, чтобы увидеть изменени� на форуме.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_top_title</word_key>
+      <word_default>External File Translation</word_default>
+      <word_custom>Перевод через файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_top_desc</word_key>
+      <word_default><![CDATA[You can edit the files in the 'translate' directory. Once you have translated the file you can import these changes directly into the database.<br /><strong>Before editing, please set your text editor to save files as UTF-8 regardless of the character set your community uses.</strong>]]></word_default>
+      <word_custom><![CDATA[Вы можете измен�ть файлы в директории /translate/. По�ле перевода вы можете импортировать изменени� в базу данных.  <br /><strong>Перед редактированием на�тройте в вашем тек�товом редакторе кодировку UTF-8, потому что форум и�пользует ее.</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_button_finish</word_key>
+      <word_default>Finish And Remove</word_default>
+      <word_custom>Завершить и удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_tbl_file</word_key>
+      <word_default>File</word_default>
+      <word_custom>Файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_tbl_local</word_key>
+      <word_default>Last Local Edit</word_default>
+      <word_custom>По�леднее локальное изменение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_tbl_submit</word_key>
+      <word_default>Import Selected Files</word_default>
+      <word_custom>Импортировать выбранные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_tbl_db</word_key>
+      <word_default>Last DB Update</word_default>
+      <word_custom>По�леднее изменение в базе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_recache</word_key>
+      <word_default>Recache all...</word_default>
+      <word_custom>Перекешировать в�е...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_recache_done</word_key>
+      <word_default>Recache complete</word_default>
+      <word_custom>Кеширование завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_all_killed</word_key>
+      <word_default>Translation Session Removed</word_default>
+      <word_custom>Се��и� перевода удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_add_new_task</word_key>
+      <word_default>Add New Task</word_default>
+      <word_custom>Добавить задачу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ext_translation_detected</word_key>
+      <word_default><![CDATA[A file translation session has been detected. Click <a href='%s'>here to go there now</a>.<br />You will not be able to start a new session until you finish the current one.]]></word_default>
+      <word_custom><![CDATA[�айдена �е��и� перевода. �ажмите <a href='%s'>�юда</a> чтобы вернуть�� к ней.<br /> Вы не можете начинать новый перевод, пока не завершите �тарый.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_export_tasksxml</word_key>
+      <word_default>Export tasks.xml</word_default>
+      <word_custom>Эк�портировать tasks.xml </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_edit_language_pack_information</word_key>
+      <word_default>Edit Language Info</word_default>
+      <word_custom>�а�тройки �зыка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_view_word_packs</word_key>
+      <word_default>View Word Packs</word_default>
+      <word_custom>Про�мотр �лов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_import_tasksxml</word_key>
+      <word_default>Import tasks.xml</word_default>
+      <word_custom>Импортировать tasks.xml </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_manage_languages</word_key>
+      <word_default>Manage Languages</word_default>
+      <word_custom>Управление �зыками</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_add_new_language_entry</word_key>
+      <word_default>Add String</word_default>
+      <word_custom>Добавить �троку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_word_out_of_date_check</word_key>
+      <word_default>Outdated Strings</word_default>
+      <word_custom>У�таревшие �троки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_submit</word_key>
+      <word_default>Submit</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sym_find</word_key>
+      <word_default>Find</word_default>
+      <word_custom>�айти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>run_task_now</word_key>
+      <word_default>Run task now -- id: </word_default>
+      <word_custom>Запу�ть задачу �ейча� -- id: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>Задача</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>rebuild_lang_from_xml</word_key>
+      <word_default>Rebuild From XML...</word_default>
+      <word_custom>Обновить из XML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_reimport_done</word_key>
+      <word_default>Language Re-Import Done</word_default>
+      <word_custom>Повторное импортирование �зыка завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>starting_admin_import</word_key>
+      <word_default>Starting Admin import...</word_default>
+      <word_custom>Запу�к импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>importing_x_langs</word_key>
+      <word_default>: Importing %s languages...</word_default>
+      <word_custom>: Импортирование %s �зыков...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>cannot_delete_default_lang</word_key>
+      <word_default>You cannot delete the default language pack</word_default>
+      <word_custom>Вы не можете удалить �зыковой пакет, и�пользующий�� по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_basic</word_key>
+      <word_default>Basics</word_default>
+      <word_custom>О�новные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_time</word_key>
+      <word_default>Log in Time</word_default>
+      <word_custom>Врем� входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_success</word_key>
+      <word_default>Success</word_default>
+      <word_custom>У�пешно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_loaded_ext</word_key>
+      <word_default>Loaded Extensions</word_default>
+      <word_custom>Загруженные дополнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_get</word_key>
+      <word_default>GET Data (URL Data)</word_default>
+      <word_custom>Данные GET (данные из URL)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>logindetail_post</word_key>
+      <word_default>POST Data (Form Data)</word_default>
+      <word_custom>Данные POST (данные формы)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_date_run</word_key>
+      <word_default>Date Run</word_default>
+      <word_custom>Дата запу�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_run</word_key>
+      <word_default>Task Run</word_default>
+      <word_custom>Задача</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_manager_logs</word_key>
+      <word_default>Task Manager Logs</word_default>
+      <word_custom>Журнал менеджера задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_log_info</word_key>
+      <word_default>Log Info</word_default>
+      <word_custom>Результаты запу�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_view_logs_for_task</word_key>
+      <word_default>View logs for task</word_default>
+      <word_custom>Про�мотр журнала задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_last_5_run_tasks</word_key>
+      <word_default>Last 5 Run Tasks</word_default>
+      <word_custom>По�ледние 5 запущенных задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_show_n_log_entries</word_key>
+      <word_default><![CDATA[Show <em>n</em> log entries]]></word_default>
+      <word_custom><![CDATA[Показать <em>n</em> запи�ей ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_view_task_manager_logs</word_key>
+      <word_default>View Task Manager Logs</word_default>
+      <word_custom>Про�мотр журнала менеджера задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_view_logs</word_key>
+      <word_default>View Logs</word_default>
+      <word_custom>Про�мотр запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_delete_logs_for_task</word_key>
+      <word_default>Delete logs for task</word_default>
+      <word_custom>Удаление запи�ей задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_tuesday</word_key>
+      <word_default>Tuesday</word_default>
+      <word_custom>Вторник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_delete_task_manager_logs</word_key>
+      <word_default>Delete Task Manager Logs</word_default>
+      <word_custom>Удалить запи�и менеджера задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_monday</word_key>
+      <word_default>Monday</word_default>
+      <word_custom>Понедельник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_delete_logs</word_key>
+      <word_default>DELETE Logs</word_default>
+      <word_custom>УД�ЛИТЬ запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_sunday</word_key>
+      <word_default>Sunday</word_default>
+      <word_custom>Во�кре�енье</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_delete_logs_older_than_n_days</word_key>
+      <word_default><![CDATA[Delete logs older than <em>n</em> days]]></word_default>
+      <word_custom><![CDATA[Удалить запи�и �тарше чем <em>n</em> дней]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_wednesday</word_key>
+      <word_default>Wednesday</word_default>
+      <word_custom>Среда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_on</word_key>
+      <word_default>On</word_default>
+      <word_custom>Ð’ </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_on_day</word_key>
+      <word_default>On day</word_default>
+      <word_custom>День</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_friday</word_key>
+      <word_default>Friday</word_default>
+      <word_custom>П�тница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_saturday</word_key>
+      <word_default>Saturday</word_default>
+      <word_custom>Суббота</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_thursday</word_key>
+      <word_default>Thursday</word_default>
+      <word_custom>Четверг</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_at</word_key>
+      <word_default>At</word_default>
+      <word_custom> Ð’ </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_time_options</word_key>
+      <word_default>Time Options</word_default>
+      <word_custom>Опции времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_this_is_the_php_file_that_is_r</word_key>
+      <word_default>This is the PHP file that is run when the task is run.</word_default>
+      <word_custom>Это PHP файл, который будет запу�кать�� при запу�ке задачи.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_php_file_to_run</word_key>
+      <word_default>Task PHP File To Run</word_default>
+      <word_custom>PHP файл задачи дл� запу�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_short_description</word_key>
+      <word_default>Task Short Description</word_default>
+      <word_custom>Краткое опи�ание задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_application</word_key>
+      <word_default>Task Application</word_default>
+      <word_custom>Задача приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_hours</word_key>
+      <word_default>hours</word_default>
+      <word_custom>ча�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_title</word_key>
+      <word_default>Task Title</word_default>
+      <word_custom>�азвание задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_on_every_hour</word_key>
+      <word_default>On every hour</word_default>
+      <word_custom>Каждый ча�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_minutes</word_key>
+      <word_default>minutes</word_default>
+      <word_custom>минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_minutes_past_the_first_availab</word_key>
+      <word_default>minutes past the first available hour</word_default>
+      <word_custom>минут �пу�т� первого до�тупного ча�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_choose_every_minute_to_run_eac</word_key>
+      <word_default><![CDATA[Choose 'Every Minute' to run each minute or a number for a specific minute of an hour]]></word_default>
+      <word_custom><![CDATA[Выберите 'Каждую минуту' дл� запу�ка каждую минуту или точное значение минуты в ча�у]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_every_minute</word_key>
+      <word_default>Every minute</word_default>
+      <word_custom>Каждую минуту</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_every</word_key>
+      <word_default>Every</word_default>
+      <word_custom>Каждые</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_time_minutes</word_key>
+      <word_default>Task Time: Minutes</word_default>
+      <word_custom>Врем� задачи: минуты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_time_week_day</word_key>
+      <word_default>Task Time: Week Day</word_default>
+      <word_custom>Врем� задачи: день недели</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_time_hours</word_key>
+      <word_default>Task Time: Hours</word_default>
+      <word_custom>Врем� задачи: ча�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_choose_every_hour_to_run_each_</word_key>
+      <word_default><![CDATA[Choose 'Every Hour' to run each hour or a number for a specific hour of a day]]></word_default>
+      <word_custom><![CDATA[Выберите 'Каждый ча�' дл� запу�ка каждый ча� или точное значение ча�а в день]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_choose_every_day_to_run_each_d_1</word_key>
+      <word_default><![CDATA[Choose 'Every Day' to run each day or a month day for a specific month day of a month]]></word_default>
+      <word_custom><![CDATA[Выберите 'Каждый день ме��ца' дл� запу�ка каждый день или точное чи�ло]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_time_month_day</word_key>
+      <word_default>Task Time: Month Day</word_default>
+      <word_custom>Врем� задачи: день ме��ца</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_choose_every_day_to_run_each_d</word_key>
+      <word_default><![CDATA[Choose 'Every Day' to run each day or a week day for a specific week day of a month]]></word_default>
+      <word_custom><![CDATA[Выберите 'Каждый день недели' дл� запу�ка каждый день недели или про�то укажите день недели]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_this_is_used_to_call_a_task_wh</word_key>
+      <word_default>This is used to call a task where the ID of the task might change</word_default>
+      <word_custom>Это �лово и�пользует�� дл� задани�, у которого ID может изменить��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_will_write_to_the_task_log_eac</word_key>
+      <word_default>Will write to the task log each time the task is run, not recommended for regular tasks run every few minutes.</word_default>
+      <word_custom>При включенной опции в�е выполнени� задач будут запи�аны в базу данных, не рекомендует�� дл� о�новных задач, выполн�емых каждые 5-10 минут.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_enable_task</word_key>
+      <word_default>Enable Task?</word_default>
+      <word_custom>Включить задачу?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_if_you_are_using_cron_you_migh</word_key>
+      <word_default>If you are using CRON, you might wish to disable this task from the internal manager.</word_default>
+      <word_custom>Е�ли вы и�пользуете CRON, вы должны отключить вызов �той задачи зде�ь.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_key</word_key>
+      <word_default>Task Key</word_default>
+      <word_custom>Ключ задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_if_set_to_yes_this_will_not_be</word_key>
+      <word_default><![CDATA[If set to 'yes', this will not be editable by admins]]></word_default>
+      <word_custom><![CDATA[Е�ли вы выберете 'Да', админи�траторы не �могут редактировать задачу]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_system_schedular</word_key>
+      <word_default>System Scheduler</word_default>
+      <word_custom>Менеджер задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_next_run</word_key>
+      <word_default>Next Run</word_default>
+      <word_custom>Следующий запу�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_enable_task_logging</word_key>
+      <word_default>Enable Task Logging</word_default>
+      <word_custom>Включить запи�ь журнала дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_run</word_key>
+      <word_default>Run</word_default>
+      <word_custom>Запу�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_how_curl_to_use_in_a_cron</word_key>
+      <word_default>Show CURL to use in a cron</word_default>
+      <word_custom>Показать �троку CURL дл� запу�ка задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_wday</word_key>
+      <word_default>WDay</word_default>
+      <word_custom>День недели</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_mday</word_key>
+      <word_default>MDay</word_default>
+      <word_custom>День ме��ца</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_min</word_key>
+      <word_default>Min</word_default>
+      <word_custom>Минута</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_hour</word_key>
+      <word_default>Hour</word_default>
+      <word_custom>Ча�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_task_safe_mode</word_key>
+      <word_default>Task Safe Mode</word_default>
+      <word_custom>Безопа�ный режим</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_unlock_task</word_key>
+      <word_default>Unlock Task...</word_default>
+      <word_custom>Разблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_edit_task</word_key>
+      <word_default>Edit Task...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_delete_task</word_key>
+      <word_default>Delete Task...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_all_times_gmt_gmt_time_now_is</word_key>
+      <word_default>All times GMT. GMT time now is:</word_default>
+      <word_custom>Врем� по Гринвичу:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_last_5_acp_log_in_attempts</word_key>
+      <word_default>Latest ACP Log in Attempts</word_default>
+      <word_custom>По�ледние 5 попыток входа в �дминцентр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_view_details</word_key>
+      <word_default>View Details</word_default>
+      <word_custom>Подробно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_ipboard_version</word_key>
+      <word_default>IP.Board Version</word_default>
+      <word_custom>Вер�и� IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_php_version</word_key>
+      <word_default>PHP Version</word_default>
+      <word_custom>Вер�и� PHP</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_log</word_key>
+      <word_default>Log</word_default>
+      <word_custom>Журнал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_system_overview</word_key>
+      <word_default>System Overview</word_default>
+      <word_custom>Обзор �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_status</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Со�то�ние</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_safe_mod</word_key>
+      <word_default>Safe Mode</word_default>
+      <word_custom>Безопа�ный режим</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_disabled_funcs</word_key>
+      <word_default>Disabled PHP Functions</word_default>
+      <word_custom>Отключенные PHP функции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_current_load</word_key>
+      <word_default>Current Server Load</word_default>
+      <word_custom>Текуща� загрузка �ервера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_sys_software</word_key>
+      <word_default>System Software</word_default>
+      <word_custom>Программное обе�печение �ервера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_avail_mem</word_key>
+      <word_default>Available Server Memory</word_default>
+      <word_custom>До�тупна� пам�ть �ервера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_total_mem</word_key>
+      <word_default>Total Server Memory</word_default>
+      <word_custom>Обща� пам�ть �ервера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>tmdebug_logs</word_key>
+      <word_default>View Logs</word_default>
+      <word_custom>Про�мотр журнала</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>topicmarkingdebug</word_key>
+      <word_default>Topic Marking Debug</word_default>
+      <word_custom>Отладка отметки тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>tmdebug_on</word_key>
+      <word_default>ON</word_default>
+      <word_custom>ВКЛ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_sql_version</word_key>
+      <word_default>SQL Version</word_default>
+      <word_custom>Вер�и� SQL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_import_language_xml</word_key>
+      <word_default>Import Language XML</word_default>
+      <word_custom>Импортирование XML-файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_version</word_key>
+      <word_default>Version</word_default>
+      <word_custom>Вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_badfile</word_key>
+      <word_default>There was no language pack information in the file you uploaded</word_default>
+      <word_custom>Информаци� о �зыковом пакете в загруженном файле не найдена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_developers_language_cache_impo</word_key>
+      <word_default><![CDATA[Developer's Language Cache Import]]></word_default>
+      <word_custom>Ин�трументы разработчика</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_import</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импорт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_indev_export_go</word_key>
+      <word_default>Export</word_default>
+      <word_custom>Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_sections_title</word_key>
+      <word_default>Language Sections</word_default>
+      <word_custom>Разделы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_indev_export</word_key>
+      <word_default>Export language files to application directories</word_default>
+      <word_custom>Эк�портировать �зыковые файлы в директории приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_select_the_application_languag</word_key>
+      <word_default>Select the application language files to import</word_default>
+      <word_custom>Выберите �зыковой файл приложени� дл� импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_or_enter_the_filename_of_the_x</word_key>
+      <word_default><![CDATA[<u>OR</u> enter the filename of the xml.gz language pack]]></word_default>
+      <word_custom><![CDATA[<u>ИЛИ</u> введите название XML-архива]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_the_file_must_be_uploaded_into</word_key>
+      <word_default><![CDATA[The file must be uploaded into the './admin' folder]]></word_default>
+      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>indev_lang_export_done</word_key>
+      <word_default>All language files exported to application directories</word_default>
+      <word_custom>В�е �зыковые файлы �к�портированы в директории приложени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_duplicate_entries_will_not_be_</word_key>
+      <word_default>Duplicate entries will not be overwritten but the default setting and other options will be updated.</word_default>
+      <word_custom>Суще�твующие на�тройки будут обновлены, другие — добавлены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_upload_xml_language_file_from_</word_key>
+      <word_default>Upload language pack from your computer</word_default>
+      <word_custom>Загрузка XML-архива � �зыковыми на�тройками</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_upload_other_error</word_key>
+      <word_default>An error occurred while attempting to upload the language pack.</word_default>
+      <word_custom>В ходе загрузки �зыка произошла ошибка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_translate</word_key>
+      <word_default>Translate in Admin CP...</word_default>
+      <word_custom>Переве�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_upload_too_large</word_key>
+      <word_default><![CDATA[The uploaded file was too large, the maximum allowed upload size for your system is currently <b>%s</b>.]]></word_default>
+      <word_custom><![CDATA[Загруженный файл �лишком велик, мак�имальный допу�тимый размер загружаемых файлов дл� вашей �и�темы �о�тавл�ет <b>%s</b>.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_page_title</word_key>
+      <word_default>Localization Manager</word_default>
+      <word_custom>Управление �зыками</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_default</word_key>
+      <word_default>Default</word_default>
+      <word_custom>По умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_title</word_key>
+      <word_default>Language</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_local</word_key>
+      <word_default>Locale</word_default>
+      <word_custom>Локаль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_date</word_key>
+      <word_default>Date Example</word_default>
+      <word_custom>Формат даты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_money</word_key>
+      <word_default>Currency Example</word_default>
+      <word_custom>Формат валюты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sys_this_will_examine_the_corecach</word_key>
+      <word_default>This will examine the cache/lang_cache/master_lang/ directory for {app}_language.php files and import them into the database.</word_default>
+      <word_custom><![CDATA[Провер�ет директорию cache/lang_cache/master_lang/<br />на наличие файлов {app}_language.php и импортирует их в базу данных.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_pack_current</word_key>
+      <word_default>Default Value</word_default>
+      <word_custom>Значение по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_pack_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_list_translate_ext</word_key>
+      <word_default>Translate Externally...</word_default>
+      <word_custom>Переве�ти через файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_pack_edit</word_key>
+      <word_default>Edit word pack</word_default>
+      <word_custom>Редактирование �лов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_pack_new</word_key>
+      <word_default>New Value</word_default>
+      <word_custom>�овое значение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_edit_title</word_key>
+      <word_default>Edit Language Pack Information</word_default>
+      <word_custom>Редактирование �зыка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_pack_edited</word_key>
+      <word_default>Word pack updated</word_default>
+      <word_custom>Слова обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_new_title</word_key>
+      <word_default>Create a new language pack</word_default>
+      <word_custom>Создать новый �зык</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_edit_button</word_key>
       <word_default>Save Changes</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_pack_created</word_key>
+      <word_default>Language pack created</word_default>
+      <word_custom>Язык �оздан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_title</word_key>
+      <word_default>Language Title</word_default>
+      <word_custom>�азвание �зыка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_title_missing</word_key>
+      <word_default>Language title can not be blank</word_default>
+      <word_custom>�азвание �зыка не может быть пу�тым</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_default</word_key>
+      <word_default>Default Language?</word_default>
+      <word_custom>И�пользовать по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_locale</word_key>
+      <word_default>Language Locale</word_default>
+      <word_custom>Локаль �зыка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_locale_missing</word_key>
+      <word_default>Language locale can not be blank</word_default>
+      <word_custom>Локаль �зыка не может быть пу�той</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_new_info</word_key>
+      <word_default><![CDATA[<h2>Language Pack Information</h2><p><br />You can configure basic language pack settings here</p>]]></word_default>
+      <word_custom><![CDATA[<h2>�а�тройки �зыка</h2><p><br />Зде�ь вы можете на�троить о�новные параметры �зыкового пакета</p>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_pack_updated</word_key>
+      <word_default>Language pack information updated</word_default>
+      <word_custom>�а�тройки �зыка обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_new_button</word_key>
+      <word_default>Add this language</word_default>
+      <word_custom>Добавить �тот �зык</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_pack_name</word_key>
+      <word_default>Pack Name</word_default>
+      <word_custom>�абор �лов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_revert</word_key>
+      <word_default>Language customization has been reverted</word_default>
+      <word_custom>Изменени� в �зыке отменены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_form_edit_info</word_key>
+      <word_default><![CDATA[<h2>Language Pack Information</h2><p><br />You can configure basic language pack settings here</p>]]></word_default>
+      <word_custom><![CDATA[<h2>�а�тройки �зыка</h2><p><br />Зде�ь вы можете на�троить о�новные параметры �зыкового пакета</p>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_out_of_date_entries</word_key>
+      <word_default>Out of Date Entries</word_default>
+      <word_custom>У�таревшие запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_key</word_key>
+      <word_default>Key</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_default</word_key>
+      <word_default>Default Text</word_default>
+      <word_custom>Тек�т по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_customized_entries</word_key>
+      <word_default>Customized Entries</word_default>
+      <word_custom>Измененные запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devexport</word_key>
+      <word_default>Export Installer XML</word_default>
+      <word_custom>Эк�портировать XML у�тановщика</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_total_entries</word_key>
+      <word_default>Total Entries</word_default>
+      <word_custom>В�его запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devemail</word_key>
+      <word_default>Email Templates</word_default>
+      <word_custom>Шаблоны E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devtemplate</word_key>
+      <word_default>Template HTML</word_default>
+      <word_custom>Шаблон HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devskin</word_key>
+      <word_default>Skin Set</word_default>
+      <word_custom>Стиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devcontent</word_key>
+      <word_default>Content Templates</word_default>
+      <word_custom>Шаблоны �одержани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devfile</word_key>
+      <word_default>File Types</word_default>
+      <word_custom>Типы файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devgroups</word_key>
+      <word_default>Groups</word_default>
+      <word_custom>Группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devpages</word_key>
+      <word_default>Pages</word_default>
+      <word_custom>Страницы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devtaks</word_key>
+      <word_default>Tasks</word_default>
+      <word_custom>Задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devlogin</word_key>
+      <word_default>Log In Auth</word_default>
+      <word_custom>�вторизаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>sy_devcomponents</word_key>
+      <word_default>Components</word_default>
+      <word_custom>Компоненты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>system_processes</word_key>
+      <word_default>System Processes</word_default>
+      <word_custom>Проце��ы �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>chckr_status</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Со�то�ние</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>last_5_version_history</word_key>
+      <word_default>Version History (Last 5)</word_default>
+      <word_custom>И�тори� обновлений (по�ледние 5)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>chckr_fix</word_key>
+      <word_default>Fix</word_default>
+      <word_custom>И�править</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>chckr_table</word_key>
+      <word_default>Table</word_default>
+      <word_custom>Таблица</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_vnav</word_key>
+      <word_default>Version Check Results</word_default>
+      <word_custom>Результаты проверки вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_vtitle</word_key>
+      <word_default>IP.Board Diagnostics - Version Checker</word_default>
+      <word_custom>Диагно�тика IP.Board - Проверка вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_vinfo</word_key>
+      <word_default>Version Information</word_default>
+      <word_custom>Информаци� о вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ptitle</word_key>
+      <word_default>IP.Board Diagnostics - Permission Checker</word_default>
+      <word_custom>Диагно�тика IP.Board - Проверка прав до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_p404</word_key>
+      <word_default>We could not find the file or folder</word_default>
+      <word_custom>Файл или директори� не найдены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_pyes</word_key>
+      <word_default>is writable</word_default>
+      <word_custom>имеет права на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_pnav</word_key>
+      <word_default>Permission Check Results</word_default>
+      <word_custom>Результаты проверки прав до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_pno</word_key>
+      <word_default>The following file or folder is not writable</word_default>
+      <word_custom>�е возможна запи�ь в �ледующую директорию или файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_wtitle</word_key>
+      <word_default>IP.Board Diagnostics - Whitespace Checker</word_default>
+      <word_custom>Диагно�тика IP.Board - Проверка на пробелы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_wnav</word_key>
+      <word_default>Whitespace Check Results</word_default>
+      <word_custom>Результаты проверки на пробелы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_wfound</word_key>
+      <word_default>has whitespace at the beginning or end of the file</word_default>
+      <word_custom>имеет пробелы в начале или конце файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ititle</word_key>
+      <word_default>IP.Board Diagnostics -  Database Index Checker</word_default>
+      <word_custom>Диагно�тика IP.Board - Проверка индек�ов базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_wclear</word_key>
+      <word_default>All files appear to be in good order</word_default>
+      <word_custom>Похоже, что в�е файлы в пор�дке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iupload</word_key>
+      <word_default>You must upload: /install/sql/%s_tables.php from the IP.Board installation package for your current version to run this tool.</word_default>
+      <word_custom>Вы должны загрузить: /install/sql/%s_tables.php из ди�трибутива IP.Board вашей текущей вер�ии дл� запу�ка �того ин�трумента.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ierror</word_key>
+      <word_default>SQL Error:</word_default>
+      <word_custom>Ошибка SQL:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iexecuted</word_key>
+      <word_default><![CDATA[Query: %s<br />Executed Successfully<br />]]></word_default>
+      <word_custom><![CDATA[Запро�: %s<br />У�пешно выполнен<br />  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_idomanual</word_key>
+      <word_default><![CDATA[ Please use the 'Fix Manually' option for this query.]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та, и�пользуйте ��ылку 'И�править вручную' дл� �того запро�а.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_inav</word_key>
+      <word_default>Database Index Results</word_default>
+      <word_custom>Результаты проверки индек�ов базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_isorry</word_key>
+      <word_default>Sorry, those queries are not allowed for your safety.</word_default>
+      <word_custom>Извините, �ти запро�ы запрещены в цел�х безопа�но�ти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_inoerrors</word_key>
+      <word_default>No Errors Found</word_default>
+      <word_custom>Ошибок не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ifixall</word_key>
+      <word_default>We have found problems with your database, and have listed them below. </word_default>
+      <word_custom>В базе данных обнаружены ошибки. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_inoprocess</word_key>
+      <word_default>There was an error and we could not process your %s_tables.php file. Please reupload it.</word_default>
+      <word_custom>Произошла ошибка и ваш файл %s_tables.php не был обработан. Пожалуй�та, перезагрузите его.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ifix</word_key>
+      <word_default>Fix</word_default>
+      <word_custom>И�править</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iindex</word_key>
+      <word_default>Index Name</word_default>
+      <word_custom>�азвание индек�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_itable</word_key>
+      <word_default>Table</word_default>
+      <word_custom>Таблица</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_ifixall_link</word_key>
+      <word_default>Would you like us to attempt to fix them for you?</word_default>
+      <word_custom>Хотите попытать�� и�править в�е в автоматиче�ком режиме ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_icongrats</word_key>
+      <word_default>There were no errors found with your database indexes.</word_default>
+      <word_custom>Ошибок в индек�ах базы данных не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iresults</word_key>
+      <word_default>Database Index Results</word_default>
+      <word_custom>Результаты проверки индек�ов базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_dtitle</word_key>
+      <word_default>IP.Board Diagnostics - Database Structure Checker</word_default>
+      <word_custom>Диагно�тика IP.Board - Проверка �труктуры базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_dnav</word_key>
+      <word_default>Database Structure Results</word_default>
+      <word_custom>Результат проверки �труктуры базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iman</word_key>
+      <word_default>, or you can run the following queries manually:</word_default>
+      <word_custom>или вы можете выполнить �ледующие запро�ы вручную.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_inauto</word_key>
+      <word_default><![CDATA[<strong>Click here to fix this table's indexes</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�ажмите зде�ь дл� и�правлени� индек�ов �той таблицы</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_dfix</word_key>
+      <word_default>Fix</word_default>
+      <word_custom>И�править</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_dtbl</word_key>
+      <word_default>Table</word_default>
+      <word_custom>Таблица</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_dstatus</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Со�то�ние</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_iauto</word_key>
+      <word_default><![CDATA[<strong>Click here to fix this table</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�ажмите зде�ь дл� и�правлени� таблицы</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ll_title</word_key>
+      <word_default>ACP Log-in Attempts</word_default>
+      <word_custom>Попытки входа в админцентр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ll_noid</word_key>
+      <word_default>No log for that ID found.</word_default>
+      <word_custom>�е найдено запи�ей дл� �того ID.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_aoff</word_key>
+      <word_default>OFF</word_default>
+      <word_custom>ВЫКЛЮЧЕ�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_aunable</word_key>
+      <word_default><![CDATA[<em>Unable to obtain process information</em>]]></word_default>
+      <word_custom><![CDATA[<em>�е возможно получить информацию о проце��е</em>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_aon</word_key>
+      <word_default>ON</word_default>
+      <word_custom>ВКЛЮЧЕ�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_atitle</word_key>
+      <word_default>IP.Board Diagnostics</word_default>
+      <word_custom>Диагно�тика IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_aphpinfo</word_key>
+      <word_default>PHP INFO</word_default>
+      <word_custom>PHP INFO</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_atotal</word_key>
+      <word_default>Total Physical Memory</word_default>
+      <word_custom>В�его физиче�кой пам�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_anoinfo</word_key>
+      <word_default><![CDATA[<em>No Information</em>]]></word_default>
+      <word_custom><![CDATA[<em>�ет данных</em>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>d_aavail</word_key>
+      <word_default>Available Physical Memory</word_default>
+      <word_custom>До�тупно физиче�кой пам�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>w_nav</word_key>
+      <word_default>Welcome</word_default>
+      <word_custom>Добро пожаловать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>ll_msg</word_key>
+      <word_default><![CDATA[This page shows all the recorded ACP log in attempts.<br />The red cross indicates an error when logging in and a green tick indicates a successful log in.]]></word_default>
+      <word_custom><![CDATA[�а �той �транице отображены в�е запи�анные попытки входа в �дминцентр.<br />Кра�ный кре�т показывает ошибку входа, а зелена� галочка  показывает у�пешный вход.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_html</word_key>
+      <word_default>Posting HTML</word_default>
+      <word_custom>Отправка HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_html_info</word_key>
+      <word_default><![CDATA[This will allow all members of the group to post pure HTML in forums that have the ability to accept raw HTML. You can turn this on and off for each forum via the edit forum settings function. Note: When HTML in posts in quoted by a member who does not have the permission to post HTML, the post will be shown in unparsed HTML format with most of the formatting removed.<br /><br /><b>Warning!</b><br />Allowing a member to post HTML is a very dangerous thing, you should not enable this functionality on any group that will use it maliciously. Although IPB tries to filter some of the more harmful content, it is NOT foolproof and this tag CAN be used to steal session cookies, redirect members and destroy the topic view layout.<br />IP.Board and Invision Power Services will not be held responsible for any misfortune that occurs from the usage of this tag.<br /><br /><b>Use it wisely!</b>]]></word_default>
+      <word_custom><![CDATA[Это позволит пользовател�м и�пользовать чи�тый HTML в форумах, в которых разрешено и�пользовать HTML. Вы можете включить или выключить �ту возможно�ть дл� каждого форума через функции управлени� форумами. Заметка: Когда HTML и�пользует�� в �оообщении пользователем, которому не разрешено и�пользовать HTML, �ообщение будет показано в необработанном HTML, где большин�тво тегов будет удалены.<br /><br /><b>Внимание!</b><br />Разрешение пользовател�м и�пользовать HTML очень опа�но, не �ледует разрешать �то делать группам, которые могут и�пользовать �то в плохих цел�х. Хот� IPB пытает�� удалить вредоно�ное �одержимое, �то �Е �вл�ет�� гарантией безопа�но�ти. Это может быть и�пользовано дл� кражи �е��ионных куки, перенаправлени� на другую �траницу или дл� нарушени� вывода �траницы темы.<br />Invision Power Board и Invision Power Services не не�ут никакой ответ�твенно�ти за не правильное и�пользование �той опции.<br /><br /><b>И�пользуйте � умом!</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_bots_info</word_key>
+      <word_default><![CDATA[Search engines such as Google 'spider' the web by using special programs to find and add links to the search engine database.<br />Invision Power can take advantage of separating the bots from the real users and you can then ensure that they are getting adequate information to help with search engine ranking.<br /><br /><b>Warning!</b><br />IP.Board recognises the search engine spiders and crawlers by their user_agent. Please keep in mind that it's not impossible to fake this and a malicious user could pose as a harmless search engine spider.<br />This is not a problem as by default the spider will have guest permissions, but it's something that you should keep in mind when allowing permissions.<br /><br />Also keep in mind that most search engines do NOT search dynamically generated website for fear of crashing the server with the constant reading of topics.]]></word_default>
+      <word_custom><![CDATA[Пои�ковые �и�темы, такие как Google, и��ледуют �еть � и�пользованием �пециальных программ, чтобы найти и добавить ��ылки в базу данных.<br/>Форум может отдел�ть роботов от реальных пользователей и предо�тавл�ть им только необходимую информацию, тем �амым повыша� форум в выдаче пои�ковика.<br /><br /><b>Внимание!</b><br />Invision Power Board ра�познает пои�ковых роботов по их user_agent. Так как его легко подделать, злоумышленник может выдать �еб� за пои�кового робота.<br />Имейте �то ввиду при изменении прав пои�ковых роботов.<br /><br />Так же имейте ввиду, что многие пои�ковые �и�темы не индек�ируют динамиче�кий �оздаваемый �айт, чтобы не нарушать работу �ервера по�то�нными запро�ами.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_multi_info</word_key>
+      <word_default><![CDATA[If you allow your moderators access to the forums' multi-moderation then you must be aware that they have full use.<br />For example, if one of your multi-moderation actions allowed the topic to be moved and you do not allow move permissions the moderator will still be able to use the topic multi-moderation and move the topic.]]></word_default>
+      <word_custom><![CDATA[Имейте ввиду, что при допу�ке модераторов к мультимодерации тем, они �могут полно�тью во�пользовать�� �той функцией.<br />�апример, е�ли одно из Ваших правил мультимодерации, на�троено на перемещение тем, но Вы запретили в на�тройках одного из модераторов перемещать темы, данный модератор в�ё равно �может перемещать темы при помощи функции мультимодерации.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_bots</word_key>
+      <word_default>What are Search Engine Spiders?</word_default>
+      <word_custom>Кто такие Пои�ковые роботы ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_multi</word_key>
+      <word_default>Moderators and Topic Multi-Moderation</word_default>
+      <word_custom>Модераци� и мультимодераци� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_upload_info</word_key>
+      <word_default><![CDATA[If you wish to allow this group to attach files (upload) when posting, you will have to ensure you have completed the following: <ul> <li>You have entered a reasonable numerical figure in the groups 'Max upload file size' field. <li>You have edited the forum permissions for this group and checked the 'Upload' checkbox. </ul> This allows you to control in which forums this group can upload to.<br><br><b>Warning!</b><br>If, when posting, no post is made and you are returned back to the community index, disable this groups upload by entering 0 into this field. This will turn off the mutli-part form the uploads use.]]></word_default>
+      <word_custom><![CDATA[Е�ли вы хотите разрешить �той группе прикрепл�ть файлы к �ообщени�м, вам �ледует убедить�� в �ледующем: <ul> <li>Вы ввели до�таточное значение в поле «Ди�кова� квота на хранение в�ех файлов (включа� личные �ообщени� и �ообщени� в темах)»</li><li>Вы изменили права до�тупа к форумам и отметили поле "Загрузка"</li></ul> <br/><br/><b>Внимание!</b><br/>Е�ли при добавлении �ообщени� ва� перебра�ывает на главную �траницу, укажите значение 0 дл� �того пол�. Это приведет к отключению формы загрузки.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_upload</word_key>
+      <word_default>Upload Permissions</word_default>
+      <word_custom>Права до�тупа загрузки файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_captcha</word_key>
+      <word_default>Registration CAPTCHA</word_default>
+      <word_custom>CAPTCHA при реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_captcha_info</word_key>
+      <word_default><![CDATA[To prevent robots from registering (such as a malicious denial of service attack registering thousands of new accounts and forcing thousands of emails to be sent from your server) you can enable this option.<br><br>When enabled, a random 6 digit numerical string is generated and shown in a graphical format (to prevent advanced bots from reading the source page). The user must enter this string exactly when registering or the account will not be created.]]></word_default>
+      <word_custom><![CDATA[Дл� предотвращение автоматиче�ких реги�траций вы можете включить �ту опцию.<br/><br/>6 произвольных цифр показывает�� в виде картинки. Пользователь должен точно вве�ти показанные цифры дл� продолжени� реги�трации. <br/><br/>Это поможет защитить форум от атак и ра��ылки нежелательных пи�ем.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_promote_info</word_key>
+      <word_default><![CDATA[If enabled (by choosing a member group to promote your members to and by entering a number of posts to achieve this) when your members meet or exceed the number of posts set they will be 'promoted' to the specified group.<br><br>Many administrators use this feature to set up a 'Senior Members' group with more functionality (such as a longer edit time, larger post uploads) and even allow access to otherwise hidden forums - when your members have made enough posts, they are promoted to this group allowing you to intice more posting and allow for a more restrictive set of permissions for newcomers.<br><br><b>Warning!</b><br>Use this feature carefully and always check the information before proceeding.<br>It is possible to advance to an Admin group - you have been warned.]]></word_default>
+      <word_custom><![CDATA[Е�ли �та опци� включена (выбрана группа дл� продвижении�), то когда пользователь набирает указанное количе�тво �ообщений, он будет перемещен в другую группу.<br><br>
+Многие админи�траторы и�пользуют �ту опцию дл� выделени� "опытных" пользователей � набором ра�ширенных прав (таких как больший объем загружаемых файлов, более длинное врем� редактировани�) и разрешени� до�тупа к �крытым форумам.
+<br/><br/><b>Внимание!</b><br/>
+И�пользуйте �ту функцию внимательно и проверьте на�тройки перед продолжением.<br />Возможно продвижение в группу �дмини�траторов!]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_bulk</word_key>
+      <word_default>Bulk Emailing</word_default>
+      <word_custom>Ма��ова� ра��ылка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_promote</word_key>
+      <word_default>Group Promotion</word_default>
+      <word_custom>Продвижение группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_components</word_key>
+      <word_default>Components Menu System</word_default>
+      <word_custom>Си�тема меню компонентов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_bulk_info</word_key>
+      <word_default><![CDATA[<b>Overview</b><br>Bulk emailing allows you to target a specific section of your community or email all your registered members.<br><br><b>Settings</b><br>You can choose which user groups will receive the email.<hr><b>Allowed Tags</b><br>Although the email system sends the mail via BCC to preserve system resources, you can add in dynamic content with the following tags.<br>{board_name} will return the name of your community<br>{reg_total} will return the total number of registered members<br>{total_posts} will return the total number of posts<br>{busy_count} will return the most number of online users<br>{busy_time} will return the date of the most online users<br>{board_url} will return the URL to the community<br><br>As the email is sent via BCC, it is not possible to include the members username, password or other user profile data.]]></word_default>
+      <word_custom><![CDATA[<b>Обзор</b><br/>
+Ма��ова� ра��ылка позвол�ет отправл�ть в�ем пользовател�м форума или отдельным группам.
+<br/><br/><b>�а�тройки</b><br/>
+Вы можете выбрать какие группы пользователей получат пи�ьма. Пи�ьма можно отправл�ть в обход опции "Получать пи�ьма от админи�трации", однако делать �то не рекомендует��.
+<hr /><b>Разрешены теги</b><br />
+Хот� почтова� �и�тема ра��ылает пи�ьма через BCC дл� �кономии �и�темных ре�ур�ов, вы можете добавл�ть динамиче�кое �одержимое � помощью некоторых тегов.<br/>
+{board_name} - будет заменено на название вашего форума;<br />{reg_total} - вернет чи�ло зареги�трированных пользователей;<br />{total_posts} - общее чи�ло �ообщений;<br />{busy_count} - мак�имум пользователей онлайн;<br />{busy_time} - врем�, когда был зареги�трирован мак�имум пользователей;<br />{board_url} - ��ылка на форум
+<br/><br/>
+Так как пи�ьма ра��ылают�� через BCC, нет возможно�ти включить в пи�ьма им� пользовател�, пароль или другие данные профил�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_deep_bad</word_key>
+      <word_default><![CDATA[The IP.Board deep scanner will pick out and list every single executable file in your installation.<br />The scanner has not been run in over a month]]></word_default>
+      <word_custom><![CDATA[Сканер проверит и выведет �пи�ок в�ех файлов вашей �и�темы.<br />Сканер не запу�кали более ме��ца.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_deep</word_key>
+      <word_default>IP.Board Executables Deep Scan</word_default>
+      <word_custom>Глубокое �канирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_nohelp</word_key>
+      <word_default>No help information is available for this function at present.</word_default>
+      <word_custom>�ет дополнительно информации дл� �той функции в данное врем�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>q_components_info</word_key>
+      <word_default><![CDATA[<strong>Menu text</strong> is the actual menu item text. <em>IE: Tools and Settings.</em><br /><strong>Menu URL</strong> is the final part of the URL. No need to add the full URL or the 'section=components&act=blog' part unless this is a redirect. <em>IE: code={code}</em><br /><strong>Menu Redirect</strong> if yes, complete the 'act={}&section={}&do={}' part of the URL in the URL box or the redirect may not work.<br /><strong>Perm Bit and Perm Lang</strong> is the ACP restriction perm bit. Entries: add, remove, edit, rebuild, recount, recache all have language entries. Any other bit names will require adding into the Perm Bit Language box. Eg: If the perm bit was 'tools', you may enter 'Allow TOOLS Access'.<br />]]></word_default>
+      <word_custom><![CDATA[<strong>Тек�т меню</strong> �то тек�т которы будет отображать�� � меню.<em>�апример, �а�тройки.</em><br />
+<strong>URL пункта</strong> - �то по�ледна�� ча�ть ��ылки. Зде�ь не требует�� задавать полную ��ылку.<em>IE: code={code}</em><br />
+<strong>Перенаправление</strong>. Заполните 'act={}&section={}&do={}' в URL иначе перенаправление не �работает. 
+<br /><strong>Ключ до�тупа и �зыка</strong> �лужат дл� до�тупа к меню в �дминцентре. �апример, е�ли ключ 'tools', то тек�т может быть 'Разрешить до�туп к TOOLS'.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_deep_good</word_key>
+      <word_default><![CDATA[The IP.Board deep scanner will pick out and list every single executable file in your installation.<br />The scanner was last run: ]]></word_default>
+      <word_custom><![CDATA[Сканер проверит и выведет �пи�ок в�ех файлов вашей �и�темы.<br />Сканер по�ледний раз запу�кали:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_runtool</word_key>
+      <word_default>Run Tool Now</word_default>
+      <word_custom>Запу�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_htaccess_good</word_key>
+      <word_default><![CDATA[To make your ACP even more secure, you can take add HTTP authentication in your "/%s/" directory.<br />IP.Board has located an ACP .htaccess file.]]></word_default>
+      <word_custom><![CDATA[Дл� повышени� безопа�но�ти вы можете добавить HTTP-аутентификацию на директорию админцентра ("/%s/").<br />IPB обнаружил .htaccess файл в директории админцентра.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_htaccess</word_key>
+      <word_default>IP.Board ACP .htaccess Protection</word_default>
+      <word_custom>Защита файлом .htaccess �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_learnmore</word_key>
+      <word_default>Learn More</word_default>
+      <word_custom>Подробнее</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_htaccess_bad</word_key>
+      <word_default><![CDATA[To make your ACP even more secure, you can add HTTP authentication in your "/%s/" directory.<br />IP.Board <strong>cannot</strong> locate an ACP .htaccess file.]]></word_default>
+      <word_custom><![CDATA[Дл� повышени� безопа�но�ти вы можете добавить HTTP-аутентификацию на директорию админцентра ("/%s/").<br />IPB не обнаружил .htaccess файл в директории админцентра.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_conf_bad</word_key>
+      <word_default><![CDATA[After installation, you should change the CHMOD on the "conf_global.php" file to prevent others from reading and writing to it.<br />"conf_global.php" is writeable.]]></word_default>
+      <word_custom><![CDATA[По�ле у�тановки IPB рекомендует�� изменить атрибуты до�тупа к файлу "conf_global.php", чтобы другие пользователи не могли произве�ти чтение или запи�ь.<br />"conf_global.php" до�тупен дл� запи�и.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_conf</word_key>
+      <word_default><![CDATA[Make "conf_global.php" Un-writable]]></word_default>
+      <word_custom><![CDATA[Запретить запи�ь в  "conf_global.php"]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_conf_good</word_key>
+      <word_default><![CDATA[After installation, you should change the CHMOD on the "conf_global.php" file to prevent others from reading and writing to it.<br />"conf_global.php" is NOT writeable.]]></word_default>
+      <word_custom><![CDATA[По�ле у�тановки IPB рекомендует�� изменить атрибуты до�тупа к файлу "conf_global.php", чтобы другие пользователи не могли произве�ти чтение или запи�ь.<br />"conf_global.php" не до�тупен дл� запи�и.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_phpcgi_bad</word_key>
+      <word_default><![CDATA[IP.Board can write .htaccess files to non-PHP directories to prevent PHP and CGI files from executing.<br />IP.Board <strong>cannot</strong> locate any .htaccess files.]]></word_default>
+      <word_custom><![CDATA[IPB может запи�ать файл .htaccess в директории, где не �одержат�� php-файлы, преп�т�тву� тем �амым запу�ку файлов PHP и CGI в �тих директори�х.<br />IPB <strong>не обнаружил</strong> какие-либо .htaccess файлы.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_phpcgi</word_key>
+      <word_default>IP.Board PHP/CGI .htaccess Protection</word_default>
+      <word_custom>Защита PHP/CGI файлом .htaccess </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_phpcgi_good</word_key>
+      <word_default><![CDATA[IP.Board can write .htaccess files to non-PHP directories to prevent PHP and CGI files from executing.<br />IP.Board has located some .htaccess files.]]></word_default>
+      <word_custom><![CDATA[IPB может запи�ать файл .htaccess в директории, где не �одержат�� php-файлы, преп�т�тву� тем �амым запу�ку файлов PHP и CGI в �тих директори�х.<br />IPB обнаружил .htaccess файлы.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_rename</word_key>
+      <word_default><![CDATA[Rename The 'admin' Directory]]></word_default>
+      <word_custom>�азвание директории �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_toggle</word_key>
+      <word_default>Toggle Now</word_default>
+      <word_custom>Переключить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_rename_good</word_key>
+      <word_default><![CDATA[The default 'admin' directory can be renamed to make it hard to find.<br />The admin directory HAS been renamed.]]></word_default>
+      <word_custom><![CDATA[Стандартную директорию админцентра ('/admin/') можно переименовать — тем �амым злоумышленнику будет �ложнее нарушить работу форума в �лучае взлома учетной запи�и какого-либо из админи�траторов.<br />Директори� админцентра ПЕРЕИМЕ�ОВ���.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_written</word_key>
+      <word_default>Authentication files written</word_default>
+      <word_custom>Файл аутентификации запи�ан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_rename_bad</word_key>
+      <word_default><![CDATA[The default 'admin' directory can be renamed to make it hard to find.<br />The admin directory has not been renamed.]]></word_default>
+      <word_custom><![CDATA[Стандартную директорию админцентра ('/admin/') можно переименовать — тем �амым злоумышленнику будет �ложнее нарушить работу форума в �лучае взлома учетной запи�и какого-либо из админи�траторов.<br />Директори� админцентра не переименована.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_rename_nav</word_key>
+      <word_default>Rename the admin directory</word_default>
+      <word_custom>Переименовать директорию �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_htaccess_nav</word_key>
+      <word_default>ACP .htaccess</word_default>
+      <word_custom>.htaccess �дминцентра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_chmod_bad</word_key>
+      <word_default><![CDATA[<strong>Could not complete the process.</strong><br />Please use your FTP client to change the CHMOD value of 'conf_global.php' to 0444.]]></word_default>
+      <word_custom><![CDATA[<strong>�евозможно выполнить операцию.</strong><br />Во�пользуйте�ь  FTP клиентом и измените атрибуты до�тупа к файлу 'conf_global.php' на 0444.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_completeform</word_key>
+      <word_default>You must complete the form. Please try again.</word_default>
+      <word_custom>Вы должны полно�тью заполнить форму.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_chmod_good</word_key>
+      <word_default>CHMOD change completed.</word_default>
+      <word_custom>Изменение прав до�тупа к файлам завершено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_allex_good</word_key>
+      <word_default><![CDATA[The deep scanner has found %s files.<br />If you're unsure of their origin, please investigate them immediately.]]></word_default>
+      <word_custom>Глубокое �канирование обнаружило %s файлов. Е�ли вы не уверены в прои�хождении �тих файлов, то немедленно про�мотрите их.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_skipped</word_key>
+      <word_default>Skipped %s, could not write into it...</word_default>
+      <word_custom>Пропущен %s, запи�ь в него невозможна...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_deep_nav</word_key>
+      <word_default>Deep Scan</word_default>
+      <word_custom>Глубокое �канирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_allex</word_key>
+      <word_default>All Executables</word_default>
+      <word_custom>В�е и�полн�емые</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_written_to</word_key>
+      <word_default>Written .htaccess to %s...</word_default>
+      <word_custom>.htaccess запи�ан в %s...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_allex_bad</word_key>
+      <word_default><![CDATA[The deep scanner has found the following files.<br /><strong>%s</strong> of %s files are rating 7/10 or more.<br />If you're unsure of their origin, please investigate them immediately.]]></word_default>
+      <word_custom><![CDATA[Глубокое �канирование обнаружило �ледующие файлы. <br /><strong>%s</strong> из %s файлов имеют рейтинг 7/10 или более. Е�ли вы не уверены в прои�хождении �тих файлов, то немедленно про�мотрите их.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_good</word_key>
+      <word_default><![CDATA[The IPB unauthorized file checker will check your IPB installation for suspicious files.<br />The unauthorized file checker was last run: ]]></word_default>
+      <word_custom><![CDATA[Сканер проверит наиболее ча�то и�пользуемые директории дл� загрузки файлов на подозрительные файлы.<br />Сканер на подозрительные файлы по�ледний раз запу�кали:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_removed</word_key>
+      <word_default>Selected Task Logs Removed</word_default>
+      <word_custom>Выбранное запи�и удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus</word_key>
+      <word_default>IP.Board Unauthorized File Checker</word_default>
+      <word_custom>Сканер подозрительных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_found</word_key>
+      <word_default>Suspicious Files Detected</word_default>
+      <word_custom>Обнаружены подозрительные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_deleted</word_key>
+      <word_default>Task deleted</word_default>
+      <word_custom>Задача удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_nodelete</word_key>
+      <word_default>You are unable to delete this task.</word_default>
+      <word_custom>Вам не позволено удал�ть �ту задачу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_bad</word_key>
+      <word_default><![CDATA[The IPB unauthorized file checker will check your IPB installation for suspicious files.<br />The unauthorized file checker has not been run in over a week]]></word_default>
+      <word_custom><![CDATA[Сканер проверит наиболее ча�то и�пользуемые директории дл� загрузки файлов на подозрительные файлы.<br />Сканер на подозрительные файлы не запу�кали более недели.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_nolocated</word_key>
+      <word_default><![CDATA[The unauthorized file scan did not identify any suspicious files.<br />Please scan regularly to ensure that your system is secure.]]></word_default>
+      <word_custom><![CDATA[Сканер не обнаружил подозрительных файлов.<br />Пожалуй�та, выполн�йте проверку как можно чаще, чтобы �одержать �и�тему в безопа�но�ти.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_locknomore</word_key>
+      <word_default>Task lock removed</word_default>
+      <word_custom>Задача разблокирована</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>�е указан ID. Пожалуй�та, попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_located</word_key>
+      <word_default><![CDATA[The unauthorized file scan located the following suspicious files.<br />If you're unsure of their origin, please remove them immediately.]]></word_default>
+      <word_custom><![CDATA[Сканер обнаружил �ледующие подозрительные файлы.<br />Е�ли вы не уверены в их прои�хождении, то немедленно удалите их.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_disabled</word_key>
+      <word_default>This task has been disabled. Please enable the task before running it.</word_default>
+      <word_custom>Эта задача была отключена. Пожалуй�та, включите задачу перед запу�ком.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_notask</word_key>
+      <word_default>No task to run.</word_default>
+      <word_custom>�ет задачи дл� запу�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>s_virus_none</word_key>
+      <word_default>No Suspicious Files Detected</word_default>
+      <word_custom>Подозрительных файлов не обнаружено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_locked</word_key>
+      <word_default>This task was locked at %s and cannot be ran until unlocked.</word_default>
+      <word_custom>Эта задача была заблокирована в %s и не может быть запущена до разблокировани�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_nolocate</word_key>
+      <word_default>Cannot locate: %s/tasks/%s</word_default>
+      <word_custom>�е возможно найти: %s/tasks/%s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_ran</word_key>
+      <word_default>Task ran successfully</word_default>
+      <word_custom>Задача у�пешно запущена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_entertitle</word_key>
+      <word_default>You must enter a task title.</word_default>
+      <word_custom>Вы должны вве�ти название задачи.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_edited</word_key>
+      <word_default>Task Edited Successfully</word_default>
+      <word_custom>Задача у�пешно изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_enterfile</word_key>
+      <word_default>You must enter a filename for the task to run.</word_default>
+      <word_custom>Вы должны вве�ти им� PHP файла запу�ка задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_saved</word_key>
+      <word_default>Task Saved Successfully</word_default>
+      <word_custom>Задача у�пешно �охранена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_create</word_key>
+      <word_default>Create New Task</word_default>
+      <word_custom>Создать новую задачу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_creating</word_key>
+      <word_default>Creating New Task</word_default>
+      <word_custom>Создание новой задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_noedit</word_key>
+      <word_default>You are unable to edit this task.</word_default>
+      <word_custom>Вам не позволено измен�ть �ту задачу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>task_edit_title</word_key>
+      <word_default>Editing Task: %s</word_default>
+      <word_custom>Редактирование задачи: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>edittask_button</word_key>
+      <word_default>Edit Task</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_daymonth</word_key>
+      <word_default>Every Day of the Month</word_default>
+      <word_custom>Каждый день ме��ца</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_hour</word_key>
+      <word_default>Every Hour</word_default>
+      <word_custom>Каждый ча�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_minute</word_key>
+      <word_default>Every Minute</word_default>
+      <word_custom>Каждую минуту</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_midnight</word_key>
+      <word_default>0 - Midnight</word_default>
+      <word_custom>0 - Полночь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_dayweek</word_key>
+      <word_default>Every Week Day</word_default>
+      <word_custom>Каждый день недели</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_pm</word_key>
+      <word_default> pm</word_default>
+      <word_custom> pm</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_am</word_key>
+      <word_default> am</word_default>
+      <word_custom> am</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_midday</word_key>
+      <word_default>Midday</word_default>
+      <word_custom>Полдень</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_wednesday</word_key>
+      <word_default>Wednesday</word_default>
+      <word_custom>Среда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_tuesday</word_key>
+      <word_default>Tuesday</word_default>
+      <word_custom>Вторник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_sunday</word_key>
+      <word_default>Sunday</word_default>
+      <word_custom>Во�кре�енье</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_monday</word_key>
+      <word_default>Monday</word_default>
+      <word_custom>Понедельник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_friday</word_key>
+      <word_default>Friday</word_default>
+      <word_custom>П�тница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_adding</word_key>
+      <word_default>Adding Task</word_default>
+      <word_custom>Добавление задачи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_thursday</word_key>
+      <word_default>Thursday</word_default>
+      <word_custom>Четверг</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_import404</word_key>
+      <word_default>%s could not be found. Please check the file and try again.</word_default>
+      <word_custom>%s не найден. Пожалуй�та, проверьте файл и попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_saturday</word_key>
+      <word_default>Saturday</word_default>
+      <word_custom>Суббота</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_lockedcaps</word_key>
+      <word_default> (LOCKED)</word_default>
+      <word_custom> (З�БЛОКИРОВ���)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_inserted</word_key>
+      <word_default>%s tasks added, %s updated</word_default>
+      <word_custom>%s заданий добавлено, %s обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_noupdate</word_key>
+      <word_default>No task information to update</word_default>
+      <word_custom>�ет информации дл� обновлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_export_single</word_key>
+      <word_default>Export task</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_exported</word_key>
+      <word_default>All tasks have been exported to the xml folder for their application</word_default>
+      <word_custom>В�е задачи были �к�портированы в xml и размещены в директори�х приложений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_import_single</word_key>
+      <word_default>Import a task</word_default>
+      <word_custom>Импортировать задачу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>upload_task_xml</word_key>
+      <word_default>Upload a task.xml file</word_default>
+      <word_custom>Загрузить tasks.xml файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>upload_task_dupe</word_key>
+      <word_default>If the task already exists it will be updated</word_default>
+      <word_custom>Е�ли задача уже �уще�твует, она будет обновлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_removed</word_key>
+      <word_default>Language pack removed</word_default>
+      <word_custom>Язык удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_nolangbits</word_key>
+      <word_default>There were no language bits for that language pack</word_default>
+      <word_custom>В �том �зыковом пакете нет фраз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_simport_success</word_key>
+      <word_default>The task has been imported successfully</word_default>
+      <word_custom>Задача у�пешно импортирована</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>task_import_button</word_key>
+      <word_default>Upload</word_default>
+      <word_custom>Загрузить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>tupload_failed</word_key>
+      <word_default>The task upload failed.</word_default>
+      <word_custom>Загрузка задачи не удала�ь.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_textreq</word_key>
+      <word_default>Default Text is a required fields</word_default>
+      <word_custom>Тек�т по умолчанию - �то об�зательное поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_keydup</word_key>
+      <word_default>The word key you entered is already in this word pack, please use a different key.</word_default>
+      <word_custom>Ключ уже �уще�твует в наборе. Пожалуй�та, и�пользуйте другое �лово.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_packreq</word_key>
+      <word_default>Word Pack is a required field</word_default>
+      <word_custom>�абор �лов - �то об�зательное поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_keyreq</word_key>
+      <word_default>Word Key is a required field</word_default>
+      <word_custom>Ключевое �лово - �то об�зательное поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_updated</word_key>
+      <word_default>Language entry update</word_default>
+      <word_custom>Обновление запи�и �зыка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_added</word_key>
+      <word_default>New language entry added</word_default>
+      <word_custom>�ова� запи�ь �зыка добавлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_addthis</word_key>
+      <word_default>Add this entry</word_default>
+      <word_custom>Добавить �ту запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_addnew</word_key>
+      <word_default>Add new entry</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_addnewfull</word_key>
+      <word_default><![CDATA[<h2>Add New Entry</h2><p><br />You can add a new entry to the word pack here.</p>]]></word_default>
+      <word_custom><![CDATA[ <h2>Добавление новой запи�и</h2><p><br />Зде�ь вы можете добавить новую запи�ь в �пи�ок �лов.</p>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_edit</word_key>
+      <word_default>Edit entry</word_default>
+      <word_custom>Редактировать запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_editentry</word_key>
+      <word_default><![CDATA[<h2>Edit Entry</h2><p><br />You can change the information for a word pack entry here.</p>]]></word_default>
+      <word_custom><![CDATA[ <h2>Редактирование запи�и</h2><p><br />Зде�ь вы можете изменить запи�ь из набора �лов .</p>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20193,39 +15435,13 @@
       <word_key>l_xmlexport</word_key>
       <word_default>Export Application: </word_default>
       <word_custom>Эк�порт �зыка приложени� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_xmlexportfull</word_key>
-      <word_default>Export Language Pack</word_default>
-      <word_custom>Эк�порт �зыка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_noopen</word_key>
-      <word_default>Could not find the file to open at: </word_default>
-      <word_custom>�е возможно найти файл дл� открыти�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_nofile</word_key>
-      <word_default>No upload file was found and no filename was specified.</word_default>
-      <word_custom>�е найден загруженный файл и не указано им� файла.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>l_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20233,9 +15449,6 @@
       <word_key>l_updatedcount</word_key>
       <word_default>Updated %s language bits, inserted %s language bits.</word_default>
       <word_custom>%s запи�ей обновлено, %s добавлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20243,9 +15456,6 @@
       <word_key>l_nowrite</word_key>
       <word_default>Could not write to </word_default>
       <word_custom>�евозможна запи�ь в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20253,19 +15463,20 @@
       <word_key>l_noapp</word_key>
       <word_default>You did not select any applications.</word_default>
       <word_custom>Вы не выбрали ни одного приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>l_copied</word_key>
-      <word_default>Language pack copied</word_default>
-      <word_custom>Язык �копирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>l_noopen</word_key>
+      <word_default>Could not find the file to open at: </word_default>
+      <word_custom>�е возможно найти файл дл� открыти�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_nofile</word_key>
+      <word_default>No upload file was found and no filename was specified.</word_default>
+      <word_custom>�е найден загруженный файл и не указано им� файла.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20273,69 +15484,13 @@
       <word_key>language_list_copy</word_key>
       <word_default>Copy language pack...</word_default>
       <word_custom>Скопировать �зык</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_system</word_pack>
-      <word_key>language_is_rtl</word_key>
-      <word_default>Display right to left?</word_default>
-      <word_custom>Отображать �права налево</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_nowords</word_key>
-      <word_default>There were no language strings to import</word_default>
-      <word_custom>�ет запи�ей дл� импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>lang_search_results</word_key>
-      <word_default>Search Results</word_default>
-      <word_custom>Результаты пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>l_wordpack_prefix</word_key>
-      <word_default>In word pack: </word_default>
-      <word_custom>В наборе �лов: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_word_removed</word_key>
-      <word_default>The word has been removed</word_default>
-      <word_custom>Слово удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_system</word_pack>
-      <word_key>language_wordpack_removed</word_key>
-      <word_default>The word pack has been removed</word_default>
-      <word_custom>�абор �лов удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>l_xmlexportfull</word_key>
+      <word_default>Export Language Pack</word_default>
+      <word_custom>Эк�порт �зыка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20343,1451 +15498,2409 @@
       <word_key>l_remove_pack</word_key>
       <word_default>Delete...</word_default>
       <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_copied</word_key>
+      <word_default>Language pack copied</word_default>
+      <word_custom>Язык �копирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_word_removed</word_key>
+      <word_default>The word has been removed</word_default>
+      <word_custom>Слово удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_wordpack_removed</word_key>
+      <word_default>The word pack has been removed</word_default>
+      <word_custom>�абор �лов удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_nowords</word_key>
+      <word_default>There were no language strings to import</word_default>
+      <word_custom>�ет запи�ей дл� импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>lang_search_results</word_key>
+      <word_default>Search Results</word_default>
+      <word_custom>Результаты пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>l_wordpack_prefix</word_key>
+      <word_default>In word pack: </word_default>
+      <word_custom>В наборе �лов: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_editing</word_key>
+      <word_default>Editing Task: %s</word_default>
+      <word_custom>Изменение задачи: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>t_disabledcaps</word_key>
+      <word_default> (DISABLED)</word_default>
+      <word_custom> (ОТКЛЮЧЕ��)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_system</word_pack>
+      <word_key>language_is_rtl</word_key>
+      <word_default>Display right to left?</word_default>
+      <word_custom>Отображать �права налево</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_doupgrade</word_key>
-      <word_default>Check this if you are uploading an upgrade for an existing skin</word_default>
-      <word_custom>Проверьте �то е�ли вы загружаете или обновл�ете �уще�твующий �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>vse_disabled</word_key>
+      <word_default>Visual Editor Disabled</word_default>
+      <word_custom>Визуальный редактор отключен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_useimageset</word_key>
-      <word_default>Use Image Set</word_default>
-      <word_custom>Какую директорию � изображени�ми и�пользовать в �том �тиле?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_fgci_title</word_key>
+      <word_default>FCGI Detected</word_default>
+      <word_custom>Включен FCGI </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_intoroot</word_key>
-      <word_default><![CDATA[The file must be uploaded into the forum's admin root folder]]></word_default>
-      <word_custom>Этот файл должен быть загружен в корневую директорию вашего форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_fgci_desc</word_key>
+      <word_default>As you are using FCGI, the standard authentication methods may not work making you unable to log in. To resolve this, create a new file called .htaccess in your forums root directory and add the following code. If you already have a .htaccess file, add this to the bottom.</word_default>
+      <word_custom>Так как у ва� и�пользует�� FCGI, �тандартные методы авторизации могут не работать. Дл� и�правлени� �той проблемы необходимо �оздать новый файл .htaccess, который необходимо ра�положить в корневой директории форума и добавить �ледующий код в тело файла. Е�ли в директории уже е�ть .htaccess файл, то добавьте код в конец файла.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_newsetname</word_key>
-      <word_default>New Skin Set Name</word_default>
-      <word_custom>�азвание �тил�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_ur_password</word_key>
+      <word_default>(Your Admin CP Password)</word_default>
+      <word_custom>Ваш пароль к админцентру</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_leaveblank</word_key>
-      <word_default>Leave blank to use the name in the XMLArchive.</word_default>
-      <word_custom>О�тавьте поле пу�тым, е�ли хотите, чтобы и�пользовать название шаблонов из XML-архива</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_path</word_key>
+      <word_default>Path</word_default>
+      <word_custom>Путь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_upgrade</word_key>
-      <word_default>Upgrade existing skin?</word_default>
-      <word_custom>Обновить �уще�твующий �тиль?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_ornamearchive</word_key>
-      <word_default><![CDATA[<em>OR</em> enter the filename of the XMLArchive]]></word_default>
-      <word_custom><![CDATA[<em>ИЛИ</em> введите название файла-архива]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_title</word_key>
+      <word_default>WebDav Details</word_default>
+      <word_custom>Данные  WebDav</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_xmlorxmlgz</word_key>
-      <word_default><![CDATA[The file must end with either '.xml' or '.xml.gz']]></word_default>
-      <word_custom><![CDATA[Этот файл должен заканчивать�� на '.xml' или '.xml.gz']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>vse_disabled_why</word_key>
+      <word_default><![CDATA[In order to use the visual editor, please enter a valid license key that has an active service license <a href='%s'>here.</a>]]></word_default>
+      <word_custom><![CDATA[Дл� и�пользовани� визуального редактора вам нужно вве�ти дей�твующий ключ активной лицензии. Сделать �то можно <a href='%s'>вот тут</a>.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_uploadxmlarchive</word_key>
-      <word_default>Upload XML(Archive) Skin Set</word_default>
-      <word_custom>Загрузка XML-архива � шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_fail_images</word_key>
-      <word_default>IP.Board cannot write to your /public/style_images/ directory which means imports may fail!</word_default>
-      <word_custom>�евозможна запи�ь в директорию /public/style_images/, импорт невозможен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_enable</word_key>
+      <word_default>Enable external editing</word_default>
+      <word_custom>Включить внешнее редактирование</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_fail_cache</word_key>
-      <word_default>IP.Board cannot write to your /cache/skin_cache/ directory which means imports may fail!</word_default>
-      <word_custom>�евозможна запи�ь в директорию /cache/skin_cache/, импорт невозможен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_webdav_host</word_key>
+      <word_default>Server/Host</word_default>
+      <word_custom>Сервер/Хо�т</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_export</word_key>
-      <word_default>Export</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_ready_button_launch</word_key>
+      <word_default>Launch visual editor</word_default>
+      <word_custom>Запу�тить визуальный редактор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_importskinset</word_key>
-      <word_default>Import Skin Set</word_default>
-      <word_custom>Импорт шаблонов �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_main_title</word_key>
+      <word_default>External Editing</word_default>
+      <word_custom>Внешнее редактирование</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssapphide_desc</word_key>
-      <word_default>Will not include this CSS file if not in the application specified above</word_default>
-      <word_custom>Этот CSS не будет включат��, е�ли указанное приложение не активно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_title</word_key>
+      <word_default><![CDATA[Externally Edit Templates &amp; CSS]]></word_default>
+      <word_custom>Внешнее редактирование шаблонов и CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssapphide</word_key>
-      <word_default><![CDATA[Hide if Application Key doesn't match current application?]]></word_default>
-      <word_custom>Скрыть, е�ли ключ приложени� не �овпадает � текущим ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_convert_go</word_key>
+      <word_default>Convert Now</word_default>
+      <word_custom>Конвертировать �ейча�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssattributes_desc</word_key>
-      <word_default><![CDATA[Attributes to be added to the &lt;link&gt; tag]]></word_default>
-      <word_custom><![CDATA[�трибуты дл� тега &lt;link&gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ee_main_desc</word_key>
+      <word_default><![CDATA[Once enabled, you can edit templates and CSS outside the Admin CP by using a WebDav client. The details you need are shown below. For more instruction on how to use this feature please see <a href='http://myipb.in/webdav/' target='_blank'>this page.</a>]]></word_default>
+      <word_custom><![CDATA[Е�ли включено, то вы можете измен�ть шаблоны и CSS вне админцентра, и�пользу� WebDav программу. В�е данные, которые вам понадоб�т��, наход�т�� ниже. Подробна� информаци� по и�пользованию �той функции �мотрите <a href='http://myipb.in/webdav/' target='_blank'>по ��ылке</a>. ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssattributes</word_key>
-      <word_default>Attributes</word_default>
-      <word_custom>�трибуты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_convert_desc</word_key>
+      <word_default><![CDATA[If you want full control over the HTML, CSS and replacements, you can convert this to a full skin.<br /><strong>This action cannot be undone.</strong>]]></word_default>
+      <word_custom><![CDATA[Е�ли вы хотите полного контрол� над HTML, CSS и макро�ы, вам нужно конвертировать �то в полный �тиль.<br /><strong>Вернуть назад будет невозможно.</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssmodules_desc</word_key>
-      <word_default><![CDATA[Used to tie this CSS file to a specific modules.<br />Separate many with comma]]></word_default>
-      <word_custom><![CDATA[И�пользуют�� дл� прив�зки CSS к определенным модул�м. <br />Раздел�ют�� зап�тыми.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_convert_title</word_key>
+      <word_default>Convert to full skin</word_default>
+      <word_custom>Конвертировать в полный �тиль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssmodules</word_key>
-      <word_default>Module Keys</word_default>
-      <word_custom>Ключи модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_convert_done</word_key>
+      <word_default>The skin has been converted</word_default>
+      <word_custom>Стиль у�пешно �конвертирован</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssapp</word_key>
-      <word_default>Application Key</word_default>
-      <word_custom>Ключ приложени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_next_dotdotdot</word_key>
+      <word_default>Next...</word_default>
+      <word_custom>Дальше...</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssapp_desc</word_key>
-      <word_default>Used to tie this CSS file to a particular application</word_default>
-      <word_custom>И�пользует�� дл� прив�зки CSS к определенному приложению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_new_title</word_key>
+      <word_default>Create New Skin</word_default>
+      <word_custom>Создать новый �тиль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssposition_desc</word_key>
-      <word_default>Position this css file is inserted in the page</word_default>
-      <word_custom>Позици� в�тавки �того файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_ready_button_edit</word_key>
+      <word_default>Edit Skin Settings</word_default>
+      <word_custom>Изменить на�тройки �тил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssposition</word_key>
-      <word_default>Include Position</word_default>
-      <word_custom>Включить позицию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_manual_title</word_key>
+      <word_default>Manual Mode</word_default>
+      <word_custom>Ручной режим</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_add</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_ready_title</word_key>
+      <word_default>New Skin Created</word_default>
+      <word_custom>�овый �тиль �оздан</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_datavariables</word_key>
-      <word_default>Data Variables</word_default>
-      <word_custom>Переменные данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_ready_desc</word_key>
+      <word_default>The skin has been created. Simply click the button below to launch a new browser window.</word_default>
+      <word_custom>Стиль у�пешно �оздан. Дл� открыти� в новом окне браузера про�то нажмите на кнопку чуть ниже.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_group</word_key>
-      <word_default>Add to Group</word_default>
-      <word_custom>Добавить в группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_new_visual_desc</word_key>
+      <word_default>The visual editor allows you to change color and board width using a visual editor with instant preview.  Please be aware that the visual editor should be considered a beta feature, and that additional improvements and features are expected yet.</word_default>
+      <word_custom>Визуальный редактор позвол�ет измен�ть цвета дизайна вашего форума, щелка� пр�мо на визуальные �лементы дизайна и задава� цвет.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_newgroup</word_key>
-      <word_default><![CDATA[<em>or</em> Create New Group]]></word_default>
-      <word_custom><![CDATA[<em>или</em> Создать новую группу]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_new_visual_title</word_key>
+      <word_default>Visual Editor</word_default>
+      <word_custom>Визуальный редактор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_alphanumericonly</word_key>
-      <word_default>Alphanumerics only, no spaces</word_default>
-      <word_custom>Только цифры и буквы, без пробелов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_new_vis_skin_title</word_key>
+      <word_default>New Visual Editor Skin</word_default>
+      <word_custom>Создать новый визуальный �тиль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssname</word_key>
-      <word_default>CSS File Name</word_default>
-      <word_custom>Им� CSS-файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_new_vis_skin_desc</word_key>
+      <word_default>This new skin will remain hidden to others until you set it as visible.</word_default>
+      <word_custom>Этот новый �тиль будет о�тавать�� �крытым от других пользователей, пока вы не �делаете его видимым.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_variables</word_key>
-      <word_default>Variables</word_default>
-      <word_custom>Переменные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>skin_gen_next</word_key>
+      <word_default>Next</word_default>
+      <word_custom>Дальше</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssprops</word_key>
-      <word_default>CSS Properties</word_default>
-      <word_custom>СSS �вой�тва</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_desc</word_key>
+      <word_default>Created by visual editor</word_default>
+      <word_custom>Создано через визуальный редактор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_addbit</word_key>
-      <word_default>Add New Bit</word_default>
-      <word_custom>Добавить новый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>skin_gen_manual_desc</word_key>
+      <word_default>This gives you full control over the HTML and CSS code which is all fully editable for advanced layout changes.</word_default>
+      <word_custom>Это да�т вам возможно�ть полно�тью измен�ть и�ходный коды HTML и CSS.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_addcssfile</word_key>
-      <word_default>Add CSS File</word_default>
-      <word_custom>Добавить CSS-файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_uncommitted_desc</word_key>
+      <word_default><![CDATA[<strong>You have %s items with uncommitted ('unsaved') changes.</strong><div class='desctext'>This means that although the items are now merged, they need to be committed ('saved') before the changes will show on your community. Please use the checkboxes and drop down to commit these changes.</div>]]></word_default>
+      <word_custom><![CDATA[<strong>У ва� %s отозванных не�охраненных изменений.</strong><div class='desctext'>Хоть �лементы �ейча� и объединены, но они требуют �охранени� дл� того, чтобы они по�вили�ь на работающем форуме. Вы можете �делать �то про�то про�тавив галочки напротив нужных пунктов и выбрать нужную операцию в выпадающем меню.</div>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editvariables</word_key>
-      <word_default>Edit Template Variables</word_default>
-      <word_custom>Изменить переменные шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_conflicts_desc</word_key>
+      <word_default><![CDATA[<strong>You have %s items with conflicts that need resolving.</strong><div class='desctext'>This means that the items could not be automatically 'merged'. You need to either edit them manually to 'resolve' the conflicts or use the 'resolve all' option to determine the final template.</div>]]></word_default>
+      <word_custom><![CDATA[<strong>У ва� %s конфликтов, требующих и�правлени�.</strong><div class='desctext'>Это означает, что �ти �лементы не могут быть автоматиче�ки объединены. Вам нужно или и�править конфликтные моменты вручную или и�пользовать опцию 'И�править в�е' дл� формировани� окончательного шаблона.</div>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_bitname</word_key>
-      <word_default>Template Bit Name</word_default>
-      <word_custom>�азвание шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>in</word_key>
+      <word_default>in</word_default>
+      <word_custom>в</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_comparediff</word_key>
-      <word_default>Compare Differences</word_default>
-      <word_custom>Сравнить различи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_importfail_old_version</word_key>
+      <word_default><![CDATA[Warning: The skin set you are attempting to import was created for <strong>IP.Board %s</strong>. You are currently running IP.Board %s.<br />You can continue but the skin may have errors or missing functionality.<br /><br /><a href='%s' class='button' />Continue and import skin</a>]]></word_default>
+      <word_custom><![CDATA[Внимание: �тиль, который вы пытаете�ь у�тановить предназначен дл� вер�ии <strong>IP.Board %s</strong>. Вы и�пользуете вер�ию %s.<br /> Данную операцию можно продолжить, однако возможны проблемы в работе �того �тил�.<br /><br /><a href='%s' class='button' />Продолжить</a>
+]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_templates</word_key>
-      <word_default>Templates</word_default>
-      <word_custom>Шаблоны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>runmergereports</word_key>
+      <word_default>Run Merge Report...</word_default>
+      <word_custom>Запу�тить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_css</word_key>
-      <word_default>CSS</word_default>
-      <word_custom>CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>exportmastertempl</word_key>
+      <word_default><![CDATA[EXPORT Templates into 'master' directory...]]></word_default>
+      <word_custom><![CDATA[Эк�портировать шаблоны в 'master' директорию]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_updateproperties</word_key>
-      <word_default>Update properties</word_default>
-      <word_custom>Обновить �вой�тва</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>importmastercss</word_key>
+      <word_default><![CDATA[IMPORT CSS from 'master' directory...]]></word_default>
+      <word_custom><![CDATA[Импортировать CSS из 'master' директории]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editcssprops</word_key>
-      <word_default>Edit CSS Properties (Advanced Users)</word_default>
-      <word_custom>Редактирование CSS (дл� опытных)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>exportmastercss</word_key>
+      <word_default><![CDATA[EXPORT CSS into 'master' directory...]]></word_default>
+      <word_custom><![CDATA[Эк�портировать CSS в 'master' директорию]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editcss</word_key>
-      <word_default>Edit CSS</word_default>
-      <word_custom>Изменить CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>importmastertempl</word_key>
+      <word_default><![CDATA[IMPORT Templates from 'master' directory...]]></word_default>
+      <word_custom><![CDATA[Импортровать шаблоны из 'master' директории]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_edittemplates</word_key>
-      <word_default>Edit Templates</word_default>
-      <word_custom>Редактирование шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mergereporttitle</word_key>
+      <word_default>Merge Report</word_default>
+      <word_custom>Отчет объединени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editingset</word_key>
-      <word_default>Editing Set</word_default>
-      <word_custom>Редактирование �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ss_keynogoodyo</word_key>
+      <word_default>You cannot use that Skin Key as it is already in use. Please select another.</word_default>
+      <word_custom>Вы не можете и�пользовать �тот ключ, так как он уже и�пользует�� другим �тилем. Пожалуй�та, выберите другой.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editreplacevar</word_key>
-      <word_default>Edit Replacement Variables</word_default>
-      <word_custom>Редактировать макро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_done_desc</word_key>
+      <word_default><![CDATA[<strong>All your templates have been saved and are now 'live' on your community</strong><div class='desctext'>You can optionally edit them further or uncommit ('revert') the changes by using the checkboxes and drop down box.</div>]]></word_default>
+      <word_custom><![CDATA[<strong>В�е ваши шаблоны �охранены и �ейча� отображают�� на 'живом' форуме</strong><div class='desctext'>При желании вы можете редактировать их дальше или отозвать (Обратить) �деланные изменени�, про�то про�тавив галочки напротив нужных и выбрать нужную операцию в выпадающем меню.</div>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_new_full</word_key>
-      <word_default>Added Template Bit</word_default>
-      <word_custom>Добавленные шаблоны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mergerepoptions</word_key>
+      <word_default>Show...</word_default>
+      <word_custom>Показать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_new</word_key>
+      <word_key>merge__showmerged</word_key>
+      <word_default>Merged</word_default>
+      <word_custom>Объединено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>merge__showall</word_key>
+      <word_default>New/No Conflict</word_default>
+      <word_custom>�овое/Без конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergeexportprefix</word_key>
+      <word_default><![CDATA[[NEW] ]]></word_default>
+      <word_custom><![CDATA[[�ОВОЕ]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>merge__showconflict</word_key>
+      <word_default>Conflicted</word_default>
+      <word_custom>Конфликтует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>merge__showcommita</word_key>
+      <word_default>Committed</word_default>
+      <word_custom>Вне�ено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>merge__showcommit</word_key>
+      <word_default>Uncommitted</word_default>
+      <word_custom>�е вне�ено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolve__new</word_key>
+      <word_default>Resolve: New Wins</word_default>
+      <word_custom>Решить: приоритет новым изменени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergereportnewitem</word_key>
+      <word_default>New item</word_default>
+      <word_custom>�овое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolve__custom</word_key>
+      <word_default>Resolve: Custom Wins</word_default>
+      <word_custom>Решить: приоритет пользователь�ким изменени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergereportdifferences</word_key>
+      <word_default>%s differences</word_default>
+      <word_custom>%s различий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergereportnoconflict</word_key>
+      <word_default>No conflicts</word_default>
+      <word_custom>�ет конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergereportconflicts</word_key>
+      <word_default>%s conflicts</word_default>
+      <word_custom>%s конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergenewitemversion</word_key>
+      <word_default>New item for this version</word_default>
+      <word_custom>�овое дл� �той вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergereportdiffs</word_key>
+      <word_default>%s differences</word_default>
+      <word_custom>%s различий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolvedconflicts</word_key>
+      <word_default>resolved conflicts</word_default>
+      <word_custom> решенные конфликты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>noconflicts</word_key>
+      <word_default>no conflicts</word_default>
+      <word_custom> нет конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergeconflicts</word_key>
+      <word_default>merge conflicts</word_default>
+      <word_custom> объединить конфликты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>menu__vieworigdef</word_key>
+      <word_default>View original default item</word_default>
+      <word_custom>Про�мотр оригинального</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>changescommitted</word_key>
+      <word_default>. Changes committed</word_default>
+      <word_custom>Изменени� прин�ты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>menu__viewcustomized</word_key>
+      <word_default>View customized item</word_default>
+      <word_custom>Про�мотр измененного</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>menu__oldnew</word_key>
+      <word_default><![CDATA[(old default &gt; new default)]]></word_default>
+      <word_custom><![CDATA[(�тарые &gt; новые)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>menu__viewnewdef</word_key>
+      <word_default>View new default item</word_default>
+      <word_custom>Про�мотр нового</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolveallnewdefault</word_key>
+      <word_default>Auto Resolve: New Default Skin Wins</word_default>
+      <word_custom>�втоматиче�ки: приоритет оригинальным изменени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>mergewithselected</word_key>
+      <word_default>With Selected:</word_default>
+      <word_custom>С выбранным: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>manuallyresolveconflict</word_key>
+      <word_default>Manually Edit/Resolve Conflicts...</word_default>
+      <word_custom>Разрешение конфликтов вручную</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>viewmergepreview</word_key>
+      <word_default>View Merge Preview...</word_default>
+      <word_custom>Предпро�мотр объединени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolvealluncommit</word_key>
+      <word_default>Revert Changes</word_default>
+      <word_custom>Отменить изменени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolveallcommit</word_key>
+      <word_default>Save Changes To Skin</word_default>
+      <word_custom>Сохранить изменени� в �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>nopreviouslystoredtemp</word_key>
+      <word_default>The merge tool is not available as you have no previously stored templates</word_default>
+      <word_custom>Ин�трумент объединени� недо�тупен, так как у ва� нет �тарых шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>runnewreporton</word_key>
+      <word_default>Run a new report on:</word_default>
+      <word_custom>Запу�тить дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolveallcustom</word_key>
+      <word_default>Auto Resolve: Your Custom Skin Wins</word_default>
+      <word_custom>�втоматиче�ки: приоритет пользователь�ким изменени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_nokeyfound</word_key>
+      <word_default>No Key Found</word_default>
+      <word_custom>�е найден ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>resolve__go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>minutepatience</word_key>
+      <word_default>Each step can take a few minutes, please be patient</word_default>
+      <word_custom>Каждый шаг может зан�ть не�колько минут.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_noconflicts</word_key>
+      <word_default> no conflicts</word_default>
+      <word_custom> нет конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_changescommitted</word_key>
+      <word_default>. Changes committed</word_default>
+      <word_custom>. Изменений применено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_nosuchitemid</word_key>
+      <word_default>No such item ID</word_default>
+      <word_custom>�ет �лемента � таким ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_resolvedconflicts</word_key>
+      <word_default> resolved conflicts</word_default>
+      <word_custom> решенных конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_mergeconflicts</word_key>
+      <word_default> merge conflicts</word_default>
+      <word_custom> конфликтов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_newitem4thisv</word_key>
+      <word_default>New item for this version</word_default>
+      <word_custom>�овый �лемент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templatesrecached_for</word_key>
+      <word_default>PHP Templates Recached for %s</word_default>
+      <word_custom>Обновлены PHP кеши дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_invalidsession</word_key>
+      <word_default>Could not locate a valid differences session</word_default>
+      <word_custom>�е удало�ь найти �е��ию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>aborted_suffix</word_key>
+      <word_default> ABORTED</word_default>
+      <word_custom>ОТМЕ�Е�О</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>htmlrebuilt_for</word_key>
+      <word_default>HTML Rebuilt for %s</word_default>
+      <word_custom>Обновление дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>reprebuilt_for</word_key>
+      <word_default>Replacements Rebuilt for %s</word_default>
+      <word_custom>Макро�ы обновлены дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>replacerebuilt</word_key>
+      <word_default>Replacements Rebuilt</word_default>
+      <word_custom>Макро�ы обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cssrebuilt_for</word_key>
+      <word_default>CSS Rebuilt for %s</word_default>
+      <word_custom>CSS обновлен дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>masterdircreatetitle</word_key>
+      <word_default>master_skin Directory Creation Results</word_default>
+      <word_custom>Результаты �оздани� master_skin директории</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>skindiff_okmsg</word_key>
+      <word_default>Items updated</word_default>
+      <word_custom>Элементы обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cannotcreatemasterdir</word_key>
+      <word_default>Could not create directory: %scache/skin_cache/master_skin please create it via FTP and run the tool again</word_default>
+      <word_custom>�е удало�ь �оздать директорию: %scache/skin_cache/master_skin, попробуйте �оздать ее вручную, и�пользу� FTP клиент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_cssmlll</word_key>
+      <word_default>Merging CSS file changes</word_default>
+      <word_custom>Вне�ение изменений в CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_tbmlll</word_key>
+      <word_default>Merging template bit changes</word_default>
+      <word_custom>Результаты объединени� шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_cssdprocess</word_key>
+      <word_default>%s of %s CSS files processed...</word_default>
+      <word_custom>%s из %s CSS файлов обработано...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_tbdprocess</word_key>
+      <word_default>%s of %s template bits processed...</word_default>
+      <word_custom>%s из %s шаблонов обработано...&#13;
+</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_cssdlll</word_key>
+      <word_default>Checking for CSS file differences</word_default>
+      <word_custom>Проверка изменений в CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cssrecached_for</word_key>
+      <word_default>CSS Recached for %s</word_default>
+      <word_custom>Кеш CSS обновлен дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_tbdlll</word_key>
+      <word_default>Checking for template bit differences</word_default>
+      <word_custom>Пои�к различий в шаблонах</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>invalidxmlarchivei</word_key>
+      <word_default>The content was not a valid XML Archive</word_default>
+      <word_custom>�е �вл�ет�� XML-архивом</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>appcssrecachedfor</word_key>
+      <word_default>App CSS Written For %s</word_default>
+      <word_custom>Запи�ан CSS дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>appxmlrecachedfor</word_key>
+      <word_default>App XML Written For %s</word_default>
+      <word_custom>Запи�ан XML дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>emptyxmlarchivei</word_key>
+      <word_default>The XML Archive is empty</word_default>
+      <word_custom>XML-архив пу�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>imagediralreadyexists</word_key>
+      <word_default>The directory public/style_images/%s already exists</word_default>
+      <word_custom>Директори� public/style_images/%s уже �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>imagedircannotcreate</word_key>
+      <word_default>Could not create public/style_images/%s. Please check file permissions and try again.</word_default>
+      <word_custom>�е удало�ь �оздать public/style_images/%s. Пожалуй�та убедите�ь, что права до�тупа вы�тавленны правильно и повторите попытку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cannotwriteimageset</word_key>
+      <word_default>Could not write the image set to disk</word_default>
+      <word_custom>�е удало�ь запи�ать пакет изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>imagedirnotexists</word_key>
+      <word_default>Image directory %s does not exist</word_default>
+      <word_custom>Директори� изображений %s не �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>xmldirmissing</word_key>
+      <word_default>/xml/ does not exist</word_default>
+      <word_custom>/xml/ не �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>noinfoxml</word_key>
+      <word_default>The info.xml file is empty or was not included</word_default>
+      <word_custom>info.xml пу�т или от�ут�вует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>importnothingtoimport</word_key>
+      <word_default>: Nothing to import</word_default>
+      <word_custom>: нет данных дл� импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>xmldirnotwrite</word_key>
+      <word_default>/xml/ is not writeable</word_default>
+      <word_custom>/xml/ не имеет прав на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>importaddupdate</word_key>
+      <word_default>%s: %s updated, %s added</word_default>
+      <word_custom>%s: %s обновлено, %s добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>noreplacementstoexport</word_key>
+      <word_default>No replacements to export</word_default>
+      <word_custom>�ет макро�ов дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>nothingtoexportfor</word_key>
+      <word_default>Nothing to export for </word_default>
+      <word_custom>�ет данных дл� �к�порта дл� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>nogroupsforexportapp</word_key>
+      <word_default>Nothing to export for %s: No template bits</word_default>
+      <word_custom>�ет данных дл� �к�порта дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>nothingtoexportforapp</word_key>
+      <word_default>Nothing to export for %s: No groups set in information.xml</word_default>
+      <word_custom>�ет данных дл� �к�порта дл� %s, от�ут�твуют данные групп в information.xml</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>couldnotlocate</word_key>
+      <word_default>Could not locate: </word_default>
+      <word_custom>�е удало�ь найти: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>nocsstoexport</word_key>
+      <word_default>No CSS to export for </word_default>
+      <word_custom>�ет CSS дл� �к�порта дл� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>css_isnotwritable</word_key>
+      <word_default> is not writeable</word_default>
+      <word_custom> не может быть запи�ан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templatescreatedmsg</word_key>
+      <word_default>Templates for %s - %s created</word_default>
+      <word_custom>Шаблон дл� %s - %s �оздан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>csscreatedmsg</word_key>
+      <word_default>CSS for %s - %s created</word_default>
+      <word_custom>CSS дл� %s - %s �оздан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>finishedcachinghtml</word_key>
+      <word_default>Done HTML templates rebuild... (Skin Set: %s)</word_default>
+      <word_custom>Закончено обновление HTML шаблонов (Стиль: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>basicimportedpre</word_key>
+      <word_default>Imported </word_default>
+      <word_custom>Импортирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>basiccouldnotwrite</word_key>
+      <word_default>Error: Could not write </word_default>
+      <word_custom>Ошибка запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>basicnothingtowritepre</word_key>
+      <word_default>Error: No content to write for </word_default>
+      <word_custom>Ошибка запи�и: от�ут�твует �одержимое дл� запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>couldnotcreatecssdir</word_key>
+      <word_default>Fatal! cannot create: public/style_css/css_%s/</word_default>
+      <word_custom>�е удало�ь �оздать public/style_css/css_%s/</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>basicwrittenpre</word_key>
+      <word_default>Wrote: </word_default>
+      <word_custom>Запи�ан: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tplbitimported</word_key>
+      <word_default>%s imported (Added %s; updated %s template bits)</word_default>
+      <word_custom>%s импортировано (добавлено %s; обновлено %s шаблонов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cpltrebuildfromcaches</word_key>
+      <word_default>Completed database rebuild from PHP cache files.</word_default>
+      <word_custom>Кеш �тилей в базе обновлен из PHP файлов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>couldnotopenfile</word_key>
+      <word_default>Could not open %s for reading, skipping file...</word_default>
+      <word_custom>�е удало�ь прочитать файл %s, пропу�каем...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>couldnotfindlineeol</word_key>
+      <word_default>Could not find any line endings in %s, skipping file...</word_default>
+      <word_custom>Похоже что файл %s пу�той, пропу�каем...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cssdirnotwritaaaable</word_key>
+      <word_default>public/style_css/css_%s/ not writeable</word_default>
+      <word_custom>public/style_css/css_%s/ не до�тупен на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cssfilenotwriteable</word_key>
+      <word_default>public/style_css/css_%s/%s.css not writeable</word_default>
+      <word_custom>public/style_css/css_%s/%s.css не до�тупен на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>fatalnotwreite</word_key>
+      <word_default>Fatal! %s/style_css not writeable - please change permissions via FTP or turn on Safe Mode</word_default>
+      <word_custom> %s/style_css не до�тупен дл� запи�и, попробуйте изменить права до�тупа через FTP-клиент или включите безопа�ный режим �тилей в на�тройках форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>safemodeenablednow</word_key>
+      <word_default>Safe Mode Enabled: Skipping Writing CSS Cache Files</word_default>
+      <word_custom>Включен режим безопа�но�ти �тилей: пропущено �оздание CSS кешей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templatefilenowrite</word_key>
+      <word_default>cache/skin_cache/cacheid_%s/%s.php not writeable - cannot cache to PHP file</word_default>
+      <word_custom>cache/skin_cache/cacheid_%s/%s.php не имеет прав на запи�ь - не удало�ь �оздать файл PHP кеша</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>fatalnotemplatew</word_key>
+      <word_default>Fatal! cannot create: cache/skin_cache/cacheid_%s/</word_default>
+      <word_custom>�е удало�ь �оздать cache/skin_cache/cacheid_%s/</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>fatalnotemplsafe</word_key>
+      <word_default>Fatal! %scache/skin_cache not writeable - please change permissions via FTP or turn on Safe Mode</word_default>
+      <word_custom>%scache/skin_cache не до�тупен дл� запи�и, попробуйте изменить права до�тупа через FTP-клиент или включите безопа�ный режим �тилей в на�тройках форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ajax_missing_data</word_key>
+      <word_default>Missing Data</word_default>
+      <word_custom>От�ут�твуют данные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_exception</word_key>
+      <word_default>There was an error initiating the skin merge report.</word_default>
+      <word_custom>Возникла ошибка при подготовке отчета объединени� �тилей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>rep_ctn_f_tpl</word_key>
+      <word_default>Replacement Content</word_default>
+      <word_custom>Содержимое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>add_repl_f_tpl</word_key>
+      <word_default>Add Replacement</word_default>
+      <word_custom>Добавить макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>rep_key_f_tpl</word_key>
+      <word_default>Replacement Key</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sandr_search_results_for</word_key>
+      <word_default>Search Results For:</word_default>
+      <word_custom>Результаты пои�ка дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_for_apps_desc</word_key>
+      <word_default><![CDATA[Please select which applications you'd like to include in your export]]></word_default>
+      <word_custom>Укажите приложени�, которые вы хотите включить в �к�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>diff_folder_error</word_key>
+      <word_default>Folder %s was missing or empty</word_default>
+      <word_custom>Директори� %s от�ут�твует или пу�та</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_for_apps</word_key>
+      <word_default>Include Templates For Applications:</word_default>
+      <word_custom>Включа� шаблоны дл� приложений: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>addrep_btn_f_tpl</word_key>
+      <word_default>Add Replacement</word_default>
+      <word_custom>Добавить макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>diff_folder_path</word_key>
+      <word_default><![CDATA[<em>Or</em> enter the name of a folder (in root forum folder) that contains valid application template XML files]]></word_default>
+      <word_custom><![CDATA[<em>ИЛИ</em> введите им� директории (в корневой директории форума), �одержащей XML файлы шаблонов приложени�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>reset_for</word_key>
+      <word_default>Reset For:</word_default>
+      <word_custom>Переу�тановить дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>uagent_mapping</word_key>
+      <word_default>User Agent Mapping</word_default>
+      <word_custom>Переназначение по User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>used_in_no_others</word_key>
+      <word_default> (Used in %s)</word_default>
+      <word_custom> (И�пользует�� в %s) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>used_in_plus_others</word_key>
+      <word_default> (Used in %s and %s other(s))</word_default>
+      <word_custom> (И�пользует�� в %s  и в %s других) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_minify_desc</word_key>
+      <word_default>This will remove whitespace and comments to reduce filesize. Changes will take affect next time you recache this skin.</word_default>
+      <word_custom>Будут удалены пробелы и комментарии дл� уменьшени� размера файла. Изменени� в�туп�т в �илу при �ледующем перекешировании �тил�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_importexport</word_key>
+      <word_default>Skin Import/Export</word_default>
+      <word_custom>Импорт/Эк�порт �тилей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_minify</word_key>
+      <word_default>Compress Cached CSS?</word_default>
+      <word_custom>Сжимать кешированные CSS?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>none_root_set</word_key>
+      <word_default>None - Root Skin Set</word_default>
+      <word_custom>�икакой - Базовый �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_canttoggle</word_key>
+      <word_default>You cannot toggle the visibility of a default skin</word_default>
+      <word_custom>Базовый �тиль не может быть �крыт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_hiddentoggled</word_key>
+      <word_default>Visibility toggled. Note: hiding from the public drop down still allows access via direct URL and via user agent mapping. To fully restrict access please edit the settings and restrict by member group.</word_default>
+      <word_custom>Видимо�ть переключена. Примечание: �крытие �тил� из �пи�ка не запрещает про�матривать форум в �том �тиле при указании ID �тил� в URL, он так же будет до�тупен и пользовател�м, попадающим под  user agent. Дл� полного запрета и�пользовани� �тил� необходимо изменить на�тройки пользователь�ких групп.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_hidden</word_key>
+      <word_default>This set is hidden from the public drop down. Click to make visible</word_default>
+      <word_custom>Стиль не отображает�� в �пи�ке �тилей. Сделать его видимым.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_not_hidden</word_key>
+      <word_default>This set is NOT hidden from the public drop down. Click to hide</word_default>
+      <word_custom>Стиль отображает�� в �пи�ке �тилей. Скрыть его.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tt_ss_of</word_key>
+      <word_default>This is the default set for this output engine</word_default>
+      <word_custom>Этот �тиль отмечен, как о�новной, дл� данного формата вывода.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templates_NO_SUCH_TEMPLATE</word_key>
+      <word_default>We could not find the template bit you were attempting to edit.  Reload the form and try again.</word_default>
+      <word_custom>Си�тема не �могла найти шаблон, который вы пытаете�ь изменить. Попробуйте обновить форму и попробовать �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cleanup_title</word_key>
+      <word_default>Clean Up Tools</word_default>
+      <word_custom>Ин�трументы очи�тки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_run_tool</word_key>
+      <word_default>Run Tool</word_default>
+      <word_custom>Запу�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_defaultdone</word_key>
+      <word_default>Skin set made default</word_default>
+      <word_custom>Стиль отмечен как о�новной.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tt_ss_of_off</word_key>
+      <word_default>Click to make this set the default set for this output engine</word_default>
+      <word_custom>Отметить �тиль, как о�новной, дл� данного формата вывода. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templates_SYNTAX_INCORRECT</word_key>
+      <word_default>There is a syntax error in the template, usually caused by PHP code not properly formed.  Please correct the error and hit save again.</word_default>
+      <word_custom>В шаблоне обнаружена ошибка �интак�и�а. Проверьте правильно�ть �одержимого шаблона и попробуйте �охранить его �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cleanup_templates_exp</word_key>
+      <word_default><![CDATA[This tool will remove any 'orphaned' or old template bits that are no longer required]]></word_default>
+      <word_custom>Ин�трумент позвол�ет очи�тить базу от �тарых и потер�нных шаблонов, которые больше не и�пользуют�� в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cleanup_templates</word_key>
+      <word_default>Clean Up Templates Database</word_default>
+      <word_custom>Очи�тка базы данных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_css_clean_desc</word_key>
+      <word_default>Result: %s cache entries removed, %s CSS entries removed</word_default>
+      <word_custom>Результат: удалено %s кешей и %s CSS </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_css_clean_run</word_key>
+      <word_default>CSS Database Cleanup Performed</word_default>
+      <word_custom>Очи�тка CSS выполнена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_template_clean_desc</word_key>
+      <word_default>Result: %s cache entries removed, %s template entries removed</word_default>
+      <word_custom>Результат: удалено %s кешей и %s шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_template_clean_run</word_key>
+      <word_default>Template Database Cleanup Performed</word_default>
+      <word_custom>Очи�тка шаблонов выполнена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>templates_TEMPLATE_EXISTS</word_key>
+      <word_default>The template bit name already exists in this group.  Please give the template a different name.</word_default>
+      <word_custom>Шаблон � таким именем уже �уще�твует в данной группе.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cleanup_css</word_key>
+      <word_default>Clean Up CSS Database</word_default>
+      <word_custom>Очи�тка CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cleanup_css_exp</word_key>
+      <word_default><![CDATA[This tool will remove any 'orphaned' or old CSS that are no longer required]]></word_default>
+      <word_custom>Ин�трумент позвол�ет очи�тить �и�тему от потер�нных и �тарых CSS, которые уже не и�пользуют��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_cache_clean_desc</word_key>
+      <word_default>Result: %s css cache files removed, %s template cache files removed</word_default>
+      <word_custom>Результат: удалено %s кешей css, %s кешей шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>tool_cache_clean_run</word_key>
+      <word_default>Cache File Cleanup Performed</word_default>
+      <word_custom>Очи�тка файлов кеша выполнена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_clean_caches</word_key>
+      <word_default>Clean File Caches For:</word_default>
+      <word_custom>Очи�тить кеш файлы: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_replacements</word_key>
+      <word_default>replacement customizations</word_default>
+      <word_custom>изменений макро�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_templates</word_key>
+      <word_default>template customizations</word_default>
+      <word_custom>изменений шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_css</word_key>
+      <word_default>CSS customizations</word_default>
+      <word_custom>изменений CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_button</word_key>
+      <word_default>Revert Customizations</word_default>
+      <word_custom>Отменить изменени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_importfail</word_key>
+      <word_default>Import Failed: </word_default>
+      <word_custom>Ошибка импортировани�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_revertcomplete</word_key>
+      <word_default>Revert Complete</word_default>
+      <word_custom>Отмена завершена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_replace_added</word_key>
+      <word_default>%s replacement(s) imported</word_default>
+      <word_custom>%s макро�ов импортировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cs_nav2</word_key>
+      <word_default>Manage CSS in </word_default>
+      <word_custom>Управление CSS в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>cs_nav1</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми и шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_importfail_no</word_key>
+      <word_default>Import Failed: Nothing to import!</word_default>
+      <word_custom>Ошибка импортировани�: �ечего импортировать!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_desc</word_key>
+      <word_default>Please select which customizations to remove. The default template, CSS, and replacement items will be restored once the customizations have been removed. There is no undo.</word_default>
+      <word_custom>Выберите изменени� дл� удалени�. По�ле удалени� будут во��тановлены шаблоны и �тили по умолчанию. Это дей�твие нельз� отменить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_title</word_key>
+      <word_default>Reverting Customizations for:</word_default>
+      <word_custom>Отмена изменений дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert_customizations</word_key>
+      <word_default>Revert all CSS and Template Customizations...</word_default>
+      <word_custom>Отменить в�е изменени� CSS и шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_clean_caches_cb_tem</word_key>
+      <word_default>Template Files</word_default>
+      <word_custom>Файлы шаблона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_clean_caches_cb_css</word_key>
+      <word_default>CSS Files</word_default>
+      <word_custom>CSS файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_images_added</word_key>
+      <word_default>%s image(s) added</word_default>
+      <word_custom>Изображений добавлено: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_set_imported</word_key>
+      <word_default><![CDATA[Set Imported<br />%s template(s) added, %s replacement(s) added, %s CSS file(s) added.]]></word_default>
+      <word_custom><![CDATA[Стиль импортирован<br/>шаблонов добавлено: %s, заменено: %s, CSS файлов добавлено: %s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_set_upgraded</word_key>
+      <word_default><![CDATA[Set Upgraded<br />%s template(s) edited, %s replacement(s) edited, %s CSS file(s) edited.]]></word_default>
+      <word_custom><![CDATA[Стиль обновлен <br/>шаблонов добавлено: %s, заменено: %s, CSS файлов добавлено: %s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_ex_skin</word_key>
+      <word_default>Export customizations in this skin only</word_default>
+      <word_custom>Эк�портировать изменени� только �того �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_title</word_key>
+      <word_default>Comparison from skin set: </word_default>
+      <word_custom>Сравнение дл� �тил�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_none</word_key>
+      <word_default> - None - </word_default>
+      <word_custom>�икакую</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_noid</word_key>
+      <word_default>No skin ID passed. Please try again.</word_default>
+      <word_custom>�е найден ID �тил�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_removed</word_key>
+      <word_default>Differences report removed</word_default>
+      <word_custom>Отчет об изменени�х удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_nosession</word_key>
+      <word_default>Could not get the current template compare session.</word_default>
+      <word_custom>�евозможно получить текущую �е��ию �равнени� шаблонов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sr_nomatches</word_key>
+      <word_default>No Matches Found!</word_default>
+      <word_custom>�е найдено ни одной запи�и, �оответ�твующей и�комой �троке. Попробуйте еще раз и ра�ширьте диапазон пои�ка. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sr_sometext</word_key>
+      <word_default>You must enter some text to search by</word_default>
+      <word_custom>Вы не ввели значение дл� пои�ка. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>re_nav2</word_key>
+      <word_default>Manage Replacements in </word_default>
+      <word_custom>Редактировать макро�ы в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>re_nav1</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми и шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_entertitle</word_key>
+      <word_default>You must enter a title</word_default>
+      <word_custom>Вы должны вве�ти название</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ie_ex_skin_p</word_key>
+      <word_default>Export customizations in this skin and any parent skins</word_default>
+      <word_custom>Эк�портировать изменени� �того �тил� и родитель�ких</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_masterwritten</word_key>
+      <word_default>Master skin has been written</word_default>
+      <word_custom>Базовый �тиль запи�ан</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sd_nocontent</word_key>
+      <word_default>There was no content in the file to process</word_default>
+      <word_custom>Файл не был загружен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_authkeyerror</word_key>
+      <word_default>Authorization Key Error</word_default>
+      <word_custom>Ошибка ключа авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_setremoved</word_key>
+      <word_default>Set Removed</word_default>
+      <word_custom>Стиль удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не найден. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_cannotremove</word_key>
+      <word_default>Cannot remove this skin set</word_default>
+      <word_custom>�евозможно удалить �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_specifyname</word_key>
+      <word_default>You must specify a set name.</word_default>
+      <word_custom>Вы должны вве�ти им� дл� �того пакета.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_skinsetsaved</word_key>
+      <word_default>Skin Set Saved</word_default>
+      <word_custom>�а�тройки �тил� �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_imgdirnoexist</word_key>
+      <word_default>The image directory you selected does not exist.</word_default>
+      <word_custom>Выбранна� директори� изображений не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_emodirnoexist</word_key>
+      <word_default>The emoticons directory you selected does not exist.</word_default>
+      <word_custom>Выбранна� директори� �майликов не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_dontmoveintoself</word_key>
+      <word_default>You cannot move this skin set into its own parent tree</word_default>
+      <word_custom>�ельз� на�ледовать �тиль от �амого �еб�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_unavailable</word_key>
+      <word_default><![CDATA[<em>Unavailable, IP.Board cannot write into your 'public/style_css' folder</em>]]></word_default>
+      <word_custom><![CDATA[<em>�едо�тупно, IP.Board не может запи�ывать файлы в директорию 'public/style_css'</em> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_nogroupaccess</word_key>
+      <word_default>No group has access to this skin. At least ensure that one group has access.</word_default>
+      <word_custom>Хот� бы одна группа пользователей должна иметь до�туп к �тилю.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_addnewset</word_key>
+      <word_default>Add New Set</word_default>
+      <word_custom>Создание нового �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_edituserset</word_key>
+      <word_default>Edit User Set </word_default>
+      <word_custom>Редактирование �тил� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_manageskinsets</word_key>
+      <word_default>Manage Skin Sets</word_default>
+      <word_custom>Управление �тилем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ss_saveset</word_key>
+      <word_default>Save Set</word_default>
+      <word_custom>Сохранить �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>te_nav2</word_key>
+      <word_default>Manage Templates in </word_default>
+      <word_custom>Управление шаблонами в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>te_nav1</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми и шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_recache_done</word_key>
+      <word_default>Skin set(s) recached successfully</word_default>
+      <word_custom>Кеширование �тилей завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_writetoprs</word_key>
+      <word_default>Cannot write to /admin/setup/xml/skins/</word_default>
+      <word_custom>�евозможна запи�ь в /public/resources/skins/ </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_replacerecached</word_key>
+      <word_default>Replacements recached for </word_default>
+      <word_custom>Завершено кеширование макро�ов дл� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_wrote</word_key>
+      <word_default>Wrote</word_default>
+      <word_custom>Запи�ано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_couldnotwrite</word_key>
+      <word_default>Could not write</word_default>
+      <word_custom>�евозможна запи�ь </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_xmltempsavedout</word_key>
+      <word_default>XML Templates Saved Out</word_default>
+      <word_custom>XML шаблоны �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_resultrebuild</word_key>
+      <word_default>Skin data successfully imported</word_default>
+      <word_custom>Стиль у�пешно импортирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_alldone</word_key>
+      <word_default>All Done!</word_default>
+      <word_custom>Завершено!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_resultbuild</word_key>
+      <word_default>Result of building for release...</word_default>
+      <word_custom>Результат �борки дл� релиза...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_masterreplace</word_key>
+      <word_default>Master Replacements Rebuilt</word_default>
+      <word_custom>Базовые макро�ы обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_mastercssrebuilt</word_key>
+      <word_default><![CDATA[ master CSS for set key '%s' rebuilt (%s updated, %s added)]]></word_default>
+      <word_custom><![CDATA[Базовый CSS дл� ключа '%s' пере�оздан (%s обновлено, %s добавлено)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_membersupdated</word_key>
+      <word_default> members updated</word_default>
+      <word_custom> пользователей обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_masterskinrebuilt</word_key>
+      <word_default>Master rebuilt for set for set ID:</word_default>
+      <word_custom>Базовый �тиль обновлен дл� ID:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_resultxmlimp</word_key>
+      <word_default>Result of template XML importing...</word_default>
+      <word_custom>Результат XML импорта шаблонов...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_forumsupdated</word_key>
+      <word_default> forums updated</word_default>
+      <word_custom> форумов обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_noapps</word_key>
+      <word_default>No apps to rebuild!</word_default>
+      <word_custom>�ет приложени� дл� обновлени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_rebuildcomplete</word_key>
+      <word_default>Rebuild complete</word_default>
+      <word_custom>Обновление завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_recachedset</word_key>
+      <word_default>Recached set: </word_default>
+      <word_custom>Обновлен кеш �тил�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_entireform</word_key>
+      <word_default>You must complete the entire form. Please try again.</word_default>
+      <word_custom>Форма должна быть заполнена полно�тью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_templatetools</word_key>
+      <word_default>Template Tools</word_default>
+      <word_custom>Ин�трументы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_added</word_key>
+      <word_default>Skin Remap Added</word_default>
+      <word_custom>Переназначение дл� �тил� добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_removed</word_key>
+      <word_default>Remapping removed</word_default>
+      <word_custom>Переназначение удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_contains</word_key>
+      <word_default>Contains</word_default>
+      <word_custom>Содержит</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_isexactly</word_key>
+      <word_default>Is Exactly</word_default>
+      <word_custom>В точно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_edited</word_key>
+      <word_default>Skin Remap Edited</word_default>
+      <word_custom>Переназначение дл� �тил� изменено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_phprebuilt</word_key>
+      <word_default>PHP Templates Rebuilt For: </word_default>
+      <word_custom>PHP шаблоны пере�озданы дл�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>to_masterhtml</word_key>
+      <word_default><![CDATA[ master HTML templates for set key '%s' rebuilt (%s updated, %s added)]]></word_default>
+      <word_custom><![CDATA[базовых HTML шаблонов дл� ключа '%s' пере�оздано (%s обновлено, %s добавлено) ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_addnew</word_key>
+      <word_default>Add New Skin Remap</word_default>
+      <word_custom>Добавить переназначение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_editremap</word_key>
+      <word_default>Edit Remapping </word_default>
+      <word_custom>Редактировать переназначени� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>�е указан ID. Попробуйте ещё раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ua_saved</word_key>
+      <word_default>User Agent Settings Saved</word_default>
+      <word_custom>�а�тройки user agent �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ua_nav1</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми и шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>ua_nav2</word_key>
+      <word_default>Manage User Agents in </word_default>
+      <word_custom>Управление User Agents в </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sm_skinnone</word_key>
+      <word_default>Select One</word_default>
+      <word_custom>Выберите </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>el_noskinid</word_key>
+      <word_default>No skin set ID was passed. Please try again, ensuring you select a skin</word_default>
+      <word_custom>�е передан ID �тил�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_nav2</word_key>
+      <word_default>Manage URL Remapping in </word_default>
+      <word_custom>Управление переназначени�ми URL дл� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>um_nav1</word_key>
+      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
+      <word_custom>Управление �тил�ми и шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_addedhtml</word_key>
+      <word_default>Added HTML</word_default>
+      <word_custom>Добавленный HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_removedhtml</word_key>
+      <word_default>Removed HTML</word_default>
+      <word_custom>Удаленный HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_close</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>el_nofile</word_key>
+      <word_default>You must either upload a new logo or enter a URL for a new logo. Please try again</word_default>
+      <word_custom>Вы должны либо загрузить новый логотип, либо вве�ти ��ылку на �уще�твующий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>el_chmod</word_key>
+      <word_default><![CDATA[You must ensure that '/public/style_images/' has the correct permissions value to allow PHP to write into it. If CHMOD is supported on your server, try the value of 0777. Also ensure the file uploaded is smaller than 2MB in size.]]></word_default>
+      <word_custom><![CDATA[Убедите�ь, что директори� '/public/style_images/' имеет правильные права до�тупа. Е�ли команда CHMOD поддерживает�� вашим �ервером, попробуйте вы�тавить значение 0777. Так же убедите�ь, что загружаемый файл меньше 2Мб.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_easylogochanger</word_key>
+      <word_default>Easy Logo Changer</word_default>
+      <word_custom>Про�та� �мена логотипа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_ajax_noperm</word_key>
+      <word_default>You do not have permission to use this function</word_default>
+      <word_custom>У ва� нет прав дл� и�пользовани� �той функции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_elc_warning</word_key>
+      <word_default><![CDATA[<strong>WARNING: Unable to upload into '/public/style_images/'. If you wish to upload a file, please CHMOD that directory now!</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>В�ИМ��ИЕ: �евозможно загрузить файл в '/public/style_images/'. Е�ли вы хотите загрузить файл, то измените права до�тупа к �той директории.</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_urlnewlogo</word_key>
+      <word_default>URL to new logo</word_default>
+      <word_custom>С�ылка на логотип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_applywhichset_info</word_key>
+      <word_default>This will change the replacement macro for your community header.  You can revert at any time.</word_default>
+      <word_custom>Е�ли вы уже измен�ли шапку �тил� из «Управлени� шаблонами», то �то дей�твие удалит в�е ваши изменени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_urlnewlogo_info</word_key>
+      <word_default>You can use a relative URL or a full URL starting with http://</word_default>
+      <word_custom>Вы можете и�пользовать отно�ительные ��ылки или полный URL, начинающий�� � http://</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_uploadlogo</word_key>
+      <word_default><![CDATA[<b><u>OR</u></b> upload a new logo]]></word_default>
+      <word_custom><![CDATA[<b><u>ИЛИ</u></b> загрузить новый логотип]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_continue</word_key>
+      <word_default>Continue</word_default>
+      <word_custom>И�кать и заменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_run</word_key>
+      <word_default>Run</word_default>
+      <word_custom>Запу�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_submit</word_key>
+      <word_default>Submit</word_default>
+      <word_custom>У�тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replaceselected</word_key>
+      <word_default>Replace Selected</word_default>
+      <word_custom>Заменить выбранные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_uploadlogo_info</word_key>
+      <word_default>Browse your computer for a logo to upload. Filename must end in .gif, .jpg, .jpeg or .png</word_default>
+      <word_custom>Выберите файл дл� загрузки � вашего компьютера. Файл должен иметь разрешение .gif, .jpg, .jpeg или .png</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_searchininfo</word_key>
+      <word_default>Search in selected set and all parents including the master set.</word_default>
+      <word_custom>Также и�кать в родитель�ких �тил�х, включа� главный �тиль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_searchandreplace</word_key>
+      <word_default>Search and Replace</word_default>
+      <word_custom>Пои�к и замена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_selectskinset</word_key>
+      <word_default>Select a skin set</word_default>
+      <word_custom>Выберите �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_searchreplaceinfo</word_key>
+      <word_default><![CDATA[If you enter text to "replace with", no replacement is made instantly as you'll be able to preview the matches and select which template bits you wish to perform the replacements on.]]></word_default>
+      <word_custom><![CDATA[Е�ли вы ввели тек�т в поле "заменить на", то вы �можете про�мотреть какие изменени� будут �деланы и отметить дл� каких шаблонов будут выполнены изменени�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacewith</word_key>
+      <word_default>Replace With</word_default>
+      <word_custom>Заменить на...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacewith_info</word_key>
+      <word_default>(Optional: Omitting will perform just a search)</word_default>
+      <word_custom>(Опционально: Е�ли вы хотите �делать замену)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_searchfor</word_key>
+      <word_default>Search For</word_default>
+      <word_custom>Пои�к по...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_applywhichset</word_key>
+      <word_default>Apply to which skin set?</word_default>
+      <word_custom>Применить к �ледующему набору �тилей:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_title_export</word_key>
+      <word_default>export</word_default>
+      <word_custom>�к�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_new</word_key>
       <word_default>New</word_default>
       <word_custom>�овый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_inherited_full</word_key>
-      <word_default>Inherited changed from parent set</word_default>
-      <word_custom>Измененные на�ледовани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_howmanytemps</word_key>
+      <word_default>%s new template bits, %s changed template bits</word_default>
+      <word_custom>�овых шаблонов: %s , измененных шаблонов: %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_modified_full</word_key>
-      <word_default>Modified in this set</word_default>
-      <word_custom>Измененные в �том �тиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_skindiff</word_key>
+      <word_default>Skin Differences</word_default>
+      <word_custom>Различи� �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_inherited</word_key>
-      <word_default>Inherited</word_default>
-      <word_custom>�а�ледованные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_exported</word_key>
+      <word_default>Exported</word_default>
+      <word_custom>Эк�портировано</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_modified</word_key>
-      <word_default>Modified</word_default>
-      <word_custom>Измененные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_nodiffs</word_key>
+      <word_default>No skin differences to show</word_default>
+      <word_custom>�ет отчетов �равнени� �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_default</word_key>
-      <word_default>Default</word_default>
-      <word_custom>По умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_viewdiffs</word_key>
+      <word_default>View Differences</word_default>
+      <word_custom>Про�мотр различий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_l_default_full</word_key>
-      <word_default>Unmodified in this set</word_default>
-      <word_custom>�е измененные в �том �тиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_processing</word_key>
+      <word_default>Processing</word_default>
+      <word_custom>Обработка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_revertreplace</word_key>
-      <word_default>Revert This Replacement</word_default>
-      <word_custom>Отменить �тот макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_bitsof</word_key>
+      <word_default>template bits of %s processed</word_default>
+      <word_custom>шаблонов %s обработано</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_editreplace</word_key>
-      <word_default>Edit This Replacement</word_default>
-      <word_custom>Изменить макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_error</word_key>
+      <word_default>Error </word_default>
+      <word_custom>Ошибка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_removereplace</word_key>
-      <word_default>Remove This Replacement</word_default>
-      <word_custom>Удалить �тот макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_clickviewreport</word_key>
+      <word_default><![CDATA[All template bits processed. <a href='%sapp=core&amp;%s&amp;do=viewReport&amp;sessionID=%s'>Click here</a> to view the report]]></word_default>
+      <word_custom><![CDATA[В�е шаблоны обработаны. <a href='%sapp=core&amp;%s&amp;do=viewReport&amp;sessionID=%s'>�ажмите зде�ь</a> дл� про�мотра отчета]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_legend</word_key>
-      <word_default>Legend</word_default>
-      <word_custom>Легенда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_skindiffreports</word_key>
+      <word_default>Template Merge Reports</word_default>
+      <word_custom>Отчет �равнени� �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacementadd</word_key>
-      <word_default>Add New Replacement</word_default>
-      <word_custom>Добавить макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacecontent</word_key>
-      <word_default>Replace Content</word_default>
-      <word_custom>Замен�ет�� на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacekey</word_key>
-      <word_default>Replace Key</word_default>
-      <word_custom>Ключ замены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_replaceinset</word_key>
-      <word_default>Replacements In Set</word_default>
-      <word_custom>Макро�ы �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_editskinsettings</word_key>
-      <word_default>Edit Skin Settings</word_default>
-      <word_custom>�а�тройки �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_edittempcss</word_key>
-      <word_default><![CDATA[Edit Templates &amp; CSS]]></word_default>
-      <word_custom>Редактирование шаблонов и CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_icon</word_key>
-      <word_default>Icon</word_default>
-      <word_custom>Иконка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_replace_info</word_key>
-      <word_default><![CDATA[When editing replacements, the tag <strong>{style_images_url}</strong> can be used. When displayed in the skin, this tag gets converted into the appropriate image URL for this skin.]]></word_default>
-      <word_custom><![CDATA[И�пользуйте тег <strong>{style_images_url}</strong> там где необходим URL к изображени�м �тил�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cancel</word_key>
-      <word_default>Cancel</word_default>
-      <word_custom>Отмена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacements</word_key>
-      <word_default>Replacements</word_default>
-      <word_custom>Макро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssfilename</word_key>
-      <word_default>CSS File Name</word_default>
-      <word_custom>Им� CSS-файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_position</word_key>
-      <word_default>Position</word_default>
-      <word_custom>Позици�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_usestyleurl</word_key>
-      <word_default><![CDATA[Use <em>{style_images_url}</em> inplace of your IMG dir URL.<br />For Example: <em>{style_images_url}/image.png</em>  is parsed as: <em>%s/image.png</em>]]></word_default>
-      <word_custom><![CDATA[И�пользуйте <em>{style_images_url}</em> там где нужен URL директории изображений. <br /> �апример:
-<em>{style_images_url}/image.png</em> выведет <em>%s/image.png</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_editing</word_key>
-      <word_default>Editing</word_default>
-      <word_custom>Редактирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_differences</word_key>
-      <word_default>Difference Report</word_default>
-      <word_custom>Отчет о различи�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_modifiedcss</word_key>
-      <word_default>Modified CSS in this skin set</word_default>
-      <word_custom>Измененные CSS в �том �тиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_newcss</word_key>
-      <word_default>New CSS in this skin set</word_default>
-      <word_custom>�овые CSS в �том �тиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert</word_key>
-      <word_default>Revert</word_default>
-      <word_custom>Отменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssfor</word_key>
-      <word_default>CSS For</word_default>
-      <word_custom>CSS дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_unmodifiedcss</word_key>
-      <word_default>Unmodified CSS in this skin set</word_default>
-      <word_custom>�е измененные CSS в �том �тиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_unmodifiedcss2</word_key>
-      <word_default>Unmodified CSS in this skin set, but modified CSS in parent skin(s)</word_default>
-      <word_custom>�е измененные CSS в �том �тиле, но измененные в родитель�ком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_addnewsettoparent</word_key>
-      <word_default>Add A New Set To This Parent</word_default>
-      <word_custom>Добавить �тиль дл� �того родител�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_addnewcss</word_key>
-      <word_default>Add New CSS File</word_default>
-      <word_custom>Добавить CSS-файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_manageurlmapping</word_key>
-      <word_default>Manage URL Mapping</word_default>
-      <word_custom>Управление переназначени�ми по URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_manageuagentmapping</word_key>
-      <word_default>Manage User Agent Mapping</word_default>
-      <word_custom>Управление переназначени�ми по User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_managetempcss</word_key>
-      <word_default><![CDATA[Manage Templates &amp; CSS]]></word_default>
-      <word_custom>Управление шаблонами и CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_managereplacements</word_key>
-      <word_default>Manage Replacements</word_default>
-      <word_custom>Управление макро�ами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_pleasebuildthem</word_key>
-      <word_default>Please build them now!</word_default>
-      <word_custom>Пожалуй�та, обновите их �ейча�!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_editsettings</word_key>
-      <word_default>Edit Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setname</word_key>
-      <word_default>Set Name</word_default>
+      <word_key>sk_difftitle</word_key>
+      <word_default>Title</word_default>
       <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_outputformat</word_key>
-      <word_default>Output Format</word_default>
-      <word_custom>Формат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_created</word_key>
+      <word_default>Created</word_default>
+      <word_custom>Создано</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_notempcache</word_key>
-      <word_default>No template caches found!</word_default>
-      <word_custom>Кеш шаблонов не найден!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_viewdiffresults</word_key>
+      <word_default>View Merge Results</word_default>
+      <word_custom>Про�мотр результатов �равнени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skinsets</word_key>
-      <word_default>Skin Sets</word_default>
-      <word_custom>Стили</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_createhtmlexport</word_key>
+      <word_default>Create HTML Export</word_default>
+      <word_custom>Эк�портировать в HTML</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_importnewskin</word_key>
-      <word_default>Import New Skin Set</word_default>
-      <word_custom>Импортировать �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_removediffresults</word_key>
+      <word_default>REMOVE Difference Results</word_default>
+      <word_custom>УД�ЛИТЬ результаты �равнени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skinmanagement</word_key>
-      <word_default>Skin Management</word_default>
-      <word_custom>Управление �тил�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_import</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импорт</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_addnewrootskin</word_key>
-      <word_default>Add New Skin Set</word_default>
-      <word_custom>Создать новый �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_createnewskindiff</word_key>
+      <word_default>Create New Skin Differences Report</word_default>
+      <word_custom>Создать новый отчет �равнени� �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_removeskinset</word_key>
-      <word_default>Remove Skin Set</word_default>
-      <word_custom>Удалить �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_enterdifftitle</word_key>
+      <word_default>Enter a new skin difference title</word_default>
+      <word_custom>Введите название</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_pleaseconfirminfo</word_key>
-      <word_default><![CDATA[<strong>You are about to remove skin set %s</strong><br /> There is no way to undo this action, and this is the last confirmation screen. Only press the button below if you mean to do this!]]></word_default>
-      <word_custom><![CDATA[<strong>Удаление �тил� %s</strong><br />
-Это дей�твие нельз� отменить. �ажмите на кнопку ниже дл� продолжени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_writemaster</word_key>
+      <word_default><![CDATA[Write templates to 'master skin' directory]]></word_default>
+      <word_custom>Запи�ать шаблоны в директорию базового �тил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_pleaseconfirm</word_key>
-      <word_default>Please Confirm</word_default>
-      <word_custom>Подтвердите выполнение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>el_log</word_key>
+      <word_default>Logo Changed and Skin Set Caches Rebuilt (Skin ID: %s )</word_default>
+      <word_custom>Логотип изменен, кеш �тил� обновлен (ID �тил�: %s)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_removingset</word_key>
-      <word_default>Removing Set</word_default>
-      <word_custom>Удаление �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>el_wrongformat</word_key>
+      <word_default>The file you uploaded is not in the correct format. It has to be one of the following: GIF, JPG/JPEG, or PNG.</word_default>
+      <word_custom>Загруженный файл имеет не верное ра�ширение. Оно должно быть одним из �ледующих: GIF, JPG/JPEG, PNG.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_rebuildreplacements</word_key>
-      <word_default>Rebuild Replacements</word_default>
-      <word_custom>Обновить макро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_regularexpression</word_key>
+      <word_default>Regular Expression</word_default>
+      <word_custom>Включить регул�рные выражени�?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_forapps</word_key>
-      <word_default>For Applications</word_default>
-      <word_custom>Дл� приложений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_skindiffreport</word_key>
+      <word_default>Template Merge Report</word_default>
+      <word_custom>Отчет �равнени� �тилей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_templatexmllast</word_key>
-      <word_default>templates.xml last updated</word_default>
-      <word_custom>templates.xml обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_changed</word_key>
+      <word_default>Changed</word_default>
+      <word_custom>Изменен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_rebuildcss</word_key>
-      <word_default>Rebuild CSS</word_default>
-      <word_custom>Обновить CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_selectskinxml</word_key>
+      <word_default>Select a valid XML skin export file from your computer.</word_default>
+      <word_custom>Выберите корректный файл «ipb_templates.xml».</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_rebuild</word_key>
-      <word_default>Rebuild</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_selectskinxml_info</word_key>
+      <word_default><![CDATA[This will be compared against your master HTML templates - so make sure they're up-to-date before running this tool]]></word_default>
+      <word_custom>Будет произведено �равнение � HTML шаблонами главного �тил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_rebuildhtml</word_key>
-      <word_default>Rebuild HTML</word_default>
-      <word_custom>Обновить HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_skipnewmiss_info</word_key>
+      <word_default>If you are comparing an old ipb_templates.xml file from an older IPB release, then you may wish to disable this. If you are comparing an XML file from a customized skin set, you should enable this.</word_default>
+      <word_custom><![CDATA[Е�ли вы �равниваете �тарый 'ipb_templates.xml' из более �тарого IPB, вы можете отключить �тот пункт. Е�ли вы �равниваете � XML файлом из измененного �тил�, вы должны включить �тот пункт.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_rebuildmasterdata</word_key>
-      <word_default>Rebuild Master Skin Data</word_default>
-      <word_custom>Обновить данные базового �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_skipnewmiss</word_key>
+      <word_default>Skip all new/missing template bits?</word_default>
+      <word_custom>Пропу�кать в�е новые/ошибочные шаблоны?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_reset</word_key>
-      <word_default>Reset</word_default>
-      <word_custom>Переу�тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_urlmapfor</word_key>
+      <word_default>URL Map For</word_default>
+      <word_custom>Переназначени� URL дл�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_wheretheyuse</word_key>
-      <word_default>Where They Use</word_default>
-      <word_custom>И�пользующих �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_type_info</word_key>
+      <word_default><![CDATA["Contains" will match the string entered below if it occurs anywhere in the query string. "Is Exactly" will look to match the string entered below with the entire query string.]]></word_default>
+      <word_custom><![CDATA[Е�ли выбран пункт '�одержит', то будут выбраны �овпадени�, которые �одержат �троку ниже, а е�ли выбран пункт 'в точно�ти', то будут выбраны только �троки точно �овпадающие � введенным тек�том.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_usedefault</word_key>
-      <word_default>Use Default</word_default>
-      <word_custom>По умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_type</word_key>
+      <word_default>Type</word_default>
+      <word_custom>Тип</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_resetto</word_key>
-      <word_default>Reset For</word_default>
-      <word_custom>Переу�тановить на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_title_info</word_key>
+      <word_default>The title is for your information only so you can distinguish between items.</word_default>
+      <word_custom>�еобходим дл� различи� переназначений в �пи�ке.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_resetskinusage</word_key>
-      <word_default>Reset Skin Set Usage</word_default>
-      <word_custom>Переу�тановка �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_members</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_allskinsets</word_key>
-      <word_default>All Skin Sets</word_default>
-      <word_custom>В�е �тили</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_skintools</word_key>
-      <word_default>Skin Tools</word_default>
-      <word_custom>Обновление HTML шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_recacheskinsets</word_key>
-      <word_default>Recache Skin Sets</word_default>
-      <word_custom>Обновление кеш-файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setauthorurl</word_key>
-      <word_default>Set Author Website Address</word_default>
-      <word_custom>Домашн�� �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setauthorname</word_key>
-      <word_default>Set Author Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useemoset_info</word_key>
-      <word_default>Choose which set of emoticons to assign to this skin.</word_default>
-      <word_custom>Выберите, какие �майлики будут и�пользовать�� в �том �тиле.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setauthor</word_key>
-      <word_default>Set Author</word_default>
-      <word_custom>Сведени� об авторе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_imageoptions</word_key>
-      <word_default>Image Options</word_default>
-      <word_custom>�а�тройки изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useimgdir</word_key>
-      <word_default>Use image directory?</word_default>
-      <word_custom>Директори� � изображени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useimgdir_info</word_key>
-      <word_default>The image directory will be used in place of {style_images_url} in CSS and replacements.</word_default>
-      <word_custom>Директори� изображений будет замен�ть�� {style_images_url} в CSS и макро�ах.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useemoset</word_key>
-      <word_default>Use emoticons set?</word_default>
-      <word_custom>И�пользуемые �майлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cachecss_info</word_key>
-      <word_default><![CDATA[This may reduce the size of the HTML as the CSS will be in a browser cachable file.<br /><span style='color:red'>Warning: Changing this value will re-cache any cached stylesheet information. Please make sure that you have synchronized any cache files with the database.</span>]]></word_default>
-      <word_custom><![CDATA[Это уменьшит размер HTML.<br /><span style='color:red'>Внимание: Изменение значени� �той опции обновит в�е кеши CSS �тилей. Убедите�ь, что в�е ваши кеши CSS �инхронизированы � базой данных.</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cachecss</word_key>
-      <word_default>Cache CSS to text files?</word_default>
-      <word_custom>Кешировать CSS �тили в файл?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cssoptions</word_key>
-      <word_default>CSS Options</word_default>
-      <word_custom>Hа�тройки CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_hideskin_info</word_key>
-      <word_default>If you are choosing to tie user-agents to this skin, you may wish to remove it from the drop down list</word_default>
-      <word_custom>Е�ли �тилю назначены user-agent, то, возможно, вы хотите �крыть его в меню выбора �тил�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_hideskin</word_key>
-      <word_default>Hide this skin from the drop down list?</word_default>
-      <word_custom>Скрыть от пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_skinsetkey</word_key>
-      <word_default>Skin Set Key?</word_default>
-      <word_custom>Ключ �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_optional</word_key>
-      <word_default>Optional</word_default>
-      <word_custom>�е об�зательно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectwhichgroups</word_key>
-      <word_default>Select which groups have access to this skin.</word_default>
-      <word_custom>Выберите группы пользователей, которые будут иметь до�туп к �тилю.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectmorethanone</word_key>
-      <word_default>You may select more than one.</word_default>
-      <word_custom>Вы можете выбрать не�колько групп.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setasdefault</word_key>
-      <word_default>Set as default skin?</word_default>
-      <word_custom>У�тановить как �тиль по умолчанию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setasdefault_info</word_key>
-      <word_default>Make this the default skin?</word_default>
-      <word_custom>Сделать �тилем по умолчанию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_skinsetparent</word_key>
-      <word_default>Skin Set Parent?</word_default>
-      <word_custom>Родитель�кий �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_defaultalready</word_key>
-      <word_default>Skin set as default already.</word_default>
-      <word_custom>Стиль уже �вл�ет�� �тилем по умолчанию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_temp_diff</word_key>
-      <word_default>Template Differences</word_default>
-      <word_custom>Различи� шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectallgroups</word_key>
-      <word_default>Select ALL current and future groups or...</word_default>
-      <word_custom>До�тупен в�ем группам пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setoutputformat</word_key>
-      <word_default>Set Output Format</word_default>
-      <word_custom>Формат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_setperms</word_key>
-      <word_default>Set Permissions</word_default>
-      <word_custom>�а�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_settitle</word_key>
-      <word_default>Set Title</word_default>
+      <word_key>sk_title</word_key>
+      <word_default>Title</word_default>
       <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_basics</word_key>
-      <word_default>Basics</word_default>
-      <word_custom>О�новные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_generalsettings</word_key>
+      <word_default>General Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_groups</word_key>
-      <word_default>Groups</word_default>
-      <word_custom>Группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_url_info</word_key>
+      <word_default>Enter the string to match in the query string</word_default>
+      <word_custom>Введите �троку дл� �овпадени� �о �трокой запро�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_uagentmappingfor</word_key>
-      <word_default>User Agent Mapping for</word_default>
-      <word_custom>Переназначени� по User Agent дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_versions</word_key>
-      <word_default>Versions</word_default>
-      <word_custom>Вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useragents</word_key>
-      <word_default>User Agents</word_default>
-      <word_custom>User Agents</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_url</word_key>
+      <word_default>URL</word_default>
+      <word_custom>URL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21797,29 +17910,6 @@
       <word_custom><![CDATA[Переназначени� по User Agent позвол�т загружать �тиль дл� по�етителей на о�нове из user-agent (веб браузера).<br />
 Вы можете назначить группы или отдельных агентов к �тилю.<br />
 З�МЕЧ��ИЕ: Вы можете назначить одинаковый user-agent к разным �тил�м. Е�ли �то произойдет, то IP.Board выберет первый до�тупный �тиль, что может не �овпа�ть � вашим выбором.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_noremapping</word_key>
-      <word_default>There are no skin set URL remappings set up for this skin set currently.</word_default>
-      <word_custom>Переназначений URL дл� �того �тил� ещё не �оздано.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_removemapping</word_key>
-      <word_default>REMOVE Mapping</word_default>
-      <word_custom>Удалить переназначение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21827,29 +17917,20 @@
       <word_key>sk_editmapping</word_key>
       <word_default>Edit Mapping</word_default>
       <word_custom>Редактировать переназначение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_mappedurls</word_key>
-      <word_default>Mapped URLs</word_default>
-      <word_custom>Переназначенные URLы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_removemapping</word_key>
+      <word_default>REMOVE Mapping</word_default>
+      <word_custom>Удалить переназначение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_added</word_key>
-      <word_default>Added</word_default>
-      <word_custom>Добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_noremapping</word_key>
+      <word_default>There are no skin set URL remappings set up for this skin set currently.</word_default>
+      <word_custom>Переназначений URL дл� �того �тил� ещё не �оздано.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21857,9 +17938,20 @@
       <word_key>sk_addnewurl</word_key>
       <word_default>Add New URL</word_default>
       <word_custom>Добавить URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_added</word_key>
+      <word_default>Added</word_default>
+      <word_custom>Добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_mappedurls</word_key>
+      <word_default>Mapped URLs</word_default>
+      <word_custom>Переназначенные URLы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21867,3121 +17959,1009 @@
       <word_key>sk_urlremappingfor</word_key>
       <word_default>URL Remapping For</word_default>
       <word_custom>Переназначени� URL дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_url</word_key>
-      <word_default>URL</word_default>
-      <word_custom>URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_setperms</word_key>
+      <word_default>Set Permissions</word_default>
+      <word_custom>�а�тройки до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_url_info</word_key>
-      <word_default>Enter the string to match in the query string</word_default>
-      <word_custom>Введите �троку дл� �овпадени� �о �трокой запро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_selectallgroups</word_key>
+      <word_default>Select ALL current and future groups or...</word_default>
+      <word_custom>До�тупен в�ем группам пользователей</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_type_info</word_key>
-      <word_default><![CDATA["Contains" will match the string entered below if it occurs anywhere in the query string. "Is Exactly" will look to match the string entered below with the entire query string.]]></word_default>
-      <word_custom><![CDATA[Е�ли выбран пункт '�одержит', то будут выбраны �овпадени�, которые �одержат �троку ниже, а е�ли выбран пункт 'в точно�ти', то будут выбраны только �троки точно �овпадающие � введенным тек�том.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_setoutputformat</word_key>
+      <word_default>Set Output Format</word_default>
+      <word_custom>Формат</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_title_info</word_key>
-      <word_default>The title is for your information only so you can distinguish between items.</word_default>
-      <word_custom>�еобходим дл� различи� переназначений в �пи�ке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_versions</word_key>
+      <word_default>Versions</word_default>
+      <word_custom>Вер�ии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_type</word_key>
-      <word_default>Type</word_default>
-      <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_title</word_key>
-      <word_default>Title</word_default>
+      <word_key>sk_settitle</word_key>
+      <word_default>Set Title</word_default>
       <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_urlmapfor</word_key>
-      <word_default>URL Map For</word_default>
-      <word_custom>Переназначени� URL дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_basics</word_key>
+      <word_default>Basics</word_default>
+      <word_custom>О�новные</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_generalsettings</word_key>
-      <word_default>General Settings</word_default>
-      <word_custom>О�новные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_uagentmappingfor</word_key>
+      <word_default>User Agent Mapping for</word_default>
+      <word_custom>Переназначени� по User Agent дл�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectskinxml_info</word_key>
-      <word_default><![CDATA[This will be compared against your master HTML templates - so make sure they're up-to-date before running this tool]]></word_default>
-      <word_custom>Будет произведено �равнение � HTML шаблонами главного �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_groups</word_key>
+      <word_default>Groups</word_default>
+      <word_custom>Группы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectskinxml</word_key>
-      <word_default>Select a valid XML skin export file from your computer.</word_default>
-      <word_custom>Выберите корректный файл «ipb_templates.xml».</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_useragents</word_key>
+      <word_default>User Agents</word_default>
+      <word_custom>User Agents</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skipnewmiss_info</word_key>
-      <word_default>If you are comparing an old ipb_templates.xml file from an older IPB release, then you may wish to disable this. If you are comparing an XML file from a customized skin set, you should enable this.</word_default>
-      <word_custom><![CDATA[Е�ли вы �равниваете �тарый 'ipb_templates.xml' из более �тарого IPB, вы можете отключить �тот пункт. Е�ли вы �равниваете � XML файлом из измененного �тил�, вы должны включить �тот пункт.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_selectmorethanone</word_key>
+      <word_default>You may select more than one.</word_default>
+      <word_custom>Вы можете выбрать не�колько групп.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_enterdifftitle</word_key>
-      <word_default>Enter a new skin difference title</word_default>
-      <word_custom>Введите название</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_selectwhichgroups</word_key>
+      <word_default>Select which groups have access to this skin.</word_default>
+      <word_custom>Выберите группы пользователей, которые будут иметь до�туп к �тилю.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skipnewmiss</word_key>
-      <word_default>Skip all new/missing template bits?</word_default>
-      <word_custom>Пропу�кать в�е новые/ошибочные шаблоны?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_defaultalready</word_key>
+      <word_default>Skin set as default already.</word_default>
+      <word_custom>Стиль уже �вл�ет�� �тилем по умолчанию.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_createnewskindiff</word_key>
-      <word_default>Create New Skin Differences Report</word_default>
-      <word_custom>Создать новый отчет �равнени� �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_temp_diff</word_key>
+      <word_default>Template Differences</word_default>
+      <word_custom>Различи� шаблонов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_removediffresults</word_key>
-      <word_default>REMOVE Difference Results</word_default>
-      <word_custom>УД�ЛИТЬ результаты �равнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_setasdefault_info</word_key>
+      <word_default>Make this the default skin?</word_default>
+      <word_custom>Сделать �тилем по умолчанию?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_createhtmlexport</word_key>
-      <word_default>Create HTML Export</word_default>
-      <word_custom>Эк�портировать в HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_setasdefault</word_key>
+      <word_default>Set as default skin?</word_default>
+      <word_custom>У�тановить как �тиль по умолчанию.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_import</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импорт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cachecss</word_key>
+      <word_default>Cache CSS to text files?</word_default>
+      <word_custom>Кешировать CSS �тили в файл?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_viewdiffresults</word_key>
-      <word_default>View Merge Results</word_default>
-      <word_custom>Про�мотр результатов �равнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_cssoptions</word_key>
+      <word_default>CSS Options</word_default>
+      <word_custom>Hа�тройки CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_difftitle</word_key>
-      <word_default>Title</word_default>
+      <word_key>sk_hideskin_info</word_key>
+      <word_default>If you are choosing to tie user-agents to this skin, you may wish to remove it from the drop down list</word_default>
+      <word_custom>Е�ли �тилю назначены user-agent, то, возможно, вы хотите �крыть его в меню выбора �тил�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_hideskin</word_key>
+      <word_default>Hide this skin from the drop down list?</word_default>
+      <word_custom>Скрыть от пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_optional</word_key>
+      <word_default>Optional</word_default>
+      <word_custom>�е об�зательно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skinsetkey</word_key>
+      <word_default>Skin Set Key?</word_default>
+      <word_custom>Ключ �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skinsetparent</word_key>
+      <word_default>Skin Set Parent?</word_default>
+      <word_custom>Родитель�кий �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cachecss_info</word_key>
+      <word_default><![CDATA[This may reduce the size of the HTML as the CSS will be in a browser cachable file.<br /><span style='color:red'>Warning: Changing this value will re-cache any cached stylesheet information. Please make sure that you have synchronized any cache files with the database.</span>]]></word_default>
+      <word_custom><![CDATA[Это уменьшит размер HTML.<br /><span style='color:red'>Внимание: Изменение значени� �той опции обновит в�е кеши CSS �тилей. Убедите�ь, что в�е ваши кеши CSS �инхронизированы � базой данных.</span>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_useimgdir</word_key>
+      <word_default>Use image directory?</word_default>
+      <word_custom>Директори� � изображени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_imageoptions</word_key>
+      <word_default>Image Options</word_default>
+      <word_custom>�а�тройки изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_useemoset</word_key>
+      <word_default>Use emoticons set?</word_default>
+      <word_custom>И�пользуемые �майлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_setauthorurl</word_key>
+      <word_default>Set Author Website Address</word_default>
+      <word_custom>Домашн�� �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_useimgdir_info</word_key>
+      <word_default>The image directory will be used in place of {style_images_url} in CSS and replacements.</word_default>
+      <word_custom>Директори� изображений будет замен�ть�� {style_images_url} в CSS и макро�ах.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_setauthor</word_key>
+      <word_default>Set Author</word_default>
+      <word_custom>Сведени� об авторе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_setauthorname</word_key>
+      <word_default>Set Author Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_useemoset_info</word_key>
+      <word_default>Choose which set of emoticons to assign to this skin.</word_default>
+      <word_custom>Выберите, какие �майлики будут и�пользовать�� в �том �тиле.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_resetskinusage</word_key>
+      <word_default>Reset Skin Set Usage</word_default>
+      <word_custom>Переу�тановка �тилей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_allskinsets</word_key>
+      <word_default>All Skin Sets</word_default>
+      <word_custom>В�е �тили</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skintools</word_key>
+      <word_default>Skin Tools</word_default>
+      <word_custom>Обновление HTML шаблонов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_recacheskinsets</word_key>
+      <word_default>Recache Skin Sets</word_default>
+      <word_custom>Обновление кеш-файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_wheretheyuse</word_key>
+      <word_default>Where They Use:</word_default>
+      <word_custom>И�пользующих �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_resetto</word_key>
+      <word_default>Reset To:</word_default>
+      <word_custom>Переу�тановить на</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_usedefault</word_key>
+      <word_default>Use Default</word_default>
+      <word_custom>По умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_templatexmllast</word_key>
+      <word_default>templates.xml last updated</word_default>
+      <word_custom>templates.xml обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_forapps</word_key>
+      <word_default>For Applications</word_default>
+      <word_custom>Дл� приложений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_rebuildreplacements</word_key>
+      <word_default>Rebuild Replacements</word_default>
+      <word_custom>Обновить макро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_rebuildcss</word_key>
+      <word_default>Rebuild CSS</word_default>
+      <word_custom>Обновить CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_rebuildhtml</word_key>
+      <word_default>Rebuild HTML</word_default>
+      <word_custom>Обновить HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_rebuild</word_key>
+      <word_default>Rebuild</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_rebuildmasterdata</word_key>
+      <word_default>Rebuild Master Skin Data</word_default>
+      <word_custom>Обновить данные базового �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_reset</word_key>
+      <word_default>Reset</word_default>
+      <word_custom>Переу�тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_pleaseconfirm</word_key>
+      <word_default>Please Confirm</word_default>
+      <word_custom>Подтвердите выполнение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_removingset</word_key>
+      <word_default>Removing Set</word_default>
+      <word_custom>Удаление �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_pleaseconfirminfo</word_key>
+      <word_default><![CDATA[<strong>You are about to remove skin set %s</strong><br /> There is no way to undo this action, and this is the last confirmation screen. Only press the button below if you mean to do this!]]></word_default>
+      <word_custom><![CDATA[<strong>Удаление �тил� %s</strong><br />
+Это дей�твие нельз� отменить. �ажмите на кнопку ниже дл� продолжени�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_removeskinset</word_key>
+      <word_default>Remove Skin Set</word_default>
+      <word_custom>Удалить �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_addnewrootskin</word_key>
+      <word_default>Create New Skin Set</word_default>
+      <word_custom>Создать новый �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skinmanagement</word_key>
+      <word_default>Skin Management</word_default>
+      <word_custom>Управление �тил�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_importnewskin</word_key>
+      <word_default>Import Skin Set</word_default>
+      <word_custom>Импортировать �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skinsets</word_key>
+      <word_default>Skin Sets</word_default>
+      <word_custom>Стили</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_outputformat</word_key>
+      <word_default>Output Format</word_default>
+      <word_custom>Формат</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_setname</word_key>
+      <word_default>Set Name</word_default>
       <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_created</word_key>
-      <word_default>Created</word_default>
-      <word_custom>Создано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_notempcache</word_key>
+      <word_default>No template caches found!</word_default>
+      <word_custom>Кеш шаблонов не найден!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skindiffreports</word_key>
-      <word_default>Template Merge Reports</word_default>
-      <word_custom>Отчет �равнени� �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_pleasebuildthem</word_key>
+      <word_default>Please build them now!</word_default>
+      <word_custom>Пожалуй�та, обновите их �ейча�!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_clickviewreport</word_key>
-      <word_default><![CDATA[All template bits processed. <a href='%sapp=core&amp;%s&amp;do=viewReport&amp;sessionID=%s'>Click here</a> to view the report]]></word_default>
-      <word_custom><![CDATA[В�е шаблоны обработаны. <a href='%sapp=core&amp;%s&amp;do=viewReport&amp;sessionID=%s'>�ажмите зде�ь</a> дл� про�мотра отчета]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_editsettings</word_key>
+      <word_default>Edit Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_processing</word_key>
-      <word_default>Processing</word_default>
-      <word_custom>Обработка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_managereplacements</word_key>
+      <word_default>Manage Replacements</word_default>
+      <word_custom>Управление макро�ами</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_bitsof</word_key>
-      <word_default>template bits of %s processed</word_default>
-      <word_custom>шаблонов %s обработано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_managetempcss</word_key>
+      <word_default><![CDATA[Manage Templates &amp; CSS]]></word_default>
+      <word_custom>Управление шаблонами и CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_error</word_key>
-      <word_default>Error </word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_manageurlmapping</word_key>
+      <word_default>Manage URL Mapping</word_default>
+      <word_custom>Управление переназначени�ми по URL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skindiff</word_key>
-      <word_default>Skin Differences</word_default>
-      <word_custom>Различи� �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_manageuagentmapping</word_key>
+      <word_default>Manage User Agent Mapping</word_default>
+      <word_custom>Управление переназначени�ми по User Agent</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_nodiffs</word_key>
-      <word_default>No skin differences to show</word_default>
-      <word_custom>�ет отчетов �равнени� �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_addnewcss</word_key>
+      <word_default>Add New CSS File</word_default>
+      <word_custom>Добавить CSS-файл</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_viewdiffs</word_key>
-      <word_default>View Differences</word_default>
-      <word_custom>Про�мотр различий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_addnewsettoparent</word_key>
+      <word_default>Add A New Set To This Parent</word_default>
+      <word_custom>Добавить �тиль дл� �того родител�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_changed</word_key>
-      <word_default>Changed</word_default>
-      <word_custom>Изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_unmodifiedcss</word_key>
+      <word_default>Unmodified CSS in this skin set</word_default>
+      <word_custom>�е измененные CSS в �том �тиле</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skindiffreport</word_key>
-      <word_default>Template Merge Report</word_default>
-      <word_custom>Отчет �равнени� �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_cssfor</word_key>
+      <word_default>CSS For</word_default>
+      <word_custom>CSS дл�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_new</word_key>
+      <word_key>sk_modifiedcss</word_key>
+      <word_default>Modified CSS in this skin set</word_default>
+      <word_custom>Измененные CSS в �том �тиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_newcss</word_key>
+      <word_default>New CSS in this skin set</word_default>
+      <word_custom>�овые CSS в �том �тиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_unmodifiedcss2</word_key>
+      <word_default>Unmodified CSS in this skin set, but modified CSS in parent skin(s)</word_default>
+      <word_custom>�е измененные CSS в �том �тиле, но измененные в родитель�ком</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revert</word_key>
+      <word_default>Revert</word_default>
+      <word_custom>Отменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_editing</word_key>
+      <word_default>Editing</word_default>
+      <word_custom>Редактирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_differences</word_key>
+      <word_default>Difference Report</word_default>
+      <word_custom>Отчет о различи�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_usestyleurl</word_key>
+      <word_default><![CDATA[Use <em>{style_images_url}</em> inplace of your IMG dir URL.<br />For Example: <em>{style_images_url}/image.png</em>  is parsed as: <em>%s/image.png</em>]]></word_default>
+      <word_custom><![CDATA[И�пользуйте <em>{style_images_url}</em> там где нужен URL директории изображений. <br /> �апример:
+<em>{style_images_url}/image.png</em> выведет <em>%s/image.png</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_position</word_key>
+      <word_default>Position</word_default>
+      <word_custom>Позици�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cssfilename</word_key>
+      <word_default>CSS File Name</word_default>
+      <word_custom>Им� CSS-файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replaceinset</word_key>
+      <word_default>Replacements In Set</word_default>
+      <word_custom>Макро�ы �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_editskinsettings</word_key>
+      <word_default>Edit Skin Settings</word_default>
+      <word_custom>�а�тройки �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_edittempcss</word_key>
+      <word_default><![CDATA[Edit Templates &amp; CSS]]></word_default>
+      <word_custom>Редактирование шаблонов и CSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_icon</word_key>
+      <word_default>Icon</word_default>
+      <word_custom>Иконка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacekey</word_key>
+      <word_default>Replace Key</word_default>
+      <word_custom>Ключ замены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replace_info</word_key>
+      <word_default><![CDATA[When editing replacements, the tag <strong>{style_images_url}</strong> can be used. When displayed in the skin, this tag gets converted into the appropriate image URL for this skin.]]></word_default>
+      <word_custom><![CDATA[И�пользуйте тег <strong>{style_images_url}</strong> там где необходим URL к изображени�м �тил�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacements</word_key>
+      <word_default>Replacements</word_default>
+      <word_custom>Макро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отмена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_legend</word_key>
+      <word_default>Legend</word_default>
+      <word_custom>Легенда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacecontent</word_key>
+      <word_default>Replace Content</word_default>
+      <word_custom>Замен�ет�� на</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_replacementadd</word_key>
+      <word_default>Add New Replacement</word_default>
+      <word_custom>Добавить макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_removereplace</word_key>
+      <word_default>Remove This Replacement</word_default>
+      <word_custom>Удалить �тот макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_default</word_key>
+      <word_default>Default</word_default>
+      <word_custom>По умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_revertreplace</word_key>
+      <word_default>Revert This Replacement</word_default>
+      <word_custom>Отменить �тот макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_editreplace</word_key>
+      <word_default>Edit This Replacement</word_default>
+      <word_custom>Изменить макро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_default_full</word_key>
+      <word_default>Unmodified in this set</word_default>
+      <word_custom>�е измененные в �том �тиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_modified</word_key>
+      <word_default>Modified</word_default>
+      <word_custom>Измененные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_modified_full</word_key>
+      <word_default>Modified in this set</word_default>
+      <word_custom>Измененные в �том �тиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_inherited</word_key>
+      <word_default>Inherited</word_default>
+      <word_custom>�а�ледованные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_l_new</word_key>
       <word_default>New</word_default>
       <word_custom>�овый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_howmanytemps</word_key>
-      <word_default>%s new template bits, %s changed template bits</word_default>
-      <word_custom>�овых шаблонов: %s , измененных шаблонов: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_l_inherited_full</word_key>
+      <word_default>Inherited changed from parent set</word_default>
+      <word_custom>Измененные на�ледовани�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_regularexpression</word_key>
-      <word_default>Regular Expression</word_default>
-      <word_custom>Включить регул�рные выражени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_l_new_full</word_key>
+      <word_default>Added Template Bit</word_default>
+      <word_custom>Добавленные шаблоны</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_title_export</word_key>
-      <word_default>export</word_default>
-      <word_custom>�к�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_editingset</word_key>
+      <word_default>Editing Set</word_default>
+      <word_custom>Редактирование �тил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_exported</word_key>
-      <word_default>Exported</word_default>
-      <word_custom>Эк�портировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_editreplacevar</word_key>
+      <word_default>Edit Replacement Variables</word_default>
+      <word_custom>Редактировать макро�ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacewith</word_key>
-      <word_default>Replace With</word_default>
-      <word_custom>Заменить на...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_editcssprops</word_key>
+      <word_default>Edit CSS Properties (Advanced Users)</word_default>
+      <word_custom>Редактирование CSS (дл� опытных)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_replacewith_info</word_key>
-      <word_default>(Optional: Ommitting will perform just a search)</word_default>
-      <word_custom>(Опционально: Е�ли вы хотите �делать замену)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_edittemplates</word_key>
+      <word_default>Edit Templates</word_default>
+      <word_custom>Редактирование шаблонов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_searchininfo</word_key>
-      <word_default>Search in selected set and all parents including the master set.</word_default>
-      <word_custom>Также и�кать в родитель�ких �тил�х, включа� главный �тиль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_updateproperties</word_key>
+      <word_default>Update properties</word_default>
+      <word_custom>Обновить �вой�тва</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_searchfor</word_key>
-      <word_default>Search For</word_default>
-      <word_custom>Пои�к по...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_templates</word_key>
+      <word_default>Templates</word_default>
+      <word_custom>Шаблоны</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_searchandreplace</word_key>
-      <word_default>Search and Replace</word_default>
-      <word_custom>Пои�к и замена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_css</word_key>
+      <word_default>CSS</word_default>
+      <word_custom>CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_selectskinset</word_key>
-      <word_default>Select a skin set</word_default>
-      <word_custom>Выберите �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_editcss</word_key>
+      <word_default>Edit CSS</word_default>
+      <word_custom>Изменить CSS</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_searchreplaceinfo</word_key>
-      <word_default><![CDATA[If you enter text to "replace with", no replacement is made instantly as you'll be able to preview the matches and select which template bits you wish to perform the replacements on.]]></word_default>
-      <word_custom><![CDATA[Е�ли вы ввели тек�т в поле "заменить на", то вы �можете про�мотреть какие изменени� будут �деланы и отметить дл� каких шаблонов будут выполнены изменени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_comparediff</word_key>
+      <word_default>Compare Differences</word_default>
+      <word_custom>Сравнить различи�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_run</word_key>
-      <word_default>Run</word_default>
-      <word_custom>Запу�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_variables</word_key>
+      <word_default>Variables</word_default>
+      <word_custom>Переменные</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_cssprops</word_key>
+      <word_default>CSS Properties</word_default>
+      <word_custom>СSS �вой�тва</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_continue</word_key>
-      <word_default>Continue</word_default>
-      <word_custom>И�кать и заменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_addbit</word_key>
+      <word_default>Add New Bit</word_default>
+      <word_custom>Добавить новый</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_submit</word_key>
-      <word_default>Submit</word_default>
-      <word_custom>У�тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_editvariables</word_key>
+      <word_default>Edit Template Variables</word_default>
+      <word_custom>Изменить переменные шаблона</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_replaceselected</word_key>
-      <word_default>Replace Selected</word_default>
-      <word_custom>Заменить выбранные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_addcssfile</word_key>
+      <word_default>Add CSS File</word_default>
+      <word_custom>Добавить CSS-файл</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_uploadlogo_info</word_key>
-      <word_default>Browse your computer for a logo to upload. Filename must end in .gif, .jpg, .jpeg or .png</word_default>
-      <word_custom>Выберите файл дл� загрузки � вашего компьютера. Файл должен иметь разрешение .gif, .jpg, .jpeg или .png</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_bitname</word_key>
+      <word_default>Template Bit Name</word_default>
+      <word_custom>�азвание шаблона</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_uploadlogo</word_key>
-      <word_default><![CDATA[<b><u>OR</u></b> upload a new logo]]></word_default>
-      <word_custom><![CDATA[<b><u>ИЛИ</u></b> загрузить новый логотип]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_alphanumericonly</word_key>
+      <word_default>Alphanumerics only, no spaces</word_default>
+      <word_custom>Только цифры и буквы, без пробелов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_urlnewlogo_info</word_key>
-      <word_default>You can use a relative URL or a full URL starting with http://</word_default>
-      <word_custom>Вы можете и�пользовать отно�ительные ��ылки или полный URL, начинающий�� � http://</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_group</word_key>
+      <word_default>Add to Group</word_default>
+      <word_custom>Добавить в группу</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_urlnewlogo</word_key>
-      <word_default>URL to new logo</word_default>
-      <word_custom>С�ылка на логотип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_cssname</word_key>
+      <word_default>CSS File Name</word_default>
+      <word_custom>Им� CSS-файла</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_applywhichset_info</word_key>
-      <word_default>This will change the replacement macro for your board header.  You can revert at any time.</word_default>
-      <word_custom>Е�ли вы уже измен�ли шапку �тил� из «Управлени� шаблонами», то �то дей�твие удалит в�е ваши изменени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssposition</word_key>
+      <word_default>Include Position</word_default>
+      <word_custom>Включить позицию</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_applywhichset</word_key>
-      <word_default>Apply to which skin set?</word_default>
-      <word_custom>Применить к �ледующему набору �тилей:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_elc_warning</word_key>
-      <word_default><![CDATA[<strong>WARNING: Unable to upload into '/public/style_images/'. If you wish to upload a file, please CHMOD that directory now!</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>В�ИМ��ИЕ: �евозможно загрузить файл в '/public/style_images/'. Е�ли вы хотите загрузить файл, то измените права до�тупа к �той директории.</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_datavariables</word_key>
+      <word_default>Data Variables</word_default>
+      <word_custom>Переменные данных</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_addedhtml</word_key>
-      <word_default>Added HTML</word_default>
-      <word_custom>Добавленный HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_newgroup</word_key>
+      <word_default><![CDATA[<em>or</em> Create New Group]]></word_default>
+      <word_custom><![CDATA[<em>или</em> Создать новую группу]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_easylogochanger</word_key>
-      <word_default>Easy Logo Changer</word_default>
-      <word_custom>Про�та� �мена логотипа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssposition_desc</word_key>
+      <word_default>Position this css file is inserted in the page</word_default>
+      <word_custom>Позици� в�тавки �того файла</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_close</word_key>
-      <word_default>Close</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssapp</word_key>
+      <word_default>Application Key</word_default>
+      <word_custom>Ключ приложени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_removedhtml</word_key>
-      <word_default>Removed HTML</word_default>
-      <word_custom>Удаленный HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_cssapp_desc</word_key>
+      <word_default>Used to tie this CSS file to a particular application</word_default>
+      <word_custom>И�пользует�� дл� прив�зки CSS к определенному приложению</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_ajax_noperm</word_key>
-      <word_default>You do not have permission to use this function</word_default>
-      <word_custom>У ва� нет прав дл� и�пользовани� �той функции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssmodules_desc</word_key>
+      <word_default><![CDATA[Used to tie this CSS file to a specific modules.<br />Separate many with comma]]></word_default>
+      <word_custom><![CDATA[И�пользуют�� дл� прив�зки CSS к определенным модул�м. <br />Раздел�ют�� зап�тыми.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_writemaster</word_key>
-      <word_default><![CDATA[Write templates to 'master skin' directory]]></word_default>
-      <word_custom>Запи�ать шаблоны в директорию базового �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssattributes_desc</word_key>
+      <word_default><![CDATA[Attributes to be added to the &lt;link&gt; tag]]></word_default>
+      <word_custom><![CDATA[�трибуты дл� тега &lt;link&gt;]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>el_log</word_key>
-      <word_default>Logo Changed and Skin Set Caches Rebuilt (Skin ID: %s )</word_default>
-      <word_custom>Логотип изменен, кеш �тил� обновлен (ID �тил�: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssmodules</word_key>
+      <word_default>Module Keys</word_default>
+      <word_custom>Ключи модул�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>el_wrongformat</word_key>
-      <word_default>The file you uploaded is not in the correct format. It has to be one of the following: GIF, JPG/JPEG, or PNG.</word_default>
-      <word_custom>Загруженный файл имеет не верное ра�ширение. Оно должно быть одним из �ледующих: GIF, JPG/JPEG, PNG.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssattributes</word_key>
+      <word_default>Attributes</word_default>
+      <word_custom>�трибуты</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>el_chmod</word_key>
-      <word_default><![CDATA[You must ensure that '/public/style_images/' has the correct permissions value to allow PHP to write into it. If CHMOD is supported on your server, try the value of 0777. Also ensure the file uploaded is smaller than 2MB in size.]]></word_default>
-      <word_custom><![CDATA[Убедите�ь, что директори� '/public/style_images/' имеет правильные права до�тупа. Е�ли команда CHMOD поддерживает�� вашим �ервером, попробуйте вы�тавить значение 0777. Так же убедите�ь, что загружаемый файл меньше 2Мб.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_importskinset</word_key>
+      <word_default>Import Skin Set</word_default>
+      <word_custom>Импорт шаблонов �тил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>ua_nav2</word_key>
-      <word_default>Manage User Agents in </word_default>
-      <word_custom>Управление User Agents в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssapphide</word_key>
+      <word_default><![CDATA[Hide if Application Key doesn't match current application?]]></word_default>
+      <word_custom>Скрыть, е�ли ключ приложени� не �овпадает � текущим ?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sm_skinnone</word_key>
-      <word_default>Select One</word_default>
-      <word_custom>Выберите </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_export</word_key>
+      <word_default>Export</word_default>
+      <word_custom>Эк�порт</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>el_noskinid</word_key>
-      <word_default>No skin set ID was passed. Please try again, ensuring you select a skin</word_default>
-      <word_custom>�е передан ID �тил�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_cssapphide_desc</word_key>
+      <word_default>Will not include this CSS file if not in the application specified above</word_default>
+      <word_custom>Этот CSS не будет включат��, е�ли указанное приложение не активно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>el_nofile</word_key>
-      <word_default>You must either upload a new logo or enter a URL for a new logo. Please try again</word_default>
-      <word_custom>Вы должны либо загрузить новый логотип, либо вве�ти ��ылку на �уще�твующий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_fail_cache</word_key>
+      <word_default>IP.Board cannot write to your /cache/skin_cache/ directory which means imports may fail!</word_default>
+      <word_custom>�евозможна запи�ь в директорию /cache/skin_cache/, импорт невозможен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>ua_saved</word_key>
-      <word_default>User Agent Settings Saved</word_default>
-      <word_custom>�а�тройки user agent �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_fail_images</word_key>
+      <word_default>IP.Board cannot write to your /public/style_images/ directory which means imports may fail!</word_default>
+      <word_custom>�евозможна запи�ь в директорию /public/style_images/, импорт невозможен.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>ua_nav1</word_key>
-      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
-      <word_custom>Управление �тил�ми и шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_xmlorxmlgz</word_key>
+      <word_default><![CDATA[The file must end with either '.xml' or '.xml.gz']]></word_default>
+      <word_custom><![CDATA[Этот файл должен заканчивать�� на '.xml' или '.xml.gz']]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_nav2</word_key>
-      <word_default>Manage URL Remapping in </word_default>
-      <word_custom>Управление переназначени�ми URL дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_uploadxmlarchive</word_key>
+      <word_default>Upload XML(Archive) Skin Set</word_default>
+      <word_custom>Загрузка XML-архива � шаблонами</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_nav1</word_key>
-      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
-      <word_custom>Управление �тил�ми и шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_ornamearchive</word_key>
+      <word_default><![CDATA[<em>OR</em> enter the filename of the XML Archive]]></word_default>
+      <word_custom><![CDATA[<em>ИЛИ</em> введите название файла-архива]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_editremap</word_key>
-      <word_default>Edit Remapping </word_default>
-      <word_custom>Редактировать переназначени� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_newsetname</word_key>
+      <word_default>New Skin Set Name</word_default>
+      <word_custom>�азвание �тил�:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_savechanges</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_intoroot</word_key>
+      <word_default><![CDATA[The file must be uploaded into the forum's admin root folder]]></word_default>
+      <word_custom>Этот файл должен быть загружен в корневую директорию вашего форума.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>�е указан ID. Попробуйте ещё раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_doupgrade</word_key>
+      <word_default>Check this if you are uploading an upgrade for an existing skin</word_default>
+      <word_custom>Проверьте �то е�ли вы загружаете или обновл�ете �уще�твующий �тиль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_isexactly</word_key>
-      <word_default>Is Exactly</word_default>
-      <word_custom>В точно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_leaveblank</word_key>
+      <word_default>Leave blank to use the name in the XML Archive.</word_default>
+      <word_custom>О�тавьте поле пу�тым, е�ли хотите, чтобы и�пользовать название шаблонов из XML-архива</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>um_addnew</word_key>
-      <word_default>Add New Skin Remap</word_default>
-      <word_custom>Добавить переназначение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>um_contains</word_key>
-      <word_default>Contains</word_default>
-      <word_custom>Содержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>um_added</word_key>
-      <word_default>Skin Remap Added</word_default>
-      <word_custom>Переназначение дл� �тил� добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>um_edited</word_key>
-      <word_default>Skin Remap Edited</word_default>
-      <word_custom>Переназначение дл� �тил� изменено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>um_removed</word_key>
-      <word_default>Remapping removed</word_default>
-      <word_custom>Переназначение удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>um_entireform</word_key>
-      <word_default>You must complete the entire form. Please try again.</word_default>
-      <word_custom>Форма должна быть заполнена полно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_templatetools</word_key>
-      <word_default>Template Tools</word_default>
-      <word_custom>Ин�трументы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_rebuildcomplete</word_key>
-      <word_default>Rebuild complete</word_default>
-      <word_custom>Обновление завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_recachedset</word_key>
-      <word_default>Recached set: </word_default>
-      <word_custom>Обновлен кеш �тил�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_phprebuilt</word_key>
-      <word_default>PHP Templates Rebuilt For: </word_default>
-      <word_custom>PHP шаблоны пере�озданы дл�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_noapps</word_key>
-      <word_default>No apps to rebuild!</word_default>
-      <word_custom>�ет приложени� дл� обновлени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_masterhtml</word_key>
-      <word_default><![CDATA[ master HTML templates for set key '%s' rebuilt (%s updated, %s added)]]></word_default>
-      <word_custom><![CDATA[базовых HTML шаблонов дл� ключа '%s' пере�оздано (%s обновлено, %s добавлено) ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_membersupdated</word_key>
-      <word_default> members updated</word_default>
-      <word_custom> пользователей обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_forumsupdated</word_key>
-      <word_default> forums updated</word_default>
-      <word_custom> форумов обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_masterskinrebuilt</word_key>
-      <word_default>Master rebuilt for set for set ID:</word_default>
-      <word_custom>Базовый �тиль обновлен дл� ID:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_resultxmlimp</word_key>
-      <word_default>Result of template XML importing...</word_default>
-      <word_custom>Результат XML импорта шаблонов...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_masterreplace</word_key>
-      <word_default>Master Replacements Rebuilt</word_default>
-      <word_custom>Базовые макро�ы обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_mastercssrebuilt</word_key>
-      <word_default><![CDATA[ master CSS for set key '%s' rebuilt (%s updated, %s added)]]></word_default>
-      <word_custom><![CDATA[Базовый CSS дл� ключа '%s' пере�оздан (%s обновлено, %s добавлено)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_resultrebuild</word_key>
-      <word_default>Skin data successfully imported</word_default>
-      <word_custom>Стиль у�пешно импортирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30011</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_alldone</word_key>
-      <word_default>All Done!</word_default>
-      <word_custom>Завершено!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_resultbuild</word_key>
-      <word_default>Result of building for release...</word_default>
-      <word_custom>Результат �борки дл� релиза...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_xmltempsavedout</word_key>
-      <word_default>XML Templates Saved Out</word_default>
-      <word_custom>XML шаблоны �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_wrote</word_key>
-      <word_default>Wrote</word_default>
-      <word_custom>Запи�ано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_replacerecached</word_key>
-      <word_default>Replacements recached for </word_default>
-      <word_custom>Завершено кеширование макро�ов дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_couldnotwrite</word_key>
-      <word_default>Could not write</word_default>
-      <word_custom>�евозможна запи�ь </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_writetoprs</word_key>
-      <word_default>Cannot write to /public/resources/skins/</word_default>
-      <word_custom>�евозможна запи�ь в /public/resources/skins/ </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>te_nav1</word_key>
-      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
-      <word_custom>Управление �тил�ми и шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>te_nav2</word_key>
-      <word_default>Manage Templates in </word_default>
-      <word_custom>Управление шаблонами в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>to_recache_done</word_key>
-      <word_default>Skin set(s) recached successfully</word_default>
-      <word_custom>Кеширование �тилей завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_saveset</word_key>
-      <word_default>Save Set</word_default>
-      <word_custom>Сохранить �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_manageskinsets</word_key>
-      <word_default>Manage Skin Sets</word_default>
-      <word_custom>Управление �тилем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_addnewset</word_key>
-      <word_default>Add New Set</word_default>
-      <word_custom>Создание нового �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_edituserset</word_key>
-      <word_default>Edit User Set </word_default>
-      <word_custom>Редактирование �тил� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_skinsetsaved</word_key>
-      <word_default>Skin Set Saved</word_default>
-      <word_custom>�а�тройки �тил� �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_unavailable</word_key>
-      <word_default><![CDATA[<em>Unavailable, IP.Board cannot write into your 'public/style_css' folder</em>]]></word_default>
-      <word_custom><![CDATA[<em>�едо�тупно, IP.Board не может запи�ывать файлы в директорию 'public/style_css'</em> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_emodirnoexist</word_key>
-      <word_default>The emoticons directory you selected does not exist.</word_default>
-      <word_custom>Выбранна� директори� �майликов не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_dontmoveintoself</word_key>
-      <word_default>You cannot move this skin set into its own parent tree</word_default>
-      <word_custom>�ельз� на�ледовать �тиль от �амого �еб�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_imgdirnoexist</word_key>
-      <word_default>The image directory you selected does not exist.</word_default>
-      <word_custom>Выбранна� директори� изображений не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_specifyname</word_key>
-      <word_default>You must specify a set name.</word_default>
-      <word_custom>Вы должны вве�ти им� дл� �того пакета.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_nogroupaccess</word_key>
-      <word_default>No group has access to this skin. At least ensure that one group has access.</word_default>
-      <word_custom>Хот� бы одна группа пользователей должна иметь до�туп к �тилю.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_setremoved</word_key>
-      <word_default>Set Removed</word_default>
-      <word_custom>Стиль удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_masterwritten</word_key>
-      <word_default>Master skin has been written</word_default>
-      <word_custom>Базовый �тиль запи�ан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_cannotremove</word_key>
-      <word_default>Cannot remove this skin set</word_default>
-      <word_custom>�евозможно удалить �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_authkeyerror</word_key>
-      <word_default>Authorization Key Error</word_default>
-      <word_custom>Ошибка ключа авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_nocontent</word_key>
-      <word_default>There was no content in the file to process</word_default>
-      <word_custom>Файл не был загружен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_noid</word_key>
-      <word_default>No skin ID passed. Please try again.</word_default>
-      <word_custom>�е найден ID �тил�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_title</word_key>
-      <word_default>Comparison from skin set: </word_default>
-      <word_custom>Сравнение дл� �тил�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_entertitle</word_key>
-      <word_default>You must enter a title</word_default>
-      <word_custom>Вы должны вве�ти название</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_removed</word_key>
-      <word_default>Differences report removed</word_default>
-      <word_custom>Отчет об изменени�х удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sr_nomatches</word_key>
-      <word_default>No Matches Found!</word_default>
-      <word_custom>�е найдено ни одной запи�и, �оответ�твующей и�комой �троке. Попробуйте еще раз и ра�ширьте диапазон пои�ка. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_nosession</word_key>
-      <word_default>Could not get the current template compare session.</word_default>
-      <word_custom>�евозможно получить текущую �е��ию �равнени� шаблонов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>re_nav2</word_key>
-      <word_default>Manage Replacements in </word_default>
-      <word_custom>Редактировать макро�ы в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sr_sometext</word_key>
-      <word_default>You must enter some text to search by</word_default>
-      <word_custom>Вы не ввели значение дл� пои�ка. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>re_nav1</word_key>
-      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
-      <word_custom>Управление �тил�ми и шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_ex_skin_p</word_key>
-      <word_default>Export customizations in this skin and any parent skins</word_default>
-      <word_custom>Эк�портировать изменени� �того �тил� и родитель�ких</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_none</word_key>
-      <word_default> - None - </word_default>
-      <word_custom>�икакую</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_ex_skin</word_key>
-      <word_default>Export customizations in this skin only</word_default>
-      <word_custom>Эк�портировать изменени� только �того �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_set_upgraded</word_key>
-      <word_default><![CDATA[Set Upgraded<br />%s template(s) edited, %s replacement(s) edited, %s CSS file(s) edited.]]></word_default>
-      <word_custom><![CDATA[Стиль обновлен <br/>шаблонов добавлено: %s, заменено: %s, CSS файлов добавлено: %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_set_imported</word_key>
-      <word_default><![CDATA[Set Imported<br />%s template(s) added, %s replacement(s) added, %s CSS file(s) added.]]></word_default>
-      <word_custom><![CDATA[Стиль импортирован<br/>шаблонов добавлено: %s, заменено: %s, CSS файлов добавлено: %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_images_added</word_key>
-      <word_default>%s image(s) added</word_default>
-      <word_custom>Изображений добавлено: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_importfail</word_key>
-      <word_default>Import Failed: </word_default>
-      <word_custom>Ошибка импортировани�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_importfail_no</word_key>
-      <word_default>Import Failed: Nothing to import!</word_default>
-      <word_custom>Ошибка импортировани�: �ечего импортировать!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_replace_added</word_key>
-      <word_default>%s replacement(s) imported</word_default>
-      <word_custom>%s макро�ов импортировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cs_nav2</word_key>
-      <word_default>Manage CSS in </word_default>
-      <word_custom>Управление CSS в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_revertcomplete</word_key>
-      <word_default>Revert Complete</word_default>
-      <word_custom>Отмена завершена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cs_nav1</word_key>
-      <word_default><![CDATA[Manage Skin Sets &amp; Templates]]></word_default>
-      <word_custom>Управление �тил�ми и шаблонами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_button</word_key>
-      <word_default>Revert Customizations</word_default>
-      <word_custom>Отменить изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_replacements</word_key>
-      <word_default>replacement customizations</word_default>
-      <word_custom>изменений макро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_css</word_key>
-      <word_default>CSS customizations</word_default>
-      <word_custom>изменений CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_templates</word_key>
-      <word_default>template customizations</word_default>
-      <word_custom>изменений шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_desc</word_key>
-      <word_default>Please select which customizations to remove. The default template, CSS, and replacement items will be restored once the customizations have been removed. There is no undo.</word_default>
-      <word_custom>Выберите изменени� дл� удалени�. По�ле удалени� будут во��тановлены шаблоны и �тили по умолчанию. Это дей�твие нельз� отменить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_title</word_key>
-      <word_default>Reverting Customizations for:</word_default>
-      <word_custom>Отмена изменений дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_revert_customizations</word_key>
-      <word_default>Revert all CSS and Template Customizations...</word_default>
-      <word_custom>Отменить в�е изменени� CSS и шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_clean_caches_cb_tem</word_key>
-      <word_default>Template Files</word_default>
-      <word_custom>Файлы шаблона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_clean_caches_cb_css</word_key>
-      <word_default>CSS Files</word_default>
-      <word_custom>CSS файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_clean_caches</word_key>
-      <word_default>Clean File Caches For:</word_default>
-      <word_custom>Очи�тить кеш файлы: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cleanup_css_exp</word_key>
-      <word_default><![CDATA[This tool will remove any 'orphaned' or old CSS that are no longer required]]></word_default>
-      <word_custom>Ин�трумент позвол�ет очи�тить �и�тему от потер�нных и �тарых CSS, которые уже не и�пользуют��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cleanup_css</word_key>
-      <word_default>Clean Up CSS Database</word_default>
-      <word_custom>Очи�тка CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_cache_clean_desc</word_key>
-      <word_default>Result: %s css cache files removed, %s template cache files removed</word_default>
-      <word_custom>Результат: удалено %s кешей css, %s кешей шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_cache_clean_run</word_key>
-      <word_default>Cache File Cleanup Performed</word_default>
-      <word_custom>Очи�тка файлов кеша выполнена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_css_clean_desc</word_key>
-      <word_default>Result: %s cache entries removed, %s CSS entries removed</word_default>
-      <word_custom>Результат: удалено %s кешей и %s CSS </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_css_clean_run</word_key>
-      <word_default>CSS Database Cleanup Performed</word_default>
-      <word_custom>Очи�тка CSS выполнена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_template_clean_desc</word_key>
-      <word_default>Result: %s cache entries removed, %s template entries removed</word_default>
-      <word_custom>Результат: удалено %s кешей и %s шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tool_template_clean_run</word_key>
-      <word_default>Template Database Cleanup Performed</word_default>
-      <word_custom>Очи�тка шаблонов выполнена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templates_TEMPLATE_EXISTS</word_key>
-      <word_default>The template bit name already exists in this group.  Please give the template a different name.</word_default>
-      <word_custom>Шаблон � таким именем уже �уще�твует в данной группе.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templates_SYNTAX_INCORRECT</word_key>
-      <word_default>There is a syntax error in the template, usually caused by PHP code not properly formed.  Please correct the error and hit save again.</word_default>
-      <word_custom>В шаблоне обнаружена ошибка �интак�и�а. Проверьте правильно�ть �одержимого шаблона и попробуйте �охранить его �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templates_NO_SUCH_TEMPLATE</word_key>
-      <word_default>We could not find the template bit you were attempting to edit.  Reload the form and try again.</word_default>
-      <word_custom>Си�тема не �могла найти шаблон, который вы пытаете�ь изменить. Попробуйте обновить форму и попробовать �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cleanup_templates_exp</word_key>
-      <word_default><![CDATA[This tool will remove any 'orphaned' or old template bits that are no longer required]]></word_default>
-      <word_custom>Ин�трумент позвол�ет очи�тить базу от �тарых и потер�нных шаблонов, которые больше не и�пользуют�� в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cleanup_title</word_key>
-      <word_default>Clean Up Tools</word_default>
-      <word_custom>Ин�трументы очи�тки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_cleanup_templates</word_key>
-      <word_default>Clean Up Templates Database</word_default>
-      <word_custom>Очи�тка базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_run_tool</word_key>
-      <word_default>Run Tool</word_default>
-      <word_custom>Запу�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tt_ss_of</word_key>
-      <word_default>This is the default set for this output engine</word_default>
-      <word_custom>Этот �тиль отмечен, как о�новной, дл� данного формата вывода.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tt_ss_of_off</word_key>
-      <word_default>Click to make this set the default set for this output engine</word_default>
-      <word_custom>Отметить �тиль, как о�новной, дл� данного формата вывода. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_not_hidden</word_key>
-      <word_default>This set is NOT hidden from the public drop down. Click to hide</word_default>
-      <word_custom>Стиль отображает�� в �пи�ке �тилей. Скрыть его.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_defaultdone</word_key>
-      <word_default>Skin set made default</word_default>
-      <word_custom>Стиль отмечен как о�новной.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_hidden</word_key>
-      <word_default>This set is hidden from the public drop down. Click to make visible</word_default>
-      <word_custom>Стиль не отображает�� в �пи�ке �тилей. Сделать его видимым.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_hiddentoggled</word_key>
-      <word_default>Visibility toggled. Note: hiding from the public drop down still allows access via direct URL and via user agent mapping. To fully restrict access please edit the settings and restrict by member group.</word_default>
-      <word_custom>Видимо�ть переключена. Примечание: �крытие �тил� из �пи�ка не запрещает про�матривать форум в �том �тиле при указании ID �тил� в URL, он так же будет до�тупен и пользовател�м, попадающим под  user agent. Дл� полного запрета и�пользовани� �тил� необходимо изменить на�тройки пользователь�ких групп.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_canttoggle</word_key>
-      <word_default>You cannot toggle the visibility of a default skin</word_default>
-      <word_custom>Базовый �тиль не может быть �крыт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_minify</word_key>
-      <word_default>Compress Cached CSS?</word_default>
-      <word_custom>Сжимать кешированные CSS?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_minify_desc</word_key>
-      <word_default>This will remove whitespace and comments to reduce filesize. Changes will take affect next time you recache this skin.</word_default>
-      <word_custom>Будут удалены пробелы и комментарии дл� уменьшени� размера файла. Изменени� в�туп�т в �илу при �ледующем перекешировании �тил�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>none_root_set</word_key>
-      <word_default>None - Root Skin Set</word_default>
-      <word_custom>�икакой - Базовый �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_importexport</word_key>
-      <word_default>Skin Import/Export</word_default>
-      <word_custom>Импорт/Эк�порт �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>used_in_no_others</word_key>
-      <word_default> (Used in %s)</word_default>
-      <word_custom> (И�пользует�� в %s) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>used_in_plus_others</word_key>
-      <word_default> (Used in %s and %s other(s))</word_default>
-      <word_custom> (И�пользует�� в %s  и в %s других) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>reset_for</word_key>
-      <word_default>Reset For:</word_default>
-      <word_custom>Переу�тановить дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>uagent_mapping</word_key>
-      <word_default>User Agent Mapping</word_default>
-      <word_custom>Переназначение по User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sandr_search_results_for</word_key>
-      <word_default>Search Results For:</word_default>
-      <word_custom>Результаты пои�ка дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>export_inc_cal_etc</word_key>
-      <word_default>inc. Calendar, Chat and Portal apps</word_default>
-      <word_custom>в т.ч., Календарь, Чат и Портал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_for_apps</word_key>
-      <word_default>Include Templates For Applications:</word_default>
-      <word_custom>Включа� шаблоны дл� приложений: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_for_apps_desc</word_key>
-      <word_default><![CDATA[Please select which applications you'd like to include in your export]]></word_default>
-      <word_custom>Укажите приложени�, которые вы хотите включить в �к�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>diff_folder_error</word_key>
-      <word_default>Folder %s was missing or empty</word_default>
-      <word_custom>Директори� %s от�ут�твует или пу�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>diff_folder_path</word_key>
-      <word_default><![CDATA[<em>Or</em> enter the name of a folder (in root forum folder) that contains valid application template XML files]]></word_default>
-      <word_custom><![CDATA[<em>ИЛИ</em> введите им� директории (в корневой директории форума), �одержащей XML файлы шаблонов приложени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>addrep_btn_f_tpl</word_key>
-      <word_default>Add Replacement</word_default>
-      <word_custom>Добавить макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>rep_ctn_f_tpl</word_key>
-      <word_default>Replacement Content</word_default>
-      <word_custom>Содержимое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>add_repl_f_tpl</word_key>
-      <word_default>Add Replacement</word_default>
-      <word_custom>Добавить макро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>rep_key_f_tpl</word_key>
-      <word_default>Replacement Key</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_missing_data</word_key>
-      <word_default>Missing Data</word_default>
-      <word_custom>От�ут�твуют данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sd_exception</word_key>
-      <word_default>There was an error initiating the skin merge report.</word_default>
-      <word_custom>Возникла ошибка при подготовке отчета объединени� �тилей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>fatalnotemplsafe</word_key>
-      <word_default>Fatal! %scache/skin_cache not writeable - please change permissions via FTP or turn on Safe Mode</word_default>
-      <word_custom>%scache/skin_cache не до�тупен дл� запи�и, попробуйте изменить права до�тупа через FTP-клиент или включите безопа�ный режим �тилей в на�тройках форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templatefilenowrite</word_key>
-      <word_default>cache/skin_cache/cacheid_%s/%s.php not writeable - cannot cache to PHP file</word_default>
-      <word_custom>cache/skin_cache/cacheid_%s/%s.php не имеет прав на запи�ь - не удало�ь �оздать файл PHP кеша</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>fatalnotemplatew</word_key>
-      <word_default>Fatal! cannot create: cache/skin_cache/cacheid_%s/</word_default>
-      <word_custom>�е удало�ь �оздать cache/skin_cache/cacheid_%s/</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>safemodeenablednow</word_key>
-      <word_default>Safe Mode Enabled: Skipping Writing CSS Cache Files</word_default>
-      <word_custom>Включен режим безопа�но�ти �тилей: пропущено �оздание CSS кешей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>fatalnotwreite</word_key>
-      <word_default>Fatal! %s/style_css not writeable - please change permissions via FTP or turn on Safe Mode</word_default>
-      <word_custom> %s/style_css не до�тупен дл� запи�и, попробуйте изменить права до�тупа через FTP-клиент или включите безопа�ный режим �тилей в на�тройках форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cssfilenotwriteable</word_key>
-      <word_default>public/style_css/css_%s/%s.css not writeable</word_default>
-      <word_custom>public/style_css/css_%s/%s.css не до�тупен на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cssdirnotwritaaaable</word_key>
-      <word_default>public/style_css/css_%s/ not writeable</word_default>
-      <word_custom>public/style_css/css_%s/ не до�тупен на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>couldnotcreatecssdir</word_key>
-      <word_default>Fatal! cannot create: public/style_css/css_%s/</word_default>
-      <word_custom>�е удало�ь �оздать public/style_css/css_%s/</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>basicnothingtowritepre</word_key>
-      <word_default>Error: No content to write for </word_default>
-      <word_custom>Ошибка запи�и: от�ут�твует �одержимое дл� запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>basiccouldnotwrite</word_key>
-      <word_default>Error: Could not write </word_default>
-      <word_custom>Ошибка запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>basicwrittenpre</word_key>
-      <word_default>Wrote: </word_default>
-      <word_custom>Запи�ан: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cpltrebuildfromcaches</word_key>
-      <word_default>Completed database rebuild from PHP cache files.</word_default>
-      <word_custom>Кеш �тилей в базе обновлен из PHP файлов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>tplbitimported</word_key>
-      <word_default>%s imported (Added %s; updated %s template bits)</word_default>
-      <word_custom>%s импортирова (добавлено %s; обновлено %s шаблонов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>couldnotfindlineeol</word_key>
-      <word_default>Could not find any line endings in %s, skipping file...</word_default>
-      <word_custom>Похоже что файл %s пу�той, пропу�каем...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>couldnotopenfile</word_key>
-      <word_default>Could not open %s for reading, skipping file...</word_default>
-      <word_custom>�е удало�ь прочитать файл %s, пропу�каем...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>basicimportedpre</word_key>
-      <word_default>Imported </word_default>
-      <word_custom>Импортирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>finishedcachinghtml</word_key>
-      <word_default>Done HTML templates rebuild... (Skin Set: %s)</word_default>
-      <word_custom>Закончено обновление HTML шаблонов (Стиль: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templatescreatedmsg</word_key>
-      <word_default>Templates for %s - %s created</word_default>
-      <word_custom>Шаблон дл� %s - %s �оздан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>csscreatedmsg</word_key>
-      <word_default>CSS for %s - %s created</word_default>
-      <word_custom>CSS дл� %s - %s �оздан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>nothingtoexportfor</word_key>
-      <word_default>Nothing to export for </word_default>
-      <word_custom>�ет данных дл� �к�порта дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>css_isnotwritable</word_key>
-      <word_default> is not writeable</word_default>
-      <word_custom> не может быть запи�ан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>nogroupsforexportapp</word_key>
-      <word_default>Nothing to export for %s: No template bits</word_default>
-      <word_custom>�ет данных дл� �к�порта дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>nothingtoexportforapp</word_key>
-      <word_default>Nothing to export for %s: No groups set in information.xml</word_default>
-      <word_custom>�ет данных дл� �к�порта дл� %s, от�ут�твуют данные групп в information.xml</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>noreplacementstoexport</word_key>
-      <word_default>No replacements to export</word_default>
-      <word_custom>�ет макро�ов дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>nocsstoexport</word_key>
-      <word_default>No CSS to export for </word_default>
-      <word_custom>�ет CSS дл� �к�порта дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>couldnotlocate</word_key>
-      <word_default>Could not locate: </word_default>
-      <word_custom>�е удало�ь найти: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>xmldirnotwrite</word_key>
-      <word_default>/xml/ is not writeable</word_default>
-      <word_custom>/xml/ не имеет прав на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>importnothingtoimport</word_key>
-      <word_default>: Nothing to import</word_default>
-      <word_custom>: нет данных дл� импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>importaddupdate</word_key>
-      <word_default>%s: %s updated, %s added</word_default>
-      <word_custom>%s: %s обновлено, %s добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>noinfoxml</word_key>
-      <word_default>The info.xml file is empty or was not included</word_default>
-      <word_custom>info.xml пу�т или от�ут�вует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>imagedirnotexists</word_key>
-      <word_default>Image directory %s does not exist</word_default>
-      <word_custom>Директори� изображений %s не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>xmldirmissing</word_key>
-      <word_default>/xml/ does not exist</word_default>
-      <word_custom>/xml/ не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>imagediralreadyexists</word_key>
-      <word_default>The directory public/style_images/%s already exists</word_default>
-      <word_custom>Директори� public/style_images/%s уже �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>imagedircannotcreate</word_key>
-      <word_default>Could not create public/style_images/%s. Please check file permissions and try again.</word_default>
-      <word_custom>�е удало�ь �оздать public/style_images/%s. Пожалуй�та убедите�ь, что права до�тупа вы�тавленны правильно и повторите попытку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cannotwriteimageset</word_key>
-      <word_default>Could not write the image set to disk</word_default>
-      <word_custom>�е удало�ь запи�ать пакет изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_useimageset_info</word_key>
-      <word_default>If you have not yet uploaded the image set, leave on -None-.</word_default>
-      <word_custom>Е�ли вы не хотите �ейча� выбрать �то, выберите «�икакую».</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>emptyxmlarchivei</word_key>
-      <word_default>The XMLArchive is empty</word_default>
-      <word_custom>XML-архив пу�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>invalidxmlarchivei</word_key>
-      <word_default>The content was not a valid XMLArchive</word_default>
-      <word_custom>�е �вл�ет�� XML-архивом</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>appxmlrecachedfor</word_key>
-      <word_default>App XML Written For %s</word_default>
-      <word_custom>Запи�ан XML дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>appcssrecachedfor</word_key>
-      <word_default>App CSS Written For %s</word_default>
-      <word_custom>Запи�ан CSS дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cssrecached_for</word_key>
-      <word_default>CSS Recached for %s</word_default>
-      <word_custom>Кеш CSS обновлен дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>templatesrecached_for</word_key>
-      <word_default>PHP Templates Recached for %s</word_default>
-      <word_custom>Обновлены PHP кеши дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>aborted_suffix</word_key>
-      <word_default> ABORTED</word_default>
-      <word_custom>ОТМЕ�Е�О</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>replacerebuilt</word_key>
-      <word_default>Replacements Rebuilt</word_default>
-      <word_custom>Макро�ы обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>reprebuilt_for</word_key>
-      <word_default>Replacements Rebuilt for %s</word_default>
-      <word_custom>Макро�ы обновлены дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>htmlrebuilt_for</word_key>
-      <word_default>HTML Rebuilt for %s</word_default>
-      <word_custom>Обновление дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cssrebuilt_for</word_key>
-      <word_default>CSS Rebuilt for %s</word_default>
-      <word_custom>CSS обновлен дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>masterdircreatetitle</word_key>
-      <word_default>master_skin Directory Creation Results</word_default>
-      <word_custom>Результаты �оздани� master_skin директории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>cannotcreatemasterdir</word_key>
-      <word_default>Could not create directory: %scache/skin_cache/master_skin please create it via FTP and run the tool again</word_default>
-      <word_custom>�е удало�ь �оздать директорию: %scache/skin_cache/master_skin, попробуйте �оздать ее вручную, и�пользу� FTP клиент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_cssmlll</word_key>
-      <word_default>Merging CSS file changes</word_default>
-      <word_custom>Вне�ение изменений в CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>skindiff_okmsg</word_key>
-      <word_default>Items updated</word_default>
-      <word_custom>Элементы обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_tbmlll</word_key>
-      <word_default>Merging template bit changes</word_default>
-      <word_custom>Результаты объединени� шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_cssdprocess</word_key>
-      <word_default>%s of %s CSS files processed...</word_default>
-      <word_custom>%s из %s CSS файлов обработано...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_cssdlll</word_key>
-      <word_default>Checking for CSS file differences</word_default>
-      <word_custom>Проверка изменений в CSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_tbdprocess</word_key>
-      <word_default>%s of %s template bits processed...</word_default>
-      <word_custom>%s из %s шаблонов обработано...&#13;
-</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_invalidsession</word_key>
-      <word_default>Could not locate a valid differences session</word_default>
-      <word_custom>�е удало�ь найти �е��ию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_tbdlll</word_key>
-      <word_default>Checking for template bit differences</word_default>
-      <word_custom>Пои�к различий в шаблонах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_changescommitted</word_key>
-      <word_default>. Changes committed</word_default>
-      <word_custom>. Изменений применено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_noconflicts</word_key>
-      <word_default> no conflicts</word_default>
-      <word_custom> нет конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_mergeconflicts</word_key>
-      <word_default> merge conflicts</word_default>
-      <word_custom> конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_resolvedconflicts</word_key>
-      <word_default> resolved conflicts</word_default>
-      <word_custom> решенных конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_newitem4thisv</word_key>
-      <word_default>New item for this version</word_default>
-      <word_custom>�овый �лемент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_nosuchitemid</word_key>
-      <word_default>No such item ID</word_default>
-      <word_custom>�ет �лемента � таким ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ajax_nokeyfound</word_key>
-      <word_default>No Key Found</word_default>
-      <word_custom>�е найден ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>runnewreporton</word_key>
-      <word_default>Run a new report on:</word_default>
-      <word_custom>Запу�тить дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>nopreviouslystoredtemp</word_key>
-      <word_default>The merge tool is not available as you have no previously stored templates</word_default>
-      <word_custom>Ин�трумент объединени� не до�тупен, так как у ва� нет �тарых шаблонов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>minutepatience</word_key>
-      <word_default>Each step can take a few minutes, please be patient</word_default>
-      <word_custom>Каждый шаг может зан�ть не�колько минут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolve__go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolvealluncommit</word_key>
-      <word_default>Revert Changes</word_default>
-      <word_custom>Отменить изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolveallcommit</word_key>
-      <word_default>Save Changes To Skin</word_default>
-      <word_custom>Сохранить изменени� в �тиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolveallnewdefault</word_key>
-      <word_default>Auto Resolve: New Default Skin Wins</word_default>
-      <word_custom>�втоматиче�ки: приоритет оригинальным изменени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolveallcustom</word_key>
-      <word_default>Auto Resolve: Your Custom Skin Wins</word_default>
-      <word_custom>�втоматиче�ки: приоритет пользователь�ким изменени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergewithselected</word_key>
-      <word_default>With Selected:</word_default>
-      <word_custom>С выбранным: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>manuallyresolveconflict</word_key>
-      <word_default>Manually Edit/Resolve Conflicts...</word_default>
-      <word_custom>Разрешение конфликтов вручную</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>viewmergepreview</word_key>
-      <word_default>View Merge Preview...</word_default>
-      <word_custom>Предпро�мотр объединени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>menu__oldnew</word_key>
-      <word_default><![CDATA[(old default &gt; new default)]]></word_default>
-      <word_custom><![CDATA[(�тарые &gt; новые)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>menu__viewnewdef</word_key>
-      <word_default>View new default item</word_default>
-      <word_custom>Про�мотр нового</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>menu__viewcustomized</word_key>
-      <word_default>View customized item</word_default>
-      <word_custom>Про�мотр измененного</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>menu__vieworigdef</word_key>
-      <word_default>View original default item</word_default>
-      <word_custom>Про�мотр оригинального</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>changescommitted</word_key>
-      <word_default>. Changes committed</word_default>
-      <word_custom>Изменени� прин�ты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>noconflicts</word_key>
-      <word_default>no conflicts</word_default>
-      <word_custom> нет конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergeconflicts</word_key>
-      <word_default>merge conflicts</word_default>
-      <word_custom> объединить конфликты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolvedconflicts</word_key>
-      <word_default>resolved conflicts</word_default>
-      <word_custom> решенные конфликты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereportdiffs</word_key>
-      <word_default>%s differences</word_default>
-      <word_custom>%s различий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereportnoconflict</word_key>
-      <word_default>No conflicts</word_default>
-      <word_custom>�ет конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergenewitemversion</word_key>
-      <word_default>New item for this version</word_default>
-      <word_custom>�овое дл� �той вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereportconflicts</word_key>
-      <word_default>%s conflicts</word_default>
-      <word_custom>%s конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereportnewitem</word_key>
-      <word_default>New item</word_default>
-      <word_custom>�овое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereportdifferences</word_key>
-      <word_default>%s differences</word_default>
-      <word_custom>%s различий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolve__new</word_key>
-      <word_default>Resolve: New Wins</word_default>
-      <word_custom>Решить: приоритет новым изменени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>resolve__custom</word_key>
-      <word_default>Resolve: Custom Wins</word_default>
-      <word_custom>Решить: приоритет пользователь�ким изменени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge__showcommita</word_key>
-      <word_default>Committed</word_default>
-      <word_custom>Вне�ено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge__showcommit</word_key>
-      <word_default>Uncommitted</word_default>
-      <word_custom>�е вне�ено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge__showmerged</word_key>
-      <word_default>Merged</word_default>
-      <word_custom>Объединено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge__showconflict</word_key>
-      <word_default>Conflicted</word_default>
-      <word_custom>Конфликтует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge__showall</word_key>
-      <word_default>New/No Conflict</word_default>
-      <word_custom>�овое/Без конфликтов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergeexportprefix</word_key>
-      <word_default><![CDATA[[NEW] ]]></word_default>
-      <word_custom><![CDATA[[�ОВОЕ]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergerepoptions</word_key>
-      <word_default>Show...</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>mergereporttitle</word_key>
-      <word_default>Merge Report</word_default>
-      <word_custom>Отчет объединени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ss_keynogoodyo</word_key>
-      <word_default>You cannot use that Skin Key as it is already in use. Please select another.</word_default>
-      <word_custom>Вы не можете и�пользовать �тот ключ, так как он уже и�пользует�� другим �тилем. Пожалуй�та, выберите другой.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>importmastercss</word_key>
-      <word_default><![CDATA[IMPORT CSS from 'master' directory...]]></word_default>
-      <word_custom><![CDATA[Импортировать CSS из 'master' директории]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>exportmastercss</word_key>
-      <word_default><![CDATA[EXPORT CSS into 'master' directory...]]></word_default>
-      <word_custom><![CDATA[Эк�портировать CSS в 'master' директорию]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>importmastertempl</word_key>
-      <word_default><![CDATA[IMPORT Templates from 'master' directory...]]></word_default>
-      <word_custom><![CDATA[Импортровать шаблоны из 'master' директории]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>exportmastertempl</word_key>
-      <word_default><![CDATA[EXPORT Templates into 'master' directory...]]></word_default>
-      <word_custom><![CDATA[Эк�портировать шаблоны в 'master' директорию]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>runmergereports</word_key>
-      <word_default>Run Merge Report...</word_default>
-      <word_custom>Запу�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge_done_desc</word_key>
-      <word_default><![CDATA[<strong>All your templates have been saved and are now 'live' on your board</strong><div class='desctext'>You can optionally edit them further or uncommit ('revert') the changes by using the checkboxes and drop down box.</div>]]></word_default>
-      <word_custom><![CDATA[<strong>В�е ваши шаблоны �охранены и �ейча� отображают�� на 'живом' форуме</strong><div class='desctext'>При желании вы можете редактировать их дальше или отозвать (Обратить) �деланные изменени�, про�то про�тавив галочки напротив нужных и выбрать нужную операцию в выпадающем меню.</div>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge_uncommitted_desc</word_key>
-      <word_default><![CDATA[<strong>You have %s items with uncommitted ('unsaved') changes.</strong><div class='desctext'>This means that although the items are now merged, they need to be committed ('saved') before the changes will show on your board. Please use the checkboxes and drop down to commit these changes.</div>]]></word_default>
-      <word_custom><![CDATA[<strong>У ва� %s отозванных не�охраненных изменений.</strong><div class='desctext'>Хоть �лементы �ейча� и объединены, но они требуют �охранени� дл� того, чтобы они по�вили�ь на работающем форуме. Вы можете �делать �то про�то про�тавив галочки напротив нужных пунктов и выбрать нужную операцию в выпадающем меню.</div>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>merge_conflicts_desc</word_key>
-      <word_default><![CDATA[<strong>You have %s items with conflicts that need resolving.</strong><div class='desctext'>This means that the items could not be automatically 'merged'. You need to either edit them manually to 'resolve' the conflicts or use the 'resolve all' option to determine the final template.</div>]]></word_default>
-      <word_custom><![CDATA[<strong>У ва� %s конфликтов, требующих и�правлени�.</strong><div class='desctext'>Это означает, что �ти �лементы не могут быть автоматиче�ки объединены. Вам нужно или и�править конфликтные моменты вручную или и�пользовать опцию 'И�править в�е' дл� формировани� окончательного шаблона.</div>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>ie_importfail_old_version</word_key>
-      <word_default><![CDATA[Warning: The skin set you are attempting to import was created for <strong>IP.Board %s</strong>. You are currently running IP.Board %s.<br />You can continue but the skin may have errors or missing functionality.<br /><br /><a href='%s' class='button' />Continue and import skin</a>]]></word_default>
-      <word_custom><![CDATA[Внимание: �тиль, который вы пытаете�ь у�тановить предназначен дл� вер�ии <strong>IP.Board %s</strong>. Вы и�пользуете вер�ию %s.<br /> Данную операцию можно продолжить, однако возможны проблемы в работе �того �тил�.<br /><br /><a href='%s' class='button' />Продолжить</a>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_importimgset</word_key>
-      <word_default>Import Image Set</word_default>
-      <word_custom>Импорт изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_uploadimgxml</word_key>
-      <word_default>Upload XML(Archive) Image Set</word_default>
-      <word_custom>Загрузка XML-архива � изображени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_newimgsetname</word_key>
-      <word_default>New Image Set Name</word_default>
-      <word_custom>�азвание директории изображений:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_applytoskin</word_key>
-      <word_default>Apply To Skin Set</word_default>
-      <word_custom>Какой �тиль и�пользовать � импортируемой директорией?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_applytoskin_info</word_key>
-      <word_default>If you do not wish to assign to a skin set, leave on -None-.</word_default>
-      <word_custom>Е�ли вы не хотите �ейча� выбрать �то, выберите «�икакой».</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_none</word_key>
-      <word_default>None</word_default>
-      <word_custom>�икакой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_importreplacements</word_key>
-      <word_default>Import Replacements</word_default>
-      <word_custom>Импорт макро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_uploadxmlreplace</word_key>
-      <word_default>Upload XML Replacements Set</word_default>
-      <word_custom>Загрузка XML-архива � макро�ами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_upgrade</word_key>
+      <word_default>Upgrade existing skin?</word_default>
+      <word_custom>Обновить �уще�твующий �тиль?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -24989,19 +18969,20 @@
       <word_key>sk_exporttemplates</word_key>
       <word_default>Export Skin Templates</word_default>
       <word_custom>Эк�порт �тилей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_skinset</word_key>
-      <word_default>Skin Set</word_default>
-      <word_custom>Какой �тиль �к�портировать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_none</word_key>
+      <word_default>None</word_default>
+      <word_custom>�икакой</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_useimageset</word_key>
+      <word_default>Use Image Set</word_default>
+      <word_custom>Какую директорию � изображени�ми и�пользовать в �том �тиле?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -25009,19 +18990,62 @@
       <word_key>sk_imageset</word_key>
       <word_default>Image Set</word_default>
       <word_custom>Какие изображени� �к�портировать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_fromskinset</word_key>
-      <word_default>From Skin Set</word_default>
-      <word_custom>Какие макро�ы �к�портировать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_uploadxmlreplace</word_key>
+      <word_default>Upload XML Replacements Set</word_default>
+      <word_custom>Загрузка XML-архива � макро�ами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_importreplacements</word_key>
+      <word_default>Import Replacements</word_default>
+      <word_custom>Импорт макро�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_skinset</word_key>
+      <word_default>Skin Set</word_default>
+      <word_custom>Какой �тиль �к�портировать?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_applytoskin_info</word_key>
+      <word_default>If you do not wish to assign to a skin set, leave on -None-.</word_default>
+      <word_custom>Е�ли вы не хотите �ейча� выбрать �то, выберите «�икакой».</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_newimgsetname</word_key>
+      <word_default>New Image Set Name</word_default>
+      <word_custom>�азвание директории изображений:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_applytoskin</word_key>
+      <word_default>Apply To Skin Set</word_default>
+      <word_custom>Какой �тиль и�пользовать � импортируемой директорией?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_importimgset</word_key>
+      <word_default>Import Image Set</word_default>
+      <word_custom>Импорт изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_uploadimgxml</word_key>
+      <word_default>Upload XML(Archive) Image Set</word_default>
+      <word_custom>Загрузка XML-архива � изображени�ми</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -25029,19 +19053,20 @@
       <word_key>sk_exportimages</word_key>
       <word_default>Export Skin Images</word_default>
       <word_custom>Эк�порт изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_exportreplaces</word_key>
-      <word_default>Export Replacements</word_default>
-      <word_custom>Эк�порт макро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sk_useimageset_info</word_key>
+      <word_default>If you have not yet uploaded the image set, leave on -None-.</word_default>
+      <word_custom>Е�ли вы не хотите �ейча� выбрать �то, выберите «�икакую».</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_fromskinset</word_key>
+      <word_default>From Skin Set</word_default>
+      <word_custom>Какие макро�ы �к�портировать?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -25049,29 +19074,13 @@
       <word_key>sk_xs_info</word_key>
       <word_default>Please select which skin set (HTML templates, CSS and Replacements) you wish to export.</word_default>
       <word_custom>Пожалуй�та, выберите �тиль дл� �к�порта.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_templates</word_pack>
-      <word_key>sk_xs_info2</word_key>
-      <word_default>Please choose how deep this export should look for customizations.</word_default>
-      <word_custom>Опци� позвол�ет у�тановить глубину �к�порта изменений �тил�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_templates</word_pack>
-      <word_key>sk_xi_info</word_key>
-      <word_default>Image sets are exported into the XMLarchive format. This is not suitable for safemode users and in such a case we recommend you manually download via FTP and ZIP the images.</word_default>
-      <word_custom>Изображени� �кпортируют�� в формате XMLarchive. Этот метод не подходит, е�ли и�пользует�� безопа�ный режим PHP. Дл� таких �лучаев рекомендует�� �качать изображени� вручную через FTP.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>sk_exportreplaces</word_key>
+      <word_default>Export Replacements</word_default>
+      <word_custom>Эк�порт макро�ов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -25079,4271 +19088,552 @@
       <word_key>sk_xr_info</word_key>
       <word_default>Replacements are exported into XML format. This option may not work properly if your server has safemode enabled.</word_default>
       <word_custom><![CDATA[Будут �к�портированы как XML-архив.<br />Е�ли �ервер работает в безопа�ном режиме - �та опци� может работать некоректно.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_xi_info</word_key>
+      <word_default>Image sets are exported into the XML archive format. This is not suitable for safemode users and in such a case we recommend you manually download via FTP and ZIP the images.</word_default>
+      <word_custom>Изображени� �кпортируют�� в формате XMLarchive. Этот метод не подходит, е�ли и�пользует�� безопа�ный режим PHP. Дл� таких �лучаев рекомендует�� �качать изображени� вручную через FTP.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_templates</word_pack>
+      <word_key>sk_xs_info2</word_key>
+      <word_default>Please choose how deep this export should look for customizations.</word_default>
+      <word_custom>Опци� позвол�ет у�тановить глубину �к�порта изменений �тил�.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_not_on_desc</word_key>
-      <word_default><![CDATA[If you wish for your Question &amp; Answers to show, please click <a href='%s'>here</a> to switch the system on]]></word_default>
-      <word_custom><![CDATA[Дл� отображени� вопро�ов и ответов нажмите <a href='%s'>зде�ь</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>re_cp_avatars</word_key>
+      <word_default>Avatars</word_default>
+      <word_custom>�ватары</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_not_on_title</word_key>
-      <word_default><![CDATA[Warning: Question &amp; Answer not enabled]]></word_default>
-      <word_custom>Внимание: �и�тема вопро� и ответ не задей�твована</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>re_convertfromphotos</word_key>
+      <word_default>Convert From</word_default>
+      <word_custom>Конвертировать из</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_lifetime</word_key>
+      <word_default><![CDATA[<em>Never</em>]]></word_default>
+      <word_custom><![CDATA[<em>�икогда</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_edited</word_key>
-      <word_default>Edited a registration question</word_default>
-      <word_custom>Изменить вопро� дл� реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tools320photos</word_key>
+      <word_default>Up to %s photos converted so far (%s photos this cycle)</word_default>
+      <word_custom>%s фотографий уже �конвертировано (%s за цикл)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_form_answers</word_key>
-      <word_default>Valid answers.  One per line.</word_default>
-      <word_custom>Правильные ответы. Один на �троку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>re_photosconverted</word_key>
+      <word_default>All photos converted successfully</word_default>
+      <word_custom>В�е фотографии у�пешно �конвертированы.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_addlog</word_key>
-      <word_default>Added a registration question</word_default>
-      <word_custom>Добавить вопро� дл� реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>expires_prefix</word_key>
+      <word_default>Expires:</word_default>
+      <word_custom>И�текает:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_form_question</word_key>
-      <word_default>Question</word_default>
-      <word_custom>Вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>re_cp_photos</word_key>
+      <word_default>Profile Photos</word_default>
+      <word_custom>Фотографии профил�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_editbutton</word_key>
-      <word_default>Edit Question</word_default>
-      <word_custom>Изменить вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qa_form_answers_extra</word_key>
+      <word_default><![CDATA[Be sure to add multiple answers where different spellings may be acceptable, for example between American &amp; British English]]></word_default>
+      <word_custom>�е забудьте и�пользовать много различных правильных ответов в �луча�х, когда на разных �зыках правильные ответы могут немного отличать�� </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_addbutton</word_key>
-      <word_default>Add Question</word_default>
-      <word_custom>Добавить вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qastatus</word_key>
+      <word_default><![CDATA[Q&amp;A Status]]></word_default>
+      <word_custom>Стату� �и�темы «Вопро�-ответ»</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_none</word_key>
-      <word_default>There are no challenge questions created yet</word_default>
-      <word_custom>�ет �озданных вопро�ов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rebuild_furl_title</word_key>
+      <word_default>Rebuilds the friendly URL cache file from all apps</word_default>
+      <word_custom>Пере�троить кеш файл ЧПУ дл� в�ех приложений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_noeditid</word_key>
-      <word_default>We could not determine which question you were trying to edit.</word_default>
-      <word_custom>�евозможно определить вопро� дл� изменени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>settings_suffix</word_key>
+      <word_default>settings</word_default>
+      <word_custom>на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_404</word_key>
-      <word_default>We could not determine which question you were trying to edit.</word_default>
-      <word_custom>�евозможно определить вопро� дл� редактировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ipssoftware_license</word_key>
+      <word_default>IPS Software License</word_default>
+      <word_custom>Лицензи�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_current</word_key>
-      <word_default>Current Questions</word_default>
-      <word_custom>Текущие вопро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qahelp_infos</word_key>
+      <word_default>Question and Answer Challenges can help provide another line of defense against spam bots that attempt to register in your community. By setting some challenge questions unique to your site, general-purpose spam bots will find it more difficult to complete the registration process and in turn spam your community.</word_default>
+      <word_custom>Си�тема «Вопро�-ответ» предлагает другой тип защиты от �пам ботов, которые пытают�� реги�трировать�� в вашем �ообще�тве. Уникальный (не �и�темный) вручную заданный вопро� дл� реги�трирующего�� человека легок, но практиче�ки невозможен дл� �пам бота.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_edit</word_key>
-      <word_default>Edit...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qa_createonenow</word_key>
+      <word_default>Create one now</word_default>
+      <word_custom>Добавить первый</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_delete</word_key>
-      <word_default>Delete...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gcaches_no_data</word_key>
+      <word_default>There are no global caches active, there is no need to rebuild anything</word_default>
+      <word_custom>Глобальных кешей дл� пере�тройки нет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_addlink</word_key>
-      <word_default>Add New Question</word_default>
-      <word_custom>Добавить вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editloginmethod</word_key>
+      <word_default>Edit Log In Method </word_default>
+      <word_custom>Редактирование метода входа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_help_title</word_key>
-      <word_default>Registration Question and Answer Challenges</word_default>
-      <word_custom>Вопро�ы и ответы при реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gcaches_rebuild_cache</word_key>
+      <word_default>Rebuild Global Caches Cache</word_default>
+      <word_custom>Пере�троить только глобальные кеши</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_deleted</word_key>
-      <word_default>The question has been deleted.</word_default>
-      <word_custom>Вопро� удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rebuild_furl_link</word_key>
+      <word_default>Rebuild FURL Cache</word_default>
+      <word_custom>Пере�троить FURL кеш</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_noid</word_key>
-      <word_default>We could not determine which question you were trying to delete.</word_default>
-      <word_custom>�евозможно определить вопро� дл� удалени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gcaches_cache_rebuilt</word_key>
+      <word_default>Global Caches cache rebuilt</word_default>
+      <word_custom>Глобальные кеши пере�троены</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>postform_badmd5</word_key>
-      <word_default>Key did not match</word_default>
-      <word_custom>Ключ не �овпадает</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gcaches_cannot_write</word_key>
+      <word_default>Could not write to the cache file, please check permissions on /cache and /cache/globalCaches.php</word_default>
+      <word_custom>Си�тема не может произве�ти запи�ь в файл кешей, пожалуй�та, проверьте права на папку /cache/ и файл /cache/globalCaches.php</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_unknown</word_key>
-      <word_default>Unknown Group </word_default>
-      <word_custom>�еизве�тна� группа </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>removelicensekey</word_key>
+      <word_default>Remove License Key</word_default>
+      <word_custom>Удалить ключ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_nav2</word_key>
-      <word_default>Manage User Agents</word_default>
-      <word_custom>Управление User Agents</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_edit_title</word_key>
+      <word_default>Edit Share Link Service</word_default>
+      <word_custom>Изменить ��ылку публичного �ерви�а</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_nav1</word_key>
-      <word_default>Manage User Agent Groups</word_default>
-      <word_custom>Управление группами User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_new_button</word_key>
+      <word_default>Add Service</word_default>
+      <word_custom>Добавить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_savechanges</word_key>
+      <word_key>uaversions</word_key>
+      <word_default>Versions:</word_default>
+      <word_custom>Вер�ии:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>sl_form_new_title</word_key>
+      <word_default>Add New Share Link Service</word_default>
+      <word_custom>Добавление нового �ерви�а публикации ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>sl_form_edit_button</word_key>
       <word_default>Save Changes</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>UD не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_key</word_key>
+      <word_default>Key</word_default>
+      <word_custom>Ключ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_editua</word_key>
-      <word_default>Edit User Agent Group %s</word_default>
-      <word_custom>Изменение группы %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_main_title</word_key>
+      <word_default>Service Information</word_default>
+      <word_custom>Серви�на� информаци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>cache__posts</word_key>
-      <word_default> posts </word_default>
-      <word_custom> �ообщений </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_title</word_key>
+      <word_default>Link Service Name</word_default>
+      <word_custom>�азвание</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_addnewtitle</word_key>
-      <word_default>Add New User Agent Group</word_default>
-      <word_custom>�ова� группа User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_url</word_key>
+      <word_default>URL Format</word_default>
+      <word_custom>Формат ��ылки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ua_addnewbutton</word_key>
-      <word_default>Add New Group</word_default>
-      <word_custom>Добавить группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_url_info</word_key>
+      <word_default><![CDATA[Use '{title}' and '{url}' as replacements from the blog entry title and URL]]></word_default>
+      <word_custom><![CDATA[И�пользуйте '{title}' и '{url}' дл� под�тановки названи� запи�и блога и URL]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>cache__of</word_key>
-      <word_default> of </word_default>
-      <word_custom> из </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>served_data</word_key>
-      <word_default><![CDATA[Served: Raw %s and <strong>%s</strong> cached]]></word_default>
-      <word_custom><![CDATA[Обработано: запи�ей %s и <strong>%s</strong> закешировано]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>no_monitoring_data</word_key>
-      <word_default>No monitoring data available</word_default>
-      <word_custom>Мониторинг отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>c_title</word_key>
-      <word_default>Cache Management</word_default>
-      <word_custom>Управление кешем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>c_msg</word_key>
-      <word_default>You can check and rebuild your caches from this control panel.</word_default>
-      <word_custom>Вы можете проверить кеши или пере�троить их</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>c_processed</word_key>
-      <word_default> processed...</word_default>
-      <word_custom> продолжаем...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>c_recachethecachegetitgotitgood</word_key>
-      <word_default>Cache re-cached</word_default>
-      <word_custom>Кеш обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>c_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>export_group</word_key>
-      <word_default>Export this group</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>conf_desc_search</word_key>
-      <word_default>In Group: </word_default>
-      <word_custom>В группе: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>choose_to_export_single</word_key>
-      <word_default>Export Selected Settings</word_default>
-      <word_custom>Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>export_selected</word_key>
-      <word_default>EXPORT SELECTED</word_default>
-      <word_custom>ЭКСПОРТ ВЫБР���ЫХ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>choose_export</word_key>
-      <word_default>Choose settings to export</word_default>
-      <word_custom>Выберите на�тройки дл� �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>export_helptitle</word_key>
-      <word_default>Export Selected System Settings</word_default>
-      <word_custom>Эк�порт выбранных на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_global_dd</word_key>
-      <word_default>Global Settings</word_default>
-      <word_custom>Общие на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_createnewtitle</word_key>
-      <word_default>Create New Setting</word_default>
-      <word_custom>Создать новую на�тройку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_ishidden</word_key>
-      <word_default> (Hidden)</word_default>
-      <word_custom> (�крыта�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>setting_keywords</word_key>
-      <word_default>Setting Keywords</word_default>
-      <word_custom>Ключи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>setting_keywords_desc</word_key>
-      <word_default>You can enter keywords that will be searched when someone uses the ACP quick search to pull up this setting (space or comma separated)</word_default>
-      <word_custom>Вы можете вве�ти не�колько ключей (разделенных зап�той или пробелом) дл� бы�трого пои�ка на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_sometoexport</word_key>
-      <word_default>You must select SOME settings to export!</word_default>
-      <word_custom>�еобходимо выбрать 1 или более на�троек дл� �к�порта!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_revertedback</word_key>
-      <word_default>Configuration setting reverted back to default.</word_default>
-      <word_custom>�а�тройка �брошена на значение по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_deleted</word_key>
-      <word_default>Configuration Setting Deleted</word_default>
-      <word_custom>�а�тройка удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_edited2</word_key>
-      <word_default>Setting Edited</word_default>
-      <word_custom>�а�тройка отредактирована</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_added2</word_key>
-      <word_default>New Setting Added</word_default>
-      <word_custom>�а�тройка добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_updated</word_key>
-      <word_default>Settings updated</word_default>
-      <word_custom>�а�тройки обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_nofields</word_key>
-      <word_default>No fields were passed to be saved. Please try again.</word_default>
-      <word_custom>�ет полей дл� �охранени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_set4group</word_key>
-      <word_default>Settings for group: %s</word_default>
-      <word_custom>�а�тройки группы: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_revertback</word_key>
-      <word_default>Revert to default value</word_default>
-      <word_custom>Отменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_nomatches</word_key>
-      <word_default><![CDATA[Unfortunately your search for <strong>%s</strong> produced no matches. Please try another phrase.]]></word_default>
-      <word_custom><![CDATA[Пои�к по <strong>%s</strong> не дал результатов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_searchedfor</word_key>
-      <word_default>Searched for: %s</word_default>
-      <word_custom>Пои�к: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_nogroup</word_key>
-      <word_default>No group was passed. Please try again.</word_default>
-      <word_custom>Группа не найдена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_editor</word_key>
-      <word_default>Full Editor</word_default>
-      <word_custom>Ра�ширенный редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_multi</word_key>
-      <word_default>Multi-Select</word_default>
-      <word_custom>Мульти выбор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_name_autocomplete</word_key>
-      <word_default>Member Name Auto Complete Field</word_default>
-      <word_custom>Поле имени пользовател� � автодополнением</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_dropdown</word_key>
-      <word_default>Drop Down</word_default>
-      <word_custom>Выпадающее меню</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_yes_no</word_key>
-      <word_default>Yes/No Radio Buttons</word_default>
-      <word_custom>Кнопки Да/�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_textarea</word_key>
-      <word_default>Text Area</word_default>
-      <word_custom>Тек�т (не�колько �трок)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_input</word_key>
-      <word_default>Text Input</word_default>
-      <word_custom>Тек�т (одна �трока)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_edited</word_key>
-      <word_default>Setting Group Edited</word_default>
-      <word_custom>Группа на�троек отредактирована</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_added</word_key>
-      <word_default>New Setting Group Added</word_default>
-      <word_custom>Группа на�троек добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_title</word_key>
-      <word_default>Add New Setting Group</word_default>
-      <word_custom>Добавить группу на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_editsetting</word_key>
-      <word_default>Edit Setting %s</word_default>
-      <word_custom>Редактирование на�тройки %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_savechanges</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_nokeyword</word_key>
-      <word_default>You must enter a keyword for this group.</word_default>
-      <word_custom>Вы должны вве�ти ключевое �лово дл� �той группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_notitle</word_key>
-      <word_default>You must enter a title for this group.</word_default>
-      <word_custom>Вы должны вве�ти название группы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_recounted</word_key>
-      <word_default>Setting Group Recounted</word_default>
-      <word_custom>Группа на�троек пере�читана.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_createnew</word_key>
-      <word_default>Create New Setting Group</word_default>
-      <word_custom>Создать новую группу на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_remove</word_key>
-      <word_default>Setting Group Removed</word_default>
-      <word_custom>Группа на�троек удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_cantremove</word_key>
-      <word_default>You cannot remove this setting group as it still contains active settings. Please remove the settings inside it first.</word_default>
-      <word_custom>�евозможно удаить группу на�троек так как в ней е�ть активные на�тройки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_noneupdate</word_key>
-      <word_default>No settings to update.</word_default>
-      <word_custom>�ет на�троек дл� обновлени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_upandin</word_key>
-      <word_default>%s settings updated. %s settings inserted.</word_default>
-      <word_custom>%s на�троек обновлено. %s на�троек добавлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_nofile</word_key>
-      <word_default>No upload file was found or no filename was specified.</word_default>
-      <word_custom>Загруженный файл не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_noopen</word_key>
-      <word_default>Could not find the file to open at: %s</word_default>
-      <word_custom>�евозможно открыть файл: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_permissions</word_key>
-      <word_default><![CDATA[<strong>API Permissions</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Ограничени� API<strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_allowaccess</word_key>
-      <word_default>Allow access to</word_default>
-      <word_custom>Разрешить до�туп в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_missing_key_data</word_key>
-      <word_default>You must supply at least a title and key.</word_default>
-      <word_custom>Дл� отправки формы, как минимум, необходимо указать название и ключ.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>s_keyinuse_already</word_key>
-      <word_default>The setting key you selected is already in use.</word_default>
-      <word_custom>Ключ на�троек, выбранный вами, уже и�пользует�� в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_restrictip</word_key>
-      <word_default><![CDATA[<strong>API Restrict IP</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>API IP ограничение</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_restrictip_info</word_key>
-      <word_default><![CDATA[<strong>Optional</strong>: You may enter the IP Address of the server you only wish to grant access. This increases security and is recommended.]]></word_default>
-      <word_custom><![CDATA[<strong>Опционально</strong>: Вы можете вве�ти IP адре� �ервера. Рекомендует�� дл� повышени� безопа�но�ти.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_usertitle_info</word_key>
-      <word_default>The title is just a name for your records for easier identification.</word_default>
-      <word_custom>Заголовок дл� пользовател� дл� про�тоты запоминани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_userbasics</word_key>
-      <word_default><![CDATA[<strong>API User Basics</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>API пользователь</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_userkey</word_key>
-      <word_default><![CDATA[<strong>API User Key</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>API пользователь�кий ключ</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_key_info</word_key>
-      <word_default>This key is automatically generated and will be re-generated if you refresh this form.</word_default>
-      <word_custom>Этот ключ автоматиче�ки �оздает�� и перегенерирует�� при обновлении �той формы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_usertitle</word_key>
-      <word_default><![CDATA[<strong>API User Title</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>API заголовок пользовател�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_createone</word_key>
-      <word_default>Would you like to create one?</word_default>
-      <word_custom>Создать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_create</word_key>
-      <word_default>Create New API User...</word_default>
-      <word_custom>Создать нового API пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_edit</word_key>
-      <word_default>Edit API User...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_remove</word_key>
-      <word_default>Remove API User...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_nousers</word_key>
-      <word_default>There are no API users currently.</word_default>
-      <word_custom>�а текущий момент API пользователей нет.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_user</word_key>
-      <word_default>API User</word_default>
-      <word_custom>API пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_log</word_key>
-      <word_default>Log</word_default>
-      <word_custom>Запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_viewdetails</word_key>
-      <word_default>View Details</word_default>
-      <word_custom>Подробно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_users</word_key>
-      <word_default>XML-RPC API Users</word_default>
-      <word_custom>XML-RPC API пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_formdata</word_key>
-      <word_default><![CDATA[<strong>XML-RPC Data (Form Data)</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Данные XML-RPC (Данные формы)</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_requestlog</word_key>
-      <word_default>XML-RPC Request Log</word_default>
-      <word_custom>Журнал XML-RPC запро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_status</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_time</word_key>
-      <word_default>Time</word_default>
-      <word_custom>Врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_success</word_key>
-      <word_default>Success</word_default>
-      <word_custom>У�пешно�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_basics</word_key>
-      <word_default><![CDATA[<strong>Basics</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>О�новы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_key</word_key>
-      <word_default>API Key</word_default>
-      <word_custom>API ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_detail</word_key>
-      <word_default>XML-RPC Log Detail</word_default>
-      <word_custom>Журнал XML-RPC</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_msg4</word_key>
-      <word_default>You may create API users for use with the XML-RPC system which allows other applications to access IP.Board data</word_default>
-      <word_custom>Вы можете �оздавать API пользователей дл� и�пользовани� � XML-RPC �и�темой, котора� позвол�ет другим приложени�м и�пользовать данные из IP.Board.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_msg3</word_key>
-      <word_default><![CDATA[<strong>The XML-RPC system is not enabled!</strong><br />All API requests will fail. <a href='%s&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=xmlrpcapi'>Click here to enable it</a>]]></word_default>
-      <word_custom><![CDATA[<strong>XML-RPC �и�тема отключена</strong><br />API запро�ы не обрабатывают��. <a href='%s&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=xmlrpcapi'>Включить</a> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_savechanges</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_disabled</word_key>
-      <word_default>XML-RPC System Disabled</word_default>
-      <word_custom>XML-RPC �и�тема отключена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_msg2</word_key>
-      <word_default>You may create API users for use with the XML-RPC system which allows other applications to access IP.Board data</word_default>
-      <word_custom>Вы можете �оздавать API пользователей дл� и�пользовани� � XML-RPC �и�темой, котора� позвол�ет другим приложени�м и�пользовать данные из IP.Board.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_edited</word_key>
-      <word_default>API User Edited</word_default>
-      <word_custom>API пользователь изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_createnew</word_key>
-      <word_default>Create New API User</word_default>
-      <word_custom>Создать API пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_edituser</word_key>
-      <word_default>Edit API User: </word_default>
-      <word_custom>Редактирование API пользовател�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_added</word_key>
-      <word_default>API User Added</word_default>
-      <word_custom>API пользователь у�пешно добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_whatuser</word_key>
-      <word_default>Could not determine the user to remove.</word_default>
-      <word_custom>Пользователь дл� удалени� не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_user404</word_key>
-      <word_default>The API user could not be found.</word_default>
-      <word_custom>�евозможно найти API пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_removed</word_key>
-      <word_default>API User successfully removed.</word_default>
-      <word_custom>API пользователь у�пешно удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>a_entertitle</word_key>
+      <word_key>sl_must_title</word_key>
       <word_default>You must enter a title</word_default>
       <word_custom>Вы должны вве�ти название</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>a_noapikey</word_key>
-      <word_default>No API user key passed!</word_default>
-      <word_custom>Ключ API не найден!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_key_info</word_key>
+      <word_default><![CDATA[Unique key used to identify the php plugin file for this link method: /admin/sources/classes/share/plugins/KEY.php<br />It is also used as the icon file name: /public/style_extra/sharelinks/KEY.png]]></word_default>
+      <word_custom><![CDATA[Уникальный ключ и�пользует�� дл� идентификации файла дополнени� дл� данного �ерви�а публикации: /admin/sources/classes/share/plugins/KEY.php<br />� также и�пользует�� в имени файла иконки метода: /public/style_extra/sharelinks/KEY.png]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_rename_conf</word_key>
-      <word_default><![CDATA[Please rename each 'conf.dist.php' file in the following directories to 'conf.php':<br /><br /><ul><li>%s</li></ul>]]></word_default>
-      <word_custom><![CDATA[Переименуйте файл 'conf.dist.php' в �ледущей директории на 'conf.php':<br /><br /><ul><li>%s</li></ul>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_canonical</word_key>
+      <word_default>Use Canonical URL</word_default>
+      <word_custom>И�пользовать �тандартную ��ылку</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>a_lognoid</word_key>
-      <word_default>No log for that ID found.</word_default>
-      <word_custom>�е найдено запи�ей дл� �того ID.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_form_enabled</word_key>
+      <word_default>Enabled</word_default>
+      <word_custom>Включено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>a_title</word_key>
-      <word_default>XML-RPC API Logs</word_default>
-      <word_custom>Запи�и XML-RPC API</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_must_url</word_key>
+      <word_default>You must enter a URL format</word_default>
+      <word_custom>Вы должны вве�ти формат ��лыки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>a_msg</word_key>
-      <word_default><![CDATA[This page shows all the recorded XML-RPC requests.<br />The red cross indicates an error during the request and a green tick indicates a successful request.]]></word_default>
-      <word_custom><![CDATA[�а �транице отображены в�е запи�анные запро�ы XML-RPC<br />Кра�ный кре�т означает ошибку, а зелена� галочка говорит о том, что запро� прошел у�пешно.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_formerror</word_key>
+      <word_default>Form Error</word_default>
+      <word_custom>Ошибка формы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_moveto</word_key>
-      <word_default>We could not determine where you were trying to move the Log In method to.</word_default>
-      <word_custom>�евозможно определить куда был перемещен метод авторизации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_added</word_key>
+      <word_default><![CDATA[Share link service '%s' added]]></word_default>
+      <word_custom><![CDATA[Добавлен �ерви� публикации ��ылок '%s' ]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_yesinstalled</word_key>
-      <word_default>Log In method was successfully installed!</word_default>
-      <word_custom>Метод авторизации у�пешно у�тановлен в �и�тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_title</word_key>
+      <word_default>Incoming Email Rules</word_default>
+      <word_custom>Правила дл� вход�щих Email адре�ов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_already</word_key>
-      <word_default>The Log In method you requested to install is already installed.</word_default>
-      <word_custom>Метод авторизации уже у�тановлен в �и�теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_updated</word_key>
+      <word_default><![CDATA[Share link service '%s' updated]]></word_default>
+      <word_custom><![CDATA[Серви� '%s' изменен]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_uninstalled</word_key>
-      <word_default>Log In method was successfully uninstalled</word_default>
-      <word_custom>Модуль авторизации удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_removed</word_key>
+      <word_default>Share link service removed</word_default>
+      <word_custom>Серви� удален</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_installer404</word_key>
-      <word_default>We could not find the installer file for the Log In method you wish to install.</word_default>
-      <word_custom>�е удало�ь найти �крипт у�тановщика дл� у�танавливаемого метода авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_must_key</word_key>
+      <word_default>You must enter a key</word_default>
+      <word_custom>Вы должны вве�ти ключ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_disabled</word_key>
-      <word_default>disabled</word_default>
-      <word_custom>отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_add</word_key>
+      <word_default>Add Rule</word_default>
+      <word_custom>Добавить правило</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>l_installed</word_key>
-      <word_default>Installed Login Handlers</word_default>
-      <word_custom>У�тановленные модули авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_others</word_key>
-      <word_default>Other Available Login Handlers</word_default>
-      <word_custom>Дополнительные модули авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_successfully</word_key>
-      <word_default>Login In method was successfully </word_default>
-      <word_custom>Метод авторизации </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_enabled</word_key>
-      <word_default>enabled</word_default>
-      <word_custom>включен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_msg</word_key>
-      <word_default><![CDATA[This section will allow you to manage your log in authentication methods.  Login handlers are executed and handled, if they are enabled, in the order in which they are listed below.  You can chain together multiple login methods, or use an external data source for account authentication.<br />&nbsp;]]></word_default>
-      <word_custom><![CDATA[Зде�ь вы можете управл�ть модул�ми авторизации. Обработчики авторизации задей�твуют�� в так, как показаны ниже. Вы можете �в�зать вме�те не�колько методов авторизации или и�пользовать внешний и�точник данных.<br />&nbsp; ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_username_or_email</word_key>
-      <word_default>Username or Email Address</word_default>
-      <word_custom>Им� пользовател� или Email адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_nav</word_key>
-      <word_default>Manage Log In Authentication</word_default>
-      <word_custom>Управление модул�ми авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_title</word_key>
-      <word_default>Log In Authentication Manager</word_default>
-      <word_custom>Управление модул�ми авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_username</word_key>
-      <word_default>Username</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_registernew</word_key>
-      <word_default>Register New Log In Method</word_default>
-      <word_custom>Добавить метод авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_added</word_key>
-      <word_default>New Log In Method Added</word_default>
-      <word_custom>�овый метод авторизации добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_edited</word_key>
-      <word_default>Log In Method Edited</word_default>
-      <word_custom>Метод авторизации изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_confwrite</word_key>
-      <word_default>/conf.php must be writable - please CHMOD this file 0777</word_default>
-      <word_custom>/conf.php должен иметь права на запи�ь - пожалуй�та �делайте CHMOD 777 данному файлу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_confup</word_key>
-      <word_default>Configuration successfully updated for %s</word_default>
-      <word_custom>�а�тройки метода авторизации %s обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_form</word_key>
-      <word_default>You must complete the entire form.</word_default>
-      <word_custom>�еобходимо заполнить форму полно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_noconfig</word_key>
-      <word_default>This login method does not have any configuration options.</word_default>
-      <word_custom>Метод авторизации не �одержит опций дл� на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_noconfigfile</word_key>
-      <word_default>We could not find the configuration file.</word_default>
-      <word_custom>�е удало�ь найти конфигурационный файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>l_404</word_key>
-      <word_default>We could not find the login method you were attempting to configure, check, enable, uninstall, or edit. Please try again.</word_default>
-      <word_custom>�е удало�ь найти метод авторизации, который вы пытаете�ь на�троить, проверить, включить/отключить или изменить. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_aboutme</word_key>
-      <word_default>About Me Content</word_default>
-      <word_custom>Сведений О �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_rules</word_key>
-      <word_default>Forum Rules</word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_none</word_key>
-      <word_default>None</word_default>
-      <word_custom>�ичего</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_msgcount</word_key>
-      <word_default>Rebuild User Messenger Totals</word_default>
-      <word_custom>Пере�читать �ообщени� в личном �щике</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_msgcount_info</word_key>
-      <word_default>This will recount members total messages and folder counts</word_default>
-      <word_custom>Будут пере�читаны �ообщени� пользователей и �четчики папок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_sigs</word_key>
-      <word_default>Signatures</word_default>
-      <word_custom>Подпи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_announce</word_key>
-      <word_default>Announcements</word_default>
-      <word_custom>Объ�влений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_uphoto</word_key>
-      <word_default>Remove Orphaned Uploaded Photos</word_default>
-      <word_custom>Удалить потер�нные фотографии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_uphoto_info</word_key>
-      <word_default><![CDATA[This will check and remove all orphaned 'photo-' photographs not assigned to a member.<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Проверка и удаление 'photo-' файлов, не �в�занных ни � одним пользователем.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_events</word_key>
-      <word_default>Calendar Events</word_default>
-      <word_custom>Событий календар�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_pms</word_key>
-      <word_default>Private Messages</word_default>
-      <word_custom>Личных �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_av_info</word_key>
-      <word_default><![CDATA[This will check and remove all orphaned 'av-' avatars not assigned to a member.<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Проверка и удаление потер�нных 'av-' файлов, не �в�занных ни � одним пользователем.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>remenu_posts</word_key>
-      <word_default>Post Content</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_av</word_key>
-      <word_default>Remove Orphaned Uploaded Avatars</word_default>
-      <word_custom>Удалить потер�нные аватары</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_orph_info</word_key>
-      <word_default><![CDATA[This will check and remove all orphaned 'post-' attachments not assigned to a post.<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Проверка и удаление потер�ных 'post-' файлов, не �в�занных ни � одним �ообщением.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_data_info</word_key>
-      <word_default><![CDATA[This will rebuild all your attachment data such as filesize, location and file extension<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Обновление информации обо в�ех прикрепленных файлов.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_orph</word_key>
-      <word_default>Remove Orphaned Attachments</word_default>
-      <word_custom>Удалить потер�нные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_data</word_key>
-      <word_default>Rebuild Attachment Data</word_default>
-      <word_custom>Обновить информацию о прикрепленных файлах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_thumb_info</word_key>
-      <word_default><![CDATA[This will rebuild all your attachment image thumbnails to the current size. This is useful if you've recently changed the thumbnail size and wish to update all current attachments<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Обновление размера изображений предпро�мотра прикрепленных изображений. И�пользуйте, е�ли недавно мен�ли на�тройки размера изображений предпро�мотра и хотите обновить �уще�твующие изображени�.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_thumb</word_key>
-      <word_default>Rebuild Attachment Thumbnails</word_default>
-      <word_custom>Обновить изображени� предпро�мотра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_pphoto_info</word_key>
-      <word_default><![CDATA[This will rebuild all your profile image thumbnails to the current size. This is useful if you've recently changed the thumbnail size and wish to update all current photos<br />This is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Обновление размера изображение предпро�мотра в профиле. И�пользуйте, е�ли недавно изменили на�тройки размера изображений.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_pphoto</word_key>
-      <word_default>Rebuild Profile Photo Thumbnails</word_default>
-      <word_custom>Обновить фотографии пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_count_info</word_key>
-      <word_default><![CDATA[This will recount members posts based on CURRENT posts from the database. This will almost certainly REDUCE the post counts for your members as deleted and pruned posts will no longer be counted. This should not be used if you wish to retain your member's current post counts.<br /><strong>THERE IS NO UNDO!</strong>]]></word_default>
-      <word_custom><![CDATA[Пере�чет �ообщений пользователей. В большин�тве �лучаев �то приводит к уменьшению количе�тва �ообщений. �е �ледует и�пользовать �тот ин�трумент, е�ли вы хотите �охранить текущее количе�тво �ообщений. <strong>ЭТО ДЕЙСТВИЕ �ЕЛЬЗЯ ОТМЕ�ИТЬ!</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_user</word_key>
-      <word_default>Rebuild User Names</word_default>
-      <word_custom>Обновление имен пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_user_info</word_key>
-      <word_default><![CDATA[This will reset the saved usernames in posts, topics, logs, etc. Useful if you've recently converted or manually changed member's names.]]></word_default>
-      <word_custom>Обновление �охраненных имен пользователей в �ообщени�х, темах, журналах и т.д. Полезно, е�ли вы недавно вручную мен�ли имена пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_count</word_key>
-      <word_default>Rebuild User Post Counts</word_default>
-      <word_custom>Обновление �четчиков пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_seouser</word_key>
-      <word_default><![CDATA[Rebuild Users' SEO Names]]></word_default>
-      <word_custom>Обновление SEO имен пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_seouser_info</word_key>
-      <word_default>This will reset the SEO display name for all members</word_default>
-      <word_custom>Ин�трумент �бра�ывает в�е SEO имена пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_rebuildbutton</word_key>
-      <word_default>Rebuild Content</word_default>
-      <word_custom>Пере�троение контента</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_rebuild_info</word_key>
-      <word_default>This will rebuild the submitted content including BBCode, custom bbcode, HTML (where allowed) and emoticons. This is only necessary upon upgrading to IP.Board 3.0, and does not need to be run more than once.</word_default>
-      <word_custom>Ин�трумент обновл�ет �одержимое в�его контента. О�уще�твл�ет�� пере�тройка оформлени� BB-кодов, HTML, �майликов внутри контента. Данный ин�трумент нужено запу�тить только единожды - по�ле обновлени� до IP.Board 3.0</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_topics_info</word_key>
-      <word_default>This will recount replies, attachment count and the topic starter and last poster for all your topics.</word_default>
-      <word_custom>Ин�трумент позвол�ет обновить �четчики, а так же информацию о по�леднем авторе дл� в�ех ваших тем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_rebuild</word_key>
-      <word_default><![CDATA[Rebuild Content [Posts, Calendar Entries, Private Messages, Announcements, Signatures, etc.]]]></word_default>
-      <word_custom><![CDATA[Пере�троение контента [�ообщений, календарей, личных �ообщений, подпи�ей и т.п]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_topics</word_key>
-      <word_default>Resynchronize Topics</word_default>
-      <word_custom>Синхронизаци� тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_s_most</word_key>
-      <word_default><![CDATA[Reset 'Most online' statistic?]]></word_default>
-      <word_custom>Сбро�ить информацию о рекорде по�ещаемо�ти?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_forums_info</word_key>
-      <word_default>This will recount replies, views, and the topic starter and last poster for all your forums.</word_default>
-      <word_custom>Ин�трумент позвол�ет обновить �четчики, а так же информацию о по�ледней теме и авторе дл� в�ех ваших форумов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_forums</word_key>
-      <word_default>Resynchronize Forums</word_default>
-      <word_custom>Синхронизаци� форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_s_last</word_key>
-      <word_default>Reset last registered member</word_default>
-      <word_custom>Сбро�ить информацию о по�леднем зареги�трированном пользователе?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_stats</word_key>
-      <word_default>Recount Statistics</word_default>
-      <word_custom>Пере�чет �тати�тики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_s_total</word_key>
-      <word_default>Recount total topics and posts</word_default>
-      <word_custom>Пере�читать количе�тво тем и �ообщений?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_s_members</word_key>
-      <word_default>Recount Members</word_default>
-      <word_custom>Пере�читать количе�тво пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_percycle</word_key>
-      <word_default>Per Cycle</word_default>
-      <word_custom>за цикл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_ban_info</word_key>
-      <word_default><![CDATA[After an upgrade from a previous version, you may find that your ban settings are no longer stored.<br />Running this tool attempts to import your old ban settings. Old entries will not overwrite new entries.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет во��тановить фильтры бана, которые могли быть потер�ны в результате обновлени� � 1.х.х. При во��тановлении, новые на�тройки не удал�ют��.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_ban</word_key>
-      <word_default><![CDATA[Find & Restore old IPB Ban Settings]]></word_default>
-      <word_custom>Во��тановление бан фильтров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_converge_info</word_key>
-      <word_default><![CDATA[After an upgrade from a previous version or import from another board software, you may find that because several of your members have used duplicate email addresses, their account has been moved into the validating group.<br />This tool finds these members and restores them into the default member group and asks them to change their email address.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет найти пользователей, чь� учетна� запи�ь �одержит дублирующий e-mail адре�, а аккаунт переведен в группу ожидающих активации. Такое может произойти в результате обновлени� или же конвертации форума � другой форумной �и�темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_converge</word_key>
-      <word_default><![CDATA[Find & Restore 'Converged' Members]]></word_default>
-      <word_custom>Пои�к и во��тановление пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_dupe1_info</word_key>
-      <word_default><![CDATA[After an upgrade from a previous version or import from another board software, you may find that due to running an upgrade tool twice or a time-out you'll end up with some duplicate tools in the System Settings.<br />This tool finds the duplicates which have a greater ID than the original.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет очи�тить на�тройки форума от дубликатов, которые могут возникнуть в результате конвертации форума � другой форумной �и�темы или при обновлении форума � вер�ии 1.х.х.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_dupe1</word_key>
-      <word_default>Remove Duplicate System Settings from IPB 2.0.x</word_default>
-      <word_custom>Удаление повтор�ющих�� на�троек в 2.0.x</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_polls_info</word_key>
-      <word_default><![CDATA[This tool converts IPB 2.0.x polls to the new format. Use this tool after a manual upgrade or when some polls didn't convert.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет преобразовать опро�ы �озданные в вер�ии 2.0.х в новый формат, и�пользуемый в вер�ии 2.1.х. И�пользуйте данный ин�трумент по�ле ручного обновлени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_polls</word_key>
-      <word_default>Convert 2.0.x Polls to 2.1.x Format</word_default>
-      <word_custom>Конвертаци� опро�ов 2.0.х в формат вер�ии 2.1.х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_events_info</word_key>
-      <word_default><![CDATA[This tool converts IPB 2.0.x calendar events to the new format. Use this tool after a manual upgrade or when some calendar events didn't convert.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет преобразовать �обыти� календар� �озданные в вер�ии 2.0.х в новый формат, и�пользуемый в вер�ии 2.1.х. И�пользуйте данный ин�трумент по�ле ручного обновлени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_1xto20_info</word_key>
-      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 1.x.x series</word_default>
-      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 1.x.x</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_dupe2</word_key>
-      <word_default>Remove Duplicate System Setting Groups from IPB 2.1.x</word_default>
-      <word_custom>Удаление повтор�ющих�� на�троек в 2.1.х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_dupe2_info</word_key>
-      <word_default><![CDATA[After an upgrade from IPB 2.0.x or import from another board software, you may find that due to running an upgrade tool twice or a time-out you'll end up with some duplicate tool groups in the System Settings.]]></word_default>
-      <word_custom>Ин�трумент позвол�ет очи�тить на�тройки форума от дубликатов, которые могут возникнуть при обновлении форума � вер�ии 2.0.х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_events</word_key>
-      <word_default>Convert 2.0.x Calendar Events to 2.1.x Format</word_default>
-      <word_custom>Конвертаци� �обытий календар� 2.0.х в формат вер�ии 2.1.х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_20to21_info</word_key>
-      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 2.0.x series</word_default>
-      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 2.0.x</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_21to22_info</word_key>
-      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 2.1.x series</word_default>
-      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 2.1.x</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_21to22</word_key>
-      <word_default><![CDATA[IP.Board 2.1.x -> 2.2.0 Upgrade Tools]]></word_default>
-      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 2.1.x -> 2.2.0]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_20to21</word_key>
-      <word_default><![CDATA[IP.Board 2.0.x -> 2.1.0 Upgrade Tools]]></word_default>
-      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 2.0.x -> 2.1.0]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_1xto20</word_key>
-      <word_default><![CDATA[IP.Board 1.x.x -> 2.0.0 Upgrade Tools]]></word_default>
-      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 1.x.x -> 2.0.0]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_230to300</word_key>
-      <word_default><![CDATA[IP.Board 2.3.x -> 3.0.x Upgrade Tools]]></word_default>
-      <word_custom><![CDATA[Си�тема обновлени� IP.Board 2.3.x -> 3.0.x]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_runtool</word_key>
-      <word_default><![CDATA[ RUN TOOL &gt;&gt;]]></word_default>
-      <word_custom><![CDATA[Запу�тить &gt;&gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_processed</word_key>
-      <word_default>Processed topic </word_default>
-      <word_custom>Обработана тема </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_title</word_key>
-      <word_default><![CDATA[Recount & Rebuild Manager]]></word_default>
-      <word_custom>Ин�трументы пере�чета и обновлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_pmsconverted</word_key>
-      <word_default>All PMs converted</word_default>
-      <word_custom>В�е личные �ообщени� у�пешно конвертированы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_msgsconverted</word_key>
-      <word_default>PMs have already been converted. No action required</word_default>
-      <word_custom>Личные �ообщени� уже �конвертированы, никакие дей�тви� не требуют��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_300pms</word_key>
-      <word_default>Convert 2.x PMs To 3.0.x Format</word_default>
-      <word_custom>Конвертировать личные �ообщени� из 2.x в формат 3.0.x</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_300pms_info</word_key>
-      <word_default>If you chose to skip PM conversion during the upgrade and cannot run the shell tool, then please run this tool</word_default>
-      <word_custom><![CDATA[Е�ли вы выбрали "пропу�тить конвертирование личных �ообщений" во врем� обновлени� и не можете запу�тить shell �крипт, пожалуй�та, запу�тите �ледующую утилиту:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_noresizefound</word_key>
-      <word_default>Could not find file to resize: </word_default>
-      <word_custom>�евозможно найти файл: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_resized</word_key>
-      <word_default>Resized: </word_default>
-      <word_custom>Изменен размер: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_noremove</word_key>
-      <word_default>Could not remove: </word_default>
-      <word_custom>�евозможно удалить: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_thisgoeshere</word_key>
-      <word_default><![CDATA[<strong>Up to %s processed so far, continuing...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Обработано %s. Продолжаем...</strong>
-	
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_rebuildcomp</word_key>
-      <word_default><![CDATA[<strong>Rebuild completed</strong><br />]]></word_default>
-      <word_custom><![CDATA[<strong>Обновление завершено</strong><br />  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_attachedok</word_key>
-      <word_default>Attached file OK:</word_default>
-      <word_custom>Прикрепленный файл:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_removedorph</word_key>
-      <word_default>Removed orphan:</word_default>
-      <word_custom>Удален:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_statsrecount</word_key>
-      <word_default>Statistics Recounted</word_default>
-      <word_custom>Стати�тика пере�читана</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_statscenter</word_key>
-      <word_default>Recount Statistics Section</word_default>
-      <word_custom>Раздел пере�чета �тати�тики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_nothing</word_key>
-      <word_default>Nothing to recount!</word_default>
-      <word_custom>�ичего не выбрано дл� пере�чета!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_pollstartto</word_key>
-      <word_default><![CDATA[<strong>Polls: %s to %s of %s completed...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Опро�ы: � %s по %s из %s завершено</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_pollconverted</word_key>
-      <word_default><![CDATA[<strong>Polls converted</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Опро�ы �конвертированы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_calalready</word_key>
-      <word_default>Calendar events already converted.</word_default>
-      <word_custom>Календарные �обыти� уже конвертированы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_calstartto</word_key>
-      <word_default><![CDATA[<strong>Calendar events: %s to %s completed...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Календарные �обыти�: c %s по %s завершено.</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_calconverted</word_key>
-      <word_default><![CDATA[<strong>Calendar events converted</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Событи� календар� �конвертированы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_calremoved</word_key>
-      <word_default>You cannot run this tool as the old calendar_events table has been removed.</word_default>
-      <word_custom>Запу�к ин�трумента невозможен, так как таблица calendar_events была удалена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_keepingid</word_key>
-      <word_default>KEEPING: %s ID %s</word_default>
-      <word_custom>Сохранение: %s ID %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_duplicatetitle</word_key>
-      <word_default><![CDATA[%s duplicate settng titles deleted<br />%s]]></word_default>
-      <word_custom><![CDATA[%s дубликатов на�троек удалено<br />%s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_deletingid</word_key>
-      <word_default>Deleting: %s ID %s</word_default>
-      <word_custom>Удаление: %s ID %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_deletetitle</word_key>
-      <word_default>%s duplicate setting titles deletes and %s duplicate settings deleted.</word_default>
-      <word_custom>Удалено повтор�ющих�� названий: %s, повтор�ющих�� на�троек: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>re_convergerest</word_key>
-      <word_default>%s members found and restored.</word_default>
-      <word_custom>%s пользователей во��тановлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_export</word_key>
-      <word_default>Export XML into App Dirs</word_default>
-      <word_custom>Эк�портировать XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_current</word_key>
-      <word_default>Current Help Files</word_default>
-      <word_custom>Разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_ftitle</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_edit</word_key>
-      <word_default>Edit</word_default>
+      <word_key>ie_edit</word_key>
+      <word_default>Edit Rule</word_default>
       <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_cf_to</word_key>
+      <word_default>Destination Email</word_default>
+      <word_custom>�дре�ат</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_addnew</word_key>
-      <word_default>Add New Help File</word_default>
-      <word_custom>Добавить раздел помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_cf_from</word_key>
+      <word_default>Sender Email</word_default>
+      <word_custom>И�ход�щий e-mail</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>re_bansimport</word_key>
-      <word_default>%s IP address(es) imported, %s email address(es) imported, %s name(s) imported.</word_default>
-      <word_custom>%s IP-адре�ов импортировано, %s адре�ов e-mail импортировано, %s имен импортировано.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_not_found</word_key>
+      <word_default>Could not locate the rule you are trying to edit.</word_default>
+      <word_custom>�е найдено правило дл� изменени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_fileapp</word_key>
-      <word_default>Help File Application</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_none</word_key>
+      <word_default>No rules to show</word_default>
+      <word_custom>�ет правил дл� отображени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_filetext</word_key>
-      <word_default>Help File Text</word_default>
-      <word_custom>Тек�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_criteria</word_key>
+      <word_default>Criteria</word_default>
+      <word_custom>Критерий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_imported</word_key>
-      <word_default>XML Files Imported</word_default>
-      <word_custom>Файлы XML импортированы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_action</word_key>
+      <word_default>Action</word_default>
+      <word_custom>Дей�твие</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_import_added</word_key>
-      <word_default>App: %s - %s added, %s updated help files inserted</word_default>
-      <word_custom>Приложение: %s - %s добавлено, %s обновленных файлов помощи добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_cf_body</word_key>
+      <word_default>Body</word_default>
+      <word_custom>Сообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_exported</word_key>
-      <word_default>Help Files Exported as XML</word_default>
-      <word_custom>Файлы помощи �к�портированы в XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_cf_sbjt</word_key>
+      <word_default>Subject</word_default>
+      <word_custom>Тема</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_filetitle</word_key>
-      <word_default>Help File Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_ct_eqls</word_key>
+      <word_default>Equals</word_default>
+      <word_custom>Совпадение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_filedesc</word_key>
-      <word_default>Help File Description</word_default>
-      <word_custom>Краткое опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_ct_ctns</word_key>
+      <word_default>Contains</word_default>
+      <word_custom>Содержимое</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_title</word_key>
-      <word_default>Help File Management</word_default>
-      <word_custom>Управление разделами помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_ct_regx</word_key>
+      <word_default>Matches Regular Expression</word_default>
+      <word_custom>Удовлетвор�ет регул�рному выражению</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_addlog</word_key>
-      <word_default>Added a help file</word_default>
-      <word_custom>Добавлен файл помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_ignore</word_key>
+      <word_default>Ignore Message</word_default>
+      <word_custom>Игнорируемые �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_import</word_key>
-      <word_default>Import App XML Files</word_default>
-      <word_custom>Импортировать XML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_rule</word_key>
+      <word_default>Rule</word_default>
+      <word_custom>Правило</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>h_editbutton</word_key>
-      <word_default>Edit this Help File</word_default>
-      <word_custom>Изменить раздел помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_addbutton</word_key>
-      <word_default>Add this Help File</word_default>
-      <word_custom>Добавить �тот файл помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_404</word_key>
-      <word_default>We could not find that help file in the database. Please try again.</word_default>
-      <word_custom>Файл помощи не найден в базе данных.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_entertitle</word_key>
-      <word_default>You must enter a title. Please try again.</word_default>
-      <word_custom>�еобходимо вве�ти название.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_added</word_key>
-      <word_default>Added a help file</word_default>
-      <word_custom>Файл помощи добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_edited</word_key>
-      <word_default>Edited help files </word_default>
-      <word_custom>Измененные файлы помощи </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_removed</word_key>
-      <word_default>Removed a help file</word_default>
-      <word_custom>Файл помощи удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>h_noid</word_key>
-      <word_default>You must pass a valid ID. Please try again.</word_default>
-      <word_custom>ID не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ua_rebuild_master</word_key>
-      <word_default>Rebuild Default User Agents</word_default>
-      <word_custom>Обновить �тандартные User Agents</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_uninstall</word_key>
-      <word_default>Uninstall...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_import</word_key>
-      <word_default>Import</word_default>
-      <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_configdetails</word_key>
-      <word_default>Configure Details...</word_default>
-      <word_custom>�а�троить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_export</word_key>
-      <word_default>Export...</word_default>
-      <word_custom>Эк�портировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_disable</word_key>
-      <word_default>Disable</word_default>
-      <word_custom>Отключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_enable</word_key>
-      <word_default>Enable</word_default>
-      <word_custom>Включить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_nomethods</word_key>
-      <word_default>There are no %s login methods available</word_default>
-      <word_custom>�ет %s  до�тупных методов авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html3</word_key>
-      <word_default><![CDATA[<strong>Log In HTML Replace Form</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>HTML код формы дл� замены</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html3_info</word_key>
-      <word_default><![CDATA[If 'yes' the above HTML will replace the log in form. If 'no' it will be added alongside the log in form.]]></word_default>
-      <word_custom><![CDATA[Е�ли 'Да', то введенный выше HTML заменит форму входа, иначе код будет добавлен к �тандартной форме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html2_info</word_key>
-      <word_default>Enter the HTML to add or replace the ACP log in form.</word_default>
-      <word_custom>Введите HTML код дл� замены формы авторизации �дминцентра или дл� добавление к ней.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html2</word_key>
-      <word_default><![CDATA[<strong>ACP Log In Form HTML</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>HTML код формы �дминцентра дл� замены</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html_info</word_key>
-      <word_default>Enter the HTML to add or replace the log in form.</word_default>
-      <word_custom>Введите HTML код дл� замены формы авторизации или дл� добавление к ней.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_type</word_key>
-      <word_default><![CDATA[<strong>Login Type</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тип</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_l_html</word_key>
-      <word_default><![CDATA[<strong>Log In Form HTML</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>HTML код формы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_configdetails</word_key>
-      <word_default>Configuration Details for</word_default>
-      <word_custom>Детали на�троек дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uacapture_desc</word_key>
-      <word_default>(If yes, enter the parenthesis # you wish to capture)</word_default>
-      <word_custom>(е�ли необходимо получать вер�ию агента, введите номер группы regex, в который �охран�ет�� вер�и�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaregex</word_key>
-      <word_default>Regex:</word_default>
-      <word_custom>Регул�рное выражение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uacapture</word_key>
-      <word_default>Regex Capture Version Number?</word_default>
-      <word_custom>Вер�и� User Agent в Regex</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaother</word_key>
-      <word_default>Other</word_default>
-      <word_custom>Иное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_position</word_key>
-      <word_default>User Agent Position:</word_default>
-      <word_custom>Позици�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uasearchengine</word_key>
-      <word_default>Search Engine</word_default>
-      <word_custom>Пои�ковик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uabrowser</word_key>
-      <word_default>Web Browser</word_default>
-      <word_custom>Веб-браузер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uakey_desc</word_key>
-      <word_default>(Alphanumerics and underscore only; Example: firefox)</word_default>
-      <word_custom><![CDATA[(Только цифры, буквы и знак '_'; �апример: Firefox)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uatype</word_key>
-      <word_default>User Agent Type:</word_default>
-      <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uakey</word_key>
-      <word_default>User Agent Key:</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_editing</word_key>
-      <word_default>Editing:</word_default>
-      <word_custom>Редактирование:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaname</word_key>
-      <word_default>User Agent Name:</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaname_desc</word_key>
-      <word_default>(Example: Firefox)</word_default>
-      <word_custom>(�апример: Firefox) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaposition</word_key>
-      <word_default>Position:</word_default>
-      <word_custom>Позици�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uamanagement</word_key>
-      <word_default>User Agent Management</word_default>
-      <word_custom>Спи�ок User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaaddnew</word_key>
-      <word_default>Add New User Agent</word_default>
-      <word_custom>Добавить User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_longtext</word_key>
-      <word_default><![CDATA[Each user agent has a numerical position. Search engines start from 0 and browsers start from 1000. It is strongly recommended that you always allow search engine user agents to be positioned before web browsers otherwise they may be incorrectly identified as web browsers as most search engines have 'Mozilla' in the user agent.<br /><br />It is also recommended that you allow 'Explorer', 'Netscape' and 'Mozilla' to be positioned last. Many other browsers contain 'Explorer' or 'Mozilla' in the user agent which could lead to incorrect identifications.]]></word_default>
-      <word_custom><![CDATA[Каждый user agent имеет чи�ловую позицию. Дл� пои�ковых роботов позици� начинает�� � 0, а дл� браузеров � 1000. Рекомендует�� �тавить пои�ковых роботов перед браузерами, иначе они могут быть неверно ра�познаны.<br /><br />Так же рекомендует�� �тавить 'Explorer', 'Netscape' и 'Mozilla' на по�леднее ме�то, так как многие браузеры �одержат 'Explorer' или 'Mozilla' в �воих user agent �троках, что может приве�ти к неправильной их идентификации.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_information</word_key>
-      <word_default>Information</word_default>
-      <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_nonein</word_key>
-      <word_default><![CDATA[I can see you have no user agents installed! <a href='%s%s&amp;do=rebuildMaster'>Click me to build the master User Agent list</a>]]></word_default>
-      <word_custom><![CDATA[�а данный момент в �и�теме не найдено ни одного user agent.<a href='%s%s&amp;do=rebuildMaster'>Создать базовый �пи�ок</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_none</word_key>
-      <word_default><![CDATA[You do not have any User Agent Groups set up. Would you like to <a href='%s&amp;module=tools&amp;section=uagents&amp;do=groupAdd'>create one?</a>]]></word_default>
-      <word_custom><![CDATA[�а данный момент не надено ни одной группы User Agent. Возможно вы захотите <a href='%s&amp;module=tools&amp;section=uagents&amp;do=groupAdd'>�оздать одну</a>.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_removeg</word_key>
-      <word_default>Remove Group...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_editg</word_key>
-      <word_default>Edit Group...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uaclose</word_key>
-      <word_default>Close</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_groups</word_key>
-      <word_default>User Agent Groups</word_default>
-      <word_custom>Группы User Agent</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>t_uasave</word_key>
-      <word_default>Save</word_default>
+      <word_key>ie_save</word_key>
+      <word_default>Save Rule</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_ua_info</word_key>
-      <word_default><![CDATA[You can limit the match to specific versions. Simply enter the version you wish to match in the box. If you wish to match multiple versions, separate them with a comma (4,5,9). If you want to match a version or higher, enter the version followed by a plus sign (7+). If you want to match a version or less, enter the version followed by a minus sign (6-).<br />Leave it blank to match all versions of this user-agent.]]></word_default>
-      <word_custom><![CDATA[Вы можете указать конкретные вер�ии агента. Дл� �того до�таточно вве�ти номера вер�ий в поле внизу. Е�ли вы хотите указать не�колько вер�ии, про�то разделите их зап�той (4,15,9). При необходимо�ти указать определенную вер�ию и в�е �ледующие за ней, введите номер вер�ии �о знаком плю� (18+). Е�ли же вы хотите указать определенную вер�ию и в�е идущие перед ней, введите номер вер�ии �о знаком мину� (6-).<br />�е заполн�йте поле, е�ли нет необходимо�ти определ�ть вер�ию user-agent.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_test_pop3</word_key>
+      <word_default>Test POP3</word_default>
+      <word_custom>Проверка POP3</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaediting</word_key>
-      <word_default>Editing Versions for</word_default>
-      <word_custom>Редактирование вер�ии дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_updated</word_key>
+      <word_default>Altered Incoming Email Rule %s</word_default>
+      <word_custom>Изменено правил дл� вход�щих Email адре�ов %s </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaversions</word_key>
-      <word_default>Versions</word_default>
-      <word_custom>Вер�ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_deleted</word_key>
+      <word_default>Deleted Incoming Email Rule %s</word_default>
+      <word_custom>Удалено правил дл� вход�щих E-mail адре�ов %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaconfigure</word_key>
-      <word_default>Configure</word_default>
-      <word_custom>�а�троить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_delete_done</word_key>
+      <word_default>Rule Deleted</word_default>
+      <word_custom>Правило удалено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaremove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_saved</word_key>
+      <word_default>Rule Saved</word_default>
+      <word_custom>Правило �охранено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_add_this_option_into_the_setti</word_key>
-      <word_default>Add this option into the settings cache?</word_default>
-      <word_custom>Добавить в кеш</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_sendto</word_key>
+      <word_default>Send to: </word_default>
+      <word_custom>Отправить: </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uatitle</word_key>
-      <word_default><![CDATA[<strong>User Agent Group Title</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�азвание группы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ie_added</word_key>
+      <word_default>Added Incoming Email Rule %s</word_default>
+      <word_custom>Добавлено правил дл� вход�щих Email %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uagroups</word_key>
-      <word_default><![CDATA[This Group's Agents]]></word_default>
-      <word_custom>�генты �той группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pop3_err_connect</word_key>
+      <word_default>Could not connect to the server</word_default>
+      <word_custom>�е удало�ь �оединит�� � �ервером</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaallavail</word_key>
-      <word_default>All Available Agents (Click to add to group)</word_default>
-      <word_custom>До�тупные агенты (нажатие добавл�ет в группу)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pop3_err_stats</word_key>
+      <word_default>Could not retrieve mailbox statistics</word_default>
+      <word_custom>�е удало�ь получить �тати�тику �щика</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>t_uaedit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pop3_err_login</word_key>
+      <word_default>Could not log in</word_default>
+      <word_custom>�е удало�ь идентифицировать��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_make_a_default_setting_cannot_</word_key>
-      <word_default>Make a default setting (cannot be removed by user)?</word_default>
-      <word_custom>�а�тройка по умолчанию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pop3_okay</word_key>
+      <word_default>Test successful: %d messages found.</word_default>
+      <word_custom>Те�т у�пешен. �айдено %s �ообщений.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_enter_title_here_or_leave_blan</word_key>
-      <word_default>Enter title here or leave blank to not start a setting group</word_default>
-      <word_custom>Введите название группы или о�тавьте поле пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_key</word_key>
+      <word_default>License Key</word_default>
+      <word_custom>Ключ лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_start_setting_group</word_key>
-      <word_default>Start setting group?</word_default>
-      <word_custom>�ачинает новую группу на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_services</word_key>
+      <word_default>License Services</word_default>
+      <word_custom>Серви� лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_036show_1_is_set_when_showing_</word_key>
-      <word_default><![CDATA[&#036;show = 1; is set when showing setting.<br />&#036;save = 1; is set when saving the setting.<br />Use &#036;key and &#036;value when writing PHP code.]]></word_default>
-      <word_custom><![CDATA[Параметр &#036;show имеет значение 1 - когда на�тройка выводит��<br />Параметр &#036;save имеет значение 1 - когда прои�ходит �охранение значени� на�тройки<br />Параметры &#036;key и &#036;value обозначают, �оответ�твенно, ключ и значение на�тройки]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>login_method_missing_functions</word_key>
+      <word_default>PHP functions required by this login method are missing: %s</word_default>
+      <word_custom>Запро� php функции данного метода авторизации утер�н: %s </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_raw_php_code_to_eval_before_sh</word_key>
-      <word_default>Raw PHP code to eval before showing and saving?</word_default>
-      <word_custom>PHP, и�полн�емый при показе и �охранении на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_activate</word_key>
+      <word_default>Activate Your License</word_default>
+      <word_custom>Данные лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_use_for_creating_form_element_</word_key>
-      <word_default><![CDATA[Use for creating form element extras.<br />Drop down box use: Key=Value; one per line.]]></word_default>
-      <word_custom><![CDATA[И�пользует�� дл� �оздани� полей-�пи�ков.<br />�апример дл� выпадающего �пи�ок в данном поле перечи�л�ют�� значени� полей в виде: Ключ=Значение]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_addons</word_key>
+      <word_default>License Addons</word_default>
+      <word_custom>Добавление лицензии</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_extra</word_key>
-      <word_default>Setting Extra?</word_default>
-      <word_custom>Дополнительные параметры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_url</word_key>
+      <word_default>Forum URL</word_default>
+      <word_custom>�дре� форума</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_default_value</word_key>
-      <word_default>Setting Default Value?</word_default>
-      <word_custom>Значение на�тройки по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_type</word_key>
-      <word_default>Setting Type?</word_default>
-      <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_key</word_key>
-      <word_default>Setting Key?</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_title</word_key>
-      <word_default>Setting title?</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_position</word_key>
-      <word_default>Setting Position?</word_default>
-      <word_custom>Позици� в �пи�ке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_description</word_key>
-      <word_default>Setting Description?</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group</word_key>
-      <word_default>Setting Group?</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_current_value</word_key>
-      <word_default>Setting Current Value?</word_default>
-      <word_custom>Текущее значение на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_update_settings</word_key>
-      <word_default>Update Settings</word_default>
-      <word_custom>Применить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_hide_from_main_settings_list</word_key>
-      <word_default>Hide from main settings list?</word_default>
-      <word_custom>�е выводить в �пи�ке на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_used_to_pull_this_from_the_db_</word_key>
-      <word_default>Used to pull this from the DB without relying on an ID</word_default>
-      <word_custom>И�пользует�� дл� получени� на�тройки из базы данных без ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group_keyword</word_key>
-      <word_default>Setting Group Keyword?</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group_description</word_key>
-      <word_default>Setting Group Description?</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group_tab</word_key>
-      <word_default>Setting Group Tab?</word_default>
-      <word_custom>Принадлежит закладке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group_title</word_key>
-      <word_default>Setting Group Title?</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_setting_group_application</word_key>
-      <word_default>Setting Group Application?</word_default>
-      <word_custom>Приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_search_settings</word_key>
-      <word_default>Search Settings...</word_default>
-      <word_custom>Пои�к на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_file_must_be_uploaded_into</word_key>
-      <word_default><![CDATA[The file must be uploaded into the './admin/' folder]]></word_default>
-      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_or_enter_the_filename_of_the_x</word_key>
-      <word_default><![CDATA[<u>OR</u> enter the filename of the XML settings file]]></word_default>
-      <word_custom><![CDATA[<u>ИЛИ</u> введите название файла]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_duplicate_entries_will_not_be_</word_key>
-      <word_default><![CDATA[Duplicate entries will not be overwritten but the default setting and other options will be updated. The file must end with either '.xml' or '.xml.gz']]></word_default>
-      <word_custom><![CDATA[Этот файл должен начинать�� � 'ipb_' и иметь ра�ширение '.xml' или '.xml.gz'. Суще�твующие на�тройки будут обновлены, другие — добавлены.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_upload_xml_settings_file_from_</word_key>
-      <word_default>Upload XML settings file from your computer</word_default>
-      <word_custom>Загрузка файла XML � на�тройками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_import_xml_settings</word_key>
-      <word_default>Import XML Settings</word_default>
-      <word_custom>Импортирование на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_delete_settings_group</word_key>
-      <word_default>Delete Settings Group...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_recount_settings_group</word_key>
-      <word_default>Recount Settings Group...</word_default>
-      <word_custom>Пере�читать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_edit_settings_group</word_key>
-      <word_default>Edit Settings Group...</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_folder</word_key>
-      <word_default>Folder</word_default>
-      <word_custom>Директори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_manage_settings</word_key>
-      <word_default>Manage Settings...</word_default>
-      <word_custom>Перейти к на�тройкам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_recache_all</word_key>
-      <word_default>Recache All</word_default>
-      <word_custom>Пере�троить ве�ь кеш</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_total_cache_size</word_key>
-      <word_default>Total Cache Size</word_default>
-      <word_custom>Общий размер кеша</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_recache_cache</word_key>
-      <word_default>Recache Cache...</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_view_cache</word_key>
-      <word_default>View Cache..</word_default>
-      <word_custom>По�мотреть �одержимое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_not_loaded_on_initialization</word_key>
-      <word_default>NOT loaded on Initialization</word_default>
-      <word_custom>�Е З�ГРУЖ�ЕТСЯ в начале работы форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_loaded_on_initialization_canno</word_key>
-      <word_default>Loaded on Initialization (Cannot unload)</word_default>
-      <word_custom>Загружает�� в начале работы форума (не может быть отключен)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_loaded_on_initialization</word_key>
-      <word_default>Loaded on Initialization</word_default>
-      <word_custom>З�ГРУЖ�ЕТСЯ в начале работы форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_init_state</word_key>
-      <word_default>Init State</word_default>
-      <word_custom>Подключение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_size</word_key>
-      <word_default>Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_global_caches</word_key>
-      <word_default>Global Caches</word_default>
-      <word_custom>Си�тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_cache_management</word_key>
-      <word_default>Cache Management</word_default>
-      <word_custom>Управление кешем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_diagnostics</word_key>
-      <word_default>Diagnostics...</word_default>
-      <word_custom>Проверить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_install</word_key>
-      <word_default>Install...</word_default>
-      <word_custom>У�тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_edit_details</word_key>
-      <word_default>Edit Details...</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_cannot_be_deleted_or_edited_by</word_key>
-      <word_default>Cannot be deleted or edited by user</word_default>
-      <word_custom>�е может быть удалена или изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_enable_safemode</word_key>
-      <word_default>Enable Safemode?</word_default>
-      <word_custom>Включить режим безопа�но�ти?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_if_yes_this_log_in_will_be_ena</word_key>
-      <word_default/>
-      <word_custom/>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_url_for_the_place_to_log_o</word_key>
-      <word_default>(Optional) The URL to send the user to when they request to log out.</word_default>
-      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� дл� выхода из �и�темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_user_log_out_url</word_key>
-      <word_default>Log In User Log Out URL</word_default>
-      <word_custom>URL завершени� �е��ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_url_for_the_place_to_log_i</word_key>
-      <word_default>(Optional) The URL to send the user to when they request to log in.</word_default>
-      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� дл� авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_user_log_in_url</word_key>
-      <word_default>Log In User Log In URL</word_default>
-      <word_custom>URL формы авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_user_register_url</word_key>
-      <word_default>Log In User Register URL</word_default>
-      <word_custom>URL реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_url_for_the_place_to_regis</word_key>
-      <word_default>(Optional) The URL to send the user to when they attempt to register a new account.</word_default>
-      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� желающего пройти реги�трацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_user_maintenance_url</word_key>
-      <word_default>Log In User Maintenance URL</word_default>
-      <word_custom>Служебный URL дл� пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_url_for_the_place_they_can</word_key>
-      <word_default>(Optional) The URL to send a user to when they request to change their email address or password.</word_default>
-      <word_custom>(�е об�зательно) URL дл� переадре�ации пользовател�, желающего �менить e-mail или пароль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_the_main_folder_the_php_files_</word_key>
-      <word_default><![CDATA[The main folder the PHP files reside.<br />E.G: If ./sources/loginauth/<strong>internal</strong>/auth.php then enter: internal]]></word_default>
-      <word_custom><![CDATA[О�новна� директори� в которой ра�положен файл.<br />�апример: Е�ли файл './sources/loginauth/<strong>internal</strong>/auth.php', то директори� - internal]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_files_folder_name</word_key>
-      <word_default>Log In Files Folder Name</word_default>
-      <word_custom>Им� директории � файлами модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_a_short_description_for_this_l</word_key>
-      <word_default>A short description for this log in method</word_default>
-      <word_custom>Короткое опи�ание модул� авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_description</word_key>
-      <word_default>Log In Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_title</word_key>
-      <word_default>Log In Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_writeable</word_key>
-      <word_default>Writeable</word_default>
-      <word_custom>До�тупен на запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_exists</word_key>
-      <word_default>Exists</word_default>
-      <word_custom>Суще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_file_name</word_key>
-      <word_default>File Name</word_default>
-      <word_custom>Им� файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_has_settings</word_key>
-      <word_default>Log In Has Settings</word_default>
-      <word_custom>Модуль имеет на�тройки?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_installed</word_key>
-      <word_default>Log In Installed</word_default>
-      <word_custom>Модуль у�тановлен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_log_in_enabled</word_key>
-      <word_default>Log In Enabled</word_default>
-      <word_custom>Модуль включен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_diagnostics_title</word_key>
-      <word_default>Log In Method Diagnostics</word_default>
-      <word_custom>Отчет о проверке модул�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_register_new_log_in_method</word_key>
-      <word_default>Add Log In Method</word_default>
-      <word_custom>Добавить метод</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_diagnostics_for</word_key>
-      <word_default>Diagnostics for</word_default>
-      <word_custom>Отчет дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_registered_log_in_authenticati</word_key>
-      <word_default>Registered Log In Authentication Methods</word_default>
-      <word_custom>Модули авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_settings</word_key>
-      <word_default>Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tol_add_new_setting_group</word_key>
-      <word_default>Add New Setting Group</word_default>
-      <word_custom>Добавить группу на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>perf_help_information</word_key>
-      <word_default><![CDATA[Performance mode allows you to easily disable many of the slightly more resource intensive features of your site that are not fully critical to your site's operation.  Examples include private conversations and searching.  The system will remember the current settings, so that you can easily reverse this change at a later time.  If you receive a sudden influx of traffic, you can use this feature to address the spike in activity quickly.]]></word_default>
-      <word_custom>Режим производительно�ти позвол�ет легко переве�ти вашу �и�тему в �о�то�ние, при котором будут отключены ре�ур�оемкие возможно�ти, не �вл�ющие�� критичными дл� функционировани� форума. При переключении в данный режим, �тарые на�тройки запоминают�� и вы в любой момент �нова можете вернуть�� к ним. Рекомендует�� и�пользовать данный режим в �луча�х внезапного повышени� нагрузки на �и�тему (например, в результате лавинообразного трафика).</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_processed</word_key>
-      <word_default>Removal Completed: %s items removed</word_default>
-      <word_custom>Удаление завершено: %s позиций удалено </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_sigs</word_key>
-      <word_default>Cached Signatures</word_default>
-      <word_custom>Кешированных подпи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_posts</word_key>
-      <word_default>Cached Posts</word_default>
-      <word_custom>Сообщений в кеше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_remove_seven</word_key>
-      <word_default>Remove items older than %s days</word_default>
-      <word_custom>Удалить запи�и �тарше %s дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_header</word_key>
-      <word_default>Cached Content</word_default>
-      <word_custom>Кеш �одержимого</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>cc_remove_all</word_key>
-      <word_default>Remove all items</word_default>
-      <word_custom>Очи�тить полно�тью</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>login_manage_enabled</word_key>
-      <word_default>Enabled?</word_default>
-      <word_custom>Включен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>setting_staff_tag</word_key>
-      <word_default> ( STAFF ) </word_default>
-      <word_custom>( �ДМ )</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>add_setting_button</word_key>
-      <word_default>Add New Setting</word_default>
-      <word_custom>Добавить на�тройку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>settings_h_prefix</word_key>
-      <word_default>Settings: </word_default>
-      <word_custom>�а�тройки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>noneed_rebuild_again</word_key>
-      <word_default>You do not need to rebuild this content again.</word_default>
-      <word_custom>Содержимое уже обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>rebuild_process_f</word_key>
-      <word_default>Processed forum %s</word_default>
-      <word_custom>Обработан форум %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>tools300pms</word_key>
-      <word_default>Checked %s PMs so far. This cycle:  Private Messages converted into conversations..</word_default>
-      <word_custom>Обработано %s личных �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_deletebook</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_editbook</word_key>
-      <word_default>Edit...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_m_title</word_key>
-      <word_default>Share Link Services</word_default>
-      <word_custom>Серви�ы публикации ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_services</word_key>
-      <word_default>Services</word_default>
-      <word_custom>Серви�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_add</word_key>
-      <word_default>Add Service</word_default>
-      <word_custom>Добавить �ерви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_icon_info</word_key>
-      <word_default>Images are located in public/style_extra/sharelinks/</word_default>
-      <word_custom>Изображени� ра�положены в public/style_extra/sharelinks/</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_icon</word_key>
-      <word_default>Icon</word_default>
-      <word_custom>Иконка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_url_info</word_key>
-      <word_default><![CDATA[Use '%title%' and '%url%' as replacements from the blog entry title and URL]]></word_default>
-      <word_custom><![CDATA[И�пользуйте '{title}' и '{url}' дл� под�тановки названи� запи�и блога и URL]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_url</word_key>
-      <word_default>URL</word_default>
-      <word_custom>URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_current_title</word_key>
-      <word_default>Share Services</word_default>
-      <word_custom>Серви�ы публикации ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_cache</word_key>
+      <word_default><![CDATA[Displaying cached license data from %s, <a href='%s'>click here</a> to refresh the data.]]></word_default>
+      <word_custom><![CDATA[Показана �охраненна� копи� данных о лицензии от %s, <a href='%s'>нажмите �юда</a> чтобы обновить данные]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -29352,589 +19642,3053 @@
       <word_default>There was an error contacting the license server, please try again later</word_default>
       <word_custom>Ошибка �оединени� � �ервером, повторите попытку позже&#13;
 </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_cache</word_key>
-      <word_default><![CDATA[Displaying cached license data from %s, <a href='%s'>click here</a> to refresh the data.]]></word_default>
-      <word_custom><![CDATA[Показана �охраненна� копи� данных о лицензии от %s, <a href='%s'>нажмите �юда</a> чтобы обновить данные]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_key_notfound</word_key>
+      <word_default>Your license key appears to be invalid.  Please contact technical support.</word_default>
+      <word_custom>Ваш лицензионный ключ неверный. Пожалуй�та, �в�жите�ь � техниче�кой поддержкой.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_url</word_key>
-      <word_default>Forum URL</word_default>
-      <word_custom>�дре� форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>license_key_bad</word_key>
+      <word_default>Your license key could not be activated. Please check your key and try again. If the problem persists, please contact technical support.</word_default>
+      <word_custom>Ваш лицензионный ключ еще не активирован. Пожалуй�та, проверьте правильно�ть ввода ключа и попробуйте еще раз. Е�ли проблема �охранит��, обратите�ь в техниче�кую поддержку.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_activate</word_key>
-      <word_default>Activate Your License</word_default>
-      <word_custom>Данные лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_icon</word_key>
+      <word_default>Icon</word_default>
+      <word_custom>Иконка</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_addons</word_key>
-      <word_default>License Addons</word_default>
-      <word_custom>Добавление лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_url_info</word_key>
+      <word_default><![CDATA[Use '%title%' and '%url%' as replacements from the blog entry title and URL]]></word_default>
+      <word_custom><![CDATA[И�пользуйте '{title}' и '{url}' дл� под�тановки названи� запи�и блога и URL]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_key</word_key>
-      <word_default>License Key</word_default>
-      <word_custom>Ключ лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_services</word_key>
+      <word_default>Services</word_default>
+      <word_custom>Серви�ы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>license_services</word_key>
-      <word_default>License Services</word_default>
-      <word_custom>Серви� лицензии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_current_title</word_key>
+      <word_default>Share Services</word_default>
+      <word_custom>Серви�ы публикации ��ылок</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>login_method_missing_functions</word_key>
-      <word_default>PHP functions required by this login method are missing: %s</word_default>
-      <word_custom>Запро� php функции данного метода авторизации утер�н: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_url</word_key>
+      <word_default>URL</word_default>
+      <word_custom>URL</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>pop3_okay</word_key>
-      <word_default>Test successful: %d messages found.</word_default>
-      <word_custom>Те�т у�пешен. �айдено %s �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_add</word_key>
+      <word_default>Add Service</word_default>
+      <word_custom>Добавить �ерви�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>pop3_err_stats</word_key>
-      <word_default>Could not retrieve mailbox statistics</word_default>
-      <word_custom>�е удало�ь получить �тати�тику �щика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_icon_info</word_key>
+      <word_default>Images are located in public/style_extra/sharelinks/</word_default>
+      <word_custom>Изображени� ра�положены в public/style_extra/sharelinks/</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>pop3_err_login</word_key>
-      <word_default>Could not log in</word_default>
-      <word_custom>�е удало�ь идентифицировать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>pop3_err_connect</word_key>
-      <word_default>Could not connect to the server</word_default>
-      <word_custom>�е удало�ь �оединит�� � �ервером</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_test_pop3</word_key>
-      <word_default>Test POP3</word_default>
-      <word_custom>Проверка POP3</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_delete_done</word_key>
-      <word_default>Rule Deleted</word_default>
-      <word_custom>Правило удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_sendto</word_key>
-      <word_default>Send to: </word_default>
-      <word_custom>Отправить: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_deleted</word_key>
-      <word_default>Deleted Incoming Email Rule %s</word_default>
-      <word_custom>Удалено правил дл� вход�щих Email адре�ов %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_saved</word_key>
-      <word_default>Rule Saved</word_default>
-      <word_custom>Правило �охранено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_added</word_key>
-      <word_default>Added Incoming Email Rule %s</word_default>
-      <word_custom>Добавлено правил дл� вход�щих Email %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_updated</word_key>
-      <word_default>Altered Incoming Email Rule %s</word_default>
-      <word_custom>Изменено правил дл� вход�щих Email адре�ов %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_save</word_key>
-      <word_default>Save Rule</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_ignore</word_key>
-      <word_default>Ignore Message</word_default>
-      <word_custom>Игнорируемые �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_rule</word_key>
-      <word_default>Rule</word_default>
-      <word_custom>Правило</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_ct_regx</word_key>
-      <word_default>Matches Regular Expression</word_default>
-      <word_custom>Удовлетвор�ет регул�рному выражению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_ct_eqls</word_key>
-      <word_default>Equals</word_default>
-      <word_custom>Совпадение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_ct_ctns</word_key>
-      <word_default>Contains</word_default>
-      <word_custom>Содержимое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_cf_body</word_key>
-      <word_default>Body</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_cf_sbjt</word_key>
-      <word_default>Subject</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_cf_to</word_key>
-      <word_default>Destination Email</word_default>
-      <word_custom>�дре�ат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_cf_from</word_key>
-      <word_default>Sender Email</word_default>
-      <word_custom>И�ход�щий Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_not_found</word_key>
-      <word_default>Could not locate the rule you are trying to edit.</word_default>
-      <word_custom>�е найдено правило дл� изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_none</word_key>
-      <word_default>No rules to show</word_default>
-      <word_custom>�ет правил дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_action</word_key>
-      <word_default>Action</word_default>
-      <word_custom>Дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_criteria</word_key>
-      <word_default>Criteria</word_default>
-      <word_custom>Критерий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>ie_edit</word_key>
-      <word_default>Edit Rule</word_default>
+      <word_key>sl_editbook</word_key>
+      <word_default>Edit...</word_default>
       <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ie_add</word_key>
-      <word_default>Add Rule</word_default>
-      <word_custom>Добавить правило</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_m_title</word_key>
+      <word_default>Share Link Services</word_default>
+      <word_custom>Серви�ы публикации ��ылок</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>ie_title</word_key>
-      <word_default>Incoming Email Rules</word_default>
-      <word_custom>Правила дл� вход�щих Email адре�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rebuild_process_f</word_key>
+      <word_default>Processed forum %s</word_default>
+      <word_custom>Обработан форум %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_formerror</word_key>
-      <word_default>Form Error</word_default>
-      <word_custom>Ошибка формы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>noneed_rebuild_again</word_key>
+      <word_default>You do not need to rebuild this content again.</word_default>
+      <word_custom>Содержимое уже обновлено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_removed</word_key>
-      <word_default>Share link service removed</word_default>
-      <word_custom>Серви� удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_setting_button</word_key>
+      <word_default>Add New Setting</word_default>
+      <word_custom>Добавить на�тройку</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_updated</word_key>
-      <word_default><![CDATA[Share link service '%s' updated]]></word_default>
-      <word_custom><![CDATA[Серви� '%s' изменен]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>settings_h_prefix</word_key>
+      <word_default>Settings: </word_default>
+      <word_custom>�а�тройки: </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_added</word_key>
-      <word_default><![CDATA[Share link service '%s' added]]></word_default>
-      <word_custom><![CDATA[Добавлен �ерви� публикации ��ылок '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sl_deletebook</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_must_key</word_key>
-      <word_default>You must enter a key</word_default>
-      <word_custom>Вы должны вве�ти ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tools300pms</word_key>
+      <word_default>Checked %s PMs so far. This cycle: %s Private Messages converted into conversations..</word_default>
+      <word_custom>Обработано %s личных �ообщений.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_must_url</word_key>
-      <word_default>You must enter a URL format</word_default>
-      <word_custom>Вы должны вве�ти формат ��лыки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>setting_staff_tag</word_key>
+      <word_default> ( STAFF ) </word_default>
+      <word_custom>( �ДМ )</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_must_title</word_key>
+      <word_key>cc_remove_all</word_key>
+      <word_default>Remove all items</word_default>
+      <word_custom>Очи�тить полно�тью</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>login_manage_enabled</word_key>
+      <word_default>Enabled?</word_default>
+      <word_custom>Включен?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cc_posts</word_key>
+      <word_default>Cached Posts</word_default>
+      <word_custom>Сообщений в кеше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cc_header</word_key>
+      <word_default>Cached Content</word_default>
+      <word_custom>Кеш �одержимого</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cc_remove_seven</word_key>
+      <word_default>Remove items older than %s days</word_default>
+      <word_custom>Удалить запи�и �тарше %s дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cc_processed</word_key>
+      <word_default>Removal Completed: %s items removed</word_default>
+      <word_custom>Удаление завершено: %s позиций удалено </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_diagnostics_for</word_key>
+      <word_default>Diagnostics for</word_default>
+      <word_custom>Отчет дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cc_sigs</word_key>
+      <word_default>Cached Signatures</word_default>
+      <word_custom>Кешированных подпи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_register_new_log_in_method</word_key>
+      <word_default>Add Log In Method</word_default>
+      <word_custom>Добавить метод</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_registered_log_in_authenticati</word_key>
+      <word_default>Registered Log In Authentication Methods</word_default>
+      <word_custom>Модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_settings</word_key>
+      <word_default>Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_add_new_setting_group</word_key>
+      <word_default>Add New Setting Group</word_default>
+      <word_custom>Добавить группу на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_diagnostics_title</word_key>
+      <word_default>Log In Method Diagnostics</word_default>
+      <word_custom>Отчет о проверке модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_installed</word_key>
+      <word_default>Log In Installed</word_default>
+      <word_custom>Модуль у�тановлен?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_enabled</word_key>
+      <word_default>Log In Enabled</word_default>
+      <word_custom>Модуль включен?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_help_information</word_key>
+      <word_default><![CDATA[Performance mode allows you to easily disable many of the slightly more resource intensive features of your site that are not fully critical to your site's operation.  Examples include private conversations and searching.  The system will remember the current settings, so that you can easily reverse this change at a later time.  If you receive a sudden influx of traffic, you can use this feature to address the spike in activity quickly.]]></word_default>
+      <word_custom>Режим производительно�ти позвол�ет легко переве�ти вашу �и�тему в �о�то�ние, при котором будут отключены ре�ур�оемкие возможно�ти, не �вл�ющие�� критичными дл� функционировани� форума. При переключении в данный режим, �тарые на�тройки запоминают�� и вы в любой момент �нова можете вернуть�� к ним. Рекомендует�� и�пользовать данный режим в �луча�х внезапного повышени� нагрузки на �и�тему (например, в результате лавинообразного трафика).</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_has_settings</word_key>
+      <word_default>Log In Has Settings</word_default>
+      <word_custom>Модуль имеет на�тройки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_auth_exists</word_key>
+      <word_default>Auth file exists?</word_default>
+      <word_custom>Файл авторизации �уще�твует?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_file_name</word_key>
+      <word_default>File Name</word_default>
+      <word_custom>Им� файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_writeable</word_key>
+      <word_default>Writeable</word_default>
+      <word_custom>До�тупен на запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_exists</word_key>
+      <word_default>Exists</word_default>
+      <word_custom>Суще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_title</word_key>
+      <word_default>Log In Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_files_folder_name</word_key>
+      <word_default>Log In Files Folder Name</word_default>
+      <word_custom>Им� директории � файлами модул�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_a_short_description_for_this_l</word_key>
+      <word_default>A short description for this log in method</word_default>
+      <word_custom>Короткое опи�ание модул� авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_description</word_key>
+      <word_default>Log In Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_main_folder_the_php_files_</word_key>
+      <word_default><![CDATA[The main folder the PHP files reside.<br />E.G: If ./sources/loginauth/<strong>internal</strong>/auth.php then enter: internal]]></word_default>
+      <word_custom><![CDATA[О�новна� директори� в которой ра�положен файл.<br />�апример: Е�ли файл './sources/loginauth/<strong>internal</strong>/auth.php', то директори� - internal]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_url_for_the_place_they_can</word_key>
+      <word_default>(Optional) The URL to send a user to when they request to change their email address or password.</word_default>
+      <word_custom>(�е об�зательно) URL дл� переадре�ации пользовател�, желающего �менить e-mail или пароль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_user_maintenance_url</word_key>
+      <word_default>Log In User Maintenance URL</word_default>
+      <word_custom>Служебный URL дл� пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_user_register_url</word_key>
+      <word_default>Log In User Register URL</word_default>
+      <word_custom>URL реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_user_log_in_url</word_key>
+      <word_default>Log In User Log In URL</word_default>
+      <word_custom>URL формы авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_url_for_the_place_to_regis</word_key>
+      <word_default>(Optional) The URL to send the user to when they attempt to register a new account.</word_default>
+      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� желающего пройти реги�трацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_edit_details</word_key>
+      <word_default>Edit Details...</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_cannot_be_deleted_or_edited_by</word_key>
+      <word_default>Cannot be deleted or edited by user</word_default>
+      <word_custom>�е может быть удалена или изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_enable_safemode</word_key>
+      <word_default>Enable Safemode?</word_default>
+      <word_custom>Включить режим безопа�но�ти?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_if_yes_this_log_in_will_be_ena</word_key>
+      <word_default/>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_url_for_the_place_to_log_o</word_key>
+      <word_default>(Optional) The URL to send the user to when they request to log out.</word_default>
+      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� дл� выхода из �и�темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_log_in_user_log_out_url</word_key>
+      <word_default>Log In User Log Out URL</word_default>
+      <word_custom>URL завершени� �е��ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_global_caches</word_key>
+      <word_default>Core Caches</word_default>
+      <word_custom>Си�тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_url_for_the_place_to_log_i</word_key>
+      <word_default>(Optional) The URL to send the user to when they request to log in.</word_default>
+      <word_custom>(�е об�зательно) URL дл� перенаправлени� пользовател� дл� авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_diagnostics</word_key>
+      <word_default>Diagnostics...</word_default>
+      <word_custom>Проверить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_install</word_key>
+      <word_default>Install...</word_default>
+      <word_custom>У�тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_caches</word_key>
+      <word_default>Caches</word_default>
+      <word_custom>Кеши</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_cache_management</word_key>
+      <word_default>Cache Management</word_default>
+      <word_custom>Управление кешем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_view_cache</word_key>
+      <word_default>View Cache</word_default>
+      <word_custom>По�мотреть �одержимое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_folder</word_key>
+      <word_default>Folder</word_default>
+      <word_custom>Директори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_manage_settings</word_key>
+      <word_default>Manage Settings...</word_default>
+      <word_custom>Перейти к на�тройкам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_total_cache_size</word_key>
+      <word_default>Total Cache Size</word_default>
+      <word_custom>Общий размер кеша</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_recache_all</word_key>
+      <word_default>Recache All</word_default>
+      <word_custom>Пере�троить ве�ь кеш</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_edit_settings_group</word_key>
+      <word_default>Edit Settings Group...</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_recache_cache</word_key>
+      <word_default>Recache Cache</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_not_loaded_on_initialization</word_key>
+      <word_default>NOT loaded on Initialization</word_default>
+      <word_custom>�Е З�ГРУЖ�ЕТСЯ в начале работы форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_loaded_on_initialization_canno</word_key>
+      <word_default>Loaded on Initialization</word_default>
+      <word_custom>Загружает�� в начале работы форума (не может быть отключен)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_init_state</word_key>
+      <word_default>Init State</word_default>
+      <word_custom>Подключение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_loaded_on_initialization</word_key>
+      <word_default>Loaded on Initialization</word_default>
+      <word_custom>З�ГРУЖ�ЕТСЯ в начале работы форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_size</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_delete_settings_group</word_key>
+      <word_default>Delete Settings Group...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_upload_xml_settings_file_from_</word_key>
+      <word_default>Upload XML settings file from your computer</word_default>
+      <word_custom>Загрузка файла XML � на�тройками</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_import_xml_settings</word_key>
+      <word_default>Import XML Settings</word_default>
+      <word_custom>Импортирование на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_duplicate_entries_will_not_be_</word_key>
+      <word_default><![CDATA[Duplicate entries will not be overwritten but the default setting and other options will be updated. The file must end with either '.xml' or '.xml.gz']]></word_default>
+      <word_custom><![CDATA[Этот файл должен начинать�� � 'ipb_' и иметь ра�ширение '.xml' или '.xml.gz'. Суще�твующие на�тройки будут обновлены, другие — добавлены.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_or_enter_the_filename_of_the_x</word_key>
+      <word_default><![CDATA[<u>OR</u> enter the filename of the XML settings file]]></word_default>
+      <word_custom><![CDATA[<u>ИЛИ</u> введите название файла]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_the_file_must_be_uploaded_into</word_key>
+      <word_default><![CDATA[The file must be uploaded into the './admin/' folder]]></word_default>
+      <word_custom><![CDATA[Этот файл должен быть загружен в директорию './admin/' вашего форума]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_search_settings</word_key>
+      <word_default>Search Settings...</word_default>
+      <word_custom>Пои�к на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group_title</word_key>
+      <word_default>Group Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_recount_settings_group</word_key>
+      <word_default>Recount Settings Group...</word_default>
+      <word_custom>Пере�читать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_settings_groups</word_key>
+      <word_default>Settings Groups</word_default>
+      <word_custom>�а�тройки групп</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group_application</word_key>
+      <word_default>Group Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group_tab</word_key>
+      <word_default>Group Tab</word_default>
+      <word_custom>Принадлежит закладке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group_description</word_key>
+      <word_default>Group Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group_keyword</word_key>
+      <word_default>Group Keyword</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_used_to_pull_this_from_the_db_</word_key>
+      <word_default>Used to pull this from the DB without relying on an ID</word_default>
+      <word_custom>И�пользует�� дл� получени� на�тройки из базы данных без ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_hide_from_main_settings_list</word_key>
+      <word_default>Hide from main settings list?</word_default>
+      <word_custom>�е выводить в �пи�ке на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_update_settings</word_key>
+      <word_default>Update Settings</word_default>
+      <word_custom>Применить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_position</word_key>
+      <word_default>Setting Position</word_default>
+      <word_custom>Позици� в �пи�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_title</word_key>
+      <word_default>Setting Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_group</word_key>
+      <word_default>Setting Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_description</word_key>
+      <word_default>Setting Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_key</word_key>
+      <word_default>Setting Key</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_current_value</word_key>
+      <word_default>Setting Current Value</word_default>
+      <word_custom>Текущее значение на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_type</word_key>
+      <word_default>Setting Type</word_default>
+      <word_custom>Тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_default_value</word_key>
+      <word_default>Setting Default Value</word_default>
+      <word_custom>Значение на�тройки по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_raw_php_code_to_eval_before_sh</word_key>
+      <word_default>Raw PHP code to eval before showing and saving?</word_default>
+      <word_custom>PHP, и�полн�емый при показе и �охранении на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_036show_1_is_set_when_showing_</word_key>
+      <word_default><![CDATA[&#036;show = 1; is set when showing setting.<br />&#036;save = 1; is set when saving the setting.<br />Use &#036;key and &#036;value when writing PHP code.]]></word_default>
+      <word_custom><![CDATA[Параметр &#036;show имеет значение 1 - когда на�тройка выводит��<br />Параметр &#036;save имеет значение 1 - когда прои�ходит �охранение значени� на�тройки<br />Параметры &#036;key и &#036;value обозначают, �оответ�твенно, ключ и значение на�тройки]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_enter_title_here_or_leave_blan</word_key>
+      <word_default>Enter a subtitle here to group this and following settings</word_default>
+      <word_custom>Введите название группы или о�тавьте поле пу�тым</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_start_setting_group</word_key>
+      <word_default>Setting Sub-grouping?</word_default>
+      <word_custom>�ачинает новую группу на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_make_a_default_setting_cannot_</word_key>
+      <word_default>Make a default setting (cannot be removed by user)?</word_default>
+      <word_custom>�а�тройка по умолчанию?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uagroups</word_key>
+      <word_default><![CDATA[This Group's Agents]]></word_default>
+      <word_custom>�генты �той группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_add_this_option_into_the_setti</word_key>
+      <word_default>Add this option into the settings cache?</word_default>
+      <word_custom>Добавить в кеш</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uatitle</word_key>
+      <word_default><![CDATA[<strong>User Agent Group Title</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�азвание группы</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_use_for_creating_form_element_</word_key>
+      <word_default><![CDATA[Use for creating form element extras.<br />Drop down box use: Key=Value; one per line.]]></word_default>
+      <word_custom><![CDATA[И�пользует�� дл� �оздани� полей-�пи�ков.<br />�апример дл� выпадающего �пи�ок в данном поле перечи�л�ют�� значени� полей в виде: Ключ=Значение]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tol_setting_extra</word_key>
+      <word_default>Setting Extra</word_default>
+      <word_custom>Дополнительные параметры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaallavail</word_key>
+      <word_default>All Available Agents (Click to add to group)</word_default>
+      <word_custom>До�тупные агенты (нажатие добавл�ет в группу)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaedit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uasave</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaclose</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uamanagegroup</word_key>
+      <word_default>Manage User Agent Groups</word_default>
+      <word_custom>Управление группами User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>tua_manage</word_key>
+      <word_default>Manage User Agents</word_default>
+      <word_custom>Управление User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_removeg</word_key>
+      <word_default>Remove Group...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_groups</word_key>
+      <word_default>User Agent Groups</word_default>
+      <word_custom>Группы User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_editg</word_key>
+      <word_default>Edit Group...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaremove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaversions</word_key>
+      <word_default>Versions</word_default>
+      <word_custom>Вер�ии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaconfigure</word_key>
+      <word_default>Configure</word_default>
+      <word_custom>�а�троить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaediting</word_key>
+      <word_default>Editing Versions for</word_default>
+      <word_custom>Редактирование вер�ии дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_info</word_key>
+      <word_default><![CDATA[You can limit the match to specific versions. Simply enter the version you wish to match in the box. If you wish to match multiple versions, separate them with a comma (4,5,9). If you want to match a version or higher, enter the version followed by a plus sign (7+). If you want to match a version or less, enter the version followed by a minus sign (6-).<br />Leave it blank to match all versions of this user-agent.]]></word_default>
+      <word_custom><![CDATA[Вы можете указать конкретные вер�ии агента. Дл� �того до�таточно вве�ти номера вер�ий в поле внизу. Е�ли вы хотите указать не�колько вер�ии, про�то разделите их зап�той (4,15,9). При необходимо�ти указать определенную вер�ию и в�е �ледующие за ней, введите номер вер�ии �о знаком плю� (18+). Е�ли же вы хотите указать определенную вер�ию и в�е идущие перед ней, введите номер вер�ии �о знаком мину� (6-).<br />�е заполн�йте поле, е�ли нет необходимо�ти определ�ть вер�ию user-agent.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_none</word_key>
+      <word_default>You do not have any User Agent Groups set up.</word_default>
+      <word_custom><![CDATA[�а данный момент не надено ни одной группы User Agent. Возможно вы захотите <a href='%s&amp;module=tools&amp;section=uagents&amp;do=groupAdd'>�оздать одну</a>.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_nonein</word_key>
+      <word_default><![CDATA[I can see you have no user agents installed! <a href='%s%s&amp;do=rebuildMaster'>Click me to build the master User Agent list</a>]]></word_default>
+      <word_custom><![CDATA[�а данный момент в �и�теме не найдено ни одного user agent.<a href='%s%s&amp;do=rebuildMaster'>Создать базовый �пи�ок</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_information</word_key>
+      <word_default>Information</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_longtext</word_key>
+      <word_default><![CDATA[Each user agent has a numerical position. Search engines start from 0 and browsers start from 1000. It is strongly recommended that you always allow search engine user agents to be positioned before web browsers otherwise they may be incorrectly identified as web browsers as most search engines have 'Mozilla' in the user agent.<br /><br />It is also recommended that you allow 'Explorer', 'Netscape' and 'Mozilla' to be positioned last. Many other browsers contain 'Explorer' or 'Mozilla' in the user agent which could lead to incorrect identifications.]]></word_default>
+      <word_custom><![CDATA[Каждый user agent имеет чи�ловую позицию. Дл� пои�ковых роботов позици� начинает�� � 0, а дл� браузеров � 1000. Рекомендует�� �тавить пои�ковых роботов перед браузерами, иначе они могут быть неверно ра�познаны.<br /><br />Так же рекомендует�� �тавить 'Explorer', 'Netscape' и 'Mozilla' на по�леднее ме�то, так как многие браузеры �одержат 'Explorer' или 'Mozilla' в �воих user agent �троках, что может приве�ти к неправильной их идентификации.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaname</word_key>
+      <word_default>User Agent Name:</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaposition</word_key>
+      <word_default>Position:</word_default>
+      <word_custom>Позици�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_editing</word_key>
+      <word_default>Editing:</word_default>
+      <word_custom>Редактирование:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uamanagement</word_key>
+      <word_default>User Agent Management</word_default>
+      <word_custom>Спи�ок User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_configdetails</word_key>
+      <word_default>Configuration Details for</word_default>
+      <word_custom>Детали на�троек дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uacapture_desc</word_key>
+      <word_default>(If yes, enter the parenthesis # you wish to capture)</word_default>
+      <word_custom>(е�ли необходимо получать вер�ию агента, введите номер группы regex, в который �охран�ет�� вер�и�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uacapture</word_key>
+      <word_default>Regex Capture Version Number?</word_default>
+      <word_custom>Вер�и� User Agent в Regex</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaregex</word_key>
+      <word_default>Regex:</word_default>
+      <word_custom>Регул�рное выражение:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_ua_position</word_key>
+      <word_default>User Agent Position:</word_default>
+      <word_custom>Позици�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaother</word_key>
+      <word_default>Other</word_default>
+      <word_custom>Иное</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uasearchengine</word_key>
+      <word_default>Search Engine</word_default>
+      <word_custom>Пои�ковик</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uatype</word_key>
+      <word_default>User Agent Type:</word_default>
+      <word_custom>Тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uabrowser</word_key>
+      <word_default>Web Browser</word_default>
+      <word_custom>Веб-браузер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uakey_desc</word_key>
+      <word_default>(Alphanumerics and underscore only; Example: firefox)</word_default>
+      <word_custom><![CDATA[(Только цифры, буквы и знак '_'; �апример: Firefox)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uakey</word_key>
+      <word_default>User Agent Key:</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaaddnew</word_key>
+      <word_default>Add New User Agent</word_default>
+      <word_custom>Добавить User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_uaname_desc</word_key>
+      <word_default>(Example: Firefox)</word_default>
+      <word_custom>(�апример: Firefox) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html2_info</word_key>
+      <word_default>Enter the HTML to add or replace the ACP log in form.</word_default>
+      <word_custom>Введите HTML код дл� замены формы авторизации �дминцентра или дл� добавление к ней.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html_info</word_key>
+      <word_default>Enter the HTML to add or replace the log in form.</word_default>
+      <word_custom>Введите HTML код дл� замены формы авторизации или дл� добавление к ней.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html2</word_key>
+      <word_default><![CDATA[<strong class='title'>ACP Log In Form HTML</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>HTML код формы �дминцентра дл� замены</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_type</word_key>
+      <word_default><![CDATA[<strong class='title'>Login Type</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тип</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html</word_key>
+      <word_default><![CDATA[<strong class='title'>Log In Form HTML</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>HTML код формы</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html3</word_key>
+      <word_default><![CDATA[<strong class='title'>Log In HTML Replace Form</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>HTML код формы дл� замены</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_enable</word_key>
+      <word_default>Enable</word_default>
+      <word_custom>Включить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_html3_info</word_key>
+      <word_default><![CDATA[If 'yes' the above HTML will replace the log in form. If 'no' it will be added alongside the log in form.]]></word_default>
+      <word_custom><![CDATA[Е�ли 'Да', то введенный выше HTML заменит форму входа, иначе код будет добавлен к �тандартной форме.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_nomethods</word_key>
+      <word_default>There are no %s login methods available</word_default>
+      <word_custom>�ет %s  до�тупных методов авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_import</word_key>
+      <word_default>Import</word_default>
+      <word_custom>Импортировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_rebuild_master</word_key>
+      <word_default>Rebuild Default User Agents</word_default>
+      <word_custom>Обновить �тандартные User Agents</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_uninstall</word_key>
+      <word_default>Uninstall...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_moredetails</word_key>
+      <word_default>More</word_default>
+      <word_custom>Подробнее</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_export</word_key>
+      <word_default>Export...</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_disable</word_key>
+      <word_default>Disable</word_default>
+      <word_custom>Отключить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>t_l_configdetails</word_key>
+      <word_default>Configure Details...</word_default>
+      <word_custom>�а�троить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_entertitle</word_key>
+      <word_default>You must enter a title. Please try again.</word_default>
+      <word_custom>�еобходимо вве�ти название.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_removed</word_key>
+      <word_default>Removed a help file</word_default>
+      <word_custom>Файл помощи удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_noid</word_key>
+      <word_default>You must pass a valid ID. Please try again.</word_default>
+      <word_custom>ID не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_added</word_key>
+      <word_default>Added a help file</word_default>
+      <word_custom>Файл помощи добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_edited</word_key>
+      <word_default>Edited help files </word_default>
+      <word_custom>Измененные файлы помощи </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_404</word_key>
+      <word_default>We could not find that help file in the database. Please try again.</word_default>
+      <word_custom>Файл помощи не найден в базе данных.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_editbutton</word_key>
+      <word_default>Edit this Help File</word_default>
+      <word_custom>Изменить раздел помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_addbutton</word_key>
+      <word_default>Add this Help File</word_default>
+      <word_custom>Добавить �тот файл помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_title</word_key>
+      <word_default>Help File Management</word_default>
+      <word_custom>Управление разделами помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_import</word_key>
+      <word_default>Import App XML Files</word_default>
+      <word_custom>Импортировать XML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_imported</word_key>
+      <word_default>XML Files Imported</word_default>
+      <word_custom>Файлы XML импортированы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_addlog</word_key>
+      <word_default>Added a help file</word_default>
+      <word_custom>Добавлен файл помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_import_added</word_key>
+      <word_default>App: %s - %s added, %s updated help files inserted</word_default>
+      <word_custom>Приложение: %s - %s добавлено, %s обновленных файлов помощи добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_exported</word_key>
+      <word_default>Help Files Exported as XML</word_default>
+      <word_custom>Файлы помощи �к�портированы в XML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_filetitle</word_key>
+      <word_default>Help File Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_filedesc</word_key>
+      <word_default>Help File Description</word_default>
+      <word_custom>Краткое опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_export</word_key>
+      <word_default>Export XML into App Dirs</word_default>
+      <word_custom>Эк�портировать XML</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_fileapp</word_key>
+      <word_default>Help File Application</word_default>
+      <word_custom>Приложение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_current</word_key>
+      <word_default>Current Help Files</word_default>
+      <word_custom>Разделы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_filetext</word_key>
+      <word_default>Help File Text</word_default>
+      <word_custom>Тек�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_addnew</word_key>
+      <word_default>Add New Help File</word_default>
+      <word_custom>Добавить раздел помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>h_ftitle</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_bansimport</word_key>
+      <word_default>%s IP address(es) imported, %s email address(es) imported, %s name(s) imported.</word_default>
+      <word_custom>%s IP-адре�ов импортировано, %s адре�ов e-mail импортировано, %s имен импортировано.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_convergerest</word_key>
+      <word_default>%s members found and restored.</word_default>
+      <word_custom>%s пользователей во��тановлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_deletingid</word_key>
+      <word_default>Deleting: %s ID %s</word_default>
+      <word_custom>Удаление: %s ID %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_deletetitle</word_key>
+      <word_default>%s duplicate setting titles deletes and %s duplicate settings deleted.</word_default>
+      <word_custom>Удалено повтор�ющих�� названий: %s, повтор�ющих�� на�троек: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_calalready</word_key>
+      <word_default>Calendar events already converted.</word_default>
+      <word_custom>Календарные �обыти� уже конвертированы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_calstartto</word_key>
+      <word_default><![CDATA[<strong>Calendar events: %s to %s completed...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Календарные �обыти�: c %s по %s завершено.</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_calremoved</word_key>
+      <word_default>You cannot run this tool as the old calendar_events table has been removed.</word_default>
+      <word_custom>Запу�к ин�трумента невозможен, так как таблица calendar_events была удалена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_duplicatetitle</word_key>
+      <word_default><![CDATA[%s duplicate setting titles deleted<br />%s]]></word_default>
+      <word_custom><![CDATA[%s дубликатов на�троек удалено<br />%s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_keepingid</word_key>
+      <word_default>KEEPING: %s ID %s</word_default>
+      <word_custom>Сохранение: %s ID %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_noresizefound</word_key>
+      <word_default>Could not find file to resize: </word_default>
+      <word_custom>�евозможно найти файл: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_noremove</word_key>
+      <word_default>Could not remove: </word_default>
+      <word_custom>�евозможно удалить: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_resized</word_key>
+      <word_default>Resized: </word_default>
+      <word_custom>Изменен размер: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_thisgoeshere</word_key>
+      <word_default><![CDATA[<strong>Up to %s processed so far, continuing...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Обработано %s. Продолжаем...</strong>
+	
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_rebuildcomp</word_key>
+      <word_default><![CDATA[<strong>Rebuild completed</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Обновление завершено</strong><br />  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_attachedok</word_key>
+      <word_default>Attached file OK:</word_default>
+      <word_custom>Прикрепленный файл:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_statscenter</word_key>
+      <word_default>Recount Statistics Section</word_default>
+      <word_custom>Раздел пере�чета �тати�тики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_removedorph</word_key>
+      <word_default>Removed orphan:</word_default>
+      <word_custom>Удален:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_nothing</word_key>
+      <word_default>Nothing to recount!</word_default>
+      <word_custom>�ичего не выбрано дл� пере�чета!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_statsrecount</word_key>
+      <word_default>Statistics Recounted</word_default>
+      <word_custom>Стати�тика пере�читана</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_pollconverted</word_key>
+      <word_default><![CDATA[<strong>Polls converted</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Опро�ы �конвертированы</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_pollstartto</word_key>
+      <word_default><![CDATA[<strong>Polls: %s to %s of %s completed...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Опро�ы: � %s по %s из %s завершено</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_calconverted</word_key>
+      <word_default><![CDATA[<strong>Calendar events converted</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Событи� календар� �конвертированы</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_title</word_key>
+      <word_default><![CDATA[Recount & Rebuild Manager]]></word_default>
+      <word_custom>Ин�трументы пере�чета и обновлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_processed</word_key>
+      <word_default>Processed topic </word_default>
+      <word_custom>Обработана тема </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_320photos</word_key>
+      <word_default>Convert 3.1 avatars/photos to 3.2 photos</word_default>
+      <word_custom>Конвертировать аватары/фотографии из IPB 3.1 в фотографии IPB 3.2</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_320photos_info</word_key>
+      <word_default>IP.Board 3.2.x has one image to identify every user.  You can use this tool upon upgrading to convert avatars or photos from IP.Board 3.1.x to IP.Board 3.2 photos.</word_default>
+      <word_custom>В IP.Board 3.2.x в профиле у каждого уча�тника и�пользует�� одно изображение. Вы можете и�пользовать утилиту дл� конвертировани� аватаров или фотографий из IP.Board 3.1.x в новый формат фотографий IP.Board 3.2.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_msgsconverted</word_key>
+      <word_default>PMs have already been converted. No action required</word_default>
+      <word_custom>Личные �ообщени� уже �конвертированы, никакие дей�тви� не требуют��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_pmsconverted</word_key>
+      <word_default>All PMs converted</word_default>
+      <word_custom>В�е личные �ообщени� у�пешно конвертированы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_300pms</word_key>
+      <word_default>Convert 2.x PMs To 3.0.x Format</word_default>
+      <word_custom>Конвертировать личные �ообщени� из 2.x в формат 3.0.x</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_230to300</word_key>
+      <word_default><![CDATA[IP.Board 2.3.x -> 3.0.x Upgrade Tools]]></word_default>
+      <word_custom><![CDATA[Си�тема обновлени� IP.Board 2.3.x -> 3.0.x]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_300pms_info</word_key>
+      <word_default>If you chose to skip PM conversion during the upgrade and cannot run the shell tool, then please run this tool</word_default>
+      <word_custom><![CDATA[Е�ли вы выбрали "пропу�тить конвертирование личных �ообщений" во врем� обновлени� и не можете запу�тить shell �крипт, пожалуй�та, запу�тите �ледующую утилиту:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_310to320</word_key>
+      <word_default><![CDATA[IP.Board 3.1.x -> 3.2.x Upgrade Tools]]></word_default>
+      <word_custom><![CDATA[Утилиты обновлени� IP.Board 3.1.x -> 3.2.x]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_runtool</word_key>
+      <word_default><![CDATA[ RUN TOOL &gt;&gt;]]></word_default>
+      <word_custom><![CDATA[Запу�тить &gt;&gt;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_21to22</word_key>
+      <word_default><![CDATA[IP.Board 2.1.x -> 2.2.0 Upgrade Tools]]></word_default>
+      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 2.1.x -> 2.2.0]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_20to21</word_key>
+      <word_default><![CDATA[IP.Board 2.0.x -> 2.1.0 Upgrade Tools]]></word_default>
+      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 2.0.x -> 2.1.0]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_1xto20</word_key>
+      <word_default><![CDATA[IP.Board 1.x.x -> 2.0.0 Upgrade Tools]]></word_default>
+      <word_custom><![CDATA[Ин�трументы очи�тки по�ле обновлени� 1.x.x -> 2.0.0]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_21to22_info</word_key>
+      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 2.1.x series</word_default>
+      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 2.1.x</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_1xto20_info</word_key>
+      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 1.x.x series</word_default>
+      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 1.x.x</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_20to21_info</word_key>
+      <word_default>These tools will clean up and rebuild content from an upgrade from the IP.Board 2.0.x series</word_default>
+      <word_custom>Этот ин�трумент проведет очи�тку и обновление �одержимого по�ле перехода � IP.Board 2.0.x</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_dupe2</word_key>
+      <word_default>Remove Duplicate System Setting Groups from IPB 2.1.x</word_default>
+      <word_custom>Удаление повтор�ющих�� на�троек в 2.1.х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_dupe2_info</word_key>
+      <word_default><![CDATA[After an upgrade from IPB 2.0.x or import from another forum software, you may find that due to running an upgrade tool twice or a time-out you'll end up with some duplicate tool groups in the System Settings.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет очи�тить на�тройки форума от дубликатов, которые могут возникнуть при обновлении форума � вер�ии 2.0.х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_events_info</word_key>
+      <word_default><![CDATA[This tool converts IPB 2.0.x calendar events to the new format. Use this tool after a manual upgrade or when some calendar events didn't convert.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет преобразовать �обыти� календар� �озданные в вер�ии 2.0.х в новый формат, и�пользуемый в вер�ии 2.1.х. И�пользуйте данный ин�трумент по�ле ручного обновлени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_polls</word_key>
+      <word_default>Convert 2.0.x Polls to 2.1.x Format</word_default>
+      <word_custom>Конвертаци� опро�ов 2.0.х в формат вер�ии 2.1.х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_polls_info</word_key>
+      <word_default><![CDATA[This tool converts IPB 2.0.x polls to the new format. Use this tool after a manual upgrade or when some polls didn't convert.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет преобразовать опро�ы �озданные в вер�ии 2.0.х в новый формат, и�пользуемый в вер�ии 2.1.х. И�пользуйте данный ин�трумент по�ле ручного обновлени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_events</word_key>
+      <word_default>Convert 2.0.x Calendar Events to 2.1.x Format</word_default>
+      <word_custom>Конвертаци� �обытий календар� 2.0.х в формат вер�ии 2.1.х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_dupe1_info</word_key>
+      <word_default><![CDATA[After an upgrade from a previous version or import from another forum software, you may find that due to running an upgrade tool twice or a time-out you'll end up with some duplicate tools in the System Settings.<br />This tool finds the duplicates which have a greater ID than the original.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет очи�тить на�тройки форума от дубликатов, которые могут возникнуть в результате конвертации форума � другой форумной �и�темы или при обновлении форума � вер�ии 1.х.х.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_dupe1</word_key>
+      <word_default>Remove Duplicate System Settings from IPB 2.0.x</word_default>
+      <word_custom>Удаление повтор�ющих�� на�троек в 2.0.x</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_ban</word_key>
+      <word_default><![CDATA[Find & Restore old IPB Ban Settings]]></word_default>
+      <word_custom>Во��тановление бан фильтров</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_converge_info</word_key>
+      <word_default><![CDATA[After an upgrade from a previous version or import from another forum software, you may find that because several of your members have used duplicate email addresses, their account has been moved into the validating group.<br />This tool finds these members and restores them into the default member group and asks them to change their email address.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет найти пользователей, чь� учетна� запи�ь �одержит дублирующий e-mail адре�, а аккаунт переведен в группу ожидающих активации. Такое может произойти в результате обновлени� или же конвертации форума � другой форумной �и�темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_s_last</word_key>
+      <word_default>Reset last registered member</word_default>
+      <word_custom>Сбро�ить информацию о по�леднем зареги�трированном пользователе?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_stats</word_key>
+      <word_default>Recount Statistics</word_default>
+      <word_custom>Пере�чет �тати�тики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_percycle</word_key>
+      <word_default>Per Cycle</word_default>
+      <word_custom>за цикл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_ban_info</word_key>
+      <word_default><![CDATA[After an upgrade from a previous version, you may find that your ban settings are no longer stored.<br />Running this tool attempts to import your old ban settings. Old entries will not overwrite new entries.]]></word_default>
+      <word_custom>Ин�трумент позвол�ет во��тановить фильтры бана, которые могли быть потер�ны в результате обновлени� � 1.х.х. При во��тановлении, новые на�тройки не удал�ют��.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_converge</word_key>
+      <word_default><![CDATA[Find & Restore 'Converged' Members]]></word_default>
+      <word_custom>Пои�к и во��тановление пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_rebuild_info</word_key>
+      <word_default>This will rebuild the submitted content including BBCode, custom bbcode, HTML (where allowed) and emoticons. This is only necessary upon upgrading to IP.Board 3.0, and does not need to be run more than once.</word_default>
+      <word_custom>Ин�трумент обновл�ет �одержимое в�его контента. О�уще�твл�ет�� пере�тройка оформлени� BB-кодов, HTML, �майликов внутри контента. Данный ин�трумент нужено запу�тить только единожды - по�ле обновлени� до IP.Board 3.0</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_rebuild</word_key>
+      <word_default><![CDATA[Rebuild Content [Posts, Calendar Entries, Private Messages, Announcements, Signatures, etc.]]]></word_default>
+      <word_custom><![CDATA[Пере�троение контента [�ообщений, календарей, личных �ообщений, подпи�ей и т.п]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_topics</word_key>
+      <word_default>Resynchronize Topics</word_default>
+      <word_custom>Синхронизаци� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_topics_info</word_key>
+      <word_default>This will recount replies, attachment count and the topic starter and last poster for all your topics.</word_default>
+      <word_custom>Ин�трумент позвол�ет обновить �четчики, а так же информацию о по�леднем авторе дл� в�ех ваших тем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_s_most</word_key>
+      <word_default><![CDATA[Reset 'Most online' statistic?]]></word_default>
+      <word_custom>Сбро�ить информацию о рекорде по�ещаемо�ти?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_s_total</word_key>
+      <word_default>Recount total topics and posts</word_default>
+      <word_custom>Пере�читать количе�тво тем и �ообщений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_s_members</word_key>
+      <word_default>Recount Members</word_default>
+      <word_custom>Пере�читать количе�тво пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_posts</word_key>
+      <word_default>Post Content</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_thumb</word_key>
+      <word_default>Rebuild Attachment Thumbnails</word_default>
+      <word_custom>Обновить изображени� предпро�мотра</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_rebuildbutton</word_key>
+      <word_default>Rebuild Content</word_default>
+      <word_custom>Пере�троение контента</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_seouser</word_key>
+      <word_default><![CDATA[Rebuild Users' SEO Names]]></word_default>
+      <word_custom>Обновление SEO имен пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_seouser_info</word_key>
+      <word_default>This will reset the SEO display name for all members</word_default>
+      <word_custom>Ин�трумент �бра�ывает в�е SEO имена пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_thumb_info</word_key>
+      <word_default><![CDATA[This will rebuild all your attachment image thumbnails to the current size. This is useful if you've recently changed the thumbnail size and wish to update all current attachments<br />This is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Обновление размера изображений предпро�мотра прикрепленных изображений. И�пользуйте, е�ли недавно мен�ли на�тройки размера изображений предпро�мотра и хотите обновить �уще�твующие изображени�.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_data</word_key>
+      <word_default>Rebuild Attachment Data</word_default>
+      <word_custom>Обновить информацию о прикрепленных файлах</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_orph</word_key>
+      <word_default>Remove Orphaned Attachments</word_default>
+      <word_custom>Удалить потер�нные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_data_info</word_key>
+      <word_default><![CDATA[This will rebuild all your attachment data such as filesize, location and file extension<br />This is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Обновление информации обо в�ех прикрепленных файлов.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_user_info</word_key>
+      <word_default><![CDATA[This will reset the saved usernames in posts, topics, logs, etc. Useful if you've recently converted or manually changed member's names.]]></word_default>
+      <word_custom>Обновление �охраненных имен пользователей в �ообщени�х, темах, журналах и т.д. Полезно, е�ли вы недавно вручную мен�ли имена пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_count</word_key>
+      <word_default>Rebuild User Post Counts</word_default>
+      <word_custom>Обновление �четчиков пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_count_info</word_key>
+      <word_default><![CDATA[This will recount members posts based on CURRENT posts from the database. This will almost certainly REDUCE the post counts for your members as deleted and pruned posts will no longer be counted. This should not be used if you wish to retain your member's current post counts.<br /><strong>THERE IS NO UNDO!</strong>]]></word_default>
+      <word_custom><![CDATA[Пере�чет �ообщений пользователей. В большин�тве �лучаев �то приводит к уменьшению количе�тва �ообщений. �е �ледует и�пользовать �тот ин�трумент, е�ли вы хотите �охранить текущее количе�тво �ообщений. <strong>ЭТО ДЕЙСТВИЕ �ЕЛЬЗЯ ОТМЕ�ИТЬ!</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_orph_info</word_key>
+      <word_default><![CDATA[This will check and remove all orphaned 'post-' attachments not assigned to a post.<br />This is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Проверка и удаление потер�ных 'post-' файлов, не �в�занных ни � одним �ообщением.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_pphoto</word_key>
+      <word_default>Rebuild Profile Photo Thumbnails</word_default>
+      <word_custom>Обновить фотографии пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_pphoto_info</word_key>
+      <word_default><![CDATA[This will rebuild all your profile image thumbnails to the current size. This is useful if you've recently changed the thumbnail size and wish to update all current photos<br />This is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Обновление размера изображение предпро�мотра в профиле. И�пользуйте, е�ли недавно изменили на�тройки размера изображений.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_user</word_key>
+      <word_default>Rebuild User Names</word_default>
+      <word_custom>Обновление имен пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_uphoto_info</word_key>
+      <word_default><![CDATA[This will check and remove all orphaned 'photo-' photographs not assigned to a member.<br />This is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Проверка и удаление 'photo-' файлов, не �в�занных ни � одним пользователем.<br />Дл� �того ин�трумента требует�� большее количе�тво ре�ур�ов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_pms</word_key>
+      <word_default>Private Messages</word_default>
+      <word_custom>Личных �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_uphoto</word_key>
+      <word_default>Remove Orphaned Uploaded Photos</word_default>
+      <word_custom>Удалить потер�нные фотографии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_events</word_key>
+      <word_default>Calendar Events</word_default>
+      <word_custom>Событий календар�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_announce</word_key>
+      <word_default>Announcements</word_default>
+      <word_custom>Объ�влений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_sigs</word_key>
+      <word_default>Signatures</word_default>
+      <word_custom>Подпи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_aboutme</word_key>
+      <word_default>About Me Content</word_default>
+      <word_custom>Сведений О �ебе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_rules</word_key>
+      <word_default>Forum Rules</word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_msgcount_info</word_key>
+      <word_default>This will recount members total messages and folder counts</word_default>
+      <word_custom>Будут пере�читаны �ообщени� пользователей и �четчики папок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_msgcount</word_key>
+      <word_default>Rebuild User Messenger Totals</word_default>
+      <word_custom>Пере�читать �ообщени� в личном �щике</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>remenu_none</word_key>
+      <word_default>None</word_default>
+      <word_custom>�ичего</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_404</word_key>
+      <word_default>We could not find the login method you were attempting to configure, check, enable, uninstall, or edit. Please try again.</word_default>
+      <word_custom>�е удало�ь найти метод авторизации, который вы пытаете�ь на�троить, проверить, включить/отключить или изменить. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_nav</word_key>
+      <word_default>Manage Log In Authentication</word_default>
+      <word_custom>Управление модул�ми авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_title</word_key>
+      <word_default>Log In Authentication Manager</word_default>
+      <word_custom>Управление модул�ми авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_username_or_email</word_key>
+      <word_default>Username or Email Address</word_default>
+      <word_custom>Им� пользовател� или Email адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_edited</word_key>
+      <word_default>Log In Method Edited</word_default>
+      <word_custom>Метод авторизации изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_registernew</word_key>
+      <word_default>Register New Log In Method</word_default>
+      <word_custom>Добавить метод авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_added</word_key>
+      <word_default>New Log In Method Added</word_default>
+      <word_custom>�овый метод авторизации добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_confup</word_key>
+      <word_default>Configuration successfully updated for %s</word_default>
+      <word_custom>�а�тройки метода авторизации %s обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_form</word_key>
+      <word_default>You must complete the entire form.</word_default>
+      <word_custom>�еобходимо заполнить форму полно�тью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_confwrite</word_key>
+      <word_default>/conf.php must be writable - please CHMOD this file 0777</word_default>
+      <word_custom>/conf.php должен иметь права на запи�ь - пожалуй�та �делайте CHMOD 777 данному файлу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_noconfigfile</word_key>
+      <word_default>We could not find the configuration file.</word_default>
+      <word_custom>�е удало�ь найти конфигурационный файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_noconfig</word_key>
+      <word_default>This login method does not have any configuration options.</word_default>
+      <word_custom>Метод авторизации не �одержит опций дл� на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_forums</word_key>
+      <word_default>Resynchronize Forums</word_default>
+      <word_custom>Синхронизаци� форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>re_forums_info</word_key>
+      <word_default>This will recount replies, views, and the topic starter and last poster for all your forums.</word_default>
+      <word_custom>Ин�трумент позвол�ет обновить �четчики, а так же информацию о по�ледней теме и авторе дл� в�ех ваших форумов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_disabled</word_key>
+      <word_default>disabled</word_default>
+      <word_custom>отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_enabled</word_key>
+      <word_default>enabled</word_default>
+      <word_custom>включен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_successfully</word_key>
+      <word_default>Login In method was successfully </word_default>
+      <word_custom>Метод авторизации </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_others</word_key>
+      <word_default>Other Available Login Handlers</word_default>
+      <word_custom>Дополнительные модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_installed</word_key>
+      <word_default>Installed Login Handlers</word_default>
+      <word_custom>У�тановленные модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_msg</word_key>
+      <word_default><![CDATA[This section will allow you to manage your log in authentication methods.  Login handlers are executed and handled, if they are enabled, in the order in which they are listed below.  You can chain together multiple login methods, or use an external data source for account authentication.<br />&nbsp;]]></word_default>
+      <word_custom><![CDATA[Зде�ь вы можете управл�ть модул�ми авторизации. Обработчики авторизации задей�твуют�� в так, как показаны ниже. Вы можете �в�зать вме�те не�колько методов авторизации или и�пользовать внешний и�точник данных.<br />&nbsp; ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_installer404</word_key>
+      <word_default>We could not find the installer file for the Log In method you wish to install.</word_default>
+      <word_custom>�е удало�ь найти �крипт у�тановщика дл� у�танавливаемого метода авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_uninstalled</word_key>
+      <word_default>Log In method was successfully uninstalled</word_default>
+      <word_custom>Модуль авторизации удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_already</word_key>
+      <word_default>The Log In method you requested to install is already installed.</word_default>
+      <word_custom>Метод авторизации уже у�тановлен в �и�теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_msg</word_key>
+      <word_default><![CDATA[This page shows all the recorded XML-RPC requests.<br />The red cross indicates an error during the request and a green tick indicates a successful request.]]></word_default>
+      <word_custom><![CDATA[�а �транице отображены в�е запи�анные запро�ы XML-RPC<br />Кра�ный кре�т означает ошибку, а зелена� галочка говорит о том, что запро� прошел у�пешно.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_whatuser</word_key>
+      <word_default>Could not determine the user to remove.</word_default>
+      <word_custom>Пользователь дл� удалени� не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_yesinstalled</word_key>
+      <word_default>Log In method was successfully installed!</word_default>
+      <word_custom>Метод авторизации у�пешно у�тановлен в �и�тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_moveto</word_key>
+      <word_default>We could not determine where you were trying to move the Log In method to.</word_default>
+      <word_custom>�евозможно определить куда был перемещен метод авторизации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>l_rename_conf</word_key>
+      <word_default><![CDATA[Please rename each 'conf.dist.php' file in the following directories to 'conf.php':<br /><br /><ul><li>%s</li></ul>]]></word_default>
+      <word_custom><![CDATA[Переименуйте файл 'conf.dist.php' в �ледущей директории на 'conf.php':<br /><br /><ul><li>%s</li></ul>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>login_exists</word_key>
+      <word_default>EXISTS</word_default>
+      <word_custom>СОДЕРЖИТ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>login_notexists</word_key>
+      <word_default>MISSING</word_default>
+      <word_custom>�Е СОДЕРЖИТ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>xmlrpc_status</word_key>
+      <word_default>XML-RPC Status</word_default>
+      <word_custom>XML-RPC �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_lognoid</word_key>
+      <word_default>No log for that ID found.</word_default>
+      <word_custom>�е найдено запи�ей дл� �того ID.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_title</word_key>
+      <word_default>XML-RPC API Logs</word_default>
+      <word_custom>Запи�и XML-RPC API</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_createnew</word_key>
+      <word_default>Create New API User</word_default>
+      <word_custom>Создать API пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_removed</word_key>
+      <word_default>API User successfully removed.</word_default>
+      <word_custom>API пользователь у�пешно удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_entertitle</word_key>
       <word_default>You must enter a title</word_default>
       <word_custom>Вы должны вве�ти название</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_enabled</word_key>
-      <word_default>Enabled</word_default>
-      <word_custom>Включено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_noapikey</word_key>
+      <word_default>No API user key passed!</word_default>
+      <word_custom>Ключ API не найден!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_canonical</word_key>
-      <word_default>Use Canonical URL</word_default>
-      <word_custom>И�пользовать �тандартную ��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_added</word_key>
+      <word_default>API User Added</word_default>
+      <word_custom>API пользователь у�пешно добавлен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_key_info</word_key>
-      <word_default><![CDATA[Unique key used to identify the php plugin file for this link method: /admin/sources/classes/share/plugins/KEY.php<br />It is also used as the icon file name: /public/style_extra/sharelinks/KEY.png]]></word_default>
-      <word_custom><![CDATA[Уникальный ключ и�пользует�� дл� идентификации файла дополнени� дл� данного �ерви�а публикации: /admin/sources/classes/share/plugins/KEY.php<br />� также и�пользует�� в имени файла иконки метода: /public/style_extra/sharelinks/KEY.png]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_edited</word_key>
+      <word_default>API User Edited</word_default>
+      <word_custom>API пользователь изменен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_key</word_key>
-      <word_default>Key</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_disabled</word_key>
+      <word_default>XML-RPC System Disabled</word_default>
+      <word_custom>XML-RPC �и�тема отключена</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_url_info</word_key>
-      <word_default><![CDATA[Use '{title}' and '{url}' as replacements from the blog entry title and URL]]></word_default>
-      <word_custom><![CDATA[И�пользуйте '{title}' и '{url}' дл� под�тановки названи� запи�и блога и URL]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_msg2</word_key>
+      <word_default>You may create API users for use with the XML-RPC system which allows other applications to access IP.Board data</word_default>
+      <word_custom>Вы можете �оздавать API пользователей дл� и�пользовани� � XML-RPC �и�темой, котора� позвол�ет другим приложени�м и�пользовать данные из IP.Board.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_url</word_key>
-      <word_default>URL Format</word_default>
-      <word_custom>Формат ��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_title</word_key>
-      <word_default>Link Service Name</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_edit_button</word_key>
+      <word_key>a_savechanges</word_key>
       <word_default>Save Changes</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_edit_title</word_key>
-      <word_default>Edit link sharing service</word_default>
-      <word_custom>Изменить ��ылку публичного �ерви�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_edituser</word_key>
+      <word_default>Edit API User: </word_default>
+      <word_custom>Редактирование API пользовател�: </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_new_button</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_user404</word_key>
+      <word_default>The API user could not be found.</word_default>
+      <word_custom>�евозможно найти API пользовател�.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>sl_form_new_title</word_key>
-      <word_default>Add new link share service</word_default>
-      <word_custom>Добавление нового �ерви�а публикации ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_userkey</word_key>
+      <word_default><![CDATA[<strong>API User Key</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>API пользователь�кий ключ</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>uaversions</word_key>
-      <word_default>Versions:</word_default>
-      <word_custom>Вер�ии:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_msg4</word_key>
+      <word_default>You may create API users for use with the XML-RPC system which allows other applications to access IP.Board data</word_default>
+      <word_custom>Вы можете �оздавать API пользователей дл� и�пользовани� � XML-RPC �и�темой, котора� позвол�ет другим приложени�м и�пользовать данные из IP.Board.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>removelicensekey</word_key>
-      <word_default>Remove License Key</word_default>
-      <word_custom>Удалить ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_detail</word_key>
+      <word_default>XML-RPC Log Detail</word_default>
+      <word_custom>Журнал XML-RPC</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>editloginmethod</word_key>
-      <word_default>Edit Log In Method </word_default>
-      <word_custom>Редактирование метода входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_basics</word_key>
+      <word_default><![CDATA[<strong>Basics</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>О�новы</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_no_question</word_key>
-      <word_default>You must enter a question.</word_default>
-      <word_custom>�еобходимо вве�ти вопро�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_key</word_key>
+      <word_default>API Key</word_default>
+      <word_custom>API ключ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>qa_no_answer</word_key>
-      <word_default>You must enter an answer.</word_default>
-      <word_custom>�еобходимо вве�ти ответ.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>a_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_msg3</word_key>
+      <word_default><![CDATA[<strong>The XML-RPC system is not enabled!</strong><br />All API requests will fail. <a href='%s&amp;module=settings&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=xmlrpcapi'>Click here to enable it</a>]]></word_default>
+      <word_custom><![CDATA[<strong>XML-RPC �и�тема отключена</strong><br />API запро�ы не обрабатывают��. <a href='%s&amp;module=tools&amp;section=settings&amp;do=setting_view&amp;conf_title_keyword=xmlrpcapi'>Включить</a> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_key_info</word_key>
+      <word_default>This key is automatically generated and will be re-generated if you refresh this form.</word_default>
+      <word_custom>Этот ключ автоматиче�ки �оздает�� и перегенерирует�� при обновлении �той формы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_usertitle</word_key>
+      <word_default><![CDATA[<strong>API User Title</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>API заголовок пользовател�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_usertitle_info</word_key>
+      <word_default>The title is just a name for your records for easier identification.</word_default>
+      <word_custom>Заголовок дл� пользовател� дл� про�тоты запоминани�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_restrictip_info</word_key>
+      <word_default><![CDATA[<strong>Optional</strong>: You may enter the IP Address of the server you only wish to grant access. This increases security and is recommended.]]></word_default>
+      <word_custom><![CDATA[<strong>Опционально</strong>: Вы можете вве�ти IP адре� �ервера. Рекомендует�� дл� повышени� безопа�но�ти.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_restrictip</word_key>
+      <word_default><![CDATA[<strong>API Restrict IP</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>API IP ограничение</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_createone</word_key>
+      <word_default>Add a new user</word_default>
+      <word_custom>Создать?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_create</word_key>
+      <word_default>Create New API User</word_default>
+      <word_custom>Создать нового API пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_userbasics</word_key>
+      <word_default><![CDATA[<strong>API User Basics</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>API пользователь</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_remove</word_key>
+      <word_default>Remove API User...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_nousers</word_key>
+      <word_default>There are no API users currently.</word_default>
+      <word_custom>�а текущий момент API пользователей нет.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_users</word_key>
+      <word_default>XML-RPC API Users</word_default>
+      <word_custom>XML-RPC API пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_user</word_key>
+      <word_default>API User</word_default>
+      <word_custom>API пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_edit</word_key>
+      <word_default>Edit API User...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_log</word_key>
+      <word_default>Log</word_default>
+      <word_custom>Запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_viewdetails</word_key>
+      <word_default>View Details</word_default>
+      <word_custom>Подробно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_requestlog</word_key>
+      <word_default>XML-RPC Request Log</word_default>
+      <word_custom>Журнал XML-RPC запро�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_status</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Стату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_success</word_key>
+      <word_default>Success</word_default>
+      <word_custom>У�пешно�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_formdata</word_key>
+      <word_default><![CDATA[<strong>XML-RPC Data (Form Data)</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Данные XML-RPC (Данные формы)</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_missing_key_data</word_key>
+      <word_default>You must supply at least a title and key.</word_default>
+      <word_custom>Дл� отправки формы, как минимум, необходимо указать название и ключ.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_time</word_key>
+      <word_default>Time</word_default>
+      <word_custom>Врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_allowaccess</word_key>
+      <word_default>Allow access to</word_default>
+      <word_custom>Разрешить до�туп в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>a_permissions</word_key>
+      <word_default><![CDATA[<strong>API Permissions</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Ограничени� API<strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_nofile</word_key>
+      <word_default>No upload file was found or no filename was specified.</word_default>
+      <word_custom>Загруженный файл не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_keyinuse_already</word_key>
+      <word_default>The setting key you selected is already in use.</word_default>
+      <word_custom>Ключ на�троек, выбранный вами, уже и�пользует�� в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_noopen</word_key>
+      <word_default>Could not find the file to open at: %s</word_default>
+      <word_custom>�евозможно открыть файл: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_noneupdate</word_key>
+      <word_default>No settings to update.</word_default>
+      <word_custom>�ет на�троек дл� обновлени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_createnew</word_key>
+      <word_default>Create New Setting Group</word_default>
+      <word_custom>Создать новую группу на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_recounted</word_key>
+      <word_default>Setting Group Recounted</word_default>
+      <word_custom>Группа на�троек пере�читана.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_remove</word_key>
+      <word_default>Setting Group Removed</word_default>
+      <word_custom>Группа на�троек удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_cantremove</word_key>
+      <word_default>You cannot remove this setting group as it still contains active settings. Please remove the settings inside it first.</word_default>
+      <word_custom>�евозможно удалить группу на�троек так как в ней е�ть активные на�тройки.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_notitle</word_key>
+      <word_default>You must enter a title for this group.</word_default>
+      <word_custom>Вы должны вве�ти название группы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_edited</word_key>
+      <word_default>Setting Group Edited</word_default>
+      <word_custom>Группа на�троек отредактирована</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_input</word_key>
+      <word_default>Text Input</word_default>
+      <word_custom>Тек�т (одна �трока)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_title</word_key>
+      <word_default>Add New Setting Group</word_default>
+      <word_custom>Добавить группу на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_upandin</word_key>
+      <word_default>%s settings updated. %s settings inserted.</word_default>
+      <word_custom>%s на�троек обновлено. %s на�троек добавлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_editsetting</word_key>
+      <word_default>Edit Setting %s</word_default>
+      <word_custom>Редактирование на�тройки %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_nokeyword</word_key>
+      <word_default>You must enter a keyword for this group.</word_default>
+      <word_custom>Вы должны вве�ти ключевое �лово дл� �той группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_name_autocomplete</word_key>
+      <word_default>Member Name Auto Complete Field</word_default>
+      <word_custom>Поле имени пользовател� � автодополнением</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_multi</word_key>
+      <word_default>Multi-Select</word_default>
+      <word_custom>Мульти выбор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_editor</word_key>
+      <word_default>Full Editor</word_default>
+      <word_custom>Ра�ширенный редактор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_textarea</word_key>
+      <word_default>Text Area</word_default>
+      <word_custom>Тек�т (не�колько �трок)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_dropdown</word_key>
+      <word_default>Drop Down</word_default>
+      <word_custom>Выпадающее меню</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_yes_no</word_key>
+      <word_default>Yes/No Radio Buttons</word_default>
+      <word_custom>Кнопки Да/�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_added</word_key>
+      <word_default>New Setting Group Added</word_default>
+      <word_custom>Группа на�троек добавлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_revertback</word_key>
+      <word_default>Revert to default value</word_default>
+      <word_custom>Отменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_searchedfor</word_key>
+      <word_default>Searched for: %s</word_default>
+      <word_custom>Пои�к: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_set4group</word_key>
+      <word_default>Settings for group: %s</word_default>
+      <word_custom>�а�тройки группы: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_nomatches</word_key>
+      <word_default><![CDATA[Unfortunately your search for <strong>%s</strong> produced no matches. Please try another phrase.]]></word_default>
+      <word_custom><![CDATA[Пои�к по <strong>%s</strong> не дал результатов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_nogroup</word_key>
+      <word_default>No group was passed. Please try again.</word_default>
+      <word_custom>Группа не найдена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_deleted</word_key>
+      <word_default>Configuration Setting Deleted</word_default>
+      <word_custom>�а�тройка удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_sometoexport</word_key>
+      <word_default>You must select SOME settings to export!</word_default>
+      <word_custom>�еобходимо выбрать 1 или более на�троек дл� �к�порта!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_global_dd</word_key>
+      <word_default>Global Settings</word_default>
+      <word_custom>Общие на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_createnewtitle</word_key>
+      <word_default>Create New Setting</word_default>
+      <word_custom>Создать новую на�тройку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_added2</word_key>
+      <word_default>New Setting Added</word_default>
+      <word_custom>�а�тройка добавлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_edited2</word_key>
+      <word_default>Setting Edited</word_default>
+      <word_custom>�а�тройка отредактирована</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_revertedback</word_key>
+      <word_default>Configuration setting reverted back to default.</word_default>
+      <word_custom>�а�тройка �брошена на значение по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_nofields</word_key>
+      <word_default>No fields were passed to be saved. Please try again.</word_default>
+      <word_custom>�ет полей дл� �охранени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_updated</word_key>
+      <word_default>Settings updated</word_default>
+      <word_custom>�а�тройки обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>s_ishidden</word_key>
+      <word_default> (Hidden)</word_default>
+      <word_custom> (�крыта�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>setting_keywords</word_key>
+      <word_default>Setting Keywords</word_default>
+      <word_custom>Ключи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>setting_keywords_desc</word_key>
+      <word_default>You can enter keywords that will be searched when someone uses the ACP quick search to pull up this setting (space or comma separated)</word_default>
+      <word_custom>Вы можете вве�ти не�колько ключей (разделенных зап�той или пробелом) дл� бы�трого пои�ка на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>export_selected</word_key>
+      <word_default>EXPORT SELECTED</word_default>
+      <word_custom>ЭКСПОРТ ВЫБР���ЫХ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>choose_export</word_key>
+      <word_default>Choose settings to export</word_default>
+      <word_custom>Выберите на�тройки дл� �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>export_helptitle</word_key>
+      <word_default>Export Selected System Settings</word_default>
+      <word_custom>Эк�порт выбранных на�троек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>conf_desc_search</word_key>
+      <word_default>In Group: </word_default>
+      <word_custom>В группе: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>c_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>export_group</word_key>
+      <word_default>Export this group</word_default>
+      <word_custom>Эк�портировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>c_processed</word_key>
+      <word_default> processed...</word_default>
+      <word_custom> продолжаем...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>c_title</word_key>
+      <word_default>Cache Management</word_default>
+      <word_custom>Управление кешем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>c_recachethecachegetitgotitgood</word_key>
+      <word_default>Cache re-cached</word_default>
+      <word_custom>Кеш обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>c_msg</word_key>
+      <word_default>You can check and rebuild your caches from this control panel.</word_default>
+      <word_custom>Вы можете проверить кеши или пере�троить их</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>choose_to_export_single</word_key>
+      <word_default>Export Selected Settings</word_default>
+      <word_custom>Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_addnewtitle</word_key>
+      <word_default>Add New User Agent Group</word_default>
+      <word_custom>�ова� группа User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cache__of</word_key>
+      <word_default> of </word_default>
+      <word_custom> из </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>cache__posts</word_key>
+      <word_default> posts </word_default>
+      <word_custom> �ообщений </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_addnewbutton</word_key>
+      <word_default>Add New Group</word_default>
+      <word_custom>Добавить группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>UD не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_editua</word_key>
+      <word_default>Edit User Agent Group %s</word_default>
+      <word_custom>Изменение группы %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_nav2</word_key>
+      <word_default>Manage User Agents</word_default>
+      <word_custom>Управление User Agents</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_nav1</word_key>
+      <word_default>Manage User Agent Groups</word_default>
+      <word_custom>Управление группами User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>postform_badmd5</word_key>
+      <word_default>Key did not match</word_default>
+      <word_custom>Ключ не �овпадает</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>ua_unknown</word_key>
+      <word_default>Unknown Group </word_default>
+      <word_custom>�еизве�тна� группа </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_noid</word_key>
+      <word_default>We could not determine which question you were trying to delete.</word_default>
+      <word_custom>�евозможно определить вопро� дл� удалени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_current</word_key>
+      <word_default>Current Questions</word_default>
+      <word_custom>Текущие вопро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_addlink</word_key>
+      <word_default>Add New Question</word_default>
+      <word_custom>Добавить вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_help_title</word_key>
+      <word_default>Registration Question and Answer Challenges</word_default>
+      <word_custom>Вопро�ы и ответы при реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_deleted</word_key>
+      <word_default>The question has been deleted.</word_default>
+      <word_custom>Вопро� удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_none</word_key>
+      <word_default>There are no challenge questions created yet</word_default>
+      <word_custom>�ет �озданных вопро�ов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_delete</word_key>
+      <word_default>Delete...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_edit</word_key>
+      <word_default>Edit...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_addlog</word_key>
+      <word_default>Added a registration question</word_default>
+      <word_custom>Добавить вопро� дл� реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_editbutton</word_key>
+      <word_default>Edit Question</word_default>
+      <word_custom>Изменить вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_404</word_key>
+      <word_default>We could not determine which question you were trying to edit.</word_default>
+      <word_custom>�евозможно определить вопро� дл� редактировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_noeditid</word_key>
+      <word_default>We could not determine which question you were trying to edit.</word_default>
+      <word_custom>�евозможно определить вопро� дл� изменени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_not_on_title</word_key>
+      <word_default><![CDATA[Warning: Question &amp; Answer not enabled]]></word_default>
+      <word_custom>Внимание: �и�тема вопро� и ответ не задей�твована</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_edited</word_key>
+      <word_default>Edited a registration question</word_default>
+      <word_custom>Изменить вопро� дл� реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_form_answers</word_key>
+      <word_default>Valid answers.  One per line.</word_default>
+      <word_custom>Правильные ответы. Один на �троку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_addbutton</word_key>
+      <word_default>Add Question</word_default>
+      <word_custom>Добавить вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>qa_form_question</word_key>
+      <word_default>Question</word_default>
+      <word_custom>Вопро�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -29942,9 +22696,6 @@
       <word_key>perf_help_title</word_key>
       <word_default>Toggle Performance Mode</word_default>
       <word_custom>Переключение режима производительно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -29952,39 +22703,27 @@
       <word_key>perf_current</word_key>
       <word_default>Current Status</word_default>
       <word_custom>Текущее �о�то�ние:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_on</word_key>
-      <word_default>ENABLED</word_default>
-      <word_custom>ВКЛЮЧЕ�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qa_no_answer</word_key>
+      <word_default>You must enter an answer.</word_default>
+      <word_custom>�еобходимо вве�ти ответ.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_off</word_key>
-      <word_default>Disabled</word_default>
-      <word_custom>Отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qa_no_question</word_key>
+      <word_default>You must enter a question.</word_default>
+      <word_custom>�еобходимо вве�ти вопро�.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_toggle</word_key>
-      <word_default>Toggle now</word_default>
-      <word_custom>Переключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>qa_not_on_desc</word_key>
+      <word_default><![CDATA[If you wish for your Question &amp; Answers to show, please click <a href='%s'>here</a> to switch the system on]]></word_default>
+      <word_custom><![CDATA[Дл� отображени� вопро�ов и ответов нажмите <a href='%s'>зде�ь</a>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -29992,9 +22731,6 @@
       <word_key>perf_enabled_setting</word_key>
       <word_default>Enabled setting: %s</word_default>
       <word_custom>Включена на�тройка: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -30002,19 +22738,20 @@
       <word_key>perf_disabled_setting</word_key>
       <word_default>Disabled setting: %s</word_default>
       <word_custom>Отключена на�тройка: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_enabled_group</word_key>
-      <word_default><![CDATA[Enabled group setting '%s' for group %s]]></word_default>
-      <word_custom><![CDATA[Включена на�тройка '%s' дл� группы %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>perf_off</word_key>
+      <word_default>Disabled</word_default>
+      <word_custom>Отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_on</word_key>
+      <word_default>ENABLED</word_default>
+      <word_custom>ВКЛЮЧЕ�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -30022,29 +22759,13 @@
       <word_key>perf_disabled_group</word_key>
       <word_default><![CDATA[Disabled group setting '%s' for group %s]]></word_default>
       <word_custom><![CDATA[Отключена на�тройка '%s' дл� группы %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_dispms</word_key>
-      <word_default>Disabled private conversations</word_default>
-      <word_custom>Отключены личные бе�еды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>perf_discal</word_key>
-      <word_default>Disabled calendar</word_default>
-      <word_custom>Отключен календарь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>perf_toggle</word_key>
+      <word_default>Toggle now</word_default>
+      <word_custom>Переключить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -30052,39 +22773,13 @@
       <word_key>perf_disonline</word_key>
       <word_default>Disabled online list</word_default>
       <word_custom>Отключен �пи�ок онлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_dishooks</word_key>
-      <word_default>Disabled hooks</word_default>
-      <word_custom>Отключены хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>perf_enpms</word_key>
-      <word_default>Enabled private conversations</word_default>
-      <word_custom>Включенные личные бе�еды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>admin_tools</word_pack>
-      <word_key>perf_encal</word_key>
-      <word_default>Enabled calendar</word_default>
-      <word_custom>Включен календарь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>perf_enabled_group</word_key>
+      <word_default><![CDATA[Enabled group setting '%s' for group %s]]></word_default>
+      <word_custom><![CDATA[Включена на�тройка '%s' дл� группы %s]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -30092,19 +22787,20 @@
       <word_key>perf_enonline</word_key>
       <word_default>Enabled online list</word_default>
       <word_custom>Включен онлайн �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>admin_tools</word_pack>
-      <word_key>perf_enhooks</word_key>
-      <word_default>Enabled hooks</word_default>
-      <word_custom>Включены хуки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>perf_dispms</word_key>
+      <word_default>Disabled private conversations</word_default>
+      <word_custom>Отключены личные бе�еды</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_discal</word_key>
+      <word_default>Disabled calendar</word_default>
+      <word_custom>Отключен календарь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -30112,9 +22808,34 @@
       <word_key>settings_nofile</word_key>
       <word_default>There were no settings to import</word_default>
       <word_custom>�ет на�трооек дл� импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_enhooks</word_key>
+      <word_default>Enabled hooks</word_default>
+      <word_custom>Включены хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_dishooks</word_key>
+      <word_default>Disabled hooks</word_default>
+      <word_custom>Отключены хуки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_enpms</word_key>
+      <word_default>Enabled private conversations</word_default>
+      <word_custom>Включенные личные бе�еды</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>admin_tools</word_pack>
+      <word_key>perf_encal</word_key>
+      <word_default>Enabled calendar</word_default>
+      <word_custom>Включен календарь</word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/core/xml/core_bbcode.xml b/upload/admin/applications/core/xml/core_bbcode.xml
index e8c89cb1..2db8cc56 100644
--- a/upload/admin/applications/core/xml/core_bbcode.xml
+++ b/upload/admin/applications/core/xml/core_bbcode.xml
@@ -16,13 +16,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
@@ -31,7 +29,7 @@
       <bbcode_title>Выровн�ть по правому краю</bbcode_title>
       <bbcode_desc>Выравнивание �одержимого пол� дл� размещени� �ообщений по правому краю</bbcode_desc>
       <bbcode_tag>right</bbcode_tag>
-      <bbcode_replace><![CDATA[<span class='bbc_right'>{content}</span>]]></bbcode_replace>
+      <bbcode_replace><![CDATA[<p class='bbc_right'>{content}</p>]]></bbcode_replace>
       <bbcode_useoption>0</bbcode_useoption>
       <bbcode_example><![CDATA[[right]Какой-нибудь тек�т[/right]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
@@ -41,13 +39,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
@@ -56,7 +52,7 @@
       <bbcode_title>Выровн�ть по левому краю</bbcode_title>
       <bbcode_desc>Выравнивание �одержимого пол� дл� размещени� �ообщений по левому краю</bbcode_desc>
       <bbcode_tag>left</bbcode_tag>
-      <bbcode_replace><![CDATA[<span class='bbc_left'>{content}</span>]]></bbcode_replace>
+      <bbcode_replace><![CDATA[<p class='bbc_left'>{content}</p>]]></bbcode_replace>
       <bbcode_useoption>0</bbcode_useoption>
       <bbcode_example><![CDATA[[left]Тек�т, выровненный по левому краю[/left]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
@@ -66,13 +62,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
@@ -81,7 +75,7 @@
       <bbcode_title>Выровн�ть по центру</bbcode_title>
       <bbcode_desc>Выравнивание �одержимого пол� дл� размещени� �ообщений по центру</bbcode_desc>
       <bbcode_tag>center</bbcode_tag>
-      <bbcode_replace><![CDATA[<span class='bbc_center'>{content}</span>]]></bbcode_replace>
+      <bbcode_replace><![CDATA[<p class='bbc_center'>{content}</p>]]></bbcode_replace>
       <bbcode_useoption>0</bbcode_useoption>
       <bbcode_example><![CDATA[[center]Тек�т по центру[/center]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
@@ -91,13 +85,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
       <bbcode_custom_regex/>
     </bbcode>
@@ -116,13 +108,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
       <bbcode_custom_regex/>
     </bbcode>
@@ -141,13 +131,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
@@ -169,13 +157,11 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>1</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
@@ -194,18 +180,16 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>9</bbcode_id>
+      <bbcode_id>10</bbcode_id>
       <bbcode_title>Полужирный шрифт</bbcode_title>
       <bbcode_desc>Отображает тек�т полужирным шрифтом</bbcode_desc>
       <bbcode_tag>b</bbcode_tag>
@@ -219,18 +203,16 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>14</bbcode_id>
+      <bbcode_id>11</bbcode_id>
       <bbcode_title>Кур�ив</bbcode_title>
       <bbcode_desc>Отображает тек�т кур�ивом</bbcode_desc>
       <bbcode_tag>i</bbcode_tag>
@@ -244,18 +226,16 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>15</bbcode_id>
+      <bbcode_id>12</bbcode_id>
       <bbcode_title>�ижнее подчеркивание</bbcode_title>
       <bbcode_desc>Подчеркивает тек�т</bbcode_desc>
       <bbcode_tag>u</bbcode_tag>
@@ -269,18 +249,16 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>16</bbcode_id>
+      <bbcode_id>13</bbcode_id>
       <bbcode_title>Горизонтальна� черта</bbcode_title>
       <bbcode_desc>Добавл�ет горизонтальную черту дл� разделени� тек�та</bbcode_desc>
       <bbcode_tag>hr</bbcode_tag>
@@ -294,18 +272,16 @@
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>17</bbcode_id>
+      <bbcode_id>14</bbcode_id>
       <bbcode_title>Код</bbcode_title>
       <bbcode_desc>И�пользуйте данный ВВ-код дл� отображени� пол� � кодом</bbcode_desc>
       <bbcode_tag>code</bbcode_tag>
@@ -316,23 +292,21 @@
       <bbcode_example><![CDATA[[code]$text = 'Some long code here';[/code]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>Код</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases>codebox</bbcode_aliases>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>18</bbcode_id>
+      <bbcode_id>15</bbcode_id>
       <bbcode_title>PHP код</bbcode_title>
       <bbcode_desc>Отображение PHP кода � форматированием и под�веткой �интак�и�а</bbcode_desc>
       <bbcode_tag>php</bbcode_tag>
@@ -345,23 +319,21 @@
 print_r($variable);[/php]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>PHP код</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>19</bbcode_id>
+      <bbcode_id>16</bbcode_id>
       <bbcode_title>HTML код</bbcode_title>
       <bbcode_desc>Отображение HTML разметки � форматированием и под�веткой �интак�и�а</bbcode_desc>
       <bbcode_tag>html</bbcode_tag>
@@ -374,23 +346,21 @@ print_r($variable);[/php]]]></bbcode_example>
  </div>[/html]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>HTML код</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>20</bbcode_id>
+      <bbcode_id>17</bbcode_id>
       <bbcode_title>SQL код</bbcode_title>
       <bbcode_desc>Отображение SQL кода � форматированием и под�веткой �интак�и�а</bbcode_desc>
       <bbcode_tag>sql</bbcode_tag>
@@ -401,23 +371,21 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_example><![CDATA[[sql]SELECT p.*, t.* FROM posts p LEFT JOIN topics t ON t.tid=p.topic_id WHERE t.tid=7[/sql]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>SQL команда</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>21</bbcode_id>
+      <bbcode_id>18</bbcode_id>
       <bbcode_title>XML код</bbcode_title>
       <bbcode_desc>Отображение XML разметки � форматированием и под�веткой �интак�и�а</bbcode_desc>
       <bbcode_tag>xml</bbcode_tag>
@@ -432,23 +400,21 @@ print_r($variable);[/php]]]></bbcode_example>
 </outer>[/xml]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>XML код</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>22</bbcode_id>
+      <bbcode_id>19</bbcode_id>
       <bbcode_title>URL</bbcode_title>
       <bbcode_desc>Тег дл� �оздани� гипер��ылки</bbcode_desc>
       <bbcode_tag>url</bbcode_tag>
@@ -464,18 +430,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>1</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>23</bbcode_id>
+      <bbcode_id>20</bbcode_id>
       <bbcode_title>Изображение</bbcode_title>
       <bbcode_desc>В�тавка изображени� в тек�т</bbcode_desc>
       <bbcode_tag>img</bbcode_tag>
@@ -489,18 +453,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>24</bbcode_id>
+      <bbcode_id>21</bbcode_id>
       <bbcode_title>Цитата</bbcode_title>
       <bbcode_desc>Отобажение цитаты в тек�те</bbcode_desc>
       <bbcode_tag>quote</bbcode_tag>
@@ -516,43 +478,39 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>25</bbcode_id>
+      <bbcode_id>22</bbcode_id>
       <bbcode_title>От�туп</bbcode_title>
       <bbcode_desc>�ебольшой от�туп тек�та от левой границы</bbcode_desc>
       <bbcode_tag>indent</bbcode_tag>
-      <bbcode_replace><![CDATA[<div class='bbc_indent'>{content}</div>]]></bbcode_replace>
+      <bbcode_replace><![CDATA[<div class='bbc_indent' style='margin-left:{option}px'>{content}</div>]]></bbcode_replace>
       <bbcode_useoption>0</bbcode_useoption>
       <bbcode_example><![CDATA[[indent]Тек�т дл� от�тупа[/indent]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
       <bbcode_menu_content_text/>
-      <bbcode_single_tag>0</bbcode_single_tag>
+      <bbcode_single_tag>1</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
-      <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
+      <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
-      <bbcode_optional_option>0</bbcode_optional_option>
+      <bbcode_optional_option>1</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>26</bbcode_id>
+      <bbcode_id>23</bbcode_id>
       <bbcode_title>Спи�ок</bbcode_title>
       <bbcode_desc>Создание HTML �пи�ка. Поддерживают�� многоуровневые �пи�ки и разные типы маркеров</bbcode_desc>
       <bbcode_tag>list</bbcode_tag>
@@ -575,18 +533,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>27</bbcode_id>
+      <bbcode_id>24</bbcode_id>
       <bbcode_title>Перечеркнутый тек�т</bbcode_title>
       <bbcode_desc>Отображает перечеркнутый тек�т</bbcode_desc>
       <bbcode_tag>strike</bbcode_tag>
@@ -600,18 +556,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases>s</bbcode_aliases>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>28</bbcode_id>
+      <bbcode_id>25</bbcode_id>
       <bbcode_title>Под�трочный тек�т</bbcode_title>
       <bbcode_desc>Отображение под�трочного тек�та</bbcode_desc>
       <bbcode_tag>sub</bbcode_tag>
@@ -625,18 +579,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>29</bbcode_id>
+      <bbcode_id>26</bbcode_id>
       <bbcode_title>�ад�трочный тек�т</bbcode_title>
       <bbcode_desc>Отображение над�трочного тек�та</bbcode_desc>
       <bbcode_tag>sup</bbcode_tag>
@@ -650,18 +602,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>30</bbcode_id>
+      <bbcode_id>27</bbcode_id>
       <bbcode_title>Email адре�</bbcode_title>
       <bbcode_desc>Создание ��ылки на Email адре�</bbcode_desc>
       <bbcode_tag>email</bbcode_tag>
@@ -677,18 +627,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>1</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>31</bbcode_id>
+      <bbcode_id>28</bbcode_id>
       <bbcode_title>Цвет фона</bbcode_title>
       <bbcode_desc>Измен�ет цвет фона тек�та</bbcode_desc>
       <bbcode_tag>background</bbcode_tag>
@@ -702,18 +650,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>32</bbcode_id>
+      <bbcode_id>29</bbcode_id>
       <bbcode_title>Цвет тек�та</bbcode_title>
       <bbcode_desc>Измен�ет цвет отображаемого тек�та</bbcode_desc>
       <bbcode_tag>color</bbcode_tag>
@@ -727,18 +673,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>33</bbcode_id>
+      <bbcode_id>30</bbcode_id>
       <bbcode_title>Размер тек�та</bbcode_title>
       <bbcode_desc>Увеличивает или уменьшает размер тек�та</bbcode_desc>
       <bbcode_tag>size</bbcode_tag>
@@ -752,18 +696,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>34</bbcode_id>
+      <bbcode_id>31</bbcode_id>
       <bbcode_title>Шрифт</bbcode_title>
       <bbcode_desc>Измен�ет шрифт тек�та</bbcode_desc>
       <bbcode_tag>font</bbcode_tag>
@@ -777,18 +719,16 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>35</bbcode_id>
+      <bbcode_id>32</bbcode_id>
       <bbcode_title>С�ылка на пользовател�</bbcode_title>
       <bbcode_desc><![CDATA[По данному имени �оздает ��ылку на профиль пользовател�]]></bbcode_desc>
       <bbcode_tag>member</bbcode_tag>
@@ -796,24 +736,22 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_useoption>1</bbcode_useoption>
       <bbcode_example><![CDATA[[member=admin] заведует �тим �айтом.]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
-      <bbcode_menu_option_text/>
+      <bbcode_menu_option_text>Им� пользовател�</bbcode_menu_option_text>
       <bbcode_menu_content_text/>
       <bbcode_single_tag>1</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>0</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
     <bbcode>
-      <bbcode_id>36</bbcode_id>
+      <bbcode_id>34</bbcode_id>
       <bbcode_title>Медиа</bbcode_title>
       <bbcode_desc>Позвол�ет размещать видео, аудио и другие ролики � некоторых �айтов</bbcode_desc>
       <bbcode_tag>media</bbcode_tag>
@@ -821,119 +759,63 @@ print_r($variable);[/php]]]></bbcode_example>
       <bbcode_useoption>1</bbcode_useoption>
       <bbcode_example><![CDATA[[media]http://www.youtube.com/watch?v=YqqLx-2vUr0[/media]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
-      <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_option_text>Разрешение (только Flash)</bbcode_menu_option_text>
+      <bbcode_menu_content_text>С�ылка</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>1</bbcode_protected>
       <bbcode_aliases>video,movie,flash,blogmedia,youtube</bbcode_aliases>
       <bbcode_optional_option>1</bbcode_optional_option>
       <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
       <bbcode_app>core</bbcode_app>
     <bbcode_custom_regex/>
     </bbcode>
-    <bbcode>
-      <bbcode_id>35</bbcode_id>
-      <bbcode_title>Выдержка из запи�и блога</bbcode_title>
-      <bbcode_desc>Тек�т заключенный в данный тег будет выводит�� вме�то в�ей запи�и на главной �транице блога, а так же в  RSS ленте блога.</bbcode_desc>
-      <bbcode_tag>extract</bbcode_tag>
-      <bbcode_replace><![CDATA[<!--blog.extract.start-->{content}<!--blog.extract.end-->]]></bbcode_replace>
-      <bbcode_useoption>0</bbcode_useoption>
-      <bbcode_example><![CDATA[[extract]Пример тек�та[/extract]]]></bbcode_example>
-      <bbcode_switch_option>0</bbcode_switch_option>
-      <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
-      <bbcode_single_tag>0</bbcode_single_tag>
-      <bbcode_groups>all</bbcode_groups>
-      <bbcode_sections>all</bbcode_sections>
-      <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
-      <bbcode_no_parsing>0</bbcode_no_parsing>
-      <bbcode_protected>0</bbcode_protected>
-      <bbcode_aliases/>
-      <bbcode_optional_option>0</bbcode_optional_option>
-      <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
-      <bbcode_app>core</bbcode_app>
-    <bbcode_custom_regex/>
-    </bbcode>
-    <bbcode>
-      <bbcode_id>36</bbcode_id>
-      <bbcode_title>С�ылка на блог</bbcode_title>
-      <bbcode_desc>Создание ��ылки на конкретный блог в �и�теме.</bbcode_desc>
-      <bbcode_tag>blog</bbcode_tag>
-      <bbcode_replace><![CDATA[<a href='{base_url}app=blog&amp;showblog={option}' class="bbc_url">{content}</a>]]></bbcode_replace>
-      <bbcode_useoption>1</bbcode_useoption>
-      <bbcode_example><![CDATA[[blog=100]Блог[/blog]]]></bbcode_example>
-      <bbcode_switch_option>0</bbcode_switch_option>
-      <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
-      <bbcode_single_tag>0</bbcode_single_tag>
-      <bbcode_groups>all</bbcode_groups>
-      <bbcode_sections>all</bbcode_sections>
-      <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
-      <bbcode_no_parsing>0</bbcode_no_parsing>
-      <bbcode_protected>0</bbcode_protected>
-      <bbcode_aliases/>
-      <bbcode_optional_option>0</bbcode_optional_option>
-      <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
-      <bbcode_app>core</bbcode_app>
-    <bbcode_custom_regex/>
-    </bbcode>
-    <bbcode>
-      <bbcode_id>37</bbcode_id>
-      <bbcode_title>С�ылка на запи�ь в блоге</bbcode_title>
-      <bbcode_desc>Создание ��ылки на запи�ь в блоге.</bbcode_desc>
-      <bbcode_tag>entry</bbcode_tag>
-      <bbcode_replace><![CDATA[<a href='{base_url}app=blog&amp;module=display&amp;section=blog&amp;showentry={option}' class="bbc_url">{content}</a>]]></bbcode_replace>
-      <bbcode_useoption>1</bbcode_useoption>
-      <bbcode_example><![CDATA[[entry=100]Запи�ь[/entry]]]></bbcode_example>
-      <bbcode_switch_option>0</bbcode_switch_option>
-      <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
-      <bbcode_single_tag>0</bbcode_single_tag>
-      <bbcode_groups>all</bbcode_groups>
-      <bbcode_sections>all</bbcode_sections>
-      <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
-      <bbcode_no_parsing>0</bbcode_no_parsing>
-      <bbcode_protected>0</bbcode_protected>
-      <bbcode_aliases/>
-      <bbcode_optional_option>0</bbcode_optional_option>
-      <bbcode_image/>
-      <bbcode_strip_search>0</bbcode_strip_search>
-      <bbcode_app>core</bbcode_app>
-      <bbcode_custom_regex/>
-    </bbcode>
     <bbcode>
       <bbcode_id>38</bbcode_id>
       <bbcode_title>Twitter</bbcode_title>
-      <bbcode_desc><![CDATA[A tag to link to a user's twitter account]]></bbcode_desc>
+      <bbcode_desc><![CDATA[С�ылка на учетную запи�ь пользовател� в Twitter]]></bbcode_desc>
       <bbcode_tag>twitter</bbcode_tag>
       <bbcode_replace><![CDATA[<a href='http://www.twitter.com/{content}' class="bbc_url">@{content}</a>]]></bbcode_replace>
       <bbcode_useoption>0</bbcode_useoption>
       <bbcode_example><![CDATA[[twitter]userName[/twitter]]]></bbcode_example>
       <bbcode_switch_option>0</bbcode_switch_option>
       <bbcode_menu_option_text/>
-      <bbcode_menu_content_text/>
+      <bbcode_menu_content_text>Пользователь</bbcode_menu_content_text>
       <bbcode_single_tag>0</bbcode_single_tag>
       <bbcode_groups>all</bbcode_groups>
       <bbcode_sections>all</bbcode_sections>
       <bbcode_php_plugin/>
-      <bbcode_parse>2</bbcode_parse>
       <bbcode_no_parsing>1</bbcode_no_parsing>
       <bbcode_protected>0</bbcode_protected>
       <bbcode_aliases/>
       <bbcode_optional_option>0</bbcode_optional_option>
       <bbcode_image>twitter.png</bbcode_image>
-      <bbcode_strip_search>0</bbcode_strip_search>
+      <bbcode_app>core</bbcode_app>
+      <bbcode_custom_regex/>
+    </bbcode>
+    <bbcode>
+      <bbcode_id>47</bbcode_id>
+      <bbcode_title>Медиа приложений</bbcode_title>
+      <bbcode_desc>Размещение медиа контента из дополнительных приложений к IP.Board</bbcode_desc>
+      <bbcode_tag>sharedmedia</bbcode_tag>
+      <bbcode_replace/>
+      <bbcode_useoption>1</bbcode_useoption>
+      <bbcode_example><![CDATA[[sharedmedia=core:attachments:123]]]></bbcode_example>
+      <bbcode_switch_option>0</bbcode_switch_option>
+      <bbcode_menu_option_text/>
+      <bbcode_menu_content_text/>
+      <bbcode_single_tag>1</bbcode_single_tag>
+      <bbcode_groups>all</bbcode_groups>
+      <bbcode_sections>all</bbcode_sections>
+      <bbcode_php_plugin>defaults.php</bbcode_php_plugin>
+      <bbcode_no_parsing>1</bbcode_no_parsing>
+      <bbcode_protected>1</bbcode_protected>
+      <bbcode_aliases/>
+      <bbcode_optional_option>0</bbcode_optional_option>
+      <bbcode_image/>
       <bbcode_app>core</bbcode_app>
       <bbcode_custom_regex/>
     </bbcode>
diff --git a/upload/admin/applications/core/xml/core_help.xml b/upload/admin/applications/core/xml/core_help.xml
deleted file mode 100644
index d66ea187..00000000
--- a/upload/admin/applications/core/xml/core_help.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<export>
-  <help>
-    <row>
-      <title>Пои�к</title>
-      <text><![CDATA[Си�тема и�пользует�� дл� пои�ка интере�ующего ва� контента в форуме.<br />
-<br />
-<strong>Бы�трый пои�к</strong><br />
-Дл� начала пои�ка вы можете во�пользовать�� формой, ра�положенной вверху �траниц форума. Введите в поле интере�ующий ва� ключ, по которому необходимо о�уще�твить пои�к и нажмите кнопку "Пои�к".<br />
-<br />
-<strong>Ра�ширенный пои�к</strong><br />
-Е�ли вы хотите перейти к полноценной форме пои�ка, во�пользуйте�ь ��ылкой "Ра�ширенный", котора� ра�полагает�� р�дом � формой бы�трого пои�ка.<br />
-<br />
-"Пои�к по <strong>ключевым �ловам</strong>" зде�ь вы можете вве�ти ключ, по которому необходимо о�уще�твить пои�к.<br />
-<br />
-"Пои�к по <strong>автору</strong>" данное поле необходимо заполнить, е�ли вы хотите найти публикации от определенного пользовател�. По мере ввода имени пользовател�, вам будут предложены варианты имен пользователей, которые подход�т уже введенному.<br />
-<br />
-"Пои�к по <strong>дате</strong>" вы можете ограничить пои�к определенным временным интервалом. Дл� �того необходимо вызвать при помощи кнопки <img src='{style_image_url}/date.png' /> календарь и в нем выбрать нужную дату.<br />
-<br />
-"И�кать в <strong>форуме</strong> выбор определенных разделов в поле �права, позволит вам о�уще�твить пои�к только в определенных разделах форума. При помощи зажатой кнопки Ctrl (или кнопки cmd в Mac) вы можете выбрать �разу не�колько разделов.<br />
-<br />
-В�е �ти пол� опциональны, однако, хот� бы одно из них должно быть заполнено. По�ле того как вы определите�ь � у�лови�ми пои�ка, нажмите кнопку <span class='input_submit'>�айти</span> чтобы начать проце�� пои�ка на форуме.<br />
-<br />
-<strong>Контек�тный пои�к</strong><br />
-Вы можете и�пользовать пои�к внутри конкретных разделов или тем. Под �пи�ком каждого раздела или темы е�ть форма  "Пои�к по форуму" и "Пои�к по теме" - про�то введите ключевое �лово в данное поле и нажмите кнопку <span class='input_submit alt'>ОК</span> чтобы запу�тить контек�тный пои�к.<br />
-<br />
-<strong>Результаты</strong><br />
-Результаты пои�ка пред�тавл�ют�� �траницей � закладками. Закладки определ�ют, по какой ча�ти форума о�уще�твл�ет�� пои�к. �апример, результаты под закладкой "Форумы" �обраны при пои�ке по темам и �ообщени�м форумов, а результаты под закладкой "Пользователи"  - при пои�ке по �пи�ку пользователей.<br />
-<br />
-Вы можете �ортировать результаты пои�ка по релевантно�ти или по дате.<br />
-<br />
-Ключевое �лово в результатах пои�ка будет <span class='searchlite'>под�вечено</span>.<br />
-<br />
-�ажав на интере�ующем ва� результате, вы будете перемещены к данному контенту.]]></text>
-      <description>Как и�пользовать �и�тему пои�ка форума</description>
-      <position>8</position>
-      <app>core</app>
-    </row>
-    <row>
-      <title>�а�тройки вашего профил�</title>
-      <text><![CDATA[Дл� перехода к на�тройкам вам необходимо нажать на ваше им� пользовател�, ра�положенное в вверху каждой �траницы форума и в выпадающем меню выбрать пункт "�а�тройки".<br />
-<br />
-Перед вами откроет�� �траница � не�колькими закладками, за каждой закладкой ра�положены опции дл� на�тройки вашего профил�. Опишем �ти закладки:<br />
-<br />
-<br />
-<strong>�а�тройки</strong><br />
-<br />
-<em>Общие на�тройки</em><br />
-<ul><br />
-	<li>�а�тройки приватно�ти<br />
-		Зде�ь вы можете на�троить подпи�ку на объ�влени� от админи�траторов форума, а так же �крыть �вой e-mail от о�тальных пользователей форума</li><br />
-	<li>Ча�овой по��<br />
-		�а�траивает�� ча�овой по��, а так же �и�тема автоматиче�кого перевода на зимнее/летнее врем�.</li><br />
-	<li>�а�тройки личных �ообщений<br />
-		Позвол�ют на�троить работу �и�темы уведомлений дл� личных �ообщений а так же вы можете полно�тью отключить личные �ообщени� дл� �воей учетной запи�и.</li><br />
-	<li>�а�тройки отправки �ообщений<br />
-		От�юда можно на�троить тип редактора и �по�об загрузки файлов дл� �ообщений.</li><br />
-</ul><br />
-	<br />
-<em>Изменение E-mail адре�а</em><br />
-Зде�ь вы можете изменить �вой e-mail адре�.<br />
-<br />
-<em>Изменение парол�</em><br />
-Зде�ь вы можете изменить пароль �воей учетной запи�и.<br />
-<br />
-<em>Изменение отображаемого имени пользовател�</em><br />
-В зави�имо�ти от на�троек форума и ваших прав при помощи данной на�тройки вы можете изменить �вое отображаемое им� на форуме.<br />
-<br />
-<em>Заметки</em><br />
-Зде�ь вы можете хранить какую-то информацию. Заметки они и е�ть заметки.<br />
-<br />
-<em>Прикрепленные файлы</em><br />
-�а �той �транице вы увидите какие файлы вы загрузили на форум, а так же �можете узнать �колько до�тупного ме�та, выделенного под ваши файлы, уже зан�то, а �колько о�тало�ь.<br />
-<br />
-Так же на �той �транице вы можете управл�ть �воими размещенными файлами, а именно удал�ть �тарые. Дл� �того отметьте галочкой файлы, которые должны быть удалены, и нажмите кнопку <span class='input_submit alt'>Удалить</span> внизу таблицы.<br />
-<br />
-<br />
-<strong>Форумы</strong><br />
-<br />
-<em>�а�тройки форума</em><br />
-<ul><br />
-	<li>�а�тройки отображени� форума<br />
-		Зде�ь �обраны на�тройки, которые помогут изменить вывод форумов и тем. В ча�тно�ти вы можете отключить вывод подпи�ей, аватаров, изображений в �ообщени�х, изменить количе�тво тем и �ообщений на �транице и т.п.</li><br />
-	<li>�а�тройки форума<br />
-		Данные опции позвол�т вам на�троить �и�тему уведомлений и новых темах, �ообщени�х.</li><br />
-</ul><br />
-	<br />
-<em>Ваши подпи�ки на темы и Ваши подпи�ки на форумы</em><br />
-�а �тих �траницах вы можете увидеть полные �пи�ки форумов и тем, на которые вы подпи�аны.<br />
-<br />
-Так же е�ть возможно�ть отпи�ать�� от любого из них, дл� �того выберите чекбок� �права от темы/форума, выберите в выпадающем �пи�ке внизу таблицы дей�твие, которое вы хотите �овершить � подпи�ками и нажмите кнопку <span class='input_submit alt'>� отмеченными</span>.<br />
-<br />
-<br />
-<strong>Профиль</strong><br />
-<br />
-<em>Изменить данные профил�</em><br />
-<ul><br />
-	<li>Комментарии<br />
-		Зде�ь производит�� на�тройка комментариев вашего профил�, а так же уведомлени� о них.</li><br />
-	<li>Друзь�<br />
-		Зде�ь производит�� на�тройка добавлени� ва� в друзь�, а так же уведомлени� о запро�ах на дружбу.</li><br />
-	<li>Данные профил�<br />
-		�а�тройка данных вашего профил�. День рождени�, по�ледние по�етители профил� и т.п.</li><br />
-	<li>Друга� информаци�<br />
-		Зде�ь вы можете указать дополнительную информацию дл� вашего профил�.</li><br />
-</ul><br />
-<br />
-<em>Информаци� о �ебе</em><br />
-Зде�ь на�траивает�� �екци� 'Обо мне' вашего профил�.<br />
-<br />
-<em>Изменить подпи�ь</em><br />
-Зде�ь вы можете изменить вашу подпи�ь.<br />
-<br />
-<em>Изменить фотографию</em><br />
-Зде�ь вы можете загрузить или изменить �вою фотографию.<br />
-<br />
-<em>Изменить аватар</em><br />
-Зде�ь вы можете загрузить или изменить �вою аватар.<br />
-<br />
-<em>Игнорируемые пользователи</em><br />
-�а �той �транице вы можете на�троить игнорирование пользователей, а так же что именно вы не хотите получать от них.<br />
-<br />
-Дл� добавлени� пользовател� в �пи�ок, введите его им� в поле "Им� пользовател�". По мере ввода имени вам будут предложены варианты имен пользователей, удовлетвор�ющих тому, что вы вводите. Теперь необходимо определить, что именно вы не хотите получать. Отмечаю опцию "Игнорировать личные �ообщени�" вы запрещаете пользователю отправл�ть вам личные �ообщени�, выбира� опцию "Игнорировать �ообщени�", вы отключаете показ в�ех �ообщений данного пользовател� в темах. Вы можете выбрать обе опции, дл� полного игнорировани� пользовател� на форуме. По�ле того как нужные пол� будут заполнены нажмите кнопку <span class='input_submit'>Сохранить</span>. <br />
-<br />
-Заметим, что некоторые группы пользователей имеют иммунитет к игнорированию, вы не �можете игнорировать пользователей из таких групп.  <br />
-<br />
-Е�ли вы решили прекратить игнорировать пользовател� про�то нажмите кнопку "Удалить", так же вы в любой момент можете изменить что именно вы не хотите получать от пользовател�.]]></text>
-      <description>Редактирование контактной и пер�ональной информации, аватаров, подпи�и, на�троек форума, �мена �зыка и �тил�.</description>
-      <position>3</position>
-      <app>core</app>
-    </row>
-    <row>
-      <title>Преимуще�тва реги�трации</title>
-      <text><![CDATA[Дл� полноценного и�пользовани� в�ех функций форума, необходимо зареги�трировать учетную запи�ь на форуме. Реги�траци� на форуме бе�платна и займет в�его лишь пару минут. <br />
- <br />
- Дл� реги�трации необходимо нажать ��ылку "<a href='{board_url}app=core&module=global&section=register'>Реги�траци�</a>" на любой �транице форума. Вы увидите �траницу � реги�трационным �оглашением, которое необходимо прочитать, пон�ть и прин�ть, отметив необходимый пункт и нажав кнопку <span class='input_submit'>Продолжить реги�трацию</span>.<br />
- <br />
- �а �транице реги�трации вы должны заполнить в�е об�зательные пол�.  Будьте внимательны при заполнении формы, е�ли вы допу�тите какие-то ошибки, то р�дом � полем по�вит�� �ообщение. По�ле того как вы заполните в�е пол�, нажмите кнопку <span class='input_submit'>Реги�траци�</span>.<br />
- <br />
- По�ле отправки формы реги�трации, возможно, что вам необходимо будет активировать �вою учетную запи�ь, дл� �того форум вышлет вам пи�ьмо � ��ылкой на активацию учетной запи�и, пройдите по ней и активируйте учетную запи�ь.]]></text>
-      <description>Как зареги�трировать�� и каковы преимуще�тва зареги�трированного пользовател�.</description>
-      <position>1</position>
-      <app>core</app>
-    </row>
-    <row>
-      <title>�вторизаци� и выход</title>
-      <text><![CDATA[<strong>�вторизаци�</strong><br />
-Дл� входа на форум под �воей учетной запи�ью про�то во�пользуйте�ь ��ылкой "Вход", ра�положенной вверху каждой �траницы форума.<br />
-<br />
-�а �транице авторизации вам необходимо будет вве�ти ваше им� пользовател� или email адре�, а также пароль, в�е �ти данные вы указывали при реги�трации. Так же вы можете выбрать опцию "Запомнить мен�", что избавит ва� от необходимо�ти авторизовать�� каждый раз, когда вы по�ещаете наш форум. Данную опцию �ледует и�пользовать только при работе на личном пер�ональном компьютере, е�ли вы авторизуете�ь на форуме � общедо�тупного компьютера (например, в компьютерном клубе или библиотеке), то ни в коем �лучае не выбирайте �ту опцию.<br />
-<br />
-Так же при авторизации вы можете выбрать опцию "Скрытно�ть". В �том �лучае, ваше им� пользовател� не будет отображать�� в �пи�ках он-лайн пользователей, хот� админи�траторы форума в�е равно будут знать о вашем при�ут�твии на форуме.<br />
-<br />
-Когда в�е пол� заполнены и нужные опции выбраны про�то нажмите кнопку <span class='input_submit'>Войти</span>.<br />
-По�ле �того форум переме�тит ва� к той �транице, � которой вы ушли на �траницу авторизации.<br />
-<br />
-�аш форум также поддерживает авторизацию через OpenID или Facebook Connect. Е�ли �ти методы авторизации включены, про�то выберите наиболее удобный вам метод и �ледуйте ин�трукци�м.<br />
-<br />
-<br />
-<strong>Во��тановление забытого парол�</strong><br />
-Е�ли вы забыли �вой пароль то на �транице входа е�ть ��ылка "Я забыл �вой пароль". Пройд� по ней, вы попадете на форму во��тановлени� парол�. В �той форме вам необходимо будет вве�ти ваши им� пользовател� или email (которые вы указывали при реги�трации) и форум вышлет вам новые данные на ваш e-mail.<br />
-<br />
-�е пытайте�ь подобрать �вой пароль, наш форум при большом количе�тве неверных попыток авторизации блокирует аккаунт. По�тому лучше во��тановить пароль, прежде чем �и�тема заблокирует ва�, в противном �лучае вы не �можете во�пользовать�� �воей учетной запи�ью, даже � новым (во��тановленным) паролем до тех пор, пока админи�тратор не �нимет блокировку � вашей учетной запи�и, или блокировка не �нимет�� автоматиче�ки.<br />
-<br />
-<br />
-<strong>Выход</strong><br />
-Дл� выхода из �воей учетной запи�и во�пользуйте�ь ��ылкой "Выход", ра�положенной вверху каждой �траницы форума.]]></text>
-      <description>Как авторизировать�� и выходить � форума, как о�тавать�� анонимным и во��танавливать пароль к �воей учетной запи�и.</description>
-      <position>2</position>
-      <app>core</app>
-    </row>
-    <row>
-      <title>Св�зь � админи�трацией форума</title>
-      <text><![CDATA[Е�ли вам необходимо �в�зать�� � админи�тратором или модератором форума, либо вы про�то хотите по�мотреть, кто работает в админи�тратор�кой команде форума, во�пользуйте�ь ��ылкой '�дмини�траци�', ра�положенной внизу главной �траницы форума. <br />
-<br />
-Заметим, что е�ли вы нашли нарушение на форуме и хотите привлечь внимание админи�трации форума, вы про�то можете во�пользовать�� кнопкой "<img src='{style_image_url}/report.png' /> Жалоба", котора� обычно находит�� р�дом � �одержимым.]]></text>
-      <description>Подробно о том, как �в�зать�� � админи�тарцией форума</description>
-      <position>10</position>
-      <app>core</app>
-    </row>
-  </help>
-</export>
diff --git a/upload/admin/applications/core/xml/core_mediatag.xml b/upload/admin/applications/core/xml/core_mediatag.xml
index bb5997ec..20dc0fc3 100644
--- a/upload/admin/applications/core/xml/core_mediatag.xml
+++ b/upload/admin/applications/core/xml/core_mediatag.xml
@@ -2,56 +2,76 @@
 <mediatagexport>
   <mediataggroup>
     <mediatag>
+      <mediatag_id>1</mediatag_id>
       <mediatag_name>YouTube</mediatag_name>
-      <mediatag_match>http://(\w+.|)youtube.com/watch?v={2}</mediatag_match>
-      <mediatag_replace><![CDATA[<object width="425" height="355"><param name="movie" value="http://youtube.com/v/$2"></param><param name="wmode" value="transparent"></param><embed src="http://youtube.com/v/$2" type="application/x-shockwave-flash" wmode="transparent" width="425" height="355"></embed></object>]]></mediatag_replace>
-    <mediatag_id>1</mediatag_id>
-    <mediatag_position>6</mediatag_position>
+      <mediatag_match><![CDATA[http://(www.)?youtube.com/watch\?v=([\d\w-_]+?)(&\S+?)?]]></mediatag_match>
+      <mediatag_replace><![CDATA[<object style="height: 390px; width: 640px"><param name="movie" value="http://youtube.com/v/$2?version=3" /><param name="allowFullScreen" value="true" /><param name="allowScriptAccess" value="always" /><embed src="http://youtube.com/v/$2?version=3" type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"></embed></object>]]></mediatag_replace>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
+      <mediatag_id>1</mediatag_id>
+    <mediatag_name>Флеш-ролик</mediatag_name>
+      <mediatag_match>{1}.swf</mediatag_match>
+      <mediatag_replace><![CDATA[<embed src="$1.swf" {width} {height} play="true" loop="true" quality="best" type="application/x-shockwave-flash" wmode="transparent" pluginspace="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" />]]></mediatag_replace>
+      <mediatag_position>6</mediatag_position>
+    </mediatag>
+    <mediatag>
+      <mediatag_id>2</mediatag_id>
       <mediatag_name>Google Video</mediatag_name>
       <mediatag_match>http://video.google.com/videoplay?docid={1}</mediatag_match>
       <mediatag_replace><![CDATA[<embed style="width:400px; height:326px;" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=$1&hl=en" flashvars=""> </embed>]]></mediatag_replace>
-    <mediatag_id>2</mediatag_id>
-    <mediatag_position>4</mediatag_position>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
+      <mediatag_id>3</mediatag_id>
       <mediatag_name>MySpace Video</mediatag_name>
-      <mediatag_match><![CDATA[http://vids.myspace.com/index.cfm?fuseaction=vids.individual(&amp;|&amp;amp;)videoid={2}(&amp;|&|$)]]></mediatag_match>
-      <mediatag_replace><![CDATA[<embed src="http://mediaservices.myspace.com/services/media/embed.aspx/m=$2,t=1,mt=video" type="application/x-shockwave-flash" width="430" height="346"></embed>]]></mediatag_replace>
-    <mediatag_id>3</mediatag_id>
-    <mediatag_position>1</mediatag_position>
+      <mediatag_match>http://www.myspace.com/video/{1}/(\d+)$</mediatag_match>
+      <mediatag_replace><![CDATA[<object width="425px" height="360px" >
+<param name="allowScriptAccess" value="always"/>
+<param name="allowFullScreen" value="true"/>
+<param name="wmode" value="transparent"/>
+<param name="movie" value="http://mediaservices.myspace.com/services/media/embed.aspx/m=$2,t=1,mt=video"/>
+<embed src="http://mediaservices.myspace.com/services/media/embed.aspx/m=$2,t=1,mt=video" width="425" height="360" allowFullScreen="true" type="application/x-shockwave-flash" wmode="transparent" allowScriptAccess="always"></embed>
+</object>]]></mediatag_replace>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
+      <mediatag_id>4</mediatag_id>
       <mediatag_name>GameTrailers</mediatag_name>
       <mediatag_match>http://www.gametrailers.com/{1}/{2}/{3}</mediatag_match>
       <mediatag_replace><![CDATA[<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" id="gtembed" width="480" height="392">	<param name="allowScriptAccess" value="sameDomain" /> 	<param name="allowFullScreen" value="true" /> <param name="movie" value="http://www.gametrailers.com/remote_wrap.php?mid=$3"/> <param name="quality" value="high" /> <embed src="http://www.gametrailers.com/remote_wrap.php?mid=$3" swLiveConnect="true" name="gtembed" align="middle" allowScriptAccess="sameDomain" allowFullScreen="true" quality="high" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" width="480" height="392"></embed> </object>]]></mediatag_replace>
-    <mediatag_id>4</mediatag_id>
-    <mediatag_position>3</mediatag_position>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
-      <mediatag_name>Слайдшоу Flickr</mediatag_name>
+      <mediatag_id>5</mediatag_id>
+      <mediatag_name>Flickr фотографии</mediatag_name>
       <mediatag_match>http://www.flickr.com/photos/{1}/sets/{2}/</mediatag_match>
       <mediatag_replace><![CDATA[<iframe align="center" src="http://www.flickr.com/slideShow/index.gne?user_id=$1&set_id=$2" frameBorder="0" width="500" height="500"></iframe>]]></mediatag_replace>
-    <mediatag_id>5</mediatag_id>
-    <mediatag_position>2</mediatag_position>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
+      <mediatag_id>6</mediatag_id>
       <mediatag_name>MP3</mediatag_name>
       <mediatag_match>{1}.mp3</mediatag_match>
-      <mediatag_replace><![CDATA[<object type="application/x-shockwave-flash" data="{board_url}/public/mp3player.swf" width="300" height="40">
-     <param name="movie" value="{board_url}/public/mp3player.swf" />
-     <param name="FlashVars" value="mp3=$1.mp3&autoplay=0&loop=0&volume=100&showstop=1&showinfo=0" />
+      <mediatag_replace><![CDATA[<object type="application/x-shockwave-flash" data="{board_url}/public/mp3player.swf" width="300" height="40">
+     <param name="movie" value="{board_url}/public/mp3player.swf" />
+     <param name="FlashVars" value="mp3=$1.mp3&autoplay=0&loop=0&volume=100&showstop=1&showinfo=0" />
 </object>]]></mediatag_replace>
-    <mediatag_id>6</mediatag_id>
-    <mediatag_position>5</mediatag_position>
+    <mediatag_position>0</mediatag_position>
     </mediatag>
     <mediatag>
-      <mediatag_name>Flash ролик/игра</mediatag_name>
-      <mediatag_match>{1}.swf</mediatag_match>
-      <mediatag_replace><![CDATA[<embed src="$1.swf" {width} {height} play="true" loop="true" quality="best" type="application/x-shockwave-flash" wmode="transparent" pluginspace="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" />]]></mediatag_replace>
-    <mediatag_id>7</mediatag_id>
-    <mediatag_position>7</mediatag_position>
+      <mediatag_id>8</mediatag_id>
+    <mediatag_name>Vimeo</mediatag_name>
+      <mediatag_match>http://vimeo.com/{1}</mediatag_match>
+      <mediatag_replace><![CDATA[<iframe src="http://player.vimeo.com/video/$1" width="400" height="250" frameborder="0"></iframe>]]></mediatag_replace>
+      <mediatag_position>0</mediatag_position>
+    </mediatag>
+    <mediatag>
+      <mediatag_name>YouTu.be</mediatag_name>
+      <mediatag_match><![CDATA[http://(www.)?youtu.be/([\d\w-_]+?)$]]></mediatag_match>
+      <mediatag_replace><![CDATA[<object width="560" height="349"><param name="movie" value="http://youtube.com/v/$2"></param><param name="wmode" value="transparent"></param><param name="flashvars" value="fs=1&autoplay=0&playerMode=embedded"></param><embed src="http://youtube.com/v/$2" type="application/x-shockwave-flash" wmode="transparent" width="560" height="349"></embed></object>]]></mediatag_replace>
+      <mediatag_id>9</mediatag_id>
+      <mediatag_position>0</mediatag_position>
     </mediatag>
   </mediataggroup>
 </mediatagexport>
diff --git a/upload/admin/applications/core/xml/core_mobile_css.xml b/upload/admin/applications/core/xml/core_mobile_css.xml
index 0341c307..cf6f942c 100644
--- a/upload/admin/applications/core/xml/core_mobile_css.xml
+++ b/upload/admin/applications/core/xml/core_mobile_css.xml
@@ -2,7 +2,7 @@
 <css>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>calendar_select</css_group>
     <css_content/>
     <css_position>1</css_position>
@@ -11,60 +11,11 @@
     <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>mobile</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
-    <css_group>ipb_bbcode</css_group>
-    <css_content>/***************************************************************/
-/* IP.Board 3 CSS                                              */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_bbcode.css - BBCode CSS								   */
-/***************************************************************/
-
-/* 	NOTE: This CSS file styles bbcodes throughout IPB. It is
-	recommended that you DO NOT change these styles if you are
-	creating a skin since it may interfere with user expectation
-	of what certain BBCodes look like. */
-	
-strong.bbc				{	font-weight: bold !important; }
-em.bbc 					{	font-style: italic !important; }
-span.bbc_underline 		{ 	text-decoration: underline !important; }
-div.bbc_center 			{	text-align: center; }
-div.bbc_left 			{	text-align: left; }
-div.bbc_right 			{	text-align: right; }
-div.bbc_indent 			{	margin-left: 50px; }
-del.bbc 				{	text-decoration: line-through !important; }
-ul.bbc 					{	list-style: disc outside; margin-left: 30px; }
-	ul.bbc ul.bbc 			{	list-style-type: circle; }
-		ul.bbc ul.bbc ul.bbc 	{	list-style-type: square; }
-ol.bbc 					{ list-style: decimal outside; margin-left: 30px; }
-	ol.bbc ol.bbc 			{	list-style-type: lower-roman; }
-hr.bbc 					{ 	display: block; border-top: 2px solid #777; }
-div.bbc_spoiler 		{	 }
-div.bbc_spoiler span	{ 	font-weight: bold; }
-div.bbc_spoiler_wrapper	{ 	border: 1px inset #777; padding: 4px; }
-div.bbc_spoiler_content	{ 	 }
-input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0px; }</css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>mobile</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_editor</css_group>
     <css_content/>
     <css_position>1</css_position>
@@ -73,13 +24,11 @@ input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0p
     <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>mobile</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_ie</css_group>
     <css_content>#search {
 	position: absolute !important;
@@ -137,20 +86,26 @@ input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0p
 #ipboard_body .user_controls li {
 	margin: 0 4px 0 0;
 	text-align: center;
-}*/</css_content>
+}*/
+
+/***********************************/
+/* Gallery IE fixes 			   */
+
+.note_fill {
+	width: 98.5%;
+	height: 98.5%;
+}</css_content>
     <css_position>0</css_position>
     <css_app>core</css_app>
     <css_app_hide>0</css_app_hide>
     <css_attributes/>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>mobile</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_print</css_group>
     <css_content><![CDATA[* {
 	font-family: Georgia, "Times New Roman", serif;
@@ -245,66 +200,17 @@ h1, h2, h3 {
     <css_attributes><![CDATA[media="print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>mobile</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
-    <css_group>ipb_reset</css_group>
-    <css_content><![CDATA[/***************************************************************/
-/* IP.Board 3 CSS                                              */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_reset.css (YUI reset)								   */
-/***************************************************************/
-
-/*-----------------------------------------------*/
-/* This file resets default browser styles.   */
-/* You shouldn't need to edit this section.      */
-/*-----------------------------------------------*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
-table {	border-collapse:collapse; border-spacing:0; }
-fieldset,img { border:0; }
-address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; }
-ol,ul { list-style:none; }
-caption,th { text-align:left; }
-h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
-q:before,q:after { content:''; }
-abbr,acronym { border:0; }
-hr { display: none; }
-address{ display: inline; }]]></css_content>
-    <css_position>0</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>mobile</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_styles</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 Mobile CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
 /************************************************************************/
 /* ipb_styles.css														*/
 /************************************************************************/
-/*
-	[ color ]
-	[ font ]
-	[ borders ]
-	[ padding ]
-	[ margin ]
-	[ sizing ]
-	[ other ]
-*/
 
 /************************************************************************/
 /* RESET (Thanks to YUI) */
@@ -329,12 +235,57 @@ html, body, form, fieldset, p, div, h1, h2, h3, h4, h5, h6 {
 }
 
 body {
-	background: #e4ebf2;
+	background: #cad6e2;
 	color: #192b40;
-	font: normal 12px arial, verdana, tahoma, sans-serif;
+	font: normal 13px helvetica, arial, verdana, tahoma, sans-serif;
 	position: relative;
 }
 
+h1 {
+	background: #5376a0; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6b9ed2), color-stop(100%,#517db1)); /* Chrome,Safari4+ */
+	border-bottom: 1px solid #111;
+	text-align: center;
+}
+
+h1 a {
+	font-size: 1.2em; 
+	font-weight: bold; 
+	padding: 0;
+	text-shadow: 0px -1px 0 rgba(0,0,0,0.8);
+	display: inline-block;
+	max-width: 140px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	color: #fff;
+	text-decoration: none;
+	line-height: 42px; 
+	height: 42px;
+}
+	
+#content { -webkit-box-shadow: 0px 2px 12px rgba(0,0,0,0.2); }
+
+#footer {
+	margin: 0 auto;
+	text-align: center;
+	padding: 10px 0;
+	font-size: 11px;
+}
+	
+	#show_skins, #show_langs, #full_version, #app_link {
+		font-size: 12px;
+		text-decoration: none;
+		display: inline-block;
+		-webkit-border-radius: 10px;
+		padding: 5px 10px;
+		color: #fff;
+		background: #b8c6df; /* Old browsers */
+		background: -moz-linear-gradient(top, #b8c6df 0%, #9eafcd 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b8c6df), color-stop(100%,#9eafcd)); /* Chrome,Safari4+ */
+		text-shadow: 0px -1px 0px rgba(0,0,0,0.2);
+		margin-bottom: 4px;
+	}
 
 h3, h4, h5, h6, strong { font-weight: bold; }
 em { font-style: italic; }
@@ -347,34 +298,24 @@ body a:hover {
 	text-decoration: underline !important;
 }
 
+.clearfix:after { content: ".";display: block;height: 0;clear: both;visibility: hidden;}
+.hidden, #loadingBox img, .post_controls { display: none; }
+.visible { display: block;}
+
 /* Cancel */
 .cancel {
 	color: #ad2930;
 	font-size: 90%;
 	font-weight: bold;
 }
-
-h1 {
-	background: #1d3652 url({style_images_url}/header_gradient.png) repeat-x;
-}
-	
-	h1 a {
-		color: #fff;
-		font-size: 26px;
-		padding: 6px 10px;
-		text-align: center;
-		display: block;
-		text-decoration: none;
-		text-shadow: #091421 0px -1px 0px;
-	}
 	
 h2 {
-	background: #b6c7db url({style_images_url}/bar_gradient.png) repeat-x bottom;
+	background: #45484d; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#45484d), color-stop(100%,#000000)); /* Chrome,Safari4+ */
 	color: #fff;
-	padding: 6px 10px;
-	font-weight: bold;
-	font-size: 13px;
-	text-shadow: #5a6d83 0px -1px 0px;
+	font-size: 14px;
+	padding: 10px 10px;
+	text-shadow: -1px -1px 0 rgba(0,0,0,1);
 }
 
 	h2 a {
@@ -383,21 +324,151 @@ h2 {
 	}
 	
 	h2.secondary {
-		background: #becbdb;
+		background: #f1f1f1;
 		color: #1d3652;
 		text-shadow: none;
-		height: 31px;
+		padding: 5px;
 	}
-	
-		h2.secondary a {
-			color: #1d3652;
+		
+		h2.secondary span.subtext {
+			color: #9d9d9d;
 		}
 		
-		h2.secondary img.photo {
-			/*border-bottom: 2px solid #aaa;*/
+		h2.secondary a {
+			color: #1d3652;
+			font-size: 16px;
 		}
+		
+#user_navigation {
+	background: #393939; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#393939), color-stop(100%,#212121)); /* Chrome,Safari4+ */
+	-webkit-box-shadow: 0px 4px 10px rgba(0,0,0,0.7);
+	z-index: 5;
+}
+
+	#user_navigation .launcher ul { margin: 10px 10px 20px 10px; }
+	#user_navigation .launcher li {
+		width: 33.33%;
+		float: left;
+	}
+
+	#user_navigation .launcher li a, #user_navigation #user_bar {
+		display: block;
+		position: relative;
+		margin: 3px;
+		height: 80px;
+		padding: 10px 0 0 0;
+		border: 1px solid #373737;
+		-webkit-border-radius: 7px;
+		text-align: center;
+		font-size: 13px;
+		text-decoration: none;
+		color: #b3b3b3;
+		text-shadow: 0px -1px 0px rgba(0,0,0,0.9);
+		background: #1c1c1c; /* Old browsers */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#1c1c1c), color-stop(100%,#282828)); /* Chrome,Safari4+ */
+		-webkit-box-shadow: 0px 0px 5px rgba(0,0,0,0.8) inset;
+	}
+
+		#user_navigation .launcher li a:hover .icon, #user_navigation .launcher li a:active .icon { opacity: 0.8; }
+
+		#user_navigation .launcher li.dummy span {
+			display: block;
+			background: #1c1c1c;
+			border: 1px solid #373737;
+			padding: 10px 0 0 0;
+			height: 80px;
+			margin: 3px;
+			-webkit-border-radius: 7px;
+			opacity: 0.4;
+		}
+
+	#user_navigation .icon {
+		display: block;
+		width: 50px;
+		height: 50px;
+		background-image: url({style_images_url}/app_icon_sprite.png );
+		background-repeat: no-repeat;
+		margin: 0 auto 7px;
+		opacity: 0.4;
+	}
+
+	#user_navigation .ipsHasNotifications {
+		position: absolute;
+		top: -3px;
+		right: 3px;
+		display: block;
+		height: 20px; line-height: 20px;
+		padding: 0 10px;
+		background: #ff3019; /* Old browsers */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff3019), color-stop(100%,#e00404));
+		border: 1px solid #e00404;
+		-webkit-border-radius: 5px;
+		color: #fff;
+		font-size: 12px;
+		text-shadow: 0px -1px 0 #950303;		
+	}
+
+	#nav_members .icon { background-position: 0px 0px; }
+	#nav_notifications .icon { background-position: -222px 0px; }
+	#nav_blog .icon { background-position: -55px 0px; }
+	#nav_statuses .icon { background-position: -168px 0px; }
+	#nav_gallery .icon { background-position: -110px 0px; }
+	#nav_vnc .icon { background-position: -54px -55px; }
+	#nav_search .icon { background-position: 0px -54px; }
+	#nav_messages .icon { background-position: -110px -54px; }
+	#nav_markread .icon { background-position: -168px -54px; }
+
+	#user_navigation #user_bar {
+		height: auto;
+		padding: 10px;
+	}
 	
-#search_bar, .master_list .controls, h3 {
+#secondary_navigation {
+	position: absolute;
+	top: 0;
+	left: 5px;
+}
+	#secondary_navigation a {
+		max-width: 70px;
+		line-height: 32px;
+		margin-top: 5px;
+		-webkit-border-radius: 4px;
+		padding: 0 5px;
+		color: #fff;
+		white-space: nowrap;
+		display: block;
+		color: #fff;
+		text-decoration: none;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		background: #375880;
+		-webkit-box-shadow: 0px 0px 4px rgba(0,0,0,0.4) inset;
+		text-shadow: 0px -1px 0 rgba(0,0,0,0.7);
+		font-size: 11px;
+	}
+
+	#secondary_navigation a:hover {
+		text-decoration: none !important;
+	}
+
+	#options-button {
+		text-indent: -3000em;
+		position: absolute;
+		top: 0;
+		right: 5px;
+		width: 40px;
+		line-height: 32px;
+		-webkit-border-radius: 4px;
+		margin-top: 5px;
+		display: block;
+		color: #fff;
+		text-decoration: none;
+		background: #375880 url({style_images_url}/mobile_nav.png ) no-repeat 50% 50%;
+		-webkit-box-shadow: 0px 0px 4px rgba(0,0,0,0.4) inset;
+	}	
+	
+#search_bar, h3 {
 	background: #f6f6f6 url({style_images_url}/search_bar_bg.png) repeat-x top;
 	padding: 6px;
 	text-align: center;
@@ -405,9 +476,7 @@ h2 {
 	border-top: 1px solid #e0e0e0;
 }
 
-	#search_bar #main_search {
-		width: 60%;
-	}
+	#search_bar #main_search { width: 60%; }
 	
 	#search_bar .button {
 		width: 21%;
@@ -420,50 +489,11 @@ h2 {
 			margin-left: 0;
 		}
 
-h3 {
-	text-align: left;
-}
+h3 { text-align: left; }
 
-#user_navigation a, #footer a {
-	color: #b5c8dd;
-	text-decoration: none;
-}
-
-	#user_navigation a:hover, #footer a:hover {
-		color: #fff;
-		text-decoration: none;
-	}
-
-#user_navigation, #footer {
-	background: #192b40;
-	color: #bcc2c9;
-	padding: 6px 10px;
-	line-height: 150%;
-	text-align: center;
-}
-
-#secondary_navigation {
-	background: #f6f6f6 url({style_images_url}/search_bar_bg.png) repeat-x top;
-}
-
-#secondary_navigation a {
-	text-decoration: none;
-	padding: 4px 10px;
-	line-height: 150%;
-	font-size: 11px;
-	color: #4f6176;
-	border-bottom: 1px solid #b8b8b8;
-	text-shadow: #fff 0px 1px 0px;
-	display: block;
-}
-
-	#secondary_navigation a:hover {
-		text-decoration: none !important;
-	}
-
-#footer form, #footer fieldset {
-	display: inline;
-}
+#footer form, #footer fieldset { display: inline; }
+#board_index .icon { min-width: 35px; margin: 4px 5px 0 5px; }
+#board_index .row_content { margin-left: 42px; }
 
 .desc {
 	color: #a2a2a2;
@@ -478,25 +508,30 @@ h3 {
 	line-height: 150%;
 }
 
-.master_list {
-	
+.padding { 
+	padding: 10px;
 }
 
 .master_list .row {
-	background: #fff;
+	background: #ffffff;
 	padding: 10px 10px;
 	border-top: 1px solid #e9edf1;
 	overflow: hidden;
 }
+
+	.master_list .row.unread {
+		background: #f5f9fd;
+	}
+		.master_list .row.unread .title {
+			font-weight: bold;
+		}
 	
-	.master_list .title {
-		font-size: 13px;
-		font-weight: bold;
+	.master_list .title { 
+		font-size: 14px;
 	}
 	
-	.master_list .row.no_messages {
-		color: #a2a2a2;
-		font-style: italic;
+	.master_list .row h4 {
+		margin-bottom: 5px;
 	}
 	
 	.master_list .row a,
@@ -508,8 +543,8 @@ h3 {
 
 	.master_list .row .icon {
 		float: left;
-		margin-right: 10px;
-		min-width: 25px;
+		margin: 0 5px 0 -5px;
+		min-width: 18px;
 	}
 
 		.master_list .row .icon img {
@@ -521,36 +556,33 @@ h3 {
 	}
 	
 	.master_list .row_content {
-		margin-left: 35px;
+		margin-left: 25px;
 	}
 	
-	/*	.master_list .avatar {
-			float: left;
-			background: #fff;
-			width: 60px;
-		}
-		
-			.master_list .avatar img {
-				max-width: 60px;
-				max-height: 60px;
-			}*/
-	
-	/*( {
-		background: #f7f7f7;
-		padding: 6px 10px;
-		overflow: hidden;
-	}*/
-	
 	.master_list .topic_reply {
-		margin: 10px;
+		margin: 5px;
 		border: 1px solid #b8b8b8;
-		background: #1a2c41;
+		position: relative;
 	}
 	
-	.master_list .controls {
+		.master_list .topic_reply .post { 
+			clear: both; 
+			border-top: 0; 
+		}
+
+		.topic_reply h2 { 
+			padding: 7px 0 8px 50px; 
+			line-height: 1.1;
+			-webkit-border-radius: 5px 5px 0 0;
+		}
+		.topic_reply h2 span { 
+			display: block; 
+		}
+	
+	.master_list .controls, .submit {
 		padding: 6px;
 		text-align: left;
-		min-height: 25px;
+		min-height: 35px;
 	}
 	
 		.master_list .post_controls {
@@ -619,7 +651,6 @@ h3 {
 		}
 	
 	.master_list .submit {
-		background: #d5dde5;
 		padding: 12px 10px;
 		font-weight: bold;
 		font-size: 13px;
@@ -643,34 +674,95 @@ h3 {
 		.master_list .poll_question .title {
 			margin-left: -10px;
 		}
-	
-.button {
-	background: #2e649f url({style_images_url}/button_gradient.png) repeat-x top;
-	border: 1px solid #393e42;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	padding: 4px 6px;
-	display: inline-block;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: #163c68 0px -1px 0px;
-	cursor: pointer;
-}
-	
-	.button:hover {
-		background: #2f65a1 url({style_images_url}/button_gradient_hover.png) repeat-x top;
-		text-decoration: none !important;
+
+	.master_list .topic_reply {
+		background: #fff;
+		border: 1px solid #aaa;	
+		-webkit-border-radius: 6px;
+		-webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.1);
 	}
-	
-	.button.delete {
-		background: #8a2020 url({style_images_url}/delete_gradient.png) repeat-x top;
-		text-shadow: #530e1d 0px -1px 0px;
-	}
-	
-		.button.delete:hover {
-			background: #8a2020 url({style_images_url}/delete_gradient_hover.png) repeat-x top;
+
+		.topic_reply .post_controls	{
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
 		}
 
+		.topic_reply .post_controls a {
+			background: #BECBDB;
+			background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0.5)), to(rgba(190, 203, 219, 1.0)), color-stop(0.5, rgba(190, 203, 219, 1)));
+			background: -moz-linear-gradient(left, rgba(190, 203, 219, 0.5), rgba(190, 203, 219, 1.0));
+			border: 1px solid rgba(0,0,0,0.3);
+			color: #222;
+			text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
+			display: inline-block;
+			margin: 2px;
+			padding: 7px 20px;		
+			border-radius: 5px;
+			-moz-border-radius: 5px;
+			-o-border-radius: 5px;
+			-webkit-border-radius: 5px;
+		}
+
+.master_list .topic_reply.moderated,
+.master_list .row.moderated {
+	background: #fbf8f9;
+}
+
+	.master_list .topic_reply.moderated a,
+	.master_list .row.moderated a {
+		color: #742030;
+	}
+
+.master_list .topic_reply.moderated {
+	border-color: #b75a5a;
+}
+
+.master_list .topic_reply.moderated h2.secondary {
+	background: #f1dfe2;
+}
+				
+div.touch-row a.title { font-size: 1.2em; }
+h2.touch-row {
+	background: #B6C7DB;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#8EA3BC), to(#62758B), color-stop(0.5, #8EA3BC));
+	border-bottom: 1px solid #62758B;
+	border-top: 1px solid #62758B;
+}
+
+.touch-row .rowContent { margin-left: 45px; }
+.touch-row-arrow {
+	opacity: 0.4;
+	width: 12px;
+	height: 18px;
+	background: transparent url({style_images_url}/rarrow.png) no-repeat !important;
+	float: right;
+	display: block;
+	position: relative;
+}
+		
+.no_messages {
+	background: #fff;
+	padding: 10px;
+	text-align: center;
+	color: #a2a2a2;
+	font-size: 14px;
+}		
+		
+.post_rep { float: right; }
+
+.ipsLikeButton_enabled, .ipsLikeButton_disabled {
+	width: 26px;
+	height: 26px;
+	display: block;
+	text-indent: -2000em;
+	position: relative;
+	top: 3px; right: 10px;
+	background-image: url({style_images_url}/like_unlike.png );
+	background-repeat: no-repeat;
+} 	
+
+	.ipsLikeButton_enabled { background-position: top; }
+	.ipsLikeButton_disabled { background-position: bottom; }
+
 span.error {
 	color: #8a2020;
 }
@@ -680,16 +772,14 @@ input.error {
 }
 
 .message {
-	background: #efffe0;
-	padding: 6px 10px;
-/*	border-top: 2px solid #aacd89;
-	border-bottom: 2px solid #aacd89;*/
+	background: #dbf1cc;
+	color: #255c00;
+	text-shadow: 0px 1px 0px rgba(255,255,255,0.7);
+	padding: 10px 10px;
+	text-align: center;
 }
 
-	.message.error {
-		background: #ffe0e0;
-		/*border-color: #cd8989;*/
-	}
+	.message.error { background: #ffe0e0; }
 
 #submit_post {
 	width: auto;
@@ -697,6 +787,120 @@ input.error {
 	padding-right: 10px;
 }
 
+/* Buttons */
+.buttons { padding: 0; text-align: center; }
+.button {
+	background: #3b3a3b; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3b3a3b), color-stop(100%,#212121)); /* Chrome,Safari4+ */
+	border-radius: 3px;
+	border: 1px solid #3a3e42;
+	-moz-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	color: #fff;
+	text-shadow: 0 -1px 0 #000;
+	font: 300 1.1em/1.3 "Helvetica Neue", Helvetica, Arial, sans-serif;
+	margin: 0;
+	padding: 8px 10px;
+	width: 120px;
+	display: inline-block;
+	text-decoration: none;
+}
+
+	.buttons .prev { /*position: absolute; left: 7px;*/float: left;	}
+	.buttons .next { /*position: absolute; right: 7px;*/ float: right; }
+
+.button.secondary {
+	background: #eaeaea; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eaeaea), color-stop(100%,#c4c4c4)); /* Chrome,Safari4+ */
+	color: #313131;
+	border-color: #acacac;
+	text-shadow: 0 1px 0 #fff;
+	-webkit-box-shadow: inset 0 1px 0 0 #fff;
+	box-shadow: inset 0 1px 0 0 #fff;
+	min-width: 80px;
+	width: auto;
+	padding: 5px 10px;
+	font-size: 13px;
+}
+
+.buttons .page-button { 	
+	background: #f7fbfc; /* Old browsers */
+	background: -moz-linear-gradient(top, #f7fbfc 0%, #d9edf2 40%, #c5e4ec 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7fbfc), color-stop(40%,#d9edf2), color-stop(100%,#c5e4ec)); /* Chrome,Safari4+ */
+	-webkit-box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.4), 0px 2px 3px rgba(0,0,0,0.2);
+	border: 1px solid rgba(0,0,0,0.3);
+	color: #222;
+	text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
+	width: 50px !important;
+	min-width: 0;
+}
+
+.buttons .disabled, .button.disabled
+{
+	background: #eeeeee; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#efefef), color-stop(100%,#c7c7c7)); /* Chrome,Safari4+ */
+	opacity: 1;
+	cursor: default;
+	text-shadow: none;
+	opacity: 0.4;
+	color: #7c7c7c;
+}
+
+.controls {
+	background: #deefff; /* Old browsers */
+	background: -moz-linear-gradient(top, #deefff 0%, #98bede 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#deefff), color-stop(100%,#98bede));
+	border-top: 1px solid #abc4dc !important;
+	border-bottom: 1px solid #6f96b7 !important;
+	text-align: center;
+}
+
+.controls .buttons { background: transparent !important;}
+
+.submit {
+	background: #f4f4f4; /* Old browsers */
+	background: -moz-linear-gradient(top, #f4f4f4 0%, #dcdcdc 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(100%,#dcdcdc)); /* Chrome,Safari4+ */
+	text-align: center;
+	border-top: 1px solid #e4e4e4;
+	border-bottom: 1px solid #c8c8c8;
+}
+
+#content .master_list a.input_submit {
+	padding: 5px 20px !important;
+}
+
+.editor textarea { height: 125px; width: 100%; }
+.attach { margin-bottom: 4px; }
+
+/* Member list filters */
+#filter-option {
+	display: inline-block; 
+	margin: 5px 0; 
+	text-decoration: none !important;
+	text-align: center;
+}
+
+.letter-page strong, .letter-page a, .letter-page a:hover { 
+	background: #fff; 
+	border: 1px solid #ccc; 
+	color: #222;
+	display: inline-block; 
+	margin: 5px 0; 
+	padding: 10px; 
+	text-decoration: none !important;
+	width: 8px;
+	text-align: center;	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.letter-page { margin: 0; }
+.letter-page.all strong, .letter-page.all a { width: 30px; }
+.letter-page.active strong { background: #ddd; }
+
 /* Poll */
 .progress_bar {
 	background-color: #fff;
@@ -713,6 +917,7 @@ input.error {
 		height: 10px;
 		display: block;
 		overflow: hidden;
+		-webkit-border-radius: 7px;
 	}
 
 	.progress_bar.limit span {
@@ -726,10 +931,326 @@ input.error {
 .progress_bar.topic_poll {
 	border: 1px solid #d5dde5;
 	margin-top: 2px;
-	width: 40%;
+	-webkit-border-radius: 8px;
 }
 
+.ipsForm_vertical .ipsField {
+	background: #fff;
+	padding: 10px;
+}
 
+.ipsForm_vertical .ipsField_title {
+	display: block;
+	font-weight: bold;
+	font-size: 14px;
+	margin-bottom: 3px;
+}
+
+.ipsForm_vertical .ipsField_content { }
+
+.ipsForm_vertical .ipsField_checkbox input {
+	float: left;
+	margin-top: 2px;
+}
+
+.ipsForm_vertical .ipsField_checkbox .ipsField_content {
+	margin-left: 20px;
+}
+
+.input_text {
+	font-size: 13px;
+	padding: 4px 3px;
+	border-radius: 2px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #848484 #c1c1c1 #e1e1e1 #c1c1c1;
+	background: #fff;
+	width: 98%;
+}
+
+.input_text:focus {
+	border-color: #4e4e4e #7c7c7c #a3a3a3 #7c7c7c;
+	-webkit-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+	box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+}
+
+.ipsEditor_textarea {
+	min-height: 100px;
+}
+
+/* Photo resizing */
+.post img {	max-width: 100%; }
+img.photo {	float: left; width: 50px; height: 50px; }
+
+.topic_reply img.photo {
+	margin: 0;
+	position: absolute;
+	top: 5px;
+	left: 5px;
+	width: 35px;
+	height: 35px;
+}
+
+#member_list img.photo, #notifications img.photo { width: 35px; height: 35px; }
+
+.status_updates .row img {
+	float: left;
+	width: 30px;
+	height: 30px;
+	margin-right: 15px;
+}
+
+/* Filter bar */
+.ipsFilterBar {
+	background: #f2f5f6; /* Old browsers */
+	background: -moz-linear-gradient(top, #f2f5f6 0%, #e3eaed 37%, #c8d7dc 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f5f6), color-stop(37%,#e3eaed), color-stop(100%,#c8d7dc)); /* Chrome,Safari4+ */
+	border-top: 1px solid #888 !important;
+	border-bottom: 1px solid #888 !important;
+	text-align: center;
+	padding: 0 0px;
+	line-height: 35px;
+}
+	                  
+	.ipsFilterBar > ul { margin: 0; padding: 0; }
+	
+	.ipsFilterBar > ul > li {
+		display: inline-block;
+		float: left;
+	}
+	
+	.ipsFilterBar.two_filters > ul > li { width: 50%; }		
+	.ipsFilterBar.three_filters > ul > li { width: 33.33%; }
+	.ipsFilterBar.four_filters > ul > li { width: 25%; }
+	
+	.ipsFilterBar > ul > li > a {
+		background: #c8d7dc; /* Old browsers */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9ca6b4), color-stop(36%,#828c95), color-stop(100%,#4a5c67)); /* Chrome,Safari4+ */
+		-webkit-box-shadow: 0px 1px 4px rgba(0,0,0,0.5) inset, 0px 1px 0px rgba(255,255,255,0.8);
+		padding: 4px 15px;
+		-webkit-border-radius: 16px;
+		text-decoration: none;
+		color: #fff;
+		font-size: 13px;
+	}
+	
+		.ipsFilterBar > ul > li.selected a {
+			background: #49c0f0; /* Old browsers */
+			background: -moz-linear-gradient(top, #49c0f0 0%, #2cafe3 100%); /* FF3.6+ */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#49c0f0), color-stop(100%,#2cafe3)); /* Chrome,Safari4+ */
+			text-shadow: 0px -1px 0 #2cafe3;
+			-webkit-box-shadow: 0px 1px 2px rgba(0,0,0,0.2) inset, 0px 1px 0px rgba(255,255,255,0.8), 0px 0px 8px rgba(141,219,255, 0.9);
+		}
+		
+.ipsFilterPane {
+	position: absolute;
+	width: 90%;
+	left: 5%;
+	top: 20px;
+	background: rgba(0,0,0,0.9);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7d7e7d), color-stop(8%,#0e0e0e)); /* Chrome,Safari4+ */
+	-webkit-border-radius: 10px;
+	-webkit-box-shadow: 0px 3px 12px rgba(0,0,0,0.7);
+	border: 1px solid #0e0e0e;
+	z-index: 1000;
+}
+	
+	.ipsFilterPane > div { padding: 10px; }
+	
+	.ipsFilterPane h4 {
+		text-align: center;
+		font-size: 16px;
+		color: #fff;
+		padding: 0 0 10px 0;
+		text-shadow: 0 -1px 0 #0e0e0e;
+	}
+	
+		.ipsFilterPane h5 {
+			font-size: 11px;
+			color: #d1d1d1;
+			text-align: center;
+			text-shadow: 0 -1px 0 #0e0e0e;
+			margin-top: -10px;
+			padding: 0 0 10px 0;
+			font-weight: normal;
+		}
+	
+	.ipsFilterPane ul, .ipsFilterPane_inner { 
+		background: #fff;
+		-webkit-border-radius: 6px;
+		position: relative;
+	}
+	
+	.ipsFilterPane li { 
+		font-size: 14px;
+		border-top: 1px solid #e9edf1;
+		font-weight: bold;
+	}
+	
+		.ipsFilterPane li.active a, .ipsFilterPane li:focus a {
+			background: url({style_images_url}/icon_check.png ) no-repeat 10px 13px;
+		}
+		
+		.ipsFilterPane li:active a {
+			background: #5376a0; /* Old browsers */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5376a0), color-stop(100%,#385885)); /* Chrome,Safari4+ */
+		}
+
+			.ipsFilterPane li:active a { color: #fff; }
+	
+	.ipsFilterPane a {
+		padding: 10px 10px 10px 30px;
+		display: block;
+		color: #000;
+		text-decoration: none;
+	}
+	
+	.ipsFilterPane .ipsFilterPane_close {
+		position: absolute;
+		top: -5px;
+		right: -5px;
+		background: #000;
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7d7e7d), color-stop(100%,#0e0e0e)); /* Chrome,Safari4+ */
+		color: #fff;
+		font-size: 16px;
+		border: 2px solid #fff;
+		height: 22px;
+		line-height: 22px;
+		width: 22px;
+		text-align: center;
+		padding: 0;
+		-webkit-border-radius: 22px;
+		box-shadow: 0px 2px 4px rgba(0,0,0,0.4);
+	}
+		
+		.ipsFilterPane .ipsFilterPane_close span {
+			position: relative;
+			top: -1px;
+		}
+	
+#filter-letters { text-align: center; }
+
+#shareStrip { text-align: center;  padding-bottom:4px }
+	#shareStrip .button.secondary { width: auto; }
+	#shareStrip a img { margin-top:-4px; }
+	
+.ipsTagBox_launcher {
+	background: #f6f6f6;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+	-webkit-box-shadow: 0px 1px 0 #fff;
+	color: #616161;
+	height: 26px;
+	line-height: 26px;
+	padding: 0 12px;
+	-moz-border-radius: 20px;
+	-webkit-border-radius: 20px;
+	border-radius: 4px;
+	display: block;
+	text-align: center;
+	text-decoration: none;
+	border: 1px solid #dbdbdb;
+	text-shadow: 0px 1px 0 #fff;
+}
+
+.ipsTagBox { min-height: 200px; }
+.ipsTagBox_editor {
+	position: absolute;
+	bottom: 0px;
+	padding: 10px 0px;
+	background: #f6f6f6;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+	border-top: 1px solid #e5e5e5;
+	width: 100%;
+	-webkit-border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: 0 -1px 5px rgba(0,0,0,0.1);
+	text-align: center;
+}
+	.ipsTagBox_editor .input_text, .ipsTagBox_editor .input_select { width: 70%; }
+	.ipsTagBox_editor .input_select { font-size: 19px !important; }	
+	.ipsTagBox_editor .input_submit {
+		background: #8fc800; /* Old browsers */
+		background: -moz-linear-gradient(top, #8fc800 0%, #5ba000 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8fc800), color-stop(100%,#5ba000)); /* Chrome,Safari4+ */
+		border: 1px solid #5ba000;
+		color: #fff;
+		text-shadow: 0px -1px 0 #5ba000;
+		padding: 5px 10px;
+		width: 20%;
+		margin-left: 1%;
+		-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,0.5) inset;
+	}
+	
+	.ipsTagBox_editor input.ipsTagBox_remove {
+		background: #ff3019; /* Old browsers */
+		background: -moz-linear-gradient(top, #ff3019 0%, #cf0404 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff3019), color-stop(100%,#cf0404)); /* Chrome,Safari4+ */
+		text-shadow: 0 -1px 0 #cf0404;
+		border-color: #cf0404;
+		width: 60%;
+	}
+	
+.ipsTagBox_taglist { padding: 5px; }
+.ipsTagBox_taglist li {
+	display: inline-block;
+	padding: 3px 10px;
+	background: #5376a0; /* Old browsers */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4774a2), color-stop(100%,#2c5687)); /* Chrome,Safari4+ */
+	border: 1px solid #2c5687;
+	color: #fff;
+	font-size: 12px;
+	font-weight: normal;
+	-webkit-border-radius: 12px;
+	text-shadow: 0px -1px 0 #2c5687;
+	margin: 0 5px 5px 0;
+	-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,0.3) inset;
+}
+
+	.ipsTagBox_taglist li.selected {
+		background: #49c0f0; /* Old browsers */
+		background: -moz-linear-gradient(top, #49c0f0 0%, #2cafe3 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#49c0f0), color-stop(100%,#2cafe3)); /* Chrome,Safari4+ */
+		text-shadow: 0px -1px 0 #2cafe3;
+		border-color: #2cafe3;
+		-webkit-box-shadow: 0px 0px 8px rgba(141,219,255, 0.9);
+		-webkit-transform: scale(1.07);
+	}
+	
+#shade {
+    position: absolute;
+    top: 43px;
+    width: 100%;
+    min-height: 468px;
+    z-index: 2;
+    background: rgba(0, 0, 0, 0.4);
+    padding: 0;
+}
+
+#loadingBox {
+	position: absolute;
+	width: 300px;
+	height: 100px;
+	margin: 0px;
+	z-index: 2;
+    background: rgba(0, 0, 0, 0.75);
+    -webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	text-align: center;
+}
+	
+	#loadingBox span {
+		line-height: 100px;
+		color: #fff;
+		font-size: 16px;
+		text-shadow: 0px -1px 0 #000;
+	}
+	
+/* Enforce a smaller recaptcha */
+#recaptcha_area { zoom: 86%; }
+#task { height: 0; line-height: 0; overflow: hidden; }
 /************************************************************************/
 /*  BBCODE STYLES */
 /* 	NOTE: These selectors style bbcodes throughout IPB. It is recommended that you DO NOT change these 
@@ -762,7 +1283,7 @@ input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0p
 pre.prettyprint 		{ padding: 5px; background: #f8f8f8; border: 1px solid #c9c9c9; overflow: auto; margin-left: 10px; font-size: 11px; line-height: 140%; }
 .bbc_member, .bbc_url	{	color: inherit; }
 
-img.bbc_img				{ max-width: 80%; }
+img.bbc_img				{ max-width: 100%; }
 
 /* Quote boxes */
 p.citation {
@@ -782,10 +1303,14 @@ p.citation {
 	}
 	
 /* Blog specific */
-
 .blog_excerpt {
 	margin: 5px 0;
 	line-height: 130%;
+}
+
+/* Status updates */
+.status_updates .row p {
+	margin-left: 45px;
 }]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
@@ -793,49 +1318,6 @@ p.citation {
     <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>mobile</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018126</css_updated>
-    <css_group>lightbox</css_group>
-    <css_content><![CDATA[#lightbox{	position: absolute;	left: 0; width: 100%; z-index: 100; text-align: center; line-height: 0;}
-#lightbox img{ width: auto; height: auto;}
-#lightbox a img{ border: none; }
-
-#outerImageContainer{ position: relative; background-color: #fff; width: 250px; height: 250px; margin: 0 auto; }
-#imageContainer{ padding: 10px; }
-
-#loading{ position: absolute; top: 40%; left: 0%; height: 25%; width: 100%; text-align: center; line-height: 0; }
-#hoverNav{ position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; }
-#imageContainer>#hoverNav{ left: 0;}
-#hoverNav a{ outline: none;}
-
-#prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; }
-#prevLink { left: 0; float: left;}
-#nextLink { right: 0; float: right;}
-#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; }
-#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; }
-
-#imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100%	; }
-
-#imageData{	padding:0 10px; color: #666; }
-#imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
-#imageData #caption{ font-weight: bold;	}
-#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
-#imageData #bottomNavClose{ width: 66px; float: right;  padding-bottom: 0.7em; outline: none;}	 	
-
-#overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; }]]></css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>mobile</css_master_key>
   </cssfile>
 </css>
diff --git a/upload/admin/applications/core/xml/core_mobile_templates.xml b/upload/admin/applications/core/xml/core_mobile_templates.xml
index 89245d1c..c9292ddb 100644
--- a/upload/admin/applications/core/xml/core_mobile_templates.xml
+++ b/upload/admin/applications/core/xml/core_mobile_templates.xml
@@ -1,12 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<templates application="core" templategroups="a:10:{s:12:&quot;skin_editors&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_emails&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_global&quot;;s:5:&quot;exact&quot;;s:17:&quot;skin_global_other&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_help&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_login&quot;;s:5:&quot;exact&quot;;s:13:&quot;skin_register&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_reports&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_search&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_stats&quot;;s:5:&quot;exact&quot;;}">
+<templates application="core" templategroups="a:12:{s:12:&quot;skin_editors&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_emails&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_global&quot;;s:5:&quot;exact&quot;;s:17:&quot;skin_global_other&quot;;s:5:&quot;exact&quot;;s:20:&quot;skin_global_comments&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_help&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_login&quot;;s:5:&quot;exact&quot;;s:13:&quot;skin_register&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_reports&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_search&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_stats&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_modcp&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_editors">
     <template>
       <template_group>skin_editors</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>ajaxEditBox</template_name>
       <template_data><![CDATA[$post="", $pid=0, $error_msg="", $extraData]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<php>
+	/* Always return as UTF-8 */
+	array_walk_recursive( $autoSaveData, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+	$jsonEncoded = json_encode( $autoSaveData );
+	$jsonEncoded = IPSText::convertCharsets($jsonEncoded, "UTF-8", IPS_DOC_CHAR_SET);
+</php>
+<if test="jsNotLoaded:|:empty($this->_editorJsLoaded)">
+	{parse template="editorLoadJs" group="editors" params="$options"}
+</if>
+<textarea id="{$options['editorName']}" name="{$formField}" class='ipsEditor_textarea input_text<if test="ismini:|:$options['type'] == 'mini'"> mini</if>'>{$content}</textarea>
+<script type="text/javascript">
+	ipb.textEditor.initialize('{$options['editorName']}', { type: <if test="hasType:|:$options['type']">'{$options['type']}'<else />''</if>,
+															height: <if test="hasHeight:|:$options['height'] > 0">{$options['height']}<else /><if test="ismini:|:$options['type'] == 'mini'">150<else />300</if></if>,
+															minimize: <if test="hasMinimize:|:$options['minimize']">'{$options['minimize']}'<else />0</if>,
+															bypassCKEditor: {parse expression="intval( $options['bypassCKEditor'] )"},
+															isRte: {parse expression="intval( $options['isRte'] )"},
+															isTypingCallBack: <if test="hasCallback:|:$options['isTypingCallBack']">{$options['isTypingCallBack']}<else />''</if>,
+															ips_AutoSaveKey: <if test="hasSaveKey:|:$options['autoSaveKey']">'{$options['autoSaveKey']}'<else />''</if>,
+											                ips_AutoSaveData: {$jsonEncoded} } );
+</script>]]></template_content>
+      <template_name>editor</template_name>
+      <template_data><![CDATA[$formField='post', $content='', $options=array(), $autoSaveData=array()]]></template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -14,14 +44,36 @@
     </template>
     <template>
       <template_group>skin_editors</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>editorJS</template_name>
       <template_data><![CDATA[$emoticons='']]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>editorLoadJs</template_name>
+      <template_data><![CDATA[$options='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>editorSettings</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_editors</template_group>
@@ -30,7 +82,7 @@
 </div>]]></template_content>
       <template_name>editorShell</template_name>
       <template_data><![CDATA[$editor_id, $field='Post', $content='', $no_sidebar=1, $lightweight=0]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -46,12 +98,45 @@
 </div>]]></template_content>
       <template_name>ips_editor</template_name>
       <template_data><![CDATA[$form_field="",$initial_content="",$images_path="",$rte_mode=0,$editor_id='ed-0',$smilies='',$allow_sidebar=1]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>mediaGenericWrapper</template_name>
+      <template_data>$rows, $pages, $app, $plugin</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>sharedMedia</template_name>
+      <template_data>$tabs</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>sharedMediaDefault</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
   </templategroup>
   <templategroup group="skin_emails">
     <template>
@@ -62,7 +147,7 @@
 </div>]]></template_content>
       <template_name>boardRules</template_name>
       <template_data><![CDATA[$title="",$body=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -76,7 +161,7 @@
 <br />]]></template_content>
       <template_name>errors</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -132,7 +217,7 @@
 </form>]]></template_content>
       <template_name>forward_form</template_name>
       <template_data><![CDATA[$title="",$text="",$lang=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -170,7 +255,7 @@
 </form>]]></template_content>
       <template_name>sendMailForm</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -182,7 +267,7 @@
 <p class='message unspecific'>{$this->lang->words['email_sent_txt']} {$member_name}.</p>]]></template_content>
       <template_name>sentScreen</template_name>
       <template_data><![CDATA[$member_name=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -198,7 +283,7 @@
 </div>]]></template_content>
       <template_name>show_address</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -213,7 +298,7 @@
 </h1>]]></template_content>
       <template_name>defaultHeader</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -235,7 +320,7 @@
 	</form>]]></template_content>
       <template_name>forum_jump</template_name>
       <template_data>$html</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -249,104 +334,130 @@
 		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
 		<title>{$header_items['title']}<if test="pagenumberintitle:|:$header_items['page']"> {$this->lang->words['page_title_page']} {$header_items['page']}</if></title>
 		<link rel="shortcut icon" href='<if test="$this->registry->output->isHTTPS">{$this->settings['board_url_https']}<else />{$this->settings['board_url']}</if>/favicon.ico' />
+		<meta property="og:title" content="{IPSText::htmlspecialchars( str_replace( ' - ' . $this->settings['board_name'], '', $header_items['title'] ) )}"/>
+		<meta property="og:site_name" content="{IPSText::htmlspecialchars( $this->settings['board_name'] )}"/>
+		<meta property="og:image" content="{$this->settings['meta_imagesrc']}"/>
 		
 		{parse template="includeJS" group="global" params="$jsModules"}
 		{parse template="includeCSS" group="global" params="$css"}
 		<!--<meta http-equiv="X-UA-Compatible" content="IE=7" />-->
 		{parse template="includeMeta" group="global" params="$metaTags"}
+
 		{parse template="includeFeeds" group="global" params="$documentHeadItems"}
 		{parse template="includeRTL" group="global" params=""}
 		
-		<meta name="apple-mobile-web-app-capable" content="yes">
+		<!--<meta name="apple-mobile-web-app-capable" content="yes">-->
+		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 		<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable = no;">
 	</head>
 	<body id='ipboard_body'>
 		<div id='ipbwrapper'>
+			<if test="count( $items['navigation'] ) > 1 && !$this->settings['_mobile_nav_home']">
+				<if test="$this->nav_count=count($items['navigation'])"></if>
+				<if test="$this->nav_back = ( isset( $this->settings['_mobile_back_nav'] ) ) ? $this->settings['_mobile_back_nav'] : 2"></if>
+				<div id='secondary_navigation'>
+					<a href='{parse url="{$items['navigation'][ $this->nav_count - $this->nav_back ][1]}" base="{$items['navigation'][ $this->nav_count - $this->nav_back ][4]}" seotitle="{$items['navigation'][ $this->nav_count - $this->nav_back ][2]}" template="{$items['navigation'][ $this->nav_count - $this->nav_back ][3]}"}'>{$this->lang->words['_larr']} &nbsp;{$items['navigation'][ $this->nav_count - $this->nav_back ][0]}</a>
+				</div>
+			<else />
+				<if test="( count( $items['navigation'] ) == 1 || $this->settings['_mobile_nav_home'] ) && ! $this->settings['_mobile_hide_nav']">
+					<div id='secondary_navigation'>
+						<a href='{parse url="act=idx" seotitle="false" base="public"}' class='back'>{$this->lang->words['_larr']} {$this->lang->words['home']}</a>
+					</div>
+				</if>
+			</if>
 			<if test="brandingBar:|:method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'overwriteHeader' )">
 				{parse template="overwriteHeader" group="{current_app}_global" params=""}
 			<else />
 				{parse template="defaultHeader" group="global" params=""}
 			</if>
 			<div id="options-button">&raquo;</div>	
-			<div id='user_navigation'>
-				<if test="memberbox:|:!$this->memberData['member_id']">
-					<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}'>{$this->lang->words['sign_in']}</a>
-					<a href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register']}'>{$this->lang->words['register']}</a>
-				<else />
-					<a href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}">{$this->lang->words['log_out']} ({$this->memberData['members_display_name']})</a>
-					<if test="messengerlink:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0">
-						<a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['your_messenger']}'>{$this->lang->words['your_messenger']}</a>
+			<div id='user_navigation' class='clearfix'>
+				<ul class='clearfix' id='user_bar'>
+					<if test="memberbox:|:!$this->memberData['member_id']">
+						<a class='button secondary' href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}'>{$this->lang->words['sign_in']}</a>&nbsp;&nbsp;&nbsp;
+						<a class='button secondary' href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register']}'>{$this->lang->words['register']}</a>
+					<else />
+						<a class='button secondary' style='width:auto' href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}">{$this->lang->words['log_out']} {$this->memberData['members_display_name']}</a>
 					</if>
-				</if>
-				<if test="!ipsRegistry::$applications['members']['app_hide_tab']"><a href='{parse url="app=members" base="public" seotitle="false"}' title='{$this->lang->words['go_to_memberlist']}'>{$this->lang->words['tb_mlist']}</a></if>
-				<if test="hasBlog:|:ipsRegistry::$applications['blog']['app_enabled']">
-					<a href='{parse url="app=blog" seotitle="false" base="public"}' title='{$this->lang->words['go_to_prefix']}{IPSLib::getAppTitle( 'blog' )}'>{IPSLib::getAppTitle( 'blog' )}</a>
-				</if>
-				<a href='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_filter_app[<if test="viewnewcontentapp:|:$this->registry->getCurrentApplication() != 'core' AND IPSLib::appisSearchable( $this->registry->getCurrentApplication() )">{$this->registry->getCurrentApplication()}<else />forums</if>]=1" base="public"}' accesskey='2'>{$this->lang->words['mob_view_new_posts']}</a>
-				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['mob_status_updates']}</a>
+				</ul>
+				<ul class='clearfix launcher'>
+					<if test="messengerlink:|:$this->memberData['member_id'] AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0">
+						<li id='nav_messages'><a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['your_messenger']}'><span class='icon'></span><if test="notifications:|:$this->memberData['msg_count_new']"><span class='ipsHasNotifications'>{$this->memberData['msg_count_new']}</span></if>{$this->lang->words['your_messenger']}</a></li>
+					</if>
+					<li id='nav_notifications'><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog&amp;clear=true" base="public"}'><span class='icon'></span><if test="notifications:|:$this->memberData['notification_cnt']"><span class='ipsHasNotifications'>{$this->memberData['notification_cnt']}</span></if>{$this->lang->words['notifications_at_the_top']}</a></li>
+					<if test="!ipsRegistry::$applications['members']['app_hide_tab'] && !count(ipsRegistry::$applications['members']['app_tab_groups']) && !IPSMember::isInGroup( $this->memberData, ipsRegistry::$applications['members']['app_tab_groups'] )">
+						<li id='nav_members'><a href='{parse url="app=members" base="public" seotitle="false"}' title='{$this->lang->words['go_to_memberlist']}'><span class='icon'></span>{$this->lang->words['tb_mlist']}</a></li>
+					</if>
+					<if test="hasBlog:|:ipsRegistry::$applications['blog']['app_enabled']">
+						<li id='nav_blog'><a href='{parse url="app=blog" seotitle="false" base="public"}' title='{$this->lang->words['go_to_prefix']}{IPSLib::getAppTitle( 'blog' )}'><span class='icon'></span>{IPSLib::getAppTitle( 'blog' )}</a></li>
+					</if>
+					<if test="hasGallery:|:ipsRegistry::$applications['gallery']['app_enabled']">
+						<li id='nav_gallery'><a href='{parse url="app=gallery" seotitle="false" base="public"}' title='{$this->lang->words['go_to_prefix']}{IPSLib::getAppTitle( 'gallery' )}'><span class='icon'></span>{IPSLib::getAppTitle( 'gallery' )}</a></li>
+					</if>
+					<li id='nav_vnc'><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=<if test="viewnewcontentapp:|:$this->registry->getCurrentApplication() != 'core' AND IPSLib::appIsSearchable( $this->registry->getCurrentApplication() )">{$this->registry->getCurrentApplication()}<else />forums</if>" base="public"}' accesskey='2'><span class='icon'></span>{$this->lang->words['mobile_view_new_posts']}</a></li>
+					<li id='nav_statuses'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'><span class='icon'></span>{$this->lang->words['mob_status_updates']}</a></li>
+					<li id='nav_search'><a href='{parse url="app=core&amp;module=search" base="public"}' accesskey='2'><span class='icon'></span>{$this->lang->words['sj_search']}</a></li>
+					<li id='nav_markread'><a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['mark_all_as_read']}'><span class='icon'></span>{$this->lang->words['mobile_mark_board_as_read']}</a></li>
+				</ul>
 			</div>
 			<script type="text/javascript">
 				/* Prevent flash of header */
 				document.getElementById('user_navigation').style.display = 'none';
 			</script>
-			<if test="count( $items['navigation'] ) > 1 && !$this->settings['_mobile_nav_home']">
-				<if test="$this->nav_count=count($items['navigation'])"></if>
-				<if test="$this->nav_back = ( isset( $this->settings['_mobile_back_nav'] ) ) ? $this->settings['_mobile_back_nav'] : 2"></if>
-				<div id='secondary_navigation'>
-					<a href='{parse url="{$items['navigation'][ $this->nav_count - $this->nav_back ][1]}" base="public" seotitle="{$items['navigation'][ $this->nav_count - $this->nav_back ][2]}" template="{$items['navigation'][ $this->nav_count - $this->nav_back ][3]}"}'>{$this->lang->words['_laquo']} {$this->lang->words['back_to']} {$items['navigation'][ $this->nav_count - $this->nav_back ][0]}</a>
-				</div>
-			<else />
-				<if test="( count( $items['navigation'] ) == 1 || $this->settings['_mobile_nav_home'] ) && ! $this->settings['_mobile_hide_nav']">
-					<div id='secondary_navigation'>
-						<a href='{parse url="act=idx" seotitle="false" base="public"}' class='back'>{$this->lang->words['_laquo']} {$this->lang->words['home']}</a>
-					</div>
-				</if>
-			</if>
 			
 			<div id='content' class='clear'>
 				<if test="mainpageContent:|:$html">{$html}</if>
 			</div>
 			
 			<div id='footer' class='clear'>
-				<if test="skinchanger:|:$this->settings['allow_skins'] AND $footer_items['skin_chooser'] AND ! $this->member->isMobileApp">
+				<if test="skinchanger:|:$footer_items['skin_chooser'] AND ( ! $this->member->isMobileApp || $this->registry->output->isLargeTouchDevice() )">
 					<if test="uagentlocked:|:$this->memberData['userAgentLocked'] AND ! $this->memberData['userAgentBypass']">
-						<a href='{parse url="{$this->settings['query_string_formatted']}&amp;unlockUserAgent=1" base="public"}'>{$this->lang->words['full_version']}</a>
+						<a id='full_version' href='{parse url="{$this->settings['query_string_formatted']}&amp;unlockUserAgent=1" base="public"}'>{$this->lang->words['full_version']}</a>
 					<else />
+						<a href='#' id='show_skins'>{$this->lang->words['change_theme']}</a>
+						<div id='show_skins_box' style='display: none'>
+							<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post">
+								<fieldset>
+									<input type='hidden' name='k' value='{$this->member->form_hash}' />
+									<label for='newSkin' class='hide'>{$this->lang->words['theme_prefix']}</label>
+									<select name="settingNewSkin" id='newSkin'>
+										<foreach loop="$footer_items['skin_chooser'] as $skin">
+											<option value='{$skin['id']}' <if test="$skin['selected']">selected='selected'</if>>{$skin['title']}</option>
+										</foreach>
+									</select>
+									<input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit alt' id='newSkinSubmit' />
+								</fieldset>
+							</form>
+						</if>
+					</if>
+				</if>
+				<if test="langchooser:|:count( $footer_items['lang_chooser']['options'] > 1 )">
+					<a href='#' id='show_langs'>{$footer_items['lang_chooser']['default']}</a>
+					<div id='show_langs_box' style='display: none'>
 						<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post">
 							<fieldset>
 								<input type='hidden' name='k' value='{$this->member->form_hash}' />
-								<label for='newSkin' class='hide'>{$this->lang->words['theme_prefix']}</label>
-								<select name="settingNewSkin" id='newSkin'>
-									{$footer_items['skin_chooser']}
+								<input type='hidden' name='setlanguage' value='1' />
+								<input type="hidden" name="langurlbits" value="{$this->settings['query_string_safe']}&amp;cal_id={$this->request['cal_id']}" />
+								<label for='newLang' class='hide'>{$this->lang->words['language_prefix']}</label>
+								<select name="langid" id='newLang'>
+									<foreach loop="$footer_items['lang_chooser']['options'] as $lang">
+										<option value='{$lang['id']}' <if test="$lang['selected']">selected='selected'</if>>
+											{$lang['title']}
+										</option>
+									</foreach>
 								</select>
-								<input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit alt' id='newSkinSubmit' />
+								<input type='submit' class='input_submit alt' value='{$this->lang->words['jmp_go']}' id='newLangSubmit' />
 							</fieldset>
 						</form>
-					</if>
-					
+					</div>
 				</if>
-				<if test="langChooser:|:substr_count( $footer_items['lang_chooser'], '<option' ) > 1">
-				<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post">
-					<fieldset>
-						<input type='hidden' name='k' value='{$this->member->form_hash}' />
-						<input type='hidden' name='setlanguage' value='1' />
-						<input type="hidden" name="langurlbits" value="{$this->settings['query_string_safe']}&amp;cal_id={$this->request['cal_id']}" />
-						<label for='newLang' class='hide'>{$this->lang->words['language_prefix']}</label>
-						<select name="langid" id='newLang'>
-								{$footer_items['lang_chooser']}
-						</select>
-						<input type='submit' class='input_submit alt' value='{$this->lang->words['jmp_go']}' id='newLangSubmit' />
-					</fieldset>
-				</form>
-				<br />
-				</if>
-				<a href='{parse url="app=core&amp;module=search" base="public"}' accesskey='2'>{$this->lang->words['sj_search']}</a> &middot;
-				<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['mark_all_as_read']}'>{$this->lang->words['mark_board_as_read']}</a> &middot; <a href='#ipbwrapper' title='{$this->lang->words['go_to_top']}'>{$this->lang->words['back_to_top']}</a>
+
 				<if test="isNotMobbyApp:|:($this->memberData['userAgentKey'] == 'iphone' || $this->memberData['userAgentKey'] == 'ipodtouch') AND ! $this->member->isMobileApp">
-					<div>{$this->lang->words['freeiphoneapp']}</div>
+					<div><a id='app_link' href="http://myipb.in/download/goiphone.php">{$this->lang->words['freeiphoneapp']}</a></div>
 				</if>
 			</div>
-			{$stats['task']}
+			<div id='task'>{$stats['task']}</div>
 		</div>
 		<div id='shade' style='display:none'></div>
 		<!-- pre-load -->
@@ -354,8 +465,8 @@
 	</body>
 </html>]]></template_content>
       <template_name>globalTemplate</template_name>
-      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, $header_items=array(), $items=array(), $footer_items=array(), $stats=array()</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, array $header_items, $items=array(), $footer_items=array(), $stats=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -363,36 +474,47 @@
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>googlePlusOneButton</template_name>
+      <template_data>$url, $title</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>include_highlighter</template_name>
       <template_data>$load_when_needed=0</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>include_lightbox</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>include_lightbox_real</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_global</template_group>
@@ -406,11 +528,11 @@
 			}
 		</php>
 		<if test="donotminifycss:|:!$this->settings['use_minify'] OR ( $data['attributes'] AND stripos( $data['attributes'], 'screen' ) === false )">
-			<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}" />
+			<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}" />
 		</if>
 	</foreach>
 	<if test="csstominify:|:$this->settings['use_minify'] AND count($this->minify)">
-		<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], 'public/', implode( ',', $this->minify ) )"}" />
+		<link rel="stylesheet" type="text/css" media='screen,print' href="{$this->settings['css_base_url']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;f={parse expression="str_replace( $this->settings['css_base_url'], PUBLIC_DIRECTORY . '/', implode( ',', $this->minify ) )"}" />
 	</if>
 </if>
 <if test="inlinecss:|:is_array( $css['inline'] ) AND count( $css['inline'] )">
@@ -423,12 +545,10 @@
 </if>
 <!--[if lte IE 7]>
 	<link rel="stylesheet" type="text/css" title='Main' media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_ie.css" />
-<![endif]-->
-<!--Remove if you don't want touch devices-->
-<link rel="stylesheet" type="text/css" title='Main' media="screen" href="{$this->settings['public_dir']}style_css/mobile_touch.css" />]]></template_content>
+<![endif]-->]]></template_content>
       <template_name>includeCSS</template_name>
       <template_data>$css</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -456,7 +576,7 @@
 </if>]]></template_content>
       <template_name>includeFeeds</template_name>
       <template_data>$documentHeadItems</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -476,7 +596,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 <script type="text/javascript" src="{$this->settings['public_dir']}js/mobile_touch.js"></script>]]></template_content>
       <template_name>includeJS</template_name>
       <template_data>$jsModules</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -491,7 +611,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </if>]]></template_content>
       <template_name>includeMeta</template_name>
       <template_data>$metaTags</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -512,14 +632,14 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 	var rtlIe	= '';
 	var rtlFull	= '';
 </script>
-<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl.css' )">
+<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl.css' )">
 	<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl.css" />
 	<script type='text/javascript'>
 		var rtlFull	= "{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl.css";
 		var isRTL	= true;
 	</script>
 <else />
-	<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl.css' )">
+	<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl.css' )">
 		<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/ipb_rtl.css" />
 		<script type='text/javascript'>
 			var rtlFull	= "{$this->settings['public_dir']}style_css/ipb_rtl.css";
@@ -527,7 +647,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 		</script>
 	</if>
 </if>
-<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl_ie.css' )">
+<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl_ie.css' )">
 	<!--[if lte IE 7]>
 	<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl_ie.css" />
 	<![endif]-->
@@ -535,7 +655,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 		var rtlIe	= "{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl_ie.css";
 	</script>
 <else />
-	<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl_ie.css' )">
+	<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl_ie.css' )">
 		<!--[if lte IE 7]>
 		<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/ipb_rtl_ie.css" />
 		<![endif]-->
@@ -546,7 +666,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </if>]]></template_content>
       <template_name>includeRTL</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -554,10 +674,47 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>includeVars</template_name>
+      <template_data>$header_items=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>liveEditJs</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[<if test="haspages:|:$data['totalItems'] > $data['itemsPerPage']">
+	<if test="prevpage:|:$data['_hasPrevious']">
+		<if test="useAjaxPrev:|:$data['ajaxLoad']">
+			<a class='button page-button prev' href="#" onclick="return ipb.global.ajaxPagination( '{$data['ajaxLoad']}', '{parse url="{$data['baseUrl']}&amp;secure_key={$this->member->form_hash}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' );" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']} {$this->lang->words['prev']}</a>
+		<else />
+			<a class='button page-button prev' href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']} {$this->lang->words['prev']}</a>
+		</if>
+	</if>
+	<if test="nextpage:|:$data['_hasNext']">
+		<if test="useAjaxNext:|:$data['ajaxLoad']">
+			<a class='button page-button next' href="#" onclick="return ipb.global.ajaxPagination( '{$data['ajaxLoad']}', '{parse url="{$data['baseUrl']}&amp;secure_key={$this->member->form_hash}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' );" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_rarr']}</a>
+		<else />
+			<a class='button page-button next' href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_rarr']}</a>
+		</if>
+	</if>
+</if>]]></template_content>
+      <template_name>nextPreviousTemplate</template_name>
+      <template_data>$data</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -567,19 +724,19 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
       <template_group>skin_global</template_group>
       <template_content><![CDATA[<if test="haspages:|:$work['pages'] > 1">
 	<if test="prevpage:|:$work['current_page'] > 1">
-		<a class="button page-button" href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_laquo']} {$this->lang->words['prev']}</a>
+		<a class="button page-button prev" href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_laquo']} {$this->lang->words['prev']}</a>
 	<else />
-		<a class="button page-button disabled" href="#">{$this->lang->words['_laquo']} {$this->lang->words['prev']}</a>
+		<a class="button page-button disabled prev" href="#">{$this->lang->words['_laquo']} {$this->lang->words['mob_prev']}</a>
 	</if>
 	<if test="nextpage:|:$work['current_page'] < $work['pages']">
-		<a class="button page-button" href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_raquo']}</a>
+		<a class="button page-button next" href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_raquo']}</a>
 	<else />
-		<a class="button page-button disabled" href="#">{$this->lang->words['next']} {$this->lang->words['_raquo']}</a>
+		<a class="button page-button disabled next" href="#">{$this->lang->words['mob_next']} {$this->lang->words['_raquo']}</a>
 	</if>
 </if>]]></template_content>
       <template_name>paginationTemplate</template_name>
       <template_data>$work, $data</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -594,7 +751,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </form>]]></template_content>
       <template_name>quickSearch</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -605,7 +762,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
       <template_content><![CDATA[&nbsp;]]></template_content>
       <template_name>shareLinks</template_name>
       <template_data><![CDATA[$links, $title='', $url='', $cssClass='topic_share left']]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -618,7 +775,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </div>]]></template_content>
       <template_name>signature_separator</template_name>
       <template_data><![CDATA[$sig=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -626,36 +783,14 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>topic_popup</template_name>
-      <template_data><![CDATA[$topicId='', $seoTitle='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content/>
-      <template_name>user_popup</template_name>
-      <template_data><![CDATA[$memberid=0, $seoName='']]></template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_content><![CDATA[<if test="hasMemberId:|:$member['member_id']"><a href="{parse url="showuser={$member['member_id']}" base="public" template="showuser" seotitle="{$member['members_seo_name']}"}" title="{$this->lang->words['view_profile']}"></if>{$member['members_display_name']}<if test="hasMemberIdClose:|:$member['member_id']"></a></if>]]></template_content>
       <template_name>userHoverCard</template_name>
       <template_data>$member=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
+      <template_master_key>mobile</template_master_key>
     </template>
     <template>
       <template_group>skin_global</template_group>
@@ -723,48 +858,177 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 	<if test="authorwarn:|:$author['warn_percent'] !== NULL">
 		<br class='clear' />
 		<div class='warn_panel clear rounded'>
-			<if test="$this->settings['warn_show_rating']">
-				<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$author['member_id']}" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
-				<p class='rating_mode user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-					<if test="changewarn:|:$author['can_edit_warn']">
-						<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$author['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
-					</if>
-					&lt;&nbsp;{$this->settings['warn_min']} ( {$author['warn_level']} ) {$this->settings['warn_max']}&nbsp;&gt;
-					<if test="changewarn:|:$author['can_edit_warn']">
-						<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$author['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a>
-					</if>
-				</p>
-			<else />
-				<if test="changewarn:|:$author['can_edit_warn']">
-					<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$author['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$author['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
-				</if>
-					<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$author['member_id']}" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
-				<if test="highwarn:|:$author['warn_percent'] >= 80">
-					<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-				<else />
-					<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-				</if>
-					<span style='width: {$author['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$author['warn_percent']}%</span></span>
-				</p>
+			<if test="changewarn:|:$author['can_edit_warn']">
+				<a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;type=add&amp;mid={$author['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;type=minus&amp;mid={$author['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
 			</if>
+				<strong><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$author['member_id']}" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
+			<if test="highwarn:|:$author['warn_percent'] >= 80">
+				<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
+			<else />
+				<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
+			</if>
+				<span style='width: {$author['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$author['warn_percent']}%</span></span>
+			</p>
 		</div>
 	</if>]]></template_content>
       <template_name>userInfoPane</template_name>
       <template_data>$author, $contentid, $options</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
   </templategroup>
+  <templategroup group="skin_global_comments">
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<php>
+// Adjust author name as needed
+if( empty($r['author']['member_id']) && !empty($r['author']['comment_author_name']) )
+{
+	$r['author']['members_display_name'] = $r['author']['comment_author_name'];
+}
+</php>
+<a id='comment_{$r['comment']['comment_id']}'></a>
+<div class="row" id="comment-{$r['comment']['comment_id']}">
+	<div class='icon'>
+		<img src='{$r['author']['pp_thumb_photo']}' width='{$r['author']['pp_thumb_width']}' height='{$r['author']['pp_thumb_height']}' class='photo' />
+	</div>
+	<div class='rowContent'>
+		<h4>{parse template="userHoverCard" group="global" params="$r['author']"}, <span class='desc'>{parse date="$r['comment']['comment_date']" format="short"}</span></h4>
+		{$r['comment']['comment_text']}
+	</div>
+</div>]]></template_content>
+      <template_name>comment</template_name>
+      <template_data>$r, $parent, $settings</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<a id='commentsStart'></a>
+<if test="comments_top:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
+	</div>
+</if>
+<h3>{$this->lang->words['comments_header']}</h3>
+<div class='comment_wrap' id='comment_wrap'>
+	<foreach loop="comments:$comments as $id => $r">
+		{parse template="comment" group="global_comments" params="$r, $parent, $settings"}
+	</foreach>
+</div>
+<if test="allow_comments:|:$parent['_canComment']">
+<h2>{$this->lang->words['mobile_add_comment']}</h2>
+	<a id="fastreply"></a>
+	<div id='fast_reply'>
+		<div>
+			<form action="{parse url="" base="publicWithApp"}" method="post">
+				<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+				<input type="hidden" name="fromApp" value="{$settings['fromApp']}" />
+				<input type="hidden" name="app" value="core" />
+				<input type="hidden" name="module" value="global" />
+				<input type="hidden" name="section" value="comments" />	
+				<input type="hidden" name="do" value="add" />
+				<input type="hidden" name="parentId" value="{$parent['parent_id']}" />
+				<input type="hidden" name="fast_reply_used" value="1" />
+				<div id='commentReply'>
+					{parse template="editorShell" group="editors" params="'fast-reply', 'Post', $preReply, 1, 1"}
+				</div>
+				<div id='commentButtons'>
+				<input type='submit' name="submit" class='input_submit' id='commentPost' value='{$this->lang->words['comment_button_post']}' tabindex='2' accesskey='s' />
+				</div>
+			</form>
+		</div>
+	</div>
+</if>
+<if test="comments_bottom:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
+	</div>
+</if>]]></template_content>
+      <template_name>commentsList</template_name>
+      <template_data><![CDATA[$comments, $settings, $pages, $parent, $preReply='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<if test="comment_errors:|:$errors">
+	<p class='message error'>{$errors}</p>
+</if>
+<div class='post_form'>
+	<form method="post" action="{$this->settings['base_url']}" name="REPLIER">
+		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+		<input type="hidden" name="fromApp" value="{$settings['fromApp']}" />
+		<input type="hidden" name="app" value="core" />
+		<input type="hidden" name="module" value="global" />
+		<input type="hidden" name="section" value="comments" />	
+		<input type="hidden" name="do" value="saveEdit" />
+		<input type="hidden" name="parentId" value="{$parent['parent_id']}" />
+		<input type="hidden" name="comment_id" value="{$comment['comment']['comment_id']}" />
+		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+		
+		<h3 class='maintitle'>
+		<if test="$do == 'saveEdit'">
+			{$this->lang->words['edit_comment']} {$parent['parent_title']}
+		</if>
+		</h3>
+		<div class='generic_bar'></div>
+		
+		<if test="guest_captcha:|:$this->memberData['member_id'] == 0 AND $this->settings['guest_captcha']">
+			<fieldset>
+				<ul>
+					<li class='field'>
+						<label for=''>{$this->lang->words['guest_captcha']}</label>
+						{$imgid}
+					</li>
+				</ul>
+			</fieldset>
+		</if>
+		
+		<fieldset>
+			{$editor}
+		</fieldset>
+		<fieldset class='submit'>
+			<input type="submit" name="submit" value="{$this->lang->words['comment_save']}" tabindex="0" class="input_submit" accesskey="s" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=global&amp;section=comments&amp;do=findComment&amp;comment_id={$comment['comment']['comment_id']}&amp;parentId={$parent['parent_id']}&amp;fromApp={$settings['fromApp']}" base="public"}' class='cancel' title='{$this->lang->words['cancel']}'>{$this->lang->words['cancel']}</a>
+		</fieldset>
+	</form>
+</div>]]></template_content>
+      <template_name>form</template_name>
+      <template_data><![CDATA[$comment, $parent, $editor="", $settings, $errors="", $do='saveEdit']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>getEditJs</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+  </templategroup>
   <templategroup group="skin_global_other">
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>ajaxPopUpNoPermission</template_name>
       <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -773,20 +1037,18 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<input type="hidden" name="captcha_unique_id" value="{$captcha_unique_id}" />
-<div class='row'>
-	{$this->lang->words['glb_captcha_image']}
-	<br />
+<div class='ipsField'>
+	<label for='gd' class='ipsField_title'>{$this->lang->words['glb_captcha_image']}</label>
 	<img id='gd-antispam' class='antispam_img' src='{$this->settings['base_url']}app=core&amp;module=global&amp;section=captcha&amp;do=showimage&amp;captcha_unique_id={$captcha_unique_id}' class='ipd' />
-	<br />
-	<span class='desc'>{$this->lang->words['gbl_captcha_image_desc']}</span>
 	<br /><br />
-	{$this->lang->words['glb_captcha_enter']}<br />
-	<input type="text" size="30" maxlength="30" value="" name="captcha_string" tabindex='0' /><br />
-	<span class='desc'>{$this->lang->words['glb_captcha_text']}</span>
+	<!--<span class='desc'>{$this->lang->words['gbl_captcha_image_desc']}</span>-->
+	<!--{$this->lang->words['glb_captcha_enter']}<br />-->
+	<input type="text" class='input_text' size="30" maxlength="30" value="" name="captcha_string" tabindex='0' /><br />
+	<!--<span class='desc'>{$this->lang->words['glb_captcha_text']}</span>-->
 </div>]]></template_content>
       <template_name>captchaGD</template_name>
       <template_data>$captcha_unique_id</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -800,7 +1062,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </div>]]></template_content>
       <template_name>captchaRecaptcha</template_name>
       <template_data><![CDATA[$html=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -809,14 +1071,16 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<h2>{$this->lang->words['board_offline']}</h2>
-<div class='message error'><strong>{$this->lang->words['board_offline_desc']}</strong><br /><br />{$message}</div>
+<div class='message error'><strong>{parse expression="sprintf( $this->lang->words['board_offline_desc'], $this->settings['board_name'])"}</strong><br /><br />{$message}</div>
+<p class='submit'>
 <if test="!$this->memberData['member_id']">
-	<br />
-	<p class='submit'><a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['attempt_login']}'><strong>{$this->lang->words['click_login']}</strong></a></p>
-</if>]]></template_content>
+	<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['attempt_login']}' class='button secondary'>{$this->lang->words['click_login']}</a>
+<else />
+	<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}' title='{$this->lang->words['log_out']}' class='button secondary'>{$this->lang->words['log_out']}</a>
+</p>]]></template_content>
       <template_name>displayBoardOffline</template_name>
       <template_data><![CDATA[$message=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -845,12 +1109,12 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 					<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}" />
 				<else />
 					<if test="popupcssnoscreen:|:!stripos( $data['attributes'], 'screen' )">
-						<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], 'public/', $data['content'] )"}" />
+						<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], PUBLIC_DIRECTORY . '/', $data['content'] )"}" />
 					</if>
 				</if>
 			</foreach>
 			<if test="popupminifycss:|:$this->settings['use_minify'] AND count($this->minify)">
-				<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], 'public/', implode( ',', $this->minify ) )"}" />
+				<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], PUBLIC_DIRECTORY . '/', implode( ',', $this->minify ) )"}" />
 			</if>
 		</if>
 		<if test="popupcssinline:|:is_array( $css['inline'] ) AND count( $css['inline'] )">
@@ -872,9 +1136,8 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 			</foreach>
 		</if>
 		<script type='text/javascript'>
-			/* SKINNOTE: Turn off for production */
 			jsDebug = <if test="$this->memberData['members_display_name'] == 'brandon' || $this->memberData['members_display_name'] == 'mattm' || $this->memberData['member_id'] == 24 || $this->memberData['member_id'] == 16 || $this->memberData['member_id'] == 18">1<else />0</if>; /* Must come before JS includes */
-			USE_RTE = <if test="popupuserte:|:$this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE'] === TRUE">1<else />0</if>;
+			USE_RTE = <if test="popupuserte:|:$this->memberData['members_editor_choice'] == 'rte'">1<else />0</if>;
 		</script>
 		<if test="popupminifyjs:|:$this->settings['use_minify']">
 			<if test="popupminfyjsrl:|:$this->settings['remote_load_js']">
@@ -883,7 +1146,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 			<else />
 				<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
 			</if>
-			<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=public/js/ipb.js,public/js/ips.quickpm.js<if test="popupjsmodules:|:count($jsLoaderItems) AND is_array($jsLoaderItems)">,public/js/ips.{parse expression="implode('.js,public/js/ips.', array_unique( array_keys( $jsLoaderItems ) ) )"}.js</if>,cache/lang_cache/1/ipb.lang.js'></script>
+			<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f={parse expression="PUBLIC_DIRECTORY"}/js/ipb.js,{parse expression="PUBLIC_DIRECTORY"}/js/ips.quickpm.js<if test="popupjsmodules:|:count($jsLoaderItems) AND is_array($jsLoaderItems)">,{parse expression="PUBLIC_DIRECTORY"}/js/ips.{parse expression="implode('.js,' . PUBLIC_DIRECTORY . '/js/ips.', array_unique( array_keys( $jsLoaderItems ) ) )"}.js</if>,cache/lang_cache/1/ipb.lang.js'></script>
 		<else />
 			<if test="popuprl:|:$this->settings['remote_load_js']">
 				<script type='text/javascript' src='<if test="popuphttpsp:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.6/prototype.js'></script>
@@ -947,10 +1210,8 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 			ipb.vars['swfupload_swf']		= '{parse url="js/3rd_party/swfupload/swfupload.swf" base="public_dir" httpauth="true"}';
 			ipb.vars['swfupload_enabled']	= <if test="popupswfupload:|:$this->settings['uploadFormType']">true<else />false</if>;
 			ipb.vars['use_swf_upload']		= ( '{$this->memberData['member_uploader']}' == 'flash' ) ? true : false;
-			ipb.vars['swfupload_debug']		= false; /* SKINNOTE: Turn off for production */
+			ipb.vars['swfupload_debug']		= false; 
 			/* ---- other ---- */
-			ipb.vars['use_live_search'] 	= <if test="popuplivesearch:|:$this->settings['live_search_disable'] || ! in_array( $this->settings['search_method'], array( 'index' ) )">false<else />true</if>;
-			ipb.vars['live_search_limit'] 	= 4;
 			ipb.vars['highlight_color']		= "#ade57a";
 			ipb.vars['charset']				= "{$this->settings['gb_char_set']}";
 			ipb.vars['use_rte']				= 1;
@@ -981,7 +1242,7 @@ var LOADING_TEMPLATE = new Template( "<div id='loadingBox'><img src='{style_imag
 </html>]]></template_content>
       <template_name>displayPopUpWindow</template_name>
       <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $title="", $output=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1031,7 +1292,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>Error</template_name>
       <template_data><![CDATA[$message="",$code=0,$ad_email_one="",$ad_email_two="",$show_top_msg=0, $login="", $post=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1046,7 +1307,7 @@ function contact_admin() {
 <br />]]></template_content>
       <template_name>error_log_in</template_name>
       <template_data><![CDATA[$q_string=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1065,7 +1326,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>error_post_textarea</template_name>
       <template_data><![CDATA[$post=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1076,7 +1337,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>facebookDone</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1086,8 +1347,211 @@ function contact_admin() {
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>facebookPop</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$user=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>followUnsubscribe</template_name>
+      <template_data>$data, $meta</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<if test="topicIsMoved:|:$imgArray['is_moved']">
+	<span title="{$this->lang->words['pm_moved']}">{parse replacement="t_moved"}</span>
+</if>
+<if test="topicIsClosed:|:$imgArray['is_closed']">
+	<span title="{$this->lang->words['pm_locked']}">{parse replacement="t_closed"}</span>
+</if>
+<if test="topicReadDot:|:$imgArray['show_dot'] && empty( $unreadUrl )">{parse replacement="t_read_dot"}</if>
+<if test="gotolatestwrap:|: ! empty( $unreadUrl ) && ! $imgArray['is_moved']">
+	<a href='{$unreadUrl}' title='{$this->lang->words['first_unread_post']}'>
+	<if test="topicUnreadDot:|:$imgArray['show_dot']">
+		{parse replacement="t_unread_dot"}
+	<else />
+		{parse replacement="t_unread"}
+	</if>
+	</a>
+</if>]]></template_content>
+      <template_name>generateTopicIcon</template_name>
+      <template_data>$imgArray, $unreadUrl</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"<if test="fbcenabled:|:IPSLib::fbc_enabled() === TRUE"> xmlns:fb="http://www.facebook.com/2008/fbml"</if>>
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
+		<title>{$header_items['title']}<if test="pagenumberintitle:|:$header_items['page']"> {$this->lang->words['page_title_page']} {$header_items['page']}</if></title>
+		<link rel="shortcut icon" href='<if test="$this->registry->output->isHTTPS">{$this->settings['board_url_https']}<else />{$this->settings['board_url']}</if>/favicon.ico' />
+		
+		{parse template="includeJS" group="global" params="$jsModules"}
+		{parse template="includeCSS" group="global" params="$css"}
+		<!--<meta http-equiv="X-UA-Compatible" content="IE=7" />-->
+		{parse template="includeMeta" group="global" params="$metaTags"}
+		{parse template="includeFeeds" group="global" params="$documentHeadItems"}
+		{parse template="includeRTL" group="global" params=""}
+		
+		<!--<meta name="apple-mobile-web-app-capable" content="yes">-->
+		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+		<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable = no;">
+	</head>
+	<body id='ipboard_body'>
+		<div id='ipbwrapper'>
+			<if test="count( $items['navigation'] ) > 1 && !$this->settings['_mobile_nav_home']">
+				<if test="$this->nav_count=count($items['navigation'])"></if>
+				<if test="$this->nav_back = ( isset( $this->settings['_mobile_back_nav'] ) ) ? $this->settings['_mobile_back_nav'] : 2"></if>
+				<div id='secondary_navigation'>
+					<a href='{parse url="{$items['navigation'][ $this->nav_count - $this->nav_back ][1]}" base="public" seotitle="{$items['navigation'][ $this->nav_count - $this->nav_back ][2]}" template="{$items['navigation'][ $this->nav_count - $this->nav_back ][3]}"}'>{$this->lang->words['_larr']} &nbsp;{$items['navigation'][ $this->nav_count - $this->nav_back ][0]}</a>
+				</div>
+			<else />
+				<if test="( count( $items['navigation'] ) == 1 || $this->settings['_mobile_nav_home'] ) && ! $this->settings['_mobile_hide_nav']">
+					<div id='secondary_navigation'>
+						<a href='{parse url="act=idx" seotitle="false" base="public"}' class='back'>{$this->lang->words['_larr']} {$this->lang->words['home']}</a>
+					</div>
+				</if>
+			</if>
+			<if test="brandingBar:|:method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'overwriteHeader' )">
+				{parse template="overwriteHeader" group="{current_app}_global" params=""}
+			<else />
+				{parse template="defaultHeader" group="global" params=""}
+			</if>
+			<div id="options-button">&raquo;</div>	
+			<div id='user_navigation'>
+				<if test="memberbox:|:!$this->memberData['member_id']">
+					<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}'>{$this->lang->words['sign_in']}</a>
+					<a href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register']}'>{$this->lang->words['register']}</a>
+				<else />
+					<a href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}">{$this->lang->words['log_out']} ({$this->memberData['members_display_name']})</a>
+					<if test="messengerlink:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0">
+						<a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['your_messenger']}'>{$this->lang->words['your_messenger']}</a>
+					</if>
+				</if>
+				<if test="!ipsRegistry::$applications['members']['app_hide_tab'] && !count(ipsRegistry::$applications['members']['app_tab_groups']) && !IPSMember::isInGroup( $this->memberData, ipsRegistry::$applications['members']['app_tab_groups'] )"><a href='{parse url="app=members" base="public" seotitle="false"}' title='{$this->lang->words['go_to_memberlist']}'>{$this->lang->words['tb_mlist']}</a></if>
+				<if test="hasBlog:|:ipsRegistry::$applications['blog']['app_enabled']">
+					<a href='{parse url="app=blog" seotitle="false" base="public"}' title='{$this->lang->words['go_to_prefix']}{IPSLib::getAppTitle( 'blog' )}'>{IPSLib::getAppTitle( 'blog' )}</a>
+				</if>
+				<if test="hasGallery:|:ipsRegistry::$applications['gallery']['app_enabled']">
+					<a href='{parse url="app=gallery" seotitle="false" base="public"}' title='{$this->lang->words['go_to_prefix']}{IPSLib::getAppTitle( 'gallery' )}'>{IPSLib::getAppTitle( 'gallery' )}</a>
+				</if>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=<if test="viewnewcontentapp:|:$this->registry->getCurrentApplication() != 'core' AND IPSLib::appIsSearchable( $this->registry->getCurrentApplication() )">{$this->registry->getCurrentApplication()}<else />forums</if>" base="public"}' accesskey='2'>{$this->lang->words['view_new_posts']}</a>
+				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['mob_status_updates']}</a>
+				<a href='{parse url="app=core&amp;module=search" base="public"}' accesskey='2'>{$this->lang->words['sj_search']}</a>
+			</div>
+			<script type="text/javascript">
+				/* Prevent flash of header */
+				document.getElementById('user_navigation').style.display = 'none';
+			</script>
+			
+			<div id='content' class='clear'>
+				<if test="mainpageContent:|:$html">{$html}</if>
+			</div>
+			
+			<div id='footer' class='clear'>
+				<if test="skinchanger:|:$footer_items['skin_chooser'] AND ! $this->member->isMobileApp">
+					<if test="uagentlocked:|:$this->memberData['userAgentLocked'] AND ! $this->memberData['userAgentBypass']">
+						<a href='{parse url="{$this->settings['query_string_formatted']}&amp;unlockUserAgent=1" base="public"}'>{$this->lang->words['full_version']}</a>
+					<else />
+						<a href='#' id='show_skins'>{$this->lang->words['change_theme']}</a>
+						<div id='show_skins_box' style='display: none'>
+							<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post">
+								<fieldset>
+									<input type='hidden' name='k' value='{$this->member->form_hash}' />
+									<label for='newSkin' class='hide'>{$this->lang->words['theme_prefix']}</label>
+									<select name="settingNewSkin" id='newSkin'>
+										<foreach loop="$footer_items['skin_chooser'] as $skin">
+											<option value='{$skin['id']}' <if test="$skin['selected']">selected='selected'</if>>{$skin['title']}</option>
+										</foreach>
+									</select>
+									<input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit alt' id='newSkinSubmit' />
+								</fieldset>
+							</form>
+						</if>
+					</div>
+				</if>
+				<if test="langchooser:|:count( $footer_items['lang_chooser']['options'] )">
+					<a href='#' id='show_langs'>{$footer_items['lang_chooser']['default']}</a>
+					<div id='show_langs_box' style='display: none'>
+						<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post">
+							<fieldset>
+								<input type='hidden' name='k' value='{$this->member->form_hash}' />
+								<input type='hidden' name='setlanguage' value='1' />
+								<input type="hidden" name="langurlbits" value="{$this->settings['query_string_safe']}&amp;cal_id={$this->request['cal_id']}" />
+								<label for='newLang' class='hide'>{$this->lang->words['language_prefix']}</label>
+								<select name="langid" id='newLang'>
+									<foreach loop="$footer_items['lang_chooser']['options'] as $lang">
+										<option value='{$lang['id']}' <if test="$lang['selected']">selected='selected'</if>>
+											{$lang['title']}
+										</option>
+									</foreach>
+								</select>
+								<input type='submit' class='input_submit alt' value='{$this->lang->words['jmp_go']}' id='newLangSubmit' />
+							</fieldset>
+						</form>
+					</div>
+				</if>
+				<if test="isNotMobbyApp:|:($this->memberData['userAgentKey'] == 'iphone' || $this->memberData['userAgentKey'] == 'ipodtouch') AND ! $this->member->isMobileApp">
+					<div><a href="http://www.invisionpower.com/download/goiphone.php">{$this->lang->words['freeiphoneapp']}</a></div>
+				</if>
+			</div>
+			<div id='task'>{$stats['task']}</div>
+		</div>
+		<div id='shade' style='display:none'></div>
+		<!-- pre-load -->
+		<div style='display:none'><img src='{style_images_url}/wait.gif' /></div>
+	</body>
+</html>]]></template_content>
+      <template_name>globalTemplateMinimal</template_name>
+      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, array $header_items, $items=array(), $footer_items=array(), $stats=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>htmlEmailWrapper</template_name>
+      <template_data>$content</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>inboxList</template_name>
+      <template_data>$topics</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>inlineUploaderComplete</template_name>
+      <template_data>$json</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1097,8 +1561,8 @@ function contact_admin() {
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>likeMoreDialogue</template_name>
-      <template_data>$data, $relId</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$data, $relId, $cache</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1109,7 +1573,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>likeSetDialogue</template_name>
       <template_data>$app, $area, $relid, $data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1120,7 +1584,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>likeSummary</template_name>
       <template_data>$data, $relId, $opts</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1131,7 +1595,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>likeSummaryContents</template_name>
       <template_data>$data, $relId, $opts=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1142,7 +1606,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>notificationsList</template_name>
       <template_data>$notifications</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1151,21 +1615,52 @@ function contact_admin() {
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<input type="hidden" name="qanda_id" value="{$data['qa_id']}" />
-<h3>{$this->lang->words['qa_title']}</h3>
-<div class='row'>
-	<strong>{$data['qa_question']}</strong><br /><br />
-	
+<div class='ipsField'>
+	<label for='qna' class='ipsField_title'>{$data['qa_question']}</label>	
 	<input type="text" class='input_text' size="30" maxlength="100" value="" name="qa_answer" id='qna' tabindex='0' /><br />
 	<span class='desc'>{$this->lang->words['qa_question_desc']}</span>
 </div>]]></template_content>
       <template_name>questionAndAnswer</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>quickNavigationOffline</template_name>
+      <template_data>$message</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>quickNavigationPanel</template_name>
+      <template_data><![CDATA[$data=array(), $currentApp='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>quickNavigationWrapper</template_name>
+      <template_data><![CDATA[$tabs=array(), $data=array(), $currentApp='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
@@ -1256,7 +1751,170 @@ function contact_admin() {
 </html>]]></template_content>
       <template_name>redirectTemplate</template_name>
       <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $text="",$url="", $full=false]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<if test="reputationBox:|:$this->settings['reputation_enabled']">
+	<if test="canRep:|:!( $this->settings['reputation_protected_groups'] && in_array( $member['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) )">	
+		<if test="isLike:|:$this->settings['reputation_point_types'] == 'like'">
+			<ul class='ipsList_inline post_rep'>
+				<li <if test="giveRepUp:|:IPSMember::canRepUp( $data, $member ) === false">style="display:none"</if> >
+					<a class='ipsLikeButton ipsLikeButton_enabled rep_up' href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' title='{$this->lang->words['reputation_up']}'>{$this->lang->words['like_this']}</a>
+				</li>
+				<li <if test="giveRepDown:|:IPSMember::canRepDown( $data, $member ) === false">style="display:none"</if> >
+					<a class='ipsLikeButton ipsLikeButton_disabled rep_down'  href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=-1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' title='{$this->lang->words['reputation_down']}'>{$this->lang->words['unlike_this']}</a>
+				</li>
+			</ul>
+		<else />
+			<ul class='ipsList_inline post_rep'>
+				<if test="canGiveRep:|:IPSMember::canGiveRep( $data, $member ) !== false">			
+					<li <if test="giveRepUp:|:IPSMember::canRepUp( $data, $member ) === false">style="display:none"</if>>
+						<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' class='rep_up' title='{$this->lang->words['reputation_up']}'>{parse replacement="rep_up"}</a>
+					</li>
+					<li <if test="giveRepDown:|:IPSMember::canRepDown( $data, $member ) === false">style="display:none"</if>>
+						<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=-1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' class='rep_down' title='{$this->lang->words['reputation_down']}'>{parse replacement="rep_down"}</a>
+					</li>
+				</if>
+			</ul>
+		</if>
+	</if>
+</if>]]></template_content>
+      <template_name>repButtons</template_name>
+      <template_data>$member, $data=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>repMoreDialogue</template_name>
+      <template_data>$data, $relId</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>reputationPopup</template_name>
+      <template_data>$reps</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3 class='maintitle'>{$this->lang->words['mob_tags']}</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<ul class='ipsList_inline'>
+		<foreach loop="eachTag:$tags['tags'] as $id => $data">
+			<li><span class="{$data['className']}">{$data['tagWithUrl']}</span></li>
+		</foreach>
+		</ul>
+	</div>
+</div>]]></template_content>
+      <template_name>tagCloud</template_name>
+      <template_data>$tags</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<a <if test="noClass:|:!$noClass">class='ipsTag'</if> href="{parse url="app=core&amp;module=search&amp;do=search&amp;search_tags={parse expression="urlencode($tag)"}&amp;search_app=<if test="inSearch:|:$this->request['search_app']">{$this->request['search_app']}<else />{parse expression="IPS_APP_COMPONENT"}</if>" base="public"}" data-tooltip="{parse expression="sprintf( $this->lang->words['find_more_tags'], $tag )"}">{$tag}</a>]]></template_content>
+      <template_name>tagEntry</template_name>
+      <template_data>$tag, $noClass=false</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<a href="{parse url="app=core&amp;module=search&amp;do=search&amp;search_tags={parse expression="urlencode($tag)"}&amp;search_app=<if test="inSearch:|:$this->request['search_app']">{$this->request['search_app']}<else />{parse expression="IPS_APP_COMPONENT"}</if>" base="public"}" class='ipsBadge ipsBadge_lightgrey'>{$tag}</a>]]></template_content>
+      <template_name>tagPrefix</template_name>
+      <template_data>$tag</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<script type='text/javascript' src="{$this->settings['public_dir']}js/ips.tags.mobile.js"></script>
+<a href='#' id='{$options['fieldId']}_tag_button' class='ipsTagBox_launcher'>{$this->lang->words['mob_edit_tags']}</a>
+<div class='ipsFilterPane' id='{$options['fieldId']}_tag_pane' style='display: none'>
+	<a href='#' id='{$options['fieldId']}_close_pane' class='ipsFilterPane_close'><span>&times;</span></a>
+	<div>
+		<h4>{$this->lang->words['topictagsh4']}</h4>
+		<if test="!$options['minTags'] && $options['maxTags']">
+			<h5>{parse expression="sprintf( $this->lang->words['tags_max_no_min'], $options['maxTags'] )"}</h5>
+		</if>
+		<if test="$options['minTags'] && !$options['maxTags']">
+			<h5>{parse expression="sprintf( $this->lang->words['tags_min_no_max'], $options['minTags'] )"}</h5>
+		</if>
+		<if test="$options['minTags'] && $options['maxTags']">
+			<h5>{parse expression="sprintf( $this->lang->words['tags_max_and_min'], $options['minTags'], $options['maxTags'] )"}</h5>
+		</if>
+		<div class='ipsFilterPane_inner'>
+			<div class='ipsTagBox'>
+				<ul id='{$options['fieldId']}_tags' class='ipsTagBox_taglist'></ul>
+			</div>
+			<div class='ipsTagBox_editor'>
+				<span id='{$options['fieldId']}_addwrap'>
+					<if test="!$options['isOpenSystem']">
+						<select id='{$options['fieldId']}_tag_select' class='input_select'>
+							<foreach loop="$options['predefinedTags'] as $tag">
+								<option value="$tag">{$tag}</option>
+							</foreach>
+						</select>
+					<else />
+						<input type='text' id='{$options['fieldId']}_tag_input' class='input_text' />
+					</if> <input type='submit' value='{$this->lang->words['mob_add_tag']}' class='input_submit' id='{$options['fieldId']}_tag_add' />
+				</span>
+				<span id='{$options['fieldId']}_removewrap' style='display: none'>
+					<input type='submit' value='{$this->lang->words['mob_remove_tag']}' id='{$options['fieldId']}_tag_remove' class='input_submit ipsTagBox_remove' />
+				</span>
+			</div>
+		</div>
+	</div>
+</div>
+<input type="text" value="" name="{$options['fieldId']}" id="{$options['fieldId']}" style='display: none' />
+<php>
+	$options['lang']['tag_add_link']	= $this->lang->words['add_a_tag'];
+	$options['lang']['tip_text']		= $this->lang->words['tag_tip'];
+	$options['forceLowercase']			= $this->settings['tags_force_lower'];
+	$options['existingTags']			= count($tags['tags']) ? $tags['tags'] : null;
+	$_tmp = $options;
+	
+	/* Always return as UTF-8 */
+	array_walk_recursive( $_tmp, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+	$jsonEncoded = json_encode( $_tmp );
+	$jsonEncoded = IPSText::convertCharsets($jsonEncoded, "UTF-8", IPS_DOC_CHAR_SET);
+</php>
+<script type="text/javascript">
+	$( "{$options['fieldId']}" ).mobileTagify( {$jsonEncoded} );
+</script>]]></template_content>
+      <template_name>tagTextEntryBox</template_name>
+      <template_data>$tags, $options, $where</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1267,7 +1925,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>twitterDone</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1278,7 +1936,7 @@ function contact_admin() {
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>twitterPop</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1298,7 +1956,7 @@ function contact_admin() {
 <if test="isajax:|:$this->request['xml']">
 <br />
 </if>
-<h2>$one_text: $three_text</h2>
+<h2>{$one_text}: {$three_text}</h2>
 <div class='row2 help_doc bullets'>
 	{$text}
 </div>
@@ -1312,7 +1970,7 @@ function contact_admin() {
 </if>]]></template_content>
       <template_name>helpShowSection</template_name>
       <template_data><![CDATA[$one_text="",$two_text="",$three_text="", $text]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1341,7 +1999,7 @@ function contact_admin() {
 </ol>]]></template_content>
       <template_name>helpShowTopics</template_name>
       <template_data><![CDATA[$one_text="",$two_text="",$three_text="",$rows]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1349,6 +2007,17 @@ function contact_admin() {
     </template>
   </templategroup>
   <templategroup group="skin_login">
+    <template>
+      <template_group>skin_login</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>ajax__inlineLogInForm</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_login</template_group>
       <template_content><![CDATA[<div class='row message error'>
@@ -1356,7 +2025,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>errors</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1369,61 +2038,1502 @@ function contact_admin() {
 	<if test="referer:|:$referer">
 		<input type="hidden" name="referer" value="{$referer}" />
 	</if>
-	<div class='master_list'>
-		<h2>{$this->lang->words['log_in']}</h2>
-	
+	<h2>{$this->lang->words['log_in']}</h2>
+		<div class='ipsForm_vertical'>
+		
+		
 		<if test="showAlternate:|:( $this->request['show'] == 'live' && in_array( 'live', $login_methods ) ) || ( $this->request['show'] == 'openid' && in_array( 'openid', $login_methods ) )">
-			<div class='row'>
+			<div class='ipsField'>
 				<if test="showOpenID:|:$this->request['show'] == 'openid'">
-					{parse replacement="openid_small"} {$this->lang->words['openid']}<br />
-					<input type='text' class='input_text' name='openid_url' value='http://' size='30' /><br />
+					<label for='openid_url' class='ipsField_title'>{parse replacement="openid_small"} {$this->lang->words['openid']}</label>
+					<input type='text' class='input_text' name='openid_url' id='openid_url' value='http://' size='30' /><br />
 					<span class='desc'>{$this->lang->words['openid_example']}</span>
 				<else />
-					{parse replacement="live_small"} {$this->lang->words['sign_in_winlive']}<br />
-					<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1&amp;auth_key={$this->member->form_hash}" base="public"}'>{parse replacement="live_large"}</a> <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1" base="public"}'>{$this->lang->words['signin_with_live']}</a>
+					<label class='ipsField_title'>{parse replacement="live_small"} {$this->lang->words['sign_in_winlive']}</label>
+					<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1&amp;auth_key={$this->member->form_hash}" base="public"}'>{parse replacement="live_large"}</a> <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1&amp;auth_key={$this->member->form_hash}" base="public"}'>{$this->lang->words['signin_with_live']}</a>
 				</if>
 			</div>
 		<else />
-			<div class='row'>
-				{$this->lang->words['enter_name']}<br />
-				<input id='username' type='text' class='input_text' name='username' size='30' />
-				<br /><br />
-				{$this->lang->words['enter_pass']}<br />
-				<input id='password' type='password' class='input_text' name='password' size='30' />
-				<br /><br />
+			<div class='ipsField'>
+				<label for='ips_username' class='ipsField_title'>{$this->lang->words['enter_name']}</label>
+				<input id='username' type='text' class='input_text' name='ips_username' size='30' />
+			</div>
+			<div class='ipsField'>
+				<label for='ips_password' class='ipsField_title'>{$this->lang->words['enter_pass']}</label>
+				<input id='password' type='password' class='input_text' name='ips_password' size='30' />
+			</div>
 			
+			<div class='ipsField'>
 				<if test="hasopenid:|:in_array( 'openid', $login_methods )">
-					{parse replacement="openid_small"} {$this->lang->words['have_openid']} <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;show=openid" base="public"}' title='{$this->lang->words['use_openid']}' id='openid_open'>{$this->lang->words['sign_in_here']}</a><br />
+					<p>{parse replacement="openid_small"} {$this->lang->words['have_openid']} <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;show=openid" base="public"}' title='{$this->lang->words['use_openid']}' id='openid_open'>{$this->lang->words['sign_in_here']}</a></p><br />
 				</if>
 				<if test="haswindowslive:|:in_array( 'live', $login_methods )">
-					{parse replacement="live_small"} {$this->lang->words['have_msnlive']} <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;show=live" base="public"}' title='{$this->lang->words['use_openid']}' id='openid_open'>{$this->lang->words['sign_in_here']}</a>
+					<p>{parse replacement="live_small"} {$this->lang->words['have_msnlive']} <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;show=live" base="public"}' title='{$this->lang->words['use_openid']}' id='openid_open'>{$this->lang->words['sign_in_here']}</a></p><br />
+				</if>
+				<if test="hasFacebook:|:IPSLib::fbc_enabled()">
+					<p><a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?_reg=1&amp;mobile=true"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a></p><br />
+				</if>
+				<if test="hasTwitter:|:IPSLib::twitter_enabled() === true">
+					<p><a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?_reg=1&amp;mobile=true"><img src="{$this->settings['img_url']}/twitter_login.png" alt="" /></a></p>
 				</if>
 			</div>
 		</if>
 		
 		<h3>{$this->lang->words['sign_in_options']}</h3>
-		<div class='row'>
+		<div class='ipsField ipsField_checkbox'>
 			<input type='checkbox' id='remember' checked='checked' name='rememberMe' value='1' class='input_check' />
-			<label for='remember'>{$this->lang->words['rememberme']}</label><br />
-			<span class='desc'>{$this->lang->words['notrecommended']}</span>
-			
+			<p class='ipsField_content'>
+				<label for='remember'>{$this->lang->words['rememberme']}</label><br />
+				<span class='desc'>{$this->lang->words['notrecommended']}</span>
+			</p>
+		</div>	
 			<if test="anonymous:|:!$this->settings['disable_anonymous']">
-				<br /><br />
-			
-				<input type='checkbox' id='invisible' name='anonymous' value='1' class='input_check' />
-				<label for='invisible'>{$this->lang->words['form_invisible']}</label><br />
-				<span class='desc'>{$this->lang->words['anon_name']}</span>
+				<div class='ipsField ipsField_checkbox'>
+					<input type='checkbox' id='invisible' name='anonymous' value='1' class='input_check' />
+					<p class='ipsField_content'>
+						<label for='invisible'>{$this->lang->words['form_invisible']}</label><br />
+						<span class='desc'>{$this->lang->words['anon_name']}</span>
+					</p>
+				</div>
 			</if>
 		</div>
 		
 		<div class='submit'>
-			<input type='submit' class='input_submit' value='{$this->lang->words['sign_in_button']}' /> {$this->lang->words['or']} <a href='{parse url="" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
+			<input type='submit' class='button' value='{$this->lang->words['sign_in_button']}' />
 		</div>
 	</div>
 </form>]]></template_content>
       <template_name>showLogInForm</template_name>
       <template_data><![CDATA[$message="",$referer="",$extra_form="", $login_methods=array(), $facebookOpts=array()]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+  </templategroup>
+  <templategroup group="skin_modcp">
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="topic"}
+<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+{parse template="include_lightbox" group="global" params=""}
+</if>
+<script type='text/javascript'>
+	ipb.topic.inSection	= 'topicview';
+</script>
+<style type='text/css'>
+	.post_mod, .post_id { display: none; }
+</style>
+{$this->templateVars['test']}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<if test="hasPosts:|:is_array( $posts ) AND count( $posts )">
+		<div id='ips_Posts'>
+			<foreach loop="post_data:$posts as $post">
+					{parse template="modCPpost" group="modcp" params="$post, array( 'sdData' => $other_data ), $post, 'deleted'"}
+			</foreach>
+		</div>
+	<else />
+		<div class='no_messages'>
+			{$this->lang->words['no_deleted_posts']}
+		</div>
+	</if>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>deletedPosts</template_name>
+      <template_data><![CDATA[$posts, $other_data=array(), $pagelinks='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="forums"}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table topic_list' id='forum_table'>
+		<if test="hastopics:|:is_array( $topics ) AND count( $topics )">
+			{parse striping="forumTable" classes="row1,row2"}
+			{parse template="modCPtopic" group="modcp" params="$topics, $pagelinks, 'deleted', $sdelete"}
+		<else />
+			<tr> 
+				<td colspan='5' class='no_messages'>{$this->lang->words['no_topics']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>deletedTopics</template_name>
+      <template_data><![CDATA[$topics, $sdelete=array(), $pagelinks='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form action='{parse url="app=core&amp;module=modcp&amp;section=editmember" base="public"}' method='post'>
+<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+<input type='hidden' name='do' value='doeditmember' />
+<input type='hidden' name='mid' value='{$profile['member_id']}' />
+<input type="hidden" name="_st" value="{$this->request['_st']}" />
+<input type="hidden" name="t" value="{$this->request['t']}" />
+<input type="hidden" name="pf" value="{$this->request['pf']}" />
+<style type='text/css'>
+	.cke_contents { height: 100px !important; }
+</style>
+<h2 class='maintitle'>{$this->lang->words['cp_em_title']}: <a href='{parse url="showuser={$profile['_parsedMember']['member_id']}" seotitle="{$profile['_parsedMember']['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$profile['_parsedMember']['members_display_name']}</a></h2>
+<div class='post_form'>
+	<fieldset>
+		<h3 class='bar'>{$this->lang->words['edit_user_images']}</h3>
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField'>
+				<label for='photo' class='ipsField_title'>{$this->lang->words['cp_remove_photo']}</label>
+				<p class='ipsForm_content'>
+					<select name="photo" id='photo' class='input_select'>
+						<option value="0">{$this->lang->words['no']}</option>
+						<option value="1">{$this->lang->words['yes']}</option>
+					</select>
+					&nbsp;&nbsp;
+					<img src='{$profile['_parsedMember']['pp_mini_photo']}' class='ipsUserPhoto ipsUserPhoto_tiny' />
+				</p>
+			</li>
+		</ul>
+		<if test="editusercfields:|:count($custom_fields->out_fields)">
+			<h3 class='bar'>{$this->lang->words['edit_user_profile']}</h3>
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='title' class='ipsField_title'>{$this->lang->words['edit_user_title']}</label>
+					<p class='ipsField_content'>
+						<input type='text' class="input_text" name='title' size='50' value='{$profile['title']}' />
+					</p>
+				</li>
+				<foreach loop="custom_fields:$custom_fields->out_fields as $id => $data">
+					<li class='ipsField'>
+						<label for='field_{$id}' class='ipsField_title'>{$custom_fields->field_names[ $id ]}</label>
+						<div class='ipsField_content'>
+							{$data}
+							<if test="editusercfielddesc:|:$custom_fields->field_desc[ $id ]">
+								<br /><span class='desc'>{$custom_fields->field_desc[ $id ]}</span>
+							</if>
+						</div>
+					</li>
+				</foreach>
+			</ul>
+		</if>
+		<h3 class='bar'>{$this->lang->words['cp_edit_signature']}</h3>
+		<div class='ipsPad'>
+			{$profile['signature']}
+		</div>
+		<h3 class='bar'>{$this->lang->words['cp_edit_aboutme']}</h3>
+		<div class='ipsPad'>
+			{$profile['aboutme']}
+		</div>
+	</fieldset>
+	<fieldset class='submit'>
+		<input type="submit" class='input_submit' value="{$this->lang->words['cp_em_submit']}" />
+	</fieldset>
+</div>
+</form>]]></template_content>
+      <template_name>editUserForm</template_name>
+      <template_data>$profile, $custom_fields=null</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<p class='message unspecific'>{$msg}</p>]]></template_content>
+      <template_name>inlineModIPMessage</template_name>
+      <template_data><![CDATA[$msg='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table'>
+		<tr class='header'>
+			<th scope='col'>{$this->lang->words['w_v_warnby']}</th>
+			<th scope='col'>{$this->lang->words['w_v_warnto']}</th>
+			<th scope='col'>{$this->lang->words['w_v_notes']}</th>
+		</tr>
+		<if test="haswarnings:|:is_array( $warnings ) AND count( $warnings )">
+			{parse striping="warnings" classes="row1,row2 altrow"}
+			<foreach loop="warningloop:$warnings as $r">
+				<tr class='{parse striping="warnings"}'>
+					<td>{$r['punisher_photo']} <a href='{parse url="showuser={$r['punisher_id']}" base="public" seotitle="{$r['punisher_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['punisher_name']}</strong></a></td>
+					<td><img src='{$r['pp_mini_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' alt='' /> <a href='{parse url="showuser={$r['member_id']}" base="public" seotitle="{$r['members_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['members_display_name']}</strong></a></td>
+					<td>{$this->lang->words['mod_warn_added']} <strong>{parse date="$r['wlog_date']" format="long" relative="false"}</strong></td>
+				</tr>
+				<tr class='{parse striping="warnings"}'>
+					<td>
+						<span class="<if test="warnlognote:|:$r['wlog_type'] == 'note' OR $r['wlog_type'] == 'pos'">positive<else />negative</if>" <if test="warnlogcolor:|:$r['wlog_type'] == 'note' || $r['wlog_type'] == 'nochan' || $r['wlog_type'] == 'custom'">style='color:gray'</if>>
+							<if test="warnlognotetype:|:$r['wlog_type'] == 'note'">
+								{$this->lang->words['mod_warn_note']}
+							<else />
+								<if test="warnlogpos:|:$r['wlog_type'] == 'pos'">
+									{$this->lang->words['w_v_minus']}
+								</if>
+								<if test="warnlogneg:|:$r['wlog_type'] == 'neg'">
+									{$this->lang->words['w_v_add']}
+								</if>
+								<if test="warnlognochange:|:$r['wlog_type'] == 'nochan'">
+									{$this->lang->words['w_v_nochan']}
+								</if>
+								<if test="warnlogcustchange:|:$r['wlog_type'] == 'custom'">
+									{$this->lang->words['w_v_custom']}
+								</if>
+							</if>
+						</span>
+					</td>
+					<td colspan='2'>{$r['content']}</td>
+				</tr>
+			</foreach>
+		<else />
+			<tr>
+				<td class="no_messages" colspan="3">{$this->lang->words['warn__no_recent']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>latestWarnLogs</template_name>
+      <template_data>$warnings, $pagelinks</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<if test="canEditMember:|:$this->memberData['g_is_supmod']">
+{parse js_module="modcp"}
+<script type='text/javascript'>
+ipb.modcp.initialtext = "{$this->lang->words['start_typing_lup']}";
+</script>
+<h2 class='maintitle'>{$this->lang->words['memberlookup_title']}</h2>
+<div class='clearfix ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<h3 class='ipsType_subtitle'>{$this->lang->words['memberlookup_desc']}</h3>
+		<p class='desc'>{$this->lang->words['starttypeingmember']}</p>
+		<form action='#' method='post' style='margin-top: 10px'>
+			<input type='text' name='memberlookup' id='memberlookup' class='input_text' size='50' />
+		</form>
+	</div>
+	<script type='text/javascript'>
+		$('memberlookup').defaultize( "{$this->lang->words['start_typing_lup']}" );
+	</script>
+</div>
+<else />
+<div class='clearfix '>
+	<div class='ipsBox_container ipsPad'>
+		<p>{$this->lang->words['intro_blurb']}</p>
+	</div>
+</div>
+</if>]]></template_content>
+      <template_name>memberLookup</template_name>
+      <template_data/>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<div id='member_list' class='clear block_wrap'>
+		<div id='member_wrap'>
+			<ul class='ipsMemberList'>
+				<if test="showmembers:|:is_array( $members ) and count( $members )">
+					{parse striping="memberStripe" classes="row1,row2"}
+					<foreach loop="members:$members as $member">
+						<li id='member_id_{$member['member_id']}' class='ipsPad clearfix member_entry {parse striping="memberStripe"}'>
+							<a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$member['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+							<div class='ipsBox_withphoto'>
+								<ul class='ipsList_inline right'>
+									<if test="weAreSupmod:|:$this->memberData['g_is_supmod'] == 1 && $member['member_id'] != $this->memberData['member_id']">
+										<li><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;auth_key={$this->member->form_hash}&amp;mid={$member['member_id']}&amp;pf={$member['member_id']}" base="public"}' class='ipsButton_secondary'>{$this->lang->words['edit_member']}</a></li>
+									</if>
+									<if test="memberwarn:|:$member['warn_percent'] !== NULL">
+										<a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$member['member_id']}&amp;_tab=warn" base="public"}' id='warn_link_modcp_{$member['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link ipsButton_secondary'>{$this->lang->words['warn_status']}</a>
+									</if>
+									<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $member['member_id'] != $this->memberData['member_id']">
+										<li class='pm_button' id='pm_xxx_{$member['pp_member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['pp_member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
+									</if>
+									<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}' class='ipsButton_secondary'>{parse replacement="find_topics_link"}</a></li>
+									<if test="blog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $member['has_blog'] != 'recache'">
+										<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
+									</if>
+									<if test="gallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+										<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
+									</if>
+								</ul>
+								
+								<h3 class='ipsType_subtitle'>
+									<strong><a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></strong>
+								</h3>
+								<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+									<if test="norep:|:$member['pp_reputation_points'] == 0 || !$member['pp_reputation_points']">
+										<p class='reputation zero ipsType_small left'>
+									</if>
+									<if test="posrep:|:$member['pp_reputation_points'] > 0">
+										<p class='reputation positive ipsType_small left'>
+									</if>
+									<if test="negrep:|:$member['pp_reputation_points'] < 0">
+										<p class='reputation negative ipsType_small left'>
+									</if>							
+											<span class='number'>{$member['pp_reputation_points']}</span>
+										</p>
+								</if>
+								<span class='desc'>
+									{$this->lang->words['member_joined']} {parse date="$member['joined']" format="joined"}<br />
+									{IPSMember::makeNameFormatted( $member['group'], $member['member_group_id'] )} &middot; <strong>{$this->lang->words['modqueued_til']}: <if test="isnotbanned:|:in_array( $type, array( 'modposts', 'suspended', 'restrictposts' ) )"><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;_tab=warn&amp;type=minus" base="public"}'></if><em>{$member['_language']}</em><if test="isnotbanned2:|:in_array( $type, array( 'modposts', 'suspended', 'restrictposts' ) )"></a></if></strong>
+								</span>
+							</div>
+						</li>
+					</foreach>
+				<else />
+					<p class='no_messages'>{$this->lang->words['no_results']}</p>
+				</if>
+			</ul>
+		</div>
+	</div>
+</div>
+	<div>{$pagelinks}</div>]]></template_content>
+      <template_name>membersList</template_name>
+      <template_data><![CDATA[$type, $members, $pagelinks='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h2 class='maintitle'>{$this->lang->words['menu_ipsearch']}</h2>
+<div class='ipsBox clearfix'>
+	<form id="userCPForm" action="{parse url="app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit" base="public"}" method="post">
+	<fieldset class="ipsBox_container ipsPad">
+		<if test="modIpIe:|:$inlineMsg">
+			{$inlineMsg}
+		</if>
+		<br />
+		
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField'>
+				<label for='ipsearch' class='ipsField_title'>{$this->lang->words['ip_enter']}</label>
+				<p class='ipsField_content'>
+					<input type="text" size="40" maxlength="24" class='input_text' name="ip" value="<if test="$ip">{$ip}<else />{$this->request['ip']}</if>" />
+					<select name="iptool" class='input_select'>
+						<option value="resolve">{$this->lang->words['ip_resolve']}</option>
+						<option value="posts">{$this->lang->words['ip_posts']}</option>
+						<option value="members">{$this->lang->words['ip_members']}</option>
+					</select>&nbsp;
+					<input type="submit" class='input_submit' value="{$this->lang->words['ip_submit']}" />
+				</p>
+			</li>
+		</ul>
+		<p class='message unspecific'>
+			{$this->lang->words['ip_desc_text']}
+		</p>
+		<p class='desc'>
+			{$this->lang->words['ip_warn_text']}
+		</p>
+	</fieldset>
+	</form>
+</div>]]></template_content>
+      <template_name>membersModIPForm</template_name>
+      <template_data><![CDATA[$ip="", $inlineMsg='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div class='topic_controls'>
+	{$pages}
+</div>
+<br />
+<table class='ipb_table'>
+	<tr class='header'>
+		<th style='width: 20%'>{$this->lang->words['ipm_name']}</th>
+		<th style='width: 15%'>{$this->lang->words['ipm_ip']}</th>
+		<th style='width: 10%' class='short'>{$this->lang->words['ipm_posts']}</th>
+		<th style='width: 20%' class='short'>{$this->lang->words['ipm_reg']}</th>
+		<th style='width: 15%'>{$this->lang->words['ipm_group']}</th>
+		<th style='width: 10%'>&nbsp;</th>
+	</tr>
+	<if test="modIPMembers:|:is_array( $members ) AND count( $members )">
+		{parse striping="members" classes="row1,row2"}
+		<foreach loop="ipMembers:$members as $id => $row">
+			<tr class='{parse striping="members"}'>
+				<td><a href="{parse url="showuser={$row['member_id']}" base="public" template="showuser" seotitle="{$row['members_seo_name']}"}">{IPSMember::makeNameFormatted( $row['members_display_name'], $row['member_group_id'] )}</a></td>
+				<td class='altrow'>{$row['ip_address']}</td>
+				<td class='short'>{$row['posts']}</td>
+				<td class="altrow short">{$row['joined']}</td>
+				<td>{$row['groupname']}</td>
+				<td class="altrow short">
+					<a href="{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$row['member_id']}&amp;auth_key={$this->member->form_hash}" base="public"}" title="{$this->lang->words['ipm_edit']}" class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['ipm_edit']}</a>
+				</td>
+			</tr>
+		</foreach>
+	</if>
+</table>
+<br />
+<div class='topic_controls'>
+	{$pages}
+</div>]]></template_content>
+      <template_name>membersModIPFormMembers</template_name>
+      <template_data><![CDATA[$pages="",$members]]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<p class='message'>
+	{$this->lang->words['ipp_found']} {$count}
+</p>
+<br />
+<div class='topic_controls'>
+	{$pageLinks}
+</div>
+<br />
+<if test="modFindMemberPosts:|:count($results)">
+	{parse striping="posts" classes="row1,row2"}
+	<foreach loop="ipPosts:$results as $result">
+		<div class='post_block ucp no_sidebar {parse striping="posts"}'>
+			<h3><a href='{parse url="showtopic={$result['topic_id']}&amp;findpost={$result['pid']}" template="showtopic" seotitle="{$result['seo_title']}" base="public"}' title='{$this->lang->words['modip_viewposts']}'>{$result['members_display_name']} | {parse date="$result['post_date']" format="long"}</a></h3>
+			<div class='post_body'>
+				<div class='post'>{$result['post']}</div>
+			</div>
+		</div>
+		<hr />
+	</foreach>
+</if>
+<br />
+<div class='topic_controls'>
+	{$pageLinks}
+</div>]]></template_content>
+      <template_name>membersModIPFormPosts</template_name>
+      <template_data><![CDATA[$count=0, $pageLinks='', $results]]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=save&amp;announce_id={$announce['announce_id']}&amp;type={$type}" base="public"}" method="post" id='postingform'>
+<fieldset class='row1'>
+	<h3 class='ipsType_subtitle'><if test="buttonlang:|:$type=='add'">{$this->lang->words['announce_add']}<else />{$this->lang->words['announce_button_edit']}</if></h3>
+	<br />
+	<if test="announceMessage:|:$msg">
+		<p class='message unspecific'>{$msg}</p>
+	</if>
+	<ul class='ipsForm ipsForm_horizontal'>
+		<li class='ipsField clearfix'>
+			<label for='announce_title' class='ipsField_title'>{$this->lang->words['announce_form_title']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="50" name="announce_title" id='announce_title' value="{$announce['announce_title']}" tabindex="1" />
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_start' class='ipsField_title'>{$this->lang->words['announce_form_start']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="10" name="announce_start" id='announce_start' value="{$announce['announce_start']}" tabindex="2" /><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_date']} {$this->lang->words['announce_form_startdesc']}</span>
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_end' class='ipsField_title'>{$this->lang->words['announce_form_end']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="10" name="announce_end" id='announce_end' value="{$announce['announce_end']}" tabindex="2" /><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_date']} {$this->lang->words['announce_form_enddesc']}</span>
+			</p>				
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_forum' class='ipsField_title'>{$this->lang->words['announce_form_forums']}</label>
+			<p class='ipsField_content'>
+				<select class="input_select" multiple="multiple" size="10" id='announce_forum' name="announce_forum[]" tabindex="4">{$forum_html}</select><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_forums2']}</span>
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='' class='ipsField_title'>{$this->lang->words['announce_form_announce']}</label>
+			<div class='ipsField_content'>
+				{$editor_html}
+			</div>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_active" id='announce_active' value="1" {$announce['announce_active_checked']} />
+			<p class='ipsField_content'>
+				<label for='announce_active'>{$this->lang->words['announce_form_enable']}</label>
+			</p>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_html_enabled" id='announce_html_enabled' value="1" {$announce['html_checkbox']} />
+			<p class='ipsField_content'>
+				<label for='announce_html_enabled'>{$this->lang->words['announce_use_html']}</label>
+			</p>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_nlbr_enabled" id='announce_nlbr_enabled' value="1" {$announce['nlbr_checkbox']} />
+			<p class='ipsField_content'>
+				<label for='announce_nlbr_enabled'>{$this->lang->words['announce_use_nlbr']}</label>
+			</p>
+		</li>
+	</ul>
+</fieldset>
+<br />
+<fieldset class='submit'>
+	<input type="submit" value="<if test="buttonlang:|:$type=='add'">{$this->lang->words['announce_add']}<else />{$this->lang->words['announce_button_edit']}</if>" class="input_submit" tabindex="7" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
+</fieldset>
+</form>]]></template_content>
+      <template_name>modAnnounceForm</template_name>
+      <template_data><![CDATA[$announce,$forum_html,$type,$editor_html,$msg=""]]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="ucp"}
+<form action="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=save" base="public"}" id="mutliact" method="post">
+<div class='topic_buttons'>
+	<ul class='topic_controls'>
+		<li>
+			<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=add" base="public"}" class='ipsButton'>{$this->lang->words['announce_add']}</a>
+		</li>
+	</ul>
+</div>
+	<h3 class='maintitle clear'>{$this->lang->words['announce_current']}</h3>
+	<table class='ipb_table' summary="{$this->lang->words['ucp_announcements']}">
+		<tr class='header'>
+			<th scope='col' style="width: 40%">{$this->lang->words['announce_title']}</th>
+			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_form_starts']}</th>
+			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_form_end']}</th>
+			<th scope='col' style="width: 25%">{$this->lang->words['announce_forums']}</th>
+			<th scope='col' style="width: 15%">&nbsp;</th>
+		</tr>
+		<if test="hasAnnouncements:|:is_array( $announcements ) AND count( $announcements )">
+			{parse striping="announcements" classes="row1,row2"}
+			<foreach loop="announcements:$announcements as $announce">
+				<tr class="{parse striping="announcements"} <if test="notactive:|:!$announce['announce_active']">moderated</if>">
+					<td>
+						<strong><a href="{parse url="showannouncement={$announce['announce_id']}&amp;f=0" base="public" template="showannouncement" seotitle="{$announce['announce_seo_title']}"}">{$announce['announce_title']}</a></strong> <if test="notactive:|:!$announce['announce_active']"><span class='desc'>{$this->lang->words['announce_page_disabled']}</span></if><br /><span class="desc">{$this->lang->words['by_ucfirst']} {parse template="userHoverCard" group="global" params="$announce"}</span>
+					</td>
+					<td class="short">
+						{parse date="$announce['announce_start']" format="DATE" relative="false"}
+					</td>
+					<td class="short">
+						{parse date="$announce['announce_end']" format="DATE" relative="false"}
+					</td>
+					<td>
+						<div class="forumdesc">
+							<if test="announceForum:|:$announce['announce_forum'] == '*'">
+								{$this->lang->words['announce_page_allforums']}
+							<else />
+								<if test="announceHasForums:|:is_array( $announce['_forums'] ) and count( $announce['_forums'] )">
+									<if test="announceMostForums:|:count( $announce['_forums'] ) > 5">
+										{parse expression="count( $announce['_forums'] )"} {$this->lang->words['announce_page_numforums']}
+									<else />
+										<ul>
+										<foreach loop="announce_forums:$announce['_forums'] as $forum">
+											<li><a href="{parse url="showforum={$forum[0]}" base="public"}">{$forum[1]}</a></li>
+										</foreach>
+										</ul>
+									</if>
+								</if>
+							</if>
+						</div>
+					</td>
+					<td class="short">
+						<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=edit&amp;announce_id={$announce['announce_id']}" base="public"}" class='ipsButton_secondary'>{$this->lang->words['announce_edit']}</a>
+						<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=delete&amp;announce_id={$announce['announce_id']}" base="public"}" id="del_{$announce['announce_id']}" class='ipsButton_secondary'>{$this->lang->words['announce_delete']}</a>
+						<script type='text/javascript'>
+							$('del_{$announce['announce_id']}').observe('click', ipb.ucp.deleteAnnouncement.bindAsEventListener( this, {$announce['announce_id']} ) );
+						</script>
+					</td>
+				</tr>
+			</foreach>
+		<else />
+			<tr>
+				<td align="center" colspan="5">{$this->lang->words['announce_none']}</td>
+			</tr>
+		</if>
+	</table>
+</form>]]></template_content>
+      <template_name>modAnnouncements</template_name>
+      <template_data>$announcements</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>Editing {$return['members_display_name']}</h1>
+<if test="fromprofile:|:$this->request['pf']">
+	<a href='{parse url="showuser={$return['member_id']}" base="public" template="showuser" seotitle="{$return['members_seo_name']}"}'>{$this->lang->words['_larr']} {parse expression="sprintf( $this->lang->words['go_back_profile'], $return['members_display_name'] )"}</a>
+<else />
+	<if test="fromprofile:|:$this->request['t']">
+		<a href='{parse url="showtopic={$return['tid']}" base="public" template="showtopic" seotitle="{$return['title_seo']}"}'>{$this->lang->words['_larr']} {parse expression="sprintf( $this->lang->words['go_back_general'], $return['title'] )"}</a>
+	<else />
+		<a href='{parse url="app=core&amp;module=modcp" base="public"}'>{$this->lang->words['_larr']} {$this->lang->words['go_back_modcp']}</a>
+	</if>
+</if>
+<br /><br />
+<div class='ipsBox clear vcard' id='profile_background'>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='modcp_tabs'>
+			<ul class='modcp_tabs'>
+				<if test="issupermod:|:$editmember">
+					<li id='editmember_tab'<if test="isEditActive:|:empty($this->request['_tab'])"> class='active'</if>><a href='#'>{$this->lang->words['editmember_tab']}</a></li>
+				</if>
+				<if test="warnenabled:|:$this->settings['warn_on']">
+					<li id='warnpanel_tab'<if test="isWarnActive:|:(!empty($this->request['_tab']) AND $this->request['_tab'] == 'warn') OR !$editmember"> class='active'</if>><a href='#'>{$this->lang->words['warnpanel_tab']}</a></li>
+					<li id='warnlogs_tab'<if test="isLogActive:|:!empty($this->request['_tab']) AND $this->request['_tab'] == 'warnlogs'"> class='active'</if>><a href='#'>{$this->lang->words['warnlog_tab']}</a></li>
+					<li id='noteform_tab'<if test="isNotesActive:|:!empty($this->request['_tab']) AND $this->request['_tab'] == 'noteform'"> class='active'</if>><a href='#'>{$this->lang->words['addnote_tab']}</a></li>
+				</if>
+			</ul>
+		</div>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' id='profile_content'>
+			<div class='ipsPad'>
+				<if test="issupermodpane:|:$editmember">
+					<div id='editmember_pane' <if test="isEditPaneActive:|:!empty($this->request['_tab']) AND in_array( $this->request['_tab'], array('warn','warnlogs','noteform') )">style='display: none'</if>>
+						{$editmember}
+					</div>
+				</if>
+				<if test="warnenabledpane:|:$this->settings['warn_on']">
+					<div id='warnpanel_pane' <if test="isWarnActive:|:(empty($this->request['_tab']) OR $this->request['_tab'] != 'warn') AND $editmember">style='display: none'</if>>
+						{$warnpanel}
+					</div>
+					<div id='warnlogs_pane' <if test="isWarnActive:|:empty($this->request['_tab']) OR $this->request['_tab'] != 'warnlogs'">style='display: none'</if>>
+						{$warnlogs}
+					</div>
+					<div id='noteform_pane' <if test="isWarnActive:|:empty($this->request['_tab']) OR $this->request['_tab'] != 'noteform'">style='display: none'</if>>
+						{$noteForm}
+					</div>
+				</if>
+			</div>
+		</div>
+	</div>
+</div>
+<script type='text/javascript'>
+(function(){
+	var currentTab = $('modcp_tabs').select("li.active")[0];
+	
+	if( !currentTab )
+	{
+		currentTab = $('modcp_tabs').select('li')[0];
+	}
+	var togglePane = function(e, elem){
+		if(e){ Event.stop(e) }
+		
+		if( currentTab ){
+			if( getId( currentTab.id ) == getId( elem.id ) ){
+				return;
+			}
+			
+			$( getId( currentTab.id ) + '_pane' ).fade({duration: 0.3});
+		}
+		
+		var newPane = $( getId( elem.id ) + '_pane' );
+		$( newPane ).appear({duration: 0.3});
+		
+		$('modcp_tabs').select("li").invoke("removeClassName", 'active');
+		
+		$(elem).addClassName('active');
+		currentTab = elem;
+	};
+	
+	var getId = function( id ){
+		return id.replace(/\_pane|\_tab/g, '');
+	};
+	
+	$('modcp_tabs').on('click', 'li', togglePane);
+	togglePane( null, currentTab );
+})();
+	
+</script>]]></template_content>
+      <template_name>modControls</template_name>
+      <template_data>$editmember, $warnpanel, $warnlogs, $noteForm, $return</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<!--post:{$post['post']['pid']}-->
+<script type="text/javascript">
+var pid = parseInt({$post['post']['pid']});
+if ( pid > ipb.topic.topPid ){
+	ipb.topic.topPid = pid;
+}
+</script>
+<if test="">
+<div class='post_block hentry clear no_sidebar <if test="reputation:|:$this->settings['reputation_enabled']">with_rep</if>' id='post_id_{$post['post']['pid']}'>
+	<a id='entry{$post['post']['pid']}'></a>
+	<if test="repIgnored:|:!empty( $post['post']['_repignored'] ) AND $post['post']['_repignored'] == 1 && $post['post']['_ignored'] != 1">
+		<div class='post_ignore'>
+			<if test="noRep:|:$post['post']['rep_points'] == 0">
+				<span class='reputation zero' title='{$this->lang->words['top_rep']}'>
+			</if>
+			<if test="posRep:|:$post['post']['rep_points'] > 0">
+				<span class='reputation positive' title='{$this->lang->words['top_rep']}'>
+			</if>
+			<if test="negRep:|:$post['post']['rep_points'] < 0">
+				<span class='reputation negative' title='{$this->lang->words['top_rep']}' >
+			</if>
+					{$post['post']['rep_points']}</span> {$this->lang->words['top_this_post_by']} <a href='{parse url="showuser={$post['author']['member_id']}" base="public"}'>{$post['author']['members_display_name']}</a> {$this->lang->words['top_below_thresh']}. <a href='#' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+		</div>
+	</if>
+	
+	<div class='post_wrap'>
+		<if test="postMid:|:$post['author']['member_id']">
+			<h3 class='row2'>
+		<else />
+			<h3 class='guest row2'>
+		</if>
+				<if test="postModCheckbox:|:$this->memberData['is_mod']">
+				<!--<span class='right'>
+					<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod right'<if test="postModSelected:|:!empty( $post['post']['_pid_selected'] )"> checked='checked'</if> />
+				</span>-->
+				</if>
+				<img src='{$post['author']['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_tiny' />&nbsp;
+				<if test="postMember:|:$post['author']['member_id']">
+					<span class="author vcard">{parse template="userHoverCard" group="global" params="$post['author']"}</span>
+				<else />
+					{$post['author']['members_display_name']}
+				</if>
+				
+				<if test="postIp:|:$post['post']['_show_ip']">
+					<span class='ip right ipsType_small'>({$this->lang->words['ip']}:
+					<if test="postAdmin:|:$post['author']['g_access_cp']">
+						<em>{$this->lang->words['ip_private']}</em>
+					<else />
+						<a href="{parse url="app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a>
+					</if>)
+					</span>
+				</if>
+			</h3>
+		
+		<div class='post_body'>
+			<if test="isDeleted:|:$type == 'deleted'">
+				<ul class='ipsList_inline'>
+					
+				</ul>
+				<ul class='ipsList_inline modcp_post_controls'>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=p_hrestore&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;pid[]={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' class='ipsButton_secondary ipsType_smaller' title='{$this->lang->words['restore_post_desc']}'>{$this->lang->words['restore_post']}</a>
+					</li>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=p_hdelete&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;pid[]={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' class='ipsButton_secondary ipsType_smaller' title='{$this->lang->words['restore_post_desc']}'>{$this->lang->words['perm_delete_post']}</a>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['posted']}</strong> <span class='desc lighter'>{parse date="$post['post']['post_date']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['deleted_post_date']}</strong> <span class='desc lighter'>{parse date="$topic['post']['pdelete_time']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['delete_from_topic']}</strong> <a class='desc lighter' href='{parse url="showtopic={$topic['post']['tid']}" seotitle="{$topic['post']['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['go_to_topic']}'>{IPSText::truncate( $topic['post']['title'], 25 )}</a>
+					</li>
+				</ul>
+			</if>
+			<if test="isUnapproved:|:$type == 'unapproved'">
+				<ul class='ipsList_inline'>
+					
+				</ul>
+				<ul class='ipsList_inline modcp_post_controls'>
+					<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
+						<li class='post_edit'><a href='{parse url="app=forums&amp;module=post&amp;section=post&amp;do=edit_post&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_edit_title']}' class='ipsButton_secondary ipsType_smaller' id='edit_post_{$post['post']['pid']}'>{$this->lang->words['post_edit']}</a></li>
+					</if>
+					<if test="canDelete:|:$post['post']['_can_delete'] === TRUE OR $post['post']['_softDelete']">
+						<li class='post_del' id='del_post_{$post['post']['pid']}'>
+							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=04&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_delete_title']}' class='delete_post ipsButton_secondary ipsType_smaller'>{$this->lang->words['post_delete']}</a>
+						</li>
+					</if>
+					<!-- Matt: Approve / unapprove post button -->
+					<if test="approvePost:|:$this->memberData['is_mod']">
+						<li id='toggle_post_{$post['post']['pid']}'>
+							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=approve&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;t={$post['post']['topic_id']}&amp;f={$post['post']['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_toggle_visible']}' class='ipsButton_secondary ipsType_smaller'><span id='toggletext_post_{$post['post']['pid']}'><if test="approveUnapprove:|:$post['post']['queued']==1">{$this->lang->words['post_approve']}<else />{$this->lang->words['post_unapprove']}</if></span></a>
+						</li>
+					</if>
+					<li class='desc'>
+						<strong>{$this->lang->words['posted']}</strong> <span class='desc lighter'>{parse date="$post['post']['post_date']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['in_topic']}</strong> <a class='desc lighter' href='{parse url="showtopic={$topic['post']['tid']}" seotitle="{$topic['post']['title_seo']}" template="showtopic" base="public"}'>{IPSText::truncate( $topic['post']['title'], 35 )}</a>
+					</li>
+				</ul>
+			</if>
+			<!--<p class='posted_info desc lighter blend_links ipsType_small'>
+				{$this->lang->words['posted']} <abbr class="published" title="{parse expression="date( 'c', $post['post']['post_date'] )"}">{parse date="$post['post']['post_date']" format="long"}</abbr>
+			</p>-->
+			<div class='post entry-content <if test="$post['post']['_repignored'] == 1">imgsize_ignore</if>'>
+				{$post['post']['post']}
+				{$post['post']['attachmentHtml']}
+				<br />
+				<if test="postEditBy:|:$post['post']['edit_by']">
+					<p class='edit'>
+						{$post['post']['edit_by']}
+						<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
+							<br />
+							<span class='reason'>{$this->lang->words['reason_for_edit']} {$post['post']['post_edit_reason']}</span>
+						</if>
+					</p>
+				</if>
+			</div>
+			</if>						
+				
+				<br />
+		</div>
+			
+				<script type='text/javascript'>
+					if( $('toggle_post_{$post['post']['pid']}') ){
+						$('toggle_post_{$post['post']['pid']}').show();
+					}
+					
+					// Add perm data
+					ipb.topic.deletePerms[{$post['post']['pid']}] = { 'canDelete' : {parse expression="intval($post['post']['_can_delete'])"}, 'canSoftDelete' : {parse expression="intval($post['post']['_softDelete'])"} };
+				</script>
+				<if test="reportedPostData:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
+					<ul id='post-report-{$post['post']['pid']}_menucontent' class='ipbmenu_content report_menu'>
+						<li><a href="{parse url="app=core&amp;module=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}" base="public"}" id='report_mark_{$post['post']['pid']}'><img src='{$this->settings['img_url']}/reports/mark_complete.png' alt='' /> {$this->lang->words['report_menu_mark_complete']}</a></li>
+						<li><a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}"><img src='{$this->settings['img_url']}/reports/view_report.png' alt='' /> {$this->lang->words['report_menu_view_report']}</a></li>
+					</ul>
+					<script type="text/javascript">
+						$('report_mark_{$post['post']['pid']}').observe('click',
+						 	ipb.global.updateReportStatus.bindAsEventListener( 	
+								this, {$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']},2,2
+							)
+						);
+					</script>
+				</if>
+			</div>		
+		</div>
+		</if>]]></template_content>
+      <template_name>modCPpost</template_name>
+      <template_data>$post, $displayData, $topic, $type</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<foreach loop="topics:$topics as $tid => $data">
+	<tr class='__topic' id='trow_{$data['tid']}' data-tid="{$data['tid']}">
+		<td class='__tid{$data['tid']} with_mod_links'>	
+			<if test="isLink:|:$data['state'] == 'link'">
+				{$this->lang->words['moved_topic_link']}
+				<em>
+			</if>		
+			<a id="tid-link-{$data['tid']}" href="{parse url="showtopic={$data['tid']}" base="public" template="showtopic" seotitle="{$data['title_seo']}"}" title='{$this->lang->words['topic_started_on']} {parse date="$data['start_date']" format="LONG"}' class='topic_title'>{$data['title']}</a>
+			<if test="isLinkEnd:|:$data['state'] == 'link'">
+				</em>
+			</if>
+			<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
+				<ul class='mini_pagination'>
+				<foreach loop="pages:$data['pages'] as $page">
+						<if test="haslastpage:|:$page['last']">
+							<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
+						<else />
+							<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a></li>
+						</if>
+				</foreach>
+				</ul>
+			</if>
+			<br />
+			<if test="isntLink:|:$data['state'] != 'link'">
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_startedby']}</strong> <span class='desc lighter blend_links'>{$data['starter']}</span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_posted']}</strong> <span class='desc lighter'>{parse date="$data['start_date']" format="short"}</span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_inforum']}</strong> <span class='desc lighter'><a href='{parse url="showforum={$data['forum']['id']}" template="showforum" seotitle="{$data['forum']['name_seo']}" base="public"}'>{$data['forum']['name']}</a></span>
+					</li>
+				</ul>
+			<else />
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_link_from']}</strong>
+						<span class='desc lighter'><a href='{parse url="showforum={$data['_toForum']['id']}" template="showforum" seotitle="{$data['_toForum']['name_seo']}" base="public"}'>{$data['_toForum']['name']}</a></span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_link_to']}</strong>
+						<span class='desc lighter'><a href='{parse url="showforum={$data['forum']['id']}" template="showforum" seotitle="{$data['forum']['name_seo']}" base="public"}'>{$data['forum']['name']}</a></span>
+					</li>
+				</ul>
+			</if>
+			<if test="topicDeletedReason:|:$data['_isDeleted']">
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_deletedby']}</strong> <span class='desc lighter blend_links'><a href='{parse url="showuser={$sdelete[ $data['tid'] ]['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$sdelete[ $data['tid'] ]['members_seo_name']}"}'>{$sdelete[ $data['tid'] ]['members_display_name']}</a></span>
+					</li>
+					<if test="showReason:|:$data['permissions']['SoftDeleteReason']">
+						<li class='desc lighter'>
+							<strong>{$this->lang->words['dlt_topic_reason']}</strong> <span class='desc lighter'>{$sdelete[ $data['tid'] ]['sdl_obj_reason']}<else />{$this->lang->words['tdb__noreasongi']}</span>
+						</li>
+					</if>
+				</span>
+			</if>
+		</td>
+		<td class='col_f_preview'>
+			<if test="isntLink2:|:$data['state'] == 'link'">
+				<a href='{$data['_url']}' class='__topic_preview expander closed' title='{$this->lang->words['view_topic_preview']}'>&nbsp;</a>
+			</if>
+		</td>
+		<td>
+			<if test="isntLink3:|:$data['state'] == 'link'">
+				<span class='desc'>{parse format_number="$data['posts']"} <if test="replylang:|:intval($data['posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if></span>
+			</if>
+		</td>
+		<td>
+			<ul class='ipsList_inline right'>
+				<if test="$type == 'deleted'">
+					<if test="tidRestore:|:$data['permissions']['TopicSoftDeleteRestore']">
+						<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topic_restore&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['restore_topic_desc']}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['restore_topic']}</a></li>
+					</if>
+					<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $data['forum_id'] ]['delete_topic']">
+						<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=09&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['dlt_delete_topic']}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['perm_delete_topic']}</a></li>
+					</if>
+				</if>
+				<if test="$type == 'unapproved'">
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topic_approve&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['modcp_approvelink']}</a>
+					</li>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=03&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['modcp_deletelink']}</a>
+					</li>
+				</if>
+			</ul>
+		</td>
+	</tr>
+</foreach>]]></template_content>
+      <template_name>modCPtopic</template_name>
+      <template_data>$topics, $pagelinks, $type, $sdelete=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['modcp_page_title']}</h1>
+<br />
+<div class='ipsBox'>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='modcp_tabs'>
+			<ul class='clear'>
+				<li id='index' class='<if test="$_activeNav['primary'] == 'index' && $_activeNav['secondary'] == 'index'">active </if>tab_toggle'>
+					<a href='{parse url="app=core&amp;module=modcp" base="public"}'>{$this->lang->words['modcp_tab_index']}</a>
+				</li>
+				<if test="accessRC:|:IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $this->settings['report_mod_group_access'] ) ) )">
+					<li id='reported_content' class='<if test="$_activeNav['primary'] == 'reported_content' && $_activeNav['secondary'] == 'reports'">active </if>tab_toggle'>
+						<a href='{parse url="app=core&amp;module=reports&amp;do=index" base="public"}'>{$this->lang->words['modcp_tab_reports']}</a>
+					</li>
+				</if>
+				<foreach loop="tabs:$tabs as $mainTabKey => $subTabs">
+					<li id='{$mainTabKey}' class='<if test="$_activeNav['primary'] == $mainTabKey">active </if>tab_toggle' data-tabid='{$mainTabKey}'>
+						<a href='{parse url="app=core&amp;module=modcp&amp;fromapp={$subTabs[0][1]}&amp;tab={$subTabs[0][0]}" base="public"}'>{$this->lang->words['modcp_mtab_' . $mainTabKey ]}</a>
+					</li>
+				</foreach>
+			</ul>
+		</div>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' id='modcp_content'>
+			<div class='ipsPad'>
+				{$output}
+			</div>
+		</div>
+	</div>
+</div>
+<script type='text/javascript'>
+	$("modcp_content").setStyle( { minHeight: $('modcp_tabs').measure('margin-box-height') + 5 + "px" } );
+</script>]]></template_content>
+      <template_name>portalPage</template_name>
+      <template_data>$output, $tabs=array(), $_activeNav=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<foreach loop="findTab:$this->templateVars['tabs'] as $mainTabKey => $subTabs">
+	<if test="isMainTab:|:$mainTabKey == $this->templateVars['activeNav']['primary']">
+		<if test="count( $subTabs ) > 1">
+			<div class='maintitle ipsFilterbar clear'>
+				<ul class='ipsList_inline'>									
+					<foreach loop="subTabs:$subTabs as $sub">
+						<li<if test="$this->templateVars['activeNav']['secondary'] == $sub[0]"> class='active'</if>>
+							<a href='{parse url="app=core&amp;module=modcp&amp;fromapp={$sub[1]}&amp;tab={$sub[0]}" base="public"}'>
+							{$this->lang->words['modcp_tab_' . $sub[0] ]}</a>
+						</li>
+					</foreach>
+				</ul>
+			</div>
+		</if>
+	</if>
+</foreach>]]></template_content>
+      <template_name>subTabLoop</template_name>
+      <template_data/>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="topic"}
+<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+{parse template="include_lightbox" group="global" params=""}
+</if>
+<script type='text/javascript'>
+	ipb.topic.inSection	= 'topicview';
+</script>
+<style type='text/css'>
+	.post_mod { display: none; }
+</style>
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<if test="hasPosts:|:is_array( $posts ) AND count( $posts )">
+		<div id='ips_Posts2'>
+			<foreach loop="post_data:$posts as $post">
+				{parse template="modCPpost" group="modcp" params="$post, array(), $post, 'unapproved'"}
+			</foreach>
+		</div>
+	<else />
+		<div class='no_messages'>
+			{$this->lang->words['no_unapproved_posts']}
+		</div>
+	</if>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>unapprovedPosts</template_name>
+      <template_data>$posts, $pagelinks</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="forums"}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table topic_list' id='forum_table'>
+		<if test="hastopics:|:is_array( $topics ) AND count( $topics )">
+			{parse striping="forumTable" classes="row1,row2"}
+			{parse template="modCPtopic" group="modcp" params="$topics, $pagelinks, 'unapproved'"}
+		<else />
+			<tr> 
+				<td colspan='5' class='no_messages'>{$this->lang->words['no_topics']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>unapprovedTopics</template_name>
+      <template_data>$topics, $pagelinks</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form method="post" action="{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=save_note&amp;mid={$member['member_id']}" base="public"}" id='postingform'>
+	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+	<input type='hidden' name='popup' value='{$this->request['popup']}' />
+	<input type="hidden" name="_st" value="{$this->request['_st']}" />
+	<input type="hidden" name="t" value="{$this->request['t']}" />
+	<input type="hidden" name="pf" value="{$this->request['pf']}" />
+	<h2 class='maintitle'>{$this->lang->words['mod_warn_new_note']} <a href="{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}" title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+	<div class='generic_bar'></div>
+	<div class='post_form'>
+		<fieldset class='row1'>
+			<h3 class='bar'>{$this->lang->words['mod_warn_fieldset']}</h3>
+			<ul>
+				<li class='field'>
+					<textarea name='note' style='width: 95%; height:150px'>{$this->request['note']}</textarea>
+				</li>
+			</ul>
+		</fieldset>
+		<fieldset class='submit'>
+			<input type='submit' class='input_submit' value='{$this->lang->words['mod_warn_note_save']}' />
+		</fieldset>
+	</div>
+</form>]]></template_content>
+      <template_name>warn_add_note_form</template_name>
+      <template_data>$member</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<if test="isAjaxModuleTitle:|:$this->request['module']=='ajax'">
+		<h3>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h3>
+	<else />
+		<h2 class='maintitle'>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+	</if>
+	<if test="isAjaxModuleDivStart:|:$this->request['module']=='ajax'">
+		<div class='fixed_inner'>
+	</if>
+		<table class='ipb_table'>
+			<tr class='header'>
+				<th scope='col'>{$this->lang->words['w_v_warnby']}</th>
+				<th scope='col'>{$this->lang->words['w_v_notes']}</th>
+			</tr>
+			<if test="warnlogentries:|:!is_array($rows) OR !count($rows)">
+				<tr>
+					<td class="no_messages" colspan="2">{$this->lang->words['w_v_none']}</td>
+				</tr>
+			<else />
+				{parse striping="modlog" classes="row2,row1"}
+				<foreach loop="logs:$rows as $r">
+					<tr class='{parse striping="modlog"}'>
+						<td><a href='{parse url="showuser={$r['punisher_id']}" base="public" seotitle="{$r['members_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['punisher_name']}</strong></a></td>
+						<td>{$this->lang->words['mod_warn_added']} <strong>{parse date="$r['wlog_date']" format="long" relative="false"}</strong></td>
+					</tr>
+					<tr class='{parse striping="modlog"}'>
+						<td>
+							<span class="<if test="warnlognote:|:$r['wlog_type'] == 'note' OR $r['wlog_type'] == 'pos'">positive<else />negative</if>" <if test="warnlogcolor:|:$r['wlog_type'] == 'note' || $r['wlog_type'] == 'nochan' || $r['wlog_type'] == 'custom'">style='color:gray'</if>>
+								<if test="warnlognotetype:|:$r['wlog_type'] == 'note'">
+									{$this->lang->words['mod_warn_note']}
+								<else />
+									<if test="warnlogpos:|:$r['wlog_type'] == 'pos'">
+										{$this->lang->words['w_v_minus']}
+									</if>
+									<if test="warnlogneg:|:$r['wlog_type'] == 'neg'">
+										{$this->lang->words['w_v_add']}
+									</if>
+									<if test="warnlognochange:|:$r['wlog_type'] == 'nochan'">
+										{$this->lang->words['w_v_nochan']}
+									</if>
+									<if test="warnlogcustchange:|:$r['wlog_type'] == 'custom'">
+										{$this->lang->words['w_v_custom']}
+									</if>
+								</if>
+							</span>
+						</td>
+						<td>{$r['content']}</td>
+					</tr>
+				</foreach>
+			</if>
+		</table>
+		<div class='ipsPad'>
+			{$links}
+		</div>
+	<if test="isAjaxModuleDivEnd:|:$this->request['module']=='ajax'">
+		</div>
+		<div class='ipsForm_submit ipsForm_right'>
+			<a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;_tab=warn" base="public"}' class='ipsButton'><img src='{$this->settings['img_url']}/moderation_cog.png' /> &nbsp;{$this->lang->words['alter_warn_level']}</a>
+		</div>
+	</if>]]></template_content>
+      <template_name>warn_view_log</template_name>
+      <template_data><![CDATA[$member, $rows, $links='']]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="profile"}
+<script type='text/javascript'>
+	ipb.profile.viewingProfile = {$member['member_id']};
+</script>
+<if test="warnerrors:|:$errors">
+	<h2>{$this->lang->words['errors_found']}</h2>
+	<p class='message error'>{$errors}</p>
+	<br />
+</if>
+<form method="post" action='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=dowarn&amp;mid={$member['member_id']}" base="public"}' id='postingform'>
+<input type="hidden" name="key" value="{$this->member->form_hash}" />
+<input type="hidden" name="type" value="{$this->request['type']}" />
+<input type="hidden" name="_st" value="{$this->request['_st']}" />
+<input type="hidden" name="t" value="{$this->request['t']}" />
+<input type="hidden" name="pf" value="{$this->request['pf']}" />
+<div class='post_form'>
+<h2 class='maintitle'>{$this->lang->words['warn_logs_for']} <a href='{parse url="showuser={$member['member_id']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+<div class='generic_bar'></div>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_member_details']}</h3>
+	<h4>
+		<img class="ipsUserPhoto ipsUserPhoto_large" src='{$member['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" />
+	</h4>
+	<ul>
+		<li class='field'>
+			{parse replacement="find_topics_link"} <a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}'>{$this->lang->words['gbl_find_my_content']}</a>
+		</li>
+		<if test="displaynamehistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
+			<li class='field' id='dname_history'>
+				{parse replacement="display_name"} <a href='{parse url="app=members&amp;module=profile&amp;section=dname&amp;id={$member['member_id']}" base="public"}' title='{$this->lang->words['view_dname_history']}'>{$this->lang->words['display_history']}</a>
+			</li>
+		</if>
+		<if test="warnreputation:|:$this->settings['reputation_enabled']">
+			<li class='field'>
+				<if test="RepPositive:|:$member['pp_reputation_points'] > 0">
+					<div class='reputation positive' style='min-width: 150px; text-align: center'>
+				</if>
+				<if test="RepNegative:|:$member['pp_reputation_points'] < 0">
+					<div class='reputation negative' style='min-width: 150px; text-align: center'>
+				</if>
+				<if test="RepZero:|:$member['pp_reputation_points'] == 0">
+					<div class='reputation zero' style='min-width: 150px; text-align: center'>
+				</if>
+					<span class='number'>{$member['pp_reputation_points']}</span>
+					<if test="reptext:|:$member['author_reputation'] && $member['author_reputation']['text']">
+						<p class='title'>{$member['author_reputation']['text']}</p>
+					</if>
+					<if test="repimage:|:$member['author_reputation'] && $member['author_reputation']['image']">
+						<p class='image'>{$member['author_reputation']['image']}</p>
+					</if>
+				</div>
+			</li>
+		</if>
+	</ul>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_details']}</h3>
+	<h4>{$this->lang->words['w_adjust_level']}<br /><span class='desc'>{$this->lang->words['warn_current_level']} {$member['warn_level']}/{$this->settings['warn_max']}</span></h4>
+	<ul>
+		<li class='field checkbox'>
+			<input type="radio" name="level" id="nochange" class="input_radio" value="nochange" <if test="warnnochange:|:$this->request['type'] == 'nochange' OR !$this->request['type']">checked='checked'</if> />
+			<label for='nochange'>{$this->lang->words['w_nochange']}</label>
+		</li>
+		<li class='field checkbox negative'>
+			<input type="radio" name="level" id="add" class="input_radio" value="add" <if test="addwarn:|:$this->request['type'] == 'add'">checked='checked'</if> />
+			<label for='add'>{$this->lang->words['w_add']}</label>
+		</li>
+		<li class='field checkbox positive'>
+			<input type="radio" name="level" id="minus" class="input_radio" value="remove" <if test="subwarn:|:$this->request['type'] == 'minus'">checked='checked'</if> />
+			<label for='minus'>{$this->lang->words['w_remove']}</label>
+		</li>	
+		<if test="warnsupermod:|:$this->memberData['g_is_supmod']">
+			<li class='field checkbox custom'>
+				<input type="radio" name="level" id="custom" class="input_radio" value="custom" <if test="warncustom:|:$this->request['type'] == 'custom'">checked='checked'</if> />
+				<label for='level_custom'>{parse expression="sprintf( $this->lang->words['w_change_custom'], $this->settings['warn_max'])"}</label>
+				 <input type='text' id='level_custom' name='level_custom' value='<if test="warncustomlevel:|:isset($this->request['customLevel'])">{$this->request['customLevel']}<else />{$member['warn_level']}</if>' size='3' />
+			</li>
+		</if>
+	</ul>
+	<h4>{$this->lang->words['w_reason']}<br /><span class='desc'>{$this->lang->words['w_reason2']}</span></h4>
+	<ul>
+		<li class='field'>
+			<textarea rows="6" cols="50" class="input_text" name="reason">{IPSText::br2nl( $this->request['reason'] )}</textarea>
+		</li>
+	</ul>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['member_suspension']}</h3>
+	<if test="modqueue:|:$modque == true">
+		<php>
+			$mod_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
+			$mhours		= 0;
+			
+			if( $member['mod_posts'] > 0 AND $member['mod_posts'] != 1 )
+			{
+				$mod_arr	= IPSMember::processBanEntry( $member['mod_posts'] );
+				
+				if( $mod_arr['date_end'] > time() )
+				{
+					$mhours		= ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_modq']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='modq' type="checkbox" name="mod_indef" value="1" <if test="modqueueposts:|:$member['mod_posts'] == 1">checked='checked'</if> />
+				<label for='modq'>{$this->lang->words['w_modq_i']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='mod_value'>{$this->lang->words['w_orfor']}</label>
+				<input class='input_text' type="text" id='mod_value' name="mod_value" value="<if test="modqueuehours:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) ) and $timespan = ($mhours / 24)">{$timespan}<else />{$mhours}</if>" size="5" />&nbsp;
+				<select name="mod_unit" class='input_select'>
+					<option value="d" <if test="modunitd:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="modunith:|:$mhours < 24 or ( ($mhours / 24) != ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="modqueueon:|:$mhours > 0">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+	<if test="postqueue:|:$postque == true">
+		<php>
+			$post_arr	= array( 'timespan' => 0, 'hours' => 0, 'days' => 0 );
+			$phours		= 0;
+			
+			if( $member['restrict_post'] > 0 AND $member['restrict_post'] != 1 )
+			{
+				$post_arr	= IPSMember::processBanEntry( $member['restrict_post'] );
+				
+				if( $post_arr['date_end'] > time() )
+				{
+					$phours		= ceil( ( $post_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_resposts']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='restrict_posts' type="checkbox" name="post_indef" value="1" <if test="postqueueposts:|:$member['restrict_post'] == 1">checked='checked'</if> />
+				<label for='restrict_posts'>{$this->lang->words['w_resposts_i']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='post_value'>{$this->lang->words['w_orfor']}</label>
+				<input class='input_text' type="text" id='post_value' name="post_value" value="<if test="postqueuehours:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) ) and $timespan = ($phours / 24)">{$timespan}<else />{$phours}</if>" size="5" />&nbsp;
+				<select name="post_unit" class='input_select'>
+					<option value="d" <if test="postunitd:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="postunith:|:$phours < 24 or ( ($phours / 24) != ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="postqueueon:|:$phours > 0">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+	<if test="banqueue:|:$ban == true">
+		<php>
+			$ban_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
+			$hours		= 0;
+			
+			if( $member['temp_ban'] AND $member['temp_ban'] != 1 )
+			{
+				$ban_arr	= IPSMember::processBanEntry( $member['temp_ban'] );
+				
+				if( $ban_arr['date_end'] > time() )
+				{
+					$hours		= ceil( ( $ban_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_suspend']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='suspend_member' type="checkbox" name="ban_indef" value="1" <if test="bannedison:|:$member['member_banned'] == 1">checked='checked'</if> />
+				<label for='suspend_member'>{$this->lang->words['w_ban_indef']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='susp_value'>{$this->lang->words['w_suspend_or']}</label>
+				<input type="text" id='susp_value' class='input_text' name="susp_value" value="<if test="bannedhours:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) ) and $timespan = ($hours / 24)">{$timespan}<else />{$hours}</if>" size="5" />
+				<select name="susp_unit" class='input_select'>
+					<option value="d" <if test="banunitd:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="banunith:|:$hours < 24 or ( ($hours / 24) != ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="banon:|:$member['temp_ban']">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_mem_content']}</h3>
+	<h4>{$this->lang->words['warn_posts_topics']}</h4>
+	<ul>
+		<li class='field checkbox'>
+			<select name="topicPosts_type" class='input_select'>
+				<option value='unapprove' <if test="unapproveposts:|:$this->request['topicPosts_type'] == 'unapprove'">selected='selected'</if>>{$this->lang->words['warn_stuff_unapprove']}</option>
+				<option value='approve' <if test="approveposts:|:$this->request['topicPosts_type'] == 'approve'">selected='selected'</if>>{$this->lang->words['warn_stuff_approve']}</option>
+			</select>
+		</li>
+		<li class='field checkbox'>
+			<input type="checkbox" id='topicPosts_topics' class='input_check' name="topicPosts_topics" value="1" />
+			<label for='topicPosts_topics'>{$this->lang->words['warn_stuff_alltopics']}</label>
+		</li>
+		<li class='field checkbox'>
+			<input type="checkbox" id='topicPosts_replies' class='input_check' name="topicPosts_replies" value="1" />
+			<label for='topicPosts_replies'>{$this->lang->words['warn_stuff_allposts']}</label>
+		</li>
+		<li class='field checkbox'>
+			<label for='topicPosts_lastx'>{$this->lang->words['warn_stuff_datecutoff']}</label>
+			<input type="text" id='topicPosts_lastx' class='input_text' name="topicPosts_lastx" value="" size="5" />
+			<select name="topicPosts_lastxunits" class='input_select'>
+				<option value="d">{$this->lang->words['w_day']}</option>
+				<option value="h">{$this->lang->words['w_hour']}</option>
+			</select>
+		</li>
+	</ul>
+</fieldset>
+<fieldset>
+	<h3 class='bar'>{$this->lang->words['warn_contact_member']}</h3>
+	<ul>
+		<li class='field'>
+			<label for='subj'>{$this->lang->words['w_c_subj']}</label>
+			<input id='subj' class='input_text' type="text" name="subject" value="{$this->request['subject']}" size="30" />
+		</li>
+		<li class='field'>
+			<label for='method'>{$this->lang->words['w_c']}</label>
+			<select id='method' name="contactmethod" class='input_select'>
+				<if test="disablepm:|:$member['members_disable_pm'] != 1">
+					<option value="pm">{$this->lang->words['w_c_p']}</option>
+				</if>
+				<option value="email">{$this->lang->words['w_c_e']}</option>
+			</select>
+		</li>
+		<li>
+			{$editor_html}
+		</li>
+	</ul>
+</fieldset>
+<fieldset class='submit'>
+	<input type="submit" class='input_submit' value="{$this->lang->words['w_submit']}" tabindex='0'/>
+</fieldset>
+	
+</div>
+</form>]]></template_content>
+      <template_name>warnForm</template_name>
+      <template_data><![CDATA[$member, $errors='', $modque=false, $postque=false, $ban=false, $editor_html='']]></template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1511,7 +3621,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>completePartialLogin</template_name>
       <template_data><![CDATA[$mid="",$key="",$custom_fields="",$errors="", $reg=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1555,7 +3665,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>lostPasswordForm</template_name>
       <template_data><![CDATA[$errors=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1569,7 +3679,7 @@ function contact_admin() {
 </p>]]></template_content>
       <template_name>lostPasswordWait</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1675,7 +3785,7 @@ function contact_admin() {
 </html>]]></template_content>
       <template_name>registerCoppaForm</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1683,42 +3793,22 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<div class='master_list'>
-	<h2>{$this->lang->words['register']}</h2>
-	<div class='message unspecific'>
-		{$this->lang->words['coppa_form_text']}
-	</div>
+      <template_content><![CDATA[<form action='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_two&amp;coppa=1" base="public"}' method='post'>
+	<div class='master_list'>
+		<h2>{$this->lang->words['register']}</h2>
+		<div class='row post line_spacing'>
+			{$this->lang->words['confirm_over_thirteen']}
+		</div>
 	
-<form action='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_two" base="public"}' method='post'>
-	<div class='row'>
-		
-		{$this->lang->words['coppa_link']}<br />
-		<select name='m' class='input_select'>
-		 	<option value='0'>{$this->lang->words['select_month']}</option>
-	 		<foreach loop="months:array(1,2,3,4,5,6,7,8,9,10,11,12) as $month">
-	 			<option value='{$month}'>{$this->lang->words['M_' . $month ]}</option>
-	 		</foreach>
-		</select>
-		<select name='d' class='input_select'>
-	 		<option value='0'>{$this->lang->words['select_day']}</option>
-	 		<foreach loop="days:range(1,31) as $day">
-	 			<option value='{$day}'>{$day}</option>
-	 		</foreach>
-		</select>
-		<select name='y' class='input_select'>
-	 		<option value='0'>{$this->lang->words['select_year']}</option>
-	 		<foreach loop="years:array_reverse(range( date('Y') - 130, date('Y') )) as $year">
-	 			<option value='{$year}'>{$year}</option>
-	 		</foreach>
-		</select>
-	</div>	
-	<div class='submit'>
-		<input type='submit' value='{$this->lang->words['coppa_continue_button']}' class='input_submit' /> {$this->lang->words['or']} <a href='{parse url="" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
+		<div class='submit'>
+			<input type='submit' value='{$this->lang->words['coppa_continue_button']}' class='button' /> &nbsp;&nbsp;
+			<a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_two" base="public"}' title='{$this->lang->words['coppa_under_thirteen']}' class='cancel'>{$this->lang->words['coppa_under_thirteen']}</a>
+		</div>
 	</div>
 </form>]]></template_content>
       <template_name>registerCoppaStart</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1742,7 +3832,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>registerCoppaTwo</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1750,115 +3840,108 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<div class='master_list'>
-	<h2>{$this->lang->words['register']}</h2>
-	<if test="registerHasErrors:|:is_array( $general_errors ) && count( $general_errors )">
-		<div class='message error'>
-			<strong>{$this->lang->words['following_errors']}</strong><br />
-			<foreach loop="general_errors:$general_errors as $r">
-				{$r}<br />
-			</foreach>
+      <template_content><![CDATA[<if test="useCoppa:|:$this->settings['use_coppa'] && (!$this->request['coppa'] && !IPSCookie::get('coppa'))">
+	{parse template="registerCoppaStart" group="register" params=""}
+<else />
+	<if test="!$this->request['agree_tos']">
+		<div class='master_list'>
+			<h2>{$this->lang->words['reg_terms_popup_title']}</h2>
+			<div class='row post line_spacing'>
+				{$this->settings['_termsAndConditions']}
+			</div>
+			<div class='submit'>
+				<a class='button secondary' href='{parse url="app=core&amp;module=global&amp;section=register&amp;agree_tos=1" base="public"}'>{$this->lang->words['mobile_agree_to_tos']}</a>
+			</div>
+		</div>
+	<else />
+		<div class='master_list'>
+			<h2>{$this->lang->words['register']}</h2>
+			<if test="registerHasErrors:|:is_array( $general_errors ) && count( $general_errors )">
+				<div class='message error'>
+					<strong>{$this->lang->words['following_errors']}</strong><br />
+					<foreach loop="general_errors:$general_errors as $r">
+						{$r}<br />
+					</foreach>
+				</div>
+			</if>
+	
+			<form class='ipsForm_vertical' action="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" method="post" name="REG" id='register'>
+				<input type="hidden" name="termsread" value="1" />
+				<input type="hidden" name="agree_to_terms" value="1" />
+				<input type="hidden" name="agree_tos" value="1" />
+				<input type="hidden" name="do" value="process_form" />
+				<input type="hidden" name="coppa_user" value="{$data['coppa_user']}" />
+				<input type='hidden' name='nexus_pass' value='1' />
+		
+				<h3>{$this->lang->words['reg_step1']}</h3>
+				<div class='ipsField'>
+					<label for='display_name' class='ipsField_title'>{$this->lang->words['reg_choose_dname']}</label>
+					<input type='text' class='input_text <if test="ieDname:|:$inline_errors['dname']">error</if>' id='display_name' size='30' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['members_display_name']}' name='members_display_name' /><br />
+					<span class='desc'><if test="ieDname:|:$inline_errors['dname']"><span class='error'>{$inline_errors['dname']}<br /></span></if>{$this->lang->words['dname_desc_one']} {$this->settings['max_user_name_length']} {$this->lang->words['dname_desc_two']}</span>
+				</div>
+		
+				<div class='ipsField'>
+					<label for='email_1' class='ipsField_title'>{$this->lang->words['reg_enter_email']}</label>
+					<input type='text' id='email_1' class='input_text email <if test="ieEmail:|:$inline_errors['email']">error</if>' size='30' maxlength='150' name='EmailAddress' value='{$this->request['EmailAddress']}' /><br />
+					<span class='desc'><if test="ieEmail:|:$inline_errors['email']"><span class='error'>{$inline_errors['email']}<br /></span></if>{$this->lang->words['reg_enter_email_desc']}</span>
+				</div>
+	
+		
+				<div class='ipsField'>
+					<label for='password_1' class='ipsField_title'>{$this->lang->words['reg_choose_password']}</label>
+					<input type='password' id='password_1' class='input_text password <if test="iePassword:|:$inline_errors['password']">error</if>' size='30' maxlength='32' value='{$this->request['PassWord']}' name='PassWord' /><br />
+					<span class='desc'><if test="iePassword:|:$inline_errors['password']"><span class='error'>{$inline_errors['password']}<br /></span></if>{$this->lang->words['reg_choose_password_desc']}</span>
+				</div>
+		
+				<div class='ipsField'>
+					<label for='password_2' class='ipsField_title'>{$this->lang->words['reg_reenter_password']}</label>
+					<input type='password' id='password_2' class='input_text password' size='30' maxlength='32' value='{$this->request['PassWord_Check']}' name='PassWord_Check' />
+				</div>
+		
+				<if test="hasCfields:|:( is_array( $custom_fields['required'] ) && count( $custom_fields['required'] ) ) || ( is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] ) )">
+					<div class='row line_spacing'>
+						<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
+							<foreach loop="custom_required:$custom_fields['required'] as $_field">
+								{$_field['name']}<br />
+								{$_field['field']}<br />
+								<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span><br /></if>
+								<br />
+							</foreach>
+						</if>
+				
+						<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
+							<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
+								{$_field['name']}<br />
+								{$_field['field']}<br />
+								<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span><br /></if>
+								<br />
+							</foreach>
+						</if>
+						<!--IBF.MODULES.EXTRA-->
+					</div>
+				</if>
+		
+				<if test="$data['captchaHTML'] || $data['qandaHTML']">
+					<h3>{$this->lang->words['reg_step3_spam']}</h3>
+					{$data['qandaHTML']}
+					{$data['captchaHTML']}
+				</if>
+			
+				<div class='ipsField ipsField_checkbox'>
+					<input type="checkbox" name="allow_admin_mail" id="allow_admin_mail" value="1" class="input_check" <if test="defaultAAE:|:$this->request['allow_admin_mail'] || !isset( $this->request['allow_admin_mail'] )">checked='checked'</if> />
+					<p class='ipsField_content'>{$this->lang->words['receive_admin_emails']}</p>
+				</div>
+				<div class='submit'>
+					<input type='submit' class='button' value='{$this->lang->words['register']}' />
+				</div>
+			</form>
+	
 		</div>
 	</if>
-	
-	<form action="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" method="post" name="REG" id='register'>
-		<input type="hidden" name="termsread" value="1" />
-		<input type="hidden" name="agree_to_terms" value="1" />
-		<input type="hidden" name="do" value="process_form" />
-		<input type="hidden" name="coppa_user" value="{$data['coppa_user']}" />
-		
-		<h3>{$this->lang->words['reg_step1']}</h3>
-		<div class='row'>
-			<if test="$data['requireName']">
-				{$this->lang->words['reg_choose_user']}<br />
-				<input type='text' class='input_text <if test="ieUsername:|:$inline_errors['username']">error</if>' id='login_name' size='30' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['UserName']}' name='UserName' /><br />
-				<span class='desc'><if test="ieUsername:|:$inline_errors['username']"><span class='error'>{$inline_errors['username']}<br /></span></if>{$this->lang->words['char_cant_use']}</em></span>
-				<if test="registerAllowDnames:|:$this->settings['auth_allow_dnames'] == 1 OR !$data['requireName']">
-					<br /><br />
-				</if>
-			</if>
-			<if test="registerAllowDnames:|:$this->settings['auth_allow_dnames'] == 1 OR !$data['requireName']">
-				{$this->lang->words['reg_choose_dname']}<br />
-				<input type='text' class='input_text <if test="ieDname:|:$inline_errors['dname']">error</if>' id='display_name' size='30' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['members_display_name']}' name='members_display_name' /><br />
-				<span class='desc'><if test="ieDname:|:$inline_errors['dname']"><span class='error'>{$inline_errors['dname']}<br /></span></if>{$this->lang->words['dname_desc_one']} {$this->settings['max_user_name_length']} {$this->lang->words['dname_desc_two']}</span>
-			</if>
-		</div>
-		
-		<div class='row'>
-			{$this->lang->words['reg_enter_email']}<br />
-			<input type='text' id='email_1' class='input_text email <if test="ieEmail:|:$inline_errors['email']">error</if>' size='30' maxlength='150' name='EmailAddress' value='{$this->request['EmailAddress']}' /><br />
-			<span class='desc'><if test="ieEmail:|:$inline_errors['email']"><span class='error'>{$inline_errors['email']}<br /></span></if>{$this->lang->words['reg_enter_email_desc']}</span>
-			<br /><br />
-	
-			{$this->lang->words['reg_reenter_email']}<br />
-			<input type='text' id='email_2' class='input_text email' size='30' maxlength='150' name='EmailAddress_two' value='{$this->request['EmailAddress_two']}' />
-		</div>
-		
-		<div class='row'>
-			{$this->lang->words['reg_choose_password']}<br />
-			<input type='password' id='password_1' class='input_text password <if test="iePassword:|:$inline_errors['password']">error</if>' size='30' maxlength='32' value='{$this->request['PassWord']}' name='PassWord' /><br />
-			<span class='desc'><if test="iePassword:|:$inline_errors['password']"><span class='error'>{$inline_errors['password']}<br /></span></if>{$this->lang->words['reg_choose_password_desc']}</span>
-			<br /><br />
-				
-			{$this->lang->words['reg_reenter_password']}<br />
-			<input type='password' id='password_2' class='input_text password' size='30' maxlength='32' value='{$this->request['PassWord_Check']}' name='PassWord_Check' />
-		</div>
-		
-		<h3>{$this->lang->words['reg_step2']}</h3>
-		<div class='row line_spacing'>
-			<input type="checkbox" name="allow_admin_mail" id="allow_admin_mail" value="1" class="input_check" <if test="defaultAAE:|:$this->request['allow_admin_mail'] || !isset( $this->request['allow_admin_mail'] )">checked='checked'</if> />	{$this->lang->words['receive_admin_emails']}<br />
-				
-			<input type="checkbox" name="allow_member_mail" id="allow_member_mail" value="1" class="input_check" <if test="deaultAME:|:$this->request['allow_member_mail']">checked='checked'</if> />  {$this->lang->words['receive_member_emails']}<br /><br />
-						
-			{$this->lang->words['time_zone']}<br />
-			<select id='timezone' class='input_select' name='time_offset'>
-				<foreach loop="timezones:$time_select as $k => $v">
-				<option value='{$k}'<if test="defaultTimezone:|:$k == $this->request['time_offset']"> selected='selected'</if>>{$v}</option>
-				</foreach>
-			</select>
-			<br /><br />
-			
-			<input type='checkbox' id='dst' name='dst' value='1' class='input_check' <if test="defaultDst:|:$this->request['dst']">checked='checked'</if> /> {$this->lang->words['auto_dst_detection']}
-		</div>
-		
-		<if test="hasCfields:|:( is_array( $custom_fields['required'] ) && count( $custom_fields['required'] ) ) || ( is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] ) )">
-			<h3>{$this->lang->words['reg_step3']}</h3>
-			<div class='row line_spacing'>
-				<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
-					<foreach loop="custom_required:$custom_fields['required'] as $_field">
-						{$_field['name']}<br />
-						{$_field['field']}<br />
-						<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span><br /></if>
-						<br />
-					</foreach>
-				</if>
-				
-				<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
-					<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
-						{$_field['name']}<br />
-						{$_field['field']}<br />
-						<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span><br /></if>
-						<br />
-					</foreach>
-				</if>
-				<!--IBF.MODULES.EXTRA-->
-			</div>
-		</if>
-		
-		<if test="$data['captchaHTML'] || $data['qandaHTML']">
-			<h3>{$this->lang->words['reg_step3_spam']}</h3>
-			{$data['qandaHTML']}
-			{$data['captchaHTML']}
-		</if>
-		<div class='submit'>
-			<input type='submit' class='input_submit' value='{$this->lang->words['register']}' /> {$this->lang->words['or']} <a href='{parse url="" base="public"}' title='{$this->lang->words['cancel_link']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</div>
-	</form>
-	
-</div>]]></template_content>
+</if>]]></template_content>
       <template_name>registerForm</template_name>
-      <template_data>$general_errors=array(), $data=array(), $inline_errors=array(), $time_select=array(), $custom_fields=array()</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_data>$general_errors=array(), $data=array(), $inline_errors=array(), $time_select=array(), $custom_fields=array(), $nexusFields=array(), $nexusStates=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1884,18 +3967,29 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>registerShowTerms</template_name>
       <template_data><![CDATA[$text="",$coppa_user=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_register</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>registerStepBar</template_name>
+      <template_data>$step</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_register</template_group>
       <template_content><![CDATA[<span class='error'>$message</span>]]></template_content>
       <template_name>registration_error</template_name>
       <template_data>$message</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1907,7 +4001,7 @@ function contact_admin() {
 <input type="hidden" name="aid" value="$aid" />]]></template_content>
       <template_name>show_lostpass_form_auto</template_name>
       <template_data><![CDATA[$aid="",$uid=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1928,7 +4022,7 @@ function contact_admin() {
 	</ul>]]></template_content>
       <template_name>show_lostpass_form_manual</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1937,15 +4031,14 @@ function contact_admin() {
     <template>
       <template_group>skin_register</template_group>
       <template_content><![CDATA[<h2>{$this->lang->words['registration_process']}</h2>
-<div class='generic_bar'></div>
-<div class='post_form'>
-	<p class='field row2'>
+<div class='master_list'>
+	<div class='row post line_spacing'>	
 		{$this->lang->words['thank_you']} {$member['members_display_name']}. {$this->lang->words['auth_text']} {$member['email']}
-	</p>
+	</div>
 </div>]]></template_content>
       <template_name>showAuthorize</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1993,7 +4086,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showLostpassForm</template_name>
       <template_data>$error</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2007,7 +4100,7 @@ function contact_admin() {
 </p>]]></template_content>
       <template_name>showLostPassWaitRandom</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2044,7 +4137,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showManualForm</template_name>
       <template_data><![CDATA[$type="reg"]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2058,7 +4151,7 @@ function contact_admin() {
 </p>]]></template_content>
       <template_name>showPreview</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2073,7 +4166,7 @@ function contact_admin() {
 </p>]]></template_content>
       <template_name>showRevalidated</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2082,7 +4175,6 @@ function contact_admin() {
     <template>
       <template_group>skin_register</template_group>
       <template_content><![CDATA[<h2>{$this->lang->words['rv_title']}</h2>
-<!-- skinnote error needs to be formatted -->
 <if test="revalidateError:|:$error">
 <p class='message error'>{$this->lang->words[$error]}</p>
 <br />
@@ -2106,27 +4198,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showRevalidateForm</template_name>
       <template_data><![CDATA[$name="",$error=""]]></template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content><![CDATA[<form method="post" action="$action">
-$hidden
-<div class="borderwrap">
-	<div class="maintitle">$title</div>
-	<table class='ipbtable' cellspacing="0">
-		$content
-	</table>
-	<div class="formsubtitle" align="center"><input type="submit" /></div>
-</div>
-</form>]]></template_content>
-      <template_name>tmpl_form</template_name>
-      <template_data><![CDATA[$action="",$hidden="",$title="",$content=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2158,62 +4230,7 @@ $hidden
 </form>]]></template_content>
       <template_name>basicReportForm</template_name>
       <template_data><![CDATA[$name="", $url="", $extra_data=""]]></template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content><![CDATA[{parse js_module="reports"}
-<form method="post" action="{$this->settings['base_url']}">
-	<input type="hidden" name="app" value="core" />
-	<input type="hidden" name="module" value="reports" />
-	<input type="hidden" name="do" value="save_methods" />
-	<input type="hidden" name="req" value="1" />
-	<input type='hidden' name='k' value='{$this->member->form_hash}' />
-	
-	<h2 class='maintitle'>{$this->lang->words['report_ajax_tab_notif_meth']}</h2>
-	<div class='generic_bar'></div>
-	<div class='post_form'>
-		<fieldset class='row1'>
-			<h3 class='bar'>{$this->lang->words['configure_notifications']}</h3>
-			<ul>
-				<li class='field checkbox'>
-					<if test="rcPmEnabled:|:$this->settings['report_pm_enabled'] == 1">
-						<if test="hasPm:|:$data['by_pm']==1">
-							<input checked='checked' type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-						<else />
-							<input type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-						</if>
-					<else />
-						<input disabled='disabled' type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-					</if>
-					<label for='notmet_pm'>{$this->lang->words['report_settings_by_pm']}</label>
-				</li>
-				<li class='field checkbox'>
-					<if test="rcEmailEnabled:|:$this->settings['report_nemail_enabled'] == 1">
-						<if test="hasEmail:|:$data['by_email']==1">
-							<input checked='checked' type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-						<else />
-							<input type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-						</if>
-					<else />
-						<input disabled='disabled' type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-					</if>
-					<label for='notmet_email'>{$this->lang->words['report_settings_by_email']}</label>
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset class='submit'>
-			<input type="submit" value="{$this->lang->words['report_settings_save']}" class='input_submit' /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=reports&amp;do=index" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
-	</div>
-</form>]]></template_content>
-      <template_name>config_notif</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2224,7 +4241,7 @@ $hidden
       <template_content><![CDATA[<img src='{$this->settings['img_url']}/reports/post_alert_3.png' alt='' />]]></template_content>
       <template_name>greenAlertImage</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2235,7 +4252,7 @@ $hidden
       <template_content><![CDATA[<img src='{$this->settings['img_url']}/reports/post_alert_1.png' alt='' />]]></template_content>
       <template_name>redAlertImage</template_name>
       <template_data/>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2290,10 +4307,10 @@ $hidden
 				</td>
 				<td class='short'>{$report['num_reports']}</td>
 				<td class='short altrow'>{$report['num_comments']}</td>
-				<td class=''>
+				<td>
 					<ul class='last_post'>
+						<li><strong>{$this->lang->words['by_ucfirst']}</strong> {parse template="userHoverCard" group="global" params="$report['member']"}</li>
 						<li><strong>{$this->lang->words['report_updated']}</strong> {parse date="$report['date_updated']" format="tiny"}</li>
-						<li><strong>{$this->lang->words['report_by']}</strong> <a href="{parse url="showuser={$report['updated_by']}" template="showuser" seotitle="{$report['n_updated_seoname']}" base="public"}" title='{$this->lang->words['view_member']}'>{IPSLib::makeNameFormatted( $report['n_updated_by'], $report['member_group_id'] )}</a>{parse template="user_popup" group="global" params="$report['updated_by'],$report['n_updated_seoname']"}</li>
 					</ul>
 				</td>
 				<td class='short altrow'>
@@ -2310,7 +4327,6 @@ $hidden
 	</if>				
 </table>
 <div id='topic_mod' class='moderation_bar rounded with_action clear'>
-	<!-- SKINNOTE: Javascript needs moving to JS files -->
 	<select name="newstatus" id="report_actions">
 		<option value="x">---</option>
 		<if test="accessACP:|:$this->memberData['g_access_cp']">
@@ -2362,7 +4378,7 @@ $hidden
 </script>]]></template_content>
       <template_name>reportsIndex</template_name>
       <template_data><![CDATA[$reports=array(), $acts="", $pages="", $active=array(), $statuses=array()]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2373,7 +4389,7 @@ $hidden
       <template_content><![CDATA[<img src='{$this->settings['public_dir']}{$img}' alt='{$this->lang->words['status']}' />]]></template_content>
       <template_name>statusIcon</template_name>
       <template_data>$img, $width, $height</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2382,10 +4398,6 @@ $hidden
     <template>
       <template_group>skin_reports</template_group>
       <template_content><![CDATA[{parse js_module="reports"}
-<script type='text/javascript'>
-	// Editor JS: Only needs to be done once per page
-	{parse template="editorJS" group="editors" params=""}
-</script>
 <div class='message'>
 	{$this->lang->words['report_about_intro']} <if test="handlePmSpecial:|:$options['class'] == 'messages'">
 		{$this->lang->words['report_about_pm']} {$options['title']}.
@@ -2420,7 +4432,7 @@ $hidden
 	<foreach loop="viewReports:$reports as $report">
 		<div class='post_block  hentry clear'>
 			<div class='post_wrap'>
-				<h3><a href='{parse url="showuser={$report['member_id']}" seotitle="{$report['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_member']}'>{$report['members_display_name']}</a>{parse template="user_popup" group="global" params="$report['member_id'], $report['members_seo_name']"}</h3>
+				<h3><a href='{parse url="showuser={$report['member_id']}" seotitle="{$report['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_member']}'>{$report['members_display_name']}</a></h3>
 				<div class='author_info'>
 					{parse template="userInfoPane" group="global" params="$report['author'], 'mreport', array()"}
 				</div>
@@ -2435,97 +4447,21 @@ $hidden
 </if>
 </div>
 <br /><hr /><br />
-
-<h2 class='maintitle'>{$this->lang->words['comments_h2']}</h2>
-<div class='generic_bar'></div>
-<if test="hasComments:|:is_array($comments) AND count($comments)">
-	<foreach loop="comments:$comments as $comment">
-		
-		<div class='post_block first hentry report_comment' id='post_id_{$comment['comment_id']}'>
-			<div class='post_wrap'>
-				<h3>
-					<if test="commentMid:|:$comment['author']['member_id']">
-						<if test="commentOnline:|:$comment['author']['_online']">
-							{parse replacement="user_online"}
-						<else />
-							{parse replacement="user_offline"}
-						</if> &nbsp;
-								<address class="author vcard"><a class="url fn" href='{parse url="showuser={$comment['author']['member_id']}" template="showuser" seotitle="{$comment['author']['members_seo_name']}" base="public"}'>{$comment['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$comment['author']['member_id'], $comment['author']['members_seo_name']"}</address>
-					<else />
-						{$comment['author']['members_display_name']}
-					</if>
-				</h3>
-				
-				<div class='author_info'>
-					{parse template="userInfoPane" group="global" params="$comment['author'], $comment['comment_id'], array()"}
-				</div>
-				<div class='post_body'>
-					<p class='posted_info'>
-						{$this->lang->words['posted_prefix']} {parse date="$comment['comment_date']" format="long"}
-					</p>
-					<div class='post entry-content'>
-						{$comment['comment']}
-					</div>
-				</div>
-				<br class='clear' />
-			</div>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<h2 class='ipsType_subtitle'>{$comments['count']} {$this->lang->words['comments_h2']}</h2>
+		<div>
+			{$comments['html']}
 		</div>
-	</foreach>
-<else />
-	<p class='no_messages'>
-		{$this->lang->words['no_comments_on_report']}
-	</p>
-</if>
-<!-- SKINNOTE: Need to use included editor here -->
-{parse js_module="editor"}
-<br />
-<div id='fast_reply' style='display: {$displayData['fast_reply']}'>
-	<h3 class='maintitle'>{$this->lang->words['add_comment_title']}</h3>
-	<div class='generic_bar'></div>
-	<div class='general_box alt'>
-		<form method="post" action="{$this->settings['base_url']}" name="report_comment_submit" id='report_comment_submit'>
-			<input type="hidden" id="report_rid" name="rid" value="{$options['rid']}" />
-			<input type="hidden" name="app" value="core" />
-			<input type="hidden" name="module" value="reports" />
-			<input type="hidden" name="do" value="save_comment" />
-			<input type='hidden' name='{$editor_id}_wysiwyg_used' value='0' />
-			{parse template="editorShell" group="editors" params="'report_comment', 'comment'"} 
-			<fieldset class='submit'>
-				<input type='submit' class='input_submit' value='{$this->lang->words['post_button']}' accesskey='s' />
-			</fieldset>
-		</form>
 	</div>
 </div>
 <if test="disablelightbox:|:!$this->settings['disable_lightbox']">
 {parse template="include_lightbox" group="global" params=""}
 </if>
-{parse template="include_highlighter" group="global" params="1"}
-<script type="text/javascript">
-//<!#^#|CDATA|
-	if( $('report_comment_textarea') ){
-		$('report_comment_textarea').setStyle('height: 70px');
-	}
-	
-	ipb.editor_values.set( 'emoticons', \$H({ {parse expression="IPSLib::fetchEmoticonsAsJson()"} }) );
-	ipb.editors[ 'report_comment' ] = new ipb.editor( 'report_comment', USE_RTE );
-	in_use = 0;
-	<if test="rteOn:|:$rte_mode != 1">
-		obj = ipb.editors['report_comment'].editor_document;
-	<else />
-		obj = $( ipb.editors['report_comment'].items['text_obj'] );
-	</if>
-	Event.observe( obj, 'click', function(){
-		if( in_use != 1 ){
-			$( ipb.editors['report_comment'] ).resize_to( 250 );
-			in_use = 1;
-		}
-	}, true);
-//|#^#]>
-</script>
-</if>]]></template_content>
+{parse template="include_highlighter" group="global" params="1"}]]></template_content>
       <template_name>viewReport</template_name>
       <template_data>$options=array(), $reports=array(), $comments=array()</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2545,7 +4481,7 @@ $hidden
 </div>
 <ol id='member_alpha' class='tab_bar no_title'>
 	<foreach loop="APapps:$this->registry->getApplications() as $app">
-		<if test="ACloopAll:|:IPSLib::appisSearchable( $app['app_directory'] )">
+		<if test="ACloopAll:|:IPSLib::appIsSearchable( $app['app_directory'] )">
 			<if test="ACOnThisTab:|:$this->request['search_app'] == $app['app_directory']">
 				<li class='active'><strong><if test="ACFixHelp:|:strtolower($app['app_title']) == 'system'">{$this->lang->words['livesearch_helpfiles']}<else />{IPSLib::getAppTitle( $app['app_directory'] )}</if></strong></li>
 			<else />				
@@ -2611,7 +4547,7 @@ $hidden
 </if>]]></template_content>
       <template_name>activePostsView</template_name>
       <template_data>$results, $pagination, $total, $asForum</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2644,7 +4580,7 @@ $hidden
 </div>]]></template_content>
       <template_name>asForumPosts</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2652,37 +4588,33 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='row touch-row' id="sr-{$data['type_id_2']}">
-	<div class='icon'>{parse replacement="{$data['_icon']}"}</div>
+      <template_content><![CDATA[<div class='row touch-row <if test="!empty( $data['_unreadUrl'] )">unread</if>' id="sr-{$data['type_id_2']}">
+	<div class='icon'>
+		{parse template="generateTopicIcon" group="global_other" params="$data['_icon'], $data['_unreadUrl']"}	
+	</div>
 	<div class='rowContent'>
-		<a class="title" href='{parse url="showtopic={$data['type_id_2']}&amp;view=<if test="isNewPostAsForum:|:$this->request['do']=='new_posts' OR $this->request['do']=='active'">getnewpost<else /><if test="resultIsPostAsForum:|:$data['misc']">findpost&amp;p={$data['misc']}</if></if>&amp;hl={$this->request['search_higlight']}&amp;fromsearch=1" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='<if test="$data['_shortTitle'] != $data['_longTitle']">{$data['_longTitle']}<else />{$this->lang->words['view_result']}</if>'><strong>{$data['_shortTitle']}</strong></a>
+		<a class="title" href='{parse url="showtopic={$data['type_id_2']}&amp;view=<if test="isNewPostAsForum:|:$this->request['do']=='new_posts' OR $this->request['do']=='active'">getnewpost<else /><if test="resultIsPostAsForum:|:$data['misc']">findpost&amp;p={$data['misc']}</if></if>&amp;hl={$this->request['search_higlight']}&amp;fromsearch=1" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='<if test="$data['_shortTitle'] != $data['_longTitle']">{$data['_longTitle']}<else />{$this->lang->words['view_result']}</if>'>{$data['_shortTitle']}</a>
 		<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
 			<span class='mini_pagination'>
-				<foreach loop="pages:$data['pages'] as $page">
-					<if test="haslastpage:|:$page['last']">
-						<a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a>
-					<else />
-						<a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a>
-					</if>
-				</foreach>
+				{parse expression="sprintf( $this->lang->words['mini_page_count'], $data['pages'][0]['total'] )"}
 			</span>
 		</if>
-		<div class='subtext'>
+		<div>
 			{parse expression="ucfirst($this->lang->words['in'])"}
 			<foreach loop="topicsForumTrail:$data['_forum_trail'] as $i => $f">
-				<if test="notLastFtAsForum:|:$i+1 == count( $data['_forum_trail'] )"><a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a></if>
+				<if test="notLastFtAsForum:|:$i+1 == count( $data['_forum_trail'] )">{$f[0]}</if>
 			</foreach>
 		</div>
-		<if test="isNewContent:|:$this->request['do']=='new_posts'">
-			<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_lastpost_string'], $data['last_post'], $data['last_poster'] )"}</span>
+		<if test="isNewContent:|:$this->request['do']=='viewNewContent'">
+			<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_lastpost_string'], $this->registry->getClass('class_localization')->getDate( $data['last_post'], 'SHORT' ), $data['last_poster'] )"}</span>
 		<else />
-			<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_post_string'], $data['post_date'], $data['last_poster'] )"}</span>
+			<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_post_string'], $this->registry->getClass('class_localization')->getDate( $data['post_date'], 'SHORT' ), $data['last_poster'] )"}</span>
 		</if>
 	</div>
 </div>]]></template_content>
       <template_name>asForumTopics</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2705,7 +4637,7 @@ $hidden
 </div>]]></template_content>
       <template_name>calEventRangedSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2728,7 +4660,7 @@ $hidden
 </div>]]></template_content>
       <template_name>calEventSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2736,18 +4668,65 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[{$this->lang->words['find_forum']}:<br />
-<select name='search_app_filters[forums][forums][]' class='input_select' size='6' style='width: 20em' multiple='multiple'>
-	{$forums}
-</select>
-<br />
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>followData</template_name>
+      <template_data>$followData</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>followedContentForumsWrapper</template_name>
+      <template_data>$results</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>followedContentForumsWrapperForums</template_name>
+      <template_data>$results</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>followedContentView</template_name>
+      <template_data>$results, $pagination, $total, $error, $contentTypes</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<div class='ipsField'>
+	<label class='ipsField_title'>{$this->lang->words['find_forum']}</label>
+	<select name='search_app_filters[forums][forums][]' class='input_select' size='6' style='width: 20em' multiple='multiple'>
+		{$forums}
+	</select>
+</div>
 <if test="noOptsSphinxforums:|:$this->settings['search_method'] != 'sphinx'">
-	<br /><input id='f_content_only' type='checkbox' name='search_app_filters[forums][contentOnly]' class='input_checkbox' value='1' /> <label>{$this->lang->words['s_search_posts']}</label><br />
-</if>
-<br />]]></template_content>
+	<!--<div class='ipsField'>
+		<input id='f_content_only' type='checkbox' name='search_app_filters[forums][contentOnly]' class='input_checkbox' value='1' /> 		
+		<label class='ipsField_content'>{$this->lang->words['s_search_posts']}</label>
+	</div>-->
+</if>]]></template_content>
       <template_name>forumAdvancedSearchFilters</template_name>
       <template_data>$forums</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2755,72 +4734,14 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<fieldset class='{parse striping="search"}'>
-	<span class='search_msg'>
-		{$this->lang->words['s_gallery_desc']}
-	</span>
-	<ul>
-		<li>
-			<label for='forums_filter'>{$this->lang->words['find_in_category']}</label>
-			<select name='search_app_filters[gallery][cats][]' class='input input_select' size='6' multiple='multiple'>
-				{$cats_dd}
-			</select>
-		</li>
-		<li>
-			<label for='forums_filter'>{$this->lang->words['find_in_albums']}</label>
-			<input type='checkbox' name='search_app_filters[gallery][albums]' class='input_check' checked='checked'>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>galleryAdvancedSearchFilters</template_name>
-      <template_data><![CDATA[$cats_dd='']]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>forumsVncFilters</template_name>
+      <template_data>$data, $currentPrefs</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='result_info'>
-	<span class='icon'>{$r['image']}</span>
-	<h3><a href='{parse url="app=gallery&amp;module=images&amp;section=viewimage&amp;img={$r['type_id_2']}" base="public"}'>{$r['content_title']}</a></h3>
-	<span class='desc breadcrumb'>
-		Left by <a href='{parse url="showuser={$r['author_id']}" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['author_name']}</a>{parse template="user_popup" group="global" params="$r['author_id'],$r['members_seo_name']"} on {parse date="$r['post_date']" format="short"}
-	</span>
-	<p>{$r['content']}</p>
-</div>]]></template_content>
-      <template_name>galleryCommentSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='gallery_block row1'>
-	<div class='wrap'>
-		<p class='image_wrap'>
-			{$r['image']}
-		</p>
-		<h3>
-			<a href='{parse url="app=gallery&amp;module=images&amp;section=viewimage&amp;img={$r['id']}" base="public" seotitle="{$r['_seo_name']}" template="viewimage"}' title='{$this->lang->words['view']}'>{parse expression="IPSText::truncate( $r['content_title'], 40 )"}</a>
-		</h3>
-		<a href='{parse url="app=gallery&amp;module=user&amp;user={$r['member_id']}" seotitle="{$r['members_seo_name']}" template="galuser" base="public"}' class='user'>{$r['members_display_name']}</a>
-			<p class='info desc'>
-				{parse expression="sprintf( $this->lang->words['image_list_stats'], $r['comments'], $r['_queued_comments'], $r['views'], $r['_image_notes_count'] )"}
-			</p>
-	</div>
-</div>]]></template_content>
-      <template_name>galleryImageSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_search</template_group>
@@ -2834,7 +4755,7 @@ $hidden
 </div>]]></template_content>
       <template_name>helpSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2845,7 +4766,7 @@ $hidden
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>memberCommentsSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2857,7 +4778,7 @@ $hidden
 	<div class='icon'>
 		<a href='{parse url="showuser={$r['type_id_2']}" seotitle="{$r['members_seo_name']}" base="public"}'>
 			<if test="$r['misc']['pp_thumb_photo']">
-				<img src='{parse url="/{$r['misc']['pp_thumb_photo']}" base="upload"}' width="25" height="25" class='photo' />
+				<img src='{$r['misc']['pp_thumb_photo']}' width="25" height="25" class='photo' />
 			<else />
 				<img src='{$this->settings['img_url']}/profile/default_thumb.png' width="25" height="25" class='photo' />
 			</if>
@@ -2868,7 +4789,167 @@ $hidden
 </div>]]></template_content>
       <template_name>memberSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>mobile</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[{parse js_module="search"}
+<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
+<h2>{$this->lang->words['new_content']}</h2>
+<php>
+	$i = 2;
+	
+	if( is_array($sortIn) AND count( $sortIn ) ){ $i++;	}
+	if( IPSLib::appIsSearchable( $this->request['search_app'], 'vncWithFollowFilter' ) AND $this->memberData['member_id'] ){ $i++; }
+	
+	switch( $i ){
+		case 3:
+			$classname = 'three_';
+		break;
+		case 4:
+			$classname = 'four_';
+		break;
+		default:
+			$classname = 'two_';
+		break;
+	}
+</php>
+	
+<div class='ipsFilterBar {$classname}filters clearfix' id='vnc_filters'>
+	<ul>
+		<li id='filter_app' class='filter'><a href='#'>{$this->lang->words['short_filter_by_app']}</a></li>
+		<if test="is_array($sortIn) AND count( $sortIn )">
+			<li id='filter_section' class='filter'><a href='#'>{$this->lang->words['short_filter_by_section']}</a></li>
+		</if>
+		<li id='filter_time' class='filter'><a href='#'>{$this->lang->words['short_filter_by_time']}</a></li>
+		<if test="canFollowFilter:|:IPSLib::appIsSearchable( $this->request['search_app'], 'vncWithFollowFilter' ) AND $this->memberData['member_id']">
+			<li id='filter_other' class='filter'><a href='#'>{$this->lang->words['short_filter_by_other']}</a></li>
+		</if>
+	</ul>
+</div>
+<div class='ipsFilterPane' id='filter_app_pane' style='display: none'>
+	<a href='#' class='ipsFilterPane_close'><span>&times;</span></a>
+	<div>
+		<h4>{$this->lang->words['mobile_filter_by_app']}</h4>
+		<ul>
+			<if test="IPSLib::appIsSearchable( 'forums', 'vnc' ) || IPSLib::appIsSearchable( 'forums', 'active' )">
+				<li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=forums&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+			</if>
+			<if test="IPSLib::appIsSearchable( 'members', 'vnc' ) || IPSLib::appIsSearchable( 'members', 'active' )">
+				<li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=members&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
+			</if>
+			<if test="IPSLib::appIsSearchable( 'core', 'vnc' ) || IPSLib::appIsSearchable( 'core', 'active' )">
+				<li <if test="helpTab:|:$this->request['search_app'] == 'core'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=core&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
+			</if>
+			<foreach loop="apps:$this->registry->getApplications() as $app">
+				<if test="appIsSearchable:|:(IPSLib::appIsSearchable( $app['app_directory'], 'vnc' ) || IPSLib::appIsSearchable( $app['app_directory'], 'active' ) ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
+					<li <if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$app['app_directory']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>
+							{IPSLib::getAppTitle( $app['app_directory'] )}
+						</a>
+					</li>
+		 		</if>
+			</foreach>
+		</ul>
+	</div>
+</div>
+<if test="is_array($sortIn) AND count( $sortIn )">
+	<div class='ipsFilterPane' id='filter_section_pane' style='display: none'>
+		<a href='#' class='ipsFilterPane_close'><span>&times;</span></a>
+		<div>
+			<h4>{$this->lang->words['mobile_filter_by_section']}</h4>
+			<ul>
+				<foreach loop="$sortIn as $id => $_data">
+					<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$_data['0']}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$_data[1]}</a>
+					</li>
+				</foreach>
+			</ul>		
+		</div>
+	</div>
+</if>
+<div class='ipsFilterPane' id='filter_time_pane' style='display: none'>
+	<a href='#' class='ipsFilterPane_close'><span>&times;</span></a>
+	<div>
+		<h4>{$this->lang->words['mobile_filter_by_time']}</h4>
+		<ul>
+			<if test="hazMember:|:$this->memberData['member_id']">
+				<if test="hazVNC:|:IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'vncWithUnreadContent' )">
+					<li <if test="$this->request['period']=='unread'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=unread&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['filter_not_read']}</a>
+					</li>
+				</if>
+				<li <if test="$this->request['period']=='lastvisit'">class='active'</if>>
+					<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=lastvisit&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['filter_new_visit']}</a>
+				</li>
+			</if>
+			<li <if test="$this->request['period']=='today'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=today&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_today']}</a>
+			</li>
+			<li <if test="$this->request['period']=='week'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=week&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_week']}</a>
+			</li>
+			<li <if test="$this->request['period']=='weeks'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=weeks&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_weeks']}</a>
+			</li>
+			<li <if test="$this->request['period']=='month'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=month&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_month']}</a>
+			</li>
+			<li <if test="$this->request['period']=='months'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=months&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_months']}</a>
+			</li>
+			<li <if test="$this->request['period']=='year'">class='active'</if>>
+				<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=year&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_year']}</a>
+			</li>
+		</ul>
+	</div>
+</div>
+<div class='ipsFilterPane' id='filter_other_pane' style='display: none'>
+	<a href='#' class='ipsFilterPane_close'><span>&times;</span></a>
+	<div>
+		<h4>{$this->lang->words['mobile_filter_by_other']}</h4>
+		<ul>
+			<if test="checked:|:$this->request['followedItemsOnly']">
+				<li class="active">
+					<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly=0" base="public"}'>{$this->lang->words['filter_i_follow']}</a>
+				</li>
+			<else />
+				<li>
+					<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly=1" base="public"}'>{$this->lang->words['filter_i_follow']}</a>
+				</li>
+			</if>
+			<li <if test="$this->request['userMode'] == 'all'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period={$this->request['period']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}&amp;userMode=<if test="$this->request['userMode'] != 'all'">all</if>" base="public"}'>{$this->lang->words['vnc_topics_and_posts']}</a></li>
+			<li <if test="$this->request['userMode'] == 'title'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period={$this->request['period']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}&amp;userMode=<if test="$this->request['userMode'] != 'title'">title</if>" base="public"}'>{$this->lang->words['vnc_topics_only']}</a></li>
+			<!--<if test="vncFilterForumsOnly:|:$this->request['search_app'] == 'forums'"><li <if test="hasFilters:|:IPSSearchRegistry::get('forums.vncForumFilters') != null">class='active'</if>><a href='' id='vncForumFilter'>{$this->lang->words['vnc_filter_by_forum']}</a></li></if>-->
+		</ul>
+	</div>
+</div>
+		
+<if test="NPTotal:|:$total">
+	<div class='master_list'>
+		{$results}
+	</div>
+	<if test="$pagination">
+		<div class='controls'>
+			<div class='buttons'>
+				{$pagination}
+			</div>
+		</div>
+	</if>
+<else />
+	<p class='no_messages'>{$this->lang->words['new_content_none']}</p>
+</if>
+<script type='text/javascript'>
+	$('vnc_filters').on("click", "li.filter", mobileFilter);
+	$('ipboard_body').on("click", ".ipsFilterPane_close", closePane);
+</script>]]></template_content>
+      <template_name>newContentView</template_name>
+      <template_data>$results, $pagination, $total, $sortDropDown, $sortIn, $dateCutSet=0</template_data>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2900,7 +4981,7 @@ $hidden
 </div>]]></template_content>
       <template_name>newPostsView</template_name>
       <template_data>$results, $pagination, $total, $sortDropDown, $sortIn, $dateCutSet=0</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2910,7 +4991,7 @@ $hidden
       <template_group>skin_search</template_group>
       <template_content><![CDATA[<form action="{parse url="app=core&amp;module=search&amp;section=search&amp;do=search" base="public"}&amp;fromsearch=1" method="post" id='search-box' >
 <input type='hidden' name='search_app' id='search_app' value='{$this->request['search_app']}' />
-<div class='master_list'>
+<div class='master_list ipsForm_vertical'>
 	<h2>{$this->lang->words['search']}</h2>
 	
 	<if test="searchTermsRemoved:|:is_array( $removed_search_terms ) && count( $removed_search_terms )">
@@ -2920,12 +5001,12 @@ $hidden
 		<div class='message error'>{$msg}</div>
 	</if>
 	
-	<div class='row'>
-		{$this->lang->words['find_words']}:<br />
+	<div class='ipsField'>
+		<label for='query' class='ipsField_title'>{$this->lang->words['find_words']}</label>
 		<input type='text' class='input_text' name='search_term' size='30' id='query' value='{$this->request['search_term']}' />
-		<br /><br />
-		
-		{$this->lang->words['find_author']}:<br />
+	</div>
+	<div class='ipsField'>
+		<label for='author' class='ipsField_title'>{$this->lang->words['find_author']}</label>
 		<input type='text' class='input_text' name='search_author' size='30' id='author' value='{$this->request['search_author']}' />
 	</div>
 	
@@ -2934,60 +5015,56 @@ $hidden
 	<if test="count($filters)">
 		<foreach loop="$filters as $app => $data">
 			<if test="$app == 'forums'">
-			<div class='row' id='app_filter_{$app}'>
+			<div id='app_filter_{$app}'>
 				<if test="!empty($data['html'])">
 					{$data['html']}
 				</if>
 				<if test="count($data['sortDropDown'])">
-					<fieldset class='{parse striping="search"}'>
-						<if test="is_array($data['sortDropIn']) AND count( $data['sortDropIn'] )">
-							<foreach loop="$data['sortDropIn'] as $id => $_data">
-								<ul>
-									<li>
-										<label for='search_by_{$_data[0]}'><if test="! $id">{$this->lang->words['s_member_sin']}<else />&nbsp;</if></label>
-										<input type='radio' name='search_app_filters[$app][searchInKey]' value='{$_data[0]}' <if test="$this->request['search_app_filters'][$app]['searchInKey'] == $_data[0] || ( ! $this->request['search_app_filters'][$app]['searchInKey'] AND ! $id )">checked="checked"</if> /> $_data[1]
-										<select name='search_app_filters[$app][{$_data[0]}][sortKey]' class='input_select' style='width:auto'>
-										<foreach loop="$data['sortDropDown'][$_data[0]] as $k => $l">
-											<option value='$k' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortKey'.$_data[0]] == $k">selected='selected'</if>>{$l}</option>
-										</foreach>
-										</select>
-										<select name='search_app_filters[$app][{$_data[0]}][sortDir]' class='input_select' style='width:auto'>
-											<option value='0' <if test="!$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-											<option value='1' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
-										</select>
-									</li>
-								</ul>
-							</foreach>
-						<else />
+					<if test="is_array($data['sortDropIn']) AND count( $data['sortDropIn'] )">
+						<foreach loop="$data['sortDropIn'] as $id => $_data">
 							<ul>
 								<li>
-									<label for='search_by'>{$this->lang->words['s_search_type']}</label>
-									<select name='search_app_filters[$app][sortKey]' id='search_sort_by_{$app}' class='input_select' style='width:auto'>
-									<foreach loop="$data['sortDropDown'] as $k => $l">
-										<option value='$k' <if test="$this->request['search_app_filters'][$app]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
+									<label for='search_by_{$_data[0]}'><if test="! $id">{$this->lang->words['s_member_sin']}<else />&nbsp;</if></label>
+									<input type='radio' name='search_app_filters[$app][searchInKey]' value='{$_data[0]}' <if test="$this->request['search_app_filters'][$app]['searchInKey'] == $_data[0] || ( ! $this->request['search_app_filters'][$app]['searchInKey'] AND ! $id )">checked="checked"</if> /> $_data[1]
+									<select name='search_app_filters[$app][{$_data[0]}][sortKey]' class='input_select' style='width:auto'>
+									<foreach loop="$data['sortDropDown'][$_data[0]] as $k => $l">
+										<option value='$k' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortKey'.$_data[0]] == $k">selected='selected'</if>>{$l}</option>
 									</foreach>
 									</select>
-									<select name='search_app_filters[$app][sortDir]' id='search_sort_order_{$app}' class='input_select' style='width:auto'>
-										<option value='0' <if test="!$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-										<option value='1' <if test="$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
+									<select name='search_app_filters[$app][{$_data[0]}][sortDir]' class='input_select' style='width:auto'>
+										<option value='0' <if test="!$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
+										<option value='1' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
 									</select>
 								</li>
 							</ul>
-						</if>
-					</fieldset>
+						</foreach>
+					<else />
+						<div class='ipsField'>
+							<label for='search_by' class='ipsField_title'>{$this->lang->words['s_search_type']}</label>
+							<select name='search_app_filters[$app][sortKey]' id='search_sort_by_{$app}' class='input_select' style='width:auto'>
+								<foreach loop="$data['sortDropDown'] as $k => $l">
+									<option value='$k' <if test="$this->request['search_app_filters'][$app]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
+								</foreach>
+							</select>
+							<select name='search_app_filters[$app][sortDir]' id='search_sort_order_{$app}' class='input_select' style='width:auto'>
+								<option value='0' <if test="!$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
+								<option value='1' <if test="$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
+							</select>
+						</div>
+					</if>
 				</if>
 			</div>
 			</if>
 		</foreach>
 		</if>	
 	<div class='submit'>
-		<input type='submit' name='submit' class='input_submit' value='{$this->lang->words['do_search']}'> {$this->lang->words['or']} <a href='{parse url="" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
+		<input type='submit' name='submit' class='button' value='{$this->lang->words['do_search']}'>
 	</div>
 </div>
 </form>]]></template_content>
       <template_name>searchAdvancedForm</template_name>
       <template_data><![CDATA[$filters='', $msg='', $current_app, $removed_search_terms=array(), $isFT=false]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2995,7 +5072,8 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div id='search_results'>
+      <template_content><![CDATA[{parse striping="searchStripe" classes="row1,row2"}
+<div id='search_results'>
 	<ol>
 		<if test="is_array( $results )">
 		<foreach loop="results:$results as $result">
@@ -3014,7 +5092,7 @@ $hidden
 </div>]]></template_content>
       <template_name>searchResults</template_name>
       <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3025,7 +5103,7 @@ $hidden
       <template_content><![CDATA[{parse template="searchResults" group="search" params="$results, $titlesOnly"}]]></template_content>
       <template_name>searchResultsAsForum</template_name>
       <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3033,30 +5111,60 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>searchResultsAsGallery</template_name>
-      <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='master_list'>
-	<h2>{$this->lang->words['search_results']}</h2>
+      <template_content><![CDATA[<php>
+	$i = 0;
+	if( IPSLib::appIsSearchable( 'forums', 'search' ) ){ $i++;	}
+	if( IPSLib::appIsSearchable( 'members', 'search' ) ){ $i++;	}
+	if( IPSLib::appIsInstalled('blog') && IPSLib::appIsSearchable( 'blog', 'search' ) ){ $i++;	}
+	if( IPSLib::appIsInstalled('gallery') && IPSLib::appIsSearchable( 'gallery', 'search' ) ){ $i++;	}
+	
+	switch( $i ){
+		case 3:
+			$classname = 'three_';
+		break;
+		case 4:
+			$classname = 'four_';
+		break;
+		case 2:
+			$classname = 'two_';
+		break;
+		default:
+			$classname = 'one_';
+		break;
+	}
+</php>
+<div class='master_list'>
+	<h2><if test="hasSearchResults:|:$total > 0 AND $search_term != ''">{$total} </if>{$this->lang->words['search_results']}</h2>
+	
+	<div class='ipsFilterBar {$classname}filters clearfix' id='vnc_filters'>
+		<ul>
+			<if test="IPSLib::appIsSearchable( 'forums', 'search' )">
+				<li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='selected'</if>><a href='{parse url="{$url_string}&amp;search_app=forums" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+			</if>
+			<if test="IPSLib::appIsSearchable( 'members', 'search' )">
+				<li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='selected'</if>><a href='{parse url="{$url_string}&amp;search_app=members" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
+			</if>
+			<if test="IPSLib::appIsInstalled('blog') && IPSLib::appIsSearchable( 'blog', 'search' )">
+				<li <if test="helpTab:|:$this->request['search_app'] == 'blog'">class='selected'</if>><a href='{parse url="{$url_string}&amp;search_app=blog" base="public"}'>{IPSLib::getAppTitle( 'blog' )}</a></li>
+			</if>
+			<if test="IPSLib::appIsInstalled('gallery') && IPSLib::appIsSearchable( 'gallery', 'search' )">
+				<li <if test="helpTab:|:$this->request['search_app'] == 'gallery'">class='selected'</if>><a href='{parse url="{$url_string}&amp;search_app=gallery" base="public"}'>{IPSLib::getAppTitle( 'gallery' )}</a></li>
+			</if>
+		</ul>
+	</div>
 	<if test="searchResultsTermsRemoved:|:is_array( $removed_search_terms ) && count( $removed_search_terms )">
 		<div class='message error'>{$this->lang->words['removed_search_terms']} <strong>{parse expression="implode( ',', $removed_search_terms )"}</strong></div>
 	</if>
 	<if test="hasSearchResults:|:$total > 0 AND $search_term != ''">
-		<div class='message'>
-			{$this->lang->words['your_search']} <em><strong>{$search_term}</strong></em> {$this->lang->words['your_search_returned']} <strong>{$total}</strong> {$this->lang->words['your_search_results']}
-		</div>
+		<!--<div class='message'>
+			{$this->lang->words['your_search']} <em><strong>{$search_term}</strong></em> {$this->lang->words['your_search_returned']} 
+		</div>-->
 	</if>
 	<if test="$pagination">
 		<div class='controls'>
-			{$pagination}
+			<div class='buttons'>
+				{$pagination}
+			</div>
 		</div>
 	</if>
 	
@@ -3066,27 +5174,17 @@ $hidden
 		<div class='row no_messages'>{$this->lang->words['no_results_found']}<if test="noResultsTerm:|:$search_term"> {$this->lang->words['no_results_found_for']} '{$search_term}'</if>.</div>
 	</if>
 	
-	
-	<div class='controls'>
-		{$this->lang->words['show_results_in']}
-		<if test="forumsTab:|:isset( $this->request['search_filter_app']['forums'] ) && $this->request['search_filter_app']['forums'] == 1">
-			<strong>{$this->lang->words['search_tab_forums']}</strong>
-		<else />				
-			<a href='{parse url="{$url_string}&amp;search_app=forums" base="public"}'>{$this->lang->words['search_tab_forums']}</a>
-		</if>
-		&middot;
-		<if test="membersTab:|:isset( $this->request['search_filter_app']['members'] ) && $this->request['search_filter_app']['members'] == 1">
-			<strong>{$this->lang->words['search_tab_members']}</strong>
-		<else />
-			<a href='{parse url="{$url_string}&amp;search_app=members" base="public"}'>{$this->lang->words['search_tab_members']}</a>
-		</if>
-		
-		{$pagination}
-	</div>
+	<if test="$pagination">
+		<div class='controls'>
+			<div class='buttons'>
+				{$pagination}
+			</div>
+		</div>
+	</if>
 </div>]]></template_content>
       <template_name>searchResultsWrapper</template_name>
       <template_data>$results, $sortDropDown, $sortIn, $pagination, $total, $showing, $search_term, $url_string, $current_key, $removed_search_terms=array(), $limited=0, $wasLimited=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3094,8 +5192,7 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!-- SKINNOTE: Wrap user link in ajax span -->
-<div class='result_info'>
+      <template_content><![CDATA[<div class='result_info'>
 	<h3>{$r['content_title']}</h3>
 	<if test="showGenericContent:|:!$resultAsTitle">
 	<p>
@@ -3111,7 +5208,7 @@ $hidden
 </div>]]></template_content>
       <template_name>searchRowGenericFormat</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3140,11 +5237,11 @@ $hidden
 		</span>
 	</if>
 	<br />
-	<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_post_string'], $resultAsTitle ? $r['_last_post'] : $r['_post_date'], $r['members_display_name'] )"}</span>
+	<span class='subtext'>{parse expression="sprintf( $this->lang->words['sr_as_post_string'], $this->registry->getClass('class_localization')->getDate( $resultAsTitle ? $r['_last_post'] : $r['_post_date'], 'SHORT' ), $r['members_display_name'] )"}</span>
 </div>]]></template_content>
       <template_name>topicPostSearchResult</template_name>
       <template_data>$r, $indent, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3159,7 +5256,7 @@ $hidden
 </if>]]></template_content>
       <template_name>topicPostSearchResultAsForum</template_name>
       <template_data>$data, $resultAsTitle=false</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3172,7 +5269,7 @@ $hidden
 	</ol>]]></template_content>
       <template_name>topicPostSubresultWrap</template_name>
       <template_data>$content</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3207,7 +5304,7 @@ $hidden
 </div>]]></template_content>
       <template_name>userPostsView</template_name>
       <template_data>$results, $pagination, $total, $member, $asForum, $limited=0, $wasLimited=false, $beginTime</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3289,7 +5386,7 @@ $hidden
 <br />]]></template_content>
       <template_name>group_strip</template_name>
       <template_data><![CDATA[$group="", $members=array()]]></template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3317,7 +5414,7 @@ $hidden
 		<foreach loop="topposters:$rows as $info">
 			<tr class='{parse striping="top_posters"}'>
 				<td>
-					<img src='{$info['pp_mini_photo']}' alt="{$info['members_display_name']}{$this->lang->words['users_photo']}" class='photo' width='{$info['pp_mini_width']}' height='{$info['pp_mini_height']}' />
+					<img src='{$info['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$info['members_display_name'])"}" class='photo' width='{$info['pp_mini_width']}' height='{$info['pp_mini_height']}' />
 				</td>
 				<td>
 					<if test="topPosterMid:|:$info['member_id'] > 0">
@@ -3364,7 +5461,7 @@ $hidden
 </table>]]></template_content>
       <template_name>top_posters</template_name>
       <template_data>$rows</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3400,18 +5497,7 @@ $hidden
 	</table>]]></template_content>
       <template_name>whoPosted</template_name>
       <template_data><![CDATA[$tid=0, $title="", $rows=array()]]></template_data>
-      <template_updated>1288194262</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>whoPostedAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288194262</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/core/xml/core_modules.xml b/upload/admin/applications/core/xml/core_modules.xml
index ecdab8a6..50d02ad5 100644
--- a/upload/admin/applications/core/xml/core_modules.xml
+++ b/upload/admin/applications/core/xml/core_modules.xml
@@ -5,13 +5,10 @@
       <sys_module_title>Ядро</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>global</sys_module_key>
-      <sys_module_description>Глобальные функции форума</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>1</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -19,209 +16,175 @@
       <sys_module_title>Панель пользовател�</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>usercp</sys_module_key>
-      <sys_module_description>Панель управлени� учетной запи�ью пользовател�</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>2</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Менеджер задач</sys_module_title>
+      <sys_module_title>Планировщик задач</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>task</sys_module_key>
-      <sys_module_description>Запу�к задач планировщика</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>3</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Прикрепление файлов</sys_module_title>
+      <sys_module_title>Прикрепл�емые файлы</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>attach</sys_module_key>
-      <sys_module_description>Обработчик загрузки файлов</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>4</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Панель управлени�</sys_module_title>
+      <sys_module_title>Журналы</sys_module_title>
       <sys_module_application>core</sys_module_application>
-      <sys_module_key>mycp</sys_module_key>
-      <sys_module_description>Про�мотр задач, тем и т.п.</sys_module_description>
+      <sys_module_key>logs</sys_module_key>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>1</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
-    <module>
-      <sys_module_title>�а�тройки и ин�трументы</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>tools</sys_module_key>
-      <sys_module_description>Модуль управлени� на�тройками �и�темы</sys_module_description>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>2</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
     <module>
       <sys_module_title>Внешний вид</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>templates</sys_module_key>
-      <sys_module_description>Модуль управлени� �тил�ми, CSS и �зыками</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>3</sys_module_position>
+      <sys_module_position>1</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Приложени�</sys_module_title>
+      <sys_module_title>Мо� панель управлени�</sys_module_title>
       <sys_module_application>core</sys_module_application>
-      <sys_module_key>applications</sys_module_key>
-      <sys_module_description>Модуль управлени� приложени�ми, их модул�ми и модификаци�ми.</sys_module_description>
+      <sys_module_key>mycp</sys_module_key>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>4</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Содержимое �ообщений</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>posts</sys_module_key>
-      <sys_module_description>Модуль управлени� BB-кодами, �майликами и т.п.</sys_module_description>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>5</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Языки</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>languages</sys_module_key>
-      <sys_module_description>Модуль управлени� �зыками �и�темы</sys_module_description>
-      <sys_module_version>3.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>6</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Си�тема жалоб</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>report</sys_module_key>
-      <sys_module_description>Модуль управлени� �и�темой жалоб форума</sys_module_description>
-      <sys_module_version>3.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>7</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Журналы</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>logs</sys_module_key>
-      <sys_module_description>Модуль про�мотра журналов �и�темы</sys_module_description>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>8</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Си�тема</sys_module_title>
-      <sys_module_application>core</sys_module_application>
-      <sys_module_key>system</sys_module_key>
-      <sys_module_description>Модуль управлени� безопа�но�тью и задачами �и�темы</sys_module_description>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>9</sys_module_position>
+      <sys_module_position>1</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
       <sys_module_title>Диагно�тика</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>diagnostics</sys_module_key>
-      <sys_module_description>Модуль предо�тавл�ет ин�трументы дл� диагно�тики �и�темы</sys_module_description>
+      <sys_module_description/>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>10</sys_module_position>
+      <sys_module_position>2</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Управление SQL</sys_module_title>
+      <sys_module_title>�а�тройки</sys_module_title>
       <sys_module_application>core</sys_module_application>
+      <sys_module_key>settings</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>2</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Сообщени�</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>posts</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>2</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Языки</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>languages</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>3.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>3</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Ин�трументы</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>tools</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>3</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Приложени� и хуки</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>applications</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>4</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Жалобы</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>report</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>3.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>7</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Си�тема</sys_module_title>
+      <sys_module_application>core</sys_module_application>
+      <sys_module_key>system</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>9</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Управление базой данных</sys_module_title>
+      <sys_module_application>core</sys_module_application>
       <sys_module_key>sql</sys_module_key>
-      <sys_module_description>Модуль управлени� SQL базой данных из �Ц</sys_module_description>
+      <sys_module_description/>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>11</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Помощь</sys_module_title>
+      <sys_module_title>Поддержка</sys_module_title>
       <sys_module_application>core</sys_module_application>
       <sys_module_key>help</sys_module_key>
-      <sys_module_description>Модуль добавл�ющий информационную поддержку в �Ц</sys_module_description>
+      <sys_module_description/>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>12</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
diff --git a/upload/admin/applications/core/xml/core_root_css.xml b/upload/admin/applications/core/xml/core_root_css.xml
index 86a8ce60..24bc4ab8 100644
--- a/upload/admin/applications/core/xml/core_root_css.xml
+++ b/upload/admin/applications/core/xml/core_root_css.xml
@@ -2,7 +2,7 @@
 <css>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864231</css_updated>
     <css_group>calendar_select</css_group>
     <css_content>.calendar_date_select {
   color:white;
@@ -19,9 +19,9 @@ iframe.ie6_blocker {
 
 .calendar_date_select thead th {
   font-weight:bold;
-  background-color: #000;
+  background-color: #aaa;
   border-top:1px solid #777;
-  border-bottom:2px solid #333;
+  border-bottom:1px solid #777;
   color: white !important;
 }
 
@@ -75,6 +75,7 @@ iframe.ie6_blocker {
 .calendar_date_select .cds_header a.next {
   float:right;
 }
+
 .calendar_date_select .cds_header a.close {
   float:right;
   display:none;
@@ -87,38 +88,40 @@ iframe.ie6_blocker {
 .calendar_date_select .cds_header select.year {
   width:61px;
 }
-
 .calendar_date_select .cds_buttons a {
   color: white;
   font-size: 9px;
 }
+
 .calendar_date_select td {
   font-size:12px;
   width: 24px;
   height: 21px;
   text-align:center;
   vertical-align: middle;
-  background-color: #666666;
+  background-color: #fff;
 }
 .calendar_date_select td.weekend {
-  background-color: #606060;
+  background-color: #eee;
+  border-left:1px solid #ddd;
+  border-right:1px solid #ddd;
 }
 
 .calendar_date_select td div {
-  color: #fff;
+  color: #000;
 }
 .calendar_date_select td div.other {
-  color: #888;
+  color: #ccc;
 }
 .calendar_date_select td.selected div {
-  color:black;
+  color:white;
 }
 
 .calendar_date_select tbody td {
-  border-bottom: 1px solid #555;
+  border-bottom: 1px solid #ddd;
 }
 .calendar_date_select td.selected {
-  background-color:white;
+  background-color:#777;
 }
 
 .calendar_date_select td:hover {
@@ -130,10 +133,9 @@ iframe.ie6_blocker {
 }
 
 .calendar_date_select td.disabled div {
-  color: #454545;
+  color: #e6e6e6;
 }
 
-
 .fieldWithErrors .calendar_date_select {
   border: 2px solid red;
 }</css_content>
@@ -143,13 +145,269 @@ iframe.ie6_blocker {
     <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
+    <css_group>ipb_ckeditor</css_group>
+    <css_content><![CDATA[/***************************************************************/
+/* IP.Board 3.2 Editor CSS                                       */
+/* ___________________________________________________________ */
+/* By Matt Mecham					                            */
+/***************************************************************/
+/* Styles for the editor (colors in main css) */
+/***************************************************************/
+
+.as_content {
+	background: #fff;
+	font-size: 1.0em;
+	border: 1px solid black;
+	padding: 6px;
+	margin: 8px;
+	overflow: auto;
+	max-height: 400px;
+}
+.as_buttons {
+	text-align: right;
+	padding: 4px 0px;
+}
+.as_message {
+	display: inline-block;
+}
+
+.ipsEditor_textarea {
+	width: 99%;
+	height: 200px;
+	font-size: 14px;
+}
+.cke_browser_webkit {outline:none !important;}
+	
+/* Main tool bar BG */
+.cke_top {
+	background: #E4EBF2 url({style_images_url}/editor/toolbar_bg.png) repeat-x !important;
+}
+
+/* Normal STD */
+.cke_skin_ips textarea.cke_source {
+	/* removed as causes pasted text to appear on one line: white-space: pre-line !important;*/
+}
+
+/* Minimized RTE */
+.cke_skin_ips .cke_wrapper.minimized { 
+	opacity: 0.6 !important;
+	background: none !important;
+	border: none !important;
+}
+
+/* Minimized STD */
+.cke_skin_ips .cke_wrapper.minimized.std { 
+	border: 2px solid #D5DDE5 !important;
+}
+
+/* Main Editor wrapper */
+.cke_skin_ips { margin-bottom: 0px !important; }
+
+.cke_skin_ips .cke_wrapper
+{
+	padding: 0px 5px 0px 3px !important;
+	border: 2px solid #D5DDE5 !important;
+	background-color: #E4EBF2 !important;
+	background-image: none !important;
+}
+
+/* OFF state for editor buttons */
+.cke_skin_ips .cke_toolgroup
+{
+	background-color: transparent !important;
+}
+
+/* HOVER 'off' button */
+.cke_skin_ips .cke_button a:hover,
+.cke_skin_ips .cke_button a:focus,
+.cke_skin_ips .cke_button a:active	/* IE */
+{
+	background-color: #d5dde5 !important;
+}
+
+/* HOVER 'on' button */
+.cke_skin_ips .cke_button a:hover.cke_on,
+.cke_skin_ips .cke_button a:focus.cke_on,
+.cke_skin_ips .cke_button a:active.cke_on	/* IE */
+{
+	background-color: #86caff !important;
+}
+
+/* Button group */
+.cke_skin_ips .cke_toolgroup
+{
+	margin-right: 0px !important;
+}
+
+/* Button separator */
+.cke_skin_ips .cke_separator
+{
+	border-left:solid 1px #D5DDE5;
+	display:inline-block !important;
+	float:left;
+	height:30px;
+	margin:0px 2px;
+}
+
+/* DIALOG: Modal blind */
+.cke_dialog_background_cover
+{
+	background-color: #3e3e3e !important;
+}
+
+/* DIALOG: Title - based on .maintitle */
+.cke_skin_ips .cke_dialog_title
+{
+	background: #2c5687 url({style_images_url}/maintitle.png) repeat-x top !important;
+	color: #fff !important;
+	padding: 10px 10px 11px !important;
+	font-size: 16px !important;
+	font-weight: 300 !important;
+	text-shadow: 0 1px 2px rgba(0,0,0,0.3);
+	font-weight: normal;
+}
+
+/* Dialog: Body */
+.cke_skin_ips .cke_dialog_body {
+	z-index: 20000 !important;
+}
+
+/* Dialog tab bg (will usually match dialog title) */
+.cke_skin_ips .cke_dialog_tabs {
+	background: #2C5687 !important;
+}
+
+/* Dialog Title close button */
+.cke_skin_ips .cke_dialog_close_button
+{
+	background: transparent url({style_images_url}/close_popup.png) no-repeat top left !important;
+	width: 13px !important;
+	height: 13px !important;
+	top: 11px !important;
+	right: 10px !important;
+}
+
+/* Dialog OK / Cancel buttons - based on ipsButton_secondary*/
+.cke_skin_ips span.cke_dialog_ui_button
+{
+	height: 22px !important;
+	line-height: 22px !important;
+	font-size: 12px !important;
+	color: #7c7c7c !important;
+	padding: 0 10px !important;
+	background: #f6f6f6 !important;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%) !important; /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)) !important; /* webkit */
+	border: 1px solid #dbdbdb !important;
+	-moz-box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3) !important;
+	-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3) !important;
+	box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3) !important;
+	-moz-border-radius: 3px !important;
+	-webkit-border-radius: 3px !important;
+	border-radius: 3px !important;
+	color: #616161 !important;
+	display: inline-block !important;
+	white-space: nowrap !important;
+}
+
+
+/* Turn off resizer */
+.cke_skin_ips .cke_dialog_footer .cke_resizer { display: none; }
+
+/* Emo slide out tray */
+.ipsSmileyTray
+{
+	text-align: center;
+	overflow: auto;
+	margin: 0px auto 0px auto;
+	padding: 4px 24px 4px 24px;
+	min-width: 600px;
+	width: 75%;
+	height: 32px;
+	border: 1px solid #D5DDE5;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	
+	-moz-border-radius-topleft: 0px;
+	-webkit-border-radius-topleft: 0px;
+	border-top-left-radius: 0px;
+	
+	-moz-border-radius-topright: 0px;
+	-webkit-border-radius-topright: 0px;
+	border-top-right-radius: 0px;
+	
+	border-top: 0px;
+	-moz-box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
+	box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
+	
+	background: #E4EBF2;
+	overflow-y: hidden;
+}
+	.ipsSmileyTray img.bbc_emoticon {
+		opacity: 0.8;
+		cursor: pointer;
+		margin: 6px 3px 0px 3px;
+		max-width: 30px;
+		max-height: 30px;
+	 }
+	 	.ipsSmileyTray img.bbc_emoticon:hover {
+			opacity: 1.0;
+	 	}
+	
+	.ipsSmileyTray .ipsSmileyTray_next {
+		background: transparent url({style_images_url}/editor/next.png) no-repeat;
+		background-position: 0px 10px;
+		display: inline-block;
+		float: right;
+		position: relative;
+		right: -20px;
+		width: 13px;
+		height: 30px;
+		cursor: pointer;
+	}
+	
+	.ipsSmileyTray .ipsSmileyTray_prev {
+		background: transparent url({style_images_url}/editor/prev.png) no-repeat;
+		background-position: 0px 10px;
+		display: inline-block;
+		position: relative;
+		left: -20px;
+		float: left;
+		width: 13px;
+		height: 30px;
+		cursor: pointer;
+	}
+	
+	.ipsSmileyTray_all {
+		display: block;
+		width: auto;
+		margin: 3px auto 0px auto;
+		text-align: center;
+		cursor: pointer;
+		font-size: 10px !important;
+	}
+	
+	
+/* ACP Specific */
+table.cke_editor td { padding: 0px !important; }]]></css_content>
+    <css_position>1</css_position>
+    <css_app>core</css_app>
+    <css_app_hide>1</css_app_hide>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
+    <css_removed>0</css_removed>
+    <css_modules/>
+    <css_master_key>root</css_master_key>
+  </cssfile>
+  <cssfile>
+    <css_set_id>0</css_set_id>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_common</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services 	*/
@@ -193,19 +451,19 @@ strong.bbc				{	font-weight: bold !important; }
 em.bbc 					{	font-style: italic !important; }
 span.bbc_underline 		{ 	text-decoration: underline !important; }
 acronym.bbc 			{ 	border-bottom: 1px dotted #000; }
-span.bbc_center, div.bbc_center	{	text-align: center; display: block; }
-span.bbc_left, div.bbc_left		{	text-align: left; display: block; }
-span.bbc_right , div.bbc_right	{	text-align: right; display: block; }
+span.bbc_center, div.bbc_center, p.bbc_center	{	text-align: center; display: block; }
+span.bbc_left, div.bbc_left, p.bbc_left	{	text-align: left; display: block; }
+span.bbc_right, div.bbc_right, p.bbc_right	{	text-align: right; display: block; }
 div.bbc_indent 			{	margin-left: 50px; }
 del.bbc 				{	text-decoration: line-through !important; }
-ul.bbc 					{	list-style: disc outside; margin-left: 30px; }
+ul.bbc 					{	list-style: disc outside; margin: 12px 0 12px 40px; }
 	ul.bbc ul.bbc 			{	list-style-type: circle; }
 		ul.bbc ul.bbc ul.bbc 	{	list-style-type: square; }
-ul.bbcol.decimal 				{ margin-left: 30px; list-style-type: decimal; }
-	ul.bbcol.lower-alpha		{ margin-left: 30px; list-style-type: lower-alpha; }
-	ul.bbcol.upper-alpha		{ margin-left: 30px; list-style-type: upper-alpha; }
-	ul.bbcol.lower-roman		{ margin-left: 30px; list-style-type: lower-roman; }
-	ul.bbcol.upper-roman		{ margin-left: 30px; list-style-type: upper-roman; }
+ul.bbcol.decimal 				{ margin: 12px 0 12px 40px; list-style-type: decimal; }
+	ul.bbcol.lower-alpha		{ margin-left: 40px; list-style-type: lower-alpha; }
+	ul.bbcol.upper-alpha		{ margin-left: 40px; list-style-type: upper-alpha; }
+	ul.bbcol.lower-roman		{ margin-left: 40px; list-style-type: lower-roman; }
+	ul.bbcol.upper-roman		{ margin-left: 40px; list-style-type: upper-roman; }
 hr.bbc 					{ 	display: block; border-top: 2px solid #777; }
 div.bbc_spoiler 		{	 }
 div.bbc_spoiler span.spoiler_title	{ 	font-weight: bold; }
@@ -213,88 +471,117 @@ div.bbc_spoiler_wrapper	{ 	border: 1px inset #777; padding: 4px; }
 div.bbc_spoiler_content	{ 	 }
 input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0px; }
 pre.prettyprint 		{ padding: 5px; background: #f8f8f8; border: 1px solid #c9c9c9; overflow: auto; margin-left: 10px; font-size: 11px; line-height: 140%; }
-.bbc_member, .bbc_url, .bbc_email	{	color: inherit; }
+img.bbc_img { cursor: pointer; }
+.signature img.bbc_img { cursor: default; }
 
 /* Quote boxes */
+
 p.citation {
-	background: #d3e9dc url({style_images_url}/citation_bg.png) no-repeat right;
-	color: #2b3730;
-	font-size: 0.9em;
-	font-weight: bold;
-	border-width: 1px 1px 0 3px;
-	border-style: solid;
-	border-color: #6fa987;
-	padding: 5px 8px;
-}
-
-	div.blockquote {
-		background: #f3f9f6;
-		font-size: 0.9em;
-		border-width: 1px 1px 1px 3px;
-		border-style: solid;
-		border-color: #6fa987;
-		margin: 0px;
-		margin-top: 0px;
-	}
-
-		div.blockquote p.citation {
-			background-color: #e5d2e9;
-			color: #413544;
-			border-color: #ae7eb9;
-		}
-		
-		div.blockquote div.blockquote {
-			background: #f9f5fa;
-			font-size: 1em;
-			border-color: #ae7eb9;
-			margin: -0px 15px 0px 15px;
-		}
-
-			div.blockquote div.blockquote p.citation {
-				background-color: #e9e7d1;
-				color: #474534;
-				border-color: #b2ab72;
-			}
-
-			div.blockquote div.blockquote div.blockquote {
-				background: #f9f8f3;
-				border-color: #b2ab72;
-			}
-			
-			div.blockquote p.citation {
-				margin: 6px 15px 0 15px;
-				font-size: 1em;
-			}
-
-div.quote {
-	padding: 12px;
-} 
-
-div.quote p.blockquote {
-	margin-left: -12px;
-}
-
-cite {
-	display: block;
+	font-size: 12px;
+	padding: 8px 10px;
+	border-left: 2px solid #989898;
+	/*background: #f3f3f3 */
+	background: #f6f6f6;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+	border-top: 2px solid #e5e5e5;
+	border-right: 2px solid #e5e5e5;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
 	font-weight: bold;
 }
 
-	blockquote cite {
-		font-size: 1em;
-	}]]></css_content>
+div.blockquote {
+	font-size: 12px;
+	padding: 10px;
+	border-left: 2px solid #989898;
+	border-right: 2px solid #e5e5e5;
+	border-bottom: 2px solid #e5e5e5;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	background: #f7f7f7;
+}
+
+div.blockquote div.blockquote {
+	margin: 0 10px 0 0;
+}
+
+div.blockquote p.citation {
+	margin: 6px 10px 0 0;
+}
+
+._sharedMediaBbcode {
+	width: 500px;
+	background: #f6f6f6;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+	border: 1px solid #dbdbdb;
+	-moz-box-shadow: 0px 1px 3px rgba(255,255,255,1) inset, 0px 1px 1px rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0px 1px 3px rgba(255,255,255,1) inset, 0px 1px 1px rgba(0,0,0,0.2);
+	box-shadow: 0px 1px 3px rgba(255,255,255,1) inset, 0px 1px 2px rgba(0,0,0,0.2);
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	color: #616161;
+	display: inline-block;
+	margin-right: 15px;
+	margin-bottom: 5px;
+	padding: 15px;
+}
+
+.bbcode_mediaWrap .details {
+	display: inline-block;
+	color: #616161;
+	font-size: 12px;
+	line-height: 1.5;
+	float: left;
+	margin-left: 30px;
+}
+
+.bbcode_mediaWrap .details a {
+	color: #616161;
+	text-decoration: none;
+}
+
+.bbcode_mediaWrap .details h5, .bbcode_mediaWrap .details h5 a {
+	font: 400 20px/1.3 "Helvetica Neue", Helvetica, Arial, sans-serif;
+	color: #2c2c2c;
+	word-wrap: break-word;
+	max-width: 420px;
+}
+
+.bbcode_mediaWrap img.sharedmedia_image {
+	float: left;
+	position: relative;
+	top: 10px;
+	left: 10px;
+}
+
+.bbcode_mediaWrap img.sharedmedia_screenshot {
+	float: left;
+	position: relative;
+	top: 10px;
+	left: 10px;
+	max-width: 80px;
+}
+
+/* Show my media label */
+.cke_button_ipsmedia span.cke_label {
+	display: inline !important;
+}]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
     <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_editor</css_group>
     <css_content><![CDATA[/***************************************************************/
 /* IP.Board 3 Editor CSS                                       */
@@ -305,6 +592,12 @@ cite {
 /* ipb_editor.css - Styles for the editor (colors in main css) */
 /***************************************************************/
 
+
+/*********************************************************/
+/* 	THESE STYLES ARE FOR THE LEGACY RTE EDITOR.			 */
+/* 	THIS EDITOR IS DEPRECATED; THESE STYLES ARE LOADED	 */
+/* 	ONLY ON DEMAND FOR LEGACY PURPOSES.					 */
+/*********************************************************/
 #ipboard_body .input_rte {
 	width: 100%;
 	height: 250px;
@@ -555,17 +848,15 @@ cite {
 }]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_app_hide>1</css_app_hide>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_help</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services 	*/
@@ -585,9 +876,7 @@ cite {
 /************************************************************************/
 /*  HELP & PORTAL STYLES */
 	
-#help_topics {
-	border: 1px solid #d5dde5;
-}
+#help_topics { border: 1px solid #c9c9c9; }
 
 #help_topics li {
 	background-image: url({style_images_url}/help.png);
@@ -597,14 +886,9 @@ cite {
 	margin-bottom: 2px;
 }
 
-	#help_topics li h3 {
-		padding: 2px 0 0 0;
-	}
+	#help_topics li h3 { padding: 2px 0 0 0; }
 
-.help_doc {
-	padding: 10px;
-	border: 1px solid #d5dde5;
-}
+.help_doc {	border: 1px solid #c9c9c9; }
 	#help_topics .help_doc ul,
 	#help_topics .help_doc ol {
 		padding: 8px 0;
@@ -613,36 +897,33 @@ cite {
 	#help_topics .help_doc li {
 		background: none;
 		padding: 2px;
-	}]]></css_content>
+	}
+	.help_doc .input_submit { background: #dfdfdf; border: 0 !important; color: #000;	font-weight: bold; font-size: inherit; padding: 1px 4px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
+		.help_doc .input_submit:hover { color: #000 }]]></css_content>
     <css_position>0</css_position>
     <css_app>core</css_app>
     <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules>help</css_modules>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_ie</css_group>
     <css_content><![CDATA[/********************************************/
 /* IE6 SPECIFIC */
 /********************************************/
 #header { _height: 1%; }
-h1, #content_jump {	_display: none; }
-#search { _position: absolute; _right: 0px; _width: 300px; }
 #primary_nav ul li.active {	_margin-bottom: -2px; }
 #user_navigation { _width: 250px }
 
-/* remove background images from annoying places */
+
 .maintitle, #footer_utilities, #ipboard_body .ips_editor .toolbar, #admin_bar {	_background-image: none !important; }
 
 h2.maintitle{ _overflow:visible; _height:1% }
 
-/* hasLayout bug */
 .statistics, #footer_utilities, #ipboard_body .ips_editor .controls, .member_entry, #search_results li { _height: 100%; }
 
 #footer_utilities form, .rep_bar { _width: 1%; }
@@ -664,97 +945,17 @@ h2.maintitle{ _overflow:visible; _height:1% }
 
 /*******************************************/
 /* <= IE7 */
-	#search label,
-	#search input,
-	#search #adv_search {
-		float: left !important;
-	}
-	
-	#search .submit_input {
-		font-size: 1.1em;
-		padding: 2px;
-	}
-	
-#ipboard_body .input_submit {
-	padding: 2px 5px;
-	font-size: 90%;
-}
 
-#ipboard_body .tab_bar li.active {
-	margin-top: -5px;
-}
+/* general fixes */
+.ipsList_inline li { zoom: 1; display: inline; }
+.clearfix { height: 1%; }
+table.ipb_table h4 { display: inline; zoom: 1 }
 
-#ipboard_body .popupWrapper {
-	padding-top: 6px;
-}
-
-#ipboard_body .ipb_palette {
-	min-width: 130px;
-	max-width: 255px;
-}
-
-#ipboard_body .emoticons_palette {
-	max-width: 400px;
-}
-
-#ipboard_body #header {
-	z-index: 2001 !important;
-	/* must be at least 1 higher than #pm_notification */
-}
-
-#ipboard_body .report_comment .post_wrap {
-	height: 1%;
-}
-
-#ipboard_body .report_menu {
-	position: static !important;
-	float: left !important;
-}
-	
-	#ipboard_body .report_menu li {
-		float: none !important;
-		display: inline !important;
-	}
-
-#ipboard_body #conversation ul.post_controls {
-	padding-bottom: 0;
-	height: 32px;
-}
-
-#ipboard_body #topic_mod_2 {
-	padding-top: 10px;
-	margin-top: -5px;
-}
-table.ipb_table ol.subforums li {
-	white-space: nowrap !important;
-}
-
-.emote {
-	padding: 5px;
-}
-
-.rep_bar { 
-	width: 8%;
-}
-
-p.rep_highlight {
-	margin-right: 10px;
-}
-
-.post_block {
-	zoom: 1;
-}
-
-
-pre.prettyprint { padding: 5px 5px 20px 5px; }
-
-#ipboard_body .input_rte {
-		/* margin-top: -191px; 200px - 8px margin - 1px border */
-}
-
-#ucp_notes {
-	margin-left: -190px !important;
-}
+/* header fixes */
+#search_wrap { width: 230px }
+#search {display: inline; zoom: 1; }
+#main_search { float: left; margin-top: 5px; }
+#logo { float: left; }
 
 /***********************************/
 /* Gallery IE fixes 			   */
@@ -763,8 +964,7 @@ pre.prettyprint { padding: 5px 5px 20px 5px; }
 	display: block;
 }
 
-.gallery_block, .image_wrap, .image_view_wrap, .gallery_view .gallery_tools li,
-.gallery_category, .gallery_filter a {
+.gallery_block, .image_wrap, .image_view_wrap {
 	display: inline;
 	zoom: 1;
 }
@@ -772,6 +972,11 @@ pre.prettyprint { padding: 5px 5px 20px 5px; }
 .gallery_row .gallery_block .wrap .pinned,
 .gallery_row .gallery_block .wrap .image_mod {
 	width: 20px;
+}
+
+.note_fill {
+	width: 98.5%;
+	height: 98.5%;
 }]]></css_content>
     <css_position>0</css_position>
     <css_app>core</css_app>
@@ -779,13 +984,11 @@ pre.prettyprint { padding: 5px 5px 20px 5px; }
     <css_attributes/>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_login_register</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
@@ -793,85 +996,28 @@ pre.prettyprint { padding: 5px 5px 20px 5px; }
 /* ipb_login_register.css - Login & Registration styles					*/
 /************************************************************************/
 
-div#register_info {
-	width: 30%;
-}
-div#register_form {
-	width: 66%;
+#register_form { 
+	width: 70%;
+	margin: 0 auto;
 }
 
-	div#register_form h2 {
-		clear: none;
-	}
+#register_submit { margin-left: 200px; }
+#register_form #save_time { color: #136db5; }
+#register_form hr, #login_form hr {
+	display: block;
+	width: 95%;
+	border: 1px solid #ebebeb;
+	border-width: 1px 0 0 0;
+	clear: both;
+	margin: 10px auto;
+}
 
-	div#register_form h3,
-	div#login_form h3 {
-		padding: 5px;
-		margin-bottom: 10px;
-	}
+#captcha .ipsField_title { padding-right: 0px; }
+#captcha.recaptcha .ipsField_content { margin-left: 193px; }
+#tou_popup { height: 250px !important; overflow: auto; }
 
-	div#register_form fieldset {
-		margin-bottom: 10px;
-	}
+#register_form .f { margin: 4px 12px 4px 0; display: inline-block; vertical-align: middle; }
 
-	div#register_form p.extra {
-		margin-bottom: 15px;
-		line-height: 150%;
-	}
-
-	div#register_form .field.nodesc {
-		padding-bottom: 26px;
-		clear: both;
-	}
-
-	div#register_form label {
-		text-align: right;
-		padding-right: 15px;
-		width: 200px;
-		float: left;
-		clear: both;
-	}
-
-	div#register_form .checkbox label,
-	div#register_form .field.radio input {
-		float: none;
-		width: auto;
-		clear: none;
-		text-align: left;
-	}
-
-	div#register_form .checkbox input {
-		margin-left: 245px;
-		clear: both;
-	}
-		
-	div#register_form input {
-		float: left;
-	}
-
-	div#register_form fieldset.submit input {
-		float: none;
-	}
-
-	div#register_form input.input_text {
-		padding-bottom: 2px;
-	}
-	
-	div#register_form hr,
-	div#login_form hr {
-		display: block;
-		width: 95%;
-		border: 1px solid #ebebeb;
-		border-width: 1px 0 0 0;
-		clear: both;
-		margin: 10px auto 10px auto;
-	}
-	
-	div#register_form span.desc {
-		margin-left: 215px;
-		display: block;
-		clear: both;
-	}
 	
 .reg_msg {	
 	color: #fff;
@@ -894,28 +1040,10 @@ div#register_form {
 		background-color: #6f8f52;
 	}
 
-div#login_form {
-	width: 80%;
-	margin: 0 auto 25px auto;
-}
+#login_form { width: 70%; margin: 0 auto; }
+#other_signin { width: 35%; }
 
-div#member_login {
-	width: 65%;
-}
-
-div#guest_register {
-	width: 30%;
-}
-
-div#member_login form {
-	margin: 0 0px 0 0;
-}
-
-div#login_form h3 {
-	font-size: 1.1em;
-}
-
-div#member_login .extra {
+#member_login .extra {
 	font-size: 0.8em;
 	color: #69727b;
 	padding: 5px;
@@ -923,120 +1051,39 @@ div#member_login .extra {
 	float: right;
 }
 
-input#openid {
-	background-image: transparent url({style_images_url}/openid.gif) no-repeat 2px 2px;
-	padding: 3px 3px 3px 20px;
-	margin-top: -2px;
-}
-
-#regular_signin, #openid_signin {
-	height: 165px;
-}
-
-#signin_options {
-	padding-left: 30px;
-}
-
-#facebookComplete
-{
-	min-height: 55px;
-}
-
-#facebookComplete img.userpic {
-	float: left;
-	width: 50px;
-	height: 50px;
-}
-
 #facebookComplete img.servicepic {
 	float: left;
 	margin-top: -2px;
-	margin-left: -8px;
+	margin-left: -12px;
 }
 
 #facebookComplete p {
 	margin-left: 60px;
 	line-height: 150%;
-}
-
-.completeLeft
-{
-	min-height: 200px;
-	float: left;
-	width:49%;
-}
-
-.completeRight fieldset.main,
-.completeLeft div.completeInner
-{
-	height: 130px;
-	overflow: auto;
-}
-
-.completeRight
-{
-	min-height: 200px;
-	margin-left: 52%;
 }]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules>global</css_modules>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_print</css_group>
     <css_content><![CDATA[* {
 	font-family: Georgia, "Times New Roman", serif;
 }
 
-html #content {
-	font-size: 10pt;
-}
-
+html #content { font-size: 10pt; }
+h1 { margin: 0; }
 ol,ul { list-style:none; }
 
-ul.pagination {
-	margin-left: -35px;
-}
-
-ul.pagination a,
-ul.pagination li.active, 
-ul.pagination li.pagejump,
-ul.pagination li.total {
-	text-decoration: none;
-	padding: 1px 4px 1px 0px;
-	display: block;
-}
-
-ul.pagination li {
-	font-size: 0.9em;	
-	margin: 0 2px 0 2px;
-	float: left;
-}
-
-	ul.pagination li.total,
-	ul.pagination li.active {
-		background: none;
-		border: 0;
-		margin-left: 0px;
-	}
-
-	ul.pagination li.active {
-		color: #000;
-		font-size: 1em;
-		font-weight: bold;
-	}
-	
-	ul.pagination li.pagejump {
-		display: none;
-	}
+.pagination .back, .pagination .forward { display: none; }
+.pagination .pages { padding-left: 0; }
+.pagination a { text-decoration: none; color: gray; }
 
 #admin_bar,
 #header,
@@ -1050,7 +1097,6 @@ ul.pagination li {
 #content_jump,
 .topic_buttons,
 .topic_options,
-h1,
 .post_id,
 h3 img,
 .ip,
@@ -1065,16 +1111,44 @@ hr,
 .message,
 #debug_wrapper,
 fieldset,
-.signature {
+.signature, 
+.ipsUserPhotoLink,
+.maintitle,
+.__like,
+#logo,
+#header_bar,
+#community_app_menu,
+.ipsLikeButton,
+.ipsLikeBar,
+#fast_reply_wrapper,
+.breadcrumb .right,
+.nexusad,
+#ipsDebug_footer,
+li.page, li.next, li.prev, li.last, li.first, 
+.ipsButton, .ipsButton_secondary,
+#profile_photo,
+.ipsVerticalTabbed_tabs {
 	display: none;
 }
 
-#breadcrumb {
-	display: block !important;
+.ipsUserPhotoLink {
+	display: inline-block;
 }
-	#breadcrumb li {
-		float: left;
-	}
+
+	.ipsUserPhoto_large { width: 90px; height: 90px; }
+	.ipsUserPhoto_medium { width: 50px; height: 50px; }
+	.ipsUserPhoto_mini { width: 30px; height: 30px;	}
+	.ipsUserPhoto_tiny { width: 20px; height: 20px;	}
+
+.breadcrumb {
+	display: block !important;
+	clear: both;
+	padding-left: 0;
+}
+	.breadcrumb li { float: left; }
+	.breadcrumb:after { content: ".";display: block;height: 0;clear: both;visibility: hidden;}
+	.breadcrumb a, .breadcrumb { color: gray; text-decoration: none; }
+	.breadcrumb .nav_sep { margin: 0 5px; }
 
 .topic, .hfeed {
 	clear: both;
@@ -1085,6 +1159,7 @@ fieldset,
 	border-top: 2pt solid gray;
 	line-height: 60%; 
 	padding-top: 10px;
+	position: relative;
 }
 
 .posted_info {
@@ -1092,20 +1167,17 @@ fieldset,
 	font-size: 8pt !important;
 	text-decoration: none !important;
 	padding-bottom: 3px;
-	float: right;
-	margin-top: -30px;
-}
-
-span.main_topic_title {
-	font-size: 1.7em;
-	padding-left: 2px;
+	position: absolute;
+	top: 3px;
+	right: 0px;
 }
 
 .post_block h3 {
 	display: inline !important;
 	margin: 0px 0px 10px !important;
 	padding: 0px !important;
-	float: left;
+	line-height: 11pt;
+	font-size: 11pt;
 }
 
 .post_block h3 a {
@@ -1114,10 +1186,19 @@ span.main_topic_title {
 	font-style: normal !important;
 }
 
-	.post_block .post_body a:after {
-	    content: " (" attr(href) ") ";
+	.post_block .post_body a:after { content: " (" attr(href) ") ";	}	
+	.post_block a.snapback { display: none;	}
+	
+	p.citation { 
+		margin: 0;
+		color: #7b7b7b;
+		font-style: italic;
 	}
-
+	p.citation, div.blockquote {
+		border-left: 8px solid #b4b4b4;
+		padding-left: 10px; 
+	}
+	
 .post_body {
 	line-height: 100%;
 	margin-top: 15px;
@@ -1144,20 +1225,25 @@ a img {
 abbr.published {
 	text-decoration: none !important;
 	border: 0px;
-}]]></css_content>
+}
+
+.post {
+	line-height: 1.5;
+}
+
+.ipsTag { font-style: italic; color: gray; text-decoration: none; }
+.ipsTag:after { content: ","; }]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
     <css_app_hide>0</css_app_hide>
     <css_attributes><![CDATA[media="print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_search</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
@@ -1165,89 +1251,32 @@ abbr.published {
 /* ipb_search.css - Search results styles								*/
 /************************************************************************/
 
-/* NEW STYLES */
-#main_search_form {
-	overflow: hidden;
-}
+#main_search_form .ipsBox_container { margin-bottom: 10px; }
+#main_search_form .ipsField { margin-bottom: 20px; }
 
-#main_search_form #main_search {
-	background: #2b4f74;
-	color: #fff;
-	font-size: 17px;
-	margin-bottom: 10px;
-}
-	
-	#main_search_form #main_search label {
-		width: 230px;
-	}
-	
-	#main_search_form #main_search .desc {
-		margin-left: 245px;
-		color: #9bb2c8;
-		font-size: 11px;
-	}
-	
-	#main_search_form #main_search .input_text {
-		border: 1px solid #192b40;
-		width: 550px;
-	}
-	
-#main_search_form fieldset {
-	padding: 10px;
-	font-size: 15px;
-	overflow: hidden;
-}
+.toggle_notify_on { display: none; }
+.show_notify .toggle_notify_on { display: block; }
+	.show_notify input.toggle_notify_on { display: inline; }
+.show_notify .toggle_notify_off { display: none; }	
 
-	#main_search_form #other_filters,
-	#main_search_form .extra_filter fieldset {
-		background: #fff;
-		margin: 0 10px 10px;
-		-moz-box-shadow: #e5e5e5 2px 2px 2px;
-		-webkit-box-shadow: #e5e5e5 2px 2px 2px;
-	}
- 
-#main_search_form fieldset > ul > li {
-	padding: 10px 0;
-}
-
-	#main_search_form fieldset li.no_label {
-		padding: 4px 0 10px 235px;
-		font-size: 13px;
-	}
-
-#main_search_form fieldset > ul > li > label {
-	width: 220px;
-	padding-right: 10px;
-	text-align: right;
+.notify_info span {
+	padding: 1px 8px;
+	background: #ededed;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	font-size: 10px;
+	font-weight: bold;
 	display: inline-block;
-	vertical-align: top;
 }
-
-#main_search_form fieldset .input_text {
-	border: 1px solid #b6b6b6;
-	font-size: 15px;
-	padding: 2px;
-}
-
-	#main_search_form fieldset .input {
-		width: 400px;
-	}
-
-	#main_search_form fieldset .input_text.date {
-		width: 158px;
-		padding-right: 25px;
-	}
 	
-	#main_search_form #date_start_icon,
-	#main_search_form #date_end_icon {
-		margin-left: -20px;
-	}
+	.notify_info img { vertical-align: bottom; }
 
 #main_search_form .search_app {
 	font-size: 12px;
 	display: inline-block;
-	padding: 8px 10px;
-	margin-right: 4px;
+	padding: 8px 10px 8px 0;
+	margin-right: 12px;
 	font-weight: bold;
 	border: 1px solid transparent;
 	cursor: pointer;
@@ -1256,69 +1285,25 @@ abbr.published {
 	#main_search_form .search_app.active {
 		background: #2b4f74;
 		border: 1px solid #1d3652;
+		padding-left: 10px;
 		color: #fff;
 		border-radius: 3px;
 		-moz-border-radius: 3px;
 		-webkit-border-radius: 3px;
 	}
 
-#main_search_form .app_chooser > ul {
-	margin-left: 230px;
-	margin-top: -5px;
-}
-
 #main_search_form .search_msg {
 	border-bottom: 1px solid #f0f0f0;
 	display: block;
 	font-size: 12px;
-	padding: 0 0 5px 230px;
+	padding: 0 0 5px 200px;
 	margin-bottom: 15px;
 	color: #5c5c5c;
 }
 
-/* OLD STYLES */
-/*#main_search_form {
-}
 
-#search_info {
-	font-size: 1.1em;
-}
-	
-	#search_info fieldset {
-		padding: 15px 0;
-	}
-	
-	#search_info fieldset li {
-		padding: 10px 0 15px 0;
-		margin-left: 20px;
-	}
-
-	#search_info fieldset label {
-		text-align: right;
-		padding-right: 10px;
-		width: 20%;
-		float: left;
-	}
-	
-	#search_info fieldset .input_text {
-		width: 60%;
-	}
-	
-	#search_info fieldset .input_text.date {
-		width: 20%;
-	}
-	
-	#search_info fieldset.extra_filter {
-		border-top: 1px solid #d5dde5;
-	}
-	
-	#search_info .input_select {
-		width: 40%;
-	}
-	*/
 div#search_results {
 	border-bottom: 4px solid #d5dde5;
-	margin-bottom: 8px;
 }	
 	
 	div#search_results span.icon {
@@ -1416,58 +1401,68 @@ div#search_results {
 	text-decoration: none;
 	font-size: 12px;
 }
-.entry-content.search {
-	/*height: 200px;
-	overflow:auto;*/
+.entry-content.search {}
+
+/* These styles are duplicated Rikki, putting a note as requested */
+
+.search_filter_container {
+	height: 440px;
+	max-height: 440px;
+}
+.search_filter_container ul.block_list {
+	height: 396px; overflow: auto;
+}
+.search_filter_container ul.block_list > li {
+	padding: 0px;
 }
 
-.col_f_icon {
-	width: 1%;
+.search_filter_container ul.block_list > li span {
+	padding: 3px 10px 3px 25px;
+	display: block;
 }
 
-.col_f_topic {
-	width: 39%;
+	.search_filter_container ul.block_list li span.heading {
+		font-weight: bold;
+	}
+
+.search_filter_container ul.block_list li.active span {
+	background: #af286d url({style_images_url}/icon_check_white.png ) no-repeat 6px 8px;
+	color: #fff;
+	font-weight: bold;
 }
 
-.col_f_starter {
-	width: 10%;
-}
-
-.col_f_views {
-	width: 5%;
-}
-
-.col_f_post {
-	width: 15%;
+#vnc_filter_popup_close { 
+	text-align: center;
+	position: absolute;
+	bottom: 0; left: 0;	right: 0;
+	height: 42px;
+	line-height: 42px;
+	padding: 0 5px;
+	background: #DBE4EF;
+	background: -moz-linear-gradient(top, #DBE4EF 0%, #c7d4e4 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#DBE4EF), color-stop(100%,#c7d4e4)); /* webkit */
+	-webkit-box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	-moz-box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	border-top: 1px solid #DBE4EF;
 }]]></css_content>
     <css_position>2</css_position>
     <css_app>core</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules>search</css_modules>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_styles</css_group>
     <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services 	*/
 /************************************************************************/
 /* ipb_styles.css														*/
 /************************************************************************/
-/*
-	[ color ]
-	[ font ]
-	[ borders ]
-	[ padding ]
-	[ margin ]
-	[ sizing ]
-	[ other ]
-*/
 
 /************************************************************************/
 /* RESET (Thanks to YUI) */
@@ -1485,164 +1480,210 @@ hr { display: none; }
 address{ display: inline; }
 
 /************************************************************************/
-/* ELEMENT STYLES */
+/* CORE ELEMENT STYLES */
+
+html, body { /* Safari has trouble with bgcolor on body. Apply to html tag too. */
+	background-color: #d8dde8;
+	color: #5a5a5a;
+}
 
 body {
-	background: #fff;
-	color: #1c2837;
-	font: normal 13px arial, verdana, tahoma, sans-serif;
+	font: normal 13px helvetica, arial, sans-serif;
 	position: relative;
 }
 
-h3, h4, h5, h6, strong { font-weight: bold; }
+input, select {
+	font: normal 13px helvetica, arial, sans-serif;
+}
+
+h3, strong { font-weight: bold; }
 em { font-style: italic; }
 img, .input_check, .input_radio { vertical-align: middle; }
 legend { display: none; }
 table { width: 100%; }
 td { padding: 3px; }
 
-h2 {
-	font-size: 1.6em;
-	font-weight: normal;
-	margin: 0 0 8px 0;
-	clear: both;
-}
 
-body h3 {
-	font-weight: bold;
-	font-size: 1.1em;
-	padding: 5px 8px 3px 8px;
-	color: #1d3652;
-}
-
-	h3 img {
-		margin-top: -2px;
-	}
-	
-	h3 a {
-		text-decoration: none;
-	}
-	
 a {
-	color: #284b72;
+	color: #225985;
+	text-decoration: none;
 }
 
-	a:hover {
-		color: #528f6c;
-		text-decoration: underline;
-	}
+	a:hover { color: #328586; }
 
-#copyright { float: right; }
-	#copyright a { text-decoration: none; }
-	#copyright a:hover { text-decoration: underline; }
 	
+/************************************************************************/
+/* LISTS */
+
+.ipsList_inline > li {
+	display: inline-block;
+	margin: 0 3px;
+}
+	.ipsList_inline > li:first-child { margin-left: 0; }
+	.ipsList_inline > li:last-child { margin-right: 0; }
+	.ipsList_inline.ipsList_reset > li:first-child { margin-left: 3px; }
+	.ipsList_inline.ipsList_reset > li:last-child { margin-right: 3px; }
+	.ipsList_inline.ipsList_nowrap { white-space: nowrap; }
+	
+.ipsList_withminiphoto > li { margin-bottom: 8px; }
+.ipsList_withmediumphoto > li .list_content { margin-left: 60px; }
+.ipsList_withminiphoto > li .list_content { margin-left: 40px; }
+.ipsList_withtinyphoto > li .list_content { margin-left: 30px; }
+.list_content { word-wrap: break-word; }
+
+.ipsList_data li { margin-bottom: 6px; line-height: 1.3; }
+.ipsList_data .row_data { display: inline-block; word-wrap: break-word; max-width: 100%; }
+.ipsList_data .row_title, .ipsList_data .ft {
+	display: inline-block;
+	float: left;
+	width: 120px;
+	font-weight: bold;
+	text-align: right;
+	padding-right: 10px;
+}
+
+.ipsList_data.ipsList_data_thin .row_title, .ipsList_data.ipsList_data_thin .ft {
+	width: 80px;
+}
+
+/************************************************************************/
+/* TYPOGRAPHY */
+
+.ipsType_pagetitle, .ipsType_subtitle {
+	font: 300 26px/1.3 Helvetica, Arial, sans-serif;
+	color: #323232;
+}
+.ipsType_subtitle { font-size: 18px; }
+.ipsType_sectiontitle { 
+	font-size: 16px;
+	font-weight: normal;
+	color: #595959;
+	padding: 5px 0;
+	border-bottom: 1px solid #ececec;
+}
+
+.ipsType_pagedesc {
+	color: #7f7f7f;
+	line-height: 1.5;
+}
+
+.ipsType_pagedesc a { text-decoration: underline; }
+
+.ipsType_textblock { line-height: 1.5; color: #282828; }
+
+.ipsType_small { font-size: 12px; }
+.ipsType_smaller, .ipsType_smaller a { font-size: 11px !important; }
+
+.ipsReset { margin: 0px !important; padding: 0px !important; }
+
+/************************************************************************/
+/* LAYOUT */
+#content, .main_width {
+	margin: 0 auto;
+	/* Uncomment for fixed */
+	/*width: 980px;*/
+	/* Fluid */
+	width: 87% !important;
+   	min-width: 960px;
+}
+
+#branding, #header_bar, #primary_nav { min-width: 980px; }
+/*#header_bar .main_width, #branding .main_width, #primary_nav .main_width { padding: 0 10px; }*/
+
+
+#content {
+	background: #fff;
+	padding: 10px 10px;
+	line-height: 120%;
+	-webkit-box-shadow: 0 5px 9px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 5px 9px rgba(0,0,0,0.1);
+	box-shadow: 0 5px 9px rgba(0,0,0,0.1);
+}
+
 /************************************************************************/
 /* COLORS */
 
-.row1, .row1 td, .post_block.row1 {
-	background-color: #fafbfc; /* Very light blue */
-}
 
-	.row1 .altrow, .row1.altrow,
-	.personal_info, .general_box {
-		background-color: #eef3f8; /* Slightly darker than row1 */
-	}
+.row1, .post_block.row1 {	background-color: #fff;  }
+
+
+.row2, .post_block.row2 { 	background-color: #f1f6f9; }
+
+
+
+.unread 				{	background-color: #f7fbfc; }
+
+
+.unread .altrow, .unread.altrow { background-color: #E2E9F0; }
+
+/* primarily used for topic preview header */
+.highlighted, .highlighted .altrow { background-color: #d6e4f0; }
+
+
+.ipsBox { background: #ebf0f3; }
 	
-.row2, .row2 td, .post_block.row2,
-.message {
-	background-color: #f1f4f7; /* Light blue */
-}
-
-	.row2 .altrow, .row2.altrow,
-/*	ul.post_controls,*/
-	ul.topic_moderation {
-		background-color: #e4ebf2; /* Slightly darker than row2 */
-	}
-	
-.moderated, body .moderated td,
-.moderated td.altrow, .post_block.moderated,
-body td.moderated, body td.moderated {
-	background-color: #f2e4e7; /* Light red */
-}
-
-	.moderated, .moderated a {
-		color: #6f3642;
+	.ipsBox_notice, .ipsBox_highlight {
+		background: #f4fcff;
+		border-bottom: 1px solid #cae9f5;
 	}
 
-body .maintitle {
-	background: #1d3652 url({style_images_url}/gradient_bg.png) repeat-x left 50%;
-	color: #fff;
-}
+/* mini badges */
+a.ipsBadge:hover { color: #fff; }
+
+.ipsBadge_green { background: #7ba60d; }
+.ipsBadge_purple { background: #af286d; }
+.ipsBadge_grey { background: #5b5b5b; }
+.ipsBadge_lightgrey { background: #b3b3b3; }
+.ipsBadge_orange { background: #ED7710; }
+.ipsBadge_red {	background: #bf1d00; }
 
-	body .maintitle a {
-		color: #fff;
-	}
-	
-ul.post_controls,
-div.post_controls {
-	background-color: #e4ebf3;
-}
 
-/* Bar */
 .bar {
-	background: #d5dde5 url({style_images_url}/gradient_bg.png) repeat-x 50%;
+	background: #eff4f7;
+	padding: 8px 10px;
 }
 	
-	.altbar {
+	.bar.altbar {
 		background: #b6c7db;
 		color: #1d3652;
 	}
 
-/* Table column headers */
+
 .header {
 	background: #b6c7db;
 	color: #1d3652;
 }
 
+	
 	body .ipb_table .header a,
 	body .topic_options a {
 		color: #1d3652;
 	}
+	
 
-/* General block */
-.general_box {
-	background-color: #eef3f8;
-	border: 1px solid #d5dde5;
-	border-bottom: 4px solid #d5dde5;
-	padding: 10px;
-}
-
-	.general_box h3 {
-		background: #d5dde5;
-		color: #1d3652;
-	}
-
-/* Post background */
 .post_block {
-	background: #fafbfc;
-	border-bottom: 6px solid #B5C0CF;
+	background: #fff;
+	border-bottom: 1px solid #D6E2EB;
 }
 
-.post_block h3 {
-	background: #d5dee5;
-}
+.post_body .post { color: #282828; }
 
-/* Post screen background */
-div.post_form fieldset {
-	background-color: #f1f4f7;
+.bbc_url, .bbc_email {
+	color: #0f72da;
+	text-decoration: underline;
 }
 
 /* Dates */
 .date, .poll_question .votes {
-	color: #a9a9a9;
-	font-size: 0.8em;
+	color: #747474;
+	font-size: 11px;
 }
 
-/* "No Messages" message */
+
 .no_messages {
 	background-color: #f6f8fa;
 	color: #1c2837;
-	padding: 25px 30px;
+	padding: 15px 10px;
 }
 
 /* Tab bars */
@@ -1653,62 +1694,19 @@ div.post_form fieldset {
 
 	.tab_bar li.active {
 		background-color: #243f5c;
+		color: #fff;
 	}
 	
 	.tab_bar.no_title.mini {
 		border-bottom: 8px solid #243f5c;
 	}
-	
-/* Filter & moderation bars */
-.filter_bar {
-	background-color: #1d3652;
-	color: #d5dde5;
-}
-	
-	.filter_bar a, .filter_bar label {
-		color: #d5dde5;
-	}
-	
-.moderation_bar {
-	background: #d5dde5;
-}
-
-/* Comments */
-.comment_wrap .comment.by_author,
-.comment_wrap .comment.by_author.row1 {
-	background: #f2f8f5;
-	border-top: 1px solid #528f6c;
-	border-bottom: 1px solid #528f6c;
-}
-
-.comment_wrap .comment.row1 {
-	border-top: 1px solid #d5dde5;
-	border-bottom: 1px solid #d5dde5;
-}
-
-.comment_wrap .comment.draft {
-	border-top: 1px solid #d5dde5;
-	border-bottom: 1px solid #d5dde5;
-	background: #f6ecee;
-}
-
-/* Topic prefix */
-.topic_prefix {
-	background-color: #daede2;
-	color: #528f6c;
-}
-
-/* Toggle for the sidebar */
-.sidebar_toggle {
-	background-color: #d5dde5;
-}
 
 /* Menu popups */
 .ipbmenu_content, .ipb_autocomplete {
-	background-color: #eef3f8;
+	background-color: #f7f9fb;
 	border: 1px solid #d5dde5;
-	-webkit-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
-	box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
+	-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0px 6px 6px;
+	box-shadow: rgba(0, 0, 0, 0.3) 0px 6px 6px;
 }
 
 	.ipbmenu_content li, .ipb_autocomplete li {
@@ -1719,757 +1717,561 @@ div.post_form fieldset {
 			background: #d5dde5;
 		}
 		
+	.ipbmenu_content a:hover { background: #d5dde5; }
+		
 /* Forms */
+
 .input_submit {
-	background-color: #1d3652;
+	background: #212121 url({style_images_url}/topic_button.png ) repeat-x top;
 	color: #fff;
-	border-color: #4f7298 #113051 #113051 #4f7298;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-moz-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	border-color: #212121;
 }
 
-	.input_submit:hover {
-		background: #2e4968;
-	}
+	.input_submit:hover { color: #fff; }
+	
 	
 	.input_submit.alt {
-		background-color: #eef3f8;
-		border-color: #fafbfc #bfcbd8 #bfcbd8 #fafbfc;
-		color: #1d3652;
+		background: #e2e9f0;
+		border-color: #dae2ea;
+		color: #464646;
+		-moz-box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
+		-webkit-box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
+		box-shadow: inset 0 1px 0 0 #eff3f8, 0px 2px 3px rgba(0,0,0,0.2);
 	}
 	
-		.input_submit.alt:hover {
-			background: #e4ebf2;
-			color: #1d3652;
-		}
+		.input_submit.alt:hover { color: #464646; }
 
 	.input_submit.delete {
-		background-color: #ad2930;
+		background: #ad2930;
 		border-color: #C8A5A4 #962D29 #962D29 #C8A5A4;
 		color: #fff;
+		-moz-box-shadow: inset 0 1px 0 0 #C8A5A4, 0px 2px 3px rgba(0,0,0,0.2);
+		-webkit-box-shadow: inset 0 1px 0 0 #C8A5A4, 0px 2px 3px rgba(0,0,0,0.2);
+		box-shadow: inset 0 1px 0 0 #C8A5A4, 0px 2px 3px rgba(0,0,0,0.2);
 	}
 	
-		.input_submit.delete:hover {
-			background: #bf3631;
-			color: #fff;
-		}
+		.input_submit.delete:hover { color: #fff; }
+
 	
 body#ipboard_body fieldset.submit,
 body#ipboard_body p.submit {
-	background-color: #d5dde5;
+	background-color: #d1ddea;
+}
+
+/* Moderated styles */
+.moderated, body .moderated td, .moderated td.altrow, .post_block.moderated,
+body td.moderated, body td.moderated {
+	background-color: #f8f1f3;
+}
+	
+	.post_block.moderated { border-color: #e9d2d7; }	
+	.moderated .row2 { background-color: #f0e0e3; }
+	.moderated, .moderated a { color: #6f3642; }
+	
+body#ipboard_body.redirector {
+	background: #fff !important;
 }
 
 /************************************************************************/
 /* HEADER */
 
-h1, #content_jump {
-	text-indent: -9999px;
-	height: 0px;
-	width: 0px;
+#header_bar {
+	background: #323232 url({style_images_url}/user_navigation.png ) repeat-x bottom;
+	padding: 0;
+	text-align: right;
+}
+	
+#admin_bar { font-size: 11px; line-height: 36px; }
+#admin_bar li.active a { color: #fc6d35; }
+#admin_bar a { color: #8a8a8a; }
+	#admin_bar a:hover { color: #fff; }
+
+#user_navigation { color: #9f9f9f; font-size: 11px; }
+#user_navigation a { color: #fff; }
+#user_navigation .ipsList_inline li { margin: 0;} /* remove spacing from default ipsList_inline */
+
+#user_navigation.not_logged_in {
+	height: 26px; padding: 6px 0 4px;
 }
 
-#header {
+#user_link {
+	font-size: 12px;
+	color: #fff;
+	padding: 0 12px;
+	height: 36px;
+	line-height: 36px;
+	display: inline-block;
+	margin-right: 15px;
+	outline: 0;
+}
+	
+	#user_link_dd {
+		display: inline-block;
+		width: 9px; height: 5px;
+		background: url({style_images_url}/header_dropdown.png ) no-repeat left;
+	}
+	
+	#user_link:hover, #notify_link:hover, #inbox_link:hover { background-color: #323232; }
+
+#user_link_menucontent #links li { 
+	width: 50%;
+	float: left;
+	margin: 3px 0;
+	text-shadow: 0px 1px 0 rgba(255,255,255,1);
+	white-space: nowrap;
+}
+
+
+#user_link.menu_active {
+	background: #fff;
+	color: #323232;
+}
+	
+	#user_link.menu_active #user_link_dd { background-position: right; }
+	#user_link_menucontent #statusForm { margin-bottom: 15px; }
+	#user_link_menucontent #statusUpdate {	margin-bottom: 5px; }
+	
+#user_link_menucontent > div {
+	margin-left: 15px;
+	width: 265px;
+	text-align: left;
+}
+
+#statusSubmitGlobal { margin-top: 3px; }
+
+#user_link.menu_active, #notify_link.menu_active, #inbox_link.menu_active {
+	background-position: bottom;
+	background-color: #fff;
+	-moz-border-radius: 3px 3px 0 0;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	border-radius: 3px 3px 0 0;
+}
+
+#notify_link, #inbox_link {
+	vertical-align: middle;
+	width: 18px;
+	height: 15px;
+	padding: 13px 24px 9px 12px;
 	position: relative;
 }
+	
+#notify_link { background: url({style_images_url}/icon_notify.png ) no-repeat top; }
+#inbox_link { background: url({style_images_url}/icon_inbox.png ) no-repeat top; }
+
+
+#user_navigation #register_link { 
+	background: #7ba60d; 
+	color: #fff;
+	display: inline-block;
+	padding: 3px 8px;
+	border: 1px solid #7ba60d;
+	-webkit-box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2), 0px 1px 4px rgba(0,0,0,0.4);
+	-moz-box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2), 0px 1px 4px rgba(0,0,0,0.4);
+	box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2), 0px 1px 4px rgba(0,0,0,0.4);
+	text-shadow: 0px 1px 2px rgba(0,0,0,0.3);
+}
+
 
 #branding {
-	background: #1d3652 url({style_images_url}/branding_bg.png) repeat-x top;
-	min-height: 80px;
+	background: #0f3854 url({style_images_url}/branding_bg.png) repeat-x;
+	border-bottom: 1px solid #1b3759;
+	min-height: 64px;
 }
-
-#admin_bar {
-	background: #2e2e2e url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	color: #d2d2d2;
-	font-size: 0.8em;
-	padding: 7px;
-	height: 14px;
-}
-
-	#admin_bar li {
-		color: #767676;
-		padding: 0 3px 0 5px;
-	}
 	
-		#admin_bar li.active, #admin_bar li.active a {
-			color: #e74242;
-		}
-	
-/* Navigation */
+	#logo { display: inline; }
+
+
 #primary_nav {
-	background: #192b40 url({style_images_url}/primarynav_bg.png) no-repeat;
-	font-size: 0.95em;
-	border-bottom: 5px solid #528f6c;
-	padding-left: 10px;
-	height: 31px;	
+	background: #204066;
+	font-size: 13px;
+	padding: 4px 0 0 0;
 }
 
-	#primary_nav ul li, #primary_nav ul li a {
-		color: #9bb2c8;
-		text-decoration: none;
-	}
-	
-	#primary_nav ul li {
-		font-size: 0.95em;
-		padding: 8px 8px;
-		margin-left: 6px;
-	}
-	
-		#primary_nav ul li.active {
-			background: transparent url({style_images_url}/tab_left.png) no-repeat top left;
-			font-size: 1.05em;
-			font-weight: bold;
-			padding: 0;			
-			margin: -4px 0px auto 5px;
-			position: relative;		
-		}
-		
-		#primary_nav ul li.active a {
-			background: transparent url({style_images_url}/tab_right.png) no-repeat top right;
-			padding: 10px 15px 10px 10px;
-			margin-left: 6px;
-			display: block;			
-		}
-		
-	#primary_nav ul li a {
-		color: #9bb2c8;
-		text-decoration: none;
-	}
-		
-#user_navigation {
-	background: #2b4f74;
-	font-size: 0.9em;
-	border-width: 0 2px 2px 2px;
-	border-style: solid;
-	border-color: #1c334e;
-	border-radius: 0 0 6px 6px;
-	-moz-border-radius: 0 0 6px 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	position: absolute;
-	width: 284px;
-	top: 7px;
-	right: 10px;
-	float: right;
-	z-index: 9999;
-}
+	#primary_nav li { margin: 0px 3px 0 0; position: relative; }
 
-	#user_navigation .photo {
-		border: 1px solid #1d3652;
-		margin: 6px 10px 6px 6px;
-		float: left;
-	}
 	
-	#user_info {
-		margin-left: 60px;
-		margin-right: 15px;
-	}
-	
-	/* Sign in services icons (Facebook, twitter, etc) */
-	.services img { margin-top: -2px }
-	
-	#user_navigation p {
-		color: #d9e3ed;
-		margin-top: 6px;
-		white-space: nowrap;
-	}
-	
-		#user_navigation p a {
-			color: #a1bad3;
-		}
-		
-	#user_navigation #new_msg_count {
-		background-color: #528f6c;
-		font-weight: bold;
-		font-size: 0.9em;
-		padding: 3px 7px;
-		top: 0px;
-		left: 45px;
-		position: absolute;
-	}
-		
-		#user_navigation ul {
-			font-size: 0.88em;
-			margin-top: 4px;
-		}
-			#user_navigation ul a {
-				color: #d5dde5;
-			}
-			
-			#user_navigation ul#user_other {	
-				margin-left: 0px;
-				top: 35px;
-				position: absolute;
-			}
-			
-			#user_navigation ul#user_other li {
-				float: left;
-				padding: 0 0 0 8px;
-			}
-
-	#user_navigation ul#user_link_menucontent {
-		background: #d5dde5;
-		border: 1px solid #1d3652;
-		margin-top: 0px;
-		width: 170px;		
-		float: right;
-		z-index: 10000;
-		-webkit-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
-		box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
+	#primary_nav a {
+		color: #c5d5e2;
+		background: #1c3b5f;
+		display: block;
+		padding: 6px 15px 8px;
+		text-shadow: 0px 1px 1px rgba(0,0,0,0.5);
 	}
 
-		#user_navigation ul#user_link_menucontent li {
-			padding: 1px;
-			float: none;
-		}
-
-		#user_navigation ul#user_link_menucontent a {
-			color: #1d3652;
-			text-decoration: none;
-			padding: 5px 5px 5px 15px;
-			display: block;
-		}
-
-			#user_navigation ul#user_link_menucontent a:hover {
-				background: #e4ebf2;
-			}
-			
-	#user_navigation #user_link {
-		background: #1d3652 url({style_images_url}/th_bg.png) repeat-x 50%;
-		border: 1px solid #1d3652;
-		padding: 3px 26px 3px 8px;
-		margin: 6px 5px 0px 8px;
-		min-width: 110px;
-		outline: 0px;
-		position: absolute;
-		display: inline-block;
-		overflow: hidden;
-		right: 66px;
-		height: 15px;
-	}
+		#primary_nav a:hover, #primary_nav a.menu_active { background: #173455; color: #fff; }
 	
-		#user_navigation #user_link img {
-			right: 5px;
-			top: 8px;
-			position: absolute;
-		}
-		
-		#user_navigation #user_link span {
-			display: inline-block;
-			overflow: hidden;
-			max-width:110px;
-		}
 	
-	#user_navigation.logged_in {
-		height: 63px;
-	}
-	
-	#user_navigation.not_logged_in {
-		font-size: 1em;
-		padding: 5px 15px 10px;
-	}
-
-		#user_navigation.not_logged_in .links {
-			margin: 8px 8px 0;
-			font-size: 11px;
-			display: block;
-			color: #d5dde5;
-		}
-			
-			#user_navigation.not_logged_in .links a {
-				font-weight: bold;
-			}
-			
-			#user_navigation.not_logged_in #register_link {
-				border-bottom: 1px dotted;
-			}
-			
-		#user_navigation.not_logged_in #sign_in {
-			background: #1d3652;
-			padding: 8px;
-			display: block;
-			min-width: 250px;
-			margin: 0;
-			padding-right: 8px;
-		}
-		
-			#user_navigation.not_logged_in #sign_in:hover {
-				text-decoration: underline;
-			}
-		
-		/* Notifications */
-		#user_navigation #user_notifications_link {
-			background: #1d3652 url({style_images_url}/th_bg.png) repeat-x 50%;
-			border: 1px solid #1d3652;
-			padding: 3px 17px 3px 5px;
-			margin: 6px 0 0px 0px;
-			min-width: 30px;
-			outline: 0px;
-			position: relative;
-			display: inline-block;
-			overflow: hidden;
-			float: right;
-			white-space: nowrap;
-			text-decoration: none;
-			height: 15px;
-		}
-					
-			#user_navigation #user_notifications_link img#notify-down-arrow {
-				right: 5px;
-				top: 8px;
-				position: absolute;
-			}
-
-			#user_navigation #user_notifications_link small {
-				position: relative;
-				background-color: #d5dde5;
-				color: #000;
-				font-weight: bold;
-				top: 0px;
-				right: 0px;
-				padding: 1px 4px;
-				border-radius: 4px;
-				-moz-border-radius: 4px;
-				-webkit-border-radius: 4px;
-			}
-			
-			#user_navigation #user_notifications.no-new small {
-				background-color: transparent;
-				color: #fff;
-			}
-			
-			#user_navigation #user_notifications.no-new small:hover {
-				background-color: #d5dde5;
-				color: #000;
-			}
-			
-			#user_notifications_link_menucontent {
-				border: 1px solid #1d3652;
-				margin-top: 3px;
-				min-width: 325px;		
-				float: right;
-				z-index: 10000;
-				font-size: 0.85em;
-			}
-			
-			#user_notifications_link_menucontent li {
-				padding: 5px 10px 5px 8px;
-				float: none;
-				clear: both;
-				/*border-top: thin solid #000;*/
-			}
-			
-			#user_notifications_link_menucontent li a {
-				/*text-decoration: none;*/
-			}
-			
-				#user_notifications_link_menucontent li.view-all {
-					text-align: center;
-					background-color: #d5dde5;
-					font-weight: bold;
-				}
-				
-				#user_notifications_link_menucontent li.no-notifications {
-					text-align: center;
-					font-style: italic;
-				}
-
-			#user_notifications_link_menucontent img {
-				float: left;
-				margin: 5px 7px 0 0;
-			}
-	
-				#user_notifications_link_menucontent li.notify:hover {
-					background: #e4ebf2;
-				}
-				
-				#user_notifications_link_menucontent li p {
-					display: inline;
-					margin-left: 0px;
-				}
-				
-				#user_notifications_link_menucontent li span.desc {
-					font-size: 0.8em;
-					padding-top: 2px;
-				}
-				
-			#user_notifications_link_menucontent .unread,
-			#user_notifications_link_menucontent .unread a {
-				font-weight: bold;
-			}
-		/* End notifications */
-		
-#search {
-	color: #556b85;
-	font-size: 0.85em;
-	margin: 5px 4px auto auto;	
-	position: relative;
-	right: 0px;
-	float: right;
-	z-index: 5000;
-	min-width: 260px;
-}
-
-	#search .submit_input {
-		background: #528f6c url({style_images_url}/search_icon.png) no-repeat 50%;
-		text-indent: -3000em;
-		width: 25px;
-		height: 21px;
-		border: 1px solid #1a2735;
-		padding: 0;
-		float: left;
-	}
-
-	#search input#main_search {
-		padding: 0;
-		border: 0;
-		width: 165px;
-		font-size: 11px;
-		background-color: #fff;
-	}
-	
-		#search input#main_search.inactive {
-			color: #a9a9a9;
-			font-style: italic;
-		}
-	
-	#search_wrap {
+	#primary_nav .active a {
 		background: #fff;
-		border: 1px solid #1a2735;
-		padding: 3px;
-		float: left;
-		white-space: nowrap;
+		color: #0b5794;
+		font-weight: bold;
+		margin-top: 0;
+		text-shadow: none;
+	}
+
+#quickNavLaunch span { 
+	background: url({style_images_url}/icon_quicknav.png ) no-repeat top;
+	width: 13px;
+	height: 13px;
+	display: inline-block;
+}
+#quickNavLaunch:hover span { background: url({style_images_url}/icon_quicknav.png ) no-repeat bottom; }
+#primary_nav #quickNavLaunch { padding: 6px 8px 8px; }
+
+#more_apps_menucontent {
+	background: #173455;
+	font-size: 12px;
+	border: 0;
+	min-width: 140px;
+	-moz-box-shadow: none;
+}
+	#more_apps_menucontent li { padding: 0; border: 0; float: none !important; min-width: 150px; }
+	#more_apps_menucontent a { 
+		display: block;
+		padding: 8px 10px;
+		color: #fff;
+		text-shadow: 0px 1px 1px rgba(0,0,0,0.5);
 	}
 	
-		#search .choice {
-			background: url({style_images_url}/search_expand.png) no-repeat right;
-			border-left: 1px solid #afafaf;
-			padding: 0 9px 0 7px;
-			color: #888888;
-			min-width: 60px;
-			height: 11px;
-			display: inline-block;
-		}
-		
-		#search_options_menucontent {
-			background: #fff;
-			font-size: 13px;
-			border: 1px solid #3c3c3c;
-			margin-top: 4px;
-			min-width: 150px;
-			display: inline-block;
-			z-index: 1000;
-		}
-		
-			#search_options_menucontent li {
-				color: #3c3c3c !important;
-				margin: 0 !important;
-				padding: 9px 5px 9px 10px !important;
-			}
-				
-				#search_options_menucontent li.special {
-					background: #e4ebf2;
-				}
-				
-				#search_options_menucontent li.special + li.app,
-				#search_options_menucontent li.title + li.special {
-					border-top: 1px solid #cbcbcb;
-				}
-			
-				#search_options_menucontent li input {
-					margin-right: 5px;
-				}
-		
-	#adv_search {
-		width: 25px;
-		height: 20px;
-		margin: 1px;
-		background: url({style_images_url}/advanced_search.png) no-repeat 50%;
-		text-indent: -3000em;
-		float: left;
+	#more_apps_menucontent a:hover { color: #000; text-shadow: none; }
+
+.breadcrumb {
+	color: #777;
+	font-size: 11px;
+}
+	.breadcrumb a { color: #777; }
+	.breadcrumb li .nav_sep { margin: 0 5px 0 0; }
+	.breadcrumb li:first-child{ margin-left: 0; }
+	.breadcrumb.top { margin-bottom: 10px; }
+	.breadcrumb.bottom { margin-top: 10px; width: 100% }
+
+.ipsHeaderMenu {
+	background: #ffffff; /* Old browsers */
+	background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 70%, #ededed 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(70%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
+	padding: 10px;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	border-radius: 0 0 6px 6px;
+	overflow: hidden;
+	width: 340px;
+}
+
+	.ipsHeaderMenu .ipsType_sectiontitle { margin-bottom: 8px; }
+	
+	#user_notifications_link_menucontent.ipsHeaderMenu,
+	#user_inbox_link_menucontent.ipsHeaderMenu {
+		width: 300px;
+	}
+	
+/************************************************************************/
+/* SEARCH */	
+
+#search { margin: 20px 0; }	
+#main_search {
+	font-size: 12px;
+	border: 0;
+	padding: 0;
+	background: transparent;
+	width: 130px;
+	outline: 0;
+}
+
+	#main_search.inactive {	color: #bcbcbc;	}
+	
+#search_wrap {
+	position: relative;
+	background: #fff;
+	display: block;
+	padding: 0 26px 0 4px;
+	height: 26px;
+	line-height: 25px;
+	-moz-border-radius: 3px 4px 4px 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-webkit-border-bottom-left-radius: 3px;
+	border-radius: 3px 4px 4px 3px;
+	-webkit-box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+	box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+	min-width: 230px;
+}
+
+#adv_search {
+	width: 16px;
+	height: 16px;
+	background: url({style_images_url}/advanced_search.png) no-repeat right 50%;
+	text-indent: -3000em;
+	display: inline-block;
+	margin: 4px 0 4px 4px;
+}
+
+
+#search .submit_input {
+	background: #7ba60d url({style_images_url}/search_icon.png) no-repeat 50%;
+	text-indent: -3000em;
+	padding: 0; border: 0;
+	border: 1px solid #7ba60d;
+	display: block;
+	width: 26px;
+	height: 26px;
+	position: absolute;
+	right: 0; top: 0; bottom: 0;
+	-moz-border-radius: 0 3px 3px 0;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	border-radius: 0 3px 3px 0;
+	-webkit-box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2);
+	-moz-box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2);
+	box-shadow: inset 0px 1px 0 rgba(255,255,255,0.2);
+}
+
+#search_options {
+	font-size: 10px;
+	height: 20px;
+	line-height: 20px;
+	margin: 3px 3px 3px 0;
+	padding: 0 6px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	background: #eaeaea;
+	display: inline-block;
+	float: right;
+}
+
+#search_options_menucontent { min-width: 100px; }
+	#search_options_menucontent input { margin-right: 10px; }
+	#search_options_menucontent li { border-bottom: 0; }
+	#search_options_menucontent label { cursor: pointer; }
+	
+/************************************************************************/
+/* FOOTER */	
+
+#backtotop {
+	width: 24px;
+	height: 24px;
+	line-height: 20px;
+	left: 50%;
+	margin-left: -12px;
+	position: absolute;
+	display: inline-block;
+	background: #bdbdbd;
+	text-align: center;
+	-moz-border-radius: 16px;
+	-webkit-border-radius: 16px;
+	border-radius: 16px;
+	opacity: 0.4;
+	outline: 0;
+}
+
+	#backtotop:hover { 
+		background: #af286d;
+		color: #fff;
+		opacity: 1;
+	}
+
+#footer_utilities { 
+	padding: 10px; 
+	font-size: 11px;
+	position: relative;
+}
+	
+	#footer_utilities .ipsList_inline > li > a { margin-right: 0px; padding: 4px 10px; }
+	#footer_utilities a.menu_active { 
+		background: #F7F9FB;
+		margin-top: -5px;
+		padding: 3px 9px 4px !important;
+		z-index: 20000;
+		position: relative;
 		display: inline-block;
+		border: 1px solid #D5DDE5;
+		border-bottom: 0;
 	}
 	
-		#adv_search:hover {
-			background-color: #2b4f74;
-		}
-		
-#secondary_nav {
-	color: #878787;
-	font-size: 0.9em;
-	padding: 12px 15px 12px 25px;
-	clear: both;
+	#copyright {
+		color: #848484;
+		text-align: right;
+		text-shadow: 0px 1px 0px #fff;
+	}
+	
+		#copyright a { color: #848484; }
+
+#ipsDebug_footer {
+	width: 900px;
+	margin: 8px auto 0px auto;
+	text-align: center;
+	color: #404040;
+	text-shadow: 0px 1px 0px #fff;
+	font-size: 11px;
 }
-
-	#secondary_nav li {
-		padding-right: 7px;
-		float: left;
-	}
-
-		#secondary_nav #section_links li {
-			padding: 0 5px;
-		}
-
-	#secondary_nav a {
-		color: #393939;
-		text-decoration: none;
-	}
-
+	#ipsDebug_footer strong { margin-left: 20px; }
+	#ipsDebug_footer a { color: #404040; }
+	
 #rss_menu {
-	background-color: #ffdfbe;
-	border: 1px solid #ff7600;
-	padding: 1px;
-	width: 200px;
-	display: block;	
-	z-index: 500;
+	background-color: #fef3d7;
+	border: 1px solid #ed7710;
 }
-
-	#secondary_nav #section_links #rss_menu li {
-		padding: 0;
-		display: block;
-		float: none;
-	}
-
+	
+	#rss_menu li { border-bottom: 1px solid #fce19b; }
 	#rss_menu a {
-		display: block;
-		padding: 3px;
-		color: #ff7600;
+		color: #ed7710;
+		padding: 5px 8px;
 	}
 
 		#rss_menu a:hover {
-			background-color: #ff7600;
+			background-color: #ed7710;
 			color: #fff;
 		}
-		
-#pm_notification {
-	background: url({style_images_url}/trans_bg.png);
-	color: #515151;
-	padding: 0;
-	margin: 15px 20% 0;
-	width: 60%;
-	position: fixed;
-	z-index: 2000;
-}
-
-	#pm_notification #pm_wrap {
-		background: #f3f3f3;
-		padding: 0px 0 0px 0;
-		margin: 10px;
-	}
-
-	#pm_notification h2 {
-		font-size: 1.1em;
-		font-weight: bold;
-		clear: none;
-		padding-left: 18px;
-		margin: -8px 0 0 10px;
-		color: #1c2837;
-	}
-	
-		#pm_notification.open h2 {
-			background: url({style_images_url}/folder_open.png ) no-repeat 2px 2px;
-		}
-		#pm_notification.closed h2 {
-			background: url({style_images_url}/folder_closed.png ) no-repeat 2px 2px;
-		}
-		
-	#pm_notification p.excerpt { 
-		margin: 15px 20px 0;
-		line-height: 150%;
-		overflow: auto;
-		max-height: 400px;
-	}
-	
-	#pm_notification p.desc {
-		margin: 0px 15px 0;
-		float: right;
-	}
-	
-	body#ipboard_body #pm_notification p.submit {	
-		margin: 15px 0 0;
-		padding-left: 15px;
-		text-align: left;
-	}
-	
-	#pm_notification a.configure {
-		font-size: 0.9em;
-		float: right;
-		margin-right: 15px;
-	}
-	
-	#pm_notification .ok_thanks {
-		text-align: center;
-		padding: 6px;
-		clear: both;
-	}
-	
-	#pm_notification h3 {
-		background-color: #dae4ed;
-		font-size: 1.2em;
-		padding: 6px;
-		margin-bottom: 2px;
-	}
-	
-	#pm_notification h3 a {
-		text-decoration: underline;
-	}
-	
-	#pm_notification h3 img {
-		margin-right: 6px;
-	}
-	
-
-
-/************************************************************************/
-/* FOOTER */
-#board_footer {
-	color: #606060;
-	font-size: 0.85em;
-	border-top: 1px solid #dedede;
-	padding: 8px 8px 15px 8px;
-	margin: 10px 15px 20px;	
-	top: 20px;
-	clear: both;
-}
-
-	#board_footer ul#utility_links li {
-		float: left;
-		padding-right: 8px;
-	}
-
-	#board_footer p {
-		text-align: right;
-	}
-
-	#board_footer a {
-		color: #606060;
-	}
-	
-#footer_utilities {
-	background: #192b40 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	color: #fff;
-	font-size: 0.8em;
-	padding: 4px 15px;
-	margin: 25px 15px 0 15px;
-}
-
-	#footer_utilities form {
-		margin: 7px 5px 0 5px;
-	}
-
-	#footer_utilities ul {
-		padding: 2px 0;
-		margin: 8px 0 0 0;
-	}
-		#footer_utilities ul li:first-child {
-			color: #d5dde5;
-		}
-
-		#footer_utilities li {
-			float: right;
-			padding: 0 8px 4px 8px;
-		}
 
 /************************************************************************/
 /* GENERAL CONTENT */
-#content {
-	padding: 20px 15px 0px 15px;
-	clear: both;
+
+.ipsUserPhoto {
+	padding: 1px;
+	border: 1px solid #d5d5d5;
+	background: #fff;
+	-webkit-box-shadow: 0px 2px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0px 2px 2px rgba(0,0,0,0.1);
+	box-shadow: 0px 2px 2px rgba(0,0,0,0.1);
+}
+	
+	.ipsUserPhotoLink:hover .ipsUserPhoto {
+		border-color: #7d7d7d;
+	}
+	
+	.ipsUserPhoto_variable { max-width: 155px; }
+	.ipsUserPhoto_large { max-width: 90px; max-height: 90px; }
+	.ipsUserPhoto_medium { width: 50px; height: 50px; }
+	.ipsUserPhoto_mini { width: 30px; height: 30px; }
+	.ipsUserPhoto_tiny { width: 20px; height: 20px;	}
+	.ipsUserPhoto_icon { width: 16px; height: 16px;	}
+
+
+.general_box {
+	background: #fcfcfc;
+	margin-bottom: 10px;
 }
 
+	
+	.general_box h3 {
+		font: normal 14px helvetica, arial, sans-serif;
+		padding: 8px 10px;
+		background: #DBE2EC;
+		color: #204066;
+	}
+
+.general_box .none {
+	color: #bcbcbc;
+}
+
+.ipsBox, .ipsPad { padding: 9px; }
+	.ipsPad_double { padding: 9px 19px; } /* 19px because it's still only 1px border to account for */
+	.ipsBox_withphoto { margin-left: 65px; }
+	
+	
+	.ipsBox_container {
+		background: #fff;
+		border: 1px solid #dbe4ef;
+	}
+	.ipsBox_notice {
+		padding: 10px;
+		line-height: 1.6;
+		margin-bottom: 10px;
+	}
+	.ipsBox_container .ipsBox_notice {	margin: -10px -10px 10px -10px;	}	
+.ipsPad_half { padding: 4px !important; }
+.ipsPad_left { padding-left: 9px; }
+.ipsPad_top { padding-top: 9px; }
+.ipsPad_top_slimmer { padding-top: 7px; }
+.ipsPad_top_half { padding-top: 4px; }
+.ipsPad_top_bottom { padding-top: 9px; padding-bottom: 9px; }
+.ipsPad_top_bottom_half { padding-top: 4px; padding-bottom: 4px; }
+
+.ipsBlendLinks_target .ipsBlendLinks_here {
+		opacity: 0.5;
+		-webkit-transition: all 0.1s ease-in-out;
+		-moz-transition: all 0.2s ease-in-out;
+	}
+	.ipsBlendLinks_target:hover .ipsBlendLinks_here { opacity: 1; }
+	
+.block_list > li {
+	padding: 5px 10px;
+	border-bottom: 1px solid #f2f2f2;
+}
+
+.ipsModMenu {
+	width: 15px;
+	height: 15px;
+	display: inline-block;
+	text-indent: -2000em;
+	background: url({style_images_url}/moderation_cog.png ) no-repeat;
+	margin-right: 5px;
+	vertical-align: middle;
+}
+
+.ipsBadge {
+	display: inline-block;
+	height: 16px;
+	line-height: 16px;
+	padding: 0 5px;
+	font-size: 9px;
+	font-weight: bold;
+	text-transform: uppercase;
+	color: #fff;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+	#nav_app_ipchat .ipsBadge {	position: absolute;	}
+	
 #ajax_loading {
-	background-color: #6f8f52;
+	background: #95C715;
+	background: -moz-linear-gradient(top, #95C715 0%, #7BA60D 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#95C715), color-stop(100%,#7BA60D));
+	background: linear-gradient(top, #95C715 0%,#7BA60D 100%);
+	border: 1px solid #7BA60D;
 	color: #fff;
 	text-align: center;
-	padding: 5px;
+	padding: 5px 0 8px;
 	width: 8%;
 	top: 0px;
 	left: 46%;
-	border-radius: 0 0 5px 5px;
 	-moz-border-radius: 0 0 5px 5px;
-	-webkit-border-bottom-left-radius: 5px;
 	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	border-radius: 0 0 5px 5px;
 	z-index: 10000;
 	position: fixed;
+	-moz-box-shadow: 0px 3px 5px rgba(0,0,0,0.2), inset 0px -1px 0px rgba(255,255,255,0.2);
+	-webkit-box-shadow: 0px 3px 5px rgba(0,0,0,0.2), inset 0px -1px 0px rgba(255,255,255,0.2);
+	box-shadow: 0px 3px 5px rgba(0,0,0,0.2), inset 0px -1px 0px rgba(255,255,255,0.2);
 }
 
 #ipboard_body.redirector {
 	width: 500px;
 	margin: 150px auto 0 auto;
 }
-	
-.topic_options, .generic_bar, .tab_filters {
-	color: #1d3652;
-	font-size: 0.85em;
-	font-weight: bold;
-	height: 33px;
-}
-	.generic_bar, .tab_filters {
-		background: #b6c7db;
-	}
-	
-	.generic_bar {
-		display: none;
-	}
-	
-	.tab_filters {
-		background: #1d3652 url({style_images_url}/th_bg.png) repeat-x top;
-		color: #fff;
-	}
-	
-	.topic_options {
-		background: #d5dee5;
-	}
-	
-	.topic_options li {
-		padding: 10px;
-		float: right;
-	}
-	
-	.topic_options a {
-		text-decoration: none;
-	}
-	
-.general_box h3 {
-	font-size: 1em;
-	border: 0;
-	padding: 5px;
-	margin: -10px -10px 5px -10px;
-}
 
-#index_stats .general_box {
-	margin-bottom: 10px;
-	overflow: hidden;
-	padding: 0px;
-}
-
-	#index_stats .general_box h3 {
-		margin:0px;
-		padding: 5px;
+#ipboard_body.minimal { margin-top: 40px; }
+	#ipboard_body.minimal #content {
+		-moz-border-radius: 10px;
+		-webkit-border-radius: 10px;
+		border-radius: 10px;
+		padding: 20px 30px;
 	}
-	
-	#index_stats.portal .general_box div.inner_portal_box {
-		padding: 5px;
-	}
-
-.general_box.alt {
-	padding: 0px;
-}
-
-.general_box.alt h3 {
-	margin: 0 0 5px 0;
-}
-
-.general_box a {
-	text-decoration: none;
-}
-
-	.general_box .block_list {
-		font-size: 0.9em;
-		padding-top: 5px;
-		margin: 0;
-	}		
-		.general_box .block_list li {
-			padding: 6px;
-			margin: 0;/* -8px;*/
-		}
+	#ipboard_body.minimal h1 { font-size: 32px; }
+	#ipboard_body.minimal .ipsType_pagedesc { font-size: 16px; }
 
 .progress_bar {
 	background-color: #fff;
@@ -2511,49 +2313,11 @@ h1, #content_jump {
 	width: 40%;
 }
 
-img.resized {
-	display: block;
-}
-
-.resized_img img {
-	border-style: solid;
-	border-color: #777;
-	border-width: 3px 3px 6px 3px;
-	margin-bottom: 5px;
-}
-
-.resized_img span {
-	background: #777;
-	color: #fff;
-	padding: 4px 8px;
-	font-size: 11px;
-}
-
-.resized_img {
-	clear: right;
-}
-
 li.rating a {
 	outline: 0;
 }
 
-.antispam_img {
-	margin-left: 215px;
-	margin-bottom: 3px;
-}
-
-.tagList {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-}
-	.tagList li { display: inline; }
-	li.level1 	{ font-size: 12px; }
-	li.level2	{ font-size: 14px; }
-	li.level3	{ font-size: 16px; }
-	li.level4 	{ font-size: 18px; }
-	li.level5	{ font-size: 20px; }
-	li.level6 	{ font-size: 22px; }
+.antispam_img { margin: 0 3px 5px 0; }
 	
 span.error {
 	color: #ad2930;
@@ -2561,27 +2325,26 @@ span.error {
 	clear: both;
 }
 
-.maintitle .desc {
-	font-size: 0.7em;
-	color: #b6c7db;
-}
+#recaptcha_widget_div { max-width: 350px; }
+#recaptcha_table { border: 0 !important; }
 
 /************************************************************************/
 /* GENERIC REPEATED STYLES */
 /* Inline lists */
-#admin_bar ul, #admin_bar li, #stat_links li, 
-.tab_filters ul, .tab_filters li,
-fieldset.with_subhead span.desc, fieldset.with_subhead label,
-.user_controls li {
+.tab_filters ul, .tab_filters li, fieldset.with_subhead span.desc, fieldset.with_subhead label,.user_controls li {
 	display: inline;
 }
 
-/* Floats */
+/* Utility styles */
 .right { float: right; }
 .left { float: left; }
-
-/* Visibility */
 .hide { display: none; }
+.short { text-align: center; }
+.clear { clear: both; }
+.clearfix:after { content: ".";display: block;height: 0;clear: both;visibility: hidden;}
+.faded { opacity: 0.5 }
+.clickable { cursor: pointer; }
+.reset_cursor { cursor: default; }
 
 /* Bullets */
 .bullets ul, .bullets ol,
@@ -2592,23 +2355,67 @@ ul.bullets, ol.bullets {
 	list-style-image: none;
 }
 
+
+.maintitle {
+	background: #2c5687 url({style_images_url}/maintitle.png) repeat-x top;
+	color: #fff;
+	padding: 10px 10px 11px;
+	font-size: 16px;
+	font-weight: 300;
+	-moz-border-radius: 4px 4px 0 0;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-radius: 4px 4px 0 0;
+	-webkit-box-shadow: inset 0px 1px 0 #528cbc;
+	-moz-box-shadow: inset 0px 1px 0 #528cbc;
+	box-shadow: inset 0px 1px 0 #528cbc;
+	border-width: 1px 1px 0 1px;
+	border-color: #316897;
+	border-style: solid;
+}
+
+	.maintitle a {	color: #fff; }
+	
+	.collapsed .maintitle {
+		opacity: 0.2;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+		border-radius: 4px;
+	}
+	
+		.collapsed .maintitle:hover { opacity: 0.4; }
+	
+	.maintitle .toggle { 
+		visibility: hidden;
+		background: url({style_images_url}/cat_minimize.png) no-repeat;
+		text-indent: -3000em;
+		width: 25px; height: 25px;
+		display: block;
+		outline: 0;
+	}
+		.maintitle:hover .toggle { visibility: visible; }
+	
+	.collapsed .toggle {
+		background-image: url({style_images_url}/cat_maximize.png);
+	}	
+	
 /* Rounded corners */
-#user_navigation #new_msg_count, .message, .popupWrapper, .poll_question h4, .reputation,
+#user_navigation #new_msg_count, .poll_question h4,
 .rounded {
 	border-radius: 6px;
 	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
 }
 
-/* Center */
-.short {
-	text-align: center;
+
+.desc, .desc.blend_links a, p.posted_info {
+	font-size: 12px;
+	color: #777777;
 }
 
-/* Description */
-.desc, p.posted_info, .warn_panel strong {
-	font-size: 0.8em;
-	color: #606060;
+
+.desc.lighter, .desc.lighter.blend_links a {
+	color: #a4a4a4;
 }
 
 /* Cancel */
@@ -2617,78 +2424,17 @@ ul.bullets, ol.bullets {
 	font-size: 0.9em;
 	font-weight: bold;
 }
-	
-/* Maintitle */
-body .maintitle {
-	font-size: 17px;
-	font-weight: normal;
-	border-radius: 5px 5px 0 0;
-	-moz-border-radius: 5px 5px 0 0;
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-	padding: 8px !important;
-	margin: 0 !important;
-	overflow: hidden;
-}
-
-/* Photo */
-.photo {
-	border: 1px solid #d8d8d8;
-}
 
 /* Moderation */
 em.moderated {
-	background: transparent;
-	font-size: 0.8em;
+	font-size: 11px;
+	font-style: normal;
 	font-weight: bold;
-	margin-top: 8px;
-	display: block;
-	clear: both;
 }
 
 /* Positive/Negative */
-.positive {
-	color: #6f8f52;
-}
-.negative {
-	color: #c7172b;
-}
-
-/* Clickable */
-.clickable {
-	cursor: pointer;
-}
-
-/* Clear */
-.clear {
-	clear: both;
-}
-
-	.clearfix, .stats_list {
-		overflow: auto;
-	}
-
-/* Block wrap */
-.block_wrap {
-	padding: 5px 0;
-	margin-bottom: 10px;
-}
-
-
-
-/* White links */
-#admin_bar a, #stat_links a,
-#primary_nav ul li.active, #primary_nav ul li a:hover, #primary_nav ul li.active a,
-#user_navigation.not_logged_in, #user_navigation.not_logged_in a,
-#user_navigation #user_link, #user_navigation #new_msg_count,
-#user_navigation ul, #user_navigation ul#user_link_menucontent,
-#search .submit_input, .message.user_status #update_status,
-table.ipb_table th a, .topic_buttons li a, .topic_buttons li span,
-.message.user_status #update_status, .tab_bar li.active, .tab_bar li.active a,
-.members li.positive a, .members li.negative a, #footer_utilities a, a.input_submit:hover {
-	color: #fff;
-	text-decoration: none;	
-}
+.positive {	color: #6f8f52; }
+.negative {	color: #c7172b; }
 
 /* Search highlighting */
 .searchlite
@@ -2705,138 +2451,770 @@ table.ipb_table th a, .topic_buttons li a, .topic_buttons li span,
 	
 /************************************************************************/
 /* COLUMN WIDTHS FOR TABLES */
-.col_f_icon, .col_f_picon,
-.col_m_status, .col_r_icon {
-	width: 3%;
+/* col_f = forums; col_c = categories; col_m = messenger; col_n = notifications */
+
+.col_f_post { width: 250px !important; }
+	.is_mod .col_f_post { width: 210px !important; }
+
+	td.col_c_post { 
+		padding-top: 10px !important;
+		width: 250px;
+	}
+
+.col_f_icon {
+	padding: 10px 0 0 0 !important;
+	width: 24px !important;
+	text-align: center;
+	vertical-align: top;
 }
 
-.col_c_icon
-{
-	width:53px;
+.col_n_icon { 
+	vertical-align: middle;
+	width: 24px;
+	padding: 0 !important;
+}
+	
+.col_f_views, .col_m_replies {
+	width: 100px !important;
+	text-align: right;
+	white-space: nowrap;
 }
 
-.col_m_replies
-{
-	width: 5%;
-}
-.col_m_to, .col_m_from {
-	width:15%;
-}
-.col_f_topic, .col_m_subject {
-	width: 49%;
-}
-.col_f_views, .col_f_starter,
-.col_r_total, .col_r_comments {
-	width: 10%;
-}
-.col_f_post, .col_m_date,
-.col_r_updated, .col_r_section {
-	width: 18%;
-}
-.col_c_stats {
-	width: 15%;
-}
-.col_c_post {
-	width: 30%;
-}
-.col_c_forum {
-	width: 55%;
-}
-.col_mod, .col_f_mod, .col_r_mod {
-	width: 3%;
-}
-.col_r_title {
-	width: 26%;
+.col_f_mod, .col_m_mod, .col_n_mod { width: 40px; text-align: right; }
+.col_f_preview { 
+	width: 20px !important; 
+	text-align: right;
 }
 
+.col_c_icon { padding: 10px 5px 10px 5px !important; width: 30px; vertical-align: middle; text-align: middle; }
+.col_c_post .ipsUserPhoto { margin-top: 3px; }
+
+.col_n_date { width: 250px; }
+.col_m_photo, .col_n_photo { width: 30px; }
+.col_m_mod { text-align: right; }
+.col_r_icon { width: 3%; }
+.col_f_topic, .col_m_subject { width: 49%; }
+.col_f_starter, .col_r_total, .col_r_comments {	width: 10%; }
+.col_m_date, .col_r_updated, .col_r_section { width: 18%; }
+.col_c_stats { width: 15%; text-align: right; }
+.col_c_forum { width: auto; }
+.col_mod, .col_r_mod { width: 3%; }
+.col_r_title { width: 26%; }
+
+/*.col_c_forum, .col_c_stats, .col_c_icon, .col_c_post { vertical-align: top; }*/
+
 /************************************************************************/
 /* TABLE STYLES */
 
 table.ipb_table {
-	line-height: 120%;
-	border-bottom: 4px solid #d5dde5;
-	/*table-layout: fixed;*/
+	width: 100%;
+	line-height: 1.3;
+	border-collapse: collapse;
 }
 	
-	table.ipb_table a {
-		text-decoration: none;
+	
+	table.ipb_table td {
+		padding: 10px;
+		border-bottom: 1px solid #f3f3f3;
+	}
+		
+		table.ipb_table tr.unread h4 { font-weight: bold; }
+		table.ipb_table tr.highlighted td { border-bottom: 0; }
+	
+	table.ipb_table th {
+		font-size: 11px;
+		font-weight: bold;
+		padding: 8px 6px;
 	}
 	
-		table.ipb_table a:hover,
-		body table.ipb_table th a {
-			text-decoration: underline;
+.last_post { margin-left: 45px; }
+
+table.ipb_table h4,
+table.ipb_table .topic_title {
+	font-size: 14px;
+	display: inline-block;
+}
+
+table.ipb_table  .unread .topic_title { font-weight: bold; }
+table.ipb_table .ipsModMenu { visibility: hidden; }
+table.ipb_table tr:hover .ipsModMenu, table.ipb_table tr .ipsModMenu.menu_active { visibility: visible; }
+
+#announcements h4 { display: inline; }
+#announcements td { border-bottom: 1px solid #fff; }
+
+.forum_data {
+	font-size: 11px;
+	color: #5c5c5c;
+	display: inline-block;
+	white-space: nowrap;
+	margin: 0px 0 0 8px;
+}
+
+.desc_more {
+	background: url({style_images_url}/desc_more.png ) no-repeat top;
+	display: inline-block;
+	width: 13px; height: 13px;
+	text-indent: -2000em;
+}
+	.desc_more:hover { background-position: bottom; }
+
+.category_block .ipb_table h4 { font-size: 15px; word-wrap: break-word; }
+
+table.ipb_table .subforums {
+	margin: 2px 0 3px 5px;
+	padding-left: 20px;
+	background: url({style_images_url}/subforum_stem.png ) no-repeat left 4px;
+}
+	table.ipb_table .subforums li.unread { font-weight: bold; }
+
+table.ipb_table .expander { 
+	visibility: hidden;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+}
+table.ipb_table tr:hover .expander { visibility: visible; opacity: 0.2; }
+table.ipb_table td.col_f_preview { cursor: pointer; }
+table.ipb_table tr td:hover .expander, .expander.open, .expander.loading { visibility: visible !important; opacity: 1; }
+table.ipb_table .expander.closed { background: url({style_images_url}/icon_expand_close.png ) no-repeat top; }
+table.ipb_table .expander.open { background: url({style_images_url}/icon_expand_close.png ) no-repeat bottom; }
+table.ipb_table .expander.loading { background: url({style_images_url}/loading.gif ) no-repeat; }
+table.ipb_table .preview td {
+	padding: 20px 10px 20px 29px;
+	z-index: 20000;
+	border-top: 0;
+}
+
+	table.ipb_table .preview td > div {
+		line-height: 1.4;
+		position: relative;		
+	}
+	
+	table.ipb_table .preview td {
+		-webkit-box-shadow: 0px 4px 5px rgba(0,0,0,0.15);
+		-moz-box-shadow: 0px 4px 5px rgba(0,0,0,0.15);
+		box-shadow: 0px 4px 5px rgba(0,0,0,0.15);
+		border: 1px solid #D6E4F0;
+	}
+
+.preview_col {
+	margin-left: 80px;
+}
+
+.preview_info {
+	border-bottom: 1px solid #eaeaea;
+	padding-bottom: 3px;
+	margin: -3px 0 3px;
+}
+
+table.ipb_table .mini_pagination { opacity: 0.5; }
+table.ipb_table tr:hover .mini_pagination { opacity: 1; }
+
+/************************************************************************/
+/* LAYOUT SYSTEM */
+
+.ipsLayout.ipsLayout_withleft { padding-left: 210px; }
+	.ipsBox.ipsLayout.ipsLayout_withleft { padding-left: 220px; }
+.ipsLayout.ipsLayout_withright { padding-right: 210px; clear: left; }
+	.ipsBox.ipsLayout.ipsLayout_withright { padding-right: 220px; }
+	
+/* Panes */
+.ipsLayout_content, .ipsLayout .ipsLayout_left, .ipsLayout_right { position: relative; }
+.ipsLayout_content { width: 100%; float: left; }
+.ipsLayout .ipsLayout_left { width: 200px; margin-left: -210px; float: left; }
+.ipsLayout .ipsLayout_right { width: 200px; margin-right: -210px; float: right; }
+
+/* Wider sidebars */
+.ipsLayout_largeleft.ipsLayout_withleft { padding-left: 280px; }
+	.ipsBox.ipsLayout_largeleft.ipsLayout_withleft { padding-left: 290px; }
+.ipsLayout_largeleft.ipsLayout .ipsLayout_left { width: 270px; margin-left: -280px; }
+.ipsLayout_largeright.ipsLayout_withright { padding-right: 280px; }
+	.ipsBox.ipsLayout_largeright.ipsLayout_withright { padding-right: 290px; }
+.ipsLayout_largeright.ipsLayout .ipsLayout_right { width: 270px; margin-right: -280px; }
+
+/* Narrow sidebars */
+.ipsLayout_smallleft.ipsLayout_withleft { padding-left: 150px; }
+	.ipsBox.ipsLayout_smallleft.ipsLayout_withleft { padding-left: 160px; }
+.ipsLayout_smallleft.ipsLayout .ipsLayout_left { width: 140px; margin-left: -150px; }
+.ipsLayout_smallright.ipsLayout_withright { padding-right: 150px; }
+	.ipsBox.ipsLayout_smallright.ipsLayout_withright { padding-right: 160px; }
+.ipsLayout_smallright.ipsLayout .ipsLayout_right { width: 140px; margin-right: -150px; }
+
+/* Tiny sidebar */
+.ipsLayout_tinyleft.ipsLayout_withleft { padding-left: 50px; }
+	.ipsBox.ipsLayout_tinyleft.ipsLayout_withleft { padding-left: 60px; }
+.ipsLayout_tinyleft.ipsLayout .ipsLayout_left { width: 40px; margin-left: -40px; }
+.ipsLayout_tinyright.ipsLayout_withright { padding-right: 50px; }
+	.ipsBox.ipsLayout_tinyright.ipsLayout_withright { padding-right: 60px; }
+.ipsLayout_tinyright.ipsLayout .ipsLayout_right { width: 40px; margin-right: -40px; }
+
+/* Big sidebar */
+.ipsLayout_bigleft.ipsLayout_withleft { padding-left: 330px; }
+	.ipsBox.ipsLayout_bigleft.ipsLayout_withleft { padding-left: 340px; }
+.ipsLayout_bigleft.ipsLayout .ipsLayout_left { width: 320px; margin-left: -330px; }
+.ipsLayout_bigright.ipsLayout_withright { padding-right: 330px; }
+	.ipsBox.ipsLayout_bigright.ipsLayout_withright { padding-right: 340px; }
+.ipsLayout_bigright.ipsLayout .ipsLayout_right { width: 320px; margin-right: -330px; }
+
+/* Even Wider sidebars */
+.ipsLayout_hugeleft.ipsLayout_withleft { padding-left: 380px; }
+	.ipsBox.ipsLayout_hugeleft.ipsLayout_withleft { padding-left: 390px; }
+.ipsLayout_hugeleft.ipsLayout .ipsLayout_left { width: 370px; margin-left: -380px; }
+.ipsLayout_hugeright.ipsLayout_withright { padding-right: 380px; }
+	.ipsBox.ipsLayout_hugeright.ipsLayout_withright { padding-right: 390px; }
+.ipsLayout_hugeright.ipsLayout .ipsLayout_right { width: 370px; margin-right: -380px; }
+
+/************************************************************************/
+/* NEW FORMS */
+
+.ipsField .ipsField_title { 
+	font-weight: bold;
+	font-size: 15px;
+}
+
+.ipsForm_required {
+	color: #ab1f39;
+	font-weight: bold;
+}
+
+.ipsForm_horizontal .ipsField_title {
+	float: left;
+	width: 185px;
+	padding-right: 15px;
+	text-align: right;
+	line-height: 1.8;
+}
+
+.ipsForm_horizontal .ipsField { margin-bottom: 15px; }
+.ipsForm_horizontal .ipsField_content, .ipsForm_horizontal .ipsField_submit { margin-left: 200px; }
+.ipsForm_horizontal .ipsField_checkbox { margin: 0 0 5px 200px; }
+.ipsForm_horizontal .ipsField_select .ipsField_title { line-height: 1.6; }
+
+.ipsForm_vertical .ipsField { margin-bottom: 10px; }
+.ipsForm_vertical .ipsField_content { margin-top: 3px; }
+
+.ipsForm .ipsField_checkbox .ipsField_content { margin-left: 25px; }
+.ipsForm .ipsField_checkbox input { float: left; margin-top: 3px; }
+
+.ipsField_primary input { font-size: 18px; }
+
+.ipsForm_submit {
+	background: #e4e4e4;
+	background: -moz-linear-gradient(top, #e4e4e4 0%, #cccccc 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e4e4e4), color-stop(100%,#cccccc));
+	padding: 5px 10px;
+	text-align: right;
+	border-top: 1px solid #cccccc;
+	margin-top: 25px;
+}
+
+.ipsForm_right { text-align: right; }
+.ipsForm_left { text-align: left; }
+.ipsForm_center { text-align: center; }
+
+/************************************************************************/
+/* SETTINGS SCREENS */
+.ipsSettings_pagetitle { font-size: 20px; margin-bottom: 5px; }
+.ipsSettings { padding: 0 0px; }
+.ipsSettings_section {
+	margin: 0 0 15px 0;
+	border-top: 1px solid #eaeaea;
+	padding: 15px 0 0 0;
+}
+	
+	.ipsSettings_section > div { margin-left: 175px; }
+	.ipsSettings_section > div ul li { margin-bottom: 10px; }
+	.ipsSettings_section .desc { margin-top: 3px; }
+	
+.ipsSettings_sectiontitle {
+	font: bold 14px Helvetica, Arial, sans-serif;
+	color: #151515;
+	width: 165px;
+	padding-left: 10px;
+	float: left;
+}
+
+.ipsSettings_fieldtitle { 
+	min-width: 100px;
+	margin-right: 10px;
+	font-size: 14px;
+	display: inline-block;
+	vertical-align: top;
+	padding-top: 3px;
+}
+
+/************************************************************************/
+/* TOOLTIPS */
+
+.ipsTooltip { padding: 5px; z-index: 25000;}
+.ipsTooltip_inner {
+	padding: 8px;
+	background: #333333;
+	border: 1px solid #333333;
+	color: #fff;
+	-webkit-box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	-moz-box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	font-size: 12px;
+	text-align: center;
+	max-width: 250px;
+}
+	.ipsTooltip_inner a { color: #fff; }
+	.ipsTooltip_inner span { font-size: 11px; color: #d2d2d2 }
+	.ipsTooltip.top 	{ background: url({style_images_url}/stems/tooltip_top.png) no-repeat bottom center; }
+		.ipsTooltip.top_left 	{ background-position: bottom left; }
+	.ipsTooltip.bottom	{ background: url({style_images_url}/stems/tooltip_bottom.png) no-repeat top center; }
+	.ipsTooltip.left 	{ background: url({style_images_url}/stems/tooltip_left.png) no-repeat center right; }
+	.ipsTooltip.right	{ background: url({style_images_url}/stems/tooltip_right.png) no-repeat center left; }
+	
+/************************************************************************/
+/* AlertFlag */
+
+.ipsHasNotifications {
+	padding: 0px 4px;
+	height: 12px;
+	line-height: 12px;
+	background: #cf2020;
+	color: #fff !important;
+	font-size: 9px;
+	text-align: center;
+	-webkit-box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	-moz-box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	box-shadow: 0px 2px 4px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	position: absolute;
+	top: 4px;
+	left: 3px;
+}
+
+.ipsHasNotifications_blank { display: none; }
+#chat-tab-count.ipsHasNotifications { left: auto; top: 0px; right: -1px; text-shadow: none !important; }
+
+/************************************************************************/
+/* SIDEBAR STYLE */
+
+.ipsSideMenu { padding: 10px 0; }
+.ipsSideMenu h4 { 
+	margin: 0 10px 5px 25px;
+	font-weight: bold;
+	color: #383838;
+}
+
+.ipsSideMenu ul {
+	border-top: 1px solid #EDF1F5;
+	margin-bottom: 20px;
+}
+
+.ipsSideMenu ul li {
+	font-size: 11px;
+	border-bottom: 1px solid #EDF1F5;
+}
+
+.ipsSideMenu ul li a {
+	padding: 5px 10px 5px 25px;
+	display: block;
+}
+
+
+.ipsSideMenu ul li.active a {
+	background: #af286d url({style_images_url}/icon_check_white.png ) no-repeat 6px 8px;
+	color: #fff;
+	font-weight: bold;
+}
+
+/***************************************************************************/
+/* WIZARDS */
+.ipsSteps {
+	border-bottom: 1px solid #fff;
+	background: #DBE2EC;
+	overflow: hidden;
+}	
+	.ipsSteps ul li {
+		float: left;
+		padding: 11px 33px 11px 18px;
+		color: #323232;
+		background-image: url({style_images_url}/wizard_step_large.png );
+		background-repeat: no-repeat;
+		background-position: bottom right;
+		position: relative;
+		max-height: 53px;
+	}
+	
+	.ipsSteps .ipsSteps_active {
+		background-position: top right;
+		color: #fff;
+		text-shadow: 0px -1px 0 rgba(0,0,0,0.7);
+	}
+	
+	.ipsSteps .ipsSteps_done { color: #aeaeae; }
+	.ipsSteps_desc { font-size: 11px; }	
+	.ipsSteps_arrow { display: none; }
+	
+	.ipsSteps_title {
+		display: block;
+		font-size: 14px;
+	}
+	
+	.ipsSteps_active .ipsSteps_arrow {
+		display: block;
+		position: absolute;
+		left: -23px;
+		top: 0;
+		width: 23px;
+		height: 54px;
+		background: url({style_images_url}/wizard_step_extra.png ) no-repeat;
+	}
+	
+	.ipsSteps ul li:first-child .ipsSteps_arrow { display: none !important;	}
+
+/************************************************************************/
+/* VERTICAL TABS (profile etc.) */
+
+.ipsVerticalTabbed { }
+
+	.ipsVerticalTabbed_content {
+		min-height: 400px;
+	}
+	
+	.ipsVerticalTabbed_tabs > ul {
+		width: 149px !important;
+		margin-top: 10px;
+		border-top: 1px solid #DBE4EF;
+		border-left: 1px solid #DBE4EF;
+	}
+		
+		.ipsVerticalTabbed_minitabs.ipsVerticalTabbed_tabs > ul { width: 40px !important; }
+		
+		
+		.ipsVerticalTabbed_tabs li {
+			background: #f6f8fb;
+			color: #808080;
+			border-bottom: 1px solid #DBE4EF;
+			font-size: 13px;
 		}
 		
-	table.ipb_table caption span.desc {
-		font-size: 0.6em;
+			
+			.ipsVerticalTabbed_tabs li a {
+				display: block;
+				padding: 10px 8px;
+				outline: 0;
+				color: #8d8d8d;
+				-webkit-transition: background-color 0.1s ease-in-out;
+				-moz-transition: background-color 0.3s ease-in-out;
+			}
+			
+				
+				.ipsVerticalTabbed_tabs li a:hover {
+					background: #eaeff5;
+					color: #808080;
+				}
+			
+				
+				.ipsVerticalTabbed_tabs li.active a {
+					width: 135px;
+					position: relative;
+					z-index: 8000;
+					border-right: 1px solid #fff;
+					background: #fff;
+					color: #353535;
+					font-weight: bold;
+				}
+				
+					.ipsVerticalTabbed_minitabs.ipsVerticalTabbed_tabs li.active a {
+						width: 24px;
+					}
+
+/************************************************************************/
+/* 'LIKE' FUNCTIONS */
+
+.ipsLikeBar { margin: 10px 0; font-size: 11px; }
+	
+	.ipsLikeBar_info {
+		line-height: 19px;
+		background: #f4f4f4;
+		padding: 0 10px;
+		display: inline-block;
+		-moz-border-radius: 2px;
+		-webkit-border-radius: 2px;
+		border-radius: 2px;
 	}
+	
+.ipsLikeButton {
+	line-height: 17px;
+	padding: 0 6px 0 24px;
+	font-size: 11px;
+	display: inline-block;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	color: #fff !important;
+}
+	.ipsLikeButton:hover { color: #fff !important; }
+	
+	.ipsLikeButton.ipsLikeButton_enabled {
+		background: #7b96bb url({style_images_url}/like_button.png ) no-repeat top left;
+		border: 1px solid #7b96bb;
+	}
+	
+	.ipsLikeButton.ipsLikeButton_disabled {
+		background: #acacac url({style_images_url}/like_button.png ) no-repeat bottom left;
+		border: 1px solid #acacac;
+	}
+
+/************************************************************************/
+/* TAG LIST */
+
+.ipsTag {
+	display: inline-block;
+	background: url({style_images_url}/tag_bg.png );
+	height: 20px;
+	line-height: 20px;
+	padding: 0 7px 0 15px;
+	margin: 5px 5px 0 0;
+	font-size: 11px;
+	color: #656565;
+	text-shadow: 0 1px 0 rgba(255,255,255,1);
+	-moz-border-radius: 0 3px 3px 0;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	border-radius: 0 3px 3px 0;
+}
+
+/************************************************************************/
+/* TAG EDITOR STYLES */
+
+.ipsTagBox_wrapper {
+	min-height: 18px;
+	width: 350px;
+	line-height: 1.3;
+	display: inline-block;
+}
+	
+	.ipsTagBox_hiddeninput { background: #fff; }
+	.ipsTagBox_hiddeninput.inactive {
+		font-size: 11px;
+		min-width: 200px;
+	}
+	
+	.ipsTagBox_wrapper input { border: 0px;	outline: 0; }
+	.ipsTagBox_wrapper li {	display: inline-block; }
+	
+	.ipsTagBox_wrapper.with_prefixes li.ipsTagBox_tag:first-child {
+		background: #dbf3ff;
+		border-color: #a8e3ff;
+		color: #136db5;
+	}
+	
+	.ipsTagBox_tag {
+		padding: 2px 1px 2px 4px;
+		background: #f4f4f4;
+		border: 1px solid #dddddd;
+		margin: 0 3px 2px 0;
+		font-size: 11px;
+		-moz-border-radius: 2px;
+		-webkit-border-radius: 2px;
+		border-radius: 2px;
+		cursor: pointer;
+	}
+	
+		.ipsTagBox_tag:hover {
+			border-color: #bdbdbd;
+		}
 		
-	table.ipb_table h4,
-	table.ipb_table .topic_title {
-		font-size: 1.1em;
-		font-weight: normal;
-		display: inline;
+		.ipsTagBox_tag.selected {
+			background: #e2e2e2 !important;
+			border-color: #c0c0c0 !important;
+			color: #424242 !important;
+		}
+		
+	.ipsTagBox_closetag {
+		margin-left: 2px;
+		display: inline-block;
+		padding: 0 3px;
+		color: #c7c7c7;
+		font-weight: bold;
+	}
+		.ipsTagBox_closetag:hover { color: #454545;	}
+		.ipsTagBox_tag.selected .ipsTagBox_closetag { color: #424242; }
+		.ipsTagBox_tag.selected .ipsTagBox_closetag:hover { color: #2f2f2f;	}
+		.ipsTagBox_wrapper.with_prefixes li.ipsTagBox_tag:first-child .ipsTagBox_closetag { color: #4f87bb; }
+		.ipsTagBox_wrapper.with_prefixes li.ipsTagBox_tag:first-child .ipsTagBox_closetag:hover { color: #003b71; }
+		
+	.ipsTagBox_addlink {
+		font-size: 10px;
+		margin-left: 3px;
+		outline: 0;
 	}
 	
-	table.ipb_table tr td {
-		/*border-bottom: 1px solid #d8e1ea;*/
-		padding: 10px 8px 8px 8px;
-		border-bottom: 1px solid #fff;
-		/*border-bottom: 2px solid #fff;*/
+	.ipsTagBox_dropdown {
+		height: 100px;
+		overflow: scroll;
+		background: #fff;
+		border: 1px solid #dddddd;
+		-webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+		-moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+		box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
+		z-index: 16000;
 	}
 	
-		table.ipb_table tr .stats {
-			text-align: right;
-			white-space: nowrap;
+		.ipsTagBox_dropdown li {
+			padding: 4px;
+			font-size: 12px;
+			cursor: pointer;
+		}
+		.ipsTagBox_dropdown li:hover {
+			background: #dbf3ff;
+			color: #003b71;
 		}
 
-		body table.ipb_table tr td p {
-			font-size: 0.9em;
+/************************************************************************/
+/* TAG CLOUD */
+.ipsTagWeight_1 { opacity: 1.0; }
+.ipsTagWeight_2 { opacity: 0.9; }
+.ipsTagWeight_3 { opacity: 0.8; }
+.ipsTagWeight_4 { opacity: 0.7; }
+.ipsTagWeight_5 { opacity: 0.6; }
+.ipsTagWeight_6 { opacity: 0.5; }
+.ipsTagWeight_7 { opacity: 0.4; }
+.ipsTagWeight_8 { opacity: 0.3; }
+		
+/************************************************************************/
+/* NEW FILTER BAR */
+
+.ipsFilterbar li {
+	margin: 0px 15px 0px 0;
+	font-size: 11px;
+}
+	
+	.ipsFilterbar li a {
+		color: #fff;
+		opacity: 0.5;
+		text-shadow: 0px 1px 0px #0d273e;
+		-webkit-transition: all 0.3s ease-in-out;
+		-moz-transition: all 0.3s ease-in-out;
+	}
+	
+		.ipsFilterbar:hover li a { opacity: 0.8; }
+
+		.ipsFilterbar li a:hover {
+			color: #fff;
+			opacity: 1;
 		}
-		
-	table.ipb_table th,
-	div#current_calendar ol#week_view li.month_bar {
-		font-size: 0.85em;
+
+.ipsFilterbar li.active { opacity: 1; }
+
+	
+	.ipsFilterbar li.active a {
+		background: #244156;
+		opacity: 1;
+		color: #fff;
+		padding: 4px 10px;
 		font-weight: bold;
-		padding: 6px;
-	}
-	
-	table.ipb_table ol.subforums {
-		padding-top: 6px;
-		margin-top: 5px;
+		-moz-border-radius: 10px;
+		-webkit-border-radius: 10px !important;
+		border-radius: 10px;
+		-webkit-box-shadow: inset 0px 2px 2px rgba(0,0,0,0.2);
+		-moz-box-shadow: inset 0px 2px 2px rgba(0,0,0,0.2);
+		box-shadow: inset 0px 2px 2px rgba(0,0,0,0.2);
 	}
 		
-		table.ipb_table ol.subforums li {
-			background: transparent url({style_images_url}/bullet_black.png) no-repeat 3px 4px;
-			color: #1d3652;
-			font-size: 0.85em;
-			padding: 0 4px 0 15px;			
-			float: left;
-		}
+/************************************************************************/
+/* POSTING FORM STYLES */
+/* Additional form styles for posting forms */
+
+.ipsPostForm { }
+	
+	.ipsPostForm.ipsLayout_withright {
+		padding-right: 260px !important;
+	}
 		
-		table.ipb_table ol.subforums li.newposts {
-			background: transparent url({style_images_url}/bullet_green.png) no-repeat 0px 0px;
-			color: #1d3652;
-			font-size: 0.85em;
-			padding: 0 4px 0 16px;			
-			float: left;
-		}
-		
-	table.ipb_table tr.announcement td {
-		font-weight: bold;
-		font-size: 1.1em;
+	.ipsPostForm .ipsLayout_content {
+		z-index: 900;
+		-webkit-box-shadow: 2px 0px 4px rgba(0,0,0,0.1);
+		-moz-box-shadow: 2px 0px 4px rgba(0,0,0,0.1);
+		box-shadow: 2px 0px 4px rgba(0,0,0,0.1);
+		float: none;
 	}
 	
-	table.ipb_table tr.subhead th {
-		font-weight: bold;
-		font-size: 1.1em;
-		padding: 8px;
+	.ipsPostForm .ipsLayout_right {
+		width: 250px;
+		margin-right: -251px;
+		border-left: 0;
+		z-index: 800;
 	}
 	
-	table.ipb_table ul li {
-		font-size: 0.95em;
+	.ipsPostForm_sidebar .ipsPostForm_sidebar_block.closed h3 {
+		background-image: url({style_images_url}/folder_closed.png );
+		background-repeat: no-repeat;
+		background-position: 10px 9px;
+		padding-left: 26px;
+		margin-bottom: 2px;
 	}
+
+/************************************************************************/
+/* MEMBER LIST STYLES */
+.ipsMemberList .ipsButton_secondary { opacity: 0.3; }
+.ipsMemberList li:hover .ipsButton_secondary, .ipsMemberList tr:hover .ipsButton_secondary { opacity: 1; }
+.ipsMemberList li .reputation { margin: 5px 10px 0 0; }
+.ipsMemberList > li .ipsButton_secondary { margin-top: 15px; }
+.ipsMemberList li .rating {	display: inline; }
+
+/************************************************************************/
+/* COMMENT STYLES */
+.ipsComment_wrap { margin-top: 10px; }
+	.ipsComment_wrap .ipsLikeBar { margin: 0; }
+	.ipsComment_wrap input[type='checkbox'] { vertical-align: middle; }
 	
+.ipsComment {
+	border-bottom: 1px solid #e9e9e9;
+	margin-bottom: 5px;
+	padding: 10px 0;
+}
+	
+.ipsComment_author, .ipsComment_reply_user {
+	width: 160px;
+	text-align: right;
+	padding: 0 10px;
+	float: left;
+	line-height: 1.3;
+}
+
+	.ipsComment_author .ipsUserPhoto { margin-bottom: 5px; }
+	
+.ipsComment_comment {
+	margin-left: 190px;
+	line-height: 1.5;
+}
+
+	.ipsComment_comment > div { min-height: 33px; }
+	
+.ipsComment_controls { margin-top: 10px; }
+.ipsComment_controls > li { opacity: 0.2; }
+	.ipsComment:hover .ipsComment_controls > li, .ipsComment .ipsComment_controls > li.right { opacity: 1; }
+
+/************************************************************************/
+/* FLOATING ACTION STYLES (comment moderation, multiquote etc.) */
+.ipsFloatingAction {
+	position: fixed;
+	right: 10px;
+	bottom: 10px;
+	background: #fff;
+	padding: 10px;
+	z-index: 15000;
+	border: 4px solid #464646;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	-moz-box-shadow: 0px 3px 6px rgba(0,0,0,0.4);
+	-webkit-box-shadow: 0px 3px 6px rgba(0,0,0,0.4);
+	box-shadow: 0px 3px 6px rgba(0,0,0,0.4);
+}
+
 /************************************************************************/
 /* FORM STYLES */
 
@@ -2846,17 +3224,25 @@ body#ipboard_body p.submit {
 	text-align: center;
 }
 
-body#ipboard_body fieldset.submit .left-align {
-	text-align: left;
+.input_text, .ipsTagBox_wrapper {
+	padding: 4px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #848484 #c1c1c1 #e1e1e1 #c1c1c1;
+	background: #fff;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
 }
 
-.input_text {
-	background: #fff url({style_images_url}/input_text.png) repeat-x;
-	font-size: 0.9em;
-	font-family: arial, verdana, tahoma, sans-serif;
-	border: 1px solid #9f9f9f;
-	padding: 2px;
-}
+	.input_text:focus {
+		border-color: #4e4e4e #7c7c7c #a3a3a3 #7c7c7c;
+		-webkit-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+		box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+	}
+	
+	input.inactive, select.inactive, textarea.inactive { color: #c4c4c4; }
 
 	.input_text.error {
 		background-color: #f3dddd;
@@ -2865,18 +3251,11 @@ body#ipboard_body fieldset.submit .left-align {
 		background-color: #f1f6ec;
 	}
 
-.input_text.email,
-.input_text.password {
-	width: 18em;
-}
-
 .input_submit {
-	font-weight: bold;
-	font-size: 0.85em;
 	text-decoration: none;
 	border-width: 1px;
 	border-style: solid;
-	padding: 3px 7px;
+	padding: 4px 10px;
 	cursor: pointer;
 }
 	
@@ -2890,7 +3269,7 @@ p.field {
 
 li.field {
 	padding: 5px;
-	margin-left: 27px;
+	margin-left: 5px;
 }
 
 	li.field label,
@@ -2943,11 +3322,12 @@ li.field.cbox .input_radio {
 /* MESSAGE STYLES */
 
 .message {
-	background: #f1f6ec url({style_images_url}/information.png) no-repeat 8px 10px;
-	padding: 10px 10px 10px 30px;
-	border: 1px solid #b0ce94;
-	color: #3e4934;
-	line-height: 150%;
+	background: #ebfcdf;
+	padding: 10px;
+	border: 1px solid #a4cfa4;
+	color: #0e440e;
+	line-height: 1.6;
+	font-size: 12px;
 }
 
 	.message h3 {
@@ -2956,11 +3336,9 @@ li.field.cbox .input_radio {
 	}
 	
 	.message.error {
-		background-color: #f3dddd;
-		background-image: url({style_images_url}/exclamation.png);
-		border-color: #deb7b7;
-		color: #281b1b;
-		font-size: 1.1em;
+		background-color: #f3e3e6;
+		border-color: #e599aa;
+		color: #80001c;
 	}
 	
 	.message.error.usercp {
@@ -2977,82 +3355,55 @@ li.field.cbox .input_radio {
 		clear: both;
 	}
 	
-	.message.user_status {
-		background: #f9f7e0;
-		color: #6c6141;
-		font-size: 1em;
-		border: 1px solid #eadca0;
-		padding: 5px 5px 5px 15px;
-		margin-bottom: 10px;
-	}
-	
-		.message.user_status.in_profile {
-			font-size: 1.2em;
-			position: relative;
-			padding-left: 15px;
-			overflow: auto;
-		}
-		
-	.message.user_status #update_status {
-		background: #243f5c;
-		font-size: 0.8em;
-		font-weight: bold;
-		padding: 3px 8px;
-		margin-left: 10px;
-	}
-	
-	.message.user_status .cancel {
-		font-size: 0.75em;
-	}
-	
 /************************************************************************/
 /* MENU & POPUP STYLES */
 
 .ipbmenu_content, .ipb_autocomplete {
-	font-size: 0.9em;
+	font-size: 12px;
 	min-width: 85px;
-	padding: 5px;
 	z-index: 2000;
 }
 	
-	.ipbmenu_content li, .ipb_autocomplete li {
-		padding: 5px;
-	}
-	
 	.ipbmenu_content li:last-child {
 		border-bottom: 0;
 		padding-bottom: 0px;
 	}
 	
-	.ipbmenu_content li:first-child {
-		padding-top: 0px;
-	}
-	
-	.ipbmenu_content a {
+	.ipbmenu_content li:first-child { padding-top: 0px;	}
+	.ipbmenu_content.with_checks a { padding-left: 26px; } /* save room for a checkmark */
+	.ipbmenu_content a .icon { margin-right: 10px; }
+	.ipbmenu_content a { 
 		text-decoration: none;
+		text-align: left;
+		display: block;
+		padding: 6px 10px;
+	}
+	.ipbmenu_content.with_checks li.selected a {
+		background-image: url({style_images_url}/icon_check.png );
+		background-repeat: no-repeat;
+		background-position: 7px 10px;
 	}
 
 .popupWrapper {
-	background-color: rgba(0,0,0,0.70);/*url({style_images_url}/trans_bg.png);*/
-	color: #fff;
-	-webkit-box-shadow: rgba(0, 0, 0, 0.64) 0px 12px 25px;
-	-moz-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.64);
-	box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.64);
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
+	background-color: #464646;
+	background-color: rgba(70,70,70,0.6);
+	padding: 4px;
+	-webkit-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7);
+	-moz-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7);
+	box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7 );
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
 }
 
 	.popupInner {
-		background: #f1f4f7;
-		color: #000;
-		border: 3px solid #d5dde5;
-		border-radius: 4px;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		margin: 8px;
+		background: #fff;
 		width: 500px;
 		overflow: auto;
+		-webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.4);
+		-moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.4);
+		box-shadow: 0px 0px 3px rgba(0,0,0,0.4);
+		overflow-x: hidden;
 	}
 	
 		.popupInner.black_mode {
@@ -3067,12 +3418,22 @@ li.field.cbox .input_radio {
 		}
 	
 		.popupInner h3 {
-			background-color: #dae4ed;
-			font-size: 1em;
-			border: 0;
-			padding-left: 24px;
+			background: #2c5687 url({style_images_url}/maintitle.png) repeat-x top;
+			color: #fff;
+			border-width: 1px 1px 0 1px;
+			border-style: solid;
+			border-color: #316897;
+			padding: 8px 10px 9px;
+			font-size: 16px;
+			font-weight: 300;
+			text-shadow: 0 1px 2px rgba(0,0,0,0.3);
+			-webkit-box-shadow: inset 0px 1px 0 #528cbc;
+			box-shadow: inset 0px 1px 0 #528cbc;
+			-moz-box-shadow: inset 0px 1px 0 #528cbc;
 		}
 		
+			.popupInner h3 a { color: #fff; }
+		
 			.popupInner.black_mode h3 {
 				background-color: #545C66;
 				color: #ddd;
@@ -3088,16 +3449,10 @@ li.field.cbox .input_radio {
 			.popupInner.warning_mode input.input_submit {
 				background-color: #7D1B1B;
 			}
-		
-.popupClose {
-	position: absolute;
-	left: 12px;
-	top: 12px;
-}
 
 .popupClose {
 	position: absolute;
-	left: 12px;
+	right: 16px;
 	top: 12px;
 }
 
@@ -3106,8 +3461,7 @@ li.field.cbox .input_radio {
 	opacity: 0.8;
 	width: 13px;
 	height: 13px;
-	top: 18px;
-	left: 16px;
+	top: 17px;
 }
 
 .popupClose.light_close_button img {
@@ -3131,64 +3485,49 @@ li.field.cbox .input_radio {
 	position: absolute;
 }
 
-	.stem.topleft {
-		background-image: url({style_images_url}/stems/topleft.png);
-	}
-	.stem.topright {
-		background-image: url({style_images_url}/stems/topright.png);
-	}
-	.stem.bottomleft {
-		background-image: url({style_images_url}/stems/bottomleft.png);
-	}
-	.stem.bottomright {
-		background-image: url({style_images_url}/stems/bottomright.png);
-	}
+	.stem.topleft { background-image: url({style_images_url}/stems/topleft.png);	}
+	.stem.topright { background-image: url({style_images_url}/stems/topright.png); }
+	.stem.bottomleft { background-image: url({style_images_url}/stems/bottomleft.png); }
+	.stem.bottomright { background-image: url({style_images_url}/stems/bottomright.png);	}
 	
 .modal {
 	background-color: #3e3e3e;
 }
 
+.userpopup h3 { font-size: 17px; }
+.userpopup h3, .userpopup .side + div { padding-left: 110px; }
+.userpopup .side { position: absolute; margin-top: -40px; }
+	.userpopup .side .ipsButton_secondary { 
+		display: block;
+		text-align: center;
+		margin-top: 5px;
+		/* 	#32468: hacky workaround to ensure these buttons work when translated */
+		max-width: 75px;
+		height: auto;
+		line-height: 1;
+		padding: 5px 10px;
+		white-space: normal;
+	}
+.userpopup .user_controls { text-align: left; }
+.userpopup .user_status { padding: 5px; margin-bottom: 5px; }
+.userpopup .reputation {
+	display: block; 
+	text-align: center;
+	margin-top: 5px;
+}
+
 .userpopup {
-	padding-bottom: 25px;
 	overflow: hidden;
 	position: relative;
 	font-size: 0.9em;
 }
 
-	.userpopup .info {
-		position: relative;
-	}
-	
-	.userpopup h3 {
-		font-size: 1.2em;
-	}
-	
-	.userpopup > div {
-		padding: 8px;
+	.userpopup dl {
+		border-bottom: 1px solid #d4d4d4;
+		padding-bottom: 10px;
+		margin-bottom: 4px;
 	}
 
-		.userpopup dl {
-			border-bottom: 1px solid #d4d4d4;
-			padding-bottom: 10px;
-			margin-bottom: 4px;
-		}
-		
-	.userpopup .photo {
-		top: 0px;
-		right: 0px;
-		position: absolute;
-	}
-	
-	.userpopup .user_controls {
-		left: 10px;
-		position: absolute;
-	}
-	
-	.userpopup .reputation {
-		right: 4px;
-		position: absolute;
-	}
-	
 .info dt {
 	float: left;
 	font-weight: bold;
@@ -3204,187 +3543,276 @@ li.field.cbox .input_radio {
 }
 
 /************************************************************************/
-/* TOPIC/POST BUTTONS STYLES */
-
-.topic_controls {
-	min-height: 30px;
-}
+/* BUTTONS STYLES */
 
 .topic_buttons li {
-	background: transparent url({style_images_url}/topic_button_left.png) no-repeat top left;
-	padding: 0;
-	margin: 0px 10px 10px 0px;
 	float: right;
+	margin: 0 0 10px 10px;
+}
+
+
+.topic_buttons li.important a, .topic_buttons li.important span, .ipsButton .important,
+.topic_buttons li a, .topic_buttons li span, .ipsButton {
+	background: #212121 url({style_images_url}/topic_button.png ) repeat-x top;
+	border: 1px solid #212121;
+	border-width: 1px 1px 0 1px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-moz-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	box-shadow: inset 0 1px 0 0 #5c5c5c, 0px 2px 3px rgba(0,0,0,0.2);
+	color: #fff;
+	text-shadow: 0 -1px 0 #191919;
+	font: 300 12px/1.3 Helvetica, Arial, sans-serif;
+	line-height: 30px;
+	height: 30px;
+	padding: 0 10px;
+	text-align: center;
+	min-width: 125px;
+	display: inline-block;
+	cursor: pointer;
+}
+
+.topic_buttons li.important a, .topic_buttons li.important span, .ipsButton .important, .ipsButton.important {
+	background: #812200 url({style_images_url}/topic_button_closed.png ) repeat-x top;
+	border-color: #812200;
+	-moz-box-shadow: inset 0 1px 0 0 #db6e46, 0px 2px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: inset 0 1px 0 0 #db6e46, 0px 2px 3px rgba(0,0,0,0.2);
+	box-shadow: inset 0 1px 0 0 #db6e46, 0px 2px 3px rgba(0,0,0,0.2);
 }
 	
-	.topic_buttons li a,
-	.topic_buttons li span {
-		font-size: 0.9em;
-		display: block;
-		margin: auto 0px auto 6px;
-		outline: 0;
+	.topic_buttons li a:hover, .ipsButton:hover { color: #fff; }
+	.topic_buttons li.non_button a {
+		background: transparent !important;
+		background-color: transparent !important;
+		border: 0;
+		box-shadow: none;
+		-moz-box-shadow: none;
+		-webkit-box-shadow: none;
+		text-shadow: none;
+		min-width: 0px;
+		color: #777777;
+		font-weight: normal;
 	}
 	
-	.topic_buttons li span {
-		padding: 8px 12px 7px 3px;
+	.topic_buttons li.disabled a, .topic_buttons li.disabled span {
+		background: #ebebeb;
+		box-shadow: none;
+		-moz-box-shadow: none;
+		-webkit-box-shadow: none;
+		text-shadow: none;
+		border: 0;
+		color: #7f7f7f;
 	}
 	
-	.topic_buttons li a {
-		background: transparent url({style_images_url}/topic_button_right.png) no-repeat top right;
-		padding: 7px 12px 6px 3px;
+	.topic_buttons li span { cursor: default !important; }
+
+
+.ipsButton_secondary {
+	height: 22px;
+	line-height: 22px;
+	font-size: 12px;
+	padding: 0 10px;
+	background: #f6f6f6;
+	background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+	border: 1px solid #dbdbdb;
+	-moz-box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3);
+	-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3);
+	box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3);
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	color: #616161;
+	display: inline-block;
+	white-space: nowrap;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+}
+	.ipsButton_secondary a { color: #616161; }
+	.ipsButton_secondary:hover {
+		color: #4c4c4c;
+		border-color: #9a9a9a;
 	}
 	
-		.topic_buttons li a img,
-		.topic_buttons li span img {
-			margin: -1px 5px 1px 0;
-		}
-		
-		.topic_buttons li a img.arrow { margin-right: -3px; }
-	
-	.topic_buttons li:hover {
-		background: transparent url({style_images_url}/topic_button_left_hover.png) no-repeat top left;
+	.ipsButton_secondary.important {
+		background: #9f2a00;
+		background: -moz-linear-gradient(top, #9f2a00 0%, #812200 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9f2a00), color-stop(100%,#812200)); /* webkit */
+		border: 1px solid #812200;
+		color: #fbf4f4;
+		-moz-box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
+		-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
+		box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
 	}
-		.topic_buttons li:hover a {
-			background: transparent url({style_images_url}/topic_button_right_hover.png) no-repeat top right;
-		}	
-	.topic_buttons li.disabled {
-		background: transparent url({style_images_url}/topic_button_left_disabled.png) no-repeat top left;
-	}
-		.topic_buttons li.disabled a {
-			background: transparent url({style_images_url}/topic_button_right_disabled.png) no-repeat top right;
-			color: #555555;
-		}
-		.topic_buttons li.disabled span {
-			background: transparent url({style_images_url}/topic_button_right_disabled.png) no-repeat top right;
-			color: #8f8e8e;
-		}	
-	.topic_buttons li.closed {
-		background: transparent url({style_images_url}/topic_button_left_closed.png) no-repeat top left;
-	}
-		.topic_buttons li.closed span,
-		.topic_buttons li.closed a {
-			background: transparent url({style_images_url}/topic_button_right_closed.png) no-repeat top right;
+		.ipsButton_secondary.important a { color: #fbf4f4; }
+		.ipsButton_secondary.important a:hover { 
+			color: #fff;
+			border-color: #571700;
 		}
 	
+.ipsButton_extra {
+	line-height: 22px;
+	height: 22px;
+	font-size: 11px;
+	margin-left: 5px;
+	color: #5c5c5c;
+}
+
+.ipsButton.no_width { min-width: 0; }
+.topic_controls { min-height: 30px; }
+
 ul.post_controls {
-	background-image: url({style_images_url}/gradient_bg.png);
-	background-repeat: repeat-x;
-	background-position: 50%;
-	font-size: 0.8em;
-	text-align: right;
-	padding: 6px 10px 28px 6px;
+	padding: 6px;
+	margin: 0 0 10px 0;
 	clear: both;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
 }
 
 		ul.post_controls li {
-			background: transparent url({style_images_url}/post_button_left.png) no-repeat top left;
-			padding: 0;
-			margin: 0 4px;
+			font-size: 12px;
 			float: right;
 		}
 
-			ul.post_controls li.report,
-			ul.post_controls li.top,
-			ul.post_controls.left li {
-				float: left;
-			}
-
 		ul.post_controls a {	
-			background: transparent url({style_images_url}/post_button_right.png) no-repeat top right;
+			height: 22px;
+			line-height: 22px;
+			padding: 0 12px;
 			color: #1d3652;
 			text-decoration: none;
-			padding: 6px 9px 3px 4px;
 			margin-left: 4px;
 			display: block;
 		}
 
-		ul.post_controls a img {
-			margin-top: -2px;
+		ul.post_controls a:hover { color: #3d70a3; }
+		
+		ul.post_controls a.ipsButton_secondary {
+			height: 20px;
+			line-height: 20px;
+		}
+		
+		ul.post_controls li.multiquote.selected a { 
+			background: #a1dc00; /* Old browsers */
+			background: -moz-linear-gradient(top, #a1dc00 0%, #7ba60d 100%); /* FF3.6+ */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#a1dc00), color-stop(100%,#7ba60d)); /* Chrome,Safari4+ */
+			border-color: #7ba60d;
+			-moz-box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
+			-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
+			box-shadow: 0px 1px 0px rgba(255,255,255,0.4) inset, 0px 1px 0px rgba(0,0,0,0.3);
+			color: #fff;
 		}
 
-		ul.post_controls a:hover {
-			color: #3d70a3;
-		}
+.post_block .post_controls li a { 
+	opacity: 0.2;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.5s ease-in-out;
+}
 
-		/* Selected button */
-		ul.post_controls li.selected {
-			background: transparent url({style_images_url}/post_button_left_selected.png) no-repeat top left;
-		}
+.post_block .post_controls li a.ipsButton_secondary {
+	opacity: 1;
+}
+.post_block:hover .post_controls li a { opacity: 1; }
 
-			ul.post_controls li.selected a {
-				background: transparent url({style_images_url}/post_button_right_selected.png) no-repeat top right;
-				color: #fff;
-			}
-
-body .topic_buttons li a:hover,
-body ul.post_controls a:hover {
-	text-decoration: none;
+.hide_signature, .sigIconStay { float: right; }
+.post_block:hover .signature a.hide_signature, .sigIconStay {
+	background: transparent url({style_images_url}/cross_sml.png) no-repeat top right;
+	width: 13px;
+	height: 13px;
+	opacity: 0.6;
+	position: absolute;
+	right: 0px;
 }
 
 /************************************************************************/
 /* PAGINATION STYLES */
 
-span.pagination.no_pages {
+.pagination { padding: 5px 0; line-height: 20px; }
+.pagination.no_numbers .page { display: none; }
+.pagination .pages { text-align: center; }
+.pagination .back { margin-right: 6px; }
+	.pagination .back li { margin: 0 2px 0 0; }
+.pagination .forward { margin-left: 6px; }
+	.pagination .forward li { margin: 0 0 0 2px; }
+
+
+.pagination .back a,
+.pagination .forward a {
+	display: inline-block;
+	padding: 0px 6px;
+	height: 20px;
+	background: #eaeaea;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	text-transform: uppercase;
+	color: #5a5a5a;
+	font-size: 11px;
+	font-weight: bold;
+}
+	
+	
+	.pagination .back a:hover,
+	.pagination .forward a:hover {
+		background: #af286d;
+		color: #fff;
+	}
+
+	.pagination .disabled a {
+		opacity: 0.4;
+		display: none;
+	}
+	
+.pagination .pages {
+	font-size: 11px;
+	font-weight: bold;
+}
+
+	.pagination .pages a, .pagejump {
+		display: inline-block;
+		padding: 1px 4px;
+		color: #999;
+	}
+	
+	.pagination .pages .pagejump { padding: 0px; }
+	
+	.pagination .pages a:hover {
+		background: #ececec;
+		-moz-border-radius: 2px;
+		-webkit-border-radius: 2px;
+		border-radius: 2px;
+	}
+	
+	.pagination .pages li { margin: 0 1px; }
+	
+		
+		.pagination .pages li.active {
+			background: #7BA60D;
+			color: #fff;
+			font-weight: bold;
+			-moz-border-radius: 2px;
+			-webkit-border-radius: 2px;
+			border-radius: 2px;
+			padding: 1px 5px;
+		}
+		
+.pagination.no_pages span {
 	color: #acacac;
-	font-size: 0.9em;
-	padding: 10px;	
-	height: 15px;
-	display: block;
+	display: inline-block;
+	line-height: 20px;
+	height: 20px;
 }
 
-	ul.pagination.top {
-		padding: 0 0 5px 0;
-		margin-bottom: 15px;
-		height: 18px;
-	}
-
-	ul.pagination.bottom {
-		padding: 5px 0 0 0;
-		margin-top: 15px;
-		height: 18px;
-	}
-
-ul.pagination a,
-ul.pagination li.active, 
-ul.pagination li.pagejump,
-ul.pagination li.total {
-	text-decoration: none;
-	padding: 1px 4px;
-	display: block;
-}
-
-ul.pagination li.pagejump img {
-	margin-top: -4px;
-}
-
-ul.pagination li {
-	background: #fff;
-	font-size: 0.9em;
-	border: 1px solid #cfcfcf;	
-	margin: 0 1px 0 1px;
-	float: left;
-}
-
-	ul.pagination li.total,
-	ul.pagination li.active {
-		background: none;
-		border: 0;
-		margin-left: 0px;
-	}
-
-	ul.pagination li.active {
-		color: #528f6c;
-		font-size: 1em;
-		font-weight: bold;
-	}
-
 ul.mini_pagination {
-	font-size: 0.75em;
+	font-size: 10px;
 	display: inline;
 	margin-left: 7px;
 }
 
 	ul.mini_pagination li a {
+		background: #fff;
 		border: 1px solid #d3d3d3;
 		padding: 1px 3px;
 	}
@@ -3399,453 +3827,156 @@ ul.mini_pagination {
 
 .moderation_bar {
 	text-align: right;
-	padding: 6px 35px 6px 10px;
-	margin: 10px 0 0 0;
+	padding: 8px 10px;
+	/*background: #f7f7f7;*/
 }
 
 	.moderation_bar.with_action {
 		background-image: url({style_images_url}/topic_mod_arrow.png);
 		background-repeat: no-repeat;
 		background-position: right center;
-	}
-	
-#topic_mod_2 {
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	-moz-border-radius-topleft: 0px;
-	-moz-border-radius-topright: 0px;
-	-webkit-border-top-left-radius: 0px;
-	-webkit-border-top-right-radius: 0px;
-	padding-top: 10px;
-	margin-top: -10px;
-}
-
-#topic_mod p {
-	padding: 7px;
-	font-size: 0.9em;
-}
-
-#topic_mod #forum_mod_options_menucontent {
-	text-align: left;
-}
-
-.filter_bar {
-	font-size: 0.8em;
-	text-align: center;
-	margin: 6px 0 0 0;
-	padding: 6px;
-}
-
-	.filter_bar select {
-		margin-right: 10px;
-	}
-	
-	.filter_bar span.clickable {
-		display: block;
-	}
-	
-/************************************************************************/
-/* TAB BAR STYLES */
-
-.tab_bar {
-	font-size: 0.9em;
-	border-radius: 6px 6px 0 0;
-	-moz-border-radius: 6px 6px 0 0;
-	-webkit-border-top-left-radius: 6px;
-	-webkit-border-top-right-radius: 6px;
-	padding: 7px 15px 25px 15px;
-}
-
-	.tab_bar.no_title {
-		background-image: url({style_images_url}/th_bg.png);
-		background-repeat: repeat-x;
-		background-position: bottom;
-		padding: 7px 15px 56px 15px;
-	}
-		
-		.tab_bar.no_title.mini {
-			background: transparent;
-			padding: 7px 15px 25px 15px;
-		}
-		
-	.tab_bar li {
-		float: left;
-		padding: 2px 10px;
+		padding-right: 35px;
 	}
 
-		.tab_bar li a {
-			color: #4a6784;
-			text-decoration: none;
-		}
-		
-		.tab_bar li.active {
-			font-weight: bold;
-			font-size: 1.1em;
-			border-radius: 4px 4px 0 0;
-			-moz-border-radius: 4px 4px 0 0;
-			-webkit-border-top-left-radius: 4px;
-			-webkit-border-top-right-radius: 4px;
-			padding: 7px 10px;
-			margin: -2px 10px 0 10px;
-		}
-		
-.tab_filters {
-	padding: 0 10px;
-}
-
-	.tab_filters ul {
-		padding-top: 10px;
-	}
-
-	.tab_filters a {
-		color: #cfd9e4;
-		text-decoration: none;
-		font-weight: normal;
-	}
-
-	.tab_filters li {
-		color: #cfd9e4;
-		padding: 0 4px;
-	}
-
-		.tab_filters li.active,
-		.tab_filters li.active a {
-			font-weight: bold;
-			color: #fff;
-		}
-		
 /************************************************************************/
 /* AUTHOR INFO (& RELATED) STYLES */
 
 .author_info {
-	text-align: left;	
-	font-size: 0.9em;
-	border-right: 1px solid #e4ebf3;
-	margin: 15px -5px 10px 0px;
-	width: 225px;
+	width: 155px;
 	float: left;
+	font-size: 12px;
+	text-align: center;
+	padding: 15px 10px;
+}
+	
+	.author_info .group_title {
+		font-weight: bold;
+		color: #5a5a5a;
+		margin-top: 5px;
+	}
+	
+	.author_info .member_title { margin-bottom: 5px; }
+	.author_info .group_icon { margin-bottom: 3px; }
+	
+.custom_fields {
+	color: #818181;
+	margin-top: 8px;
 }
 
-	.author_info.no_rep {
-		margin-bottom: 15px;
-	}
-	
-	.author_info li.avatar, .author_info li.group_icon, .author_info li.title {
-		text-align: center;
-	}
-	
-	.author_info ul.user_fields li {
-		clear: both;
-		font-size: 0.9em;
-		color: #718a96;
-		padding-bottom: 2px;
-		overflow: hidden;
-	}
-	
-	.author_info ul.user_fields {
-		clear: both;
-	}
-	
-	.author_info ul.user_fields li span.ft,
-	.author_info ul.user_fields li span.fc {
-		display: block;
-		float: left;
-	}
-	
-	.author_info ul.user_fields li span.ft {
-		width: 38%;
-		text-align: right;
-		font-weight: bold;
-		padding: 0 0 0 8px;
-	}
-	
-	.author_info ul.user_fields li span.fc {
-		padding: 0 8px 0 8px;
-		max-width: 50%;
-		word-wrap: break-word;
-	}
-	
-	/*.author_info dl {
-		font-size: 0.9em;
-		margin: 8px 8px 15px 8px;
-	}
-	
-	.author_info dt,
-	.author_info dd {
-		display: inline-block;
-		color: #718a96;
-		vertical-align: top;
-	}
-	
-	.author_info dt {
-		font-weight: bold;	
-		text-align: right;
-		clear: both;
-	}
-	
-	.author_info dd {
-		text-align: left;
-		background: red;
-	}*/
-	
-	.author_info .title {
-		margin-top: 4px;
-	}	
-	
+.custom_fields .ft { 
+	color: #505050;
+	margin-right: 3px;
+}
+
+.custom_fields .fc {
+	word-wrap: break-word;
+}
+
+
 .user_controls {
 	text-align: center;
 	margin: 6px 0;
 }
 
-	.user_controls li {
-		margin: 0 2px;
-		display: inline;
-	}
-		
-		.user_controls li a {
-			display: inline-block;
-			background-color: #d5dee5;
-			border-radius: 4px;
-			-moz-border-radius: 4px;
-			-webkit-border-radius: 4px;
-			padding: 3px;
-			color: #1d3652;
-		}
-	
-.warn_panel {
-	text-align: left;
-	padding: 6px;
-	margin: 0 10px;
-}
-	.warn_panel .warn_link {
-		padding-left: 10%;
-		text-decoration: none;
+	.user_controls li a {
+		display: inline-block;
+		background: #f6f6f6;
+		background: -moz-linear-gradient(top, #f6f6f6 0%, #e5e5e5 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#e5e5e5)); /* webkit */
+		border: 1px solid #dbdbdb;
+		-moz-box-shadow: 0px 1px 0px rgba(255,255,255,1) inset, 0px 1px 0px rgba(0,0,0,0.3);
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+		border-radius: 3px;
+		padding: 5px;
+		color: #616161;
 	}
 
-	.warn_panel .warn_edit {
-		float: right;
-	}
-
-	.warn_panel .warn_edit.up {
-		margin-right: 10%;
-	}
-	
-.rating_mode.user_warn {
-	margin: 0 auto;
-	width: 80%;
-	font-size: 0.9em;
-}
-
-	.rating_mode .warn_edit.down {
-		float: none;
-		margin-right: 3px;
-	}
-	
-	.rating_mode .warn_edit.up {
-		float: none;
-		margin-left: 2px;
-	}
-
-	
 /************************************************************************/
 /* BOARD INDEX STYLES */
 
-a.toggle {	
-	background: url({style_images_url}/cat_minimize.png) no-repeat;
-	text-indent: -3000em;
-	padding-bottom: 2px;
-	width: 25px;
-	height: 100%;
-	display: block;
-	outline: 0;
-}
+#board_index #categories { overflow: hidden; } /* opera fix */
 
-#latest_news {
-	color: #1d3652;
-	font-size: 0.9em;
-	border: 1px solid #d5dde5;
-	padding: 10px;
-	margin: 0 4px 6px;
-}
-
-	#latest_news a {
-		text-decoration: none;
-	}
-
-div#categories {
-	width: 76%;
-	overflow: hidden;
-}
-
-	div#categories.no_sidebar {
-		width: 100%;
-		float: none;
-	}
-
-#index_stats {
-	padding-bottom: 25px;
-	margin-bottom: 20px;
-	margin-top: 0px;
-	width: 22%;
-}
-
-.sidebar_toggle {
-	text-align: right;	
-	padding: 4px 3px;
-	height: 18px;
-	width: 10px;
-	right: 4px;
+#board_index { position: relative; }
+	#board_index.no_sidebar { padding-right: 0px; }
+		#board_index.force_sidebar { padding-right: 290px; }
+	
+#toggle_sidebar {
 	position: absolute;
-	outline: 0;
+	right: -5px;
+	top: -13px;
+	z-index: 8000;
+	background: #333333;
+	padding: 3px 7px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	color: #fff;
+	opacity: 0;
+	-webkit-transition: all 0.4s ease-in-out;
+	-moz-transition: all 0.4s ease-in-out;
 }
+	#index_stats:hover + #toggle_sidebar, #board_index.no_sidebar #toggle_sidebar { opacity: 0.1; }
+	#toggle_sidebar:hover { opacity: 1 !important; }
 
-	#open_sidebar.sidebar_toggle {
-		right: 0;
-		border-top-right-radius: 0;
-		border-bottom-right-radius: 0;
-		-moz-border-radius-top-right: 0;
-		-moz-border-radius-bottom-right: 0;
-		-webkit-border-top-right-radius: 0;
-		-webkit-border-bottom-right-radius: 0;
-	}
 	
-	#open_sidebar, #close_sidebar {
-		outline: none;
-	}
-
-.category_block h3.collapsed {
-	border-bottom: 8px solid #b6c7db;
-}
-
-	.category_block h3.collapsed a.toggle {
-		background-image: url({style_images_url}/cat_maximize.png);
-		/*padding-bottom: 6px;*/
-	}
-
-
-.index_stats_collapse
-{
-	text-indent: -3000em;
-	padding-bottom: 2px;
-	width: 15px;
-	height: 15px;
-	display: block;
-	float: right;
-	outline: 0;
-}
-
-.index_stats_collapse.open
-{
-	background-image: url({style_images_url}/cat_minimize_small.png);
-	opacity:0.6;
-}
-
-.index_stats_collapse.close
-{
-	background-image: url({style_images_url}/cat_maximize_small.png);
-	opacity:0.6;
-}
-
-.statistics {	
-	padding: 15px;
-	margin: 10px 0px 0 0px;
-	min-height: 160px;
-}
-
-	.statistics h2 {
-		font-size: 1.1em;
-		font-weight: bold;
-	}
-		
-		.statistics h2 span {
-			font-size: 0.8em;
-			font-weight: normal;
-			color: #425365;
-		}
-		
-	.statistics #active_users, .statistics #forum_active_users {
-		border-top: 0;
-		padding-top: 0;
-	}
-	
-	body #topic_stats.statistics {
-		min-height: 50px;
-	}
-
-body .stats_list {
-	border-top: 1px solid #e4ebf2;
+.ipsSideBlock {
+	background: #F7FBFC;
+	padding: 10px;
 	margin-bottom: 10px;
-	padding: 10px 5px 0 0;
-	float: left;
-	width: 60%;
-	line-height: 140%;
+}
+		
+	.ipsSideBlock h3 {
+		font: normal 14px helvetica, arial, sans-serif;
+		color: #204066;
+		padding: 5px 10px;
+		background: #DBE2EC;
+		margin: -10px -10px 10px;
+	}
+	
+	.ipsSideBlock h3 .mod_links { opacity: 0.0; }
+	.ipsSideBlock h3:hover .mod_links { opacity: 1; }
+
+.status_list .status_list { margin: 10px 0 0 50px; }
+.status_list p.index_status_update { line-height: 120%; margin:4px 0px; }
+.status_list li { position: relative; }
+.status_reply {
+	margin-top: 8px;
+}
+
+.status_list li .mod_links { 
+	opacity: 0.1;
+	-webkit-transition: all 0.4s ease-in-out;
+	-moz-transition: all 0.4s ease-in-out;
+}
+.status_list li:hover .mod_links { opacity: 1; }
+
+/* board stats */
+#board_stats ul { text-align: center; }
+	#board_stats li { margin-right: 20px; }
+	#board_stats .value {
+		display: inline-block;
+		background: #e2e2e2;
+		color: #4a4a4a;
+		padding: 2px 6px;
+		font-weight: bold;
+		-moz-border-radius: 2px;
+		-webkit-border-radius: 2px;
+		border-radius: 2px;
+		margin-right: 3px;
+	}
+
+.statistics {
+	margin: 20px 0 0 0;
+	padding: 10px 0;
+	border-top: 3px solid #d8d8d8;
+	line-height: 1.3;
 	overflow: hidden;
 }
 
-	.stats_list li,
-	.active_users li {
-		float: left;
-		font-size: 0.9em;
-		padding: 0 5px 0 0;
-		margin-top: 4px;
-	}
-	
-	.stats_list ul, .stats_list p {
-		margin-left: 15px;
-	}
-	
-	.stats_list span.desc {
-		font-weight: normal;
-	}
-	
-.active_users span.name {
-	font-size: 0.9em;
-	padding: 0 5px 0 0;
-	margin-top: 4px;
-}
-
-.active_users p {
-	margin-left: 15px;
-}
-
-#stats {
-	border-left: 1px solid #e4ebf2;
-	padding-left: 20px;
-	width: 33%;
-	float: right;
-}
-	#stats dl {
-		margin-left: 10px;
-	}
-	
-	#stats dt,
-	#stats dd {
-		border-top: 1px solid #dedede;
-		font-size: 0.85em;
-		padding: 6px 2px;
-		float: left;
-		width: 45%;
-	}
-	
-	#stats dt {
+	.statistics_head {
+		font-size: 14px;
 		font-weight: bold;
-		clear: both;
-	}
-	
-	#stats .extra {
-		color: #a2a2a2;
-		font-size: 0.9em;
-	}
-	
-#stat_links {	
-	color: #69727b;
-	font-size: 0.85em;
-	text-align: center !important;
-	margin-top: 25px;
-}
-
-	#stat_links li {
-		padding: 2px 6px;
 	}
 
 .friend_list ul li,
@@ -3870,10 +4001,27 @@ body .stats_list {
 	body#ipboard_body #hook_watched_items fieldset.submit {
 		padding: 8px;
 	}
+	
+#hook_birthdays .list_content {
+	padding-top: 8px;
+}
+
+#hook_calendar .ipsBox_container { padding: 10px; }
+#hook_calendar td, #hook_calendar th { text-align: center; }
+#hook_calendar th { font-weight: bold; padding: 5px 0;}
 
 /************************************************************************/
 /* FORUM VIEW (& RELATED) STYLES */
 
+#more_topics {
+	text-align: center;
+	font-weight: bold;
+}
+	#more_topics a { display: block; padding: 10px 0;}
+
+	/* Result of the 'load more topics' link */
+	.dynamic_update { border-top: 2px solid #b3b3b3; }
+
 .topic_preview,
 ul.topic_moderation {
 	margin-top: -2px;
@@ -3899,146 +4047,26 @@ img.mini_rate {
 	margin-right: -5px;
 }
 
-.topic_prefix {
-	font-size: 0.8em;
-	font-weight: bold;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	padding: 0px 4px;	
-	float: left;
-	display: block;
-}
-
-#forum_legend {
-	width: 39%;
-}
-
-	#forum_legend dl {
-		font-size: 0.9em;
-		margin-top: 15px;
-	}
-
-		#forum_legend dt,
-		#forum_legend dd {
-			font-size: 0.9em;
-			border-top: 1px solid #dedede;
-			padding: 6px 2px;
-			height: 20px;
-			float: left;
-		}
-
-		#forum_legend dt {
-			text-align: center;
-			width: 9%;
-		}
-
-		#forum_legend dd {
-			width: 38%;
-			max-width: 200px;
-		}
-
-.message.forum_rules {
-	margin-bottom: 20px;
-}
-
-.rules {
-	line-height: 150%;
-}
-
-#forum_table .maintitle .main_forum_title {
-	float: left;
-}
-
-#forum_table .maintitle .desc {
-	float: right;
-}
-
-	#forum_table .maintitle .desc a {
-		color: #d5dde5;
-	}
-
-#filter_form input.input_submit {
-	margin-left: 4px;
-}
-
-.maintitle .desclinks {
-	color: #d5dde5;
-	font-size: 0.6em;
-	padding-top: 4px;
-}
-
-.maintitle .desclinks a {
-	text-decoration: none;
-}
-
 /************************************************************************/
 /* TOPIC VIEW (& RELATED) STYLES */
 
-ul.topic_jump {
-	font-size: 0.8em;
-	padding-top: 4px;
-	margin: 0px auto 15px auto;
-}
-
-ul.topic_jump li {
-	padding: 1px 7px;
-	float: left;
-}
-	ul.topic_jump li a {
-		text-decoration: none;
-	}
-
-	ul.topic_jump li.previous {
-		border-right: 1px solid #8f8f8f;
-	}
-
-	ul.topic_jump li.next {
-		border-left: 1px solid #8f8f8f;
-	}
-	
-/*#ipboard_body .post_block h3,*/
-.poll h3 {
-	background: #B5C0CF url({style_images_url}/gradient_bg.png) repeat-x 50%;
-}
-
-body .ip {
-	color: #475769;
-	font-style: italic;
-	font-weight: normal;
-	font-size: 11px;
-	padding-top: 4px;
-	margin-right: 10px;
-	margin-left: 15px;
-}
-
-span.post_id {
-	font-size: 11px;	
-	font-weight: normal;
-	padding-top: 4px;
-	display: block;
-	float: right;
-}
-
-input.post_mod {
-	float: right;
-	margin: 0px 6px 0 15px;
-}
+body .ip { color: #475769; }
+span.post_id { margin-left: 15px; }
+input.post_mod { margin:12px 5px 0px 10px; }
 
 .signature {
-	color: #8e8e8e;
-	font-size: 11px;
-	border-top: 1px solid #d5dde5;
-	padding: 8px;
-	margin: 10px 10px 0 6px;
+	clear: right;
+	color: #a4a4a4;
+	font-size: 0.9em;
+	border-top: 1px solid #d5d5d5;
+	padding: 10px 0;
+	margin: 6px 0 4px;
+	position: relative;
 }
 
-	.signature a {
-		text-decoration: underline;
-	}
+	.signature a { text-decoration: underline; }
 
 .post_block {
-	margin: 0 0 1px 0;
 	position: relative;
 }
 
@@ -4047,50 +4075,37 @@ input.post_mod {
 	}
 	
 	.post_block h3 {
-		padding: 8px;
+		background: #D8DDE8;
+		padding: 0 10px;
+		height: 36px;
+		line-height: 36px;
+		font-weight: normal;
+		font-size: 16px;
 	}
 	
-	.post_block address {
-		font-weight: bold;
-	}
-	
-	.post_wrap {
-		top: 0px;
-	}
-	
-	.post_block.topic_summary h3 {
-		padding: 4px;
-	}
-	
-	.post_block.topic_summary .posted_info {
-		margin-left: 10px;
-	}
-	
-	.post_block.topic_summary .post_body .post {
-		padding: 3px 10px 15px;
-		margin-top: -15px;
-	}
-	
-	.post_block.with_rep .post_body {
-		margin-bottom: 25px;
-	}
-	
-	
-.post_body {
-	margin-left: 235px;
-	line-height: 100%;
-}
+	.post_wrap { top: 0px; }	
 
-	.post_block.no_sidebar .post_body {
-		margin-left: 0px;
-	}
+.post_body {
+	margin: 0 10px 0 185px;
+	padding-top: 15px;
+}
 	
 	.post_body .post {
-		margin-top: 3px;
-		padding: 10px;
-		line-height: 150%;
+		line-height: 1.6;
+		font-size: 14px;
 	}
 	
+	.post_block.no_sidebar .post_body { margin-left: 10px !important; }
+	
+.posted_info {
+	padding: 0 0 10px 0;
+}
+
+	.posted_info strong.event {
+		color: #1c2837;
+		font-size: 1.2em;
+	}
+
 .post_ignore {	
 	background: #fafbfc;
 	color: #777;
@@ -4106,29 +4121,14 @@ input.post_mod {
 	}
 
 .rep_bar {
-	background: #e4ebf2;
-	font-size: 0.8em;
-	border-top-left-radius: 5px;
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-top-left-radius: 5px;
-	padding: 0 10px;
-	right: 0;
-	bottom: 32px;
-	position: absolute;
+	white-space: nowrap;
+	margin: 6px 4px;
 }
-	
-/*	.post_block.rep_highlight .rep_bar {
-		max-width: 140px;
-	}*/
 
-	.rep_bar ul {
-		margin-top: 8px;
-		float: left;
+	.rep_bar .reputation {
+		font-size: 10px;
+		padding: 2px 10px !important;
 	}
-	
-		.rep_bar ul li {
-			float: left;
-		}
 		
 p.rep_highlight {
 	float: right;
@@ -4137,9 +4137,9 @@ p.rep_highlight {
 	background: #D5DEE5;
 	color: #1d3652;
 	padding: 5px;
-	border-radius: 5px;
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
+	border-radius: 5px;
 	font-size: 0.8em;
 	font-weight: bold;
 	text-align: center;
@@ -4148,58 +4148,14 @@ p.rep_highlight {
 	p.rep_highlight img {
 		margin-bottom: 4px;
 	}
-	
-p.posted_info {
-	padding: 10px 5px 7px 7px;
-	margin-left: -3px;
-	margin-bottom: -10px;
-}
 
-	p.posted_info strong.event {
-		color: #1c2837;
-		font-size: 1.2em;
-	}
-
-p.edit {
-	background-color: #f3f3f3;
-	color: #515151;
-	font-size: 0.9em;
-	line-height: 120%;
-	padding: 10px;
-	margin-top: 10px;
-}
-
-div.threaded_view ul ul {
-	margin-left: -25px;
-}
-
-div.threaded_view ul li {
-	padding: 0px 0 0px 25px;
-}
-
-	div.threaded_view {
-		line-height: 140%;
-		padding: 5px 0 15px 0;
-	}
-	
-	div.threaded_view .post_title {
-		font-style: italic;
-	}
-
-.topic_share {
-	font-size: 0.9em;
-	padding: 3px;
-	margin-top: 4px;
-}
-
-	.topic_share li {
-		float: left;
-		margin: 0 5px;
-	}
-
-.poll {
-	border-bottom: 7px solid #1d3652;
-	margin-bottom: 5px;
+.edit {
+	padding: 2px 0 0 24px;
+	background: url({style_images_url}/icon_warning.png ) no-repeat left 4px;
+	font-size: 12px;
+	margin-top: 15px;
+	line-height: 14px;
+	color: #7c7c7c;
 }
 
 .poll fieldset {
@@ -4236,19 +4192,9 @@ div.threaded_view ul li {
 	padding: 1px 0 1px 1px;
 }
 
-.topic .main_topic_title {
-	float: left;
-}
-
-.maintitle .rating {
-	font-size: 11px;
-	margin: 4px 0 0 15px;
-	float: right;
-}
-
-	.maintitle .rating img {
-		margin-top: -2px;
-	}
+.rating { display: block; margin-bottom: 4px; line-height: 16px; } 
+	.rating img { vertical-align: top; }
+#rating_text { margin-left: 4px; }
 	
 /************************************************************************/
 /* POSTING FORM (& RELATED) STYLES */
@@ -4270,7 +4216,7 @@ div.post_form label {
 
 	div.post_form .checkbox input.input_check,
 	#mod_form .checkbox input.input_check {
-		margin-left: 315px;
+		margin-left: 295px;
 	}
 	
 	div.post_form .antispam_img {
@@ -4336,58 +4282,28 @@ fieldset.with_subhead {
 	display: block;
 }
 
-.post_form #poll_wrap .question {
+#poll_wrap .question {
 	margin-bottom: 10px;
 }
 
-	.post_form #poll_wrap .question .wrap {
-		background-color: #e4ebf2;
-		padding: 10px;
-		margin-left: 290px;
-		margin-right: 12px;
-	}
-
-		.post_form #poll_wrap .question .wrap ol {
-			margin-left: 25px;
-			margin-top: 16px;
+		#poll_wrap .question .wrap ol {
+			margin-left: 25px; 
 			list-style: decimal;
 		}
-			.post_form #poll_wrap .question .wrap ol li {
+			#poll_wrap .question .wrap ol li {
 				margin: 5px;
 			}
-
-	.post_form #poll_wrap .question .wrap input.input_check,
-	.post_form #poll_wrap .question .wrap label,
-	.post_form #poll_wrap .question .wrap span.desc {
-		text-align: left;
-		margin-left: 0;
-		display: inline;
-		width: auto;
-		clear: none;
-		float: none;
-	}
 	
-	.post_form #poll_wrap .question ul.post_controls {
-		text-align: left;
-	}
-	
-.post_form .question_title {
-	font-weight: bold;
-}
+.question_title { margin-left: 30px; padding-bottom: 0; }
+	.question_title .input_text { font-weight: bold }
 
-.post_form #poll_form .topic_buttons {
-	margin-left: 315px;
-}
+#poll_wrap { position: relative; }
+#poll_footer { }
+#poll_container_wrap { overflow: auto; }
+#poll_popup_inner { overflow: hidden; }
 
-	.post_form #poll_form .topic_buttons li,
-	.post_form #poll_form .post_controls li {
-		float: left;
-	}
-
-.post_form #poll_form #poll_stats.desc {
-	margin-left: 320px;
-	margin-bottom: 8px;
-}
+.poll_control { margin-left: 20px; }
+.post_form .tag_field ul { margin-left: 290px; }
 
 /************************************************************************/
 /* ATTACHMENT MANAGER (& RELATED) STYLES */
@@ -4397,9 +4313,7 @@ fieldset.with_subhead {
 	z-index: 1;
 }
 	
-#attachments {
-	margin: 15px;
-}
+#attachments { }
 
 	#attachments li {
 		background-color: #e4ebf2;
@@ -4468,160 +4382,54 @@ fieldset.with_subhead {
 			position: absolute;
 		}
 		
-fieldset.attachments .input_submit, fieldset.attachments .swfupload, fieldset.attachments .input_upload {
-	margin-left: 15px;
+.attach_controls {
+	background: url({style_images_url}/icon_attach.png ) no-repeat 3px top;
+	padding-left: 30px;
+	min-height: 82px;
 }
 
-div.post_form fieldset.attachments span.desc {
-	margin: 0 0 0 15px;
-	display: inline;
-	clear: none;
-}
+	.attach_controls .ipsType_subtitle { margin-bottom: 5px; }
+	.attach_controls iframe { display: block; margin-bottom: 5px; }
+	
+.attach_button { font-weight: bold;  }
+#help_msg {	margin-top: 8px; }
 
 #attach_wrap {
-	background: #eef3f8;
-	padding: 6px;
-	margin-top: 8px;
+	/*background: #eef3f8;
+	padding: 6px;*/
+	margin-top: 10px;
+	overflow: hidden;
 }
 
 	#attach_wrap h4 {
-		font-size: 1em;
-		font-weight: bold;
+		font-size: 16px;
+		padding-left: 0px;
 	}
 	
 	#attach_wrap li {
-		margin: 5px 6px;
+		margin: 5px 0;
 		float: left;
 	}
+		#attach_wrap .attachment {
+			float: none;
+		}
 		
 		#attach_wrap .desc.info {
 			margin-left: 24px;
 		}
 
-
-/************************************************************************/
-/* COMMENTS (& RELATED) STYLES */
-
-#comment_list {
-	margin-top: 10px;
-}
-
-#comment_innerwrap .no-form {
-	margin-top: 4px;
-}
-
-.comment_wrap .comment {
-	line-height: 150%;
-	padding: 5px;
-}
-	.comment_wrap {
-		position: relative;
-	}
-
-		.comment_wrap .rep_bar {
-			position: static;
-			margin: -10px -5px -5px 0;
-			
-		}
-	
-	
-	.comment_wrap .comment .photo {
-		float: left;
-		margin: 0 10px 10px 0;
-	}
-	
-	.comment_wrap .comment h4,
-	.comment_wrap .posted_date,
-	.comment_wrap .comment .comment_content {
-		margin-left: 65px;
-	}
-
-	.comment_wrap .posted_date {
-		display: block;
-	}
-	
-	.comment_wrap .comment h4 {
-		font-size: 1.1em;
-		margin-bottom: -3px;
-		clear: none !important;
-	}
-
-		.comment_wrap .comment h4 a {
-			text-decoration: none;
-		}
-	
-	.comment_wrap .comment .comment_content {
-		padding: 10px 5px;
-	}
-
-.comment_options {
-	float: right;
-}
-
-	.comment_options li {
-		font-size: 0.8em;
-		font-weight: bold;
-		margin: 0 5px;
-		float: left;
-	}
-	
-	.comment_options li a,
-	.comment .cleft a {
-		text-decoration: none;
-	}
-	
-#commentReply {
-	margin-left: 70px;
-}
-
-#commentUser {
-	padding-top:0px;
-	padding-left: 10px;
-	float: left;
-}
-
-#commentButtons {
-	margin: 0px 0px 10px 0px;
-	text-align: right;
-}
-	
-/* New comment styles */
-.comment .post_wrap .cleft {
-	float: left;
-	margin-left: 65px;
-	padding-left: 5px;
-	position: absolute;
-	display: inline-box;
-}
-
-.comment_wrap .comment.gallery_row_off,
-.comment_wrap .comment.row1,
-.comment_wrap .comment.row2 {
-	margin-bottom: 0px;
-	margin-top: 0px;
-	margin-left: 0px;
-	padding-left: 0px;
-	border-bottom: 0px;
-}
-
-.comment_wrap .comment.row2 {
-	padding-top: 5px;
-}
-
-.comment_content {
-	padding: 10px 0px 10px 0px;
-}
+#attach_error_box {	margin-bottom: 10px; }
 
 /************************************************************************/
 /* REPUTATION STYLES */
 
-.reputation
-/*.post_block .rep_highlight*/ {
+.reputation {
 	font-weight: bold;
 	padding: 3px 8px;
-	margin: 6px;
-	display: block;
-	float: right;
+	display: inline-block;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 }
 	
 	.reputation.positive, .members li.positive {
@@ -4640,110 +4448,9 @@ div.post_form fieldset.attachments span.desc {
 		background: #dedede;
 		color: #6e6e6e;
 	}
-	
-/*body .post_block .rep_highlight {	
-	font-size: 1.1em;
-	float: left;
-}*/
-	
-	
 
-/************************************************************************/
-/*  PORTAL STYLES */
-	
-#index_stats.portal
-{
-	margin-top: 0px;
-}
-	
-#portal_articles {
-	width: 76%;
-	margin-right: 2%;
-}
 
-#portal_active_users ul,
-#portal_active_users li {
-	float: left;
-	padding: 3px;
-}
-
-#portal_active_users ul {
-	margin-bottom: 15px;
-}
-
-/************************************************************************/
-/* Status updates */
-
-#status_recent_actions {
-	width: 20%;
-}
-
-.status_profile_page {
-	width: 65%;
-	margin-right: 10px;
-	float: left;
-}
-
-.status_profile_actions
-{
-	width: 30%;
-	padding: 10px;
-	float: left;
-}
-
-.status_action_left
-{
-	margin-left:4px;
-	float: left;
-}
-.status_action_right
-{
-	margin-left: 35px;
-}
-
-#status_standalone_page {
-	width: 76%;
-}
-
-#status_wrapper {
-}
-
-	#status_wrapper .right {
-		padding-bottom: 8px;
-		padding-right: 8px;
-	}
-
-	#status_wrapper p.no-status, .status_profile_actions p.no-status {
-		padding: 10px;
-		text-align: center;
-		font-size: 1.1em;
-	}
-	
-	.status_profile_actions p.no-status {
-		padding: 4px;
-	}
-
-.status_main_wrap {
-	margin-bottom: 20px;	
-	margin: 10px;
-	padding: 15px;
-	background: #fff;
-	-moz-box-shadow: #e5e5e5 2px 2px 2px;
-	-webkit-box-shadow: #e5e5e5 2px 2px 2px;
-}
-
-	.status_main_wrap a {
-		text-decoration: none;
-	}
-	
-.status_main_photo {
-	float: left;
-}
-
-.status_main_content {
-	margin-left: 65px;
-	word-wrap: break-word;
-}
+.status_main_content { white-space: break-word; }
 
 .status_main_content h4 {
 	font-weight:normal;
@@ -4770,160 +4477,32 @@ div.post_form fieldset.attachments span.desc {
 	float: left;
 }
 
-.status_mini_content {
-	margin-left: 35px;
-}
-
-.status_mini_content p {
-	font-size:10px;
-	padding: 4px 0px 4px 0px;
-}
-
-.status_mini_content h5 {
-	font-weight:normal;
-	padding-top: 4px;
-	font-size:1.0em;
-}
-
-.status_mini_content h5 a {
-	font-weight:bold;
-}
 
 .status_textarea {
 	width: 99%;
 }
 
-.status_submit {
-	padding-right: 5px;
-	text-align: right;
-}
-
 .status_replies_many {
 	height: 300px;
 	overflow: auto;
 }
 
+	
 .status_update {
-	background: #2b4f74;
+	background: #71a5c9;
 	color: #fff;
 	padding: 15px 12px;
 }
-	.status_update input
-	{
-		font-size: 1.1em;
-	}
-	
-	.status_update .desc
-	{
-		color: #FFFFFF;
-	}
-	
-	.status_profile_actions div
-	{
-		padding:5px 0px 5px 0px;
-	}
 
-.status_main_content h4 a.su_links { font-weight: normal;}
-
-/* Fiddle with some stuffs for the status hook */
-#statusHook{
-	background: #FFFFFF;
-	padding: 0px;
-}
-	#statusHook h3 {
-		margin:0px;
-		padding: 5px;
-	}
-	
-	#statusHook .status_main_photo {
-		padding:6px;
-	}
-	
-	#statusHook .status_main_content {
-		margin-left: 0px;
-	}
-	
-	#statusHook .status_main_content h4 {
-		font-size: 0.95em;
-		padding: 2px 6px 0px 6px;
-		margin-left:28px;
-		line-height: 125%;
-	}
-	
-	#statusHook .status_main_content p {
-		padding: 2px 6px 2px 6px;
-		margin-left:28px;
-	}
-	
-	#statusHook .status_update {
-		margin-bottom: 0px;
-		padding: 6px;
-	}
-	
-	#statusHook .status_main_wrap {
-		margin: 0;
-		background-color: #f1f4f7;
-		border-bottom:2px solid #e4ebf2;
-		padding: 4px;
-		-moz-box-shadow: none;
-		-webkit-box-shadow: none;
-	}
-	
-	#statusHook .status_mini_wrap {
-		background-color: #fafbfc !important;
-	}
-	
-	#statusHook .status_mini_wrap h5
-	{
-		color: #606060;
-		font-size: 0.9em;
-	}
-	
-	#statusHook .status_mini_content {
-		margin-left: 45px;
-	}
-	#statusHook #statusUpdate,
-	#statusHook #statusSubmit {
-		font-size: 0.9em !important;
-	}
-	
-	#statusUpdate {
-		padding: 2px;
-	}
-	
-	#statusHook .status_feedback {
-		/*border-left: 2px solid #e4ebf2;*/
-		margin: 0 -4px -4px 10px;
-	}
-	
-	#statusHook .status_update .desc
-	{
-		color: #606060;
-	}
-	
-	.status_inactive {
-		color: gray;
-	}
-	
-	.status_smallspace {
-		font-size: 1.0em;
-	}
-
-#notificationlog table td a, #likesList table td a {
-	text-decoration: underline;
-}
-
-#chat-tab-count {
-	background-color: #d5dde5;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding: 2px 5px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	color: #000;
-	text-decoration: none;
-	z-index: 5000;
-}
+	.status_update .input_text { width: 70%; padding: 6px 4px; }
+	.status_update .status_inactive { color: #bbbbbb; }	
+	#status_wrapper h4 { font-weight: bold; font-size: 14px; }
+	.status_content { line-height: 1.4; }
+	.status_content .mod_links { opacity: 0.2; }
+	.status_content:hover .mod_links { opacity: 1; }
+	.status_content .h4, .status_content .status_status { font-size: 14px; word-wrap: break-word; }
+	.status_feedback { margin: 10px 0 0 -10px; }
+		.status_feedback .row2 { margin-bottom: 1px; }
 
 /* Favorites */
 .ips_like {
@@ -4936,8 +4515,7 @@ div.post_form fieldset.attachments span.desc {
 	line-height: 130%;
 	clear: both;
 }
-.ips_like a
-{
+.ips_like a {
 	color: #878787;
 }
 
@@ -4958,6 +4536,7 @@ div.post_form fieldset.attachments span.desc {
 
 .ips_like a.ftoggle.on {
 	/*background: #e4ebf2 url({style_images_url}/icons/fave_on_small.png) no-repeat left 2px;*/
+	margin-left: 3px;
 }
 
 .ips_like a.ftoggle._newline,
@@ -4976,71 +4555,148 @@ div.post_form fieldset.attachments span.desc {
 	background-color: #d5dde5;
 }
 
-/* Fave pop-up */
-.likepop {
-	padding:4px;
-}
-
-.likepop div {
-	min-height: 60px;
-	display: block;
-}
-.likepop img {
-	float: left;
-	margin-top: 4px;
-	margin-left: 4px;
-}
-
-.likepop div em {
-	float: right;
-	padding-top: 8px;
-	padding-right: 8px;
-}
-.likepop div div {
-	margin-left: 62px;
-	padding-top: 8px;
-}
-
-.likepop div div strong {
-	font-size: 1.1em;
-}
-
-.likepop div div p {
-	margin-top:6px;
-	line-height: 150%;
-}
-
-
-/* reduce images in topic pop-up */
-#topicPreview img
-{
-	max-width: 200px;
-	max-height: 200px;
-	clear:both;
-}
-
-.facebook-like {
-	float: left;
-}
+.facebook-like { margin-top: 5px; }
 
 .boxShadow {
 	-webkit-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
-	-moz-box-shadow: rgba(0, 0, 0, 0.64) 0px 12px 25px;
+	-moz-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
 	box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
+}
+
+/* New notification panel */
+#ipsGlobalNotification {
+	position: fixed;
+	left: 50%;
+	margin-left: -250px;
+	top: 20px;
+	text-align: center;
+	font-weight: bold;
+}
+
+#ips_NotificationCloseButton {
+	background: transparent url({style_images_url}/close_popup.png) no-repeat top left;
+	opacity: 0.8;
+	width: 13px;
+	height: 13px;
+	top: 5px;
+	left: 5px;
+	position: absolute;
+	cursor: pointer;
+}
+
+.googlePlusOne {
+	display: inline-block;
+	vertical-align:middle;
+	margin-top: 1px;
+}
+/************************************************************************/
+/* SHARED MEDIA STYLES */
+
+#mymedia_inserted {
+	position: absolute;
+	top: 100px; left: 50%;
+	margin-left: -200px;
+	width: 400px;
+	padding: 20px 0;
+	background: black;
+	font-size: 15px;
+	font-weight: bold;
+	color: #fff;
+	z-index: 20000;
+	text-align: center;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+#mymedia_toolbar { 
+	position: absolute;
+	bottom: 0; left: 0;	right: 0;
+	height: 42px;
+	line-height: 42px;
+	padding: 0 5px;
+	background: #DBE4EF;
+	background: -moz-linear-gradient(top, #DBE4EF 0%, #c7d4e4 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#DBE4EF), color-stop(100%,#c7d4e4)); /* webkit */
+	-webkit-box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	-moz-box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	box-shadow: 0px 1px 1px 0px rgba(255,255,255,0.5) inset;
+	border-top: 1px solid #DBE4EF;
+}
+
+#mymedia_finish { position: absolute; right: 5px; top: 5px; }
+#mymedia_content { height: 339px; overflow: auto; }
+
+.media_results li.result {
+	width: 20%;
+	height: 100px;
+	padding: 15px 0;
+	float: left;
+	text-align: center;
+	cursor: pointer;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+	.media_results li:hover { 
+		background: #F9F9F9;
+		background: -moz-linear-gradient(top, #F9F9F9 0%, #EDEDED 100%);
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(100%,#EDEDED));
+	}
+	.media_results li:active { 
+		background: #EDEDED;
+		background: -moz-linear-gradient(top, #EDEDED 0%, #F9F9F9 100%);
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#EDEDED), color-stop(100%,#F9F9F9));
+	}
+	
+	.media_image {
+		padding: 1px;
+		border: 1px solid #d5d5d5;
+		margin-bottom: 5px;
+	}
+
+/********************************************************/
+/* ModCP styles											*/
+
+.modcp_post_controls { padding-bottom: 15px; }
+.modcp_post_controls .ipsButton_secondary { opacity: 0.5; }
+.post_body:hover .modcp_post_controls .ipsButton_secondary { opacity: 1; }
+
+#modcp_content .ipsFilterbar li.active a {
+	margin-bottom: 1px;
+	display: inline-block;
+}
+
+/********************************************************/
+/* Advertisements from Nexus							*/
+
+.nexusad { padding: 10px; clear: both; }
+
+#bbcode-description {
+	color: #666 !important;
+	white-space: normal !important;
+	word-wrap: break-word;
+}
+
+/********************************************************/
+/* iPad Specific									*/
+@media only screen and (device-width: 768px) {
+	table.ipb_table .expander,
+	table.ipb_table .ipsModMenu { visibility: visible; opacity: 0.2; }
+	.post_block .post_controls { opacity: 1 !important;	}
 }]]></css_content>
     <css_position>1</css_position>
     <css_app>core</css_app>
     <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_ucp</css_group>
     <css_content>/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
@@ -5048,40 +4704,28 @@ div.post_form fieldset.attachments span.desc {
 /* ipb_ucp.css - UserCP styles											*/
 /************************************************************************/
 
-#fbUserBox p.desc {
-	left: 0px;
+#usercp_content { min-height: 420px; }
+#fbUserBox p.desc { left: 0px; }
+
+.ipsSettings_section .custom .wrap { display: block; padding: 8px 0 8px 15px; }
+	.ipsSettings_section .custom .wrap span.f { margin-right: 10px; }
+
+.notify_icon {
+	width: 12px;
+	height: 12px;
+	display: inline-block;
+	vertical-align: middle;
+	margin-right: 3px;
+	background: url({style_images_url}/icon_notify_types.png ) no-repeat;
 }
 
-#usercp_menu {
-	text-align: right;
-	font-size: 0.9em;
-	border-right: 3px solid #528f6c;
-	width: 190px;
-	float: left;
-}
+.notification_table td .notify_icon { visibility: hidden; }
+.notification_table tr:hover td .notify_icon { visibility: visible; }
+
+	.notify_icon.inline { background-position: left; }
+	.notify_icon.mobile { background-position: center; }
+	.notify_icon.email { background-position: right; }
 
-	#usercp_menu li {
-		background-color: #e4ebf2;
-		padding: 6px 5px;
-		margin: 0 8px 4px 0;
-	}
-		
-		#usercp_menu li a {
-			text-decoration: none;
-		}
-	
-	#usercp_menu li.active {
-		background-color: #528f6c;
-		color: #fff;
-		font-weight: bold;
-		font-size: 1.05em;
-		border-radius: 4px 0 0 4px;
-		-moz-border-radius: 4px 0 0 4px;
-		-webkit-border-top-left-radius: 4px;
-		-webkit-border-bottom-left-radius: 4px;
-		padding: 6px 5px;
-		margin-right: 0px;
-	}
 
 div.avatar_gallery {	
 	text-align: center;
@@ -5096,42 +4740,6 @@ div.avatar_gallery {
 		display: inline-block;
 	}
 	
-.usercp_body {
-	background-color: transparent;
-	padding: 5px 5px 20px 5px;
-}
-
-#usercp_content {
-	padding: 0 0 0 10px;
-	margin-left: 190px;
-	border-left: 3px solid #528f6c;
-}
-	
-	#usercp_content fieldset.row1,
-	#usercp_content fieldset.row2 {
-		padding: 10px;
-		margin-bottom: 4px;
-	}
-	
-	#usercp_content h3 {
-		padding: 0;
-		border: 0;
-		font-size: 1em;
-		margin-left: -2px;
-		margin-bottom: 4px;
-		font-weight: bold;
-	}
-	
-	#usercp_content .post_block h3 {
-		font-size: 1.1em;
-		padding: 5px 8px 3px 8px;
-		margin-left: 0;
-	}
-	
-	#usercp_content .post {
-		padding: 20px;
-	}
-	
 /* Notify styles */
 #usercp_content .notification_table td.notify_title {
 	font-size: 0.9em;
@@ -5144,11 +4752,9 @@ div.avatar_gallery {
     <css_position>1</css_position>
     <css_app>core</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules>usercp</css_modules>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
 </css>
diff --git a/upload/admin/applications/core/xml/core_root_templates.xml b/upload/admin/applications/core/xml/core_root_templates.xml
index e1f4e2e3..9554af79 100644
--- a/upload/admin/applications/core/xml/core_root_templates.xml
+++ b/upload/admin/applications/core/xml/core_root_templates.xml
@@ -1,97 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<templates application="core" templategroups="a:10:{s:12:&quot;skin_editors&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_emails&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_global&quot;;s:5:&quot;exact&quot;;s:17:&quot;skin_global_other&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_help&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_login&quot;;s:5:&quot;exact&quot;;s:13:&quot;skin_register&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_reports&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_search&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_stats&quot;;s:5:&quot;exact&quot;;}">
+<templates application="core" templategroups="a:12:{s:12:&quot;skin_editors&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_emails&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_global&quot;;s:5:&quot;exact&quot;;s:17:&quot;skin_global_other&quot;;s:5:&quot;exact&quot;;s:20:&quot;skin_global_comments&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_help&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_login&quot;;s:5:&quot;exact&quot;;s:13:&quot;skin_register&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_reports&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_search&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_stats&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_modcp&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_editors">
     <template>
       <template_group>skin_editors</template_group>
-      <template_content><![CDATA[<if test="ajaxerror:|:$error_msg">
+      <template_content><![CDATA[<php>
+	$inlinePost = $post;
+	
+	$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+	$this->editor = new $classToLoad();
+	
+	$inlinePost = $this->editor->convertContent( $post );
+</php>
+<if test="jsNotLoaded:|:$extraData['_loadJs']">
+	{parse template="editorLoadJs" group="editors" params="$extraData['smilies']"}
+</if>
+<if test="ajaxerror:|:$error_msg">
 	<p id='error_msg_e{$pid}' class='message error'>{$error_msg}</p>
 <else />
 	<p id='error_msg_e{$pid}' class='message error' style='display: none'>{$error_msg}</p>
 </if>
 <input type='hidden' name='editor_ids[]' value='e{$pid}' />
 <div class='ips_editor' id='editor_e{$pid}'>
-	<if test="hidesidebar:|:$this->settings['_remove_emoticons']==0">
-		<div class='sidebar row1 altrow' id='e{$pid}_sidebar' <if test="IPSCookie::get('emoticon_sidebar') != '1'">style='display: none'</if>>
-			<h4><img src='{$this->settings['img_url']}/close_popup.png' alt='' id='e{$pid}_close_sidebar' /><span>{$this->lang->words['emoticons_template_title']}</span></h4>
-			<div id='e{$pid}_emoticon_holder' class='emoticon_holder'></div>
-			<div class='show_all_emoticons' id='e{$pid}_showall_bar'>
-				<input type='button' value='{$this->lang->words['show_all_emotes']}' id='e{$pid}_showall_emoticons' class='input_submit emoticons' />
-			</div>
+	{parse editor="Post" content="$post" options="array( 'editorName' => 'edit-' . $pid, 'type' => 'full', 'minimize' => 0 )"}
+	<if test="showeditoptions:|:$extraData['showEditOptions']">
+		<div class='row2 ipsPad'>
+				<if test="showreason:|:$extraData['showReason']">
+					{$this->lang->words['preason_for_edit']} <input type='text' size='35' maxlength='250' class='input_text' id='post_edit_reason_{$pid}' name='post_edit_reason_{$pid}' value='{$extraData['reasonForEdit']}' tabindex='0' />
+				</if>
+				<if test="showappendedit:|:$extraData['showAppendEdit']">
+				<input type='checkbox' name='add_edit_{$pid}' id='add_edit_{$pid}' <if test="appendedit:|:$extraData['append_edit']">checked='checked'</if> value='1' /> <label for='add_edit'>{$this->lang->words['show_edited_by']}</label>
+				</if>
 		</div>
 	</if>
-	<div id='e{$pid}_controls' class='controls'>
-		<ul id='e{$pid}_toolbar_1' class='toolbar'>
-			<li class='left'>
-				<span id='e{$pid}_cmd_fontname' class='rte_control rte_menu rte_font' title='{$this->lang->words['box_font']}'>{$this->lang->words['box_font']}</span>
-			</li>
-			<li class='left sep'>
-				<span id='e{$pid}_cmd_fontsize' class='rte_control rte_menu rte_fontsize' title='{$this->lang->words['box_size']}'>{$this->lang->words['box_size']}</span>
-			</li>
-			<li class='left'>
-				<span id='e{$pid}_cmd_forecolor' class='rte_control rte_palette' title='{$this->lang->words['js_tt_font_col']}'><img src='{$this->settings['img_url']}/rte_icons/font_color.png' alt='{$this->lang->words['js_tt_font_col']}' /></span>
-			</li>
-			
-			<li class='right'>
-				<span id='e{$pid}_cmd_spellcheck' class='rte_control rte_button' title='{$this->lang->words['js_tt_spellcheck']}'><img src='{$this->settings['img_url']}/rte_icons/spellcheck.png' alt='{$this->lang->words['js_tt_spellcheck']}' /></span>
-			</li>
-		</ul>
-		<ul id='e{$pid}_toolbar_2' class='toolbar'>
-			<li class='left'>
-				<span id='e{$pid}_cmd_bold' class='rte_control rte_button' title='{$this->lang->words['js_tt_bold']}'><img src='{$this->settings['img_url']}/rte_icons/bold.png' alt='{$this->lang->words['js_tt_bold']}' /></span>
-			</li>
-			<li class='left'>
-				<span id='e{$pid}_cmd_italic' class='rte_control rte_button' title='{$this->lang->words['js_tt_italic']}'><img src='{$this->settings['img_url']}/rte_icons/italic.png' alt='{$this->lang->words['js_tt_italic']}' /></span>
-			</li>
-			<li class='left'>
-				<span id='e{$pid}_cmd_underline' class='rte_control rte_button' title='{$this->lang->words['js_tt_underline']}'><img src='{$this->settings['img_url']}/rte_icons/underline.png' alt='{$this->lang->words['js_tt_underline']}' /></span>
-			</li>
-			<li class='sep'>
-				<span id='e{$pid}_cmd_strikethrough' class='rte_control rte_button' title='{$this->lang->words['js_tt_strike']}'><img src='{$this->settings['img_url']}/rte_icons/strike.png' alt='{$this->lang->words['js_tt_strike']}' /></span>
-			</li>
-		<if test="ajaxremoveemoticons:|:$this->settings['_remove_emoticons']==0">
-			<li>
-				<span id='e{$pid}_cmd_emoticons' class='rte_control rte_button' title='{$this->lang->words['js_tt_emoticons']}'><img src='{$this->settings['img_url']}/rte_icons/emoticons.png' alt='{$this->lang->words['js_tt_emoticons']}' /></span>
-			</li>
-		</if>
-			<li>
-				<span id='e{$pid}_cmd_link' class='rte_control rte_palette' title='{$this->lang->words['js_tt_link']}'><img src='{$this->settings['img_url']}/rte_icons/link.png' alt='{$this->lang->words['js_tt_link']}' /></span>
-			</li>
-			<li>
-				<span id='e{$pid}_cmd_image' class='rte_control rte_palette' title='{$this->lang->words['js_tt_image']}'><img src='{$this->settings['img_url']}/rte_icons/picture.png' alt='{$this->lang->words['js_tt_image']}' /></span>
-			</li>
-			<li>
-				<span id='e{$pid}_cmd_email' class='rte_control rte_palette' title='{$this->lang->words['js_tt_email']}'><img src='{$this->settings['img_url']}/rte_icons/email.png' alt='{$this->lang->words['js_tt_email']}' /></span>
-			</li>
-			<li>
-				<span id='e{$pid}_cmd_ipb_quote' class='rte_control rte_button' title='{$this->lang->words['js_tt_quote']}'><img src='{$this->settings['img_url']}/rte_icons/quote.png' alt='{$this->lang->words['js_tt_quote']}' /></span>
-			</li>
-			<li>
-				<span id='e{$pid}_cmd_ipb_code' class='rte_control rte_button' title='{$this->lang->words['js_tt_code']}'><img src='{$this->settings['img_url']}/rte_icons/code.png' alt='{$this->lang->words['js_tt_code']}' /></span>
-			</li>
-			<li>
-				<span id='e{$pid}_cmd_media' class='rte_control rte_palette' title='{$this->lang->words['js_tt_media']}'><img src='{$this->settings['img_url']}/rte_icons/media.png' alt='{$this->lang->words['js_tt_media']}' /></span>
-			</li>
-		</ul>
-	</div>
-	<div id='e{$pid}_wrap' class='editor'>
-		<textarea name="Post" class="input_rte" id="e{$pid}_textarea" rows="10" cols="60" tabindex='0'>{$post}</textarea>
-	</div>
-	<fieldset class='submit'>	
-		<if test="showeditoptions:|:$extraData['showEditOptions']">
-			<div class='left-align'>
-					<if test="showreason:|:$extraData['showReason']">
-						{$this->lang->words['reason_for_edit']} <input type='text' size='35' maxlength='250' class='input_text' id='post_edit_reason' name='post_edit_reason' value='{$extraData['reasonForEdit']}' tabindex='0' />
-					</if>
-					<if test="showappendedit:|:$extraData['showAppendEdit']">
-					<input type='checkbox' name='add_edit' id='add_edit' <if test="appendedit:|:$extraData['append_edit']">checked='checked'</if> value='1' /> <label for='add_edit'>{$this->lang->words['show_edited_by']}</label>
-					</if>
-			</div>
-			<br />
-		</if>
-		
+	<fieldset class='submit'>			
 		<if test="htmlstatus:|:is_array( $extraData['checkBoxes']['html'] ) AND count( $extraData['checkBoxes']['html'] )">
 			<div class='left-align' style='margin-bottom: 5px;'>
-				<select name="post_htmlstatus" id="post_htmlstatus" class="input_select" tabindex='0'>
+				<select name="post_htmlstatus_{$pid}" id="post_htmlstatus_{$pid}" class="input_select" tabindex='0'>
 					<option value="0"{$extraData['checkBoxes']['html'][0]}>{$this->lang->words['pp_nohtml']}</option>
 					<option value="1"{$extraData['checkBoxes']['html'][1]}>{$this->lang->words['pp_html1']}</option>
 					<option value="2"{$extraData['checkBoxes']['html'][2]}>{$this->lang->words['pp_html2']}</option>
@@ -101,10 +45,46 @@
 		
 		<input type='submit' value='{$this->lang->words['save_changes']}' class='input_submit' id='edit_save_e{$pid}' tabindex='0' /> <if test="! $extraData['skipFullButton']"><input type='submit' value='{$this->lang->words['use_full_editor']}' class='input_submit alt' id='edit_switch_e{$pid}' tabindex='0' /></if> {$this->lang->words['or']} <a href='#' title='{$this->lang->words['cancel']}' class='cancel' id='edit_cancel_e{$pid}' tabindex='0'>{$this->lang->words['cancel']}</a>
 	</fieldset>
+	<code class='hide' id='edit-$pid-content'>{$inlinePost}</code>
+	<script type="text/javascript">
+		ipb.textEditor.getEditor( 'edit-$pid' ).initEditor( $('edit-$pid-content').innerHTML );
+	</script>
 </div>]]></template_content>
       <template_name>ajaxEditBox</template_name>
       <template_data><![CDATA[$post="", $pid=0, $error_msg="", $extraData]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<php>
+	/* Always return as UTF-8 */
+	$autoSaveData	= is_array($autoSaveData) ? $autoSaveData : array();
+	array_walk_recursive( $autoSaveData, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+	$jsonEncoded = json_encode( $autoSaveData );
+	$jsonEncoded = IPSText::convertCharsets($jsonEncoded, "UTF-8", IPS_DOC_CHAR_SET);
+</php>
+<if test="jsNotLoaded:|:empty($this->_editorJsLoaded)">
+	{parse template="editorLoadJs" group="editors" params="$options"}
+</if>
+<textarea id="{$options['editorName']}" name="{$formField}" class='ipsEditor_textarea input_text<if test="ismini:|:$options['type'] == 'mini'"> mini</if>'>{$content}</textarea>
+<script type="text/javascript">
+	ipb.textEditor.initialize('{$options['editorName']}', { type: <if test="hasType:|:$options['type']">'{$options['type']}'<else />''</if>,
+															height: <if test="hasHeight:|:$options['height'] > 0">{$options['height']}<else /><if test="ismini:|:$options['type'] == 'mini'">150<else />300</if></if>,
+															minimize: <if test="hasMinimize:|:$options['minimize']">'{$options['minimize']}'<else />0</if>,
+															bypassCKEditor: {parse expression="intval( $options['bypassCKEditor'] )"},
+															delayInit: {parse expression="intval( $options['delayInit'] )"},
+															isRte: {parse expression="intval( $options['isRte'] )"},
+															isTypingCallBack: <if test="hasCallback:|:$options['isTypingCallBack']">{$options['isTypingCallBack']}<else />''</if>,
+															ips_AutoSaveKey: <if test="hasSaveKey:|:$options['autoSaveKey']">'{$options['autoSaveKey']}'<else />''</if>,
+											                ips_AutoSaveData: {$jsonEncoded} } );
+</script>]]></template_content>
+      <template_name>editor</template_name>
+      <template_data><![CDATA[$formField='post', $content='', $options=array(), $autoSaveData=array()]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -135,7 +115,7 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
 	ipb.vars['emoticon_url'] = "{$this->settings['emoticons_url']}";]]></template_content>
       <template_name>editorJS</template_name>
       <template_data><![CDATA[$emoticons='']]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -143,7 +123,91 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
     </template>
     <template>
       <template_group>skin_editors</template_group>
-      <template_content><![CDATA[<if test="$show_sidebar = IPSCookie::get('emoticon_sidebar')"></if>
+      <template_content><![CDATA[{parse js_module="textEditor"}
+<php>
+	$this->_editorJsLoaded = true;
+	/* Always return as UTF-8 */
+	$_tmp	= is_array($options['smilies']) ? $options['smilies'] : array();
+	array_walk_recursive( $_tmp, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+	$jsonEncoded = json_encode( $_tmp );
+	$jsonEncoded = IPSText::convertCharsets($jsonEncoded, "UTF-8", IPS_DOC_CHAR_SET);
+</php>
+<if test="bypassCkEditor:|: ! $options['bypassCKEditor']">
+	<if test="defined("CK_LOAD_SOURCE") AND CK_LOAD_SOURCE">
+		<!-- Load source files, not the minified version -->
+		<script type="text/javascript" src="{$this->settings['js_base_url']}js/3rd_party/ckeditor/ckeditor_source.js"></script>
+	<else />
+		<script type="text/javascript" src="{$this->settings['js_base_url']}js/3rd_party/ckeditor/ckeditor.js"></script>
+	</if>
+	<script type="text/javascript">
+		/* Dynamic items */
+		CKEDITOR.config.IPS_BBCODE          = {IPSLib::fetchBbcodeAsJson( array( 'skip' => array( 'sharedmedia' ) ) )};
+		CKEDITOR.config.IPS_BBCODE_IMG_URL  = "{$this->settings['public_cdn_url']}style_extra/bbcode_icons";
+		CKEDITOR.config.IPS_BBCODE_BUTTONS  = [];
+		
+		/* Has to go before config load */
+		var IPS_smiley_path			= "{$this->settings['emoticons_url']}/";
+		var IPS_smiles       		= <if test="hasimages:|:! empty($options['smilies']['count'])">{$jsonEncoded}<else />{}</if>;
+		var IPS_remove_plugins      = [];
+		var IPS_hide_contextMenu    = {parse expression="intval($this->settings['cke_hide_contextMenu'])"};
+		var IPS_rclick_contextMenu  = {parse expression="intval($this->memberData['bw_cke_contextmenu'])"};
+		
+		/* Has to go after */
+		<if test="noSmilies:|:$options['noSmilies']">
+		IPS_remove_plugins.push( 'ipsemoticon' );
+		</if>
+		
+		/* Load our configuration */
+		CKEDITOR.config.customConfig  = '{$this->settings['js_base_url']}js/3rd_party/ckeditor/ips_config.js';
+	</script>
+</if>
+{parse expression="$this->registry->output->addToDocumentHead( 'importcss', "{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_ckeditor.css" )"}]]></template_content>
+      <template_name>editorLoadJs</template_name>
+      <template_data><![CDATA[$options='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['editor_options']}</h3>
+<div class='fixed_inner ipsBox row1'>
+	<div class='ipsSettings'>
+		<fieldset class='ipsSettings_section'>
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='bw_cke_contextmenu'>{$this->lang->words['editor_context_menu']}</label>
+					<br />
+					<select name='bw_cke_contextmenu' id='bw_cke_contextmenu' class='input_select'>
+					<option value='0' <if test="isSelected:|:$this->memberData['bw_cke_contextmenu'] != 1"> selected="selected"</if>>{$this->lang->words['editor_context_menu_crc']}</option>
+					<option value='1' <if test="isSelected:|:$this->memberData['bw_cke_contextmenu'] == 1"> selected="selected"</if>>{$this->lang->words['editor_context_menu_rc']}</option>
+					
+					</select>
+				</li>			
+				<li>
+					<input type='checkbox' class='input_check' id='clearSavedContent' name="clearSavedContent" value="1" /> &nbsp;<label for='clearSavedContent'>{$this->lang->words['editor_clear_data']}</label>
+				</li>
+			</ul>
+		</fieldset>
+	</div>
+	<div class='right' style='position: relative'>
+		<a href='#' id='ipsEditorOptionsSave' class='ipsButton_secondary'>{$this->lang->words['editor_ok']}</a>
+	</div>
+</div>]]></template_content>
+      <template_name>editorSettings</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[{parse addtohead="{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_editor.css" type="importcss"}
+<if test="$show_sidebar = IPSCookie::get('emoticon_sidebar')"></if>
 	<div class='ips_editor' id='editor_{$editor_id}'>
 		<div class='sidebar row1 altrow' id='{$editor_id}_sidebar' style='display: none'>
 			<h4><img src='{$this->settings['img_url']}/close_popup.png' alt='' id='{$editor_id}_close_sidebar' /><span>{$this->lang->words['emoticons_template_title']}</span></h4>
@@ -194,11 +258,6 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
 					<li class='right'>
 						<span id='{$editor_id}_cmd_redo' class='rte_control rte_button' title='{$this->lang->words['js_tt_redo']}'><img src='{$this->settings['img_url']}/rte_icons/redo.png' alt='{$this->lang->words['js_tt_redo']}' /></span>
 					</li>
-					<if test="shellallowrte:|:$this->settings['posting_allow_rte'] == 1">
-						<li class='right'>
-							<!--<span id='{$editor_id}_cmd_switcheditor' class='rte_control rte_button' title='{$this->lang->words['js_tt_switcheditor']}'><img src='{$this->settings['img_url']}/rte_icons/switch.png' alt='{$this->lang->words['js_tt_switcheditor']}' /></span>-->
-						</li>
-					</if>
 				</ul>
 			</if>
 			<ul id='{$editor_id}_toolbar_2' class='toolbar' style='display: none'>
@@ -251,9 +310,6 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
 				<li>
 					<span id='{$editor_id}_cmd_media' class='rte_control rte_palette' title='{$this->lang->words['js_tt_media']}'><img src='{$this->settings['img_url']}/rte_icons/media.png' alt='{$this->lang->words['js_tt_media']}' /></span>
 				</li>
-				<!--<li class='right'>
-					<span id='{$editor_id}_cmd_justifyfull' class='rte_control rte_button' title='{$this->lang->words['js_tt_jfull']}'><img src='{$this->settings['img_url']}/rte_icons/align_full.png' alt='{$this->lang->words['js_tt_jfull']}' /></span>
-				</li>-->
 				<if test="shellsecondbarlightweight:|:!$lightweight">
 					<li class='right'>
 						<span id='{$editor_id}_cmd_justifyright' class='rte_control rte_button' title='{$this->lang->words['js_tt_right']}'><img src='{$this->settings['img_url']}/rte_icons/align_right.png' alt='{$this->lang->words['js_tt_right']}' /></span>
@@ -283,7 +339,7 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
 	</script>]]></template_content>
       <template_name>editorShell</template_name>
       <template_data><![CDATA[$editor_id, $field='Post', $content='', $no_sidebar=1, $lightweight=0]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -293,6 +349,7 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
       <template_group>skin_editors</template_group>
       <template_content><![CDATA[<!-- RTE ON: $rte_mode -->
 {parse js_module="editor"}
+{parse addtohead="{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_editor.css" type="importcss"}
 <!--top-->
 <input type='hidden' name='{$editor_id}_wysiwyg_used' id='{$editor_id}_wysiwyg_used' value='0' />
 <input type='hidden' name='editor_ids[]' value='{$editor_id}' />
@@ -349,12 +406,6 @@ ipb.editor_values.set( 'bbcodes', \$H({IPSLib::fetchBbcodeAsJson()}) );
 			<li class='right'>
 				<span id='{$editor_id}_cmd_redo' class='rte_control rte_button' title='{$this->lang->words['js_tt_redo']}'><img src='{$this->settings['img_url']}/rte_icons/redo.png' alt='{$this->lang->words['js_tt_redo']}' /></span>
 			</li>
-			
-		<if test="allowrte:|:$this->settings['posting_allow_rte'] == 1">
-			<li class='right'>
-				<!--<span id='{$editor_id}_cmd_switcheditor' class='rte_control rte_button' title='{$this->lang->words['js_tt_switcheditor']}'><img src='{$this->settings['img_url']}/rte_icons/switch.png' alt='{$this->lang->words['js_tt_switcheditor']}' /></span>-->
-			</li>
-		</if>
 		</ul>
 		<ul id='{$editor_id}_toolbar_2' class='toolbar' style='display: none'>
 			<li>
@@ -453,7 +504,97 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 </script>]]></template_content>
       <template_name>ips_editor</template_name>
       <template_data><![CDATA[$form_field="",$initial_content="",$images_path="",$rte_mode=0,$editor_id='ed-0',$smilies='',$allow_sidebar=1]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<div class='clearfix'>
+	{$pages}
+</div>
+<div>
+	<ul class='media_results'>
+		<if test="hasrows:|:count($rows)">
+			<foreach loop="genericmedia:$rows as $row">
+				<li class='result' onclick="return CKEDITOR.plugins.ipsmedia.insert( '{$row['insert']}' );">
+					<if test="hasimage:|:$row['image']">
+							<img src='{$row['image']}' alt=''<if test="haswidth:|:$row['width']"> width='{$row['width']}'</if><if test="hasheight:|:$row['height']"> height='{$row['height']}'</if> style='max-width: 80px;' class='media_image' /><br />
+					</if>
+					
+						<strong>{parse expression="IPSText::truncate( $row['title'], 15 )"}</strong>
+						<if test="hasdescription:|:$row['desc']">
+							<br /><span class='desc'>{parse expression="IPSText::truncate( $row['desc'], 15 )"}</span>
+						</if>
+				</li>
+			</foreach>
+		<else />
+			<li class='no_messages'>
+				{$this->lang->words['no_mymedia_rows']}
+			</li>
+		</if>
+	</ul>
+</div>
+<div class='clearfix'>
+	{$pages}
+</div>]]></template_content>
+      <template_name>mediaGenericWrapper</template_name>
+      <template_data>$rows, $pages, $app, $plugin</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['mymedia_title']}</h3>
+<div class='fixed_inner ipsBox'>
+	<div id='mymedia_inserted' style='display: none'>{$this->lang->words['added_to_editor']}</div>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left'>
+			<ul id='mymedia_tabs'>
+				<foreach loop="mediatabs:$tabs as $tab">
+					<li id='{$tab['app']}_{$tab['plugin']}'><a href='#' onclick="return CKEDITOR.plugins.ipsmedia.loadTab( '{$tab['app']}', '{$tab['plugin']}' );">{$tab['title']}</a></li>
+				</foreach>
+			</ul>
+		</div>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' style='position: relative'>
+			<div class='ipsType_small' id='mymedia_toolbar'>
+				<a href='#' id='mymedia_finish' class='ipsButton no_width' onclick="CKEDITOR.plugins.ipsmedia.popup.hide(); return false;"><img src='{$this->settings['img_url']}/accept.png' /> &nbsp;{$this->lang->words['mymedia_finished']}</a>
+				<input type='hidden' name='sharedmedia_search_app' id='sharedmedia_search_app' value='' />
+				<input type='hidden' name='sharedmedia_search_plugin' id='sharedmedia_search_plugin' value='' />
+				<input type='text' name='search_string' id='sharedmedia_search' value="{$this->lang->words['start_typing_sms']}" size='30' class='input_text inactive' />
+				<input class='input_submit' type='button' id='sharedmedia_submit' value='{$this->lang->words['search_string_search']}' />
+				&nbsp;&nbsp;<a href='#' id='sharedmedia_reset' class='ipsType_smaller'>{$this->lang->words['search_string_reset']}</a>
+			</div>
+			<div id='mymedia_content' class='ipsPad'>
+				{parse template="sharedMediaDefault" group="editors" params=""}
+			</div>
+		</div>
+	</div>
+</div>
+<script type='text/javascript'>
+ipb.vars['sm_init_value']	= "{$this->lang->words['start_typing_sms']}";
+CKEDITOR.plugins.ipsmedia.searchinit();
+</script>]]></template_content>
+      <template_name>sharedMedia</template_name>
+      <template_data>$tabs</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_editors</template_group>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle' style='text-align: center'>{$this->lang->words['mymedia_title']}</h1>
+				<h2 class='ipsType_subtitle desc' style='text-align: center'>{$this->lang->words['shareable_media_warn']}</h2>]]></template_content>
+      <template_name>sharedMediaDefault</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -463,27 +604,14 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
   <templategroup group="skin_emails">
     <template>
       <template_group>skin_emails</template_group>
-      <template_content><![CDATA[<h2>{$title}</h2>
-<div class='row1 general_box rules'>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$title}</h1>
+<div class='row2 ipsPad rules'>
 	{$body}
-</div>]]></template_content>
+</div>
+<br />]]></template_content>
       <template_name>boardRules</template_name>
       <template_data><![CDATA[$title="",$body=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content><![CDATA[<p class='message error'>
-	{$data}
-</p>
-<br />]]></template_content>
-      <template_name>errors</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -507,37 +635,51 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 	
 	<h2 class='maintitle'>{$this->lang->words['title']}</h2>
 	<div class='generic_bar'></div>
-	<div class='post_form'>
+	<div class='ipsForm ipsForm_horizontal'>
 		<fieldset>
 			<h3 class='bar'>{$this->lang->words['email_recepient']}</h3>
-			<ul>
-				<li class='field'>
-					<label for='to_lang'>{$this->lang->words['send_lang']}</label>
-					<select name='lang' class='input_select' id='to_lang'>
-						<foreach loop="lang:$this->caches['lang_data'] as $l">
-							<option value='{$l['lang_id']}' <if test="language:|:$l['lant_id'] == $this->memberData['language']">selected='selected'</if>>{$l['lang_title']}</option>
-						</foreach>
-					</select>
+			<ul class='ipsPad'>
+				<if test="count($this->caches['lang_data']) == 1">
+					<input type='hidden' name='lang' value='{$this->caches['lang_data'][0]['lang_id']}' />
+				<else />
+					<li class='ipsField clear'>
+						<label for='to_lang' class='ipsField_title'>{$this->lang->words['send_lang']}</label>
+						<p class='ipsField_content'>
+							<select name='lang' class='input_select' id='to_lang'>
+								<foreach loop="lang:$this->caches['lang_data'] as $l">
+									<option value='{$l['lang_id']}' <if test="language:|:$l['lant_id'] == $this->memberData['language']">selected='selected'</if>>{$l['lang_title']}</option>
+								</foreach>
+							</select>
+						</p>
+					</li>
+				</if>
+				<li class='ipsField clear'>
+					<label for='to_name' class='ipsField_title'>{$this->lang->words['to_name']}</label>
+					<p class='ipsField_content'>
+						<input type="text" id='to_name' class='input_text' name="to_name" value="{$this->request['to_name']}" size="30" maxlength="100" />
+					</p>
 				</li>
-				<li class='field'>
-					<label for='to_name'>{$this->lang->words['to_name']}</label>
-					<input type="text" id='to_name' class='input_text' name="to_name" value="{$this->request['to_name']}" size="30" maxlength="100" />
+				<li class='ipsField clear'>
+					<label for='to_email' class='ipsField_title'>{$this->lang->words['to_email']}</label>
+					<p class='ipsField_content'>
+						<input type="text" id='to_email' class='input_text' name="to_email" value="{$this->request['to_email']}" size="30" maxlength="100" />
+					</p>
 				</li>
-				<li class='field'>
-					<label for='to_email'>{$this->lang->words['to_email']}</label>
-					<input type="text" id='to_email' class='input_text' name="to_email" value="{$this->request['to_email']}" size="30" maxlength="100" />
-				</li>
-				<li class='field'> 
-					<label for='subject'>{$this->lang->words['subject']}</label>
-					<input type="text" id="subject" class="input_text" name="subject" value="<if test="hasSubject:|:$this->request['subject']">{$this->request['subject']}<else />$title</if>" size="30" maxlength="120" />
+				<li class='ipsField clear'> 
+					<label for='subject' class='ipsField_title'>{$this->lang->words['subject']}</label>
+					<p class='ipsField_content'>
+						<input type="text" id="subject" class="input_text" name="subject" value="<if test="hasSubject:|:$this->request['subject']">{$this->request['subject']}<else />$title</if>" size="30" maxlength="120" />
+					</p>
 				</li> 				
-				<li class='field'>
-					<label for='to_message'>{$this->lang->words['message']}</label>
-					<textarea id='to_message' cols="60" rows="12" wrap="soft" name="message" class="input_text"><if test="hasText:|:$this->request['message']">{$this->request['message']}<else />$text</if></textarea>
+				<li class='ipsField clear'>
+					<label for='to_message' class='ipsField_title'>{$this->lang->words['message']}</label>
+					<p class='ipsField_content'>
+						<textarea id='to_message' cols="60" rows="12" wrap="soft" name="message" class="input_text"><if test="hasText:|:$this->request['message']">{$this->request['message']}<else />$text</if></textarea>
+					</p>
 				</li>
 				<if test="hasCaptcha:|:$captchaHTML">
-					<li class='field' style='text-align:center;width:60%;margin-left:auto;margin-right:auto'>
-						$captchaHTML
+					<li class='ipsField clear'>
+						{$captchaHTML}
 					</li>
 				</if>
 			</ul>
@@ -549,73 +691,7 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 </form>]]></template_content>
       <template_name>forward_form</template_name>
       <template_data><![CDATA[$title="",$text="",$lang="", $captchaHTML='', $msg='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=members&module=messaging&section=contact&do=01" base="public"}" method="post" id="REPLIER">
-	<input type="hidden" name="to" value="{$data['TO']}" />
-	<input type='hidden' name='k' value='{$this->member->form_hash}' />
-	
-	<p class='message unspecific'>{$this->lang->words['imp_text']}</p><br />
-	
-	<h2 class='maintitle'>{$this->lang->words['emailing_prefix']} {$data['NAME']}</h2>	
-	<div class='generic_bar'></div>
-	<div class='post_form'>
-		<fieldset class='row1'>
-			<h3 class='bar'>{$this->lang->words['email_details']}</h3>
-			<ul>
-				<li class='field'>
-					<label for='subject'>{$this->lang->words['subject']}</label>
-					<input type="text" name="subject" id='subject' class='input_text' value="{$data['subject']}" size="50" maxlength="50" />
-				</li>
-				<li class='field'>
-					<label for='message'>{$this->lang->words['message']}</label>
-					<textarea cols="60" rows="8" wrap="soft" name="message" class="input_text" id='message'>{$data['content']}</textarea><br />
-					<span class='desc'>{$this->lang->words['msg_txt']}</span>
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset class='submit'>
-			<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" /> {$this->lang->words['or']} <a href='{parse url="showuser={$data['TO']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
-	</div>
-</form>]]></template_content>
-      <template_name>sendMailForm</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['email_sent']}</h2>
-<p class='message unspecific'>{$this->lang->words['email_sent_txt']} {$member_name}.</p>]]></template_content>
-      <template_name>sentScreen</template_name>
-      <template_data><![CDATA[$member_name=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['send_email_to']} {$data['NAME']}</h2>
-<div class='general_box'>
-	{$this->lang->words['show_address_text']}
-	<br />
-	<strong><a href="mailto:{$data['ADDRESS']}" class="misc">{$this->lang->words['send_email_to']} {$data['NAME']}</a></strong>
-</div>]]></template_content>
-      <template_name>show_address</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -628,7 +704,7 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
       <template_content><![CDATA[<a href='{$this->settings['board_url']}' title='{$this->lang->words['go_home']}' rel="home" accesskey='1'><img src='{parse replacement="logo_img"}' alt='{$this->lang->words['logo']}' /></a>]]></template_content>
       <template_name>defaultHeader</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -650,7 +726,7 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 	</form>]]></template_content>
       <template_name>forum_jump</template_name>
       <template_data>$html</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -658,151 +734,187 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"<if test="fbcenabled:|:IPSLib::fbc_enabled() === TRUE"> xmlns:fb="http://www.facebook.com/2008/fbml"</if>>
+      <template_content><![CDATA[<!DOCTYPE html>
+	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"<if test="fbcenabled:|:IPSLib::fbc_enabled() === TRUE || $this->settings['fbc_appid']"> xmlns:fb="http://www.facebook.com/2008/fbml"</if>>
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
 		<title>{$header_items['title']}<if test="pagenumberintitle:|:$header_items['page']"> {$this->lang->words['page_title_page']} {$header_items['page']}</if></title>
 		<link rel="shortcut icon" href='<if test="$this->registry->output->isHTTPS">{$this->settings['board_url_https']}<else />{$this->settings['board_url']}</if>/favicon.ico' />
 		<link rel="image_src" href='{$this->settings['meta_imagesrc']}' />
 		<script type='text/javascript'>
-		//<[!CDATA[
-			jsDebug = {parse expression="intval($this->settings['_jsDebug'])"}; /* Must come before JS includes */
-			USE_RTE = <if test="userte:|:$this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE'] === TRUE">1<else />0</if>;
-			DISABLE_AJAX = parseInt({$this->settings['disable_text_ajax']}); /* Disables ajax requests where text is sent to the DB; helpful for charset issues */
-			inACP   = false;
+		//<!#^#|CDATA|
+			jsDebug			= {parse expression="intval($this->settings['_jsDebug'])"}; /* Must come before JS includes */
+			USE_RTE			= <if test="userte:|:$this->memberData['members_editor_choice'] == 'rte'">1<else />0</if>;
+			DISABLE_AJAX	= parseInt({$this->settings['disable_text_ajax']}); /* Disables ajax requests where text is sent to the DB; helpful for charset issues */
+			inACP			= false;
+			var isRTL		= false;
+			var rtlIe		= '';
+			var rtlFull		= '';
 		//|#^#]>
 		</script>
 		{parse template="includeCSS" group="global" params="$css"}
 		{parse template="includeMeta" group="global" params="$metaTags"}
-		<meta property="og:title" content="{IPSText::htmlspecialchars( str_replace( ' - ' . $this->settings['board_name'], '', $header_items['title'] ) )}"/>
-		<meta property="og:site_name" content="{$this->settings['board_name']}"/>
+		<meta property="og:title" content="{$this->registry->output->encodeMetaTagContent( str_replace( ' - ' . $this->settings['board_name'], '', $header_items['title'] ) )}"/>
+		<meta property="og:site_name" content="{$this->registry->output->encodeMetaTagContent( $this->settings['board_name'] )}"/>
 		<meta property="og:image" content="{$this->settings['meta_imagesrc']}"/>
+		<meta property="og:type" content="article" />
+		<if test="isLargeTouch:|:$this->registry->output->isLargeTouchDevice()">
+		<!--<meta name="viewport" content="width=device-width;">-->
+		</if>
+		<if test="isSmallTouch:|:$this->registry->output->isSmallTouchDevice()">
+		<meta name="viewport" content="width=1024px">
+		</if>
 		{parse template="includeJS" group="global" params="$jsModules"}
 		{parse template="includeFeeds" group="global" params="$documentHeadItems"}
 		{parse template="includeRTL" group="global" params=""}		
-		{parse template="includeVars" group="global" params=""}
-		<script type='text/javascript'>
-			Loader.boot();
-		</script>
+		{parse template="includeVars" group="global" params="$header_items"}
 	</head>
 	<body id='ipboard_body'>
+		<p id='content_jump' class='hide'><a id='top'></a><a href='#j_content' title='{$this->lang->words['jump_to_content']}' accesskey='m'>{$this->lang->words['jump_to_content']}</a></p>
 		<div id='ipbwrapper'>
-			<h1>{$this->settings['board_name']}: {$header_items['title']}</h1>
-			<p id='content_jump'><a id='top'></a><a href='#j_content' title='{$this->lang->words['jump_to_content']}' accesskey='m'>{$this->lang->words['jump_to_content']}</a></p>
-		
-			<if test="accessreports:|:($this->memberData['g_is_supmod'] == 1 OR ( isset( $this->memberData['access_report_center'] ) AND $this->memberData['access_report_center'] ) )">
-				<div id='admin_bar'>
-					<if test="showacplink:|:$this->memberData['g_access_cp'] == 1 AND $this->settings['security_remove_acp_link'] == 0">
-					<p class='right'>
-						<a href="{$this->settings['_admin_link']}" title='{$this->lang->words['admin_cp']}'>{$this->lang->words['login_to_acp']} &gt;</a>
-					</p>
+			<!-- ::: TOP BAR: Sign in / register or user drop down and notification alerts ::: -->
+			<div id='header_bar' class='clearfix'>
+				<div class='main_width'>
+					<if test="accessreports:|:$this->memberData['is_mod'] OR !empty($this->memberData['access_report_center']) || ($this->memberData['g_access_cp'] AND !$this->settings['security_remove_acp_link'])">
+						<ul id='admin_bar' class='ipsList_inline left'>
+							<if test="showacplink:|:$this->memberData['g_access_cp'] AND !$this->settings['security_remove_acp_link']">
+								<li>
+									<a href="{$this->settings['_admin_link']}" title='{$this->lang->words['admin_cp']}' target="_blank">{$this->lang->words['login_to_acp']}</a>
+								</li>
+							</if>
+							<li><a href="{parse url="app=core&amp;module=modcp" base="public"}" title='{$this->lang->words['gbl_modcp_link']}'>{$this->lang->words['gbl_modcp_link']}</a></li>
+							<if test="rclink:|:$this->memberData['access_report_center'] && $this->memberData['_cache']['report_num'] > 0">
+								<li class='active'>
+									<a href="{parse url="app=core&amp;module=reports&amp;do=index" base="public"}" title='{$this->lang->words['view_reports']}'>{$this->memberData['_cache']['report_num']} {$this->lang->words['report_member_bar']}</a>
+								</li>
+							</if>
+						</ul>
 					</if>
-					<strong>{$this->lang->words['mod_tools']}</strong> 
-					<ul id='mod_tools'>
-						<if test="issupermod:|:$this->memberData['g_is_supmod'] == 1">
-							<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress" base="public"}' title='{$this->lang->words['ip_lookup']}'>{$this->lang->words['ip_lookup']}</a></li>
-							<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" base="public"}' title='{$this->lang->words['post_announcement']}'>{$this->lang->words['post_announcement']}</a></li>
-						</if>
-						<if test="rclink:|:$this->memberData['access_report_center']">
-							<li <if test="numreports:|:$this->memberData['_cache']['report_num'] > 0">class='active'</if>><a href="{parse url="app=core&amp;module=reports&amp;do=index" base="public"}" title='{$this->lang->words['view_reports']}'>{$this->memberData['_cache']['report_num']} {$this->lang->words['report_member_bar']}</a></li>
-						</if>
-					</ul>
-				</div>
-			</if>
-			<div id='header'>
-				<div id='branding'>
-					<if test="brandingBar:|:method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'overwriteHeader' )">
-						{parse template="overwriteHeader" group="{current_app}_global" params=""}
-					<else />
-						{parse template="defaultHeader" group="global" params=""}
-					</if>
-				</div>
-						
-				<if test="memberbox:|:$this->memberData['member_id']">
-					<div id='user_navigation' class='logged_in'>
-						<a href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}" title='{$this->lang->words['your_profile']}'><img src='{$this->memberData['pp_thumb_photo']}' alt="{$this->memberData['members_display_name']}{$this->lang->words['users_photo']}" width='{$this->memberData['pp_thumb_width']}' height='{$this->memberData['pp_thumb_height']}' class='photo' /></a>
-						<div id='user_info'>
-							<p id='user_notifications' <if test="nonewnotifications:|:!$this->memberData['notification_cnt']">class='no-new'</if>>
-								<a id='user_notifications_link' href='{parse url="app=core&amp;module=usercp&amp;area=notificationlog" base="public"}' title="{parse expression="sprintf( "{$this->lang->words['manage_notifications']}", "{$this->memberData['notification_cnt']}" )"}"><small><if test="$this->memberData['notification_cnt'] > 99">99+<else />{$this->memberData['notification_cnt']}</if><span class='hide'>{$this->lang->words['unread_notification_suffix']}</span></small> <img src='{$this->settings['img_url']}/opts_arrow.png' alt='&gt;' id='notify-down-arrow' /></a>
-							</p>
-							<p>
-								<span class='hide'>{$this->lang->words['logged_in_as']} </span>
-								<a id='user_link' class='ipbmenu' href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}"  title='{$this->lang->words['your_profile']}'><span>{$this->memberData['members_display_name']}</span> <img src='{$this->settings['img_url']}/opts_arrow.png' alt='&gt;' /></a><if test="newmessages:|:$this->memberData['msg_count_new'] != 0"><a href='{parse url="app=members&amp;module=messaging" base="public"}' id='new_msg_count' title='{$this->memberData['msg_count_new']} {$this->lang->words['msg_new']}'>{$this->memberData['msg_count_new']}<span class='hide'> {$this->lang->words['msg_new']}</span></a></if>
-							</p>
-							<ul id='user_link_menucontent' class='boxShadow'>
-								<li id='user_profile' class='row1'><a href='{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['your_profile']}'>{$this->lang->words['my_profile']}</a></li>
-								<li id='user_ucp' class='row1'><a href="{parse url="app=core&amp;module=usercp" base="public"}" title="{$this->lang->words['cp_tool_tip']}">{$this->lang->words['your_cp']}</a></li>
-								<li id='user_content' class='row1'><a href="{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$this->memberData['member_id']}" base="public"}" title="{$this->lang->words['my_content_link']}">{$this->lang->words['my_content_link']}</a></li>
-								<if test="userLikeLink:|:IPSLib::haveAppsWithLike()">
-									<li id='user_likes' class='row1'><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=likes" base="public"}' title='{$this->lang->words['your_likes']}'>{$this->lang->words['your_likes']}</a></li>
+					<if test="memberbox:|:$this->memberData['member_id']">
+						<div id='user_navigation' class='logged_in'>
+							<ul class='ipsList_inline right'>
+								<if test="showInboxNotify:|:! ( ! $this->memberData['member_id'] && $this->settings['force_login'] ) && !($this->settings['board_offline'] && !$this->memberData['g_access_offline'])">
+									<if test="messengerlink:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0">
+										<li><a data-clicklaunch="getInboxList" id='inbox_link' href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['your_messenger']}'><if test="notifications:|:$this->memberData['msg_count_new']"><span class='ipsHasNotifications'>{$this->memberData['msg_count_new']}</span></if>&nbsp;</a></li>
+									</if>
+									<li><a data-clicklaunch="getNotificationsList" id='notify_link' href="{parse url="app=core&amp;module=usercp&amp;area=notificationlog" base="public"}" title="{$this->lang->words['notifications_at_the_top']}"><if test="notifications:|:$this->memberData['notification_cnt']"><span class='ipsHasNotifications'>{$this->memberData['notification_cnt']}</span></if>&nbsp;</a></li>
 								</if>
-								<if test="messengerlink:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0">
-									<li id='user_msg' class='row1'><a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['your_messenger']}'>{$this->lang->words['your_messenger']} <span id='new_message'>({$this->memberData['msg_count_new']} {$this->lang->words['msg_new']})</span></a></li>
-								</if>
-								<if test="nobbyNoMates:|:$this->settings['friends_enabled']">
-									<li id='user_friends' class='row1'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=list" base="public"}' title="{$this->lang->words['manage_friends']}" class='manage_friends'>{$this->lang->words['manage_friends']}</a></li>
-								</if>
-								<li id='user_enemies' class='row1'><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=ignoredusers" base="public"}' title="{$this->lang->words['manage_ignored_users']}" class='manage_enemies'>{$this->lang->words['manage_ignored_users']}</a></li>
-								<if test="bloglink:|:$this->memberData['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
-									<li id='user_blog' class='row1'><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$this->memberData['member_id']}" base="public"}' title="{$this->lang->words['go_to_my_blog']}">{$this->lang->words['my_blog']}</a></li>
-								</if>
-								<if test="gallerylink:|:$this->memberData['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-									<li id='user_gallery' class='row1'><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$this->memberData['member_id']}" base="public"}' title="{$this->lang->words['go_to_my_gallery']}">{$this->lang->words['my_gallery']}</a></li>
-								</if>
-								<if test="nexuslink:|:IPSLib::appIsInstalled( 'nexus' )">
-									<li id='user_nexus' class='row1'><a href='{parse url="app=nexus&amp;module=clients" base="public"}' title="{$this->lang->words['client_area']}">{$this->lang->words['client_area']}</a></li>
-								</if>
-							</ul>
-							<ul id='user_other'>
-								<li><a href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}">{$this->lang->words['log_out']}</a></li>
-								<li><a href="{parse url="app=core&amp;module=help" base="public"}" title='{$this->lang->words['view_help']}' rel="help" accesskey='6'>{$this->lang->words['sj_help']}</a></li>
+								<li><a id='user_link' href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}"  title='{$this->lang->words['your_profile']}'>{$this->memberData['members_display_name']} &nbsp;<span id='user_link_dd'></span></a></li>							
+								<li><a href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}">{$this->lang->words['log_out']}</a></li>								
 								<if test="authenticating:|:$this->memberData['member_group_id'] == $this->settings['auth_group']">
-									<li><strong><a href="{parse url="app=core&amp;module=global&amp;section=register&amp;do=reval" base="public"}" title='{$this->lang->words['resend_val']}'>{$this->lang->words['resend_val']}</a></strong></li>
+									<li><a href="{parse url="app=core&amp;module=global&amp;section=register&amp;do=reval" base="public"}" title='{$this->lang->words['resend_val']}'>{$this->lang->words['resend_val']}</a></li>
 								</if>
 							</ul>
-							<script type='text/javascript'>
-								if( $('user_link_menucontent') ){
-									$('user_link_menucontent').hide();
-								}
-							</script>
-							{parse js_module="friends"}
 						</div>
+						<!-- ::: USER DROP DOWN MENU ::: -->
+						<div id='user_link_menucontent' class='ipsHeaderMenu clearfix boxShadow' style='display: none'>
+							<a href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}" title='{$this->lang->words['your_profile']}' class='ipsUserPhotoLink left'>
+								<img src='{$this->memberData['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$this->memberData['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium photo' />
+							</a>
+							
+							<div class='left'>
+								<if test="canUpdateStatus:|:$this->registry->getClass('memberStatus')->canCreate( $this->memberData ) && !($this->settings['board_offline'] && !$this->memberData['g_access_offline'])">
+									<form id='statusForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=new&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
+										<input type='text' id='statusUpdateGlobal' name='content' class='input_text' style='width: 97%' /><br />
+										<input type='submit' id='statusSubmitGlobal' class='ipsButton_secondary' value='{$this->lang->words['global_update_status']}' />
+										<if test="update:|:(IPSLib::twitter_enabled() OR IPSLib::fbc_enabled() ) AND ( $this->memberData['fb_uid'] OR $this->memberData['twitter_id'] )">
+											&nbsp;&nbsp;
+											<if test="updateTwitter:|:IPSLib::twitter_enabled() AND ( $this->memberData['twitter_id'] )"><input type='checkbox' id='su_TwitterGlobal' value='1' name='su_Twitter' /> <label for='su_TwitterGlobal' class='desc ipsType_smaller'>Twitter</label></if> &nbsp; 
+											<if test="updateFacebook:|:IPSLib::fbc_enabled() AND ( $this->memberData['fb_uid'] )">&nbsp;<input type='checkbox' id='su_FacebookGlobal' value='1' name='su_Facebook' /> <label for='su_FacebookGlobal' class='desc ipsType_smaller'>Facebook</label></if>
+										</if>
+										<br />
+										<hr />
+									</form>
+								</if>
+									<ul id='links'>
+										<li id='user_profile'><a href='{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['your_profile']}'>{$this->lang->words['my_profile']}</a></li>
+										<li id='user_ucp'><a href="{parse url="app=core&amp;module=usercp" base="public"}" title="{$this->lang->words['cp_tool_tip']}">{$this->lang->words['your_cp']}</a></li>
+										<li id='user_content'><a href="{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$this->memberData['member_id']}" base="public"}" title="{$this->lang->words['my_content_link']}">{$this->lang->words['my_content_link']}</a></li>
+										<if test="userLikeLink:|:count( IPSLib::getEnabledApplications('like') )">
+											<li id='user_likes'><a href='{parse url="app=core&amp;module=search&amp;do=followed" base="public"}' title='{$this->lang->words['your_likes']}'>{$this->lang->words['your_likes']}</a></li>
+										</if>
+										<if test="nobbyNoMates:|:$this->settings['friends_enabled'] && $this->memberData['g_can_add_friends']">
+											<li id='user_friends'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=list" base="public"}' title="{$this->lang->words['manage_friends']}" class='manage_friends'>{$this->lang->words['manage_friends']}</a></li>
+										</if>
+										<li id='user_enemies'><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=ignoredusers" base="public"}' title="{$this->lang->words['manage_ignored_users']}" class='manage_enemies'>{$this->lang->words['manage_ignored_users']}</a></li>
+										<if test="bloglink:|:$this->memberData['has_blog'] AND IPSLib::appIsInstalled('blog')">
+											<li id='user_blog'><a href="{parse url="app=blog&amp;module=manage" base="public" template="manageblog" seotitle="false"}">{$this->lang->words['manage_blogs']}</a></li>
+										</if>
+										<if test="pmLink:|:$this->memberData['members_disable_pm'] != 2">
+											<li id='user_pm'><a href="{parse url="app=members&module=messaging" base="public"}">{$this->lang->words['user_dd_go_pm']}</a></li>
+										</if>
+										<if test="gallerylink:|:$this->memberData['has_gallery'] AND IPSLib::appIsInstalled('gallery')">
+											<li id='user_gallery'><a href='{parse url="app=gallery&amp;user={$this->memberData['member_id']}" base="public" seotitle="{$this->memberData['members_seo_name']}" template="useralbum"}' title="{$this->lang->words['go_to_my_gallery']}">{$this->lang->words['my_gallery']}</a></li>
+										</if>
+										<if test="nexuslink:|:IPSLib::appIsInstalled('nexus')">
+											<li id='user_nexus'><a href='{parse url="app=nexus&amp;module=clients" base="public"}' title="{$this->lang->words['client_area']}">{$this->lang->words['client_area']}</a></li>
+										</if>										
+									</ul>
+							</div>
+						</div>
+					<else />
+						<div id='user_navigation' class='not_logged_in'>
+							
+							<ul class='ipsList_inline right'>
+								<li>
+									<span class='services'>
+										<if test="limFacebook:|:IPSLib::loginMethod_enabled('facebook')">
+											<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;serviceClick=facebook" base="public"}'>{parse replacement="lim_facebook"}</a>
+										</if>
+										<if test="limTwitter:|:IPSLib::loginMethod_enabled('twitter')">
+											<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;serviceClick=twitter" base="public"}'>{parse replacement="lim_twitter"}</a>
+										</if>
+										<if test="limOpenid:|:IPSLib::loginMethod_enabled('openid')">
+											<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;serviceClick=openid" base="public"}'>{parse replacement="lim_openid"}</a>
+										</if>
+										<if test="limWindows:|:IPSLib::loginMethod_enabled('live')">
+											<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;serviceClick=live" base="public"}'>{parse replacement="lim_windows"}</a>
+										</if>
+									</span>
+									&nbsp;&nbsp;&nbsp;&nbsp;
+									<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}' id='sign_in' <if test="IPS_APP_COMPONENT == 'ccs'">class='no_ajax'</if>>{$this->lang->words['sign_in']}</a>&nbsp;&nbsp;&nbsp;
+								</li>
+								<li>
+									<a href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register']}' id='register_link'>{$this->lang->words['register']}</a>
+								</li>
+							</ul>
+						</div>
+					</if>
+				</div>
+			</div>
+			<!-- ::: BRANDING STRIP: Logo and search box ::: -->
+			<div id='branding'>
+				<div class='main_width'>
+					<div id='logo'>
+						<if test="brandingBar:|:ipsRegistry::$applications[ $this->registry->getCurrentApplication() ]['hasCustomHeader']">
+							{parse template="overwriteHeader" group="{current_app}_global" params=""}
+						<else />
+							{parse template="defaultHeader" group="global" params=""}
+						</if>
 					</div>
-				<else />
-					<div id='user_navigation' class='not_logged_in'>
-						<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}' id='sign_in' class='rounded'>
-							<span class='left'>{$this->lang->words['sign_in']}</span>
-							<span class='services right'>
-								<if test="limFacebook:|:IPSLib::loginMethod_enabled('facebook')">{parse replacement="lim_facebook"}</if>
-								<if test="limTwitter:|:IPSLib::loginMethod_enabled('twitter')">{parse replacement="lim_twitter"}</if>
-								<if test="limOpenid:|:IPSLib::loginMethod_enabled('openid')">{parse replacement="lim_openid"}</if>
-								<if test="limWindows:|:IPSLib::loginMethod_enabled('live')">{parse replacement="lim_windows"}</if>
-							</span>
-							<br />
-						</a>
-						<span class='links'>
-							{$this->lang->words['new_user']}
-							<a href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register']}' id='register_link'>{$this->lang->words['register']}</a>
-							<a href="{parse url="app=core&amp;module=help" base="public"}" title='{$this->lang->words['view_help']}' rel="help" accesskey='6' class='right'>{parse replacement="help_icon"} {$this->lang->words['sj_help']}</a>
-						</span>
-					</div>
-				
-				</if>
-			
-				<div id='primary_nav'>
-					<div id='search'>
-						{parse template="quickSearch" group="global" params=""}
-					</div>
-					<ul>
-						<if test="showhomeurl:|:$this->settings['home_url']">
+					{parse template="quickSearch" group="global" params=""}
+				</div>
+			</div>
+			<!-- ::: APPLICATION TABS ::: -->
+			<div id='primary_nav' class='clearfix'>
+				<div class='main_width'>
+					<ul class='ipsList_inline' id='community_app_menu'>
+						<if test="showQuickNav:|:! ( ! $this->memberData['member_id'] && $this->settings['force_login'] ) && !($this->settings['board_offline'] && !$this->memberData['g_access_offline'])">
+							<li class='right'>
+								<a href="{parse url="app=core&amp;module=global&amp;section=navigation&amp;inapp={parse expression="IPS_APP_COMPONENT"}" base="public"}" rel="quickNavigation" accesskey='9' id='quickNavLaunch' title='{$this->lang->words['launch_quicknav']}'><span>&nbsp;</span></a>
+							</li>
+						</if>
+						<li id='nav_explore' class='right'>
+							<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=<if test="viewnewcontentapp:|:$this->registry->getCurrentApplication() != 'core' AND IPSLib::appIsSearchable( $this->registry->getCurrentApplication() )">{$this->registry->getCurrentApplication()}<else />forums</if>" base="public"}' accesskey='2'>{$this->lang->words['view_new_posts']}</a>
+						</li>
+						<if test="showhomeurl:|:$this->settings['home_url'] AND $this->settings['home_name']">
 							<li id='nav_home' class='left'><a href='{$this->settings['home_url']}' title='{$this->lang->words['homepage_title']}' rel="home">{$this->settings['home_name']}</a></li>
 						</if>
 						{parse variable="forumActive" default="" oncondition="IPS_APP_COMPONENT == 'forums'" value="active"}
 						{parse variable="membersActive" default="" oncondition="IPS_APP_COMPONENT == 'members'" value="active"}
 						{parse variable="helpActive" default="" oncondition="IPS_APP_COMPONENT == 'core' AND $this->request['module'] == 'help'" value="active"}
-						<if test="!ipsRegistry::$applications['forums']['app_hide_tab']"><li id='nav_discussion' class='left {parse variable="forumActive"}'><a href='{parse url="act=idx" seotitle="false" base="public"}' title='{$this->lang->words['go_to_discussion']}'>{$this->lang->words['discussion']}</a></li></if>
-						<if test="!ipsRegistry::$applications['members']['app_hide_tab']"><li id='nav_members' class='left {parse variable="membersActive"}'><a href='{parse url="app=members" base="public" template="members_list" seotitle="false"}' title='{$this->lang->words['go_to_memberlist']}'>{$this->lang->words['tb_mlist']}</a></li></if>
+						<if test="!ipsRegistry::$applications['forums']['app_hide_tab'] && (!count(ipsRegistry::$applications['forums']['app_tab_groups']) OR IPSMember::hasOtherGroups( $this->memberData, ipsRegistry::$applications['forums']['app_tab_groups']) )"><li id='nav_discussion' class='left {parse variable="forumActive"}'><a href='{parse url="act=idx" seotitle="false" base="public"}' title='{$this->lang->words['go_to_discussion']}'>{IPSLib::getAppTitle( 'forums' )}</a></li></if>
+						<if test="!ipsRegistry::$applications['members']['app_hide_tab'] && (!count(ipsRegistry::$applications['members']['app_tab_groups']) OR IPSMember::hasOtherGroups( $this->memberData, ipsRegistry::$applications['members']['app_tab_groups']) )"><li id='nav_members' class='left {parse variable="membersActive"}'><a href='{parse url="app=members&amp;module=list" base="public" template="members_list" seotitle="false"}' title='{$this->lang->words['go_to_memberlist']}'>{IPSLib::getAppTitle( 'members' )}</a></li></if>
 						<if test="applicationsloop:|:is_array($header_items['applications']) AND count($header_items['applications'])">
 							<foreach loop="applications:$header_items['applications'] as $data">
 								<if test="showingapp:|:$data['app_show']">
@@ -811,132 +923,163 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 								</if>
 							</foreach>
 						</if>
+						<li id='nav_other_apps' style='display: none'>
+							<a href='#' class='ipbmenu' id='more_apps'>{$this->lang->words['more_apps']} <img src='{$this->settings['img_url']}/useropts_arrow.png' /></a>
+						</li>
 					</ul>
 				</div>
-				
-				<if test="pmbox:|:is_array( $items['notifications'] )">
-					<div id='pm_notification' class='open' rel='{$items['notifications']['notify_id']}'>
-						<div id='pm_wrap'>
-							<h3><a href='#j_content' id='close_pm_notification'><img src="{$this->settings['img_url']}/close_popup.png" alt="x"></a> <span id='pm_notify_title'>{$items['notifications']['notify_title']}</span></h3>
-							<p class='desc'><strong>{$this->lang->words['pc_sent']}</strong> <span id='pm_date'>{parse date="$items['notifications']['notify_sent']" format="short"}</span></p>
-							<p id='pm_notify_excerpt' class='excerpt'>
-								{$items['notifications']['notify_text']}
-							</p>
-							<p class='submit'>
-								<if test="$items['notifications']['notify_url']">
-									<a href='{$items['notifications']['notify_url']}' id='view_pm_notification' class='input_submit'>{$this->lang->words['global_pm_read_short']}<if test="unreadCheck:|:$this->memberData['notification_cnt'] > 1"> (<span id='pm-count'>1</span>/{$this->memberData['notification_cnt']})</if></a> &nbsp;
-								<else />
-									<a href='{parse url="app=core&amp;module=usercp&amp;area=viewNotification&amp;do=view&amp;view={$items['notifications']['notify_id']}" base="public"}' id='view_pm_notification' class='input_submit'>{$this->lang->words['global_pm_read']}<if test="unreadCheck:|:$this->memberData['notification_cnt'] > 1"> (<span id='pm-count'>1</span>/{$this->memberData['notification_cnt']})</if></a> &nbsp;
-								</if>
-								<a href='{parse url="app=core&amp;module=usercp&amp;area=markNotification&amp;do=mark&amp;mark={$items['notifications']['notify_id']}" base="public"}' id='ack_pm_notification' class='input_submit alt'>{$this->lang->words['mark_pc_read']}</a> &nbsp;
-								
-								<a href='#' id='notification_go_forward' class='configure input_submit<if test="morethanonenotification:|:$this->memberData['notification_cnt'] < 2"> hide</if>'>&gt;</a>
-								<a href='#' id='notification_go_back' class='configure input_submit hide'>&lt;</a>
-								
-								<a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=notifications" base="public"}' class='configure'>{$this->lang->words['configure_notifications']}</a>
-							</p>
-						</div>
-					</div>
-					<script type='text/javascript'>
-						$('pm_notification').hide();
-					</script>
-				</if>
+				<script type='text/javascript'>
+					if( $('primary_nav') ){	ipb.global.activateMainMenu(); }
+				</script>
+			</div>	
 			
-				<div id='secondary_nav'>
-					<ul id='breadcrumb' class='left'>
-						<php>$this->did_first = 0;</php>
+			<!-- ::: MAIN CONTENT AREA ::: -->
+			<div id='content' class='clearfix'>
+				<!-- ::: NAVIGATION BREADCRUMBS ::: -->
+				<if test="count( $items['navigation'] )">
+					<div id='secondary_navigation' class='clearfix'>
+						<ol class='breadcrumb top ipsList_inline left'>
+							<php>$this->did_first = 0;</php>
+							<if test="switchnavigation:|:!$this->settings['remove_forums_nav'] OR ipsRegistry::$current_application == 'forums'">
+								<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+									<a href='{parse url="act=idx" seotitle="false" base="public"}' itemprop="url">
+										<span itemprop="title">{$this->settings['board_name']}</span>
+									</a>
+								</li>
+								<if test="didfirstnav:|:$this->did_first=1"></if>
+							</if>
+							<foreach loop="navigation:$items['navigation'] as $idx => $data">
+								<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+									<if test="didfirstappnow:|:$this->did_first"><span class='nav_sep'>{parse replacement="f_nav_sep"}</span></if>
+									 <if test="navigationlink:|:$data[1]"><a href='{parse url="{$data[1]}" base="$data[4]" seotitle="$data[2]" template="$data[3]"}' title='{$this->lang->words['nav_return_to']} {$data[0]}' itemprop="url"></if><span itemprop="title">{$data[0]}</span><if test="closenavigationlink:|:$data[1]"></a></if>
+								</li>
+								<if test="forsuredidfirstnav:|:$this->did_first=1"></if>
+							</foreach>
+						</ol>
+					</div>
+					<br />
+				</if>
+				<noscript>
+					<div class='message error'>
+						<strong>{$this->lang->words['gbl_no_js_title']}</strong>
+						<p>{$this->lang->words['gbl_no_js']}</p>
+					</div>
+					<br />
+				</noscript>
+				<!-- ::: CONTENT ::: -->
+				<if test="hasHeaderAd:|:$items['adHeaderCode']">
+					<div class='ipsAd'>{$items['adHeaderCode']}</div>
+				</if>
+				<if test="mainpageContent:|:$html">{$html}</if>
+				<if test="hasFooterAd:|:$items['adFooterCode']">
+					<div class='ipsAd'>{$items['adFooterCode']}</div>
+				</if>
+				<ol class='breadcrumb bottom ipsList_inline left clearfix clear'>
+					<if test="count( $items['navigation'] )">
+						<php>$this->did_first_bottom = 0;</php>
 						<if test="switchnavigation:|:!$this->settings['remove_forums_nav'] OR ipsRegistry::$current_application == 'forums'">
-							<li class='first'><a href='{parse url="act=idx" seotitle="false" base="public"}'>{$this->settings['board_name']}</a></li>
-							<if test="didfirstnav:|:$this->did_first=1"></if>
+							<li><a href='{parse url="act=idx" seotitle="false" base="public"}'>{$this->settings['board_name']}</a></li>
+							<if test="didfirstnav:|:$this->did_first_bottom=1"></if>
 						</if>
 						<foreach loop="navigation:$items['navigation'] as $idx => $data">
-							<li<if test="notdonefirstapp:|:!$this->did_first"> class='first'</if>><if test="didfirstappnow:|:$this->did_first"><span class='nav_sep'>{parse replacement="f_nav_sep"}</span></if> <if test="navigationlink:|:$data[1]"><a href='{parse url="{$data[1]}" base="$data[4]" seotitle="$data[2]" template="$data[3]"}' title='{$this->lang->words['nav_return_to']}{$data[0]}'></if>{$data[0]}<if test="closenavigationlink:|:$data[1]"></a></if></li>
-							<if test="forsuredidfirstnav:|:$this->did_first=1"></if>
+							<li><if test="didfirstappnow:|:$this->did_first_bottom"><span class='nav_sep'>{parse replacement="f_nav_sep"}</span></if> <if test="navigationlink:|:$data[1]"><a href='{parse url="{$data[1]}" base="$data[4]" seotitle="$data[2]" template="$data[3]"}' title='{$this->lang->words['nav_return_to']} {$data[0]}'></if>{$data[0]}<if test="closenavigationlink:|:$data[1]"></a></if></li>
+							<if test="forsuredidfirstnav:|:$this->did_first_bottom=1"></if>
 						</foreach>
-					</ul>
-					<ul id='section_links' class='right'>
-						<if test="siteruleslink:|:$this->settings['gl_show'] and $this->settings['gl_title']">
-						<li><a href='<if test="ruleslink:|:$this->settings['gl_link']">{$this->settings['gl_link']}<else />{parse url="app=forums&amp;module=extras&amp;section=boardrules" base="public"}</if>'><if test="siterulestitle:|:$this->settings['gl_title']">{$this->settings['gl_title']}<else />{$this->lang->words['board_rules']}</if></a></li>
-						</if>
-						<li><a href='{parse url="app=core&amp;module=search&amp;do=<if test="ncmember:|:$this->memberData['member_id']">new_posts<else />active</if>&amp;search_app=<if test="viewnewcontentapp:|:$this->registry->getCurrentApplication() != 'core' AND IPSLib::appisSearchable( $this->registry->getCurrentApplication() )">{$this->registry->getCurrentApplication()}<else />forums</if>" base="public"}' accesskey='2'>{$this->lang->words['view_new_posts']}</a></li>
-						<li><img src='{$this->settings['img_url']}/feed.png' alt='{$this->lang->words['rss_feed']}' id='rss_feed' class='clickable' /></li>
-					</ul>
-				</div>
-			</div>
-			<div id='content' class='clear'>
-				<a id='j_content'></a>
-				{$items['adHeaderCode']}
-				<if test="mainpageContent:|:$html">{$html}</if>
-				{$items['adFooterCode']}
-				<br class='clear' />
-			</div>
-			<div id='footer_utilities' class='clearfix clear rounded'>
-				<h2 class='hide'>{$this->lang->words['skin_and_lang']}</h2>
-				<if test="skinchanger:|:$this->settings['allow_skins'] AND $footer_items['skin_chooser']">
-					<if test="uagentlocked:|:$this->memberData['userAgentLocked'] AND ! $this->memberData['userAgentBypass']">
-						<p id='useragent_msg'>
-							{$this->lang->words['skin_browser_set']} <a href='{parse url="{$this->settings['query_string_formatted']}&amp;unlockUserAgent=1" base="public"}'>{$this->lang->words['override_browser_theme']}</a>
-						</p>
 					<else />
-						<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post" class='left'>
-							<fieldset>
-								<input type='hidden' name='k' value='{$this->member->form_hash}' />
-								<label for='newSkin' class='hide'>{$this->lang->words['theme_prefix']}</label>
-								<select name="settingNewSkin" id='newSkin'>
-									{$footer_items['skin_chooser']}
-								</select>
-								<input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit alt' id='newSkinSubmit' />
-							</fieldset>
-						</form>
+						<li>&nbsp;</li>
 					</if>
-				</if>
-				<form action="{parse url="{$this->settings['query_string_formatted']}" base="public"}" method="post" class='left'>
-					<fieldset>
-						<input type='hidden' name='k' value='{$this->member->form_hash}' />
-						<input type='hidden' name='setlanguage' value='1' />
-						<input type="hidden" name="langurlbits" value="{$this->settings['query_string_safe']}&amp;cal_id={$this->request['cal_id']}" />
-						<label for='newLang' class='hide'>{$this->lang->words['language_prefix']}</label>
-						<select name="langid" id='newLang'>
-								{$footer_items['lang_chooser']}
-						</select>
-						<input type='submit' class='input_submit alt' value='{$this->lang->words['jmp_go']}' id='newLangSubmit' />
-					</fieldset>
-				</form>
-				<h2 class='hide'>{$this->lang->words['exec_stats']}</h2>
-				<ul class='right'>
-					<li>{$this->lang->words['time_now']} {$footer_items['time']}
-						<if test="lastvisit:|:$this->memberData['member_id'] AND $this->memberData['last_visit']"><p>{$this->lang->words['you_last_visit']} {parse date="$this->memberData['last_visit']" format="short"}</p></if>
-					</li>
-					<if test="showdebuglevel:|:$this->memberData['member_id'] and $this->settings['debug_level']">
-						<li><img src='{$this->settings['img_url']}/stats_time.png' alt='' /> {$stats['ex_time']} <if test="isfloat:|:is_float($stats['ex_time'])">{$this->lang->words['stats_sec']}</if></li>
-						<li><img src='{$this->settings['img_url']}/stats_server.png' alt='' /> {$stats['server_load']}</li>
-						<li><img src='{$this->settings['img_url']}/stats_database.png' alt='' /> {$stats['queries']} <if test="sqldebuglink:|:IPS_SQL_DEBUG_MODE"><a href='{parse url="{$this->settings['query_string_safe']}&amp;debug=1" base="public"}'></if>{$this->lang->words['stats_queries']}<if test="closesqldebuglink:|:IPS_SQL_DEBUG_MODE"></a></if></li>
-						<li><img src='{$this->settings['img_url']}/stats_compression.png' alt='' /> {$stats['gzip_status']}</li>
-					</if>
-				</ul>
+					<if test="siteruleslink:|:$this->settings['gl_show'] and $this->settings['gl_title']">
+						<li class='right ipsType_smaller'>
+							<a href='<if test="ruleslink:|:$this->settings['gl_link']">{$this->settings['gl_link']}<else />{parse url="app=forums&amp;module=extras&amp;section=boardrules" base="public"}</if>'><if test="siterulestitle:|:$this->settings['gl_title']">{$this->settings['gl_title']}<else />{$this->lang->words['board_rules']}</if></a>
+						</li>
+					</if>	
+				</ol>
 			</div>
-			<!-- __FOOTER__ -->
-			<!-- /__FOOTER__ -->
-			<!--DEBUG_STATS-->
-			<div id='board_footer'>
-				<ul id='utility_links' class='left'>
-					<li><a href='#top' id='backtotop' title='{$this->lang->words['go_to_top']}'>{$this->lang->words['back_to_top']}</a></li>
-					<li><a href='{parse url="act=idx" seotitle="false" base="public"}' title='{$this->lang->words['sj_home']}'>{$this->lang->words['sj_home']}</a></li>
-					<li><a href="{parse url="app=core&amp;module=global&amp;section=login&amp;do=deleteCookies&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['delete_all_cookies_title']}'>{$this->lang->words['delete_my_cookies']}</a></li>
-					<li><a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['mark_all_as_read']}'>{$this->lang->words['mark_board_as_read']}</a></li>
+			<!-- ::: FOOTER (Change skin, language, mark as read, etc) ::: -->
+			<div id='footer_utilities' class='main_width clearfix clear'>
+				<a rel="nofollow" href='#top' id='backtotop' title='{$this->lang->words['go_to_top']}'><img src='{$this->settings['img_url']}/top.png' alt='' /></a>
+				<ul class='ipsList_inline left'>
+					<li>
+						<img src='{$this->settings['img_url']}/feed.png' alt='{$this->lang->words['rss_feed']}' id='rss_feed' class='clickable' />
+					</li>
+					<if test="skinchanger:|:count($footer_items['skin_chooser']) > 1">
+						<if test="uagentlocked:|:$this->memberData['userAgentLocked'] AND ! $this->memberData['userAgentBypass']">
+							<li id='useragent_msg'>
+								{$this->lang->words['skin_browser_set']} <a href='{parse url="{$this->settings['query_string_formatted']}&amp;unlockUserAgent=1" base="public"}'>{$this->lang->words['override_browser_theme']}</a>
+							</li>
+						<else />
+						<if test="isTouchDevice:|:$this->registry->output->isTouchDevice()">
+							<li>
+								<a href='{parse url="{$this->settings['query_string_formatted']}&amp;setAsMobile=1" base="public"}'>{$this->lang->words['set_mobile_theme']}</a>
+							</li>
+						</if>
+							<li>
+								<a rel="nofollow" id='new_skin' href='#'>{$this->lang->words['change_theme']}</a>			
+								<ul id='new_skin_menucontent' class='ipbmenu_content with_checks' style='display: none'>
+									<foreach loop="$footer_items['skin_chooser'] as $skin">
+										<li <if test="$skin['selected']">class='selected'</if>>
+											<a href='{parse url="{$this->settings['query_string_formatted']}&amp;k={$this->member->form_hash}&amp;settingNewSkin={$skin['id']}" base="public"}'>{$skin['title']}</a>
+										</li>
+									</foreach>
+								</ul>
+							</li>
+						</if>
+					</if>
+					<if test="langchooser:|:count( $footer_items['lang_chooser']['options'] ) > 1">
+						<li>
+							<a rel="nofollow" href='#' id='new_language'>{$footer_items['lang_chooser']['default']}</a>							
+							<ul id='new_language_menucontent' class='ipbmenu_content with_checks' style='display: none'>
+								<foreach loop="$footer_items['lang_chooser']['options'] as $lang">
+									<li <if test="$lang['selected']">class='selected'</if>>
+										<a href="{parse url="{$this->settings['query_string_formatted']}&amp;k={$this->member->form_hash}&amp;setlanguage=1&amp;langurlbits={$this->settings['query_string_safe']}&amp;cal_id={$this->request['cal_id']}&amp;langid={$lang['id']}" base="public"}">{$lang['title']}</a>
+									</li>
+								</foreach>
+							</ul>
+						</li>
+					</if>
+					<li>
+						<a rel="nofollow" id='mark_all_read' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['mark_all_as_read']}'>{$this->lang->words['mark_board_as_read']}</a>
+						<ul id='mark_all_read_menucontent' class='ipbmenu_content' style='display: none'>
+							<foreach loop="$footer_items['mark_read_apps'] as $app => $appData">
+								<li>
+									<if test="hideRcForPerms:|:$this->memberData['showReportCenter'] OR $app != 'core'">
+										<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=app&amp;markApp={$app}&amp;k={$this->member->form_hash}" base="public"}"><if test="isCoreRC:|:$app=='core'">{$this->lang->words['markread_rc_link']}<else />{IPSLib::getAppTitle($app)}</if></a>
+									</if>
+								</li>
+							</foreach>
+							<li>
+								<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}"><strong>{$this->lang->words['mark_all_as_read']}</strong></a>
+							</li>
+						</ul>
+					</li>
+					<li>
+						<a href="{parse url="app=core&amp;module=help" base="public"}" title='{$this->lang->words['view_help']}' rel="help" accesskey='6'>{$this->lang->words['sj_help']}</a>
+					</li>				
 				</ul>
 				{$footer_items['copyright']}
 			</div>
+			<if test="showdebuglevel:|:$this->memberData['member_id'] and $this->settings['debug_level']">
+				<div id='ipsDebug_footer'>
+					<strong>{$this->lang->words['time_now']}</strong> {$footer_items['time']}
+					<if test="lastvisit:|:$this->memberData['member_id'] AND $this->memberData['last_visit']"><strong>{$this->lang->words['you_last_visit']}</strong> {parse date="$this->memberData['last_visit']" format="short"}</if>
+					<strong>{$this->lang->words['stat_exec']}</strong> {$stats['ex_time']} <if test="isfloat:|:is_float($stats['ex_time'])">{$this->lang->words['stats_sec']}</if>
+					<strong>{$this->lang->words['stat_load']}</strong> {$stats['server_load']}
+					<strong>{$this->lang->words['stat_queries']}</strong> {$stats['queries']} <if test="sqldebuglink:|:IPS_SQL_DEBUG_MODE"><a href='{parse url="{$this->settings['query_string_safe']}&amp;debug=1" base="public"}'></if>{$this->lang->words['stats_queries']}<if test="closesqldebuglink:|:IPS_SQL_DEBUG_MODE"></a></if>
+					<strong>{$this->lang->words['stat_gzip']}</strong> {$stats['gzip_status']}
+				</div>
+			</if>
 			{$stats['task']}
 			<if test="includeLightboxDoReal:|:$this->settings['do_include_lightbox_real']">
 				{parse template="include_lightbox_real" group="global" params=""}
 			</if>
 		</div>
+		
+		<!--DEBUG_STATS-->
 	</body>
 </html>]]></template_content>
       <template_name>globalTemplate</template_name>
-      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, $header_items=array(), $items=array(), $footer_items=array(), $stats=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, array $header_items, $items=array(), $footer_items=array(), $stats=array()</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -944,9 +1087,21 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[{parse addtohead="{$this->settings['public_dir']}style_css/prettify.css" type="importcss"}
-	<script type="text/javascript" src="{$this->settings['public_dir']}js/3rd_party/prettify/prettify.js"></script>
-	<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/prettify/lang-sql.js'></script>
+      <template_content><![CDATA[<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+<li><div class='googlePlusOne'><g:plusone count="false" size="small"></g:plusone></div></li>]]></template_content>
+      <template_name>googlePlusOneButton</template_name>
+      <template_data>$url, $title</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[{parse addtohead="{$this->settings['css_base_url']}style_css/prettify.css" type="importcss"}
+	<script type="text/javascript" src="{$this->settings['js_base_url']}js/3rd_party/prettify/prettify.js"></script>
+	<script type='text/javascript' src='{$this->settings['js_base_url']}js/3rd_party/prettify/lang-sql.js'></script>
 	<!-- By default we load generic code, php, css, sql and xml/html; load others here if desired -->
 	<script type="text/javascript">
 	//<!#^#|CDATA|
@@ -955,7 +1110,7 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 	</script>]]></template_content>
       <template_name>include_highlighter</template_name>
       <template_data>$load_when_needed=0</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -963,10 +1118,10 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<php>$this->settings['do_include_lightbox_real']	= 1;</php>]]></template_content>
+      <template_content><![CDATA[<php>$this->settings['do_include_lightbox_real'] = 1;</php>]]></template_content>
       <template_name>include_lightbox</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -992,7 +1147,7 @@ ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', USE_RTE );
 	}, window.LightboxOptions || {});
 /* Watch for a lightbox image and set up our downloadbutton watcher */
 document.observe('click', (function(event){
-    var target = event.findElement('a[rel*="lightbox"]') || event.findElement('area[rel*="lightbox"]');
+    var target = event.findElement('a[rel*="lightbox"]') || event.findElement('area[rel*="lightbox"]') || event.findElement('span[rel*="lightbox"]');
     if (target) {
         event.stop();
         gbl_addDownloadButton();
@@ -1024,7 +1179,7 @@ function gbl_addDownloadButton()
 </script>]]></template_content>
       <template_name>include_lightbox_real</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1042,11 +1197,11 @@ function gbl_addDownloadButton()
 			}
 		</php>
 		<if test="donotminifycss:|:!$this->settings['use_minify'] OR ( $data['attributes'] AND stripos( $data['attributes'], 'screen' ) === false )">
-			<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}" />
+			<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}" />
 		</if>
 	</foreach>
 	<if test="csstominify:|:$this->settings['use_minify'] AND count($this->minify)">
-		<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;f={parse expression="str_replace( $this->settings['public_dir'], 'public/', implode( ',', $this->minify ) )"}" />
+		<link rel="stylesheet" type="text/css" media='screen,print' href="{$this->settings['css_base_url']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;f={parse expression="str_replace( $this->settings['css_base_url'], PUBLIC_DIRECTORY . '/', implode( ',', $this->minify ) )"}" />
 	</if>
 </if>
 <if test="inlinecss:|:is_array( $css['inline'] ) AND count( $css['inline'] )">
@@ -1058,11 +1213,30 @@ function gbl_addDownloadButton()
 	</foreach>
 </if>
 <!--[if lte IE 7]>
-	<link rel="stylesheet" type="text/css" title='Main' media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_ie.css" />
-<![endif]-->]]></template_content>
+	<link rel="stylesheet" type="text/css" title='Main' media="screen" href="{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_ie.css" />
+<![endif]-->
+<!--[if lte IE 8]>
+	<style type='text/css'>
+		.ipb_table { table-layout: fixed; }
+		.ipsLayout_content { width: 99.5%; }
+	</style>
+<![endif]-->
+<if test="$this->settings['resize_img_force']">
+	<!-- Forces resized images to an admin-defined size -->
+	<style type='text/css'>
+		img.bbc_img {
+			max-width: {$this->settings['resize_img_force']}px !important;
+			max-height: {$this->settings['resize_img_force']}px !important;
+		}
+	</style>
+<else />
+	<style type='text/css'>
+		img.bbc_img { max-width: 100% !important; }
+	</style>
+</if>]]></template_content>
       <template_name>includeCSS</template_name>
       <template_data>$css</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1077,7 +1251,7 @@ function gbl_addDownloadButton()
 				<script type="text/javascript" src="{$data}" charset="<% CHARSET %>"></script>
 			</if>
 			<if test="dhcss:|:$type == 'rss'">
-				<link rel="alternate feed" type="application/rss+xml" title="{$data['title']}" href="{$data['url']}" />
+				<link rel="alternate" type="application/rss+xml" title="{$data['title']}" href="{$data['url']}" />
 			</if>
 			<if test="dhrsd:|:$type == 'rsd'">
 				<link rel="EditURI" type="application/rsd+xml" title="{$data['title']}" href="{$data['url']}" />
@@ -1090,7 +1264,7 @@ function gbl_addDownloadButton()
 </if>]]></template_content>
       <template_name>includeFeeds</template_name>
       <template_data>$documentHeadItems</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1100,29 +1274,33 @@ function gbl_addDownloadButton()
       <template_group>skin_global</template_group>
       <template_content><![CDATA[<if test="minifyjs:|:$this->settings['use_minify']">
 	<if test="remoteloadjs:|:$this->settings['remote_load_js']">
-		<script type='text/javascript' src='<if test="usehttpsprototype:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.6/prototype.js'></script>
+		<script type='text/javascript' src='<if test="usehttpsprototype:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.7/prototype.js'></script>
 		<script type='text/javascript' src='<if test="usehttpsscriptaculous:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/scriptaculous/1.8/scriptaculous.js?load=effects,dragdrop,builder'></script>
 	<else />
-		<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;g=js'></script>
+		<script type='text/javascript' src='{$this->settings['js_base_url']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;g=js'></script>
 	</if>
-	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;charset={$this->settings['gb_char_set']}&amp;f=public/js/ipb.js,public/js/ips.quickpm.js<if test="hasjsmodules:|:count($jsModules)">,public/js/ips.{parse expression="implode('.js,public/js/ips.', array_unique( array_keys( $jsModules ) ) )"}.js</if>,cache/lang_cache/{$this->lang->lang_id}/ipb.lang.js' charset='{$this->settings['gb_char_set']}'></script>
+	<script type='text/javascript' src='{$this->settings['js_base_url']}min/index.php?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;charset={$this->settings['gb_char_set']}&amp;f={parse expression="PUBLIC_DIRECTORY"}/js/ipb.js,cache/lang_cache/{$this->lang->lang_id}/ipb.lang.js,{parse expression="PUBLIC_DIRECTORY"}/js/ips.hovercard.js,{parse expression="PUBLIC_DIRECTORY"}/js/ips.quickpm.js<if test="hasjsmodules:|:count($jsModules)">,{parse expression="PUBLIC_DIRECTORY"}/js/ips.{parse expression="implode('.js,' . PUBLIC_DIRECTORY . '/js/ips.', array_unique( array_keys( $jsModules ) ) )"}.js</if>' charset='{$this->settings['gb_char_set']}'></script>
 <else />
 	<if test="nominifyremoteloadjs:|:$this->settings['remote_load_js']">
-		<script type='text/javascript' src='<if test="nmusehttpsp:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.6/prototype.js'></script>
+		<script type='text/javascript' src='<if test="nmusehttpsp:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.7/prototype.js'></script>
 	<else />
-		<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/prototype.js'></script>
+		<script type='text/javascript' src='{$this->settings['js_base_url']}js/3rd_party/prototype.js'></script>
 	</if>
-	<script type='text/javascript' src='{$this->settings['public_dir']}js/ipb.js?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;load=quickpm,{parse expression="implode(',', array_unique( array_keys( $jsModules ) ) )"}'></script>
+	<script type='text/javascript' src='{$this->settings['js_base_url']}js/ipb.js?ipbv={parse expression="trim(ipsRegistry::$vn_full)"}&amp;load=quickpm,hovercard,{parse expression="implode(',', array_unique( array_keys( $jsModules ) ) )"}'></script>
 	<if test="nominifyremoteloadjs2:|:$this->settings['remote_load_js']">
 		<script type='text/javascript' src='<if test="nmusehttpss:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/scriptaculous/1.8/scriptaculous.js?load=effects,dragdrop,builder'></script>
 	<else />
-		<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/scriptaculous/scriptaculous-cache.js'></script>
+		<script type='text/javascript' src='{$this->settings['js_base_url']}js/3rd_party/scriptaculous/scriptaculous-cache.js'></script>
 	</if>
 	<script type="text/javascript" src='{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/ipb.lang.js' charset='{$this->settings['gb_char_set']}'></script>
+</if>
+{parse template="liveEditJs" group="global"}
+<if test="isLargeTouch:|:$this->registry->output->isLargeTouchDevice()">
+<script type="text/javascript" src='{$this->settings['js_base_url']}js/3rd_party/iscroll/iscroll.js'></script>
 </if>]]></template_content>
       <template_name>includeJS</template_name>
       <template_data>$jsModules</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1132,12 +1310,15 @@ function gbl_addDownloadButton()
       <template_group>skin_global</template_group>
       <template_content><![CDATA[<if test="metatags:|:is_array( $metaTags ) AND count( $metaTags )">
 	<foreach loop="metaTags:$metaTags as $tag => $content">
-	<meta name="$tag" content="$content" />
+		<meta name="{$tag}" content="{$content}" />
+		<if test="hasIdentifier:|:$tag == 'identifier-url'">
+			<meta name="og:url" content="{$content}" />
+		</if>
 	</foreach>
 </if>]]></template_content>
       <template_name>includeMeta</template_name>
       <template_data>$metaTags</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1153,19 +1334,14 @@ function gbl_addDownloadButton()
 		</if>
 	</if>
 </foreach>
-<script type='text/javascript'>
-	var isRTL	= false;
-	var rtlIe	= '';
-	var rtlFull	= '';
-</script>
-<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl.css' )">
+<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl.css' )">
 	<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl.css" />
 	<script type='text/javascript'>
 		var rtlFull	= "{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl.css";
 		var isRTL	= true;
 	</script>
 <else />
-	<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl.css' )">
+	<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl.css' )">
 		<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/ipb_rtl.css" />
 		<script type='text/javascript'>
 			var rtlFull	= "{$this->settings['public_dir']}style_css/ipb_rtl.css";
@@ -1173,7 +1349,7 @@ function gbl_addDownloadButton()
 		</script>
 	</if>
 </if>
-<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl_ie.css' )">
+<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . $this->registry->output->skin['_csscacheid'] . '/ipb_rtl_ie.css' )">
 	<!--[if lte IE 7]>
 	<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl_ie.css" />
 	<![endif]-->
@@ -1181,7 +1357,7 @@ function gbl_addDownloadButton()
 		var rtlIe	= "{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_rtl_ie.css";
 	</script>
 <else />
-	<if test="importrtlcss:|:$this->isRtlLang AND file_exists( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl_ie.css' )">
+	<if test="importrtlcss:|:$this->isRtlLang AND is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/ipb_rtl_ie.css' )">
 		<!--[if lte IE 7]>
 		<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/ipb_rtl_ie.css" />
 		<![endif]-->
@@ -1189,10 +1365,21 @@ function gbl_addDownloadButton()
 			var rtlIe	= "{$this->settings['public_dir']}style_css/ipb_rtl_ie.css";
 		</script>
 	</if>
+</if>
+<if test="hasMemberTopicMax:|:$this->settings['member_topic_avatar_max']">
+	<!-- Forces topic photo to show without thumb -->
+	<style type='text/css'>
+		.ipsUserPhoto_variable { max-width: {parse expression="intval($this->settings['member_topic_avatar_max'])"}px !important; }
+		<if test="RTLMargin:|:$this->isRtlLang">
+			.post_body { margin-right: {parse expression="((intval($this->settings['member_topic_avatar_max']  + 25 ) < 185 ) ? 185 : intval($this->settings['member_topic_avatar_max']  + 25 ) )"}px !important; }
+		<else />
+			.post_body { margin-left: {parse expression="((intval($this->settings['member_topic_avatar_max']  + 25 ) < 185 ) ? 185 : intval($this->settings['member_topic_avatar_max']  + 25 ) )"}px !important; }
+		</if>
+	</style>
 </if>]]></template_content>
       <template_name>includeRTL</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1205,6 +1392,7 @@ function gbl_addDownloadButton()
 		/* ---- URLs ---- */
 		ipb.vars['base_url'] 			= '<if test="$this->registry->output->isHTTPS">{parse expression="str_replace( 'http://', 'https://', "{$this->settings['js_base']}" )"}<else />{$this->settings['js_base']}</if>';
 		ipb.vars['board_url']			= '{$this->settings['board_url']}';
+		ipb.vars['img_url'] 			= "{$this->settings['img_url']}";
 		ipb.vars['loading_img'] 		= '{$this->settings['img_url']}/loading.gif';
 		ipb.vars['active_app']			= '{$this->registry->getCurrentApplication()}';
 		ipb.vars['upload_url']			= '{$this->settings['upload_url']}';
@@ -1214,49 +1402,116 @@ function gbl_addDownloadButton()
 		ipb.vars['is_admin']			= parseInt( {$this->memberData['g_access_cp']} );
 		ipb.vars['secure_hash'] 		= '{$this->member->form_hash}';
 		ipb.vars['session_id']			= '{$this->member->session_id}';
-		ipb.vars['can_befriend']		= <if test="canbefriend:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">true<else />false</if>;
 		ipb.vars['twitter_id']			= {parse expression="intval($this->memberData['twitter_id'])"};
 		ipb.vars['fb_uid']				= <if test="hasFBCHash:|:$this->memberData['fb_token']">{parse expression="intval($this->memberData['fb_uid'])"}<else />0</if>;
+		ipb.vars['auto_dst']			= parseInt( {$this->memberData['members_auto_dst']} );
+		ipb.vars['dst_in_use']			= parseInt( {$this->memberData['dst_in_use']} );
+		ipb.vars['is_touch']			= <if test="istl:|:$this->registry->output->isLargeTouchDevice()">'large';<else /><if test="istm:|:$this->registry->output->isSmallTouchDevice()">'small';<else />false;</if></if>
+		ipb.vars['member_group']		= {parse expression="json_encode( array( 'g_mem_info' => $this->memberData['g_mem_info'] ) )"}
 		/* ---- cookies ----- */
 		ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
 		ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
 		ipb.vars['cookie_path']			= '{$this->settings['cookie_path']}';
 		/* ---- Rate imgs ---- */
-		ipb.vars['rate_img_on']			= '{$this->settings['img_url']}/bullet_star.png';
-		ipb.vars['rate_img_off']		= '{$this->settings['img_url']}/bullet_star_off.png';
-		ipb.vars['rate_img_rated']		= '{$this->settings['img_url']}/bullet_star_rated.png';
+		ipb.vars['rate_img_on']			= '{$this->settings['img_url']}/star.png';
+		ipb.vars['rate_img_off']		= '{$this->settings['img_url']}/star_off.png';
+		ipb.vars['rate_img_rated']		= '{$this->settings['img_url']}/star_rated.png';
 		/* ---- Uploads ---- */
 		ipb.vars['swfupload_swf']		= '{parse url="js/3rd_party/swfupload/swfupload.swf" base="public_dir"}';
 		ipb.vars['swfupload_enabled']	= <if test="canswfupload:|:$this->settings['uploadFormType']">true<else />false</if>;
 		ipb.vars['use_swf_upload']		= ( '{$this->memberData['member_uploader']}' == 'flash' ) ? true : false;
-		ipb.vars['swfupload_debug']		= false; /* SKINNOTE: Turn off for production */
+		ipb.vars['swfupload_debug']		= false;
 		/* ---- other ---- */
-		ipb.vars['live_search_limit'] 	= 4;
-		ipb.vars['highlight_color']		= "#ade57a";
+		ipb.vars['highlight_color']     = "#ade57a";
 		ipb.vars['charset']				= "{$this->settings['gb_char_set']}";
-		ipb.vars['use_rte']				= 1;
-		ipb.vars['image_resize']		= {parse expression="intval($this->settings['resize_linked_img'])"};
-		ipb.vars['image_resize_force']  = {parse expression="intval($this->settings['resize_img_force'])"};
 		ipb.vars['seo_enabled']			= {parse expression="intval($this->settings['use_friendly_urls'])"};
 		<if test="usefurl:|:$this->settings['use_friendly_urls']">
 		ipb.vars['seo_params']			= {parse expression="json_encode($this->registry->getClass('output')->seoTemplates['__data__'])"};
 		</if>
 		/* Templates/Language */
-		ipb.templates['ajax_loading'] 	= "<div id='ajax_loading'>" + ipb.lang['loading'] + "</div>";
+		ipb.templates['inlineMsg']		= "{$header_items['inlineMsg']}";
+		ipb.templates['ajax_loading'] 	= "<div id='ajax_loading'><img src='{$this->settings['img_url']}/ajax_loading.gif' alt='" + ipb.lang['loading'] + "' /></div>";
 		ipb.templates['close_popup']	= "<img src='{$this->settings['img_url']}/close_popup.png' alt='x' />";
-		ipb.templates['rss_shell']		= new Template("<ul id='rss_menu'>#{items}</ul>");
+		ipb.templates['rss_shell']		= new Template("<ul id='rss_menu' class='ipbmenu_content'>#{items}</ul>");
 		ipb.templates['rss_item']		= new Template("<li><a href='#{url}' title='#{title}'>#{title}</a></li>");
-		ipb.templates['resized_img']	= new Template("<span>{$this->lang->words['resized_image']}</span>");
-		ipb.templates['m_add_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a>");
-		ipb.templates['m_rem_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a>");
+		ipb.templates['m_add_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a>");
+		ipb.templates['m_rem_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a>");
 		ipb.templates['autocomplete_wrap'] = new Template("<ul id='#{id}' class='ipb_autocomplete' style='width: 250px;'></ul>");
-		ipb.templates['autocomplete_item'] = new Template("<li id='#{id}'><img src='#{img}' alt='' width='#{img_w}' height='#{img_h}' />&nbsp;&nbsp;#{itemvalue}</li>");
-		ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['global_page_jump']}</h3><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit add_folder' id='#{id}_submit' /></div>");
+		ipb.templates['autocomplete_item'] = new Template("<li id='#{id}' data-url='#{url}'><img src='#{img}' alt='' class='ipsUserPhoto ipsUserPhoto_mini' />&nbsp;&nbsp;#{itemvalue}</li>");
+		ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['global_page_jump']}</h3><p class='ipsPad'><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit add_folder' id='#{id}_submit' /></p></div>");
+		ipb.templates['global_notify'] 	= new Template("<div class='popupWrapper'><div class='popupInner'><div class='ipsPad'>#{message} #{close}</div></div></div>");
+		<if test="hasNotification:|:! empty( $header_items['notifications'] )">
+			ipb.vars['notificationData']          = {$header_items['notifications']};
+			ipb.templates['notificationTemplate'] = new Template( "<div><h3>#{notify_title}</h3><div class='fixed_inner ipsPad row1'><h4 class='ipsType_sectiontitle'>#{member_PhotoTag} #{title} <span class='ipsType_smaller'>{$this->lang->words['by_ucfirst']} #{member_members_display_name} - #{date_parsed}</span><p class='ipsType_smaller right ipsPad_half'><a href='#{url}'>{parse expression="sprintf( $this->lang->words['global_pm_read_short'], '#{type}' )"}</a></p></h4><p class='ipsPad_half'>#{content}</p></div></div>");
+		</if>
+		
+		ipb.templates['header_menu'] 	= new Template("<div id='#{id}' class='ipsHeaderMenu boxShadow'></div>");
+		<if test="autodst:|:$this->memberData['members_auto_dst'] == 1 AND $this->settings['time_dst_auto_correction']">
+			ipb.global.checkDST();
+		</if>
+		Loader.boot();
 	//|#^#]>
 	</script>]]></template_content>
       <template_name>includeVars</template_name>
+      <template_data>$header_items=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[<if test="liveEditOn:|: defined( 'IPS_LIVE_EDIT') && IPS_LIVE_EDIT">
+	<script type='text/javascript'>	
+		skingen_imgs = "{$this->settings['public_dir']}style_extra/skin_creator";
+		<if test="hasSkinData:|: ! empty( $this->registry->output->skinGenSession['skin_gen_data'] )">
+		var IPS_SKIN_GEN_SAVED_DATA = {parse expression="json_encode( $this->registry->output->skinGenSession['skin_gen_data'] )"};
+		</if>
+	</script>
+	<link rel="stylesheet" href="{$this->settings['public_dir']}style_css/skin_creator.css" type="text/css"  media="screen" />
+	<link rel="stylesheet" href="{$this->settings['js_base_url']}js/3rd_party/prototype/colorpicker/css/prototype_colorpicker.css" type="text/css"  media="screen" />
+	<script type="text/javascript" src="{$this->settings['js_base_url']}js/3rd_party/prototype/colorpicker/js/prototype_colorpicker.js"></script>
+	<script type="text/javascript" src="{$this->settings['cache_dir']}skinGenJsonCache.js"></script>
+	<script type="text/javascript" src="{$this->settings['js_base_url']}js/ips.skin_gen.js"></script>
+</if>]]></template_content>
+      <template_name>liveEditJs</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global</template_group>
+      <template_content><![CDATA[<if test="haspages:|:$data['totalItems'] > $data['itemsPerPage']">
+	<div class='left pagination clear'>
+		<ul class='ipsList_inline back forward'>
+			<if test="prevpage:|:$data['_hasPrevious']">
+				<li class='prev'>
+					<if test="useAjaxPrev:|:$data['ajaxLoad']">
+						<a href="#" onclick="return ipb.global.ajaxPagination( '{$data['ajaxLoad']}', '{parse url="{$data['baseUrl']}&amp;secure_key={$this->member->form_hash}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' );" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']} {$this->lang->words['prev']}</a>
+					<else />
+						<a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']} {$this->lang->words['prev']}</a>
+					</if>
+				</li>
+			</if>
+			<if test="nextpage:|:$data['_hasNext']">
+				<li class='next'>
+					<if test="useAjaxNext:|:$data['ajaxLoad']">
+						<a href="#" onclick="return ipb.global.ajaxPagination( '{$data['ajaxLoad']}', '{parse url="{$data['baseUrl']}&amp;secure_key={$this->member->form_hash}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' );" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_rarr']}</a>
+					<else />
+						<a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']} {$this->lang->words['_rarr']}</a>
+					</if>
+				</li>
+			</if>
+		</ul>
+	</div>
+</if>]]></template_content>
+      <template_name>nextPreviousTemplate</template_name>
+      <template_data>$data</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1265,43 +1520,55 @@ function gbl_addDownloadButton()
     <template>
       <template_group>skin_global</template_group>
       <template_content><![CDATA[<if test="haspages:|:$work['pages'] > 1">
-	<ul class='pagination left'>
-		<if test="$this->request['module'] != 'ajax'">
-		<li class='pagejump clickable pj{$data['uniqid']}'>
-			{$work['pages']} {$this->lang->words['tpl_pages']} {parse replacement="dropdown"}
-			<script type='text/javascript'>
-				ipb.global.registerPageJump( '{$data['uniqid']}', { url: "{parse url="{$data['baseUrl']}" template="{$data['seoTemplate']}" seotitle="{$data['seoTitle']}" base="{$data['base']}"}<if test="furlinfo:|:$data['isFriendly']">/</if>", stKey: '{$data['startValueKey']}', perPage: {$data['itemsPerPage']}, totalPages: {$work['pages']} } );
-			</script>
-		</li>
-		</if>
-		<if test="firstpage:|:1 < ($work['current_page'] - $data['dotsSkip'])">
-			<li class='first'><a href='{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}=0" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' title='{$this->lang->words['tpl_gotofirst']}' rel='start'>{$this->lang->words['_laquo']} {$this->lang->words['ps_first']}</a></li>
-		</if>
-		<if test="prevpage:|:$work['current_page'] > 1">
-			<li class='prev'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']}</a></li>
-		</if>
-		<if test="normalpages:|:is_array( $work['_pageNumbers'] ) && count( $work['_pageNumbers'] )">
-			<foreach loop="pagination:$work['_pageNumbers'] as $_real => $_page">
-				<if test="activepage:|:$_real == $data['currentStartValue']">
-					<li class='active'>{$_page}</li>
-				<else />
-					<li><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={$_real}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="$_page">{$_page}</a></li>
-				</if>
-			</foreach>
-		</if>
-		<if test="nextpage:|:$work['current_page'] < $work['pages']">
-			<li class='next'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['_rarr']}</a></li>
-		</if>
-		<if test="lastpage:|:isset( $work['_showEndDots'] ) && $work['_showEndDots']">
-			<li class='last'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] )"}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_gotolast']}" rel='last'>{$this->lang->words['ps_last']} {$this->lang->words['_raquo']}</a></li>
-		</if>
-	</ul>
+	<div class='pagination clearfix left <if test="!$data['showNumbers']">no_numbers</if>'>
+		<ul class='ipsList_inline back left'>
+			<if test="firstpage:|:1 < ($work['current_page'] - $data['dotsSkip'])">
+				<li class='first'><a href='{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}=0{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}' title='{$this->lang->words['tpl_gotofirst']}' rel='start'>{$this->lang->words['_laquo']} <!--{$this->lang->words['ps_first']}--></a></li>
+			</if>
+			<if test="prevpage:|:$work['current_page'] > 1">
+				<li class='prev'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] - $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['prev']}</a></li>
+			</if>
+		</ul>
+		<ul class='ipsList_inline left pages'>
+			<if test="$this->request['module'] != 'ajax' AND !$data['noDropdown']">
+				<li class='pagejump clickable pj{$data['uniqid']}'>
+					<a href='#'>{parse expression="sprintf( $this->lang->words['tpl_pages'], $work['current_page'], $work['pages'] )"} <!--{parse replacement="dropdown"}--></a>
+					<script type='text/javascript'>
+						ipb.global.registerPageJump( '{$data['uniqid']}', { url: "{parse url="{$data['baseUrl']}" template="{$data['seoTemplate']}" seotitle="{$data['seoTitle']}" base="{$data['base']}"}<if test="furlinfo:|:$data['isFriendly']">/</if>", stKey: '{$data['startValueKey']}', perPage: {$data['itemsPerPage']}, totalPages: {$work['pages']}, anchor: '{$data['anchor']}' } );
+					</script>
+				</li>
+			<else />
+				<li class='pagejump'>
+					{parse expression="sprintf( $this->lang->words['tpl_pages'], $work['current_page'], $work['pages'] )"}
+				</li>
+			</if>
+			<if test="normalpages:|:is_array( $work['_pageNumbers'] ) && count( $work['_pageNumbers'] )">
+				<foreach loop="pagination:$work['_pageNumbers'] as $_real => $_page">
+					<if test="activepage:|:$_real == $data['currentStartValue']">
+						<li class='page active'>{$_page}</li>
+					<else />
+						<li class='page'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={$_real}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="$_page">{$_page}</a></li>
+					</if>
+				</foreach>
+			</if>
+		</ul>
+		<ul class='ipsList_inline forward left'>
+			<if test="nextpage:|:$work['current_page'] < $work['pages']">
+				<li class='next'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['next']}</a></li>
+			</if>
+			<if test="lastpage:|:!empty( $work['_showEndDots'] )">
+				<li class='last'><a href="{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] )"}{$data['anchor']}" base="{$data['base']}" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}" title="{$this->lang->words['tpl_gotolast']}" rel='last'>{$this->lang->words['_raquo']}</a></li>
+			</if>
+		</ul>
+	</div>
 <else />
-	<span class='pagination no_pages left'>{$this->lang->words['page_1_of_1']}</span>
+	<if test="notDisableSinglePage:|:!$data['disableSinglePage']">
+		<p class='pagination no_pages left ipsType_small'><span>{$this->lang->words['page_1_of_1']}</span></p>
+	</if>
 </if>]]></template_content>
       <template_name>paginationTemplate</template_name>
       <template_data>$work, $data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1309,53 +1576,51 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=search&amp;do=search&amp;fromMainBar=1" base="public"}" method="post" id='search-box' >
-	<fieldset>
-		<label for='main_search' class='hide'>{$this->lang->words['sj_search']}</label>
-		<span id='search_wrap'>
-			<input type='text' id='main_search' name='search_term' class='text_input' size='17' tabindex='6' />
-			<span class='choice ipbmenu clickable' id='search_options'></span>
-			<ul id='search_options_menucontent' class='boxShadow' style='display: none'>
-				<li class='title'><strong>{$this->lang->words['context_search_title']}</strong></li>
-				<if test="inTopic:|:$this->request['showtopic']">
-					<li class='special'><label for='s_topic' title='{$this->lang->words['context_search_topic']}'><input type='radio' name='search_app' value="forums:topic:{$this->request['showtopic']}" class='input_radio' id='s_topic' checked="checked" /> <strong>{$this->lang->words['context_search_topic']}</strong></label></li>
-				</if>
-				<if test="inForum:|:( $this->request['showforum'] AND $this->registry->getClass('class_forums')->forum_by_id[ $this->request['showforum'] ]['sub_can_post'] ) || $this->request['showtopic']">
-					<li class='special'><label for='s_forum' title='{$this->lang->words['context_search_forum']}'><input type='radio' name='search_app' value="forums:forum:{$this->request['f']}" class='input_radio' id='s_forum' <if test="!$this->request['showtopic']">checked="checked"</if> /> <strong>{$this->lang->words['context_search_forum']}</strong></label></li>
-				</if>
-				<if test="lookElsewhere:|:! in_array( $this->registry->getCurrentApplication(), array( 'forums', 'members', 'core' ) )">
-					<if test="appContextSearch:|:method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'contextSearch' )">
-						{parse template="contextSearch" group="{current_app}_global" params=""}
+      <template_content><![CDATA[<div id='search' class='right'>
+	<form action="{parse url="app=core&amp;module=search&amp;do=search&amp;fromMainBar=1" base="public"}" method="post" id='search-box' >
+		<fieldset>
+			<label for='main_search' class='hide'>{$this->lang->words['sj_search']}</label>
+			<a href='{parse url="app=core&amp;module=search&amp;search_in=<if test="hasSearchApp:|:isset($this->request['search_app']) AND $this->request['search_app']">{$this->request['search_app']}<else />{$this->registry->getCurrentApplication()}</if>" base="public"}' title='{$this->lang->words['advanced_search']}' accesskey='4' rel="search" id='adv_search' class='right'>{$this->lang->words['advanced']}</a>
+			<span id='search_wrap' class='right'>
+				<input type='text' id='main_search' name='search_term' class='inactive' size='17' tabindex='6' />
+				<span class='choice ipbmenu clickable' id='search_options' style='display: none'></span>
+				<ul id='search_options_menucontent' class='ipbmenu_content ipsPad' style='display: none'>
+					<li class='title'><strong>{$this->lang->words['context_search_title']}</strong></li>
+					<if test="inTopic:|:$this->request['showtopic']">
+						<li class='special'><label for='s_topic' title='{$this->lang->words['context_search_topic']}'><input type='radio' name='search_app' value="forums:topic:{$this->request['showtopic']}" class='input_radio' id='s_topic' checked="checked" /> <strong>{$this->lang->words['context_search_topic']}</strong></label></li>
 					</if>
-				</if>
-				<if test="IPSLib::appIsSearchable( 'forums', 'search' )">
-					<li class='app'><label for='s_forums' title='{$this->lang->words['discussion']}'><input type='radio' name='search_app' class='input_radio' id='s_forums' value="forums" <if test="inThisApp:|:( ( $this->request['search_app'] && $this->request['search_app'] == 'forums' ) ) || ( !IPSLib::appIsSearchable( $this->registry->getCurrentApplication(), 'search' ) ) || ( ( $this->registry->getCurrentApplication() == 'forums' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'forums' )}</label></li>
-				</if>
-				<if test="IPSLib::appIsSearchable( 'members', 'search' )">
-					<li class='app'><label for='s_members' title='{$this->lang->words['tb_mlist']}'><input type='radio' name='search_app' class='input_radio' id='s_members' value="members" <if test="inThisApp:|:( ( $this->request['search_app'] && $this->request['search_app'] == 'members' ) ) || ( ( $this->registry->getCurrentApplication() == 'members' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'members' )}</label></li>
-				</if>
-				<if test="IPSLib::appIsSearchable( 'core', 'search' )">
-					<li class='app'><label for='s_core' title='{$this->lang->words['sj_help']}'><input type='radio' name='search_app' class='input_radio' id='s_core' value="core" <if test="inThisApp:|:( ( $this->request['search_app'] && $this->request['search_app'] == 'core' ) ) || ( ( $this->registry->getCurrentApplication() == 'core' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'core' )}</label></li>
-				</if>
-				<foreach loop="appLoop:$this->registry->getApplications() as $app => $data">
-					<if test="IPSLib::appIsSearchable( $app, 'search' ) AND !in_array( $app, array( 'forums', 'members', 'core' ) )">
-						<li class='app'><label for='s_{$app}' title='{$data['app_public_title']}'><input type='radio' name='search_app' class='input_radio' id='s_{$app}' value="{$app}" <if test="inThisApp:|:( ( $this->request['search_app'] && $this->request['search_app'] == $app ) || ( !IPSLib::appIsSearchable( $this->registry->getCurrentApplication(), 'search' ) AND $app == 'core' ) || ( ( $this->registry->getCurrentApplication() == $app ) && ! $this->request['search_app'] ) ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( $app )}</label></li>
+					<if test="inForum:|:( $this->request['showforum'] AND $this->registry->getClass('class_forums')->forum_by_id[ $this->request['showforum'] ]['sub_can_post'] ) || $this->request['showtopic']">
+						<li class='special'><label for='s_forum' title='{$this->lang->words['context_search_forum']}'><input type='radio' name='search_app' value="forums:forum:{$this->request['f']}" class='input_radio' id='s_forum' <if test="!$this->request['showtopic']">checked="checked"</if> /> <strong>{$this->lang->words['context_search_forum']}</strong></label></li>
 					</if>
-				</foreach>
-			</ul>
-		</span>
-		<input type='submit' class='submit_input clickable' value='{$this->lang->words['sj_search']}' />
-		<a href='{parse url="app=core&amp;module=search&amp;search_in={$this->registry->getCurrentApplication()}" base="public"}' title='{$this->lang->words['advanced_search']}' accesskey='4' rel="search" id='adv_search'>{$this->lang->words['advanced']}</a>
-	</fieldset>
-</form>
-<script type='text/javascript'>
-	document.observe("dom:loaded", function(){
-		ipb.global.contextualSearch();
-	});
-</script>]]></template_content>
+					<if test="lookElsewhere:|:! in_array( $this->registry->getCurrentApplication(), array( 'forums', 'members', 'core' ) )">
+						<if test="appContextSearch:|:method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'contextSearch' )">
+							{parse template="contextSearch" group="{current_app}_global" params=""}
+						</if>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'forums', 'search' )">
+						<li class='app'><label for='s_forums' title='{IPSLib::getAppTitle('forums')}'><input type='radio' name='search_app' class='input_radio' id='s_forums' value="forums" <if test="inThisApp:|:( ( isset($this->request['search_app']) AND $this->request['search_app'] == 'forums' ) ) || ( !IPSLib::appIsSearchable( $this->registry->getCurrentApplication(), 'search' ) ) || ( ( $this->registry->getCurrentApplication() == 'forums' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'forums' )}</label></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'members', 'search' )">
+						<li class='app'><label for='s_members' title='{IPSLib::getAppTitle('members')}'><input type='radio' name='search_app' class='input_radio' id='s_members' value="members" <if test="inThisApp:|:( ( isset($this->request['search_app']) AND $this->request['search_app'] == 'members' ) ) || ( ( $this->registry->getCurrentApplication() == 'members' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'members' )}</label></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'core', 'search' )">
+						<li class='app'><label for='s_core' title='{IPSLib::getAppTitle('core')}'><input type='radio' name='search_app' class='input_radio' id='s_core' value="core" <if test="inThisApp:|:( ( isset($this->request['search_app']) AND $this->request['search_app'] == 'core' ) ) || ( ( $this->registry->getCurrentApplication() == 'core' ) && ! $this->request['search_app'] ) && !$this->request['showtopic'] && !$this->request['showforum']">checked="checked"</if> />{IPSLib::getAppTitle( 'core' )}</label></li>
+					</if>
+					<foreach loop="appLoop:$this->registry->getApplications() as $app => $data">
+						<if test="IPSLib::appIsSearchable( $app, 'search' ) AND !in_array( $app, array( 'forums', 'members', 'core' ) )">
+							<li class='app'><label for='s_{$app}' title='{IPSLib::getAppTitle( $app )}'><input type='radio' name='search_app' class='input_radio' id='s_{$app}' value="{$app}" <if test="inThisApp:|:( ( isset($this->request['search_app']) AND $this->request['search_app'] == $app ) || ( !IPSLib::appIsSearchable( $this->registry->getCurrentApplication(), 'search' ) AND $app == 'core' ) || ( ( $this->registry->getCurrentApplication() == $app ) && ( !isset($this->request['search_app']) OR !$this->request['search_app'] ) ) ) && !$this->request['showtopic'] && !$this->request['showforum'] && ( !method_exists( $this->registry->output->getTemplate( $this->registry->getCurrentApplication() . '_global' ), 'contextSearch' ) or ipsRegistry::$appSearch )">checked="checked"</if> />{IPSLib::getAppTitle( $app )}</label></li>
+						</if>
+					</foreach>
+				</ul>
+				<input type='submit' class='submit_input clickable' value='{$this->lang->words['sj_search']}' />
+			</span>
+			
+		</fieldset>
+	</form>
+</div>]]></template_content>
       <template_name>quickSearch</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1365,22 +1630,26 @@ function gbl_addDownloadButton()
       <template_group>skin_global</template_group>
       <template_content><![CDATA[{parse js_module="sharelinks"}
 <if test="gotLinks:|:is_array( $links )">
-	<ul class='{$cssClass} shareButtons'>
+	<ul class='{$cssClass} shareButtons ipsList_inline'>
 	<foreach loop="cacheLoop:$links as $id => $data">
 		<if test="isEnabled:|:$data['share_enabled']">
-			<li><a href="{parse url="sharelink={$data['share_key']};{$data['_url']};{$title}" base="public"}" rel="nofollow" target="_blank" title="<if test="!in_array( $data['share_key'], array( 'print', 'download' ) )">{$this->lang->words['gbl_sharelink_with']} </if>{$data['share_title']}" class='_slink' id='slink_{$data['share_key']}'><img src="{$this->settings['public_dir']}style_extra/sharelinks/{$data['share_key']}.png" /></a></li>
+			<if test="hasCustom:|:$data['customOutput'] and is_array( $data['customOutput'] )">
+				{parse expression="$this->registry->output->getTemplate($data['customOutput'][0])->$data['customOutput'][1]( $url, $title )"}
+			<else />
+			<li><a href="{parse url="sharelink={$data['share_key']};{$data['_url']};{$title}" base="public"}" rel="nofollow" target="_blank" title="<if test="!in_array( $data['share_key'], array( 'print', 'download' ) )">{$this->lang->words['gbl_sharelink_with']} {$data['share_title']}<else />{$this->lang->words['gbl_sharelink_with_' . $data['share_key'] ]}</if>" class='_slink' id='slink_{$data['share_key']}'><img src="{$this->settings['public_cdn_url']}style_extra/sharelinks/{$data['share_key']}.png" /></a></li>
+			</if>
 		</if>
 	</foreach>
 	</ul>
 	<script type="text/javascript">
 		ipb.sharelinks.url   = "{parse expression="IPSText::base64_decode_urlSafe($url)"}";
-		ipb.sharelinks.title = "{parse expression="IPSText::base64_decode_urlSafe($title)"}";
-		ipb.sharelinks.bname = "{parse expression="trim($this->settings['board_name'])"}";
+		ipb.sharelinks.title = "{parse expression="IPSText::base64_decode_urlSafe( IPSText::htmlspecialchars( $title ) )"}";
+		ipb.sharelinks.bname = "{parse expression="trim(addslashes($this->settings['board_name']))"}";
 	</script>
 </if>]]></template_content>
       <template_name>shareLinks</template_name>
       <template_data><![CDATA[$links, $title='', $url='', $cssClass='topic_share left']]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1388,12 +1657,13 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<div class="signature">
+      <template_content><![CDATA[<div class="signature" data-memberid="{$author_id}">
+	<if test="notMe:|: $this->memberData['member_id'] && $this->memberData['member_id'] != $author_id && $can_ignore"><a href='#' class='hide_signature'></a></if>
 	{$sig}
 </div>]]></template_content>
       <template_name>signature_separator</template_name>
-      <template_data><![CDATA[$sig=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data><![CDATA[$sig="", $author_id=0, $can_ignore=true]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1401,32 +1671,10 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<a href='#' id='tidPop_{$topicId}' style='display:none' title='{$this->lang->words['view_topic_preview']}' class='__tpopup'>{parse replacement="topic_popup"}</a>]]></template_content>
-      <template_name>topic_popup</template_name>
-      <template_data><![CDATA[$topicId='', $seoTitle='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[&nbsp;<if test="popupmemberid:|:$memberid AND $this->memberData['g_mem_info']"> <a href='{parse url="showuser={$memberid}&amp;f={$this->request['f']}" template="showuser" seotitle="{$seoName}" base="public"}' class='__user __id{$memberid}<if test="popupforumid:|:! empty($this->request['f'])"> __fid{$this->request['f']}</if>' title='{$this->lang->words['view_profile']}'>{parse replacement="user_popup"}</a></if>]]></template_content>
-      <template_name>user_popup</template_name>
-      <template_data><![CDATA[$memberid=0, $seoName='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<a hovercard-ref="member" hovercard-id="{$member['member_id']}" class="_hovertrigger" href='{parse url="showuser={$member['member_id']}<if test="hasEf:|:$this->request['f']">&amp;f={$this->request['f']}</if>" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a>]]></template_content>
+      <template_content><![CDATA[<if test="hasMemberId:|:$member['member_id']"><a hovercard-ref="member" hovercard-id="{$member['member_id']}" class="_hovertrigger url fn" href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'></if>{$member['members_display_name']}<if test="hasMemberIdClose:|:$member['member_id']"></a></if>]]></template_content>
       <template_name>userHoverCard</template_name>
       <template_data>$member=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1434,15 +1682,29 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global</template_group>
-      <template_content><![CDATA[<ul class='user_details'>
-		<if test="avatar:|:$author['member_id'] AND $author['avatar']">
-			<li class='avatar'><a href="{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}" title="{$this->lang->words['view_profile']}">{$author['avatar']}</a></li>
+      <template_content><![CDATA[<div class='user_details'>
+	<ul class='basic_info'>
+		<if test="membertitle:|:$author['member_title']">
+			<p class='desc member_title'>{$author['member_title']}</p>
+		</if>
+		<if test="avatar:|:$author['member_id']">
+			<li class='avatar'>
+				<a href="{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}" title="{$this->lang->words['view_profile']}" class='ipsUserPhotoLink'>
+				<if test="hasVariable:|:$this->settings['member_topic_avatar_max']">	
+					<img src='{$author['pp_main_photo']}' class='ipsUserPhoto ipsUserPhoto_variable' />
+				<else />
+					<img src='{$author['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_large' />
+				</if>
+				</a>
+			</li>
 		<else />
-			<li class='avatar'>{$author['avatar']}</li>
-		</if>
-		<if test="membertitle:|:$author['title']">
-			<li class='title'>{$author['title']}</li>
+			<li class='avatar'>
+				<img src='{$author['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_large' />
+			</li>
 		</if>
+		<li class='group_title'>
+			{$author['_group_formatted']}
+		</li>
 		<if test="rankimage:|:$author['member_rank_img']">
 			<li class='group_icon'>
 			<if test="rankimageimage:|:$author['member_rank_img_i'] == 'img'">
@@ -1452,45 +1714,15 @@ function gbl_addDownloadButton()
 			</if>
 			</li>
 		</if>
-	</ul>
-	<div style='margin: 0 auto;'>
-		<if test="xhtmlftw:|:$this->memberData['member_id'] != $author['member_id'] OR ($author['has_blog'] AND IPSLib::appIsInstalled( 'blog' )) OR ($author['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' ))">
-			<ul class='user_controls clear'>
-				<if test="friendop:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $author['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends'] && $author['member_id']">
-					<if test="isfriend:|:IPSMember::checkFriendStatus( $author['member_id'] )">
-						<li class='mini_friend_toggle is_friend' id='friend_{$contentid}_{$author['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$author['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
-					<else />
-						<li class='mini_friend_toggle is_not_friend' id='friend_{$contentid}_{$author['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$author['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>
-					</if>
-				</if>
-				<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['member_id'] != $author['member_id'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $author['member_id']">
-					<li class='pm_button' id='pm_{$contentid}_{$author['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$author['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}'>{parse replacement="send_msg"}</a></li>
-				</if>
-				<if test="hasblog:|:$author['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $author['has_blog'] != 'recache'">
-					<li><a href='{parse url="app=blog&amp;show_members_blogs={$author['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
-				</if>
-				<if test="hasgallery:|:$author['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-					<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$author['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
-				</if>
-			</ul>
-		</if>
-	</div>
-	<ul class='user_fields'>
-		<li>
-			<span class='ft'>{$this->lang->words['m_group']}</span>
-			<span class='fc'>{$author['_group_formatted']}</span>
+		<if test="postCount:|:$author['member_id']">
+		<li class='post_count desc lighter'>
+			{parse expression="$this->registry->getClass('class_localization')->formatNumber( intval( $author['posts'] ) )"} {$this->lang->words['m_posts']}
 		</li>
-		<if test="ismember:|:$author['member_id']">
-			<li>
-				<span class='ft'>{$this->lang->words['m_posts']}</span>
-				<span class='fc'>{parse expression="$this->registry->getClass('class_localization')->formatNumber( intval( $author['posts'] ) )"}</span>
-			</li>
-			<li>
-				<span class='ft'>{$this->lang->words['m_joined']}</span>
-				<span class='fc'>{parse date="$author['joined']" format="joined"}</span>
-			</li>
 		</if>
-		<if test="authorcfields:|:$author['custom_fields'] != """>
+	</ul>
+	
+	<if test="authorcfields:|:$author['custom_fields'] != """>
+		<ul class='custom_fields'>
 			<foreach loop="customFieldsOuter:$author['custom_fields'] as $group => $data">
 				<foreach loop="customFields:$author['custom_fields'][ $group ] as $field">
 					<if test="$field != ''">
@@ -1500,40 +1732,282 @@ function gbl_addDownloadButton()
 					</if>
 				</foreach>
 			</foreach>
-		</if>
-	</ul>
-	<if test="authorwarn:|:$author['warn_percent'] !== NULL">
-		<br class='clear' />
-		<div class='warn_panel clear rounded'>
-			<if test="$this->settings['warn_show_rating']">
-				<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$author['member_id']}" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
-				<p class='rating_mode user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-					<if test="changewarn:|:$author['can_edit_warn']">
-						<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$author['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
+		</ul>
+	</if>	
+		
+	<if test="authorwarn:|:$author['warn_percent'] !== NULL">		
+		<ul>
+			<li>
+				<br />
+				<div class='warn_panel clear rounded ipsType_small'>
+						<strong><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$author['member_id']}&amp;_tab=warn" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
+					<if test="highwarn:|:$author['warn_percent'] >= 80">
+						<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
+					<else />
+						<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
 					</if>
-					&lt;&nbsp;{$this->settings['warn_min']} ( {$author['warn_level']} ) {$this->settings['warn_max']}&nbsp;&gt;
-					<if test="changewarn:|:$author['can_edit_warn']">
-						<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$author['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a>
-					</if>
-				</p>
-			<else />
-				<if test="changewarn:|:$author['can_edit_warn']">
-					<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$author['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$author['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
-				</if>
-					<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$author['member_id']}" base="public"}' id='warn_link_{$contentid}_{$author['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
-				<if test="highwarn:|:$author['warn_percent'] >= 80">
-					<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-				<else />
-					<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$author['warn_percent']}%'>
-				</if>
-					<span style='width: {$author['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$author['warn_percent']}%</span></span>
-				</p>
-			</if>
-		</div>
-	</if>]]></template_content>
+						<span style='width: {$author['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$author['warn_percent']}%</span></span>
+					</p>
+				</div>
+			</li>
+		</ul>
+	</if>
+</div>]]></template_content>
       <template_name>userInfoPane</template_name>
       <template_data>$author, $contentid, $options</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+  </templategroup>
+  <templategroup group="skin_global_comments">
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<php>
+// Adjust author name as needed
+if( empty($r['author']['member_id']) && !empty($r['author']['comment_author_name']) )
+{
+	$r['author']['members_display_name'] = $r['author']['comment_author_name'];
+}
+</php>
+<if test="canEditNoPost:|:!$this->hasEditJs AND !$parent['_canComment'] AND $r['comment']['_canEdit']">
+	{parse template="getEditJs" group="global_comments" params=""}
+</if>
+<a id='comment_{$r['comment']['comment_id']}'></a>
+<div data-commentid='{$r['comment']['comment_id']}' class='ipsComment clearfix <if test="commentQueued:|:!$r['comment']['comment_approved']">moderated</if>' id='comment_id_{$r['comment']['comment_id']}'>
+	<if test="commentignored:|:$r['comment']['_ignored'] || $r['comment']['_repignored']">
+		<div class='post_ignore'>
+			<if test="userIgnoredLang:|:$r['comment']['_repignored'] == 1">{$this->lang->words['comment_ignored_rep']}<else />{$this->lang->words['ignored_comments_not']}</if> <if test="hasauthormemid:|:$r['author']['member_id']"><a href='{parse url="showuser={$r['author']['member_id']}" base="public"}'></if>{$r['author']['members_display_name']}<if test="hasauthormidclose:|:$r['author']['member_id']"></a></if>. <a href='#entry{$r['comment']['comment_id']}' title='{$this->lang->words['ignored_comments_not']}' style='display: none' id='unhide_post_{$r['comment']['comment_id']}'>{$this->lang->words['rep_view_anyway']}</a>
+		</div>
+	</if>
+	<div class='ipsComment_author'>
+		<if test="linkPhotoStart:|:$r['author']['member_id']"><a class='ipsUserPhotoLink' href='{parse url="showuser={$r['author']['member_id']}" template="showuser" seotitle="{$r['author']['members_seo_name']}" base="public"}'></if><img src='{$r['author']['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' /><if test="linkPhotoEnd:|:$r['author']['member_id']"></a></if><br />{parse template="userHoverCard" group="global" params="$r['author']"}<br />
+		<span class='post_id'>
+			<a rel='bookmark' class='desc lighter ipsType_smaller' href='{parse url="app=core&amp;module=global&amp;section=comments&amp;do=findComment&amp;comment_id={$r['comment']['comment_id']}&amp;parentId={$parent['parent_id']}&amp;fromApp={$settings['fromApp']}" base="public"}' title='{$this->lang->words['comment_permalink']}'>{parse date="$r['comment']['comment_date']" format="short"}</a>
+		</span>
+	</div>	
+	<div id='comment_{$r['comment']['comment_id']}' class='ipsComment_comment'>
+		<div class='comment_content'>{$r['comment']['comment_text']}</div>
+		
+		<ul class='ipsComment_controls ipsList_inline ipsType_smaller'>
+			<if test="moderateCheckbox:|:$parent['_canModerate']">
+				<li class='right'>&nbsp;&nbsp;<input class="ipsComment_mod" type='checkbox' name='' id='mod_comment_id_{$r['comment']['comment_id']}' /></li>
+			</if>
+			<if test="enableRep:|:$settings['enableRep']">
+				<li class='right'>
+					{parse template="repButtons" group="global_other" params="$r['author'], array_merge( array( 'primaryId' => $r['comment']['comment_id'], 'domLikeStripId' => 'like_post_' . $r['comment']['comment_id'], 'domCountId' => 'rep_comment_' . $r['comment']['comment_id'], 'app' => $settings['thisApp'], 'type' => $settings['repType'], 'likeFormatted' => $r['comment']['like']['formatted'] ), $r['comment'] )"}
+				</li>
+			</if>
+			<if test="canReply:|:$r['comment']['_canReply']">
+				<li><a href='{$this->settings['this_url']}<if test="hasAppend:|:! strstr( $this->settings['this_url'], '_rcid')"><if test="hasQ:|:strstr($this->settings['this_url'], '?')">&amp;<else />?</if>_rcid={$r['comment']['comment_id']}</if>#fastreply' title="{$this->lang->words['reply_to_comment']}" id='reply_comment_{$r['comment']['comment_id']}' class='ipsButton_secondary reply_comment'>{$this->lang->words['comment_reply']}</a></li>
+			</if>
+			<if test="canDelete:|:$r['comment']['_canDelete']">
+				<li>
+					<a href='{parse url="app=core&amp;module=global&amp;section=comments&amp;do=delete&amp;comment_id={$r['comment']['comment_id']}&amp;parentId={$parent['parent_id']}&amp;fromApp={$settings['fromApp']}&amp;auth_key={$this->member->form_hash}" base="public"}' id='delete_comment_{$r['comment']['comment_id']}' class='delete_comment' title='{$this->lang->words['delete_comment']}'>{$this->lang->words['delete_link']}</a>
+				</li>
+			</if>
+			<if test="canEdit:|:$r['comment']['_canEdit']">
+				<li>
+					<a href="{parse url="app=core&amp;module=global&amp;section=comments&amp;do=showEdit&amp;comment_id={$r['comment']['comment_id']}&amp;parentId={$parent['parent_id']}&amp;fromApp={$settings['fromApp']}" base="public"}" id='edit_comment_{$r['comment']['comment_id']}' class='edit_comment'>{$this->lang->words['edit_link']}</a>
+				</li>
+			</if>
+			<if test="hasReport:|:$r['comment']['urls-report']">
+				<li>
+					<a href="{parse url="{$r['comment']['urls-report']}&amp;st={$this->request['st']}" base="public"}">{$this->lang->words['report_link']}</a>
+				</li>
+			</if>
+		</ul>
+		
+	</div>
+</div>
+<if test="commentinitignored:|:$r['comment']['_ignored'] || $r['comment']['_repignored']">
+	<script type='text/javascript'>
+		ipb.comments.setCommentHidden( {$r['comment']['comment_id']} );
+	</script>
+</if>]]></template_content>
+      <template_name>comment</template_name>
+      <template_data>$r, $parent, $settings</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<script type='text/javascript'>
+	ipb.templates['comment_moderation'] = new Template("<div id='comment_moderate_box' class='ipsFloatingAction' style='display: none'><span class='desc'>{$this->lang->words['comment_action_count']} </span><select name='modOptions' class='input_select' id='commentModAction'><option value='approve'>{$this->lang->words['approve_x_comments']}</option><option value='unapprove'>{$this->lang->words['unapprove_x_comments']}</option><option value='delete'>{$this->lang->words['delete_x_comments']}</option></select>&nbsp;&nbsp;<input type='button' class='input_submit' id='submitModAction' value='{$this->lang->words['comments_act_go']}' /></div>");
+	
+	ipb.templates['comment_delete'] = new Template("<h3>{$this->lang->words['comm_confirm_delete']}</h3><div class='ipsPad ipsForm_center desc'>{$this->lang->words['comm_confirm_delete_desc']}<br /><br /><input type='button' class='input_submit' id='delPush' onclick='ipb.comments.deleteIt(event)' value='{$this->lang->words['del_comm_now']}' />");
+</script>
+{parse js_module="comments"}
+<a id='commentsStart'></a>
+<if test="comments_top:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
+	</div>
+</if>
+<div class='ipsComment_wrap' id='comment_wrap'>
+	<foreach loop="comments:$comments as $id => $r">
+		{parse template="comment" group="global_comments" params="$r, $parent, $settings"}
+	</foreach>
+</div>
+<if test="comments_bottom:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
+	</div>
+</if>
+<if test="allow_comments:|:$parent['_canComment']">
+	<br />
+	<a id="fastreply"></a>
+	<div id='fast_reply' class='ipsComment_reply row2 ipsPad'>
+		<form action="{parse url="" base="publicWithApp"}" method="post">
+			<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+			<input type="hidden" name="fromApp" value="{$settings['fromApp']}" />
+			<input type="hidden" name="app" value="core" />
+			<input type="hidden" name="module" value="global" />
+			<input type="hidden" name="section" value="comments" />	
+			<input type="hidden" name="do" value="add" />
+			<input type="hidden" name="parentId" value="{$parent['parent_id']}" />
+			<input type="hidden" name="fast_reply_used" value="1" />
+			<div class='ipsComment_reply_user'>
+				<img src='{$this->memberData['pp_small_photo']}' alt='{$this->lang->words['your_photo']}' class='ipsUserPhoto ipsUserPhoto_medium' />
+			</div>
+			<div id='commentReply' class='ipsComment_comment'>
+				<if test="guestName:|:!$this->memberData['member_id']">
+					<div id='commentName'>
+						<label for='comment_name'>{$this->lang->words['yourname_captcha']}</label> <input type='text' id='comment_name' name='comment_name' class='input_text' />
+						{$this->lang->words['or']} <a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['sign_in']}' data-clicklaunch="inlineSignin" data-clickscope="ipb.global">{$this->lang->words['click_here_to_log_in']}</a>
+					</div>
+					<if test="hasCaptcha:|:$settings['captcha']">
+						<div id='commentCaptcha' style='display:none;'>
+							{$settings['captcha']}
+						</div>
+					</if>
+				</if>
+				{parse editor="Post" content="$preReply" options="array( 'type' => 'mini', 'minimize' => 1, 'autoSaveKey' => $settings['autoSaveKey'] )"}
+				<br />
+				<div id='commentButtons'>
+					<input type='submit' name="submit" class='input_submit' id='commentPost' value='{$this->lang->words['comment_button_post']}' tabindex='0' accesskey='s' />
+				</div>
+			</div>
+		</form>
+	</div>
+</if>
+<if test="$comments">
+	<!-- REPUTATION FILTERS -->
+	<if test="reputationFilter:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_content'] && $this->memberData['member_id'] != 0 && is_array($this->caches['reputation_levels'])">
+		<div id='reputation_filter' class='filter_bar rounded'>
+			<span id='show_filters' class='clickable' style='display: none'>{$this->lang->words['rep_f_currently']} <if test="repFilterDefault:|:$this->memberData['_members_cache']['rep_filter'] && $this->memberData['_members_cache']['rep_filter'] === '*'">{$this->lang->words['g_rep_f_viewing_all']} <else />{$this->lang->words['g_rep_f_hiding']} {$this->memberData['_members_cache']['rep_filter']} {$this->lang->words['rep_f_points']}.</if> {$this->lang->words['rep_f_threshold']}</span>
+			<form id='filter_form' method="post" action="{parse url="" base="public"}">
+				<fieldset>
+		 			<input type="hidden" name="app" value="gallery" />
+			 		<input type="hidden" name="module" value="images" />
+			 		<input type="hidden" name="section" value="viewimage" />
+			 		<input type="hidden" name="rep_filter" value="update" />
+					<input type="hidden" name="img" value="{$this->request['img']}" />
+					<input type="hidden" name="cat" value="{$this->request['cat']}" />
+			 		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+			 		<input type="hidden" name="st" value="{$this->request['st']}" />
+			 		<label for='rep_filter_select'>{$this->lang->words['rep_f_hide']}</label>
+			 		<select name='rep_filter_set' id='rep_filter_select'>
+			 			<option value='*' <if test="optSelectStar:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $this->memberData['_members_cache']['rep_filter'] == '*'"> selected='selected'</if>>{$this->lang->words['g_rep_f_all_posts']}</option>
+					<if test="repFilterOptions:|:is_array($this->caches['reputation_levels'])">
+						<foreach loop="reputation_levels:$this->caches['reputation_levels'] as $k => $v">
+						<option value='{$v['level_points']}'<if test="optRepFilterSelected:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $v['level_points'] == $this->memberData['_members_cache']['rep_filter']"> selected='selected'</if>>{$v['level_points']} {$this->lang->words['rep_f_points']}</option>
+						</foreach>
+					</if>
+					</select>
+					<input type="submit" name="gobutton" value="{$this->lang->words['rep_f_update']}" class="input_submit alt" />
+				</fieldset>
+			</form>
+		</div>
+		<script type='text/javascript'>
+			$('show_filters').show();
+		</script>
+	</if>
+</if>
+<script type='text/javascript'>
+	ipb.global.post_width			= 500;
+	document.observe("dom:loaded", function(){
+		ipb.comments.parentId = {parse expression="intval( $parent['parent_id'] )"};
+		ipb.comments.setData( {parse expression="json_encode( $settings )"} );
+	});
+</script>]]></template_content>
+      <template_name>commentsList</template_name>
+      <template_data><![CDATA[$comments, $settings, $pages, $parent, $preReply='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<if test="comment_errors:|:$errors">
+	<p class='message error'>{$errors}</p>
+</if>
+<div class='post_form'>
+	<form method="post" action="{$this->settings['base_url']}" name="REPLIER">
+		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+		<input type="hidden" name="fromApp" value="{$settings['fromApp']}" />
+		<input type="hidden" name="app" value="core" />
+		<input type="hidden" name="module" value="global" />
+		<input type="hidden" name="section" value="comments" />	
+		<input type="hidden" name="do" value="saveEdit" />
+		<input type="hidden" name="parentId" value="{$parent['parent_id']}" />
+		<input type="hidden" name="comment_id" value="{$comment['comment']['comment_id']}" />
+		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+		
+		<h3 class='maintitle'>
+		<if test="$do == 'saveEdit'">
+			{$this->lang->words['edit_comment']} {$parent['parent_title']}
+		</if>
+		</h3>
+		<div class='generic_bar'></div>
+		
+		<if test="guest_captcha:|:$this->memberData['member_id'] == 0 AND $this->settings['guest_captcha']">
+			<fieldset>
+				<ul>
+					<li class='field'>
+						<label for=''>{$this->lang->words['guest_captcha']}</label>
+						{$imgid}
+					</li>
+				</ul>
+			</fieldset>
+		</if>
+		
+		<fieldset>
+			{$editor}
+		</fieldset>
+		<fieldset class='submit'>
+			<input type="submit" name="submit" value="{$this->lang->words['comment_save']}" tabindex="0" class="input_submit" accesskey="s" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=global&amp;section=comments&amp;do=findComment&amp;comment_id={$comment['comment']['comment_id']}&amp;parentId={$parent['parent_id']}&amp;fromApp={$settings['fromApp']}" base="public"}' class='cancel' title='{$this->lang->words['cancel']}'>{$this->lang->words['cancel']}</a>
+		</fieldset>
+	</form>
+</div>]]></template_content>
+      <template_name>form</template_name>
+      <template_data><![CDATA[$comment, $parent, $editor="", $settings, $errors="", $do='saveEdit']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_comments</template_group>
+      <template_content><![CDATA[<php>
+$pluginEditorHook = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+$editor = new $pluginEditorHook();
+$smilies	= $editor->fetchEmoticons( 20 );
+$bypass		= $editor->getRteEnabled() ? 0 : 1;
+$this->hasEditJs = true;
+</php>
+{parse template="editorLoadJs" group="editors" params="array( 'bypassCKEditor' => $bypass, 'smilies' => $smilies )"}]]></template_content>
+      <template_name>getEditJs</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1555,7 +2029,7 @@ function gbl_addDownloadButton()
 </div>]]></template_content>
       <template_name>ajaxPopUpNoPermission</template_name>
       <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1564,38 +2038,27 @@ function gbl_addDownloadButton()
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<input type="hidden" id="regid" name="captcha_unique_id" value="{$captcha_unique_id}" />
-<fieldset class="GLB-table-row">
-<if test="$this->request['section'] == 'register'">
-	<if test="$this->cache->getCache('_hasStep3')">
-		<h3 class='bar'>{$this->lang->words['reg_step4_spam']}</h3>
-	<else />
-		<h3 class='bar'>{$this->lang->words['reg_step3_spam']}</h3>
-	</if>
-</if>
-<legend><strong>{$this->lang->words['gbl_captcha_title']}</strong></legend>
-	<table class='ipbtable' cellspacing="0">
-		<tr>
-			<td width="30%"><strong>{$this->lang->words['glb_captcha_image']}</strong><br />{$this->lang->words['gbl_captcha_image_desc']}</td>
-			<td width="70%"><strong>{$this->lang->words['glb_captcha_enter']}</strong><br />{$this->lang->words['glb_captcha_text']}</td>
-		</tr>
-		<tr>
-			<td style='padding-right:10px'>
-				<img id='gd-antispam' class='antispam_img' src='{$this->settings['base_url']}app=core&amp;module=global&amp;section=captcha&amp;do=showimage&amp;captcha_unique_id={$captcha_unique_id}' class='ipd' />
-				<br />
-				<a href='#' id='gd-image-link'>{$this->lang->words['captcah_new']}</a>
-			</td>
-			<td>
-				<input type="text" style='font-size:18px' size="20" maxlength="20" value="" name="captcha_string" tabindex='0' />
-			</td>
-		</tr>
-	</table>
+<fieldset id='captcha' class='gd'>
+	<ul class='ipsForm <if test="$this->request['section'] == 'register' || $this->request['section'] == 'lostpass'">ipsForm_horizontal<else />ipsForm_vertical</if>'>
+		<li class='ipsField'>
+			<label class='ipsField_title'>{$this->lang->words['glb_captcha_image']} <span class='ipsForm_required'>*</span></label>
+			<div class='ipsField_content'>
+				<p class='clearfix'>
+					<img id='gd-antispam' class='antispam_img left' src='{$this->settings['base_url']}app=core&amp;module=global&amp;section=captcha&amp;do=showimage&amp;captcha_unique_id={$captcha_unique_id}' />
+					<a href='#' id='gd-image-link' class='ipsButton_secondary left' title="{$this->lang->words['captcah_new']}"><img src='{$this->settings['img_url']}/icon_refresh.png' alt="{$this->lang->words['captcah_new']}" /></a>
+				</p>
+				<input type="text" class='input_text' size="36" maxlength="20" value="" name="captcha_string" tabindex='0' id='captcha_string' />
+			</div>
+		</li>
+	</ul>
 </fieldset>
 <script type='text/javascript'>
-	ipb.global.initGD( 'gd-antispam' );
+	ipb.global.initGD();
+	$('captcha_string').defaultize( "{$this->lang->words['captcha_string_enter']}" );
 </script>]]></template_content>
       <template_name>captchaGD</template_name>
       <template_data>$captcha_unique_id</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1603,26 +2066,19 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<fieldset>
-<if test="$this->request['section'] == 'register'">
-	<if test="$this->cache->getCache('_hasStep3')">
-		<h3 class='bar'>{$this->lang->words['reg_step4_spam']}</h3>
-	<else />
-		<h3 class='bar'>{$this->lang->words['reg_step3_spam']}</h3>
-	</if>
-</if>
-<legend><strong>{$this->lang->words['glb_captcha_image']}</strong></legend>
-	<table class='ipbtable' cellspacing="0">
-		<tr>
-			<td style='padding:10px'>
+      <template_content><![CDATA[<fieldset id='captcha' class='recaptcha'>
+	<ul class='ipsForm <if test="$this->request['section'] == 'register' || $this->request['section'] == 'lostpass'">ipsForm_horizontal<else />ipsForm_vertical</if>'>
+		<li class='ipsField'>
+			<label class='ipsField_title'>{$this->lang->words['glb_captcha_image']} <span class='ipsForm_required'>*</span></label>
+			<div class='ipsField_content'>
 				{$html}
-			</td>
-		</tr>
-	</table>
+			</div>
+		</li>
+	</ul>
 </fieldset>]]></template_content>
       <template_name>captchaRecaptcha</template_name>
       <template_data><![CDATA[$html=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1630,15 +2086,19 @@ function gbl_addDownloadButton()
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['board_offline']}</h2>
-<div class='message error'><strong>{$this->lang->words['board_offline_desc']}</strong><br /><br />{$message}</div>
-<if test="!$this->memberData['member_id']">
-	<br />
-	<p class='submit'><a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['attempt_login']}'><strong>{$this->lang->words['click_login']}</strong></a></p>
-</if>]]></template_content>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{parse expression="sprintf( $this->lang->words['board_offline_desc'], $this->settings['board_name'])"}</h1>
+<div class='ipsType_pagedesc'>{$message}</div>
+<br /><br />
+<p>
+	<if test="!$this->memberData['member_id']">
+		<a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['attempt_login']}' class='ipsButton'>{$this->lang->words['click_login']}</a>
+	<else />
+		<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=logout&amp;k={$this->member->form_hash}" base="public"}' title='{$this->lang->words['log_out']}' class='ipsButton_secondary'>{$this->lang->words['log_out']}</a>
+	</if>
+</p>]]></template_content>
       <template_name>displayBoardOffline</template_name>
       <template_data><![CDATA[$message=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1668,12 +2128,12 @@ function gbl_addDownloadButton()
 					<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}" />
 				<else />
 					<if test="popupcssnoscreen:|:!stripos( $data['attributes'], 'screen' )">
-						<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], 'public/', $data['content'] )"}" />
+						<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], PUBLIC_DIRECTORY . '/', $data['content'] )"}" />
 					</if>
 				</if>
 			</foreach>
 			<if test="popupminifycss:|:$this->settings['use_minify'] AND count($this->minify)">
-				<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], 'public/', implode( ',', $this->minify ) )"}" />
+				<link rel="stylesheet" type="text/css" media='screen' href="{$this->settings['public_dir']}min/index.php?f={parse expression="str_replace( $this->settings['public_dir'], PUBLIC_DIRECTORY . '/', implode( ',', $this->minify ) )"}" />
 			</if>
 		</if>
 		<if test="popupcssinline:|:is_array( $css['inline'] ) AND count( $css['inline'] )">
@@ -1695,9 +2155,11 @@ function gbl_addDownloadButton()
 			</foreach>
 		</if>
 		<script type='text/javascript'>
-			/* SKINNOTE: Turn off for production */
-			jsDebug = {parse expression="intval($this->settings['_jsDebug'])"}; /* Must come before JS includes */
-			USE_RTE = <if test="popupuserte:|:$this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE'] === TRUE">1<else />0</if>;
+			jsDebug		= {parse expression="intval($this->settings['_jsDebug'])"}; /* Must come before JS includes */
+			USE_RTE		= <if test="popupuserte:|:$this->memberData['members_editor_choice'] == 'rte'">1<else />0</if>;
+			var isRTL	= false;
+			var rtlIe	= '';
+			var rtlFull	= '';
 		</script>
 		<if test="popupminifyjs:|:$this->settings['use_minify']">
 			<if test="popupminfyjsrl:|:$this->settings['remote_load_js']">
@@ -1706,7 +2168,7 @@ function gbl_addDownloadButton()
 			<else />
 				<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
 			</if>
-			<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=public/js/ipb.js,public/js/ips.quickpm.js<if test="popupjsmodules:|:count($jsLoaderItems) AND is_array($jsLoaderItems)">,public/js/ips.{parse expression="implode('.js,public/js/ips.', array_unique( array_keys( $jsLoaderItems ) ) )"}.js</if>,cache/lang_cache/{$this->lang->lang_id}/ipb.lang.js'></script>
+			<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f={parse expression="PUBLIC_DIRECTORY"}/js/ipb.js,{parse expression="PUBLIC_DIRECTORY"}/js/ips.quickpm.js<if test="popupjsmodules:|:count($jsLoaderItems) AND is_array($jsLoaderItems)">,{parse expression="PUBLIC_DIRECTORY"}/js/ips.{parse expression="implode('.js,' . PUBLIC_DIRECTORY . '/js/ips.', array_unique( array_keys( $jsLoaderItems ) ) )"}.js</if>,cache/lang_cache/{$this->lang->lang_id}/ipb.lang.js'></script>
 		<else />
 			<if test="popuprl:|:$this->settings['remote_load_js']">
 				<script type='text/javascript' src='<if test="popuphttpsp:|:$this->registry->output->isHTTPS">https<else />http</if>://ajax.googleapis.com/ajax/libs/prototype/1.6/prototype.js'></script>
@@ -1745,6 +2207,7 @@ function gbl_addDownloadButton()
 		//<!#^#|CDATA|
 			/* ---- URLs ---- */
 			ipb.vars['base_url'] 			= '{parse url="" base="public"}';
+			ipb.vars['board_url']			= '{$this->settings['board_url']}';
 			ipb.vars['loading_img'] 		= '{$this->settings['img_url']}/loading.gif';
 			ipb.vars['active_app']			= '{$this->registry->getCurrentApplication()}';
 			ipb.vars['upload_url']			= '{$this->settings['upload_url']}';
@@ -1755,6 +2218,8 @@ function gbl_addDownloadButton()
 			ipb.vars['secure_hash'] 		= '{$this->member->form_hash}';
 			ipb.vars['session_id']			= '{$this->member->session_id}';
 			ipb.vars['can_befriend']		= <if test="popupbefriend:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">true<else />false</if>;
+			ipb.vars['auto_dst']			= parseInt( {$this->memberData['members_auto_dst']} );
+			ipb.vars['dst_in_use']			= parseInt( {$this->memberData['dst_in_use']} );
 			/* ---- cookies ----- */
 			ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
 			ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
@@ -1767,14 +2232,12 @@ function gbl_addDownloadButton()
 			ipb.vars['swfupload_swf']		= '{parse url="js/3rd_party/swfupload/swfupload.swf" base="public_dir" httpauth="true"}';
 			ipb.vars['swfupload_enabled']	= <if test="popupswfupload:|:$this->settings['uploadFormType']">true<else />false</if>;
 			ipb.vars['use_swf_upload']		= ( '{$this->memberData['member_uploader']}' == 'flash' ) ? true : false;
-			ipb.vars['swfupload_debug']		= false; /* SKINNOTE: Turn off for production */
+			ipb.vars['swfupload_debug']		= false;
 			/* ---- other ---- */
-			ipb.vars['use_live_search'] 	= <if test="popuplivesearch:|:$this->settings['live_search_disable'] || ! in_array( $this->settings['search_method'], array( 'index' ) )">false<else />true</if>;
-			ipb.vars['live_search_limit'] 	= 4;
 			ipb.vars['highlight_color']		= "#ade57a";
 			ipb.vars['charset']				= "{$this->settings['gb_char_set']}";
 			ipb.vars['use_rte']				= 1;
-			ipb.vars['image_resize']		= 40; /* SKINNOTE: Needs to read from setting */
+			ipb.vars['image_resize_force']  = {parse expression="intval($this->settings['resize_img_force'])"};
 			ipb.vars['seo_enabled']			= {parse expression="intval($this->settings['use_friendly_urls'])"};
 			<if test="popupfurl:|:$this->settings['use_friendly_urls']">
 			ipb.vars['seo_params']			= {parse expression="json_encode($this->registry->getClass('output')->seoTemplates['__data__'])"};
@@ -1788,7 +2251,7 @@ function gbl_addDownloadButton()
 			ipb.templates['m_add_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a>");
 			ipb.templates['m_rem_friend']	= new Template("<a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id=#{id}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a>");
 			ipb.templates['autocomplete_wrap'] = new Template("<ul id='#{id}' class='ipb_autocomplete' style='width: 250px;'></ul>");
-			ipb.templates['autocomplete_item'] = new Template("<li id='#{id}'><img src='#{img}' alt='' width='#{img_w}' height='#{img_h}' />&nbsp;&nbsp;#{itemvalue}</li>");
+			ipb.templates['autocomplete_item'] = new Template("<li id='#{id}' data-url='#{url}'><img src='#{img}' alt='' width='#{img_w}' height='#{img_h}' />&nbsp;&nbsp;#{itemvalue}</li>");
 			ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['global_page_jump']}</h3><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='{$this->lang->words['jmp_go']}' class='input_submit add_folder' id='#{id}_submit' /></div>");
 			Loader.boot();
 		//|#^#]>
@@ -1802,7 +2265,7 @@ function gbl_addDownloadButton()
 </html>]]></template_content>
       <template_name>displayPopUpWindow</template_name>
       <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $title="", $output=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1820,9 +2283,9 @@ function contact_admin() {
 }
 //-->
 </script>
-<h2>{$this->lang->words['error_title']}</h2>
+<h1 class='ipsType_pagetitle'>{$this->lang->words['error_title']}</h1>
 <if test="showerrortitle:|:$show_top_msg == 1">
-	<p>{$this->lang->words['exp_text']}</p>
+	<p class='ipsType_pagedesc'>{$this->lang->words['exp_text']}</p>
 	<br />
 </if>
 <div class='message error'>
@@ -1852,7 +2315,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>Error</template_name>
       <template_data><![CDATA[$message="",$code=0,$ad_email_one="",$ad_email_two="",$show_top_msg=0, $login="", $post=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1867,7 +2330,7 @@ function contact_admin() {
 <br />]]></template_content>
       <template_name>error_log_in</template_name>
       <template_data><![CDATA[$q_string=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1886,7 +2349,7 @@ function contact_admin() {
 </div>]]></template_content>
       <template_name>error_post_textarea</template_name>
       <template_data><![CDATA[$post=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1894,21 +2357,17 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<div style='float:left; width:80px; text-align: center'>
-		<strong>{$user['first_name']} {$user['last_name']}</strong>
-		<p style='padding-top:4px'><img src='{$user['pic_square']}' /></p>
-	</div>
-	<div style='margin-left: 110px; text-align:center'>
-		<br />
-		<strong>{$this->lang->words['facebook_post_ok']}</strong>
-		<br />
-		<br />
-		<br />
-		<br />
-	</div>]]></template_content>
+      <template_content><![CDATA[<div class='ipsForm_center'>
+	<br />
+	<strong>{$this->lang->words['facebook_post_ok']}</strong>
+	<br />
+	<br />
+	<br />
+	<br />
+</div>]]></template_content>
       <template_name>facebookDone</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1917,23 +2376,60 @@ function contact_admin() {
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<h3>{$this->lang->words['share_via_facebook']}</h3>
-<div class='general_box' id='fWrap'>
-	<div style='float:left; width:80px; text-align: center'>
-		<strong>{$user['first_name']} {$user['last_name']}</strong>
-		<p style='padding-top:4px'><img src='{$user['pic_square']}' /></p>
-	</div>
-	<div style='margin-left: 110px'>
-		<div class='desc'>{$this->lang->words['fbc_comment_desc']}</div>
-		<textarea rows='5' cols='10' name='fContent' style='width: 270px' id='fContent'></textarea>
-		<div>
-			<div class='right clear'><input type='button' id='fSubmit' class='input_submit' value='{$this->lang->words['facebook_share']}' /></div>
-			<br clear="both" />
-		</div>
-	</div>
+<div class='fixed_inner'>
+	<div class='ipsPad'><fb:like href="" id="fbLikeButton" layout="standard" show_faces="false" width="350" height="45" action="like" colorscheme="light" /></div>
+	<if test="hasFbConnected:|:$user['id']">
+		<ul class='ipsList_withminiphoto' id="fParent">
+			<li class='clearfix ipsPad_half'>
+				<img src='{$user['pic_square']}' class='left ipsUserPhoto ipsUserPhoto_small'/>
+				<img src="{$this->settings['public_dir']}style_status/facebook.png" class='left' style='margin-top: -2px; margin-left: -12px;'/>
+				<div class='list_content' style='margin-left:58px' id='fWrap' >
+					<textarea class='input_text' rows='3' cols='10' name='fContent' style='width: 97%;' id='fContent'></textarea>
+					<div>
+						<div class='right clear'>
+							<input type='button' id='fSubmit' class='input_submit' value='{$this->lang->words['facebook_share']}' />
+						</div>
+						<div class='ipsType_smaller desc'>{$this->lang->words['share_fb_name']} {$user['first_name']} {$user['last_name']}</div>
+					</div>
+					
+				</div>
+			</li>
+		</ul>
+	<else />
+		<div class='ipsPad ipsForm_center'><a href="{$this->settings['_original_base_url']}/interface/facebook/index.php"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a></div>
+	</if>
+	<div id="fb-root"></div>
+	<script>
+		window.fbAsyncInit = function() {
+			FB.init({appId: '{$this->settings['fbc_appid']}', status: true, cookie: true, xfbml: true});
+			if ( $('fParent') )
+			{
+				FB.Event.subscribe('edge.create', function(response) {
+	 				new Effect.Fade( $('fParent'), { duration: 0.2 } );
+				});
+						
+				FB.Event.subscribe('edge.remove', function(response) {
+	 				new Effect.Appear( $('fParent'), { duration: 0.2 } );
+				});
+			}
+		};
+		(function() {
+			var e = document.createElement('script'); e.async = true;
+		    e.src = document.location.protocol + '//connect.facebook.net/{$this->settings['fb_locale']}/all.js';
+			document.getElementById('fb-root').appendChild(e);
+				    
+			$('fbLikeButton').writeAttribute('href', $('ipsCanonical').readAttribute('href') );
+			
+			if ( $('fContent') )
+			{
+				$('fContent').defaultize('{$this->lang->words['fb_share_default']}');
+			}
+		}());
+	</script>
 </div>]]></template_content>
       <template_name>facebookPop</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$user=array()</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1941,27 +2437,291 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[{parse striping="faverave" classes="row1,row2"}
-<h3>Liked By</h3>
-<div class='general_box likepop'>
-	<foreach loop="$data as $mid => $data">
-		<div class='{parse striping="faverave"}'>
-			<em class='desc'>Added: {parse date="$data['like_added']" format="short"}</em>
-			<img src='{$data['pp_thumb_photo']}' width='{$data['pp_thumb_width']}' height='{$data['pp_thumb_height']}' class='photo' />
-			<div>
-				<strong>{$data['members_display_name']}</strong>
-				<p class='desc'>
-					{parse expression="IPSLib::makeNameFormatted( $data['g_title'], $data['g_id'] )"}
-					<br />
-					Joined: {parse date="$data['joined']" format="joined"}
-				</p>
+      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=global&amp;section=like&amp;do=doUnsubscribe" base="public"}" method="post">
+<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+<input type='hidden' name='like_rel_id' value='{$data[ $this->memberData['member_id'] ]['like_rel_id']}' />
+<input type='hidden' name='like_area' value='{$data[ $this->memberData['member_id'] ]['like_area']}' />
+<input type='hidden' name='like_app' value='{$data[ $this->memberData['member_id'] ]['like_app']}' />
+<input type='hidden' name='like_id' value='{$data[ $this->memberData['member_id'] ]['like_id']}' />
+<h3 class='maintitle'>{$this->lang->words['pg_unfollow_title']}</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad_double ipsType_textblock'>
+		{parse expression="sprintf( $this->lang->words['pg_unfollow_text'], $data[ $this->memberData['member_id'] ]['members_display_name'], $meta['like.url'], $meta['like.title'] )"}
+		<br />
+		<br />
+		<p>
+			<input type="submit" value="{$this->lang->words['pg_unfollow_confirm']}" class='ipsButton'>
+			{$this->lang->words['or']}
+			<a href='{parse url="app=core&amp;module=search&amp;do=followed" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+		</p>
+	</div>
+</div>
+</form>]]></template_content>
+      <template_name>followUnsubscribe</template_name>
+      <template_data>$data, $meta</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<if test="topicIsMoved:|:$imgArray['is_moved']">
+	<span title="{$this->lang->words['pm_moved']}">{parse replacement="t_moved"}</span>
+</if>
+<if test="topicIsClosed:|:$imgArray['is_closed']">
+	<span title="{$this->lang->words['pm_locked']}">{parse replacement="t_closed"}</span>
+</if>
+<if test="topicReadDot:|:$imgArray['show_dot'] && empty( $unreadUrl )">{parse replacement="t_read_dot"}</if>
+<if test="gotolatestwrap:|: ! empty( $unreadUrl ) && ! $imgArray['is_moved']">
+	<a href='{$unreadUrl}' title='{$this->lang->words['first_unread_post']}'>
+	<if test="topicUnreadDot:|:$imgArray['show_dot']">
+		{parse replacement="t_unread_dot"}
+	<else />
+		{parse replacement="t_unread"}
+	</if>
+	</a>
+</if>]]></template_content>
+      <template_name>generateTopicIcon</template_name>
+      <template_data>$imgArray, $unreadUrl</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!DOCTYPE html>
+	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"<if test="fbcenabled:|:IPSLib::fbc_enabled() === TRUE"> xmlns:fb="http://www.facebook.com/2008/fbml"</if>>
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
+		<title>{$header_items['title']}<if test="pagenumberintitle:|:$header_items['page']"> {$this->lang->words['page_title_page']} {$header_items['page']}</if></title>
+		<link rel="shortcut icon" href='<if test="$this->registry->output->isHTTPS">{$this->settings['board_url_https']}<else />{$this->settings['board_url']}</if>/favicon.ico' />
+		<link rel="image_src" href='{$this->settings['meta_imagesrc']}' />
+		<script type='text/javascript'>
+		//<!#^#|CDATA|
+			jsDebug			= {parse expression="intval($this->settings['_jsDebug'])"}; /* Must come before JS includes */
+			USE_RTE			= <if test="userte:|:$this->memberData['members_editor_choice'] == 'rte'">1<else />0</if>;
+			DISABLE_AJAX	= parseInt({$this->settings['disable_text_ajax']}); /* Disables ajax requests where text is sent to the DB; helpful for charset issues */
+			inACP			= false;
+			var isRTL		= false;
+			var rtlIe		= '';
+			var rtlFull		= '';
+		//|#^#]>
+		</script>
+		{parse template="includeCSS" group="global" params="$css"}
+		{parse template="includeMeta" group="global" params="$metaTags"}
+		<meta property="og:title" content="{IPSText::htmlspecialchars( str_replace( ' - ' . $this->settings['board_name'], '', $header_items['title'] ) )}"/>
+		<meta property="og:site_name" content="{IPSText::htmlspecialchars( $this->settings['board_name'] )}"/>
+		<meta property="og:image" content="{$this->settings['meta_imagesrc']}"/>
+		<if test="isLargeTouch:|:$this->registry->output->isLargeTouchDevice()">
+		<meta name="viewport" content="width=1024px; initial-scale=1.0; minimum-scale=1.0;">
+		</if>
+		<if test="isSmallTouch:|:$this->registry->output->isSmallTouchDevice()">
+		<meta name="viewport" content="width=1024px">
+		</if>
+		{parse template="includeJS" group="global" params="$jsModules"}
+		{parse template="includeFeeds" group="global" params="$documentHeadItems"}
+		{parse template="includeRTL" group="global" params=""}		
+		{parse template="includeVars" group="global" params="$header_items"}
+	</head>
+	<body id='ipboard_body' class='minimal'>
+		<p id='content_jump' class='hide'><a id='top'></a><a href='#j_content' title='{$this->lang->words['jump_to_content']}' accesskey='m'>{$this->lang->words['jump_to_content']}</a></p>
+		<div id='ipbwrapper'>		
+			<div id='content' class='clearfix'>
+				{$items['adHeaderCode']}
+				<if test="mainpageContent:|:$html">{$html}</if>
+				{$items['adFooterCode']}
 			</div>
+			<div id='footer_utilities' class='main_width clearfix clear'>
+				{$footer_items['copyright']}
+			</div>
+			<if test="showdebuglevel:|:$this->memberData['member_id'] and $this->settings['debug_level']">
+				<div id='ipsDebug_footer'>
+					<strong>{$this->lang->words['time_now']}</strong> {$footer_items['time']}
+					<if test="lastvisit:|:$this->memberData['member_id'] AND $this->memberData['last_visit']"><strong>{$this->lang->words['you_last_visit']}</strong> {parse date="$this->memberData['last_visit']" format="short"}</if>
+					<strong>{$this->lang->words['stat_exec']}</strong> {$stats['ex_time']} <if test="isfloat:|:is_float($stats['ex_time'])">{$this->lang->words['stats_sec']}</if>
+					<strong>{$this->lang->words['stat_load']}</strong> {$stats['server_load']}
+					<strong>{$this->lang->words['stat_queries']}</strong> {$stats['queries']} <if test="sqldebuglink:|:IPS_SQL_DEBUG_MODE"><a href='{parse url="{$this->settings['query_string_safe']}&amp;debug=1" base="public"}'></if>{$this->lang->words['stats_queries']}<if test="closesqldebuglink:|:IPS_SQL_DEBUG_MODE"></a></if>
+					<strong>{$this->lang->words['stat_gzip']}</strong> {$stats['gzip_status']}
+				</div>
+			</if>
+			{$stats['task']}
 		</div>
-	</foreach>
+		
+		<!--DEBUG_STATS-->
+	</body>
+</html>]]></template_content>
+      <template_name>globalTemplateMinimal</template_name>
+      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, array $header_items, $items=array(), $footer_items=array(), $stats=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<!DOCTYPE html>
+	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
+		<title><#subject#></title>
+		<style type="text/css">
+			body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
+			table {	border-collapse:collapse; border-spacing:0; }
+			fieldset,img { border:0; }
+			address,caption,cite,code,dfn,th,var { font-style:normal; font-weight:normal; }
+			ol,ul { list-style:none; }
+			caption,th { text-align:left; }
+			h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
+			q:before,q:after { content:''; }
+			abbr,acronym { border:0; }
+			address{ display: inline; }
+			
+			html, body {
+				background-color: #d8dde8;
+				color: #5a5a5a;
+			}
+			body {
+				font: normal 13px helvetica, arial, sans-serif;
+				position: relative;
+			}
+			
+			h3, strong { font-weight: bold; }
+			em { font-style: italic; }
+			img, .input_check, .input_radio { vertical-align: middle; }
+			legend { display: none; }
+			table { width: 100%; }
+			td { padding: 3px; }
+			
+			a {
+				color: #225985;
+				text-decoration: none;
+			}
+			
+			a:hover { color: #328586; }
+			
+			div.outer { margin: 0 auto; padding: 14px; }
+			
+			table.wrap { max-width: 800px; margin: 0 auto; }
+			
+			td.logo {
+				background-color: #0f3854;
+				padding: 8px;
+			}
+			
+			td.content {
+				background-color: #fff;
+				font-size: 14px !important;
+				color: black !important;
+				line-height: 150% !important;
+				padding: 8px;
+			}
+		</style>
+	</head>
+	<body>
+	<div class='outer'>
+	<table class='wrap'>
+		<tr>
+			<td class='logo'><img src="{$this->settings['img_url']}/logo_transparent.png" /></td>
+		</tr>
+		<tr>
+			<td class='content'>{$content}</td>
+		</tr>
+	</table>
+	</div>
+	</body>
+</html>]]></template_content>
+      <template_name>htmlEmailWrapper</template_name>
+      <template_data>$content</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h4 class='ipsType_sectiontitle'>{$this->lang->words['inbox_at_the_top']}<p class='ipsPad_half ipsType_smaller right'><a href='{parse url="app=members&amp;module=messaging" base="public"}' class='configure'>{$this->lang->words['inbox_list_view']}</a> &middot; <a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['compose_new']}'>{$this->lang->words['compose_new']}</a></p></h4>
+<ul class='ipsList_withminiphoto'>
+	<if test="hasTopics:|:count($topics)">
+		<foreach loop="loopynotify:$topics as $topic">
+		<li class='<if test="$topic['map_has_unread']">unread</if> ipsType_small clearfix'>
+			<img src='{$topic['_starterMemberData']['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$topic['_starterMemberData']['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_mini left' />
+			<div class='list_content'>
+				<a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$topic['mt_id']}&amp;msgID=__firstUnread__" base="public"}'>
+				<if test="$topic['map_has_unread']"><strong></if>{$topic['mt_title']}<if test="$topic['map_has_unread']"></strong></if>
+				</a>
+				<br />
+				<span class='ipsType_smaller desc lighter'>{$topic['_starterMemberData']['members_display_name']} - {parse date="$topic['msg_date']" format="short"}</span>
+			</div>
+		</li>
+		</foreach>
+	<else />
+		<li class='row1 ipsPad_half ipsType_smaller'>{$this->lang->words['inbox_list_none']}</li>
+	</if>
+</ul>]]></template_content>
+      <template_name>inboxList</template_name>
+      <template_data>$topics</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<html>
+<head>
+</head>
+<body>
+<script type='text/javascript'>
+	parent.ipb.inlineUploader.complete( $json );
+</script>
+</body>
+</html>]]></template_content>
+      <template_name>inlineUploaderComplete</template_name>
+      <template_data>$json</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['followed_by']}</h3>
+<div class='likepop fixed_inner'>
+	<if test="hasVisibleEntries:|:is_array($data) && count($data)">
+		<ul class='ipsList_withminiphoto'>
+			<foreach loop="$data as $mid => $data">
+				<li class='clearfix ipsPad_half <if test="$data['like_is_anon']">faded</if>'>
+					<a href='{parse url="showuser={$data['member_id']}" seotitle="{$data['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'>
+						<img src='{$data['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+					</a>
+					<div class='list_content'>
+						<a href='{parse url="showuser={$data['member_id']}" seotitle="{$data['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$data['members_display_name']}</strong></a>
+						<if test="$data['like_is_anon']"><em class='desc'>{$this->lang->words['followed_anonymously']}</em></if>
+						<p class='desc'>
+							{parse expression="IPSMember::makeNameFormatted( $data['g_title'], $data['g_id'] )"}
+						</p>
+					</div>
+				</li>
+			</foreach>
+		</ul>
+	</if>
+	<if test="hasAnonEntries:|:$cache['anonCount']">
+		<p class='desc ipsPad ipsForm_center'>
+			(<if test="count( $data )">{$this->lang->words['fave_and']}</if> {parse expression="sprintf( ($cache['anonCount'] > 1) ? $this->lang->words['follow_anon_count_p'] : $this->lang->words['follow_anon_count_s'], $cache['anonCount'] )"})
+		</p>
+	</if>
 </div>]]></template_content>
       <template_name>likeMoreDialogue</template_name>
-      <template_data>$data, $relId</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$data, $relId, $cache</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1969,35 +2729,33 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<h3>{$this->lang->words['fave_title']}</h3>
-<div class='general_box'>
-	<fieldset>
-		<ul>
-			<li class='field checkbox'>
-				<input type="checkbox" name="notify" id="like_notify" class="input_check" value="1" />
-				<label for="like_notify">{parse expression="sprintf($this->lang->words['label_notify'], $data['notifyType'][1])"}</label>
-			</li>
-			<li class='field'>
-				<label for="like_freq">{$this->lang->words['label_freq']}
-					<select name="freq" id="like_freq" class="input_select">
-						<foreach loop="$data['frequencies'] as $freq">
-							<option value="$freq">{$this->lang->words[ 'freq_' . $freq ]}</option>
-						</foreach>
-					</select>
-				</label>		 				
-			</li>
-			<li class='field checkbox'>
-				<input type="checkbox" name="anon" id="like_anon" class="input_check" value="1" />
-				<label for="like_anon">{$this->lang->words['label_anon']}<br /><span class='desc'>{$this->lang->words['label_anon_desc']}</span></label>
-			</li>
-			<li class="submit" style="float:right">
-				<input type="submit" value="Set Favorite" class="input_submit _fsubmit" />
-			</li>
-	</fieldset>
-</div>]]></template_content>
+      <template_content><![CDATA[<h3>{parse expression="$this->lang->words['like_ucfirst_' . $data['vernacular'] ]"}</h3>
+<fieldset class='ipsPad ipsForm ipsForm_vertical'>
+	<ul>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" name="notify" id="like_notify" class="input_check" value="1" checked='checked' />
+			<p class='ipsField_content'>
+				<label for="like_notify">{$this->lang->words['label_notify']}</label>
+				<select name="freq" id="like_freq" class="input_select">
+					<foreach loop="$data['frequencies'] as $freq">
+						<option value="$freq">{$this->lang->words[ 'freq_' . $freq ]}</option>
+					</foreach>
+				</select>
+			</p>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" name="anon" id="like_anon" class="input_check" value="1" />
+			<p class='ipsField_content'>
+				<label for="like_anon">{$this->lang->words['label_anon']}<br /><span class='desc lighter'>{$this->lang->words['label_anon_desc']}</span></label>
+			</p>
+		</li>
+		<li class="submit ipsForm_center">
+			<input type="submit" value="{parse expression="sprintf( $this->lang->words['set_fave_button'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}" class="input_submit _fsubmit" />
+		</li>
+</fieldset>]]></template_content>
       <template_name>likeSetDialogue</template_name>
       <template_data>$app, $area, $relid, $data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2006,15 +2764,15 @@ function contact_admin() {
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[{parse js_module="like"}
-<div class='ips_like' data-app="{$data['app']}" data-area="{$data['area']}" data-relid="{$relId}" data-isfave="{$data['iFave']}">
-	{parse template="likeSummaryContents" group="global_other" params="$data, $relid, $opts"}
+<div class='ips_like' data-app="{$data['app']}" data-area="{$data['area']}" data-relid="{$relId}" data-isfave="{$data['iLike']}">
+	{parse template="likeSummaryContents" group="global_other" params="$data, $relId, $opts"}
 </div>
 <script type="text/javascript">
-	var FAVE_TEMPLATE = new Template( "<h3>{$this->lang->words['unset_fave_title']}</h3><div class='general_box'><span class='desc'>{$this->lang->words['unset_fave_words']}</span><br /><p style='text-align:right'><input type='button' value='{$this->lang->words['unset_button']}' class='input_submit _funset' /></p></div>");
+	var FAVE_TEMPLATE = new Template( "<h3>{parse expression="sprintf( $this->lang->words['unset_fave_title'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}</h3><div><span class='desc'>{parse expression="sprintf( $this->lang->words['unset_fave_words'], $this->lang->words['like_un' . $data['vernacular'] ])"}</span><br /><p style='text-align:right'><input type='button' value='{parse expression="sprintf( $this->lang->words['unset_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}' class='input_submit _funset' /></p></div>");
 </script>]]></template_content>
       <template_name>likeSummary</template_name>
       <template_data>$data, $relId, $opts</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2023,10 +2781,12 @@ function contact_admin() {
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<if test="$data['formatted']">{$data['formatted']}<else />&nbsp;</if>
-<a href='#' title="<if test="$data['iFave']">Unlike and stop notifications<else />Like and receive notifications on updates</if>" class='ftoggle <if test="$data['iFave']"> on</if><if test="$opts['button-new-line']"> _newline</if>'><if test="$data['iFave']">Unlike<else />Like</if></a>]]></template_content>
+<if test="likeOnlyMembers:|:$this->memberData['member_id']">
+	<a href='#' title="<if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['fave_tt_on'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['fave_tt_off'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if>" class='ftoggle <if test="$data['iLike']"> on</if><if test="$opts['button-new-line']"> _newline</if>'><if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['unset_fave_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['set_fave_button'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if></a>
+</if>]]></template_content>
       <template_name>likeSummaryContents</template_name>
       <template_data>$data, $relId, $opts=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2034,34 +2794,37 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<ul id='user_notifications_link_menucontent' class='boxShadow'>
+      <template_content><![CDATA[<h4 class='ipsType_sectiontitle'>{$this->lang->words['notifications_at_the_top']}
+	<p class='ipsPad_half ipsType_smaller right'>
+	<a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" base="public"}' class='configure'>{$this->lang->words['notifications_viewall']}</a>
+	&middot; <a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=notifications" base="public"}' class='configure'>{$this->lang->words['generic_opts_link']}</a>
+	</p>
+</h4>
+<ul class='ipsList_withminiphoto'>
 	<if test="hasnotifications:|:count($notifications)">
 		<foreach loop="loopynotify:$notifications as $notify">
-		<li class='row1 notify <if test="!$notify['notify_read']">unread</if>'>
-			<img src='{$this->settings['img_url']}/notifications/{$notify['notify_icon']}.png' alt='' />
-			<p>
+		<li class='<if test="!$notify['notify_read']">unread</if> ipsType_small clearfix'>
+			<img src='{$notify['member']['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$notify['member']['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_mini left' />
+			<div class='list_content'>
 				<if test="strpos( $notify['notify_title'], '<a href' ) === false">
 					<a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notify['notify_id']}" base="public"}'>
 				</if>
-				{$notify['notify_title']}
+				<if test="!$notify['notify_read']"><strong></if>{$notify['notify_title']}<if test="!$notify['notify_read']"></strong></if>
 				<if test="strpos( $notify['notify_title'], '<a href' ) === false">
 					</a>
 				</if>
 				<br />
-				<span class='desc'>{$this->lang->words['notify__sent']}{parse date="$notify['notify_sent']" format="short"}</span>
-			</p>
+				<span class='ipsType_smaller desc lighter'>{parse date="$notify['notify_sent']" format="short"}</span>
+			</div>
 		</li>
 		</foreach>
-		<li class='view-all'>
-			<a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=notificationlog" base="public"}' class='configure'>{$this->lang->words['notifications_viewall']}</a>
-		</li>
 	<else />
-		<li class='row1 notify no-notifications'>{$this->lang->words['nonotifications_list']}</li>
+		<li class='desc'>{$this->lang->words['nonotifications_list']}</li>
 	</if>
 </ul>]]></template_content>
       <template_name>notificationsList</template_name>
       <template_data>$notifications</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2069,21 +2832,85 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<input type="hidden" name="qanda_id" value="{$data['qa_id']}" />
-<fieldset class='{parse striping="register"}'>
-	<h3 class='bar'>{$this->lang->words['qa_title']}</h3>
-	
-	<ul>
-		<li class='field required'>
-			<label for='qna'>{$data['qa_question']}</label>
-			<input type="text" class='input_text' size="20" maxlength="100" value="<if test="qadefault:|:$this->request['qanda_id'] AND $this->request['qanda_id']==$data['qa_id']">{$this->request['qa_answer']}</if>" name="qa_answer" id='qna' tabindex='0' /><br />
-			<span class='desc'>{$this->lang->words['qa_question_desc']}</span>
+      <template_content><![CDATA[<fieldset id='q_n_a'>	
+	<input type="hidden" name="qanda_id" value="{$data['qa_id']}" />
+	<ul class='ipsForm ipsForm_horizontal'>
+		<li class='ipsField'>
+			<label for='qna' class='ipsField_title'>{$this->lang->words['registration_question']} <span class='ipsForm_required'>*</span></label>
+			<div class='ipsField_content'>
+				<strong>{$data['qa_question']}</strong><br />
+				<input type="text" class='input_text' size="45" maxlength="100" value="<if test="qadefault:|:$this->request['qanda_id'] AND $this->request['qanda_id']==$data['qa_id']">{$this->request['qa_answer']}</if>" name="qa_answer" id='qna' tabindex='0' /><br />
+				<span class='desc lighter'>{$this->lang->words['qa_question_desc']}</span>
+			</div>
 		</li>
 	</ul>
 </fieldset>]]></template_content>
       <template_name>questionAndAnswer</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['navigation_title']}</h3>
+<div class='fixed_inner ipsBox'>
+	<div class='message error'><strong>{$this->lang->words['board_offline_desc']}</strong><br /><br />{$message}</div>
+</div>]]></template_content>
+      <template_name>quickNavigationOffline</template_name>
+      <template_data>$message</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<div>
+	<foreach loop="outer:$data as $_data">
+		<if test="hasTitle:|: ! empty( $_data['title'] )"><h3>{$_data['title']}</h3></if>
+		<ul class='block_list'>
+		<foreach loop="innerAgain:$_data['links'] as $link">
+	 		<li><if test="depth:|:!empty($link['depth'])">{parse expression="str_repeat( '&nbsp;&nbsp;&nbsp;&nbsp;', $link['depth'])"}</if><a <if test="important:|:!empty($link['important'])">style="font-weight:bold"</if> href="{$link['url']}">{$link['title']}</a></li>
+		</foreach>
+		</ul>
+	</foreach>
+</div>]]></template_content>
+      <template_name>quickNavigationPanel</template_name>
+      <template_data><![CDATA[$data=array(), $currentApp='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['navigation_title']}</h3>
+<div class='fixed_inner ipsBox'>
+	<if test="isLargeTouch:|:$this->registry->output->isLargeTouchDevice()">
+		<div class='message' style='margin-bottom: 5px;'>{$this->lang->words['scroll_tip']}</div>
+	</if>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left'>		
+			<ul>
+				<foreach loop="navTabs:$tabs as $app => $title">
+					<li <if test="active:|:$app == $currentApp">class='active'</if>><a href='{parse url="app=core&amp;module=global&amp;section=navigation&amp;inapp={$app}" base="public"}' rel="ipsQuickNav" data-app="{$app}">{$title}</a></li>
+				</foreach>
+			</ul>
+		</div>
+	
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' style='position: relative' id='ipsNav_content'>
+			{parse template="quickNavigationPanel" group="global_other" params="$data, $currentApp"}
+		</div>
+	</div>
+</div>]]></template_content>
+      <template_name>quickNavigationWrapper</template_name>
+      <template_data><![CDATA[$tabs=array(), $data=array(), $currentApp='']]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2121,7 +2948,10 @@ function contact_admin() {
 		
 		{parse template="includeRTL" group="global" params=""}	
 		<script type='text/javascript'>
-			jsDebug = 0; /* Must come before JS includes */
+			jsDebug		= 0; /* Must come before JS includes */
+			var isRTL	= false;
+			var rtlIe	= '';
+			var rtlFull	= '';
 		</script>
 		<if test="redirectdh:|:count($documentHeadItems)">
 			<foreach loop="redirectdocumentHeadItems:$documentHeadItems as $type => $idx">
@@ -2165,8 +2995,6 @@ function contact_admin() {
 	</head>
 	<body  id='ipboard_body' class='redirector'>
 		<div id='ipbredirectwrapper'>
-			<h1>{$this->settings['site_name']}</h1>
-			<h2>{$this->lang->words['thanks']}</h2>
 			<p class='message'>
 				<strong>{$text}</strong>
 				<br /><br />
@@ -2179,7 +3007,7 @@ function contact_admin() {
 </html>]]></template_content>
       <template_name>redirectTemplate</template_name>
       <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $text="",$url="", $full=false]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2187,21 +3015,235 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<div style='float:left; width:80px; text-align: center'>
-		<strong>{$user['screen_name']}</strong>
-		<p style='padding-top:4px'><img src='{$user['profile_image_url']}' /></p>
+      <template_content><![CDATA[<php>
+	// Apps can set the key empty to disable, but this will allow all apps to use the popup to show who repped
+	if( !isset($data['jsCallback']) )
+	{
+		$data['jsCallback']	= "ipb.global.repPopUp( this, {$data['primaryId']}, '{$data['app']}', '{$data['type']}' );";
+	}
+	
+	$repClickable	= ( $this->memberData['gbw_view_reps'] AND $data['jsCallback'] ) ? 'onclick="' . $data['jsCallback'] . '"' : '';
+</php>
+<if test="reputationBox:|:$this->settings['reputation_enabled']">
+	<if test="canRep:|:!( $this->settings['reputation_protected_groups'] && in_array( $member['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) ) and $this->memberData['member_id']">	
+		<if test="isLike:|:$this->settings['reputation_point_types'] == 'like'">
+			<div class='ipsLikeBar right clearfix' id='{$data['domCountId']}'>
+				<ul class='ipsList_inline'>
+					<if test="!isset($data['hide_text']) OR !$data['hide_text']">
+						<li id="{$data['domLikeStripId']}" class='ipsLikeBar_info' <if test="hasNoLikes:|:!$data['likeFormatted']">style="display:none"</if>>
+							{$data['likeFormatted']}
+						</li>
+					</if>
+					<if test="canGiveRep:|:IPSMember::canGiveRep( $data, $member ) !== false">
+						<li <if test="giveRepUp:|:IPSMember::canRepUp( $data, $member ) === false">style="display:none"</if>>
+							<a class='ipsLikeButton ipsLikeButton_enabled rep_up' href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' title='{$this->lang->words['do_like_up']}'>{$this->lang->words['like_this']}</a>
+						</li>
+						<li <if test="giveRepDown:|:IPSMember::canRepDown( $data, $member ) === false">style="display:none"</if>>
+							<a class='ipsLikeButton ipsLikeButton_disabled rep_down' href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=-1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' title='{$this->lang->words['do_like_down']}'>{$this->lang->words['unlike_this']}</a>
+						</li>
+					</if>
+				</ul>
+			</div>
+		<else />
+			<div class='rep_bar clearfix <if test="pos:|:!$data['position'] || $data['position'] == 'right'">right</if>' id='{$data['domCountId']}'>
+				{parse variable="repClickable" default="" oncondition="$this->memberData['gbw_view_reps']" value=" clickable"}
+				<ul class='ipsList_inline'>
+					<if test="canGiveRep:|:IPSMember::canGiveRep( $data, $member ) !== false">			
+						<li <if test="giveRepUp:|:IPSMember::canRepUp( $data, $member ) === false">style="display:none"</if>>
+							<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' class='rep_up' title='{$this->lang->words['reputation_up']}'>{parse replacement="rep_up"}</a>
+						</li>
+						<li <if test="giveRepDown:|:IPSMember::canRepDown( $data, $member ) === false">style="display:none"</if>>
+							<a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate={$data['app']}&amp;type={$data['type']}&amp;type_id={$data['primaryId']}&amp;rating=-1&amp;secure_key={$this->member->form_hash}&amp;post_return={$data['primaryId']}' class='rep_down' title='{$this->lang->words['reputation_down']}'>{parse replacement="rep_down"}</a>
+						</li>
+					</if>
+					<if test="isNotLike:|:$this->settings['reputation_point_types'] != 'like'">
+						<if test="hasNoRep:|:$data['rep_points'] == 0">
+							<li><span class='reputation zero rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {$repClickable}>
+						</if>
+						<if test="hasPosRep:|:$data['rep_points'] > 0">
+							<li><span class='reputation positive rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {$repClickable}>
+						</if>
+						<if test="hasNegRep:|:$data['rep_points'] < 0">
+							<li><span class='reputation negative rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {$repClickable}>
+						</if>
+							{$data['rep_points']}
+							</span>
+						</li>
+					</if>
+				</ul>
+			</div>
+		</if>
+	</if>
+</if>
+<script type='text/javascript'>
+	ipb.global.registerReputation( '{$data['domCountId']}', { domLikeStripId: '{$data['domLikeStripId']}', app: '{$data['app']}', type: '{$data['type']}', typeid: '{$data['primaryId']}' }, parseInt('{$data['rep_points']}') );
+</script>]]></template_content>
+      <template_name>repButtons</template_name>
+      <template_data>$member, $data=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['liked_by_title']}</h3>
+<div class='likepop fixed_inner'>
+	<ul class='ipsList_withminiphoto'>
+		<foreach loop="$data as $mid => $data">
+			<li class='clearfix ipsPad_half <if test="$data['like_is_anon']">faded</if>'>
+				<a href='{parse url="showuser={$data['member_id']}" seotitle="{$data['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'>
+					<img src='{$data['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+				</a>
+				<div class='list_content'>
+					<a href='{parse url="showuser={$data['member_id']}" seotitle="{$data['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$data['members_display_name']}</strong></a>
+					<em class='desc'>{$this->lang->words['likeadded']} {parse date="$data['rep_date']" format="short"}</em>
+					<p class='desc'>
+						{parse expression="IPSMember::makeNameFormatted( $data['g_title'], $data['g_id'] )"}
+					</p>
+				</div>
+			</li>
+		</foreach>
+	</ul>
+</div>]]></template_content>
+      <template_name>repMoreDialogue</template_name>
+      <template_data>$data, $relId</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<div>
+	<h3>{$this->lang->words['rep_given']}</h3>
+	<div class='ipsPad' style='min-height: 60px'>
+		<if test="empty($reps)">
+			<em>{$this->lang->words['no_rep']}</em>
+		<else />
+			<foreach loop="$reps as $r">
+				<if test="$r['rep_rating'] > 0">
+					{parse replacement="rep_up"}
+				<else />
+					{parse replacement="rep_down"}
+				</if>
+				 <a href='{parse url="showuser={$r['member']['member_id']}" base="public" template="showuser" seotitle="{$r['member']['members_seo_name']}"}'>{$r['member']['members_display_name']}</a><br />
+			</foreach>
+		</if>
 	</div>
-	<div style='margin-left: 110px; text-align:center'>
-		<br />
-		<strong>{$this->lang->words['tweet_ok']}</strong>
-		<br />
-		<br />
-		<br />
-		<p><a href="http://twitter.com/{$user['screen_name']}/status/{$user['status']['id']}" target="_blank">twitter.com/{$user['screen_name']}/status/{$user['status']['id']}</a></p>
-	</div>]]></template_content>
+</div>]]></template_content>
+      <template_name>reputationPopup</template_name>
+      <template_data>$reps</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<h3 class='maintitle'>Tags</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<ul class='ipsList_inline'>
+		<foreach loop="eachTag:$tags['tags'] as $id => $data">
+			<li><span class="{$data['className']}">{$data['tagWithUrl']}</span></li>
+		</foreach>
+		</ul>
+	</div>
+</div>]]></template_content>
+      <template_name>tagCloud</template_name>
+      <template_data>$tags</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<if test="isNotHuman:|:!$this->member->is_not_human">
+	<a <if test="noClass:|:!$noClass">class='ipsTag'</if> href="{parse url="app=core&amp;module=search&amp;do=search&amp;search_tags={parse expression="urlencode($tag)"}&amp;search_app=<if test="inSearch:|:isset($this->request['search_app']) AND $this->request['search_app']">{$this->request['search_app']}<else />{$app}</if>" base="public"}" data-tooltip="{parse expression="sprintf( $this->lang->words['find_more_tags'], $tag )"}"><span>{$tag}</span></a>
+<else />
+	{$tag}
+</if>]]></template_content>
+      <template_name>tagEntry</template_name>
+      <template_data><![CDATA[$tag, $noClass=false, $app='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<if test="isNotHuman:|:!$this->member->is_not_human">
+	<a href="{parse url="app=core&amp;module=search&amp;do=search&amp;search_tags={parse expression="urlencode($tag)"}&amp;search_app=<if test="inSearch:|:isset($this->request['search_app']) AND $this->request['search_app']">{$this->request['search_app']}<else />{$app}</if>" base="public"}" class='ipsBadge ipsBadge_lightgrey'>{$tag}</a>
+<else />
+	{$tag}
+</if>]]></template_content>
+      <template_name>tagPrefix</template_name>
+      <template_data><![CDATA[$tag, $app='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[{parse js_module="tags"}
+<input type="text" class="input_text" size="50" value="" name="{$options['fieldId']}" id="{$options['fieldId']}" <if test="isClosedField:|: ! $options['isOpenSystem']">readonly="readonly"</if> />
+<if test="canPrefix:|:$options['prefixesEnabled'] && !$this->memberData['gbw_disable_prefixes']">
+	&nbsp;&nbsp;<span class="desc lighter"><input type="checkbox" value="1" name="{$options['fieldId']}_prefix" id="{$options['fieldId']}_prefix" <if test="prefixChecked:|:$tags['formatted']['prefix'] OR $this->request[ $options['fieldId'] . '_prefix' ]">checked='checked'</if> /> {$this->lang->words['firsttagprefix']}</span>
+</if>
+<if test="!$options['minTags'] && $options['maxTags']">
+	<br /><span class='desc lighter'>{parse expression="sprintf( $this->lang->words['tags_max_no_min'], $options['maxTags'] )"}</span>
+</if>
+<if test="$options['minTags'] && !$options['maxTags']">
+	<br /><span class='desc lighter'>{parse expression="sprintf( $this->lang->words['tags_min_no_max'], $options['minTags'] )"}</span>
+</if>
+<if test="$options['minTags'] && $options['maxTags']">
+	<br /><span class='desc lighter'>{parse expression="sprintf( $this->lang->words['tags_max_and_min'], $options['minTags'], $options['maxTags'] )"}</span>
+</if>
+<php>
+	$options['lang']['tag_add_link']	= $this->lang->words['add_a_tag'];
+	$options['lang']['tip_text']		= $this->lang->words['tag_tip'];
+	$options['forceLowercase']			= $this->settings['tags_force_lower'];
+	$options['existingTags']			= count($tags['tags']) ? $tags['tags'] : null;
+	
+	$_tmp = $options;
+	
+	/* Always return as UTF-8 */
+	array_walk_recursive( $_tmp, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+	$jsonEncoded = json_encode( $_tmp );
+	$jsonEncoded = IPSText::convertCharsets($jsonEncoded, "UTF-8", IPS_DOC_CHAR_SET);
+</php>
+<script type="text/javascript">
+	$( "{$options['fieldId']}" ).tagify( {parse expression="$jsonEncoded"} );
+</script>]]></template_content>
+      <template_name>tagTextEntryBox</template_name>
+      <template_data>$tags, $options, $where</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_global_other</template_group>
+      <template_content><![CDATA[<div class='ipsForm_center'>
+	<br />
+	<strong>{$this->lang->words['tweet_ok']}</strong>
+	<br />
+	<br />
+	<p><a href="http://twitter.com/{$user['screen_name']}/status/{$user['status']['id']}" target="_blank">twitter.com/{$user['screen_name']}/status/{$user['status']['id']}</a></p>
+</div>]]></template_content>
       <template_name>twitterDone</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2210,22 +3252,25 @@ function contact_admin() {
     <template>
       <template_group>skin_global_other</template_group>
       <template_content><![CDATA[<h3>{$this->lang->words['share_via_twitter']}</h3>
-<div class='general_box' id='tWrap'>
-	<div style='float:left; width:80px; text-align: center'>
-		<strong>{$user['screen_name']}</strong>
-		<p style='padding-top:4px'><img src='{$user['profile_image_url']}' /></p>
-	</div>
-	<div style='margin-left: 110px'>
-		<textarea rows='5' cols='10' name='tContent' style='width: 270px' id='tContent'></textarea>
-		<div>
-			<div class='right'><input type='button' id='tSubmit' class='input_submit' value='{$this->lang->words['twitter_share']}' /></div>
-			<div class='desc'><span id='cLeft' style='font-weight:bold'>0</span> {$this->lang->words['twitter_chrs_left']}</div>
-		</div>
-	</div>
+<div class='fixed_inner'>
+	<ul class='ipsList_withminiphoto'>
+		<li class='clearfix ipsPad_half'>
+			<img src='{$user['profile_image_url']}' class='left ipsUserPhoto ipsUserPhoto_small'/>
+			<img src="{$this->settings['public_dir']}style_status/twitter.png" class='left' style='margin-top: -2px; margin-left: -12px;'/>
+			<div class='list_content' style='margin-left:58px' id='tWrap' >
+				<p class='ipsType_small desc'>{$user['screen_name']}</p>
+				<textarea class='input_text' rows='3' cols='10' name='tContent' style='width: 97%;' id='tContent'></textarea>
+				<div>
+					<div class='right'><input type='button' id='tSubmit' class='input_submit' value='{$this->lang->words['twitter_share']}' /></div>
+					<div class='ipsType_smaller desc'><span id='cLeft' style='font-weight:bold'>0</span> {$this->lang->words['twitter_chrs_left']}</div>
+				</div>
+			</div>
+		</li>
+	</ul>
 </div>]]></template_content>
       <template_name>twitterPop</template_name>
       <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2245,21 +3290,19 @@ function contact_admin() {
 <if test="isajax:|:$this->request['xml']">
 <br />
 </if>
-<h2>$one_text: $three_text</h2>
-<div class='row2 help_doc bullets'>
+<if test="notajax:|:!$this->request['xml']">
+	<h1 class='ipsType_pagetitle'>{$one_text}: {$three_text}</h1>
+<else />
+	<h1 class='ipsType_subtitle'>{$one_text}: {$three_text}</h1>
+</if>
+<br />
+<div class='row2 help_doc ipsPad bullets'>
 	{$text}
 </div>
-<br />
-<if test="notajaxbottom:|:!$this->request['xml']">
-<div class='topic_controls'>
-	<ul class='topic_buttons'>
-		<li><a href="{parse url="app=core&amp;module=help" base="public"}" title="{$this->lang->words['help_return_list_title']}"><img src='{$this->settings['img_url']}/back.png' alt='' /> {$this->lang->words['help_return_list']}</a></li>
-	</ul>
-</div>
-</if>]]></template_content>
+<br />]]></template_content>
       <template_name>helpShowSection</template_name>
       <template_data><![CDATA[$one_text="",$two_text="",$three_text="", $text]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2288,7 +3331,7 @@ function contact_admin() {
 </ol>]]></template_content>
       <template_name>helpShowTopics</template_name>
       <template_data><![CDATA[$one_text="",$two_text="",$three_text="",$rows]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2296,6 +3339,124 @@ function contact_admin() {
     </template>
   </templategroup>
   <templategroup group="skin_login">
+    <template>
+      <template_group>skin_login</template_group>
+      <template_content><![CDATA[<php>
+	$uses_name		= false;
+	$uses_email		= false;
+	$_redirect		= '';
+	
+	foreach( $this->cache->getCache('login_methods') as $method )
+	{
+		if( $method['login_user_id'] == 'username' or $method['login_user_id'] == 'either' )
+		{
+			$uses_name	= true;
+		}
+		
+		if( $method['login_user_id'] == 'email' or $method['login_user_id'] == 'either' )
+		{
+			$uses_email	= true;
+		}
+		
+		if( $method['login_login_url'] )
+		{
+			$_redirect	= $method['login_login_url'];
+		}
+	}
+	if( $uses_name AND $uses_email )
+	{
+		$this->lang->words['enter_name']	= $this->lang->words['enter_name_and_email'];
+	}
+	else if( $uses_email )
+	{
+		$this->lang->words['enter_name']	= $this->lang->words['enter_useremail'];
+	}
+	else
+	{
+		$this->lang->words['enter_name']	= $this->lang->words['enter_username'];
+	}
+</php>
+<if test="hasRedirect:|:$_redirect">
+<script type='text/javascript'>
+window.location = '{$_redirect}';
+</script>
+<else />
+<div id='inline_login_form'>
+	<form action="{parse url="app=core&amp;module=global&amp;section=login&amp;do=process" base="public"}" method="post" id='login'>
+		<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+		<input type="hidden" name="referer" value="{parse expression="my_getenv('HTTP_REFERER')"}" />
+		<h3>{$this->lang->words['log_in']}</h3>
+		<if test="registerServices:|: IPSLib::fbc_enabled() || IPSLib::twitter_enabled() === true">
+			<div class='ipsBox_notice'>
+				<ul class='ipsList_inline'>
+					<if test="registerUsingFb:|:IPSLib::fbc_enabled()">
+						<li><a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?_reg=1"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a></li>
+					</if>
+					<if test="twitterBox:|:IPSLib::twitter_enabled() === true">
+						<li><a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?_reg=1"><img src="{$this->settings['img_url']}/twitter_login.png" alt="" /></a></li>
+					</if>
+				</ul>
+			</div>
+		</if>
+		<br />
+		<div class='ipsForm ipsForm_horizontal'>
+			<fieldset>
+				<ul>
+					<li class='ipsField'>
+						<div class='ipsField_content'>
+							{$this->lang->words['register_prompt_1']} <a href="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" title='{$this->lang->words['register_prompt_2']}'>{$this->lang->words['register_prompt_2']}</a>
+						</div>
+					</li>
+					<li class='ipsField ipsField_primary'>
+						<label for='ips_username' class='ipsField_title'>{$this->lang->words['enter_name']}</label>
+						<div class='ipsField_content'>
+							<input id='ips_username' type='text' class='input_text' name='ips_username' size='30' />
+						</div>
+					</li>
+					<li class='ipsField ipsField_primary'>
+						<label for='ips_password' class='ipsField_title'>{$this->lang->words['enter_pass']}</label>
+						<div class='ipsField_content'>
+							<input id='ips_password' type='password' class='input_text' name='ips_password' size='30' /><br />
+							<a href='{parse url="app=core&amp;module=global&amp;section=lostpass" base="public"}' title='{$this->lang->words['retrieve_pw']}'>{$this->lang->words['login_forgotten_pass']}</a>
+						</div>
+					</li>
+					<li class='ipsField ipsField_checkbox'>
+						<input type='checkbox' id='inline_remember' checked='checked' name='rememberMe' value='1' class='input_check' />
+						<div class='ipsField_content'>
+							<label for='inline_remember'>
+								<strong>{$this->lang->words['rememberme']}</strong><br />
+								<span class='desc lighter'>{$this->lang->words['notrecommended']}</span>
+							</label>
+						</div>
+					</li>
+					<if test="anonymous:|:!$this->settings['disable_anonymous']">
+						<li class='ipsField ipsField_checkbox'>
+							<input type='checkbox' id='inline_invisible' name='anonymous' value='1' class='input_check' />
+							<div class='ipsField_content'>
+								<label for='inline_invisible'>
+									<strong>{$this->lang->words['form_invisible']}</strong><br />
+									<span class='desc lighter'>{$this->lang->words['anon_name']}</span>
+								</label>
+							</div>
+						</li>
+					</if>
+				</ul>
+			</fieldset>
+			<div class='ipsForm_submit ipsForm_center'>
+				<input type='submit' class='ipsButton' value='{$this->lang->words['log_in']}' />
+			</div>	
+		</div>	
+	</form>
+</div>
+</if>]]></template_content>
+      <template_name>ajax__inlineLogInForm</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_login</template_group>
       <template_content><![CDATA[<p class='message error'>
@@ -2304,7 +3465,7 @@ function contact_admin() {
 <br /><br />]]></template_content>
       <template_name>errors</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2313,132 +3474,110 @@ function contact_admin() {
     <template>
       <template_group>skin_login</template_group>
       <template_content><![CDATA[{parse js_module="signin"}
-<div id='login_form' class='clear'>
+<div id='login_form' class='clearfix'>
 	
-	<div id='member_login' class='left'>
+	<div id='member_login'>
 		<h2 class='maintitle'>{$this->lang->words['log_in']}</h2>
-		<div class='generic_bar'></div>
 		<form action="{parse url="app=core&amp;module=global&amp;section=login&amp;do=process" base="public"}" method="post" id='login'>
-		<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
-			<if test="referer:|:$referer">
-			<input type="hidden" name="referer" value="{$referer}" />
-			</if>
+			<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+			<if test="referer:|:$referer"><input type="hidden" name="referer" value="{$referer}" /></if>
 			<div id='regular_signin'>
 				<a id='_regularsignin'></a>
 				<h3 class='bar'>{$this->lang->words['enter_name_and_pass']}</h3>
-				<ul>
-					<li class='field'>
-						<label for='username'>{$this->lang->words['enter_name']}</label>
-						<input id='username' type='text' class='input_text' name='username' size='25' />
+				<ul class='ipsForm ipsForm_vertical ipsPad_double left'>
+					<li class='ipsField'>
+						<label for='ips_username' class='ipsField_title'>{$this->lang->words['enter_name']}</label>
+						<p class='ipsField_content'>
+							<input id='ips_username' type='text' class='input_text' name='ips_username' size='50' tabindex='1' /><br />
+							<span class='desc ipsType_smaller'>{$this->lang->words['register_prompt_1']} <a href='{parse url="app=core&amp;module=global&amp;section=register" base="public"}' title='{$this->lang->words['register_prompt_2']}'>{$this->lang->words['register_prompt_2']}</a></span>
+						</p>
 					</li>
-					<li class='field'>
-						<label for='password'>{$this->lang->words['enter_pass']}</label>
-						<input id='password' type='password' class='input_text' name='password' size='25' /><br />
-						<a href='{parse url="app=core&amp;module=global&amp;section=lostpass" base="public"}' class='desc' title='{$this->lang->words['retrieve_pw']}'>{$this->lang->words['login_forgotten_pass']}</a>
+					<li class='ipsField'>
+						<label for='ips_password' class='ipsField_title'>{$this->lang->words['enter_pass']}</label>
+						<p class='ipsField_content'>
+							<input id='ips_password' type='password' class='input_text' name='ips_password' size='50' tabindex='2' /><br />
+							<a href='{parse url="app=core&amp;module=global&amp;section=lostpass" base="public"}' class='ipsType_smaller' title='{$this->lang->words['retrieve_pw']}'>{$this->lang->words['login_forgotten_pass']}</a>
+						</p>
 					</li>
 				</ul>
-				<if test="hasopenid:|:in_array( 'openid', $login_methods )">
-				<p class='extra'>{parse replacement="openid_small"} {$this->lang->words['have_openid']} <a href='#_openid' title='{$this->lang->words['use_openid']}' id='openid_open'>{$this->lang->words['sign_in_here']}</a></p>
-				</if>
-				<if test="haswindowslive:|:in_array( 'live', $login_methods )">
-				<p class='extra'>{parse replacement="live_small"} {$this->lang->words['have_msnlive']} <a href='#_live' title='{$this->lang->words['use_live']}' id='live_open'>{$this->lang->words['sign_in_here']}</a></p>
-				</if>
-				<if test="extraform:|:is_array($extra_form) AND count($extra_form)">
-					<foreach loop="extrafields:$extra_form as $form_fields">
-						{$form_fields}
-					</foreach>
-				</if>
+				<div class='right ipsPad_double' id='other_signin'>
+					<ul class='ipsList_data clear ipsType_small'>
+						<if test="facebook:|:IPSLib::fbc_enabled()">
+							<li><a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?_reg=1"><img src="{$this->settings['img_url']}/facebook_login.png" alt="Facebook" /></a></li>
+						</if>
+						<if test="twitterBox:|:IPSLib::twitter_enabled() === true">
+							<li><a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?_reg=1"><img src="{$this->settings['img_url']}/twitter_login.png" alt="Twitter" /></a></li>
+						</if>
+						
+						<if test="hasopenid:|:in_array( 'openid', $login_methods )">
+							<li><a href='#_openid' title='{$this->lang->words['use_openid']}' id='openid_open'>{parse replacement="openid_small"} {$this->lang->words['have_openid']}</a></li>
+						</if>
+						<if test="haswindowslive:|:in_array( 'live', $login_methods )">
+							<li><a href='#_live' title='{$this->lang->words['use_live']}' id='live_open'>{parse replacement="live_small"} {$this->lang->words['sign_in_winlive']}</a></li>
+						</if>
+						<if test="extraform:|:is_array($extra_form) AND count($extra_form)">
+							<foreach loop="extrafields:$extra_form as $form_fields">
+								{$form_fields}
+							</foreach>
+						</if>
+					</ul>
+				</div>
 			</div>
 			<if test="openidform:|:in_array( 'openid', $login_methods )">
-			<div id='openid_signin'>
-				<a id='_openid'></a>
-				<h3 class='bar'>{$this->lang->words['sign_in_openid']}</h3>
-				{parse replacement="openid_large"}
-				<ul>
-					<li class='field'>
-						<label for='openid'>{$this->lang->words['openid']}</label>
-						<input id='openid' type='text' class='input_text' name='openid_url' value='http://' size='30' /><br />
-						<span class='desc'>{$this->lang->words['openid_example']}</span>
-					</li>
-				</ul>
-				<p class='extra'>{parse replacement="signin_icon"} <a href='#_regularsignin' title='{$this->lang->words['regular_signin']}' id='openid_close'>{$this->lang->words['use_regular']}</a></p>
-			</div>
+				<div id='openid_signin'>
+					<a id='_openid'></a>
+					<h3 class='bar'>{$this->lang->words['sign_in_openid']}</h3>
+					<ul class='ipsForm_horizontal ipsPad_double left'>
+						<li class='ipsField'>
+							<label for='openid' class='ipsField_title'>{parse replacement="openid_large"}</label>
+							<p class='ipsField_content ipsPad'>
+								<input id='openid' type='text' class='input_text' name='openid_url' value='http://' size='30' /><br />
+								<span class='desc'>{$this->lang->words['openid_example']}</span>
+							</p>
+						</li>
+					</ul>
+					<p class='extra'><a href='#_regularsignin' title='{$this->lang->words['regular_signin']}' id='openid_close'>{$this->lang->words['use_regular']}</a></p>
+				</div>
 			</if>
 			<if test="liveform:|:in_array( 'live', $login_methods )">
-			<div id='live_signin'>
-				<a id='_live'></a>
-				<h3 class='bar'>{$this->lang->words['sign_in_winlive']}</h3>
-				<ul>
-					<li class='field'>
-						<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1&amp;auth_key={$this->member->form_hash}" base="public"}'>{parse replacement="live_large"}</a> <a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1" base="public"}'>{$this->lang->words['signin_with_live']}</a>
-					</li>
-				</ul>
-				<p class='extra'>{parse replacement="signin_icon"} <a href='#_regularsignin' title='{$this->lang->words['regular_signin']}' id='live_close'>{$this->lang->words['use_regular']}</a></p>
-			</div>
+				<div id='live_signin'>
+					<a id='_live'></a>
+					<h3 class='bar'>{$this->lang->words['sign_in_winlive']}</h3>
+					<div class='ipsPad_double'>
+						<br />
+						<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;do=process&amp;use_live=1&amp;auth_key={$this->member->form_hash}" base="public"}' class='ipsButton'>{parse replacement="live_large"} &nbsp;&nbsp;{$this->lang->words['signin_with_live']}</a>
+					</div>
+					<p class='extra'><a href='#_regularsignin' title='{$this->lang->words['regular_signin']}' id='live_close'>{$this->lang->words['use_regular']}</a></p>
+				</div>
 			</if>
 			<hr />
 			<fieldset id='signin_options'>
 				<legend>{$this->lang->words['sign_in_options']}</legend>
-				<ul>
-					<li class='field checkbox'>
+				<ul class='ipsForm ipsForm_vertical ipsPad_double'>
+					<li class='ipsField ipsField_checkbox clearfix'>
 						<input type='checkbox' id='remember' checked='checked' name='rememberMe' value='1' class='input_check' />
-						<label for='remember'>
-							{$this->lang->words['rememberme']}<br />
-							<span class='desc'>{$this->lang->words['notrecommended']}</span>
-						</label>
+						<p class='ipsField_content'>
+							<label for='remember'>{$this->lang->words['rememberme']}</label><br />
+							<span class='desc lighter'>{$this->lang->words['notrecommended']}</span>
+						</p>
 					</li>
 					<if test="anonymous:|:!$this->settings['disable_anonymous']">
-						<li class='field checkbox'>
+						<li class='ipsField ipsField_checkbox clearfix'>
 							<input type='checkbox' id='invisible' name='anonymous' value='1' class='input_check' />
-							<label for='invisible'>
-								{$this->lang->words['form_invisible']}<br />
-								<span class='desc'>{$this->lang->words['anon_name']}</span>
-							</label>
+							<p class='ipsField_content'>
+								<label for='invisible'>{$this->lang->words['form_invisible']}</label><br />
+								<span class='desc lighter'>{$this->lang->words['anon_name']}</span>
+							</p>
 						</li>
 					</if>
 				</ul>
 			</fieldset>
 			<fieldset class='submit'>
-				<input type='submit' class='input_submit' value='{$this->lang->words['sign_in_button']}' /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
+				<input type='submit' class='input_submit' value='{$this->lang->words['sign_in_button']}' tabindex='3' /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
 			</fieldset>
 		</form>
 	</div>
-	<div id='guest_register' class='right general_box'>
-		<if test="facebook:|:$this->settings['fbc_enable'] AND $this->settings['fbc_api_id']">
-			<h3 class='bar'>{$this->lang->words['fb_login_title']}</h3>
-			<p>
-				<div id='fbUserBox'>
-					{$this->lang->words['login_w_facebook']}
-					<br />
-					<br />
-					<a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?_reg=1"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a>
-				</div>
-				<br clear='both' />
-			</p>
-			<br />
-		</if>
-		<!-- TWITTER LOG IN -->
-		<if test="twitterBox:|:IPSLib::twitter_enabled() === true">
-			<h3 class='bar'>{$this->lang->words['twitter_login_title']}</h3>
-			<p>
-				{$this->lang->words['login_w_twitter']}
-				<br />
-				<br />
-				<a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?_reg=1"><img src="{$this->settings['img_url']}/twitter_login.png" alt="" /></a>
-			</p>
-			<br />
-		</if>
-		<h3 class='bar'>{$this->lang->words['not_a_member']}</h3>
-		<p>
-			{$this->settings['login_page_info']}
-		</p>
-		<br />
-		<p style='text-align: center'>
-			<a href='{parse url="app=core&amp;module=global&amp;section=register" template="section=register" base="public"}'>{$this->lang->words['register_now']}</a>
-		</p>
-	</div>
 </div>
-</if>
 <if test="toggleOpenId:|:$this->request['serviceClick'] == 'openid'">
 <script type='text/javascript'>
 document.observe("dom:loaded", function(e){ ipb.signin.toggleOpenID(e); });
@@ -2451,7 +3590,1455 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
 </if>]]></template_content>
       <template_name>showLogInForm</template_name>
       <template_data><![CDATA[$message="",$referer="",$extra_form="", $login_methods=array(), $facebookOpts=array()]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+  </templategroup>
+  <templategroup group="skin_modcp">
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="topic"}
+<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+{parse template="include_lightbox" group="global" params=""}
+</if>
+<script type='text/javascript'>
+	ipb.topic.inSection	= 'topicview';
+</script>
+<style type='text/css'>
+	.post_mod, .post_id { display: none; }
+</style>
+{$this->templateVars['test']}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<if test="hasPosts:|:is_array( $posts ) AND count( $posts )">
+		<div id='ips_Posts'>
+			<foreach loop="post_data:$posts as $post">
+					{parse template="modCPpost" group="modcp" params="$post, array( 'sdData' => $other_data ), $post, 'deleted'"}
+			</foreach>
+		</div>
+	<else />
+		<div class='no_messages'>
+			{$this->lang->words['no_deleted_posts']}
+		</div>
+	</if>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>deletedPosts</template_name>
+      <template_data><![CDATA[$posts, $other_data=array(), $pagelinks='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="forums"}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table topic_list' id='forum_table'>
+		<if test="hastopics:|:is_array( $topics ) AND count( $topics )">
+			{parse striping="forumTable" classes="row1,row2"}
+			{parse template="modCPtopic" group="modcp" params="$topics, $pagelinks, 'deleted', $sdelete"}
+		<else />
+			<tr> 
+				<td colspan='3' class='no_messages'>{$this->lang->words['no_deleted_topics']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>deletedTopics</template_name>
+      <template_data><![CDATA[$topics, $sdelete=array(), $pagelinks='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form action='{parse url="app=core&amp;module=modcp&amp;section=editmember" base="public"}' method='post'>
+<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+<input type='hidden' name='do' value='doeditmember' />
+<input type='hidden' name='mid' value='{$profile['member_id']}' />
+<input type="hidden" name="_st" value="{$this->request['_st']}" />
+<input type="hidden" name="t" value="{$this->request['t']}" />
+<input type="hidden" name="pf" value="{$this->request['pf']}" />
+<style type='text/css'>
+	.cke_contents { height: 100px !important; }
+</style>
+<h2 class='maintitle'>{$this->lang->words['cp_em_title']}: <a href='{parse url="showuser={$profile['_parsedMember']['member_id']}" seotitle="{$profile['_parsedMember']['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$profile['_parsedMember']['members_display_name']}</a></h2>
+<div class=''>
+	<fieldset>
+		<h3 class='bar'>{$this->lang->words['edit_user_images']}</h3>
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField'>
+				<label for='photo' class='ipsField_title'>{$this->lang->words['cp_remove_photo']}</label>
+				<p class='ipsForm_content'>
+					<select name="photo" id='photo' class='input_select'>
+						<option value="0">{$this->lang->words['no']}</option>
+						<option value="1">{$this->lang->words['yes']}</option>
+					</select>
+					&nbsp;&nbsp;
+					<img src='{$profile['_parsedMember']['pp_mini_photo']}' class='ipsUserPhoto ipsUserPhoto_tiny' />
+				</p>
+			</li>
+		</ul>
+		<if test="editusercfields:|:count($custom_fields->out_fields)">
+			<h3 class='bar'>{$this->lang->words['edit_user_profile']}</h3>
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='title' class='ipsField_title'>{$this->lang->words['edit_user_title']}</label>
+					<p class='ipsField_content'>
+						<input type='text' class="input_text" name='title' size='50' value='{$profile['title']}' />
+					</p>
+				</li>
+				<foreach loop="custom_fields:$custom_fields->out_fields as $id => $data">
+					<li class='ipsField'>
+						<label for='field_{$id}' class='ipsField_title'>{$custom_fields->field_names[ $id ]}</label>
+						<div class='ipsField_content'>
+							{$data}
+							<if test="editusercfielddesc:|:$custom_fields->field_desc[ $id ]">
+								<br /><span class='desc'>{$custom_fields->field_desc[ $id ]}</span>
+							</if>
+						</div>
+					</li>
+				</foreach>
+			</ul>
+		</if>
+		<h3 class='bar'>{$this->lang->words['cp_edit_signature']}</h3>
+		<div class='ipsPad'>
+			{$profile['signature']}
+		</div>
+		<h3 class='bar'>{$this->lang->words['cp_edit_aboutme']}</h3>
+		<div class='ipsPad'>
+			{$profile['aboutme']}
+		</div>
+	</fieldset>
+	<fieldset class='submit'>
+		<input type="submit" class='input_submit' value="{$this->lang->words['cp_em_submit']}" />
+	</fieldset>
+</div>
+</form>]]></template_content>
+      <template_name>editUserForm</template_name>
+      <template_data>$profile, $custom_fields=null</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<p class='message unspecific'>{$msg}</p>]]></template_content>
+      <template_name>inlineModIPMessage</template_name>
+      <template_data><![CDATA[$msg='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table'>
+		<tr class='header'>
+			<th scope='col'>{$this->lang->words['w_v_warnby']}</th>
+			<th scope='col'>{$this->lang->words['w_v_warnto']}</th>
+			<th scope='col'>{$this->lang->words['w_v_notes']}</th>
+		</tr>
+		<if test="haswarnings:|:is_array( $warnings ) AND count( $warnings )">
+			{parse striping="warnings" classes="row1,row2 altrow"}
+			<foreach loop="warningloop:$warnings as $r">
+				<tr class='{parse striping="warnings"}'>
+					<td>{$r['punisher_photo']} <a href='{parse url="showuser={$r['punisher_id']}" base="public" seotitle="{$r['punisher_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['punisher_name']}</strong></a></td>
+					<td><img src='{$r['pp_mini_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' alt='' /> <a href='{parse url="showuser={$r['member_id']}" base="public" seotitle="{$r['members_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['members_display_name']}</strong></a></td>
+					<td>{$this->lang->words['mod_warn_added']} <strong>{parse date="$r['wlog_date']" format="long" relative="false"}</strong></td>
+				</tr>
+				<tr class='{parse striping="warnings"}'>
+					<td>
+						<span class="<if test="warnlognote:|:$r['wlog_type'] == 'note' OR $r['wlog_type'] == 'pos'">positive<else />negative</if>" <if test="warnlogcolor:|:$r['wlog_type'] == 'note' || $r['wlog_type'] == 'nochan' || $r['wlog_type'] == 'custom'">style='color:gray'</if>>
+							<if test="warnlognotetype:|:$r['wlog_type'] == 'note'">
+								{$this->lang->words['mod_warn_note']}
+							<else />
+								<if test="warnlogpos:|:$r['wlog_type'] == 'pos'">
+									{$this->lang->words['w_v_minus']}
+								</if>
+								<if test="warnlogneg:|:$r['wlog_type'] == 'neg'">
+									{$this->lang->words['w_v_add']}
+								</if>
+								<if test="warnlognochange:|:$r['wlog_type'] == 'nochan'">
+									{$this->lang->words['w_v_nochan']}
+								</if>
+								<if test="warnlogcustchange:|:$r['wlog_type'] == 'custom'">
+									{$this->lang->words['w_v_custom']}
+								</if>
+							</if>
+						</span>
+					</td>
+					<td colspan='2'>{$r['content']}</td>
+				</tr>
+			</foreach>
+		<else />
+			<tr>
+				<td class="no_messages" colspan="3">{$this->lang->words['warn__no_recent']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>latestWarnLogs</template_name>
+      <template_data>$warnings, $pagelinks</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<if test="canEditMember:|:$this->memberData['g_is_supmod']">
+{parse js_module="modcp"}
+<script type='text/javascript'>
+ipb.modcp.initialtext = "{$this->lang->words['start_typing_lup']}";
+</script>
+<h2 class='maintitle'>{$this->lang->words['memberlookup_title']}</h2>
+<div class='clearfix ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<h3 class='ipsType_subtitle'>{$this->lang->words['memberlookup_desc']}</h3>
+		<p class='desc'>{$this->lang->words['starttypeingmember']}</p>
+		<form action='#' method='post' style='margin-top: 10px'>
+			<input type='text' name='memberlookup' id='memberlookup' class='input_text' size='50' />
+		</form>
+	</div>
+	<script type='text/javascript'>
+		$('memberlookup').defaultize( "{$this->lang->words['start_typing_lup']}" );
+	</script>
+</div>
+<else />
+<div class='clearfix '>
+	<div class='ipsBox_container ipsPad'>
+		<p>{$this->lang->words['intro_blurb']}</p>
+	</div>
+</div>
+</if>]]></template_content>
+      <template_name>memberLookup</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<div id='member_list' class='clear block_wrap'>
+		<div id='member_wrap'>
+			<ul class='ipsMemberList'>
+				<if test="showmembers:|:is_array( $members ) and count( $members )">
+					{parse striping="memberStripe" classes="row1,row2"}
+					<foreach loop="members:$members as $member">
+						<li id='member_id_{$member['member_id']}' class='ipsPad clearfix member_entry {parse striping="memberStripe"}'>
+							<a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$member['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+							<div class='ipsBox_withphoto'>
+								<ul class='ipsList_inline right'>
+									<if test="weAreSupmod:|:$this->memberData['g_is_supmod'] == 1 && $member['member_id'] != $this->memberData['member_id']">
+										<li><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;auth_key={$this->member->form_hash}&amp;mid={$member['member_id']}&amp;pf={$member['member_id']}" base="public"}' class='ipsButton_secondary'>{$this->lang->words['edit_member']}</a></li>
+									</if>
+									<if test="memberwarn:|:$member['warn_percent'] !== NULL">
+										<a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$member['member_id']}&amp;_tab=warn" base="public"}' id='warn_link_modcp_{$member['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link ipsButton_secondary'>{$this->lang->words['warn_status']}</a>
+									</if>
+									<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $member['member_id'] != $this->memberData['member_id']">
+										<li class='pm_button' id='pm_xxx_{$member['pp_member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['pp_member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
+									</if>
+									<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}' class='ipsButton_secondary'>{parse replacement="find_topics_link"}</a></li>
+									<if test="blog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $member['has_blog'] != 'recache'">
+										<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
+									</if>
+									<if test="gallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+										<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
+									</if>
+								</ul>
+								
+								<h3 class='ipsType_subtitle'>
+									<strong><a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></strong>
+								</h3>
+								<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+									<if test="norep:|:$member['pp_reputation_points'] == 0 || !$member['pp_reputation_points']">
+										<p class='reputation zero ipsType_small left'>
+									</if>
+									<if test="posrep:|:$member['pp_reputation_points'] > 0">
+										<p class='reputation positive ipsType_small left'>
+									</if>
+									<if test="negrep:|:$member['pp_reputation_points'] < 0">
+										<p class='reputation negative ipsType_small left'>
+									</if>							
+											<span class='number'>{$member['pp_reputation_points']}</span>
+										</p>
+								</if>
+								<span class='desc'>
+									{$this->lang->words['member_joined']} {parse date="$member['joined']" format="joined"}<br />
+									{IPSMember::makeNameFormatted( $member['group'], $member['member_group_id'] )} &middot; <strong>{$this->lang->words['modqueued_til']}: <if test="isnotbanned:|:in_array( $type, array( 'modposts', 'suspended', 'restrictposts' ) )"><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;_tab=warn&amp;type=minus" base="public"}'></if><em>{$member['_language']}</em><if test="isnotbanned2:|:in_array( $type, array( 'modposts', 'suspended', 'restrictposts' ) )"></a></if></strong>
+								</span>
+							</div>
+						</li>
+					</foreach>
+				<else />
+					<p class='no_messages'>{$this->lang->words['no_results']}</p>
+				</if>
+			</ul>
+		</div>
+	</div>
+</div>
+	<div>{$pagelinks}</div>]]></template_content>
+      <template_name>membersList</template_name>
+      <template_data><![CDATA[$type, $members, $pagelinks='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h2 class='maintitle'>{$this->lang->words['menu_ipsearch']}</h2>
+<div class='ipsBox clearfix'>
+	<form id="userCPForm" action="{parse url="app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit" base="public"}" method="post">
+	<fieldset class="ipsBox_container ipsPad">
+		<if test="modIpIe:|:$inlineMsg">
+			{$inlineMsg}
+		</if>
+		<br />
+		
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField'>
+				<label for='ipsearch' class='ipsField_title'>{$this->lang->words['ip_enter']}</label>
+				<p class='ipsField_content'>
+					<input type="text" size="40" maxlength="24" class='input_text' name="ip" value="<if test="$ip">{$ip}<else />{$this->request['ip']}</if>" />
+					<select name="iptool" class='input_select'>
+						<option value="resolve">{$this->lang->words['ip_resolve']}</option>
+						<option value="posts">{$this->lang->words['ip_posts']}</option>
+						<option value="members">{$this->lang->words['ip_members']}</option>
+					</select>&nbsp;
+					<input type="submit" class='input_submit' value="{$this->lang->words['ip_submit']}" />
+				</p>
+			</li>
+		</ul>
+		<p class='message unspecific'>
+			{$this->lang->words['ip_desc_text']}
+		</p>
+		<p class='desc'>
+			{$this->lang->words['ip_warn_text']}
+		</p>
+	</fieldset>
+	</form>
+</div>]]></template_content>
+      <template_name>membersModIPForm</template_name>
+      <template_data><![CDATA[$ip="", $inlineMsg='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<div class='topic_controls'>
+	{$pages}
+</div>
+<br />
+<table class='ipb_table'>
+	<tr class='header'>
+		<th style='width: 20%'>{$this->lang->words['ipm_name']}</th>
+		<th style='width: 15%'>{$this->lang->words['ipm_ip']}</th>
+		<th style='width: 10%' class='short'>{$this->lang->words['ipm_posts']}</th>
+		<th style='width: 20%' class='short'>{$this->lang->words['ipm_reg']}</th>
+		<th style='width: 15%'>{$this->lang->words['ipm_group']}</th>
+		<th style='width: 10%'>&nbsp;</th>
+	</tr>
+	<if test="modIPMembers:|:is_array( $members ) AND count( $members )">
+		{parse striping="members" classes="row1,row2"}
+		<foreach loop="ipMembers:$members as $id => $row">
+			<tr class='{parse striping="members"}'>
+				<td><a href="{parse url="showuser={$row['member_id']}" base="public" template="showuser" seotitle="{$row['members_seo_name']}"}">{IPSMember::makeNameFormatted( $row['members_display_name'], $row['member_group_id'] )}</a></td>
+				<td class='altrow'>{$row['ip_address']}</td>
+				<td class='short'>{$row['posts']}</td>
+				<td class="altrow short">{$row['joined']}</td>
+				<td>{$row['groupname']}</td>
+				<td class="altrow short">
+					<a href="{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$row['member_id']}&amp;auth_key={$this->member->form_hash}" base="public"}" title="{$this->lang->words['ipm_edit']}" class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['ipm_edit']}</a>
+				</td>
+			</tr>
+		</foreach>
+	</if>
+</table>
+<br />
+<div class='topic_controls'>
+	{$pages}
+</div>]]></template_content>
+      <template_name>membersModIPFormMembers</template_name>
+      <template_data><![CDATA[$pages="",$members]]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<p class='message'>
+	{$this->lang->words['ipp_found']} {$count}
+</p>
+<br />
+<div class='topic_controls'>
+	{$pageLinks}
+</div>
+<br />
+<if test="modFindMemberPosts:|:count($results)">
+	{parse striping="posts" classes="row1,row2"}
+	<foreach loop="ipPosts:$results as $result">
+		<div class='post_block ucp no_sidebar {parse striping="posts"}'>
+			<h3><a href='{parse url="showtopic={$result['topic_id']}&amp;findpost={$result['pid']}" template="showtopic" seotitle="{$result['seo_title']}" base="public"}' title='{$this->lang->words['modip_viewposts']}'>{$result['members_display_name']} | {parse date="$result['post_date']" format="long"}</a></h3>
+			<div class='post_body'>
+				<div class='post'>{$result['post']}</div>
+			</div>
+		</div>
+		<hr />
+	</foreach>
+</if>
+<br />
+<div class='topic_controls'>
+	{$pageLinks}
+</div>]]></template_content>
+      <template_name>membersModIPFormPosts</template_name>
+      <template_data><![CDATA[$count=0, $pageLinks='', $results]]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=save&amp;announce_id={$announce['announce_id']}&amp;type={$type}" base="public"}" method="post" id='postingform'>
+<fieldset class='row1'>
+	<h3 class='ipsType_subtitle'><if test="buttonlang:|:$type=='add'">{$this->lang->words['announce_add']}<else />{$this->lang->words['announce_button_edit']}</if></h3>
+	<br />
+	<if test="announceMessage:|:$msg">
+		<p class='message unspecific'>{$msg}</p>
+	</if>
+	<ul class='ipsForm ipsForm_horizontal'>
+		<li class='ipsField clearfix'>
+			<label for='announce_title' class='ipsField_title'>{$this->lang->words['announce_form_title']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="50" name="announce_title" id='announce_title' value="{$announce['announce_title']}" tabindex="1" />
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_start' class='ipsField_title'>{$this->lang->words['announce_form_start']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="10" name="announce_start" id='announce_start' value="{$announce['announce_start']}" tabindex="2" /><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_date']} {$this->lang->words['announce_form_startdesc']}</span>
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_end' class='ipsField_title'>{$this->lang->words['announce_form_end']}</label>
+			<p class='ipsField_content'>
+				<input class='input_text' type="text" size="10" name="announce_end" id='announce_end' value="{$announce['announce_end']}" tabindex="2" /><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_date']} {$this->lang->words['announce_form_enddesc']}</span>
+			</p>				
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='announce_forum' class='ipsField_title'>{$this->lang->words['announce_form_forums']}</label>
+			<p class='ipsField_content'>
+				<select class="input_select" multiple="multiple" size="10" id='announce_forum' name="announce_forum[]" tabindex="4">{$forum_html}</select><br />
+				<span class="desc lighter">{$this->lang->words['announce_form_forums2']}</span>
+			</p>
+		</li>
+		<li class='ipsField clearfix'>
+			<label for='' class='ipsField_title'>{$this->lang->words['announce_form_announce']}</label>
+			<div class='ipsField_content'>
+				{$editor_html}
+			</div>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_active" id='announce_active' value="1" {$announce['announce_active_checked']} />
+			<p class='ipsField_content'>
+				<label for='announce_active'>{$this->lang->words['announce_form_enable']}</label>
+			</p>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_html_enabled" id='announce_html_enabled' value="1" {$announce['html_checkbox']} />
+			<p class='ipsField_content'>
+				<label for='announce_html_enabled'>{$this->lang->words['announce_use_html']}</label>
+			</p>
+		</li>
+		<li class='ipsField ipsField_checkbox'>
+			<input type="checkbox" class="checkbox" name="announce_nlbr_enabled" id='announce_nlbr_enabled' value="1" {$announce['nlbr_checkbox']} />
+			<p class='ipsField_content'>
+				<label for='announce_nlbr_enabled'>{$this->lang->words['announce_use_nlbr']}</label>
+			</p>
+		</li>
+	</ul>
+</fieldset>
+<br />
+<fieldset class='submit'>
+	<input type="submit" value="<if test="buttonlang:|:$type=='add'">{$this->lang->words['announce_add']}<else />{$this->lang->words['announce_button_edit']}</if>" class="input_submit" tabindex="7" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
+</fieldset>
+</form>]]></template_content>
+      <template_name>modAnnounceForm</template_name>
+      <template_data><![CDATA[$announce,$forum_html,$type,$editor_html,$msg=""]]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="ucp"}
+<form action="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=save" base="public"}" id="mutliact" method="post">
+<div class='topic_buttons'>
+	<ul class='topic_controls'>
+		<li>
+			<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=add" base="public"}" class='ipsButton'>{$this->lang->words['announce_add']}</a>
+		</li>
+	</ul>
+</div>
+	<h3 class='maintitle clear'>{$this->lang->words['announce_current']}</h3>
+	<table class='ipb_table' summary="{$this->lang->words['ucp_announcements']}">
+		<tr class='header'>
+			<th scope='col' style="width: 40%">{$this->lang->words['announce_title']}</th>
+			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_form_starts']}</th>
+			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_form_end']}</th>
+			<th scope='col' style="width: 25%">{$this->lang->words['announce_forums']}</th>
+			<th scope='col' style="width: 15%">&nbsp;</th>
+		</tr>
+		<if test="hasAnnouncements:|:is_array( $announcements ) AND count( $announcements )">
+			{parse striping="announcements" classes="row1,row2"}
+			<foreach loop="announcements:$announcements as $announce">
+				<tr class="{parse striping="announcements"} <if test="notactive:|:!$announce['announce_active']">moderated</if>">
+					<td>
+						<strong><a href="{parse url="showannouncement={$announce['announce_id']}&amp;f=0" base="public" template="showannouncement" seotitle="{$announce['announce_seo_title']}"}">{$announce['announce_title']}</a></strong> <if test="notactive:|:!$announce['announce_active']"><span class='desc'>{$this->lang->words['announce_page_disabled']}</span></if><br /><span class="desc">{$this->lang->words['by_ucfirst']} {parse template="userHoverCard" group="global" params="$announce"}</span>
+					</td>
+					<td class="short">
+						{parse date="$announce['announce_start']" format="DATE" relative="false"}
+					</td>
+					<td class="short">
+						{parse date="$announce['announce_end']" format="DATE" relative="false"}
+					</td>
+					<td>
+						<div class="forumdesc">
+							<if test="announceForum:|:$announce['announce_forum'] == '*'">
+								{$this->lang->words['announce_page_allforums']}
+							<else />
+								<if test="announceHasForums:|:is_array( $announce['_forums'] ) and count( $announce['_forums'] )">
+									<ul>
+									<foreach loop="announce_forums:$announce['_forums'] as $forum">
+										<li><a href="{parse url="showforum={$forum[0]}" base="public"}">{$forum[1]}</a></li>
+									</foreach>
+									</ul>
+								<else />
+									{$announce['announce_forum_show']}
+								</if>
+							</if>
+						</div>
+					</td>
+					<td class="short">
+						<ul class='ipsList_inline ipsList_nowrap'>
+							<li>
+								<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=edit&amp;announce_id={$announce['announce_id']}" base="public"}" class='ipsButton_secondary'>{$this->lang->words['announce_edit']}</a>
+							</li>
+							<li>
+								<a href="{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=delete&amp;announce_id={$announce['announce_id']}" base="public"}" id="del_{$announce['announce_id']}" class='ipsButton_secondary'>{$this->lang->words['announce_delete']}</a>
+							</li>
+						</ul>
+						<script type='text/javascript'>
+							$('del_{$announce['announce_id']}').observe('click', ipb.ucp.deleteAnnouncement.bindAsEventListener( this, {$announce['announce_id']} ) );
+						</script>
+					</td>
+				</tr>
+			</foreach>
+		<else />
+			<tr>
+				<td align="center" colspan="5">{$this->lang->words['announce_none']}</td>
+			</tr>
+		</if>
+	</table>
+</form>]]></template_content>
+      <template_name>modAnnouncements</template_name>
+      <template_data>$announcements</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{parse expression="sprintf( $this->lang->words['modcp_editing_h1'], $return['members_display_name'] )"}</h1>
+<if test="fromprofile:|:$this->request['pf']">
+	<a href='{parse url="showuser={$return['member_id']}" base="public" template="showuser" seotitle="{$return['members_seo_name']}"}'>{$this->lang->words['_larr']} {parse expression="sprintf( $this->lang->words['go_back_profile'], $return['members_display_name'] )"}</a>
+<else />
+	<if test="fromprofile:|:$this->request['t']">
+		<a href='{parse url="showtopic={$return['tid']}" base="public" template="showtopic" seotitle="{$return['title_seo']}"}'>{$this->lang->words['_larr']} {parse expression="sprintf( $this->lang->words['go_back_general'], $return['title'] )"}</a>
+	<else />
+		<a href='{parse url="app=core&amp;module=modcp" base="public"}'>{$this->lang->words['_larr']} {$this->lang->words['go_back_modcp']}</a>
+	</if>
+</if>
+<br /><br />
+<div class='ipsBox clear vcard' id='profile_background'>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='modcp_tabs'>
+			<ul class='modcp_tabs'>
+				<if test="issupermod:|:$editmember">
+					<li id='editmember_tab'<if test="isEditActive:|:empty($this->request['_tab'])"> class='active'</if>><a href='#'>{$this->lang->words['editmember_tab']}</a></li>
+				</if>
+				<if test="warnenabled:|:$this->settings['warn_on']">
+					<li id='warnpanel_tab'<if test="isWarnActive:|:(!empty($this->request['_tab']) AND $this->request['_tab'] == 'warn') OR !$editmember"> class='active'</if>><a href='#'>{$this->lang->words['warnpanel_tab']}</a></li>
+					<li id='warnlogs_tab'<if test="isLogActive:|:!empty($this->request['_tab']) AND $this->request['_tab'] == 'warnlogs'"> class='active'</if>><a href='#'>{$this->lang->words['warnlog_tab']}</a></li>
+					<li id='noteform_tab'<if test="isNotesActive:|:!empty($this->request['_tab']) AND $this->request['_tab'] == 'noteform'"> class='active'</if>><a href='#'>{$this->lang->words['addnote_tab']}</a></li>
+				</if>
+			</ul>
+		</div>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' id='profile_content'>
+			<div class='ipsPad'>
+				<if test="issupermodpane:|:$editmember">
+					<div id='editmember_pane' <if test="isEditPaneActive:|:!empty($this->request['_tab']) AND in_array( $this->request['_tab'], array('warn','warnlogs','noteform') )">style='display: none'</if>>
+						{$editmember}
+					</div>
+				</if>
+				<if test="warnenabledpane:|:$this->settings['warn_on']">
+					<div id='warnpanel_pane' <if test="isWarnActive:|:(empty($this->request['_tab']) OR $this->request['_tab'] != 'warn') AND $editmember">style='display: none'</if>>
+						{$warnpanel}
+					</div>
+					<div id='warnlogs_pane' <if test="isWarnActive:|:empty($this->request['_tab']) OR $this->request['_tab'] != 'warnlogs'">style='display: none'</if>>
+						{$warnlogs}
+					</div>
+					<div id='noteform_pane' <if test="isWarnActive:|:empty($this->request['_tab']) OR $this->request['_tab'] != 'noteform'">style='display: none'</if>>
+						{$noteForm}
+					</div>
+				</if>
+			</div>
+		</div>
+	</div>
+</div>
+<script type='text/javascript'>
+(function(){
+	var currentTab = $('modcp_tabs').select("li.active")[0];
+	
+	if( !currentTab )
+	{
+		currentTab = $('modcp_tabs').select('li')[0];
+	}
+	var togglePane = function(e, elem){
+		if(e){ Event.stop(e) }
+		
+		if( currentTab ){
+			if( getId( currentTab.id ) == getId( elem.id ) ){
+				return;
+			}
+			
+			$( getId( currentTab.id ) + '_pane' ).fade({duration: 0.3});
+		}
+		
+		var newPane = $( getId( elem.id ) + '_pane' );
+		$( newPane ).appear({duration: 0.3});
+		
+		$('modcp_tabs').select("li").invoke("removeClassName", 'active');
+		
+		$(elem).addClassName('active');
+		currentTab = elem;
+	};
+	
+	var getId = function( id ){
+		return id.replace(/\_pane|\_tab/g, '');
+	};
+	
+	$('modcp_tabs').on('click', 'li', togglePane);
+	togglePane( null, currentTab );
+})();
+	
+</script>]]></template_content>
+      <template_name>modControls</template_name>
+      <template_data>$editmember, $warnpanel, $warnlogs, $noteForm, $return</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<!--post:{$post['post']['pid']}-->
+<script type="text/javascript">
+var pid = parseInt({$post['post']['pid']});
+if ( pid > ipb.topic.topPid ){
+	ipb.topic.topPid = pid;
+}
+</script>
+<if test="">
+<div class='post_block hentry clear no_sidebar <if test="reputation:|:$this->settings['reputation_enabled']">with_rep</if>' id='post_id_{$post['post']['pid']}'>
+	<a id='entry{$post['post']['pid']}'></a>
+	<if test="repIgnored:|:!empty( $post['post']['_repignored'] ) AND $post['post']['_repignored'] == 1 && $post['post']['_ignored'] != 1">
+		<div class='post_ignore'>
+			<if test="noRep:|:$post['post']['rep_points'] == 0">
+				<span class='reputation zero' title='{$this->lang->words['top_rep']}'>
+			</if>
+			<if test="posRep:|:$post['post']['rep_points'] > 0">
+				<span class='reputation positive' title='{$this->lang->words['top_rep']}'>
+			</if>
+			<if test="negRep:|:$post['post']['rep_points'] < 0">
+				<span class='reputation negative' title='{$this->lang->words['top_rep']}' >
+			</if>
+					{$post['post']['rep_points']}</span> {$this->lang->words['top_this_post_by']} <a href='{parse url="showuser={$post['author']['member_id']}" base="public"}'>{$post['author']['members_display_name']}</a> {$this->lang->words['top_below_thresh']}. <a href='#' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+		</div>
+	</if>
+	
+	<div class='post_wrap'>
+		<if test="postMid:|:$post['author']['member_id']">
+			<h3 class='row2'>
+		<else />
+			<h3 class='guest row2'>
+		</if>
+				<if test="postModCheckbox:|:$this->memberData['is_mod']">
+				<!--<span class='right'>
+					<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod right'<if test="postModSelected:|:!empty( $post['post']['_pid_selected'] )"> checked='checked'</if> />
+				</span>-->
+				</if>
+				<img src='{$post['author']['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_tiny' />&nbsp;
+				<if test="postMember:|:$post['author']['member_id']">
+					<span class="author vcard">{parse template="userHoverCard" group="global" params="$post['author']"}</span>
+				<else />
+					{$post['author']['members_display_name']}
+				</if>
+				
+				<if test="postIp:|:$post['post']['_show_ip']">
+					<span class='ip right ipsType_small'>({$this->lang->words['ip']}:
+					<if test="postAdmin:|:$post['author']['g_access_cp']">
+						<em>{$this->lang->words['ip_private']}</em>
+					<else />
+						<a href="{parse url="app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a>
+					</if>)
+					</span>
+				</if>
+			</h3>
+		
+		<div class='post_body'>
+			<if test="isDeleted:|:$type == 'deleted'">
+				<ul class='ipsList_inline'>
+					
+				</ul>
+				<ul class='ipsList_inline modcp_post_controls'>
+					<if test="postIsHardDeleted:|:!$post['post']['_isDeleted']">
+						<li>
+							<img data-tooltip="{$this->lang->words['hard_delete_warn_post']}" src='{$this->settings['img_url']}/icon_timewarning.png' />
+						</li>
+					</if>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=p_hrestore&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;pid[]={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' class='ipsButton_secondary ipsType_smaller' title='{$this->lang->words['restore_post_desc']}'>{$this->lang->words['restore_post']}</a>
+					</li>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=p_hdelete&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;pid[]={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' class='ipsButton_secondary ipsType_smaller' title='{$this->lang->words['restore_post_desc']}'>{$this->lang->words['perm_delete_post']}</a>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['posted']}</strong> <span class='desc lighter'>{parse date="$post['post']['post_date']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['deleted_post_date']}</strong> <span class='desc lighter'>{parse date="$topic['post']['pdelete_time']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['delete_from_topic']}</strong> <a class='desc lighter' href='{parse url="showtopic={$topic['post']['tid']}" seotitle="{$topic['post']['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['go_to_topic']}'>{IPSText::truncate( $topic['post']['title'], 25 )}</a>
+					</li>
+				</ul>
+			</if>
+			<if test="isUnapproved:|:$type == 'unapproved'">
+				<ul class='ipsList_inline'>
+					
+				</ul>
+				<ul class='ipsList_inline modcp_post_controls'>
+					<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
+						<li class='post_edit'><a href='{parse url="app=forums&amp;module=post&amp;section=post&amp;do=edit_post&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_edit_title']}' class='ipsButton_secondary ipsType_smaller' id='edit_post_{$post['post']['pid']}'>{$this->lang->words['post_edit']}</a></li>
+					</if>
+					<!-- Matt: Approve / unapprove post button -->
+					<if test="approvePost:|:$this->memberData['is_mod']">
+						<li id='toggle_post_{$post['post']['pid']}'>
+							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=approve&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;t={$post['post']['topic_id']}&amp;f={$post['post']['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_toggle_visible']}' class='ipsButton_secondary ipsType_smaller'><span id='toggletext_post_{$post['post']['pid']}'><if test="approveUnapprove:|:$post['post']['queued']==1">{$this->lang->words['post_approve']}<else />{$this->lang->words['post_unapprove']}</if></span></a>
+						</li>
+					</if>
+					<if test="canDelete:|:$post['post']['_can_delete'] === TRUE OR $post['post']['_softDelete']">
+						<li class='post_del' id='del_post_{$post['post']['pid']}'>
+							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=04&amp;f={$post['post']['forum_id']}&amp;t={$post['post']['topic_id']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' title='{$this->lang->words['post_delete_title']}' class='delete_post ipsButton_secondary important ipsType_smaller'>{$this->lang->words['post_delete']}</a>
+						</li>
+					</if>
+					<if test="reportedPostData:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
+						<img src="{$this->settings['img_url']}/reports/post_alert_{$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid']]['gfx']}.png" alt="" class='ipbmenu clickable' id='post-report-{$post['post']['pid']}' />
+					</if>
+					<li class='desc'>
+						<strong>{$this->lang->words['posted']}</strong> <span class='desc lighter'>{parse date="$post['post']['post_date']" format="short"}</span>
+					</li>
+					<li class='desc'>
+						<strong>{$this->lang->words['in_topic']}</strong> <a class='desc lighter' href='{parse url="showtopic={$topic['post']['tid']}" seotitle="{$topic['post']['title_seo']}" template="showtopic" base="public"}'>{IPSText::truncate( $topic['post']['title'], 35 )}</a>
+					</li>
+				</ul>
+			</if>
+			<!--<p class='posted_info desc lighter blend_links ipsType_small'>
+				{$this->lang->words['posted']} <abbr class="published" title="{parse expression="date( 'c', $post['post']['post_date'] )"}">{parse date="$post['post']['post_date']" format="long"}</abbr>
+			</p>-->
+			<div class='post entry-content <if test="$post['post']['_repignored'] == 1">imgsize_ignore</if>'>
+				{$post['post']['post']}
+				{$post['post']['attachmentHtml']}
+				<br />
+				<if test="postEditBy:|:$post['post']['edit_by']">
+					<p class='edit'>
+						{$post['post']['edit_by']}
+						<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
+							<br />
+							<span class='reason'>{$this->lang->words['reason_for_edit']} {$post['post']['post_edit_reason']}</span>
+						</if>
+					</p>
+				</if>
+			</div>
+						
+				<br />
+		</div>
+			
+				<script type='text/javascript'>
+					if( $('toggle_post_{$post['post']['pid']}') ){
+						$('toggle_post_{$post['post']['pid']}').show();
+					}
+					
+					// Add perm data
+					ipb.topic.deletePerms[{$post['post']['pid']}] = { 'canDelete' : {parse expression="intval($post['post']['_can_delete'])"}, 'canSoftDelete' : {parse expression="intval($post['post']['_softDelete'])"} };
+				</script>
+				<if test="reportedPostData:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
+					<ul id='post-report-{$post['post']['pid']}_menucontent' class='ipbmenu_content report_menu' style='display: none'>
+						<li><a href="{parse url="app=core&amp;module=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}" base="public"}" id='report_mark_{$post['post']['pid']}'><img src='{$this->settings['img_url']}/reports/mark_complete.png' alt='' /> {$this->lang->words['report_menu_mark_complete']}</a></li>
+						<li><a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}"><img src='{$this->settings['img_url']}/reports/view_report.png' alt='' /> {$this->lang->words['report_menu_view_report']}</a></li>
+					</ul>
+					<script type="text/javascript">
+						$('report_mark_{$post['post']['pid']}').observe('click',
+						 	ipb.global.updateReportStatus.bindAsEventListener( 	
+								this, {$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']},2,2
+							)
+						);
+					</script>
+				</if>
+			</div>		
+		</div>
+		</if>]]></template_content>
+      <template_name>modCPpost</template_name>
+      <template_data>$post, $displayData, $topic, $type</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<foreach loop="topics:$topics as $tid => $data">
+	<tr class='__topic' id='trow_{$data['tid']}' data-tid="{$data['tid']}">
+		<td class='__tid{$data['tid']} with_mod_links'>	
+			<if test="isLink:|:$data['state'] == 'link'">
+				{$this->lang->words['moved_topic_link']}
+				<em>
+			</if>		
+			<a id="tid-link-{$data['tid']}" href="{parse url="showtopic={$data['tid']}" base="public" template="showtopic" seotitle="{$data['title_seo']}"}" title='{$this->lang->words['topic_started_on']} {parse date="$data['start_date']" format="LONG"}' class='topic_title'>{$data['title']}</a>
+			<if test="isLinkEnd:|:$data['state'] == 'link'">
+				</em>
+			</if>
+			<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
+				<ul class='mini_pagination'>
+				<foreach loop="pages:$data['pages'] as $page">
+						<if test="haslastpage:|:$page['last']">
+							<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
+						<else />
+							<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a></li>
+						</if>
+				</foreach>
+				</ul>
+			</if>
+			<br />
+			<if test="isntLink:|:$data['state'] != 'link'">
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_startedby']}</strong> <span class='desc lighter blend_links'><if test="hasStarterId:|:$data['starter_id']">{parse template="userHoverCard" group="global" params="$data"}<else />{$data['starter']}</if></span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_posted']}</strong> <span class='desc lighter'>{parse date="$data['start_date']" format="short"}</span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_inforum']}</strong> <span class='desc lighter'><a href='{parse url="showforum={$data['forum']['id']}" template="showforum" seotitle="{$data['forum']['name_seo']}" base="public"}'>{$data['forum']['name']}</a></span>
+					</li>
+				</ul>
+			<else />
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_link_from']}</strong>
+						<span class='desc lighter'><a href='{parse url="showforum={$data['_toForum']['id']}" template="showforum" seotitle="{$data['_toForum']['name_seo']}" base="public"}'>{$data['_toForum']['name']}</a></span>
+					</li>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_link_to']}</strong>
+						<span class='desc lighter'><a href='{parse url="showforum={$data['forum']['id']}" template="showforum" seotitle="{$data['forum']['name_seo']}" base="public"}'>{$data['forum']['name']}</a></span>
+					</li>
+				</ul>
+			</if>
+			<if test="topicDeletedReason:|:$data['_isDeleted']">
+				<ul class='ipsList_inline'>
+					<li class='desc lighter'>
+						<strong>{$this->lang->words['dlt_topic_deletedby']}</strong> <span class='desc lighter blend_links'>{parse template="userHoverCard" group="global" params="$sdelete[ $data['tid'] ]"}</span>
+					</li>
+					<if test="showReason:|:$data['permissions']['SoftDeleteReason']">
+						<li class='desc lighter'>
+							<strong>{$this->lang->words['dlt_topic_reason']}</strong> <span class='desc lighter'>{$sdelete[ $data['tid'] ]['sdl_obj_reason']}<else />{$this->lang->words['tdb__noreasongi']}</span>
+						</li>
+					</if>
+				</span>
+			</if>
+		</td>
+		<td>
+			<if test="isntLink3:|:$data['state'] == 'link'">
+				<span class='desc'>{parse format_number="$data['posts']"} <if test="replylang:|:intval($data['posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if></span>
+			</if>
+		</td>
+		<td>
+			<ul class='ipsList_inline right'>
+				<if test="$type == 'deleted'">
+					<if test="isntLink4:|:$data['state'] == 'link'">
+						<if test="tidRestore:|:$data['permissions']['TopicSoftDeleteRestore']">
+							<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topic_restore&amp;t={$data['real_tid']}&amp;f={$data['_toForum']['id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['restore_topic_desc']}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['restore_topic']}</a></li>
+						</if>
+						<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $data['forum_id'] ]['delete_topic']">
+							<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=09&amp;t={$data['real_tid']}&amp;f={$data['_toForum']['id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['dlt_delete_topic']}' class='ipsButton_secondary ipsType_smaller important'>{$this->lang->words['perm_delete_topic']}</a></li>
+						</if>
+					<else />
+						<if test="topicIsHardDeleted:|:!$data['_isDeleted']">
+							<li>
+								<img data-tooltip="{$this->lang->words['hard_delete_warn_topic']}" src='{$this->settings['img_url']}/icon_timewarning.png' />
+							</li>
+						</if>
+						<if test="tidRestore:|:$data['permissions']['TopicSoftDeleteRestore']">
+							<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topic_restore&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['restore_topic_desc']}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['restore_topic']}</a></li>
+						</if>
+						<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $data['forum_id'] ]['delete_topic']">
+							<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=09&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:deleted" base="public"}' title='{$this->lang->words['dlt_delete_topic']}' class='ipsButton_secondary ipsType_smaller important'>{$this->lang->words['perm_delete_topic']}</a></li>
+						</if>
+					</if>
+				</if>
+				<if test="$type == 'unapproved'">
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topic_approve&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['modcp_approvelink']}</a>
+					</li>
+					<li>
+						<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=03&amp;t={$data['real_tid']}&amp;f={$data['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;return=modcp:unapproved" base="public"}' class='ipsButton_secondary ipsType_smaller important'>{$this->lang->words['modcp_deletelink']}</a>
+					</li>
+				</if>
+			</ul>
+		</td>
+	</tr>
+</foreach>]]></template_content>
+      <template_name>modCPtopic</template_name>
+      <template_data>$topics, $pagelinks, $type, $sdelete=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['modcp_page_title']}</h1>
+<br />
+<div class='ipsBox'>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='modcp_tabs'>
+			<ul class='clear'>
+				<li id='index' class='<if test="$_activeNav['primary'] == 'index' && $_activeNav['secondary'] == 'index'">active </if>tab_toggle'>
+					<a href='{parse url="app=core&amp;module=modcp" base="public"}'>{$this->lang->words['modcp_tab_index']}</a>
+				</li>
+				<if test="accessRC:|:IPSMember::isInGroup( $this->memberData, explode( ',', IPSText::cleanPermString( $this->settings['report_mod_group_access'] ) ) )">
+					<li id='reported_content' class='<if test="$_activeNav['primary'] == 'reported_content' && $_activeNav['secondary'] == 'reports'">active </if>tab_toggle'>
+						<a href='{parse url="app=core&amp;module=reports&amp;do=index" base="public"}'>{$this->lang->words['modcp_tab_reports']}</a>
+					</li>
+				</if>
+				<foreach loop="tabs:$tabs as $mainTabKey => $subTabs">
+					<li id='{$mainTabKey}' class='<if test="$_activeNav['primary'] == $mainTabKey">active </if>tab_toggle' data-tabid='{$mainTabKey}'>
+						<a href='{parse url="app=core&amp;module=modcp&amp;fromapp={$subTabs[0][1]}&amp;tab={$subTabs[0][0]}" base="public"}'>{$this->lang->words['modcp_mtab_' . $mainTabKey ]}</a>
+					</li>
+				</foreach>
+			</ul>
+		</div>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' id='modcp_content'>
+			<div class='ipsPad'>
+				{$output}
+			</div>
+		</div>
+	</div>
+</div>
+<script type='text/javascript'>
+	$("modcp_content").setStyle( { minHeight: $('modcp_tabs').measure('margin-box-height') + 5 + "px" } );
+</script>]]></template_content>
+      <template_name>portalPage</template_name>
+      <template_data>$output, $tabs=array(), $_activeNav=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<foreach loop="findTab:$this->templateVars['tabs'] as $mainTabKey => $subTabs">
+	<if test="isMainTab:|:$mainTabKey == $this->templateVars['activeNav']['primary']">
+		<if test="count( $subTabs ) > 1">
+			<div class='maintitle ipsFilterbar clear'>
+				<ul class='ipsList_inline'>									
+					<foreach loop="subTabs:$subTabs as $sub">
+						<li<if test="$this->templateVars['activeNav']['secondary'] == $sub[0]"> class='active'</if>>
+							<a href='{parse url="app=core&amp;module=modcp&amp;fromapp={$sub[1]}&amp;tab={$sub[0]}" base="public"}'>
+							{$this->lang->words['modcp_tab_' . $sub[0] ]}</a>
+						</li>
+					</foreach>
+				</ul>
+			</div>
+		</if>
+	</if>
+</foreach>]]></template_content>
+      <template_name>subTabLoop</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="topic"}
+<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+{parse template="include_lightbox" group="global" params=""}
+</if>
+<script type='text/javascript'>
+	ipb.topic.inSection	= 'topicview';
+</script>
+<style type='text/css'>
+	.post_mod { display: none; }
+</style>
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<if test="hasPosts:|:is_array( $posts ) AND count( $posts )">
+		<div id='ips_Posts2'>
+			<foreach loop="post_data:$posts as $post">
+				{parse template="modCPpost" group="modcp" params="$post, array(), $post, 'unapproved'"}
+			</foreach>
+		</div>
+	<else />
+		<div class='no_messages'>
+			{$this->lang->words['no_unapproved_posts']}
+		</div>
+	</if>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>unapprovedPosts</template_name>
+      <template_data>$posts, $pagelinks</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="forums"}
+<div>{$pagelinks}</div>
+{parse template="subTabLoop" group="modcp" params=""}
+<div class='clearfix'>
+	<table class='ipb_table topic_list' id='forum_table'>
+		<if test="hastopics:|:is_array( $topics ) AND count( $topics )">
+			{parse striping="forumTable" classes="row1,row2"}
+			{parse template="modCPtopic" group="modcp" params="$topics, $pagelinks, 'unapproved'"}
+		<else />
+			<tr> 
+				<td colspan='3' class='no_messages'>{$this->lang->words['no_unapproved_topics']}</td>
+			</tr>
+		</if>
+	</table>
+	<div>{$pagelinks}</div>
+</div>]]></template_content>
+      <template_name>unapprovedTopics</template_name>
+      <template_data>$topics, $pagelinks</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<form method="post" action="{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=save_note&amp;mid={$member['member_id']}" base="public"}" id='postingform'>
+	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+	<input type='hidden' name='popup' value='{$this->request['popup']}' />
+	<input type="hidden" name="_st" value="{$this->request['_st']}" />
+	<input type="hidden" name="t" value="{$this->request['t']}" />
+	<input type="hidden" name="pf" value="{$this->request['pf']}" />
+	<h2 class='maintitle'>{$this->lang->words['mod_warn_new_note']} <a href="{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}" title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+	<div class='generic_bar'></div>
+	<div class='post_form'>
+		<fieldset class='row1'>
+			<h3 class='bar'>{$this->lang->words['mod_warn_fieldset']}</h3>
+			<ul>
+				<li class='field'>
+					<textarea name='note' style='width: 95%; height:150px'>{$this->request['note']}</textarea>
+				</li>
+			</ul>
+		</fieldset>
+		<fieldset class='submit'>
+			<input type='submit' class='input_submit' value='{$this->lang->words['mod_warn_note_save']}' />
+		</fieldset>
+	</div>
+</form>]]></template_content>
+      <template_name>warn_add_note_form</template_name>
+      <template_data>$member</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[<if test="isAjaxModuleTitle:|:$this->request['module']=='ajax'">
+		<h3>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h3>
+	<else />
+		<h2 class='maintitle'>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+	</if>
+	<if test="isAjaxModuleDivStart:|:$this->request['module']=='ajax'">
+		<div class='fixed_inner'>
+	</if>
+		<table class='ipb_table'>
+			<tr class='header'>
+				<th scope='col'>{$this->lang->words['w_v_warnby']}</th>
+				<th scope='col'>{$this->lang->words['w_v_notes']}</th>
+			</tr>
+			<if test="warnlogentries:|:!is_array($rows) OR !count($rows)">
+				<tr>
+					<td class="no_messages" colspan="2">{$this->lang->words['w_v_none']}</td>
+				</tr>
+			<else />
+				{parse striping="modlog" classes="row2,row1"}
+				<foreach loop="logs:$rows as $r">
+					<tr class='{parse striping="modlog"}'>
+						<td><a href='{parse url="showuser={$r['punisher_id']}" base="public" seotitle="{$r['members_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['punisher_name']}</strong></a></td>
+						<td>{$this->lang->words['mod_warn_added']} <strong>{parse date="$r['wlog_date']" format="long" relative="false"}</strong></td>
+					</tr>
+					<tr class='{parse striping="modlog"}'>
+						<td>
+							<span class="<if test="warnlognote:|:$r['wlog_type'] == 'note' OR $r['wlog_type'] == 'pos'">positive<else />negative</if>" <if test="warnlogcolor:|:$r['wlog_type'] == 'note' || $r['wlog_type'] == 'nochan' || $r['wlog_type'] == 'custom'">style='color:gray'</if>>
+								<if test="warnlognotetype:|:$r['wlog_type'] == 'note'">
+									{$this->lang->words['mod_warn_note']}
+								<else />
+									<if test="warnlogpos:|:$r['wlog_type'] == 'pos'">
+										{$this->lang->words['w_v_minus']}
+									</if>
+									<if test="warnlogneg:|:$r['wlog_type'] == 'neg'">
+										{$this->lang->words['w_v_add']}
+									</if>
+									<if test="warnlognochange:|:$r['wlog_type'] == 'nochan'">
+										{$this->lang->words['w_v_nochan']}
+									</if>
+									<if test="warnlogcustchange:|:$r['wlog_type'] == 'custom'">
+										{$this->lang->words['w_v_custom']}
+									</if>
+								</if>
+							</span>
+						</td>
+						<td>{$r['content']}</td>
+					</tr>
+				</foreach>
+			</if>
+		</table>
+		<div class='ipsPad'>
+			{$links}
+		</div>
+	<if test="isAjaxModuleDivEnd:|:$this->request['module']=='ajax'">
+		</div>
+		<div class='ipsForm_submit ipsForm_right'>
+			<a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;_tab=warn" base="public"}' class='ipsButton'><img src='{$this->settings['img_url']}/moderation_cog.png' /> &nbsp;{$this->lang->words['alter_warn_level']}</a>
+		</div>
+	</if>]]></template_content>
+      <template_name>warn_view_log</template_name>
+      <template_data><![CDATA[$member, $rows, $links='']]></template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_modcp</template_group>
+      <template_content><![CDATA[{parse js_module="profile"}
+<script type='text/javascript'>
+	ipb.profile.viewingProfile = {$member['member_id']};
+</script>
+<if test="warnerrors:|:$errors">
+	<h2>{$this->lang->words['errors_found']}</h2>
+	<p class='message error'>{$errors}</p>
+	<br />
+</if>
+<form method="post" action='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=dowarn&amp;mid={$member['member_id']}" base="public"}' id='postingform'>
+<input type="hidden" name="key" value="{$this->member->form_hash}" />
+<input type="hidden" name="type" value="{$this->request['type']}" />
+<input type="hidden" name="_st" value="{$this->request['_st']}" />
+<input type="hidden" name="t" value="{$this->request['t']}" />
+<input type="hidden" name="pf" value="{$this->request['pf']}" />
+<div class='post_form'>
+<h2 class='maintitle'>{$this->lang->words['warn_logs_for']} <a href='{parse url="showuser={$member['member_id']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
+<div class='generic_bar'></div>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_member_details']}</h3>
+	<h4>
+		<img class="ipsUserPhoto ipsUserPhoto_large" src='{$member['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" />
+	</h4>
+	<ul>
+		<li class='field'>
+			{parse replacement="find_topics_link"} <a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}'>{$this->lang->words['gbl_find_my_content']}</a>
+		</li>
+		<if test="displaynamehistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
+			<li class='field' id='dname_history'>
+				{parse replacement="display_name"} <a href='{parse url="app=members&amp;module=profile&amp;section=dname&amp;id={$member['member_id']}" base="public"}' title='{$this->lang->words['view_dname_history']}'>{$this->lang->words['display_history']}</a>
+			</li>
+		</if>
+		<if test="warnreputation:|:$this->settings['reputation_enabled']">
+			<li class='field'>
+				<if test="RepPositive:|:$member['pp_reputation_points'] > 0">
+					<div class='reputation positive' style='min-width: 150px; text-align: center'>
+				</if>
+				<if test="RepNegative:|:$member['pp_reputation_points'] < 0">
+					<div class='reputation negative' style='min-width: 150px; text-align: center'>
+				</if>
+				<if test="RepZero:|:$member['pp_reputation_points'] == 0">
+					<div class='reputation zero' style='min-width: 150px; text-align: center'>
+				</if>
+					<span class='number'>{$member['pp_reputation_points']}</span>
+					<if test="reptext:|:$member['author_reputation'] && $member['author_reputation']['text']">
+						<p class='title'>{$member['author_reputation']['text']}</p>
+					</if>
+					<if test="repimage:|:$member['author_reputation'] && $member['author_reputation']['image']">
+						<p class='image'>{$member['author_reputation']['image']}</p>
+					</if>
+				</div>
+			</li>
+		</if>
+	</ul>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_details']}</h3>
+	<h4>{$this->lang->words['w_adjust_level']}<br /><span class='desc'>{$this->lang->words['warn_current_level']} {$member['warn_level']}/{$this->settings['warn_max']}</span></h4>
+	<ul>
+		<li class='field checkbox'>
+			<input type="radio" name="level" id="nochange" class="input_radio" value="nochange" <if test="warnnochange:|:$this->request['type'] == 'nochange' OR !$this->request['type']">checked='checked'</if> />
+			<label for='nochange'>{$this->lang->words['w_nochange']}</label>
+		</li>
+		<li class='field checkbox negative'>
+			<input type="radio" name="level" id="add" class="input_radio" value="add" <if test="addwarn:|:$this->request['type'] == 'add'">checked='checked'</if> />
+			<label for='add'>{$this->lang->words['w_add']}</label>
+		</li>
+		<li class='field checkbox positive'>
+			<input type="radio" name="level" id="minus" class="input_radio" value="remove" <if test="subwarn:|:$this->request['type'] == 'minus'">checked='checked'</if> />
+			<label for='minus'>{$this->lang->words['w_remove']}</label>
+		</li>	
+		<if test="warnsupermod:|:$this->memberData['g_is_supmod']">
+			<li class='field checkbox custom'>
+				<input type="radio" name="level" id="custom" class="input_radio" value="custom" <if test="warncustom:|:$this->request['type'] == 'custom'">checked='checked'</if> />
+				<label for='level_custom'>{parse expression="sprintf( $this->lang->words['w_change_custom'], $this->settings['warn_max'])"}</label>
+				 <input type='text' id='level_custom' name='level_custom' value='<if test="warncustomlevel:|:isset($this->request['customLevel'])">{$this->request['customLevel']}<else />{$member['warn_level']}</if>' size='3' />
+			</li>
+		</if>
+	</ul>
+	<h4>{$this->lang->words['w_reason']}<br /><span class='desc'>{$this->lang->words['w_reason2']}</span></h4>
+	<ul>
+		<li class='field'>
+			<textarea rows="6" cols="50" class="input_text" name="reason">{IPSText::br2nl( $this->request['reason'] )}</textarea>
+		</li>
+	</ul>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['member_suspension']}</h3>
+	<if test="modqueue:|:$modque == true">
+		<php>
+			$mod_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
+			$mhours		= 0;
+			
+			if( $member['mod_posts'] > 0 AND $member['mod_posts'] != 1 )
+			{
+				$mod_arr	= IPSMember::processBanEntry( $member['mod_posts'] );
+				
+				if( $mod_arr['date_end'] > time() )
+				{
+					$mhours		= ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_modq']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='modq' type="checkbox" name="mod_indef" value="1" <if test="modqueueposts:|:$member['mod_posts'] == 1">checked='checked'</if> />
+				<label for='modq'>{$this->lang->words['w_modq_i']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='mod_value'>{$this->lang->words['w_orfor']}</label>
+				<input class='input_text' type="text" id='mod_value' name="mod_value" value="<if test="modqueuehours:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) ) and $timespan = ($mhours / 24)">{$timespan}<else />{$mhours}</if>" size="5" />&nbsp;
+				<select name="mod_unit" class='input_select'>
+					<option value="d" <if test="modunitd:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="modunith:|:$mhours < 24 or ( ($mhours / 24) != ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="modqueueon:|:$mhours > 0">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+	<if test="postqueue:|:$postque == true">
+		<php>
+			$post_arr	= array( 'timespan' => 0, 'hours' => 0, 'days' => 0 );
+			$phours		= 0;
+			
+			if( $member['restrict_post'] > 0 AND $member['restrict_post'] != 1 )
+			{
+				$post_arr	= IPSMember::processBanEntry( $member['restrict_post'] );
+				
+				if( $post_arr['date_end'] > time() )
+				{
+					$phours		= ceil( ( $post_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_resposts']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='restrict_posts' type="checkbox" name="post_indef" value="1" <if test="postqueueposts:|:$member['restrict_post'] == 1">checked='checked'</if> />
+				<label for='restrict_posts'>{$this->lang->words['w_resposts_i']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='post_value'>{$this->lang->words['w_orfor']}</label>
+				<input class='input_text' type="text" id='post_value' name="post_value" value="<if test="postqueuehours:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) ) and $timespan = ($phours / 24)">{$timespan}<else />{$phours}</if>" size="5" />&nbsp;
+				<select name="post_unit" class='input_select'>
+					<option value="d" <if test="postunitd:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="postunith:|:$phours < 24 or ( ($phours / 24) != ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="postqueueon:|:$phours > 0">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+	<if test="banqueue:|:$ban == true">
+		<php>
+			$ban_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
+			$hours		= 0;
+			
+			if( $member['temp_ban'] AND $member['temp_ban'] != 1 )
+			{
+				$ban_arr	= IPSMember::processBanEntry( $member['temp_ban'] );
+				
+				if( $ban_arr['date_end'] > time() )
+				{
+					$hours		= ceil( ( $ban_arr['date_end'] - time() ) / 3600 );
+				}
+			}
+		</php>
+		<h4>{$this->lang->words['w_suspend']}</h4>
+		<ul>
+			<li class='field checkbox'>
+				<input class='input_check' id='suspend_member' type="checkbox" name="ban_indef" value="1" <if test="bannedison:|:$member['member_banned'] == 1">checked='checked'</if> />
+				<label for='suspend_member'>{$this->lang->words['w_ban_indef']}</label>
+			</li>
+			<li class='field checkbox'>
+				<label for='susp_value'>{$this->lang->words['w_suspend_or']}</label>
+				<input type="text" id='susp_value' class='input_text' name="susp_value" value="<if test="bannedhours:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) ) and $timespan = ($hours / 24)">{$timespan}<else />{$hours}</if>" size="5" />
+				<select name="susp_unit" class='input_select'>
+					<option value="d" <if test="banunitd:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
+					<option value="h" <if test="banunith:|:$hours < 24 or ( ($hours / 24) != ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
+				</select>
+				<if test="banon:|:$member['temp_ban']">
+					<span class='desc'>{$this->lang->words['w_restricted']}</span>
+				</if>
+			</li>
+		</ul>
+	</if>
+</fieldset>
+<fieldset class='with_subhead'>
+	<h3 class='bar'>{$this->lang->words['warn_mem_content']}</h3>
+	<h4>{$this->lang->words['warn_posts_topics']}</h4>
+	<ul>
+		<li class='field checkbox'>
+			<select name="topicPosts_type" class='input_select'>
+				<option value='unapprove' <if test="unapproveposts:|:$this->request['topicPosts_type'] == 'unapprove'">selected='selected'</if>>{$this->lang->words['warn_stuff_unapprove']}</option>
+				<option value='approve' <if test="approveposts:|:$this->request['topicPosts_type'] == 'approve'">selected='selected'</if>>{$this->lang->words['warn_stuff_approve']}</option>
+			</select>
+		</li>
+		<li class='field checkbox'>
+			<input type="checkbox" id='topicPosts_topics' class='input_check' name="topicPosts_topics" value="1" />
+			<label for='topicPosts_topics'>{$this->lang->words['warn_stuff_alltopics']}</label>
+		</li>
+		<li class='field checkbox'>
+			<input type="checkbox" id='topicPosts_replies' class='input_check' name="topicPosts_replies" value="1" />
+			<label for='topicPosts_replies'>{$this->lang->words['warn_stuff_allposts']}</label>
+		</li>
+		<li class='field checkbox'>
+			<label for='topicPosts_lastx'>{$this->lang->words['warn_stuff_datecutoff']}</label>
+			<input type="text" id='topicPosts_lastx' class='input_text' name="topicPosts_lastx" value="" size="5" />
+			<select name="topicPosts_lastxunits" class='input_select'>
+				<option value="d">{$this->lang->words['w_day']}</option>
+				<option value="h">{$this->lang->words['w_hour']}</option>
+			</select>
+		</li>
+	</ul>
+</fieldset>
+<fieldset>
+	<h3 class='bar'>{$this->lang->words['warn_contact_member']}</h3>
+	<ul>
+		<li class='field'>
+			<label for='subj'>{$this->lang->words['w_c_subj']}</label>
+			<input id='subj' class='input_text' type="text" name="subject" value="{$this->request['subject']}" size="30" />
+		</li>
+		<li class='field'>
+			<label for='method'>{$this->lang->words['w_c']}</label>
+			<select id='method' name="contactmethod" class='input_select'>
+				<if test="disablepm:|:$member['members_disable_pm'] != 1">
+					<option value="pm">{$this->lang->words['w_c_p']}</option>
+				</if>
+				<option value="email">{$this->lang->words['w_c_e']}</option>
+			</select>
+		</li>
+		<li>
+			{$editor_html}
+		</li>
+	</ul>
+</fieldset>
+<fieldset class='submit'>
+	<input type="submit" class='input_submit' value="{$this->lang->words['w_submit']}" tabindex='0'/>
+</fieldset>
+	
+</div>
+</form>]]></template_content>
+      <template_name>warnForm</template_name>
+      <template_data><![CDATA[$member, $errors='', $modque=false, $postque=false, $ban=false, $editor_html='']]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2467,141 +5054,219 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
 	ipb.register.inSection	   = "completeReg";
 	ipb.register.nameMaxLength = "{$this->settings['max_user_name_length']}";
 	ipb.register.allowedChars  = "{$this->settings['username_characters']}";
-	ipb.register.memberPartial = parseInt('$mid');
+	ipb.register.memberPartial = parseInt('{$mid}');
 	ipb.templates['accept']    = "&nbsp;<span id='[id]_msg' class='reg_msg reg_accept' style='display: none'><img src='{$this->settings['img_url']}/accept.png' alt='' /> [msg]</span>";
 	ipb.templates['error']     = "&nbsp;<span id='[id]_msg' class='reg_msg reg_error' style='display: none'><img src='{$this->settings['img_url']}/exclamation.png' alt='' /> [msg]</span>";
 //|#^#]>
 </script>
-<if test="partialLoginErrors:|:isset( $errors ) && $errors">
-	<p class='message error'>
-		<strong>{$this->lang->words['errors_found']}</strong>
-		{$errors}
-	</p>
+<div id='register_form'>	
+	<h1 class='ipsType_pagetitle'><if test="hasAName:|:$this->request['members_display_name'] OR $userFromService['_name']">{parse expression="sprintf($this->lang->words['connect_sub'], $userFromService['_name'] ? IPSText::utf8ToEntities( $userFromService['_name'] ) : $this->request['members_display_name'])"}<else />{$this->lang->words['connect_sub2']}</if></h1>
 	<br />
-</if>
-<form action="{parse url="app=core&amp;module=global&amp;section=register&amp;do=complete_login_do&amp;key=$key&amp;mid=$mid" base="public"}" method="POST">
-	<input type="hidden" name="termsread" value="1" />
-	<input type="hidden" name="agree_to_terms" value="1" />
-	
-	<h2>{$this->lang->words['clogin_title']}</h2>
-	
 	<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )">
 		<input type='hidden' name='connectService' value='{$userFromService['service']}' />
-		<div class='general_box' id='facebookComplete'>
-			<img src="{$userFromService['_pic']}" class='userpic' />
+		<div id='facebookComplete' class='clearfix'>
+			<img src="{$userFromService['_pic']}" class='ipsUserPhoto ipsUserPhoto_medium left' />
 			<img src="{$userFromService['_sImage']}" class='servicepic' />
-			<p>
-				{parse expression="sprintf($this->lang->words['connect_sub'], ucfirst($userFromService['_name']))"}
-				<br />
+			<p class='ipsBox_withphoto'>
 				{parse expression="sprintf($this->lang->words['connect_sub_desc'], ucfirst($userFromService['service']))"}
 				<br />
-				<span class='desc'>{parse expression="sprintf($this->lang->words['connect_desc'], ucfirst($userFromService['service']))"}</span>
+				{parse expression="sprintf($this->lang->words['connect_desc'], ucfirst($userFromService['service']))"}
 			</p>
 		</div>
 	<else />
 		<p class='message'>{$this->lang->words['clogin_text']}</p>
 	</if>
-	
 	<br />
-	<div class='general_box<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )"> completeLeft</if>'>
-		<h3 class='bar'>{$this->lang->words['new_account_title']}</h3>
-		<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )"><span class='desc'>{$this->lang->words['new_account_desc']}</span></if>
-		<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )"><div class='completeInner'></if>
-		<fieldset class='main'>
-		<if test="partialAllowDnames:|:$this->settings['auth_allow_dnames'] == 1">
-			<ul>
-				<li class='field'>
-					<if test="fbDisplayName:|:$userFromService['service'] == 'facebook' AND $this->settings['fb_realname'] != 'any' AND $userFromService['_displayName']">
-						<if test="fbDNInner:|:$this->settings['fb_realname'] == 'prefilled'">
-							<label for='display_name'>{$this->lang->words['dname_name']}</label>
-							<input id='display_name' class='input_text'  type="text" size="25" maxlength="64" value="{$userFromService['_displayName']}" name="members_display_name" />
-						<else />
-							<strong>{$userFromService['_displayName']}</strong>
-							<input type="hidden" value="{$userFromService['_displayName']}" name="members_display_name" />
-						</if>
-					<else />
-						<label for='display_name'>{$this->lang->words['dname_name']}</label>
-						<input id='display_name' class='input_text'  type="text" size="25" maxlength="64" value="{$this->request['members_display_name']}" name="members_display_name" />
-					</if>
-				</li>
-			</ul>
-		</if>
-		<if test="partialNoEmail:|:! $reg['partial_email_ok']">
-			<ul>
-				<li class='field'>
-					<label for='email_1'>{$this->lang->words['email_address']}</label>
-					<input id='email_1' class='input_text'  type="text" size="25" maxlength="50" value="{$this->request['EmailAddress']}" name="EmailAddress" />
-				</li>
-				<li class='field'>
-					<label for='email_2'>{$this->lang->words['email_address_confirm']}</label>
-					<input id='email_2' class='input_text'  type="text" size="25" maxlength="50"  value="{$this->request['EmailAddress_two']}" name="EmailAddress_two" />
-				</li>
-			</ul>
-		</if>
-		<if test="partialCustomFields:|:$custom_fields != ''">
-			<fieldset class='rcomplete'>
-			<ul>
-			<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
-				<foreach loop="custom_required:$custom_fields['required'] as $_field">
-					<if test="reqCfieldDesc:|:$_field['desc'] == ''">
-						<li class='field nodesc required {$_field['type']}'>
-					<else />
-						<li class='field required {$_field['type']}'>
-					</if>
-							<label for='cprofile_{$_field['id']}'>{$_field['name']}</label>
-							{$_field['field']}
-							<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
-						</li>
-				</foreach>
-			</if>
-			
-			<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
-				<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
-					<if test="optCfieldDesc:|:$_field['desc'] == ''">
-						<li class='field nodesc optional {$_field['type']}'>
-					<else />
-						<li class='field optional {$_field['type']}'>
-					</if>
-							<label for='cprofile_{$_field['id']}'>{$_field['name']}</label>
-							{$_field['field']}
-							<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
-						</li>
-				</foreach>
-			</if>
-			</ul>
-			</fieldset>
-		</if>
-		</fieldset>
-		<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )"></div></if>
-		<fieldset class='submit'>
-			<input type='submit' value='{$this->lang->words['new_account_submit']}' class='input_submit' />
-		</fieldset>
+	<if test="partialLoginErrors:|:!empty( $errors )">
+		<p class='message error'>
+			<strong>{$this->lang->words['errors_found']}</strong>
+			{$errors}
+		</p>
+		<br />
+	</if>
+	<div id='connect_choose'>
+		<h2 class='ipsType_subtitle'>{parse expression="sprintf( $this->lang->words['already_have_account'], $this->settings['board_name'] )"}</h2>
+		<div class='ipsBox' style='margin-top: 5px'>
+			<div class='ipsBox_container ipsPad' style='text-align: center'>
+				<a href='#connect_new' class='ipsButton' id='choose_new'>{$this->lang->words['need_to_create_acc']}</a>&nbsp;&nbsp;&nbsp;
+				<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )">
+					<a href='#connect_existing' id='choose_existing'>{$this->lang->words['use_an_existing_acc']}</a>
+				</if>
+			</div>
+		</div>
+	</div>
+	<div id='connect_new'>
+		<br />
+		<h2 class='maintitle'>{$this->lang->words['new_account_title']}</h2>
+		<div class='ipsBox'>
+			<div class='ipsBox_container <if test="count( $userFromService ) AND ! empty( $userFromService['service'] )"> completeLeft</if>'>
+				<form action="{parse url="app=core&amp;module=global&amp;section=register&amp;do=complete_login_do&amp;key=$key&amp;mid=$mid&amp;connectService={$userFromService['service']}" base="public"}" method="POST">
+					<input type="hidden" name="termsread" value="1" />
+					<input type="hidden" name="agree_to_terms" value="1" />
+					<input type='hidden' name='from' value='new' />
+					<fieldset class='main'>
+						<ul class='ipsForm ipsForm_horizontal ipsPad'>
+							<if test="partialAllowDnames:|:$this->settings['auth_allow_dnames'] == 1">
+								<li class='ipsField clear'>
+									<if test="fbDisplayName:|:$userFromService['service'] == 'facebook' AND $this->settings['fb_realname'] != 'any' AND $userFromService['_displayName']">
+										<if test="fbDNInner:|:$this->settings['fb_realname'] == 'prefilled'">
+											<label for='display_name' class='ipsField_title'>{$this->lang->words['dname_name']}</label>
+											<p class='ipsField_content'>
+												<input id='display_name' class='input_text'  type="text" size="40" maxlength="64" value="{$userFromService['_displayName']}" name="members_display_name" />
+											</p>
+										<else />
+											<span class='ipsField_title'></span>
+											<p class='ipsField_content'><strong>{IPSText::utf8ToEntities( $userFromService['_displayName'] )}</strong></p>
+											<input type="hidden" value="{$userFromService['_displayName']}" name="members_display_name" />
+										</if>
+									<else />
+										<label for='display_name' class='ipsField_title'>{$this->lang->words['dname_name']}</label>
+										<p class='ipsField_content'>
+											<input id='display_name' class='input_text'  type="text" size="40" maxlength="64" value="{$this->request['members_display_name']}" name="members_display_name" />
+										</p>
+									</if>
+								</li>
+							</if>
+							<if test="partialNoEmail:|:! $reg['partial_email_ok']">
+								<li class='ipsField clear'>
+									<label for='email_1' class='ipsField_title'>{$this->lang->words['email_address']}</label>
+									<p class='ipsField_content'>
+										<input id='email_1' class='input_text'  type="text" size="40" maxlength="50" value="{$this->request['EmailAddress']}" name="EmailAddress" />
+									</p>
+								</li>
+								<li class='ipsField clear'>
+									<label for='email_2' class='ipsField_title'>{$this->lang->words['email_address_confirm']}</label>
+									<p class='ipsField_content'>
+										<input id='email_2' class='input_text'  type="text" size="40" maxlength="50"  value="{$this->request['EmailAddress_two']}" name="EmailAddress_two" />
+									</p>
+								</li>
+							</if>
+							<if test="partialCustomFields:|:$custom_fields != ''">
+								<fieldset class='rcomplete'>
+								<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
+									<foreach loop="custom_required:$custom_fields['required'] as $_field">
+										<li class='ipsField clear {$_field['type']}'>
+											<label for='cprofile_{$_field['id']}' class='ipsField_title'>{$_field['name']} <span class='ipsForm_required'>*</span></label>
+											<div class='ipsField_content'>
+												{$_field['field']}
+												<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
+											</div>
+										</li>
+									</foreach>
+								</if>
+	
+								<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
+									<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
+										<li class='ipsField clear {$_field['type']}'>
+											<label for='cprofile_{$_field['id']}' class='ipsField_title'>{$_field['name']}</label>
+											<div class='ipsField_content'>
+												{$_field['field']}
+												<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
+											</div>
+										</li>
+									</foreach>
+								</if>
+								</fieldset>
+							</if>
+						</ul>
+					</fieldset>
+					<fieldset class='submit'>
+						<input type='submit' value='{$this->lang->words['new_account_submit']}' class='input_submit' />
+					</fieldset>
+				</form>
+			</div>
+		</div>
 	</div>
 	<if test="count( $userFromService ) AND ! empty( $userFromService['service'] )">
-		<div class='general_box completeRight'>
-			<h3 class='bar'>{$this->lang->words['connect_account_title']}</h3>
-			<span class='desc'>{$this->lang->words['connect_account_desc']}</span>
-			<fieldset class='main'>
-				<ul>
-					<li class='field'>
-						<label for='login_user'>{$this->lang->words['connect_username']}</label>
-						<input id='login_user' class='input_text' type="text" size="25" maxlength="50" value="{$this->request['login_user']}" name="login_user" />
-					</li>
-					<li class='field'>
-						<label for='login_pass'>{$this->lang->words['connect_password']}</label>
-						<input id='login_pass' class='input_text' type="password" size="25" maxlength="50"  value="" name="login_pass" />
-					</li>
-				</ul>
-			</fieldset>
-			<fieldset class='submit'>
-			<input type='submit' value='{$this->lang->words['connect_account_submit']}' class='input_submit' />
-		</fieldset>
+		<br />
+		<div id='connect_existing'>
+			<h2 class='maintitle'>{$this->lang->words['connect_account_title']}</h2>
+			<div class='ipsBox'>
+				<div class='ipsBox_container'>
+					<form action="{parse url="app=core&amp;module=global&amp;section=register&amp;do=complete_login_do&amp;key={$key}&amp;mid={$mid}&amp;connectService={$userFromService['service']}" base="public"}" method="POST">
+						<input type="hidden" name="termsread" value="1" />
+						<input type="hidden" name="agree_to_terms" value="1" />
+						<input type='hidden' name="from" value="existing" />
+						<fieldset class='ipsPad_double'>
+							<ul class='ipsForm ipsForm_horizontal'>
+								<li class='ipsField clear'>
+									<label for='login_user' class='ipsField_title'>{$this->lang->words['connect_username']}</label>
+									<div class='ipsField_content'>
+										<input id='login_user' class='input_text' type="text" size="50" maxlength="50" value="{$this->request['login_user']}" name="login_user" /><br />
+										<span class='desc'>{$this->lang->words['connect_username_desc']}</span> 
+									</div>
+								</li>
+								<li class='ipsField clear'>
+									<label for='login_pass' class='ipsField_title'>{$this->lang->words['connect_password']}</label>
+									<div class='ipsField_content'>
+										<input id='login_pass' class='input_text' type="password" size="50" maxlength="50"  value="" name="login_pass" /><br />
+										<span class='desc'>{$this->lang->words['connect_password_desc']}</span>
+									</div>
+								</li>
+							</ul>
+						</fieldset>
+						<fieldset class='submit'>
+							<input type='submit' value='{$this->lang->words['connect_account_submit']}' class='input_submit' />
+						</fieldset>
+					</form>
+				</div>
+			</div>
 		</div>
 	</if>
-</form>]]></template_content>
+</div>
+<script type='text/javascript'>
+	<if test="$this->request['from']">
+		ipb.vars['register_active'] = "{$this->request['from']}";
+	</if>
+	
+	function setUpSignin(){
+		if( !$('connect_existing') ){
+			$('connect_choose').hide();
+			return;
+		}
+		
+		if( !Object.isUndefined( ipb.vars['register_active'] ) ){
+			if( ipb.vars['register_active'] == 'new' ){
+				$('connect_new').show();
+				$('connect_existing').hide();
+			} else {
+				$('connect_existing').show();
+				$('connect_new').hide();
+			}
+		} else {
+			$('connect_new').hide();
+			$('connect_existing').hide();
+		}
+		
+		$('choose_new').observe('click', toggleSignIn);
+		$('choose_existing').observe('click', toggleSignIn);
+	}
+	
+	function toggleSignIn(e){
+		Event.stop(e);
+		var toggleTo = Event.findElement(e, 'a');
+		if( !toggleTo ){ return; }
+		
+		if( toggleTo == $('choose_new') ){
+			if( !$('connect_new').visible() ){
+				$('connect_existing').fade( { duration: 0.3, afterFinish: function(){
+					$('connect_new').appear( { duration: 0.2 } );
+				} } );
+			}
+		} else {
+			if( !$('connect_existing').visible() ){
+				$('connect_new').fade( { duration: 0.3, afterFinish: function(){
+					$('connect_existing').appear({ duration: 0.2});
+				}});
+			}
+		}
+	}
+	
+	setUpSignin();
+</script>]]></template_content>
       <template_name>completePartialLogin</template_name>
       <template_data><![CDATA[$mid="",$key="",$custom_fields="",$errors="", $reg="", $userFromService=array()]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2609,35 +5274,42 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['lost_pass_form']}</h2>
-<if test="lostPasswordErrors:|:isset( $errors ) && $errors">
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['lost_pass_form']}</h1>
+<div class='ipsType_pagedesc'>
+	{$this->lang->words['lost_your_password']} {$this->lang->words['lp_text']}
+</div>
+<br />
+<if test="lostPasswordErrors:|:!empty( $errors )">
 	<p class='message error'>
 		<strong>{$this->lang->words['errors_found']}</strong><br />
 		{$errors}
 	</p>
+	<br />
 </if>
-<p class='message unspecific'>
-	{$this->lang->words['lost_your_password']}
-	{$this->lang->words['lp_text']}
-</p>
+
 <form action="{parse url="app=core&module=global&section=lostpass" base="public"}" method="post">
 <input type="hidden" name="do" value="11" />
-<div class='generic_bar'></div>
-<div id='lost_pass_form' class='post_form'>
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['recover_password']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='member_name'>{$this->lang->words['lp_user_name']}</label>
-				<input type="text" size="32" name="member_name" id='member_name' class='input_text' />
-			</li>
-			<li class='field'>
-				<label for='email_addy'>{$this->lang->words['lp_email_or']}</label>
-				<input type="text" size="32" name="email_addy" id='email_addy' class='input_text' />
-			</li>
-		</ul>
-	</fieldset>
-	<!--{REG.ANTISPAM}-->
+<h2 class='maintitle'>{$this->lang->words['recover_password']}</h2>
+<div id='lost_pass_form' class='ipsBox'>
+	<div class='ipsBox_container ipsPad_double'>
+		<fieldset>
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField clear'>
+					<label for='member_name' class='ipsField_title'>{$this->lang->words['lp_user_name']}</label>
+					<p class='ipsField_content'>
+						<input type="text" size="32" name="member_name" id='member_name' class='input_text' />
+					</p>
+				</li>
+				<li class='ipsField clear'>
+					<label for='email_addy' class='ipsField_title'>{$this->lang->words['lp_email_or']}</label>
+					<p class='ipsField_content'>
+						<input type="text" size="32" name="email_addy" id='email_addy' class='input_text' />
+					</p>
+				</li>
+			</ul>
+		</fieldset>
+		<!--{REG.ANTISPAM}-->
+	</div>
 	<fieldset class='submit'>
 			<input class='input_submit' type="submit" value="{$this->lang->words['lp_send']}" /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
 	</fieldset>
@@ -2645,7 +5317,7 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
 </form>]]></template_content>
       <template_name>lostPasswordForm</template_name>
       <template_data><![CDATA[$errors=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2653,13 +5325,14 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['lpf_title']}</h2>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['lpf_title']}</h1>
+<br />
 <p class='message'>
 	{$this->lang->words['lpass_text']}
 </p>]]></template_content>
       <template_name>lostPasswordWait</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2765,7 +5438,7 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
 </html>]]></template_content>
       <template_name>registerCoppaForm</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2773,63 +5446,83 @@ document.observe("dom:loaded", function(e){ ipb.signin.toggleLive(e); });
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[{parse js_module="register"}
-<!--<script type="text/javascript" src="{$this->settings['public_dir']}js/ipb_register.js"></script>-->
-<script type="text/javascript">
-//<!#^#|CDATA|
-var coppa_bounce = '{$this->lang->words['coppa_bounce']}';
-//coppa_check();
-//|#^#]>
-</script>
-<script type="text/javascript">
-function contact_admin() {
-  // Very basic spam bot stopper
-  <php>
-  	$adminEmail = explode( '@', $this->settings['email_in'] );
-  </php>
-  admin_email_one = '{$adminEmail[0]}';
-  admin_email_two = '{$adminEmail[1]}';
-  window.location = 'mailto:'+admin_email_one+'@'+admin_email_two+'?subject={$this->lang->words['coppa_email_subject']}';
-}
-</script>
-<h2>{$this->lang->words['register']}</h2>
-<p class='message unspecific'>
-	{$this->lang->words['coppa_form_text']}
-</p>
-<form action='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_two" base="public"}' method='post'>
-	<div class='post_form'>
-		<fieldset class='general_box'>
-			<h3>{$this->lang->words['coppa_info']}</h3>
-				<label for='month'>{$this->lang->words['coppa_link']}</label>
-				<select name='m' class='input_select'>
-				 	<option value='0'>{$this->lang->words['select_month']}</option>
-			 		<foreach loop="months:array(1,2,3,4,5,6,7,8,9,10,11,12) as $month">
-			 			<option value='{$month}'>{$this->lang->words['M_' . $month ]}</option>
-			 		</foreach>
-				</select>
+      <template_content><![CDATA[<if test="useCoppa:|:$this->settings['use_coppa'] && (!$this->request['coppa'] && !IPSCookie::get('coppa'))">
+<div class='post_form' id='coppa_form'>
+	<fieldset class='general_box'>
+		<h3>{$this->lang->words['coppa_info']}</h3>
+		<div class='ipsPad'>
+			{$this->lang->words['confirm_over_thirteen']}
+		</div>
+		<div class='ipsPad ipsForm_center'>
+			<form>
+			<select name='month' id='coppa_bday_m'>
+				<foreach loop="coppaMRange:$this->lang->words as $k => $v">
+					<if test="isMKey:|:strpos( $k, 'M_' ) === 0">
+						<option value='{parse expression="str_replace( 'M_', '', $k )"}'>{$v}</option>
+					</if>
+				</foreach>
+			</select>
+			&nbsp;
+			<select name='day' id='coppa_bday_d'>
+				<foreach loop="coppaDRange:range( 1, 31 ) as $_day">
+					<option value='{$_day}'>{$_day}</option>
+				</foreach>
+			</select>
+			&nbsp;
+			<select name='year' id='coppa_bday_y'>
+				<foreach loop="coppaYRange:array_reverse( range( date('Y') - 110, date('Y') ) ) as $_year">
+					<option value='{$_year}'>{$_year}</option>
+				</foreach>
+			</select>
+			</form>
+		</div>
+	</fieldset>
+	<fieldset class='ipsForm_submit ipsForm_right'>
+		<a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_two&amp;coppa=1" base="public"}' id='confirm_coppa' class='ipsButton'>{$this->lang->words['coppa_continue_button']}</a>
+	</fieldset>
+</div>
+<script type='text/javascript'>
+	$('coppa_form').hide();
 	
-				<select name='d' class='input_select'>
-			 		<option value='0'>{$this->lang->words['select_day']}</option>
-			 		<foreach loop="days:range(1,31) as $day">
-			 			<option value='{$day}'>{$day}</option>
-			 		</foreach>
-				</select>
+	function validateDate( popup )
+	{
+		var day		= parseInt($('coppa_bday_d').value);
+		var month	= parseInt($('coppa_bday_m').value);
+		var year	= parseInt($('coppa_bday_y').value);
+		var compare		= Math.round( new Date( year + 13, month, day ).getTime() / 1000 );
+		var today		= Math.round( new Date().getTime() / 1000 );
+		if ( (today - compare) < 0 )
+		{
+			window.location = ipb.vars['base_url'] + "app=core&module=global&section=register&do=coppa_two";
+		}
+		else
+		{
+			popup.hide();
+			ipb.Cookie.set('coppa', 'no', true);
+		}
+	}
 	
-				<select name='y' class='input_select'>
-			 		<option value='0'>{$this->lang->words['select_year']}</option>
-			 		<foreach loop="years:array_reverse(range( date('Y') - 130, date('Y') )) as $year">
-			 			<option value='{$year}'>{$year}</option>
-			 		</foreach>
-				</select>
-		</fieldset>
-		<fieldset class='submit'>
-			<input type='submit' value='{$this->lang->words['coppa_continue_button']}' class='input_submit' /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
-	</div>
-</form>]]></template_content>
+	ipb.vars['coppa_popup'] = new ipb.Popup( 'coppa_popup', {	type: 'pane',
+																initial: $('coppa_form').show(),
+																hideAtStart: false,
+																hideClose: true,
+																defer: false,
+																modal: true,
+																w: '550px' },
+															{
+																afterInit: function( popup ){
+																	popup.getObj().select("#confirm_coppa")[0].observe('click', function(e){
+																		Event.stop(e);
+																		
+																		return validateDate( popup );
+																	});
+																}
+															} );
+</script>
+</if>]]></template_content>
       <template_name>registerCoppaStart</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2838,36 +5531,27 @@ function contact_admin() {
     <template>
       <template_group>skin_register</template_group>
       <template_content><![CDATA[{parse js_module="register"}
-<script type="text/javascript">
-function contact_admin() {
-  // Very basic spam bot stopper
-  <php>
-  	$adminEmail = explode( '@', $this->settings['email_in'] );
-  </php>
-  admin_email_one = '{$adminEmail[0]}';
-  admin_email_two = '{$adminEmail[1]}';
-  window.location = 'mailto:'+admin_email_one+'@'+admin_email_two+'?subject={$this->lang->words['coppa_email_subject']}';
-}
-</script>
-<h2>{$this->lang->words['cp2_title']}</h2>
-<div class='general_box'>
-	<h3 class='clear'>{$this->lang->words['coppa_form']}</h3>
-	<p>
-		{$this->lang->words['cp2_text']}<br /><br />
-		<strong><a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=12" base="public"}' title='Print form'>{$this->lang->words['coppa_clickhere']}</a></strong>
-	</p>
-	<p>
-		<br />
-		{$this->lang->words['coppa_form_text']}
-	</p>
-	<p>
-		<br />
-		<a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_one" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>&lt; {$this->lang->words['cancel']}</a>
-	</p>	
+<h1 class='ipsType_pagetitle'>{$this->lang->words['cp2_title']}</h1>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad_double'>
+		<h2 class='clear ipsType_subtitle'>{$this->lang->words['coppa_form']}</h2>
+		<p>
+			{$this->lang->words['cp2_text']}<br /><br />
+			<strong><a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=12" base="public"}' title='{$this->lang->words['coppa_form']}'>{$this->lang->words['coppa_clickhere']}</a></strong>
+		</p>
+		<p>
+			<br />
+			{$this->lang->words['coppa_form_text']}
+		</p>
+		<p>
+			<br />
+			<a href='{parse url="app=core&amp;module=global&amp;section=register&amp;do=coppa_one" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>&lt; {$this->lang->words['cancel']}</a>
+		</p>
+	</div>	
 </div>]]></template_content>
       <template_name>registerCoppaTwo</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2885,172 +5569,298 @@ function contact_admin() {
 	ipb.templates['error'] = "&nbsp;<span id='[id]_msg' class='reg_msg reg_error' style='display: none'><img src='{$this->settings['img_url']}/exclamation.png' alt='' /> [msg]</span>";
 //|#^#]>
 </script>
-<if test="registerHasErrors:|:is_array( $general_errors ) && count( $general_errors )">
-<div class='message error'>
-	{$this->lang->words['following_errors']}
+<div id='register_form'>
+	<!--<h1 class='ipsType_pagetitle'>{$this->lang->words['ready_register']}</h1>-->
+	{parse template="registerStepBar" group="register" params="array('register_form' => 'ipsSteps_active', 'confirmation' => '')"}
+	<if test="registerHasErrors:|:is_array( $general_errors ) && count( $general_errors )">
+	<div class='message error'>
+		{$this->lang->words['following_errors']}
+		<ul>
+			<foreach loop="general_errors:$general_errors as $r">
+				<li>{$r}</li>
+			</foreach>
+		</ul>
+	</div>
+	<br />
+	</if>
+	<form action="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" method="post" name="REG" id='register'>
+		<input type="hidden" name="termsread" value="1" />
+		<input type="hidden" name="agree_to_terms" value="1" />
+		<input type="hidden" name="do" value="process_form" />
+		<input type="hidden" name="coppa_user" value="{$data['coppa_user']}" />
+		<input type='hidden' name='nexus_pass' value='1' />
+		<input type='hidden' name='time_offset' id='auto_time_offset' value='0' />
+		<input type='hidden' name='dst' id='auto_dst' value='0' />
+		
+		<h1 class='maintitle'>
+			{$this->lang->words['ready_register']}
+		</h1>
+		<div class='ipsBox'>
+		
+			<div class='ipsBox_container ipsPad'>
+			
+				<if test="registerServices:|:IPSLib::fbc_enabled() || IPSLib::twitter_enabled() === true">
+					<div class='ipsBox_container ipsBox_notice ipsForm ipsForm_horizontal' id='external_services'>
+						<strong class='ipsField_title' id='save_time'>{$this->lang->words['want_to_save_time']}</strong>
+						<div class='ipsField_content'>
+							<ul class='ipsList_inline'>
+								<if test="registerUsingFb:|:IPSLib::fbc_enabled()">
+									<li><a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?_reg=1"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a></li>
+								</if>
+								<if test="twitterBox:|:IPSLib::twitter_enabled() === true">
+									<li><a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?_reg=1"><img src="{$this->settings['img_url']}/twitter_login.png" alt="" /></a></li>
+								</if>
+							</ul>
+						</div>
+					</div>
+				</if>
+			
+				<if test="registerHasInlineErrors:|:is_array( $inline_errors ) && ( $inline_errors['username'] || $inline_errors['dname'] || $inline_errors['email'] || $inline_errors['password'] )">
+					<p class='message error'>{$this->lang->words['reg_errors_found']}</p>
+					<br />	
+				</if>
+				<fieldset>
+					<ul class='ipsForm ipsForm_horizontal'>
+						<li class='ipsField'>
+							<p class='ipsField_content'>
+								<span class='ipsForm_required ipsType_smaller'>* {$this->lang->words['required_field']}</span>
+							</p>
+						</li>
+						<li class='ipsField clear <if test="ieDnameClass:|:$inline_errors['dname']">error</if>'>
+							<label for='display_name' class='ipsField_title'>{$this->lang->words['reg_choose_dname']} <span class='ipsForm_required'>*</span></label>
+							<p class='ipsField_content'>
+								<input type='text' class='input_text' id='display_name' size='45' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['members_display_name']}' name='members_display_name' /><br />
+								<span class='desc primary lighter'>
+									<if test="ieDname:|:$inline_errors['dname']"><span class='error'>{$inline_errors['dname']}<br /></span></if>
+									{parse expression="sprintf( $this->lang->words['dname_desc'], $this->settings['max_user_name_length'])"}
+								</span>
+							</p>
+						</li>
+						<li class='ipsField clear <if test="ieEmailClass:|:$inline_errors['email']">error</if>'>
+							<label for='email_1' class='ipsField_title'>{$this->lang->words['reg_enter_email']} <span class='ipsForm_required'>*</span></label>
+							<p class='ipsField_content'>
+								<input type='text' id='email_1' class='input_text email' size='45' maxlength='150' name='EmailAddress' value='{$this->request['EmailAddress']}' /><br />
+								<if test="ieEmail:|:$inline_errors['email']"><span class='desc'><span class='error'>{$inline_errors['email']}</span></span></if>
+							</p>
+						</li>		
+						<li class='ipsField clear <if test="iePasswordClass:|:$inline_errors['password']">error</if>'>
+							<label for='password_1' class='ipsField_title'>{$this->lang->words['reg_choose_password']} <span class='ipsForm_required'>*</span></label>
+							<p class='ipsField_content'>
+								<input type='password' id='password_1' class='input_text password' size='45' maxlength='32' value='{$this->request['PassWord']}' name='PassWord' /><br />
+								<span class='desc lighter'><if test="iePassword:|:$inline_errors['password']"><span class='error'>{$inline_errors['password']}<br /></span></if>{$this->lang->words['reg_choose_password_desc']}</span>
+							</p>
+						</li>
+						<li class='ipsField clear'>
+							<label for='password_2' class='ipsField_title'>{$this->lang->words['reg_reenter_password']} <span class='ipsForm_required'>*</span></label>
+							<p class='ipsField_content'>
+								<input type='password' id='password_2' class='input_text password' size='45' maxlength='32' value='{$this->request['PassWord_Check']}' name='PassWord_Check' /><br />
+							</p>
+						</li>
+					</ul>
+				</fieldset>
+				<if test="hasNexusFields:|:!empty( $nexusFields )">
+					<script type='text/javascript'>
+						var _countriesWithStates = [];
+						<foreach loop="statesJs:$nexusStates as $k => $v">
+							_countriesWithStates["{$k}"] = 1;
+						</foreach>
+					</script>
+					<hr />
+					<fieldset>
+						<ul class='ipsForm ipsForm_horizontal'>
+							<foreach loop="fields:$nexusFields as $f">
+								<if test="isAddressOrPhone:|:in_array( $f['f_column'], array( 'cm_address_1', 'cm_phone' ) )">
+									<br />
+								</if>
+								<if test="isText:|:$f['f_type'] == 'text'">
+									<li class='ipsField clear'>
+										<label for='{$f['f_column']}' class='ipsField_title'><if test="isAddress1:|:$f['f_column'] == 'cm_address_1'">{$this->lang->words['cm_address']}<else /><if test="isAddress2:|:$f['f_column'] == 'cm_address_2'">&nbsp;<else />{$f['f_name']}</if></if> <if test="textRequired:|:$f['f_reg_require']"><span class='ipsForm_required'>*</span></if></label>
+										<p class='ipsField_content'>
+											<input type='text' class='input_text' id='{$f['f_column']}' size='25' maxlength='255' value='{$this->request[ $f['f_column'] ]}' name='{$f['f_column']}' />
+										</p>
+										<if test="textErrorMessage:|:$f['f_reg_require'] and $this->request['do'] == 'process_form' and !$this->request[ $f['f_column'] ]">
+											<span class='error'>{$this->lang->words['err_complete_form']}</span>
+										</if>
+									</li>
+								</if>
+								<if test="isDropdown:|:$f['f_type'] == 'dropdown'">
+									<li class='ipsField clear'>
+										<label for='{$f['f_column']}' class='ipsField_title'>{$f['f_name']} <if test="dropdownRequired:|:$f['f_reg_require']"><span class='ipsForm_required'>*</span></if></label>
+										<div class='ipsField_content'>
+											<select name='{$f['f_column']}' id='{$f['f_column']}' <if test="isCountry:|:$f['f_column'] == 'cm_country'">onchange='states()'</if>>
+												<foreach loop="options:explode( "\n", $f['f_extra'] ) as $k => $v">
+													{parse variable="selected" default="" oncondition="$k == $this->request[ $f['f_column'] ] or $v == $this->request[ $f['f_column'] ]" value=" selected='selected'"}
+													<option value='<if test="isCountrySelect:|:$f['f_column'] == 'cm_country'">{$v}<else />{$k}</if>'{parse variable="selected"}><if test="isCountryWords:|:$f['f_column'] == 'cm_country'">{$this->lang->words['nc_'.$v]}<else />{$v}</if></option>
+												</foreach>
+											</select>
+										</div>
+										<if test="dropdownErrorMessage:|:$f['f_reg_require'] and $this->request['do'] == 'process_form' and !$this->request[ $f['f_column'] ]">
+											<span class='error'>{$this->lang->words['err_complete_form']}</span>
+										</if>
+									</li>
+								</if>
+								<if test="isSpecial:|:$f['f_type'] == 'special'">
+									<li class='ipsField clear'>
+										<label for='cm_state' class='ipsField_title'>{$this->lang->words['cm_state']} <if test="specialRequired:|:$f['f_reg_require']"><span class='ipsForm_required'>*</span></if></label>
+										<div class='ipsField_content'>
+											<input type='text' class='input_text' id='text-states' size='25' name='cm_state' value='{$this->request['cm_state']}' />
+											<foreach loop="statesCountries:$nexusStates as $country => $_states">
+												<select name='_cm_state' id='{$country}-states' class='input_select' style='display:none'>
+													<foreach loop="states:$_states as $s">
+														{parse variable="selected" default="" oncondition="$s[0] == $this->request['cm_state']" value=" selected='selected'"}
+														<option value='{$s[0]}'{parse variable="selected"}>{$s[1]}</option>
+													</foreach>
+												</select>
+											</foreach>
+										</div>
+										<if test="specialErrorMessage:|:$f['f_reg_require'] and $this->request['do'] == 'process_form' and !$this->request[ $f['f_column'] ]">
+											<span class='error'>{$this->lang->words['err_complete_form']}</span>
+										</if>
+									</li>
+								</if>
+							</foreach>
+						</ul>
+					</fieldset>
+					<script type='text/javascript'>
+						function states()
+						{
+							var c = $('cm_country').value;
+							if ( c in _countriesWithStates )
+							{
+								$( _display ).style.display = 'none';
+								$( _display ).name = '_cm_state';
+								
+								$( c + '-states' ).style.display = '';
+								$( c + '-states' ).name = 'cm_state';
+								
+								_display = c + '-states';
+							}
+							else
+							{
+								$( _display ).style.display = 'none';
+								$( _display ).name = '_cm_state';
+								
+								$( 'text-states' ).style.display = '';
+								$( 'text-states' ).name = 'cm_state';
+								
+								_display = 'text-states';
+							}
+						}
+						
+						var _display = 'text-states';
+						states();
+					</script>
+				</if>				
+				<if test="hasCfields:|:( is_array( $custom_fields['required'] ) && count( $custom_fields['required'] ) ) || ( is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] ) )">
+				<hr />
+					<fieldset>
+						<ul class='ipsForm ipsForm_horizontal'>
+						<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
+							<foreach loop="custom_required:$custom_fields['required'] as $_field">
+								<li class='ipsField clear ipsField_{$_field['type']}'>
+									<label for='cprofile_{$_field['id']}' class='ipsField_title'>{$_field['name']} <span class='ipsForm_required'>*</span></label>
+									<div class='ipsField_content'>
+										{$_field['field']}
+										<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><br /><span class='desc'>{$_field['desc']}</span></if>
+									</div>
+								</li>
+							</foreach>
+						</if>
+			
+						<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
+							<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
+								<li class='ipsField clear ipsField_{$_field['type']}'>
+									<label for='cprofile_{$_field['id']}' class='ipsField_title'>{$_field['name']}</label>
+									<div class='ipsField_content'>
+										{$_field['field']}
+										<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><br /><span class='desc'>{$_field['desc']}</span></if>
+									</div>
+								</li>
+							</foreach>
+						</if>
+					</fieldset>				
+				</if>
+				<hr />
+				{$data['qandaHTML']}
+				{$data['captchaHTML']}
+				<hr />
+				<fieldset>
+					<ul class='ipsForm ipsForm_horizontal'>
+						<li class='ipsField clear ipsField_checkbox'>
+							<input type="checkbox" name="allow_admin_mail" id="allow_admin_mail" value="1" class="input_check" <if test="defaultAAE:|:$this->request['allow_admin_mail'] || !isset( $this->request['allow_admin_mail'] )">checked='checked'</if> />
+							<p class='ipsField_content'>
+								<label for='allow_admin_mail'>{$this->lang->words['receive_admin_emails']}</label>
+							</p>
+						</li>
+						<li class='ipsField clear ipsField_checkbox'>
+							<input type='checkbox' name='agree_tos' id='agree_tos' value='1' class='input_check' <if test="checkedTOS:|:$this->request['agree_tos']">checked="checked"</if> />
+							<p class='ipsField_content'>
+								<label for='agree_tos' <if test="ieDnameClass:|:$inline_errors['dname']">error</if>>
+									<strong>{$this->lang->words['agree_to_tos']} <a href='#' id='tou_link'>{$this->lang->words['terms_of_use']}</a></strong>
+									<if test="ieTOS:|:$inline_errors['tos']"><br /><span class='error'>{$inline_errors['tos']}</span></if>
+								</label>	
+								<textarea id='tou' class='input_text' style='width: 350px; height: 100px; display: block;'>
+									{$this->settings['_termsAndConditions']}
+								</textarea>
+							</p>
+						</li>
+					</ul>
+					<script type='text/javascript'>
+						$('tou').hide();				
+					</script>
+				</fieldset>
+				<br />
+				<fieldset>
+					<input type='submit' class='ipsButton' id='register_submit' value='{$this->lang->words['register']}' />
+				</fieldset>	
+			</div>
+		</div>
+	</form>
+	<script type='text/javascript'>
+		ipb.templates['registration_terms'] = new Template("<h3>{$this->lang->words['reg_terms_popup_title']}</h3><div class='ipsPad' id='tou_popup'>#{content}</div>");
+	</script>
+	{parse template="registerCoppaStart" group="register" params=""}
+</div>]]></template_content>
+      <template_name>registerForm</template_name>
+      <template_data>$general_errors=array(), $data=array(), $inline_errors=array(), $time_select=array(), $custom_fields=array(), $nexusFields=array(), $nexusStates=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_register</template_group>
+      <template_content><![CDATA[<php>
+	$this->templateVars['step_count'] = 1;
+</php>
+<div class='ipsSteps clearfix'>
 	<ul>
-		<foreach loop="general_errors:$general_errors as $r">
-			<li>{$r}</li>
-		</foreach>
+		<if test="IPSLib::appIsInstalled('nexus') AND $this->settings['nexus_reg_show'] AND $this->settings['nexus_store_online']">
+			<li class='<if test="$this->request['nexus_pass']">ipsSteps_done<else />ipsSteps_active</if>'>
+				<strong class='ipsSteps_title'>{parse expression="sprintf($this->lang->words['regstep'], $this->templateVars['step_count'])"}</strong>
+				<span class='ipsSteps_desc'>{$this->lang->words['regstep_choose_package']}</span>
+				<span class='ipsSteps_arrow'>&nbsp;</span>
+			</li>
+			<!--Don't delete: {parse expression="$this->templateVars['step_count']++"}-->
+		</if>
+		<li class='{$step['register_form']}'>
+			<strong class='ipsSteps_title'>{parse expression="sprintf($this->lang->words['regstep'], $this->templateVars['step_count'])"}</strong>
+			<span class='ipsSteps_desc'>{$this->lang->words['regstep_your_account']}</span>
+			<span class='ipsSteps_arrow'>&nbsp;</span>
+			<!--Don't delete: {parse expression="$this->templateVars['step_count']++"}-->
+		</li>
+		<li class='{$step['confirmation']}'>
+			<strong class='ipsSteps_title'>{parse expression="sprintf($this->lang->words['regstep'], $this->templateVars['step_count'])"}</strong>
+			<span class='ipsSteps_desc'>{$this->lang->words['regstep_confirm']}</span>
+			<span class='ipsSteps_arrow'>&nbsp;</span>
+		</li>
 	</ul>
 </div>
-<br />
-</if>
-{parse striping="register" classes="row1,row2"}
-<form action="{parse url="app=core&amp;module=global&amp;section=register" base="public"}" method="post" name="REG" id='register'>
-	<input type="hidden" name="termsread" value="1" />
-	<input type="hidden" name="agree_to_terms" value="1" />
-	<input type="hidden" name="do" value="process_form" />
-	<input type="hidden" name="coppa_user" value="{$data['coppa_user']}" />
-	
-	<div id='register_info' class='right general_box'>
-		<h3>{$this->lang->words['why_register']}</h3>
-		<p>{$this->settings['register_page_info']}</p>
-		<br />
-		<if test="registerUsingFb:|:$this->settings['fbc_enable'] AND $this->settings['fbc_api_id']">
-			<h3 class='bar'>{$this->lang->words['fb_login_title']}</h3>
-			<div class='desc' style='margin-bottom:4px'>{$this->lang->words['login_w_facebook']}</div>
-			<p>
-				<a href="{$this->settings['_original_base_url']}/interface/facebook/index.php?reg=1"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a>
-			</p>
-			<br />
-		</if>
-		<if test="twitterBox:|:IPSLib::twitter_enabled() === true">
-			<h3 class='bar'>{$this->lang->words['twitter_login_title']}</h3>
-			<div class='desc' style='margin-bottom:4px'>{$this->lang->words['login_w_twitter']}</div>
-			<p>
-				<a href="{$this->settings['_original_base_url']}/interface/twitter/index.php?reg=1"><img src="{$this->settings['img_url']}/twitter_login.png" alt="" /></a>
-			</p>
-		</if>
-	</div>
-	<div id='register_form' class='block_wrap left'>
-		<h2>{$this->lang->words['ready_register']}</h2>
-		<p class='extra'>
-			{$this->lang->words['reg_free']}
-			<br />
-			{$this->lang->words['already_account']} <a href='{parse url="app=core&amp;module=global&amp;section=login" base="public"}' title='{$this->lang->words['goto_signin']}'>{$this->lang->words['sign_in_page']}</a>
-			<br />
-		</p>
-		<if test="registerHasInlineErrors:|:is_array( $inline_errors ) && ( $inline_errors['username'] || $inline_errors['dname'] || $inline_errors['email'] || $inline_errors['password'] )">
-			<p class='message error'>{$this->lang->words['reg_errors_found']}</p>	
-		</if>
-		
-		<div class='generic_bar'></div>
-		<fieldset class='{parse striping="register"}'>
-			<h3 class='bar'>{$this->lang->words['reg_step1']}</h3>
-			
-			<ul>
-				<if test="$data['requireName']">
-					<li class='field required <if test="ieUsernameClass:|:$inline_errors['username']">error</if>'>
-						<label for='login_name'>{$this->lang->words['reg_choose_user']}</label>
-						<input type='text' class='input_text' id='login_name' size='25' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['UserName']}' name='UserName' /><br />
-						<span class='desc'><if test="ieUsername:|:$inline_errors['username']"><span class='error'>{$inline_errors['username']}<br /></span></if>{$this->lang->words['char_cant_use']}</em></span>
-					</li>
-				</if>
-				<if test="registerAllowDnames:|:$this->settings['auth_allow_dnames'] == 1 OR !$data['requireName']">
-					<li class='field required <if test="ieDnameClass:|:$inline_errors['dname']">error</if>'>
-						<label for='display_name'>{$this->lang->words['reg_choose_dname']}</label>
-						<input type='text' class='input_text' id='display_name' size='25' maxlength='{$this->settings['max_user_name_length']}' value='{$this->request['members_display_name']}' name='members_display_name' /><br />
-						<span class='desc'><if test="ieDname:|:$inline_errors['dname']"><span class='error'>{$inline_errors['dname']}<br /></span></if>{$this->lang->words['dname_desc_one']} {$this->settings['max_user_name_length']} {$this->lang->words['dname_desc_two']}</span>
-					</li>
-				</if>
-			</ul>
-			<hr />
-			<ul>
-				<li class='field required <if test="ieEmailClass:|:$inline_errors['email']">error</if>'>
-					<label for='email_1'>{$this->lang->words['reg_enter_email']}</label>
-					<input type='text' id='email_1' class='input_text email' size='25' maxlength='150' name='EmailAddress' value='{$this->request['EmailAddress']}' /><br />
-					<span class='desc'><if test="ieEmail:|:$inline_errors['email']"><span class='error'>{$inline_errors['email']}<br /></span></if>{$this->lang->words['reg_enter_email_desc']}</span>
-				</li>
-				<li class='field nodesc required'>
-					<label for='email_2'>{$this->lang->words['reg_reenter_email']}</label>
-					<input type='text' id='email_2' class='input_text email' size='25' maxlength='150' name='EmailAddress_two' value='{$this->request['EmailAddress_two']}' />
-				</li>
-			</ul>
-			<hr />
-			<ul>
-				<li class='field required <if test="iePasswordClass:|:$inline_errors['password']">error</if>'>
-					<label for='password_1'>{$this->lang->words['reg_choose_password']}</label>
-					<input type='password' id='password_1' class='input_text password' size='25' maxlength='32' value='{$this->request['PassWord']}' name='PassWord' /><br />
-					<span class='desc'><if test="iePassword:|:$inline_errors['password']"><span class='error'>{$inline_errors['password']}<br /></span></if>{$this->lang->words['reg_choose_password_desc']}</span>
-				</li>
-				<li class='field nodesc required'>
-					<label for='password_2'>{$this->lang->words['reg_reenter_password']}</label>
-					<input type='password' id='password_2' class='input_text password' size='25' maxlength='32' value='{$this->request['PassWord_Check']}' name='PassWord_Check' /><br />
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset class='{parse striping="register"}'>
-			<h3 class='bar'>{$this->lang->words['reg_step2']}</h3>
-			
-			<ul>
-				<li class='field checkbox'>
-					<input type="checkbox" name="allow_admin_mail" id="allow_admin_mail" value="1" class="input_check" <if test="defaultAAE:|:$this->request['allow_admin_mail'] || !isset( $this->request['allow_admin_mail'] )">checked='checked'</if> />
-					<label for='allow_admin_mail'>{$this->lang->words['receive_admin_emails']}</label>
-				</li>
-				<li class='field checkbox nodesc'>
-					<input type="checkbox" name="allow_member_mail" id="allow_member_mail" value="1" class="input_check" <if test="deaultAME:|:$this->request['allow_member_mail']">checked='checked'</if> />
-					<label for="allow_member_mail">{$this->lang->words['receive_member_emails']}</label>
-				</li>
-				<li class='field'>
-					<label for='timezone'>{$this->lang->words['time_zone']}</label>
-					<select id='timezone' class='input_select' name='time_offset'>
-						<foreach loop="timezones:$time_select as $k => $v">
-						<option value='{$k}'<if test="defaultTimezone:|:$k == $this->request['time_offset']"> selected='selected'</if>>{$v}</option>
-						</foreach>
-					</select>
-				</li>
-				<li class='field checkbox'>
-					<input type='checkbox' id='dst' name='dst' value='1' class='input_check' <if test="defaultDst:|:$this->request['dst']">checked='checked'</if> /> <label for='dst' id='dst_label'>{$this->lang->words['auto_dst_detection']}</label>
-				</li>
-			</ul>
-		</fieldset>
-		<if test="hasCfields:|:( is_array( $custom_fields['required'] ) && count( $custom_fields['required'] ) ) || ( is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] ) )">
-		<fieldset class='{parse striping="register"}'>
-			<h3 class='bar'>{$this->lang->words['reg_step3']}</h3>
-			
-			<ul>
-			<if test="reqCfields:|:is_array( $custom_fields['required'] ) && count( $custom_fields['required'] )">
-				<foreach loop="custom_required:$custom_fields['required'] as $_field">
-					<if test="reqCfieldDesc:|:$_field['desc'] == ''">
-						<li class='field nodesc required {$_field['type']}'>
-					<else />
-						<li class='field required {$_field['type']}'>
-					</if>
-							<label for='cprofile_{$_field['id']}'>{$_field['name']}</label>
-							{$_field['field']}
-							<if test="reqCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
-						</li>
-				</foreach>
-			</if>
-			
-			<if test="optCfields:|:is_array( $custom_fields['optional'] ) && count( $custom_fields['optional'] )">
-				<foreach loop="custom_optional:$custom_fields['optional'] as $_field">
-					<if test="optCfieldDesc:|:$_field['desc'] == ''">
-						<li class='field nodesc optional {$_field['type']}'>
-					<else />
-						<li class='field optional {$_field['type']}'>
-					</if>
-							<label for='cprofile_{$_field['id']}'>{$_field['name']}</label>
-							{$_field['field']}
-							<if test="optCfieldDescSpan:|:$_field['desc'] != ''"><span class='desc'>{$_field['desc']}</span></if>
-						</li>
-				</foreach>
-			</if>
-			<!--IBF.MODULES.EXTRA-->
-		</fieldset>				
-		</if>
-		{$data['qandaHTML']}
-		{$data['captchaHTML']}
-		<fieldset class='submit'>
-			<input type='submit' class='input_submit' value='{$this->lang->words['register']}' /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel_link']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>	
-	</div>
-</form>
-</if>]]></template_content>
-      <template_name>registerForm</template_name>
-      <template_data>$general_errors=array(), $data=array(), $inline_errors=array(), $time_select=array(), $custom_fields=array()</template_data>
-      <template_updated>1288194260</template_updated>
+<br />]]></template_content>
+      <template_name>registerStepBar</template_name>
+      <template_data>$step</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3058,47 +5868,11 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=global&amp;section=register&amp;coppa_user={$coppa_user}&amp;termsread=1&amp;coppa_pass=1" base="public"}" method="post">
-	<h2>{$this->lang->words['tc_title']}</h2>
-	<p class='message'>{$this->lang->words['tc_text']}</p>
-	<br />
-	
-	<div class='general_box'>
-		<h3>{$this->lang->words['forum_terms']}</h3>
-		<p>{$text}</p>
-	</div>
-	<fieldset class='submit'>
-		<input class='input_check' type="checkbox" id="agree_cbox" name="agree_to_terms" value="1" /> <label for='agree_cbox'><strong>{$this->lang->words['agree_submit']}</strong></label>
-		<br /><br />
-		<input type="submit" value="{$this->lang->words['tc_regbut']}" class="input_submit" />
-	</fieldset>
-</form>]]></template_content>
-      <template_name>registerShowTerms</template_name>
-      <template_data><![CDATA[$text="",$coppa_user=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content><![CDATA[<span class='error'>$message</span>]]></template_content>
-      <template_name>registration_error</template_name>
-      <template_data>$message</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content><![CDATA[<input type="hidden" name="uid" value="$uid" />
-<input type="hidden" name="aid" value="$aid" />]]></template_content>
+      <template_content><![CDATA[<input type="hidden" name="uid" value="{$uid}" />
+<input type="hidden" name="aid" value="{$aid}" />]]></template_content>
       <template_name>show_lostpass_form_auto</template_name>
       <template_data><![CDATA[$aid="",$uid=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3119,7 +5893,7 @@ function contact_admin() {
 	</ul>]]></template_content>
       <template_name>show_lostpass_form_manual</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3127,16 +5901,18 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['registration_process']}</h2>
-<div class='generic_bar'></div>
-<div class='post_form'>
-	<p class='field row2'>
-		{$this->lang->words['thank_you']} {$member['members_display_name']}. {$this->lang->words['auth_text']} {$member['email']}
-	</p>
+      <template_content><![CDATA[<div id='register_form'>
+	{parse template="registerStepBar" group="register" params="array('register_form' => '', 'confirmation' => 'ipsSteps_active')"}
+	<h1 class='maintitle'>{$this->lang->words['ready_register']}</h1>
+	<div class='ipsBox'>
+		<div class='ipsBox_container ipsPad'>
+			{$this->lang->words['thank_you']} {$member['members_display_name']}. {$this->lang->words['auth_text']} {$member['email']}
+		</div>
+	</div>
 </div>]]></template_content>
       <template_name>showAuthorize</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3144,8 +5920,11 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['dumb_header']}</h2>
-<if test="lostpassFormErrors:|:isset( $error ) && $error">
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['dumb_header']}</h1>
+<div class='ipsType_pageinfo'>
+	{$this->lang->words['dumb_text']}
+</div>
+<if test="lostpassFormErrors:|:!empty( $error )">
 	<p class='message error'>
 		{$error}
 	</p>
@@ -3153,7 +5932,6 @@ function contact_admin() {
 <form action="{parse url="app=core&module=global&section=lostpass" base="public"}" method="post">
 <input type="hidden" name="do" value="03" />
 <input type="hidden" name="type" value="lostpass" />
-<p class='message unspecific'>{$this->lang->words['dumb_text']}</p>
 <div class='generic_bar'></div>
 	<div class='post_form'>
 		<!--IBF.INPUT_TYPE-->
@@ -3184,7 +5962,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showLostpassForm</template_name>
       <template_data>$error</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3192,13 +5970,14 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['lpf_title']}</h2>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['lpf_title']}</h1>
+<br />
 <p class='message'>
 	{$this->lang->words['lpass_text_random']}
 </p>]]></template_content>
       <template_name>showLostPassWaitRandom</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3206,7 +5985,7 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['dumb_header']}</h2>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['dumb_header']}</h1>
 <form action="{parse url="" base="public"}" method="post" name="REG">
 <input type="hidden" name="app" value="core" />
 <input type="hidden" name="module" value="global" />
@@ -3235,7 +6014,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showManualForm</template_name>
       <template_data><![CDATA[$type="reg"]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3243,13 +6022,14 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['registration_process']}</h2>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['registration_process']}</h1>
+<br />
 <p class='message'>
 	{$this->lang->words['thank_you']} {$member['members_display_name']}. {$this->lang->words['preview_reg_text']}
 </p>]]></template_content>
       <template_name>showPreview</template_name>
       <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3257,14 +6037,15 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['rv_title']}</h2>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['rv_title']}</h1>
+<br />
 <p class='message'>
 	{$this->lang->words['rv_process']}<br />
 	{$this->lang->words['rv_done']}
 </p>]]></template_content>
       <template_name>showRevalidated</template_name>
       <template_data/>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3272,8 +6053,8 @@ function contact_admin() {
     </template>
     <template>
       <template_group>skin_register</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['rv_title']}</h2>
-<!-- skinnote error needs to be formatted -->
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['rv_title']}</h1>
+<br />
 <if test="revalidateError:|:$error">
 <p class='message error'>{$this->lang->words[$error]}</p>
 <br />
@@ -3286,7 +6067,7 @@ function contact_admin() {
 	
 	<div class='post_form'>
 		<fieldset class='general_box'>
-			<h3>Revalidate</h3>
+			<h3>{$this->lang->words['rv_bar_title']}</h3>
 			<label for='username'>{$this->lang->words['rv_name']}</label>
 			<input type="text" class='input_text' id='username' size="32" maxlength="64" name="username" value="$name" />
 		</fieldset>
@@ -3297,27 +6078,7 @@ function contact_admin() {
 </form>]]></template_content>
       <template_name>showRevalidateForm</template_name>
       <template_data><![CDATA[$name="",$error=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content><![CDATA[<form method="post" action="$action">
-$hidden
-<div class="borderwrap">
-	<div class="maintitle">$title</div>
-	<table class='ipbtable' cellspacing="0">
-		$content
-	</table>
-	<div class="formsubtitle" align="center"><input type="submit" /></div>
-</div>
-</form>]]></template_content>
-      <template_name>tmpl_form</template_name>
-      <template_data><![CDATA[$action="",$hidden="",$title="",$content=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3331,14 +6092,16 @@ $hidden
 <div class='generic_bar'></div>
 <form action="{$this->settings['base_url']}app=core&amp;module=reports&amp;rcom={$this->request['rcom']}&amp;send=1" method="post" name="REPLIER">
 	<input type='hidden' name='k' value='{$this->member->form_hash}' />
-	<div class='post_form'>
+	<div class='ipsForm ipsForm_horizontal'>
 		<fieldset>
 			<h3 class='bar'>{$this->lang->words['reporting_title']} <a href="{$url}" title='{$this->lang->words['view_content']}'>{$name}</a></h3>
-			<ul>
-				<li class='field'>
-					<label for='message'>{$this->lang->words['report_basic_enter']}</label>
-					<textarea id='message' class='input_text' name='message' cols='60' rows='8'></textarea>
-					<span class='desc'>{$this->lang->words['report_basic_desc']}</span>
+			<ul class='ipsPad'>
+				<li class='ipsField'>
+					<label for='message' class='ipsField_title'>{$this->lang->words['report_basic_enter']}</label>
+					<p class='ipsField_content'>
+						<textarea id='message' class='input_text' name='message' cols='60' rows='8'></textarea><br />
+						<span class='desc'>{$this->lang->words['report_basic_desc']}</span>
+					</p>
 				</li>
 				{$extra_data}
 			</ul>
@@ -3350,7 +6113,7 @@ $hidden
 </form>]]></template_content>
       <template_name>basicReportForm</template_name>
       <template_data><![CDATA[$name="", $url="", $extra_data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3359,90 +6122,15 @@ $hidden
     <template>
       <template_group>skin_reports</template_group>
       <template_content><![CDATA[{parse js_module="reports"}
-<form method="post" action="{$this->settings['base_url']}">
-	<input type="hidden" name="app" value="core" />
-	<input type="hidden" name="module" value="reports" />
-	<input type="hidden" name="do" value="save_methods" />
-	<input type="hidden" name="req" value="1" />
-	<input type='hidden' name='k' value='{$this->member->form_hash}' />
-	
-	<h2 class='maintitle'>{$this->lang->words['report_ajax_tab_notif_meth']}</h2>
-	<div class='generic_bar'></div>
-	<div class='post_form'>
-		<fieldset class='row1'>
-			<h3 class='bar'>{$this->lang->words['configure_notifications']}</h3>
-			<ul>
-				<li class='field checkbox'>
-					<if test="rcPmEnabled:|:$this->settings['report_pm_enabled'] == 1">
-						<if test="hasPm:|:$data['by_pm']==1">
-							<input checked='checked' type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-						<else />
-							<input type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-						</if>
-					<else />
-						<input disabled='disabled' type="checkbox" value="1" id="notmet_pm" name="notmet_pm" class='input_check' />
-					</if>
-					<label for='notmet_pm'>{$this->lang->words['report_settings_by_pm']}</label>
-				</li>
-				<li class='field checkbox'>
-					<if test="rcEmailEnabled:|:$this->settings['report_nemail_enabled'] == 1">
-						<if test="hasEmail:|:$data['by_email']==1">
-							<input checked='checked' type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-						<else />
-							<input type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-						</if>
-					<else />
-						<input disabled='disabled' type="checkbox" value="1" id="notmet_email" name="notmet_email" class='input_check' />
-					</if>
-					<label for='notmet_email'>{$this->lang->words['report_settings_by_email']}</label>
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset class='submit'>
-			<input type="submit" value="{$this->lang->words['report_settings_save']}" class='input_submit' /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=reports&amp;do=index" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
+<if test="noviewall:|:!$this->request['showall']">
+	<p class='message'>{$this->lang->words['only_active_note']}  <a href='{parse url="app=core&amp;module=reports&amp;do=index&amp;showall=1" base="public"}'>{$this->lang->words['click_here_link']}</a> {$this->lang->words['to_view_allrep']}</p>
+</if>
+<if test="hasPages:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
 	</div>
-</form>]]></template_content>
-      <template_name>config_notif</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content><![CDATA[<img src='{$this->settings['img_url']}/reports/post_alert_3.png' alt='' />]]></template_content>
-      <template_name>greenAlertImage</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content><![CDATA[<img src='{$this->settings['img_url']}/reports/post_alert_1.png' alt='' />]]></template_content>
-      <template_name>redAlertImage</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content><![CDATA[{parse js_module="reports"}
-<div class='topic_controls'>
-	{$pages}
-	<ul class='topic_buttons'>
-		<li><a href='{$this->settings['base_url']}app=core&amp;module=usercp&amp;tab=core&amp;area=notifications'><img src='{$this->settings['img_url']}/shield.png' alt='' /> {$this->lang->words['report_settings_options']}</a></li>
-	</ul>
-</div>
-<br />
+</if>
+<br class='clear' />
 <form method="post" action="{$this->settings['base_url']}app=core&amp;module=reports&amp;do=process&amp;st={$this->request['st']}">
 <input type='hidden' name='k' value='{$this->member->form_hash}' />
 <table class='ipb_table report_center' summary='{$this->lang->words['reported_content_summary']}'>
@@ -3461,6 +6149,11 @@ $hidden
 		<foreach loop="reports:$reports as $report">
 			<tr class='{parse striping="reportsTable"}'>
 				<td class='short altrow'>
+					<if test="isread:|:$report['_isRead']">
+						{parse replacement="t_read"}
+					<else />
+						{parse replacement="t_unread"}
+					</if>
 					<a href="{parse url="app=core&amp;module=reports&amp;section=reports&amp;do=process&amp;report_ids[{$report['id']}]={$report['id']}&amp;newstatus=2&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['change_current_status']}' class='ipbmenu' id='change_status-{$report['id']}'><span id="rstat-{$report['id']}">{$report['status_icon']}</span></a>
 				</td>
 				<td>
@@ -3475,17 +6168,28 @@ $hidden
 				</td>
 				<td class='altrow'>
 					<if test="indexReportUrl:|:$report['section']['url']">
-						<a href="{$report['section']['url']}" title='{$this->lang->words['go_to_section']}'>{$report['section']['title']}</a>
+						<if test="!$report['section']['title']">
+							<a href="{$report['section']['url']}" title='{$this->lang->words['go_to_section']}' class='desc blend_links'>{$this->lang->words['report_no_title']}</a>
+						<else />
+							<a href="{$report['section']['url']}" title='{$this->lang->words['go_to_section']}'>{$report['section']['title']}</a>
+						</if>
 					<else />
-						{$report['section']['title']}
+						<if test="!$report['section']['title']">
+							{$this->lang->words['report_no_title']}
+						<else />
+							{$report['section']['title']}
+						</if>
 					</if>
 				</td>
 				<td class='short'>{$report['num_reports']}</td>
 				<td class='short altrow'>{$report['num_comments']}</td>
-				<td class=''>
-					<ul class='last_post'>
-						<li><strong>{$this->lang->words['report_updated']}</strong> {parse date="$report['date_updated']" format="tiny"}</li>
-						<li><strong>{$this->lang->words['report_by']}</strong> <a href="{parse url="showuser={$report['updated_by']}" template="showuser" seotitle="{$report['n_updated_seoname']}" base="public"}" title='{$this->lang->words['view_member']}'>{IPSLib::makeNameFormatted( $report['n_updated_by'], $report['member_group_id'] )}</a>{parse template="user_popup" group="global" params="$report['updated_by'],$report['n_updated_seoname']"}</li>
+				<td>
+					<a href='{parse url="showuser={$report['updated_by']}" seotitle="{$report['member']['members_seo_name']}" template="showuser" base="public"}' class='ipsUserPhotoLink left'>
+						<img src='{$report['member']['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+					</a>
+					<ul class='last_post ipsType_small'>
+						<li>{$this->lang->words['by_ucfirst']} {parse template="userHoverCard" group="global" params="$report['member']"}</li>
+						<li>{parse date="$report['date_updated']" format="date"}</li>
 					</ul>
 				</td>
 				<td class='short altrow'>
@@ -3499,16 +6203,16 @@ $hidden
 				{$this->lang->words['no_reports']}
 			</td>
 		</tr>
-	</if>				
+	</if>
 </table>
 <div id='topic_mod' class='moderation_bar rounded with_action clear'>
-	<!-- SKINNOTE: Javascript needs moving to JS files -->
+	<a href='#' class='ipsButton_secondary left' id='prune_reports'>{$this->lang->words['report_option_prune']}</a>
+	<span class='desc'>{$this->lang->words['r_with_selected']}</span>
 	<select name="newstatus" id="report_actions">
 		<option value="x">---</option>
 		<if test="accessACP:|:$this->memberData['g_access_cp']">
 			<optgroup label="{$this->lang->words['report_actions']}"  style="font-style: normal;">
 			<if test="$this->memberData['g_access_cp']"><option value="d">{$this->lang->words['report_option_delete']}</option></if>
-			<option value="p">{$this->lang->words['report_option_prune']}</option>
 			</optgroup>
 		</if>
 		<optgroup label="{$this->lang->words['report_actions_mark_optgroup']}" style="font-style: normal;">
@@ -3518,43 +6222,39 @@ $hidden
 	<label for='pruneDayBox' id='pruneDayLabel'>{$this->lang->words['older_than']}</label>
 	<input type="text" name="pruneDays" id="pruneDayBox" class='input_text' size="3" value="" />
 	<span id='pruneDayLang'>{$this->lang->words['report_prune_days_box']}</span>
-	<input type="submit" id='report_mod' class="input_submit alt" value="{$this->lang->words['with_selected']}" />
-	
-	<script type='text/javascript'>
-		if( $F('report_actions') != 'p' )
-		{
-			$('pruneDayLabel').hide();
-			$('pruneDayBox').hide();
-			$('pruneDayLang').hide();
-		}
-	</script>
+	<input type="submit" id='report_mod' class="input_submit alt" value="{$this->lang->words['r_go']}" />
 </div>
 </form>
-<br />
-<!-- ACTIVE USERS -->
-<if test="topicActiveUsers:|:is_array( $active ) AND count( $active )">
-	<div id='topic_stats' class='statistics general_box clearfix'>
-		<div id='topic_active_users' class='active_users'>
-			<h2>
-			{parse expression="sprintf( $this->lang->words['active_users_title'], ($active['members'] + $active['anon'] ) )"}<br />
-			<span class='desc'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $active['members'], $active['guests'], $active['anon'] )"}</span>
-			</h2>
-			<ol>
-				<if test="auNames:|:is_array( $active['names'] ) AND count( $active['names'] )">
-					<foreach loop="active_users:$active['names'] as $p => $r">
-				<li>{$r['p_start']}<if test="auId:|:$r['id']"><a href='{parse url="showuser={$r['id']}" seotitle="{$r['seo']}" template="showuser" base="public"}' title='{$r['p_title']}'></if>{$r['name']}<if test="auEndId:|:$r['id']"></a></if>{$r['p_end']}<if test="lastActiveUser:|:$p + 1 != count( $active['names'] )">,</if></li>
-					</foreach>
-				</if>
-			</ol>
-		</div>
+<div id='prune_reports_form' style='display: none'>
+	<div class='ipsPad ipsForm_center'>
+		<form method="post" action="{$this->settings['base_url']}app=core&amp;module=reports&amp;do=process&amp;st={$this->request['st']}">
+		<input type='hidden' name='k' value='{$this->member->form_hash}' />
+		<input type='hidden' name='newstatus' value='p' />
+		{$this->lang->words['report_prune_1']} <input type="text" name="pruneDays" id="pruneDayBox" class='input_text' size="3" value="" /> {$this->lang->words['report_prune_2']}&nbsp;&nbsp;
+		<input type="submit" id='report_mod' class="input_submit alt" value="{$this->lang->words['r_go']}" />
 	</div>
-</if>
+</div>
 <script type='text/javascript'>
-	ipb.global.registerCheckAll('checkAllReports', 'checkall');
+	$('prune_reports').observe('click', function(e){
+		Event.stop(e);
+		if( ipb.reports.prunePopup ){
+			ipb.reports.prunePopup.kill();
+		}
+		else
+		{
+			ipb.reports.prunePopup = new ipb.Popup( 'prune', { type: 'balloon',
+																	initial: $('prune_reports_form').show(),
+																	stem: true,
+																	hideClose: true,
+																	attach: { target: $('prune_reports'), position: 'auto' },
+																	hideAtStart: false,
+																	w: '350px' });
+		}
+	});
 </script>]]></template_content>
       <template_name>reportsIndex</template_name>
-      <template_data><![CDATA[$reports=array(), $acts="", $pages="", $active=array(), $statuses=array()]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data><![CDATA[$reports=array(), $acts="", $pages="", $statuses=array()]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3565,7 +6265,7 @@ $hidden
       <template_content><![CDATA[<img src='{$this->settings['public_dir']}{$img}' alt='{$this->lang->words['status']}' />]]></template_content>
       <template_name>statusIcon</template_name>
       <template_data>$img, $width, $height</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3574,10 +6274,6 @@ $hidden
     <template>
       <template_group>skin_reports</template_group>
       <template_content><![CDATA[{parse js_module="reports"}
-<script type='text/javascript'>
-	// Editor JS: Only needs to be done once per page
-	{parse template="editorJS" group="editors" params=""}
-</script>
 <div class='message'>
 	{$this->lang->words['report_about_intro']} <if test="handlePmSpecial:|:$options['class'] == 'messages'">
 		{$this->lang->words['report_about_pm']} {$options['title']}.
@@ -3612,7 +6308,7 @@ $hidden
 	<foreach loop="viewReports:$reports as $report">
 		<div class='post_block  hentry clear'>
 			<div class='post_wrap'>
-				<h3><a href='{parse url="showuser={$report['member_id']}" seotitle="{$report['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_member']}'>{$report['members_display_name']}</a>{parse template="user_popup" group="global" params="$report['member_id'], $report['members_seo_name']"}</h3>
+				<h3><a href='{parse url="showuser={$report['member_id']}" seotitle="{$report['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_member']}'>{$report['members_display_name']}</a></h3>
 				<div class='author_info'>
 					{parse template="userInfoPane" group="global" params="$report['author'], 'mreport', array()"}
 				</div>
@@ -3627,97 +6323,21 @@ $hidden
 </if>
 </div>
 <br /><hr /><br />
-
-<h2 class='maintitle'>{$this->lang->words['comments_h2']}</h2>
-<div class='generic_bar'></div>
-<if test="hasComments:|:is_array($comments) AND count($comments)">
-	<foreach loop="comments:$comments as $comment">
-		
-		<div class='post_block first hentry report_comment' id='post_id_{$comment['comment_id']}'>
-			<div class='post_wrap'>
-				<h3>
-					<if test="commentMid:|:$comment['author']['member_id']">
-						<if test="commentOnline:|:$comment['author']['_online']">
-							{parse replacement="user_online"}
-						<else />
-							{parse replacement="user_offline"}
-						</if> &nbsp;
-								<address class="author vcard"><a class="url fn" href='{parse url="showuser={$comment['author']['member_id']}" template="showuser" seotitle="{$comment['author']['members_seo_name']}" base="public"}'>{$comment['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$comment['author']['member_id'], $comment['author']['members_seo_name']"}</address>
-					<else />
-						{$comment['author']['members_display_name']}
-					</if>
-				</h3>
-				
-				<div class='author_info'>
-					{parse template="userInfoPane" group="global" params="$comment['author'], 'mcomment', array()"}
-				</div>
-				<div class='post_body'>
-					<p class='posted_info'>
-						{$this->lang->words['posted_prefix']} {parse date="$comment['comment_date']" format="long"}
-					</p>
-					<div class='post entry-content'>
-						{$comment['comment']}
-					</div>
-				</div>
-				<br class='clear' />
-			</div>
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<h2 class='ipsType_subtitle'>{$comments['count']} {$this->lang->words['comments_h2']}</h2>
+		<div>
+			{$comments['html']}
 		</div>
-	</foreach>
-<else />
-	<p class='no_messages'>
-		{$this->lang->words['no_comments_on_report']}
-	</p>
-</if>
-<!-- SKINNOTE: Need to use included editor here -->
-{parse js_module="editor"}
-<br />
-<div id='fast_reply' style='display: {$displayData['fast_reply']}'>
-	<h3 class='maintitle'>{$this->lang->words['add_comment_title']}</h3>
-	<div class='generic_bar'></div>
-	<div class='general_box alt'>
-		<form method="post" action="{$this->settings['base_url']}" name="report_comment_submit" id='report_comment_submit'>
-			<input type="hidden" id="report_rid" name="rid" value="{$options['rid']}" />
-			<input type="hidden" name="app" value="core" />
-			<input type="hidden" name="module" value="reports" />
-			<input type="hidden" name="do" value="save_comment" />
-			<input type='hidden' name='{$editor_id}_wysiwyg_used' value='0' />
-			{parse template="editorShell" group="editors" params="'report_comment', 'comment'"} 
-			<fieldset class='submit'>
-				<input type='submit' class='input_submit' value='{$this->lang->words['post_button']}' accesskey='s' />
-			</fieldset>
-		</form>
 	</div>
 </div>
 <if test="disablelightbox:|:!$this->settings['disable_lightbox']">
 {parse template="include_lightbox" group="global" params=""}
 </if>
-{parse template="include_highlighter" group="global" params="1"}
-<script type="text/javascript">
-//<!#^#|CDATA|
-	if( $('report_comment_textarea') ){
-		$('report_comment_textarea').setStyle('height: 70px');
-	}
-	
-	ipb.editor_values.set( 'emoticons', \$H({ {parse expression="IPSLib::fetchEmoticonsAsJson()"} }) );
-	ipb.editors[ 'report_comment' ] = new ipb.editor( 'report_comment', USE_RTE );
-	in_use = 0;
-	<if test="rteOn:|:$rte_mode != 1">
-		obj = ipb.editors['report_comment'].editor_document;
-	<else />
-		obj = $( ipb.editors['report_comment'].items['text_obj'] );
-	</if>
-	Event.observe( obj, 'click', function(){
-		if( in_use != 1 ){
-			$( ipb.editors['report_comment'] ).resize_to( 250 );
-			in_use = 1;
-		}
-	}, true);
-//|#^#]>
-</script>
-</if>]]></template_content>
+{parse template="include_highlighter" group="global" params="1"}]]></template_content>
       <template_name>viewReport</template_name>
       <template_data>$options=array(), $reports=array(), $comments=array()</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3725,178 +6345,49 @@ $hidden
     </template>
   </templategroup>
   <templategroup group="skin_search">
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<php>
- $period = IPSSearchRegistry::get('in.period');
-</php>
-<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=active&amp;search_app={$this->request['search_app']}&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
-<h2>{parse expression="sprintf($this->lang->words['active_content'], $this->lang->words['actperiod_' . $period ])"}</h2>
-<p class='message'>
-	{$this->lang->words['active_have_been']} <em><strong>{$total}</strong></em> {parse expression="sprintf($this->lang->words['active_entries'], $this->lang->words['actperiod_' . $period ])"}
-</p>
-<br />
-<div class='topic_controls'>
-{$pagination}
-</div>
-<ol id='member_alpha' class='tab_bar'>
-	<!--harcoded forums, members, system apps-->
-	<if test="IPSLib::appisSearchable( 'forums', 'active' )">
-		<if test="forumsTab:|:$this->request['search_app'] == 'forums'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'forums' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app=forums&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
-		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'members', 'active' )">
-		<if test="membersTab:|:$this->request['search_app'] == 'members'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'members' )}</strong></li>
-		<else />
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app=members&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
-		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'core', 'active' )">
-		<if test="helpTab:|:$this->request['search_app'] == 'core'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'core' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app=core&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
-		</if>
-	</if>
-	<foreach loop="apps:$this->registry->getApplications() as $app">
-		<if test="appIsSearchable:|:IPSLib::appisSearchable( $app['app_directory'], 'active' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
-			<if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">
-				<li class='active'><strong>{IPSLib::getAppTitle( $app['app_directory'] )}</strong></li>
-			<else />				
-				<li><a href='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app={$app['app_directory']}&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
-			</if>
- 		</if>
-	</foreach>
-</ol>
-<div class='tab_filters'>
-	<ul class='right'>
-		<if test="is_array($sortIn) AND count( $sortIn )">
-			<form action='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app={$this->request['search_app']}&amp;period={$this->request['period']}&amp;sid={$this->request['_sid']}" base="public"}' method='post'>
-			<select name='search_app_filters[{$this->request['search_app']}][searchInKey]' class='input_select' style='width:auto'>
-				<foreach loop="$sortIn as $id => $_data">
-					<option value='$_data[0]' <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">selected='selected'</if>>{$_data[1]}</option>
-				</foreach>
-			</select>
-			<input type='submit' class='input_submit alt' value='{$this->lang->words['s_update']}' />
-			</form>
-		</if>
-	</ul>
-</div>
-<if test="AChasResults:|:$total">
-	{$results}
-<else />
-	<div class='no_messages'>{$this->lang->words['active_none']}</div>
-</if>
-<div class='filter_bar rounded clear clearfix'>
-	<form action='{parse url="app=core&amp;module=search&amp;do=active&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}" base="public"}' method='post'>
-	<div class='right'>
-		{$this->lang->words['getactive_for']} 
-		<select name='period'>
-			<option value='today'<if test="$this->request['period']=='today'"> selected='selected'</if>>{$this->lang->words['actperiod_today']}</option>
-			<option value='week'<if test="$this->request['period']=='week'"> selected='selected'</if>>{$this->lang->words['actperiod_week']}</option>
-			<option value='weeks'<if test="$this->request['period']=='weeks'"> selected='selected'</if>>{$this->lang->words['actperiod_weeks']}</option>
-			<option value='month'<if test="$this->request['period']=='month'"> selected='selected'</if>>{$this->lang->words['actperiod_month']}</option>
-			<option value='months'<if test="$this->request['period']=='months'"> selected='selected'</if>>{$this->lang->words['actperiod_months']}</option>
-			<option value='year'<if test="$this->request['period']=='year'"> selected='selected'</if>>{$this->lang->words['actperiod_year']}</option>
-		</select>&nbsp;
-		<input type="submit" name="gobutton" value="{$this->lang->words['active_go']}" class="input_submit alt" />
-	</div>
-	</form>
-</div>
-<if test="AChasResultsPages:|:$total">
-	<br class='clear' />{$pagination}
-</if>]]></template_content>
-      <template_name>activePostsView</template_name>
-      <template_data>$results, $pagination, $total, $sortIn</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
     <template>
       <template_group>skin_search</template_group>
       <template_content><![CDATA[<!--Begin Msg Number {$data['pid']}-->
-<br />
-<div class='maintitle links'>
-	<if test="gotonewpost:|:!$data['_isRead']"><a href='{parse url="showtopic={$data['tid']}&amp;view=getnewpost" template="showtopic" seotitle="{$data['title_seo']}" base="public"}' title='{$this->lang->words['first_unread_post']}'>{parse replacement="f_newpost"}</a></if>
-	<if test="hasForumTrail:|:$data['_forum_trail']">
-			<foreach loop="topicsForumTrail:$data['_forum_trail'] as $i => $f">
-				<a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a> <if test="notLastFt:|:$i+1 != count( $data['_forum_trail'] )">&gt;</if>
-			</foreach>
-	</if>
-	&gt; <a href="{parse url="showtopic={$data['tid']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}">{$data['topic_title']}</a>
-</div>
-<div class='post_block hentry clear <if test="postQueued:|:$data['queued'] OR $data['approved'] != 1">moderated</if>' id='post_id_{$data['pid']}'>
-	<a id='entry{$data['pid']}'></a>
+<div class='post_block hentry clear no_sidebar ipsBox_container' id='post_id_{$data['pid']}'>
 	<div class='post_wrap'>
 		<if test="postMid:|:$data['member_id']">
-			<h3>
+			<h3 class='row2'>
 		<else />
-			<h3 class='guest'>
+			<h3 class='guest row2'>
 		</if>
-			<span class='post_id'><a href='{parse url="showtopic={$data['topic_id']}&amp;view=findpost&amp;p={$data['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' rel='bookmark' title='{$this->lang->words['link_to_post']} #{$data['pid']}'>#{$data['pid']}</a></span>
-			<if test="postMember:|:$data['member_id']">
-				<if test="postOnline:|:$data['_online']">
-					{parse replacement="user_online"}
-				<else />
-					{parse replacement="user_offline"}
-				</if> &nbsp;
-					<span class="author vcard"><a class="url fn" href='{parse url="showuser={$data['member_id']}" base="public" template="showuser" seotitle="{$data['members_seo_name']}"}'>{$data['members_display_name']}</a>{parse template="user_popup" group="global" params="$data['member_id'], $data['members_seo_name']"}</span>
-			<else />
-				{$data['members_display_name']}
-			</if>
+		<if test="postModCheckbox:|:$this->memberData['g_is_supmod']">
+			<span class='right'>
+				<label for='checkbox_{$data['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$data['pid']}' name='selectedpids[]' value='{$data['pid']}' class='post_mod right'<if test="postModSelected:|:!empty( $data['_pid_selected'] )"> checked='checked'</if> />
+			</span>
+		</if>
+			<span class='post_id right ipsType_small desc blend_links'><a href='{parse url="showtopic={$data['topic_id']}&amp;view=findpost&amp;p={$data['pid']}" template="showtopic" seotitle="{$data['title_seo']}" base="public"}' rel='bookmark' title='{$this->lang->words['link_to_post']} #{$data['pid']}'>#{$data['pid']}</a></span>
+			<a href="{parse url="showtopic={$data['tid']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}">{IPSText::truncate( $data['topic_title'], 80)}</a>
 		</h3>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="array_merge( $data, array( 'posts' => $data['m_posts'] ) ), $data['pid'], array()"}
-		</div>
 		<div class='post_body'>
-			<p class='posted_info'>
-				<if test="isAdmin:|:$this->memberData['g_is_supmod']"><input type='checkbox' id='checkbox_{$data['pid']}' name='selectedpids[]' value='{$data['pid']}' class='post_mod' /></if>
-				<if test="postIcon:|:$data['icon_id']">
-					<img src="{$this->settings['public_dir']}style_extra/post_icons/icon{$data['icon_id']}.gif" alt="" />&nbsp;
+			<p class='posted_info desc lighter ipsType_small'>
+				<img src='{$data['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_tiny' /> {$this->lang->words['posted']} {$this->lang->words['search_by']}
+				<if test="postMember:|:$data['member_id']"><span class="author vcard">{parse template="userHoverCard" group="global" params="$data"}</span><else />{$data['members_display_name']}</if>
+				{$this->lang->words['on']} <abbr class="published" title="{parse expression="date( 'c', $data['_post_date'] )"}">{parse date="$data['_post_date']" format="long"}</abbr>
+				<if test="hasForumTrail:|:$data['_forum_trail']">
+					in
+					<foreach loop="topicsForumTrail:$data['_forum_trail'] as $i => $f">
+						<if test="notLastFtAsForum:|:$i+1 == count( $data['_forum_trail'] )"><a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a></if>
+					</foreach>
 				</if>
-				{$this->lang->words['posted']} <abbr class="published" title="{parse expression="date( 'c', $data['_post_date'] )"}">{parse date="$data['_post_date']" format="long"}</abbr>
 			</p>
-			<div class='post entry-content search'>
+			<div class='post entry-content'>
 				{$data['post']}
 				{$data['attachmentHtml']}
-				<br />
-				<if test="postEditBy:|:$data['edit_by']">
-					<p class='edit'>
-						{$data['edit_by']}
-						<if test="postEditByReason:|:$data['post_edit_reason'] != ''">
-							<br />
-							<span class='reason'>{$this->lang->words['reason_for_edit']} {$data['post_edit_reason']}</span>
-						</if>
-					</p>
-				</if>
-				<if test="sDeleted:|:$data['_p_isDeleted'] AND $data['permissions']['PostSoftDeleteSee']">
-					<br />
-					<div class='desc'>
-					{parse replacement="delete_post_icon"} {$this->lang->words['post_deleted_by']} <a href='{parse url="showuser={$data['sData']['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$data['sData']['members_seo_name']}"}'>{$data['sData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$data['sData']['member_id'], $data['sData']['members_seo_name']"} on {parse date="$data['sData']['sdl_obj_date']" format="long"}.
-					<if test="showReason:|:$data['permissions']['SoftDeleteReason']">
-						<if test="$data['sData']['sdl_obj_reason']">{$data['sData']['sdl_obj_reason']}<else />{$this->lang->words['no_reason_given']}</if>
-					</if>
-					</div>
-				</if>
 			</div>
-			<if test="postSignature:|:$data['signature']">
-				{parse template="signature_separator" group="global" params="$data['signature']"}
-			</if>
 		</div>
-		<ul class='post_controls'>
-			
-		</ul>
-	</div>		
-</div>]]></template_content>
+	</div>
+	<br />
+</div>
+<hr />
+<br />]]></template_content>
       <template_name>asForumPosts</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3904,19 +6395,28 @@ $hidden
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[{parse striping="searchTable" classes="row1,row2"}
-<tr class='__topic __tid{$data['tid']} {parse striping="searchTable"}<if test="$data['approved'] != 1"> moderated</if>' id='trow_{$data['tid']}'>
-	<td class='short altrow'>{parse replacement="{$data['_icon']}"}</td>
+      <template_content><![CDATA[<tr class='__topic __tid{$data['tid']} <if test="!$data['_icon']['is_read']">unread</if> expandable <if test="$data['approved'] != 1"> moderated</if>' id='trow_{$data['tid']}' data-tid="{$data['tid']}">
+	<td class='col_f_icon short altrow'>
+		{parse template="generateTopicIcon" group="global_other" params="$data['_icon'], $data['_unreadUrl']"}
+	</td>
 	<td>
-		<span class='topic_preview right'>{parse template="topic_popup" group="global" params="$data['tid']"}</span>
-		{$data['topicPrefix']}
-		<if test="gotonewpost:|:!$data['_isRead']"><a href='{parse url="showtopic={$data['tid']}&amp;view=getnewpost" template="showtopic" seotitle="{$data['title_seo']}" base="public"}' title='{$this->lang->words['first_unread_post']}'>{parse replacement="f_newpost"}</a></if>
-		<if test="topichasattach:|:$data['topic_hasattach']">
-			<a href="{$this->settings['base_url']}app=forums&amp;module=forums&amp;section=attach&amp;tid={$data['tid']}" title="{parse expression="intval($data['topic_hasattach'])"} {$this->lang->words['topic_attach']}">{parse replacement="t_attach"}</a>
+		<if test="hasPrefix:|:!empty($data['tags']['formatted']['prefix'])">
+			{$data['tags']['formatted']['prefix']}
 		</if>
-		<a href='{parse url="showtopic={$data['tid']}<if test="isNewPostTR:|:$this->request['do']=='new_posts' OR $this->request['do']=='active'">&amp;view=getnewpost<else /><if test="resultIsPostTR:|:$data['pid']">&amp;view=findpost</if>&amp;p={$data['pid']}</if>&amp;hl={$data['cleanSearchTerm']}&amp;fromsearch=1" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_result']}'>{$data['_shortTitle']}</a>
+		<h4><a href='{parse url="showtopic={$data['tid']}<if test="isNewPostTR:|:$this->request['do']=='new_posts' OR $this->request['do']=='active'">&amp;view=getnewpost<else /><if test="resultIsPostTR:|:$data['pid'] AND $data['pid'] != $data['topic_firstpost']">&amp;view=findpost&amp;p={$data['pid']}</if></if>&amp;hl={$data['cleanSearchTerm']}&amp;fromsearch=1" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_result']}'>{$data['_shortTitle']}</a></h4>
+		<span class='desc blend_links'>
+			<foreach loop="topicsForumTrail:$data['_forum_trail'] as $i => $f">
+			<if test="notLastFtAsForum:|:$i+1 == count( $data['_forum_trail'] )"><span class='desc lighter'>{$this->lang->words['search_aft_in']}</span> <a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a></if>
+			</foreach>
+		</span>
+		<span class='desc lighter blend_links toggle_notify_off'>
+			<br />{$this->lang->words['aft_started_by']} {$data['starter']}, {parse date="$data['start_date']" format="DATE"}
+			<if test="hasTags:|:count($data['tags']['formatted'])">
+				&nbsp;<img src='{$this->settings['img_url']}/icon_tag.png' /> {$data['tags']['formatted']['truncatedWithLinks']}
+			</if>
+		</span>
 		<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
-			<ul class='mini_pagination'>
+			<ul class='mini_pagination toggle_notify_off'>
 			<foreach loop="pages:$data['pages'] as $page">
 					<if test="haslastpage:|:$page['last']">
 						<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
@@ -3926,38 +6426,54 @@ $hidden
 			</foreach>
 			</ul>
 		</if>
-		<if test="topicDeletedReason:|:$data['_isDeleted']">
-			<div class='desc'>
-				{$this->lang->words['topicdeletedyb']} <a href='{parse url="showuser={$data['sData']['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$data['sData']['members_seo_name']}"}'>{$data['sData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$data['sData']['member_id'], $data['sData']['members_seo_name']"} {$this->lang->words['on']} {parse date="$data['sData']['sdl_obj_date']" format="long"}.
-				<if test="showReason:|:$data['permissions']['SoftDeleteReason']">
-					<if test="$data['sData']['sdl_obj_reason']">{$data['sData']['sdl_obj_reason']}<else />{$this->lang->words['nosdeletereason']}</if>
-				</if>
-			</div>
-		<else />
-			<if test="description:|:$data['description']"><br /><span class='desc'>{$data['description']}</span></if>
+		<if test="bothSearchUnderTitle:|:IPSSearchRegistry::get('set.searchResultType') == 'both'">
+			<span class='desc lighter blend_links toggle_notify_off'>
+				<br />{$this->lang->words['n_last_post_by']} {$data['last_poster']},
+				<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$data['_last_post']" format="DATE"}</a>
+			</span>
 		</if>
+		<if test="isFollowedStuff:|:count($data['_followData'])">
+			{parse template="followData" group="search" params="$data['_followData']"}
+		</if>			
 	</td>
-	<td class='altrow'>
-		<foreach loop="topicsForumTrail:$data['_forum_trail'] as $i => $f">
-		<if test="notLastFtAsForum:|:$i+1 == count( $data['_forum_trail'] )"><a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a></if>
-		</foreach>
+	<td class='col_f_preview __topic_preview'>
+		<a href='#' class='expander closed' title='{$this->lang->words['view_topic_preview']}'>&nbsp;</a>
 	</td>
-	<td class='short'>{$data['starter']}{parse template="user_popup" group="global" params="$data['starter_id'], $data['seo_first_name']"}</td>
-	<td class='stats altrow'>
+	<td class='col_f_views'>
 		<ul>
 			<li>{parse format_number="$data['posts']"} <if test="replylang:|:intval($data['posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if></li>
 			<li class='views desc'>{parse format_number="$data['views']"} {$this->lang->words['views']}</li>
 		</ul>
 	</td>
-	<td>
-		<ul class='last_post'>
-			<li>
-				<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse replacement="f_lastpost"}</a> <a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{$data['last_post']}</if></a>
-			</li>
-			<li>{$this->lang->words['forum_by']} {$data['last_poster']}{parse template="user_popup" group="global" params="$data['last_poster_id'], $data['seo_last_name']"}</li>
+	<td class='col_f_post'>
+		<a href='{parse url="showuser={$data['member_id']}" seotitle="{$data['members_seo_name']}" template="showuser" base="public"}' class='ipsUserPhotoLink left'>
+			<img src='{$data['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+		</a>
+		<ul class='last_post ipsType_small'>
+			<if test="bothSearch:|:IPSSearchRegistry::get('set.searchResultType') == 'both'">
+				<li>{parse template="userHoverCard" group="global" params="$data"}</li>
+				<li>
+					<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{$this->lang->words['n_posted']} {parse date="$data['_post_date']" format="DATE"}</a>
+				</li>
+			<else />
+				<li>{$data['last_poster']}</li>
+				<li>
+					<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$data['_last_post']" format="DATE"}</a>
+				</li>
+			</if>								
 		</ul>
 	</td>
-	<if test="isAdmin:|:$this->memberData['g_is_supmod']"><td><input type='checkbox' class='input_check topic_mod' id='tmod_{$data['tid']}' /></td></if>
+	<if test="isFollowedStuff:|:count($data['_followData'])">
+		<td class='col_f_mod'>
+			<input class='input_check checkall toggle_notify_on' type="checkbox" name="likes[]" value="{$data['_followData']['like_app']}-{$data['_followData']['like_area']}-{$data['_followData']['like_rel_id']}" />
+		</td>
+	<else />
+		<if test="isAdmin:|:$this->memberData['g_is_supmod']">
+			<td class='col_f_mod'>
+				<input type='checkbox' class='input_check topic_mod' id='tmod_{$data['tid']}' />
+			</td>
+		</if>
+	</if>
 </tr>
 <if test="$data['pid']">
 <script type='text/javascript'>
@@ -3966,7 +6482,7 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
 </if>]]></template_content>
       <template_name>asForumTopics</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3974,22 +6490,23 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='result_info'>
-	<h3><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$r['type_id']}&amp;do=showevent&amp;event_id={$r['type_id_2']}&amp;hl={$this->request['search_higlight']}" base="public"}'>{$r['content_title']}</a> ({parse date="$r['updated']" format="short"} {$this->lang->words['to']} {parse date="$r['misc']" format="short"})</h3>
-	<if test="showCalendarContent:|:!$resultAsTitle">
-	<p>
-		{$r['content']}
-	</p>
+      <template_content><![CDATA[<p class='notify_info toggle_notify_on'>
+	<span>
+		<if test="$followData['like_notify_do']">
+			<img src='{$this->settings['img_url']}/icon_follow_freq.png' /> &nbsp;{$this->lang->words['notify_freq_' . $followData['like_notify_freq'] ]}
+		<else />
+		 	<img src='{$this->settings['img_url']}/icon_follow_freq_none.png' /> &nbsp;{$this->lang->words['notify_freq_none']}
+		</if>
+	</span>
+	<if test="$followData['like_is_anon']">
+		<span>
+			<img src='{$this->settings['img_url']}/icon_follow_anon.png' /> &nbsp;{$this->lang->words['anonymous']}
+		</span>
 	</if>
-</div>
-<div class='result_details desc'>
-	<ul>
-		<li>{$this->lang->words['search_by']} <a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$r['members_display_name']}</a>{parse template="user_popup" group="global" params="$r['member_id']"}</li>
-	</ul>
-</div>]]></template_content>
-      <template_name>calEventRangedSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+</p>]]></template_content>
+      <template_name>followData</template_name>
+      <template_data>$followData</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3997,22 +6514,228 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='result_info'>
-	<h3><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$r['type_id']}&amp;do=showevent&amp;event_id={$r['type_id_2']}&amp;hl={$this->request['search_higlight']}" base="public"}'>{$r['content_title']}</a> ({parse date="$r['updated']" format="short"} {$this->lang->words['to']} {parse date="$r['misc']" format="short"})</h3>
-	<if test="showCalendarContent:|:!$resultAsTitle">
-	<p>
-		{$r['content']}
+      <template_content><![CDATA[{parse js_module="forums"}
+<script type='text/javascript' src='{$this->settings['public_dir']}js/ips.forums.js'></script>
+<table class='ipb_table topic_list' id='forum_table'>
+	<if test="count($results)">
+		<foreach loop="NCresultsAsForum:$results as $result">
+			{$result['html']}
+		</foreach>
+	</if>
+</table>]]></template_content>
+      <template_name>followedContentForumsWrapper</template_name>
+      <template_data>$results</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<script type='text/javascript'>
+//<!#^#|CDATA|
+	var markerURL  = "{parse url="app=forums&module=ajax&section=markasread&i=1" base="public"}"; // Ajax URL so don't use &amp;
+	var unreadIcon = "<img src='{$this->settings['img_url']}/f_icon_read.png' />";
+//|#^#]>
+</script>
+<table class='ipb_table topic_list' id='forum_table'>
+	<if test="count($results)">
+		<foreach loop="NCresultsAsForum:$results as $forum_data">
+			<tr class='<if test="$forum_data['_has_unread']">unread</if>'>
+				<td class='col_c_icon altrow'>
+					<if test="$forum_data['_has_unread']">
+						<a id='forum_img_{$forum_data['id']}' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" data-tooltip="{$this->lang->words['bi_markread']}" class='forum_marker'><img src='{$this->settings['img_url']}/f_icon.png' /></a>
+						<script type='text/javascript'>
+							ipb.global.registerMarker( "forum_img_{$forum_data['id']}", "{$forum_data['img_new_post']}", markerURL + "&forumid={$forum_data['id']}" );
+						</script>
+					<else />
+						<img src='{$this->settings['img_url']}/f_icon_read.png' />
+					</if>
+				</td>
+				<td class='col_c_forum'>
+					<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a></h4>
+					
+					<if test="showSubForums:|:$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
+						<br />
+						<ol class='ipsList_inline ipsType_small subforums toggle_notify_off' id='subforums_{$forum_data['id']}'>
+							<foreach loop="subforums:$forum_data['subforums'] as $__id => $__data">
+								<if test="showSubForumsLit:|:$__data[3]"><li class='unread'><else /><li></if>
+									<a href="{parse url="showforum={$__data[0]}" seotitle="{$__data[2]}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$__data[1]}</a>
+								</li>
+							</foreach>
+						</ol>
+					</if>
+					<if test="isFollowedStuff:|:count($forum_data['_followData'])">
+						{parse template="followData" group="search" params="$forum_data['_followData']"}
+					</if>
+				</td>
+				<td class='col_c_stats ipsType_small'>
+					<strong>{$forum_data['topics']}</strong> {$this->lang->words['topics']}<br />
+					<strong>{$forum_data['posts']}</strong> {$this->lang->words['replies']}
+				</td>
+				<td class='col_c_post'>
+					<if test="hideLastInfo:|:$forum_data['hide_last_info']">
+						<ul class='last_post'>
+							<li class='desc'>{$this->lang->words['f_protected']}</li>
+						</ul>
+					<else />
+						<if test="hasphoto:|:$forum_data['pp_small_photo'] AND !$forum_data['hide_last_info']">
+							<a href='{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}' class='ipsUserPhotoLink left'>
+								<img src='{$forum_data['pp_small_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+							</a>
+						</if>
+						<ul class='last_post ipsType_small'>
+							<if test="!$forum_data['last_id']">
+								<li class='desc lighter'><em>{$this->lang->words['f_none']}</em></li>
+							<else />
+								<li>
+									<a href='{parse url="showtopic={$forum_data['last_topic_id']}&amp;view=getnewpost" seotitle="{$forum_data['seo_last_title']}" template="showtopic" base="public"}' title="{$this->lang->words['view_new_post']}">
+										{parse expression="IPSText::truncate( $forum_data['last_title'], 28)"}
+									</a>
+								</li>
+								<if test="lastPosterID:|:$forum_data['last_poster_id']">
+									<li>{$this->lang->words['by_ucfirst']} {parse expression="IPSMember::makeProfileLink($forum_data['last_poster_name'], $forum_data['last_poster_id'], $forum_data['seo_last_name'])"}</li>
+								</if>
+								<if test="hideDateUrl:|:$forum_data['_hide_last_date']">
+									<li class='desc lighter'>{parse date="$forum_data['last_post']" format="DATE"}</li>
+								<else />
+									<li class='desc lighter blend_links'><a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse date="$forum_data['last_post']" format="DATE"}</a></li>
+								</if>
+							</if>
+						</ul>
+					</if>
+				</td>
+				<td class='col_f_mod'>
+					<input class='input_check checkall toggle_notify_on' type="checkbox" name="likes[]" value="{$forum_data['_followData']['like_app']}-{$forum_data['_followData']['like_area']}-{$forum_data['_followData']['like_rel_id']}" />
+				</td>
+			</tr>
+		</foreach>
+	</if>
+</table>]]></template_content>
+      <template_name>followedContentForumsWrapperForums</template_name>
+      <template_data>$results</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_search</template_group>
+      <template_content><![CDATA[<if test="haslikeserror:|:$error">
+<p class='message error'>
+	{$error}
+</p>
+<else />
+	<if test="hasconfirm:|:$this->request['confirm']">
+	<p class='message'>
+		{$this->lang->words['likes_rem_suc']}
 	</p>
 	</if>
+</if>
+<br />
+<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=followed&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
+<h1 class='ipsType_pagetitle'>{$this->lang->words['followed_content']}</h1>
+<div class='ipsType_pagedesc'>
+	{$this->lang->words['followed_content_desc']}
 </div>
-<div class='result_details desc'>
-	<ul>
-		<li>{$this->lang->words['search_by']} <a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$r['members_display_name']}</a>{parse template="user_popup" group="global" params="$r['member_id']"}</li>
-	</ul>
-</div>]]></template_content>
-      <template_name>calEventSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+<br />
+<div class='ipsLayout ipsLayout_withleft clearfix'>
+	<div class='ipsLayout_left'>
+		<div class='ipsBox'>
+			<div class='ipsBox_container ipsSideMenu'>
+				<h4>{$this->lang->words['filter_by_app']}</h4>
+				<ul>
+					<if test="memberFollow:|:IPSLib::appSupportsExtension( 'forums', array('like') )"><li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=followed&amp;search_app=forums&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li></if>
+					<if test="memberFollow:|:IPSLib::appSupportsExtension( 'members', array('like') )"><li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=followed&amp;search_app=members&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li></if>
+					<foreach loop="apps:$this->registry->getApplications() as $app">
+						<if test="supportsLikes:|:IPSLib::appSupportsExtension( $app['app_directory'], array('like') ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
+							<li <if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=followed&amp;search_app={$app['app_directory']}&amp;sid={$this->request['_sid']}" base="public"}'>
+									{IPSLib::getAppTitle( $app['app_directory'] )}
+								</a>
+							</li>
+				 		</if>
+					</foreach>
+				</ul>
+				<if test="is_array($contentTypes) AND count( $contentTypes )">
+					<h4>{$this->lang->words['filter_by_section']}</h4>
+					<ul>
+						<foreach loop="$contentTypes as $type">
+							<li <if test="$this->request['contentType'] == $type">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=followed&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;contentType={$type}" base="public"}'>{$this->lang->words['followed_type__' . $type]}</a>
+							</li>
+						</foreach>
+					</ul>
+				</if>
+			</div>
+		</div>
+	</div>
+	<form action="{parse url="app=core&amp;module=search&amp;do=manageFollowed&amp;search_app={$this->request['search_app']}&amp;contentType={$this->request['contentType']}" base="public"}" id="checkBoxForm" method="post">
+	<input type="hidden" name="secure_key" value="{$this->member->form_hash}" />
+	
+	<div class='right clearfix'>
+		<a href='#' id='toggle_notification' class='ipsButton_secondary'>{$this->lang->words['display_edit_options']}</a>
+	</div>
+	<br /><br />
+	
+	<div class='ipsLayout_content'>
+		<h2 class='maintitle'>
+			<span class='right'>
+				<input type='checkbox' id='checkAllLikes' class='input_check toggle_notify_on' title='{$this->lang->words['search_select_all']}' value='1' />
+			</span>
+			<if test="searchedApp:|:$this->request['search_app']">{IPSLib::getAppTitle( $this->request['search_app'] )}<else />All</if>
+		</h2>
+		<div>
+			<if test="NPTotal:|:$total">
+				{$results}
+				
+				<if test="hasLikeForMod:|:count($results)">
+					
+					<div class='moderation_bar rounded with_action toggle_notify_on'>
+						<select name='modaction' class='input_select'>
+							<option value=''>{$this->lang->words['like_mod__chose']}</option>
+							<option value='delete'>{$this->lang->words['like_mod__delete']}</option>
+							<option value='change-donotify'>{$this->lang->words['like_mod__change_donotify']}</option>
+							<option value='change-donotnotify'>{$this->lang->words['like_mod__change_nonotify']}</option>
+							<option value='change-immediate'>{$this->lang->words['like_mod__change_immediate']}</option>
+							<option value='change-offline'>{$this->lang->words['like_mod__change_offline']}</option>
+							<if test="forumsDigests:|:$this->request['search_app'] == 'forums'">
+								<option value='change-daily'>{$this->lang->words['like_mod__change_daily']}</option>
+								<option value='change-weekly'>{$this->lang->words['like_mod__change_weekly']}</option>
+							</if>
+							<option value='change-anon'>{$this->lang->words['like_mod__change_anon']}</option>
+							<option value='change-noanon'>{$this->lang->words['like_mod__change_noanon']}</option>
+						</select>
+							
+						<input type="submit" class="input_submit alt" value="{$this->lang->words['update_selected']}" />
+					</div>
+				</if>
+				<br />
+				{$pagination}
+			<else />
+				<p class='no_messages'>{$this->lang->words['followed_content_none']}</p>
+			</if>
+		</div>
+	</div>
+	
+	</form>
+</div>
+<br class='clear' />
+<script type='text/javascript'>
+	ipb.global.registerCheckAll('checkAllLikes', 'checkall');
+	
+	if( $('toggle_notification') ){
+		$('toggle_notification').observe( 'click', function(e){
+			Event.stop(e);
+			$('checkBoxForm').toggleClassName('show_notify');
+		});
+	}
+</script>]]></template_content>
+      <template_name>followedContentView</template_name>
+      <template_data>$results, $pagination, $total, $error, $contentTypes</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4024,34 +6747,33 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
 	<span class='search_msg'>
 		{$this->lang->words['s_forum_desc']}
 	</span>
-	<ul>
-		<li>
-			<label for='forums_filter'>{$this->lang->words['find_forum']}</label>
-			<select name='search_app_filters[forums][forums][]' class='input input_select' size='6' multiple='multiple'>
-				{$forums}
-			</select>
+	<ul class='ipsForm_horizontal'>
+		<li class='ipsField ipsField_select clear'>
+			<label class='ipsField_title' for='forums_filter'>{$this->lang->words['find_forum']}</label>
+			<p class='ipsField_content'>
+				<select name='search_app_filters[forums][forums][]' class='input input_select' size='6' multiple='multiple'>
+					{$forums}
+				</select>
+			</p>
 		</li>
-		<li>
-			<label for='forums_type'>{$this->lang->words['s_forum_content']}</label>
-			<select id='forums_type' class='input_select' name='search_app_filters[forums][contentOnly]'>
-				<option value='0'>{$this->lang->words['s_search_topics_posts']}</option>
-				<option value='1'>{$this->lang->words['s_search_posts']}</option>
-			</select>
+		<li class='ipsField clear'>
+			<label class='ipsField_title' for='forums_display'>{$this->lang->words['s_forum_display']}</label>
+			<p class='ipsField_content'>
+				<input type='radio' name='search_app_filters[forums][noPreview]' value='0' /> {$this->lang->words['s_forum_asposts']}&nbsp;&nbsp;&nbsp;
+				<input type='radio' name='search_app_filters[forums][noPreview]' value='1' checked="checked" /> {$this->lang->words['s_forum_astopics']}
+			</p>
 		</li>
-		<li>
-			<label for='forums_display'>{$this->lang->words['s_forum_display']}</label>
-			<input type='radio' name='search_app_filters[forums][noPreview]' value='0' /> {$this->lang->words['s_forum_asposts']}&nbsp;&nbsp;&nbsp;
-			<input type='radio' name='search_app_filters[forums][noPreview]' value='1' checked="checked" /> {$this->lang->words['s_forum_astopics']}
-		</li>
-		<li>
-			<label for='f_p_data'>{$this->lang->words['s_forum_stuff']}</label>
-			{parse expression="sprintf( $this->lang->words['s_forum_stuff_2'], "<input id='f_p_count' type='text' name='search_app_filters[forums][pCount]' class='input_text' style='vertical-align: middle; width:40px' size='5' value='' />", "<input id='f_p_views' type='text' name='search_app_filters[forums][pViews]' class='input_text' style='vertical-align: middle; width:40px' size='5' value='' />")"}
+		<li class='ipsField clear'>
+			<label class='ipsField_title' for='f_p_data'>{$this->lang->words['s_forum_stuff']}</label>
+			<p class='ipsField_content'>
+				{parse expression="sprintf( $this->lang->words['s_forum_stuff_2'], "<input id='f_p_count' type='text' name='search_app_filters[forums][pCount]' class='input_text' style='vertical-align: middle; width:40px' size='5' value='' />", "<input id='f_p_views' type='text' name='search_app_filters[forums][pViews]' class='input_text' style='vertical-align: middle; width:40px' size='5' value='' />")"}
+			</p>
 		</li>
 	</ul>
 </fieldset>]]></template_content>
       <template_name>forumAdvancedSearchFilters</template_name>
       <template_data>$forums</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4059,72 +6781,27 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<fieldset class='{parse striping="search"}'>
-	<span class='search_msg'>
-		{$this->lang->words['s_gallery_desc']}
-	</span>
-	<ul>
-		<if test="is_array( $cats_dd ) && count( $cats_dd )">
-		<li>
-			<label for='forums_filter'>{$this->lang->words['find_in_category']}</label>
-			<select name='search_app_filters[gallery][cats][]' class='input input_select' size='6' multiple='multiple'>
-				<foreach loop="categories:$cats_dd as $a">
-					<option value='{$a[0]}'>{$a[1]}</option>
-				</foreach>
-			</select>
-		</li>
-		</if>
-		<li>
-			<label for='forums_filter'>{$this->lang->words['find_in_albums']}</label>
-			<input type='checkbox' name='search_app_filters[gallery][excludeAlbums]' value='1' class='input_check' />
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>galleryAdvancedSearchFilters</template_name>
-      <template_data><![CDATA[$cats_dd='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='result_info'>
-	<span class='icon'>{$r['image']}</span>
-	<h3><a href='{parse url="app=gallery&amp;module=images&amp;section=viewimage&amp;img={$r['type_id_2']}" base="public"}'>{$r['content_title']}</a></h3>
-	<span class='desc breadcrumb'>
-		{$this->lang->words['searchresult_leftby']} <a href='{parse url="showuser={$r['author_id']}" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['author_name']}</a>{parse template="user_popup" group="global" params="$r['author_id'],$r['members_seo_name']"} on {parse date="$r['post_date']" format="short"}
-	</span>
-	<p>{$r['content']}</p>
-</div>]]></template_content>
-      <template_name>galleryCommentSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='gallery_block row1'>
-	<div class='wrap'>
-		<p class='image_wrap'>
-			{$r['image']}
-		</p>
-		<h3>
-			<a href='{parse url="app=gallery&amp;module=images&amp;section=viewimage&amp;img={$r['id']}" base="public" seotitle="{$r['caption_seo']}" template="viewimage"}' title='{$this->lang->words['view']}'>{parse expression="IPSText::truncate( $r['content_title'], 40 )"}</a>
-		</h3>
-		<a href='{parse url="app=gallery&amp;module=user&amp;user={$r['member_id']}" seotitle="{$r['members_seo_name']}" template="galuser" base="public"}' class='user'>{$r['members_display_name']}</a>
-			<p class='info desc'>
-				{parse expression="sprintf( $this->lang->words['image_list_stats'], $r['comments'], $r['_queued_comments'], $r['views'], $r['_image_notes_count'] )"}
-			</p>
+      <template_content><![CDATA[<h3>
+	{$this->lang->words['vnc_filters_header']}
+</h3>
+<div class='fixed_inner ipsBox ipsLayout clearfix'>
+	<div class='ipsLayout_content ipsBox_container search_filter_container'>
+		<div id="vnc_filter_popup_close"><a class='input_submit' id='save_vnc_filters' href='#'>{$this->lang->words['save_vnc_filters']}</a> &nbsp;&nbsp;{$this->lang->words['or']}&nbsp;&nbsp;<a href='#' id='cancel_vnc_filters' class='cancel'>{$this->lang->words['cancel']}</a></div>
+		<ul class='block_list'>
+			<li class='clickable<if test="noFiltersSet:|:$currentPrefs == null OR !count($currentPrefs)"> active</if>' id='forum_all'><span><strong>{$this->lang->words['vnc_filter_showall_forums']}</strong></span><input type='hidden' name='forum_all' id='hf_all' value='<if test="noFiltersSet:|:$currentPrefs == null OR !count($currentPrefs)">1</if>' /></li>
+			<foreach loop="forumlist:$data as $_data">
+				<if test="hasTitle:|: ! empty( $_data['important'] )">
+					<li><span class='heading'>{$_data['title']}</span></li>
+				<else />
+					<li class='clickable<if test="hasFiltersSet:|:count($currentPrefs) AND in_array($_data['id'], $currentPrefs)"> active</if>' id='forum_{$_data['id']}'><if test="depth:|:!empty($_data['depth'])"></if><span>{parse expression="str_repeat( '&nbsp;&nbsp;&nbsp;&nbsp;', $_data['depth'])"}{$_data['title']}</span><input type='hidden' name='forum_{$_data['id']}' id='hf_{$_data['id']}' value='<if test="hasFiltersSet:|:count($currentPrefs) AND in_array($_data['id'], $currentPrefs)">1<else />0</if>' /></li>
+				</if>
+			</foreach>
+		</ul>
 	</div>
 </div>]]></template_content>
-      <template_name>galleryImageSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_name>forumsVncFilters</template_name>
+      <template_data>$data, $currentPrefs</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4136,7 +6813,7 @@ ipb.global.searchResults[ {$data['tid']} ] = { pid: {parse expression="intval($d
 $st = IPSSearchRegistry::get('in.search_higlight');
 </php>
 <div class='result_info'>
-	<h3><a href='{parse url="app=core&amp;module=help&amp;do=01&amp;HID={$r['type_id_2']}&amp;hl=$st" base="public"}'>{$r['content_title']}</a></h3>
+	<h3><a href='{parse url="app=core&amp;module=help&amp;do=01&amp;HID={$r['type_id_2']}&amp;hl={$st}" base="public"}'>{$r['content_title']}</a></h3>
 	<if test="showHelpContent:|:!$resultAsTitle">
 	<p>
 		{$r['content']}
@@ -4145,7 +6822,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 </div>]]></template_content>
       <template_name>helpSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4153,27 +6830,63 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<if test="showMemberData:|:!$resultAsTitle">
+      <template_content><![CDATA[<if test="isReply:|: ! empty( $r['reply_id'] )">
 	<span class='icon'>
-		<if test="$r['misc']['pp_thumb_photo']">
-			<img src='{parse url="/{$r['misc']['pp_thumb_photo']}" base="upload"}' class='photo' alt='' />
-		<else />
-			<img src='{$this->settings['img_url']}/profile/default_thumb.png' class='photo' alt='' />
-		</if>
+		{parse expression="IPSMember::buildPhotoTag( $r['reply_author'], 'small' )"}<if test="forSomeoneElseImg:|:$r['reply_author']['member_id'] != $r['status_member_id']">{parse expression="IPSMember::buildPhotoTag( $r['status_member'], 'inset' )"}</if>
 	</span>
-</if>
-<div class='result_info'>
-	<h3><a href='{parse url="showuser={$r['member_id']}" seotitle="{$r['members_seo_name']}" base="public"}'>{parse expression="sprintf( $this->lang->words['their_profile'], $r['members_display_name'] )"}</a>{parse template="user_popup" group="global" params="$r['member_id'],$r['members_seo_name']"}</h3>
-	<span class='desc breadcrumb'>
-		{$this->lang->words['searchresult_leftby']} <a href='{parse url="showuser={$r['comment_by_member_id']}" seotitle="{$r['members_seo_name_from']}" base="public"}'>{$r['members_display_name_from']}</a>{parse template="user_popup" group="global" params="$r['comment_by_member_id'],$r['members_seo_name_from']"} on {parse date="$r['updated']" format="short"}
-	</span>
-	<p>
-		{$r['content']}
-	</p>
-</div>]]></template_content>
+	<div class='result_info'>
+		<h3>
+			{parse template="userHoverCard" group="global" params="$r['reply_author']"}
+			<if test="forSomeoneElse:|:$r['reply_author']['member_id'] != $r['status_member_id']">
+				&rarr;
+				{parse template="userHoverCard" group="global" params="$r['status_member']"}
+			</if>
+		</h3>
+		<span class='desc breadcrumb'>
+			<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$r['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{$this->lang->words['results_pf_reply']}</a>,
+		   {parse date="$r['reply_date']" format="short"}
+		</span>
+		<p>
+			{$r['reply_content']}
+		</p>
+	</div>
+<else />
+	<if test="isUpdate:|: $r['status_member_id'] == $r['status_author_id']">
+		<span class='icon'>
+			{parse expression="IPSMember::buildPhotoTag( $r['status_author'], 'small' )"}
+		</span>
+		<div class='result_info'>
+			<h3>{parse template="userHoverCard" group="global" params="$r['status_author']"}</h3>
+			<span class='desc breadcrumb'>
+				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$r['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{$this->lang->words['results_pf_status']}</a>, {parse date="$r['status_date']" format="short"}
+			</span>
+			<p>
+				{$r['status_content']}
+			</p>
+		</div>
+	<else />
+		<span class='icon'>
+			{parse expression="IPSMember::buildPhotoTag( $r['status_author'], 'small' )"}
+			{parse expression="IPSMember::buildPhotoTag( $r['status_member'], 'inset' )"}
+		</span>
+		<div class='result_info'>
+			<h3>
+				{parse template="userHoverCard" group="global" params="$r['status_author']"}
+				&rarr;
+				{parse template="userHoverCard" group="global" params="$r['status_member']"}
+			</h3>
+			<span class='desc breadcrumb'>
+				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$r['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{$this->lang->words['results_pf_comment']}</a>, {parse date="$r['status_date']" format="short"}
+			</span>
+			<p>
+				{$r['status_content']}
+			</p>
+		</div>
+	</if>
+</if>]]></template_content>
       <template_name>memberCommentsSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4183,22 +6896,21 @@ $st = IPSSearchRegistry::get('in.search_higlight');
       <template_group>skin_search</template_group>
       <template_content><![CDATA[<if test="showMemberData:|:!$resultAsTitle">
 	<span class='icon'>
-		<if test="$r['misc']['pp_thumb_photo']">
-			<img src='{parse url="/{$r['misc']['pp_thumb_photo']}" base="upload"}' class='photo' />
-		<else />
-			<img src='{$this->settings['img_url']}/profile/default_thumb.png' class='photo' />
-		</if>
+		<a href='{parse url="showuser={$r['type_id_2']}" seotitle="{$r['members_seo_name']}" base="public"}' class='ipsUserPhotoLink'>
+			{IPSMember::buildPhotoTag( $r, 'small' )}
+		</a>
 	</span>
 </if>
 <div class='result_info'>
-	<h3><a href='{parse url="showuser={$r['type_id_2']}" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['content_title']}</a>{parse template="user_popup" group="global" params="$r['type_id_2'],$r['members_seo_name']"}</h3>
-	<span class='desc breadcrumb'>
-		{$this->lang->words['member_joined']} {parse date="$r['joined']" format="short"}
+	<h3><a href='{parse url="showuser={$r['type_id_2']}" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['content_title']}</a></h3>
+	<span class='desc lighter breadcrumb'>
+		{$this->lang->words['member_joined']} {parse date="$r['joined']" format="short"}<br />
+		{IPSMember::makeNameFormatted( $r['group'], $r['member_group_id'] )} &middot; {parse format_number="$r['posts']"} {$this->lang->words['member_posts']}
 	</span>
 </div>]]></template_content>
       <template_name>memberSearchResult</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4206,79 +6918,129 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['new_content']}</h2>
-<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=new_posts&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
-<if test="NPhasResults:|:$total">
-	<p class='message'>
-		{$this->lang->words['new_content_there']} <strong>{$total}</strong> {$this->lang->words['new_content_entries']} <if test="$dateCutSet">{$this->lang->words['new_content_since']} {parse date="$dateCutSet" format="joined"}</if>
-	</p>
-	<br />
-	<div class='topic_controls'>
-		{$pagination}
-	</div>
-</if>
-<ol id='member_alpha' class='tab_bar'>
-	<!--harcoded forums, members, system apps-->
-	<if test="IPSLib::appisSearchable( 'forums', 'vnc' )">
-		<if test="forumsTab:|:$this->request['search_app'] == 'forums'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'forums' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_app=forums&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
-		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'members', 'vnc' )">
-		<if test="membersTab:|:$this->request['search_app'] == 'members'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'members' )}</strong></li>
-		<else />
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_app=members&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
-		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'core', 'vnc' )">
-		<if test="helpTab:|:$this->request['search_app'] == 'core'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'core' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_app=core&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
-		</if>
-	</if>
-	<foreach loop="apps:$this->registry->getApplications() as $app">
-		<if test="appIsSearchable:|:IPSLib::appisSearchable( $app['app_directory'], 'vnc' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
-			<if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">
-				<li class='active'><strong>{IPSLib::getAppTitle( $app['app_directory'] )}</strong></li>
-			<else />				
-				<li><a href='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_app={$app['app_directory']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
-			</if>
- 		</if>
-	</foreach>
-</ol>
-<div class='tab_filters'>
-	<ul class='right'>
-		<if test="is_array($sortIn) AND count( $sortIn )">
-			<form action='{parse url="app=core&amp;module=search&amp;do=new_posts&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}" base="public"}' method='post'>
-			<select name='search_app_filters[{$this->request['search_app']}][searchInKey]' class='input_select' style='width:auto'>
-				<foreach loop="$sortIn as $id => $_data">
-					<option value='$_data[0]' <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">selected='selected'</if>>{$_data[1]}</option>
-				</foreach>
-			</select>
-			<input type='submit' class='input_submit alt' value='{$this->lang->words['s_update']}' />
-			</form>
-		</if>
-	</ul>
-	<ul class='right padded'>
-		<if test="$this->request['search_app'] == 'forums'">
-			<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=all&amp;k={$this->member->form_hash}" base="public"}" title='{$this->lang->words['mark_all_as_read']}'>{$this->lang->words['s_mark_all_read']}</a>&nbsp;&nbsp;
-		</if>
-	</ul>
+      <template_content><![CDATA[{parse js_module="search"}
+<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
+<h1 class='ipsType_pagetitle'>{$this->lang->words['new_content']}</h1>
+<div class='ipsType_pagedesc'>
+	{$this->lang->words['new_content_desc']}
 </div>
-<if test="NPTotal:|:$total">
-	{$results}
-	<br />
-	{$pagination}
-<else />
-	<p class='no_messages'>{$this->lang->words['new_content_none']}</p>
-</if>]]></template_content>
-      <template_name>newPostsView</template_name>
+<br />
+<div class='ipsLayout ipsLayout_withleft clearfix'>
+	<div class='ipsLayout_left'>
+		<div class='ipsBox'>
+			<div class='ipsBox_container ipsSideMenu'>
+				<h4>{$this->lang->words['filter_by_app']}</h4>
+				<ul>
+					<if test="IPSLib::appIsSearchable( 'forums', 'vnc' ) || IPSLib::appIsSearchable( 'forums', 'active' )">
+						<li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=forums&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'members', 'vnc' ) || IPSLib::appIsSearchable( 'members', 'active' )">
+						<li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=members&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'core', 'vnc' ) || IPSLib::appIsSearchable( 'core', 'active' )">
+						<li <if test="helpTab:|:$this->request['search_app'] == 'core'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app=core&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
+					</if>
+					<foreach loop="apps:$this->registry->getApplications() as $app">
+						<if test="appIsSearchable:|:(IPSLib::appIsSearchable( $app['app_directory'], 'vnc' ) || IPSLib::appIsSearchable( $app['app_directory'], 'active' ) ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
+							<li <if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$app['app_directory']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>
+									{IPSLib::getAppTitle( $app['app_directory'] )}
+								</a>
+							</li>
+				 		</if>
+					</foreach>
+				</ul>
+			
+				<if test="is_array($sortIn) AND count( $sortIn )">
+					<h4>{$this->lang->words['filter_by_section']}</h4>
+					<ul>
+						<foreach loop="$sortIn as $id => $_data">
+							<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$_data['0']}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$_data[1]}</a>
+							</li>
+						</foreach>
+					</ul>
+				</if>
+			
+				<h4>{$this->lang->words['filter_by_time']}</h4>
+				<ul>
+					<if test="hazVNC:|:IPSLib::appIsSearchable( IPSSearchRegistry::get('in.search_app'), 'vncWithUnreadContent' ) AND $this->memberData['member_id']">
+						<li <if test="$this->request['period']=='unread'">class='active'</if>>
+							<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=unread&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['filter_not_read']}</a>
+						</li>
+					</if>
+					<if test="hazMember:|:$this->memberData['member_id']">
+						<li <if test="$this->request['period']=='lastvisit'">class='active'</if>>
+							<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=lastvisit&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['filter_new_visit']}</a>
+						</li>
+					</if>
+					<li <if test="$this->request['period']=='today'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=today&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_today']}</a>
+					</li>
+					<li <if test="$this->request['period']=='week'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=week&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_week']}</a>
+					</li>
+					<li <if test="$this->request['period']=='weeks'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=weeks&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_weeks']}</a>
+					</li>
+					<li <if test="$this->request['period']=='month'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=month&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_month']}</a>
+					</li>
+					<li <if test="$this->request['period']=='months'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=months&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_months']}</a>
+					</li>
+					<li <if test="$this->request['period']=='year'">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period=year&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}" base="public"}'>{$this->lang->words['actperiod_year']}</a>
+					</li>
+				</ul>
+				
+				<if test="canFollowFilter:|:IPSLib::appIsSearchable( $this->request['search_app'], 'vncWithFollowFilter' ) AND $this->memberData['member_id']">
+					<h4>{$this->lang->words['filter_by_other']}</h4>
+					<ul>
+						<if test="checked:|:$this->request['followedItemsOnly']">
+							<li class="active">
+								<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly=0" base="public"}'>{$this->lang->words['filter_i_follow']}</a>
+							</li>
+						<else />
+							<li>
+								<a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request[ $this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] ]}&amp;period={$this->request['period']}&amp;userMode={$this->request['userMode']}&amp;followedItemsOnly=1" base="public"}'>{$this->lang->words['filter_i_follow']}</a>
+							</li>
+						</if>
+						<li <if test="$this->request['userMode'] == 'all'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period={$this->request['period']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}&amp;userMode=<if test="$this->request['userMode'] != 'all'">all</if>" base="public"}'>{$this->lang->words['vnc_topics_and_posts']}</a></li>
+						<li <if test="$this->request['userMode'] == 'title'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=viewNewContent&amp;search_app={$this->request['search_app']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;period={$this->request['period']}&amp;followedItemsOnly={$this->request['followedItemsOnly']}&amp;userMode=<if test="$this->request['userMode'] != 'title'">title</if>" base="public"}'>{$this->lang->words['vnc_topics_only']}</a></li>
+						<if test="vncFilterForumsOnly:|:$this->request['search_app'] == 'forums'"><li <if test="hasFilters:|:IPSSearchRegistry::get('forums.vncForumFilters') != null">class='active'</if>><a href='' id='vncForumFilter'>{$this->lang->words['vnc_filter_by_forum']}</a></li></if>
+					</ul>
+				</if>
+			</div>
+		</div>
+	</div>
+	<div class='ipsLayout_content'>
+		<div class='clearfix'>
+			{$pagination}
+		</div>
+		<h2 class='maintitle'>
+			<if test="searchismod:|:$this->memberData['g_is_supmod'] == 1">
+				<span class='right'>
+					<input type='checkbox' id='tmod_all' class='input_check' title='{$this->lang->words['search_select_all']}' value='1' />
+				</span>
+			</if>
+			{IPSLib::getAppTitle( $this->request['search_app'] )}
+		</h2>
+		<div>
+			<if test="NPTotal:|:$total">
+				{$results}
+				<br />
+				{$pagination}
+			<else />
+				<p class='no_messages'>{$this->lang->words['new_content_none']}</p>
+			</if>
+		</div>
+	</div>
+</div>
+<br class='clear' />]]></template_content>
+      <template_name>newContentView</template_name>
       <template_data>$results, $pagination, $total, $sortDropDown, $sortIn, $dateCutSet=0</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4287,10 +7049,11 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     <template>
       <template_group>skin_search</template_group>
       <template_content><![CDATA[<style type='text/css'>
- 	@import url('{$this->settings['public_dir']}/style_css/{$this->registry->output->skin['_csscacheid']}/calendar_select.css');
+ 	@import url('{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/calendar_select.css');
 </style>
 <script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/calendar_date_select/calendar_date_select.js'></script>
 {parse js_module="search"}
+<h1 class='ipsType_pagetitle'>{$this->lang->words['search']}</h1>
 <if test="searchTermsRemoved:|:is_array( $removed_search_terms ) && count( $removed_search_terms )">
 <br />
 <p class='message error'>{$this->lang->words['removed_search_terms']} <strong>{parse expression="implode( ',', $removed_search_terms )"}</strong></p>
@@ -4300,59 +7063,101 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 <p class='message error'>{$msg}</p>
 </if>
 <br />
-<form action="{parse url="app=core&amp;module=search&amp;section=search&amp;do=search" base="public"}&amp;fromsearch=1" method="post" id='search-box' >
-	<input type='hidden' name='search_app' id='search_app' value='{$this->request['search_app']}' />
-	<h2 class='maintitle'>{$this->lang->words['search']}</h2>
-	<div id='main_search_form' class='clear row2 altrow'>
-		<fieldset id='main_search'>
-			<ul>
-				<li>
-					<label for='query'>{$this->lang->words['find_words']}</label>
-					<input type='text' class='input_text' name='search_term' id='query' value='{$this->request['search_term']}' /><br />
-					<span class='desc'>{$this->lang->words['s_andor_quotes']}</span>
+<div class='ipsBox' id='main_search_form'>
+	<form action="{parse url="app=core&amp;module=search&amp;section=search&amp;do=search" base="public"}&amp;fromsearch=1" method="post" id='search-box' >
+		<input type='hidden' name='search_app' id='search_app' value='{$this->request['search_app']}' />
+		<fieldset id='' class='ipsBox_container ipsPad'>
+			<ul class='ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='query' class='ipsField_title'>{$this->lang->words['find_words']}</label>
+					<p class='ipsField_content'>
+						<input type='text' class='input_text' name='search_term' id='query' value='{$this->request['search_term']}' size='50' /><br />
+						<span class='desc lighter'>{$this->lang->words['s_andor_quotes']}</span>
+					</p>
 				</li>
 			</ul>
 		</fieldset>
 		
-		<fieldset id='other_filters'>
-			<ul>
-				<li>
-					<label for='andor_type'><strong>{$this->lang->words['matchlabel']}</strong></label>
-					<if test="isFullText:|:$this->settings['use_fulltext'] AND $this->DB->checkBooleanFulltextSupport()">
-						<select name="andor_type" id="andor_type">
-							<option value="and" <if test="$this->settings['s_andor_type'] == 'and'">selected='selected'</if>>{$this->lang->words['s_andor_and']}</option>
-							<option value="or" <if test="$this->settings['s_andor_type'] == 'or'">selected='selected'</if>>{$this->lang->words['s_andor_or']}</option>
+		<fieldset id='other_filters' class='ipsBox_container ipsPad'>
+			<ul class='ipsForm_horizontal'>
+				<li class='ipsField ipsField_select clear'>
+					<label for='andor_type' class='ipsField_title'><strong>{$this->lang->words['matchlabel']}</strong></label>
+					<p class='ipsField_content'>
+						<if test="isFullText:|:$this->settings['use_fulltext'] AND $this->DB->checkBooleanFulltextSupport()">
+							<select name="andor_type" id="andor_type">
+								<option value="and" <if test="$this->settings['s_andor_type'] == 'and'">selected='selected'</if>>{$this->lang->words['s_andor_and']}</option>
+								<option value="or" <if test="$this->settings['s_andor_type'] == 'or'">selected='selected'</if>>{$this->lang->words['s_andor_or']}</option>
+							</select>
+							&nbsp;&nbsp;
+						</if>
+						
+						<select name="search_content" id="search_content">
+							<option value="both">{$this->lang->words['search_both_types']}</option>
+							<option value="titles">{$this->lang->words['search_titles_types']}</option>
+							<option value="content">{$this->lang->words['search_content_types']}</option>
 						</select>
-						&nbsp;&nbsp;
-					</if>
-					<input type='checkbox' class='input_check' name='content_title_only' value='1'>&nbsp;&nbsp;{$this->lang->words['search_titles_only']}
+					</p>
 				</li>
-				<li>
-					<label for='author'>{$this->lang->words['find_author']}</label>
-					<input type='text' class='input_text input' name='search_author' id='author' value='{$this->request['search_author']}' />
+				<if test="tagyouareit:|:$canTag">
+					<li class='ipsField clear'>
+						<label for='tags' class='ipsField_title'>{$this->lang->words['find_by_tags']}</label>
+						<p class='ipsField_content'>
+							<input type='text' class='input_text input' name='search_tags' id='tags' value='{$this->request['find_by_tags']}' size='50' />
+							<br />
+							<span class='desc lighter'>{$this->lang->words['find_by_tags_desc']}</span>
+						</p>
+					</li>
+				</if>
+				<li class='ipsField clear'>
+					<label for='author' class='ipsField_title'>{$this->lang->words['find_author']}</label>
+					<p class='ipsField_content'>
+						<input type='text' class='input_text input' name='search_author' id='author' value='{$this->request['search_author']}' size='50' />
+					</p>
 				</li>
-				<li>
-					<label for='date_start'>{$this->lang->words['find_date']}</label>
-					<input type='text' class='input_text date' name='search_date_start' id='date_start' value='{$this->request['_search_date_start']}' /><img src='{$this->settings['img_url']}/date.png' alt='' id='date_start_icon' style='cursor: pointer' /> &nbsp;
-					<strong>{$this->lang->words['to']}</strong> &nbsp;<input type='text' class='input_text date' name='search_date_end' id='date_end' value='{$this->request['_search_date_end']}' /><img src='{$this->settings['img_url']}/date.png' alt='' id='date_end_icon' style='cursor: pointer' />
+				<li class='ipsField clear'>
+					<label for='date_start' class='ipsField_title'>{$this->lang->words['find_date']}</label>
+					<p class='ipsField_content'>
+						<input type='text' class='input_text' name='search_date_start' id='date_start' value='{$this->request['_search_date_start']}' /><img src='{$this->settings['img_url']}/date.png' alt='' id='date_start_icon' style='cursor: pointer' /> &nbsp;
+						<strong>{$this->lang->words['to']}</strong> &nbsp;<input type='text' class='input_text' name='search_date_end' id='date_end' value='{$this->request['_search_date_end']}' /><img src='{$this->settings['img_url']}/date.png' alt='' id='date_end_icon' style='cursor: pointer' />
+					</p>
 				</li>
 				<if test="count($filters)">
-					<li class='app_chooser'>
-						<label style='float: left' for=''>{$this->lang->words['search_section']}</label>
-						<ul id='sapps'>
-							<foreach loop="$filters as $app => $data">
-								<li style='display: inline-block;' class='search_app' id='sapp_{$app}'>
-									<input type='radio' name='search_app' value='{$app}' id='radio_{$app}' <if test="$app == $this->request['search_app']">checked="checked"</if> /> <label for='radio_{$app}'>{IPSLib::getAppTitle( $app )}</label>
-								</li>
-							</foreach>
-						</ul>
+					<li class='ipsField app_chooser'>
+						<label class='ipsField_title' for=''>{$this->lang->words['search_section']}</label>
+						<div class='ipsField_content'>
+							<ul id='sapps'>
+								<if test="IPSLib::appIsSearchable( 'forums', 'search' )">
+									<li style='display: inline-block;' class='search_app' id='sapp_forums'>
+										<input type='radio' name='search_app' value='forums' id='radio_forums' <if test="$this->request['search_app'] == 'forums'">checked="checked"</if> /> <label for='radio_forums'>{IPSLib::getAppTitle( 'forums' )}</label>
+									</li>
+								</if>
+								<if test="IPSLib::appIsSearchable( 'members', 'search' )">
+									<li style='display: inline-block;' class='search_app' id='sapp_members'>
+										<input type='radio' name='search_app' value='members' id='radio_members' <if test="$this->request['search_app'] == 'members'">checked="checked"</if> /> <label for='radio_members'>{IPSLib::getAppTitle( 'members' )}</label>
+									</li>
+								</if>
+								<if test="IPSLib::appIsSearchable( 'core', 'search' )">
+									<li style='display: inline-block;' class='search_app' id='sapp_core'>
+										<input type='radio' name='search_app' value='core' id='radio_core' <if test="$this->request['search_app'] == 'core'">checked="checked"</if> /> <label for='radio_core'>{IPSLib::getAppTitle( 'core' )}</label>
+									</li>
+								</if>
+			
+								<foreach loop="appLoop:$this->registry->getApplications() as $app => $data">
+									<if test="IPSLib::appIsSearchable( $app, 'search' ) AND !in_array( $app, array( 'forums', 'members', 'core' ) )">
+										<li style='display: inline-block;' class='search_app' id='sapp_{$app}'>
+											<input type='radio' name='search_app' value='{$app}' id='radio_{$app}' <if test="$app == $this->request['search_app']">checked="checked"</if> /> <label for='radio_{$app}'>{IPSLib::getAppTitle( $app )}</label>
+										</li>
+									</if>
+								</foreach>
+							</ul>
+						</div>
 					</li>
 				</if>
 			</ul>
 		</fieldset>
 		<if test="count($filters)">
 			<foreach loop="$filters as $app => $data">
-				<div id='app_filter_{$app}' style='display: none'>
+				<div id='app_filter_{$app}' class='ipsBox_container ipsPad' style='display: none'>
 					<if test="!empty($data['html'])">
 						{$data['html']}
 					</if>
@@ -4360,35 +7165,39 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 						<fieldset class='{parse striping="search"}'>
 							<if test="is_array($data['sortDropIn']) AND count( $data['sortDropIn'] )">
 								<foreach loop="$data['sortDropIn'] as $id => $_data">
-									<ul>
-										<li>
-											<label for='search_by_{$_data[0]}'><if test="! $id">{$this->lang->words['s_member_sin']}<else />&nbsp;</if></label>
-											<input type='radio' name='search_app_filters[$app][searchInKey]' value='{$_data[0]}' <if test="$this->request['search_app_filters'][$app]['searchInKey'] == $_data[0] || ( ! $this->request['search_app_filters'][$app]['searchInKey'] AND ! $id )">checked="checked"</if> /> $_data[1]
-											<select name='search_app_filters[$app][{$_data[0]}][sortKey]' class='input_select' style='width:auto'>
-											<foreach loop="$data['sortDropDown'][$_data[0]] as $k => $l">
-												<option value='$k' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortKey'.$_data[0]] == $k">selected='selected'</if>>{$l}</option>
-											</foreach>
-											</select>
-											<select name='search_app_filters[$app][{$_data[0]}][sortDir]' class='input_select' style='width:auto'>
-												<option value='0' <if test="!$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-												<option value='1' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
-											</select>
+									<ul class='ipsForm_horizontal'>
+										<li class='ipsField ipsField_select'>
+											<label class='ipsField_title' for='search_by_{$_data[0]}'><if test="! $id">{$this->lang->words['s_member_sin']}<else />&nbsp;</if></label>
+											<p class='ipsField_content'>
+												<input type='radio' name='search_app_filters[$app][searchInKey]' value='{$_data[0]}' <if test="$this->request['search_app_filters'][$app]['searchInKey'] == $_data[0] || ( ! $this->request['search_app_filters'][$app]['searchInKey'] AND ! $id )">checked="checked"</if> /> $_data[1]
+												<select name='search_app_filters[$app][{$_data[0]}][sortKey]' class='input_select' style='width:auto'>
+												<foreach loop="$data['sortDropDown'][$_data[0]] as $k => $l">
+													<option value='$k' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortKey'.$_data[0]] == $k">selected='selected'</if>>{$l}</option>
+												</foreach>
+												</select>
+												<select name='search_app_filters[$app][{$_data[0]}][sortDir]' class='input_select' style='width:auto'>
+													<option value='0' <if test="!$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
+													<option value='1' <if test="$this->request['search_app_filters'][$app][$_data[0]]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
+												</select>
+											</p>
 										</li>
 									</ul>
 								</foreach>
 							<else />
-								<ul>
-									<li>
-										<label for='search_by'>{$this->lang->words['s_search_type']}</label>
-										<select name='search_app_filters[$app][sortKey]' id='search_sort_by_{$app}' class='input_select' style='width:auto'>
-										<foreach loop="$data['sortDropDown'] as $k => $l">
-											<option value='$k' <if test="$this->request['search_app_filters'][$app]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
-										</foreach>
-										</select>
-										<select name='search_app_filters[$app][sortDir]' id='search_sort_order_{$app}' class='input_select' style='width:auto'>
-											<option value='0' <if test="!$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-											<option value='1' <if test="$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
-										</select>
+								<ul class='ipsForm_horizontal'>
+									<li class='ipsField ipsField_select'>
+										<label class='ipsField_title' for='search_by'>{$this->lang->words['s_search_type']}</label>
+										<p class='ipsField_content'>
+											<select name='search_app_filters[$app][sortKey]' id='search_sort_by_{$app}' class='input_select' style='width:auto'>
+											<foreach loop="$data['sortDropDown'] as $k => $l">
+												<option value='$k' <if test="$this->request['search_app_filters'][$app]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
+											</foreach>
+											</select>
+											<select name='search_app_filters[$app][sortDir]' id='search_sort_order_{$app}' class='input_select' style='width:auto'>
+												<option value='0' <if test="!$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
+												<option value='1' <if test="$this->request['search_app_filters'][$app]['sortDir']">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
+											</select>
+										</p>
 									</li>
 								</ul>
 							</if>
@@ -4400,11 +7209,11 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 		<fieldset class='submit'>
 			<input type='submit' name='submit' class='input_submit' value='{$this->lang->words['do_search']}'> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
 		</fieldset>
-	</div>	
-</form>]]></template_content>
+	</form>
+</div>]]></template_content>
       <template_name>searchAdvancedForm</template_name>
-      <template_data><![CDATA[$filters='', $msg='', $current_app, $removed_search_terms=array(), $isFT=false]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data><![CDATA[$filters='', $msg='', $current_app, $removed_search_terms=array(), $isFT=false, $canTag=false]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4415,24 +7224,24 @@ $st = IPSSearchRegistry::get('in.search_higlight');
       <template_content><![CDATA[{parse striping="searchStripe" classes="row1,row2"}
 <div id='search_results'>
 	<ol>
-		<if test="is_array($results)">
-		<foreach loop="results:$results as $result">	
-			<if test="subResult:|:$result['sub']">
-				<li class='{parse striping="searchStripe"} sub clearfix clear'>
-					{$result['html']}
-				</li>
-			<else />
-				<li class='{parse striping="searchStripe"} clearfix clear'>
-					{$result['html']}
-				</li>
-			</if>
-		</foreach>
+		<if test="hasResults:|:is_array($results) && count($results)">
+			<foreach loop="results:$results as $result">
+				<if test="subResult:|:$result['sub']">
+					<li class='{parse striping="searchStripe"} sub clearfix clear'>
+						{$result['html']}
+					</li>
+				<else />
+					<li class='{parse striping="searchStripe"} clearfix clear'>
+						{$result['html']}
+					</li>
+				</if>
+			</foreach>
 		</if>
 	</ol>
 </div>]]></template_content>
       <template_name>searchResults</template_name>
       <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4444,20 +7253,13 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 <if test="asTawpiks:|:$titlesOnly">
 <script type='text/javascript' src='{$this->settings['public_dir']}js/ips.forums.js'></script>
 <table class='ipb_table topic_list' id='forum_table'>
-	<tr class='header'>
-		<th scope='col' class='col_f_icon'>&nbsp;</th>
-		<th scope='col' class='col_f_topic'>{$this->lang->words['forum_topic']}</th>
-		<th scope='col' class='col_f_starter'>{$this->lang->words['forum_forum']}</th>
-		<th scope='col' class='col_f_starter short'>{$this->lang->words['forum_started_by']}</th>
-		<th scope='col' class='col_f_views stats'>{$this->lang->words['forum_stats']}</th>
-		<th scope='col' class='col_f_post'><if test="colheadertitle:|:$this->request['content_title_only'] OR $this->request['show_as_titles']">{$this->lang->words['forum_last_post_info']}<else />{$this->lang->words['forum_showas_post_info']}</if></th>
-		<if test="isAdmin:|:$this->memberData['g_is_supmod']"><th scope='col' class='col_f_icon' style='width:1%'>&nbsp;</th></if>
-	</tr>
 </if>
 	<if test="count($results)">
+		<if test="asPostsStart:|:!$titlesOnly"><div class='ipsBox'></if>
 		<foreach loop="NCresultsAsForum:$results as $result">
 			{$result['html']}
 		</foreach>
+		<if test="asPostsEnd:|:!$titlesOnly"></div></if>
 	</if>
 <if test="asTawpiks2:|:$titlesOnly">
 	</table>
@@ -4477,10 +7279,12 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 					<input type="hidden" value="{$this->request['selectedtids']}" id='selectedtids' name="selectedtids" />
 				
 					<select name="tact" id='mod_tact'>
-						<option value="close">{$this->lang->words['cpt_close']}</option>
-						<option value="open">{$this->lang->words['cpt_open']}</option>
-						<option value="pin">{$this->lang->words['cpt_pin']}</option>
-						<option value="unpin">{$this->lang->words['cpt_unpin']}</option>
+						<option value="close">{$this->lang->words['cpt_close_f']}</option>
+						<option value="open">{$this->lang->words['cpt_open_f']}</option>
+						<option value="pin">{$this->lang->words['cpt_pin_f']}</option>
+						<option value="unpin">{$this->lang->words['cpt_unpin_f']}</option>
+						<option value="move">{$this->lang->words['cpt_move_f']}</option>
+						<option value="merge">{$this->lang->words['cpt_merge_f']}</option>
 						<option value="delete">{$this->lang->words['search_cpt_delete']}</option>
 						<if test="$this->registry->class_forums->can_Un_SoftDeleteTopics( 0, array() )"><option value="sundelete">{$this->lang->words['search_cpt_undelete']}</option></if>
 						<option value="approve">{$this->lang->words['search_cpt_approve']}</option>
@@ -4532,11 +7336,13 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 		</script>
 	</div>
 	</if>
-	{parse template="include_lightbox_real" group="global" params="1"}
+	<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+		{parse template="include_lightbox" group="global" params=""}
+	</if>
 </if>]]></template_content>
       <template_name>searchResultsAsForum</template_name>
       <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4544,151 +7350,121 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipgallery.css" />
-<style type='text/css'>
-	.gallery_block {
-		width: <if test="$this->settings['gallery_thumb_width'] < 160">160<else />{parse expression="intval($this->settings['gallery_thumb_width'] + 10)"}</if>px;
-		height: {parse expression="intval($this->settings['gallery_thumb_height'] + 120)"}px;
-	}
-</style>
-<!--[if lte IE 8]>
-<style type='text/css'>
-	.note_fill {
-		width: 98.5%;
-		height: 98.5%;
-	}
-</style>
-<![endif]-->
-{parse striping="imagelisting" classes="row1,row2"}
-<div class='gallery_row row2'>
-<foreach loop="results:$results as $result">	
-	{$result['html']}
-</foreach>
-</div>]]></template_content>
-      <template_name>searchResultsAsGallery</template_name>
-      <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<h2 class='hide'>{$this->lang->words['search_results']}</h2>
-<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "{$url_string}&amp;search_app={$current_key}", "public" ) )"}" />
-<if test="searchResultsTermsRemoved:|:is_array( $removed_search_terms ) && count( $removed_search_terms )">
-<p class='message error'>{$this->lang->words['removed_search_terms']} <strong>{parse expression="implode( ',', $removed_search_terms )"}</strong></p>
-<br />
-</if>
+      <template_content><![CDATA[<input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "{$url_string}&amp;search_app={$current_key}", "public" ) )"}" />
+<h1 class='ipsType_pagetitle'>{$this->lang->words['search_results']}</h1>
+<div class='ipsType_pagedesc'>
 	<if test="hasSearchResults:|:$total > 0 AND $search_term != ''">
 		<if test="hasSearchResultsCut:|:$limited AND $wasLimited">
-			<p class='message'>
-				{parse expression="sprintf( $this->lang->words['your_search_limited'], $search_term, $limited )"}
-			</p>
+			{parse expression="sprintf( $this->lang->words['your_search_limited'], $search_term, $limited )"}
 		<else />
-			<p class='message'>
-				{$this->lang->words['your_search']} <em><strong>{$search_term}</strong></em> {$this->lang->words['your_search_returned']} <strong>{$total}</strong> {$this->lang->words['your_search_results']}
-			</p>
+			{$this->lang->words['your_search']} <em><strong>{$search_term}</strong></em> {$this->lang->words['your_search_returned']} <strong>{$total}</strong> {$this->lang->words['your_search_results']}
+		</if>
+	<else />
+		<if test="hasSearchResults:|:$total > 0 AND $search_tags != ''">
+			{parse expression="sprintf( $this->lang->words['tag_search_results'], $total, $search_tags )"}
 		</if>
 	</if>
-	<br />
-	<div class='topic_controls'>
-		{$pagination}
-	</div>
-	
-	<ol id='member_alpha' class='tab_bar'>
-		<!--harcoded forums, members, system apps-->
-		<if test="IPSLib::appisSearchable( 'forums', 'search' )">
-			<if test="forumsTab:|:$this->request['search_app'] == 'forums'">
-				<li class='active'><strong>{IPSLib::getAppTitle( 'forums' )}</strong></li>
-			<else />				
-				<li><a href='{parse url="{$url_string}&amp;search_app=forums" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
-			</if>
-		</if>
-		<if test="IPSLib::appisSearchable( 'members', 'search' )">
-			<if test="membersTab:|:$this->request['search_app'] == 'members'">
-				<li class='active'><strong>{IPSLib::getAppTitle( 'members' )}</strong></li>
-			<else />
-				<li><a href='{parse url="{$url_string}&amp;search_app=members" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
-			</if>
-		</if>
-		<if test="IPSLib::appisSearchable( 'core', 'search' )">
-			<if test="helpTab:|:$this->request['search_app'] == 'core'">
-				<li class='active'><strong>{IPSLib::getAppTitle( 'core' )}</strong></li>
-			<else />				
-				<li><a href='{parse url="{$url_string}&amp;search_app=core" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
-			</if>
-		</if>
-		<foreach loop="apps:$this->registry->getApplications() as $app">
-			<if test="appIsSearchable:|:IPSLib::appisSearchable( $app['app_directory'], 'search' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
-				<if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">
-					<li class='active'><strong>{IPSLib::getAppTitle( $app['app_directory'] )}</strong></li>
-				<else />				
-					<li><a href='{parse url="{$url_string}&amp;search_app={$app['app_directory']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
-				</if>
-	 		</if>
-		</foreach>
-	</ol>
-	<div class='tab_filters'>
-		<if test="is_array($sortIn) AND count( $sortIn )">
-			<ul class='right' style='padding-left:5px'>
-				<form action='{parse url="{$url_string}&amp;search_app={$current_key}" base="public"}' method='post'>
-				<label for='search_in'>{$this->lang->words['s_search_in']}</label>
-				<select name='search_app_filters[{$current_key}][searchInKey]' class='input_select' id='search_search_in' style='width:auto'>
-					<foreach loop="$sortIn as $id => $_data">
-						<option value='$_data[0]' <if test="$this->request['search_app_filters'][$current_key]['searchInKey'] == $_data[0]">selected='selected'</if>>{$_data[1]}</option>
+</div>
+<br />
+<div class='ipsLayout ipsLayout_withleft clearfix'>
+	<div class='ipsLayout_left'>
+		<div class='ipsBox'>
+			<div class='ipsBox_container ipsSideMenu'>
+				<h4>{$this->lang->words['filter_by_app']}</h4>
+				<ul>
+					<if test="IPSLib::appIsSearchable( 'forums', 'search' )">
+						<li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='active'</if>><a href='{parse url="{$url_string}&amp;search_app=forums" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'members', 'search' )">
+						<li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='active'</if>><a href='{parse url="{$url_string}&amp;search_app=members" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'core', 'search' )">
+						<li <if test="helpTab:|:$this->request['search_app'] == 'core'">class='active'</if>><a href='{parse url="{$url_string}&amp;search_app=core" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
+					</if>
+					<foreach loop="apps:$this->registry->getApplications() as $app">
+						<if test="appIsSearchable:|:IPSLib::appIsSearchable( $app['app_directory'], 'search' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
+							<li <if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">class='active'</if>><a href='{parse url="{$url_string}&amp;search_app={$app['app_directory']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
+				 		</if>
 					</foreach>
-				</select>
-				<input type='submit' class='input_submit alt' value='{$this->lang->words['_rarr']}' />
-				</form>
-			</ul>
-		</if>
-		<ul class='right'>
-			<form action='{parse url="{$url_string}&amp;search_app={$current_key}" base="public"}' method='post'>
-			<label for='search_by'>{$this->lang->words['s_search_type']}</label>
+				</ul>
+			
+				<if test="is_array($sortIn) AND count( $sortIn )">
+					<h4>{$this->lang->words['filter_by_section']}</h4>
+					<ul>
+						<foreach loop="$sortIn as $id => $_data">
+							<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">class='active'</if>>
+								<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$_data['0']}" base="public"}'>{$_data[1]}</a>
+							</li>
+						</foreach>
+					</ul>
+				</if>
+			</div>
+		</div>
+	</div>
+	<div class='ipsLayout_content'>		
+		<div class='clearfix'>
+			{$pagination}
+		</div>
+		<div class='maintitle ipsFilterbar'>				
 			<if test="IPSSearchRegistry::get('config.contentTypes') AND is_array( IPSSearchRegistry::get('config.contentTypes') )">
 				<if test="count($sortDropDown)">
-					<select name='search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortKey]' id='search_sort_by' class='input_select' style='width:auto'>
-					<foreach loop="$sortDropDown as $k => $l">
-						<option value='$k' <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
-					</foreach>
-					</select>
+					<span class='ipsType_small'>{$this->lang->words['sort_by']}</span>&nbsp;&nbsp;
+					<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+						<foreach loop="$sortDropDown as $k => $l">
+							<li <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortKey'] == $k">class='active'</if>>
+								<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortKey]={$k}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortDir]={$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortDir']}" base="public"}'>{$l}</a>
+							</li>
+						</foreach>
+					</ul>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				</if>
-				<select name='search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortDir]' id='search_sort_order' class='input_select' style='width:auto'>
-					<option value='0' <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortDir'] == 0">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-					<option value='1' <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortDir'] == 1">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
-				</select>
+				<span class='ipsType_small'>{$this->lang->words['order']}</span>&nbsp;&nbsp;
+				<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+					<li <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortDir'] == 0">class='active'</if>>
+						<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortKey]={$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortKey']}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortDir]=0" base="public"}'>{$this->lang->words['s_search_type_o_0']}</a>
+					</li>
+					<li <if test="$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortDir'] == 1">class='active'</if>>
+						<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortKey]={$this->request['search_app_filters'][$current_key][$this->request['search_app_filters'][$current_key]['searchInKey']]['sortKey']}&amp;search_app_filters[$current_key][{$this->request['search_app_filters'][$current_key]['searchInKey']}][sortDir]=1" base="public"}'>{$this->lang->words['s_search_type_o_1']}</a>
+					</li>
+				</ul>
 			<else />
 				<if test="count($sortDropDown)">
-					<select name='search_app_filters[$current_key][sortKey]' id='search_sort_by' class='input_select' style='width:auto'>
-					<foreach loop="$sortDropDown as $k => $l">
-						<option value='$k' <if test="$this->request['search_app_filters'][$current_key]['sortKey'] == $k">selected='selected'</if>>{$l}</option>
-					</foreach>
-					</select>
+					<span class='ipsType_small'>{$this->lang->words['sort_by']}</span>&nbsp;&nbsp;
+					<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+						<foreach loop="$sortDropDown as $k => $l">
+							<li <if test="$this->request['search_app_filters'][$current_key]['sortKey'] == $k">class='active'</if>>
+								<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][sortKey]={$k}&amp;search_app_filters[$current_key][sortDir]={$this->request['search_app_filters'][$current_key]['sortDir']}" base="public"}'>{$l}</a>
+							</li>
+						</foreach>
+					</ul>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				</if>
-				<select name='search_app_filters[$current_key][sortDir]' id='search_sort_order' class='input_select' style='width:auto'>
-					<option value='0' <if test="$this->request['search_app_filters'][$current_key]['sortDir'] == 0">selected='selected'</if>>{$this->lang->words['s_search_type_o_0']}</option>
-					<option value='1' <if test="$this->request['search_app_filters'][$current_key]['sortDir'] == 1">selected='selected'</if>>{$this->lang->words['s_search_type_o_1']}</option>
-				</select>
+				<span class='ipsType_small'>{$this->lang->words['order']}</span>&nbsp;&nbsp;
+				<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+					<li <if test="$this->request['search_app_filters'][$current_key]['sortDir'] == 0">class='active'</if>>
+						<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][sortKey]={$this->request['search_app_filters'][$current_key]['sortKey']}&amp;search_app_filters[$current_key][sortDir]=0" base="public"}'>{$this->lang->words['s_search_type_o_0']}</a>
+					</li>
+					<li <if test="$this->request['search_app_filters'][$current_key]['sortDir'] == 1">class='active'</if>>
+						<a href='{parse url="{$url_string}&amp;search_app={$current_key}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[$current_key][sortKey]={$this->request['search_app_filters'][$current_key]['sortKey']}&amp;search_app_filters[$current_key][sortDir]=1" base="public"}'>{$this->lang->words['s_search_type_o_1']}</a>
+					</li>
+				</ul>
 			</if>
-			<input type='submit' class='input_submit alt' value='{$this->lang->words['s_update']}' />
-			</form>
-		</ul>
+		</div>
+		<div class='ipsBox_container'>
+			<if test="hasTotal:|:$total">
+				{$results}
+			<else />
+				<p class='no_messages'>{$this->lang->words['no_results_found']}<if test="noResultsTerm:|:$search_term"> {$this->lang->words['no_results_found_for']} '{$search_term}'</if>.</p>
+			</if>
+		</div>
+		<div class='clearfix'>
+			{$pagination}
+		</div>
 	</div>
-	
-<if test="hasTotal:|:$total">
-	{$results}
-	<br />
-	<div class='topic_controls'>
-		{$pagination}
-	</div>
-<else />
-	<p class='no_messages'>{$this->lang->words['no_results_found']}<if test="noResultsTerm:|:$search_term"> {$this->lang->words['no_results_found_for']} '{$search_term}'</if>.</p>
-</if>]]></template_content>
+</div>]]></template_content>
       <template_name>searchResultsWrapper</template_name>
-      <template_data>$results, $sortDropDown, $sortIn, $pagination, $total, $showing, $search_term, $url_string, $current_key, $removed_search_terms=array(), $limited=0, $wasLimited=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$results, $sortDropDown, $sortIn, $pagination, $total, $showing, $search_term, $url_string, $current_key, $removed_search_terms=array(), $limited=0, $wasLimited=false, $search_tags</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4696,8 +7472,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     </template>
     <template>
       <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!-- SKINNOTE: Wrap user link in ajax span -->
-<div class='result_info'>
+      <template_content><![CDATA[<div class='result_info'>
 	<h3>{$r['content_title']}</h3>
 	<if test="showGenericContent:|:!$resultAsTitle">
 	<p>
@@ -4712,55 +7487,14 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 				<li>{parse date="$r['updated']" format="short"}</li>
 			</if>
 			<if test="$r['member_id']">
-				<li>{$this->lang->words['search_by']} <a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['members_display_name']}</a>{parse template="user_popup" group="global" params="$r['member_id']"}</li>
+				<li>{$this->lang->words['search_by']} <a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}'>{$r['members_display_name']}</a></li>
 			</if>
 		</ul>
 	</div>
 </if>]]></template_content>
       <template_name>searchRowGenericFormat</template_name>
       <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<div class='result_info'>
-	<span class='icon'>{parse replacement="{$r['_icon']}"}</span>
-	<h3><a href='{parse url="showtopic={$r['type_id_2']}&amp;view=<if test="isNewPost:|:$this->request['do']=='new_posts' OR $this->request['do']=='active'">getnewpost<else /><if test="resultIsPost:|:$r['misc']">findpost&amp;p={$r['misc']}</if></if>&amp;hl={$this->request['search_higlight']}&amp;fromsearch=1" seotitle="{$r['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_result']}'>{$r['content_title']}</a></h3>
-	<if test="showTopicContent:|:!$resultAsTitle">
-	<p>
-		{$r['content']}
-	</p>
-	</if>
-	<if test="hasForumTrail:|:$r['_forum_trail']">
-		<span class='desc breadcrumb'>
-			<foreach loop="topicsForumTrail:$r['_forum_trail'] as $i => $f">
-			<a href='{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}'>{$f[0]}</a> <if test="notLastFt:|:$i+1 != count( $r['_forum_trail'] )">&gt;</if>
-			</foreach>
-		</span>
-	</if>
-</div>
-<div class='result_details desc'>
-	<ul>
-		<li>{parse format_number="$r['posts']"} {$this->lang->words['forum_replies']}</li>
-		<li>
-			<if test="showTopicAsTitle:|:$resultAsTitle">
-				{parse date="$r['_last_post']" format="short"} {$this->lang->words['search_by']} <a href='{parse url="showuser={$r['last_poster_id']}" seotitle="{$r['seo_last_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$r['last_poster_name']}</a>{parse template="user_popup" group="global" params="$r['last_poster_id'], $r['seo_last_name']"}
-			<else />
-				{parse date="$r['_post_date']" format="short"} {$this->lang->words['search_by']} <a href='{parse url="showuser={$r['member_id']}" seotitle="{$r['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$r['members_display_name']}</a>{parse template="user_popup" group="global" params="$r['member_id'], $r['members_seo_name']"}
-			</if>
-		</li>
-		<if test="topicHasAttach:|:$r['topic_hasattach']">
-			<li><a href="{parse url="app=forums&amp;module=forums&amp;section=attach&amp;tid={$r['type_id_2']}" base="public"}">{$r['topic_hasattach']} {$this->lang->words['attach_header']}</a></li>
-		</if>
-	</ul>
-</div>]]></template_content>
-      <template_name>topicPostSearchResult</template_name>
-      <template_data>$r, $indent, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4775,20 +7509,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 </if>]]></template_content>
       <template_name>topicPostSearchResultAsForum</template_name>
       <template_data>$data, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<ol>
-		{$content}
-	</ol>]]></template_content>
-      <template_name>topicPostSubresultWrap</template_name>
-      <template_data>$content</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4797,92 +7518,129 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     <template>
       <template_group>skin_search</template_group>
       <template_content><![CDATA[<php>
-	$datecut = ( $this->settings['search_ucontent_days'] ) ? $this->registry->class_localization->getDate( time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ), 'joined' ) : 0;
+	$datecut		= ( $this->settings['search_ucontent_days'] ) ? $this->registry->class_localization->getDate( time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ), 'joined' ) : 0;
 </php>
-<h2>{parse expression="sprintf( $this->lang->words['s_participation_title'], $member['members_display_name'] )"}</h2>
+<h2 class='ipsType_pagetitle'>{parse expression="sprintf( $this->lang->words['s_participation_title'], $member['members_display_name'] )"}</h2>
 <input type='hidden' name="usedInJsLater" id="urlString" value="{parse expression="base64_encode( $this->registry->output->buildUrl( "app=core&amp;module=search&amp;do=user_activity&amp;search_app={$this->request['search_app']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}", "public" ) )"}" />
 <if test="NPhasResults:|:$total">
-		<p class='message'>
+		<p class='ipsType_pagedesc'>
 			{parse expression="sprintf( $this->lang->words['s_participation_msg'], $total, $member['members_display_name'] )"}
 			<if test="$datecut">
-				<br /><span class='desc'>{parse expression="sprintf( $this->lang->words['s_participation_range'], $datecut )"}</span>
+				<span class='desc lighter'>{parse expression="sprintf( $this->lang->words['s_participation_range'], $datecut )"}</span>
 			</if>
 		</p>
 	<br />
 </if>
-
-<div class='topic_controls'>
-	{$pagination}
-</div>
-<ol id='member_alpha' class='tab_bar'>
-	<!--harcoded forums, members, system apps-->
-	<if test="IPSLib::appisSearchable( 'forums', 'usercontent' )">
-		<if test="forumsTab:|:$this->request['search_app'] == 'forums'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'forums' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=forums&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+<div class='ipsLayout ipsLayout_withleft clearfix'>
+	<div class='ipsLayout_left'>
+		<div class='ipsBox'>
+			<div class='ipsBox_container ipsSideMenu'>
+				<h4>{$this->lang->words['filter_by_app']}</h4>
+				<ul>
+					<if test="IPSLib::appIsSearchable( 'forums', 'usercontent' )">
+						<li <if test="forumsTab:|:$this->request['search_app'] == 'forums'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=forums&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'forums' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'members', 'usercontent' )">
+						<li <if test="membersTab:|:$this->request['search_app'] == 'members'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=members&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
+					</if>
+					<if test="IPSLib::appIsSearchable( 'core', 'usercontent' )">
+						<li <if test="helpTab:|:$this->request['search_app'] == 'core'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=core&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
+					</if>
+					<foreach loop="apps:$this->registry->getApplications() as $app">
+						<if test="appIsSearchable:|:IPSLib::appIsSearchable( $app['app_directory'], 'usercontent' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
+							<li <if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$app['app_directory']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
+				 		</if>
+					</foreach>
+				</ul>
+				
+				<if test="$this->request['search_app'] == 'forums'">
+					<h4>{$this->lang->words['userposts_morefilters']}</h4>
+					<ul>
+						<li <if test="$this->request['userMode'] == 'all'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$this->request['search_app']}&amp;mid={$this->request['mid']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;userMode=all" base="public"}'>{$this->lang->words['viewall_opt_dd']}</a></li>
+						<li <if test="$this->request['userMode'] == 'title'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$this->request['search_app']}&amp;mid={$this->request['mid']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;userMode=title" base="public"}'>{$this->lang->words['viewallt_opt_dd']}</a></li>
+						<li <if test="$this->request['userMode'] == 'content'">class='active'</if>><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$this->request['search_app']}&amp;mid={$this->request['mid']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;userMode=content" base="public"}'>{$this->lang->words['viewallp_opt_dd']}</a></li>
+					</ul>
+				</if>
+				
+				<if test="is_array($sortIn) AND count( $sortIn )">
+					<h4>{$this->lang->words['filter_by_type']}</h4>
+					<ul>
+						<foreach loop="$sortIn as $id => $_data">
+							<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$this->request['search_app']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$_data[0]}" base="public"}'>{$_data[1]}</a>
+							</li>
+						</foreach>
+					</ul>
+				</if>
+			</div>
+		</div>
+	</div>
+	<div class='ipsLayout_content'>
+		<if test="$pagination">
+			<div class='topic_controls'>
+				{$pagination}
+			</div>
+			<br />
 		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'members', 'usercontent' )">
-		<if test="membersTab:|:$this->request['search_app'] == 'members'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'members' )}</strong></li>
-		<else />
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=members&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'members' )}</a></li>
-		</if>
-	</if>
-	<if test="IPSLib::appisSearchable( 'core', 'usercontent' )">
-		<if test="helpTab:|:$this->request['search_app'] == 'core'">
-			<li class='active'><strong>{IPSLib::getAppTitle( 'core' )}</strong></li>
-		<else />				
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app=core&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( 'core' )}</a></li>
-		</if>
-	</if>
-	<foreach loop="apps:$this->registry->getApplications() as $app">
-		<if test="appIsSearchable:|:IPSLib::appisSearchable( $app['app_directory'], 'usercontent' ) AND !in_array( $app['app_directory'], array('core','forums','members') )">
-			<if test="appIsSearched:|:$this->request['search_app'] == $app['app_directory']">
-				<li class='active'><strong>{IPSLib::getAppTitle( $app['app_directory'] )}</strong></li>
-			<else />				
-				<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$app['app_directory']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;sid={$this->request['_sid']}" base="public"}'>{IPSLib::getAppTitle( $app['app_directory'] )}</a></li>
+		<div class='maintitle ipsFilterbar'>
+			<if test="IPSSearchRegistry::get('config.contentTypes') AND is_array( IPSSearchRegistry::get('config.contentTypes') )">
+				<if test="count($sortDropDown)">
+					<span class='ipsType_small'>{$this->lang->words['sort_by']}</span>&nbsp;&nbsp;
+					<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+						<foreach loop="$sortDropDown as $k => $l">
+							<li <if test="$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortKey'] == $k">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;search_app={$this->request['search_app']}&amp;userMode={$this->request['userMode']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortKey]={$k}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortDir]={$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortDir']}" base="public"}'>{$l}</a>
+							</li>
+						</foreach>
+					</ul>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				</if>
+				<span class='ipsType_small'>{$this->lang->words['order']}</span>&nbsp;&nbsp;
+				<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+					<li <if test="$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortDir'] == 0">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;search_app={$this->request['search_app']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortKey]={$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortKey']}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortDir]=0" base="public"}'>{$this->lang->words['s_search_type_o_0']}</a>
+					</li>
+					<li <if test="$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortDir'] == 1">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;search_app={$this->request['search_app']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortKey]={$this->request['search_app_filters'][$this->request['search_app']][$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']]['sortKey']}&amp;search_app_filters[{$this->request['search_app']}][{$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}][sortDir]=1" base="public"}'>{$this->lang->words['s_search_type_o_1']}</a>
+					</li>
+				</ul>
+			<else />
+				<if test="count($sortDropDown)">
+					<span class='ipsType_small'>{$this->lang->words['sort_by']}</span>&nbsp;&nbsp;
+					<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+						<foreach loop="$sortDropDown as $k => $l">
+							<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['sortKey'] == $k">class='active'</if>>
+								<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;search_app={$this->request['search_app']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][sortKey]={$k}&amp;search_app_filters[{$this->request['search_app']}][sortDir]={$this->request['search_app_filters'][$this->request['search_app']]['sortDir']}" base="public"}'>{$l}</a>
+							</li>
+						</foreach>
+					</ul>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				</if>
+				<span class='ipsType_small'>{$this->lang->words['order']}</span>&nbsp;&nbsp;
+				<ul class='ipsList_inline ipsType_smaller' style='display: inline'>
+					<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['sortDir'] == 0">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;search_app={$this->request['search_app']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][sortKey]={$this->request['search_app_filters'][$this->request['search_app']]['sortKey']}&amp;search_app_filters[{$this->request['search_app']}][sortDir]=0" base="public"}'>{$this->lang->words['s_search_type_o_0']}</a>
+					</li>
+					<li <if test="$this->request['search_app_filters'][$this->request['search_app']]['sortDir'] == 1">class='active'</if>>
+						<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;sid={$this->request['_sid']}&amp;mid={$this->request['mid']}&amp;userMode={$this->request['userMode']}&amp;search_app={$this->request['search_app']}&amp;search_app_filters[{$this->request['search_app']}][searchInKey]={$this->request['search_app_filters'][$this->request['search_app']]['searchInKey']}&amp;search_app_filters[{$this->request['search_app']}][sortKey]={$this->request['search_app_filters'][$this->request['search_app']]['sortKey']}&amp;search_app_filters[{$this->request['search_app']}][sortDir]=1" base="public"}'>{$this->lang->words['s_search_type_o_1']}</a>
+					</li>
+				</ul>
 			</if>
- 		</if>
-	</foreach>
-</ol>
-<div class='tab_filters'>
-	<ul class='right'>
-		<if test="$this->request['search_app'] == 'forums'">
-		<form action='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$app['app_directory']}&amp;mid={$this->request['mid']}&amp;sid={$this->request['_sid']}" base="public"}' method='post'>
-		<select name='userMode' class='input_select' style='width:auto'>
-			<option value='all' <if test="$this->request['userMode'] == 'all'">selected="selected"</if>>{parse expression="sprintf( $this->lang->words['viewall_opt_dd'], $member['members_display_name'] )"}</option>
-			<option value='title' <if test="$this->request['userMode'] == 'title'">selected="selected"</if>>{parse expression="sprintf( $this->lang->words['viewallt_opt_dd'], $member['members_display_name'] )"}</option>
-			<option value='content' <if test="$this->request['userMode'] == 'content'">selected="selected"</if>>{parse expression="sprintf( $this->lang->words['viewallp_opt_dd'], $member['members_display_name'] )"}</option>
-		</select>
-		<input type='submit' class='input_submit alt' value='{$this->lang->words['s_update']}' />
-		</form>
-		</if>
-		<if test="is_array($sortIn) AND count( $sortIn )">
-			<form action='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;search_app={$app['app_directory']}&amp;mid={$this->request['mid']}&amp;sid={$this->request['_sid']}" base="public"}' method='post'>
-			<select name='search_app_filters[{$this->request['search_app']}][searchInKey]' class='input_select' style='width:auto'>
-				<foreach loop="$sortIn as $id => $_data">
-					<option value='$_data[0]' <if test="$this->request['search_app_filters'][$this->request['search_app']]['searchInKey'] == $_data[0]">selected='selected'</if>>{$_data[1]}</option>
-				</foreach>
-			</select>
-			<input type='submit' class='input_submit alt' value='{$this->lang->words['s_update']}' />
-			</form>
-		</if>
-	</ul>
-</div>
-<if test="NPTotal:|:$total">
-	{$results}
-<else />
-	<p class='no_messages'>{$this->lang->words['user_posts_none']}</p>
-</if>
-<br />
-<div class='topic_controls'>
-	{$pagination}
+		</div>
+		<div>
+			<if test="NPTotal:|:$total">
+				{$results}
+				<br />
+				{$pagination}
+			<else />
+				<p class='no_messages'>{$this->lang->words['user_posts_none']}</p>
+			</if>
+		</div>
+	</div>
 </div>]]></template_content>
       <template_name>userPostsView</template_name>
-      <template_data>$results, $pagination, $total, $member, $limited=0, $wasLimited=false, $beginTime, $sortIn</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_data>$results, $pagination, $total, $member, $limited=0, $wasLimited=false, $beginTime=0, $sortIn=null, $sortDropDown=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4893,7 +7651,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     <template>
       <template_group>skin_stats</template_group>
       <template_content><![CDATA[<!-- This is looped over once for admins, once for supmods, and then once for forum mods -->
-<table class='ipb_table'>
+<table class='ipb_table ipsMemberList'>
 	<caption class='maintitle'>{$group}</caption>
 	<tr class='header'>
 		<th scope='col' style='width: 3%'>&nbsp;</th>
@@ -4907,11 +7665,13 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 		<foreach loop="members:$members as $info">
 			<tr class='{parse striping="staff"}'>
 				<td>
-					<img src='{$info['pp_mini_photo']}' alt='photo' class='photo' width='{$info['pp_mini_width']}' height='{$info['pp_mini_height']}' />
+					<a href='{parse url="showuser={$info['member_id']}" seotitle="{$info['members_seo_name']}" template="showuser" base="public"}' class='ipsUserPhotoLink' title='{$this->lang->words['view_profile']}'>
+						<img src='{$info['pp_mini_photo']}' alt='photo' class='ipsUserPhoto ipsUserPhoto_mini' />
+					</a>
 				</td>
 				<td>
 					<if test="leadermid:|:$info['member_id'] > 0">
-						<a href='{parse url="showuser={$info['member_id']}" seotitle="{$info['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$info['members_display_name']}</a> {parse template="user_popup" group="global" params="$info['member_id'],$info['members_seo_name']"}
+						{parse expression="IPSMember::makeProfileLink($info['members_display_name'], $info['member_id'], $info['members_seo_name'])"}
 					<else />
 						{$info['members_display_name']}
 					</if>
@@ -4938,22 +7698,22 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 					</if>
 				</td>
 				<td class='short altrow'>
-					<ul class='user_controls clear'>
+					<ul class='ipsList_inline right ipsList_nowrap'>
 						<if test="isFriendable:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $info['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
 							<if test="isFriend:|:IPSMember::checkFriendStatus( $info['member_id'] )">
-								<li class='mini_friend_toggle is_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
+								<li class='mini_friend_toggle is_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a></li>
 							<else />
-								<li class='mini_friend_toggle is_not_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
+								<li class='mini_friend_toggle is_not_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a></li>								
 							</if>
 						</if>
 						<if test="canPm:|:$this->memberData['g_use_pm'] AND $this->memberData['member_id'] != $info['member_id'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-							<li class='pm_button' id='pm_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$info['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}'>{parse replacement="send_msg"}</a></li>
+							<li class='pm_button' id='pm_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$info['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
 						</if>
 						<if test="hasBlog:|:$info['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
-							<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$info['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
+							<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$info['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
 						</if>
 						<if test="hasGallery:|:$info['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-							<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$info['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
+							<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$info['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
 						</if>
 					</ul>
 				</td>
@@ -4964,7 +7724,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 <br />]]></template_content>
       <template_name>group_strip</template_name>
       <template_data><![CDATA[$group="", $members=array()]]></template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4972,8 +7732,9 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     </template>
     <template>
       <template_group>skin_stats</template_group>
-      <template_content><![CDATA[<table class='ipb_table'>
-	<caption class='maintitle'>{$this->lang->words['todays_posters']}</caption>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['todays_posters']}</h1>
+<br />
+<table class='ipb_table ipsMemberList'>
 	<tr class='header'>
 		<th scope='col' style='width: 3%'>&nbsp;</th>
 		<th scope='col'>{$this->lang->words['member']}</th>
@@ -4992,11 +7753,11 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 		<foreach loop="topposters:$rows as $info">
 			<tr class='{parse striping="top_posters"}'>
 				<td>
-					<img src='{$info['pp_mini_photo']}' alt="{$info['members_display_name']}{$this->lang->words['users_photo']}" class='photo' width='{$info['pp_mini_width']}' height='{$info['pp_mini_height']}' />
+					<img src='{$info['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$info['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_mini' />
 				</td>
 				<td>
 					<if test="topPosterMid:|:$info['member_id'] > 0">
-						<a href='{parse url="showuser={$info['member_id']}" seotitle="{$info['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$info['members_display_name']}</a> {parse template="user_popup" group="global" params="$info['member_id'], $info['members_seo_name']"}
+						{parse expression="IPSMember::makeProfileLink($info['members_display_name'], $info['member_id'], $info['members_seo_name'])"}
 					<else />
 						{$info['members_display_name']}
 					</if>
@@ -5014,22 +7775,22 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 					{$info['today_pct']}%
 				</td>
 				<td class='altrow short'>
-					<ul class='user_controls clear'>
+					<ul class='ipsList_inline right'>
 						<if test="tpIsFrindable:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $info['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
 							<if test="tpIsFriend:|:IPSMember::checkFriendStatus( $info['member_id'] )">
-								<li class='mini_friend_toggle is_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
+								<li class='mini_friend_toggle is_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a></li>
 							<else />
-								<li class='mini_friend_toggle is_not_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
+								<li class='mini_friend_toggle is_not_friend' id='friend_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$info['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a></li>								
 							</if>
 						</if>
 						<if test="tpPm:|:$this->memberData['g_use_pm'] AND $this->memberData['member_id'] != $info['member_id'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-							<li class='pm_button' id='pm_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$info['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}'>{parse replacement="send_msg"}</a></li>
+							<li class='pm_button' id='pm_xxx_{$info['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$info['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
 						</if>
 						<if test="tpBlog:|:$info['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
-							<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$info['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
+							<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$info['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
 						</if>
 						<if test="tpGallery:|:$info['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-							<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$info['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
+							<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$info['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
 						</if>
 					</ul>
 				</td>
@@ -5039,7 +7800,7 @@ $st = IPSSearchRegistry::get('in.search_higlight');
 </table>]]></template_content>
       <template_name>top_posters</template_name>
       <template_data>$rows</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -5048,45 +7809,36 @@ $st = IPSSearchRegistry::get('in.search_higlight');
     <template>
       <template_group>skin_stats</template_group>
       <template_content><![CDATA[<if test="$this->request['module']=='ajax'">
-	<h3>{$this->lang->words['who_farted']} {$title}</h3>
+	<h3>{$this->lang->words['who_farted']} {IPSText::truncate( $title, 40 )}</h3>
 <else />
-	<h3 class='maintitle'>{$this->lang->words['who_farted']} {$title}</h3>
+	<h3 class='maintitle'>{$this->lang->words['who_farted']} {IPSText::truncate( $title, 30 )}</h3>
 </if>
-<table class='ipb_table'>
-	<tr class='header'>
-		<th>{$this->lang->words['whoposted_name']}</th>
-		<th>{$this->lang->words['whoposted_posts']}</th>
-	</tr>
-	<if test="hasPosters:|:count($rows) AND is_array($rows)">
-		{parse striping="whoposted" classes="row1,row2"}
-		<foreach loop="whoposted:$rows as $row">
-			<tr class='{parse striping="whoposted"}'>
-				<td class="altrow">
-					<if test="posterHasMid:|:$row['author_id']">
-						<a href="{parse url="showuser={$row['author_id']}" template="showuser" seotitle="{$row['members_seo_name']}" base="public"}" title="{$this->lang->words['goto_profile']}">{$row['author_name']}</a>{parse template="user_popup" group="global" params="$row['author_id'],$row['members_seo_name']"}
-					<else />
-						{$row['author_name']}
-					</if>
-				</td>
-				<td>{$row['pcount']}</td>
-			</tr>
-		</foreach>
-	</if>
-	</table>]]></template_content>
+<div class='fixed_inner'>
+	<table class='ipb_table'>
+		<tr class='header'>
+			<th>{$this->lang->words['whoposted_name']}</th>
+			<th>{$this->lang->words['whoposted_posts']}</th>
+		</tr>
+		<if test="hasPosters:|:count($rows) AND is_array($rows)">
+			{parse striping="whoposted" classes="row1,row2"}
+			<foreach loop="whoposted:$rows as $row">
+				<tr class='{parse striping="whoposted"}'>
+					<td class="altrow">
+						<if test="posterHasMid:|:$row['author_id']">
+							<a href="{parse url="showuser={$row['author_id']}" template="showuser" seotitle="{$row['members_seo_name']}" base="public"}" title="{$this->lang->words['goto_profile']}">{$row['author_name']}</a>
+						<else />
+							{$row['author_name']}
+						</if>
+					</td>
+					<td>{$row['pcount']}</td>
+				</tr>
+			</foreach>
+		</if>
+	</table>
+</div>]]></template_content>
       <template_name>whoPosted</template_name>
       <template_data><![CDATA[$tid=0, $title="", $rows=array()]]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>whoPostedAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288194260</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/core/xml/core_settings.xml b/upload/admin/applications/core/xml/core_settings.xml
index fe8733c2..06d7a446 100644
--- a/upload/admin/applications/core/xml/core_settings.xml
+++ b/upload/admin/applications/core/xml/core_settings.xml
@@ -1,6 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <settingexport>
   <settinggroup>
+    <setting>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_keyword>externaledit</conf_title_keyword>
+      <conf_title_title>IP.Board External Edit (WebDav)</conf_title_title>
+      <conf_title_desc/>
+      <conf_title_tab/>
+      <conf_title_app>core</conf_title_app>
+      <conf_title_noshow>1</conf_title_noshow>
+    </setting>
+    <setting>
+      <conf_title>Включить WebDav</conf_title>
+      <conf_description>Разрешить внешнее редактирование �тилей</conf_description>
+      <conf_group>1</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>webdav_on</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>externaledit</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_keyword>ipboardlicensekey</conf_title_keyword>
+      <conf_title_title>IP.Board License Key</conf_title_title>
+      <conf_title_desc/>
+      <conf_title_tab>System</conf_title_tab>
+      <conf_title_app>core</conf_title_app>
+      <conf_title_noshow>1</conf_title_noshow>
+    </setting>
+    <setting>
+      <conf_title>Реги�трационный ключ</conf_title>
+      <conf_description><![CDATA[Это реги�трационный ключ IP.Board, а не ваш код клиента или пароль  дл� входа в клиент-центр. 
+
+Ключ вы получаете вме�те � пи�ьмом об активации вашей покупки IP.Board.
+
+<br />�Е УД�ЛЯЙТЕ ИЛИ РЕД�КТИРУЙТЕ Д���ЫЙ КЛЮЧ, ЕСЛИ ВЫ �Е УВЕРЕ�Ы В СВОИХ ДЕЙСТВИЯХ!]]></conf_description>
+      <conf_group>2</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>ipb_reg_number</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>ipboardlicensekey</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>general</conf_title_keyword>
@@ -10,10 +66,27 @@
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
+    <setting>
+      <conf_title>Мета тег: image_src</conf_title>
+      <conf_description>Facebook и�пользуют данный тег при публикации и/или �инхронизации �одержимого. Мак�имальные размеры изображени� 130px x 110px. Макро� {style_image_url} может и�пользовать�� дл� указани� URL до директории изображений �тил�.</conf_description>
+      <conf_group>3</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>meta_imagesrc</conf_key>
+      <conf_default>{style_image_url}/meta_image.png</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>general</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_title>�азвание форума</conf_title>
       <conf_description>И�пользует�� в навигационном меню, заголовке �траницы, пи�ьмах � форума.</conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>board_name</conf_key>
       <conf_default>Invision Power Board</conf_default>
@@ -22,25 +95,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>�азвани� и адре�а</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>general</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Мета тег: image_src</conf_title>
-      <conf_description>Facebook и�пользуют данный тег при публикации и/или �инхронизации �одержимого. Мак�имальные размеры изображени� 130px x 110px. Макро� {style_image_url} может и�пользовать�� дл� указани� URL до директории изображений �тил�.</conf_description>
-      <conf_group>1</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>meta_imagesrc</conf_key>
-      <conf_default>{style_image_url}/meta_image.png</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -49,7 +103,7 @@
     <setting>
       <conf_title>�азвание �айта</conf_title>
       <conf_description>Показывает�� в навигационном меню форума.</conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>home_name</conf_key>
       <conf_default/>
@@ -58,7 +112,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -67,7 +120,7 @@
     <setting>
       <conf_title>�дре� �айта</conf_title>
       <conf_description/>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>home_url</conf_key>
       <conf_default/>
@@ -76,65 +129,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>general</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>URL к директории загрузок</conf_title>
-      <conf_description><![CDATA[URL адре�, ведущий к вашей директории "uploads".
-<!--SUGGEST-->]]></conf_description>
-      <conf_group>1</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>upload_url</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp><![CDATA[if( $show == 1 )
-{
-	$this_host   = getenv( 'SERVER_NAME' );
-	$this_script = getenv( 'SCRIPT_NAME' );
-	$this_script = str_replace( "\\\\", "/", $this_script );
-
-	if( $this_host AND $this_script )
-	{
-		$this_script = str_replace( '/'.CP_DIRECTORY.'/index.php', '/uploads', $this_script );
-		$r['conf_description'] = str_replace( "<!--SUGGEST-->", "<br />IPB определил url к директории загрузок так:<br />http://".$this_host.$this_script, $r['conf_description'] );
-	}
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group>Пути и адре�а форума</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>general</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Путь до директории загрузок</conf_title>
-      <conf_description><![CDATA[Вводите аб�олютный (полный) путь до директории загрузок "uploads". Важно понимать, что �то не URL.
-<!--SUGGEST-->]]></conf_description>
-      <conf_group>1</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>upload_dir</conf_key>
-      <conf_default/>
-      <conf_extra>upload_dir</conf_extra>
-      <conf_evalphp><![CDATA[if( $show == 1 )
-{
-	$this_script = str_replace( '\\\\', '/', getenv( 'SCRIPT_FILENAME' ) );
- 	
-	if( $this_script )
-	{
-		$this_script = str_replace( '/'.CP_DIRECTORY.'/index.php', '/uploads', $this_script );
- 		$r['conf_description'] = str_replace( "<!--SUGGEST-->", "<br />IPB определил �ледующий путь к директории загрузок:<br />".$this_script, $r['conf_description'] );
-	}
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -145,16 +139,71 @@
       <conf_description><![CDATA[<b>�еоб�зательно дл� заполнени�</b>
 <br />Опци� позвол�ет переопределить значение домена в action формы загрузок.  Данна� на�тройка может быть полезна дл� форумов, работающих на не�кольких �ерверах, в цел�х ра�пределени� нагрузки.<br />
 Пример значени� пол�: http://master.mysite.ru/forums]]></conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>upload_domain</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>general</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>URL к директории загрузок</conf_title>
+      <conf_description><![CDATA[URL адре�, ведущий к вашей директории "uploads".
+<!--SUGGEST-->]]></conf_description>
+      <conf_group>3</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>upload_url</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp><![CDATA[if( $show == 1 )
+{
+	$this_host   = getenv( 'SERVER_NAME' );
+	$this_script = getenv( 'SCRIPT_NAME' );
+	$this_script = str_replace( "&#092;&#092;&#092;&#092;", "/", $this_script );
+
+	if( $this_host AND $this_script )
+	{
+		$this_script = str_replace( '/'.CP_DIRECTORY.'/index.php', '/uploads', $this_script );
+		$r['conf_description'] = str_replace( "<!--SUGGEST-->", "<br />IP.Board определил URL к директории загрузок так: <strong>http://".$this_host.$this_script . '</strong>', $r['conf_description'] );
+	}
+}]]></conf_evalphp>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group>Пути и адре�а форума</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>general</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Путь до директории загрузок</conf_title>
+      <conf_description><![CDATA[Вводите аб�олютный (полный) путь до директории загрузок "uploads". Важно понимать, что �то не URL.
+<!--SUGGEST-->]]></conf_description>
+      <conf_group>3</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>upload_dir</conf_key>
+      <conf_default/>
+      <conf_extra>upload_dir</conf_extra>
+      <conf_evalphp><![CDATA[if( $show == 1 )
+{
+	$this_script = str_replace( '&#092;&#092;&#092;&#092;', '/', getenv( 'SCRIPT_FILENAME' ) );
+ 	
+	if( $this_script )
+	{
+		$this_script = str_replace( '/'.CP_DIRECTORY.'/index.php', '/uploads', $this_script );
+ 		$r['conf_description'] = str_replace( "<!--SUGGEST-->", "<br />IP.Board определил �ледующий путь к директории загрузок: <strong>".$this_script . '</strong>', $r['conf_description'] );
+	}
+}]]></conf_evalphp>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -166,16 +215,15 @@
 <br />Опци� позвол�ет определить путь до директории, где ра�положены поддиректории skin_cache, style_avatars, style_emoticons, style_images. Данна� на�тройка может быть полезна дл� форумов, работающих на не�кольких �ерверах, в цел�х ра�пределени� нагрузки.<br />
 Пример значени� пол�: /home/srv/clustered_data/forums/
 ]]></conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_cache_path</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
+      <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -186,36 +234,78 @@
       <conf_description><![CDATA[<b>�еоб�зательно дл� заполнени�</b>
     <br />
     Е�ли вы изменили «Путь до директории кеша», необходимо также указать и URL до него.]]></conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_cache_url</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>8</conf_position>
+      <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
+    <setting>
+      <conf_title>Сжать javascript?</conf_title>
+      <conf_description><![CDATA[Вы можете включить �жатие javascript и CSS дл� уменьшени� HTTP запро�ов к �ерверу.<br />
+Опци� не работает, е�ли включена загрузка javascript из Google.]]></conf_description>
+      <conf_group>3</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>use_minify</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>8</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords>minify, reduce, compress, javascript</conf_keywords>
+      <conf_title_keyword>general</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_title>URL к директории изображений</conf_title>
       <conf_description><![CDATA[<b>�еоб�зательно дл� заполнени�</b>
 <br />URL адре�, ведущий к изображени�м, и�пользуемым в �тиле форума (style_images). Данна� на�тройка может быть полезна дл� форумов, работающих на не�кольких �ерверах, в цел�х ра�пределени� нагрузки.<br />
 Пример заполнени� пол�: http://img.domain.ru/forums/]]></conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_img_url</conf_key>
       <conf_default/>
       <conf_extra/>
+      <conf_evalphp><![CDATA[if( $save == 1 && $value )
+{
+		/* Flag skins for recache */
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+		$skinCaching	= new skinCaching( $this->registry );
+		
+		/* Flag all for recache */
+		$skinCaching->flagSetForRecache();
+}]]></conf_evalphp>
+      <conf_protected>1</conf_protected>
+      <conf_position>9</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>general</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title><![CDATA[&quot;�азвание&quot; владельца лицензии]]></conf_title>
+      <conf_description><![CDATA[Это им� будет выведено в&nbsp;�троке &laquo;Лицензи� зареги�трирована на:&raquo; <br />�апример: <em>Иван&nbsp;Иванов</em>,&nbsp;<em>IBResource</em>]]></conf_description>
+      <conf_group>3</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>ipb_reg_name</conf_key>
+      <conf_default/>
+      <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>8</conf_position>
+      <conf_position>11</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -224,19 +314,18 @@
     <setting>
       <conf_title>Режим отладки</conf_title>
       <conf_description>Опци� позвол�ет на�троить детально�ть информации, выводимой внизу �траниц форума</conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>debug_level</conf_key>
       <conf_default>0</conf_default>
-      <conf_extra>0=0: Отключен&#13;
+      <conf_extra><![CDATA[0=0: Отключен&#13;
 1=1: Выводить уровень загрузки �ервера, врем� генерации �траницы и чи�ло запро�ов&#13;
 2=2: Выводить информацию уровн� 1 плю� данные из GET и POST&#13;
-3=3: Выводить информацию уровн� 2 плю� запро�ы к базе данных</conf_extra>
+3=3: Выводить информацию уровн� 2 плю� запро�ы к базе данных]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
+      <conf_position>11</conf_position>
       <conf_start_group>Прочие на�тройки</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -250,52 +339,15 @@ Invision Power Board> Спи�ок пользователей
 
 по�ле - так:
 Спи�ок пользователей]]></conf_description>
-      <conf_group>1</conf_group>
+      <conf_group>3</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>remove_forums_nav</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>11</conf_position>
+      <conf_position>99</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>general</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить возможно�ть делить�� ��ылками</conf_title>
-      <conf_description>�а �траницах � контентом будут добавлены ��ылки дл� публикации контента в различных �ерви�ах. Данна� возможно�ть может быть отключена дл� конкретных форумов непо�ред�твенно в на�тройках �амих форумов.</conf_description>
-      <conf_group>1</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>sl_enable</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>14</conf_position>
-      <conf_start_group>Публикаци� ��ылок</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>general</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить �пи�ок опубликованных материалов</conf_title>
-      <conf_description>Так как нет возможно�ти провер�ть права до�тупа дл� опубликованных на �ерви�ах материалов вы можете полно�тью отключить отображение �пи�ков таких материалов.</conf_description>
-      <conf_group>1</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>sl_publicdata</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>general</conf_title_keyword>
@@ -306,14 +358,31 @@ Invision Power Board> Спи�ок пользователей
       <conf_title_keyword>log_prune</conf_title_keyword>
       <conf_title_title>Журналы дей�твий</conf_title_title>
       <conf_title_desc/>
-      <conf_title_tab>Performance</conf_title_tab>
+      <conf_title_tab>Advanced</conf_title_tab>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
+    <setting>
+      <conf_title>�нти�пам-�ерви�</conf_title>
+      <conf_description>Желаете удал�ть �тарые запи�и из журнала работы � анти-�пам �ерви�ом (по умолчанию через 30 дней)</conf_description>
+      <conf_group>4</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>ipb_prune_spam</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>10</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>log_prune</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_title>По�ещени� пои�ковых ботов</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала по�ещений пои�ковых ботов (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_spider</conf_key>
       <conf_default>1</conf_default>
@@ -321,8 +390,7 @@ Invision Power Board> Спи�ок пользователей
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
-      <conf_start_group>Сокращение журналов</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Очи�тка журналов</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -331,7 +399,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Менеджер задач</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала менеджера задач (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_task</conf_key>
       <conf_default>1</conf_default>
@@ -340,7 +408,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>20</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -349,7 +416,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Дей�тви� админи�траторов</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала дей�твий админи�траторов (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_admin</conf_key>
       <conf_default>0</conf_default>
@@ -358,7 +425,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>30</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -367,7 +433,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Дей�тви� модераторов</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала дей�твий модераторов (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_mod</conf_key>
       <conf_default>0</conf_default>
@@ -376,7 +442,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>40</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -385,7 +450,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>E-mail отправлени�</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала e-mail отправлений (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_email</conf_key>
       <conf_default>1</conf_default>
@@ -394,7 +459,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>50</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -403,7 +467,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>E-mail ошибки</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала e-mail ошибок (по умолчанию через 30 дней)??</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_emailerror</conf_key>
       <conf_default>1</conf_default>
@@ -412,7 +476,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>60</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -421,7 +484,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>SQL ошибки</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала SQL ошибок (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_prune_sql</conf_key>
       <conf_default>1</conf_default>
@@ -430,7 +493,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>70</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -439,7 +501,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Попытки входа в админцентр</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала попыток входа в админцентр (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>prune_admin_login_logs</conf_key>
       <conf_default>1</conf_default>
@@ -448,7 +510,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>80</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -457,7 +518,7 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Общие ошибки (error_log)</conf_title>
       <conf_description>Желаете удал�ть �тарые запи�и из журнала общих ошибок (по умолчанию через 30 дней)?</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>prune_error_logs</conf_key>
       <conf_default>1</conf_default>
@@ -466,7 +527,6 @@ Invision Power Board> Спи�ок пользователей
       <conf_protected>1</conf_protected>
       <conf_position>90</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>prune, error, logs</conf_keywords>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -475,22 +535,21 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Запи�ывать ошибки</conf_title>
       <conf_description>Запи�ывать в�е ошибки выбранного уровн�.</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>error_log_level</conf_key>
       <conf_default>4</conf_default>
-      <conf_extra>0=�е запи�ывать никаких общих ошибок&#13;
+      <conf_extra><![CDATA[0=�е запи�ывать никаких общих ошибок&#13;
 1=Запи�ывать аб�олютно в�е ошибки&#13;
 2=Запи�ывать в�е ошибки 1 уровн� и выше&#13;
 3=Запи�ывать в�е ошибки 2 уровн� и выше&#13;
 4=Запи�ывать в�е ошибки 3 уровн� и выше&#13;
 5=Запи�ывать в�е ошибки 4 уровн� и выше&#13;
-6=Запи�ывать в�е ошибки 5 уровн�</conf_extra>
+6=Запи�ывать в�е ошибки 5 уровн�]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>100</conf_position>
-      <conf_start_group>Запи�ь ошибок</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Журнал ошибок</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -499,22 +558,21 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_title>Уведомление админи�тратору</conf_title>
       <conf_description>Уведомл�ть на e-mail дл� вход�щих пи�ем о запи�и ошибок.</conf_description>
-      <conf_group>2</conf_group>
+      <conf_group>4</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>error_log_notify</conf_key>
-      <conf_default>6</conf_default>
-      <conf_extra>0=�е уведомл�ть вообще&#13;
+      <conf_default>0</conf_default>
+      <conf_extra><![CDATA[0=�е уведомл�ть вообще&#13;
 1=Уведомл�ть обо в�ех ошибках&#13;
 2=Уведомл�ть об ошибках 1 уровн� и выше&#13;
 3=Уведомл�ть об ошибках 2 уровн� и выше&#13;
 4=Уведомл�ть об ошибках 3 уровн� и выше&#13;
 5=Уведомл�ть об ошибках 4 уровн� и выше&#13;
-6=Уведомл�ть об ошибках 5 уровн�</conf_extra>
+6=Уведомл�ть об ошибках 5 уровн�]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>110</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>email, admin, notify, error, log</conf_keywords>
       <conf_title_keyword>log_prune</conf_title_keyword>
@@ -523,244 +581,8 @@ Invision Power Board> Спи�ок пользователей
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_title_title>Интеграци� � Facebook</conf_title_title>
-      <conf_title_desc>�а�тройки дл� �оединени� � Facebook</conf_title_desc>
-      <conf_title_tab>System</conf_title_tab>
-      <conf_title_app>core</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Включить �оединение � Facebook?</conf_title>
-      <conf_description><![CDATA[Первоначально вам �ЕОБХОДИМО на�троить �ам Facebook.<br /?Дл� �того перейдите <a href="http://www.facebook.com/developers/editapp.php?new">�юда</a>]]></conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>fbc_enable</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Ключ API</conf_title>
-      <conf_description>Ключ выдает�� по�ле �оздани� Facebook Application.</conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>fbc_api_id</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>ID приложени�</conf_title>
-      <conf_description>ID выдает�� по�ле �оздани� Facebook Application.</conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>fbc_appid</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Приватный ключ</conf_title>
-      <conf_description><![CDATA[Данный ключ показывает�� как "Секретно" по�ле �оздани� Facebook Application.]]></conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>fbc_secret</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Пользователь�ка� группа по умолчанию</conf_title>
-      <conf_description>В �ту группу будут попадать в�е пользователи, �оздавшие �вой аккаунт на форуме через аккаунт Facebook. Опци� не ра�про�тран�ет �воего дей�тви� на пользователей, которые добавили �вой Facebook аккаунт по�ле обычной реги�трации на форуме.</conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>fbc_mgid</conf_key>
-      <conf_default>3</conf_default>
-      <conf_extra>#show_groups#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Группа дл� Facebook &quot;Bot&quot;]]></conf_title>
-      <conf_description><![CDATA[Facebook провер�ет �траницу � материалом при и�пользовании кнопок «Мне нравит��» и «Поделить��». Укажите группу, в которую будет попадать робот, зашедший дл� проверки на форум . �апример, е�ли дл� го�тей у ва� �крыта ча�ть форумов, то �тоит вы�тавить группу «Пользователи».]]></conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>multi</conf_type>
-      <conf_key>fbc_bot_group</conf_key>
-      <conf_default>2</conf_default>
-      <conf_extra>#show_groups#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[ &quot;Локаль&quot; Facebook Javascript]]></conf_title>
-      <conf_description>Какую локаль необходимо и�пользовать дл� виджетов Facebook. Полный �пи�ок локалей: http://wiki.developers.facebook.com/index.php/Facebook_Locales</conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>fb_locale</conf_key>
-      <conf_default>ru_RU</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Facebook обработка &quot;Отображаемого имени�&quot;]]></conf_title>
-      <conf_description>Какое им� и�пользовать в каче�тве отображаемого, при �оздании учетной запи�и на форуме и входе через Facebook.</conf_description>
-      <conf_group>3</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>fb_realname</conf_key>
-      <conf_default>any</conf_default>
-      <conf_extra>any=на выбор пользовател�
-prefilled=на выбор пользовател�, но заполнить данными имени из facebook
-enforced=и�пользовать им� из facebook</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>fbconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>twitterconnect</conf_title_keyword>
-      <conf_title_title>Интеграци� � Twitter</conf_title_title>
-      <conf_title_desc>�а�тройки дл� �оединени� � Twitter	</conf_title_desc>
-      <conf_title_tab/>
-      <conf_title_app>core</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Включить интеграцию � Twitter</conf_title>
-      <conf_description><![CDATA[Вам также необходимо на�троить Twitter приложение <a href="http://twitter.com/oauth_clients">зде�ь</a>]]></conf_description>
-      <conf_group>4</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>tc_enabled</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>twitterconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Consumer Key</conf_title>
-      <conf_description/>
-      <conf_group>4</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>tc_token</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>twitterconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Consumer Secret</conf_title>
-      <conf_description/>
-      <conf_group>4</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>tc_secret</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>twitterconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Пользователь�ка� группа по умолчанию</conf_title>
-      <conf_description>В �ту группу будут попадать в�е пользователи, �оздавшие �вой аккаунт на форуме через аккаунт Twitter. Опци� не ра�про�тран�ет �воего дей�тви� на пользователей, которые добавили �вой Twitter аккаунт по�ле обычной реги�трации на форуме.</conf_description>
-      <conf_group>4</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>tc_mgid</conf_key>
-      <conf_default>3</conf_default>
-      <conf_extra>#show_groups#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>twitterconnect</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>vk</conf_title_keyword>
-      <conf_title_title>Интеграци� � Вконтакте</conf_title_title>
-      <conf_title_desc>�а�тройки дл� �оединени� � Вконтакте</conf_title_desc>
+      <conf_title_title>Интеграци� � �оциальными �ет�ми</conf_title_title>
+      <conf_title_desc>�а�тройки дл� �оединени� � Вконтакте, Facebook, Twitter, на�тройки публикации контента в �ерви�ах</conf_title_desc>
       <conf_title_tab>System</conf_title_tab>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
@@ -776,11 +598,10 @@ enforced=и�пользовать им� из facebook</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Интеграци� � Вконтакте</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>vk, vkontakte</conf_keywords>
-      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
@@ -795,10 +616,9 @@ enforced=и�пользовать им� из facebook</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
@@ -813,10 +633,9 @@ enforced=и�пользовать им� из facebook</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
@@ -829,75 +648,234 @@ enforced=и�пользовать им� из facebook</conf_extra>
       <conf_extra>#show_groups#</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
+      <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>cookies</conf_title_keyword>
-      <conf_title_title>�а�тройки Cookies</conf_title_title>
-      <conf_title_desc>Группа опций, позвол�юща� вам гибко на�траивать параметры cookie, и�пользуемых форумом.</conf_title_desc>
-      <conf_title_tab>System</conf_title_tab>
-      <conf_title_app>core</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
+      <conf_title>Включить �оединение � Facebook?</conf_title>
+      <conf_description><![CDATA[Первоначально вам �ЕОБХОДИМО на�троить �ам Facebook.<br /?Дл� �того перейдите <a href="http://www.facebook.com/developers/editapp.php?new">�юда</a>]]></conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>fbc_enable</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>20</conf_position>
+      <conf_start_group>Facebook Connect</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Домен</conf_title>
-      <conf_description><![CDATA[И�пользуйте <u>.</u>domain.ru дл� у�тановки cookies, которые будут дей�твовать как на о�новном домене (domain.ru) так и на в�ех �убдоменах данного домена.]]></conf_description>
-      <conf_group>6</conf_group>
+      <conf_title>ID приложени�</conf_title>
+      <conf_description>ID выдает�� по�ле �оздани� Facebook Application.</conf_description>
+      <conf_group>5</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>cookie_domain</conf_key>
+      <conf_key>fbc_appid</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
+      <conf_position>21</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>cookies</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Префик�</conf_title>
-      <conf_description>И�пользуйте префик�, е�ли у ва� у�тановлено не�колько форумов на одном домене.</conf_description>
-      <conf_group>6</conf_group>
+      <conf_title>Приватный ключ</conf_title>
+      <conf_description><![CDATA[Данный ключ показывает�� как "Секретно" по�ле �оздани� Facebook Application.]]></conf_description>
+      <conf_group>5</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>cookie_id</conf_key>
+      <conf_key>fbc_secret</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
+      <conf_position>22</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>cookies</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Путь</conf_title>
+      <conf_title><![CDATA[Facebook обработка &quot;Отображаемого имени�&quot;]]></conf_title>
+      <conf_description>Какое им� и�пользовать в каче�тве отображаемого, при �оздании учетной запи�и на форуме и входе через Facebook.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>fb_realname</conf_key>
+      <conf_default>any</conf_default>
+      <conf_extra>any=на выбор пользовател�&#13;
+prefilled=на выбор пользовател�, но заполнить данными имени из facebook&#13;
+enforced=и�пользовать им� из facebook</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>24</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Пользователь�ка� группа по умолчанию</conf_title>
+      <conf_description>В �ту группу будут попадать в�е пользователи, �оздавшие �вой аккаунт на форуме через аккаунт Facebook. Опци� не ра�про�тран�ет �воего дей�тви� на пользователей, которые добавили �вой Facebook аккаунт по�ле обычной реги�трации на форуме.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>fbc_mgid</conf_key>
+      <conf_default>3</conf_default>
+      <conf_extra>#show_groups#</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>25</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title><![CDATA[ &quot;Локаль&quot; Facebook Javascript]]></conf_title>
+      <conf_description>Какую локаль необходимо и�пользовать дл� виджетов Facebook. Полный �пи�ок локалей: http://wiki.developers.facebook.com/index.php/Facebook_Locales</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>fb_locale</conf_key>
+      <conf_default>ru_RU</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>26</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title><![CDATA[Группа дл� Facebook &quot;Bot&quot;]]></conf_title>
+      <conf_description>Facebook провер�ет �траницу � материалом при и�пользовании кнопок «Мне нравит��» и «Поделить��». Укажите группу, в которую будет попадать робот, зашедший дл� проверки на форум . �апример, е�ли дл� го�тей у ва� �крыта ча�ть форумов, то �тоит вы�тавить группу «Пользователи».</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>multi</conf_type>
+      <conf_key>fbc_bot_group</conf_key>
+      <conf_default>2</conf_default>
+      <conf_extra>#show_groups#</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>27</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Включить интеграцию � Twitter</conf_title>
+      <conf_description><![CDATA[Вам также необходимо на�троить Twitter приложение <a href="http://twitter.com/oauth_clients">зде�ь</a>]]></conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>tc_enabled</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>30</conf_position>
+      <conf_start_group>Интеграци� � Twitter</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Consumer Secret</conf_title>
       <conf_description/>
-      <conf_group>6</conf_group>
+      <conf_group>5</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>cookie_path</conf_key>
+      <conf_key>tc_secret</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
+      <conf_position>31</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>cookies</conf_title_keyword>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Consumer Key</conf_title>
+      <conf_description/>
+      <conf_group>5</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>tc_token</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>32</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Пользователь�ка� группа по умолчанию</conf_title>
+      <conf_description>В �ту группу будут попадать в�е пользователи, �оздавшие �вой аккаунт на форуме через аккаунт Twitter. Опци� не ра�про�тран�ет �воего дей�тви� на пользователей, которые добавили �вой Twitter аккаунт по�ле обычной реги�трации на форуме.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>tc_mgid</conf_key>
+      <conf_default>3</conf_default>
+      <conf_extra>#show_groups#</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>33</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Включить возможно�ть делить�� ��ылками</conf_title>
+      <conf_description>�а �траницах � контентом будут добавлены ��ылки дл� публикации контента в различных �ерви�ах. Данна� возможно�ть может быть отключена дл� конкретных форумов непо�ред�твенно в на�тройках �амих форумов.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>sl_enable</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>40</conf_position>
+      <conf_start_group>Публикаци� контента в �ерви�ах</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Разрешить �пи�ок опубликованных материалов</conf_title>
+      <conf_description>Так как нет возможно�ти провер�ть права до�тупа дл� опубликованных на �ерви�ах материалов вы можете полно�тью отключить отображение �пи�ков таких материалов.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>sl_publicdata</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>41</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>fbconnect</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
@@ -912,7 +890,7 @@ enforced=и�пользовать им� из facebook</conf_extra>
     <setting>
       <conf_title>Метод отправки почты</conf_title>
       <conf_description>Выберите �по�об, которым будет отправл�ть�� почта � форума. Е�ли PHP функци� mail() не работает или не до�тупна, и�пользуйте SMTP. Е�ли вы не уверены, что необходимо выбрать в данном параметре, прокон�ультируйте�ь � вашим хо�тинг-провайдером.</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>mail_method</conf_key>
       <conf_default>mail</conf_default>
@@ -922,7 +900,23 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>email</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Отправл�ть HTML форматированные �ообщени�</conf_title>
+      <conf_description/>
+      <conf_group>9</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>email_use_html</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -931,7 +925,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>Email адре� дл� пи�ем</conf_title>
       <conf_description>�а �тот email будут приходить в�е пи�ьма</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>email_in</conf_key>
       <conf_default/>
@@ -939,8 +933,7 @@ smtp=SMTP</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
-      <conf_start_group>Email адре�а</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Email Addresses</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -949,7 +942,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>Email адре� дл� пол� От</conf_title>
       <conf_description>Данный email будет виден в поле От, во в�ех пи�ьмах, пришедших от форума.</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>email_out</conf_key>
       <conf_default/>
@@ -958,7 +951,6 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -967,7 +959,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>�дре� �ервера</conf_title>
       <conf_description><![CDATA[По умолчанию 'localhost']]></conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>smtp_host</conf_key>
       <conf_default>localhost</conf_default>
@@ -975,8 +967,7 @@ smtp=SMTP</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
-      <conf_start_group>�а�тройки SMTP �ервера</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>SMTP Set-up</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -985,7 +976,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>Порт �ервера</conf_title>
       <conf_description>По умолчанию 25</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>smtp_port</conf_key>
       <conf_default>25</conf_default>
@@ -994,7 +985,6 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1003,7 +993,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title><![CDATA[И�пользовать &#39;&lt;&#39; и &#39;&gt;&#39; в &#39;to&#39; и &#39;from&#39; адре�ах?]]></conf_title>
       <conf_description>�екоторые SMTP �ервера требуют о�обого формата адре�ов. Е�ли у ва� е�ть проблема � отправкой пи�ем, попробуйте включить или отключить �ту опцию</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>mail_wrap_brackets</conf_key>
       <conf_default>0</conf_default>
@@ -1012,7 +1002,6 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1021,7 +1010,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>Им� пользовател� на �ервере</conf_title>
       <conf_description><![CDATA[В �лучае и�пользовани� 'localhost' обычно не требует��.]]></conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>smtp_user</conf_key>
       <conf_default/>
@@ -1030,7 +1019,6 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1039,7 +1027,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>Пароль пользовател�</conf_title>
       <conf_description><![CDATA[В �лучае и�пользовани� 'localhost' обычно не требует��.]]></conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>smtp_pass</conf_key>
       <conf_default/>
@@ -1048,7 +1036,6 @@ smtp=SMTP</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1058,7 +1045,7 @@ smtp=SMTP</conf_extra>
       <conf_title>Дополнительные опции дл� функции</conf_title>
       <conf_description><![CDATA[Вы можете добавить дополнительные опции, которые будут переданы параметром в функцию Mail().
 �апример: -femail@address.com зада�т принудительное значение 'From' дл� в�ех пи�ем.]]></conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>input</conf_type>
       <conf_key>php_mail_extra</conf_key>
       <conf_default/>
@@ -1066,8 +1053,7 @@ smtp=SMTP</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
-      <conf_start_group>�а�тройки PHP Mail</conf_start_group>
-      <conf_end_group>1</conf_end_group>
+      <conf_start_group>PHP Mail Settings</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1076,7 +1062,7 @@ smtp=SMTP</conf_extra>
     <setting>
       <conf_title>�а�тройка SMTP HELO</conf_title>
       <conf_description>Выберите тип, необходимый дл� вашего SMTP �ервера.</conf_description>
-      <conf_group>7</conf_group>
+      <conf_group>8</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>smtp_helo</conf_key>
       <conf_default>HELO</conf_default>
@@ -1086,7 +1072,6 @@ EHLO=EHLO</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>helo ehlo</conf_keywords>
       <conf_title_keyword>email</conf_title_keyword>
@@ -1104,7 +1089,7 @@ EHLO=EHLO</conf_extra>
     <setting>
       <conf_title>Включить IP.Converge?</conf_title>
       <conf_description>Е�ли опци� включена, IPB будет производить идентификацию через  IP.Converge.</conf_description>
-      <conf_group>8</conf_group>
+      <conf_group>9</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipconverge_enabled</conf_key>
       <conf_default>0</conf_default>
@@ -1113,7 +1098,6 @@ EHLO=EHLO</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>ipconverge</conf_title_keyword>
@@ -1122,7 +1106,7 @@ EHLO=EHLO</conf_extra>
     <setting>
       <conf_title>�дре� IP.Converge</conf_title>
       <conf_description>Корневой URL адре� приложени� IP.Converge.</conf_description>
-      <conf_group>8</conf_group>
+      <conf_group>9</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipconverge_url</conf_key>
       <conf_default/>
@@ -1131,7 +1115,6 @@ EHLO=EHLO</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>ipconverge</conf_title_keyword>
@@ -1140,7 +1123,7 @@ EHLO=EHLO</conf_extra>
     <setting>
       <conf_title>Идентификационный номер (Product ID) IP.Converge</conf_title>
       <conf_description>�омер, полученный от IP.Converge �ервера.</conf_description>
-      <conf_group>8</conf_group>
+      <conf_group>9</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipconverge_pid</conf_key>
       <conf_default/>
@@ -1149,7 +1132,6 @@ EHLO=EHLO</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>ipconverge</conf_title_keyword>
@@ -1167,7 +1149,7 @@ EHLO=EHLO</conf_extra>
     <setting>
       <conf_title>Включить XML-RPC API</conf_title>
       <conf_description>При включении данной �и�темы программы-клиенты �могут и�пользовать XML-RPC интерфей� форума.</conf_description>
-      <conf_group>9</conf_group>
+      <conf_group>10</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>xmlrpc_enable</conf_key>
       <conf_default>0</conf_default>
@@ -1176,7 +1158,6 @@ EHLO=EHLO</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>xmlrpcapi</conf_title_keyword>
@@ -1185,7 +1166,7 @@ EHLO=EHLO</conf_extra>
     <setting>
       <conf_title>Журналирование</conf_title>
       <conf_description>Позвол�ет указать тип запи�ей дл� журнала XML-RPC. Е�ли вы выбираете В�е, то в журнал запи�ывают�� в�е запро�ы XML-RPC, е�ли - Ошибки, то в журнал запи�ывают�� проблемные запро�ы.</conf_description>
-      <conf_group>9</conf_group>
+      <conf_group>10</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>xmlrpc_log_type</conf_key>
       <conf_default>all</conf_default>
@@ -1195,7 +1176,6 @@ failed=Ошибки</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>xmlrpcapi</conf_title_keyword>
@@ -1204,7 +1184,7 @@ failed=Ошибки</conf_extra>
     <setting>
       <conf_title>Врем� жизни запи�ей журнала</conf_title>
       <conf_description>За какой промежуток времени хранить запи�и журнала. �апример, е�ли вы введете значение опции 30, то в журнале будут запи�и за по�ледние 30 дней.</conf_description>
-      <conf_group>9</conf_group>
+      <conf_group>10</conf_group>
       <conf_type>input</conf_type>
       <conf_key>xmlrpc_log_expire</conf_key>
       <conf_default>30</conf_default>
@@ -1213,7 +1193,6 @@ failed=Ошибки</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>xmlrpcapi</conf_title_keyword>
@@ -1228,187 +1207,10 @@ failed=Ошибки</conf_extra>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
-    <setting>
-      <conf_title>Механизм генерации Captcha</conf_title>
-      <conf_description>Можно выбрать и�пользование �тороннего �ерви�а reCAPTHCHA или же и�пользовать GD библиотеку.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>bot_antispam_type</conf_key>
-      <conf_default>recaptcha</conf_default>
-      <conf_extra>none=нет&#13;
-recaptcha=reCAPTCHA&#13;
-default=� и�пользованием GD</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить �и�тему вопро�-ответ?</conf_title>
-      <conf_description><![CDATA[Данна� �и�тема выводит вопро� на �транице, где необходима защита от роботов, и ждет ввода правильного ответа. Вы можете <a href='<!--URL-->'>на�троить</a> вопро�ы и ответы, и�пользуемые �и�темой.]]></conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>registration_qanda</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp><![CDATA[if( $show == 1 )
-{
- $r['conf_description'] = str_replace( '<!--URL-->', $this->settings['_base_url'] . 'app=core&module=tools&section=qanda', $r['conf_description'] );
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>captcha spam spambot questions registration security</conf_keywords>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить Captcha при отправке �ообщений го�т�ми?</conf_title>
-      <conf_description>При включенной опции, го�т�м необходимо будет пройти CAPTCHA те�т, при попытке добавлени� темы или �ообщени�.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>guest_captcha</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать шрифты</conf_title>
-      <conf_description><![CDATA[И�пользование уникальных шрифтов, позвол�ет у�илить отказоу�тойчиво�ть Captcha ко взлому. Вы можете добавить новые шрифты в директорию '/style_captcha/captcha_fonts'.]]></conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>captcha_allow_fonts</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group>�а�тройки GD Captcha</conf_start_group>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Публичный ключ (Public Key)</conf_title>
-      <conf_description><![CDATA[<a href='http://www.recaptcha.net'>Получить ключ</a>]]></conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>recaptcha_public_key</conf_key>
-      <conf_default>6LcpWAMAAAAAAA4klDtDNuDH6LsGgBX5mBoJ3naK</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group>�а�тройки reCAPTCHA</conf_start_group>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>recaptcha, captcha</conf_keywords>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Приватный ключ (Private Key)</conf_title>
-      <conf_description><![CDATA[<a href='http://www.recaptcha.net'>Получить ключ</a>]]></conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>recaptcha_private_key</conf_key>
-      <conf_default>6LcpWAMAAAAAAETX5jHd9NlPtIHJA4G-ra3X2RQB</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>recaptcha, captcha</conf_keywords>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Язык интерфей�а</conf_title>
-      <conf_description/>
-      <conf_group>10</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>recaptcha_language</conf_key>
-      <conf_default>ru</conf_default>
-      <conf_extra>en=English&#13;
-nl=Dutch&#13;
-fr=French&#13;
-de=German&#13;
-pt=Portuguese&#13;
-ru=Ру��кий&#13;
-es=Spanish&#13;
-tr=Turkish</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>8</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>recaptcha</conf_keywords>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Оформление</conf_title>
-      <conf_description>Вы можете выбрать одну из �тандартных тем, котора� будет и�пользовать�� дл� оформлени� формы вывода reCAPTCHA.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>recaptcha_theme</conf_key>
-      <conf_default>clean</conf_default>
-      <conf_extra>clean=Clean&#13;
-red=Red&#13;
-white=White&#13;
-blackglass=Blackglass</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить динамиче�кие изображени�?</conf_title>
-      <conf_description>Е�ли опци� включена, пользователи могут размещать изображени�, генерируемые PHP/CGI �криптами. Иногда их и�пользуют вме�то подпи�и, но пользователи могут во�пользовать�� ими, чтобы запи�ать в них опа�ный код дл� взлома форума.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>allow_dynamic_img</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>10</conf_position>
-      <conf_start_group><![CDATA[Безопа�но�ть [на�тройки, оказывающие вы�окое вли�ние на безопа�но�ть]]]></conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Разрешить X_FORWARDED_FOR?</conf_title>
       <conf_description>Е�ли данна� опци� включена, то �и�тема будет учитывать заголовки X_FORWARDED_FOR при получении IP-адре�а пользовател�. Это бывает полезно в Интранет �ет�х, когда REMOTE_ADDR один  и тот же дл� в�ех пользователей �ети. Однако данный заголовок очень легко изменить, и �тим фактом могут во�пользовать�� � целью подмены IP адре�а.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>xforward_matching</conf_key>
       <conf_default>0</conf_default>
@@ -1416,8 +1218,7 @@ blackglass=Blackglass</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Безопа�но�ть</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1426,7 +1227,7 @@ blackglass=Blackglass</conf_extra>
     <setting>
       <conf_title>Метод во��тановлени� забытого парол�</conf_title>
       <conf_description><![CDATA[Рекомендуем и�пользовать метод 'Вы�лать по почте �лучайно �генерированный пароль', по�кольку �то �амый безопа�ный метод.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>lp_method</conf_key>
       <conf_default>random</conf_default>
@@ -1436,7 +1237,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1445,7 +1245,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>Врем� жизни ключа авторизации пользовател�</conf_title>
       <conf_description>В течение указанного промежутка времени, ключ авторизации (он у�танавливает�� в cookie пользовател�) будет �читать�� дей�твительным. По и�течению указанного �рока, пользователю вы�тавл�ет�� новый ключ. Чем меньше временной интервал, тем больше защищены пользователи от кражи cookies.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>login_key_expire</conf_key>
       <conf_default>7</conf_default>
@@ -1457,25 +1257,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>13</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Сбра�ывать ключ авторизации при каждом входе?</conf_title>
-      <conf_description/>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>login_change_key</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>14</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1484,7 +1265,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>Длительно�ть �е��ии</conf_title>
       <conf_description>Чи�ло �екунд, проход�щее до того, как �е��и� пользовател� и�течёт и будет удалена. Чем меньше �то чи�ло, тем меньше шан�ов, что �е��ию перехват�т.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>input</conf_type>
       <conf_key>session_expiration</conf_key>
       <conf_default>3600</conf_default>
@@ -1493,7 +1274,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>15</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1502,7 +1282,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>Учитывать IP адре� пользовател� при проверке �е��ии?</conf_title>
       <conf_description>Е�ли функци� включена, IP адре� пользовател� должен �овпадать �о значением, хранимым в таблице �е��ий. Отключите данную функцию в интранете, когда многие пользователи имеют один и тот же IP адре�.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>match_ipaddress</conf_key>
       <conf_default>1</conf_default>
@@ -1511,7 +1291,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>16</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1520,7 +1299,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>Учитывать браузер пользовател� при проверке �е��ии?</conf_title>
       <conf_description>Данна� функци� еще более �нижает веро�тно�ть перехвата �е��ии, но �то значит, что �е��и� пользовател� прекратить��, е�ли он одновременно во�пользует�� не�колькими браузерами.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>match_browser</conf_key>
       <conf_default>0</conf_default>
@@ -1529,7 +1308,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>17</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1539,7 +1317,7 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_title>Количе�тво неудачных попыток авторизовать��</conf_title>
       <conf_description><![CDATA[Количе�тво неудавших�� попыток авторизовать�� до того, как учетна� запи�ь будет заблокирована.<br />
 <b>Совет</b>: У�тановите 0, чтобы отключить функцию.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_bruteforce_attempts</conf_key>
       <conf_default>3</conf_default>
@@ -1548,7 +1326,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>18</conf_position>
       <conf_start_group>Защита от перебора паролей</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1558,7 +1335,7 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_title>Сбра�ывать �четчик неудачных попыток через Х минут</conf_title>
       <conf_description><![CDATA[Через �колько минут �бро�ить �чет неудачных попыток авторизации? <br />
 <b>Совет</b>: У�тановите 0, чтобы не �бра�ывать неудавшие�� попытки. <!-- locked -->]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_bruteforce_period</conf_key>
       <conf_default>15</conf_default>
@@ -1567,7 +1344,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>19</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1577,7 +1353,7 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_title>�втоматиче�ки разблокировать учетную запи�ь?</conf_title>
       <conf_description><![CDATA[Е�ли запи�ь заблокирована из-за неудачных попыток авторизации, можно разблокировать учетную запи�ь через определенный промежуток времени по�ле неудачных попыток.<br />
 <b>Совет</b>: Отключение данной функции потребует разблокировать учетные запи�и вручную во вкладке Си�тема.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_bruteforce_unlock</conf_key>
       <conf_default>1</conf_default>
@@ -1586,61 +1362,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>20</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать защищенную форму дл� отправки пи�ьма пользователю?</conf_title>
-      <conf_description>Опци� позвол�ет �крыть e-mail адре�а пользовател� от других пользователей. Это �по�об�твует защите �лектронных адре�ов пользователей от разглашени�.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>use_mail_form</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>21</conf_position>
-      <conf_start_group><![CDATA[Безопа�но�ть [на�тройки, оказывающие �реднее вли�ние на безопа�но�ть]]]></conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Запретить размещать flash?</conf_title>
-      <conf_description>Опци� позвол�ет запретить и�пользование flash во в�ей �и�теме.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>disable_flash</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>22</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить отправку изображений?</conf_title>
-      <conf_description>Опытные программи�ты могут �оздавать �крипты и под видом изображений загружать их на �ервер. IP.Board ограничивает потенциальный урон от подобных дей�твий. Эту функцию �ледует отключать только в крайних �луча�х.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>allow_images</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>23</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1649,7 +1370,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>Убрать ��ылку на �Ц � форума?</conf_title>
       <conf_description><![CDATA[Е�ли функци� активна, ��ылка на �Ц не будет отображать�� в заголовке форума. Полезно, е�ли вы переименовали папку 'admin'.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>security_remove_acp_link</conf_key>
       <conf_default>0</conf_default>
@@ -1658,7 +1379,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>24</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1667,7 +1387,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>И�пользовать https протокол дл� форм входа?</conf_title>
       <conf_description>И�пользование протокола HTTPS, позвол�ет защитить передачу логина и парол�. И�пользовать данную опцию можно только в �лучае правильной на�тройки web-�ервера.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>logins_over_https</conf_key>
       <conf_default>0</conf_default>
@@ -1676,7 +1396,6 @@ choose=разрешить пользователю �амому вве�ти н
       <conf_protected>1</conf_protected>
       <conf_position>25</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1685,7 +1404,7 @@ choose=разрешить пользователю �амому вве�ти н
     <setting>
       <conf_title>И�пользовать активацию учетных запи�ей пользователей?</conf_title>
       <conf_description><![CDATA[�дмини�тратор может вручную утверждать в�е новые учетные запи�и или у�тановить проверку �лектронных адре�ов пользователей. Е�ли у�тановлен метод проверки "�ктиваци� по e-mail, затем админи�тратором", то пользователь получает проверочное �лектронное пи�ьмо. При у�пешной активации, пользователь попадает в очередь на утверждение админи�тратором.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>reg_auth_type</conf_key>
       <conf_default>user</conf_default>
@@ -1697,7 +1416,6 @@ admin=активаци� админи�тратором&#13;
       <conf_protected>1</conf_protected>
       <conf_position>26</conf_position>
       <conf_start_group><![CDATA[Безопа�но�ть [работа � пользовател�ми]]]></conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1706,7 +1424,7 @@ admin=активаци� админи�тратором&#13;
     <setting>
       <conf_title>Удал�ть неактивированные учетные запи�и по�ле X дней</conf_title>
       <conf_description>Включение �той опции позвол�ет удал�ть в�е учётные запи�и автоматиче�ки, е�ли они не были активированы в течение указанного количе�тва дней. Введите 0, чтобы не удал�ть автоматиче�ки неподтвержденные реги�трации.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>input</conf_type>
       <conf_key>validate_day_prune</conf_key>
       <conf_default>0</conf_default>
@@ -1715,7 +1433,6 @@ admin=активаци� админи�тратором&#13;
       <conf_protected>1</conf_protected>
       <conf_position>27</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1724,7 +1441,7 @@ admin=активаци� админи�тратором&#13;
     <setting>
       <conf_title>Уведомл�ть при реги�трации нового пользовател�?</conf_title>
       <conf_description>Включение опции позвол�ет уведомл�ть админи�трацию о каждой новой реги�трации пользовател� на форуме.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>new_reg_notify</conf_key>
       <conf_default>0</conf_default>
@@ -1733,66 +1450,6 @@ admin=активаци� админи�тратором&#13;
       <conf_protected>1</conf_protected>
       <conf_position>28</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Уведомл�ть при по�влении нового �памера?</conf_title>
-      <conf_description>Включение опции позвол�ет уведомл�ть админи�трацию, е�ли какой-либо пользователь был отмечен как �памер.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>spm_notify</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>29</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Пользователю, отмеченному как �памер, запрещено</conf_title>
-      <conf_description/>
-      <conf_group>10</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>spm_option</conf_key>
-      <conf_default>disable</conf_default>
-      <conf_extra>none=в�е разрешено&#13;
-disable=отправл�ть PM/�ообщени�/темы&#13;
-unapprove=отправл�ть PM/�ообщени�/темы и �крывают�� в�е его �ообщени�&#13;
-</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>30</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Скрывать �ообщени� за X дней при отметке пользовател� как �памер</conf_title>
-      <conf_description><![CDATA[Опци� имеет �илу, только при выборе пункта � �окрытием �ообщений в предыдущей на�тройке.
-В значении опции необходимо указать количе�тво дней, за которые �ообщени� от пользовател�, помеченного как �памер, будут �крыты. �апример, е�ли указать 3 дн�, то при отметке пользовател� �памером, в�е его �ообщени� за предыдущие 3 дн� будут �крыты. <br />
-Вы можете вве�ти значение 0, тогда в�е �ообщени� пользовател� будут �крыты.]]></conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>spm_post_days</conf_key>
-      <conf_default>3</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>31</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1801,7 +1458,7 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>За�тавл�ть по�етителей авторизовать��, чтобы увидеть форум?</conf_title>
       <conf_description>Е�ли �та на�тройка включена, по�етители должны будут либо авторизовать��, либо зареги�трировать�� перед тем, как продолжить про�мотр форума.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>force_login</conf_key>
       <conf_default>0</conf_default>
@@ -1810,7 +1467,6 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
       <conf_protected>1</conf_protected>
       <conf_position>32</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1819,16 +1475,17 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>Отключить реги�трацию?</conf_title>
       <conf_description>Включение �той на�тройки полно�тью отключает возможно�ть реги�трации по�етителей на форуме.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
+      <conf_group>11</conf_group>
+      <conf_type>dropdown</conf_type>
       <conf_key>no_reg</conf_key>
       <conf_default>0</conf_default>
-      <conf_extra/>
+      <conf_extra>0=нет&#13;
+1=только внутреннюю&#13;
+2=в�е возможные методы реги�трации</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>33</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1837,7 +1494,7 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>Удал�ть коды chr(0xCA) при вводе?</conf_title>
       <conf_description><![CDATA[Символ chr(0xCA) может и�пользовать�� в каче�тве '�крытого' �имвола пробела дл� �мул�ции зареги�трированных имен – <strong>может �тать причиной пропадани� �имволов в �ообщени�х в кодировках, отличных от западной</strong>.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>strip_space_chr</conf_key>
       <conf_default>0</conf_default>
@@ -1846,25 +1503,6 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
       <conf_protected>1</conf_protected>
       <conf_position>34</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Отключить ��ылку &#39;Пожаловать�� на �ообщение модератору&#39;?]]></conf_title>
-      <conf_description>Отключает возможно�ть пользователей жаловать�� на �ообщени�.</conf_description>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>disable_reportpost</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>35</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1873,16 +1511,15 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>Флуд-контроль — интервал задержки</conf_title>
       <conf_description><![CDATA[За�тавит пользователей подождать перед размещением �ледующего �ообщени�.<br>Е�ли о�тавить на�тройку пу�той, флуд-контроль будет отключён. �е отно�ит�� к пользовател�м, принадлежащим к группе, которой разрешено обходить флуд-контроль.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>input</conf_type>
       <conf_key>flood_control</conf_key>
-      <conf_default>10</conf_default>
+      <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>36</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1891,7 +1528,7 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>Разрешить пользовател�м про�матривать �пи�ок активных пользователей?</conf_title>
       <conf_description>Е�ли на�тройка включена, пользователи и по�етители получат возможно�ть про�матривать �пи�ки активных пользователей. Темы и форумы, которые пользователь не имеет право про�матривать, не показывают��.</conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>allow_online_list</conf_key>
       <conf_default>1</conf_default>
@@ -1899,26 +1536,7 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>37</conf_position>
-      <conf_start_group>Конфиденциально�ть</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Показывать вер�ию IPB?</conf_title>
-      <conf_description/>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>ipb_display_version</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>38</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Приватно�ть</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -1927,52 +1545,32 @@ unapprove=отправл�ть PM/�ообщени�/темы и �крываю
     <setting>
       <conf_title>Отключить возможно�ть анонимной авторизации?</conf_title>
       <conf_description><![CDATA[Е�ли опци� включена, то пользователи не увид�т опцию "Скрытно�ть" в форме входа.]]></conf_description>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>disable_anonymous</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>39</conf_position>
+      <conf_position>38</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Отключить возможно�ть  админи�траторам видеть анонимных пользователей на форуме?</conf_title>
+      <conf_title>Показывать вер�ию IPB?</conf_title>
       <conf_description/>
-      <conf_group>10</conf_group>
+      <conf_group>11</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>disable_admin_anon</conf_key>
-      <conf_default>0</conf_default>
+      <conf_key>ipb_display_version</conf_key>
+      <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>40</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>securityandprivacy</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Отключить возможно�ть админи�траторов видеть IP-адре�а пользователей на форуме?</conf_title>
-      <conf_description/>
-      <conf_group>10</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>disable_online_ip</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>41</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>securityandprivacy</conf_title_keyword>
@@ -2003,7 +1601,6 @@ sphinx=Sphinx</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2021,30 +1618,6 @@ sphinx=Sphinx</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>searchsetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Тип пои�ка �лово�очетаний</conf_title>
-      <conf_description><![CDATA[При типе "ИЛИ" в результатах пои�ка будут материалы, �одержащие хот� бы одно �лово, вход�щее в �лово�очетание.
-
-При типе "И" в результатах будут только те материалы, которые �одержат оба �лова.
-
-Опци� имеет �илу только дл� «Традиционного» пои�ка]]></conf_description>
-      <conf_group>12</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>s_andor_type</conf_key>
-      <conf_default>and</conf_default>
-      <conf_extra>and=И&#13;
-    or=ИЛИ</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2062,27 +1635,8 @@ sphinx=Sphinx</conf_extra>
       <conf_extra>min_search_word</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
+      <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>searchsetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Количе�тво отображаемых на одной �транице результатов</conf_title>
-      <conf_description>Пол умолчанию 25.</conf_description>
-      <conf_group>12</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>search_per_page</conf_key>
-      <conf_default>25</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2101,11 +1655,44 @@ sphinx=Sphinx</conf_extra>
 400=400&#13;
 500=500&#13;
 1000=1000</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>searchsetup</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Количе�тво отображаемых на одной �транице результатов</conf_title>
+      <conf_description>Пол умолчанию 25.</conf_description>
+      <conf_group>12</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>search_per_page</conf_key>
+      <conf_default>25</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>searchsetup</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>�овые публикации должны и�пользовать только SQL</conf_title>
+      <conf_description>При включении данной опции получение данных о новых публикаци�х будет выполн�ть�� только через SQL. Это позвол�ет убрать временной лаг при работе Sphinx.</conf_description>
+      <conf_group>12</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>force_sql_vnc</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2139,27 +1726,48 @@ if ( $show == 1 )
 $key = 'vnp_block_forums[]';
 }]]></conf_evalphp>
       <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
+      <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Ограничить &quot;Темы/Сообщени� �того пользовател�&quot; результатами за X дней]]></conf_title>
-      <conf_description>Количе�тво дней �читает�� � момента по�леднего �ообщени� пользовател�. Таким образом, е�ли по�ледний раз пользователь отправл�л �ообщение/тему в марте, и вы указали в на�тройках лимит в 30 дней, то пои�к будет и�кать в�е темы/�ообщени� за февраль (т.е. 30-ю дн�ми ранее по�ледней даты отправки �ообщени�).</conf_description>
+      <conf_title>Тип пои�ка �лово�очетаний</conf_title>
+      <conf_description><![CDATA[При типе "ИЛИ" в результатах пои�ка будут материалы, �одержащие хот� бы одно �лово, вход�щее в �лово�очетание.
+
+При типе "И" в результатах будут только те материалы, которые �одержат оба �лова.
+
+Опци� имеет �илу только дл� «Традиционного» пои�ка]]></conf_description>
       <conf_group>12</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>search_ucontent_days</conf_key>
-      <conf_default>365</conf_default>
-      <conf_extra/>
+      <conf_type>dropdown</conf_type>
+      <conf_key>s_andor_type</conf_key>
+      <conf_default>and</conf_default>
+      <conf_extra>and=И&#13;
+or=ИЛИ</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>7</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>searchsetup</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>По умолчанию новыми публикаци�ми �читать:</conf_title>
+      <conf_description/>
+      <conf_group>12</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>default_vnc_method</conf_key>
+      <conf_default>unread</conf_default>
+      <conf_extra>unread=�е прочитанное&#13;
+lastvisit=�овое � по�леднего по�ещени�</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2177,8 +1785,7 @@ $key = 'vnp_block_forums[]';
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
+      <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
@@ -2195,8 +1802,24 @@ $key = 'vnp_block_forums[]';
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
-      <conf_start_group>�а�тройки Sphinx пои�ка</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>�а�тройки Sphinx</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>searchsetup</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title><![CDATA[Ограничить &quot;Темы/Сообщени� �того пользовател�&quot; результатами за X дней]]></conf_title>
+      <conf_description>Количе�тво дней �читает�� � момента по�леднего �ообщени� пользовател�. Таким образом, е�ли по�ледний раз пользователь отправл�л �ообщение/тему в марте, и вы указали в на�тройках лимит в 30 дней, то пои�к будет и�кать в�е темы/�ообщени� за февраль (т.е. 30-ю дн�ми ранее по�ледней даты отправки �ообщени�).</conf_description>
+      <conf_group>12</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>search_ucontent_days</conf_key>
+      <conf_default>365</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>10</conf_position>
+      <conf_start_group/>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2215,7 +1838,6 @@ $key = 'vnp_block_forums[]';
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2233,7 +1855,23 @@ $key = 'vnp_block_forums[]';
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>searchsetup</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Префик� дл� Sphinx индек�а</conf_title>
+      <conf_description>И�пользование уникального префик�а дл� индек�а данного форума. Это позвол�ет и�пользовать один Sphinx демон дл� не�кольких форумов IP.Board</conf_description>
+      <conf_group>12</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>sphinx_prefix</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>13</conf_position>
+      <conf_start_group/>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2249,9 +1887,8 @@ $key = 'vnp_block_forums[]';
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>13</conf_position>
+      <conf_position>14</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>searchsetup</conf_title_keyword>
@@ -2262,7 +1899,7 @@ $key = 'vnp_block_forums[]';
       <conf_title_keyword>serverenvironment</conf_title_keyword>
       <conf_title_title>�а�тройки �ерверного окружени�</conf_title_title>
       <conf_title_desc>�а�тройки данной группы, позвол�ют под�троить ваш форум под параметры �ерверного окружени�.</conf_title_desc>
-      <conf_title_tab/>
+      <conf_title_tab>System</conf_title_tab>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
@@ -2277,8 +1914,7 @@ $key = 'vnp_block_forums[]';
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Кодировки</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2292,37 +1928,18 @@ $key = 'vnp_block_forums[]';
       <conf_key>charset_conv_method</conf_key>
       <conf_default>mb</conf_default>
       <conf_extra>internal=Внтренний&#13;
-    mb=mb функции&#13;
-    recode=recode&#13;
-    iconv=iconv</conf_extra>
+mb=mb функции&#13;
+recode=recode&#13;
+iconv=iconv</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>multibyte, utf8, utf-8, charset, recode, iconv, mb, internal</conf_keywords>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_title>Включить безопа�ный режим дл� �тилей?</conf_title>
-      <conf_description>В безопа�ном режиме работы �тилей �и�тема подключает шаблоны �тилей из базы данных. В обычном режиме, �и�тема и�пользует шаблоны �тилей из кеш-файлов, хран�щих�� в директории cache. Безопа�ный режим необходим в �лучае проблем � чтением �тилей из кеш-файлов, например, когда по�вл�ют�� PHP ошибки, �в�занные � safemode и/или open_basedir.</conf_description>
-      <conf_group>13</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>safe_mode_skins</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>serverenvironment</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Отключить AJAX дл� тек�тов</conf_title>
       <conf_description>Полезно дл� �айтов имеющих проблемы � неверным отображением �имволов национальных кодировок, не поддерживаемых PHP.</conf_description>
@@ -2333,9 +1950,25 @@ $key = 'vnp_block_forums[]';
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
+      <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>serverenvironment</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Включить безопа�ный режим дл� �тилей?</conf_title>
+      <conf_description>В безопа�ном режиме работы �тилей �и�тема подключает шаблоны �тилей из базы данных. В обычном режиме, �и�тема и�пользует шаблоны �тилей из кеш-файлов, хран�щих�� в директории cache. Безопа�ный режим необходим в �лучае проблем � чтением �тилей из кеш-файлов, например, когда по�вл�ют�� PHP ошибки, �в�занные � safemode и/или open_basedir.</conf_description>
+      <conf_group>13</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>safe_mode_skins</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group>Серверное окружение</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2353,26 +1986,6 @@ $key = 'vnp_block_forums[]';
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>serverenvironment</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Вер�и� GD</conf_title>
-      <conf_description><![CDATA[GD – в�троенна� графиче�ка� библиотека дл� Р�Р. Большин�тво пакетов Р�Р имеют библиотеку GD2, котора� предлагает более у�овершен�твованные функции. Е�ли при у�тановлении �той на�тройки в "GD2", произойдет ошибка, тогда выберите "GD1".]]></conf_description>
-      <conf_group>13</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>gd_version</conf_key>
-      <conf_default>2</conf_default>
-      <conf_extra>1=GD1&#13;
-2=GD2</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2384,13 +1997,12 @@ $key = 'vnp_block_forums[]';
       <conf_group>13</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>print_headers</conf_key>
-      <conf_default>0</conf_default>
+      <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2408,25 +2020,6 @@ $key = 'vnp_block_forums[]';
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>serverenvironment</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Убрать �траницы переадре�ации?</conf_title>
-      <conf_description>Включение опции позвол�ет убрать �траницу переадре�ации, и�пользуемую дл� информировани� пользовател� о его по�леднем дей�твии. Переадре�аци� будет прои�ходить напр�мую, без отображени� данной �траницы.</conf_description>
-      <conf_group>13</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>ipb_remove_redirect_pages</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2438,34 +2031,14 @@ $key = 'vnp_block_forums[]';
       <conf_group>13</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>header_redirect</conf_key>
-      <conf_default/>
+      <conf_default>location</conf_default>
       <conf_extra>location=Location type (*nix savvy)&#13;
 refresh=Refresh (Windows savvy)&#13;
-html=HTML META redirect (Е�ли другие варианты не работают...)</conf_extra>
+html=HTML META redirect (Е�ли другие варианты не работают)</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>serverenvironment</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать �океты?</conf_title>
-      <conf_description>Включение данной опции позволит и�пользовать механизм �окетов дл� работы форума � внешними ре�ур�ами (например, дл� получени� RSS потоков). &#13;
-</conf_description>
-      <conf_group>13</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>enable_sockets</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>11</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2482,8 +2055,7 @@ html=HTML META redirect (Е�ли другие варианты не работ
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
-      <conf_start_group>HTTP-авторизаци�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>HTTP авторизаци�</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2501,7 +2073,57 @@ html=HTML META redirect (Е�ли другие варианты не работ
       <conf_protected>1</conf_protected>
       <conf_position>13</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>serverenvironment</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Домен</conf_title>
+      <conf_description><![CDATA[И�пользуйте <u>.</u>domain.ru дл� у�тановки cookies, которые будут дей�твовать как на о�новном домене (domain.ru) так и на в�ех �убдоменах данного домена.]]></conf_description>
+      <conf_group>13</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>cookie_domain</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>500</conf_position>
+      <conf_start_group>Cookies</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>serverenvironment</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Префик�</conf_title>
+      <conf_description>И�пользуйте префик�, е�ли у ва� у�тановлено не�колько форумов на одном домене.</conf_description>
+      <conf_group>13</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>cookie_id</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>501</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>serverenvironment</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Путь</conf_title>
+      <conf_description/>
+      <conf_group>13</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>cookie_path</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>502</conf_position>
+      <conf_start_group/>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>serverenvironment</conf_title_keyword>
@@ -2512,7 +2134,7 @@ html=HTML META redirect (Е�ли другие варианты не работ
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
       <conf_title_title>�а�тройки �и�темы рекламы</conf_title_title>
       <conf_title_desc>Данные опции позвол�ют на�троить рекламные площадки форума</conf_title_desc>
-      <conf_title_tab/>
+      <conf_title_tab>System</conf_title_tab>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
@@ -2528,7 +2150,6 @@ html=HTML META redirect (Е�ли другие варианты не работ
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>О�новные на�тройки</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2552,17 +2173,16 @@ html=HTML META redirect (Е�ли другие варианты не работ
 	{
 		$_POST['ad_code_exempt_groups'] = "";
 	}
-
+	
 	$key = 'ad_code_exempt_groups';
 }
 if ( $show == 1 )
 {
-  $key='ad_code_exempt_groups[]';
+    $key='ad_code_exempt_groups[]';
 }]]></conf_evalphp>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2580,7 +2200,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>ad,advertisement,code,header</conf_keywords>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2598,7 +2217,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>ad,code,advertisement,footer</conf_keywords>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2616,7 +2234,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group>Главна� �траница</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2634,7 +2251,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2652,7 +2268,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2669,8 +2284,7 @@ if ( $show == 1 )
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
-      <conf_start_group>Страница тем форума</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Страница форума</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2688,7 +2302,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2706,7 +2319,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2724,7 +2336,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
       <conf_start_group>Страница темы</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2742,7 +2353,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
@@ -2760,25 +2370,206 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>13</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>adcodeintegration</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
+    <setting>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_title_title>�а�тройки �и�темы тегов</conf_title_title>
+      <conf_title_desc>Параметры на�тройки �и�темы тегов</conf_title_desc>
+      <conf_title_tab>System</conf_title_tab>
+      <conf_title_app>core</conf_title_app>
+      <conf_title_noshow>0</conf_title_noshow>
+    </setting>
+    <setting>
+      <conf_title>Си�тема включена?</conf_title>
+      <conf_description>Включить или отключить �и�тему тегов</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>tags_enabled</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Тип �и�темы</conf_title>
+      <conf_description>Открыта� �и�тема позвол�ет пользовател�м �амим �оздавать теги. Закрыта� - админи�траторы �оздают теги, пользователи их и�пользуют.</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>tags_open_system</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[1=Открыта� (�оздание и добавление тегов на лету)&#13;
+0=Закрыта� (и�пользование только заранее �озданных тегов)]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>2</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>И�пользование тегов как префик�ов тем</conf_title>
+      <conf_description/>
+      <conf_group>15</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>tags_can_prefix</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[0=Запретить&#13;
+1=Только админи�траторам&#13;
+2=В�ем кто имеет �оответ�твующие права]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>3</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Разрешенные теги</conf_title>
+      <conf_description>При и�пользовании закрытого типа �и�темы в данной на�тройке вы должны указать �пи�ок тегов, которые можно и�пользовать. Разделитель - зап�та�.</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>textarea</conf_type>
+      <conf_key>tags_predefined</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Преобразовывать имена тегов к нижнему реги�тру</conf_title>
+      <conf_description/>
+      <conf_group>15</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>tags_force_lower</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Минимальное количе�тво тегов к запи�и</conf_title>
+      <conf_description>0 - отключает ограничение.</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>tags_min</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>6</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Мак�имальное количе�тво тегов к запи�и</conf_title>
+      <conf_description>0 - отключает ограничение</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>tags_max</conf_key>
+      <conf_default>10</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>7</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Минимальна� длина тега</conf_title>
+      <conf_description>0 - отключает ограничение</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>tags_len_min</conf_key>
+      <conf_default>2</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>8</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Маки�мальна� длина тега</conf_title>
+      <conf_description>0 - отключает ограничение</conf_description>
+      <conf_group>15</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>tags_len_max</conf_key>
+      <conf_default>30</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>9</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Провер�ть теги через фильтр нецензурных �лов</conf_title>
+      <conf_description/>
+      <conf_group>15</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>tags_clean</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>10</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>globaltags</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>cpusaving</conf_title_keyword>
       <conf_title_title>Оптимизаци� нагрузки на �ервер</conf_title_title>
       <conf_title_desc>Данный раздел позвол�ет ограничить или отключить некоторые функции, что позволит у�корить работу вашего форума.</conf_title_desc>
-      <conf_title_tab>Performance</conf_title_tab>
+      <conf_title_tab>Advanced</conf_title_tab>
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
     <setting>
       <conf_title>Лимит загрузки �ервера</conf_title>
       <conf_description><![CDATA[Когда загрузка до�тигает указанного предела, отображает�� «форум перегружен»<br>Вы можете отключить лимит, про�то не заполн�� данное поле.]]></conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>input</conf_type>
       <conf_key>load_limit</conf_key>
       <conf_default/>
@@ -2787,7 +2578,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2796,7 +2586,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить кеширование (prefetch)?</conf_title>
       <conf_description>�екоторые веб-оптимизаторы могут кешировать �траницы перед запро�ом пользовател�. Это �уще�твенно у�кор�ет загрузку �траницы пользователем, однако, �оздает дополнительную нагрузку на �ервер.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>disable_prefetching</conf_key>
       <conf_default>1</conf_default>
@@ -2805,7 +2595,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2814,7 +2603,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Включить кеширование?</conf_title>
       <conf_description>Е�ли включить данную опцию, некоторые данные будут кешировать�� дл� �охранени� ре�ур�ов �ервера.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>cc_on</conf_key>
       <conf_default>1</conf_default>
@@ -2822,27 +2611,7 @@ if ( $show == 1 )
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
-      <conf_start_group>Кеширование данных</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить мониторинг?</conf_title>
-      <conf_description><![CDATA[Включение мониторинга �и�темы кешировани� позволит увидеть �тати�тику попадани� запи�ей в кеш. <br />
-<b>Важно:</b> не включайте на�тройку на загруженном форуме. Это может приве�ти к �ильной потери производительно�ти!]]></conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>cc_monitor</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Кеширование �одержимого</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2852,16 +2621,15 @@ if ( $show == 1 )
       <conf_title>Кеширование �ообщений</conf_title>
       <conf_description><![CDATA[Введите количе�тво дней, через которое кешируемые �ообщени� будет обновл�ть��?<br/ >
 Введите 0 дл� отключени� кешировани� �ообщений.]]></conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>input</conf_type>
       <conf_key>cc_posts</conf_key>
       <conf_default>7</conf_default>
       <conf_extra/>
       <conf_evalphp/>
-      <conf_protected>0</conf_protected>
+      <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2870,7 +2638,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Кеширование подпи�ей</conf_title>
       <conf_description><![CDATA[Введите количе�тво дней, через которое кешируемые подпи�и будет обновл�ть��?<br /> Введите 0 дл� отключени� кешировани� подпи�ей.]]></conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>input</conf_type>
       <conf_key>cc_sigs</conf_key>
       <conf_default>180</conf_default>
@@ -2879,7 +2647,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2888,7 +2655,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Показывать дополнительные пол� профил� при про�мотре тем?</conf_title>
       <conf_description>Е�ли включить данную опцию форум будет и�пользовать «т�желый» запро� к базе данных «LEFT JOIN...», который �делает выборку необходимых данных из �оответ�твующей таблицы.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>custom_profile_topic</conf_key>
       <conf_default>1</conf_default>
@@ -2897,25 +2664,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group>Оптимизаци� ре�ур�ов SQL �ервера</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Кешировать календари и дни рождени�?</conf_title>
-      <conf_description>�е рекомендует��, е�ли ваш форум �Е по�ещает�� ежедневно.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>cache_calendar</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2924,7 +2672,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Период от�ут�тви�, через которое пользователь �читает�� неактивным (в минутах)</conf_title>
       <conf_description/>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>input</conf_type>
       <conf_key>au_cutoff</conf_key>
       <conf_default>15</conf_default>
@@ -2933,25 +2681,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить от�леживание подпи�ки на изменени�?</conf_title>
-      <conf_description>При включенной опции IP.Board будет определ�ть факт подпи�ки на изменени� в темах и форумах, и показывать �оответ�твующую кнопку «Подпи�ать��» или «Отпи�ать��». Это добавл�ет по одному дополнительному запро�у при про�мотре �пи�ка тем и �пи�ка форумов.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>cpu_watch_update</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>11</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2960,7 +2689,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>�емедленно обновл�ть про�мотры темы?</conf_title>
       <conf_description>Е�ли данна� опци� включена, �четчик количе�тва про�мотров темы будет обновл�ть�� каждый раз, когда кто-нибудь про�матривает данную тему. Е�ли она отключена, то про�мотры темы будут запи�ывать�� в другую таблицу и обновл�ть�� каждые 3 ча�а. Это значительно уменьшит загрузку таблицы тем, е�ли ваш форум очень по�ещаемый</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>update_topic_views_immediately</conf_key>
       <conf_default>0</conf_default>
@@ -2969,7 +2698,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2978,7 +2706,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отмечать темы, в которые отвечал пользователь?</conf_title>
       <conf_description/>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>show_user_posted</conf_key>
       <conf_default>1</conf_default>
@@ -2987,7 +2715,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>13</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -2997,7 +2724,7 @@ if ( $show == 1 )
       <conf_title>Удал�ть длительные пои�ковые запро�ы?</conf_title>
       <conf_description><![CDATA[Количе�тво �екунд, по�ле и�течени� которых, пои�ковый запро� будет удален.<br />
 Введите 0 дл� отключени� удалени�.]]></conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>input</conf_type>
       <conf_key>kill_search_after</conf_key>
       <conf_default>30</conf_default>
@@ -3006,7 +2733,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>14</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>resources, search, kill</conf_keywords>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3015,7 +2741,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить «Пользователи, про�матривающие данный форум»?</conf_title>
       <conf_description>Позвол�ет уменьшить количе�тво запро�ов на 1 при каждом про�мотре форума</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>no_au_forum</conf_key>
       <conf_default>0</conf_default>
@@ -3024,7 +2750,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>15</conf_position>
       <conf_start_group>Отключение возможно�тей</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3033,7 +2758,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить «Пользователи, про�матривающие данную тему»?</conf_title>
       <conf_description>Позвол�ет уменьшить количе�тво запро�ов на 1 при каждом про�мотре темы</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>no_au_topic</conf_key>
       <conf_default>0</conf_default>
@@ -3042,25 +2767,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>16</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Отключить краткое изложение темы?</conf_title>
-      <conf_description>Отключить отображение краткого изложени� темы внизу �траницы, на которой пишет�� ответ в тему?</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>disable_summary</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3069,16 +2775,32 @@ if ( $show == 1 )
     <setting>
       <conf_title>Показывать активных пользователей?</conf_title>
       <conf_description/>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>show_active</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
+      <conf_position>17</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>cpusaving</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Отключить краткое изложение темы?</conf_title>
+      <conf_description>Отключить отображение краткого изложени� темы внизу �траницы, на которой пишет�� ответ в тему?</conf_description>
+      <conf_group>16</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>disable_summary</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
       <conf_position>18</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3087,7 +2809,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Разрешить пользовател�м пользовать�� пои�ком?</conf_title>
       <conf_description/>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>allow_search</conf_key>
       <conf_default>1</conf_default>
@@ -3096,34 +2818,15 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>19</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_title>Разрешить показ результатов пои�ка в виде заголовков тем?</conf_title>
-      <conf_description>�а�тройка позвол�ет добавить опцию «Показывать результаты в виде заголовков тем» в ра�ширенную форму пои�ка. Вводит�� дополнительна� группировка.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>enable_show_as_titles</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>20</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>search, fulltext, lock, posts, resources</conf_keywords>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Показывать �тати�тику форума?</conf_title>
       <conf_description>Отображение �тати�тики форума внизу главной �траницы.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>show_totals</conf_key>
       <conf_default>1</conf_default>
@@ -3132,7 +2835,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>21</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3141,7 +2843,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить �тати�тику профилей?</conf_title>
       <conf_description>Стати�тика по�ещений профилей пользовател�ми на большом форуме может �оздавать большую нагрузку.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>disable_profile_stats</conf_key>
       <conf_default>0</conf_default>
@@ -3150,25 +2852,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>22</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Мак�имальное количе�тво �имволов в �лове</conf_title>
-      <conf_description>Ограничивает и�пользование длинных �лов без пробелов, которые могут ра�т�нуть таблицы в ширину, и�кажа� их. Рекомендуемое значение — 80-100 �имволов.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>post_wordwrap</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>23</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3177,7 +2860,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить подфорумы на главной �транице форума</conf_title>
       <conf_description>Отключить отображение подфорумов на главной �транице форума?</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>disable_subforum_show</conf_key>
       <conf_default>0</conf_default>
@@ -3186,25 +2869,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>24</conf_position>
       <conf_start_group>Уменьшение HTML кода</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Показывать упрощенное выпадающее меню бы�трого перехода?</conf_title>
-      <conf_description>Удаление подфорумов разделов из выпадающего меню, полезно, когда таких подфорумов много.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>short_forum_jump</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra>short_forum_jump</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>25</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3213,7 +2877,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Подгружать javascript файлы из �ерверов Google</conf_title>
       <conf_description>Включив �ту функцию, некоторые javascript файлы будут загружать�� из �ерверов Google, что позволит немного �низить нагрузку на ваш �ервер.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>remote_load_js</conf_key>
       <conf_default>0</conf_default>
@@ -3222,35 +2886,15 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>26</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_title>Сжать javascript?</conf_title>
-      <conf_description><![CDATA[Вы можете включить �жатие javascript и CSS дл� уменьшени� HTTP запро�ов к �ерверу.<br />
-Опци� не работает, е�ли включена загрузка javascript из Google.]]></conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>use_minify</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>27</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>minify, reduce, compress, javascript</conf_keywords>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Включить от�леживание прочитанных тем?</conf_title>
       <conf_description/>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>topic_marking_enable</conf_key>
       <conf_default>1</conf_default>
@@ -3259,7 +2903,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>28</conf_position>
       <conf_start_group>От�леживание �тату�а прочитанных тем</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
@@ -3268,7 +2911,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить от�леживание через Cookie</conf_title>
       <conf_description>Даже е�ли вы отключили �и�тему от�леживани� выше, форум будет продолжать от�леживать �тату�ы � и�пользованием cookies. Вы можете полно�тью отключить от�леживание, включив �ту опцию, что позволит не�колько разгрузить �ервер при больших нагрузках.</conf_description>
-      <conf_group>15</conf_group>
+      <conf_group>16</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>topic_marking_noquery</conf_key>
       <conf_default>0</conf_default>
@@ -3277,30 +2920,11 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>29</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>cpusaving</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_title>Ограничение циклов разбора bb-кода</conf_title>
-      <conf_description>�нализатор bb-кодов будет пробегать тек�ты �ообщений указанное количе�тво раз.</conf_description>
-      <conf_group>15</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>max_bbcodes_per_post</conf_key>
-      <conf_default>2000</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>30</conf_position>
-      <conf_start_group>Прочее</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>limit, parse</conf_keywords>
-      <conf_title_keyword>cpusaving</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>boardoffline</conf_title_keyword>
@@ -3314,7 +2938,7 @@ if ( $show == 1 )
       <conf_title>Переве�ти форум в режим offline?</conf_title>
       <conf_description>Форум будет до�тупен только тем, кто имеет права дл� про�мотра форума в режиме offline.&#13;
 (на�траивает�� в правах групп пользователей)</conf_description>
-      <conf_group>16</conf_group>
+      <conf_group>18</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>board_offline</conf_key>
       <conf_default>0</conf_default>
@@ -3323,7 +2947,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>boardoffline</conf_title_keyword>
@@ -3332,7 +2955,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Сообщение</conf_title>
       <conf_description>Данное �ообщение будет выведено тем пользовател�м, которые не могут и�пользовать форум в режиме offline.</conf_description>
-      <conf_group>16</conf_group>
+      <conf_group>18</conf_group>
       <conf_type>editor</conf_type>
       <conf_key>offline_msg</conf_key>
       <conf_default/>
@@ -3341,7 +2964,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>0</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>boardoffline</conf_title_keyword>
@@ -3356,28 +2978,10 @@ if ( $show == 1 )
       <conf_title_app>core</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
-    <setting>
-      <conf_title>Включить от�леживание пои�ковых роботов?</conf_title>
-      <conf_description>Данна� опци� позвол�ет включить механизм определени� пои�ковых роботов �реди пользователей форума. Е�ли опци� отключена, на�тройки ниже не будут иметь �илы.</conf_description>
-      <conf_group>35</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>spider_sense</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>seo</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Журналировать дей�тви� пои�ковых роботов?</conf_title>
       <conf_description>Опци� позвол�ет включить ведение подробного журнала по�ещени� пои�ковым роботом вашего форума. Данную на�тройку имеет �мы�л включать на короткое врем�, только дл� анализа индек�ируемо�ти вашего форума. При большом количе�тве пои�ковых роботов на вашем форуме, из-за �той на�тройки может возникнуть больша� нагрузка на �ервер.</conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>spider_visit</conf_key>
       <conf_default>0</conf_default>
@@ -3386,25 +2990,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>seo</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Считать ботов членами групп?</conf_title>
-      <conf_description>Эта функци� поможет ограничить до�туп бота к определенным ча�т�м форума, вы�тавл�� �оответ�твующие права дл� группы, к которой будут отно�ит�� боты.</conf_description>
-      <conf_group>35</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>spider_group</conf_key>
-      <conf_default>2</conf_default>
-      <conf_extra>#show_groups#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3413,7 +2998,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Показывать ботов в �пи�ке активных пользователей?</conf_title>
       <conf_description/>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>spider_active</conf_key>
       <conf_default>1</conf_default>
@@ -3422,25 +3007,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>seo</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Помечать ботов в �пи�ке активных пользователей, как �крытых?</conf_title>
-      <conf_description>При включении �той опции, имена ботов будут видны только админи�траторам.</conf_description>
-      <conf_group>35</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>spider_anon</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3449,7 +3015,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Перенаправление на новые URL?</conf_title>
       <conf_description>Включение данной опции позвол�ет перенаправить по�етител�, пришедшего по �тарому адре�у, вида showxxxx=x, на новый ЧПУ адре� �траницы.</conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>seo_r_on</conf_key>
       <conf_default>0</conf_default>
@@ -3457,8 +3023,7 @@ if ( $show == 1 )
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>14</conf_position>
-      <conf_start_group>Друже�твенные URL (ЧПУ)</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>�а�тройки ЧПУ</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3469,17 +3034,19 @@ if ( $show == 1 )
       <conf_description><![CDATA[При типе URL «Путь» адре�а будут иметь вид <b>/index.php/forum/2-news/</b><br />
 При типе URL «Запро�» - <b>/index.php?/forum/2-news/</b><br /><br />
 Выбор типа ограничивает�� так же программным обе�печением �ервера. Следует знать, что е�ли и�пользует�� веб �ервер Apache и PHP его модуль, то можно и�пользовать оба типа URL. Е�ли же �ервер на платформе Windows или PHP у�тановлен как CGI, то и�пользовать можно только тип «Запро�»]]></conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>url_type</conf_key>
       <conf_default>query_string</conf_default>
-      <conf_extra>path_info=Путь&#13;
-query_string=Запро�</conf_extra>
-      <conf_evalphp/>
+      <conf_extra><![CDATA[path_info=Путь&#13;
+query_string=Запро�]]></conf_extra>
+      <conf_evalphp><![CDATA[if ( $show == 1 AND ! $this->settings['use_friendly_urls'] )
+{
+	$r['conf_description'] .= "<div style='color:red'>Внимание: ЧПУ не автивировано. Вам необходимо изменить 'conf_global.php' и добавить в конец файла �троку: <kbd>&#092;$INFO&#092;['use_friendly_urls'&#092;]            = '1';</kdb></div>";
+}]]></conf_evalphp>
       <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
+      <conf_position>16</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3489,7 +3056,7 @@ query_string=Запро�</conf_extra>
       <conf_title>И�пользовать .htaccess mod_rewrite?</conf_title>
       <conf_description><![CDATA[При включении �той опции необходимо будет �оздать файл .htaccess в корневой директории форума �о �ледующим �одержимым.<br />
 <!-- MOD_REWITE_EXAMPLE -->]]></conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>htaccess_mod_rewrite</conf_key>
       <conf_default>0</conf_default>
@@ -3499,41 +3066,17 @@ query_string=Запро�</conf_extra>
 	$r['conf_description'] = str_replace( '<!-- MOD_REWITE_EXAMPLE -->', nl2br( $this->registry->adminFunctions->fetchModRewrite() ), $r['conf_description'] );
 }]]></conf_evalphp>
       <conf_protected>1</conf_protected>
-      <conf_position>16</conf_position>
+      <conf_position>17</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_title>Тип обработки неверных URL?</conf_title>
-      <conf_description><![CDATA[Опци� позвол�ет включить более же�ткую проверку адре�ов форума.
-<br />
-�апример, при отключенной опции, адре�а:<br />
-/forum/2-my-forum (и)<br />/forum/2-random-text<br />ведут на одну и ту же �траницу.<br />При включении �той опции, втора� ��ылка будет ве�ти на не�уще�твующую �траницу, и будет запущен выбранный механизм обработки неверного URL. �а�тройка имеет SEO значение.]]></conf_description>
-      <conf_group>35</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>seo_bad_url</conf_key>
-      <conf_default>nothing</conf_default>
-      <conf_extra><![CDATA[nothing=�е обрабатывать
-meta=Добавить мета-теги дл� пои�ковика: 'noindex, nofollow'
-redirect=Перенаправить на правильный URL («301»)]]></conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords>301, redirect, friendly urls</conf_keywords>
-      <conf_title_keyword>seo</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Title</conf_title>
       <conf_description>Укажите тек�т, который будет и�пользовать�� в мета-теге title. Е�ли о�тавить поле пу�тым, будет и�пользовать�� название форума.</conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>input</conf_type>
       <conf_key>seo_index_title</conf_key>
       <conf_default/>
@@ -3541,8 +3084,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>19</conf_position>
-      <conf_start_group>SEO дл� главной �траницы</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Главна� �траница</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>seo,title</conf_keywords>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3551,7 +3093,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Description</conf_title>
       <conf_description>Укажите тек�т, который будет и�пользовать�� в мета-теге description</conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>textarea</conf_type>
       <conf_key>seo_index_md</conf_key>
       <conf_default/>
@@ -3560,7 +3102,6 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>20</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
@@ -3569,7 +3110,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Keywords</conf_title>
       <conf_description>Укажите тек�т, который будет и�пользовать�� в мета-теге keywords</conf_description>
-      <conf_group>35</conf_group>
+      <conf_group>19</conf_group>
       <conf_type>textarea</conf_type>
       <conf_key>seo_index_mk</conf_key>
       <conf_default/>
@@ -3578,12 +3119,120 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>20</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>seo</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
+    <setting>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_title_title>Правила форума</conf_title_title>
+      <conf_title_desc>Данный раздел позвол�ет �оздать и поддерживать общие правила форума.</conf_title_desc>
+      <conf_title_tab>System</conf_title_tab>
+      <conf_title_app>core</conf_title_app>
+      <conf_title_noshow>0</conf_title_noshow>
+    </setting>
+    <setting>
+      <conf_title>Показать ��ылку на правила в подвале форума</conf_title>
+      <conf_description/>
+      <conf_group>17</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>gl_show</conf_key>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>�азвание</conf_title>
+      <conf_description/>
+      <conf_group>17</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>gl_title</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>2</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>С�ылка на �траницу правил</conf_title>
+      <conf_description>Введите URL �траницы, где ра�положены ваши правила или о�тавьте �то поле пу�тым.</conf_description>
+      <conf_group>17</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>gl_link</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>3</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Е�ли не и�пользуете ��ылку на правила; введите тек�т правил зде�ь</conf_title>
+      <conf_description>Разрешен HTML</conf_description>
+      <conf_group>17</conf_group>
+      <conf_type>editor</conf_type>
+      <conf_key>gl_guidelines</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>0</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Правила и у�лови� реги�трации</conf_title>
+      <conf_description><![CDATA[Данные правила будут показаны пользователю в проце��е реги�трации новой учетной запи�и на форуме.
+<b>HTML разрешен</b>]]></conf_description>
+      <conf_group>17</conf_group>
+      <conf_type>editor</conf_type>
+      <conf_key>reg_rules</conf_key>
+      <conf_default><![CDATA[<b>Правила и положени� форума</b>
+
+Пожалуй�та, уделите немного внимани� и прочтите краткие правила, указанные ниже. Е�ли вы принимаете их и желаете продолжить проце�� реги�трации, отметьте �вое �огла�ие и нажмите кнопку «Реги�траци�». Дл� отмены реги�трации нажмите кнопку «�азад» в вашем браузере.
+
+Пожалуй�та, помните, что мы не отвечаем на в�е публикуемые �ообщени�.
+
+�а форуме от�ут�твует предварительна� проверка открываемых тем и публикаций. Как только вы отправл�ете �ообщение — оно �разу публикует�� на форуме. �дмини�траци� форума �нимает � �еб� ответ�твенно�ть за �одержание �ообщений, публикуемых пользовател�ми. Ответ�твенно�ть за �одержание �ообщени� не�ёт только его автор.
+
+�а форуме запрещено:
+отправка �ообщений не по �одержанию форума/темы, о�корблени� и угрозы в адре� пользователей форума, пропаганда ра�овой, национальной и религиозной вражды; реклама и �амореклама;
+ненормативна� лек�ика, �ек�уальные домогатель�тва и т.д.
+
+�арушители правил будут �трого наказаны модераторами или админи�траторами форума и им будет закрыт до�туп на форум.
+
+Принима� данные правила, вы �оглашаете�ь не публиковать любой материал, защищенный автор�ким правом, е�ли автор�кое право не принадлежит вам.]]></conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group>Правила и у�лови� реги�трации</conf_start_group>
+      <conf_add_cache>0</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>boardguidelines</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>ipbcopyright</conf_title_keyword>
@@ -3596,16 +3245,21 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Ключ дл� удалени� копирайта</conf_title>
       <conf_description>Данный ключ вы должны получить у IPS.</conf_description>
-      <conf_group>17</conf_group>
+      <conf_group>20</conf_group>
       <conf_type>input</conf_type>
       <conf_key>ipb_copy_number</conf_key>
       <conf_default/>
       <conf_extra/>
-      <conf_evalphp/>
+      <conf_evalphp><![CDATA[if( $save == 1 )
+{
+  if( !preg_match( "#^[0-9]+?-[0-9]+?-[0-9]+?-[0-9]+?#", $_POST[ $key ] ) )
+  {
+   $_POST[ $key ] = "";
+  }
+}]]></conf_evalphp>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>ipbcopyright</conf_title_keyword>
@@ -3614,7 +3268,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>�е показывать копирайт?</conf_title>
       <conf_description/>
-      <conf_group>17</conf_group>
+      <conf_group>20</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ips_cp_purchase</conf_key>
       <conf_default>0</conf_default>
@@ -3623,80 +3277,11 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>ipbcopyright</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>ipbreg</conf_title_keyword>
-      <conf_title_title>Управление лицензией IP.Board</conf_title_title>
-      <conf_title_desc/>
-      <conf_title_tab>IPS Apps</conf_title_tab>
-      <conf_title_app>core</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Реги�трационный ключ</conf_title>
-      <conf_description><![CDATA[Это реги�трационный ключ IP.Board, а не ваш код клиента или пароль  дл� входа в клиент-центр. 
-
-Ключ вы получаете вме�те � пи�ьмом об активации вашей покупки IP.Board.
-
-<br />�Е УД�ЛЯЙТЕ ИЛИ РЕД�КТИРУЙТЕ Д���ЫЙ КЛЮЧ, ЕСЛИ ВЫ �Е УВЕРЕ�Ы В СВОИХ ДЕЙСТВИЯХ!]]></conf_description>
-      <conf_group>18</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>ipb_reg_number</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbreg</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Отображать информацию о том, на кого зареги�трирована лицензи�?</conf_title>
-      <conf_description><![CDATA[Е�ли �тот пункт включен, то в нижней ча�ти форума будет отображать�� �трочка:<br />
-Лицензи� зареги�трирована на: &laquo;…»]]></conf_description>
-      <conf_group>18</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>ipb_reg_show</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbreg</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[&quot;�азвание&quot; владельца лицензии]]></conf_title>
-      <conf_description><![CDATA[Это им� будет выведено в&nbsp;�троке &laquo;Лицензи� зареги�трирована на:&raquo; <br />�апример: <em>Иван&nbsp;Иванов</em>,&nbsp;<em>IBResource</em>]]></conf_description>
-      <conf_group>18</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>ipb_reg_name</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbreg</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>coppa</conf_title_keyword>
@@ -3704,12 +3289,12 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_title_desc><![CDATA[Данна� опци� позвол�ет активировать <a href='http://www.ftc.gov/ogc/coppa1.htm' target='_blank'>COPPA</a>.]]></conf_title_desc>
       <conf_title_tab>Members</conf_title_tab>
       <conf_title_app>core</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
+      <conf_title_noshow>1</conf_title_noshow>
     </setting>
     <setting>
       <conf_title>И�пользовать реги�трационную �и�тему COPPA?</conf_title>
       <conf_description><![CDATA[Включение <a href="http://www.ftc.gov/ogc/coppa1.htm" target="_blank">COPPA</a> на вашем форуме потребует, чтобы в�е дети младше 13 лет имели пи�ьменное разрешение от родителей, отправленное по фак�у или почте.]]></conf_description>
-      <conf_group>19</conf_group>
+      <conf_group>22</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>use_coppa</conf_key>
       <conf_default>0</conf_default>
@@ -3718,7 +3303,6 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>coppa</conf_title_keyword>
@@ -3727,7 +3311,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>�омер фак�а дл� получени� за�влений</conf_title>
       <conf_description/>
-      <conf_group>19</conf_group>
+      <conf_group>22</conf_group>
       <conf_type>input</conf_type>
       <conf_key>coppa_fax</conf_key>
       <conf_default/>
@@ -3736,7 +3320,6 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>coppa</conf_title_keyword>
@@ -3745,7 +3328,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Почтовый адре� дл� получени� за�влений</conf_title>
       <conf_description/>
-      <conf_group>19</conf_group>
+      <conf_group>22</conf_group>
       <conf_type>textarea</conf_type>
       <conf_key>coppa_address</conf_key>
       <conf_default/>
@@ -3754,7 +3337,6 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>coppa</conf_title_keyword>
@@ -3763,7 +3345,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Дополнительна� COPPA информаци�</conf_title>
       <conf_description>Этот тек�т будет отображен в форме заполнени� за�влени� родитель�кого разрешени� на по�ещение форума.</conf_description>
-      <conf_group>19</conf_group>
+      <conf_group>22</conf_group>
       <conf_type>editor</conf_type>
       <conf_key>coppa_consent_extra</conf_key>
       <conf_default/>
@@ -3772,7 +3354,6 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>coppa</conf_title_keyword>
@@ -3790,27 +3371,28 @@ redirect=Перенаправить на правильный URL («301»)]]></
     <setting>
       <conf_title>Ча�овой по�� �ервера</conf_title>
       <conf_description><![CDATA[<span style='color:red'>Е�ли вы выбрали правильный ча�овой по��, а показани� ча�ов отличают�� на ча�, то �то �в�зано � летним/зимним временем. Пользователи вашего форума могут откорректировать �ту функцию в �а�тройках форума при помощи Панели управлени� пользовател�.</span>]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>time_offset</conf_key>
-      <conf_default>3</conf_default>
+      <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp><![CDATA[if ( $show == 1 )
 {
-		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_usercp' ), 'core' );
-		
-		foreach( ipsRegistry::getClass('class_localization')->words as $off => $words )
- 		{
- 			if (preg_match("/^time_(-?[\\d\\.]+)$/", $off, $match))
- 			{
- 				$dropdown[] = array( $match[1], $words );
- 			}
- 		}
+	ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_usercp' ), 'core' );
+	
+	foreach( ipsRegistry::getClass('class_localization')->words as $off => $words )
+	{
+		if (preg_match("/^time_(-?[&#092;d&#092;.]+)$/", $off, $match))
+		{
+			$dropdown[ $match[1] ] = array( $match[1], $words );
+		}
+	}
+	
+	ksort($dropdown);
 }]]></conf_evalphp>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>Корректировка времени</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3820,7 +3402,7 @@ redirect=Перенаправить на правильный URL («301»)]]></
       <conf_title>Корректировка времени �ервера</conf_title>
       <conf_description><![CDATA[Позвол�ет более точно на�троить врем� на �ервере. Значение указывает�� в минутах, �о знаком + или -, �оответ�твенно дл� добавлени� или вычитани� определенного количе�тва минут.
 <br>Текущее врем� в �и�теме (� и�пользованием в�ех на�троек):<br /><-T->]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>time_adjust</conf_key>
       <conf_default>0</conf_default>
@@ -3833,7 +3415,6 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3842,19 +3423,18 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>И�пользовать отно�ительные даты?</conf_title>
       <conf_description/>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>time_use_relative</conf_key>
       <conf_default>1</conf_default>
-      <conf_extra>0=�ет&#13;
+      <conf_extra><![CDATA[0=�ет&#13;
 1=Да ( �егодн� и вчера )&#13;
 2=Да ( по�ледние X минут, �егодн� и вчера)&#13;
-3=Да ( в�е �разу )</conf_extra>
+3=Да ( в�е �разу )]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group>Отно�ительные даты</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3863,16 +3443,15 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>Формат отно�ительных дат</conf_title>
       <conf_description>{--} замен�ет�� на «�егодн�» или «вчера»</conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>time_use_relative_format</conf_key>
-      <conf_default>{--}, %H:%M</conf_default>
+      <conf_default>{--}, %I:%M %p</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3881,7 +3460,7 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>�втоматиче�кий перевод ча�ов</conf_title>
       <conf_description>Включение данной опции позвол�ет автоматиче�ки производить переход пользователей � летнее/зимнее врем�.</conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>time_dst_auto_correction</conf_key>
       <conf_default>1</conf_default>
@@ -3890,7 +3469,6 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group>Переход на зимнее/летнее врем�</conf_start_group>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3899,7 +3477,7 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>Полный формат</conf_title>
       <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>clock_long</conf_key>
       <conf_default>%d %B %Y - %H:%M</conf_default>
@@ -3908,7 +3486,6 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group>Формат дат</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3917,7 +3494,7 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>Сокращенный формат</conf_title>
       <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>clock_short</conf_key>
       <conf_default>%d %b %Y %H:%M</conf_default>
@@ -3926,7 +3503,6 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3935,7 +3511,7 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>�льтернативный �окращенный формат</conf_title>
       <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>clock_short2</conf_key>
       <conf_default>%d %B %Y</conf_default>
@@ -3944,43 +3520,6 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>date</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Краткий формат</conf_title>
-      <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>clock_tiny</conf_key>
-      <conf_default>%d %b %Y - %H:%M</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>date</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Формат даты</conf_title>
-      <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>clock_date</conf_key>
-      <conf_default>%d %b %Y</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>10</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
@@ -3989,16 +3528,49 @@ $r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] )
     <setting>
       <conf_title>Формат даты реги�трации</conf_title>
       <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
-      <conf_group>20</conf_group>
+      <conf_group>23</conf_group>
       <conf_type>input</conf_type>
       <conf_key>clock_joined</conf_key>
-      <conf_default>%d %B %y</conf_default>
+      <conf_default>%d-%B %y</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>9</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>date</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Краткий формат</conf_title>
+      <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
+      <conf_group>23</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>clock_tiny</conf_key>
+      <conf_default>%d %b %Y - %H:%M</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>10</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>date</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Формат даты</conf_title>
+      <conf_description><![CDATA[�азначение ключей можно по�мотреть в <a href='http://uk.php.net/manual/en/function.strftime.php'>PHP strftime</a>]]></conf_description>
+      <conf_group>23</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>clock_date</conf_key>
+      <conf_default>%d %b %Y</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>date</conf_title_keyword>
diff --git a/upload/admin/applications/core/xml/core_xmlskin_css.xml b/upload/admin/applications/core/xml/core_xmlskin_css.xml
deleted file mode 100644
index 424be605..00000000
--- a/upload/admin/applications/core/xml/core_xmlskin_css.xml
+++ /dev/null
@@ -1,4791 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<css>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>calendar_select</css_group>
-    <css_content>.calendar_date_select {
-  color:white;
-  border:#777 1px solid;
-  display:block;
-  width:195px;
-  z-index: 1000;
-}
-/* this is a fun ie6 hack to get drop downs to stay behind the popup window.  This should always be just underneath .calendar_date_select */
-iframe.ie6_blocker {
-  position: absolute;
-  z-index: 999;
-}
-
-.calendar_date_select thead th {
-  font-weight:bold;
-  background-color: #000;
-  border-top:1px solid #777;
-  border-bottom:2px solid #333;
-  color: white !important;
-}
-
-.calendar_date_select .cds_buttons {
-  text-align:center;
-  padding:5px 0px;
-  background-color: #555;
-}
-
-.calendar_date_select .cds_footer {
-  background-color: black;
-  padding:3px;
-  font-size:12px;
-  text-align:center;
-}
-
-.calendar_date_select table {
-  margin: 0px;
-  padding: 0px;
-}
-
-
-.calendar_date_select .cds_header {
-  background-color: #ccc;
-  border-bottom: 2px solid #aaa;
-  text-align:center;
-}
-
-.calendar_date_select .cds_header span {
-  font-size:15px;
-  color: black;
-  font-weight: bold;
-}
-
-.calendar_date_select select { font-size:11px;}
-
-.calendar_date_select .cds_header a:hover {
-  color: white;
-}
-.calendar_date_select .cds_header a {
-  width:22px;
-  height:20px;
-  text-decoration: none;
-  font-size:14px;
-  color:black !important;
-}
-
-.calendar_date_select .cds_header a.prev {
-  float:left;
-}
-.calendar_date_select .cds_header a.next {
-  float:right;
-}
-.calendar_date_select .cds_header a.close {
-  float:right;
-  display:none;
-}
-
-.calendar_date_select .cds_header select.month {
-  width:90px;
-}
-
-.calendar_date_select .cds_header select.year {
-  width:61px;
-}
-
-.calendar_date_select .cds_buttons a {
-  color: white;
-  font-size: 9px;
-}
-.calendar_date_select td {
-  font-size:12px;
-  width: 24px;
-  height: 21px;
-  text-align:center;
-  vertical-align: middle;
-  background-color: #666666;
-}
-.calendar_date_select td.weekend {
-  background-color: #606060;
-}
-
-.calendar_date_select td div {
-  color: #fff;
-}
-.calendar_date_select td div.other {
-  color: #888;
-}
-.calendar_date_select td.selected div {
-  color:black;
-}
-
-.calendar_date_select tbody td {
-  border-bottom: 1px solid #555;
-}
-.calendar_date_select td.selected {
-  background-color:white;
-}
-
-.calendar_date_select td:hover {
-  background-color:#ccc;
-}
-
-.calendar_date_select td.today {
-  border: 1px dashed #999;
-}
-
-.calendar_date_select td.disabled div {
-  color: #454545;
-}
-
-
-.fieldWithErrors .calendar_date_select {
-  border: 2px solid red;
-}</css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_bbcode</css_group>
-    <css_content>/***************************************************************/
-/* IP.Board 3 CSS                                              */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_bbcode.css - BBCode CSS								   */
-/***************************************************************/
-
-/* 	NOTE: This CSS file styles bbcodes throughout IPB. It is
-	recommended that you DO NOT change these styles if you are
-	creating a skin since it may interfere with user expectation
-	of what certain BBCodes look like. */
-	
-strong.bbc				{	font-weight: bold !important; }
-em.bbc 					{	font-style: italic !important; }
-span.bbc_underline 		{ 	text-decoration: underline !important; }
-div.bbc_center 			{	text-align: center; }
-div.bbc_left 			{	text-align: left; }
-div.bbc_right 			{	text-align: right; }
-div.bbc_indent 			{	margin-left: 50px; }
-del.bbc 				{	text-decoration: line-through !important; }
-ul.bbc 					{	list-style: disc outside; margin-left: 30px; }
-	ul.bbc ul.bbc 			{	list-style-type: circle; }
-		ul.bbc ul.bbc ul.bbc 	{	list-style-type: square; }
-ol.bbc 					{ list-style: decimal outside; margin-left: 30px; }
-	ol.bbc ol.bbc 			{	list-style-type: lower-roman; }
-hr.bbc 					{ 	display: block; border-top: 2px solid #777; }
-div.bbc_spoiler 		{	 }
-div.bbc_spoiler span	{ 	font-weight: bold; }
-div.bbc_spoiler_wrapper	{ 	border: 1px inset #777; padding: 4px; }
-div.bbc_spoiler_content	{ 	 }
-input.bbc_spoiler_show	{ 	width: 45px; font-size: .7em; margin: 0px; padding: 0px; }</css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_editor</css_group>
-    <css_content><![CDATA[/***************************************************************/
-/* IP.Board 3 Editor CSS                                       */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_editor.css - Styles for the editor (colors in main css) */
-/***************************************************************/
-
-#ipboard_body .input_rte {
-	width: 100%;
-	height: 250px;
-}
-
-	#ipboard_body .ips_editor.lite_edition .input_rte {
-		height: 60px;
-	}
-
-#ipboard_body .ips_editor {
-	background-color: #d5dde5;
-	border: 1px solid #d5dde5;
-	margin: 8px;
-	padding: 6px;
-	position: relative;
-	line-height: 100% !important;
-}
-
-	#ipboard_body .ips_editor.with_sidebar .controls,
-	#ipboard_body .ips_editor.with_sidebar .editor {
-		margin-right: 200px;
-	}
-	
-	#ipboard_body .ips_editor .controls {
-		position: relative;
-	}
-	
-	/* Sidebar go bye-bye-bye (like Keith) */
-	#ipboard_body .ips_editor.with_sidebar .sidebar {
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		width: 194px;
-		bottom: 1px;
-		margin: 6px 6px 6px 0;
-		border-width: 1px;
-		border-style: solid;
-		border-color: #f6f8fa #d5dde5 #d5dde5 #f6f8fa;
-	}
-		
-		#ipboard_body .ips_editor.with_sidebar .sidebar h4 {
-			background-color: #e4ebf2;
-			height: 25px;
-			color: #1d3652;
-			font-size: 10px;
-			font-weight: bold;
-		}
-		
-			#ipboard_body .ips_editor.with_sidebar .sidebar h4 span {
-				padding: 6px 0 0 6px;
-				display: block;
-			}
-		
-		#ipboard_body .ips_editor.with_sidebar .sidebar #emoticon_holder {
-			position: absolute;
-			top: 25px;
-			bottom: 1px;
-			width: 193px;
-			overflow: auto;
-		}
-		
-
-	#ipboard_body .ips_editor .toolbar {
-		height: 30px;
-		/*clear: both;*/
-		background: #e4ebf2 url({style_images_url}/gradient_bg.png) repeat-x left 50%;
-		border-width: 1px;
-		border-style: solid;
-		border-color: #f6f8fa #d5dde5 #d5dde5 #f6f8fa;
-	}
-		
-		#ipboard_body .ips_editor .toolbar li {
-			float: left;
-			padding: 3px;
-		}
-		
-			#ipboard_body .ips_editor .toolbar li.sep {
-				padding-right: 4px;
-				border-right: 1px solid #d5dde5;
-				margin-right: 4px;
-			}
-			
-			#ipboard_body .ips_editor .toolbar li.left {
-				float: left;
-			}
-			
-			#ipboard_body .ips_editor .toolbar li.right {
-				float: right;
-			}
-		
-		#ipboard_body .ips_editor .toolbar li span {
-			display: block;
-			padding: 3px;
-		}
-		
-	#ipboard_body .ips_editor ul.ipbmenu_content,
-	#ipboard_body .ips_editor ul.ipbmenu_content li {
-		display: block;
-		float: none;
-		background-color: #fff;
-	}
-		
-#ipboard_body .ips_editor .toolbar li .rte_menu.rte_control {
-	font-size: 11px;
-	height: 14px;
-	border: 1px solid #aeb9c5;
-	margin-top: 1px;
-	padding: 4px 15px 2px 7px;
-	background-color: #fff;
-	background-image: url({style_images_url}/rte_icons/rte_arrow.png);
-	background-repeat: no-repeat;
-	background-position: right center;
-}
-
-#ipboard_body .rte_title {
-	background-color: #d5dde5;
-	padding: 4px;
-	margin: -4px -4px 5px -4px;
-	color: #1d3652;
-	font-size: 10px;
-	font-weight: bold;
-}
-
-#ipboard_body .rte_fontsize {
-	min-width: 50px;
-}
-
-#ipboard_body .rte_font {
-	min-width: 85px;
-}
-
-#ipboard_body .rte_special {
-	min-width: 90px;
-}
-
-#ipboard_body .ipb_palette {
-	padding: 4px;
-	background-color: #eef3f8;
-	border-width: 1px 2px 2px 1px;
-	border-style: solid;
-	border-color: #d5dde5;
-	font-size: 11px;
-
-}
-
-	#ipboard_body .ipb_palette label {
-		display: block;
-		font-weight: bold;
-		clear: both;
-		width: auto !important;
-		float: none !important;
-		text-align: left !important;
-	}
-	
-	#ipboard_body .ipb_palette input {
-		clear: both;
-		width: 96%;
-		margin-bottom: 5px;
-		font-size: 11px;
-		margin-right: 6px;
-	}
-	
-	#ipboard_body .ipb_palette input[type="submit"] {
-		background-color: #d5dde5;
-		border: 1px solid #d5dde5;
-		margin: 5px auto 5px auto;
-		text-align: center;
-		padding: 2px;
-		color: #1d3652;
-		font-size: 11px;
-		display: block;
-		width: auto !important;
-	}
-	
-	#ipboard_body .ipb_palette.extended {
-		min-width: 250px;
-		max-width: 320px;
-	}
-	
-	#ipboard_body .ipb_palette pre {
-		padding: 5px 7px 10px 7px;
-	}
-
-#ipboard_body ul.fontsizes li {
-	padding: 0.3em 0px !important;
-}
-
-#ipboard_body .ipb_palette table.rte_colors {
-	border-collapse: separate;
-	background-color: #fff;
-	border-spacing: 1px;
-}
-
-#ipboard_body table.rte_colors td {
-	padding: 6px;
-	border: 1px solid #777;
-	margin: 1px;
-	font-size: 1px;
-	cursor: pointer;
-	height: 18px;
-}
-
-#ipboard_body .rte_control {
-	cursor: pointer;
-	border: 1px solid #e4ebf2;
-}		
-
-#ipboard_body .rte_hover {
-	background-color: #d5dde5;
-}
-
-#ipboard_body .rte_selected {
-	background-color: #d5dde5;
-	border: 1px solid #aeb9c5;
-}]]></css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_ie</css_group>
-    <css_content>#search {
-	position: absolute !important;
-	right: 0px !important;
-	float: none !important;
-	display: block !important;
-	width: 330px;
-}
-
-	#search label,
-	#search input {
-		float: left !important;
-	}
-	
-	#search .submit_input {
-		font-size: 1em;
-	}
-	
-	#search label {
-		margin: 4px 6px;
-	}
-
-#ipboard_body .input_submit {
-	padding: 2px 5px;
-	font-size: 90%;
-}
-
-#ipboard_body .tab_bar li.active {
-	margin-top: -5px;
-}
-
-#ipboard_body .popupWrapper {
-	padding-top: 6px;
-}
-
-#ipboard_body .ipb_palette {
-	min-width: 130px;
-	max-width: 255px;
-}
-
-#ipboard_body #conversation .post_block {
-	position: static !important;
-	clear: both !important;
-}
-
-#ipboard_body #conversation ul.post_controls {
-	padding-bottom: 0;
-	height: 32px;
-}
-
-/*#ipboard_body .user_controls li img {
-	margin: 4px 0;
-}
-
-#ipboard_body .user_controls li {
-	margin: 0 4px 0 0;
-	text-align: center;
-}*/</css_content>
-    <css_position>0</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes/>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_print</css_group>
-    <css_content><![CDATA[* {
-	font-family: Georgia, "Times New Roman", serif;
-}
-
-html #content {
-	font-size: 10pt;
-}
-
-#admin_bar,
-#header,
-#footer_utilities,
-#utility_links,
-.post_mod,
-.author_info,
-.rep_bar,
-.post_controls,
-.top,
-#content_jump,
-.topic_buttons,
-.topic_options,
-h1,
-.post_id,
-h3 img,
-.ip,
-hr,
-.moderation_bar,
-.topic_jump,
-.topic_share,
-#fast_reply,
-#reputation_filter,
-.statistics {
-	display: none;
-}
-
-#breadcrumb {
-	display: block !important;
-}
-	#breadcrumb li {
-		float: left;
-	}
-
-.post_block {
-	margin-bottom: 25pt;
-	border-top: 2pt solid gray;
-	line-height: 60%; 
-	padding-top: 10px;
-}
-
-.posted_info {
-	color: gray !important;
-	font-size: 8pt !important;
-	text-decoration: none !important;
-	border-bottom: 1pt solid lightgray;
-	padding-bottom: 3px;
-}
-
-.post_block h3 {
-	display: inline !important;
-	margin: 0px !important;
-	padding: 0px !important;
-}
-
-.post_block h3 a {
-	color: black !important;
-	text-decoration: none !important;
-	font-style: normal !important;
-}
-
-	.post_block .post_body a:after {
-	    content: " (" attr(href) ") ";
-	}
-
-.post_body {
-	margin-left: 10pt;
-	line-height: 100%;
-	margin-top: 15pt;
-}
-
-h1, h2, h3 {
-	font-weight: bold;
-}
-
-#copyright {
-	text-align: center;
-	color: gray;
-	font-size: 9pt;
-}]]></css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[media="print"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_reset</css_group>
-    <css_content><![CDATA[/***************************************************************/
-/* IP.Board 3 CSS                                              */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_reset.css (YUI reset)								   */
-/***************************************************************/
-
-/*-----------------------------------------------*/
-/* This file resets default browser styles.   */
-/* You shouldn't need to edit this section.      */
-/*-----------------------------------------------*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
-table {	border-collapse:collapse; border-spacing:0; }
-fieldset,img { border:0; }
-address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; }
-ol,ul { list-style:none; }
-caption,th { text-align:left; }
-h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
-q:before,q:after { content:''; }
-abbr,acronym { border:0; }
-hr { display: none; }
-address{ display: inline; }]]></css_content>
-    <css_position>0</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>ipb_styles</css_group>
-    <css_content><![CDATA[/***************************************************************/
-/* IP.Board 3 CSS                                              */
-/* ___________________________________________________________ */
-/* By Rikki Tissier                                            */
-/* (c)2008 Invision Power Services                             */
-/***************************************************************/
-/* ipb_styles.css - General structure styles				   */
-/***************************************************************/
-/* NOTE: This CSS is currently *unoptimized*				   */
-/*-----------------------------------------------*/
-/* Basic styles                                  */
-/*-----------------------------------------------*/
-
-html {
-	width: 100%;
-	height: 100%;
-}
-
-body {
-	background: #fff; /*url({style_images_url}/content_bg.png) repeat-x;*/
-	font-family: arial, verdana, tahoma, sans-serif;
-	font-size: 13px;
-	position: relative;
-	color: #1c2837;
-	padding: 0px 0px 0px 0px;
-	width: 100%;
-	height: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	font-weight: bold;
-}
-
-h2 {
-	font-size: 1.6em;
-	font-weight: normal;
-	margin: 0 0 8px 0;
-	clear: both;
-}
-
-h3 {
-	font-size: 1.1em;
-	padding: 5px 8px 3px 8px;
-	color: #1d3652;
-}
-
-	h3 img {
-		margin-top: -2px;
-	}
-	
-	h3 a {
-		text-decoration: none;
-	}
-	
-	h3.bar {
-		/*border-top: 2px solid #8da9c6;*/
-		background: #d5dde5 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	}
-	
-	#ipboard_body #fast_reply h3 {
-		color: #1c2837;
-		font-size: 1.4em;
-		font-weight: normal;
-		padding: 0;
-	}
-
-table {
-	width: 100%;
-}
-
-td {
-	padding: 3px;
-}
-
-img {
-	vertical-align: middle;
-}
-
-strong {
-	font-weight: bold;
-}
-em {
-	font-style: italic;
-}
-
-em strong {
-	font-weight: bold;
-	font-style: italic;
-}
-
-legend {
-	display: none;
-}
-
-a {
-	color: #284b72;
-	/*text-decoration: none;
-	border-bottom: 1px solid #9eb4cd;*/
-}
-
-a:hover {
-	color: #528f6c;
-	text-decoration: underline;
-}
-
-a.cancel {
-	color: #ad2930;
-	font-size: 0.9em;
-	font-weight: bold;
-}
-
-/*-----------------------------------------------*/
-/* Colors/bg images only (rest of the classes    */
-/* defined elsewhere)                            */
-/*-----------------------------------------------*/
-
-.post_block h3,
-.poll h3 {
-	background: #B5C0CF url({style_images_url}/gradient_bg.png) repeat-x 50%;
-}
-
-.row1,
-tr.row1 td {
-	background-color: #fafbfc; /* Very light blue */
-	/*background-color: #f1fff7;*/
-}
-
-	.row1 .altrow,
-	.row1.altrow,
-	tr.row1 td.altrow,
-	.personal_info,
-	#board_statistics,
-	#forum_footer,
-	#topic_footer,
-	.general_box,
-	.ips_editor .sidebar {
-		background-color: #eef3f8; /* Slightly darker than row1 */
-	}
-	
-	/*#index_stats .stats_block,
-	#board_statistics,
-	#forum_footer,
-	#topic_footer,*/
-
-	#index_stats .stats_block,
-	.general_box {
-		border: 1px solid #d5dde5;
-		border-bottom: 4px solid #d5dde5;
-		background-color: #eef3f8;
-	}
-
-.row2,
-tr.row2 td,
-.message {
-	background-color: #f1f4f7; /* Light blue */
-}
-	
-	.row2 .altrow,
-	.row2.altrow,
-	tr.row2 td.altrow {
-		background-color: #e4ebf2; /* Slightly darker than row2 */
-	}
-	
-.row3 {
-	background-color: #f3f8f5;
-}
-
-.row4 {
-	background-color: #e5f0ea;
-}
-	
-.row1.moderated td,
-.row2.moderated td,
-.row1.moderated td.altrow,
-.row2.moderated td.altrow,
-.post_block.moderated,
-.row1 td.moderated,
-.row2 td.moderated{
-	background-color: #f2e4e7;
-}
-
-	.moderated,
-	.moderated a {
-		color: #6f3642;
-	}
-	
-.message {
-	border-width: 1px;
-	border-style: solid;
-	border-color: #b0ce94;
-	background-color: #f1f6ec;
-	background-image: url({style_images_url}/information.png);
-	color: #3e4934;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	line-height: 150%;
-}
-
-	.message.error {
-		background-color: #f3dddd;
-		background-image: url({style_images_url}/exclamation.png);
-		border-color: #deb7b7;
-		color: #281b1b;
-		font-size: 1.1em;
-	}
-	
-	.message.unspecific {
-		background-color: #f3f3f3;
-		border-color: #d4d4d4;
-		color: #515151;
-		clear: both;
-		margin: 0 0 10px 0;
-	}
-	
-	.message.user_status {
-		background: #f9f7e0;
-		border: 1px solid #eadca0;
-		color: #6c6141;
-		padding-left: 15px;
-		font-size: 1em;
-		padding: 5px;
-		margin-bottom: 10px;
-	}
-	
-	.message.user_status.in_profile {
-		font-size: 1.2em;
-		position: relative;
-		padding-left: 15px;
-	}
-	
-		.message.user_status #update_status {
-			background: #243f5c;
-			padding: 3px 8px;
-			margin-left: 10px;
-			font-size: 0.8em;
-			font-weight: bold;
-			-moz-border-radius: 4px;
-			color: #fff;
-		}
-		
-		.message.user_status .cancel {
-			font-size: 0.75em;
-		}
-	
-
-/* BBCODE STYLES */
-
-span.bbc_underline {
-	text-decoration: underline !important;
-}
-
-
-/* ---------------------------------------------- */
-
-/* Hide H1, Jump to content link */
-h1, #content_jump {
-	text-indent: -9999px;
-	height: 0px;
-	width: 0px;
-}
-
-.hide {
-	display: none;
-}
-
-/* Inputs */
-.input_text {
-	border: 1px solid #9f9f9f;
-	background: #fff url({style_images_url}/input_text.png) repeat-x;
-	padding: 2px;
-	font-size: 0.9em;
-	font-family: arial, verdana, tahoma, sans-serif;
-}
-
-	.input_text.error {
-		background-color: #f3dddd;
-	}
-	.input_text.accept {
-		background-color: #f1f6ec;
-	}
-
-.input_text.email {
-	width: 18em;
-}
-
-.input_text.password {
-	width: 18em;
-}
-
-body#ipboard_body fieldset.submit,
-body#ipboard_body p.submit {
-	padding: 15px 6px 15px 6px;
-	text-align: center;
-	background-color: #d5dde5;
-	/*text-align: right;*/
-}
-
-.input_submit,
-.input_faux_button {
-	border-width: 1px;
-	border-style: solid;
-	padding: 4px 7px;
-	font-weight: bold;
-}
-
-.input_submit {
-	background-color: #1d3652;
-	border-color: #4f7298 #113051 #113051 #4f7298;
-	color: #fff;
-}
-
-	.input_submit.alt {
-		background-color: #eef3f8;
-		border-color: #fafbfc #bfcbd8 #bfcbd8 #fafbfc;
-		color: #1d3652;
-		text-decoration: none;
-	}
-
-.input_faux_button {
-	background-color: #dedede;
-	border-color: #efefef #c3c3c3 #c3c3c3 #efefef;
-	color: #6e6e6e;
-	font-size: 0.9em;
-	text-decoration: none;
-}
-	
-.input_check,
-.input_radio {
-	vertical-align: middle;
-}
-	
-/* Messages/Errors/Generic things */
-.message {
-	background-repeat: no-repeat;
-	background-position: 8px 10px;
-	padding: 10px 10px 10px 30px;
-}
-
-	.message h3 {
-		padding: 0;
-		color: #323232;
-	}
-
-.positive {
-	color: #6f8f52;
-}
-
-.negative {
-	color: #c7172b;
-}
-
-.date {
-	color: #a9a9a9;
-	font-size: 0.8em;
-}
-
-.hl {
-	/*background-color: #f6ff00;*/
-	color: #6f8f52;
-	font-weight: bold;
-	background: #e3edd9;
-	color: #6f8f52;
-}
-
-.modal {
-	background-color: #3e3e3e;
-}
-
-.no_messages,
-.ipb_table .no_messages {
-	padding: 25px 30px;
-	color: #1c2837;
-	background-color: #f6f8fa;
-}
-
-.rules {
-	line-height: 150%;
-}
-
-.resized_img {
-}
-	
-	.resized_img img {
-		border-style: solid;
-		border-color: #777;
-		border-width: 3px 3px 6px 3px;
-		margin-bottom: 5px;
-	}
-	
-	.resized_img span {
-		background: #777;
-		color: #fff;
-		padding: 4px 8px;
-		font-size: 0.8em;
-	}
-	
-img.resized {
-	display: block;
-}
-
-/* Redirect screen */
-#ipboard_body.redirector {
-	width: 500px;
-	margin: 150px auto 0 auto;
-}
-
-/* Misc */
-
-#ajax_loading {
-	background-color: #6f8f52;
-	padding: 5px;
-	width: 8%;
-	position: fixed;
-	top: 0px;
-	left: 46%;
-	text-align: center;
-	color: #fff;
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	z-index: 10000;
-}
-
-.stem {
-	width: 31px;
-	height: 16px;
-	position: absolute;
-}
-
-	.stem.topleft {
-		background-image: url({style_images_url}/stems/topleft.png);
-	}
-	.stem.topright {
-		background-image: url({style_images_url}/stems/topright.png);
-	}
-	.stem.bottomleft {
-		background-image: url({style_images_url}/stems/bottomleft.png);
-	}
-	.stem.bottomright {
-		background-image: url({style_images_url}/stems/bottomright.png);
-	}
-	
-	
-.popupWrapper {
-	background: url({style_images_url}/trans_bg.png);
-	/*background: #192b40;*/
-	/*width: 500px;*/
-	color: #fff;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-
-.popupInner {
-	background: #fff;
-	color: #000;
-	border: 3px solid #d5dde5;
-	/*height: 200px;*/
-	width: 500px;
-	margin: 6px;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	overflow: auto;
-}
-
-	.popupInner h3 {
-		font-size: 1em;
-		border: 0;
-		background-color: #dae4ed;
-		padding-left: 24px;
-	}
-
-.popupClose {
-	position: absolute;
-	left: 12px;
-	top: 12px;
-	cursor: pointer;
-}
-	
-.popup_footer {
-	position: absolute;
-	bottom: 0px;
-	right: 0px;
-	padding: 15px;
-}
-
-.popup_body {
-	padding: 10px;
-}
-
-.ipbmenu_content,
-.ipb_autocomplete {
-	background-color: #eef3f8;
-	border: 1px solid #d5dde5;
-	min-width: 85px;
-	padding: 5px;
-	font-size: 0.9em;
-	z-index: 2000;
-}
-	
-	.ipbmenu_content li,
-	.ipb_autocomplete li {
-		border-bottom: 1px solid #d5dde5;
-		padding: 5px;
-	}
-	
-		.ipb_autocomplete li.active {
-			background: #d5dde5;
-		}
-	
-	.ipbmenu_content li:last-child {
-		border-bottom: 0;
-		padding-bottom: 0px;
-	}
-	
-	.ipbmenu_content li:first-child {
-		padding-top: 0px;
-	}
-	
-	.ipbmenu_content a {
-		text-decoration: none;
-	}
-	
-/*#ipb_alert {
-	position: absolute;
-	width: 400px;
-	height: 150px;
-	background-color: #f4f5e9;
-	top: 100px;
-	padding: 10px;
-}*/
-
-.photo {
-	border: 1px solid #d8d8d8;
-}
-
-li.rating a {
-	outline: 0;
-}
-
-.clear {
-	clear: both;
-}
-
-.bullets ul,
-.bullets ol,
-ul.bullets,
-ol.bullets {
-	list-style: disc;
-	margin-left: 30px;
-	line-height: 150%;
-	list-style-image: none;
-}
-
-/*-----------------------------------------------*/
-/* Branding/Header styles                        */
-/*-----------------------------------------------*/
-
-#header {
-	position: relative;
-}
-
-#branding {
-	background: #1d3652 url({style_images_url}/branding_bg.png) repeat-x top;
-	height: 100px;
-}
-
-/* Admin bar */
-#admin_bar {
-	background: #2e2e2e url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	color: #d2d2d2;
-	padding: 7px;
-	font-size: 0.8em;
-	height: 14px;
-}
-
-	#admin_bar ul,
-	#admin_bar li {
-		display: inline;
-	}
-	
-		#admin_bar li {
-			padding: 0 3px 0 5px;
-			color: #767676;
-		}
-		
-		#admin_bar li.active,
-		#admin_bar li.active a {
-			color: #e74242;
-		}
-	
-	#admin_bar p {
-		float: right;
-	}
-	
-	#admin_bar a {
-		color: #fff;
-		text-decoration: none;
-	}
-
-/*-----------------------------------------------*/
-/* Footer			                             */
-/*-----------------------------------------------*/
-
-#board_footer {
-	clear: both;
-	padding: 8px 8px 15px 8px;
-	margin: 10px 15px 20px;
-	border-top: 1px solid #dedede;
-	font-size: 0.85em;
-	color: #606060;
-	top: 20px;
-}
-
-	#board_footer #utility_links {
-		float: left;
-	}
-		
-		#board_footer ul#utility_links li {
-			float: left;
-			padding-right: 8px;
-		}
-		
-	#board_footer p {
-		float: right;
-		text-align: right;
-	}
-	
-	#board_footer a {
-		color: #606060;
-	}
-
-#footer_utilities {
-	background: #192b40 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	overflow: hidden;
-	padding: 4px 15px;
-	color: #fff;
-	font-size: 0.8em;
-	margin: 25px 15px 0 15px;
-	clear: both;
-	min-height: 35px;
-}
-	#footer_utilities a {
-		color: #fff;
-	}
-	
-	#footer_utilities form {
-		float: left;
-		margin: 7px 5px 0 5px;
-	}
-	
-	#footer_utilities ul {
-		float: right;
-		padding: 2px 0;
-		margin: 8px 0 0 0;
-	}
-		#footer_utilities ul li:first-child {
-			color: #d5dde5;
-		}
-		
-		#footer_utilities li {
-			float: right;
-			padding: 0 8px 4px 8px;
-		}
-/*-----------------------------------------------*/
-/* Navigation elements                           */
-/*-----------------------------------------------*/
-
-/* The tab bar */
-#primary_nav {
-	background: #192b40 url({style_images_url}/primarynav_bg.png) no-repeat;
-	height: 31px;
-	border-bottom: 5px solid #528f6c; /*#6f8f52;*/
-	padding-left: 10px;
-	font-size: 0.95em;
-}
-	
-	#primary_nav ul li {
-		float: left;
-		color: #9bb2c8;
-		font-size: 0.95em;
-		padding: 8px 8px;
-		margin-left: 6px;
-	}
-	
-		#primary_nav ul li.active {
-			background: transparent url({style_images_url}/tab_left.png) no-repeat top left;
-			padding: 0;
-			color: #fff;
-			margin-right: 0px;
-			position: relative; /* Shift it up a few px */
-			top: -4px;
-			font-size: 1.05em;
-			font-weight: bold;
-		}
-		
-		#primary_nav ul li.active a {
-			background: transparent url({style_images_url}/tab_right.png) no-repeat top right;
-			display: block;
-			padding: 10px 15px 10px 10px;
-			margin-left: 6px;
-			color: #fff;
-			text-decoration: none;
-		}
-		
-	#primary_nav ul li a {
-		color: #9bb2c8;
-		text-decoration: none;
-	}
-	
-		#primary_nav ul li a:hover {
-			color: #fff;
-		}
-	
-#user_navigation {
-	position: relative;
-	top: -93px;
-	right: 10px;
-	float: right;
-	background: #2b4f74;
-	font-size: 0.9em;
-	margin-bottom: -93px;
-	-moz-border-radius-bottomleft: 6px;
-	-moz-border-radius-bottomright: 6px;
-	-webkit-border-bottom-left-radius: 6px;
-	-webkit-border-bottom-right-radius: 6px;
-	border-width: 0 2px 2px 2px;
-	border-style: solid;
-	border-color: #1c334e;
-	z-index: 9999;
-}
-	
-	#user_navigation .photo {
-		float: left;
-		margin: 6px 10px 6px 6px;
-	}
-	
-	#user_info {
-		margin-left: 60px;
-		margin-right: 15px;
-	}
-	
-	#user_navigation p {
-		color: #d9e3ed;
-		margin-top: 6px;
-		white-space: nowrap;
-	}
-	
-		#user_navigation p a {
-			color: #a1bad3;
-		}
-		
-		#user_navigation #new_msg_count {
-			background-color: #528f6c;
-			padding: 3px 7px;
-			font-weight: bold;
-			font-size: 0.9em;
-			-moz-border-radius: 6px;
-			-webkit-border-radius: 6px;
-			position: absolute;
-			top: 0px;
-			left: 45px;
-			color: #fff;
-			text-decoration: none;
-		}
-	
-	#user_navigation ul {
-		color: #fff;
-		font-size: 0.88em;
-		margin-top: 4px;
-	}
-		#user_navigation ul a {
-			color: #d5dde5;
-		}
-		
-		#user_navigation ul#user_other li {
-			float: left;
-			margin: 0 0;
-			padding: 0 4px;
-		}
-		
-	#user_navigation .photo {
-		border: 1px solid #1d3652;
-	}
-			
-	#user_navigation ul#user_link_menucontent {
-		width: 170px;
-		background: #d5dde5;
-		border: 1px solid #1d3652;
-		float: right;
-		z-index: 10000;
-		color: #fff;
-		margin-top: 0px;
-	}
-	
-		#user_navigation ul#user_link_menucontent li {
-			padding: 1px;
-			float: none;
-		}
-		
-		#user_navigation ul#user_link_menucontent a {
-			display: block;
-			padding: 5px 5px 5px 15px;
-			color: #1d3652;
-			text-decoration: none;
-		}
-		
-			#user_navigation ul#user_link_menucontent a:hover {
-				background: #528f6c;
-				color: #fff;
-			}
-	
-	#user_navigation #user_link {
-		display: block;
-		background: #1d3652 url({style_images_url}/th_bg.png) repeat-x 50%;
-		border: 1px solid #1d3652;
-		padding: 3px 10px;
-		color: #fff;
-		text-decoration: none;
-		min-width: 150px;
-		margin: 6px 0 0px 8px;
-		outline: 0px;
-		position: relative;
-	}
-	
-		#user_navigation #user_link img {
-			position: absolute;
-			right: 5px;
-			top: 8px;
-		}
-	
-	#user_navigation.not_logged_in {
-		font-size: 1em;
-		padding: 15px 25px;
-		color: #fff;
-	}
-		
-		#user_navigation.not_logged_in a {
-			color: #fff;
-			text-decoration: none;
-			margin: 0 10px;
-		}
-		
-/* The search box */
-#search {
-	float: right;
-	margin: 5px 4px auto auto;
-	color: #556b85;
-	font-size: 0.85em;
-	position: relative;
-	right: 0px;
-}
-
-	#search .submit_input {
-		background: #528f6c;
-		color: #fff;
-		border: 1px solid #1a2735;
-		padding: 2px;
-	}
-	
-	#search input#main_search {
-		margin-left: 5px;
-		padding: 3px 3px 3px 18px;
-		background: #fff url({style_images_url}/search_icon.png) no-repeat left;
-		border: 1px solid #1a2735;
-	}
-	
-	#search a {
-		display: block;
-		float: right;
-		color: #556b85;
-		margin: 5px 7px;
-	}
-
-/* The breadcrumb */
-#secondary_nav {
-	clear: both;
-	color: #878787;
-	font-size: 0.9em;
-	padding: 12px 15px 12px 25px;
-}
-
-	#secondary_nav li {
-		float: left;
-		padding-right: 7px;
-	}
-	
-	#secondary_nav #breadcrumb {
-		float: left;
-	}
-	
-	#secondary_nav #section_links {
-		float: right;
-	}
-	
-		#secondary_nav #section_links li {
-			padding: 0 5px;
-		}
-		
-	#secondary_nav a {
-		color: #393939;
-		text-decoration: none;
-	}
-		
-/* PM Notification */
-#pm_notification {
-	/*background: #f3f3f3 url({style_images_url}/gradient_bg.png) repeat-x left 50%;*/
-	background: url({style_images_url}/trans_bg.png);
-	padding: 0;
-	/* border: 4px solid #d4d4d4;
-	border-top: 0;*/
-	position: absolute;
-	width: 60%;
-	margin: 0 20%;
-	/*-moz-border-radius-bottomleft: 10px;
-	-moz-border-radius-bottomright: 10px;*/
-	z-index: 2000;
-	color: #515151;
-}
-	
-	#pm_notification #pm_wrap {
-		margin: 0 6px 6px 6px;
-		padding: 18px 0 30px 0;
-		background: #f3f3f3;
-	}
-	
-	#pm_notification .photo {
-		float: left;
-		margin: 0 15px;
-	}
-	
-	#pm_notification h2 {
-		font-size: 1.5em;
-		clear: none;
-		margin: 0px 0 0 85px;
-		color: #1c2837;
-	}
-	
-	#pm_notification p {
-		margin: 10px auto 0 95px;
-	}
-	
-	#pm_notification .ok_thanks {
-		clear: both;
-		padding: 6px;
-		text-align: center;
-	}
-
-#rss_feed {
-	cursor: pointer;
-}
-
-#rss_menu {
-	width: 200px;
-	background-color: #ffdfbe;
-	border: 1px solid #ff7600;
-	display: block;
-	padding: 1px;
-	z-index: 500;
-}
-	
-	#secondary_nav #section_links #rss_menu li {
-		display: block;
-		float: none;
-		padding: 0;
-	}
-	
-	#rss_menu a {
-		display: block;
-		padding: 3px;
-		color: #ff7600;
-	}
-	
-		#rss_menu a:hover {
-			background-color: #ff7600;
-			color: #fff;
-		}
-		
-/*-----------------------------------------------*/
-/* General content styles                        */
-/*-----------------------------------------------*/
-
-#content {
-	clear: both;
-	/*overflow: hidden;*/
-	padding: 20px 15px 0px 15px;
-}
-
-#index_stats {
-	float: right;
-	width: 22%;
-	/* border-left: 1px solid #dedede; 
-	padding-left: 15px;*/
-	padding-bottom: 25px;
-	margin-bottom: 20px;
-	/*border-left: 1px solid #d2d2d2;
-	padding-left: 15px;*/
-}	
-	
-	#index_stats .general_box {
-		margin-bottom: 10px;
-		overflow: hidden;
-	}
-
-	#index_stats h3,
-	.general_box h3 {
-		background: #d5dde5; /*url({style_images_url}/th_bg_alt.png) repeat-x 50%*/
-		margin: -10px -10px 5px -10px;
-		border: 0;
-		padding: 5px;
-		color: #1d3652;
-		font-size: 1em;
-	}
-	
-	/*#ipboard_body #index_stats h3 {
-		margin: 2px;
-	}*/
-	.general_box {
-		padding: 10px;
-	}
-	
-		.general_box.alt {
-			padding: 0px;
-		}
-		
-			.general_box.alt h3 {
-				margin: 0 0 5px 0;
-			}
-		
-		.general_box a {
-			text-decoration: none;
-		}
-		
-	#index_stats ul,
-	#index_stats ol {
-		padding-top: 5px;
-	}
-	
-	#index_stats ul {
-		font-size: 0.9em;
-		margin: 0;
-	}
-		
-		#index_stats ul li {
-			padding: 6px;
-				margin: 0 -8px;
-		}
-	
-	#index_stats .date {
-		font-size: 0.9em;
-	}
-	
-	#index_stats a {
-		text-decoration: none;
-	}
-	
-#open_sidebar,
-#close_sidebar {
-	width: 25px;
-	height: 20px;
-	background-color: #d5dde5;
-	position: absolute;
-	right: 0;
-	-moz-border-radius-topleft: 4px;
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	text-align: right;
-	padding-right: 3px;
-	outline: 0;
-}
-
-/*-----------------------------------------------*/
-/* Table styling (Forums & topics)               */
-/*-----------------------------------------------*/
-
-.short {
-	text-align: center;
-}
-
-.desc {
-	font-size: 0.8em;
-	color: #606060;
-}
-
-a.toggle {
-	display: block;
-	float: right;
-	width: 25px;
-	height: 100%;
-	padding-bottom: 2px;
-	text-align: center;
-	-moz-border-radius-topleft: 4px;
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-	outline: 0;
-	background: url({style_images_url}/cat_minimize.png) no-repeat;
-	text-indent: -3000em;
-}
-
-div.category_block.board_index {
-	width: 76%;
-}
-	div.category_block.board_index.no_sidebar {
-		width: 99%;
-		float: none;
-	}
-	
-div.category_block,
-div.topic,
-div#member_list,
-div#register_form {
-	/*background: transparent url({style_images_url}/block_bg.png) repeat-x top;*/
-	padding: 5px;
-	margin-bottom: 10px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-
-div.category_block h3 {
-	background: none;
-	border: 0;
-	padding: 0 0 6px 0;
-	font-size: 1.35em;
-	font-weight: normal;
-	margin-bottom: -4px;
-}
-
-	div.category_block h3.collapsed {
-		border-bottom: 8px solid #243f5c;
-	}
-	
-		div.category_block h3.collapsed a.toggle {
-			padding-bottom: 6px;
-			background: url({style_images_url}/cat_maximize.png) no-repeat;
-		}
-		
-	div.category_block em.moderated {
-		font-size: 0.8em;
-		font-weight: bold;
-		display: block;
-		clear: both;
-		margin-top: 8px;
-	}
-
-div.topic {
-	/*clear: both;*/
-}
-
-table.ipb_table {
-	line-height: 120%;
-	border-bottom: 4px solid #d5dde5;
-}
-	
-	table.ipb_table a {
-		text-decoration: none;
-	}
-	
-		table.ipb_table a:hover {
-			text-decoration: underline;
-		}
-	
-	table.ipb_table .row1.moderated,
-	table.ipb_table .row2.moderated {
-		color: #97334d;
-	}
-		
-		table.ipb_table .row1.moderated a,
-		table.ipb_table .row2.moderated a{
-			font-style: italic;
-			color: #97334d;
-		}
-	
-	table.ipb_table h4 {
-		font-size: 1.1em;
-		display: inline;
-		font-weight: normal;
-	}
-
-	table.ipb_table caption {
-		font-size: 1.5em;
-		padding: 0;
-		margin-bottom: 8px;
-	}
-	
-		table.ipb_table caption span.desc {
-			font-size: 0.6em;
-		}
-
-	table.ipb_table .header,
-	div#current_calendar ol#week_view li.month_bar {
-		/* background: #1d3652 url({style_images_url}/th_bg.png) repeat-x top; */
-		background: #1d3652 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-	}
-	
-	table.ipb_table th,
-	div#current_calendar ol#week_view li.month_bar {
-		color: #fff;
-		padding: 8px 6px;
-		font-size: 0.85em;
-		font-weight: bold;
-	}
-	
-		table.ipb_table th a {
-			color: #fff;
-			text-decoration: underline;
-		}
-	
-	table.ipb_table tr td {
-		padding: 10px 8px 8px 8px;
-		/*border-bottom: 1px solid #d8e1ea;*/
-		border-bottom: 2px solid #fff;
-	}
-	
-		table.ipb_table tr td.stats {
-			text-align: right;
-		}
-		
-			table.ipb_table tr td.stats .views {
-				color: #606060;
-				font-size: 0.8em;
-			}
-		
-		table.ipb_table tr td p {
-			font-size: 0.9em;
-			color: #606060;
-		}
-		
-		table.ipb_table h5,
-		table.ipb_table ol li {
-			display: inline;
-			float: left;
-			font-size: 0.85em;
-		}
-		
-		table.ipb_table h5.subforums {
-			display: none;
-		}
-		
-		table.ipb_table h5, 
-		table.ipb_table ol {
-			padding-top: 6px;
-			margin-top: 5px;
-		}
-				
-		table.ipb_table ol li {
-			padding: 0 4px 0 15px;
-			color: #1d3652;
-			background-image: url('{style_images_url}/bullet_black.png');
-			background-repeat: no-repeat;
-			background-position: 3px 3px;
-		}
-		
-		table.ipb_table ul li {
-			font-size: 0.95em;
-		}
-		
-		table.ipb_table .topic_title {
-			font-size: 1.05em;
-		}
-		
-	table.ipb_table tr.announcement td {
-		font-weight: bold;
-		font-size: 1.1em;
-	}
-		
-	table.ipb_table tr.subhead th {
-		background: #B5C0CF;
-		color: #1d3652;
-		font-weight: bold;
-		font-size: 1.1em;
-		padding: 8px;
-	}
-
-span.mini_rate {
-	display: inline-block;
-	margin-right: 12px;
-}
-
-img.mini_rate {
-	margin-right: -5px;
-}
-
-/* Column widths */
-.col_f_icon,
-.col_f_picon,
-.col_c_icon,
-.col_m_status,
-.col_r_icon {
-	width: 3%;
-}
-.col_m_replies
-{
-	width: 5%;
-	text-align:center;
-}
-.col_m_to,
-.col_m_from {
-	width:15%;
-	text-align:center;
-}
-.col_f_topic
-.col_m_subject {
-	width: 49%;
-}
-.col_f_replies,
-.col_f_views,
-.col_f_starter,
-.col_r_total,
-.col_r_comments {
-	width: 10%;
-	text-align: center;
-}
-.col_f_views,
-.col_c_stats {
-	text-align: right;
-}
-.col_f_post,
-.col_m_date,
-.col_r_updated,
-.col_r_section {
-	width: 25%;
-}
-.col_c_stats {
-	width: 15%;
-}
-.col_c_post {
-	width: 30%;
-}
-.col_c_forum {
-	width: 55%;
-}
-.col_mod,
-.col_f_mod,
-.col_r_mod {
-	width: 3%;
-	text-align: center;
-}
-.col_r_title {
-	width: 26%;
-}
-
-ul.topic_moderation {
-	float: right;
-	margin-top: -2px;
-	z-index: 300;
-	background-color: #e4ebf2;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-	
-	ul.topic_moderation li {
-		float: left;
-	}
-	
-	ul.topic_moderation li a {
-		display: block;
-		float: left;
-		padding: 0 3px;
-	}
-
-/*-----------------------------------------------*/
-/* Topic & Post buttons			                 */
-/*-----------------------------------------------*/
-/* Sliding door technique by AListApart		     */
-
-.topic_controls {
-	min-height: 30px;
-}
-
-.topic_buttons li {
-	float: right;
-	margin: 0px 10px 10px 0px;
-	background: transparent url({style_images_url}/topic_button_left.png) no-repeat top left;
-	padding: 0;
-}
-	
-	.topic_buttons li a,
-	.topic_buttons li span {
-		display: block;
-		margin-right: 0px;
-		font-size: 0.9em;
-		text-decoration: none;
-		color: #e9e9e9;
-		outline: 0;
-	}
-	
-	.topic_buttons li span {
-		padding: 7px 12px 8px 10px;
-	}
-	
-	.topic_buttons li a {
-		background: transparent url({style_images_url}/topic_button_right.png) no-repeat top right;
-		padding: 7px 12px 6px 3px;
-		margin-left: 6px;
-	}
-	
-		.topic_buttons li a img,
-		.topic_buttons li span img {
-			margin: -1px 5px 1px 0;
-		}
-	
-	.topic_buttons li.disabled {
-		background: transparent url({style_images_url}/topic_button_left_disabled.png) no-repeat top left;
-	}
-	
-		.topic_buttons li.disabled span {
-			background: transparent url({style_images_url}/topic_button_right_disabled.png) no-repeat top right;
-			color: #8f8e8e;
-		}
-		
-	.topic_buttons li.closed {
-		background: transparent url({style_images_url}/topic_button_left_closed.png) no-repeat top left;
-	}
-		
-		.topic_buttons li.closed span,
-		.topic_buttons li.closed a {
-			background: transparent url({style_images_url}/topic_button_right_closed.png) no-repeat top right;
-		}
-	
-		
-
-ul.post_controls {
-	padding: 6px 10px 28px 6px;
-	clear: both;
-	text-align: right;
-	font-size: 0.8em;
-	background: #e4ebf2 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-}
-				
-		ul.post_controls li {
-			background: transparent url({style_images_url}/post_button_left.png) no-repeat top left;
-			padding: 0;
-			margin: 0 4px;
-			float: right;
-		}
-		
-			ul.post_controls li.report,
-			ul.post_controls.left li {
-				float: left;
-			}
-	
-		ul.post_controls a {
-			text-decoration: none;
-			display: block;
-			background: transparent url({style_images_url}/post_button_right.png) no-repeat top right;
-			padding: 6px 9px 3px 4px;
-			margin-left: 4px;
-			color: #1d3652;
-		}
-		
-		ul.post_controls a img {
-			margin-top: -2px;
-		}
-
-		ul.post_controls a:hover {
-			color: #3d70a3;
-		}
-		
-		/* Selected button */
-		ul.post_controls li.selected {
-			background: transparent url({style_images_url}/post_button_left_selected.png) no-repeat;
-		}
-		
-			ul.post_controls li.selected a {
-				background: transparent url({style_images_url}/post_button_right_selected.png) no-repeat right;
-				color: #fff;
-			}
-			
-body .topic_buttons li a:hover,
-body ul.post_controls a:hover {
-	text-decoration: none;
-}
-
-/*-----------------------------------------------*/
-/* Reputation	    			                 */
-/*-----------------------------------------------*/
-
-.reputation {
-	padding: 3px 8px;
-	display: block;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	font-weight: bold;
-	margin: 6px;
-	float: right;
-}
-
-	.reputation.positive,
-	.members li.positive {
-		background: #6f8f52;
-		color: #fff;
-	}
-	
-	.reputation.negative,
-	.members li.negative {
-		background: #b82929;
-		color: #fff;
-	}
-	
-	.reputation.zero {
-		background: #dedede;
-		color: #6e6e6e;
-	}
-	
-	.members li.positive a,
-	.members li.negative a {
-		color: #fff;
-	} 
-	
-.post_ignore .reputation {
-	float: none;
-	display: inline;
-	padding: 2px 6px;
-	text-align: center;
-}
-	
-#profile_overview .reputation {
-	float: none;
-	text-align: center;
-	font-weight: normal;
-	margin: 6px 0;
-}
-
-	#profile_overview .reputation .number {
-		font-size: 1.1em;
-		font-weight: bold;
-	}
-	
-	#profile_overview .reputation .title,
-	#profile_overview .reputation .image {
-		display: block;
-		font-size: 0.9em;
-	}
-
-/*-----------------------------------------------*/
-/* Pagination	    			                 */
-/*-----------------------------------------------*/
-	
-span.pagination.no_pages {
-	font-size: 0.9em;
-	color: #acacac;
-	padding: 10px;
-	float: left;
-	display: block;
-	height: 15px;
-}
-
-ul.pagination {
-	height: 18px;
-	float: left;
-}
-
-	ul.pagination.top {
-		/*border-bottom: 1px solid #e1e1e1;*/
-		margin-bottom: 15px;
-		padding: 0 0 5px 0;
-	}
-
-	ul.pagination.bottom {
-		margin-top: 15px;
-		/*border-top: 1px solid #e1e1e1;*/
-		padding: 5px 0 0 0;
-	}
-
-ul.pagination a {
-	text-decoration: none;
-}
-
-ul.pagination li {
-	float: left;
-	font-size: 0.9em;
-	padding: 1px 4px;
-	margin: 0 2px 0 2px;
-	border: 1px solid #cfcfcf;
-	background: #fff;
-}
-
-	ul.pagination li.total {
-		background: none;
-		border: 0;
-		margin-left: 0px;
-		cursor: pointer;
-	}
-
-	ul.pagination li.active {
-		font-size: 1em;
-		color: #528f6c;
-		font-weight: bold;
-		border: 0;
-		background-color: transparent;
-	}
-
-ul.topic_jump {
-	margin: 0 auto 15px auto;
-	float: right;
-	border-top: 1px solid #e4e4e4;
-	font-size: 0.8em;
-	padding-top: 4px;
-	clear: both;
-}
-
-ul.topic_jump li {
-	float: left;
-	padding: 1px 7px;
-	font-weight: bold;
-}
-	ul.topic_jump li a {
-		text-decoration: none;
-	}
-
-	ul.topic_jump li.previous a,
-	ul.topic_jump li.next a {
-		font-weight: normal;
-	}
-
-	ul.topic_jump li.previous {
-		border-right: 1px solid #8f8f8f;
-	}
-
-	ul.topic_jump li.next {
-		border-left: 1px solid #8f8f8f;
-	}
-	
-ul.mini_pagination {
-	display: inline;
-	font-size: 0.75em;
-	margin-left: 7px;
-}
-
-	ul.mini_pagination li {
-		display: inline;
-		padding: 1px 3px;
-		border: 1px solid #d3d3d3;
-		margin: 0px 2px;
-	}
-	
-/*-----------------------------------------------*/
-/* Board Stats / Forum Footer	                 */
-/*-----------------------------------------------*/
-
-#stat_links,
-.statistics {
-	clear: both;	
-}
-
-#index_stats .stats_block {
-	margin: 0 0 15px 0;
-	padding: 8px;
-	overflow: hidden;
-}
-
-.statistics {
-	margin: 10px 0px 0 0px;
-	min-height: 160px;
-	padding: 15px;
-	overflow: hidden;
-}
-	
-	body #board_statistics {
-		margin-top: 10px;
-	}
-	
-	body #topic_stats.statistics {
-		min-height: 50px;
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	.statistics h2 span {
-		font-size: 0.8em;
-		font-weight: normal;
-		color: #425365;
-	}
-	
-#stat_links {
-	margin-top: 25px;
-	font-size: 0.9em;
-	text-align: center !important;
-	color: #69727b;
-}
-
-	#stat_links li {
-		display: inline;
-		padding: 2px 6px;
-	}
-	
-.statistics h2 {
-	font-size: 1.1em;
-	font-weight: bold;
-}
-
-#active_users,
-#cal_events,
-#cal_bdays,
-#forum_led_by,
-#forum_active_users {
-	float: left;
-	overflow: hidden;
-	width: 60%;
-	margin-bottom: 10px;
-	border-top: 1px solid #e4ebf2;
-	padding: 10px 0 0 0;
-}
-	#active_users li,
-	#forum_active_users li,
-	#topic_active_users li,
-	#cal_events li,
-	#cal_bdays li,
-	#forum_led_by li {
-		float: left;
-		font-size: 0.9em;
-		padding: 0 5px 0 0;
-		margin-top: 4px;
-	}
-	
-	#active_users ul,
-	#cal_events ul,
-	#cal_bdays ul,
-	#forum_active_users ul,
-	#forum_led_by ul {
-		margin-left: 15px;
-	}
-	
-.statistics #active_users,
-.statistics #forum_active_users {
-	border-top: 0;
-	padding-top: 0;
-}
-
-#stats {
-	float: right;
-	width: 33%;
-	border-left: 1px solid #e4ebf2;
-	padding-left: 20px;
-}
-	#stats dl {
-		margin-left: 10px;
-	}
-	
-	#stats dt,
-	#stats dd {
-		float: left;
-		width: 45%;
-		font-size: 0.85em;
-		padding: 6px 2px;
-		border-top: 1px solid #dedede;
-	}
-	
-	#stats dt {
-		clear: both;
-		font-weight: bold;
-	}
-	
-	#stats .extra {
-		font-size: 0.9em;
-		color: #a2a2a2;
-	}
-	
-#forum_legend {
-	float: right;
-	width: 39%;
-}
-
-	#forum_legend dl {
-		font-size: 0.9em;
-		margin-top: 15px;
-	}
-
-		#forum_legend dt,
-		#forum_legend dd {
-			float: left;
-			height: 20px;
-			font-size: 0.9em;
-			padding: 6px 2px;
-			border-top: 1px solid #dedede;
-		}
-
-		#forum_legend dt {
-			width: 9%;
-			text-align: center;
-		}
-
-		#forum_legend dd {
-			width: 38%;
-			max-width: 200px;
-		}
-
-		#forum_legend dt.clear {
-			clear: both;
-		}
-
-#forum_active_users,
-#topic_active_users {
-	float: left;
-	width: 60%;
-}
-
-	#forum_active_users span.desc,
-	#topic_active_users span.desc {
-		font-weight: normal;
-	}
-
-.message.forum_rules {
-	margin-bottom: 20px;
-}
-
-/*-----------------------------------------------*/
-/* Board Stats / Forum Footer	                 */
-/*-----------------------------------------------*/
-
-h2.main_topic_title {
-	margin: 0 0 -3px 0;
-}
-
-	span.main_topic_desc {
-		font-size: 1em;
-	}
-	
-.post_block {
-	background: #fafbfc url({style_images_url}/post_bg.png) repeat-y;
-	/*clear: both;*/
-	margin: 0 0 4px 0;
-	position: relative;
-	/*border-bottom: 6px solid #fff;*/
-	/*border-bottom: 6px solid #8a9fb5;*/
-}
-	
-	.post_block h3 {
-		padding: 8px;
-	}
-	
-	.post_block address {
-		font-weight: bold;
-	}
-	
-	.post_wrap {
-		top: 0px;
-	}
-	
-	.post_block.topic_summary h3 {
-		padding: 4px;
-	}
-	
-	.post_block.topic_summary .posted_info {
-		margin-left: 10px;
-	}
-	
-	.post_block.topic_summary .post_body .post {
-		padding: 3px 10px;
-		margin-top: -10px;
-	}
-	
-	.post_block.with_rep .post_body {
-		margin-bottom: 25px;
-	}
-	
-	.post_block.announcement .author_info {
-		margin-top: 20px;
-	}
-		
-.post_ignore {
-	padding: 15px;
-	background: #fafbfc;
-	color: #777;
-	font-size: 0.9em;
-}
-	
-.author_info {
-	float: left;
-	width: 225px;
-	font-size: 0.9em;
-	margin: -20px 0 15px 0;
-	text-align: left;
-}
-
-	.author_info.no_rep {
-		margin-bottom: 15px;
-	}
-
-/*	.author_info ul.user_details {
-		padding: 0 10px 10px 10px;
-		margin: 8px 0 0 0;
-	}*/
-	
-	.author_info li.avatar,
-	.author_info li.group_icon,
-	.author_info li.title {
-		text-align: center;
-	}
-	
-	.author_info dl {
-		margin: 8px 8px 15px 8px;
-		font-size: 0.9em;
-		overflow: hidden;
-	}
-	
-	.author_info dt,
-	.author_info dd {
-		display: block;
-		color: #718a96;
-	}
-	
-	.author_info dt {
-		clear: both;
-		float: left;
-		text-align: right;
-		width: 33%;
-		font-weight: bold;
-	}
-	
-	.author_info dd {
-		margin-left: 37%;
-	}
-
-.user_controls {
-	clear: both;
-	text-align: center;
-	margin: 6px 0;
-}
-	
-	.user_controls li {
-		display: inline;
-		padding: 3px 3px 5px 3px;
-		margin: 0 0px;
-		background-color: #d5dde5;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-	}
-	
-.post_body {
-	/*float: left;*/
-	/*width: 85%;*/
-	margin-left: 227px;
-	line-height: 100%;
-}
-
-.post_body div.post {
-	padding: 0 10px;
-	line-height: 150%;
-}
-
-.post_body div.post {
-	padding: 10px;
-}
-
-p.citation {
-	padding: 5px 8px;
-	background: #cee5d8 url({style_images_url}/citation_bg.png) no-repeat right;
-	font-size: 0.9em;
-	font-weight: bold;
-	color: #2b3730;
-	border-width: 0 1px 0 3px;
-	border-style: solid;
-	border-color: #528f6c;
-}
-
-blockquote {
-	margin: 0px;
-	margin-top: -3px;
-	font-size: 0.9em;
-	border-width: 0 1px 1px 3px;
-	border-style: solid;
-	border-color: #528f6c;
-}
-	
-	blockquote p.citation {
-		background-color: #dcc6e1;
-		border-color: #8f589b;
-		color: #413544;
-	}
-	
-	blockquote blockquote {
-		font-size: 1em;
-		margin: -3px 15px -15px 15px;
-		border-color: #8f589b;
-	}
-	
-		blockquote blockquote p.citation {
-			background-color: #e1dec6;
-			border-color: #b0a863;
-			color: #474534;
-		}
-		
-		blockquote blockquote blockquote {
-			border-color: #b0a863;
-		}
-		
-	blockquote p.citation {
-		margin: 6px 15px 0 15px;
-		font-size: 1em;
-	}
-	
-	.post_body div.quote {
-		padding: 12px;
-	} 
-	
-	div.quote p.blockquote {
-		margin-left: -12px;
-	}
-	
-cite {
-	display: block;
-	font-weight: bold;
-}
-
-	blockquote cite {
-		font-size: 1em;
-	}
-
-
-p.posted_info {
-	color: #606060;
-	font-size: 0.8em;
-	padding: 7px 5px 7px 7px;
-	margin-left: 225px;
-}
-
-	p.posted_info strong.event {
-		color: #1c2837;
-		font-size: 1.2em;
-	}
-
-.rep_bar {
-	clear: both;
-	background: #e4ebf2;
-	position: absolute;
-	right: 0;
-	bottom: 32px;
-	float: right;
-	padding: 0 10px;
-	font-size: 0.8em;
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-top-left-radius: 5px;
-	max-width: 90px;
-}
-
-/*.rep_bar {
-	position: absolute;
-	right: 0px;
-	clear: both;
-	background: #e4ebf2;
-	padding: 0 10px;
-	font-size: 0.8em;
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-top-left-radius: 5px;
-	max-width: 50px;
-}*/
-
-	.rep_bar ul {
-		margin-top: 8px;
-		float: left;
-	}
-	
-		.rep_bar ul li {
-			float: left;
-		}
-	
-.ip {
-	color: #475769;
-	font-style: italic;
-	font-size: 0.75em;
-	font-weight: normal;
-}
-
-span.post_id {
-	display: block;
-	float: right;
-	font-size: 0.65em;
-	padding-top: 4px;
-	font-weight: normal;
-}
-
-a.top {
-	display: block;
-	float: right;
-	font-size: 0.7em;
-	margin: -15px 0 5px 0;
-	color: #425365;
-	display: none;
-}
-
-div.signature {
-	font-size: 0.8em;
-	border-top: 1px solid #d5dde5;
-	padding: 8px;
-	margin: 10px 10px 0 6px;
-	color: #8e8e8e;
-}
-
-label.post_mod {
-	display: none;
-}
-
-input.post_mod {
-	float: right;
-	margin: -21px 6px 0 0;
-}
-
-p.edit {
-	background-color: #f3f3f3;
-	color: #515151;
-	padding: 10px;
-	margin-top: 10px;
-	font-size: 0.9em;
-	line-height: 120%;
-}
-
-ul.topic_options,
-ul.profile_options {
-	background: #1d3652 url({style_images_url}/th_bg.png) repeat-x top;
-	color: #fff;
-	font-size: 0.85em;
-	font-weight: bold;
-	height: 33px;
-}
-
-	ul.topic_options {
-		margin-top: 5px;
-	}
-
-	.topic_options li,
-	.profile_options li {
-		float: right;
-		padding: 10px;
-	}
-	
-	.topic_options li.rating,
-	.profile_options li.rating {
-		float: left;
-	}
-	
-	.topic_options li.rating #rating_text,
-	.profile_options li.rating #rating_text {
-		font-weight: normal;
-		color: #cfd9e4;
-		padding-left: 6px;
-	}
-	
-	ul.topic_options a {
-		color: #d5dde5;
-		text-decoration: none;
-	}
-	
-		ul.topic_options a:hover {
-			color: #fff;
-		}
-	
-ul.profile_options {
-	margin-bottom: 20px;
-}
-
-.topic_prefix,
-.recent_activity #tab_recentActivity em,
-.searchlite {
-	background-color: #daede2;
-	color: #528f6c;
-	font-weight: bold;
-}
-
-.topic_prefix,
-.recent_activity #tab_recentActivity em {
-	font-style: normal;
-	padding: 0px 4px;	
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
-.topic_prefix {
-	float: left;
-	display: block;
-	font-size: 0.8em;
-}
-
-#topic_mod,
-#messenger_mod {
-	background-image: url({style_images_url}/topic_mod_arrow.png);
-	background-repeat: no-repeat;
-	background-position: right center;
-}
-
-#topic_mod {
-	clear: both;
-}
-
-	.moderation_bar {
-		background: #d5dde5;
-		padding: 6px 35px 6px 10px;
-		margin: 10px 0 0 0;
-		text-align: right;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-	#topic_mod_2 {
-		-moz-border-radius-topleft: 0px;
-		-moz-border-radius-topright: 0px;
-		-webkit-border-top-left-radius: 0px;
-		-webkit-border-top-right-radius: 0px;
-		margin-top: -10px;
-		padding-top: 10px;
-	}
-	
-	.moderation_bar form[name="multimod"],
-	form#context_search {
-		float: left;
-	}
-	
-#forum_filter,
-#reputation_filter,
-#stat_links,
-#messenger_filter {
-	background-color: #1d3652;
-	text-align: center;
-	color: #d5dde5;
-	margin: 6px 0 0 0;
-	padding: 6px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	font-size: 0.8em;
-}
-	
-	#stat_links a {
-		color: #d5dde5;
-	}
-
-	#forum_filter select,
-	#reputation_filter select {
-		margin-right: 10px;
-	}
-	
-	#forum_filter label,
-	#reputation_filter label {
-		color: #d5dde5;
-	}
-	
-	#forum_filter span,
-	#reputation_filter span {
-		cursor: pointer;
-		display: block;
-	}
-
-.poll {
-	border-bottom: 7px solid #1d3652;
-	margin-bottom: 5px;
-}
-
-.poll fieldset {
-	padding: 9px;
-}
-
-.poll_question {
-	margin: 10px 10px 10px 20px;
-	padding: 10px;
-}
-	
-	.poll_question h4 {
-		margin: 0 -7px;
-		background-color: #e4ebf2;
-		-moz-border-radius: 6px;
-		-webkit-border-radius: 6px;
-		padding: 5px;
-	}
-	
-	.poll_question ol {
-		padding: 8px;
-		background-color: #fafbfc;
-	}
-	
-	.poll_question li {
-		margin: 6px 0;
-		font-size: 0.9em;
-	}
-	
-	.poll_question .votes {
-		color: #999999;
-		font-size: 0.8em;
-		margin-left: 5px;
-	}
-
-div.threaded_view ul ul {
-	margin-left: -25px;
-}
-
-div.threaded_view ul li {
-	padding: 0px 0 0px 25px;
-}
-
-	div.threaded_view {
-		line-height: 140%;
-		padding: 5px 0 15px 0;
-	}
-	
-	div.threaded_view .post_title {
-		font-style: italic;
-	}
-
-#topic_options strong {	
-	cursor: pointer;
-}
-
-ul#topic_options_menu {
-	background-color: #eef3f8;
-	border: 1px solid #1d3652;
-}
-
-	ul#topic_options_menu li {
-		display: block;
-		float: none;
-		color: #1d3652;
-		padding: 7px 10px;
-	}
-
-h3.topic_share,
-ul.topic_share {
-	float: left;
-	font-size: 0.9em;
-	padding: 3px;
-	margin-top: 4px;
-}
-
-	ul.topic_share li {
-		float: left;
-		margin: 0 5px;
-	}
-	
-#attach_wrap {
-	padding: 6px;
-	background: #eef3f8;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	margin-top: 8px;
-	overflow: hidden;
-}
-
-	#attach_wrap h4 {
-		font-size: 1em;
-		font-weight: bold;
-	}
-	
-	#attach_wrap li {
-		float: left;
-		margin: 5px 6px;
-	}
-		
-		#attach_wrap .desc.info {
-			margin-left: 24px;
-		}
-	
-/*-----------------------------------------------*/
-/* Member List			    	                 */
-/*-----------------------------------------------*/
-
-div#member_list {
-	clear: both;
-}
-
-div#member_filters {
-	margin-top: 10px;
-	margin-bottom: 15px;
-}
-	
-	div#member_filters fieldset.other_filters {
-		padding: 6px;
-		text-align: center;
-		margin-top: 10px;
-		clear: both;
-	}
-	
-	div#member_filters fieldset.submit {
-		clear: both;
-		background: #d5dde5;
-		padding: 6px;
-	}
-	
-	div#member_filters ul {
-		width: 48%;
-		float: left;
-		margin-bottom: 12px;
-		margin-top: 8px;
-	}
-	
-	div#member_filters li {
-		clear: both;
-		border-bottom: 1px solid #d5dde5;
-		margin-right: 20px;
-		padding: 8px 0 8px 0;
-	}
-	
-		div#member_filters li .desc {
-			display: inline;
-			margin: 0;
-		}
-	
-	div#member_filters label {
-		width: 150px;
-		display: block;
-		float: left;
-		text-align: right;
-		margin-right: 15px;
-	}
-	
-	div#member_filters li.field.custom input,
-	div#member_filters li.field.custom textarea {
-		width: 50%;
-	}
-		
-#member_alpha li {
-	padding: 2px 7px;
-}
-
-	#member_alpha li.active {
-		padding: 7px 15px;
-	}
-
-.members li.member_entry {
-	position: relative;
-	clear: both;
-	min-height: 100px;
-}
-
-.members li .photo {
-	float: left;
-	margin: 10px;
-}
-
-.members li .user_controls {
-	position: absolute;
-	left: 395px;
-	margin: 25px 10px;
-	width: 350px;
-	clear: none;
-}
-
-	.members li .user_controls .rating {
-		background: none;
-		margin-right: 10px;
-	}
-	
-	.members li .user_controls a {
-		text-decoration: none;
-		font-size: 0.85em;
-	}
-	
-.members li .info {
-	position: absolute;
-	left: 90px;
-	font-size: 0.9em;
-	line-height: 100%;
-	margin: 10px;
-	border-right: 1px solid #d5dde5;
-	width: 350px;
-}
-	.members li .info dt {
-		text-align: right;
-		width: 80px;
-	}
-	
-	.members li .info dd {
-		width: 200px;
-	}
-	
-.members li .reputation {
-	margin-top: 40px;
-}
-
-.members li p.rating {
-	position: absolute;
-	right: 0;
-	margin: 10px;
-}
-
-.members li.general_box {
-	margin-bottom: 4px;
-}
-
-/*-----------------------------------------------*/
-/* Registration/Login	    	                 */
-/*-----------------------------------------------*/
-
-div#register_info {
-	width: 30%;
-	float: right;
-	/*border: 1px solid #b0ce94;
-	background-color: #f1f6ec;
-	color: #3e4934;
-	padding: 7px;*/
-}
-
-div#register_form {
-	width: 66%;
-}
-
-	div#register_form h2 {
-		clear: none;
-	}
-	
-	div#register_form h3,
-	div#login_form h3 {
-		padding: 5px;
-		margin-bottom: 10px;
-	}
-	
-	div#register_form fieldset {
-		margin-bottom: 10px;
-	}
-	
-	div#register_form p.extra {
-		margin-bottom: 15px;
-		line-height: 150%;
-	}
-	
-		div#register_form .field.nodesc {
-			clear: both;
-			padding-bottom: 26px;
-		}
-		
-	div#register_form label {
-		width: 200px;
-		float: left;
-		clear: both;
-		text-align: right;
-		padding-right: 15px;
-	}
-	
-		div#register_form .checkbox label,
-		div#register_form .field.radio input
-		/*div#register_form #dst_label*/ {
-			float: none;
-			width: auto;
-			clear: none;
-			text-align: left;
-		}
-		
-		div#register_form .checkbox input
-		/*div#register_form input#dst*/ {
-			margin-left: 245px;
-			clear: both;
-		}
-		
-		/*body div#register_form input#dst {
-			margin-left: 218px;
-			clear: both;
-		}*/
-	
-	div#register_form input {
-		float: left;
-	}
-		
-		div#register_form fieldset.submit input {
-			float: none;
-		}
-		
-		div#register_form input.input_text {
-			padding-bottom: 2px;
-		}
-	
-	div#register_form hr,
-	div#login_form hr {
-		display: block;
-		width: 95%;
-		border-top: 1px solid #ebebeb;
-		border-bottom: 0;
-		border-left: 0;
-		border-right: 0;
-		clear: both;
-		margin: 10px auto 10px auto;
-	}
-	
-	div#register_form span.desc {
-		display: block;
-		clear: both;
-		margin-left: 215px;
-	}
-
-.reg_msg {
-	font-size: 0.8em;
-	font-weight: bold;
-	position: absolute;
-	padding: 3px 8px;
-	color: #fff;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-}
-
-	.reg_msg img {
-		display: none;
-	}
-
-	.reg_msg.reg_error {
-		background-color: #ad2930;
-	}
-	.reg_msg.reg_accept {
-		background-color: #6f8f52;
-	}
-	
-div#login_form {
-	width: 80%;
-	margin: 0 auto 25px auto;
-	clear: both;
-}
-
-div#member_login {
-	width: 65%;
-}
-
-div#guest_register {
-	width: 30%;
-}
-
-div#member_login {
-	float: left;
-}
-	
-	div#member_login form {
-		margin: 0 0px 0 0;
-	}
-	
-	div#login_form h3 {
-		font-size: 1.1em;
-	}
-	
-	/*div#member_login form label {
-		width: 90px;
-		float: left;
-		text-align: right;
-		padding-right: 15px;
-	}*/
-	
-	div#member_login .extra {
-		float: right;
-		color: #69727b;
-		font-size: 0.8em;
-		padding: 5px;
-		margin-right: 10px;
-	}
-	
-div#guest_register {
-	float: right;
-}
-
-input#openid {
-	background-image: url('{style_images_url}/openid.gif');
-	background-repeat: no-repeat;
-	background-position: 2px;
-	padding: 3px 3px 3px 20px;
-	margin-top: -2px;
-}
-
-#regular_signin,
-#openid_signin {
-	height: 165px;
-}
-
-#signin_options {
-	padding-left: 30px;
-}
-
-.antispam_img {
-	margin-left: 215px;
-	margin-bottom: 3px;
-}
-
-/*-----------------------------------------------*/
-/* Calendar				    	                 */
-/*-----------------------------------------------*/
-
-div#calendar_list {
-	width: 17%;
-	float: left;
-	padding: 10px;
-}
-
-div#calendar_list ol {
-	margin-top: 10px;
-	margin-bottom: 15px;
-}
-
-div#current_calendar {
-	width: 79%;
-	float: right;
-	margin-top: -20px;
-}
-	
-	div#current_calendar h2 {
-		float: left;
-	}
-	
-	/*div#current_calendar ul.pagination {
-		float: right;
-	}
-	
-	div#current_calendar ul.pagination li {
-		display: inline;
-	}*/
-	
-	div#current_calendar table {
-		border-collapse: collapse;
-		clear: both;
-		border: 2px solid #243f5c;
-		margin-bottom: 10px;
-	}
-
-		div#current_calendar table tr.header th {
-			width: 14%;
-			background: #1d3652 url({style_images_url}/gradient_bg.png) repeat-x left 50%;
-			padding: 8px 5px;
-			color: #fff;
-			font-size: 0.9em;
-			font-weight: bold;
-		}
-		
-			#ipboard_body table th.head_week {
-				width: 2% !important;
-			}
-			
-			#ipboard_body table th.view_week {
-				background-color: #B5C0CF;
-				text-align: center;
-				border: 1px solid #B5C0CF;
-			}
-		
-		div#current_calendar table td {
-			height: 85px;
-			vertical-align: top;
-			border: 1px solid #d8d8d8;
-			padding: 5px;
-			font-size: 0.9em;
-		}
-		
-			div#current_calendar table td.selected {
-				background-color: #e1e7ee;
-			}
-	
-			div#current_calendar table td.blank,
-			div#mini_calendars table td.blank {
-				background-color: #e7e7e7;
-			}
-			
-			div#current_calendar table td.today,
-			div#mini_calendars table td.today {
-				border: 2px solid #6f8f52;
-				color: #6f8f52;
-				background-color: #f1f6ec;
-			}
-			
-			div#current_calendar table td strong,
-			div#mini_calendars table td strong {
-				font-size: 0.9em;
-				font-weight: bold;
-			}
-			
-			div#current_calendar table td ul {
-				margin: 5px;
-			}
-
-/* Week view */
-div#current_calendar ol#week_view {
-	margin-top: 12px;
-	clear: both;
-}
-	
-	div#current_calendar ol#week_view li.day {
-		margin-bottom: 2px;
-	}
-	
-	div#current_calendar ol#week_view li.day div {
-		position: relative;
-		min-height: 60px;
-		padding: 4px 10px 4px 75px;
-	}
-	
-	div#current_calendar ol#week_view li.day .date {
-		display: block;
-		position: absolute;
-		top: 0px;
-		bottom: 0px;
-		left: 0px;
-		width: 65px;
-		text-align: center;
-		padding-top: 10px;
-		font-size: 1.2em;
-		color: #1d3652;
-	}
-	
-div#mini_calendars {
-	width: 18%;
-	float: left;
-	margin-top: 20px;
-	margin-bottom: 15px;
-}
-	div#mini_calendars table,
-	.mini_cal {
-		border: 2px solid #1d3652;
-	}
-	
-	div#mini_calendars h3 {
-		background: none;
-		border: 0;
-		padding: 0;
-		font-size: 1.2em;
-		font-weight: normal;
-	}
-	
-	div#mini_calendars th,
-	.mini_cal th {
-		background: #1d3652 url({style_images_url}/gradient_bg.png) repeat-x 50%;
-		color: #fff;
-		font-weight: bold;
-	}
-	
-		div#mini_calendars th.view_week {
-			padding: 6px 2px;
-		}
-	
-	div#mini_calendars th,
-	div#mini_calendars td,
-	.mini_cal th,
-	.mini_cal td {
-		padding: 6px;
-		font-size: 0.85em;
-		text-align: center;
-	}
-	
-	div#mini_calendars td,
-	.mini_cal td {
-		border: 1px solid #f1f4f7;
-	}
-
-.cal_color {
-	margin-right: 8px;
-	padding: 0 7px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-}
-
-.cal {
-	color: #fff;
-	font-size: 0.8em;
-	padding: 2px 5px;
-	margin-bottom: 3px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	background-color: #d5dde5;
-}
-
-	#ipboard_body .cal a {
-		text-decoration: underline;
-	}
-	
-	.today .cal {
-		background-color: #6f8f52;
-	}
-	
-	.today .cal a {
-		color: #fff;
-	}
-	
-.cal_1 {
-	background-color: #971a48;
-}
-
-.cal_2 {
-	background-color: #3fa711;
-}
-.cal_3 {
-	background-color: #cd8b24;
-}
-
-/*-----------------------------------------------*/
-/* Profile				    	                 */
-/*-----------------------------------------------*/
-
-div.userpopup {
-	overflow: hidden;
-	position: relative;
-	padding-bottom: 25px;
-}
-
-	div.userpopup .info {
-		position: relative;
-	}
-	
-	div.userpopup h3 {
-		font-size: 1.2em;
-	}
-	
-	div.userpopup > div {
-		padding: 8px;
-	}
-	
-	div.userpopup {
-		font-size: 0.9em;
-	}
-	
-		div.userpopup dl {
-			padding-bottom: 10px;
-			margin-bottom: 4px;
-			border-bottom: 1px solid #d4d4d4;
-		}
-		
-	div.userpopup .photo {
-		position: absolute;
-		top: 0px;
-		right: 0px;
-	}
-	
-	div.userpopup .user_controls {
-		position: absolute;
-		left: 10px;
-	}
-	
-	div.userpopup .reputation {
-		position: absolute;
-		right: 4px;
-	}
-	
-div#profile_overview {
-	float: left;
-	width: 20%;
-}
-
-div#main_profile_body {
-	float: right;
-	width: 78%;
-}
-
-.personal_statement {
-	border-bottom: 1px solid #dedede;
-	padding-bottom: 10px;
-	clear: both;
-}
-
-	.personal_statement h3 {
-		background: none;
-		border: 0;
-		padding: 0;
-		display: none;
-	}
-	
-	.personal_statement p,
-	.friend_list p,
-	.comments p {
-		/* margin: 15px 0 0 5px;*/
-		padding: 15px 0 0 5px;
-		font-size: 0.9em;
-	}
-
-.personal_info {
-	text-align: center;
-	clear: both;
-}
-
-	.personal_info .photo {
-		margin: 20px auto 20px auto;
-	}
-	
-	.personal_info ul {
-		-moz-border-radius-bottomleft: 10px;
-		-moz-border-radius-bottomright: 10px;
-		-webkit-border-bottom-left-radius: 10px;
-		-webkit-border-bottom-right-radius: 10px;
-		padding: 5px 10px;
-		font-size: 0.9em;
-	}
-	
-	.personal_info li,
-	#calendar_list li {
-		margin: 2px 0;
-		text-align: left;
-	}
-	
-	.personal_info li a,
-	#calendar_list li a {
-		padding: 5px 7px;
-		background: #d5dde5;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		display: block;
-		text-decoration: none;
-	}
-	
-div#profile_overview .info {
-	padding: 5px 0 5px 0;
-	font-size: 0.9em;
-	border-top: 1px solid #dedede;
-	border-bottom: 1px solid #dedede;
-}
-
-	body div#profile_overview .info dt {
-		width: 37%;
-		padding: 3px 4px;
-	}
-	
-	body div#profile_overview .info dd {
-		width: 53%;
-		padding: 3px 4px;
-	}
-
-.about_info,
-.contact_info {
-	width: 47%;
-	float: left;
-}
-
-	body .contact_info {
-		float: right;
-	}
-
-.recent_activity,
-.about_contact,
-.friend_list,
-.comments {
-	clear: both;
-	float: left;
-	width: 100%;
-}
-
-.about_contact,
-.friend_list,
-.comments {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-	.about_contact dl,
-	dl.user_info {
-		padding: 10px;
-	}
-	
-	.about_contact dt,
-	.about_contact dd,
-	.info dt,
-	.user_info dt,
-	.user_info dd {
-		float: left;
-	}
-
-		.about_contact dt,
-		.info dt,
-		.user_info dt {
-			clear: both;
-			width: 30%;
-			padding: 3px 6px;
-			font-weight: bold;
-		}
-	
-		.about_contact dd,
-		.info dd,
-		.user_info dd {
-			padding: 3px 6px;
-			width: 60%;
-		}
-		
-		.info dd,
-		.user_info dd {	
-			margin-left: 35%;
-		}
-
-.friend_list ul,
-#top_posters {
-}
-
-.friend_list ul li,
-#top_posters li {
-	min-width: 80px;
-	height: 70px;
-	text-align: center;
-	padding: 8px 0 0 0;
-	margin: 5px 0 0 0;
-	float: left;
-	overflow: hidden;
-}
-
-	.friend_list ul li span.name,
-	#top_posters li span.name {
-		font-size: 0.8em;
-	}
-
-.recent_activity .general_box {
-	background: #eef3f8;
-}
-
-.recent_activity a {
-	text-decoration: none;
-}
-
-.recent_activity #tab_recentActivity {
-	line-height: 150%;
-}
-	
-	.recent_activity #tab_recentActivity h4 {
-		font-size: 1.1em;
-		color: #1d3652;
-		font-weight: normal;
-		padding: 10px;
-	}
-	
-	.recent_activity #tab_recentActivity ol {
-		padding: 0 0 10px 20px;
-		font-size: 0.9em;
-	}
-	
-	.recent_activity {
-	}
-	
-	.recent_activity li img {
-		padding-right: 6px;
-	}
-	
-	#tab_posts .general_box,
-	#tab_topics .general_box {
-		max-height: 250px;
-		overflow: auto;
-	}
-
-		#tab_posts h4,
-		#tab_topics h4 {
-			font-size: 1.05em;
-			font-weight: normal;
-			padding: 6px 0 0 6px;
-		}
-
-		#tab_posts .post_body,
-		#tab_topics .post_body {
-			background-color: #fafbfc;
-			padding: 10px 10px 25px 18px;
-			border-bottom: 1px solid #d5dde5;
-			line-height: 140%;
-			margin-left: 0;
-		}
-		
-		#tab_posts p.posted_info,
-		#tab_topics p.posted_info {
-			padding: 0 0 6px 6px;
-			margin: 0;
-		}
-	
-#post_comment {
-	clear: both;
-	padding: 10px 10px 10px 30px;
-	margin-top: 15px;
-	margin-left: 10px;
-}
-
-	#post_comment .photo {
-		float: left;
-		clear: both;
-		margin: 0 16px 0 6px;
-	}
-	
-	#post_comment .input_textarea {
-		width: 380px;
-		margin-bottom: 8px;
-	}
-	
-	#post_comment .input_submit {
-		clear: both;
-		margin: 0 10px 0 50px;
-	}
-
-#comment_list li {
-	clear: both;
-	/*margin: 15px 0 15px 20px;*/
-	padding: 10px 0 10px 20px;
-}
-	
-#comment_list .photo {
-	float: left;
-}
-
-#comment_list h4,
-#comment_list p {
-	margin-left: 70px;
-	padding: 5px;	
-}
-
-#comment_list h4 .desc {
-	font-weight: normal;
-	font-size: 0.7em;
-}
-
-#latest_visitors {
-	margin-top: 12px;
-}
-
-	#latest_visitors li .photo {
-		float: left;
-		margin-right: 10px;
-		margin-top: 2px;
-	}
-	
-	#latest_visitors li {
-		clear: both;
-		padding: 5px;
-	}
-
-/*-----------------------------------------------*/
-/* Search				    	                 */
-/*-----------------------------------------------*/
-
-#main_search_form {
-	clear: both;
-	margin-top: 15px;
-}
-
-#search_info {
-	/*float: left;
-	width: 75%;*/
-	font-size: 1.1em;
-
-}
-	
-	#search_info fieldset {
-		padding: 15px 0;
-	}
-	
-	#search_info fieldset li {
-		padding-bottom: 15px;
-		padding-top: 10px;
-		margin-left: 20px;
-	}
-
-	#search_info fieldset label {
-		width: 20%;
-		float: left;
-		text-align: right;
-		padding-right: 10px;
-	}
-	
-	#search_info fieldset .input_text {
-		width: 60%;
-	}
-	
-	#search_info fieldset .input_text.date {
-		width: 20%;
-	}
-	
-	#search_info fieldset.extra_filter {
-		border-top: 1px solid #d5dde5;
-	}
-	
-	#search_info .input_select {
-		width: 40%;
-	}
-
-fieldset#search_where {
-	float: right;
-	width: 19%;
-}
-
-	fieldset#search_where strong {
-		font-size: 1.2em;
-	}
-	
-	
-	fieldset#search_where li {
-		padding: 6px 0 0 6px;
-	}
-	
-	fieldset#search_where input {
-		vertical-align: middle;
-	}
-
-div#search_results {
-	/*padding: 25px 0 0 15px;*/
-	border-bottom: 4px solid #d5dde5;
-	margin-bottom: 8px;
-}	
-	
-	div#search_results h3 {
-		background: 0;
-		border: 0;
-		padding: 0;
-		font-weight: normal;
-		margin-left: 115px;
-	}
-
-	div#search_results li {
-		padding: 15px 0 20px 15px;
-	}
-	
-	div#search_results p {
-		max-width: 60em;
-		margin-left: 115px;
-	}
-	
-	div#search_results .gutter {
-		display: block;
-		float: left;
-		margin-top: 6px;
-		font-size: 0.65em;
-		font-weight: bold;
-		background-color: #528f6c;
-		padding: 3px 8px 2px 8px;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		color: #fff;
-		text-transform: uppercase;
-	}
-	
-		div#search_results .gutter img {
-			padding-right: 4px;
-		}
-		
-	div#search_results .sub {
-		padding-left: 65px;
-	}
-	
-		div#search_results .sub .gutter {
-			background-color: #dedede;
-			color: #1d3652;
-			padding: 6px 8px 5px 8px;
-		}
-	
-	div#search_results ol ol {
-		padding: 20px 0 0 15px;
-		margin: 0 0 -15px 20px;
-	}
-
-/*-----------------------------------------------*/
-/* Post screen									 */
-/*-----------------------------------------------*/
-
-div.post_form label {
-	width: 275px;
-	float: left;
-	clear: both;
-	text-align: right;
-	padding-right: 15px;
-}
-
-	div.post_form span.desc {
-		display: block;
-		clear: both;
-		margin-left: 290px;
-	}
-
-	div.post_form .checkbox input.input_check,
-	#mod_form .checkbox input.input_check {
-		margin-left: 315px;
-	}
-	
-	div.post_form .antispam_img {
-		margin-left: 290px;
-	}
-	
-	div.post_form .captcha .input_text {
-		float: left;
-	}
-	
-div.post_form fieldset {
-	padding-bottom: 15px;
-	/*margin-bottom: 10px;*/
-	background-color: #f1f4f7;
-	/*border-bottom: 2px solid #d5dde5;*/
-}
-
-div.post_form h3 {
-	margin-bottom: 10px;
-}
-
-fieldset.with_subhead {
-	margin-bottom: 0;
-	padding-bottom: 0;
-}
-
-fieldset.with_subhead h4 {
-	width: 300px;
-	float: left;
-	text-align: right;
-	margin-top: 6px;
-}
-
-fieldset.with_subhead ul {
-	margin: 0 15px 6px 320px;
-	border-bottom: 1px solid #d5dde5;
-	padding-bottom: 6px;
-}
-
-fieldset.with_subhead span.desc,
-fieldset.with_subhead label {
-	display: inline;
-	margin: 0;
-	width: auto;
-}
-
-fieldset.with_subhead #post_icons {
-	border: 0;
-	margin-left: 326px;
-}
-
-fieldset.with_subhead #post_icons li {
-	float: left;
-	margin-right: 15px;
-	margin-bottom: 6px;
-}
-
-div.post_form fieldset.with_subhead .checkbox input.input_check {
-	margin-left: 0px;
-}
-
-#toggle_post_options {
-	display: block;
-	cursor: pointer;
-	margin: 15px;
-	font-size: 0.9em;
-	padding: 2px 0 2px 22px;
-	background: transparent url({style_images_url}/add.png) no-repeat;
-}
-
-/* Post polls */
-
-.post_form #poll_wrap .question {
-	margin-bottom: 10px;
-}
-
-.post_form #poll_wrap .question .wrap {
-	margin-left: 290px;
-	margin-right: 12px;
-	background-color: #e4ebf2;
-	padding: 10px;
-	-moz-border-radius: 8px;
-	-webkit-border-radius: 8px;
-}
-
-.post_form #poll_wrap .question .wrap ol {
-	margin-left: 25px;
-	margin-top: 16px;
-	list-style: decimal;
-}
-	.post_form #poll_wrap .question .wrap ol li {
-		margin: 5px;
-	}
-	
-	.post_form #poll_wrap .question .wrap input.input_check,
-	.post_form #poll_wrap .question .wrap label,
-	.post_form #poll_wrap .question .wrap span.desc {
-		margin-left: 0;
-		display: inline;
-		width: auto;
-		text-align: left;
-		clear: none;
-		float: none;
-	}
-	
-	.post_form .question_title {
-		font-weight: bold;
-	}
-	
-.post_form #poll_wrap .question ul.post_controls {
-	text-align: left;
-}
-
-.post_form #poll_form .topic_buttons {
-	margin-left: 315px;
-}
-
-.post_form #poll_form .topic_buttons li {
-	float: left;
-}
-
-.post_form #poll_form #poll_stats.desc {
-	margin-left: 320px;
-	margin-bottom: 8px;
-}
-
-/* Attachments */
-
-fieldset.attachments .input_submit,
-fieldset.attachments .swfupload,
-fieldset.attachments .input_upload {
-	margin-left: 15px;
-}
-
-div.post_form fieldset.attachments span.desc {
-	display: inline;
-	margin: 0 0 0 15px;
-	clear: none;
-}
-
-#attachments {
-	margin: 15px;
-}
-
-#attachments li {
-	background-color: #e4ebf2;
-	padding: 6px 20px 6px 42px;
-	border: 1px solid #d5dde5;
-	position: relative;
-	margin-bottom: 10px;
-}
-	
-	#attachments li p.info {
-		width: 300px;
-		font-size: 0.8em;
-		color: #69727b;
-	}
-	
-	#attachments li .links {
-		display: none;
-	}
-	
-	#attachments li .progress_bar {
-		width: 200px;
-		position: absolute;
-		right: 0px;
-		margin-right: 15px;
-		top: 15px;
-	}
-	
-	#attachments li.complete,
-	#attachments li.in_progress,
-	#attachments li.error {
-		background-repeat: no-repeat;
-		background-position: 12px 12px;
-	}
-	
-	#attachments li.in_progress {
-		background-image: url({style_images_url}/loading.gif);
-	}
-	
-	#attachments li.error {
-		background-image: url({style_images_url}/exclamation.png);
-	}
-	
-	#attachments li.complete {
-		background-image: url({style_images_url}/accept.png);
-	}
-	
-		#attachments li.complete .links {
-			display: block;
-			position: absolute;
-			right: 0px;
-			margin-right: 15px;
-			top: 12px;
-			font-size: 0.9em;
-		}
-	
-	#attachments li.error {
-		background-color: #e8caca;
-		border: 1px solid #ddafaf;
-	}
-	
-		#attachments li.error .info {
-			color: #8f2d2d;
-		}
-		#attachments li.error .links {
-			display: none;
-		}
-	
-	#attachments li .thumb_img {
-		position: absolute;
-		left: 6px;
-		top: 6px;
-		width: 30px;
-		height: 30px;
-		overflow: hidden;
-	}
-	
-	#attachments.traditional .progress_bar {
-		display: none;
-	}
-/*-----------------------------------------------*/
-/* Messenger			    	                 */
-/*-----------------------------------------------*/
-
-#messenger_utilities {
-	float: left;
-	width: 18%;
-}	
-	
-#messenger_content {
-	float: right;
-	width: 80%;
-	/*margin-top: -20px;*/
-}
-
-#messenger_content h2 {
-	clear: none;
-	font-size: 1.4em;
-}
-
-#messenger_content .author_info {
-	margin-top: 0px;
-}
-
-#folder_list,
-#space_allowance,
-#message_search,
-#participants,
-#invite_more {
-	margin-bottom: 10px;
-	position: relative;
-}
-
-#space_allowance p{
-	line-height: 150%;
-}
-
-#message_list {
-	/*clear: both;*/
-	clear: right;
-}
-
-#message_compose .input_check {
-	margin-left: 245px;
-}
-
-#invite_more p.desc {
-	padding: 10px;
-}
-
-#folder_list li {
-	margin-bottom: 4px;
-	margin-left: 6px;
-	padding: 1px;
-}
-
-	#folder_list #folders {
-		margin-bottom: 12px;
-	}
-
-	#folder_list .total {
-		position: absolute;
-		right: 0;
-		margin-right: 10px;
-		background-color: #d5dde5;
-		font-size: 0.75em;
-		font-weight: bold;
-		padding: 3px 6px;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-	}
-
-#participants #participants_list li {
-	padding: 5px;
-	clear: both;
-	min-height: 55px;
-}
-	
-#participants #participants_list li .photo {
-	float: left;
-	margin-right: 10px;
-	margin-top: 2px;
-}
-	
-	#participants #participants_list span.name.left_convo a {
-		color: #8a8a8a;
-		font-style: italic;
-	}
-	
-	#participants #participants_list span.name.blocked a {
-		color: #ad2930;
-	}
-
-li.new_folder {
-	padding-left: 20px;
-}
- 
-.add_folder.input_submit {
-	padding: 1px 3px;
-}
-
-.edit_folders {
-	position: absolute;
-	right: 0px;
-	margin-right: 10px;
-	font-size: 0.8em;
-	font-weight: bold;
-	padding: 2px;
-}
-
-	.f_delete {
-		color: #f00;
-	}
-
-.progress_bar {
-	border: 1px solid #d5dde5;
-	background-color: #fff;
-}
-
-	.progress_bar span {
-		background: #243f5c url({style_images_url}/gradient_bg.png) repeat-x left 50%;
-		display: block;
-		text-align: center;
-		font-size: 0em;
-		text-indent: -2000em; /* Safari fix */
-		height: 10px;
-		font-weight: bold;
-		color: #fff;
-		overflow: hidden;
-	}
-	
-	.progress_bar.limit span {
-		background: #b82929 url('{style_images_url}/progressbar_warning.png') repeat-x center;
-	}
-	
-	.progress_bar span span {
-		display: none;
-	}
-	
-.progress_bar.user_warn {
-	width: 80%;
-	margin: 0 auto;
-}
-
-	.progress_bar.user_warn span {
-		height: 6px;
-	}
-	
-.progress_bar.topic_poll {
-	width: 40%;
-	border: 1px solid #d5dde5;
-	margin-top: 2px;
-}
-
-.warn_panel {
-	text-align: left;
-	clear: both;
-	background-color: #e4ebf2;
-	padding: 6px;
-	margin: 0 10px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-	.warn_panel strong {
-		margin-left: 10%;
-		font-size: 0.85em;
-		color: #777;
-	}
-	
-	.warn_panel .warn_edit {
-		float: right;
-	}
-	
-	.warn_panel .warn_edit.up {
-		margin-right: 10%;
-	}
-	
-	
-
-	
-/*-----------------------------------------------*/
-/* Tab bar				    	                 */
-/*-----------------------------------------------*/
-
-.tab_bar {
-	background-color: #e4ebf2;
-	padding: 7px 15px 25px 15px;
-	-moz-border-radius-topleft: 6px;
-	-moz-border-radius-topright: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-webkit-border-top-right-radius: 6px;
-	font-size: 0.9em;
-	color: #4a6784;
-}
-
-	.tab_bar.no_title {
-		background-image: url('{style_images_url}/th_bg.png');
-		background-repeat: repeat-x;
-		background-position: bottom;
-		padding: 7px 15px 56px 15px;
-	}
-		
-		.tab_bar.no_title.mini {
-			padding: 7px 15px 25px 15px;
-			background-image: none;
-			border-bottom: 8px solid #243f5c;
-			background-color: transparent;
-		}
-	
-	.tab_bar li {
-		float: left;
-		padding: 2px 10px;
-	}
-		
-		.tab_bar li a {
-			color: #4a6784;
-			text-decoration: none;
-		}
-	
-	.tab_bar li.active {
-		background-color: #243f5c;
-		color: #fff;
-		-moz-border-radius-topleft: 4px;
-		-moz-border-radius-topright: 4px;
-		-webkit-border-top-left-radius: 4px;
-		-webkit-border-top-right-radius: 4px;
-		margin: -2px 10px 0 10px;
-		padding: 7px 10px;
-		font-weight: bold;
-		font-size: 1.1em;
-	}
-	
-		.tab_bar li.active a {
-			color: #fff;
-			font-weight: bold;
-			text-decoration: none;
-		}
-	
-.tab_body {
-	clear: both;
-	background-color: #f6f8fa;
-	padding: 15px;
-}
-
-.tab_filters {
-	background: #1d3652 url({style_images_url}/th_bg.png) repeat-x top;
-	height: 30px;
-	padding: 0 10px;
-	font-size: 0.9em;
-	color: #fff;
-}
-	
-	.tab_filters ul {
-		display: inline;
-		padding-top: 8px;
-		float: right;
-	}
-
-	.tab_filters a {
-		color: #cfd9e4;
-		text-decoration: none;
-	}
-	
-	.tab_filters li {
-		display: inline;
-		padding: 0 4px;
-		color: #cfd9e4;
-	}
-	
-		.tab_filters li.active,
-		.tab_filters li.active a {
-			font-weight: bold;
-			color: #fff;
-		}
-/*-----------------------------------------------*/
-/* Help											 */
-/*-----------------------------------------------*/
-
-#help_topics {
-	border: 1px solid #d5dde5;
-}
-
-#help_topics li {
-	padding: 10px 32px;
-	background-image: url({style_images_url}/help.png);
-	background-repeat: no-repeat;
-	background-position: 9px 12px;
-	margin-bottom: 2px;
-}
-
-	#help_topics li h3 {
-		padding: 2px 0 0 0;
-	}
-	
-.help_doc {
-	padding: 10px;
-	border: 1px solid #d5dde5;
-}
-	#help_topics .help_doc ul,
-	#help_topics .help_doc ol {
-		padding: 8px 0;
-	}
-	
-	#help_topics .help_doc li {
-		background: none;
-		padding: 2px;
-	}
-
-/*-----------------------------------------------*/
-/* UserCP				    	                 */
-/*-----------------------------------------------*/
-
-#usercp_menu {
-	width: 190px;
-	text-align: right;
-	font-size: 0.9em;
-	float: left;
-	border-right: 3px solid #528f6c;
-}
-
-	#usercp_menu li {
-		padding: 6px 5px;
-		background-color: #e4ebf2;
-		margin-bottom: 4px;
-		margin-right: 8px;
-	}
-		
-		#usercp_menu li a {
-			text-decoration: none;
-		}
-	
-	#usercp_menu li.active {
-		background-color: #528f6c;
-		color: #fff;
-		font-weight: bold;
-		font-size: 1.05em;
-		padding: 6px 5px;
-		-moz-border-radius-topleft: 4px;
-		-moz-border-radius-bottomleft: 4px;
-		-webkit-border-top-left-radius: 4px;
-		-webkit-border-bottom-left-radius: 4px;
-		margin-right: 0px;
-	}
-
-div.avatar_gallery {
-	width: 20%;
-	float: left;
-	margin-top: 15px;
-	text-align: center;
-}
-
-	div.avatar_gallery input,
-	div.avatar_gallery label {
-		margin-top: 10px;
-		display: inline-block;
-	}
-		
-
-.tab_body.usercp_body {
-	padding: 5px 5px 20px 5px;
-	background-color: transparent;
-}
-
-#usercp_content {
-	margin-left: 190px;
-	border-left: 3px solid #528f6c;
-	padding: 0 0 0 10px;
-}
-	
-	#usercp_content fieldset.row1,
-	#usercp_content fieldset.row2 {
-		padding: 10px;
-		margin-bottom: 4px;
-	}
-	
-	#usercp_content h3 {
-		background: 0;
-		padding: 0;
-		border: 0;
-		font-weight: normal;
-	}
-	
-	#usercp_content ul {
-		padding: 7px 0 15px 10px;
-	}
-	
-	p.field {
-		padding: 15px;
-	}
-	
-	li.field {
-		padding: 5px;
-		margin-left: 27px;
-	}
-	
-		li.field label {
-			display: block;
-		}
-		
-		li.field input {
-			
-		}
-			
-		li.field span.desc {
-			display: block;
-		}
-	
-	li.field.checkbox {
-		margin-left: 0;
-	}
-	
-	li.field.checkbox .input_check,
-	li.field.checkbox .input_radio {
-		margin-right: 10px;
-		vertical-align: middle;
-	}
-		
-		li.field.checkbox label {
-			width: auto;
-			float: none;
-			display: inline;
-		}
-		
-		li.field.checkbox span.desc {
-			padding-left: 27px;
-			display: block;
-			margin-left: auto;
-		}
-
-.tagList {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-}
-	.tagList li {
-		display: inline;
-	}
-	
-	li.level1 {
-		font-size: 12px;
-	}
-	
-	li.level2 {
-		font-size: 14px;
-	}
-	
-	li.level3 {
-		font-size: 16px;
-	}
-	
-	li.level4 {
-		font-size: 18px;
-	}
-	
-	li.level5 {
-		font-size: 20px;
-	}
-	
-	li.level6 {
-		font-size: 22px;
-	}
-	
-	
-#lightbox{	position: absolute;	left: 0; width: 100%; z-index: 16000; text-align: center; line-height: 0;}
-#lightbox img{ width: auto; height: auto;}
-#lightbox a img{ border: none; }
-
-#outerImageContainer{ position: relative; background-color: #fff; width: 250px; height: 250px; margin: 0 auto; }
-#imageContainer{ padding: 10px; }
-
-#loading{ position: absolute; top: 40%; left: 0%; height: 25%; width: 100%; text-align: center; line-height: 0; }
-#hoverNav{ position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; }
-#imageContainer>#hoverNav{ left: 0;}
-#hoverNav a{ outline: none;}
-
-#prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; }
-#prevLink { left: 0; float: left;}
-#nextLink { right: 0; float: right;}
-#prevLink:hover, #prevLink:visited:hover { background: url({style_images_url}/lightbox/prevlabel.gif) left 15% no-repeat; }
-#nextLink:hover, #nextLink:visited:hover { background: url({style_images_url}/lightbox/nextlabel.gif) right 15% no-repeat; }
-
-#imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100%	; }
-
-#imageData{	padding:0 10px; color: #666; }
-#imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
-#imageData #caption{ font-weight: bold;	}
-#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
-#imageData #bottomNavClose{ width: 66px; float: right;  padding-bottom: 0.7em; outline: none;}	 	
-
-#overlay{ position: absolute; top: 0; left: 0; z-index: 15000; width: 100%; height: 500px; background-color: #000; }
-
-/* SKINNOTE: FIX THIS RIKKI!! lol */
-.snapback { 
-	margin-right: 5px; 
-	padding-left: 0px;
-	padding-top: 1px;
-	padding-bottom: 1px;
-}
-
-.swfupload {
-		position: absolute;
-		z-index: 1;
-	}
-
-
-.clickable {
-	cursor: pointer;
-}
-
-.activeuserposting
-{
-	font-style: italic;
-}
-
-#portal_active_users ul,
-#portal_active_users li {
-	float: left;
-	padding: 3px;
-}
-
-#portal_active_users ul {
-	margin-bottom: 15px;
-}
-
-#portal_active_users {
-	overflow: hidden;
-}]]></css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018125</css_updated>
-    <css_group>lightbox</css_group>
-    <css_content><![CDATA[#lightbox{	position: absolute;	left: 0; width: 100%; z-index: 100; text-align: center; line-height: 0;}
-#lightbox img{ width: auto; height: auto;}
-#lightbox a img{ border: none; }
-
-#outerImageContainer{ position: relative; background-color: #fff; width: 250px; height: 250px; margin: 0 auto; }
-#imageContainer{ padding: 10px; }
-
-#loading{ position: absolute; top: 40%; left: 0%; height: 25%; width: 100%; text-align: center; line-height: 0; }
-#hoverNav{ position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; }
-#imageContainer>#hoverNav{ left: 0;}
-#hoverNav a{ outline: none;}
-
-#prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; }
-#prevLink { left: 0; float: left;}
-#nextLink { right: 0; float: right;}
-#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; }
-#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; }
-
-#imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100%	; }
-
-#imageData{	padding:0 10px; color: #666; }
-#imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
-#imageData #caption{ font-weight: bold;	}
-#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
-#imageData #bottomNavClose{ width: 66px; float: right;  padding-bottom: 0.7em; outline: none;}	 	
-
-#overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; }]]></css_content>
-    <css_position>1</css_position>
-    <css_app>core</css_app>
-    <css_app_hide>0</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>xmlskin</css_master_key>
-  </cssfile>
-</css>
diff --git a/upload/admin/applications/core/xml/core_xmlskin_templates.xml b/upload/admin/applications/core/xml/core_xmlskin_templates.xml
deleted file mode 100644
index 8a52f945..00000000
--- a/upload/admin/applications/core/xml/core_xmlskin_templates.xml
+++ /dev/null
@@ -1,1530 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="core" templategroups="a:10:{s:12:&quot;skin_editors&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_emails&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_global&quot;;s:5:&quot;exact&quot;;s:17:&quot;skin_global_other&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_help&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_login&quot;;s:5:&quot;exact&quot;;s:13:&quot;skin_register&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_reports&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_search&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_stats&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_editors">
-    <template>
-      <template_group>skin_editors</template_group>
-      <template_content/>
-      <template_name>ajaxEditBox</template_name>
-      <template_data><![CDATA[$post="", $pid=0, $error_msg="", $extraData]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_editors</template_group>
-      <template_content/>
-      <template_name>editorJS</template_name>
-      <template_data><![CDATA[$emoticons='']]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_editors</template_group>
-      <template_content/>
-      <template_name>editorShell</template_name>
-      <template_data><![CDATA[$editor_id, $field='Post', $content='', $lite=0]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_editors</template_group>
-      <template_content/>
-      <template_name>ips_editor</template_name>
-      <template_data><![CDATA[$form_field="",$initial_content="",$images_path="",$rte_mode=0,$editor_id='ed-0',$smilies='', $bbcode='', $can_use_emos=1, $IPS_DOC_CHAR_SET=1]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_emails">
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>boardRules</template_name>
-      <template_data><![CDATA[$title="",$body=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>errors</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>forward_form</template_name>
-      <template_data><![CDATA[$title="",$text="",$lang=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>sendMailForm</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>sentScreen</template_name>
-      <template_data><![CDATA[$member_name=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_emails</template_group>
-      <template_content/>
-      <template_name>show_address</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_global">
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content/>
-      <template_name>defaultHeader</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content/>
-      <template_name>forum_jump</template_name>
-      <template_data>$html</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<?xml version="1.0" encoding="UTF-8" ?>
-<ipb>
-$html
-</ipb>]]></template_content>
-      <template_name>globalTemplate</template_name>
-      <template_data>$html, $documentHeadItems, $css, $jsModules, $metaTags, $header_items=array(), $items=array(), $footer_items=array(), $stats=array()</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content/>
-      <template_name>include_highlighter</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>include_lightbox</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>include_lightbox_real</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeCSS</template_name>
-      <template_data>$css</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeFeeds</template_name>
-      <template_data>$documentHeadItems</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeJS</template_name>
-      <template_data>$jsModules</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeMeta</template_name>
-      <template_data>$metaTags</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeRTL</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>includeVars</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<if test="$work['pages'] > 1">
-	<pagination>
-		<total>{$work['pages']}</total>
-		<current>{$work['current_page']}</current>
-		<pages>
-	<foreach loop="pagination:$work['_pageNumbers'] as $_real => $_page">
-			<page>
-				<title>{$_page}</title>
-				<url>{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={$_real}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}</url>
-			</page>
-	</foreach>
-		<if test="$work['current_page'] < $work['pages']">
-			<page>
-				<title>{$this->lang->words['tpl_next']}</title>
-				<url>{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( $data['currentStartValue'] + $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}</url>
-			</page>
-		</if>
-		<if test="isset( $work['_showEndDots'] ) && $work['_showEndDots']">
-			<page>
-				<title>{$this->lang->words['tpl_gotolast']}</title>
-				<url>{parse url="{$data['baseUrl']}&amp;{$data['startValueKey']}={parse expression="intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] )"}" base="public" seotitle="{$data['seoTitle']}" template="{$data['seoTemplate']}"}</url>
-			</page>			
-		</if>
-		</pages>
-	</pagination>
-</if>]]></template_content>
-      <template_name>paginationTemplate</template_name>
-      <template_data>$work, $data</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>quickSearch</template_name>
-      <template_data/>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>shareLinks</template_name>
-      <template_data><![CDATA[$links, $title='', $url='', $cssClass='topic_share left']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content>$sig</template_content>
-      <template_name>signature_separator</template_name>
-      <template_data><![CDATA[$sig=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>topic_popup</template_name>
-      <template_data><![CDATA[$topicId='', $seoTitle='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content/>
-      <template_name>user_popup</template_name>
-      <template_data><![CDATA[$memberid=0, $seoName='']]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>userHoverCard</template_name>
-      <template_data>$member=array()</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global</template_group>
-      <template_content><![CDATA[<details>	
-		<if test="$author['member_id'] AND $author['avatar']">
-			<avatar>{$author['avatar']}</avatar>
-		<else />
-			<avatar>{$author['avatar']}</avatar>
-		</if>
-		<if test="$author['title']">
-			<title>{$author['title']}</title>
-		</if>
-		<if test="$author['member_rank_img']">
-			<rank>{$author['member_rank_img']}</rank>
-		</if>
-		
-		<if test="$author['has_blog']">
-			<blog>{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$author['member_id']}" base="public"}</blog>
-		</if>
-		<if test="$author['has_gallery']">
-			<gallery>{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$author['member_id']}" base="public"}</gallery>
-		</if>	
-			<group>{$author['_group_formatted']}</group>
-			<posts>{parse expression="$this->registry->getClass('class_localization')->formatNumber( intval( $author['posts'] ) )"}</posts>
-			<joined>{$author['joined']}</joined>
-		<if test="$author['custom_fields']['profile_info'] != """>
-			<customfields>
-			<foreach loop="$author['custom_fields']['profile_info'] as $field">
-				<field><!#^#|CDATA|
-						{$field}
-						|#^#]>
-				</field>
-			</foreach>
-			</customfields>
-		</if>
-		</details>]]></template_content>
-      <template_name>userInfoPane</template_name>
-      <template_data>$author, $contentid, $options</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_global_other">
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>ajaxPopUpNoPermission</template_name>
-      <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content/>
-      <template_name>captchaGD</template_name>
-      <template_data>$captcha_unique_id</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content/>
-      <template_name>captchaRecaptcha</template_name>
-      <template_data><![CDATA[$html=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<offline>
-	<message>{$message}</message>
-</offline>]]></template_content>
-      <template_name>displayBoardOffline</template_name>
-      <template_data><![CDATA[$message=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<?xml version="1.0" encoding="UTF-8" ?>
-<ipb>
-$html
-</ipb>]]></template_content>
-      <template_name>displayPopUpWindow</template_name>
-      <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $title="", $output=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<error>
-	<code>{$code}</code>
-	<message>{$message}</message>
-</error>]]></template_content>
-      <template_name>Error</template_name>
-      <template_data><![CDATA[$message="",$code=0,$ad_email_one="",$ad_email_two="",$show_top_msg=0, $login="", $post=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content/>
-      <template_name>error_log_in</template_name>
-      <template_data><![CDATA[$q_string=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content/>
-      <template_name>error_post_textarea</template_name>
-      <template_data><![CDATA[$post=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>facebookDone</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>facebookPop</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likeMoreDialogue</template_name>
-      <template_data>$data, $relId</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likeSetDialogue</template_name>
-      <template_data>$app, $area, $relid, $data</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likeSummary</template_name>
-      <template_data>$data, $relId, $opts</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likeSummaryContents</template_name>
-      <template_data>$data, $relId, $opts=array()</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>notificationsList</template_name>
-      <template_data>$notifications</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content/>
-      <template_name>questionAndAnswer</template_name>
-      <template_data>$data</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<?xml version="1.0" encoding="UTF-8" ?>
-<ipb>
-	<redirect>
-		<url>{parse url="$url" base="public"}</url>
-		<message>{$text}</message>
-	</redirect>
-</ipb>]]></template_content>
-      <template_name>redirectTemplate</template_name>
-      <template_data><![CDATA[$documentHeadItems, $css, $jsLoaderItems, $text="",$url="", $full=false]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>twitterDone</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_global_other</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>twitterPop</template_name>
-      <template_data>$user</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_help">
-    <template>
-      <template_group>skin_help</template_group>
-      <template_content><![CDATA[<if test="!$this->request['xml']">
-<div class='topic_controls'>
-	<ul class='topic_buttons'>
-		<li><a href="{parse url="app=core&amp;module=help" base="public"}" title="{$this->lang->words['help_back_list_title']}"><img src='{$this->settings['img_url']}/back.png' alt='Icon' /> {$this->lang->words['help_return_list']}</a></li>
-	</ul>
-</div>
-</if>
-<if test="$this->request['xml']">
-<br />
-</if>
-<h2>$one_text: $three_text</h2>
-<div class='row2 help_doc bullets'>
-	$text
-</div>
-<br />
-<if test="!$this->request['xml']">
-<div class='topic_controls'>
-	<ul class='topic_buttons'>
-		<li><a href="{parse url="app=core&amp;module=help" base="public"}" title="{$this->lang->words['help_return_list_title']}"><img src='{$this->settings['img_url']}/back.png' alt='Icon' /> {$this->lang->words['help_return_list']}</a></li>
-	</ul>
-</div>
-</if>]]></template_content>
-      <template_name>helpShowSection</template_name>
-      <template_data><![CDATA[$one_text="",$two_text="",$three_text="", $text]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_help</template_group>
-      <template_content><![CDATA[{parse js_module="help"}
-<h2>{$this->lang->words['help_topics']}</h2>
-<p class='message unspecific'>$two_text</p>
-<ol id='help_topics'>
-	{parse striping="help" classes="row1,row2"}
-	<foreach loop="topics:$rows as $entry">
-	<li class='{parse striping="help"} helpRow'>
-		<h3><a href="{parse url="app=core&amp;module=help&amp;do=01&amp;HID={$entry['id']}" base="public"}" title="{$this->lang->words['help_read_document']}">{$entry['title']}</a></h3>
-		<p>
-			{$entry['description']}
-		</p>
-	</li>
-	</foreach>
-</ol>]]></template_content>
-      <template_name>helpShowTopics</template_name>
-      <template_data><![CDATA[$one_text="",$two_text="",$three_text="",$rows]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_login">
-    <template>
-      <template_group>skin_login</template_group>
-      <template_content/>
-      <template_name>errors</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_login</template_group>
-      <template_content/>
-      <template_name>showLogInForm</template_name>
-      <template_data><![CDATA[$message="",$referer="",$extra_form="", $has_openid=false, $facebookOpts=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_register">
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>completePartialLogin</template_name>
-      <template_data><![CDATA[$mid="",$key="",$custom_fields="",$errors="", $reg=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>lostPasswordForm</template_name>
-      <template_data><![CDATA[$error=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>lostPasswordWait</template_name>
-      <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>registerCoppaForm</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>registerCoppaStart</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>registerCoppaTwo</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>registerForm</template_name>
-      <template_data><![CDATA[$general_errors=array(), $data=array(), $inline_errors=array(), $time_select='', $custom_fields=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>registerShowTerms</template_name>
-      <template_data><![CDATA[$text="",$coppa_user=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>registration_error</template_name>
-      <template_data>$message</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>show_lostpass_form_auto</template_name>
-      <template_data><![CDATA[$aid="",$uid=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>show_lostpass_form_manual</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showAuthorize</template_name>
-      <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showLostpassForm</template_name>
-      <template_data>$error</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showLostPassWaitRandom</template_name>
-      <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showManualForm</template_name>
-      <template_data><![CDATA[$type="reg"]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showPreview</template_name>
-      <template_data><![CDATA[$member=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showRevalidated</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>showRevalidateForm</template_name>
-      <template_data><![CDATA[$name="",$error=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>subsm_end</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>subsm_row</template_name>
-      <template_data><![CDATA[$id="",$title="",$cost="",$duration=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>subsm_start</template_name>
-      <template_data><![CDATA[$cur=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_register</template_group>
-      <template_content/>
-      <template_name>tmpl_form</template_name>
-      <template_data><![CDATA[$action="",$hidden="",$title="",$content=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_reports">
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>basicReportForm</template_name>
-      <template_data><![CDATA[$name="", $url="", $extra_data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>config_notif</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>greenAlertImage</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>redAlertImage</template_name>
-      <template_data/>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>reportsIndex</template_name>
-      <template_data><![CDATA[$reports=array(), $acts="", $pages="", $active=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>statusIcon</template_name>
-      <template_data>$img, $width, $height</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_reports</template_group>
-      <template_content/>
-      <template_name>viewReport</template_name>
-      <template_data>$options=array(), $reports=array(), $comments=array()</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_search">
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<activecontent>
-	<total>{$total}</total>
-<if test="$total">
-	<results>
-	<foreach loop="results:$results as $result">	
-		{$result['html']}
-	</foreach>
-	</results>	
-</if>
-{$pagination}
-</activecontent>]]></template_content>
-      <template_name>activePostsView</template_name>
-      <template_data>$results, $pagination, $total</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>asForumPosts</template_name>
-      <template_data>$data</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>asForumTopics</template_name>
-      <template_data>$data</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/calendar.png</icon>
-	<type>Calendar Ranged Event</type>
-	<url>{parse url="app=calendar&amp;module=calendar&amp;cal_id={$r['type_id']}&amp;do=showevent&amp;event_id={$r['type_id_2']}&amp;hl={$this->request['search_term']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']} ({$r['updated']} to {$r['misc']})|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>calEventRangedSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/calendar.png</icon>
-	<type>Calendar Event</type>
-	<url>{parse url="app=calendar&amp;module=calendar&amp;cal_id={$r['type_id']}&amp;do=showevent&amp;event_id={$r['type_id_2']}&amp;hl={$this->request['search_term']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>calEventSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<fieldset id='app_filter_forums' class='{parse striping="search"} extra_filter'>
-	<ul>
-		<li>
-			<label for='forums_filter'>Find in <strong>forum</strong>:</label>
-			<select name='search_app_filters[forums][]' class='input_select' size='6' multiple='multiple'>
-				{$forums}
-			</select>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>forumAdvancedSearchFilters</template_name>
-      <template_data>$forums</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>galleryAdvancedSearchFilters</template_name>
-      <template_data><![CDATA[$cats_dd='']]></template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/gallery.png</icon>
-	<type>Gallery Comment</type>
-	<url>{parse url="app=gallery&amp;module=images&amp;img={$r['misc']}&amp;hl={$this->request['search_term']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>galleryCommentSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/gallery.png</icon>
-	<type>Gallery Image</type>
-	<url>{parse url="app=gallery&amp;module=images&amp;img={$r['type_id_2']}&amp;hl={$this->request['search_term']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>galleryImageSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/core.png</icon>
-	<type>Help File</type>
-	<url>{parse url="app=core&amp;module=help&amp;do=01&amp;HID={$r['type_id_2']}&amp;hl={$this->request['search_term']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>helpSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>memberCommentsSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/members.png</icon>
-	<type>Member</type>
-	<url>{parse url="showuser={$r['type_id_2']}" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>memberSearchResult</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<newcontent>
-	<total>{$total}</total>
-<if test="$total">
-	<results>
-	<foreach loop="results:$results as $result">	
-		{$result['html']}
-	</foreach>
-	</results>	
-</if>
-{$pagination}
-</newcontent>]]></template_content>
-      <template_name>newPostsView</template_name>
-      <template_data>$results, $pagination, $total</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content/>
-      <template_name>searchAdvancedForm</template_name>
-      <template_data><![CDATA[$filters='', $msg='', $removed_search_terms=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<search>
-	<term>{$search_term}</term>
-	<total>{$total}</total>
-<if test="$total">
-	<results>
-	<foreach loop="results:$results as $result">	
-		{$result['html']}
-	</foreach>
-	</results>	
-</if>
-{$pagination}
-</search>]]></template_content>
-      <template_name>searchResults</template_name>
-      <template_data>$results, $pagination, $total, $showing, $search_term, $url_string, $current_key, $removed_search_terms=array()</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>searchResultsAsForum</template_name>
-      <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>searchResultsAsGallery</template_name>
-      <template_data>$results, $titlesOnly</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>searchResultsWrapper</template_name>
-      <template_data>$results, $sortDropDown, $sortIn, $pagination, $total, $showing, $search_term, $url_string, $current_key, $removed_search_terms=array(), $limited=0, $wasLimited=false</template_data>
-      <template_updated>1288194260</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/core.png</icon>
-	<type>Content</type>
-	<url></url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</result>]]></template_content>
-      <template_name>searchRowGenericFormat</template_name>
-      <template_data>$r, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/forums.png</icon>
-	<type>Topic</type>
-	<url>{parse url="showtopic={$r['type_id_2']}&amp;view=<if test="$this->request['do']=='new_posts'">getnewpost<else /><if test="$r['misc']">findpost&amp;p={$r['misc']}</if></if>&amp;hl={$this->request['search_term']}&amp;fromsearch=1" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-<if test="$r['_forum_trail']">
-	<forums>
-	<foreach loop="$r['_forum_trail'] as $i => $f">
-		<forum>
-			<url>{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}</url>
-			<name>{$f[0]}</name>
-		</forum>
-	</foreach>
-	</forums>
-</if>
-	<replies>{$r['posts']}</replies>
-	<attachments>{$r['topic_hasattach']}</attachments>
-<if test="$this->request['do'] == 'new_posts'">
-	<date>{$r['last_post']}</date>
-	<user>
-		<id>{$r['last_poster_id']}</id>
-		<name>{$r['last_poster_name']}</name>
-		<url>{parse url="showuser={$r['last_poster_id']}" base="public"}</url>
-	</user>
-<else />
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</if> 
-</result>]]></template_content>
-      <template_name>topicPostSearchResult</template_name>
-      <template_data>$r, $indent, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<result>
-	<icon>{$this->settings['public_dir']}style_extra/app_icons/forums.png</icon>
-	<type>Topic</type>
-	<url>{parse url="showtopic={$r['type_id_2']}&amp;view=<if test="$this->request['do']=='new_posts'">getnewpost<else /><if test="$r['misc']">findpost&amp;p={$r['misc']}</if></if>&amp;hl={$this->request['search_term']}&amp;fromsearch=1" base="public"}</url>
-	<title><!#^#|CDATA|{$r['content_title']}|#^#]></title>
-	<content><!#^#|CDATA|{$r['content']}|#^#]></content>
-<if test="$r['_forum_trail']">
-	<forums>
-	<foreach loop="$r['_forum_trail'] as $i => $f">
-		<forum>
-			<url>{parse url="{$f[1]}" template="showforum" seotitle="{$f[2]}" base="public"}</url>
-			<name>{$f[0]}</name>
-		</forum>
-	</foreach>
-	</forums>
-</if>
-	<replies>{$r['posts']}</replies>
-	<attachments>{$r['topic_hasattach']}</attachments>
-<if test="$this->request['do'] == 'new_posts'">
-	<date>{$r['last_post']}</date>
-	<user>
-		<id>{$r['last_poster_id']}</id>
-		<name>{$r['last_poster_name']}</name>
-		<url>{parse url="showuser={$r['last_poster_id']}" base="public"}</url>
-	</user>
-<else />
-	<date>{$r['updated']}</date>
-	<user>
-		<id>{$r['member_id']}</id>
-		<name>{$r['members_display_name']}</name>
-		<url>{parse url="showuser={$r['member_id']}" base="public"}</url>
-	</user>
-</if> 
-</result>]]></template_content>
-      <template_name>topicPostSearchResultAsForum</template_name>
-      <template_data>$r, $indent, $resultAsTitle=false</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content>{$content}</template_content>
-      <template_name>topicPostSubresultWrap</template_name>
-      <template_data>$content</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_search</template_group>
-      <template_content><![CDATA[<usercontent>
-	<total>{$total}</total>
-<if test="$total">
-	<results>
-	<foreach loop="results:$results as $result">	
-		{$result['html']}
-	</foreach>
-	</results>	
-</if>
-{$pagination}
-</usercontent>]]></template_content>
-      <template_name>userPostsView</template_name>
-      <template_data>$results, $pagination, $total</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_stats">
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content/>
-      <template_name>group_strip</template_name>
-      <template_data><![CDATA[$group="", $members=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content/>
-      <template_name>top_posters</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content/>
-      <template_name>whoPosted</template_name>
-      <template_data><![CDATA[$tid=0, $title="", $rows=array()]]></template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_stats</template_group>
-      <template_content/>
-      <template_name>whoPostedAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288194261</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications/core/xml/hooks.xml b/upload/admin/applications/core/xml/hooks.xml
index 526aefe4..39559ea9 100644
--- a/upload/admin/applications/core/xml/hooks.xml
+++ b/upload/admin/applications/core/xml/hooks.xml
@@ -4,16 +4,8 @@
 		<file>vkontakte.xml</file>
 		<enabled>1</enabled>
 	</hook>
-	<hook>
-		<file>unreadnotifications.xml</file>
-		<enabled>1</enabled>
-	</hook>
 	<hook>
 		<file>adcodesidebar.xml</file>
 		<enabled>1</enabled>
 	</hook>
-	<hook>
-		<file>sharelinks.xml</file>
-		<enabled>0</enabled>
-	</hook>
 </hooks>
\ No newline at end of file
diff --git a/upload/admin/applications/core/xml/hooks/adcodesidebar.xml b/upload/admin/applications/core/xml/hooks/adcodesidebar.xml
index 97006ee8..080ccc40 100644
--- a/upload/admin/applications/core/xml/hooks/adcodesidebar.xml
+++ b/upload/admin/applications/core/xml/hooks/adcodesidebar.xml
@@ -6,7 +6,7 @@
       <hook_desc>Вывод рекламы в правом блоке на главной �транице</hook_desc>
       <hook_author>Invision Power Services, Inc.</hook_author>
       <hook_email/>
-      <hook_website/>
+      <hook_website>http://www.invisionpower.com</hook_website>
       <hook_update_check/>
       <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
       <hook_version_human>1.0.0</hook_version_human>
diff --git a/upload/admin/applications/core/xml/hooks/index.html b/upload/admin/applications/core/xml/hooks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/xml/hooks/index.html
+++ b/upload/admin/applications/core/xml/hooks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/xml/hooks/sharelinks.xml b/upload/admin/applications/core/xml/hooks/sharelinks.xml
deleted file mode 100644
index 3e8b066e..00000000
--- a/upload/admin/applications/core/xml/hooks/sharelinks.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<hookexport>
-  <hookdata>
-    <config>
-      <hook_name>Опубликованные ��ылки</hook_name>
-      <hook_desc>Вывод информации о по�ледних опубликованных ��ылках</hook_desc>
-      <hook_author>Invision Power Services</hook_author>
-      <hook_email/>
-      <hook_website/>
-      <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long>10001</hook_version_long>
-      <hook_extra_data><![CDATA[a:1:{s:8:"database";a:0:{}}]]></hook_extra_data>
-      <hook_key>sharelinks</hook_key>
-    </config>
-  </hookdata>
-  <hookfiles>
-    <file>
-      <hook_file_real>boardIndexShareLinks.php</hook_file_real>
-      <hook_type>templateHooks</hook_type>
-      <hook_classname>boardIndexShareLinks</hook_classname>
-      <hook_data><![CDATA[a:7:{s:12:"dataLocation";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:11:"skin_boards";s:12:"skinFunction";s:18:"boardIndexTemplate";s:4:"type";s:7:"foreach";s:2:"id";s:11:"side_blocks";s:8:"position";s:9:"outer.pre";}]]></hook_data>
-      <hooks_source><![CDATA[<?php
-
-class boardIndexShareLinks
-{
-	private $hookGateway;
-	
-	public function __construct()
-	{
-		$registry    =  ipsRegistry::instance();
-		
-		require_once( IPSLib::getAppDir( 'core' ) . '/sources/classes/hooks/gateway.php' );
-		$this->hookGateway = new core_hookGateway( $registry );
-	}
-	
-	public function getOutput()
-	{
-		return $this->hookGateway->shareLinks();
-	}	
-}]]></hooks_source>
-    </file>
-  </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language/>
-  <hookextras_modules/>
-  <hookextras_help/>
-  <hookextras_templates/>
-  <hookextras_css/>
-  <hookextras_tasks/>
-  <hookextras_database_create/>
-  <hookextras_database_alter/>
-  <hookextras_database_update/>
-  <hookextras_database_insert/>
-</hookexport>
diff --git a/upload/admin/applications/core/xml/hooks/unreadnotifications.xml b/upload/admin/applications/core/xml/hooks/unreadnotifications.xml
deleted file mode 100644
index 803da0a6..00000000
--- a/upload/admin/applications/core/xml/hooks/unreadnotifications.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<hookexport>
-  <hookdata>
-    <config>
-      <hook_name>Уведомлени�</hook_name>
-      <hook_desc>Вывод не прочитанных уведомлений пользвател� на главной �транице</hook_desc>
-      <hook_author>Invision Power Services, Inc</hook_author>
-      <hook_email/>
-      <hook_website/>
-      <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:31000;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long>10000</hook_version_long>
-      <hook_extra_data><![CDATA[a:2:{s:7:"display";N;s:8:"database";a:0:{}}]]></hook_extra_data>
-      <hook_key>unread_notifications</hook_key>
-    </config>
-  </hookdata>
-  <hookfiles>
-    <file>
-      <hook_file_real>boardIndexNotifications.php</hook_file_real>
-      <hook_type>templateHooks</hook_type>
-      <hook_classname>boardIndexNotifications</hook_classname>
-      <hook_data><![CDATA[a:7:{s:12:"dataLocation";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:11:"skin_boards";s:12:"skinFunction";s:18:"boardIndexTemplate";s:4:"type";s:7:"foreach";s:2:"id";s:11:"side_blocks";s:8:"position";s:9:"outer.pre";}]]></hook_data>
-      <hooks_source><![CDATA[<?php
-
-class boardIndexNotifications
-{
-	public $registry;
-	
-	public function __construct()
-	{
-        /* Make registry objects */
-		$this->registry		=  ipsRegistry::instance();
-		$this->memberData	=& $this->registry->member()->fetchMemberData();
-	}
-	
-	public function getOutput()
-	{
-		//-----------------------------------------
-		// Notifications library
-		//-----------------------------------------
-		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
-		$notifyLibrary->setMember( $this->memberData );
-		return $notifyLibrary->getBoardIndexHook();
-	}
-}]]></hooks_source>
-    </file>
-  </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language/>
-  <hookextras_modules/>
-  <hookextras_help/>
-  <hookextras_templates/>
-  <hookextras_css/>
-  <hookextras_tasks/>
-  <hookextras_database_create/>
-  <hookextras_database_alter/>
-  <hookextras_database_update/>
-  <hookextras_database_insert/>
-</hookexport>
diff --git a/upload/admin/applications/core/xml/hooks/vkontakte.xml b/upload/admin/applications/core/xml/hooks/vkontakte.xml
index 583042d0..e6122009 100644
--- a/upload/admin/applications/core/xml/hooks/vkontakte.xml
+++ b/upload/admin/applications/core/xml/hooks/vkontakte.xml
@@ -5,31 +5,32 @@
       <hook_name>Формы авторизации Vkontakte</hook_name>
       <hook_desc>Добавление форм Vkontakte в шаблоны</hook_desc>
       <hook_author>IBResource, LTD</hook_author>
-      <hook_email/>
-      <hook_website/>
+      <hook_email>sales@ibresource.ru</hook_email>
+      <hook_website>http://www.ibresource.ru</hook_website>
       <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.1</hook_version_human>
-      <hook_version_long>10001</hook_version_long>
-      <hook_extra_data><![CDATA[a:3:{s:7:"display";a:2:{s:9:"templates";s:97:"От skin_vkontakte: membersVkontakteConnect, showLoginVkFrame, vkUserBoxes, vkUserBoxPlaceholder";s:8:"language";s:38:"От core_admin_js: bit_skin_vkontakte";}s:9:"templates";a:1:{s:14:"skin_vkontakte";a:4:{s:0:"";s:23:"membersVkontakteConnect";i:1;s:16:"showLoginVkFrame";i:2;s:11:"vkUserBoxes";i:3;s:20:"vkUserBoxPlaceholder";}}s:8:"language";a:1:{s:13:"core_admin_js";a:1:{s:0:"";s:18:"bit_skin_vkontakte";}}}]]></hook_extra_data>
+      <hook_requirements><![CDATA[a:3:{s:21:"required_applications";a:0:{}s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
+      <hook_version_human>1.1.0</hook_version_human>
+      <hook_version_long>10010</hook_version_long>
+      <hook_extra_data><![CDATA[a:5:{s:7:"display";a:3:{s:9:"templates";s:81:"От skin_vkontakte: membersVkontakteConnect, vkInlineLogInService, vkServicesLim";s:8:"language";s:38:"От core_admin_js: bit_skin_vkontakte";s:8:"settings";s:73:"Группа на�троек: Интеграци� � Вконтакте";}s:9:"templates";a:1:{s:14:"skin_vkontakte";a:3:{s:0:"";s:23:"membersVkontakteConnect";i:1;s:20:"vkInlineLogInService";i:2;s:13:"vkServicesLim";}}s:8:"database";a:0:{}s:13:"settingGroups";a:1:{s:0:"";s:2:"vk";}s:8:"settings";a:0:{}}]]></hook_extra_data>
       <hook_key>ibr_vkontakte_forms</hook_key>
+      <hook_global_caches/>
     </config>
   </hookdata>
   <hookfiles>
     <file>
       <hook_file_real>vkontakte.php</hook_file_real>
       <hook_type>templateHooks</hook_type>
-      <hook_classname>vk_frame</hook_classname>
-      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:10:"skin_login";s:12:"skinFunction";s:13:"showLogInForm";s:4:"type";s:2:"if";s:2:"id";s:12:"toggleOpenId";s:8:"position";s:10:"post.endif";}]]></hook_data>
+      <hook_classname>vk_register_form</hook_classname>
+      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:13:"skin_register";s:12:"skinFunction";s:12:"registerForm";s:4:"type";s:2:"if";s:2:"id";s:10:"twitterBox";s:8:"position";s:10:"post.endif";}]]></hook_data>
       <hooks_source><![CDATA[<?php
 
-class vk_frame
+class vk_register_form
 {
 	public function getOutput()
 	{
         if( IPSLib::loginMethod_enabled('vkontakte') === true )
         {
-            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkUserBoxes();
+            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkInlineLogInService();
         }
 	}
 }]]></hooks_source>
@@ -47,7 +48,7 @@ class vk_lim
 	{
         if( IPSLib::loginMethod_enabled('vkontakte') === true )
         {
-            return " " . ipsRegistry::instance()->output->getReplacement('lim_vkontakte');
+            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkServicesLim();
         }
 	}
 }]]></hooks_source>
@@ -55,248 +56,231 @@ class vk_lim
     <file>
       <hook_file_real>vkontakte.php</hook_file_real>
       <hook_type>templateHooks</hook_type>
-      <hook_classname>vk_button</hook_classname>
-      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:10:"skin_login";s:12:"skinFunction";s:13:"showLogInForm";s:4:"type";s:2:"if";s:2:"id";s:10:"twitterBox";s:8:"position";s:11:"pre.startif";}]]></hook_data>
+      <hook_classname>vk_login_form</hook_classname>
+      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:10:"skin_login";s:12:"skinFunction";s:13:"showLogInForm";s:4:"type";s:2:"if";s:2:"id";s:10:"twitterBox";s:8:"position";s:10:"post.endif";}]]></hook_data>
       <hooks_source><![CDATA[<?php
 
-class vk_button
+class vk_login_form
 {
 	public function getOutput()
 	{
         if( IPSLib::loginMethod_enabled('vkontakte') === true )
         {
-            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkUserBoxPlaceholder();
+            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkInlineLogInService();
+        }
+	}
+}]]></hooks_source>
+    </file>
+    <file>
+      <hook_file_real>vkontakte.php</hook_file_real>
+      <hook_type>templateHooks</hook_type>
+      <hook_classname>vk_ajax_login_form</hook_classname>
+      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:10:"skin_login";s:12:"skinFunction";s:21:"ajax__inlineLogInForm";s:4:"type";s:2:"if";s:2:"id";s:10:"twitterBox";s:8:"position";s:10:"post.endif";}]]></hook_data>
+      <hooks_source><![CDATA[<?php
+
+class vk_ajax_login_form
+{
+	public function getOutput()
+	{
+        if( IPSLib::loginMethod_enabled('vkontakte') === true )
+        {
+            return ipsRegistry::instance()->output->getTemplate('vkontakte')->vkInlineLogInService();
         }
 	}
 }]]></hooks_source>
     </file>
   </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language>
-    <language>
-      <word_app>core</word_app>
-      <word_pack>admin_js</word_pack>
-      <word_key>bit_skin_vkontakte</word_key>
-      <word_default>Формы дл� Вконтакте</word_default>
-      <word_custom/>
-      <word_js>0</word_js>
-    </language>
-  </hookextras_language>
+  <hookextras_settings>
+    <setting>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_title>Интеграци� � Вконтакте</conf_title_title>
+      <conf_title_desc>�а�тройки дл� �оединени� � Вконтакте</conf_title_desc>
+      <conf_title_noshow>0</conf_title_noshow>
+      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_title_app>core</conf_title_app>
+      <conf_title_tab>System</conf_title_tab>
+    </setting>
+    <setting>
+      <conf_id>38</conf_id>
+      <conf_title>ID приложени�</conf_title>
+      <conf_description>ID выдает�� по�ле �оздани� приложени� Вконтакте.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>vk_api_id</conf_key>
+      <conf_value/>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>2</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_id>37</conf_id>
+      <conf_title>Включить �оединение � Вконтакте?</conf_title>
+      <conf_description><![CDATA[Первоначально вам �ЕОБХОДИМО �оздать приложение Вконтакте. Сделать �то можно <a href="http://vkontakte.ru/apps.php?act=add&site=1">зде�ь</a>]]></conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>vk_enabled</conf_key>
+      <conf_value/>
+      <conf_default>0</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>1</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords>vk, vkontakte</conf_keywords>
+      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_id>41</conf_id>
+      <conf_title>Пользователь�ка� группа по умолчанию</conf_title>
+      <conf_description>В �ту группу будут попадать в�е пользователи, �оздавшие �вой аккаунт на форуме через аккаунт Вконтакте. Опци� не ра�про�тран�ет �воего дей�тви� на пользователей, которые добавили �вой Вконтакте аккаунт по�ле обычной реги�трации на форуме.</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>vk_mgid</conf_key>
+      <conf_value/>
+      <conf_default>3</conf_default>
+      <conf_extra>#show_groups#</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_id>40</conf_id>
+      <conf_title>Защищенный ключ</conf_title>
+      <conf_description>Защищенный ключ выдает�� по�ле �оздани� приложени� Вконтакте</conf_description>
+      <conf_group>5</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>vk_secret</conf_key>
+      <conf_value/>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>vk</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+  </hookextras_settings>
+  <hookextras_language/>
   <hookextras_modules/>
   <hookextras_help/>
   <hookextras_templates>
     <templates>
-      <template_set_id>0</template_set_id>
       <template_group>skin_vkontakte</template_group>
-      <template_content/>
-      <template_name>membersVkontakteConnect</template_name>
-      <template_data/>
-      <template_updated>1280738635</template_updated>
-      <template_removable>1</template_removable>
-      <template_added_to>1</template_added_to>
-      <template_user_added>1</template_user_added>
-      <template_user_edited>1</template_user_edited>
-      <template_master_key/>
-      <template_set_type/>
-    </templates>
-    <templates>
-      <template_set_id>1</template_set_id>
-      <template_group>skin_vkontakte</template_group>
-      <template_content><![CDATA[{parse js_module="vkontakte"}
-{parse striping="usercp" classes="row1,row2"}
+      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
 
 <if test="!$isConnected">
 <div>
-<div id='vkUserBox'></div>
-<iframe id="vk_frame" src="{$this->settings['_original_base_url']}/interface/vkontakte/index.php" style='position:absolute;top: -1000px;'></iframe>
-
-<!--VK Template-->
-<div id='vk-template-button' style='display:none'>
-	{$this->lang->words['vkontakte_config']}
-	<br /><br />
-	<a href="#" id="vk_login"><img src="{$this->settings['img_url']}/vkontakte_login.png" alt="" /></a>
-</div>
-<div id='vk-template-main' style='display:none'>
-	<fieldset class='row2'>
-		<div style='float:left; margin-right:4px;margin-bottom:3px'>
-			<a href="#" id="openapi_userlink"><img src="http://vkontakte.ru/images/question_c.gif" id="openapi_userphoto" /></a>
-		</div>
-		{$this->lang->words['vk_logged_in']} <strong id="openapi_user"></strong> 
-	</fieldset>
-</div>
-<div id='vk-template-linked' style='display:none'>
-	<div class='desc'>
-		{$this->lang->words['vk_logged_in']}
-	</div>
-
-	<form action='
-{$this->settings['_original_base_url']}/interface/vkontakte/index.php' method='post' name='linkForm' id='vk_linkForm'>
-		<input type='button' class='input_submit' id='vk_link' value='Св�зать � учетной запи�ью форума' />
-	</form>
-</div>
-
+	<p class='message'>{$this->lang->words['vk_config']}</p>
+	<br />
+	<br />
+	<a href="{$this->settings['_original_base_url']}/interface/vkontakte/index.php"><img src="{$this->settings['img_url']}/vkontakte_login.png" alt="" /></a>
+	<br />
 </div>
 <else />
 <div>
-	<fieldset class='row1'>
-		<if test="vkPassword:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
-			<div class='message'>
-				<strong>{$this->lang->words['remote_no_password']}</strong>
-				<p>{$this->lang->words['remote_no_password_1']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=password" base="public"}'>{$this->lang->words['remote_no_password_2']}</a>
-				</p>
-			</div>
-			<br />
+	<div class='ipsPad row2 clearfix'>
+		<if test="vkHasPic:|:$userData['photo']">	
+			<img src="{$userData['photo']}" alt='' class='left ipsUserPhoto ipsUserPhoto_medium' />
+			<div class='ipsBox_withphoto'>
 		</if>
-		<h3>{$this->lang->words['vk_disassociate']}</h3>
-		<p>{$this->lang->words['vk_revoke']}</p>
-		<p class='desc'>{$this->lang->words['vk_disassociate_desc']}</p>
-		<p><input type='button' class='input_submit alt' id='tc_remove' value='{$this->lang->words['tc_disassociate_now']}' /></p>
-	</fieldset>
+		<h2 class='ipsType_subtitle'>
+			{$this->lang->words['vk_logged_in_as']} <strong>{$userData['first_name']} {$userData['last_name']}</strong>
+		</h2>
+		<if test="tcHasPic:|:$userData['photo']">
+			</div>
+		</if>
+	</div>
+
+	<br />
+	<div class='right row2 ipsPad clearfix' style='width: 250px'>
+		<input type='button' class='ipsButton_secondary' id='vk_remove_start' value='{$this->lang->words['vk_disassociate']}' />
+
+		<div id='vk_remove_popup' style='display: none'>
+			<h3>{$this->lang->words['vk_disassociate']}</h3>
+			<div class='ipsPad'>
+				<p>{$this->lang->words['vk_revoke']}</p>
+				<p class='desc'>{$this->lang->words['vk_disassociate_desc']}</p>
+				<br />
+				<input type='button' class='ipsButton' id='vk_remove' value='{$this->lang->words['tc_disassociate_now']}' />
+			</div>
+		</div>
+	</div>
+
+	<if test="vkPassword:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
+		<div class='message'>
+			<strong>{$this->lang->words['remote_no_password']}</strong>
+			<p>{$this->lang->words['remote_no_password_1']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=password" base="public"}'>{$this->lang->words['remote_no_password_2']}</a>
+			</p>
+		</div>
+		<br />
+	</if>
 </div>
 <script type="text/javascript">
-ipb.vkontakte.initUserCP();
+	$('vk_remove').observe( 'click', usercp_remove );
+	function usercp_remove(){
+		window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=core&area=vkontakteRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
+	}
+
+	$('vk_remove_start').on('click', function(e){
+		new ipb.Popup( 'sign_in_popup', {	type: 'pane',
+											initial: $('vk_remove_popup').show(),
+											hideAtStart: false,
+											hideClose: false,
+											modal: true,
+											w: '600px' } );
+	});
 </script>
 </if>
 ]]></template_content>
       <template_name>membersVkontakteConnect</template_name>
-      <template_data>$isConnected</template_data>
+      <template_data>$isConnected, $userData</template_data>
       <template_updated>1280738657</template_updated>
       <template_removable>1</template_removable>
       <template_added_to>1</template_added_to>
       <template_user_added>1</template_user_added>
-      <template_user_edited>1</template_user_edited>
-      <template_master_key/>
-      <template_set_type/>
-    </templates>
-    <templates>
-      <template_set_id>0</template_set_id>
-      <template_group>skin_vkontakte</template_group>
-      <template_content><![CDATA[<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>Open API IPB Gateway</title>
-    <script language="JavaScript" src="http://vkontakte.ru/js/common.js"></script>
-  </head>
-  <body>
-    <div id="vk_api_transport" style="display:none"></div>
-
-    <script type="text/javascript">
-        function doLogin() {
-            VK.Auth.login(
-                null,
-                VK.access.FRIENDS | VK.access.WIKI
-            );
-        }
-        
-        function doLogout() {
-            VK.Auth.logout( function() { window.location.reload(); });
-        }
-
-        function onAuthLogin(data) {
-            var 
-                code = 'return {';
-                code += 'u: API.getProfiles({uids: API.getVariable({key: 1280}), fields: "photo"})[0]';
-                code += '};';
-
-            VK.Api.call('execute', {'code': code}, function( d ){ 
-                    memberInfo = { 'id': d.response.u.uid,
-                                   'name': d.response.u.first_name + ' ' + d.response.u.last_name,
-                                   'photo': d.response.u.photo
-                    };
-
-                    parent.window.ipb.vkontakte.loadUser( memberInfo );
-
-             } );
-        }
-
-        window.vkAsyncInit = function() {
-            VK.Observer.subscribe('auth.login', onAuthLogin);
-
-            VK.init({
-                apiId:{$this->settings['vk_api_id']},
-                nameTransportPath: '{$this->settings['_path_from_root']}/interface/vkontakte/xd_receiver.htm'
-            });
-
-            onDomReady( parent.window.ipb.vkontakte.show_loginButton );
-          };
-
-          (function() {
-            var el = document.createElement('script');
-            el.type = 'text/javascript';
-            el.src = '<if test="$this->settings['logins_over_https']">{parse expression="str_replace('http://', 'https://', $this->settings['_original_base_url'])"}/interface/vkontakte/openapi.js.php<else />http://vkontakte.ru/js/api/openapi.js</if>';
-            el.async = true;
-            document.getElementById('vk_api_transport').appendChild(el);
-          }());
-    </script>
-  </body>
-</html>]]></template_content>
-      <template_name>showLoginVkFrame</template_name>
-      <template_data><![CDATA[$hash='']]></template_data>
-      <template_updated>1279887574</template_updated>
-      <template_removable>1</template_removable>
-      <template_added_to>1</template_added_to>
-      <template_user_added>1</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>root</template_master_key>
-      <template_set_type/>
     </templates>
     <templates>
-      <template_set_id>0</template_set_id>
       <template_group>skin_vkontakte</template_group>
-      <template_content><![CDATA[<script language="JavaScript" src="{$this->settings['_original_base_url']}/public/js/ips.vkontakte.js"></script>
-
-<iframe id="vk_frame" src="<if test="$this->settings['logins_over_https']">{parse expression="str_replace('http://', 'https://', $this->settings['_original_base_url'])"}<else />{parse expression="$this->settings['_original_base_url']"}</if>/interface/vkontakte/index.php" style='position:absolute;top: -1000px;'></iframe>
-
-<!--VK Template-->
-<div id='vk-template-button' style='display:none'>
-	{$this->lang->words['login_w_vkontakte']}
-	<br /><br />
-        <a href="#" id="vk_login"><img src="{$this->settings['img_url']}/vkontakte_login.png" alt="" /></a>
-</div>
-<div id='vk-template-main' style='display:none'>
-	<div style='float:left; margin-right:4px;margin-bottom:3px'>
-		<a href="#" id="openapi_userlink"><img src="http://vkontakte.ru/images/question_c.gif" id="openapi_userphoto" /></a>
-	</div>
-	{$this->lang->words['welcome_prefix']} <span id="openapi_user"></span>
-</div>
-<div id='vk-template-linked' style='display:none'>
-	<div class='desc'>
-		{$this->lang->words['vk_logged_in']}
-	</div>
-	<br clear='both'/>
-	<form action='<if test="$this->settings['logins_over_https']">{parse expression="str_replace('http://', 'https://', $this->settings['_original_base_url'])"}<else />{parse expression="$this->settings['_original_base_url']"}</if>/interface/vkontakte/index.php' method='post' name='linkForm' id='vk_linkForm'>
-		<input type='button' class='input_submit' id='vk_complete' value='{$this->lang->words['vk_complete_login']}' />
-	</form>
-</div>]]></template_content>
-      <template_name>vkUserBoxes</template_name>
+      <template_content><![CDATA[<li><a href="{$this->settings['_original_base_url']}/interface/vkontakte/index.php?_reg=1"><img src="{$this->settings['img_url']}/vkontakte_login.png" alt="" /></a></li>]]></template_content>
+      <template_name>vkInlineLogInService</template_name>
       <template_data/>
-      <template_updated>1279887617</template_updated>
+      <template_updated>1311665029</template_updated>
       <template_removable>1</template_removable>
       <template_added_to>1</template_added_to>
       <template_user_added>1</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>root</template_master_key>
-      <template_set_type/>
     </templates>
     <templates>
-      <template_set_id>0</template_set_id>
       <template_group>skin_vkontakte</template_group>
-      <template_content><![CDATA[			<h3 class='bar'>{$this->lang->words['vk_login_title']}</h3>
-			<p>
-				<div id='vkUserBox'>
-				</div>
-				<br clear='both' />
-			</p>
-			<br />]]></template_content>
-      <template_name>vkUserBoxPlaceholder</template_name>
+      <template_content><![CDATA[<a href='{parse url="app=core&amp;module=global&amp;section=login&amp;serviceClick=vkontakte" base="public"}'>{parse replacement="lim_vkontakte"}</a>]]></template_content>
+      <template_name>vkServicesLim</template_name>
       <template_data/>
-      <template_updated>1279887584</template_updated>
+      <template_updated>1311664820</template_updated>
       <template_removable>1</template_removable>
       <template_added_to>1</template_added_to>
       <template_user_added>1</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>root</template_master_key>
-      <template_set_type/>
     </templates>
   </hookextras_templates>
   <hookextras_css/>
diff --git a/upload/admin/applications/core/xml/index.html b/upload/admin/applications/core/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/core/xml/index.html
+++ b/upload/admin/applications/core/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/core/xml/information.xml b/upload/admin/applications/core/xml/information.xml
index 14047da8..b522f24e 100644
--- a/upload/admin/applications/core/xml/information.xml
+++ b/upload/admin/applications/core/xml/information.xml
@@ -3,9 +3,14 @@
 	<data>
 		<name>Си�тема</name>
 		<public_name>Помощь</public_name>
+        <hide_tab>0</hide_tab>
 		<author>Invision Power Services, Inc.</author>
 		<description>Базовый модуль</description>
-		<templategroups>
+		<disabledatinstall>0</disabledatinstall>
+    <global_caches/>
+    <website/>
+    <update_check/>
+    <templategroups>
 			<template match="exact">skin_editors</template>
 			<template match="exact">skin_emails</template>
 			<template match="exact">skin_global</template>
@@ -17,6 +22,7 @@
 			<template match="exact">skin_reports</template>
 			<template match="exact">skin_search</template>
 			<template match="exact">skin_stats</template>
-		</templategroups>
+		<template match="exact">skin_modcp</template>
+    </templategroups>
 	</data>
 </information>
\ No newline at end of file
diff --git a/upload/admin/applications/core/xml/public_core_language_pack.xml b/upload/admin/applications/core/xml/public_core_language_pack.xml
index 7c8e295b..be8c45bc 100644
--- a/upload/admin/applications/core/xml/public_core_language_pack.xml
+++ b/upload/admin/applications/core/xml/public_core_language_pack.xml
@@ -1,115 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <languageexport>
   <languagegroup>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>mq_image_add</word_key>
-      <word_default>MultiQuote</word_default>
-      <word_custom>Цитата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>comment_reply</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>permalink</word_key>
-      <word_default>Permalink:</word_default>
-      <word_custom>С�ылка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>view_it_anyway</word_key>
-      <word_default>View it anyway?</word_default>
-      <word_custom>По�мотреть?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>view_comment</word_key>
-      <word_default>View comment</word_default>
-      <word_custom>По�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_comments</word_pack>
-      <word_key>ignored_comments_not</word_key>
-      <word_default>This comment is hidden because you have chosen to ignore posts by</word_default>
-      <word_custom>Комментарий �крыт, так как вы игнорируете �ообщени� от </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
       <word_key>comments_header</word_key>
       <word_default>Comments</word_default>
       <word_custom>Комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>edit_link</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mobile_add_comment</word_key>
+      <word_default>Add Comment</word_default>
+      <word_custom>Добавить комментарий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>delete_link</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>comment_approval_required</word_key>
+      <word_default>Your comment requires moderator approval before it will be shown.</word_default>
+      <word_custom>Ваш комментарий должен быть проверен модератором.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>delete_comment</word_key>
-      <word_default>Delete comment</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>click here to login</word_key>
+      <word_default>click here to log in</word_default>
+      <word_custom>нажмите чтобы войти</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>edit_comment</word_key>
-      <word_default>Editing comment from:</word_default>
-      <word_custom>Редактирование комментари� от:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>comment_permalink</word_key>
+      <word_default>Get the permalink</word_default>
+      <word_custom>Получить пр�мую ��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>comm_confirm_delete</word_key>
+      <word_default>Confirm Delete</word_default>
+      <word_custom>Подтверждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>del_comm_now</word_key>
+      <word_default>Delete comment now</word_default>
+      <word_custom>Удалить комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>comm_confirm_delete_desc</word_key>
+      <word_default>Are you sure you want to delete this comment?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тот комментарий?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>comment_action_count</word_key>
+      <word_default><![CDATA[With <span id='comment_count'>#{count}</span> checked comments:]]></word_default>
+      <word_custom><![CDATA[С <span id='comment_count'>#{count}</span> отмеченными комментари�ми:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>manage_comments_pop</word_key>
+      <word_default>Manage Comments</word_default>
+      <word_custom>Управление комментари�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>approve_x_comments</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Опубликовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>unapprove_x_comments</word_key>
+      <word_default>Un-approve</word_default>
+      <word_custom>Скрыть</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -117,49 +91,69 @@
       <word_key>comment_save</word_key>
       <word_default>Save</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>report_link</word_key>
-      <word_default>Report</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>comments_act_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>ОК</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>check_all</word_key>
-      <word_default>Check all</word_default>
-      <word_custom>Выбрать в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>delete_x_comments</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>comment_button_post</word_key>
-      <word_default>Add Comment</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>edit_comment</word_key>
+      <word_default>Editing comment from:</word_default>
+      <word_custom>Редактирование комментари� от:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_comments</word_pack>
-      <word_key>comment_notice_subject</word_key>
-      <word_default><![CDATA[A new comment has been left on <a href='%s'>%s</a>]]></word_default>
-      <word_custom><![CDATA[Добавлен комментарий <a href='%s'>%s</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>delete_comment</word_key>
+      <word_default>Delete comment</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>view_it_anyway</word_key>
+      <word_default>View it anyway?</word_default>
+      <word_custom>По�мотреть?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>view_comment</word_key>
+      <word_default>View comment</word_default>
+      <word_custom>По�мотреть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>ignored_comments_not</word_key>
+      <word_default>This comment is hidden because you have chosen to ignore posts by</word_default>
+      <word_custom>Комментарий �крыт, так как вы игнорируете �ообщени� от </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>edit_link</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>delete_link</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -181,609 +175,181 @@ You can review the new comment here:
 
 Коментарий ра�положен по �ледующему адре�у:
 <#URL#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>editor_unloaded_atm</word_key>
-      <word_default>Tip: click inside this box to load the editor</word_default>
-      <word_custom>�ажмите дл� загрузки тек�тового редактора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_comments</word_pack>
+      <word_key>check_all</word_key>
+      <word_default>Check all</word_default>
+      <word_custom>Выбрать в�е</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>show_all_emotes</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>В�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_resizesmall</word_key>
-      <word_default>Decrease editor size</word_default>
-      <word_custom>Уменьшить размер редактора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_resizebig</word_key>
-      <word_default>Increase editor size</word_default>
-      <word_custom>Увеличить размер редактора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_list</word_key>
-      <word_default>Insert list</word_default>
-      <word_custom>В�тавить �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_jfull</word_key>
-      <word_default>Justify full</word_default>
-      <word_custom>Ра�т�нуть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_right</word_key>
-      <word_default>Align right</word_default>
-      <word_custom>По правому краю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_center</word_key>
-      <word_default>Align center</word_default>
-      <word_custom>По центру</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_left</word_key>
-      <word_default>Align left</word_default>
-      <word_custom>По левому краю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_outdent</word_key>
-      <word_default>Outdent</word_default>
-      <word_custom>Уменьшить от�туп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_indent</word_key>
-      <word_default>Indent</word_default>
-      <word_custom>Увеличить от�туп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_font_col</word_key>
-      <word_default>Text color</word_default>
-      <word_custom>Цвет тек�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_back_col</word_key>
-      <word_default>Background color</word_default>
-      <word_custom>Цвет фона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_underline</word_key>
-      <word_default>Underline</word_default>
-      <word_custom>Подчеркнутый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_bold</word_key>
-      <word_default>Bold</word_default>
-      <word_custom>Полужирный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_italic</word_key>
-      <word_default>Italic</word_default>
-      <word_custom>Кур�ив</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_redo</word_key>
-      <word_default>Redo</word_default>
-      <word_custom>Отменить ввод</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_other</word_key>
-      <word_default>Other styles</word_default>
-      <word_custom>Спец. �лементы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_undo</word_key>
-      <word_default>Undo</word_default>
-      <word_custom>Вернуть ввод</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_size</word_key>
-      <word_default>Sizes</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_font</word_key>
-      <word_default>Fonts</word_default>
-      <word_custom>Шрифт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_htmlsource</word_key>
-      <word_default>Toggle HTML source</word_default>
-      <word_custom>Отобразить HTML код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_noformat</word_key>
-      <word_default>Remove formatting</word_default>
-      <word_custom>Удалить форматирование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>override</word_key>
-      <word_default>0</word_default>
-      <word_custom/>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>the_max_length</word_key>
-      <word_default>0</word_default>
-      <word_custom/>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_switcheditor</word_key>
-      <word_default>Switch between standard and rich text editor</word_default>
-      <word_custom>Переключение между �тандартным и визуальным редакторами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_spellcheck</word_key>
-      <word_default>Spellcheck</word_default>
-      <word_custom>Проверить орфографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_emoticons</word_key>
-      <word_default>Emoticons</word_default>
-      <word_custom>Смайлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_other_desc</word_key>
-      <word_default>Other available styles</word_default>
-      <word_custom>Другие �тили</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_size_desc</word_key>
-      <word_default>Choose a font size</word_default>
-      <word_custom>Выберите размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>box_font_desc</word_key>
-      <word_default>Choose a font to use</word_default>
-      <word_custom>Выберите шрифт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_sup</word_key>
-      <word_default>Superscript</word_default>
-      <word_custom>Верхний индек�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_strike</word_key>
-      <word_default>Strikethrough</word_default>
-      <word_custom>Зачеркнутый</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_sub</word_key>
-      <word_default>Subscript</word_default>
-      <word_custom>�ижний индек�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_media</word_key>
-      <word_default>Insert media</word_default>
-      <word_custom>Медиа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_code</word_key>
-      <word_default>Insert code snippet</word_default>
-      <word_custom>Код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_quote</word_key>
-      <word_default>Insert quotation</word_default>
-      <word_custom>Цитата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_email</word_key>
-      <word_default>Insert email address</word_default>
-      <word_custom>В�тавить адре� �лектронной почты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_link</word_key>
-      <word_default>Insert link</word_default>
-      <word_custom>В�тавить ��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_image</word_key>
-      <word_default>Insert image</word_default>
-      <word_custom>В�тавить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_tt_help</word_key>
-      <word_default>Help</word_default>
-      <word_custom>помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>show_all_emoticons</word_key>
-      <word_default>Show all emoticons</word_default>
-      <word_custom>Показать в�е �майлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>use_full_editor</word_key>
-      <word_default>Use Full Editor</word_default>
-      <word_custom>Ра�ширенна� форма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>show_edited_by</word_key>
-      <word_default><![CDATA[Show 'Edit by' line]]></word_default>
-      <word_custom>Добавить надпи�ь «Отредактировано...»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>save_changes</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>reason_for_edit</word_key>
-      <word_default>Reason for edit:</word_default>
-      <word_custom>Причина редактировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_template_update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_template_cancel_source</word_key>
-      <word_default>Cancel Source Edit</word_default>
-      <word_custom>Отключить редактирование кода</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_editors</word_pack>
-      <word_key>js_template_add</word_key>
-      <word_default>Add</word_default>
+      <word_pack>public_comments</word_pack>
+      <word_key>comment_button_post</word_key>
+      <word_default>Add Comment</word_default>
       <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>comment_notice_subject</word_key>
+      <word_default><![CDATA[A new comment has been left on <a href='%s'>%s</a>]]></word_default>
+      <word_custom><![CDATA[Добавлен комментарий <a href='%s'>%s</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>report_link</word_key>
+      <word_default>Report</word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>reply_to_comment</word_key>
+      <word_default>Reply directly to this comment</word_default>
+      <word_custom>Ответить на комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>mq_image_add</word_key>
+      <word_default>MultiQuote</word_default>
+      <word_custom>Цитата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>permalink</word_key>
+      <word_default>Permalink:</word_default>
+      <word_custom>С�ылка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>comment_reply</word_key>
+      <word_default>Quote</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_comments</word_pack>
+      <word_key>yourname_captcha</word_key>
+      <word_default>Your Name:</word_default>
+      <word_custom>Ваше им�:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_example</word_key>
-      <word_default>Example</word_default>
-      <word_custom>Пример</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_context_menu</word_key>
+      <word_default>Editor context menu</word_default>
+      <word_custom>Контек�тное меню</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_insert_media</word_key>
-      <word_default>Insert Media</word_default>
-      <word_custom>добавить медиа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_options</word_key>
+      <word_default>Editor Options</word_default>
+      <word_custom>Опции</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_media_url</word_key>
-      <word_default>Media URL</word_default>
-      <word_custom>Медиа URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_context_menu_crc</word_key>
+      <word_default>CONTROL + Right click</word_default>
+      <word_custom>CONTROL + Клик правой кнопкой</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_insert_email</word_key>
-      <word_default>Insert Email</word_default>
-      <word_custom>В�тавить e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_context_menu_rc</word_key>
+      <word_default>Right click</word_default>
+      <word_custom>Клик правой кнопкой</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_email_me</word_key>
-      <word_default>Email me</word_default>
-      <word_custom>Пишите мне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_ok</word_key>
+      <word_default>Ok</word_default>
+      <word_custom>Ок</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_email_url</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>�дре� �лектронной почты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>editor_clear_data</word_key>
+      <word_default>Clear my saved content</word_default>
+      <word_custom>Очи�тить �охраненное</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_insert_img</word_key>
-      <word_default>Insert Image</word_default>
-      <word_custom>В�тавить изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>added_to_editor</word_key>
+      <word_default>Added to editor</word_default>
+      <word_custom>Добавлено в редактор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_imageurl</word_key>
-      <word_default>Image URL</word_default>
-      <word_custom>URL дл� изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mymedia_finished</word_key>
+      <word_default>Finished</word_default>
+      <word_custom>Завершено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_insert_link</word_key>
-      <word_default>Insert Link</word_default>
-      <word_custom>В�тавить ��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>start_typing_sms</word_key>
+      <word_default>Search My Media...</word_default>
+      <word_custom>Пои�к в библиотеке</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_default</word_key>
-      <word_default>My link</word_default>
-      <word_custom>Мо� ��ылка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_string_reset</word_key>
+      <word_default>Clear Search</word_default>
+      <word_custom>Очи�тить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_editors</word_pack>
-      <word_key>js_template_link</word_key>
-      <word_default>Link text</word_default>
-      <word_custom>Тек�т ��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_string_search</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>no_mymedia_rows</word_key>
+      <word_default>We did not find any results in this category</word_default>
+      <word_custom>В данной категории ничего не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>sharedmedia_events</word_key>
+      <word_default>Events</word_default>
+      <word_custom>Событи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>sharedmedia_attachments</word_key>
+      <word_default>Attachments</word_default>
+      <word_custom>Прикрепленные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>sharedmedia_h4title</word_key>
+      <word_default>Media Types</word_default>
+      <word_custom>Медиа-типы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>mymedia_title</word_key>
+      <word_default>Your Media Library</word_default>
+      <word_custom>Ваша медиа-библиотека</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -791,299 +357,440 @@ You can review the new comment here:
       <word_key>js_template_url</word_key>
       <word_default>URL</word_default>
       <word_custom>URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>shareable_media_warn</word_key>
+      <word_default><![CDATA[Media you have uploaded to the community is available here for sharing.<br /><strong>Content you share will be visible by <em>all</em> members who can view this topic.</strong><br /><br />Select a media type to choose what to share.]]></word_default>
+      <word_custom><![CDATA[В�е медиа-данные, что вы загружали в �и�тему до�тупны дл� публикации. <br /><strong>В�е что вы опубликуете будет до�тупно к про�мотру <em>в�ем</em> пользовател�м </strong><br /><br />Выберите тип медиа-данных который вы хотите опубликовать.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_link</word_key>
+      <word_default>Link text</word_default>
+      <word_custom>Тек�т ��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_default</word_key>
+      <word_default>My link</word_default>
+      <word_custom>Мо� ��ылка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_example</word_key>
+      <word_default>Example</word_default>
+      <word_custom>Пример</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_insert_media</word_key>
+      <word_default>Insert Media</word_default>
+      <word_custom>добавить медиа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_media_url</word_key>
+      <word_default>Media URL</word_default>
+      <word_custom>Медиа URL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_insert_email</word_key>
+      <word_default>Insert Email</word_default>
+      <word_custom>В�тавить e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_email_me</word_key>
+      <word_default>Email me</word_default>
+      <word_custom>Пишите мне</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_email_url</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>�дре� �лектронной почты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_insert_img</word_key>
+      <word_default>Insert Image</word_default>
+      <word_custom>В�тавить изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_imageurl</word_key>
+      <word_default>Image URL</word_default>
+      <word_custom>URL дл� изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_insert_link</word_key>
+      <word_default>Insert Link</word_default>
+      <word_custom>В�тавить ��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>show_edited_by</word_key>
+      <word_default><![CDATA[Show 'Edit by' line]]></word_default>
+      <word_custom>Добавить надпи�ь «Отредактировано...»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_template_cancel_source</word_key>
+      <word_default>Cancel Source Edit</word_default>
+      <word_custom>Отключить редактирование кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>use_full_editor</word_key>
+      <word_default>Use Full Editor</word_default>
+      <word_custom>Ра�ширенна� форма</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_help</word_key>
+      <word_default>Help</word_default>
+      <word_custom>помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>save_changes</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>show_all_emoticons</word_key>
+      <word_default>Show all emoticons</word_default>
+      <word_custom>Показать в�е �майлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_image</word_key>
+      <word_default>Insert image</word_default>
+      <word_custom>В�тавить изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_link</word_key>
+      <word_default>Insert link</word_default>
+      <word_custom>В�тавить ��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_email</word_key>
+      <word_default>Insert email address</word_default>
+      <word_custom>В�тавить адре� �лектронной почты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_quote</word_key>
+      <word_default>Insert quotation</word_default>
+      <word_custom>Цитата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_code</word_key>
+      <word_default>Insert code snippet</word_default>
+      <word_custom>Код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_strike</word_key>
+      <word_default>Strikethrough</word_default>
+      <word_custom>Зачеркнутый</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_sub</word_key>
+      <word_default>Subscript</word_default>
+      <word_custom>�ижний индек�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_media</word_key>
+      <word_default>Insert media</word_default>
+      <word_custom>Медиа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_sup</word_key>
+      <word_default>Superscript</word_default>
+      <word_custom>Верхний индек�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_font_desc</word_key>
+      <word_default>Choose a font to use</word_default>
+      <word_custom>Выберите шрифт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_size_desc</word_key>
+      <word_default>Choose a font size</word_default>
+      <word_custom>Выберите размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_other_desc</word_key>
+      <word_default>Other available styles</word_default>
+      <word_custom>Другие �тили</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_emoticons</word_key>
+      <word_default>Emoticons</word_default>
+      <word_custom>Смайлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>override</word_key>
+      <word_default>0</word_default>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>the_max_length</word_key>
+      <word_default>0</word_default>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_switcheditor</word_key>
+      <word_default>Switch between standard and rich text editor</word_default>
+      <word_custom>Переключение между �тандартным и визуальным редакторами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_spellcheck</word_key>
+      <word_default>Spellcheck</word_default>
+      <word_custom>Проверить орфографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_noformat</word_key>
+      <word_default>Remove formatting</word_default>
+      <word_custom>Удалить форматирование</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_size</word_key>
+      <word_default>Sizes</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_other</word_key>
+      <word_default>Other styles</word_default>
+      <word_custom>Спец. �лементы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>box_font</word_key>
+      <word_default>Fonts</word_default>
+      <word_custom>Шрифт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_htmlsource</word_key>
+      <word_default>Toggle HTML source</word_default>
+      <word_custom>Отобразить HTML код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_undo</word_key>
+      <word_default>Undo</word_default>
+      <word_custom>Вернуть ввод</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_redo</word_key>
+      <word_default>Redo</word_default>
+      <word_custom>Отменить ввод</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_bold</word_key>
+      <word_default>Bold</word_default>
+      <word_custom>Полужирный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_italic</word_key>
+      <word_default>Italic</word_default>
+      <word_custom>Кур�ив</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_underline</word_key>
+      <word_default>Underline</word_default>
+      <word_custom>Подчеркнутый</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_font_col</word_key>
+      <word_default>Text color</word_default>
+      <word_custom>Цвет тек�та</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_outdent</word_key>
+      <word_default>Outdent</word_default>
+      <word_custom>Уменьшить от�туп</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_back_col</word_key>
+      <word_default>Background color</word_default>
+      <word_custom>Цвет фона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_indent</word_key>
+      <word_default>Indent</word_default>
+      <word_custom>Увеличить от�туп</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_left</word_key>
+      <word_default>Align left</word_default>
+      <word_custom>По левому краю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_center</word_key>
+      <word_default>Align center</word_default>
+      <word_custom>По центру</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_right</word_key>
+      <word_default>Align right</word_default>
+      <word_custom>По правому краю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_list</word_key>
+      <word_default>Insert list</word_default>
+      <word_custom>В�тавить �пи�ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_jfull</word_key>
+      <word_default>Justify full</word_default>
+      <word_custom>Ра�т�нуть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_resizebig</word_key>
+      <word_default>Increase editor size</word_default>
+      <word_custom>Увеличить размер редактора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>js_tt_resizesmall</word_key>
+      <word_default>Decrease editor size</word_default>
+      <word_custom>Уменьшить размер редактора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>editor_unloaded_atm</word_key>
+      <word_default>Tip: click inside this box to load the editor</word_default>
+      <word_custom>�ажмите дл� загрузки тек�тового редактора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_editors</word_pack>
+      <word_key>show_all_emotes</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>В�е</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_emails</word_pack>
-      <word_key>email_sent_txt</word_key>
-      <word_default>Thanks, the email has been successfully sent to</word_default>
-      <word_custom>Спа�ибо, пи�ьмо у�пешно отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>fb_share_default</word_key>
+      <word_default>Share link with your own comment...</word_default>
+      <word_custom>Поделить�� ��ылкой � вашим комментарием...</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_emails</word_pack>
-      <word_key>member_address_title</word_key>
-      <word_default>Members Email Address</word_default>
-      <word_custom>E-mail адре� пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>msg_txt</word_key>
-      <word_default>Note: By using this form, the recipient will be able to view your email address</word_default>
-      <word_custom>Примечание: получатель пи�ьма узнает ваш e-mail адре� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>show_address_text</word_key>
-      <word_default><![CDATA[You can send this member an email by clicking on the link below. Invision Power Board does not show email addresses in the topic view to prevent email addresses being harvested by 'spam bots'.]]></word_default>
-      <word_custom>Дл� отправки e-mail пи�ьма пользователю во�пользуйте�ь размещенной ниже ��ылкой. IPB не показывает e-mail адре�а дл� защиты от �пам-ботов. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>send_email_to</word_key>
-      <word_default>Send an email to</word_default>
-      <word_custom>Отправка пи�ьма дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>title</word_key>
-      <word_default>Send a page to a friend</word_default>
-      <word_custom>Отправить ��ылку на �траницу другу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>redirect</word_key>
-      <word_default>The email has been sent</word_default>
-      <word_custom>Пи�ьмо отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>subject</word_key>
-      <word_default>Subject</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>message</word_key>
-      <word_default>Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>to_email</word_key>
-      <word_default>Send to (Email Address):</word_default>
-      <word_custom>Отправить на e-mail:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>submit_send</word_key>
-      <word_default>Send Email</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>to_name</word_key>
-      <word_default><![CDATA[Send to (Person's Name):]]></word_default>
-      <word_custom>Кому (им� друга):</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>send_lang</word_key>
-      <word_default>Send this email in</word_default>
-      <word_custom>Язык пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>no_subject</word_key>
-      <word_default>You must enter a subject for the email</word_default>
-      <word_custom>�еобходимо вве�ти тему пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>gen_error</word_key>
-      <word_default>You are not logged in or able to send emails</word_default>
-      <word_custom>Дл� и�пользовани� �той возможно�ти вы должны быть авторизованы и иметь необходимые права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>exceeded_flood</word_key>
-      <word_default>The mail could not be sent because you have already sent an email within the last %s minutes</word_default>
-      <word_custom>Вы не можете отправл�ть более одного пи�ьма в течение %s минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>no_message</word_key>
-      <word_default>You must enter some content for the email</word_default>
-      <word_custom>Вы должны вве�ти тек�т пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>exceeded_quota</word_key>
-      <word_default>The mail could not be sent because you have exceeded your alloted quota of %s emails a day</word_default>
-      <word_custom>Количе�тво разрешенных пи�ем в день - %s. Вы и�черпали данный лимит.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>imp_text</word_key>
-      <word_default>IMPORTANT: To prevent malicious use, all emails sent via this form are logged and the contents recorded and available to the administrators. DO NOT email user names, passwords or any personal details.</word_default>
-      <word_custom>В�Ж�О: дл� предотвращени� возможного неправомерного и�пользовани� данной возможно�ти, в�е пи�ьма, отправленные через �ту форму зано��т�� в �пециальный журнал, до�тупный админи�трации форума. �И В КОЕМ �лучае не отправл�йте пароли, логины или любую другую личную информацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>forum_langbit</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>topic_langbit</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>emailing_prefix</word_key>
-      <word_default>Emailing</word_default>
-      <word_custom>Пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>email_member</word_key>
-      <word_default>Email Member</word_default>
-      <word_custom>Отправить пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>tweet_ok</word_key>
-      <word_default>Your tweet was successful!</word_default>
-      <word_custom>Tweet отправлен!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>twitter_chrs_left</word_key>
-      <word_default>chars left. Shortened URL will be auto-added</word_default>
-      <word_custom> �имволов о�тало�ь. Сокращение ��ылок будет применено автоматиче�ки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>twitter_share</word_key>
-      <word_default>Share</word_default>
-      <word_custom>Поделить��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>share_via_twitter</word_key>
-      <word_default>Share Via Twitter</word_default>
-      <word_custom>Поделить�� через Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>email_sent</word_key>
-      <word_default>The email has been sent</word_default>
-      <word_custom>Пи�ьмо отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>facebook_share</word_key>
-      <word_default>Share</word_default>
-      <word_custom>Поделить��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>share_fb_name</word_key>
+      <word_default>Logged into Facebook as</word_default>
+      <word_custom>Вошли через Facebook как</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1091,19 +798,6 @@ You can review the new comment here:
       <word_key>share_via_facebook</word_key>
       <word_default>Share Via Facebook</word_default>
       <word_custom>Поделить�� через Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_emails</word_pack>
-      <word_key>fbc_comment_desc</word_key>
-      <word_default>You can optionally leave a comment below</word_default>
-      <word_custom>Вы можете о�тавить комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1111,9 +805,6 @@ You can review the new comment here:
       <word_key>facebook_post_ok</word_key>
       <word_default>The link was posted successfully</word_default>
       <word_custom>С�ылка была отправлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1121,29 +812,202 @@ You can review the new comment here:
       <word_key>err_reg_code</word_key>
       <word_default>The Captcha input was incorrect. Please try again.</word_default>
       <word_custom>Вы не правильно ввели защитный код. Пожалуй�та попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_emails</word_pack>
-      <word_key>email_friend</word_key>
-      <word_default>Use this feature to let a friend know about this topic!</word_default>
-      <word_custom>И�пользуйте �ту возможно�ть дл� отправки ��ылки на �ту тему друзь�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>twitter_share</word_key>
+      <word_default>Share</word_default>
+      <word_custom>Поделить��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_emails</word_pack>
-      <word_key>email_recepient</word_key>
-      <word_default>Recipient</word_default>
-      <word_custom>�дре�ат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>share_via_twitter</word_key>
+      <word_default>Share Via Twitter</word_default>
+      <word_custom>Поделить�� через Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>facebook_share</word_key>
+      <word_default>Share</word_default>
+      <word_custom>Поделить��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>fbc_comment_desc</word_key>
+      <word_default>You can optionally leave a comment below</word_default>
+      <word_custom>Вы можете о�тавить комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>imp_text</word_key>
+      <word_default>IMPORTANT: To prevent malicious use, all emails sent via this form are logged and the contents recorded and available to the administrators. DO NOT email user names, passwords or any personal details.</word_default>
+      <word_custom>В�Ж�О: дл� предотвращени� возможного неправомерного и�пользовани� данной возможно�ти, в�е пи�ьма, отправленные через �ту форму зано��т�� в �пециальный журнал, до�тупный админи�трации форума. �И В КОЕМ �лучае не отправл�йте пароли, логины или любую другую личную информацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>exceeded_flood</word_key>
+      <word_default>The mail could not be sent because you have already sent an email within the last %s minutes</word_default>
+      <word_custom>Вы не можете отправл�ть более одного пи�ьма в течение %s минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>exceeded_quota</word_key>
+      <word_default>The mail could not be sent because you have exceeded your allotted quota of %s emails a day</word_default>
+      <word_custom>Количе�тво разрешенных пи�ем в день - %s. Вы и�черпали данный лимит.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>no_subject</word_key>
+      <word_default>You must enter a subject for the email</word_default>
+      <word_custom>�еобходимо вве�ти тему пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>gen_error</word_key>
+      <word_default>You are not logged in or able to send emails</word_default>
+      <word_custom>Дл� и�пользовани� �той возможно�ти вы должны быть авторизованы и иметь необходимые права до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>emailing_prefix</word_key>
+      <word_default>Emailing</word_default>
+      <word_custom>Пи�ьмо</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>email_member</word_key>
+      <word_default>Email Member</word_default>
+      <word_custom>Отправить пи�ьмо</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>topic_langbit</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>forum_langbit</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>tweet_ok</word_key>
+      <word_default>Your tweet was successful!</word_default>
+      <word_custom>Tweet отправлен!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>twitter_chrs_left</word_key>
+      <word_default>chars left. Shortened URL will be auto-added</word_default>
+      <word_custom> �имволов о�тало�ь. Сокращение ��ылок будет применено автоматиче�ки.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>no_message</word_key>
+      <word_default>You must enter some content for the email</word_default>
+      <word_custom>Вы должны вве�ти тек�т пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>to_email</word_key>
+      <word_default>Send to (Email Address)</word_default>
+      <word_custom>Отправить на e-mail:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>submit_send</word_key>
+      <word_default>Send Email</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>to_name</word_key>
+      <word_default><![CDATA[Send to (Person's Name)]]></word_default>
+      <word_custom>Кому (им� друга):</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>send_lang</word_key>
+      <word_default>Send this email in</word_default>
+      <word_custom>Язык пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>message</word_key>
+      <word_default>Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>subject</word_key>
+      <word_default>Subject</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>redirect</word_key>
+      <word_default>The email has been sent</word_default>
+      <word_custom>Пи�ьмо отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>title</word_key>
+      <word_default>Send a page to a friend</word_default>
+      <word_custom>Отправить ��ылку на �траницу другу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>member_address_title</word_key>
+      <word_default>Members Email Address</word_default>
+      <word_custom>E-mail адре� пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>show_address_text</word_key>
+      <word_default><![CDATA[You can send this member an email by clicking on the link below. IP.Board does not show email addresses in the topic view to prevent email addresses being harvested by 'spam bots'.]]></word_default>
+      <word_custom>Дл� отправки e-mail пи�ьма пользователю во�пользуйте�ь размещенной ниже ��ылкой. IPB не показывает e-mail адре�а дл� защиты от �пам-ботов. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>send_email_to</word_key>
+      <word_default>Send an email to</word_default>
+      <word_custom>Отправка пи�ьма дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>msg_txt</word_key>
+      <word_default>Note: By using this form, the recipient will be able to view your email address</word_default>
+      <word_custom>Примечание: получатель пи�ьма узнает ваш e-mail адре� </word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1151,52 +1015,512 @@ You can review the new comment here:
       <word_key>email_details</word_key>
       <word_default>Enter the email details</word_default>
       <word_custom>Введите e-mail данные </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>email_recepient</word_key>
+      <word_default>Recipient</word_default>
+      <word_custom>�дре�ат</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>email_friend</word_key>
+      <word_default>Use this feature to let a friend know about this topic!</word_default>
+      <word_custom>И�пользуйте �ту возможно�ть дл� отправки ��ылки на �ту тему друзь�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>email_sent</word_key>
+      <word_default>The email has been sent</word_default>
+      <word_custom>Пи�ьмо отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_emails</word_pack>
+      <word_key>email_sent_txt</word_key>
+      <word_default>Thanks, the email has been successfully sent to</word_default>
+      <word_custom>Спа�ибо, пи�ьмо у�пешно отправлено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>email_member</word_key>
-      <word_default><![CDATA[<#MEMBER_NAME#>,
+      <word_key>subject__other_status_reply</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has replied to <a href='%s'>%s</a>'s <a href='%s'>status</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> прокомментировал <a href='%s'>%s</a> <a href='%s'>�тату�</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__status_reply</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has replied to your <a href='%s'>status</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> прокомментировал ваш <a href='%s'>�тату�</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>personal_convo_new_reply</word_key>
+      <word_default><![CDATA[<#NAME#>,
 
-<#FROM_NAME#> has sent you this email from <#BOARD_ADDRESS#>.
+<#POSTER#> has replied to a personal conversation entitled "<#TITLE#>".
+
+<#POSTER#> said:
+======================================================================
+<#TEXT#>
+======================================================================
+
+PLEASE DO NOT REPLY DIRECTLY TO THIS EMAIL!
+You can reply to this personal conversation by following the link below:
+
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>, <#POSTER#> ответил в личную бе�еду "<#TITLE#>".
+<#POSTER#> �казал:
+<#TEXT#>
+Вы можете про�мотреть полный диалог бе�еды по указанной ниже ��ылке:
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__personal_convo_new_reply</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has replied to a <a href='%s'>personal conversation</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> напи�ал новое �ообщение в <a href='%s'>личной бе�еде</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__error_log_notification</word_key>
+      <word_default>An error has been generated on your site</word_default>
+      <word_custom>�а вашем форуме возникла ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>personal_convo_invite</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+<#POSTER#> has added you to their personal conversation entitled "<#TITLE#>".
+
+You can read this personal conversation by following the link below:
+
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>, <#POSTER#> добавил ва� к личной бе�еде "<#TITLE#>". 
+Вы можете прочитать диалог по указанной ниже ��ылке:
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__personal_convo_invite</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has added you to a <a href='%s'>personal conversation</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> приглашает ва� прин�ть уча�тие в <a href='%s'>бе�еде</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__account_created</word_key>
+      <word_default>Your account has been created</word_default>
+      <word_custom>Ваша учетна� запи�ь у�пешно �оздана</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>account_created</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+Your account has been created successfully at <#BOARD_NAME#>.
+
+If we were waiting on a parental consent form, this means the form has been received and documented.
+
+Your details are as follows:
+
+Username: <#NAME#>
+Email Address: <#EMAIL#>
+Password: <#PASSWORD#>
+
+Please be aware that we do not store a plain text copy of your password, and you can change your password at any time through your control panel on the site.
+
+Visit this link to join into our discussions!
+
+<#BOARD_ADDRESS#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>,
+
+Ваша учетна� запи�ь у�пешно �оздана на форуме <#BOARD_NAME#>
+
+Данные дл� до�тупа к форумам �ледующие:
+
+Им� пользовател�: <#NAME#> 
+Пароль: <#PASSWORD#>
+E-mail: <#EMAIL#>
+
+Пожалуй�та, запомните, что мы не храним ваш пароль, но вы можете его изменить в любой врем� в ваших личных данных.
+
+При�тного общени�!
+
+<#BOARD_ADDRESS#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_friend_approved</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> approved your friend request]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> активировал дружбу � вами]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_friend_approved</word_key>
+      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
+
+<#FRIEND_NAME#> has approved your friend request!
+
+Log in and then manage your friends: <#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> прин�л предложение �тать вашим другом! Управление вашим �пи�ком друзей по ��ылке: <#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_friend_request</word_key>
+      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
+
+<#FRIEND_NAME#> wants to be your friend!
+
+This message has been sent because <#FRIEND_NAME#> has added you to their friends
+list. As you've chosen to approve all friend requests, you will need to visit your
+friends list and approve them.
+
+Log in and then manage your friends: <#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> хочет �тать вашим другом! Так как у ва� включена проверка желающих �тать вашими друзь�ми, то дл� того, чтобы он по�вил�� в вашем �пи�ке друзей, его запро� необходимо подтвердить (или отклонить). Сделать �то можно по ��ылке: <#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_friend_added</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> added you as a friend]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> добавил ва� в друзь�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_friend_added</word_key>
+      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
+
+<#FRIEND_NAME#> has successfully added you to their friends list.
+
+Manage your friends: <#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> �тал вашим другом.
+Управление �пи�ком ваших друзей: <#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_comment_request</word_key>
+      <word_default><![CDATA[<a href='%s'>New comment</a> from <a href='%s'>%s</a> pending approval]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>�овый комментарий</a> от <a href='%s'>%s</a> ожидает подтверждени�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_friend_request</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> sent you a <a href='%s'>friend request</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> <a href='%s'>хочет</a> дружить � вами]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__post_was_quoted</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> <a href='%s'>quoted</a> a <a href='%s'>post you made</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> <a href='%s'>процитировал</a> ваше <a href='%s'>�ообщение</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_comment_added</word_key>
+      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
+
+<#COMMENT_NAME#> has left you a comment on your profile.
+
+Manage your comments: <#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, 
+
+<#COMMENT_NAME#> о�тавил комментарий в вашем профиле.
+
+Управление такими комментари�ми по ��ылке: <#LINK#>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_comment_added</word_key>
+      <word_default><![CDATA[<a href='%s'>New comment</a> from <a href='%s'>%s</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>�овый комментарий</a> от <a href='%s'>%s</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>error_log_notification</word_key>
+      <word_default><![CDATA[Dear admin,
+
+An error has been generated on your forums.  You are being sent this notification based on your error log notification settings in the Admin Control Panel.  This error meets the criteria for errors that you have set to be notified about.
+
+The error code is: <#CODE#>
+The error message is: <#MESSAGE#>
+The user who saw this error is: <#VIEWER#>
+The IP address of this user is: <#IP_ADDRESS#>
+
+Please login to your Admin Control Panel to use the error log viewer tool for further information.
+
+<#BOARD_ADDRESS#>
+]]></word_default>
+      <word_custom><![CDATA[�а вашем форуме возникла ошибка!
+
+Вы получили �то уведомление, так как у ва� включена �оответ�твующа� функци� в админцентре.
+
+Данные по ошибке.
+
+Код ошибки: <#CODE#> 
+Сообщение: <#MESSAGE#> 
+Пользователь, кто обнаружил ошибку: <#VIEWER#> 
+Его IP-адре�: <#IP_ADDRESS#> 
+
+Более подробную информаци� вы можете получить, про�мотрев журнал error_log.
+
+<#BOARD_ADDRESS#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_status</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+<#OWNER#> has just posted a new status update.
+
+======================================================================
+<#STATUS#>
+======================================================================
 
 
-<#MESSAGE#>
+You can turn off status notification by visiting <#URL#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>,
 
----------------------------------------------------
-Please note that <#BOARD_NAME#> has no control over the
-contents of this message.
----------------------------------------------------
+<#OWNER#> только что обновил �тату�.
+
+======================================================================
+<#STATUS#>
+======================================================================
+
+
+Вы можете отключить уведомлени� по адре�у <#URL#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_status</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has posted a new <a href='%s'>status update</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> обновил �вой <a href='%s'>�тату�</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__email_convo</word_key>
+      <word_default>Personal Conversation Archive</word_default>
+      <word_custom>�рхив личной перепи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>email_convo</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+Attached to this message is a HTML file containing a personal conversation archive:
+Conversation title: <#TITLE#>
+Conversation started: <#DATE#>
+<#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>,
+
+К пи�ьму прикреплен архив личной перепи�ки:
+�азвание: <#TITLE#>
+�ачало: <#DATE#>
+<#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_likes</word_key>
+      <word_default><![CDATA[Hello!
+
+<#MEMBER_NAME#> just liked a post you made!
+
+<#SHORT_POST#>
+<#URL#>
+]]></word_default>
+      <word_custom><![CDATA[Здрав�твуйте!
+
+Пользователю <#MEMBER_NAME#> понравило�ь вашe �ообщение на форуме!
+
+<#SHORT_POST#>
+<#URL#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__new_likes</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> liked a <a href='%s'>post you made</a> in <a href='%s'>%s</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> понравило�ь <a href='%s'>�ообщение, �деланное вами,</a> в <a href='%s'>%s</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>footer</word_key>
+      <word_default><![CDATA[
+Regards,
+
+The <#BOARD_NAME#> team.
+<#BOARD_ADDRESS#>
+]]></word_default>
+      <word_custom><![CDATA[С уважением, <#BOARD_NAME#>, <#BOARD_ADDRESS#> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>header</word_key>
+      <word_default/>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_comment_request</word_key>
+      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
+
+<#COMMENT_NAME#> has left you a comment that requires your approval.
+
+As you've chosen to approve all new comments the new comment will not appear on your
+profile until it's been approved.
+
+Log in and then manage your comments: <#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#COMMENT_NAME#> о�тавил комментарий в вашем профиле. Так как у ва� включена премодераци� комментариев, дл� того, чтобы он по�вил��, необходимо вам его активировать, в противном �лучае удалить. Сделать �то можно по ��ылке: <#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>new_topic_queue_notify</word_key>
+      <word_default><![CDATA[Hello!
+
+This email has been sent from: <#BOARD_NAME#>.
+
+A new topic has been entered into the moderation queue and is awaiting
+approval.
+
+----------------------------------
+Topic: <#TOPIC#>
+Forum: <#FORUM#>
+Author: <#POSTER#>
+Time: <#DATE#>
+Manage Queue: <#LINK#>
+----------------------------------
+<#POST#>
+----------------------------------
+
+If you no longer require notification, you can stop these emails by simply
+removing your email address from the forum settings options.
+
+<#BOARD_ADDRESS#>
 
 ]]></word_default>
-      <word_custom><![CDATA[<#BOARD_ADDRESS#>
-
-<#MEMBER_NAME#>, 
-
-<#FROM_NAME#> отправил вам пи�ьмо.
-
----------------------------------------------------
- <#MESSAGE#> 
---------------------------------------------------- 
-
-Имейте в виду, что форум не не�ет ответ�твенно�ть за �одержание данного пи�ьма.
+      <word_custom><![CDATA[<#BOARD_NAME#>
+
+�а форуме по�вило�ь нова� тема дл� проверки и публикации/удалени� модератором.
+
+Тема: <#TOPIC#>
+Форум: <#FORUM#>
+�втор:  <#POSTER#>
+Врем�: <#DATE#>
+
+Дл� �овершени� дей�твий � темой перейдите по ��ылке: <#LINK#> 
+----------------------------------
+<#POST#>
+----------------------------------
+
+Е�ли вы больше не хотите получать такие уведомлени�, удалите ваш e-mail адре� в на�тройках форума.
+
+�дре� форума: <#BOARD_ADDRESS#>
 ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__complete_reg</word_key>
-      <word_default>Account: %s, validated at %s</word_default>
-      <word_custom>Учетна� запи�ь: %s, подтверждена %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>personal_convo_new_convo</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+<#POSTER#> has sent you a new personal conversation entitled "<#TITLE#>".
+
+<#POSTER#> said:
+======================================================================
+<#TEXT#>
+======================================================================
+
+PLEASE DO NOT REPLY DIRECTLY TO THIS EMAIL!
+You can reply to this personal conversation by following the link below:
+
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>, <#POSTER#> отправил вам �ообщение � заголовком "<#TITLE#>". 
+<#POSTER#> �казал: ======================================================================
+<#TEXT#>
+Вы можете про�мотреть бе�еду � ним, пройд� по указанной ниже ��ылке:
+<#BOARD_ADDRESS#><#LINK#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__personal_convo_new_convo</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> started a new <a href='%s'>personal conversation</a> with you]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> начал новую <a href='%s'>бе�еду</a> � вами]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>status_reply</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+<#POSTER#> <#BLURB#>
+
+Status: (<#OWNER#>) <#STATUS#>
+======================================================================
+<#TEXT#>
+======================================================================
+
+
+You can turn off status notification by visiting <#URL#>
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>,
+
+<#POSTER#> <#BLURB#>
+
+Стату�: (<#OWNER#>) <#STATUS#>
+======================================================================
+<#TEXT#>
+======================================================================
+
+
+Вы можете отключить уведомлени� по адре�у <#URL#>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1208,520 +1532,123 @@ Success!
 An administrator has accepted your registration request or email address change at <#BOARD_NAME#>. You may now log in with
 your chosen details and access your full user account at <#BOARD_ADDRESS#>
 ]]></word_default>
-      <word_custom><![CDATA[<#BOARD_NAME#>.
-
-Поздравл�ем! 
-
-�дмини�тратор у�пешно активировал вашу реги�трацию (или �мену e-mail адре�а).
-Теперь вы можете войти на форум и пользовать�� в�еми возможно�т�ми полноценного пользовател�.
-
-�дре� форума: <#BOARD_ADDRESS#>
+      <word_custom><![CDATA[<#BOARD_NAME#>.
+
+Поздравл�ем! 
+
+�дмини�тратор у�пешно активировал вашу реги�трацию (или �мену e-mail адре�а).
+Теперь вы можете войти на форум и пользовать�� в�еми возможно�т�ми полноценного пользовател�.
+
+�дре� форума: <#BOARD_ADDRESS#>
 ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__subs_no_post</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> replied to <a href='%s'>%s</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> ответил в тему <a href='%s'>%s</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subject__complete_reg</word_key>
+      <word_default>Account: %s, validated at %s</word_default>
+      <word_custom>Учетна� запи�ь: %s, подтверждена %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subs_no_post</word_key>
-      <word_default><![CDATA[<#NAME#>,
+      <word_key>new_post_queue_notify</word_key>
+      <word_default><![CDATA[Hello!
 
-<#POSTER#> has just posted a reply to a topic that you have subscribed to titled "<#TITLE#>".
+This email has been sent from: <#BOARD_NAME#>.
 
-The topic can be found here:
-<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
+A new post has been entered into the moderation queue and is awaiting
+approval.
 
-If you have configured in your control panel to receive immediate topic reply notifications, you may receive an
-email for each reply made to this topic.  Otherwise, only 1 email is sent per board visit for each subscribed topic. 
-This is to limit the amount of mail that is sent to your inbox.
-
-Unsubscribing:
---------------
-
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Topics" link in the "Forums" tab.
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> опубликовал ответ в тему "<#TITLE#>", на которую вы подпи�аны.
-
-----------------------------------------------------------------------
-<#POST#>
-----------------------------------------------------------------------
-
-�дре� темы: <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
-
-В теме могут быть и другие ответы, однако вами задано, чтобы приходило только одно пи�ьмо � уведомлением (на каждую тему) между вашими визитами на форум. 
-
-Отпи�ать��:
---------------
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subs_with_post</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#POSTER#> has just posted a reply to a topic that you have subscribed to titled "<#TITLE#>".
-
-----------------------------------------------------------------------
+----------------------------------
+Topic: <#TOPIC#>
+Forum: <#FORUM#>
+Author: <#POSTER#>
+Time: <#DATE#>
+Manage Queue: <#LINK#>
+----------------------------------
 <#POST#>
-----------------------------------------------------------------------
+----------------------------------
 
-The topic can be found here:
-<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
+If you no longer require notification, you can stop these emails by simply
+removing your email address from the forum settings options.
 
+<#BOARD_ADDRESS#>
 
-
-If you have configured in your control panel to receive immediate topic reply notifications, you may receive an
-email for each reply made to this topic.  Otherwise, only 1 email is sent per board visit for each subscribed topic. 
-This is to limit the amount of mail that is sent to your inbox.
-
-Unsubscribing:
---------------
-
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Topics" link in the "Forums" tab.
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> опубликовал ответ в тему "<#TITLE#>", на которую вы подпи�аны.
-
-----------------------------------------------------------------------
-<#POST#>
-----------------------------------------------------------------------
-
-�дре� темы: <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
-
-Е�ли у ва� включена немедленна� до�тавка уведомлений о новых �ообщени�х в �той теме, вы будете получать пи�ьмо � уведомлением на каждый новый ответ в тему. В противном �лучае только одно такое пи�ьмо �о в�еми новыми ответами будет приходить между каждым вашим визитом на форум.
-
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom><![CDATA[<#BOARD_NAME#>
+
+�а форуме по�вило�ь новое �ообщение дл� проверки и публикации/удалени� модератором.
+
+Тема: <#TOPIC#>
+Форум: <#FORUM#>
+�втор:  <#POSTER#>
+Врем�: <#DATE#>
+
+Дл� �овершени� дей�твий � �ообщением перейдите по ��ылке: <#LINK#> 
+----------------------------------
+<#POST#>
+----------------------------------
+
+Е�ли вы больше не хотите получать такие уведомлени�, удалите ваш e-mail адре� в на�тройках форума.
+
+�дре� форума: <#BOARD_ADDRESS#>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__subs_new_topic</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> posted topic <a href='%s'>%s</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> �оздал тему <a href='%s'>%s</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subject__new_post_queue_notify</word_key>
+      <word_default>New Post Awaiting Approval</word_default>
+      <word_custom>�овое �ообщение, требующее активации</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subs_new_topic</word_key>
+      <word_key>subject__digest_forum_weekly</word_key>
+      <word_default>Your weekly new topics digest</word_default>
+      <word_custom>Обзор новых тем за неделю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>digest_forum_weekly</word_key>
       <word_default><![CDATA[<#NAME#>,
 
-<#POSTER#> has just posted a new topic entitled "<#TITLE#>" in forum "<#FORUM#>".
+This is the digest of posts created this week in forum <#FORUM_NAME#>.
 
 ----------------------------------------------------------------------
-<#POST#>
+
+
+
+<#CONTENT#>
+
+
+
+
 ----------------------------------------------------------------------
 
-The topic can be found here:
-<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>
-
-Please note that if you wish to get email notification of any replies to this topic, you will have to click on the
-"Track this Topic" link shown on the topic page, or by visiting the link below:
-<#BOARD_ADDRESS#>?app=core&module=usercp&tab=forums&area=watch&watch=topic&do=list&tid=<#TOPIC_ID#>
-
+The forum can be found here:
+<#URL#>
 
 Unsubscribing:
 --------------
 
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Forums" link in the "Forums" tab.
-If you are not subscribed to any forums and wish to stop receiving notification, uncheck the setting
-"Send me any updates sent by the board administrator" found in 'My Settings' under 'General Settings' in the "Settings" tab.
+You can unsubscribe at any time by visiting the "Content I Follow" section of our community here: <#BOARD_ADDRESS#>?app=core&module=search&do=followed
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> открыл новую тему "<#TITLE#>" в разделе "<#FORUM#>".
-
-----------------------------------------------------------------------
-<#POST#>
-----------------------------------------------------------------------
-
-�дре� темы: <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#> 
-
-Имейте в виду, что вы можете подпи�ать�� на уведомлени� о новых ответах в �той теме. Это можно �делать как из �амой темы, так и нажав на указанную ниже ��ылку: <#BOARD_ADDRESS#>?app=core&module=usercp&tab=forums&area=watch&watch=topic&do=list&tid=<#TOPIC_ID#>
-
-Отпи�ать��:
--------------- 
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
-Е�ли вы не хотите больше получать никаких уведомлений � форума про�то отключите �оответ�твующую опцию « Сообщать мне обо в�ех изменени�х, проводимых админи�тратором форума.» в вашем профиле в меню «Общие на�тройки».
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>forward_page</word_key>
-      <word_default><![CDATA[
-<#TO_NAME#>
+      <word_custom><![CDATA[<#NAME#>, 
 
+Это пи�ьмо �одержит обзор новых тем за по�леднюю неделю:
 
-<#THE_MESSAGE#>
+---------------------------------------------------------------------- 
+<#CONTENT#> 
+---------------------------------------------------------------------- 
 
----------------------------------------------------
-Please note that <#BOARD_NAME#> has no control over the
-contents of this message.
----------------------------------------------------
-]]></word_default>
-      <word_custom><![CDATA[<#BOARD_NAME#>
-
-<#TO_NAME#> 
-
---------------------------------------------------- 
-<#THE_MESSAGE#>
----------------------------------------------------
-
-Имейте в виду, что форум не не�ет ответ�твенно�ть за �одержание данного пи�ьма.
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__subs_with_post</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> replied to <a href='%s'>%s</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> ответил в тему <a href='%s'>%s</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>lost_pass_email_pass</word_key>
-      <word_default><![CDATA[
-<#NAME#>,
-This email has been sent from <#BOARD_ADDRESS#>.
+Раздел форума, на который вы подпи�али�ь, по ��ылке:
+<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
 
-This email completes your lost password request.
-
-------------------------------------------------
-YOUR NEW PASSWORD
-------------------------------------------------
-
-Your username is: <#USERNAME#>
-Your email address is: <#EMAIL#>
-Your new password is: <#PASSWORD#>
-
-Log in here: <#LOGIN#>
-
-Please be careful to use the correct information (username or email address) to login to the site.
-
-------------------------------------------------
-CHANGING YOUR PASSWORD
-------------------------------------------------
-
-Once you've logged in, you can visit your User CP to
-change your password.
-
-User CP: <#THE_LINK#>
-
-]]></word_default>
-      <word_custom><![CDATA[<#BOARD_ADDRESS#>
-
-<#NAME#>, Вы �оздали новый пароль.
-
------------------------------------------------- �ОВЫЙ П�РОЛЬ
------------------------------------------------- 
-Им� пользовател�: <#USERNAME#>
-Пароль: <#PASSWORD#>
-E-mail: <#EMAIL#>
-
-Войти на форум � новыми данными: <#LOGIN#>
-
------------------------------------------------- ИЗМЕ�Е�ИЕ П�РОЛЯ 
-----------------------------------------
-По�ле входа вы можете изменить �вой пароль в �воих личных данных: <#THE_LINK#>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>newemail</word_key>
-      <word_default><![CDATA[
-<#NAME#>,
-This email has been sent from <#BOARD_ADDRESS#>.
-
-You have received this email because you requested an
-email address change.
-
-------------------------------------------------
-Activation Instructions Below
-------------------------------------------------
-
-We require that you "validate" your email address change to ensure that
-you instigated this action. This protects against
-unwanted spam and malicious abuse.
-
-To activate your account, simply click on the following link:
-
-<#THE_LINK#>
-
-(Some email client users may need to copy and paste the link into your web
-browser).
-
-------------------------------------------------
-Not working?
-------------------------------------------------
-
-If you could not validate your registration by clicking on the link, please
-visit this page:
-
-<#MAN_LINK#>
-
-It will ask you for a user id number, and your validation key. These are shown
-below:
-
-User ID: <#ID#>
-
-Validation Key: <#CODE#>
-
-Please copy and paste, or type those numbers into the corresponding fields in the form.
-
-Once the activation is complete, you may need to log back in to update your member group
-permissions.
-
-------------------------------------------------
-Help! I get an error!
-------------------------------------------------
-
-If you cannot re-activate your account, it's possible that the account has been removed or you
-are in the process of another activation, such as registering or changing your registered email address.
-If this is the case, then please complete the previous activation.
-If the error persists, please contact an administrator to rectify the problem.
-
-]]></word_default>
-      <word_custom><![CDATA[Здрав�твуйте, <#NAME#>!
-
-Вы получили �то пи�ьмо, потому что вы�лали запро� на изменение E-mail.
-
-------------------------------------------------
-Ин�трукци� по активации
-------------------------------------------------
-
-Вам необходимо будет активировать изменение e-mail адре�а, �то необходимо дл� проверки того, что �то дей�твие �делали именно вы. Также �то требует�� дл� защиты от нежелательных злоупотреблений и �пама.
-
-Дл� активации учетной запи�и зайдите по ��ылке:
-
-<#THE_LINK#>
-
-------------------------------------------------
-�е �работало?
-------------------------------------------------
-
-Е�ли подтвердить вам не удало�ь, зайдите по ��ылке
-
-<#MAN_LINK#>
-
-и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
-
-===================================
-ID пользовател�: <#ID#>
-Код активации: <#CODE#>
-===================================
-
-Е�ли ничего не получает��, �в�жите�ь � админи�тратором форума!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>admin_newuser</word_key>
-      <word_default><![CDATA[
-Hello,
-
-You have received this email because a new user has completed their registration!
-
-------------------------------------------------
-Log in name: <#LOG_IN_NAME#>
-Display name: <#DISPLAY_NAME#>
-Email: <#EMAIL#>
-IP Address: <#IP#>
-Date: <#DATE#>
-------------------------------------------------
-
-You can turn off user notification in the Admin Control Panel
-
-Have a super day!
-]]></word_default>
-      <word_custom><![CDATA[Здрав�твуйте.
-
-Пользователь <#LOG_IN_NAME#> зареги�трировал�� <#DATE#>
-
-(вы можете отключить подобные уведомлени� в админцентре)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>possibleSpammer</word_key>
-      <word_default><![CDATA[
-
-Hello,
-
-You have received this email because you chose to be notified when a possible spammer is flagged.
-
-Name: <#MEMBER_NAME#>
-Email: <#EMAIL#>
-IP: <#IP#>
-Registered: <#DATE#>
-
-You can view this user here: <#LINK#>
-
-Have a super day!
-]]></word_default>
-      <word_custom><![CDATA[Здрав�твуйте.
-
-Обнаружен возможный «�памер» (человек или робот, ра��ылающий �пам).
-
-Им�: <#MEMBER_NAME#>
-E-mail: <#EMAIL#>
-IP-адре�: <#IP#>
-Дата реги�трации: <#DATE#> 
-
-Про�мотреть другую информацию и возможные дей�тви� по пользователю можно по ��ылке:
-<#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>lost_pass</word_key>
-      <word_default><![CDATA[
-<#NAME#>,
-This email has been sent from <#BOARD_ADDRESS#>.
-
-You have received this email because a user account password recovery
-was instigated by you on <#BOARD_NAME#>.
-
-------------------------------------------------
-IMPORTANT!
-------------------------------------------------
-
-If you did not request this password change, please IGNORE and DELETE this
-email immediately. Only continue if you wish your password to be reset!
-
-------------------------------------------------
-Activation Instructions Below
-------------------------------------------------
-
-We require that you "validate" your password recovery to ensure that
-you instigated this action. This protects against
-unwanted spam and malicious abuse.
-
-Simply click on the link below and complete the rest of the form
-
-<#THE_LINK#>
-
-(Some email client users may need to copy and paste the link into your web
-browser).
-
-------------------------------------------------
-Not working?
-------------------------------------------------
-
-If you could not validate your registration by clicking on the link, please
-visit this page:
-
-<#MAN_LINK#>
-
-It will ask you for a user id number, and your validation key. These are shown
-below:
-
-User ID: <#ID#>
-
-Validation Key: <#CODE#>
-
-Please copy and paste, or type those numbers into the corresponding fields in the form.
-
-------------------------------------------------
-Is this not working?
-------------------------------------------------
-
-If you cannot re-activate your account, it's possible that the account has been removed or you
-are in the process of another activation, such as registering or changing your registered email address.
-If this is the case, then please complete the previous activation.
-If the error persists, please contact an administrator to rectify the problem.
-
-IP address of sender: <#IP_ADDRESS#>
-
-]]></word_default>
-      <word_custom><![CDATA[Здрав�твуйте, <#NAME#>!
-
-Вы получили �то пи�ьмо, по�кольку был �делан запро� на во��тановление вашего парол� в форуме «<#BOARD_NAME #>».
-Е�ли вы не делали такой запро�, проигнорируйте и удалите �то �ообщение.
-
-
-Е�ли же вы в �амом деле забыли �вой пароль, заново активируйте вашу учетную запи�ь.
-
-Чтобы активировать вашу учетную запи�ь, необходимо перейти по ��ылке
-<#THE_LINK#>
-�ктиваци� произойдет автоматиче�ки.
-
-Е�ли таким �по�обом �бро�ить пароль не удало�ь, попробуйте активировать вручную. Пройдите по ��ылке
-<#MAN_LINK#>
-и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
-
-===================================
-ID пользовател�: <#ID#>
-Код активации: <#CODE#>
-===================================
-
-По�ле активации учетной запи�и �ледуйте ин�трукци�м по во��тановлению парол�, которые будет �ообщать вам форум.
-
-Е�ли ничего не получает��, �в�жите�ь � админи�тратором форума!
-(IP адре� отправител�: <#IP_ADDRESS#>)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>send_text</word_key>
-      <word_default><![CDATA[I thought you might be interested in reading this web page: <#THE LINK#>
-
-From,
-
-<#USER NAME#>
-]]></word_default>
-      <word_custom><![CDATA[Сообщение от пользовател�: <#USER NAME#>
-
-Сообщаю, что вам будет интере�но прочитать указанную по ��ылке �траницу:
-<#THE LINK#> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+Отпи�ать��:
+-------------- 
+Вы можете управл�ть �воими подпи�ками в данной �екции форума: <#BOARD_ADDRESS#>?app=core&module=search&do=followed]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1775,47 +1702,245 @@ If this is the case, please contact an administrator to rectify the problem.
 
 Thank you for registering and enjoy your stay!
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>,
-
-В форуме по адре�у <#BOARD_ADDRESS#> по�вила�ь реги�трационна� запи�ь,
-в которой был указал ваш �лектронный адре� (e-mail).
-
-Е�ли вы не понимаете, о чем идет речь — про�то проигнорируйте �то �ообщение!
-
-Е�ли же именно вы решили зареги�трировать�� в форуме по адре�у <#BOARD_ADDRESS#>,
-то вам �ледует подтвердить �вою реги�трацию и тем �амым активировать вашу учетную запи�ь.
-Подтверждение реги�трации производит�� один раз и необходимо дл� повышени� безопа�но�ти форума и защиты его от злоумышленников.
-Чтобы активировать вашу учетную запи�ь, необходимо перейти по ��ылке:
-<#THE_LINK#>
-�ктиваци� произойдет автоматиче�ки.
-
-Е�ли таким �по�обом активировать учетную запи�ь не удало�ь, попробуйте �делать �то вручную. Пройдите по ��ылке
-<#MAN_LINK#>
-и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
-
-===================================
-ID пользовател�: <#ID#>
-Код активации: <#CODE#>
-===================================
-
-По�ле активации учетной запи�и вы �можете войти в форум, и�пользу� выбранные вами им� пользовател� (login) и пароль. С �того момента вы �можете о�тавл�ть �ообщени�.
-
-Пожалуй�та, не забудьте заполнить �вои личные данные.
-
+      <word_custom><![CDATA[<#NAME#>,
+
+В форуме по адре�у <#BOARD_ADDRESS#> по�вила�ь реги�трационна� запи�ь,
+в которой был указал ваш �лектронный адре� (e-mail).
+
+Е�ли вы не понимаете, о чем идет речь — про�то проигнорируйте �то �ообщение!
+
+Е�ли же именно вы решили зареги�трировать�� в форуме по адре�у <#BOARD_ADDRESS#>,
+то вам �ледует подтвердить �вою реги�трацию и тем �амым активировать вашу учетную запи�ь.
+Подтверждение реги�трации производит�� один раз и необходимо дл� повышени� безопа�но�ти форума и защиты его от злоумышленников.
+Чтобы активировать вашу учетную запи�ь, необходимо перейти по ��ылке:
+<#THE_LINK#>
+�ктиваци� произойдет автоматиче�ки.
+
+Е�ли таким �по�обом активировать учетную запи�ь не удало�ь, попробуйте �делать �то вручную. Пройдите по ��ылке
+<#MAN_LINK#>
+и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
+
+===================================
+ID пользовател�: <#ID#>
+Код активации: <#CODE#>
+===================================
+
+По�ле активации учетной запи�и вы �можете войти в форум, и�пользу� выбранные вами им� пользовател� (login) и пароль. С �того момента вы �можете о�тавл�ть �ообщени�.
+
+Пожалуй�та, не забудьте заполнить �вои личные данные.
+
 Благодарим за реги�трацию!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__digest_topic_daily</word_key>
-      <word_default>Your daily new posts digest</word_default>
-      <word_custom>Обзор новых �ообщений за день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>send_text</word_key>
+      <word_default><![CDATA[I thought you might be interested in reading this web page: <#THE LINK#>
+
+From,
+
+<#USER NAME#>
+]]></word_default>
+      <word_custom><![CDATA[Сообщение от пользовател�: <#USER NAME#>
+
+Сообщаю, что вам будет интере�но прочитать указанную по ��ылке �траницу:
+<#THE LINK#> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>admin_newuser</word_key>
+      <word_default><![CDATA[
+Hello,
+
+You have received this email because a new user has completed their registration!
+
+------------------------------------------------
+Log in name: <#LOG_IN_NAME#>
+Display name: <#DISPLAY_NAME#>
+Email: <#EMAIL#>
+IP Address: <#IP#>
+Date: <#DATE#>
+------------------------------------------------
+
+You can turn off user notification in the Admin Control Panel
+
+Have a super day!
+]]></word_default>
+      <word_custom><![CDATA[Здрав�твуйте.
+
+Пользователь <#LOG_IN_NAME#> зареги�трировал�� <#DATE#>
+
+(вы можете отключить подобные уведомлени� в админцентре)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>lost_pass</word_key>
+      <word_default><![CDATA[
+<#NAME#>,
+This email has been sent from <#BOARD_ADDRESS#>.
+
+You have received this email because a user account password recovery
+was instigated by you on <#BOARD_NAME#>.
+
+------------------------------------------------
+IMPORTANT!
+------------------------------------------------
+
+If you did not request this password change, please IGNORE and DELETE this
+email immediately. Only continue if you wish your password to be reset!
+
+------------------------------------------------
+Activation Instructions Below
+------------------------------------------------
+
+We require that you "validate" your password recovery to ensure that
+you instigated this action. This protects against
+unwanted spam and malicious abuse.
+
+Simply click on the link below and complete the rest of the form
+
+<#THE_LINK#>
+
+(Some email client users may need to copy and paste the link into your web
+browser).
+
+------------------------------------------------
+Not working?
+------------------------------------------------
+
+If you could not validate your password recovery request by clicking on the link, please
+visit this page:
+
+<#MAN_LINK#>
+
+It will ask you for a user id number, and your validation key. These are shown
+below:
+
+User ID: <#ID#>
+
+Validation Key: <#CODE#>
+
+Please copy and paste, or type those numbers into the corresponding fields in the form.
+
+------------------------------------------------
+Is this not working?
+------------------------------------------------
+
+If you cannot re-activate your account, it's possible that the account has been removed or you
+are in the process of another activation, such as registering or changing your registered email address.
+If this is the case, then please complete the previous activation.
+If the error persists, please contact an administrator to rectify the problem.
+
+IP address of sender: <#IP_ADDRESS#>
+
+]]></word_default>
+      <word_custom><![CDATA[Здрав�твуйте, <#NAME#>!
+
+Вы получили �то пи�ьмо, по�кольку был �делан запро� на во��тановление вашего парол� в форуме «<#BOARD_NAME#>».
+Е�ли вы не делали такой запро�, проигнорируйте и удалите �то �ообщение.
+
+
+Е�ли же вы в �амом деле забыли �вой пароль, заново активируйте вашу учетную запи�ь.
+
+Чтобы активировать вашу учетную запи�ь, необходимо перейти по ��ылке
+<#THE_LINK#>
+�ктиваци� произойдет автоматиче�ки.
+
+Е�ли таким �по�обом �бро�ить пароль не удало�ь, попробуйте активировать вручную. Пройдите по ��ылке
+<#MAN_LINK#>
+и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
+
+===================================
+ID пользовател�: <#ID#>
+Код активации: <#CODE#>
+===================================
+
+По�ле активации учетной запи�и �ледуйте ин�трукци�м по во��тановлению парол�, которые будет �ообщать вам форум.
+
+Е�ли ничего не получает��, �в�жите�ь � админи�тратором форума!
+(IP адре� отправител�: <#IP_ADDRESS#>)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>possibleSpammer</word_key>
+      <word_default><![CDATA[
+
+Hello,
+
+You have received this email because you chose to be notified when a possible spammer is flagged.
+
+Name: <#MEMBER_NAME#>
+Email: <#EMAIL#>
+IP: <#IP#>
+Registered: <#DATE#>
+
+You can view this user here: <#LINK#>
+
+Have a super day!
+]]></word_default>
+      <word_custom><![CDATA[Здрав�твуйте.
+
+Обнаружен возможный «�памер» (человек или робот, ра��ылающий �пам).
+
+Им�: <#MEMBER_NAME#>
+E-mail: <#EMAIL#>
+IP-адре�: <#IP#>
+Дата реги�трации: <#DATE#> 
+
+Про�мотреть другую информацию и возможные дей�тви� по пользователю можно по ��ылке:
+<#LINK#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>digest_forum_daily</word_key>
+      <word_default><![CDATA[<#NAME#>,
+
+This is your daily new topics digest for forum <#FORUM_NAME#>!
+
+----------------------------------------------------------------------
+
+
+
+<#CONTENT#>
+
+
+
+
+----------------------------------------------------------------------
+
+The forum can be found here:
+<#URL#>
+
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time by visiting the "Content I Follow" section of our community here: <#BOARD_ADDRESS#>?app=core&module=search&do=followed
+]]></word_default>
+      <word_custom><![CDATA[<#NAME#>, 
+
+Это пи�ьмо �одержит обзор новых тем за �егодн�:
+
+---------------------------------------------------------------------- 
+<#CONTENT#> 
+---------------------------------------------------------------------- 
+
+Раздел форума, на который вы подпи�али�ь, по ��ылке:
+<#URL#>
+
+Отпи�ать��:
+-------------- 
+Вы можете управл�ть �воими подпи�ками в данной �екции форума: <#BOARD_ADDRESS#>?app=core&module=search&do=followed]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__digest_forum_daily</word_key>
+      <word_default>Your daily new topics digest</word_default>
+      <word_custom>Обзор новых тем за день</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1837,40 +1962,34 @@ This is the digest of posts in topic "<#TITLE#>" for today.
 ----------------------------------------------------------------------
 
 The topic can be found here:
-<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
+<#URL#>
 
 Unsubscribing:
 --------------
 
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Topics" link in the "Forums" tab.
+You can unsubscribe at any time here: <#UNSUBCRIBE_URL#>
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, 
-
-Это пи�ьмо �одержит обзор �ообщений темы «<#TITLE#>» за �егодн�:
-
----------------------------------------------------------------------- 
-<#CONTENT#> 
----------------------------------------------------------------------- 
-
-�дре� темы: <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost 
-
-Отпи�ать��:
--------------- 
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
+      <word_custom><![CDATA[<#NAME#>, 
+
+Это пи�ьмо �одержит обзор �ообщений темы «<#TITLE#>» за �егодн�:
+
+---------------------------------------------------------------------- 
+<#CONTENT#> 
+---------------------------------------------------------------------- 
+
+�дре� темы: <#URL#>
+
+Отпи�ать��:
+-------------- 
+Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
 ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__digest_topic_weekly</word_key>
-      <word_default>Your weekly new posts digest</word_default>
-      <word_custom>Обзор новых �ообщений за неделю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subject__digest_topic_daily</word_key>
+      <word_default>Your daily new posts digest</word_default>
+      <word_custom>Обзор новых �ообщений за день</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -1878,7 +1997,7 @@ You can unsubscribe at any time by logging into your control panel and clicking
       <word_key>digest_topic_weekly</word_key>
       <word_default><![CDATA[<#NAME#>,
 
-This your weekly new topics digest!
+This is the digest of posts in topic "<#TITLE#>" for this week.
 
 ----------------------------------------------------------------------
 
@@ -1891,195 +2010,241 @@ This your weekly new topics digest!
 
 ----------------------------------------------------------------------
 
-The forum can be found here:
-<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
+The topic can be found here:
+<#URL#>
 
 Unsubscribing:
 --------------
 
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Forums" link in the "Forums" tab.
+You can unsubscribe at any time here: <#UNSUBCRIBE_URL#>
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, 
-
-Это пи�ьмо �одержит обзор �ообщений темы «<#TITLE#>» за по�леднюю неделю:
-
----------------------------------------------------------------------- 
-<#CONTENT#> 
----------------------------------------------------------------------- 
-
-�дре� темы: <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost 
-
-Отпи�ать��:
--------------- 
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom><![CDATA[<#NAME#>, 
+
+Это пи�ьмо �одержит обзор �ообщений темы «<#TITLE#>» за по�леднюю неделю:
+
+---------------------------------------------------------------------- 
+<#CONTENT#> 
+---------------------------------------------------------------------- 
+
+�дре�: <#URL#>
+
+Отпи�ать��:
+--------------
+Вы можете управл�ть �воими подпи�ками в данной �екции форума: <#UNSUBCRIBE_URL#>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__digest_forum_daily</word_key>
-      <word_default>Your daily new topics digest</word_default>
-      <word_custom>Обзор новых тем за день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subject__digest_topic_weekly</word_key>
+      <word_default>Your weekly new posts digest</word_default>
+      <word_custom>Обзор новых �ообщений за неделю</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>digest_forum_daily</word_key>
+      <word_key>newemail</word_key>
+      <word_default><![CDATA[
+<#NAME#>,
+This email has been sent from <#BOARD_ADDRESS#>.
+
+You have received this email because you requested an
+email address change.
+
+------------------------------------------------
+Activation Instructions Below
+------------------------------------------------
+
+We require that you "validate" your email address change to ensure that
+you instigated this action. This protects against
+unwanted spam and malicious abuse.
+
+To activate your account, simply click on the following link:
+
+<#THE_LINK#>
+
+(Some email client users may need to copy and paste the link into your web
+browser).
+
+------------------------------------------------
+Not working?
+------------------------------------------------
+
+If you could not validate your email address change by clicking on the link, please
+visit this page:
+
+<#MAN_LINK#>
+
+It will ask you for a user id number, and your validation key. These are shown
+below:
+
+User ID: <#ID#>
+
+Validation Key: <#CODE#>
+
+Please copy and paste, or type those numbers into the corresponding fields in the form.
+
+Once the activation is complete, you may need to log back in to update your member group
+permissions.
+
+------------------------------------------------
+Help! I get an error!
+------------------------------------------------
+
+If you cannot re-activate your account, it's possible that the account has been removed or you
+are in the process of another activation, such as registering or changing your registered email address.
+If this is the case, then please complete the previous activation.
+If the error persists, please contact an administrator to rectify the problem.
+
+]]></word_default>
+      <word_custom><![CDATA[Здрав�твуйте, <#NAME#>!
+
+Вы получили �то пи�ьмо, потому что вы�лали запро� на изменение E-mail.
+
+------------------------------------------------
+Ин�трукци� по активации
+------------------------------------------------
+
+Вам необходимо будет активировать изменение e-mail адре�а, �то необходимо дл� проверки того, что �то дей�твие �делали именно вы. Также �то требует�� дл� защиты от нежелательных злоупотреблений и �пама.
+
+Дл� активации учетной запи�и зайдите по ��ылке:
+
+<#THE_LINK#>
+
+------------------------------------------------
+�е �работало?
+------------------------------------------------
+
+Е�ли подтвердить вам не удало�ь, зайдите по ��ылке
+
+<#MAN_LINK#>
+
+и введите указанные ниже ID пользовател� и код активации (не пароль!) в �оответ�твующие пол�.
+
+===================================
+ID пользовател�: <#ID#>
+Код активации: <#CODE#>
+===================================
+
+Е�ли ничего не получает��, �в�жите�ь � админи�тратором форума!]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>lost_pass_email_pass</word_key>
+      <word_default><![CDATA[
+<#NAME#>,
+This email has been sent from <#BOARD_ADDRESS#>.
+
+This email completes your lost password request.
+
+------------------------------------------------
+YOUR NEW PASSWORD
+------------------------------------------------
+
+Your username is: <#USERNAME#>
+Your email address is: <#EMAIL#>
+Your new password is: <#PASSWORD#>
+
+Log in here: <#LOGIN#>
+
+Please be careful to use the correct information (username or email address) to login to the site.
+
+------------------------------------------------
+CHANGING YOUR PASSWORD
+------------------------------------------------
+
+Once you've logged in, you can visit your User CP to
+change your password.
+
+User CP: <#THE_LINK#>
+
+]]></word_default>
+      <word_custom><![CDATA[<#BOARD_ADDRESS#>
+
+<#NAME#>, Вы �оздали новый пароль.
+
+------------------------------------------------ �ОВЫЙ П�РОЛЬ
+------------------------------------------------ 
+Им� пользовател�: <#USERNAME#>
+Пароль: <#PASSWORD#>
+E-mail: <#EMAIL#>
+
+Войти на форум � новыми данными: <#LOGIN#>
+
+------------------------------------------------ ИЗМЕ�Е�ИЕ П�РОЛЯ 
+----------------------------------------
+По�ле входа вы можете изменить �вой пароль в �воих личных данных: <#THE_LINK#>
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>forward_page</word_key>
+      <word_default><![CDATA[
+<#TO_NAME#>
+
+
+<#THE_MESSAGE#>
+
+---------------------------------------------------
+Please note that <#BOARD_NAME#> has no control over the
+contents of this message.
+---------------------------------------------------
+]]></word_default>
+      <word_custom><![CDATA[<#BOARD_NAME#>
+
+<#TO_NAME#> 
+
+--------------------------------------------------- 
+<#THE_MESSAGE#>
+---------------------------------------------------
+
+Имейте в виду, что форум не не�ет ответ�твенно�ть за �одержание данного пи�ьма.
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subs_new_topic</word_key>
       <word_default><![CDATA[<#NAME#>,
 
-This your daily new topics digest!
+<#POSTER#> has just posted a new topic entitled "<#TITLE#>" in forum "<#FORUM#>".
 
 ----------------------------------------------------------------------
-
-
-
-<#CONTENT#>
-
-
-
-
-----------------------------------------------------------------------
-
-The forum can be found here:
-<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
-
-Unsubscribing:
---------------
-
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Forums" link in the "Forums" tab.
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, 
-
-Это пи�ьмо �одержит обзор новых тем за �егодн�:
-
----------------------------------------------------------------------- 
-<#CONTENT#> 
----------------------------------------------------------------------- 
-
-Раздел форума, на который вы подпи�али�ь, по ��ылке:
-<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
-
-Отпи�ать��:
--------------- 
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__digest_forum_weekly</word_key>
-      <word_default>Your weekly new topics digest</word_default>
-      <word_custom>Обзор новых тем за неделю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>digest_forum_weekly</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-This is the digest of this weeks posts in forum <#FORUM_NAME#>.
-
-----------------------------------------------------------------------
-
-
-
-<#CONTENT#>
-
-
-
-
-----------------------------------------------------------------------
-
-The forum can be found here:
-<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
-
-Unsubscribing:
---------------
-
-You can unsubscribe at any time by logging into your control panel and clicking on the "Manage Watched Topics" link in the "Forums" tab.
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, 
-
-Это пи�ьмо �одержит обзор новых тем за по�леднюю неделю:
-
----------------------------------------------------------------------- 
-<#CONTENT#> 
----------------------------------------------------------------------- 
-
-Раздел форума, на который вы подпи�али�ь, по ��ылке:
-<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
-
-Отпи�ать��:
--------------- 
-Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_post_queue_notify</word_key>
-      <word_default>New Post Awaiting Approval</word_default>
-      <word_custom>�овое �ообщение, требующее активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_post_queue_notify</word_key>
-      <word_default><![CDATA[Hello!
-
-This email has been sent from: <#BOARD_NAME#>.
-
-A new post has been entered into the moderation queue and is awaiting
-approval.
-
-----------------------------------
-Topic: <#TOPIC#>
-Forum: <#FORUM#>
-Author: <#POSTER#>
-Time: <#DATE#>
-Manage Queue: <#LINK#>
-----------------------------------
 <#POST#>
-----------------------------------
+----------------------------------------------------------------------
 
-If you no longer require notification, you can stop these emails by simply
-removing your email address from the forum settings options.
+The topic can be found here:
+<#URL#>
 
-<#BOARD_ADDRESS#>
+Unsubscribing:
+--------------
 
+You can unsubscribe at any time here: <#UNSUBCRIBE_URL#>
+
+If you are not following any forums and wish to stop receiving notifications, uncheck the setting
+"Send me any updates sent by the board administrator" found in 'My Settings' under 'Notification Options'.
 ]]></word_default>
-      <word_custom><![CDATA[<#BOARD_NAME#>
-
-�а форуме по�вило�ь новое �ообщение дл� проверки и публикации/удалени� модератором.
-
-Тема: <#TOPIC#>
-Форум: <#FORUM#>
-�втор:  <#POSTER#>
-Врем�: <#DATE#>
-
-Дл� �овершени� дей�твий � �ообщением перейдите по ��ылке: <#LINK#> 
----------------------------------- 
-Е�ли вы больше не хотите получать такие уведомлени�, удалите ваш e-mail адре� в на�тройках форума.
-
-�дре� форума: <#BOARD_ADDRESS#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom><![CDATA[<#NAME#>, <#POSTER#> открыл новую тему "<#TITLE#>" в разделе "<#FORUM#>".
+
+----------------------------------------------------------------------
+<#POST#>
+----------------------------------------------------------------------
+
+�дре� темы: <#URL#>
+
+Отпи�ать��:
+-------------- 
+Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
+Е�ли вы не хотите больше получать никаких уведомлений � форума про�то отключите �оответ�твующую опцию « Сообщать мне обо в�ех изменени�х, проводимых админи�тратором форума.» в вашем профиле в меню «Общие на�тройки».
+]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_email_content</word_pack>
+      <word_key>subject__subs_new_topic</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> posted topic <a href='%s'>%s</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> �оздал тему <a href='%s'>%s</a>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -2087,55 +2252,6 @@ removing your email address from the forum settings options.
       <word_key>subject__new_topic_queue_notify</word_key>
       <word_default>New Topic Awaiting Approval</word_default>
       <word_custom>�ова� тема, требующа� активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_topic_queue_notify</word_key>
-      <word_default><![CDATA[Hello!
-
-This email has been sent from: <#BOARD_NAME#>.
-
-A new topic has been entered into the moderation queue and is awaiting
-approval.
-
-----------------------------------
-Topic: <#TOPIC#>
-Forum: <#FORUM#>
-Author: <#POSTER#>
-Time: <#DATE#>
-Manage Queue: <#LINK#>
-----------------------------------
-<#POST#>
-----------------------------------
-
-If you no longer require notification, you can stop these emails by simply
-removing your email address from the forum settings options.
-
-<#BOARD_ADDRESS#>
-
-]]></word_default>
-      <word_custom><![CDATA[<#BOARD_NAME#>
-
-�а форуме по�вило�ь нова� тема дл� проверки и публикации/удалени� модератором.
-
-Тема: <#TOPIC#>
-Форум: <#FORUM#>
-�втор:  <#POSTER#>
-Врем�: <#DATE#>
-
-Дл� �овершени� дей�твий � темой перейдите по ��ылке: <#LINK#> 
----------------------------------- 
-Е�ли вы больше не хотите получать такие уведомлени�, удалите ваш e-mail адре� в на�тройках форума.
-
-�дре� форума: <#BOARD_ADDRESS#>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -2158,3306 +2274,122 @@ The post that <#MEMBER_NAME#> submitted can be found here:
 ----------------------------------
 
 If you no longer wish to receive notifications of quoted posts, you can adjust your preferences on the
-board by clicking My Settings, and then choosing Notification Options.
+community by clicking My Settings, and then choosing Notification Options.
 
 <#BOARD_ADDRESS#>
 
 ]]></word_default>
-      <word_custom><![CDATA[Здрав�твуйте!
-
-Уведомл�ем ва� о том, что одно из ваших �ообщений было процитировано <#MEMBER_NAME#>.
-
-Прочитать �ообщение от <#MEMBER_NAME#> вы можете по ��ылке: 
-
-<#NEW_POST#>
-
-----------------------------------
-<#POST#>
-----------------------------------
-
-Е�ли вы больше не хотите получать уведомлени� о цитировании ваших �ообщений, вы можете изменить необходимые параметры в на�тройках вашего профил� в разделе «�а�тройки уведомлений».
-
+      <word_custom><![CDATA[Здрав�твуйте!
+
+Уведомл�ем ва� о том, что одно из ваших �ообщений было процитировано <#MEMBER_NAME#>.
+
+Прочитать �ообщение от <#MEMBER_NAME#> вы можете по ��ылке: 
+
+<#NEW_POST#>
+
+----------------------------------
+<#POST#>
+----------------------------------
+
+Е�ли вы больше не хотите получать уведомлени� о цитировании ваших �ообщений, вы можете изменить необходимые параметры в на�тройках вашего профил� в разделе «�а�тройки уведомлений».
+
 <#BOARD_ADDRESS#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_comment_added</word_key>
-      <word_default><![CDATA[<a href='%s'>New comment</a> from <a href='%s'>%s</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>�овый комментарий</a> от <a href='%s'>%s</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_comment_added</word_key>
-      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
-
-<#COMMENT_NAME#> has left you a comment on your profile.
-
-Manage your comments: <#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, 
-
-<#COMMENT_NAME#> о�тавил комментарий в вашем профиле.
-
-Управление такими комментари�ми по ��ылке: <#LINK#>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__post_was_quoted</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> <a href='%s'>quoted</a> a <a href='%s'>post you made</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> <a href='%s'>процитировал</a> ваше <a href='%s'>�ообщение</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_comment_request</word_key>
-      <word_default><![CDATA[<a href='%s'>New comment</a> from <a href='%s'>%s</a> pending approval]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>�овый комментарий</a> от <a href='%s'>%s</a> ожидает подтверждени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_comment_request</word_key>
-      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
-
-<#COMMENT_NAME#> has left you a comment that requires your approval.
-
-As you've chosen to approve all new comments the new comment will not appear on your
-profile until it's been approved.
-
-Log in and then manage your comments: <#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#COMMENT_NAME#> о�тавил комментарий в вашем профиле. Так как у ва� включена премодераци� комментариев, дл� того, чтобы он по�вил��, необходимо вам его активировать, в противном �лучае удалить. Сделать �то можно по ��ылке: <#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_friend_request</word_key>
-      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
-
-<#FRIEND_NAME#> wants to be your friend!
-
-This message has been sent because <#FRIEND_NAME#> has added you to their friends
-list. As you've chosen to approve all friend requests, you will need to visit your
-friends list and approve them.
-
-Log in and then manage your friends: <#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> хочет �тать вашим другом! Так как у ва� включена проверка желающих �тать вашими друзь�ми, то дл� того, чтобы он по�вил�� в вашем �пи�ке друзей, его запро� необходимо подтвердить (или отклонить). Сделать �то можно по ��ылке: <#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_friend_added</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> added you as a friend]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> добавил ва� в друзь�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_friend_added</word_key>
-      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
-
-<#FRIEND_NAME#> has successfully added you to their friends list.
-
-Manage your friends: <#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> �тал вашим другом.
-Управление �пи�ком ваших друзей: <#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_friend_approved</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> approved your friend request]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> активировал дружбу � вами]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_friend_approved</word_key>
-      <word_default><![CDATA[<#MEMBERS_DISPLAY_NAME#>,
-
-<#FRIEND_NAME#> has approved your friend request!
-
-Log in and then manage your friends: <#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#MEMBERS_DISPLAY_NAME#>, <#FRIEND_NAME#> прин�л предложение �тать вашим другом! Управление вашим �пи�ком друзей по ��ылке: <#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_friend_request</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> sent you a <a href='%s'>friend request</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> <a href='%s'>хочет</a> дружить � вами]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__account_created</word_key>
-      <word_default>Your account has been created</word_default>
-      <word_custom>Ваша учетна� запи�ь у�пешно �оздана</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>account_created</word_key>
+      <word_key>subs_with_post</word_key>
       <word_default><![CDATA[<#NAME#>,
 
-Your account has been created successfully at <#BOARD_NAME#>.
+<#POSTER#> has just posted a reply to a topic that you have subscribed to titled "<#TITLE#>".
 
-If we were waiting on a parental consent form, this means the form has been received and documented.
+----------------------------------------------------------------------
+<#POST#>
+----------------------------------------------------------------------
 
-Your details are as follows:
+The topic can be found here: <#URL#>
 
-Username: <#NAME#>
-Email Address: <#EMAIL#>
-Password: <#PASSWORD#>
 
-Please be aware that we do not store a plain text copy of your password, and you can change your password at any time through your control panel on the site.
 
-Visit this link to join into our discussions!
+If you have configured in your control panel to receive immediate topic reply notifications, you may receive an
+email for each reply made to this topic.  Otherwise, only 1 email is sent per board visit for each subscribed topic. 
+This is to limit the amount of mail that is sent to your inbox.
 
-<#BOARD_ADDRESS#>
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time here: <#UNSUBCRIBE_URL#>
 ]]></word_default>
-      <word_custom><![CDATA[<#NAME#>,
-
-Ваша учетна� запи�ь у�пешно �оздана на форуме <#BOARD_NAME#>
-
-Данные дл� до�тупа к форумам �ледующие:
-
-Им� пользовател�: <#NAME#> 
-Пароль: <#PASSWORD#>
-E-mail: <#EMAIL#>
-
-Пожалуй�та, запомните, что мы не храним ваш пароль, но вы можете его изменить в любой врем� в ваших личных данных.
-
-При�тного общени�!
-
-<#BOARD_ADDRESS#>
+      <word_custom><![CDATA[<#NAME#>, <#POSTER#> опубликовал ответ в тему "<#TITLE#>", на которую вы подпи�аны.
+
+----------------------------------------------------------------------
+<#POST#>
+----------------------------------------------------------------------
+
+�дре� темы: <#URL#>
+
+Е�ли у ва� включена немедленна� до�тавка уведомлений о новых �ообщени�х в �той теме, вы будете получать пи�ьмо � уведомлением на каждый новый ответ в тему. В противном �лучае только одно такое пи�ьмо �о в�еми новыми ответами будет приходить между каждым вашим визитом на форум.
+
+Вы можете управл�ть �воими подпи�ками в боковом блоке «Подпи�ки» вкладки «Об�уждени�» на форуме.
 ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>subject__error_log_notification</word_key>
-      <word_default>An error has been generated on your site</word_default>
-      <word_custom>�а вашем форуме возникла ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>subject__subs_with_post</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> replied to <a href='%s'>%s</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> ответил в тему <a href='%s'>%s</a>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_email_content</word_pack>
-      <word_key>error_log_notification</word_key>
-      <word_default><![CDATA[Dear admin,
+      <word_key>email_member</word_key>
+      <word_default><![CDATA[<#MEMBER_NAME#>,
 
-An error has been generated on your forums.  You are being sent this notification based on your error log notification settings in the Admin Control Panel.  This error meets the criteria for errors that you have set to be notified about.
+<#FROM_NAME#> has sent you this email from <#BOARD_ADDRESS#>.
 
-The error code is: <#CODE#>
-The error message is: <#MESSAGE#>
-The user who saw this error is: <#VIEWER#>
-The IP address of this user is: <#IP_ADDRESS#>
 
-Please login to your Admin Control Panel to use the error log viewer tool for further information.
+<#MESSAGE#>
+
+---------------------------------------------------
+Please note that <#BOARD_NAME#> has no control over the
+contents of this message.
+---------------------------------------------------
 
-<#BOARD_ADDRESS#>
 ]]></word_default>
-      <word_custom><![CDATA[�а вашем форуме возникла ошибка!
-
-Вы получили �то уведомление, так как у ва� включена �оответ�твующа� функци� в админцентре.
-
-Данные по ошибке.
-
-Код ошибки: <#CODE#> 
-Сообщение: <#MESSAGE#> 
-Пользователь, кто обнаружил ошибку: <#VIEWER#> 
-Его IP-адре�: <#IP_ADDRESS#> 
-
-Более подробную информаци� вы можете получить, про�мотрев журнал error_log.
-
-<#BOARD_ADDRESS#>
+      <word_custom><![CDATA[<#BOARD_ADDRESS#>
+
+<#MEMBER_NAME#>, 
+
+<#FROM_NAME#> отправил вам пи�ьмо.
+
+---------------------------------------------------
+ <#MESSAGE#> 
+--------------------------------------------------- 
+
+Имейте в виду, что форум не не�ет ответ�твенно�ть за �одержание данного пи�ьма.
 ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__personal_convo_invite</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> has added you to a <a href='%s'>personal conversation</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> приглашает ва� прин�ть уча�тие в <a href='%s'>бе�еде</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>personal_convo_invite</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#POSTER#> has added you to their personal conversation entitled "<#TITLE#>".
-
-You can read this personal conversation by following the link below:
-
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> добавил ва� к личной бе�еде "<#TITLE#>". 
-Вы можете прочитать диалог по указанной ниже ��ылке:
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>personal_convo_new_reply</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#POSTER#> has replied to a personal conversation entitled "<#TITLE#>".
-
-<#POSTER#> said:
-======================================================================
-<#TEXT#>
-======================================================================
-
-PLEASE DO NOT REPLY DIRECTLY TO THIS EMAIL!
-You can reply to this personal conversation by following the link below:
-
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> ответил в личную бе�еду "<#TITLE#>".
-<#POSTER#> �казал:
-<#TEXT#>
-Вы можете про�мотреть полный диалог бе�еды по указанной ниже ��ылке:
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__personal_convo_new_reply</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> has replied to a <a href='%s'>personal conversation</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> напи�ал новое �ообщение в <a href='%s'>личной бе�еде</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__personal_convo_new_convo</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> started a new <a href='%s'>personal conversation</a> with you]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> начал новую <a href='%s'>бе�еду</a> � вами]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>personal_convo_new_convo</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#POSTER#> has sent you a new personal conversation entitled "<#TITLE#>".
-
-<#POSTER#> said:
-======================================================================
-<#TEXT#>
-======================================================================
-
-PLEASE DO NOT REPLY DIRECTLY TO THIS EMAIL!
-You can reply to this personal conversation by following the link below:
-
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>, <#POSTER#> отправил вам �ообщение � заголовком "<#TITLE#>". 
-<#POSTER#> �казал: ======================================================================
-<#TEXT#>
-Вы можете про�мотреть бе�еду � ним, пройд� по указанной ниже ��ылке:
-<#BOARD_ADDRESS#><#LINK#>
-]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>new_status</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#OWNER#> has just posted a new status update.
-
-======================================================================
-<#STATUS#>
-======================================================================
-
-
-You can turn off status notification by visiting <#URL#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>,
-
-<#OWNER#> только что обновил �тату�.
-
-======================================================================
-<#STATUS#>
-======================================================================
-
-
-Вы можете отключить уведомлени� по адре�у <#URL#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__other_status_reply</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> has replied to <a href='%s'>%s</a>'s <a href='%s'>status</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> прокомментировал <a href='%s'>%s</a> <a href='%s'>�тату�</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__status_reply</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a> has replied to your <a href='%s'>status</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a> прокомментировал ваш <a href='%s'>�тату�</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>status_reply</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-<#POSTER#> <#BLURB#>
-
-Status: (<#OWNER#>) <#STATUS#>
-======================================================================
-<#TEXT#>
-======================================================================
-
-
-You can turn off status notification by visiting <#URL#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>,
-
-<#POSTER#> <#BLURB#>
-
-Стату�: (<#OWNER#>) <#STATUS#>
-======================================================================
-<#TEXT#>
-======================================================================
-
-
-Вы можете отключить уведомлени� по адре�у <#URL#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__new_status</word_key>
-      <word_default><![CDATA[<a href='%s'><#OWNER#></a> has posted a new <a href='%s'>status update</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'><#OWNER#></a> обновил �вой <a href='%s'>�тату�</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>email_convo</word_key>
-      <word_default><![CDATA[<#NAME#>,
-
-Attached to this message is a HTML file containing a personal conversation archive:
-Conversation title: <#TITLE#>
-Conversation started: <#DATE#>
-<#LINK#>
-]]></word_default>
-      <word_custom><![CDATA[<#NAME#>,
-
-К пи�ьму прикреплен архив личной перепи�ки:
-�азвание: <#TITLE#>
-�ачало: <#DATE#>
-<#LINK#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>header</word_key>
-      <word_default/>
-      <word_custom/>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>footer</word_key>
-      <word_default><![CDATA[
-Regards,
-
-The <#BOARD_NAME#> team.
-<#BOARD_ADDRESS#>
-]]></word_default>
-      <word_custom><![CDATA[С уважением, <#BOARD_NAME#>, <#BOARD_ADDRESS#> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_email_content</word_pack>
-      <word_key>subject__email_convo</word_key>
-      <word_default>Personal Conversation Archive</word_default>
-      <word_custom>�рхив личной перепи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>missing_files</word_key>
-      <word_default>Sorry, some required files are missing. Please go back and try again.</word_default>
-      <word_custom>От�ут�твуют необходимые дл� работы файлы. Верните�ь назад и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_permission</word_key>
-      <word_default>Sorry, but you do not have permission to use this feature. If you are not logged in, you may do so using the form below if available.</word_default>
-      <word_custom>К �ожалению вы не можете во�пользовать�� �той возможно�тью. Е�ли вы еще не вошли на форум, возможно, �делав �то вы �можете во�пользовать�� ей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forgot_pass</word_key>
-      <word_default>Forgotten your password?</word_default>
-      <word_custom>Забыли пароль?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>pass_link</word_key>
-      <word_default>Click here!</word_default>
-      <word_custom>Вам �юда!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>complete_form</word_key>
-      <word_default>You must complete the form fully before proceeding. Please go back and check the data you entered.</word_default>
-      <word_custom>�еобходимо заполнить форму полно�тью. Пожалуй�та верните�ь назад и проделайте �то.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>stf_no_name</word_key>
-      <word_default>You must enter the name of the person you are sending this page to</word_default>
-      <word_custom>�еобходимо вве�ти им� получател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>stf_no_subject</word_key>
-      <word_default>You must enter a subject for the email</word_default>
-      <word_custom>�еобходимо вве�ти тему �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>stf_no_msg</word_key>
-      <word_default>You must enter a message to send</word_default>
-      <word_custom>�еобходимо вве�ти тек�т �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>stf_no_email</word_key>
-      <word_default>You must enter the email address of the person you are sending this page to</word_default>
-      <word_custom>�еобходимо вве�ти e-mail адре� человека, которому вы хотите отправить �ту �траницу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>exp_text</word_key>
-      <word_default><![CDATA[Sorry, an error occurred. If you are unsure on how to use a feature, or don't know why you got this error message, try looking through the help files for more information.]]></word_default>
-      <word_custom>Возникла ошибка. Е�ли вы не уверены, что правильно и�пользуете функцию, �оветуем вам обратить�� к нашей �и�теме помощи за дополнительной информацией.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>erl_log_in_submit</word_key>
-      <word_default>Log In</word_default>
-      <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>erl_enter_name</word_key>
-      <word_default>Your account username</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>erl_enter_pass</word_key>
-      <word_default>Your account password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_friend_mid</word_key>
-      <word_default>Only members have access to the friends feature.</word_default>
-      <word_custom>Возможно�ть «Друзь�» до�тупна только зареги�трированным пользовател�м.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>bad_email_message</word_key>
-      <word_default>The email message contained data you are not allowed to send.  Please contact an administrator with any questions.</word_default>
-      <word_custom>В вашем пи�ьме �одержит�� не допу�тима� информаци�. Вы можете �в�зать�� � админи�трацией форума за дополнительными разъ��нени�ми.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_ignore_id</word_key>
-      <word_default>We could not find the member you were attempting to ignore.</word_default>
-      <word_custom>Си�теме не удало�ь найти пользовател�, которого вы хотите зане�ти в �пи�ок игнорируемых.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_archive_messages</word_key>
-      <word_default>Sorry, no personal messages were found using that search critera. Try again and broaden the scope.</word_default>
-      <word_custom>К �ожалению по данному пои�ковому запро�у личных �ообщений не найдено. Попробуйте ра�ширить критерии пои�ка и повторить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>upload_failed</word_key>
-      <word_default>The upload failed. Please contact a member of staff to help rectify the problem.</word_default>
-      <word_custom>Загрузка не удала�ь. Пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reg_off</word_key>
-      <word_default>The board administrator is no longer accepting any new registrations at the moment.</word_default>
-      <word_custom>�дмини�траци� отключила реги�трацию на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_no_delete_permission</word_key>
-      <word_default>You do not have permission to delete this topic.</word_default>
-      <word_custom>У ва� не до�таточно прав дл� удалени� темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_event</word_key>
-      <word_default>We could not determine which event you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти �обытие на которое вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>err_attach_not_attached</word_key>
-      <word_default>You do not have permission to view this attachment.</word_default>
-      <word_custom>У ва� не до�таточно прав дл� про�мотра �того прикрепленного файла.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>attach_file_missing</word_key>
-      <word_default>We could not find the attachment you were attempting to view.</word_default>
-      <word_custom>Запрашиваемый вами прикрепленный файл не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_permission_to_download</word_key>
-      <word_default>You do not have permission to view this attachment.</word_default>
-      <word_custom>У ва� не до�таточно прав дл� загрузки данного прикрепленного файла.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>attach_no_attachment</word_key>
-      <word_default>We could not find the attachment you were attempting to view.</word_default>
-      <word_custom>Запрашиваемый вами прикрепленный файл не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_such_user</word_key>
-      <word_default>We could not find the member you requested.</word_default>
-      <word_custom>Запрашиваемый вами пользователь не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>server_too_busy</word_key>
-      <word_default>Sorry, the server is too busy to handle your request, please try again in a moment</word_default>
-      <word_custom>Прино�им �вои изменени�. Сервер в данный момент �лишком перегружен. Зайдите позже.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>account_susp</word_key>
-      <word_default>Your account has been temporarily suspended. This suspension is due to end on %s.</word_default>
-      <word_custom>Ваша учетна� запи�ь заблокирована. Срок окончани� блокировки: %s.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>portal_not_enabled</word_key>
-      <word_default>The portal has not been enabled. Please contact an administrator.</word_default>
-      <word_custom>Портал не включен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_chat_service_type</word_key>
-      <word_default>The administrator has not configured the service type for the chat room yet.</word_default>
-      <word_custom>Данный �ерви� чата не на�троен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_chat_access</word_key>
-      <word_default>You do not have access to our chat room.</word_default>
-      <word_custom>У ва� нет до�тупа к нашему чату.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_chat_default_room</word_key>
-      <word_default>The administrator has not configured a default chat room yet.</word_default>
-      <word_custom>Чат не на�троен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_no_birthdays</word_key>
-      <word_default>We did not find any birthdays on this date.</word_default>
-      <word_custom>В �тот день дней рождени� не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_chat_account_number</word_key>
-      <word_default>The chat room has not been properly setup by the administrator (the chat room account number has not been supplied).</word_default>
-      <word_custom>Чат не у�тановлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_invalid_date</word_key>
-      <word_default>The date you chose for the event is not a valid date.  For example, February 30th and April 31st are invalid dates.  Please verify your input and resubmit the form.</word_default>
-      <word_custom>Выбранна� вами дата неверна. �апример не может быть 30 феврал� или 31 апрел�. Пожалуй�та убедите�ь в правильно�ти ввода даты и отправьте форму �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_invalid_date_view</word_key>
-      <word_default>You requested to see events for an invalid date.  Please go back and try again.</word_default>
-      <word_custom>Вы пытаете�ь выве�ти �обыти� дл� неверной даты. Пожалуй�та верните�ь назад и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_range_wrong</word_key>
-      <word_default>The end date for a ranged or recurring event must occur after the start date.</word_default>
-      <word_custom>Дата окончани� �обыти� должна быть по�ле даты начала.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_title_too_long</word_key>
-      <word_default>The calendar title cannot be longer than 64 characters.</word_default>
-      <word_custom>�азвание �обыти� не может превышать 64 �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_no_title</word_key>
-      <word_default>You must submit a valid event title in order to save this event.</word_default>
-      <word_custom>�еобходимо указать название �обыти�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_post_too_long</word_key>
-      <word_default>Your event details were too large.  Please shorten it up a little.</word_default>
-      <word_custom>Опи�ание �обыти� велико. Попробуйте �ократить его и повторить добавление �обыти�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_post_too_short</word_key>
-      <word_default>You must submit event details in order to save this event.</word_default>
-      <word_custom>Дл� добавлени� �обыти� необходимо более подробно опи�ать его.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_no_post_perm</word_key>
-      <word_default>You do not have permission to add events to this calendar.</word_default>
-      <word_custom>Вы не можете добавл�ть новые �обыти� в �тот календарь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_no_edit_perm</word_key>
-      <word_default>You do not have permission to edit this calendar event.</word_default>
-      <word_custom>Вы не можете редактировать �обыти� �того календар�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_no_guests</word_key>
-      <word_default>You must be logged in to save events to our calendar.</word_default>
-      <word_custom>Добавл�ть �обыти� в календарь могут только авторизованные пользователи.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_event_not_found</word_key>
-      <word_default>We could not find that calendar event.</word_default>
-      <word_custom>Запрашиваемое вами �обытие не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_dmy_missing</word_key>
-      <word_default>The day, month or year values supplied in the URL do not appear to valid.</word_default>
-      <word_custom>Значени� даты, ме��ца или года, переданные по ��ылке не верны.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_bad_approve</word_key>
-      <word_default>You do not have permission to approve this calendar event.</word_default>
-      <word_custom>У ва� нет прав дл� удалени� �того �обыти�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_bad_key</word_key>
-      <word_default>There was a problem authenticating your request.  Please go back and click the link again.</word_default>
-      <word_custom>Ошибка безопа�но�ти. Пожалуй�та верните�ь назад и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>cal_no_perm</word_key>
-      <word_default>You do not have permission to view this calendar or this calendar does not exist.</word_default>
-      <word_custom>Вы не можете про�матривать �тот календарь, либо календарь про�то не �уще�твует в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_bad_delete</word_key>
-      <word_default>We could not find the event you were attempting to delete.</word_default>
-      <word_custom>Удал�емое вами �обытие не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>calendar_delete_no_perm</word_key>
-      <word_default>You do not have permission to delete this calendar event.</word_default>
-      <word_custom>Вы не можете удал�ть �обыти� из �того календар�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warned_already</word_key>
-      <word_default>This member has been warned once already within the allotted time allowed.</word_default>
-      <word_custom>Вы пытаете�ь предупредить пользовател�, который уже был предупрежден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_protected_member</word_key>
-      <word_default>The member you are attempting to warn is protected from such actions.</word_default>
-      <word_custom>Вы пытаете�ь предупредить пользовател�, который защищен от подобных дей�твий.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_past_max_low</word_key>
-      <word_default><![CDATA[You cannot lower this member's warn level any more at this time.]]></word_default>
-      <word_custom>�а данный момент времени понизить уровень предупреждений у данного пользовател� невозможно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_bad_key</word_key>
-      <word_default>Your secure key, used to verify your identity, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
-      <word_custom>Ключ безопа�но�ти, который подтверждает вашу лично�ть, не �овпадает � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_past_max_high</word_key>
-      <word_default><![CDATA[You cannot raise this member's warn level any higher at this time.]]></word_default>
-      <word_custom>�а данный момент предупредить пользовател� невозможно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_member_notes</word_key>
-      <word_default>You do not have permission to access this area of the site.</word_default>
-      <word_custom>Вы не можете во�пользовать�� данной возможно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_no_user</word_key>
-      <word_default>We could not find the requested user.  Please go back and try again.</word_default>
-      <word_custom>Запрошенный вами пользователь не �уще�твует. Попробуйте вернуть�� назад и повторить попытку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_no_access</word_key>
-      <word_default>You do not have permission to access this area of the site.</word_default>
-      <word_custom>Вы не можете во�пользовать�� данной возможно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>warn_system_off</word_key>
-      <word_default>The warn system is presently disabled.</word_default>
-      <word_custom>Си�тема предупреждений отключена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>settings_profiles_off</word_key>
-      <word_default>You are not permitted to view member profiles.</word_default>
-      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>profiles_off</word_key>
-      <word_default>You are not permitted to view member profiles.</word_default>
-      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>profiles_no_member</word_key>
-      <word_default>We could not find the member whose profile you were attempting to view.</word_default>
-      <word_custom>Вы запро�или профиль не�уще�твующего пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>photos_no_id</word_key>
-      <word_default><![CDATA[We could not determine which member's photo you were attempting to view.]]></word_default>
-      <word_custom>Пользовател�, чью фотографию вы пытаете�ь по�мотреть, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>status_off</word_key>
-      <word_default>You are not permitted to change your status.</word_default>
-      <word_custom>Вы не можете измен�ть �тату�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>photos_profiles_off</word_key>
-      <word_default>You are not permitted to view member profiles.</word_default>
-      <word_custom>Вы не можете про�матривать пользователь�кие профили.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>dnames_no_id</word_key>
-      <word_default><![CDATA[We could not determine which member's display name history you were attempting to view.]]></word_default>
-      <word_custom>�е �уще�твует и�тории изменени� имен дл� запрашиваемого вами пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>dnames_off</word_key>
-      <word_default>The administrator does not allow members to change their display names.</word_default>
-      <word_custom>Возможно�ть изменени� имени пользовател� отключена админи�тратором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>onlinelist_disabled</word_key>
-      <word_default>You are not permitted to view our online list.</word_default>
-      <word_custom>Вы не можете про�матривать �пи�ок онлайн пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>comments_profiles</word_key>
-      <word_default>You are not permitted to view member profiles.</word_default>
-      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>dname_profiles_off</word_key>
-      <word_default>You are not permitted to view member profiles.</word_default>
-      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_you_be_banned_yo</word_key>
-      <word_default>You have been banned from this personal conversation.</word_default>
-      <word_custom>К �ожалению вам закрыли до�туп к �той перепи�ке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_no_msgid</word_key>
-      <word_default>We could not determine which message you were attempting to view.</word_default>
-      <word_custom>Сообщени�, которое вы пытаете�ь про�мотреть, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_bad_key</word_key>
-      <word_default>Your secure key, used to verify your identity, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
-      <word_custom>Ключ безопа�но�ти, который подтверждает вашу лично�ть, не �овпадает � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_disabled</word_key>
-      <word_default>You are not allowed to use the private messaging system.</word_default>
-      <word_custom>Вы не можете пользовать�� личными �ообщени�ми.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>messenger_no_guests</word_key>
-      <word_default>You must be logged in to use the private messaging system.</word_default>
-      <word_custom>Дл� и�пользовани� личных �ообщений необходимо войти в �и�тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>cannot_view_memberlist</word_key>
-      <word_default>You do not have permission to view the member listing.</word_default>
-      <word_custom>Вы не можете про�матривать �пи�ок пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>customfields_toobig</word_key>
-      <word_default><![CDATA[One of the fields you filled in was too large ('%s').  Please shorten it up a little.]]></word_default>
-      <word_custom><![CDATA[Одно из заполненных вами полей, �одержит �лишком большое значение ('%s'). ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>customfields_empty</word_key>
-      <word_default><![CDATA[You did not fill in a value for one of the fields that requires a value ('%s').]]></word_default>
-      <word_custom><![CDATA[Вы не заполнили об�зательное поле ('%s').]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>customfields_invalid</word_key>
-      <word_default><![CDATA[One of the fields you filled in requires values in a specific format, but the value you supplied did not meet this format ('%s').]]></word_default>
-      <word_custom><![CDATA[Значение одного из заполненных вами полей не �оответ�твует ожидаемому формату ('%s').]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>member_bad_birthday</word_key>
-      <word_default>You must enter for your birthday at least the month and day of your birthday.</word_default>
-      <word_custom>Вы должны указать как минимум ме��ц и день вашего дн� рождени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>members_sig_too_long</word_key>
-      <word_default>Your signature exceeds the maximum allowed length.  Please go back and shorten it a little.</word_default>
-      <word_custom>У ва� �лишком длинна� подпи�ь. Попробуйте ее немного �ократить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>members_profile_disabled</word_key>
-      <word_default>You are not permitted to modify all or some of your profile information.</word_default>
-      <word_custom>Вы не можете измен�ть некоторую информацию в �воем профиле.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>pp_friend_timeflood</word_key>
-      <word_default>You cannot re-add a friend for five minutes after removing them</word_default>
-      <word_custom>Вы не можете добавить �того пользовател� в друзь�, потому что менее п�ти минут назад вы отказали�ь от дружбы � ним.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>friends_not_enabled</word_key>
-      <word_default>The friends feature is not enabled on this board.</word_default>
-      <word_custom>Возможно�ть добавлени� пользователей в друзь� на данном форуме отключена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_mismatch_topic</word_key>
-      <word_default>There was a problem loading the post you are attempting to edit.  Please notify an administrator.</word_default>
-      <word_custom>При попытке редактировани� �ообщени� возникла проблема. Пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>members_tool_supmod</word_key>
-      <word_default>You do not have permission to access this moderator tool.</word_default>
-      <word_custom>Вы не имеете до�тупа к �той модератор�кой возможно�ти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>post_too_short</word_key>
-      <word_default>You must enter a post.</word_default>
-      <word_custom>Сообщение �лишком короткое.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>post_too_long</word_key>
-      <word_default>Your post was too long.  Please go back and shorten it a little.</word_default>
-      <word_custom>Сообщение �лишком длинное.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_guests</word_key>
-      <word_default>You must be logged in to see this forum.</word_default>
-      <word_custom>Дл� про�мотра �того форума вы должны быть авторизованным пользователем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_not_enough_posts</word_key>
-      <word_default>You do not have enough posts to post in this forum.</word_default>
-      <word_custom>Вы еще не набрали необходимое количе�тво �ообщений, чтобы отправл�ть �ообщени� в данном форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_permission</word_key>
-      <word_default>You do not have permission to view this forum.</word_default>
-      <word_custom>Вы не можете про�матривать �тот форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_view_topic</word_key>
-      <word_default>You do not have permission to view this topic.</word_default>
-      <word_custom>Вы не можете про�матривать �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_not_enough_posts</word_key>
-      <word_default>You do not have enough posts to view topics in this forum.</word_default>
-      <word_custom>Вы еще не набрали необходимого количе�тва �ообщений чтобы про�матривать �пи�ок тем данного форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_bad_auth_key</word_key>
-      <word_default>Your secure key, used to verify you are posting the topic, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
-      <word_custom>Ваш ключ безопа�но�ти, и�пользующий�� дл� проверки того, что именно вы отправл�ете данные формы не �овпал � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>flood_control</word_key>
-      <word_default>The administrator has limited the number of new posts you can submit within a short time frame. Please wait %s seconds before replying or posting a new topic.</word_default>
-      <word_custom>Стоит делать передышку в %s �екунд между отправками новых тем и �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_restricted</word_key>
-      <word_default>Your posting rights have been removed by an administrator.</word_default>
-      <word_custom>Вам запрещено общать�� на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_off_susp</word_key>
-      <word_default>Your posting rights have been temporarily suspended. The suspension is due to end %s.</word_default>
-      <word_custom>Вам запретили общать�� на форуме до %s.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>posting_bad_action</word_key>
-      <word_default>We could not determine what action you were attempting to take.</word_default>
-      <word_custom>�евозможно определить что пытаете�ь �делать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>multimod_not_found</word_key>
-      <word_default>We could not determine which multi-moderation tool you were attempting to use.</word_default>
-      <word_custom>Запрашиваемое дей�твие мульти-модерации не �уще�твует в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>multimod_no_topic</word_key>
-      <word_default>We could not determine which topic you were attempting to take action against.</word_default>
-      <word_custom>Темы не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>multimod_no_perms</word_key>
-      <word_default>You do not have permission to use this multi-moderation tool on this topic.</word_default>
-      <word_custom>Вы не можете и�пользовать мульти-модерацию на данной теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_bad_fid</word_key>
-      <word_default>You appear to have submitted an invalid forum.</word_default>
-      <word_custom>Идентификатор форума неверен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_bad_tid</word_key>
-      <word_default>You appear to have submitted an invalid topic.</word_default>
-      <word_custom>Идентификатор темы неверен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_bad_pid</word_key>
-      <word_default>You appear to have submitted an invalid post.</word_default>
-      <word_custom>Идентификатор �ообщени� неверен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_authorization_key</word_key>
-      <word_default>We use an authorization key to verify you really submitted the form, and the authorization key was not supplied with your form submission or was invalid.  Please go back, reload the form and try to submit it again.</word_default>
-      <word_custom>Дл� подтверждени� того, что именно вы отправили формы и�пользует�� ключ авторизации. Вме�те � �той формой ключ не был отправлен либо он неверный. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_mm_id</word_key>
-      <word_default>We could not determine which multi-moderation tool you were attempting to use.</word_default>
-      <word_custom>�евозможно определить какой ин�трумент мультимодерации вы пытаете�ь и�пользовать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_multimod</word_key>
-      <word_default>You do not have permission to use this multi-moderation tool.</word_default>
-      <word_custom>Вы не можете и�пользовать функцию мульти-модерации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_um_what_now</word_key>
-      <word_default><![CDATA[We couldn't figure out what you were attempting to do.]]></word_default>
-      <word_custom>Дей�твие, которое вы пытаете�ь произве�ти, не �уще�твует в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_stupid_beggar</word_key>
-      <word_default>Out of all the options in all the drop down, you had to choose one with dashed lines, well done. Go back and behave yourself.</word_default>
-      <word_custom>Отлично, вы только что умудрили�ь из в�ех опций в �пи�ке выбрать �амую бе�полезную, �о�то�щую из одних черточек. Верните�ь назад и и�правьте ошибку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_prune_topics</word_key>
-      <word_default>We could not find any topics to prune that met your filter criteria.</word_default>
-      <word_custom>Си�теме не удало�ь найти �ообщени� дл� удалени�, удовлетвор�ющие вашему фильтру.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_prune_member</word_key>
-      <word_default>We could not find the member whose topics you are attempting to prune.</word_default>
-      <word_custom>Пользователь, чьи �ообщени� вы пытаете�ь удалить, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_topics_merge_two</word_key>
-      <word_default>You need to select at least two topics in order to merge them.</word_default>
-      <word_custom>Дл� объединени� необходимо выбрать как минимум две темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_open_perms</word_key>
-      <word_default>You do not have permission to open this topic.</word_default>
-      <word_custom>Вы не можете открыть �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_topic_title</word_key>
-      <word_default>You must specify the topic title.</word_default>
-      <word_custom>Вы должны указать название темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_open_opened</word_key>
-      <word_default>The topic you are attempting to open is already open.</word_default>
-      <word_custom>Вы пытаете�ь открыть уже открытую тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_delete_post_find</word_key>
-      <word_default>We could not find the post you were attempting to delete.</word_default>
-      <word_custom>Сообщение, которое вы пытаете�ь удалить, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_move_save</word_key>
-      <word_default>Why, oh why, would you attempt to move a topic into the same forum it is already in?  Do YOU see the logic in that?</word_default>
-      <word_custom>Вы пытаете�ь переме�тить тему в тот же �амый форум, в котором она находит�� �ейча�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>moderate_no_permission</word_key>
-      <word_default>You do not have permission to carry out that function.</word_default>
-      <word_custom>Вы не можете и�пользовать �ту возможно�ть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_move_forum</word_key>
-      <word_default>We could not determine which forum you were attempting to move the topic into.</word_default>
-      <word_custom>Форума, куда вы пытаете�ь перене�ти тему, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_same_topics</word_key>
-      <word_default>You cannot merge a topic into itself.  That would be illogical captain! (tm)</word_default>
-      <word_custom>Вы пытаете�ь объединить тему �аму � �обой. Это же не логично!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_missing_old_topic</word_key>
-      <word_default>We could not find one of the topics you were attempting to merge.</word_default>
-      <word_custom>�е �уще�твует одной из тем, которые вы пытаете�ь объединить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_missing_url_title</word_key>
-      <word_default>You must fill in the form completely.  You omitted either the URL of the topic or the new topic title.</word_default>
-      <word_custom>Похоже что вы не заполнили форму надлежащим образом. Вы пропу�тили или URL, или название новой темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_close_topic</word_key>
-      <word_default>You do not have permission to close this topic.</word_default>
-      <word_custom>Вы не можете закрыть �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_delete_topic</word_key>
-      <word_default>You do not have permission to delete this topic.</word_default>
-      <word_custom>Вы не можете удалить �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_merge_posts</word_key>
-      <word_default><![CDATA[It appears we're missing some input from your forum submission.  Did you fill in the form completely?]]></word_default>
-      <word_custom>�едо�таточно данных дл� завершени� �того дей�тви�. Пожалуй�та убедите�ь, что форма была правильно заполнена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_only_one_pid</word_key>
-      <word_default>You must select more than one post for moderation.</word_default>
-      <word_custom>�еобходимо выбрать более одного �ообщени� дл� о�уще�твлени� �того дей�тви�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_pids</word_key>
-      <word_default>You did not select any posts for moderation.</word_default>
-      <word_custom>Вы не выбрали ни одного �ообщени� дл� о�уще�твлени� �того дей�тви�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_forum_no_posts</word_key>
-      <word_default>The forum you are attempting to move the topic to does not allow posting or displaying of topics.  As a result the topic would be sucked into a black hole and lost in oblivion.  How about you try a different forum?</word_default>
-      <word_custom>Вы пытаете�ь перене�ти тему в форум где запрещен про�мотр тем или отправка �ообщений. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_need_title</word_key>
-      <word_default>You must specify the topic title of the new topic.</word_default>
-      <word_custom>Вы должны вве�ти название новой темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_forum_move</word_key>
-      <word_default>We could not find the forum you were attempting to place the topic into.</word_default>
-      <word_custom>Вы пытаете�ь перене�ти тему в не�уще�твующий форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_delete_first_post</word_key>
-      <word_default>You cannot delete the first post in a topic.  You should delete the topic itself instead.</word_default>
-      <word_custom>Вы пытаете�ь удалить первое �ообщение в теме. Этого делать нельз�. Е�ли вам нужно удалить тему, во�пользуйте�ь �пециально предназначенной дл� �того опцией.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_not_enough_split</word_key>
-      <word_default>There are not enough posts in this topic to split it.</word_default>
-      <word_custom>В �той теме недо�таточно �ообщений дл� того чтобы разделить ее.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_too_much_split</word_key>
-      <word_default>You cannot split all posts within this topic to another topic.  You must leave at least one post in this topic.</word_default>
-      <word_custom>Вы пытаете�ь перене�ти в�е �ообщени� темы, �того делать нельз�. В �тарой теме должно о�тать�� хот� бы одно �ообщение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_topic_pinned</word_key>
-      <word_default>The topic you are attempting to pin is already pinned.</word_default>
-      <word_custom>Вы пытаете�ь подн�ть уже подн�тую тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_topic_unpinned</word_key>
-      <word_default>The topic you are attempting to unpin is not currently pinned.</word_default>
-      <word_custom>Вы пытаете�ь опу�тить уже опущенную тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_tid</word_key>
-      <word_default>We could not determine which topic you were attempting to moderate.</word_default>
-      <word_custom>Темы не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_no_mid</word_key>
-      <word_default>We could not determine which member you were attempting to edit.</word_default>
-      <word_custom>Си�теме не удало�ь найти пользовател�, профиль которого вы пытаете�ь отредактировать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_only_supermods</word_key>
-      <word_default>Only supermoderators have access to perform this function.</word_default>
-      <word_custom>Данна� возможно�ть до�тупна только �упермодераторам.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mod_admin_edit</word_key>
-      <word_default>You are not permitted to edit an administrator.</word_default>
-      <word_custom>Вы не можете редактировать профиль админи�тратора.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>tracker_already_track</word_key>
-      <word_default>You are already subscribed to this topic.</word_default>
-      <word_custom>Вы уже подпи�аны на �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>tracker_only_members</word_key>
-      <word_default>Only registered members can subscribe to topics on our forums.  Why not register an account?</word_default>
-      <word_custom>Опци� от�леживани� тем до�тупна только нашим зареги�трированным пользовател�м. Почему бы не зареги�трировать�� �ейча�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>tracker_no_fid</word_key>
-      <word_default>We could not determine which forum the topic you are attempting to subscribe to is in.</word_default>
-      <word_custom>Си�теме не удало�ь найти форум темы на которую вы пытаете�ь подпи�ать��.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>tracker_no_tid</word_key>
-      <word_default>We could not determine which topic you are attempting to subscribe to.</word_default>
-      <word_custom>Тема, на которую вы пытаете�ь подпи�ать��, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_not_yours2</word_key>
-      <word_default>You cannot view this topic because it is not your topic and the administrator has specified that you can only view your own topics in this forum.</word_default>
-      <word_custom>Вы пытаете�ь про�мотреть тему, автором которой вы не �вл�ете�ь. В данном разделе форума вы можете про�матривать только �вои темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_not_yours</word_key>
-      <word_default>You cannot view this topic because it is not your topic and the administrator has specified that you can only view your own topics.</word_default>
-      <word_custom>Вы пытаете�ь про�мотреть тему, автором которой вы не �вл�ете�ь. Вы можете про�матривать только �вои темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_post_not_in_topic</word_key>
-      <word_default>You requested a post that is not part of this topic.  Please verify the URL you clicked or contact an administrator.</word_default>
-      <word_custom>Вы запро�или �ообщение, которое не �вл�ет�� ча�тью данной темы. Проверьте правильно�ть ��ылки, по которой вы нажали или обратите�ь к админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_none_older</word_key>
-      <word_default>There are no older topics in this forum.</word_default>
-      <word_custom>В форуме не о�тало�ь �тарых тем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_none_newer</word_key>
-      <word_default>There are no newer topics in this forum.</word_default>
-      <word_custom>В форуме не о�тало�ь новых тем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_vote_not_enough</word_key>
-      <word_default>You must cast your vote in each question of the poll.</word_default>
-      <word_custom>�еобходимо ответить на каждый вопро� опро�а.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_vote_noreply</word_key>
-      <word_default>You do not have permission to vote in this poll.</word_default>
-      <word_custom>Вы не можете о�тавл�ть �ообщени� в данном опро�е.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_vote_already</word_key>
-      <word_default>You have already voted in this poll. You are only allowed to vote in a poll once.</word_default>
-      <word_custom>Вы уже голо�овали в �том опро�е.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_vote_locked</word_key>
-      <word_default>You are not allowed to vote in polls that are locked.</word_default>
-      <word_custom>Вы не можете голо�овать в опро�ах, которые закрыты.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_cannot_vote</word_key>
-      <word_default>You do not have permission to vote in this poll.</word_default>
-      <word_custom>Вы не можете голо�овать в данном опро�е.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_rate_locked</word_key>
-      <word_default>You are not allowed to rate topics that are locked.</word_default>
-      <word_custom>Вы не можете оценивать закрытые темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_rate_no_perm</word_key>
-      <word_default>You do not have permission to rate this topic.</word_default>
-      <word_custom>У ва� нет прав дл� вы�тавлени� рейтинга �той теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_no_fid</word_key>
-      <word_default>We could not determine which forum this topic is in.</word_default>
-      <word_custom>Си�тема не �могла найти форум, которому принадлежит тема.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topic_not_approved</word_key>
-      <word_default>You do not have permission to view this topic.</word_default>
-      <word_custom>У ва� нет прав дл� про�мотра �той темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>topics_no_tid</word_key>
-      <word_default>We could not determine which topic you were attempting to view.</word_default>
-      <word_custom>Си�тема не �могла найти тему, которую вы пытаете�ь по�мотреть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>markread_no_id</word_key>
-      <word_default>We could not find the forum id you were attempting to mark as read.</word_default>
-      <word_custom>Си�тема не �могла найти форум, который вы хотите пометить прочтенным.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_wrong_pass</word_key>
-      <word_default>Sorry, but the password you entered is not correct.  Please contact an administrator for assistance.</word_default>
-      <word_custom>К �ожалению введенный вами пароль не верен. Обратите�ь к админи�трации форума за помощью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_bad_filter</word_key>
-      <word_default>The topic filter settings you submitted are not valid.  Please go back and reset your topic filter settings.</word_default>
-      <word_custom>Параметры фильтрации темы неверны. Пожалуй�та верните�ь назад и обновите на�тройки фильтра темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_pass_blank</word_key>
-      <word_default>This forum requires a password to gain access to it.  Please go back and fill in the password field before submitting the form.</word_default>
-      <word_custom>Данный форум защищен паролем. Пожалуй�та верните�ь назад и заполните поле парол�, прежде чем �нова отправить форму.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_why_l_gt_1</word_key>
-      <word_default>Why is the L greater than 1?  Looks kinda suspicious if you ask me.</word_default>
-      <word_custom>Почему L больше 1? Потому что гладиолу�!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_rules</word_key>
-      <word_default>There are no forum-specific rules configured for this forum.  Please refer to the board rules instead.</word_default>
-      <word_custom>Данный раздел не имеет каких-то о�обенных правил. Пожалуй�та ознакомьте�ь � о�новными правилами форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_access</word_key>
-      <word_default>You do not have permission to view topics in this forum.</word_default>
-      <word_custom>У ва� нет прав дл� про�мотра тем в данном форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forums_no_id</word_key>
-      <word_default>We could not find the forum you were attempting to view.</word_default>
-      <word_custom>Си�тема не �могла найти форум, который вы пытаете�ь по�мотреть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>findpost_missing_pid</word_key>
-      <word_default>We could not find the post you were attempting to view.</word_default>
-      <word_custom>Си�тема не �могла найти �ообщение, которое вы пытаете�ь по�мотреть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>findpost_missing_topic</word_key>
-      <word_default>We could not find the topic that this post belongs to.</word_default>
-      <word_custom>Си�тема не �могла найти тему к которой принадлежит �то �ообщение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>attach_no_forum_perm</word_key>
-      <word_default>You do not have permission to view attachments in the forum this topic is in.</word_default>
-      <word_custom>У ва� нет прав дл� про�мотра прикрепленный файлов в форуме в котором находит�� тема � прикреплени�ми.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>attach_no_attachments</word_key>
-      <word_default>The specified topic does not have any attachments to view.</word_default>
-      <word_custom>Указанна� тема не �одержит прикрепленных файлов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>attach_missing_tid</word_key>
-      <word_default>We could not determine which topic you were attempting to view attachments from.</word_default>
-      <word_custom>Си�тема не �могла найти тему к которой принадлежат прикрепленные файлы, которые вы пытаете�ь по�мотреть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>announcement_no_perms</word_key>
-      <word_default>You do not have permission to read the requested announcement.</word_default>
-      <word_custom>У ва� нет прав чтобы прочитать запрашиваемое объ�вление.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>announcement_id_missing</word_key>
-      <word_default>We could not determine which announcement you were attempting to view.</word_default>
-      <word_custom>Си�тема не �могла найти объ�вление, которое вы пытаете�ь по�мотреть.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>email_address_invalid</word_key>
-      <word_default>The email address you entered is not in a valid format.  Please check it and resubmit the form.</word_default>
-      <word_custom>Введенный вами e-mail адре� неверный. Пожалуй�та проверьте его и отправьте форму �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forward_only_members</word_key>
-      <word_default>Only members can forward topics from our forums.</word_default>
-      <word_custom>Отправка темы по e-mail до�тупна только зареги�трированным пользовател�м.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forward_no_tid</word_key>
-      <word_default>We could not determine which topic you were attempting to forward.</word_default>
-      <word_custom>Темы, которую вы пытаете�ь отправить, не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forward_no_fid</word_key>
-      <word_default>We could not determine which form the topic is in.</word_default>
-      <word_custom>Си�теме не удало�ь найти форум, которому принадлежит данна� тема.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mail_member_private</word_key>
-      <word_default>Sorry, but this member does not wish to be contacted by email through this board.</word_default>
-      <word_custom>К �ожалению пользователь не желает получать email пи�ьма от других пользователей форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mail_member_no_member</word_key>
-      <word_default>We could not find the member you were attempting to send an email to.</word_default>
-      <word_custom>Си�тема не �могла найти пользовател�, которому вы пытаете�ь отправить e-mail.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_member_mail</word_key>
-      <word_default>Sorry, you are not permitted to send an email via this board.</word_default>
-      <word_custom>Извините, но вам не до�тупна возможно�ть отправки e-mail пи�ем � форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>mail_member_no_mid</word_key>
-      <word_default>We could not determine which member you were attempting to send an email to.</word_default>
-      <word_custom>Си�тема не �могла найти пользовател�, которому вы пытаете�ь отправить e-mail.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>members_only_mail</word_key>
-      <word_default>Only members may contact other members through our forums.</word_default>
-      <word_custom>Только зареги�трированные пользователи могут отправл�ть e-mail пи�ьма друг другу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>contact_what_action</word_key>
-      <word_default><![CDATA[You didn't specify what action you would like to take.]]></word_default>
-      <word_custom>�еверное и�пользование функций форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>contact_need_message</word_key>
-      <word_default>You did not specify why you are reporting this post.</word_default>
-      <word_custom>Вы не указали причину по которой отправл�ете жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>usercp_forums_must_login</word_key>
-      <word_default>The forum you are attempting to subscribe to requires you to enter a password.  Please go login to the forum before subscribing to it.</word_default>
-      <word_custom>Вы пытаете�ь подпи�ать�� на форум, защищенный паролем. Прежде чем вы �можете подпи�ать�� на него, вам необходимо вернуть�� назад и вве�ти пароль дл� данного форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>forum_already_subscribed</word_key>
-      <word_default>You are already subscribed to the topic or forum you are attempting to subscribe to.</word_default>
-      <word_custom>Вы уже подпи�аны на �ту тему или форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>usercp_forums_no_topic</word_key>
-      <word_default>We could not find the topic you wish to subscribe to.</word_default>
-      <word_custom>Си�теме не удало�ь найти тему на которую вы пытаете�ь подпи�ать��.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>usercp_forums_no_perms</word_key>
-      <word_default>You do not have permission to read topics in this forum.</word_default>
-      <word_custom>У ва� нет прав дл� про�мотра тем в данном форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>usercp_forums_bad_key</word_key>
-      <word_default>Your secure key, used to protect your account settings, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
-      <word_custom>Ключ безопа�но�ти не �овпадает � отправленным. Верните�ь назад, обновите форму и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_missing_tidpid</word_key>
-      <word_default>We could not determine which topic or post you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти тему или �ообщение на которую(ое) вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>announcements_supermods</word_key>
-      <word_default>Only super-moderators have access to manage announcements on our site.</word_default>
-      <word_custom>Управление объ�влени�ми до�тупно только �упермодераторам.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_member</word_key>
-      <word_default>We could not find the member profile you were attempting to report</word_default>
-      <word_custom>Си�теме не удало�ь найти пользовател� на чей профиль вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_msg</word_key>
-      <word_default>We could not find the private message you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти личное �ообщение на которое вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_invalid_gtype</word_key>
-      <word_default>We could not determine what gallery content you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти контент в галерее на который вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_imageid</word_key>
-      <word_default>We could not determine which gallery image you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти изображение в галерее на которое вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_file</word_key>
-      <word_default>We could not determine which file you were attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти файл на который вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_images_disabled</word_key>
-      <word_default>We are not accepting reports on images at this time.</word_default>
-      <word_custom>Си�тема жалоб на изображени� галереи в данный момент отключена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_input_not_match</word_key>
-      <word_default>The data you submitted does not match the expected format.</word_default>
-      <word_custom>Данные, отправленные вами, не �оответ�твуют необходимому формату.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_cannot_view_entry</word_key>
-      <word_default>You do not have permission to report this blog entry.</word_default>
-      <word_custom>У ва� нет прав чтобы отправить жалобу на �ту запи�ь блога.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_entry</word_key>
-      <word_default>We could not find the blog entry that you are attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти запи�ь в блоге на которую вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_must_be_member</word_key>
-      <word_default>You must be a registered member and logged in to our site in order to report this content.</word_default>
-      <word_custom>Дл� отправки жалобы вам необходимо быть зареги�трированным и авторизованным пользователем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_blog_entry_id</word_key>
-      <word_default>We could not determine which blog or entry you are attempting to report.</word_default>
-      <word_custom>Си�теме не удало�ь найти запи�ь в блоге или �ам блог на которую(ый) вы пытаете�ь отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_no_term</word_key>
-      <word_default>You must specify a search term.</word_default>
-      <word_custom>�еобходимо вве�ти ключ пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>usercp_bad_tab</word_key>
-      <word_default>We could not find the section of the User Control Panel you requested.</word_default>
-      <word_custom>�е удало�ь найти запрашиваемую вами �екцию пользователь�кой панели.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_plugin_file</word_key>
-      <word_default>We could not find a file to appropriately search our systems.</word_default>
-      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>sphinx_api_missing</word_key>
-      <word_default>Search is not available as the Sphinx API is not available, please contact an administrator about this issue</word_default>
-      <word_custom>Пои�к не до�тупен. От�ут�твует Sphinx API. Пожалуй�та, �в�жите�ь � админи�трацией форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_invalid_plugin</word_key>
-      <word_default>We could not find a file to appropriately search our systems.</word_default>
-      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_plugin_class</word_key>
-      <word_default>We could not find a file to appropriately search our systems.</word_default>
-      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_like_whoa</word_key>
-      <word_default><![CDATA[Hmm, well that is certainly odd.  The number of reports we found in the database to delete doesn't match what you requested to delete.  Please try again.]]></word_default>
-      <word_custom>Количе�тво жалоб, отмеченных как удал�емые не �овпадают � количе�твом жалоб, которые хотите удалить вы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_comment</word_key>
-      <word_default>We could not find the report you are attempting to submit a comment to.</word_default>
-      <word_custom>�е удало�ь �охранить комментарий к жалобе, так как в запро�е от�ут�твуют необходимые данные.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_rid</word_key>
-      <word_default>We could not find the report you are attempting to view.</word_default>
-      <word_custom>Жалоба не найдена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_cant_report</word_key>
-      <word_default>You do not have permission to report the item you are attempting to report.</word_default>
-      <word_custom>У ва� не до�таточно прав дл� отправки жалобы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_cant_empty</word_key>
-      <word_default>You must submit a message with your report.</word_default>
-      <word_custom>�еобходимо напи�ать жалобу, прежде чем отправить ее.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_what_now</word_key>
-      <word_default>We could not determine what type of content you are attempting to report.</word_default>
-      <word_custom>�е удало�ь определить тип �одержимого, на которое вы хотите отправить жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_need_tidcid</word_key>
-      <word_default>You did not submit enough information for us to find the report you requested.</word_default>
-      <word_custom>Отправленных данных не до�таточно, чтобы �и�тема �могла найти запрашиваемую жалобу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reports_no_topic</word_key>
-      <word_default>Well, we thought there was an open report on this topic but perhaps we were wrong.  Go back and try reporting the topic again.</word_default>
-      <word_custom>В �и�теме не найдено запрашиваемой жалобы. Веро�тно �тоит повторить отправку жалобы на тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_report_none_perm</word_key>
-      <word_default><![CDATA[We couldn't figure out what you were attempting to accomplish, so we felt an error was appropriate.]]></word_default>
-      <word_custom>У ва� не до�таточно прав чтобы завершить то, что вы хотите.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>report_not_found</word_key>
-      <word_default>The report that you are attempting to view could not be found.</word_default>
-      <word_custom>Жалоба не найдена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_report_prune_perm</word_key>
-      <word_default>You do not have permission to prune or delete reports.</word_default>
-      <word_custom>У ва� не до�таточно прав чтобы удал�ть жалобы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_reports_permission</word_key>
-      <word_default>You do not have permission to access the report center.</word_default>
-      <word_custom>У ва� нет до�тупа к �и�теме жалоб.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>help_no_id</word_key>
-      <word_default>The help topic you requested could not be found.</word_default>
-      <word_custom>Раздел помощи, запрошенный вами, не удало�ь найти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>han_login_create_failed</word_key>
-      <word_default>Your account could not be created in our external system properly.  Please notify an administrator.</word_default>
-      <word_custom>�е удало�ь добавить вашу учетную запи�ь во внешнюю базу пользователей. Пожалуй�та �в�жите�ь � админи�трацией форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>reputation_missing_data</word_key>
-      <word_default>Your reputation submission could not be saved because not all of the necessary information was provided.</word_default>
-      <word_custom>Репутаци� не может быть изменена, так как в запро�е от�ут�твуют необходимые данные.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>awaiting_coppa</word_key>
-      <word_default>You must have your parent or guardian complete the COPPA form and submit it to the administrator before your member account can be created.</word_default>
-      <word_custom>�еобходимо чтобы ваши родители или опекуны заполнили форму COPPA и отправили ее админи�трации форума перед �озданием учетной запи�и на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>registration_disabled</word_key>
-      <word_default>The administrator is currently not accepting new membership registrations.</word_default>
-      <word_custom>В данный момент реги�траци� на форуме отключена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>validation_key_invalid</word_key>
-      <word_default>Your validation key did not match the one in our records.  Please verify the link you followed or contact an administrator for assistance.</word_default>
-      <word_custom>�еверный ключ активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>validate_admin_turn</word_key>
-      <word_default>You have completed your portion of the validation request already.  An administrator must approve your account before you have full access.</word_default>
-      <word_custom>Спа�ибо за активацию аккаунта. �дмини�траци� форума должна проверить вашу учетную запи�ь, прежде чем вы получите полный до�туп к форуму.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_validate_key</word_key>
-      <word_default>We could not find the validation request you are attempting to verify.</word_default>
-      <word_custom>�еверный ключ активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>partial_reg_noid</word_key>
-      <word_default>We could not find the partial registration record, or your member account.  Please notify an administrator.</word_default>
-      <word_custom>Пользователь найден, однако, его запи�ь повреждена. Пожалуй�та, �ообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>coppa_form_fill</word_key>
-      <word_default>You must select your birthday from the dropdown menus before you can continue.</word_default>
-      <word_custom>Вы должны указать ваш день рождени� прежде чем продолжить реги�трацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_no_mid</word_key>
-      <word_default>We found your member account, but there is no member id set for the account.  Please notify an administrator.</word_default>
-      <word_custom>Пользователь найден, однако, его запи�ь повреждена. Пожалуй�та, �ообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_name_email</word_key>
-      <word_default>You did not supply your name or email address.</word_default>
-      <word_custom>Вы не ввели им� или e-mail.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_no_user</word_key>
-      <word_default>We could not find the member account for the name or email address you supplied.  Please verify the information and resubmit the form.</word_default>
-      <word_custom>К �ожалению нам не удало�ь найти пользовател� � такими данными. Пожалуй�та проверьте отправл�емую информацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_external_fail</word_key>
-      <word_default>There was an error changing your password in one of our external systems.  Please notify an administrator.</word_default>
-      <word_custom>Возникла проблема �о �меной парол�. Сообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_not_lostpass</word_key>
-      <word_default><![CDATA[Your lost password reset request is not actually a lost password reset request.  Yes, we're confused too.  Please report this to an administrator.]]></word_default>
-      <word_custom>Ваш запро� на во��тановление парол� на �амом деле не �вл�ет�� запро�ом на во��тановление парол�. Вы не понимаете о чем �то, к �ожалению мы тоже. Пожалуй�та �в�жите�ь � админи�трацией форума и �ообщите им об �той ошибке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_key_wrong</word_key>
-      <word_default>The validation key supplied does not match the key we have on record.  Please verify it is correct and resubmit the request.</word_default>
-      <word_custom>Ключ валидации не �овпадает � ключем, хран�щим�� в наших запи��х. Веро�тно, вам �ледует повторить отправку запро�а. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_new_reg</word_key>
-      <word_default>Your account is awaiting admin validation.  An admin will take a look at it as soon as possible.</word_default>
-      <word_custom>Ваша учетна� запи�ь ожидает подтверждени� админи�тратора.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_not_validating</word_key>
-      <word_default>The member specified is not presently awaiting validation for a lost password request.</word_default>
-      <word_custom>Пользователь не запрашивал во��тановление парол�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>lostpass_no_member</word_key>
-      <word_default>We could not find the member account for the user id you supplied.</word_default>
-      <word_custom>Пользовател� � такими данными не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>uid_key_incorrect</word_key>
-      <word_default>The user id you supplied to reset your password does not appear to be valid.</word_default>
-      <word_custom>�еверный идентификатор пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>validation_key_incorrect</word_key>
-      <word_default>The validation key you supplied to reset your password does not appear to be valid.</word_default>
-      <word_custom>�е удало�ь �бро�ить пароль. Ключ валидации неверный.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_view_board_b</word_key>
-      <word_default>You are not allowed to visit this forum.</word_default>
-      <word_custom>Вы не можете про�матривать форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_view_board</word_key>
-      <word_default>You are not allowed to visit this forum.</word_default>
-      <word_custom>Вы не можете про�матривать форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>you_are_banned</word_key>
-      <word_default>You are not allowed to visit this forum.</word_default>
-      <word_custom>Вам запрещено про�матривать форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>bad_logout_key</word_key>
-      <word_default>The link you followed to logout appears to be badly formed.  Please go back and click the link again.</word_default>
-      <word_custom>Выйти не удало�ь. С�ылка «Выход» имеет неверный формат.  Пожалуй�та, верните�ь назад и попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>bad_delete_cookies_key</word_key>
-      <word_default>The link you followed to delete your cookies appears to be badly formed.  Please go back and click the link again.</word_default>
-      <word_custom>Очи�тить cookies не удало�ь. С�ылка «Очи�тить cookies» имеет неверный формат.  Пожалуй�та, верните�ь назад и попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_permission_to_search</word_key>
-      <word_default>You do not have permission to use the search system.</word_default>
-      <word_custom>Вы не можете и�пользовать пои�к на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_off</word_key>
-      <word_default>Search is not enabled on the forums at this time.</word_default>
-      <word_custom>В данный момент пои�к на форуме отключен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_permission_for_display_names</word_key>
-      <word_default>You do not have permission to change your display name.</word_default>
-      <word_custom>Вы не можете изменить им� пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_permission_to_attach</word_key>
-      <word_default>You do not have permission to use the attachments system.</word_default>
-      <word_custom>Вы не можете прикрепл�ть файлы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>must_agree_to_terms</word_key>
-      <word_default>You must agree to the registration terms.</word_default>
-      <word_custom>�еобходимо прин�ть правила пользовани� форумом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>command_file_missing</word_key>
-      <word_default>The requested action could not be performed, because we could not locate the following file: %s</word_default>
-      <word_custom>Запрашиваемое дей�твие не может быть выполнено. Требуемый файл: %s не найден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>command_class_incorrect</word_key>
-      <word_default>The requested action could not be performed, there are no valid commands classes in the requested file: %s</word_default>
-      <word_custom>Запрашиваемое дей�твие не может быть выполнено. В файле: %s не найдены необходимые кла��ы дей�твий.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_login_methods</word_key>
-      <word_default>Could not load any login handlers</word_default>
-      <word_custom>�е удало�ь загрузить модули авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>fbc_disabled</word_key>
-      <word_default>Facebook Connect is not enabled</word_default>
-      <word_custom>Facebook Connect отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>fbc_authorization_already_linked</word_key>
-      <word_default>That member account is already linked to a Facebook profile</word_default>
-      <word_custom>Пользователь�ка� запи�ь уже при�оединена к Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>fbc_authorization_screwup</word_key>
-      <word_default>An error occurred while attempting to authorize this Facebook Connect action</word_default>
-      <word_custom>Возникла ошибка при попытке авторизовать�� � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>error_back</word_key>
-      <word_default>Go Back</word_default>
-      <word_custom>�азад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>er_help_files</word_key>
-      <word_default>Our help documentation</word_default>
-      <word_custom>Разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>er_register</word_key>
-      <word_default>Register a new account</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>er_contact_admin</word_key>
-      <word_default>Contact the forums administrator</word_default>
-      <word_custom>Св�зь � админи�трацией форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>er_lost_pass</word_key>
-      <word_default>Forgotten Password Recovery</word_default>
-      <word_custom>Во��тановление парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>error_title</word_key>
-      <word_default>An Error Occurred</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>er_useful_links</word_key>
-      <word_default>Useful Links</word_default>
-      <word_custom>Полезные ��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>err_UNKNOWN</word_key>
-      <word_default>An unknown error occurred </word_default>
-      <word_custom>Возникла ошибка </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>bad_notify_id</word_key>
-      <word_default>We could not find the notification you were attempting to view.</word_default>
-      <word_custom>�е удало�ь найти уведомление, которое вы пытаете�ь про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>twit_not_remote</word_key>
-      <word_default>You cannot log in with your Twitter credentials for this member. You must log in with your forum credentials using the normal log in form</word_default>
-      <word_custom>Вы не можете авторизовать�� � и�пользованием Twitter-аккаунта. Вам необходимо войти в �и�тему и�пользу� обычны �по�об входа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>twit_not_on</word_key>
-      <word_default>Twitter connect is not enabled</word_default>
-      <word_custom>Интеграци� � Twitter не включена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>twit_ohnoes</word_key>
-      <word_default>An error occurred while trying to authorize this Twitter connection</word_default>
-      <word_custom>Возникла ошибка при попытке проверки �оединени� � Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>moderate_no_permission_deleted_items</word_key>
-      <word_default>One or more deleted items cannot be restored as you do not have permission to restore them</word_default>
-      <word_custom>Вы не можете во��танавливать удаленные публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>search_invalid_id</word_key>
-      <word_default>Invalid member id</word_default>
-      <word_custom>�еверный ID пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>incorrect_furl</word_key>
-      <word_default><![CDATA[Sorry, we could not locate the page you are requesting to view. Please click <a href='#' onclick='window.location = ipb.vars.base_url'>here</a> to return back to the forum's home]]></word_default>
-      <word_custom><![CDATA[К �ожалению, не удало�ь найти запрашиваемую вами �траницу. Пожалуй�та верните�ь на <a href='#' onclick='window.location = ipb.vars.base_url'>главную �траницу</a> форума.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>twitter_app_error</word_key>
-      <word_default><![CDATA[There is an error with your Twitter application settings. Please check to ensure that you have not set your Twitter application as a Desktop application type, it must be set to 'Browser']]></word_default>
-      <word_custom>Е�ть проблема � на�тройками вашего Twitter-приложени�. Пожалуй�та, убедите�ь, что в приложении не указан тип Desktop application он должен быть Browser</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_error</word_pack>
-      <word_key>no_remote_reg</word_key>
-      <word_default>The administrator has disabled all registrations and as such, you are not able to complete your log in at this time.</word_default>
-      <word_custom>�дмини�траци� отключила возможно�ть реги�трации на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>fb_not_remote</word_key>
-      <word_default>You cannot log in with your Facebook credentials for this member. You must log in with your forum credentials using the normal log in form</word_default>
-      <word_custom>Вы не можете зайти на форум � и�пользованием �того Facebook-аккаунта. Вам необходимо зайти на форум и�пользу� обычные данные.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>noappcomments</word_key>
+      <word_default>There was a problem with the request.  Please go back and try again.</word_default>
+      <word_custom>Возникла проблема � обработкой запро�а. Попробуйте вернуть�� на предыдущую �траницу и повторить дей�твие �нова.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>fb_ohnoes</word_key>
-      <word_default>An error occurred while trying to authorize this Facebook connection</word_default>
-      <word_custom>Возникла ошибка при авторизации через Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>posting_bad_captcha</word_key>
+      <word_default>You did not provide the correct words for the security check.</word_default>
+      <word_custom>Вы ввели некорректные �лова в коде безопа�но�ти.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>fb_not_on</word_key>
-      <word_default>Facebook connect is not enabled</word_default>
-      <word_custom>Facebook Connect отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>nocomment_found</word_key>
+      <word_default>We could not find the comment you were looking for.</word_default>
+      <word_custom>Си�тема не �могла найти комментарий, который вы ищете.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5465,9 +2397,6 @@ The <#BOARD_NAME#> team.
       <word_key>forward_turned_off</word_key>
       <word_default>Sorry, this feature has been disabled</word_default>
       <word_custom>К �ожалению в данный момент возможно�ть отключена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5475,39 +2404,1875 @@ The <#BOARD_NAME#> team.
       <word_key>login_no_authkey</word_key>
       <word_default>We encountered a problem processing your login request.  Please try again.</word_default>
       <word_custom>Произошла ошибка в проце��е авторизации. Пожалуй�та попробуйте позже.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>no_guests</word_key>
-      <word_default><![CDATA[Sorry, but this function isn't available to guests.]]></word_default>
-      <word_custom>К �ожалению данна� возможно�ть не до�тупна дл� го�тей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>fb_not_on</word_key>
+      <word_default>Facebook connect is not enabled</word_default>
+      <word_custom>Facebook Connect отключен</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>incorrect_use</word_key>
-      <word_default>Incorrect use of one of the board files.</word_default>
-      <word_custom>�е правильное обращение к одному из файлов форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>fb_ohnoes</word_key>
+      <word_default>An error occurred while trying to authorize this Facebook connection</word_default>
+      <word_custom>Возникла ошибка при авторизации через Facebook</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_error</word_pack>
-      <word_key>poss_hack_attempt</word_key>
-      <word_default>We are treating that action as a possible hack attempt. This action will be logged and the board administrator will be informed via email.</word_default>
-      <word_custom>Си�тема определила данное дей�твие как попытку взлома. О данном факте было �ообщено админи�тратору форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>fb_not_remote</word_key>
+      <word_default>You cannot log in with your Facebook credentials for this member. You must log in with your community credentials using the normal log in form</word_default>
+      <word_custom>Вы не можете зайти на форум � и�пользованием �того Facebook-аккаунта. Вам необходимо зайти на форум и�пользу� обычные данные.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_remote_reg</word_key>
+      <word_default>The administrator has disabled all registrations and as such, you are not able to complete your log in at this time.</word_default>
+      <word_custom>�дмини�траци� отключила возможно�ть реги�трации на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>incorrect_furl</word_key>
+      <word_default><![CDATA[Sorry, we could not locate the page you are requesting to view. Please click <a href='#' onclick='window.location = ipb.vars.base_url'>here</a> to return to the community index]]></word_default>
+      <word_custom><![CDATA[К �ожалению, не удало�ь найти запрашиваемую вами �траницу. Пожалуй�та верните�ь на <a href='#' onclick='window.location = ipb.vars.base_url'>главную �траницу</a> форума.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>twitter_app_error</word_key>
+      <word_default>There is an error with your Twitter application settings. Please check to ensure that you have properly set a callback URL in your Twitter application configuration.</word_default>
+      <word_custom>Е�ть проблема � на�тройками вашего Twitter-приложени�. Пожалуй�та, убедите�ь, что в приложении указан правильный callback URL</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>twit_not_remote</word_key>
+      <word_default>You cannot log in with your Twitter credentials for this member. You must log in with your community credentials using the normal log in form</word_default>
+      <word_custom>Вы не можете авторизовать�� � и�пользованием Twitter-аккаунта. Вам необходимо войти в �и�тему и�пользу� обычны �по�об входа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>err_UNKNOWN</word_key>
+      <word_default>An unknown error occurred </word_default>
+      <word_custom>Возникла ошибка </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>bad_notify_id</word_key>
+      <word_default>We could not find the notification you were attempting to view.</word_default>
+      <word_custom>�е удало�ь найти уведомление, которое вы пытаете�ь про�мотреть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>error_title</word_key>
+      <word_default>An Error Occurred</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>twit_not_on</word_key>
+      <word_default>Twitter connect is not enabled</word_default>
+      <word_custom>Интеграци� � Twitter не включена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_invalid_id</word_key>
+      <word_default>Invalid member id</word_default>
+      <word_custom>�еверный ID пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>moderate_no_permission_deleted_items</word_key>
+      <word_default>You do not have permisson to remove or restore one or more of the selected posts or topics.</word_default>
+      <word_custom>Вы не можете во��танавливать удаленные публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>er_lost_pass</word_key>
+      <word_default>Forgotten Password Recovery</word_default>
+      <word_custom>Во��тановление парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>twit_ohnoes</word_key>
+      <word_default>An error occurred while trying to authorize this Twitter connection</word_default>
+      <word_custom>Возникла ошибка при попытке проверки �оединени� � Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>er_useful_links</word_key>
+      <word_default>Useful Links</word_default>
+      <word_custom>Полезные ��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>er_contact_admin</word_key>
+      <word_default>Contact the community administrator</word_default>
+      <word_custom>Св�зь � админи�трацией форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>er_help_files</word_key>
+      <word_default>Our help documentation</word_default>
+      <word_custom>Разделы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>er_register</word_key>
+      <word_default>Register a new account</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>error_back</word_key>
+      <word_default>Go Back</word_default>
+      <word_custom>�азад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>fbc_authorization_screwup</word_key>
+      <word_default>An error occurred while attempting to authorize this Facebook Connect action</word_default>
+      <word_custom>Возникла ошибка при попытке авторизовать�� � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>command_class_incorrect</word_key>
+      <word_default>The requested action could not be performed, there are no valid commands classes in the requested file: %s</word_default>
+      <word_custom>Запрашиваемое дей�твие не может быть выполнено. В файле: %s не найдены необходимые кла��ы дей�твий.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>command_file_missing</word_key>
+      <word_default>The requested action could not be performed, because we could not locate the following file: %s</word_default>
+      <word_custom>Запрашиваемое дей�твие не может быть выполнено. Требуемый файл: %s не найден</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_permission_to_attach</word_key>
+      <word_default>You do not have permission to use the attachments system.</word_default>
+      <word_custom>Вы не можете прикрепл�ть файлы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_off</word_key>
+      <word_default>Search is not enabled on the community at this time.</word_default>
+      <word_custom>В данный момент пои�к на форуме отключен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_permission_for_display_names</word_key>
+      <word_default>You do not have permission to change your display name.</word_default>
+      <word_custom>Вы не можете изменить им� пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_permission_to_search</word_key>
+      <word_default>You do not have permission to use the search system.</word_default>
+      <word_custom>Вы не можете и�пользовать пои�к на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>bad_delete_cookies_key</word_key>
+      <word_default>The link you followed to delete your cookies appears to be badly formed.  Please go back and click the link again.</word_default>
+      <word_custom>Очи�тить cookies не удало�ь. С�ылка «Очи�тить cookies» имеет неверный формат.  Пожалуй�та, верните�ь назад и попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>you_are_banned</word_key>
+      <word_default>You are not allowed to visit this community.</word_default>
+      <word_custom>Вам запрещено про�матривать форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>bad_logout_key</word_key>
+      <word_default>The link you followed to logout appears to be badly formed.  Please go back and click the link again.</word_default>
+      <word_custom>Выйти не удало�ь. С�ылка «Выход» имеет неверный формат.  Пожалуй�та, верните�ь назад и попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_view_board</word_key>
+      <word_default>You are not allowed to visit this community.</word_default>
+      <word_custom>Вы не можете про�матривать форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>validation_key_incorrect</word_key>
+      <word_default>The validation key you supplied to reset your password does not appear to be valid.</word_default>
+      <word_custom>�е удало�ь �бро�ить пароль. Ключ валидации неверный.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_view_board_b</word_key>
+      <word_default>You are not allowed to visit this community.</word_default>
+      <word_custom>Вы не можете про�матривать форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>uid_key_incorrect</word_key>
+      <word_default>The user id you supplied to reset your password does not appear to be valid.</word_default>
+      <word_custom>�еверный идентификатор пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>fbc_authorization_already_linked</word_key>
+      <word_default>That member account is already linked to a Facebook profile</word_default>
+      <word_custom>Пользователь�ка� запи�ь уже при�оединена к Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>fbc_disabled</word_key>
+      <word_default>Facebook Connect is not enabled</word_default>
+      <word_custom>Facebook Connect отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_login_methods</word_key>
+      <word_default>Could not load any login handlers</word_default>
+      <word_custom>�е удало�ь загрузить модули авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_no_member</word_key>
+      <word_default>We could not find the member account for the user id you supplied.</word_default>
+      <word_custom>Пользовател� � такими данными не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_not_validating</word_key>
+      <word_default>The member specified is not presently awaiting validation for a lost password request.</word_default>
+      <word_custom>Пользователь не запрашивал во��тановление парол�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_not_lostpass</word_key>
+      <word_default><![CDATA[Your lost password reset request is not actually a lost password reset request.  Yes, we're confused too.  Please report this to an administrator.]]></word_default>
+      <word_custom>Ваш запро� на во��тановление парол� на �амом деле не �вл�ет�� запро�ом на во��тановление парол�. Вы не понимаете о чем �то, к �ожалению мы тоже. Пожалуй�та �в�жите�ь � админи�трацией форума и �ообщите им об �той ошибке.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_key_wrong</word_key>
+      <word_default>The validation key supplied does not match the key we have on record.  Please verify it is correct and resubmit the request.</word_default>
+      <word_custom>Ключ валидации не �овпадает � ключем, хран�щим�� в наших запи��х. Веро�тно, вам �ледует повторить отправку запро�а. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_new_reg</word_key>
+      <word_default>Your account is awaiting admin validation.  An admin will take a look at it as soon as possible.</word_default>
+      <word_custom>Ваша учетна� запи�ь ожидает подтверждени� админи�тратора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_name_email</word_key>
+      <word_default>You did not supply your name or email address.</word_default>
+      <word_custom>Вы не ввели им� или e-mail.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_external_fail</word_key>
+      <word_default>There was an error changing your password in one of our external systems.  Please notify an administrator.</word_default>
+      <word_custom>Возникла проблема �о �меной парол�. Сообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_no_user</word_key>
+      <word_default>We could not find the member account for the name or email address you supplied.  Please verify the information and resubmit the form.</word_default>
+      <word_custom>К �ожалению нам не удало�ь найти пользовател� � такими данными. Пожалуй�та проверьте отправл�емую информацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>lostpass_no_mid</word_key>
+      <word_default>We found your member account, but there is no member id set for the account.  Please notify an administrator.</word_default>
+      <word_custom>Пользователь найден, однако, его запи�ь повреждена. Пожалуй�та, �ообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>coppa_form_fill</word_key>
+      <word_default>You must select your birthday from the dropdown menus before you can continue.</word_default>
+      <word_custom>Вы должны указать ваш день рождени� прежде чем продолжить реги�трацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>partial_reg_noid</word_key>
+      <word_default>We could not find the partial registration record, or your member account.  Please notify an administrator.</word_default>
+      <word_custom>Пользователь найден, однако, его запи�ь повреждена. Пожалуй�та, �ообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_validate_key</word_key>
+      <word_default>We could not find the validation request you are attempting to verify.  This is likely because you have already validated your account, or an administrator has validated your account for you.  Please try to login with your registration details now.</word_default>
+      <word_custom>�еверный ключ активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>validate_admin_turn</word_key>
+      <word_default>You have completed your portion of the validation request already.  An administrator must approve your account before you have full access.</word_default>
+      <word_custom>Спа�ибо за активацию аккаунта. �дмини�траци� форума должна проверить вашу учетную запи�ь, прежде чем вы получите полный до�туп к форуму.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>validation_key_invalid</word_key>
+      <word_default>Your validation key did not match the one in our records.  Please verify the link you followed or contact an administrator for assistance.</word_default>
+      <word_custom>�еверный ключ активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>registration_disabled</word_key>
+      <word_default>The administrator is currently not accepting new membership registrations.</word_default>
+      <word_custom>В данный момент реги�траци� на форуме отключена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>awaiting_coppa</word_key>
+      <word_default>You must have your parent or guardian complete the COPPA form and submit it to the administrator before your member account can be created.</word_default>
+      <word_custom>�еобходимо чтобы ваши родители или опекуны заполнили форму COPPA и отправили ее админи�трации форума перед �озданием учетной запи�и на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reputation_missing_data</word_key>
+      <word_default>Your reputation submission could not be saved because not all of the necessary information was provided.</word_default>
+      <word_custom>Репутаци� не может быть изменена, так как в запро�е от�ут�твуют необходимые данные.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>help_no_id</word_key>
+      <word_default>The help topic you requested could not be found.</word_default>
+      <word_custom>Раздел помощи, запрошенный вами, не удало�ь найти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>han_login_create_failed</word_key>
+      <word_default>Your account could not be created in our external system properly.  Please notify an administrator.</word_default>
+      <word_custom>�е удало�ь добавить вашу учетную запи�ь во внешнюю базу пользователей. Пожалуй�та �в�жите�ь � админи�трацией форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_report_none_perm</word_key>
+      <word_default><![CDATA[We couldn't figure out what you were attempting to accomplish, so we felt an error was appropriate.]]></word_default>
+      <word_custom>У ва� не до�таточно прав чтобы завершить то, что вы хотите.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_need_tidcid</word_key>
+      <word_default>You did not submit enough information for us to find the report you requested.</word_default>
+      <word_custom>Отправленных данных не до�таточно, чтобы �и�тема �могла найти запрашиваемую жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_topic</word_key>
+      <word_default>Well, we thought there was an open report on this topic but perhaps we were wrong.  Go back and try reporting the topic again.</word_default>
+      <word_custom>В �и�теме не найдено запрашиваемой жалобы. Веро�тно �тоит повторить отправку жалобы на тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_what_now</word_key>
+      <word_default>We could not determine what type of content you are attempting to report.</word_default>
+      <word_custom>�е удало�ь определить тип �одержимого, на которое вы хотите отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_report_prune_perm</word_key>
+      <word_default>You do not have permission to prune or delete reports.</word_default>
+      <word_custom>У ва� не до�таточно прав чтобы удал�ть жалобы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_reports_permission</word_key>
+      <word_default>You do not have permission to access the report center.</word_default>
+      <word_custom>У ва� нет до�тупа к �и�теме жалоб.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>report_not_found</word_key>
+      <word_default>The report that you are attempting to view could not be found.</word_default>
+      <word_custom>Жалоба не найдена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_plugin_file</word_key>
+      <word_default>We could not find a file to appropriately search our systems.</word_default>
+      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_plugin_class</word_key>
+      <word_default>We could not find a file to appropriately search our systems.</word_default>
+      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_invalid_plugin</word_key>
+      <word_default>We could not find a file to appropriately search our systems.</word_default>
+      <word_custom>�е найден �оответ�твующий плагин пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_like_whoa</word_key>
+      <word_default><![CDATA[Hmm, well that is certainly odd.  The number of reports we found in the database to delete doesn't match what you requested to delete.  Please try again.]]></word_default>
+      <word_custom>Количе�тво жалоб, отмеченных как удал�емые не �овпадают � количе�твом жалоб, которые хотите удалить вы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_comment</word_key>
+      <word_default>We could not find the report you are attempting to submit a comment to.</word_default>
+      <word_custom>�е удало�ь �охранить комментарий к жалобе, так как в запро�е от�ут�твуют необходимые данные.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_rid</word_key>
+      <word_default>We could not find the report you are attempting to view.</word_default>
+      <word_custom>Жалоба не найдена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_cant_empty</word_key>
+      <word_default>You must submit a message with your report.</word_default>
+      <word_custom>�еобходимо напи�ать жалобу, прежде чем отправить ее.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_cant_report</word_key>
+      <word_default>You do not have permission to report the item you are attempting to report.</word_default>
+      <word_custom>У ва� не до�таточно прав дл� отправки жалобы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>sphinx_api_missing</word_key>
+      <word_default>Search is not available as the Sphinx API is not available, please contact an administrator about this issue</word_default>
+      <word_custom>Пои�к не до�тупен. От�ут�твует Sphinx API. Пожалуй�та, �в�жите�ь � админи�трацией форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>search_no_term</word_key>
+      <word_default>You must specify a search term.</word_default>
+      <word_custom>�еобходимо вве�ти ключ пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>usercp_bad_tab</word_key>
+      <word_default>We could not find the section of the User Control Panel you requested.</word_default>
+      <word_custom>�е удало�ь найти запрашиваемую вами �екцию пользователь�кой панели.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_blog_entry_id</word_key>
+      <word_default>We could not determine which blog or entry you are attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти запи�ь в блоге или �ам блог на которую(ый) вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_entry</word_key>
+      <word_default>We could not find the blog entry that you are attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти запи�ь в блоге на которую вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_must_be_member</word_key>
+      <word_default>You must be a registered member and logged in to our site in order to report this content.</word_default>
+      <word_custom>Дл� отправки жалобы вам необходимо быть зареги�трированным и авторизованным пользователем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_input_not_match</word_key>
+      <word_default>The data you submitted does not match the expected format.</word_default>
+      <word_custom>Данные, отправленные вами, не �оответ�твуют необходимому формату.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_cannot_view_entry</word_key>
+      <word_default>You do not have permission to report this blog entry.</word_default>
+      <word_custom>У ва� нет прав чтобы отправить жалобу на �ту запи�ь блога.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_msg</word_key>
+      <word_default>We could not find the private message you were attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти личное �ообщение на которое вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_file</word_key>
+      <word_default>We could not determine which file you were attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти файл на который вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>contact_what_action</word_key>
+      <word_default><![CDATA[You didn't specify what action you would like to take.]]></word_default>
+      <word_custom>�еверное и�пользование функций форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_member</word_key>
+      <word_default>We could not find the member profile you were attempting to report</word_default>
+      <word_custom>Си�теме не удало�ь найти пользовател� на чей профиль вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_missing_tidpid</word_key>
+      <word_default>We could not determine which topic or post you were attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти тему или �ообщение на которую(ое) вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>contact_need_message</word_key>
+      <word_default>You did not specify why you are reporting this post.</word_default>
+      <word_custom>Вы не указали причину по которой отправл�ете жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>announcements_supermods</word_key>
+      <word_default>Only super-moderators have access to manage announcements on our site.</word_default>
+      <word_custom>Управление объ�влени�ми до�тупно только �упермодераторам.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>members_only_mail</word_key>
+      <word_default>Only members may contact other members through our community.</word_default>
+      <word_custom>Только зареги�трированные пользователи могут отправл�ть e-mail пи�ьма друг другу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mail_member_private</word_key>
+      <word_default>Sorry, but this member does not wish to be contacted by email through this community.</word_default>
+      <word_custom>К �ожалению пользователь не желает получать email пи�ьма от других пользователей форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mail_member_no_member</word_key>
+      <word_default>We could not find the member you were attempting to send an email to.</word_default>
+      <word_custom>Си�тема не �могла найти пользовател�, которому вы пытаете�ь отправить e-mail.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mail_member_no_mid</word_key>
+      <word_default>We could not determine which member you were attempting to send an email to.</word_default>
+      <word_custom>Си�тема не �могла найти пользовател�, которому вы пытаете�ь отправить e-mail.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_member_mail</word_key>
+      <word_default>Sorry, you are not permitted to send an email via this community.</word_default>
+      <word_custom>Извините, но вам не до�тупна возможно�ть отправки e-mail пи�ем � форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forward_only_members</word_key>
+      <word_default>Only members can forward topics from our community.</word_default>
+      <word_custom>Отправка темы по e-mail до�тупна только зареги�трированным пользовател�м.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forward_no_fid</word_key>
+      <word_default>We could not determine which forum the topic is in.</word_default>
+      <word_custom>Си�теме не удало�ь найти форум, которому принадлежит данна� тема.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forward_no_tid</word_key>
+      <word_default>We could not determine which topic you were attempting to forward.</word_default>
+      <word_custom>Темы не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>email_address_invalid</word_key>
+      <word_default>The email address you entered is not in a valid format.  Please check it and resubmit the form.</word_default>
+      <word_custom>Введенный вами e-mail адре� неверный. Пожалуй�та проверьте его и отправьте форму �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>announcement_id_missing</word_key>
+      <word_default>We could not determine which announcement you were attempting to view.</word_default>
+      <word_custom>Си�тема не �могла найти объ�вление, которое вы пытаете�ь по�мотреть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>attach_missing_tid</word_key>
+      <word_default>We could not determine which topic you were attempting to view attachments from.</word_default>
+      <word_custom>Си�тема не �могла найти тему к которой принадлежат прикрепленные файлы, которые вы пытаете�ь по�мотреть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>announcement_no_perms</word_key>
+      <word_default>You do not have permission to read the requested announcement.</word_default>
+      <word_custom>У ва� нет прав чтобы прочитать запрашиваемое объ�вление.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>attach_no_attachments</word_key>
+      <word_default>The specified topic does not have any attachments to view.</word_default>
+      <word_custom>Указанна� тема не �одержит прикрепленных файлов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>attach_no_forum_perm</word_key>
+      <word_default>You do not have permission to view attachments in the forum this topic is in.</word_default>
+      <word_custom>У ва� нет прав дл� про�мотра прикрепленный файлов в форуме в котором находит�� тема � прикреплени�ми.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>findpost_missing_topic</word_key>
+      <word_default>We could not find the topic that this post belongs to.</word_default>
+      <word_custom>Си�тема не �могла найти тему к которой принадлежит �то �ообщение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_id</word_key>
+      <word_default>We could not find the forum you were attempting to view.</word_default>
+      <word_custom>Си�тема не �могла найти форум, который вы пытаете�ь по�мотреть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>findpost_missing_pid</word_key>
+      <word_default>We could not find the post you were attempting to view.</word_default>
+      <word_custom>Си�тема не �могла найти �ообщение, которое вы пытаете�ь по�мотреть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_why_l_gt_1</word_key>
+      <word_default>Why is the L greater than 1?  Looks kinda suspicious if you ask me.</word_default>
+      <word_custom>Почему L больше 1? Потому что гладиолу�!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_rules</word_key>
+      <word_default>There are no forum-specific rules configured for this forum.  Please refer to the community rules instead.</word_default>
+      <word_custom>Данный раздел не имеет каких-то о�обенных правил. Пожалуй�та ознакомьте�ь � о�новными правилами форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_access</word_key>
+      <word_default>You do not have permission to view topics in this forum.</word_default>
+      <word_custom>У ва� нет прав дл� про�мотра тем в данном форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_pass_blank</word_key>
+      <word_default>This forum requires a password to gain access to it.  Please go back and fill in the password field before submitting the form.</word_default>
+      <word_custom>Данный форум защищен паролем. Пожалуй�та верните�ь назад и заполните поле парол�, прежде чем �нова отправить форму.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_wrong_pass</word_key>
+      <word_default>Sorry, but the password you entered is not correct.  Please contact an administrator for assistance.</word_default>
+      <word_custom>К �ожалению введенный вами пароль не верен. Обратите�ь к админи�трации форума за помощью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>markread_no_id</word_key>
+      <word_default>We could not find the forum id you were attempting to mark as read.</word_default>
+      <word_custom>Си�тема не �могла найти форум, который вы хотите пометить прочтенным.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_no_tid</word_key>
+      <word_default>We could not determine which topic you were attempting to view.</word_default>
+      <word_custom>Си�тема не �могла найти тему, которую вы пытаете�ь по�мотреть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_not_approved</word_key>
+      <word_default>You do not have permission to view this topic.</word_default>
+      <word_custom>У ва� нет прав дл� про�мотра �той темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_no_fid</word_key>
+      <word_default>We could not determine which forum this topic is in.</word_default>
+      <word_custom>Си�тема не �могла найти форум, которому принадлежит тема.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_rate_locked</word_key>
+      <word_default>You are not allowed to rate topics that are locked.</word_default>
+      <word_custom>Вы не можете оценивать закрытые темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_rate_no_perm</word_key>
+      <word_default>You do not have permission to rate this topic.</word_default>
+      <word_custom>У ва� нет прав дл� вы�тавлени� рейтинга �той теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_cannot_vote</word_key>
+      <word_default>You do not have permission to vote in this poll.</word_default>
+      <word_custom>Вы не можете голо�овать в данном опро�е.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_vote_already</word_key>
+      <word_default>You have already voted in this poll. You are only allowed to vote in a poll once.</word_default>
+      <word_custom>Вы уже голо�овали в �том опро�е.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_bad_filter</word_key>
+      <word_default>The topic filter settings you submitted are not valid.  Please go back and reset your topic filter settings.</word_default>
+      <word_custom>Параметры фильтрации темы неверны. Пожалуй�та верните�ь назад и обновите на�тройки фильтра темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_vote_noreply</word_key>
+      <word_default>You do not have permission to vote in this poll.</word_default>
+      <word_custom>Вы не можете о�тавл�ть �ообщени� в данном опро�е.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_vote_locked</word_key>
+      <word_default>You are not allowed to vote in polls that are locked.</word_default>
+      <word_custom>Вы не можете голо�овать в опро�ах, которые закрыты.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_post_not_in_topic</word_key>
+      <word_default>You requested a post that is not part of this topic.  Please verify the URL you clicked or contact an administrator.</word_default>
+      <word_custom>Вы запро�или �ообщение, которое не �вл�ет�� ча�тью данной темы. Проверьте правильно�ть ��ылки, по которой вы нажали или обратите�ь к админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_none_newer</word_key>
+      <word_default>There are no newer topics in this forum.</word_default>
+      <word_custom>В форуме не о�тало�ь новых тем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_none_older</word_key>
+      <word_default>There are no older topics in this forum.</word_default>
+      <word_custom>В форуме не о�тало�ь �тарых тем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topic_vote_not_enough</word_key>
+      <word_default>You must cast your vote in each question of the poll.</word_default>
+      <word_custom>�еобходимо ответить на каждый вопро� опро�а.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_not_yours</word_key>
+      <word_default>You cannot view this topic because it is not your topic and the administrator has specified that you can only view your own topics.</word_default>
+      <word_custom>Вы пытаете�ь про�мотреть тему, автором которой вы не �вл�ете�ь. Вы можете про�матривать только �вои темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>topics_not_yours2</word_key>
+      <word_default>You cannot view this topic because it is not your topic and the administrator has specified that you can only view your own topics in this forum.</word_default>
+      <word_custom>Вы пытаете�ь про�мотреть тему, автором которой вы не �вл�ете�ь. В данном разделе форума вы можете про�матривать только �вои темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>tracker_no_tid</word_key>
+      <word_default>We could not determine which topic you are attempting to subscribe to.</word_default>
+      <word_custom>Тема, на которую вы пытаете�ь подпи�ать��, не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>tracker_no_fid</word_key>
+      <word_default>We could not determine which forum the topic you are attempting to subscribe to is in.</word_default>
+      <word_custom>Си�теме не удало�ь найти форум темы на которую вы пытаете�ь подпи�ать��.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>tracker_only_members</word_key>
+      <word_default>Only registered members can subscribe to topics on our community.  Why not register an account?</word_default>
+      <word_custom>Опци� от�леживани� тем до�тупна только нашим зареги�трированным пользовател�м. Почему бы не зареги�трировать�� �ейча�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>tracker_already_track</word_key>
+      <word_default>You are already subscribed to this topic.</word_default>
+      <word_custom>Вы уже подпи�аны на �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_move_forum</word_key>
+      <word_default>We could not determine which forum you were attempting to move the topic into.</word_default>
+      <word_custom>Форума, куда вы пытаете�ь перене�ти тему, не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_admin_edit</word_key>
+      <word_default>You are not permitted to edit an administrator.</word_default>
+      <word_custom>Вы не можете редактировать профиль админи�тратора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_only_supermods</word_key>
+      <word_default>Only supermoderators have access to perform this function.</word_default>
+      <word_custom>Данна� возможно�ть до�тупна только �упермодераторам.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_mid</word_key>
+      <word_default>We could not determine which member you were attempting to edit.</word_default>
+      <word_custom>Си�теме не удало�ь найти пользовател�, профиль которого вы пытаете�ь отредактировать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_move_save</word_key>
+      <word_default>Why, oh why, would you attempt to move a topic into the same forum it is already in?  Do YOU see the logic in that?</word_default>
+      <word_custom>Вы пытаете�ь переме�тить тему в тот же �амый форум, в котором она находит�� �ейча�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_delete_post_find</word_key>
+      <word_default>We could not find the post you were attempting to delete.</word_default>
+      <word_custom>Сообщение, которое вы пытаете�ь удалить, не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_um_what_now</word_key>
+      <word_default><![CDATA[We couldn't figure out what you were attempting to do.]]></word_default>
+      <word_custom>Дей�твие, которое вы пытаете�ь произве�ти, не �уще�твует в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_topics_merge_two</word_key>
+      <word_default>You need to select at least two topics in order to merge them.</word_default>
+      <word_custom>Дл� объединени� необходимо выбрать как минимум две темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_prune_member</word_key>
+      <word_default>We could not find the member whose topics you are attempting to prune.</word_default>
+      <word_custom>Пользователь, чьи �ообщени� вы пытаете�ь удалить, не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_prune_topics</word_key>
+      <word_default>We could not find any topics to prune that met your filter criteria.</word_default>
+      <word_custom>Си�теме не удало�ь найти �ообщени� дл� удалени�, удовлетвор�ющие вашему фильтру.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_open_perms</word_key>
+      <word_default>You do not have permission to open this topic.</word_default>
+      <word_custom>Вы не можете открыть �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_open_opened</word_key>
+      <word_default>The topic you are attempting to open is already open.</word_default>
+      <word_custom>Вы пытаете�ь открыть уже открытую тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_topic_title</word_key>
+      <word_default>You must specify the topic title.</word_default>
+      <word_custom>Вы должны указать название темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_delete_post</word_key>
+      <word_default>You do not have permission to delete the post.</word_default>
+      <word_custom>Вы не можете удалить �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>moderate_no_permission</word_key>
+      <word_default>You do not have permission to carry out that function.</word_default>
+      <word_custom>Вы не можете и�пользовать �ту возможно�ть.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_same_topics</word_key>
+      <word_default>You cannot merge a topic into itself.  That would be illogical captain! (tm)</word_default>
+      <word_custom>Вы пытаете�ь объединить тему �аму � �обой. Это же не логично!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_missing_old_topic</word_key>
+      <word_default>We could not find one of the topics you were attempting to merge.</word_default>
+      <word_custom>�е �уще�твует одной из тем, которые вы пытаете�ь объединить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_delete_topic</word_key>
+      <word_default>You do not have permission to delete this topic.</word_default>
+      <word_custom>Вы не можете удалить �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_missing_url_title</word_key>
+      <word_default>You must fill in the form completely.  You omitted either the URL of the topic or the new topic title.</word_default>
+      <word_custom>Похоже что вы не заполнили форму надлежащим образом. Вы пропу�тили или URL, или название новой темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_close_topic</word_key>
+      <word_default>You do not have permission to close this topic.</word_default>
+      <word_custom>Вы не можете закрыть �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_pids</word_key>
+      <word_default>You did not select any posts for moderation.</word_default>
+      <word_custom>Вы не выбрали ни одного �ообщени� дл� о�уще�твлени� �того дей�тви�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_only_one_pid</word_key>
+      <word_default>You must select more than one post for moderation.</word_default>
+      <word_custom>�еобходимо выбрать более одного �ообщени� дл� о�уще�твлени� �того дей�тви�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_merge_posts</word_key>
+      <word_default><![CDATA[It appears we're missing some input from your form submission.  Did you fill in the form completely?]]></word_default>
+      <word_custom>�едо�таточно данных дл� завершени� �того дей�тви�. Пожалуй�та убедите�ь, что форма была правильно заполнена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_forum_no_posts</word_key>
+      <word_default>The forum you are attempting to move the topic to does not allow posting or displaying of topics.</word_default>
+      <word_custom>Вы пытаете�ь перене�ти тему в форум где запрещен про�мотр тем или отправка �ообщений. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_forum_move</word_key>
+      <word_default>We could not find the forum you were attempting to place the topic into.</word_default>
+      <word_custom>Вы пытаете�ь перене�ти тему в не�уще�твующий форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_need_title</word_key>
+      <word_default>You must specify the topic title of the new topic.</word_default>
+      <word_custom>Вы должны вве�ти название новой темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_delete_first_post</word_key>
+      <word_default>You cannot delete the first post in a topic.  You should delete the topic itself instead.</word_default>
+      <word_custom>Вы пытаете�ь удалить первое �ообщение в теме. Этого делать нельз�. Е�ли вам нужно удалить тему, во�пользуйте�ь �пециально предназначенной дл� �того опцией.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_too_much_split</word_key>
+      <word_default>You cannot split all posts within this topic to another topic.  You must leave at least one post in this topic.</word_default>
+      <word_custom>Вы пытаете�ь перене�ти в�е �ообщени� темы, �того делать нельз�. В �тарой теме должно о�тать�� хот� бы одно �ообщение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_not_enough_split</word_key>
+      <word_default>There are not enough posts in this topic to split it.</word_default>
+      <word_custom>В �той теме недо�таточно �ообщений дл� того чтобы разделить ее.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_tid</word_key>
+      <word_default>We could not determine which topic you were attempting to moderate.</word_default>
+      <word_custom>Темы не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_topic_unpinned</word_key>
+      <word_default>The topic you are attempting to unpin is not currently pinned.</word_default>
+      <word_custom>Вы пытаете�ь опу�тить уже опущенную тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_topic_pinned</word_key>
+      <word_default>The topic you are attempting to pin is already pinned.</word_default>
+      <word_custom>Вы пытаете�ь подн�ть уже подн�тую тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_restricted</word_key>
+      <word_default>Your posting rights have been removed by an administrator.</word_default>
+      <word_custom>Вам запрещено общать�� на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_off_susp</word_key>
+      <word_default>Your posting rights have been temporarily suspended. The suspension is due to end %s.</word_default>
+      <word_custom>Вам запретили общать�� на форуме до %s.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>flood_control</word_key>
+      <word_default>The administrator has limited the number of new posts you can submit within a short time frame. Please wait %s seconds before replying or posting a new topic.</word_default>
+      <word_custom>Стоит делать передышку в %s �екунд между отправками новых тем и �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_bad_action</word_key>
+      <word_default>We could not determine what action you were attempting to take.</word_default>
+      <word_custom>�евозможно определить что пытаете�ь �делать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>multimod_not_found</word_key>
+      <word_default>We could not determine which multi-moderation tool you were attempting to use.</word_default>
+      <word_custom>Запрашиваемое дей�твие мульти-модерации не �уще�твует в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>multimod_no_perms</word_key>
+      <word_default>You do not have permission to use this multi-moderation tool on this topic.</word_default>
+      <word_custom>Вы не можете и�пользовать мульти-модерацию на данной теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>multimod_no_topic</word_key>
+      <word_default>We could not determine which topic you were attempting to take action against.</word_default>
+      <word_custom>Темы не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_bad_fid</word_key>
+      <word_default>You appear to have submitted an invalid forum.</word_default>
+      <word_custom>Идентификатор форума неверен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_bad_pid</word_key>
+      <word_default>You appear to have submitted an invalid post.</word_default>
+      <word_custom>Идентификатор �ообщени� неверен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_bad_tid</word_key>
+      <word_default>You appear to have submitted an invalid topic.</word_default>
+      <word_custom>Идентификатор темы неверен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_authorization_key</word_key>
+      <word_default>We use an authorization key to verify you really submitted the form, and the authorization key was not supplied with your form submission or was invalid.  Please go back, reload the form and try to submit it again.</word_default>
+      <word_custom>Дл� подтверждени� того, что именно вы отправили формы и�пользует�� ключ авторизации. Вме�те � �той формой ключ не был отправлен либо он неверный. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_mm_id</word_key>
+      <word_default>We could not determine which multi-moderation tool you were attempting to use.</word_default>
+      <word_custom>�евозможно определить какой ин�трумент мультимодерации вы пытаете�ь и�пользовать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_no_multimod</word_key>
+      <word_default>You do not have permission to use this multi-moderation tool.</word_default>
+      <word_custom>Вы не можете и�пользовать функцию мульти-модерации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>mod_stupid_beggar</word_key>
+      <word_default>Out of all the options in all the drop down, you had to choose one with dashed lines, well done. Go back and behave yourself.</word_default>
+      <word_custom>Отлично, вы только что умудрили�ь из в�ех опций в �пи�ке выбрать �амую бе�полезную, �о�то�щую из одних черточек. Верните�ь назад и и�правьте ошибку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_view_topic</word_key>
+      <word_default>You do not have permission to view this topic.</word_default>
+      <word_custom>Вы не можете про�матривать �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_bad_auth_key</word_key>
+      <word_default>Your secure key, used to verify you are posting the topic, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
+      <word_custom>Ваш ключ безопа�но�ти, и�пользующий�� дл� проверки того, что именно вы отправл�ете данные формы не �овпал � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_permission</word_key>
+      <word_default>You do not have permission to view this forum.</word_default>
+      <word_custom>Вы не можете про�матривать �тот форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_not_enough_posts</word_key>
+      <word_default>You do not have enough posts to view topics in this forum.</word_default>
+      <word_custom>Вы еще не набрали необходимого количе�тва �ообщений чтобы про�матривать �пи�ок тем данного форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>post_too_short</word_key>
+      <word_default>You must enter a post.</word_default>
+      <word_custom>Сообщение �лишком короткое.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>post_too_long</word_key>
+      <word_default>Your post was too long.  Please go back and shorten it a little.</word_default>
+      <word_custom>Сообщение �лишком длинное.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_mismatch_topic</word_key>
+      <word_default>There was a problem loading the post you are attempting to edit.  Please notify an administrator.</word_default>
+      <word_custom>При попытке редактировани� �ообщени� возникла проблема. Пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>members_tool_supmod</word_key>
+      <word_default>You do not have permission to access this moderator tool.</word_default>
+      <word_custom>Вы не имеете до�тупа к �той модератор�кой возможно�ти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>friends_not_enabled</word_key>
+      <word_default>The friends feature is not enabled on this community.</word_default>
+      <word_custom>Возможно�ть добавлени� пользователей в друзь� на данном форуме отключена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>posting_not_enough_posts</word_key>
+      <word_default>You do not have enough posts to post in this forum.</word_default>
+      <word_custom>Вы еще не набрали необходимое количе�тво �ообщений, чтобы отправл�ть �ообщени� в данном форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forums_no_guests</word_key>
+      <word_default>You must be logged in to see this forum.</word_default>
+      <word_custom>Дл� про�мотра �того форума вы должны быть авторизованным пользователем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>pp_friend_timeflood</word_key>
+      <word_default>You cannot re-add a friend for five minutes after removing them</word_default>
+      <word_custom>Вы не можете добавить �того пользовател� в друзь�, потому что менее п�ти минут назад вы отказали�ь от дружбы � ним.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>member_bad_birthday</word_key>
+      <word_default>You must enter for your birthday at least the month and day of your birthday.</word_default>
+      <word_custom>Вы должны указать как минимум ме��ц и день вашего дн� рождени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>members_profile_disabled</word_key>
+      <word_default>You are not permitted to modify all or some of your profile information.</word_default>
+      <word_custom>Вы не можете измен�ть некоторую информацию в �воем профиле.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>customfields_toobig</word_key>
+      <word_default><![CDATA[One of the fields you filled in was too large ('%s').  Please shorten it up a little.]]></word_default>
+      <word_custom><![CDATA[Одно из заполненных вами полей, �одержит �лишком большое значение ('%s'). ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>customfields_invalid</word_key>
+      <word_default><![CDATA[One of the fields you filled in requires values in a specific format, but the value you supplied did not meet this format ('%s').]]></word_default>
+      <word_custom><![CDATA[Значение одного из заполненных вами полей не �оответ�твует ожидаемому формату ('%s').]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>customfields_empty</word_key>
+      <word_default><![CDATA[You did not fill in a value for one of the fields that requires a value ('%s').]]></word_default>
+      <word_custom><![CDATA[Вы не заполнили об�зательное поле ('%s').]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>cannot_view_memberlist</word_key>
+      <word_default>You do not have permission to view the member listing.</word_default>
+      <word_custom>Вы не можете про�матривать �пи�ок пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_no_guests</word_key>
+      <word_default>You must be logged in to use the private messaging system.</word_default>
+      <word_custom>Дл� и�пользовани� личных �ообщений необходимо войти в �и�тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_disabled</word_key>
+      <word_default>You are not allowed to use the private messaging system.</word_default>
+      <word_custom>Вы не можете пользовать�� личными �ообщени�ми.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_bad_key</word_key>
+      <word_default>Your secure key, used to verify your identity, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
+      <word_custom>Ключ безопа�но�ти, который подтверждает вашу лично�ть, не �овпадает � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_no_msgid</word_key>
+      <word_default>We could not determine which message you were attempting to view.</word_default>
+      <word_custom>Сообщени�, которое вы пытаете�ь про�мотреть, не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_you_be_banned_yo</word_key>
+      <word_default>You have been banned from this personal conversation.</word_default>
+      <word_custom>К �ожалению вам закрыли до�туп к �той перепи�ке.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>onlinelist_disabled</word_key>
+      <word_default>You are not permitted to view our online list.</word_default>
+      <word_custom>Вы не можете про�матривать �пи�ок онлайн пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>dnames_off</word_key>
+      <word_default>The administrator does not allow members to change their display names.</word_default>
+      <word_custom>Возможно�ть изменени� имени пользовател� отключена админи�тратором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>dname_profiles_off</word_key>
+      <word_default>You are not permitted to view member profiles.</word_default>
+      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>comments_profiles</word_key>
+      <word_default>You are not permitted to view member profiles.</word_default>
+      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>dnames_no_id</word_key>
+      <word_default><![CDATA[We could not determine which member's display name history you were attempting to view.]]></word_default>
+      <word_custom>�е �уще�твует и�тории изменени� имен дл� запрашиваемого вами пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>status_off</word_key>
+      <word_default>You are not permitted to change your status.</word_default>
+      <word_custom>Вы не можете измен�ть �тату�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>settings_profiles_off</word_key>
+      <word_default>You are not permitted to view member profiles.</word_default>
+      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>profiles_off</word_key>
+      <word_default>You are not permitted to view member profiles.</word_default>
+      <word_custom>Вы не можете про�матривать профили пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>profiles_no_member</word_key>
+      <word_default>We could not find the member whose profile you were attempting to view.</word_default>
+      <word_custom>Вы запро�или профиль не�уще�твующего пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_system_off</word_key>
+      <word_default>The warn system is presently disabled.</word_default>
+      <word_custom>Си�тема предупреждений отключена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_no_user</word_key>
+      <word_default>We could not find the requested user.  Please go back and try again.</word_default>
+      <word_custom>Запрошенный вами пользователь не �уще�твует. Попробуйте вернуть�� назад и повторить попытку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_member_notes</word_key>
+      <word_default>You do not have permission to access this area of the site.</word_default>
+      <word_custom>Вы не можете во�пользовать�� данной возможно�тью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_no_access</word_key>
+      <word_default>You do not have permission to access this area of the site.</word_default>
+      <word_custom>Вы не можете во�пользовать�� данной возможно�тью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_past_max_high</word_key>
+      <word_default><![CDATA[You cannot raise this member's warn level any higher at this time.]]></word_default>
+      <word_custom>�а данный момент предупредить пользовател� невозможно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_past_max_low</word_key>
+      <word_default><![CDATA[You cannot lower this member's warn level any more at this time.]]></word_default>
+      <word_custom>�а данный момент времени понизить уровень предупреждений у данного пользовател� невозможно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_protected_member</word_key>
+      <word_default>The member you are attempting to warn is protected from such actions.</word_default>
+      <word_custom>Вы пытаете�ь предупредить пользовател�, который защищен от подобных дей�твий.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warn_bad_key</word_key>
+      <word_default>Your secure key, used to verify your identity, did not match the one submitted.  Please go back, reload the form, and try again.</word_default>
+      <word_custom>Ключ безопа�но�ти, который подтверждает вашу лично�ть, не �овпадает � отправленным. Пожалуй�та, верните�ь назад, обновите �траницу и попробуйте отправить �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>warned_already</word_key>
+      <word_default>This member has been warned once already within the allotted time allowed.</word_default>
+      <word_custom>Вы пытаете�ь предупредить пользовател�, который уже был предупрежден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>cal_no_perm</word_key>
+      <word_default>You do not have permission to view this calendar or this calendar does not exist.</word_default>
+      <word_custom>Вы не можете про�матривать �тот календарь, либо календарь про�то не �уще�твует в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_bad_approve</word_key>
+      <word_default>You do not have permission to approve this calendar event.</word_default>
+      <word_custom>У ва� нет прав дл� удалени� �того �обыти�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_event_not_found</word_key>
+      <word_default>We could not find that calendar event.</word_default>
+      <word_custom>Запрашиваемое вами �обытие не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_no_guests</word_key>
+      <word_default>You must be logged in to save events to our calendar.</word_default>
+      <word_custom>Добавл�ть �обыти� в календарь могут только авторизованные пользователи.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_delete_no_perm</word_key>
+      <word_default>You do not have permission to delete this calendar event.</word_default>
+      <word_custom>Вы не можете удал�ть �обыти� из �того календар�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_bad_key</word_key>
+      <word_default>There was a problem authenticating your request.  Please go back and click the link again.</word_default>
+      <word_custom>Ошибка безопа�но�ти. Пожалуй�та верните�ь назад и попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_bad_delete</word_key>
+      <word_default>We could not find the event you were attempting to delete.</word_default>
+      <word_custom>Удал�емое вами �обытие не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_dmy_missing</word_key>
+      <word_default>The day, month or year values supplied in the URL do not appear to valid.</word_default>
+      <word_custom>Значени� даты, ме��ца или года, переданные по ��ылке не верны.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_no_post_perm</word_key>
+      <word_default>You do not have permission to add events to this calendar.</word_default>
+      <word_custom>Вы не можете добавл�ть новые �обыти� в �тот календарь.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_no_edit_perm</word_key>
+      <word_default>You do not have permission to edit this calendar event.</word_default>
+      <word_custom>Вы не можете редактировать �обыти� �того календар�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_post_too_short</word_key>
+      <word_default>You must submit event details in order to save this event.</word_default>
+      <word_custom>Дл� добавлени� �обыти� необходимо более подробно опи�ать его.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_invalid_date_view</word_key>
+      <word_default>You requested to see events for an invalid date.  Please go back and try again.</word_default>
+      <word_custom>Вы пытаете�ь выве�ти �обыти� дл� неверной даты. Пожалуй�та верните�ь назад и попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_no_birthdays</word_key>
+      <word_default>We did not find any birthdays on this date.</word_default>
+      <word_custom>В �тот день дней рождени� не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_invalid_date</word_key>
+      <word_default>The date you chose for the event is not a valid date.  For example, February 30th and April 31st are invalid dates.  Please verify your input and resubmit the form.</word_default>
+      <word_custom>Выбранна� вами дата неверна. �апример не может быть 30 феврал� или 31 апрел�. Пожалуй�та убедите�ь в правильно�ти ввода даты и отправьте форму �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_range_wrong</word_key>
+      <word_default>The end date must occur after the start date, and cannot exceed the December 31, 2037.</word_default>
+      <word_custom>Дата окончани� �обыти� должна быть по�ле даты начала.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_title_too_long</word_key>
+      <word_default>The calendar title cannot be longer than 64 characters.</word_default>
+      <word_custom>�азвание �обыти� не может превышать 64 �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_no_title</word_key>
+      <word_default>You must submit a valid event title in order to save this event.</word_default>
+      <word_custom>�еобходимо указать название �обыти�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>calendar_post_too_long</word_key>
+      <word_default>Your event details were too large.  Please shorten it up a little.</word_default>
+      <word_custom>Опи�ание �обыти� велико. Попробуйте �ократить его и повторить добавление �обыти�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_chat_account_number</word_key>
+      <word_default>The chat room has not been properly setup by the administrator (the chat room account number has not been supplied).</word_default>
+      <word_custom>Чат не у�тановлен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_chat_default_room</word_key>
+      <word_default>The administrator has not configured a default chat room yet.</word_default>
+      <word_custom>Чат не на�троен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_chat_access</word_key>
+      <word_default>You do not have access to our chat room.</word_default>
+      <word_custom>У ва� нет до�тупа к нашему чату.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_chat_service_type</word_key>
+      <word_default>The administrator has not configured the service type for the chat room yet.</word_default>
+      <word_custom>Данный �ерви� чата не на�троен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>account_susp</word_key>
+      <word_default>Your account has been temporarily suspended. This suspension is due to end on %s.</word_default>
+      <word_custom>Ваша учетна� запи�ь заблокирована. Срок окончани� блокировки: %s.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>portal_not_enabled</word_key>
+      <word_default>The portal has not been enabled. Please contact an administrator.</word_default>
+      <word_custom>Портал не включен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>server_too_busy</word_key>
+      <word_default>Sorry, the server is too busy to handle your request, please try again in a moment</word_default>
+      <word_custom>Прино�им �вои изменени�. Сервер в данный момент �лишком перегружен. Зайдите позже.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_such_user</word_key>
+      <word_default>We could not find the member you requested.</word_default>
+      <word_custom>Запрашиваемый вами пользователь не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>attach_no_attachment</word_key>
+      <word_default>We could not find the attachment you were attempting to view.</word_default>
+      <word_custom>Запрашиваемый вами прикрепленный файл не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>attach_file_missing</word_key>
+      <word_default>We could not find the attachment you were attempting to view.</word_default>
+      <word_custom>Запрашиваемый вами прикрепленный файл не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>err_attach_not_attached</word_key>
+      <word_default>You do not have permission to view this attachment.</word_default>
+      <word_custom>У ва� не до�таточно прав дл� про�мотра �того прикрепленного файла.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_permission_to_download</word_key>
+      <word_default>You do not have permission to view this attachment.</word_default>
+      <word_custom>У ва� не до�таточно прав дл� загрузки данного прикрепленного файла.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reports_no_event</word_key>
+      <word_default>We could not determine which event you were attempting to report.</word_default>
+      <word_custom>Си�теме не удало�ь найти �обытие на которое вы пытаете�ь отправить жалобу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>messenger_no_delete_permission</word_key>
+      <word_default>You do not have permission to delete this topic.</word_default>
+      <word_custom>У ва� не до�таточно прав дл� удалени� темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_archive_messages</word_key>
+      <word_default>Sorry, no personal messages were found using that search critera. Try again and broaden the scope.</word_default>
+      <word_custom>К �ожалению по данному пои�ковому запро�у личных �ообщений не найдено. Попробуйте ра�ширить критерии пои�ка и повторить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_ignore_id</word_key>
+      <word_default>We could not find the member you were attempting to ignore.</word_default>
+      <word_custom>Си�теме не удало�ь найти пользовател�, которого вы хотите зане�ти в �пи�ок игнорируемых.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>upload_failed</word_key>
+      <word_default>The upload failed. Please contact a member of staff to help rectify the problem.</word_default>
+      <word_custom>Загрузка не удала�ь. Пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>reg_off</word_key>
+      <word_default>The community administrator is no longer accepting any new registrations at the moment.</word_default>
+      <word_custom>�дмини�траци� отключила реги�трацию на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>erl_log_in_submit</word_key>
+      <word_default>Log In</word_default>
+      <word_custom>Войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>exp_text</word_key>
+      <word_default><![CDATA[Sorry, an error occurred. If you are unsure on how to use a feature, or don't know why you got this error message, try looking through the help files for more information.]]></word_default>
+      <word_custom>Возникла ошибка. Е�ли вы не уверены, что правильно и�пользуете функцию, �оветуем вам обратить�� к нашей �и�теме помощи за дополнительной информацией.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>erl_enter_pass</word_key>
+      <word_default>Your account password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>erl_enter_name</word_key>
+      <word_default>Your account username</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>stf_no_msg</word_key>
+      <word_default>You must enter a message to send</word_default>
+      <word_custom>�еобходимо вве�ти тек�т �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>stf_no_name</word_key>
+      <word_default>You must enter the name of the person you are sending this page to</word_default>
+      <word_custom>�еобходимо вве�ти им� получател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>stf_no_subject</word_key>
+      <word_default>You must enter a subject for the email</word_default>
+      <word_custom>�еобходимо вве�ти тему �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>stf_no_email</word_key>
+      <word_default>You must enter the email address of the person you are sending this page to</word_default>
+      <word_custom>�еобходимо вве�ти e-mail адре� человека, которому вы хотите отправить �ту �траницу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>bad_email_message</word_key>
+      <word_default>The email message contained data you are not allowed to send.  Please contact an administrator with any questions.</word_default>
+      <word_custom>В вашем пи�ьме �одержит�� не допу�тима� информаци�. Вы можете �в�зать�� � админи�трацией форума за дополнительными разъ��нени�ми.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_friend_mid</word_key>
+      <word_default>Only members have access to the friends feature.</word_default>
+      <word_custom>Возможно�ть «Друзь�» до�тупна только зареги�трированным пользовател�м.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>forgot_pass</word_key>
+      <word_default>Forgotten your password?</word_default>
+      <word_custom>Забыли пароль?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_permission</word_key>
+      <word_default>Sorry, but you do not have permission to use this feature. If you are not logged in, you may do so using the form below if available.</word_default>
+      <word_custom>К �ожалению вы не можете во�пользовать�� �той возможно�тью. Е�ли вы еще не вошли на форум, возможно, �делав �то вы �можете во�пользовать�� ей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>missing_files</word_key>
+      <word_default>Sorry, some required files are missing. Please go back and try again.</word_default>
+      <word_custom>От�ут�твуют необходимые дл� работы файлы. Верните�ь назад и попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>complete_form</word_key>
+      <word_default>You must complete the form fully before proceeding. Please go back and check the data you entered.</word_default>
+      <word_custom>�еобходимо заполнить форму полно�тью. Пожалуй�та верните�ь назад и проделайте �то.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>pass_link</word_key>
+      <word_default>Click here!</word_default>
+      <word_custom>Вам �юда!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5515,9 +4280,27 @@ The <#BOARD_NAME#> team.
       <word_key>del_post</word_key>
       <word_default>Authorization mismatch - please go back and try again. If you have been trying to access a function incorrectly, please use the proper method.</word_default>
       <word_custom>Ошибка безопа�но�ти - пожалуй�та верните�ь назад и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>poss_hack_attempt</word_key>
+      <word_default>We are treating that action as a possible hack attempt. This action will be logged and the community administrator will be informed via email.</word_default>
+      <word_custom>Си�тема определила данное дей�твие как попытку взлома. О данном факте было �ообщено админи�тратору форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>incorrect_use</word_key>
+      <word_default>An error was detected with your request.  Please go back and try again.</word_default>
+      <word_custom>�е правильное обращение к одному из файлов форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_error</word_pack>
+      <word_key>no_guests</word_key>
+      <word_default><![CDATA[Sorry, but this function isn't available to guests.]]></word_default>
+      <word_custom>К �ожалению данна� возможно�ть не до�тупна дл� го�тей.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -5525,3029 +4308,440 @@ The <#BOARD_NAME#> team.
       <word_key>pass_blank</word_key>
       <word_default>Your password field was not complete</word_default>
       <word_custom>Вы не ввели пароль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>D_5</word_key>
-      <word_default>Friday</word_default>
-      <word_custom>П�тница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_no_js</word_key>
+      <word_default>You currently have javascript disabled. Several functions may not work. Please re-enable javascript to access full functionality.</word_default>
+      <word_custom>У ва� отключен JavaScript. �екоторые возможно�ти �и�темы не будут работать. Пожалуй�та, включите JavaScript дл� получени� до�тупа ко в�ем функци�м.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>D_3</word_key>
-      <word_default>Wednesday</word_default>
-      <word_custom>Среда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_no_js_title</word_key>
+      <word_default>Javascript Disabled Detected</word_default>
+      <word_custom>Отключен JavaScript</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>D_4</word_key>
-      <word_default>Thursday</word_default>
-      <word_custom>Четверг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>D_2</word_key>
-      <word_default>Tuesday</word_default>
-      <word_custom>Вторник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_12</word_key>
-      <word_default>December</word_default>
-      <word_custom>Декабрь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>D_0</word_key>
-      <word_default>Sunday</word_default>
-      <word_custom>Во�кре�енье</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>D_1</word_key>
-      <word_default>Monday</word_default>
-      <word_custom>Понедельник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_11</word_key>
-      <word_default>November</word_default>
-      <word_custom>�о�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_10</word_key>
-      <word_default>October</word_default>
-      <word_custom>Окт�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_9</word_key>
-      <word_default>September</word_default>
-      <word_custom>Сент�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_7</word_key>
-      <word_default>July</word_default>
-      <word_custom>Июль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_8</word_key>
-      <word_default>August</word_default>
-      <word_custom>�вгу�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_5</word_key>
-      <word_default>May</word_default>
-      <word_custom>Май</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_6</word_key>
-      <word_default>June</word_default>
-      <word_custom>Июнь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_4</word_key>
-      <word_default>April</word_default>
-      <word_custom>�прель</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_2</word_key>
-      <word_default>February</word_default>
-      <word_custom>Февраль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_3</word_key>
-      <word_default>March</word_default>
-      <word_custom>Март</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>M_1</word_key>
-      <word_default>January</word_default>
-      <word_custom>Январь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>admin_cp</word_key>
-      <word_default>Admin CP</word_default>
-      <word_custom>Перейти в панель админи�трировани� �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>transfer_you</word_key>
-      <word_default>Please wait while we transfer you...</word_default>
-      <word_custom>Подождите, �ейча� Вы будете перенаправлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>thanks</word_key>
-      <word_default>Thanks</word_default>
-      <word_custom> Спа�ибо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>you_last_visit</word_key>
-      <word_default>Last Visit:</word_default>
-      <word_custom>По�леднее по�ещение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pass</word_key>
-      <word_default>Password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>submit_li</word_key>
-      <word_default>Log in</word_default>
-      <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>yes</word_key>
-      <word_default>Yes</word_default>
-      <word_custom>Да</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>forum_jump</word_key>
-      <word_default>Forum Jump</word_default>
-      <word_custom>Бы�трый переход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>forum_home</word_key>
-      <word_default>Forum Home</word_default>
-      <word_custom>Главна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>cp_tool_tip</word_key>
-      <word_default>Edit my settings, such as signature, avatar and more...</word_default>
-      <word_custom>Редактировать на�тройки (подпи�ь, аватар и тп)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_offline</word_key>
-      <word_default>(OFFLINE)</word_default>
-      <word_custom>(OFFLINE)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>jmp_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_new_posts</word_key>
-      <word_default>View New Content</word_default>
-      <word_custom>Про�мотр новых публикаций</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tb_mlist</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gzip_on</word_key>
-      <word_default>GZIP Enabled</word_default>
-      <word_custom>GZIP включен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gzip_off</word_key>
-      <word_default>GZIP Disabled</word_default>
-      <word_custom>GZIP отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>page_1_of_1</word_key>
-      <word_default>Page 1 of 1</word_default>
-      <word_custom>Страница 1 из 1</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ps_first</word_key>
-      <word_default>First</word_default>
-      <word_custom>Перва�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ps_last</word_key>
-      <word_default>Last</word_default>
-      <word_custom>По�ледн��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sj_help</word_key>
-      <word_default>Help</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>live_chat</word_key>
-      <word_default>Live Chat</word_default>
-      <word_custom>Чат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sj_home</word_key>
-      <word_default>Forum Home</word_default>
-      <word_custom>К �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sj_search</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tt_poll_svote</word_key>
-      <word_default>Go back and show the voting options</word_default>
-      <word_custom>Вернуть�� к голо�ованию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tt_poll_show</word_key>
-      <word_default>View poll results before adding your vote</word_default>
-      <word_custom>По�мотреть ра�пределение голо�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tt_poll_null</word_key>
-      <word_default>View results, but forfeit your vote in this poll</word_default>
-      <word_custom>По�мотреть ра�пределение голо�ов. Вы потер�ете право голо�а!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tt_poll_vote</word_key>
-      <word_default>Add your vote to this poll</word_default>
-      <word_custom>Проголо�овать!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tt_gounread</word_key>
-      <word_default>Go to the first unread post</word_default>
-      <word_custom>Перейти к первому непрочитанному �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bi_markread</word_key>
-      <word_default>Mark forum as read?</word_default>
-      <word_custom>Пометить форум как прочтенный?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>err_select</word_key>
-      <word_default>Select All</word_default>
-      <word_custom>Выбрать в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>err_title</word_key>
-      <word_default>Post Data Saved!</word_default>
-      <word_custom>Содержимое �ообщени� �охранено!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>err_expl</word_key>
-      <word_default><![CDATA[The following post data has been saved. In some cases, using your browser's back button will empty out form fields which results in the loss of any typed and unsaved material. You may select all of the text area below and copy before hitting back.]]></word_default>
-      <word_custom>Данные �ледующего �ообщени� у�пешно �охранены. Иногда �лучает��, что при нажатии на кнопку «�азад» заполненные в пол� данные тер�ют��, по�тому вы можете �копировать тек�т и только потом вернуть�� на предыдущую �траницу.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sf_mb</word_key>
-      <word_default>MB</word_default>
-      <word_custom>МБ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sf_k</word_key>
-      <word_default>K</word_default>
-      <word_custom>К</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sf_bytes</word_key>
-      <word_default>bytes</word_default>
-      <word_custom>байт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sf_gb</word_key>
-      <word_default>GB</word_default>
-      <word_custom>ГБ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tpl_pages</word_key>
-      <word_default>Pages</word_default>
-      <word_custom>Страниц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>resend_val</word_key>
-      <word_default>Resend Validation</word_default>
-      <word_custom>Повторно вы�лать пи�ьмо активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>email_address</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tpl_prev</word_key>
-      <word_default>Previous Page</word_default>
-      <word_custom>Предыдуща� �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>next</word_key>
-      <word_default>Next</word_default>
-      <word_custom>Вперед</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>prev</word_key>
-      <word_default>Prev</word_default>
-      <word_custom>�азад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tpl_next</word_key>
-      <word_default>Next page</word_default>
-      <word_custom>Следующа� �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tpl_gotolast</word_key>
-      <word_default>Go to last page</word_default>
-      <word_custom>Перейти к по�ледней �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>tpl_gotofirst</word_key>
-      <word_default>Go to first page</word_default>
-      <word_custom>Перейти к первой �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_yesterday</word_key>
-      <word_default>Yesterday</word_default>
-      <word_custom>Вчера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_weeks_ago</word_key>
-      <word_default>%s weeks ago</word_default>
-      <word_custom>%s недель назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_today</word_key>
-      <word_default>Today</word_default>
-      <word_custom>Сегодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_less_week</word_key>
-      <word_default>A week ago</word_default>
-      <word_custom>неделю назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_less_day</word_key>
-      <word_default>A day ago</word_default>
-      <word_custom>вчера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_days_ago</word_key>
-      <word_default>%s days ago</word_default>
-      <word_custom>%s дней назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_hours_ago</word_key>
-      <word_default>%s hours ago</word_default>
-      <word_custom>%s ча�ов назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_less_hour</word_key>
-      <word_default>An hour ago</word_default>
-      <word_custom>ча� назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_less_minute</word_key>
-      <word_default>A minute ago</word_default>
-      <word_custom>минуту назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_minutes_ago</word_key>
-      <word_default>%s minutes ago</word_default>
-      <word_custom>%s минут назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_seconds_ago</word_key>
-      <word_default>%s seconds ago</word_default>
-      <word_custom>%s �екунд назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>au_reading</word_key>
-      <word_default>Reading (%s)...</word_default>
-      <word_custom>Читает %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>au_posting</word_key>
-      <word_default>Posting (%s)...</word_default>
-      <word_custom>Отвечает в %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>global_page_jump</word_key>
-      <word_default>Jump to page</word_default>
-      <word_custom>Перейти к �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>global_pm_read</word_key>
-      <word_default>View Notification</word_default>
-      <word_custom>Читать �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>global_pm_read_short</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>global_guestname</word_key>
-      <word_default>Guest</word_default>
-      <word_custom>Го�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>stats_sec</word_key>
-      <word_default>sec</word_default>
-      <word_custom>�ек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>stats_queries</word_key>
-      <word_default>queries</word_default>
-      <word_custom>запро�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>mailto_erroronforums</word_key>
-      <word_default>Error on the forums</word_default>
-      <word_custom>Ошибка на форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbcode_img_alt</word_key>
-      <word_default>Posted Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ajax_topictitle</word_key>
-      <word_default><![CDATA[Edited topic title from '%s' to '%s' from forum view]]></word_default>
-      <word_custom><![CDATA[Изменено название темы � '%s' на'%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ajax_topicstate</word_key>
-      <word_default>Altered topic state (opened/closed) from forum view</word_default>
-      <word_custom>Изменен �тату� темы (открыта/закрыта)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_unpinopen</word_key>
-      <word_default><![CDATA[Unpinned & opened topic from post form]]></word_default>
-      <word_custom>Тема опущена и открыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_unpinclose</word_key>
-      <word_default><![CDATA[Unpinned & closed topic from post form]]></word_default>
-      <word_custom>Тема опущена и закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_pinopen</word_key>
-      <word_default><![CDATA[Pinned & opened topic from post form]]></word_default>
-      <word_custom>Тема подн�та и открыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_opened</word_key>
-      <word_default>Opened topic from post form</word_default>
-      <word_custom>Тема открыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_unpinned</word_key>
-      <word_default>Unpinned topic from post form</word_default>
-      <word_custom>Тема опущена </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_pinclose</word_key>
-      <word_default><![CDATA[Pinned & closed topic from post form]]></word_default>
-      <word_custom>Тема закрыта и подн�та </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_pinned</word_key>
-      <word_default>Pinned topic from post form</word_default>
-      <word_custom>Тема подн�та </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>modlogs_closed</word_key>
-      <word_default>Closed topic from post form</word_default>
-      <word_custom>Тема закрыта </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>m_posts</word_key>
-      <word_default>Posts:</word_default>
-      <word_custom>Сообщений: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>m_joined</word_key>
-      <word_default>Joined:</word_default>
-      <word_custom>Реги�траци�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>m_group</word_key>
-      <word_default>Group:</word_default>
-      <word_custom>Группа:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>partial_login</word_key>
-      <word_default>The login was successful!</word_default>
-      <word_custom>Вы вошли в �и�тему!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>report_center_rss</word_key>
-      <word_default>Report Center RSS Feed</word_default>
-      <word_custom>RSS �и�темы жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>report_menu_view_report</word_key>
-      <word_default>View Report</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>report_menu_mark_complete</word_key>
-      <word_default>Mark Complete</word_default>
-      <word_custom>Пометить как решенна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_date_cite</word_key>
-      <word_default>From %s:</word_default>
-      <word_custom>От %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>report_member_bar</word_key>
-      <word_default>Active Reports</word_default>
-      <word_custom>�ктивных жалоб: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_quote</word_key>
-      <word_default>Quote</word_default>
-      <word_custom>Цитата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_full_cite</word_key>
-      <word_default>%s, on %s, said:</word_default>
-      <word_custom>%s (%s) пи�ал:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_name_cite</word_key>
-      <word_default>%s said:</word_default>
-      <word_custom>%s �казал:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_external_link</word_key>
-      <word_default>External link</word_default>
-      <word_custom>С�ылка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_member_bbcode</word_key>
-      <word_default>Member profile</word_default>
-      <word_custom>Профиль пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>bbc_email</word_key>
-      <word_default>E-mail Link</word_default>
-      <word_custom>E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>glb_captcha_text</word_key>
-      <word_default>Please enter the 6 character code shown in the image. If you cannot read the code, click the image to generate a new one. Case sensitive.</word_default>
-      <word_custom>Пожалуй�та введите 6 �имволов указанных на картинке. Е�ли вы не можете прочитать �имволы на картинке, нажмите на картинку, чтобы получить другую. Код реги�трозави�им (различают�� заглавные и пропи�ные �имволы)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>glb_captcha_enter</word_key>
-      <word_default>Confirm security code</word_default>
-      <word_custom>Подтвердите код безопа�но�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gbl_captcha_image_desc</word_key>
-      <word_default>If you do not see any numbers, or see broken images, please contact a board administrator to rectify the problem.</word_default>
-      <word_custom>Е�ли вы не видите никаких чи�ел или видите не в�е чи�ла, пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>glb_captcha_image</word_key>
-      <word_default>Your unique security code</word_default>
-      <word_custom>Код безопа�но�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gbl_captcha_title</word_key>
-      <word_default>Security Code</word_default>
-      <word_custom>Код безопа�но�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>rss_board_offline</word_key>
-      <word_default>Our board is offline temporarily and RSS feeds are unavailable during this time</word_default>
-      <word_custom>�аша �и�тема в данный момент отключена. RSS не до�тупен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_protected</word_key>
-      <word_default>Can not modify that groups reputation</word_default>
-      <word_custom>Вы не можете изменить репутацию у пользовател� �той группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_config</word_key>
-      <word_default>The configuration file for the reputation voting is missing or corrupt.</word_default>
-      <word_custom>Конфигураци� �и�темы рейтинг от�ут�твует или повреждена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_quota_neg</word_key>
-      <word_default>You have reached your quota of negative votes for the day</word_default>
-      <word_custom>Вы и�черпали лимит отрицательных оценок на �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_quota_pos</word_key>
-      <word_default>You have reached your quota of positive votes for the day</word_default>
-      <word_custom>Вы и�черпали лимит положительных оценок на �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_invalid</word_key>
-      <word_default>Invalid Rating</word_default>
-      <word_custom>�еверный рейтинг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_yourown</word_key>
-      <word_default>You are now allowed to vote on your own content</word_default>
-      <word_custom>Вы не можете голо�овать за �об�твенный контент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_guest</word_key>
-      <word_default>You must be logged in to use the reputation system</word_default>
-      <word_custom>Вы должны войти в �и�тему, чтобы во�пользовать�� �и�темой рейтинга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>reputation_offline</word_key>
-      <word_default>Rating System Offline</word_default>
-      <word_custom>Си�тема рейтинга отключена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_openidcleanup</word_key>
-      <word_default>OpenID temporary caches cleared out</word_default>
-      <word_custom>OpenID кеши очищены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_mobileNotifications</word_key>
-      <word_default>Mobile notifications sent</word_default>
-      <word_custom>Отправлены уведомлени� мобильным клиентам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_profileviews</word_key>
-      <word_default>Profile views counter updated</word_default>
-      <word_custom>Счетчик про�мотров профилей обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_mysqlcleanup</word_key>
-      <word_default>Cleaned up sleeping mysql processes</word_default>
-      <word_custom>Убиты «за�нувшие» mysql проце��ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_removevalidating</word_key>
-      <word_default>%s old validating members pruned</word_default>
-      <word_custom>%s �тарых аккаунтов, ожидающих активации, удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_removelocked</word_key>
-      <word_default>%s locked members pruned</word_default>
-      <word_custom>%s �тарых аккаунтов, ожидающих активации, удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_dailycleanout</word_key>
-      <word_default>%s XML-RPC logs removed, %s orphaned attachments removed, and %s subscriptions pruned</word_default>
-      <word_custom>%s XML-RPC запи�ей журнала удалено, %s потер�нных прикрепленных файлов удалено, %s подпи�ок очищено и %s маркеров прочтени� тем удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_weeklydigest</word_key>
-      <word_default><![CDATA[Weekly Topic & Forum Digest Sent]]></word_default>
-      <word_custom>Еженедельный отчет о темах и �ообщени�х отправлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_updateviews</word_key>
-      <word_default>Topic views counter updated</word_default>
-      <word_custom>Количе�тво про�мотров тем обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_rssimport</word_key>
-      <word_default>RSS Import completed (%s)</word_default>
-      <word_custom>Импорт RSS завершен (%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_dailydigest</word_key>
-      <word_default><![CDATA[Daily Topic & Forum Digest Sent]]></word_default>
-      <word_custom>Ежедневный отчет о темах и �ообщени�х отправлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_calendars</word_key>
-      <word_default>Calendar recached</word_default>
-      <word_custom>Обновление кешей календар� завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_announcements</word_key>
-      <word_default>Announcements updated</word_default>
-      <word_custom>Объ�влени� обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_pop3email</word_key>
-      <word_default>Checked for incoming Emails</word_default>
-      <word_custom>Проверка вход�щих Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_statsrebuilt</word_key>
-      <word_default>Statistics rebuilt</word_default>
-      <word_custom>Стати�тика обновлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_logprune</word_key>
-      <word_default>Log tables pruned</word_default>
-      <word_custom>Журналы очищены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>task_cleanout</word_key>
-      <word_default>Old reg_images, sessions and search results removed</word_default>
-      <word_custom>Старые коды подтверждени�, �е��ии и результаты пои�ка удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>attach_notallowed</word_key>
-      <word_default>Uploading is not allowed</word_default>
-      <word_custom>Загрузка запрещена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>attach_unlimited</word_key>
-      <word_default>Unlimited</word_default>
-      <word_custom>не ограничено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>board_offline_title</word_key>
-      <word_default>Board Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>resized_image</word_key>
-      <word_default>Resized to #{percent}% (was #{width} x #{height}) - Click image to enlarge</word_default>
-      <word_custom>Уменьшено на #{percent}% (#{width} x #{height}) - �ажмите дл� увеличени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>advanced</word_key>
-      <word_default>Advanced</word_default>
-      <word_custom>Ра�ширенный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_my_gallery</word_key>
-      <word_default>Go to my gallery</word_default>
-      <word_custom>Перейти в �вою галерею</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>my_gallery</word_key>
-      <word_default>My Gallery</word_default>
-      <word_custom>Мо� галере�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_help</word_key>
-      <word_default>View help</word_default>
-      <word_custom>Перейти к помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>advanved_help</word_key>
-      <word_default>Advanced Search</word_default>
-      <word_custom>Ра�ширенный пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>my_blog</word_key>
-      <word_default>My Blog</word_default>
-      <word_custom>Мой блог</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>client_area</word_key>
-      <word_default>Client Area</word_default>
-      <word_custom>Клиент-центр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>manage_friends</word_key>
-      <word_default>Manage Friends</word_default>
-      <word_custom>Друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_my_blog</word_key>
-      <word_default>Go to my blog</word_default>
-      <word_custom>Перейти в �вой блог</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>your_cp</word_key>
-      <word_default>My Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>logo</word_key>
-      <word_default>Logo</word_default>
-      <word_custom>Логотип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_home</word_key>
-      <word_default>Go to board index</word_default>
-      <word_custom>Перейти к �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_reports</word_key>
-      <word_default>View active reports</word_default>
-      <word_custom>Про�мотреть жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>post_announcement</word_key>
-      <word_default>Manage Announcements</word_default>
-      <word_custom>Создание объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>mod_tools</word_key>
-      <word_default>Mod Tools:</word_default>
-      <word_custom>Модерирование:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ip_lookup</word_key>
-      <word_default>IP Lookup</word_default>
-      <word_custom>Определение IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>login_to_acp</word_key>
-      <word_default>Log in to your Admin CP</word_default>
-      <word_custom>Вход в админцентр форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>jump_to_content</word_key>
-      <word_default>Jump to content</word_default>
-      <word_custom>Перейти к �одержимому</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>cancel</word_key>
-      <word_default>Cancel</word_default>
-      <word_custom>Отмена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>report</word_key>
-      <word_default>Report</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>or</word_key>
-      <word_default>or</word_default>
-      <word_custom>или</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>remove_friend</word_key>
-      <word_default>Remove Friend</word_default>
-      <word_custom>Удалить из друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>page_title_page</word_key>
-      <word_default>- Page</word_default>
-      <word_custom>- Страница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>add_friend</word_key>
-      <word_default>Add as Friend</word_default>
-      <word_custom>Добавить в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>generic_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>lightbox_of</word_key>
-      <word_default>of</word_default>
-      <word_custom>из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>lightbox_label</word_key>
-      <word_default>Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>mark_all_as_read</word_key>
-      <word_default>Mark all as read</word_default>
-      <word_custom>Отметить в�е как прочтенное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>mark_board_as_read</word_key>
-      <word_default>Mark Board As Read</word_default>
-      <word_custom>Отметить в�е �ообщени� прочитанными</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>delete_my_cookies</word_key>
-      <word_default>Delete My Cookies</word_default>
-      <word_custom>Очи�тить cookies</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>delete_all_cookies_title</word_key>
-      <word_default>Delete cookies set by this board</word_default>
-      <word_custom>Очи�тить cookies, у�тановленные �и�темой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>back_to</word_key>
-      <word_default>Back to</word_default>
-      <word_custom>Вернуть�� к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>back_to_top</word_key>
-      <word_default>Back to top</word_default>
-      <word_custom>�аверх</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_top</word_key>
-      <word_default>Go to top</word_default>
-      <word_custom>�аверх</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>exec_stats</word_key>
-      <word_default>Execution Stats</word_default>
-      <word_custom>Стати�тика работы �и�темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>time_now</word_key>
-      <word_default>Time Now:</word_default>
-      <word_custom>Сейча�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>theme_prefix</word_key>
-      <word_default>Theme:</word_default>
-      <word_custom>Стиль:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>language_prefix</word_key>
-      <word_default>Language:</word_default>
-      <word_custom>Язык:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>override_browser_theme</word_key>
-      <word_default>Click here to manually choose a theme</word_default>
-      <word_custom>�ажмите �юда дл� выбора темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>skin_browser_set</word_key>
-      <word_default>You are using a theme designed for your browser.</word_default>
-      <word_custom>Вы и�пользуете тему наиболее подход�щую дл� вашего браузера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>rss_feed</word_key>
-      <word_default>RSS Feed</word_default>
-      <word_custom>RSS поток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>skin_and_lang</word_key>
-      <word_default>Skin and Language</word_default>
-      <word_custom>Внешний вид</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>board_rules</word_key>
-      <word_default>Board Rules</word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pc_replies</word_key>
-      <word_default>Replies:</word_default>
-      <word_custom>Ответов: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pc_sent</word_key>
-      <word_default>Sent:</word_default>
-      <word_custom>Отправлено: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ignore_conversation</word_key>
-      <word_default>Ignore This Notification</word_default>
-      <word_custom>Игнорировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>nav_return_to</word_key>
-      <word_default>Return to </word_default>
-      <word_custom>Вернуть�� к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pc_subject</word_key>
-      <word_default>Subject:</word_default>
-      <word_custom>Тема: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>replied_convo</word_key>
-      <word_default>replied to a conversation</word_default>
-      <word_custom>ответил в личной бе�еде</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_prefix</word_key>
-      <word_default>Go to %s</word_default>
-      <word_custom>Перейти к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sent_new_convo</word_key>
-      <word_default>sent you a new conversation</word_default>
-      <word_custom> хочет начать личную бе�еду � вами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_memberlist</word_key>
-      <word_default>Go to Member List</word_default>
-      <word_custom>Перейти к �пи�ку пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>discussion</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Об�уждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>home</word_key>
-      <word_default>Home</word_default>
-      <word_custom>�а главную</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>go_to_discussion</word_key>
-      <word_default>Go to Forums</word_default>
-      <word_custom>Перейти к �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>homepage_title</word_key>
-      <word_default>Homepage</word_default>
-      <word_custom>Перейти на �айт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>minus</word_key>
-      <word_default>Minus</word_default>
-      <word_custom>Мину�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>add</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>captcah_new</word_key>
-      <word_default><![CDATA[Can't make it out? Click here to generate a new image]]></word_default>
-      <word_custom>�е можете прочитать? �ажмите зде�ь чтобы �оздать новое изображение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>not_signed_in</word_key>
-      <word_default>You are not signed in</word_default>
-      <word_custom>Вы не вошли</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>click_login</word_key>
-      <word_default>Click here to log in</word_default>
-      <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>board_offline_desc</word_key>
-      <word_default>This board is currently offline.</word_default>
-      <word_custom>Форумы в данный момент отключены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>attempt_login</word_key>
-      <word_default>Attempt to log in</word_default>
-      <word_custom>Попробовать войти в �и�тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>check_all</word_key>
-      <word_default>Check all</word_default>
-      <word_custom>Выбрать в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>click_toggle</word_key>
-      <word_default>Click to Toggle</word_default>
-      <word_custom>�ажмите дл� переключени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>board_offline</word_key>
-      <word_default>Board Offline</word_default>
-      <word_custom>Форум отключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_status</word_key>
-      <word_default>Warn Status</word_default>
-      <word_custom>Предупреждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_level</word_key>
-      <word_default>Warning level:</word_default>
-      <word_custom>Уровень предупреждени�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_view_history</word_key>
-      <word_default>View warn history</word_default>
-      <word_custom>По�мотреть и�торию предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_decrease</word_key>
-      <word_default>Decrease warning</word_default>
-      <word_custom>�н�ть предупреждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_gallery</word_key>
-      <word_default>View gallery</word_default>
-      <word_custom>Перейти к галерее</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>warn_increase</word_key>
-      <word_default>Increase warning</word_default>
-      <word_custom>добавить предупреждение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_blog</word_key>
-      <word_default>View blog</word_default>
-      <word_custom>Перейти к блогу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pm_member</word_key>
-      <word_default>PM this member</word_default>
-      <word_custom>Отправить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>photo</word_key>
-      <word_default>Photo</word_default>
-      <word_custom>Фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>users_photo</word_key>
-      <word_default><![CDATA['s Photo]]></word_default>
-      <word_custom> фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>icon</word_key>
-      <word_default>Icon</word_default>
-      <word_custom>Иконка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>their_profile</word_key>
-      <word_default><![CDATA[%s's Profile]]></word_default>
-      <word_custom> </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>my_profile</word_key>
-      <word_default>My Profile</word_default>
-      <word_custom>Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>your_profile</word_key>
-      <word_default>Your Profile</word_default>
-      <word_custom>Ваш профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_profile</word_key>
-      <word_default>View Profile</word_default>
-      <word_custom>Про�мотр профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_stopwords_</word_key>
-      <word_default>about,all,and,been,can,cant,for,has,here,just,me,new,next,not,old,out,our,said,saw,that,thats,the,their,then,theyll,this,was,were,well,will,with,what,whats,when,where,why,you</word_default>
-      <word_custom>about,all,and,can,cant,for,just,me,new,not,old,out,the,then,theyll,this,was,were,well,will,with,what,whats,when,where,why,you,о,и,на,в,к,под,из,подо,из,перед,по,за,без,до,от,при,через,�,у,без</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>find_posts</word_key>
-      <word_default>Find Posts</word_default>
-      <word_custom>�айти �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>find_topics</word_key>
-      <word_default>Find Topics</word_default>
-      <word_custom>�айти темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>use_full_editor</word_key>
-      <word_default>Use full messenger</word_default>
-      <word_custom>Полна� форма отправки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>manage_ignored_users</word_key>
-      <word_default>Manage Ignored Users</word_default>
-      <word_custom>Игнорируемые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>quick_send_to</word_key>
-      <word_default>Sending a PM to</word_default>
-      <word_custom>Отправка личного �ообщени� дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>quick_send_button</word_key>
-      <word_default>Send</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>quick_message</word_key>
-      <word_default>Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>quick_subject</word_key>
-      <word_default>Subject</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__show</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__view_post</word_key>
-      <word_default>View Post</word_default>
-      <word_custom>Про�мотр �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__useronline</word_key>
-      <word_default>User is online</word_default>
-      <word_custom>Пользователь онлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__pip</word_key>
-      <word_default>Pip</word_default>
-      <word_custom>Pip</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__tracking</word_key>
-      <word_default>Tracking</word_default>
-      <word_custom>Подпи�ать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__useroffline</word_key>
-      <word_default>User is offline</word_default>
-      <word_custom>Пользователь офлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__useredit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__voted</word_key>
-      <word_default>Voted</word_default>
-      <word_custom>Проголо�овал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__user</word_key>
-      <word_default>User</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>D_6</word_key>
-      <word_default>Saturday</word_default>
-      <word_custom>Суббота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__edit</word_key>
-      <word_default>Edit icon</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__delete</word_key>
-      <word_default>Delete icon</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__reply</word_key>
-      <word_default>Reply Icon</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>macro__report</word_key>
-      <word_default>Report Icon</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>pm_this_member</word_key>
-      <word_default>PM this member</word_default>
-      <word_custom>Отправить ЛС</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>emoticons_template_title</word_key>
-      <word_default>Emoticons</word_default>
-      <word_custom>Смайлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>mark_pc_read</word_key>
-      <word_default>Mark As Read</word_default>
-      <word_custom>Отметить прочтенным</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>configure_notifications</word_key>
-      <word_default>Notification Settings</word_default>
-      <word_custom>�а�тройки уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>notifications_viewall</word_key>
-      <word_default>View All Notifications</word_default>
-      <word_custom>В�е уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>notify_toggle</word_key>
-      <word_default>Toggle the notification excerpt</word_default>
-      <word_custom>Переключить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>nomore_notifications_4u</word_key>
-      <word_default>We could not find any more unread notifications for you</word_default>
-      <word_custom>У ва� нет непрочитанных уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>notifylogin_error</word_key>
-      <word_default>You must be logged in to view your notifications</word_default>
-      <word_custom>Дл� про�мотра уведомлений необходимо зайти в �и�тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>unread_notification_suffix</word_key>
-      <word_default> unread notifications</word_default>
-      <word_custom> непрочитанных уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>manage_notifications</word_key>
-      <word_default>You have %s unread notifications</word_default>
-      <word_custom>У ва� %s непрочитанных уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gbl_sharelink_with</word_key>
-      <word_default>Share this link via</word_default>
-      <word_custom>Поделить�� ��ылкой через</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>view_topic_preview</word_key>
-      <word_default>View topic preview</word_default>
-      <word_custom>Предпро�мотр темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>status_creator_facebook</word_key>
-      <word_default>Facebook</word_default>
-      <word_custom>Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>status_creator_twitter</word_key>
-      <word_default>Twitter</word_default>
-      <word_custom>Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>status_creator_ipb</word_key>
-      <word_default>Board</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>su_via</word_key>
-      <word_default>via</word_default>
-      <word_custom> через </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>context_search_forum</word_key>
-      <word_default>This forum</word_default>
-      <word_custom>Этот форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>context_search_topic</word_key>
-      <word_default>This topic</word_default>
-      <word_custom>Эта тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>context_search_title</word_key>
-      <word_default>Search section:</word_default>
-      <word_custom>И�кать в:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>gbl_find_my_content</word_key>
-      <word_default>Find My Content</word_default>
-      <word_custom>Публикации пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>my_content_link</word_key>
-      <word_default>My Content</word_default>
-      <word_custom>Мои публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>active_users_detail</word_key>
-      <word_default>%s members, %s guests, %s anonymous users</word_default>
-      <word_custom>%s пользователей, %s го�тей, %s �крытых пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_larr</word_key>
-      <word_default><![CDATA[&larr;]]></word_default>
-      <word_custom><![CDATA[&larr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_raquo</word_key>
-      <word_default><![CDATA[&raquo;]]></word_default>
-      <word_custom><![CDATA[&raquo;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_laquo</word_key>
-      <word_default><![CDATA[&laquo;]]></word_default>
-      <word_custom><![CDATA[&laquo;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>notify__sent</word_key>
-      <word_default/>
-      <word_custom/>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_rarr</word_key>
-      <word_default><![CDATA[&rarr;]]></word_default>
-      <word_custom><![CDATA[&rarr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>more</word_key>
+      <word_key>more_apps</word_key>
       <word_default>More</word_default>
-      <word_custom>Дальше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Больше</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>full_version</word_key>
-      <word_default>Full Version</word_default>
-      <word_custom>Полна� вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>generic_opts_link</word_key>
+      <word_default>Options</word_default>
+      <word_custom>�а�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>task__optimizedtables</word_key>
-      <word_default>%s database tables optimized</word_default>
-      <word_custom> %s таблиц оптимизировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>set_mobile_theme</word_key>
+      <word_default>Use Mobile Version</word_default>
+      <word_custom>И�пользовать мобильную вер�ию</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>nonotifications_list</word_key>
-      <word_default>You do not have any notifications</word_default>
-      <word_custom>У ва� нет уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>quicknav_comm_link</word_key>
+      <word_default>Community</word_default>
+      <word_custom>Сообще�тво</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>gbl_fb_no_app_id</word_key>
-      <word_default><![CDATA[You need to visit your ACP Settings for Facebook Connect and enter your <a href='http://www.facebook.com/developers/' target='_blank'>Facebook Application</a> ID]]></word_default>
-      <word_custom><![CDATA[�еобходимо проверить на�тройки Интеграци� � Facebook и указать ID вашего <a href='http://www.facebook.com/developers/' target='_blank'>Facebook Application</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>step</word_key>
+      <word_default>Step %s</word_default>
+      <word_custom>Шаг %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>acp_sessiontimeout</word_key>
-      <word_default>Your ACP session has expired. Please refresh the page to log back in.</word_default>
-      <word_custom>Се��и� и�текла. Пожалуй�та, обновите �траницу и повторите вход в �и�тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbl_post</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Сообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>ap_np_msg</word_key>
-      <word_default>You do not have permission for this action</word_default>
-      <word_custom>Вы не имеете права на выполнение �того дей�тви�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>user_dd_go_pm</word_key>
+      <word_default>Personal Messenger</word_default>
+      <word_custom>Личный �щик</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>ap_error</word_key>
-      <word_default>Notice</word_default>
-      <word_custom>Уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>markread_rc_link</word_key>
+      <word_default>Report Center</word_default>
+      <word_custom>Жалобы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>status_creator_ipbmobiphone</word_key>
-      <word_default>Mobile App</word_default>
-      <word_custom>Mobile App</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>registration_question</word_key>
+      <word_default>Registration Question</word_default>
+      <word_custom>Вопро� при реги�трации</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>mob_view_new_posts</word_key>
-      <word_default>New Content</word_default>
-      <word_custom>�овые публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>by_ucfirst</word_key>
+      <word_default>By</word_default>
+      <word_custom>По</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>mob_status_updates</word_key>
-      <word_default>Status Updates</word_default>
-      <word_custom>Обновлени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>launch_quicknav</word_key>
+      <word_default>Open Quick Navigation</word_default>
+      <word_custom>Открыть бы�трый переход</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>licensed_to</word_key>
-      <word_default>Licensed to: </word_default>
-      <word_custom>Лицензи� зареги�трирована на: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_this</word_key>
+      <word_default>Like This</word_default>
+      <word_custom>�равит��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>lim_windows</word_key>
-      <word_default>Log in with Windows Live</word_default>
-      <word_custom>Войти � и�пользованием Windows Live </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>liked_by</word_key>
+      <word_default>Liked by</word_default>
+      <word_custom>�равит��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>lim_twitter</word_key>
-      <word_default>Log in with Twitter</word_default>
-      <word_custom>Вход � и�пользованием Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>lim_facebook</word_key>
-      <word_default>Log in with Facebook</word_default>
-      <word_custom>Войти � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>lim_openid</word_key>
-      <word_default>Log in with OpenID</word_default>
-      <word_custom>Войти � и�пользованием OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>on</word_key>
-      <word_default>on</word_default>
-      <word_custom>в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>loadingtext</word_key>
-      <word_default>Loading...</word_default>
-      <word_custom>Загрузка...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>freeiphoneapp</word_key>
-      <word_default>Get the free IP.Board App for iPhone now!</word_default>
-      <word_custom>У�тановите бе�платное приложение на iPhone дл� IP.Board</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_rssimportnotoc</word_key>
-      <word_default>No title or content</word_default>
-      <word_custom>�ет �одержимого или названи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_rssimportcode</word_key>
-      <word_default>Code: </word_default>
-      <word_custom>Код:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>_rssimportsource</word_key>
-      <word_default>Source</word_default>
-      <word_custom>И�точник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>rssappoffline</word_key>
-      <word_default>The requested RSS feed could not be retrieved</word_default>
-      <word_custom>�е удало�ь получить запрашиваемый RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>unset_button</word_key>
+      <word_key>unlike_this</word_key>
       <word_default>Unlike</word_default>
       <word_custom>�е нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pre_pinned</word_key>
+      <word_default>Pinned</word_default>
+      <word_custom>Зафик�ировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>f_deleted_badge</word_key>
+      <word_default>Deleted</word_default>
+      <word_custom>Удаленные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>f_queued_badge</word_key>
+      <word_default>Queued</word_default>
+      <word_custom>В очереди</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tags_max_no_min</word_key>
+      <word_default>Select a maximum of %s tags</word_default>
+      <word_custom>Укажите не более %s тег(ов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pre_moved</word_key>
+      <word_default>Moved</word_default>
+      <word_custom>Перемещено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>firsttagprefix</word_key>
+      <word_default>Use first tag as prefix</word_default>
+      <word_custom>И�пользовать первый тег как префик�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tag_trunc_has_more</word_key>
+      <word_default>and %s more...</word_default>
+      <word_custom>и %s еще...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tags_max_and_min</word_key>
+      <word_default><![CDATA[Select <em>at least</em> %s tags and a maximum of %s tags]]></word_default>
+      <word_custom><![CDATA[Укажите <em>не менее</em> %s и не более %s тег(ов)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tags_min_no_max</word_key>
+      <word_default><![CDATA[Select <em>at least</em> %s tags]]></word_default>
+      <word_custom><![CDATA[Укажите <em>как минимум</em> %s тег(ов)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>inbox_list_none</word_key>
+      <word_default>There are no messages to show</word_default>
+      <word_custom>�ет �ообщений дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_notify_item</word_key>
+      <word_default>item</word_default>
+      <word_custom>�лемент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_notify_pm</word_key>
+      <word_default>message</word_default>
+      <word_custom>�ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>errorcleaningcontentcache</word_key>
+      <word_default>There was an error cleaning up the content cache</word_default>
+      <word_custom>Возникла проблема � очи�ткой кеша публикаций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>notifications_at_the_top</word_key>
+      <word_default>Notifications</word_default>
+      <word_custom>Уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>compose_new</word_key>
+      <word_default>Compose New</word_default>
+      <word_custom>Создать новое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>status_updates_link</word_key>
+      <word_default>Member Status Updates</word_default>
+      <word_custom>Обновлени� �тату�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>change_theme</word_key>
+      <word_default>Change Theme</word_default>
+      <word_custom>Изменить �тиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_update_status</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_status_update</word_key>
+      <word_default><![CDATA[What's on your mind?]]></word_default>
+      <word_custom>О чем ты �ейча� думаешь?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>navigation_title</word_key>
+      <word_default>Quick Navigation</word_default>
+      <word_custom>Бы�трый переход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>online_user_link</word_key>
+      <word_default>Users Online</word_default>
+      <word_custom>Пользователи онлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>contentcache_cleaned</word_key>
+      <word_default>Cleaned up content cache - %s items removed</word_default>
+      <word_custom>Очищены кеши контента - удалено %s запи�ей </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>registered_users_link</word_key>
+      <word_default>Registered Members</word_default>
+      <word_custom>Зареги�трированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>inbox_list_view</word_key>
+      <word_default>View All Messages</word_default>
+      <word_custom>В�е �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>inbox_at_the_top</word_key>
+      <word_default>Inbox</word_default>
+      <word_custom>Вход�щие</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>find_more_tags</word_key>
+      <word_default><![CDATA[Find more content tagged '%s']]></word_default>
+      <word_custom>�айти еще публикации � тегом «%s»</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>member_since</word_key>
+      <word_default>Member since</word_default>
+      <word_custom>Пользователь �</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stat_exec</word_key>
+      <word_default>Exec. Time:</word_default>
+      <word_custom>Врем� и�полнени�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tag_tip</word_key>
+      <word_default>Type tags separated by commas...</word_default>
+      <word_custom>Вводите теги рздел�� их зап�тыми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>add_a_tag</word_key>
+      <word_default>Add a tag</word_default>
+      <word_custom>Добавить тег</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_formatted_more</word_key>
+      <word_default><![CDATA[%s and <a href='%s' class='_repLikeMore' data-id='%s' data-type='%s' data-app='%s'>%s others</a> like this]]></word_default>
+      <word_custom><![CDATA[%s и <a href='%s' class='_repLikeMore' data-id='%s' data-type='%s' data-app='%s'>%s другим</a> �то нравит��]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_moi</word_key>
+      <word_default>You</word_default>
+      <word_custom>Вам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_and</word_key>
+      <word_default>and</word_default>
+      <word_custom>и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_formatted_me</word_key>
+      <word_default>You like this</word_default>
+      <word_custom>Вам �то нравит��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_permadelete</word_key>
+      <word_default>%s posts permanently deleted, %s topics permanently deleted</word_default>
+      <word_custom>%s �ообщений и %s тем полно�тью удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_modcp_link</word_key>
+      <word_default>ModeratorCP</word_default>
+      <word_custom>Модератор�ка� панель</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mod_actions</word_key>
+      <word_default>Moderator actions</word_default>
+      <word_custom>Дей�тви� модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stat_gzip</word_key>
+      <word_default>Gzip:</word_default>
+      <word_custom>Gzip:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stat_load</word_key>
+      <word_default>Load:</word_default>
+      <word_custom>Загрузка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stat_queries</word_key>
+      <word_default>Queries:</word_default>
+      <word_custom>Запро�ов:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>unset_fave_button</word_key>
+      <word_default>%s</word_default>
+      <word_custom>%s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
       <word_key>unset_fave_words</word_key>
-      <word_default>If you unlike this you will no longer receive any notifications</word_default>
+      <word_default>If you %s you will no longer receive any notifications</word_default>
       <word_custom>Е�ли вам �то не нравит�� вы больше ну будете получать какие-либо уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>set_fave_button</word_key>
+      <word_default>%s</word_default>
+      <word_custom>%s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>unset_button</word_key>
+      <word_default>%s</word_default>
+      <word_custom>�е нравит��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_formatted_one_more</word_key>
+      <word_default><![CDATA[%s and <a href='%s' class='_fmore'>1 other</a> follow this]]></word_default>
+      <word_custom><![CDATA[Понравило�ь: %s и <a href='%s' class='_fmore'>еще одному</a>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
       <word_key>unset_fave_title</word_key>
-      <word_default>Unlike</word_default>
+      <word_default>%s</word_default>
       <word_custom>�е нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8555,19 +4749,6 @@ The <#BOARD_NAME#> team.
       <word_key>fave_and</word_key>
       <word_default>and</word_default>
       <word_custom>и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>fave_formatted_me</word_key>
-      <word_default>You like this</word_default>
-      <word_custom>Вам понравило�ь �то</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8575,59 +4756,2323 @@ The <#BOARD_NAME#> team.
       <word_key>fave_moi</word_key>
       <word_default>You</word_default>
       <word_custom>Ð’Ñ‹</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_formatted_me</word_key>
+      <word_default>You follow this</word_default>
+      <word_custom>Вам понравило�ь �то</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
       <word_key>fave_formatted_more</word_key>
-      <word_default><![CDATA[%s and <a href='%s' class='_fmore'>%s others</a> like this]]></word_default>
+      <word_default><![CDATA[%s and <a href='%s' class='_fmore'>%s others</a> follow this]]></word_default>
       <word_custom><![CDATA[Понравило�ь: %s и <a href='%s' class='_fmore'>%s другим</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>fave_formatted_one_more</word_key>
-      <word_default><![CDATA[%s and <a href='%s' class='_fmore'>1 other</a> like this]]></word_default>
-      <word_custom><![CDATA[Понравило�ь: %s и <a href='%s' class='_fmore'>еще одному</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>fave_formatted_one</word_key>
-      <word_default>%s likes this</word_default>
-      <word_custom>%s понравило�ь �то</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>fave_formatted_many</word_key>
-      <word_default>%s like this</word_default>
-      <word_custom>Понравило�ь: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
       <word_key>your_likes</word_key>
-      <word_default>My Liked Content</word_default>
+      <word_default>Content I Follow</word_default>
       <word_custom>Мне нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_formatted_many</word_key>
+      <word_default>%s follow this</word_default>
+      <word_custom>Понравило�ь: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_formatted_one</word_key>
+      <word_default>%s follows this</word_default>
+      <word_custom>%s понравило�ь �то</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>follow_anon_count_p</word_key>
+      <word_default>%s anonymous users</word_default>
+      <word_custom>%s анонимных пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>followed_anonymously</word_key>
+      <word_default>(Anonymously)</word_default>
+      <word_custom>(�нонимно)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>follow_anon_count_s</word_key>
+      <word_default>1 anonymous user</word_default>
+      <word_custom>1 анонимный пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>followed_by</word_key>
+      <word_default>Followed By</word_default>
+      <word_custom>След�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>liked_by_title</word_key>
+      <word_default>Liked By</word_default>
+      <word_custom>�равит��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_comments_like</word_key>
+      <word_default>comments</word_default>
+      <word_custom>комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>itemmarkers_task_log</word_key>
+      <word_default>Cleaned up %s markers, removed %s unused rows</word_default>
+      <word_custom>Удалено %s маркеров �ообщений, удалено %s не и�пользуемых запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>missing_template_bit</word_key>
+      <word_default>We could not find the requested template</word_default>
+      <word_custom>Си�тема не может найти запрашиваемый шаблон</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_formatted_one</word_key>
+      <word_default>%s likes this</word_default>
+      <word_custom>%s �то нравит��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_formatted_many</word_key>
+      <word_default>%s like this</word_default>
+      <word_custom>%s люб�т �то</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_like_formatted_one_more</word_key>
+      <word_default><![CDATA[%s and <a href='%s' class='_repLikeMore' data-id='%s' data-type='%s' data-app='%s'>1 other</a> like this]]></word_default>
+      <word_custom><![CDATA[%s и <a href='%s' class='_repLikeMore' data-id='%s' data-type='%s' data-app='%s'>еще 1</a> �то нравит��]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_unlike</word_key>
+      <word_default>unfollow</word_default>
+      <word_custom>прекратить �ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_ucfirst_unlike</word_key>
+      <word_default>Unfollow</word_default>
+      <word_custom>Прекратить �ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_like</word_key>
+      <word_default>follow</word_default>
+      <word_custom>�ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_ucfirst_like</word_key>
+      <word_default>Follow</word_default>
+      <word_custom>Следить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_tt_on</word_key>
+      <word_default>%s and stop notifications</word_default>
+      <word_custom>%s и о�тановить уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>fave_tt_off</word_key>
+      <word_default>%s and receive notifications on updates</word_default>
+      <word_custom>%s и получать уведомлени� об обновлени�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>rssappoffline</word_key>
+      <word_default>The requested RSS feed could not be retrieved</word_default>
+      <word_custom>�е удало�ь получить запрашиваемый RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_follow</word_key>
+      <word_default>follow</word_default>
+      <word_custom>�ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_unfollow</word_key>
+      <word_default>unfollow</word_default>
+      <word_custom>прекратить �ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_ucfirst_unfollow</word_key>
+      <word_default>Unfollow</word_default>
+      <word_custom>Прекратить �ледить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>like_ucfirst_follow</word_key>
+      <word_default>Follow</word_default>
+      <word_custom>Следить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_rssimportsource</word_key>
+      <word_default>Source</word_default>
+      <word_custom>И�точник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lim_twitter</word_key>
+      <word_default>Log in with Twitter</word_default>
+      <word_custom>Вход � и�пользованием Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lim_facebook</word_key>
+      <word_default>Log in with Facebook</word_default>
+      <word_custom>Войти � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lim_openid</word_key>
+      <word_default>Log in with OpenID</word_default>
+      <word_custom>Войти � и�пользованием OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>loadingtext</word_key>
+      <word_default>Loading...</word_default>
+      <word_custom>Загрузка...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_rssimportcode</word_key>
+      <word_default>Code: </word_default>
+      <word_custom>Код:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_rssimportnotoc</word_key>
+      <word_default>No title or content</word_default>
+      <word_custom>�ет �одержимого или названи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>on</word_key>
+      <word_default>on</word_default>
+      <word_custom>на</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>freeiphoneapp</word_key>
+      <word_default>Get the free IP.Board App for iPhone now!</word_default>
+      <word_custom>У�тановите бе�платное приложение на iPhone дл� IP.Board</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>status_creator_ipb</word_key>
+      <word_default>Board</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>advanced_search</word_key>
+      <word_default>Advanced Search</word_default>
+      <word_custom>Ра�ширенный пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>context_search_forum</word_key>
+      <word_default>This forum</word_default>
+      <word_custom>Этот форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>context_search_topic</word_key>
+      <word_default>This topic</word_default>
+      <word_custom>Эта тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>context_search_title</word_key>
+      <word_default>Search section:</word_default>
+      <word_custom>И�кать в:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>my_content_link</word_key>
+      <word_default>My Content</word_default>
+      <word_custom>Мои публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_find_my_content</word_key>
+      <word_default>Find content</word_default>
+      <word_custom>Публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>active_users_detail</word_key>
+      <word_default>%s members, %s guests, %s anonymous users</word_default>
+      <word_custom>%s пользователей, %s го�тей, %s анонимных</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>notify__sent</word_key>
+      <word_default/>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_laquo</word_key>
+      <word_default><![CDATA[&laquo;]]></word_default>
+      <word_custom><![CDATA[&laquo;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_raquo</word_key>
+      <word_default><![CDATA[&raquo;]]></word_default>
+      <word_custom><![CDATA[&raquo;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>nonotifications_list</word_key>
+      <word_default>You do not have any notifications</word_default>
+      <word_custom>У ва� нет уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task__optimizedtables</word_key>
+      <word_default>%s database tables optimized</word_default>
+      <word_custom> %s таблиц оптимизировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>full_version</word_key>
+      <word_default>Full Version</word_default>
+      <word_custom>Полна� вер�и�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>more</word_key>
+      <word_default>More</word_default>
+      <word_custom>Дальше</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_rarr</word_key>
+      <word_default><![CDATA[&rarr;]]></word_default>
+      <word_custom><![CDATA[&rarr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_larr</word_key>
+      <word_default><![CDATA[&larr;]]></word_default>
+      <word_custom><![CDATA[&larr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_fb_no_app_id</word_key>
+      <word_default><![CDATA[You need to visit your ACP Settings for Facebook Connect and enter your <a href='http://www.facebook.com/developers/' target='_blank'>Facebook Application</a> ID]]></word_default>
+      <word_custom><![CDATA[�еобходимо проверить на�тройки Интеграци� � Facebook и указать ID вашего <a href='http://www.facebook.com/developers/' target='_blank'>Facebook Application</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>acp_sessiontimeout</word_key>
+      <word_default>Your ACP session has expired. Please refresh the page to log back in.</word_default>
+      <word_custom>Се��и� и�текла. Пожалуй�та, обновите �траницу и повторите вход в �и�тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>status_creator_ipbmobiphone</word_key>
+      <word_default>Mobile App</word_default>
+      <word_custom>Mobile App</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ap_error</word_key>
+      <word_default>Notice</word_default>
+      <word_custom>Уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ap_np_msg</word_key>
+      <word_default>You do not have permission for this action</word_default>
+      <word_custom>Вы не имеете права на выполнение �того дей�тви�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mob_status_updates</word_key>
+      <word_default>Status Updates</word_default>
+      <word_custom>Обновлени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mob_view_new_posts</word_key>
+      <word_default>New Content</word_default>
+      <word_custom>�овые публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>licensed_to</word_key>
+      <word_default>Licensed to:</word_default>
+      <word_custom>Лицензи� зареги�трирована на: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lim_windows</word_key>
+      <word_default>Log in with Windows Live</word_default>
+      <word_custom>Войти � и�пользованием Windows Live </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_sharelink_with_print</word_key>
+      <word_default>Print</word_default>
+      <word_custom>Дл� печати</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_sharelink_with_download</word_key>
+      <word_default>Download</word_default>
+      <word_custom>Скачать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>su_via</word_key>
+      <word_default>via</word_default>
+      <word_custom> через </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>nomore_notifications_4u</word_key>
+      <word_default>We could not find any more unread notifications for you</word_default>
+      <word_custom>У ва� нет непрочитанных уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>notify_toggle</word_key>
+      <word_default>Toggle the notification excerpt</word_default>
+      <word_custom>Переключить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>manage_notifications</word_key>
+      <word_default>You have %s unread notifications</word_default>
+      <word_custom>У ва� %s непрочитанных уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>unread_notification_suffix</word_key>
+      <word_default> unread notifications</word_default>
+      <word_custom> непрочитанных уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>status_creator_twitter</word_key>
+      <word_default>Twitter</word_default>
+      <word_custom>Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>status_creator_facebook</word_key>
+      <word_default>Facebook</word_default>
+      <word_custom>Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_topic_preview</word_key>
+      <word_default>Preview this topic</word_default>
+      <word_custom>Предпро�мотр темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_sharelink_with</word_key>
+      <word_default>Share this link via</word_default>
+      <word_custom>Поделить�� ��ылкой через</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__reply</word_key>
+      <word_default>Reply Icon</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__report</word_key>
+      <word_default>Report Icon</word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pm_this_member</word_key>
+      <word_default>Send message</word_default>
+      <word_custom>Отправить ЛС</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>emoticons_template_title</word_key>
+      <word_default>Emoticons</word_default>
+      <word_custom>Смайлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mark_pc_read</word_key>
+      <word_default>Mark As Read</word_default>
+      <word_custom>Отметить прочтенным</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>notifications_viewall</word_key>
+      <word_default>View All Notifications</word_default>
+      <word_custom>В�е уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>configure_notifications</word_key>
+      <word_default>Notification Settings</word_default>
+      <word_custom>�а�тройки уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>notifylogin_error</word_key>
+      <word_default>You must be logged in to view your notifications</word_default>
+      <word_custom>Дл� про�мотра уведомлений необходимо зайти в �и�тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__edit</word_key>
+      <word_default>Edit icon</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__delete</word_key>
+      <word_default>Delete icon</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__show</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Показать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__view_post</word_key>
+      <word_default>View Post</word_default>
+      <word_custom>Про�мотр �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__useronline</word_key>
+      <word_default>User is online</word_default>
+      <word_custom>Пользователь онлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__useroffline</word_key>
+      <word_default>User is offline</word_default>
+      <word_custom>Пользователь офлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__tracking</word_key>
+      <word_default>Tracking</word_default>
+      <word_custom>Подпи�ать��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__pip</word_key>
+      <word_default>Pip</word_default>
+      <word_custom>Pip</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__useredit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__user</word_key>
+      <word_default>User</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>macro__voted</word_key>
+      <word_default>Voted</word_default>
+      <word_custom>Проголо�овал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>quick_send_button</word_key>
+      <word_default>Send</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>use_full_editor</word_key>
+      <word_default>Use Full Editor</word_default>
+      <word_custom>Полна� форма отправки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>quick_message</word_key>
+      <word_default>Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>your_profile</word_key>
+      <word_default>Your Profile</word_default>
+      <word_custom>Ваш профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_profile</word_key>
+      <word_default>View Profile</word_default>
+      <word_custom>Про�мотр профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>_stopwords_</word_key>
+      <word_default>about,all,and,been,can,cant,for,has,here,just,me,new,next,not,old,out,our,said,saw,that,thats,the,their,then,theyll,this,was,were,well,will,with,what,whats,when,where,why,you</word_default>
+      <word_custom>about,all,and,can,cant,for,just,me,new,not,old,out,the,then,theyll,this,was,were,well,will,with,what,whats,when,where,why,you,о,и,на,в,к,под,из,подо,из,перед,по,за,без,до,от,при,через,�,у,без</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>find_posts</word_key>
+      <word_default>Find Posts</word_default>
+      <word_custom>�айти �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>manage_ignored_users</word_key>
+      <word_default>Manage Ignore Prefs</word_default>
+      <word_custom>Игнорируемые</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>find_topics</word_key>
+      <word_default>Find Topics</word_default>
+      <word_custom>�айти темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>quick_send_to</word_key>
+      <word_default>Sending a PM to</word_default>
+      <word_custom>Отправка личного �ообщени� дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>quick_subject</word_key>
+      <word_default>Subject</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>my_profile</word_key>
+      <word_default>My Profile</word_default>
+      <word_custom>Профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>their_profile</word_key>
+      <word_default><![CDATA[%s's Profile]]></word_default>
+      <word_custom>Профиль %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>icon</word_key>
+      <word_default>Icon</word_default>
+      <word_custom>Иконка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_status</word_key>
+      <word_default>Warn Status</word_default>
+      <word_custom>Предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_view_history</word_key>
+      <word_default>View warn history</word_default>
+      <word_custom>По�мотреть и�торию предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_decrease</word_key>
+      <word_default>Decrease warning</word_default>
+      <word_custom>�н�ть предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_increase</word_key>
+      <word_default>Increase warning</word_default>
+      <word_custom>добавить предупреждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>alter_warn_level</word_key>
+      <word_default>Alter Warning Level</word_default>
+      <word_custom>Изменить уровень предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_gallery</word_key>
+      <word_default>View gallery</word_default>
+      <word_custom>Перейти к галерее</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_blog</word_key>
+      <word_default>View blog</word_default>
+      <word_custom>Перейти к блогу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pm_member</word_key>
+      <word_default>PM this member</word_default>
+      <word_custom>Отправить �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>users_photo</word_key>
+      <word_default><![CDATA[%s's Photo]]></word_default>
+      <word_custom> фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>photo</word_key>
+      <word_default>Photo</word_default>
+      <word_custom>Фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_level</word_key>
+      <word_default>Warning level:</word_default>
+      <word_custom>Уровень предупреждени�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>check_all</word_key>
+      <word_default>Check all</word_default>
+      <word_custom>Выбрать в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>click_toggle</word_key>
+      <word_default>Click to Toggle</word_default>
+      <word_custom>�ажмите дл� переключени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>captcah_new</word_key>
+      <word_default><![CDATA[Can't make it out? Click here to generate a new image]]></word_default>
+      <word_custom>�е можете прочитать? �ажмите зде�ь чтобы �оздать новое изображение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>not_signed_in</word_key>
+      <word_default>You are not signed in</word_default>
+      <word_custom>Вы не вошли</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>board_offline</word_key>
+      <word_default>Community Offline</word_default>
+      <word_custom>Сообще�тво в данный момент отключено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>attempt_login</word_key>
+      <word_default>Attempt to log in</word_default>
+      <word_custom>Попробовать войти в �и�тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>click_login</word_key>
+      <word_default>Click here to log in</word_default>
+      <word_custom>Войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>board_offline_desc</word_key>
+      <word_default>%s is currently unavailable</word_default>
+      <word_custom>Форумы в данный момент отключены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>homepage_title</word_key>
+      <word_default>Homepage</word_default>
+      <word_custom>Перейти на �айт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>minus</word_key>
+      <word_default>Minus</word_default>
+      <word_custom>Мину�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>captcha_string_enter</word_key>
+      <word_default>Enter the characters you see</word_default>
+      <word_custom>Введите буквы, изображенные на картинке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>home</word_key>
+      <word_default>Home</word_default>
+      <word_custom>�а главную</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_discussion</word_key>
+      <word_default>Go to Forums</word_default>
+      <word_custom>Перейти к �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_prefix</word_key>
+      <word_default>Go to %s</word_default>
+      <word_custom>Перейти к </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_memberlist</word_key>
+      <word_default>Go to Member List</word_default>
+      <word_custom>Перейти к �пи�ку пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sent_new_convo</word_key>
+      <word_default>sent you a new conversation</word_default>
+      <word_custom> хочет начать личную бе�еду � вами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>replied_convo</word_key>
+      <word_default>replied to a conversation</word_default>
+      <word_custom>ответил в личной бе�еде</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>discussion</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Об�уждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pc_subject</word_key>
+      <word_default>Subject:</word_default>
+      <word_custom>Тема: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pc_sent</word_key>
+      <word_default>Sent:</word_default>
+      <word_custom>Отправлено: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pc_replies</word_key>
+      <word_default>Replies:</word_default>
+      <word_custom>Ответов: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>nav_return_to</word_key>
+      <word_default>Return to</word_default>
+      <word_custom>Вернуть�� к </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ignore_conversation</word_key>
+      <word_default>Ignore This Notification</word_default>
+      <word_custom>Игнорировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>skin_and_lang</word_key>
+      <word_default>Skin and Language</word_default>
+      <word_custom>Внешний вид</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>rss_feed</word_key>
+      <word_default>RSS Feed</word_default>
+      <word_custom>RSS поток</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>board_rules</word_key>
+      <word_default>Community Rules</word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>skin_browser_set</word_key>
+      <word_default>You are using a theme designed for your browser.</word_default>
+      <word_custom>Вы и�пользуете тему наиболее подход�щую дл� вашего браузера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>theme_prefix</word_key>
+      <word_default>Theme:</word_default>
+      <word_custom>Стиль:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>language_prefix</word_key>
+      <word_default>Language:</word_default>
+      <word_custom>Язык:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_top</word_key>
+      <word_default>Go to top</word_default>
+      <word_custom>�аверх</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_now</word_key>
+      <word_default>Time Now:</word_default>
+      <word_custom>Сейча�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>exec_stats</word_key>
+      <word_default>Execution Stats</word_default>
+      <word_custom>Стати�тика работы �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>override_browser_theme</word_key>
+      <word_default>Click here to manually choose a theme</word_default>
+      <word_custom>�ажмите �юда дл� выбора темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mark_all_as_read</word_key>
+      <word_default>Mark all as read</word_default>
+      <word_custom>Отметить в�е как прочтенное</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>back_to_top</word_key>
+      <word_default>Top</word_default>
+      <word_custom>�аверх</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>back_to</word_key>
+      <word_default>Back to</word_default>
+      <word_custom>Вернуть�� к </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mobile_mark_board_as_read</word_key>
+      <word_default>Mark All Read</word_default>
+      <word_custom>Пометить как прочитанное</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mark_board_as_read</word_key>
+      <word_default>Mark Community Read</word_default>
+      <word_custom>Отметить в�е �ообщени� прочитанными</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>generic_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lightbox_label</word_key>
+      <word_default>Image</word_default>
+      <word_custom>Изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>lightbox_of</word_key>
+      <word_default>of</word_default>
+      <word_custom>из</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>remove_friend</word_key>
+      <word_default>Remove Friend</word_default>
+      <word_custom>Удалить из друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>report</word_key>
+      <word_default>Report</word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>page_title_page</word_key>
+      <word_default>- Page</word_default>
+      <word_custom>- Страница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>add_friend</word_key>
+      <word_default>Add as Friend</word_default>
+      <word_custom>Добавить в друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отмена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>or</word_key>
+      <word_default>or</word_default>
+      <word_custom>или</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>login_to_acp</word_key>
+      <word_default>AdminCP</word_default>
+      <word_custom>Вход в админцентр форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>jump_to_content</word_key>
+      <word_default>Jump to content</word_default>
+      <word_custom>Перейти к �одержимому</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ip_lookup</word_key>
+      <word_default>IP Lookup</word_default>
+      <word_custom>Определение IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mod_tools</word_key>
+      <word_default>Mod Tools:</word_default>
+      <word_custom>Модерирование:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>post_announcement</word_key>
+      <word_default>Announcements</word_default>
+      <word_custom>Создание объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>logo</word_key>
+      <word_default>Logo</word_default>
+      <word_custom>Логотип</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_home</word_key>
+      <word_default>Go to community index</word_default>
+      <word_custom>Перейти к �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_reports</word_key>
+      <word_default>View active reports</word_default>
+      <word_custom>Про�мотреть жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>your_cp</word_key>
+      <word_default>My Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>my_blog</word_key>
+      <word_default>My Blog</word_default>
+      <word_custom>Мой блог</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>manage_friends</word_key>
+      <word_default>Manage Friends</word_default>
+      <word_custom>Друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_my_blog</word_key>
+      <word_default>Go to my blog</word_default>
+      <word_custom>Перейти в �вой блог</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>client_area</word_key>
+      <word_default>Client Area</word_default>
+      <word_custom>Клиент-центр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>go_to_my_gallery</word_key>
+      <word_default>Go to my gallery</word_default>
+      <word_custom>Перейти в �вою галерею</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>advanved_help</word_key>
+      <word_default>Advanced Search</word_default>
+      <word_custom>Ра�ширенный пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_help</word_key>
+      <word_default>View help</word_default>
+      <word_custom>Перейти к помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>my_gallery</word_key>
+      <word_default>My Gallery</word_default>
+      <word_custom>Мо� галере�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>advanced</word_key>
+      <word_default>Advanced</word_default>
+      <word_custom>Ра�ширенный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>resized_image</word_key>
+      <word_default>Resized to #{percent}% (was #{width} x #{height}) - Click image to enlarge</word_default>
+      <word_custom>Уменьшено на #{percent}% (#{width} x #{height}) - �ажмите дл� увеличени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>attach_unlimited</word_key>
+      <word_default>Unlimited</word_default>
+      <word_custom>не ограничено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>attach_notallowed</word_key>
+      <word_default>Uploading is not allowed</word_default>
+      <word_custom>Загрузка запрещена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>board_offline_title</word_key>
+      <word_default>Community Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_pop3email</word_key>
+      <word_default>Checked for incoming Emails</word_default>
+      <word_custom>Проверка вход�щих Email</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_cleanout</word_key>
+      <word_default>Old reg_images, sessions and search results removed</word_default>
+      <word_custom>Старые коды подтверждени�, �е��ии и результаты пои�ка удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_logprune</word_key>
+      <word_default>Log tables pruned</word_default>
+      <word_custom>Журналы очищены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_statsrebuilt</word_key>
+      <word_default>Statistics rebuilt</word_default>
+      <word_custom>Стати�тика обновлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_announcements</word_key>
+      <word_default>Announcements updated</word_default>
+      <word_custom>Объ�влени� обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_calendars</word_key>
+      <word_default>Calendar recached</word_default>
+      <word_custom>Обновление кешей календар� завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_rssimport</word_key>
+      <word_default>RSS Import completed (%s)</word_default>
+      <word_custom>Импорт RSS завершен (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_dailydigest</word_key>
+      <word_default><![CDATA[Daily Topic & Forum Digest Sent]]></word_default>
+      <word_custom>Ежедневный отчет о темах и �ообщени�х отправлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_updateviews</word_key>
+      <word_default>Topic views counter updated</word_default>
+      <word_custom>Количе�тво про�мотров тем обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_weeklydigest</word_key>
+      <word_default><![CDATA[Weekly Topic & Forum Digest Sent]]></word_default>
+      <word_custom>Еженедельный отчет о темах и �ообщени�х отправлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_removevalidating</word_key>
+      <word_default>%s old validating members pruned</word_default>
+      <word_custom>%s �тарых аккаунтов, ожидающих активации, удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_dailycleanout</word_key>
+      <word_default>%s XML-RPC logs removed, %s orphaned attachments removed, %s subscriptions pruned and %s redirect link topics removed</word_default>
+      <word_custom>%s XML-RPC запи�ей журнала удалено, %s потер�нных прикрепленных файлов удалено, %s подпи�ок очищено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_profileviews</word_key>
+      <word_default>Profile views counter updated</word_default>
+      <word_custom>Счетчик про�мотров профилей обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_mysqlcleanup</word_key>
+      <word_default>Cleaned up sleeping mysql processes</word_default>
+      <word_custom>Убиты «за�нувшие» mysql проце��ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_removelocked</word_key>
+      <word_default>%s locked members pruned</word_default>
+      <word_custom>%s �тарых аккаунтов, ожидающих активации, удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_mobileNotifications</word_key>
+      <word_default>Mobile notifications sent</word_default>
+      <word_custom>Отправлены уведомлени� мобильным клиентам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>task_openidcleanup</word_key>
+      <word_default>OpenID temporary caches cleared out</word_default>
+      <word_custom>OpenID кеши очищены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_offline</word_key>
+      <word_default>Rating System Offline</word_default>
+      <word_custom>Си�тема рейтинга отключена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>rss_board_offline</word_key>
+      <word_default>Our community is offline temporarily and RSS feeds are unavailable during this time</word_default>
+      <word_custom>�аша �и�тема в данный момент отключена. RSS не до�тупен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_protected</word_key>
+      <word_default>Can not modify that groups reputation</word_default>
+      <word_custom>Вы не можете изменить репутацию у пользовател� �той группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_captcha_title</word_key>
+      <word_default>Security Code</word_default>
+      <word_custom>Код безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_config</word_key>
+      <word_default>The configuration file for the reputation voting is missing or corrupt.</word_default>
+      <word_custom>Конфигураци� �и�темы рейтинг от�ут�твует или повреждена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_invalid</word_key>
+      <word_default>There was a problem storing your reputation vote.</word_default>
+      <word_custom>�еверный рейтинг</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_quota_pos</word_key>
+      <word_default>You have reached your quota of positive votes for the day</word_default>
+      <word_custom>Вы и�черпали лимит положительных оценок на �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_quota_neg</word_key>
+      <word_default>You have reached your quota of negative votes for the day</word_default>
+      <word_custom>Вы и�черпали лимит отрицательных оценок на �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_yourown</word_key>
+      <word_default>You are not allowed to vote on your own content</word_default>
+      <word_custom>Вы не можете голо�овать за �об�твенный контент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>reputation_guest</word_key>
+      <word_default>You must be logged in to use the reputation system</word_default>
+      <word_custom>Вы должны войти в �и�тему, чтобы во�пользовать�� �и�темой рейтинга</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>glb_captcha_text</word_key>
+      <word_default>Please enter the 6 character code shown in the image. If you cannot read the code, click the image to generate a new one. Case sensitive.</word_default>
+      <word_custom>Пожалуй�та введите 6 �имволов указанных на картинке. Е�ли вы не можете прочитать �имволы на картинке, нажмите на картинку, чтобы получить другую. Код реги�трозави�им (различают�� заглавные и пропи�ные �имволы)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>glb_captcha_enter</word_key>
+      <word_default>Confirm security code</word_default>
+      <word_custom>Подтвердите код безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>glb_captcha_image</word_key>
+      <word_default>Security Check</word_default>
+      <word_custom>Код безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gbl_captcha_image_desc</word_key>
+      <word_default>If you do not see any numbers, or see broken images, please contact a community administrator to rectify the problem.</word_default>
+      <word_custom>Е�ли вы не видите никаких чи�ел или видите не в�е чи�ла, пожалуй�та �ообщите об �том админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_member_bbcode</word_key>
+      <word_default>Member profile</word_default>
+      <word_custom>Профиль пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_external_link</word_key>
+      <word_default>External link</word_default>
+      <word_custom>С�ылка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_email</word_key>
+      <word_default>E-mail Link</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_pinned</word_key>
+      <word_default>Pinned topic from post form</word_default>
+      <word_custom>Тема подн�та </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_date_cite</word_key>
+      <word_default>From %s:</word_default>
+      <word_custom>От %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>report_member_bar</word_key>
+      <word_default>Active Reports</word_default>
+      <word_custom>активных жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_full_cite</word_key>
+      <word_default>%s, on %s, said:</word_default>
+      <word_custom>%s (%s) пи�ал:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_name_cite</word_key>
+      <word_default>%s said:</word_default>
+      <word_custom>%s �казал:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>report_menu_mark_complete</word_key>
+      <word_default>Mark Complete</word_default>
+      <word_custom>Пометить как решенна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbc_quote</word_key>
+      <word_default>Quote</word_default>
+      <word_custom>Цитата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>report_menu_view_report</word_key>
+      <word_default>View Report</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>report_center_rss</word_key>
+      <word_default>Report Center RSS Feed</word_default>
+      <word_custom>RSS �и�темы жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>m_group</word_key>
+      <word_default>Group:</word_default>
+      <word_custom>Группа:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>partial_login</word_key>
+      <word_default>You are now signed in</word_default>
+      <word_custom>Вы вошли в �и�тему!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_closed</word_key>
+      <word_default>Closed topic from post form</word_default>
+      <word_custom>Тема закрыта </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>m_joined</word_key>
+      <word_default>Joined:</word_default>
+      <word_custom>Реги�траци�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>m_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_pinclose</word_key>
+      <word_default><![CDATA[Pinned & closed topic from post form]]></word_default>
+      <word_custom>Тема закрыта и подн�та </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_opened</word_key>
+      <word_default>Opened topic from post form</word_default>
+      <word_custom>Тема открыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_unpinned</word_key>
+      <word_default>Unpinned topic from post form</word_default>
+      <word_custom>Тема опущена </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_unpinclose</word_key>
+      <word_default><![CDATA[Unpinned & closed topic from post form]]></word_default>
+      <word_custom>Тема опущена и закрыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_pinopen</word_key>
+      <word_default><![CDATA[Pinned & opened topic from post form]]></word_default>
+      <word_custom>Тема подн�та и открыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ajax_topicstate</word_key>
+      <word_default>Altered topic state (opened/closed) from forum view</word_default>
+      <word_custom>Изменен �тату� темы (открыта/закрыта)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>modlogs_unpinopen</word_key>
+      <word_default><![CDATA[Unpinned & opened topic from post form]]></word_default>
+      <word_custom>Тема опущена и открыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mailto_erroronforums</word_key>
+      <word_default>Error on the forums</word_default>
+      <word_custom>Ошибка на форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ajax_topictitle</word_key>
+      <word_default><![CDATA[Edited topic title from '%s' to '%s' from forum view]]></word_default>
+      <word_custom><![CDATA[Изменено название темы � '%s' на'%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stats_sec</word_key>
+      <word_default>sec</word_default>
+      <word_custom>�ек</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bbcode_img_alt</word_key>
+      <word_default>Posted Image</word_default>
+      <word_custom>Изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stats_queries</word_key>
+      <word_default>queries</word_default>
+      <word_custom>запро�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_pm_read_short</word_key>
+      <word_default>View %s</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_guestname</word_key>
+      <word_default>Guest</word_default>
+      <word_custom>Го�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_pm_read</word_key>
+      <word_default>View Notification</word_default>
+      <word_custom>Читать �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>global_page_jump</word_key>
+      <word_default>Jump to page</word_default>
+      <word_custom>Перейти к �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>au_reading</word_key>
+      <word_default>Reading (%s)...</word_default>
+      <word_custom>Читает %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_seconds_ago</word_key>
+      <word_default>%s seconds ago</word_default>
+      <word_custom>%s �екунд назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>au_posting</word_key>
+      <word_default>Posting (%s)...</word_default>
+      <word_custom>Отвечает в %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_less_hour</word_key>
+      <word_default>An hour ago</word_default>
+      <word_custom>ча� назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_minutes_ago</word_key>
+      <word_default>%s minutes ago</word_default>
+      <word_custom>%s минут назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_less_minute</word_key>
+      <word_default>A minute ago</word_default>
+      <word_custom>минуту назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_hours_ago</word_key>
+      <word_default>%s hours ago</word_default>
+      <word_custom>%s ча�ов назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_less_day</word_key>
+      <word_default>A day ago</word_default>
+      <word_custom>вчера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_today</word_key>
+      <word_default>Today</word_default>
+      <word_custom>Сегодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_weeks_ago</word_key>
+      <word_default>%s weeks ago</word_default>
+      <word_custom>%s недель назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_less_week</word_key>
+      <word_default>A week ago</word_default>
+      <word_custom>неделю назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_days_ago</word_key>
+      <word_default>%s days ago</word_default>
+      <word_custom>%s дней назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>time_yesterday</word_key>
+      <word_default>Yesterday</word_default>
+      <word_custom>Вчера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mob_next</word_key>
+      <word_default>Next</word_default>
+      <word_custom>Вперед</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>prev</word_key>
+      <word_default>Prev</word_default>
+      <word_custom>�азад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>next</word_key>
+      <word_default>Next</word_default>
+      <word_custom>Вперед</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tpl_prev</word_key>
+      <word_default>Previous Page</word_default>
+      <word_custom>Предыдуща� �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tpl_next</word_key>
+      <word_default>Next page</word_default>
+      <word_custom>Следующа� �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tpl_gotofirst</word_key>
+      <word_default>Go to first page</word_default>
+      <word_custom>Перейти к первой �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tpl_gotolast</word_key>
+      <word_default>Go to last page</word_default>
+      <word_custom>Перейти к по�ледней �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>resend_val</word_key>
+      <word_default>Resend Validation</word_default>
+      <word_custom>Повторно вы�лать пи�ьмо активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mob_prev</word_key>
+      <word_default>Prev</word_default>
+      <word_custom>�азад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sf_bytes</word_key>
+      <word_default>bytes</word_default>
+      <word_custom>байт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tpl_pages</word_key>
+      <word_default>Page %s of %s</word_default>
+      <word_custom>Страниц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>email_address</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sf_mb</word_key>
+      <word_default>MB</word_default>
+      <word_custom>МБ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sf_gb</word_key>
+      <word_default>GB</word_default>
+      <word_custom>ГБ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>err_select</word_key>
+      <word_default>Select All</word_default>
+      <word_custom>Выбрать в�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>bi_markread</word_key>
+      <word_default>Mark forum as read?</word_default>
+      <word_custom>Пометить форум как прочтенный?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sf_k</word_key>
+      <word_default>K</word_default>
+      <word_custom>К</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>err_title</word_key>
+      <word_default>Post Data Saved!</word_default>
+      <word_custom>Содержимое �ообщени� �охранено!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>err_expl</word_key>
+      <word_default><![CDATA[The following post data has been saved. In some cases, using your browser's back button will empty out form fields which results in the loss of any typed and unsaved material. You may select all of the text area below and copy before hitting back.]]></word_default>
+      <word_custom>Данные �ледующего �ообщени� у�пешно �охранены. Иногда �лучает��, что при нажатии на кнопку «�азад» заполненные в пол� данные тер�ют��, по�тому вы можете �копировать тек�т и только потом вернуть�� на предыдущую �траницу.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tt_poll_svote</word_key>
+      <word_default>Go back and show the voting options</word_default>
+      <word_custom>Вернуть�� к голо�ованию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tt_gounread</word_key>
+      <word_default>Go to the first unread post</word_default>
+      <word_custom>Перейти к первому непрочитанному �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tt_poll_show</word_key>
+      <word_default>View poll results before adding your vote</word_default>
+      <word_custom>По�мотреть ра�пределение голо�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tt_poll_null</word_key>
+      <word_default>View results, but forfeit your vote in this poll</word_default>
+      <word_custom>По�мотреть ра�пределение голо�ов. Вы потер�ете право голо�а!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sj_search</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tt_poll_vote</word_key>
+      <word_default>Add your vote to this poll</word_default>
+      <word_custom>Проголо�овать!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ps_first</word_key>
+      <word_default>First</word_default>
+      <word_custom>Перва�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sj_home</word_key>
+      <word_default>Forum Home</word_default>
+      <word_custom>К �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sj_help</word_key>
+      <word_default>Help</word_default>
+      <word_custom>Помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>live_chat</word_key>
+      <word_default>Live Chat</word_default>
+      <word_custom>Чат</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>tb_mlist</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>ps_last</word_key>
+      <word_default>Last</word_default>
+      <word_custom>По�ледн��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gzip_on</word_key>
+      <word_default>GZIP Enabled</word_default>
+      <word_custom>GZIP включен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>page_1_of_1</word_key>
+      <word_default>Single page</word_default>
+      <word_custom>Страница 1 из 1</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>view_new_posts</word_key>
+      <word_default>View New Content</word_default>
+      <word_custom>Про�мотр новых публикаций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>gzip_off</word_key>
+      <word_default>GZIP Disabled</word_default>
+      <word_custom>GZIP отключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>mobile_view_new_posts</word_key>
+      <word_default>New Content</word_default>
+      <word_custom>�овые публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>warn_offline</word_key>
+      <word_default>(OFFLINE)</word_default>
+      <word_custom>(OFFLINE)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>cp_tool_tip</word_key>
+      <word_default>Edit my settings, such as signature, photo and more...</word_default>
+      <word_custom>Редактировать на�тройки (подпи�ь, аватар и тп)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>jmp_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>ОК</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>forum_home</word_key>
+      <word_default>Forum Home</word_default>
+      <word_custom>Главна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>forum_jump</word_key>
+      <word_default>Forum Jump</word_default>
+      <word_custom>Бы�трый переход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>pass</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>submit_li</word_key>
+      <word_default>Log in</word_default>
+      <word_custom>Войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>you_last_visit</word_key>
+      <word_default>Last Visit:</word_default>
+      <word_custom>По�леднее по�ещение:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>thanks</word_key>
+      <word_default>Thanks</word_default>
+      <word_custom>Спа�ибо</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_2</word_key>
+      <word_default>February</word_default>
+      <word_custom>Февраль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_3</word_key>
+      <word_default>March</word_default>
+      <word_custom>Март</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_4</word_key>
+      <word_default>April</word_default>
+      <word_custom>�прель</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_5</word_key>
+      <word_default>May</word_default>
+      <word_custom>Май</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_6</word_key>
+      <word_default>June</word_default>
+      <word_custom>Июнь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>admin_cp</word_key>
+      <word_default>Admin CP</word_default>
+      <word_custom>Перейти в панель админи�трировани� �и�темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_1</word_key>
+      <word_default>January</word_default>
+      <word_custom>Январь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_10</word_key>
+      <word_default>October</word_default>
+      <word_custom>Окт�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_8</word_key>
+      <word_default>August</word_default>
+      <word_custom>�вгу�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_7</word_key>
+      <word_default>July</word_default>
+      <word_custom>Июль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>transfer_you</word_key>
+      <word_default>Please wait while we transfer you...</word_default>
+      <word_custom>Подождите, �ейча� Вы будете перенаправлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_9</word_key>
+      <word_default>September</word_default>
+      <word_custom>Сент�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_11</word_key>
+      <word_default>November</word_default>
+      <word_custom>�о�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>M_12</word_key>
+      <word_default>December</word_default>
+      <word_custom>Декабрь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_0</word_key>
+      <word_default>Sunday</word_default>
+      <word_custom>Во�кре�енье</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_1</word_key>
+      <word_default>Monday</word_default>
+      <word_custom>Понедельник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_2</word_key>
+      <word_default>Tuesday</word_default>
+      <word_custom>Вторник</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_3</word_key>
+      <word_default>Wednesday</word_default>
+      <word_custom>Среда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_5</word_key>
+      <word_default>Friday</word_default>
+      <word_custom>П�тница</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_4</word_key>
+      <word_default>Thursday</word_default>
+      <word_custom>Четверг</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8635,9 +7080,20 @@ The <#BOARD_NAME#> team.
       <word_key>D_7</word_key>
       <word_default>Sunday</word_default>
       <word_custom>Во�кре�енье</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>D_6</word_key>
+      <word_default>Saturday</word_default>
+      <word_custom>Суббота</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>register</word_key>
+      <word_default>Create Account</word_default>
+      <word_custom>Реги�траци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8645,19 +7101,6 @@ The <#BOARD_NAME#> team.
       <word_key>name</word_key>
       <word_default>Name</word_default>
       <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>register</word_key>
-      <word_default>Register Now!</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8665,19 +7108,6 @@ The <#BOARD_NAME#> team.
       <word_key>logged_in_as</word_key>
       <word_default>Signed in as </word_default>
       <word_custom>Вошли как</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>new_user</word_key>
-      <word_default>New user? </word_default>
-      <word_custom>�овый пользователь?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8685,29 +7115,13 @@ The <#BOARD_NAME#> team.
       <word_key>msg_new</word_key>
       <word_default>New</word_default>
       <word_custom>�овых</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>offline</word_key>
-      <word_default>Sorry, the boards are offline at the moment</word_default>
-      <word_custom>Си�тема в данный момент отключена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>log_out</word_key>
-      <word_default>Sign Out</word_default>
-      <word_custom>Выход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>new_user</word_key>
+      <word_default>New user? </word_default>
+      <word_custom>�овый пользователь?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8715,39 +7129,20 @@ The <#BOARD_NAME#> team.
       <word_key>dont_wait</word_key>
       <word_default>Or click here if you do not wish to wait</word_default>
       <word_custom>Или нажмите �юда, е�ли не хотите ждать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>stand_by</word_key>
-      <word_default>Please stand by...</word_default>
-      <word_custom>Подождите...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>log_out</word_key>
+      <word_default>Sign Out</word_default>
+      <word_custom>Выход</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_global</word_pack>
-      <word_key>your_messenger</word_key>
-      <word_default>Messenger</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>sign_in</word_key>
-      <word_default><![CDATA[Sign In &raquo;]]></word_default>
-      <word_custom>Вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>offline</word_key>
+      <word_default>Sorry, the community is offline at the moment</word_default>
+      <word_custom>Си�тема в данный момент отключена</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8755,9 +7150,34 @@ The <#BOARD_NAME#> team.
       <word_key>ajax_incomplete_data</word_key>
       <word_default>Incomplete Data</word_default>
       <word_custom>�еверные данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>stand_by</word_key>
+      <word_default>Please stand by...</word_default>
+      <word_custom>Подождите...</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>your_messenger</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>sign_in</word_key>
+      <word_default>Sign In</word_default>
+      <word_custom>Вход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_global</word_pack>
+      <word_key>manage_blogs</word_key>
+      <word_default>Manage Blogs</word_default>
+      <word_custom>Блоги</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8765,19 +7185,6 @@ The <#BOARD_NAME#> team.
       <word_key>ajax_nohtml_return</word_key>
       <word_default>There was an error attempting to retrieve the HTML to display</word_default>
       <word_custom>Возникла ошибка при получении HTML дл� вывода</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_global</word_pack>
-      <word_key>ajax_avatar_dir</word_key>
-      <word_default>Could not locate that directory</word_default>
-      <word_custom>�е удало�ь найти директорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8785,29 +7192,20 @@ The <#BOARD_NAME#> team.
       <word_key>lim_vkontakte</word_key>
       <word_default>Вход � и�пользованием Вконтакте</word_default>
       <word_custom>Вход � и�пользованием Вконтакте </word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_help</word_pack>
-      <word_key>help_return_list</word_key>
-      <word_default>Return to the list of topics</word_default>
-      <word_custom>Вернуть�� к �пи�ку разделов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_global</word_pack>
+      <word_key>topictagsh4</word_key>
+      <word_default>Topic Tags</word_default>
+      <word_custom>Теги темы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_help</word_pack>
-      <word_key>help_back_list_title</word_key>
-      <word_default>Back to list</word_default>
-      <word_custom>�азад к �пи�ку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_global</word_pack>
+      <word_key>scroll_tip</word_key>
+      <word_default>Tip: Use two fingers to scroll this list</word_default>
+      <word_custom>Под�казка: до�тупна прокрутка � помощью же�тов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8815,29 +7213,20 @@ The <#BOARD_NAME#> team.
       <word_key>help_read_document</word_key>
       <word_default>Read document</word_default>
       <word_custom>Прочитать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_help</word_pack>
-      <word_key>page_title</word_key>
-      <word_default>View Help Topics</word_default>
-      <word_custom>Про�мотр разделов помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>help_back_list_title</word_key>
+      <word_default>Back to list</word_default>
+      <word_custom>�азад к �пи�ку</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_help</word_pack>
-      <word_key>help_topic</word_key>
-      <word_default>Help Topic</word_default>
-      <word_custom>Раздел помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>help_return_list</word_key>
+      <word_default>Return to the list of topics</word_default>
+      <word_custom>Вернуть�� к �пи�ку разделов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8845,9 +7234,6 @@ The <#BOARD_NAME#> team.
       <word_key>help_topics</word_key>
       <word_default>Help Topics</word_default>
       <word_custom>Разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8855,9 +7241,6 @@ The <#BOARD_NAME#> team.
       <word_key>help_txt</word_key>
       <word_default>Choose a topic from the list, or search for a topic</word_default>
       <word_custom>Выберите интере�ующий ва� раздел помощи или во�пользуйте�ь пои�ком</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8865,9 +7248,6 @@ The <#BOARD_NAME#> team.
       <word_key>choose_file</word_key>
       <word_default>Choose a Topic</word_default>
       <word_custom>Выберите раздел</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8875,9 +7255,6 @@ The <#BOARD_NAME#> team.
       <word_key>topic_text</word_key>
       <word_default>Here is the topic you chose to view</word_default>
       <word_custom>Выбранный вами раздел помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -8885,998 +7262,155 @@ The <#BOARD_NAME#> team.
       <word_key>no_help_topics</word_key>
       <word_default>There are no help topics yet</word_default>
       <word_custom>В данный момент в �и�теме нет разделов помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>required_data_missing</word_key>
-      <word_default>Some required data was missing</word_default>
-      <word_custom>Ча�ть необходимых данных от�ут�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>note_save_empty</word_key>
-      <word_default>Your note cannot be empty; click the Delete link for this note if you do not wish to keep it</word_default>
-      <word_custom>Ваше примечание пу�то; удалите его, е�ли оно отправлено по ошибке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>note_no_permission_d</word_key>
-      <word_default><![CDATA[You don't have permission to delete notes]]></word_default>
-      <word_custom>Вы не можете удал�ть примечани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>note_no_permission_a</word_key>
-      <word_default>You do not have permission to add notes to this image</word_default>
-      <word_custom>Вы не можете добавл�ть примечани� к �тому изображению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>idm_invalid_file</word_key>
-      <word_default>Invalid File</word_default>
-      <word_custom>Файл неверный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>idm_comment_empty</word_key>
-      <word_default>Comment is empty</word_default>
-      <word_custom>Комментарий пу�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>note_no_permission_e</word_key>
-      <word_default>You do not have permission to edit this note</word_default>
-      <word_custom>Вы не можете редактировать примечани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>idm_msg_text</word_key>
-      <word_default>You did not enter any text to email to the user</word_default>
-      <word_custom>Вы не ввели �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>idm_msg_email</word_key>
-      <word_default>You did not enter an email address to send the email to</word_default>
-      <word_custom>Вы не ввели e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>blog_publish_now</word_key>
-      <word_default>Publish Now</word_default>
-      <word_custom>Опубликовать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>blog_save_draft</word_key>
-      <word_default>Save Draft</word_default>
-      <word_custom>В черновики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>blog_cat_exists</word_key>
-      <word_default>That category already exists</word_default>
-      <word_custom>Категори� уже �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>fail_config</word_key>
-      <word_default>Failed to save configuration</word_default>
-      <word_custom>�е удало�ь �охранить на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>blog_revert_header</word_key>
-      <word_default>Are you sure you want to revert your header?</word_default>
-      <word_custom>Вы дей�твительно хотите вернуть заголовок к прежнему виду?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>blog_uncategorized</word_key>
-      <word_default>Uncategorized</word_default>
-      <word_custom>Без категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>fail_cblock</word_key>
-      <word_default>Failed to save content block changes</word_default>
-      <word_custom>�е удало�ь �охранить изменени� внутри блока</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>option_is_empty</word_key>
-      <word_default><![CDATA[This tag's option cannot be left empty!]]></word_default>
-      <word_custom>Данна� на�тройка тега должна быть заполнена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>js_rte_errorloadingiespell</word_key>
-      <word_default>Error loading ieSpell. Exception: </word_default>
-      <word_custom>�е удало�ь загрузить ieSpell. Ошибка: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>prof_update_default</word_key>
-      <word_default><![CDATA[What's on your mind?]]></word_default>
-      <word_custom>О чем ты �ейча� думаешь?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>js_rte_erroriespell</word_key>
-      <word_default>ieSpell was not detected. Click OK to go to the download page.</word_default>
-      <word_custom>ieSpell не обнаружен. �ажмите OK дл� перехода на �траницу загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>prof_update_button</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>prof_comment_mod</word_key>
-      <word_default>Your comment was added, but requires approval by this member before it will be displayed</word_default>
-      <word_custom>Ваш комментарий был добавлен. Подождите пока владелец профил�, одобрит его, затем он по�вит�� в общем �пи�ке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>prof_comment_perm</word_key>
-      <word_default>You do not have permission to post comments on this profile</word_default>
-      <word_custom>У ва� не до�таточно прав чтобы о�тавить комментарий в �том профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>prof_comment_empty</word_key>
-      <word_default>You must enter a comment</word_default>
-      <word_custom>Вы должны вве�ти тек�т комментари�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>enter_unlimited_names</word_key>
-      <word_default>Enter names</word_default>
-      <word_custom>Введите имена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>save_folder</word_key>
-      <word_default><![CDATA[>]]></word_default>
-      <word_custom><![CDATA[>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>enter_x_names</word_key>
-      <word_default><![CDATA[Enter up to [x] names]]></word_default>
-      <word_custom><![CDATA[Введите до [x] имен пользователей]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>invalid_folder_name</word_key>
-      <word_default>The folder name is invalid</word_default>
-      <word_custom>Им� директории неверное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>confirm_delete</word_key>
-      <word_default>Are you sure you want to delete this folder? ALL messages in it will be deleted. This cannot be undone!</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �ту папку? Будут удалены ВСЕ �ообщени�, �одержащие�� в ней. Данное дей�твие �Е ОБР�ТИМО!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>cant_delete_folder</word_key>
-      <word_default><![CDATA[You can't delete a protected folder!]]></word_default>
-      <word_custom>Вы не можете удалить защищенную папку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>confirm_empty</word_key>
-      <word_default>Are you sure you want to empty this folder?</word_default>
-      <word_custom>Вы дей�твительно хотите очи�тить �ту папку?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>must_enter_name</word_key>
-      <word_default>You must enter a name</word_default>
-      <word_custom>�еобходимо вве�ти им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>folder_protected</word_key>
-      <word_default>Cannot perform that action on a protected folder</word_default>
-      <word_custom>�е удало�ь �овершить дей�твие. Папка защищена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>folder_not_found</word_key>
-      <word_default>Cannot find that folder</word_default>
-      <word_custom>�е удало�ь найти папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>delete_pm_confirm</word_key>
-      <word_default>Are you sure you wish to permanently delete this conversation?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �ту перепи�ку?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>delete_reply_confirm</word_key>
-      <word_default>Are you sure you want to delete this reply?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �тот ответ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>delete_pm_many_confirm</word_key>
-      <word_default>Are you sure you wish to delete these conversations?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �ти перепи�ки?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>message_sent</word_key>
-      <word_default>Message Sent</word_default>
-      <word_custom>Сообщение отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>reached_max_folders</word_key>
-      <word_default>You have reached the maximum number of allowed folders</word_default>
-      <word_custom>Вы до�тигли лимита на количе�тво папок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_queue</word_key>
-      <word_default>You have attempted to queue too many files. The number of files you can queue is: </word_default>
-      <word_custom>Вы попытали�ь загрузить �лишком много файлов. Допу�тимо одновременно загружать не более </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_skipped</word_key>
-      <word_default>Upload Skipped</word_default>
-      <word_custom>Загрузка пропущена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>public_help</word_pack>
+      <word_key>page_title</word_key>
+      <word_default>View Help Topics</word_default>
+      <word_custom>Про�мотр разделов помощи</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>pending</word_key>
-      <word_default>Pending</word_default>
-      <word_custom>Ожидает</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_done</word_key>
-      <word_default><![CDATA[Done (uploaded [total])]]></word_default>
-      <word_custom><![CDATA[Готово (загружено [total])]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>uploading</word_key>
-      <word_default>Uploading...</word_default>
-      <word_custom>Загрузка...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>silly_server</word_key>
-      <word_default>The server returned an error during upload</word_default>
-      <word_custom>Возникла ошибка при загрузке файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_progress</word_key>
-      <word_default><![CDATA[Uploaded [done] of [total]]]></word_default>
-      <word_custom><![CDATA[Загружено [done] из [total]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_limit_hit</word_key>
-      <word_default>Upload limit exceeded</word_default>
-      <word_custom>Превышен лимит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_too_big</word_key>
-      <word_default>This file was too big to upload</word_default>
-      <word_custom>Размер файла превышает допу�тимый дл� загрузки размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_failed</word_key>
-      <word_default>This upload failed</word_default>
-      <word_custom>Загрузка не удала�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>upload_no_file</word_key>
-      <word_default>No file was selected for upload</word_default>
-      <word_custom>Вы не выбрали файл дл� загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>invalid_mime_type</word_key>
-      <word_default><![CDATA[You aren't permitted to upload this kind of file]]></word_default>
-      <word_custom>Вы не можете загружать файлы подобного типа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>switch_to_advanced</word_key>
-      <word_default>Try our advanced uploader which supports multiple file uploading (modern browser required)</word_default>
-      <word_custom>Во�пользуйте�ь нашим новым менеджером дл� загрузки �разу не�кольких файлов (требует�� �овременный браузер)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>trouble_uploading</word_key>
-      <word_default>Trouble uploading?</word_default>
-      <word_custom>Проблемы � загрузкой?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>att_select_files</word_key>
-      <word_default>Select files</word_default>
-      <word_custom>Выберите файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>click_to_attach</word_key>
-      <word_default>Click To Attach Files</word_default>
-      <word_custom>�ажмите чтобы прикрепить файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>post_empty</word_key>
-      <word_default>Your post is empty</word_default>
-      <word_custom>Ваше �ообщение пу�то</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>poll_stats</word_key>
-      <word_default><![CDATA[You may add [q] more question(s), with [c] choices per question]]></word_default>
-      <word_custom><![CDATA[Вам разрешено добавить еще [q] вопро�ов � [c] вариантами ответа на вопро�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>editor_enter_list</word_key>
-      <word_default>Enter list item (or hit Cancel to finish list)</word_default>
-      <word_custom>Введите пункт �пи�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>delete_topic_confirm</word_key>
-      <word_default>Are you sure you want to delete this topic?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �ту тему?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>click_to_show_opts</word_key>
-      <word_default>Click to configure post options</word_default>
-      <word_custom>�ажмите дл� управлени� опци�ми �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>with_selected</word_key>
-      <word_default>With Selected ({num})</word_default>
-      <word_custom>С отмеченными ({num}) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>unapprove</word_key>
-      <word_default>Unapprove</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>justgo</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>approve</word_key>
-      <word_default>Approve</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>poll_no_more_choices</word_key>
-      <word_default>You cannot add any more choices to this question</word_default>
-      <word_custom>Вы больше не можете добавл�ть варианты к вопро�у.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>poll_no_more_q</word_key>
-      <word_default>You cannot add any more questions to this poll!</word_default>
-      <word_custom>Вы больше не можете добавл�ть вопро�ы к опро�у</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>poll_not_enough_choices</word_key>
-      <word_default><![CDATA[One or more of your questions doesn't contain enough choices. Each question must contain at least 2 choices!]]></word_default>
-      <word_custom>Один из вопро�ов не �одержит до�таточного количе�тва вариантов выбора, вариантов должно быть не меньше двух!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>is_spammer</word_key>
-      <word_default>This account has been flagged as a spam account</word_default>
-      <word_custom>Этот пользователь уже отмечен как �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>set_as_spammer</word_key>
-      <word_default>Are you sure you want to flag this user as a spam account?</word_default>
-      <word_custom>Вы уверены что хотите пометить пользовател� как �памера?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>copy_topic_link</word_key>
-      <word_default>Copy the permalink below to store the direct address to this post in your clipboard</word_default>
-      <word_custom>Пр�ма� ��ылка на �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>delete_post_confirm</word_key>
-      <word_default>Are you sure you want to delete this post?</word_default>
-      <word_custom>Вы уверены что хотите удалить �то �ообщение?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>vote_updated</word_key>
-      <word_default>Vote updated!</word_default>
-      <word_custom>Голо� обновлен!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>vote_success</word_key>
-      <word_default>Vote saved!</word_default>
-      <word_custom>Голо� �охранен!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>pass_too_long</word_key>
-      <word_default><![CDATA[&#10007; Your password is too long (max. 32 characters)]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенный пароль больше 32 �имволов]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>pass_too_short</word_key>
-      <word_default><![CDATA[&#10007; Your password is too short (min. 3 characters)]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенный пароль менее 3 �имволов]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>pass_doesnt_match</word_key>
-      <word_default><![CDATA[&#10007; The passwords you entered don't match]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенные пароли не �овпадают]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>invalid_email</word_key>
-      <word_default><![CDATA[&#10007; This isn't a valid address]]></word_default>
-      <word_custom><![CDATA[&#10007; E-mail адре� неправильный]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>email_in_use</word_key>
-      <word_default><![CDATA[&#10007; This email address is in use]]></word_default>
-      <word_custom><![CDATA[&#10007; E-mail адре� уже и�пользует��]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>email_banned</word_key>
-      <word_default><![CDATA[&#10007; This email address has been banned]]></word_default>
-      <word_custom><![CDATA[&#10007; E-mail адре� запрещен дл� и�пользовани�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>email_doesnt_match</word_key>
-      <word_default><![CDATA[&#10007; The addresses you entered don't match]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенные адре�а не �овпадают]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>not_available</word_key>
-      <word_default><![CDATA[&#10007; This name is taken!]]></word_default>
-      <word_custom><![CDATA[&#10007; Им� уже зан�то!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>too_long</word_key>
-      <word_default><![CDATA[&#10007; The name you entered is too long]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенное им� �лишком длинное]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
+      <word_pack>public_help</word_pack>
+      <word_key>help_topic</word_key>
+      <word_default>Help Topic</word_default>
+      <word_custom>Раздел помощи</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>invalid_chars</word_key>
-      <word_default><![CDATA[&#10007; This field contains invalid characters]]></word_default>
-      <word_custom><![CDATA[&#10007;  Поле �одержит недопу�тимые �имволы]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>photo_editor_cropping_still</word_key>
+      <word_default><![CDATA[Please finish cropping before clicking 'Done']]></word_default>
+      <word_custom><![CDATA[Пожалуй�та завершите недоделанное, прежде чем нажмете 'Готово']]></word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>too_short</word_key>
-      <word_default><![CDATA[&#10007; The name you entered is too short]]></word_default>
-      <word_custom><![CDATA[&#10007; Введенное им� �лишком короткое]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>mark_read_topic</word_key>
+      <word_default>There was a problem fetching this topic.</word_default>
+      <word_custom>Суще�твует проблема выборки в �той теме.</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>is_required</word_key>
-      <word_default><![CDATA[&#10007; This field is required]]></word_default>
-      <word_custom><![CDATA[&#10007; Поле �вл�ет�� об�зательным]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>close_tpreview</word_key>
+      <word_default>Close preview</word_default>
+      <word_custom>Закрыть предпро�мотр</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_already</word_key>
-      <word_default><![CDATA[You've already rated this entry]]></word_default>
-      <word_custom>Вы уже проголо�овали за �ту запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>open_tpreview</word_key>
+      <word_default>Preview this topic</word_default>
+      <word_custom>Предпро�мотр �той темы</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>available</word_key>
-      <word_default><![CDATA[&#10004; Available!]]></word_default>
-      <word_custom><![CDATA[&#10004; До�тупно!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>mark_read_forum</word_key>
+      <word_default>There was a problem fetching this forum.</word_default>
+      <word_custom>Суще�твует проблема выборка в �том форуме.</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_topic_locked</word_key>
-      <word_default>This topic is locked</word_default>
-      <word_custom>Тема закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>no_permission_preview</word_key>
+      <word_default><![CDATA[Sorry, you don't have permission to preview this topic.]]></word_default>
+      <word_custom>Извините, но вы не имеете до�тупа к про�мотру �той темы.</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_good</word_key>
-      <word_default>Good</word_default>
-      <word_custom>Хорошо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>clear_markboard</word_key>
+      <word_default>Are you sure you want to mark all content as read?</word_default>
+      <word_custom>Вы дей�твительно хотите отметить в�е прочитанным?</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_awesome</word_key>
-      <word_default>Awesome!</word_default>
-      <word_custom>Замечательно!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_auto_saved</word_key>
+      <word_default>Last auto saved: #{time}</word_default>
+      <word_custom>По�леднее авто�охранение: #{time}</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_nbad</word_key>
-      <word_default>Not Bad</word_default>
-      <word_custom>�е плохо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_view_saved</word_key>
+      <word_default>View Auto Saved Content (#{updatedDate})</word_default>
+      <word_custom>Про�мотр авто�охран�емого �одержимого (#{updatedDate})</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_ok</word_key>
-      <word_default>Okay</word_default>
-      <word_custom>Средне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_restore</word_key>
+      <word_default>Restore Content</word_default>
+      <word_custom>Во��тановить �одержимое</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>rtg_poor</word_key>
-      <word_default>Poor</word_default>
-      <word_custom>Плохо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_saved</word_key>
+      <word_default>Saved Content</word_default>
+      <word_custom>Сохраненное �одержимое</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>quickpm_msg_blank</word_key>
-      <word_default>Your message is blank</word_default>
-      <word_custom>Введите �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_saved_desc</word_key>
+      <word_default><![CDATA[As you type, the text editor content is automatically saved so that if you had to reload this page you can restore what you've written so far.]]></word_default>
+      <word_custom>Пока вы набираете, тек�товый редактор автоматиче�ки �охран�ет �одержимое, и е�ли вдруг вы перезагрузите �ту �траницу, то вы �можете во��тановить в�е, что вы напи�али.</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>quickpm_enter_subject</word_key>
-      <word_default>Please enter a subject</word_default>
-      <word_custom>Введите тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>ck_saved_title</word_key>
+      <word_default>About Saved Content</word_default>
+      <word_custom>О �охраненном �одержимом</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>member_no_exist</word_key>
-      <word_default>That member does not exist!</word_default>
-      <word_custom>Пользователь не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>saving_post</word_key>
+      <word_default>Saving post...</word_default>
+      <word_custom>Сохранение �ообщени�...</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>friend_already</word_key>
-      <word_default>This member is already on your friends list</word_default>
-      <word_custom>Пользователь уже ваш друг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>mq_reply_swap</word_key>
+      <word_default>Reply to #{num} quoted post(s)</word_default>
+      <word_custom>Ответить на #{num} цитируемых �ообщений</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>cannot_readd_friend</word_key>
-      <word_default>You cannot re-add this friend for five minutes after removing them</word_default>
-      <word_custom>В течение п�ти минут вы не можете �нова добавить только что удаленного пользовател� в друзь�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>emo_show_all</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>Показывать в�е</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>no_permission</word_key>
-      <word_default>You do not have permission for this action</word_default>
-      <word_custom>У ва� нет прав дл� �овершени� �того дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>from</word_key>
+      <word_default>From</word_default>
+      <word_custom>Из</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -9885,18 +7419,6 @@ The <#BOARD_NAME#> team.
       <word_key>delete_confirm</word_key>
       <word_default>Are you sure you want to continue?</word_default>
       <word_custom>Вы дей�твительно хотите продолжить?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>error_security</word_key>
-      <word_default>Security Error</word_default>
-      <word_custom>Ошибка защиты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -9905,8 +7427,14 @@ The <#BOARD_NAME#> team.
       <word_key>error</word_key>
       <word_default>Error</word_default>
       <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>error_security</word_key>
+      <word_default>Security Error</word_default>
+      <word_custom>Ошибка защиты</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -9915,8 +7443,14 @@ The <#BOARD_NAME#> team.
       <word_key>action_failed</word_key>
       <word_default>Action failed</word_default>
       <word_custom>Дей�твие не выполнено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>success</word_key>
+      <word_default>Success</word_default>
+      <word_custom>У�пешно</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -9925,8 +7459,6 @@ The <#BOARD_NAME#> team.
       <word_key>error_occured</word_key>
       <word_default>An error occurred</word_default>
       <word_custom>Возникла ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -9935,118 +7467,38 @@ The <#BOARD_NAME#> team.
       <word_key>loading</word_key>
       <word_default>Loading...</word_default>
       <word_custom>Загрузка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>post_empty_post</word_key>
-      <word_default><![CDATA[Sorry, you can't submit a blank post. Please enter some text in the editor box]]></word_default>
-      <word_custom>�ельз� отправл�ть пу�тое �ообщение. Введите какой-либо тек�т в редакторе.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>no_permission</word_key>
+      <word_default>You do not have permission for this action</word_default>
+      <word_custom>У ва� нет прав дл� �овершени� �того дей�тви�</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>post_empty_title</word_key>
-      <word_default>You must enter a topic title!</word_default>
-      <word_custom>Вы должны вве�ти название темы!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>cannot_readd_friend</word_key>
+      <word_default>You cannot re-add this friend for five minutes after removing them</word_default>
+      <word_custom>В течение п�ти минут вы не можете �нова добавить только что удаленного пользовател� в друзь�.</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>post_empty_username</word_key>
-      <word_default>You must enter a username</word_default>
-      <word_custom>Вы должны вве�ти им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>friend_already</word_key>
+      <word_default>This member is already on your friends list</word_default>
+      <word_custom>Пользователь уже ваш друг</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>spoiler_hide</word_key>
-      <word_default>Hide</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>usercp_photo_upload</word_key>
-      <word_default>You have not selected a file to upload</word_default>
-      <word_custom>Вы не выбрали файл дл� загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>spoiler_show</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>messenger_cancel</word_key>
-      <word_default>Cancel</word_default>
-      <word_custom>Отменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>messenger_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>search_default_value</word_key>
-      <word_default>Search...</word_default>
-      <word_custom>И�кать...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>signin_badopenid</word_key>
-      <word_default>Supplied OpenID url is invalid</word_default>
-      <word_custom>Введенный OpenID не может быть правильным</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>1</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_js</word_pack>
-      <word_key>signin_nopassword</word_key>
-      <word_default>No password entered</word_default>
-      <word_custom>�е введен пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>member_no_exist</word_key>
+      <word_default>That member does not exist!</word_default>
+      <word_custom>Пользователь не �уще�твует!</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -10055,38 +7507,958 @@ The <#BOARD_NAME#> team.
       <word_key>signin_nosigninname</word_key>
       <word_default>No sign in name entered</word_default>
       <word_custom>�е введено им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>max_notes_reached</word_key>
-      <word_default>You cannot add any more notes to this image, because you have reached the maximum number allowed</word_default>
-      <word_custom>Вы и�черпали лимит до�тупных примечаний дл� данного изображени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>missing_data</word_key>
+      <word_default>Missing data!</word_default>
+      <word_custom>�еправильные данные</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>note_confirm_delete</word_key>
-      <word_default>Are you sure you want to delete this note?</word_default>
-      <word_custom>Вы хотите удалить примечание?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>signin_nopassword</word_key>
+      <word_default>No password entered</word_default>
+      <word_custom>�е введен пароль</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_js</word_pack>
-      <word_key>go_to_category</word_key>
-      <word_default>Go to this category</word_default>
-      <word_custom>Перейти к категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
+      <word_key>signin_badopenid</word_key>
+      <word_default>Supplied OpenID url is invalid</word_default>
+      <word_custom>Введенный OpenID не может быть правильным</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>hide</word_key>
+      <word_default><![CDATA[&times;]]></word_default>
+      <word_custom><![CDATA[&times;]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>unhide</word_key>
+      <word_default>...</word_default>
+      <word_custom>...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>search_default_value</word_key>
+      <word_default>Search...</word_default>
+      <word_custom>И�кать...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>unapproved</word_key>
+      <word_default>Unapproved</word_default>
+      <word_custom>Скрыто</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>status_updated</word_key>
+      <word_default>Your status has been updated</word_default>
+      <word_custom>Ваш �тату� у�пешно обновлен</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>global_leave_msg</word_key>
+      <word_default>Leave a message...</word_default>
+      <word_custom>О�тавить �ообщение...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>usercp_photo_upload</word_key>
+      <word_default>You have not selected a file to upload</word_default>
+      <word_custom>Вы не выбрали файл дл� загрузки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>global_status_update</word_key>
+      <word_default><![CDATA[What's on your mind?]]></word_default>
+      <word_custom>О чем ты думаешь �ейча�?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>spoiler_hide</word_key>
+      <word_default>Hide</word_default>
+      <word_custom>Скрыть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>spoiler_show</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Показать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>post_empty_username</word_key>
+      <word_default>You must enter a username</word_default>
+      <word_custom>Вы должны вве�ти им� пользовател�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>post_empty_title</word_key>
+      <word_default>You must enter a topic title!</word_default>
+      <word_custom>Вы должны вве�ти название темы!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>post_empty_post</word_key>
+      <word_default><![CDATA[Sorry, you can't submit a blank post. Please enter some text in the editor box]]></word_default>
+      <word_custom>�ельз� отправл�ть пу�тое �ообщение. Введите какой-либо тек�т в редакторе.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>board_offline</word_key>
+      <word_default>This feature is unavailable while the board is offline</word_default>
+      <word_custom>Когда форум в отключенном �о�то�нии, �та функци� недо�тупна</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>quickpm_enter_subject</word_key>
+      <word_default>Please enter a subject</word_default>
+      <word_custom>Введите тему</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>topic_polling</word_key>
+      <word_default><![CDATA[#{count} new replies added. <a href='javascript:void(0);' onclick='#{click}'>Show me</a>]]></word_default>
+      <word_custom><![CDATA[Добавлено #{count} новых ответов. <a href='javascript:void(0);' onclick='#{click}'>Показать мне</a>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_poor</word_key>
+      <word_default>Poor</word_default>
+      <word_custom>Плохо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>quickpm_msg_blank</word_key>
+      <word_default>Your message is blank</word_default>
+      <word_custom>Введите �ообщение</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_ok</word_key>
+      <word_default>Okay</word_default>
+      <word_custom>Средне</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_nbad</word_key>
+      <word_default>Not Bad</word_default>
+      <word_custom>�еплохо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_good</word_key>
+      <word_default>Good</word_default>
+      <word_custom>Хорошо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_awesome</word_key>
+      <word_default>Awesome!</word_default>
+      <word_custom>Замечательно!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_topic_locked</word_key>
+      <word_default>This topic is locked</word_default>
+      <word_custom>Тема закрыта</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>rtg_already</word_key>
+      <word_default><![CDATA[You've already rated this entry]]></word_default>
+      <word_custom>Вы уже проголо�овали за �ту запи�ь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>available</word_key>
+      <word_default><![CDATA[&#10004; Available!]]></word_default>
+      <word_custom><![CDATA[&#10004; До�тупно!]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>is_required</word_key>
+      <word_default><![CDATA[&#10007; This field is required]]></word_default>
+      <word_custom><![CDATA[&#10007; Поле �вл�ет�� об�зательным]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>not_available</word_key>
+      <word_default><![CDATA[&#10007; This name is taken!]]></word_default>
+      <word_custom><![CDATA[&#10007; Им� уже зан�то!]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>invalid_chars</word_key>
+      <word_default><![CDATA[&#10007; This field contains invalid characters]]></word_default>
+      <word_custom><![CDATA[&#10007;  Поле �одержит недопу�тимые �имволы]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>too_long</word_key>
+      <word_default><![CDATA[&#10007; The name you entered is too long]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенное им� �лишком длинное]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>too_short</word_key>
+      <word_default><![CDATA[&#10007; The name you entered is too short]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенное им� �лишком короткое]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>email_doesnt_match</word_key>
+      <word_default><![CDATA[&#10007; The addresses you entered don't match]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенные адре�а не �овпадают]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>email_banned</word_key>
+      <word_default><![CDATA[&#10007; This email address has been banned]]></word_default>
+      <word_custom><![CDATA[&#10007; E-mail адре� запрещен дл� и�пользовани�]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>email_in_use</word_key>
+      <word_default><![CDATA[&#10007; This email address is in use]]></word_default>
+      <word_custom><![CDATA[&#10007; E-mail адре� уже и�пользует��]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>invalid_email</word_key>
+      <word_default><![CDATA[&#10007; This isn't a valid address]]></word_default>
+      <word_custom><![CDATA[&#10007; E-mail адре� неправильный]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>pass_too_short</word_key>
+      <word_default><![CDATA[&#10007; Your password is too short (min. 3 characters)]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенный пароль менее 3 �имволов]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>pass_doesnt_match</word_key>
+      <word_default><![CDATA[&#10007; The passwords you entered don't match]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенные пароли не �овпадают]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>set_as_spammer</word_key>
+      <word_default>Are you sure you want to flag this user as a spam account?</word_default>
+      <word_custom>Вы уверены что хотите пометить пользовател� как �памера?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>copy_topic_link</word_key>
+      <word_default>Copy the permalink below to store the direct address to this post in your clipboard</word_default>
+      <word_custom>Пр�ма� ��ылка на �ообщение</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>delete_post_confirm</word_key>
+      <word_default>Are you sure you want to delete this post?</word_default>
+      <word_custom>Вы уверены что хотите удалить �то �ообщение?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>vote_success</word_key>
+      <word_default>Vote saved!</word_default>
+      <word_custom>Голо� �охранен!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>vote_updated</word_key>
+      <word_default>Vote updated!</word_default>
+      <word_custom>Голо� обновлен!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>pass_too_long</word_key>
+      <word_default><![CDATA[&#10007; Your password is too long (max. 32 characters)]]></word_default>
+      <word_custom><![CDATA[&#10007; Введенный пароль больше 32 �имволов]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>is_spammer</word_key>
+      <word_default>This account has been flagged as a spam account</word_default>
+      <word_custom>Этот пользователь уже отмечен как �памер</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>poll_not_enough_choices</word_key>
+      <word_default><![CDATA[One or more of your questions doesn't contain enough choices. Each question must contain at least 2 choices!]]></word_default>
+      <word_custom>Один из вопро�ов не �одержит до�таточного количе�тва вариантов выбора, вариантов должно быть не меньше двух!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>poll_no_more_choices</word_key>
+      <word_default>You cannot add any more choices to this question</word_default>
+      <word_custom>Вы больше не можете добавл�ть варианты к вопро�у.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>poll_no_more_q</word_key>
+      <word_default>You cannot add any more questions to this poll!</word_default>
+      <word_custom>Вы больше не можете добавл�ть вопро�ы к опро�у</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>att_select_files</word_key>
+      <word_default>Select files</word_default>
+      <word_custom>Выберите файлы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>click_to_attach</word_key>
+      <word_default>Choose Files...</word_default>
+      <word_custom>�ажмите, чтобы прикрепить файлы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>post_empty</word_key>
+      <word_default>Your post is empty</word_default>
+      <word_custom>Ваше �ообщение пу�то</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>editor_enter_list</word_key>
+      <word_default>Enter list item (or hit Cancel to finish list)</word_default>
+      <word_custom>Введите пункт �пи�ка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>poll_stats</word_key>
+      <word_default><![CDATA[You may add [q] more question(s), with [c] choices per question]]></word_default>
+      <word_custom><![CDATA[Вам разрешено добавить еще [q] вопро�ов � [c] вариантами ответа на вопро�.]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>click_to_show_opts</word_key>
+      <word_default>Click to configure post options</word_default>
+      <word_custom>�ажмите дл� управлени� опци�ми �ообщени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>no_more_topics</word_key>
+      <word_default>No more topics</word_default>
+      <word_custom>Больше тем нет</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>delete_topic_confirm</word_key>
+      <word_default>Are you sure you want to delete this topic?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �ту тему?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>justgo</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Ок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>with_selected</word_key>
+      <word_default>With Selected ({num})</word_default>
+      <word_custom>С выбранными ({num})</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>approve</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Показать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>unapprove</word_key>
+      <word_default>Unapprove</word_default>
+      <word_custom>Скрыть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>switch_to_advanced</word_key>
+      <word_default>Try our advanced uploader which supports multiple file uploading (modern browser required)</word_default>
+      <word_custom>Во�пользуйте�ь нашим новым менеджером дл� загрузки �разу не�кольких файлов (требует�� �овременный браузер)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>trouble_uploading</word_key>
+      <word_default>Trouble uploading?</word_default>
+      <word_custom>Проблемы � загрузкой?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_no_file</word_key>
+      <word_default>No file was selected for upload</word_default>
+      <word_custom>Вы не выбрали файл дл� загрузки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>invalid_mime_type</word_key>
+      <word_default><![CDATA[You aren't permitted to upload this kind of file]]></word_default>
+      <word_custom>Вы не можете загружать файлы подобного типа</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_too_big</word_key>
+      <word_default>This file was too big to upload</word_default>
+      <word_custom>Размер файла превышает допу�тимый дл� загрузки размер</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_failed</word_key>
+      <word_default>This upload failed</word_default>
+      <word_custom>Загрузка не удала�ь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_limit_hit</word_key>
+      <word_default>Upload limit exceeded</word_default>
+      <word_custom>Превышен лимит</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>silly_server</word_key>
+      <word_default>The server returned an error during upload</word_default>
+      <word_custom>Возникла ошибка при загрузке файла</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_progress</word_key>
+      <word_default><![CDATA[Uploaded [done] of [total]]]></word_default>
+      <word_custom><![CDATA[Загружено [done] из [total]]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_done</word_key>
+      <word_default><![CDATA[Done (uploaded [total])]]></word_default>
+      <word_custom><![CDATA[Готово (загружено [total])]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>out_of_diskspace</word_key>
+      <word_default>You have run out of space for uploads</word_default>
+      <word_custom>Выделенное ди�ковое про�тран�тво дл� загрузок и�черпано.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_queue</word_key>
+      <word_default>You have attempted to queue too many files. The number of files you can queue is: </word_default>
+      <word_custom>Вы попытали�ь загрузить �лишком много файлов. Допу�тимо одновременно загружать не более </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>upload_skipped</word_key>
+      <word_default>Upload Skipped</word_default>
+      <word_custom>Загрузка пропущена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>pending</word_key>
+      <word_default>Pending</word_default>
+      <word_custom>Ожидает</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>uploading</word_key>
+      <word_default>Uploading...</word_default>
+      <word_custom>Загрузка...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>delete_pm_confirm</word_key>
+      <word_default>Are you sure you wish to permanently delete this conversation?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �ту перепи�ку?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>delete_reply_confirm</word_key>
+      <word_default>Are you sure you want to delete this reply?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �тот ответ?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>delete_pm_many_confirm</word_key>
+      <word_default>Are you sure you wish to delete these conversations?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �ти перепи�ки?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>reached_max_folders</word_key>
+      <word_default>You have reached the maximum number of allowed folders</word_default>
+      <word_custom>Вы до�тигли лимита на количе�тво папок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>message_sent</word_key>
+      <word_default>Your message has been sent</word_default>
+      <word_custom>Сообщение отправлено</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>album_full</word_key>
+      <word_default>You are not permitted to upload any more items into this album</word_default>
+      <word_custom>У ва� недо�таточно прав, чтобы загрузить еще �лементы в �тот альбом</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>folder_protected</word_key>
+      <word_default>Cannot perform that action on a protected folder</word_default>
+      <word_custom>�е удало�ь �овершить дей�твие. Папка защищена.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>folder_not_found</word_key>
+      <word_default>Cannot find that folder</word_default>
+      <word_custom>�е удало�ь найти папку</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>must_enter_name</word_key>
+      <word_default>You must enter a name</word_default>
+      <word_custom>�еобходимо вве�ти им�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>cant_delete_folder</word_key>
+      <word_default><![CDATA[You can't delete a protected folder!]]></word_default>
+      <word_custom>Вы не можете удалить защищенную папку.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>confirm_empty</word_key>
+      <word_default>Are you sure you want to empty this folder?</word_default>
+      <word_custom>Вы дей�твительно хотите очи�тить �ту папку?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>confirm_delete</word_key>
+      <word_default>Are you sure you want to delete this folder? ALL messages in it will be deleted. This cannot be undone!</word_default>
+      <word_custom>Вы дей�твительно хотите удалить �ту папку? Будут удалены ВСЕ �ообщени�, �одержащие�� в ней. Данное дей�твие �Е ОБР�ТИМО!</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>save_folder</word_key>
+      <word_default><![CDATA[>]]></word_default>
+      <word_custom><![CDATA[>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>invalid_folder_name</word_key>
+      <word_default>The folder name is invalid</word_default>
+      <word_custom>Им� директории неверное</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>enter_x_names</word_key>
+      <word_default><![CDATA[Enter up to [x] names]]></word_default>
+      <word_custom><![CDATA[Введите до [x] имен пользователей]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>messenger_cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>messenger_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>enter_unlimited_names</word_key>
+      <word_default>Enter names</word_default>
+      <word_custom>Введите имена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>prof_update_button</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>prof_comment_mod</word_key>
+      <word_default>Your comment was added, but requires approval by this member before it will be displayed</word_default>
+      <word_custom>Ваш комментарий был добавлен. Подождите пока владелец профил�, одобрит его, затем он по�вит�� в общем �пи�ке.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>prof_comment_perm</word_key>
+      <word_default>You do not have permission to post comments on this profile</word_default>
+      <word_custom>У ва� не до�таточно прав чтобы о�тавить комментарий в �том профиле</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>prof_update_default</word_key>
+      <word_default><![CDATA[What's on your mind?]]></word_default>
+      <word_custom>О чем ты �ейча� думаешь?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>folder_emptied</word_key>
+      <word_default>Folder emptied successfully</word_default>
+      <word_custom>Папка у�пешно очищена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>prof_comment_empty</word_key>
+      <word_default>You must enter a comment</word_default>
+      <word_custom>Вы должны вве�ти тек�т комментари�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>js_rte_errorloadingiespell</word_key>
+      <word_default>Error loading ieSpell. Exception: </word_default>
+      <word_custom>�е удало�ь загрузить ieSpell. Ошибка: </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>js_rte_erroriespell</word_key>
+      <word_default>ieSpell was not detected. Click OK to go to the download page.</word_default>
+      <word_custom>ieSpell не обнаружен. �ажмите OK дл� перехода на �траницу загрузки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>option_is_empty</word_key>
+      <word_default><![CDATA[This tag's option cannot be left empty!]]></word_default>
+      <word_custom>Данна� на�тройка тега должна быть заполнена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>comment_requires_approval</word_key>
+      <word_default>Your comment requires moderator approval before it will be shown.</word_default>
+      <word_custom>Прежде чем публикуемый комментарий будет показан на форуме, он будет проверен модератором.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>fail_cblock</word_key>
+      <word_default>Failed to save content block changes</word_default>
+      <word_custom>�е удало�ь �охранить изменени� внутри блока</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>fail_config</word_key>
+      <word_default>Failed to save configuration</word_default>
+      <word_custom>�е удало�ь �охранить на�тройки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>blog_revert_header</word_key>
+      <word_default>Are you sure you want to revert your header?</word_default>
+      <word_custom>Вы дей�твительно хотите вернуть заголовок к прежнему виду?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>blog_uncategorized</word_key>
+      <word_default>Uncategorized</word_default>
+      <word_custom>Без категории</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>idm_msg_email</word_key>
+      <word_default>You did not enter an email address to send the email to</word_default>
+      <word_custom>Вы не ввели e-mail адре�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>blog_publish_now</word_key>
+      <word_default>Publish Now</word_default>
+      <word_custom>Опубликовать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>blog_save_draft</word_key>
+      <word_default>Save Draft</word_default>
+      <word_custom>В черновики</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>blog_cat_exists</word_key>
+      <word_default>That category already exists</word_default>
+      <word_custom>Категори� уже �уще�твует</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>note_no_permission_a</word_key>
+      <word_default>You do not have permission to add notes to this image</word_default>
+      <word_custom>Вы не можете добавл�ть примечани� к �тому изображению</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>note_no_permission_e</word_key>
+      <word_default>You do not have permission to edit this note</word_default>
+      <word_custom>Вы не можете редактировать примечани�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>idm_msg_text</word_key>
+      <word_default>You did not enter any text to email to the user</word_default>
+      <word_custom>Вы не ввели �ообщение</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>idm_invalid_file</word_key>
+      <word_default>Invalid File</word_default>
+      <word_custom>Файл неверный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>idm_comment_empty</word_key>
+      <word_default>Comment is empty</word_default>
+      <word_custom>Комментарий пу�т</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>required_data_missing</word_key>
+      <word_default>Some required data was missing</word_default>
+      <word_custom>Ча�ть необходимых данных от�ут�твует</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>note_no_permission_d</word_key>
+      <word_default><![CDATA[You don't have permission to delete notes]]></word_default>
+      <word_custom>Вы не можете удал�ть примечани�</word_custom>
       <word_js>1</word_js>
     </lang>
     <lang>
@@ -10095,49 +8467,2631 @@ The <#BOARD_NAME#> team.
       <word_key>gallery_rotate_failed</word_key>
       <word_default>There was an error rotating the image</word_default>
       <word_custom>Возникла проблема при повороте изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
       <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_like</word_pack>
-      <word_key>freq_offline</word_key>
-      <word_default>Only when not online</word_default>
-      <word_custom>Только когда не в �ети</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_js</word_pack>
+      <word_key>go_to_category</word_key>
+      <word_default>Go to this category</word_default>
+      <word_custom>Перейти к категории</word_custom>
+      <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_like</word_pack>
-      <word_key>freq_immediate</word_key>
-      <word_default>Instantly</word_default>
-      <word_custom>Моментально</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_js</word_pack>
+      <word_key>note_confirm_delete</word_key>
+      <word_default>Are you sure you want to delete this note?</word_default>
+      <word_custom>Вы хотите удалить примечание?</word_custom>
+      <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_like</word_pack>
-      <word_key>label_anon_desc</word_key>
-      <word_default>Do not show me in like summary</word_default>
-      <word_custom>�е показывать мен�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_js</word_pack>
+      <word_key>max_notes_reached</word_key>
+      <word_default>You cannot add any more notes to this image, because you have reached the maximum number allowed</word_default>
+      <word_custom>Вы и�черпали лимит до�тупных примечаний дл� данного изображени�.</word_custom>
+      <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_like</word_pack>
-      <word_key>label_anon</word_key>
-      <word_default>Like Anonymously</word_default>
-      <word_custom>�нонимно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__newpage</word_key>
+      <word_default>New Page</word_default>
+      <word_custom>�ова� �траница</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__source</word_key>
+      <word_default>BBCode Mode</word_default>
+      <word_custom>Режим BB-кодов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>note_save_empty</word_key>
+      <word_default>Your note cannot be empty; click the Delete link for this note if you do not wish to keep it</word_default>
+      <word_custom>Ваше примечание пу�то; удалите его, е�ли оно отправлено по ошибке</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__editor</word_key>
+      <word_default>Rich Text Editor</word_default>
+      <word_custom>Визуальный редактор</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__toolbar</word_key>
+      <word_default>Toolbar</word_default>
+      <word_custom>Панель ин�трументов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__italic</word_key>
+      <word_default>Italic</word_default>
+      <word_custom>Кур�ивный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__cut</word_key>
+      <word_default>Cut</word_default>
+      <word_custom>Вырезать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bold</word_key>
+      <word_default>Bold</word_default>
+      <word_custom>Полужирный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__underline</word_key>
+      <word_default>Underline</word_default>
+      <word_custom>Подчеркнутый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste</word_key>
+      <word_default>Paste</word_default>
+      <word_custom>В�тавить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__print</word_key>
+      <word_default>Print</word_default>
+      <word_custom>Печать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__copy</word_key>
+      <word_default>Copy</word_default>
+      <word_custom>Копи�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectall</word_key>
+      <word_default>Select All</word_default>
+      <word_custom>Отметить в�е</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__removeformat</word_key>
+      <word_default>Remove Format</word_default>
+      <word_custom>Удалить форматирование</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__subscript</word_key>
+      <word_default>Subscript</word_default>
+      <word_custom>Индек�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__strike</word_key>
+      <word_default>Strike Through</word_default>
+      <word_custom>Зачеркнутый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__superscript</word_key>
+      <word_default>Superscript</word_default>
+      <word_custom>Верхний индек�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__pb</word_key>
+      <word_default>Insert Page Break for Printing</word_default>
+      <word_custom>В�тавить перевод �троки дл� печати</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__hr</word_key>
+      <word_default>Insert Horizontal Line</word_default>
+      <word_custom>В�тавить горизонтальную линию</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__unlink</word_key>
+      <word_default>Unlink</word_default>
+      <word_custom>Разъединить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__pba</word_key>
+      <word_default>Page Break</word_default>
+      <word_custom>Перевод �троки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__mymedia</word_key>
+      <word_default>My Media</word_default>
+      <word_custom>Мои файлы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__redo</word_key>
+      <word_default>Redo</word_default>
+      <word_custom>�азад</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__undo</word_key>
+      <word_default>Undo</word_default>
+      <word_custom>Отменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bbcode</word_key>
+      <word_default>Special BBCode</word_default>
+      <word_custom>Специальные BB-коды</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__genoption</word_key>
+      <word_default>Option</word_default>
+      <word_custom>Опци�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__pselectbbcode</word_key>
+      <word_default>Please select</word_default>
+      <word_custom>Пожалуй�та, выберите</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__gencontent</word_key>
+      <word_default>Content</word_default>
+      <word_custom>Контент</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bbcodelabel</word_key>
+      <word_default>BBCode</word_default>
+      <word_custom>BB-код</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__code_title</word_key>
+      <word_default>Code</word_default>
+      <word_custom>Код</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__emoticons</word_key>
+      <word_default>Emoticons</word_default>
+      <word_custom>Смайлики</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__url</word_key>
+      <word_default>URL</word_default>
+      <word_custom>URL</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__protocol</word_key>
+      <word_default>Protocol</word_default>
+      <word_custom>Протокол</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__browse_server</word_key>
+      <word_default>Browse Server</word_default>
+      <word_custom>Обзор �ервера</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__upload</word_key>
+      <word_default>Upload</word_default>
+      <word_custom>Загрузить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__server_send</word_key>
+      <word_default>Send it to the Server</word_default>
+      <word_custom>Отправить на �ервер</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__image</word_key>
+      <word_default>Image</word_default>
+      <word_custom>Картинка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__form</word_key>
+      <word_default>Form</word_default>
+      <word_custom>Форма</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__flash</word_key>
+      <word_default>Flash</word_default>
+      <word_custom>Flash</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__checkbox</word_key>
+      <word_default>Checkbox</word_default>
+      <word_custom>Флажок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__id</word_key>
+      <word_default>Id</word_default>
+      <word_custom>ID</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__textarea</word_key>
+      <word_default>Textarea</word_default>
+      <word_custom>Тек�това� обла�ть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__textfield</word_key>
+      <word_default>Text Field</word_default>
+      <word_custom>Тек�товое поле</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__radiobutton</word_key>
+      <word_default>Radio Button</word_default>
+      <word_custom>Кнопка выбора</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__notset</word_key>
+      <word_default><![CDATA[<not set>]]></word_default>
+      <word_custom><![CDATA[<не указано>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__imagebutton</word_key>
+      <word_default>Image Button</word_default>
+      <word_custom>Кнопка � картинкой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__button</word_key>
+      <word_default>Button</word_default>
+      <word_custom>Кнопка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectfield</word_key>
+      <word_default>Selection Field</word_default>
+      <word_custom>Выберите поле</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__rtllang</word_key>
+      <word_default>Right to Left (RTL)</word_default>
+      <word_custom>Справа на лево (RTL))</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__languagedir</word_key>
+      <word_default>Language Direction</word_default>
+      <word_custom>�аправление �зыка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__longdescurl</word_key>
+      <word_default>Long Description URL</word_default>
+      <word_custom>Опи�ание URL</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__langcode</word_key>
+      <word_default>Language Code</word_default>
+      <word_custom>Код �зыка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ltrlang</word_key>
+      <word_default>Left to Right (LTR)</word_default>
+      <word_custom>Слева направо (LTR)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__advisorytitle</word_key>
+      <word_default>Advisory Title</word_default>
+      <word_custom>�азвание под�казок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__css_classes</word_key>
+      <word_default>Stylesheet Classes</word_default>
+      <word_custom>Кла��ы таблиц �тилей</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ok</word_key>
+      <word_default>OK</word_default>
+      <word_custom>ОК</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отмена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__style</word_key>
+      <word_default>Style</word_default>
+      <word_custom>Стиль</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__general</word_key>
+      <word_default>General</word_default>
+      <word_custom>О�новное</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__advanced</word_key>
+      <word_default>Advanced</word_default>
+      <word_custom>Ра�ширенные</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__nan</word_key>
+      <word_default>This value is not a number.</word_default>
+      <word_custom>Это значение не �вл�ет�� чи�лом.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__close</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__confirmreload</word_key>
+      <word_default>Any unsaved changes to this content will be lost. Are you sure you want to load new page?</word_default>
+      <word_custom>В�е не�охраненные изменени� контента будут утер�ны. Вы уверены, что хотите открыть новую �траницу?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__confirmcancel</word_key>
+      <word_default>Some of the options have been changed. Are you sure to close the dialog?</word_default>
+      <word_custom>�екоторые опции были изменены, вы дей�твительно хотите закрыть окно?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__tnewwindow</word_key>
+      <word_default>New Window (_blank)</word_default>
+      <word_custom>�овое окно (_blank)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__target</word_key>
+      <word_default>Target</word_default>
+      <word_custom>Цель</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ttopwindow</word_key>
+      <word_default>Topmost Window (_top)</word_default>
+      <word_custom>Главное окно (_top)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__tsamewindow</word_key>
+      <word_default>Same Window (_self)</word_default>
+      <word_custom>Это же окно (_self)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__width</word_key>
+      <word_default>Width</word_default>
+      <word_custom>Ширина</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__tparentwindow</word_key>
+      <word_default>Parent Window (_parent)</word_default>
+      <word_custom>Родитель�кое окно (_parent)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__height</word_key>
+      <word_default>Height</word_default>
+      <word_custom>Вы�ота</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__left</word_key>
+      <word_default>Left</word_default>
+      <word_custom>Слева</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__alignment</word_key>
+      <word_default>Alignment</word_default>
+      <word_custom>Выравнивание</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__center</word_key>
+      <word_default>Center</word_default>
+      <word_custom>Центр</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__right</word_key>
+      <word_default>Right</word_default>
+      <word_custom>�аправо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__top</word_key>
+      <word_default>Top</word_default>
+      <word_custom>По верху</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__height_nan</word_key>
+      <word_default>Height must be a number.</word_default>
+      <word_custom>Вы�ота должна быть чи�ловой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bottom</word_key>
+      <word_default>Bottom</word_default>
+      <word_custom>�ижний край</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__middle</word_key>
+      <word_default>Middle</word_default>
+      <word_custom>По �ередине</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__width_nan</word_key>
+      <word_default>Width must be a number.</word_default>
+      <word_custom>Ширина может быть только целым чи�лом.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__unavailable</word_key>
+      <word_default>unavailable</word_default>
+      <word_custom>недо�тупно</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__contextmenopt</word_key>
+      <word_default>Context Menu Options</word_default>
+      <word_custom>Опции контек�тного меню</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__insertspecial</word_key>
+      <word_default>Insert Special Character</word_default>
+      <word_custom>В�тавить �пециальные �имволы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectspecial</word_key>
+      <word_default>Select Special Character</word_default>
+      <word_custom>Выберите �пециальный �имвол</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__linkother</word_key>
+      <word_default><![CDATA[<other>]]></word_default>
+      <word_custom><![CDATA[<other>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__link</word_key>
+      <word_default>Link</word_default>
+      <word_custom>С�ылка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__speccharopts</word_key>
+      <word_default>Special Character Options</word_default>
+      <word_custom>Опции �пециальных �имволов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__editlink</word_key>
+      <word_default>Edit Link</word_default>
+      <word_custom>Изменить ��ылку</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__link_info</word_key>
+      <word_default>Link Info</word_default>
+      <word_custom>Инфо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__link_type</word_key>
+      <word_default>Link Type</word_default>
+      <word_custom>Тип ��ылки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__anchorlink</word_key>
+      <word_default>Link to anchor in the text</word_default>
+      <word_custom>С�ылка на �корь в тек�те</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__emaillink</word_key>
+      <word_default>E-mail</word_default>
+      <word_custom>E-mail</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popuplink</word_key>
+      <word_default><![CDATA[<popup window>]]></word_default>
+      <word_custom><![CDATA[<в�плывающее окно>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__framelink</word_key>
+      <word_default><![CDATA[<frame>]]></word_default>
+      <word_custom><![CDATA[<frame>]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__targframename</word_key>
+      <word_default>Target Frame Name</word_default>
+      <word_custom>Им� цели фрейма</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupwinname</word_key>
+      <word_default>Popup Window Name</word_default>
+      <word_custom>Им� в�плывающего окна</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupfeat</word_key>
+      <word_default>Popup Window Features</word_default>
+      <word_custom>Параметры в�плывающего окна</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupresize</word_key>
+      <word_default>Resizable</word_default>
+      <word_custom>Измен�емый размер</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popuplocation</word_key>
+      <word_default>Location Bar</word_default>
+      <word_custom>Панель адре�а</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupstatusba</word_key>
+      <word_default>Status Bar</word_default>
+      <word_custom>Строка �о�то�ни�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popuptoolbar</word_key>
+      <word_default>Toolbar</word_default>
+      <word_custom>Панель ин�трументов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupmenubar</word_key>
+      <word_default>Menu Bar</word_default>
+      <word_custom>Панель меню</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupfullscr</word_key>
+      <word_default>Full Screen (IE)</word_default>
+      <word_custom>Полно�кранное (IE)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupscroll</word_key>
+      <word_default>Scroll Bars</word_default>
+      <word_custom>Поло�ы прокрутки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupleftpos</word_key>
+      <word_default>Left Position</word_default>
+      <word_custom>По левому краю</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popupdepend</word_key>
+      <word_default>Dependent (Netscape)</word_default>
+      <word_custom>Зави�имое (Netscape)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__popuptoppos</word_key>
+      <word_default>Top Position</word_default>
+      <word_custom>От�туп �верху</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__accesskey</word_key>
+      <word_default>Access Key</word_default>
+      <word_custom>Ключ до�тупа</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__byelementid</word_key>
+      <word_default>By Element Id</word_default>
+      <word_custom>По id �лемента</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectanchor</word_key>
+      <word_default>Select an Anchor</word_default>
+      <word_custom>Выберите �корь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__byanchorname</word_key>
+      <word_default>By Anchor Name</word_default>
+      <word_custom>По имени �кор�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__linked_char</word_key>
+      <word_default>Linked Resource Charset</word_default>
+      <word_custom>Кодировка �айта, на который ��ылка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__advisorytype</word_key>
+      <word_default>Advisory Content Type</word_default>
+      <word_custom>Тип контента под�казок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__tab_index</word_key>
+      <word_default>Tab Index</word_default>
+      <word_custom>По�ледовательно�ть перехода</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__byemailaddy</word_key>
+      <word_default>E-Mail Address</word_default>
+      <word_custom>E-mail</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__emailsubject</word_key>
+      <word_default>Message Subject</word_default>
+      <word_custom>Тема �ообщени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__emailbody</word_key>
+      <word_default>Message Body</word_default>
+      <word_custom>Тело �ообщени�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__noanchorsa</word_key>
+      <word_default>(No anchors available in the document)</word_default>
+      <word_custom>(В документе нет ни одного �кор�)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__type_url</word_key>
+      <word_default>Please type the link URL</word_default>
+      <word_custom>Пожалуй�та, введите URL ��ылки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__type_email</word_key>
+      <word_default>Please type the e-mail address</word_default>
+      <word_custom>Пожалуй�та, введите e-mail адре�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__anchor</word_key>
+      <word_default>Anchor</word_default>
+      <word_custom>Якорь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__editanchor</word_key>
+      <word_default>Edit Anchor</word_default>
+      <word_custom>Изменить �корь</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__anchorprop</word_key>
+      <word_default>Anchor Properties</word_default>
+      <word_custom>Свой�тва �кор�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__anchorname</word_key>
+      <word_default>Anchor Name</word_default>
+      <word_custom>Им� �кор�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__numberedlist</word_key>
+      <word_default>Numbered List Properties</word_default>
+      <word_custom>Свой�тва нумерованного �пи�ка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__typeanchor</word_key>
+      <word_default>Please type the anchor name</word_default>
+      <word_custom>Пожалуй�та, введите им� �кор�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bulletlist</word_key>
+      <word_default>Bulleted List Properties</word_default>
+      <word_custom>Свой�тва маркированного �пи�ка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__type</word_key>
+      <word_default>Type</word_default>
+      <word_custom>Тип</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__start</word_key>
+      <word_default>Start</word_default>
+      <word_custom>�ачина� �</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__list_nan</word_key>
+      <word_default>List start number must be a whole number.</word_default>
+      <word_custom>�ачальное чи�ло �пи�ка должно быть целым чи�лом.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__circle</word_key>
+      <word_default>Circle</word_default>
+      <word_custom>Круг</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__disc</word_key>
+      <word_default>Disc</word_default>
+      <word_custom>Окружно�ть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__square</word_key>
+      <word_default>Square</word_default>
+      <word_custom>Квадрат</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__armeniannumb</word_key>
+      <word_default>Armenian numbering</word_default>
+      <word_custom>�рм�н�ка� нумераци�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__none</word_key>
+      <word_default>None</word_default>
+      <word_custom>�ет</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__georgiannumb</word_key>
+      <word_default>Georgian numbering (an, ban, gan, etc.)</word_default>
+      <word_custom>Грузин�ка� нумераци� (an, ban, gan, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__lowerroman</word_key>
+      <word_default>Lower Roman (i, ii, iii, iv, v, etc.)</word_default>
+      <word_custom>Строчные рим�кие (i, ii, iii, iv, v, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__upperroman</word_key>
+      <word_default>Upper Roman (I, II, III, IV, V, etc.)</word_default>
+      <word_custom>Заглавные рим�кие (I, II, III, IV, V, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__loweralpha</word_key>
+      <word_default>Lower Alpha (a, b, c, d, e, etc.)</word_default>
+      <word_custom>Строчные латин�кие (a, b, c, d, e, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__upperalpha</word_key>
+      <word_default>Upper Alpha (A, B, C, D, E, etc.)</word_default>
+      <word_custom>Заглавные латин�кие (A, B, C, D, E, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__lowergreek</word_key>
+      <word_default>Lower Greek (alpha, beta, gamma, etc.)</word_default>
+      <word_custom>Строчные грече�кие (альфа, бета, гамма, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__decimal</word_key>
+      <word_default>Decimal (1, 2, 3, etc.)</word_default>
+      <word_custom>Де��тичные (1, 2, 3 и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__decimal_zero</word_key>
+      <word_default>Decimal leading zero (01, 02, 03, etc.)</word_default>
+      <word_custom>Де��тичные � нулем (01, 02, 03, и т.д.)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__findreplace</word_key>
+      <word_default>Find and Replace</word_default>
+      <word_custom>�айти и заменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__find</word_key>
+      <word_default>Find</word_default>
+      <word_custom>�айти</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__find_what</word_key>
+      <word_default>Find what:</word_default>
+      <word_custom>Что и�кать:</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__replace</word_key>
+      <word_default>Replace</word_default>
+      <word_custom>Заменить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__replace_with</word_key>
+      <word_default>Replace with:</word_default>
+      <word_custom>Заменить на:</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__replace_all</word_key>
+      <word_default>Replace All</word_default>
+      <word_custom>Заменить в�е</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__match_cyclic</word_key>
+      <word_default>Match cyclic</word_default>
+      <word_custom>По в�ему тек�ту</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__match_word</word_key>
+      <word_default>Match whole word</word_default>
+      <word_custom>Только �лово целиком</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__match_case</word_key>
+      <word_default>Match case</word_default>
+      <word_custom>Учитывать реги�тр</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__text_notfound</word_key>
+      <word_default>The specified text was not found.</word_default>
+      <word_custom>Указанный тек�т не найден.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__value</word_key>
+      <word_default>Value</word_default>
+      <word_custom>Значение</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__replace_cnt</word_key>
+      <word_default>%1 occurrence(s) replaced.</word_default>
+      <word_custom>Заменено %s позиций</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__image_prop</word_key>
+      <word_default>Image Properties</word_default>
+      <word_custom>Свой�тва картинки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__imagebutton_p</word_key>
+      <word_default>Image Button Properties</word_default>
+      <word_custom>Свой�тва кнопки � картинкой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__image_info</word_key>
+      <word_default>Image Info</word_default>
+      <word_custom>Инфо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__alt_text</word_key>
+      <word_default>Alternative Text</word_default>
+      <word_custom>�льтернативный тек�т</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__lock_ratio</word_key>
+      <word_default>Lock Ratio</word_default>
+      <word_custom>Фик�ировать пропорции</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__unlock_ratio</word_key>
+      <word_default>Unlock Ratio</word_default>
+      <word_custom>Ра�крыть пропорции</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__border</word_key>
+      <word_default>Border</word_default>
+      <word_custom>Границы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__reset_size</word_key>
+      <word_default>Reset Size</word_default>
+      <word_custom>Вернуть обычные размеры</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__hspace</word_key>
+      <word_default>HSpace</word_default>
+      <word_custom>Горизонтальный от�туп</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__vspace</word_key>
+      <word_default>VSpace</word_default>
+      <word_custom>Вертикальный от�туп</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__image_url</word_key>
+      <word_default>Please type the image URL</word_default>
+      <word_custom>Введите URL картинки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__buttontoimage</word_key>
+      <word_default>Do you want to transform the selected image button to a simple image?</word_default>
+      <word_custom>Вы хотите тран�формировать выбранную картинку кнопки в про�то картинку</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__imagetobutton</word_key>
+      <word_default>Do you want to transform the selected image to a image button?</word_default>
+      <word_custom>Вы хотите тран�формировать выбранную картинку в кнопку � картинкой?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__missingimgurl</word_key>
+      <word_default>Image source URL is missing.</word_default>
+      <word_custom>С�ылка на изображение ошибочна.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__border_nan</word_key>
+      <word_default>Border must be a whole number.</word_default>
+      <word_custom>Толщина границ должна быть целым чи�лом</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__hspace_nan</word_key>
+      <word_default>HSpace must be a whole number.</word_default>
+      <word_custom>Горизонтальный от�туп должен быть целым чи�лом</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__smiley</word_key>
+      <word_default>Smiley</word_default>
+      <word_custom>Смайлики</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__properties</word_key>
+      <word_default>Properties</word_default>
+      <word_custom>Свой�тва</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__flash_prop</word_key>
+      <word_default>Flash Properties</word_default>
+      <word_custom>Свой�тва Flash</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__vspace_nan</word_key>
+      <word_default>VSpace must be a whole number.</word_default>
+      <word_custom>Вертикальный от�туп может быть только целым чи�лом.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__smileyopts</word_key>
+      <word_default>Smiley Options</word_default>
+      <word_custom>Опции �майликов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__insertsmilie</word_key>
+      <word_default>Insert a Smiley</word_default>
+      <word_custom>В�тавить �майлик</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__elementspath</word_key>
+      <word_default>Elements path</word_default>
+      <word_custom>Путь к �лементам</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__insdelbullist</word_key>
+      <word_default>Insert/Remove Bulleted List</word_default>
+      <word_custom>В�тавить/Удалить маркированный �пи�ок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__insdelnumlist</word_key>
+      <word_default>Insert/Remove Numbered List</word_default>
+      <word_custom>В�тавить/Удалить цифровой �пи�ок</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__inc_indent</word_key>
+      <word_default>Increase Indent</word_default>
+      <word_custom>Увеличить от�туп</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__xelements</word_key>
+      <word_default>%1 element</word_default>
+      <word_custom>%1 �лемент</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__alignright</word_key>
+      <word_default>Align Right</word_default>
+      <word_custom>По правому краю</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__dec_indent</word_key>
+      <word_default>Decrease Indent</word_default>
+      <word_custom>Уменьшить от�туп</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__alignleft</word_key>
+      <word_default>Align Left</word_default>
+      <word_custom>По левому краю</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__justify</word_key>
+      <word_default>Justify</word_default>
+      <word_custom>По ширине</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__blockquote</word_key>
+      <word_default>Block Quote</word_default>
+      <word_custom>Блок � цитатой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_err1</word_key>
+      <word_default><![CDATA[Your browser security settings don\'t permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).]]></word_default>
+      <word_custom>�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть автоматиче�кие операции по вырезанию тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+X).</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_err2</word_key>
+      <word_default><![CDATA[Your browser security settings don\'t permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).]]></word_default>
+      <word_custom>�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть автоматиче�кие операции по копированию тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+C).</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_box</word_key>
+      <word_default><![CDATA[Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та, в�тавьте тек�т в нижеуказанное поле, и�пользу� клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку OK]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_area</word_key>
+      <word_default>Paste Area</word_default>
+      <word_custom>Зона дл� в�тавки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_err3</word_key>
+      <word_default>Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.</word_default>
+      <word_custom>Потому что на�тройки безопа�но�ти вашего браузера не разрешают редактору обращать�� к буферу обмена. Вы должны в�тавить тек�т �нова в �то окно.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__clean_word</word_key>
+      <word_default>The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?</word_default>
+      <word_custom>Тек�т, который вы хотите в�тавить �копирован из Word. Вы хотите подчи�тить его перед в�тавкой?</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_word</word_key>
+      <word_default>Paste from Word</word_default>
+      <word_custom>В�тавить из Word</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__templateopts</word_key>
+      <word_default>Template Options</word_default>
+      <word_custom>Опции шаблонов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__templates</word_key>
+      <word_default>Templates</word_default>
+      <word_custom>Шаблоны</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__paste_ptext</word_key>
+      <word_default>Paste as Plain Text</word_default>
+      <word_custom>В�тавить только тек�т</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__nocleanword</word_key>
+      <word_default>It was not possible to clean up the pasted data due to an internal error</word_default>
+      <word_custom>�евозможно очи�тить в�тавл�емые данные из-за внутренней ошибки �и�темы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__contenttemps</word_key>
+      <word_default>Content Templates</word_default>
+      <word_custom>Шаблоны контента</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__about_ck</word_key>
+      <word_default>About CKEditor</word_default>
+      <word_custom>О CKEditor</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__automatic</word_key>
+      <word_default>Automatic</word_default>
+      <word_custom>�втоматиче�ки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__more_colors</word_key>
+      <word_default>More Colors...</word_default>
+      <word_custom>Еще цвета...</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__colors</word_key>
+      <word_default>Colors</word_default>
+      <word_custom>Цвета</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bg_color</word_key>
+      <word_default>Background Color</word_default>
+      <word_custom>Цвет фона</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__text_color</word_key>
+      <word_default>Text Color</word_default>
+      <word_custom>Цвет тек�та</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__font_size</word_key>
+      <word_default>Font Size</word_default>
+      <word_custom>Размер шрифта</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__size</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__font_name</word_key>
+      <word_default>Font Name</word_default>
+      <word_custom>Им� шрифта</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__font</word_key>
+      <word_default>Font</word_default>
+      <word_custom>Шрифт</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__normal_div</word_key>
+      <word_default>Normal (DIV)</word_default>
+      <word_custom>Обычный (DIV)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__heading</word_key>
+      <word_default>Heading</word_default>
+      <word_custom>Заглавие</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__address</word_key>
+      <word_default>Address</word_default>
+      <word_custom>�дре�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__formatted</word_key>
+      <word_default>Formatted</word_default>
+      <word_custom>Форматированный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__normal</word_key>
+      <word_default>Normal</word_default>
+      <word_custom>Обычный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__para_format</word_key>
+      <word_default>Paragraph Format</word_default>
+      <word_custom>Формат параграфа</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__formaat</word_key>
+      <word_default>Format</word_default>
+      <word_custom>Формат</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__object_styles</word_key>
+      <word_default>Object Styles</word_default>
+      <word_custom>Стили объектов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__inline_styles</word_key>
+      <word_default>Inline Styles</word_default>
+      <word_custom>Внедренный �тили</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__block_styles</word_key>
+      <word_default>Block Styles</word_default>
+      <word_custom>Стили блока</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__format_styles</word_key>
+      <word_default>Formatting Styles</word_default>
+      <word_custom>Стили форматировани�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__styles</word_key>
+      <word_default>Styles</word_default>
+      <word_custom>Стили</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__show_blocks</word_key>
+      <word_default>Show Blocks</word_default>
+      <word_custom>Показать блоки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__notemplates</word_key>
+      <word_default>(No templates defined)</word_default>
+      <word_custom>(�и одного шаблона не определено)</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__whichtempl</word_key>
+      <word_default>Please select the template to open in the editor</word_default>
+      <word_custom>Пожалуй�та выберите шаблон дл� открыти� в редакторе</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__repactconts</word_key>
+      <word_default>Replace actual contents</word_default>
+      <word_custom>Заменить актуальный контент</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__expandtools</word_key>
+      <word_default>Expand Toolbar</word_default>
+      <word_custom>Развернуть панель</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__collapsetools</word_key>
+      <word_default>Collapse Toolbar</word_default>
+      <word_custom>Свернуть панель</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__clear</word_key>
+      <word_default>Clear</word_default>
+      <word_custom>Очи�тить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectedcolor</word_key>
+      <word_default>Selected Color</word_default>
+      <word_custom>Выбранный цвет</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__highlight</word_key>
+      <word_default>Highlight</word_default>
+      <word_custom>Под�ветка</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__color_options</word_key>
+      <word_default>Color Options</word_default>
+      <word_custom>Опции цветов</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__selectcolor</word_key>
+      <word_default>Select color</word_default>
+      <word_custom>Выберите цвет</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__dragtoresize</word_key>
+      <word_default>Drag to resize</word_default>
+      <word_custom>Перетащите дл� изменени� размера</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__unknownobj</word_key>
+      <word_default>Unknown Object</word_default>
+      <word_custom>�еизве�тный объект</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__iframe</word_key>
+      <word_default>iFrame</word_default>
+      <word_custom>iFrame</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__flashanima</word_key>
+      <word_default>Flash Animation</word_default>
+      <word_custom>�нимаци� Flash</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__minimize</word_key>
+      <word_default>Minimize</word_default>
+      <word_custom>Свернуть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__maximize</word_key>
+      <word_default>Maximize</word_default>
+      <word_custom>Развернуть</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__copyright</word_key>
+      <word_default><![CDATA[Copyright &copy; $1. All rights reserved.]]></word_default>
+      <word_custom><![CDATA[&copy; $1. В�е права защищены.]]></word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__licvisitsite</word_key>
+      <word_default>For licensing information please visit our web site:</word_default>
+      <word_custom>По вопро�ам лицензировани� обращайте�ь на наш �айт:</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bidiltr</word_key>
+      <word_default>Text direction from left to right</word_default>
+      <word_custom>�апи�ание тек�та �лева направо</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__enablescayt</word_key>
+      <word_default>Enable SCAYT</word_default>
+      <word_custom>Включить проверку орфографии</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__nooperalol</word_key>
+      <word_default>Not supported by Opera</word_default>
+      <word_custom>Opera не поддерживает��</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__scayt</word_key>
+      <word_default>Spell Check As You Type</word_default>
+      <word_custom>Проверка орфографии налету при вводе тек�та</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__bidirtl</word_key>
+      <word_default>Text direction from right to left</word_default>
+      <word_custom>�апи�ание тек�та �права налево</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__disablescayt</word_key>
+      <word_default>Disable SCAYT</word_default>
+      <word_custom>Отключить проверку орфографии</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__diction_name</word_key>
+      <word_default>Dictionary name</word_default>
+      <word_custom>Им� �ловар�</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__dictionaries</word_key>
+      <word_default>Dictionaries</word_default>
+      <word_custom>Словари</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignorewnumber</word_key>
+      <word_default>Ignore Words with Numbers</word_default>
+      <word_custom>Пропу�тить �лова � цифрами</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignoremixedc</word_key>
+      <word_default>Ignore Words with Mixed Case</word_default>
+      <word_custom>Пропу�тить �лова � большими и малыми буквами</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignoredomains</word_key>
+      <word_default>Ignore Domain Names</word_default>
+      <word_custom>Пропу�тить доменные имена</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignoreallcaps</word_key>
+      <word_default>Ignore All-Caps Words</word_default>
+      <word_custom>Пропу�тить в�е �лова большими буквами</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__dict_name</word_key>
+      <word_default>Dictionary name should not be empty.</word_default>
+      <word_custom>Им� �ловар� не может быть пу�тым.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__add_word</word_key>
+      <word_default>Add Word</word_default>
+      <word_custom>Добавить �лово</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignore_all</word_key>
+      <word_default>Ignore All</word_default>
+      <word_custom>Пропу�тить в�е</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__ignore</word_key>
+      <word_default>Ignore</word_default>
+      <word_custom>Пропу�тить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__moresuggs</word_key>
+      <word_default>More suggestions</word_default>
+      <word_custom>Еще варианты</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__languages</word_key>
+      <word_default>Languages</word_default>
+      <word_custom>Языки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__togglescayt</word_key>
+      <word_default>Toggle SCAYT</word_default>
+      <word_custom>Переключить проверку орфографии</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__aboutscayt</word_key>
+      <word_default>About SCAYT</word_default>
+      <word_custom>О проверке орфографии</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__restore</word_key>
+      <word_default>Restore</word_default>
+      <word_custom>Во��тановить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__create</word_key>
+      <word_default>Create</word_default>
+      <word_custom>Создать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__rename</word_key>
+      <word_default>Rename</word_default>
+      <word_custom>Переименовать</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__sadbrown</word_key>
+      <word_default>Saddle Brown</word_default>
+      <word_custom>Кожано-коричневый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__maroon</word_key>
+      <word_default>Maroon</word_default>
+      <word_custom>Темно-бордовы</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__black</word_key>
+      <word_default>Black</word_default>
+      <word_custom>Черный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__about</word_key>
+      <word_default>About</word_default>
+      <word_custom>О</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__dict_cookie</word_key>
+      <word_default>Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.</word_default>
+      <word_custom>Изначально, пользователь�кий �ловарь хранит�� в cookies, которые ограничены в размере. Когда �ловарь пользовател� выра�тает до размеров, что его невозможно хранить в cookies,  хранение его перено�ит�� на наш �ервер. Чтобы �охранить ваш �ловарь на нашем �ервере, вам �ледует указать уникальное название вашего �ловар�. Е�ли у ва� уже был �охраненный �ловарь, то укажите зде�ь его название и нажмите кнопку Во��тановить.</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__navy</word_key>
+      <word_default>Navy</word_default>
+      <word_custom>Темно-�иний</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__teal</word_key>
+      <word_default>Teal</word_default>
+      <word_custom>Бирюзовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__dsgray</word_key>
+      <word_default>Dark Slate Gray</word_default>
+      <word_custom>Зеленовато-�ерый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__darkgray</word_key>
+      <word_default>Dark Gray</word_default>
+      <word_custom>Темно-�ерый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__indigo</word_key>
+      <word_default>Indigo</word_default>
+      <word_custom>Индиго</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__turquoise</word_key>
+      <word_default>Turquoise</word_default>
+      <word_custom>Бледно-бирюзовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__darkgreen</word_key>
+      <word_default>Dark Green</word_default>
+      <word_custom>Темно-зеленый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__goldenrod</word_key>
+      <word_default>Golden Rod</word_default>
+      <word_custom>Золоти�то-березовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__brown</word_key>
+      <word_default>Brown</word_default>
+      <word_custom>Коричневый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__firebrick</word_key>
+      <word_default>Fire Brick</word_default>
+      <word_custom>Кирпичный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__gray</word_key>
+      <word_default>Gray</word_default>
+      <word_custom>Серый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__purple</word_key>
+      <word_default>Purple</word_default>
+      <word_custom>Пурпурный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__medblue</word_key>
+      <word_default>Medium Blue</word_default>
+      <word_custom>Ярко-�иний</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__orange</word_key>
+      <word_default>Orange</word_default>
+      <word_custom>Оранжевый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__blue</word_key>
+      <word_default>Blue</word_default>
+      <word_custom>Синий</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__violet</word_key>
+      <word_default>Violet</word_default>
+      <word_custom>Фиолетовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__green</word_key>
+      <word_default>Green</word_default>
+      <word_custom>Зеленый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__cyan</word_key>
+      <word_default>Cyan</word_default>
+      <word_custom>Зеленовато-голубой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__gold</word_key>
+      <word_default>Gold</word_default>
+      <word_custom>Золотой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__darkorange</word_key>
+      <word_default>Dark Orange</word_default>
+      <word_custom>Темно-оранжевый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__red</word_key>
+      <word_default>Red</word_default>
+      <word_custom>Кра�ный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__dimgray</word_key>
+      <word_default>Dim Gray</word_default>
+      <word_custom>Ту�кло-�ерый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lightsalmon</word_key>
+      <word_default>Light Salmon</word_default>
+      <word_custom>Светлый �омон</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__yellow</word_key>
+      <word_default>Yellow</word_default>
+      <word_custom>Желтый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lime</word_key>
+      <word_default>Lime</word_default>
+      <word_custom>Лимонно-зеленый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__paleturq</word_key>
+      <word_default>Pale Turquoise</word_default>
+      <word_custom>Бледно-бирюзовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lightblue</word_key>
+      <word_default>Light Blue</word_default>
+      <word_custom>Светло-�иний</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__plum</word_key>
+      <word_default>Plum</word_default>
+      <word_custom>Темно-фиолетовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lightgray</word_key>
+      <word_default>Light Gray</word_default>
+      <word_custom>Светло-�ерый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lavender</word_key>
+      <word_default>Lavender Blush</word_default>
+      <word_custom>Голубой � кра�ным отливом</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__quotelabel</word_key>
+      <word_default>Quote</word_default>
+      <word_custom>Цитата</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__togglelabel</word_key>
+      <word_default>Toggle editing mode</word_default>
+      <word_custom>Переключить вид редактора</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__honeydew</word_key>
+      <word_default>Honeydew</word_default>
+      <word_custom>Медовый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__azure</word_key>
+      <word_default>Azure</word_default>
+      <word_custom>Лазурный</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__aliceblue</word_key>
+      <word_default>Alice Blue</word_default>
+      <word_custom>Светло-голубой</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__reglavender</word_key>
+      <word_default>Lavender</word_default>
+      <word_custom>Бледно-лиловый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__antique</word_key>
+      <word_default>Antique White</word_default>
+      <word_custom>Белый антик</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__lightyellow</word_key>
+      <word_default>Light Yellow</word_default>
+      <word_custom>Светло-желтый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__iframeurl</word_key>
+      <word_default>Please type the iFrame URL</word_default>
+      <word_custom>Введите URL iFrame</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__iframescroll</word_key>
+      <word_default>Enable scrollbars</word_default>
+      <word_custom>Включить поло�ы прокрутки</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__iframeborder</word_key>
+      <word_default>Show frame border</word_default>
+      <word_custom>Показывать границы фрейма</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__divcontainer</word_key>
+      <word_default>Create Div Container</word_default>
+      <word_custom>Создать контейнер Div</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__inlinestyle</word_key>
+      <word_default>Inline Style</word_default>
+      <word_custom>Внедренный �тиль</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__edit_div</word_key>
+      <word_default>Edit Div</word_default>
+      <word_custom>Изменить Div</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__remove_div</word_key>
+      <word_default>Remove Div</word_default>
+      <word_custom>Удалить Div</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__codelabel</word_key>
+      <word_default>Code</word_default>
+      <word_custom>Код</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckcolor__white</word_key>
+      <word_default>White</word_default>
+      <word_custom>Белый</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__iframeprops</word_key>
+      <word_default>iFrame Properties</word_default>
+      <word_custom>Свой�тва iFrame </word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__hiddenfield</word_key>
+      <word_default>Hidden Field</word_default>
+      <word_custom>Скрытое поле</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__hiddenfield</word_key>
+      <word_default>Hidden Field</word_default>
+      <word_custom>Скрытое поле</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>ckeditor__preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+      <word_js>1</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_js</word_pack>
+      <word_key>photo_editor_enterurl</word_key>
+      <word_default>Enter a url here</word_default>
+      <word_custom/>
+      <word_js>1</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10145,29 +11099,62 @@ The <#BOARD_NAME#> team.
       <word_key>label_freq</word_key>
       <word_default>Frequency</word_default>
       <word_custom>Ча�тота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_like</word_pack>
-      <word_key>label_notify</word_key>
-      <word_default>Receive notification of %s</word_default>
-      <word_custom>Получать уведомлени� дл� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_like</word_pack>
       <word_key>fave_title</word_key>
-      <word_default>Like</word_default>
-      <word_custom>�равит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_default>%s</word_default>
+      <word_custom>%s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>label_anon</word_key>
+      <word_default>Follow Anonymously</word_default>
+      <word_custom>Следить анонимно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>label_notify</word_key>
+      <word_default>Receive notification</word_default>
+      <word_custom>Получать уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>freq_immediate</word_key>
+      <word_default>Instantly</word_default>
+      <word_custom>�емедленно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>label_anon_desc</word_key>
+      <word_default>Do not show me in the summary</word_default>
+      <word_custom>�е показывать мен� в выборке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>freq_offline</word_key>
+      <word_default>Only when not online</word_default>
+      <word_custom>Только, когда не в онлайне</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>likedby</word_key>
+      <word_default>Followed By</word_default>
+      <word_custom>След�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>likeadded</word_key>
+      <word_default>Added:</word_default>
+      <word_custom>Добавлено:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10175,9 +11162,6 @@ The <#BOARD_NAME#> team.
       <word_key>freq_weekly</word_key>
       <word_default>Weekly</word_default>
       <word_custom>Еженедельно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10185,609 +11169,55 @@ The <#BOARD_NAME#> team.
       <word_key>freq_daily</word_key>
       <word_default>Daily</word_default>
       <word_custom>Ежедневно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>pg_unfollow_confirm</word_key>
+      <word_default>Unfollow This Item Now</word_default>
+      <word_custom>Прекратить от�леживание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>pg_no_longer_following</word_key>
+      <word_default>You are no longer following this item</word_default>
+      <word_custom>Вы больше не от�леживаете �то</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>pg_unlike_done</word_key>
+      <word_default>Item unfollowed successfully</word_default>
+      <word_custom>Вы прекратили от�леживание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>pg_unfollow_text</word_key>
+      <word_default><![CDATA[<strong>%s</strong>, you have elected to unfollow the item <a href='%s'>%s</a>.<br />If you unfollow, you will no longer receive notifcations when this item is updated.]]></word_default>
+      <word_custom><![CDATA[<strong>%s</strong>, вы хотите прекратить от�леживание <a href='%s'>%s</a>.<br />При отключении от�леживани� вы больше не будете получать уведомлени� об обновлени�х.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_like</word_pack>
+      <word_key>pg_unfollow_title</word_key>
+      <word_default>Unfollow Item</word_default>
+      <word_custom>Прекратить от�леживание</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_no_forum_acct</word_key>
-      <word_default>We could not locate a linked forum account:</word_default>
-      <word_custom>Си�тема не �могла найти �в�занную учетную запи�ь:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>register_prompt_1</word_key>
+      <word_default>Need an account?</word_default>
+      <word_custom>�ужна учетна� запи�ь?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_logged_in</word_key>
-      <word_default>You are logged into Facebook.</word_default>
-      <word_custom>Вы вошли в Facebook.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>welcome_prefix</word_key>
-      <word_default>Welcome,</word_default>
-      <word_custom>Здрав�твуйте,</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>login_w_facebook</word_key>
-      <word_default>Sign in with your Facebook account</word_default>
-      <word_custom>Вход � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>fb_login_title</word_key>
-      <word_default>Facebook Sign In</word_default>
-      <word_custom>Вход � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>login_forgotten_pass</word_key>
-      <word_default><![CDATA[I've forgotten my password]]></word_default>
-      <word_custom>Я забыл �вой пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>not_a_member</word_key>
-      <word_default>Not a member?</word_default>
-      <word_custom>Еще не зареги�трированы? </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>log_in</word_key>
-      <word_default>Sign In</word_default>
-      <word_custom>Вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>sign_in_button</word_key>
-      <word_default>Sign In</word_default>
-      <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>anon_name</word_key>
-      <word_default><![CDATA[Don't add me to the active users list]]></word_default>
-      <word_custom>�е отображать мен� в �пи�ке активных пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>form_invisible</word_key>
-      <word_default>Sign in anonymously</word_default>
-      <word_custom>Скрытно�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>notrecommended</word_key>
-      <word_default>This is not recommended for shared computers</word_default>
-      <word_custom>�е включайте, е�ли и�пользуете общедо�тупный компьютер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>rememberme</word_key>
-      <word_default>Remember me</word_default>
-      <word_custom>Запомнить мен�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>sign_in_options</word_key>
-      <word_default>Sign in options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>use_regular</word_key>
-      <word_default>Use regular sign in</word_default>
-      <word_custom>И�пользовать обычный вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>regular_signin</word_key>
-      <word_default>Regular sign in</word_default>
-      <word_custom>Обычный вход</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>openid</word_key>
-      <word_default>OpenID:</word_default>
-      <word_custom>OpenID: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>openid_example</word_key>
-      <word_default>Example: http://username.myprovider.com</word_default>
-      <word_custom>�апример: http://username.ya.ru</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>signin_with_live</word_key>
-      <word_default>Click here to sign in using Windows Live</word_default>
-      <word_custom>�ажмите зде�ь чтобы войти под учетной запи�ью Windows Live</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>sign_in_winlive</word_key>
-      <word_default>Sign in with Windows Live</word_default>
-      <word_custom>Войти � и�пользованием Windows Live</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>sign_in_openid</word_key>
-      <word_default>Sign in with OpenID</word_default>
-      <word_custom>Войти � и�пользованием OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>have_msnlive</word_key>
-      <word_default>Have Windows Live?</word_default>
-      <word_custom>Е�ть Windows Live?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>use_openid</word_key>
-      <word_default>Use OpenID</word_default>
-      <word_custom>И�пользовать OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>use_live</word_key>
-      <word_default>Use Windows Live</word_default>
-      <word_custom>И�пользовать Windows Live</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>have_openid</word_key>
-      <word_default>Have an OpenID?</word_default>
-      <word_custom>Е�ть OpenID?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>sign_in_here</word_key>
-      <word_default>Sign in here</word_default>
-      <word_custom>Вход зде�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>enter_name_and_email</word_key>
-      <word_default>Username or email address:</word_default>
-      <word_custom>Им� пользовател� или e-mail адре�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>enter_pass</word_key>
-      <word_default>Password:</word_default>
-      <word_custom>Пароль:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>enter_username</word_key>
-      <word_default>Username:</word_default>
-      <word_custom>Им� пользовател�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>enter_useremail</word_key>
-      <word_default>Email address:</word_default>
-      <word_custom>E-mail адре�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>enter_name_and_pass</word_key>
-      <word_default>Enter your sign in name and password</word_default>
-      <word_custom>Введите ваши им� пользовател� и пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>thanks_for_logout</word_key>
-      <word_default>You are now signed out</word_default>
-      <word_custom>Вы вышли</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>admin_force_log_in</word_key>
-      <word_default>The board administrator requires all members to sign in</word_default>
-      <word_custom>�дмини�траци� форума запретила про�мотр форума го�т�м. �еобходимо авторизовать�� на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>pass_not_log_in</word_key>
-      <word_default>Your password change has been approved, taking you to the sign in form</word_default>
-      <word_custom>Пароль у�пешно изменен. Переходим на �траницу авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>please_log_in</word_key>
-      <word_default>Please enter your details below to sign in</word_default>
-      <word_custom>Введите ваши данные дл� авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>email_not_log_in</word_key>
-      <word_default>Your email address change has been approved, taking you to the sign in form</word_default>
-      <word_custom>E-mail адре� у�пешно изменен. Переходим на �траницу авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>pass_log_in</word_key>
-      <word_default>Your password change has been approved, returning you to the board index</word_default>
-      <word_custom>Пароль у�пешно изменен. Переходим к �пи�ку форумов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>email_log_in</word_key>
-      <word_default>Your email address change has been approved, returning you to the board index</word_default>
-      <word_custom>E-mail адре� у�пешно изменен. Переходим к �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>reg_not_log_in</word_key>
-      <word_default>You are now registered, taking you to the sign in form</word_default>
-      <word_custom>Вы у�пешно зареги�трировали�ь. Переходим на �траницу авторизации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>reg_log_in</word_key>
-      <word_default>You are now registered and signed in, returning you to the board index</word_default>
-      <word_custom>Вы зареги�трированы и авторизованы. Переходим к �пи�ку форумов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>logged_in</word_key>
-      <word_default>You are signed in, returning you to the board index</word_default>
-      <word_custom>Вы вошли. Переходим к �пи�ку форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>not_logged_in</word_key>
-      <word_default>You are not signed in, taking you to the sign in form</word_default>
-      <word_custom>Вы не авторизованы. Переходим на �траницу авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>wrong_auth</word_key>
-      <word_default>Username or password incorrect.</word_default>
-      <word_custom>Логин или пароль неверны.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>wrong_openid</word_key>
-      <word_default>We could not verify your identity through OpenID.  Please try again, or choose another login method.</word_default>
-      <word_custom>Мы не �могли подтвердить ваш аккаунт через OpenID. Попробуйте еще раз или во�пользуйте�ь другим �по�обом авторизации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>bruteforce_account_lock</word_key>
-      <word_default>Your account is currently locked due to consecutive failed login attempts and will remain locked until an administrator unlocks it.</word_default>
-      <word_custom>Ваша учетна� запи�ь заблокирована из-за большого количе�тва неудачных попыток входа. Запи�ь будет разблокирована админи�тратором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>complete_form</word_key>
-      <word_default>You must complete both fields</word_default>
-      <word_custom>�еобходимо заполнить оба пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>bruteforce_account_unlock</word_key>
-      <word_default>Your account will automatically be unlocked in %s minutes</word_default>
-      <word_custom>Ваша учетна� запи�ь заблокирована на %s минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>register_now</word_key>
-      <word_default>Register Now</word_default>
-      <word_custom>Зареги�трировать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>retrieve_pw</word_key>
-      <word_default>Retrieve password</word_default>
-      <word_custom>Во��тановление парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__liveicon</word_key>
-      <word_default>Live Icon</word_default>
-      <word_custom>Иконка Live</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>flagged_remote</word_key>
-      <word_default>Our central login system has determined that you must first login at the application you originally registered at before you can login to these forums.</word_default>
-      <word_custom>Централизованна� �и�тема входа �ообщила о том, что вы должны авторизовать�� в той �и�теме где вы первоначально были зареги�трированы, прежде чем пытать�� авторизовать�� на �том форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>fb_new_account</word_key>
-      <word_default>Complete log in with new account</word_default>
-      <word_custom>Войти � �озданием новой учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__openidicon</word_key>
-      <word_default>OpenID Icon</word_default>
-      <word_custom>Иконка OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__openidlogo</word_key>
-      <word_default>OpenID Logo</word_default>
-      <word_custom>Логотип OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__signin</word_key>
-      <word_default>Sign in icon</word_default>
-      <word_custom>Иконка входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__register</word_key>
-      <word_default>Register</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>macro__help</word_key>
-      <word_default>Help</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>login_w_twitter_desc</word_key>
-      <word_default><![CDATA[If you would rather connect your existing forum account with your Twitter account, please <a href='#' id='twitterPop'>click here</a>]]></word_default>
-      <word_custom><![CDATA[Е�ли вы хотите �в�зать уже �уще�твующую учетную запи�ь � аккаунтом в Twitter, пожалуй�та <a href='#' id='twitterPop'>нажмите зде�ь</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>login_w_twitter</word_key>
-      <word_default>Sign in with your Twitter account</word_default>
-      <word_custom>Вход � и�пользованием Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_login</word_pack>
-      <word_key>twitter_login_title</word_key>
-      <word_default>Twitter Sign In</word_default>
-      <word_custom>Вход через Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>register_prompt_2</word_key>
+      <word_default>Register now!</word_default>
+      <word_custom>Зареги�трируйте�ь �ейча�!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10795,9 +11225,13 @@ The <#BOARD_NAME#> team.
       <word_key>twitter_connect_account_desc</word_key>
       <word_default><![CDATA[If have an existing forum account, simply log in as normal then visit <a href='%s' target='_blank'>this page</a> to connect your forum account with your Twitter account]]></word_default>
       <word_custom><![CDATA[Е�ли у ва� уже е�ть учетна� запи�ь на форуме, войдите � ее помощью, а затем перейдите на <a href='%s' target='_blank'>�ту �траницу</a> чтобы �в�зать вашу запи�ь � аккаунтом в Twitter]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>macro__help</word_key>
+      <word_default>Help</word_default>
+      <word_custom>Помощь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10805,49 +11239,349 @@ The <#BOARD_NAME#> team.
       <word_key>twitter_connect_account_title</word_key>
       <word_default>Connecting Twitter</word_default>
       <word_custom>Св�зывание � Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_link_account</word_key>
-      <word_default>link to an existing account</word_default>
-      <word_custom>�в�зать � �уще�твующей учетной запи�ью</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>macro__signin</word_key>
+      <word_default>Sign in icon</word_default>
+      <word_custom>Иконка входа</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_link_email</word_key>
-      <word_default>Email:</word_default>
-      <word_custom>E-mail:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>macro__openidlogo</word_key>
+      <word_default>OpenID Logo</word_default>
+      <word_custom>Логотип OpenID</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_link_pass</word_key>
-      <word_default>Pass:</word_default>
+      <word_key>macro__register</word_key>
+      <word_default>Register</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>login_w_twitter_desc</word_key>
+      <word_default><![CDATA[If you would rather connect your existing forum account with your Twitter account, please <a href='#' id='twitterPop'>click here</a>]]></word_default>
+      <word_custom><![CDATA[Е�ли вы хотите �в�зать уже �уще�твующую учетную запи�ь � аккаунтом в Twitter, пожалуй�та <a href='#' id='twitterPop'>нажмите зде�ь</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>login_w_twitter</word_key>
+      <word_default>Sign in with your Twitter account</word_default>
+      <word_custom>Вход � и�пользованием Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>twitter_login_title</word_key>
+      <word_default>Twitter Sign In</word_default>
+      <word_custom>Вход через Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>macro__liveicon</word_key>
+      <word_default>Live Icon</word_default>
+      <word_custom>Иконка Live</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>macro__openidicon</word_key>
+      <word_default>OpenID Icon</word_default>
+      <word_custom>Иконка OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>register_now</word_key>
+      <word_default>Register Now</word_default>
+      <word_custom>Зареги�трировать��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>flagged_remote</word_key>
+      <word_default>Our central login system has determined that you must first login at the application you originally registered at before you can login to these forums.</word_default>
+      <word_custom>Централизованна� �и�тема входа �ообщила о том, что вы должны авторизовать�� в той �и�теме где вы первоначально были зареги�трированы, прежде чем пытать�� авторизовать�� на �том форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>retrieve_pw</word_key>
+      <word_default>Retrieve password</word_default>
+      <word_custom>Во��тановление парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>complete_form</word_key>
+      <word_default>You must complete both fields</word_default>
+      <word_custom>�еобходимо заполнить оба пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>bruteforce_account_lock</word_key>
+      <word_default>Your account is currently locked due to consecutive failed login attempts and will remain locked until an administrator unlocks it.</word_default>
+      <word_custom>Ваша учетна� запи�ь заблокирована из-за большого количе�тва неудачных попыток входа. Запи�ь будет разблокирована админи�тратором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>bruteforce_account_unlock</word_key>
+      <word_default>Your account will automatically be unlocked in %s minutes</word_default>
+      <word_custom>Ваша учетна� запи�ь заблокирована на %s минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>wrong_openid</word_key>
+      <word_default>We could not verify your identity through OpenID.  Please try again, or choose another login method.</word_default>
+      <word_custom>Мы не �могли подтвердить ваш аккаунт через OpenID. Попробуйте еще раз или во�пользуйте�ь другим �по�обом авторизации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>wrong_auth</word_key>
+      <word_default>Username or password incorrect.</word_default>
+      <word_custom>Логин или пароль неверны.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>email_log_in</word_key>
+      <word_default>Your email address change has been approved, returning you to the community index</word_default>
+      <word_custom>E-mail адре� у�пешно изменен. Переходим к �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>reg_not_log_in</word_key>
+      <word_default>You are now registered, taking you to the sign in form</word_default>
+      <word_custom>Вы у�пешно зареги�трировали�ь. Переходим на �траницу авторизации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>reg_log_in</word_key>
+      <word_default>You are now registered and signed in, returning you to the community index</word_default>
+      <word_custom>Вы зареги�трированы и авторизованы. Переходим к �пи�ку форумов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>not_logged_in</word_key>
+      <word_default>You are not signed in, taking you to the sign in form</word_default>
+      <word_custom>Вы не авторизованы. Переходим на �траницу авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>logged_in</word_key>
+      <word_default>You are signed in, returning you to the community index</word_default>
+      <word_custom>Вы вошли. Переходим к �пи�ку форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>missing_extensions</word_key>
+      <word_default>An extension required to process this request is missing.  Please notify the administrator.</word_default>
+      <word_custom>Ра�ширение, требуемое дл� работы модул� авторизации от�ут�вует. Пожалуй�та, уведомите об �том админи�тратора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>admin_force_log_in</word_key>
+      <word_default>The community administrator requires all members to sign in</word_default>
+      <word_custom>�дмини�траци� форума запретила про�мотр форума го�т�м. �еобходимо авторизовать�� на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>enter_username</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>please_log_in</word_key>
+      <word_default>Please enter your details below to sign in</word_default>
+      <word_custom>Введите ваши данные дл� авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>pass_not_log_in</word_key>
+      <word_default>Your password change has been approved, taking you to the sign in form</word_default>
+      <word_custom>Пароль у�пешно изменен. Переходим на �траницу авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>pass_log_in</word_key>
+      <word_default>Your password change has been approved, returning you to the community index</word_default>
+      <word_custom>Пароль у�пешно изменен. Переходим к �пи�ку форумов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>email_not_log_in</word_key>
+      <word_default>Your email address change has been approved, taking you to the sign in form</word_default>
+      <word_custom>E-mail адре� у�пешно изменен. Переходим на �траницу авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>enter_name_and_pass</word_key>
+      <word_default>Enter your sign in name and password</word_default>
+      <word_custom>Введите ваши им� пользовател� и пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>enter_useremail</word_key>
+      <word_default>Email address:</word_default>
+      <word_custom>E-mail адре�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>thanks_for_logout</word_key>
+      <word_default>You are now signed out</word_default>
+      <word_custom>Вы вышли</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>enter_name_and_email</word_key>
+      <word_default>Username or email:</word_default>
+      <word_custom>Им� пользовател� или e-mail адре�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>enter_pass</word_key>
+      <word_default>Password</word_default>
       <word_custom>Пароль:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_login</word_pack>
-      <word_key>fb_link_complete</word_key>
-      <word_default>Link and complete log in</word_default>
-      <word_custom>Св�зать и войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sign_in_here</word_key>
+      <word_default>Sign in here</word_default>
+      <word_custom>Вход зде�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>have_openid</word_key>
+      <word_default>Sign in with OpenID</word_default>
+      <word_custom>Е�ть OpenID?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>use_openid</word_key>
+      <word_default>Use OpenID</word_default>
+      <word_custom>И�пользовать OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>sign_in_openid</word_key>
+      <word_default>Sign in with OpenID</word_default>
+      <word_custom>Войти � и�пользованием OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>use_live</word_key>
+      <word_default>Use Windows Live</word_default>
+      <word_custom>И�пользовать Windows Live</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>sign_in_options</word_key>
+      <word_default>Sign in options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>notrecommended</word_key>
+      <word_default>This is not recommended for shared computers</word_default>
+      <word_custom>�е включайте, е�ли и�пользуете общедо�тупный компьютер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>rememberme</word_key>
+      <word_default>Remember me</word_default>
+      <word_custom>Запомнить мен�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>form_invisible</word_key>
+      <word_default>Sign in anonymously</word_default>
+      <word_custom>Скрытно�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>anon_name</word_key>
+      <word_default><![CDATA[Don't add me to the active users list]]></word_default>
+      <word_custom>�е отображать мен� в �пи�ке активных пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>regular_signin</word_key>
+      <word_default>Regular sign in</word_default>
+      <word_custom>Обычный вход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>openid_example</word_key>
+      <word_default>Example: http://username.myprovider.com</word_default>
+      <word_custom>�апример: http://username.ya.ru</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>openid</word_key>
+      <word_default>OpenID:</word_default>
+      <word_custom>OpenID: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>signin_with_live</word_key>
+      <word_default>Click here to sign in using Windows Live</word_default>
+      <word_custom>�ажмите зде�ь чтобы войти под учетной запи�ью Windows Live</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>sign_in_winlive</word_key>
+      <word_default>Sign in with Windows Live</word_default>
+      <word_custom>Войти � и�пользованием Windows Live</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>have_msnlive</word_key>
+      <word_default>Sign in with Windows Live?</word_default>
+      <word_custom>Е�ть Windows Live?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10855,9 +11589,111 @@ The <#BOARD_NAME#> team.
       <word_key>fb_complete_login</word_key>
       <word_default>Complete log in</word_default>
       <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>use_regular</word_key>
+      <word_default>Use regular sign in</word_default>
+      <word_custom>И�пользовать обычный вход</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_link_complete</word_key>
+      <word_default>Link and complete log in</word_default>
+      <word_custom>Св�зать и войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_link_email</word_key>
+      <word_default>Email:</word_default>
+      <word_custom>E-mail:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_link_pass</word_key>
+      <word_default>Pass:</word_default>
+      <word_custom>Пароль:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_link_account</word_key>
+      <word_default>link to an existing account</word_default>
+      <word_custom>�в�зать � �уще�твующей учетной запи�ью</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_new_account</word_key>
+      <word_default>Complete log in with new account</word_default>
+      <word_custom>Войти � �озданием новой учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_no_forum_acct</word_key>
+      <word_default>We could not locate a linked forum account:</word_default>
+      <word_custom>Си�тема не �могла найти �в�занную учетную запи�ь:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_logged_in</word_key>
+      <word_default>You are logged into Facebook.</word_default>
+      <word_custom>Вы вошли в Facebook.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>welcome_prefix</word_key>
+      <word_default>Welcome,</word_default>
+      <word_custom>Здрав�твуйте,</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>fb_login_title</word_key>
+      <word_default>Facebook Sign In</word_default>
+      <word_custom>Вход � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>login_w_facebook</word_key>
+      <word_default>Sign in with your Facebook account</word_default>
+      <word_custom>Вход � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>login_forgotten_pass</word_key>
+      <word_default><![CDATA[I've forgotten my password]]></word_default>
+      <word_custom>Я забыл �вой пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>sign_in_button</word_key>
+      <word_default>Sign In</word_default>
+      <word_custom>Войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>not_a_member</word_key>
+      <word_default>Not a member?</word_default>
+      <word_custom>Еще не зареги�трированы? </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_login</word_pack>
+      <word_key>log_in</word_key>
+      <word_default>Sign In</word_default>
+      <word_custom>Вход</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10865,9 +11701,6 @@ The <#BOARD_NAME#> team.
       <word_key>vk_login_title</word_key>
       <word_default>Вход через Вконтакте</word_default>
       <word_custom>Вход через Вконтакте</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10875,9 +11708,6 @@ The <#BOARD_NAME#> team.
       <word_key>login_w_vkontakte</word_key>
       <word_default>Вход � и�пользованием Вконтакте</word_default>
       <word_custom>Вход � и�пользованием Вконтакте</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10885,9 +11715,6 @@ The <#BOARD_NAME#> team.
       <word_key>vk_complete_login</word_key>
       <word_default>Войти на форум</word_default>
       <word_custom>Войти на форум</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10895,9 +11722,6 @@ The <#BOARD_NAME#> team.
       <word_key>vk_logout</word_key>
       <word_default>Выйти из Вконтакте</word_default>
       <word_custom>Выйти из Вконтакте</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -10905,229 +11729,2680 @@ The <#BOARD_NAME#> team.
       <word_key>vk_logged_in</word_key>
       <word_default>Вы вошли в Вконтакте</word_default>
       <word_custom>Вы вошли в Вконтакте</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>nav_reg</word_key>
-      <word_default>Registration</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>go_back_general</word_key>
+      <word_default>Go back to %s</word_default>
+      <word_custom>�азад к %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>auth_text</word_key>
-      <word_default><![CDATA[Your registration has been submitted.<br /><br />The board administrator has chosen to require validation for all email addresses. Within the next 10 minutes (usually instantly) you'll receive an email with instructions on the next step. Don't worry, it won't take long before you can post!<br /><br />The email has been sent to]]></word_default>
-      <word_custom><![CDATA[Ваша реги�траци� завершена.<br /><br />�дмини�траци� форума требует подтверждени� в�ех e-mail адре�ов. В �ледующие 10 минут (обычно мгновенно) вы получите пи�ьмо � ин�трукци�ми по активации вашей учетной запи�и. Следуйте в�ем ин�трукци�м в пи�ьме и вы �можете во�пользовать�� в�еми возможно�т�ми форума уже через не�колько минут! <br /><br />Пи�ьмо было вы�лано на адре� ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>go_back_profile</word_key>
+      <word_default><![CDATA[Go back to %s's profile]]></word_default>
+      <word_custom>�азад к профилю %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>agree_submit</word_key>
-      <word_default>I have read, understood and agree to these rules and conditions</word_default>
-      <word_custom>Я ознакомил�� � правилами и у�лови�ми, и принимаю их.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>moved_topic_link</word_key>
+      <word_default>Moved topic link:</word_default>
+      <word_custom>С�ылка на перемещенную тему:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>std_text</word_key>
-      <word_default>Please ensure that you complete all the fields fully, taking particular care over the password fields.</word_default>
-      <word_custom>Пожалуй�та убедите�ь, что в�е пол� формы заполнены. О�обенно тщательно проверьте пол� паролей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>intro_blurb</word_key>
+      <word_default>This control panel allows quick access to common moderator functions, logs and tools.  Select an option from the menu on the left to continue.</word_default>
+      <word_custom>Это контрольна� панель, котора� позвол�ет иметь бы�трый до�туп к о�новным функци�м и утилитам дл� модератора. Щелкните на пункт в левом меню дл� выбора нужной функции.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_success</word_key>
-      <word_default>Registration Successful</word_default>
-      <word_custom>Реги�траци� завершена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>go_back_modcp</word_key>
+      <word_default>Go back to ModCP</word_default>
+      <word_custom>�азад в мод. панель</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>thank_you</word_key>
-      <word_default>Thank you</word_default>
-      <word_custom>Спа�ибо,</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>starttypeingmember</word_key>
+      <word_default>Start typing a name to find matching members</word_default>
+      <word_custom>�ачните набирать им� в поле дл� автоматиче�кого пои�ка имени</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>registration_process</word_key>
-      <word_default>Registration Process</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>no_deleted_posts</word_key>
+      <word_default>There are no deleted posts to view</word_default>
+      <word_custom>Удаленных �ообщений дл� про�мотра нет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>preview_reg_text</word_key>
-      <word_default>Your registration has been successful. The administrator wishes to preview all new registered accounts before posting permissions are granted. The administrator has been notified of your registration.</word_default>
-      <word_custom>Ваша реги�траци� завершена. �дмини�траци� форума провер�ет в�е новые учетные запи�и, перед предо�тавлением полного до�тупа к форуму. �дмини�тратор уже оповещен о вашей реги�трации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>perm_delete_post</word_key>
+      <word_default>Permanently delete</word_default>
+      <word_custom>Полно�тью удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>dumb_text</word_key>
-      <word_default>Please ensure that you complete the form fully. The information you need will be in the email that was sent to you.</word_default>
-      <word_custom>Пожалуй�та убедите�ь, что в�е пол� формы заполнены. В�� необходима� информаци� будет вы�лана пи�ьмом на ваш e-mail адре�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>restore_post</word_key>
+      <word_default>Restore</word_default>
+      <word_custom>Во��тановить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>email_validate_text</word_key>
-      <word_default>You will be sent an email to the email address you give after registering. Please read the email carefully, you will need to validate your account by clicking on a link in the email.</word_default>
-      <word_custom>Вам будет вы�лан e-mail на адре� указанный при реги�трации. Пожалуй�та внимательно ознакомьте�ь � ним, вам необходимо будет про�ледовать по ��ылке в пи�ьме, чтобы активировать вашу учетную запи�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>restore_post_desc</word_key>
+      <word_default>Restore this post to its original topic location</word_default>
+      <word_custom>Во��тановить �то �ообщение в оригинальной теме</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>registration_form</word_key>
-      <word_default>Registration Form</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>no_unapproved_posts</word_key>
+      <word_default>There are no unapproved posts to view</word_default>
+      <word_custom>Сообщений дл� премодерации нет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>activation_form</word_key>
-      <word_default>Activation Form</word_default>
-      <word_custom>Форма активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>original_post_date</word_key>
+      <word_default>Original post</word_default>
+      <word_custom>Оригинальное �ообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_subject</word_key>
-      <word_default>Password recovery information from</word_default>
-      <word_custom>Информаци� о во��тановлении парол� �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>perm_delete_post_desc</word_key>
+      <word_default>Permanently remove this post from the database</word_default>
+      <word_custom>Полно�тью удалить�� �то �ообщение из базы данных</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_email_or</word_key>
-      <word_default>OR Enter your email address</word_default>
-      <word_custom>ИЛИ ваш e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>deleted_post_date</word_key>
+      <word_default>Deleted</word_default>
+      <word_custom>Удалено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_send</word_key>
-      <word_default>Proceed</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>delete_from_topic</word_key>
+      <word_default>From topic</word_default>
+      <word_custom>Из темы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_user_name</word_key>
-      <word_default>Enter your account username</word_default>
-      <word_custom>Введите ваш логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>go_to_topic</word_key>
+      <word_default>Go to this topic</word_default>
+      <word_custom>Перейти к �той теме</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cpf_phone</word_key>
-      <word_default>Phone Number</word_default>
-      <word_custom>�омер телефона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>in_topic</word_key>
+      <word_default>In topic</word_default>
+      <word_custom>в тему</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cpf_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>perm_delete_topic</word_key>
+      <word_default>Permanently delete</word_default>
+      <word_custom>Полно�тью удалить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lost_pass_form</word_key>
-      <word_default>Lost Password Form</word_default>
-      <word_custom>Во��тановление парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>restore_topic</word_key>
+      <word_default>Restore</word_default>
+      <word_custom>Во��тановить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cpf_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>perm_delete_topic_desc</word_key>
+      <word_default>Permanently delete this topic from the database</word_default>
+      <word_custom>Полно�тью удалить�� �та тема из базы данных</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cpf_relation</word_key>
-      <word_default>Relation to child</word_default>
-      <word_custom>Отношение к ребенку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_modcp</word_pack>
+      <word_key>restore_topic_desc</word_key>
+      <word_default>Restore this topic to its original forum</word_default>
+      <word_custom>Во��тановить �ту тему в оригинальном разделе форума</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cpf_signature</word_key>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Опубликовано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_inforum</word_key>
+      <word_default>In forum</word_default>
+      <word_custom>В форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_deletedby</word_key>
+      <word_default>Deleted by</word_default>
+      <word_custom>Удалил</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_startedby</word_key>
+      <word_default>Started by</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_link_from</word_key>
+      <word_default>Link deleted from</word_default>
+      <word_custom>С�ылка удалена из</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_reason</word_key>
+      <word_default>Reason</word_default>
+      <word_custom>Причина</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_navbar</word_key>
+      <word_default>Moderator Control Panel</word_default>
+      <word_custom>Панель модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>dlt_topic_link_to</word_key>
+      <word_default>Original topic in</word_default>
+      <word_custom>Оригинальна� тема в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_page_title</word_key>
+      <word_default>Moderator Control Panel</word_default>
+      <word_custom>Панель модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_warnby</word_key>
+      <word_default>Warned by</word_default>
+      <word_custom>Предупреждение от</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__no_recent</word_key>
+      <word_default>No recent warnings found</word_default>
+      <word_custom>По�ледних предупреждений не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__block_title</word_key>
+      <word_default>Recent Warnings</word_default>
+      <word_custom>По�ледние предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_minus</word_key>
+      <word_default>Removed from warn level</word_default>
+      <word_custom>Уменьшен уровень предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_none</word_key>
+      <word_default>There are no saved notes for this member</word_default>
+      <word_custom>Сохраненных заметок дл� �того пользовател� нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_notes</word_key>
+      <word_default>Notes</word_default>
+      <word_custom>Заметки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_add</word_key>
+      <word_default>Added to warn level</word_default>
+      <word_custom>Увеличен уровень предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_warned_on</word_key>
+      <word_default>Warned on</word_default>
+      <word_custom>Предупрежден о</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>mod_warn_added</word_key>
+      <word_default>Note Added</word_default>
+      <word_custom>Заметка добавлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_nochan</word_key>
+      <word_default>No change to warn level</word_default>
+      <word_custom>Уровень предупреждений не изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>mod_warn_note</word_key>
+      <word_default>Warn Level Unchanged</word_default>
+      <word_custom>Уровень предупреждений о�тал�� без изменений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_warnto</word_key>
+      <word_default>Member Warned</word_default>
+      <word_custom>Пользователь предупрежден</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_custom</word_key>
+      <word_default>Custom Warning</word_default>
+      <word_custom>Отдельно предупреждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__deltopics_title</word_key>
+      <word_default>Recent Topic Deletions</word_default>
+      <word_custom>По�ледние удалени� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__reports_title</word_key>
+      <word_default>Active Reports</word_default>
+      <word_custom>�ктивные жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_em_title</word_key>
+      <word_default>Editing Member</word_default>
+      <word_custom>Редактирование пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_vp_title</word_key>
+      <word_default><![CDATA[%s's Profile]]></word_default>
+      <word_custom>Профиль %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_em_sub_main</word_key>
+      <word_default>Main Member Information</word_default>
+      <word_custom>О�новна� информаци� о пользователе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_em_sub_other</word_key>
+      <word_default>Other Member Information</word_default>
+      <word_custom>Дополнительна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__delposts_title</word_key>
+      <word_default>Recent Post Deletions</word_default>
+      <word_custom>По�ледние удалени� �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__unappposts_title</word_key>
+      <word_default>Posts Pending Approval</word_default>
+      <word_custom>Сообщени�, ждущие проверки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__unapptopics_title</word_key>
+      <word_default>Topics Pending Approval</word_default>
+      <word_custom>Темы, ждущие проверки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_edit_signature</word_key>
       <word_default>Signature</word_default>
       <word_custom>Подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_edit_aboutme</word_key>
+      <word_default>About Me</word_default>
+      <word_custom>Обо мне</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_remove_photo</word_key>
+      <word_default>Remove photo?</word_default>
+      <word_custom>Удалить фото?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_em_submit</word_key>
+      <word_default>Edit Member</word_default>
+      <word_custom>Редактировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>edit_user_images</word_key>
+      <word_default>User Images</word_default>
+      <word_custom>Изображени� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>edit_user_profile</word_key>
+      <word_default>Profile Fields</word_default>
+      <word_custom>Пол� профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>edit_user_title</word_key>
+      <word_default>Member Title</word_default>
+      <word_custom>Звание пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>edit_user_status</word_key>
+      <word_default>Member Status</word_default>
+      <word_custom>Стату� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>flag_spam_done</word_key>
+      <word_default>User Flagged As Spam Account</word_default>
+      <word_custom>Пользователь отмечен, как �памер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>acp_edited_profile</word_key>
+      <word_default>Edited Profile for:</word_default>
+      <word_custom>Отредактирован профиль у:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>plugin_not_found</word_key>
+      <word_default>We could not find the tab you requested.</word_default>
+      <word_custom>Си�тема не может найти �траницу, которую вы запро�или.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>start_typing_lup</word_key>
+      <word_default>Start typing...</word_default>
+      <word_custom>Введите им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>memberlookup_title</word_key>
+      <word_default>Member Lookup</word_default>
+      <word_custom>Редактирование пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>memberlookup_desc</word_key>
+      <word_default>Look up a member to moderate</word_default>
+      <word_custom>Пои�к пользовател� дл� модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warnpanel_tab</word_key>
+      <word_default>Warn Panel</word_default>
+      <word_custom>Панель предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warnlog_tab</word_key>
+      <word_default>Warn Logs</word_default>
+      <word_custom>Журнал предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>editmember_tab</word_key>
+      <word_default>Edit Member</word_default>
+      <word_custom>Изменить пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>addnote_tab</word_key>
+      <word_default>Add Note</word_default>
+      <word_custom>Добавить заметку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>new_note_added</word_key>
+      <word_default>A new note has been added for %s</word_default>
+      <word_custom>�ова� заметка у�пешно добавлена дл� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modqueued_til</word_key>
+      <word_default>Restriction Ends</word_default>
+      <word_custom>Ограничение заканчивает��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__modposts_title</word_key>
+      <word_default>Mod-Queued Members</word_default>
+      <word_custom>Пользователи на премодерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_modq_indef</word_key>
+      <word_default>Indefinitely</word_default>
+      <word_custom>�ав�егда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__restrictposts_title</word_key>
+      <word_default>Members on Post Restriction</word_default>
+      <word_custom>Пользователи � запретом на публикацию �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__suspended_title</word_key>
+      <word_default>Suspended Members</word_default>
+      <word_custom>Временно заблокированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__banned_title</word_key>
+      <word_default>Banned Members</word_default>
+      <word_custom>Заблокированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_edit_user</word_key>
+      <word_default>Member Look-up</word_default>
+      <word_custom>Проверка пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_find_user</word_key>
+      <word_default>Enter part, or all of the username you wish to edit</word_default>
+      <word_custom>Введите ча�ть или полно�тью им� пользовател�, которого вы хотите редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_find_submit</word_key>
+      <word_default>Find user</word_default>
+      <word_custom>�айти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipp_found</word_key>
+      <word_default>Your search returned (at least) the following number of matching posts:</word_default>
+      <word_custom>Ваш пои�ковый запро� выдал как минимум �ледующее количе�тво подход�щих �ообщений:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_warn_text</word_key>
+      <word_default><![CDATA[<b>Please Note</b>: You may enter a wildcard '*' (without quotes) as the last part of the IP address.<br />For example, 127.*.*.* will match all IP address that start with 127.<br />127.1.0.* will match all IP addresses that start with 127.1.0.<br />An error will occur if you attempt to use a wildcard in the middle of the IP address. For example, 127.*.0.1 will return an error.]]></word_default>
+      <word_custom><![CDATA[<b>Внимание</b>: Вы можете и�пользовать �имвол '*' (без кавычек) в любой ча�ти IP-адре�а.<br />�апример, 127.*.*.* будет провер�ть по в�ем IP, которые начинают�� � 127.<br /> 127.1.0.* будет провер�ть по в�ем начинающим�� � 127.1.0.<br />Е�ли вы и�пользуете * в �ередине IP-адре�а, то �и�тема не �может прове�ти пои�к. �апример, 127.*.0.1 вернет ошибку.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_desc_text</word_key>
+      <word_default><![CDATA[<strong>Resolve IP Address</strong>: This option will allow you to look up an IP address for more information (note, you must enter all 4 parts of the IP address to use this tool)<br /><strong>Find Posts with this IP</strong>: This option will run a search for all posts associated with this IP address (limited to 500 results)<br /><strong>Find members who registered with this IP</strong>: This tool will run a seach for all members who registered with the entered IP address]]></word_default>
+      <word_custom><![CDATA[<strong>Информаци�</strong>: Эта опци� позвол�ет получить информацию IP-адре�у (нужно вводить IP-адре� полно�тью)<br /><strong>�айти �ообщени�</strong>: Эта опци� позвол�ет найти в�е �ообщени�, напи�анные � введенного IP-адре�а (результат ограничен 500ами)<br /><strong>�айти пользователей</strong>: Эта опци� позвол�ет показать в�ех пользователей, которые реги�трировали�ь � �тим IP-адре�ом]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_reg</word_key>
+      <word_default>Date Registered</word_default>
+      <word_custom>Зареги�трирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP-адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_title</word_key>
+      <word_default>Member Search Results</word_default>
+      <word_custom>Результаты пои�ка пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_members</word_key>
+      <word_default>Find Members</word_default>
+      <word_custom>�айти пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_posts</word_key>
+      <word_default>Find Posts</word_default>
+      <word_custom>�айти �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_resolve</word_key>
+      <word_default>Resolve</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>cp_no_matches</word_key>
+      <word_default>There was no data returned from your search input, please try again</word_default>
+      <word_custom>�ет данных по введенным критери�м пои�ка, попробуйте еще раз</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_resolve_result</word_key>
+      <word_default><![CDATA[The host name for %s is <b>%s</b><br /><br />Try visiting <a href='http://nic.com/cgi-bin/whois' target='_blank'>nic.com</a> to get more information by running this match via WHOIS.]]></word_default>
+      <word_custom><![CDATA[Им� хо�та дл� %s - <b>%s</b><br /><br />Вы можете зайти на <a href='https://www.nic.ru/whois/?wi=1' target='_blank'>RU-CENTER</a> дл� получени� большей информации по нужному вам IP.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_submit</word_key>
+      <word_default>Run Tool</word_default>
+      <word_custom>Запу�тить утилиту</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ip_enter</word_key>
+      <word_default><![CDATA[<b>Enter the IP address</b>]]></word_default>
+      <word_custom><![CDATA[<b>Введите IP-адре�</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>menu_memsearch</word_key>
+      <word_default>Member Look-up Tool</word_default>
+      <word_custom>Утилита управлени� пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>menu_ipsearch</word_key>
+      <word_default>IP Address Look-up Tool</word_default>
+      <word_custom>Утилита проверки IP-адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ipm_edit</word_key>
+      <word_default>Edit Member</word_default>
+      <word_custom>Редактировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn__iptools_title</word_key>
+      <word_default>IP Address Tools</word_default>
+      <word_custom>Утилиты IP-адре�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announcement_deleted</word_key>
+      <word_default>The announcement has been deleted</word_default>
+      <word_custom>Объ�вление у�пешно удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_page_disabled</word_key>
+      <word_default>(Not Active)</word_default>
+      <word_custom>(�е активно)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modip_viewposts</word_key>
+      <word_default>View post</word_default>
+      <word_custom>Про�мотр �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_del2</word_key>
+      <word_default>Ok, no action taken!</word_default>
+      <word_custom>Ок, дей�твие отменено!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_del1</word_key>
+      <word_default>Are you sure you wish to delete this announcement?</word_default>
+      <word_custom>Вы дей�твительно хотите удалить объ�вление?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_error_date</word_key>
+      <word_default>The start or end date is not a real date, please check the dates entered.</word_default>
+      <word_custom>�ачальна� или конечна� дата нереальна, пожалуй�та, проверьте введенные даты.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_error_title</word_key>
+      <word_default>You must enter a title and content for this announcement.</word_default>
+      <word_custom>Вы должны вве�ти заголовок и �одержание объ�влени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>Заголовок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_error_forums</word_key>
+      <word_default>You must choose at least one forum for this announcement.</word_default>
+      <word_custom>Вы об�заны выбрать хот� бы один раздел форума дл� отображени� объ�влени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_end</word_key>
+      <word_default>End Date</word_default>
+      <word_custom>Дата окончани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_author</word_key>
+      <word_default>Author</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_starts</word_key>
+      <word_default>Starts</word_default>
+      <word_custom>�ачинает��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_current</word_key>
+      <word_default>Current Announcements</word_default>
+      <word_custom>Текущие объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_add</word_key>
+      <word_default>Add Announcement</word_default>
+      <word_custom>Добавить объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_none</word_key>
+      <word_default>There are no announcements</word_default>
+      <word_custom>Объ�влений нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_button_edit</word_key>
+      <word_default>Edit Announcement</word_default>
+      <word_custom>Редактировать объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_title</word_key>
+      <word_default>Announcement Title</word_default>
+      <word_custom>Заголовок объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_announce</word_key>
+      <word_default>Announcement Post</word_default>
+      <word_custom>Содержание объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>menu_announcements</word_key>
+      <word_default>Manage Announcements</word_default>
+      <word_custom>Управление объ�влени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_enable</word_key>
+      <word_default>Enable this announcement</word_default>
+      <word_custom>Включить �то объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_page_allforums</word_key>
+      <word_default>All Forums</word_default>
+      <word_custom>В�е форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_use_nlbr</word_key>
+      <word_default>Parse newlines (if HTML enabled)?</word_default>
+      <word_custom>Обрабатывать переводы �трок (е�ли HTML включен)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_use_html</word_key>
+      <word_default>Enable HTML?</word_default>
+      <word_custom>Включить HTML?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_allforums</word_key>
+      <word_default>-- All Forums --</word_default>
+      <word_custom>-- В�е форумы --</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_forums2</word_key>
+      <word_default>You may choose more than one</word_default>
+      <word_custom>Вы можете выбрать больше одного</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_forums</word_key>
+      <word_default>Activate in Forums</word_default>
+      <word_custom>�ктивировать в форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_enddesc</word_key>
+      <word_default>Leave blank to not use an end date</word_default>
+      <word_custom>О�тавьте пу�тым, е�ли не хотите и�пользовать дату окончани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_startdesc</word_key>
+      <word_default>Leave blank to not use a start date</word_default>
+      <word_custom>О�тавьте пу�тым, е�ли не хотите и�пользовать начальную дату</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_date</word_key>
+      <word_default>(MM-DD-YYYY)</word_default>
+      <word_custom>(ММ-ДД-ГГГГ)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_form_start</word_key>
+      <word_default>Start Date</word_default>
+      <word_custom>�ачальна� дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>ucp_announcements</word_key>
+      <word_default>Announcements</word_default>
+      <word_custom>Объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Редактировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>view_rc_index</word_key>
+      <word_default><![CDATA[Visit Report Center &raquo;]]></word_default>
+      <word_custom><![CDATA[По�етить центр жалоб &raquo;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announcement_saved</word_key>
+      <word_default>The announcement has been successfully saved</word_default>
+      <word_custom>Объ�вление у�пешно �охранено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_details</word_key>
+      <word_default>Warn Details</word_default>
+      <word_custom>Детали предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_rep</word_key>
+      <word_default>Reputation:</word_default>
+      <word_custom>Репутаци�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_posts_topics</word_key>
+      <word_default><![CDATA[Member's Posts and Topics]]></word_default>
+      <word_custom>Сообщени� и темы пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_current_level</word_key>
+      <word_default>Current Level:</word_default>
+      <word_custom>Текущий уровень:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_mem_content</word_key>
+      <word_default>Member Content</word_default>
+      <word_custom>Контент пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>member_suspension</word_key>
+      <word_default>Member Suspension</word_default>
+      <word_custom>Блокировка пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_stuff_unapprove</word_key>
+      <word_default>Un-approve</word_default>
+      <word_custom>Отклонить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_stuff_approve</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Опубликовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_stuff_alltopics</word_key>
+      <word_default><![CDATA[All member's topics]]></word_default>
+      <word_custom>В�е темы пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_contact_member</word_key>
+      <word_default>Contact Member</word_default>
+      <word_custom>Св�зать�� � пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_change_custom</word_key>
+      <word_default>Enter Custom Level (Max: %s)</word_default>
+      <word_custom>Введите уровень вручную (max: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_suspend_or</word_key>
+      <word_default>or suspend for</word_default>
+      <word_custom>или от�транить до</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_ban_indef</word_key>
+      <word_default>Ban indefinitely</word_default>
+      <word_custom>Бан нав�егда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_suspend</word_key>
+      <word_default><![CDATA[Ban / Suspend member's account]]></word_default>
+      <word_custom>Заблокировать / От�транить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_nochange</word_key>
+      <word_default>Do Not Change Warning Level</word_default>
+      <word_custom>�е измен�ть уровень предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>mod_warn_fieldset</word_key>
+      <word_default>New Note Contents</word_default>
+      <word_custom>Содержание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>mod_warn_new_note</word_key>
+      <word_default>Add a new note for</word_default>
+      <word_custom>Добавление новой заметки пользователю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>mod_warn_note_save</word_key>
+      <word_default>Save Note</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_logs_for</word_key>
+      <word_default>Warn Panel For</word_default>
+      <word_custom>Панель предупреждений пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_member_details</word_key>
+      <word_default>Member Details</word_default>
+      <word_custom>Детали пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_popup_title</word_key>
+      <word_default>Warn Logs</word_default>
+      <word_custom>Журнал предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_v_title</word_key>
+      <word_default>Saved warn logs</word_default>
+      <word_custom>Журнал �охраненных предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_stuff_datecutoff</word_key>
+      <word_default>made within the last</word_default>
+      <word_custom>�делано в течение по�ледних</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>warn_stuff_allposts</word_key>
+      <word_default><![CDATA[All member's replies]]></word_default>
+      <word_custom>В�е ответы пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_remove</word_key>
+      <word_default>Decrease Warning Level By One Point</word_default>
+      <word_custom>Уменьшить уровень предупреждений на 1 пункт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_add</word_key>
+      <word_default>Increase Warning Level By One Point</word_default>
+      <word_custom>Увеличить уровень на 1 пункт</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_done_t</word_key>
+      <word_default>Warn Adjustment Result</word_default>
+      <word_custom>Результат предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_done_home</word_key>
+      <word_default>Go back to the forum home</word_default>
+      <word_custom>�азад на главную форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_done_forum</word_key>
+      <word_default>Go back to forum</word_default>
+      <word_custom>�азад на форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_done_te</word_key>
+      <word_default><![CDATA[%s's warning level has been adjusted successfully and the action logged.]]></word_default>
+      <word_custom>Уровень предупреждений пользовател� %s у�пешно изменен и и�тори� операции �охранена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_done_topic</word_key>
+      <word_default>Go back to topic</word_default>
+      <word_custom>�азад в тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_restricted</word_key>
+      <word_default>Restriction in progress, the remaining time has been recalculated</word_default>
+      <word_custom>Ограничение дей�твует, о�тавшее�� врем� пере�читывает��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_title</word_key>
+      <word_default>Member Warning Center</word_default>
+      <word_custom>Центр предупреждений пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>we_no_subject</word_key>
+      <word_default>You must enter a PM / Email subject</word_default>
+      <word_custom>Вы должны вве�ти тему личного �ообщени�/пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>we_no_reason</word_key>
+      <word_default>You must enter a reason for this warn adjustment in the relevant section below</word_default>
+      <word_custom>Вы об�заны вве�ти причину дл� �того предупреждени� в нужном поле ниже</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_warnfor</word_key>
+      <word_default>Member Warning Panel for</word_default>
+      <word_custom>Панель предупреждений дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_complete</word_key>
+      <word_default>Please complete the form below fully</word_default>
+      <word_custom>Пожалуй�та, полно�тью заполните форму</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_adjust_level</word_key>
+      <word_default><![CDATA[Adjust member's warn level]]></word_default>
+      <word_custom>Изменение уровн� предупреждений пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_modq</word_key>
+      <word_default>Enforce moderator preview of all new posts?</word_default>
+      <word_custom>Требовать проверку модераторов в�ех новых �ообщений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_modq_i</word_key>
+      <word_default>Moderator preview indefinitely</word_default>
+      <word_custom>Проверка модератором нав�егда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_day</word_key>
+      <word_default>Days</word_default>
+      <word_custom>Дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_resposts_i</word_key>
+      <word_default>Disable indefinitely</word_default>
+      <word_custom>Отключить нав�егда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_orfor</word_key>
+      <word_default>or for</word_default>
+      <word_custom>или дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_susfor</word_key>
+      <word_default>Suspend for</word_default>
+      <word_custom>От�транить до</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_reason</word_key>
+      <word_default>Reason for this warn adjustment</word_default>
+      <word_custom>Причина изменени� �того предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_hour</word_key>
+      <word_default>Hours</word_default>
+      <word_custom>Ча�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_resposts</word_key>
+      <word_default>Disable this members posting ability</word_default>
+      <word_custom>Отключить �тим пользовател�м возможно�ть пи�ать публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_c</word_key>
+      <word_default>Method</word_default>
+      <word_custom>Метод</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_contact</word_key>
+      <word_default>Send message to member</word_default>
+      <word_custom>Отправка �ообщени� пользователю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_reason2</word_key>
+      <word_default>This section must be completed</word_default>
+      <word_custom>Это поле должно быть заполнено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_c_e</word_key>
+      <word_default>Email</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_c_p</word_key>
+      <word_default>PM</word_default>
+      <word_custom>ЛС</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_c_subj</word_key>
+      <word_default>Email / PM Subject</word_default>
+      <word_custom>Тема �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_submit</word_key>
+      <word_default>Alter Warn Level</word_default>
+      <word_custom>Применить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>w_contact2</word_key>
+      <word_default>Leave blank to not contact the member</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы не отправл�ть �ообщение пользователю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>view_dname_history</word_key>
+      <word_default>View display name history</word_default>
+      <word_custom>Про�мотр и�тории отображаемых имен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>display_history</word_key>
+      <word_default>Display name history</word_default>
+      <word_custom>И�тори� отображаемых имен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_no_access</word_key>
+      <word_default>You do not have access to the moderator control panel.</word_default>
+      <word_custom>Вы не имеете до�тупа к панели модератора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_approvelink</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Опубликовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_announcements</word_key>
+      <word_default>Announcements</word_default>
+      <word_custom>Объ�влени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_reported_content</word_key>
+      <word_default>Reported Content</word_default>
+      <word_custom>Публикации � жалобами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_index</word_key>
+      <word_default>Index</word_default>
+      <word_custom>Главна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_deletelink</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_unapproved_content</word_key>
+      <word_default>Unapproved Content</word_default>
+      <word_custom>�епроверенный контент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_reports</word_key>
+      <word_default>Report Center</word_default>
+      <word_custom>Си�тема жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_deleted_content</word_key>
+      <word_default>Deleted Content</word_default>
+      <word_custom>Удаленные публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_deletedposts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_unapprovedposts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_deletedtopics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_ip_tools</word_key>
+      <word_default>IP Address Tools</word_default>
+      <word_custom>Утилиты IP-адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_index</word_key>
+      <word_default>Index</word_default>
+      <word_custom>Главна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_mtab_manage_members</word_key>
+      <word_default>Manage Members</word_default>
+      <word_custom>Управление пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_unapprovedtopics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_modposts</word_key>
+      <word_default>Mod-Queued Members</word_default>
+      <word_custom>Ждущие проверки пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_warn</word_key>
+      <word_default>Recent Warnings</word_default>
+      <word_custom>По�ледние предупреждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_restrictposts</word_key>
+      <word_default>Post-Restricted Members</word_default>
+      <word_custom>Пользователи � запретом пи�ать �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_suspended</word_key>
+      <word_default>Suspended Members</word_default>
+      <word_custom>Временно заблокированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_banned</word_key>
+      <word_default>Banned Members</word_default>
+      <word_custom>Заблокированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_iplookup</word_key>
+      <word_default>IP Lookup</word_default>
+      <word_custom>Проверка IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_tab_announcements</word_key>
+      <word_default>Manage Announcements</word_default>
+      <word_custom>Управление объ�влени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>no_unapproved_topics</word_key>
+      <word_default>There are no unapproved topics to view</word_default>
+      <word_custom>Тем дл� премодерации нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>modcp_editing_h1</word_key>
+      <word_default>Editing %s</word_default>
+      <word_custom>Редактирование %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>announce_page_numforums</word_key>
+      <word_default>forums</word_default>
+      <word_custom>форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>no_deleted_topics</word_key>
+      <word_default>There are no deleted topics to view</word_default>
+      <word_custom>Удаленных тем дл� про�мотра нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>hard_delete_warn_topic</word_key>
+      <word_default>This topic has been removed from the forum and will be automatically deleted soon</word_default>
+      <word_custom>Тема удалена из форума и будет в�коре автоматиче�ки удалена из базы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_modcp</word_pack>
+      <word_key>hard_delete_warn_post</word_key>
+      <word_default>This post has been removed from the topic and will be automatically deleted soon</word_default>
+      <word_custom>Сообщение удалено из темы и будет в�коре автоматиче�ки удалено из базы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>dname_desc</word_key>
+      <word_default>Between 3 and %s characters</word_default>
+      <word_custom>Между 3 и %s �имволами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>required_field</word_key>
+      <word_default>Required Information</word_default>
+      <word_custom>Требуема� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>regstep_confirm</word_key>
+      <word_default>Confirmation</word_default>
+      <word_custom>Подтверждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>regstep</word_key>
+      <word_default>Step %s</word_default>
+      <word_custom>Шаг %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>mobile_cant_register_link</word_key>
+      <word_default><![CDATA[We're unable to register you via the mobile interface right now. Click the button below to view the full version of the community and proceed with registration.]]></word_default>
+      <word_custom>Си�тема не может �ейча� зареги�трировать ва� через мобильный интерфей�. �ажмите на кнопку ниже дл� про�мотра полной вер�ии �ообще�тва и продолжени� реги�трации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lost_your_password</word_key>
+      <word_default><![CDATA[If you've lost your password, you can use this form to reset it.]]></word_default>
+      <word_custom>При помощи данной формы вы можете �бро�ить ваш текущий пароль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_desc</word_key>
+      <word_default><![CDATA[You can either create a new <strong>forum account</strong> or connect your %s account to your existing forum account.]]></word_default>
+      <word_custom><![CDATA[Вы можете либо �оздать новую <strong>учетную запи�ь на форуме</strong> либо при�оединить ваш %s аккаунт к уже �уще�твующей.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_password_desc</word_key>
+      <word_default><![CDATA[Enter the password you <em>currently</em> use to log in to this community]]></word_default>
+      <word_custom><![CDATA[Введите ваш <em>текущий</em> пароль дл� входа на форум]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_username_desc</word_key>
+      <word_default><![CDATA[Enter the email address you <em>currently</em> use to log in to this community]]></word_default>
+      <word_custom><![CDATA[Введите ваш текущий <em>e-mail</em> адре� дл� входа на форум]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_username</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>Email</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_account_desc</word_key>
+      <word_default><![CDATA[If you <em>do</em> already have forum account, complete this section:]]></word_default>
+      <word_custom><![CDATA[Е�ли у ва� <em>уже</em> е�ть учетна� запи�ь на форуме. пожалуй�та, заполните �ти пол�:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_account_desc</word_key>
+      <word_default><![CDATA[If you <em>do not</em> have a forum account, complete this section:]]></word_default>
+      <word_custom><![CDATA[Е�ли у ва� <em>еще нет</em> учетной запи�и на форуме, пожалуй�та заполните �ледующие пол�:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_account_submit</word_key>
+      <word_default>Connect Accounts</word_default>
+      <word_custom>Св�зать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_account_title</word_key>
+      <word_default>Connect to an existing forum account</word_default>
+      <word_custom>При�оединить к �уще�твующей учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_account_submit</word_key>
+      <word_default>Create New Account</word_default>
+      <word_custom>Создать учетную запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_account_title</word_key>
+      <word_default>Create a new forum account</word_default>
+      <word_custom>Создание новой учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>login_w_twitter</word_key>
+      <word_default>Sign in with your Twitter account</word_default>
+      <word_custom>Вход � и�пользованием Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>login_w_facebook</word_key>
+      <word_default>Sign in with your Facebook account</word_default>
+      <word_custom>Войти � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>twitter_login_title</word_key>
+      <word_default>Twitter Sign In</word_default>
+      <word_custom>Вход через Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>fb_login_title</word_key>
+      <word_default>Facebook Sign In</word_default>
+      <word_custom>Вход через Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>use_an_existing_acc</word_key>
+      <word_default><![CDATA[I want to connect an <strong>EXISTING</strong> forum account]]></word_default>
+      <word_custom><![CDATA[У мен� уже <strong>ЕСТЬ</strong> учетна� запи�ь на форуме.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>need_to_create_acc</word_key>
+      <word_default><![CDATA[I need to create a <strong>NEW</strong> forum account]]></word_default>
+      <word_custom><![CDATA[Создать <storng>�ОВУЮ</strong> учетную запи�ь на форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>already_have_account</word_key>
+      <word_default>Do you already have a %s forum account?</word_default>
+      <word_custom>Вы уже имеете аккаунт на нашем форуме?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>terms_of_use</word_key>
+      <word_default>Terms of Use</word_default>
+      <word_custom>У�лови� и�пользовани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>want_to_save_time</word_key>
+      <word_default>Want to save time?</word_default>
+      <word_custom>Хотите �охранить врем�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>mobile_agree_to_tos</word_key>
+      <word_default>I AGREE</word_default>
+      <word_custom>Я СОГЛ�СЕ�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>agree_to_tos</word_key>
+      <word_default><![CDATA[I've read and agree to the]]></word_default>
+      <word_custom>Я прочитал и �оглашаю�ь �</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_terms_popup_title</word_key>
+      <word_default>Registration Terms</word_default>
+      <word_custom>Реги�трационные у�лови�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>must_agree_to_terms</word_key>
+      <word_default>You must agree to the registration terms.</word_default>
+      <word_custom>Вы должны подтвердить �вое �огла�ие � у�лови�ми реги�трации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_sub</word_key>
+      <word_default><![CDATA[<strong>%s</strong>, you're almost there!]]></word_default>
+      <word_custom><![CDATA[<strong>%s</strong>, вы уже зде�ь!]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_sub_desc</word_key>
+      <word_default><![CDATA[As you've logged in via <strong>%s</strong> for the first time, we just need a few more details before we can proceed.]]></word_default>
+      <word_custom><![CDATA[Вы вошли через <strong>%s</strong> в первый раз, по�тому нам необходимо получить еще немного информации о ва�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_incorrect_details</word_key>
+      <word_default>Incorrect email address or password</word_default>
+      <word_custom>�еверные e-mail или пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_already_linked</word_key>
+      <word_default>The forum account %s is already connected to a %s user</word_default>
+      <word_custom>Учетна� запи�ь %s уже �в�зана � пользователем %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_unknown</word_key>
+      <word_default>An unknown error occured. Please continue logging in with a new account and contact an admin to merge your accounts</word_default>
+      <word_custom>Возникла неизве�тна� ошибка. Пожалуй�та, попробуйте продолжить начатое дей�твие и �ообщите о возникшей ошибке админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>register</word_key>
+      <word_default>Create Account</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_step3_spam</word_key>
+      <word_default>Verify you are a human</word_default>
+      <word_custom>Шаг 3: Защитный код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>recover_password</word_key>
+      <word_default>Recover Password</word_default>
+      <word_custom>Во��тановление парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>mobile_cant_register</word_key>
+      <word_default>Unfortunately we cannot offer mobile registration at this time. Please create an account on another device, then you will be able to sign in here.</word_default>
+      <word_custom>К �ожалению �и�тема �ейча� не может предложить возможно�ть реги�трации на форуме через мобильные у�трой�тва. Пожалуй�та, зареги�трируйте�ь � компьютера, по�ле чего вы �можете авторизовать�� через мобильный.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_step4_spam</word_key>
+      <word_default>Verify you are a human</word_default>
+      <word_custom>Шаг 4: Защитный код</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>fb_welcome</word_key>
+      <word_default>Welcome,</word_default>
+      <word_custom>Здрав�твуйте,</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>complete_form</word_key>
+      <word_default>Please complete the form fully</word_default>
+      <word_custom>Пожалуй�та, полно�тью заполните форму</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>following_errors</word_key>
+      <word_default>The following errors were found:</word_default>
+      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>forum_terms</word_key>
+      <word_default><![CDATA[Forum Terms &amp; Rules]]></word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>passwords_not_match</word_key>
+      <word_default>The password fields did not match</word_default>
+      <word_custom>Введенные пароли не �овпадают</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_with_facebook</word_key>
+      <word_default>Register Using Facebook</word_default>
+      <word_custom>Зареги�трировать�� через Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>log_with_facebook</word_key>
+      <word_default>Log in with facebook</word_default>
+      <word_custom>Вход � и�пользованием Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>why_register</word_key>
+      <word_default>Why register?</word_default>
+      <word_custom>Зачем реги�трировать��?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>ready_register</word_key>
+      <word_default>Join Our Community</word_default>
+      <word_custom>Готовы зареги�трировать��?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_free</word_key>
+      <word_default><![CDATA[It's free and simple to register for our community! We just need a few pieces of information from you, and you'll be ready to make your first post in no time!]]></word_default>
+      <word_custom>Реги�траци� на нашем форуме крайне про�та и аб�олютно бе�платна. Мы узнаем немножко информации о ва�, и вы через мгновение �можете пользовать�� в�еми возможно�т�ми форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>already_account</word_key>
+      <word_default>If you already have an account, you can go directly to the</word_default>
+      <word_custom>Е�ли вы уже зареги�трированы на нашем форуме, вы можете про�ледовать �разу на</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_step1</word_key>
+      <word_default>Account Information</word_default>
+      <word_custom>Шаг 1: Данные учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_errors_found</word_key>
+      <word_default>Errors were found with your registration. Please correct the highlighted fields below.</word_default>
+      <word_custom>В проце��е проверки реги�трации были найдены ошибки в заполнении формы. Пожалуй�та и�правьте их и продолжите реги�трацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>goto_signin</word_key>
+      <word_default>Go to sign in</word_default>
+      <word_custom>Перейти на �траницу входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>sign_in_page</word_key>
+      <word_default>sign in page</word_default>
+      <word_custom>�траницу входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_choose_user</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>char_cant_use</word_key>
+      <word_default><![CDATA[The name you'll sign in with. You can't use: <em>[ ] | ; , &#036; &#92; &lt; &gt; &quot;</em>]]></word_default>
+      <word_custom><![CDATA[Им�, и�пользуемое дл� входа на форум. Вы не можете и�пользовать: [ ] | ; , &#036;  &lt; &gt; &quot;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_enter_email</word_key>
+      <word_default>E-mail Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_enter_email_desc</word_key>
+      <word_default>So that we can verify your identity, and keep you updated</word_default>
+      <word_custom>Дл� того чтобы мы могли подтвердить вашу реги�трацию </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_choose_dname</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_reenter_email</word_key>
+      <word_default>Re-enter your e-mail address</word_default>
+      <word_custom>Подтвердите e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_choose_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_choose_password_desc</word_key>
+      <word_default>Between 3 and 32 characters</word_default>
+      <word_custom>Вы должны и�пользовать �ложный пароль, �одержащий не менее 3 и не более 32 �имволов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_reenter_password</word_key>
+      <word_default>Confirm Password</word_default>
+      <word_custom>Подтвердите пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>fb_logged_in</word_key>
+      <word_default>You are logged into Facebook</word_default>
+      <word_custom>Вы вошли в Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>regstep_your_account</word_key>
+      <word_default>Your Account</word_default>
+      <word_custom>Ваша учетна� запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>regstep_choose_package</word_key>
+      <word_default>Choose Package</word_default>
+      <word_custom>Выберите комплект</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_step3</word_key>
+      <word_default>Additional Information</word_default>
+      <word_custom>Шаг 3: Дополнительна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>auto_dst_detection</word_key>
+      <word_default>Enable automatic DST detection?</word_default>
+      <word_custom>�втоматиче�кий переход на зимнее/летнее врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>time_zone</word_key>
+      <word_default>Time Zone</word_default>
+      <word_custom>Ча�овой по��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>receive_admin_emails</word_key>
+      <word_default>Receive email from administrators</word_default>
+      <word_custom>Получать e-mail от админи�трации форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_step2</word_key>
+      <word_default>Community Options</word_default>
+      <word_custom>Шаг 2: �а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>fb_reg_with</word_key>
+      <word_default>You can register here using your Facebook Account!</word_default>
+      <word_custom>Вы можете зареги�трировать�� зде�ь и�пользу� ваш аккаунт в Facebook!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>qa_title</word_key>
+      <word_default>Challenge Question</word_default>
+      <word_custom>Вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>qa_question_title</word_key>
+      <word_default>Your registration question</word_default>
+      <word_custom>Вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_username_none</word_key>
+      <word_default>The username must be between 3 and %s characters</word_default>
+      <word_custom>Логин должен быть не менее 3 и не более %s �имволов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_no_name</word_key>
+      <word_default>You must enter a name longer than 3 characters and shorter than %s.</word_default>
+      <word_custom>Им� пользовател� должно быть не менее 3 и не более %s �имволов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lp_text</word_key>
+      <word_default><![CDATA[Enter your username or email address in the field below. The username or email address is case <b>in</b>sensitive. Once you have submitted the form, you will receive an email asking for validation of this request to ensure that no malicious use has occurred. This email will also contain a link that you must click for further instruction.]]></word_default>
+      <word_custom><![CDATA[Введите ваш логин и e-mail адре� в �оответ�твующие пол� формы. Данные <strong>не</strong> чув�твительны к реги�тру букв. <br />По�ле отправки формы, вы получите пи�ьмо � про�ьбой о подтверждении запро�а, а так же ��ылкой на дальнейшие ин�трукции.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_no_name_spec</word_key>
+      <word_default>  Be aware that some special characters use more than 1 character.</word_default>
+      <word_custom> Помните, что некоторые �пециальные �имволы и�пользуют более чем 1 �имвол.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>fb_complete_reg</word_key>
+      <word_default>Complete Registration Now</word_default>
+      <word_custom>Завершить реги�трацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>just_admin_validation</word_key>
+      <word_default>After registration your account will then be entered into the administration queue for review and approval.</word_default>
+      <word_custom>По�ле реги�трации ваш аккаунт будет добавлен в очередь на проверку и утверждение админи�тратором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_admin_remtext</word_key>
+      <word_default><![CDATA[Don't forget to create the account upon receipt of this consent form, and notify the user that their new account is ready for use]]></word_default>
+      <word_custom>�е забудьте �оздать учетную запи�ь дл� �того пользовател� и �ообщить ему, что он учетна� запи�ь готова к и�пользованию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_admin_reminder</word_key>
+      <word_default>Admin Reminder</word_default>
+      <word_custom>�апоминание админи�тратору</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_clickhere</word_key>
+      <word_default>Click here to print the parental consent form</word_default>
+      <word_custom>�ажмите зде�ь дл� ра�печатки �оглашени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_additional_info</word_key>
+      <word_default>COPPA Information</word_default>
+      <word_custom>Информаци� COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_form_fill</word_key>
+      <word_default>You must input your birthday completely</word_default>
+      <word_custom>Вы должны вве�ти полную дату рождени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_continue_button</word_key>
+      <word_default>Continue</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>select_day</word_key>
+      <word_default>Day</word_default>
+      <word_custom>День</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>select_year</word_key>
+      <word_default>Year</word_default>
+      <word_custom>Год</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>select_month</word_key>
+      <word_default>Month</word_default>
+      <word_custom>Ме��ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>validation_complete</word_key>
+      <word_default>Validation Complete</word_default>
+      <word_custom>�ктиваци� завершена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_q_and_a</word_key>
+      <word_default>Your answer to the challenge question was not valid.  Please try again.</word_default>
+      <word_custom>Вы дали неверный ответ на вопро� при реги�трации. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>qa_question_desc</word_key>
+      <word_default>This helps to protect us against spammers.</word_default>
+      <word_custom>Введите ответ на вопро� (реги�тр букв не важен)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_email_invalid</word_key>
+      <word_default><![CDATA[The email address you entered is invalid (ex: name@domain.com)<br /> or contains illegal characters: [ ] ; # &amp; ! * ' &quot; &lt; &gt; % ( ) { } &#092; ?]]></word_default>
+      <word_custom><![CDATA[Введенный e-mail адре� либо неправильный, либо �одержит недопу�тимые �имволы: [ ] ; # &amp; ! * ' &quot; &lt; &gt; % ( )   { } ?]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_registration_email_spammer</word_key>
+      <word_default>Possible Spammer Registered at %s</word_default>
+      <word_custom>Возможно �пам-реги�траци� на </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_registration_email</word_key>
+      <word_default>New Registration at %s</word_default>
+      <word_custom>Реги�траци� на </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_registration_email1</word_key>
+      <word_default>New Registration at %s</word_default>
+      <word_custom>�ова� реги�траци� на </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_bounce</word_key>
+      <word_default>You must either cancel your registration or have your parent complete the COPPA registration form and send it to us</word_default>
+      <word_custom>Вы должны отменить реги�трацию или попро�ить одного из родителей заполнить форму COPPA и отправить ее нам.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>clogin_submit</word_key>
+      <word_default>Continue...</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>clogin_text</word_key>
+      <word_default><![CDATA[As this is the first time you've logged in, we require just a few more details before we can proceed]]></word_default>
+      <word_custom>Вы в первый раз заходите на наш форум. �ам необходимо получить от ва� еще немножко информации, прежде чем вы �можете при�тупить к работе � форумом.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>clogin_title</word_key>
+      <word_default>Welcome to our community</word_default>
+      <word_custom>Добро пожаловать на наш форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>clogin_done</word_key>
+      <word_default>You are now logged in</word_default>
+      <word_custom>Вы вошли</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_email_ban</word_key>
+      <word_default>The email address you used is not accepted by this community.  Please select a different email address.</word_default>
+      <word_custom>Указанный вами e-mail адре� запрещен дл� и�пользовани� на данном форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpass_text_random</word_key>
+      <word_default>An email has been sent to your registered email address containing your new password.</word_default>
+      <word_custom>Пи�ьмо � новым паролем было отправлено на email адре�, указанный вами при реги�трации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lp_random_pass</word_key>
+      <word_default>Click the proceed button below to have a new password emailed to the email address registered to your account.</word_default>
+      <word_custom>�ажмите кнопку продолжить чтобы вы�лать новый пароль на e-mail адре� указанный вами при реги�трации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lp_random_pass_subject</word_key>
+      <word_default>Your new password</word_default>
+      <word_custom>Ваш новый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_username_taken</word_key>
+      <word_default>That username is already taken</word_default>
+      <word_custom>Данный логин уже зан�т кем-то другим</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>dname_name</word_key>
+      <word_default>Display name</word_default>
+      <word_custom>Введите им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_email_nm</word_key>
+      <word_default>The email addresses do not match</word_default>
+      <word_custom>Введенные e-mail адре�а не �овпадают</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_email_taken</word_key>
+      <word_default>The email address is already in use</word_default>
+      <word_custom>Указанный e-mail адре� уже кем-то и�пользует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>reg_error_chars</word_key>
+      <word_default><![CDATA[Contains one or more of these illegal characters: [ ] | ; ,  &#036; &#92; &lt; &gt; &quot;]]></word_default>
+      <word_custom><![CDATA[Содержит недопу�тимые �имволы: [ ] | ; , &#036; &#92; &lt; &gt; &quot; ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>email_address_confirm</word_key>
+      <word_default>Confirm Email Address</word_default>
+      <word_custom>Подтверждение E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>tc_regbut</word_key>
+      <word_default>Continue Registration</word_default>
+      <word_custom>Продолжить реги�трацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cf_optional</word_key>
+      <word_default>Optional Information</word_default>
+      <word_custom>Дополнительна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>tc_text</word_key>
+      <word_default>In order to proceed, you must agree to the following:</word_default>
+      <word_custom>Прежде чем продолжить реги�трацию, вам необходимо ознакомить�� � нашими правилами.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>tc_title</word_key>
+      <word_default><![CDATA[Registration Terms &amp; Rules]]></word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>user_name</word_key>
+      <word_default><![CDATA[Enter your desired <strong>log in</strong> username]]></word_default>
+      <word_custom>Введите логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_title</word_key>
+      <word_default>Resend validation email</word_default>
+      <word_custom>Отправка повторной активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>user_admin_validation</word_key>
+      <word_default>After successful validation your account will then be entered into the administration queue for review and approval.</word_default>
+      <word_custom>По�ле у�пешной активации вашей учетной запи�и, он будет добавлен в очередь дл� подтверждени� админи�тратором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>email_address</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_done</word_key>
+      <word_default><![CDATA[<strong>Your revalidation request was successful</strong><br />A revalidation email has been sent to the registered address for that member. Please check your email within the next few minutes - including any 'junk mail' or 'spam' folders you may have.]]></word_default>
+      <word_custom><![CDATA[<strong>Повторное пи�ьмо � активацией отправлено</strong><br />Пи�ьмо было отправлено на email адре�, указанный при реги�трации. Через не�колько минут проверьте ваш email. Возможно наши пи�ьма ра�познают�� вашим почтовым клиентом как �пам, е�ли �нова не найдете пи�ьма проверьте �то.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_process</word_key>
+      <word_default>Revalidation Process</word_default>
+      <word_custom>Повторна� активаци� </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_ins_name</word_key>
+      <word_default>Please enter your sign in name below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
+      <word_custom>Введите логин, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_ins_email</word_key>
+      <word_default>Please enter your sign in email below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
+      <word_custom>Введите email, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_ins_both</word_key>
+      <word_default>Please enter your sign in name or email below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
+      <word_custom>Введите логин или email, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_go</word_key>
+      <word_default>Search and Send</word_default>
+      <word_custom>�айти и отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_name</word_key>
+      <word_default>Sign in name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpass_text</word_key>
+      <word_default>An email containing further activation instructions has been sent. This email should be received within the next 10 minutes (usually instantly).</word_default>
+      <word_custom>Пи�ьмо � дальнейшими ин�трукци�ми было отправлено на ваш e-mail адре�, указанный при реги�трации. Пи�ьмо приходит в течение 10 минут (обычно моментально).</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpf_title</word_key>
+      <word_default>Lost Password Recovery</word_default>
+      <word_custom>Во��тановление парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpf_pass1</word_key>
+      <word_default>Enter a new password</word_default>
+      <word_custom>�овый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>new_password</word_key>
+      <word_default>New Password</word_default>
+      <word_custom>�овый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpf_pass11</word_key>
+      <word_default>It must be no more than 32 characters and no less than 3 characters</word_default>
+      <word_custom>�е должен быть длиннее 32 �имволов и короче 3</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_cf_to_long</word_key>
+      <word_default>You have entered more data than allowed in this field</word_default>
+      <word_custom>Вы ввели �лишком много данных в поле чем �то необходимо </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_complete_form</word_key>
+      <word_default>This field is required and must be completed</word_default>
+      <word_custom>Данное поле об�зательно дл� заполнени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpf_pass22</word_key>
+      <word_default>It must match exactly</word_default>
+      <word_custom>Должен полно�тью �овпадать � предыдущим</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lpf_pass2</word_key>
+      <word_default>Re-enter your new password</word_default>
+      <word_custom>Введите пароль еще раз</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_invalid</word_key>
+      <word_default>The data you entered in this field is in an invalid format</word_default>
+      <word_custom>Данные, введенные в поле, неверного формата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>errors_found</word_key>
+      <word_default>The Following Errors Were Found</word_default>
+      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_no_username</word_key>
+      <word_default>You must enter a valid username between 3 and 32 characters</word_default>
+      <word_custom>Вы должны вве�ти пароль не длиннее 32 и не короче 3 �имволов </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_reg_code</word_key>
+      <word_default>The security code you supplied did not match the one displayed, a new code has been generated, please try again</word_default>
+      <word_custom>�еверный защитный код. Был �оздан новый, повторите попытку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>email_reg_subj</word_key>
+      <word_default>New Registration at %s</word_default>
+      <word_custom>Реги�траци� на </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_invalid_email</word_key>
+      <word_default>The email address entered was not a valid email address</word_default>
+      <word_custom>Введенный e-mail адре� неверный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>err_no_validations</word_key>
+      <word_default>There are no pending validation requests for that member. Please check the name and try again</word_default>
+      <word_custom>�е найдено ни одной ожидающей активации дл� данного пользовател�. Проверьте введенный логин и повторите попытку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_title</word_key>
+      <word_default>COPPA Registration</word_default>
+      <word_custom>Реги�траци� COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>ne_subject</word_key>
+      <word_default>Email change request at %s</word_default>
+      <word_custom>Запро� на изменение e-mail на</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_info</word_key>
+      <word_default>Birthday</word_default>
+      <word_custom>Информаци� COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>confirm_over_thirteen</word_key>
+      <word_default>Please supply your birthday to continue</word_default>
+      <word_custom><![CDATA[В �оответ�твии � законом COPPA о защите не�овершеннолетних в Интернете, мы должны проверить, что вы �тарше 13 лет. Е�ли вы младше, вам нужно <a href='<#FORM_LINK#>'>получить разрешение</a> от ваших родителей, чтобы пользовать�� �тим форумом.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>rv_bar_title</word_key>
+      <word_default>Revalidate</word_default>
+      <word_custom>Повторна� активаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_link</word_key>
+      <word_default>Please select your birthday</word_default>
+      <word_custom>Укажите дату вашего рождени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_form</word_key>
+      <word_default>COPPA Form</word_default>
+      <word_custom>Форма COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_form_text</word_key>
+      <word_default><![CDATA[A parent or guardian must complete and mail or fax a signed <#FORM_LINK#> to the administrator of the community before a child under the age of 13 can complete the registration process.<br />For further information, please contact the forum administrator]]></word_default>
+      <word_custom><![CDATA[Один из родителей или опекун должен заполнить и отправить по почте или фак�ом подпи�анный <#FORM_LINK#> админи�тратору форума перед тем, как ребенок не до�тигший 13 лет �может зареги�трировать�� на форуме.<br />За дополнительной информацией, пожалуй�та, <a href="javascript:contact_admin();">Обратите�ь к админи�тратору форума</a> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_link_form</word_key>
+      <word_default>permission form</word_default>
+      <word_custom>форма разрешени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>coppa_email_subject</word_key>
+      <word_default>COPPA Registration Information</word_default>
+      <word_custom>COPPA Информаци� реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cp2_text</word_key>
+      <word_default><![CDATA[ All users under the age of 13 must seek permission from a parent or guardian before you may participate on these forums.<br /><br />Once the parental consent form has been received, an account will be created for you with the information supplied, and an email will be sent to the provided email address to notify you that your account is ready for use.  You can then change your account details from your 'My Controls' area upon logging in with your new account.]]></word_default>
+      <word_custom><![CDATA[В�е пользователи возра�том до 13 лет, об�заны иметь разрешение родителей, дл� дальнейшего уча�ти� и пользовани� �тими форумами.<br /><br />Как только админи�траци� форума получит разрешение от ваших родителей, учетна� запи�ь дл� ва� будет �оздана.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cp2_title</word_key>
+      <word_default>Our COPPA registration policy</word_default>
+      <word_custom>�аше реги�трационное �оглашение COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_title</word_key>
+      <word_default>COPPA Permission Form</word_default>
+      <word_custom>Форма разрешени� COPPA</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_perm_parent</word_key>
+      <word_default><![CDATA[Instructions for a parent or guardian<br /><br />Please print this form out, complete it and fax it to the number specified (if present) or mail to the mailing address below.]]></word_default>
+      <word_custom><![CDATA[Ин�трукции дл� родителей или опекунов<br /><br />Пожалуй�та, ра�печатайте �ту форму, заполните ее и перешлите по фак�у на наш номер. Е�ли фак�а не имеет��, вы можете пере�лать �ту форму по нижеуказанному адре�у.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cp_success</word_key>
+      <word_default>Your registration was successful! Redirecting you to the consent form</word_default>
+      <word_custom>Ваша реги�траци� прин�та! Сейча� вы будете перемещены к форме разрешени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11135,29 +14410,55 @@ The <#BOARD_NAME#> team.
       <word_key>cpf_name</word_key>
       <word_default>Parent / Legal Guardian FULL name</word_default>
       <word_custom>Полное им� родител�/опекуна</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cpf_fax</word_key>
-      <word_default><![CDATA[<b>Fax Number:</b>]]></word_default>
-      <word_custom><![CDATA[<b>�омер фак�а:</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>lost_pass_form</word_key>
+      <word_default>Lost Your Password?</word_default>
+      <word_custom>Во��тановление парол�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cpf_address</word_key>
-      <word_default><![CDATA[<b>Mailing Address:</b>]]></word_default>
-      <word_custom><![CDATA[<b>�дре� дл� пи�ем:</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cpf_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_phone</word_key>
+      <word_default>Phone Number</word_default>
+      <word_custom>�омер телефона</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_signature</word_key>
+      <word_default>Signature</word_default>
+      <word_custom>Подпи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>cpf_relation</word_key>
+      <word_default>Relation to child</word_default>
+      <word_custom>Отношение к ребенку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>lp_send</word_key>
+      <word_default>Proceed</word_default>
+      <word_custom>Продолжить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -11166,1439 +14467,111 @@ The <#BOARD_NAME#> team.
       <word_default><![CDATA[Please sign the form below and send to us.<br /><br />I understand that I may consent to the collection of necessary information about my child without permitting the site to disclose such information to third parties.  I also understand that the site will not collect more information about my child than is reasonably necessary to participate on the site.<br /><br />
 									I confirm that the information that the child has supplied is correct. I understand that the profile information may be changed by entering a password and I understand that I may ask for this registration profile to be removed.  I understand that I can contact the owner of this site at any time to determine what information about my child has been collected, to confirm how that information is used, and to request that the site no longer collect information about my child.]]></word_default>
       <word_custom><![CDATA[Про�им ва� подпи�ать ниже�ледующую форму и пере�лать ее нам.<br><br>Я подтверждаю, что информаци�, предо�тавленна� ребенком верна. Я �оглашаю�ь, что информаци� профил� может быть изменена только по�ле ввода парол�. И � принимаю то что, � могу затребовать удалени� �того профил� в любой момент.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cp2_title</word_key>
-      <word_default>Our COPPA registration policy</word_default>
-      <word_custom>�аше реги�трационное �оглашение COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cpf_address</word_key>
+      <word_default><![CDATA[<b>Mailing Address:</b>]]></word_default>
+      <word_custom><![CDATA[<b>�дре� дл� пи�ем:</b>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cp_success</word_key>
-      <word_default>Your registration was successful! Redirecting you to the consent form</word_default>
-      <word_custom>Ваша реги�траци� прин�та! Сейча� вы будете перемещены к форме разрешени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cpf_fax</word_key>
+      <word_default><![CDATA[<b>Fax Number:</b>]]></word_default>
+      <word_custom><![CDATA[<b>�омер фак�а:</b>]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cpf_title</word_key>
-      <word_default>COPPA Permission Form</word_default>
-      <word_custom>Форма разрешени� COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>lp_subject</word_key>
+      <word_default>Password recovery information from</word_default>
+      <word_custom>Информаци� о во��тановлении парол� �</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>cpf_perm_parent</word_key>
-      <word_default><![CDATA[Instructions for a parent or guardian<br /><br />Please print this form out, complete it and fax it to the number specified (if present) or mail to the mailing address below.]]></word_default>
-      <word_custom><![CDATA[Ин�трукции дл� родителей или опекунов<br /><br />Пожалуй�та, ра�печатайте �ту форму, заполните ее и перешлите по фак�у на наш номер. Е�ли фак�а не имеет��, вы можете пере�лать �ту форму по нижеуказанному адре�у.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>activation_form</word_key>
+      <word_default>Activation Form</word_default>
+      <word_custom>Форма активации</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>coppa_email_subject</word_key>
-      <word_default>COPPA Registration Information</word_default>
-      <word_custom>COPPA Информаци� реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cp2_text</word_key>
-      <word_default><![CDATA[ All users under the age of 13 must seek permission from a parent or guardian before you may participate on these forums.<br /><br />Once the parental consent form has been received, an account will be created for you with the information supplied, and an email will be sent to the provided email address to notify you that your account is ready for use.  You can then change your account details from your 'My Controls' area upon logging in with your new account.]]></word_default>
-      <word_custom><![CDATA[В�е пользователи возра�том до 13 лет, об�заны иметь разрешение родителей, дл� дальнейшего уча�ти� и пользовани� �тими форумами.<br /><br />Как только админи�траци� форума получит разрешение от ваших родителей, учетна� запи�ь дл� ва� будет �оздана.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_link</word_key>
-      <word_default>Please select your birthday</word_default>
-      <word_custom>Укажите дату вашего рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_form_text</word_key>
-      <word_default><![CDATA[A parent or guardian must complete and mail or fax a signed <#FORM_LINK#> to the administrator of the board before a child under the age of 13 can complete the registration process.<br />For further information, please <a href="javascript:contact_admin();">Contact the forums administrator</a>]]></word_default>
-      <word_custom><![CDATA[Один из родителей или опекун должен заполнить и отправить по почте или фак�ом подпи�анный <#FORM_LINK#> админи�тратору форума перед тем, как ребенок не до�тигший 13 лет �может зареги�трировать�� на форуме.<br />За дополнительной информацией, пожалуй�та, <a href="javascript:contact_admin();">Обратите�ь к админи�тратору форума</a> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_link_form</word_key>
-      <word_default>permission form</word_default>
-      <word_custom>форма разрешени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_info</word_key>
-      <word_default>COPPA Information</word_default>
-      <word_custom>Информаци� COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_form</word_key>
-      <word_default>COPPA Form</word_default>
-      <word_custom>Форма COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>ne_subject</word_key>
-      <word_default>Email change request at </word_default>
-      <word_custom>Запро� на изменение e-mail на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_title</word_key>
-      <word_default>COPPA Registration</word_default>
-      <word_custom>Реги�траци� COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>email_reg_subj</word_key>
-      <word_default>Registration at </word_default>
-      <word_custom>Реги�траци� на </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_no_validations</word_key>
-      <word_default>There are no pending validation requests for that member. Please check the name and try again</word_default>
-      <word_custom>�е найдено ни одной ожидающей активации дл� данного пользовател�. Проверьте введенный логин и повторите попытку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_reg_code</word_key>
-      <word_default>The registration code did not match the one displayed, a new code has been generated, please try again</word_default>
-      <word_custom>�еверный защитный код. Был �оздан новый, повторите попытку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_invalid_email</word_key>
-      <word_default>The email address entered was not a valid email address</word_default>
-      <word_custom>Введенный e-mail адре� неверный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_no_username</word_key>
-      <word_default>You must enter a valid username between 3 and 32 characters</word_default>
-      <word_custom>Вы должны вве�ти пароль не длиннее 32 и не короче 3 �имволов </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_invalid</word_key>
-      <word_default>The data you entered in this field is in an invalid format</word_default>
-      <word_custom>Данные, введенные в поле, неверного формата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>errors_found</word_key>
-      <word_default>The Following Errors Were Found</word_default>
-      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_complete_form</word_key>
-      <word_default>This field is required and must be completed</word_default>
-      <word_custom>Данное поле об�зательно дл� заполнени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_cf_to_long</word_key>
-      <word_default>You have entered more data than allowed in this field</word_default>
-      <word_custom>Вы ввели �лишком много данных в поле чем �то необходимо </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_password</word_key>
-      <word_default>New Password</word_default>
-      <word_custom>�овый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpf_pass1</word_key>
-      <word_default>Enter a new password</word_default>
-      <word_custom>�овый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpf_pass11</word_key>
-      <word_default>It must be no more than 32 characters and no less than 3 characters</word_default>
-      <word_custom>�е должен быть длиннее 32 �имволов и короче 3</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpf_pass2</word_key>
-      <word_default>Re-enter your new password</word_default>
-      <word_custom>Введите пароль еще раз</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpf_pass22</word_key>
-      <word_default>It must match exactly</word_default>
-      <word_custom>Должен полно�тью �овпадать � предыдущим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_name</word_key>
-      <word_default>Sign in name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpass_text</word_key>
-      <word_default>An email containing further activation instructions has been sent. This email should be received within the next 10 minutes (usually instantly).</word_default>
-      <word_custom>Пи�ьмо � дальнейшими ин�трукци�ми было отправлено на ваш e-mail адре�, указанный при реги�трации. Пи�ьмо приходит в течение 10 минут (обычно моментально).</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpf_title</word_key>
-      <word_default>Lost Password Recovery</word_default>
-      <word_custom>Во��тановление парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_ins_both</word_key>
-      <word_default>Please enter your sign in name or email below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
-      <word_custom>Введите логин или email, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_go</word_key>
-      <word_default>Search and Send</word_default>
-      <word_custom>�айти и отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_ins_email</word_key>
-      <word_default>Please enter your sign in email below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
-      <word_custom>Введите email, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_ins_name</word_key>
-      <word_default>Please enter your sign in name below to search for any pending validation requests. If any are found, the email will be resent to the email address you registered with.</word_default>
-      <word_custom>Введите логин, указанный при реги�трации, дл� пои�ка незавершенной активации. Е�ли така� активаци� будет найдена, вам повторно будет вы�лано пи�ьмо � детал�ми активации вашей учетной запи�и.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>email_address_confirm</word_key>
-      <word_default>Confirm Email Address</word_default>
-      <word_custom>Подтверждение E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>email_address</word_key>
-      <word_default>Enter your Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_title</word_key>
-      <word_default>Resend validation email</word_default>
-      <word_custom>Отправка повторной активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_process</word_key>
-      <word_default>Revalidation Process</word_default>
-      <word_custom>Повторна� активаци� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>rv_done</word_key>
-      <word_default><![CDATA[<strong>Your revalidation request was successful</strong><br />A revalidation email has been sent to the registered address for that member. Please check your email within the next few minutes - including any 'junk mail' or 'spam' folders you may have.]]></word_default>
-      <word_custom><![CDATA[<strong>Повторное пи�ьмо � активацией отправлено</strong><br />Пи�ьмо было отправлено на email адре�, указанный при реги�трации. Через не�колько минут проверьте ваш email. Возможно наши пи�ьма ра�познают�� вашим почтовым клиентом как �пам, е�ли �нова не найдете пи�ьма проверьте �то.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>tc_regbut</word_key>
-      <word_default>Continue Registration</word_default>
-      <word_custom>Продолжить реги�трацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>cf_optional</word_key>
-      <word_default>Optional Information</word_default>
-      <word_custom>Дополнительна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>user_name</word_key>
-      <word_default><![CDATA[Enter your desired <strong>log in</strong> username]]></word_default>
-      <word_custom>Введите логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>tc_title</word_key>
-      <word_default><![CDATA[Registration Terms &amp; Rules]]></word_default>
+      <word_key>registration_form</word_key>
+      <word_default>Registration Form</word_default>
       <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>tc_text</word_key>
-      <word_default>In order to proceed, you must agree to the following:</word_default>
-      <word_custom>Прежде чем продолжить реги�трацию, вам необходимо ознакомить�� � нашими правилами.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>email_validate_text</word_key>
+      <word_default>You will be sent an email to the email address you give after registering. Please read the email carefully, you will need to validate your account by clicking on a link in the email.</word_default>
+      <word_custom>Вам будет вы�лан e-mail на адре� указанный при реги�трации. Пожалуй�та внимательно ознакомьте�ь � ним, вам необходимо будет про�ледовать по ��ылке в пи�ьме, чтобы активировать вашу учетную запи�ь.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>reg_error_email_taken</word_key>
-      <word_default>The email address is already in use by another member</word_default>
-      <word_custom>Указанный e-mail адре� уже кем-то и�пользует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>lp_email_or</word_key>
+      <word_default><![CDATA[<em>-OR-</em> Email Address]]></word_default>
+      <word_custom>ИЛИ ваш e-mail</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>user_admin_validation</word_key>
-      <word_default>After successful validation your account will then be entered into the administration queue for review and approval.</word_default>
-      <word_custom>По�ле у�пешной активации вашей учетной запи�и, он будет добавлен в очередь дл� подтверждени� админи�тратором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>lp_user_name</word_key>
+      <word_default>Account username</word_default>
+      <word_custom>Введите ваш логин</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>reg_error_email_nm</word_key>
-      <word_default>The email addresses do not match</word_default>
-      <word_custom>Введенные e-mail адре�а не �овпадают</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>dumb_text</word_key>
+      <word_default>Please ensure that you complete the form fully. The information you need will be in the email that was sent to you.</word_default>
+      <word_custom>Пожалуй�та убедите�ь, что в�е пол� формы заполнены. В�� необходима� информаци� будет вы�лана пи�ьмом на ваш e-mail адре�.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>reg_error_username_taken</word_key>
-      <word_default>The username is already taken by another member</word_default>
-      <word_custom>Данный логин уже зан�т кем-то другим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>agree_submit</word_key>
+      <word_default>I have read, understood and agree to these rules and conditions</word_default>
+      <word_custom>Я ознакомил�� � правилами и у�лови�ми, и принимаю их.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>dname_name</word_key>
-      <word_default><![CDATA[Enter your desired <strong>display</strong> name]]></word_default>
-      <word_custom>Введите им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>std_text</word_key>
+      <word_default>Please ensure that you complete all the fields fully, taking particular care over the password fields.</word_default>
+      <word_custom>Пожалуй�та убедите�ь, что в�е пол� формы заполнены. О�обенно тщательно проверьте пол� паролей.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>reg_error_chars</word_key>
-      <word_default><![CDATA[Contains one or more of these illegal characters: [ ] | ; ,  &#036; &#92; &lt; &gt; &quot;]]></word_default>
-      <word_custom><![CDATA[Содержит недопу�тимые �имволы: [ ] | ; , &#036; &#92; &lt; &gt; &quot; ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>thank_you</word_key>
+      <word_default>Thank you</word_default>
+      <word_custom>Спа�ибо,</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>clogin_submit</word_key>
-      <word_default>Continue...</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>clogin_done</word_key>
-      <word_default>You are now logged in</word_default>
-      <word_custom>Вы вошли</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>clogin_title</word_key>
-      <word_default>Welcome to our forum</word_default>
-      <word_custom>Добро пожаловать на наш форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>clogin_text</word_key>
-      <word_default><![CDATA[As this is the first time you've logged in, we require just a few more details before we can proceed]]></word_default>
-      <word_custom>Вы в первый раз заходите на наш форум. �ам необходимо получить от ва� еще немножко информации, прежде чем вы �можете при�тупить к работе � форумом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_bounce</word_key>
-      <word_default>You must either cancel your registration or have your parent complete the COPPA registration form and send it to us</word_default>
-      <word_custom>Вы должны отменить реги�трацию или попро�ить одного из родителей заполнить форму COPPA и отправить ее нам.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_registration_email</word_key>
-      <word_default>Registration at </word_default>
-      <word_custom>Реги�траци� на </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_registration_email1</word_key>
-      <word_default>New Registration at </word_default>
-      <word_custom>�ова� реги�траци� на </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_registration_email_spammer</word_key>
-      <word_default>Possible Spammer Registered at </word_default>
-      <word_custom>Возможно �пам-реги�траци� на </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_error_email_ban</word_key>
-      <word_default>The email address you used is not accepted by this board.  Please select a different email address.</word_default>
-      <word_custom>Указанный вами e-mail адре� запрещен дл� и�пользовани� на данном форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lpass_text_random</word_key>
-      <word_default>An email has been sent to your registered email address containing your new password.</word_default>
-      <word_custom>Пи�ьмо � новым паролем было отправлено на email адре�, указанный вами при реги�трации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_random_pass</word_key>
-      <word_default>Click the proceed button below to have a new password emailed to the email address registered to your account.</word_default>
-      <word_custom>�ажмите кнопку продолжить чтобы вы�лать новый пароль на e-mail адре� указанный вами при реги�трации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_error_email_invalid</word_key>
-      <word_default><![CDATA[The email address you entered is invalid (ex: name@domain.com)<br /> or contains illegal characters: [ ] ; # &amp; ! * ' &quot; &lt; &gt; % ( ) { } &#092; ?]]></word_default>
-      <word_custom><![CDATA[Введенный e-mail адре� либо неправильный, либо �одержит недопу�тимые �имволы: [ ] ; # &amp; ! * ' &quot; &lt; &gt; % ( )   { } ?]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_random_pass_subject</word_key>
-      <word_default>Your new password</word_default>
-      <word_custom>Ваш новый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lp_text</word_key>
-      <word_default><![CDATA[Enter your username or email address in the field below. The username or email address is case <b>in</b>sensitive.<br />Once you have submitted the form, you will receive an email asking for validation of this request to ensure that no malicious use has occurred. This email will also contain a link that you must click for further instruction.]]></word_default>
-      <word_custom><![CDATA[Введите ваш логин и e-mail адре� в �оответ�твующие пол� формы. Данные <strong>не</strong> чув�твительны к реги�тру букв. <br />По�ле отправки формы, вы получите пи�ьмо � про�ьбой о подтверждении запро�а, а так же ��ылкой на дальнейшие ин�трукции.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_error_no_name_spec</word_key>
-      <word_default>  Be aware that some special characters use more than 1 character.</word_default>
-      <word_custom> Помните, что некоторые �пециальные �имволы и�пользуют более чем 1 �имвол.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_error_username_none</word_key>
-      <word_default>The username must be between 3 and %s characters</word_default>
-      <word_custom>Логин должен быть не менее 3 и не более %s �имволов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_error_no_name</word_key>
-      <word_default>You must enter a name longer than 3 characters and shorter than %s.</word_default>
-      <word_custom>Им� пользовател� должно быть не менее 3 и не более %s �имволов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>just_admin_validation</word_key>
-      <word_default>After registration your account will then be entered into the administration queue for review and approval.</word_default>
-      <word_custom>По�ле реги�трации ваш аккаунт будет добавлен в очередь на проверку и утверждение админи�тратором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_admin_remtext</word_key>
-      <word_default><![CDATA[Don't forget to create the account upon receipt of this consent form, and notify the user that their new account is ready for use]]></word_default>
-      <word_custom>�е забудьте �оздать учетную запи�ь дл� �того пользовател� и �ообщить ему, что он учетна� запи�ь готова к и�пользованию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_admin_reminder</word_key>
-      <word_default>Admin Reminder</word_default>
-      <word_custom>�апоминание админи�тратору</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_clickhere</word_key>
-      <word_default>Click here to print the parental consent form</word_default>
-      <word_custom>�ажмите зде�ь дл� ра�печатки �оглашени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>select_day</word_key>
-      <word_default>Day</word_default>
-      <word_custom>День</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>select_year</word_key>
-      <word_default>Year</word_default>
-      <word_custom>Год</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_continue_button</word_key>
-      <word_default>Continue</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_form_fill</word_key>
-      <word_default>You must input your birthday completely</word_default>
-      <word_custom>Вы должны вве�ти полную дату рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>coppa_additional_info</word_key>
-      <word_default>COPPA Information</word_default>
-      <word_custom>Информаци� COPPA</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>select_month</word_key>
-      <word_default>Month</word_default>
-      <word_custom>Ме��ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>validation_complete</word_key>
-      <word_default>Validation Complete</word_default>
-      <word_custom>�ктиваци� завершена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>err_q_and_a</word_key>
-      <word_default>Your answer to the challenge question was not valid.  Please try again.</word_default>
-      <word_custom>Вы дали неверный ответ на вопро� при реги�трации. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>qa_question_desc</word_key>
-      <word_default>Enter the answer to your question.  Case-insensitive.</word_default>
-      <word_custom>Введите ответ на вопро� (реги�тр букв не важен)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>qa_title</word_key>
-      <word_default>Challenge Question</word_default>
-      <word_custom>Вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>qa_question_title</word_key>
-      <word_default>Your registration question</word_default>
-      <word_custom>Вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>fb_complete_reg</word_key>
-      <word_default>Complete Registration Now</word_default>
-      <word_custom>Завершить реги�трацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>fb_reg_with</word_key>
-      <word_default>You can register here using your Facebook Account!</word_default>
-      <word_custom>Вы можете зареги�трировать�� зде�ь и�пользу� ваш аккаунт в Facebook!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>fb_logged_in</word_key>
-      <word_default>You are logged into Facebook</word_default>
-      <word_custom>Вы вошли в Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_step3</word_key>
-      <word_default>Additional Information</word_default>
-      <word_custom>Шаг 3: Дополнительна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>auto_dst_detection</word_key>
-      <word_default>Enable automatic DST detection?</word_default>
-      <word_custom>�втоматиче�кий переход на зимнее/летнее врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>time_zone</word_key>
-      <word_default>Time Zone</word_default>
-      <word_custom>Ча�овой по��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_step2</word_key>
-      <word_default>Board Options</word_default>
-      <word_custom>Шаг 2: �а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>receive_admin_emails</word_key>
-      <word_default>Receive email from administrators</word_default>
-      <word_custom>Получать e-mail от админи�трации форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>receive_member_emails</word_key>
-      <word_default>Receive email from other members</word_default>
-      <word_custom>Получать e-mail от других пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_reenter_password</word_key>
-      <word_default>Re-enter your password</word_default>
-      <word_custom>Подтвердите пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_choose_password_desc</word_key>
-      <word_default>You should choose a strong password, between 3 and 32 characters</word_default>
-      <word_custom>Вы должны и�пользовать �ложный пароль, �одержащий не менее 3 и не более 32 �имволов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_reenter_email</word_key>
-      <word_default>Re-enter your e-mail address</word_default>
-      <word_custom>Подтвердите e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_choose_password</word_key>
-      <word_default>Choose your password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_enter_email</word_key>
-      <word_default>Enter your e-mail address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_enter_email_desc</word_key>
-      <word_default>So that we can verify your identity, and keep you updated</word_default>
-      <word_custom>Дл� того чтобы мы могли подтвердить вашу реги�трацию </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>dname_desc_one</word_key>
-      <word_default>The name that will be shown next to your topics, posts, etc. This should be between 3 and</word_default>
-      <word_custom>Им� пользовател� будет отображать�� во в�ех ваших темах, �ообщени�х и т.п. Должно �одержать не менее 3, но и не более</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>dname_desc_two</word_key>
-      <word_default>characters long.</word_default>
-      <word_custom>�имволов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_choose_dname</word_key>
-      <word_default>Choose a display name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>char_cant_use</word_key>
-      <word_default><![CDATA[The name you'll sign in with. You can't use: <em>[ ] | ; , &#036; &#92; &lt; &gt; &quot;</em>]]></word_default>
-      <word_custom><![CDATA[Им� и�пользуемое дл� входа на форум. Вы не можете и�пользовать: [ ] | ; , &#036;  &lt; &gt; &quot;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_choose_user</word_key>
-      <word_default>Choose a username</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_step1</word_key>
-      <word_default>Account Information</word_default>
-      <word_custom>Шаг 1: Данные учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_errors_found</word_key>
-      <word_default>Errors were found with your registration. Please correct the highlighted fields below.</word_default>
-      <word_custom>В проце��е проверки реги�трации были найдены ошибки в заполнении формы. Пожалуй�та и�правьте их и продолжите реги�трацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>sign_in_page</word_key>
-      <word_default>sign in page</word_default>
-      <word_custom>�траницу входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>goto_signin</word_key>
-      <word_default>Go to sign in</word_default>
-      <word_custom>Перейти на �траницу входа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>already_account</word_key>
-      <word_default>If you already have an account, you can go directly to the</word_default>
-      <word_custom>Е�ли вы уже зареги�трированы на нашем форуме, вы можете про�ледовать �разу на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_free</word_key>
-      <word_default><![CDATA[It's free and simple to register for our board! We just need a few pieces of information from you, and you'll be ready to make your first post in no time!]]></word_default>
-      <word_custom>Реги�траци� на нашем форуме крайне про�та и аб�олютно бе�платна. Мы узнаем немножко информации о ва�, и вы через мгновение �можете пользовать�� в�еми возможно�т�ми форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>ready_register</word_key>
-      <word_default>Ready to register?</word_default>
-      <word_custom>Готовы зареги�трировать��?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>why_register</word_key>
-      <word_default>Why register?</word_default>
-      <word_custom>Зачем реги�трировать��?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>fb_welcome</word_key>
-      <word_default>Welcome,</word_default>
-      <word_custom>Здрав�твуйте,</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>lost_your_password</word_key>
-      <word_default><![CDATA[If you've lost your password, you can use this form to reset it.]]></word_default>
-      <word_custom>При помощи данной формы вы можете �бро�ить ваш текущий пароль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>recover_password</word_key>
-      <word_default>Recover Password</word_default>
-      <word_custom>Во��тановление парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>complete_form</word_key>
-      <word_default>Please complete the form fully</word_default>
-      <word_custom>Пожалуй�та полно�тью заполните форму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>forum_terms</word_key>
-      <word_default><![CDATA[Forum Terms &amp; Rules]]></word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>following_errors</word_key>
-      <word_default>The following errors were found:</word_default>
-      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_with_facebook</word_key>
-      <word_default>Register Using Facebook</word_default>
-      <word_custom>Зареги�трировать�� через Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>passwords_not_match</word_key>
-      <word_default>The password fields did not match</word_default>
-      <word_custom>Введенные пароли не �овпадают</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>log_with_facebook</word_key>
-      <word_default>Log in with facebook</word_default>
-      <word_custom>Вход � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_step4_spam</word_key>
-      <word_default>Verify you are a human</word_default>
-      <word_custom>Шаг 4: Защитный код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>reg_step3_spam</word_key>
-      <word_default>Verify you are a human</word_default>
-      <word_custom>Шаг 3: Защитный код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>register</word_key>
-      <word_default>Register</word_default>
+      <word_key>registration_process</word_key>
+      <word_default>Registration Process</word_default>
       <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>connect_unknown</word_key>
-      <word_default>An unknown error occured. Please continue logging in with a new account and contact an admin to merge your accounts</word_default>
-      <word_custom>Возникла неизве�тна� ошибка. Пожалуй�та, попробуйте продолжить начатое дей�твие и �ообщите о возникшей ошибке админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>reg_success</word_key>
+      <word_default>Registration Successful</word_default>
+      <word_custom>Реги�траци� завершена.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_register</word_pack>
-      <word_key>connect_already_linked</word_key>
-      <word_default>The forum account %s is already connected to a %s user</word_default>
-      <word_custom>Учетна� запи�ь %s уже �в�зана � пользователем %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_incorrect_details</word_key>
-      <word_default>Incorrect email address or password</word_default>
-      <word_custom>�еверные email или пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_sub</word_key>
-      <word_default><![CDATA[<strong>%s</strong>, you're almost there!]]></word_default>
-      <word_custom><![CDATA[<strong>%s</strong>, вы уже зде�ь!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_sub_desc</word_key>
-      <word_default><![CDATA[As you've logged in via <strong>%s</strong> for the first time, we just need a few more details before we can proceed.]]></word_default>
-      <word_custom><![CDATA[Вы вошли через <strong>%s</strong> в первый раз, по�тому нам необходимо получить еще немного информации о ва�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_desc</word_key>
-      <word_default><![CDATA[You can either create a new <strong>forum account</strong> or connect your %s account to your existing forum account.]]></word_default>
-      <word_custom><![CDATA[Вы можете либо �оздать новую <strong>учетную запи�ь на форуме</strong> либо при�оединить ваш %s аккаунт к уже �уще�твующей.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_password</word_key>
-      <word_default><![CDATA[Enter your forum account's password]]></word_default>
-      <word_custom>Введите пароль от учетной запи�и на форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_username</word_key>
-      <word_default><![CDATA[Enter your forum account's email address]]></word_default>
-      <word_custom>Введите email вашего учетной запи�и на форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_account_desc</word_key>
-      <word_default><![CDATA[If you <em>do</em> already have forum account, complete this section:]]></word_default>
-      <word_custom><![CDATA[Е�ли у ва� <em>уже</em> е�ть учетна� запи�ь на форуме. пожалуй�та, заполните �ти пол�:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_account_submit</word_key>
-      <word_default>Connect Accounts</word_default>
-      <word_custom>Св�зать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_account_desc</word_key>
-      <word_default><![CDATA[If you <em>do not</em> have a forum account, complete this section:]]></word_default>
-      <word_custom><![CDATA[Е�ли у ва� <em>еще нет</em> учетной запи�и на форуме, пожалуй�та заполните �ледующие пол�:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>login_w_twitter</word_key>
-      <word_default>Sign in with your Twitter account</word_default>
-      <word_custom>Вход � и�пользованием Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_account_title</word_key>
-      <word_default>Create a new forum account</word_default>
-      <word_custom>Создание новой учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>new_account_submit</word_key>
-      <word_default>Create New Account</word_default>
-      <word_custom>Создать учетную запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>connect_account_title</word_key>
-      <word_default>Connect to an existing forum account</word_default>
-      <word_custom>При�оединить к �уще�твующей учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>twitter_login_title</word_key>
-      <word_default>Twitter Sign In</word_default>
-      <word_custom>Вход через Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>login_w_facebook</word_key>
-      <word_default>Sign in with your Facebook account</word_default>
-      <word_custom>Войти � и�пользованием Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>fb_login_title</word_key>
-      <word_default>Facebook Sign In</word_default>
-      <word_custom>Вход через Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>dumb_submit</word_key>
-      <word_default>Proceed</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>dumb_header</word_key>
-      <word_default>Account Activation</word_default>
-      <word_custom>�ктиваци� учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_register</word_pack>
-      <word_key>val_key</word_key>
-      <word_default>Validation Key:</word_default>
-      <word_custom>Ключ активации:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>preview_reg_text</word_key>
+      <word_default>Your registration has been successful. The administrator wishes to preview all new registered accounts before posting permissions are granted. The administrator has been notified of your registration.</word_default>
+      <word_custom>Ваша реги�траци� завершена. �дмини�траци� форума провер�ет в�е новые учетные запи�и, перед предо�тавлением полного до�тупа к форуму. �дмини�тратор уже оповещен о вашей реги�трации.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -12606,919 +14579,90 @@ The <#BOARD_NAME#> team.
       <word_key>user_id</word_key>
       <word_default>User ID:</word_default>
       <word_custom>ID пользовател�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>val_key</word_key>
+      <word_default>Validation Key:</word_default>
+      <word_custom>Ключ активации:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>dumb_header</word_key>
+      <word_default>Account Activation</word_default>
+      <word_custom>�ктиваци� учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>dumb_submit</word_key>
+      <word_default>Proceed</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>nav_reg</word_key>
+      <word_default>Registration</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>auth_text</word_key>
+      <word_default><![CDATA[Your registration has been submitted.<br /><br />The community administrator has chosen to require validation for all email addresses. Within the next 10 minutes (usually instantly) you'll receive an email with instructions on the next step. Don't worry, it won't take long before you can post!<br /><br />The email has been sent to]]></word_default>
+      <word_custom><![CDATA[Ваша реги�траци� завершена.<br /><br />�дмини�траци� форума требует подтверждени� в�ех e-mail адре�ов. В �ледующие 10 минут (обычно мгновенно) вы получите пи�ьмо � ин�трукци�ми по активации вашей учетной запи�и. Следуйте в�ем ин�трукци�м в пи�ьме и вы �можете во�пользовать�� в�еми возможно�т�ми форума уже через не�колько минут! <br /><br />Пи�ьмо было вы�лано на адре� ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_register</word_pack>
+      <word_key>connect_sub2</word_key>
+      <word_default><![CDATA[You're almost there!]]></word_default>
+      <word_custom>Вы уже зде�ь!</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_reports</word_pack>
-      <word_key>report_msg_page</word_key>
-      <word_default>Report this message to a moderator</word_default>
-      <word_custom>Пожаловать�� модератору на �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_msg_title</word_key>
-      <word_default>Private Message Title</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_msg_msg</word_key>
-      <word_default><![CDATA[<strong>Enter your report</strong><br /><br />]]></word_default>
-      <word_custom><![CDATA[<b>Жалоба</b><br />Примечание: копи� личного �ообщени� будет включена в жалобу]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_file_msg</word_key>
-      <word_default><![CDATA[<strong>Enter your report</strong><br /><br />]]></word_default>
-      <word_custom><![CDATA[<b>Введите жалобу</b><br /><br />Примечание: Модератор будет проинформирован о ��ылке на файл.<br /><br />]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_file_title</word_key>
-      <word_default>File Name</word_default>
-      <word_custom>Им� файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_file_page</word_key>
-      <word_default>Report this file to a moderator</word_default>
-      <word_custom>Пожаловать�� модератору на файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_options</word_key>
-      <word_default>Notifications</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_section_title_site_gallery</word_key>
-      <word_default>Site Gallery</word_default>
-      <word_custom>Галере�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_gallery_comment_suffix</word_key>
-      <word_default> - Comment</word_default>
-      <word_custom> - комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_gallery_image_suffix</word_key>
-      <word_default> - Image</word_default>
-      <word_custom> - изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_by_alert</word_key>
-      <word_default><![CDATA[<b>Notification by Board Alert?</b><br />Receive a notification through a board alert when a report is received. You will see this alert while browsing the forums, and you don't have to fill up your private message box.]]></word_default>
-      <word_custom><![CDATA[<strong>Уведомление через оповещение форума</strong><br />Получать уведомлени� о новых жалобах во в�плывающем информационном окне. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_by_email</word_key>
-      <word_default>Notification by Email?</word_default>
-      <word_custom>Отправл�ть уведомлени� на адре� �лектронной почты?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_pm_desc</word_key>
-      <word_default>Receive a notification through private message when a report is received.</word_default>
-      <word_custom>Получать уведомлени� о новых жалобах по личной почте.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>reports_methods_saved</word_key>
-      <word_default>Your notification preferences have been saved</word_default>
-      <word_custom>�а�тройки уведомлений были �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_comment_saved</word_key>
-      <word_default>Your comment has been saved successfully</word_default>
-      <word_custom>Ваш комментарий был у�пешно добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_settings_by_pm</word_key>
-      <word_default>Notification by Private Message?</word_default>
-      <word_custom>Отправл�ть уведомлени� личным �ообщением?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_ajax_tab_notif_meth</word_key>
-      <word_default>Notification Methods</word_default>
-      <word_custom>Уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>active_users_members</word_key>
-      <word_default>%s members:</word_default>
-      <word_custom>%s пользователей:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>active_users_title</word_key>
-      <word_default>%s user(s) are viewing</word_default>
-      <word_custom>%s человек про�матривают �ту �траницу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>active_users_detail</word_key>
-      <word_default><![CDATA[<strong>%s</strong> members, <strong>%s</strong> guests, <strong>%s</strong> anonymous users]]></word_default>
-      <word_custom>%s пользователей, %s го�тей, %s �крытых пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>redirect_delete_report</word_key>
-      <word_default>Deleting Reports...</word_default>
-      <word_custom>Удаление жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>redirect_mark_status</word_key>
-      <word_default>Marking Reports...</word_default>
-      <word_custom>Изменение �тату�а жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_option_prune</word_key>
-      <word_default>Prune Reports</word_default>
-      <word_custom>Очи�тить от жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_option_delete</word_key>
-      <word_default>Delete Reports</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_page_title_unknown</word_key>
-      <word_default>Unknown Title</word_default>
-      <word_custom>�ет заголовка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_sending</word_key>
-      <word_default>Sending Report...</word_default>
-      <word_custom>Отправка жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_post_enter</word_key>
-      <word_default><![CDATA[<strong>Enter your report</strong>]]></word_default>
-      <word_custom><![CDATA[Жалоба<br /><br />Примечание: вам не нужно указывать зде�ь тему и �ообщение, модератор автоматиче�ки получит �ту информацию.<br /><br />Пожалуй�та, и�пользуйте �ту возможно�ть форума только дл� жалоб о некорректном �ообщении. Дл� �в�зи � модератором и�пользуйте личные �ообщени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_basic_submit</word_key>
-      <word_default>Submit Report</word_default>
-      <word_custom>Отправить жалобу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_post_url_title</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_basic_desc</word_key>
-      <word_default><![CDATA[Please note: The moderator will be made aware of the link to the page you are reporting.<br />This form is to be used ONLY for reporting objectionable content and is not to be used as a method of communicating with moderators for other reasons.]]></word_default>
-      <word_custom>Внимание: данна� форма не предназначена дл� �в�зи � админи�трацией форума, и�пользуйте ее только дл� указани� на нарушающие правила форума публикации!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_post_title</word_key>
-      <word_default>Report this post to a moderator</word_default>
-      <word_custom>Отправить жалобу модератору на �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_basic_enter</word_key>
-      <word_default><![CDATA[<strong>Enter your report</strong>]]></word_default>
-      <word_custom><![CDATA[Введите тек�т жалобы<br /><br />Примечание: вам не нужно указывать зде�ь тему и �ообщение, модератор автоматиче�ки получит �ту информацию.<br /><br />Пожалуй�та, и�пользуйте �ту возможно�ть форума только дл� жалоб о некорректном �ообщении. Дл� �в�зи � модератором и�пользуйте личные �ообщени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_basic_url_title</word_key>
-      <word_default>Reporting Page</word_default>
-      <word_custom>Сообщение о</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_basic_title</word_key>
-      <word_default>Report this page to a moderator</word_default>
-      <word_custom>Сообщить о</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_comments</word_key>
-      <word_default>Comments</word_default>
-      <word_custom>Комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_last_updated</word_key>
-      <word_default>Last Updated</word_default>
-      <word_custom>По�леднее обновление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_reports</word_key>
-      <word_default>Reports</word_default>
-      <word_custom>Жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_section</word_key>
-      <word_default>Section</word_default>
-      <word_custom>Секци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_header_updated_by</word_key>
-      <word_default>Updated By</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>main_title</word_key>
-      <word_default>Report Center</word_default>
-      <word_custom>Си�тема жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>list_title</word_key>
-      <word_default>Reports</word_default>
-      <word_custom>Жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_prune_days_box</word_key>
-      <word_default>days</word_default>
+      <word_key>report_prune_2</word_key>
+      <word_default>days old</word_default>
       <word_custom>дней назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_reports</word_pack>
-      <word_key>older_than</word_key>
-      <word_default>older than</word_default>
-      <word_custom>размещенных больше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_prune_message_none</word_key>
-      <word_default>Nothing to prune...</word_default>
-      <word_custom>По заданному критерию жалоб не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_prune_message_done</word_key>
-      <word_default>Pruning reports...</word_default>
-      <word_custom>Удаление жалоб</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_actions_mark_optgroup</word_key>
-      <word_default>Mark Report As</word_default>
-      <word_custom>Пометить жалобу как</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_actions</word_key>
-      <word_default>Report Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>rss_feed_title</word_key>
-      <word_default>Report Notification</word_default>
-      <word_custom>Уведомлени� о жалобах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_cal_msg</word_key>
-      <word_default><![CDATA[<b>Enter your report</b>]]></word_default>
-      <word_custom>Введите тек�т жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_cal_title</word_key>
-      <word_default>Event Title</word_default>
-      <word_custom>Событие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_cal_page</word_key>
-      <word_default>Report this event to a moderator</word_default>
-      <word_custom>Сообщить о �обытии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_section_title_cal</word_key>
-      <word_default>Calendar Event</word_default>
-      <word_custom>Календарное �обытие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_mem_title</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_mem_msg</word_key>
-      <word_default><![CDATA[<b>Enter your report</b>]]></word_default>
-      <word_custom>Введите тек�т жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_mem_page</word_key>
-      <word_default>Report this profile to a moderator</word_default>
-      <word_custom>Сообщить о профиле пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_section_title_mem</word_key>
-      <word_default>Member Profile</word_default>
-      <word_custom>Профиль пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_section_title_msg</word_key>
-      <word_default>Private Message</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_section_title_site_downloads</word_key>
-      <word_default>Download Manager</word_default>
-      <word_custom>Файловый архив</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>reports_rss_desc</word_key>
-      <word_default>Shows new reports from the report center.</word_default>
-      <word_custom>По�мотреть новые жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>reports_messenger</word_key>
-      <word_default>Messenger</word_default>
-      <word_custom>Личный �щик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>with_selected</word_key>
-      <word_default>with selected</word_default>
-      <word_custom>� отмеченными</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>status</word_key>
-      <word_default>Status</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>view_content</word_key>
-      <word_default>View content</word_default>
-      <word_custom>По�мотреть �одержимое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>post_button</word_key>
-      <word_default>Post</word_default>
-      <word_custom>Опубликовать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>reporting_title</word_key>
-      <word_default>Report:</word_default>
-      <word_custom>�азвание темы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>add_comment_title</word_key>
-      <word_default>Add Comment</word_default>
-      <word_custom>Добавить комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>no_comments_on_report</word_key>
-      <word_default>There are no comments on this report yet.</word_default>
-      <word_custom>Комментариев пока нет.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>posted_prefix</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>comments_h2</word_key>
-      <word_default>Comments</word_default>
-      <word_custom>Комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>reports_h2</word_key>
-      <word_default>Reports</word_default>
-      <word_custom>Жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>change_status_title</word_key>
-      <word_default>Change status</word_default>
-      <word_custom>Изменить �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>mark_status_as</word_key>
-      <word_default>Mark as</word_default>
-      <word_custom>Пометить как</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>current_status</word_key>
-      <word_default>Current Status:</word_default>
-      <word_custom>Текущий �тату�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>change_current_status</word_key>
-      <word_default>Change Current Status</word_default>
-      <word_custom>Изменить текущий �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>delete_report</word_key>
-      <word_default>Delete Report</word_default>
-      <word_custom>Удалить жалобу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_join_pm</word_key>
-      <word_default>Join the private conversation</word_default>
-      <word_custom>При�оединит�� к личной перепи�ке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_view_reported</word_key>
-      <word_default>View reported content</word_default>
-      <word_custom>По�мотреть �одержимое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_about_pm</word_key>
-      <word_default>a private message titled</word_default>
-      <word_custom>личному �ообщению:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_about_intro</word_key>
-      <word_default>This report is regarding</word_default>
-      <word_custom>Жалоба отно�ит�� к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>configure_notifications</word_key>
-      <word_default>Configure Notifications</word_default>
-      <word_custom>Опции уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>no_reports</word_key>
-      <word_default>There are no reports to view</word_default>
-      <word_custom>�ет жалоб дл� ра��мотрени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>view_member</word_key>
-      <word_default>View member</word_default>
-      <word_custom>Про�мотр профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>report_updated</word_key>
-      <word_default>Updated:</word_default>
-      <word_custom>Отправлено: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>go_to_section</word_key>
-      <word_default>Go to section</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>view_report</word_key>
-      <word_default>View report</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_reports</word_pack>
-      <word_key>select_all_reports</word_key>
-      <word_default>Select all reports</word_default>
-      <word_custom>Отметить в�е жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>report_prune_1</word_key>
+      <word_default>Prune reports older than</word_default>
+      <word_custom>Удалить отчеты �тарше, чем</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_reports</word_pack>
       <word_key>reported_content_summary</word_key>
-      <word_default>Reported content from across your board</word_default>
+      <word_default>Reported content from across your community</word_default>
       <word_custom>Жалобы не контент �о в�его форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_reports</word_pack>
-      <word_key>reports_no_plugin</word_key>
-      <word_default>The report center module for the content you are trying to report is not configured correctly.</word_default>
-      <word_custom>Си�тема жалоб дл� данного типа публикаций не на�троена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>report_no_title</word_key>
+      <word_default>No report title</word_default>
+      <word_custom>�ет заголовка у жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>click_here_link</word_key>
+      <word_default>Click here</word_default>
+      <word_custom>�ажмите зде�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>to_view_allrep</word_key>
+      <word_default>to view all reports.</word_default>
+      <word_custom>дл� про�мотра в�ех жалоб</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -13526,9 +14670,41 @@ The <#BOARD_NAME#> team.
       <word_key>reports_no_comment_text</word_key>
       <word_default>You did not submit a comment to save.</word_default>
       <word_custom>Вы не ввели комментарий.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reports_no_plugin</word_key>
+      <word_default>The report center module for the content you are trying to report is not configured correctly.</word_default>
+      <word_custom>Си�тема жалоб дл� данного типа публикаций не на�троена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>only_active_note</word_key>
+      <word_default>Only active reports are currently being displayed.</word_default>
+      <word_custom>Сейча� отображают�� только активные жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>view_report</word_key>
+      <word_default>View report</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>go_to_section</word_key>
+      <word_default>Go to section</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>select_all_reports</word_key>
+      <word_default>Select all reports</word_default>
+      <word_custom>Отметить в�е жалобы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -13536,9 +14712,468 @@ The <#BOARD_NAME#> team.
       <word_key>no_permission_addreport</word_key>
       <word_default>You do not have permission to add yourself to private conversations.</word_default>
       <word_custom>Вы не можете добавить �еб� в личную бе�еду.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_updated</word_key>
+      <word_default>Updated</word_default>
+      <word_custom>Отправлено: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_view_reported</word_key>
+      <word_default>View reported content</word_default>
+      <word_custom>По�мотреть �одержимое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>delete_report</word_key>
+      <word_default>Delete Report</word_default>
+      <word_custom>Удалить жалобу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_about_pm</word_key>
+      <word_default>a private message titled</word_default>
+      <word_custom>личному �ообщению:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_join_pm</word_key>
+      <word_default>Join the private conversation</word_default>
+      <word_custom>При�оединит�� к личной перепи�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_about_intro</word_key>
+      <word_default>This report is regarding</word_default>
+      <word_custom>Жалоба отно�ит�� к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>configure_notifications</word_key>
+      <word_default>Configure Notifications</word_default>
+      <word_custom>Опции уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>view_member</word_key>
+      <word_default>View member</word_default>
+      <word_custom>Про�мотр профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>no_reports</word_key>
+      <word_default>There are no reports to view</word_default>
+      <word_custom>�ет жалоб дл� ра��мотрени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>change_status_title</word_key>
+      <word_default>Change status</word_default>
+      <word_custom>Изменить �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>change_current_status</word_key>
+      <word_default>Change Current Status</word_default>
+      <word_custom>Изменить текущий �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>current_status</word_key>
+      <word_default>Current Status:</word_default>
+      <word_custom>Текущий �тату�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>mark_status_as</word_key>
+      <word_default>Mark as</word_default>
+      <word_custom>Пометить как</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>comments_h2</word_key>
+      <word_default>Comments</word_default>
+      <word_custom>Комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>no_comments_on_report</word_key>
+      <word_default>There are no comments on this report yet.</word_default>
+      <word_custom>Комментариев пока нет.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reports_h2</word_key>
+      <word_default>Reports</word_default>
+      <word_custom>Жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>add_comment_title</word_key>
+      <word_default>Add Comment</word_default>
+      <word_custom>Добавить комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>posted_prefix</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>post_button</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Опубликовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reporting_title</word_key>
+      <word_default>Report:</word_default>
+      <word_custom>�азвание темы:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>view_content</word_key>
+      <word_default>View content</word_default>
+      <word_custom>По�мотреть �одержимое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>status</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Стату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>r_with_selected</word_key>
+      <word_default>With selected reports:</word_default>
+      <word_custom>С выбранными жалобами:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>r_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reports_messenger</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Личный �щик</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_section_title_site_downloads</word_key>
+      <word_default>Download Manager</word_default>
+      <word_custom>Файловый архив</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reports_rss_desc</word_key>
+      <word_default>Shows new reports from the report center.</word_default>
+      <word_custom>По�мотреть новые жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_mem_page</word_key>
+      <word_default>Report this profile to a moderator</word_default>
+      <word_custom>Сообщить о профиле пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_mem_title</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_mem_msg</word_key>
+      <word_default><![CDATA[<b>Enter your report</b>]]></word_default>
+      <word_custom>Введите тек�т жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_section_title_msg</word_key>
+      <word_default>Private Message</word_default>
+      <word_custom>Личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_section_title_mem</word_key>
+      <word_default>Member Profile</word_default>
+      <word_custom>Профиль пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_actions</word_key>
+      <word_default>Report Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_actions_mark_optgroup</word_key>
+      <word_default>Mark Report As</word_default>
+      <word_custom>Пометить жалобу как</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_section</word_key>
+      <word_default>Section</word_default>
+      <word_custom>Секци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_updated_by</word_key>
+      <word_default>Updated By</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_title</word_key>
+      <word_default>Reports</word_default>
+      <word_custom>Жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>main_title</word_key>
+      <word_default>Report Center</word_default>
+      <word_custom>Си�тема жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_prune_days_box</word_key>
+      <word_default>days</word_default>
+      <word_custom>дней назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>older_than</word_key>
+      <word_default>older than</word_default>
+      <word_custom>размещенных больше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_prune_message_none</word_key>
+      <word_default>Nothing to prune...</word_default>
+      <word_custom>По заданному критерию жалоб не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_prune_message_done</word_key>
+      <word_default>Pruning reports...</word_default>
+      <word_custom>Удаление жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>rss_feed_title</word_key>
+      <word_default>Report Notification</word_default>
+      <word_custom>Уведомлени� о жалобах</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_comments</word_key>
+      <word_default>Comments</word_default>
+      <word_custom>Комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_reports</word_key>
+      <word_default>Reports</word_default>
+      <word_custom>Жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>list_header_last_updated</word_key>
+      <word_default>Last Updated</word_default>
+      <word_custom>По�леднее обновление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_basic_url_title</word_key>
+      <word_default>Reporting Page</word_default>
+      <word_custom>Сообщение о</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_basic_title</word_key>
+      <word_default>Report this page to a moderator</word_default>
+      <word_custom>Сообщить о</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_basic_desc</word_key>
+      <word_default><![CDATA[Please note: The moderator will be made aware of the link to the page you are reporting.<br />This form is to be used ONLY for reporting objectionable content and is not to be used as a method of communicating with moderators for other reasons.]]></word_default>
+      <word_custom>Внимание: данна� форма не предназначена дл� �в�зи � админи�трацией форума, и�пользуйте ее только дл� указани� на нарушающие правила форума публикации!</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>redirect_mark_status</word_key>
+      <word_default>Marking Reports...</word_default>
+      <word_custom>Изменение �тату�а жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>redirect_delete_report</word_key>
+      <word_default>Deleting Reports...</word_default>
+      <word_custom>Удаление жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_ajax_tab_notif_meth</word_key>
+      <word_default>Notification Methods</word_default>
+      <word_custom>Уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>reports_methods_saved</word_key>
+      <word_default>Your notification preferences have been saved</word_default>
+      <word_custom>�а�тройки уведомлений были �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_comment_saved</word_key>
+      <word_default>Your comment has been saved successfully</word_default>
+      <word_custom>Ваш комментарий был у�пешно добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_gallery_comment_suffix</word_key>
+      <word_default> - Comment</word_default>
+      <word_custom> - комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_gallery_image_suffix</word_key>
+      <word_default> - Image</word_default>
+      <word_custom> - изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_basic_enter</word_key>
+      <word_default><![CDATA[<strong>Enter your report</strong>]]></word_default>
+      <word_custom>Введите тек�т жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>active_users_members</word_key>
+      <word_default>%s members:</word_default>
+      <word_custom>%s пользователей:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>active_users_title</word_key>
+      <word_default>%s user(s) are viewing</word_default>
+      <word_custom>%s человек про�матривают �ту �траницу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_file_title</word_key>
+      <word_default>File Name</word_default>
+      <word_custom>Им� файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_file_page</word_key>
+      <word_default>Report this file to a moderator</word_default>
+      <word_custom>Пожаловать�� модератору на файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_file_msg</word_key>
+      <word_default><![CDATA[<strong>Enter your report</strong><br /><br />]]></word_default>
+      <word_custom><![CDATA[<b>Введите жалобу</b><br /><br />Примечание: Модератор будет проинформирован о ��ылке на файл.<br /><br />]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_msg_page</word_key>
+      <word_default>Report this message to a moderator</word_default>
+      <word_custom>Пожаловать�� модератору на �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_msg_title</word_key>
+      <word_default>Private Message Title</word_default>
+      <word_custom>Личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_msg_msg</word_key>
+      <word_default><![CDATA[<strong>Enter your report</strong><br /><br />]]></word_default>
+      <word_custom><![CDATA[<b>Жалоба</b><br />Примечание: копи� личного �ообщени� будет включена в жалобу]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -13546,9 +15181,6 @@ The <#BOARD_NAME#> team.
       <word_key>subject_report</word_key>
       <word_default><![CDATA[<a href='%s'>%s</a> has <a href='%s'>reported</a> <a href='%s'>something</a>]]></word_default>
       <word_custom><![CDATA[<a href='%s'>%s</a> о�тавил <a href='%s'>жалобу</a> на <a href='%s'>�ледующее</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -13571,1311 +15203,447 @@ Report:
 
 ------------------------------------------------
 ]]></word_default>
-      <word_custom><![CDATA[<#MOD_NAME#>, 
-Вам было отправлено уведомление от <#USERNAME#> через кнопку «Жалоба». 
-
------------------------------------------------- 
-
-С�ылка: <#LINK#> 
-
------------------------------------------------- 
-
-Жалоба: <#REPORT#> 
-
+      <word_custom><![CDATA[<#MOD_NAME#>, 
+Вам было отправлено уведомление от <#USERNAME#> через кнопку «Жалоба». 
+
+------------------------------------------------ 
+
+С�ылка: <#LINK#> 
+
+------------------------------------------------ 
+
+Жалоба: <#REPORT#> 
+
 ------------------------------------------------ ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_title</word_key>
-      <word_default>All %s by %s</word_default>
-      <word_custom>В�е %s %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_posts_title</word_key>
-      <word_default>Active content</word_default>
-      <word_custom>�ктивные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_form</word_key>
-      <word_default>Search Form</word_default>
-      <word_custom>Форма пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_results</word_key>
-      <word_default>Search Results</word_default>
-      <word_custom>Результаты пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>no_xml_permission</word_key>
-      <word_default>Sorry, but you do not have permission to use the search feature.</word_default>
-      <word_custom>Вы не можете пользовать�� пои�ком.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>xml_flood</word_key>
-      <word_default>Flood control is enabled. Please wait at least %s seconds before attempting to search again</word_default>
-      <word_custom>Флуд контроль включен. Вы �можете во�пользовать�� пои�ком через %s �екунд.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_off</word_key>
-      <word_default>Sorry, the administrator has taken the search engine offline for the moment. Please try again later</word_default>
-      <word_custom>�дмини�тратор отключил функцию пои�ка. Пожалуй�та, попробуйте позже</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>livesearch_thisforum</word_key>
-      <word_default>This Forum</word_default>
-      <word_custom>Пои�к по форуму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>livesearch_thistopic</word_key>
-      <word_default>This Topic</word_default>
-      <word_custom>Пои�к по теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_invalid_date_future</word_key>
-      <word_default>One or both of the dates in your search are in the future, please check your date range and try again</word_default>
-      <word_custom>Одна из выбранных вами дат еще не на�тупила, проверьте выбранные даты и попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_invalid_date_range</word_key>
-      <word_default>The date range you selected for your search is invalid, please ensure that the start date is not later than the end date</word_default>
-      <word_custom>Выбранные даты неверны, убедите�ь что начальна� дата не позже, чем конечна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_term_long</word_key>
-      <word_default><![CDATA[One or all of your search keywords were longer than %s characters.  Don't you think that's a bit long of a piece of a text to get a reliable search result?  Please shorten it a bit..]]></word_default>
-      <word_custom>Строка �одержит более %s �имволов. Пожалуй�та, верните�ь назад и попробуйте вве�ти более короткую �троку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_term_short</word_key>
-      <word_default><![CDATA[One or all of your search keywords were below %s characters or you searched for words which are not allowed, such as 'html', 'img', etc, please increase the length of these search keywords or choose different keywords.]]></word_default>
-      <word_custom><![CDATA[Одно или в�е введенные вами ключевые �лова дл� пои�ка имеет менее %s �имволов, или же вы ввели в каче�тве ключевого �лова недопу�тимые к пои�ку �лова, такие как 'html', 'img' и т.д. Верните�ь назад и увеличьте количе�тво �имволов в ключевом �лове, либо измените его.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>see_all_ps</word_key>
-      <word_default>See all %s results</word_default>
-      <word_custom>Выве�ти в�е %s результатов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>quick_search</word_key>
-      <word_default>Quick Search</word_default>
-      <word_custom>Бы�трый пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_none</word_key>
-      <word_default>There is no information to show.</word_default>
-      <word_custom>По вашему запро�у ничего не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_all</word_key>
-      <word_default>All User Content</word_default>
-      <word_custom>В�е публикации пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_have_been</word_key>
-      <word_default>There have been</word_default>
-      <word_custom>�айдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_title_member</word_key>
-      <word_default>by </word_default>
-      <word_custom>пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_title_posts</word_key>
-      <word_default>posts</word_default>
-      <word_custom>�ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_title_topics</word_key>
-      <word_default>topics</word_default>
-      <word_custom>темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>user_posts_title_all</word_key>
-      <word_default>All</word_default>
-      <word_custom>В�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>new_content_all</word_key>
-      <word_default>All New Content</word_default>
-      <word_custom>В�е новые публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>new_content_none</word_key>
-      <word_default>Sorry, no new content found.</word_default>
-      <word_custom>�овых публикаций не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>new_content_entries</word_key>
-      <word_default>new entries</word_default>
-      <word_custom>новых �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>new_content</word_key>
-      <word_default>New content</word_default>
-      <word_custom>�овые публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>new_content_there</word_key>
-      <word_default>There are</word_default>
-      <word_custom>Добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_none</word_key>
-      <word_default>No active content found</word_default>
-      <word_custom>По вашему запро�у ничего не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_all</word_key>
-      <word_default>All Active Content</word_default>
-      <word_custom>В�е активные публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_have_been</word_key>
-      <word_default>There have been</word_default>
-      <word_custom>Опубликовано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_entries</word_key>
-      <word_default>entries in the last %s</word_default>
-      <word_custom>�ообщений за по�ледние %</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_content</word_key>
-      <word_default>Active content in the last %s</word_default>
-      <word_custom>�ктивные публикации за по�ледние %</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>no_results_found</word_key>
-      <word_default>No results found</word_default>
-      <word_custom>Пои�к не дал результатов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>no_results_found_for</word_key>
-      <word_default>for</word_default>
-      <word_custom>по</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>sort_by_date</word_key>
-      <word_default>Sort by Date</word_default>
-      <word_custom>Сортировать по дате</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>my_results</word_key>
-      <word_default>My Results</word_default>
-      <word_custom>Мои результаты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>sort_by_relevance</word_key>
-      <word_default>Sort by Relevance</word_default>
-      <word_custom>Сортировать по релевантно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_search_returned</word_key>
-      <word_default>returned</word_default>
-      <word_custom>вернул</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_search_results</word_key>
-      <word_default>results</word_default>
-      <word_custom>результатов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_search</word_key>
-      <word_default>Your search for the term</word_default>
-      <word_custom>Пои�к по �лову</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>generic_content</word_key>
-      <word_default>Content</word_default>
-      <word_custom>Контент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>gallery_comment</word_key>
-      <word_default>Comment</word_default>
-      <word_custom>Комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>gallery_posted_by</word_key>
-      <word_default>Posted by</word_default>
-      <word_custom>Отправил</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>gallery_comments</word_key>
-      <word_default>comments</word_default>
-      <word_custom>комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>gallery_image</word_key>
-      <word_default>Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>member_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>member_joined</word_key>
-      <word_default>Joined on</word_default>
-      <word_custom>Реги�траци�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>core_help</word_key>
-      <word_default>Help</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>calendar_event</word_key>
-      <word_default>Event</word_default>
-      <word_custom>Событие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_forum</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_replies</word_key>
-      <word_default>replies</word_default>
-      <word_custom>ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_topic_also</word_key>
-      <word_default>Also in this topic</word_default>
-      <word_custom>Также в �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_by</word_key>
-      <word_default>by</word_default>
-      <word_custom>автор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>view_result</word_key>
-      <word_default>View result</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>to</word_key>
-      <word_default>to</word_default>
-      <word_custom><![CDATA[ &mdash;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>find_forum</word_key>
-      <word_default><![CDATA[Find in <strong>forum</strong>]]></word_default>
-      <word_custom>И�кать в форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>find_date</word_key>
-      <word_default><![CDATA[Find by <strong>date</strong>]]></word_default>
-      <word_custom><![CDATA[Пои�к по <strong>дате</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>find_author</word_key>
-      <word_default><![CDATA[Find <strong>author</strong>]]></word_default>
-      <word_custom><![CDATA[Пои�к по <strong>автору</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>show_as_titles</word_key>
-      <word_default>Show results as titles</word_default>
-      <word_custom>Показывать результаты в виде заголовков тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_titles_only</word_key>
-      <word_default>Search titles only</word_default>
-      <word_custom>И�кать только в названи�х тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>find_words</word_key>
-      <word_default><![CDATA[Find <strong>words</strong>]]></word_default>
-      <word_custom>Пои�к по ключевым �ловам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>removed_search_terms</word_key>
-      <word_default>The following search terms are not allowed and were removed from your query:</word_default>
-      <word_custom>Одно из введенных вами �лов запрещено при и�пользовании пои�ка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>optional_fields</word_key>
-      <word_default>All fields are optional, but you must submit at least one search criteria.</word_default>
-      <word_custom>Об�зательных к заполнению полей нет, но вы должны заполнить хот� бы одно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>attach_header</word_key>
-      <word_default>Attachments</word_default>
-      <word_custom>прикрепленных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_asposts</word_key>
-      <word_default>As posts</word_default>
-      <word_custom>как �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_astopics</word_key>
-      <word_default>As a topic list</word_default>
-      <word_custom>как �пи�ок тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_content</word_key>
-      <word_default><![CDATA[<strong>Search</strong> in]]></word_default>
-      <word_custom><![CDATA[<strong>И�кать</strong> в]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_display</word_key>
-      <word_default><![CDATA[<strong>Display</strong> results]]></word_default>
-      <word_custom><![CDATA[<strong>Показать</strong> результаты]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_stuff_2</word_key>
-      <word_default>%s posts and %s views</word_default>
-      <word_custom>%s �ообщени�ми и %s про�мотрами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_desc</word_key>
-      <word_default><![CDATA[These additional filters can be used to find <strong>discussions</strong>]]></word_default>
-      <word_custom><![CDATA[Дополнительные фильтры дл� <strong>об�уждений</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_forum_stuff</word_key>
-      <word_default><![CDATA[Topics with <strong>at least</strong>]]></word_default>
-      <word_custom><![CDATA[Темы <strong>� не менее</strong>: ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_type_o_0</word_key>
-      <word_default>Descending (z-a)</word_default>
-      <word_custom>по убыванию (�-а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_type_1</word_key>
-      <word_default>Relevance</word_default>
-      <word_custom>релевантно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_type_o_1</word_key>
-      <word_default>Ascending (a-z)</word_default>
-      <word_custom>по возра�танию (а-�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_type_0</word_key>
-      <word_default>Last Update Time</word_default>
-      <word_custom>дате обновлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_show_topics_only</word_key>
-      <word_default>Show results as topics</word_default>
-      <word_custom>Показать только заголовки тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_type</word_key>
-      <word_default><![CDATA[Result <strong>sorting</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Сортировать</strong> результаты по ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_topics_posts</word_key>
-      <word_default><![CDATA[Topic titles &amp; posts]]></word_default>
-      <word_custom>�азвани�х тем и �ообщени�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_mark_all_read</word_key>
-      <word_default>(Mark all items as read)</word_default>
-      <word_custom>(Отметить в�е как прочтенное)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_search_posts</word_key>
-      <word_default>Posts only</word_default>
-      <word_custom>И�кать только �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_section</word_key>
-      <word_default><![CDATA[Search in <strong>section</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Раздел</strong> дл� пои�ка]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_showas_post_info</word_key>
-      <word_default>Post Information</word_default>
-      <word_custom>Информаци� о �ообщении</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>active_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_year</word_key>
-      <word_default>year</word_default>
-      <word_custom>год</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_months</word_key>
-      <word_default>6 months</word_default>
-      <word_custom>6 ме��цев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_month</word_key>
-      <word_default>month</word_default>
-      <word_custom>ме��ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_weeks</word_key>
-      <word_default>2 weeks</word_default>
-      <word_custom>2 недели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_today</word_key>
-      <word_default>24 hours</word_default>
-      <word_custom>24 ча�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>actperiod_week</word_key>
-      <word_default>week</word_default>
-      <word_custom>недел�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>sr_as_post_string</word_key>
-      <word_default>Posted on %s by %s</word_default>
-      <word_custom>Отправлено %s автор %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>getactive_for</word_key>
-      <word_default>Active in the last...</word_default>
-      <word_custom>�ктивные за по�ледние </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_content_by_date</word_key>
-      <word_default>since %s</word_default>
-      <word_custom>c %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_topics_limited</word_key>
-      <word_default><![CDATA[The most recent %s topics by <strong><em>%s</em></strong>]]></word_default>
-      <word_custom><![CDATA[По�ледние %s тем от <strong><em>%s</em></strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_posts_limited</word_key>
-      <word_default><![CDATA[The most recent %s posts by <strong><em>%s</em></strong>]]></word_default>
-      <word_custom><![CDATA[По�ледние %s �ообщений от <strong><em>%s</em></strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>your_search_limited</word_key>
-      <word_default><![CDATA[Your results for the term <strong><em>%s</em></strong> limited to the first %s]]></word_default>
-      <word_custom><![CDATA[Результаты пои�ка по <strong><em>%s</em></strong> ограничены первыми %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_andor_or</word_key>
-      <word_default>any words</word_default>
-      <word_custom>любые �лова</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_andor_quotes</word_key>
-      <word_default><![CDATA[Tip: Search for a specific phrase by "enclosing it in quotes"]]></word_default>
-      <word_custom><![CDATA[Под�казка: дл� пои�ка �лово�очетани� "заключите его в кавычки"]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_sort_views</word_key>
-      <word_default>Views</word_default>
-      <word_custom>про�мотрам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_andor_and</word_key>
-      <word_default>all words</word_default>
-      <word_custom>в�е �лова</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_sort_posts</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>�ообщени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>forum_sort_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>заголовку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_cpt_undelete</word_key>
-      <word_default>Restore Deleted Topics</word_default>
-      <word_custom>Во��тановить удаленные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_cpt_delete</word_key>
-      <word_default>Delete Topics</word_default>
-      <word_custom>Удалить темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_cpt_unapprove</word_key>
-      <word_default>Un-approve Topics (Set Invisible)</word_default>
-      <word_custom>Скрыть темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>search_cpt_approve</word_key>
-      <word_default>Approve Topics (Set Visible)</word_default>
-      <word_custom>Опубликовать темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_p_unapprove</word_key>
-      <word_default>Set Invisible (Unapprove Posts)</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_search</word_pack>
-      <word_key>s_p_delete</word_key>
-      <word_default>Delete Posts</word_default>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_reply</word_key>
+      <word_default><![CDATA[
+<#MOD_NAME#>,
+
+<#COMMENTER#> has made a comment on a report you have access to in our report center.
+
+------------------------------------------------
+
+Content Reported: <#LINK#> 
+Report Link: <#REPORTLINK#>
+
+------------------------------------------------
+Comment:
+
+<#COMMENT#>
+
+------------------------------------------------
+]]></word_default>
+      <word_custom><![CDATA[<#MOD_NAME#>,
+
+<#COMMENTER#> о�тавил комментарий на жалобу, к которой у ва� е�ть до�туп через центр жалоб.
+
+------------------------------------------------
+
+Жалоба на публикацию: <#LINK#>
+С�ылка на �аму жалобу: <#REPORTLINK#>
+
+------------------------------------------------
+Комментарий:
+
+<#COMMENT#>
+
+------------------------------------------------]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>subject_reportreply</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a> has <a href='%s'>commented</a> on <a href='%s'>reported content</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a> <a href='%s'>прокомментировал</a> <a href='%s'>публикацию � жалобой</a> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_option_prune</word_key>
+      <word_default>Prune Reports...</word_default>
+      <word_custom>Очи�тить от жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_option_delete</word_key>
+      <word_default>Delete Reports</word_default>
       <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_page_title_unknown</word_key>
+      <word_default>Unknown Title</word_default>
+      <word_custom>�ет заголовка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_sending</word_key>
+      <word_default>Sending Report...</word_default>
+      <word_custom>Отправка жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_basic_submit</word_key>
+      <word_default>Submit Report</word_default>
+      <word_custom>Отправить жалобу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_post_enter</word_key>
+      <word_default><![CDATA[<strong>Enter your report</strong>]]></word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_post_url_title</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_reports</word_pack>
+      <word_key>report_post_title</word_key>
+      <word_default>Report this post to a moderator</word_default>
+      <word_custom>Отправить жалобу модератору на �то �ообщение</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_p_undelete</word_key>
-      <word_default>Restore Deleted Posts</word_default>
-      <word_custom>Во��тановить удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>aft_started_by</word_key>
+      <word_default>Started by</word_default>
+      <word_custom>�втор</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_p_approve</word_key>
-      <word_default>Set Visible (Approve Posts)</word_default>
-      <word_custom>Опубликовать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_aft_in</word_key>
+      <word_default>in</word_default>
+      <word_custom>в</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_msin_comments</word_key>
-      <word_default>Profile Comments</word_default>
-      <word_custom>Комментарии к профилю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>results_pf_reply</word_key>
+      <word_default>Made a reply</word_default>
+      <word_custom>�апи�ал ответ</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_msin_members</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>results_pf_comment</word_key>
+      <word_default>Made a comment</word_default>
+      <word_custom>�апи�ал комментарий</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_search_sort_creation_date</word_key>
-      <word_default>Date Added</word_default>
-      <word_custom>Дате добавлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>filter_not_read</word_key>
+      <word_default>Content I have not read</word_default>
+      <word_custom>�епрочетнное</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_member_sin</word_key>
-      <word_default>Search In</word_default>
-      <word_custom>И�кать в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>filter_past</word_key>
+      <word_default>Past %s</word_default>
+      <word_custom>По�ледние %s</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_participation_range</word_key>
-      <word_default>(Search limited from %s)</word_default>
-      <word_custom>(учитывают�� публикации только � %s) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>filter_new_visit</word_key>
+      <word_default>New since my last visit</word_default>
+      <word_custom>С по�леднего по�ещени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_participation_msg</word_key>
-      <word_default>There have been %s items by %s</word_default>
-      <word_custom>%s публикаций �оздано %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_freq_offline</word_key>
+      <word_default><![CDATA[Notify only when I'm offline]]></word_default>
+      <word_custom>Уведомл�ть когда � offline</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_participation_title</word_key>
-      <word_default><![CDATA[%s's Content]]></word_default>
-      <word_custom>Публикации %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>filter_i_follow</word_key>
+      <word_default>Just items I follow</word_default>
+      <word_custom>Только от�леживаемое</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>no_search_app</word_key>
-      <word_default><![CDATA[The application '%s' does not support search]]></word_default>
-      <word_custom><![CDATA[Приложение '%s' не поддерживает пои�к]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_freq_immediate</word_key>
+      <word_default>Notify immediately</word_default>
+      <word_custom>Уведомл�ть незамедлительно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>new_content_since</word_key>
-      <word_default>since</word_default>
-      <word_custom> начина� � </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_freq_daily</word_key>
+      <word_default>Send a daily digest</word_default>
+      <word_custom>Отправл�ть ежедневные отчеты</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>nosdeletereason</word_key>
-      <word_default>No reason given</word_default>
-      <word_custom>Без причины</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_freq_weekly</word_key>
+      <word_default>Send a weekly digest</word_default>
+      <word_custom>Отправл�ть еженедельные отчеты</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>s_search_in</word_key>
-      <word_default>Search in</word_default>
-      <word_custom>И�кать в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_freq_none</word_key>
+      <word_default>No notification</word_default>
+      <word_custom>�е уведомл�ть</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>topicdeletedyb</word_key>
-      <word_default>Topic deleted by</word_default>
-      <word_custom>Тема удалена </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>followed_type__topics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Темы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>viewallp_opt_dd</word_key>
-      <word_default>View all posts by %s</word_default>
-      <word_custom>В�е �ообщени� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>display_edit_options</word_key>
+      <word_default>Toggle Edit Options</word_default>
+      <word_custom>Показать опции редактировани�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>viewallt_opt_dd</word_key>
-      <word_default>View all topics %s has started</word_default>
-      <word_custom>В�е темы %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>vnc_filter_by_forum</word_key>
+      <word_default>Filter by forum</word_default>
+      <word_custom>Фильтровать по форуму</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>viewall_opt_dd</word_key>
-      <word_default>View all topics %s has posted in or started</word_default>
-      <word_custom>В�е темы в которых принимал уча�тие %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>followed_type__forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>matchlabel</word_key>
-      <word_default>Match</word_default>
-      <word_custom>Совпадение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>vnc_filter_showall_forums</word_key>
+      <word_default>Show results from all forums</word_default>
+      <word_custom>Результаты �о в�ех форумов</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>sr_as_lastpost_string</word_key>
-      <word_default>Last post on %s by %s</word_default>
-      <word_custom>По�леднее �ообщение %s от %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>vnc_filters_header</word_key>
+      <word_default>Configure forum filters for new content</word_default>
+      <word_custom>�а�тройка фильтров</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>results_pf_status</word_key>
+      <word_default>Made a status update</word_default>
+      <word_custom>Изменил �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>save_vnc_filters</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>anonymous</word_key>
+      <word_default>Anonymous</word_default>
+      <word_custom>�нононимный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_both_types</word_key>
+      <word_default>Search title and content</word_default>
+      <word_custom>И�кать по теме и �одержимому</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_titles_types</word_key>
+      <word_default>Only search in titles</word_default>
+      <word_custom>И�кать только по заголовкам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_content_types</word_key>
+      <word_default>Only search in content</word_default>
+      <word_custom>И�кать только </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>sort_by</word_key>
+      <word_default>Sort by</word_default>
+      <word_custom>Сортировать </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>order</word_key>
+      <word_default>Order</word_default>
+      <word_custom>Пор�док</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_by_tags</word_key>
+      <word_default>Find tags</word_default>
+      <word_custom>�айти теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_by_tags_desc</word_key>
+      <word_default>Separate multiple tags with commas</word_default>
+      <word_custom>Разделите теги зап�тыми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>filter_by_app</word_key>
+      <word_default>By content type</word_default>
+      <word_custom>По типу контента</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>member_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>filter_by_type</word_key>
+      <word_default>More filters</word_default>
+      <word_custom>Дополнительные фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>filter_by_time</word_key>
+      <word_default>By time period</word_default>
+      <word_custom>По времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>filter_by_section</word_key>
+      <word_default>By section</word_default>
+      <word_custom>По �екции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>short_filter_by_app</word_key>
+      <word_default>By Type</word_default>
+      <word_custom>По типу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>filter_by_other</word_key>
+      <word_default>Other</word_default>
+      <word_custom>Другое</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>short_filter_by_section</word_key>
+      <word_default>By Section</word_default>
+      <word_custom>По �екции</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>short_filter_by_time</word_key>
+      <word_default>By Time</word_default>
+      <word_custom>По времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>short_filter_by_type</word_key>
+      <word_default>More</word_default>
+      <word_custom>Еще</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>short_filter_by_other</word_key>
+      <word_default>More</word_default>
+      <word_custom>Еще</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>mobile_filter_by_app</word_key>
+      <word_default>Filter By Content Type</word_default>
+      <word_custom>Фильтровать по типу публикаций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>mobile_filter_by_section</word_key>
+      <word_default>Filter By Section</word_default>
+      <word_custom>Фильтровать по разделу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>mobile_filter_by_time</word_key>
+      <word_default>Filter By Time</word_default>
+      <word_custom>Фильтровать по времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>mobile_filter_by_type</word_key>
+      <word_default>More Options</word_default>
+      <word_custom>Дополнительно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_desc</word_key>
+      <word_default>Explore content from the community</word_default>
+      <word_custom> </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>mobile_filter_by_other</word_key>
+      <word_default>More Options</word_default>
+      <word_custom>Дополнительно</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>followed_content_desc</word_key>
+      <word_default>View content you are following</word_default>
+      <word_custom>Про�мотр материалов, которые вы от�леживаете</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14883,19 +15651,895 @@ Report:
       <word_key>searchresult_leftby</word_key>
       <word_default>Left by</word_default>
       <word_custom>Отправил</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_search</word_pack>
-      <word_key>new_posts_title</word_key>
+      <word_key>userposts_morefilters</word_key>
+      <word_default><![CDATA[See this member&#39;s]]></word_default>
+      <word_custom>По пользователю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>sr_as_lastpost_string</word_key>
+      <word_default>Last post on %s by %s</word_default>
+      <word_custom>По�леднее �ообщение %s от %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>viewall_opt_dd</word_key>
+      <word_default>Topics and posts</word_default>
+      <word_custom>Темы и �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>matchlabel</word_key>
+      <word_default>Match</word_default>
+      <word_custom>Совпадение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>viewallt_opt_dd</word_key>
+      <word_default>Only topics</word_default>
+      <word_custom>В�е темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>viewallp_opt_dd</word_key>
+      <word_default>Only posts</word_default>
+      <word_custom>В�е �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_in</word_key>
+      <word_default>Search in</word_default>
+      <word_custom>И�кать в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>vnc_topics_and_posts</word_key>
+      <word_default>Topics I participated in</word_default>
+      <word_custom>Темы в которых � уча�твую</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>vnc_topics_only</word_key>
+      <word_default>Topics I started</word_default>
+      <word_custom>Мои темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>topicdeletedyb</word_key>
+      <word_default>Topic deleted by</word_default>
+      <word_custom>Тема удалена </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_since</word_key>
+      <word_default>since</word_default>
+      <word_custom> начина� � </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_member_sin</word_key>
+      <word_default>Search In</word_default>
+      <word_custom>И�кать в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>no_search_app</word_key>
+      <word_default><![CDATA[The application '%s' does not support search]]></word_default>
+      <word_custom><![CDATA[Приложение '%s' не поддерживает пои�к]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>nosdeletereason</word_key>
+      <word_default>No reason given</word_default>
+      <word_custom>Без причины</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_participation_msg</word_key>
+      <word_default>There have been %s items by %s</word_default>
+      <word_custom>%s публикаций �оздано %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_msin_comments</word_key>
+      <word_default>Profile Feed</word_default>
+      <word_custom>Комментарии к профилю</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_participation_title</word_key>
+      <word_default><![CDATA[%s's Content]]></word_default>
+      <word_custom>Публикации %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_participation_range</word_key>
+      <word_default>(Search limited from %s)</word_default>
+      <word_custom>(учитывают�� публикации только � %s) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_msin_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_sort_creation_date</word_key>
+      <word_default>Date Added</word_default>
+      <word_custom>Дате добавлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_p_delete</word_key>
+      <word_default>Delete Posts</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_p_undelete</word_key>
+      <word_default>Restore Deleted Posts</word_default>
+      <word_custom>Во��тановить удаленные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_p_approve</word_key>
+      <word_default>Set Visible (Approve Posts)</word_default>
+      <word_custom>Опубликовать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_p_unapprove</word_key>
+      <word_default>Set Invisible (Unapprove Posts)</word_default>
+      <word_custom>Скрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_sort_posts</word_key>
+      <word_default>Replies</word_default>
+      <word_custom>�ообщени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_sort_views</word_key>
+      <word_default>Views</word_default>
+      <word_custom>про�мотрам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_cpt_undelete</word_key>
+      <word_default>Restore Deleted Topics</word_default>
+      <word_custom>Во��тановить удаленные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_cpt_delete</word_key>
+      <word_default>Delete Topics</word_default>
+      <word_custom>Удалить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_cpt_unapprove</word_key>
+      <word_default>Un-approve Topics (Set Invisible)</word_default>
+      <word_custom>Скрыть темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_cpt_approve</word_key>
+      <word_default>Approve Topics (Set Visible)</word_default>
+      <word_custom>Опубликовать темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_andor_or</word_key>
+      <word_default>any words</word_default>
+      <word_custom>любые �лова</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_sort_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>заголовку</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_andor_quotes</word_key>
+      <word_default><![CDATA[Tip: Search for a specific phrase by "enclosing it in quotes"]]></word_default>
+      <word_custom><![CDATA[Под�казка: дл� пои�ка �лово�очетани� "заключите его в кавычки"]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_andor_and</word_key>
+      <word_default>all words</word_default>
+      <word_custom>в�е �лова</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_topics_limited</word_key>
+      <word_default><![CDATA[The most recent %s topics by <strong><em>%s</em></strong>]]></word_default>
+      <word_custom><![CDATA[По�ледние %s тем от <strong><em>%s</em></strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_posts_limited</word_key>
+      <word_default><![CDATA[The most recent %s posts by <strong><em>%s</em></strong>]]></word_default>
+      <word_custom><![CDATA[По�ледние %s �ообщений от <strong><em>%s</em></strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_content_by_date</word_key>
+      <word_default>since %s</word_default>
+      <word_custom>c %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>sr_as_post_string</word_key>
+      <word_default>Posted on %s by %s</word_default>
+      <word_custom>Отправлено %s автор %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_search_limited</word_key>
+      <word_default><![CDATA[Your results for the term <strong><em>%s</em></strong> limited to the first %s]]></word_default>
+      <word_custom><![CDATA[Результаты пои�ка по <strong><em>%s</em></strong> ограничены первыми %s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_weeks</word_key>
+      <word_default>Past 2 weeks</word_default>
+      <word_custom>2 недели</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>getactive_for</word_key>
+      <word_default>Active in the last...</word_default>
+      <word_custom>�ктивные за по�ледние </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_week</word_key>
+      <word_default>Past week</word_default>
+      <word_custom>недел�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_month</word_key>
+      <word_default>Past month</word_default>
+      <word_custom>ме��ц</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_today</word_key>
+      <word_default>Past 24 hours</word_default>
+      <word_custom>24 ча�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_year</word_key>
+      <word_default>Past year</word_default>
+      <word_custom>год</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>actperiod_months</word_key>
+      <word_default>Past 6 months</word_default>
+      <word_custom>6 ме��цев</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_type</word_key>
+      <word_default>Result sorting</word_default>
+      <word_custom>Сортировать результаты по </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_section</word_key>
+      <word_default>Search in section</word_default>
+      <word_custom>Раздел дл� пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_showas_post_info</word_key>
+      <word_default>Post Information</word_default>
+      <word_custom>Информаци� о �ообщении</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_type_0</word_key>
+      <word_default>Last Update Time</word_default>
+      <word_custom>дате обновлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_type_o_1</word_key>
+      <word_default>Ascending</word_default>
+      <word_custom>по возра�танию (а-�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_type_1</word_key>
+      <word_default>Relevance</word_default>
+      <word_custom>релевантно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_search_type_o_0</word_key>
+      <word_default>Descending</word_default>
+      <word_custom>по убыванию (�-а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_stuff</word_key>
+      <word_default>Topics with at least</word_default>
+      <word_custom>Темы � не менее: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_stuff_2</word_key>
+      <word_default>%s posts and %s views</word_default>
+      <word_custom>%s �ообщени�ми и %s про�мотрами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_display</word_key>
+      <word_default>Display results</word_default>
+      <word_custom>Показать результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_asposts</word_key>
+      <word_default>As posts</word_default>
+      <word_custom>как �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_desc</word_key>
+      <word_default><![CDATA[These additional filters can be used to find <strong>discussions</strong>]]></word_default>
+      <word_custom><![CDATA[Дополнительные фильтры дл� <strong>об�уждений</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>removed_search_terms</word_key>
+      <word_default>The following search terms are not allowed and were removed from your query:</word_default>
+      <word_custom>Одно из введенных вами �лов запрещено при и�пользовании пои�ка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>attach_header</word_key>
+      <word_default>Attachments</word_default>
+      <word_custom>прикрепленных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>s_forum_astopics</word_key>
+      <word_default>As a topic list</word_default>
+      <word_custom>как �пи�ок тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>show_as_titles</word_key>
+      <word_default>Show results as titles</word_default>
+      <word_custom>Показывать результаты в виде заголовков тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_author</word_key>
+      <word_default>Find author</word_default>
+      <word_custom>Пои�к по автору</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_words</word_key>
+      <word_default>Find words</word_default>
+      <word_custom>Пои�к по ключевым �ловам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>optional_fields</word_key>
+      <word_default>All fields are optional, but you must submit at least one search criteria.</word_default>
+      <word_custom>Об�зательных к заполнению полей нет, но вы должны заполнить хот� бы одно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_by</word_key>
+      <word_default>by</word_default>
+      <word_custom>от</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_date</word_key>
+      <word_default>Find by date</word_default>
+      <word_custom>Пои�к по дате</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>to</word_key>
+      <word_default>to</word_default>
+      <word_custom><![CDATA[ &mdash;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>find_forum</word_key>
+      <word_default>Find in forum</word_default>
+      <word_custom>И�кать в форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>gallery_comment</word_key>
+      <word_default>Comment</word_default>
+      <word_custom>Комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>core_help</word_key>
+      <word_default>Help</word_default>
+      <word_custom>Помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>gallery_comments</word_key>
+      <word_default>comments</word_default>
+      <word_custom>комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>member_joined</word_key>
+      <word_default>Joined on</word_default>
+      <word_custom>Реги�траци�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>member_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>calendar_event</word_key>
+      <word_default>Event</word_default>
+      <word_custom>Событие</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_replies</word_key>
+      <word_default>replies</word_default>
+      <word_custom>ответов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_forum</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>view_result</word_key>
+      <word_default>View result</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>forum_topic_also</word_key>
+      <word_default>Also in this topic</word_default>
+      <word_custom>Также в �той теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>gallery_image</word_key>
+      <word_default>Image</word_default>
+      <word_custom>Изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>gallery_posted_by</word_key>
+      <word_default>Posted by</word_default>
+      <word_custom>Отправил</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>generic_content</word_key>
+      <word_default>Content</word_default>
+      <word_custom>Контент</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_search</word_key>
+      <word_default>Your search for the term</word_default>
+      <word_custom>Пои�к по �лову</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>tag_search_results</word_key>
+      <word_default><![CDATA[There were <strong>%s</strong> results tagged with <em><strong>%s</strong></em>]]></word_default>
+      <word_custom><![CDATA[�айдено <strong>%s</strong> результатов � тегом <em><strong>%s</strong></em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_search_returned</word_key>
+      <word_default>returned</word_default>
+      <word_custom>вернул</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>your_search_results</word_key>
+      <word_default>results</word_default>
+      <word_custom>результатов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>my_results</word_key>
+      <word_default>My Results</word_default>
+      <word_custom>Мои результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>sort_by_relevance</word_key>
+      <word_default>Sort by Relevance</word_default>
+      <word_custom>Сортировать по релевантно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>sort_by_date</word_key>
+      <word_default>Sort by Date</word_default>
+      <word_custom>Сортировать по дате</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>no_results_found_for</word_key>
+      <word_default>for</word_default>
+      <word_custom>по</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>no_results_found</word_key>
+      <word_default>No results found</word_default>
+      <word_custom>Пои�к не дал результатов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_content</word_key>
+      <word_default>Active content in the last %s</word_default>
+      <word_custom>�ктивные публикации за по�ледние %</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_entries</word_key>
+      <word_default>entries in the last %s</word_default>
+      <word_custom>�ообщений за по�ледние %</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_have_been</word_key>
+      <word_default>There have been</word_default>
+      <word_custom>Опубликовано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content</word_key>
       <word_default>New content</word_default>
       <word_custom>�овые публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_all</word_key>
+      <word_default>All Active Content</word_default>
+      <word_custom>В�е активные публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_there</word_key>
+      <word_default>There are</word_default>
+      <word_custom>Добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_none</word_key>
+      <word_default>No active content found</word_default>
+      <word_custom>По вашему запро�у ничего не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_entries</word_key>
+      <word_default>new entries</word_default>
+      <word_custom>новых �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_all</word_key>
+      <word_default>All New Content</word_default>
+      <word_custom>В�е новые публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_content_none</word_key>
+      <word_default>Sorry, no new content found.</word_default>
+      <word_custom>�овых публикаций не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>followed_content</word_key>
+      <word_default>Content You Follow</word_default>
+      <word_custom>От�леживаемое вами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>followed_content_none</word_key>
+      <word_default>Sorry, we could not find any content you are following.</word_default>
+      <word_custom>К �ожалению ничего не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_title_all</word_key>
+      <word_default>All</word_default>
+      <word_custom>В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_title_topics</word_key>
+      <word_default>topics</word_default>
+      <word_custom>темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_title_member</word_key>
+      <word_default>by </word_default>
+      <word_custom>пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_title_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_none</word_key>
+      <word_default>There is no information to show.</word_default>
+      <word_custom>По вашему запро�у ничего не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_all</word_key>
+      <word_default>All User Content</word_default>
+      <word_custom>В�е публикации пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>on</word_key>
+      <word_default>on</word_default>
+      <word_custom>в</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_have_been</word_key>
+      <word_default>There have been</word_default>
+      <word_custom>�айдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>quick_search</word_key>
+      <word_default>Quick Search</word_default>
+      <word_custom>Бы�трый пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_term_short</word_key>
+      <word_default><![CDATA[One or all of your search keywords were below %s characters or you searched for words which are not allowed, such as 'html', 'img', etc, please increase the length of these search keywords or choose different keywords.]]></word_default>
+      <word_custom><![CDATA[Одно или в�е введенные вами ключевые �лова дл� пои�ка имеет менее %s �имволов, или же вы ввели в каче�тве ключевого �лова недопу�тимые к пои�ку �лова, такие как 'html', 'img' и т.д. Верните�ь назад и увеличьте количе�тво �имволов в ключевом �лове, либо измените его.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>see_all_ps</word_key>
+      <word_default>See all %s results</word_default>
+      <word_custom>Выве�ти в�е %s результатов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_invalid_date_range</word_key>
+      <word_default>The date range you selected for your search is invalid, please ensure that the start date is not later than the end date</word_default>
+      <word_custom>Выбранные даты неверны, убедите�ь что начальна� дата не позже, чем конечна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_term_long</word_key>
+      <word_default><![CDATA[One or all of your search keywords were longer than %s characters.  Don't you think that's a bit long of a piece of a text to get a reliable search result?  Please shorten it a bit..]]></word_default>
+      <word_custom>Строка �одержит более %s �имволов. Пожалуй�та, верните�ь назад и попробуйте вве�ти более короткую �троку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_invalid_date_future</word_key>
+      <word_default>One or both of the dates in your search are in the future, please check your date range and try again</word_default>
+      <word_custom>Одна из выбранных вами дат еще не на�тупила, проверьте выбранные даты и попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>livesearch_thistopic</word_key>
+      <word_default>This Topic</word_default>
+      <word_custom>Пои�к по теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>no_xml_permission</word_key>
+      <word_default>Sorry, but you do not have permission to use the search feature.</word_default>
+      <word_custom>Вы не можете пользовать�� пои�ком.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_off</word_key>
+      <word_default>Sorry, the administrator has taken the search engine offline for the moment. Please try again later</word_default>
+      <word_custom>�дмини�тратор отключил функцию пои�ка. Пожалуй�та, попробуйте позже</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>livesearch_thisforum</word_key>
+      <word_default>This Forum</word_default>
+      <word_custom>Пои�к по форуму</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_results</word_key>
+      <word_default>Search Results</word_default>
+      <word_custom>Результаты пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>xml_flood</word_key>
+      <word_default>Flood control is enabled. Please wait at least %s seconds before attempting to search again</word_default>
+      <word_custom>Флуд контроль включен. Вы �можете во�пользовать�� пои�ком через %s �екунд.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14903,9 +16547,48 @@ Report:
       <word_key>do_search</word_key>
       <word_default>Search Now</word_default>
       <word_custom>�айти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>new_posts_title</word_key>
+      <word_default>New content</word_default>
+      <word_custom>�овые публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>followed_ct_title</word_key>
+      <word_default>Content You Follow</word_default>
+      <word_custom>От�леживаемое вами</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>active_posts_title</word_key>
+      <word_default>Active content</word_default>
+      <word_custom>�ктивные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>user_posts_title</word_key>
+      <word_default>All %s by %s</word_default>
+      <word_custom>В�е %s %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>search_form</word_key>
+      <word_default>Search Form</word_default>
+      <word_custom>Форма пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>like_parent_from</word_key>
+      <word_default>from</word_default>
+      <word_custom>из</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14913,9 +16596,6 @@ Report:
       <word_key>filters</word_key>
       <word_default>Search Options</word_default>
       <word_custom>Параметры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14923,9 +16603,13 @@ Report:
       <word_key>in</word_key>
       <word_default>in</word_default>
       <word_custom>в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_search</word_pack>
+      <word_key>th_like_on</word_key>
+      <word_default>Followed On</word_default>
+      <word_custom>От�леживает��</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -14933,5429 +16617,363 @@ Report:
       <word_key>show_results_in</word_key>
       <word_default>Show results for: </word_default>
       <word_custom>Показать результаты за: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_title</word_key>
-      <word_default>Your Options</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>admin_send_desc</word_key>
-      <word_default>Enabling this option will add your email address to the administrators mail list and you will receive any updates sent.</word_default>
-      <word_custom>При включении �той функции, ваш e-mail адре� будет добавлен к �пи�ку e-mail адре�ов админи�тратора и вы, в��кий раз будете уведомлены по e-mail, о любых изменени�х на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>admin_send</word_key>
-      <word_default>Send me any updates sent by the board administrator</word_default>
-      <word_custom>Сообщать мне обо в�ех изменени�х, проводимых админи�тратором форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>account_pass_old</word_key>
-      <word_default>Enter your CURRENT password</word_default>
-      <word_custom>Текущий пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_title</word_key>
-      <word_default>Manage Watched Topics</word_default>
-      <word_custom>Ваши подпи�ки на темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_time</word_key>
-      <word_default>Time Zone</word_default>
-      <word_custom>Ча�овой по��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_viewsig</word_key>
-      <word_default><![CDATA[View members' signatures when reading topics?]]></word_default>
-      <word_custom>Отображать подпи�и пользователей в темах?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>account_pass_new</word_key>
-      <word_default>Enter your NEW password</word_default>
-      <word_custom>Введите ваш �ОВЫЙ пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>send_full_msg_desc</word_key>
-      <word_default>Enabling this option will send a plain text version of the post in the watched topic email.</word_default>
-      <word_custom>При включении �той функции, копи� нового �ообщени�, в про�том тек�товом формате, будет вы�лана вам на e-mail.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>send_full_msg</word_key>
-      <word_default>Include a copy of the post when emailing me from a watched topic</word_default>
-      <word_custom>Добавл�ть копию �ообщени� из подпи�анных тем в отправл�емое пи�ьмо-уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>email</word_key>
-      <word_default>Email Settings</word_default>
-      <word_custom>�а�тройки E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_display</word_key>
-      <word_default>Board Display Settings</word_default>
-      <word_custom>�а�тройки отображени� форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_view</word_key>
-      <word_default>Views</word_default>
-      <word_custom>Про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_last_post</word_key>
-      <word_default>Last Post</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_start</word_key>
-      <word_default>Subscribed on</word_default>
-      <word_custom>Подпи�ан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_viewava</word_key>
-      <word_default><![CDATA[View members' avatars when reading topics?]]></word_default>
-      <word_custom>Отображать аватары пользователей в темах?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>rboard_prefs</word_key>
-      <word_default>Board Preferences</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>board_prefs</word_key>
-      <word_default>Notification Preferences</word_default>
-      <word_custom>�а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_header</word_key>
-      <word_default>Current Subscriptions</word_default>
-      <word_custom>Текущие подпи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>t_title</word_key>
-      <word_default>Your control panel</word_default>
-      <word_custom>Ваша панель управлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_viewimg</word_key>
-      <word_default>View images in posts, such as smilies and posted images?</word_default>
-      <word_custom>Отображать картинки в �ообщени�х (например, �майлики, изображени�)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>account_pass_title</word_key>
-      <word_default>Your Password</word_default>
-      <word_custom>�овый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>account_pass_new2</word_key>
-      <word_default>Please confirm your NEW password</word_default>
-      <word_custom>Подтверждение нового парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>hide_email_desc</word_key>
-      <word_default>Enabling this option will deny other members sending you an email via the board.</word_default>
-      <word_custom>При включении �той функции, пользователи форума не �могут отправл�ть вам пи�ьма из форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>avatar_url_title</word_key>
-      <word_default>Your image avatars</word_default>
-      <word_custom>Загрузка личного аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>hide_email</word_key>
-      <word_default>Hide my email address from other members</word_default>
-      <word_custom>Скрыть мой e-mail адре� от других пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_replies</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>yes</word_key>
-      <word_default>Yes</word_default>
-      <word_custom>Да</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>privacy_settings</word_key>
-      <word_default>Privacy Settings</word_default>
-      <word_custom>�а�тройки приватно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>height</word_key>
-      <word_default>Height</word_default>
-      <word_custom>Ширина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>avatar_pre_title</word_key>
-      <word_default>Pre-installed avatars</word_default>
-      <word_custom>Преду�тановленные аватары</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>no</word_key>
-      <word_default>No</word_default>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_freq_none</word_key>
+      <word_default>None</word_default>
       <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notes_saved_msg</word_key>
-      <word_default>Notes Saved</word_default>
-      <word_custom>Заметки �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>view_liked_content</word_key>
+      <word_default>View this content you follow</word_default>
+      <word_custom>Про�мотреть публикации, которые вы от�леживаете</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pass_change_text</word_key>
-      <word_default>You may change your password here. We will attempt to update your current session after your successful password change. If, however, you do experience difficulties, please try logging out and logging back in before contacting a staff member to help resolve the problem</word_default>
-      <word_custom>Зде�ь вы можете изменить ваш пароль. По�ле у�пешного изменени� парол�, форум попытает�� обновить ваш �еан�. При возникновении каких-либо проблем, попробуйте переавторизовать��. Е�ли ничего не получит��, обратите�ь к �дмини�тратору форума дл� разрешени� проблемы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_freq_immediate</word_key>
+      <word_default>Immediate</word_default>
+      <word_custom>�езамедлительно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>width</word_key>
-      <word_default>Width</word_default>
-      <word_custom>Вы�ота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_freq_offline</word_key>
+      <word_default>Offline</word_default>
+      <word_custom>Только когда � в offline</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>note_pad_empty</word_key>
-      <word_default>You may store post snippets, or any other information you need to keep here</word_default>
-      <word_custom>Зде�ь вы можете хранить отрывки �ообщений или любую другую важную информацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_freq_daily</word_key>
+      <word_default>Daily Digest</word_default>
+      <word_custom>Ежедневный отчет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ce_current</word_key>
-      <word_default><![CDATA[<b>Your current email address:</b> ]]></word_default>
-      <word_custom><![CDATA[<b>Ваш текущий e-mail адре�:</b> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_freq_weekly</word_key>
+      <word_default>Weekly Digest</word_default>
+      <word_custom>Еженедельные отчет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ce_auth</word_key>
-      <word_default><![CDATA[<br /><br />PLEASE NOTE: You will have to re-activate your account after changing your email address.<br />An email will be sent to the email address you specify below, outlining what you need to do.<br /><br />Proceeding with this action will log you out. It is strongly recommended that you reset your password before changing your email address if you are unable to remember your password.]]></word_default>
-      <word_custom><![CDATA[<br /><br />ПРИМЕЧ��ИЕ: По�ле изменени� e-mail адре�а вы должны будете переактивировать вашу учетную запи�ь.<br />�а ваш e-mail адре� будет отправлено пи�ьмо � подробными ин�трукци�ми о дальнейших дей�тви�х.<br /><br />Вы должны будете переавторизовать��. �а�то�тельно рекомендуем вам, перед изменением e-mail адре�а, во�пользовать�� функцией во��тановлени� парол�, е�ли вы его не помните.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__chose</word_key>
+      <word_default>Choose Action</word_default>
+      <word_custom>Выберите дей�твие</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ce_redirect</word_key>
-      <word_default>An email has been sent, redirecting to the activation screen</word_default>
-      <word_custom>Пи�ьмо на e-mail отправлено. Сейча� вы перейдете на �траницу активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__delete</word_key>
+      <word_default>Stop following</word_default>
+      <word_custom>Прекратить �ледить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ce_new_email2</word_key>
-      <word_default>Confirm the new email address</word_default>
-      <word_custom>Повторите новый e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_daily</word_key>
+      <word_default>Change notifications to daily digest</word_default>
+      <word_custom>Изменить режим уведомлений на ежедневные отчет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ce_new_email</word_key>
-      <word_default>Enter your new email address</word_default>
-      <word_custom>Введите новый e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_weekly</word_key>
+      <word_default>Change notifications to weekly digest</word_default>
+      <word_custom>Изменить режим уведомлений на еженедельные отчет</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>change_email_title</word_key>
-      <word_default>Change your registered email address</word_default>
-      <word_custom>Изменение e-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_anon</word_key>
+      <word_default>Change follow preference to anonymous</word_default>
+      <word_custom>Следить анонимно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>with_selected</word_key>
-      <word_default>with selected</word_default>
-      <word_custom>от выбранных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_noanon</word_key>
+      <word_default>Change follow preference to visible</word_default>
+      <word_custom>Следить публично</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_current_sig</word_key>
-      <word_default>Your current Signature</word_default>
-      <word_custom>Текуща� подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>update_selected</word_key>
+      <word_default>Update Selected</word_default>
+      <word_custom>Обновить выбранное</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_edit_sig</word_key>
-      <word_default>Edit Signature</word_default>
-      <word_custom>Изменение подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>no_likes_for_del</word_key>
+      <word_default>You did not select any followed content to moderate</word_default>
+      <word_custom>Вы ничего не выбрали</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_delete</word_key>
-      <word_default>Unsubscribe</word_default>
-      <word_custom>Отпи�ать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_offline</word_key>
+      <word_default>Change notifications to offline</word_default>
+      <word_custom>Изменить режим уведомлений на «только когда � в offline»</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_sig_info</word_key>
-      <word_default>Change Signature</word_default>
-      <word_custom>Изменить подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_immediate</word_key>
+      <word_default>Change notifications to immediate</word_default>
+      <word_custom>Изменить режим уведомлений на незамедлительный</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_avatar_info</word_key>
-      <word_default>Change Avatar</word_default>
-      <word_custom>Изменить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_nonotify</word_key>
+      <word_default>Stop notifying me of updates</word_default>
+      <word_custom>Прекратить уведомл�ть мен� об обновлени�х</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>lp_subject</word_key>
-      <word_default>Email address change at</word_default>
-      <word_custom>Изменение e-mail адре�а дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>arch_likes_head</word_key>
+      <word_default>Followed Content</word_default>
+      <word_custom>От�леживаемое</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_use_default</word_key>
-      <word_default>Use forum default</word_default>
-      <word_custom>По умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_mod__change_donotify</word_key>
+      <word_default>Notify me of updates</word_default>
+      <word_custom>Уведомл�ть мен� об обновлени�х</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_number_topics</word_key>
-      <word_default><![CDATA[Number of <strong>topics</strong> to show for each forum page:]]></word_default>
-      <word_custom>Количе�тво тем на �траницу форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>likes_rem_suc</word_key>
+      <word_default>Followed content successfully updated</word_default>
+      <word_custom>От�леживаемые публикации обновлены</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_number_posts</word_key>
-      <word_default><![CDATA[Number of <strong>posts</strong> to show for each topic page:]]></word_default>
-      <word_custom>Количе�тво �ообщений на �траницу темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>no_likes_del</word_key>
+      <word_default>You did not select any followed content to stop following</word_default>
+      <word_custom>Вы ничего не от�леживаете</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>no_auto_prune</word_key>
-      <word_default>Subscription auto pruning is switched off at present</word_default>
-      <word_custom>�втоотмена подпи�ки выключена в данное врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>likes_table_head</word_key>
+      <word_default>Listing of followed content for this user</word_default>
+      <word_custom>Спи�ок от�леживаемых публикаций пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>auto_prune</word_key>
-      <word_default>Note: Subscriptions are pruned if there is no reply to the topic after %s days</word_default>
-      <word_custom>Примечание: подпи�ка будет отменена, е�ли в теме не будет ответов в течение %s дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>th_like_anon</word_key>
+      <word_default>Anonymous</word_default>
+      <word_custom>�нонимно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_none</word_key>
-      <word_default>There are no subscriptions to show, try selecting a less restrictive date range</word_default>
-      <word_custom>Вы не подпи�аны ни на одну тему. Выберите другой диапазон даты.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>th_like_title</word_key>
+      <word_default>Content</word_default>
+      <word_custom>Публикаци�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_all</word_key>
-      <word_default>the beginning</word_default>
-      <word_custom>В�е врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_is_anon</word_key>
+      <word_default>You are following this content anonymously</word_default>
+      <word_custom>Вы �ледите за данной публикацией анонимно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>show_topics_from</word_key>
-      <word_default>Show topics from:</word_default>
-      <word_custom>Показать темы за:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>likes_none</word_key>
+      <word_default>You have not followed any content yet</word_default>
+      <word_custom>У ва� еще нет от�леживаемых публикаций</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ft_posts</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>th_like_notification</word_key>
+      <word_default>Notifications</word_default>
+      <word_custom>Уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ft_topics</word_key>
-      <word_default>Topics</word_default>
-      <word_custom>Тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>like_notify_yes</word_key>
+      <word_default>You have selected to receive notifications</word_default>
+      <word_custom>Вы выбрали получение уведомлений</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ft_last_post</word_key>
-      <word_default>Last Post</word_default>
+      <word_pack>public_search</word_pack>
+      <word_key>n_last_post_by</word_key>
+      <word_default>Last Post by</word_default>
       <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_today</word_key>
-      <word_default>Last day</word_default>
-      <word_custom>По�ледний день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_day</word_key>
-      <word_default>Last %s days</word_default>
-      <word_custom>По�ледние %s дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>От:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ft_forum</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>in</word_key>
-      <word_default>In:</word_default>
-      <word_custom>Ð’:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>forum_subs_none</word_key>
-      <word_default>You are not subscribed to any forums at present</word_default>
-      <word_custom>В данный момент вы не подпи�аны ни на один из �уще�твующих форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>f_none</word_key>
-      <word_default>--</word_default>
-      <word_custom>--</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>forum_subs_header</word_key>
-      <word_default>Manage Watched Forums</word_default>
-      <word_custom>Ваши подпи�ки на форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_change</word_key>
-      <word_default>Change Photo</word_default>
-      <word_custom>Изменить фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_upload</word_key>
-      <word_default>Upload an image from your computer</word_default>
-      <word_custom>Загрузить фотографию �о �воего компьютера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_autosize</word_key>
-      <word_default>Image Scale On</word_default>
-      <word_custom>Ма�штабирование изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_as_desc</word_key>
-      <word_default><![CDATA[This will scale the image down for you if it's too big in pixel size]]></word_default>
-      <word_custom>Е�ли ваше изображение �лишком большое, оно будет  автоматиче�ки уменьшено до нужных размеров.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_change_photo</word_key>
-      <word_default>Change Photo</word_default>
-      <word_custom>Изменить фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_current</word_key>
-      <word_default>Currently Used Photo</word_default>
-      <word_custom>И�пользуема� фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_desc</word_key>
-      <word_default>This section will allow you to specify a photo to be used in your profile which is viewable by other board members.</word_default>
-      <word_custom>Зде�ь вы можете загрузить фотографию, котора� будет видна другим пользовател�м в вашем профиле.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_title</word_key>
-      <word_default>Your Personal Photo</word_default>
-      <word_custom>Ваша фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_autosize</word_key>
-      <word_default>Image Scale On</word_default>
-      <word_custom>Ма�штабирование изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_as_desc</word_key>
-      <word_default><![CDATA[This will scale the image down for you if it's too big in pixel size]]></word_default>
-      <word_custom>Е�ли ваше изображение �лишком большое, оно будет  автоматиче�ки уменьшено до нужных размеров.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_text_url</word_key>
-      <word_default>Your avatar must be no bigger than %s pixels by %s pixels in size.</word_default>
-      <word_custom>Размер вашего аватара не должен превышать %s на %s пик�елей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_t_gravatar</word_key>
-      <word_default>Gravatar</word_default>
-      <word_custom>Gravatar</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_t_na</word_key>
-      <word_default>No avatar selected</word_default>
-      <word_custom>�ватар не выбран</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_t_url</word_key>
-      <word_default>Offsite File</word_default>
-      <word_custom>С�ылка URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_t_local</word_key>
-      <word_default>Gallery Avatar</word_default>
-      <word_custom>�ватар галереи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_allowed_files</word_key>
-      <word_default><![CDATA[The following file types are allowed: <strong>%s</strong>]]></word_default>
-      <word_custom><![CDATA[Допу�тимы �ледующие типы файлов: <strong>%s</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_t_upload</word_key>
-      <word_default>Uploaded File</word_default>
-      <word_custom>Загруженный файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_current</word_key>
-      <word_default>Your Current Avatar</word_default>
-      <word_custom>Текущий аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_settings</word_key>
-      <word_default>Your Avatar Settings</word_default>
-      <word_custom>�а�тройки аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_text_upload</word_key>
-      <word_default>Uploaded avatars from your computer must be no larger than %s KB.</word_default>
-      <word_custom>Загружаемый � компьютера аватар должен быть не более %s килобайт.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_url</word_key>
-      <word_default>Enter a URL to an online avatar image</word_default>
-      <word_custom>Введите ��ылку на файл вашего аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_upload</word_key>
-      <word_default>Upload a new image from your computer</word_default>
-      <word_custom>Загрузите аватар �о �воего компьютера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_go_gal</word_key>
-      <word_default>Choose an avatar from one of our galleries</word_default>
-      <word_custom>Выберите аватар в одной из наших галерей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_max</word_key>
-      <word_default><![CDATA[All photos must be no larger than %s kB.<br />]]></word_default>
-      <word_custom>Объем в�ех фотографий не должен превышать %s килобайт.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ec_passy</word_key>
-      <word_default>Your Current Password</word_default>
-      <word_custom>Текущий пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>av_root</word_key>
-      <word_default>Base Gallery</word_default>
-      <word_custom>Базова� галере�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_addem</word_key>
-      <word_default>Add a new user to your list</word_default>
-      <word_custom>Добавить новых пользователей в �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pph_max2</word_key>
-      <word_default>Photos must be no bigger than %s pixels by %s pixels.</word_default>
-      <word_custom> Фотографии должны быть не больше %s на %s пик�елей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_group</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_ignore_users</word_key>
-      <word_default>Manage Ignored Users</word_default>
-      <word_custom>Игнорируемые пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>mi5_title</word_key>
-      <word_default>Manage your ignored users</word_default>
-      <word_custom>Управление �пи�ком игнорируемых пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_space_used</word_key>
-      <word_default>You have used %s of %s</word_default>
-      <word_custom>Вами и�пользовано %s из допу�тимых %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_space_unl</word_key>
-      <word_default>You have used %s of global upload space.</word_default>
-      <word_custom>Вы и�пользуете %s от общего ди�кового про�тран�тва.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_delete</word_key>
-      <word_default>Delete Selected</word_default>
-      <word_custom>Удалить выбранные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_space_count</word_key>
-      <word_default><![CDATA[You have %s attachments (%s&#037; used)]]></word_default>
-      <word_custom><![CDATA[Вами загружено %s файлов (%s&#037; и�пользовано)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_hsize</word_key>
-      <word_default>Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>attach_title</word_key>
-      <word_default>Attachment</word_default>
-      <word_custom>Файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>menu_memsearch</word_key>
-      <word_default>Member Look-up Tool</word_default>
-      <word_custom>Пои�к пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_attach</word_key>
-      <word_default>Manage Attachments</word_default>
-      <word_custom>Прикрепленные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>menu_ipsearch</word_key>
-      <word_default>IP Address Look-up Tool</word_default>
-      <word_custom>Определение IP адре�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_edit</word_key>
-      <word_default>Edit Member</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_group</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_reg</word_key>
-      <word_default>Date Registered</word_default>
-      <word_custom>Дата реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipm_title</word_key>
-      <word_default>Member Search Results</word_default>
-      <word_custom>Результаты пои�ка пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_no_matches</word_key>
-      <word_default>There was no data returned from your search input, please try again</word_default>
-      <word_custom>�ичего не найдено по вашему запро�у. Верните�ь назад и попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_resolve</word_key>
-      <word_default>Resolve</word_default>
-      <word_custom>Определение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_posts</word_key>
-      <word_default>Find Posts</word_default>
-      <word_custom>�айти �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_members</word_key>
-      <word_default>Find Members</word_default>
-      <word_custom>Пои�к пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_resolve_result</word_key>
-      <word_default><![CDATA[The host name for %s is <b>%s</b><br /><br />Try visiting <a href='http://news.nic.com/cgi-bin/whois' target='_blank'>nic.com</a> to get more information by running this match via WHOIS.]]></word_default>
-      <word_custom><![CDATA[�азвание хо�та IP адре�а %s - <b>%s</b><br /><br />Можете по�етить <a href='http://news.nic.com/cgi-bin/whois' target='_blank'>nic.com</a> дл� получени� дополнительной информации через WHOIS.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_submit</word_key>
-      <word_default>Run Tool</word_default>
-      <word_custom>�ачать пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_enter</word_key>
-      <word_default><![CDATA[<b>Enter the IP address</b>]]></word_default>
-      <word_custom><![CDATA[<b>Введите IP адре�</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_warn_text</word_key>
-      <word_default><![CDATA[<b>Please Note</b>: You may enter a wildcard '*' (without quotes) as the last part of the IP address.<br />For example, 127.*.*.* will match all IP address that start with 127.<br />127.1.0.* will match all IP addresses that start with 127.1.0.<br />An error will occur if you attempt to use a wildcard in the middle of the IP address. For example, 127.*.0.1 will return an error.]]></word_default>
-      <word_custom><![CDATA[<b>Примечание</b>: Вы можете и�пользовать ма�ку '*' (без кавычек) вме�то по�ледних ча�тей IP адре�а.<br />Пример: При и�пользовании 127.*.*.* будут найдены в�е IP адре�а, начинающие�� � 127.<br />При и�пользовании 127.1.0.* будут найдены в�е IP адре�а, начинающие�� � 127.1.0.<br />При и�пользовании ма�ки в �ередине IP адре�а, произойдет ошибка и вы получите �ообщение об ошибке. Пример. И�пользование 127.*.0.1 выда�т ошибку.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_find_submit</word_key>
-      <word_default>Find user</word_default>
-      <word_custom>�айти пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ipp_found</word_key>
-      <word_default>Your search returned (at least) the following number of matching posts:</word_default>
-      <word_custom>Кол-во найденных по вашему запро�у �ообщений:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ip_desc_text</word_key>
-      <word_default><![CDATA[<strong>Resolve IP Address</strong>: This option will allow you to look up an IP address for more information (note, you must enter all 4 parts of the IP address to use this tool)<br /><strong>Find Posts with this IP</strong>: This option will run a search for all posts associated with this IP address (limited to 500 results)<br /><strong>Find members who registered with this IP</strong>: This tool will run a seach for all members who registered with the entered IP address]]></word_default>
-      <word_custom><![CDATA[<b><u>Определение</u> IP адре�а</b>:  С помощью �той опции вы �можете узнать об IP адре�е более подробные �ведени� (примечание, вы должны вве�ти в�е 4 ча�ти IP адре�а дл� и�пользовани� �того �ред�тва)<br /><b><u>Пои�к �ообщений</u> � �тим IP</b>: Эта функци� запу�тит пои�к в�ех �ообщений, отправленных � �того IP адре�а (не более 500 �ообщений)<br /><b><u>Пои�к пользователей, </u> зареги�трированных � �того IP</b>: Эта функци� запу�тит пои�к в�ех пользователей, зареги�трированных � �того IP адре�а]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_page_allforums</word_key>
-      <word_default>All Forums</word_default>
-      <word_custom>В�е форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_enable</word_key>
-      <word_default>Enable this announcement</word_default>
-      <word_custom>Опубликовать объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>menu_announcements</word_key>
-      <word_default>Manage Announcements</word_default>
-      <word_custom>Объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_edit_user</word_key>
-      <word_default>Member Look-up</word_default>
-      <word_custom>Пои�к пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_find_user</word_key>
-      <word_default>Enter part, or all of the username you wish to edit</word_default>
-      <word_custom>Введите ча�ть или полное им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_forums2</word_key>
-      <word_default>You may choose more than one</word_default>
-      <word_custom>Можете выбрать не�колько форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_allforums</word_key>
-      <word_default>-- All Forums --</word_default>
-      <word_custom>-- В�е форумы --</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_use_html</word_key>
-      <word_default>Enable HTML?</word_default>
-      <word_custom>Включить HTML?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_use_nlbr</word_key>
-      <word_default>Parse newlines (if HTML enabled)?</word_default>
-      <word_custom>Включить обработку новых �трок (е�ли HTML включен)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_startdesc</word_key>
-      <word_default>Leave blank to not use a start date</word_default>
-      <word_custom>�е заполн�йте, е�ли не хотите и�пользовать дату начала</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_enddesc</word_key>
-      <word_default>Leave blank to not use an end date</word_default>
-      <word_custom>�е заполн�йте, е�ли не хотите и�пользовать дату завершени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_forums</word_key>
-      <word_default>Activate in Forums</word_default>
-      <word_custom>Показывать в форумах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_start</word_key>
-      <word_default>Start Date (MM-DD-YYYY)</word_default>
-      <word_custom>Дата начала (ДД.ММ.ГГГГ)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_end</word_key>
-      <word_default>End Date (MM-DD-YYYY)</word_default>
-      <word_custom>Дата завершени� (ДД.ММ.ГГГГ)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_form_title</word_key>
-      <word_default>Announcement Title</word_default>
-      <word_custom>Заголовок объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_none</word_key>
-      <word_default>There are no announcements</word_default>
-      <word_custom>�ет ни одного объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_button_edit</word_key>
-      <word_default>Edit Announcement</word_default>
-      <word_custom>Отредактировать объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_current</word_key>
-      <word_default>Current Announcements</word_default>
-      <word_custom>Текущие объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_add</word_key>
-      <word_default>Add Announcement</word_default>
-      <word_custom>Создание объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_starts</word_key>
-      <word_default>Starts</word_default>
-      <word_custom>�ачало</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_end</word_key>
-      <word_default>Ends</word_default>
-      <word_custom>Окончание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>Заголовок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_author</word_key>
-      <word_default>Author</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_error_forums</word_key>
-      <word_default>You must choose at least one forum for this announcement.</word_default>
-      <word_custom>Вы должны выбрать хот� бы один форум дл� �того объ�влени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_error_title</word_key>
-      <word_default>You must enter a title and content for this announcement.</word_default>
-      <word_custom>Вы должны вве�ти заголовок и тек�т объ�влени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_error_date</word_key>
-      <word_default>The start or end date is not a real date, please check the dates entered.</word_default>
-      <word_custom>Дата начала или завершени� указана в неправильном формате. Проверьте введенные данные.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_del1</word_key>
-      <word_default>Are you sure you wish to delete this announcement?</word_default>
-      <word_custom>Вы дей�твительно хотите удалить �то объ�вление?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_del2</word_key>
-      <word_default>Ok, no action taken!</word_default>
-      <word_custom>Дей�твие отменено!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_c_change</word_key>
-      <word_default>Change to:</word_default>
-      <word_custom>Изменить на:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_page_disabled</word_key>
-      <word_default>(Not Active)</word_default>
-      <word_custom>(Отключено)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subs_submit</word_key>
-      <word_default>Proceed</word_default>
-      <word_custom>Выполнить дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_none_title</word_key>
-      <word_default>No Notification</word_default>
-      <word_custom>�е уведомл�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_none_desc</word_key>
-      <word_default>This option will not send out any notification but will retain the forum in your subscriptions panel.</word_default>
-      <word_custom>При выборе �той опции вы не будете получать никаких уведомлений на e-mail, но в�е новые и обновленные форумы будут �охранены на вашей личной �транице подпи�ок.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_weekly_desc</word_key>
-      <word_default>This option will send out a weekly digest showing all new topics and all updated topics for the week</word_default>
-      <word_custom>При выборе �той опции вы будете еженедельно получать краткое уведомление обо в�ех новых темах и �ообщени�х за текущую неделю.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_weekly</word_key>
-      <word_default>Weekly Digest</word_default>
-      <word_custom>Еженедельное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_daily</word_key>
-      <word_default>Daily Digest</word_default>
-      <word_custom>Ежедневное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_daily_desc</word_key>
-      <word_default>This option will send out a daily digest showing all new topics and all updated topics for the day</word_default>
-      <word_custom>При выборе �той опции вы будете ежедневно получать краткое уведомление обо в�ех новых темах и �ообщени�х за текущий день.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_immediate_desc</word_key>
-      <word_default>This option will send out a notification immediately after a new topic has been made, regardless of your activity.</word_default>
-      <word_custom>При выборе �той опции вы будете уведомлены о новых темах , незави�имо от того, при�ут�твуете ли вы или от�ут�твуете на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>subsf_immediate</word_key>
-      <word_default>Immediate Notification</word_default>
-      <word_custom>�емедленное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_search</word_pack>
+      <word_key>n_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлено</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subsf_delayed_desc</word_key>
-      <word_default><![CDATA[This option will send out a notification if a new topic has been posted and you're not active on the board.]]></word_default>
-      <word_custom>При выборе �той опции вы будете уведомлены о новых темах во врем� �воего от�ут�тви� на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>edit_my_about_me</word_key>
+      <word_default>Edit my About Me page</word_default>
+      <word_custom>Редактировать �траницу «Обо мне»</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subsf_delayed</word_key>
-      <word_default>Delayed Notification</word_default>
-      <word_custom>Уведомление � задержкой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>auto_but_no_email</word_key>
+      <word_default>You are automatically following all topics you reply to with no notification frequency selected.  This will cause the topics to show in your followed content area, but you will not receive notifications for these topics.</word_default>
+      <word_custom>Вы автоматиче�ки �ледите за в�еми темами, в которых вы отвечаете, без какой-либо подпи�ки на уведомлени� по ним. Это приведет к то, что �ти темы будут показывать в разделе � контентом, за которым вы �ледите, но вы не будете получать уведомлени� по ним.</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subsf_exp_text</word_key>
-      <word_default><![CDATA[Please choose your notification method.<br />You will receive a notification when a new topic is posted in a forum you are subscribed to.  Digests will also include updated topics.]]></word_default>
-      <word_custom><![CDATA[Выберите �по�об уведомлени�.<br />При подпи�ке на форум вы будете уведомлены обо в�ех новых темах в �том форуме, а при подпи�ке на тему получите уведомлени� уже о в�ех новых �ообщени�х в �той теме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>background_options</word_key>
+      <word_default>Background Options</word_default>
+      <word_custom>�а�тройки фона</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_none_title</word_key>
-      <word_default>No Notification</word_default>
-      <word_custom>�е уведомл�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>general_account_settings</word_key>
+      <word_default>General Account Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_none_desc</word_key>
-      <word_default>This option will not send out any notifications, but will retain the topic in your subscriptions panel.</word_default>
-      <word_custom>При выборе �той опции вы не будете получать никаких уведомлений на e-mail, но в�е новые и обновленные темы будут �охранены на вашей личной �транице подпи�ок.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_photo_title</word_key>
+      <word_default>Photo</word_default>
+      <word_custom>Фото</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_weekly</word_key>
-      <word_default>Weekly Digest</word_default>
-      <word_custom>Еженедельное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_hide_allow</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Показать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_weekly_desc</word_key>
-      <word_default>This option will send out a weekly digest showing all new replies for the week</word_default>
-      <word_custom>При выборе �той опции вы будете еженедельно получать краткое уведомление обо в�ех новых �ообщени�х за текущую неделю.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_ignore_sigs_glb</word_key>
+      <word_default>Hide</word_default>
+      <word_custom>Скрыть</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_daily_desc</word_key>
-      <word_default>This option will send out a daily digest showing all new replies for the day</word_default>
-      <word_custom>При выборе �той опции вы будете ежедневно получать краткое уведомление обо в�ех новых темах и �ообщени�х за текущий день.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_ignore_sigs</word_key>
+      <word_default>Signature</word_default>
+      <word_custom>Подпи�ь</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_daily</word_key>
-      <word_default>Daily Digest</word_default>
-      <word_custom>Ежедневное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_add_prefix</word_key>
+      <word_default>Ignore:</word_default>
+      <word_custom>Игнорировать:</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_immediate</word_key>
-      <word_default>Immediate Notification</word_default>
-      <word_custom>�емедленное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_email_pass_change</word_key>
+      <word_default><![CDATA[Email &amp; Password]]></word_default>
+      <word_custom>E-mail и пароль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_immediate_desc</word_key>
-      <word_default>This option will send out a notification immediately after a reply has been made, regardless of your activity.</word_default>
-      <word_custom>При выборе �той опции вы будете уведомлены о новых темах или ответах, незави�имо от того, при�ут�твуете ли вы или от�ут�твуете на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_global_prefs</word_key>
+      <word_default>Global Preferences</word_default>
+      <word_custom>Глоабальные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_delayed</word_key>
-      <word_default>Delayed Notification</word_default>
-      <word_custom>Уведомление � задержкой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_global_prefs_desc</word_key>
+      <word_default>Ignore all signatures when reading topics</word_default>
+      <word_custom>Игнорировать в�е подпи�и, когда читаете темы</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_delayed_desc</word_key>
-      <word_default><![CDATA[This option will send out a notification if a reply has been made and you're not active on the board.]]></word_default>
-      <word_custom>При выборе �той опции вы будете уведомлены о новых темах или ответах во врем� �воего от�ут�тви� на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_email_pass_change_desc</word_key>
+      <word_default><![CDATA[You can leave a section blank if you do not wish to update that section. For example, you can change your email address without completing the 'Password' section at the bottom.]]></word_default>
+      <word_custom><![CDATA[Вы можете о�тавить поле пу�тым, е�ли не хотите обновл�ть его. �апример, вы можете изменить ваш e-mail адре� без заполнени� пол� 'Пароль' в конце.]]></word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_for</word_key>
-      <word_default>for</word_default>
-      <word_custom>на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_photo_change</word_key>
+      <word_default>Change your photo...</word_default>
+      <word_custom>Изменить ваше фото...</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_c_title</word_key>
-      <word_default>Subscription Information</word_default>
-      <word_custom>Информаци� о подпи�ках</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_hide_disallow</word_key>
+      <word_default>Hide</word_default>
+      <word_custom>Свернуть</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_c_type</word_key>
-      <word_default>Type</word_default>
-      <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_ignored_users</word_key>
+      <word_default><![CDATA[You aren't ignoring any users]]></word_default>
+      <word_custom>Вы пока никого не игнорируете</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>subs_exp_text</word_key>
-      <word_default><![CDATA[Please choose your notification method.<br />You will receive a notification when a new reply is made to a topic you are subscribed to.]]></word_default>
-      <word_custom><![CDATA[Выберите �по�об уведомлени�.<br />При подпи�ке на форум вы будете уведомлены обо в�ех новых �ообщени�х в �той теме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_hide_disallow_msg</word_key>
+      <word_default>Block</word_default>
+      <word_custom>Блокировать</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>auto_track_type</word_key>
-      <word_default>If enabled, choose default notification type:</word_default>
-      <word_custom>Е�ли включено, выберите тип уведомлени�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_ignore_chats</word_key>
+      <word_default>Chats</word_default>
+      <word_custom>Перепи�ки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>auto_track</word_key>
-      <word_default>Watch every topic I reply to</word_default>
+      <word_default>Auto follow topics I reply to. Notification frequency:</word_default>
       <word_custom>Включить уведомлени� на e-mail?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>attach_topicmoved</word_key>
-      <word_default><![CDATA[<i>Unavailable</i>]]></word_default>
-      <word_custom><![CDATA[<i>Тема перемещена</i>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ucp_hide_allow_msg</word_key>
+      <word_default>Allow</word_default>
+      <word_custom>Разрешить</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>attach_inpm</word_key>
-      <word_default>Personal Message</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>conv_email_warning_title</word_key>
-      <word_default>EMAIL WARNING</word_default>
-      <word_custom>E-MAIL ПРЕДУПРЕЖДЕ�ИЕ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>conv_email_warning</word_key>
-      <word_default><![CDATA[Your email address has been changed because it was in use by another account. This means that all email will NOT go to your correct email address - this could include lost password notifications, etc.<br />PLEASE change your email address immediately.]]></word_default>
-      <word_custom><![CDATA[Ваш e-mail адре� изменен в �в�зи � тем, что данный e-mail и�пользует�� на другой учетной запи�и. Это означает, что вы не будете получать никаких пи�ем � форума, такие как уведомление о во��тановлении забытого парол� и т.д.<br />�емедленно измените �вой e-mail адре�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>announce_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>enable_flash</word_key>
-      <word_default>Enable flash uploader?</word_default>
-      <word_custom>Включить загрузку файлов � и�пользованием flash</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>flash_text</word_key>
-      <word_default>Allows for an upload progress bar and multiple file uploads, but does not work on all browsers</word_default>
-      <word_custom>Позвол�ет и�пользовать flash дл� прогре��-бара и загрузки не�кольких файлов. Работает не во в�ех браузерах.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>rte_text</word_key>
-      <word_default>Rich Text Editor requires IE6+, Mozilla / Firefox 3.0+, Safari 4+, Google Chrome, or Opera 9+</word_default>
-      <word_custom>Визуальный редактор требует Internet Explorer 6+, Mozilla / Firefox или Opera 9+</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_title_posting</word_key>
-      <word_default>Posting Settings</word_default>
-      <word_custom>�а�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>enable_rte</word_key>
-      <word_default>Enable visual (RTE) editor?</word_default>
-      <word_custom>И�пользовать визуальный редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_time_txt2</word_key>
-      <word_default>The time (including your current adjustment) is:</word_default>
-      <word_custom>Текущее врем� (включа� ваши на�тройки ча�ового по��а):</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dst_correction_title</word_key>
-      <word_default>DST Correction</word_default>
-      <word_custom>Коррекци� перехода на летнее врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dst_auto2</word_key>
-      <word_default>If selected, your DST setting is automatically adjusted when you next load the board index</word_default>
-      <word_custom>Е�ли выбрано, то ваши на�тройки перехода на летнее врем� будут автоматиче�ки применены, когда в �ледующий раз вы войдете на главную �траницу форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dst_error</word_key>
-      <word_default>An error occurred when trying to automatically change your DST settings. If the error continues, please switch off auto DST correction.</word_default>
-      <word_custom>Произошла ошибка при попытке автоматиче�ки изменить ваши на�тройки перехода на летнее врем�. Е�ли ошибка продолжает��, пожалуй�та, отключите автокоррекцию перехода на летнее врем�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_dname_change</word_key>
-      <word_default>Change Display Name</word_default>
-      <word_custom>Изменить им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_title</word_key>
-      <word_default>Change Display Name</word_default>
-      <word_custom>Изменить им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_string</word_key>
-      <word_default><![CDATA[You have made %s of %s display name changes since %s.<br />You are permitted to make %s changes in a %s day period.<br /><br />Changing your display name will <strong>not</strong> affect your log in details.]]></word_default>
-      <word_custom><![CDATA[Вы �делали %s из %s изменений имени пользовател� � %s.<br />Вам разрешено делать %s изменений каждые %s дней.<br /><br >Изменение  имени никак <strong>не</strong> отражает�� на вашем логине.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_password2</word_key>
-      <word_default>This is to ensure security on your account</word_default>
-      <word_custom>Это гарантирует безопа�но�ть вашей учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_password</word_key>
-      <word_default>Enter your current password</word_default>
-      <word_custom>Введите ваш текущий пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_choose2</word_key>
-      <word_default><![CDATA[This is the display name you wish to now use. Characters not permitted: [ ] | , ; &#036;]]></word_default>
-      <word_custom><![CDATA[Запрещенные �имволы: [ ] | , ;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_change_ok</word_key>
-      <word_default>Display name changed successfully</word_default>
-      <word_custom>Им� пользовател� у�пешно изменено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_choose</word_key>
-      <word_default>Enter a new display name</word_default>
-      <word_custom>Введите новое им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sub_added</word_key>
-      <word_default>Your subscription has been added</word_default>
-      <word_custom>Подпи�ка у�пешно добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_op_pm_desc</word_key>
-      <word_default>If you disable your personal messenger, you will not be able to start or participate in personal conversations.</word_default>
-      <word_custom>Е�ли вы отключите и�пользование вами личных �ообщений, вы не �можете отправл�ть и получать личные �ообщени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_op_pm</word_key>
-      <word_default>Disable my personal messenger</word_default>
-      <word_custom>�е принимать личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_choose_fmod_type</word_key>
-      <word_default>Choose the type of moderation for when new friends are added</word_default>
-      <word_custom>Выберите тип модерации дл� добавлени� в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_choose_cmod_type</word_key>
-      <word_default>Choose the type of moderation for when comments are added</word_default>
-      <word_custom>Выберите тип модерации новых комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_choose_comm_type</word_key>
-      <word_default>Choose the type of notification for when comments are added</word_default>
-      <word_custom>Выберите тип уведомлени� о новых комментари�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_choose_friend_type</word_key>
-      <word_default>Choose the type of notification for when new friends are added</word_default>
-      <word_custom>Выберите тип уведомлени� о новых друзь�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_current_aboutme</word_key>
-      <word_default><![CDATA[Your current 'About Me' page]]></word_default>
-      <word_custom>Текуща� информаци� о �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>identity_url_assoc</word_key>
-      <word_default>That identity url is already in use by another account</word_default>
-      <word_custom>Этот OpenID уже и�пользует�� другим пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cp_edit_aboutme</word_key>
-      <word_default><![CDATA[Edit your 'About Me' page]]></word_default>
-      <word_custom>Изменить информацию о �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>identity_url_desc</word_key>
-      <word_default>You can associate an OpenID identity URL with your account</word_default>
-      <word_custom>Вы можете �в�зать ваш OpenID � вашей учетной запи�ью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>identity_url</word_key>
-      <word_default>Your Identity URL</word_default>
-      <word_custom>Ваш OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>identity_url_h3</word_key>
-      <word_default>OpenID Options</word_default>
-      <word_custom>�а�тройки OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_notes</word_key>
-      <word_default>Manage Notes</word_default>
-      <word_custom>Заметки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_badimgext</word_key>
-      <word_default>You cannot link to that type of image</word_default>
-      <word_custom>Вы не можете �делать ��ылку на �тот тип изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_chmod</word_key>
-      <word_default>The upload failed - there was a problem moving the avatar to the uploads directory.  Please verify permissions are set correctly on the uploads folder.</word_default>
-      <word_custom>Загрузка не удала�ь - возникла ошибка при перемещении аватара в директорию загрузки. Пожалуй�та, проверьте права до�тупа к директории загрузки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_badimg</word_key>
-      <word_default>The upload failed - there was a problem processing the image</word_default>
-      <word_custom>Загрузка не удала�ь - возникла ошибка при обработке изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_noimg2</word_key>
-      <word_default>We could not determine the avatar you were trying to update with</word_default>
-      <word_custom>�евозможно определить аватар, который вы хотите обновить на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_noimg</word_key>
-      <word_default>The upload failed - you may only upload an image file</word_default>
-      <word_custom>Загрузка не удала�ь - вы можете загрузить только изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_toobig</word_key>
-      <word_default>The upload failed - the file was too large</word_default>
-      <word_custom>Загрузка не удала�ь - файл �лишком большой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_noperm</word_key>
-      <word_default><![CDATA[You do not have permission to edit an administrator's avatar]]></word_default>
-      <word_custom>У ва� недо�таточно прав дл� редактировани� аватара админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_nofile</word_key>
-      <word_default>The upload failed - there was no image to upload</word_default>
-      <word_custom>Загрузка не удала�ь - изображение не загружено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>saveavatar_nomem</word_key>
-      <word_default>The member does not exist</word_default>
-      <word_custom>Пользователь не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>noignoreuser_noid</word_key>
-      <word_default>We could not find the member you were attempting to remove from your ignore list, or you are not ignoring that user</word_default>
-      <word_custom>�е удало�ь найти пользовател�, которого вы хотите удалить из �пи�ка игнорируемых. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>noignoreuser_success</word_key>
-      <word_default>You are no longer ignoring the user</word_default>
-      <word_custom>Пользователь удален из �пи�ка игнорируемых</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ignoreuser_success</word_key>
-      <word_default>You are now ignoring the user</word_default>
-      <word_custom>Пользователь добавлен в �пи�ок игнорируемых</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ignoreuser_cannot</word_key>
-      <word_default>You cannot ignore that member</word_default>
-      <word_custom>Вы не можете игнорировать �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ignoreuser_already</word_key>
-      <word_default>You are already choosing to ignore items from that member</word_default>
-      <word_custom>Пользователь уже находит�� в �пи�ке игнорируемых</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ignoreuser_noid</word_key>
-      <word_default>We could not find the member you were attempting to ignore.</word_default>
-      <word_custom>�е удало�ь найти пользовател�, которого вы хотите добавить в �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>removeav_noperm</word_key>
-      <word_default><![CDATA[You do not have permission to edit a administrator's avatar]]></word_default>
-      <word_custom>У ва� недо�таточно прав дл� редактировани� аватара админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ignoreuser_nomem</word_key>
-      <word_default>We could not find a member that matches that name</word_default>
-      <word_custom>�е удало�ь найти пользовател� � таким именем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>removeav_notexist</word_key>
-      <word_default>The member does not exist</word_default>
-      <word_custom>Пользователь не �уще�твует</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>change_settings</word_key>
-      <word_default>Change Profile Information</word_default>
-      <word_custom>Изменить данные профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>change_aboutme</word_key>
-      <word_default>Change About Me Page</word_default>
-      <word_custom>Информаци� о �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>captcha_email_invalid</word_key>
-      <word_default>That CAPTCHA input did not match the CAPTCHA image.</word_default>
-      <word_custom>Введенна� �трока не �оответ�твует �троке на изображении.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>emails_no_matchy</word_key>
-      <word_default>The entered email addresses do not match.</word_default>
-      <word_custom>Введенные e-mail адре�а не �овпадают.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>email_not_valid</word_key>
-      <word_default>You must enter valid email addresses.</word_default>
-      <word_custom>Вы должны вве�ти верный e-mail адре�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>email_is_taken</word_key>
-      <word_default>That email address is already in use.</word_default>
-      <word_custom>Этот e-mail адре� уже и�пользует�� другим пользователем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_taken</word_key>
-      <word_default>That name is already in use, please choose another.</word_default>
-      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_no_more</word_key>
-      <word_default>You are not permitted to make any more changes to your display name</word_default>
-      <word_custom>Вы больше не можете изменить ваше им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_illegal</word_key>
-      <word_default>The name contains illegal characters.</word_default>
-      <word_custom>Им� �одержит недопу�тимые �имволы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_tooshort</word_key>
-      <word_default>The name must be more than 3 characters and less than %s characters</word_default>
-      <word_custom>Им� должно быть больше 3 и меньше %s �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_noload</word_key>
-      <word_default>We could not load the member</word_default>
-      <word_custom>�евозможно загрузить пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_change_noperm</word_key>
-      <word_default>That name is already in use, please choose another.</word_default>
-      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>name_taken_change</word_key>
-      <word_default>That name is already in use, please choose another.</word_default>
-      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pw_change_successful</word_key>
-      <word_default>Your password change was successful</word_default>
-      <word_custom>Пароль у�пешно изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>new_pw_too_long</word_key>
-      <word_default>Your new password is too long</word_default>
-      <word_custom>�овый пароль �лишком длинный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>hanlogin_pw_failed</word_key>
-      <word_default>The password change failed</word_default>
-      <word_custom>�евозможно изменить пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>current_pw_bad</word_key>
-      <word_default>Your current password is incorrect</word_default>
-      <word_custom>�еверный текущий пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>passwords_not_matchy</word_key>
-      <word_default>The passwords do not match</word_default>
-      <word_custom>Пароли не �овпадают</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>called_invalid_function</word_key>
-      <word_default>The page you requested was not valid.</word_default>
-      <word_custom>Запрошенна� вами �траница не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pagetitle_bit</word_key>
-      <word_default>User CP</word_default>
-      <word_custom>Профиль пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>complete_entire_form</word_key>
-      <word_default>You must complete the entire form</word_default>
-      <word_custom>Вы должны заполнить в�ю форму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_outline_explain</word_key>
-      <word_default>All posts in a topic are shown in tree display, with one thread at a time shown.</word_default>
-      <word_custom>В�е �ообщени� показывают�� в древовидном �пи�ке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_announcements</word_key>
-      <word_default>Announcements</word_default>
-      <word_custom>Объ�влени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>securehash_not_secure</word_key>
-      <word_default>Your security key was not valid.</word_default>
-      <word_custom>�еверный ключ безопа�но�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_outline</word_key>
-      <word_default>Outline</word_default>
-      <word_custom>Древовидный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_standard_explain</word_key>
-      <word_default>Posts are shown one after the other.</word_default>
-      <word_custom>Сообщени� показывают�� друг за другом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_linearplus_explain</word_key>
-      <word_default>The first post is always shown at the top of the page, with other posts shown one after the other.</word_default>
-      <word_custom>Первое �ообщение в�егда показывает�� вверху �траницы. О�тальные �ообщени� показывают�� друг за другом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_standard</word_key>
-      <word_default>Standard</word_default>
-      <word_custom>Стандартный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_linearplus</word_key>
-      <word_default>Linear +</word_default>
-      <word_custom>Линейный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_required_info</word_key>
-      <word_default>Required Information</word_default>
-      <word_custom>Требуема� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_other_info</word_key>
-      <word_default>Other Information</word_default>
-      <word_custom>Друга� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_remove_photo</word_key>
-      <word_default>Remove My Photo</word_default>
-      <word_custom>Удалить фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_dst_now</word_key>
-      <word_default>Currently in DST?</word_default>
-      <word_custom>Уже на летнем времени?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_dst_effect</word_key>
-      <word_default>Is DST currently in effect?</word_default>
-      <word_custom>Перейти на летнее врем�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_topic_display_mode</word_key>
-      <word_default>Topic Display Mode</word_default>
-      <word_custom>Режимы отображени� тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_birthday_select</word_key>
-      <word_default>Select Your Birthday</word_default>
-      <word_custom>Введите дату рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_birthday_optional</word_key>
-      <word_default>Entering your birthday is optional</word_default>
-      <word_custom>Ввод дн� рождени� не �вл�ет�� об�зательным</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_show_x_latest</word_key>
-      <word_default>Show X latest visitors on my profile</word_default>
-      <word_custom>Показывать X по�ледних по�етителей профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_friend_approve</word_key>
-      <word_default>Friend Approval</word_default>
-      <word_custom>Модерировать запро�ы на дружбу?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_friends</word_key>
-      <word_default>Friends</word_default>
-      <word_custom>Друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_show_friends_profile</word_key>
-      <word_default>Show my friends in my profile</word_default>
-      <word_custom>Показывать друзей в профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_friend_notify</word_key>
-      <word_default>Friend Notification Type</word_default>
-      <word_custom>Уведомл�ть о новых друзь�х?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_comment_approval</word_key>
-      <word_default>Comment Approval</word_default>
-      <word_custom>Модерировать новые комментарии?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_comment_notify_type</word_key>
-      <word_default>Comment Notification Type</word_default>
-      <word_custom>Уведомл�ть о новых комментари�х?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_comments</word_key>
-      <word_default>Comments</word_default>
-      <word_custom>Комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_enable_comments</word_key>
-      <word_default>Enable Profile Comments</word_default>
-      <word_custom>Разрешить комментирование профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_members_name</word_key>
-      <word_default><![CDATA[Member's Name]]></word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_ignore_pc</word_key>
-      <word_default>Ignore Personal Conversations</word_default>
-      <word_custom>Игнорировать личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_ignored_users</word_key>
-      <word_default>Ignored Users</word_default>
-      <word_custom>Игнорируемые пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_ignore_posts</word_key>
-      <word_default>Ignore Posts</word_default>
-      <word_custom>Игнорировать �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_ignore_msgs</word_key>
-      <word_default>Ignore Messages</word_default>
-      <word_custom>Игнорировать личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_reply_since</word_key>
-      <word_default>topic(s) have new replies since your last visit</word_default>
-      <word_custom>тем �одержат новые ответы � момента вашего по�леднего по�ещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_select_category</word_key>
-      <word_default>Select a Category</word_default>
-      <word_custom>Выберите категорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_watched_forums</word_key>
-      <word_default>Watched Forums</word_default>
-      <word_custom>От�леживаемые форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_full</word_key>
-      <word_default>full</word_default>
-      <word_custom> допу�тимого ме�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_user_attach</word_key>
-      <word_default>User Attachments</word_default>
-      <word_custom>Файлы пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_view_org</word_key>
-      <word_default>View original topic</word_default>
-      <word_custom>По�мотреть оригинальную тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_remove_avatar</word_key>
-      <word_default>Remove My Avatar</word_default>
-      <word_custom>Удалить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_gravatar_enter_email</word_key>
-      <word_default><![CDATA[enter your <a href='http://en.gravatar.com' title='Gravatar site'>Gravatar</a> e-mail address]]></word_default>
-      <word_custom><![CDATA[введите e-mail адре� вашего <a href='http://en.gravatar.com' title='Gravatar �айт'>Gravatar</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_attach_allowance</word_key>
-      <word_default>Your attachment allowance is</word_default>
-      <word_custom>Зан�то </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>settings_for_ucp</word_key>
-      <word_default>Settings for</word_default>
-      <word_custom>�а�тройки дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cancel_edit</word_key>
-      <word_default>Cancel edit</word_default>
-      <word_custom>Отмена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>admin_emailpassword</word_key>
-      <word_default>Because you have administrator access on this board, you must utilize the admin control panel to change your email address or password.  This measure is taken for security purposes.  In the Admin CP, navigate to the System tab, and click on Change My Details.  You will be able to change your email address and password from this page.</word_default>
-      <word_custom>Вы имеете до�туп админи�тратора, по�тому дл� изменени� e-mail адре�а или парол� вам необходимо перейти в �Ц. Эта мера принимает�� в цел�х безопа�но�ти. В �Ц перейдите на вкладку Пользователи, нажмите Управление пользовател�ми, найдите вашу учетную запи�ь и нажмите на ваше им�. �а �той �транице вы �можете изменить �вой e-mail адре� и пароль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_toomanyurls</word_key>
-      <word_default>You may only use up to %s urls in your signature.</word_default>
-      <word_custom>Подпи�ь может �одержать не более %s ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_toomanylines</word_key>
-      <word_default>You may only use up to %s lines of text in your signature.</word_default>
-      <word_custom>Подпи�ь не должна быть больше %s �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_imagetoobig</word_key>
-      <word_default><![CDATA[<a href='%s'>This image</a> is larger than the maximum allowed dimensions of %s x %s.]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>Это изображение</a> больше мак�имально допу�тимого размера %s х %s.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_toomanyimages</word_key>
-      <word_default>You may only use up to %s images in your signature.</word_default>
-      <word_custom>Подпи�ь может �одержать не более %s изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_urls_nl</word_key>
-      <word_default>Any number of URLs</word_default>
-      <word_custom>Любое количе�тво ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_lines</word_key>
-      <word_default>Up to %s lines</word_default>
-      <word_custom>До %s �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_lines_nl</word_key>
-      <word_default>Any number of lines</word_default>
-      <word_custom>Любое количе�тво �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_facebook</word_key>
-      <word_default>Manage Facebook Connect</word_default>
-      <word_custom>Соединение � Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_imgsize_nl</word_key>
-      <word_default>Images of any size</word_default>
-      <word_custom>Изображени� любого размера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_urls</word_key>
-      <word_default>Up to %s URLs</word_default>
-      <word_custom>До %s ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_imagesr_nl</word_key>
-      <word_default>Any number images</word_default>
-      <word_custom>Любое количе�тво изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_imgsize</word_key>
-      <word_default>Images up to %s x %s pixels</word_default>
-      <word_custom>Изображени� размером до %s х %s пик�елей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>topic_title</word_key>
-      <word_default>Topic title</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_max_imagesr</word_key>
-      <word_default>Up to %s images</word_default>
-      <word_custom>До %s изображений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_restrictions</word_key>
-      <word_default>Signature Restrictions</word_default>
-      <word_custom>Ограничени� подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_restrictions_contain</word_key>
-      <word_default>Your signature may contain:</word_default>
-      <word_custom>Подпи�ь может �одержать:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate_now</word_key>
-      <word_default>Disassociate Account Now</word_default>
-      <word_custom>Отв�зать учетную запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate_info_3</word_key>
-      <word_default>and choose an email address outside of Facebook if you wish to continue using this forum account after you have disassociated your forum account from Facebook. There is no undo.</word_default>
-      <word_custom>и выберите e-mail вне Facebook е�ли хотите продолжить и�пользовать �ту учетную запи�ь на форуме, но отв�зать ее от Facebook. Это дей�твие нельз� отменить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate_info_2</word_key>
-      <word_default>change your email address</word_default>
-      <word_custom>изменение вашего e-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate_info_1</word_key>
-      <word_default>If you disassociate your forum account, you will not be able to use the Forgotton Password feature to retrieve your forum account password.  It is recommended you</word_default>
-      <word_custom>Е�ли вы отключаете �в�зь Facebook � учетной запи�ью на форуме, вы не �можете и�пользовать функцию во��тановлени� парол� на форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_using_email</word_key>
-      <word_default>You are using a Facebook email address</word_default>
-      <word_custom>Вы и�пользуете Facebook e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_now</word_key>
-      <word_default>Synchronize Now</word_default>
-      <word_custom>Синхронизировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate</word_key>
-      <word_default>Disassociate Facebook</word_default>
-      <word_custom>Отключить �в�зь � аккаунтом в Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_disassociate_desc</word_key>
-      <word_default>This will log you out, remove the account link from Facebook and will remove the Facebook Application.</word_default>
-      <word_custom>Выйти из учетной запи�и, удалить �оединение � Facebook и удалить приложение Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_never</word_key>
-      <word_default>Never</word_default>
-      <word_custom>�икогда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_aboutme</word_key>
-      <word_default><![CDATA[Update my <strong>&quot;About Me&quot;</strong> with my Facebook &quot;About Me&quot;]]></word_default>
-      <word_custom><![CDATA[Обновить данные <strong>«Обо мне»</strong> на форуме и на Facebook.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_last_syncd</word_key>
-      <word_default>This information is updated once every 24 hours.  Last synchronized:</word_default>
-      <word_custom>Эта информаци� обновл�ет�� каждые 24 ча�а. По�леднее обновление:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_avatar</word_key>
-      <word_default><![CDATA[Update my <strong>Avatar</strong> with my Facebook picture]]></word_default>
-      <word_custom><![CDATA[Заменить <strong>аватар</strong> аватаром из Facebook ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_options</word_key>
-      <word_default>Facebook to Forum Account Synchronization Options</word_default>
-      <word_custom>Опции �инхронизации учетной запи�и Facebook и �того форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_photo</word_key>
-      <word_default><![CDATA[Update my <strong>Profile Picture</strong> with my Facebook picture]]></word_default>
-      <word_custom><![CDATA[И�пользовать в профиле <strong>фото</strong> из Facebook ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_logged_in_as</word_key>
-      <word_default>You are logged into Facebook as</word_default>
-      <word_custom>Вы авторизованы на Facebook как</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_config</word_key>
-      <word_default><![CDATA[You will need to connect with Facebook before you can configure your options. If you do not see the Facebook button below, try logging out of <a href='http://www.facebook.com' target='_blank'>Facebook</a> and reloading this page.]]></word_default>
-      <word_custom>Вам нужно войти через Facebook, прежде чем  на�траивать �ти опции.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_connect_mismatch</word_key>
-      <word_default>Facebook Connect Mismatch</word_default>
-      <word_custom>�ет �оединени� � Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_connect_mismatch_desc</word_key>
-      <word_default><![CDATA[The <em>Facebook account</em> you are currently logged into is already linked to another forum account.<br />You will need to log out of <a href='http://www.facebook.com'>Facebook</a> before returning here if you want to configure these options.]]></word_default>
-      <word_custom><![CDATA[Данна� <em>учетна� запи�ь на Facebook</em> уже и�пользует�� другим пользователем форума.<br />Вам нужно выйти из <a href='http://www.facebook.com'>Facebook</a> прежде чем дальше на�траивать ваши опции.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_email_not_allowed_desc</word_key>
-      <word_default>You have not given this forum permission to send emails via your facebook account. You will need to click the link in the box above to allow this before you can configure any Facebook Connect options.</word_default>
-      <word_custom>У ва� недо�таточно прав дл� отправки e-mail пи�ьма через facebook профиль. Вам нужно нажать на ��ылку в вышеуказанном блоке дл� решени� �той проблемы. Прежде чем вы �можете на�траивать опции �оединени� � Facebook.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>member_title_desc</word_key>
-      <word_default>Your member title is shown beside posts you make</word_default>
-      <word_custom>Ваш �тату� отображает�� � вашими �ообщени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_email_not_allowed</word_key>
-      <word_default>Email Not Allowed</word_default>
-      <word_custom>Отправка e-mail пи�ем запрещена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>member_title</word_key>
-      <word_default>Member Title</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>avatar</word_key>
-      <word_default>Avatar</word_default>
-      <word_custom>�ватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>profile_information</word_key>
-      <word_default>Profile Information</word_default>
-      <word_custom>Данные профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>click_allow_email</word_key>
-      <word_default>Click here to allow email from this forum</word_default>
-      <word_custom>�ажмите зде�ь, чтобы получать пи�ьма � �того форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cannot_get_email_2</word_key>
-      <word_default>Until you allow emails from this forum, you will not receive topic subscription notifications, new personal message notifications, etc.</word_default>
-      <word_custom>Пока вы не разрешите получать пи�ьма � �того форума, вы не �можете получать уведомлени� о �обыти�х в от�леживаемых темах, уведомлени� о новых личных �ообщени�х и т.п.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>h_hits</word_key>
-      <word_default>Views</word_default>
-      <word_custom>Про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>cannot_get_email</word_key>
-      <word_default>You cannot currently receive emails from this forum</word_default>
-      <word_custom>Вы не можете получать пи�ьма � �того форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>h_replies</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>h_topic_starter</word_key>
-      <word_default>Topic Starter</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>h_last_action</word_key>
-      <word_default>Last Action</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>h_topic_title</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_group_restrict_posts</word_key>
-      <word_default>You cannot change your signature until you have %s more approved posts</word_default>
-      <word_custom>Вы не �можете изменить вашу подпи�ь пока у ва� не будет более %s утвержденных �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>sig_group_restrict_date</word_key>
-      <word_default>You cannot change your signature until %s</word_default>
-      <word_custom>Вы не �можете изменить вашу подпи�ь до %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_group_restrict_posts</word_key>
-      <word_default>You cannot change your display name until you have %s more approved posts</word_default>
-      <word_custom>Вы не �можете изменить ваше им� пользовател� пока у ва� не будет более %s утвержденных �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>op_dd_enabled</word_key>
-      <word_default>Enabled  - Only add when I approve them</word_default>
-      <word_custom>Включено — добавл�ть только когда � �то разрешил</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>dname_group_restrict_date</word_key>
-      <word_default>You cannot change your display name until %s</word_default>
-      <word_custom>Вы не �можете изменить ваше им� пользовател� до %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>op_dd_pm</word_key>
-      <word_default>Notify Via Personal Message (PM)</word_default>
-      <word_custom>Уведомл�ть личным �ообщением (PM)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>op_dd_disabled</word_key>
-      <word_default>Disabled - Allow addition without approving</word_default>
-      <word_custom>Выключено — разрешить добавление без подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>op_dd_email</word_key>
-      <word_default>Notify Via Email</word_default>
-      <word_custom>Уведомл�ть по e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>op_dd_none</word_key>
-      <word_default>No Notification</word_default>
-      <word_custom>�е уведомл�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_cannot_find_member</word_key>
-      <word_default>Please reload the page and try again.  If you continue to experience problems, please contact an administrator.</word_default>
-      <word_custom>Перезагрузите �траничку и попробуйте еще раз. Е�ли не помогает - обратите�ь к админи�тратору. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_upload_to_big</word_key>
-      <word_default>The file you uploaded is too large.</word_default>
-      <word_custom>Файл, который вы пытаете�ь загрузить �лишком большой.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_upload_failed</word_key>
-      <word_default>The upload failed.  Please notify an administrator.</word_default>
-      <word_custom>Загрузка не удала�ь. Сообщите админи�тратору.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_invalid_file_extension</word_key>
-      <word_default>The file type you tried to upload is not allowed.</word_default>
-      <word_custom>Тип файла, который вы пытаете�ь загрузить, не разрешен дл� загрузки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_no_photo_upload_permission</word_key>
-      <word_default>You do not have permission to upload a personal photo.</word_default>
-      <word_custom>Вам не разрешено загружать фотографию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tab__core</word_key>
-      <word_default>Settings</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tab__forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tab__members</word_key>
-      <word_default>Profile</word_default>
-      <word_custom>Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>your_browser_norte</word_key>
-      <word_default>Your browser does not support the RTE</word_default>
-      <word_custom>Ваш браузер не поддерживает визуальный редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>admin_val_no_email_chg</word_key>
-      <word_default>You cannot change your email address until the administrator validates your account.</word_default>
-      <word_custom>Вы не можете �менить email адре�, до тех пор пока админи�тратор не активирует вашу учетную запи�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_forum_search_display_1</word_key>
-      <word_default>Show results as a list</word_default>
-      <word_custom>Показать результаты в виде �пи�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_forum_search_display_0</word_key>
-      <word_default>Show results like a forum</word_default>
-      <word_custom>Показать результаты в виде форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_vnc_type_1</word_key>
-      <word_default>Show me all content that I have not read</word_default>
-      <word_custom>публикации, которые � еще не читал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_forum_search_display</word_key>
-      <word_default>Forum Results Display</word_default>
-      <word_custom>Результаты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_vnc_type_0</word_key>
-      <word_default>Show me all new content since my last visit</word_default>
-      <word_custom>публикации � момента по�леднего по�ещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_title_search</word_key>
-      <word_default>Search Settings</word_default>
-      <word_custom>�а�тройка пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_vnc_type</word_key>
-      <word_default>View New Content Method</word_default>
-      <word_custom>Тип новых публикаций</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_status_notify_all</word_key>
-      <word_default>Notify me by e-mail when a reply is made to any status I have replied to</word_default>
-      <word_custom>Уведомл�ть мен� по email о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_status_notify_mine</word_key>
-      <word_default>Notify me by e-mail when I get a reply to my status updates</word_default>
-      <word_custom>Уведомл�ть мен� по email о комментари�х к обновлени�м моего �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_status_email</word_key>
-      <word_default>Status Update Settings</word_default>
-      <word_custom>�а�тройки обновлени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify_type_mobile</word_key>
-      <word_default>Mobile</word_default>
-      <word_custom>Мобильный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_twitter</word_key>
-      <word_default>Manage Twitter Connect</word_default>
-      <word_custom>Cоединение � Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>twitter_config</word_key>
-      <word_default>You will need to connect with Twitter before you can configure your options. </word_default>
-      <word_custom>�еобходимо иметь �в�занный Twitter-аккаунт прежде чем что-то на�траивать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify_type_inline</word_key>
-      <word_default>Inline Notification</word_default>
-      <word_custom>Внутри�и�темное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify_type_pm</word_key>
-      <word_default>Personal Conversation</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify_type_email</word_key>
-      <word_default>Email</word_default>
-      <word_custom>Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifytitle_other</word_key>
-      <word_default>Other Notifications</word_default>
-      <word_custom>Прочие уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifytitle_status_updates</word_key>
-      <word_default>Status Updates</word_default>
-      <word_custom>Обновлени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifytitle_topics_posts</word_key>
-      <word_default><![CDATA[Topics &amp; Posts]]></word_default>
-      <word_custom>Темы и �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifytitle_profiles_friends</word_key>
-      <word_default><![CDATA[Profiles &amp; Friends]]></word_default>
-      <word_custom>Профиль и друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifytitle_private_msgs</word_key>
-      <word_default>Private Messages</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__file_approved</word_key>
-      <word_default>File I submitted is approved</word_default>
-      <word_custom>Отправленный мной файл одобрен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__new_file</word_key>
-      <word_default>File I am watching is updated</word_default>
-      <word_custom>От�леживаемый файл обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__friend_request_approve</word_key>
-      <word_default>Friend request approved</word_default>
-      <word_custom>Подтверждение моего запро�а на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__ccs_notifications</word_key>
-      <word_default>Article subscriptions</word_default>
-      <word_custom>Подпи�ка на �татью</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__reply_any_status</word_key>
-      <word_default>Replies to statuses I have replied to</word_default>
-      <word_custom>Комментарий к �тату�у, который � тоже прокомментировал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__reply_your_status</word_key>
-      <word_default>Replies to my statuses</word_default>
-      <word_custom>Прокоментирован мой �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__invite_private_message</word_key>
-      <word_default>Invited to a conversation</word_default>
-      <word_custom>Приглашение в личную бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__friend_status_update</word_key>
-      <word_default>Friends status updates</word_default>
-      <word_custom>Изменене �тату�а у друга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__reply_private_message</word_key>
-      <word_default>Replies to conversations</word_default>
-      <word_custom>�овое �ообщение в личной бе�еде</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__new_private_message</word_key>
-      <word_default>New conversation</word_default>
-      <word_custom>�ова� бе�еда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__friend_request_pending</word_key>
-      <word_default>Pending friend request</word_default>
-      <word_custom>�овый запро� на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__profile_comment_pending</word_key>
-      <word_default>Pending comments</word_default>
-      <word_custom>�е подтвержденный комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__friend_request</word_key>
-      <word_default>Adds me as a friend</word_default>
-      <word_custom>Добавили в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__profile_comment</word_key>
-      <word_default>Profile comments</word_default>
-      <word_custom>Комментарий в профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__new_reply</word_key>
-      <word_default>Topic Replies</word_default>
-      <word_custom>�овый ответ в теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__post_quoted</word_key>
-      <word_default>My posts being quoted</word_default>
-      <word_custom>Мое �ообщение процитировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__new_topic_queue</word_key>
-      <word_default>Topic pending approval</word_default>
-      <word_custom>�ова� тема, ожидающа� подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__report_center</word_key>
-      <word_default>Reported content</word_default>
-      <word_custom>Жалоба на публикацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__new_topic</word_key>
-      <word_default>New topics</word_default>
-      <word_custom>�ова� тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__short__reputation_received</word_key>
-      <word_default>Received reputation points</word_default>
-      <word_custom>Изменена репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__file_approved</word_key>
-      <word_default>Notification method to use when a file I submitted is approved</word_default>
-      <word_custom>Спо�об уведомлени� при публикации отправленного мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__friend_request_approve</word_key>
-      <word_default>Notify me when someone approves a friend request I make</word_default>
-      <word_custom>Спо�об уведомлени� при подтверждении моего запро�а на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_filecomment</word_key>
-      <word_default>Notification method to use when a file I like receives a new comment</word_default>
-      <word_custom>Спо�об уведомлени� о новых комментари�х дл� файлов, которые мне нрав�т��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__updated_file</word_key>
-      <word_default>Notification method to use when a file I like is updated</word_default>
-      <word_custom>Спо�об уведомлени� об обновлении файла, который мне нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_file</word_key>
-      <word_default>Notification method to use when a file I am watching is updated</word_default>
-      <word_custom>Спо�об уведомлени� при обновлении от�леживаемого мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__item_shipped</word_key>
-      <word_default><![CDATA[Notify me when an item I've purchased has been shipped]]></word_default>
-      <word_custom>Спо�об уведомлени� мен� при отгрузке покупки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__commission_earned</word_key>
-      <word_default>Notify me when I earn commission</word_default>
-      <word_custom>Спо�об уведомлени� при получении комми��ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__staff_support_new</word_key>
-      <word_default>Notify me when a customer creates a new support request</word_default>
-      <word_custom>Спо�об уведомлени� при �оздании пользователем новго вопро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__staff_support_reply</word_key>
-      <word_default>Notify me when a customer replies to a new support request</word_default>
-      <word_custom>Спо�об уведомлени� при ответе пользователем в вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__support_reply</word_key>
-      <word_default>Notify me when a staff member replies to my support request</word_default>
-      <word_custom>Спо�об уведомлени� при ответе в мой вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__payment_failed</word_key>
-      <word_default>Notify me if my payment fails</word_default>
-      <word_custom>Спо�об уведомлени� при неудачном платеже</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__invoice_expired</word_key>
-      <word_default>Notify me when an invoice expires</word_default>
-      <word_custom>Спо�об уведомлени� при и�течении �рока �чета</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__payment_received</word_key>
-      <word_default>Notify me when my payment is received</word_default>
-      <word_custom>Спо�об уведомлени� при прохождении платежа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__ccs_notifications</word_key>
-      <word_default>Notification method to use for article subscriptions</word_default>
-      <word_custom>Спо�об уведомлени� дл� подпи�ки на �татьи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_invoice</word_key>
-      <word_default>Notify me when an invoice is generated</word_default>
-      <word_custom>Спо�об уведомлени� при вы�тавлении �чета</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__reply_any_status</word_key>
-      <word_default>Notify me of replies to status updates I have replied to</word_default>
-      <word_custom>Уведомл�ть мен� о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__reply_your_status</word_key>
-      <word_default>Notify me of replies to my status updates</word_default>
-      <word_custom>Спо�об уведомлени� при комментировании обновлени� моего �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__friend_status_update</word_key>
-      <word_default>Notify me when one of my friends updates their status</word_default>
-      <word_custom>Спо�об уведомлени� при обновлении �тату�а у друга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__invite_private_message</word_key>
-      <word_default>Notify me when I am invited to a personal conversation</word_default>
-      <word_custom>Спо�об уведомлени� при приглашении мен� в личную бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_private_message</word_key>
-      <word_default>Notify me when I receive a new personal conversation</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении мен� в личную бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__reply_private_message</word_key>
-      <word_default>Notify me of replies to my personal conversations</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении нового �ообщени� в личной бе�еде</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__friend_request</word_key>
-      <word_default>Notify me when someone adds me as a friend</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении мен� в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__friend_request_pending</word_key>
-      <word_default>Notify me when I have a pending friend request</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении у мен� ожидающего запро�а на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__profile_comment</word_key>
-      <word_default>Notify me of comments made on my profile</word_default>
-      <word_custom>Спо�об уведомлени� при комментировании моего профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__profile_comment_pending</word_key>
-      <word_default>Notify me of comments made on my profile pending approval</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении комментарием моего профил�, ожидающих подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__post_quoted</word_key>
-      <word_default>Notify me when someone quotes my posts</word_default>
-      <word_custom>Спо�об уведомлени� при цитировании моих �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_topic_queue</word_key>
-      <word_default>Notification method to use when a topic is pending approval</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении темы, ожидающей модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_reply</word_key>
-      <word_default>Notification method to use for topic replies and reply digests</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении ответов в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_topic</word_key>
-      <word_default>Notification method to use for new topics and topic digests</word_default>
-      <word_custom>Спо�об уведомлени� при �оздании новой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__report_center</word_key>
-      <word_default>Notify me of reported content</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notification_options</word_key>
-      <word_default>Notification Options</word_default>
-      <word_custom>�а�тройки уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__new_comment</word_key>
-      <word_default>Notify me of new comments</word_default>
-      <word_custom>Уведомл�ть о новых комментари�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify__reputation_received</word_key>
-      <word_default>Notify me when I receive reputation points</word_default>
-      <word_custom>Спо�об уведомлени� при изменении моего рейтинга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifications_info_acp</word_key>
-      <word_default>Not all notification methods may be available for all notification events.</word_default>
-      <word_custom>�екоторые методы уведомлений могут быть недо�тупны дл� �обытий в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>admin_no_notify_config</word_key>
-      <word_default>The administrator does not allow you to override this configuration</word_default>
-      <word_custom>�дмини�тратор запретил измен�ть �тот параметр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notopt__email</word_key>
-      <word_default>Email</word_default>
-      <word_custom>Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notopt__pm</word_key>
-      <word_default>Personal Conversation</word_default>
-      <word_custom>Лична� перепи�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notopt__inline</word_key>
-      <word_default>Inline Notifications</word_default>
-      <word_custom>Внутри�и�темные уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notopt__mobile</word_key>
-      <word_default>Mobile</word_default>
-      <word_custom>Мобильный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>th_sent</word_key>
-      <word_default>Sent</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>th_notification</word_key>
-      <word_default>Notification</word_default>
-      <word_custom>Уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifications_table_head</word_key>
-      <word_default>Inline notifications for this user</word_default>
-      <word_custom>Внутри�и�темные уведомлени� дл� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>arch_notifications_head</word_key>
-      <word_default>Saved Notifications</word_default>
-      <word_custom>Полученные уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_notifications</word_key>
-      <word_default>Notification Options</word_default>
-      <word_custom>�а�тройки уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifications_none</word_key>
-      <word_default>You have no saved notifications</word_default>
-      <word_custom>У ва� нет уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ndel_selected</word_key>
-      <word_default>Delete Selected</word_default>
-      <word_custom>Удалить отмеченное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_arch_notify</word_key>
-      <word_default>Your Notifications</word_default>
-      <word_custom>Уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notifyview_date</word_key>
-      <word_default>Sent:</word_default>
-      <word_custom>Отправлено: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>notify_rem_suc</word_key>
-      <word_default>Notifications successfully removed</word_default>
-      <word_custom>Уведомлени� удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>no_notify_del</word_key>
-      <word_default>You did not select any notifications to delete</word_default>
-      <word_custom>Вы не выбрали уведомлени� дл� удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_notify_yes</word_key>
-      <word_default>You have selected to receive notifications</word_default>
-      <word_custom>Вы хотите быть уведомлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_is_anon</word_key>
-      <word_default>You are liking this content anonymously</word_default>
-      <word_custom>Вам нравит�� �то, но вы предпочли не афишировать �то</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>likes_none</word_key>
-      <word_default>You have not liked any content yet</word_default>
-      <word_custom>�ичего нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>th_like_notification</word_key>
-      <word_default>Notifications</word_default>
-      <word_custom>Уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>th_like_anon</word_key>
-      <word_default>Anonymous</word_default>
-      <word_custom>�нонимно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>th_like_title</word_key>
-      <word_default>Content</word_default>
-      <word_custom>Контент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>likes_table_head</word_key>
-      <word_default>Listing of liked content for this user</word_default>
-      <word_custom>Пользователю нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>arch_likes_head</word_key>
-      <word_default>Liked Content</word_default>
-      <word_custom>�равит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>likes_rem_suc</word_key>
-      <word_default>Liked content successfully updated</word_default>
-      <word_custom>У�пешно обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>no_likes_del</word_key>
-      <word_default>You did not select any liked content to stop liking</word_default>
-      <word_custom>Вы ничего не выбрали</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_options_desc</word_key>
-      <word_default>If you have Facebook syncronized, you may not wish to check all the options as they can overwrite each other</word_default>
-      <word_custom>Е�ли у ва� уже на�троена �инхронизаци� � Facebook, изменение данных параметров могут перекрыть уже на�троенные параметры Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_disassociate_now</word_key>
-      <word_default>Disassociate Account Now</word_default>
-      <word_custom>Убрать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_disassociate_desc</word_key>
-      <word_default>This will log you out and remove the account link from Twitter</word_default>
-      <word_custom>Позвол�ет вам убрать �в�зь � Twitter-аккаунтом дл� данной учетной запи�и форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_now</word_key>
-      <word_default>Synchronize Now</word_default>
-      <word_custom>Обновить �ейча�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_disassociate</word_key>
-      <word_default>Disassociate Twitter</word_default>
-      <word_custom>Убрать �в�зь � Twitter-аккаунтом</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_never</word_key>
-      <word_default>Never</word_default>
-      <word_custom>никогда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_last_syncd</word_key>
-      <word_default>This information is updated once every 3 hours.  Last synchronized:</word_default>
-      <word_custom>Эта информаци� обновл�ет�� каждые 3 ча�а. По�ледний раз: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_aboutme</word_key>
-      <word_default><![CDATA[Update my <strong>&quot;About Me&quot;</strong> with my Twitter &quot;About Me&quot;]]></word_default>
-      <word_custom><![CDATA[Обновл�ть <strong>&quot;Обо мне&quot;</strong> данными из моего Twitter-аккаунта]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_bgimg</word_key>
-      <word_default><![CDATA[Update my <strong>Profile Background</strong> with my Twitter background]]></word_default>
-      <word_custom><![CDATA[Обновл�ть мое <strong>фоновое изображение</strong> профил� фоном из моего Twitter-аккаунта]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_status_out</word_key>
-      <word_default><![CDATA[Update my <strong>Twitter Status</strong> with my Forum status (Export your status)]]></word_default>
-      <word_custom><![CDATA[Обновл�ть мой <strong>Twitter-�тату�</strong> �тату�ом из моего профил� на форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_status_in</word_key>
-      <word_default><![CDATA[Update my <strong>Forum Status</strong> with my Twitter status (Import a status)]]></word_default>
-      <word_custom><![CDATA[Обновл�ть мой <strong>�тату�</strong> �тату�ом из моего Twitter-аккаунта]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_avatar</word_key>
-      <word_default><![CDATA[Update my <strong>Avatar</strong> with my Twitter picture]]></word_default>
-      <word_custom><![CDATA[Обновл�ть мой <strong>аватар</strong> картинкой из моего Twitter-аккаунта]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_photo</word_key>
-      <word_default><![CDATA[Update my <strong>Profile Picture</strong> with my Twitter picture]]></word_default>
-      <word_custom><![CDATA[Обновл�ть мою <strong>фотографию</strong> картинкой из моего Twitter-аккаунта]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_sync_options</word_key>
-      <word_default>Twitter to Forum Account Synchronization Options</word_default>
-      <word_custom>Параметры �инхронизации учетной запи�и форума и аккаунта Twitter</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_logged_in_as</word_key>
-      <word_default>You are logged into Twitter as</word_default>
-      <word_custom>Вы вошли в Twitter под </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>tc_config</word_key>
-      <word_default>You will need to connect with Twitter before you can configure your options.</word_default>
-      <word_custom>Вам необходимо �в�зать запи�ь � Twitter-аккаунтом прежде чем вы �можете что-то на�троить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_read_stream_desc</word_key>
-      <word_default>This is required so the board can read your latest status updates and wall posts for use when synchronizing statuses.</word_default>
-      <word_custom>Это необходимо чтобы �и�тема могла получать ваши �тату�ы и �ообщени� на вашей �тене.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_publish_stream_desc</word_key>
-      <word_default><![CDATA[This is required so the board can publish status updates and enable links to be shared on your wall <strong>with your permission</strong>.]]></word_default>
-      <word_custom><![CDATA[Это необходимо чтобы �и�тема могла измен�ть ваш �тату� и публиковать ��ылки на вашей �тене <strong>� вашего разрешени�</strong>.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_email_access_desc</word_key>
-      <word_default>This is required so the board can send you topic notifications, etc.</word_default>
-      <word_custom>�еобходимо дл� того, чтобы �и�тема могла вы�ылать вам уведомлени� о темах и т.п.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_email_access</word_key>
-      <word_default>Email Access</word_default>
-      <word_custom>Email до�туп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_publish_stream</word_key>
-      <word_default>Publish Stream</word_default>
-      <word_custom>Поток публикаци</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_read_stream</word_key>
-      <word_default>Read Stream</word_default>
-      <word_custom>Поток чтени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_offline_access_desc</word_key>
-      <word_default><![CDATA[This is required so the board can synchronize your profiles and update your status <strong>with your permission</strong> even when you are not actively logged into Facebook.]]></word_default>
-      <word_custom><![CDATA[Это необходимо чтобы �и�тема могла �инхронизировать ваши профили и обновл�ит ваш �тату� <strong>� вашего разрешени�</strong> даже когда вы не зашли в Facebook.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_offline_access</word_key>
-      <word_default>Offline Access</word_default>
-      <word_custom>Offline до�туп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_remove_imgs</word_key>
-      <word_default>Remove background image</word_default>
-      <word_custom>Убрать фоновое изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_request</word_key>
-      <word_default>Request Permission</word_default>
-      <word_custom>Запро� разрешени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fbp_title</word_key>
-      <word_default>Facebook Connect Permission Check</word_default>
-      <word_custom>Проверка прав Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_remove_t</word_key>
-      <word_default>Remove All Customizations</word_default>
-      <word_custom>Убрать в�е пер�онализации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_remove</word_key>
-      <word_default>Remove Customizations</word_default>
-      <word_custom>Убрать пер�онализацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_view_profile</word_key>
-      <word_default><![CDATA[View your profile &rarr;]]></word_default>
-      <word_custom><![CDATA[Про�мотр профил� &rarr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_bgimg_ext_bad</word_key>
-      <word_default>You can only upload png, jpg, or gif images</word_default>
-      <word_custom>Разрешено загружать png, jpg, или gif</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_bgimg_url_bad</word_key>
-      <word_default>The URL must start with http:// and not contain the following characters: ( *</word_default>
-      <word_custom>URL начинать�� � http:// и не должен �одержать �имволы: ( *</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pp_no_bgimg_upload_permission</word_key>
-      <word_default>You do not have permission to upload a background image.</word_default>
-      <word_custom>Вам не разрешего загружать изображение дл� подложки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_tile_d</word_key>
-      <word_default>If checked, the image will be tiled (good for patterns). If unchecked, the image will be fixed and shown once (good for photos)</word_default>
-      <word_custom>При выборе, фон будет заполнен изображением (хорошо дл� изображений-паттернов). Е�ли опци� отключена, то изображение будет зафик�ировано на �транице и показано единожды (хорошо дл� фотографий) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_preview</word_key>
-      <word_default>Current Background</word_default>
-      <word_custom>Текущий фон</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_tile</word_key>
-      <word_default>Tile Image</word_default>
-      <word_custom>Заполнить изображением</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_color_d</word_key>
-      <word_default>Enter a hex value, EG ff0000</word_default>
-      <word_custom>Введите ше�тнадцатеричое значение, напр-р ff0000</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_color</word_key>
-      <word_default>Background Color</word_default>
-      <word_custom>Цвет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_image_upl_d</word_key>
-      <word_default><![CDATA[Browse your computer's files to upload a file. Maximum size in kB: %s]]></word_default>
-      <word_custom>Мак�имальный размер в КБ: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_image_upl</word_key>
-      <word_default>Choose a file to upload</word_default>
-      <word_custom>Выберите файл дл� загрузки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_image_img_d</word_key>
-      <word_default>The URL must start with http://. Only png, jpg and gifs are accepted</word_default>
-      <word_custom>С�ылка должна начинать�� � http://. В каче�тве изображений принимают�� только png, jpg и gif.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_image_img</word_key>
-      <word_default>Enter a URL to an image</word_default>
-      <word_custom>Введите ��ылку на изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg_image</word_key>
-      <word_default>Background Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_cust_bg</word_key>
-      <word_default>Profile Background</word_default>
-      <word_custom>Фон профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_customize_msg</word_key>
-      <word_default>This page allows you to customize your profile background. These customizations will be shown to all members visiting your profile page.</word_default>
-      <word_custom>�а данной �транице вы можете пер�онализировать �вой профиль, а именно изменить фон. Изменени� будут видны в�ем пользовател�м, про�матривающим ваш профиль.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_customize</word_key>
-      <word_default>Profile Customization</word_default>
-      <word_custom>Пер�онализаци� профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>show_notification_popup_desc</word_key>
-      <word_default>This option will cause a popup to be displayed when there is a new notification for you to review</word_default>
-      <word_custom>При включении данной опции, при каждом новом уведомлении будет выводит�� в�плывающее �ообщение, �игнализирующее о получении уведомлени� дл� ва�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>show_notification_popup</word_key>
-      <word_default>Show popup when I receive a new inline notification</word_default>
-      <word_custom>Показывать в�плывающее �ообщение при получении внутри�и�темного уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_status</word_key>
-      <word_default><![CDATA[Update my <strong>Facebook Status</strong> with my Forum status (Export your status)]]></word_default>
-      <word_custom><![CDATA[Обновить <strong>�тату� в Facebook</strong> на �тату� на форуме.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>fb_sync_status_in</word_key>
-      <word_default><![CDATA[Update my <strong>Forum Status</strong> with my Facebook status (Import a status)]]></word_default>
-      <word_custom><![CDATA[Обновить <strong>�тату� на форуме</strong> на ваш �тату� в Facebook.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>twitter_revoke</word_key>
-      <word_default><![CDATA[Please visit your <a href='http://twitter.com/account/connections' target='_blank'>Twitter Connections page</a> to revoke access <strong>before</strong> clicking the button below]]></word_default>
-      <word_custom><![CDATA[Пожалуй�та зайдите на <a href='http://twitter.com/account/connections' target='_blank'>�траницу Twitter Connections</a> дл� отключени� до�тупа форуму <strong>прежде</strong> чем нажать на кнопку ниже]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>facebook_av_warning</word_key>
-      <word_default>If you have your Twitter Connect preferences set to import an avatar, it may overwite this preference</word_default>
-      <word_custom>Е�ли вы у�тановили импорт аватара из Twitter, данна� на�тройка изменит �то</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>twitter_av_warning</word_key>
-      <word_default>If you have your Facebook Connect preferences set to import an avatar, it may overwite this preference</word_default>
-      <word_custom>Е�ли у ва� уже на�троена �инхронизаци� аватара � Facebook, изменение данной опции перекроет �ту на�тройку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>pf__unlimited</word_key>
-      <word_default>Unlimited</word_default>
-      <word_custom>�е ограничено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>view_notification_logcontent</word_key>
-      <word_default>View content</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>view_notification_logentry</word_key>
-      <word_default>View notification</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>remote_no_password_2</word_key>
-      <word_default>please click here to set a password</word_default>
-      <word_custom>нажмите зде�ь дл� у�тановки парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>remote_no_password_1</word_key>
-      <word_default>If you would like to set a local password for this forum so you can use the mobile skin or log in directly</word_default>
-      <word_custom>Вы можете у�тановить локальный пароль, чтобы заходить на форум или мобильную вер�ию напр�мую.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>remote_no_password</word_key>
-      <word_default>Set a local password</word_default>
-      <word_custom>У�тановить локальный пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>remote_pass_set</word_key>
-      <word_default>You can set a local password here. This will allow you to log in directly to the forums and browse the site from your mobile device. This is optional and will not change how you currently log in</word_default>
-      <word_custom>Вы можете у�тановить локальный пароль, чтобы заходить на форум или мобильную вер�ию напр�мую. У�тановка парол� опциональна и не вли�ет на �уще�твующий проце�� авторизации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>enter_pass_remote2</word_key>
-      <word_default>Confirm your local password</word_default>
-      <word_custom>Подтвердите локальный пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ignore_del_areusure</word_key>
+      <word_default>Are you sure you want to remove this user?</word_default>
+      <word_custom>Вы уверены, что хотите удалить �того пользовател�?</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20363,9 +16981,13 @@ Report:
       <word_key>enter_pass_remote1</word_key>
       <word_default>Enter a local password</word_default>
       <word_custom>Введите локальный пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>enter_pass_remote2</word_key>
+      <word_default>Confirm your local password</word_default>
+      <word_custom>Подтвердите локальный пароль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20373,9 +16995,6 @@ Report:
       <word_key>goback</word_key>
       <word_default>Go Back</word_default>
       <word_custom>Вернуть��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20383,9 +17002,6 @@ Report:
       <word_key>notificationlog_mar</word_key>
       <word_default>Mark All Read</word_default>
       <word_custom>Отметить в�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20393,289 +17009,2575 @@ Report:
       <word_key>deletenotification</word_key>
       <word_default>Delete</word_default>
       <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>m_likesystem</word_key>
-      <word_default>Content You Like</word_default>
-      <word_custom>Вам нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>no_likes_for_del</word_key>
-      <word_default>You did not select any liked content to moderate</word_default>
-      <word_custom>Вы ничего не выбрали</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>update_selected</word_key>
-      <word_default>Update Selected</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_noanon</word_key>
-      <word_default>Change like preference to visible</word_default>
-      <word_custom>Убрать анонимно�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_anon</word_key>
-      <word_default>Change like preference to anonymous</word_default>
-      <word_custom>Изменить на анонимное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_offline</word_key>
-      <word_default>Change notifications to offline</word_default>
-      <word_custom>Изменить уведомлени� на оффлайновые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_immediate</word_key>
-      <word_default>Change notifications to immediate</word_default>
-      <word_custom>Изменить уведомление на мгновенное </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_nonotify</word_key>
-      <word_default>Stop notifying me of updates</word_default>
-      <word_custom>�е уведомл�ть мен�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__change_donotify</word_key>
-      <word_default>Notify me of updates</word_default>
-      <word_custom>Уведомл�ть мен� об обновлени�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__delete</word_key>
-      <word_default>Stop liking</word_default>
-      <word_custom>�е нравит��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_mod__chose</word_key>
-      <word_default>Choose Action</word_default>
-      <word_custom>Выберите дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>like_notify_freq_weekly</word_key>
       <word_default>Weekly Digest</word_default>
-      <word_custom>Еженедельно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>like_notify_freq_daily</word_key>
-      <word_default>Daily Digest</word_default>
-      <word_custom>Ежедневно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Еженедельный дайдже�т</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>like_notify_freq_offline</word_key>
       <word_default>Offline</word_default>
-      <word_custom>Оффлайн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Офлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>like_notify_freq_daily</word_key>
+      <word_default>Daily Digest</word_default>
+      <word_custom>Ежедневный дайдже�т</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>like_notify_freq_immediate</word_key>
       <word_default>Immediate</word_default>
-      <word_custom>Мгновенно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>�емедленно</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>view_liked_content</word_key>
-      <word_default>View this content you like</word_default>
+      <word_key>like_notify_freq_none</word_key>
+      <word_default>None</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>remote_pass_set</word_key>
+      <word_default>You can set a local password here. This will allow you to log in directly to the forums and browse the site from your mobile device. This is optional and will not change how you currently log in</word_default>
+      <word_custom>Вы можете у�тановить локальный пароль, чтобы заходить на форум или мобильную вер�ию напр�мую. У�тановка парол� опциональна и не вли�ет на �уще�твующий проце�� авторизации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_customize_msg</word_key>
+      <word_default>This page allows you to customize your profile background. These customizations will be shown to all members visiting your profile page.</word_default>
+      <word_custom>�а данной �транице вы можете пер�онализировать �вой профиль, а именно изменить фон. Изменени� будут видны в�ем пользовател�м, про�матривающим ваш профиль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>remote_no_password_1</word_key>
+      <word_default>If you would like to set a local password for this forum so you can use the mobile skin or log in directly</word_default>
+      <word_custom>Вы можете у�тановить локальный пароль, чтобы заходить на форум или мобильную вер�ию напр�мую.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>remote_no_password</word_key>
+      <word_default>Set a local password</word_default>
+      <word_custom>У�тановить локальный пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>show_notification_popup_desc</word_key>
+      <word_default>This option will cause a popup to be displayed when there is a new notification for you to review</word_default>
+      <word_custom>При включении данной опции, при каждом новом уведомлении будет выводит�� в�плывающее �ообщение, �игнализирующее о получении уведомлени� дл� ва�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_customize</word_key>
+      <word_default>Profile Customization</word_default>
+      <word_custom>Пер�онализаци� профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>show_notification_popup</word_key>
+      <word_default>Show inline pop-up when I have new personal messages (latest will be shown)</word_default>
+      <word_custom>Показывать в�плывающее �ообщение при получении внутри�и�темного уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_status</word_key>
+      <word_default><![CDATA[Update my <strong>Facebook Status</strong> with my Forum status (Export your status)]]></word_default>
+      <word_custom><![CDATA[Обновить <strong>�тату� в Facebook</strong> на �тату� на форуме.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_status_in</word_key>
+      <word_default><![CDATA[Update my <strong>Forum Status</strong> with my Facebook status (Import a status)]]></word_default>
+      <word_custom><![CDATA[Обновить <strong>�тату� на форуме</strong> на ваш �тату� в Facebook.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>twitter_revoke</word_key>
+      <word_default><![CDATA[Please visit your <a href='http://twitter.com/account/connections' target='_blank'>Twitter Connections page</a> to revoke access <strong>before</strong> clicking the button below]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та зайдите на <a href='http://twitter.com/account/connections' target='_blank'>�траницу Twitter Connections</a> дл� отключени� до�тупа форуму <strong>прежде</strong> чем нажать на кнопку ниже]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pf__unlimited</word_key>
+      <word_default>Unlimited</word_default>
+      <word_custom>�е ограничено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>view_notification_logcontent</word_key>
+      <word_default>View content</word_default>
       <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>th_like_on</word_key>
-      <word_default>Liked On</word_default>
-      <word_custom>Понравило�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>view_notification_logentry</word_key>
+      <word_default>View notification</word_default>
+      <word_custom>Про�мотр</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>like_parent_from</word_key>
-      <word_default>from</word_default>
-      <word_custom>из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>remote_no_password_2</word_key>
+      <word_default>please click here to set a password</word_default>
+      <word_custom>нажмите зде�ь дл� у�тановки парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_title</word_key>
+      <word_default>Choose Background</word_default>
+      <word_custom>Выберите фон</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg</word_key>
+      <word_default>Profile Background</word_default>
+      <word_custom>Фон профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_image_img_d</word_key>
+      <word_default>The URL must start with http://. Only png, jpg and gifs are accepted</word_default>
+      <word_custom>С�ылка должна начинать�� � http://. В каче�тве изображений принимают�� только png, jpg и gif.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_image_img</word_key>
+      <word_default>Enter a URL to an image</word_default>
+      <word_custom>Введите ��ылку на изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_image</word_key>
+      <word_default>Image URL</word_default>
+      <word_custom>Изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_image_upl_d</word_key>
+      <word_default><![CDATA[Browse your computer's files to upload a file. Maximum size in KB: %s]]></word_default>
+      <word_custom>Мак�имальный размер в КБ: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_color</word_key>
+      <word_default>Background color</word_default>
+      <word_custom>Цвет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_color_d</word_key>
+      <word_default>Enter a hex value, e.g. ff0000</word_default>
+      <word_custom>Введите ше�тнадцатеричое значение, напр-р ff0000</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_image_upl</word_key>
+      <word_default>Upload a file</word_default>
+      <word_custom>Выберите файл дл� загрузки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_tile_d</word_key>
+      <word_default>If checked, the image will be tiled (good for patterns). If unchecked, the image will be fixed and shown once (good for photos)</word_default>
+      <word_custom>При выборе, фон будет заполнен изображением (хорошо дл� изображений-паттернов). Е�ли опци� отключена, то изображение будет зафик�ировано на �транице и показано единожды (хорошо дл� фотографий) </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_preview</word_key>
+      <word_default>Current Background</word_default>
+      <word_custom>Текущий фон</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_bg_tile</word_key>
+      <word_default>Tile the image (good for patterns, bad for photos)</word_default>
+      <word_custom>Заполнить изображением</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_no_bgimg_upload_permission</word_key>
+      <word_default>You do not have permission to upload a background image.</word_default>
+      <word_custom>Вам не разрешего загружать изображение дл� подложки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_bgimg_ext_bad</word_key>
+      <word_default>You can only upload png, jpg, or gif images</word_default>
+      <word_custom>Разрешено загружать png, jpg, или gif</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_remove_t</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Убрать в�е пер�онализации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_view_profile</word_key>
+      <word_default><![CDATA[View your profile &rarr;]]></word_default>
+      <word_custom><![CDATA[Про�мотр профил� &rarr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_bgimg_url_bad</word_key>
+      <word_default>The URL must start with http:// and not contain the following characters: ( *</word_default>
+      <word_custom>URL начинать�� � http:// и не должен �одержать �имволы: ( *</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_email_access</word_key>
+      <word_default>Email Access</word_default>
+      <word_custom>Email до�туп</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_offline_access</word_key>
+      <word_default>Offline Access</word_default>
+      <word_custom>Offline до�туп</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_title</word_key>
+      <word_default>Facebook Connect Permission Check</word_default>
+      <word_custom>Проверка прав Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_request</word_key>
+      <word_default>Request Permission</word_default>
+      <word_custom>Запро� разрешени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_remove_imgs</word_key>
+      <word_default>Remove background image</word_default>
+      <word_custom>Убрать фоновое изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_cust_remove</word_key>
+      <word_default>Remove my customizations</word_default>
+      <word_custom>Убрать пер�онализацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_options_desc</word_key>
+      <word_default>If you have Facebook synchronized, you may not wish to check all the options as they can overwrite each other</word_default>
+      <word_custom>Е�ли у ва� уже на�троена �инхронизаци� � Facebook, изменение данных параметров могут перекрыть уже на�троенные параметры Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_disassociate_now</word_key>
+      <word_default>Disassociate Account Now</word_default>
+      <word_custom>Убрать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_disassociate_desc</word_key>
+      <word_default>This will log you out and remove the account link from Twitter</word_default>
+      <word_custom>Позвол�ет вам убрать �в�зь � Twitter-аккаунтом дл� данной учетной запи�и форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_disassociate</word_key>
+      <word_default>Disassociate Twitter</word_default>
+      <word_custom>Убрать �в�зь � Twitter-аккаунтом</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_now</word_key>
+      <word_default>Synchronize Now</word_default>
+      <word_custom>Обновить �ейча�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_never</word_key>
+      <word_default>Never</word_default>
+      <word_custom>никогда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_last_syncd</word_key>
+      <word_default>This information is updated once every 3 hours.  Last synchronized:</word_default>
+      <word_custom>Эта информаци� обновл�ет�� каждые 3 ча�а. По�ледний раз: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_aboutme</word_key>
+      <word_default><![CDATA[Update my <strong>&quot;About Me&quot;</strong> with my Twitter &quot;About Me&quot;]]></word_default>
+      <word_custom><![CDATA[Обновл�ть <strong>&quot;Обо мне&quot;</strong> данными из моего Twitter-аккаунта]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_bgimg</word_key>
+      <word_default><![CDATA[Update my <strong>Profile Background</strong> with my Twitter background]]></word_default>
+      <word_custom><![CDATA[Обновл�ть мое <strong>фоновое изображение</strong> профил� фоном из моего Twitter-аккаунта]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_status_out</word_key>
+      <word_default><![CDATA[Update my <strong>Twitter Status</strong> with my Forum status (Export your status)]]></word_default>
+      <word_custom><![CDATA[Обновл�ть мой <strong>Twitter-�тату�</strong> �тату�ом из моего профил� на форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_status_in</word_key>
+      <word_default><![CDATA[Update my <strong>Forum Status</strong> with my Twitter status (Import a status)]]></word_default>
+      <word_custom><![CDATA[Обновл�ть мой <strong>�тату�</strong> �тату�ом из моего Twitter-аккаунта]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_photo_info</word_key>
+      <word_default>This allows you to use your Twitter picture as your profile photo when you edit your photo</word_default>
+      <word_custom>Это разрешает вам и�пользовать ваше изображение в Twitter как вашу фотографию в профиле.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_photo</word_key>
+      <word_default><![CDATA[Retrieve my <strong>Twitter Picture</strong> to use as my profile photo]]></word_default>
+      <word_custom><![CDATA[Обновл�ть мою <strong>фотографию</strong> картинкой из моего Twitter-аккаунта]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_sync_options</word_key>
+      <word_default>Twitter to Forum Account Synchronization Options</word_default>
+      <word_custom>Параметры �инхронизации учетной запи�и форума и аккаунта Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_logged_in_as</word_key>
+      <word_default>You are logged into Twitter as</word_default>
+      <word_custom>Вы вошли в Twitter под </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tc_config</word_key>
+      <word_default>You will need to connect with Twitter before you can configure your options.</word_default>
+      <word_custom>Вам необходимо �в�зать запи�ь � Twitter-аккаунтом прежде чем вы �можете что-то на�троить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_read_stream_desc</word_key>
+      <word_default>This is required so the community can read your latest status updates and wall posts for use when synchronizing statuses.</word_default>
+      <word_custom>Это необходимо чтобы �и�тема могла получать ваши �тату�ы и �ообщени� на вашей �тене.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_publish_stream_desc</word_key>
+      <word_default><![CDATA[This is required so the community can publish status updates and enable links to be shared on your wall <strong>with your permission</strong>.]]></word_default>
+      <word_custom><![CDATA[Это необходимо чтобы �и�тема могла измен�ть ваш �тату� и публиковать ��ылки на вашей �тене <strong>� вашего разрешени�</strong>.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_email_access_desc</word_key>
+      <word_default>This is required so the community can send you topic notifications, etc.</word_default>
+      <word_custom>�еобходимо дл� того, чтобы �и�тема могла вы�ылать вам уведомлени� о темах и т.п.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_read_stream</word_key>
+      <word_default>Read Stream</word_default>
+      <word_custom>Поток чтени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_offline_access_desc</word_key>
+      <word_default><![CDATA[This is required so the community can synchronize your profiles and update your status <strong>with your permission</strong> even when you are not actively logged into Facebook.]]></word_default>
+      <word_custom><![CDATA[Это необходимо чтобы �и�тема могла �инхронизировать ваши профили и обновл�ит ваш �тату� <strong>� вашего разрешени�</strong> даже когда вы не зашли в Facebook.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify_rem_suc</word_key>
+      <word_default>Notifications successfully removed</word_default>
+      <word_custom>Уведомлени� удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fbp_publish_stream</word_key>
+      <word_default>Publish Stream</word_default>
+      <word_custom>Поток публикаций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>no_notify_del</word_key>
+      <word_default>You did not select any notifications to delete</word_default>
+      <word_custom>Вы не выбрали уведомлени� дл� удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>th_notification</word_key>
+      <word_default>Notification</word_default>
+      <word_custom>Уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>th_sent</word_key>
+      <word_default>Sent</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notopt__email</word_key>
+      <word_default>Email</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notopt__pm</word_key>
+      <word_default>Personal Conversation</word_default>
+      <word_custom>Лична� перепи�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notopt__inline</word_key>
+      <word_default>Inline Notifications</word_default>
+      <word_custom>Внутри�и�темные уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>admin_no_notify_config</word_key>
+      <word_default>The administrator does not allow you to override this configuration</word_default>
+      <word_custom>�дмини�тратор запретил измен�ть �тот параметр</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notopt__mobile</word_key>
+      <word_default>Mobile</word_default>
+      <word_custom>Мобильный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifications_info_acp</word_key>
+      <word_default>Not all notification methods may be available for all notification events.</word_default>
+      <word_custom>�екоторые методы уведомлений могут быть недо�тупны дл� �обытий в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notification_options</word_key>
+      <word_default>Notification Options</word_default>
+      <word_custom>�а�тройки уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__new_likes</word_key>
+      <word_default><![CDATA[Notify me when someone 'likes' my posts]]></word_default>
+      <word_custom><![CDATA[Уведомл�ть мен�, когда кому-то 'нравит��' любое мое �ообщение]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__new_comment</word_key>
+      <word_default>Notify me of new comments</word_default>
+      <word_custom>Уведомл�ть о новых комментари�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__reputation_received</word_key>
+      <word_default>Notify me when I receive reputation points</word_default>
+      <word_custom>Спо�об уведомлени� при изменении моего рейтинга</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__report_center</word_key>
+      <word_default>Notify me of reported content</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении жалобы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__followed_topics</word_key>
+      <word_default>Notification method to use for replies to followed topics</word_default>
+      <word_custom>Метод уведомлени� дл� комментариев в темах, за которыми �ледите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__followed_forums</word_key>
+      <word_default>Notification method to use for topics in followed forums</word_default>
+      <word_custom>Метод уведомлени� дл� тем в форумах, за которыми �ледите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__followed_topics_digest</word_key>
+      <word_default>Notification method to use for followed topics daily/weekly digests</word_default>
+      <word_custom>Метод уведомлени� в дайдже�тах дл� тем, за которыми �ледите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__followed_forums_digest</word_key>
+      <word_default>Notification method to use for followed forums daily/weekly digests</word_default>
+      <word_custom>Метод уведомени� в дайдже�тах дл� форумов, за которыми �ледите</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifications_table_head</word_key>
+      <word_default>Inline notifications for this user</word_default>
+      <word_custom>Внутри�и�темные уведомлени� дл� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>arch_notifications_head</word_key>
+      <word_default>Saved Notifications</word_default>
+      <word_custom>Полученные уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ndel_selected</word_key>
+      <word_default>Delete Selected</word_default>
+      <word_custom>Удалить отмеченное</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifications_none</word_key>
+      <word_default>You have no saved notifications</word_default>
+      <word_custom>У ва� нет уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_arch_notify</word_key>
+      <word_default>Your Notifications</word_default>
+      <word_custom>Уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_notifications</word_key>
+      <word_default>Notification Options</word_default>
+      <word_custom>�а�тройки уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__post_quoted</word_key>
+      <word_default>Notify me when someone quotes my posts</word_default>
+      <word_custom>Спо�об уведомлени� при цитировании моих �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifyview_date</word_key>
+      <word_default>Sent:</word_default>
+      <word_custom>Отправлено: </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__new_topic_queue</word_key>
+      <word_default>Notification method to use when a topic is pending approval</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении темы, ожидающей модерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__friend_request</word_key>
+      <word_default>Notify me when someone adds me as a friend</word_default>
+      <word_custom>Спо�об уведомлени� при добавлении мен� в друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__profile_comment</word_key>
+      <word_default>Notify me of comments made on my profile</word_default>
+      <word_custom>Спо�об уведомлени� при комментировании моего профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__profile_comment_pending</word_key>
+      <word_default>Notify me of comments made on my profile pending approval</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении комментарием моего профил�, ожидающих подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__friend_request_pending</word_key>
+      <word_default>Notify me when I have a pending friend request</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении у мен� ожидающего запро�а на дружбу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__invite_private_message</word_key>
+      <word_default>Notify me when I am invited to a personal conversation</word_default>
+      <word_custom>Спо�об уведомлени� при приглашении мен� в личную бе�еду</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__reply_private_message</word_key>
+      <word_default>Notify me of replies to my personal conversations</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении нового �ообщени� в личной бе�еде</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__new_private_message</word_key>
+      <word_default>Notify me when I receive a new personal conversation</word_default>
+      <word_custom>Спо�об уведомлени� при добавлении мен� в личную бе�еду</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__reply_your_status</word_key>
+      <word_default>Notify me of replies to my status updates</word_default>
+      <word_custom>Спо�об уведомлени� при комментировании обновлени� моего �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__friend_status_update</word_key>
+      <word_default>Notify me when one of my friends updates their status</word_default>
+      <word_custom>Спо�об уведомлени� при обновлении �тату�а у друга</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__reputation_received</word_key>
+      <word_default>Received reputation points</word_default>
+      <word_custom>Изменена репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__new_entry</word_key>
+      <word_default>Notify me of new entries on blogs I follow</word_default>
+      <word_custom>Уведомл�ть мен� обо в�ех новых запи��х в блогах, за которыми � �лежу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__friend_request_approve</word_key>
+      <word_default>Notify me when someone approves a friend request I make</word_default>
+      <word_custom>Спо�об уведомлени� при подтверждении моего запро�а на дружбу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__reply_any_status</word_key>
+      <word_default>Notify me of replies to status updates I have replied to</word_default>
+      <word_custom>Уведомл�ть мен� о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__report_center</word_key>
+      <word_default>Reported content</word_default>
+      <word_custom>Жалоба на публикацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__new_topic</word_key>
+      <word_default>New topics</word_default>
+      <word_custom>�ова� тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__new_reply</word_key>
+      <word_default>Topic Replies</word_default>
+      <word_custom>�овый ответ в теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__post_quoted</word_key>
+      <word_default>My posts being quoted</word_default>
+      <word_custom>Мое �ообщение процитировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__new_topic_queue</word_key>
+      <word_default>Topic pending approval</word_default>
+      <word_custom>�ова� тема, ожидающа� подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__profile_comment_pending</word_key>
+      <word_default>Pending comments</word_default>
+      <word_custom>�е подтвержденный комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__friend_request</word_key>
+      <word_default>Adds me as a friend</word_default>
+      <word_custom>Добавили в друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__profile_comment</word_key>
+      <word_default>Profile comments</word_default>
+      <word_custom>Комментарий в профиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__new_private_message</word_key>
+      <word_default>New conversation</word_default>
+      <word_custom>�ова� бе�еда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__invite_private_message</word_key>
+      <word_default>Invited to a conversation</word_default>
+      <word_custom>Приглашение в личную бе�еду</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__reply_private_message</word_key>
+      <word_default>Replies to conversations</word_default>
+      <word_custom>�овое �ообщение в личной бе�еде</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__friend_request_pending</word_key>
+      <word_default>Pending friend request</word_default>
+      <word_custom>�овый запро� на дружбу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__friend_request_approve</word_key>
+      <word_default>Friend request approved</word_default>
+      <word_custom>Подтверждение моего запро�а на дружбу</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__reply_any_status</word_key>
+      <word_default>Replies to statuses I have replied to</word_default>
+      <word_custom>Комментарий к �тату�у, который � тоже прокомментировал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__reply_your_status</word_key>
+      <word_default>Replies to my statuses</word_default>
+      <word_custom>Прокоментирован мой �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify__short__friend_status_update</word_key>
+      <word_default>Friends status updates</word_default>
+      <word_custom>Изменене �тату�а у друга</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifytitle_status_updates</word_key>
+      <word_default>Status Updates</word_default>
+      <word_custom>Обновлени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifytitle_topics_posts</word_key>
+      <word_default><![CDATA[Topics &amp; Posts]]></word_default>
+      <word_custom>Темы и �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifytitle_private_msgs</word_key>
+      <word_default>Private Messages</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifytitle_profiles_friends</word_key>
+      <word_default><![CDATA[Profiles &amp; Friends]]></word_default>
+      <word_custom>Профиль и друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notifytitle_other</word_key>
+      <word_default>Other Notifications</word_default>
+      <word_custom>Прочие уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify_type_email</word_key>
+      <word_default>Email</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify_type_mobile</word_key>
+      <word_default>Mobile App</word_default>
+      <word_custom>Мобильный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify_type_inline</word_key>
+      <word_default>Notification List</word_default>
+      <word_custom>Внутри�и�темное уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>notify_type_pm</word_key>
+      <word_default>Personal Conversation</word_default>
+      <word_custom>Личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>twitter_config</word_key>
+      <word_default>You will need to connect with Twitter before you can configure your options. </word_default>
+      <word_custom>�еобходимо иметь �в�занный Twitter-аккаунт прежде чем что-то на�траивать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_twitter</word_key>
+      <word_default>Manage Twitter</word_default>
+      <word_custom>Cоединение � Twitter</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_status_notify_mine</word_key>
+      <word_default>Notify me by e-mail when I get a reply to my status updates</word_default>
+      <word_custom>Уведомл�ть мен� по email о комментари�х к обновлени�м моего �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_status_email</word_key>
+      <word_default>Status Update Settings</word_default>
+      <word_custom>�а�тройки обновлени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_status_notify_all</word_key>
+      <word_default>Notify me by e-mail when a reply is made to any status I have replied to</word_default>
+      <word_custom>Уведомл�ть мен� по email о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_title_search</word_key>
+      <word_default>Search Settings</word_default>
+      <word_custom>�а�тройка пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_vnc_type</word_key>
+      <word_default>View New Content Method</word_default>
+      <word_custom>Тип новых публикаций</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_vnc_type_0</word_key>
+      <word_default>Show me all new content since my last visit</word_default>
+      <word_custom>публикации � момента по�леднего по�ещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_forum_search_display</word_key>
+      <word_default>Forum Results Display</word_default>
+      <word_custom>Результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_vnc_type_1</word_key>
+      <word_default>Show me all content that I have not read</word_default>
+      <word_custom>публикации, которые � еще не читал</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_forum_search_display_1</word_key>
+      <word_default>Show results as a list</word_default>
+      <word_custom>Показать результаты в виде �пи�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_forum_search_display_0</word_key>
+      <word_default>Show results like a forum</word_default>
+      <word_custom>Показать результаты в виде форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>admin_val_no_email_chg</word_key>
+      <word_default>You cannot change your email address until the administrator validates your account.</word_default>
+      <word_custom>Вы не можете �менить email адре�, до тех пор пока админи�тратор не активирует вашу учетную запи�ь.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_upload_failed</word_key>
+      <word_default>The upload failed.  Please notify an administrator.</word_default>
+      <word_custom>Загрузка не удала�ь. Сообщите админи�тратору.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tab__forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_no_photo_upload_permission</word_key>
+      <word_default>You do not have permission to upload a personal photo.</word_default>
+      <word_custom>Вам не разрешено загружать фотографию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tab__core</word_key>
+      <word_default>Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_upload_to_big</word_key>
+      <word_default>The file you uploaded is too large.</word_default>
+      <word_custom>Файл, который вы пытаете�ь загрузить �лишком большой.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_invalid_file_extension</word_key>
+      <word_default>The file type you tried to upload is not allowed.</word_default>
+      <word_custom>Тип файла, который вы пытаете�ь загрузить, не разрешен дл� загрузки.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>tab__members</word_key>
+      <word_default>Profile</word_default>
+      <word_custom>Профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_cannot_find_member</word_key>
+      <word_default>Please reload the page and try again.  If you continue to experience problems, please contact an administrator.</word_default>
+      <word_custom>Перезагрузите �траничку и попробуйте еще раз. Е�ли не помогает - обратите�ь к админи�тратору. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>op_dd_none</word_key>
+      <word_default>No Notification</word_default>
+      <word_custom>�е уведомл�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>op_dd_pm</word_key>
+      <word_default>Notify Via Personal Message (PM)</word_default>
+      <word_custom>Уведомл�ть личным �ообщением (PM)</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>op_dd_enabled</word_key>
+      <word_default>Allow me to approve comments before they are displayed on my profile</word_default>
+      <word_custom>Включено — добавл�ть только когда � �то разрешил</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>op_dd_email</word_key>
+      <word_default>Notify Via Email</word_default>
+      <word_custom>Уведомл�ть по e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_group_restrict_date</word_key>
+      <word_default>You cannot change your display name until %s</word_default>
+      <word_custom>Вы не �можете изменить ваше им� пользовател� до %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_group_restrict_posts</word_key>
+      <word_default>You cannot change your display name until you have %s more approved posts</word_default>
+      <word_custom>Вы не �можете изменить ваше им� пользовател� пока у ва� не будет более %s утвержденных �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_group_restrict_posts</word_key>
+      <word_default>You cannot change your signature until you have %s more approved posts</word_default>
+      <word_custom>Вы не �можете изменить вашу подпи�ь пока у ва� не будет более %s утвержденных �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_group_restrict_date</word_key>
+      <word_default>You cannot change your signature until %s</word_default>
+      <word_custom>Вы не �можете изменить вашу подпи�ь до %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_email_not_allowed</word_key>
+      <word_default>Email Not Allowed</word_default>
+      <word_custom>Отправка e-mail пи�ем запрещена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_email_not_allowed_desc</word_key>
+      <word_default>You have not given this forum permission to send emails via your facebook account. You will need to click the link in the box above to allow this before you can configure any Facebook Connect options.</word_default>
+      <word_custom>У ва� недо�таточно прав дл� отправки e-mail пи�ьма через facebook профиль. Вам нужно нажать на ��ылку в вышеуказанном блоке дл� решени� �той проблемы. Прежде чем вы �можете на�траивать опции �оединени� � Facebook.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_connect_mismatch</word_key>
+      <word_default>Facebook Connect Mismatch</word_default>
+      <word_custom>�ет �оединени� � Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>member_title_desc</word_key>
+      <word_default>Your member title is shown beside posts you make</word_default>
+      <word_custom>Ваш �тату� отображает�� � вашими �ообщени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>profile_information</word_key>
+      <word_default>Profile Information</word_default>
+      <word_custom>Данные профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>member_title</word_key>
+      <word_default>Member Title</word_default>
+      <word_custom>Стату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>click_allow_email</word_key>
+      <word_default>Click here to allow email from this forum</word_default>
+      <word_custom>�ажмите зде�ь, чтобы получать пи�ьма � �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cannot_get_email</word_key>
+      <word_default>You cannot currently receive emails from this forum</word_default>
+      <word_custom>Вы не можете получать пи�ьма � �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cannot_get_email_2</word_key>
+      <word_default>Until you allow emails from this forum, you will not receive topic subscription notifications, new personal message notifications, etc.</word_default>
+      <word_custom>Пока вы не разрешите получать пи�ьма � �того форума, вы не �можете получать уведомлени� о �обыти�х в от�леживаемых темах, уведомлени� о новых личных �ообщени�х и т.п.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>h_hits</word_key>
+      <word_default>Views</word_default>
+      <word_custom>Про�мотров</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>h_topic_starter</word_key>
+      <word_default>Topic Starter</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>h_replies</word_key>
+      <word_default>Replies</word_default>
+      <word_custom>Ответов</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>h_last_action</word_key>
+      <word_default>Last Action</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>h_topic_title</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>�азвание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_connect_mismatch_desc</word_key>
+      <word_default><![CDATA[The <em>Facebook account</em> you are currently logged into is already linked to another forum account.<br />You will need to log out of <a href='http://www.facebook.com'>Facebook</a> before returning here if you want to configure these options.]]></word_default>
+      <word_custom><![CDATA[Данна� <em>учетна� запи�ь на Facebook</em> уже и�пользует�� другим пользователем форума.<br />Вам нужно выйти из <a href='http://www.facebook.com'>Facebook</a> прежде чем дальше на�траивать ваши опции.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_photo_info</word_key>
+      <word_default>This allows you to use your Facebook picture as your profile photo when you edit your photo</word_default>
+      <word_custom>Это разрешает вам и�пользовать ваше Facebook фото, как фото в профиле на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_photo</word_key>
+      <word_default><![CDATA[Retrieve my <strong>Facebook Picture</strong> to use as my profile photo]]></word_default>
+      <word_custom><![CDATA[И�пользовать в профиле <strong>фото</strong> из Facebook ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_options</word_key>
+      <word_default>Facebook to Forum Account Synchronization Options</word_default>
+      <word_custom>Опции �инхронизации учетной запи�и Facebook и �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_logged_in_as</word_key>
+      <word_default>You are logged into Facebook as</word_default>
+      <word_custom>Вы авторизованы на Facebook как</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_config</word_key>
+      <word_default>You will need to connect with Facebook before you can configure your options.</word_default>
+      <word_custom>Вам нужно войти через Facebook, прежде чем  на�траивать �ти опции.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_last_syncd</word_key>
+      <word_default>This information is updated once every 24 hours.  Last synchronized:</word_default>
+      <word_custom>Эта информаци� обновл�ет�� каждые 24 ча�а. По�леднее обновление:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_aboutme</word_key>
+      <word_default><![CDATA[Update my <strong>&quot;About Me&quot;</strong> with my Facebook &quot;About Me&quot;]]></word_default>
+      <word_custom><![CDATA[Обновить данные <strong>«Обо мне»</strong> на форуме и на Facebook.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_using_email</word_key>
+      <word_default>You are using a Facebook email address</word_default>
+      <word_custom>Вы и�пользуете Facebook e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate_info_1</word_key>
+      <word_default>If you disassociate your forum account, you will not be able to use the Forgotton Password feature to retrieve your forum account password.  It is recommended you</word_default>
+      <word_custom>Е�ли вы отключаете �в�зь Facebook � учетной запи�ью на форуме, вы не �можете и�пользовать функцию во��тановлени� парол� на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate_now</word_key>
+      <word_default>Disassociate Account Now</word_default>
+      <word_custom>Отв�зать учетную запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_never</word_key>
+      <word_default>Never</word_default>
+      <word_custom>�икогда</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_sync_now</word_key>
+      <word_default>Synchronize Now</word_default>
+      <word_custom>Синхронизировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate</word_key>
+      <word_default>Disassociate Facebook</word_default>
+      <word_custom>Отключить �в�зь � аккаунтом в Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate_desc</word_key>
+      <word_default>This will log you out, remove the account link from Facebook and will remove the Facebook Application.</word_default>
+      <word_custom>Выйти из учетной запи�и, удалить �оединение � Facebook и удалить приложение Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_restrictions_contain</word_key>
+      <word_default>Your signature may contain:</word_default>
+      <word_custom>Подпи�ь может �одержать:</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_restrictions</word_key>
+      <word_default>Signature Restrictions</word_default>
+      <word_custom>Ограничени� подпи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate_info_3</word_key>
+      <word_default>and choose an email address outside of Facebook if you wish to continue using this forum account after you have disassociated your forum account from Facebook. There is no undo.</word_default>
+      <word_custom>и выберите e-mail вне Facebook е�ли хотите продолжить и�пользовать �ту учетную запи�ь на форуме, но отв�зать ее от Facebook. Это дей�твие нельз� отменить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_imagesr_nl</word_key>
+      <word_default>Any number images</word_default>
+      <word_custom>Любое количе�тво изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_imgsize</word_key>
+      <word_default>Images up to %s x %s pixels</word_default>
+      <word_custom>Изображени� размером до %s х %s пик�елей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>fb_disassociate_info_2</word_key>
+      <word_default>change your email address</word_default>
+      <word_custom>изменение вашего e-mail адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_imagesr</word_key>
+      <word_default>Up to %s images</word_default>
+      <word_custom>До %s изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_lines</word_key>
+      <word_default>Up to %s lines</word_default>
+      <word_custom>До %s �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>topic_title</word_key>
+      <word_default>Topic title</word_default>
+      <word_custom>�азвание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_lines_nl</word_key>
+      <word_default>Any number of lines</word_default>
+      <word_custom>Любое количе�тво �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_urls_nl</word_key>
+      <word_default>Any number of URLs</word_default>
+      <word_custom>Любое количе�тво ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_urls</word_key>
+      <word_default>Up to %s URLs</word_default>
+      <word_custom>До %s ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_max_imgsize_nl</word_key>
+      <word_default>Images of any size</word_default>
+      <word_custom>Изображени� любого размера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_facebook</word_key>
+      <word_default>Manage Facebook</word_default>
+      <word_custom>Соединение � Facebook</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_toomanyimages</word_key>
+      <word_default>You may only use up to %s images in your signature.</word_default>
+      <word_custom>Подпи�ь может �одержать не более %s изображений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_toomanyurls</word_key>
+      <word_default>You may only use up to %s urls in your signature.</word_default>
+      <word_custom>Подпи�ь может �одержать не более %s ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_toomanylines</word_key>
+      <word_default>You may only use up to %s lines of text in your signature.</word_default>
+      <word_custom>Подпи�ь не должна быть больше %s �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>sig_imagetoobig</word_key>
+      <word_default><![CDATA[<a href='%s'>This image</a> is larger than the maximum allowed dimensions of %s x %s.]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>Это изображение</a> больше мак�имально допу�тимого размера %s х %s.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_view_org</word_key>
+      <word_default>View original topic</word_default>
+      <word_custom>По�мотреть оригинальную тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_full</word_key>
+      <word_default>full</word_default>
+      <word_custom> допу�тимого ме�та</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_user_attach</word_key>
+      <word_default>User Attachments</word_default>
+      <word_custom>Файлы пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_attach_allowance</word_key>
+      <word_default>Your attachment allowance is</word_default>
+      <word_custom>Зан�то </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>admin_emailpassword</word_key>
+      <word_default>Because you have administrator access on this community, you must utilize the admin control panel to change your email address or password.  This measure is taken for security purposes.  In the Admin CP, navigate to the System tab, and click on Change My Details.  You will be able to change your email address and password from this page.</word_default>
+      <word_custom>Вы имеете до�туп админи�тратора, по�тому дл� изменени� e-mail адре�а или парол� вам необходимо перейти в �Ц. Эта мера принимает�� в цел�х безопа�но�ти. В �Ц перейдите на вкладку Пользователи, нажмите Управление пользовател�ми, найдите вашу учетную запи�ь и нажмите на ваше им�. �а �той �транице вы �можете изменить �вой e-mail адре� и пароль.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>settings_for_coretab</word_key>
+      <word_default>General Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cancel_edit</word_key>
+      <word_default>Cancel edit</word_default>
+      <word_custom>Отмена</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>settings_for_ucp</word_key>
+      <word_default>Settings for %s</word_default>
+      <word_custom>�а�тройки дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_select_category</word_key>
+      <word_default>Select a Category</word_default>
+      <word_custom>Выберите категорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_gravatar_enter_email</word_key>
+      <word_default><![CDATA[enter your <a href='http://en.gravatar.com' title='Gravatar site'>Gravatar</a> e-mail address]]></word_default>
+      <word_custom><![CDATA[введите e-mail адре� вашего <a href='http://en.gravatar.com' title='Gravatar �айт'>Gravatar</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_reply_since</word_key>
+      <word_default>topic(s) have new replies since your last visit</word_default>
+      <word_custom>тем �одержат новые ответы � момента вашего по�леднего по�ещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_watched_forums</word_key>
+      <word_default>Watched Forums</word_default>
+      <word_custom>От�леживаемые форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_ignored_users</word_key>
+      <word_default>Ignore Preferences</word_default>
+      <word_custom>Игнорируемые пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_ignore_msgs</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Игнорировать личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_ignore_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Игнорировать �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_members_name</word_key>
+      <word_default><![CDATA[Member's Name]]></word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_ignore_pc</word_key>
+      <word_default>Messages</word_default>
+      <word_custom>Игнорировать личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_comments</word_key>
+      <word_default><![CDATA[Comments &amp; Visitors]]></word_default>
+      <word_custom>Комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_enable_comments</word_key>
+      <word_default>Allow members to leave comments on my profile</word_default>
+      <word_custom>Разрешить комментирование профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_comment_notify_type</word_key>
+      <word_default>Comment Notification Type</word_default>
+      <word_custom>Уведомл�ть о новых комментари�х?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_friends</word_key>
+      <word_default>Friends</word_default>
+      <word_custom>Друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_comment_approval</word_key>
+      <word_default>Comment Approval</word_default>
+      <word_custom>Модерировать новые комментарии?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_show_friends_profile</word_key>
+      <word_default>Show my friends in my profile</word_default>
+      <word_custom>Показывать друзей в профиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_friend_notify</word_key>
+      <word_default>Friend Notification Type</word_default>
+      <word_custom>Уведомл�ть о новых друзь�х?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_friend_approve</word_key>
+      <word_default><![CDATA[Allow me to approve members before they're added as a friend]]></word_default>
+      <word_custom>Модерировать запро�ы на дружбу?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_birthday_select</word_key>
+      <word_default>Your Birthday</word_default>
+      <word_custom>Введите дату рождени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_birthday_optional</word_key>
+      <word_default>Entering your birthday is optional</word_default>
+      <word_custom>Ввод дн� рождени� не �вл�ет�� об�зательным</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_required_info</word_key>
+      <word_default>Required Information</word_default>
+      <word_custom>Требуема� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_dst_effect</word_key>
+      <word_default>Is DST currently in effect?</word_default>
+      <word_custom>Перейти на летнее врем�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_other_info</word_key>
+      <word_default>Other Information</word_default>
+      <word_custom>Друга� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_remove_photo</word_key>
+      <word_default>Remove My Photo</word_default>
+      <word_custom>Удалить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_show_x_latest</word_key>
+      <word_default>Show last 5 visitors on my profile</word_default>
+      <word_custom>Показывать X по�ледних по�етителей профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_dst_now</word_key>
+      <word_default>My timezone is currently in DST</word_default>
+      <word_custom>Уже на летнем времени?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>securehash_not_secure</word_key>
+      <word_default>Your security key was not valid.</word_default>
+      <word_custom>�еверный ключ безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>called_invalid_function</word_key>
+      <word_default>The page you requested was not valid.</word_default>
+      <word_custom>Запрошенна� вами �траница не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pagetitle_bit</word_key>
+      <word_default>User CP</word_default>
+      <word_custom>Профиль пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>complete_entire_form</word_key>
+      <word_default>You must complete the entire form</word_default>
+      <word_custom>Вы должны заполнить в�ю форму</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>new_pw_too_long</word_key>
+      <word_default>Your new password is too long</word_default>
+      <word_custom>�овый пароль �лишком длинный</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pw_change_successful</word_key>
+      <word_default>Your password change was successful</word_default>
+      <word_custom>Пароль у�пешно изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>hanlogin_pw_failed</word_key>
+      <word_default>The password change failed</word_default>
+      <word_custom>�евозможно изменить пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>current_pw_bad</word_key>
+      <word_default>Your current password is incorrect</word_default>
+      <word_custom>�еверный текущий пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>passwords_not_matchy</word_key>
+      <word_default>The passwords do not match</word_default>
+      <word_custom>Пароли не �овпадают</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_noload</word_key>
+      <word_default>We could not load the member</word_default>
+      <word_custom>�евозможно загрузить пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_taken_change</word_key>
+      <word_default>That name is already in use, please choose another.</word_default>
+      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_tooshort</word_key>
+      <word_default>The name must be more than 3 characters and less than %s characters</word_default>
+      <word_custom>Им� должно быть больше 3 и меньше %s �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_noperm</word_key>
+      <word_default>That name is already in use, please choose another.</word_default>
+      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_taken</word_key>
+      <word_default>That name is already in use, please choose another.</word_default>
+      <word_custom>Это им� уже и�пользует�� другим пользователем, пожалуй�та выберите другое.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_illegal</word_key>
+      <word_default>The name contains illegal characters.</word_default>
+      <word_custom>Им� �одержит недопу�тимые �имволы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>name_change_no_more</word_key>
+      <word_default>You are not permitted to make any more changes to your display name</word_default>
+      <word_custom>Вы больше не можете изменить ваше им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>emails_no_matchy</word_key>
+      <word_default>The entered email addresses do not match.</word_default>
+      <word_custom>Введенные e-mail адре�а не �овпадают.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>email_not_valid</word_key>
+      <word_default>You must enter valid email addresses.</word_default>
+      <word_custom>Вы должны вве�ти верный e-mail адре�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>captcha_email_invalid</word_key>
+      <word_default>That CAPTCHA input did not match the CAPTCHA image.</word_default>
+      <word_custom>Введенна� �трока не �оответ�твует �троке на изображении.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>email_is_taken</word_key>
+      <word_default>That email address is already in use.</word_default>
+      <word_custom>Этот e-mail адре� уже и�пользует�� другим пользователем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>change_aboutme</word_key>
+      <word_default>About Me Page</word_default>
+      <word_custom>Информаци� о �ебе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>change_settings</word_key>
+      <word_default>Profile Settings</word_default>
+      <word_custom>Изменить данные профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cp_aboutme_desc</word_key>
+      <word_default><![CDATA[Your <em>About Me</em> page is a good place to provide a little additional information about yourself. This information is shown in your profile for other members to read.]]></word_default>
+      <word_custom><![CDATA[Страница � вашей информацией <em>Обо мне</em> - �то хорошее ме�то дл� размещени� дополнительной информации о �ебе. Она показывает�� в профиле, и другие пользователи могут читать �то.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ignoreuser_nomem</word_key>
+      <word_default>We could not find a member that matches that name</word_default>
+      <word_custom>�е удало�ь найти пользовател� � таким именем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>removeav_notexist</word_key>
+      <word_default>The member does not exist</word_default>
+      <word_custom>Пользователь не �уще�твует</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ignoreuser_noid</word_key>
+      <word_default>We could not find the member you were attempting to ignore.</word_default>
+      <word_custom>�е удало�ь найти пользовател�, которого вы хотите добавить в �пи�ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>noignoreuser_success</word_key>
+      <word_default>You are no longer ignoring the user</word_default>
+      <word_custom>Пользователь удален из �пи�ка игнорируемых</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ignoreuser_success</word_key>
+      <word_default>You are now ignoring the user</word_default>
+      <word_custom>Пользователь добавлен в �пи�ок игнорируемых</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ignoreuser_cannot</word_key>
+      <word_default>You cannot ignore that member</word_default>
+      <word_custom>Вы не можете игнорировать �того пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ignoreuser_already</word_key>
+      <word_default>You are already choosing to ignore items from that member</word_default>
+      <word_custom>Пользователь уже находит�� в �пи�ке игнорируемых</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>noignoreuser_noid</word_key>
+      <word_default>We could not find the member you were attempting to remove from your ignore list, or you are not ignoring that user</word_default>
+      <word_custom>�е удало�ь найти пользовател�, которого вы хотите удалить из �пи�ка игнорируемых. </word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cp_edit_aboutme</word_key>
+      <word_default><![CDATA[Edit your 'About Me' page]]></word_default>
+      <word_custom><![CDATA[Редактировать �траницу 'Обо мне']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>identity_url_assoc</word_key>
+      <word_default>That identity url is already in use by another account</word_default>
+      <word_custom>Этот OpenID уже и�пользует�� другим пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>identity_url</word_key>
+      <word_default>Your Identity URL</word_default>
+      <word_custom>Ваш OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>identity_url_desc</word_key>
+      <word_default>You can associate an OpenID identity URL with your account</word_default>
+      <word_custom>Вы можете �в�зать ваш OpenID � вашей учетной запи�ью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>identity_url_h3</word_key>
+      <word_default>OpenID Options</word_default>
+      <word_custom>�а�тройки OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_choose_cmod_type</word_key>
+      <word_default>Choose the type of moderation for when comments are added</word_default>
+      <word_custom>Выберите тип модерации новых комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_choose_friend_type</word_key>
+      <word_default>Choose the type of notification for when new friends are added</word_default>
+      <word_custom>Выберите тип уведомлени� о новых друзь�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_choose_comm_type</word_key>
+      <word_default>Choose the type of notification for when comments are added</word_default>
+      <word_custom>Выберите тип уведомлени� о новых комментари�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cp_current_aboutme</word_key>
+      <word_default><![CDATA[Your current 'About Me' page]]></word_default>
+      <word_custom>Текуща� информаци� о �ебе</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>finish_aboutme_edit</word_key>
+      <word_default><![CDATA[Finish &amp; Save]]></word_default>
+      <word_custom>Завершить и �охранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_choose_fmod_type</word_key>
+      <word_default>Choose the type of moderation for when new friends are added</word_default>
+      <word_custom>Выберите тип модерации дл� добавлени� в друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_choose2</word_key>
+      <word_default><![CDATA[This is the display name you wish to now use. Characters not permitted: [ ] | , ; &#036;]]></word_default>
+      <word_custom><![CDATA[Запрещенные �имволы: [ ] | , ;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_choose</word_key>
+      <word_default>New display name</word_default>
+      <word_custom>Введите новое им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_change_ok</word_key>
+      <word_default>Display name changed successfully</word_default>
+      <word_custom>Им� пользовател� у�пешно изменено</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_password</word_key>
+      <word_default>Current password</word_default>
+      <word_custom>Введите ваш текущий пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_password2</word_key>
+      <word_default>This is to ensure security on your account</word_default>
+      <word_custom>Это гарантирует безопа�но�ть вашей учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_string</word_key>
+      <word_default><![CDATA[You have made <strong>%s</strong> of <strong>%s</strong> display name changes since %s. You are permitted to make %s changes in a %s day period.<br />Changing your display name will <strong>not</strong> affect your log in details.]]></word_default>
+      <word_custom><![CDATA[Вы �делали %s из %s изменений имени пользовател� � %s.<br />Вам разрешено делать %s изменений каждые %s дней.<br /><br >Изменение  имени никак <strong>не</strong> отражает�� на вашем логине.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dname_title</word_key>
+      <word_default>Change Display Name</word_default>
+      <word_custom>Изменить им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_dname_change</word_key>
+      <word_default>Change Display Name</word_default>
+      <word_custom>Изменить им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_inpm</word_key>
+      <word_default>Personal Message</word_default>
+      <word_custom>Личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_attach</word_key>
+      <word_default>Manage Attachments</word_default>
+      <word_custom>Прикрепленные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_topicmoved</word_key>
+      <word_default><![CDATA[<i>Unavailable</i>]]></word_default>
+      <word_custom><![CDATA[<i>Тема перемещена</i>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dst_error</word_key>
+      <word_default>An error occurred when trying to automatically change your DST settings. If the error continues, please switch off auto DST correction.</word_default>
+      <word_custom>Произошла ошибка при попытке автоматиче�ки изменить ваши на�тройки перехода на летнее врем�. Е�ли ошибка продолжает��, пожалуй�та, отключите автокоррекцию перехода на летнее врем�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>conv_email_warning</word_key>
+      <word_default><![CDATA[Your email address has been changed because it was in use by another account. This means that all email will NOT go to your correct email address - this could include lost password notifications, etc.<br />PLEASE change your email address immediately.]]></word_default>
+      <word_custom><![CDATA[Ваш e-mail адре� изменен в �в�зи � тем, что данный e-mail и�пользует�� на другой учетной запи�и. Это означает, что вы не будете получать никаких пи�ем � форума, такие как уведомление о во��тановлении забытого парол� и т.д.<br />�емедленно измените �вой e-mail адре�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>conv_email_warning_title</word_key>
+      <word_default>EMAIL WARNING</word_default>
+      <word_custom>E-MAIL ПРЕДУПРЕЖДЕ�ИЕ</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>flash_text</word_key>
+      <word_default>Allows for an upload progress bar and multiple file uploads, but does not work on all browsers</word_default>
+      <word_custom>Позвол�ет и�пользовать flash дл� прогре��-бара и загрузки не�кольких файлов. Работает не во в�ех браузерах.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>enable_flash</word_key>
+      <word_default>Enable flash uploader?</word_default>
+      <word_custom>Включить загрузку файлов � и�пользованием flash</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_title</word_key>
+      <word_default>Attachment</word_default>
+      <word_custom>Файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_hsize</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_delete</word_key>
+      <word_default>Delete Selected</word_default>
+      <word_custom>Удалить выбранные</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dst_auto2</word_key>
+      <word_default>If selected, your DST setting is automatically adjusted when you next load the community index</word_default>
+      <word_custom>Е�ли выбрано, то ваши на�тройки перехода на летнее врем� будут автоматиче�ки применены, когда в �ледующий раз вы войдете на главную �траницу форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>dst_correction_title</word_key>
+      <word_default>Automatically detect when my timezone is in DST</word_default>
+      <word_custom>Коррекци� перехода на летнее врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>settings_time_txt2</word_key>
+      <word_default>The time (including your current adjustment) is:</word_default>
+      <word_custom>Текущее врем� (включа� ваши на�тройки ча�ового по��а):</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_title_posting</word_key>
+      <word_default>Posting Settings</word_default>
+      <word_custom>�а�тройки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>enable_rte</word_key>
+      <word_default>Enable visual (RTE) editor?</word_default>
+      <word_custom>И�пользовать визуальный редактор</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>rte_text</word_key>
+      <word_default>Rich Text Editor requires IE6+, Mozilla / Firefox 3.0+, Safari 4+, Google Chrome, or Opera 9+</word_default>
+      <word_custom>Визуальный редактор требует Internet Explorer 6+, Mozilla / Firefox или Opera 9+</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_space_count</word_key>
+      <word_default><![CDATA[You have %s attachments (%s&#037; used)]]></word_default>
+      <word_custom><![CDATA[Вами загружено %s файлов (%s&#037; и�пользовано)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_space_used</word_key>
+      <word_default>You have used %s of %s</word_default>
+      <word_custom>Вами и�пользовано %s из допу�тимых %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>attach_space_unl</word_key>
+      <word_default>You have used %s of global upload space.</word_default>
+      <word_custom>Вы и�пользуете %s от общего ди�кового про�тран�тва.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_title</word_key>
+      <word_default><![CDATA[Users You're Ignoring]]></word_default>
+      <word_custom>Управление �пи�ком игнорируемых пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_ignore_users</word_key>
+      <word_default><![CDATA['Ignore' Preferences]]></word_default>
+      <word_custom>Игнорируемые пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_addem</word_key>
+      <word_default>Add a new user to your list</word_default>
+      <word_custom>Добавить новых пользователей в �пи�ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>mi5_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>av_autosize</word_key>
+      <word_default>Image Scale On</word_default>
+      <word_custom>Ма�штабирование изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_max</word_key>
+      <word_default><![CDATA[All photos must be no larger than %s kB.<br />]]></word_default>
+      <word_custom>Объем в�ех фотографий не должен превышать %s килобайт.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>av_t_gravatar</word_key>
+      <word_default>Gravatar</word_default>
+      <word_custom>Gravatar</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ec_passy</word_key>
+      <word_default>Current password</word_default>
+      <word_custom>Текущий пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_current</word_key>
+      <word_default>Currently Used Photo</word_default>
+      <word_custom>И�пользуема� фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_number_topics</word_key>
+      <word_default><![CDATA[Number of <strong>topics</strong> to show for each forum page:]]></word_default>
+      <word_custom>Количе�тво тем на �траницу форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_number_posts</word_key>
+      <word_default><![CDATA[Number of <strong>posts</strong> to show for each topic page:]]></word_default>
+      <word_custom>Количе�тво �ообщений на �траницу темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_change_photo</word_key>
+      <word_default>Photo</word_default>
+      <word_custom>Изменить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_as_desc</word_key>
+      <word_default><![CDATA[This will scale the image down for you if it's too big in pixel size]]></word_default>
+      <word_custom>Е�ли ваше изображение �лишком большое, оно будет  автоматиче�ки уменьшено до нужных размеров.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_autosize</word_key>
+      <word_default>Image Scale On</word_default>
+      <word_custom>Ма�штабирование изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_upload</word_key>
+      <word_default>Upload an image from your computer</word_default>
+      <word_custom>Загрузить фотографию �о �воего компьютера</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_change</word_key>
+      <word_default>Change Photo</word_default>
+      <word_custom>Изменить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_max2</word_key>
+      <word_default>Photos must be no bigger than %s pixels by %s pixels.</word_default>
+      <word_custom> Фотографии должны быть не больше %s на %s пик�елей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_title</word_key>
+      <word_default>Your Personal Photo</word_default>
+      <word_custom>Ваша фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pph_desc</word_key>
+      <word_default>This section will allow you to specify a photo to be used in your profile which is viewable by other community members.</word_default>
+      <word_custom>Зде�ь вы можете загрузить фотографию, котора� будет видна другим пользовател�м в вашем профиле.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>av_as_desc</word_key>
+      <word_default><![CDATA[This will scale the image down for you if it's too big in pixel size]]></word_default>
+      <word_custom>Е�ли ваше изображение �лишком большое, оно будет  автоматиче�ки уменьшено до нужных размеров.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pp_use_default</word_key>
+      <word_default>Use forum default</word_default>
+      <word_custom>По умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>lp_subject</word_key>
+      <word_default>Email address change at</word_default>
+      <word_custom>Изменение e-mail адре�а дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>with_selected</word_key>
+      <word_default>with selected</word_default>
+      <word_custom>� выбранными</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>m_sig_info</word_key>
+      <word_default>Signature</word_default>
+      <word_custom>Изменить подпи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>change_email_title</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>Изменение e-mail адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cp_current_sig</word_key>
+      <word_default>Your current Signature</word_default>
+      <word_custom>Текуща� подпи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ce_new_email</word_key>
+      <word_default>New email address</word_default>
+      <word_custom>Введите новый e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>cp_edit_sig</word_key>
+      <word_default>Edit Signature</word_default>
+      <word_custom>Изменение подпи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>height</word_key>
+      <word_default>Height</word_default>
+      <word_custom>Ширина</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>width</word_key>
+      <word_default>Width</word_default>
+      <word_custom>Вы�ота</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ce_new_email2</word_key>
+      <word_default>Confirm email address</word_default>
+      <word_custom>Повторите новый e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ce_auth</word_key>
+      <word_default><![CDATA[<strong>PLEASE NOTE:</strong> You will have to re-activate your account after changing your email address.<br />An email will be sent to the email address you specify below, outlining what you need to do.<br />Proceeding with this action will sign you out. It is strongly recommended that you reset your password before changing your email address if you are unable to remember your password.]]></word_default>
+      <word_custom><![CDATA[<br /><br />ПРИМЕЧ��ИЕ: По�ле изменени� e-mail адре�а вы должны будете переактивировать вашу учетную запи�ь.<br />�а ваш e-mail адре� будет отправлено пи�ьмо � подробными ин�трукци�ми о дальнейших дей�тви�х.<br /><br />Вы должны будете переавторизовать��. �а�то�тельно рекомендуем вам, перед изменением e-mail адре�а, во�пользовать�� функцией во��тановлени� парол�, е�ли вы его не помните.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ce_current</word_key>
+      <word_default>Current email address</word_default>
+      <word_custom><![CDATA[<b>Ваш текущий e-mail адре�:</b> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>pass_change_text</word_key>
+      <word_default>We will attempt to update your current session after your successful password change. If, however, you do experience difficulties, please try signing out and signing back in before contacting a staff member to help resolve the problem</word_default>
+      <word_custom>Зде�ь вы можете изменить ваш пароль. По�ле у�пешного изменени� парол�, форум попытает�� обновить ваш �еан�. При возникновении каких-либо проблем, попробуйте переавторизовать��. Е�ли ничего не получит��, обратите�ь к �дмини�тратору форума дл� разрешени� проблемы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>board_prefs</word_key>
+      <word_default>Notification Preferences</word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ce_redirect</word_key>
+      <word_default>An email has been sent, redirecting to the activation screen</word_default>
+      <word_custom>Пи�ьмо на e-mail отправлено. Сейча� вы перейдете на �траницу активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>t_title</word_key>
+      <word_default>Your control panel</word_default>
+      <word_custom>Ваша панель управлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>settings_viewimg</word_key>
+      <word_default>View images in posts, such as smilies and posted images?</word_default>
+      <word_custom>Отображать картинки в �ообщени�х (например, �майлики, изображени�)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>account_pass_title</word_key>
+      <word_default>Password</word_default>
+      <word_custom>�овый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>account_pass_new2</word_key>
+      <word_default>Confirm NEW password</word_default>
+      <word_custom>Подтверждение нового парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>send_full_msg</word_key>
+      <word_default>Include a copy of the post when emailing me from a watched topic</word_default>
+      <word_custom>Добавл�ть копию �ообщени� из подпи�анных тем в отправл�емое пи�ьмо-уведомление</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>rboard_prefs</word_key>
+      <word_default>Community Preferences</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>email</word_key>
+      <word_default>Email Settings</word_default>
+      <word_custom>�а�тройки E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>send_full_msg_desc</word_key>
+      <word_default>Enabling this option will send a plain text version of the post in the watched topic email.</word_default>
+      <word_custom>При включении �той функции, копи� нового �ообщени�, в про�том тек�товом формате, будет вы�лана вам на e-mail.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>admin_send_desc</word_key>
+      <word_default>Enabling this option will add your email address to the administrators mail list and you will receive any updates sent.</word_default>
+      <word_custom>При включении �той функции, ваш e-mail адре� будет добавлен к �пи�ку e-mail адре�ов админи�тратора и вы, в��кий раз будете уведомлены по e-mail, о любых изменени�х на форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>admin_send</word_key>
+      <word_default>Send me any updates sent by the community administrator</word_default>
+      <word_custom>Сообщать мне обо в�ех изменени�х, проводимых админи�тратором форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>settings_time</word_key>
+      <word_default>Time Zone</word_default>
+      <word_custom>Ча�овой по��</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>account_pass_old</word_key>
+      <word_default>CURRENT password</word_default>
+      <word_custom>Текущий пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_title</word_key>
+      <word_default>My Settings</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>account_pass_new</word_key>
+      <word_default>NEW password</word_default>
+      <word_custom>Введите ваш �ОВЫЙ пароль</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>ucp_change_email</word_key>
-      <word_default>Change Email Address</word_default>
+      <word_default>Email Address</word_default>
       <word_custom>Изменение E-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_general_settings</word_key>
-      <word_default>General Settings</word_default>
-      <word_custom>Общие на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_change_password</word_key>
-      <word_default>Change Password</word_default>
-      <word_custom>Изменение парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp_change_name</word_key>
-      <word_default>Change Display Name</word_default>
-      <word_custom>Изменение имени пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ok_email_changed</word_key>
-      <word_default><![CDATA[Your email address has been updated. Remember, you'll need to log in with your new email address from now on.]]></word_default>
-      <word_custom>Ваш e-mail адре� обновлен. Помните, что � �того момента вам необходимо входить в �и�тему � вашим новым e-mail адре�ом.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-12</word_key>
-      <word_default>(GMT - 12:00 hours) Enitwetok, Kwajalien</word_default>
-      <word_custom>(GMT - 12:00) Эневеток, Кваджалейн</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-11</word_key>
-      <word_default>(GMT - 11:00 hours) Midway Island, Samoa</word_default>
-      <word_custom>(GMT - 11:00) о.Миду�й, Самоа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-10</word_key>
-      <word_default>(GMT - 10:00 hours) Hawaii</word_default>
-      <word_custom>(GMT - 10:00) Гавайи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-9.5</word_key>
-      <word_default>(GMT - 9:30 hours) French Polynesia</word_default>
-      <word_custom>(GMT - 9:30) Француз�ка� Полинези�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-9</word_key>
-      <word_default>(GMT - 9:00 hours) Alaska</word_default>
-      <word_custom>(GMT - 9:00) �л��ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20683,9 +19585,6 @@ Report:
       <word_key>time_-8</word_key>
       <word_default><![CDATA[(GMT - 8:00 hours) Pacific Time (US &amp; Canada)]]></word_default>
       <word_custom>(GMT - 8:00) Тихоокеан�кое врем� (СШ� и Канада), Тихуана</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20693,19 +19592,69 @@ Report:
       <word_key>time_-7</word_key>
       <word_default><![CDATA[(GMT - 7:00 hours) Mountain Time (US &amp; Canada)]]></word_default>
       <word_custom>(GMT - 7:00) Горное врем� (СШ� и Канада), �ризона</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_-6</word_key>
-      <word_default><![CDATA[(GMT - 6:00 hours) Central Time (US &amp; Canada), Mexico City]]></word_default>
-      <word_custom>(GMT - 6:00) Центральное врем� (СШ� и Канада), Мехико</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_-11</word_key>
+      <word_default>(GMT - 11:00 hours) Midway Island, Samoa</word_default>
+      <word_custom>(GMT - 11:00) о.Миду�й, Самоа</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-10</word_key>
+      <word_default>(GMT - 10:00 hours) Hawaii</word_default>
+      <word_custom>(GMT - 10:00) Гавайи</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-9.5</word_key>
+      <word_default>(GMT - 9:30 hours) French Polynesia</word_default>
+      <word_custom>(GMT - 9:30) Француз�ка� Полинези�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-9</word_key>
+      <word_default>(GMT - 9:00 hours) Alaska</word_default>
+      <word_custom>(GMT - 9:00) �л��ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-12</word_key>
+      <word_default>(GMT - 12:00 hours) Enitwetok, Kwajalien</word_default>
+      <word_custom>(GMT - 12:00) Эневеток, Кваджалейн</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ok_email_changed</word_key>
+      <word_default><![CDATA[Your email address has been updated. Remember, you'll need to log in with your new email address from now on.]]></word_default>
+      <word_custom>Ваш e-mail адре� обновлен. Помните, что � �того момента вам необходимо входить в �и�тему � вашим новым e-mail адре�ом.</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_change_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Изменение парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_change_name</word_key>
+      <word_default>Display Name</word_default>
+      <word_custom>Изменение имени пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp_general_settings</word_key>
+      <word_default>General Settings</word_default>
+      <word_custom>Общие на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20713,19 +19662,13 @@ Report:
       <word_key>time_-5</word_key>
       <word_default><![CDATA[(GMT - 5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima]]></word_default>
       <word_custom>(GMT - 5:00) Во�точное врем� (СШ� и Канада), Богота, Лима, Кито</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_-4.5</word_key>
-      <word_default>(GMT - 4:30 hours) Bolivarian Time</word_default>
-      <word_custom>(GMT - 4:30) Боливариан�кое врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_-6</word_key>
+      <word_default><![CDATA[(GMT - 6:00 hours) Central Time (US &amp; Canada), Mexico City]]></word_default>
+      <word_custom>(GMT - 6:00) Центральное врем� (СШ� и Канада), Мехико</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20733,39 +19676,13 @@ Report:
       <word_key>time_-4</word_key>
       <word_default>(GMT - 4:00 hours) Atlantic Time (Canada), Caracas, La Paz</word_default>
       <word_custom>(GMT - 4:00) �тлантиче�кое врем� (Канада), Карака�, Ла Па�, Санть�го</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_-3.5</word_key>
-      <word_default>(GMT - 3:30 hours) Newfoundland</word_default>
-      <word_custom>(GMT - 3:30) �ьюфаундленд</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-3</word_key>
-      <word_default>(GMT - 3:00 hours) Brazil, Buenos Aires, Falkland Is.</word_default>
-      <word_custom>(GMT - 3:00) Бразили�, Бу�но�-�йре�, Джорджтаун, Гренланди�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_-2</word_key>
-      <word_default>(GMT - 2:00 hours) Mid-Atlantic, Ascention Is., St Helena</word_default>
-      <word_custom>(GMT - 2:00) Среднеатлантиче�кое врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_-4.5</word_key>
+      <word_default>(GMT - 4:30 hours) Bolivarian Time</word_default>
+      <word_custom>(GMT - 4:30) Боливариан�кое врем�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20773,9 +19690,20 @@ Report:
       <word_key>time_-1</word_key>
       <word_default>(GMT - 1:00 hours) Azores, Cape Verde Islands</word_default>
       <word_custom>(GMT - 1:00) �зор�кие о-ва, о-ва Зеленого мы�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-3.5</word_key>
+      <word_default>(GMT - 3:30 hours) Newfoundland</word_default>
+      <word_custom>(GMT - 3:30) �ьюфаундленд</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-2</word_key>
+      <word_default>(GMT - 2:00 hours) Mid-Atlantic, Ascention Is., St Helena</word_default>
+      <word_custom>(GMT - 2:00) Среднеатлантиче�кое врем�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20783,49 +19711,20 @@ Report:
       <word_key>time_0</word_key>
       <word_default>(GMT) Casablanca, Dublin, London, Lisbon, Monrovia</word_default>
       <word_custom>(GMT) Ка�абланка, Дублин, Эдинбург, Ли��абон, Лондон, Монрови�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_-3</word_key>
+      <word_default>(GMT - 3:00 hours) Brazil, Buenos Aires, Falkland Is.</word_default>
+      <word_custom>(GMT - 3:00) Бразили�, Бу�но�-�йре�, Джорджтаун, Гренланди�</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
       <word_key>time_1</word_key>
-      <word_default>(GMT + 1:00 hours) Brussels, Copenhagen, Madrid, Paris</word_default>
-      <word_custom>(GMT + 1:00) �м�тердам, Берлин, Брю��ель, Мадрид, Париж, Рим</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_2</word_key>
-      <word_default>(GMT + 2:00 hours) Kaliningrad, South Africa</word_default>
-      <word_custom>(GMT + 2:00) Каир, Хель�инки, Калининград, Южна� �фрика, Варшава</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_3</word_key>
-      <word_default>(GMT + 3:00 hours) Baghdad, Riyadh, Moscow, Nairobi</word_default>
-      <word_custom>(GMT + 3:00) Багдад, Эр-Ри�д, Мо�ква, �айроби</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_3.5</word_key>
-      <word_default>(GMT + 3:30 hours) Tehran</word_default>
-      <word_custom>(GMT + 3:30) Тегеран</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_default>(GMT + 1:00 hours) Brussels, Copenhagen, Madrid, Paris, Rome</word_default>
+      <word_custom>(GMT + 1:00) �м�тердам, Берлин, Брю��ель, Мадрид, Париж</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20833,9 +19732,6 @@ Report:
       <word_key>time_4</word_key>
       <word_default>(GMT + 4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi</word_default>
       <word_custom>(GMT + 4:00) �бу-Даби, Баку, Му�кат, Тбили�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20843,9 +19739,6 @@ Report:
       <word_key>time_4.5</word_key>
       <word_default>(GMT + 4:30 hours) Kabul</word_default>
       <word_custom>(GMT + 4:30) Кабул</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20853,29 +19746,27 @@ Report:
       <word_key>time_5</word_key>
       <word_default>(GMT + 5:00 hours) Ekaterinburg, Karachi, Tashkent</word_default>
       <word_custom>(GMT + 5:00) Екатеринбург, И�ламабад, Карачи, Ташкент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_5.5</word_key>
-      <word_default>(GMT + 5:30 hours) Bombay, Calcutta, Madras, New Delhi</word_default>
-      <word_custom>(GMT + 5:30) Бомбей, Калькутта, Мадра�, �ью-Дели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_3.5</word_key>
+      <word_default>(GMT + 3:30 hours) Tehran</word_default>
+      <word_custom>(GMT + 3:30) Тегеран</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_5.75</word_key>
-      <word_default>(GMT + 5:45 hours) Kathmandu</word_default>
-      <word_custom>(GMT + 5:45) Катманду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_3</word_key>
+      <word_default>(GMT + 3:00 hours) Baghdad, Riyadh, Moscow, Nairobi</word_default>
+      <word_custom>(GMT + 3:00) Багдад, Эр-Ри�д, Мо�ква, �айроби</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_2</word_key>
+      <word_default>(GMT + 2:00 hours) Kaliningrad, South Africa</word_default>
+      <word_custom>(GMT + 2:00) Каир, Хель�инки, Калининград, Южна� �фрика, Варшава</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20883,69 +19774,20 @@ Report:
       <word_key>time_6</word_key>
       <word_default>(GMT + 6:00 hours) Almaty, Bangladesh, Dhakra</word_default>
       <word_custom>(GMT + 6:00) �лма-�та, Коломбо, Дхака, �ово�ибир�к, Ом�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_6.5</word_key>
-      <word_default>(GMT + 6:30 hours) Yangon, Naypyidaw, Bantam</word_default>
-      <word_custom>(GMT + 6:30) Янгон, �айпьидо, Бантам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_5.5</word_key>
+      <word_default>(GMT + 5:30 hours) Bombay, Calcutta, Madras, New Delhi</word_default>
+      <word_custom>(GMT + 5:30) Бомбей, Калькутта, Мадра�, �ью-Дели</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_7</word_key>
-      <word_default>(GMT + 7:00 hours) Bangkok, Hanoi, Jakarta</word_default>
-      <word_custom>(GMT + 7:00) Бангкок, Ханой, Джакарта, Кра�но�р�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_8</word_key>
-      <word_default>(GMT + 8:00 hours) Hong Kong, Perth, Singapore, Taipei</word_default>
-      <word_custom>(GMT + 8:00) Пекин, Гонконг, Перт, Сингапур, Тайпей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_8.75</word_key>
-      <word_default>(GMT + 8:45 hours) Caiguna, Eucla</word_default>
-      <word_custom>(GMT + 8:45) Кейгуна, Юкла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_9</word_key>
-      <word_default>(GMT + 9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk</word_default>
-      <word_custom>(GMT + 9:00) О�ака, Саппоро, Сеул, Токио, Якут�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_9.5</word_key>
-      <word_default>(GMT + 9:30 hours) Adelaide, Darwin</word_default>
-      <word_custom>(GMT + 9:30) �делаида, Дарвин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_5.75</word_key>
+      <word_default>(GMT + 5:45 hours) Kathmandu</word_default>
+      <word_custom>(GMT + 5:45) Катманду</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20953,29 +19795,27 @@ Report:
       <word_key>time_10</word_key>
       <word_default>(GMT + 10:00 hours) Melbourne, Papua New Guinea, Sydney</word_default>
       <word_custom>(GMT + 10:00) Канберра, Мельбурн, Гуам, Сидней, Владиво�ток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_10.5</word_key>
-      <word_default>(GMT + 10:30 hours) Lord Howe Island</word_default>
-      <word_custom>(GMT + 10:30) О�тров Лорд-Хау</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_7</word_key>
+      <word_default>(GMT + 7:00 hours) Bangkok, Hanoi, Jakarta</word_default>
+      <word_custom>(GMT + 7:00) Бангкок, Ханой, Джакарта, Кра�но�р�к</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
       <word_pack>public_usercp</word_pack>
-      <word_key>time_11</word_key>
-      <word_default>(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Is.</word_default>
-      <word_custom>(GMT + 11:00) Магадан, �ова� Каледони�, Соломоновы о-ва</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>time_6.5</word_key>
+      <word_default>(GMT + 6:30 hours) Yangon, Naypyidaw, Bantam</word_default>
+      <word_custom>(GMT + 6:30) Янгон, �айпьидо, Бантам</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_9.5</word_key>
+      <word_default>(GMT + 9:30 hours) Adelaide, Darwin</word_default>
+      <word_custom>(GMT + 9:30) �делаида, Дарвин</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20983,9 +19823,41 @@ Report:
       <word_key>time_11.5</word_key>
       <word_default>(GMT + 11:30 hours) Burnt Pine, Kingston</word_default>
       <word_custom>(GMT + 11:30) Бернт Пайн, Кинг�тон </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_10.5</word_key>
+      <word_default>(GMT + 10:30 hours) Lord Howe Island</word_default>
+      <word_custom>(GMT + 10:30) О�тров Лорд-Хау</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_8</word_key>
+      <word_default>(GMT + 8:00 hours) Hong Kong, Perth, Singapore, Taipei</word_default>
+      <word_custom>(GMT + 8:00) Пекин, Гонконг, Перт, Сингапур, Тайпей</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_8.75</word_key>
+      <word_default>(GMT + 8:45 hours) Caiguna, Eucla</word_default>
+      <word_custom>(GMT + 8:45) Кейгуна, Юкла</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_9</word_key>
+      <word_default>(GMT + 9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk</word_default>
+      <word_custom>(GMT + 9:00) О�ака, Саппоро, Сеул, Токио, Якут�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_11</word_key>
+      <word_default>(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Is.</word_default>
+      <word_custom>(GMT + 11:00) Магадан, �ова� Каледони�, Соломоновы о-ва</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -20993,9 +19865,6 @@ Report:
       <word_key>time_12</word_key>
       <word_default>(GMT + 12:00 hours) Auckland, Fiji, Marshall Islands</word_default>
       <word_custom>(GMT + 12:00) Окленд, Фиджи, Камчатка, Веллингтон, Маршалловы о�трова</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21003,9 +19872,6 @@ Report:
       <word_key>time_12.75</word_key>
       <word_default>(GMT + 12:45 hours) Chatham Islands</word_default>
       <word_custom>(GMT + 12:45) О�трова Чатем </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21013,29 +19879,6 @@ Report:
       <word_key>time_13</word_key>
       <word_default>(GMT + 13:00 hours) Kamchatka, Anadyr</word_default>
       <word_custom>(GMT + 13:00) Камчатка, �надырь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>time_14</word_key>
-      <word_default>(GMT + 14:00 hours) Kiritimati</word_default>
-      <word_custom>(GMT + 14:00) Киритимати (о�тров Рожде�тва)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>core</word_app>
-      <word_pack>public_usercp</word_pack>
-      <word_key>ucp__settings_saved</word_key>
-      <word_default>Settings Saved</word_default>
-      <word_custom>�а�тройки �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21043,9 +19886,20 @@ Report:
       <word_key>ucp__save_changes</word_key>
       <word_default>Save Changes</word_default>
       <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>ucp__settings_saved</word_key>
+      <word_default>Settings Saved</word_default>
+      <word_custom>�а�тройки �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>time_14</word_key>
+      <word_default>(GMT + 14:00 hours) Kiritimati</word_default>
+      <word_custom>(GMT + 14:00) Киритимати (о�тров Рожде�тва)</word_custom>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21053,9 +19907,6 @@ Report:
       <word_key>m_vkontakte</word_key>
       <word_default>Соединение � Вконтакте</word_default>
       <word_custom>Соединение � Вконтакте</word_custom>
-      <word_default_version>31003</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21063,9 +19914,6 @@ Report:
       <word_key>vk_config</word_key>
       <word_default>�еобходимо иметь �в�занный � Vkontakte аккаунт прежде чем что-то на�траивать.</word_default>
       <word_custom>�еобходимо иметь �в�занный � Вконтакте аккаунт прежде чем что-то на�траивать.</word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21073,9 +19921,6 @@ Report:
       <word_key>vk_disassociate</word_key>
       <word_default>Убрать �в�зь � аккаунтом Вконтакте</word_default>
       <word_custom>Убрать �в�зь � аккаунтом Вконтакте</word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21083,9 +19928,6 @@ Report:
       <word_key>vk_disassociate_desc</word_key>
       <word_default>Позвол�ет вам убрать �в�зь � аккаунтом Вконтакте дл� данной учетной запи�и форума.</word_default>
       <word_custom>Позвол�ет вам убрать �в�зь � аккаунтом Вконтакте дл� данной учетной запи�и форума.</word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21093,9 +19935,6 @@ Report:
       <word_key>vk_logged_in</word_key>
       <word_default>Вы вошли в Вконтакте </word_default>
       <word_custom>Вы вошли в Вконтакте</word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>core</word_app>
@@ -21103,9 +19942,20 @@ Report:
       <word_key>vk_revoke</word_key>
       <word_default><![CDATA[Пожалуй�та зайдите на <a href='http://vkontakte.ru/apps.php?m=1' target='_blank'>�траницу Приложени� Вконтакте</a> дл� отключени� до�тупа форуму <strong>прежде</strong> чем нажать на кнопку ниже]]></word_default>
       <word_custom><![CDATA[Пожалуй�та зайдите на <a href='http://vkontakte.ru/apps.php?m=1' target='_blank'>�траницу Приложени� Вконтакте</a> дл� отключени� до�тупа форуму <strong>прежде</strong> чем нажать на кнопку ниже]]></word_custom>
-      <word_default_version>31004</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>nots_pm_list</word_key>
+      <word_default>Msg List</word_default>
+      <word_custom>Спи�ок �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>core</word_app>
+      <word_pack>public_usercp</word_pack>
+      <word_key>nots_pm_whatthef</word_key>
+      <word_default>Message notifications appear in the message list (the icon next to the notificatons icon at the top of the screen)</word_default>
+      <word_custom>Уведомление о �ообщени�х (иконка р�дом � иконкой уведомлений в �амом верху �траницы)</word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/core/xml/versions.xml b/upload/admin/applications/core/xml/versions.xml
index d29ef79c..82b1ae91 100644
--- a/upload/admin/applications/core/xml/versions.xml
+++ b/upload/admin/applications/core/xml/versions.xml
@@ -268,4 +268,32 @@
 		<human>3.1.4</human>
 		<long>31007</long>
 	</version>
+	<version>
+		<human>3.2.0 Beta 1</human>
+		<long>32000</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 2</human>
+		<long>32001</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 3</human>
+		<long>32002</long>
+	</version>
+	<version>
+		<human>3.2.0</human>
+		<long>32003</long>
+	</version>
+	<version>
+		<human>3.2.1</human>
+		<long>32004</long>
+	</version>
+	<version>
+		<human>3.2.2</human>
+		<long>32005</long>
+	</version>
+	<version>
+		<human>3.2.3</human>
+		<long>32006</long>
+	</version>
 </versions>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/app_class_forums.php b/upload/admin/applications/forums/app_class_forums.php
index f7cf663f..38b6979f 100644
--- a/upload/admin/applications/forums/app_class_forums.php
+++ b/upload/admin/applications/forums/app_class_forums.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forums application initialization
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 7003 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -45,7 +45,7 @@ class app_class_forums
 	 * Constructor
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -64,7 +64,7 @@ class app_class_forums
 		{
 			try
 			{
-				require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );
+				require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );/*noLibHook*/
 				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/admin_forum_functions.php", 'admin_forum_functions', 'forums' );
 				
 				$this->registry->setClass( 'class_forums', new $classToLoad( $registry ) );
@@ -94,31 +94,25 @@ class app_class_forums
 		// the skins...
 		//---------------------------------------------------
 		
-		if ( isset( $_GET['showtopic'] ) AND $_GET['showtopic'] != '' )
+		if ( !empty( $_GET['showtopic'] ) )
 		{
+			/* Load tagging stuff */
+			if ( ! $this->registry->isClassLoaded('tags') )
+			{
+				require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+				$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' )  );
+			}
+		
 			$this->request['t'] = intval( $_GET['showtopic']  );
 			
-			if ( $this->settings['cpu_watch_update'] AND $this->memberData['member_id'] )
-			{
-				$this->DB->build( array( 'select' => 't.*',
-										 'from'   => array( 'topics' => 't' ),
-										 'where'  => 't.tid=' . $this->request['t'],
-										 'add_join' => array( array( 'select' => 'w.trid as trackingTopic',
-																	 'from'   => array( 'tracker' => 'w' ),
-																	 'where'  => 'w.topic_id=t.tid AND w.member_id=' . $this->memberData['member_id'],
-																	 'type'   => 'left' ) ) ) );
-				$this->DB->execute();
-				
-				$topic = $this->DB->fetch();
-			}
-			else
-			{
-				$topic = $this->DB->buildAndFetch( array( 'select' => '*',
-														  'from'   => 'topics',
-														  'where'  => "tid=" . $this->request['t'],
-												)      );
-			}
-										
+			$this->DB->build( array( 'select'   => 't.*',
+									 'from'     => array( 'topics' => 't' ),
+									 'where'    => 't.tid=' . $this->request['t'],
+									 'add_join' => array( $this->registry->tags->getCacheJoin( array( 'meta_id_field' => 't.tid' ) ) ) ) );
+			$this->DB->execute();
+			
+			$topic = $this->DB->fetch();
+			
 			$this->registry->getClass('class_forums')->topic_cache = $topic;
 	   
 		    $this->request['f'] =  $topic['forum_id'];
@@ -139,11 +133,11 @@ class app_class_forums
 	/**
 	 * Do some set up after ipsRegistry::init()
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function afterOutputInit()
 	{
-		if ( isset( $_GET['showtopic'] ) AND $_GET['showtopic'] != '' AND is_array( $this->registry->getClass('class_forums')->topic_cache ) )
+		if ( !empty( $_GET['showtopic'] ) AND is_array( $this->registry->getClass('class_forums')->topic_cache ) )
 		{
 			$topic = $this->registry->getClass('class_forums')->topic_cache;
 
@@ -165,7 +159,7 @@ class app_class_forums
 			/* Store root doc URL */
 			$this->registry->getClass('output')->storeRootDocUrl( $this->registry->getClass('output')->buildSEOUrl( 'showtopic=' . $topic['tid'], 'publicNoSession', $topic['title_seo'], 'showtopic' ) );
 		}
-		else if ( isset( $_GET['showforum'] ) AND $_GET['showforum'] != '' )
+		else if ( !empty( $_GET['showforum'] ) )
 		{
 			$_GET['showforum']					= intval($_GET['showforum']);
 			ipsRegistry::$request['showforum']	= intval(ipsRegistry::$request['showforum']);
@@ -192,11 +186,8 @@ class app_class_forums
 				$this->registry->getClass('output')->storeRootDocUrl( $this->registry->getClass('output')->buildSEOUrl( 'showforum=' . $data['id'], 'publicNoSession', $data['name_seo'], 'showforum' ) );
 			}
 		}
-		else if ( isset( $_GET['showannouncement'] ) AND $_GET['showannouncement'] != '' )
+		else if ( !empty( $_GET['showannouncement'] ) )
 		{
-			//$announce = $this->DB->buildAndFetch( array( 'select' => 'announce_id, announce_title',
-			//										  'from'   => 'announcements',
-			//										  'where'  => 'announce_id=' . intval( $_GET['showannouncement'] ) ) );
 			$announce	= $this->caches['announcements'][ intval( $_GET['showannouncement'] ) ];
 													
 			if ( $announce['announce_id'] )
diff --git a/upload/admin/applications/forums/extensions/admin/group_form.php b/upload/admin/applications/forums/extensions/admin/group_form.php
index b5af91d0..0c31f5a7 100644
--- a/upload/admin/applications/forums/extensions/admin/group_form.php
+++ b/upload/admin/applications/forums/extensions/admin/group_form.php
@@ -1,51 +1,44 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Group property updater (Forums)
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6925 $
- *
+ * @file		group_form.php 	Forums group editing form
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-03-03 13:09:09 -0500 (Thu, 03 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 7948 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
+if ( ! defined( 'IN_ACP' ) )
 {
 	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
 	exit();
 }
 
+/**
+ *
+ * @interface	admin_group_form__forums
+ * @brief		Forums group editing form
+ *
+ */
 class admin_group_form__forums implements admin_group_form
 {	
 	/**
-	* Tab name
-	* This can be left blank and the application title will
-	* be used
-	*
-	* @access	public
-	* @var		string	Tab name
-	*/
+	 * Tab name (leave it blank to use the default application title)
+	 *
+	 * @var		$tab_name
+	 */
 	public $tab_name = "";
 
-	
 	/**
-	* Returns content for the page.
-	*
-	* @access	public
-	* @author	Brandon Farber
-	* @param    array 				Group data
-	* @param	integer				Number of tabs used so far
-	* @return   array 				Array of tabs, content
-	*/
+	 * Returns HTML tabs content for the page
+	 *
+	 * @param	array		$group		Group data
+	 * @param	integer		$tabsUsed	Number of tabs used so far (your ids should be this +1)
+	 * @return	@e array Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content), 'tabsUsed' (number of tabs you have used)
+	 */
 	public function getDisplayContent( $group=array(), $tabsUsed = 2 )
 	{
 		//-----------------------------------------
@@ -68,12 +61,10 @@ class admin_group_form__forums implements admin_group_form
 	}
 	
 	/**
-	* Process the entries for saving and return
-	*
-	* @access	public
-	* @author	Brandon Farber
-	* @return   array 				Array of keys => values for saving
-	*/
+	 * Process the entries for saving and return
+	 *
+	 * @return	@e array Array of keys => values for saving
+	 */
 	public function getForSave()
 	{
 		$return = array(
@@ -102,6 +93,4 @@ class admin_group_form__forums implements admin_group_form
 
 		return $return;
 	}
-	
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/admin/index.html b/upload/admin/applications/forums/extensions/admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/admin/index.html
+++ b/upload/admin/applications/forums/extensions/admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/admin/member_form.php b/upload/admin/applications/forums/extensions/admin/member_form.php
index 548ddbc4..55142b01 100644
--- a/upload/admin/applications/forums/extensions/admin/member_form.php
+++ b/upload/admin/applications/forums/extensions/admin/member_form.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member property updater (AJAX)
- * Last Updated: $Date: 2010-03-22 22:39:27 -0400 (Mon, 22 Mar 2010) $
+ * Last Updated: $Date: 2011-04-19 12:42:57 -0400 (Tue, 19 Apr 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 5986 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8391 $
  *
  */
 
@@ -31,7 +31,6 @@ class admin_member_form__forums implements admin_member_form
 	* This can be left blank and the application title will
 	* be used
 	*
-	* @access	public
 	* @var		string		Tab name
 	*/
 	public $tab_name = "";
@@ -50,7 +49,6 @@ class admin_member_form__forums implements admin_member_form
 	* Use the format:
 	* $array[] = array( 'img' => '', 'url' => '', 'title' => '' );
 	*
-	* @access	public
 	* @author	Matt Mecham
 	* @param    array 			Member data
 	* @return   array 			Array of links
@@ -81,7 +79,6 @@ class admin_member_form__forums implements admin_member_form
 	/**
 	* Returns content for the page.
 	*
-	* @access	public
 	* @author	Matt Mecham
 	* @param    array 				Member data
 	* @return   array 				Array of tabs, content
@@ -100,13 +97,6 @@ class admin_member_form__forums implements admin_member_form
 				
 		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_forums' ), 'forums' );
 		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_member_form' ), 'forums' );
-		
-		//-----------------------------------------
-		// Get member data
-		//-----------------------------------------
-
-	//	$member 			= IPSMember::load( $member['member_id'], 'extendedProfile' );
-		$member['_avatar']	= str_replace( '<img ', '<img id="MF__avatar" ', IPSMember::buildAvatar( $member ) );
 
 		//-----------------------------------------
 		// Show...
@@ -118,7 +108,6 @@ class admin_member_form__forums implements admin_member_form
 	/**
 	* Process the entries for saving and return
 	*
-	* @access	public
 	* @author	Brandon Farber
 	* @return   array 				Multi-dimensional array (core, extendedProfile) for saving
 	*/
@@ -127,8 +116,6 @@ class admin_member_form__forums implements admin_member_form
 		$return = array( 'core' => array(), 'extendedProfile' => array() );
 		
 		$return['core']['posts']				= intval(ipsRegistry::$request['posts']);
-		$return['core']['view_avs']				= intval(ipsRegistry::$request['view_avs']);
-		$return['core']['view_img']				= intval(ipsRegistry::$request['view_img']);
 		$return['core']['restrict_post']		= ipsRegistry::$request['post_indef'] ? 1 : ( ipsRegistry::$request['post_timespan'] > 0 ? IPSMember::processBanEntry( array( 'timespan' => intval(ipsRegistry::$request['post_timespan']), 'unit' => ipsRegistry::$request['post_units']  ) ) : '' );
 		$return['core']['mod_posts']			= ipsRegistry::$request['mod_indef'] ? 1 : ( ipsRegistry::$request['mod_timespan'] > 0 ? IPSMember::processBanEntry( array( 'timespan' => intval(ipsRegistry::$request['mod_timespan']), 'unit' => ipsRegistry::$request['mod_units']  ) ) : '' );
 		$return['core']['org_perm_id']			= ipsRegistry::$request['org_perm_id'] ? ',' . implode( ",", ipsRegistry::$request['org_perm_id'] ) . ',' : '';
diff --git a/upload/admin/applications/forums/extensions/attachments/index.html b/upload/admin/applications/forums/extensions/attachments/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/attachments/index.html
+++ b/upload/admin/applications/forums/extensions/attachments/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/attachments/plugin_post.php b/upload/admin/applications/forums/extensions/attachments/plugin_post.php
index 7c89b79e..074f7b34 100644
--- a/upload/admin/applications/forums/extensions/attachments/plugin_post.php
+++ b/upload/admin/applications/forums/extensions/attachments/plugin_post.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * IP.Board post attachments plugin
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 7003 $
+ * @version		$Revision: 9520 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -36,7 +36,7 @@ class plugin_post extends class_attach
 	 * Constructor
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -113,7 +113,7 @@ class plugin_post extends class_attach
 		// Check..
 		//-----------------------------------------
 		
-		if ( ! isset( $attach['pid'] ) OR empty( $attach['pid'] ) )
+		if ( empty( $attach['pid'] ) )
 		{
 			if( $attach['attach_member_id'] != $this->memberData['member_id'] )
 			{
@@ -319,10 +319,7 @@ class plugin_post extends class_attach
 		}
 		
 		
-		$this->DB->build( array( "select" => 'COUNT(*) as cnt', 'from' => 'attachments', 'where'  => "attach_post_key='{$post_key}'" ) );
-		$this->DB->execute();
-	
-		$cnt = $this->DB->fetch();
+		$cnt	= $this->DB->buildAndFetch( array( "select" => 'COUNT(*) as cnt', 'from' => 'attachments', 'where'  => "attach_post_key='{$post_key}'" ) );
 		
 		if ( $cnt['cnt'] )
 		{
@@ -390,14 +387,11 @@ class plugin_post extends class_attach
 		
 			if ( count( $pids ) )
 			{
-				$this->DB->build( array( 
-										'select' => 'count(*) as cnt',
-										'from'   => 'attachments',
-										'where'  => "attach_rel_module='post' AND attach_rel_id IN(" . implode( ',', $pids ) . ")") );
-				$this->DB->execute();
-			
-				$cnt = $this->DB->fetch();
-			
+				$cnt	= $this->DB->buildAndFetch( array( 
+														'select'	=> 'count(*) as cnt',
+														'from'		=> 'attachments',
+														'where'		=> "attach_rel_module='post' AND attach_rel_id IN(" . implode( ',', $pids ) . ")") );
+
 				$count = intval( $cnt['cnt'] );
 			}
 		
@@ -487,7 +481,7 @@ class plugin_post extends class_attach
 				
 				if ( isset( $topic['forum_id'] ) )
 				{
-					if ( isset($_moderator[ $topic['forum_id'] ]['edit_post']) and $_moderator[ $topic['forum_id'] ]['edit_post'] )
+					if ( !empty($_moderator[ $topic['forum_id'] ]['edit_post']) )
 					{
 						$ok_to_remove = TRUE;
 					}
@@ -574,7 +568,7 @@ class plugin_post extends class_attach
 																'where'  => "attach_post_key='{$post_key}'" 
 														) );
 
-				$space_used = intval( $_space_used['figure'] );
+				$space_used = $_space_used['figure'] ? $_space_used['figure'] : 0;
 			}
 			else
 			{
@@ -588,7 +582,7 @@ class plugin_post extends class_attach
 																'where'  => "attach_member_id={$member_id} AND attach_rel_module IN( 'post', 'msg' )" 
 														)	);
 
-				$space_used    = intval( $_space_used['figure'] );
+				$space_used    = $_space_used['figure'] ? $_space_used['figure'] : 0;
 			}	
 
 			if ( $this->memberData['g_attach_max'] > 0 )
@@ -601,9 +595,9 @@ class plugin_post extends class_attach
 																		'where'  => "attach_member_id={$member_id} AND attach_rel_module IN( 'post', 'msg' )" 
 															)	 );
 
-					$g_space_used    = intval( $_g_space_used['figure'] );
+					$g_space_used    = $_g_space_used['figure'] ? $_g_space_used['figure'] : 0;
 					
-					if( intval( ( $this->memberData['g_attach_max'] * 1024 ) - $g_space_used ) < 0 )
+					if( ( $this->memberData['g_attach_max'] * 1024 ) - $g_space_used < 0 )
 					{
 						$space_used    			= $g_space_used;
 						$total_space_allowed	= $this->memberData['g_attach_max'] * 1024;
@@ -666,7 +660,7 @@ class plugin_post extends class_attach
 		IPSDebug::fireBug( 'info', array( 'Max single file size: ' . $max_single_upload ) );
 		
 		$return = array( 'space_used' => $space_used, 'space_left' => $space_left, 'space_allowed' => $space_allowed, 'max_single_upload' => $max_single_upload, 'total_space_allowed' => $total_space_allowed );
-
+				
 		return $return;
 	}
 	
diff --git a/upload/admin/applications/forums/extensions/coreExtensions.php b/upload/admin/applications/forums/extensions/coreExtensions.php
index 4138f3ea..7446a672 100644
--- a/upload/admin/applications/forums/extensions/coreExtensions.php
+++ b/upload/admin/applications/forums/extensions/coreExtensions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum permissions mappings
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $ 
+ * @link		http://hatynka.in
+ * @version		$Rev: 9483 $ 
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -27,7 +27,20 @@ if ( ! defined( 'IN_IPB' ) )
  */
 class forumsShareLinks
 {
-	function __construct()
+	/**
+	 * Shortcuts
+	 *
+	 * @var	object
+	 */
+	protected $DB;
+	protected $registry;
+	
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
 	{
 		$this->DB 		= ipsRegistry::DB();
 		$this->registry = ipsRegistry::instance();
@@ -227,7 +240,7 @@ class forumsPermMappingForum
 	 *
 	 * @var		array
 	 */
-	private $mapping = array(
+	protected $mapping = array(
 								'view'     => 'perm_view',
 								'read'     => 'perm_2',
 								'reply'    => 'perm_3',
@@ -241,7 +254,7 @@ class forumsPermMappingForum
 	 *
 	 * @var		array
 	 */
-	private $perm_names = array(
+	protected $perm_names = array(
 								'view'     => 'Show Forum',
 								'read'     => 'Read Topics',
 								'reply'    => 'Reply Topics',
@@ -255,7 +268,7 @@ class forumsPermMappingForum
 	 *
 	 * @var		array
 	 */
-	private $perm_colors = array(
+	protected $perm_colors = array(
 								'view'     => '#fff0f2',
 								'read'     => '#effff6',
 								'reply'    => '#edfaff',
@@ -301,7 +314,7 @@ class forumsPermMappingForum
 	 */
 	public function getPermItems()
 	{
-		require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );
+		require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/admin_forum_functions.php", 'admin_forum_functions', 'forums' );
 		
 		$forumfunc = new $classToLoad( ipsRegistry::instance() );
@@ -333,18 +346,18 @@ class forumsPermMappingForum
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Item Marking
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9483 $
  */
 
 class itemMarking__forums
@@ -356,7 +369,7 @@ class itemMarking__forums
 	 * 
 	 * @var		array
 	 */
-	private $_convertData = array( 'forumID' => 'item_app_key_1' );
+	protected $_convertData = array( 'forumID' => 'item_app_key_1' );
 	
 	/**#@+
 	 * Registry Object Shortcuts
@@ -378,7 +391,7 @@ class itemMarking__forums
 	 * I'm a constructor, twisted constructor
 	 *
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -439,16 +452,14 @@ class itemMarking__forums
 	{
 		$count     = 0;
 		$lastItem  = 0;
-		$approved  = $this->memberData['is_mod'] ? ' AND approved IN (0,1) ' : ' AND approved=1 ';
+		$approved  = $this->memberData['is_mod'] ? ' AND ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible', 'hidden' ), '' ) . ' ' : ' AND ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) . ' ';
 		$readItems = is_array( $readItems ) ? $readItems : array( 0 );
 
 		if ( $data['forumID'] )
 		{
-			$_count = $this->DB->buildAndFetch( array( 
-															'select' => 'COUNT(*) as cnt, MIN(last_post) as lastItem',
-															'from'   => 'topics',
-															'where'  => "forum_id=" . intval( $data['forumID'] ) . " {$approved} AND tid NOT IN(".implode(",",array_keys($readItems)).") AND last_post > ".intval($lastReset) . " AND state != 'link'"
-													)	);
+			$_count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as cnt, MIN(last_post) as lastItem',
+													   'from'   => 'topics',
+													   'where'  => "forum_id=" . intval( $data['forumID'] ) . " {$approved} AND tid NOT IN(".implode(",",array_keys($readItems)).") AND last_post > ".intval($lastReset) . " AND state != 'link'" )	);
 													
 			$count 	  = intval( $_count['cnt'] );
 			$lastItem = intval( $_count['lastItem'] );
@@ -462,18 +473,18 @@ class itemMarking__forums
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Fetch Skin
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9483 $
  */
 
 class fetchSkin__forums
@@ -497,9 +508,8 @@ class fetchSkin__forums
 	/**
 	 * I'm a constructor, twisted constructor
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -526,7 +536,6 @@ class fetchSkin__forums
 	/**
 	 * Returns a skin ID or FALSE
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @return	mixed			INT or FALSE if no skin found / required
 	 */
@@ -554,7 +563,7 @@ class fetchSkin__forums
 
 			if ( $eff )
 			{
-				if ( isset( $cache[ $eff ]['skin_id'] ) && $cache[ $eff ]['skin_id'] )
+				if ( !empty( $cache[ $eff ]['skin_id'] ) )
 				{
 					$useSkinID = $cache[ $eff ]['skin_id'];
 				}
@@ -568,19 +577,19 @@ class fetchSkin__forums
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Library: Handle public session data
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 7003 $
+ * @version		$Revision: 9483 $
  */
 
 class publicSessions__forums
@@ -591,7 +600,6 @@ class publicSessions__forums
 	 * current_appcomponent, current_module and current_section are automatically
 	 * stored. This function allows you to add specific variables in.
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @return	array
 	 */
@@ -610,7 +618,7 @@ class publicSessions__forums
     	// FORUM
     	//-----------------------------------------
 
-    	if ( ipsRegistry::$request['module'] == 'forums' AND ( isset( ipsRegistry::$request['f'] ) AND ipsRegistry::$request['f'] ) )
+    	if ( ipsRegistry::$request['module'] == 'forums' AND !empty( ipsRegistry::$request['f'] ) )
     	{
     		$array = array( 
     						 'location_2_type'   => 'forum',
@@ -621,7 +629,7 @@ class publicSessions__forums
     	// TOPIC
     	//-----------------------------------------
     	
-    	else if ( ipsRegistry::$request['module'] == 'forums' AND ipsRegistry::$request['section'] == 'topics' AND ( isset( ipsRegistry::$request['t'] ) AND ipsRegistry::$request['t'] ) )
+    	else if ( ipsRegistry::$request['module'] == 'forums' AND ipsRegistry::$request['section'] == 'topics' AND !empty( ipsRegistry::$request['t'] ) )
     	{
     		$array = array( 
     						 'location_1_type'   => 'topic',
@@ -634,7 +642,7 @@ class publicSessions__forums
     	// POST
     	//-----------------------------------------
     	
-    	else if ( ipsRegistry::$request['module'] == 'post' AND ( isset( ipsRegistry::$request['f'] ) AND ipsRegistry::$request['f'] ) )
+    	else if ( ipsRegistry::$request['module'] == 'post' AND !empty( ipsRegistry::$request['f'] ) )
     	{
     		$array = array( 
     			 			 'location_1_type'   => 'topic',
@@ -650,7 +658,6 @@ class publicSessions__forums
 	/**
 	 * Parse/format the online list data for the records
 	 *
-	 * @access	public
 	 * @author	Brandon Farber
 	 * @param	array 			Online list rows to check against
 	 * @return	array 			Online list rows parsed
@@ -704,21 +711,17 @@ class publicSessions__forums
 		// Get the forums, if you dare
 		//-----------------------------------------
 
-		if( !class_exists('app_class_forums') OR !ipsRegistry::getClass('class_forums') )
+		ipsRegistry::getAppClass('forums');
+		
+		if( count($forums_raw) )
 		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php', 'app_class_forums', 'forums' );
-			$app_class_forums = new $classToLoad( ipsRegistry::instance() );
-			
-			if( count($forums_raw) )
+			foreach( ipsRegistry::getClass('class_forums')->forum_by_id as $fid => $forum )
 			{
-				foreach( ipsRegistry::getClass('class_forums')->forum_by_id as $fid => $forum )
+				if( isset($forums_raw[$fid]) )
 				{
-					if( isset($forums_raw[$fid]) )
+					if( ipsRegistry::getClass( 'permissions' )->check( 'view', $forum ) !== false )
 					{
-						if( ipsRegistry::getClass( 'permissions' )->check( 'view', $forum ) !== false )
-						{
-							$forums[ $fid ] = $forum['name'];
-						}
+						$forums[ $fid ] = $forum['name'];
 					}
 				}
 			}
@@ -730,9 +733,11 @@ class publicSessions__forums
 		
 		if( count($topics_raw) )
 		{
-			ipsRegistry::DB()->build( array( 'select'	=> 't.tid, t.title, t.forum_id', 
+			$_approved	= ipsRegistry::getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), 't.' );
+
+			ipsRegistry::DB()->build( array( 'select'	=> 't.*', 
 											 'from'		=> array( 'topics' => 't' ), 
-											 'where'	=> 't.approved=1 AND t.tid IN(' . implode( ',', $topics_raw ) . ') AND ' . ipsRegistry::getClass('permissions')->buildPermQuery('p'),
+											 'where'	=> $_approved . ' AND t.tid IN(' . implode( ',', $topics_raw ) . ') AND ' . ipsRegistry::getClass('permissions')->buildPermQuery('p'),
 											 'add_join'	=> array(
 																array(
 																		'from'   => array( 'permission_index' => 'p' ),
@@ -745,9 +750,11 @@ class publicSessions__forums
 			
 			while( $r = ipsRegistry::DB()->fetch($tr) )
 			{
-				if( count( ipsRegistry::getClass('class_forums')->forum_by_id[ $r['forum_id'] ] ) )
+				$_forum	= ipsRegistry::getClass('class_forums')->getForumByid( $r['forum_id'] );
+				
+				if( count( $_forum ) AND ipsRegistry::getClass('class_forums')->forumsCheckAccess( $_forum['id'], false, 'topic', $r, true ) )
 				{
-					if( ipsRegistry::getClass( 'permissions' )->check( 'read', ipsRegistry::getClass('class_forums')->forum_by_id[ $r['forum_id'] ] ) !== false )
+					if( ipsRegistry::getClass( 'permissions' )->check( 'read', $_forum ) !== false )
 					{
 						$topics[ $r['tid'] ] = $r['title'];
 					}
diff --git a/upload/admin/applications/forums/extensions/coreVariables.php b/upload/admin/applications/forums/extensions/coreVariables.php
index a1e6da49..75a88b1e 100644
--- a/upload/admin/applications/forums/extensions/coreVariables.php
+++ b/upload/admin/applications/forums/extensions/coreVariables.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core variables extensions
  * Defines the reset array, which caches to load, how to recache those caches, and the bitwise array
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-06-27 06:48:51 -0400 (Mon, 27 Jun 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6882 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 9090 $ 
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -27,7 +27,7 @@ if ( ! defined( 'IN_IPB' ) )
 $_RESET = array();
 
 # ALL
-if ( ( isset( $_REQUEST['CODE'] ) AND $_REQUEST['CODE'] ) or ( isset( $_REQUEST['code'] ) AND $_REQUEST['code'] ) )
+if ( !empty( $_REQUEST['CODE'] ) or !empty( $_REQUEST['code'] ) )
 {
 	$_RESET['do'] = ( $_REQUEST['CODE'] ) ? $_REQUEST['CODE'] : $_REQUEST['code'];
 }
@@ -39,14 +39,28 @@ if ( ( isset( $_REQUEST['CODE'] ) AND $_REQUEST['CODE'] ) or ( isset( $_REQUEST[
 $_LOAD = array();
 
 # BOARD INDEX
-if ( ( ( !isset($_GET['section']) OR ! $_GET['section'] ) AND ( !isset($_GET['module']) OR ! $_GET['module'] ) ) OR ( $_GET['module'] == 'forums' AND $_GET['section'] == 'boards' ) )
+if ( ( empty($_GET['section']) AND empty($_GET['module']) ) OR ( $_GET['module'] == 'forums' AND $_GET['section'] == 'boards' ) )
 {
-	$_LOAD['chatting']			= 1;
-	$_LOAD['birthdays']			= 1;
-	$_LOAD['calendar']			= 1;
-	$_LOAD['calendars']			= 1;
 	$_LOAD['ranks']				= 1;
 	$_LOAD['reputation_levels']	= 1;
+
+	# The following are IPS app caches that are used for board index hooks.
+	# We need a better way to abstract these and only load them if the hooks are actually enabled and app is installed.
+	$_LOAD['chatting']			= 1; // This is only for the who's chatting hook, chat tab count has a global cache
+	$_LOAD['birthdays']			= 1;
+	$_LOAD['calendar_events']	= 1;
+	$_LOAD['calendars']			= 1;
+	
+	$_LOAD['support_staff']			= 1;
+	$_LOAD['support_departments']	= 1;
+	$_LOAD['support_statuses']		= 1;
+	$_LOAD['donation_goals']		= 1;
+	
+	$_LOAD['blog_stats']			= 1;
+	$_LOAD['blogmods']				= 1;
+	
+	$_LOAD['idm_cats']				= 1;
+	$_LOAD['idm_mods']				= 1;
 }
 
 # TOPIC
@@ -144,4 +158,7 @@ $_BITWISE = array( 'moderators' => array( 'bw_flag_spammers',
 										  'bw_mod_un_soft_delete_topic',
 										  'bw_mod_soft_delete_topic_see',
 										  'bw_mod_soft_delete_reason',
-										  'bw_mod_soft_delete_see_post' ) );
+										  'bw_mod_soft_delete_see_post' ),
+					'forums'	=> array( 'bw_disable_tagging',
+										  'bw_disable_prefixes' ),
+					'posts'		=> array( 'bw_post_from_mobile') );
diff --git a/upload/admin/applications/forums/extensions/dataHookLocations.php b/upload/admin/applications/forums/extensions/dataHookLocations.php
index b600235f..3c18510f 100644
--- a/upload/admin/applications/forums/extensions/dataHookLocations.php
+++ b/upload/admin/applications/forums/extensions/dataHookLocations.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Define data hook locations (Forums)
- * Last Updated: $Date: 2010-10-21 09:25:51 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-05-18 04:49:10 -0400 (Wed, 18 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7009 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8812 $
  */
 
 $dataHookLocations = array(
@@ -34,13 +34,6 @@ $dataHookLocations = array(
 	array( 'incrementUsersPostCount', 'Increment users post count' ),
 	
 	/* OUTPUT ARRAYS */
-	array( 'boardIndexCategories', 'Board Index Output: Categories' ),
-	array( 'boardIndexOnlineUsers', 'Board Index Output: Active users' ),
-	array( 'forumViewData', 'Forum View Output' ),
 	array( 'topicViewQuery', 'Topic View Query: Members Table and Joins' ),
-	array( 'topicViewPostData', 'Topic View Output: Posts Data' ),
-	array( 'topicViewForumData', 'Topic View Output: Forum Data' ),
-	array( 'topicViewTopicData', 'Topic View Output: Topic Data' ),
-	array( 'topicViewDisplayData', 'Topic View Output: Other Data' ),
 	
 );
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/editorSections.php b/upload/admin/applications/forums/extensions/editorSections.php
index 7065a80a..c3ad7b56 100644
--- a/upload/admin/applications/forums/extensions/editorSections.php
+++ b/upload/admin/applications/forums/extensions/editorSections.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode Management : Determines if bbcode can be used in this section
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 7442 $
  *
  */
 
diff --git a/upload/admin/applications/forums/extensions/furlIdTemplates.php b/upload/admin/applications/forums/extensions/furlIdTemplates.php
index 9f037334..c20ef0e5 100644
--- a/upload/admin/applications/forums/extensions/furlIdTemplates.php
+++ b/upload/admin/applications/forums/extensions/furlIdTemplates.php
@@ -7,10 +7,10 @@
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		Invision Power Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
  * @version		$Rev: 4136 $
  *
diff --git a/upload/admin/applications/forums/extensions/furlRedirect.php b/upload/admin/applications/forums/extensions/furlRedirect.php
index 3682cb7c..f0cdd619 100644
--- a/upload/admin/applications/forums/extensions/furlRedirect.php
+++ b/upload/admin/applications/forums/extensions/furlRedirect.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS output plugin :: posts
- * Last Updated: $Date: 2010-07-10 01:01:06 -0400 (Sat, 10 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 6628 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,18 +29,16 @@ class furlRedirect_forums
 	/**
 	 * Key type: Type of action (topic/forum)
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_type = '';
+	protected $_type = '';
 	
 	/**
 	 * Key ID
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_id = 0;
+	protected $_id = 0;
 	
 	/**
 	* Constructor
@@ -59,7 +57,6 @@ class furlRedirect_forums
 	 * Set the key ID
 	 * @example		furlRedirect_forums::setKey( 'topic', 12 );
 	 *
-	 * @access	public
 	 * @param	string	Type
 	 * @param	mixed	Value
 	 */
@@ -72,14 +69,13 @@ class furlRedirect_forums
 	/**
 	 * Set up the key by URI
 	 *
-	 * @access	public
 	 * @param	string		URI (example: index.php?showtopic=5&view=getlastpost)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setKeyByUri( $uri )
 	{
 		$uri = str_replace( '&amp;', '&', $uri );
-		
+
 		if ( strstr( $uri, '?' ) )
 		{
 			list( $_chaff, $uri ) = explode( '?', $uri );
@@ -96,6 +92,11 @@ class furlRedirect_forums
 					$this->setKey( 'topic', intval( $v ) );
 					return TRUE;
 				}
+				else if( $k == 'act' AND $v == 'ST' )
+				{
+					$this->setKey( 'topic', intval( $_REQUEST['t'] ) );
+					return TRUE;
+				}
 				else if ( $k == 'showforum' )
 				{
 					$this->setKey( 'forum', intval( $v ) );
@@ -115,7 +116,6 @@ class furlRedirect_forums
 	/**
 	* Return the SEO title
 	*
-	* @access	public
 	* @return	string		The SEO friendly name
 	*/
 	public function fetchSeoTitle()
@@ -140,7 +140,6 @@ class furlRedirect_forums
 	/**
 	 * Return the SEO title for a topic
 	 *
-	 * @access	public
 	 * @return	string		The SEO friendly name
 	 */
 	public function _fetchSeoTitle_topic()
@@ -168,14 +167,11 @@ class furlRedirect_forums
 	/**
 	 * Return the SEO title for a forum
 	 *
-	 * @access	public
 	 * @return	string		The SEO friendly name
 	 */
 	public function _fetchSeoTitle_forum()
 	{
-		$forum = $this->DB->buildAndFetch( array( 'select' => 'id, name_seo, name',
-												  'from'   => 'forums',
-												  'where'  => 'id=' . intval( $this->_id ) ) );
+		$forum = $this->registry->getClass('class_forums')->getForumById( intval( $this->_id ) );
 												
 		if ( $forum['id'] )
 		{
@@ -194,14 +190,10 @@ class furlRedirect_forums
 	/**
 	 * Return the SEO title for an announcement
 	 *
-	 * @access	public
 	 * @return	string		The SEO friendly name
 	 */
 	public function _fetchSeoTitle_announcement()
 	{
-		//$announce = $this->DB->buildAndFetch( array( 'select' => 'announce_id, announce_title',
-		//										  'from'   => 'announcements',
-		//										  'where'  => 'announce_id=' . intval( $this->_id ) ) );
 		$announce	= $this->caches['announcements'][ intval( $this->_id ) ];
 
 		if ( $announce['announce_id'] )
diff --git a/upload/admin/applications/forums/extensions/furlTemplates.php b/upload/admin/applications/forums/extensions/furlTemplates.php
index e7d251ee..f8caca26 100644
--- a/upload/admin/applications/forums/extensions/furlTemplates.php
+++ b/upload/admin/applications/forums/extensions/furlTemplates.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sets up SEO templates
- * Last Updated: $Date: 2010-10-27 14:13:29 -0400 (Wed, 27 Oct 2010) $
+ * Last Updated: $Date: 2011-08-02 15:53:39 -0400 (Tue, 02 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 7057 $
+ * @version		$Rev: 9351 $
  *
  */
 
@@ -57,12 +57,32 @@ $_SEOTEMPLATES = array(
 							  'out'           => array( '#showforum=(.+?)(&|$)#i', 'forum/$1-#{__title__}/$2' ),
 							  'in'            => array( 'regex'   => '#^/forum/(\d+?)-#i',
 													    'matches' => array( array( 'showforum', '$1' ) ) ) ),
-					
+
+	'showtopicunread'=> array( 'app'		      => 'forums',
+							   'allowRedirect'    => 1,
+							   'out'              => array( '#showtopic=(.+?)(?:&|&amp;)view=getnewpost(&|$)#i', 'topic/$1-#{__title__}/unread/$2' ),
+							   'in'               => array( 'regex'   => '#^/topic/(\d+?)-([^/]+?)/unread(/|$)#i',
+												            'matches' => array( array( 'showtopic', '$1' ),
+																				array( 'view', 'getnewpost' ) ) ) ),
+																				
+	'showtopicnextunread'=> array( 'app'		      => 'forums',
+								   'allowRedirect'    => 1,
+								   'out'              => array( '#showtopic=(.+?)(?:&|&amp;)view=getnextunread(&|$)#i', 'topic/$1-#{__title__}/nextunread/$2' ),
+								   'in'               => array( 'regex'   => '#^/topic/(\d+?)-([^/]+?)/nextunread(/|$)#i',
+													            'matches' => array( array( 'showtopic', '$1' ),
+																					array( 'view', 'getnextunread' ) ) ) ),
+
 	'showtopic'     => array( 'app'		      => 'forums',
 							  'allowRedirect' => 1,
 							  'out'           => array( '#showtopic=(.+?)(&|$)#i', 'topic/$1-#{__title__}/$2' ),
 							  'in'            => array( 'regex'   => '#^/topic/(\d+?)-#i',
 												        'matches' => array( array( 'showtopic', '$1' ) ) ) ),
+
+	'acteqst'       => array( 'app'		      => 'forums',
+							  'allowRedirect' => 1,
+							  'out'           => array( '#act=ST(.*?)&t=(.+?)(&|$)#i', 'topic/$2-#{__title__}/$3' ),
+							  'in'            => array( 'regex'   => '#^notavalidrequest$#i',
+												        'matches' => array( array( 'showtopic', '0' ) ) ) ),
 							
 	'act=idx'       => array( 'app'		      => 'forums',
 							  'allowRedirect' => 0,
diff --git a/upload/admin/applications/forums/extensions/index.html b/upload/admin/applications/forums/extensions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/index.html
+++ b/upload/admin/applications/forums/extensions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/like/forums.php b/upload/admin/applications/forums/extensions/like/forums.php
new file mode 100644
index 00000000..86426d48
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/like/forums.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * @file		forums.php 	Forums like class (forums application)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
+ * @since		15th Feb 2011
+ * $LastChangedDate: 2011-09-30 05:21:05 -0400 (Fri, 30 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9571 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		like_forums_forums_composite
+ * @brief		Forums like class (forums application)
+ */
+class like_forums_forums_composite extends classes_like_composite
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make registry objects */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		if ( ! $this->registry->isClassLoaded('class_forums') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/forums/class_forums.php', 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+			$this->registry->getClass('class_forums')->forumsInit();
+		}
+		
+		/* Init */
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
+		$this->lang->loadLanguageFile( array( 'public_forums', 'public_topic' ), 'forums' );
+	}
+	
+	/**
+	 * Fetch the template group
+	 * 
+	 * @return	@e string
+	 */
+	public function skin()
+	{
+		return 'forum';
+	}
+	
+	/**
+	 * Return an array of acceptable frequencies
+	 * Possible: immediate, offline, daily, weekly
+	 * 
+	 * @return	@e array
+	 */
+	public function allowedFrequencies()
+	{
+		return array( 'immediate', 'offline', 'daily', 'weekly' );
+	}
+	
+	/**
+	 * Return types of notification available for this item
+	 * 
+	 * @return	@e array	array( key, human readable )
+	 */
+	public function getNotifyType()
+	{
+		return array( 'forums', $this->lang->words['follow_notify_forums'] );
+	}
+	
+	/**
+	 * Gets the vernacular (like or follow)
+	 *
+	 * @return	@e string
+	 */
+	public function getVernacular()
+	{
+		return 'follow_f';
+	}
+	
+	/**
+	 * Check notifications that are to be sent to make sure they're valid and that
+	 * 
+	 * @param	array		$metaData		like_ DB data and like owner member data
+	 * @return	@e boolean
+	 */
+	public function notificationCanSend( $metaData )
+	{
+		$forum = $this->registry->getClass('class_forums')->getForumById( $metaData['like_rel_id'] );
+		
+		/* Set member */
+		$this->registry->getClass('class_forums')->setMemberData( $data );
+		
+		$result = $this->registry->getClass('class_forums')->forumsCheckAccess( $forum['id'], 0, 'forum', array(), true );
+		
+		/* reset */
+		$this->registry->getClass('class_forums')->setMemberData( $this->memberData );
+		
+		if ( ! $result )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Builds the notification data via the app class
+	 * 
+	 * @param	array		$data		like_ DB data and like owner member data
+	 * @param	string		$type		Types of notifications to send
+	 * @return	@e array	array( notification_key, notification_url, email_template, email_subject, build_message_array )
+	 * @see		allowedFrequencies()
+	 */
+	public function buildNotificationData( $data, $type )
+	{
+		$forum = array_merge( $data, $this->registry->permissions->parse( $data ) );
+		$fFurl = $this->registry->getClass('output')->buildSEOUrl( 'showforum=' . $forum['id'], 'publicNoSession', $forum['name_seo'], 'showforum' );
+		$group = $this->caches['group_cache'][ $data['member_group_id'] ];
+		
+		/* Topic has been posted in since last digest? */
+		if ( $forum['last_post'] <= $data['like_notify_sent'] )
+		{
+			return false;
+		}
+		
+		/* Set member */
+		$this->registry->getClass('class_forums')->setMemberData( $data );
+		
+		$result = $this->registry->getClass('class_forums')->forumsCheckAccess( $forum['id'], 0, 'forum', array(), true );
+		
+		/* reset */
+		$this->registry->getClass('class_forums')->setMemberData( $this->memberData );
+		
+		if ( ! $result )
+		{
+			return false;
+		}
+		
+		/* build email unless cached */
+		if ( empty( $this->_cache['bndf'][ $forum['id'] ] ) )
+		{
+			$othersPosted = false;
+			$topics       = $this->registry->getClass('topics')->getTopics( array( 'forumId'       => $forum['id'],
+														         'topicType'     => 'visible',
+																 'dateIsGreater' => $data['like_notify_sent'],
+																 'getFirstPost'	 => true,
+														         'sortField'     => 'tid',
+														         'sortOrder' 	 => 'asc' ) );
+			
+			foreach( $topics as $pid => $topic )
+			{
+				/* Don't send if it's just us... */
+				if ( $data['like_member_id'] != $topic['starter_id'] )
+				{
+					$othersPosted = true;
+				}			
+				
+				$post_output .= "<br />-------------------------------------------<br />"
+				             .  $this->lang->words['topic_langbit'] . ": " . $topic['title'] . " ( ".  $topic['starter_name'] . " -- " . ipsRegistry::getClass('class_localization')->getDate( $topic['start_date'], 'SHORT' ) . ")<br />"
+				             .  $this->registry->getClass('output')->buildSEOUrl( 'showtopic=' . $topic['tid'], 'publicNoSession', $topic['title_seo'], 'showtopic' )
+							 .  "<br />............................................<br />"
+							 .  $topic['post'] . "<br /><br />";
+			}
+			
+			/* ensure we have something to send */
+			if ( ! $post_output )
+			{
+				return false;
+			}
+								
+			/* Process it */
+			$main_output = $this->lang->words['forum_langbit'] .  ":" . $forum['name'] . ")<br />"
+						 . "=====================================<br />"
+						 . $post_output
+						 . "<br />=====================================<br />";
+						 
+			$this->_cache['bndf'][ $forum['id'] ] = $main_output;
+		}
+		else
+		{
+			$othersPosted = true;
+			$main_output  = $this->_cache['bndf'][ $forum['id'] ];
+		}
+		
+		if ( $othersPosted )
+		{
+			/* Return array */		
+			return array( 'notification_key'	    => 'followed_forums_digest',
+		        		  'notification_url'		=> $fFurl,
+		        		  'email_template'			=> ( $data['like_notify_freq'] == 'daily' ) ? 'digest_forum_daily' : 'digest_forum_weekly',
+		        		  'email_subject'	    	=> ( $data['like_notify_freq'] == 'daily' ) ? $this->lang->words['subject__digest_forum_daily'] : $this->lang->words['subject__digest_forum_weekly'],
+		        		  'build_message_array'		=> array( 'URL'  	    => $fFurl,
+															  'TITLE'		=> $forum['name'],
+															  'NAME'		=> '-member:members_display_name-',
+															  'FORUM_NAME'	=> $forum['name'],
+															  'FORUM_ID'	=> $forum['id'],
+															  'CONTENT'		=> $main_output ) );
+		}
+		
+	}
+	 
+	/**
+	 * Fetches joins for fetching data
+	 * 
+	 * @param	string		$field		DB field name (defaults to 'l.like_rel_id')
+	 * @return	@e array
+	 */
+	public function getDataJoins( $field='l.like_rel_id' )
+	{
+		return array( array( 'select' => 'f.*', 'from' => array( 'forums' => 'f'), 'where' => 'f.id=' . $field, 'type' => 'left' ),
+					  array( 'select' => 'p.*', 'from' => array( 'permission_index' => 'p'), 'where' => "p.perm_type_id=f.id AND p.app='forums' AND p.perm_type='forum'", 'type' => 'left' )  );
+	}
+	
+	/**
+	 * Returns the type of item
+	 * 
+	 * @param	mixed		$relId			Relationship ID or array of IDs
+	 * @param	array		$selectType		Array of meta to select (title, url, type, parentTitle, parentUrl, parentType) null fetches all
+	 * @return	@e array	Meta data
+	 */
+	public function getMeta( $relId, $selectType=null )
+	{
+		$return    = array();
+		$isNumeric = false;
+		
+		if ( is_numeric( $relId ) )
+		{
+			$relId     = array( intval($relId) );
+			$isNumeric = true;
+		}
+		
+		$this->DB->build( array( 'select' => 'f.*',
+								 'from'   => array( 'forums' => 'f' ),
+								 'where'  => 'f.id IN (' . implode( ',', $relId ) . ')',
+								 'add_join' => array( array( 'select' => 'p.id as parent_fid, p.name as parent_name, p.name_seo as parent_name_seo',
+															 'from'   => array( 'forums' => 'p' ),
+															 'where'  => 'p.id=f.parent_id',
+															 'type'   => 'left'  ) ) ) );
+		
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			/* Title */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'title', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.title'] = $row['name'];
+			} 
+			
+			/* URL */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'url', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.url'] = $this->registry->output->buildSEOUrl( "showforum=" . $row['id'], "public", $row['name_seo'], "showforum" );
+			}
+			
+			/* Type */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'type', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.type'] = $this->lang->words['follow_forum'];
+			} 
+			
+			/* Parent title */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentTitle', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.parentTitle'] = ( ! empty( $row['parent_name'] ) ) ? $row['parent_name'] : null;
+			} 
+			
+			/* Parent url */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentTitle', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.parentUrl'] = ( ! empty( $row['parent_name'] ) ) ? $this->registry->output->buildSEOUrl( "showforum=" . $row['parent_fid'], "public", $row['parent_name_seo'], "showforum" ) : null;
+			} 
+			
+			/* Parent Type */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentType', $selectType ) ) )
+			{
+				$return[ $row['id'] ]['like.parentType'] = '';
+			} 
+		}
+		
+		return ( $isNumeric === true ) ? array_pop( $return ) : $return;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/like/index.html b/upload/admin/applications/forums/extensions/like/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/like/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/like/topics.php b/upload/admin/applications/forums/extensions/like/topics.php
new file mode 100644
index 00000000..2401ef55
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/like/topics.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ * @file		topics.php 	Topics like class (forums application)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * $LastChangedDate: 2011-10-05 16:14:58 -0400 (Wed, 05 Oct 2011) $
+ * @version		v3.2.3
+ * $Revision: 9584 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		like_forums_topics_composite
+ * @brief		Topics like class (forums application)
+ */
+class like_forums_topics_composite extends classes_like_composite
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make registry objects */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		if ( ! $this->registry->isClassLoaded('class_forums') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/forums/class_forums.php', 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+			$this->registry->getClass('class_forums')->forumsInit();
+		}
+		
+		/* Init */
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
+		$this->lang->loadLanguageFile( array( 'public_forums', 'public_topic' ), 'forums' );
+	}
+	
+	/**
+	 * Fetch the template group
+	 * 
+	 * @return	@e string
+	 */
+	public function skin()
+	{
+	     return 'topic';
+	}	
+	
+	/**
+	 * Return an array of acceptable frequencies
+	 * Possible: immediate, offline, daily, weekly
+	 * 
+	 * @return	@e array
+	 */
+	public function allowedFrequencies()
+	{
+		return array( 'immediate', 'offline', 'daily', 'weekly' );
+	}
+	
+	/**
+	 * Return types of notification available for this item
+	 * 
+	 * @return	@e array	array( key, human readable )
+	 */
+	public function getNotifyType()
+	{
+		return array( 'topics', $this->lang->words['follow_notify_topics'] );
+	}
+	
+	/**
+	 * Gets the vernacular (like or follow)
+	 *
+	 * @return	@e string
+	 */
+	public function getVernacular()
+	{
+		return 'follow_t';
+	}
+	
+	/**
+	 * Check notifications that are to be sent to make sure they're valid and that
+	 * 
+	 * @param	array		$metaData		like_ DB data and like owner member data
+	 * @return	@e boolean
+	 */
+	public function notificationCanSend( $metaData )
+	{
+		/* Digests are checked in buildNotificationData */
+		$topic = $this->registry->getClass('topics')->getTopicById( $metaData['like_rel_id'] );
+		$forum = $this->registry->getClass('class_forums')->getForumById( $topic['forum_id'] );
+		
+		/* Set member */
+		$this->registry->getClass('class_forums')->setMemberData( $metaData );
+		
+		$result = $this->registry->getClass('class_forums')->forumsCheckAccess( $forum['id'], 0, 'forum', $topic, true );
+		
+		/* reset */
+		$this->registry->getClass('class_forums')->setMemberData( $this->memberData );
+		
+		if ( ! $result )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Function to let plugins determine if a notification should not be sent.  Return false to send notification, or true to skip sending it.
+	 * 
+	 * @param	array	Notification data
+	 * @return	@e bool
+	 */
+ 	public function excludeNotification( $row )
+ 	{
+ 		if ( $row['like_notify_freq'] == 'offline' AND $row['last_activity'] < $row['like_notify_sent'] )
+ 		{
+ 			return true;
+ 		}
+ 		
+ 		return false;
+ 	}
+	
+	/**
+	 * Builds the notification data via the app class
+	 * 
+	 * @param	array		$data		like_ DB data and like owner member data
+	 * @param	string		$type		Types of notifications to send
+	 * @return	@e array	array( notification_key, notification_url, email_template, email_subject, build_message_array )
+	 * @see		allowedFrequencies()
+	 */
+	public function buildNotificationData( $data, $type )
+	{
+		$topic     = $data;
+		$forum     = $this->registry->getClass('class_forums')->getForumById( $topic['forum_id'] );
+		$flag      = $this->registry->class_forums->fetchHiddenTopicType( $topic );
+		$tFurl     = $this->registry->getClass('output')->buildSEOUrl( 'showtopic=' . $topic['tid'], 'publicNoSession', $topic['title_seo'], 'showtopic' );
+		$group     = $this->caches['group_cache'][ $data['member_group_id'] ];
+		
+		/* Topic has been posted in since last digest? */
+		if ( $topic['last_post'] <= $data['like_notify_sent'] )
+		{
+			return false;
+		}
+		
+		/* Unapproved or deleted */
+		if ( $flag != 'visible' )
+		{
+			return false;
+		}
+		
+		/* Set member */
+		$this->registry->getClass('class_forums')->setMemberData( $data );
+		
+		$result = $this->registry->getClass('class_forums')->forumsCheckAccess( $forum['id'], 0, 'forum', $topic, true );
+		
+		/* reset */
+		$this->registry->getClass('class_forums')->setMemberData( $this->memberData );
+		
+		if ( ! $result )
+		{
+			return false;
+		}
+			
+		/* build email unless cached */
+		if ( empty( $this->_cache['bnd'][ $topic['tid'] ] ) )
+		{
+			$othersPosted = false;
+			$posts        = $this->registry->getClass('topics')->getPosts( array( 'topicId'       => $topic['tid'],
+														        'postType'      => 'visible',
+																'dateIsGreater' => $data['like_notify_sent'],
+														        'sortField'     => 'pid',
+														        'sortOrder' 	=> 'asc' ) );
+			
+			foreach( $posts as $pid => $post )
+			{
+				/* Don't send if it's just us... */
+				if ( $data['like_member_id'] != $post['author_id'] )
+				{
+					$othersPosted = true;
+				}
+				
+				$post_output .= "<br />-------------------------------------------<br />"
+							 .  $post['author_name'] . " -- " . ipsRegistry::getClass( 'class_localization')->getDate( $post['post_date'], 'SHORT' ) . "<br />" . $post['post'] . "<br /><br />";
+			}
+			
+			/* ensure we have something to send */
+			if ( ! $post_output )
+			{
+				return false;
+			}
+								
+			/* Process it */
+			$main_output .= $this->lang->words['topic_langbit'] . ": " . $topic['title'] . " (" . $this->lang->words['forum_langbit'] . ":" . $forum['name'] . ")<br />"
+						 .  $tFurl . "<br />"
+						 .  "=====================================<br />"
+						 .  $post_output
+						 .  "<br />=====================================<br />";
+			
+			$this->_cache['bnd'][ $topic['tid'] ] = $main_output;
+		}
+		else
+		{
+			$othersPosted = true;
+			$main_output  = $this->_cache['bnd'][ $topic['tid'] ];
+		}
+		
+		if ( $othersPosted )
+		{
+			/* Return array */		
+			return array( 'notification_key'	    => 'followed_topics_digest',
+		        		  'notification_url'		=> $tFurl,
+		        		  'email_template'			=> ( $data['like_notify_freq'] == 'daily' ) ? 'digest_topic_daily' : 'digest_topic_weekly',
+		        		  'email_subject'	    	=> ( $data['like_notify_freq'] == 'daily' ) ? $this->lang->words['subject__digest_topic_daily'] : $this->lang->words['subject__digest_topic_weekly'],
+		        		  'build_message_array'		=> array( 'URL'  	    => $tFurl,
+															  'TITLE'		=> $topic['title'],
+															  'NAME'		=> '-member:members_display_name-',
+															  'CONTENT'		=> $main_output ) );
+		}
+		
+	}
+	
+	/**
+	 * Fetches joins for fetching data
+	 * 
+	 * @param	string		$field		DB field name (defaults to 'l.like_rel_id')
+	 * @return	@e array
+	 */
+	public function getDataJoins( $field='l.like_rel_id' )
+	{
+		return array( array( 'select' => 't.*', 'from' => array( 'topics' => 't'), 'where' => 't.tid=' . $field, 'type' => 'left' ) );
+	}
+	
+	/**
+	 * Returns the type of item
+	 * 
+	 * @param	mixed		$relId			Relationship ID or array of IDs
+	 * @param	array		$selectType		Array of meta to select (title, url, type, parentTitle, parentUrl, parentType) null fetches all
+	 * @return	@e array	Meta data
+	 */
+	public function getMeta( $relId, $selectType=null )
+	{
+		$return    = array();
+		$isNumeric = false;
+		
+		if ( is_numeric( $relId ) )
+		{
+			$relId     = array( intval($relId) );
+			$isNumeric = true;
+		}
+
+		$this->DB->build( array( 'select' => 't.*',
+								 'from'   => array( 'topics' => 't' ),
+								 'where'  => 't.tid IN (' . implode( ',', $relId ) . ')',
+								 'add_join' => array( array( 'select' => 'id as parent_fid, p.name as parent_name, p.name_seo as parent_name_seo',
+															 'from'   => array( 'forums' => 'p' ),
+															 'where'  => 'p.id=t.forum_id',
+															 'type'   => 'left'  ) ) ) );
+		
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			/* Title */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'title', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.title'] = $row['title'];
+			} 
+			
+			/* URL */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'url', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.url'] = $this->registry->output->buildSEOUrl( "showtopic=" . $row['tid'], "public", $row['title_seo'], "showtopic" );
+			}
+			
+			/* Type */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'type', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.type'] = $this->lang->words['follow_topic'];
+			} 
+			
+			/* Parent title */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentTitle', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.parentTitle'] = ( ! empty( $row['parent_name'] ) ) ? $row['parent_name'] : null;
+			} 
+			
+			/* Parent url */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentTitle', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.parentUrl'] = ( ! empty( $row['parent_name'] ) ) ? $this->registry->output->buildSEOUrl( "showforum=" . $row['parent_fid'], "public", $row['parent_name_seo'], "showforum" ) : null;
+			} 
+			
+			/* Parent Type */
+			if ( $selectType === null OR ( is_array( $selectType ) AND in_array( 'parentType', $selectType ) ) )
+			{
+				$return[ $row['tid'] ]['like.parentType'] = $this->lang->words['follow_forum'];
+			} 
+		}
+		
+		return ( $isNumeric === true ) ? array_pop( $return ) : $return;
+	}
+	
+	/**
+	 * Returns the join table for sorting when using 'view content I follow'
+	 * core_like has the alias "l".
+	 */
+	public function getSearchJoinAndSortBy()
+	{
+		return array( 'from'  => array( 'topics' => 't' ),
+					  'where' => 'l.like_rel_id=t.tid',
+					  'order' => 't.last_post' );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/memberSync.rename.php b/upload/admin/applications/forums/extensions/memberSync.rename.php
index 7eed16db..6a8a6630 100644
--- a/upload/admin/applications/forums/extensions/memberSync.rename.php
+++ b/upload/admin/applications/forums/extensions/memberSync.rename.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum permissions mappings
- * Last Updated: $Date: 2010-04-26 14:40:44 -0400 (Mon, 26 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6179 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $ 
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -28,18 +28,17 @@ if ( ! defined( 'IN_IPB' ) )
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6179 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $ 
+ */
 class forumsMemberSync
 {
 	/**
 	 * Registry reference
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $registry;
@@ -47,9 +46,8 @@ class forumsMemberSync
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct()
 	{
 		$this->registry = ipsRegistry::instance();
@@ -58,10 +56,9 @@ class forumsMemberSync
 	/**
 	 * This method is run when a member is flagged as a spammer
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onSetAsSpammer( $member )
 	{
 
@@ -70,10 +67,9 @@ class forumsMemberSync
 	/**
 	 * This method is run when a member is un-flagged as a spammer
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onUnSetAsSpammer( $member )
 	{
 
@@ -82,10 +78,9 @@ class forumsMemberSync
 	/**
 	 * This method is run when a new account is created
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onCreateAccount( $member )
 	{
 
@@ -94,9 +89,8 @@ class forumsMemberSync
 	/**
 	 * This method is run when the register form is displayed to a user
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onRegisterForm()
 	{
 
@@ -105,10 +99,9 @@ class forumsMemberSync
 	/**
 	 * This method is ren when a user successfully logs in
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onLogin( $member )
 	{
 
@@ -117,10 +110,9 @@ class forumsMemberSync
 	/**
 	 * This method is called after a member account has been removed
 	 *
-	 * @access	public
 	 * @param	string	$ids	SQL IN() clause
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onDelete( $mids )
 	{
 
@@ -129,11 +121,10 @@ class forumsMemberSync
 	/**
 	 * This method is called after a member's account has been merged into another member's account
 	 *
-	 * @access	public
 	 * @param	array	$member		Member account being kept
 	 * @param	array	$member2	Member account being removed
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onMerge( $member, $member2 )
 	{
 
@@ -146,7 +137,7 @@ class forumsMemberSync
 	 * @param  string   $new_email  New email address
 	 * @param  string	$old_email	Old email address
 	 * @return void
-	 **/
+	 */
 	public function onEmailChange( $id, $new_email, $old_email )
 	{
 
@@ -155,11 +146,10 @@ class forumsMemberSync
 	/**
 	 * This method is run after a users password is successfully changed
 	 *
-	 * @access	public
 	 * @param	integer	$id						Member ID
 	 * @param	string	$new_plain_text_pass	The new password
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onPassChange( $id, $new_plain_text_pass )
 	{
 
@@ -170,10 +160,9 @@ class forumsMemberSync
 	 * $member will contain EITHER 'member_id' OR 'email' depending on what data was passed to
 	 * IPSMember::save().
 	 *
-	 * @access	public
 	 * @param	array 	$member		Array of values that were changed
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onProfileUpdate( $member )
 	{
 
@@ -182,12 +171,11 @@ class forumsMemberSync
 	/**
 	 * This method is run after a users group is successfully changed
 	 *
-	 * @access	public
 	 * @param	integer	$id			Member ID
 	 * @param	integer	$new_group	New Group ID
 	 * @param	integer	$old_group	Old Group ID
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onGroupChange( $id, $new_group, $old_group )
 	{
 
@@ -196,11 +184,10 @@ class forumsMemberSync
 	/**
 	 * This method is run after a users display name is successfully changed
 	 *
-	 * @access	public
 	 * @param	integer	$id			Member ID
 	 * @param	string	$new_name	New display name
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onNameChange( $id, $new_name )
 	{
 
@@ -209,10 +196,9 @@ class forumsMemberSync
 	/**
 	 * This method is run when a user logs out
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onLogOut( $member )
 	{
 		
diff --git a/upload/admin/applications/forums/extensions/modcp/index.html b/upload/admin/applications/forums/extensions/modcp/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/modcp/plugin_announcements.php b/upload/admin/applications/forums/extensions/modcp/plugin_announcements.php
new file mode 100644
index 00000000..add69a24
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/plugin_announcements.php
@@ -0,0 +1,451 @@
+<?php
+/**
+ * @file		plugin_announcements.php 	Moderator control panel plugin: manage announcements
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/18/2011
+ * $LastChangedDate: 2011-09-26 15:52:07 -0400 (Mon, 26 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9550 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_forums_announcements
+ * @brief		Moderator control panel plugin: manage announcements
+ * 
+ */
+class plugin_forums_announcements
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'announcements';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'announcements';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Doing something else?
+		//-----------------------------------------
+		
+		switch( $this->request['_do'] )
+		{
+			case 'delete':
+				return $this->_delete();
+			break;
+			
+			case 'add':
+			case 'edit':
+				return $this->_form( $this->request['_do'] );
+			break;
+			
+			case 'save':
+				return $this->_save( $this->request['type'] );
+			break;
+		}
+
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$announcements	= array();
+
+		//-----------------------------------------
+		// Get announcements
+		//-----------------------------------------
+		
+		$this->DB->build( array(
+								'select'	=> 'a.*',
+								'from'		=> array( 'announcements' => 'a' ),
+								'order'		=> 'a.announce_end DESC',
+								'add_join'	=> array(
+													array( 'select'	=> 'm.member_id, m.members_display_name, m.member_group_id, m.members_seo_name',
+															'from'	=> array( 'members' => 'm' ),
+															'where'	=> 'm.member_id=a.announce_member_id',
+															'type'	=> 'left'
+														)
+													)
+								)		);
+		$this->DB->execute();
+		
+		while ( $r = $this->DB->fetch() )
+		{
+			$r['announce_seo_title']	= IPSText::makeSeoTitle( $r['announce_title'] );
+			
+			if ( $r['announce_forum'] == '*' )
+			{
+				$r['announce_forum_show'] = $this->lang->words['announce_page_allforums'];
+			}
+			else
+			{
+				$tmp_forums = explode(",",$r['announce_forum']);
+
+				if ( is_array( $tmp_forums ) and count($tmp_forums) )
+				{
+					if ( count($tmp_forums) > 5 )
+					{
+						$r['announce_forum_show'] = count($tmp_forums) . ' ' . $this->lang->words['announce_page_numforums'];
+					}
+					else
+					{
+						$r['_forums'] = array();
+						
+						foreach( $tmp_forums as $id )
+						{
+							$r['_forums'][] = array( $id, $this->registry->getClass('class_forums')->forum_by_id[ $id ]['name'] );
+						}
+					}
+				}	
+			}
+
+			$announcements[] = $r;
+		}
+		
+		return $this->registry->getClass('output')->getTemplate('modcp')->modAnnouncements( $announcements );
+	}
+	
+	/**
+	 * Delete announcement
+	 *
+	 * @return	@e void
+	 */
+	protected function _delete()
+	{
+		$announce_id	= intval( $this->request['announce_id'] );
+
+		//-----------------------------------------
+		// Delete it
+		//-----------------------------------------
+		
+		$this->DB->delete( 'announcements', 'announce_id=' . $announce_id );
+		
+		//-----------------------------------------
+		// Update cache and redirect
+		//-----------------------------------------
+		
+		$this->registry->cache()->rebuildCache( 'announcements', 'forums' );
+		
+		$this->registry->getClass('output')->redirectScreen( $this->lang->words['announcement_deleted'], $this->settings['base_url']."app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums" );
+	}
+	
+	/**
+	 * Show announcement form
+	 *
+	 * @param	string	$type	Add or edit
+	 * @param	string	$msg	Message to show
+	 * @return	@e string
+	 */
+	protected function _form( $type='add', $msg='' )
+	{
+		//-----------------------------------------
+		// INIT the editor/bbcode classes
+		//-----------------------------------------
+
+		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'announcement';
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		if ( $type == 'add' )
+		{
+			$announce	= array( 'announce_active' => 1, 'announce_id' => 0 );
+		}
+		else
+		{
+			$announce_id				= intval( $this->request['announce_id'] );
+			$announce					= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'announcements', 'where' => 'announce_id='.$announce_id ) );
+			$announce['announce_forum']	= explode( ",", $announce['announce_forum'] );
+			$announce['announce_start']	= $announce['announce_start'] ? strftime( '%m-%d-%Y', $announce['announce_start'] ) : '';
+			$announce['announce_end']	= $announce['announce_end']   ? strftime( '%m-%d-%Y', $announce['announce_end'] ) : '';
+		}
+
+		//-----------------------------------------
+		// Do we have _POST?
+		//-----------------------------------------
+		
+		foreach( array( 'announce_html_enabled', 'announce_title', 'announce_post', 'announce_start', 'announce_end', 'announce_forum', 'announce_active' ) as $bit )
+		{
+			if ( !empty($this->request[$bit]) )
+			{
+				$announce[ $bit ]	= $this->request[ $bit ];
+			}
+			else if( !isset($announce[ $bit] ) )
+			{
+				$announce[ $bit ]	= null;
+			}
+		}
+		
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor			= new $classToLoad();
+		$editor->setAllowHtml( $announce['announce_html_enabled'] );
+
+		$_editor		= $editor->show( 'announce_post', array( 'type' => 'full' ), $announce['announce_post'] );
+
+		//-----------------------------------------
+		// Forums
+		//-----------------------------------------
+		
+		$forum_html	= "<option value='*'>" . $this->lang->words['announce_form_allforums'] . "</option>" . $this->registry->getClass('class_forums')->forumsForumJump( false, true, true );
+		
+		//-----------------------------------------
+		// Save forums?
+		//-----------------------------------------
+		
+		if ( is_array( $announce['announce_forum'] ) and count( $announce['announce_forum'] ) )
+		{
+			foreach( $announce['announce_forum'] as $f )
+			{
+				$forum_html = preg_replace( "#option\s+value=[\"'](".preg_quote($f,'#').")[\"']#i", "option value='\\1' selected='selected'", $forum_html );
+			}
+		}
+		
+		$announce['announce_active_checked'] = $announce['announce_active'] 	  ? 'checked="checked"'  : '';
+		$announce['html_checkbox']			 = $announce['announce_html_enabled'] ? "checked='checked' " : '';
+		$announce['nlbr_checkbox']			 = $announce['announce_nlbr_enabled'] ? "checked='checked' " : '';
+
+		return $this->registry->getClass('output')->getTemplate('modcp')->modAnnounceForm( $announce, $forum_html, $type, $_editor, $msg );
+	}
+
+	/**
+	 * Add or update an announcement
+	 *
+	 * @param	string	$type	add|edit
+	 * @return	@e void
+	 */
+	protected function _save( $type='add' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$forums_to_save	= "";
+		$start_date		= 0;
+		$end_date		= 0;
+		$announce_id	= intval( $this->request['announce_id'] );
+
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		if ( ! $this->request['announce_title'] or ! $this->request['announce_post'] )
+		{
+			return $this->_form( $type, $this->lang->words['announce_error_title'] );
+		}
+		
+		//-----------------------------------------
+		// Get forums to add announce in
+		//-----------------------------------------
+		
+		if ( is_array( $this->request['announce_forum'] ) and count( $this->request['announce_forum'] ) )
+		{
+			if ( in_array( '*', $this->request['announce_forum'] ) )
+			{
+				$forums_to_save = '*';
+			}
+			else
+			{
+				$forums_to_save = implode( ",", $this->request['announce_forum'] );
+			}
+		}
+
+		if ( ! $forums_to_save )
+		{
+			return $this->_form( $type, $this->lang->words['announce_error_forums'] );
+		}
+		
+		//-----------------------------------------
+		// Check Dates
+		//-----------------------------------------
+		
+		if ( strstr( $this->request['announce_start'], '-' ) )
+		{
+			$start_array = explode( '-', $this->request['announce_start'] );
+			
+			if ( $start_array[0] and $start_array[1] and $start_array[2] )
+			{
+				if ( ! checkdate( $start_array[0], $start_array[1], $start_array[2] ) )
+				{
+					return $this->_form( $type, $this->lang->words['announce_error_date'] );
+				}
+			}
+
+			$start_date = mktime( 12, 0, 0, $start_array[0], $start_array[1], $start_array[2] );
+		}
+		
+		if ( strstr( $this->request['announce_end'], '-' ) )
+		{
+			$end_array = explode( '-', $this->request['announce_end']  );
+			
+			if ( $end_array[0] and $end_array[1] and $end_array[2] )
+			{
+				if ( ! checkdate( $end_array[0], $end_array[1], $end_array[2] ) )
+				{
+					return $this->_form( $type, $this->lang->words['announce_error_date'] );
+				}
+			}
+
+			$end_date = mktime( 12, 0, 0, $end_array[0], $end_array[1], $end_array[2] );
+		}
+		
+		//-----------------------------------------
+		// Sort out the content
+		//-----------------------------------------
+		
+		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor				= new $classToLoad();
+		$editor->setAllowBbcode( true );
+		$editor->setAllowHtml( intval($this->request['announce_html_enabled']) );
+
+		$announceContent	= $editor->process( $_POST['announce_post'] );
+
+		IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_html		= intval($this->request['announce_html_enabled']);
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br		= $this->request['announce_html_enabled'] ? $this->request['announce_nlbr_enabled'] : 0;
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'announcement';
+		
+		$announceContent	= IPSText::getTextClass( 'bbcode' )->preDbParse( $announceContent );
+
+		//-----------------------------------------
+		// Build save array
+		//-----------------------------------------
+		
+		$save_array = array( 'announce_title'			=> $this->request['announce_title'],
+							 'announce_post'			=> $announceContent,
+							 'announce_active'			=> $this->request['announce_active'] ? $this->request['announce_active'] : 0,
+							 'announce_forum'			=> $forums_to_save,
+							 'announce_html_enabled'	=> $this->request['announce_html_enabled'] ? $this->request['announce_html_enabled'] : 0,
+							 'announce_nlbr_enabled'	=> $this->request['announce_nlbr_enabled'] ? $this->request['announce_nlbr_enabled'] : 0,
+							 'announce_start'			=> $start_date,
+							 'announce_end'				=> $end_date
+						   );
+						   
+		//-----------------------------------------
+		// Save..
+		//-----------------------------------------
+		
+		if ( $type == 'add' )
+		{
+			$save_array['announce_member_id']	= $this->memberData['member_id'];
+			
+			$this->DB->insert( 'announcements', $save_array );
+		}
+		else
+		{
+			if ( $announce_id )
+			{
+				$this->DB->update( 'announcements', $save_array, 'announce_id=' . $announce_id );
+			}
+		}
+		
+		//-----------------------------------------
+		// Update cache
+		//-----------------------------------------
+		
+		$this->registry->cache()->rebuildCache( 'announcements', 'forums' );
+		
+		$this->registry->getClass('output')->redirectScreen( $this->lang->words['announcement_saved'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums" );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/modcp/plugin_deletedposts.php b/upload/admin/applications/forums/extensions/modcp/plugin_deletedposts.php
new file mode 100644
index 00000000..3c6d96d0
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/plugin_deletedposts.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * @file		plugin_deletedposts.php 	Moderator control panel plugin: show deleted posts
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/15/2011
+ * $LastChangedDate: 2011-05-31 14:07:00 -0400 (Tue, 31 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8930 $
+ */
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_forums_deletedposts
+ * @brief		Moderator control panel plugin: show deleted posts
+ * 
+ */
+class plugin_forums_deletedposts
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_topic' ), 'forums' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'deleted_content';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'deletedposts';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR $this->memberData['is_mod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+
+		//-----------------------------------------
+		// Get results
+		//-----------------------------------------
+
+		$st			= intval($this->request['st']);
+		$_filters	= $this->_getFilters();
+		$_filters	= array_merge( $_filters, array(
+													'postType'		=> array( 'sdelete', 'pdelete', 'oktoremove' ),
+													'getCount'		=> true,
+													'sortField'		=> 'pid',
+													'sortOrder'		=> 'desc',
+													'parse'			=> true,
+													'limit'			=> 10,
+													'offset'		=> $st
+								)					);
+
+		$this->registry->getClass('topics')->setPermissionData();
+		$posts	= $this->registry->getClass('topics')->getPosts( $_filters );
+		$total	= $this->registry->getClass('topics')->getPostsCount();
+		
+		/* Got soft delete pids? */
+		$other_data	= array();
+		
+		if ( is_array( $posts ) AND count( $posts ) )
+		{
+			$other_data	= IPSDeleteLog::fetchEntries( array_keys($posts), 'post', false );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total,
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=deletedposts",
+															)		);
+
+		return $this->registry->output->getTemplate('modcp')->deletedPosts( $posts, $other_data, $pages );
+	}
+
+	/**
+	 * Retrieve forum ids we can moderate in for getTopics() call
+	 * 
+	 * @return	@e array
+	 */
+ 	protected function _getFilters()
+ 	{
+ 		$_return	= array();
+ 		
+ 		if( $this->memberData['g_is_supmod'] )
+ 		{
+ 			$_return['skipForumCheck']	= true;
+ 		}
+ 		else
+ 		{
+ 			$_return['forumId']			= array( 0 );
+ 			
+ 			if( count($this->memberData['forumsModeratorData']) )
+ 			{
+ 				foreach( $this->memberData['forumsModeratorData'] as $fid => $forum )
+ 				{
+ 					if( $forum['delete_post'] )
+ 					{
+ 						$_return['forumId'][]	= $fid;
+ 					}
+ 				}
+ 			}
+ 		}
+ 		
+ 		return $_return;
+ 	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/modcp/plugin_deletedtopics.php b/upload/admin/applications/forums/extensions/modcp/plugin_deletedtopics.php
new file mode 100644
index 00000000..a4088df9
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/plugin_deletedtopics.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * @file		plugin_deletedtopics.php 	Moderator control panel plugin: show deleted topics
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/15/2011
+ * $LastChangedDate: 2011-05-31 14:07:00 -0400 (Tue, 31 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8930 $
+ */
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_forums_deletedtopics
+ * @brief		Moderator control panel plugin: show deleted topics
+ * 
+ */
+class plugin_forums_deletedtopics
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Forums library object
+	 *
+	 * @var		$forums
+	 */
+	protected $forums;
+
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_forums' ), 'forums' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'deleted_content';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'deletedtopics';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR $this->memberData['is_mod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+		
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+		
+		$classToLoad	= IPSLib::loadActionOverloader( IPSLib::getAppDir('forums') . '/modules_public/forums/forums.php', 'public_forums_forums_forums' );
+		$this->forums	= new $classToLoad( $this->registry );
+		$this->forums->makeRegistryShortcuts( $this->registry );
+
+		$st			= intval($this->request['st']);
+		$_filters	= $this->_getFilters();
+		$_filters	= array_merge( $_filters, array(
+													'topicType'		=> array( 'sdelete', 'pdelete', 'oktoremove' ),
+													'getCount'		=> true,
+													'sortField'		=> 'tid',
+													'sortOrder'		=> 'desc',
+													'limit'			=> 10,
+													'offset'		=> $st
+								)					);
+
+		$this->registry->getClass('topics')->setPermissionData();
+		$topics	= $this->registry->getClass('topics')->getTopics( $_filters );
+		$total	= $this->registry->getClass('topics')->getTopicsCount();
+		$final	= array();
+		
+		//-----------------------------------------
+		// Format data
+		//-----------------------------------------
+
+		if( count( $topics ) )
+		{
+			foreach( $topics as $tid => $topic )
+			{
+				/* Have to preserve original forum id for linked topics */
+				if( $topic['state'] == 'link' )
+				{
+					$_originalForum		= $topic['forum_id'];
+				}
+				
+				$topic			= $this->_checkPermissions( $topic );
+				$topic			= $this->forums->renderEntry( $topic );
+				$topic['forum']	= $this->registry->class_forums->getForumById( $topic['forum_id'] );
+				
+				if( $topic['state'] == 'link' )
+				{
+					$topic['_toForum']	= $this->registry->class_forums->getForumById( $_originalForum );
+				}
+
+				$final[ $tid ]	= $topic;
+			}
+		}
+
+		$other_data	= array();
+		
+		if ( is_array( $topics ) AND count( $topics ) )
+		{
+			$other_data	= IPSDeleteLog::fetchEntries( array_keys($topics), 'topic', false );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total,
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=deletedtopics",
+															)		);
+		
+		return $this->registry->output->getTemplate('modcp')->deletedTopics( $final, $other_data, $pages );
+	}
+	
+	/**
+	 * Add permissions to the array
+	 *
+	 * @param	array 	$row	Array of topic data
+	 * @return	@e array
+	 */
+	protected function _checkPermissions( $row )
+	{
+		$row['permissions']								= array();
+
+		$row['permissions']['PostSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeletePosts( $row['forum_id'], array() );
+		$row['permissions']['PostSoftDeleteRestore']	= $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $row['forum_id'] );
+		$row['permissions']['PostSoftDeleteSee']		= $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $row['forum_id'] );
+		$row['permissions']['SoftDeleteReason']			= $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $row['forum_id'] );
+		$row['permissions']['SoftDeleteContent']		= $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $row['forum_id'] );
+		$row['permissions']['TopicSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeleteTopics( $row['forum_id'], array() );
+		$row['permissions']['TopicSoftDeleteRestore']	= $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $row['forum_id'] );
+		$row['permissions']['TopicSoftDeleteSee']		= $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $row['forum_id'] );
+		$row['permissions']['canQueue']					= $this->registry->getClass('class_forums')->canQueuePosts( $row['forum_id'] );
+		
+		return $row;
+	}
+	
+	/**
+	 * Retrieve forum ids we can moderate in for getTopics() call
+	 * 
+	 * @return	@e array
+	 */
+ 	protected function _getFilters()
+ 	{
+ 		$_return	= array();
+ 		
+ 		if( $this->memberData['g_is_supmod'] )
+ 		{
+ 			$_return['skipForumCheck']	= true;
+ 		}
+ 		else
+ 		{
+ 			$_return['forumId']			= array( 0 );
+ 			
+ 			if( count($this->memberData['forumsModeratorData']) )
+ 			{
+ 				foreach( $this->memberData['forumsModeratorData'] as $fid => $forum )
+ 				{
+ 					if( $forum['delete_topic'] )
+ 					{
+ 						$_return['forumId'][]	= $fid;
+ 					}
+ 				}
+ 			}
+ 		}
+ 		
+ 		return $_return;
+ 	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedposts.php b/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedposts.php
new file mode 100644
index 00000000..fe4bc36d
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedposts.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @file		plugin_unapprovedposts.php 	Moderator control panel plugin: show posts pending approval
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/15/2011
+ * $LastChangedDate: 2011-05-31 14:07:00 -0400 (Tue, 31 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8930 $
+ */
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_forums_unapprovedposts
+ * @brief		Moderator control panel plugin: show posts pending approval
+ * 
+ */
+class plugin_forums_unapprovedposts
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_topic' ), 'forums' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'unapproved_content';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'unapprovedposts';
+	}
+	
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR $this->memberData['is_mod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+		
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+
+		//-----------------------------------------
+		// Get results
+		//-----------------------------------------
+
+		$st		= intval($this->request['st']);
+		$_filters	= $this->_getFilters();
+		$_filters	= array_merge( $_filters, array(
+													'postType'		=> array( 'hidden' ),
+													'getCount'		=> true,
+													'sortField'		=> 'pid',
+													'sortOrder'		=> 'desc',
+													'parse'			=> true,
+													'limit'			=> 10,
+													'offset'		=> $st
+								)					);
+		
+		$this->registry->getClass('topics')->setPermissionData();
+		$posts	= $this->registry->getClass('topics')->getPosts( $_filters );
+		$total	= $this->registry->getClass('topics')->getPostsCount();
+		
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total,
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=unapprovedposts",
+															)		);
+
+		return $this->registry->output->getTemplate('modcp')->unapprovedPosts( $posts, $pages );
+	}
+
+	/**
+	 * Retrieve forum ids we can moderate in for getTopics() call
+	 * 
+	 * @return	@e array
+	 */
+ 	protected function _getFilters()
+ 	{
+ 		$_return	= array();
+ 		
+ 		if( $this->memberData['g_is_supmod'] )
+ 		{
+ 			$_return['skipForumCheck']	= true;
+ 		}
+ 		else
+ 		{
+ 			$_return['forumId']			= array( 0 );
+ 			
+ 			if( count($this->memberData['forumsModeratorData']) )
+ 			{
+ 				foreach( $this->memberData['forumsModeratorData'] as $fid => $forum )
+ 				{
+ 					if( $forum['post_q'] )
+ 					{
+ 						$_return['forumId'][]	= $fid;
+ 					}
+ 				}
+ 			}
+ 		}
+ 		
+ 		return $_return;
+ 	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedtopics.php b/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedtopics.php
new file mode 100644
index 00000000..5bfdc557
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/modcp/plugin_unapprovedtopics.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * @file		plugin_unapprovedtopics.php 	Moderator control panel plugin: show topics pending approval
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/15/2011
+ * $LastChangedDate: 2011-05-31 14:07:00 -0400 (Tue, 31 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8930 $
+ */
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_forums_unapprovedtopics
+ * @brief		Moderator control panel plugin: show topics pending approval
+ * 
+ */
+class plugin_forums_unapprovedtopics
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Forums library object
+	 *
+	 * @var		$forums
+	 */
+	protected $forums;
+
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_forums' ), 'forums' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'unapproved_content';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'unapprovedtopics';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR $this->memberData['is_mod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+		
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
+		//-----------------------------------------
+		// Get forum class
+		//-----------------------------------------
+		
+		$classToLoad	= IPSLib::loadActionOverloader( IPSLib::getAppDir('forums') . '/modules_public/forums/forums.php', 'public_forums_forums_forums' );
+		$this->forums	= new $classToLoad( $this->registry );
+		$this->forums->makeRegistryShortcuts( $this->registry );
+
+		$st			= intval($this->request['st']);
+		$_filters	= $this->_getFilters();
+		$_filters	= array_merge( $_filters, array(
+													'topicType'		=> array( 'hidden' ),
+													'getCount'		=> true,
+													'sortField'		=> 'tid',
+													'sortOrder'		=> 'desc',
+													'limit'			=> 10,
+													'offset'		=> $st
+								)					);
+
+		$this->registry->getClass('topics')->setPermissionData();
+		$topics	= $this->registry->getClass('topics')->getTopics( $_filters );
+		$total	= $this->registry->getClass('topics')->getTopicsCount();
+		$final	= array();
+		
+		//-----------------------------------------
+		// Format data
+		//-----------------------------------------
+
+		if( count( $topics ) )
+		{
+			foreach( $topics as $tid => $topic )
+			{
+				$topic			= $this->_checkPermissions( $topic );
+				$topic			= $this->forums->renderEntry( $topic );
+				$topic['forum']	= $this->registry->class_forums->getForumById( $topic['forum_id'] );
+				$final[ $tid ]	= $topic;
+			}
+		}
+		
+		$other_data	= array();
+		
+		if ( is_array( $topics ) AND count( $topics ) )
+		{
+			$other_data	= IPSDeleteLog::fetchEntries( array_keys($topics), 'topic', false );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total,
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=unapprovedtopics",
+															)		);
+		
+		return $this->registry->output->getTemplate('modcp')->unapprovedTopics( $final, $pages );
+	}
+	
+	/**
+	 * Add permissions to the array
+	 *
+	 * @param	array 	$row	Array of topic data
+	 * @return	@e array
+	 */
+	protected function _checkPermissions( $row )
+	{
+		$row['permissions']								= array();
+
+		$row['permissions']['PostSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeletePosts( $row['forum_id'], array() );
+		$row['permissions']['PostSoftDeleteRestore']	= $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $row['forum_id'] );
+		$row['permissions']['PostSoftDeleteSee']		= $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $row['forum_id'] );
+		$row['permissions']['SoftDeleteReason']			= $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $row['forum_id'] );
+		$row['permissions']['SoftDeleteContent']		= $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $row['forum_id'] );
+		$row['permissions']['TopicSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeleteTopics( $row['forum_id'], array() );
+		$row['permissions']['TopicSoftDeleteRestore']	= $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $row['forum_id'] );
+		$row['permissions']['TopicSoftDeleteSee']		= $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $row['forum_id'] );
+		$row['permissions']['canQueue']					= $this->registry->getClass('class_forums')->canQueuePosts( $row['forum_id'] );
+		
+		return $row;
+	}
+
+	/**
+	 * Retrieve forum ids we can moderate in for getTopics() call
+	 * 
+	 * @return	@e array
+	 */
+ 	protected function _getFilters()
+ 	{
+ 		$_return	= array();
+ 		
+ 		if( $this->memberData['g_is_supmod'] )
+ 		{
+ 			$_return['skipForumCheck']	= true;
+ 		}
+ 		else
+ 		{
+ 			$_return['forumId']			= array( 0 );
+ 			
+ 			if( count($this->memberData['forumsModeratorData']) )
+ 			{
+ 				foreach( $this->memberData['forumsModeratorData'] as $fid => $forum )
+ 				{
+ 					if( $forum['topic_q'] )
+ 					{
+ 						$_return['forumId'][]	= $fid;
+ 					}
+ 				}
+ 			}
+ 		}
+ 		
+ 		return $_return;
+ 	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/navigation/generate.php b/upload/admin/applications/forums/extensions/navigation/generate.php
new file mode 100644
index 00000000..f7babc8f
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/navigation/generate.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @file		generate.php 	Navigation plugin: attachments
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		3/8/2011
+ * $LastChangedDate: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8229 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_core_attachments
+ * @brief		Provide ability to share attachments via editor
+ */
+class navigation_forums
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct() 
+	{
+		$this->registry		=  ipsRegistry::instance();
+		$this->DB			=  $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		=  $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		=  $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			=  $this->registry->class_localization;
+		
+		if ( ! $this->registry->isClassLoaded('class_forums' ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+			$this->registry->getClass('class_forums')->strip_invisible = 1;
+			$this->registry->getClass('class_forums')->forumsInit();
+		}
+	}
+	
+	/**
+	 * Return the tab title
+	 *
+	 * @return	@e string
+	 */
+	public function getTabName()
+	{ 
+		return IPSLib::getAppTitle( 'forums' );
+	}
+	
+	/**
+	 * Returns navigation data
+	 * @return	array	array( array( 0 => array( 'title' => 'x', 'url' => 'x' ) ) );
+	 */
+	public function getNavigationData()
+	{
+		$blocks = array();
+		$links  = $this->_getData();
+			
+		/* Add to blocks */
+		$blocks[] = array( 'title' => '', 'links' => $links );
+		
+		return $blocks;
+	}
+	
+	/**
+	 * Fetches forum jump data
+	 *
+	 * @return	string
+	 */
+	private function _getData()
+	{
+		$depth_guide = 0;
+		$links		 = array();
+		
+		if( is_array($this->registry->class_forums->forum_cache['root'] ) AND count($this->registry->class_forums->forum_cache['root'] ) )
+		{
+			foreach($this->registry->class_forums->forum_cache['root'] as $forum_data )
+			{
+				if ( $forum_data['sub_can_post'] or ( isset($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) AND is_array($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) AND count($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) ) )
+				{
+					$forum_data['redirect_on'] = isset( $forum_data['redirect_on'] ) ? $forum_data['redirect_on'] : 0;
+					
+					if ( $forum_data['redirect_on'] == 1 )
+					{
+						continue;
+					}
+					
+					$links[] = array( 'important' => true, 'depth' => $depth_guide, 'title' => $forum_data['name'], 'url' => $this->registry->output->buildSEOUrl( 'showforum=' . $forum_data['id'], 'public', $forum_data['name_seo'], 'showforum' ) );
+					
+					if ( isset($this->registry->class_forums->forum_cache[ $forum_data['id'] ]) AND is_array($this->registry->class_forums->forum_cache[ $forum_data['id'] ] ) )
+					{
+						$depth_guide++;
+						
+						foreach($this->registry->class_forums->forum_cache[ $forum_data['id'] ] as $forum_data )
+						{
+							if ( $forum_data['redirect_on'] == 1 )
+							{
+								continue;
+							}						
+						
+							$links[] = array( 'depth' => $depth_guide, 'title' => $forum_data['name'], 'url' => $this->registry->output->buildSEOUrl( 'showforum=' . $forum_data['id'], 'public', $forum_data['name_seo'], 'showforum' ) );
+					
+							$links = $this->_getDataRecursively( $forum_data['id'], $links, $depth_guide );			
+						}
+						
+						$depth_guide--;
+					}
+				}
+			}
+		}
+		
+		return $links;
+	}
+	
+	/**
+	 * Internal helper function for forumsForumJump
+	 *
+	 * @param	integer	$root_id
+	 * @param	array	$links
+	 * @param	string	$depth_guide
+	 * @return	string
+	 */
+	private function _getDataRecursively( $root_id, $links=array(), $depth_guide=0 )
+	{
+		if ( isset( $this->registry->class_forums->forum_cache[ $root_id ] ) AND is_array($this->registry->class_forums->forum_cache[ $root_id ] ) )
+		{
+			$depth_guide++;
+			
+			foreach($this->registry->class_forums->forum_cache[ $root_id ] as $forum_data )
+			{
+				if ( $forum_data['redirect_on'] == 1 )
+				{
+					continue;
+				}
+				
+				$links[] = array( 'depth' => $depth_guide, 'title' => $forum_data['name'], 'url' => $this->registry->output->buildSEOUrl( 'showforum=' . $forum_data['id'], 'public', $forum_data['name_seo'], 'showforum' ) );
+				
+				$links = $this->_getDataRecursively( $forum_data['id'], $links, $depth_guide );
+			}
+		}
+		
+		
+		return $links;
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/navigation/index.html b/upload/admin/applications/forums/extensions/navigation/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/navigation/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/notifications.php b/upload/admin/applications/forums/extensions/notifications.php
index e8c940cd..e88a5078 100644
--- a/upload/admin/applications/forums/extensions/notifications.php
+++ b/upload/admin/applications/forums/extensions/notifications.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Define the core notification types
- * Last Updated: $Date: 2010-04-08 16:37:04 -0400 (Thu, 08 Apr 2010) $
+ * Last Updated: $Date: 2011-03-29 08:39:51 -0400 (Tue, 29 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6088 $
+ * @version		$Rev: 8208 $
  *
  */
 
@@ -37,12 +37,15 @@ class forums_notifications
 		 * Notification types - Needs to be a method so when require_once is used, $_NOTIFY isn't empty
 		 */
 		$_NOTIFY	= array(
-							array( 'key' => 'new_topic', 'default' => array( 'email' ), 'disabled' => array(), 'icon' => 'notify_newtopic' ),
-							array( 'key' => 'new_reply', 'default' => array( 'email' ), 'disabled' => array(), 'icon' => 'notify_newreply' ),
 							array( 'key' => 'post_quoted', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_quoted' ),
+							array( 'key' => 'new_likes', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_newreply' ),
+							array( 'key' => 'followed_topics', 'default' => array( 'email' ), 'disabled' => array(), 'icon' => 'notify_newreply' ),
+							array( 'key' => 'followed_forums', 'default' => array( 'email' ), 'disabled' => array(), 'icon' => 'notify_newreply' ),
+							array( 'key' => 'followed_topics_digest', 'default' => array( 'email' ), 'disabled' => array('inline'), 'icon' => 'notify_newreply' ),
+							array( 'key' => 'followed_forums_digest', 'default' => array( 'email' ), 'disabled' => array('inline'), 'icon' => 'notify_newreply' ),
 							// This is defined in ACP forum settings as an email, so it's not mapped to a specific member
 							//array( 'key' => 'new_topic_queue', 'default' => array( 'email' ), 'disabled' => array() ),
-							);
+							);/*noLibHook*/
 		return $_NOTIFY;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/portalPlugins/poll-cfg.php b/upload/admin/applications/forums/extensions/portalPlugins/poll-cfg.php
deleted file mode 100644
index dbf7fee5..00000000
--- a/upload/admin/applications/forums/extensions/portalPlugins/poll-cfg.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: poll
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$PORTAL_CONFIG = array();
-
-/**
-* Main plug in title
-*
-*/
-$PORTAL_CONFIG['pc_title'] = 'Опро�';
-
-/**
-* Plug in mini description
-*
-*/
-$PORTAL_CONFIG['pc_desc']  = "Выводит блок опро�а";
-
-/**
-* Keyword for settings. This is the keyword
-* entered into ibf_conf_settings_titles -> conf_title_keyword
-* Can be left blank.
-* PLEASE stick to the naming convention when entering a setting
-* keyword: portal_{file_name_minus_php} This will prevent
-* other keyword clashes. Likewise, when creating settings, choose
-* NOT to cache them (they will be loaded at run time) and always
-* prefix with {file_name_minus_php}_setting_key - for example
-* If you had a setting called "export_forums" then please name it
-* "recent_topics_export_forums". This will be available in
-* $this->settings['recent_topics_export_forums'] in the
-* main module.
-*/
-$PORTAL_CONFIG['pc_settings_keyword'] = "portal_poll";
-
-/**
-* Exportable tags key must be in the naming format of:
-* {file_name_minus_php}-tag. The value *MUST* be the function
-* which it corresponds to. For example:
-* 'recent_topics_last_x' => 'recent_topics_last_x'
-* The portal will look for function 'recent_topics_last_x' in
-* module "sources/portal_plugins/recent_topics.php" when it parses
-* the tag <!--::recent_topics_last_x::-->
-*
-* @param array[ TAG ] = array( FUNCTION NAME, DESCRIPTION );
-*/
-$PORTAL_CONFIG['pc_exportable_tags']['poll_show_poll'] = array( 'poll_show_poll', 'Shows the request poll' );
diff --git a/upload/admin/applications/forums/extensions/portalPlugins/poll.php b/upload/admin/applications/forums/extensions/portalPlugins/poll.php
deleted file mode 100644
index 2884881f..00000000
--- a/upload/admin/applications/forums/extensions/portalPlugins/poll.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: poll
- * Last Updated: $Date: 2010-10-22 06:13:38 -0400 (Fri, 22 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7016 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class ppi_poll extends public_portal_portal_portal 
-{
-	/**
-	 * Initialize module
-	 *
-	 * @return	void
-	 */
-	public function init()
- 	{
- 	}
- 	
-	/**
-	 * Display a poll
-	 *
-	 * @return	string		HTML content to replace tag with
-	 * @todo	We need to update the code below to load the furlTemplates file and check against it, then add a fallback on the normal url as a default.
-	 */
-	public function poll_show_poll()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
- 		$extra	= "";
- 		$sql	= "";
- 		$check	= 0;
- 		
- 		//-----------------------------------------
- 		// Got a poll?
- 		//-----------------------------------------
- 		
- 		if ( ! $this->settings['poll_poll_url'] )
- 		{
- 			return;
- 		}
- 		
- 		//-----------------------------------------
-		// Get the topic ID of the entered URL
-		//-----------------------------------------
-		
-		/* Friendly URL */
-		if( $this->settings['use_friendly_urls'] )
-		{
-			preg_match( "#/topic/(\d+)(.*?)/#", $this->settings['poll_poll_url'], $match );
-			$tid = intval( trim( $match[1] ) );
-		}
-		/* Normal URL */
-		else
-		{
-			preg_match( "/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/", $this->settings['poll_poll_url'], $match );
-			$tid = intval( trim( $match[3] ) );
-		}
-		
-		if ( !$tid )
-		{
-			return;
-		}
-		
-		//-----------------------------------------
-		// Get topic...
-		//-----------------------------------------
-		
-		$this->registry->class_localization->loadLanguageFile( array( 'public_boards', 'public_topic' ), 'forums' );
-		$this->registry->class_localization->loadLanguageFile( array( 'public_editors' ), 'core' );
-
-		if( !$this->registry->isClassLoaded('class_forums') )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
-			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
-			
-			$this->registry->getClass('class_forums')->strip_invisible = 1;
-			$this->registry->getClass('class_forums')->forumsInit();
-		}
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums', 'forums' ) . '/topics.php', 'public_forums_forums_topics', 'forums' );
-		$topic = new $classToLoad();
-		$topic->makeRegistryShortcuts( $this->registry );
-
-		$topic->topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from'   => 'topics', 'where'  => "tid=" . $tid ) );
-		$topic->forum = ipsRegistry::getClass('class_forums')->forum_by_id[ $topic->topic['forum_id'] ];
-	
-		$this->request['f'] =  $topic->forum['id'] ;
-		$this->request['t'] =  $tid ;
-		
-		if ( $topic->topic['poll_state'] )
-		{
- 			return $this->registry->getClass('output')->getTemplate('portal')->pollWrapper( $topic->_generatePollOutput(), $tid );
- 		}
- 		else
- 		{
- 			return;
- 		}
- 	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/portalPlugins/recent_topics-cfg.php b/upload/admin/applications/forums/extensions/portalPlugins/recent_topics-cfg.php
deleted file mode 100644
index 0f4e4cea..00000000
--- a/upload/admin/applications/forums/extensions/portalPlugins/recent_topics-cfg.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: recent topics
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$PORTAL_CONFIG = array();
-
-/**
-* Main plug in title
-*
-*/
-$PORTAL_CONFIG['pc_title'] = 'По�ледние темы';
-
-/**
-* Plug in mini description
-*
-*/
-$PORTAL_CONFIG['pc_desc']  = "Выводит блок по�ледних тем";
-
-/**
-* Keyword for settings. This is the keyword
-* entered into ibf_conf_settings_titles -> conf_title_keyword
-* Can be left blank.
-* PLEASE stick to the naming convention when entering a setting
-* keyword: portal_{file_name_minus_php} This will prevent
-* other keyword clashes. Likewise, when creating settings, choose
-* NOT to cache them (they will be loaded at run time) and always
-* prefix with {file_name_minus_php}_setting_key - for example
-* If you had a setting called "export_forums" then please name it
-* "recent_topics_export_forums". This will be available in
-* $this->settings['recent_topics_export_forums'] in the
-* main module.
-*/
-$PORTAL_CONFIG['pc_settings_keyword'] = "portal_recent_topics";
-
-/**
-* Exportable tags key must be in the naming format of:
-* {file_name_minus_php}-tag. The value *MUST* be the function
-* which it corresponds to. For example:
-* 'recent_topics_last_x' => 'recent_topics_last_x'
-* The portal will look for function 'recent_topics_last_x' in
-* module "sources/portal_plugins/recent_topics.php" when it parses
-* the tag <!--::recent_topics_last_x::-->
-*
-* @param array[ TAG ] = array( FUNCTION NAME, DESCRIPTION );
-*/
-$PORTAL_CONFIG['pc_exportable_tags']['recent_topics_last_x']             = array( 'recent_topics_last_x'            , 'Shows the last X topics with full post from the selected forums' );
-$PORTAL_CONFIG['pc_exportable_tags']['recent_topics_discussions_last_x'] = array( 'recent_topics_discussions_last_x', 'Shows the last X topic titles from ALL viewable forums'          );
diff --git a/upload/admin/applications/forums/extensions/portalPlugins/recent_topics.php b/upload/admin/applications/forums/extensions/portalPlugins/recent_topics.php
deleted file mode 100644
index a9722443..00000000
--- a/upload/admin/applications/forums/extensions/portalPlugins/recent_topics.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: recent topics
- * Last Updated: $Date: 2010-11-04 13:30:54 -0400 (Thu, 04 Nov 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7093 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class ppi_recent_topics extends public_portal_portal_portal 
-{
-	/**
-	 * Initialize module
-	 *
-	 * @return	void
-	 */
-	public function init()
-	{
-		$this->settings['csite_article_date'] = $this->settings['csite_article_date'] ? $this->settings['csite_article_date'] : '%c';
-	}
-
-	/**
-	 * Show the recently started topic titles
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function recent_topics_discussions_last_x()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		$results	= array();
-		$limit		= $this->settings['recent_topics_discuss_number'] ? $this->settings['recent_topics_discuss_number'] : 5;
-
-		$results	= $this->registry->class_forums->hooks_recentTopics( $limit, false );
-
-		return count($results) ? $this->registry->getClass('output')->getTemplate('portal')->latestPosts( $results ) : '';
-	}
-
-	
-	/**
-	 * Show the "news" articles
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function recent_topics_last_x()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-
- 		$attach_pids	= array();
- 		$attach_posts	= array();
- 		$forums			= array();
- 		$rows			= array();
- 		$output			= array();
-		$where_clause	= array();
- 		$limit			= $this->settings['recent_topics_article_max'] ? $this->settings['recent_topics_article_max'] : 5;
- 		$posts			= intval($this->memberData['posts']);
-
- 		//-----------------------------------------
-    	// Grab articles new/recent in 1 bad ass query
-    	//-----------------------------------------
-
- 		foreach( explode( ',', $this->settings['recent_topics_article_forum'] ) as $forum_id )
- 		{
- 			if( !$forum_id )
- 			{
- 				continue;
- 			}
-
- 			$forums[] = intval($forum_id);
- 		}
- 		
- 		if( !count($forums) )
- 		{
- 			return;
- 		}
-		
-		/* Loop through the forums and build a list of forums we're allowed access to */
-		$forumIdsOk  = array();
-	
-		foreach( $this->registry->class_forums->forum_by_id as $id => $data )
-		{
-			/* Allowing this forum? */
-			if ( ! in_array( $id, $forums ) )
-			{
-				continue;
-			}
-			
-			/* Can we read? */
-			if ( ! $this->registry->permissions->check( 'read', $data ) )
-			{
-				continue;
-			}
-
-			/* Can read, but is it password protected, etc? */
-			if ( ! $this->registry->class_forums->forumsCheckAccess( $id, 0, 'forum', array(), true ) )
-			{
-				continue;
-			}
-
-			if ( ! $data['can_view_others'] )
-			{
-				continue;
-			}
-			
-			if ( $data['min_posts_view'] > $posts )
-			{
-				continue;
-			}
-
-			$forumIdsOk[] = $id;
-		}
-
-		if( !count($forumIdsOk) )
-		{
-			return '';
-		}
-
-		/* Add allowed forums */
-		$where_clause[] = "t.forum_id IN (" . implode( ",", $forumIdsOk ) . ")";
-
-		//-----------------------------------------
-		// Will we need to parse attachments?
-		//-----------------------------------------
-		
-		$parseAttachments	= false;
-		
-		//-----------------------------------------
-		// Run query
-		//-----------------------------------------
-		
-		$pinned   = array();
-		$unpinned = array();
-		$all	  = array();
-		$data     = array();
-		$count    = 0;
-		
-		if( !$this->settings['portal_exclude_pinned'] )
-		{
-			/* Fetch all pinned topics to avoid filesort */
-			$this->DB->build( array( 'select' => 't.tid, t.start_date',
-									 'from'   => 'topics t',
-									 'where'  => "t.pinned=1 AND t.approved=1 AND t.state != 'link' AND " . implode( ' AND ', $where_clause ),
-									 //'order'  => 't.tid DESC',
-									 'limit'  => array ( $limit ) ) );
-									
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
-			{
-				$pinned[ $row['start_date'] ] = $row['tid'];
-				$all[ $row['start_date'] ]    = $row['tid'];
-			}
-		}
-		
-		/* Still need more? */
-		
-		if ( count( $pinned ) < $limit )
-		{
-			$pinnedWhere	= $this->settings['portal_exclude_pinned'] ? "" : "t.pinned=0 AND ";
-			
-			$this->DB->build( array( 'select' => 't.tid, t.start_date',
-									 'from'   => 'topics t',
-									 'where'  => $pinnedWhere . "t.approved=1 AND t.state != 'link' AND " . implode( ' AND ', $where_clause ),
-									 'order'  => 'tid DESC',
-									 'limit'  => array ( $limit - count( $pinned ) ) ) );
-									
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
-			{
-				$unpinned[ $row['start_date'] ] = $row['tid'];
-				$all[ $row['start_date'] ]      = $row['tid'];
-			}
-		}
-		
-		/* got anything? */
-		if ( ! count( $all ) )
-		{
-			return;
-		}
-		
-		$this->DB->build( array( 
-								'select'	=> 't.*',
-								'from'		=> array( 'topics' => 't' ),
-								'where'		=> "t.tid IN (" . implode( ",",  array_values( $all ) ) . ")",
-								'add_join'	=> array(
-													array( 
-															'select'	=> 'p.*',
-															'from'	=> array( 'posts' => 'p' ),
-															'where'	=> 'p.pid=t.topic_firstpost',
-															'type'	=> 'left'
-														),
-													array(
-															'select'	=> 'f.use_html',
-															'from'		=> array( 'forums' => 'f' ),
-															'where'		=> "f.id=t.forum_id",
-															'type'		=> 'left',
-														),
-													array( 
-															'select'	=> 'm.member_id, m.members_display_name, m.member_group_id, m.members_seo_name, m.mgroup_others, m.login_anonymous, m.last_visit, m.last_activity',
-															'from'		=> array( 'members' => 'm' ),
-															'where'		=> 'm.member_id=p.author_id',
-															'type'		=> 'left'
-														),
-													array( 
-															'select'	=> 'pp.*',
-															'from'		=> array( 'profile_portal' => 'pp' ),
-															'where'		=> 'pp.pp_member_id=m.member_id',
-															'type'		=> 'left'
-														),
-												
-													)
-					)		);
-		
-		$outer = $this->DB->execute();
-		
- 		//-----------------------------------------
- 		// Loop through..
- 		//-----------------------------------------
- 		
- 		while( $row = $this->DB->fetch($outer) )
- 		{
-			$data[ $row['tid'] ] = $row;
-		}
-		
-		krsort( $unpinned );
-		krsort( $pinned );
-		
-		foreach( $unpinned as $date => $tid )
-		{
-			if ( count( $pinned ) < $limit )
-			{
-				$pinned[ $date ] = $tid;
-			}
-			else
-			{
-				break;
-			}
-			
-			$count++;
-		}
-		
-		/* Now put it altogether */
-		foreach( $pinned as $date => $tid )
-		{
- 			//-----------------------------------------
- 			// INIT
- 			//-----------------------------------------
- 			
-			$entry              = $data[ $tid ];
- 			$bottom_string		= "";
- 			$read_more			= "";
- 			$top_string			= "";
- 			$got_these_attach	= 0;
- 			
-			if( $entry['topic_hasattach'] )
-			{
-				$parseAttachments	= true;
-			}
-
-			//-----------------------------------------
-			// Parse the post
-			//-----------------------------------------
-			
-			IPSText::getTextClass( 'bbcode' )->parse_smilies			= $entry['use_emo'];
-			IPSText::getTextClass( 'bbcode' )->parse_html				= ( $entry['use_html'] and $entry['post_htmlstate'] ) ? 1 : 0;
-			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $entry['post_htmlstate'] == 2 ? 1 : 0;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $entry['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $entry['mgroup_others'];
-			$entry['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $entry['post'] );
- 			
- 			//-----------------------------------------
- 			// BASIC INFO
- 			//-----------------------------------------
- 			
- 			$real_posts			= $entry['posts'];
- 			$entry['posts']		= ipsRegistry::getClass('class_localization')->formatNumber(intval($entry['posts']));
-
- 			if( !$entry['author_id'] )
- 			{
-				$entry['members_display_name']	= $this->settings['guest_name_pre'] . $entry['author_name'] . $this->settings['guest_name_suf'];
-				$entry['member_id']				= 0;
-			}
-			else
-			{
-				$entry	= IPSMember::buildDisplayData( $entry );
-			}
-
- 			//-----------------------------------------
- 			// Get Date
- 			//-----------------------------------------
- 			
- 			$entry['date'] = $this->registry->class_localization->getDate( $entry['post_date'], "manual{" . $this->settings['csite_article_date'] . "}" );
-
- 			//-----------------------------------------
-			// Attachments?
-			//-----------------------------------------
-			
-			if( $entry['pid'] )
-			{
-				$attach_pids[ $entry['pid'] ] = $entry['pid'];
-			}
- 			
- 			//-----------------------------------------
- 			// Avatar
- 			//-----------------------------------------
- 			
- 			$entry['avatar']	= IPSMember::buildAvatar( $entry );
-
-			if ( IPSMember::checkPermissions('download', $entry['forum_id'] ) === FALSE )
-			{
-				$this->settings[ 'show_img_upload'] =  0 ;
-			} 
-			
-			//-----------------------------------------
-			// View image...
-			//-----------------------------------------
-		 			
-			$entry['post'] = IPSText::getTextClass( 'bbcode' )->memberViewImages( $entry['post'] );	
- 			
-			$rows[] = $entry;
- 		}
- 		
- 		$output = $this->registry->getClass('output')->getTemplate('portal')->articles( $rows );
- 		
- 		//-----------------------------------------
- 		// Process Attachments
- 		//-----------------------------------------
- 		
- 		if ( $parseAttachments AND count( $attach_pids ) )
- 		{
-			if ( ! is_object( $this->class_attach ) )
-			{
-				//-----------------------------------------
-				// Grab render attach class
-				//-----------------------------------------
-				
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
-				$this->class_attach                  = new $classToLoad( $this->registry );
-				
-				$this->class_attach->attach_post_key = '';
-
-				ipsRegistry::getClass( 'class_localization' )->loadLanguageFile( array( 'public_topic' ), 'forums' );
-			}
-			
-			$this->class_attach->attach_post_key	=  '';
-			$this->class_attach->type				= 'post';
-			$this->class_attach->init();
-		
-			$output = $this->class_attach->renderAttachments( $output, $attach_pids );
-			$output	= $output[0]['html'];
- 		}
- 		
- 		return $output;
- 	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/profileTabs/index.html b/upload/admin/applications/forums/extensions/profileTabs/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/profileTabs/index.html
+++ b/upload/admin/applications/forums/extensions/profileTabs/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/profileTabs/posts.conf.php b/upload/admin/applications/forums/extensions/profileTabs/posts.conf.php
index 96d34735..826acad0 100644
--- a/upload/admin/applications/forums/extensions/profileTabs/posts.conf.php
+++ b/upload/admin/applications/forums/extensions/profileTabs/posts.conf.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config for posts plugin
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7442 $
  *
  */
 
diff --git a/upload/admin/applications/forums/extensions/profileTabs/posts.php b/upload/admin/applications/forums/extensions/profileTabs/posts.php
index 5e64478c..8e122037 100644
--- a/upload/admin/applications/forums/extensions/profileTabs/posts.php
+++ b/upload/admin/applications/forums/extensions/profileTabs/posts.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile Plugin Library
- * Last Updated: $Date: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $Date: 2011-07-27 10:14:00 -0400 (Wed, 27 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 7023 $
+ * @version		$Revision: 9326 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -73,63 +73,56 @@ class profile_posts extends profile_plugin_parent
 			return $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_posts_to_show' );
 		}
 		
-		$pids	= array();
-		
-		//-----------------------------------------
-		// And limit by post count...
-		//-----------------------------------------
-		
-		$posts	= intval($this->memberData['posts']);
-		
-		//-----------------------------------------
-		// Will we need to parse attachments?
-		//-----------------------------------------
-		
-		$parseAttachments	= false;
-		
 		/* Get list of good forum IDs */
 		$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds();
 		
-		/* Set up joins */
-		$_post_joins = array( array(
-									'select'	=> 't.*',
-									'from'		=> array( 'topics' => 't' ),
-									'where'		=> 't.tid=p.topic_id',
-									'type'		=> 'left' 
-								),
-							array(
-									'select'	=> 'm.member_group_id, m.mgroup_others',
-									'from'		=> array( 'members' => 'm' ),
-									'where'		=> 'm.member_id=p.author_id',
-									'type'		=> 'left' 
-								) );
-		
-		/* Cache? */
-		if ( IPSContentCache::isEnabled() )
-		{
-			if ( IPSContentCache::fetchSettingValue('post') )
-			{
-				$_post_joins[] = IPSContentCache::join( 'post', 'p.pid' );
-			}
-		}
-		
-		if ( $this->settings['search_ucontent_days'] )
-		{
-			$date_cut = ( $this->memberData['last_post'] ? $this->memberData['last_post'] : time() ) - 86400 * intval( $this->settings['search_ucontent_days'] );
-			$date_cut = ' AND p.post_date > ' . $date_cut;
-		}
-		
 		//-----------------------------------------
 		// Get last X posts
 		//-----------------------------------------
 		
 		if( is_array($forumIdsOk) AND count($forumIdsOk) )
 		{
+			/* Init vars */
+			$pids				= array();
+			$parseAttachments	= false;
+			
+			/* Set up joins */
+			$_post_joins = array( array(
+										'select'	=> 't.*',
+										'from'		=> array( 'topics' => 't' ),
+										'where'		=> 't.tid=p.topic_id',
+										'type'		=> 'left' 
+									),
+								array(
+										'select'	=> 'm.member_group_id, m.mgroup_others',
+										'from'		=> array( 'members' => 'm' ),
+										'where'		=> 'm.member_id=p.author_id',
+										'type'		=> 'left' 
+									) );
+			
+			/* Cache? */
+			if ( IPSContentCache::isEnabled() )
+			{
+				if ( IPSContentCache::fetchSettingValue('post') )
+				{
+					$_post_joins[] = IPSContentCache::join( 'post', 'p.pid' );
+				}
+			}
+			
+			if ( $this->settings['search_ucontent_days'] )
+			{
+				$date_cut = ( $this->memberData['last_post'] ? $this->memberData['last_post'] : time() ) - 86400 * intval( $this->settings['search_ucontent_days'] );
+				$date_cut = ' AND p.post_date > ' . $date_cut;
+			}
+			
+			$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+			$_approved	= $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), 't.' );
+
 			$this->DB->build( array( 
 										'select'	=> 'p.*',
 										'from'		=> array( 'posts' => 'p' ),
-										'where'		=> "p.queued=0 AND t.approved=1 AND p.author_id={$member['member_id']} AND p.new_topic=0 AND t.forum_id IN (" . implode( ",", $forumIdsOk ) . ") " . $date_cut,
-										'order'		=> 'p.post_date DESC',
+										'where'		=> $_queued . " AND " . $_approved . " AND p.author_id={$member['member_id']} AND p.new_topic=0 AND t.forum_id IN (" . implode( ",", $forumIdsOk ) . ") " . $date_cut,
+										'order'		=> 'p.pid DESC',
 										'limit'		=> array( 0, $last_x ),
 										'add_join'	=> $_post_joins
 									) 	);
@@ -148,7 +141,7 @@ class profile_posts extends profile_plugin_parent
 				if ( ! $row['cache_content'] )
 				{
 					IPSText::getTextClass( 'bbcode' )->parse_smilies		 = $row['use_emo'];
-					IPSText::getTextClass( 'bbcode' )->parse_html			 = ( $row['use_html'] and $this->memberData['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+					IPSText::getTextClass( 'bbcode' )->parse_html			 = ( $row['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
 					IPSText::getTextClass( 'bbcode' )->parse_nl2br			 = $row['post_htmlstate'] == 2 ? 1 : 0;
 					IPSText::getTextClass( 'bbcode' )->parse_bbcode			 = 1;
 					IPSText::getTextClass( 'bbcode' )->parsing_section		 = 'topics';
@@ -164,45 +157,45 @@ class profile_posts extends profile_plugin_parent
 					$row['post'] = $row['cache_content'];
 				}
 				
-				$row['post']	= IPSLib::memberViewImages( $row['post'] );
-				
-				$row['_post_date']  = ipsRegistry::getClass( 'class_localization')->getDate( $row['post_date'], 'SHORT' );
+				$row['_post_date']  = ipsRegistry::getClass('class_localization')->getDate( $row['post_date'], 'SHORT' );
 				$row['_raw_date']   = $row['post_date'];
 				$row['_date_array'] = IPSTime::date_getgmdate( $row['post_date'] + ipsRegistry::getClass( 'class_localization')->getTimeOffset() );
 				
 				$row['post'] .= "\n<!--IBF.ATTACHMENT_". $row['pid']. "-->";
 				
-				$content .= $this->registry->getClass('output')->getTemplate('profile')->tabSingleColumn( $row, $this->lang->words['profile_read_topic'], $this->settings['base_url'].'app=forums&amp;module=forums&amp;section=findpost&amp;pid='.$row['pid'], $this->lang->words['profile_in_topic'] . $row['title'] );
+				$url	= $this->registry->output->buildSEOUrl( "showtopic={$row['topic_id']}&amp;view=findpost&amp;p={$row['pid']}", 'public', $row['title_seo'], 'showtopic' );
+				
+				$content .= $this->registry->getClass('output')->getTemplate('profile')->tabSingleColumn( $row, $this->lang->words['profile_read_topic'], $url, $this->lang->words['profile_in_topic'] . $row['title'] );
 			}
-		}
-
-		//-----------------------------------------
-		// Attachments (but only if necessary)
-		//-----------------------------------------
-		
-		if ( $parseAttachments AND !is_object( $this->class_attach ) )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
-			$this->class_attach        = new $classToLoad( $this->registry );
-
-			$this->class_attach->type  = 'post';
-			$this->class_attach->init();
 			
-			if ( IPSMember::checkPermissions('download') === false )
+			//-----------------------------------------
+			// Attachments (but only if necessary)
+			//-----------------------------------------
+			
+			if ( $parseAttachments AND !is_object( $this->class_attach ) )
 			{
-				$this->settings['show_img_upload'] = 0;
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
+				$this->class_attach        = new $classToLoad( $this->registry );
+	
+				$this->class_attach->type  = 'post';
+				$this->class_attach->init();
+				
+				if ( IPSMember::checkPermissions('download') === false )
+				{
+					$this->settings['show_img_upload'] = 0;
+				}
+				
+				$content = $this->class_attach->renderAttachments( $content, $pids );
+				$content = $content[0]['html'];
 			}
+	
+			//-----------------------------------------
+			// Macros...
+			//-----------------------------------------
 			
-			$content = $this->class_attach->renderAttachments( $content, $pids );
-			$content = $content[0]['html'];
+			$content = $this->registry->output->replaceMacros( $content );
 		}
 
-		//-----------------------------------------
-		// Macros...
-		//-----------------------------------------
-		
-		$content = $this->registry->output->replaceMacros( $content );
-
 		//-----------------------------------------
 		// Return content..
 		//-----------------------------------------
diff --git a/upload/admin/applications/forums/extensions/profileTabs/topics.conf.php b/upload/admin/applications/forums/extensions/profileTabs/topics.conf.php
index 9ea8b324..bd4be81e 100644
--- a/upload/admin/applications/forums/extensions/profileTabs/topics.conf.php
+++ b/upload/admin/applications/forums/extensions/profileTabs/topics.conf.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config for topics plugin
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7442 $
  *
  */
 
diff --git a/upload/admin/applications/forums/extensions/profileTabs/topics.php b/upload/admin/applications/forums/extensions/profileTabs/topics.php
index 02492c1b..51b61933 100644
--- a/upload/admin/applications/forums/extensions/profileTabs/topics.php
+++ b/upload/admin/applications/forums/extensions/profileTabs/topics.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile Plugin Library
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-07-21 05:49:32 -0400 (Thu, 21 Jul 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 7003 $
+ * @version		$Revision: 9298 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -69,62 +69,56 @@ class profile_topics extends profile_plugin_parent
 		
 		if( !$this->memberData['g_other_topics'] AND $this->memberData['member_id'] != $member['member_id'] )
 		{
-			return $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_posts_to_show' );
+			return $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_topics_to_show' );
 		}
 		
-		//-----------------------------------------
-		// And limit by post count...
-		//-----------------------------------------
-		
-		$posts	= intval($this->memberData['posts']);
-		
-		//-----------------------------------------
-		// Will we need to parse attachments?
-		//-----------------------------------------
-		
-		$parseAttachments	= false;
-		
 		/* Get list of good forum IDs */
 		$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds();
 		
-		/* Set up joins */
-		$_post_joins = array( array(
-									'select' => 'p.*',
-									'from'   => array( 'posts' => 'p' ),
-									'where'  => 't.topic_firstpost=p.pid',
-									'type'   => 'left' 
-								),
-							 array(
-									'select'	=> 'm.member_group_id, m.mgroup_others',
-									'from'		=> array( 'members' => 'm' ),
-									'where'		=> 'm.member_id=p.author_id',
-									'type'		=> 'left' 
-								) );
-		
-		/* Cache? */
-		if ( IPSContentCache::isEnabled() )
-		{
-			if ( IPSContentCache::fetchSettingValue('post') )
-			{
-				$_post_joins[] = IPSContentCache::join( 'post', 'p.pid' );
-			}
-		}
-		
-		if ( $this->settings['search_ucontent_days'] )
-		{
-			$date_cut = ( $this->memberData['last_post'] ? $this->memberData['last_post'] : time() ) - 86400 * intval( $this->settings['search_ucontent_days'] );
-			$date_cut = ' AND t.start_date > ' . $date_cut;
-		}
-
 		//-----------------------------------------
 		// Get last X posts
 		//-----------------------------------------
 		
 		if( is_array($forumIdsOk) AND count($forumIdsOk) )
 		{
+			/* Init vars */
+			$pids				= array();
+			$parseAttachments	= false;
+			
+			/* Set up joins */
+			$_post_joins = array( array(
+										'select' => 'p.*',
+										'from'   => array( 'posts' => 'p' ),
+										'where'  => 't.topic_firstpost=p.pid',
+										'type'   => 'left' 
+									),
+								 array(
+										'select'	=> 'm.member_group_id, m.mgroup_others',
+										'from'		=> array( 'members' => 'm' ),
+										'where'		=> 'm.member_id=p.author_id',
+										'type'		=> 'left' 
+									) );
+			
+			/* Cache? */
+			if ( IPSContentCache::isEnabled() )
+			{
+				if ( IPSContentCache::fetchSettingValue('post') )
+				{
+					$_post_joins[] = IPSContentCache::join( 'post', 'p.pid' );
+				}
+			}
+			
+			if ( $this->settings['search_ucontent_days'] )
+			{
+				$date_cut = ( $this->memberData['last_post'] ? $this->memberData['last_post'] : time() ) - 86400 * intval( $this->settings['search_ucontent_days'] );
+				$date_cut = ' AND t.start_date > ' . $date_cut;
+			}
+			
+			$_approved	= $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), 't.' );
+			
 			$this->DB->build( array( 'select'	=> 't.*',
 									 'from'		=> array( 'topics' => 't' ),
-									 'where'	=> "t.starter_id={$member['member_id']} AND t.approved=1 AND t.forum_id IN (" . implode( ",", $forumIdsOk ) . ") " . $date_cut,
+									 'where'	=> "t.starter_id={$member['member_id']} AND {$_approved} AND t.forum_id IN (" . implode( ",", $forumIdsOk ) . ") " . $date_cut,
 									'order'		=> 't.start_date DESC',
 									'limit'		=> array( 0, $last_x ),
 									'add_join'	=> $_post_joins ) );
@@ -151,7 +145,7 @@ class profile_topics extends profile_plugin_parent
 				if ( ! $row['cache_content'] )
 				{
 					IPSText::getTextClass( 'bbcode' )->parse_smilies			= $row['use_emo'];
-					IPSText::getTextClass( 'bbcode' )->parse_html				= ( $row['use_html'] and $this->memberData['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+					IPSText::getTextClass( 'bbcode' )->parse_html				= ( $row['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
 					IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $row['post_htmlstate'] == 2 ? 1 : 0;
 					IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
 					IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
@@ -166,50 +160,50 @@ class profile_topics extends profile_plugin_parent
 				{
 					$row['post'] = $row['cache_content'];
 				}
-				
-				$row['post']	= IPSLib::memberViewImages( $row['post'] );
-				
-				$row['_post_date']  = ipsRegistry::getClass( 'class_localization')->getDate( $row['post_date'], 'SHORT' );
+
+				$row['_post_date']  = ipsRegistry::getClass('class_localization')->getDate( $row['post_date'], 'SHORT' );
 				$row['_raw_date']   = $row['post_date'];
 				$row['_date_array'] = IPSTime::date_getgmdate( $row['post_date'] + ipsRegistry::getClass( 'class_localization')->getTimeOffset() );
 				
 				$row['post'] .= "\n<!--IBF.ATTACHMENT_". $row['pid']. "-->";
 				
-				$content .= $this->registry->getClass('output')->getTemplate('profile')->tabSingleColumn( $row, $this->lang->words['profile_read_topic'], $this->settings['base_url'].'app=forums&amp;module=forums&amp;section=findpost&amp;pid='.$row['pid'], $row['title'] );
+				$url	= $this->registry->output->buildSEOUrl( "showtopic={$row['topic_id']}&amp;view=findpost&amp;p={$row['pid']}", 'public', $row['title_seo'], 'showtopic' );
+				
+				$content .= $this->registry->getClass('output')->getTemplate('profile')->tabSingleColumn( $row, $this->lang->words['profile_read_topic'], $url, $row['title'] );
 			}
-		}
-		
-		//-----------------------------------------
-		// Attachments (but only if necessary)
-		//-----------------------------------------
-		
-		if ( $parseAttachments AND !is_object( $this->class_attach ) )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
-			$this->class_attach        = new $classToLoad( $this->registry );
-
-			$this->class_attach->type  = 'post';
-			$this->class_attach->init();
 			
-			if ( IPSMember::checkPermissions('download') === false )
+			//-----------------------------------------
+			// Attachments (but only if necessary)
+			//-----------------------------------------
+			
+			if ( $parseAttachments AND !is_object( $this->class_attach ) )
 			{
-				$this->settings['show_img_upload'] = 0;
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
+				$this->class_attach        = new $classToLoad( $this->registry );
+	
+				$this->class_attach->type  = 'post';
+				$this->class_attach->init();
+				
+				if ( IPSMember::checkPermissions('download') === false )
+				{
+					$this->settings['show_img_upload'] = 0;
+				}
+				
+				$content = $this->class_attach->renderAttachments( $content, $pids );
+				$content = $content[0]['html'];
 			}
+	
+			//-----------------------------------------
+			// Macros...
+			//-----------------------------------------
 			
-			$content = $this->class_attach->renderAttachments( $content, $pids );
-			$content = $content[0]['html'];
+			$content = $this->registry->output->replaceMacros( $content );
 		}
-
-		//-----------------------------------------
-		// Macros...
-		//-----------------------------------------
-		
-		$content = $this->registry->output->replaceMacros( $content );
 		
 		//-----------------------------------------
 		// Return content..
 		//-----------------------------------------
 		
-		return $content ? $this->registry->getClass('output')->getTemplate('profile')->tabTopics( $content ) : $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_posts_to_show' );
+		return $content ? $this->registry->getClass('output')->getTemplate('profile')->tabTopics( $content ) : $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_topics_to_show' );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/reportPlugins/index.html b/upload/admin/applications/forums/extensions/reportPlugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/reportPlugins/index.html
+++ b/upload/admin/applications/forums/extensions/reportPlugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/reportPlugins/post.php b/upload/admin/applications/forums/extensions/reportPlugins/post.php
index f5ff1c37..cfbd8207 100644
--- a/upload/admin/applications/forums/extensions/reportPlugins/post.php
+++ b/upload/admin/applications/forums/extensions/reportPlugins/post.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Report Center :: Posts plugin
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,11 +25,19 @@ if ( ! defined( 'IN_IPB' ) )
 
 class post_plugin
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
@@ -39,7 +47,6 @@ class post_plugin
 	protected $memberData;
 	protected $cache;
 	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Holds extra data for the plugin
@@ -51,8 +58,8 @@ class post_plugin
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -70,8 +77,7 @@ class post_plugin
 		$this->caches   =& $this->registry->cache()->fetchCaches();
 		$this->lang		= $this->registry->class_localization;
 		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php', 'app_class_forums', 'forums' );
-		$app_class_forums = new $classToLoad( $this->registry );
+		ipsRegistry::getAppClass( 'forums' );
 	}
 	
 	/**
@@ -162,7 +168,7 @@ class post_plugin
 
 			foreach( $this->caches['moderators'] as $mod )
 			{
-				if( $mod['member_id'] == $this->memberData['member_id'] )
+				if( $this->memberData['member_id'] AND $mod['member_id'] == $this->memberData['member_id'] )
 				{
 					$these_forums = explode( ',', IPSText::cleanPermString( $mod['forum_id'] ) );
 					
@@ -379,11 +385,30 @@ class post_plugin
 		return $return_data;
 	}
 	
+	/**
+	 * Accepts an array of data from rc_reports_index and returns an array formatted nearly identical to processReport()
+	 *
+	 * @param 	array 		Report data
+	 * @return	array 		Formatted report data
+	 */
+	public function formatReportData( $report_data )
+	{
+		return array(
+					'REDIRECT_URL'	=> $report_data['url'],
+					'FORUM_ID'		=> $report_data['exdat1'],
+					'REPORT_INDEX'	=> $report_data['id'],
+					'SAVED_URL'		=> str_replace( '&amp;', '&', $report_data['url'] ),
+					'REPORT'		=> '',
+					'SEOTITLE'		=> $report_data['seoname'],
+					'TEMPLATE'		=> 'showtopic',
+					);
+	}
+	
 	/**
 	 * Where to send user after report is submitted
 	 *
 	 * @param 	array 		Report data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reportRedirect( $report_data )
 	{
@@ -414,26 +439,26 @@ class post_plugin
 		}
 		
 		$this->DB->build( array(
-									'select'	=> 'noti.*',
-									'from'		=> array( 'rc_modpref' => 'noti' ),
-									'where'		=> "(m.member_group_id IN(" . $group_ids . ") " . ( count($secondaryWhere) ? "OR " . implode( ' OR ', $secondaryWhere ) : '' ) . ") AND (g.g_is_supmod=1 OR g.g_access_cp=1 OR moderator.forum_id LIKE '%,{$report_data['FORUM_ID']},%')",
-									'add_join'	=> array(
-														array(
-															'select'	=> 'm.member_id as real_member_id, m.members_display_name as name, m.language, m.members_disable_pm, m.email, m.member_group_id',
-															'from'		=> array( 'members' => 'm' ),
-															'where'		=> 'm.member_id=noti.mem_id',
-															),
-														array(
-															'select'	=> 'moderator.member_id, moderator.group_id',
-															'from'		=> array( 'moderators' => 'moderator' ),
-															'where'		=> 'moderator.member_id=m.member_id OR moderator.group_id=m.member_group_id',
-															),
-														array(
-															'from'		=> array( 'groups' => 'g' ),
-															'where'		=> 'g.g_id=m.member_group_id',
-															'type'		=> 'left',
-															),
-														)
+								'select'	=> 'm.member_id as real_member_id, m.members_display_name as name, m.language, m.members_disable_pm, m.email, m.member_group_id',
+								'from'		=> array( 'members' => 'm' ),
+								'where'		=> "(m.member_group_id IN(" . $group_ids . ") " . ( count($secondaryWhere) ? "OR " . implode( ' OR ', $secondaryWhere ) : '' ) . ") AND (g.g_is_supmod=1 OR g.g_access_cp=1 OR moderator.forum_id LIKE '%,{$report_data['FORUM_ID']},%')",
+								'add_join'	=> array(
+													array(
+														'select'	=> 'noti.*',
+														'from'		=> array( 'rc_modpref' => 'noti' ),
+														'where'		=> 'm.member_id=noti.mem_id',
+														),
+													array(
+														'select'	=> 'moderator.member_id, moderator.group_id',
+														'from'		=> array( 'moderators' => 'moderator' ),
+														'where'		=> 'moderator.member_id=m.member_id OR moderator.group_id=m.member_group_id',
+														),
+													array(
+														'from'		=> array( 'groups' => 'g' ),
+														'where'		=> 'g.g_id=m.member_group_id',
+														'type'		=> 'left',
+														),
+													)
 							)		);
 		$this->DB->execute();
 
@@ -456,9 +481,9 @@ class post_plugin
 	 * Check access to report the topic
 	 *
 	 * @param 	integer 	Topic id
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _checkAccess( $tid )
+	protected function _checkAccess( $tid )
     {
 		if ( ! $this->memberData['member_id'] )
 		{
diff --git a/upload/admin/applications/forums/extensions/reputation.php b/upload/admin/applications/forums/extensions/reputation.php
index abbfcffe..b83ec564 100644
--- a/upload/admin/applications/forums/extensions/reputation.php
+++ b/upload/admin/applications/forums/extensions/reputation.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reputation configuration for application
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7007 $ 
+ * @link		http://hatynka.in
+ * @version		$Rev: 7442 $ 
  */
 
 if ( ! defined( 'IN_IPB' ) )
diff --git a/upload/admin/applications/forums/extensions/rssOutput.php b/upload/admin/applications/forums/extensions/rssOutput.php
index 206dc54d..2f9ca372 100644
--- a/upload/admin/applications/forums/extensions/rssOutput.php
+++ b/upload/admin/applications/forums/extensions/rssOutput.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS output plugin :: posts
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 7003 $
+ * @version		$Revision: 8021 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,7 +30,7 @@ class rss_output_forums
 	 * 
 	 * @var		integer			Expiration timestamp
 	 */
-	private $expires			= 0;
+	protected $expires			= 0;
 	
 	/**
 	 * Grab the RSS links
@@ -102,14 +102,12 @@ class rss_output_forums
 				
 				define( 'IN_ACP', 1 );
 				
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php', 'app_class_forums', 'forums' );
-				$app_class_forums = new $classToLoad( ipsRegistry::instance() );
+				ipsRegistry::getAppClass( 'forums' );
 				
 				$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums' ) . '/modules_admin/rss/export.php', 'admin_forums_rss_export' );
 				$rss_export  = new $classToLoad();
 				$rss_export->makeRegistryShortcuts( ipsRegistry::instance() );
-				
-				
+
 				return $rss_export->rssExportRebuildCache( $rss_data['rss_export_id'], 0 );
 			}
 			else
diff --git a/upload/admin/applications/forums/extensions/search/config.php b/upload/admin/applications/forums/extensions/search/config.php
index 6dcc2c44..821f46b9 100644
--- a/upload/admin/applications/forums/extensions/search/config.php
+++ b/upload/admin/applications/forums/extensions/search/config.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config file
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-04-18 21:34:01 -0400 (Mon, 18 Apr 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8370 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -23,13 +23,20 @@ if ( ! defined( 'IN_IPB' ) )
 }
 
 /* Can search with this app */
-$CONFIG['can_search']	      = 1;
+$CONFIG['can_search']			= 1;
 
 /* Can view new content with this app */
-$CONFIG['can_viewNewContent'] = 1;
+$CONFIG['can_viewNewContent']	= 1;
 
-/* Can fetch active content with this app */
-$CONFIG['can_activeContent']  = 1;
+/* Can further filter VNC by removing non-followed 'categories' */
+$CONFIG['can_vnc_filter_by_followed']	= 1;
+$CONFIG['can_vnc_unread_content']		= 1;
 
 /* Can fetch user generated content */
-$CONFIG['can_userContent'] = 1;
\ No newline at end of file
+$CONFIG['can_userContent']		= 1;
+
+/* Can search tags */
+$CONFIG['can_searchTags']		= 1;
+
+/* Content types for 'follow', default one first */
+$CONFIG['followContentTypes']		= array( 'topics', 'forums' );
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/search/engines/index.html b/upload/admin/applications/forums/extensions/search/engines/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/search/engines/index.html
+++ b/upload/admin/applications/forums/extensions/search/engines/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/search/engines/sphinx.php b/upload/admin/applications/forums/extensions/search/engines/sphinx.php
index d64f45f1..8023edeb 100644
--- a/upload/admin/applications/forums/extensions/search/engines/sphinx.php
+++ b/upload/admin/applications/forums/extensions/search/engines/sphinx.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Basic Forum Search
- * Last Updated: $Date: 2010-02-23 12:38:11 +0000 (Tue, 23 Feb 2010) $
+ * Last Updated: $Date: 2011-10-04 16:35:02 -0400 (Tue, 04 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @author 		$Author: bfarber $
+ * @copyright	© 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5861 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9580 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,10 +24,17 @@ if ( ! defined( 'IN_IPB' ) )
 
 class search_engine_forums extends search_engine
 {
+	/**
+	 * Forum ids to search - set in secondary methods
+	 * 
+	 * @var	array
+	 */
+ 	protected $searchForumIds	= array();
+ 	
 	/**
 	 * Constructor
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -39,6 +46,7 @@ class search_engine_forums extends search_engine
 		{
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
 			ipsRegistry::setClass( 'class_forums', new $classToLoad( ipsRegistry::instance() ) );
+			ipsRegistry::getClass('class_forums')->strip_invisible = 1;
 			ipsRegistry::getClass('class_forums')->forumsInit();
 		}
 		
@@ -61,8 +69,8 @@ class search_engine_forums extends search_engine
 		$sort_by            = IPSSearchRegistry::get('in.search_sort_by');
 		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
 		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
+		$search_type		= IPSSearchRegistry::get('opt.searchType');
+		$search_tags        = IPSSearchRegistry::get('in.raw_search_tags');
 		$search_ids		    = array();
 		$groupby			= false;
 		$cType              = IPSSearchRegistry::get('contextual.type');
@@ -71,16 +79,21 @@ class search_engine_forums extends search_engine
 		/* Contextual search */
 		if ( $cType == 'topic' )
 		{
-			$content_title_only = false;
-			$post_search_only   = true;
-			
-			IPSSearchRegistry::set('opt.searchTitleOnly', false);
-			IPSSearchRegistry::set('opt.onlySearchPosts', true);
-			IPSSearchRegistry::set('display.onlyTitles', false);
+			$search_type	= 'content';
+			IPSSearchRegistry::set('opt.searchType', 'content');
 			IPSSearchRegistry::set('opt.noPostPreview', false);
 		}
 		
+		/* If searching tags, we don't show a preview */
+		if( $search_tags )
+		{
+			IPSSearchRegistry::set('opt.noPostPreview', true);
+			IPSSearchRegistry::set('opt.searchType', 'titles');
+			$search_type = 'titles';
+		}
+		
 		/* Permissions */
+		$permissions						= array();
 		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
 		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
 		$permissions['PostSoftDeleteSee']   = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( 0 );
@@ -107,81 +120,86 @@ class search_engine_forums extends search_engine
 		}
 					
 		/* Limit Results */
-		$this->sphinxClient->SetLimits( intval($start), intval($perPage) );
+		$this->sphinxClient->SetLimits( intval($start), $perPage );
 		
 		/* Loop through the forums and build a list of forums we're allowed access to */
-		$forumIdsOk  = array();
-		$forumIdsBad = array();
-		
-		if ( ! empty( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) AND count( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) )
+		if( is_array($this->searchForumIds) AND count($this->searchForumIds) )
 		{
-			foreach(  ipsRegistry::$request['search_app_filters']['forums']['forums'] as $forum_id )
+			$forumIdsOk	= $this->searchForumIds;
+		}
+		else
+		{
+			$forumIdsOk		= array();
+			$forumIdsBad	= array();
+			
+			if ( ! empty( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) AND count( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) )
 			{
-				if( $forum_id )
+				foreach(  ipsRegistry::$request['search_app_filters']['forums']['forums'] as $forum_id )
 				{
-					$data	= $this->registry->class_forums->forum_by_id[ $forum_id ];
-					
-					/* Check for sub forums */
-					$children = ipsRegistry::getClass( 'class_forums' )->forumsGetChildren( $forum_id );
-					
-					foreach( $children as $kid )
+					if( $forum_id )
 					{
-						if( ! in_array( $kid, ipsRegistry::$request['search_app_filters']['forums']['forums'] ) )
+						$data	= $this->registry->class_forums->forum_by_id[ $forum_id ];
+						
+						/* Check for sub forums */
+						$children = ipsRegistry::getClass( 'class_forums' )->forumsGetChildren( $forum_id );
+						
+						foreach( $children as $kid )
 						{
-							if( ! $this->registry->permissions->check( 'read', $this->registry->class_forums->forum_by_id[ $kid ] ) )
+							if( ! in_array( $kid, ipsRegistry::$request['search_app_filters']['forums']['forums'] ) )
 							{
-								$forumIdsBad[] = $kid;
-								continue;
+								if( ! $this->registry->permissions->check( 'read', $this->registry->class_forums->forum_by_id[ $kid ] ) )
+								{
+									$forumIdsBad[] = $kid;
+									continue;
+								}
+								
+								/* Can read, but is it password protected, etc? */
+								if ( ! $this->registry->class_forums->forumsCheckAccess( $kid, 0, 'forum', array(), true ) )
+								{
+									$forumIdsBad[] = $kid;
+									continue;
+								}
+	
+								if ( ! $this->registry->class_forums->forum_by_id[ $kid ]['sub_can_post'] OR ! $this->registry->class_forums->forum_by_id[ $kid ]['can_view_others'] )
+								{
+									$forumIdsBad[] = $kid;
+									continue;
+								}
+								
+								$forumIdsOk[] = $kid;
 							}
-							
-							/* Can read, but is it password protected, etc? */
-							if ( ! $this->registry->class_forums->forumsCheckAccess( $kid, 0, 'forum', array(), true ) )
-							{
-								$forumIdsBad[] = $kid;
-								continue;
-							}
-
-							if ( ! $this->registry->class_forums->forum_by_id[ $kid ]['sub_can_post'] OR ! $this->registry->class_forums->forum_by_id[ $kid ]['can_view_others'] )
-							{
-								$forumIdsBad[] = $kid;
-								continue;
-							}
-							
-							$forumIdsOk[] = $kid;
 						}
+	
+						/* Can we read? */
+						if ( ! $this->registry->permissions->check( 'view', $data ) )
+						{
+							$forumIdsBad[] = $forum_id;
+							continue;
+						}
+	
+						/* Can read, but is it password protected, etc? */
+						if ( ! $this->registry->class_forums->forumsCheckAccess( $forum_id, 0, 'forum', array(), true ) )
+						{
+							$forumIdsBad[] = $forum_id;
+							continue;
+						}
+	
+						if ( ! $data['sub_can_post'] OR ! $data['can_view_others'] AND !$this->memberData['g_access_cp'] )
+						{
+							$forumIdsBad[] = $forum_id;
+							continue;
+						}
+					
+						$forumIdsOk[] = $forum_id;
 					}
-
-					/* Can we read? */
-					if ( ! $this->registry->permissions->check( 'view', $data ) )
-					{
-						$forumIdsBad[] = $forum_id;
-						continue;
-					}
-
-					/* Can read, but is it password protected, etc? */
-					if ( ! $this->registry->class_forums->forumsCheckAccess( $forum_id, 0, 'forum', array(), true ) )
-					{
-						$forumIdsBad[] = $forum_id;
-						continue;
-					}
-
-					if ( ! $data['sub_can_post'] OR ! $data['can_view_others'] AND !$this->memberData['g_access_cp'] )
-					{
-						$forumIdsBad[] = $forum_id;
-						continue;
-					}
-				
-					$forumIdsOk[] = $forum_id;
 				}
 			}
 		}
 		
 		if ( ! count($forumIdsOk) )
 		{
-			$allowTrashCan = ( $cType == 'forum' ) ? true : false;
-			
 			/* Get list of good forum IDs */
-			$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds( null, array(), $allowTrashCan );
+			$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds();
 		}
 		
 		/* Add allowed forums */
@@ -204,7 +222,7 @@ class search_engine_forums extends search_engine
 		}
 	
 		/* Exclude some items */
-		if ( ! $content_title_only )
+		if ( $search_type != 'titles' )
 		{
 			if ( $permissions['SoftDeleteContent'] AND $permissions['PostSoftDeleteSee'] AND $permissions['canQueue'] )
 			{
@@ -265,7 +283,7 @@ class search_engine_forums extends search_engine
 				$this->search_end_timestamp = time() + 100;
 			}
 			
-			if ( $content_title_only )
+			if ( $search_type == 'titles' )
 			{
 				$this->sphinxClient->SetFilterRange( 'start_date', $this->search_begin_timestamp, $this->search_end_timestamp );
 			}
@@ -275,70 +293,117 @@ class search_engine_forums extends search_engine
 			}
 		}
 	
-		if ( IPSSearchRegistry::get('opt.noPostPreview') OR IPSSearchRegistry::get('display.onlyTitles') )
+		if ( IPSSearchRegistry::get('opt.noPostPreview') OR $search_type == 'titles' )
 		{
 			$groupby = true;
 		}
-	
-		if ( $content_title_only )
+		
+		/* Check tags */
+		$_tag   = '';
+		$tagIds = array();
+		
+		if ( $search_tags && $this->settings['tags_enabled'] )
 		{
-			if ( $sort_order == 'asc' )
+			$search_tags = explode( ",", $search_tags );
+			
+			$this->DB->build( array( 'select' => 'tag_id',
+									 'from'   => 'core_tags',
+									 'where'  => 'tag_meta_app=\'forums\' AND tag_meta_area=\'topics\' AND (' . $this->DB->buildLikeChain( 'tag_text', $search_tags, false ) . ')',
+									 'limit'  => array( 0, 500 ) ) );
+			
+			$o = $this->DB->execute();
+			
+			while( $row = $this->DB->fetch( $o ) )
 			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $sortKey );
-			}
-			else
-			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $sortKey );
+				$tagIds[] = $row['tag_id'];
 			}
 			
-			if ( $groupby )
+			if ( count( $tagIds ) )
 			{
-				$this->sphinxClient->SetGroupBy( 'last_post_group', SPH_GROUPBY_ATTR, '@group ' . $sort_order );
+				$this->sphinxClient->SetFilter( 'tag_id', $tagIds );
 			}
-			
-			$_s = ( $search_term ) ? '@title ' . $search_term : '';
-			
-			$result = $this->sphinxClient->Query( $_s, 'forums_search_posts_main,forums_search_posts_delta' );
-			
-			$this->logSphinxWarnings();
+		}
+
+		/* Set sort order */
+		if ( $sort_order == 'asc' )
+		{
+			$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $sortKey );
 		}
 		else
 		{
-			if ( $groupby )
-			{
-				$this->sphinxClient->SetGroupBy( 'last_post_group', SPH_GROUPBY_ATTR, '@group DESC');
-			}
+			$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $sortKey );
+		}
+
+		/* Generate sphinx search query */
+		switch( $search_type )
+		{
+			case 'titles':
+				/* Group by */
+				if ( $groupby )
+				{
+					/* @link http://community.invisionpower.com/topic/335036-sphinx-vncactive-content-sorting/ */
+					$this->sphinxClient->SetGroupDistinct ( "tid" );
+					$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, '@group ' . $sort_order );				
+				}
+				
+				$_s = ( $search_term ) ? '@title ' . $search_term : '';
+			break;
 			
-			if ( $sort_order == 'asc' )
-			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $sortKeyPost );
-			}
-			else
-			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $sortKeyPost );
-			}
+			case 'content':
+				/* Group by */
+				if ( $groupby )
+				{
+					$this->sphinxClient->SetSortMode( SPH_SORT_EXTENDED, $sortKeyPost . ' DESC' );
+					$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, 'last_post ' . $sort_order );
+					
+					IPSSearchRegistry::set('set.searchResultType', 'both' );
+				}
+				
 			
-			if ( $post_search_only )
-			{
 				$_s = ( $search_term ) ? '@post ' . $search_term : '';
-				$result = $this->sphinxClient->Query(  $_s, 'forums_search_posts_main,forums_search_posts_delta' );
-			}
-			else
-			{
-				$_s = ( $search_term AND strstr( $search_term, '"' ) ) ? '@post  ' . $search_term . ' | @title ' . $search_term : ( $search_term ? '@(post,title) ' . $search_term : '' );
-				$result = $this->sphinxClient->Query(  $_s, 'forums_search_posts_main,forums_search_posts_delta' );
-			}
+			break;
 			
-			$this->logSphinxWarnings();
+			case 'both':
+			default:
+				/* Group by */
+				if ( $groupby )
+				{
+					$this->sphinxClient->SetSortMode( SPH_SORT_EXTENDED, $sortKeyPost . ' DESC' );
+					$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, 'last_post ' . $sort_order );
+				}
+				
+				IPSSearchRegistry::set('set.searchResultType', 'both' );
+				
+				$_s = ( $search_term AND strstr( $search_term, '"' ) ) ? '@post  ' . $search_term . ' | @title ' . $search_term : ( $search_term ? '@(post,title) ' . $search_term : '' );
+			break;
 		}
 		
+		/* Perform search */
+		$result = $this->sphinxClient->Query( $_s . $_tag, $this->settings['sphinx_prefix'] . 'forums_search_posts_main, ' . $this->settings['sphinx_prefix'] . 'forums_search_posts_delta' );
+		
+		/* Log errors */
+		$this->logSphinxWarnings();
+		
+		/* Get result ids */
 		if ( is_array( $result['matches'] ) && count( $result['matches'] ) )
 		{
+			$c = 0;
+			
 			foreach( $result['matches'] as $res )
 			{
-				$search_ids[] = ( $content_title_only ) ? $res['attrs']['tid'] : $res['attrs']['search_id'];
+				$search_ids[] = ( $search_type == 'titles' && IPSSearchRegistry::get('set.searchResultType') != 'both' ) ? $res['attrs']['tid'] : $res['attrs']['search_id'];
 			}
 		}
+		
+		/* Set return type */
+		if ( $search_type == 'titles' )
+		{
+			IPSSearchRegistry::set('set.returnType', 'tids' );
+		}
+		else
+		{
+			IPSSearchRegistry::set('set.returnType', 'pids' );
+		}
 
 		/* Return it */
 		return array( 'count' => intval( $result['total_found'] ) > 1000 ? 1000 : $result['total_found'], 'resultSet' => $search_ids );
@@ -352,38 +417,53 @@ class search_engine_forums extends search_engine
 	 */
 	public function viewUserContent( $member )
 	{
-		/* Ensure we limit by date */
-		$this->settings['search_ucontent_days'] = ( $this->settings['search_ucontent_days'] ) ? $this->settings['search_ucontent_days'] : 365;
-	
 		/* Bit of init */
-		$time = time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) );
+		$time			= ( $member['last_post'] ? $member['last_post'] : time() ) - ( 86400 * intval( $this->settings['search_ucontent_days'] ) );
+		$sort_by		= IPSSearchRegistry::get('in.search_sort_by');
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
 
 		switch( IPSSearchRegistry::get('in.userMode') )
 		{
 			default:
 			case 'all': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', false );
-				IPSSearchRegistry::set('display.onlyTitles' , true );
-				IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				IPSSearchRegistry::set('opt.searchType', 'both');
+				IPSSearchRegistry::set('opt.noPostPreview'  , true );
 			break;
 			case 'title': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', true );
-				IPSSearchRegistry::set('display.onlyTitles' , true );
-				IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				IPSSearchRegistry::set('opt.searchType', 'titles');
+				IPSSearchRegistry::set('opt.noPostPreview'  , true );
 			break;	
 			case 'content': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', false );
-				IPSSearchRegistry::set('display.onlyTitles' , false );
+				IPSSearchRegistry::set('opt.searchType', 'content');
 				IPSSearchRegistry::set('opt.noPostPreview'  , false );
 			break;	
 		}
 		
+		/* Sorting */
+		switch( $sort_by )
+		{
+			default:
+			case 'date':
+				$sortKey     = 'last_post';
+				$sortKeyPost = 'post_date';
+			break;
+			case 'title':
+				$sortKeyPost = $sortKey  = 'tordinal';
+			break;
+			case 'posts':
+				$sortKeyPost = $sortKey  = 'posts';
+			break;
+			case 'views':
+				$sortKeyPost = $sortKey  = 'views';
+			break;
+		}
+		
 		/* Init */
 		$start		= IPSSearchRegistry::get('in.start');
 		$perPage    = IPSSearchRegistry::get('opt.search_per_page');
-	
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
+			
+		//IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
+		//IPSSearchRegistry::set('in.search_sort_order', 'desc' );
 		
 		/* Limit Results */
 		$this->sphinxClient->SetLimits( intval($start), intval($perPage) );
@@ -409,6 +489,7 @@ class search_engine_forums extends search_engine
 		}
 				
 		/* Set up perms */
+		$permissions						= array();
 		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
 		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
 		$permissions['PostSoftDeleteSee']   = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( 0 );
@@ -459,42 +540,72 @@ class search_engine_forums extends search_engine
 			}
 		}
 		
-		if ( IPSSearchRegistry::get('in.userMode') == 'title' )
+		/* Perform 'search' */
+		/* We have to sort by topic last post date for 'both' otherwise the topics will appear in random order.  Even though it's correctly ordering by YOUR post
+			date, the user just sees the list of topics with random last post date ordering.  In a future version it would be nice to change the last post column
+			on 'view user content' to show something like "you last posted on x date" instead of showing the topic last poster and last post date.
+			@link	http://community.invisionpower.com/tracker/issue-33692-my-content-second-page */
+		if ( IPSSearchRegistry::get('in.userMode') == 'title' OR IPSSearchRegistry::get('in.userMode') == 'all' )
 		{
+			/* Set return type */
+			IPSSearchRegistry::set('set.returnType', 'tids' );
+		
 			$this->sphinxClient->SetGroupDistinct ( "tid" );
-			$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, '@group DESC' );
+			$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, $sortKey . ' ' . $sort_order );
 			
-			$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, 'last_post' );
-			
-			$result = $this->sphinxClient->Query( '', 'forums_search_posts_main,forums_search_posts_delta' );
-			
-			$this->logSphinxWarnings();
-		}
-		else
-		{
-			if ( IPSSearchRegistry::get('in.userMode') == 'content' )
+			if ( $sort_order == 'asc' )
 			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, 'post_date' );
+				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $sortKey );
 			}
 			else
 			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, 'post_date' );
-				$this->sphinxClient->SetGroupBy( 'last_post_group', SPH_GROUPBY_ATTR, '@group desc' );
+				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $sortKey );
 			}
 			
-			$result = $this->sphinxClient->Query(  '', 'forums_search_posts_main,forums_search_posts_delta' );
-			
-			$this->logSphinxWarnings();
+			$result = $this->sphinxClient->Query( '', $this->settings['sphinx_prefix'] . 'forums_search_posts_main,' . $this->settings['sphinx_prefix'] . 'forums_search_posts_delta' );
 		}
+		else
+		{
+			/* Set return type */
+			if( IPSSearchRegistry::get('in.userMode') == 'all' )
+			{
+				IPSSearchRegistry::set('set.returnType', 'tids' );
+			}
+			else
+			{
+				IPSSearchRegistry::set('set.returnType', 'pids' );
+			}
+			
+			if ( $sort_order == 'asc' )
+			{
+				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $sortKeyPost );
+			}
+			else
+			{
+				$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $sortKeyPost );
+			}
+			
+			if ( IPSSearchRegistry::get('in.userMode') != 'content' )
+			{
+				$this->sphinxClient->SetGroupBy( 'tid', SPH_GROUPBY_ATTR, $sortKeyPost . ' ' . $sort_order );
+			}
+			
+			$result = $this->sphinxClient->Query(  '', $this->settings['sphinx_prefix'] . 'forums_search_posts_main,' . $this->settings['sphinx_prefix'] . 'forums_search_posts_delta' );
+		}
+		
+		/* Log warnings */
+		$this->logSphinxWarnings();
 
+		/* Get result ids */
 		if ( is_array( $result['matches'] ) && count( $result['matches'] ) )
 		{
 			foreach( $result['matches'] as $res )
 			{
-				$search_ids[] = ( IPSSearchRegistry::get('opt.searchTitleOnly') ) ? $res['attrs']['tid'] : $res['attrs']['search_id'];
+				$search_ids[] = ( IPSSearchRegistry::get('set.returnType') == 'tids' ) ? $res['attrs']['tid'] : $res['attrs']['search_id'];
 			}
 		}
 		
+		/* Return results */
 		return array( 'count' => intval( $result['total_found'] ) > 1000 ? 1000 : $result['total_found'], 'resultSet' => $search_ids );
 	}
 
@@ -507,50 +618,102 @@ class search_engine_forums extends search_engine
 	 */
 	public function viewNewContent()
 	{
-		$tids       = $this->registry->getClass('classItemMarking')->fetchCookieData( 'forums', 'items' );
-		$oldStamp   = $this->registry->getClass('classItemMarking')->fetchOldestUnreadTimestamp( array(), 'forums' );
-		$check      = IPS_UNIX_TIME_NOW - ( 86400 * 90 );
-		$forumIdsOk = array();
+		$oldStamp		= $this->registry->getClass('classItemMarking')->fetchOldestUnreadTimestamp( array(), 'forums' );
+		$check		    = IPS_UNIX_TIME_NOW - ( 86400 * $this->settings['topic_marking_keep_days'] );
+		$forumIdsOk		= array();
+		$start			= IPSSearchRegistry::get('in.start');
+		$perPage		= IPSSearchRegistry::get('opt.search_per_page');
+		$seconds		= IPSSearchRegistry::get('in.period_in_seconds');
+		$followedOnly	= $this->memberData['member_id'] ? IPSSearchRegistry::get('in.vncFollowFilterOn' ) : false;
+		$permissions	= array();
 		
 		/* Loop through the forums and build a list of forums we're allowed access to */
 		$bvnp = explode( ',', $this->settings['vnp_block_forums'] );
 		
 		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
 		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		IPSSearchRegistry::set('opt.searchTitleOnly' , true );
-		IPSSearchRegistry::set('display.onlyTitles'  , true );
 		IPSSearchRegistry::set('opt.noPostPreview'   , true );
+		IPSSearchRegistry::set('opt.searchType'      , 'titles' );
+		
+		$followedForums = array();
+		$followedTopics = array();
+
+		//-----------------------------------------
+		// Only content we have participated in?
+		//-----------------------------------------
+
+		if( IPSSearchRegistry::get('in.userMode') )
+		{
+			$_tempResults	= $this->viewUserContent( $this->memberData );
+			
+			if( $_tempResults['count'] )
+			{
+				$this->sphinxClient->SetFilter( 'tid', $_tempResults['resultSet'] );
+			}
+			else
+			{
+				return array( 'count' => 0, 'resultSet' => array() );
+			}
+
+			switch( IPSSearchRegistry::get('in.userMode') )
+			{
+				default:
+				case 'all':
+				case 'content':
+					IPSSearchRegistry::set('opt.searchType', 'both' );
+					IPSSearchRegistry::set('opt.noPostPreview'  , true );
+				break;
+				case 'title': 
+					IPSSearchRegistry::set('opt.searchType', 'titles' );
+					IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				break;
+			}
+		}
+		
+		/* Set return type */
+		IPSSearchRegistry::set('set.returnType', 'tids' );
 		
 		/* Get list of good forum IDs */
-		$_forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], $bvnp );
-		
-		if ( ! $this->memberData['bw_vnc_type'] )
+		$_forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], ( $followedOnly ) ? array() : $bvnp );
+
+		/* Fetch forum rel ids */
+		if ( $followedOnly )
 		{
-			$oldStamp   = IPSLib::fetchHighestNumber( array( intval( $this->memberData['_cache']['gb_mark__forums'] ), intval( $this->memberData['last_visit'] ) ) );
-			$tids       = array();
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
 			
-			$forumIdsOk = $_forumIdsOk;
+			/* @link http://community.invisionpower.com/tracker/issue-33284-view-new-content-just-items-i-follow */
+			//$like = classes_like::bootstrap( 'forums', 'forums' );
+			
+			//$followedForums = $like->getDataByMemberIdAndArea( $this->memberData['member_id'] );
+			$followedForums = array(); //( $followedForums === null ) ? array() : array_keys( $followedForums );
+			
+			$like = classes_like::bootstrap( 'forums', 'topics' );
+			
+			$followedTopics = $like->getDataByMemberIdAndArea( $this->memberData['member_id'] );
+			$followedTopics = ( $followedTopics === null ) ? array() : array_keys( $followedTopics );
+		}
+		
+		/* What type of date restriction? */
+		if ( IPSSearchRegistry::get('in.period_in_seconds') !== false )
+		{
+			$oldStamp	= ( time() - $seconds );
+			$forumIdsOk	= $_forumIdsOk;
 		}
 		else
 		{
 			foreach( $_forumIdsOk as $id )
 			{
+				if ( $followedOnly && ! in_array( $id, $followedForums ) )
+				{
+					// We don't want to skip followed topics just because we don't follow the forum
+					//continue;
+				}
+				
 				$lMarked    = $this->registry->getClass('classItemMarking')->fetchTimeLastMarked( array( 'forumID' => $id ), 'forums' );
 				$fData      = $this->registry->getClass('class_forums')->forumsFetchData( $id );
 			
 				if ( $fData['last_post'] > $lMarked )
 				{
-					/* Add to tids */
-					$_tids = $this->registry->getClass('classItemMarking')->fetchReadIds( array( 'forumID' => $id ), 'forums', false );
-					
-					if ( is_array( $_tids ) )
-					{
-						foreach( $_tids as $k => $v )
-						{
-							$tids[ $k ] = $v;
-						}
-					}
-					
 					$forumIdsOk[ $id ] = $id;
 				}
 			}
@@ -580,86 +743,137 @@ class search_engine_forums extends search_engine
 			}
 		}
 		
+		/* Only show VNC results from specified forums? */
+		if ( is_array(IPSSearchRegistry::get('forums.vncForumFilters')) AND count(IPSSearchRegistry::get('forums.vncForumFilters')) )
+		{
+			$_newIdsOk	= array();
+			
+			foreach( IPSSearchRegistry::get('forums.vncForumFilters') as $forumId )
+			{
+				if( in_array( $forumId, $forumIdsOk ) )
+				{
+					$_newIdsOk[]	= $forumId;
+				}
+			}
+			
+			$forumIdsOk	= $_newIdsOk;
+		}
+		
 		/* Set the timestamps */
 		$this->sphinxClient->SetFilterRange( 'last_post', $oldStamp, time() );
 		$this->setDateRange( 0, 0 );
 		
 		/* Force it into filter so that search can pick it up */
-		ipsRegistry::$request['search_app_filters']['forums']['forums'] = $forumIdsOk;
-		
-		/* Try and limit the TIDS */
-		if ( is_array( $tids ) AND count( $tids ) )
-		{
-			if ( count( $tids ) > 300 )
-			{
-				/* Sort by last read date */
-				arsort( $tids, SORT_NUMERIC );
-				$tids = array_slice( $tids, 0, 300 );
-			}
-							
-			$this->DB->build( array( 'select' => 'tid, last_post',
-							   		 'from'   => 'topics',
-							   	     'where'  => "tid IN (" . implode( ",", array_keys( $tids ) ) . ')' ) );
-							   
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
-			{
-				/* Posted in since last read? */
-				if ( $row['last_post'] > $tids[ $row['tid'] ] )
-				{
-					unset( $tids[ $row['tid'] ] );
-				}
-			}
-			
-			if ( count( $tids ) )
-			{
-				$tids = array_keys( $tids );
-			}
-		}
-		
-		/* Set read tids */
-		if ( count( $tids ) )
-		{
-			$this->sphinxClient->SetFilter( 'tid', $tids, TRUE );
-		}
+		$this->searchForumIds	= $forumIdsOk;
 		
 		/* Set up some vars */
 		IPSSearchRegistry::set('set.resultCutToDate', $oldStamp );
 		
-		return $this->search();
-	}
-	
-	/**
-	 * Perform the search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @return	array
-	 */
-	public function viewActiveContent()
-	{
-		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
+		/* Fetch first 300 results */
+		IPSSearchRegistry::set('opt.search_per_page', 300);
+		IPSSearchRegistry::set('in.start', 0);
+			
+		/* Run search */
+		$data = $this->search();
 		
-		/* Loop through the forums and build a list of forums we're allowed access to */
-		$bvnp = explode( ',', $this->settings['vnp_block_forums'] );
+		/* Reset for display function */
+		IPSSearchRegistry::set('in.start', $start);
+		IPSSearchRegistry::set('opt.search_per_page', $perPage);
 		
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		IPSSearchRegistry::set('opt.searchTitleOnly' , true );
-		IPSSearchRegistry::set('display.onlyTitles'  , true );
-		IPSSearchRegistry::set('opt.noPostPreview'   , true );
+		$_ffWhere = '';
 		
-		/* Get list of good forum IDs */
-		$forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], $bvnp );
+		/* Followed topics only */
+		if ( $followedOnly )
+		{
+			if ( ! count( $followedTopics ) && ! count( $followedForums ) )
+			{
+				return array( 'count' => 0, 'resultSet' => array() );
+			}
+			
+			if ( count( $followedForums ) )
+			{
+				/* @link http://community.invisionpower.com/tracker/issue-33284-view-new-content-just-items-i-follow */
+				//$_ffWhere = ' OR forum_id IN (' . implode( ',', $followedForums ) . ') ';
+			}
+		}
+		
+		/* This method allows us to have just one "tid IN()" clause, instead of two, depending on scenario */
+		if ( count($followedTopics) )
+		{
+			$where[]  = "( tid IN(" . implode( ',', $followedTopics ) . ')' . $_ffWhere . ' )';
+		}
+		else
+		{
+			if( !count($data['resultSet']) )
+			{
+				return array( 'count' => 0, 'resultSet' => array() );
+			}
 
-		/* Force it into filter so that search can pick it up */
-		ipsRegistry::$request['search_app_filters']['forums']['forums'] = $forumIdsOk;
+			$where[] = "( tid IN(" . implode( ',', $data['resultSet'] ) . ')' . $_ffWhere . ' )';	
+		}
 		
-		/* Set the timestamps */
-		$this->sphinxClient->SetFilterRange( 'last_post', intval( time() - $seconds ), time() );
-		$this->setDateRange( 0, 0 );
+		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
+		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
 		
-		return $this->search();
+		if ( $permissions['TopicSoftDeleteSee'] AND $permissions['canQueue'] )
+		{
+			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible', 'hidden', 'sdeleted' ) );
+		}
+		else if ( $permissions['TopicSoftDeleteSee'] )
+		{
+			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible', 'sdeleted' ) );
+		}
+		else if ( $permissions['canQueue'] )
+		{
+			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible', 'hidden' ) );
+		}
+		else
+		{
+			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible' )  );
+		}
+			
+		$where = implode( " AND ", $where );
+		
+		/* Fetch the count */
+		$count = $this->DB->buildAndFetch( array( 'select'   => 'count(*) as count',
+										  		  'from'     => 'topics',
+										 		  'where'    => $where ) );
+								 
+		/* Fetch the count */
+		if ( $count['count'] )
+		{
+			$limit = ( IPSSearchRegistry::get('in.period') != 'unread' ) ? array( $start, $perPage ) : array( 0, 1200 );
+		
+			$this->DB->build( array( 'select'   => 'tid, forum_id, last_post',
+									 'from'     => 'topics',
+									 'where'    => $where,
+									 'order'    => 'last_post DESC',
+									 'limit'    => $limit ) );
+									
+			$inner  = $this->DB->execute();
+			
+			while( $row = $this->DB->fetch( $inner ) )
+			{
+				$rtids[ $row['tid'] ] = $row;
+			}
+		}
+
+		/* Set up some vars */
+		IPSSearchRegistry::set('set.resultCutToDate', $oldStamp );
+		
+		if ( IPSSearchRegistry::get('in.period') == 'unread' )
+		{
+			$filter				= $this->registry->class_forums->postProcessVncTids( $rtids, array( $start, $perPage ) );
+			$data['count']		= $filter['count'];
+			$data['resultSet']	= $filter['tids'];
+		}
+		else
+		{
+			$data	= array( 'count' => $count['count'], 'resultSet' => array_keys( $rtids) );
+		}
+		
+		/* Return it */
+		return $data;
 	}
 	
 	/**
@@ -667,7 +881,7 @@ class search_engine_forums extends search_engine
 	 *
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
@@ -681,7 +895,7 @@ class search_engine_forums extends search_engine
 	/**
 	 * Returns an array used in the searchplugin's setCondition method
 	 *
-	 * @param	array 	$data	Array of forums to view
+	 * @param	array 	$data	Array of filters to apply
 	 * @return	array 	Array with column, operator, and value keys, for use in the setCondition call
 	 */
 	public function buildFilterSQL( $data )
@@ -691,7 +905,11 @@ class search_engine_forums extends search_engine
 		
 		/* Set up some defaults */
 		IPSSearchRegistry::set( 'opt.noPostPreview'  , true );
-		IPSSearchRegistry::set( 'opt.onlySearchPosts', false );
+		
+		if ( ! IPSSearchRegistry::get('opt.searchType' ) )
+		{
+			IPSSearchRegistry::set( 'opt.searchType', 'both' );
+		}
 		
 		if( isset( $data ) && is_array( $data ) && count( $data ) )
 		{
@@ -703,12 +921,6 @@ class search_engine_forums extends search_engine
 					IPSSearchRegistry::set( 'opt.noPostPreview', false );
 				}
 
-				/* CONTENT ONLY */
-				if ( $field == 'contentOnly' AND $_data['contentOnly'] == 1 )
-				{
-					IPSSearchRegistry::set( 'opt.onlySearchPosts', true );
-				}
-
 				/* POST COUNT */
 				if ( $field == 'pCount' AND intval( $_data['pCount'] ) > 0 )
 				{
@@ -726,7 +938,7 @@ class search_engine_forums extends search_engine
 		}
 		else
 		{
-			return '';
+			return array();
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/search/engines/sql.php b/upload/admin/applications/forums/extensions/search/engines/sql.php
index 35a693b7..24d02572 100644
--- a/upload/admin/applications/forums/extensions/search/engines/sql.php
+++ b/upload/admin/applications/forums/extensions/search/engines/sql.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Basic Forum Search
- * Last Updated: $Date: 2010-02-23 12:38:11 +0000 (Tue, 23 Feb 2010) $
+ * Last Updated: $Date: 2011-09-29 22:09:09 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5861 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9570 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -37,9 +37,17 @@ class search_engine_forums extends search_engine
 		{
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
 			ipsRegistry::setClass( 'class_forums', new $classToLoad( ipsRegistry::instance() ) );
+			ipsRegistry::getClass('class_forums')->strip_invisible = 1;
 			ipsRegistry::getClass('class_forums')->forumsInit();
 		}
 		
+		/* Load tagging stuff */
+		if ( ! $registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
+		
 		parent::__construct( $registry );
 	}
 	
@@ -55,33 +63,38 @@ class search_engine_forums extends search_engine
 	public function search()
 	{
 		/* INIT */ 
-		$count       		= 0;
-		$results     		= array();
 		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
 		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
 		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
+		$search_tags        = IPSSearchRegistry::get('in.raw_search_tags');
 		$rows    			= array();
-		$count   			= 0;
 		$c                  = 0;
 		$got     			= 0;
 		$sortKey			= '';
 		$sortType			= '';
 		$cType              = IPSSearchRegistry::get('contextual.type');
 		$cId		        = IPSSearchRegistry::get('contextual.id' );
-			
+		$topicIds			= array();
+		
 		/* Contextual search */
 		if ( $cType == 'topic' )
 		{
-			$content_title_only = false;
-			$post_search_only   = true;
-			
-			IPSSearchRegistry::set('opt.searchTitleOnly', false);
-			IPSSearchRegistry::set('opt.onlySearchPosts', true);
-			IPSSearchRegistry::set('display.onlyTitles', false);
+			IPSSearchRegistry::set('opt.searchType', 'content');
 			IPSSearchRegistry::set('opt.noPostPreview', false);
+			IPSSearchRegistry::set('set.returnType', 'pids' );
+		}
+		
+		/* If searching tags, we don't show a preview */
+		if( $search_tags )
+		{
+			IPSSearchRegistry::set('opt.noPostPreview', true);
+			IPSSearchRegistry::set('set.returnType', 'tids' );
+		}
+		
+		/* Set up the flag for displaying results for posts and topics */
+		if ( IPSSearchRegistry::get('opt.searchType') == 'both' || ( IPSSearchRegistry::get('opt.searchType') == 'content' && IPSSearchRegistry::get('opt.noPostPreview') ) )
+		{
+			IPSSearchRegistry::set('set.searchResultType', 'both' );
 		}
 		
 		/* Sorting */
@@ -89,7 +102,7 @@ class search_engine_forums extends search_engine
 		{
 			default:
 			case 'date':
-				$sortKey  = ( $content_title_only ) ? 'last_post' : 'post_date';
+				$sortKey  = ! IPSSearchRegistry::searchTitleOnly() ? 'post_date' : 'last_post';
 				$sortType = 'numerical';
 			break;
 			case 'title':
@@ -105,46 +118,109 @@ class search_engine_forums extends search_engine
 				$sortType = 'numerical';
 			break;
 		}
-				
+
 		/* Search in titles */
-		if ( $content_title_only )
+		if ( $search_term OR !($search_tags && $this->settings['tags_enabled']) )
 		{
-			/* Do the search */
-			$this->DB->build( array( 
-									'select'   => "t.tid as id, t.tid as topic_id, t.title, t.posts, t.views, t.last_post",
-									'from'	   => 'topics t',
-	 								'where'	   => $this->_buildWhereStatement( $search_term, $content_title_only ),
-									'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
-									'order'    => 't.'.$sortKey . ' ' . $order_dir ) );
-		}
-		else
-		{
-			/* Do the search */
-			$this->DB->build( array( 
-									'select'   => "p.pid as id, post_date, p.topic_id",
-									'from'	   => array( 'posts' => 'p' ),
-	 								'where'	   => $this->_buildWhereStatement( $search_term, $content_title_only, '', null, ( IPSSearchRegistry::get('opt.onlySearchPosts') || IPSSearchRegistry::get('in.search_author') ) ? false : true ),
-									'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
-									'order'    => $sortKey . ' ' . $sort_order,
-									'add_join' => array( array( 'select' => 't.title, t.posts, t.views',
-																'from'	 => array( 'topics' => 't' ),
-												 				'where'	 => 't.tid=p.topic_id',
-												 				'type'	 => 'left' ) ) ) );
-		}
-
-		$DB = $this->DB->execute();
-
-		/* Fetch all to sort */
-		while( $r = $this->DB->fetch( $DB ) )
-		{
-			if ( IPSSearchRegistry::get('opt.noPostPreview') )
+			if ( ! IPSSearchRegistry::searchTitleOnly() )
 			{
-				$_rows[ $r['topic_id'] ] = $r;
+				/* Do the search */
+				$this->DB->build( array( 
+										'select'   => "p.pid as id, p.post_date, p.topic_id",
+										'from'	   => array( 'posts' => 'p' ),
+		 								'where'	   => $this->_buildWhereStatement( $search_term, IPSSearchRegistry::searchTitleOnly(), '', null, ( IPSSearchRegistry::get('opt.searchType') == 'content' || IPSSearchRegistry::get('in.search_author') ) ? false : true ),
+										'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
+										'order'    => $sortKey . ' ' . $sort_order,
+										'add_join' => array( array( 'select' => 't.title, t.posts, t.views',
+																	'from'	 => array( 'topics' => 't' ),
+													 				'where'	 => 't.tid=p.topic_id',
+													 				'type'	 => 'left' ) ) ) );
 			}
 			else
 			{
-			$_rows[ $r['id'] ] = $r;
+				/* Do the search */
+				$this->DB->build( array( 
+										'select'   => "t.tid as id, t.tid as topic_id, t.title, t.posts, t.views, t.last_post",
+										'from'	   => 'topics t',
+		 								'where'	   => str_replace( 'p.author_id', 't.starter_id', $this->_buildWhereStatement( $search_term, IPSSearchRegistry::searchTitleOnly() ) ),
+										'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
+										'order'    => 't.'.$sortKey . ' ' . $sort_order ) );
+			}
+	
+			$DB = $this->DB->execute();
+	
+			/* Fetch all to sort */
+			while( $r = $this->DB->fetch( $DB ) )
+			{
+				$topicIds[] = $r['topic_id'];
+				
+				if ( IPSSearchRegistry::get('opt.noPostPreview') )
+				{
+					$_rows[ $r['topic_id'] ] = $r;
+				}
+				else
+				{
+					$_rows[ $r['id'] ] = $r;
+				}
+			}
 		}
+		
+		/* Check tags */
+		if ( $search_tags && $this->settings['tags_enabled'] )
+		{
+			$tags = $this->registry->tags->search( $search_tags, array( 'meta_parent_id' => $this->request['search_app_filters']['forums']['forums'],
+																		'meta_app'		 => 'forums',
+																		'meta_area'		 => 'topics',
+																		'meta_id'		 => $topicIds,
+																		//'sortKey'		 => 't.' . str_replace( 'post_date', 'topic_firstpost', $sortKey ),
+																		'sortOrder'		 => $sort_order,
+																		/*'joins' 		 => array( 'select' => 't.tid',
+																								   'from'	=> array( 'topics' => 't' ),
+																								   'where'  => 't.tid=tg.tag_meta_id',
+																								   'type'   => 'left' )*/ ) );
+			
+			/* Do the search */
+			if ( is_array( $tags) && count( $tags ) )
+			{
+				$_tagIds = array();
+				$_rows   = array();
+				
+				foreach( $tags as $id => $data )
+				{
+					$_tagIds[] = $data['tag_meta_id'];
+				}
+				
+				$this->DB->build( array('select'	=> "t.tid as id, t.tid as topic_id, t.title, t.posts, t.views, t.last_post",
+										'from'		=> array( 'topics' => 't' ),
+		 								'where'		=> 't.tid IN (' . implode( ",", $_tagIds ) . ')',
+										'limit'		=> array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
+										'order'		=> 't.'.str_replace( 'post_date', 'topic_firstpost', $sortKey ) . ' ' . $sort_order,
+										'add_join'	=> array(
+															array(
+																'select'	=> 'p.pid',
+																'from'		=> array( 'posts' => 'p' ),
+																'where'		=> 'p.pid=t.topic_firstpost',
+																'type'		=> 'left',
+																)
+															)
+								)		);
+				
+		
+				$DB = $this->DB->execute();
+		
+				/* Fetch all to merge and sort */
+				while( $r = $this->DB->fetch( $DB ) )
+				{
+					if ( IPSSearchRegistry::searchTitleOnly() )
+					{
+						$_rows[ $r['topic_id'] ] = $r;
+					}
+					else
+					{
+						$_rows[ $r['pid'] ] = $r;
+					}
+				}
+			}
 		}
 		
 		/* Fetch count */
@@ -156,10 +232,10 @@ class search_engine_forums extends search_engine
 			
 			IPSSearchRegistry::set('set.resultsCutToLimit', true );
 		}
-		
+
 		/* Set vars */
 		IPSSearch::$ask = $sortKey;
-		IPSSearch::$aso = strtolower( $order_dir );
+		IPSSearch::$aso = strtolower( $sort_order );
 		IPSSearch::$ast = $sortType;
 		
 		/* Sort */
@@ -188,7 +264,7 @@ class search_engine_forums extends search_engine
 				}
 			}
 		}
-	
+
 		/* Return it */
 		return array( 'count' => $count, 'resultSet' => $rows );
 	}
@@ -201,45 +277,67 @@ class search_engine_forums extends search_engine
 	 */
 	public function viewUserContent( $member )
 	{
-		$app = IPSSearchRegistry::get('in.search_app');
-	
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		
+		$sort_by		= IPSSearchRegistry::get('in.search_sort_by');
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
+
 		switch( IPSSearchRegistry::get('in.userMode') )
 		{
 			default:
 			case 'all': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', true );
-				IPSSearchRegistry::set('display.onlyTitles' , true );
-				IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				IPSSearchRegistry::set('opt.searchType', 'both' );
+				IPSSearchRegistry::set('opt.noPostPreview'  , true );
+				IPSSearchRegistry::set('set.returnType', 'tids' );
 			break;
 			case 'title': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', true );
-				IPSSearchRegistry::set('display.onlyTitles' , true );
-				IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				IPSSearchRegistry::set('opt.searchType', 'titles' );
+				IPSSearchRegistry::set('opt.noPostPreview'  , true );
+				IPSSearchRegistry::set('set.returnType', 'tids' );
 			break;	
 			case 'content': 
-				IPSSearchRegistry::set('opt.searchTitleOnly', false );
-				IPSSearchRegistry::set('display.onlyTitles' , false );
+				IPSSearchRegistry::set('opt.searchType', 'content' );
 				IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				IPSSearchRegistry::set('set.returnType', 'pids' );
 			break;	
 		}
+
+		/* Sorting */
+		switch( $sort_by )
+		{
+			default:
+			case 'date':
+				$sortKey  = IPSSearchRegistry::get('opt.searchType') == 'content' ? 'p.post_date' : 't.last_post';
+				$sortType = 'numerical';
+			break;
+			case 'title':
+				$sortKey  = 't.title';
+				$sortType = 'string';
+			break;
+			case 'posts':
+				$sortKey  = 't.posts';
+				$sortType = 'numerical';
+			break;
+			case 'views':
+				$sortKey  = 't.views';
+				$sortType = 'numerical';
+			break;
+		}
 		
 		/* Init */
 		$start		= IPSSearchRegistry::get('in.start');
-		$perPage    = IPSSearchRegistry::get('opt.search_per_page');
+		$perPage	= IPSSearchRegistry::get('opt.search_per_page');
 
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		
-		/* Ensure we limit by date */
-		$this->settings['search_ucontent_days'] = ( $this->settings['search_ucontent_days'] ) ? $this->settings['search_ucontent_days'] : 365;
-		
 		/* Get list of good forum IDs */
 		$forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'] );
 
-		$forumIdsOk  	= ( count( $forumIdsOk ) ) ? $forumIdsOk : array( 0 => 0 );
+		//-----------------------------------------
+		// No forums?
+		//-----------------------------------------
+		
+		if( !count( $forumIdsOk ) )
+		{
+			return array( 'count' => 0, 'resultSet' => array() );
+		}
+
 		$topic_where[]	= "t.forum_id IN (" . implode( ",", $forumIdsOk ) . ")";
 		
 		if ( IPSSearchRegistry::get('in.userMode') != 'title' )
@@ -251,18 +349,21 @@ class search_engine_forums extends search_engine
 		{
 			if ( IPSSearchRegistry::get('in.userMode') != 'title' )
 			{
-				$where[]       = "p.post_date > " . ( time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ) );
+				$where[]       = "p.post_date > " . ( ( $member['last_post'] ? $member['last_post'] : time() ) - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ) );
 			}
 			
-			$topic_where[] = "t.start_date > " . ( time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ) );
+			$topic_where[] = "t.last_post > " . ( ( $member['last_post'] ? $member['last_post'] : time() ) - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ) );
 		}
-				
+		
+		$where[]	= "state != 'link'";
+		
 		/* Set up perms */
+		$permissions						= array();
 		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
 		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
 		$permissions['PostSoftDeleteSee']   = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( 0 );
-		$permissions['SoftDeleteReason']       = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( 0 );
-		$permissions['SoftDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( 0 );
+		$permissions['SoftDeleteReason']	= $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( 0 );
+		$permissions['SoftDeleteContent']	= $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( 0 );
 		
 		/* Exclude some items */
 		if ( IPSSearchRegistry::get('in.userMode') != 'title' )
@@ -311,7 +412,7 @@ class search_engine_forums extends search_engine
 			$this->DB->build( array( 'select'   => 't.tid, t.last_post, t.topic_firstpost',
 									 'from'     => 'topics t',
 									 'where'    => implode( ' AND ', $topic_where ) . " AND t.starter_id=" . intval( $member['member_id'] ),
-									 'order'    => 't.last_post DESC',
+									 'order'    => $sortKey . ' ' . $sort_order,
 									 'limit'    => array(0, 1000 ) ) );
 			$this->DB->execute();
 			
@@ -320,8 +421,8 @@ class search_engine_forums extends search_engine
 				$pids[ $t['tid'] ] = $t['last_post'];
 			}
 			
-			$where = ( array_merge( (array) $where, (array) $topic_where ) );
-			$where = implode( " AND ", $where );
+			$where	= ( array_merge( (array) $where, (array) $topic_where ) );
+			$where	= implode( " AND ", $where );
 			
 			/* Now for posts */
 			$this->DB->build( array( 'select'   => 'p.pid',
@@ -346,7 +447,7 @@ class search_engine_forums extends search_engine
 			if ( $count['count'] )
 			{
 				arsort( $pids, SORT_NUMERIC );
-				$tids = array_slice( array_keys( $pids ), $start, $perPage );
+				$tids = array_slice( array_keys( $pids ), $start, $perPage, true );
 			} 
 		}
 		else if ( IPSSearchRegistry::get('in.userMode') == 'title' )
@@ -367,7 +468,7 @@ class search_engine_forums extends search_engine
 				$this->DB->build( array( 'select'   => 'tid',
 										 'from'     => 'topics t',
 										 'where'    => $where,
-										 'order'    => 't.tid DESC',
+										 'order'    => $sortKey . ' ' . $sort_order,
 										 'limit'    => array( $start, $perPage ) ) );
 										
 				$inner = $this->DB->execute();
@@ -390,7 +491,7 @@ class search_engine_forums extends search_engine
 											 		  'add_join' => array( array( 'from'   => array( 'posts' => 'p' ),
 											 		  							  'where'  => 'p.topic_id=t.tid',
 											 		  							  'type'   => 'left' ) ) ) );
-									 
+
 			/* Fetch the count */
 			if ( $count['count'] )
 			{
@@ -401,7 +502,7 @@ class search_engine_forums extends search_engine
 								 		  							 'from'   => array( 'posts' => 'p' ),
 								 		  							 'where'  => 'p.topic_id=t.tid',
 								 		  							 'type'   => 'left' ) ),
-										 'order'    => 't.last_post DESC',
+										 'order'    => $sortKey . ' ' . $sort_order,
 										 'limit'    => array( $start, $perPage ) ) );
 										
 				$inner = $this->DB->execute();
@@ -429,70 +530,122 @@ class search_engine_forums extends search_engine
 	 */
 	public function viewNewContent()
 	{
-		$rtids      = array();
-		$tids       = $this->registry->getClass('classItemMarking')->fetchCookieData( 'forums', 'items' );
-		$oldStamp   = $this->registry->getClass('classItemMarking')->fetchOldestUnreadTimestamp( array(), 'forums' );
-		$check      = IPS_UNIX_TIME_NOW - ( 86400 * 90 );
-		$forumIdsOk = array();
+		$rtids		= array();
+		$oldStamp	= $this->registry->getClass('classItemMarking')->fetchOldestUnreadTimestamp( array(), 'forums' );
+		$check		= IPS_UNIX_TIME_NOW - ( 86400 * $this->settings['topic_marking_keep_days'] );
+		$forumIdsOk	= array();
+		$where		= array();
+		$_tidsOnly	= array();
 		
 		/* Loop through the forums and build a list of forums we're allowed access to */
-		$bvnp       = explode( ',', $this->settings['vnp_block_forums'] );
-		$start		= IPSSearchRegistry::get('in.start');
-		$perPage    = IPSSearchRegistry::get('opt.search_per_page');
+		$bvnp			= explode( ',', $this->settings['vnp_block_forums'] );
+		$start			= IPSSearchRegistry::get('in.start');
+		$perPage		= IPSSearchRegistry::get('opt.search_per_page');
+		$seconds		= IPSSearchRegistry::get('in.period_in_seconds');
+		$followedOnly	= $this->memberData['member_id'] ? IPSSearchRegistry::get('in.vncFollowFilterOn' ) : false;
 		
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		IPSSearchRegistry::set('opt.searchTitleOnly' , true );
-		IPSSearchRegistry::set('display.onlyTitles'  , true );
-		IPSSearchRegistry::set('opt.noPostPreview'   , true );
+		$followedForums	= array();
+		$followedTopics	= array();
 		
-		if ( intval( $this->memberData['_cache']['gb_mark__forums'] ) > 0 )
-		{
-			$oldStamp = $this->memberData['_cache']['gb_mark__forums'];
-		}
+		IPSSearchRegistry::set('in.search_sort_by'		, 'date' );
+		IPSSearchRegistry::set('in.search_sort_order'	, 'desc' );
+		IPSSearchRegistry::set('opt.searchType'			, 'titles' );
+		IPSSearchRegistry::set('opt.noPostPreview'		, true );
 		
-		/* Finalize times */
-		if ( ! $oldStamp OR $oldStamp == IPS_UNIX_TIME_NOW )
+		//-----------------------------------------
+		// Only content we have participated in?
+		//-----------------------------------------
+
+		if( IPSSearchRegistry::get('in.userMode') )
 		{
-			$oldStamp = intval( $this->memberData['last_visit'] );
-		}
-		
-		/* Older than 3 months.. then limit */
-		if ( $oldStamp < $check )
-		{
-			$oldStamp = $check;
-		}
-	
-		/* Get list of good forum IDs */
-		$_forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], $bvnp );
-				
-		if ( ! $this->memberData['bw_vnc_type'] )
-		{
-			$oldStamp = IPSLib::fetchHighestNumber( array( intval( $this->memberData['_cache']['gb_mark__forums'] ), intval( $this->memberData['last_visit'] ) ) );
-			$where[]  = "last_post > " .  $oldStamp;
+			$_tempResults	= $this->viewUserContent( $this->memberData );
 			
+			if( $_tempResults['count'] )
+			{
+				$_tidsOnly	= array_merge( $_tidsOnly, $_tempResults['resultSet'] );
+			}
+			else
+			{
+				return array( 'count' => 0, 'resultSet' => array() );
+			}
+
+			switch( IPSSearchRegistry::get('in.userMode') )
+			{
+				default:
+				case 'all':
+				case 'content':
+					IPSSearchRegistry::set('opt.searchType', 'both' );
+					IPSSearchRegistry::set('opt.noPostPreview'  , true );
+				break;
+				case 'title': 
+					IPSSearchRegistry::set('opt.searchType', 'titles' );
+					IPSSearchRegistry::set('opt.noPostPreview'  , false );
+				break;
+			}
+		}
+		
+		/* Set return type */
+		IPSSearchRegistry::set('set.returnType', 'tids' );
+		
+		/* Get list of good forum IDs */
+		$_forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], ( $followedOnly ) ? array() : $bvnp );
+
+		/* Fetch forum rel ids */
+		if ( $followedOnly )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			
+			/* @link http://community.invisionpower.com/tracker/issue-33284-view-new-content-just-items-i-follow */
+			//$like = classes_like::bootstrap( 'forums', 'forums' );
+			
+			//$followedForums = $like->getDataByMemberIdAndArea( $this->memberData['member_id'] );
+			$followedForums = array(); //( $followedForums === null ) ? array() : array_keys( $followedForums );
+			
+			$like = classes_like::bootstrap( 'forums', 'topics' );
+			
+			$followedTopics = $like->getDataByMemberIdAndArea( $this->memberData['member_id'] );
+			$followedTopics = ( $followedTopics === null ) ? array() : array_keys( $followedTopics );
+		}
+
+		/* Period filtering */
+		if ( IPSSearchRegistry::get('in.period_in_seconds') !== false )
+		{
+			$where[]  = "last_post > " .  ( IPS_UNIX_TIME_NOW - $seconds );
+
 			$forumIdsOk = $_forumIdsOk;
 		}
 		else
 		{
+			if ( intval( $this->memberData['_cache']['gb_mark__forums'] ) > 0 )
+			{
+				$oldStamp = $this->memberData['_cache']['gb_mark__forums'];
+			}
+
+			/* Finalize times */
+			if ( ! $oldStamp OR $oldStamp == IPS_UNIX_TIME_NOW )
+			{
+				$oldStamp = intval( $this->memberData['last_visit'] );
+			}
+			
+			/* Older than 3 months.. then limit */
+			if ( $oldStamp < $check )
+			{
+				$oldStamp = $check;
+			}
+		
 			foreach( $_forumIdsOk as $id )
 			{
+				/*if ( $followedOnly && ! in_array( $id, $followedForums ) )
+				{
+					// We don't want to skip followed topics just because we don't follow the forum
+					continue;
+				}*/
+				
 				$lMarked    = $this->registry->getClass('classItemMarking')->fetchTimeLastMarked( array( 'forumID' => $id ), 'forums' );
 				$fData      = $this->registry->getClass('class_forums')->forumsFetchData( $id );
-			
+				
 				if ( $fData['last_post'] > $lMarked )
 				{
-					/* Add to tids */
-					$_tids = $this->registry->getClass('classItemMarking')->fetchReadIds( array( 'forumID' => $id ), 'forums', false );
-					
-					if ( is_array( $_tids ) )
-					{
-						foreach( $_tids as $k => $v )
-						{
-							$tids[ $k ] = $v;
-						}
-					}
-					
 					$forumIdsOk[ $id ] = $id;
 				}
 			}
@@ -504,52 +657,41 @@ class search_engine_forums extends search_engine
 				return array( 'count' => 0, 'resultSet' => array() );
 			}
 			
-			/* Try and limit the TIDS */
-			if ( is_array( $tids ) AND count( $tids ) )
-			{
-				if ( count( $tids ) > 300 )
-				{
-					/* Sort by last read date */
-					arsort( $tids, SORT_NUMERIC );
-					$tids = array_slice( $tids, 0, 300 );
-				}
-								
-				$this->DB->build( array( 'select' => 'tid, last_post',
-								   		 'from'   => 'topics',
-								   	     'where'  => "tid IN (" . implode( ",", array_keys( $tids ) ) . ')' ) );
-								   
-				$this->DB->execute();
-				
-				while( $row = $this->DB->fetch() )
-				{
-					/* Posted in since last read? */
-					if ( $row['last_post'] > $tids[ $row['tid'] ] )
-					{
-						unset( $tids[ $row['tid'] ] );
-					}
-				}
-				
-				if ( count( $tids ) )
-				{
-					$tids = array_keys( $tids );
-				}
-			}
-			
 			/* Based on oldest timestamp */
 			$where[] = "last_post > " . $oldStamp;
-			
-			/* Set read tids */
-			if ( count( $tids ) )
-			{
-				$where[] = "tid NOT IN (" . implode( ",", $tids ) . ')';
-			}
 		}
-		
+
 		$forumIdsOk	= ( count( $forumIdsOk ) ) ? $forumIdsOk : array( 0 => 0 );
+		
+		/* Only show VNC results from specified forums? */
+		if( is_array(IPSSearchRegistry::get('forums.vncForumFilters')) AND count(IPSSearchRegistry::get('forums.vncForumFilters')) )
+		{
+			$_newIdsOk	= array();
+			
+			foreach( IPSSearchRegistry::get('forums.vncForumFilters') as $forumId )
+			{
+				if( in_array( $forumId, $forumIdsOk ) )
+				{
+					$_newIdsOk[]	= $forumId;
+				}
+			}
+			
+			$forumIdsOk	= $_newIdsOk;
+		}
+
+		//-----------------------------------------
+		// No forums?
+		//-----------------------------------------
+		
+		if( !count( $forumIdsOk ) )
+		{
+			return array( 'count' => 0, 'resultSet' => array() );
+		}
+
 		$where[]	= "forum_id IN (" . implode( ",", $forumIdsOk ) . ")";
 		
 		/* Add in last bits */
-		$where[] = "state != 'link'";
+		$where[]	= "state != 'link'";
 		
 		/* Set up perms */
 		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
@@ -557,23 +699,63 @@ class search_engine_forums extends search_engine
 		
 		if ( $permissions['TopicSoftDeleteSee'] AND $permissions['canQueue'] )
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden', 'sdeleted') );
+			$permWhere = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden', 'sdeleted') );
 		}
 		else if ( $permissions['TopicSoftDeleteSee'] )
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'sdeleted') );
+			$permWhere = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'sdeleted') );
 		}
 		else if ( $permissions['canQueue'] )
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden') );
+			$permWhere = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden') );
 		}
 		else
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible' )  );
+			$permWhere = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible' )  );
+		}
+		
+		/* add perm */
+		$where[]  = $permWhere;
+		$_ffWhere = '';
+		
+		/* Followed topics only? */
+		if ( $followedOnly )
+		{
+			if ( ! count( $followedTopics ) && ! count( $followedForums ) )
+			{
+				return array( 'count' => 0, 'resultSet' => array() );
+			}
+
+			$_tidsOnly	= array_merge( $_tidsOnly, $followedTopics );
+			
+			if ( count( $followedForums ) )
+			{
+				$_ffWhere = ' OR forum_id IN (' . implode( ',', $followedForums ) . ') ';
+			}
+		}
+
+		/* This method allows us to have just one "tid IN()" clause, instead of two, depending on scenario */
+		if( count($_tidsOnly) AND count($followedTopics) )
+		{
+			/* Only look for tids in both arrays */
+			$_both	= array_intersect( $_tidsOnly, $followedTopics );
+			
+			if( count($_both) )
+			{
+				$where[]  = "( tid IN(" . implode( ',', $_both ) . ')' . $_ffWhere . ' )';
+			}
+		}
+		else if( count($_tidsOnly) )
+		{
+			$where[]  = "( tid IN(" . implode( ',', $_tidsOnly ) . ')' . $_ffWhere . ' )';
+		}
+		else if( count($followedTopics) )
+		{
+			$where[]  = "( tid IN(" . implode( ',', $followedTopics ) . ')' . $_ffWhere . ' )';
 		}
 
 		$where = implode( " AND ", $where );
-		
+
 		/* Fetch the count */
 		$count = $this->DB->buildAndFetch( array( 'select'   => 'count(*) as count',
 										  		  'from'     => 'topics',
@@ -582,102 +764,38 @@ class search_engine_forums extends search_engine
 		/* Fetch the count */
 		if ( $count['count'] )
 		{
-			$this->DB->build( array( 'select'   => 'tid',
+			$limit = ( IPSSearchRegistry::get('in.period') != 'unread' ) ? array( $start, $perPage ) : array( 0, 1200 );
+		
+			$this->DB->build( array( 'select'   => 'tid, forum_id, last_post',
 									 'from'     => 'topics',
 									 'where'    => $where,
 									 'order'    => 'last_post DESC',
-									 'limit'    => array( $start, $perPage ) ) );
+									 'limit'    => $limit ) );
 									
-			$inner = $this->DB->execute();
+			$inner  = $this->DB->execute();
 			
 			while( $row = $this->DB->fetch( $inner ) )
 			{
-				$rtids[ $row['tid'] ] = $row['tid'];
+				$rtids[ $row['tid'] ] = $row;
 			}
 		}
 		
 		/* Set up some vars */
 		IPSSearchRegistry::set('set.resultCutToDate', $oldStamp );
 		
-		/* Return it */
-		return array( 'count' => $count['count'], 'resultSet' => $rtids );
-	}
-	
-	/**
-	 * Perform the search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @return	nothin'
-	 */
-	public function viewActiveContent()
-	{
-		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
-		
-		/* Loop through the forums and build a list of forums we're allowed access to */
-		$where		= array();
-		$forumIdsOk	= array();
-		$bvnp		= explode( ',', $this->settings['vnp_block_forums'] );
-		$start		= IPSSearchRegistry::get('in.start');
-		$perPage    = IPSSearchRegistry::get('opt.search_per_page');
-		$tids	    = array();
-		
-		/* Get list of good forum IDs */
-		$forumIdsOk	= $this->registry->class_forums->fetchSearchableForumIds( $this->memberData['member_id'], $bvnp );
-
-		$forumIdsOk	= ( count( $forumIdsOk ) ) ? $forumIdsOk : array( 0 => 0 );
-		$where[]	= "t.forum_id IN (" . implode( ",", $forumIdsOk ) . ")";
-
-		/* Generate last post times */
-		$where[] = "t.last_post > " . intval( time() - $seconds );
-		
-		/* Set up perms */
-		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
-		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
-		
-		/* Add in last bits */
-		$where[] = "t.state != 'link'";
-		
-		if ( $permissions['TopicSoftDeleteSee'] AND $permissions['canQueue'] )
+		if( IPSSearchRegistry::get('in.period') == 'unread' )
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden', 'sdeleted'), 't.');
-		}
-		else if ( $permissions['TopicSoftDeleteSee'] )
-		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'sdeleted'), 't.');
-		}
-		else if ( $permissions['canQueue'] )
-		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden'), 't.');
+			$filter				= $this->registry->class_forums->postProcessVncTids( $rtids, array( $start, $perPage ) );
+			$data['count']		= $filter['count'];
+			$data['resultSet']	= $filter['tids'];
 		}
 		else
 		{
-			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible' ), 't.' );
-		}
-		
-		$where = implode( " AND ", $where );
-		
-		/* Fetch the count */
-		$count = $this->DB->buildAndFetch( array( 'select'   => 'COUNT(tid) as count',
-												  'from'     => array( 'topics' => 't' ),
-												  'where'    => $where ) );
-								
-		
-		/* Grab */
-		$this->DB->build( array( 'select'   => 'tid',
-								 'from'     => array( 'topics' => 't' ),
-								 'where'    => $where,
-								 'order'    => 'last_post DESC',
-								 'limit'    => array( $start, $perPage ) ) );
-								
-		$this->DB->execute();
-		
-		while( $row = $this->DB->fetch() )
-		{
-			$tids[ $row['tid'] ] = $row['tid'];
+			$data	= array( 'count' => $count['count'], 'resultSet' => array_keys( $rtids) );
 		}
 		
 		/* Return it */
-		return array( 'count' => $count['count'], 'resultSet' => $tids );
+		return $data;
 	}
 
 	/**
@@ -690,21 +808,22 @@ class search_engine_forums extends search_engine
 	 * @param	bool	$noForums			Don't check forums that posts are in
 	 * @return	string
 	 */
-	private function _buildWhereStatement( $search_term, $content_title_only=false, $order='', $onlyPosts=null, $noForums=false )
+	protected function _buildWhereStatement( $search_term, $content_title_only=false, $order='', $onlyPosts=null, $noForums=false )
 	{		
 		/* INI */
-		$where_clause = array();
-		$onlyPosts    = ( $onlyPosts !== null ) ? $onlyPosts : IPSSearchRegistry::get('opt.onlySearchPosts');
-		$sort_by      = IPSSearchRegistry::get('in.search_sort_by');
-		$sort_order   = IPSSearchRegistry::get('in.search_sort_order');
-		$sortKey	  = '';
-		$sortType	  = '';
-		$cType        = IPSSearchRegistry::get('contextual.type');
-		$cId		  = IPSSearchRegistry::get('contextual.id' );
+		$where_clause	= array();
+		$onlyPosts		= ( $onlyPosts !== null ) ? $onlyPosts : ( IPSSearchRegistry::get('opt.searchType') == 'content' );
+		$sort_by		= IPSSearchRegistry::get('in.search_sort_by');
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
+		$sortKey		= '';
+		$sortType		= '';
+		$cType			= IPSSearchRegistry::get('contextual.type');
+		$cId			= IPSSearchRegistry::get('contextual.id' );
+		$search_tags	= IPSSearchRegistry::get('in.raw_search_tags');
 		
 		/* Loop through the forums and build a list of forums we're allowed access to */
-		$forumIdsOk  = array();
-		$forumIdsBad = array();
+		$forumIdsOk		= array();
+		$forumIdsBad	= array();
 		
 		if ( ! empty( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) AND count( ipsRegistry::$request['search_app_filters']['forums']['forums'] ) )
 		{
@@ -771,12 +890,10 @@ class search_engine_forums extends search_engine
 		
 		if ( ! count($forumIdsOk) )
 		{
-			$allowTrashCan = ( $cType == 'forum' ) ? true : false;
-			
 			/* Get list of good forum IDs */
-			$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds( null, array(), $allowTrashCan );
+			$forumIdsOk = $this->registry->class_forums->fetchSearchableForumIds();
 		}
-		
+
 		/* Add allowed forums */
 		if ( $noForums !== true )
 		{
@@ -800,11 +917,12 @@ class search_engine_forums extends search_engine
 		}
 			
 		/* Exclude some items */
+		$permissions						= array();
 		$permissions['TopicSoftDeleteSee']  = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( 0 );
 		$permissions['canQueue']			= $this->registry->getClass('class_forums')->canQueuePosts( 0 );
 		$permissions['PostSoftDeleteSee']   = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( 0 );
-		$permissions['SoftDeleteReason']       = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( 0 );
-		$permissions['SoftDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( 0 );
+		$permissions['SoftDeleteReason']    = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( 0 );
+		$permissions['SoftDeleteContent']   = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( 0 );
 
 		if ( ! $content_title_only )
 		{
@@ -826,23 +944,23 @@ class search_engine_forums extends search_engine
 			}
 		}
 
-			if ( $permissions['SoftDeleteContent'] AND $permissions['TopicSoftDeleteSee'] AND $permissions['canQueue'] )
-			{
-				$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden', 'sdeleted'), 't.');
-			}
-			else if ( $permissions['SoftDeleteContent'] AND $permissions['TopicSoftDeleteSee'] )
-			{
-				$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'sdeleted'), 't.');
-			}
-			else if ( $permissions['canQueue'] )
-			{
-				$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden'), 't.');
-			}
-			else
-			{
-				$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible' ), 't.' );
-			}
-		
+		if ( $permissions['SoftDeleteContent'] AND $permissions['TopicSoftDeleteSee'] AND $permissions['canQueue'] )
+		{
+			$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden', 'sdeleted'), 't.');
+		}
+		else if ( $permissions['SoftDeleteContent'] AND $permissions['TopicSoftDeleteSee'] )
+		{
+			$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'sdeleted'), 't.');
+		}
+		else if ( $permissions['canQueue'] )
+		{
+			$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible', 'hidden'), 't.');
+		}
+		else
+		{
+			$where_clause[] = $this->registry->class_forums->fetchTopicHiddenQuery(array('visible' ), 't.' );
+		}
+
 		if( $search_term )
 		{
 			$search_term = str_replace( '&quot;', '"', $search_term );
@@ -850,15 +968,20 @@ class search_engine_forums extends search_engine
 			if( $content_title_only )
 			{			
 				$where_clause[] = $this->DB->buildSearchStatement( 't.title', $search_term, true, false, ipsRegistry::$settings['use_fulltext'] );
+
+				IPSSearchRegistry::set('set.returnType', 'tids' );
 			}
 			else
 			{
 				if ( $onlyPosts )
 				{
 					$where_clause[] = $this->DB->buildSearchStatement( 'p.post', $search_term, true, false, ipsRegistry::$settings['use_fulltext'] );
+					IPSSearchRegistry::set('set.returnType', 'pids' );
 				}
 				else
 				{
+					IPSSearchRegistry::set('set.returnType', 'pids' );
+					
 					/* Sorting */
 					switch( $sort_by )
 					{
@@ -890,8 +1013,7 @@ class search_engine_forums extends search_engine
 					$tids = array( 0 => 0 );
 					$pids = array( 0 => 0 );
 					
-					$this->DB->build( array( 
-											'select'   => "t.tid, t.last_post, t.forum_id",
+					$this->DB->build( array('select'   => "t.tid, t.last_post, t.forum_id",
 											'from'	   => 'topics t',
 			 								'where'	   => str_replace( 'p.author_id', 't.starter_id', $this->_buildWhereStatement( $search_term, true, $order, null ) ),
 			 								'order'    => 't.' . $sortKey . ' ' . $sort_order,
@@ -941,7 +1063,6 @@ class search_engine_forums extends search_engine
 											'from'	   => array( 'posts' => 'p' ),
 			 								'where'	   => $this->_buildWhereStatement( $search_term, false, $order, true ),
 			 								'order'    => IPSSearch::$ask . ' ' . IPSSearch::$aso,
-			 								'group'    => 'p.topic_id',
 											'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit')),
 											'add_join' => array( array( 'select' => 't.approved, t.forum_id',
 																		'from'   => array( 'topics' => 't' ),
@@ -971,10 +1092,10 @@ class search_engine_forums extends search_engine
 				}
 			}
 		}
-	
+		
 		/* No moved topic links */
 		$where_clause[] = "t.state != 'link'";
-
+		
 		/* Date Restrict */
 		if( $this->search_begin_timestamp && $this->search_end_timestamp )
 		{ 
@@ -1014,7 +1135,7 @@ class search_engine_forums extends search_engine
 	 *
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
@@ -1038,7 +1159,7 @@ class search_engine_forums extends search_engine
 		
 		/* Set up some defaults */
 		IPSSearchRegistry::set( 'opt.noPostPreview'  , true );
-		IPSSearchRegistry::set( 'opt.onlySearchPosts', false );
+		//IPSSearchRegistry::set( 'opt.searchType', 'both' );
 		
 		/* Make default search type topics */
 		if( isset( $data ) && is_array( $data ) && count( $data ) )
@@ -1051,12 +1172,6 @@ class search_engine_forums extends search_engine
 					IPSSearchRegistry::set( 'opt.noPostPreview', false );
 				}
 
-				/* CONTENT ONLY */
-				if ( $field == 'contentOnly' AND $_data['contentOnly'] == 1 )
-				{
-					IPSSearchRegistry::set( 'opt.onlySearchPosts', true );
-				}
-
 				/* POST COUNT */
 				if ( $field == 'pCount' AND intval( $_data['pCount'] ) > 0 )
 				{
@@ -1064,7 +1179,7 @@ class search_engine_forums extends search_engine
 				}
 
 				/* TOPIC VIEWS */
-				if ( $field == 'pViews' AND intval( $_data['pViews'] ) > 0 )
+				if ( $field == 'pViews' AND intval( $_data ) > 0 )
 				{
 					$return[] = array( 'column' => 't.views', 'operator' => '>=', 'value' => intval( $_data['pViews'] ) );
 				}
diff --git a/upload/admin/applications/forums/extensions/search/form.php b/upload/admin/applications/forums/extensions/search/form.php
index ec835d11..48b08f2e 100644
--- a/upload/admin/applications/forums/extensions/search/form.php
+++ b/upload/admin/applications/forums/extensions/search/form.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Returns HTML for the form (optional class, not required)
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -27,7 +27,7 @@ class search_form_forums
 	/**
 	 * Construct
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
diff --git a/upload/admin/applications/forums/extensions/search/format.php b/upload/admin/applications/forums/extensions/search/format.php
index 0fad3163..c811fd0e 100644
--- a/upload/admin/applications/forums/extensions/search/format.php
+++ b/upload/admin/applications/forums/extensions/search/format.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Formats forum search results
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-10-17 10:49:01 -0400 (Mon, 17 Oct 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9629 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -27,7 +27,7 @@ class search_format_forums extends search_format
 	/**
 	 * Constructor
 	 * 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -36,15 +36,85 @@ class search_format_forums extends search_format
 		{
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
 			ipsRegistry::setClass( 'class_forums', new $classToLoad( ipsRegistry::instance() ) );
+			ipsRegistry::getClass('class_forums')->strip_invisible = 1;
 			ipsRegistry::getClass('class_forums')->forumsInit();
 		}
 		
+		/* Load tagging stuff */
+		if ( ! $registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
+		
 		parent::__construct( $registry );
 		
 		/* Set up wrapper */
 		$this->templates = array( 'group' => 'search', 'template' => 'searchResultsAsForum' );
 	}
 	
+	/**
+	 * Return the output for the followed content results
+	 *
+	 * @param	array 	$results	Array of results to show
+	 * @param	array 	$followData	Meta data from follow/like system
+	 * @return	@e string
+	 */
+	public function parseFollowedContentOutput( $results, $followData )
+	{
+		/* Topics? */
+		if( IPSSearchRegistry::get('in.followContentType') == 'topics' )
+		{
+			return $this->registry->output->getTemplate('search')->followedContentForumsWrapper( $this->parseAndFetchHtmlBlocks( $this->processFollowedResults( $results, $followData ) ) );
+		}
+		/* Or forums? */
+		else
+		{
+			$forums		= array();
+			$member_ids	= array();
+			
+			if( count($results) )
+			{
+				/* Get forum data */
+				foreach( $results as $result )
+				{
+					$forums[ $result ]	= $this->registry->class_forums->forumsFormatLastinfo( $this->registry->class_forums->forumsCalcChildren( $result, $this->registry->class_forums->getForumById( $result ) ) );
+
+					if( $forums[ $result ]['last_poster_id'] )
+					{
+						$member_ids[ $result ]	= $forums[ $result ]['last_poster_id'];
+					}
+				}
+				
+				/* Merge in follow data */
+				foreach( $followData as $_follow )
+				{
+					$forums[ $_follow['like_rel_id'] ]['_followData']	= $_follow;
+				}
+
+				/* And get latest member info */
+				if( count($member_ids) )
+				{
+					$_members	= IPSMember::load( array_unique($member_ids), 'members,profile_portal' );
+					
+					foreach( $member_ids as $forumId => $memberId )
+					{
+						$_member	= $_members[ $memberId ];
+						
+						if( $_member['member_id'] )
+						{
+							$_member	= IPSMember::buildDisplayData( $_member, array( 'reputation' => 0, 'warn' => 0 ) );
+							
+							$forums[ $forumId ]	= array_merge( $_member, $forums[ $forumId ] );
+						}
+					}
+				}
+			}
+			
+			return $this->registry->output->getTemplate('search')->followedContentForumsWrapperForums( $forums );
+		}
+	}
+	
 	/**
 	 * Parse search results
 	 *
@@ -57,13 +127,10 @@ class search_format_forums extends search_format
 		$sub               = false;
 		$isVnc             = false;
 		$search_term	   = IPSSearchRegistry::get('in.clean_search_term');
-		$onlyPosts		   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$onlyTitles		   = IPSSearchRegistry::get('display.onlyTitles');
 		$noPostPreview	   = IPSSearchRegistry::get('opt.noPostPreview');
 		$results		   = array();
 		$attachPids		   = array();
-		$results		   = array();
-		
+
 		/* loop and process */
 		foreach( $rows as $id => $data )
 		{	
@@ -79,20 +146,25 @@ class search_format_forums extends search_format
 			$data['_last_post']  = $data['last_post'];
 			$data['_longTitle']  = $data['content_title'];
 			$data['_shortTitle'] = IPSText::truncate( $data['content_title'], 60 );
-			$data['last_poster'] = $data['last_poster_id'] ? IPSLib::makeProfileLink( $data['last_poster_name'], $data['last_poster_id'], $data['seo_last_name'] ) : $this->settings['guest_name_pre'] . $data['last_poster_name'] . $this->settings['guest_name_suf'];
-			$data['starter']     = $data['starter_id']     ? IPSLib::makeProfileLink( $data['starter_name'], $data['starter_id'], $data['seo_first_name'] ) : $this->settings['guest_name_pre'] . $data['starter_name'] . $this->settings['guest_name_suf'];
-			$data['last_post']   = $this->registry->getClass( 'class_localization')->getDate( $data['last_post'], 'SHORT' );
+			$data['last_poster'] = $data['last_poster_id'] ? IPSMember::makeProfileLink( $data['last_poster_name'], $data['last_poster_id'], $data['seo_last_name'] ) : $this->settings['guest_name_pre'] . $data['last_poster_name'] . $this->settings['guest_name_suf'];
+			$data['starter']     = $data['starter_id']     ? IPSMember::makeProfileLink( $data['starter_name'], $data['starter_id'], $data['seo_first_name'] ) : $this->settings['guest_name_pre'] . $data['starter_name'] . $this->settings['guest_name_suf'];
+			//$data['last_post']   = $this->registry->getClass( 'class_localization')->getDate( $data['last_post'], 'SHORT' );
 	
 			if ( isset( $data['post_date'] ) )
 			{
 				$data['_post_date']	= $data['post_date'];
-				$data['post_date']	= $this->registry->getClass( 'class_localization')->getDate( $data['post_date'], 'SHORT' );
+				//$data['post_date']	= $this->registry->getClass( 'class_localization')->getDate( $data['post_date'], 'SHORT' );
 			}
-	
-			if ( $this->memberData['is_mod'] )
+
+			if ( $this->registry->getClass('class_forums')->canQueuePosts( $forum['id'] ) )
 			{
 				$data['posts'] += intval($data['topic_queuedposts']);
 			}
+			
+			if( $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $forum['id'] ) )
+			{
+				$data['posts'] += intval($data['topic_deleted_posts']);
+			}
 	
 			if ( $data['posts'])
 			{
@@ -118,36 +190,43 @@ class search_format_forums extends search_format
 					{
 						$data['pages'][] = array(  'last'   => 1,
 						 					       'st'     => ($pages - 1) * $this->settings['display_max_posts'],
-						  						   'page'   => $pages );
+						  						   'page'   => $pages,
+						 							'total' => $pages);
 						break;
 					}
 					else
 					{
 						$data['pages'][] = array( 'last' => 0,
 												  'st'   => $real_no,
-												  'page' => $page_no );
+												  'page' => $page_no,
+												 	'total' => $pages );
 					}
 				}
 			}
 		
 			/* For-matt some stuffs */
-			if ( ! $data['cache_content'] )
+			if ( IPSSearchRegistry::get('opt.noPostPreview') != true )
 			{
-				IPSText::getTextClass( 'bbcode' )->parse_smilies			= $data['use_emo'];
-				IPSText::getTextClass( 'bbcode' )->parse_html				= ( $forum['use_html'] and $this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'] and $data['post_htmlstate'] ) ? 1 : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $data['post_htmlstate'] == 2 ? 1 : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $forum['use_ibc'];
-				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $data['member_group_id'];
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $data['mgroup_others'];
+				if ( ! $data['cache_content'] )
+				{
+					IPSText::getTextClass( 'bbcode' )->parse_smilies			= $data['use_emo'];
+					IPSText::getTextClass( 'bbcode' )->parse_html				= ( $forum['use_html'] and $this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'] and $data['post_htmlstate'] ) ? 1 : 0;
+					IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $data['post_htmlstate'] == 2 ? 1 : 0;
+					IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $forum['use_ibc'];
+					IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
+					IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $data['member_group_id'];
+					IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $data['mgroup_others'];
+					
+					$data['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $data['post'] );
+				}
+				else
+				{
+					$data['post'] = '<!--cached-' . gmdate( 'r', $data['cache_updated'] ) . '-->' . $data['cache_content'];
+				}
+				
+				$data['post'] = IPSText::searchHighlight( $data['post'], $search_term );
 			}
-			else
-			{
-				$data['post'] = '<!--cached-' . gmdate( 'r', $data['cache_updated'] ) . '-->' . $data['cache_content'];
-			}
-			
-			$data['post'] = IPSText::searchHighlight( IPSText::getTextClass( 'bbcode' )->preDisplayParse( $data['post'] ), $search_term );
-			
+
 			/* Has attachments */
 			if ( $data['topic_hasattach'] )
 			{
@@ -156,9 +235,9 @@ class search_format_forums extends search_format
 			
 			$rows[ $id ] = $data;
 		}
-		
+
 		/* Attachments */
-		if ( count( $attachPids ) )
+		if ( count( $attachPids ) AND IPSSearchRegistry::get('set.returnType') != 'tids' )
 		{
 			/* Load attachments class */
 			if ( ! is_object( $this->class_attach ) )
@@ -169,8 +248,8 @@ class search_format_forums extends search_format
 				$this->class_attach->init();
 			}
 			
-			$attachHTML = $this->class_attach->renderAttachments( array( $data['pid'] => $data['post'] ), array_keys( $attachPids ) );
-	
+			$attachHTML = $this->class_attach->renderAttachments( $attachPids, array_keys( $attachPids ) );
+
 			/* Now parse back in the rendered posts */
 			if( is_array($attachHTML) AND count($attachHTML) )
 			{
@@ -181,7 +260,7 @@ class search_format_forums extends search_format
 					{
 						$_data['html'] = IPSText::stripAttachTag( $_data['html'] );
 					}
-					
+
 					$rows[ $id ]['post']           = $_data['html'];
 					$rows[ $id ]['attachmentHtml'] = $_data['attachmentHtml'];
 				}
@@ -194,7 +273,7 @@ class search_format_forums extends search_format
 			/* Format content */
 			list( $html, $sub ) = $this->formatContent( $data );
 			
-			$results[ $id ] = array( 'html' => $html, 'app' => $data['app'], 'type' => $data['type'], 'sub' => $sub );
+			$results[ $id ] = array( 'html' => $html, 'app' => $data['app'], 'type' => $data['type'], 'sub' => $sub, '_followData' => !empty($data['_followData']) ? $data['_followData'] : array() );
 		}
 		
 		return $results;
@@ -208,8 +287,7 @@ class search_format_forums extends search_format
 	 */
 	public function formatContent( $data )
 	{
-		$onlyPosts		   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$onlyTitles		   = IPSSearchRegistry::get('display.onlyTitles');
+		$onlyTitles		   = IPSSearchRegistry::searchTitleOnly();
 		$noPostPreview	   = IPSSearchRegistry::get('opt.noPostPreview');
 
 		/* Forum Breadcrum */
@@ -221,10 +299,15 @@ class search_format_forums extends search_format
 		/* Has posted dot */
 		$show_dots = ( $this->settings['show_user_posted'] AND $this->memberData['member_id'] AND  $data['_hasPosted'] ) ? 1 : 0;
 
+		if ( ! $is_read )
+		{
+			$data['_unreadUrl']	= $this->registry->output->buildSEOUrl( 'showtopic=' . $data['tid'] . '&amp;view=getnewpost', 'public', $data['title_seo'], 'showtopicunread' );
+		}
+		
 		/* Icon */
 		$data['_icon']   = $this->registry->getClass( 'class_forums' )->fetchTopicFolderIcon( $data, $show_dots, $is_read );
 		$data['_isRead'] = $is_read;
-		
+
 		/* Display type */
 		return array( $this->registry->getClass( 'output' )->getTemplate( 'search' )->topicPostSearchResultAsForum( $data, ( $onlyTitles || $noPostPreview ) ? 1 : 0 ), 0 );
 	}
@@ -233,17 +316,37 @@ class search_format_forums extends search_format
 	 * Formats / grabs extra data for results
 	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
 	 *
+	 * @param	array 	$ids			Ids
+	 * @param	array	$followData		Retrieve the follow meta data
 	 * @return array
 	 */
-	public function processResults( $ids )
+	public function processFollowedResults( $ids, $followData=array() )
+	{
+		/* Topics? */
+		if( IPSSearchRegistry::get('in.followContentType') == 'topics' )
+		{
+			IPSSearchRegistry::set('set.returnType', 'tids' );
+			return $this->processResults( $ids, $followData );
+		}
+
+		return $ids;
+	}
+	
+	/**
+	 * Formats / grabs extra data for results
+	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
+	 *
+	 * @param	array 	$ids			Ids
+	 * @param	array	$followData		Retrieve the follow meta data
+	 * @return array
+	 */
+	public function processResults( $ids, $followData=array() )
 	{
 		/* INIT */
 		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
 		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
 		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$onlyPosts          = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
+		$content_title_only = IPSSearchRegistry::searchTitleOnly();
 		$_post_joins		= array();
 		$members			= array();
 		$results			= array();
@@ -262,7 +365,7 @@ class search_format_forums extends search_format
 		$permissions['SoftDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( 0 );
 		$permissions['PostSoftDeleteRestore']  = $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( 0 );
 		$permissions['TopicSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( 0 );
-		
+
 		/* Got some? */
 		if ( count( $ids ) )
 		{
@@ -278,14 +381,16 @@ class search_format_forums extends search_format
 				{
 					$_post_joins[] = IPSContentCache::join( 'sig' , 'p.author_id', 'ccb', 'left', 'ccb.cache_content as cache_content_sig, ccb.cache_updated as cache_updated_sig' );
 				}
-			} 
-			
+			}
+
+			$_post_joins[] = $this->registry->tags->getCacheJoin( array( 'meta_id_field' => 't.tid' ) );
+
 			/* Sorting */
 			switch( $sort_by )
 			{
 				default:
 				case 'date':
-					$sortKey  = ( $content_title_only ) ? 'last_post' : 'post_date';
+					$sortKey  = ( IPSSearchRegistry::get('set.returnType') == 'tids' ) ? 'last_post' : 'post_date';
 					$sortType = 'numerical';
 				break;
 				case 'title':
@@ -304,14 +409,14 @@ class search_format_forums extends search_format
 
 			/* Set vars */
 			IPSSearch::$ask = $sortKey;
-			IPSSearch::$aso = strtolower( $order_dir );
+			IPSSearch::$aso = strtolower( $sort_order );
 			IPSSearch::$ast = $sortType;
-				
+			
 			/* If we are search in titles only, then the ID array will be TIDs */
-			if( $content_title_only )
+			if ( IPSSearchRegistry::get('set.returnType') == 'tids' )
 			{
 				$k = 'tid';
-				
+
 				$this->DB->build( array( 
 									'select'   => "t.*",
 									'from'	   => array( 'topics' => 't' ),
@@ -344,7 +449,7 @@ class search_format_forums extends search_format
 												 							 'type'		=> 'left' ) ), $_post_joins ) ) );
 															
 			}
-			
+
 			/* Grab data */
 			$this->DB->execute();
 			
@@ -354,6 +459,18 @@ class search_format_forums extends search_format
 				$_rows[ $row[ $k ] ] = $row;
 			}
 			
+			/* Get the 'follow' meta data? */
+			if( count($followData) )
+			{
+				$followData = classes_like_meta::get( $followData );
+
+				/* Merge the data from the follow class into the results */
+				foreach( $followData as $_formatted )
+				{
+					$_rows[ $_formatted['like_rel_id'] ]['_followData']	= $_formatted;
+				}
+			}
+
 			/* Sort */
 			if ( count( $_rows ) )
 			{
@@ -364,10 +481,20 @@ class search_format_forums extends search_format
 					/* Prevent member from stepping on it */
 					$row['topic_title'] = $row['title'];
 					
-					/* Got author but no member data? */
-					if ( ! empty( $row['author_id'] ) )
+					/* Get author data? */
+					if( $k == 'tid' )
 					{
-						$members[ $row['author_id'] ] = $row['author_id'];
+						if ( ! empty( $row['last_poster_id'] ) )
+						{
+							$members[ $row['last_poster_id'] ] = $row['last_poster_id'];
+						}
+					}
+					else
+					{
+						if ( ! empty( $row['author_id'] ) )
+						{
+							$members[ $row['author_id'] ] = $row['author_id'];
+						}
 					}
 					
 					/* Topic ids? */
@@ -394,7 +521,7 @@ class search_format_forums extends search_format
 					}
 				
 					$row['cleanSearchTerm'] = urlencode($search_term);
-					$row['topicPrefix']     = $row['pinned'] ? $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->settings['pre_pinned'] ) : '';
+					$row['topicPrefix']     = $row['pinned'] ? $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->lang->words['pre_pinned'] ) : '';
 					
 					$row['_isVisible'] = ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $row ) == 'visible' ) ? true : false;
 					$row['_isHidden']  = ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $row ) == 'hidden' ) ? true : false;
@@ -442,7 +569,13 @@ class search_format_forums extends search_format
 							continue;
 						}
 					}
-				
+					
+					/* Tags */
+					if ( ! empty( $row['tag_cache_key'] ) )
+					{
+						$row['tags'] = $this->registry->tags->formatCacheJoinData( $row );
+					}
+
 					$results[ $row['pid'] ] = $this->genericizeResults( $row );
 				}
 			}
@@ -450,23 +583,26 @@ class search_format_forums extends search_format
 			/* Need to load members? */
 			if ( count( $members ) )
 			{
-				$mems = IPSMember::load( $members, 'all' );
+				$mems		= IPSMember::load( $members, 'all' );
+				$mems[0]	= array();
 				
 				foreach( $results as $id => $r )
 				{
-					if ( ! empty( $r['author_id'] ) AND isset( $mems[ $r['author_id'] ] ) )
+					$_memberIdColumn	= ( IPSSearchRegistry::get('set.returnType') == 'tids' ) ? 'last_poster_id' : 'author_id';
+					
+					if ( isset( $mems[ $r[ $_memberIdColumn ] ] ) )
 					{
-						$mems[ $r['author_id'] ]['m_posts'] = $mems[ $r['author_id'] ]['posts'];
-						//unset( $mems[ $r['author_id'] ]['posts'] );
-						unset( $mems[ $r['author_id'] ]['last_post'] );
+						$mems[ $r[ $_memberIdColumn ] ]['m_posts'] = $mems[ $r[ $_memberIdColumn ] ]['posts'];
+						
+						unset( $mems[ $r[ $_memberIdColumn ] ]['last_post'] );
 						
 						if ( isset( $r['cache_content_sig'] ) )
 						{ 
-							$mems[ $r['author_id'] ]['cache_content'] = $r['cache_content_sig'];
-							$mems[ $r['author_id'] ]['cache_updated'] = $r['cache_updated_sig'];
+							$mems[ $r[ $_memberIdColumn ] ]['cache_content'] = $r['cache_content_sig'];
+							$mems[ $r[ $_memberIdColumn ] ]['cache_updated'] = $r['cache_updated_sig'];
 						}
 						
-						$_mem = IPSMember::buildDisplayData( $mems[ $r['author_id'] ], array( 'signature' => 1 ) );
+						$_mem = IPSMember::buildDisplayData( $mems[ $r[ $_memberIdColumn ] ], array( 'reputation' => 0, 'warn' => 0 ) );
 						
 						unset( $_mem['cache_content'], $_mem['cache_updated'] );
 						
@@ -476,13 +612,15 @@ class search_format_forums extends search_format
 					}
 				}
 			}
-			
+
 			/* Generate 'dot' folder icon */
 			if ( $this->settings['show_user_posted'] AND count( $topicIds ) )
 			{
+				$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), '' );
+
 				$this->DB->build( array( 'select' => 'author_id, topic_id',
 										 'from'   => 'posts',
-										 'where'  => 'queued=0 AND author_id=' . $this->memberData['member_id'] . ' AND topic_id IN(' . implode( ',', $topicIds ) . ')' ) );
+										 'where'  => $_queued . ' AND author_id=' . $this->memberData['member_id'] . ' AND topic_id IN(' . implode( ',', $topicIds ) . ')' ) );
 										  
 				$this->DB->execute();
 				
@@ -557,7 +695,7 @@ class search_format_forums extends search_format
 		$r['type_2']				= 'topic';
 		$r['type_id_2']				= $r['tid'];
 		$r['misc']					= $r['pid'];
-
+		
 		return $r;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/search/index.html b/upload/admin/applications/forums/extensions/search/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/extensions/search/index.html
+++ b/upload/admin/applications/forums/extensions/search/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/sphinxTemplate.php b/upload/admin/applications/forums/extensions/sphinxTemplate.php
index 483fef81..392f98d2 100644
--- a/upload/admin/applications/forums/extensions/sphinxTemplate.php
+++ b/upload/admin/applications/forums/extensions/sphinxTemplate.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sphinx template file
- * Last Updated: $Date: 2010-10-28 12:07:41 -0400 (Thu, 28 Oct 2010) $
+ * Last Updated: $Date: 2011-09-23 11:38:00 -0400 (Fri, 23 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7063 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9545 $
  * @since		3.0.0
  *
  */
@@ -28,17 +28,17 @@ if ( ! defined( 'IN_IPB' ) )
 $appSphinxTemplate	= <<<EOF
 
 ################################# --- FORUM --- ##############################
-source forums_search_posts_main : ipb_source_config
+source <!--SPHINX_CONF_PREFIX-->forums_search_posts_main : <!--SPHINX_CONF_PREFIX-->ipb_source_config
 {
 	# Set our forum PID counter
-	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_forums_counter_posts', (SELECT max(pid) FROM <!--SPHINX_DB_PREFIX-->posts), '', 0, UNIX_TIMESTAMP() )
+	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_forums_counter_posts', (SELECT max(pid) FROM <!--SPHINX_DB_PREFIX-->posts), 0, UNIX_TIMESTAMP(), 0 )
 	
 	# Query posts for the main source
 	sql_query		= SELECT p.pid, p.pid as search_id, p.author_id, p.post_date, p.post, p.topic_id, p.queued, \
-							 t.tid, t.title, t.title as tordinal, t.views, t.posts, t.forum_id, t.last_post, t.state, t.start_date, t.starter_id, t.last_poster_id, t.topic_firstpost, \
+							 t.tid, t.title, LOWER(t.title) as tordinal, t.views, t.posts, t.forum_id, t.last_post, t.state, t.start_date, t.starter_id, t.last_poster_id, t.topic_firstpost, \
 							CASE WHEN t.approved = -1 THEN 1 ELSE 0 END AS soft_deleted, \
 							CASE WHEN t.approved = -1 THEN 0 ELSE t.approved END AS approved, \
-							CONCAT(t.last_post, '.', t.tid ) as last_post_group \
+							CONCAT( SUBSTRING( t.last_post, 2, 8 ), '0', LPAD( t.tid, 10, 0 ) ) as last_post_group \
 					  FROM <!--SPHINX_DB_PREFIX-->posts p \
 					  LEFT JOIN <!--SPHINX_DB_PREFIX-->topics t ON ( p.topic_id=t.tid )
 	
@@ -57,47 +57,50 @@ source forums_search_posts_main : ipb_source_config
 	sql_attr_uint			= posts
 	sql_attr_uint			= views
 	sql_attr_str2ordinal	= tordinal
-	sql_attr_str2ordinal	= last_post_group
+	sql_attr_bigint			= last_post_group
+	sql_attr_multi			= uint tag_id from query; SELECT t.topic_firstpost, c.tag_id FROM <!--SPHINX_DB_PREFIX-->core_tags c LEFT JOIN <!--SPHINX_DB_PREFIX-->topics t ON (t.tid=c.tag_meta_id) WHERE c.tag_meta_app='forums' AND c.tag_meta_area='topics'
 	
 	sql_ranged_throttle	= 0
 }
 
-source forums_search_posts_delta : forums_search_posts_main
+source <!--SPHINX_CONF_PREFIX-->forums_search_posts_delta : <!--SPHINX_CONF_PREFIX-->forums_search_posts_main
 {
 	# Override the base sql_query_pre
 	sql_query_pre = 
 	
 	# Query posts for the delta source
 	sql_query		= SELECT p.pid, p.pid as search_id, p.author_id, p.post_date, p.post, p.topic_id, p.queued, \
-							 t.tid, t.title, t.title as tordinal, t.views, t.posts, t.forum_id, t.last_post, t.state, t.start_date, t.starter_id, t.last_poster_id, t.topic_firstpost, \
+							 t.tid, t.title, LOWER(t.title) as tordinal, t.views, t.posts, t.forum_id, t.last_post, t.state, t.start_date, t.starter_id, t.last_poster_id, t.topic_firstpost, \
 							 CASE WHEN t.approved = -1 THEN 1 ELSE 0 END AS soft_deleted, \
 						 	 CASE WHEN t.approved = -1 THEN 0 ELSE t.approved END AS approved, \
-							CONCAT(t.last_post, '.', t.tid ) as last_post_group \
+							 CONCAT( SUBSTRING( t.last_post, 2, 8 ), '0', LPAD( t.tid, 10, 0 ) ) as last_post_group \
 					  FROM <!--SPHINX_DB_PREFIX-->posts p \
 					  LEFT JOIN <!--SPHINX_DB_PREFIX-->topics t ON ( p.topic_id=t.tid ) \
 					  WHERE p.pid > ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_forums_counter_posts' )
+					  
+	sql_query_killlist = SELECT pid FROM !--SPHINX_DB_PREFIX-->posts WHERE pid > ( SELECT cs_value FROM !--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_forums_counter_posts' )
 }
 
-index forums_search_posts_main
+index <!--SPHINX_CONF_PREFIX-->forums_search_posts_main
 {
-	source			= forums_search_posts_main
-	path			= <!--SPHINX_BASE_PATH-->/forums_search_posts_main
+	source			= <!--SPHINX_CONF_PREFIX-->forums_search_posts_main
+	path			= <!--SPHINX_BASE_PATH-->/<!--SPHINX_CONF_PREFIX-->forums_search_posts_main
 	
 	docinfo			= extern
 	mlock			= 0
 	morphology		= none
 	min_word_len	= 2
-	charset_type	= sbcs
+	charset_type	= utf-8
 	html_strip		= 0
 	#infix_fields    = post, title
 	#min_infix_len   = 3
 	#enable_star     = 1
 }
 
-index forums_search_posts_delta : forums_search_posts_main
+index <!--SPHINX_CONF_PREFIX-->forums_search_posts_delta : <!--SPHINX_CONF_PREFIX-->forums_search_posts_main
 {
-   source			= forums_search_posts_delta
-   path				= <!--SPHINX_BASE_PATH-->/forums_search_posts_delta
+   source			= <!--SPHINX_CONF_PREFIX-->forums_search_posts_delta
+   path				= <!--SPHINX_BASE_PATH-->/<!--SPHINX_CONF_PREFIX-->forums_search_posts_delta
 }
 
 
diff --git a/upload/admin/applications/forums/extensions/tags/index.html b/upload/admin/applications/forums/extensions/tags/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/tags/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/tags/topics.php b/upload/admin/applications/forums/extensions/tags/topics.php
new file mode 100644
index 00000000..74dc6afb
--- /dev/null
+++ b/upload/admin/applications/forums/extensions/tags/topics.php
@@ -0,0 +1,336 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Forums/Topics Class
+ * Matt Mecham
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		25 Feb 2011
+ * @version		$Revision: 9483 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class tags_forums_topics extends classes_tag_abstract
+{
+	protected $topicCache = array();
+		
+	/**
+	 * CONSTRUCTOR
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make registry objects */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Init
+	 *
+	 * @return	@e void
+	 */
+	public function init()
+	{
+		if ( ! $this->registry->isClassLoaded('class_forums') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/forums/class_forums.php', 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+			$this->registry->getClass('class_forums')->forumsInit();
+		}
+		
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
+		parent::init();
+	}
+	
+	/**
+	 * Little 'trick' to force preset tags
+	 *
+	 * @param	string	view to show
+	 * @param	array	Where data to show
+	 */
+	public function render( $what, $where )
+	{
+		if ( ! empty( $where['meta_parent_id'] ) )
+		{
+			$forum = $this->registry->class_forums->getForumById( $where['meta_parent_id'] );
+		}
+		
+		if ( ! empty( $forum['tag_predefined'] ) )
+		{
+			/* Turn off open system */
+			$this->settings['tags_open_system'] = false;
+		}
+		
+		return parent::render( $what, $where );
+	}
+	
+	/**
+	 * Fetches parent ID
+	 * @param 	array	Where Data
+	 * @return	int		Id of parent if one exists or 0
+	 */
+	public function getParentId( $where )
+	{
+		$topic = $this->_getTopic( $where['meta_id'] );
+		
+		return intval( $topic['forum_id'] );
+	}
+	
+	/**
+	 * Fetches permission data
+	 * @param 	array	Where Data
+	 * @return	string	Comma delimiter or *
+	 */
+	public function getPermissionData( $where )
+	{
+		if ( isset( $where['meta_id'] ) )
+		{
+			$topic = $this->_getTopic( $where['meta_id'] );
+			$forum = $this->registry->class_forums->getForumById( $topic['forum_id'] );
+		}
+		else if ( isset( $where['meta_parent_id'] ) )
+		{
+			$forum = $this->registry->class_forums->getForumById( $where['meta_parent_id'] );
+		}
+		
+		return $forum['perm_view'];
+	}
+	
+	/**
+	 * Basic permission check
+	 * @param	string	$what (add/remove/edit/create/prefix) [ add = add new tags to items, create = create unique tags, use a tag as a prefix for an item ]
+	 * @param	array	$where data
+	 */
+	public function can( $what, $where )
+	{
+		$topic = array();
+		$forum = array();
+		
+		if ( ! empty( $where['meta_id'] ) )
+		{
+			$topic = $this->_getTopic( $where['meta_id'] );
+			$forum = $this->registry->class_forums->getForumById( $topic['forum_id'] );
+		}
+		else if ( ! empty( $where['meta_parent_id'] ) )
+		{
+			$forum = $this->registry->class_forums->getForumById( $where['meta_parent_id'] );
+		}
+		
+		/* Check parent */
+		$return = parent::can( $what, $where );
+
+		if ( $return === false  )
+		{
+			return $return;
+		}
+		
+		/* Forum disabled */
+		if ( $forum['bw_disable_tagging'] )
+		{
+			return false;
+		}
+
+		switch ( $what )
+		{
+			case 'create':
+				if ( ! $this->_isOpenSystem() )
+				{
+					return false;
+				}
+				
+				return true;
+			break;
+			case 'add':
+			
+				if ( $this->registry->class_forums->canStartTopic( $forum['id'] ) )
+				{
+					return true;
+				}
+			break;
+			case 'edit':
+			case 'remove':
+				if ( $this->memberData['member_id'] == $topic['starter_id'] )
+				{
+					return true;
+				}
+			break;
+			case 'prefix':
+				if ( $this->registry->class_forums->canStartTopic( $forum['id'] ) )
+				{
+					return true;
+				}
+			break;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * DEFAULT: returns true and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	int		If meta item is visible (not unapproved, etc)
+	 */
+	public function getIsVisible( $where )
+	{
+		$topic    = $this->_getTopic( $where['meta_id'] );
+		$approved = $this->registry->class_forums->fetchHiddenTopicType( $topic );
+		
+		return ( $approved == 'visible' ) ? 1 : 0;
+	}
+	
+	/**
+	 * Search for tags
+	 * @param mixed $tags	Array or string
+	 * @param array $options	Array( 'meta_id' (array), 'meta_parent_id' (array), 'olderThan' (int), 'youngerThan' (int), 'limit' (int), 'sortKey' (string) 'sortOrder' (string) )
+	 */
+	public function search( $tags, $options )
+	{
+		$ok = array();
+		
+		/* Fix up forum IDs */
+		if ( isset( $options['meta_parent_id'] ) )
+		{
+			if ( is_array( $options['meta_parent_id'] ) )
+			{
+				foreach( $options['meta_parent_id'] as $id )
+				{
+					if ( $this->_canSearchForum( $id ) === true )
+					{
+						$ok[] = $id;
+					}
+				}
+			}
+			else
+			{
+				if ( $this->_canSearchForum( $options['meta_parent_id'] ) === true )
+				{
+					$ok[] = $options['meta_parent_id'];
+				}
+			}
+		}
+		else
+		{
+			/* Fetch forum IDs */
+			$ok = $this->registry->class_forums->fetchSearchableForumIds();
+		}
+		
+		$options['meta_parent_id'] = $ok;
+		
+		return parent::search( $tags, $options );
+	}
+	
+	/**
+	 * Fetch a list of pre-defined tags
+	 * 
+	 * @param 	array	Where Data
+	 * @return	Array of pre-defined tags or null
+	 */
+	protected function _getPreDefinedTags( $where=array() )
+	{
+		if ( ! empty( $where['meta_parent_id'] ) )
+		{
+			$forum = $this->registry->class_forums->getForumById( $where['meta_parent_id'] );
+		}
+		
+		$this->settings['tags_predefined'] = ( ! empty( $forum['tag_predefined'] ) ) ? $forum['tag_predefined'] : $this->settings['tags_predefined'];
+		
+		return parent::_getPreDefinedTags( $where );
+	}
+	
+	/**
+	 * Can set an item as a topic prefix
+	 * 
+	 * @param 	array		$where		Where Data
+	 * @return 	@e boolean
+	 */
+	protected function _prefixesEnabled( $where )
+	{
+		if ( ! empty( $where['meta_parent_id'] ) )
+		{
+			$forum = $this->registry->class_forums->getForumById( $where['meta_parent_id'] );
+		}
+		
+		if ( $forum['bw_disable_prefixes'] )
+		{
+			return false;
+		}
+		else
+		{
+			return parent::_prefixesEnabled( $where );
+		}
+	}
+	
+	/**
+	 * Check a forum for tag searching
+	 * 
+	 * @param	id		$id		Forum ID
+	 * @return	@e boolean	True if it can be searched
+	 */
+	protected function _canSearchForum( $id )
+	{
+		$data = $this->registry->class_forums->getForumById( $id );
+					
+		if ( ! $this->registry->permissions->check( 'read', $data ) )
+		{
+			return false;
+		}
+		
+		/* Can read, but is it password protected, etc? */
+		if ( ! $this->registry->class_forums->forumsCheckAccess( $id, 0, 'forum', array(), true ) )
+		{
+			return false;
+		}
+
+		if ( ! $data['sub_can_post'] OR ! $data['can_view_others'] )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Fetch a topic
+	 * 
+	 * @param	integer		$tid	Topic ID
+	 * @return	@e array	Topic data
+	 */
+	protected function _getTopic( $tid )
+	{
+		if ( ! isset( $this->topicCache[ $tid ] ) )
+		{
+			$this->topicCache[ $tid ] = $this->registry->getClass('topics')->getTopicById( $tid );
+		}
+		
+		return $this->topicCache[ $tid ];
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/extensions/usercpForms.php b/upload/admin/applications/forums/extensions/usercpForms.php
deleted file mode 100644
index e165937d..00000000
--- a/upload/admin/applications/forums/extensions/usercpForms.php
+++ /dev/null
@@ -1,1383 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * UserCP Tab
- * Last Updated: $Date: 2010-10-28 06:58:47 -0400 (Thu, 28 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7060 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class usercpForms_forums extends public_core_usercp_manualResolver implements interface_usercp
-{
-	/**
-	 * Tab name
-	 * This can be left blank and the application title will
-	 * be used
-	 *
-	 * @var		string	Tab name
-	 */
-	public $tab_name		= "Форумы";
-	
-	/**
-	 * OK Message
-	 * This is an optional message to return back to the framework
-	 * to replace the standard 'Settings saved' message
-	 *
-	 * @var		string		"Done" message to display
-	 */
-	public $ok_message		= '';
-	
-	/**
-	 * Hide 'save' button and form elements
-	 * Useful if you have custom output that doesn't
-	 * require it
-	 *
-	 * @var		bool	Hide the form/save button
-	 */
-	public $hide_form_and_save_button	= false;
-	
-	/**
-	 * If you wish to allow uploads, set a value for this
-	 *
-	 * @var		integer
-	 */
-	public $uploadFormMax			= 0;	
-	
-	/**
-	 * Initiate this module
-	 *
-	 * @return	void
-	 */
-	public function init()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$this->request['st'] = intval( $this->request['st'] );
-		
-		//-----------------------------------------
-		// Make sure we have values
-		//-----------------------------------------
-		
-		if ( $this->settings['postpage_contents'] == "" )
-		{
-			$this->settings['postpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
-		
-		if ( $this->settings['topicpage_contents'] == "" )
-		{
-			$this->settings['topicpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
-		
-		//-----------------------------------------
-		// Grab forum class
-		//-----------------------------------------
-		if( ipsRegistry::isClassLoaded('class_forums') !== TRUE )
-		{
-			try
-			{
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
-				$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
-			}
-			catch( Exception $error )
-			{
-				IPS_exception_error( $error );
-			}
-			
-			$this->registry->getClass('class_forums')->strip_invisible = 1;
-			$this->registry->getClass('class_forums')->forumsInit();
-		}
-		
-		$this->tab_name	= ipsRegistry::getClass('class_localization')->words['tab__forums'];
-	}
-	
-	/**
-	 * Return links for this tab
-	 * You may return an empty array or FALSE to not have
-	 * any links show in the tab.
-	 *
-	 * The links must have 'area=xxxxx'. The rest of the URL
-	 * is added automatically.
-	 * 'area' can only be a-z A-Z 0-9 - _
-	 *
-	 * @author	Matt Mecham
-	 * @return   array 		array of links
-	 */
-	public function getLinks()
-	{
-		ipsRegistry::instance()->getClass('class_localization')->loadLanguageFile( array( 'public_usercp' ), 'core' );
-
-		$array = array();
-		
-		$array[] = array( 'url'   => 'area=settings',
-						  'title' => ipsRegistry::instance()->getClass('class_localization')->words['rboard_prefs'],
-						  'active' => $this->request['tab'] == 'forums' && $this->request['area'] == 'settings' ? 1 : 0,
-						  'area'  => 'settings'
-						 );
-						
-		$array[] = array( 'url'   => 'area=topicsubs',
-						  'title' => ipsRegistry::instance()->getClass('class_localization')->words['subs_title'],
-						  'active' => $this->request['tab'] == 'forums' && $this->request['area'] == 'topicsubs' ? 1 : 0,
-						  'area'   => 'topicsubs'						  
-						 );
-		
-		$array[] = array( 'url'   => 'area=forumsubs',
-						  'title' => ipsRegistry::instance()->getClass('class_localization')->words['forum_subs_header'],
-						  'active' => $this->request['tab'] == 'forums' && $this->request['area'] == 'forumsubs' ? 1 : 0,
-						  'area'   => 'forumsubs'						  
-						 );
-		
-		
-		if ( $this->memberData['g_is_supmod'] == 1 )
-		{
-			$array[] = array( 'url'   => 'area=mod_announcements',
-							  'title' => ipsRegistry::instance()->getClass('class_localization')->words['menu_announcements'],
-						  	  'active' => $this->request['tab'] == 'forums' && $this->request['area'] == 'mod_announcements' ? 1 : 0,
-						      'area'   => 'mod_announcements'							  
-							  );
-		}
-								
-		return $array;
-	}
-	
-	/**
-	 * Reset the area
-	 * This is used so that you can reset teh $_AREA, to fix the the left-hand menu highlighting
-	 * for custom events (e.g. announcements)
-	 *
-	 * @author	Brandon Farber
-	 * @param	string		Area
-	 * @return   string		Area
-	 */
-	public function resetArea( $area )
-	{
-		if( $area == 'modAddAnnouncement' OR $area == 'modEditAnnouncement' )
-		{
-			$area = 'mod_announcements';
-		}
-		
-		return $area;
-	}
-		
-	/**
-	 * Run custom event
-	 *
-	 * If you pass a 'do' in the URL / post form that is not either:
-	 * save / save_form or show / show_form then this function is loaded
-	 * instead. You can return a HTML chunk to be used in the UserCP (the
-	 * tabs and footer are auto loaded) or redirect to a link.
-	 *
-	 * If you are returning HTML, you can use $this->hide_form_and_save_button = 1;
-	 * to remove the form and save button that is automatically placed there.
-	 *
-	 * @author	Matt Mecham
-	 * @param	string				Current 'area' variable (area=xxxx from the URL)
-	 * @return   mixed 				html or void
-	 */
-	public function runCustomEvent( $currentArea )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$html = '';
-		
-		//-----------------------------------------
-		// What to do?
-		//-----------------------------------------
-		
-		switch( $currentArea )
-		{
-			# Mod: Announcements
-			case 'modDeleteAnnouncement':
-				$html = $this->_customEvent_modAnnounceDelete();
-			break;
-			case 'modAddAnnouncement':
-				$html = $this->_customEvent_modAnnounceForm('add');
-			break;
-			case 'modEditAnnouncement':
-				$html = $this->_customEvent_modAnnounceForm('edit');
-			break;
-			case 'modSaveAnnouncement':
-				$html = $this->_customEvent_modAnnounceSave( $this->request['type'] );
-			break;
-			# Watched Topics / Forums
-			case 'updateWatchTopics':
-				$this->_customEvent_updateTopics();
-			break;
-			case 'updateWatchForums':
-				$this->_customEvent_updateForums();
-			break;
-			case 'watch':
-				if ( $this->request['do'] == 'saveWatch' )
-				{
-					$html = $this->_customEvent_watch( TRUE );
-				}
-				else
-				{
-					$html = $this->_customEvent_watch();
-				}
-			break;
-		}
-		
-		//-----------------------------------------
-		// Turn off save button
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-		
-		return $html;
-	}
-	
-	/**
-	 * Custom Event: Add an announcement
-	 *
-	 * @author	Matt Mecham
-	 * @return	void
-	 */
-	private function _customEvent_modAnnounceDelete()
-	{
-		$announce_id    = intval( $this->request['announce_id'] );
-		
-		//-----------------------------------------
-		// Check to see if we have access
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->registry->getClass('output')->showError( 'announcements_supermods', 2030, true );
- 			return;
-		}
-		
-		//-----------------------------------------
-		// Delete it
-		//-----------------------------------------
-		
-		if ( $announce_id )
-		{
-			$this->DB->buildAndFetch( array( 'delete' => 'announcements', 'where' => 'announce_id='.$announce_id ) );
-		}
-		
-		//-----------------------------------------
-		// Update cache
-		//-----------------------------------------
-		
-		$this->registry->cache()->rebuildCache( 'announcements', 'forums' );
-		
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" );
-	}
-		
-	/**
-	 * Custom Event: Add an announcement
-	 *
-	 * @author	Matt Mecham
-	 * @return	void
-	 */
-	private function _customEvent_modAnnounceSave( $type='add' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$forums_to_save = "";
-		$start_date     = 0;
-		$end_date       = 0;
-		$announce_id    = intval( $this->request['announce_id'] );
-		
-		//-----------------------------------------
-		// Check to see if we have access
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->registry->getClass('output')->showError( 'announcements_supermods', 2031, true );
- 			return;
-		}
-		
-		//-----------------------------------------
-		// Turn off global form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// check...
-		//-----------------------------------------
-		
-		if ( ! $this->request['announce_title'] or ! $this->request['announce_post'] )
-		{
-			return $this->_customEvent_modAnnounceForm( $type, $this->lang->words['announce_error_title'] );
-		}
-		
-		//-----------------------------------------
-		// Get forums to add announce in
-		//-----------------------------------------
-		
-		if ( is_array( $_POST['announce_forum'] ) and count( $_POST['announce_forum'] ) )
-		{
-			if ( in_array( '*', $_POST['announce_forum'] ) )
-			{
-				$forums_to_save = '*';
-			}
-			else
-			{
-				$forums_to_save = implode( ",", $_POST['announce_forum'] );
-			}
-		}
-		
-		if ( ! $forums_to_save )
-		{
-
-			return $this->_customEvent_modAnnounceForm( $type, $this->lang->words['announce_error_forums'] );
-		}
-		
-		//-----------------------------------------
-		// Check Dates
-		//-----------------------------------------
-		
-		if ( strstr( $this->request['announce_start'], '.' ) )
-		{
-			$start_array = explode( '.', $this->request['announce_start'] );
-			
-			if ( $start_array[0] and $start_array[1] and $start_array[2] )
-			{
-				if ( ! checkdate( $start_array[1], $start_array[0], $start_array[2] ) )
-				{
-					return $this->_customEvent_modAnnounceForm( $type, $this->lang->words['announce_error_date'] );
-				}
-			}
-			
-			$start_date = mktime( 12, 0, 0, $start_array[1], $start_array[0], $start_array[2] );
-		}
-		
-		if ( strstr( $this->request['announce_end'], '.' ) )
-		{
-			$end_array = explode( '.', $this->request['announce_end']  );
-			
-			if ( $end_array[0] and $end_array[1] and $end_array[2] )
-			{
-				if ( ! checkdate( $end_array[1], $end_array[0], $end_array[2] ) )
-				{
-					return $this->_customEvent_modAnnounceForm( $type, $this->lang->words['announce_error_date'] );
-				}
-			}
-			
-			$end_date = mktime( 12, 0, 0, $end_array[1], $end_array[0], $end_array[2] );
-		}
-		
-		//-----------------------------------------
-		// Sort out the content
-		//-----------------------------------------
-
-		$announceContent = IPSText::getTextClass( 'editor' )->processRawPost( 'announce_post' );
-
-		IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_html		= intval($this->request['announce_html_enabled']);
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br		= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'announcement';
-		
-		$announceContent	= IPSText::getTextClass( 'bbcode' )->preDbParse( $announceContent );
-
-		//-----------------------------------------
-		// Build save array
-		//-----------------------------------------
-		
-		$save_array = array( 'announce_title'        => $this->request['announce_title'],
-							 'announce_post'         => $announceContent,
-							 'announce_active'       => $this->request['announce_active'] ? $this->request['announce_active'] : 0,
-							 'announce_forum'        => $forums_to_save,
-							 'announce_html_enabled' => $this->request['announce_html_enabled'] ? $this->request['announce_html_enabled'] : 0,
-							 'announce_nlbr_enabled' => $this->request['announce_nlbr_enabled'] ? $this->request['announce_nlbr_enabled'] : 0,
-							 'announce_start'        => $start_date,
-							 'announce_end'          => $end_date
-						   );
-						   
-		//-----------------------------------------
-		// Save..
-		//-----------------------------------------
-		
-		if ( $type == 'add' )
-		{
-			$save_array['announce_member_id'] = $this->memberData['member_id'];
-			
-			$this->DB->insert( 'announcements', $save_array );
-		}
-		else
-		{
-			if ( $announce_id )
-			{
-				$this->DB->update( 'announcements', $save_array, 'announce_id='.$announce_id );
-			}
-		}
-		
-		//-----------------------------------------
-		// Update cache
-		//-----------------------------------------
-		
-		$this->registry->cache()->rebuildCache( 'announcements', 'forums' );
-		
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" );
-	}
-	
-	
-	/**
-	 * Custom Event: Add an announcement
-	 *
-	 * @author	Matt Mecham
-	 * @param	string	Add or edit
-	 * @param	string	Message to show
-	 * @return	string	HTML
-	 */
-	private function _customEvent_modAnnounceForm( $type='add', $msg='' )
-	{
-		//-----------------------------------------
-		// Check to see if we have access
-		//-----------------------------------------
-
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->registry->getClass('output')->showError( 'announcements_supermods', 2032, true );
- 			return;
-		}
-		
-		//-----------------------------------------
-		// Turn off global form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// INIT the editor/bbcode classes
-		//-----------------------------------------
-		
-		/* Load the Parser */
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'announcement';
-		
-		//-----------------------------------------
-		// Set up
-		//-----------------------------------------
-		
-		if ( $type == 'add' )
-		{
-			$button   = $this->lang->words['announce_add'];
-			$announce = array( 'announce_active' => 1, 'announce_id' => 0 );
-		
-		}
-		else
-		{
-			$announce_id                = intval( $this->request['announce_id'] );
-			$button                     = $this->lang->words['announce_button_edit'];
-			$announce                   = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'announcements', 'where' => 'announce_id='.$announce_id ) );
-			$announce['announce_forum'] = explode( ",", $announce['announce_forum'] );
-			$announce['announce_start'] = $announce['announce_start'] ? strftime( '%d.%m.%Y', $announce['announce_start'] ) : '';
-			$announce['announce_end']   = $announce['announce_end']   ? strftime( '%d.%m.%Y', $announce['announce_end'] ) : '';
-		}
-
-		//-----------------------------------------
-		// Do we have _POST?
-		//-----------------------------------------
-		
-		foreach( array( 'announce_html_enabled', 'announce_title', 'announce_post', 'announce_start', 'announce_end', 'announce_forum', 'announce_active' ) as $bit )
-		{
-			if ( isset($_POST[$bit]) AND $_POST[$bit] )
-			{
-				$announce[$bit] = $_POST[$bit];
-			}
-			else if( !isset($announce[$bit]) )
-			{
-				$announce[$bit] = NULL;
-			}
-		}
-		
-		if ( $announce['announce_post'] )
-		{
-			if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-			{
-				$announce['announce_post'] = IPSText::getTextClass( 'bbcode' )->convertForRTE( $announce['announce_post'] );
-			}
-			else
-			{
-				IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-				IPSText::getTextClass( 'bbcode' )->parse_html		= $announce['announce_html_enabled'] ? $announce['announce_html_enabled'] : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_nl2br		= $announce['announce_nlbr_enabled'] ? $announce['announce_nlbr_enabled'] : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-				
-				$announce['announce_post'] = IPSText::getTextClass( 'bbcode' )->preEditParse( $announce['announce_post'] );
-			}
-		}
-		
-		//-----------------------------------------
-		// Forums
-		//-----------------------------------------
-		
-		$forum_html = "<option value='*'>" . $this->lang->words['announce_form_allforums'] . "</option>" . $this->registry->getClass('class_forums')->forumsForumJump(0,1,1);
-		
-		//-----------------------------------------
-		// Save forums?
-		//-----------------------------------------
-		
-		if ( is_array( $announce['announce_forum'] ) and count( $announce['announce_forum'] ) )
-		{
-			foreach( $announce['announce_forum'] as $f )
-			{
-				$forum_html = preg_replace( "#option\s+value=[\"'](".preg_quote($f,'#').")[\"']#i", "option value='\\1' selected='selected'", $forum_html );
-			}
-		}
-		
-		$announce['announce_active_checked'] = $announce['announce_active'] 	  ? 'checked="checked"'  : '';
-		$announce['html_checkbox'] 			 = $announce['announce_html_enabled'] ? "checked='checked' " : '';
-		$announce['nlbr_checkbox'] 			 = $announce['announce_nlbr_enabled'] ? "checked='checked' " : '';
-		
-		$this->_nav[] = array( ipsRegistry::instance()->getClass('class_localization')->words['menu_announcements'], "app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" );
-		$this->_nav[] = array( ipsRegistry::instance()->getClass('class_localization')->words[ $type == 'add' ? 'announce_add' : 'announce_button_edit' ] );
-		
-		return $this->registry->getClass('output')->getTemplate('ucp')->modAnnounceForm($announce, $button, $forum_html, $type, IPSText::getTextClass( 'editor' )->showEditor( $announce['announce_post'], 'announce_post' ), $msg);
-	}
-	
-	
-	/**
-	 * Custom Event: Update watched forums
-	 *
-	 * @author	Matt Mecham
-	 * @return	void
-	 */
-	private function _customEvent_updateForums()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$ids     = array();
- 		$allowed = array( 'none', 'immediate', 'delayed', 'daily', 'weekly' );
-
-		//-----------------------------------------
-		// Get IDs
-		//-----------------------------------------
-		
-		if ( is_array( $_REQUEST['forumIDs'] ) )
-		{
-			foreach( $_REQUEST['forumIDs'] as $id => $value )
-			{
-				$ids[] = intval( $id );
-			}
-		}
-		
-		//-----------------------------------------
- 		// Check...
- 		//-----------------------------------------
-
- 		if ( $this->request['authKey'] != $this->member->form_hash )
- 		{
- 			$this->registry->getClass('output')->showError( 'usercp_forums_bad_key', 3030, true );
- 		}
-
-		//-----------------------------------------
- 		// what we doing?
- 		//-----------------------------------------
- 		
- 		if ( count($ids) > 0 )
- 		{
- 			if ( $this->request['trackchoice'] == 'unsubscribe' )
- 			{
- 				$this->DB->buildAndFetch( array( 'delete' => 'forum_tracker', 'where' => "member_id=" . $this->memberData['member_id'] . " and forum_id IN (".implode( ",", $ids ).")" ) );
- 			}
- 			else if ( in_array( $this->request['trackchoice'], $allowed ) )
- 			{
- 				$this->DB->update( 'forum_tracker', array( 'forum_track_type' => $this->request['trackchoice'] ), "member_id=" . $this->memberData['member_id'] . " and forum_id IN (".implode( ",", $ids ).")" );
- 			}
- 		}
-
-		$this->registry->getClass('class_forums')->recacheWatchedForums( $this->memberData['member_id'] );
-		
-		if( $this->request['forumReturn'] )
-		{
-			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'showforum=' . intval( $this->request['forumReturn'] ) );
-		}
-		else
-		{
-			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=forums&amp;area=forumsubs" );
-		}
-	}
-	
-	/**
-	 * Custom Event: Update watched topics
-	 *
-	 * @author	Matt Mecham
-	 * @return	void
-	 */
-	private function _customEvent_updateTopics()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$ids     = array();
- 		$allowed = array( 'none', 'immediate', 'delayed', 'daily', 'weekly' );
-
-		//-----------------------------------------
-		// Get IDs
-		//-----------------------------------------
-		
-		if ( is_array( $_REQUEST['topicIDs'] ) )
-		{
-			foreach( $_REQUEST['topicIDs'] as $id => $value )
-			{
-				$ids[] = intval( $id );
-			}
-		}
-	
-		//-----------------------------------------
- 		// Check...
- 		//-----------------------------------------
- 		
- 		if ( $this->request['authKey'] != $this->member->form_hash )
- 		{
- 			$this->registry->getClass('output')->showError( 'usercp_forums_bad_key', 3031, true );
- 		}
- 		
- 		//-----------------------------------------
- 		// what we doing?
- 		//-----------------------------------------
- 		
- 		if ( count($ids) > 0 )
- 		{
- 			if ( $this->request['trackchoice'] == 'unsubscribe' )
- 			{
- 				$this->DB->delete( 'tracker', "member_id='{$this->memberData['member_id']}' and topic_id IN ( " . implode( ",", $ids ) . ")" );
- 			}
- 			else if ( in_array( $this->request['trackchoice'], $allowed ) )
- 			{
- 				$this->DB->update( 'tracker', array( 'topic_track_type' => $this->request['trackchoice'] ), "member_id='{$this->memberData['member_id']}' and topic_id IN (".implode( ",", $ids ).")" );
- 			}
- 		}
- 		
- 		if( $this->request['topicReturn'] )
- 		{
- 			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'showtopic=' . intval( $this->request['topicReturn'] ) . '&amp;st=' . intval( $this->request['st'] ) );
- 		}
- 		else
- 		{
- 	    	$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=forums&amp;area=topicsubs" );
- 	    }
-	}
-	
-	/**
-	 * Custom Event: Watch A Topic
-	 *
-	 * @author	Matt Mecham
-	 * @param	bool	Whether to save it or not
-	 * @return	void
-	 */
-	private function _customEvent_watch( $saveIt=FALSE )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$watch      = $this->request['watch'] == 'forum' ? 'forum' : 'topic';
-		$topicID    = intval($this->request['tid']);
-		$forumID    = intval($this->request['fid']);
-		$forum   	= array();
-		$topic	    = array();
-		
-		if ( $watch == 'topic' )
-		{
-			//-----------------------------------------
-			// Get the details from the DB (TOPIC)
-			//-----------------------------------------
-		
-			$topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$topicID ) );
-			
-			if ( ! $topic['tid'] )
-			{ 
-				$this->registry->getClass('output')->showError( 'usercp_forums_no_topic', 1030 );
-			}
-			
-			$forum   = $this->registry->getClass('class_forums')->forum_by_id[ $topic['forum_id'] ];
-			$forumID = $topic['forum_id'];
-		}
-		else
-		{
-			//-----------------------------------------
-			// Get the details (FORUM)
-			//-----------------------------------------
-		
-			$forum = $this->registry->getClass('class_forums')->forum_by_id[ $forumID ];
-		}
-		
-		//-----------------------------------------
-		// Permy check
-		//-----------------------------------------
-		
-		if ( IPSMember::checkPermissions('read', $forumID ) !== TRUE )
-		{
-			$this->registry->getClass('output')->showError( 'usercp_forums_no_perms', 1031, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Passy check
-		//-----------------------------------------
-		$deny_access = 1;
-		
-		if ( isset( $forum['password_override'] ) && IPSText::cleanPermString($forum['password_override']) != '' )
-		{
-			if ( IPSMember::isInGroup( $this->memberData, explode( ",", IPSText::cleanPermString($forum['password_override']) ) ) )
-			{
-				$deny_access = 0;
-			}
-		}
-		
-		if ( $deny_access AND ( isset($forum['password']) AND $forum['password'] != "" ) )
-		{
-			if ( $this->registry->getClass('class_forums')->forumsComparePassword( $forum['id'] ) != TRUE )
-			{
-				$this->registry->getClass('output')->showError( 'usercp_forums_must_login', 1032, null, null, 403 );
-			}
-		}
-		
-		//-----------------------------------------
-		// Have we already subscribed?
-		//-----------------------------------------
-		
-		if ( $watch == 'forum' )
-		{
-			$tmp = $this->DB->buildAndFetch( array( 
-													'select' => 'frid as tmpid',
-													'from'   => 'forum_tracker',
-													'where'  => "forum_id={$forumID} AND member_id=".$this->memberData['member_id'] 
-											)	 );
-		}
-		else
-		{
-			$tmp = $this->DB->buildAndFetch( array( 
-													'select' => 'trid as tmpid',
-													'from'   => 'tracker',
-													'where'  => "topic_id={$topicID} AND member_id=".$this->memberData['member_id'] 
-											)	 );
-		}
-		
-		if ( $tmp['tmpid'] )
-		{
-			$this->registry->getClass('output')->showError( 'forum_already_subscribed', 1033 );
-		}
-		
-		//-----------------------------------------
-		// What to do...
-		//-----------------------------------------
-		
-		if ( ! $saveIt )
-		{
-			//-----------------------------------------
-			// Okay, lets do the HTML
-			//-----------------------------------------
-			
-			return $this->registry->getClass('output')->getTemplate('ucp')->watchChoices( $forum, $topic, $watch );
-		}
-		else
-		{
-			//-----------------------------------------
-			// Auth check
-			//-----------------------------------------
-			
-			if ( $this->request['auth_key'] != $this->member->form_hash )
-			{
-				$this->registry->getClass('output')->showError( 'usercp_forums_bad_key', 2033, true );
-			}
-			
-			//-----------------------------------------
-			// Method..
-			//-----------------------------------------
-			
-			switch ( $this->request['emailtype'] )
-			{
-				case 'immediate':
-					$_method = 'immediate';
-					break;
-				case 'delayed':
-					$_method = 'delayed';
-					break;
-				case 'none':
-					$_method = 'none';
-					break;
-				case 'daily':
-					$_method = 'daily';
-					break;
-				case 'weekly':
-					$_method = 'weekly';
-					break;
-				default:
-					$_method = 'delayed';
-					break;
-			}
-        
-			//-----------------------------------------
-			// Add it to the DB
-			//-----------------------------------------
-			
-			if ( $watch == 'forum' )
-			{
-				$this->DB->insert( 'forum_tracker', array (
-														 'member_id'        => $this->memberData['member_id'],
-														 'forum_id'         => $forumID,
-														 'start_date'       => time(),
-														 'forum_track_type' => $_method,
-											  )       );
-				
-				$this->registry->getClass('class_forums')->recacheWatchedForums( $this->memberData['member_id'] );
-				
-				$this->registry->getClass('output')->redirectScreen( $this->lang->words['sub_added'], $this->settings['base_url'] . "showforum={$forumID}", $forum['name_seo'] );	
-			
-			}
-			else
-			{
-				$this->DB->insert( 'tracker',  array (
-												   'member_id'        => $this->memberData['member_id'],
-												   'topic_id'         => $topicID,
-												   'start_date'       => time(),
-												   'topic_track_type' => $_method,
-										)       );
-										
-				$this->registry->getClass('output')->redirectScreen( $this->lang->words['sub_added'], $this->settings['base_url'] . "showtopic={$topicID}&st=" . $this->request['st'], $topic['title_seo'] );
-	
-			}
-		}
-	}
-	
-	/**
-	 * UserCP Form Show
-	 *
-	 * @author	Matt Mecham
-	 * @param	string	Current area as defined by 'get_links'
-	 * @param	array   Array of member / core_sys_login information (if we're editing)
-	 * @return   string  Processed HTML
-	 */
-	public function showForm( $current_area, $errors=array() )
-	{
-		//-----------------------------------------
-		// Where to go, what to see?
-		//-----------------------------------------
-	
-		switch( $current_area )
-		{
-			default:
-			case 'settings':
-				return $this->showForumSettings();
-			break;
-			case 'topicsubs':
-				return $this->showTopicSubs();
-			break;
-			case 'forumsubs':
-				return $this->showForumSubs();
-			break;
-			case 'mod_announcements':
-				return $this->showModAnnouncements();
-			break;
-		}
-	}
-	
-	/**
-	 * Show topic announcement management
-	 *
-	 * @author	Matt Mecham
-	 * @return   string  Processed HTML
-	 */
-	public function showModAnnouncements()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$announcements = array();
-		
-		//-----------------------------------------
-		// Turn off global form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// Make sure we have access...
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->registry->getClass('output')->showError( 'announcements_supermods', 2034, true );
- 			return;
-		}
-		
-		//-----------------------------------------
-		// Get announcements
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select'		=> 'a.*',
-										'from'		=> array( 'announcements' => 'a' ),
-										'order'		=> 'a.announce_end DESC',
-										'add_join'	=> array(
-															array( 'select'	=> 'm.member_id, m.name, m.members_display_name',
-																	'from'	=> array( 'members' => 'm' ),
-																	'where'	=> 'm.member_id=a.announce_member_id',
-																	'type'	=> 'left'
-																)
-															)
-								)		);
-		$this->DB->execute();
-		
-		while ( $r = $this->DB->fetch() )
-		{
-			$r['announce_seo_title']	= IPSText::makeSeoTitle( $r['announce_title'] );
-			
-			if ( $r['announce_forum'] == '*' )
-			{
-				$r['announce_forum_show'] = $this->lang->words['announce_page_allforums'];
-			}
-			else
-			{
-				$tmp_forums = explode(",",$r['announce_forum']);
-
-				if ( is_array( $tmp_forums ) and count($tmp_forums) )
-				{
-					if ( count($tmp_forums) > 5 )
-					{
-						$r['announce_forum_show'] = count($tmp_forums).' '.$this->lang->words['announce_page_numforums'];
-					}
-					else
-					{
-						$r['_forums'] = array();
-						
-						foreach( $tmp_forums as $id )
-						{
-							$r['_forums'][] = array( $id, $this->registry->getClass('class_forums')->forum_by_id[ $id ]['name'] );
-						}
-					}
-				}	
-			}
-
-			$r['announce_inactive'] = !$r['announce_active'] ? "<span class='desc'>" . $this->lang->words['announce_page_disabled'] . "</span>" : '';
-			
-			$announcements[] = $r;
-			
-			//$content .= $this->registry->getClass('output')->getTemplate('ucp')->ucp_announce_manage_row( $r );
-		}
-		
-		return $this->registry->getClass('output')->getTemplate('ucp')->modAnnouncements( $announcements );
-	}
-	
-	/**
-	 * Show topic subscriptions
-	 *
-	 * @author	Matt Mecham
-	 * @return	string  Processed HTML
-	 * @todo 	[Future] Explore turning "new posts" into "unread posts"
-	 */
-	public function showForumSubs()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$mainForumArray = array();
-		$forums         = array();
-		$forumIDs		= array();
-		$topParents     = array();
-		
-		//-----------------------------------------
-		// Turn off global form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
- 		// INIT...
- 		//-----------------------------------------
- 		
- 		$remap = array( 'none'      => 'subs_none_title',
-						'immediate' => 'subs_immediate',
-						'delayed'   => 'subs_delayed',
-						'daily'     => 'subs_daily',
-						'weekly'    => 'subs_weekly'
-					  );
-					  
- 		$mainForumArray = array();
-
- 		//-----------------------------------------
- 		// Query the DB for the subby toppy-ics - at the same time
- 		// we get the forum and topic info, 'cos we rule.
- 		//-----------------------------------------
- 		
-		$this->DB->build( array( 'select'	=> '*',
-								 'from'	    => 'forum_tracker',
-								 'where'	=> 'member_id=' . $this->memberData['member_id'] ) );
-		$this->DB->execute();
-		
- 		while( $forum = $this->DB->fetch() )
- 		{
-			$topParents[]                 = $this->registry->getClass('class_forums')->fetchTopParentID( $forum['forum_id'] );
-			$forum['_type']               = $remap[ $forum['forum_track_type'] ];
-			$forums[ $forum['forum_id'] ] = $forum;
-		}
-		
-		//-----------------------------------------
-		// Get new count
-		//-----------------------------------------
-		
-		if ( is_array( $forums ) AND count( $forums ) )
-		{
-			$this->DB->build( array( 'select'   => 'forum_id, COUNT(*) as newTopics',
-									 'from'     => 'topics',
-									 'where'    => 'forum_id IN (' . implode( ',', array_keys( $forums ) ) . ') AND last_post > ' . $this->memberData['last_visit'],
-									 'group'    => 'forum_id' ) );
-														
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
-			{
-				$forums[ $row['forum_id'] ]['_newTopics'] = $row['newTopics'];
-			}
-		}
-		
-		//-----------------------------------------
-		// Now, loop through all forums...
-		//-----------------------------------------
-		
-		foreach( $this->registry->getClass('class_forums')->forum_cache['root'] as $id => $data )
-		{
-			if ( in_array( $id, $topParents ) )
-			{
-				$mainForumArray[ $id ] = array( '_data'   => $data,
-												'_forums' => $this->_showForumSubsRecurse( $forums, $id ) );
-			}
-		}
-
-		return $this->registry->getClass('output')->getTemplate('ucp')->watchedForums( $mainForumArray );
-	}
-	
-	/**
-	 * Recursively build up the tracked forums
-	 *
-	 * @param	array 		Tracked forums
-	 * @param	integer		Forum id to start at
-	 * @param	array 		Forum data thus far
-	 * @param	integer		Depth level
-	 * @return	array 		Forums
-	 */
-	private function _showForumSubsRecurse( $forums, $root, $forumArray=array(), $depth=0 )
-	{
-		if ( is_array( $this->registry->getClass('class_forums')->forum_cache[ $root ] ) AND count( $this->registry->getClass('class_forums')->forum_cache[ $root ] ) )
-		{
-			foreach( $this->registry->getClass('class_forums')->forum_cache[ $root ] as $id => $forum )
-			{
-				if ( in_array( $id, array_keys( $forums ) ) )
-				{ 
-					//-----------------------------------------
-					// Got perms to see this forum?
-					//-----------------------------------------
-			
-					if ( ! $this->registry->getClass('class_forums')->forum_by_id[ $forum['id'] ] )
-					{
-						continue;
-					}
-					
-					$forum['_depth']      = $depth;
-					$forum['_newTopics']  = $forums[ $forum['id'] ]['_newTopics'];
-					$forum['_type']       = $forums[ $forum['id'] ]['_type'];
-					
-					$forum['folder_icon'] = $this->registry->getClass('class_forums')->forumsNewPosts($forum);
-							
-					$forum['last_title'] = str_replace( "&#33;" , "!", $forum['last_title'] );
-					$forum['last_title'] = str_replace( "&quot;", '"', $forum['last_title'] );
-				
-					if ( IPSText::mbstrlen($forum['last_title']) > 30 )
-					{
-						$forum['last_title'] = IPSText::truncate( $forum['last_title'], 30 );
-					}
-			
-					$forumArray[ $forum['id'] ] = $forum;
-				}
-				
-				$forumArray = $this->_showForumSubsRecurse( $forums, $forum['id'], $forumArray, $depth + 1 );
-			}
-		}
-		
-		return $forumArray;
-	}
-	
-	/**
-	 * Show topic subscriptions
-	 *
-	 * @author	Matt Mecham
-	 * @return   string  Processed HTML
-	 */
-	public function showTopicSubs()
-	{
-		//-----------------------------------------
-		// Turn off global form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
- 		//-----------------------------------------
- 		// INIT...
- 		//-----------------------------------------
- 		
-		$date_cut       = ( intval($this->request['datecut'] ) ) ? intval( $this->request['datecut'] ) : 30;
- 		$date_query     = $date_cut != 1000 ? " AND t.last_post > ".(time() - ($date_cut*86400))." " : "";
- 		$topic_array    = array();
-		$forum_array    = array();
-		$mainForumArray = array();
-		
- 		$remap = array( 'none'      => 'subs_none_title',
-						'immediate' => 'subs_immediate',
-						'delayed'   => 'subs_delayed',
-						'daily'     => 'subs_daily',
-						'weekly'    => 'subs_weekly'
-					  );
- 		
- 		//-----------------------------------------
- 		// Get forums module
- 		//-----------------------------------------
- 		
- 		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums' ) . '/modules_public/forums/forums.php', 'public_forums_forums_forums' );
- 		$forumController = new $classToLoad();
-		$forumController->makeRegistryShortcuts( $this->registry );
- 		$forumController->initForums();
- 		
- 		//-----------------------------------------
- 		// Query the DB for the subby toppy-ics - at the same time
- 		// we get the forum and topic info, 'cos we rule.
- 		//-----------------------------------------
- 		
-		$this->DB->build( array( 'select'	=> 's.topic_track_type, s.trid, s.member_id, s.topic_id, s.last_sent, s.start_date as track_started',
-										'from'	=> array( 'tracker' => 's' ),
-										'where'	=> 's.member_id=' . $this->memberData['member_id'] . $date_query,
-										'add_join'	=> array(
-															array( 'select'	=> 't.*',
-																	'from'	=> array( 'topics' => 't' ),
-																	'where'	=> 't.tid=s.topic_id',
-																	'type'	=> 'left'
-																),
-															array( 'select'	=> 'f.id as forum_id, f.name as forum_name',
-																	'from'	=> array( 'forums' => 'f' ),
-																	'where'	=> 'f.id=t.forum_id',
-																	'type'	=> 'left'
-																),
-															)
-								)		);
-		$this->DB->execute();
-		
-		while( $topic = $this->DB->fetch() )
-		{
-			//-----------------------------------------
-			// Got perms to see this forum?
-			//-----------------------------------------
-			
-			if ( ! $this->registry->getClass('class_forums')->forum_by_id[ $topic['forum_id'] ] )
-			{
-				continue;
-			}
-			
-			$topic['_last_post']        = $topic['last_post'];
-			$topic['_type']             = $remap[ $topic['topic_track_type'] ];
-			$topic_ids[ $topic['tid'] ] = $topic['forum_id'];
-			
-			if ( ! isset( $mainForumArray[ $topic['forum_id'] ] ) )
-			{
-				$mainForumArray[ $topic['forum_id'] ] = $topic;
-			}
-			
-			$mainForumArray[ $topic['forum_id'] ]['_topics'][ $topic['tid'] ] = $topic;
-		}
-		
-		//-----------------------------------------
-		// Are we dotty?
-		//-----------------------------------------
-		
-		if( ( $this->settings['show_user_posted'] == 1 ) and ( $this->memberData['member_id'] ) and count($mainForumArray) )
-		{
-			$this->DB->build( array( 
-									'select' => 'author_id, topic_id',
-									'from'   => 'posts',
-									'where'  => 'queued=0 AND author_id=' . $this->memberData['member_id'] . ' AND topic_id IN(' . implode( ',', array_keys( $topic_ids ) ) . ')',
-							)	);
-									  
-			$this->DB->execute();
-			
-			while( $p = $this->DB->fetch() )
-			{
-				if ( is_array( $mainForumArray[ $topic_ids[ $p['topic_id'] ] ]['_topics'][ $p['topic_id'] ] ) )
-				{
-					$mainForumArray[ $topic_ids[ $p['topic_id'] ] ]['_topics'][ $p['topic_id'] ]['author_id'] = $p['author_id'];
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Now parse
-		//-----------------------------------------
-		
-		foreach( $mainForumArray as $forum_id => $data )
-		{
-			foreach( $mainForumArray[ $forum_id ]['_topics'] as $tid => $_data )
-			{
-				$mainForumArray[ $forum_id ]['_topics'][ $tid ] = $forumController->parseTopicData( $_data );
-			}
-		}
-	
-		return $this->registry->getClass('output')->getTemplate('ucp')->watchedTopics( $mainForumArray, $date_cut );
-	}
-	
-	/**
-	 * Show the forums Settings form
-	 *
-	 * @author	Matt Mecham
-	 * @return   string  Processed HTML
-	 */
-	public function showForumSettings()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$pp_a	= array();
-		$tp_a	= array();
-
-		//-----------------------------------------
-		// Viewing settings...
-		//-----------------------------------------
-		
-		list( $post_page, $topic_page ) = explode( "&", $this->memberData['view_prefs'] );
-
-		if ( $post_page == "" )
-		{
-			$post_page = -1;
-		}
-		if ( $topic_page == "" )
-		{
-			$topic_page = -1;
-		}
-
-		foreach( explode( ',', $this->settings['postpage_contents'] ) as $n )
-		{
-			$n      = intval(trim($n));
-			$pp_a[] = array( $n, $n );
-		}
-
-		foreach( explode( ',', $this->settings['topicpage_contents'] ) as $n )
-		{
-			$n      = intval(trim($n));
-			$tp_a[] = array( $n, $n );
-		}
-
-		return $this->registry->getClass('output')->getTemplate('ucp')->forumPrefsForm( array( 
-																							'viewTopicsForm'	=> $tp_a,
-																							'viewPostsForm'		=> $pp_a,
-																							'postsPerPage'		=> $post_page,
-																							'topicsPerPage'		=> $topic_page ) );
-	}
-	
-	/**
-	 * UserCP Form Check
-	 *
-	 * @author	Matt Mecham
-	 * @param	string	Current area as defined by 'get_links'
-	 * @return   string  Processed HTML
-	 */
-	public function saveForm( $current_area )
-	{
-		//-----------------------------------------
-		// Where to go, what to see?
-		//-----------------------------------------
-		
-		switch( $current_area )
-		{
-			default:
-			case 'settings':
-				return $this->saveForumSettings();
-			break;
-		}
-	}
-
-	/**
-	 * UserCP Save Form: Settings
-	 *
-	 * @return   array  Errors
-	 */
-	public function saveForumSettings()
-	{
-		//-----------------------------------------
-		// Check...
-		//-----------------------------------------
-		
-		if ( ! in_array( $this->request['postpage'], explode( ',', $this->settings['postpage_contents'] ) ) )
-		{
-			$this->request['postpage'] = '-1';
-		}
-		
-		if ( ! in_array( $this->request['topicpage'], explode( ',', $this->settings['topicpage_contents'] ) ) )
-		{
-			$this->request['topicpage'] = '-1';
-		}
- 		
- 		IPSCookie::set( 'topicmode', $this->request['topic_display_mode'], 1 );
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'view_avs'   => intval($this->request['viewAvatars']),
-		 																				  'view_sigs'  => intval($this->request['viewSignatures']),
-																						  'view_img'   => intval($this->request['viewImages']),
-																						  'view_prefs' => intval($this->request['postpage'])."&".intval($this->request['topicpage']) ) ) );
-
-		return TRUE;
-	}
-	
-	/**
-	 * Password check
-	 *
-	 * @param	string	Plain Text Password
-	 * @return	bool	Password matches
-	 */
-	private function _check_password( $password_check )
-	{
-		//-----------------------------------------
-		// Ok, check password first
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		$this->han_login =  new $classToLoad( $this->registry );
-    	$this->han_login->init();
-		
-		//-----------------------------------------
-		// Is this a username or email address?
-		//-----------------------------------------
-		
-		$this->han_login->loginPasswordCheck( $this->memberData['name'], $this->memberData['email'], $password_check );
-	
-		if ( $this->han_login->return_code == 'SUCCESS' )
-		{
-			return TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/index.html b/upload/admin/applications/forums/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/index.html
+++ b/upload/admin/applications/forums/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/js/acp.rss.js b/upload/admin/applications/forums/js/acp.rss.js
index 4ac71877..e3c4dc2c 100644
--- a/upload/admin/applications/forums/js/acp.rss.js
+++ b/upload/admin/applications/forums/js/acp.rss.js
@@ -25,15 +25,15 @@ ACPRss = {
 	
 	showAuthBoxes: function()
 	{
-		var auth_req = $('rss_import_auth_userinfo');
-		
-		if( !auth_req.visible() )
+		if( $('rss_import_auth_userinfo_1').visible() )
 		{
-			auth_req.show();
+			$('rss_import_auth_userinfo_1').hide();
+			$('rss_import_auth_userinfo_2').hide();
 		}
 		else
 		{
-			auth_req.hide();
+			$('rss_import_auth_userinfo_1').show();
+			$('rss_import_auth_userinfo_2').show();
 		}
 	},
 	
diff --git a/upload/admin/applications/forums/js/index.html b/upload/admin/applications/forums/js/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/js/index.html
+++ b/upload/admin/applications/forums/js/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/ajax/index.html b/upload/admin/applications/forums/modules_admin/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/ajax/index.html
+++ b/upload/admin/applications/forums/modules_admin/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/ajax/member_editform.php b/upload/admin/applications/forums/modules_admin/ajax/member_editform.php
index 5529be09..a53800de 100644
--- a/upload/admin/applications/forums/modules_admin/ajax/member_editform.php
+++ b/upload/admin/applications/forums/modules_admin/ajax/member_editform.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member property updater (AJAX)
- * Last Updated: $Date: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6915 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,9 +29,8 @@ class admin_forums_ajax_member_editform extends ipsAjaxCommand
 	/**
 	* Main class entry point
 	*
-	* @access	public
 	* @param	object		ipsRegistry reference
-	* @return	void		[Outputs to screen]
+	* @return	@e void		[Outputs to screen]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -49,94 +48,17 @@ class admin_forums_ajax_member_editform extends ipsAjaxCommand
 		
     	switch( $this->request['do'] )
     	{
-			case 'remove_avatar':
-				$this->_removeAvatar();
-			break;
-			
-			case 'get_avatar_images':
-				$this->_getAvatarImages();
-			break;
-			
 			case 'show':
 			default:
 				$this->show();
 			break;
     	}
 	}
-	
-	
-	/**
-	* Get avatar images in a directory
-	*
-	* @access	protected
-	* @return	void		[Outputs to screen]
-	*/
-	protected function _getAvatarImages()
-	{
-		$dir	= IPSText::alphanumericalClean( urldecode( $this->request['cat'] ), ' ' );
-		$images	= IPSMember::getFunction()->getHostedAvatarsFromCategory( $dir );
-		
-		IPSDebug::fireBug( 'info', array( 'Directory: ' . $dir ) );
-		
-		if ( $images === FALSE )
-		{
-			$this->returnJsonError($this->lang->words['m_nodir']);
-			exit();
-		}
-		else
-		{
-			$output = $this->html->inline_avatar_images( $images );
-		
-			$this->returnJsonArray( array('html' => $output) );
-		}
-	}
-		
-	/**
-	* Remove user's avatar
-	*
-	* @access	protected
-	* @return	void		[Outputs to screen]
-	*/
-	protected function _removeAvatar()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$member_id		= intval( $this->request['member_id'] );
-		
-		try
-		{
-			IPSMember::getFunction()->removeAvatar( $member_id );
-			
-			$_string = <<<EOF
-			{
-				'success'       : true,
-			}
-
-EOF;
-			$this->returnString( $_string );
-		}
-		catch( Exception $error )
-		{
-			switch ( $error->getMessage() )
-			{
-				case 'NO_MEMBER_ID':
-					$this->registry->output->showError( $this->lang->words['t_noid'], 1130 );
-				break;
-				case 'NO_PERMISSION':
-					$this->registry->output->showError( $this->lang->words['t_permav'], 2130, true );
-				break;
-			}
-		}
-	}
-	
 
 	/**
 	* Show the form
 	*
-	* @access	protected
-	* @return	void		[Outputs to screen]
+	* @return	@e void		[Outputs to screen]
 	*/
 	protected function show()
 	{
@@ -171,47 +93,6 @@ EOF;
 		{
 			$output = $this->html->$name( $member );
 		}
-		else
-		{
-			$save_to		= '';
-			$div_id			= '';
-			$form_field		= '';
-			$text			= '';
-			$description	= '';
-			$method			= '';
-
-
-			switch( $name )
-			{	
-				/*case 'inline_warn_level':
-					$method			= 'inline_form_generic';
-					$save_to		= 'save_generic&amp;field=warn_level';
-					$div_id			= 'warn_level';
-					$form_field		= ipsRegistry::getClass('output')->formInput( "generic__field", $member['warn_level'] );
-					$text			= "Member Warn Level";
-					$description	= "Make adjustments to the member's overall warn level.  This does NOT add a warn log record - you should do so manually using the 'Add New Note' link if you wish to store a log of this adjustment";
-				break;*/
-				
-				case 'inline_avatar':
-					if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_photo', 'members', 'members' ) )
-					{
-						$this->returnJsonError($this->lang->words['m_nopermban']);
-					}
-					
-					$form				= array();
-					$form['avatar_url']	= ipsRegistry::getClass('output')->formInput( "avatar_url", $member['avatar_type'] == 'url' ? $member['avatar_location'] : '' );
-					
-			 		$av_categories = array_merge( array( 0 => array( 0, $this->lang->words['m_selectcat'] ) ), IPSMember::getFunction()->getHostedAvatarCategories() );
-
-					$output = $this->html->inline_avatar_selector( $member, $av_categories );
-				break;
-			}
-			
-			if ( ! $output AND $method AND method_exists( $this->html, $method ) )
-			{
-				$output = $this->html->$method( $member, $save_to, $div_id, $form_field, $text, $description );
-			}
-		}
 		
 		//-----------------------------------------
 		// Print...
diff --git a/upload/admin/applications/forums/modules_admin/attachments/defaultSection.php b/upload/admin/applications/forums/modules_admin/attachments/defaultSection.php
index 63705d72..74d00449 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/defaultSection.php
+++ b/upload/admin/applications/forums/modules_admin/attachments/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section for attachments module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'attachments' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'types';
diff --git a/upload/admin/applications/forums/modules_admin/attachments/index.html b/upload/admin/applications/forums/modules_admin/attachments/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/index.html
+++ b/upload/admin/applications/forums/modules_admin/attachments/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/attachments/search.php b/upload/admin/applications/forums/modules_admin/attachments/search.php
index a834e130..29d4d494 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/search.php
+++ b/upload/admin/applications/forums/modules_admin/attachments/search.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachments: Search
- * Last Updated: $LastChangedDate: 2010-10-01 20:18:21 -0400 (Fri, 01 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Mon 24th May 2004
- * @version		$Rev: 6937 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -28,33 +28,29 @@ class admin_forums_attachments_search extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -103,10 +99,9 @@ class admin_forums_attachments_search extends ipsCommand
 	/**
 	 * Bulk remove attachments
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _bulkRemoveAttachments()
+	protected function _bulkRemoveAttachments()
 	{
 		foreach ( $_POST as $key => $value )
 		{
@@ -166,7 +161,7 @@ class admin_forums_attachments_search extends ipsCommand
 			// Recount topic upload marker
 			//-----------------------------------------
 			
-			require_once( IPSLib::getAppDir('forums') . '/sources/classes/post/classPost.php' );
+			require_once( IPSLib::getAppDir('forums') . '/sources/classes/post/classPost.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 			
 			$postlib = new $classToLoad( $this->registry );
@@ -210,10 +205,9 @@ class admin_forums_attachments_search extends ipsCommand
 	/**
 	 * Attachment search results
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _searchResults()
+	protected function _searchResults()
 	{
 		$show	= intval($this->request['show']);
 		$show	= $show > 100 ? 100 : $show;
@@ -323,10 +317,9 @@ class admin_forums_attachments_search extends ipsCommand
 	/**
 	 * Show attachment search form
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _searchForm()
+	protected function _searchForm()
 	{
 		$gt_array = array( 0 => array( 'gt', $this->lang->words['se_morethan'] ), 1 => array( 'lt', $this->lang->words['se_lessthan'] ) );
 		
diff --git a/upload/admin/applications/forums/modules_admin/attachments/stats.php b/upload/admin/applications/forums/modules_admin/attachments/stats.php
index 550e06f8..40d813e4 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/stats.php
+++ b/upload/admin/applications/forums/modules_admin/attachments/stats.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachments: Stats
- * Last Updated: $LastChangedDate: 2010-02-18 20:29:54 -0500 (Thu, 18 Feb 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Mon 24th May 2004
- * @version		$Rev: 5855 $
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -25,28 +25,18 @@ if ( ! defined( 'IN_ACP' ) )
 
 class admin_forums_attachments_stats extends ipsCommand
 {
-	/**
-	 * Image directory
-	 *
-	 * @access	private
-	 * @var		string
-	 */
-	private $image_dir = '';
-	
 	/**
 	 * HTML  object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main execution point
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -56,10 +46,7 @@ class admin_forums_attachments_stats extends ipsCommand
 		$this->html->form_code_js = 'module=attachments&amp;section=stats&amp;';
 		
 		$this->lang->loadLanguageFile( array( 'admin_attachments' ) );
-		
-		/* Image Set */
-		$this->image_dir = $this->registry->output->skin['set_image_dir'];
-		
+
 		//-----------------------------------------
 		// StRT!
 		//-----------------------------------------
@@ -82,15 +69,14 @@ class admin_forums_attachments_stats extends ipsCommand
 	/**
 	 * Shows attachment statistics
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentStatsOverview()
 	{
 		/* Get attachment Types */
 		$cache['attachtypes'] = array();
 			
-		$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_img', 'from' => 'attachments_type', 'where' => "atype_post=1" ) );
 		$this->DB->execute();
 	
 		while ( $r = $this->DB->fetch() )
diff --git a/upload/admin/applications/forums/modules_admin/attachments/types.php b/upload/admin/applications/forums/modules_admin/attachments/types.php
index cc9459c2..87059493 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/types.php
+++ b/upload/admin/applications/forums/modules_admin/attachments/types.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachments: Manage
- * Last Updated: $LastChangedDate: 2010-06-28 20:04:10 -0400 (Mon, 28 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-06-23 12:03:27 -0400 (Thu, 23 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Mon 24th May 2004
- * @version		$Rev: 6584 $
+ * @version		$Rev: 9081 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -25,28 +25,18 @@ if ( ! defined( 'IN_ACP' ) )
 
 class admin_forums_attachments_types extends ipsCommand
 {
-	/**
-	 * Image directory
-	 *
-	 * @access	private
-	 * @var		string
-	 */
-	private $image_dir = '';
-	
 	/**
 	 * HTML  object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Main execution point
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -56,10 +46,7 @@ class admin_forums_attachments_types extends ipsCommand
 		$this->html->form_code_js = 'module=attachments&amp;section=types&amp;';
 		
 		$this->lang->loadLanguageFile( array( 'admin_attachments' ) );
-		
-		/* Image Set */
-		$this->image_dir = $this->registry->output->skin['set_image_dir'];
-		
+
 		//-----------------------------------------
 		// StRT!
 		//-----------------------------------------
@@ -103,6 +90,7 @@ class admin_forums_attachments_types extends ipsCommand
 			
 			case 'overview':
 			default:
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'mime_view' );
 				$this->attachmentTypesOverview();
 			break;
 		}
@@ -115,9 +103,8 @@ class admin_forums_attachments_types extends ipsCommand
 	/**
 	 * Imports attachment types from an xml document
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeImport()
 	{
 		/* Get the XML Content */
@@ -131,11 +118,10 @@ class admin_forums_attachments_types extends ipsCommand
 		}
 		
 		/* Get the XML class */
-		require_once( IPS_KERNEL_PATH.'class_xml.php' );
-		$xml = new class_xml();
-		
-		/* Parse the XML document */
-		$xml->xml_parse_document( $content );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
+
+		$xml = new classXML( IPS_DOC_CHAR_SET );
+		$xml->loadXML( $content );
 		
 		/* Get a list of the types already installed */
 		$types = array();
@@ -149,24 +135,25 @@ class admin_forums_attachments_types extends ipsCommand
 		}
 		
 		/* Loop through the xml document and insert new types */
-		foreach( $xml->xml_array['attachtypesexport']['attachtypesgroup']['attachtype'] as $entry )
+		foreach( $xml->fetchElements('attachtype') as $record )
 		{
+			$entry  = $xml->fetchElementsFromRecord( $record );
+
 			/* Build the insert array */
-			$insert_array = array( 'atype_extension' => $entry['atype_extension']['VALUE'],
-								   'atype_mimetype'  => $entry['atype_mimetype']['VALUE'],
-								   'atype_post'      => $entry['atype_post']['VALUE'],
-								   'atype_photo'     => $entry['atype_photo']['VALUE'],
-								   'atype_img'       => $entry['atype_img']['VALUE']
+			$insert_array = array( 'atype_extension' => $entry['atype_extension'],
+								   'atype_mimetype'  => $entry['atype_mimetype'],
+								   'atype_post'      => $entry['atype_post'],
+								   'atype_img'       => $entry['atype_img']
 								 );
 
 			/* Bypass if this type has already been added */
-			if ( $types[ $entry['atype_extension']['VALUE'] ] )
+			if ( $types[ $entry['atype_extension'] ] )
 			{
 				continue;
 			}
 			
 			/* Insert the new type */
-			if ( $entry['atype_extension']['VALUE'] and $entry['atype_mimetype']['VALUE'] )
+			if ( $entry['atype_extension'] and $entry['atype_mimetype'] )
 			{
 				$this->DB->insert( 'attachments_type', $insert_array );
 			}
@@ -182,27 +169,28 @@ class admin_forums_attachments_types extends ipsCommand
 	/**
 	 * Builds the attachment type xml export
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeExport()
 	{
-		/* Get XML Class */
-		require_once( IPS_KERNEL_PATH.'class_xml.php' );
-		$xml = new class_xml();
+		//-----------------------------------------
+		// Get xml class
+		//-----------------------------------------
 		
-		/* Set the root of the XML document */
-		$xml->xml_set_root( 'attachtypesexport' );
-		
-		/* Add the attachment type group */
-		$xml->xml_add_group( 'attachtypesgroup' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
+
+		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
+		$xml->newXMLDocument();
+		$xml->addElement( 'attachtypesexport' );
+		$xml->addElement( 'attachtypesgroup', 'attachtypesexport' );
+
 		/* Query the attachment Types */
 		$this->DB->build( array( 
-										'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img',
-										'from'   => 'attachments_type',
-										'order'  => "atype_extension" 
-								)	 );
+								'select' => 'atype_extension,atype_mimetype,atype_post,atype_img',
+								'from'   => 'attachments_type',
+								'order'  => "atype_extension" 
+						)	 );
 		$this->DB->execute();
 		
 		/* Loop through the types */
@@ -210,33 +198,18 @@ class admin_forums_attachments_types extends ipsCommand
 		
 		while( $r = $this->DB->fetch() )
 		{
-			/* INI */
-			$content = array();
-			
-			/* Build the tag */
-			foreach ( $r as $k => $v )
-			{
-				$content[] = $xml->xml_build_simple_tag( $k, $v );
-			}
-			
-			/* Add to the entry */
-			$entry[] = $xml->xml_build_entry( 'attachtype', $content );
+			$xml->addElementAsRecord( 'attachtypesgroup', 'attachtype', $r );
 		}
-		
-		/* Add entries to the group and build the document */
-		$xml->xml_add_entry_to_group( 'attachtypesgroup', $entry );
-		$xml->xml_format_document();
-		
+
 		/* Send for download */
-		$this->registry->output->showDownload( $xml->xml_document, 'attachments.xml', "unknown/unknown", false );
+		$this->registry->output->showDownload( $xml->fetchDocument(), 'attachments.xml', "unknown/unknown", false );
 	}	
 	
 	/**
 	 * Removes the specified attachment type
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeDelete()
 	{
 		/* INI */
@@ -255,10 +228,9 @@ class admin_forums_attachments_types extends ipsCommand
 	/**
 	 * Processes the from for adding/editing attachments
 	 *
-	 * @access	public
 	 * @param	string	$type	Either add or edit	 
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeSave( $type='add' )
 	{
 		/* INI */
@@ -274,11 +246,9 @@ class admin_forums_attachments_types extends ipsCommand
 		
 		/* Build the save array */
 		$save_array = array( 'atype_extension' => str_replace( ".", "", $this->request['atype_extension'] ),
-							 'atype_mimetype'  => $this->request['atype_mimetype'],
-							 'atype_post'      => $this->request['atype_post'],
-							 'atype_photo'     => $this->request['atype_photo'],
-							 'atype_img'       => $this->request['atype_img']
-						   );
+							 'atype_mimetype'  => trim( $this->request['atype_mimetype'] ),
+							 'atype_post'      => trim( $this->request['atype_post'] ),
+							 'atype_img'       => trim( $this->request['atype_img'] ) );
 		
 		/* Add attachment type to the database */
 		if ( $type == 'add' )
@@ -290,6 +260,7 @@ class admin_forums_attachments_types extends ipsCommand
 			{
 				$this->registry->output->global_message = sprintf( $this->lang->words['ty_already'], $save_array['atype_extension'] );
 				$this->attachmentTypeForm($type);
+				return;
 			}
 			
 			/* Insert the attachment type */
@@ -316,15 +287,14 @@ class admin_forums_attachments_types extends ipsCommand
 	/**
 	 * Displays the form for adding/editing attachment types
 	 *
-	 * @access	public
 	 * @param	string	$type	Either add or edit
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeForm( $type='add' )
 	{
 		/* INI */
-		$this->request[ 'id'] =  $this->request['id'] ? intval( $this->request['id'] )  : 0;
-		$this->request[ 'baseon'] =  $this->request['baseon'] ? intval( $this->request['baseon'] ) : 0;
+		$this->request['id']		= $this->request['id'] ? intval( $this->request['id'] ) : 0;
+		$this->request['baseon']	= $this->request['baseon'] ? intval( $this->request['baseon'] ) : 0;
 		
 		/* Navigation */
 		$this->registry->output->nav[] = array( '', $this->lang->words['ty_addedit'] );
@@ -352,7 +322,6 @@ class admin_forums_attachments_types extends ipsCommand
 				$attach = array( 'atype_extension' 	=> '',
 								 'atype_mimetype'	=> '',
 								 'atype_post'		=> '',
-								 'atype_photo'		=> '',
 								 'atype_img'		=> '' );
 			}
 			
@@ -391,11 +360,10 @@ class admin_forums_attachments_types extends ipsCommand
 		
 		/* Form Elements */
 		$form = array(
-						'atype_extension' => $this->registry->output->formSimpleInput( 'atype_extension', ( isset( $this->request['atype_extension'] ) AND $this->request['atype_extension'] ) ? $this->request['atype_extension'] : $attach['atype_extension'], 10 ),
-						'atype_mimetype'  => $this->registry->output->formSimpleInput( 'atype_mimetype' , ( isset( $this->request['atype_mimetype'] )  AND $this->request['atype_mimetype'] )  ? $this->request['atype_mimetype']  : $attach['atype_mimetype'] , 40 ),
-						'atype_post'      => $this->registry->output->formYesNo(       'atype_post'     , ( isset( $this->request['atype_post'] )      AND $this->request['atype_post'] )      ? $this->request['atype_post']      : $attach['atype_post']          ),
-						'atype_photo'     => $this->registry->output->formYesNo(       'atype_photo'    , ( isset( $this->request['atype_photo'] )     AND $this->request['atype_photo'] )     ? $this->request['atype_photo']     : $attach['atype_photo']         ),
-						'atype_img'       => $this->registry->output->formSimpleInput( 'atype_img'      , ( isset( $this->request['atype_img'] )       AND $this->request['atype_img'] )       ? $this->request['atype_img']       : $attach['atype_img']      , 40 ),
+						'atype_extension' => $this->registry->output->formSimpleInput( 'atype_extension', !empty( $this->request['atype_extension'] )	? $this->request['atype_extension']	: $attach['atype_extension'], 10 ),
+						'atype_mimetype'  => $this->registry->output->formSimpleInput( 'atype_mimetype' , !empty( $this->request['atype_mimetype'] )	? $this->request['atype_mimetype']	: $attach['atype_mimetype'] , 40 ),
+						'atype_post'      => $this->registry->output->formYesNo(       'atype_post'     , !empty( $this->request['atype_post'] )		? $this->request['atype_post']		: $attach['atype_post']          ),
+						'atype_img'       => $this->registry->output->formSimpleInput( 'atype_img'      , !empty( $this->request['atype_img'] )			? $this->request['atype_img']		: $attach['atype_img']      , 40 ),
 					);
 		
 		/* Output */
@@ -405,9 +373,8 @@ class admin_forums_attachments_types extends ipsCommand
 	/**
 	 * Shows the attachment types that have been setup
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypesOverview()
 	{
 		/* Get the attachments */
@@ -419,11 +386,9 @@ class admin_forums_attachments_types extends ipsCommand
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$r['_imagedir'] = $this->image_dir;
+			$r['_imagedir'] = $this->registry->output->skin['set_image_dir'];
 			
-			$checked_img         = "<img src='{$this->settings['skin_acp_url']}/_newimages/icons/tick.png' alt='Yes' />";
-			$r['apost_checked']  = $r['atype_post']  ? $checked_img : '&nbsp;';
-			$r['aphoto_checked'] = $r['atype_photo'] ? $checked_img : '&nbsp;';
+			$r['apost_checked']  = $r['atype_post']  ? "<img src='{$this->settings['skin_acp_url']}/images/icons/tick.png' alt='{$this->lang->words['yesno_yes']}' />" : "<img src='{$this->settings['skin_acp_url']}/images/icons/cross.png' alt='{$this->lang->words['yesno_no']}' />";
 			
 			$attach_rows[] = $r;
 		}
@@ -435,14 +400,13 @@ class admin_forums_attachments_types extends ipsCommand
 	/*
 	 * Rebuilds the attachment type cache
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function attachmentTypeCacheRebuild()
 	{
 		$cache = array();
 			
-		$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$this->DB->build( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_img', 'from' => 'attachments_type', 'where' => "atype_post=1" ) );
 		$this->DB->execute();
 	
 		while ( $r = $this->DB->fetch() )
diff --git a/upload/admin/applications/forums/modules_admin/attachments/xml/index.html b/upload/admin/applications/forums/modules_admin/attachments/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/xml/index.html
+++ b/upload/admin/applications/forums/modules_admin/attachments/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/attachments/xml/menu.xml b/upload/admin/applications/forums/modules_admin/attachments/xml/menu.xml
index e1c375b8..e5ddee45 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/xml/menu.xml
+++ b/upload/admin/applications/forums/modules_admin/attachments/xml/menu.xml
@@ -6,9 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Типы файлов</subitemtitle>
+					<subitemlang>attachment_types</subitemlang>
 					<subsection>types</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>mime_view</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика</subitemtitle>
+					<subitemlang>attachment_stats</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>stats_attachments</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -30,9 +32,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Пои�к</subitemtitle>
+					<subitemlang>attachment_search</subitemlang>
 					<subsection>search</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>view_attachments</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/forums/modules_admin/attachments/xml/permissions.xml b/upload/admin/applications/forums/modules_admin/attachments/xml/permissions.xml
index 3b226cdd..2e9384d1 100644
--- a/upload/admin/applications/forums/modules_admin/attachments/xml/permissions.xml
+++ b/upload/admin/applications/forums/modules_admin/attachments/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление прикрепленными файлами</grouptitle>
+		<grouplang>forums_attachments</grouplang>
 		<items>
 			<item>
 				<key>view_attachments</key>
@@ -19,7 +20,12 @@
 	</group>
 	<group>
 		<grouptitle>Управление типами прикрепл�емых файлов</grouptitle>
+		<grouplang>forums_mimes</grouplang>
 		<items>
+			<item>
+				<key>mime_view</key>
+				<string>Может про�матривать?</string>
+			</item>
 			<item>
 				<key>mime_add</key>
 				<string>Может добавл�ть?</string>
diff --git a/upload/admin/applications/forums/modules_admin/forums/defaultSection.php b/upload/admin/applications/forums/modules_admin/forums/defaultSection.php
index 978d84a2..d8d8f6fd 100644
--- a/upload/admin/applications/forums/modules_admin/forums/defaultSection.php
+++ b/upload/admin/applications/forums/modules_admin/forums/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section setting
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'forums' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		Tuesday 17th August 2004
- * @version		$Revision: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'forums';
diff --git a/upload/admin/applications/forums/modules_admin/forums/forums.php b/upload/admin/applications/forums/modules_admin/forums/forums.php
index 2335d3aa..903beffc 100644
--- a/upload/admin/applications/forums/modules_admin/forums/forums.php
+++ b/upload/admin/applications/forums/modules_admin/forums/forums.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum management
- * Last Updated: $Date: 2010-11-08 15:39:48 -0500 (Mon, 08 Nov 2010) $
+ * Last Updated: $Date: 2011-09-01 23:02:38 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 17th August 2004
- * @version		$Revision: 7117 $
+ * @version		$Revision: 9442 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,32 +30,16 @@ class admin_forums_forums_forums extends ipsCommand
  	 *
  	 * @var		object
  	 */
-	private $html;
-	
-	/**
-	 * Forum functions object
-	 *
-	 * @var		object
-	 */
-	private $forum_functions;
-	
+	protected $html;
+
 	/**
 	 * Main entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doExecute( ipsRegistry $registry )
 	{
-		/* Forum functions set up */
-		require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/admin_forum_functions.php", 'admin_forum_functions', 'forums' );
-		
-		$this->forum_functions = new $classToLoad( $registry );
-		$this->forum_functions->forumsInit();
-		
-		$this->request['showall'] = intval( $this->request['showall'] );
-		
 		//-----------------------------------------
 		// Load skin & lang
 		//-----------------------------------------
@@ -70,7 +54,14 @@ class admin_forums_forums_forums extends ipsCommand
 		// LOAD HTML
 		//-----------------------------------------
 		
-		$this->forum_functions->html =& $this->html;
+		$this->registry->getClass('class_forums')->html =& $this->html;
+		
+		/* Load tagging stuff */
+		if ( ! $this->registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
 		
 		//-----------------------------------------
 		// To do...
@@ -169,7 +160,7 @@ class admin_forums_forums_forums extends ipsCommand
 	/**
 	 * Edit skins assigned to forums
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function skinEdit()
 	{
@@ -182,7 +173,7 @@ class admin_forums_forums_forums extends ipsCommand
 		}
 		
 		/* Forum Data */
-		$forum = $this->forum_functions->forum_by_id[ $this->request['f'] ];
+		$forum = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ];
 		
 		/* Check the forum */
 		if ( ! $forum['id'] )
@@ -203,13 +194,14 @@ class admin_forums_forums_forums extends ipsCommand
 		$forum['apply_to_children'] = $this->registry->output->formYesNo( 'apply_to_children' );
 		
 		/* Output */
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['modify_skin_head'] );
 		$this->registry->output->html .= $this->html->forumSkinOptions( $this->request['f'], $forum );
 	}
 	
 	/**
 	 * Save the skin assigned to the forum
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doSkinEdit()
 	{
@@ -223,7 +215,7 @@ class admin_forums_forums_forums extends ipsCommand
 		}
 		
 		/* Forum Data */
-		$forum = $this->forum_functions->forum_by_id[ $this->request['f'] ];
+		$forum = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ];
 		
 		/* Update the forum */
 		$this->DB->update( 'forums', array( 'skin_id' => $this->request['fsid'] ), 'id='.$this->request['f'] );
@@ -231,7 +223,7 @@ class admin_forums_forums_forums extends ipsCommand
 		/* Apply to children */
 		if( $this->request['apply_to_children'] )
 		{
-			$ids = $this->forum_functions->forumsGetChildren( $this->request['f'] );
+			$ids = $this->registry->getClass('class_forums')->forumsGetChildren( $this->request['f'] );
 			
 			if ( count( $ids ) )
 			{
@@ -240,20 +232,18 @@ class admin_forums_forums_forums extends ipsCommand
 		}
 		
 		$this->registry->output->global_message = $this->lang->words['for_skinup'];
-		
-		$this->recacheForums();
-		
-		$this->forum_functions->forumsInit();
+
+		$this->registry->getClass('class_forums')->forumsInit();
 		
 		/* Bounce */		
-		$this->request['f'] = $this->forum_functions->forum_by_id[ $this->request['f'] ]['parent_id'];
+		$this->request['f'] = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]['parent_id'];
 		$this->showForums();
 	}
 	
 	/**
 	 * Show the form to edit rules
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function showRules()
 	{
@@ -279,16 +269,16 @@ class admin_forums_forums_forums extends ipsCommand
 		
 		$forum = $this->DB->fetch();
 		
-    	//-----------------------------------------
-        // Load and config the std/rte editors
-        //-----------------------------------------
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
+		
+		$_editor->setContent( $forum['rules_text'], 'rules' );
+		$_editor->setAllowHtml( 1 );
+		$_editor->setAllowSmilies( 1 );
+		
+		$forum['_editor']	= $_editor->show( 'body', array( 'height' => 350 ) );
 
-		IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies	= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_html		= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'rules';
-        
         /* Form Fields */
         $forum['_show_rules'] = $this->registry->output->formDropdown( "show_rules", array( 
 																							array( '0' , $this->lang->words['for_rulesdont'] ),
@@ -297,28 +287,18 @@ class admin_forums_forums_forums extends ipsCommand
 																							), $forum['show_rules'] );
 																								
 		$forum['_title'] = $this->registry->output->formInput( "title", IPSText::stripslashes( str_replace( "'", '&#039;', $forum['rules_title'] ) ) );
-									     
-		if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-		{
-			$forum['rules_text'] = IPSText::getTextClass( 'bbcode' )->convertForRTE( $forum['rules_text'] );
-		}
-		else
-		{
-			$forum['rules_text'] = IPSText::getTextClass( 'bbcode' )->preEditParse( $forum['rules_text'] );
-		}
-		
-		$forum['_editor'] = IPSText::getTextClass( 'editor' )->showEditor( $forum['rules_text'], 'body' );
-		
+
 		$forum['rules_raw_html'] = $this->registry->output->formCheckbox( 'rules_raw_html', $forum['rules_raw_html'] );
 
 		/* Output */
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['frm_rulessetup'] );
 		$this->registry->output->html .= $this->html->forumRulesForm( $forum['id'], $forum );
 	}
 	
 	/**
 	 * Save the forum rules
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doRules()
 	{
@@ -332,19 +312,23 @@ class admin_forums_forums_forums extends ipsCommand
 		
 		if( ! $this->request['rules_raw_html'] )
 		{
-    		//-----------------------------------------
-        	// Load editor/bbcode
-        	//-----------------------------------------
-       
-        	$_POST[ 'body' ]                   = IPSText::getTextClass( 'editor' )->processRawPost( 'body' );
-        
-			IPSText::getTextClass( 'bbcode' )->bypass_badwords	= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_smilies	= 0;
-			IPSText::getTextClass( 'bbcode' )->parse_html		= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'rules';
-
-			$_POST[ 'body' ]        			= IPSText::getTextClass( 'bbcode' )->preDbParse( $_POST[ 'body' ] );	
+			/* Load editor stuff */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$_editor = new $classToLoad();
+		
+			/* About me editor */
+			$_editor->setAllowHtml( 1 );
+			$_editor->setAllowSmilies( 0 );
+			
+			$_POST['body'] 		= $_editor->process( $_POST['body'] );
+			
+			IPSText::getTextClass('bbcode')->parse_smilies		= 0;
+			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+			IPSText::getTextClass('bbcode')->parse_html			= 1;
+			IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
+			IPSText::getTextClass('bbcode')->parsing_section			= 'rules';
+			
+			$_POST['body']		= IPSText::getTextClass('bbcode')->preDbParse( $_POST['body'] );
 		}
 
 		$rules = array( 
@@ -355,15 +339,14 @@ class admin_forums_forums_forums extends ipsCommand
 					  );
 					  
 		$this->DB->update( 'forums', $rules, 'id='.$this->request['f'] );
-		
-		$this->recacheForums();
+
 		$this->registry->output->global_message = $this->lang->words['for_rulesup'];
 		
 		//-----------------------------------------
 		// Bounce back to parent...
 		//-----------------------------------------
 		
-		$this->request['f'] = $this->forum_functions->forum_by_id[ $this->request['f'] ]['parent_id'];
+		$this->request['f'] = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]['parent_id'];
 		$this->showForums();
 	}
 	
@@ -371,25 +354,25 @@ class admin_forums_forums_forums extends ipsCommand
 	 * Recount the forum
 	 *
 	 * @param	integer		[optional] Forum id
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function recount($f_override="")
 	{
-		if ($f_override != "")
+		//-----------------------------------------
+		// Remap
+		//-----------------------------------------
+		
+		if( $f_override )
 		{
-			// Internal call, remap
-			
-			ipsRegistry::$request[ 'f'] =  $f_override ;
+			ipsRegistry::$request['f'] = $f_override;
 		}
 		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
-		$modfunc = new $classToLoad( $this->registry );
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+		$modfunc		= new $classToLoad( $this->registry );
 		
 		$modfunc->forumRecount($this->request['f']);
 
-		$this->recacheForums();
-		
-		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['for_recountedlog'], $this->forum_functions->forum_by_id[$this->request['f']]['name'] ) );
+		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['for_recountedlog'], $this->registry->getClass('class_forums')->forum_by_id[$this->request['f']]['name'] ) );
 		
 		$this->registry->output->global_message = $this->lang->words['for_resynched'];
 		
@@ -397,14 +380,14 @@ class admin_forums_forums_forums extends ipsCommand
 		// Bounce back to parent...
 		//-----------------------------------------
 		
-		ipsRegistry::$request[ 'f'] =  $this->forum_functions->forum_by_id[ $this->request['f'] ]['parent_id'] ;
+		ipsRegistry::$request['f'] = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]['parent_id'] ;
 		$this->showForums();
 	}
 	
 	/**
 	 * Show the form to empty a forum
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function emptyForum()
 	{
@@ -412,39 +395,37 @@ class admin_forums_forums_forums extends ipsCommand
 		$this->request['f'] = intval( $this->request['f'] );
 		$form_array         = array();
 		
-		if( $this->request['f'] == "" )
+		if( !$this->request['f'] )
 		{
 			$this->registry->output->showError( $this->lang->words['for_noid'], 1137 );
 		}
 		
-		$this->DB->build( array( 'select' => 'id, name', 'from' => 'forums', 'where' => "id=".$this->request['f'] ) );
-		$this->DB->execute();
+		$forum	= $this->DB->buildAndFetch( array( 'select' => 'id, name', 'from' => 'forums', 'where' => "id=" . $this->request['f'] ) );
 		
 		//-----------------------------------------
 		// Make sure we have a legal forum
 		//-----------------------------------------
 		
-		if ( !$this->DB->getTotalRows() )
+		if ( !$forum['id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['for_noid'], 1138 );
 		}
-		
-		$forum = $this->DB->fetch();
-				
+
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->forumEmptyForum( $this->request['f'], $forum );		
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['frm_emptytitle'] );
+		$this->registry->output->html .= $this->html->forumEmptyForum( $forum );		
 	}
 	
 	/**
 	 * Empty a forum
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doEmpty()
 	{
 		/* INI */
-		$this->request['f'] = intval( $this->request['f'] );
+		$this->request['f']	= intval( $this->request['f'] );
 		$soFar				= intval($this->request['sofar']);
 		$thisCycle			= 0;
 				
@@ -452,10 +433,10 @@ class admin_forums_forums_forums extends ipsCommand
 		// Get module
 		//-----------------------------------------
 		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
-		$modfunc = new $classToLoad( $this->registry );
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+		$modfunc		= new $classToLoad( $this->registry );
 		
-		if( $this->request['f'] == "" )
+		if( !$this->request['f'] )
 		{
 			$this->registry->output->showError( $this->lang->words['for_noid_source'], 1139 );
 		}
@@ -480,7 +461,7 @@ class admin_forums_forums_forums extends ipsCommand
 		
 		while( $t = $this->DB->fetch($outer) )
 		{
-			$modfunc->topicDelete( $t['tid'] );
+			$modfunc->topicDeleteFromDB( $t['tid'] );
 			$thisCycle++;
 		}
 		
@@ -491,12 +472,12 @@ class admin_forums_forums_forums extends ipsCommand
 		if( !$thisCycle )
 		{
 			$modfunc->forumRecount( $this->request['f'] );
-			$modfunc->statsRecount();
-			$this->recacheForums();
-		
+			
+			$this->cache->rebuildCache( 'stats', 'global' );
+
 			$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['for_emptiedlog'], $forum['name'] ) );
 		
-			$this->request['f'] = $this->forum_functions->forum_by_id[ $this->request['f'] ]['parent_id'];
+			$this->request['f'] = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]['parent_id'];
 
 			$this->registry->output->global_message   = $this->lang->words['for_emptied'];
 			$this->showForums();
@@ -504,14 +485,14 @@ class admin_forums_forums_forums extends ipsCommand
 		else
 		{
 			$soFar	= $soFar + $thisCycle;
-			$this->registry->output->redirect( $this->settings['base_url'] . $this->html->form_code . "&do=doempty&f={$this->request['f']}&sofar={$soFar}", sprintf( $this->lang->words['emptyforum_sofarcycle'], $soFar ), 1 );
+			$this->registry->output->html           .= $this->registry->output->global_template->temporaryRedirect( $this->settings['base_url'] . $this->html->form_code . "&do=doempty&f={$this->request['f']}&sofar={$soFar}", sprintf( $this->lang->words['emptyforum_sofarcycle'], $soFar ) );
 		}
 	}
 	
 	/**
 	 * Show the form to delete a form
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function deleteForm()
 	{
@@ -547,7 +528,7 @@ class admin_forums_forums_forums extends ipsCommand
 			}
 		}
 		
-		$form_array = $this->forum_functions->adForumsForumList( 1 );
+		$form_array = $this->registry->getClass('class_forums')->adForumsForumList( 1 );
 		
 		//-----------------------------------------
 		// Count the number of topics
@@ -566,13 +547,14 @@ class admin_forums_forums_forums extends ipsCommand
 		}
 
 		/* Output */
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['frm_deletebutton'] );
 		$this->registry->output->html .= $this->html->forumDeleteForm( $this->request['f'], $name, $move, $is_cat );
 	}
 	
 	/**
 	 * Delete a forum
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doDelete()
 	{
@@ -716,20 +698,16 @@ class admin_forums_forums_forums extends ipsCommand
 		// Delete forum subscriptions
 		//-----------------------------------------
 		
-		$this->DB->delete( 'forum_tracker', "forum_id=".$this->request['f'] );
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'forums' );
+		$_like->remove( $this->request['f'] );
 		
 		//-----------------------------------------
 		// Update children
 		//-----------------------------------------
 		
 		$this->DB->update( 'forums', array( 'parent_id' => $this->request['new_parent_id'] ), "parent_id=" . $this->request['f'] );
-		
-		//-----------------------------------------
-		// Rebuild forum cache
-		//-----------------------------------------
-		
-		$this->recacheForums();
-		
+
 		//-----------------------------------------
 		// Rebuild moderator cache
 		//-----------------------------------------
@@ -740,8 +718,9 @@ class admin_forums_forums_forums extends ipsCommand
 		$moderator->rebuildModeratorCache();
 		
 		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['for_removedlog'], $forum['name'] ) );
-		
-		$this->registry->output->doneScreen($this->lang->words['for_removed'], $this->lang->words['for_control'], $this->form_code, 'redirect' );
+
+		$this->registry->output->global_message	= $this->lang->words['for_removed'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 
 	/**
@@ -749,7 +728,7 @@ class admin_forums_forums_forums extends ipsCommand
 	 *
 	 * @param	string		[new|edit]
 	 * @param	boolean		Whether to change forum to category/back
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function forumForm( $type='edit', $changetype=0 )
 	{
@@ -833,31 +812,19 @@ class admin_forums_forums_forums extends ipsCommand
 			// Do not show forum in forum list
 			//-----------------------------------------
 			
-			$this->forum_functions->exclude_from_list = $forum_id;
+			$this->registry->getClass('class_forums')->exclude_from_list = $forum_id;
 			
 			//-----------------------------------------
 			// Get this forum
 			//-----------------------------------------
 			
-			$forum = $this->DB->buildAndFetch( array( 
-															'select'   => 'f.*',
-															'from'     => array( 'forums' => 'f' ),
-															'where'    => 'f.id='.$this->request['f'],
-															'add_join' => array(																	
-																				array(
-																						'select' => 'p.*',
-																						'from'   => array( 'permission_index' => 'p' ),
-																						'where'  => "p.perm_type_id=f.id AND p.app='forums' AND p.perm_type='forum'",
-																						'type'   => 'left',
-																					)
-																			),
-													)	);
+			$forum = $this->registry->class_forums->getForumById( $forum_id );
 			
 			//-----------------------------------------
 			// Check
 			//-----------------------------------------
 			
-			if ($forum['id'] == "")
+			if( !$forum['id'] )
 			{
 				$this->registry->output->showError( $this->lang->words['for_noid'], 11315 );
 			}
@@ -872,6 +839,7 @@ class admin_forums_forums_forums extends ipsCommand
 			{
 				$addnew_type = $addnew_type == 'category' ? 'forum' : 'category';
 			}
+			
 			if( $addnew_type == 'category' )
 			{
 				$title  		= sprintf( $this->lang->words['for_editcat'], $forum['name'] );
@@ -884,14 +852,6 @@ class admin_forums_forums_forums extends ipsCommand
 				$button 		= $this->lang->words['for_editfor_button'];
 				$code   		= "doedit";
 			}
-			if( $addnew_type == 'category' )
-			{
-				$convert	= "<input type='submit' class='realbutton' onclick='ACPForums.convert()' value='{$this->lang->words['for_changefor']}' />";
-			}
-			else
-			{
-				$convert	= "<input type='submit' class='realbutton' onclick='ACPForums.convert()' value='{$this->lang->words['for_changecat']}' />";
-			}
 		}
 		
 		//-----------------------------------------
@@ -907,6 +867,7 @@ class admin_forums_forums_forums extends ipsCommand
 			{
 				$addnew_type = $addnew_type == 'category' ? 'forum' : 'category';
 			}
+
 			if( $addnew_type == 'category' )
 			{
 				$forum = array(
@@ -914,7 +875,6 @@ class admin_forums_forums_forums extends ipsCommand
 								'name'						=> $f_name ? $f_name : $this->lang->words['for_newcat'],
 								'parent_id'					=> $parentid,
 								'use_ibc'					=> 1,
-								'quick_reply'				=> 1,
 								'allow_poll'				=> 1,
 								'prune'						=> 100,
 								'topicfilter'				=> 'all',
@@ -922,7 +882,6 @@ class admin_forums_forums_forums extends ipsCommand
 								'sort_order'				=> 'Z-A',
 								'inc_postcount'				=> 1,
 								'description'				=> '',
-								'status'					=> 0,
 								'redirect_url'				=> '',
 								'password'					=> '',
 								'password_override'			=> '',
@@ -939,9 +898,9 @@ class admin_forums_forums_forums extends ipsCommand
 								
 							  );
 							  
-				$title       = $this->lang->words['for_addcat'];
-				$button      = $this->lang->words['for_addcat'];
-				$code        = "donew";
+				$title	= $this->lang->words['for_addcat'];
+				$button	= $this->lang->words['for_addcat'];
+				$code	= "donew";
 			}
 			else
 			{
@@ -950,7 +909,6 @@ class admin_forums_forums_forums extends ipsCommand
 								'name'						=> $f_name ? $f_name : $this->lang->words['for_newfor'],
 								'parent_id'					=> $parentid,
 								'use_ibc'					=> 1,
-								'quick_reply'				=> 1,
 								'allow_poll'				=> 1,
 								'prune'						=> 100,
 								'topicfilter'				=> 'all',
@@ -958,7 +916,6 @@ class admin_forums_forums_forums extends ipsCommand
 								'sort_order'				=> 'Z-A',
 								'inc_postcount'				=> 1,
 								'description'				=> '',
-								'status'					=> 1,
 								'redirect_url'				=> '',
 								'password'					=> '',
 								'password_override'			=> '',
@@ -980,21 +937,13 @@ class admin_forums_forums_forums extends ipsCommand
 				$button      = $this->lang->words['for_addfor'];
 				$code        = "donew";
 			}
-			if( $addnew_type == 'category' )
-			{
-				$convert	= "<input type='submit' class='realbutton' onclick='ACPForums.convert()' value='{$this->lang->words['for_changefor']}' />";
-			}
-			else
-			{
-				$convert	= "<input type='submit' class='realbutton' onclick='ACPForums.convert()' value='{$this->lang->words['for_changecat']}' />";
-			}
 		}
 
 		//-----------------------------------------
 		// Build forumlist
 		//-----------------------------------------
 		
-		$forumlist = $this->forum_functions->adForumsForumList();
+		$forumlist = $this->registry->getClass('class_forums')->adForumsForumList();
 		
 		//-----------------------------------------
 		// Build group list
@@ -1006,66 +955,61 @@ class admin_forums_forums_forums extends ipsCommand
 		{
 			$mem_group[] = array( $g_id , $group['g_title'] );
 		}		
-		
-		//-----------------------------------------
-		// Page title...
-		//-----------------------------------------
-		
-		//$this->registry->output->html_help_title = $title;
-		
+			
 		//-----------------------------------------
 		// Generate form items
 		//-----------------------------------------
 		
 		# Main settings
-		$form['name']         = $this->registry->output->formInput(   'name'        , IPSText::parseCleanValue( ( isset( $_POST['name'] ) AND $_POST['name'] ) ? $_POST['name'] : $forum['name'] ) );
-		$form['description']  = $this->registry->output->formTextarea("description" , IPSText::br2nl( ( isset( $_POST['description']) AND $_POST['description'] ) ? $_POST['description'] : $forum['description'] ) );
-		$form['parent_id']    = $this->registry->output->formDropdown("parent_id"   , $forumlist, ( isset($_POST['parent_id'] ) AND $_POST['parent_id'] ) 	? $_POST['parent_id']    : $forum['parent_id'] );
-		$form['status']       = $this->registry->output->formDropdown("status"      , $dd_state , ( isset($_POST['status'] ) AND $_POST['status'] )    	? $_POST['status']       : $forum['status'] );
-		$form['sub_can_post'] = $this->registry->output->formYesNo(  'sub_can_post', ( isset($_POST['sub_can_post']) AND $_POST['sub_can_post'] )         ? $_POST['sub_can_post'] : ( $forum['sub_can_post'] == 1 ? 0 : 1 ) );
+		$form['name']         = $this->registry->output->formInput(   'name'        , IPSText::parseCleanValue( !empty( $_POST['name'] ) ? $_POST['name'] : $forum['name'] ) );
+		$form['description']  = $this->registry->output->formTextarea("description" , IPSText::br2nl( !empty( $_POST['description']) ? $_POST['description'] : $forum['description'] ) );
+		$form['parent_id']    = $this->registry->output->formDropdown("parent_id"   , $forumlist, !empty($_POST['parent_id'] ) ? $_POST['parent_id']    : $forum['parent_id'] );
+		$form['sub_can_post'] = $this->registry->output->formYesNo(  'sub_can_post', !empty($_POST['sub_can_post']) ? $_POST['sub_can_post'] : ( $forum['sub_can_post'] == 1 ? 0 : 1 ) );
 		
 		# Redirect options
-		$form['redirect_url']  = $this->registry->output->formInput( 'redirect_url' , ( isset($_POST['redirect_url']) 	AND $_POST['redirect_url'] )  ? $_POST['redirect_url']  : $forum['redirect_url']  );
-		$form['redirect_on']   = $this->registry->output->formYesNo('redirect_on'  , ( isset($_POST['redirect_on']) 	AND $_POST['redirect_on'] )   ? $_POST['redirect_on']   : $forum['redirect_on']   );
-		$form['redirect_hits'] = $this->registry->output->formInput( 'redirect_hits', ( isset($_POST['redirect_hits']) AND $_POST['redirect_hits'] ) ? $_POST['redirect_hits'] : $forum['redirect_hits'] );
+		$form['redirect_url']  = $this->registry->output->formInput( 'redirect_url' , !empty($_POST['redirect_url']) ? $_POST['redirect_url']  : $forum['redirect_url']  );
+		$form['redirect_on']   = $this->registry->output->formYesNo('redirect_on'  , !empty($_POST['redirect_on']) ? $_POST['redirect_on']   : $forum['redirect_on']   );
+		$form['redirect_hits'] = $this->registry->output->formInput( 'redirect_hits', !empty($_POST['redirect_hits']) ? $_POST['redirect_hits'] : $forum['redirect_hits'] );
 		
 		# Permission settings
-		$form['permission_showtopic']    = $this->registry->output->formYesNo(  'permission_showtopic'   , ( isset($_POST['permission_showtopic']) AND $_POST['permission_showtopic'] ) ? $_POST['permission_showtopic'] : $forum['permission_showtopic'] );
-		$form['permission_custom_error'] = $this->registry->output->formTextarea("permission_custom_error", IPSText::br2nl( ( isset($_POST['permission_custom_error']) AND $_POST['permission_custom_error'] ) ? $_POST['permission_custom_error'] : $forum['permission_custom_error'] ) );
+		$form['permission_showtopic']    = $this->registry->output->formYesNo(  'permission_showtopic'   , !empty($_POST['permission_showtopic']) ? $_POST['permission_showtopic'] : $forum['permission_showtopic'] );
+		$form['permission_custom_error'] = $this->registry->output->formTextarea("permission_custom_error", IPSText::br2nl( !empty($_POST['permission_custom_error']) ? $_POST['permission_custom_error'] : $forum['permission_custom_error'] ) );
 		
 		# Forum settings
-		$form['use_html']           = $this->registry->output->formYesNo('use_html'          , ( isset($_POST['use_html']) 			AND $_POST['use_html'] )           	? $_POST['use_html']            : $forum['use_html'] );
-		$form['use_ibc']            = $this->registry->output->formYesNo('use_ibc'           , ( isset($_POST['use_ibc']) 			AND $_POST['use_ibc'] )            	? $_POST['use_ibc']             : $forum['use_ibc']  );
-		$form['quick_reply']        = $this->registry->output->formYesNo('quick_reply'       , ( isset($_POST['quick_reply']) 		AND $_POST['quick_reply'] )         ? $_POST['quick_reply']         : $forum['quick_reply']  );
-		$form['allow_poll']         = $this->registry->output->formYesNo('allow_poll'        , ( isset($_POST['allow_poll']) 			AND $_POST['allow_poll'] )          ? $_POST['allow_poll']          : $forum['allow_poll']  );
-		$form['allow_pollbump']     = $this->registry->output->formYesNo('allow_pollbump'    , ( isset($_POST['allow_pollbump']) 		AND $_POST['allow_pollbump'] )      ? $_POST['allow_pollbump']      : $forum['allow_pollbump']  );
-		$form['inc_postcount']      = $this->registry->output->formYesNo('inc_postcount'     , ( isset($_POST['inc_postcount']) 		AND $_POST['inc_postcount'] )       ? $_POST['inc_postcount']       : $forum['inc_postcount']  );
-		$form['forum_allow_rating'] = $this->registry->output->formYesNo('forum_allow_rating', ( isset($_POST['forum_allow_rating']) 	AND $_POST['forum_allow_rating'] )  ? $_POST['forum_allow_rating']  : $forum['forum_allow_rating']  );
-		$form['min_posts_post']		= $this->registry->output->formInput('min_posts_post'     , ( isset($_POST['min_posts_post'])      AND $_POST['min_posts_post'] )      ? $_POST['min_posts_post']      : $forum['min_posts_post']  );
-		$form['min_posts_view']		= $this->registry->output->formInput('min_posts_view'     , ( isset($_POST['min_posts_view'])      AND $_POST['min_posts_view'] )      ? $_POST['min_posts_view']      : $forum['min_posts_view']  );
-		$form['can_view_others']	= $this->registry->output->formYesNo('can_view_others'   , ( isset($_POST['can_view_others'])     AND $_POST['can_view_others'] )     ? $_POST['can_view_others']     : $forum['can_view_others']  );
-		$form['hide_last_info']		= $this->registry->output->formYesNo('hide_last_info'   , ( isset($_POST['hide_last_info'])     AND $_POST['hide_last_info'] )     ? $_POST['hide_last_info']     : $forum['hide_last_info']  );
-		$form['disable_sharelinks'] = $this->registry->output->formYesNo('disable_sharelinks'   , ( isset($_POST['disable_sharelinks'])     AND $_POST['disable_sharelinks'] )     ? $_POST['disable_sharelinks']     : $forum['disable_sharelinks']  );
+		$form['use_html']           = $this->registry->output->formYesNo('use_html'          , !empty($_POST['use_html']) ? $_POST['use_html']            : $forum['use_html'] );
+		$form['use_ibc']            = $this->registry->output->formYesNo('use_ibc'           , !empty($_POST['use_ibc']) ? $_POST['use_ibc']             : $forum['use_ibc']  );
+		$form['allow_poll']         = $this->registry->output->formYesNo('allow_poll'        , !empty($_POST['allow_poll']) ? $_POST['allow_poll']          : $forum['allow_poll']  );
+		$form['allow_pollbump']     = $this->registry->output->formYesNo('allow_pollbump'    , !empty($_POST['allow_pollbump']) ? $_POST['allow_pollbump']      : $forum['allow_pollbump']  );
+		$form['inc_postcount']      = $this->registry->output->formYesNo('inc_postcount'     , !empty($_POST['inc_postcount']) ? $_POST['inc_postcount']       : $forum['inc_postcount']  );
+		$form['forum_allow_rating'] = $this->registry->output->formYesNo('forum_allow_rating', !empty($_POST['forum_allow_rating']) ? $_POST['forum_allow_rating']  : $forum['forum_allow_rating']  );
+		$form['min_posts_post']		= $this->registry->output->formInput('min_posts_post'     , !empty($_POST['min_posts_post']) ? $_POST['min_posts_post']      : $forum['min_posts_post']  );
+		$form['min_posts_view']		= $this->registry->output->formInput('min_posts_view'     , !empty($_POST['min_posts_view']) ? $_POST['min_posts_view']      : $forum['min_posts_view']  );
+		$form['can_view_others']	= $this->registry->output->formYesNo('can_view_others'   , !empty($_POST['can_view_others']) ? $_POST['can_view_others']     : $forum['can_view_others']  );
+		$form['hide_last_info']		= $this->registry->output->formYesNo('hide_last_info'   , !empty($_POST['hide_last_info']) ? $_POST['hide_last_info']     : $forum['hide_last_info']  );
+		$form['disable_sharelinks'] = $this->registry->output->formYesNo('disable_sharelinks'   , !empty($_POST['disable_sharelinks']) ? $_POST['disable_sharelinks']     : $forum['disable_sharelinks']  );
 
 		# Mod settings
-		$form['preview_posts']      = $this->registry->output->formDropdown(		"preview_posts"    		, $dd_moderate, ( isset($_POST['preview_posts']) AND $_POST['preview_posts'] ) ? $_POST['preview_posts'] 	: $forum['preview_posts'] );
-		$form['notify_modq_emails'] = $this->registry->output->formInput(  		'notify_modq_emails'	, ( isset($_POST['notify_modq_emails']) AND $_POST['notify_modq_emails'] ) ? $_POST['notify_modq_emails'] 	: $forum['notify_modq_emails'] );
-		$form['password']           = $this->registry->output->formInput(  		'password'          	, ( isset($_POST['password']) 			AND $_POST['password'] )           ? $_POST['password']           	: $forum['password'] );
-		$form['password_override']  = $this->registry->output->formMultiDropdown(  	'password_override[]'	, $mem_group, ( isset($_POST['password_override']) AND $_POST['password_override'] ) ? $_POST['password_override'] : explode( ",", $forum['password_override'] ) );
+		$form['preview_posts']      = $this->registry->output->formDropdown(		"preview_posts"    		, $dd_moderate, !empty($_POST['preview_posts']) ? $_POST['preview_posts'] 	: $forum['preview_posts'] );
+		$form['notify_modq_emails'] = $this->registry->output->formInput(  		'notify_modq_emails'	, !empty($_POST['notify_modq_emails']) ? $_POST['notify_modq_emails'] 	: $forum['notify_modq_emails'] );
+		$form['password']           = $this->registry->output->formInput(  		'password'          	, !empty($_POST['password']) ? $_POST['password']           	: $forum['password'] );
+		$form['password_override']  = $this->registry->output->formMultiDropdown(  	'password_override[]'	, $mem_group, !empty($_POST['password_override']) ? $_POST['password_override'] : explode( ",", $forum['password_override'] ) );
 		
 		# Sorting settings
-		$form['prune']      		= $this->registry->output->formDropdown("prune"     , $dd_prune, ( isset($_POST['prune']) 			AND $_POST['prune'] )		? $_POST['prune']		: $forum['prune'] );
-		$form['sort_key']   		= $this->registry->output->formDropdown("sort_key"  , $dd_order, ( isset($_POST['sort_key']) 		AND $_POST['sort_key'] )	? $_POST['sort_key']	: $forum['sort_key'] );
-		$form['sort_order'] 		= $this->registry->output->formDropdown("sort_order", $dd_by   , ( isset($_POST['sort_order']) 	AND $_POST['sort_order'] )	? $_POST['sort_order'] 	: $forum['sort_order'] );
-		$form['topicfilter'] 		= $this->registry->output->formDropdown("topicfilter", $dd_filter, ( isset($_POST['topicfilter']) 	AND $_POST['topicfilter'] ) ? $_POST['topicfilter'] : $forum['topicfilter'] );
+		$form['prune']      		= $this->registry->output->formDropdown("prune"     , $dd_prune, !empty($_POST['prune']) ? $_POST['prune']		: $forum['prune'] );
+		$form['sort_key']   		= $this->registry->output->formDropdown("sort_key"  , $dd_order, !empty($_POST['sort_key']) ? $_POST['sort_key']	: $forum['sort_key'] );
+		$form['sort_order'] 		= $this->registry->output->formDropdown("sort_order", $dd_by   , !empty($_POST['sort_order']) ? $_POST['sort_order'] 	: $forum['sort_order'] );
+		$form['topicfilter'] 		= $this->registry->output->formDropdown("topicfilter", $dd_filter, !empty($_POST['topicfilter']) ? $_POST['topicfilter'] : $forum['topicfilter'] );
+		
+		$form['bw_disable_tagging']  = $this->registry->output->formYesNo("bw_disable_tagging", !empty($_POST['bw_disable_tagging']) ? $_POST['bw_disable_tagging'] : $forum['bw_disable_tagging'] );
+		$form['bw_disable_prefixes'] = $this->registry->output->formYesNo("bw_disable_prefixes", !empty($_POST['bw_disable_prefixes']) ? $_POST['bw_disable_prefixes'] : $forum['bw_disable_prefixes'] );
+		$form['tag_predefined']      = $this->registry->output->formTextarea("tag_predefined", IPSText::br2nl( !empty($_POST['tag_predefined']) ? $_POST['tag_predefined'] : $forum['tag_predefined'] ) );
+		
 		
 		# Trim the form for categories...
 		$form['addnew_type']			= $addnew_type;
 		$this->request['type']          = $addnew_type;
 		$form['addnew_type_upper']		= ucwords($addnew_type);
-		
-		$form['convert_button'] 		=& $convert;
-		
+
 		//-----------------------------------------
 		// Show permission matrix
 		//-----------------------------------------
@@ -1093,14 +1037,9 @@ class admin_forums_forums_forums extends ipsCommand
 		$tabsUsed	= 2;
 		$firsttab   = false;
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
-			{
-				continue;
-			}
-			
-			if ( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/forum_form.php' ) )
+			if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/forum_form.php' ) )
 			{
 				$_class = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/forum_form.php', 'admin_forum_form__'.$app_dir, $app_dir );
 				
@@ -1126,21 +1065,15 @@ class admin_forums_forums_forums extends ipsCommand
 		// Show form...
 		//-----------------------------------------
 		
+		$this->registry->output->extra_nav[]	= array( '', $title );
 		$this->registry->output->html .= $this->html->forumForm( $form, $button, $code, $title, $forum, $perm_matrix );
-		
-		//-----------------------------------------
-		// Nav and print
-		//-----------------------------------------
-		
-		//ipsRegistry::getClass('adminOuput')->nav[] = array( $this->form_code, 'Manage Forums' );
-		//ipsRegistry::getClass('adminOuput')->nav[] = array( '', 'Add/Edit '.ucwords($addnew_type) );
 	}
 	
 	/**
 	 * Save the forum
 	 *
 	 * @param	string		[new|edit]
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function forumSave($type='new')
 	{
@@ -1158,10 +1091,10 @@ class admin_forums_forums_forums extends ipsCommand
 		// INIT
 		//-----------------------------------------
 		
-		$this->request['name'] = trim( $this->request['name'] );
-		$this->request['f'] = intval( $this->request['f'] );
-		
-		$forum_cat_lang = intval( $this->request['parent_id'] ) == -1 ? $this->lang->words['for_iscat_y'] : $this->lang->words['for_iscat_n'];
+		$this->request['name']		= trim( $this->request['name'] );
+		$this->request['f']			= intval( $this->request['f'] );
+		$this->request['parent_id']	= !empty($this->request['parent_id']) ? intval($this->request['parent_id']) : -1;
+		$forum_cat_lang				= intval( $this->request['parent_id'] ) == -1 ? $this->lang->words['for_iscat_y'] : $this->lang->words['for_iscat_n'];
 		
 		//-----------------------------------------
 		// Auth check...
@@ -1187,9 +1120,9 @@ class admin_forums_forums_forums extends ipsCommand
 		// spot?
 		//-----------------------------------------
 		
-		if( $this->request['parent_id'] != $this->forum_functions->forum_by_id[ $this->request['f'] ]['parent_id'] )
+		if( $this->request['parent_id'] != $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]['parent_id'] )
 		{
-			$ids   = $this->forum_functions->forumsGetChildren( $this->request['f'] );
+			$ids   = $this->registry->getClass('class_forums')->forumsGetChildren( $this->request['f'] );
 			$ids[] = $this->request['f'];
 			
 			if ( in_array( $this->request['parent_id'], $ids ) )
@@ -1200,56 +1133,51 @@ class admin_forums_forums_forums extends ipsCommand
 			}
 		}
 		
-		if( $this->request['parent_id'] < 1 )
-		{
-			$this->request['sub_can_post'] = 1;
-		}
+		//if( $this->request['parent_id'] < 1 )
+		//{
+		//	$this->request['sub_can_post'] = 1;
+		//}
 				
 		//-----------------------------------------
 		// Save array
 		//-----------------------------------------
 
-		$save = array (  'name'                    => IPSText::getTextClass('bbcode')->xssHtmlClean( nl2br( IPSText::stripslashes( $_POST['name'] ) ) ),
-						 'name_seo'				   => IPSText::makeSeoTitle( $this->request['name'] ),
-						 'description'             => IPSText::getTextClass('bbcode')->xssHtmlClean( nl2br( IPSText::stripslashes( $_POST['description'] ) ) ),
-						 'use_ibc'                 => intval($this->request['use_ibc']),
-						 'use_html'                => intval($this->request['use_html']),
-						 'status'                  => intval($this->request['status']),
-						 'password'                => $this->request['password'],
-						 'password_override'	   => is_array($this->request['password_override']) ? implode( ",", $this->request['password_override'] ) : '',
-						 'sort_key'                => $this->request['sort_key'],
-						 'sort_order'              => $this->request['sort_order'],
-						 'prune'                   => intval($this->request['prune']),
-						 'topicfilter'             => $this->request['topicfilter'],
-						 'preview_posts'           => intval($this->request['preview_posts']),
-						 'allow_poll'              => intval($this->request['allow_poll']),
-						 'allow_pollbump'          => intval($this->request['allow_pollbump']),
-						 'forum_allow_rating'      => intval($this->request['forum_allow_rating']),
-						 'inc_postcount'           => intval($this->request['inc_postcount']),
-						 'parent_id'               => intval($this->request['parent_id']),
-						 'sub_can_post'            => ( intval($this->request['sub_can_post']) == 1 ? 0 : 1 ),
-						 'quick_reply'             => intval($this->request['quick_reply']),
-						 'redirect_on'             => intval($this->request['redirect_on']),
-						 'redirect_hits'           => intval($this->request['redirect_hits']),
-						 'redirect_url'            => $this->request['redirect_url'],
-						 'notify_modq_emails'      => $this->request['notify_modq_emails'],
-						 'permission_showtopic'    => intval($this->request['permission_showtopic']),
-						 'min_posts_post'          => intval( $this->request['min_posts_post'] ),
-						 'min_posts_view'          => intval( $this->request['min_posts_view'] ),
-						 'can_view_others'		   => intval( $this->request['can_view_others'] ),
-						 'hide_last_info'		   => intval( $this->request['hide_last_info'] ),
-						 'disable_sharelinks'	   => intval( $this->request['disable_sharelinks'] ),
-						 'permission_custom_error' => nl2br( IPSText::stripslashes($_POST['permission_custom_error']) ) );
-						
+		$save = array(	'name'						=> IPSText::getTextClass('bbcode')->xssHtmlClean( nl2br( IPSText::stripslashes( $_POST['name'] ) ) ),
+						'name_seo'					=> IPSText::makeSeoTitle( $this->request['name'] ),
+						'description'				=> IPSText::getTextClass('bbcode')->xssHtmlClean( nl2br( IPSText::stripslashes( $_POST['description'] ) ) ),
+						'use_ibc'					=> intval($this->request['use_ibc']),
+						'use_html'					=> intval($this->request['use_html']),
+						'password'					=> $this->request['password'],
+						'password_override'			=> is_array($this->request['password_override']) ? implode( ",", $this->request['password_override'] ) : '',
+						'sort_key'					=> $this->request['sort_key'],
+						'sort_order'				=> $this->request['sort_order'],
+						'prune'						=> intval($this->request['prune']),
+						'topicfilter'				=> $this->request['topicfilter'],
+						'preview_posts'				=> intval($this->request['preview_posts']),
+						'allow_poll'				=> intval($this->request['allow_poll']),
+						'allow_pollbump'			=> intval($this->request['allow_pollbump']),
+						'forum_allow_rating'		=> intval($this->request['forum_allow_rating']),
+						'inc_postcount'				=> intval($this->request['inc_postcount']),
+						'parent_id'					=> intval($this->request['parent_id']),
+						'sub_can_post'				=> intval($this->request['sub_can_post']),
+						'redirect_on'				=> intval($this->request['redirect_on']),
+						'redirect_hits'				=> intval($this->request['redirect_hits']),
+						'redirect_url'				=> $this->request['redirect_url'],
+						'notify_modq_emails'		=> $this->request['notify_modq_emails'],
+						'permission_showtopic'		=> $this->request['parent_id'] == -1 ? 1 : intval($this->request['permission_showtopic']),
+						'min_posts_post'			=> intval( $this->request['min_posts_post'] ),
+						'min_posts_view'			=> intval( $this->request['min_posts_view'] ),
+						'can_view_others'			=> intval( $this->request['can_view_others'] ),
+						'hide_last_info'			=> intval( $this->request['hide_last_info'] ),
+						'disable_sharelinks'		=> intval( $this->request['disable_sharelinks'] ),
+						'tag_predefined'			=> $this->request['tag_predefined'],
+					    'forums_bitoptions'			=> IPSBWOPtions::freeze( $this->request, 'forums', 'forums' ),
+						'permission_custom_error'	=> nl2br( IPSText::stripslashes($_POST['permission_custom_error']) ) );
+
 		/* Save data from application tabs */
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
-			{
-				continue;
-			}
-        
-			if ( file_exists( IPSLib::getAppDir( $app_dir  ) . '/extensions/admin/forum_form.php' ) )
+			if ( is_file( IPSLib::getAppDir( $app_dir  ) . '/extensions/admin/forum_form.php' ) )
 			{
 				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/forum_form.php', 'admin_forum_form__'.$app_dir, $app_dir );
 				$_object = new $_class( $this->registry );
@@ -1309,10 +1237,10 @@ class admin_forums_forums_forums extends ipsCommand
 			 {
 				$save['can_view_others'] = 1;
 				
-				/* Permissions */
-				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_public_permissions.php', 'classPublicPermissions' );
-				$permissions = new $classToLoad( ipsRegistry::instance() );
-				$permissions->savePermMatrix( $this->request['perms'], $this->request['f'], 'forum' );
+				///* Permissions */
+				//$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_public_permissions.php', 'classPublicPermissions' );
+				//$permissions = new $classToLoad( ipsRegistry::instance() );
+				//$permissions->savePermMatrix( $this->request['perms'], $this->request['f'], 'forum' );
 
 				if( ! $save['can_view_others'] )
 				{
@@ -1326,20 +1254,22 @@ class admin_forums_forums_forums extends ipsCommand
 
 			$this->DB->update( 'forums', $save, "id=" . $this->request['f'] );
 						
+			/* Tags */
+			$this->registry->getClass('class_forums')->forumsInit();
+			$this->registry->tags->updatePermssionsByParentId( $this->request['f'] );
+			
 			$this->registry->output->global_message = $forum_cat_lang.$this->lang->words['for__edited'];
 			
 			$this->registry->adminFunctions->saveAdminLog( $forum_cat_lang." '" . $this->request['name'] . "' " . mb_strtolower ( $this->lang->words['for__edited'] ) );
 		}
 		
-		$this->recacheForums();
-		
 		$this->request['f'] = '';
 		if( $save['parent_id'] > 0 )
 		{
 			$this->request['f'] = $save['parent_id'];
 		}
 		
-		$this->forum_functions->forumsInit();
+		$this->registry->getClass('class_forums')->forumsInit();
 		
 		$this->showForums();
 	}
@@ -1347,7 +1277,7 @@ class admin_forums_forums_forums extends ipsCommand
 	/**
 	 * Show the form to edit permissions
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function permEditForm()
 	{
@@ -1370,11 +1300,11 @@ class admin_forums_forums_forums extends ipsCommand
 		// Get this forum details
 		//-----------------------------------------
 		
-		$forum = $this->forum_functions->forum_by_id[ $this->request['f'] ];
+		$forum = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ];
 		
 		if( $this->request['copyForumPerms'] )
 		{
-			$forumToCopy	= $this->forum_functions->forum_by_id[ $this->request['copyForumPerms'] ];
+			$forumToCopy	= $this->registry->getClass('class_forums')->forum_by_id[ $this->request['copyForumPerms'] ];
 			
 			foreach( array( 'perm_view', 'perm_2', 'perm_3', 'perm_4', 'perm_5', 'perm_6' ) as $field )
 			{
@@ -1413,7 +1343,7 @@ class admin_forums_forums_forums extends ipsCommand
 			$perm_matrix = $permissions->adminPermMatrix( 'forum', $forum, 'forums', 'view' );			
 		}
 		
-		$forumCopyDropdown = $this->registry->output->formDropdown( 'copyForumPerms', $this->forum_functions->adForumsForumList() );
+		$forumCopyDropdown = $this->registry->output->formDropdown( 'copyForumPerms', $this->registry->getClass('class_forums')->adForumsForumList() );
 
 		$this->registry->output->html .= $this->html->forumPermissionForm( $forum, $relative, $perm_matrix, $forum, $forumCopyDropdown );
 	}
@@ -1422,7 +1352,7 @@ class admin_forums_forums_forums extends ipsCommand
 	 * Get the id of the next forum
 	 *
 	 * @param	integer		Last forum id
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function getNextId($fid)
 	{
@@ -1431,7 +1361,7 @@ class admin_forums_forums_forums extends ipsCommand
 		$index  = 0;
 		$count  = 0;
 		
-		foreach( $this->forum_functions->forum_cache['root'] as $forum_data )
+		foreach( $this->registry->getClass('class_forums')->forum_cache['root'] as $forum_data )
 		{
 			$ids[ $count ] = $forum_data['id'];
 			
@@ -1442,11 +1372,11 @@ class admin_forums_forums_forums extends ipsCommand
 			
 			$count++;
 			
-			if ( isset($this->forum_functions->forum_cache[ $forum_data['id'] ]) AND is_array( $this->forum_functions->forum_cache[ $forum_data['id'] ] ) )
+			if ( isset($this->registry->getClass('class_forums')->forum_cache[ $forum_data['id'] ]) AND is_array( $this->registry->getClass('class_forums')->forum_cache[ $forum_data['id'] ] ) )
 			{
-				foreach( $this->forum_functions->forum_cache[ $forum_data['id'] ] as $forum_data )
+				foreach( $this->registry->getClass('class_forums')->forum_cache[ $forum_data['id'] ] as $forum_data )
 				{
-					$children = $this->forum_functions->forumsGetChildren( $forum_data['id'] );
+					$children = $this->registry->getClass('class_forums')->forumsGetChildren( $forum_data['id'] );
 					
 					$ids[ $count ] = $forum_data['id'];
 			
@@ -1477,22 +1407,11 @@ class admin_forums_forums_forums extends ipsCommand
 	
 		return array( 'next' => $ids[ $index + 1 ], 'previous' => $ids[ $index - 1 ] );
 	}
-	
-	/**
-	 * Recache the forums
-	 *
-	 * @return	void
-	 * @deprecated	We're moving away from forum cache
-	 */	
-	public function recacheForums()
-	{
-		//$this->registry->class_forums->updateForumCache();		
-	}
 
 	/**
 	 * Save the permissions
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function permDoEdit()
 	{
@@ -1510,9 +1429,7 @@ class admin_forums_forums_forums extends ipsCommand
 		
 		/* Log */
 		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['for_permeditedin'], $this->request['name'] ) );
-		
-		$this->recacheForums();
-		
+
 		/* Previous Forum */
 		if ( $this->request['doprevious'] AND $this->request['doprevious'] and $this->request['previd'] > 0 )
 		{
@@ -1539,14 +1456,15 @@ class admin_forums_forums_forums extends ipsCommand
 		/* Done */
 		else
 		{
-			$this->registry->output->doneScreen( $this->lang->words['for_permedited2'], $this->lang->words['for_control'], $this->html->form_code, 'redirect' );
+			$this->registry->output->global_message	= $this->lang->words['for_permedited2'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 		}
 	}
 	
 	/**
 	 * Reorder the child forums
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function doReorder()
 	{
@@ -1582,8 +1500,6 @@ class admin_forums_forums_forums extends ipsCommand
  				$position++;
  			}
  		}
- 		
- 		$this->recacheForums();
 
  		$ajax->returnString( 'OK' );
  		exit();
@@ -1592,7 +1508,7 @@ class admin_forums_forums_forums extends ipsCommand
 	/**
 	 * List the forums
 	 *
-	 * @return	void		Outputs to screen
+	 * @return	@e void		Outputs to screen
 	 */	
 	public function showForums()
 	{
@@ -1601,88 +1517,45 @@ class admin_forums_forums_forums extends ipsCommand
 		//-----------------------------------------
 		
 		$this->request['f'] = intval( $this->request['f'] );
-		
-		//-----------------------------------------
-		// Nav
-		//-----------------------------------------
-		
-		if( $this->request['f'] )
-		{
-			$nav = $this->forum_functions->forumsBreadcrumbNav( $this->request['f'], '&'.$this->form_code.'&f=' );
 
-			if( is_array( $nav ) and count( $nav ) > 1 )
-			{
-				//array_shift( $nav );
-			}
-		}
-		
 		//-----------------------------------------
 		// Grab the moderators
 		//-----------------------------------------
 		
-		$this->forum_functions->moderators = array();
+		$this->registry->getClass('class_forums')->moderators	= array();
+		$this->registry->getClass('class_forums')->type			= 'manage';
 		
 		$this->DB->build( array( 
-										'select'  => 'm.*', 
-										'from' 	  => array( 'moderators' => 'm' ),
-										'add_join'=> array(
-															array( 
-																	'select' => 'mm.members_display_name',
-																	'from'	 => array( 'members' => 'mm' ),
-																	'where'	 => 'mm.member_id=m.member_id AND m.is_group=0',
-																	'type'	 => 'left'
-																)
-															)
-										) 		);
+								'select'	=> 'm.*', 
+								'from'		=> array( 'moderators' => 'm' ),
+								'add_join'	=> array(
+													array( 
+															'select' => 'mm.members_display_name',
+															'from'	 => array( 'members' => 'mm' ),
+															'where'	 => 'mm.member_id=m.member_id AND m.is_group=0',
+															'type'	 => 'left'
+														)
+													)
+								) 		);
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$this->forum_functions->moderators[] = $r;
+			$this->registry->getClass('class_forums')->moderators[] = $r;
 		}
 		
 		//-----------------------------------------
 		// Print screen
 		//-----------------------------------------
-		
-		$this->forum_functions->type = 'manage';
 
-		$this->registry->output->html .= $this->html->renderForumHeader( $nav );
-		
-		$this->forum_functions->forumsListForums();
-		
-		$choose = "<select name='roots' class='realbutton'>";
-		
-		if( is_array($this->forum_functions->forum_cache['root']) AND count($this->forum_functions->forum_cache['root']) )
-		{
-			foreach( $this->forum_functions->forum_cache['root'] as $fid => $fdata )
-			{
-				$choose .= "<option value='{$fid}'>{$fdata['name']}</option>\n";
-			}
-		}
-		
-		$choose .= "</select>";
-		
-		//-----------------------------------------
-		// Member groups
-		//-----------------------------------------
-		
-		$mem_group = "<select name='group'>";
-			
-		$this->DB->build( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'order' => "g_title" ) );
-		$this->DB->execute();
-	
-		while ( $r = $this->DB->fetch() )
-		{
-		 	$mem_group .= "<option value='{$r['g_id']}'>{$r['g_title']}</option>\n";
-		}
-		
-		$mem_group .= "</select>";
+		$this->registry->output->html .= $this->html->renderForumHeader();
 		
+		$this->registry->getClass('class_forums')->forumsListForums();
+
 		//-----------------------------------------
 		// Add footer
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->renderForumFooter( $choose, $mem_group );
+		$this->registry->output->html .= $this->html->renderForumFooter();
 	}	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/forums/index.html b/upload/admin/applications/forums/modules_admin/forums/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/forums/index.html
+++ b/upload/admin/applications/forums/modules_admin/forums/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/forums/moderator.php b/upload/admin/applications/forums/modules_admin/forums/moderator.php
index b838bbdd..ade291b2 100644
--- a/upload/admin/applications/forums/modules_admin/forums/moderator.php
+++ b/upload/admin/applications/forums/modules_admin/forums/moderator.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum moderator management
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 17th August 2004
- * @version		$Revision: 7003 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -43,7 +43,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	 * Main execution point
 	 *
 	 * @param 	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -108,7 +108,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	/**
 	 * Delete a moderator
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function delete()
 	{
@@ -183,7 +183,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	/**
 	 * Edit a moderator
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doEdit()
 	{
@@ -281,7 +281,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	/**
 	 * Add a moderator
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function addMod()
 	{
@@ -432,7 +432,7 @@ class admin_forums_forums_moderator extends ipsCommand
 		
 		$mr_has['forum_id'] = ',' . implode( ',', $forums ) . ',';
 
-		$this->DB->force_data_type = array( 'member_name' => 'string' );
+		$this->DB->setDataType( 'member_name', 'string' );
 		
 		$this->DB->insert( 'moderators', $mr_hash );
 		
@@ -447,7 +447,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	/**
 	 * Rebuild moderator cache
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function rebuildModeratorCache()
 	{
@@ -495,7 +495,7 @@ class admin_forums_forums_moderator extends ipsCommand
 	 * Show the add/edit form
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function modForm( $type='add' )
 	{
@@ -625,13 +625,14 @@ class admin_forums_forums_moderator extends ipsCommand
 
 
 		/* Output */
-		$this->registry->output->html .= $this->html->moderatorPermissionForm( $mod, $form_code, $mod['mid'], $member_id, $mod_type, $group['g_id'], $group['g_name'], $button );
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['mod_' . $type ] );
+		$this->registry->output->html	.= $this->html->moderatorPermissionForm( $mod, $form_code, $mod['mid'], $member_id, $mod_type, $group['g_id'], $group['g_name'], $button );
 	}
 
 	/**
 	 * Refine member search, if necessary
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function moderatorAddPreform()
 	{
@@ -692,10 +693,6 @@ class admin_forums_forums_moderator extends ipsCommand
 			$form_array[] = array( $r['member_id'] , $r['name'] );
 		}
 		
-		/* Page Header */
-		$this->registry->output->html_help_title = $this->lang->words['mod_add'];
-		$this->registry->output->html_help_msg = $this->lang->words['mod_add_info'];
-		
 		/* Output */
 		$this->registry->output->html .= $this->html->moderatorSelectForm( $this->request['fid'], $this->registry->output->formDropdown( "member_id", $form_array ) );
 	}
diff --git a/upload/admin/applications/forums/modules_admin/forums/multimods.php b/upload/admin/applications/forums/modules_admin/forums/multimods.php
index 00c031c2..6ebb5802 100644
--- a/upload/admin/applications/forums/modules_admin/forums/multimods.php
+++ b/upload/admin/applications/forums/modules_admin/forums/multimods.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Topic Multi-Moderation
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-08 18:01:45 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 7003 $
+ * @version		$Rev: 9470 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,13 +30,13 @@ class admin_forums_forums_multimods extends ipsCommand
 	 *
 	 * @var		object
 	 */
-	private $forumfunc;
+	protected $forumfunc;
 
 	/**
 	 * Main execution point
 	 *
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -55,7 +55,7 @@ class admin_forums_forums_multimods extends ipsCommand
 		$this->lang->loadLanguageFile( array( 'admin_forums' ) );
 		
 		/* Navigation */
-		$this->registry->output->nav[]			= array( $this->form_code, $this->lang->words['mm_nav'] );
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['mm_nav'] );
 		$this->registry->output->extra_title[]	= $this->lang->words['mm_nav'];
 		
 		switch( $this->request['do'] )
@@ -126,7 +126,7 @@ class admin_forums_forums_multimods extends ipsCommand
 	 * Saves the add/edit multi moderation form
 	 *
 	 * @param	string  $type  Either 'new' or 'edit'	 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function multiModerationSaveForm( $type='new' )
 	{
@@ -162,8 +162,8 @@ class admin_forums_forums_multimods extends ipsCommand
 						'topic_pin'	            => $this->request['topic_pin'],
 						'topic_move'            => intval( $this->request['topic_move'] ),
 						'topic_move_link'       => intval( $this->request['topic_move_link'] ),
-						'topic_title_st'        => IPSText::stripslashes( $_POST['topic_title_st'] ),
-						'topic_title_end'       => IPSText::stripslashes( $_POST['topic_title_end'] ),
+						'topic_title_st'        => $this->request['topic_title_st'],
+						'topic_title_end'       => $this->request['topic_title_end'],
 						'topic_reply'           => intval( $this->request['topic_reply'] ),
 						'topic_reply_content'   => IPSText::stripslashes( $_POST['topic_reply_content'] ),
 						'topic_reply_postcount' => intval( $this->request['topic_reply_postcount'] ),
@@ -202,7 +202,7 @@ class admin_forums_forums_multimods extends ipsCommand
 	 * Builds the add/edit multi moderation form
 	 *
 	 * @param	string  $type  Either 'new' or 'edit'
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function multiModerationForm( $type='new' )
 	{
@@ -287,7 +287,7 @@ class admin_forums_forums_multimods extends ipsCommand
 				$selected = "";
 			}
 			
-			if( isset( $i['redirect_on'] ) AND $i['redirect_on'] == 1 )
+			if( !empty( $i['redirect_on'] ) )
 			{
 				continue;
 			}
@@ -319,7 +319,7 @@ class admin_forums_forums_multimods extends ipsCommand
 	/**
 	 * Show all available multi mods
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function multiModerationOverview()
 	{
@@ -342,7 +342,7 @@ class admin_forums_forums_multimods extends ipsCommand
 	/**
 	 * Rebuilds the multi moderation cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function multiModerationRebuildCache()
 	{
@@ -372,7 +372,7 @@ class admin_forums_forums_multimods extends ipsCommand
 	 *
 	 * @return	string	Comma separated list of forum ids
 	 */ 
-    private function _getSelectedForums()
+    protected function _getSelectedForums()
     {
     	/* INI */
 		$forumids = array();
diff --git a/upload/admin/applications/forums/modules_admin/forums/permissions.php b/upload/admin/applications/forums/modules_admin/forums/permissions.php
deleted file mode 100644
index 239be988..00000000
--- a/upload/admin/applications/forums/modules_admin/forums/permissions.php
+++ /dev/null
@@ -1,671 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Forum Permission Masks
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		17th March 2002
- * @version		$Rev: 7003 $
- */
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class admin_forums_forums_permissions extends ipsCommand
-{
-	/**
-	 * Forum functions object
-	 *
-	 * @var		object
-	 */
-	private $forumfunc;
-	
-	/**
-	 * Main execution point
-	 *
-	 * @param	object	ipsRegistry reference
-	 * @return	void
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		/* Setup Forum Classes */
-		$this->registry->class_forums->forumsInit();
-		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/admin_forum_functions.php", 'admin_forum_functions', 'forums' );
-		$this->forumfunc = new $classToLoad( $registry );
-		$this->forumfunc->forumsInit();
-		
-		/* Load Skin and Lang */
-		$this->html = $this->registry->output->loadTemplate( 'cp_skin_permissions' );
-		$this->html->form_code    = 'module=forums&amp;section=permissions&amp;';
-		$this->html->form_code_js = 'module=forums&amp;section=permissions&amp;';
-		
-		$this->lang->loadLanguageFile( array( 'admin_forums' ) );
-		
-		/* Determine what todo */
-		switch( $this->request['do'] )
-		{
-			case 'fedit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_edit' );
-				$this->forumPermissions();
-			break;
-				
-			case 'pdelete':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_delete' );
-				$this->deleteMask();
-			break;
-				
-			case 'dofedit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_edit' );
-				$this->saveForumPermissions();
-			break;
-				
-			case 'permsplash':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_view' );
-				$this->permsplash();
-			break;		
-					
-			case 'preview_forums':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_view' );
-				$this->previewForumPermissions();
-			break;
-				
-			case 'dopermadd':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_add' );
-				$this->addNewPerm();
-			break;
-			
-			case 'donameedit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_edit' );
-				$this->editPermName();
-			break;			
-			
-			case 'splash':
-			default:
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_view' );
-				$this->permissionsSplash();
-			break;
-		}
-		
-		/* Output */
-		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
-		$this->registry->output->sendOutput();		
-	}
-	
-	/**
-	 * Shows the forum permission preview popup
-	 *
-	 * @return	void
-	 */
-	public function previewForumPermissions()
-	{
-		/* Check ID */
-		$perm_id = intval( $this->request['id'] );
-		if( ! $perm_id )
-		{
-			$this->registry->output->showError( $this->lang->words['per_setid'], 11342 );
-		}
-		
-		/* Query the set name */
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=" . $perm_id ) );
-		$this->DB->execute();
-		
-		if ( ! $perms = $this->DB->fetch() )
-		{
-			$this->registry->output->showError( $this->lang->words['per_setid'], 11343 );
-		}
-		
-		/* Type of permission to preview */
-		switch( $this->request['t'] )
-		{
-			case 'start':
-				$human_type = $this->lang->words['per_start'];
-				$code_word  = 'perm_4';
-				break;
-				
-			case 'reply':
-				$human_type = $this->lang->words['per_reply'];
-				$code_word  = 'perm_3';
-				break;
-			
-			case 'show':
-				$human_type = $this->lang->words['per_show'];
-				$code_word  = 'perm_view';
-				break;
-				
-			case 'upload':
-				$human_type = $this->lang->words['per_upload'];
-				$code_word  = 'perm_5';
-				break;
-				
-			case 'download':
-				$human_type = $this->lang->words['per_download'];
-				$code_word  = 'perm_6';
-				break;				
-				
-			default:
-				$human_type = $this->lang->words['per_read'];
-				$code_word  = 'perm_2';
-				break;
-		}
-		
-		/* Get forums */		
-		$theforums  = $this->forumfunc->adForumsForumList(1);
-		
-		/* Loop through forums */
-		$rows = array();
-		
-		foreach( $theforums as $v )
-		{
-			$id   = $v[0];
-			$name = $v[1];
-			
-			$this->registry->class_forums->forum_by_id[$id][ $code_word ] = isset( $this->registry->class_forums->forum_by_id[$id][ $code_word ] ) ? $this->registry->class_forums->forum_by_id[$id][ $code_word ] : '';
-			
-			if( $this->registry->class_forums->forum_by_id[$id][ $code_word ] == '*' )
-			{
-				$rows[] = array( 'css' => 'color:green', 'name' => $name );
-			}
-			else if (preg_match( "/(^|,)".$perm_id."(,|$)/", $this->registry->class_forums->forum_by_id[$id][ $code_word ]) )
-			{
-				$rows[] = array( 'css' => 'color:green;font-weight:bold', 'name' => $name );
-			}
-			else
-			{
-				if( $code_word != 'perm_view' AND $this->registry->class_forums->forum_by_id[$id]['parent_id'] == 'root' )
-				{
-					/* Categories */
-					$rows[] = array( 'css' => 'color:grey', 'name' => $name );
-				}
-				else
-				{
-					/* No Access */
-					$rows[] = array( 'css' => 'color:red;font-weight:bold', 'name' => $name );
-				}
-			}
-		}
-										 
-		$type_drop = $this->registry->output->formDropdown( 't', array( 
-																		array( 'start'   , $this->lang->words['per_start_m']          ),
-																		array( 'reply'   , $this->lang->words['per_reply_m']    		  ),
-																		array( 'read'    , $this->lang->words['per_read_m']        	  ),
-																		array( 'show'    , $this->lang->words['per_show_m']           ),
-																		array( 'upload'  , $this->lang->words['per_upload_m']     		),
-																		array( 'download', $this->lang->words['per_download_m']			  ),
-																	), $this->request['t'] );
-		
-		/* Output */
-		$this->registry->output->html .= $this->html->previewForumPermissions( $id, $perms['perm_name'], $type_drop, $rows, $human_type );
-		$this->registry->output->printPopupWindow();
-	}	
-	
-	/**
-	 * Save Forum Permission Matrix
-	 *
-	 * @return	void
-	 */
-	public function saveForumPermissions()
-	{
-		/* Check ID */
-		$gid = intval( $this->request['id'] );
-		
-		if( ! $gid )
-		{
-			$this->registry->output->showError( $this->lang->words['per_groupid'], 11344 );
-		}
-		
-		/* Check the mask */
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=" . $gid ) );
-		$this->DB->execute();
-		
-		if ( ! $gr = $this->DB->fetch() )
-		{
-			$this->registry->output->showError( $this->lang->words['per_groupid'], 11345 );
-		}
-				
-		/* Permission Fields */
-		$permission_fields = array( 'view' => 'perm_view', 'read' => 'perm_2', 'reply' => 'perm_3', 'start' => 'perm_4', 'upload' => 'perm_5', 'download' => 'perm_6' );
-		
-		/* Query all the forum permissions */
-		$forum_data = $this->forumfunc->adForumsForumData();
-		
-		//echo '<pre>'; print_r( $this->request );exit();
-		foreach( $forum_data as $r )
-		{
-			/* Initialize the array */
-			$new_permissions = array();
-			
-			/* Loop through each permission type */
-			foreach( $permission_fields as $k => $v )
-			{
-				/* Don't change global permissions */				
-				if( $r[$v] != '*' )
-				{					
-					if( isset( $this->request[$k] ) && is_array( $this->request[$k] ) )
-					{
-						/* Check for forum */
-						$forum_checked = isset($this->request[$k][ $r['id'] ]);
-						
-						/* Check to see if the forum is currently added to this mask */
-						$_perm_array = explode( ',', IPSText::cleanPermString( $r[$v] ) );
-						
-						if( in_array( $gid, $_perm_array ) )
-						{
-							/* The forum was unchecked, so we need to remove it */
-							if( ! $forum_checked )
-							{
-								unset( $_perm_array[ array_search( $gid, $_perm_array ) ] );
-							}
-						}
-						else
-						{
-							/* The forum was checked, so we need to add it */
-							if( $forum_checked )
-							{
-								$_perm_array[] = $gid;
-							}
-						}
-						
-						/* Set the new string */
-						$new_permissions[$v] = ',' . implode( ',', $_perm_array ) . ',';
-					}
-					else
-					{
-						$new_permissions[$v] = '';
-					}
-				}
-				else
-				{
-					$new_permissions[$v] = '*';
-				}				
-			}
-			
-			/* Root Forum */
-			if( $r['root_forum'] )
-			{
-				$new_permissions['perm_2'] = $new_permissions['perm_3'] = $new_permissions['perm_4'] = $new_permissions['perm_5'] = $new_permissions['perm_6'] = '';
-			}			
-			
-			/* Update the database */
-			$this->DB->update( 'permission_index', $new_permissions, "perm_type='forum' AND app='forums' AND perm_type_id={$r['id']}" );
-		}
-		
-		/* All Done */
-		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['per_editedlog'], $gr['perm_name'] ) );		
-		$this->registry->output->global_message = $this->lang->words['per_updated'];
-		$this->permissionsSplash();
-	}	
-	
-	/**
-	 * Removes a permission set
-	 *
-	 * @return	void
-	 */
-	public function deleteMask()
-	{
-		/* Check ID */
-		$old_id = intval( $this->request['id'] );
-		
-		if( ! $old_id )
-		{
-			$this->registry->output->showError( $this->lang->words['per_setid'], 11346 );
-		}
-		
-		/* Permission Fields */
-		$permission_fields = array( 'perm_view', 'perm_2', 'perm_3', 'perm_4', 'perm_5', 'perm_6', 'perm_7' );
-		
-		/* Query all the forum permissions */
-		$this->DB->build( array( 'select' => '*', 'from' => 'permission_index', 'where' => "perm_type='forum' AND app='forums'" ) );
-		$outer = $this->DB->execute();
-		
-		while( $r = $this->DB->fetch( $outer ) )
-		{
-			/* Perms */
-			foreach( $permission_fields as $perm )
-			{
-				if( isset( $r[$perm] ) && $r[$perm] != '*' && $r[$perm] )
-				{
-					/* Arrayize */
-					$_perm_array = explode( ',', IPSText::cleanPermString( $r[$perm] ) );
-					
-					/* Check for the mask */										
-					if( in_array( $old_id, $_perm_array ) )
-					{
-						unset( $_perm_array[ array_search( $old_id, $_perm_array ) ] );
-					}
-					
-					/* Back to string */
-					$r[$perm] = ',' . implode( ',', $_perm_array ) . ',';
-				}
-			}
-						
-			/* Update */
-			$this->DB->update( 'permission_index', $r, "perm_id={$r['perm_id']}" );
-		}
-		
-		/* Delete the mask */
-		$this->DB->delete( 'forum_perms', "perm_id={$old_id}" );
-		
-		/* Done */
-		$this->registry->output->global_message = $this->lang->words['per_removed'];
-		$this->permissionsSplash();
-	}	
-	
-	/**
-	 * Adds a new permission set
-	 *
-	 * @return	void
-	 */
-	public function addNewPerm()
-	{
-		/* Check Perm Name */
-		$this->request['new_perm_name'] = trim( $this->request['new_perm_name'] );
-		
-		if( $this->request['new_perm_name'] == "" )
-		{
-			$this->registry->output->showError( $this->lang->words['per_entername'], 11347 );
-		}
-		
-		/* Perm set to copy */
-		$copy_id = intval( $this->request['new_perm_copy'] );
-		
-		/* Insert new permission set */
-		$this->DB->insert( 'forum_perms', array( 'perm_name' => $this->request['new_perm_name'] ) );		
-		$new_id = $this->DB->getInsertId();
-		
-		/* Copy permission */
-		if( $new_id && $copy_id )
-		{
-			/* Permission Fields */
-			$permission_fields = array( 'perm_view', 'perm_2', 'perm_3', 'perm_4', 'perm_5', 'perm_6', 'perm_7' );
-			
-			/* Query all the forum permissions */
-			$this->DB->build( array( 'select' => '*', 'from' => 'permission_index', 'where' => "perm_type='forum' AND app='forums'" ) );
-			$outer = $this->DB->execute();
-			
-			while( $r = $this->DB->fetch( $outer ) )
-			{
-				/* Perms */
-				foreach( $permission_fields as $perm )
-				{
-					if( isset( $r[$perm] ) )
-					{
-						if( in_array( $copy_id, explode( ',', IPSText::cleanPermString( $r[$perm] ) ) ) )
-						{
-							$r[$perm] .= "{$new_id},";
-						}
-					}	
-				}
-				
-				/* Update */
-				$this->DB->update( 'permission_index', $r, "perm_id={$r['perm_id']}" );
-			}
-		}
-		
-		/* Done */
-		$this->registry->output->global_message = sprintf( $this->lang->words['per_added'], $this->request['new_perm_name'] );
-		$this->permissionsSplash();
-	}	
-	
-	/**
-	 * Changes the name of a permission set
-	 *
-	 * @return	void
-	 */
-	public function editPermName()
-	{
-		/* ID */
-		$gid = intval( $this->request['id'] );		
-		
-		/* Check ID */
-		if( ! $gid )
-		{
-			$this->registry->output->showError( $this->lang->words['per_groupid'], 11348 );
-		}
-		
-		/* Check Name */
-		if( $this->request['perm_name'] == "" )
-		{
-			$this->registry->output->showError( $this->lang->words['per_entername'], 11349 );
-		}
-		
-		/* Query group */		
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id={$gid}" ) );
-		$this->DB->execute();
-		
-		if ( ! $gr = $this->DB->fetch() )
-		{
-			$this->registry->output->showError( $this->lang->words['per_groupid'], 11350 );
-		}
-		
-		/* Update the database */
-		$this->DB->update( 'forum_perms', array( 'perm_name' => $this->request['perm_name'] ), 'perm_id=' . $gid );
-		
-		/* Done */
-		$this->registry->adminFunctions->saveAdminLog( sprintf( $this->lang->words['per_editedlog'], $gr['perm_name'] ) );		
-		$this->registry->output->global_message = $this->lang->words['per_updated'];
-		$this->forumPermissions();
-	}	
-
-	/**
-	 * Forum Permission Matrix
-	 *
-	 * @return	void
-	 */
-	public function forumPermissions()
-	{
-		/* Check for ID */
-		if( $this->request['id'] == "")
-		{
-			$this->registry->output->showError( $this->lang->words['per_groupid'], 11351 );
-		}
-		
-		/* Permission Class */
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_public_permissions.php', 'classPublicPermissions' );
-		$permissions = new $classToLoad( ipsRegistry::instance() );		
-		
-		/* Page Setup */
-		$this->registry->output->nav[] = array( $this->form_code.'&do=permsplash', $this->lang->words['per_manage'] );
-		$this->registry->output->nav[] = array( '', $this->lang->words['per_addedit'] );		
-		
-		/* Query Mask */
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=" . intval( $this->request['id'] ) ) );
-		$this->DB->execute();		
-		$group = $this->DB->fetch();
-		
-		/* Data */
-		$gid        = $group['perm_id'];
-		$gname      = $group['perm_name'];		
-		$forum_data = $this->forumfunc->adForumsForumData();
-				
-		/* Permission Fields */
-		$permission_fields = array( 'view' => 'perm_view', 'read' => 'perm_2', 'reply' => 'perm_3', 'start' => 'perm_4', 'upload' => 'perm_5', 'download' => 'perm_6' );		
-		
-		/* Loop through masks and build output array */
-		$permission_rows = array();
-		
-		foreach( $forum_data as $r )
-		{
-			/* INI Perms */
-			$_perms = array();
-			
-			foreach( $permission_fields as $perm => $key )
-			{
-				if( $r[$key] == '*' )
-				{
-					$_perms[$perm] = $this->lang->words['per_global'];
-				}
-				else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r[$key] ) )
-				{
-					$_perms[$perm] = 'checked';
-				}
-				else
-				{
-					$_perms[$perm] = '';
-				}
-			}
-
-			/* Root Forum */
-			if( $r['root_forum'] )
-			{
-				$r['css'] = 'tablerow4';
-				$_perms['download'] = $_perms['upload'] = $_perms['reply'] = $_perms['start'] = $_perms['read'] = $this->lang->words['per_notused'];
-			}
-			else
-			{
-				$r['css'] = 'tablerow1';
-			}
-			
-			/* Perms */
-			$r['_perms'] = $_perms;
-			
-			/* Add to array */
-			$permission_rows[] = $r;
-		}
-	
-		/* Output */
-		$this->registry->output->html .= $this->html->permissionsForum( $gid, $gname, $permission_rows, $this->registry->class_forums->forumById( $this->request['id'] ) );		
-	}	
-	
-	/**
-	 * Displays the permission splash screen
-	 *
-	 * @return	void
-	 */
-	public function permissionsSplash()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$perms   = array();
-		$mems    = array();
-		$groups  = array();
-		$dlist   = "";
-		$content = "";
-		
-		//-----------------------------------------
-		// Page title & desc
-		//-----------------------------------------
-
-		$this->registry->output->nav[]           = array( $this->form_code.'&do=permsplash', $this->lang->words['per_manage'] );
-								
-		//-----------------------------------------
-		// Get the names for the perm masks w/id
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'order' => 'perm_name ASC' ) );
-		$this->DB->execute();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			$perms[ $r['perm_id'] ] = $r['perm_name'];
-		}
-		
-		//-----------------------------------------
-		// Get the number of members using this mask
-		// as an over ride
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select'	=> 'COUNT(member_id) as count, org_perm_id',
-										'from'	=> 'members',
-										'where'	=> "(org_perm_id " . $this->DB->buildIsNull( false ) . " AND org_perm_id != '')",
-										'group'	=> 'org_perm_id',
-							)		);
-		$this->DB->execute();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			if ( strstr( $r['org_perm_id'] , "," ) )
-			{
-				foreach( explode( ",", $r['org_perm_id'] ) as $pid )
-				{
-					$mems[ $pid ]  = ! isset( $mems[ $pid ] ) ? 0 : $mems[ $pid ];
-					$mems[ $pid ] += $r['count'];
-				}
-			}
-			else
-			{
-				$mems[ $r['org_perm_id'] ] += $r['count'];
-			}
-			
-		}
-	
-		//-----------------------------------------
-		// Get the member group names and the mask
-		// they use
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => 'g_id, g_title, g_perm_id', 'from' => 'groups' ) );
-		$this->DB->execute();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			if ( strstr( $r['g_perm_id'] , "," ) )
-			{
-				foreach( explode( ",", $r['g_perm_id'] ) as $pid )
-				{
-					$groups[ $pid ][] = $r['g_title'];
-				}
-			}
-			else
-			{
-				$groups[ $r['g_perm_id'] ][] = $r['g_title'];
-			}
-		}
-		
-		//-----------------------------------------
-		// Print the splash screen
-		//-----------------------------------------
-		
-		$display_groups = array();
-		foreach( $perms as $id => $name )
-		{
-			$groups_used = "";
-			$mems_used   = 0;
-			$is_active   = 0;
-			$dlist      .= "<option value='$id'>$name</option>\n";
-			
-			if ( isset( $groups[ $id ] ) AND is_array( $groups[ $id ] ) )
-			{
-				foreach( $groups[ $id ] as $g_title )
-				{
-					$groups_used .= '&middot; ' . $g_title . "<br />";
-				}
-				
-				$is_active = 1;
-			}
-			else
-			{
-				$groups_used = "{$this->lang->words['per_none']}";
-			}			
-			
-			if ( isset($mems[ $id ]) AND $mems[ $id ] > 0 )
-			{
-				$is_active = 1;
-			}
-			
-			$r['id']       = $id;
-			$r['name']     = $name;
-			$r['isactive'] = $is_active;
-			$r['groups']   = $groups_used;
-			$r['mems']     = isset( $mems[ $id ] ) ? intval( $mems[ $id ] ) : 0;
-			
-			$display_groups[] = $r;
-		}
-		
-		$this->registry->output->html .= $this->html->permissionsSplash( $display_groups, $dlist );
-	}	
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/forums/xml/index.html b/upload/admin/applications/forums/modules_admin/forums/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/forums/xml/index.html
+++ b/upload/admin/applications/forums/modules_admin/forums/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/forums/xml/menu.xml b/upload/admin/applications/forums/modules_admin/forums/xml/menu.xml
index 5f1dff77..bd11f12a 100644
--- a/upload/admin/applications/forums/modules_admin/forums/xml/menu.xml
+++ b/upload/admin/applications/forums/modules_admin/forums/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление форумами</subitemtitle>
+					<subitemlang>forums</subitemlang>
 					<subsection>forums</subsection>
 					<subitemurl>do=forums_overview</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Мульти-модераци� тем</subitemtitle>
+					<subitemlang>multimod</subitemlang>
 					<subsection>multimods</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>mmod_view</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
diff --git a/upload/admin/applications/forums/modules_admin/forums/xml/permissions.xml b/upload/admin/applications/forums/modules_admin/forums/xml/permissions.xml
index c02e200f..e522d8c3 100644
--- a/upload/admin/applications/forums/modules_admin/forums/xml/permissions.xml
+++ b/upload/admin/applications/forums/modules_admin/forums/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление форумами</grouptitle>
+		<grouplang>forums_forums</grouplang>
 		<items>
 			<item>
 				<key>forums_add</key>
@@ -39,6 +40,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление модераторами</grouptitle>
+		<grouplang>forums_moderators</grouplang>
 		<items>
 			<item>
 				<key>mods_add</key>
@@ -60,6 +62,7 @@
 	</group>
 	<group>
 		<grouptitle>Управление мульти-модерацией</grouptitle>
+		<grouplang>forums_multimods</grouplang>
 		<items>
 			<item>
 				<key>mmod_add</key>
diff --git a/upload/admin/applications/forums/modules_admin/index.html b/upload/admin/applications/forums/modules_admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/index.html
+++ b/upload/admin/applications/forums/modules_admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/rss/defaultSection.php b/upload/admin/applications/forums/modules_admin/rss/defaultSection.php
index abcbd1c8..5677ecb8 100644
--- a/upload/admin/applications/forums/modules_admin/rss/defaultSection.php
+++ b/upload/admin/applications/forums/modules_admin/rss/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section for RSS module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'rss' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'import';
diff --git a/upload/admin/applications/forums/modules_admin/rss/export.php b/upload/admin/applications/forums/modules_admin/rss/export.php
index e0740296..ef87bc17 100644
--- a/upload/admin/applications/forums/modules_admin/rss/export.php
+++ b/upload/admin/applications/forums/modules_admin/rss/export.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum RSS Export
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,13 +29,13 @@ class admin_forums_rss_export extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */	
-	private $html;	
+	protected $html;	
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -95,7 +95,7 @@ class admin_forums_rss_export extends ipsCommand
 	/**
 	 * Deletes an RSS Export Streawm
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssExportDelete()
 	{
@@ -125,7 +125,7 @@ class admin_forums_rss_export extends ipsCommand
 	 * Save the add/edit RSS Export Stream form
 	 *
 	 * @param	string	$type	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssExportSave( $type='add' )
 	{
@@ -198,7 +198,7 @@ class admin_forums_rss_export extends ipsCommand
 	 * Form for adding/editing an RSS Export Stream
 	 *
 	 * @param	string	$type	add/edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssExportForm( $type='add' )
 	{
@@ -260,16 +260,16 @@ class admin_forums_rss_export extends ipsCommand
 		/* Form Elements */
 		$form = array();
 		
-		$form['rss_export_title']        = $this->registry->output->formInput(  'rss_export_title'         , IPSText::htmlspecialchars( ( isset($this->request['rss_export_title']) AND $this->request['rss_export_title'] ) ? $this->request['rss_export_title'] : $rssstream['rss_export_title'] ) );
-		$form['rss_export_desc']         = $this->registry->output->formInput(  'rss_export_desc'          , IPSText::htmlspecialchars( ( isset($this->request['rss_export_desc']) AND $this->request['rss_export_desc'] )  ? $this->request['rss_export_desc']  : $rssstream['rss_export_desc']  ) );
-		$form['rss_export_image']        = $this->registry->output->formInput(  'rss_export_image'         , IPSText::htmlspecialchars( ( isset($this->request['rss_export_image']) AND $this->request['rss_export_image'] ) ? $this->request['rss_export_image'] : $rssstream['rss_export_image'] ) );
-		$form['rss_export_include_post'] = $this->registry->output->formYesNo( 'rss_export_include_post'  , ( isset($this->request['rss_export_include_post']) AND $this->request['rss_export_include_post'] ) ? $this->request['rss_export_include_post'] : $rssstream['rss_export_include_post'] );
-		$form['rss_export_enabled']      = $this->registry->output->formYesNo( 'rss_export_enabled'       , ( isset($this->request['rss_export_enabled']) AND $this->request['rss_export_enabled'] ) ? $this->request['rss_export_enabled'] : $rssstream['rss_export_enabled'] );
-		$form['rss_export_count']        = $this->registry->output->formSimpleInput( 'rss_export_count'   , ( isset($this->request['rss_export_count']) AND $this->request['rss_export_count'] )   ? $this->request['rss_export_count']   : $rssstream['rss_export_count'], 5 );
+		$form['rss_export_title']        = $this->registry->output->formInput(  'rss_export_title'         , IPSText::htmlspecialchars( !empty($this->request['rss_export_title']) ? $this->request['rss_export_title'] : $rssstream['rss_export_title'] ) );
+		$form['rss_export_desc']         = $this->registry->output->formInput(  'rss_export_desc'          , IPSText::htmlspecialchars( !empty($this->request['rss_export_desc']) ? $this->request['rss_export_desc']  : $rssstream['rss_export_desc']  ) );
+		$form['rss_export_image']        = $this->registry->output->formInput(  'rss_export_image'         , IPSText::htmlspecialchars( !empty($this->request['rss_export_image']) ? $this->request['rss_export_image'] : $rssstream['rss_export_image'] ) );
+		$form['rss_export_include_post'] = $this->registry->output->formYesNo( 'rss_export_include_post'  , !empty($this->request['rss_export_include_post']) ? $this->request['rss_export_include_post'] : $rssstream['rss_export_include_post'] );
+		$form['rss_export_enabled']      = $this->registry->output->formYesNo( 'rss_export_enabled'       , !empty($this->request['rss_export_enabled']) ? $this->request['rss_export_enabled'] : $rssstream['rss_export_enabled'] );
+		$form['rss_export_count']        = $this->registry->output->formSimpleInput( 'rss_export_count'   , !empty($this->request['rss_export_count']) ? $this->request['rss_export_count']   : $rssstream['rss_export_count'], 5 );
 		$form['rss_export_forums']       = $this->registry->output->formMultiDropdown(  'rss_export_forums[]', $dropdown, explode( ",", $rss_export_forums ), 7 );
-		$form['rss_export_cache_time']   = $this->registry->output->formSimpleInput( 'rss_export_cache_time'   , ( isset($this->request['rss_export_cache_time']) AND $this->request['rss_export_cache_time'] )  ? $this->request['rss_export_cache_time']   : $rssstream['rss_export_cache_time'], 5 );
-		$form['rss_export_sort']         = $this->registry->output->formDropdown( 'rss_export_sort' , $dd_sort , ( isset($this->request['rss_export_sort']) AND $this->request['rss_export_sort'] )  ? $this->request['rss_export_sort']  : $rssstream['rss_export_sort'] );
-		$form['rss_export_order']        = $this->registry->output->formDropdown( 'rss_export_order', $dd_order, ( isset($this->request['rss_export_order']) AND $this->request['rss_export_order'] ) ? $this->request['rss_export_order'] : $rssstream['rss_export_order'] );
+		$form['rss_export_cache_time']   = $this->registry->output->formSimpleInput( 'rss_export_cache_time'   , !empty($this->request['rss_export_cache_time']) ? $this->request['rss_export_cache_time']   : $rssstream['rss_export_cache_time'], 5 );
+		$form['rss_export_sort']         = $this->registry->output->formDropdown( 'rss_export_sort' , $dd_sort , !empty($this->request['rss_export_sort']) ? $this->request['rss_export_sort']  : $rssstream['rss_export_sort'] );
+		$form['rss_export_order']        = $this->registry->output->formDropdown( 'rss_export_order', $dd_order, !empty($this->request['rss_export_order']) ? $this->request['rss_export_order'] : $rssstream['rss_export_order'] );
 		
 		/* Output */
 		$this->registry->output->html            .= $this->html->rssExportForm( $form, $title, $formcode, $button, $rssstream );
@@ -278,7 +278,7 @@ class admin_forums_rss_export extends ipsCommand
 	/**
 	 * Lists Current RSS Exports
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssExportOverview()
 	{
@@ -342,8 +342,7 @@ class admin_forums_rss_export extends ipsCommand
 		
 		/* Get RSS Clas */
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
-		$class_rss              = new $classToLoad();		
-		$class_rss->use_sockets = $this->use_sockets;
+		$class_rss              = new $classToLoad();
 		$class_rss->doc_type    = IPS_DOC_CHAR_SET;
 		
 		/* Reset rss_export cache */
@@ -371,7 +370,7 @@ class admin_forums_rss_export extends ipsCommand
 					$this->DB->build( array( 
 													'select' => 't.*',
 													'from'   => array( 'topics' => 't' ),
-													'where'  => "t.forum_id IN( " . $row['rss_export_forums'] . " ) AND t.state != 'link' AND t.approved=1",
+													'where'  => "t.forum_id IN( " . $row['rss_export_forums'] . " ) AND t.state != 'link' AND " . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), 't.' ),
 													'order'  => 't.' . $row['rss_export_order'] . ' ' . $row['rss_export_sort'],
 													'limit'  => array( 0, $row['rss_export_count'] ),
 													'add_join' => array( array( 
@@ -387,7 +386,7 @@ class admin_forums_rss_export extends ipsCommand
 					$this->DB->build( array( 
 													'select' => '*',
 													'from'   => 'topics',
-													'where'  => "forum_id IN( ".$row['rss_export_forums']." ) AND state != 'link' AND approved=1",
+													'where'  => "forum_id IN( ".$row['rss_export_forums']." ) AND state != 'link' AND " . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ),
 													'order'  => $row['rss_export_order'].' '. $row['rss_export_sort'],
 													'limit'  => array( 0, $row['rss_export_count'] )
 										)		);
@@ -412,7 +411,7 @@ class admin_forums_rss_export extends ipsCommand
 						$channel_id = $class_rss->createNewChannel( array(
 																				'title'       => $row['rss_export_title'],
 																				'description' => $row['rss_export_desc'],
-																				'link'        => $this->settings['board_url'].'/index.php',
+																				'link'        => $this->settings['board_url'],
 																				'pubDate'     => $class_rss->formatDate( $row['rss_export_order'] == 'start_date' ? $topic['start_date'] : $topic['last_post'] ),
 																				'ttl'         => $row['rss_export_cache_time']
 																	)		);
@@ -422,7 +421,7 @@ class admin_forums_rss_export extends ipsCommand
 							$class_rss->addImageToChannel( $channel_id, array( 
 																				'title' => $row['rss_export_title'],
 																				'url' => $row['rss_export_image'],
-																				'link'=> $this->settings['board_url'].'/index.php' 
+																				'link'=> $this->settings['board_url']
 														)		);
 						}
 						
diff --git a/upload/admin/applications/forums/modules_admin/rss/import.php b/upload/admin/applications/forums/modules_admin/rss/import.php
index 7839f37a..cda4c865 100644
--- a/upload/admin/applications/forums/modules_admin/rss/import.php
+++ b/upload/admin/applications/forums/modules_admin/rss/import.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum RSS Import
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-10-14 12:56:17 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9622 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -24,33 +24,26 @@ if ( ! defined( 'IN_ACP' ) )
 
 class admin_forums_rss_import extends ipsCommand
 {
-	/**
-	 * Use sockets
-	 *
-	 * @var		bool
-	 */		
-	private $use_sockets	= 1;
-	
 	/**
 	 * Classes yet loaded?
 	 *
 	 * @var		bool
 	 */	
-	private $classes_loaded	= false;
+	protected $classes_loaded	= false;
 	
 	/**
 	 * Items imported so far
 	 *
 	 * @var		integer
 	 */	
-	private $import_count	= 0;
+	protected $import_count	= 0;
 	
 	/**
 	 * Validation message(s)
 	 *
 	 * @var		array
 	 */	
-	private $validate_msg	= array();
+	protected $validate_msg	= array();
 	
 	/**#@+
 	 * URL bits
@@ -66,27 +59,27 @@ class admin_forums_rss_import extends ipsCommand
 	 *
 	 * @var		object
 	 */		
-	private $func_mod;	
+	protected $func_mod;	
 	
 	/**
 	 * RSS Parser Class
 	 *
 	 * @var		object
 	 */		
-	private $class_rss;
+	protected $class_rss;
 	
 	/**
 	 * Skin object
 	 *
 	 * @var		object
 	 */	
-	private $html;	
+	protected $html;	
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -169,7 +162,7 @@ class admin_forums_rss_import extends ipsCommand
 	/**
 	 * Delete an RSS Import Stream
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssImportDelete()
 	{
@@ -261,7 +254,7 @@ class admin_forums_rss_import extends ipsCommand
 	/**
 	 * Splash screen for removing imported articles
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssImportRemoveDialogue()
 	{
@@ -276,7 +269,7 @@ class admin_forums_rss_import extends ipsCommand
 		}
 		
 		/* Load RSS Stream */
-		$rssstream = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'rss_import', 'where' => "rss_import_id=$rss_import_id" ) );
+		$rssstream = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'rss_import', 'where' => "rss_import_id={$rss_import_id}" ) );
 		
 		if( ! $rssstream['rss_import_id'] )
 		{
@@ -303,7 +296,7 @@ class admin_forums_rss_import extends ipsCommand
 	 * Saves the add/edit RSS Import form
 	 *
 	 * @param	string	$type	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssImportSave($type='add')
 	{
@@ -334,11 +327,10 @@ class admin_forums_rss_import extends ipsCommand
 		$rss_import_topic_hide = intval( $this->request['rss_import_topic_hide'] );
 		$rss_import_inc_pcount = intval( $this->request['rss_import_inc_pcount'] );
 		$rss_import_topic_pre  = $this->request['rss_import_topic_pre'];
-		$rss_import_charset    = $this->request['rss_import_charset'];
 		$rss_import_allow_html = intval( $this->request['rss_import_allow_html'] );
 		$rss_import_auth	   = intval( $this->request['rss_import_auth'] );
-		$rss_import_auth_user  = trim( $this->request['rss_import_auth_user'] ) ? trim( $this->request['rss_import_auth_user'] ) : $this->lang->words['im_notneeded'];
-		$rss_import_auth_pass  = trim( $this->request['rss_import_auth_pass'] ) ? trim( $this->request['rss_import_auth_pass'] ) : $this->lang->words['im_notneeded'];
+		$rss_import_auth_user  = trim( $this->request['rss_import_auth_user'] ) ? trim( $this->request['rss_import_auth_user'] ) : '';
+		$rss_import_auth_pass  = trim( $this->request['rss_import_auth_pass'] ) ? trim( $this->request['rss_import_auth_pass'] ) : '';
 
 		$rss_error             = array();
 		
@@ -360,35 +352,18 @@ class admin_forums_rss_import extends ipsCommand
 			return;
 		}
 		
+		//-----------------------------------------
+		// Only validate feed if it's enabled
+		// @link	http://community.invisionpower.com/tracker/issue-26647-unable-to-disable-rss-import-feed
+		//-----------------------------------------
+		
+		if ( $rss_import_enabled )
+		{
 		/* Load the RSS Class */
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
 		$this->class_rss               =  new $classToLoad();
-		
-		$this->class_rss->use_sockets  =  $this->use_sockets;
 		$this->class_rss->rss_max_show =  $rss_import_pergo;
-		
-		/* Set DOC TYPE */
-		$supported_encodings = array( 'utf-8', 'iso-8859-1', 'us-ascii' );
-		
-		if( in_array( strtolower( IPS_DOC_CHAR_SET ), $supported_encodings ) )
-		{
-			$this->class_rss->doc_type = IPS_DOC_CHAR_SET;
-		}
-		else
-		{
-			$this->class_rss->doc_type = 'UTF-8';
-		}
-		
-		if( strtolower( $rss_import_charset ) != $this->class_rss->doc_type )
-		{
-			$this->class_rss->convert_charset     = 1;
-			$this->class_rss->feed_charset        = $rss_import_charset;
-			$this->class_rss->destination_charset = $this->class_rss->doc_type;
-		}
-		else
-		{
-			$this->class_rss->convert_charset = 0;
-		}
+			$this->class_rss->doc_type		= strtoupper(IPS_DOC_CHAR_SET);
 		
 		/* Set this import's authentication */				
 		$this->class_rss->auth_req  = $rss_import_auth;
@@ -416,11 +391,12 @@ class admin_forums_rss_import extends ipsCommand
 			$this->rssImportForm( $type );
 			return;
 		}
+		}
 
 		/* Member data */
 		$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, name', 'from' => 'members', 'where' => "members_l_display_name='" . mb_strtolower( $rss_import_mid ) . "'" ) );
 		
-		if ( !isset( $member['member_id'] ) OR !$member['member_id'] )
+		if ( empty( $member['member_id'] ) )
 		{
 			$this->registry->output->global_message = sprintf( $this->lang->words['im_nomember'], $rss_import_mid );
 			$this->rssImportForm( $type );
@@ -434,7 +410,7 @@ class admin_forums_rss_import extends ipsCommand
 		/* Check to make sure forum ID is valid */
 		$this->registry->class_forums->forumsInit();
 		
-		if ( ! isset( $this->registry->class_forums->forum_by_id[ $rss_import_forum_id ] ) OR !$this->registry->class_forums->forum_by_id[ $rss_import_forum_id ] )
+		if ( empty( $this->registry->class_forums->forum_by_id[ $rss_import_forum_id ] ) )
 		{
 			$this->registry->output->global_message = $this->lang->words['im_noforum'];
 			$this->rssImportForm( $type );
@@ -462,7 +438,6 @@ class admin_forums_rss_import extends ipsCommand
 						'rss_import_topic_hide' => $rss_import_topic_hide,
 						'rss_import_inc_pcount' => $rss_import_inc_pcount,
 						'rss_import_topic_pre'  => $rss_import_topic_pre,
-						'rss_import_charset'    => $rss_import_charset,
 						'rss_import_allow_html'	=> $rss_import_allow_html,
 						'rss_import_auth'		=> $rss_import_auth,
 						'rss_import_auth_user'  => $rss_import_auth_user,
@@ -497,7 +472,7 @@ class admin_forums_rss_import extends ipsCommand
 	 * Form for adding/editing RSS Imports
 	 *
 	 * @param	string	$type	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssImportForm( $type='add' )
 	{
@@ -505,8 +480,6 @@ class admin_forums_rss_import extends ipsCommand
 		$rss_import_id = $this->request['rss_import_id'] ? intval( $this->request['rss_import_id'] ) : 0;
 		
 		/* Build form drop downs */
-		$this->registry->class_forums->forumsInit();
-		
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/admin_forum_functions.php", 'admin_forum_functions', 'forums' );
 		$aff = new $classToLoad( $this->registry );
 		$aff->forumsInit();
@@ -533,7 +506,6 @@ class admin_forums_rss_import extends ipsCommand
 							    'rss_import_topic_hide'	=> 0,
 							    'rss_import_inc_pcount'	=> 1,
 							    'rss_import_topic_pre'	=> '',
-							    'rss_import_charset'	=> '',
 							    'rss_import_allow_html'	=> 0,
 							    'rss_import_auth'		=> NULL,
 							    'rss_import_auth_user'	=> NULL,
@@ -571,39 +543,28 @@ class admin_forums_rss_import extends ipsCommand
 		/* Form Elements */
 		$form = array();
 		
-		$form['rss_import_title']      = $this->registry->output->formInput(        'rss_import_title'       , ( isset($this->request['rss_import_title']) 	 AND $this->request['rss_import_title'] )      ? stripslashes($this->request['rss_import_title'])      : $rssstream['rss_import_title'] );
-		$form['rss_import_enabled']    = $this->registry->output->formYesNo(       'rss_import_enabled'     , ( isset($this->request['rss_import_enabled']) 	 AND $this->request['rss_import_enabled'] )    ? $this->request['rss_import_enabled']    : $rssstream['rss_import_enabled'] );
-		$form['rss_import_url']        = $this->registry->output->formInput(        'rss_import_url'         , ( isset($this->request['rss_import_url']) 		 AND $this->request['rss_import_url'] )        ? $this->request['rss_import_url']        : $rssstream['rss_import_url'] );
-		$form['rss_import_forum_id']   = $this->registry->output->formDropdown(     'rss_import_forum_id'    , $forum_dropdown, ( isset($this->request['rss_import_forum_id']) AND $this->request['rss_import_forum_id'] ) ? $this->request['rss_import_forum_id'] : $rssstream['rss_import_forum_id'] );
-		$form['rss_import_mid']        = $this->registry->output->formInput(        'rss_import_mid'         , ( isset($this->request['rss_import_mid']) 		 AND $this->request['rss_import_mid'] )        ? $this->request['rss_import_mid']        : $rssstream['rss_import_mid'] );
-		$form['rss_import_pergo']      = $this->registry->output->formSimpleInput( 'rss_import_pergo'       , ( isset($this->request['rss_import_pergo']) 	 AND  $this->request['rss_import_pergo'] )     ? $this->request['rss_import_pergo']      : $rssstream['rss_import_pergo'], 5 );
-		$form['rss_import_time']       = $this->registry->output->formSimpleInput( 'rss_import_time'        , ( isset($this->request['rss_import_time']) 		 AND $this->request['rss_import_time'] )       ? $this->request['rss_import_time']       : $rssstream['rss_import_time'], 5 );
-		$form['rss_import_showlink']   = $this->registry->output->formInput(        'rss_import_showlink'    , ( isset($this->request['rss_import_showlink']) 	 AND $this->request['rss_import_showlink'] )   ? htmlspecialchars($this->request['rss_import_showlink'])   : htmlspecialchars($rssstream['rss_import_showlink']) );
-		$form['rss_import_topic_open'] = $this->registry->output->formYesNo(       'rss_import_topic_open'  , ( isset($this->request['rss_import_topic_open']) AND $this->request['rss_import_topic_open'] ) ? $this->request['rss_import_topic_open'] : $rssstream['rss_import_topic_open'] );
-		$form['rss_import_topic_hide'] = $this->registry->output->formYesNo(       'rss_import_topic_hide'  , ( isset($this->request['rss_import_topic_hide']) AND $this->request['rss_import_topic_hide'] ) ? $this->request['rss_import_topic_hide'] : $rssstream['rss_import_topic_hide'] );
-		$form['rss_import_inc_pcount'] = $this->registry->output->formYesNo(       'rss_import_inc_pcount'  , ( isset($this->request['rss_import_inc_pcount']) AND $this->request['rss_import_inc_pcount'] ) ? $this->request['rss_import_inc_pcount'] : $rssstream['rss_import_inc_pcount'] );
-		$form['rss_import_topic_pre']  = $this->registry->output->formInput(        'rss_import_topic_pre'   , ( isset($this->request['rss_import_topic_pre'])  AND $this->request['rss_import_topic_pre'] )  ? $this->request['rss_import_topic_pre']  : $rssstream['rss_import_topic_pre'] );
-		$form['rss_import_charset']    = $this->registry->output->formInput(        'rss_import_charset'     , ( isset($this->request['rss_import_charset']) 	 AND $this->request['rss_import_charset'] )    ? $this->request['rss_import_charset']    : $rssstream['rss_import_charset'] );
-		$form['rss_import_allow_html'] = $this->registry->output->formYesNo(       'rss_import_allow_html'  , ( isset($this->request['rss_import_allow_html']) AND $this->request['rss_import_allow_html'] ) ? $this->request['rss_import_allow_html'] : $rssstream['rss_import_allow_html'] );
+		$form['rss_import_title']      = $this->registry->output->formInput(        'rss_import_title'       , !empty($this->request['rss_import_title']) ? stripslashes($this->request['rss_import_title'])      : $rssstream['rss_import_title'] );
+		$form['rss_import_enabled']    = $this->registry->output->formYesNo(       'rss_import_enabled'     , !empty($this->request['rss_import_enabled']) ? $this->request['rss_import_enabled']    : $rssstream['rss_import_enabled'] );
+		$form['rss_import_url']        = $this->registry->output->formInput(        'rss_import_url'         , !empty($this->request['rss_import_url']) ? $this->request['rss_import_url']        : $rssstream['rss_import_url'] );
+		$form['rss_import_forum_id']   = $this->registry->output->formDropdown(     'rss_import_forum_id'    , $forum_dropdown, !empty($this->request['rss_import_forum_id']) ? $this->request['rss_import_forum_id'] : $rssstream['rss_import_forum_id'] );
+		$form['rss_import_mid']        = $this->registry->output->formInput(        'rss_import_mid'         , !empty($this->request['rss_import_mid']) ? $this->request['rss_import_mid']        : $rssstream['rss_import_mid'] );
+		$form['rss_import_pergo']      = $this->registry->output->formSimpleInput( 'rss_import_pergo'       , !empty($this->request['rss_import_pergo']) ? $this->request['rss_import_pergo']      : $rssstream['rss_import_pergo'], 5 );
+		$form['rss_import_time']       = $this->registry->output->formSimpleInput( 'rss_import_time'        , !empty($this->request['rss_import_time']) ? $this->request['rss_import_time']       : $rssstream['rss_import_time'], 5 );
+		$form['rss_import_showlink']   = $this->registry->output->formInput(        'rss_import_showlink'    , !empty($this->request['rss_import_showlink']) ? htmlspecialchars($this->request['rss_import_showlink'])   : htmlspecialchars($rssstream['rss_import_showlink']) );
+		$form['rss_import_topic_open'] = $this->registry->output->formYesNo(       'rss_import_topic_open'  , !empty($this->request['rss_import_topic_open']) ? $this->request['rss_import_topic_open'] : $rssstream['rss_import_topic_open'] );
+		$form['rss_import_topic_hide'] = $this->registry->output->formYesNo(       'rss_import_topic_hide'  , !empty($this->request['rss_import_topic_hide']) ? $this->request['rss_import_topic_hide'] : $rssstream['rss_import_topic_hide'] );
+		$form['rss_import_inc_pcount'] = $this->registry->output->formYesNo(       'rss_import_inc_pcount'  , !empty($this->request['rss_import_inc_pcount']) ? $this->request['rss_import_inc_pcount'] : $rssstream['rss_import_inc_pcount'] );
+		$form['rss_import_topic_pre']  = $this->registry->output->formInput(        'rss_import_topic_pre'   , !empty($this->request['rss_import_topic_pre']) ? $this->request['rss_import_topic_pre']  : $rssstream['rss_import_topic_pre'] );
+		$form['rss_import_allow_html'] = $this->registry->output->formYesNo(       'rss_import_allow_html'  , !empty($this->request['rss_import_allow_html']) ? $this->request['rss_import_allow_html'] : $rssstream['rss_import_allow_html'] );
 		$form['rss_import_auth']	   = $this->registry->output->formCheckbox(	 'rss_import_auth'		  ,
-																						( isset($this->request['rss_import_auth']) AND $this->request['rss_import_auth'] ) ? $this->request['rss_import_auth'] : $rssstream['rss_import_auth'],
+																						!empty($this->request['rss_import_auth']) ? $this->request['rss_import_auth'] : $rssstream['rss_import_auth'],
 																						'1',
 																						"rss_import_auth",
 																						'onclick="ACPRss.showAuthBoxes()"'
 																				);
-																
-		$auth_checked = ( isset( $this->request['rss_import_auth'] ) AND $this->request['rss_import_auth'] ) ? $this->request['rss_import_auth'] : $rssstream['rss_import_auth'];
-		if( !$auth_checked )
-		{
-			$form['rss_div_show'] = "style='display:none;'";
-		}
-		else
-		{
-			$form['rss_div_show'] = "style='display:;'";
-		}
-		
-		$form['rss_import_auth_user'] = $this->registry->output->formInput( 'rss_import_auth_user', ( isset( $this->request['rss_import_auth_user'] ) AND $this->request['rss_import_auth_user'] ) ? $this->request['rss_import_auth_user'] : $rssstream['rss_import_auth_user'] );
-		$form['rss_import_auth_pass'] = $this->registry->output->formInput( 'rss_import_auth_pass', ( isset( $this->request['rss_import_auth_pass'] ) AND $this->request['rss_import_auth_pass'] ) ? $this->request['rss_import_auth_pass'] : $rssstream['rss_import_auth_pass'] );																				
+
+		$form['rss_import_auth_user'] = $this->registry->output->formInput( 'rss_import_auth_user', !empty( $this->request['rss_import_auth_user'] ) ? $this->request['rss_import_auth_user'] : $rssstream['rss_import_auth_user'] );
+		$form['rss_import_auth_pass'] = $this->registry->output->formInput( 'rss_import_auth_pass', !empty( $this->request['rss_import_auth_pass'] ) ? $this->request['rss_import_auth_pass'] : $rssstream['rss_import_auth_pass'] );																				
 		
 		/* Output */
 		$this->registry->output->html           .= $this->html->rssImportForm( $form, $title, $formcode, $button, $rssstream );
@@ -612,7 +573,7 @@ class admin_forums_rss_import extends ipsCommand
 	/**
 	 * Builds a list of current RSS Imports
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rssImportOverview()
 	{
@@ -692,14 +653,12 @@ class admin_forums_rss_import extends ipsCommand
 			if ( ! is_object( $this->class_rss ) )
 			{
 				$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
-				$this->class_rss               =  new $classToLoad();
-				
-				$this->class_rss->use_sockets  =  $this->use_sockets;
-				$this->class_rss->rss_max_show =  100;
+				$this->class_rss               = new $classToLoad();
+				$this->class_rss->rss_max_show = 100;
 			}
 
 			/* Get the post class */
-			require_once(IPSLib::getAppDir('forums') .'/sources/classes/post/classPost.php' );
+			require_once(IPSLib::getAppDir('forums') .'/sources/classes/post/classPost.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 			
 			$this->post = new $classToLoad( $this->registry );
@@ -720,359 +679,355 @@ class admin_forums_rss_import extends ipsCommand
 			$this->registry->class_forums->forumsInit();
 		}
 		
+		/* Sort out which IDs to load.. */
+		if ( $rss_import_id == 'all' )
+		{
+			$where = '';
+		}
+		elseif( $id_is_array == 1 )
+		{
+			$where = 'rss_import_id IN (' . implode(',', $rss_import_ids) . ')';
+		}
+		else
+		{
+			$where = 'rss_import_id=' . $rss_import_id;
+		}
+		
 		/* Query the RSS imports */
-		$this->DB->build( array( 'select' => '*', 'from' => 'rss_import' ) );
+		$this->DB->build( array( 'select' => '*', 'from' => 'rss_import', 'where' => $where ) );
 		$outer = $this->DB->execute();
 		
 		/* Loop through and build cache */
 		while( $row = $this->DB->fetch( $outer ) )
 		{
-			/* Are we caching this one? */
-			if( $rss_import_id == 'all' OR $row['rss_import_id'] == $rss_import_id OR ( $id_is_array == 1 AND in_array( $row['rss_import_id'], $rss_import_ids ) ) )
+			/* Skip non-existent forums - bad stuff happens */
+			if ( !isset($this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]) )
 			{
-				/* Skip non-existent forums - bad stuff happens */
-				if ( !isset($this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]) )
+				continue;
+			}
+			
+			/* Allowing badwords? */
+			IPSText::getTextClass('bbcode')->bypass_badwords = $row['rss_import_allow_html'];
+			
+			/* Set this import's doctype */
+			$this->class_rss->doc_type 		= strtoupper(IPS_DOC_CHAR_SET);
+			
+			/* Set this import's authentication */
+			$this->class_rss->auth_req 	= $row['rss_import_auth'];
+			$this->class_rss->auth_user = $row['rss_import_auth_user'];
+			$this->class_rss->auth_pass = $row['rss_import_auth_pass'];
+
+			/* Clear RSS object's error cache first */
+			$this->class_rss->errors 	= array();
+			$this->class_rss->rss_items = array();
+			
+			/* Reset the rss count as this is a new feed */
+			$this->class_rss->rss_count 	= 0;
+			$this->class_rss->rss_max_show 	= $row['rss_import_pergo'];
+			
+			/* Parse RSS */
+			$this->class_rss->parseFeedFromUrl( $row['rss_import_url'] );
+			
+			/* Check for errors */
+			if ( is_array( $this->class_rss->errors ) and count( $this->class_rss->errors ) )
+			{
+				$rss_error = array_merge( $rss_error,  $this->class_rss->errors );
+				continue;
+			}
+			
+			if ( ! is_array( $this->class_rss->rss_channels ) or ! count( $this->class_rss->rss_channels ) )
+			{
+				$rss_error[] = sprintf( $this->lang->words['im_noopen'], $row['rss_import_url'] );
+				continue;
+			}
+			
+			/* Update last check time */
+			$this->DB->update( 'rss_import', array( 'rss_import_last_import' => IPS_UNIX_TIME_NOW ), 'rss_import_id='.$row['rss_import_id'] );
+			
+			/* Apparently so: Parse feeds and check for already imported GUIDs */
+			$final_items = array();
+			$items       = array();
+			$check_guids = array();
+			$final_guids = array();
+			$count       = 0;
+			
+			if ( ! is_array( $this->class_rss->rss_items ) or ! count( $this->class_rss->rss_items ) )
+			{
+				$rss_error[] = $row['rss_import_url'] . $this->lang->words['im_noimport'];
+				continue;
+			}
+			
+			/* Loop through the channels */
+			foreach ( $this->class_rss->rss_channels as $channel_id => $channel_data )
+			{
+				if ( is_array( $this->class_rss->rss_items[ $channel_id ] ) and count ($this->class_rss->rss_items[ $channel_id ] ) )
+				{
+					/* Loop through the items in this channel */
+					foreach( $this->class_rss->rss_items[ $channel_id ] as $item_data )
+					{
+						/* Item Data */
+						$item_data['content']  = $item_data['content']   ? $item_data['content']  : $item_data['description'];
+						$item_data['guid']     = md5( $row['rss_import_id'] . ( $item_data['guid'] ? $item_data['guid']     : preg_replace( "#\s|\r|\n#is", "", $item_data['title'].$item_data['link'].$item_data['description'] ) ) );
+						$item_data['unixdate'] = intval($item_data['unixdate'])  ? intval($item_data['unixdate']) : IPS_UNIX_TIME_NOW;
+
+						/*  If feed charset doesn't match original, we converted to utf-8 and need to convert back now */
+						if ( $this->class_rss->doc_type != $this->class_rss->orig_doc_type )
+						{
+							$item_data['title']   = IPSText::convertCharsets( $item_data['title']  , "UTF-8", IPS_DOC_CHAR_SET );
+							$item_data['content'] = IPSText::convertCharsets( $item_data['content'], "UTF-8", IPS_DOC_CHAR_SET );
+						}
+
+						/* Error check */
+						if ( ! $item_data['title'] OR ! $item_data['content'] )
+						{
+						 	$rss_error[] = sprintf( $this->lang->words['im_notitle'], $item_data['title'] );
+							continue;
+						}
+						
+						/* Dates */
+						if ( $item_data['unixdate'] < 1 )
+						{
+							$item_data['unixdate'] = IPS_UNIX_TIME_NOW;
+						}
+						else if ( $item_data['unixdate'] > IPS_UNIX_TIME_NOW )
+						{
+							$item_data['unixdate'] = IPS_UNIX_TIME_NOW;
+						}
+						
+						/* Add to array */
+						$items[ $item_data['guid'] ] = $item_data;
+						$check_guids[]               = $item_data['guid'];
+					}
+				}
+			}
+
+			/* Check GUIDs */
+			if ( ! count( $check_guids ) )
+			{
+				$rss_error[] = $this->lang->words['im_noitems'];
+				continue;
+			}
+			
+			$this->DB->build( array( 'select' => '*', 'from' => 'rss_imported', 'where' => "rss_imported_guid IN ('".implode( "','", $check_guids )."')" ) );
+			$this->DB->execute();
+			
+			while ( $guid = $this->DB->fetch() )
+			{
+				$final_guids[ $guid['rss_imported_guid'] ] = $guid['rss_imported_guid'];
+			}
+			
+			/* Compare GUIDs */
+			$item_count = 0;
+			
+			foreach( $items as $guid => $data )
+			{
+				if ( in_array( $guid, $final_guids ) )
 				{
 					continue;
 				}
-				
-				/* Allowing badwords? */
-				IPSText::getTextClass( 'bbcode' )->bypass_badwords = $row['rss_import_allow_html'];
-				
-				/* Set this import's doctype */
-				$this->class_rss->doc_type 		= IPS_DOC_CHAR_SET;
-				$this->class_rss->feed_charset 	= $row['rss_import_charset'];
-				
-				if( strtolower( $row['rss_import_charset'] ) != IPS_DOC_CHAR_SET )
-				{
-					$this->class_rss->convert_charset = 1;
-				}
 				else
 				{
-					$this->class_rss->convert_charset = 0;
+					$item_count++;
+					
+					/* Make sure each item has a unique date */
+					$final_items[ $data['unixdate'].$item_count ] = $data;
 				}
-				
-				/* Set this import's authentication */
-				$this->class_rss->auth_req 		= $row['rss_import_auth'];
-				$this->class_rss->auth_user 	= $row['rss_import_auth_user'];
-				$this->class_rss->auth_pass 	= $row['rss_import_auth_pass'];
+			}
 
-				/* Clear RSS object's error cache first */
-				$this->class_rss->errors 		= array();
-				$this->class_rss->rss_items 	= array();
+			/* Sort Array */
+			krsort( $final_items );
+			
+			/* Pick off last X */
+			$count           = 1;
+			$tmp_final_items = $final_items;
+			$final_items     = array();
+			
+			foreach( $tmp_final_items as $date => $data )
+			{
+				$final_items[ $date ] = $data;
 				
-				/* Reset the rss count as this is a new feed */
-				$this->class_rss->rss_count 	= 0;
-				$this->class_rss->rss_max_show 	= $row['rss_import_pergo'];
-				
-				/* Parse RSS */
-				$this->class_rss->parseFeedFromUrl( $row['rss_import_url'] );
-				
-				/* Check for errors */
-				if ( is_array( $this->class_rss->errors ) and count( $this->class_rss->errors ) )
+				if ( $count >= $row['rss_import_pergo'] )
 				{
-					$rss_error = array_merge( $rss_error,  $this->class_rss->errors );
-					continue;
+					break;
+				}
+					
+				$count++;
+			}
+
+			/* Anything left? */
+			if ( ! count( $final_items ) )
+			{
+				continue;
+			}
+			
+			/* Figure out MID */
+			$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, name, members_display_name, ip_address', 'from' => 'members', 'where' => "member_id={$row['rss_import_mid']}" ) );
+			
+			if ( ! $member['member_id'] )
+			{
+				continue;
+			}
+			
+			/* Set member in post class */
+			$this->post->setAuthor( $member['member_id'] );
+			$this->post->setForumData( $this->registry->getClass('class_forums')->forum_by_id[ $row['rss_import_forum_id'] ] );
+			
+			/* Make 'dem posts */
+			$affected_forum_ids[] = $row['rss_import_forum_id'];
+			
+			foreach( $final_items as $topic_item )
+			{
+				/* Fix &amp; */
+				$topic_item['title'] = str_replace( '&amp;', '&', $topic_item['title'] );
+				$topic_item['title'] = str_replace( array( "\r", "\n" ), ' ', $topic_item['title'] );
+				$topic_item['title'] = str_replace( array( "<br />", "<br>" ), ' ', $topic_item['title'] );
+				$topic_item['title'] = trim( $topic_item['title'] );
+				$topic_item['title'] = strip_tags( $topic_item['title'] );
+				$topic_item['title'] = IPSText::parseCleanValue( $topic_item['title'] );
+				
+				/* Fix up &amp;reg; */
+				$topic_item['title'] = str_replace( '&amp;reg;', '&reg;', $topic_item['title'] );
+				
+				if( $row['rss_import_topic_pre'] )
+				{
+					$topic_item['title'] = str_replace( '&nbsp;', ' ', str_replace( '&amp;nbsp;', '&nbsp;', $row['rss_import_topic_pre'] ) ) .' '. $topic_item['title'];
 				}
 				
-				if ( ! is_array( $this->class_rss->rss_channels ) or ! count( $this->class_rss->rss_channels ) )
+				/* Build topic insert array */
+				$topic = array(
+								'title'            => IPSText::mbsubstr( $topic_item['title'], 0, 250 ),
+								'title_seo'		   => IPSText::makeSeoTitle( IPSText::mbsubstr( $topic_item['title'], 0, 250 ) ),
+								'state'            => $row['rss_import_topic_open'] ? 'open' : 'closed',
+								'posts'            => 0,
+								'starter_id'       => $member['member_id'],
+								'starter_name'     => $member['members_display_name'],
+								'start_date'       => $topic_item['unixdate'],
+								'last_poster_id'   => $member['member_id'],
+								'last_poster_name' => $member['members_display_name'],
+								'last_post'        => $topic_item['unixdate'],
+								'icon_id'          => 0,
+								'author_mode'      => 1,
+								'poll_state'       => 0,
+								'last_vote'        => 0,
+								'views'            => 0,
+								'forum_id'         => $row['rss_import_forum_id'],
+								'approved'         => $row['rss_import_topic_hide'] ? 0 : 1,
+								'pinned'           => 0,
+								'seo_last_name'	   => IPSText::makeSeoTitle( $member['members_display_name'] ),
+								'seo_first_name'   => IPSText::makeSeoTitle( $member['members_display_name'] ) );
+				
+				/* More post class stuff */
+				$this->post->setPublished( $row['rss_import_topic_hide'] ? FALSE : TRUE );
+				
+				/* Get editor */
+				$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+				$editor			= new $classToLoad();
+		
+				/* Sort post content: Convert HTML to BBCode */
+				IPSText::getTextClass('bbcode')->parse_smilies		= 1;
+				IPSText::getTextClass('bbcode')->parse_html			= intval($row['rss_import_allow_html']);
+				IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+				IPSText::getTextClass('bbcode')->parsing_section	= 'topics';
+
+				/* Force RTE */
+				$editor->setRteEnabled( true );
+
+				/* Clean up.. */
+				$topic_item['content'] = preg_replace( "#<br />(\r)?\n#is", "<br />", $topic_item['content'] );
+
+				/* Add in Show link... */
+				if ( $row['rss_import_showlink'] AND $topic_item['link'] )
 				{
-					$rss_error[] = sprintf( $this->lang->words['im_noopen'], $row['rss_import_url'] );
-					continue;
-				}
-				
-				/* Update last check time */
-				$this->DB->update( 'rss_import', array( 'rss_import_last_import' => time() ), 'rss_import_id='.$row['rss_import_id'] );
-				
-				/* Apparently so: Parse feeds and check for already imported GUIDs */
-				$final_items = array();
-				$items       = array();
-				$check_guids = array();
-				$final_guids = array();
-				$count       = 0;
-				
-				if ( ! is_array( $this->class_rss->rss_items ) or ! count( $this->class_rss->rss_items ) )
-				{
-					$rss_error[] = $row['rss_import_url'] . $this->lang->words['im_noimport'];
-					continue;
-				}
-				
-				/* Loop through the channels */
-				foreach ( $this->class_rss->rss_channels as $channel_id => $channel_data )
-				{
-					if ( is_array( $this->class_rss->rss_items[ $channel_id ] ) and count ($this->class_rss->rss_items[ $channel_id ] ) )
+					$the_link = str_replace( '{url}', trim($topic_item['link']), $row['rss_import_showlink'] );
+
+					if ( $row['rss_import_allow_html'] )
 					{
-						/* Loop through the items in this channel */
-						foreach( $this->class_rss->rss_items[ $channel_id ] as $item_data )
-						{
-							/* Item Data */
-							$item_data['content']  = $item_data['content']   ? $item_data['content']  : $item_data['description'];
-							$item_data['guid']     = md5( $row['rss_import_id'] . ( $item_data['guid'] ? $item_data['guid']     : preg_replace( "#\s|\r|\n#is", "", $item_data['title'].$item_data['link'].$item_data['description'] ) ) );
-							$item_data['unixdate'] = intval($item_data['unixdate'])  ? intval($item_data['unixdate']) : time();
-
-							/*  Convert char set? */
-							if ( $row['rss_import_charset'] AND ( strtolower(IPS_DOC_CHAR_SET) != strtolower($row['rss_import_charset']) ) )
-							{
-								$item_data['title']   = IPSText::convertCharsets( $item_data['title']  , $row['rss_import_charset'], IPS_DOC_CHAR_SET );
-								$item_data['content'] = IPSText::convertCharsets( $item_data['content'], $row['rss_import_charset'], IPS_DOC_CHAR_SET );
-							}
-
-							/* Dates */
-							if ( $item_data['unixdate'] < 1 )
-							{
-								$item_data['unixdate'] = time();
-							}
-							else if ( $item_data['unixdate'] > time() )
-							{
-								$item_data['unixdate'] = time();
-							}
-
-							/* Error check */
-							if ( ! $item_data['title'] OR ! $item_data['content'] )
-							{
-							 	$rss_error[] = sprintf( $this->lang->words['im_notitle'], $item_data['title'] );
-								continue;
-							}
-
-							/* Add to array */
-							$items[ $item_data['guid'] ] = $item_data;
-							$check_guids[]               = $item_data['guid'];
-						}
-					}
-				}
-
-				/* Check GUIDs */
-				if ( ! count( $check_guids ) )
-				{
-					$rss_error[] = $this->lang->words['im_noitems'];
-					continue;
-				}
-				
-				$this->DB->build( array( 'select' => '*', 'from' => 'rss_imported', 'where' => "rss_imported_guid IN ('".implode( "','", $check_guids )."')" ) );
-				$this->DB->execute();
-				
-				while ( $guid = $this->DB->fetch() )
-				{
-					$final_guids[ $guid['rss_imported_guid'] ] = $guid['rss_imported_guid'];
-				}
-				
-				/* Compare GUIDs */
-				$item_count = 0;
-				
-				foreach( $items as $guid => $data )
-				{
-					if ( in_array( $guid, $final_guids ) )
-					{
-						continue;
+						$_raw	= IPSText::getTextClass('bbcode')->preEditParse( stripslashes($the_link) );
+						
+						$the_link = "<br /><br />" . IPSText::getTextClass('bbcode')->preDbParse( $editor->process( $_raw ) );
 					}
 					else
 					{
-						$item_count++;
-						
-						/* Make sure each item has a unique date */
-						$final_items[ $data['unixdate'].$item_count ] = $data;
+						$the_link = "<br /><br />" . $the_link;
 					}
+					
+					$topic_item['content'] .= $the_link;
 				}
 
-				/* Sort Array */
-				krsort( $final_items );
-				
-				/* Pick off last X */
-				$count           = 1;
-				$tmp_final_items = $final_items;
-				$final_items     = array();
-				
-				foreach( $tmp_final_items as $date => $data )
+				if ( ! $row['rss_import_allow_html'] )
 				{
-					$final_items[ $date ] = $data;
-					
-					if ( $count >= $row['rss_import_pergo'] )
-					{
-						break;
-					}
-						
-					$count++;
-				}
+					$topic_item['content']	= stripslashes($topic_item['content']);//IPSText::getTextClass( 'bbcode' )->preEditParse( stripslashes($topic_item['content']) );
 
-				/* Anything left? */
-				if ( ! count( $final_items ) )
+					$post_content = IPSText::getTextClass('bbcode')->preDbParse( $editor->process( $topic_item['content'] ) );
+				}
+				else
 				{
-					continue;
+					$post_content = stripslashes($topic_item['content']);
 				}
+
+				/* Build Post insert array */
+				$post = array(
+								'author_id'      => $member['member_id'],
+								'use_sig'        => 1,
+								'use_emo'        => 1,
+								'ip_address'     => $member['ip_address'],
+								'post_date'      => $topic_item['unixdate'],
+								'icon_id'        => 0,
+								'post'           => $post_content,
+								'author_name'    => $member['members_display_name'],
+								'topic_id'       => 0,
+								'queued'         => 0,
+								'post_htmlstate' => intval($row['rss_import_allow_html']),
+							 );
+							 
+				/* Insert the topic into the database to get the last inserted value of the auto_increment field follow suit with the post */					
+				$this->DB->insert( 'topics', $topic );
 				
-				/* Figure out MID */
-				$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, name, members_display_name, ip_address', 'from' => 'members', 'where' => "member_id={$row['rss_import_mid']}" ) );
+				$post['topic_id']  = $this->DB->getInsertId();
+				$topic['tid']      = $post['topic_id'];
 				
-				if ( ! $member['member_id'] )
+				/* Update the post info with the upload array info */
+				$post['post_key']  = md5( uniqid( microtime() ) );
+				$post['new_topic'] = 1;
+				
+				/* Add post to DB */
+				$this->DB->insert( 'posts', $post );
+			
+				$post['pid'] = $this->DB->getInsertId();
+				
+				/* Update topic with firstpost ID */
+				$this->DB->update( 'topics', array( 'topic_firstpost' => $post['pid'] ), 'tid=' . $topic['tid'] );
+									
+				/* Insert GUID match */
+				$this->DB->insert( 'rss_imported', array( 
+															'rss_imported_impid' => $row['rss_import_id'],
+															'rss_imported_guid'  => $topic_item['guid'],
+															'rss_imported_tid'   => $topic['tid'] 
+									)	 );
+			
+				/* Are we tracking this forum? If so generate some mailies - yay! */
+				$this->post->forum = $this->registry->class_forums->forum_by_id[$row['rss_import_forum_id']];
+
+				$this->post->sendOutTrackedForumEmails( $row['rss_import_forum_id'], $topic['tid'], $topic['title'], $this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]['name'], $post['post'], $member['member_id'], $member['members_display_name'] );
+				
+				if( $topic['approved'] == 0 )
 				{
-					continue;
+					$this->post->sendNewTopicForApprovalEmails( $topic['tid'], $topic['title'], $topic['starter_name'], $post['pid'] );
 				}
 				
-				/* Set member in post class */
-				$this->post->setAuthor( $member['member_id'] );
-				$this->post->setForumData( $this->registry->getClass('class_forums')->forum_by_id[ $row['rss_import_forum_id'] ] );
+				$this->import_count++;
 				
-				/* Make 'dem posts */
-				$affected_forum_ids[] = $row['rss_import_forum_id'];
-				
-				foreach( $final_items as $topic_item )
+				/* Increment user? */
+				if ( $row['rss_import_inc_pcount'] AND $this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]['inc_postcount'] )
 				{
-					/* Fix &amp; */
-					$topic_item['title'] = str_replace( '&amp;', '&', $topic_item['title'] );
-					$topic_item['title'] = str_replace( array( "\r", "\n" ), ' ', $topic_item['title'] );
-					$topic_item['title'] = str_replace( array( "<br />", "<br>" ), ' ', $topic_item['title'] );
-					$topic_item['title'] = trim( $topic_item['title'] );
-					$topic_item['title'] = strip_tags( $topic_item['title'] );
-					$topic_item['title'] = IPSText::parseCleanValue( $topic_item['title'] );
-					
-					/* Fix up &amp;reg; */
-					$topic_item['title'] = str_replace( '&amp;reg;', '&reg;', $topic_item['title'] );
-					
-					if( $row['rss_import_topic_pre'] )
+					if ( ! $affected_members[ $member['member_id'] ] OR $affected_members[ $member['member_id'] ] < 0 )
 					{
-						$topic_item['title'] = str_replace( '&nbsp;', ' ', str_replace( '&amp;nbsp;', '&nbsp;', $row['rss_import_topic_pre'] ) ) .' '. $topic_item['title'];
+						$affected_members[ $member['member_id'] ] = 0;
 					}
 					
-					/* Build topic insert array */
-					$topic = array(
-									'title'            => IPSText::mbsubstr( $topic_item['title'], 0, 250 ),
-									'title_seo'		   => IPSText::makeSeoTitle( IPSText::mbsubstr( $topic_item['title'], 0, 250 ) ),
-									'description'      => '' ,
-									'state'            => $row['rss_import_topic_open'] ? 'open' : 'closed',
-									'posts'            => 0,
-									'starter_id'       => $member['member_id'],
-									'starter_name'     => $member['members_display_name'],
-									'start_date'       => $topic_item['unixdate'],
-									'last_poster_id'   => $member['member_id'],
-									'last_poster_name' => $member['members_display_name'],
-									'last_post'        => $topic_item['unixdate'],
-									'icon_id'          => 0,
-									'author_mode'      => 1,
-									'poll_state'       => 0,
-									'last_vote'        => 0,
-									'views'            => 0,
-									'forum_id'         => $row['rss_import_forum_id'],
-									'approved'         => $row['rss_import_topic_hide'] ? 0 : 1,
-									'pinned'           => 0,
-									'seo_last_name'	   => IPSText::makeSeoTitle( $member['members_display_name'] ),
-  									'seo_first_name'   => IPSText::makeSeoTitle( $member['members_display_name'] ) );
-					
-					/* More post class stuff */
-					$this->post->setPublished( $row['rss_import_topic_hide'] ? FALSE : TRUE );
-					
-					/* Sort post content: Convert HTML to BBCode */
-					IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-					IPSText::getTextClass( 'bbcode' )->parse_html		= intval($row['rss_import_allow_html']);
-					IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-					IPSText::getTextClass( 'bbcode' )->parsing_section	= 'topics';
-
-					$this->memberData['_canUseRTE']						= true;
-					$_POST['ed-0_wysiwyg_used']							= 1;
-					IPSText::getTextClass( 'editor' )->method			= 'rte';
-
-					/* Clean up.. */
-					$topic_item['content'] = preg_replace( "#<br />(\r)?\n#is", "<br />", $topic_item['content'] );
-
-					/* Add in Show link... */
-					if ( $row['rss_import_showlink'] AND $topic_item['link'] )
-					{
-						$the_link = str_replace( '{url}', trim($topic_item['link']), $row['rss_import_showlink'] );
-
-						if ( $row['rss_import_allow_html'] )
-						{
-							$_POST['_tmpPostField']	= IPSText::getTextClass( 'bbcode' )->preEditParse( stripslashes($the_link) );
-							
-							$the_link = "<br /><br />" . IPSText::getTextClass( 'bbcode' )->preDbParse( IPSText::getTextClass( 'editor' )->processRawPost( '_tmpPostField' ) );
-						}
-						else
-						{
-							$the_link = "<br /><br />" . $the_link;
-						}
-						
-						$topic_item['content'] .= $the_link;
-					}
-
-					if ( ! $row['rss_import_allow_html'] )
-					{
-						$_POST['_tmpPostField']	= stripslashes($topic_item['content']);//IPSText::getTextClass( 'bbcode' )->preEditParse( stripslashes($topic_item['content']) );
-
-						$post_content = IPSText::getTextClass( 'bbcode' )->preDbParse( IPSText::getTextClass( 'editor' )->processRawPost( '_tmpPostField' ) );
-					}
-					else
-					{
-						$post_content = stripslashes($topic_item['content']);
-					}
-
-					/* Build Post insert array */
-					$post = array(
-									'author_id'      => $member['member_id'],
-									'use_sig'        => 1,
-									'use_emo'        => 1,
-									'ip_address'     => $member['ip_address'],
-									'post_date'      => $topic_item['unixdate'],
-									'icon_id'        => 0,
-									'post'           => $post_content,
-									'author_name'    => $member['members_display_name'],
-									'topic_id'       => "",
-									'queued'         => 0,
-									'post_htmlstate' => 0,
-								 );
-								 
-					/* Insert the topic into the database to get the last inserted value of the auto_increment field follow suit with the post */					
-					$this->DB->insert( 'topics', $topic );
-					
-					$post['topic_id']  = $this->DB->getInsertId();
-					$topic['tid']      = $post['topic_id'];
-					
-					/* Update the post info with the upload array info */
-					$post['post_key']  = md5( uniqid( microtime() ) );
-					$post['new_topic'] = 1;
-					
-					/* Add post to DB */
-					$this->DB->insert( 'posts', $post );
-				
-					$post['pid'] = $this->DB->getInsertId();
-					
-					/* Update topic with firstpost ID */
-					$this->DB->build( array( 
-													'update' => 'topics',
-													'set'    => "topic_firstpost=".$post['pid'],
-													'where'  => "tid=".$topic['tid']
-										)      );
-										 
-					$this->DB->execute();
-										
-					/* Insert GUID match */
-					$this->DB->insert( 'rss_imported', array( 
-																'rss_imported_impid' => $row['rss_import_id'],
-																'rss_imported_guid'  => $topic_item['guid'],
-																'rss_imported_tid'   => $topic['tid'] 
-										)	 );
-				
-					/* Are we tracking this forum? If so generate some mailies - yay! */
-					$this->post->forum = $this->registry->class_forums->forum_by_id[$row['rss_import_forum_id']];
-
-					$this->post->sendOutTrackedForumEmails( $row['rss_import_forum_id'], $topic['tid'], $topic['title'], $this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]['name'], $post['post'], $member['member_id'], $member['members_display_name'] );
-					
-					if( $topic['approved'] == 0 )
-					{
-						$this->post->sendNewTopicForApprovalEmails( $topic['tid'], $topic['title'], $topic['starter_name'], $post['pid'] );
-					}
-					
-					$this->import_count++;
-					
-					/* Increment user? */
-					if ( $row['rss_import_inc_pcount'] AND $this->registry->class_forums->forum_by_id[ $row['rss_import_forum_id'] ]['inc_postcount'] )
-					{
-						if ( ! $affected_members[ $member['member_id'] ] OR $affected_members[ $member['member_id'] ] < 0 )
-						{
-							$affected_members[ $member['member_id'] ] = 0;
-						}
-						
-						$affected_members[ $member['member_id'] ]++;
-					}
+					$affected_members[ $member['member_id'] ]++;
 				}
- 			}
+			}
 		}
 		
 		/* Update Members */
@@ -1096,7 +1051,7 @@ class admin_forums_rss_import extends ipsCommand
 				$this->func_mod->forumRecount( $fid );
 			}
 			
-			$this->func_mod->statsRecount();
+			$this->cache->rebuildCache( 'stats', 'global' );
 		}
 		
 		/* Return */
@@ -1145,18 +1100,15 @@ class admin_forums_rss_import extends ipsCommand
 			$rss_import_topic_hide = intval( $this->request['rss_import_topic_hide'] );
 			$rss_import_inc_pcount = intval( $this->request['rss_import_inc_pcount'] );
 			$rss_import_topic_pre  = $this->request['rss_import_topic_pre'];
-			$rss_import_charset    = $this->request['rss_import_charset'];
 			$rss_import_allow_html = intval( $this->request['rss_import_allow_html'] );
 			$rss_import_auth	   = intval( $this->request['rss_import_auth'] );
-			$rss_import_auth_user  = trim( $this->request['rss_import_auth_user'] ) ? trim( $this->request['rss_import_auth_user'] ) : 'Not Needed';
-			$rss_import_auth_pass  = trim( $this->request['rss_import_auth_pass'] ) ? trim( $this->request['rss_import_auth_pass'] ) : 'Not Needed';
+			$rss_import_auth_user  = trim( $this->request['rss_import_auth_user'] ) ? trim( $this->request['rss_import_auth_user'] ) : '';
+			$rss_import_auth_pass  = trim( $this->request['rss_import_auth_pass'] ) ? trim( $this->request['rss_import_auth_pass'] ) : '';
 			
 			$return				   = 1;
 		}
 		else
 		{
-			$return = 0;
-			
 			/* Get the RSS ID */
 			$rss_input_id = $this->request['rss_id'] ? intval($this->request['rss_id']) : 0;
 			
@@ -1187,7 +1139,6 @@ class admin_forums_rss_import extends ipsCommand
 					
 					$rss_import_forum_id   = intval( $rss_data['rss_import_forum_id'] );
 					$rss_import_inc_pcount = intval( $rss_data['rss_import_inc_pcount'] );
-					$rss_import_charset    = $rss_data['rss_import_charset'];
 					$rss_import_auth	   = intval( $rss_data['rss_import_auth'] );
 					$rss_import_auth_user  = trim( $rss_data['rss_import_auth_user'] );
 					$rss_import_auth_pass  = trim( $rss_data['rss_import_auth_pass'] );
@@ -1197,7 +1148,6 @@ class admin_forums_rss_import extends ipsCommand
 			else
 			{
 				$rss_import_url 		= IPSText::stripslashes( trim( $this->request['rss_url'] ) );
-				$rss_import_charset 	= IPS_DOC_CHAR_SET;
 				$rss_import_auth		= "";
 				$rss_import_auth_user 	= "";
 				$rss_import_auth_pass 	= "";				
@@ -1219,8 +1169,6 @@ class admin_forums_rss_import extends ipsCommand
 				{
 					$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
 					$this->class_rss               =  new $classToLoad();
-					
-					$this->class_rss->use_sockets  =  $this->use_sockets;
 					$this->class_rss->rss_max_show =  100;
 				}
 				
@@ -1228,17 +1176,7 @@ class admin_forums_rss_import extends ipsCommand
 			}
 			
 			/* Set this imports doc type */
-			$this->class_rss->doc_type 		= IPS_DOC_CHAR_SET;
-			$this->class_rss->feed_charset 	= IPS_DOC_CHAR_SET;
-			
-			if( strtolower( $rss_import_charset ) != IPS_DOC_CHAR_SET )
-			{
-				$this->class_rss->convert_charset = 1;
-			}
-			else
-			{
-				$this->class_rss->convert_charset = 0;
-			}
+			$this->class_rss->doc_type 		= strtoupper(IPS_DOC_CHAR_SET);
 			
 			/* Set this import's authentication */		
 			$this->class_rss->auth_req = $rss_import_auth;				
@@ -1261,13 +1199,13 @@ class admin_forums_rss_import extends ipsCommand
 				if( $this->class_rss->classFileManagement->http_status_code )
 				{
 					$this->validate_msg[] =	$this->html->rssValidateMsg( array( 'class' => 'rss-feed-invalid', 
-																				  'msg' => "{$this->lang->words['im_http']} {$this->class_rss->classFileManagement->http_status_code} ({$this->class_rss->class_file_management->http_status_text})" ) );
+																				  'msg' => "{$this->lang->words['im_http']} {$this->class_rss->classFileManagement->http_status_code} ({$this->class_rss->classFileManagement->http_status_text})" ) );
 				}
 			}
 			else
 			{
 				$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-valid', 
-																			  'msg' => "{$this->lang->words['im_http']} {$this->class_rss->classFileManagement->http_status_code} ({$this->class_rss->class_file_management->http_status_text})" ) );
+																			  'msg' => "{$this->lang->words['im_http']} {$this->class_rss->classFileManagement->http_status_code} ({$this->class_rss->classFileManagement->http_status_text})" ) );
 			}
 			
 			/* Display any errors found */
@@ -1280,33 +1218,6 @@ class admin_forums_rss_import extends ipsCommand
 			}
 			else
 			{
-				if( $this->class_rss->orig_doc_type )
-				{
-					if( !$standalone AND $rss_import_charset )
-					{
-						if( strtolower($rss_import_charset) != strtolower($this->class_rss->orig_doc_type) )
-						{
-							$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-invalid', 
-																						  'msg' => sprintf( $this->lang->words['im_doc_type'], $this->class_rss->orig_doc_type, $rss_import_charset ) ) );
-						}
-						else
-						{
-							$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-valid', 
-																						  'msg' => sprintf ( $this->lang->words['im_charset_cor'], $this->class_rss->orig_doc_type ) ) );
-						}
-					}
-					else
-					{
-						$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-valid', 
-																					  'msg' => sprintf( $this->lang->words['im_charset'], $this->class_rss->orig_doc_type ) ) );
-					}
-				}
-				else
-				{
-					$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-invalid', 
-																				  'msg' => $this->lang->words['im_nocharset'] ) );
-				}
-				
 				/* Channels */
 				if ( ! is_array( $this->class_rss->rss_channels ) or ! count( $this->class_rss->rss_channels ) )
 				{
@@ -1346,7 +1257,7 @@ class admin_forums_rss_import extends ipsCommand
 										$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-msg', 
 																									  'msg' => $this->lang->words['im_invdate'] ) );
 									}
-									else if ( $item_data['unixdate'] > time() )
+									else if ( $item_data['unixdate'] > IPS_UNIX_TIME_NOW )
 									{
 										$this->validate_msg[] = $this->html->rssValidateMsg( array( 'class' => 'rss-feed-msg',
 																									  'msg' => $this->lang->words['im_invdate'] ) );
@@ -1421,7 +1332,7 @@ class admin_forums_rss_import extends ipsCommand
 			{
 				if( count( $this->validate_msg ) )
 				{
-					$this->registry->output->global_message = sprintf( $this->lang->words['im_valresults'], IPSText::stripslashes( trim( $this->request['rss_import_url'] ) ), implode( "<br />&nbsp;&middot;", $this->validate_msg ) );
+					$this->registry->output->setMessage( sprintf( $this->lang->words['im_valresults'], IPSText::stripslashes( trim( $rss_import_url ) ), implode( "<br />&nbsp;&middot;", $this->validate_msg ) ), 1 );
 					$this->rssImportOverview();
 					return;
 				}
diff --git a/upload/admin/applications/forums/modules_admin/rss/index.html b/upload/admin/applications/forums/modules_admin/rss/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/rss/index.html
+++ b/upload/admin/applications/forums/modules_admin/rss/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/rss/xml/index.html b/upload/admin/applications/forums/modules_admin/rss/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/rss/xml/index.html
+++ b/upload/admin/applications/forums/modules_admin/rss/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/rss/xml/menu.xml b/upload/admin/applications/forums/modules_admin/rss/xml/menu.xml
index 9d15c90b..ac201803 100644
--- a/upload/admin/applications/forums/modules_admin/rss/xml/menu.xml
+++ b/upload/admin/applications/forums/modules_admin/rss/xml/menu.xml
@@ -6,9 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Импорт RSS</subitemtitle>
+					<subitemlang>rssimports</subitemlang>
 					<subsection>import</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>import_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Эк�порт RSS</subitemtitle>
+					<subitemlang>rssexports</subitemlang>
 					<subsection>export</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>export_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/forums/modules_admin/rss/xml/permissions.xml b/upload/admin/applications/forums/modules_admin/rss/xml/permissions.xml
index 9af77a43..f000eb6d 100644
--- a/upload/admin/applications/forums/modules_admin/rss/xml/permissions.xml
+++ b/upload/admin/applications/forums/modules_admin/rss/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление RSS</grouptitle>
+		<grouplang>forums_rss</grouplang>
 		<items>
 			<item>
 				<key>export_manage</key>
diff --git a/upload/admin/applications/forums/modules_admin/statistics/defaultSection.php b/upload/admin/applications/forums/modules_admin/statistics/defaultSection.php
index 8afe7389..5fe816f4 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/defaultSection.php
+++ b/upload/admin/applications/forums/modules_admin/statistics/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section file for statistics module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'statistics' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'stats';
diff --git a/upload/admin/applications/forums/modules_admin/statistics/index.html b/upload/admin/applications/forums/modules_admin/statistics/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/index.html
+++ b/upload/admin/applications/forums/modules_admin/statistics/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/statistics/stats.php b/upload/admin/applications/forums/modules_admin/statistics/stats.php
index 4d53e2a7..cda7eb0c 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/stats.php
+++ b/upload/admin/applications/forums/modules_admin/statistics/stats.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum Statistics
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-09-06 06:56:14 -0400 (Tue, 06 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6854 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9456 $
  */
 
 
@@ -28,7 +28,6 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	* Array of Month Names
 	*
-	* @access	private
 	* @var		array
 	*/		
 	protected $month_names;
@@ -36,7 +35,6 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	* Skin object
 	*
-	* @access	private
 	* @var		object			Skin templates
 	*/	
 	protected $html;	
@@ -44,9 +42,8 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	* Main class entry point
 	*
-	* @access	public
 	* @param	object		ipsRegistry reference
-	* @return	void		[Outputs to screen]
+	* @return	@e void		[Outputs to screen]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -78,9 +75,37 @@ class admin_forums_statistics_stats extends ipsCommand
 		$this->registry->output->ignoreCoreNav	= true;
 		$this->registry->output->core_nav[]		= array( $this->settings['base_url'] . 'module=statistics', $this->lang->words['stats_title'] );
 		
+		/* Silly timezones */
+		$tz = floor( $this->memberData['time_offset'] );
+		$this->DB->setTimeZone( $tz );
+		if ( $tz ==  0 )
+		{
+			date_default_timezone_set( 'GMT' );
+		}
+		elseif ( $tz > 0 )
+		{				
+			date_default_timezone_set( 'Etc/GMT-' . $tz );
+		}
+		elseif ( $tz < 0 )
+		{				
+			date_default_timezone_set( 'Etc/GMT+' . abs( $tz ) );
+		}
+		
 		/* What to do */
 		switch( $this->request['do'] )
-		{			
+		{
+			case 'spam':
+				$this->statsMainScreen( 'spam' );
+			break;
+			
+			case 'show_spam':
+				$this->spamServiceResultScreen();
+			break;
+			
+			case 'spamGraph':
+				$this->spamServiceGraph();
+			break;
+			
 			case 'show_reg':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'stats_registration' );
 				$this->result_screen( 'reg' );
@@ -145,20 +170,283 @@ class admin_forums_statistics_stats extends ipsCommand
 		$this->registry->output->sendOutput();
 	}
 	
+	/**
+	 * Print a 1x1 transparent gif and safely exist
+	 *
+	 * @return	@e void
+	 */
+	protected function _safeExit()
+	{
+		$content	= base64_decode( "R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" );
+		header( "Content-type: image/gif" );
+		header( "Connection: Close" );
+		header( "Cache-Control:  public, max-age=86400" );
+		header( "Expires: " . gmdate( "D, d M Y, H:i:s", time() + 86400 ) . " GMT" );
+		print $content;
+		flush();
+		exit;
+	}
+	
 	/**
 	 * Display a graph of spam service stats
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
+	public function spamServiceGraph()
+	{
+		/* Check the to fields */
+		if ( ! checkdate( $this->request['to_month'], $this->request['to_day'], $this->request['to_year'] ) )
+		{
+			$this->_safeExit();
+		}
+		
+		/* Check the from fields */
+		if ( ! checkdate( $this->request['from_month'] ,$this->request['from_day'] ,$this->request['from_year'] ) )
+		{
+			$this->_safeExit();
+		}
+		
+		/* Create time stamps */
+		$to_time   = mktime(12 ,0 ,0 ,$this->request['to_month']   ,$this->request['to_day']   ,$this->request['to_year']  );
+		$from_time = mktime(12 ,0 ,0 ,$this->request['from_month'] ,$this->request['from_day'] ,$this->request['from_year']);
+		
+		/* Get Human Dates */
+		$human_to_date   = getdate( $to_time );
+		$human_from_date = getdate( $from_time );
+
+		/* Setup Timescale */
+	  	switch( $this->request['timescale'] )
+	  	{
+	  		case 'daily':
+		  		$php_date = "F jS - Y";
+		  		break;
+		  		
+		  	case 'monthly':
+		  	    $php_date = "F Y";
+		  	    break;
+		  	    
+		  	default:
+		  		$php_date = "W [F Y]";
+		  		break;
+		}
+		
+		$order = $this->request['sortby'] == 'desc' ? 'desc' : 'asc';
+		
+		/* Query Spam Logs */
+		$this->DB->build( array( 
+								'select'	=> 'log_code, log_date', 
+								'from'		=> 'spam_service_log', 
+								'where'		=> 'log_date > ' . $from_time . ' AND log_date < ' . $to_time,
+								'order'		=> 'log_date ' . $order
+						)	);
+		$this->DB->execute();
+		
+		/* Make sure we have logs */
+		if( ! $this->DB->getTotalRows() )
+		{
+			$this->_safeExit();
+		}
+		
+		/* Loop through and build data for two graph lines */
+		$notSpamData	= array();
+		$isSpamData		= array();
+		$labels			= array();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			/* Ignore errors */
+			if( $r['log_code'] == 0 )
+			{
+				continue;
+			}
+			
+			/* Date */
+			$logDate = date( $php_date, $r['log_date'] );
+			
+			if( ! in_array( $logDate, $labels ) )
+			{
+				$labels[] = $logDate;
+			}
+			
+			if( ! isset( $notSpamData[ $logDate ] ) )
+			{
+				$notSpamData[ $logDate ] = 0;
+			}
+			
+			if( ! isset( $isSpamData[ $logDate ] ) )
+			{
+				$isSpamData[ $logDate ] = 0;
+			}
+			
+			if( $r['log_code'] == 1 )
+			{
+				$notSpamData[ $logDate ]++;
+			}
+			else if( in_array( $r['log_code'], array( 2, 3, 4 ) ) )
+			{
+				$isSpamData[ $logDate ]++;
+			}
+		}
+		
+		if( !count($notSpamData) AND !count($isSpamData) )
+		{
+			$this->_safeExit();
+		}
+
+		/* Table Title */
+		$title = $this->lang->words[ 'timescale_' . $this->request['timescale'] ] ." {$this->lang->words['stats_spam']} ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} {$this->lang->words['stats_to']} {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})";
+
+		/* Get the Graph Class */
+		require_once( IPS_KERNEL_PATH . 'classGraph.php' );/*noLibHook*/
+		
+		/* Graph Ooptions */
+		$graph = new classGraph( false );
+		$graph->options['title']			= $title;
+		$graph->options['width']			= 800;
+		$graph->options['height']			= 480;
+		$graph->options['style3D']			= 0;
+		$graph->options['charttype']		= 'Line';
+		$graph->options['font']				= IPS_PUBLIC_PATH . 'style_captcha/captcha_fonts/Sathu.ttf';
+
+		/* Build Graph */
+		$graph->addLabels( $labels );
+		$graph->addSeries( $this->lang->words['statisnotspam'], array_values( $notSpamData ) );
+		$graph->addSeries( $this->lang->words['statisspam'], array_values( $isSpamData ) );
+
+		$graph->display();
+
+		exit();
+	}
+	
+	/**
+	 * Display spam service stats
+	 *
+	 * @return	@e void
+	 */
+	public function spamServiceResultScreen()
+	{
+		/* Check the to fields */
+		if ( ! checkdate( $this->request['to_month'], $this->request['to_day'], $this->request['to_year'] ) )
+		{
+			$this->registry->output->showError( $this->lang->words['stats_toincorrect'], 11352 );
+		}
+		
+		/* Check the from fields */
+		if ( ! checkdate( $this->request['from_month'] ,$this->request['from_day'] ,$this->request['from_year'] ) )
+		{
+			$this->registry->output->showError( $this->lang->words['stats_fromincorrect'], 11353 );
+		}
+		
+		/* Create time stamps */
+		$to_time   = mktime(12 ,0 ,0 ,$this->request['to_month']   ,$this->request['to_day']   ,$this->request['to_year']  );
+		$from_time = mktime(12 ,0 ,0 ,$this->request['from_month'] ,$this->request['from_day'] ,$this->request['from_year']);
+		
+		/* Get Human Dates */
+		$human_to_date   = getdate( $to_time );
+		$human_from_date = getdate( $from_time );
+		
+		/* Setup Timescale */
+	  	switch( $this->request['timescale'] )
+	  	{
+	  		case 'daily':
+		  		$php_date = "F jS - Y";
+		  		break;
+		  		
+		  	case 'monthly':
+		  	    $php_date = "F Y";
+		  	    break;
+		  	    
+		  	default:
+		  		$php_date = "W [F Y]";
+		  		break;
+		}
+		
+		$order = $this->request['sortby'] == 'desc' ? 'desc' : 'asc';
+		
+		/* Query Spam Logs */
+		$this->DB->build( array( 
+								'select'	=> 'log_code, log_date', 
+								'from'		=> 'spam_service_log', 
+								'where'		=> 'log_date > ' . $from_time . ' AND log_date < ' . $to_time,
+								'order'		=> 'log_date ' . $order
+						)	);
+		$this->DB->execute();
+		
+		$results	= array();
+		$total		= 0;
+		
+		while( $r = $this->DB->fetch() )
+		{
+			/* Skip errors */
+			if( $r['log_code'] == 0 )
+			{
+				continue;
+			}
+			
+			/* Key */
+			if( $r['log_code'] == 1 )
+			{
+				$arrayKey = 'notspam';
+			}
+			else if( in_array( $r['log_code'], array( 2, 3, 4 ) ) )
+			{
+				$arrayKey = 'spam';
+			}
+
+			$results[ date( $php_date, $r['log_date'] ) ][ $arrayKey ]++;
+			$total++;
+		}
+		
+		/* Figure out max result */
+		$max_result = 0;
+		
+		foreach( $results as $k => $v )
+		{
+			$_max = ( $v['spam'] > $v['notspam'] ) ? $v['spam'] : $v['notspam'];
+
+			if( $_max > $max_result )
+			{
+				$max_result = $_max;
+			}
+		}
+
+		/* Build the output rows */
+		$rows = array();
+			
+		foreach( $results as $dateVal => $stats )
+		{
+			/* INIT */
+			$newStats = array();
+			
+			/* Width of the bars */
+			$newStats['spam']['_width']		= intval( ( $stats['spam'] / $max_result ) * 100 - 8 );
+			$newStats['notspam']['_width']	= intval( ( $stats['notspam'] / $max_result ) * 100 - 8 );
+			
+			$newStats['spam']['_width'] 	= $newStats['spam']['_width'] < 0 ? 1 : $newStats['spam']['_width'];
+			$newStats['notspam']['_width'] 	= $newStats['notspam']['_width'] < 0 ? 1 : $newStats['notspam']['_width'];
+			
+			
+			/* Save Count */
+			$newStats['spam']['count']		= $stats['spam'] ? $stats['spam'] : 0;
+			$newStats['notspam']['count']	= $stats['notspam'] ? $stats['notspam'] : 0;
+			
+			$rows[$dateVal] = $newStats;
+		}
+
+		/* Table Title */
+		$title = $this->lang->words[ 'timescale_' . $this->request['timescale'] ] ." {$this->lang->words['stats_spam']} ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} {$this->lang->words['stats_to']} {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})";
+		
+		/* Navigation */
+		$this->registry->output->extra_nav[]     = array( '', $this->lang->words['stats_spam'] );
+		return $this->registry->output->html .= $this->html->spamServiceStats( $title, $rows, $total );
+	}
 	
 	/**
 	 * Display statistics for the selected mode
 	 *
-	 * @access	public
 	 * @param	string	Type of stat screen reg, topic, post, msg	 
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function result_screen($mode='reg')
 	{
 		/* Check the to fields */
@@ -331,15 +619,19 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	 * Date Selection Screen
 	 *
-	 * @access	public
 	 * @param	string	Type of stat screen reg, topic, post, msg, views
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function statsMainScreen( $mode='reg' )
 	{
 		/* Setup this mode */
 		switch( $mode )
 		{
+			case 'spam':
+				$form_code	= 'show_spam';
+				$table		= $this->lang->words['stats_spam'];
+			break;
+			
 			case 'reg':
 				$form_code = 'show_reg';
 				$table     = $this->lang->words['stats_reg'];
@@ -364,6 +656,8 @@ class admin_forums_statistics_stats extends ipsCommand
 			default:
 				$form_code = 'statsShowTopicViews';
 				$table     = $this->lang->words['stats_views'];
+				
+				$this->registry->output->setMessage( $this->lang->words['topic_view_warning'], 1 );
 			break;			
 		}
 
@@ -393,9 +687,8 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	 * Show topic view stats
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function statsShowTopicViews()
 	{
 		/* Check the to fields */
@@ -495,9 +788,8 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	 * Create the drop down options for the year select
 	 *
-	 * @access	public
 	 * @return	array
-	 **/
+	 */
 	public function statsMakeYear()
 	{
 		$time_now = getdate();
@@ -524,9 +816,8 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	 * Create the drop down options for the month select
 	 *
-	 * @access	public
 	 * @return	array
-	 **/
+	 */
 	public function statsMakeMonth()
 	{
 		$return = array();
@@ -542,9 +833,8 @@ class admin_forums_statistics_stats extends ipsCommand
 	/**
 	 * Create the drop down options for the day select
 	 *
-	 * @access	public
 	 * @return	array
-	 **/
+	 */
 	public function statsMakeDay()
 	{
 		$return = array();
diff --git a/upload/admin/applications/forums/modules_admin/statistics/xml/index.html b/upload/admin/applications/forums/modules_admin/statistics/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/xml/index.html
+++ b/upload/admin/applications/forums/modules_admin/statistics/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/statistics/xml/menu.xml b/upload/admin/applications/forums/modules_admin/statistics/xml/menu.xml
index 6b1694ec..7494559e 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/xml/menu.xml
+++ b/upload/admin/applications/forums/modules_admin/statistics/xml/menu.xml
@@ -6,9 +6,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика реги�траций</subitemtitle>
+					<subitemlang>stats_reg</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=reg</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>stats_registration</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика �оздани� тем</subitemtitle>
+					<subitemlang>stats_topics</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=topic</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>stats_topics</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -30,9 +32,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика отправки �ообщений</subitemtitle>
+					<subitemlang>stats_posts</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=post</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>stats_posts</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -42,9 +45,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика и�пользовани� ЛС</subitemtitle>
+					<subitemlang>stats_pms</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=msg</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>stats_msg</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -54,8 +58,22 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Стати�тика про�мотров тем</subitemtitle>
+					<subitemlang>stats_tviews</subitemlang>
 					<subsection>stats</subsection>
 					<subitemurl>do=views</subitemurl>
+					<subitemrolekey>stats_views</subitemrolekey>
+					<subisredirect>0</subisredirect>
+				</subitem>
+			</subitems>
+		</item>
+		<item>
+			<title>�нти�пам �ерви�</title>
+			<subitems>
+				<subitem>
+					<subitemtitle>Стати�тика анти�пам �ерви�а</subitemtitle>
+					<subitemlang>stats_spam</subitemlang>
+					<subsection>stats</subsection>
+					<subitemurl>do=spam</subitemurl>
 					<subitemrolekey></subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
diff --git a/upload/admin/applications/forums/modules_admin/statistics/xml/permissions.xml b/upload/admin/applications/forums/modules_admin/statistics/xml/permissions.xml
index 0820947c..d8a4eb93 100644
--- a/upload/admin/applications/forums/modules_admin/statistics/xml/permissions.xml
+++ b/upload/admin/applications/forums/modules_admin/statistics/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление �тати�тикой</grouptitle>
+		<grouplang>forums_stats</grouplang>
 		<items>
 			<item>
 				<key>stats_topics</key>
diff --git a/upload/admin/applications/forums/modules_admin/tools/defaultSection.php b/upload/admin/applications/forums/modules_admin/tools/defaultSection.php
index a8f8e04e..25550aff 100644
--- a/upload/admin/applications/forums/modules_admin/tools/defaultSection.php
+++ b/upload/admin/applications/forums/modules_admin/tools/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section for tools module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'tools' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'tools';
diff --git a/upload/admin/applications/forums/modules_admin/tools/index.html b/upload/admin/applications/forums/modules_admin/tools/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/tools/index.html
+++ b/upload/admin/applications/forums/modules_admin/tools/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/tools/tools.php b/upload/admin/applications/forums/modules_admin/tools/tools.php
index d68ca7ff..dfa5628f 100644
--- a/upload/admin/applications/forums/modules_admin/tools/tools.php
+++ b/upload/admin/applications/forums/modules_admin/tools/tools.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member management
- * Last Updated: $Date: 2010-10-14 10:29:53 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6978 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,50 +31,36 @@ class admin_forums_tools_tools extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
-	 /**
+	/**
 	 * Editor object
 	 *
-	 * @access	private
 	 * @var		object			Editor library
 	 */
-	private $han_editor;
+	protected $han_editor;
 
-	/**
-	 * Trash can forum id
-	 *
-	 * @access	private
-	 * @var		integer			Trash can forum
-	 */
-	private $trash_forum		= 0;
-
-	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -123,11 +109,6 @@ class admin_forums_tools_tools extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'ftools_deleteposts' );
 				$this->_deletePostsDo();
 			break;
-			
-			case 'new_avatar':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_photo', 'members', 'members' );
-				$this->_processAvatar();
-			break;
 		}
 		
 		//-----------------------------------------
@@ -142,12 +123,11 @@ class admin_forums_tools_tools extends ipsCommand
 	/**
 	 * Delete a forum's email subscriptions
 	 * 
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @author	Brandon Farber
 	 * @since	IPB3 / 22 Oct 2008
 	 */
-	private function _deleteForumSubscriptions()
+	protected function _deleteForumSubscriptions()
 	{
 		/**
 		 * Get members watching forums so we can recache em..
@@ -155,16 +135,21 @@ class admin_forums_tools_tools extends ipsCommand
 		$forum_id	= intval( $this->request['f'] );
 		$members	= array();
 		
-		$this->DB->build( array( 'select' => 'member_id', 'from' => 'forum_tracker', 'where' => 'forum_id=' . $forum_id ) );
+		$this->DB->build( array( 'select' => 'like_member_id', 'from' => 'core_like', 'where' => "like_app='forums' AND like_area='forums' AND like_rel_id=" . $forum_id ) );
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$members[]	= $r['member_id'];
+			$members[]	= $r['like_member_id'];
 		}
 		
-		$this->DB->delete( 'forum_tracker', 'forum_id=' . $forum_id );
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'forums' );
+		$_like->remove( $forum_id );
 		
+		/**
+		 * Recache members
+		 */
 		foreach( $members as $mid )
 		{
 			$this->registry->getClass('class_forums')->recacheWatchedForums( $mid );
@@ -175,111 +160,61 @@ class admin_forums_tools_tools extends ipsCommand
 		 */
 		$toDelete	= array();
 		
-		$this->DB->build( array( 'select'		=> 'tr.trid',
-									'from'		=> array( 'tracker' => 'tr' ),
-									'where'		=> 't.forum_id=' . $forum_id,
-									'add_join'	=> array(
-														array(
-															'from'	=> array( 'topics' => 't' ),
-															'where'	=> 't.tid=tr.topic_id',
-															'type'	=> 'left'
-															)
+		$this->DB->build( array(
+								'select'	=> 'l.like_rel_id',
+								'from'		=> array( 'core_like' => 'l' ),
+								'where'		=> 't.forum_id=' . $forum_id,
+								'add_join'	=> array(
+													array(
+														'from'	=> array( 'topics' => 't' ),
+														'where'	=> "t.tid=l.like_rel_id AND l.like_app='forums' AND l.like_area='topics'",
+														'type'	=> 'left'
 														)
+													)
 						)		);
 		$this->DB->execute();
 		
 		while( $r = $this->DB->fetch() )
 		{
-			$toDelete[]	= $r['trid'];
+			$toDelete[]	= $r['like_rel_id'];
 		}
 		
 		if( count($toDelete) )
 		{
-			$this->DB->delete( 'tracker', 'trid IN(' . implode( ',', $toDelete ) . ')' );
+			$this->DB->delete( 'core_like', "like_lookup_id IN ('" . implode( "','", $toDelete ) . "')" );
+			$this->DB->delete( 'core_like_cache', "like_cache_id IN ('" . implode( "','", $toDelete ) . "')" );
 		}
-		
-		$this->registry->output->redirect( $this->settings['_base_url'] . "app=forums", $this->lang->words['m_subsf_redirect'] );
 
+		$this->registry->output->redirect( $this->settings['_base_url'] . "app=forums", $this->lang->words['m_subsf_redirect'] );
 	}
 
 	/**
 	 * Delete a member's email subscriptions
 	 * 
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @author	Brandon Farber
 	 * @since	IPB3 / 22 Oct 2008
 	 */
-	private function _deleteSubscriptions()
+	protected function _deleteSubscriptions()
 	{
-		$member_id			= intval( $this->request['member_id'] );
+		$member_id	= intval( $this->request['member_id'] );
 		
-		$this->DB->delete( 'tracker', 'member_id=' . $member_id );
-		$this->DB->delete( 'forum_tracker', 'member_id=' . $member_id );
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->removeByMemberId( $member_id );
+
+		$_like	= classes_like::bootstrap( 'forums', 'forums' );
+		$_like->removeByMemberId( $member_id );
 		
-		$this->registry->output->redirect( $this->settings['_base_url'] . "app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$this->request['member_id']}", $this->lang->words['m_subs_redirect'] );
+		$this->registry->output->redirect( $this->settings['_base_url'] . "app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member_id}", $this->lang->words['m_subs_redirect'] );
 	}
 
-	/**
-	 * Update a member's avatar
-	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
-	 * @author	Brandon Farber
-	 * @since	IPB3 / 9 June 2008
-	 */
-	private function _processAvatar()
-	{
-		$member_id = intval( $this->request['member_id'] );
-		
-		try
-		{
-			IPSMember::getFunction()->saveNewAvatar( $member_id );
-		}
-		catch( Exception $error )
-		{
-			switch ( $error->getMessage() )
-			{
-				case 'NO_MEMBER_ID':
-					$this->registry->output->showError( $this->lang->words['t_noid'], 11356 );
-				break;
-				case 'NO_PERMISSION':
-					$this->registry->output->showError( $this->lang->words['t_permav'], 11357, true );
-				break;
-				case 'UPLOAD_NO_IMAGE':
-					$this->registry->output->showError( $this->lang->words['t_uploadfail1'], 11358 );
-				break;
-				case 'UPLOAD_INVALID_FILE_EXT':
-					$this->registry->output->showError( $this->lang->words['t_uploadfail2'], 11359 );
-				break;
-				case 'UPLOAD_TOO_LARGE':
-					$this->registry->output->showError( $this->lang->words['t_uploadfail3'], 11360 );
-				break;
-				case 'UPLOAD_CANT_BE_MOVED':
-					$this->registry->output->showError( $this->lang->words['t_uploadfail4'], 11361 );
-				break;
-				case 'UPLOAD_NOT_IMAGE':
-					$this->registry->output->showError( $this->lang->words['t_uploadfail5'], 2131, true );
-				break;
-				case 'NO_AVATAR_TO_SAVE':
-					$this->registry->output->showError( $this->lang->words['t_noav'], 11362 );
-				break;
-				case 'INVALID_FILE_EXT':
-					$this->registry->output->showError( $this->lang->words['t_badavext'], 11362 );
-				break;
-			}
-		}
-
-		$this->registry->output->redirect( $this->settings['_base_url'] . "app=members&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$this->request['member_id']}", $this->lang->words['t_avupdated'] );
-	}
-	
 	/**
 	 * Delete a member's posts [process]
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _deletePostsDo()
+	protected function _deletePostsDo()
 	{
 		//-----------------------------------------
 		// INIT
@@ -308,7 +243,7 @@ class admin_forums_tools_tools extends ipsCommand
 			/* Right, first off, are we deleting anything? */
 			if ( !$delete_posts and !$delete_topics )
 			{
-				$this->registry->output->showError( "You're an idiot" );
+				$this->registry->output->showError( $this->lang->words['no_post_topic_sel_del'] );
 				return;
 			}
 			/* Okay, are we deleting topics AND posts? */
@@ -325,7 +260,6 @@ class admin_forums_tools_tools extends ipsCommand
 																			  ."&init=1"
 																			  ."&dposts={$delete_posts}"
 																			  ."&dtopics={$delete_topics}"
-																			  ."&use_trash_can=".intval($this->request['use_trash_can'])
 																			  ."&member_id={$member_id}"
 																			  ."&restart_for_posts={$restart_for_posts}";
 																			  
@@ -338,31 +272,13 @@ class admin_forums_tools_tools extends ipsCommand
 		
 		if ( ! is_object( $mod_func ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php' );
-			$this->registry->setClass( 'classItemMarking', new classItemMarking( $this->registry ) );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php', 'classItemMarking' );
+			$this->registry->setClass( 'classItemMarking', new $classToLoad( $this->registry ) );
 			
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
 			$mod_func	=  new $classToLoad( $this->registry );
 		}
-		
-        //-----------------------------------------
-        // Trash-can set up
-        //-----------------------------------------
-        
-        $trash_append = '';
-        
-        if ( $this->settings['forum_trash_can_enable'] and $this->settings['forum_trash_can_id'] )
-        {
-        	if ( $this->registry->class_forums->forum_by_id[ $this->settings['forum_trash_can_id'] ]['sub_can_post'] )
-        	{
-        		if ( $this->request['use_trash_can'] )
-        		{
-        			$this->trash_forum	= $this->settings['forum_trash_can_id'];
-        			$trash_append		= " AND forum_id<>{$this->trash_forum}";
-        		}
-        	}
-        }
-        
+
 		//-----------------------------------------
 		// Get member
 		//-----------------------------------------
@@ -382,7 +298,7 @@ class admin_forums_tools_tools extends ipsCommand
 		{
 			$this->DB->build( array( 'select'		=> 'p.*',
 										'from'		=> array( 'posts' => 'p' ),
-										'where'		=> "p.author_id={$member_id}{$trash_append}",
+										'where'		=> "p.author_id={$member_id}",
 										'order'		=> 'p.pid ASC',
 										//'limit'		=> array( $start, $end ),
 										'add_join'	=> array(
@@ -400,7 +316,7 @@ class admin_forums_tools_tools extends ipsCommand
 		{
 			$this->DB->build( array( 'select'		=> 't.*',
 										'from'		=> array( 'topics' => 't' ),
-										'where'		=> "t.starter_id={$member_id}{$trash_append}",
+										'where'		=> "t.starter_id={$member_id}",
 										'order'		=> 't.tid ASC',
 										//'limit'		=> array( $start, $end ),
 										'add_join'	=> array(
@@ -477,21 +393,7 @@ class admin_forums_tools_tools extends ipsCommand
 				// Ok, deleting topics or posts?
 				//-----------------------------------------
 				
-				if ( ( $delete_posts OR $delete_topics ) AND ( $this->trash_forum and $this->trash_forum != $topic['forum_id'] ) )
-				{
-					//-----------------------------------------
-					// Move, don't delete
-					//-----------------------------------------
-					
-					$mod_func->topicMove( $r['topic_id'], $topic['forum_id'], $this->trash_forum );
-					
-					$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
-					$forums_affected[ $this->trash_forum ] = $this->trash_forum;
-					
-					$topics_deleted++;
-					$posts_deleted += $topic_i_posted['count'];
-				}				
-				else if ( $delete_posts OR $delete_topics )
+				if ( $delete_posts OR $delete_topics )
 				{
 					$this->DB->delete( 'posts', 'author_id=' . $member_id . ' AND topic_id=' . $r['tid'] );
 					$this->DB->delete('topics', 'tid=' . $r['tid'] );
@@ -508,29 +410,12 @@ class admin_forums_tools_tools extends ipsCommand
 			
 			else if ( $topic['starter_id'] == $member_id AND $delete_topics )
 			{
-				if ( $this->trash_forum and $this->trash_forum != $topic['forum_id'] )
-				{
-					//-----------------------------------------
-					// Move, don't delete
-					//-----------------------------------------
-					
-					$mod_func->topicMove( $r['topic_id'], $topic['forum_id'], $this->trash_forum );
-					
-					$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
-					$forums_affected[ $this->trash_forum ] = $this->trash_forum;
-					
-					$topics_deleted++;
-					$posts_deleted += $topic_i_posted['count'];
-				}				
-				else
-				{				
-					$this->DB->delete( 'posts', 'topic_id=' . $r['tid'] );
-					$this->DB->delete( 'topics', 'tid=' . $r['tid'] );
-																	  
-					$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
-					$topics_deleted++;
-					$posts_deleted += $topic['posts'] + 1;
-				}
+				$this->DB->delete( 'posts', 'topic_id=' . $r['tid'] );
+				$this->DB->delete( 'topics', 'tid=' . $r['tid'] );
+																  
+				$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
+				$topics_deleted++;
+				$posts_deleted += $topic['posts'] + 1;
 			}
 			
 			//-----------------------------------------
@@ -539,82 +424,12 @@ class admin_forums_tools_tools extends ipsCommand
 			
 			else if ( $delete_posts AND ! $r['new_topic'] AND $r['pid'] )
 			{
-				if ( $this->trash_forum and $this->trash_forum != $topic['forum_id'] )
-				{
-					//-----------------------------------------
-					// Set up and pass to split topic handler
-					//-----------------------------------------
-					
-					$new_title   = $this->lang->words['acp_posts_deleted_from'] . $topic['title'];
-					$new_desc    = $this->lang->words['acp_posts_deleted_from_tid'] . $topic['tid'];
-					
-					//-----------------------------------------
-					// Is first post queued?
-					//-----------------------------------------
-					
-					$topic_approved	= 1;
-					
-					$first_post = $this->DB->buildAndFetch( array( 'select'	=> 'pid, queued',
-																			'from'	=> 'posts',
-																			'where'	=> "pid=" . $r['pid'],
-																	)      );
-					
-					if( $first_post['queued'] )
-					{
-						$topic_approved = 0;
-						$this->DB->update( 'posts', array( 'queued' => 0 ), 'pid=' . $first_post['pid'] );
-					}
-					
-					//-----------------------------------------
-					// Complete a new dummy topic
-					//-----------------------------------------
-					
-					$this->DB->insert( 'topics',  array(
-											'title'				=> $new_title,
-											'description'		=> $new_desc,
-											'state'				=> 'open',
-											'posts'				=> 0,
-											'starter_id'		=> $member_id,
-											'starter_name'		=> $member['members_display_name'],
-											'start_date'		=> time(),
-											'last_poster_id'	=> $member_id,
-											'last_poster_name'	=> $member['members_display_name'],
-											'last_post'			=> time(),
-											'icon_id'			=> 0,
-											'author_mode'		=> 1,
-											'poll_state'		=> 0,
-											'last_vote'			=> 0,
-											'views'				=> 0,
-											'forum_id'			=> $this->trash_forum,
-											'approved'			=> $topic_approved,
-											'pinned'			=> 0,
-									)               );
+				$this->DB->delete( 'posts', 'pid=' . $r['pid'] );
 
-					$new_topic_id = $this->DB->getInsertId();
-			
-					//-----------------------------------------
-					// Move the posts
-					//-----------------------------------------
-					
-					$this->DB->update( 'posts', array( 'topic_id' => $new_topic_id, 'new_topic' => 0, 'queued' => 0 ), "pid={$r['pid']}" ); 
-					$this->DB->update( 'posts', array( 'new_topic' => 0 ), "topic_id={$topic['tid']}" );
+				$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
+				$topics_affected[ $topic['tid']      ] = $topic['tid'];
 
-					$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
-					$forums_affected[ $this->trash_forum ] = $this->trash_forum;
-					$topics_affected[ $topic['tid']      ] = $topic['tid'];
-					$topics_affected[ $new_topic_id      ] = $new_topic_id;
-
-					$posts_deleted++;
-				}
-				else
-				{
-					$this->DB->delete( 'posts', 'pid=' . $r['pid'] );
-
-					$forums_affected[ $topic['forum_id'] ] = $topic['forum_id'];
-					$topics_affected[ $topic['tid']      ] = $topic['tid'];
-
-					$posts_deleted++;
-				}
+				$posts_deleted++;
 			}
 		}
 		
@@ -655,7 +470,6 @@ class admin_forums_tools_tools extends ipsCommand
 																			  ."&init=1"
 																			  ."&dposts=1"
 																			  ."&dtopics=0"
-																			  ."&use_trash_can=".intval($this->request['use_trash_can'])
 																			  ."&member_id={$member_id}"
 																			  ."&restart_for_posts=0";
 																			  
@@ -666,7 +480,7 @@ class admin_forums_tools_tools extends ipsCommand
 			// Recount stats..
 			//-----------------------------------------
 			
-			$mod_func->statsRecount();
+			$this->cache->rebuildCache( 'stats', 'global' );
 			
 			//-----------------------------------------
 			// Reset member's posts
@@ -682,15 +496,17 @@ class admin_forums_tools_tools extends ipsCommand
 				}
 			}
 
+			$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+			
 			if ( ! count( $forums ) )
 			{
-				$count = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'posts', 'where' => 'queued != 1 AND author_id=' . $member_id ) );
+				$count = $this->DB->buildAndFetch( array( 'select' => 'count(*) as count', 'from' => 'posts p', 'where' => $_queued . ' AND p.author_id=' . $member_id ) );
 			}
 			else
 			{
 				$count = $this->DB->buildAndFetch( array( 'select'	=> 'count(p.pid) as count',
 																'from'		=> array( 'posts' => 'p' ),
-																'where'		=> 'p.queued <> 1 AND p.author_id=' . $member_id . ' AND t.forum_id NOT IN (' . implode( ",", $forums ) . ')',
+																'where'		=> $_queued . ' AND p.author_id=' . $member_id . ' AND t.forum_id NOT IN (' . implode( ",", $forums ) . ')',
 																'add_join'	=> array( 
 																					array( 'type'	=> 'left',
 																		 					'from'	=> array( 'topics' => 't' ),
@@ -720,7 +536,6 @@ class admin_forums_tools_tools extends ipsCommand
 																			  ."&init=1"
 																			  ."&dposts={$delete_posts}"
 																			  ."&dtopics={$delete_topics}"
-																			  ."&use_trash_can=".intval($this->request['use_trash_can'])
 																			  ."&member_id={$member_id}"
 																			  ."&restart_for_posts={$restart_for_posts}";
 																			  
@@ -733,10 +548,9 @@ class admin_forums_tools_tools extends ipsCommand
 	/**
 	 * Delete a member's posts [form/confirmation]
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _deletePostsStart()
+	protected function _deletePostsStart()
 	{
 		//-----------------------------------------
 		// Page set up
@@ -761,21 +575,14 @@ class admin_forums_tools_tools extends ipsCommand
 		//-----------------------------------------
 		// Get number of topics member has started
 		//-----------------------------------------
-		
-		$_where	= "";
-		
-		if( $this->settings['forum_trash_can_enable'] AND $this->settings['forum_trash_can_id'] )
-		{
-			$_where	= " AND t.forum_id <> " . $this->settings['forum_trash_can_id'];
-		}
-		
+
 		$topics = $this->DB->buildAndFetch( array( 'select'	=> 'count(*) as count',
 													'from'	=> 'topics t',
-													'where'	=> 't.starter_id=' . $member_id . $_where ) );
+													'where'	=> 't.starter_id=' . $member_id ) );
 																	
 		$posts  = $this->DB->buildAndFetch( array( 'select'		=> 'count(*) as count',
 													'from'		=> array( 'posts' => 'p' ),
-													'where'		=> 'p.author_id=' . $member_id . $_where,
+													'where'		=> 'p.author_id=' . $member_id,
 													'add_join'	=> array(
 																		array(
 																			'from'	=> array( 'topics' => 't' ),
diff --git a/upload/admin/applications/forums/modules_admin/tools/xml/index.html b/upload/admin/applications/forums/modules_admin/tools/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_admin/tools/xml/index.html
+++ b/upload/admin/applications/forums/modules_admin/tools/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_admin/tools/xml/permissions.xml b/upload/admin/applications/forums/modules_admin/tools/xml/permissions.xml
index 408cbe7b..813e3a6d 100644
--- a/upload/admin/applications/forums/modules_admin/tools/xml/permissions.xml
+++ b/upload/admin/applications/forums/modules_admin/tools/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Ин�трументы</grouptitle>
+		<grouplang>forums_tools</grouplang>
 		<items>
 			<item>
 				<key>ftools_deleteposts</key>
diff --git a/upload/admin/applications/forums/modules_public/ajax/attachments.php b/upload/admin/applications/forums/modules_public/ajax/attachments.php
index 7e4490c9..fc04d057 100644
--- a/upload/admin/applications/forums/modules_public/ajax/attachments.php
+++ b/upload/admin/applications/forums/modules_public/ajax/attachments.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Grab attachments and return via AJAX (AJAX)
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_forums_ajax_attachments extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -81,7 +81,7 @@ class public_forums_ajax_attachments extends ipsAjaxCommand
 		}
 		else
 		{
-			$this->returnHtml( $this->registry->getClass('output')->getTemplate('forum')->forumAttachmentsAjaxWrapper( $attachHTML ) );
+			$this->returnHtml( $attachHTML );
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/ajax/defaultSection.php b/upload/admin/applications/forums/modules_public/ajax/defaultSection.php
index f434e95a..cc85f28d 100644
--- a/upload/admin/applications/forums/modules_public/ajax/defaultSection.php
+++ b/upload/admin/applications/forums/modules_public/ajax/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section file for forum ajax module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'ajax' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'topics';
diff --git a/upload/admin/applications/forums/modules_public/ajax/emoticons.php b/upload/admin/applications/forums/modules_public/ajax/emoticons.php
index 1faf7a66..cb245e7b 100644
--- a/upload/admin/applications/forums/modules_public/ajax/emoticons.php
+++ b/upload/admin/applications/forums/modules_public/ajax/emoticons.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ourputs emoticon list via AJAX (AJAX)
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -28,9 +28,8 @@ class public_forums_ajax_emoticons extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
diff --git a/upload/admin/applications/forums/modules_public/ajax/forums.php b/upload/admin/applications/forums/modules_public/ajax/forums.php
new file mode 100644
index 00000000..43f7398b
--- /dev/null
+++ b/upload/admin/applications/forums/modules_public/ajax/forums.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Fetch topics and other data from the forum
+ * Last Updated: $Date: 2011-09-14 20:13:56 -0400 (Wed, 14 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @version		$Revision: 9491 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class public_forums_ajax_forums extends ipsAjaxCommand 
+{
+	/**
+	* Main class entry point
+	*
+	* @param	object		ipsRegistry reference
+	* @return	@e void		[Outputs to screen]
+	*/
+	public function doExecute( ipsRegistry $registry )
+	{
+		switch( $this->request['do'] )
+		{
+			default:
+			case 'getTopics':
+				$this->_getTopics();
+			break;
+			case 'markRead':
+				$this->_markRead();
+			break;
+		}
+	}
+	
+	/**
+	 * Mark topic as read
+	 */
+	protected function _markRead()
+	{
+		$fid = intval( $this->request['fid'] );
+		
+		$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $fid ) );
+		
+		$this->returnJsonArray( array( 'status' => 'ok' ) );
+	}
+	
+	/**
+	 * Get topics from a forum
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _getTopics()
+	{
+		//-----------------------------------------
+		// Reset input
+		//-----------------------------------------
+		
+		$_GET['showforum']					= intval($_GET['f']);
+		ipsRegistry::$request['showforum']	= intval(ipsRegistry::$request['f']);
+		
+		if ( $_GET['showforum'] < 1 )
+		{
+			$this->returnJsonArray( array( 'error' => 'incorrect_f' ) );
+		}
+		
+		//-----------------------------------------
+		// Get the forum controller
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums' ) . '/modules_public/forums/forums.php', 'public_forums_forums_forums' );
+		$forums	= new $classToLoad();
+		$forums->makeRegistryShortcuts( $this->registry );
+		$forums->initForums();
+		$forums->buildPermissions();
+		
+		$data	= $forums->renderForum();
+		$html	= '';
+
+		if( is_array( $data['topic_data'] ) && count( $data['topic_data'] ) )
+		{
+			foreach( $data['topic_data'] as $idx => $tdata )
+			{
+				$html .= $this->registry->output->getTemplate('forum')->topic( $tdata, $data['other_data']['forum_data'], $data['other_data'], 1 );
+			}
+		}
+
+		$html  = $this->cleanOutput( $this->parseAndCleanHooks( $html ) );
+		$pages = $this->parseAndCleanHooks( $data['other_data']['forum_data']['SHOW_PAGES'] );
+		
+		$this->returnJsonArray( array( 'topics' => $html, 'pages' => $pages, 'hasMore' => $data['other_data']['hasMore'] ) );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/ajax/index.html b/upload/admin/applications/forums/modules_public/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/ajax/index.html
+++ b/upload/admin/applications/forums/modules_public/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/ajax/markasread.php b/upload/admin/applications/forums/modules_public/ajax/markasread.php
index d5892882..9496dee7 100644
--- a/upload/admin/applications/forums/modules_public/ajax/markasread.php
+++ b/upload/admin/applications/forums/modules_public/ajax/markasread.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ajax Functions For Topics
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,9 +29,8 @@ class public_forums_ajax_markasread extends ipsAjaxCommand
 	/**
 	 * IPS command execution
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -54,9 +53,8 @@ class public_forums_ajax_markasread extends ipsAjaxCommand
 	/**
 	 * Marks the specified forum as read
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function markForumAsRead()
 	{
 		//-----------------------------------------
diff --git a/upload/admin/applications/forums/modules_public/ajax/stats.php b/upload/admin/applications/forums/modules_public/ajax/stats.php
index bfbd83d5..a490e529 100644
--- a/upload/admin/applications/forums/modules_public/ajax/stats.php
+++ b/upload/admin/applications/forums/modules_public/ajax/stats.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Retrieve who posted stats
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_forums_ajax_stats extends ipsAjaxCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -43,7 +43,7 @@ class public_forums_ajax_stats extends ipsAjaxCommand
 	/**
 	 * Retrieve posters in a given topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _whoPosted()
 	{
@@ -61,7 +61,7 @@ class public_forums_ajax_stats extends ipsAjaxCommand
 		}
 		else
 		{
-			$this->returnHtml( $this->registry->getClass('output')->getTemplate('stats')->whoPostedAjaxWrapper( $output ) );
+			$this->returnHtml( $output );
 		}
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/ajax/topics.php b/upload/admin/applications/forums/modules_public/ajax/topics.php
index 1a56a0b8..3b5c7111 100644
--- a/upload/admin/applications/forums/modules_public/ajax/topics.php
+++ b/upload/admin/applications/forums/modules_public/ajax/topics.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ajax Functions For Topics
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-26 10:20:55 -0400 (Mon, 26 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9547 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,10 +28,17 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs for the ajax handler]
+	 * @return	@e void		[Outputs for the ajax handler]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
+		/* Load topic class */
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
 		$this->lang->loadLanguageFile( array( 'public_topic', 'public_mod' ), 'forums' );
 
 		//-----------------------------------------
@@ -52,10 +59,6 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 			case 'saveTopicTitle':
 				$this->saveTopicTitle();
 			break;
-			
-			case 'saveTopicDescription':
-				$this->saveTopicDescription();
-			break;
 
 			case 'rateTopic':
 				$this->rateTopic();
@@ -68,68 +71,574 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 			case 'preview':
 				$this->_topicPreview();
 			break;
+
+			case 'reply':
+				$this->_reply();
+			break;
 			
-			case 'reputation':
-				$this->reputation();
+			case 'quote':
+			case 'mqquote':
+				$this->_quote();
+			break;
+			
+			case 'pollForReplies':
+				$this->_pollForReplies();
+			break;
+			case 'getNewPosts':
+				$this->_getNewPosts();
+			break;
+			case 'markRead':
+				$this->_markRead();
+			break;
+			case 'sigCloseMenu':
+				$this->_sigCloseMenu();
+			break;
+			case 'ignoreSig':
+				$this->_ignoreSig();
 			break;
 		}
 	}
 	
-	/**
-	 * Displays reputation popup
-	 *
-	 * @return	void
-	 */
-	protected function reputation()
+	protected function _ignoreSig()
 	{
-		if ( !$this->memberData['gbw_view_reps'] )
+		$memberId = trim( $this->request['memberId'] );
+		$memberId = ( is_numeric( $memberId ) ) ? $memberId : 'all';
+		
+		/* Whut */
+		if ( $memberId == 'all' )
 		{
-			$this->returnJsonError('no_permission');
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'view_sigs' => 0 ) ) );
 		}
+		else
+		{
+			/* Insert or update? */
+			$ignored = IPSMember::fetchIgnoredUsers( $this->memberData );
+			
+			if ( ! empty( $ignored[ $memberId ] ) )
+			{
+				/* Update */
+				$this->DB->update( 'ignored_users', array( 'ignore_signatures' => 1 ), 'ignore_owner_id=' . $this->memberData['member_id'] . ' AND ignore_ignore_id=' . $memberId );
+			}
+			else
+			{
+				$this->DB->insert( 'ignored_users', array( 'ignore_owner_id'   => $this->memberData['member_id'],
+													   	   'ignore_ignore_id'  => $memberId,
+													       'ignore_messages'   => 0,
+													       'ignore_topics'     => 0,
+														   'ignore_signatures' => 1 ) );
+			}
+			
+			/* Rebuild cache */
+			IPSMember::rebuildIgnoredUsersCache( $this->memberData );
+		}
+		
+		$this->returnJsonArray( array( 'status' => 'ok' ) );
+	}
 	
-		$postID = intval( $this->request['post'] );
+	protected function _sigCloseMenu()
+	{
+		$pid = intval( $this->request['pid'] );
 		
-		/* Get data */
-		$reps = array();
-		$this->DB->build( array(
-			'select'	=> 'member_id, rep_rating',
-			'from'		=> 'reputation_index',
-			'where'		=> "app='forums' AND type='pid' AND type_id='{$postID}'",
-			'order'		=> 'rep_date',
-			) );
-					
-		$q = $this->DB->execute();
-		while ( $r = $this->DB->fetch( $q ) )
+		/* Fetch post */
+		$post  = $this->registry->getClass('topics')->getPostById( $pid );
+		$this->registry->getClass('topics')->setTopicData( $post );
+		
+		if ( $this->registry->getClass('topics')->canView() )
 		{
-			$r['member'] = IPSMember::load( $r['member_id'] );
-			$reps[] = $r;
+			return $this->returnHtml( $this->registry->output->getTemplate('topic')->ajaxSigCloseMenu( $post ) );
 		}
+		else
+		{
+			$this->returnJsonError( 'nopermission' );
+		}
+	}
+	
+	protected function _markRead()
+	{
+		$tid = intval( $this->request['tid'] );
 		
-		return $this->returnHtml( $this->registry->output->getTemplate('topic')->reputationPopup( $reps ) );
+		/* Get latest post */
+		$post  = $this->registry->getClass('topics')->getPosts( array( 'topicId' => $tid, 'sortField' => 'pid', 'sortOrder' => 'desc', 'offset' => 0, 'limit' => 1 ) );
+		$post  = array_pop( $post );
+		$forum = $this->registry->class_forums->getForumById( $post['forum_id'] );
+		
+		$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $post['forum_id'], 'itemID' => $tid, 'markDate' => $post['post_date'], 'containerLastActivityDate' => $forum['last_post'] ) );
+		
+		$this->returnJsonArray( array( 'status' => 'ok' ) );
 	}
 	
+	/**
+	 * Polls for replies innit
+	 */
+	protected function _pollForReplies()
+	{
+		$topicId = intval( $this->request['t'] );
+		$topPid  = intval( $this->request['pid'] );
+		
+		/* Can we view this topic? */
+		$this->registry->getClass('topics')->setTopicData( $topicId );
+		
+		/* Can we view? */
+		if ( $this->registry->getClass('topics')->canView() !== true )
+		{
+			$this->returnJsonArray( array( 'count' => 0 ) );
+		}
+		
+		/* Get posts */ 
+		$posts = $this->_getPosts( $topicId, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
+		
+		/* Got anything sailor? */
+		if ( ! count( $posts ) )
+		{
+			$this->returnJsonArray( array( 'count' => 0 ) );
+		}
+		else
+		{
+			$this->returnJsonArray( array( 'count' => count( $posts ), 'data' => $posts ) );
+		}
+	}
+	
+	/**
+	 * Fetches the new posts to insert into the live page ...
+	 */
+	protected function _getNewPosts()
+	{
+		$topicId = intval( $this->request['t'] );
+		$topPid  = intval( $this->request['pid'] );
+		
+		/* Can we view this topic? */
+		$this->registry->getClass('topics')->setTopicData( $topicId );
+		
+		/* Can we view? */
+		if ( $this->registry->getClass('topics')->canView() !== true )
+		{
+			$this->returnHtml( '' );
+		}
+		
+		/* Get posts */ 
+		$posts = $this->_getPosts( $topicId, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
+		
+		/* Got anything sailor? */
+		if ( ! count( $posts ) )
+		{
+			$this->returnHtml( '' );
+		}
+		else
+		{
+			$html = '';
+			
+			foreach( $posts as $pid => $data )
+			{
+				$html .= $this->registry->output->getTemplate('topic')->post( $data, array(), $this->registry->getClass('topics')->getTopicData() );
+			}
+			
+			$this->returnHtml( $html );
+		}
+	}
+	
+	/**
+	 * Fetches posts
+	 * @param	INT		Topic ID
+	 * @param	INT		Top PID
+	 * @param	INT		Forum ID
+	 */
+	protected function _getPosts( $topicId, $topPid, $forumId )
+	{
+		IPSDebug::fireBug( 'info', array( 'Retrieving posts for topic id ' . $topicId . ' where pid is greater than ' . $topPid ) );
+		
+		/* Reset viewing member id - can be set to someone else by post class (e.g. in the sendOutQuoteNotifications() method) */
+		$this->registry->getClass('topics')->setMemberData( $this->memberData );
+
+		/* Get posts */
+		$posts = $this->registry->getClass('topics')->getPosts( array(   'topicId' 		  => $topicId,
+																		 'pidIsGreater'   => $topPid,
+																		 'onlyViewable'   => true,
+																		 'onlyVisible'    => true,
+																		 'parse'		  => true,
+																		 'forumId'		  => $forumId,
+																		 'limit'		  => 50,
+																		 'sortKey'		  => 'date',
+																		 'sortOrder'	  => 'asc' ) );
+		
+		if ( count( $posts ) )
+		{
+			/* Fetch post count ID */
+			$this->registry->getClass('topics')->getPosts( array(   'topicId' 		 => $topicId,
+																	'pidIsLess'      => $topPid,
+																	'onlyViewable'   => true,
+																	'onlyVisible'    => true,
+																	'parse'		  	 => false,
+																	'getCount'		 => true,
+																	'forumId'		 => $forumId,
+																	'limit'			 => 50,
+																	'sortKey'		 => 'date',
+																	'sortOrder'	     => 'asc' ) );
+			
+			$count = $this->registry->getClass('topics')->getPostsCount();
+			$count++;
+			
+			foreach( $posts as $id => $data )
+			{
+				$posts[ $id ]['post']['post_count'] = ++$count;
+			}
+		}
+		
+		/* Parse attachments */
+		$topic	= $this->registry->getClass('topics')->getTopicData();
+		
+		if( $topic['topic_hasattach'] )
+		{
+			//-----------------------------------------
+			// INIT. Yes it is
+			//-----------------------------------------
+			
+			$postHTML = array();
+			
+			//-----------------------------------------
+			// Separate out post content
+			//-----------------------------------------
+			
+			foreach( $posts as $id => $post )
+			{
+				$postHTML[ $id ] = $post['post']['post'];
+			}
+
+			//-----------------------------------------
+			// Grab render attach class
+			//-----------------------------------------
+				
+			if ( ! is_object( $this->class_attach ) )
+			{	
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
+				$this->class_attach		   =  new $classToLoad( $this->registry );
+			}
+			
+			//-----------------------------------------
+			// Not got permission to view downloads?
+			//-----------------------------------------
+			
+			if ( $this->registry->permissions->check( 'download', $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ] ) === FALSE )
+			{
+				$this->settings['show_img_upload'] = 0;
+			}
+			
+			//-----------------------------------------
+			// Continue...
+			//-----------------------------------------
+			
+			$this->class_attach->type  = 'post';
+			$this->class_attach->init();
+
+			$attachHTML = $this->class_attach->renderAttachments( $postHTML, array_keys( $posts ) );
+	
+			/* Now parse back in the rendered posts */
+			if( is_array($attachHTML) AND count($attachHTML) )
+			{
+				foreach( $attachHTML as $id => $data )
+				{
+					/* Get rid of any lingering attachment tags */
+					if ( stristr( $data['html'], "[attachment=" ) )
+					{
+						$data['html'] = IPSText::stripAttachTag( $data['html'] );
+					}
+
+					$posts[ $id ]['post']['post']			= $data['html'];
+					$posts[ $id ]['post']['attachmentHtml']	= $data['attachmentHtml'];
+				}
+			}
+		}
+		
+		return $posts;
+	}
+	
+	/**
+	 * Fetches data to quote
+	 *
+	 * @return	@e void
+	 */
+	protected function _quote()
+	{
+		/* Init */
+		$tid	= intval( $this->request['t'] );
+		$pid	= intval( $this->request['p'] );
+		$pids	= explode( ',', IPSText::cleanPermString( $this->request['pids'] ) );
+		$posts	= array();
+		$_post	= '';
+
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		/* Set up topic */
+		if( $pid )
+		{
+			$posts[]  = $this->registry->getClass('topics')->getPostById( $pid );
+		}
+		else
+		{
+			foreach( $pids as $pid )
+			{
+				$posts[]  = $this->registry->getClass('topics')->getPostById( $pid );
+			}
+		}
+
+		/* Permission ids */
+		$perm_id	= $this->memberData['org_perm_id'] ? $this->memberData['org_perm_id'] : $this->memberData['g_perm_id'];
+		$perm_array	= explode( ",", $perm_id );
+
+		/* Naughty boy chex */
+		foreach( $posts as $post )
+		{
+			/* Set up data */
+			$this->registry->getClass('topics')->setTopicData( $post );
+			
+			if ( $this->registry->getClass('topics')->canView() !== true )
+			{
+				$this->returnJsonError( 'nopermission' );
+			}
+		
+			if ( $this->registry->permissions->check( 'read', $this->registry->class_forums->getForumById( $post['forum_id'] ), $perm_array ) !== TRUE )
+			{
+				$this->returnJsonError( 'nopermission' );
+			}
+
+			/* Post visible? */
+			if ( $this->registry->getClass('class_forums')->fetchHiddenType( $post ) != 'visible' )
+			{
+				$this->returnJsonError( 'nopermission' );
+			}
+
+			/* Phew that was a toughy wasn't it? */
+			if ( $this->settings['strip_quotes'] )
+			{
+				$post['post'] = IPSText::getTextClass( 'bbcode' )->stripQuotes( $post['post'] );
+			}
+			
+			/* Strip shared media in quotes */
+			$post['post'] = IPSText::getTextClass( 'bbcode' )->stripSharedMedia( $post['post'] );
+			
+			/* We don't use makeQuoteSafe() here because the result is returned via AJAX and inserted as text into the editor.  + shows as &#043; as a result if we do */
+			$_quoted	= preg_replace( '/(<br\s*\/?>\s*)+$/', "<br />", "<br />" . rtrim($post['post']) . "<br />" );
+			$_post		.= "[quote name='" . ( $post['members_display_name'] ? $post['members_display_name'] : $post['author_name'] ) . "' timestamp='" . $post['post_date'] . "' post='" . $post['pid'] . "']{$_quoted}[/quote]<br />";
+		}
+
+		$this->editor->setContent( $_post, 'topics' );
+		
+		$this->returnHtml( $this->editor->getContent() );
+	}
+	
+	/**
+	 * Saves the post
+	 *
+	 * @return	@e void
+	 */
+	protected function _reply()
+	{
+		/* Init */
+		$fid  	 = intval( $this->request['f'] );
+		$tid  	 = intval( $this->request['t'] );
+		$topPid  = intval( $this->request['pid'] );
+		
+		/* Basic checks */
+		if ( ! $tid )
+		{
+			$this->returnJsonError( $this->lang->words['ajax_reply_noperm'] );
+		}
+		
+		if ( $this->memberData['member_id'] )
+		{
+			if ( $this->memberData['restrict_post'] )
+			{
+				if ( $this->memberData['restrict_post'] == 1 )
+				{
+					$this->returnJsonError( $this->lang->words['ajax_reply_noperm'] );
+				}
+
+				$post_arr = IPSMember::processBanEntry( $this->memberData['restrict_post'] );
+
+				if ( time() >= $post_arr['date_end'] )
+				{
+					//-----------------------------------------
+					// Update this member's profile
+					//-----------------------------------------
+					
+					IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'restrict_post' => 0 ) ) );
+				}
+				else
+				{
+					$this->returnJsonError( $this->lang->words['ajax_reply_noperm'] );
+				}
+			}
+		}
+
+		/* Load lang and classes */
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_topics' ) );
+
+		if ( ! is_object( $this->postClass ) )
+		{
+			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
+                        
+			$this->postClass = new $classToLoad( $this->registry );
+		}
+	
+		/* Fetch topic data */
+		$topicData = $this->registry->getClass('topics')->getTopicById( $tid );
+		
+		if ( ! $this->registry->getClass('topics')->canView( $topicData ) )
+		{
+			$this->returnJsonError( $this->lang->words['ajax_reply_noperm'] );
+		}
+		
+		/* Duplicate posts */
+		if ( time() - $this->memberData['last_post'] <= 4 )
+		{
+			$_lastPost	= $this->DB->buildAndFetch( array( 'select' => 'topic_id',
+														   'from'   => 'posts',
+														   'where'  => 'author_id=' . $this->memberData['member_id'],
+														   'order'  => 'post_date DESC',
+														   'limit'  => array( 0, 1 ) ) );
+
+			/* We made a reply within the last 4 seconds to this topic.. */
+			if ( $_lastPost['topic_id'] == $tid )
+			{
+				$this->returnJsonError( $this->lang->words['topic_duplicate_post'] );
+			}
+		}
+		
+		/* Set post class data */
+		$this->postClass->setForumData( $this->registry->getClass('class_forums')->getForumById( $topicData['forum_id'] ) );
+		$this->postClass->setTopicID( $tid );
+		$this->postClass->setForumID( $fid );
+		
+		$this->postClass->setSettings( array( 'enableSignature' => 1,
+											  'enableEmoticons' => 1,
+											  'post_htmlstatus' => 0,
+											  'enableTracker'   => 0 ) );
+		
+		/* Topic Data */
+		$this->postClass->setTopicData( $topicData );
+		$this->postClass->setAuthor( $this->member->fetchMemberData() );
+		$this->postClass->setIsAjax( TRUE );
+		$this->postClass->setPublished( 'reply' );
+		
+		$this->postClass->setPostContent( $_POST['Post'] );
+
+		/* POST */
+		try
+		{
+			/**
+			 * If there was an error, return it as a JSON error
+			 */
+			if ( $this->postClass->addReply() === FALSE )
+			{
+				$this->returnJsonError( $this->postClass->getPostError() );
+			}
+			
+			/* If it requires preview, return a message */
+			if( $this->postClass->getPublished() === false )
+			{
+				$this->returnJsonArray( array( 'success' => 1, 'message' => $this->lang->words['thanks_need_preview'] ) );
+			}
+
+			IPSDebug::fireBug( 'info', array( 'The post was successfully saved...' ) );
+
+			$topic = $this->postClass->getTopicData();
+			$post  = $this->postClass->getPostData();
+			
+			/* If we are merging, back up one */
+			if( $post['pid'] == $topPid )
+			{
+				$topPid--;
+			}
+			
+			/* Mark topic as read */
+			$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $topic['forum_id'], 'itemID' => $topic['tid'] ) );
+			
+			/* Can we report? */
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/reportLibrary.php', 'reportLibrary', 'core' );
+			$reports		= new $classToLoad( $this->registry );
+			
+			/* Can we view this topic? */
+			$this->registry->getClass('topics')->setTopicData( $topic );
+			
+			$topic					= $this->registry->getClass('topics')->getTopicData();
+			$topic['_canReport']	= $reports->canReport( 'post' );
+		
+			/* Get posts */ 
+			$posts = $this->_getPosts( $tid, $topPid, $this->registry->getClass('topics')->getTopicData('forum_id') );
+			
+			IPSDebug::fireBug( 'info', array( 'Found ' . count($posts) . ' posts...' ) );
+			
+			/* Got anything sailor? */
+			if ( ! count( $posts ) )
+			{
+				$this->returnHtml( '' );
+			}
+			else
+			{
+				$html		= '';
+				$lastpid	= 0;
+				
+				foreach( $posts as $pid => $data )
+				{
+					$html		.= $this->registry->output->getTemplate('topic')->post( $data, array(), $topic, $this->postClass->getForumData() );
+					$lastpid	= $pid;
+				}
+				
+				if( count($posts) == 1 )
+				{
+					$this->returnJsonArray( array( 'success' => 1, 'post' => $html, 'postid' => $lastpid ), true );
+				}
+				else
+				{
+					$this->returnHtml( $html );
+				}
+			}		
+		}
+		catch ( Exception $error )
+		{
+			$this->returnJsonError( $error->getMessage() );
+		}
+	}
+
 	/**
 	 * Displays a topic preview
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _topicPreview()
 	{
 		/* INIT */
-		$tid   = intval( $this->request['tid'] );
-		$pid   = intval( $this->request['pid'] );
-		$sTerm = trim( $this->request['searchTerm'] );
-		$topic = array();
-		$posts = array();
-		$query = '';
+		$tid			= intval( $this->request['tid'] );
+		$pid			= intval( $this->request['pid'] );
+		$sTerm			= trim( $this->request['searchTerm'] );
+		$topic			= array();
+		$posts			= array();
+		$permissions	= array();
+		$query			= '';
+
+		/* Topic visibility */
+	
+		$_perms = array( 'visible' );
 		
+		if ( $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( false ) )
+		{
+			$_perms[] = 'sdelete';
+		}
+		
+		if ( $this->registry->getClass('class_forums')->canQueuePosts( false ) )
+		{
+			$_perms[] = 'hidden';
+		}
+
 		/* Grab topic data and first post */
 		$topic = $this->DB->buildAndFetch( array( 'select'   => 't.*, t.title as topic_title, t.posts as topic_posts, t.last_post as topic_last_post',
 												  'from'     => array( 'topics' => 't' ),
-												  'where'    => 't.tid=' . $tid,
+												  'where'    => $this->registry->class_forums->fetchTopicHiddenQuery( $_perms, 't.' ) . ' AND t.tid=' . $tid,
 												  'add_join' => array( array( 'select' => 'p.*',
 												  							  'from'   => array( 'posts' => 'p' ),
-												  							  'where'  => 'p.pid=topic_firstpost',
+												  							  'where'  => 'p.pid=t.topic_firstpost',
 												  							  'type'   => 'left' ),
 												  					   array( 'select' => 'm.*',
 												  					   		  'from'   => array( 'members' => 'm' ),
@@ -148,7 +657,8 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 		/* Permission check */
 		if ( $this->registry->class_forums->forumsCheckAccess( $topic['forum_id'], 0, 'topic', $topic, true ) !== true )
 		{
-			return $this->returnHtml( $this->registry->output->getTemplate('global_other')->ajaxPopUpNoPermission() );
+			return $this->returnString( 'no_permission' );
+			//return $this->returnHtml( $this->registry->output->getTemplate('global_other')->ajaxPopUpNoPermission() );
 		}
 		
 		/* Build permissions */
@@ -228,6 +738,9 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 				
 				while( $r = $this->DB->fetch() )
 				{
+					$r['tid']		= $topic['tid'];
+					$r['title_seo']	= $topic['title_seo'];
+					
 					if ( $r['pid'] == $count['max'] )
 					{
 						$posts['last'] = $r;
@@ -278,15 +791,26 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 		{
 			$data  = IPSMember::buildDisplayData( $data );
 			
+			IPSText::getTextClass( 'bbcode' )->parse_smilies			= $data['use_emo'];
+			IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_html'] and $this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'] and $data['post_htmlstate'] ) ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $data['post_htmlstate'] == 2 ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->registry->class_forums->forum_by_id[ $topic['forum_id'] ]['use_ibc'];
+			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $data['member_group_id'];
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $data['mgroup_others'];
+			
+			$data['post']	= IPSText::getTextClass( 'bbcode' )->stripQuotes( $data['post'] );
+			$data['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $data['post'] );
+			
 			/* Search term? */
 			if ( $k == 'search' AND $pid AND $sTerm )
 			{
-				$data['post'] = IPSText::truncateTextAroundPhrase( IPSText::getTextClass( 'bbcode' )->stripAllTags( str_replace( '<br />', ' ', $data['post'] ) ), $sTerm );
+				$data['post'] = IPSText::truncateTextAroundPhrase( IPSText::getTextClass( 'bbcode' )->stripAllTags( str_replace( '<br />', ' ', strip_tags( $data['post'], '<br>' ) ) ), $sTerm );
 				$data['post'] = IPSText::searchHighlight( $data['post'], $sTerm );
 			}
 			else
 			{
-				$data['post'] = IPSText::truncate( IPSText::getTextClass( 'bbcode' )->stripAllTags( $data['post'] ), 500 );
+				$data['post'] = IPSText::truncate( IPSText::getTextClass( 'bbcode' )->stripAllTags( strip_tags( $data['post'], '<br>' ) ), 500 );
 			}
 			
 			$data['_isVisible']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $data ) == 'visible' ) ? true : false;
@@ -304,7 +828,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 	/**
 	 * Toggle the posts approve thingy
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _postApproveToggle()
 	{
@@ -350,7 +874,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 	/**
 	 * Add vote to rating
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rateTopic()
 	{
@@ -468,18 +992,14 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 	/**
 	 * Saves a ajax topic title edit
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveTopicTitle()
 	{
 		/* INIT */
-		IPSDebug::fireBug( 'info', array( 'Initial name: ' . $_POST['name'] ) );
 		$name	   = $_POST['name'];
-		IPSDebug::fireBug( 'info', array( 'after convert and make safe: ' . $name ) );
 		$tid	   = intval( $this->request['tid'] );
 		$can_edit  = 0;
-		
-		IPSDebug::fireBug( 'info', array( 'The topic title after converting is: ' . $name ) );
 
 		/* Check ID */
 		if( ! $tid )
@@ -600,74 +1120,12 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 		$title = trim( $title );
 
 		return $title;
-	}
-	
-	/**
-	 * Saves a ajax topic description edit
-	 *
-	 * @return	void
-	 */
-	public function saveTopicDescription()
-	{
-		/* INIT */
-		$description = $this->convertAndMakeSafe( $this->request['description'], TRUE );
-		$tid	     = intval( $this->request['tid'] );
-		$can_edit    = 0;
-
-		/* Check ID */
-		if( ! $tid )
-		{ 
-			$this->returnString( $this->lang->words['ajax_no_topic_id'] );
-		}
-		
-		/* Load Topic */
-		$topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid=' . $tid ) );
-		
-		if( ! $topic['tid'] )
-		{ 
-			$this->returnString( $this->lang->words['ajax_topic_not_found'] );
-		}
-		
-		/* Check Permissions */
-		if ( $this->memberData['g_is_supmod'] )
-		{
-			$can_edit = 1;
-		}
-		
-		if( $this->memberData['forumsModeratorData'][ $topic['forum_id'] ]['edit_topic'] )
-		{
-			$can_edit = 1;
-		}
-
-		if( ! $can_edit )
-		{
-			$this->class_ajax->returnString( $this->lang->words['ajax_no_t_permission'] );
-		}
-		
-		/* Update the description */
-    	$this->DB->update( 'topics', array( 'description' => $description ), 'tid=' . $tid );
-    	
-		$this->DB->insert( 'moderator_logs', array(
-											  		'forum_id'    => intval( $topic['forum_id'] ),
-											  		'topic_id'    => $tid,
-											  		'member_id'   => $this->memberData['member_id'],
-											  		'member_name' => $this->memberData['members_display_name'],
-											  		'ip_address'  => $this->input['IP_ADDRESS'],
-											 		'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-											  		'ctime'       => time(),
-											  		'topic_title' => $topic['title'],
-											  		'action'      => $this->lang->words['ajax_topicdesc'],
-											  		'query_string'=> htmlspecialchars( my_getenv('QUERY_STRING') ),
-										  )  );   
-		
-		/* All Done */
-		$this->returnString( 'success' );
 	}	
 
 	/**
 	 * Saves the post
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function editBoxSave()
 	{
@@ -731,7 +1189,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 
 		if ( ! is_object( $this->postClass ) )
 		{
-			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
                         
 			$this->postClass = new $classToLoad( $this->registry );
@@ -744,8 +1202,9 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 		$this->postClass->setTopicID( $tid );
 		$this->postClass->setPostID( $pid );
 		$this->postClass->setForumID( $fid );
+		$this->postClass->setPublished( 'reply' );
 		
-		if( isset($this->request['post_htmlstatus']) )		// Off is "0"
+		if( isset($this->request['post_htmlstatus']) )	// Off is "0"
 		{
 			$this->postClass->setSettings( array( 'post_htmlstatus' => $this->request['post_htmlstatus'] ) );
 		}
@@ -854,7 +1313,7 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 	/**
 	 * Shows the edit box
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function editBoxShow()
 	{
@@ -910,32 +1369,19 @@ class public_forums_ajax_topics extends ipsAjaxCommand
 		{
 			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_editors' ), 'core' );
 			
-			require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/post/classPost.php" );
+			require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/post/classPost.php" );/*noLibHook*/
 			$classToLoad     = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 			$this->postClass = new $classToLoad( $this->registry );
 		}
-		
-		# Forum Data
-		$this->postClass->setForumData( $this->registry->getClass('class_forums')->forum_by_id[ $fid ] );
-		
-		# IDs
+
+		/* Set post class data */
+		$this->postClass->setForumData( $this->registry->getClass('class_forums')->getForumById( $fid ) );
 		$this->postClass->setTopicID( $tid );
-		$this->postClass->setPostID( $pid );
 		$this->postClass->setForumID( $fid );
+		$this->postClass->setPostID( $pid );
 		
 		/* Topic Data */
-		$this->postClass->setTopicData( $this->DB->buildAndFetch( array( 
-																			'select'   => 't.*, p.poll_only', 
-																			'from'     => array( 'topics' => 't' ), 
-																			'where'    => "t.forum_id={$fid} AND t.tid={$tid}",
-																			'add_join' => array(
-																								array( 
-																										'type'	=> 'left',
-																										'from'	=> array( 'polls' => 'p' ),
-																										'where'	=> 'p.tid=t.tid'
-																									)
-																								)
-									) 							)	 );
+		$this->postClass->setTopicData( $this->registry->getClass('topics')->getTopicById( $tid ) );
 		
 		# Set Author
 		$this->postClass->setAuthor( $this->member->fetchMemberData() );
diff --git a/upload/admin/applications/forums/modules_public/ajax/usercp.php b/upload/admin/applications/forums/modules_public/ajax/usercp.php
deleted file mode 100644
index 6dccc878..00000000
--- a/upload/admin/applications/forums/modules_public/ajax/usercp.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Member property updater (AJAX)
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 6133 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_forums_ajax_usercp extends ipsAjaxCommand 
-{
-	/**
-	* Main class entry point
-	*
-	* @access	public
-	* @param	object		ipsRegistry reference
-	* @return	void		[Outputs to screen]
-	*/
-	public function doExecute( ipsRegistry $registry )
-	{
-    	switch( $this->request['do'] )
-    	{
-			case 'get_avatar_images':
-				$this->_getAvatarImages();
-			break;
-    	}
-	}
-	
-	
-	/**
-	* Get avatar images in a directory
-	*
-	* @access	protected
-	* @return	void		[Outputs to screen]
-	*/
-	protected function _getAvatarImages()
-	{
-		$dir	= urldecode( $this->request['cat'] );
-		$images	= IPSMember::getFunction()->getHostedAvatarsFromCategory( $dir );
-		
-		if ( $images === FALSE )
-		{
-			$this->returnJsonError( $this->lang->words['ajax_avatar_dir'] );
-			exit();
-		}
-		else
-		{
-			$output = $this->registry->getClass('output')->getTemplate('ucp')->forumsInlineAvatarImages( $images, $dir );
-		
-			$this->returnHtml(  $output );
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/extras/boardrules.php b/upload/admin/applications/forums/modules_public/extras/boardrules.php
index 82805619..e7cbeafd 100644
--- a/upload/admin/applications/forums/modules_public/extras/boardrules.php
+++ b/upload/admin/applications/forums/modules_public/extras/boardrules.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Board Rules
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * Last Updated: $Date: 2011-08-18 17:50:15 -0400 (Thu, 18 Aug 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6502 $
+ * @version		$Rev: 9399 $
  */
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -25,44 +25,25 @@ if ( ! defined( 'IN_IPB' ) )
 class public_forums_extras_boardrules extends ipsCommand
 {
 	/**
-	 * Temporary stored output
+	 * Class entry point
 	 *
-	 * @access	public
-	 * @var		string
+	 * @param	object		Registry reference
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	public $output	= "";
-	
-	/**
-	* Class entry point
-	*
-	* @access	public
-	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
-	*/
 	public function doExecute( ipsRegistry $registry )
 	{
 		/* Get board rule (not cached) */
 		$row = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_sys_conf_settings', 'where' => "conf_key='gl_guidelines'" ) );
 
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= 1;
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'global';
-		
-		$row['conf_value']	= IPSText::getTextClass('bbcode')->preDbParse( $row['conf_value'] );
-		$row['conf_value']	= IPSText::getTextClass('bbcode')->preDisplayParse( $row['conf_value'] );
+		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'global';
 
-		/* Hacky fix for bug #15632 */
-		//$row['conf_value'] = str_replace( '<ul><br />'          , '<ul>', $row['conf_value'] );
-		//$row['conf_value'] = str_replace( '<ul'                 , '<ul class="bbc"', $row['conf_value'] );
-		//$row['conf_value'] = str_replace( '</li><br />'         , '</li>', $row['conf_value'] );
-		//$row['conf_value'] = str_replace( '</ul><br />'         , '</ul>', $row['conf_value'] );
-		//$row['conf_value'] = preg_replace( '#<li([^\n]*)<br />#', '<li$1', $row['conf_value'] );
-		
 		$this->registry->output->addNavigation( $this->settings['gl_title'], '' );
 		$this->registry->output->setTitle( $this->settings['gl_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->output->addContent( $this->registry->output->getTemplate('emails')->boardRules( $this->settings['gl_title'], $row['conf_value'] ) );
+		$this->registry->output->addContent( $this->registry->output->getTemplate('emails')->boardRules( $this->settings['gl_title'], IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['conf_value'] ) ) );
 		$this->registry->output->sendOutput();
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/extras/defaultSection.php b/upload/admin/applications/forums/modules_public/extras/defaultSection.php
index 07203c59..361980dc 100644
--- a/upload/admin/applications/forums/modules_public/extras/defaultSection.php
+++ b/upload/admin/applications/forums/modules_public/extras/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default forum extras module section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'extras' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'stats';
diff --git a/upload/admin/applications/forums/modules_public/extras/forward.php b/upload/admin/applications/forums/modules_public/extras/forward.php
index 1d9f378d..05175b0c 100644
--- a/upload/admin/applications/forums/modules_public/extras/forward.php
+++ b/upload/admin/applications/forums/modules_public/extras/forward.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forward a topic to someone
- * Last Updated: $Date: 2010-10-14 06:42:56 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6975 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_forums_extras_forward extends ipsCommand
 	/**
 	 * Temporary stored output HTML
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $output;
@@ -38,27 +37,24 @@ class public_forums_extras_forward extends ipsCommand
 	/**
 	 * Forum information
 	 *
-	 * @access	private
 	 * @var		array		Array of forum details
 	 */
-	private $forum			= array();
+	protected $forum			= array();
 
 	/**
 	 * Topic information
 	 *
-	 * @access	private
 	 * @var		array		Array of topic details
 	 */
-	private $topic			= array();
+	protected $topic			= array();
 	
-	private $page			= array();
+	protected $page			= array();
 
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -157,10 +153,9 @@ class public_forums_extras_forward extends ipsCommand
 	/**
 	 * Forward the page (sends the email)
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _sendEmail()
+	protected function _sendEmail()
 	{
 		//-----------------------------------------
 		// Check
@@ -220,16 +215,15 @@ class public_forums_extras_forward extends ipsCommand
 		IPSText::getTextClass('email')->from	= $this->memberData['email'];
 		IPSText::getTextClass('email')->sendMail();
 		
-		$this->registry->output->redirectScreen( $this->lang->words['redirect'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . $this->request['st'] );
+		$this->registry->output->redirectScreen( $this->lang->words['redirect'], $this->page['url'] );
 	}
 	
 	/**
 	 * Show the form to forward the page
 	 *
-	 * @access	private
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
-	private function _showForm( $msg='' )
+	protected function _showForm( $msg='' )
 	{
 		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_email_content' ), 'core' );
 		
@@ -270,5 +264,4 @@ class public_forums_extras_forward extends ipsCommand
 		$this->registry->output->addContent( $this->output );
 		$this->registry->output->sendOutput();
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/extras/index.html b/upload/admin/applications/forums/modules_public/extras/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/extras/index.html
+++ b/upload/admin/applications/forums/modules_public/extras/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/extras/legends.php b/upload/admin/applications/forums/modules_public/extras/legends.php
index 6d1dc912..ed7e75f7 100644
--- a/upload/admin/applications/forums/modules_public/extras/legends.php
+++ b/upload/admin/applications/forums/modules_public/extras/legends.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Emoticon and BBCode Legends
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6502 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -28,7 +28,6 @@ class public_forums_extras_legends extends ipsCommand
 	/**
 	 * Output
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $output	= "";
@@ -36,9 +35,8 @@ class public_forums_extras_legends extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -66,9 +64,8 @@ class public_forums_extras_legends extends ipsCommand
 	/**
 	 * Displays the emoticon list popup
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
  	public function emoticonsPopUpList()
  	{
 		/* INIT */
@@ -117,9 +114,8 @@ class public_forums_extras_legends extends ipsCommand
 	/**
 	 * Show BBCode Helpy file
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
  	public function bbcodePopUpList()
  	{
 		/* Load the Parser */
diff --git a/upload/admin/applications/forums/modules_public/extras/rating.php b/upload/admin/applications/forums/modules_public/extras/rating.php
index 5b45a8ed..d0d5db1f 100644
--- a/upload/admin/applications/forums/modules_public/extras/rating.php
+++ b/upload/admin/applications/forums/modules_public/extras/rating.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Add rating fallback
- * Last Updated: $Date: 2010-05-07 19:47:39 -0400 (Fri, 07 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6250 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_forums_extras_rating extends ipsCommand
 	/**
 	 * Forum data
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $forum		= array();
@@ -38,7 +37,6 @@ class public_forums_extras_rating extends ipsCommand
 	/**
 	 * Topic data
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $topic		= array();
@@ -46,9 +44,8 @@ class public_forums_extras_rating extends ipsCommand
 	/**
 	* Class entry point
 	*
-	* @access	public
 	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
+	* @return	@e void		[Outputs to screen/redirects]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -64,7 +61,6 @@ class public_forums_extras_rating extends ipsCommand
 
 		$topic_id	= intval($this->request['t']);
 		$rating_id	= intval($this->request['rating']);
-		$vote_cast	= array();
 
 		$this->registry->class_localization->loadLanguageFile( array( 'public_topic' ) );
 		
@@ -173,11 +169,11 @@ class public_forums_extras_rating extends ipsCommand
 					$this->DB->update( 'topics', array( 'topic_rating_total' => intval($this->topic['topic_rating_total']) + $new_rating ), 'tid=' . $this->topic['tid'] );
 				}
 
-				$this->registry->output->redirectScreen( $this->lang->words['topic_rating_changed'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+				$this->registry->output->redirectScreen( $this->lang->words['topic_rating_changed'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
 			}
 			else
 			{
-				$this->registry->output->redirectScreen( $this->lang->words['topic_rated_already'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+				$this->registry->output->redirectScreen( $this->lang->words['topic_rated_already'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
 			}
 		}
 
@@ -201,6 +197,6 @@ class public_forums_extras_rating extends ipsCommand
 												), 'tid=' . $this->topic['tid'] );
 		}
 
-		$this->registry->output->redirectScreen( $this->lang->words['topic_rating_done'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+		$this->registry->output->redirectScreen( $this->lang->words['topic_rating_done'] , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
  	}
 }
diff --git a/upload/admin/applications/forums/modules_public/extras/stats.php b/upload/admin/applications/forums/modules_public/extras/stats.php
index 89cad2cb..13674b78 100644
--- a/upload/admin/applications/forums/modules_public/extras/stats.php
+++ b/upload/admin/applications/forums/modules_public/extras/stats.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member stats functions
- * Last Updated: $Date: 2010-10-18 17:06:14 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-05-12 17:45:20 -0400 (Thu, 12 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6991 $
+ * @version		$Revision: 8752 $
  *
  */
 
@@ -45,7 +45,7 @@ class public_forums_extras_stats extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -108,12 +108,14 @@ class public_forums_extras_stats extends ipsCommand
  												  
  		/* Ok, so the group by causes a temp table then filesort which can be slow but alternative is to loop over all
  		   posts and sort in PHP which could be slower when hundreds of replies so we get a bit smart about it */
- 		   
+
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), '' );
+
  		if ( $topic['posts'] >= 100 )
  		{
 			$this->DB->build( array( 'select'	=> 'COUNT(pid) as pcount, author_id',
 									 'from'		=> 'posts',
-									 'where'	=> "topic_id={$tid} AND queued=0",
+									 'where'	=> "topic_id={$tid} AND " . $_queued,
 									 'group'	=> 'author_id',
 									 'order'	=> 'pcount DESC' ) );
 			
@@ -137,10 +139,10 @@ class public_forums_extras_stats extends ipsCommand
  		{
  			$_tmp  = array();
  			$_tmp2 = array();
- 			
+
  			$this->DB->build( array( 'select'	=> 'author_id',
 									 'from'		=> 'posts',
-									 'where'	=> "topic_id={$tid} AND queued=0" ) );
+									 'where'	=> "topic_id={$tid} AND " . $_queued ) );
 			
 			$this->DB->execute();
 	 		
@@ -202,7 +204,7 @@ class public_forums_extras_stats extends ipsCommand
  		// Guests
  		//-----------------------------------------
  		
- 		$guests = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as guest_posts', 'from' => 'posts', 'where' => "topic_id={$tid} AND queued=0 AND author_id=0" ) );
+ 		$guests = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as guest_posts', 'from' => 'posts', 'where' => "topic_id={$tid} AND {$_queued} AND author_id=0" ) );
  		
  		if( $guests['guest_posts'] )
  		{
@@ -235,7 +237,7 @@ class public_forums_extras_stats extends ipsCommand
 	 *
 	 * @param	integer		Topic id
 	 * @param	boolean		Return on error instead of printing
-	 * @return	void		[Prints error if you cannot access]
+	 * @return	@e void		[Prints error if you cannot access]
 	 */
 	protected function _checkAccess( $tid, $returnOnError=false )
 	{ 
@@ -277,7 +279,7 @@ class public_forums_extras_stats extends ipsCommand
 	/**
 	 * Show the forum leaders
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _showLeaders()
  	{
@@ -319,7 +321,7 @@ class public_forums_extras_stats extends ipsCommand
 			{
 				$group_ids[ $i['group_id'] ] = $i['group_id'];
 			}
-			else
+			else if( $i['member_id'] )
 			{
 				$member_ids[ $i['member_id'] ] = $i['member_id'];
 			}
@@ -509,7 +511,7 @@ class public_forums_extras_stats extends ipsCommand
 						}
 					}
 				}
-				else if( array_key_exists( $member['member_id'], $moderators ) && ( ($data['is_group'] and $data['group_id'] == $member['member_group_id']) || $data['member_id'] == $member['member_id'] ) )
+				else if( isset( $moderators[ $member['member_id'] ] ) && ( ($data['is_group'] and $data['group_id'] == $member['member_group_id']) || $data['member_id'] == $member['member_id'] ) )
 				{
 					$moderators[ $member['member_id'] ]['forums'][ $data['forum_id'] ]	= $data['forum_id'];
 				}
@@ -555,7 +557,7 @@ class public_forums_extras_stats extends ipsCommand
 	 * Critical function to show the database queries
 	 * ...or is it...
 	 *
-	 * @return	void		[Outputs image to screen]
+	 * @return	@e void		[Outputs image to screen]
 	 */
 	private function _showQueries()
  	{
@@ -584,7 +586,7 @@ class public_forums_extras_stats extends ipsCommand
 	/**
 	 * Show today's top posters
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _showTodaysPosters()
  	{
diff --git a/upload/admin/applications/forums/modules_public/extras/toggle.php b/upload/admin/applications/forums/modules_public/extras/toggle.php
index 15d1698c..940ebc64 100644
--- a/upload/admin/applications/forums/modules_public/extras/toggle.php
+++ b/upload/admin/applications/forums/modules_public/extras/toggle.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Silly toggle function(?s{0,})
- * Last Updated: $Date: 2010-06-08 20:53:45 -0400 (Tue, 08 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6485 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_forums_extras_toggle extends ipsCommand
 	/**
 	* Class entry point
 	*
-	* @access	public
 	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
+	* @return	@e void		[Outputs to screen/redirects]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -63,8 +62,7 @@ class public_forums_extras_toggle extends ipsCommand
  	/**
  	 * Toggle side panel on/off without JS
  	 *
- 	 * @access	public
- 	 * @return	void
+ 	 * @return	@e void
  	 * @see		The Dark Knight (it was an awesome movie)
  	 */
  	public function _toggleSidePanel()
diff --git a/upload/admin/applications/forums/modules_public/extras/vote.php b/upload/admin/applications/forums/modules_public/extras/vote.php
index 3041a786..01289858 100644
--- a/upload/admin/applications/forums/modules_public/extras/vote.php
+++ b/upload/admin/applications/forums/modules_public/extras/vote.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Poll voting
- * Last Updated: $Date: 2010-05-07 19:47:39 -0400 (Fri, 07 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6250 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_forums_extras_vote extends ipsCommand
 	/**
 	 * Topic data
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $topic		= array();
@@ -38,9 +37,8 @@ class public_forums_extras_vote extends ipsCommand
 	/**
 	* Class entry point
 	*
-	* @access	public
 	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
+	* @return	@e void		[Outputs to screen/redirects]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -92,7 +90,7 @@ class public_forums_extras_vote extends ipsCommand
 																				'type'		=> 'left'
 																				),
 																			array( 
-																				'select'	=> 'f.allow_pollbump, f.status',
+																				'select'	=> 'f.allow_pollbump',
 																				'from'		=> array( 'forums' => 'f' ),
 																				'where'		=> 'f.id=t.forum_id',
 																				'type'		=> 'left'
@@ -117,11 +115,6 @@ class public_forums_extras_vote extends ipsCommand
 			$this->registry->output->showError( 'topic_vote_locked', 10352, true, null, 403 );
 		}
 
-		if( ! $this->topic['status'] )
-		{
-			$this->registry->output->showError( 'topic_cannot_vote', 103152, true, null, 403 );
-		}
-
 		//-----------------------------------------
 		// Have reply permissions??
 		//-----------------------------------------
@@ -153,9 +146,8 @@ class public_forums_extras_vote extends ipsCommand
 	/**
 	 * Add vote to poll
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function topicAddVoteToPoll()
 	{
 		//-----------------------------------------
@@ -307,14 +299,13 @@ class public_forums_extras_vote extends ipsCommand
 		
 		$lang = $this->request['nullvote'] ? $this->lang->words['poll_viewing_results'] : $this->lang->words['poll_vote_added'];
 		
-		$this->registry->output->redirectScreen( $lang , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+		$this->registry->output->redirectScreen( $lang , $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
 	}
 
 	/**
 	 * Remove votes
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function topicDeletePollVotes()
 	{
@@ -337,7 +328,7 @@ class public_forums_extras_vote extends ipsCommand
 										
 		if ( ! $voter )
 		{
-			$this->registry->output->redirectScreen( $this->lang->words['poll_vote_deleted'], $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+			$this->registry->output->redirectScreen( $this->lang->words['poll_vote_deleted'], $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
 		}
 		
 		//-----------------------------------------
@@ -376,6 +367,6 @@ class public_forums_extras_vote extends ipsCommand
 		$this->DB->update( 'polls', $update, "tid=" . $this->topic['tid'] );
 		
 		/* done */
-		$this->registry->output->redirectScreen( $this->lang->words['poll_vote_deleted'], $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
+		$this->registry->output->redirectScreen( $this->lang->words['poll_vote_deleted'], $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'], $this->topic['title_seo'], 'showtopic' );
 	}
 }
diff --git a/upload/admin/applications/forums/modules_public/forums/announcements.php b/upload/admin/applications/forums/modules_public/forums/announcements.php
index 2f0d7b9b..f6e62ec5 100644
--- a/upload/admin/applications/forums/modules_public/forums/announcements.php
+++ b/upload/admin/applications/forums/modules_public/forums/announcements.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Announcement View
- * Last Updated: $Date: 2010-07-10 01:01:06 -0400 (Sat, 10 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6628 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,9 +28,8 @@ class public_forums_forums_announcements extends ipsCommand
 	/**
 	* Class entry point
 	*
-	* @access	public
 	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
+	* @return	@e void		[Outputs to screen/redirects]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -132,7 +131,7 @@ class public_forums_forums_announcements extends ipsCommand
 
 		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
 		IPSText::getTextClass( 'bbcode' )->parse_html				= $announce['announce_html_enabled'] ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $announce['announce_nlbr_enabled'];
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $announce['announce_html_enabled'] ? $announce['announce_nlbr_enabled'] : 1;
 		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
 		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'announcements';
 		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $announce['member_group_id'];
@@ -194,9 +193,8 @@ class public_forums_forums_announcements extends ipsCommand
 	/**
 	 * Hides announcements that have passed their expire date
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function announceRetireExpired()
 	{
 		//-----------------------------------------
@@ -211,9 +209,8 @@ class public_forums_forums_announcements extends ipsCommand
     /**
 	 * Rebuilds the attachment cache
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function announceRecache()
 	{
diff --git a/upload/admin/applications/forums/modules_public/forums/attach.php b/upload/admin/applications/forums/modules_public/forums/attach.php
index 4ea11684..dfc743ae 100644
--- a/upload/admin/applications/forums/modules_public/forums/attach.php
+++ b/upload/admin/applications/forums/modules_public/forums/attach.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * View Topic Attachments
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: danc $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6502 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,9 +28,8 @@ class public_forums_forums_attach extends ipsCommand
 	/**
 	* Class entry point
 	*
-	* @access	public
 	* @param	object		Registry reference
-	* @return	void		[Outputs to screen/redirects]
+	* @return	@e void		[Outputs to screen/redirects]
 	*/
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -82,7 +81,6 @@ class public_forums_forums_attach extends ipsCommand
 	* Get the actual output.
 	* This is abstracted so that the AJAX routine can load and execute this function
 	*
-	* @access	public
 	* @param	array 		Topic and attachment data
 	* @return	string		HTML output
 	*/
@@ -104,7 +102,7 @@ class public_forums_forums_attach extends ipsCommand
 		// aight.....
 		//-----------------------------------------
 		
-		$_queued	= ( ! $this->registry->getClass('class_forums')->canQueuePosts( $topic['forum_id'] ) ) ? ' AND p.queued=0' : '';
+		$_queued	= ( ! $this->registry->getClass('class_forums')->canQueuePosts( $topic['forum_id'] ) ) ? ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' ) : '';
 		$_st		= $this->request['st'] > 0 ? intval($this->request['st']) : 0;
 		$_limit		= 50;
 		$_pages		= '';
diff --git a/upload/admin/applications/forums/modules_public/forums/boards.php b/upload/admin/applications/forums/modules_public/forums/boards.php
index e9ca031b..8f8fdaeb 100644
--- a/upload/admin/applications/forums/modules_public/forums/boards.php
+++ b/upload/admin/applications/forums/modules_public/forums/boards.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Board Index View
- * Last Updated: $Date: 2010-10-12 13:04:59 -0400 (Tue, 12 Oct 2010) $
+ * Last Updated: $Date: 2011-09-08 18:01:45 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6964 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9470 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class public_forums_forums_boards extends ipsCommand
 	 * Main Execution Function
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -36,9 +36,6 @@ class public_forums_forums_boards extends ipsCommand
 		// INIT
 		//-----------------------------------------
 
-		$chat_html = '';
-		$news_data = array();
-		
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_boards' ) );
 		
 		if (! $this->memberData['member_id'] )
@@ -52,29 +49,12 @@ class public_forums_forums_boards extends ipsCommand
 		
 		$cat_data = $this->processAllCategories();
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $cat_data, 'boardIndexCategories' );
-		
 		//-----------------------------------------
 		// Add in show online users
 		//-----------------------------------------
 		
 		$active = $this->getActiveUserDetails();
-		
-		//-----------------------------------------
-		// Check for news forum.
-		//-----------------------------------------
-		
-		if ( isset( $this->registry->getClass('class_forums')->forum_by_id[ $this->settings['news_forum_id'] ]['newest_id']) AND $this->registry->getClass('class_forums')->forum_by_id[ $this->settings['news_forum_id'] ]['newest_id'] AND $this->settings['index_news_link'] )
-		{
-			$news_data = array( 
-								'forum_id'	=> $this->settings['news_forum_id'],
-								'title'		=> stripslashes($this->registry->getClass('class_forums')->forum_by_id[ $this->settings['news_forum_id'] ]['newest_title']),
-								'seo_title' => IPSText::makeSeoTitle( $this->registry->getClass('class_forums')->forum_by_id[ $this->settings['news_forum_id'] ]['newest_title'] ),
-								'id'		=> $this->registry->getClass('class_forums')->forum_by_id[ $this->settings['news_forum_id'] ]['newest_id'] 
-							);
-		}
-	
+
 		/* Check for sidebar hooks */
 		$show_sidebar = false;
 		
@@ -105,23 +85,17 @@ class public_forums_forums_boards extends ipsCommand
 												'info'    => $stats_info 
 							)	);
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $active, 'boardIndexOnlineUsers' );
-		
+		/* Output */
 		$template = $this->registry->getClass('output')->getTemplate('boards')->boardIndexTemplate(
-																									$this->registry->getClass( 'class_localization')->getDate( $this->memberData['last_visit'], 'LONG' ),
+																									$this->registry->getClass('class_localization')->getDate( $this->memberData['last_visit'], 'LONG' ),
 																									$active,
-																									$this->getCalendarEvents(),
-																									$this->getBirthdays(),
-																									$chat_html,
-																									$news_data,
 																									$cat_data,
 																									$show_sidebar );
 		
 		//-----------------------------------------
 		// Meta tags
 		//-----------------------------------------
-		
+	
 		if( $this->settings['seo_index_md'] )
 		{
 			$this->registry->output->addMetaTag( 'description', $this->settings['seo_index_md'], false );
@@ -134,7 +108,10 @@ class public_forums_forums_boards extends ipsCommand
 		
 		$this->registry->output->addCanonicalTag( "act=idx", 'public', 'false' );
 		
-		/* Set Ad code for the board index */
+		//-----------------------------------------
+		// Set ad codes
+		//-----------------------------------------
+
 		if( $this->registry->getClass('IPSAdCode')->userCanViewAds() )
 		{
 			$this->registry->getClass('IPSAdCode')->setGlobalCode( 'header', 'ad_code_board_index_header' );
@@ -150,65 +127,6 @@ class public_forums_forums_boards extends ipsCommand
         $this->registry->getClass('output')->sendOutput();
 	}
 
-	/**
-	 * Builds an array of category data
-	 *
-	 * @param	integer		$fid	ID of the forum to get sub forums for
-	 * @return	array
-	 */
-	public function showSubForums( $fid )
-	{
-		/* INIT */
-		$temp_html 	     = "";
-		$sub_output      = "";
-		$return_cat_data = array();
-		$temp_cat_data   = array();
-
-		if ( isset( $this->registry->getClass('class_forums')->forum_cache[ $fid ] ) AND is_array( $this->registry->getClass('class_forums')->forum_cache[ $fid ] ) )
-		{
-			$cat_data = $this->registry->getClass('class_forums')->forum_by_id[ $fid ];
-			
-			foreach( $this->registry->getClass('class_forums')->forum_cache[ $fid ] as $forum_data )
-			{
-				$forum_data['_queued_img'] 		= isset($forum_data['_queued_img'] ) 	? $forum_data['_queued_img'] 	: '';
-				$forum_data['_queued_info']		= isset($forum_data['_queued_info'] ) 	? $forum_data['_queued_info'] 	: '';
-				$forum_data['show_subforums'] 	= isset($forum_data['show_subforums'] ) ? $forum_data['show_subforums'] : '';
-				$forum_data['last_unread'] 		= isset($forum_data['last_unread'] ) 	? $forum_data['last_unread'] 	: '';
-				
-				//-----------------------------------------
-				// Get all subforum stats
-				// and calculate
-				//-----------------------------------------
-				
-				if ( $this->settings['forum_cache_minimum'] AND $this->settings['forum_cache_minimum'] )
-				{
-					$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
-					$need_desc[] = $forum_data['id'];
-				}
-					
-				if ( $forum_data['redirect_on'] )
-				{
-					$forum_data['redirect_hits']	= $this->registry->getClass('class_localization')->formatNumber( $forum_data['redirect_hits'] );
-					
-					$forum_data['redirect_target'] 	= isset($forum_data['redirect_target']) ? $forum_data['redirect_target'] : '_parent';
-					$temp_cat_data[ $forum_data['id'] ] = $forum_data;
-				}
-				else
-				{
-					$temp_cat_data[ $forum_data['id'] ] = $this->registry->getClass('class_forums')->forumsFormatLastinfo( $this->registry->getClass('class_forums')->forumsCalcChildren( $forum_data['id'], $forum_data ) );
-				}
-			}
-		}
-		
-		if ( count( $temp_cat_data ) )
-		{
-			$return_cat_data[] = array( 'cat_data'   => $cat_data,
-										'forum_data' => $temp_cat_data );
-		}
-		
-		return $return_cat_data;
-    }
-    
 	/**
 	 * Builds an array of category data for output
 	 *
@@ -216,11 +134,14 @@ class public_forums_forums_boards extends ipsCommand
 	 */
 	public function processAllCategories()
 	{
-		/* INIT */
-		$return_cat_data = array();
-		$need_desc       = array();
-		$root            = array();
-		$parent          = array();
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$return_cat_data	= array();
+		$root				= array();
+		$parent				= array();
+		$member_ids			= array();
 		
 		//-----------------------------------------
 		// Want to view categories?
@@ -287,10 +208,14 @@ class public_forums_forums_boards extends ipsCommand
 							{
 								$temp_cat_data[ $forum_data['id'] ] = $this->registry->class_forums->forumsFormatLastinfo( $this->registry->class_forums->forumsCalcChildren( $forum_data['id'], $forum_data ) );
 							}
-							
+
+							if( $temp_cat_data[ $forum_data['id'] ]['last_poster_id'] )
+							{
+								$member_ids[ $forum_data['id'] ]	= $temp_cat_data[ $forum_data['id'] ]['last_poster_id'];
+							}
 						}
 					}
-					
+
 					if ( count( $temp_cat_data ) )
 					{
 						$return_cat_data[] = array( 'cat_data'   => $cat_data,
@@ -302,6 +227,41 @@ class public_forums_forums_boards extends ipsCommand
 			}
 		}
 
+		if( count($member_ids) )
+		{
+			$_members	= IPSMember::load( array_unique($member_ids), 'members,profile_portal' );
+			
+			foreach( $member_ids as $forumId => $memberId )
+			{
+				$_member	= $_members[ $memberId ];
+				
+				if( $_member['member_id'] )
+				{
+					$_member	= IPSMember::buildDisplayData( $_member );
+					
+					foreach( $return_cat_data as $k => $_type )
+					{
+						foreach( $_type as $__type => $obj )
+						{
+							if( $__type == 'forum_data' )
+							{
+								foreach( $obj as $fid => $fdata )
+								{
+									if( $fid != $forumId )
+									{
+										continue;
+									}
+									
+									$return_cat_data[ $k ][ $__type ][ $fid ]	= array_merge( $_member, $fdata );
+									break 3;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		return $return_cat_data;
 	}
 
@@ -350,9 +310,9 @@ class public_forums_forums_boards extends ipsCommand
 			}
 			
 			$this->DB->build( array( 
-											'select' => 'id, member_id, member_name, seo_name, login_type, running_time, member_group, uagent_type',
-											'from'   => 'sessions',
-											'where'  => "running_time > $time",
+									'select' => 'id, member_id, member_name, seo_name, login_type, running_time, member_group, uagent_type',
+									'from'   => 'sessions',
+									'where'  => "running_time > {$time}",
 								)	);
 			$this->DB->execute();
 			
@@ -396,18 +356,7 @@ class public_forums_forums_boards extends ipsCommand
 					
 					if ( ! $cached[ $result['member_name'] ] )
 					{
-						if ( $this->settings['spider_anon'] )
-						{
-							if ( $this->memberData['g_access_cp'] )
-							{
-								$active['NAMES'][] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
-							}
-						}
-						else
-						{
-							$active['NAMES'][] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
-						}
-						
+						$active['NAMES'][] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 						$cached[ $result['member_name'] ] = 1;
 					}
 					else
@@ -439,11 +388,11 @@ class public_forums_forums_boards extends ipsCommand
 					{
 						$cached[ $result['member_id'] ] = 1;
 
-						$result['member_name'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
+						$result['member_name'] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 						
 						if ( $result['login_type'] )
 						{
-							if ( $this->memberData['g_access_cp'] and ($this->settings['disable_admin_anon'] != 1) )
+							if ( $this->memberData['g_access_cp'] )
 							{
 								$active['NAMES'][] = "<a href='" . $this->registry->getClass('output')->buildSEOUrl( "showuser={$result['member_id']}", 'public', $result['seo_name'], 'showuser' ) . "' title='$last_date'>{$result['member_name']}</a>*";
 								$active['ANON']++;
@@ -468,312 +417,9 @@ class public_forums_forums_boards extends ipsCommand
 		}
 		
 		$this->lang->words['active_users'] = sprintf( $this->lang->words['active_users'], $this->settings['au_cutoff'] );
-		
+
 		return $active;
 	}
-	
-	/**
-	 * Returns a string of calendar events
-	 *
-	 * @return	mixed		HTML string, or false
-	 */
-	public function getCalendarEvents()
-	{
-		//-----------------------------------------
-		// Are we viewing the calendar?
-		//-----------------------------------------
-		
-		if( $this->settings['show_calendar'] AND IPSLib::appIsInstalled('calendar') )
-		{
-			/* Get the current day, month, and year */
-			$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() + $this->registry->class_localization->getTimeOffset() ) );
-		
-			$day   = $a[2];
-			$month = $a[1];
-			$year  = $a[0];
-			
-			/* Check the calendar limit */
-			$this->settings['calendar_limit'] = intval( $this->settings['calendar_limit'] ) < 2 ? 1 : intval( $this->settings['calendar_limit'] );
-			
-			$our_unix    = gmmktime( 0, 0, 0, $month, $day, $year);
-			$max_date    = $our_unix + ($this->settings['calendar_limit'] * 86400);
-			$events      = array();
-			$show_events = array();
-			
-			if( $this->memberData['org_perm_id'] )
-			{
-				$member_permission_groups = explode( ",", IPSText::cleanPermString( $this->memberData['org_perm_id'] ) );
-			}
-			else
-			{
-				$cache                    = $this->caches['group_cache'];
-				$member_permission_groups = explode( ",", IPSText::cleanPermString( $this->memberData['g_perm_id'] ) );
-				
-				if( $this->memberData['mgroup_others'] )
-				{
-					$this->memberData['mgroup_others'] = IPSText::cleanPermString($this->memberData['mgroup_others']);
-					
-					$mgroup_others = explode( ",", $this->memberData['mgroup_others'] );
-					
-					if( count($mgroup_others) )
-					{
-						foreach( $mgroup_others as $member_group_id )
-						{
-							if( $member_group_id )
-							{
-								$member_permission_groups = array_merge( $member_permission_groups, explode( ",", IPSText::cleanPermString( $cache[$member_group_id]['g_perm_id'] ) ) );
-							}
-						}
-					}
-				}
-			}
-			
-			if( is_array( $this->caches['calendar'] ) AND count( $this->caches['calendar'] ) )
-			{
-				foreach( $this->caches['calendar'] as $u )
-				{
-					$set_offset = 0;
-
-					if( $u['event_timeset'] && !($u['event_recurring'] == 0 AND $u['event_unix_to']) )
-					{
-						$set_offset = $this->memberData['time_offset'] ? $this->memberData['time_offset'] * 3600 : 0;
-					}
-					
-					$u['_unix_from'] = $u['event_unix_from'] - $set_offset;
-					$u['_unix_to']   = $u['event_unix_to'] - $set_offset;
-					
-					//-----------------------------------------
-					// Private?
-					//-----------------------------------------
-					
-					if ( $u['event_private'] == 1 and $this->memberData['member_id'] != $u['event_member_id'] )
-					{
-						continue;
-					}
-					
-					//-----------------------------------------
-					// Got perms?
-					//-----------------------------------------
-					
-					if( $u['event_perms'] != "*" )
-					{
-						$event_perms = explode( ",", IPSText::cleanPermString( $u['event_perms'] ) );
-						
-						$check = 0;
-						
-						if( count($event_perms) )
-						{
-							foreach( $event_perms as $mgroup_perm )
-							{
-								if( in_array( $mgroup_perm, $member_permission_groups ) )
-								{
-									$check = 1;
-								}
-							}
-						}
-						
-						if( !$check )
-						{
-							continue;
-						}
-					}
-						
-					//-----------------------------------------
-					// Got calendar perms?
-					//-----------------------------------------
-					
-					if( $u['_perm_read'] != "*" )
-					{
-						$read_perms = explode( ",", IPSText::cleanPermString( $u['_perm_read'] ) );
-						
-						$check = 0;
-						
-						if( count( $read_perms ) )
-						{
-							foreach( $read_perms as $mgroup_perm )
-							{
-								if( in_array( $mgroup_perm, $member_permission_groups ) )
-								{
-									$check = 1;
-								}
-							}
-						}
-						
-						if( !$check )
-						{
-							continue;
-						}
-					}
-					
-					//-----------------------------------------
-					// In range?
-					//-----------------------------------------
-				
-					if ( $u['event_recurring'] == 0 AND ( ( $u['event_unix_to'] >= $our_unix AND $u['event_unix_from'] <= $max_date )
-						OR ( $u['event_unix_to'] == 0 AND $u['event_unix_from'] >= $our_unix AND $u['event_unix_from'] <= $max_date ) ) )
-					{
-						$u['event_activetime'] = $u['_unix_from'];
-						$events[ str_pad( $u['event_unix_from'].$u['event_id'], 15, "0" ) ] = $u;
-					}
-					elseif( $u['event_recurring'] > 0 )
-					{
-						$cust_range_s = $u['event_unix_from'];
-
-						while( $cust_range_s < $u['event_unix_to'])
-						{
-							if( $cust_range_s >= $our_unix AND $cust_range_s <= $max_date )
-							{
-								/* Special case for months, to take into account different numbers of days */
-								if ( $u['event_recurring'] == "2" )
-								{
-									$u['event_activetime'] = gmmktime( 1, 1, 1, gmdate( 'n', $cust_range_s ), gmdate( 'j', $u['event_unix_from'] ), gmdate( 'Y', $cust_range_s ) );
-								}
-								else
-								{
-									$u['event_activetime'] = $cust_range_s;
-								}
-								$events[ str_pad( $cust_range_s.$u['event_id'], 15, "0" ) ] = $u;
-							}
-
-							if( $u['event_recurring'] == "1" )
-							{
-								$cust_range_s += 604800;
-							}
-							elseif ( $u['event_recurring'] == "2" )
-							{
-								$cust_range_s += 2628000;
-							}
-							else
-							{
-								$cust_range_s += 31536000;
-							}
-						}								
-					}
-				}
-			}
-			
-			//-----------------------------------------
-			// Print...
-			//-----------------------------------------
-			
-			ksort($events);
-			
-			foreach( $events as $event )
-			{
-				//-----------------------------------------
-				// Recurring?
-				//-----------------------------------------
-
-				$c_time = '';
-				$c_time = gmstrftime( '%x', $event['event_activetime'] );
-				$url    = $this->registry->output->buildSEOUrl( "app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}", 'public', $event['event_title'], 'event' );
-				
-				$show_events[] = "<a href='{$url}' title='$c_time'>".$event['event_title']."</a>";
-			}
-			
-			$this->lang->words['calender_f_title'] = sprintf( $this->lang->words['calender_f_title'], $this->settings['calendar_limit'] );
-			
-			if ( count($show_events) > 0 )
-			{
-				$event_string = $show_events; // Change in 3.0 by rikki: Just pass the array for the template to deal with
-			}
-			else
-			{
-				if ( ! $this->settings['autohide_calendar'] )
-				{
-					$event_string = $this->lang->words['no_calendar_events'];
-				}
-			}
-			
-			return $event_string;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-	
-	/**
-	 * Returns an array of birthday information
-	 *
-	 * @return	mixed		Array of birthday information, or false
-	 */
-	public function getBirthdays()
-	{
-		if ($this->settings['show_birthdays'] or $this->settings['show_calendar'] )
-		{
-			$a				= explode( ',', gmdate( 'Y,n,j,G,i,s', time() + $this->registry->getClass( 'class_localization')->getTimeOffset() ) );
-			$day			= $a[2];
-			$month			= $a[1];
-			$year			= $a[0];
-			
-			$birthstring	= "";
-			$count			= 0;
-			$lang 			= '';
-			$users			= array();
-			
-			if ( $this->settings['show_birthdays'] )
-			{
-				if ( is_array($this->caches['birthdays']) AND count( $this->caches['birthdays'] ) )
-				{
-					foreach( $this->caches['birthdays'] as $u )
-					{
-						if ( $u['bday_day'] == $day and $u['bday_month'] == $month )
-						{
-							$users[] = $u;
-						}
-						else if( $day == 28 && $month == 2 && !date("L") )
-						{
-							if ( $u['bday_day'] == "29" and $u['bday_month'] == $month )
-							{
-								$users[] = $u;
-							}
-						}
-					}
-				}
-				
-				//-----------------------------------------
-				// Spin and print...
-				//-----------------------------------------
-				
-				foreach ( $users as $user )
-				{
-					/* Age */
-					$pyear = 0;
-					
-					if( $user['bday_year'] && $user['bday_year'] > 0 )
-					{
-						$pyear = $year - $user['bday_year'];
-					}
-					
-					$birthstring[] = $this->registry->getClass('output')->getTemplate('boards')->birthday( $user, $pyear );
-
-					$count++;
-				}
-				
-				//-----------------------------------------
-				// Fix up string...
-				//-----------------------------------------
-
-				$lang = $this->lang->words['no_birth_users'];
-				
-				if ($count > 0)
-				{
-					$lang = ($count > 1) ? $this->lang->words['birth_users'] : $this->lang->words['birth_user'];
-				}
-				else
-				{
-					return FALSE;
-				}
-			}
-			
-			return array( 'count' => $count, 'lang' => $lang, 'users' => $birthstring );
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
 
 	/**
 	 * Returns an array of board stats
@@ -820,7 +466,7 @@ class public_forums_forums_boards extends ipsCommand
 				$this->cache->setCache( 'stats', $stats, array( 'array' => 1 ) );
 			}
 			
-			$stats_output['most_time'] = $this->registry->getClass( 'class_localization')->getDate( $stats['most_date'], 'LONG' );
+			$stats_output['most_time'] = $this->registry->getClass( 'class_localization')->getDate( $stats['most_date'], 'DATE' );
 			$stats_output['most_online'] = $this->registry->getClass('class_localization')->formatNumber($stats['most_count']);
 			
 			$this->lang->words['most_online'] = str_replace( "<#NUM#>" ,  $stats_output['most_online']	, $this->lang->words['most_online'] );
diff --git a/upload/admin/applications/forums/modules_public/forums/defaultSection.php b/upload/admin/applications/forums/modules_public/forums/defaultSection.php
index 564ad8a8..2eab5e2e 100644
--- a/upload/admin/applications/forums/modules_public/forums/defaultSection.php
+++ b/upload/admin/applications/forums/modules_public/forums/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default section file for forums public module
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'forums' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'boards';
diff --git a/upload/admin/applications/forums/modules_public/forums/findpost.php b/upload/admin/applications/forums/modules_public/forums/findpost.php
index 6f9cde22..37dff27f 100644
--- a/upload/admin/applications/forums/modules_public/forums/findpost.php
+++ b/upload/admin/applications/forums/modules_public/forums/findpost.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bounces a user to the right post
- * Last Updated: $Date: 2010-07-12 18:26:09 -0400 (Mon, 12 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6635 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  * @since		14th April 2004
  *
  * |   > Interesting Fact: I've had iTunes playing every Radiohead tune
@@ -36,9 +36,8 @@ class  public_forums_forums_findpost extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[redirects]
+	 * @return	@e void		[redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -76,6 +75,9 @@ class  public_forums_forums_findpost extends ipsCommand
 		{
 			$this->registry->getClass('output')->showError( 'findpost_missing_topic', 10332, null, null, 404 );
 		}
+
+		$sort_field	= ($this->settings['post_order_column'] == 'pid') ? 'pid' : 'post_date';
+		$sort_value	= $sort_field == 'pid' ? $pid : $post['post_date'];
 		
 		$query  = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
 		
@@ -85,7 +87,7 @@ class  public_forums_forums_findpost extends ipsCommand
 			if ( $this->permissions['softDeleteSee'] )
 			{
 				/* See queued and soft deleted */
-				$query = '';
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'approved', 'sdeleted', 'hidden' ) );
 			}
 			else
 			{
@@ -103,7 +105,7 @@ class  public_forums_forums_findpost extends ipsCommand
 			}
 		}
 			
-		$cposts = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$post['topic_id']} AND pid <= {$pid}{$query}" ) );							
+		$cposts = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$post['topic_id']} AND {$sort_field} <=" . intval( $sort_value ) . $query ) );							
 		
 		if ( (($cposts['posts']) % $this->settings['display_max_posts']) == 0 )
 		{
diff --git a/upload/admin/applications/forums/modules_public/forums/forums.php b/upload/admin/applications/forums/modules_public/forums/forums.php
index 40f25a87..6742765a 100644
--- a/upload/admin/applications/forums/modules_public/forums/forums.php
+++ b/upload/admin/applications/forums/modules_public/forums/forums.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum Viewing
- * Last Updated: $Date: 2010-11-12 17:23:13 -0500 (Fri, 12 Nov 2010) $
+ * Last Updated: $Date: 2011-10-04 16:35:02 -0400 (Tue, 04 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7175 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9580 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,92 +29,78 @@ class public_forums_forums_forums extends ipsCommand
 	 *
 	 * @var		array
 	 */
-	private $forum	= array();
+	protected $forum				= array();
 	
 	/**
 	 * Array of topic ids to open
 	 *
 	 * @var		array
 	 */
-	private $update_topics_open	= array();
+	protected $update_topics_open	= array();
 	
 	/**
 	 * Array of topic ids to close
 	 *
 	 * @var		array
 	 */
-	private $update_topics_close	= array();
+	protected $update_topics_close	= array();
 	
 	/**
 	 * Permissions array
 	 *
 	 */
-	protected $permissions = array();
-	private $_sdTids       = array();
+	protected $permissions			= array();
+	protected $_sdTids				= array();
+	
+	/**
+	 * Permissions
+	 * @var	bool
+	 */
+	protected $can_close_topics		= false;
+	protected $can_move_topics		= false;
+	protected $can_edit_topics		= false;
+	protected $can_open_topics		= false;
 	
 	/**
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
 		//-----------------------------------------
-        // Are we doing anything with "site jump?"
-        //-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$this->initForums();
 
-        switch( $this->request[ 'f' ] )
-        {
-        	case 'sj_home':
-        		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] );
-        		break;
-        	case 'sj_search':
-        		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&amp;module=search' );
-        		break;
-        	case 'sj_help':
-        		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&amp;module=help' );
-        		break;
-        	default:
-        		$this->request['f'] =  intval($this->request['f']  );
-        		break;
-        }
-        
-        $this->initForums();
-        
-        //-----------------------------------------
-        // Get the forum info based on the forum ID,
-        // and get the category name, ID, etc.
-        //-----------------------------------------
-        
-        $this->forum = $this->registry->getClass('class_forums')->forum_by_id[ $this->request['f'] ]; 
-        
-        //-----------------------------------------
-        // Error out if we can not find the forum
-        //-----------------------------------------
-        
-        if( ! $this->forum['id'] )
-        {
-        	$this->registry->getClass('output')->showError( 'forums_no_id', 10333, null, null, 404 );
-        }
-        
-        //-----------------------------------------
+		//-----------------------------------------
+		// Error out if we can not find the forum
+		//-----------------------------------------
+		
+		if( ! $this->forum['id'] )
+		{
+			$this->registry->getClass('output')->showError( 'forums_no_id', 10333, null, null, 404 );
+		}
+		
+		//-----------------------------------------
 		// Build permissions
 		//-----------------------------------------
 		
-		$this->_buildPermissions();
+		$this->buildPermissions();
 		
-        //-----------------------------------------
-        // Is it a redirect forum?
-        //-----------------------------------------
-        
-        if( isset( $this->forum['redirect_on'] ) AND $this->forum['redirect_on'] )
-        {
-        	$redirect = $this->DB->buildAndFetch( array( 'select' => 'redirect_url', 'from' => 'forums', 'where' => "id=".$this->forum['id']) );
+		//-----------------------------------------
+		// Is it a redirect forum?
+		//-----------------------------------------
+		
+		if( !empty( $this->forum['redirect_on'] ) )
+		{
+			$redirect = $this->DB->buildAndFetch( array( 'select' => 'redirect_url', 'from' => 'forums', 'where' => "id=".$this->forum['id']) );
 
-        	if( $redirect['redirect_url'] )
-        	{
-        		//-----------------------------------------
+			if( $redirect['redirect_url'] )
+			{
+				//-----------------------------------------
 				// Update hits:
 				//-----------------------------------------
 				
@@ -125,19 +111,15 @@ class public_forums_forums_forums extends ipsCommand
 				//-----------------------------------------
 				
 				$this->registry->getClass('output')->silentRedirect( $redirect['redirect_url'] );
-				
-				// Game over man!
-        	}
-        }
-        
-        //-----------------------------------------
-        // If this is a sub forum, we need to get
-        // the cat details, and parent details
-        //-----------------------------------------
-        
-        $this->nav = $this->registry->getClass('class_forums')->forumsBreadcrumbNav( $this->forum['id'] );
-        
-		$this->forum['FORUM_JUMP'] = $this->registry->getClass('class_forums')->buildForumJump( 1, 0, 0 );
+			}
+		}
+		
+		//-----------------------------------------
+		// If this is a sub forum, we need to get
+		// the cat details, and parent details
+		//-----------------------------------------
+		
+		$this->nav = $this->registry->getClass('class_forums')->forumsBreadcrumbNav( $this->forum['id'] );
 		
 		//-----------------------------------------
 		// Check forum access perms
@@ -149,11 +131,11 @@ class public_forums_forums_forums extends ipsCommand
 		}
 		
 		//-----------------------------------------
-        // Are we viewing the forum, or viewing the forum rules?
-        //-----------------------------------------
-        
+		// Are we viewing the forum, or viewing the forum rules?
+		//-----------------------------------------
+		
 		$subforum_data  = array();
-		$data           = array();
+		$data		   = array();
 
 		if( $this->registry->getClass('class_forums')->forumsGetChildren( $this->forum['id'] ) )
 		{
@@ -174,35 +156,16 @@ class public_forums_forums_forums extends ipsCommand
 			$subforum_data = $subforum_data ? $subforum_data : $this->showSubForums();
 		}
 		
-		/* Posting Allowed? */
-		$this->forum['_user_can_post'] = 1;
+		//-----------------------------------------
+		// Set permissions
+		//-----------------------------------------
 		
-		if( ! $this->registry->permissions->check( 'start', $this->forum ) )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
+		$this->forum['_user_can_post'] = $this->registry->class_forums->canStartTopic( $this->forum['id'] );
 
-		if( ! $this->forum['sub_can_post'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-
-		if( $this->forum['min_posts_post'] && $this->forum['min_posts_post'] > $this->memberData['posts'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
+		//-----------------------------------------
+		// Forum rules
+		//-----------------------------------------
 		
-		if( ! $this->forum['status'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-		
-		if( ! $this->memberData['g_post_new_topics'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-		
-		/* Rules */
 		if( $this->forum['show_rules'] == 2)
 		{
 			IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
@@ -219,13 +182,19 @@ class public_forums_forums_forums extends ipsCommand
 			}
 		}
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $data, 'forumViewData' );
-
 		//-----------------------------------------
 		// Show the template
 		//-----------------------------------------
-	
+		
+		if ( !$this->request['sort_key'] )
+		{
+			$this->request['sort_key'] = $this->forum['sort_key'];
+		}
+		if ( !$this->request['sort_by'] )
+		{
+			$this->request['sort_by'] = $this->forum['sort_order'];
+		}
+							
 		$template = $this->registry->getClass('output')->getTemplate('forum')->forumIndexTemplate( 
 																									$this->forum,
 																									$data['announce_data'],
@@ -237,7 +206,7 @@ class public_forums_forums_forums extends ipsCommand
 																									$data['active_users'],
 																									$this->registry->getClass('class_forums')->forumsGetModerators( $this->forum['id'] )
 																								);
-		
+																								
 		$this->registry->getClass('output')->setTitle( strip_tags($this->forum['name']) . ' - ' . ipsRegistry::$settings['board_name'] );
 		$this->registry->getClass('output')->addContent( $template );
 
@@ -249,7 +218,10 @@ class public_forums_forums_forums extends ipsCommand
 			}
 		}
 		
-		/* Set Ad code for the board index */
+		//-----------------------------------------
+		// Add code
+		//-----------------------------------------
+		
 		if( $this->registry->getClass('IPSAdCode')->userCanViewAds() )
 		{
 			$this->registry->getClass('IPSAdCode')->setGlobalCode( 'header', 'ad_code_forum_view_header' );
@@ -266,13 +238,13 @@ class public_forums_forums_forums extends ipsCommand
 		}
 		
 		$this->registry->output->addMetaTag( 'description', $this->forum['name'] . ': ' . $this->forum['description'] );
-        $this->registry->getClass('output')->sendOutput();
+		$this->registry->getClass('output')->sendOutput();
 	}
 	
 	/**
 	 * Setup for the forum controller
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initForums()
 	{
@@ -293,14 +265,32 @@ class public_forums_forums_forums extends ipsCommand
 		{
 			$this->request['selectedtids'] = IPSCookie::get('modtids');
 		}
+
+		//-----------------------------------------
+		// Get the forum info based on the forum ID,
+		// and get the category name, ID, etc.
+		//-----------------------------------------
+		
+		$this->forum = $this->registry->getClass('class_forums')->getForumById( $this->request['f'] );
+		
+		/* Followed stuffs */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$this->_like = classes_like::bootstrap( 'forums', 'forums' );
+		
+		/* Load tagging stuff */
+		if ( ! $this->registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' )  );
+		}
 	}
 	
 	/**
 	 * Builds permissions for the forum controller
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _buildPermissions()
+	public function buildPermissions()
 	{
 		$mod = $this->memberData['forumsModeratorData'];
 		
@@ -309,6 +299,7 @@ class public_forums_forums_forums extends ipsCommand
 			$this->can_edit_topics  = 1;
 			$this->can_close_topics = 1;
 			$this->can_open_topics  = 1;
+			$this->can_move_topics	= 1;
 		}
 		else if( isset($mod[ $this->forum['id'] ]) AND is_array( $mod[ $this->forum['id'] ] ) )
 		{
@@ -326,17 +317,22 @@ class public_forums_forums_forums extends ipsCommand
 			{
 				$this->can_open_topics  = 1;
 			}
+			
+			if ( $mod[ $this->forum['id'] ]['move_topics'] )
+			{
+				$this->can_move_topics  = 1;
+			}
 		}
 		
-		$this->permissions['PostSoftDelete']        = $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->forum['id'], array() );
-		$this->permissions['PostSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $this->forum['id'] );
-		$this->permissions['PostSoftDeleteSee']     = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $this->forum['id'] );
-		$this->permissions['SoftDeleteReason']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $this->forum['id'] );
-		$this->permissions['SoftDeleteContent']     = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $this->forum['id'] );
-		$this->permissions['TopicSoftDelete']        = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], array() );
-		$this->permissions['TopicSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $this->forum['id'] );
-		$this->permissions['TopicSoftDeleteSee']     = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $this->forum['id'] );
-		$this->permissions['canQueue']				 = $this->registry->getClass('class_forums')->canQueuePosts( $this->forum['id'] );
+		$this->permissions['PostSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->forum['id'], array() );
+		$this->permissions['PostSoftDeleteRestore']		= $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $this->forum['id'] );
+		$this->permissions['PostSoftDeleteSee']			= $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $this->forum['id'] );
+		$this->permissions['SoftDeleteReason']			= $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $this->forum['id'] );
+		$this->permissions['SoftDeleteContent']			= $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $this->forum['id'] );
+		$this->permissions['TopicSoftDelete']			= $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], array() );
+		$this->permissions['TopicSoftDeleteRestore']	= $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $this->forum['id'] );
+		$this->permissions['TopicSoftDeleteSee']		= $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $this->forum['id'] );
+		$this->permissions['canQueue']					= $this->registry->getClass('class_forums')->canQueuePosts( $this->forum['id'] );
 		
 		$this->forum['permissions'] =& $this->permissions;
 	}
@@ -348,11 +344,81 @@ class public_forums_forums_forums extends ipsCommand
 	 */
 	public function showSubForums()
 	{
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums' ) . '/modules_public/forums/boards.php', 'public_forums_forums_boards' );
-		$boards = new $classToLoad();
-		$boards->makeRegistryShortcuts( $this->registry );
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+
+		$return_cat_data	= array();
+		$temp_cat_data		= array();
+		$member_ids			= array();
+		$fid				= intval($this->request['f']);
+
+		if ( isset( $this->registry->getClass('class_forums')->forum_cache[ $fid ] ) AND is_array( $this->registry->getClass('class_forums')->forum_cache[ $fid ] ) )
+		{
+			$cat_data = $this->registry->getClass('class_forums')->forum_by_id[ $fid ];
+			
+			foreach( $this->registry->getClass('class_forums')->forum_cache[ $fid ] as $forum_data )
+			{
+				$forum_data['_queued_img']		= isset($forum_data['_queued_img'] )	? $forum_data['_queued_img']	: '';
+				$forum_data['_queued_info']		= isset($forum_data['_queued_info'] )	? $forum_data['_queued_info']	: '';
+				$forum_data['show_subforums']	= isset($forum_data['show_subforums'] )	? $forum_data['show_subforums']	: '';
+				$forum_data['last_unread']		= isset($forum_data['last_unread'] )	? $forum_data['last_unread']	: '';
+				
+				//-----------------------------------------
+				// Get all subforum stats
+				// and calculate
+				//-----------------------------------------
+
+				if ( $forum_data['redirect_on'] )
+				{
+					$forum_data['redirect_target']		= isset($forum_data['redirect_target']) ? $forum_data['redirect_target'] : '_parent';
+					$temp_cat_data[ $forum_data['id'] ]	= $forum_data;
+				}
+				else
+				{
+					$temp_cat_data[ $forum_data['id'] ]	= $this->registry->getClass('class_forums')->forumsFormatLastinfo( $this->registry->getClass('class_forums')->forumsCalcChildren( $forum_data['id'], $forum_data ) );
+				}
+				
+				if( $temp_cat_data[ $forum_data['id'] ]['last_poster_id'] )
+				{
+					$member_ids[ $forum_data['id'] ]	= $temp_cat_data[ $forum_data['id'] ]['last_poster_id'];
+				}
+			}
+		}
 		
-		return $boards->showSubForums( $this->request['f'] );
+		if( count($member_ids) )
+		{
+			$_members	= IPSMember::load( array_unique($member_ids), 'members,profile_portal' );
+			
+			foreach( $member_ids as $forumId => $memberId )
+			{
+				$_member	= $_members[ $memberId ];
+				
+				if( $_member['member_id'] )
+				{
+					$_member	= IPSMember::buildDisplayData( $_member );
+					
+					foreach( $temp_cat_data as $fid => $fdata )
+					{
+						if( $fid != $forumId )
+						{
+							continue;
+						}
+						
+						$temp_cat_data[ $fid ]	= array_merge( $_member, $fdata );
+						break;
+					}
+				}
+			}
+		}
+		
+		if ( count( $temp_cat_data ) )
+		{
+			$return_cat_data[] = array( 'cat_data'   => $cat_data,
+										'forum_data' => $temp_cat_data );
+		}
+		
+		return $return_cat_data;
     }
 
 	/**
@@ -370,13 +436,13 @@ class public_forums_forums_forums extends ipsCommand
 			$this->registry->getClass('output')->showError( 'forums_why_l_gt_1', 10336 );
 		}
 		
-		return ( isset( $this->request['L'] ) AND $this->request['L'] == 1 ) ? $this->authenticateUser() : $this->renderForum();
+		return !empty( $this->request['L'] ) ? $this->authenticateUser() : $this->renderForum();
 	}
 	
 	/**
 	 * Authenicate the log in for a password protected forum
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function authenticateUser()
 	{
@@ -390,9 +456,9 @@ class public_forums_forums_forums extends ipsCommand
 			$this->registry->getClass('output')->showError( 'forums_wrong_pass', 10338, null, null, 403 );
 		}
 		
-		IPSCookie::set( "ipbforumpass_".$this->forum['id'], md5( $this->request['f_password'] ) );
+		IPSCookie::set( "ipbforumpass_" . $this->forum['id'], md5( $this->request['f_password'] ) );
 		
-		$this->registry->getClass('output')->redirectScreen( $this->lang->words['logged_in'] , "{$this->settings['base_url']}showforum={$this->forum['id']}", $this->forum['name_seo'] );
+		$this->registry->getClass('output')->redirectScreen( $this->lang->words['logged_in'] , "{$this->settings['base_url']}showforum={$this->forum['id']}", $this->forum['name_seo'], 'showforum' );
 	}
 	
 	/**
@@ -406,18 +472,19 @@ class public_forums_forums_forums extends ipsCommand
 		// INIT
 		//-----------------------------------------
 		
-		$this->request['st'] =  $this->request['changefilters'] ? 0 : ( isset($this->request['st']) ? intval($this->request['st']) : 0 );
-		$announce_data  = array();
-		$topic_data     = array();
-		$other_data     = array();
-		$multi_mod_data = array();
-		$footer_filter  = array();
+		$this->request['st']	= $this->request['changefilters'] ? 0 : ( isset($this->request['st']) ? intval($this->request['st']) : 0 );
+		$announce_data			= array();
+		$topic_data				= array();
+		$other_data				= array();
+		$multi_mod_data			= array();
+		$footer_filter			= array();
+		$member_ids				= array();
 		
 		//-----------------------------------------
 		// Show?
 		//-----------------------------------------
 		
-		if ( isset(  $this->request['show'] ) AND $this->request['show'] == 'sinceLastVisit' )
+		if ( isset( $this->request['show'] ) AND $this->request['show'] == 'sinceLastVisit' )
 		{
 			$this->request['prune_day'] = 200;
 		}
@@ -426,15 +493,15 @@ class public_forums_forums_forums extends ipsCommand
 	    // Are we actually a moderator for this forum?
 	    //-----------------------------------------
 	    
-		$mod = $this->memberData['forumsModeratorData'];
+		$mod	= $this->memberData['forumsModeratorData'];
 		
-	    if ( ! $this->memberData['g_is_supmod'] )
-	    {
-	    	if( ! isset( $mod[ $this->forum['id'] ] ) OR ! is_array( $mod[ $this->forum['id'] ] ) )
-	    	{
-	    		$this->memberData['is_mod'] = 0;
-	    	}
-	    }
+		if ( ! $this->memberData['g_is_supmod'] )
+		{
+			if( ! isset( $mod[ $this->forum['id'] ] ) OR ! is_array( $mod[ $this->forum['id'] ] ) )
+			{
+				$this->memberData['is_mod'] = 0;
+			}
+		}
 	    
 		//-----------------------------------------
 		// Announcements
@@ -481,6 +548,8 @@ class public_forums_forums_forums extends ipsCommand
 					$announce['forum_id']       = $this->forum['id'];
 					$announce['announce_views'] = intval($announce['announce_views']);
 					$announce_data[] = $announce;
+
+					$member_ids[ $announce['member_id'] ]	= $announce['member_id'];
 				}
 				
 				$this->forum['_showAnnouncementsBar'] = 1;
@@ -497,15 +566,15 @@ class public_forums_forums_forums extends ipsCommand
 		// Sort options
 		//-----------------------------------------
 		
-		$cookie_prune = IPSCookie::get( $this->forum['id']."_prune_day" );
-		$cookie_sort  = IPSCookie::get( $this->forum['id']."_sort_key" );
-		$cookie_sortb = IPSCookie::get( $this->forum['id']."_sort_by" );
-		$cookie_fill  = IPSCookie::get( $this->forum['id']."_topicfilter" );
+		$cookie_prune	= IPSCookie::get( $this->forum['id'] . "_prune_day" );
+		$cookie_sort	= IPSCookie::get( $this->forum['id'] . "_sort_key" );
+		$cookie_sortb	= IPSCookie::get( $this->forum['id'] . "_sort_by" );
+		$cookie_fill	= IPSCookie::get( $this->forum['id'] . "_topicfilter" );
 		
 		$prune_value	= $this->selectVariable( array( 
 												1 => ! empty( $this->request['prune_day'] ) ? $this->request['prune_day'] : NULL,
 												2 => !empty($cookie_prune) ? $cookie_prune : NULL,
-												3 => $this->forum['prune']        ,
+												3 => $this->forum['prune'],
 												4 => '100' )
 									    );
 
@@ -513,65 +582,64 @@ class public_forums_forums_forums extends ipsCommand
 												1 => ! empty( $this->request['sort_key'] ) ? $this->request['sort_key'] : NULL,
 												2 => !empty($cookie_sort) ? $cookie_sort : NULL,
 												3 => $this->forum['sort_key'],
-												4 => 'last_post'            )
+												4 => 'last_post'		    )
 									   );
 
 		$sort_by		= $this->selectVariable( array(
 												1 => ! empty( $this->request['sort_by'] ) ? $this->request['sort_by'] : NULL,
 												2 => !empty($cookie_sortb) ? $cookie_sortb : NULL,
-												3 => $this->forum['sort_order'] ,
-												4 => 'Z-A'                      )
+												3 => $this->forum['sort_order'],
+												4 => 'Z-A'				      )
 									   );
 									 
 		$topicfilter	= $this->selectVariable( array(
 												1 => ! empty( $this->request['topicfilter'] ) ? $this->request['topicfilter'] : NULL,
 												2 => !empty($cookie_fill) ? $cookie_fill : NULL,
-												3 => $this->forum['topicfilter'] ,
-												4 => 'all'                      )
+												3 => $this->forum['topicfilter'],
+												4 => 'all'				      )
 									   );
-//print_r($this->request);exit;
-//print($cookie_sort);exit;
+
 		if( ! empty( $this->request['remember'] ) )
 		{
 			if( $this->request['prune_day'] )
 			{
-				IPSCookie::set( $this->forum['id']."_prune_day", $this->request['prune_day'] );
+				IPSCookie::set( $this->forum['id'] . "_prune_day", $this->request['prune_day'] );
 			}
 			
 			if( $this->request['sort_key'] )
 			{
-				IPSCookie::set( $this->forum['id']."_sort_key", $this->request['sort_key'] );
+				IPSCookie::set( $this->forum['id'] . "_sort_key", $this->request['sort_key'] );
 			}	
 			
 			if( $this->request['sort_by'] )
 			{
-				IPSCookie::set( $this->forum['id']."_sort_by", $this->request['sort_by'] );
+				IPSCookie::set( $this->forum['id'] . "_sort_by", $this->request['sort_by'] );
 			}	
 			
 			if( $this->request['topicfilter'] )
 			{
-				IPSCookie::set( $this->forum['id']."_topicfilter", $this->request['topicfilter'] );
+				IPSCookie::set( $this->forum['id'] . "_topicfilter", $this->request['topicfilter'] );
 			}
 		}
-		//print $sort_key;exit;
+
 		//-----------------------------------------
 		// Figure out sort order, day cut off, etc
 		//-----------------------------------------
 		
-		$Prune = $prune_value < 100 ? (time() - ($prune_value * 60 * 60 * 24)) : ( ( $prune_value == 200 AND $this->memberData['member_id'] ) ? $this->memberData['last_visit'] : 0 );
+		$Prune			= $prune_value < 100 ? (time() - ($prune_value * 60 * 60 * 24)) : ( ( $prune_value == 200 AND $this->memberData['member_id'] ) ? $this->memberData['last_visit'] : 0 );
 
-		$sort_keys   =  array( 'last_post'         => 'sort_by_date',
+		$sort_keys		=  array( 'last_post'		 => 'sort_by_date',
 							   'last_poster_name'  => 'sort_by_last_poster',
-							   'title'             => 'sort_by_topic',
+							   'title'		     => 'sort_by_topic',
 							   'starter_name'      => 'sort_by_poster',
-							   'start_date'        => 'sort_by_start',
+							   'start_date'		=> 'sort_by_start',
 							   'topic_hasattach'   => 'sort_by_attach',
-							   'posts'             => 'sort_by_replies',
-							   'views'             => 'sort_by_views',
+							   'posts'		     => 'sort_by_replies',
+							   'views'		     => 'sort_by_views',
 							   
 							 );
 
-		$prune_by_day = array( '1'    => 'show_today',
+		$prune_by_day	= array( '1'    => 'show_today',
 							   '5'    => 'show_5_days',
 							   '7'    => 'show_7_days',
 							   '10'   => 'show_10_days',
@@ -586,25 +654,25 @@ class public_forums_forums_forums extends ipsCommand
 							 );
 
 		$sort_by_keys = array( 'Z-A'  => 'descending_order',
-                         	   'A-Z'  => 'ascending_order',
-                             );
-                             
-        $filter_keys  = array( 'all'    => 'topicfilter_all',
-        					   'open'   => 'topicfilter_open',
-        					   'hot'    => 'topicfilter_hot',
-        					   'poll'   => 'topicfilter_poll',
-        					   'locked' => 'topicfilter_locked',
-        					   'moved'  => 'topicfilter_moved',
-        					 );
-        					 
-        if( $this->memberData['member_id'] )
-        {
-        	$filter_keys['istarted'] = 'topicfilter_istarted';
-        	$filter_keys['ireplied'] = 'topicfilter_ireplied';
-        }
+						 	   'A-Z'  => 'ascending_order',
+						     );
+						     
+		$filter_keys  = array( 'all'    => 'topicfilter_all',
+							   'open'   => 'topicfilter_open',
+							   'hot'    => 'topicfilter_hot',
+							   'poll'   => 'topicfilter_poll',
+							   'locked' => 'topicfilter_locked',
+							   'moved'  => 'topicfilter_moved',
+							 );
+							 
+		if( $this->memberData['member_id'] )
+		{
+			$filter_keys['istarted'] = 'topicfilter_istarted';
+			$filter_keys['ireplied'] = 'topicfilter_ireplied';
+		}
 
-        //-----------------------------------------
-        // check for any form funny business by wanna-be hackers
+		//-----------------------------------------
+		// check for any form funny business by wanna-be hackers
 		//-----------------------------------------
 		
 		if( ( ! isset( $filter_keys[$topicfilter] ) ) or ( ! isset( $sort_keys[$sort_key] ) ) or ( ! isset( $prune_by_day[$prune_value] ) ) or ( ! isset( $sort_by_keys[$sort_by] ) ) )
@@ -614,8 +682,8 @@ class public_forums_forums_forums extends ipsCommand
 	    
 	    $r_sort_by = $sort_by == 'A-Z' ? 'ASC' : 'DESC';
 	    
-        //-----------------------------------------
-        // If sorting by starter, add secondary..
+		//-----------------------------------------
+		// If sorting by starter, add secondary..
 		//-----------------------------------------
 		$sort_key_chk = $sort_key;
 		
@@ -657,7 +725,7 @@ class public_forums_forums_forums extends ipsCommand
 	    
 	    if( ! $this->memberData['g_other_topics'] or $topicfilter == 'istarted' OR ( ! $this->forum['can_view_others'] AND ! $this->memberData['is_mod'] ) )
 		{
-            $add_query_array[] = "t.starter_id='".$this->memberData['member_id']."'";
+		    $add_query_array[] = "t.starter_id='".$this->memberData['member_id']."'";
 		}
 		
 		$_SQL_EXTRA		= '';
@@ -701,11 +769,25 @@ class public_forums_forums_forums extends ipsCommand
 			if ( $prune_value == 200 )
 			{
 				/* Just new content, don't show pinned, please */
-				$_SQL_AGE_PRUNE	= " AND (t.last_post > {$Prune})";
+				if( $this->memberData['is_mod'] AND $this->request['modfilter'] )
+				{
+					$_SQL_AGE_PRUNE	= " AND (t.last_post > {$Prune} OR t.approved=0)";
+				}
+				else
+				{
+					$_SQL_AGE_PRUNE	= " AND (t.last_post > {$Prune})";
+				}
 			}
 			else
 			{
-				$_SQL_AGE_PRUNE	= " AND (t.pinned=1 or t.last_post > {$Prune})";
+				if( $this->memberData['is_mod'] AND $this->request['modfilter'] )
+				{
+					$_SQL_AGE_PRUNE	= " AND (t.pinned=1 or t.last_post > {$Prune} OR t.approved=0)";
+				}
+				else
+				{
+					$_SQL_AGE_PRUNE	= " AND (t.pinned=1 or t.last_post > {$Prune})";					
+				}
 			}
 		}
 		
@@ -719,17 +801,11 @@ class public_forums_forums_forums extends ipsCommand
 			// Checking topics we've replied to?
 			//-----------------------------------------
 
-			$this->DB->build( array(
-										'select'	=> 'COUNT(' . $this->DB->buildDistinct( 'p.topic_id' ) . ') as max',
-										'from'		=> array( 'topics' => 't' ),
-										'where'		=> " t.forum_id={$this->forum['id']} AND p.author_id=".$this->memberData['member_id'] . " AND p.new_topic=0" . $_SQL_APPROVED . $_SQL_AGE_PRUNE,
-										'add_join'	=> array(
-															array(
-																'from'	=> array( 'posts' => 'p' ),
-																'where'	=> 'p.topic_id=t.tid',
-																)
-															)
-								)		);
+			$this->DB->build( array( 'select'	=> 'COUNT(' . $this->DB->buildDistinct( 'p.topic_id' ) . ') as max',
+									 'from'		=> array( 'topics' => 't' ),
+									 'where'	=> " t.forum_id={$this->forum['id']} AND p.author_id=".$this->memberData['member_id'] . " AND p.new_topic=0" . $_SQL_APPROVED . $_SQL_AGE_PRUNE,
+									 'add_join'	=> array( array( 'from'	=> array( 'posts' => 'p' ),
+																 'where'	=> 'p.topic_id=t.tid' ) ) ) );
 			$this->DB->execute();
 			
 			$total_possible = $this->DB->fetch();
@@ -767,23 +843,25 @@ class public_forums_forums_forums extends ipsCommand
 			$_extraStuff	.= "&amp;modfilter=" . $this->request['modfilter'];
 		}
 		
-		$this->forum['SHOW_PAGES'] = $this->registry->getClass('output')->generatePagination( array( 
-																									'totalItems'        => $total_possible['max'],
-																									'itemsPerPage'      => $this->settings['display_max_topics'],
-																									'currentStartValue' => $this->request['st'],
-																									'seoTitle'			=> $this->forum['name_seo'],
-																									'baseUrl'           => "showforum=".$this->forum['id']."&amp;prune_day={$prune_value}&amp;sort_by={$sort_by}&amp;sort_key={$sort_key_chk}&amp;topicfilter={$topicfilter}{$_extraStuff}",
-																							)	);
+		$this->forum['SHOW_PAGES'] = $this->registry->getClass('output')->generatePagination( array( 'totalItems'			=> $total_possible['max'],
+																									 'itemsPerPage'			=> $this->settings['display_max_topics'],
+																									 'currentStartValue'	=> $this->request['st'],
+																									 'seoTitle'				=> $this->forum['name_seo'],
+																									 'showNumbers'			=> false,
+																									'disableSinglePage'		=> false,
+																									 'baseUrl'				=> "showforum=".$this->forum['id']."&amp;prune_day={$prune_value}&amp;sort_by={$sort_by}&amp;sort_key={$sort_key_chk}&amp;topicfilter={$topicfilter}{$_extraStuff}" )	);
 
 		//-----------------------------------------
 		// Start printing the page
 		//-----------------------------------------
 
-		$other_data = array( 'forum_data'       => $this->forum,
-							 'can_edit_topics'  => $this->can_edit_topics,
-							 'can_open_topics'  => $this->can_open_topics,
-							 'can_close_topics' => $this->can_close_topics );
-				
+		$other_data = array( 'forum_data'		=> $this->forum,
+							 'hasMore'			=> ( $this->request['st'] + $this->settings['display_max_topics'] > $total_possible['max'] ) ? false : true,
+							 'can_edit_topics'	=> $this->can_edit_topics,
+							 'can_open_topics'	=> $this->can_open_topics,
+							 'can_close_topics'	=> $this->can_close_topics,
+							 'can_move_topics'	=> $this->can_move_topics );
+
 		$total_topics_printed = 0;
 		
 		//-----------------------------------------
@@ -793,16 +871,16 @@ class public_forums_forums_forums extends ipsCommand
 		$topic_array = array();
 		$topic_ids   = array();
 		$topic_sort  = "";
-        
-        //-----------------------------------------
-        // Mod filter?
-        //-----------------------------------------
-        
-        $this->request['modfilter'] = isset( $this->request['modfilter'] ) ? $this->request['modfilter'] : '';
-        
+		
+		//-----------------------------------------
+		// Mod filter?
+		//-----------------------------------------
+		
+		$this->request['modfilter'] = isset( $this->request['modfilter'] ) ? $this->request['modfilter'] : '';
+		
 		if( $this->request['modfilter'] == 'invisible_topics' and $this->memberData['is_mod'] )
 		{
-			$topic_sort = 't.approved asc,';
+			$topic_sort = 'CASE WHEN t.approved = 0 THEN 0 ELSE 1 END ASC,';
 		}
 		else if( $this->request['modfilter'] == 'invisible_posts' and $this->memberData['is_mod'] )
 		{
@@ -810,7 +888,7 @@ class public_forums_forums_forums extends ipsCommand
 		}
 		else if( $this->request['modfilter'] == 'all' and $this->memberData['is_mod'] )
 		{
-			$topic_sort = 't.approved asc, t.topic_queuedposts desc,';
+			$topic_sort = 'CASE WHEN t.approved = 0 THEN 0 ELSE 1 END ASC, t.topic_queuedposts desc,';
 		}
 		
 		//-----------------------------------------
@@ -828,32 +906,33 @@ class public_forums_forums_forums extends ipsCommand
 			
 			$parse_dots = 0;
 			
+			$_joins	= array( array( 'select'	=> 't.*',
+							 'from'		=> array( 'posts' => 'p' ),
+							 'where'	=> 'p.topic_id=t.tid AND p.author_id=' . $this->memberData['member_id'] ) );
+
+			if( $this->settings['tags_enabled'] AND !$this->forum['bw_disable_tagging'] )
+			{
+				$_joins[]	= $this->registry->tags->getCacheJoin( array( 'meta_id_field' => 't.tid' ) );
+			}
+			
 			// For some reason, mySQL doesn't like the distinct + t.* being in reverse order...
-			$this->DB->build( array(
-										'select'	=> $this->DB->buildDistinct( 'p.author_id' ),
-										'from'		=> array( 'topics' => 't' ),
-										'where'		=> "t.forum_id=" . $this->forum['id'] . " AND t.pinned IN (0,1)" . $_SQL_APPROVED . $_SQL_AGE_PRUNE . " AND p.new_topic=0",
-										'order'		=> "t.pinned desc,{$topic_sort} t.{$sort_key} {$r_sort_by}",
-										'limit'		=> array( intval($First), intval($this->settings['display_max_topics']) ),
-										'add_join'	=> array(
-															array(
-																'select'	=> 't.*',
-																'from'		=> array( 'posts' => 'p' ),
-																'where'		=> 'p.topic_id=t.tid AND p.author_id=' . $this->memberData['member_id'],
-																)
-															)
-								)		);
+			$this->DB->build( array( 'select'	=> $this->DB->buildDistinct( 'p.author_id' ),
+									 'from'		=> array( 'topics' => 't' ),
+									 'where'		=> "t.forum_id=" . $this->forum['id'] . " AND t.pinned IN (0,1)" . $_SQL_APPROVED . $_SQL_AGE_PRUNE . " AND p.new_topic=0",
+									 'order'		=> "t.pinned desc,{$topic_sort} t.{$sort_key} {$r_sort_by}",
+									 'limit'		=> array( intval($First), intval($this->settings['display_max_topics']) ),
+									 'add_join'	=> $_joins ) );
 			$this->DB->execute();
 		}
 		else
 		{
-			$this->DB->build( array( 
-											'select' => '*',
-											'from'   => 'topics t',
-											'where'  =>  "t.forum_id=" . $this->forum['id'] . " AND t.pinned IN (0,1)" . $_SQL_APPROVED . $_SQL_AGE_PRUNE . $_SQL_EXTRA,
-											'order'  => 't.pinned DESC, '.$topic_sort.' t.'.$sort_key .' '. $r_sort_by,
-											'limit'  => array( intval($First), $this->settings['display_max_topics'] )
-									)	);
+			$this->DB->build( array( 'select'   => 't.*',
+									 'from'     => array( 'topics' =>  't' ),
+									 'where'    => "t.forum_id=" . $this->forum['id'] . " AND t.pinned IN (0,1)" . $_SQL_APPROVED . $_SQL_AGE_PRUNE . $_SQL_EXTRA,
+									 'order'    => 't.pinned DESC, '.$topic_sort.' t.'.$sort_key .' '. $r_sort_by,
+									 'limit'    => array( intval($First), $this->settings['display_max_topics'] ),
+									 'add_join' => ( $this->settings['tags_enabled'] AND !$this->forum['bw_disable_tagging'] ) ? array( $this->registry->tags->getCacheJoin( array( 'meta_id_field' => 't.tid' ) ) ) : array() 
+		 					)		);
 			$this->DB->execute();
 		}
 		
@@ -861,6 +940,11 @@ class public_forums_forums_forums extends ipsCommand
 		{
 			$topic_array[ $t['tid'] ] = $t;
 			$topic_ids[ $t['tid'] ]   = $t['tid'];
+			
+			if( $t['last_poster_id'] )
+			{
+				$member_ids[ $t['last_poster_id'] ]	= $t['last_poster_id'];
+			}
 		}
 			
 		ksort( $topic_ids );
@@ -871,10 +955,12 @@ class public_forums_forums_forums extends ipsCommand
 		
 		if( ( $this->settings['show_user_posted'] == 1 ) and ( $this->memberData['member_id'] ) and ( count($topic_ids) ) and ( $parse_dots ) )
 		{
+			$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), '' );
+
 			$this->DB->build( array( 
 									'select' => 'author_id, topic_id',
 									'from'   => 'posts',
-									'where'  => 'queued=0 AND author_id=' . $this->memberData['member_id'] . ' AND topic_id IN(' . implode( ',', $topic_ids ) . ')',
+									'where'  => $_queued . ' AND author_id=' . $this->memberData['member_id'] . ' AND post_date > 0 AND topic_id IN(' . implode( ',', $topic_ids ) . ')',
 							)	);
 									  
 			$this->DB->execute();
@@ -887,37 +973,49 @@ class public_forums_forums_forums extends ipsCommand
 				}
 			}
 		}
-		
+
 		//-----------------------------------------
-		// Are we tracking watched stuff
+		// Get needed members
 		//-----------------------------------------
 		
-		if( ( $this->settings['cpu_watch_update'] == 1 ) and ( $this->memberData['member_id'] ) and ( count($topic_ids) ) and ( $parse_dots ) )
+		if( count($member_ids) )
 		{
-			$this->DB->build( array( 
-									'select' => 'topic_id, trid as trackingTopic',
-									'from'   => 'tracker',
-									'where'  => 'member_id=' . $this->memberData['member_id'] . ' AND topic_id IN(' . implode( ',', $topic_ids ) . ')',
-							)	);
-									  
-			$this->DB->execute();
+			$_members	= IPSMember::load( $member_ids );
 			
-			while( $p = $this->DB->fetch() )
+			//-----------------------------------------
+			// Add member data to announcements
+			//-----------------------------------------
+			
+			$new_announces	= array();
+			
+			foreach( $announce_data as $announce )
 			{
-				if ( is_array( $topic_array[ $p['topic_id'] ] ) )
-				{
-					$topic_array[ $p['topic_id'] ]['trackingTopic'] = 1;
-				}
+				$announce	= array_merge( $announce, IPSMember::buildDisplayData( $_members[ $announce['member_id'] ] ) );
+				
+				$new_announces[]	= $announce;
 			}
+			
+			$announce_data	= $new_announces;
 		}
 		
 		//-----------------------------------------
 		// Show meh the topics!
 		//-----------------------------------------
+				
 		$adCodeSet	= false;
 		
 		foreach( $topic_array as $topic )
 		{
+			/* Add member */
+			if( $topic['last_poster_id'] )
+			{
+				$topic	= array_merge( IPSMember::buildDisplayData( $_members[ $topic['last_poster_id'] ] ), $topic );
+			}
+			else
+			{
+				$topic	= array_merge( IPSMember::buildProfilePhoto( array() ), $topic );
+			}
+				
 			/* AD Code */
 			if( $this->registry->getClass('IPSAdCode')->userCanViewAds() && ! $adCodeSet )
 			{
@@ -1047,12 +1145,15 @@ class public_forums_forums_forums extends ipsCommand
 			$other_data['sdData'] = IPSDeleteLog::fetchEntries( $this->_sdTids, 'topic', false );
 		}
 		
-		return array( 'announce_data'  => $announce_data,
-					  'topic_data'     => $topic_data,
-					  'other_data'     => $other_data,
-					  'multi_mod_data' => $multi_mod_data,
-					  'footer_filter'  => $footer_filter,
-					  'active_users'   => ( $this->settings['no_au_forum'] ) ? array( '_done' => 0 ) : $this->_generateActiveUserData() );
+		/* Fetch follow data */
+		$other_data['follow_data'] = $this->_like->render( 'summary', $this->forum['id'] );
+		
+		return array( 'announce_data'	=> $announce_data,
+					  'topic_data'		=> $topic_data,
+					  'other_data'		=> $other_data,
+					  'multi_mod_data'	=> $multi_mod_data,
+					  'footer_filter'	=> $footer_filter,
+					  'active_users'	=> ( $this->settings['no_au_forum'] ) ? array( '_done' => 0 ) : $this->_generateActiveUserData() );
     }
     
 	/**
@@ -1060,6 +1161,7 @@ class public_forums_forums_forums extends ipsCommand
 	 *
 	 * @return	array 	Array of data (not the most helpful description ever. Sorry
 	 * @author	Matt
+	 * @todo	[Future] Needs to be updated with the new SESSIONS API class included for 3.2
 	 */
 	protected function _generateActiveUserData()
 	{
@@ -1117,7 +1219,7 @@ class public_forums_forums_forums extends ipsCommand
 		
 		foreach( $rows as $result )
 		{
-			$result['member_name'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
+			$result['member_name'] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 			
 			$last_date = $this->registry->getClass( 'class_localization')->getDate( $result['running_time'], 'TINY' );
 			
@@ -1146,18 +1248,7 @@ class public_forums_forums_forums extends ipsCommand
 					
 					if ( ! $cached[ $result['member_name'] ] )
 					{
-						if ( $this->settings['spider_anon'] )
-						{
-							if ( $this->memberData['g_access_cp'] )
-							{
-								$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-							}
-						}
-						else
-						{
-							$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-						}
-						
+						$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
 						$cached[ $result['member_name'] ] = 1;
 					}
 					else
@@ -1191,7 +1282,7 @@ class public_forums_forums_forums extends ipsCommand
 					
 					if ( $result['login_type'] )
 					{
-						if ( $this->memberData['g_access_cp'] and ($this->settings['disable_admin_anon'] != 1) )
+						if ( $this->memberData['g_access_cp'] )
 						{
 							$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'] . '*', 'p_start' => $p_start, 'p_title' => $p_title, 'p_end' => $p_end, 'seo' => $result['seo_name'] );
 							$active['anon']++;
@@ -1228,15 +1319,14 @@ class public_forums_forums_forums extends ipsCommand
 		// INIT
 		//-----------------------------------------
 		
-		$topic['real_tid']   = $topic['tid'];
-		$topic['_last_post'] = $topic['last_post'];
+		$topic['real_tid']		= $topic['tid'];
 		
 		/* Update perms */
 		$this->permissions['TopicSoftDelete'] = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $topic );
 		
-		$topic['_isVisible'] = ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'visible' ) ? true : false;
-		$topic['_isHidden']	 = ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'hidden' ) ? true : false;
-		$topic['_isDeleted'] = ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'sdelete' ) ? true : false;
+		$topic['_isVisible']	= ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'visible' ) ? true : false;
+		$topic['_isHidden']		= ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'hidden' ) ? true : false;
+		$topic['_isDeleted']	= ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'sdelete' ) ? true : false;
 		
 		/* Collect TIDS of soft deleted topics */
 		if ( $topic['_isDeleted'] AND $this->permissions['TopicSoftDeleteSee'] )
@@ -1245,26 +1335,16 @@ class public_forums_forums_forums extends ipsCommand
 		}
 		
 		//-----------------------------------------
-		// Do we have an SEO title?
+		// Rebuild SEO title on the fly, if needed
 		//-----------------------------------------
-		
-		$_hasSEOTitle	= false;
-		
-		if( $topic['title_seo'] )
-		{
-			$_hasSEOTitle	= true;
-		}
-		
-		$topic['title_seo'] = ( $topic['title_seo'] ) ? $topic['title_seo'] : IPSText::makeSeoTitle( $topic['title'] );
-		
-		/**
-		 * Here we'll take the one query hit to update in order to speed it up in the future
-		 */
-		if ( ! $_hasSEOTitle AND $this->settings['use_friendly_urls'] )
+
+		if( ! $topic['title_seo'] )
 		{
+			$topic['title_seo']	= IPSText::makeSeoTitle( $topic['title'] );
+			
 			$this->DB->update( 'topics', array( 'title_seo' => ( $topic['title_seo'] ) ? $topic['title_seo'] : '-' ), 'tid=' . $topic['tid'] );
 		}
-	
+
 		//-----------------------------------------
 		// Need to update this topic?
 		//-----------------------------------------
@@ -1311,66 +1391,81 @@ class public_forums_forums_forums extends ipsCommand
 				}
 			}					
 		}
-
+		
 		//-----------------------------------------
-		// For polls we check last vote instead
-		// @todo [Future] Show a diff icon for new vote + new reply, new vote + no new reply, etc.
-		// Bug 16598: Need separate checks for icon vs getnewpost link
+		// Linky pinky!
 		//-----------------------------------------
 		
-		if( $topic['poll_state'] AND ( $topic['last_vote'] > $topic['last_post'] ) )
+		/* We need original _tid in the skin template for linked topics, so we'll reassign here and just use that in the template, rather
+			than add a bunch of HTML logic to show _tid for link and tid for regular topics */
+		$topic['_tid']			= $topic['tid'];
+		$topic['_forum_id']		= $topic['forum_id'];
+		
+		if ( $topic['state'] == 'link' )
 		{
-			$is_read		= $this->registry->classItemMarking->isRead( array( 'forumID' => $topic['forum_id'], 'itemID' => $topic['tid'], 'itemLastUpdate' => $topic['last_vote'] ), 'forums' );
-			$gotonewpost	= $this->registry->classItemMarking->isRead( array( 'forumID' => $topic['forum_id'], 'itemID' => $topic['tid'], 'itemLastUpdate' => $topic['last_post'] ), 'forums' );
+			$t_array				= explode("&", $topic['moved_to']);
+			$topic['tid']			= $t_array[0];
+			$topic['forum_id']		= $t_array[1];
+			$topic['title']			= $topic['title'];
+			$topic['views']			= '--';
+			$topic['prefix']		= $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->lang->words['pre_moved'] );
+		}
+
+		/* Fetch last marking time for this entry */
+		$lastMarked = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $topic['_forum_id'] ? $topic['_forum_id'] : $topic['forum_id'], 'itemID' => $topic['tid'] ) );
+		
+		/* Check against it */
+		if ( $topic['poll_state'] AND ( $topic['last_vote'] > $topic['last_post'] ) )
+		{
+			$topic['_hasUnread'] = ( $lastMarked < $topic['last_vote'] ) ? true : false;
 		}
 		else
 		{
-			$is_read		= $this->registry->classItemMarking->isRead( array( 'forumID' => $topic['forum_id'], 'itemID' => $topic['tid'], 'itemLastUpdate' => $topic['last_post'] ), 'forums' );
-			$gotonewpost	= $is_read;
+			$topic['_hasUnread'] = ( $lastMarked < $topic['last_post'] ) ? true : false;
 		}
 		
+		/* Determine which link normal or /unread */
+		if ( $lastMarked && $topic['posts'] && $topic['_hasUnread'] )
+		{
+			/* They've seen this topic but not all of it or there have been new */
+			$topic['_canJumpToUnread'] = true;
+		}
+		
+		if ( $topic['_hasUnread'] )
+		{
+			$topic['_unreadUrl'] = $this->registry->output->buildSEOUrl( 'showtopic=' . $topic['tid'] . '&amp;view=getnewpost', 'public', $topic['title_seo'], 'showtopicunread' );
+		}
+		
+		$topic['_url'] = $this->registry->output->buildSEOUrl( 'showtopic=' . $topic['tid'], 'public', $topic['title_seo'], 'showtopic' );
+		
 		//-----------------------------------------
 		// Yawn
 		//-----------------------------------------
 
-		$topic['last_poster'] = $topic['last_poster_id'] ? IPSLib::makeProfileLink( $topic['last_poster_name'], $topic['last_poster_id'], $topic['seo_last_name'] ) : $this->settings['guest_name_pre'] . $topic['last_poster_name'] . $this->settings['guest_name_suf'];
-
-		$topic['starter']     = $topic['starter_id']     ? IPSLib::makeProfileLink( $topic['starter_name'], $topic['starter_id'], $topic['seo_first_name'] ) : $this->settings['guest_name_pre'] . $topic['starter_name'] . $this->settings['guest_name_suf'];
-	 
-		$topic['prefix']  = $topic['poll_state'] ? $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->settings['pre_polls'] ) : '';
-		
-		$show_dots = "";
-		
-		if ( $this->memberData['member_id'] and ( isset($topic['author_id']) AND $topic['author_id'] ) )
-		{
-			$show_dots = 1;
-		}
-	
-		$topic['folder_img'] = $this->registry->getClass('class_forums')->fetchTopicFolderIcon( $topic, $show_dots, $is_read );
-
-		$topic['start_date'] = $this->registry->getClass( 'class_localization')->getDate( $topic['start_date'], 'LONG' );
+		$topic['last_poster']	= $topic['last_poster_id']	? IPSMember::makeProfileLink( $topic['last_poster_name'], $topic['last_poster_id'], $topic['seo_last_name'] ) : $this->settings['guest_name_pre'] . $topic['last_poster_name'] . $this->settings['guest_name_suf'];
+		$topic['starter']		= $topic['starter_id']		? IPSMember::makeProfileLink( $topic['starter_name'], $topic['starter_id'], $topic['seo_first_name'] ) : $this->settings['guest_name_pre'] . $topic['starter_name'] . $this->settings['guest_name_suf'];
+		$topic['prefix']		= $topic['poll_state']		? $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->lang->words['poll_prefix'] ) : '';
+		$topic['folder_img']	= $this->registry->getClass('class_forums')->fetchTopicFolderIcon( $topic, ( $this->memberData['member_id'] and !empty($topic['author_id']) ), ( $topic['_hasUnread'] ? 0 : 1 ) );
 	
 		//-----------------------------------------
 		// Pages 'n' posts
 		//-----------------------------------------
 		
-		$pages = 1;
-		$topic['PAGES'] = "";
+		$pages			= 1;
+		$topic['pages']	= "";
 		
 		if ( $this->permissions['canQueue'] )
 		{
 			$topic['posts'] += intval($topic['topic_queuedposts']);
 		}
 		
+		if( $this->permissions['PostSoftDeleteSee'] )
+		{
+			$topic['posts'] += intval($topic['topic_deleted_posts']);
+		}
+		
 		if ($topic['posts'])
 		{
-			$mode = IPSCookie::get( 'topicmode' );
-			
-			if( $mode == 'threaded' )
-			{
-				$this->settings['display_max_posts'] =  $this->settings['threaded_per_page'] ;
-			}
-			
 			if ( (($topic['posts'] + 1) % $this->settings['display_max_posts']) == 0 )
 			{
 				$pages = ($topic['posts'] + 1) / $this->settings['display_max_posts'];
@@ -1393,65 +1488,23 @@ class public_forums_forums_forums extends ipsCommand
 				{
 					$topic['pages'][] = array( 'last'   => 1,
 					 					       'st'     => ($pages - 1) * $this->settings['display_max_posts'],
-					  						   'page'   => $pages );
+					  						   'page'   => $pages,
+					 							'total' => $pages );
 					break;
 				}
 				else
 				{
 					$topic['pages'][] = array( 'last' => 0,
 											   'st'   => $real_no,
-											   'page' => $page_no );
+											   'page' => $page_no,
+											 	'total' => $pages );
 				}
 			}
 		}
 		
-		//-----------------------------------------
-		// Format some numbers
-		//-----------------------------------------
-		
-		$topic['__posts'] = $topic['posts'];
-		$topic['posts']   = $this->registry->getClass('class_localization')->formatNumber( intval($topic['posts']) );
-		$topic['views']	  = $this->registry->getClass('class_localization')->formatNumber( intval($topic['views']) );
-		
-		//-----------------------------------------
-		// Jump to latest post / last time stuff...
-		//-----------------------------------------
-		
-		if ( !$gotonewpost )
-		{
-			$topic['go_new_post']  = true;
-		}
-		else
-		{
-			$topic['go_new_post']  = false;
-		}
-	
-	//	$topic['last_post']  = $this->registry->getClass( 'class_localization')->getDate( $topic['last_post'], 'SHORT' );
-		
-		//-----------------------------------------
-		// Linky pinky!
-		//-----------------------------------------
-			
-		if ($topic['state'] == 'link')
-		{
-			$t_array = explode("&", $topic['moved_to']);
-			$topic['tid']       = $t_array[0];
-			$topic['forum_id']  = $t_array[1];
-			$topic['title']     = $topic['title'];
-			$topic['views']     = '--';
-			$topic['posts']     = '--';
-			$topic['prefix']    = $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->settings['pre_moved'] );
-			$topic['go_new_post'] = false;
-		}
-		else
-		{
-			$topic['_posts'] = $topic['posts'];
-			$topic['posts'] = $this->registry->getClass('output')->getTemplate('forum')->who_link($topic['tid'], $topic['posts']);
-		}
-		
 		$topic['_hasqueued'] = 0;
-		$mod = $this->memberData['forumsModeratorData'];
-		$mod = $mod ? $mod : array();
+
+		$mod	= $this->memberData['forumsModeratorData'] ? $this->memberData['forumsModeratorData'] : array();
 		
 		if ( ( $this->memberData['g_is_supmod'] or
 				($mod[ $topic['forum_id'] ]['post_q'] AND $mod[ $topic['forum_id'] ]['post_q'] == 1) ) and 
@@ -1467,7 +1520,7 @@ class public_forums_forums_forums extends ipsCommand
 		
 	    $topic['_rate_img']   = '';
 	    
-	    if ( isset($this->forum['forum_allow_rating']) AND $this->forum['forum_allow_rating'] )
+	    if ( !empty($this->forum['forum_allow_rating']) )
 		{
 			if ( $topic['topic_rating_total'] )
 			{
@@ -1503,6 +1556,12 @@ class public_forums_forums_forums extends ipsCommand
 			}
 		}
 		
+		/* Tags */
+		if ( ! empty( $topic['tag_cache_key'] ) )
+		{
+			$topic['tags'] = $this->registry->tags->formatCacheJoinData( $topic );
+		}
+		
 		return $topic;
 	}
 	
@@ -1516,15 +1575,15 @@ class public_forums_forums_forums extends ipsCommand
 	{
 		$topic = $this->parseTopicData( $topic );
 		
-		$topic['PAGES']			     = isset($topic['PAGES']) 		? $topic['PAGES'] 		: '';
-		$topic['prefix']		     = isset($topic['prefix'])		? $topic['prefix']		: '';
-		$topic['attach_img'] 	     = isset($topic['attach_img']) 	? $topic['attach_img'] 	: '';
-		$topic['_hasqueued'] 	     = isset($topic['_hasqueued']) 	? $topic['_hasqueued'] 	: '';
-		$topic['tidon']		  	     = isset($topic['tidon'])		? $topic['tidon']		: 0;
+		$topic['pages']				= isset($topic['pages'])		? $topic['pages']		: '';
+		$topic['prefix']			= isset($topic['prefix'])		? $topic['prefix']		: '';
+		$topic['attach_img']		= isset($topic['attach_img'])	? $topic['attach_img']	: '';
+		$topic['_hasqueued']		= isset($topic['_hasqueued'])	? $topic['_hasqueued']	: '';
+		$topic['tidon']				= isset($topic['tidon'])		? $topic['tidon']		: 0;
 		
 		if( $topic['pinned'] == 1 )
 		{
-			$topic['prefix'] = $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->settings['pre_pinned'] );
+			$topic['prefix'] = $this->registry->getClass('output')->getTemplate('forum')->topicPrefixWrap( $this->lang->words['pre_pinned'] );
 		}
 		
 		return $topic;
diff --git a/upload/admin/applications/forums/modules_public/forums/index.html b/upload/admin/applications/forums/modules_public/forums/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/forums/index.html
+++ b/upload/admin/applications/forums/modules_public/forums/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/forums/markasread.php b/upload/admin/applications/forums/modules_public/forums/markasread.php
index 2dbecafa..b1af0289 100644
--- a/upload/admin/applications/forums/modules_public/forums/markasread.php
+++ b/upload/admin/applications/forums/modules_public/forums/markasread.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forums -> Mark As Read command class
- * Last Updated: $Date: 2010-04-06 07:02:13 -0400 (Tue, 06 Apr 2010) $
+ * Last Updated: $Date: 2011-07-14 03:36:38 -0400 (Thu, 14 Jul 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Rev: 6069 $
+ * @version		$Rev: 9230 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_forums_forums_markasread extends ipsCommand
 	/**
 	 * Main execution point
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -48,16 +47,19 @@ class public_forums_forums_markasread extends ipsCommand
 			break;
 			case 'all':
 				return $this->markBoardAsRead();
+			break;
+			case 'app':
+				return $this->markBoardAsRead( trim( $this->request['markApp'] ) );
+			break;
 		}
 	}
 	
 	/**
 	 * Mark all forums and topics as read
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
- 	public function markBoardAsRead()
+ 	public function markBoardAsRead( $app=null )
  	{
         //-----------------------------------------
         // Check
@@ -74,27 +76,25 @@ class public_forums_forums_markasread extends ipsCommand
 		//-----------------------------------------
         // Reset board markers
         //-----------------------------------------
-        
-		/*foreach( ipsRegistry::$applications as $app_dir => $data )
-		{
-			if ( isset( $data['app_enabled'] ) AND $data['app_enabled'] )
-			{
-				$this->registry->classItemMarking->markAppAsRead( $app_dir );
-			}
-		}*/
-		
-		# Bug fix 21223 - reset all markers with one cookie save
-		$this->registry->classItemMarking->markAppAsRead();
 
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'act=idx', 'false' );
+		# Bug fix 21223 - reset all markers with one cookie save
+		$this->registry->classItemMarking->markAppAsRead( $app );
+
+		if( $app && !in_array( $app, array('core','forums') ) )
+		{
+			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=' . $app, 'false' );
+		}
+		else
+		{
+			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] );
+		}
 	}
 	
 	/**
 	 * Marks the specified forum as read
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function markForumAsRead()
 	{
 		//-----------------------------------------
@@ -113,7 +113,7 @@ class public_forums_forums_markasread extends ipsCommand
         
         if ( ! $forum_data['id'] )
         {
-        	$this->registry->getClass('output')->showError( 'markread_no_id', 10340, null, null, 404 );
+        	$this->registry->getClass('output')->showError( 'markread_no_id', 10340.8, null, null, 404 );
         }
 
 		/* Turn off instant updates and write back tmp markers in destructor */
diff --git a/upload/admin/applications/forums/modules_public/forums/printtopic.php b/upload/admin/applications/forums/modules_public/forums/printtopic.php
deleted file mode 100644
index 8b33126c..00000000
--- a/upload/admin/applications/forums/modules_public/forums/printtopic.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Print Topic
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
- * </pre>
- *
- * @author		$Author: danc $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Rev: 6502 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_forums_forums_printtopic extends ipsCommand
-{
-	/**
-	 * Temporary output
-	 *
-	 * @access	private
-	 * @var		string
-	 */
-	private $output = "";
-	
-	/**
-	 * Forum data
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $forum	= array();
-	
-	/**
-	 * Topic data
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $topic	= array();
-
-	private $attach_pids;
-	
-	/**
-	 * Main execution function
-	 *
-	 * @access	public
-	 * @param	object	Registry Object
-	 * @return	void
-	 * @todo 	Need error codes
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$_moderator = $this->memberData['forumsModeratorData'];
-		
-		//-----------------------------------------
-		// Compile the language file
-		//-----------------------------------------
-		
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_printpage' ) );
-		
-		//-----------------------------------------
-		// Check the input
-		//-----------------------------------------
-		
-		$this->request['t'] =  intval($this->request['t'] );
-		$this->request['f'] =  intval($this->request['f'] );
-		
-		if ( ! $this->request['t'] or ! $this->request['f'] )
-		{
-			$this->registry->getClass('output')->showError( 'missing_files', 0, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Get the forum info based on the
-		// forum ID, get the category name, ID,
-		// and get the topic details
-		//-----------------------------------------
-		
-		$this->topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => "tid=" . $this->request['t'] ) );
-		$this->forum = $this->registry->getClass('class_forums')->forum_by_id[ $this->topic['forum_id'] ];
-							
-		//-----------------------------------------
-		// Error out if we can not find the forum
-		//-----------------------------------------
-		
-		if ( ! $this->forum['id'] )
-		{
-			$this->registry->getClass('output')->showError( 'missing_files', 0, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Error out if we can not find the topic
-		//-----------------------------------------
-		
-		if ( ! $this->topic['tid'] )
-		{
-			$this->registry->getClass('output')->showError( 'missing_files', 0, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Check viewing permissions, private forums,
-		// password forums, etc
-		//-----------------------------------------
-		
-		if ( ( ! $this->topic['pinned'] ) and ( ! $this->memberData['g_other_topics'] ) )
-		{
-			$this->registry->getClass('output')->showError( 'no_view_topic', 0, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Check access
-		//-----------------------------------------
-		
-		$this->registry->getClass('class_forums')->forumsCheckAccess( $this->forum['id'], 1, 'topic' );
-		
-		if ( ! $this->topic['approved'] AND !( $this->memberData['g_is_supmod'] OR $_moderator[ $this->topic['forum_id'] ]['topic_q'] ) )
-		{
-			$this->registry->getClass('output')->showError( 'no_view_topic', 0, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Main logic engine
-		//-----------------------------------------
-		
-		if ($this->request['client'] == 'choose')
-		{
-			$this->page_title = $this->topic['title'];
-		
-			$this->nav = array( array( $this->forum['name'], "showforum={$this->forum['id']}" ),
-								 array( $this->topic['title'], "showtopic={$this->topic['tid']}" )
-								);
-							   
-							   
-			$this->output = $this->registry->getClass('output')->getTemplate('printpage')->choose_form($this->forum['id'], $this->topic['tid'], $this->topic['title']);
-
-			$this->registry->getClass('output')->setTitle( $this->page_title . ' - ' . ipsRegistry::$settings['board_name'] );
-			$this->registry->getClass('output')->addContent( $this->output );
-			
-			if( is_array( $this->nav ) AND count( $this->nav ) )
-			{
-				foreach( $this->nav as $_id => $_nav )
-				{
-					$this->registry->getClass('output')->addNavigation( $_nav[0], $_nav[1] );
-				}
-			}
-
-			$this->registry->getClass('output')->sendOutput();
-			
-			exit();
-		}
-		else
-		{
-			$header = 'text/html';
-			$ext	= '.html';
-			
-			switch ($this->request['client'])
-			{
-				case 'printer':
-					$header = 'text/html';
-					$ext	= '.html';
-					break;
-				case 'html':
-					$header = 'unknown/unknown';
-					$ext	= '.html';
-					break;
-				default:
-					$header = 'application/msword';
-					$ext	= '.doc';
-			}
-		}
-		
-		$title = substr( str_replace( " ", "_" , preg_replace( "/&(lt|gt|quot|#124|#036|#33|#39);/", "", $this->topic['title'] ) ), 0, 100);
-		
-		@header( "Content-type: {$header};charset=" . IPS_DOC_CHAR_SET );
-		
-		if ( $this->request['client'] != 'printer' )
-		{
-			@header("Content-Disposition: attachment; filename=$title".$ext);
-		}
-		
-		print $this->getPosts();
-		
-		exit;
-	}
-	
-	/**
-	 * Gets the posts to be printed/downloaded
-	 *
-	 * @access	protected
-	 * @return	string
-	 **/
-	protected function getPosts()
-	{
-		//-----------------------------------------
-		// Render the page top
-		//-----------------------------------------
-
-		$posts_html = $this->registry->getClass('output')->getTemplate('printpage')->pp_header( $this->forum['name'], $this->topic['title'], $this->topic['starter_name'] , $this->forum['id'], $this->topic['tid'] );
-
-		$max_posts	 = 300;
-		$attach_pids = array();
-		
-		$this->DB->build( array( 
-								'select'   => 'p.*',
-								'from'	   => array( 'posts' => 'p' ),
-								'where'	   => "p.topic_id={$this->topic['tid']} and p.queued=0",
-								'order'	   => 'p.pid',
-								'limit'	   => array( 0, $max_posts ),
-								'add_join' => array(
-													array(
-															'select' => 'm.members_display_name',
-															'from'	 => array( 'members' => 'm' ),
-															'where'	 => 'm.member_id=p.author_id',
-															'type'	 => 'left'
-														)
-													)
-						)	);
-		$this->DB->execute();
-		
-		//-----------------------------------------	   
-		// Loop through to pick out the correct member IDs.
-		// and push the post info into an array - maybe in the future
-		// we can add page spans, or maybe save to a PDF file?
-		//-----------------------------------------
-		
-		$the_posts		= array();
-		$mem_ids		= array();
-		$member_array	= array();
-		$cached_members = array();
-		$pids			= array();
-		
-		while ( $i = $this->DB->fetch() )
-		{
-			$the_posts[ $i['pid' ]] = $i;
-			$this->attach_pids[]	= $i['pid'];
-			
-			if ( $i['author_id'] )
-			{
-				$mem_ids[ $i['author_id'] ] = $i['author_id'];
-			}
-		}
-		
-		$the_posts = $this->_parseAttachments( $the_posts, $this->attach_pids );
-		
-		//-----------------------------------------
-		// Get the member profiles needed for this topic
-		//-----------------------------------------
-		
-		if ( count( $mem_ids ) )
-		{
-			$this->DB->build( array( 
-									'select'   => 'm.*',
-									'from'	   => array( 'members' => 'm' ),
-									'where'	   => 'm.member_id IN ('.implode( ',', $mem_ids ).')',
-									'add_join' => array(
-														array( 
-																'select' => 'g.*',
-																'from'	 => array( 'groups' => 'g' ),
-																'where'	 => 'g.g_id=m.member_group_id',
-																'type'	 => 'left' 
-															) 
-														) 
-							)	);
-			
-			$this->DB->execute();
-		
-			while( $m = $this->DB->fetch() )
-			{
-				$member_array[ $m['member_id'] ] = $m;
-			}
-		}
-		
-		//-----------------------------------------
-		// Format and print out the topic list
-		//-----------------------------------------
-
-		foreach( $the_posts as $row )
-		{
-			$poster = array();
-			
-			//-----------------------------------------
-			// Get the member info. We parse the data and cache it.
-			// It's likely that the same member posts several times in
-			// one page, so it's not efficient to keep parsing the same
-			// data
-			//-----------------------------------------
-			
-			if( $row['author_id'] != 0 )
-			{
-				//-----------------------------------------
-				// Is it in the hash?
-				//-----------------------------------------
-				
-				if ( isset($cached_members[ $row['author_id'] ]) )
-				{
-					//-----------------------------------------
-					// Ok, it's already cached, read from it
-					//-----------------------------------------
-					
-					$poster = $cached_members[ $row['author_id'] ];
-					$row['name_css'] = 'normalname';
-				}
-				else
-				{
-					//-----------------------------------------
-					// Ok, it's NOT in the cache, is it a member thats
-					// not been deleted?
-					//-----------------------------------------
-					
-					if ($member_array[ $row['author_id'] ])
-					{
-						$row['name_css'] = 'normalname';
-						$poster = $member_array[ $row['author_id'] ];
-						
-						//-----------------------------------------
-						// Add it to the cached list
-						//-----------------------------------------
-						
-						$cached_members[ $row['author_id'] ] = $poster;
-					}
-					else
-					{
-						//-----------------------------------------
-						// It's probably a deleted member, so treat them as a guest
-						//-----------------------------------------
-						
-						$poster = IPSMember::setUpGuest( $row['author_name'] );
-						$row['name_css'] = 'unreg';
-					}
-				}
-			}
-			else
-			{
-				//-----------------------------------------
-				// It's definately a guest...
-				//-----------------------------------------
-				
-				$poster = IPSMember::setUpGuest( $row['author_name'] );
-				$row['name_css'] = 'unreg';
-			}
-
-			//-----------------------------------------
-			
-			$row['post'] = preg_replace( "/<!--EDIT\|(.+?)\|(.+?)-->/", "", $row['post'] );
-			
-			//-----------------------------------------
-		
-			$row['post_date']	= $this->registry->getClass( 'class_localization')->getDate( $row['post_date'], 'LONG', 1 );
-			
-			//-----------------------------------------
-			// Quoted attachments?
-			//-----------------------------------------
-			
-			$attach_pids[ $row['pid'] ] = $row['pid'];
-
-			$row['post']	= $this->parseMessage( $row['post'], $row );
-
-			//-----------------------------------------
-			// Parse HTML tag on the fly
-			//-----------------------------------------
-			
-			$posts_html .= $this->registry->getClass('output')->getTemplate('printpage')->pp_postentry( $poster, $row );
-		}
-		
-		if ( count( $attach_pids ) )
-		{
-			if ( ! is_object( $this->class_attach ) )
-			{
-				//-----------------------------------------
-				// Grab render attach class
-				//-----------------------------------------
-
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
-				$this->class_attach		   =  new $classToLoad( $this->registry );
-				$this->class_attach->type  = 'post';
-				$this->class_attach->init();
-			}
-
-			$posts_html = $this->class_attach->renderAttachments( $posts_html, $attach_pids );
-			
-			$posts_html = $posts_html[0]['html'];
-		}
-		
-		//-----------------------------------------
-		// Print the footer
-		//-----------------------------------------
-		
-		$posts_html .= $this->registry->getClass('output')->getTemplate('printpage')->pp_end();
-		
-		//-----------------------------------------
-		// Macros
-		//-----------------------------------------
-		
-		$posts_html = $this->registry->getClass('output')->replaceMacros( $posts_html );
-		
-		//-----------------------------------------
-		// CSS
-		//-----------------------------------------
-		
-		$this->registry->getClass('output')->skin['_usecsscache'] = 0;
-		
-		return $posts_html;
-	}
-	
-	/**
-	* Parse attachments
-	*
-	* @access	public
-	* @param	array	Array of post data
-	* @return	string	HTML parsed by attachment class
-	*/
-	public function _parseAttachments( $postData )
-	{
-		//-----------------------------------------
-		// INIT. Yes it is
-		//-----------------------------------------
-		
-		$postHTML = array();
-		
-		//-----------------------------------------
-		// Separate out post content
-		//-----------------------------------------
-		
-		foreach( $postData as $id => $post )
-		{
-			$postHTML[ $id ] = $post['post'];
-		}
-		
-		//-----------------------------------------
-		// ATTACHMENTS!!!
-		//-----------------------------------------
-		
-		if ( $this->topic['topic_hasattach'] )
-		{
-			if ( ! is_object( $this->class_attach ) )
-			{
-				//-----------------------------------------
-				// Grab render attach class
-				//-----------------------------------------
-
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
-				$this->class_attach		   =  new $classToLoad( $this->registry );
-			}
-			
-			//-----------------------------------------
-			// Not got permission to view downloads?
-			//-----------------------------------------
-			
-			if ( $this->registry->permissions->check( 'download', $this->registry->class_forums->forum_by_id[ $this->topic['forum_id'] ] ) === FALSE )
-			{
-				$this->settings['show_img_upload'] =  0 ;
-			}
-			
-			//-----------------------------------------
-			// Continue...
-			//-----------------------------------------
-			
-			$this->class_attach->type  = 'post';
-			$this->class_attach->init();
-			
-			# attach_pids is generated in the func_topic_xxxxx files
-			$attachHTML = $this->class_attach->renderAttachments( $postHTML, $this->attach_pids );
-		}
-
-		/* Now parse back in the rendered posts */
-		if( is_array($attachHTML) AND count($attachHTML) )
-		{
-			foreach( $attachHTML as $id => $data )
-			{
-				/* Get rid of any lingering attachment tags */
-				if ( stristr( $data['html'], "[attachment=" ) )
-				{
-					$data['html'] = IPSText::stripAttachTag( $data['html'] );
-				}
-				
-				$postData[ $id ]['post']		   = $data['html'];
-				$postData[ $id ]['attachmentHtml'] = $data['attachmentHtml'];
-			}
-		}
-
-		return $postData;
-	}
-	
-	/**
-	 * Parses Posts
-	 *
-	 * @access	protected
-	 * @param	string	$message	Text
-	 * @param	array	$row		Formatting params
-	 * @return	string
-	 **/
-	protected function parseMessage( $message="", $row=array() )
-	{
-		IPSText::getTextClass( 'bbcode' )->parse_smilies			= $row['use_emo'];
-		IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->forum['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $row['post_htmlstate'] == 2 ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->forum['use_ibc'];
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];
-
-		return IPSText::getTextClass( 'bbcode' )->preDisplayParse( $message );
-	}
-}
diff --git a/upload/admin/applications/forums/modules_public/forums/rules.php b/upload/admin/applications/forums/modules_public/forums/rules.php
index 27e8f3d0..bd648625 100644
--- a/upload/admin/applications/forums/modules_public/forums/rules.php
+++ b/upload/admin/applications/forums/modules_public/forums/rules.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Show forum rules
- * Last Updated: $Date: 2010-10-05 21:26:08 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6945 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,17 +28,15 @@ class public_forums_forums_rules extends ipsCommand
 	/**
 	 * Array of form data
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $forum	= array();
+	protected $forum	= array();
 
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -64,7 +62,7 @@ class public_forums_forums_rules extends ipsCommand
 		// Is it a redirect forum?
 		//-----------------------------------------
 
-		if( isset( $this->forum['redirect_on'] ) AND $this->forum['redirect_on'] )
+		if( !empty( $this->forum['redirect_on'] ) )
 		{
 			$redirect = $this->DB->buildAndFetch( array( 'select' => 'redirect_url', 'from' => 'forums', 'where' => "id=" . $this->forum['id']) );
 
diff --git a/upload/admin/applications/forums/modules_public/forums/topics.php b/upload/admin/applications/forums/modules_public/forums/topics.php
index c30cc9c4..ee64e606 100644
--- a/upload/admin/applications/forums/modules_public/forums/topics.php
+++ b/upload/admin/applications/forums/modules_public/forums/topics.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Topic View
- * Last Updated: $Date: 2010-10-19 08:45:58 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $Date: 2011-10-11 11:50:01 -0400 (Tue, 11 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6994 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9597 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,28 +29,7 @@ class public_forums_forums_topics extends ipsCommand
 	 *
 	 * @var		string
 	 */
-	private $_firstPostContent = '';
-	
-	/**
-	 * Moderators in this forum
-	 *
-	 * @var		array
-	 */
-	public $moderator	= array();
-	
-	/**
-	 * Forum data
-	 *
-	 * @var		array
-	 */
-	public $forum		= array();
-	
-	/**
-	 * Topic data
-	 *
-	 * @var		array
-	 */
-	public $topic		= array();
+	protected $_firstPostContent = '';
 
 	/**
 	 * Number of posts so far (offset)
@@ -59,27 +38,6 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public $post_count	 = 0;
 	
-	/**
-	 * Parsed member data
-	 *
-	 * @var		array
-	 */
-	public $cached_members	= array();
-	
-	/**
-	 * Is first post printed?
-	 *
-	 * @var		bool
-	 */
-	public $first_printed	= false;
-	
-	/**
-	 * Printed any posts?
-	 *
-	 * @var		bool
-	 */
-	public $printed		= false;
-	
 	/**
 	 * First post id
 	 *
@@ -107,13 +65,6 @@ class public_forums_forums_topics extends ipsCommand
 	 * @var		array
 	 */
 	public $attach_pids	= array();
-	
-	/**
-	 * Last read topic id
-	 *
-	 * @var		integer
-	 */
-	public $last_read_tid	= 0;
 
 	/**
 	 * Can rate a topic permission
@@ -129,39 +80,24 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public $poll_only	= false;
 	
+	/**
+	 * Can we edit at least one post?
+	 * 
+	 * @var		boolean
+	 */
+ 	protected $_canEditAPost	= false;
+	
 	/**
 	 * Attachments library
 	 *
 	 * @var		object
 	 */
 	public $class_attach;
-	
-	/**
-	 * Test to see if user is restricted by Posts per day
-	 *
-	 * @var	   int
-	 */
-	private $_ppd_ok = TRUE;
-	
-	/**
-	 * Topic view mode
-	 *
-	 * @var	   string
-	 */
-	private $topic_view_mode = '';
-	
-	/**
-	 * Cache Monitor
-	 *
-	 * @var		array
-	 */
-	private $_cacheMonitor = array( 'post' => array( 'cached' => 0, 'raw' => 0 ),
-									'sig'  => array( 'cached' => 0, 'raw' => 0 ) );
 
 	/**
 	 * Soft deleted PIDS
 	 */
-	private $_sdPids = array();
+	protected $_sdPids = array();
 	
 	/**
 	 * Permissions array
@@ -169,12 +105,18 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	protected $permissions = array();
 	
+	/**
+	 * Max post date for this page
+	 * 
+	 */
+	protected $_maxPostDate = 0;
+	
 	/**
 	 * Mod actions
 	 *
 	 * @var		array
 	 */
-	private $mod_action = array(	'CLOSE_TOPIC'   => '00',
+	protected $mod_action = array(	'CLOSE_TOPIC'   => '00',
 									'OPEN_TOPIC'	=> '01',
 									'MOVE_TOPIC'	=> '02',
 									'DELETE_TOPIC'  => '03',
@@ -185,119 +127,12 @@ class public_forums_forums_topics extends ipsCommand
 									'MERGE_TOPIC'   => '60',
 									'TOPIC_HISTORY' => '90',
 								);
-							 							 
-							 	
-	/**
-	 * Loads the topic and forum data for the specified topic id
-	 *
-	 * @param	mixed	$topic	Array of topic data, or single topic id
-	 * @return	void
-	 */
-	public function loadTopicAndForum( $topic="" )
-	{
-		if ( ! is_array( $topic ) )
-		{
-			//-----------------------------------------
-			// Check the input
-			//-----------------------------------------
-			
-			$this->request['t'] = intval( $this->request['t'] );
-			
-			if ( $this->request['t'] < 0  )
-			{
-				$this->registry->output->showError( 'topics_no_tid', 10341, null, null, 404 );
-			}
-			
-			//-----------------------------------------
-			// Get the forum info based on the forum ID,
-			// get the category name, ID, and get the topic details
-			//-----------------------------------------
-			
-			if ( ! isset( $this->registry->class_forums->topic_cache['tid'] ) OR ! $this->registry->class_forums->topic_cache['tid'] )
-			{
-				$this->DB->build( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$this->request['t'] ) );									
-				$this->DB->execute();
-				
-				$this->topic = $this->DB->fetch();
-			}
-			else
-			{
-				$this->topic = $this->registry->class_forums->topic_cache;
-			}
-		}
-		else
-		{
-			$this->topic = $topic;
-		}
-		
-		$this->topic['forum_id'] = isset( $this->topic['forum_id'] ) ? $this->topic['forum_id'] : 0;
-		
-		$this->forum = $this->registry->class_forums->forum_by_id[ $this->topic['forum_id'] ];
-		
-		$this->request['f'] = $this->forum['id'];
-		
-		//-----------------------------------------
-		// Error out if we can not find the topic
-		//-----------------------------------------
-		
-		if ( ! $this->topic['tid'] )
-		{
-			$this->registry->output->showError( 'topics_no_tid', 10343, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Error out if we can not find the forum
-		//-----------------------------------------
-		
-		if ( ! $this->forum['id'] )
-		{
-			$this->registry->output->showError( 'topics_no_fid', 10342, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Error out if the topic is not approved or soft deleted
-		//-----------------------------------------
-		
-		$approved = $this->registry->class_forums->fetchHiddenTopicType( $this->topic );
-		
-		if ( ! $this->registry->class_forums->canQueuePosts($this->forum['id']) )
-		{
-			if ( $approved == 'hidden' )
-			{
-				$this->registry->output->showError( 'topic_not_approved', 10344, null, null, 403 );
-			}
-		}
-		
-		$this->permissions['softDelete']             = $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->topic['forum_id'], array() );
-		$this->permissions['softDeleteRestore']      = $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $this->topic['forum_id'] );
-		$this->permissions['softDeleteSee']          = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $this->topic['forum_id'] );
-		$this->permissions['softDeleteReason']       = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $this->topic['forum_id'] );
-		$this->permissions['softDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $this->topic['forum_id'] );
-		$this->permissions['TopicSoftDelete']        = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $this->topic );
-		$this->permissions['TopicSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $this->forum['id'] );
-		$this->permissions['TopicSoftDeleteSee']     = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $this->forum['id'] );
-		
-		/* Soft deleted? */
-		if ( $approved == 'sdelete' AND ! $this->permissions['softDeleteContent'] )
-		{
-			$this->registry->output->showError( 'topic_not_approved', 10344.1, null, null, 403 );
-		}
-		
-		$this->registry->class_forums->forumsCheckAccess( $this->forum['id'], 1, 'topic', $this->topic );
-		
-		/* Got a nice perm? */
-		$this->topic['permissions'] =& $this->permissions;
-		
-		/* Deleted topic? */
-		$this->topic['_isDeleted'] = ( $approved == 'sdelete' ) ? true : false;
-		$this->topic['_isHidden']  = ( $approved == 'hidden' )  ? true : false;
-	}
 	
 	/**
 	 * Main Execution Function
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -309,185 +144,136 @@ class public_forums_forums_topics extends ipsCommand
 		$poll_data = '';
 		$function  = '';
 		
-		//-----------------------------------------
-		// INIT module
-		//-----------------------------------------
+		/* Print CSS */
+		$this->registry->output->addToDocumentHead( 'raw', "<link rel='stylesheet' type='text/css' title='Main' media='print' href='{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_print.css' />" );
 		
-		$this->loadTopicAndForum();
-
-		//-----------------------------------------
-		// Topic rating: Rating
-		//-----------------------------------------
+		/* Followed stuffs */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$this->_like = classes_like::bootstrap( 'forums', 'topics' );
 		
+		/* Init */
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
+		
+		try
+		{
+			/* Load up the data dudes */
+			$this->registry->getClass('topics')->autoPopulate( null, false );
+		}
+		catch( Exception $crowdCheers )
+		{
+			$msg = str_replace( 'EX_', '', $crowdCheers->getMessage() );
+			
+			$this->registry->output->showError( $msg, 10340, null, null, 404 );
+		}
+		
+		
+		/* Shortcut */
+		$this->forumClass = $this->registry->getClass('class_forums');
+		
+		/* Setup basics for this method */
+		$topicData      = $this->registry->getClass('topics')->getTopicData();
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		
+		/* Rating */
 		$this->can_rate = $this->memberData['member_id'] ? intval( $this->memberData['g_topic_rate_setting'] ) : 0;
 
-		//-----------------------------------------
-		// Reputation Cache
-		//-----------------------------------------
-		
-		if( $this->settings['reputation_enabled'] )
-		{
-			/* Load the class */
-			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
-			$this->registry->setClass( 'repCache', new $classToLoad() );
-		
-			/* Update the filter? */
-			if( isset( $this->request['rep_filter'] ) && $this->request['rep_filter'] == 'update' )
-			{
-				/**
-				 * Check secure key
-				 * @link	http://community.invisionpower.com/tracker/issue-22078-i-can-edit-your-treshold
-				 */
-				if( $this->request['secure_key'] != $this->member->form_hash )
-				{
-					$this->registry->output->showError( 'usercp_forums_bad_key', 1021522 );
-				}
-				
-				$_mem_cache = IPSMember::unpackMemberCache( $this->memberData['members_cache'] );
-				
-				if( $this->request['rep_filter_set'] == '*' )
-				{
-					$_mem_cache['rep_filter'] = '*';
-				}
-				else
-				{
-					$_mem_cache['rep_filter'] = intval( $this->request['rep_filter_set'] );
-				}
-				
-				IPSMember::packMemberCache( $this->memberData['member_id'], $_mem_cache );
-				
-				$this->memberData['_members_cache'] = $_mem_cache;
-			}
-			else
-			{
-				$this->memberData['_members_cache'] = IPSMember::unpackMemberCache( $this->memberData['members_cache'] );
-			}
-		}
-
-		//-----------------------------------------
-		// Process the topic
-		//-----------------------------------------
-		
-		$this->topicSetUp();
-		
-		//-----------------------------------------
-		// Which view are we using?
-		// If mode='show' we're viewing poll results, don't change view mode
-		//-----------------------------------------
-		
-		$this->topic_view_mode = $this->_generateTopicViewMode();
-		
-		//-----------------------------------------
-		// VIEWS
-		//-----------------------------------------
+		/* Set up topic */
+		$topicData = $this->topicSetUp( $topicData );
 
+		/* Specific view? */
 		$this->_doViewCheck();
-		
-		//-----------------------------------------
-		// UPDATE TOPIC?
-		//-----------------------------------------
-		
-		$this->_doUpdateTopicCheck();
-		
-		//-----------------------------------------
-		// Check PPD
-		//-----------------------------------------
-		
-		$this->_ppd_ok = $this->registry->getClass('class_forums')->checkGroupPostPerDay( $this->memberData, TRUE );
-		
-		//-----------------------------------------
-		// Post ID stuff
-		//-----------------------------------------
-		
-		$find_pid	  = $this->request['pid'] == "" ? (isset( $this->request['p'] ) ? $this->request['p'] : 0 ) : ( isset( $this->request['pid'] ) ? $this->request['pid'] : 0 );
-		$threaded_pid = $find_pid ? '&amp;pid=' . $find_pid : '';
-		$linear_pid   = $find_pid ? '&amp;view=findpost&amp;p=' . $find_pid : '';
-		
-		//-----------------------------------------
-		// Remove potential [attachmentid= tag in title
-		//-----------------------------------------
-		
-		$this->topic['title'] = IPSText::stripAttachTag( $this->topic['title'] );
-		
-		//-----------------------------------------
-		// Get posts
-		//-----------------------------------------
-		
+
+		/* Get Posts */
 		$_NOW = IPSDebug::getMemoryDebugFlag();
 
-		if ( $this->topic_view_mode == 'threaded' )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/threaded.php', 'threadedModeLibrary', 'forums' );
-			$threaded	= new $classToLoad( $this->registry, $this );
-			$post_data	= $threaded->_getTopicDataThreaded();
-		}
-		else
-		{
-			$post_data = $this->_getTopicDataLinear();
-		}
+		$postData = $this->_getPosts();
 
 		unset( $this->cached_members );
 		
+		/* Status? */
+		if ( $topicData['_ppd_ok'] === TRUE )
+		{
+			/* status from PPD */
+			if ( $this->forumClass->ppdStatusMessage )
+			{
+				$topicData['_fastReplyStatusMessage'][] = $this->forumClass->ppdStatusMessage;
+			}
+			
+			/* status from mod posts */
+			$topicData['_fastReplyStatusMessage'][] = $this->forumClass->fetchPostModerationStatusMessage( $this->memberData, $forumData, $topicData, 'reply' );
+		}
+		
+		//-----------------------------------------
+		// Update the item marker
+		//-----------------------------------------
+	
+		if ( ! $this->request['view'] )
+		{
+			/* If we marked page 2 but land back on page 1 again we don't want to unmark it! */
+			$lastMarked = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $forumData['id'], 'itemID' => $topicData['tid'] ) );
+
+			/* is this the very last page? */
+			if ( $this->registry->getClass('topics')->isOnLastPage() )
+			{
+				/* ...then make the timestamp 'NOW' so polls will be cleared correctly */
+				$this->_maxPostDate = IPS_UNIX_TIME_NOW;
+			}
+			
+			if ( $lastMarked < $this->_maxPostDate )
+			{
+				$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $forumData['id'], 'itemID' => $topicData['tid'], 'markDate' => $this->_maxPostDate, 'containerLastActivityDate' => $forumData['last_post'] ) );
+			}
+		}
+		
+		/* Set has unread flag */
+		$forumData['_hasUnreadTopics'] = $this->registry->getClass('class_forums')->getHasUnread( $forumData['id'] );
+		
 		IPSDebug::setMemoryDebugFlag( "TOPICS: Parsed Posts - Completed", $_NOW );
 	
 		//-----------------------------------------
 		// Generate template
 		//-----------------------------------------
 		
-		$this->topic['id'] = $this->topic['forum_id'];
+		$topicData['id'] = $topicData['forum_id'];
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $this->topic, 'topicViewTopicData' );
-		
-		/* Posting Allowed? */
-		$this->forum['_user_can_post'] = 1;//( $this->_ppd_ok === TRUE ) ? 1 : 0;
-		
-		if( ! $this->registry->permissions->check( 'start', $this->forum ) )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-
-		if( ! $this->forum['sub_can_post'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-
-		if( $this->forum['min_posts_post'] && $this->forum['min_posts_post'] > $this->memberData['posts'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-		
-		if( ! $this->forum['status'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-		
-		if( ! $this->memberData['g_post_new_topics'] )
-		{
-			$this->forum['_user_can_post'] = 0;
-		}
-
 		//-----------------------------------------
 		// This has to be called first to set $this->poll_only
 		//-----------------------------------------
 		
-		$poll_data	= ( $this->topic['poll_state'] ) ? $this->_generatePollOutput() : '';
+		$poll_data	= ( $topicData['poll_state'] ) ? $this->_generatePollOutput() : '';
 
-		$displayData = array( 'threaded_mode_enabled' => ( $this->topic_view_mode == 'threaded' ) ? 1 : 0,
-							  'fast_reply'			  => $this->_getFastReplyData(),
-							  'multi_mod'			  => $this->_getMultiModerationData(),
-							  'reply_button'		  => $this->_getReplyButtonData(),
-							  'active_users'		  => $this->_getActiveUserData(),
-							  'mod_links'			  => $this->_generateModerationPanel(),
-							  'poll_data'			  => $poll_data );
+		$displayData = array( 'fast_reply'		    => $this->_getFastReplyData(),
+							  'multi_mod'			=> $this->registry->getClass('topics')->getMultiModerationData(),
+							  'reply_button'		=> $this->_getReplyButtonData(),
+							  'active_users'		=> $this->_getActiveUserData(),
+							  'mod_links'			=> $this->_generateModerationPanel(),
+							  'forumJump'			=> $this->forumClass->buildForumJump(),
+							  'follow_data' 		=> $this->_like->render( 'summary', $topicData['tid'] ),
+							  'poll_data'			=> $poll_data,
+							  'load_editor_js'		=> false,
+							  'smilies'				=> '' );
+
+		//-----------------------------------------
+		// If we can edit, but not reply, load JS still
+		//-----------------------------------------
+
+		if( !$displayData['fast_reply'] AND $this->_canEditAPost )
+		{
+			$displayData['load_editor_js']	= true;
+			
+			$classToLoad			= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$editor					= new $classToLoad();
+			$displayData['smilies']	= $editor->fetchEmoticons();
+		}
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $displayData, 'topicViewDisplayData' );
-		
-		$post_data = $this->_parseAttachments( $post_data );
+		$postData = $this->_parseAttachments( $postData );
 		
 		/* Rules */
-		if( $this->forum['show_rules'] == 2 )
+		if( $forumData['show_rules'] == 2 )
 		{
 			IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
 			IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
@@ -497,61 +283,45 @@ class public_forums_forums_topics extends ipsCommand
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberdata['member_group_id'];
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
 
-			if( ! $this->forum['rules_raw_html'] )
+			if( ! $forumData['rules_raw_html'] )
 			{
-				$this->forum['rules_text'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $this->forum['rules_text'] );
+				$forumData['rules_text'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $forumData['rules_text'] );
 			}
 		}
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $this->forum, 'topicViewForumData' );
-		
-		//-----------------------------------------
-		// Fix post order if linear+ and ordering
-		// posts DESC (rare, I know): 16221
-		//-----------------------------------------
-		
-		if( $this->topic_view_mode == 'linearplus' AND $this->settings['post_order_sort'] == 'desc' )
-		{
-			$newPosts	= array();
-			
-			foreach( $post_data as $pid => $data )
-			{
-				if( $pid == $this->topic['topic_firstpost'] )
-				{
-					array_unshift( $newPosts, $data );
-				}
-				else
-				{
-					$newPosts[] = $data;
-				}
-			}
-			
-			//-----------------------------------------
-			// Nothing else relies on the key being pid
-			//-----------------------------------------
-			
-			$post_data	= $newPosts;
-		}
-
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $post_data, 'topicViewPostData' );
-		
 		/* Got soft delete pids? */
 		if ( is_array( $this->_sdPids ) AND count( $this->_sdPids ) )
 		{
 			$displayData['sdData'] = IPSDeleteLog::fetchEntries( $this->_sdPids, 'post', false );
 		}
+		
+		if( $topicData['starter_id'] )
+		{
+			$topicData['_starter']	= IPSMember::buildDisplayData( IPSMember::load( $topicData['starter_id'] ) );
+		}
+		else
+		{
+			$topicData['_starter']	= IPSMember::buildDisplayData( array(
+																		'member_id'				=> 0,
+																		'members_display_name'	=> $topicData['starter_name'] ? $this->settings['guest_name_pre'] . $topicData['starter_name'] . $this->settings['guest_name_suf'] : $this->lang->words['global_guestname'],
+																)		);
+		}
+		
+		/* Can we report? */
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/reportLibrary.php', 'reportLibrary', 'core' );
+		$reports		= new $classToLoad( $this->registry );
+		
+		$topicData['_canReport']	= $reports->canReport( 'post' );
 
-		$template = $this->registry->output->getTemplate('topic')->topicViewTemplate( $this->forum, $this->topic, $post_data, $displayData );
+		$template = $this->registry->output->getTemplate('topic')->topicViewTemplate( $forumData, $topicData, $postData, $displayData );
 
 		//-----------------------------------------
 		// Send for output
 		//-----------------------------------------
 		
-		$this->registry->output->setTitle( $this->topic['title'] . ' - ' . $this->settings['board_name']);
+		$this->registry->output->setTitle( $topicData['title'] . ' - ' . $this->settings['board_name']);
 		$this->registry->output->addContent( $template );
-		
+				
 		if ( is_array( $this->nav ) AND count( $this->nav ) )
 		{
 			foreach( $this->nav as $_nav )
@@ -560,21 +330,16 @@ class public_forums_forums_topics extends ipsCommand
 			}
 		}
 
-		/**
-		 * Update cache monitor
-		 */
-		IPSContentCache::updateMonitor( $this->_cacheMonitor );
-		
 		/**
 		 * Add navigational links
 		 */
-		$this->registry->output->addToDocumentHead( 'raw', "<link rel='up' href='" . $this->registry->output->buildSEOUrl( 'showforum=' . $this->topic['forum_id'], 'publicNoSession', $this->forum['name_seo'], 'showforum' ) . "' />" );
-		$this->registry->output->addToDocumentHead( 'raw', "<link rel='author' href='" . $this->registry->output->buildSEOUrl( 'showuser=' . $this->topic['starter_id'], 'publicNoSession', $this->topic['seo_first_name'], 'showuser' ) . "' />" );
+		$this->registry->output->addToDocumentHead( 'raw', "<link rel='up' href='" . $this->registry->output->buildSEOUrl( 'showforum=' . $topicData['forum_id'], 'publicNoSession', $forumData['name_seo'], 'showforum' ) . "' />" );
+		$this->registry->output->addToDocumentHead( 'raw', "<link rel='author' href='" . $this->registry->output->buildSEOUrl( 'showuser=' . $topicData['starter_id'], 'publicNoSession', $topicData['seo_first_name'], 'showuser' ) . "' />" );
 		
 		/* Add Meta Content */
 		if ( $this->_firstPostContent )
 		{
-			$this->registry->output->addMetaTag( 'keywords', $this->topic['title'] . ' ' . str_replace( "\n", " ", str_replace( "\r", "", strip_tags( $this->_firstPostContent ) ) ), TRUE );
+			$this->registry->output->addMetaTag( 'keywords', $topicData['title'] . ' ' . str_replace( "\n", " ", str_replace( "\r", "", strip_tags( $this->_firstPostContent ) ) ), TRUE );
 		}
 		
 		# Trim to 155 chars based on Dan's recommendation
@@ -598,351 +363,145 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public function parsePostRow( $row = array() )
 	{
-		//-----------------------------------------
-		// Memory Debug
-		//-----------------------------------------
+		/* Init */
+		$topicData      = $this->registry->getClass('topics')->getTopicData();
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
 		
-		$_NOW   = IPSDebug::getMemoryDebugFlag();
-		$poster = array();
+		/* Parse post */
+		$parsed = $this->registry->getClass('topics')->parsePost( $row );
 		
-		//-----------------------------------------
-		// Cache member
-		//-----------------------------------------
-		
-		if ( $row['author_id'] != 0 )
+		if( $parsed['post']['_can_edit'] )
 		{
-			//-----------------------------------------
-			// Is it in the hash?
-			//-----------------------------------------
-			
-			if ( isset( $this->cached_members[ $row['author_id'] ] ) )
-			{
-				//-----------------------------------------
-				// Ok, it's already cached, read from it
-				//-----------------------------------------
-				
-				$poster = $this->cached_members[ $row['author_id'] ];
-				$row['name_css'] = 'normalname';
-			}
-			else
-			{
-				$row['name_css']	= 'normalname';
-				$poster				= $row;
-				
-				//-----------------------------------------
-				// Unset post data
-				//-----------------------------------------
-				
-				unset( $poster['pid'], $poster['append_edit'], $poster['edit_time'], $poster['use_sig'], $poster['use_emo'], $poster['post_edit_reason'],
-						$poster['post_date'], $poster['icon_id'], $poster['post'], $poster['queued'], $poster['topic_id'], $poster['post_htmlstate'],
-						$poster['post_title'], $poster['new_topic'], $poster['edit_name'], $poster['post_key'], $poster['post_parent'] );
-				
-				if ( isset( $poster['cache_content_sig'] ) )
-				{ 
-					$poster['cache_content'] = $poster['cache_content_sig'];
-					$poster['cache_updated'] = $poster['cache_updated_sig'];
-					
-					/* Cache data monitor */
-					$this->_cacheMonitor['sig']['cached']++;
-				}
-				else
-				{
-					unset( $poster['cache_content'], $poster['cache_updated'] );
-					
-					/* Cache data monitor */
-					$this->_cacheMonitor['sig']['raw']++;
-				}
-				
-				$poster = IPSMember::buildDisplayData( $poster, array( 'signature' => 1, 'customFields' => 1, 'warn' => 1, 'avatar' => 1, 'checkFormat' => 1, 'cfLocation' => 'topic' ) );
-				$poster['member_id'] = $row['mid'];
-				
-				//-----------------------------------------
-				// Add it to the cached list
-				//-----------------------------------------
-				
-				$this->cached_members[ $row['author_id'] ] = $poster;
-			}
+			$this->_canEditAPost	= true;
 		}
-		else
-		{
-			//-----------------------------------------
-			// It's definitely a guest...
-			//-----------------------------------------
-			
-			$row['author_name']	= $this->settings['guest_name_pre'] . $row['author_name'] . $this->settings['guest_name_suf'];
-			
-			$poster = IPSMember::setUpGuest( $row['author_name'] );
-			$poster['members_display_name']		= $row['author_name'];
-			$poster['_members_display_name']	= $row['author_name'];
-			$poster['custom_fields']			= "";
-			$poster['warn_img']					= "";
-			$row['name_css']					= 'unreg';
-		}
-		
-		# Memory Debug
-		IPSDebug::setMemoryDebugFlag( "PID: ".$row['pid'] . " - Member Parsed", $_NOW );
-		
-		/* Update permission */
-		$this->permissions['softDelete'] = $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->topic['forum_id'], $row );
-		
-		/* Soft delete */
-		$row['_softDelete']        = ( $row['pid'] != $this->topic['topic_firstpost'] ) ? $this->permissions['softDelete'] : FALSE;
-		$row['_softDeleteRestore'] = $this->permissions['softDeleteRestore'];
-		$row['_softDeleteSee']     = $this->permissions['softDeleteSee'];
-		$row['_softDeleteReason']  = $this->permissions['softDeleteReason'];
-		$row['_softDeleteContent'] = $this->permissions['softDeleteContent'];
-		
-		$row['_isVisible']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $row ) == 'visible' ) ? true : false;
-		$row['_isHidden']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $row ) == 'hidden' ) ? true : false;
-		$row['_isDeleted']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $row ) == 'sdelete' ) ? true : false;
 		
 		/* Collect PIDS of soft deleted posts */
-		if ( $row['_isDeleted'] AND $row['_softDeleteSee'] )
+		if ( $parsed['post']['_isDeleted'] AND $parsed['post']['_softDeleteSee'] )
 		{
-			$this->_sdPids[] = $row['pid'];
+			$this->_sdPids[] = $parsed['post']['pid'];
 		}
 		
-		//-----------------------------------------
-		// Queued
-		//-----------------------------------------
-		
-		if ( $this->topic['topic_firstpost'] == $row['pid'] and ( $row['_isHidden'] OR $this->topic['_isHidden'] ) )
+		/* Grab first post */
+		if ( $topicData['topic_firstpost'] == $parsed['post']['pid'] )
 		{
-			$row['queued']    = 1;
-			$row['_isHidden'] = true;
+			$this->_firstPostContent = $parsed['post']['post'];
 		}
-	
-		//-----------------------------------------
-		// Edit...
-		//-----------------------------------------
-		
-		$row['edit_by'] = "";
-		
-		if ( ( $row['append_edit'] == 1 ) and ( $row['edit_time'] != "" ) and ( $row['edit_name'] != "" ) )
+		else if( $this->request['st'] AND ! $this->_firstPostContent )
 		{
-			$e_time = $this->registry->class_localization->getDate( $row['edit_time'] , 'LONG' );
-			
-			$row['edit_by'] = sprintf( $this->lang->words['edited_by'], $row['edit_name'], $e_time );
+			$this->_firstPostContent = $parsed['post']['post'];
 		}
 		
-		//-----------------------------------------
-		// Parse the post
-		//-----------------------------------------
-		
-		if ( ! $row['cache_content'] )
+		/* Anything to highlight? */
+		if ( isset($this->request['hl']) AND $this->request['hl'] )
 		{
-			$_NOW2   = IPSDebug::getMemoryDebugFlag();
-
-			IPSText::getTextClass( 'bbcode' )->parse_smilies			= $row['use_emo'];
-			IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->forum['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
-			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $row['post_htmlstate'] == 2 ? 1 : 0;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->forum['use_ibc'];
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];
-			
-			/* Work around */
-			$_tmp = $this->memberData['view_img'];
-			$this->memberData['view_img'] = 1;
-			
-			$row['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['post'] );
-			
-			$this->memberData['view_img'] = $_tmp;
-			
-			IPSDebug::setMemoryDebugFlag( "topics::parsePostRow - bbcode parse - Completed", $_NOW2 );
-			
-			IPSContentCache::update( $row['pid'], 'post', $row['post'] );
-			
-			/* Cache data monitor */
-			$this->_cacheMonitor['post']['raw']++;
-		}
-		else
-		{
-			$row['post'] = '<!--cached-' . gmdate( 'r', $row['cache_updated'] ) . '-->' . $row['cache_content'];
-			
-			/* Cache data monitor */
-			$this->_cacheMonitor['post']['cached']++;
+			$parsed['post']['post'] = IPSText::searchHighlight( $parsed['post']['post'], $this->request['hl'] );
 		}
 		
-		//-----------------------------------------
-		// Capture content
-		//-----------------------------------------
-		
-		if ( $this->topic['topic_firstpost'] == $row['pid'] )
-		{
-			$this->_firstPostContent = $row['post'];
-		}
-		else if( $this->request['st'] AND !$this->_firstPostContent )
-		{
-			$this->_firstPostContent = $row['post'];
-		}
-		
-		//-----------------------------------------
-		// View image...
-		//-----------------------------------------
-		
-		$row['post'] = IPSLib::memberViewImages( $row['post'] );
-		
-		//-----------------------------------------
-		// Highlight...
-		//-----------------------------------------
-		
-		if ( $this->request['hl'] )
-		{
-			$row['post'] = IPSText::searchHighlight( $row['post'], $this->request['hl'] );
-		}
-		
-		//-----------------------------------------
-		// Multi Quoting?
-		//-----------------------------------------
-
+		/* Multi quote */
 		if ( $this->qpids )
 		{
-			if ( strstr( ','.$this->qpids.',', ','.$row['pid'].',' ) )
+			if ( strstr( ','.$this->qpids.',', ','.$parsed['post']['pid'].',' ) )
 			{
-				$row['_mq_selected'] = 1;
+				$parsed['post']['_mq_selected'] = 1;
 			}
 		}
 		
-		//-----------------------------------------
-		// Multi PIDS?
-		//-----------------------------------------
-
+		/* Mod PIDS */
 		if ( $this->memberData['is_mod'] )
 		{
 			if ( $this->request['selectedpids'] )
 			{
-				if ( strstr( ','.$this->request['selectedpids'].',', ','.$row['pid'].',' ) )
+				if ( strstr( ','.$this->request['selectedpids'].',', ','.$parsed['post']['pid'].',' ) )
 				{
-					$row['_pid_selected'] = 1;
+					$parsed['post']['_pid_selected'] = 1;
 				}
 				
 				$this->request['selectedpidcount'] =  count( explode( ",", $this->request['selectedpids']  ) );
 			}
 		}
 		
-		//-----------------------------------------
-		// Delete button..
-		//-----------------------------------------
-		
-		$row['_can_delete'] = $row['pid'] != $this->topic['topic_firstpost'] 
-							  ? $this->_getDeleteButtonData( $row ) 
-							  : FALSE;		
-		$row['_can_edit']   = $this->_getEditButtonData( $row );
-		$row['_show_ip']	= $this->_getIPAddressData();
-		
-		//-----------------------------------------
-		// Siggie stuff
-		//-----------------------------------------
-		
-		$row['signature'] = "";
-		
-		if ( isset( $poster['signature'] ) AND $poster['signature'] AND $this->memberData['view_sigs'] )
-		{
-			if ($row['use_sig'] == 1)
-			{
-				$row['signature'] = $this->registry->output->getTemplate( 'global' )->signature_separator( $poster['signature'] );
-			}
-		}
-		
-		//-----------------------------------------
-		// Fix up the membername so it links to the members profile
-		//-----------------------------------------
+		/* Post number */
+		$this->post_count++;
 	
-		if ( $poster['member_id'] )
+		$parsed['post']['post_count'] = intval($this->request['st']) + $this->post_count;
+		
+		if ( $parsed['post']['_isDeleted'] )
 		{
-			$poster['_members_display_name'] = "<a href='{$this->settings['_base_url']}showuser={$poster['member_id']}'>{$poster['members_display_name_short']}</a>";
+			$this->post_count--;
 		}
 		
-		//-----------------------------------------
-		// Post number
-		//-----------------------------------------
-		
-		if ( $this->topic_view_mode == 'linearplus' and $this->topic['topic_firstpost'] == $row['pid'] )
+		/* Post max date for item marking*/
+		if ( $row['post_date'] > $this->_maxPostDate )
 		{
-			$row['post_count'] = 1;
-			
-			if ( ! $this->first )
-			{
-				$this->post_count++;
-			}
-		}
-		else
-		{
-			$this->post_count++;
-		
-			$row['post_count'] = intval($this->request['st']) + $this->post_count;
-			
-			if ( $row['_isDeleted'] )
-			{
-				$this->post_count--;
-			}
+			$this->_maxPostDate = $row['post_date'];
 		}
 		
-		$row['forum_id'] = $this->topic['forum_id'];		
-		
-		//-----------------------------------------
-		// Memory Debug
-		//-----------------------------------------
-	
-		IPSDebug::setMemoryDebugFlag( "PID: ".$row['pid']. " - Completed", $_NOW );
-		
-		return array( 'row' => $row, 'poster' => $poster );
+		return $parsed;
 	}
 
 	/**
-	 * Return last post
-	 *
-	 * @return	void
+	 * Redirects to new post
+	 * @param mixed $topicData
 	 */
-	public function returnLastPost()
+	public function returnNewPost( $topicData=false )
 	{
-		$st     = 0;
-		$mode 	= $this->topic_view_mode;
-		$pre	= $mode != 'threaded' ? 'st' : 'start';
-		$query  = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
-				
-		if( $mode == 'threaded' )
+		$topicData      = ( $topicData === false ) ? $this->registry->getClass('topics')->getTopicData() : $topicData;
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
+		$st             = 0;
+		$pid	        = "";
+		$last_time      = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $forumData['id'], 'itemID' => $topicData['tid'] ) );
+		$query          = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
+		
+		/* Can we deal with hidden posts? */
+		if ( $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
 		{
-			$this->settings['display_max_posts'] = $this->settings['threaded_per_page'] ;
-			$this->request['st'] =  $this->request['start'] ;
-		}		
-		else
-		{
-			/* Can we deal with hidden posts? */
-			if ( $this->registry->class_forums->canQueuePosts( $this->topic['forum_id'] ) )
+			if ( $permissionData['softDeleteSee'] )
 			{
-				if ( $this->permissions['softDeleteSee'] )
-				{
-					/* See queued and soft deleted */
-					$query = '';
-				}
-				else
-				{
-					/* Otherwise, see queued and approved */
-					$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible', 'hidden' ) );
-				}
+				/* See queued and soft deleted */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'approved', 'sdeleted', 'hidden' ) );
 			}
 			else
 			{
-				/* We cannot see hidden posts */
-				if ( $this->permissions['softDeleteSee'] )
-				{
-					/* See queued and soft deleted */
-					$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array('approved', 'sdeleted') );
-				}
+				/* Otherwise, see queued and approved */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible', 'hidden' ) );
 			}
 		}
-			
-		if ($this->topic['posts'])
+		else
 		{
-			if ( (($this->topic['posts'] + 1) % $this->settings['display_max_posts']) == 0 )
+			/* We cannot see hidden posts */
+			if ( $permissionData['softDeleteSee'] )
 			{
-				$pages = ($this->topic['posts'] + 1) / $this->settings['display_max_posts'];
+				/* See queued and soft deleted */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array('approved', 'sdeleted') );
+			}
+		}
+
+		$this->DB->build( array( 'select' => 'MIN(pid) as pid',
+								 'from'   => 'posts',
+								 'where'  => "topic_id={$topicData['tid']} AND post_date > " . intval( $last_time ) . $query,
+								 'limit'  => array( 0,1 ) )	);						
+		$this->DB->execute();
+		
+		$post = $this->DB->fetch();
+		
+		if ( $post['pid'] )
+		{
+			$pid = "&#entry".$post['pid'];
+			
+			$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND pid <= {$post['pid']}" . $query ) );										
+			$this->DB->execute();
+		
+			$cposts = $this->DB->fetch();
+			
+			if ( (($cposts['posts']) % $this->settings['display_max_posts']) == 0 )
+			{
+				$pages = ($cposts['posts']) / $this->settings['display_max_posts'];
 			}
 			else
 			{
-				$number = ( ($this->topic['posts'] + 1) / $this->settings['display_max_posts'] );
+				$number = ( ($cposts['posts']) / $this->settings['display_max_posts'] );
 				$pages = ceil( $number);
 			}
 			
@@ -950,13 +509,89 @@ class public_forums_forums_topics extends ipsCommand
 			
 			if( $this->settings['post_order_sort'] == 'desc' )
 			{
-				$st = (ceil(($this->topic['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
+				$st = (ceil(($topicData['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
+			}						
+			
+			$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$topicData['tid']."&pid={$post['pid']}&st={$st}".$pid, $topicData['title_seo'] );
+		}
+		else
+		{
+			$this->returnLastPost( $topicData );
+		}
+	}
+	
+	/**
+	 * Return last post
+	 *
+	 * @return	@e void
+	 */
+	public function returnLastPost( $topicData=false )
+	{
+		/* Init */
+		$topicData      = ( $topicData === false ) ? $this->registry->getClass('topics')->getTopicData() : $topicData;
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
+		$st             = 0;
+		$query          = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
+		$_posts			= $topicData['posts'];
+		
+		if( $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
+		{
+			$_posts	+= intval($topicData['topic_queuedposts']);
+		}
+		
+		if( $permissionData['softDeleteSee'] )
+		{
+			$_posts	+= intval($topicData['topic_deleted_posts']);
+		}
+
+		/* Can we deal with hidden posts? */
+		if ( $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
+		{
+			if ( $permissionData['softDeleteSee'] )
+			{
+				/* See queued and soft deleted */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'approved', 'sdeleted', 'hidden' ) );
+			}
+			else
+			{
+				/* Otherwise, see queued and approved */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible', 'hidden' ) );
+			}
+		}
+		else
+		{
+			/* We cannot see hidden posts */
+			if ( $permissionData['softDeleteSee'] )
+			{
+				/* See queued and soft deleted */
+				$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array('approved', 'sdeleted') );
+			}
+		}
+			
+		if( $_posts )
+		{
+			if ( (($_posts + 1) % $this->settings['display_max_posts']) == 0 )
+			{
+				$pages = ($_posts + 1) / $this->settings['display_max_posts'];
+			}
+			else
+			{
+				$number = ( ($_posts + 1) / $this->settings['display_max_posts'] );
+				$pages = ceil( $number );
+			}
+			
+			$st = ($pages - 1) * $this->settings['display_max_posts'];
+			
+			if( $this->settings['post_order_sort'] == 'desc' )
+			{
+				$st = (ceil(($_posts/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
 			}
 		}
 		
 		$this->DB->build( array(  'select' => 'pid',
 								  'from'   => 'posts',
-								  'where'  => "topic_id=".$this->topic['tid'] . $query,
+								  'where'  => "topic_id=".$topicData['tid'] . $query,
 								  'order'  => $this->settings['post_order_column'].' DESC',
 								  'limit'  => array( 0,1 ) ) );
 							 
@@ -964,7 +599,7 @@ class public_forums_forums_topics extends ipsCommand
 		
 		$post = $this->DB->fetch();
 		
-		$this->registry->output->silentRedirect($this->settings['base_url']."showtopic=".$this->topic['tid']."&pid={$post['pid']}&{$pre}={$st}&"."#entry".$post['pid'], $this->topic['title_seo'] );
+		$this->registry->output->silentRedirect($this->settings['base_url']."showtopic=".$topicData['tid']."&pid={$post['pid']}&st={$st}&"."#entry".$post['pid'], $topicData['title_seo'] );
 	}
 	
 	/**
@@ -975,11 +610,15 @@ class public_forums_forums_topics extends ipsCommand
 	*/
 	public function _parseAttachments( $postData )
 	{
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
+		
 		//-----------------------------------------
 		// No attachments?  Then what are you doing here?
 		//-----------------------------------------
 		
-		if ( !$this->topic['topic_hasattach'] )
+		if ( ! $topicData['topic_hasattach'] )
 		{
 			return $postData;
 		}
@@ -1017,7 +656,7 @@ class public_forums_forums_topics extends ipsCommand
 		// Not got permission to view downloads?
 		//-----------------------------------------
 		
-		if ( $this->registry->permissions->check( 'download', $this->registry->class_forums->forum_by_id[ $this->topic['forum_id'] ] ) === FALSE )
+		if ( $this->registry->permissions->check( 'download', $this->registry->class_forums->forum_by_id[ $topicData['forum_id'] ] ) === FALSE )
 		{
 			$this->settings['show_img_upload'] =  0 ;
 		}
@@ -1028,8 +667,7 @@ class public_forums_forums_topics extends ipsCommand
 		
 		$this->class_attach->type  = 'post';
 		$this->class_attach->init();
-		
-		# attach_pids is generated in the func_topic_xxxxx files
+
 		$attachHTML = $this->class_attach->renderAttachments( $postHTML, $this->attach_pids );
 
 		/* Now parse back in the rendered posts */
@@ -1043,8 +681,8 @@ class public_forums_forums_topics extends ipsCommand
 					$data['html'] = IPSText::stripAttachTag( $data['html'] );
 				}
 				
-				$postData[ $id ]['post']['post']           = $data['html'];
-				$postData[ $id ]['post']['attachmentHtml'] = $data['attachmentHtml'];
+				$postData[ $id ]['post']['post']			= $data['html'];
+				$postData[ $id ]['post']['attachmentHtml']	= $data['attachmentHtml'];
 			}
 		}
 
@@ -1058,6 +696,9 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public function _generatePollOutput()
 	{
+		/* Init */
+		$topicData   = $this->registry->getClass('topics')->getTopicData();
+		$forumData   = $this->forumClass->getForumById( $topicData['forum_id'] );
 		$showResults = 0;
 		$pollData    = array();
 		
@@ -1065,7 +706,7 @@ class public_forums_forums_topics extends ipsCommand
 		// Get the poll information...
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select' => '*', 'from' => 'polls', 'where' => 'tid=' . $this->topic['tid'] ) );
+		$this->DB->build( array( 'select' => '*', 'from' => 'polls', 'where' => 'tid=' . $topicData['tid'] ) );
 		$this->DB->execute();
 		
 		$poll = $this->DB->fetch();
@@ -1076,7 +717,7 @@ class public_forums_forums_topics extends ipsCommand
 		
 		if ( ! $poll['pid'] )
 		{
-			return;
+			return array();
 		}
 		
 		//-----------------------------------------
@@ -1085,17 +726,16 @@ class public_forums_forums_topics extends ipsCommand
 		
 		if ( ! $poll['poll_question'] )
 		{
-			$poll['poll_question'] = $this->topic['title'];
+			$poll['poll_question'] = $topicData['title'];
 		}
 		
 		//-----------------------------------------
 		// Poll only?
 		//-----------------------------------------
 		
-		if( $poll['poll_only'] == 1 )
+		if ( $poll['poll_only'] == 1 )
 		{
-			$this->poll_only = true;
-			$this->topic['_poll_only'] = true;
+			$this->registry->getClass('topics')->setTopicData( 'poll_only', true );
 		}
 		
 		//-----------------------------------------
@@ -1112,7 +752,7 @@ class public_forums_forums_topics extends ipsCommand
 		
 		$this->DB->build( array( 'select'   => 'v.*',
 								 'from'     => array( 'voters' => 'v' ),
-								 'where'    => 'v.tid=' . $this->topic['tid'],
+								 'where'    => 'v.tid=' . $topicData['tid'],
 								 'add_join' => array( array( 'select' => 'm.*',
 															 'from'   => array( 'members' => 'm' ),
 															 'where'  => 'm.member_id=v.member_id',
@@ -1138,7 +778,7 @@ class public_forums_forums_topics extends ipsCommand
 					$memberData = array( 'member_id'            => $voter['member_id'],
 										 'members_seo_name'     => $voter['members_seo_name'],
 										 'members_display_name' => $voter['members_display_name'],
-										 'members_colored_name' => str_replace( '"', '\"', IPSLib::makeNameFormatted( $voter['members_display_name'], $voter['member_group_id'] ) ),
+										 'members_colored_name' => str_replace( '"', '\"', IPSMember::makeNameFormatted( $voter['members_display_name'], $voter['member_group_id'] ) ),
 										 '_last'                => 0 );
 					
 					foreach( $_choices as $_questionID => $data )
@@ -1183,7 +823,7 @@ class public_forums_forums_topics extends ipsCommand
 		// is the topic locked?
 		//-----------------------------------------
 		
-		if ( $this->topic['state'] == 'closed' OR ! $this->forum['status'] )
+		if ( $topicData['state'] == 'closed' )
 		{
 			$showResults = 1;
 		}
@@ -1291,134 +931,88 @@ class public_forums_forums_topics extends ipsCommand
 				}
 				else
 				{
-					$pollData[ $id ]['choices'][ $choice_id ] =  array( 'type'   => ( isset($data['multi']) AND $data['multi'] == 1 ) ? 'multi' : 'single',
+					$pollData[ $id ]['choices'][ $choice_id ] =  array( 'type'   => !empty($data['multi']) ? 'multi' : 'single',
 													   					'votes'  => $votes,
 																		'choice' => $choice );
 				}
 			}
 		}
 		
-		$_editPoll	= $this->_getEditButtonData( array( 'member_id' => $this->topic['starter_id'], 'post_date' => $this->topic['start_date'] ) );
+		$_editPoll	= $this->registry->getClass('topics')->canEditPost( array( 'member_id' => $topicData['starter_id'], 'post_date' => $topicData['start_date'] ) );
 
-		$html = $this->registry->output->getTemplate('topic')->pollDisplay( $poll, $this->topic, $this->forum, $pollData, $showResults, $_editPoll );
+		$html = $this->registry->output->getTemplate('topic')->pollDisplay( $poll, $topicData, $forumData, $pollData, $showResults, $_editPoll );
 		
 		$this->settings['max_images'] = $tmp_max_images;
 		
-		return $html;
-	}
-	
-	/**
-	 * Generate the topic mode.
-	 *
-	 * @return	string
-	 */
-	private function _generateTopicViewMode()
-	{
-		$return = '';
-		
-		// We don't want indexed links changing the mode
-		/*if ( $this->request['mode'] AND $this->request['mode'] AND $this->request['mode'] != 'show' )
-		{
-			$return = $this->request['mode'];
-			IPSCookie::set( 'topicmode', $this->request['mode'], 1 );
-		}
-		else
-		{*/
-			$return = IPSCookie::get('topicmode');
-		//}
-		
-		if ( ! $return )
-		{
-			$return = $this->settings['topicmode_default'] ? $this->settings['topicmode_default'] : 'linear';
-		}
-	
-		if ( $return == 'threaded' )
-		{
-			$this->settings['display_max_posts'] = $this->settings['threaded_per_page'];
-			$this->request['st'] = $this->request['start'];
-		}
-		
-		return $return;
+		return array( 'html' => $html, 'poll' => $poll );
 	}
 
-	/**
-	 * Updates the topic
-	 *
-	 * @return	void
-	 */
-	private function _doUpdateTopicCheck()
-	{
-		$mode 	= $this->topic_view_mode;
-		$pre	= $mode != 'threaded' ? 'st' : 'start';
-
-		if ( empty( $this->request['b'] ) )
-		{
-			if ( $this->topic['topic_firstpost'] < 1 )
-			{
-				//--------------------------------------
-				// No first topic set - old topic, update
-				//--------------------------------------
-				
-				$this->DB->build( array( 'select' => 'pid', 'from' => 'posts', 'where' => 'topic_id='.$this->topic['tid'].' AND new_topic=1' ) );									 
-				$this->DB->execute();
-				
-				$post = $this->DB->fetch();
-				
-				if ( ! $post['pid'] )
-				{
-					//-----------------------------------------
-					// Get first post info
-					//-----------------------------------------
-					
-					$this->DB->build( array( 
-													'select' => 'pid',
-													'from'   => 'posts',
-													'where'  => "topic_id={$this->topic['tid']}",
-													'order'  => 'pid ASC',
-													'limit'  => array( 0, 1 ) 
-											) 	);
-					$this->DB->execute();
-					
-					$first_post  = $this->DB->fetch();
-					$post['pid'] = $first_post['pid'];
-				}
-				
-				if ( $post['pid'] )
-				{
-					$this->DB->update('topics', 'topic_firstpost='.$post['pid'], 'tid='.$this->topic['tid'], false, true );
-				}
-				
-				//--------------------------------------
-				// Reload "fixed" topic
-				//--------------------------------------
-				
-				$this->registry->output->silentRedirect($this->settings['base_url']."showtopic=".$this->topic['tid']."&b=1&{$pre}=" . $this->request['st'] . "&p=" . $this->request['p'] . ""."&#entry".$this->request['p']);
-			}
-		}
-	}
-	
 	/**
 	 * Tests to see if we're viewing a post, etc
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _doViewCheck()
+	protected function _doViewCheck()
 	{
-		$mode 	= $this->topic_view_mode;
-		$pre	= $mode != 'threaded' ? 'st' : 'start';
-   
+		/* Init */
+		$topicData      = $this->registry->getClass('topics')->getTopicData();
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
+		
 		if ( $this->request['view'] )
 		{
-			if ($this->request['view'] == 'new')
+			/* Determine what we can see */
+			$_approved	= $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible' ), '' );
+			
+			/* Can we deal with hidden posts? */
+			if ( $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
+			{
+				if ( $permissionData['TopicSoftDeleteSee'] )
+				{
+					/* See queued and soft deleted */
+					$_approved = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'approved', 'sdeleted', 'hidden' ), '' );
+				}
+				else
+				{
+					/* Otherwise, see queued and approved */
+					$_approved = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible', 'hidden' ), '' );
+				}
+			}
+			else
+			{
+				/* We cannot see hidden posts */
+				if ( $permissionData['TopicSoftDeleteSee'] )
+				{
+					/* See queued and soft deleted */
+					$_approved = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'approved', 'sdeleted' ), '' );
+				}
+			}
+				
+			if ( $this->request['view'] == 'getnextunread' )
+			{
+				$tid   = $this->registry->getClass('topics')->getNextUnreadTopicId();
+				
+				if ( $tid )
+				{
+					$topic = $this->registry->getClass('topics')->getTopicById( $tid );
+				
+					$this->returnNewPost( $topic );
+				}
+				else
+				{
+					$this->registry->output->showError( 'topics_none_newer', 10356, null, null, 404 );
+				}
+			}
+			else if ($this->request['view'] == 'new')
 			{
 				//-----------------------------------------
 				// Newer 
 				//-----------------------------------------
-				
+
 				$this->DB->build( array( 
 												'select' => 'tid, title_seo',
 												'from'   => 'topics',
-												'where'  => "forum_id={$this->forum['id']} AND approved=1 AND state <> 'link' AND last_post > {$this->topic['last_post']}",
+												'where'  => "forum_id={$forumData['id']} AND {$_approved} AND state <> 'link' AND last_post > {$topicData['last_post']}",
 												'order'  => 'last_post',
 												'limit'  => array( 0,1 )
 									)	);
@@ -1428,7 +1022,7 @@ class public_forums_forums_topics extends ipsCommand
 				{
 					$this->topic = $this->DB->fetch();
 					
-					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$this->topic['tid'], $this->topic['title_seo'] );
+					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$topicData['tid'], $topicData['title_seo'] );
 				}
 				else
 				{
@@ -1440,11 +1034,11 @@ class public_forums_forums_topics extends ipsCommand
 				//-----------------------------------------
 				// Older
 				//-----------------------------------------
-				
+
 				$this->DB->build( array( 
 												'select' => 'tid, title_seo',
 												'from'   => 'topics',
-												'where'  => "forum_id={$this->forum['id']} AND approved=1 AND state <> 'link' AND last_post < {$this->topic['last_post']}",
+												'where'  => "forum_id={$forumData['id']} AND {$_approved} AND state <> 'link' AND last_post < {$topicData['last_post']}",
 												'order'  => 'last_post DESC',
 												'limit'  => array( 0,1 )
 									)	);
@@ -1455,7 +1049,7 @@ class public_forums_forums_topics extends ipsCommand
 				{
 					$this->topic = $this->DB->fetch();
 					
-					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$this->topic['tid'], $this->topic['title_seo'] );
+					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$topicData['tid'], $topicData['title_seo'] );
 				}
 				else
 				{
@@ -1471,24 +1065,25 @@ class public_forums_forums_topics extends ipsCommand
 				$this->returnLastPost();
 			}
 			else if ($this->request['view'] == 'getnewpost')
+			{
+				$this->returnNewPost();
+			}
+			else if ($this->request['view'] == 'findpost')
 			{
 				//-----------------------------------------
-				// Newest post
+				// Find a post
 				//-----------------------------------------
 				
-				$st	       = 0;
-				$pid	   = "";
-				$markers   = $this->memberData['members_markers'];
-				$last_time = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $this->forum['id'], 'itemID' => $this->topic['tid'] ) );
-				$query  = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
+				$pid	= intval($this->request['p']);
+				$query	= ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
 				
 				/* Can we deal with hidden posts? */
-				if ( $this->registry->class_forums->canQueuePosts( $this->topic['forum_id'] ) )
+				if ( $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
 				{
-					if ( $this->permissions['softDeleteSee'] )
+					if ( $permissionData['softDeleteSee'] )
 					{
 						/* See queued and soft deleted */
-						$query = '';
+						$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'approved', 'sdeleted', 'hidden' ) );
 					}
 					else
 					{
@@ -1499,63 +1094,12 @@ class public_forums_forums_topics extends ipsCommand
 				else
 				{
 					/* We cannot see hidden posts */
-					if ( $this->permissions['softDeleteSee'] )
+					if ( $permissionData['softDeleteSee'] )
 					{
 						/* See queued and soft deleted */
 						$query = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array('approved', 'sdeleted') );
 					}
 				}
-		
-				$this->DB->build( array( 
-												'select' => 'MIN(pid) as pid',
-												'from'   => 'posts',
-												'where'  => "topic_id={$this->topic['tid']} AND post_date > " . intval( $last_time ) . $query,
-												'limit'  => array( 0,1 )
-									)	);						
-				$this->DB->execute();
-				
-				$post = $this->DB->fetch();
-				
-				if ( $post['pid'] )
-				{
-					$pid = "&#entry".$post['pid'];
-					
-					$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']} AND pid <= {$post['pid']}" ) );										
-					$this->DB->execute();
-				
-					$cposts = $this->DB->fetch();
-					
-					if ( (($cposts['posts']) % $this->settings['display_max_posts']) == 0 )
-					{
-						$pages = ($cposts['posts']) / $this->settings['display_max_posts'];
-					}
-					else
-					{
-						$number = ( ($cposts['posts']) / $this->settings['display_max_posts'] );
-						$pages = ceil( $number);
-					}
-					
-					$st = ($pages - 1) * $this->settings['display_max_posts'];
-					
-					if( $this->settings['post_order_sort'] == 'desc' )
-					{
-						$st = (ceil(($this->topic['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
-					}						
-					
-					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$this->topic['tid']."&pid={$post['pid']}&{$pre}={$st}".$pid, $this->topic['title_seo'] );
-				}
-				else
-				{
-					$this->returnLastPost();
-				}
-			}
-			else if ($this->request['view'] == 'findpost')
-			{
-				//-----------------------------------------
-				// Find a post
-				//-----------------------------------------
-				
-				$pid = intval($this->request['p']);
 				
 				if ( $pid > 0 )
 				{
@@ -1569,7 +1113,7 @@ class public_forums_forums_topics extends ipsCommand
 						$sort_value = $date['post_date'];
 					}
 
-					$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']} AND {$sort_field} <=" . intval( $sort_value ) ) );										
+					$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$topicData['tid']} AND {$sort_field} <=" . intval( $sort_value ) . $query ) );										
 					$this->DB->execute();
 					
 					$cposts = $this->DB->fetch();
@@ -1588,21 +1132,21 @@ class public_forums_forums_topics extends ipsCommand
 					
 					if( $this->settings['post_order_sort'] == 'desc' )
 					{
-						$st = (ceil(($this->topic['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
+						$st = (ceil(($topicData['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
 					}
 					
 					$search_hl = '';
-					if( isset( $this->request['hl'] ) && $this->request['hl'] )
+					if( !empty( $this->request['hl'] ) )
 					{
 						$search_hl .= "&amp;hl={$this->request['hl']}";
 					}
 					
-					if( isset( $this->request['fromsearch'] ) && $this->request['fromsearch'] )
+					if( !empty( $this->request['fromsearch'] ) )
 					{
 						$search_hl .= "&amp;fromsearch={$this->request['fromsearch']}";
 					}
 
-					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$this->topic['tid']."&{$pre}={$st}&p={$pid}{$search_hl}"."&#entry".$pid, $this->topic['title_seo'] );
+					$this->registry->output->silentRedirect( $this->settings['base_url']."showtopic=".$topicData['tid']."&st={$st}&p={$pid}{$search_hl}"."&#entry".$pid, $topicData['title_seo'] );
 				}
 				else
 				{
@@ -1612,94 +1156,6 @@ class public_forums_forums_topics extends ipsCommand
 		}
 	}
 	
-	/**
-	 * Return whether we can see the IP address or not
-	 *
-	 * @return	bool
-	 */
-	public function _getIPAddressData()
-	{
-		if ( $this->memberData['g_is_supmod'] != 1 && ( !isset($this->moderator['view_ip']) OR $this->moderator['view_ip'] != 1 ) )
-		{
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-	
-	/**
-	 * Return whether or not we have permission to delete the post
-	 *
-	 * @return	bool
-	 */
-	public function _getDeleteButtonData( $poster )
-	{
-		if ( ! $this->memberData['member_id']  )
-		{
-			return FALSE;
-		}
-		
-		if ( $this->memberData['g_is_supmod'] OR $this->moderator['delete_post'] )
-		{
-			return TRUE;
-		}
-		
-		if ( $poster['member_id'] == $this->memberData['member_id'] and ( $this->memberData['g_delete_own_posts'] ) )
-		{
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	 * Return whether or not we can edit this post
-	 *
-	 * @param	array 		Array of post data
-	 * @return  bool
-	 */
-	public function _getEditButtonData( $poster=array() )
-	{
-		if ( $this->memberData['member_id'] == "" or $this->memberData['member_id'] == 0 )
-		{
-			return FALSE;
-		}
-				
-		if ( $this->memberData['g_is_supmod'] )
-		{
-			return TRUE;
-		}
-		
-		if ( $this->moderator['edit_post'] )
-		{
-			return TRUE;
-		}
-		
-		if ( $poster['member_id'] == $this->memberData['member_id'] and ($this->memberData['g_edit_posts']) )
-		{
-			// Have we set a time limit?
-			if ($this->memberData['g_edit_cutoff'] > 0)
-			{
-				if ( $poster['post_date'] > ( time() - ( intval($this->memberData['g_edit_cutoff']) * 60 ) ) )
-				{
-					return TRUE;
-				}
-				else
-				{
-					return FALSE;
-				}
-			}
-			else
-			{
-				return TRUE;
-			}
-		}
-		
-		return FALSE;
-	}
-	
 	/**
 	 * Get reply button data
 	 *
@@ -1707,136 +1163,35 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public function _getReplyButtonData()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
 		
-		$image = '';
-		$url   = '';
-		
-		if ($this->topic['state'] == 'closed' OR ( $this->topic['poll_state'] AND $this->poll_only ) )
-		{
-			/* Do we have the ability to post in closed topics or is this a poll only?*/
-			if ($this->memberData['g_post_closed'] == 1)
-			{
-				$url   = $this->settings['base_url_with_app'] . "module=post&amp;section=post&amp;do=reply_post&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid'];
-				$image = 'locked';
-			}
-			else
-			{
-				$image = "locked";
-			}
-		}
-		else
-		{
-			if ( $this->topic['state'] == 'moved' )
-			{
-				$image = "moved";
-			}
-			else if ( $this->topic['_isDeleted'] )
-			{
-				$image = 'no_reply';
-			}
-			else
-			{
-				//if ( $this->_ppd_ok !== TRUE )
-				//{
-					/* Posts per day restriction */
-					//$image = 'locked';
-				//}
-				if( $this->forum['min_posts_post'] && $this->forum['min_posts_post'] > $this->memberData['posts'] )
-				{
-					$image = "locked";
-				}
-				else if( ! $this->forum['status'] )
-				{
-					$image = "locked";
-				}
-				else
-				{
-					if ( $this->memberData['member_id'] AND ( ( ( $this->memberData['member_id'] == $this->topic['starter_id'] ) AND ! $this->memberData['g_reply_own_topics'] ) OR ( ( $this->memberData['member_id'] != $this->topic['starter_id'] ) AND ! $this->memberData['g_reply_other_topics'] ) ) )
-					{
-						$image = "no_reply";
-					}
-					else if( $this->registry->permissions->check( 'reply', $this->forum ) == TRUE )
-					{
-						$url   = $this->settings['base_url_with_app'] . "module=post&amp;section=post&amp;do=reply_post&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid'];
-						$image = "reply";
-					}
-					else
-					{
-						$image = "no_reply";
-					}
-				}
-			}
-		}
+		$image = $this->registry->getClass('topics')->getReplyStatus();
+		$url   = ( $image == 'reply' OR ( $image == 'locked' AND $this->memberData['g_post_closed'] ) ) ? $this->settings['base_url_with_app'] . "module=post&amp;section=post&amp;do=reply_post&amp;f=".$forumData['id']."&amp;t=".$topicData['tid'] : '';
 
 		return array( 'image' => $image, 'url' => $url );
-	}		
-	
-	/**
-	 * Get multimoderation data
-	 *
-	 * @return	array
-	 */
-	public function _getMultiModerationData()
-	{
-		$return_array = array();
-		$mm_array	 = $this->registry->class_forums->getMultimod( $this->forum['id'] );
-		
-		//-----------------------------------------
-		// Print and show
-		//-----------------------------------------
-		
-		if ( is_array( $mm_array ) and count( $mm_array ) )
-		{
-			foreach( $mm_array as $m )
-			{
-				$return_array[] = $m;
-			}
-		}
-		
-		return $return_array;
 	}
 	
 	/**
 	 * Get fast reply status
 	 *
 	 * @return	string
-	 * @deprecated	Fast reply is always open now, but this does still check perms before showing it
 	 */
 	public function _getFastReplyData()
 	{
-		$show = 'unavailable';
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$show      = false;
 		
-		if (   ( $this->forum['quick_reply'] == 1 )
-		   and ( $this->registry->permissions->check( 'reply', $this->forum ) == TRUE )
-		   and ( $this->topic['state'] != 'closed' )
-		   and ( $this->_ppd_ok === TRUE )
-		   and ( ! $this->poll_only ) )
+		if (  
+		       ( $this->registry->permissions->check( 'reply', $forumData ) == TRUE )
+		   and ( $topicData['state'] != 'closed' OR $this->memberData['g_post_closed'] )
+		   and ( $topicData['_ppd_ok'] === TRUE )
+		   and ( ! $topicData['poll_only'] ) )
 		{
-			$show  = "hide";
-			$cache = $this->memberData['_cache'];
-			
-			$sqr = ($cache['qr_open']) ? $cache['qr_open'] : 0;
-			
-			if ( $sqr == 1 )
-			{
-				$show = "show";
-			}
-		}
-		
-		/* Status? */
-		if ( $this->_ppd_ok === TRUE )
-		{
-			/* status from PPD */
-			if ( $this->registry->getClass('class_forums')->ppdStatusMessage )
-			{
-				$this->topic['_fastReplyStatusMessage'][] = $this->registry->getClass('class_forums')->ppdStatusMessage;
-			}
-			
-			/* status from mod posts */
-			$this->topic['_fastReplyStatusMessage'][] = $this->registry->getClass('class_forums')->fetchPostModerationStatusMessage( $this->memberData, $this->forum, $this->topic, 'reply' );
+			$show  = true;
 		}
 		
 		return $show;
@@ -1846,13 +1201,14 @@ class public_forums_forums_topics extends ipsCommand
 	 * Return active user data
 	 *
 	 * @return	array
+	 * 
+	 * @todo	[Future] Needs to be updated with the new SESSIONS API class included for 3.2
 	 */
 	public function _getActiveUserData()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
 		$ar_time = time();
 		$cached = array();
 		$guests = array();
@@ -1870,7 +1226,7 @@ class public_forums_forums_topics extends ipsCommand
 		//-----------------------------------------
 		
 		if ($this->settings['no_au_topic'] != 1)
-		{	
+		{
 			//-----------------------------------------
 			// Get the users
 			//-----------------------------------------
@@ -1880,7 +1236,7 @@ class public_forums_forums_topics extends ipsCommand
 			$this->DB->build( array( 
 									'select' => 's.member_id, s.member_name, s.member_group, s.id, s.login_type, s.running_time, s.uagent_type, s.current_module, s.seo_name',
 									'from'	 => 'sessions s',
-									'where'	 => "s.location_1_type='topic' AND s.location_1_id={$this->topic['tid']} AND s.running_time > " . ( time() - $cut_off ) . " AND s.in_error=0",
+									'where'	 => "s.location_1_type='topic' AND s.location_1_id={$topicData['tid']} AND s.running_time > " . ( time() - $cut_off ) . " AND s.in_error=0",
 						)		);	 
 			$this->DB->execute();
 					   
@@ -1901,7 +1257,7 @@ class public_forums_forums_topics extends ipsCommand
 			
 			foreach( $rows as $result )
 			{
-				$result['member_name'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
+				$result['member_name'] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 				
 				$last_date = $this->registry->class_localization->getDate( $result['running_time'], 'TINY' );
 				
@@ -1930,18 +1286,7 @@ class public_forums_forums_topics extends ipsCommand
 
 						if ( ! $cached[ $result['member_name'] ] )
 						{
-							if ( $this->settings['spider_anon'] )
-							{
-								if ( $this->memberData['g_access_cp'] )
-								{
-									$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-								}
-							}
-							else
-							{
-								$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
-							}
-
+							$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'], 'seo' => $result['seo_name'] );
 							$cached[ $result['member_name'] ] = 1;
 						}
 						else
@@ -1975,7 +1320,7 @@ class public_forums_forums_topics extends ipsCommand
 						
 						if ( $result['login_type'] )
 						{
-							if ( $this->memberData['g_access_cp'] and ($this->settings['disable_admin_anon'] != 1) )
+							if ( $this->memberData['g_access_cp'] )
 							{
 								$active['names'][] = array( 'id' => $result['member_id'], 'name' => $result['member_name'] . '*', 'p_start' => $p_start, 'p_title' => $p_title, 'p_end' => $p_end, 'seo' => $result['seo_name'] );
 								$active['anon']++;
@@ -2002,6 +1347,7 @@ class public_forums_forums_topics extends ipsCommand
 		}
 	}
 	
+	
 	/**
 	 * Generate the moderation panel
 	 * $skcusgej, still. After all this time	 
@@ -2010,10 +1356,10 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public function _generateModerationPanel()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$moderator = $this->registry->getClass('topics')->getModeratorData();
 		$mod_links = array();
 		$_got_data = 0;
 		$actions   = array( 'move_topic', 'close_topic', 'open_topic', 'delete_topic', 'edit_topic', 'pin_topic', 'unpin_topic', 'merge_topic', 'unsubbit' );
@@ -2023,7 +1369,7 @@ class public_forums_forums_topics extends ipsCommand
 			return;
 		}
 		
-		if ( $this->memberData['member_id'] == $this->topic['starter_id'] )
+		if ( $this->memberData['member_id'] == $topicData['starter_id'] )
 		{
 			$_got_data = 1;
 		}
@@ -2033,7 +1379,7 @@ class public_forums_forums_topics extends ipsCommand
 			$_got_data = 1;
 		}
 		
-		if ( isset( $this->moderator['mid'] ) AND $this->moderator['mid'] != "" )
+		if ( !empty( $moderator['mid'] ) )
 		{
 			$_got_data = 1;
 		}
@@ -2047,9 +1393,9 @@ class public_forums_forums_topics extends ipsCommand
 		// Add on approve/unapprove topic fing
 		//-----------------------------------------
 		
-		if ( $this->registry->class_forums->canQueuePosts( $this->forum['id'] ) ) 
+		if ( $this->registry->class_forums->canQueuePosts( $forumData['id'] ) ) 
 		{
-			if ( $this->topic['approved'] != 1 )
+			if ( $topicData['approved'] != 1 )
 			{
 				$mod_links[] = array( 'option' => 'topic_approve',
 									  'value'  => $this->lang->words['cpt_approvet'] );
@@ -2069,16 +1415,16 @@ class public_forums_forums_topics extends ipsCommand
 				{
 					$mod_links[] = $this->_addModLink($key);
 				}
-				elseif ( isset($this->moderator['mid']) AND $this->moderator['mid'])
+				elseif ( !empty($moderator['mid']) )
 				{
 					if ($key == 'merge_topic' or $key == 'split_topic')
 					{
-						if ($this->moderator['split_merge'] == 1)
+						if ($moderator['split_merge'] == 1)
 						{
 							$mod_links[] = $this->_addModLink($key);
 						}
 					}
-					else if ( isset($this->moderator[ $key ]) AND $this->moderator[ $key ] )
+					else if ( !empty($moderator[ $key ]) )
 					{
 						$mod_links[] = $this->_addModLink($key);
 					}
@@ -2094,7 +1440,7 @@ class public_forums_forums_topics extends ipsCommand
 					}
 					elseif ($key == 'delete_topic')
 					{
-						if ($this->memberData['g_delete_own_topics'])
+						if ( $this->memberData['g_delete_own_topics'] OR $this->registry->getClass('class_forums')->canSoftDeleteTopics( $forumData['id'], $topicData ) )
 						{
 							$mod_links[] = $this->_addModLink($key);
 						}
@@ -2109,7 +1455,7 @@ class public_forums_forums_topics extends ipsCommand
 				}
 				elseif ($key == 'delete_topic')
 				{
-					if ($this->memberData['g_delete_own_topics'])
+					if ( $this->memberData['g_delete_own_topics'] OR $this->registry->getClass('class_forums')->canSoftDeleteTopics( $forumData['id'], $topicData ) )
 					{
 						$mod_links[] = $this->_addModLink($key);
 					}
@@ -2133,30 +1479,34 @@ class public_forums_forums_topics extends ipsCommand
 	 */
 	public function _addModLink( $key="" )
 	{
+		/* Init */
+		$topicData = $this->registry->getClass('topics')->getTopicData();
+		$forumData = $this->forumClass->getForumById( $topicData['forum_id'] );
+		
 		if ($key == "") return "";
 		
-		if ($this->topic['state'] == 'open'   and $key == 'open_topic') return "";
-		if ($this->topic['state'] == 'closed' and $key == 'close_topic') return "";
-		if ($this->topic['state'] == 'moved'  and ($key == 'close_topic' or $key == 'move_topic')) return "";
-		if ($this->topic['pinned'] == 1 and $key == 'pin_topic')   return "";
-		if ($this->topic['pinned'] == 0 and $key == 'unpin_topic') return "";
+		if ($topicData['state'] == 'open'   and $key == 'open_topic') return "";
+		if ($topicData['state'] == 'closed' and $key == 'close_topic') return "";
+		if ($topicData['state'] == 'moved'  and ($key == 'close_topic' or $key == 'move_topic')) return "";
+		if ($topicData['pinned'] == 1 and $key == 'pin_topic')   return "";
+		if ($topicData['pinned'] == 0 and $key == 'unpin_topic') return "";
 		
 		return array( 'option' => $this->mod_action[ strtoupper($key) ],
 					  'value'  => $this->lang->words[ strtoupper($key) ] );
 	}
 	
 	/**
-	 * Get Linear Topic Data
+	 * Get Topic Data
 	 *
 	 * @return	array
 	 */
-	public function _getTopicDataLinear()
+	public function _getPosts()
 	{
-		//-----------------------------------------
-		// Grab the posts we'll need
-		//-----------------------------------------
-
-		$first = intval($this->request['st']) >=0 ? intval($this->request['st']) : 0;
+		/* Init */
+		$topicData      = $this->registry->getClass('topics')->getTopicData();
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
+		$first          = intval($this->request['st']) >=0 ? intval($this->request['st']) : 0;
 
 		$pc_join = array();
 
@@ -2183,12 +1533,12 @@ class public_forums_forums_topics extends ipsCommand
 		$queued_query_bit = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('visible');
 
 		/* Can we deal with hidden posts? */
-		if ( $this->registry->class_forums->canQueuePosts($this->topic['forum_id']) )
+		if ( $this->registry->class_forums->canQueuePosts($topicData['forum_id']) )
 		{
-			if ( $this->permissions['softDeleteSee'] )
+			if ( $permissionData['softDeleteSee'] )
 			{
 				/* See queued and soft deleted */
-				$queued_query_bit = '';
+				$queued_query_bit = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible', 'hidden', 'sdeleted' ) );
 			}
 			else
 			{
@@ -2205,7 +1555,7 @@ class public_forums_forums_topics extends ipsCommand
 		else
 		{
 			/* We cannot see hidden posts */
-			if ( $this->permissions['softDeleteSee'] )
+			if ( $permissionData['softDeleteSee'] )
 			{
 				/* See queued and soft deleted */
 				$queued_query_bit = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery( array('approved', 'sdeleted') );
@@ -2213,80 +1563,23 @@ class public_forums_forums_topics extends ipsCommand
 		}
 		
 		/* Did we specifically want to see soft deleted posts? */
-		if ( $this->request['modfilter'] == 'deleted_posts' AND $this->permissions['softDeleteSee'] )
+		if ( $this->request['modfilter'] == 'deleted_posts' AND $permissionData['softDeleteSee'] )
 		{
 			$queued_query_bit = ' AND ' . $this->registry->class_forums->fetchPostHiddenQuery('sdeleted');
 		}
 
-		//-----------------------------------------
-		// Using "new" mode?
-		//-----------------------------------------
+		$this->DB->build( array(
+								'select' => 'pid',
+								'from'   => 'posts',
+								'where'  => 'topic_id='.$topicData['tid']. $queued_query_bit,
+								'order'  => $this->settings['post_order_column'].' '.$this->settings['post_order_sort'],
+								'limit'  => array( $first, $this->settings['display_max_posts'] ) )	);
 
-		if ( $this->topic_view_mode == 'linearplus' and $this->topic['topic_firstpost'] )
+		$this->DB->execute();
+
+		while( $p = $this->DB->fetch() )
 		{
-			$this->topic['new_mode_start'] = $first + 1;
-
-			if ( $first )
-			{
-				$this->topic['new_mode_start']--;
-			}
-
-			if ( $first + $this->settings['display_max_posts'] > ( $this->topic['posts'] + 1 ) )
-			{
-				$this->topic['new_mode_end'] = $this->topic['posts'];
-			}
-			else
-			{
-				$this->topic['new_mode_end'] = $first + ($this->settings['display_max_posts'] - 1);
-			}
-
-			if ( $first )
-			{
-				$this->pids = array( 0 => $this->topic['topic_firstpost'] );
-			}
-
-			//-----------------------------------------
-			// Get PIDS of this page/topic
-			//-----------------------------------------
-
-			$this->DB->build( array(
-									'select' => 'pid,topic_id',
-									'from'   => 'posts',
-									'where'  => 'topic_id='.$this->topic['tid']. $queued_query_bit,
-									'order'  => 'pid asc',
-									'limit'  => array( $first, $this->settings['display_max_posts'] )
-						)	);
-
-			$this->DB->execute();
-
-			while( $p = $this->DB->fetch() )
-			{
-				$this->pids[ $p['pid'] ] = $p['pid'];
-			}
-		}
-		else
-		{
-			//-----------------------------------------
-			// Run query
-			//-----------------------------------------
-
-			$this->topic_view_mode = 'linear';
-
-			# We don't need * but if we don't use it, it won't use the correct index
-			$this->DB->build( array(
-									'select' => 'pid',
-									'from'   => 'posts',
-									'where'  => 'topic_id='.$this->topic['tid']. $queued_query_bit,
-									'order'  => $this->settings['post_order_column'].' '.$this->settings['post_order_sort'],
-									'limit'  => array( $first, $this->settings['display_max_posts'] )
-						)	);
-
-			$this->DB->execute();
-
-			while( $p = $this->DB->fetch() )
-			{
-				$this->pids[ $p['pid'] ] = $p['pid'];
-			}
+			$this->pids[ $p['pid'] ] = $p['pid'];
 		}
 
 		//-----------------------------------------
@@ -2338,7 +1631,7 @@ class public_forums_forums_topics extends ipsCommand
 		
 		$_post_joins = array(
 								array( 
-										'select' => 'm.member_id as mid,m.name,m.member_group_id,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn, m.members_display_name, m.members_seo_name, m.has_gallery, m.has_blog, m.members_bitoptions,m.mgroup_others'.$_extraMember,
+										'select' => 'm.member_id as mid,m.name,m.member_group_id,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title as member_title, m.warn_level, m.warn_lastwarn, m.members_display_name, m.members_seo_name, m.has_gallery, m.has_blog, m.members_bitoptions,m.mgroup_others'.$_extraMember,
 										'from'   => array( 'members' => 'm' ),
 										'where'  => 'm.member_id=p.author_id',
 										'type'   => 'left'
@@ -2410,13 +1703,11 @@ class public_forums_forums_topics extends ipsCommand
 		// Get posts
 		//-----------------------------------------
 
-		$this->DB->build( array( 
-								'select'   => 'p.*',
-								'from'	   => array( 'posts' => 'p' ),
-								'where'	   => "p.pid IN(" . implode( ',', $this->pids ) . ")",
-								'order'	   => $this->settings['post_order_column'] . ' ' . $this->settings['post_order_sort'],
-								'add_join' => $_post_joins
-						)	);
+		$this->DB->build( array( 'select'   => 'p.*',
+								 'from'	    => array( 'posts' => 'p' ),
+								 'where'    => "p.pid IN(" . implode( ',', $this->pids ) . ")",
+								 'order'    => $this->settings['post_order_column'] . ' ' . $this->settings['post_order_sort'],
+								 'add_join' => $_post_joins )	);
 
 		$oq = $this->DB->execute();
 
@@ -2431,7 +1722,7 @@ class public_forums_forums_topics extends ipsCommand
 				$this->DB->build( array(
 										'select' => 'COUNT(*) as pcount',
 										'from'   => 'posts',
-										'where'  => "topic_id=".$this->topic['tid']." and queued=0"
+										'where'  => "topic_id=".$topicData['tid']." and queued=0"
 							)	);
 
 				$newq   = $this->DB->execute();
@@ -2446,11 +1737,11 @@ class public_forums_forums_topics extends ipsCommand
 
 				if ($pcount['pcount'] > 1)
 				{
-					$this->DB->update( 'topics', array( 'posts' => $pcount['pcount'] ), "tid=".$this->topic['tid'] );
+					$this->DB->update( 'topics', array( 'posts' => $pcount['pcount'] ), "tid=".$topicData['tid'] );
 
 				}
 
-				$this->registry->output->silentRedirect($this->settings['base_url']."showtopic={$this->topic['tid']}&view=getlastpost");
+				$this->registry->output->silentRedirect($this->settings['base_url']."showtopic={$topicData['tid']}&view=getlastpost");
 			}
 		}
 
@@ -2458,7 +1749,7 @@ class public_forums_forums_topics extends ipsCommand
 		// Render the page top
 		//-----------------------------------------
 
-		$this->topic['go_new'] = isset($this->topic['go_new']) ? $this->topic['go_new'] : '';
+		$topicData['go_new'] = isset($topicData['go_new']) ? $topicData['go_new'] : '';
 
 		//-----------------------------------------
 		// Format and print out the topic list
@@ -2470,32 +1761,22 @@ class public_forums_forums_topics extends ipsCommand
 		while ( $row = $this->DB->fetch( $oq ) )
 		{
 			$row['member_id']	= $row['mid'];
-			$row['g_access_cp']	= $this->caches['group_cache'][ $row['member_group_id'] ]['g_access_cp'];
 
-			$return = $this->parsePostRow( $row );
-
-			$poster = $return['poster'];
-			$row	= $return['row'];
-			$poster['member_id'] = $poster['mid'];
+			$_data = $this->parsePostRow( $row );
 			
-			/* Reputation */
-			if( $this->settings['reputation_enabled'] )
-			{
-				$row['pp_reputation_points'] = $row['pp_reputation_points'] ? $row['pp_reputation_points'] : 0;
-				$row['has_given_rep']        = $row['has_given_rep'] ? $row['has_given_rep'] : 0;
-				$row['rep_points']           = $row['rep_points'] ? $row['rep_points'] : 0;
-			}
-
-			$post_data[ $row['pid'] ] = array( 'post' => $row, 'author' => $poster );
+			$post_data[ $_data['post'] ['pid'] ] = $_data;
 
 			//-----------------------------------------
 			// Are we giving this bloke a good ignoring?
 			//-----------------------------------------
-			if( isset( $ignored_users ) && is_array( $ignored_users ) && count( $ignored_users ) )
+			
+			$post_data[ $row['pid'] ]['post']['_ignored']	= 0;
+
+			if ( isset( $ignored_users ) && is_array( $ignored_users ) && count( $ignored_users ) )
 			{
-				if( in_array( $poster['member_id'], $ignored_users ) )
+				if( in_array( $post_data[ $row['pid'] ]['author']['member_id'], $ignored_users ) )
 				{
-					if ( ! strstr( $this->settings['cannot_ignore_groups'], ','.$poster['member_group_id'].',' ) )
+					if ( ! strstr( $this->settings['cannot_ignore_groups'], ','.$post_data[ $row['pid'] ]['post']['member_group_id'].',' ) )
 					{
 						$post_data[ $row['pid'] ]['post']['_ignored'] = 1;
 						continue;
@@ -2503,48 +1784,17 @@ class public_forums_forums_topics extends ipsCommand
 				}
 			}
 			
-			//-----------------------------------------
-			// What about rep, are we ignoring?
-			//-----------------------------------------
-			
-			$this->memberData['_members_cache']['rep_filter'] = isset( $this->memberData['_members_cache']['rep_filter'] ) ? $this->memberData['_members_cache']['rep_filter'] : '*';
-						
-			if( $this->settings['reputation_enabled'] )
-			{
- 				if( ! ( $this->settings['reputation_protected_groups'] && 
- 					    in_array( $this->memberData['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) 
- 					   ) &&
- 					  $this->memberData['_members_cache']['rep_filter'] !== '*'
- 				)
-				{
-					if( $this->settings['reputation_show_content'] && $post_data[ $row['pid'] ]['post']['rep_points'] < $this->memberData['_members_cache']['rep_filter'] )
-					{
-						$post_data[ $row['pid'] ]['post']['_repignored'] = 1;
-					}
-				}
-			}
-
-			//-----------------------------------------
-			// Show end first post
-			//-----------------------------------------
-
-			if ( $this->topic_view_mode == 'linearplus' and $this->first_printed == 0 and $row['pid'] == $this->topic['topic_firstpost'] and $this->topic['posts'] > 0)
-			{
-				$post_data[ $row['pid'] ]['post']['_end_first_post'] = 1;
-			}
-
-			$post_data[ $row['pid'] ]['post']['rep_points'] = $post_data[ $row['pid'] ]['post']['rep_points'] ? $post_data[ $row['pid'] ]['post']['rep_points'] : 0;
-			
 			/* AD Code */
-			if( $this->registry->getClass('IPSAdCode')->userCanViewAds() && ! $adCodeSet )
+			$post_data[ $row['pid'] ]['post']['_adCode']	= '';
+
+			if ( $this->registry->getClass('IPSAdCode')->userCanViewAds() && ! $adCodeSet )
 			{
-				if( $this->registry->getClass('IPSAdCode')->getAdCode('ad_code_topic_view_code') )
+				if ( $this->registry->getClass('IPSAdCode')->getAdCode('ad_code_topic_view_code') )
 				{
 					$post_data[ $row['pid'] ]['post']['_adCode']	= $this->registry->getClass('IPSAdCode')->getAdCode('ad_code_topic_view_code');
 					$adCodeSet										= true;
 				}
 			}
-			
 		}
 
 		//-----------------------------------------
@@ -2557,10 +1807,15 @@ class public_forums_forums_topics extends ipsCommand
 	/**
 	 * Topic set up ya'll
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function topicSetUp()
+	public function topicSetUp( $topicData )
 	{
+		/* Init */
+		$topicData      = ( $topicData['tid'] ) ? $topicData : $this->registry->getClass('topics')->getTopicData();
+		$forumData      = $this->forumClass->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->registry->getClass('topics')->getPermissionData();
+
 		//-----------------------------------------
 		// Memory...
 		//-----------------------------------------
@@ -2599,14 +1854,13 @@ class public_forums_forums_topics extends ipsCommand
 		{
 			$moderator = $this->memberData['forumsModeratorData'];
 			
-			if ( !isset($moderator[ $this->forum['id'] ]) OR !is_array( $moderator[ $this->forum['id'] ] ) )
+			if ( !isset($moderator[ $forumData['id'] ]) OR !is_array( $moderator[ $forumData['id'] ] ) )
 			{
 				$this->memberData['is_mod'] = 0;
 			}
 		}
 		
 		$this->settings['_base_url'] = $this->settings['base_url'];
-		$this->forum['FORUM_JUMP']   = $this->registry->getClass('class_forums')->buildForumJump();
 		$this->first				 = intval( $this->request['st'] ) > 0 ? intval( $this->request['st'] ) : 0;
 		$this->request['view']	     = ! empty( $this->request['view'] ) ? $this->request['view'] : NULL ;
 		
@@ -2615,28 +1869,32 @@ class public_forums_forums_topics extends ipsCommand
 		// password forums, etc
 		//-----------------------------------------
 
-		if ( ( ! $this->memberData['g_other_topics'] ) AND ( $this->topic['starter_id'] != $this->memberData['member_id'] ) )
+		if ( ( ! $this->memberData['g_other_topics'] ) AND ( $topicData['starter_id'] != $this->memberData['member_id'] ) )
 		{
 			$this->registry->output->showError( 'topics_not_yours', 10359, null, null, 403 );
 		}
-		else if( (!$this->forum['can_view_others'] AND !$this->memberData['is_mod'] ) AND ( $this->topic['starter_id'] != $this->memberData['member_id'] ) )
+		else if( (!$forumData['can_view_others'] AND !$this->memberData['is_mod'] ) AND ( $topicData['starter_id'] != $this->memberData['member_id'] ) )
 		{
 			$this->registry->output->showError( 'topics_not_yours2', 10360, null, null, 403 );
 		}
+		else if( $forumData['redirect_on'] AND $forumData['redirect_url'] )
+		{
+			$this->registry->output->silentRedirect( $forumData['redirect_url'] );
+		}
 		
 		//-----------------------------------------
 		// Update the topic views counter
 		//-----------------------------------------
 		
-		if ( ! $this->request['view'] AND $this->topic['state'] != 'link' )
+		if ( ! $this->request['view'] AND $topicData['state'] != 'link' )
 		{
 			if ( $this->settings['update_topic_views_immediately'] )
 			{
-				$this->DB->update( 'topics', 'views=views+1', "tid=".$this->topic['tid'], true, true );
+				$this->DB->update( 'topics', 'views=views+1', "tid=".$topicData['tid'], true, true );
 			}
 			else
 			{
-				$this->DB->insert( 'topic_views', array( 'views_tid' => $this->topic['tid'] ), true );
+				$this->DB->insert( 'topic_views', array( 'views_tid' => $topicData['tid'] ), true );
 			}
 		}
 		
@@ -2644,46 +1902,46 @@ class public_forums_forums_topics extends ipsCommand
 		// Need to update this topic?
 		//-----------------------------------------
 		
-		if ( $this->topic['state'] == 'open' )
+		if ( $topicData['state'] == 'open' )
 		{
-			if( !$this->topic['topic_open_time'] OR $this->topic['topic_open_time'] < $this->topic['topic_close_time'] )
+			if( !$topicData['topic_open_time'] OR $topicData['topic_open_time'] < $topicData['topic_close_time'] )
 			{
-				if ( $this->topic['topic_close_time'] AND ( $this->topic['topic_close_time'] <= time() AND ( time() >= $this->topic['topic_open_time'] OR !$this->topic['topic_open_time'] ) ) )
+				if ( $topicData['topic_close_time'] AND ( $topicData['topic_close_time'] <= time() AND ( time() >= $topicData['topic_open_time'] OR !$topicData['topic_open_time'] ) ) )
 				{
-					$this->topic['state'] = 'closed';
+					$topicData['state'] = 'closed';
 					
-					$this->DB->update( 'topics', array( 'state' => 'closed' ), 'tid='.$this->topic['tid'], true );
+					$this->DB->update( 'topics', array( 'state' => 'closed' ), 'tid='.$topicData['tid'], true );
 				}
 			}
-			else if( $this->topic['topic_open_time'] OR $this->topic['topic_open_time'] > $this->topic['topic_close_time'] )
+			else if( $topicData['topic_open_time'] OR $topicData['topic_open_time'] > $topicData['topic_close_time'] )
 			{
-				if ( $this->topic['topic_close_time'] AND ( $this->topic['topic_close_time'] <= time() AND time() <= $this->topic['topic_open_time'] ) )
+				if ( $topicData['topic_close_time'] AND ( $topicData['topic_close_time'] <= time() AND time() <= $topicData['topic_open_time'] ) )
 				{
-					$this->topic['state'] = 'closed';
+					$topicData['state'] = 'closed';
 					
-					$this->DB->update( 'topics', array( 'state' => 'closed' ), 'tid='.$this->topic['tid'], true );
+					$this->DB->update( 'topics', array( 'state' => 'closed' ), 'tid='.$topicData['tid'], true );
 				}
 			}				
 		}
-		else if ( $this->topic['state'] == 'closed' )
+		else if ( $topicData['state'] == 'closed' )
 		{
-			if( !$this->topic['topic_close_time'] OR $this->topic['topic_close_time'] < $this->topic['topic_open_time'] )
+			if( !$topicData['topic_close_time'] OR $topicData['topic_close_time'] < $topicData['topic_open_time'] )
 			{
-				if ( $this->topic['topic_open_time'] AND ( $this->topic['topic_open_time'] <= time() AND ( time() >= $this->topic['topic_close_time'] OR !$this->topic['topic_close_time'] ) ) )
+				if ( $topicData['topic_open_time'] AND ( $topicData['topic_open_time'] <= time() AND ( time() >= $topicData['topic_close_time'] OR !$topicData['topic_close_time'] ) ) )
 				{
-					$this->topic['state'] = 'open';
+					$topicData['state'] = 'open';
 					
-					$this->DB->update( 'topics', array( 'state' => 'open' ), 'tid='.$this->topic['tid'], true );
+					$this->DB->update( 'topics', array( 'state' => 'open' ), 'tid='.$topicData['tid'], true );
 				}
 			}
-			else if( $this->topic['topic_close_time'] OR $this->topic['topic_close_time'] > $this->topic['topic_open_time'] )
+			else if( $topicData['topic_close_time'] OR $topicData['topic_close_time'] > $topicData['topic_open_time'] )
 			{
 
-				if ( $this->topic['topic_open_time'] AND ( $this->topic['topic_open_time'] <= time() AND time() <= $this->topic['topic_close_time'] ) )
+				if ( $topicData['topic_open_time'] AND ( $topicData['topic_open_time'] <= time() AND time() <= $topicData['topic_close_time'] ) )
 				{
-					$this->topic['state'] = 'open';
+					$topicData['state'] = 'open';
 					
-					$this->DB->update( 'topics', array( 'state' => 'open' ), 'tid='.$this->topic['tid'], true );
+					$this->DB->update( 'topics', array( 'state' => 'open' ), 'tid='.$topicData['tid'], true );
 				}
 			}				
 		}
@@ -2692,71 +1950,62 @@ class public_forums_forums_topics extends ipsCommand
 		// Current topic rating value
 		//-----------------------------------------
 		
-		$this->topic['_rate_show']  = 0;
-		$this->topic['_rate_int']   = 0;
-		$this->topic['_rate_img']   = '';
+		$topicData['_rate_show']  = 0;
+		$topicData['_rate_int']   = 0;
+		$topicData['_rate_img']   = '';
 		
-		if ( $this->topic['state'] != 'open' )
+		if ( $topicData['state'] != 'open' )
 		{
-			$this->topic['_allow_rate'] = 0;
+			$topicData['_allow_rate'] = 0;
 		}
 		else
 		{
-			$this->topic['_allow_rate'] = $this->can_rate;
+			$topicData['_allow_rate'] = $this->can_rate;
 		}
 		
-		if ( $this->forum['forum_allow_rating'] )
+		if ( $forumData['forum_allow_rating'] )
 		{
-			$rating = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topic_ratings', 'where' => "rating_tid={$this->topic['tid']} and rating_member_id=".$this->memberData['member_id'] ) );
+			$rating = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topic_ratings', 'where' => "rating_tid={$topicData['tid']} and rating_member_id=".$this->memberData['member_id'] ) );
 			
 			if ( $rating['rating_value'] AND $this->memberData['g_topic_rate_setting'] != 2 )
 			{
-				$this->topic['_allow_rate'] = 0;
+				$topicData['_allow_rate'] = 0;
 			}
 			
-			$this->topic['_rate_id']	   = 0;
-			$this->topic['_rating_value']  = $rating['rating_value'] ? $rating['rating_value'] : -1;
+			$topicData['_rate_id']	   = 0;
+			$topicData['_rating_value']  = $rating['rating_value'] ? $rating['rating_value'] : -1;
 			
-			if ( $this->topic['topic_rating_total'] )
+			if ( $topicData['topic_rating_total'] )
 			{
-				$this->topic['_rate_int'] = round( $this->topic['topic_rating_total'] / $this->topic['topic_rating_hits'] );
+				$topicData['_rate_int'] = round( $topicData['topic_rating_total'] / $topicData['topic_rating_hits'] );
 			}
 			
 			//-----------------------------------------
 			// Show image?
 			//-----------------------------------------
 			
-			if ( ( $this->topic['topic_rating_hits'] >= $this->settings['topic_rating_needed'] ) AND ( $this->topic['_rate_int'] ) )
+			if ( ( $topicData['topic_rating_hits'] >= $this->settings['topic_rating_needed'] ) AND ( $topicData['_rate_int'] ) )
 			{
-				$this->topic['_rate_id']   = $this->topic['_rate_int'];
-				$this->topic['_rate_show'] = 1;
+				$topicData['_rate_id']   = $topicData['_rate_int'];
+				$topicData['_rate_show'] = 1;
 			}
 		}
 		else
 		{
-			$this->topic['_allow_rate'] = 0;
+			$topicData['_allow_rate'] = 0;
 		}		
 		
-		//-----------------------------------------
-		// Update the item marker
-		//-----------------------------------------
-	
-		if ( ! $this->request['view'] )
-		{
-			$this->registry->getClass('classItemMarking')->markRead( array( 'forumID' => $this->forum['id'], 'itemID' => $this->topic['tid'] ) );
-		}
-		
 		//-----------------------------------------
 		// If this forum is a link, then 
 		// redirect them to the new location
 		//-----------------------------------------
 		
-		if ( $this->topic['state'] == 'link' )
+		if ( $topicData['state'] == 'link' AND $topicData['moved_to'] )
 		{
-			$f_stuff	= explode("&", $this->topic['moved_to']);
+			$f_stuff	= explode("&", $topicData['moved_to']);
 			$_topic		= $this->DB->buildAndFetch( array( 'select' => 'title_seo', 'from' => 'topics', 'where' => 'tid=' . $f_stuff[0] ) );
 			
-			$this->registry->output->redirectScreen( $this->lang->words['topic_moved'], $this->settings['base_url'] . "showtopic={$f_stuff[0]}", $_topic['title_seo'], 'showtopic' );
+			$this->registry->output->silentRedirect( $this->settings['base_url'] . "showtopic={$f_stuff[0]}", $_topic['title_seo'], true, 'showtopic' );
 		}
 		
 		//-----------------------------------------
@@ -2764,58 +2013,33 @@ class public_forums_forums_topics extends ipsCommand
 		// the cat details, and parent details
 		//-----------------------------------------
 		
-	   	$this->nav = $this->registry->class_forums->forumsBreadcrumbNav( $this->forum['id'] );
-		
-		//-----------------------------------------
-		// Are we a moderator?
-		//-----------------------------------------
-		
-		if ( ($this->memberData['member_id']) and ($this->memberData['g_is_supmod'] != 1) )
-		{
-			$other_mgroups	= array();
-			$_mgroup_others	= IPSText::cleanPermString( $this->memberData['mgroup_others'] );
-
-			if( $_mgroup_others )
-			{
-				$other_mgroups = explode( ",", $_mgroup_others );
-			}
-		
-			$other_mgroups[] = $this->memberData['member_group_id'];
-			
-			$member_group_ids = implode( ",", $other_mgroups );
-
-			$this->moderator = $this->DB->buildAndFetch( array( 
-																'select' => '*',
-																'from'	=> 'moderators',
-																'where'	=> "forum_id LIKE '%,{$this->forum['id']},%' AND (member_id={$this->memberData['member_id']} OR (is_group=1 AND group_id IN({$member_group_ids})))"
-														)	);
-		}
+	   	$this->nav = $this->registry->class_forums->forumsBreadcrumbNav( $forumData['id'] );
 		
 		//-----------------------------------------
 		// Hi! Light?
 		//-----------------------------------------
 		
-		$hl = (isset( $this->request['hl'] ) AND $this->request['hl']) ? '&amp;hl='.$this->request['hl'] : '';
+		$hl = !empty( $this->request['hl'] ) ? '&amp;hl=' . $this->request['hl'] : '';
 		
 		//-----------------------------------------
 		// If we can see queued topics, add count
 		//-----------------------------------------
 		
-		if ( $this->registry->class_forums->canQueuePosts($this->forum['id']) )
+		if ( $this->registry->class_forums->canQueuePosts($forumData['id']) )
 		{
 			if( isset( $this->request['modfilter'] ) AND $this->request['modfilter'] == 'invisible_posts' )
 			{
-				$this->topic['posts'] = intval( $this->topic['topic_queuedposts'] );
+				$topicData['posts'] = intval( $topicData['topic_queuedposts'] );
 			}
 			else
 			{
-				$this->topic['posts'] += intval( $this->topic['topic_queuedposts'] );
+				$topicData['posts'] += intval( $topicData['topic_queuedposts'] );
 			}
 		}
 		
-		if ( $this->permissions['softDeleteSee'] AND $this->topic['topic_deleted_posts'] )
+		if ( $permissionData['softDeleteSee'] AND $topicData['topic_deleted_posts'] )
 		{
-			$this->topic['posts'] += intval( $this->topic['topic_deleted_posts'] );
+			$topicData['posts'] += intval( $topicData['topic_deleted_posts'] );
 		}
 		
 		//-----------------------------------------
@@ -2827,29 +2051,23 @@ class public_forums_forums_topics extends ipsCommand
 			$hl	.= "&amp;modfilter=" . $this->request['modfilter'];
 		}
 		
-		$this->topic['SHOW_PAGES']
+		$topicData['SHOW_PAGES']
 			= $this->registry->output->generatePagination( array( 
-																	'totalItems'		=> ($this->topic['posts']+1),
+																	'totalItems'		=> ($topicData['posts']+1),
 																	'itemsPerPage'		=> $this->settings['display_max_posts'],
 																	'currentStartValue'	=> $this->first,
-																	'seoTitle'			=> $this->topic['title_seo'],
+																	'seoTitle'			=> $topicData['title_seo'],
 																	'seoTemplate'		=> 'showtopic',
- 																	'baseUrl'			=> "showtopic=".$this->topic['tid'].$hl ) );
+ 																	'baseUrl'			=> "showtopic=".$topicData['tid'].$hl ) );
 								   
-		//if ( ($this->topic['posts'] + 1) > $this->settings['display_max_posts'])
-		//{
-		//	$this->topic['go_new'] = $this->registry->output->getTemplate('topic')->golastpost_link($this->forum['id'], $this->topic['tid'] );
-		//}
-								   
-		
 		//-----------------------------------------
 		// Fix up some of the words
 		//-----------------------------------------
 		
-		$this->topic['TOPIC_START_DATE'] = $this->registry->class_localization->getDate( $this->topic['start_date'], 'LONG' );
+		$topicData['TOPIC_START_DATE'] = $this->registry->class_localization->getDate( $topicData['start_date'], 'LONG' );
 		
-		$this->lang->words['topic_stats'] = str_replace( "<#START#>", $this->topic['TOPIC_START_DATE'], $this->lang->words['topic_stats']);
-		$this->lang->words['topic_stats'] = str_replace( "<#POSTS#>", $this->topic['posts']		   , $this->lang->words['topic_stats']);
+		$this->lang->words['topic_stats'] = str_replace( "<#START#>", $topicData['TOPIC_START_DATE'], $this->lang->words['topic_stats']);
+		$this->lang->words['topic_stats'] = str_replace( "<#POSTS#>", $topicData['posts']		   , $this->lang->words['topic_stats']);
 		
 		//-----------------------------------------
 		// Multi Quoting?
@@ -2867,6 +2085,7 @@ class public_forums_forums_topics extends ipsCommand
 		IPSCookie::set('modpids', '', 0);
 		
 		IPSDebug::setMemoryDebugFlag( "TOPIC: topics.php::topicSetUp", $_before );
+		
+		return $topicData;
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/forums/tracker.php b/upload/admin/applications/forums/modules_public/forums/tracker.php
deleted file mode 100644
index d62391f4..00000000
--- a/upload/admin/applications/forums/modules_public/forums/tracker.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Subscribe to a topic or forum
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_forums_forums_tracker extends ipsCommand
-{
-	/**
-	* Forum information
-	*
-	* @access	private
-	* @var		array		Array of forum details
-	*/
-	private $forum			= array();
-
-	/**
-	* Topic information
-	*
-	* @access	private
-	* @var		array		Array of topic details
-	*/
-	private $topic			= array();
-	
-	/**
-	* Subscription type
-	*
-	* @access	private
-	* @var		string		topic or forum
-	*/
-	private $type			= 'topic';
-
-	/**
-	* Subscription method
-	*
-	* @access	private
-	* @var		string		delayed, immediate, none, daily, weekly
-	*/
-	private $method			= 'delayed';
-
-	/**
-	* Class entry point
-	*
-	* @access	public
-	* @param	object		Registry reference
-	* @param	boolean		Return instead of showing topic subscribed page
-	* @return	mixed		[Outputs to screen/redirects, or returns if $is_sub is true]
-	*/
-	public function doExecute( ipsRegistry $registry, $is_sub = false )
-	{
-		if( !$this->request['t'] )
-		{
-			$this->registry->output->showError( 'tracker_no_tid', 10361, null, null, 404 );
-		}
-
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_emails' ), 'core' );
-
-		//-----------------------------------------
-		// Check the input
-		//-----------------------------------------
-		
-		if ( $this->request['type'] == 'forum' )
-		{
-			$this->type = 'forum';
-		}
-		
-		//-----------------------------------------
-		// Method..
-		//-----------------------------------------
-		
-		switch ( $this->request['method'] )
-		{
-			case 'delayed':
-			default:
-				$this->method = 'delayed';
-			break;
-			case 'immediate':
-				$this->method = 'immediate';
-			break;
-			case 'none':
-				$this->method = 'none';
-			break;
-			case 'daily':
-				$this->method = 'daily';
-			break;
-			case 'weekly':
-				$this->method = 'weekly';
-			break;
-		}
-		
-		
-		$this->request['t'] =  intval($this->request['t']);
-		$this->request['f'] =  intval($this->request['f']);
-		
-		//-----------------------------------------
-		// Error out if we can not find the forum
-		//-----------------------------------------
-		
-		if ( ! ipsRegistry::getClass('class_forums')->forum_by_id[ $this->request['f'] ] )
-		{
-			if ( $is_sub == false )
-			{
-				$this->registry->output->showError( 'tracker_no_fid', 10362, null, null, 404 );
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		//-----------------------------------------
-		// Get the information based on ID
-		//-----------------------------------------
-		
-		if ( $this->type == 'forum' )
-		{
-			$this->forum = ipsRegistry::getClass('class_forums')->forum_by_id[ $this->request['f'] ];
-		}
-		else
-		{
-			$this->topic = $this->DB->buildAndFetch( array( 'select' => 'tid, forum_id, starter_id', 'from' => 'topics', 'where' => 'tid=' . $this->request['t'] ) );
-			
-			if( !is_array($this->topic) OR !count($this->topic) )
-			{
-				$this->registry->output->showError( 'tracker_no_tid', 10363, null, null, 404 );
-			}
-
-			$this->forum = ipsRegistry::getClass('class_forums')->forum_by_id[ $this->request['f'] ];
-		}
-
-		//-----------------------------------------
-		// Error out if we can not find the topic
-		//-----------------------------------------
-		
-		if ( $this->type != 'forum' )
-		{
-			if ( ! $this->topic['tid'] )
-			{
-				if ( $is_sub == false )
-				{
-					$this->registry->output->showError( 'tracker_no_fid', 10364, null, null, 404 );
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Check viewing permissions, private forums,
-		// password forums, etc
-		//-----------------------------------------
-		
-		if ( !$this->memberData['member_id'] )
-		{
-			if ( $is_sub == false )
-			{
-				$this->registry->output->showError( 'tracker_only_members', 10365, null, null, 403 );
-			}
-			else
-			{
-				return false;
-			}
-		}
-		
-		if( $is_sub )
-		{
-			$this->registry->getClass('class_forums')->forumsCheckAccess( $this->forum['id'], 0, $this->type, $this->topic, true );
-		}
-		else
-		{
-			$this->registry->getClass('class_forums')->forumsCheckAccess( $this->forum['id'], 0, $this->type, $this->topic );
-		}
-		
-		//-----------------------------------------
-		// Have we already subscribed?
-		//-----------------------------------------
-		
-		if ( $this->type == 'forum' )
-		{
-			$this->DB->build( array( 'select'	=> 'frid',
-											'from'	=> 'forum_tracker',
-											'where'	=> "forum_id='" . $this->forum['id'] . "' AND member_id=" . $this->memberData['member_id'] ) );
-			$this->DB->execute();
-		}
-		else
-		{
-			$this->DB->build( array( 'select'	=> 'trid',
-											'from'	=> 'tracker',
-											'where'	=> "topic_id='" . $this->topic['tid'] . "' AND member_id=" . $this->memberData['member_id'] ) );
-			$this->DB->execute();
-		}
-		
-		if ( $this->DB->getTotalRows() )
-		{
-			if ( $is_sub == false )
-			{
-				$this->registry->output->showError( 'tracker_already_track', 10366 );
-			}
-			else
-			{
-				return false;
-			}
-		}
-		
-		//-----------------------------------------
-		// Add it to the DB
-		//-----------------------------------------
-		
-		if ($this->type == 'forum')
-		{
-			$this->DB->insert( 'forum_tracker', array (
-															'member_id'			=> $this->memberData['member_id'],
-															'forum_id'			=> $this->request['f'],
-															'start_date'		=> time(),
-															'forum_track_type'	=> $this->method,
-								)						);
-		}
-		else
-		{
-			$this->DB->insert( 'tracker', array (
-													'member_id'			=> $this->memberData['member_id'],
-													'topic_id'			=> $this->topic['tid'],
-													'start_date'		=> time(),
-													'topic_track_type'	=> $this->method,
-									 )	   );
-		}
-		
-		if ( $is_sub == false )
-		{
-			if ( $this->type == 'forum' )
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['sub_added'], $this->settings['base_url'] . "showforum={$this->topic['id']}" );
-			}
-			else
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['sub_added'], $this->settings['base_url'] . "showtopic={$this->topic['tid']}&amp;st=" . $this->request['st'] );
-			}
-		}
-		else
-		{
-			return true;
-		}
-	}
-}
diff --git a/upload/admin/applications/forums/modules_public/index.html b/upload/admin/applications/forums/modules_public/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/index.html
+++ b/upload/admin/applications/forums/modules_public/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/moderate/defaultSection.php b/upload/admin/applications/forums/modules_public/moderate/defaultSection.php
new file mode 100644
index 00000000..1c0a7a64
--- /dev/null
+++ b/upload/admin/applications/forums/modules_public/moderate/defaultSection.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file		defaultSection.php 	Define the default section for the 'moderate' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		14th May 2003
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
+ */
+
+$DEFAULT_SECTION = 'moderate';
diff --git a/upload/admin/applications/forums/modules_public/moderate/index.html b/upload/admin/applications/forums/modules_public/moderate/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/moderate/index.html
+++ b/upload/admin/applications/forums/modules_public/moderate/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/moderate/moderate.php b/upload/admin/applications/forums/modules_public/moderate/moderate.php
index ebd808a8..d4864b51 100644
--- a/upload/admin/applications/forums/modules_public/moderate/moderate.php
+++ b/upload/admin/applications/forums/modules_public/moderate/moderate.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator actions
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-10-11 11:50:01 -0400 (Tue, 11 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7195 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9597 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -59,20 +59,6 @@ class public_forums_moderate_moderate extends ipsCommand
 	 */
 	protected $topic			= array();
 
-	/**
-	 * Trash can forum ID
-	 *
-	 * @var		integer		Forum id
-	 */
-	protected $trash_forum	= 0;
-
-	/**
-	 * Trash can in use flag
-	 *
-	 * @var		boolean		Trash can in use
-	 */
-	protected $trash_inuse	= false;
-	
 	/**
 	 * Topic ids stored
 	 *
@@ -94,7 +80,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -102,7 +88,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		// Load language & skin files
 		//-----------------------------------------
 		
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_mod' ) );
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_mod' ) );
 		
 		/* If we're here auth_key was fine, so did we come from search? */
 		if ( $this->memberData['member_id'] AND $this->memberData['g_is_supmod'] AND $this->request['fromSearch'] AND $this->request['returnUrl'] )
@@ -125,17 +111,11 @@ class public_forums_moderate_moderate extends ipsCommand
 		$this->modLibrary = new $classToLoad( $this->registry );
 		$this->modLibrary->init( $this->forum );
 
-		//-----------------------------------------
-		// Trash-can set up
-		//-----------------------------------------
-		
-		$this->_takeOutTrash();
-	  
 		//-----------------------------------------
 		// Convert the code ID's into something
 		// use mere mortals can understand....
 		//-----------------------------------------
-		
+				
 		switch ( $this->request['do'] )
 		{
 			case '02':
@@ -159,6 +139,9 @@ class public_forums_moderate_moderate extends ipsCommand
 			case '08':
 				$this->_deleteTopic();
 			break;
+			case '09':
+				$this->_deleteTopicPermanent();
+			break;
 			case '12':
 				$this->_doEdit();
 			break;
@@ -241,20 +224,11 @@ class public_forums_moderate_moderate extends ipsCommand
 			case 'topic_unapprove':
 				$this->_topicApproveAlter('unapprove');
 			break;
-			//-----------------------------------------
-			// Edit member
-			//-----------------------------------------
-			case 'editmember':
-				$this->_editMember();
-			break;
-			case 'doeditmember':
-				$this->_doEditMember();
-			break;
 			
-			case 'setAsSpammer':
-				$this->_setAsSpammer();
+			case 'topic_restore':
+				$this->_topicApproveAlter('approve');
 			break;
-			
+
 			/* New options for 3.1 */
 			case 'p_approve':
 				$this->_postsManage('approve_unapproved');
@@ -268,6 +242,12 @@ class public_forums_moderate_moderate extends ipsCommand
 			case 'p_delete_softed':
 				$this->_postsManage('delete_deleted');
 			break;
+			case 'p_hrestore':
+				$this->_postsManage('hdelete_restore');
+			break;
+			case 'p_hdelete':
+				$this->_postsManage('hdelete_delete');
+			break;
 			
 			default:
 				$this->_showError();
@@ -306,17 +286,28 @@ class public_forums_moderate_moderate extends ipsCommand
 					$where = $this->registry->class_forums->fetchPostHiddenQuery( 'sdeleted' );
 				break;
 			}
-			
-			/* Get posts */
-			$this->DB->build( array( 'select' => '*',
-									 'from'	  => 'posts',
-									 'where'  => 'topic_id=' . $this->topic['tid'] . ' AND ' . $where ) );
-									 
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
+
+			if( is_array($this->request['pid']) )
 			{
-				$this->pids[ $row['pid'] ] = $row['pid'];
+				foreach( $this->request['pid'] as $pid )
+				{
+					$pid	= intval($pid);
+					$this->pids[ $pid ] = $pid;
+				}
+			}
+			else
+			{
+				/* Get posts */
+				$this->DB->build( array( 'select' => '*',
+										 'from'	  => 'posts',
+										 'where'  => 'topic_id=' . $this->topic['tid'] . ' AND ' . $where ) );
+										 
+				$this->DB->execute();
+				
+				while( $row = $this->DB->fetch() )
+				{
+					$this->pids[ $row['pid'] ] = $row['pid'];
+				}
 			}
 			
 			$this->request['selectedpids'] = implode( ",", $this->pids );
@@ -338,10 +329,26 @@ class public_forums_moderate_moderate extends ipsCommand
 					case 'delete_deleted':
 						$this->_multiDeletePost();
 					break;
+					case 'hdelete_restore':
+						$this->_multiRestoreHardDeletedPost();
+					break;
+					case 'hdelete_delete':
+						$this->_multiRemoveHardDeletedPost();
+					break;
 				}
-				
+
+				if( $this->request['return'] )
+				{
+					$_bits	= explode( ':', $this->request['return'] );
+					
+					if( count($_bits) AND $_bits[0] == 'modcp' )
+					{
+						$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'posts' );
+					}
+				}
+
 				/* Done */
-				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . '&amp;st=' . intval($this->request['st']) );
+				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . '&amp;st=' . intval($this->request['st']), $this->topic['title_seo'], 'showtopic' );
 			}
 		}
 		
@@ -349,6 +356,83 @@ class public_forums_moderate_moderate extends ipsCommand
 		$this->_showError( 'mod_no_tid', 103118.1 );
 	}
 	
+	/**
+	 * Permanently remove a hard deleted post
+	 *
+	 * @return	@e void
+	 */
+	protected function _multiRemoveHardDeletedPost()
+	{
+		$_titles	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'p.*', 
+								'from'		=> array( 'posts' => 'p' ),
+								'where'		=> 'p.pid IN(' . implode( ',', $this->pids ) . ')',
+								'add_join'	=> array(
+													array(
+														'select'	=> 't.*',
+														'from'		=> array( 'topics' => 't' ),
+														'where'		=> 't.tid=p.topic_id',
+														'type'		=> 'left',
+														)
+													)
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$_titles[ $r['tid'] ]	= $r['title'];
+
+			$this->modLibrary->init( $this->registry->getClass('class_forums')->allForums[ $r['forum_id'] ], $r );
+			$this->modLibrary->postDeleteFromDb( $r['pid'] );
+			$this->modLibrary->forumRecount( $r['forum_id'] );
+			$this->modLibrary->clearModQueueTable( 'post', $r['pid'] );
+		}
+		
+		$this->modLibrary->addModerateLog( "", "", "", implode( ', ', $_titles ), sprintf( $this->lang->words['multi_post_delete'], implode( ', ', $this->pids ) ) );
+	}
+
+	/**
+	 * Restore a hard deleted post
+	 *
+	 * @return	@e void
+	 */
+	protected function _multiRestoreHardDeletedPost()
+	{
+		$this->DB->update( 'posts', array( 'queued' => 0 ), 'pid IN(' . implode( ',', $this->pids ) . ')' );
+		
+		/* Remove any soft delete logs */
+		IPSDeleteLog::removeEntries( $this->pids, 'post', true );
+
+		$this->DB->build( array(
+								'select'	=> 'p.*', 
+								'from'		=> array( 'posts' => 'p' ),
+								'where'		=> 'p.pid IN(' . implode( ',', $this->pids ) . ')',
+								'add_join'	=> array(
+													array(
+														'select'	=> 't.*',
+														'from'		=> array( 'topics' => 't' ),
+														'where'		=> 't.tid=p.topic_id',
+														'type'		=> 'left',
+														)
+													)
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$this->modLibrary->init( $this->registry->getClass('class_forums')->allForums[ $r['forum_id'] ], $r );
+			$this->modLibrary->rebuildTopic( $r['tid'] );
+			$this->modLibrary->forumRecount( $r['forum_id'] );
+			$this->modLibrary->clearModQueueTable( 'post', $r['pid'] );
+		}
+		
+		$this->cache->rebuildCache( 'stats', 'global' );
+		
+		$this->modLibrary->addModerateLog( "", "", "", implode( ',', $this->pids ), sprintf( $this->lang->words['multi_post_restore'], $this->pids ) );
+	}
+	
 	/**
 	 * A simple wrapper function for multimethods
 	 *
@@ -396,7 +480,7 @@ class public_forums_moderate_moderate extends ipsCommand
 				switch ( $what )
 				{
 					case 'approve_unapproved':
-						$this->_multiAlterTopics('topic_q', "approved=1");
+						$this->_multiAlterTopics('topic_q', $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) );
 					break;
 					case 'delete_unapproved':
 						$this->_multiAlterTopics('delete_topic');
@@ -411,399 +495,21 @@ class public_forums_moderate_moderate extends ipsCommand
 				
 				/* Done */
 				$url = "showforum=" . $this->forum['id'];
-				$url = ( $this->request['st'] ) ? "showforum=" . $this->forum['id'] . '&st=' . $this->request['st'] : $url;
+				$url = ( $this->request['st'] ) ? "showforum=" . $this->forum['id'] . '&amp;st=' . $this->request['st'] : $url;
 		
-				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_topics'], $this->settings['base_url'] . $url, $this->forum['name_seo']  );
+				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_topics'], $this->settings['base_url'] . $url, $this->forum['name_seo'], 'showforum'  );
 			}	
 		}
 		
 		/* Still here? */
 		$this->_showError( 'mod_no_tid', 103118.1 );
 	}
-	
-	/**
-	 * Flag a user account as a spammer
-	 *
-	 * @return	void		Outputs error screen
-	 */
-	protected function _setAsSpammer()
-	{
-		/* INIT */
-		$member_id = intval( $this->request['member_id'] );
-		$toSave	   = array( 'core' => array( 'bw_is_spammer' => 1 ) );
-		
-		/* Load member */
-		$member = IPSMember::load( $member_id );
-		
-		if ( ! $member['member_id'] )
-		{
-			$this->_showError( 'moderate_no_permission', 10311900, 403 );
-		}
-		
-		/* Check permissions */
-		$this->_genericPermissionCheck('bw_flag_spammers');
-		
-		/* Protected group? */
-		if ( strstr( ','.$this->settings['warn_protected'].',', ','.$member['member_group_id'].',' ) )
-		{
-			$this->_showError( 'moderate_no_permission', 10311901, 403 );
-		}
-		
-		/* What do to.. */
-		if ( $this->settings['spm_option'] )
-		{
-			switch( $this->settings['spm_option'] )
-			{
-				case 'disable':
-					$toSave['core']['restrict_post']      = 1;
-					$toSave['core']['members_disable_pm'] = 2;
-				break;
-				case 'unapprove':
-					$toSave['core']['restrict_post']      = 1;
-					$toSave['core']['members_disable_pm'] = 2;
-					/* Unapprove posts and topics */
-					$this->modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
-				break;
-				case 'ban':
-					/* Unapprove posts and topics */
-					$this->modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
-					
-					$toSave	= array(
-									'core'				=> array(
-																'member_banned'		=> 1,
-																'title'				=> '',
-																'bw_is_spammer'		=> 1,
-																),
-									'extendedProfile'	=> array(
-																'signature'			=> '',
-																'pp_about_me'		=> '',
-																)
-									);
 
-					//-----------------------------------------
-					// Avatar
-					//-----------------------------------------
-					
-					$toSave['extendedProfile']['avatar_location']	= "";
-					$toSave['extendedProfile']['avatar_size']		= "";
-		
-					try
-					{
-						IPSMember::getFunction()->removeAvatar( $member['member_id'] );
-					}
-					catch( Exception $e )
-					{
-						// Maybe should show an error or something
-					}
-					
-					//-----------------------------------------
-					// Photo
-					//-----------------------------------------
-					
-					IPSMember::getFunction()->removeUploadedPhotos( $member['member_id'] );
-		
-					$toSave['extendedProfile'] = array_merge( $toSave['extendedProfile'], array(
-													'pp_main_photo'		=> '',
-													'pp_main_width'		=> 0,
-													'pp_main_height'	=> 0,
-													'pp_thumb_photo'	=> '',
-													'pp_thumb_width'	=> 0,
-													'pp_thumb_height'	=> 0
-													)	);
-
-					//-----------------------------------------
-					// Profile fields
-					//-----------------------------------------
-			
-					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-					$fields = new $classToLoad();
-					
-					$fields->member_data = $member;
-					$fields->initData( 'edit' );
-					$fields->parseToSave( array() );
-					
-					if ( count( $fields->out_fields ) )
-					{
-						$toSave['customFields']	= $fields->out_fields;
-					}
-
-					//-----------------------------------------
-					// Update signature content cache
-					//-----------------------------------------
-					
-					IPSContentCache::update( $member['member_id'], 'sig', '' );
-				break;
-			}
-		}
-		
-		/* Send an email */
-		if ( $this->settings['spm_notify'] AND ( $this->settings['email_in'] != $this->memberData['email'] ) )
-		{
-			IPSText::getTextClass('email')->getTemplate( 'possibleSpammer' );
-
-			IPSText::getTextClass('email')->buildMessage( array( 'DATE'         => $this->registry->class_localization->getDate( $member['joined'], 'LONG', 1 ),
-																 'MEMBER_NAME'  => $member['members_display_name'],
-																 'IP'			=> $member['ip_address'],
-																 'EMAIL'		=> $member['email'],
-																 'LINK'         => $this->registry->getClass('output')->buildSEOUrl("showuser=" . $member['member_id'], 'public', $member['members_seo_name'], 'showuser') ) );
-
-			IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email_spammer'] . $this->settings['board_name'];
-			IPSText::getTextClass('email')->to      = $this->settings['email_in'];
-			IPSText::getTextClass('email')->sendMail();
-		}
-		
-		/* Flag them as a spammer */
-		IPSMember::save( $member_id, $toSave );
-		
-		/* Send Spammer to Spam Service */
-		
-		/* Run member sync */
-		IPSLib::runMemberSync( 'onSetAsSpammer', $member );
-		
-		/* Add mod log */
-		$this->_addModeratorLog( $this->lang->words['flag_spam_done'] . ': ' . $member['member_id'] . ' - ' . $member['email'] );
-		
-		/* Redirect */
-		if( $this->topic['tid'] )
-		{
-			$this->registry->output->redirectScreen( $this->lang->words['flag_spam_done'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']), $this->topic['title_seo'] );
-		}
-		else
-		{
-			$this->registry->output->redirectScreen( $this->lang->words['flag_spam_done'], $this->settings['base_url'] . "showuser=" . $member['member_id'], $member['members_seo_name'] );
-		}
-		
-	}
-	
-	/**
-	 * Save the member updates
-	 *
-	 * @return	void		Outputs error screen
-	 * @todo 	[Future] Determine what items should be editable and allow moderators to edit them
-	 */
-	protected function _doEditMember()
-	{
-		$member = $this->_checkAndGetMember();
-
-		/* Get the signature */
-		$signature	= IPSText::getTextClass( 'editor' )->processRawPost( 'Post' );
-		$aboutme	= IPSText::getTextClass( 'editor' )->processRawPost( 'aboutme' );
-		
-		/* Parse the signature */
-		IPSText::getTextClass( 'bbcode' )->parse_smilies    		= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_html       		= intval( $this->settings['sig_allow_html'] );
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode     		= intval( $this->settings['sig_allow_ibc'] );
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'signatures';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
-
-		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
-		$signatureCache	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );
-		
-		/* Parse the about me */
-		IPSText::getTextClass( 'bbcode' )->parse_smilies    		= $this->settings['aboutme_emoticons'];
-		IPSText::getTextClass( 'bbcode' )->parse_html       		= intval( $this->settings['aboutme_html'] );
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode     		= intval( $this->settings['aboutme_bbcode'] );
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'aboutme';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
-
-		$aboutme	= IPSText::getTextClass('bbcode')->preDbParse( $aboutme );	
-		
-		/* Add sig to the save array */
-		$save['extendedProfile']	= array( 'signature' => $signature, 'pp_about_me' => $aboutme );
-		$save['members']			= array( 'title' => $this->request['title'] );
-
-		if ( $this->request['avatar'] == 1 )
-		{
-			$save['extendedProfile']['avatar_location']	= "";
-			$save['extendedProfile']['avatar_size']		= "";
-
-			try
-			{
-				IPSMember::getFunction()->removeAvatar( $member['member_id'] );
-			}
-			catch( Exception $e )
-			{
-				// Maybe should show an error or something
-			}
-		}
-		
-		if ( $this->request['photo'] == 1 )
-		{
-			IPSMember::getFunction()->removeUploadedPhotos( $member['member_id'] );
-
-			$save['extendedProfile'] = array_merge( $save['extendedProfile'], array(
-											'pp_main_photo'		=> '',
-											'pp_main_width'		=> 0,
-											'pp_main_height'	=> 0,
-											'pp_thumb_photo'	=> '',
-											'pp_thumb_width'	=> 0,
-											'pp_thumb_height'	=> 0
-											)	);
-		}
-		
-		//-----------------------------------------
-		// Profile fields
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields = new $classToLoad();
-		
-		$fields->member_data = $member;
-		$fields->initData( 'edit' );
-		$fields->parseToSave( $_POST );
-		
-		if ( count( $fields->out_fields ) )
-		{
-			$save['customFields']	= $fields->out_fields;
-		}
-
-		//-----------------------------------------
-		// Write it to the DB.
-		//-----------------------------------------
-		
-		IPSMember::save( $member['member_id'], $save );
-		
-		//-----------------------------------------
-		// Update signature content cache
-		//-----------------------------------------
-		
-		IPSContentCache::update( $member['member_id'], 'sig', $signatureCache );
-
-		//-----------------------------------------
-		// Add a mod log entry and redirect
-		//-----------------------------------------
-		
-		$this->_addModeratorLog( $this->lang->words['acp_edited_profile'] . " {$member['members_display_name']}" );
-		
-		$this->registry->output->redirectScreen(  $this->lang->words['acp_edited_profile'] . " {$member['members_display_name']}", $this->settings['base_url'] . "app=forums&amp;module=moderate&amp;section=moderate&do=editmember&auth_key={$this->member->form_hash}&mid={$member['member_id']}" );
-	}
-
-	/**
-	 * Form to edit a member
-	 *
-	 * @return	void		Outputs error screen
-	 * @todo 	[Future] Determine what items should be editable and allow moderators to edit them
-	 * @todo 	[Future] Show avatar and profile picture previews?
-	 */
-	protected function _editMember()
-	{
-		$member = $this->_checkAndGetMember();
-
-		if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-		{
-			$editable['signature']	= IPSText::getTextClass( 'bbcode' )->convertForRTE( $member['signature'] );
-		}
-		else
-		{
-			$editable['signature']	= IPSText::getTextClass('bbcode')->preEditParse( $member['signature'] );
-		}
-		
-		if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-		{
-			$editable['aboutme']	= IPSText::getTextClass( 'bbcode' )->convertForRTE( $member['pp_about_me'] );
-		}
-		else
-		{
-			$editable['aboutme']	= IPSText::getTextClass('bbcode')->preEditParse( $member['pp_about_me'] );
-		}
-		
-		$editable['member_id']		 		= $member['member_id'];
-		$editable['members_display_name']	= $member['members_display_name'];
-		$editable['title']					= $member['title'];
-
-		//-----------------------------------------
-		// Profile fields
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields = new $classToLoad();
-		
-		$fields->member_data = $member;
-		$fields->initData( 'edit' );
-		$fields->parseToEdit();
-		
-		$editable['signature']	= IPSText::getTextClass( 'editor' )->showEditor( $editable['signature'], 'Post' );
-		$editable['aboutme']	= IPSText::getTextClass( 'editor' )->showEditor( $editable['aboutme'], 'aboutme' );
-
-		//-----------------------------------------
-		// Show?
-		//-----------------------------------------
-		
-		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->editUserForm( $editable, $fields );
-
-		$this->registry->getClass('output')->setTitle( $this->lang->words['cp_em_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->getClass('output')->addNavigation( $this->lang->words['cp_vp_title'], "showuser={$member['member_id']}", $member['members_seo_name'], 'showuser' );
-		$this->registry->getClass('output')->addNavigation( $this->lang->words['cp_em_title'], '' );
-	}
-	
-	/**
-	 * Edit member: check permissions and return member
-	 *
-	 * @return	array		Member information
-	 */
-	protected function _checkAndGetMember()
-	{
-		$mid = intval($this->request['mid']) ? intval($this->request['mid']) : intval($this->request['member']);
-		
-		//-----------------------------------------
-		// Got anyfink?
-		//-----------------------------------------
-		 
-		if ( ! $mid )
-		{
-			$this->_showError( 'mod_no_mid', 10369 );
-		}
-
-		//-----------------------------------------
-		// Check Permissions
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->_showError( 'mod_only_supermods', 10370, 403 );
-		}
-		
-		//-----------------------------------------
-		// Load and config the post parser
-		//-----------------------------------------
-
-		IPSText::getTextClass('bbcode')->parse_html					= $this->settings['sig_allow_html'];
-		IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-		IPSText::getTextClass('bbcode')->parse_smilies				= 0;
-		IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings['sig_allow_ibc'];
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'signatures';
-
-		
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_post' ) );
-
-		//-----------------------------------------
-		// Get member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $mid );
-		
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
-		
-		//-----------------------------------------
-		// No editing of admins!
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_access_cp'] AND $member['g_access_cp'] )
-		{
-			$this->_showError( 'mod_admin_edit', 3032, 403 );
-		}
-		
-		return $member;
-	}
-	
 	/**
 	 * Alter approve/unapprove state of topic
 	 *
 	 * @param	string		[approve|unapprove]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _topicApproveAlter( $type='approve' )
 	{
@@ -817,11 +523,13 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		if( $approve_int )
 		{
+			$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+			
 			$this->DB->build( array( 
 									'select'   => 'p.*', 
 									'from'     => array( 'posts' => 'p' ),
 									'order'    => 'pid ASC',
-									'where'    => 'p.queued=0 AND p.topic_id=' . $this->topic['tid'],
+									'where'    => $_queued . ' AND p.topic_id=' . $this->topic['tid'],
 									'add_join' => array( 
 														array(
 																'select' => 't.title, t.forum_id, t.topic_firstpost',
@@ -849,21 +557,48 @@ class public_forums_moderate_moderate extends ipsCommand
 			}
 			
 			$this->modLibrary->clearModQueueTable( 'topic', $this->topic['tid'], true );
+
+			/* Likes */
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like	= classes_like::bootstrap( 'forums', 'topics' );
+			$_like->toggleVisibility( $this->topic['tid'], true );
+
+			/* Tagging */
+			if ( $this->registry->tags->isEnabled() )
+			{
+				$this->registry->tags->updateVisibilityByMetaId( $this->topic['tid'], 1 );
+			}
+			
+			/* Remove any soft delete logs if we are 'restoring' */
+			if( $this->request['do'] == 'topic_restore' )
+			{
+				IPSDeleteLog::removeEntries( array( $this->topic['tid'] ), 'topic', true );
+			}
 		}
 
 		$this->modLibrary->forumRecount( $this->forum['id'] );
-		$this->modLibrary->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		$this->_addModeratorLog( sprintf( $type == 'approve' ? $this->lang->words['acp_approve_topic'] : $this->lang->words['acp_unapprove_topic'], $this->topic['tid'] ) );
-		
-		$this->registry->output->redirectScreen( $this->lang->words['redirect_modified'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']) );
+
+		if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['redirect_modified'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'topics' );
+			}
+		}
+
+		$this->registry->output->redirectScreen( $this->lang->words['redirect_modified'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']), $this->topic['title_seo'], 'showtopic' );
 	}
 	
 	/**
 	 * Alter pin/unpinned state of topic
 	 *
 	 * @param	string		[pin|unpin]
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _topicPinAlter( $type='pin' )
 	{
@@ -907,27 +642,27 @@ class public_forums_moderate_moderate extends ipsCommand
 			$url	= "showforum=".$this->topic['forum_id']."&amp;st=".intval($this->request['st']);
 		}
 
-		$this->registry->output->redirectScreen( $words, $this->settings['base_url'] . $url );
+		$this->registry->output->redirectScreen( $words, $this->settings['base_url'] . $url, $this->request['from'] == 'forum' ? $this->forum['name_seo'] : $this->topic['title_seo'], $this->request['from'] == 'forum' ? 'showforum' : 'showtopic' );
 	}
 
 	/**
 	 * Alter pin/unpinned state of topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _resyncForum()
 	{
 		$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
 		$this->modLibrary->forumRecount( $this->forum['id'] );
-		$this->modLibrary->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
-		$this->registry->output->redirectScreen( $this->lang->words['cp_resync'], $this->settings['base_url'] . "showforum=".$this->forum['id'] );
+		$this->registry->output->redirectScreen( $this->lang->words['cp_resync'], $this->settings['base_url'] . "showforum=".$this->forum['id'], $this->forum['name_seo'], 'showforum' );
 	}
 	
 	/**
 	 * Process post multi-moderation
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiPostModify()
 	{
@@ -969,6 +704,17 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		IPSCookie::set( 'modpids', '', 0 );
 		
+		/* From modcp */
+		if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'posts' );
+			}
+		}
+				
 		/* From search? */
 		if ( $this->fromSearch AND $this->returnUrl )
 		{
@@ -995,7 +741,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		}
 		else if ( $this->topic['tid'] )
 		{
-			$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . '&amp;st=' . intval($this->request['st']) );
+			$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . '&amp;st=' . intval($this->request['st']), $this->topic['title_seo'], 'showtopic' );
 		}
 	}
 	
@@ -1003,7 +749,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Post multi-mod: Move posts
 	 *
 	 * @param 	string		[Optional] error message
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiMovePost( $error='' )
 	{
@@ -1125,6 +871,12 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			$this->DB->update( 'posts', array( 'topic_id' => $move_to_topic['tid'], 'new_topic' => 0 ), "pid IN(" . implode( ",", $this->pids ) . ")" ); 
 			$this->DB->update( 'posts', array( 'new_topic' => 0 ), "topic_id={$this->topic['tid']}" ); 
+			
+			//-----------------------------------------
+			// Update attachments
+			//-----------------------------------------
+			
+			$this->DB->update( 'attachments', array( 'attach_parent_id' => $move_to_topic['tid'] ), "attach_rel_module='post' AND attach_rel_id IN(" . implode( ",", $this->pids ) . ")" );
 		
 			//-----------------------------------------
 			// Is first post queued for new topic?
@@ -1177,12 +929,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			{
 				$this->modLibrary->forumRecount( $move_to_topic['forum_id'] );
 			}
-			
-			if( $move_to_topic['forum_id'] == $this->settings['forum_trash_can_id'] )
-			{
-				$this->modLibrary->clearModQueueTable( 'post', $this->pids );
-			}
-			
+
 			$this->_addModeratorLog( sprintf( $this->lang->words['acp_moved_posts'], $this->topic['title'], $move_to_topic['title'] ) );
 		}
 	}
@@ -1192,7 +939,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 *
 	 * @param 	integer		1=undelete, 0=restore
 	 * @param	string		Reason for moderating the post
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiSoftDeletePost( $delete=1, $reason='' )
 	{
@@ -1221,26 +968,26 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			if ( ! $result )
 			{
-				$this->_showError( 'moderate_no_permission', 103119 );
+				$this->_showError( 'moderate_no_permission', 103119.1 );
 			}
 		}
 		
 		/* Fetch entries and checked for lock status if not sup global */
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$logs = IPSDeleteLog::fetchEntries( $this->pids, 'post' );
-			
-			if ( is_array( $logs ) )
-			{
-				foreach( $logs as $l => $data )
-				{
-					if ( $data['sdl_locked'] )
-					{
-						$this->_showError( 'moderate_no_permission_deleted_items', 10367.1 );
-					}
-				}
-			}
-		}
+		//if ( ! $this->memberData['g_is_supmod'] )
+		//{
+		//	$logs = IPSDeleteLog::fetchEntries( $this->pids, 'post' );
+		//	
+		//	if ( is_array( $logs ) )
+		//	{
+		//		foreach( $logs as $l => $data )
+		//		{
+		//			if ( $data['sdl_locked'] )
+		//			{
+		//				$this->_showError( 'moderate_no_permission_deleted_items', 10367.1 );
+		//			}
+		//		}
+		//	}
+		//}
 		
 		/* Ensure we check for a single topic id */
 		if ( ! $this->fromSearch )
@@ -1257,7 +1004,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Post multi-mod: Approve posts
 	 *
 	 * @param 	integer		1=approve, 0=unapprove
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiApprovePost( $approve=1 )
 	{
@@ -1281,18 +1028,58 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Post multi-mod: Delete posts
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiDeletePost()
 	{
 		$this->_resetModerator( $this->topic['forum_id'] );
-		
-		$this->_genericPermissionCheck( 'delete_post' );
-		
+
+		if( !$this->_genericPermissionCheck( 'delete_post', null, true ) )
+		{
+			if( !$this->memberData['g_delete_own_posts'] )
+			{
+				$this->_showError( 'mod_delete_first_post', 10376.1 );
+			}
+			else
+			{
+				/* Sort for the query */
+				$_newPids	= array();
+				$_pid		= IPSLib::cleanIntArray( $this->pids );
+				
+				if ( count($_pid) > 0 )
+				{
+					$_pid = " IN(" . implode( ",", $_pid ) . ")";
+				}
+				else
+				{
+					$this->_showError( 'mod_no_posts_to_del', 10376.3 );
+				}
+
+				/* Make sure we're the author of these posts */
+				$this->DB->build( array( 'select' => 'pid, author_id', 'from' => 'posts', 'where' => 'pid' . $_pid ) );
+				$this->DB->execute();
+				
+				while( $_r = $this->DB->fetch() )
+				{
+					if( $_r['author_id'] == $this->memberData['member_id'] )
+					{
+						$_newPids[ $_r['pid'] ]	= $_r['pid'];
+					}
+				}
+				
+				$this->pids	= $_newPids;
+			}
+		}
+
 		//-----------------------------------------
 		// Check to make sure that this isn't the first post in the topic..
 		//-----------------------------------------
 		
+		if( !count($this->pids) )
+		{
+			$this->_showError( 'mod_no_posts_to_del', 10376.2 );
+		}
+		
 		foreach( $this->pids as $p )
 		{
 			if ( $this->topic['topic_firstpost'] == $p )
@@ -1302,48 +1089,22 @@ class public_forums_moderate_moderate extends ipsCommand
 		}
 		
 		$this->_addModeratorLog( sprintf( $this->lang->words['multi_post_delete_mod_log'], count( $this->pids ), $this->topic['title'] ) );
-		
-		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
-		{
-			//-----------------------------------------
-			// Set up and pass to split topic handler
-			//-----------------------------------------
-			
-			$this->request['checked']	= 1;
-			$this->request['fid']		= $this->trash_forum;
-			$this->request['title']		= $this->lang->words['mod_from'] . " " . $this->topic['title'];
-			$this->request['desc']		= $this->lang->words['mod_from_id']." ".$this->topic['tid'];
-			
-			foreach( $this->pids as $p )
-			{
-				$this->request['selectedpids_' . $p ] = 1;
-			}
-			
-			$this->trash_inuse = 1;
-			
-			$this->_multiSplitTopic();
-			
-			$this->trash_inuse = 0;
-		}
-		else
-		{
-			$this->modLibrary->postDelete( $this->pids );
-			
-		}
-		
+
+		$this->modLibrary->postDelete( $this->pids, true );
+
 		$this->modLibrary->clearModQueueTable( 'post', $this->pids );
 	}
 	
 	/**
 	 * Post multi-mod: Split topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiSplitTopic()
 	{
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
-		$this->_genericPermissionCheck( 'split_merge', '', 1 );
+		$this->_genericPermissionCheck( 'split_merge' );
 		 
 		if ( ! $this->fromSearch AND ! $this->topic['tid'] )
 		{
@@ -1475,7 +1236,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			if ( $this->forum['id'] )
 			{
-				$this->request[ 'fid'] =  intval($this->request['fid'] );
+				$this->request['fid'] = intval($this->request['fid']);
 				
 				if ( $this->request['fid'] != $this->forum['id'] )
 				{
@@ -1507,7 +1268,6 @@ class public_forums_moderate_moderate extends ipsCommand
 				if ( $this->fromSearch )
 				{
 					$this->request['title']		= $this->lang->words['mod_from'] . " " . $topic['title'];
-					$this->request['desc']		= $this->lang->words['mod_from_id']." ".$topic['tid'];
 				}
 				
 				$first_post = $this->DB->buildAndFetch( array( 'select'	=> 'pid, queued',
@@ -1530,7 +1290,6 @@ class public_forums_moderate_moderate extends ipsCommand
 				
 				$this->DB->insert( 'topics', array(
 													'title'				=> $this->request['title'],
-													'description'		=> $this->request['desc'] ,
 													'state'				=> 'open',
 													'posts'				=> 0,
 													'starter_id'		=> 0,
@@ -1555,20 +1314,23 @@ class public_forums_moderate_moderate extends ipsCommand
 				// Move the posts
 				//-----------------------------------------
 				
-				$this->DB->update( 'posts', array( 'topic_id' => $new_topic_id, 'new_topic' => 0, 'post_parent' => 0 ), 'topic_id=' . $_tid . " AND pid IN(" . implode( ",", $pids ). ")" ); 
+				$this->DB->update( 'posts', array( 'topic_id' => $new_topic_id, 'new_topic' => 0 ), 'topic_id=' . $_tid . " AND pid IN(" . implode( ",", $pids ). ")" ); 
 				
 				//-----------------------------------------
 				// Move the posts
 				//-----------------------------------------
-				
-				if ( $this->trash_inuse )
-				{
-					$this->DB->update( 'posts', array( 'queued' => 0 ), "topic_id={$new_topic_id}" );
-				}
-	
+
 				$this->DB->update( 'posts', array( 'new_topic' => 0 ), "topic_id={$_tid}" );
+
+				//-----------------------------------------
+				// Update attachments
+				//-----------------------------------------
 				
-				$this->DB->update( 'posts', array( 'post_parent' => 0 ), 'post_parent IN (' . implode( ',', $pids ) . ')' );
+				$this->DB->update( 'attachments', array( 'attach_parent_id' => $new_topic_id ), "attach_rel_module='post' AND attach_rel_id IN(" . implode( ",", $pids ) . ")" );
+				
+				$_cnt	= $this->DB->getAffectedRows();
+				
+				$this->DB->update( 'topics', array( 'topic_hasattach' => $_cnt ), 'tid=' . $new_topic_id );
 				
 				//-----------------------------------------
 				// Rebuild the topics
@@ -1590,15 +1352,8 @@ class public_forums_moderate_moderate extends ipsCommand
 				
 				/* Run moderation sync */
 				$this->modLibrary->runModSync( 'topicSplit', $pids, $topic['tid'], $new_topic_id );
-			
-				if ( $this->trash_inuse )
-				{
-					$this->_addModeratorLog( $this->lang->words['acp_trashcan_post'] . " '{$topic['title']}'" );
-				}
-				else
-				{
-					$this->_addModeratorLog( $this->lang->words['acp_split_topic'] . " '{$topic['title']}'" );
-				}
+
+				$this->_addModeratorLog( $this->lang->words['acp_split_topic'] . " '{$topic['title']}'" );
 			}
 		}
 	}
@@ -1606,7 +1361,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Post multi-mod: Merge posts
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiMergePost()
 	{
@@ -1659,7 +1414,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			{
 				if ( IPSMember::checkPermissions('read', $p['forum_id'] ) == TRUE )
 				{
-					$master_post .= "<br /><br />" . $p['post'];
+					$master_post .= $p['post'] . "<br /><br />";
 					
 					$dropdown[]			= array( $p['pid'], ipsRegistry::getClass( 'class_localization')->getDate( $p['post_date'], 'LONG') ." (#{$p['pid']})" );
 					
@@ -1694,33 +1449,13 @@ class public_forums_moderate_moderate extends ipsCommand
 			// Print form
 			//-----------------------------------------
 			
-			if ( IPSText::getTextClass('editor')->method == 'rte' )
-			{
-				IPSText::getTextClass('bbcode')->parse_wordwrap	= 0;
-				IPSText::getTextClass('bbcode')->parse_html		= 0;
+			/* Load editor stuff */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$_editor = new $classToLoad();
 
-				$master_post = IPSText::getTextClass('bbcode')->convertForRTE( trim($master_post) );
-			}
-			else
-			{
-				IPSText::getTextClass('bbcode')->parse_html    			= 0;
-				IPSText::getTextClass('bbcode')->parse_nl2br   			= 0;
-				IPSText::getTextClass('bbcode')->parse_smilies 			= 1;
-				IPSText::getTextClass('bbcode')->parse_bbcode  			= 1;
-				IPSText::getTextClass('bbcode')->parsing_section		= 'topics';
+			$_editor->setContent( trim($master_post) );
 
-				if( IPSText::getTextClass('bbcode')->parse_html )
-				{
-					if( !IPSText::getTextClass('bbcode')->parse_nl2br )
-					{
-						$master_post = str_replace( array( '<br />', '<br>' ), "", trim($master_post) );
-					}
-				}
-
-				$master_post = IPSText::getTextClass('bbcode')->preEditParse( $master_post );
-			}
-
-			$editor = IPSText::getTextClass('editor')->showEditor( $master_post, 'Post' );
+			$editor = $_editor->show( 'Post', array( 'autoSaveKey' => md5( 'merge-' . $this->topic['tid'] ), 'height' => 350 ) );
 			
 			$this->output .= $this->registry->getClass('output')->getTemplate('mod')->mergePostForm( $editor, $dropdown, $authors, $attachments, $seoTitle );
 
@@ -1747,12 +1482,23 @@ class public_forums_moderate_moderate extends ipsCommand
 				$this->_showError( 'mod_merge_posts', 10384 );
 			}
 			
+			/* Load editor stuff */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$_editor = new $classToLoad();
+			
+			/* remove saved content */
+			if ( $this->memberData['member_id'] )
+			{
+				$_editor->removeAutoSavedContent( array( 'member_id' => $this->memberData['member_id'], 'autoSaveKey' => md5( 'merge-' . $this->topic['tid'] ) ) );
+			}
+		
 			IPSText::getTextClass('bbcode')->parse_smilies		= 1;
 			IPSText::getTextClass('bbcode')->parse_html			= 0;
 			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
 			IPSText::getTextClass('bbcode')->parsing_section	= 'topics';
 
-			$post = IPSText::getTextClass('editor')->processRawPost( 'Post' );
+			$post = $_editor->process( $_POST['Post'] );
+
 			$post = IPSText::getTextClass('bbcode')->preDbParse( $post );
 
 			//-----------------------------------------
@@ -1816,7 +1562,6 @@ class public_forums_moderate_moderate extends ipsCommand
 												'author_name'	=> $author['name'],
 												'post'			=> $post,
 												'post_key'		=> $new_post_key,
-												'post_parent'	=> 0, 
 												'edit_time'		=> time(),
 												'edit_name'		=> $this->memberData['members_display_name'],
 												'append_edit'	=> ( $append_edit OR !$this->memberData['g_append_edit'] ) ? 1 : 0,
@@ -1835,7 +1580,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			foreach ( $_POST as $key => $value )
 			{
-				if ( preg_match( "/^attach_(\d+)$/", $key, $match ) )
+				if ( preg_match( '/^attach_(\d+)$/', $key, $match ) )
 				{
 					if ( $this->request[ $match[0] ] == 'keep' )
 					{
@@ -1897,7 +1642,7 @@ class public_forums_moderate_moderate extends ipsCommand
 				$this->modLibrary->forumRecount( $f );
 			}
 			
-			$this->modLibrary->statsRecount();
+			$this->cache->rebuildCache( 'stats', 'global' );
 			
 			/* Clear the content cache */
 			IPSContentCache::drop( 'post', $this->pids );
@@ -1909,15 +1654,15 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * If we have an option between normal / soft delete, show it.
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiDeletePostSplash()
 	{
 		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_topic' ), 'forums' );
 		
 		$canSoftDelete = $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->forum['id'], array() );
-		$canHardDelete = ( $this->memberData['g_is_supmod'] OR $this->moderator['delete_post'] ) ? true : false;
-		
+		$canHardDelete = ( $this->memberData['g_is_supmod'] OR $this->moderator['delete_post'] OR $this->memberData['g_delete_own_posts'] ) ? true : false;
+
 		/* First hurdle */
 		if ( ! $canSoftDelete AND ! $canHardDelete )
 		{
@@ -1945,13 +1690,13 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Close a topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _closeTopic()
 	{
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
-		if( !$this->_genericPermissionCheck( 'close_topic', '', 0, true ) )
+		if( !$this->_genericPermissionCheck( 'close_topic', '', true ) )
 		{
 			if ( $this->topic['starter_id'] != $this->memberData['member_id'] OR !$this->memberData['g_open_close_posts'] )
 			{
@@ -1969,7 +1714,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Soft delete a topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _softDeleteTopicToggle( $delete )
 	{
@@ -1989,24 +1734,24 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		if ( ! $result )
 		{
-			$this->_showError( 'mod_no_delete_topic', 103119 );
+			$this->_showError( 'mod_no_delete_topic', 103119.0 );
 		}
 		
 		$this->modLibrary->topicToggleSoftDelete( array( $this->topic['tid'] ), $delete, $reason );
 		
-		$this->registry->output->redirectScreen( $this->lang->words[ $lang ], $this->settings['base_url'] . "showforum=" . $this->forum['id'] . '&st=' . intval( $this->request['st'] ), $this->topic['title_seo'] );
+		$this->registry->output->redirectScreen( $this->lang->words[ $lang ], $this->settings['base_url'] . "showforum=" . $this->forum['id'] . '&st=' . intval( $this->request['st'] ), $this->forum['name_seo'], 'showforum' );
 	}
 	
 	/**
 	 * Delete a topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _deleteTopic()
 	{
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
-		if( !$this->_genericPermissionCheck( 'delete_topic', '', 0, true ) )
+		if( !$this->_genericPermissionCheck( 'delete_topic', '', true ) )
 		{
 			if ( $this->topic['starter_id'] != $this->memberData['member_id'] OR !$this->memberData['g_delete_own_topics'] )
 			{
@@ -2025,44 +1770,81 @@ class public_forums_moderate_moderate extends ipsCommand
 			$this->modLibrary->forumRecount( $linked_topic['forum_id'] );
 		}
 		
-		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
-		{
-			//-----------------------------------------
-			// Move, don't delete
-			//-----------------------------------------
-			
-			$this->modLibrary->topicMove($this->topic['tid'], $this->forum['id'], $this->trash_forum);
-			
-			$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
-			$this->registry->class_forums->allForums[ $this->trash_forum ]['_update_deletion'] = 1;
-			
-			$this->modLibrary->forumRecount( $this->forum['id'] );
-			$this->modLibrary->forumRecount( $this->trash_forum );
-			
-			$this->_addModeratorLog( $this->lang->words['acp_trashcan_a_topic'] . " " . $this->topic['tid'] );
-		}
-		else
-		{
-			$this->modLibrary->topicDelete($this->topic['tid']);
-			$this->_addModeratorLog( $this->lang->words['acp_deleted_a_topic'] );
-		}
+		$this->modLibrary->topicDelete($this->topic['tid']);
+		$this->_addModeratorLog( $this->lang->words['acp_deleted_a_topic'] );
 		
 		$this->modLibrary->clearModQueueTable( 'topic', $this->topic['tid'] );
 
-		$this->registry->output->redirectScreen( $this->lang->words['p_deleted'], $this->settings['base_url'] . "showforum=" . $this->forum['id'] . '&st=' . intval( $this->request['st'] ), $this->topic['title_seo'] );
+		if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['p_deleted'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'topics' );
+			}
+		}
+
+		$this->registry->output->redirectScreen( $this->lang->words['p_deleted'], $this->settings['base_url'] . "showforum=" . $this->forum['id'] . '&st=' . intval( $this->request['st'] ), $this->forum['name_seo'], 'showforum' );
+	}
+
+	/**
+	 * Perma-Delete a topic
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _deleteTopicPermanent()
+	{
+		$this->_resetModerator( $this->topic['forum_id'] );
+		
+		if( !$this->_genericPermissionCheck( 'delete_topic', '', true ) )
+		{
+			if ( $this->topic['starter_id'] != $this->memberData['member_id'] OR !$this->memberData['g_delete_own_topics'] )
+			{
+				$this->_showError( 'mod_no_delete_topic', 10386, 403 );
+			}
+		}
+
+		// Do we have a linked topic to remove?
+		$this->DB->build( array( 'select' => 'tid, forum_id', 'from' => 'topics', 'where' => "state='link' AND moved_to='" . $this->topic['tid'] . '&' . $this->forum['id'] . "'" ) );
+		$this->DB->execute();
+		
+		if ( $linked_topic = $this->DB->fetch() )
+		{
+			$this->DB->delete( 'topics', "tid=" . $linked_topic['tid'] );
+			
+			$this->modLibrary->forumRecount( $linked_topic['forum_id'] );
+		}
+		
+		$this->modLibrary->topicDeleteFromDb($this->topic['tid']);
+		$this->_addModeratorLog( $this->lang->words['acp_deleted_a_topic'] );
+		
+		$this->modLibrary->clearModQueueTable( 'topic', $this->topic['tid'] );
+
+		if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['p_deleted'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'topics' );
+			}
+		}
+
+		$this->registry->output->redirectScreen( $this->lang->words['p_deleted'], $this->settings['base_url'] . "showforum=" . $this->forum['id'] . '&st=' . intval( $this->request['st'] ), $this->forum['name_seo'], 'showforum' );
 	}
 	
 	/**
 	 * Delete a topic (confirmation screen)
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _deleteForm()
 	{
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
 		$canSoftDelete = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $this->topic );
-		
+
 		if ( $canSoftDelete )
 		{
 			/* Send to form, then */
@@ -2072,7 +1854,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		}
 		else
 		{
-			if( !$this->_genericPermissionCheck( 'delete_topic', '', 0, true ) )
+			if( !$this->_genericPermissionCheck( 'delete_topic', '', true ) )
 			{
 				if ( $this->topic['starter_id'] != $this->memberData['member_id'] OR !$this->memberData['g_delete_own_topics'] )
 				{
@@ -2091,11 +1873,14 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Display the topic history
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _topicHistory()
 	{
-		$this->_genericPermissionCheck();
+		if ( !$this->memberData['g_access_cp'] )
+		{
+			$this->_showError( $error, 103119.5 );
+		}
 		
 		//-----------------------------------------
 		// Admin only
@@ -2103,7 +1888,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		if( !$this->memberData['g_access_cp'] )
 		{
-			$this->_showError( 'moderate_no_permission', 103119, 403 );
+			$this->_showError( 'moderate_no_permission', 103119.2, 403 );
 		}
 
 		if ($this->topic['last_post'] == $this->topic['start_date'])
@@ -2163,26 +1948,36 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Unsubscribe all form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _unsubscribeAllForm()
 	{
 		$this->_genericPermissionCheck();
 		
-		$tracker = $this->DB->buildAndFetch( array( 'select' => 'COUNT(trid) as subbed', 'from' => 'tracker', 'where' => "topic_id=" . $this->topic['tid'] ) );
+		//-----------------------------------------
+		// Get like class
+		//-----------------------------------------
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$topics	= $_like->getCount( $this->topic['tid'] );
 
-		if ( $tracker['subbed'] < 1 )
+		if ( $topics )
 		{
-			$text = $this->lang->words['ts_none'];
+			$text = sprintf( $this->lang->words['ts_count'], $topics );
 		}
 		else
 		{
-			$text = sprintf( $this->lang->words['ts_count'], $tracker['subbed'] );
+			$text = $this->lang->words['ts_none'];
 		}
 
 		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->unsubscribeForm( $this->forum, $this->topic, $text );
 
-		$this->registry->getClass('output')->addNavigation( $this->forum['name'], "{$this->settings['_base_url']}showforum={$this->forum['id']}" );
+		foreach( $this->registry->class_forums->forumsBreadcrumbNav( $this->topic['forum_id'] ) as $_nav )
+		{
+			$this->registry->getClass('output')->addNavigation( $_nav[0], $_nav[1] );
+		}
+
 		$this->registry->getClass('output')->addNavigation( $this->topic['title'], "{$this->settings['_base_url']}showtopic={$this->topic['tid']}" );
 		$this->registry->getClass('output')->setTitle( $this->lang->words['ts_title']." &gt; ".$this->topic['title']  . ' - ' . ipsRegistry::$settings['board_name']);
 	}
@@ -2190,23 +1985,27 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Unsubscribe all complete
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _unsubscribeAll()
 	{
 		$this->_genericPermissionCheck();
 		
-		// Delete the subbies based on this topic ID
+		//-----------------------------------------
+		// Get like class
+		//-----------------------------------------
 		
-		$this->DB->delete( 'tracker', "topic_id=" . $this->topic['tid'] );
-		
-		$this->registry->output->redirectScreen( $this->lang->words['ts_redirect'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']) );
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->remove( $this->topic['tid'] );
+
+		$this->registry->output->redirectScreen( $this->lang->words['ts_redirect'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']), $this->topic['title_seo'], 'showtopic' );
 	}
 	
 	/**
 	 * Merge two topics form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mergeStart()
 	{
@@ -2224,7 +2023,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Merge two topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mergeComplete()
 	{
@@ -2289,7 +2088,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			{
 				$pass = TRUE;
 			}
-			else
+			else if( $this->memberData['member_id'] )
 			{
 				$other_mgroups	= array();
 				$_mgroup_others	= IPSText::cleanPermString( $this->memberData['mgroup_others'] );
@@ -2322,6 +2121,63 @@ class public_forums_moderate_moderate extends ipsCommand
 			$this->_showError();
 		}
 		
+		//-----------------------------------------
+		// Sort out polls
+		//-----------------------------------------
+		
+		/* Who has a poll? */
+		$main_topic_poll = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'polls', 'where' => "tid={$this->topic['tid']}" ) );
+		$old_topic_poll = 	$this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'polls', 'where' => "tid={$old_topic['tid']}" ) );	
+		
+		/* The old topic has a poll and the new one doesn't */
+		if ( $old_topic_poll['pid'] and !$main_topic_poll['pid'] )
+		{
+			// Make that poll the poll for the master topic
+			$this->DB->update( 'polls', array( 'tid' => $this->topic['tid'] ), "tid={$old_topic_poll}" );
+			
+			// Make the votes for that now
+			$this->DB->update( 'voters', array( 'tid' => $this->topic['tid'] ), "tid={$old_topic_poll}" );
+			
+			// Let the master topic know that it has a poll now
+			$this->DB->update( 'topics', array( 'poll_state' => 1 ), "tid={$this->topic['tid']}" );
+		}
+		
+		/* They both have polls */
+		elseif ( $old_topic_poll['pid'] and $main_topic_poll['pid'] )
+		{
+			// Have we selected one?
+			if ( $this->request['chosenpolltid'] )
+			{
+				$chosenTid = intval( $this->request['chosenpolltid'] );
+				
+				// Remove the non chosen ones
+				$this->DB->delete( 'polls', "tid={$this->topic['tid']}" );
+				$this->DB->delete( 'polls', "tid={$old_topic_poll} AND tid <> {$chosenTid}" );
+				$this->DB->delete( 'voters', "tid={$this->topic['tid']}" );
+				$this->DB->delete( 'voters', "tid={$old_topic_poll} AND tid <> {$chosenTid}" );
+				
+				// Make the chosen poll the poll for the master topic
+				$this->DB->update( 'polls', array( 'tid' => $this->topic['tid'] ), "tid={$chosenTid}" );
+				
+				// Make the votes for that now
+				$this->DB->update( 'voters', array( 'tid' => $this->topic['tid'] ), "tid={$chosenTid}" );
+				
+				// Let the master topic know that it has a poll now
+				$this->DB->update( 'topics', array( 'poll_state' => 1 ), "tid={$this->topic['tid']}" );
+			}
+			
+			// No? Well ask them which one to keep
+			else
+			{
+				ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_topic' ) );
+				$this->output .= $this->registry->getClass('output')->getTemplate('mod')->mergeMultiplePolls( array( $main_topic_poll, $old_topic_poll ), ",{$main_topic_poll['tid']},{$old_topic_poll['tid']}" );
+				$this->registry->getClass('output')->addNavigation( $this->forum['name'], "{$this->settings['_base_url']}showforum={$this->forum['id']}" );
+				$this->registry->getClass('output')->addNavigation( $this->topic['title'], "{$this->settings['_base_url']}showtopic={$this->topic['tid']}" );
+				$this->registry->getClass('output')->setTitle( $this->lang->words['mt_top']." ".$this->topic['title']  . ' - ' . ipsRegistry::$settings['board_name']);
+				return false;
+			}
+		}
+				
 		//-----------------------------------------
 		// Update the posts, remove old polls, subs and topic
 		//-----------------------------------------
@@ -2330,22 +2186,35 @@ class public_forums_moderate_moderate extends ipsCommand
 		IPSDeleteLog::removeEntries( array( $old_topic['tid'] ), 'topic', TRUE );
 		
 		$this->DB->update( 'posts', array( 'topic_id' => $this->topic['tid'] ), 'topic_id=' . $old_topic['tid'] );
-		
-		$this->DB->delete( 'polls', "tid=" . $old_topic['tid'] );
-		
 		$this->DB->delete( 'voters', "tid=" . $old_topic['tid'] );
-		
-		$this->DB->delete( 'tracker', "topic_id=" . $old_topic['tid'] );
-		
 		$this->DB->delete( 'topics', "tid=" . $old_topic['tid'] );
+
+		//-----------------------------------------
+		// Update attachments
+		//-----------------------------------------
+		
+		$this->DB->update( 'attachments', array( 'attach_parent_id' => $this->topic['tid'] ), "attach_rel_module='post' AND attach_parent_id=" . $old_topic['tid'] );
+
+		//-----------------------------------------
+		// Get like class
+		//-----------------------------------------
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->remove( $old_topic['tid'] );
+		
+		//-----------------------------------------
+		// Tags
+		//-----------------------------------------
+		
+		$this->registry->tags->moveTagsByMetaId( $old_topic['tid'], $this->topic['tid'] );
 		
 		//-----------------------------------------
 		// Update the newly merged topic
 		//-----------------------------------------
 		
-		$updater = array(  'title'			=> $this->request['title'],
-						   'description'	=> $this->request['desc'],
-						   'views'			=> $old_topic['views'] + $this->topic['views']
+		$updater = array(	'title'			=> $this->request['title'],
+							'views'			=> $old_topic['views'] + $this->topic['views']
 						);
 						
 		if ( $old_topic['last_post'] > $this->topic['last_post'] )
@@ -2387,9 +2256,11 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$amode = $first_post['author_id'] ? 1 : 0;
 		
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), '' );
+		
 		$this->DB->build( array( 'select'	=> 'COUNT(*) as posts',
 										'from'	=> 'posts',
-										'where'	=> "queued <> 1 AND topic_id=" . $this->topic['tid'] ) );
+										'where'	=> $_queued . " AND topic_id=" . $this->topic['tid'] ) );
 		
 		$this->DB->execute();
 		
@@ -2426,13 +2297,13 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$this->_addModeratorLog( sprintf( $this->lang->words['acp_merged_topic'], $old_topic['title'], $this->topic['title'] ) );
 		
-		$this->registry->output->redirectScreen( $this->lang->words['mt_redirect'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] );
+		$this->registry->output->redirectScreen( $this->lang->words['mt_redirect'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'], $this->topic['title_seo'], 'showtopic' );
 	}
 	
 	/**
 	 * Merge two topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _moveForm()
 	{
@@ -2443,16 +2314,20 @@ class public_forums_moderate_moderate extends ipsCommand
 		$jump_html = $this->registry->getClass('class_forums')->buildForumJump(0,1,1);
 				 								
 		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->moveTopicForm( $this->forum, $this->topic, $jump_html );
+		
+		foreach( $this->registry->class_forums->forumsBreadcrumbNav( $this->forum['id'] ) as $_nav )
+		{
+			$this->registry->output->addNavigation( $_nav[0], $_nav[1], $_nav[2], $_nav[3] );
+		}
+		$this->registry->output->addNavigation( $this->topic['title'], "{$this->settings['_base_url']}showtopic={$this->topic['tid']}", $this->topic['title_seo'], 'showtopic' );
 
-		$this->registry->getClass('output')->addNavigation( $this->forum['name'], "{$this->settings['_base_url']}showforum={$this->forum['id']}" );
-		$this->registry->getClass('output')->addNavigation( $this->topic['title'], "{$this->settings['_base_url']}showtopic={$this->topic['tid']}" );
 		$this->registry->getClass('output')->setTitle( $this->lang->words['t_move'].": ".$this->topic['title']  . ' - ' . ipsRegistry::$settings['board_name']);
 	}
 	
 	/**
 	 * Merge two topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _doMove()
 	{
@@ -2522,19 +2397,14 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$this->modLibrary->forumRecount($source);
 		$this->modLibrary->forumRecount($moveto);
-		
-		if( $moveto == $this->settings['forum_trash_can_id'] )
-		{
-			$this->modLibrary->clearModQueueTable( 'topic', $this->topic['tid'] );
-		}
-	
-		$this->registry->output->redirectScreen( $this->lang->words['p_moved'], $this->settings['base_url'] . "showforum=" . $this->forum['id'] );
+
+		$this->registry->output->redirectScreen( $this->lang->words['p_moved'], $this->settings['base_url'] . "showforum=" . $this->forum['id'], $this->forum['name_seo'], 'showforum' );
 	}
 
 	/**
 	 * Delete a single post
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _deletePost()
 	{
@@ -2551,7 +2421,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
-		if( !$this->_genericPermissionCheck( 'delete_post', '', 0, true ) )
+		if( !$this->_genericPermissionCheck( 'delete_post', '', true ) )
 		{
 			if( !$this->memberData['g_delete_own_posts'] OR $this->memberData['member_id'] != $post['author_id'] )
 			{
@@ -2567,41 +2437,29 @@ class public_forums_moderate_moderate extends ipsCommand
 		{
 			$this->_showError( 'mod_delete_first_post', 10398 );
 		}
-		
-		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
-		{
-			//-----------------------------------------
-			// Set up and pass to split topic handler
-			//-----------------------------------------
 
-			$this->request['checked']			= 1;
-			$this->request['fid']				= $this->trash_forum;
-			$this->request['title']				= $this->lang->words['mod_from'] . " " . $this->topic['title'];
-			$this->request['desc']				= $this->lang->words['mod_from_id'] . " " . $this->topic['tid'];
-			$this->request['selectedpids'][]	= $this->request['p'];
-			
-			$this->trash_inuse = 1;
-			
-			$this->pids  = $this->_getIds( 'selectedpids' );
-			$this->_multiSplitTopic();
-			
-			$this->trash_inuse = 0;
-		}
-		else
-		{
-			$this->modLibrary->postDelete( $this->request['p'] );
-			$this->modLibrary->forumRecount( $this->forum['id'] );
-		}
+		$this->modLibrary->postDelete( $this->request['p'] );
+		$this->modLibrary->forumRecount( $this->forum['id'] );
 		
 		$this->modLibrary->clearModQueueTable( 'post', $post['pid'] );
-		
-		$this->registry->output->redirectScreen( $this->lang->words['post_deleted'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']), $this->topic['title_seo'] );
+
+		if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['post_deleted'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'posts' );
+			}
+		}
+
+		$this->registry->output->redirectScreen( $this->lang->words['post_deleted'], $this->settings['base_url'] . "showtopic=" . $this->topic['tid'] . "&amp;st=" . intval($this->request['st']), $this->topic['title_seo'], 'showtopic' );
 	}
 	
 	/**
 	 * Show the edit topic title form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _editForm()
 	{
@@ -2628,7 +2486,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Save the topic title edits
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _doEdit()
 	{
@@ -2641,7 +2499,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			$this->_showError( 'mod_no_topic_title', 10399 );
 		}
 		
-		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 		$_postClass  = new $classToLoad( $this->registry );
 		
@@ -2653,7 +2511,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$title_seo = IPSText::makeSeoTitle( $this->request['TopicTitle'] );
 		
-		$this->DB->update( 'topics', array( 'title' => $this->request['TopicTitle'], 'description' => $this->request['TopicDesc'], 'title_seo' => $title_seo ), 'tid=' . $this->topic['tid'] );
+		$this->DB->update( 'topics', array( 'title' => $this->request['TopicTitle'], 'title_seo' => $title_seo ), 'tid=' . $this->topic['tid'] );
 
 		$this->modLibrary->forumRecount( $this->forum['id'] );
 
@@ -2665,7 +2523,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Open a closed topic
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _openTopic()
 	{
@@ -2676,7 +2534,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$this->_resetModerator( $this->topic['forum_id'] );
 		
-		if( !$this->_genericPermissionCheck( 'open_topic', '', 0, true ) )
+		if( !$this->_genericPermissionCheck( 'open_topic', '', true ) )
 		{
 			if( !$this->memberData['g_open_close_posts'] OR $this->topic['starter_id'] != $this->memberData['member_id'] )
 			{
@@ -2701,7 +2559,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Move topics to another forum from the prune popup tool
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _pruneMove()
 	{
@@ -2717,6 +2575,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		// SET UP
 		//-----------------------------------------
 		
+		define( 'IPS_FORCE_HTML_REDIRECT', true );
 		$pergo		= intval( $this->request['pergo'] ) ? intval( $this->request['pergo'] ) : 50;
 		$max		= intval( $this->request['max'] );
 		$current	= intval($this->request['current']);
@@ -2821,7 +2680,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Prune delete topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _pruneFinish()
 	{
@@ -2837,6 +2696,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		// SET UP
 		//-----------------------------------------
 		
+		define( 'IPS_FORCE_HTML_REDIRECT', true );
 		$pergo		= intval( $this->request['pergo'] ) ? intval( $this->request['pergo'] ) : 50;
 		$max		= intval( $this->request['max'] );
 		$current	= intval($this->request['current']);
@@ -2924,7 +2784,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Prune popup form
 	 *
 	 * @param	string		HTML output
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _pruneStart( $complete_html="" )
 	{
@@ -2957,7 +2817,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			$link		= "&amp;pergo=" . $this->request['pergo'];
 			$link_text	= $this->lang->words['cp_prune_dorem'];
 			
-			$tcount = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as tcount', 'from' => 'topics', 'where' => "forum_id={$this->forum['id']}" ) );
+			$tcount = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as tcount', 'from' => 'topics', 'where' => "forum_id={$this->forum['id']} AND approved < 2" ) );
 			
 			$db_query = "";
 			
@@ -3016,7 +2876,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			$count = $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
 																'from'	=> 'topics',
-																'where'	=> "forum_id=" . $this->forum['id'] . $db_query ) );
+																'where'	=> "forum_id=" . $this->forum['id'] . ' AND approved < 2' . $db_query ) );
 			
 			//-----------------------------------------
 			// Prune?
@@ -3067,7 +2927,17 @@ class public_forums_moderate_moderate extends ipsCommand
 		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->pruneSplash( $this->forum, $html_forums, $confirm_data, $complete_html );
 		
 		$this->registry->getClass('output')->setTitle( $this->settings['board_name'] );
-		$this->registry->getClass('output')->addNavigation( $this->forum['name'], "{$this->settings['_base_url']}showforum={$this->forum['id']}", $this->forum['name_seo'], 'showforum' );
+		
+		$nav	= $this->registry->class_forums->forumsBreadcrumbNav( $this->forum['id'] );
+
+		if ( is_array( $nav ) AND count( $nav ) )
+		{
+			foreach( $nav as $_nav )
+			{
+				$this->registry->output->addNavigation( $_nav[0], $_nav[1], $_nav[2], $_nav[3] );
+			}
+		}
+
 		$this->registry->output->addContent( $this->output );
 		$this->registry->getClass('output')->sendOutput();
 	}
@@ -3075,13 +2945,13 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Topic multi-moderation
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiTopicModify()
 	{
 		/* init */
 		$done = false;
-		
+				
 		/* Check these first */
 		switch ( $this->request['tact'] )
 		{
@@ -3122,10 +2992,10 @@ class public_forums_moderate_moderate extends ipsCommand
 					$this->_multiAlterTopics('unpin_topic', "pinned=0");
 				break;
 				case 'approve':
-					$this->_multiAlterTopics('topic_q', "approved=1");
+					$this->_multiAlterTopics('topic_q', $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) );
 				break;
 				case 'unapprove':
-					$this->_multiAlterTopics('topic_q', "approved=0");
+					$this->_multiAlterTopics('topic_q', $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'hidden' ), '' ) );
 				break;
 				case 'delete':
 					$this->_multiAlterDeleteSplash();
@@ -3147,7 +3017,10 @@ class public_forums_moderate_moderate extends ipsCommand
 					$this->_multiCompleteCheckedMove();
 				break;
 				case 'merge':
-					$this->_multiTopicMerge();
+					if ( $this->_multiTopicMerge() === FALSE )
+					{
+						return;
+					}
 				break;
 				default:
 					$this->_multiTopicMmod();
@@ -3170,18 +3043,27 @@ class public_forums_moderate_moderate extends ipsCommand
 			}
 
 		}
+		else if( $this->request['return'] )
+		{
+			$_bits	= explode( ':', $this->request['return'] );
+			
+			if( count($_bits) AND $_bits[0] == 'modcp' )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_posts'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'topics' );
+			}
+		}
 		else if ( $this->forum['id'] )
 		{
 			$url = "showforum=" . $this->forum['id'];
-			$url = ( $this->request['st'] ) ? "showforum=" . $this->forum['id'] . '&st=' . $this->request['st'] : $url;
+			$url = ( $this->request['st'] ) ? "showforum=" . $this->forum['id'] . '&amp;st=' . $this->request['st'] : $url;
 			
 			if ( $this->request['nr'] )
 			{
-				$this->registry->output->silentRedirect( $this->settings['base_url'] . $url );
+				$this->registry->output->silentRedirect( $this->settings['base_url'] . $url, $this->forum['name_seo'], 'showforum' );
 			}
 			else
 			{
-				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_topics'], $this->settings['base_url'] . $url, $this->forum['name_seo']  );
+				$this->registry->output->redirectScreen( $this->lang->words['cp_redirect_topics'], $this->settings['base_url'] . $url, $this->forum['name_seo'], 'showforum' );
 			}
 		}
 	}
@@ -3189,14 +3071,14 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * If we have an option between normal / soft delete, show it.
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiAlterDeleteSplash()
 	{
 		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_forums' ), 'forums' );
 		
-		$canSoftDelete = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], array() );
-		$canHardDelete = ( $this->memberData['g_is_supmod'] OR $this->moderator['delete_topic'] ) ? true : false;
+		$canSoftDelete = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $this->topic );
+		$canHardDelete = ( $this->memberData['g_is_supmod'] OR $this->moderator['delete_topic'] OR ( $this->memberData['g_delete_own_topics'] AND $this->memberData['member_id'] == $this->topic['starter_id'] ) ) ? true : false;
 		
 		/* First hurdle */
 		if ( ! $canSoftDelete AND ! $canHardDelete )
@@ -3225,7 +3107,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Merge two or more topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiTopicMerge()
 	{
@@ -3241,6 +3123,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		//-----------------------------------------
 		
 		$topics		= array();
+		$tids       = array();
 		$merge_ids	= array();
 		$newViews	= 0;
 		
@@ -3250,6 +3133,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		while ( $r = $this->DB->fetch() )
 		{
 			$topics[]	= $r;
+			$tids[]     = $r['tid'];
 			$newViews	+= $r['views'];
 		}
 		
@@ -3291,6 +3175,79 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			$merge_ids[] = $t['tid'];
 		}
+				
+		//-----------------------------------------
+		// Sort out polls
+		//-----------------------------------------
+		
+		$polls = array();
+		
+		/* Who has a poll? */
+		$pollForFirstTopic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'polls', 'where' => "tid={$first_topic['tid']}" ) );
+
+		$this->DB->build( array( 'select' => '*', 'from' => 'polls', 'where' => $this->DB->buildWherePermission( $merge_ids, 'tid', FALSE ) ) );
+		$this->DB->execute();
+
+		while ( $row = $this->DB->fetch() )
+		{
+			$polls[ $row['tid'] ] = $row;
+		}
+		
+		/* We have one poll */
+		if ( !$pollForFirstTopic['pid'] and count( $polls ) == 1 )
+		{
+			// Make that poll the poll for the master topic
+			$this->DB->update( 'polls', array( 'tid' => $main_topic_id ), $this->DB->buildWherePermission( $merge_ids, 'tid', FALSE ) );
+			
+			// Make the votes for that now
+			$this->DB->update( 'voters', array( 'tid' => $main_topic_id ), $this->DB->buildWherePermission( $merge_ids, 'tid', FALSE ) );
+			
+			// Let the master topic know that it has a poll now
+			$this->DB->update( 'topics', array( 'poll_state' => 1 ), "tid={$main_topic_id}" );
+		}
+		
+		/* There's more than one poll to deal with */
+		else if( $pollForFirstTopic['pid'] OR count($polls) )
+		{
+			// Have we selected one?
+			if ( $this->request['chosenpolltid'] )
+			{
+				$chosenTid = intval( $this->request['chosenpolltid'] );
+				
+				// Remove the non chosen ones
+				$this->DB->delete( 'polls', "tid={$main_topic_id}" );
+				$this->DB->delete( 'polls', $this->DB->buildWherePermission( $merge_ids, 'tid', FALSE ) . " AND tid <> {$chosenTid}" );
+				$this->DB->delete( 'voters', "tid={$main_topic_id}" );
+				$this->DB->delete( 'voters', $this->DB->buildWherePermission( $merge_ids, 'tid', FALSE ) . " AND tid <> {$chosenTid}" );
+				
+				// Make the chosen poll the poll for the master topic
+				$this->DB->update( 'polls', array( 'tid' => $main_topic_id ), "tid={$chosenTid}" );
+				
+				// Make the votes for that now
+				$this->DB->update( 'voters', array( 'tid' => $main_topic_id ), "tid={$chosenTid}" );
+				
+				// Let the master topic know that it has a poll now
+				$this->DB->update( 'topics', array( 'poll_state' => 1 ), "tid={$main_topic_id}" );
+			}
+			
+			// No? Well ask them which one to keep
+			else
+			{
+				if ( $pollForFirstTopic['tid'] )
+				{
+					array_unshift( $polls, $pollForFirstTopic );
+				}
+				
+				ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_topic' ) );
+				$this->output .= $this->registry->getClass('output')->getTemplate('mod')->mergeMultiplePolls( $polls, $this->request['selectedtids'] );
+				$this->registry->getClass('output')->addNavigation( 'foo', 'bar' );		
+				return false;
+			}
+		}
+		
+		//-----------------------------------------
+		// Update the posts, subs and topic
+		//-----------------------------------------
 		
 		/* Bug #20829: If the topic is not approved, set all the posts unapproved so that they are not displayed after the merge */
 		if( is_array( $unapproved ) && count( $unapproved ) )
@@ -3298,22 +3255,23 @@ class public_forums_moderate_moderate extends ipsCommand
 			$this->DB->update( 'posts', array( 'queued' => 1 ), 'topic_id IN (' . implode( ",", $unapproved ) . ")" );
 		}
 		
-		//-----------------------------------------
-		// Update the posts, remove old polls, subs and topic
-		//-----------------------------------------
-		
 		$this->DB->update( 'posts', array( 'topic_id' => $main_topic_id ), 'topic_id IN (' . implode( ",", $merge_ids ) . ")" );
 		$this->DB->update( 'topics', array( 'views' => $newViews ), 'tid=' . $main_topic_id );
-		
-		$this->DB->delete( 'polls', "tid IN (" . implode( ",", $merge_ids ) . ")" );
-		
 		$this->DB->delete( 'voters', "tid IN (" . implode( ",", $merge_ids ) . ")" );
-		
-		$this->DB->delete( 'tracker', "topic_id IN (" . implode( ",", $merge_ids ) . ")" );
-		
 		$this->DB->delete( 'topics', "tid IN (" . implode( ",", $merge_ids ) . ")" );
+
+		//-----------------------------------------
+		// Get like class
+		//-----------------------------------------
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->remove( $merge_ids );
+		
+		//-----------------------------------------
+		// Remove from delete log
+		//-----------------------------------------
 		
-		/* Remove from deletion log */
 		IPSDeleteLog::removeEntries( $merge_ids, 'topic', TRUE );
 		
 		//-----------------------------------------
@@ -3324,7 +3282,10 @@ class public_forums_moderate_moderate extends ipsCommand
 
 		$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
 		$this->modLibrary->forumRecount( $this->forum['id'] );
-		$this->modLibrary->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
+		
+		/* Tags */
+		$this->registry->tags->moveTagsByMetaId( $tids, $main_topic_id );
 		
 		/* Run Sync */
 		foreach ( $merge_ids as $mid )
@@ -3339,7 +3300,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	/**
 	 * Alter multiple topics at once
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiAlterTopics( $mod_action="", $sql="" )
 	{
@@ -3347,23 +3308,28 @@ class public_forums_moderate_moderate extends ipsCommand
 		{
 			$this->_showError( 'mod_um_what_now', 103109 );
 		}
-	
+
 		$this->_genericPermissionCheck( $mod_action );
 		
 		//-----------------------------------------
 		// Make sure we can moderate EACH topic
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select' => 'tid, forum_id', 'from' => 'topics', 'where' => 'tid IN (' . implode( ",", $this->tids ) . ')', 'order' => 'start_date asc' ) );
+		$topics	= array();
+		$forums	= array();
+
+		$this->DB->build( array( 'select' => 'tid, forum_id, title', 'from' => 'topics', 'where' => 'tid IN (' . implode( ",", $this->tids ) . ')' ) );
 		$this->DB->execute();
 		
 		while ( $r = $this->DB->fetch() )
 		{
-			$topics[] = $r;
+			$topics[ $r['tid'] ] = $r;
 		}
 		
 		foreach( $topics as $topic )
 		{
+			$forums[ $topic['forum_id'] ]	= $topic['forum_id'];
+
 			$this->_resetModerator( $topic['forum_id'] );
 			
 			$this->_genericPermissionCheck( $mod_action );
@@ -3373,49 +3339,63 @@ class public_forums_moderate_moderate extends ipsCommand
 		{
 			$this->DB->buildAndFetch( array( 'update' => 'topics', 'set' => $sql, 'where' => "tid IN(" . implode( ",", $this->tids ) . ") AND state!='link'" ) );
 			
-			$this->_addModeratorLog( sprintf( $this->lang->words['acp_altered_topics'], $sql, implode( ",", $this->tids) ) );
-			
-			if( $mod_action == 'topic_q' AND $sql == 'approved=1' )
+			$this->_addModeratorLog( sprintf( $this->lang->words['acp_altered_topics'], $sql, implode( ", ", $this->tids) ) );
+
+			if( $mod_action == 'topic_q' AND trim($sql) == 'approved=1' )
 			{
 				$this->modLibrary->clearModQueueTable( 'topic', $this->tids, true );
 			}
 		}
 		else
 		{
-			if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
+			$this->modLibrary->topicDelete( $this->tids );
+			
+			foreach( $this->tids as $_tid )
 			{
-				//-----------------------------------------
-				// Move, don't delete
-				//-----------------------------------------
-				
-				$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
-				
-				$this->modLibrary->topicMove( $this->tids, $this->forum['id'], $this->trash_forum );
-				$this->modLibrary->forumRecount($this->trash_forum);
-				$this->_addModeratorLog( $this->lang->words['acp_trashcan_topics']." ".implode(",",$this->tids) );
-			}
-			else
-			{
-				$this->modLibrary->topicDelete( $this->tids );
-				$this->_addModeratorLog( sprintf( $this->lang->words['acp_deleted_topics'], implode( ",", $this->tids ) ) );
+				$this->request['t']		= $_tid;
+				$this->request['f']		= $topics[ $_tid ]['forum_id'];
+				$this->topic['title']	= $topics[ $_tid ]['title'];
+
+				$this->_addModeratorLog( sprintf( $this->lang->words['acp_deleted_topics'], $_tid ) );
 			}
 			
+			$this->request['t']		= 0;
+			$this->request['f']		= 0;
+			$this->topic['title']	= '';
+
 			$this->modLibrary->clearModQueueTable( 'topic', $this->tids );
 		}
 		
 		if ( $mod_action == 'delete_topic' or $mod_action == 'topic_q' )
 		{
-			$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
+			foreach( $forums as $forum )
+			{
+				$this->registry->class_forums->allForums[ $forum ]['_update_deletion'] = 1;
+				
+				$this->modLibrary->forumRecount( $forum );
+			}
 			
-			$this->modLibrary->forumRecount( $this->forum['id'] );
-			$this->modLibrary->statsRecount();
+			$this->cache->rebuildCache( 'stats', 'global' );
+		}
+		
+		/* Tags */
+		if ( $mod_action == 'topic_q' )
+		{
+			if ( $sql == 'approved=1' )
+			{
+				$this->registry->tags->updateVisibilityByMetaId( $this->tids, 1 );
+			}
+			else
+			{
+				$this->registry->tags->updateVisibilityByMetaId( $this->tids, 0 );
+			}
 		}
 	}
 	
 	/**
 	 * Alter multiple topics at once
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiSoftDeleteTopics( $delete=1, $reason='' )
 	{
@@ -3423,17 +3403,40 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		if ( $delete )
 		{
-			$result = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], array() );
+			if( !count($this->topic) )
+			{
+				$finalResult	= false;
+				
+				$this->DB->build( array( 'select' => 'tid,starter_id', 'from' => 'topics', 'where' => 'tid IN(' . implode( ',', $this->tids ) . ')' ) );
+				$this->DB->execute();
+				
+				while( $r = $this->DB->fetch() )
+				{
+					$result = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $r );
+					
+					if( $result )
+					{
+						$this->tids[ $r['tid'] ]	= $r['tid'];
+						$finalResult				= true;
+					}
+				}
+				
+				$result	= $finalResult;
+			}
+			else
+			{
+				$result = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->forum['id'], $this->topic );
+			}
 		}
 		else
 		{
 			$result = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $this->forum['id'] );
 
 		}
-		
+
 		if ( ! $result )
 		{
-			$this->_showError( 'moderate_no_permission', 103119 );
+			$this->_showError( 'moderate_no_permission', 103119.4 );
 		}
 		
 		/* Ensure we check for a single topic id */
@@ -3444,13 +3447,16 @@ class public_forums_moderate_moderate extends ipsCommand
 		else
 		{
 			$this->modLibrary->topicToggleSoftDelete( $this->tids, $delete, $reason );
-		}	
+		}
+		
+		/* Tagging */
+		$this->registry->tags->updateVisibilityByMetaId( $this->tids, $delete );
 	}
 	
 	/**
 	 * Show the form to move topics
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiStartCheckedMove()
 	{
@@ -3459,7 +3465,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		$jump_html	= $this->registry->getClass('class_forums')->buildForumJump(0,1,1);
 		$topics		= array();
 
-		$this->DB->build( array( 'select' => 'title, tid, forum_id', 'from' => 'topics', 'where' => "forum_id=" . $this->forum['id'] . " AND tid IN(" . implode( ",", $this->tids ) . ")" ) );
+		$this->DB->build( array( 'select' => 'title, tid, forum_id', 'from' => 'topics', 'where' => "tid IN(" . implode( ",", $this->tids ) . ")" ) );
 		$this->DB->execute();
 		
 		while( $row = $this->DB->fetch() )
@@ -3480,14 +3486,22 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->moveTopicsForm( $this->forum, $jump_html, $topics );
 
-		$this->registry->getClass('output')->addNavigation( $this->forum['name'], $this->settings['base_url'] . "showforum={$this->forum['id']}" );
+		if( $this->forum['name'] )
+		{
+			$this->registry->getClass('output')->addNavigation( $this->forum['name'], $this->settings['base_url'] . "showforum={$this->forum['id']}" );
+		}
+		else
+		{
+			$this->registry->getClass('output')->addNavigation( $this->lang->words['cp_tmove_start'], '' );
+		}
+		
 		$this->registry->getClass('output')->setTitle( $this->lang->words['cp_ttitle']  . ' - ' . ipsRegistry::$settings['board_name']);
 	}
 	
 	/**
 	 * Complete the topic move
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiCompleteCheckedMove()
 	{
@@ -3495,7 +3509,7 @@ class public_forums_moderate_moderate extends ipsCommand
 
 		$add_link	= $this->request['leave'] == 'y' ? 1 : 0;
 		$dest_id	= intval($this->request['df']);
-		$source_id	= $this->forum['id'];
+		$topics		= array();
  		
 		//-----------------------------------------
 		// Make sure we can moderate EACH topic
@@ -3506,12 +3520,12 @@ class public_forums_moderate_moderate extends ipsCommand
 		
 		while ( $r = $this->DB->fetch() )
 		{
-			$topics[] = $r;
+			$topics[ $r['forum_id'] ][] = $r['tid'];
 		}
 		
-		foreach( $topics as $topic )
+		foreach( $topics as $forum_id => $_topics )
 		{
-			$this->_resetModerator( $topic['forum_id'] );
+			$this->_resetModerator( $forum_id );
 			
 			$this->_genericPermissionCheck( 'move_topic' );
 		}
@@ -3520,74 +3534,83 @@ class public_forums_moderate_moderate extends ipsCommand
 		// Check for input..
 		//-----------------------------------------
 		
-		if ( !$source_id OR !$dest_id OR $dest_id == -1 )
+		if ( !$dest_id OR $dest_id == -1 )
 		{
 			$this->_showError( 'mod_no_forum_move', 103110 );
 		}
 
-		if ( $source_id == $dest_id )
+		$_newTopics		= array();
+		$source_id		= 0;
+		$_allSources	= array();
+		
+		foreach( $topics as $forum_id => $_topics )
 		{
-			$this->_showError( 'mod_no_move_save', 103111 );
-		}
-		
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => 'id, sub_can_post, name, redirect_on', 'from' => 'forums', 'where' => "id IN(" . $source_id . ',' . $dest_id . ")" ) );
-		$this->DB->execute();
-		
-		if ( $this->DB->getTotalRows() != 2 )
-		{
-			$this->_showError( 'mod_no_move_save', 103112 );
-		}
-		
-		$source_name	= "";
-		$dest_name		= "";
-		
-		//-----------------------------------------
-		// Check for an attempt to move into a subwrap forum
-		//-----------------------------------------
-		
-		while ( $f = $this->DB->fetch() )
-		{
-			if ( $f['id'] == $source_id )
+			if ( $forum_id != $dest_id )
 			{
-				$source_name = $f['name'];
-			}
-			else
-			{
-				$dest_name = $f['name'];
-			}
-			
-			if ( ( $f['sub_can_post'] != 1 ) OR $f['redirect_on'] == 1 )
-			{
-				$this->_showError( 'mod_forum_no_posts', 103113 );
+				$source_id					= $forum_id;	// We'll just use the last one found for logs..
+				$_allSources[ $forum_id ]	= $forum_id;
+				$_newTopics[ $forum_id ]	= $_topics;
 			}
 		}
 		
-		$this->modLibrary->topicMove( $this->tids, $source_id, $dest_id, $add_link );
+		$topics	= $_newTopics;
 		
-		if( $dest_id == $this->settings['forum_trash_can_id'] )
+		//-----------------------------------------
+		// Some basic details
+		//-----------------------------------------
+		
+		$_destination	= $this->registry->class_forums->getForumById( $dest_id );
+		$_source		= $this->registry->class_forums->getForumById( $source_id );
+		
+		if( !$_destination['sub_can_post'] OR $_destination['redirect_on'] )
 		{
-			$this->modLibrary->clearModQueueTable( 'topic', $this->tids );
+			$this->_showError( 'mod_forum_no_posts', 103112 );
+		}
+
+		$source_name	= $_source['name'];
+		$dest_name		= $_destination['name'];
+
+		//-----------------------------------------
+		// If all topics are in same source forum, just call once
+		//-----------------------------------------
+		
+		if( count($_allSources) == 1 )
+		{
+			$this->modLibrary->topicMove( $this->tids, $source_id, $dest_id, $add_link );
 		}
 		
+		//-----------------------------------------
+		// Otherwise call once per source..
+		//-----------------------------------------
+		
+		else
+		{
+			foreach( $topics as $forum_id => $_topicIds )
+			{
+				$this->modLibrary->topicMove( $_topicIds, $forum_id, $dest_id, $add_link );
+			}
+		}
+
 		//-----------------------------------------
 		// Resync the forums..
 		//-----------------------------------------
 		
-		$this->registry->class_forums->allForums[ $source_id ]['_update_deletion'] = 1;
-		$this->registry->class_forums->allForums[  $dest_id  ]['_update_deletion'] = 1;
-		
-		$this->modLibrary->forumRecount($source_id);
-		$this->modLibrary->forumRecount($dest_id);
+		$this->registry->class_forums->allForums[ $dest_id ]['_update_deletion'] = 1;
+		$this->modLibrary->forumRecount( $dest_id );
 		
+		foreach( $_allSources as $_sourceId )
+		{
+			$this->registry->class_forums->allForums[ $_sourceId ]['_update_deletion'] = 1;
+			$this->modLibrary->forumRecount( $_sourceId );
+		}
+
 		$this->_addModeratorLog( sprintf( $this->lang->words['acp_moved_topics'], $source_name, $dest_name ) );
 	}
 	
 	/**
 	 * Topic multi-moderation
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _multiTopicMmod()
 	{
@@ -3721,9 +3744,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	   		{
 	   			$move_ids[]	= array( $tid, $this->forum['id'] );
 	   		}
-	   		
-			$this->modLibrary->auto_update = FALSE;  // Turn off auto forum re-synch, we'll manually do it at the end
-			
+
 			IPSText::getTextClass('bbcode')->parse_smilies			= 1;
 			IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
 			IPSText::getTextClass( 'bbcode' )->parsing_section		= 'topics';
@@ -3783,7 +3804,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Grabs post ids for multi-mod
 	 *
 	 * @param	string		Field to look in
-	 * @return	void		Cleaned array of post ids
+	 * @return	@e void		Cleaned array of post ids
 	 */
 	protected function _getIds( $field='selectedtids', $fieldJS='' )
 	{
@@ -3852,7 +3873,8 @@ class public_forums_moderate_moderate extends ipsCommand
 			{
 				/* remove base url from url */
 				$this->request['topic_url'] = str_replace( $this->settings['_original_base_url'], '', $this->request['topic_url'] );
-				
+				$this->request['topic_url'] = str_replace( array( '/index.php/', '/index.php?/' ), '/', $this->request['topic_url'] );
+
 				$templates	= IPSLib::buildFurlTemplates();
 				
 				preg_match( $templates['showtopic']['in']['regex'], $this->request['topic_url'], $match );
@@ -3861,7 +3883,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			/* Normal URL */
 			else
 			{
-				preg_match( "/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/", $this->request['topic_url'], $match );
+				preg_match( '/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/', $this->request['topic_url'], $match );
 				$old_id = intval( trim( $match[3] ) );
 			}			
 		}
@@ -3880,7 +3902,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * @param 	string		Error message language key
 	 * @param 	integer		Error code
 	 * @param	integer		Header code
-	 * @return	void		Outputs error screen
+	 * @return	@e void		Outputs error screen
 	 */
 	protected function _showError( $msg = 'moderate_no_permission', $level = 10367, $header=500 )
 	{
@@ -3891,7 +3913,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * Shortcut for adding a moderator log
 	 *
 	 * @param 	string		Error message language key
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _addModeratorLog( $title = 'unknown' )
 	{
@@ -3903,11 +3925,10 @@ class public_forums_moderate_moderate extends ipsCommand
 	 *
 	 * @param 	string		Key to check from 'moderator' aray
 	 * @param	string		[Optional] error language key to use if check fails
-	 * @param	string		[Optional] pass if "trash_inuse" is set
 	 * @param	boolean		Return (vs output)
 	 * @return	mixed		Boolean true | Displays error screen
 	 */
-	protected function _genericPermissionCheck( $key='', $error='moderate_no_permission', $checkTrash=0, $return=false )
+	protected function _genericPermissionCheck( $key='', $error='moderate_no_permission', $return=false )
 	{
 		$pass = 0;
 	
@@ -3919,10 +3940,6 @@ class public_forums_moderate_moderate extends ipsCommand
 		{
 			$pass = 1;
 		}
-		else if( $checkTrash AND $this->trash_inuse == true )
-		{
-			$pass = 1;
-		}
 
 		if ( $pass == 0 )
 		{
@@ -3931,44 +3948,12 @@ class public_forums_moderate_moderate extends ipsCommand
 				return false;
 			}
 
-			$this->_showError( $error, 103119 );
+			$this->_showError( $error, 103119.5 );
 		}
 		
 		return true;
 	}
-	
-	/**
-	 * Setup the trash can forum
-	 *
-	 * @author	Brandon Farber
-	 * @return	void
-	 */
-	protected function _takeOutTrash()
-	{
-		if ( $this->settings['forum_trash_can_enable'] and $this->settings['forum_trash_can_id'] )
-		{
-			if ( $this->registry->class_forums->allForums[ $this->settings['forum_trash_can_id'] ]['sub_can_post'] )
-			{
-				if ( $this->memberData['g_access_cp'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_admin'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else if ( $this->memberData['g_is_supmod'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_smod'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else if ( $this->memberData['is_mod'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_mod'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_id'];
-				}
-			}
-		}
-	}
-	
+
 	/**
 	 * Check the input
 	 * 1) Checks against CSRF attacks
@@ -3977,7 +3962,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 * 4) Sets up $this->forum and $this->moderator
 	 *
 	 * @author	Brandon Farber
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _setupAndCheckInput()
 	{
@@ -4036,7 +4021,7 @@ class public_forums_moderate_moderate extends ipsCommand
 					}
 					
 					if ( $this->request['f'] AND ( $this->topic['forum_id'] != $this->request['f'] ) ) 
-					{ 
+					{
 						$this->_showError( 'mod_no_tid', 3033, null, null, 404 );
 					}
 				}
@@ -4064,7 +4049,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			
 			if ( ! $this->fromSearch )
 			{
-				if ( ! $this->request['f'] AND $this->request['do'] != 'setAsSpammer' )
+				if ( ! $this->request['f'] )
 				{
 					$this->_showError( 'mod_bad_fid', 4030, null, null, 404 );
 				}
@@ -4085,7 +4070,7 @@ class public_forums_moderate_moderate extends ipsCommand
 			// Are we a moderator?
 			//-----------------------------------------
 			
-			if ( $this->request['f'] AND isset( $this->memberData['forumsModeratorData'][ $this->request['f'] ]) AND $this->memberData['forumsModeratorData'][ $this->request['f'] ] )
+			if ( $this->request['f'] AND !empty( $this->memberData['forumsModeratorData'][ $this->request['f'] ]) )
 			{
 				$this->moderator = $this->memberData['forumsModeratorData'][ $this->request['f'] ];
 			}
@@ -4097,7 +4082,7 @@ class public_forums_moderate_moderate extends ipsCommand
 	 *
 	 * @param	integer		Forum ID
 	 * @author	Brandon Farber
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _resetModerator( $forumId )
 	{
@@ -4107,7 +4092,7 @@ class public_forums_moderate_moderate extends ipsCommand
 		// Are we a moderator?
 		//-----------------------------------------
 		
-		if ( isset( $this->memberData['forumsModeratorData'][ $forumId ]) AND $this->memberData['forumsModeratorData'][ $forumId ] )
+		if ( !empty( $this->memberData['forumsModeratorData'][ $forumId ]) )
 		{
 			$this->moderator = $this->memberData['forumsModeratorData'][ $forumId ];
 		}
diff --git a/upload/admin/applications/forums/modules_public/moderate/multimod.php b/upload/admin/applications/forums/modules_public/moderate/multimod.php
index 8a0e1005..66a83721 100644
--- a/upload/admin/applications/forums/modules_public/moderate/multimod.php
+++ b/upload/admin/applications/forums/modules_public/moderate/multimod.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator actions
- * Last Updated: $Date: 2010-07-01 18:13:46 -0400 (Thu, 01 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 6596 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,7 +29,6 @@ class public_forums_moderate_multimod extends ipsCommand
 	/**
 	 * Temporary stored output HTML
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $output;
@@ -37,73 +36,64 @@ class public_forums_moderate_multimod extends ipsCommand
 	/**
 	 * Moderator function library
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $modLibrary;
+	protected $modLibrary;
 
 	/**
 	 * Moderator information
 	 *
-	 * @access	private
 	 * @var		array		Array of moderator details
 	 */
-	private $moderator		= array();
+	protected $moderator		= array();
 
 	/**
 	 * Forum information
 	 *
-	 * @access	private
 	 * @var		array		Array of forum details
 	 */
-	private $forum			= array();
+	protected $forum			= array();
 
 	/**
 	 * Topic information
 	 *
-	 * @access	private
 	 * @var		array		Array of topic details
 	 */
-	private $topic			= array();
+	protected $topic			= array();
 	
 	/**
 	 * Topic id
 	 *
-	 * @access	private
 	 * @var		integer		Topic id
 	 */
-	private $topic_id		= 0;
+	protected $topic_id		= 0;
 
 	/**
 	 * Forum id
 	 *
-	 * @access	private
 	 * @var		integer		Forum id
 	 */
-	private $forum_id		= 0;
+	protected $forum_id		= 0;
 
 	/**
 	 * Multimod id
 	 *
-	 * @access	private
 	 * @var		integer		Multimod id
 	 */
-	private $mm_id			= 0;
+	protected $mm_id			= 0;
 
 	/**
 	 * Multimod data
 	 *
-	 * @access	private
 	 * @var		array 		Multimod data
 	 */
-	private $mm_data		= array();
+	protected $mm_data		= array();
 	
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -281,8 +271,6 @@ class public_forums_moderate_multimod extends ipsCommand
 		
 		if ( $this->mm_data['topic_reply'] and $this->mm_data['topic_reply_content'] )
 		{
-			$this->modLibrary->auto_update = FALSE;  // Turn off auto forum re-synch, we'll manually do it at the end
-			
 			IPSText::getTextClass('bbcode')->parse_smilies			= 1;
 			IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
 			IPSText::getTextClass('bbcode')->parse_html				= 1;
@@ -336,6 +324,8 @@ class public_forums_moderate_multimod extends ipsCommand
 		
 		$this->modLibrary->forumRecount( $this->forum['id'] );
 		
+		$this->cache->rebuildCache( 'stats', 'global' );
+		
 		//-----------------------------------------
 		// Add mod log
 		//-----------------------------------------
@@ -346,7 +336,7 @@ class public_forums_moderate_multimod extends ipsCommand
 		// Redirect back with nice fluffy message
 		//-----------------------------------------
 		
-		$this->registry->output->redirectScreen( sprintf($this->lang->words['mm_applied'], $this->mm_data['mm_title'] ), $this->settings['base_url'] . "showforum=" . $this->forum['id'], $this->forum['name_seo'] );
+		$this->registry->output->redirectScreen( sprintf($this->lang->words['mm_applied'], $this->mm_data['mm_title'] ), $this->settings['base_url'] . "showforum=" . $this->forum['id'], $this->forum['name_seo'], 'showforum' );
 				  
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/post/defaultSection.php b/upload/admin/applications/forums/modules_public/post/defaultSection.php
index d354e7cb..4be79df4 100644
--- a/upload/admin/applications/forums/modules_public/post/defaultSection.php
+++ b/upload/admin/applications/forums/modules_public/post/defaultSection.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Forum posting default section
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'post' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
 $DEFAULT_SECTION = 'post';
diff --git a/upload/admin/applications/forums/modules_public/post/index.html b/upload/admin/applications/forums/modules_public/post/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/modules_public/post/index.html
+++ b/upload/admin/applications/forums/modules_public/post/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/modules_public/post/post.php b/upload/admin/applications/forums/modules_public/post/post.php
index fe1d31fe..8a35a730 100644
--- a/upload/admin/applications/forums/modules_public/post/post.php
+++ b/upload/admin/applications/forums/modules_public/post/post.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Posting
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-16 07:16:26 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  * File Created By: Matt Mecham
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Forums 
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9496 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -43,7 +43,7 @@ class public_forums_post_post extends ipsCommand
 	 * Controller run function
 	 * 
 	 * @param	object	Registry
-	 * @return	void
+	 * @return	@e void
 	 */
     public function doExecute( ipsRegistry $registry )
     {
@@ -75,16 +75,16 @@ class public_forums_post_post extends ipsCommand
         // Check the input
         //-----------------------------------------
         
-        $this->request[ 't' ] =  intval($this->request['t'] );
-        $this->request[ 'p' ] =  intval($this->request['p'] );
-        $this->request[ 'f' ] =  intval($this->request['f'] );
-        $this->request[ 'st'] =  intval($this->request['st'] );
-        
+        $this->request[ 't' ] = intval($this->request['t']);
+        $this->request[ 'p' ] = intval($this->request['p']);
+        $this->request[ 'f' ] = intval($this->request['f']);
+        $this->request[ 'st'] = intval($this->request['st']);
+       
 		//-----------------------------------------
 		// Grab the post class
 		//-----------------------------------------
 		
-		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 		$this->_postClass = new $classToLoad( $registry );
 
@@ -97,13 +97,12 @@ class public_forums_post_post extends ipsCommand
 		$this->_postClass->setPostID( $this->request['p'] );
 		$this->_postClass->setForumID( $this->request['f'] );
 		
-		# Topic Title and description - use _POST as it is cleaned in the function.
+		# Topic Title use _POST as it is cleaned in the function.
 		# We wrap this because the title may not be set when showing a form and would
 		# throw a length error
 		if ( $_POST['TopicTitle'] )
 		{
 			$this->_postClass->setTopicTitle( $_POST['TopicTitle'] );
-			$this->_postClass->setTopicDescription( $_POST['TopicDesc'] );
 		}
 		
 		# Is Preview Mode
@@ -128,7 +127,7 @@ class public_forums_post_post extends ipsCommand
 		
 		
 		# Published
-		$this->_postClass->setPublished( $this->_checkPostModeration( $doCodes[ $do ][1] ) === TRUE ? TRUE : FALSE );
+		$this->_postClass->setPublished( $doCodes[ $do ][1] );
 
 		# Post Content
 		$this->_postClass->setPostContent( isset( $_POST['Post'] ) ? $_POST['Post'] : '' );
@@ -200,7 +199,7 @@ class public_forums_post_post extends ipsCommand
 				{
 					if ( $this->memberData['g_avoid_flood'] != 1 )
 					{
-						if ( time() - $this->memberData['last_post'] < $this->settings['flood_control'] )
+						if ( ( time() - $this->memberData['last_post'] < $this->settings['flood_control'] ) OR time() < $this->memberData['last_post'] )
 						{
 							$this->registry->getClass('output')->showError( array( 'flood_control', $this->settings['flood_control'] ), 103128, null, null, 403 );
 						}
@@ -246,7 +245,7 @@ class public_forums_post_post extends ipsCommand
         	// Make sure we have a "Guest" Name..
         	//-----------------------------------------
         	
-        	$this->_check_guest_name();
+        	$this->_fixGuestName();
         	$this->checkDoublePost();
         	
         	$this->saveForm( $doCodes[ $do ][1] );
@@ -261,7 +260,7 @@ class public_forums_post_post extends ipsCommand
 	 * Save the form
 	 *
 	 * @param	string	Type of form to show
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveForm( $type )
 	{
@@ -328,7 +327,7 @@ class public_forums_post_post extends ipsCommand
 						$this->showForm( $type );
 					}
 
-					$this->registry->getClass('output')->showError( $error->getMessage(), 103130 );
+					$this->registry->getClass('output')->showError( $error->getMessage(), 103130, null, null, 403 );
 				}
 			break;
 			case 'new':
@@ -350,7 +349,7 @@ class public_forums_post_post extends ipsCommand
 				catch( Exception $error )
 				{
 					$language	= $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage();
-					$this->registry->getClass('output')->showError( $language, 103131 );
+					$this->registry->getClass('output')->showError( $language, 103131, null, null, 403 );
 				}
 			break;
 			case 'edit':
@@ -366,13 +365,23 @@ class public_forums_post_post extends ipsCommand
 					$topic = $this->_postClass->getTopicData();
 					$post  = $this->_postClass->getPostData();
 					
+					if( $this->request['return'] )
+					{
+						$_bits	= explode( ':', $this->request['return'] );
+						
+						if( count($_bits) AND $_bits[0] == 'modcp' )
+						{
+							$this->registry->output->redirectScreen( $this->lang->words['post_edited'], $this->settings['base_url'] . "app=core&amp;module=modcp&amp;fromapp=forums&amp;tab=" . $_bits[1] . 'posts' );
+						}
+					}
+				
 					# Redirect
 					ipsRegistry::getClass('output')->redirectScreen( $this->lang->words['post_edited'], $this->settings['base_url'] . "showtopic={$topic['tid']}&st=" . $this->request['st'] . "#entry{$post['pid']}", $topic['title_seo'] );
 					
 				}
 				catch( Exception $error )
 				{
-					$this->registry->getClass('output')->showError( $error->getMessage(), 103132 );
+					$this->registry->getClass('output')->showError( $error->getMessage(), 103132, null, null, 403 );
 				}
 			break;
 		}
@@ -404,7 +413,7 @@ class public_forums_post_post extends ipsCommand
 					}
 					else
 					{
-						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103133 );
+						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103133, null, null, 403 );
 					}
 				}
 			break;
@@ -427,7 +436,7 @@ class public_forums_post_post extends ipsCommand
 					}
 					else
 					{
-						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103134 );
+						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103134, null, null, 403 );
 					}
 				}
 			break;
@@ -446,7 +455,7 @@ class public_forums_post_post extends ipsCommand
 					}
 					else
 					{
-						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103135 );
+						$this->registry->getClass('output')->showError( $this->lang->words[ $error->getMessage() ] ? $this->lang->words[ $error->getMessage() ] : $error->getMessage(), 103135, null, null, 403 );
 					}
 				}
 			break;
@@ -460,34 +469,38 @@ class public_forums_post_post extends ipsCommand
 	 */
 	public function checkDoublePost()
 	{
-		if( ! $this->_postClass->getIsPreview() )
+		if ( ! $this->_postClass->getIsPreview() )
 		{
-			if( time() - $this->memberData['last_post'] <= 5 )
+			if ( time() - $this->memberData['last_post'] <= 4 )
 			{
-				if( $this->request['do'] == '01' or $this->request['do'] == '11' )
+				if ( $this->request['do'] == 'new_post_do' )
 				{
 					/* Redirect to the newest topic in the forum */
 					$forum = $this->_postClass->getForumData();
 
-					$this->DB->build( array( 
-											'select' => 'tid',
-											'from'   => 'topics',
-											'where'  => "forum_id='" . $forum['id'] . "' AND approved=1",
-											'order'  => 'last_post DESC',
-											'limit'  => array( 0, 1 )
-									)	);										   
-					$this->DB->execute();
-					
-					$topic = $this->DB->fetch();
+					$topic	= $this->DB->buildAndFetch( array( 
+															'select' => 'tid',
+															'from'   => 'topics',
+															'where'  => "forum_id='" . $forum['id'] . "' AND " . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ),
+															'order'  => 'last_post DESC',
+															'limit'  => array( 0, 1 )
+									)	);
 					
 					$this->registry->getClass('output')->silentRedirect( "{$this->settings['base_url']}showtopic={$topic['tid']}" );
 					exit();
 				}
 				else
 				{
-					/* It's a reply, so simply show the topic... */
-					$this->registry->getClass('output')->silentRedirect( "{$this->settings['base_url']}showtopic={$this->request['t']}&amp;view=getlastpost" );
-					exit();
+					/* Verify if last post was made to this same topic
+						@link	http://community.invisionpower.com/tracker/issue-25712-replying-to-two-topics-at-same-time-causing-only-one-post-to-actually-make-it-into-the-database */
+					$_lastPost	= $this->DB->buildAndFetch( array( 'select' => 'topic_id', 'from' => 'posts', 'where' => 'author_id=' . $this->memberData['member_id'], 'order' => 'post_date DESC', 'limit' => array( 0, 1 ) ) );
+
+					/* We made a reply within the last 4 seconds to this topic.. */
+					if( $_lastPost['topic_id'] == $this->request['t'] )
+					{
+						$this->registry->getClass('output')->silentRedirect( "{$this->settings['base_url']}showtopic={$this->request['t']}&amp;view=getlastpost" );
+						exit();
+					}
 				}
 			}
 		}
@@ -496,15 +509,10 @@ class public_forums_post_post extends ipsCommand
 	/**
 	 * Check for guest's name being in use
 	 *
-	 * @return	void
-	 * @deprecated	As far as I can see this function is not used anywhere, we should remove it for 3.2 
+	 * @return	@e void
 	 */
-	private function _check_guest_name()
+	protected function _fixGuestName()
 	{
-		/* is this even used anymore? 
-		   I disabled it 'cos it was adding the prefix and suffix twice when using a 'found' name
-		   -- Matt */
-		
 		if ( ! $this->memberData['member_id'] )
 		{
 			$this->request['UserName'] = trim( $this->request['UserName'] );
@@ -514,103 +522,6 @@ class public_forums_post_post extends ipsCommand
 			$this->request['UserName'] = IPSText::mbstrlen( $this->request['UserName'] ) > $this->settings['max_user_name_length'] ? $this->lang->words['global_guestname'] : $this->request['UserName'];
 			
 		}
-		
-		return;
-		
-		/*if( ! $this->memberData['member_id'] )
-		{
-			$this->request['UserName'] = trim( $this->request['UserName'] );
-			$this->request['UserName'] = str_replace( '<br />', '', $this->request['UserName'] );
-			
-			$this->request['UserName'] = $this->request['UserName'] ? $this->request['UserName'] : $this->lang->words['global_guestname'] ;
-			$this->request['UserName'] = IPSText::mbstrlen( $this->request['UserName'] ) > $this->settings['max_user_name_length'] ? $this->lang->words['global_guestname'] : $this->request['UserName'];
-			
-			if ($this->request['UserName'] != $this->lang->words['global_guestname'])
-			{
-				$this->DB->build( array( 
-											'select' => 'member_id, name, members_display_name, members_created_remote, email, member_group_id, member_login_key, ip_address, login_anonymous',
-											'from'	 => 'members',
-											'where'	 => 'members_l_username=\'' . trim( strtolower( $this->request['UserName'] ) ) . '\''
-								)	);
-				$this->DB->execute();
-				
-				if ( $this->DB->getTotalRows() )
-				{
-					$this->request['UserName'] =  $this->settings['guest_name_pre'] . $this->request['UserName'] . $this->settings['guest_name_suf'] ;
-				}
-			}
-		}*/
-	}
-	
-	/**
-	 * Checks to see if this member is forced to have their posts
-	 * moderated
-	 *
-	 * @param	string	Type of post (new, reply, edit, poll)
-	 * @return	boolean	Whether to PUBLISH this topic or not
-	 */
-	private function _checkPostModeration( $type )
-	{
-		/* Does this member have mod_posts enabled? */
-		if ( $this->memberData['mod_posts'] )
-		{
-			/* Mod Queue Forever */
-			if ( $this->memberData['mod_posts'] == 1 )
-			{
-				return FALSE;
-			}
-			else
-			{
-				/* Do we need to remove the mod queue for this user? */
-				$mod_arr = IPSMember::processBanEntry( $this->memberData['mod_posts'] );
-				
-				/* Yes, they are ok now */
-				if ( time() >= $mod_arr['date_end'] )
-				{
-					IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'mod_posts' => 0 ) ) );
-				}
-				/* Nope, still don't want to see them */
-				else
-				{
-					return FALSE;
-				}
-			}
-		}
-		
-		/* Group can bypass mod queue */
-		if( $this->memberData['g_avoid_q'] )
-		{
-			return TRUE;
-		}
-		
-		/* Is the member's group moderated? */
-		if ( $this->_postClass->checkGroupIsPostModerated( $this->memberData ) === TRUE )
-		{
-			return FALSE;
-		}
-		
-		/* Check to see if this forum has moderation enabled */
-		$forum = $this->_postClass->getForumData();
-
-		switch( intval( $forum['preview_posts'] ) )
-		{
-			default:
-			case 0:
-				return TRUE;
-			break;
-			case 1:
-				return FALSE;
-			break;
-			case 2:
-				return ( $type == 'new' ) ? FALSE : TRUE;
-			break;
-			case 3:
-				return ( $type == 'reply' ) ? FALSE : TRUE;
-			break;
-		}
-		
-		/* Our post can be seen! */
-		return TRUE;
 	}
 	
 	/**
@@ -618,7 +529,7 @@ class public_forums_post_post extends ipsCommand
 	 *
 	 * @return	string
 	 */
-	private function _fetchPpdError()
+	protected function _fetchPpdError()
 	{
 		$_g = $this->caches['group_cache'][ $this->memberData['member_group_id'] ];
 		$_l = sprintf( $this->lang->words['NO_POSTING_PPD'], $_g['g_ppd_limit'] );
diff --git a/upload/admin/applications/forums/setup/index.html b/upload/admin/applications/forums/setup/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/setup/index.html
+++ b/upload/admin/applications/forums/setup/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/index.html b/upload/admin/applications/forums/setup/versions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/setup/versions/index.html
+++ b/upload/admin/applications/forums/setup/versions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/install/index.html b/upload/admin/applications/forums/setup/versions/install/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/setup/versions/install/index.html
+++ b/upload/admin/applications/forums/setup/versions/install/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_fulltext.php b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_fulltext.php
index 017cbbcb..822bf7a4 100644
--- a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_fulltext.php
+++ b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_fulltext.php
@@ -3,6 +3,6 @@
 * Installation Schematic File
 * Generated on Thu, 30 Apr 2009 19:03:38 +0000 GMT
 */
-$INDEX[] = "ALTER TABLE posts ADD FULLTEXT KEY post (post)";
-$INDEX[] = "ALTER TABLE topics ADD FULLTEXT KEY title (title)";
+$INDEX[] = "ALTER TABLE posts ADD FULLTEXT KEY post (post);";
+$INDEX[] = "ALTER TABLE topics ADD FULLTEXT KEY title (title);";
 ?>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_inserts.php b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_inserts.php
index 206dcc24..1441eb42 100644
--- a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_inserts.php
+++ b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_inserts.php
@@ -1,8 +1,8 @@
 <?php
 # FORUMS: Last field: forums_bitoptions
 
-$INSERT[] = "INSERT INTO forums VALUES (1, 0, 0, 0, 0, '', 'Категори�', 'Те�това� категори�. Ее можно удалить или переименовать.'				, 1, 1, 0, 1, '', '', '', 0, 'last_post', 'Z-A', 30, 'all', 0, 0, 1, 1, 1, NULL, -1, 0, '', 0, 0, '', '', '', 0, '', 1, 0, 0, 1, 1, '', 0,0,0,1,0,'categoriya','','','', 0, 0, 0, 0, 0);";
-$INSERT[] = "INSERT INTO forums VALUES (2, 1, 0, UNIX_TIMESTAMP(), 1, '<%admin_name%>', 'Форум', 'Те�товый форум. Может быть удален или переименован.', 1, 1, 0, 1, '', '', 'Ура заработало&#33;', 1, 'last_post', 'Z-A', 100, 'all', 0, 0, 1, 1, 1, NULL, 1, 1, '', 0, 0, '', '', '', 1, '', 0, 0, 0, 0, 1, '', 0,0,0,1,0,'forum','ura-zarabotalo','<%admin_seoname%>','a:1:{i:1;i:<%time%>;} ', 0, 0, 0, 0, 0);";
+$INSERT[] = "INSERT INTO forums VALUES (1, 0, 0, 0, 0, '', 'Категори�', 'Те�това� категори�. Ее можно удалить или переименовать.'				, 1, 1, 0, '', '', '', 0, 'last_post', 'Z-A', 30, 'all', 0, 0, 1, 1, 1, 0, -1, '', 0, 0, '', '', '', 0, '', 1, 0, 0, 1, 0, '', 0,0,0,1,0,'categoriya','','','', 0, 0, 0, 0, 0, '');";
+$INSERT[] = "INSERT INTO forums VALUES (2, 1, 0, UNIX_TIMESTAMP(), 1, '<%admin_name%>', 'Форум', 'Те�товый форум. Может быть удален или переименован.', 1, 1, 0, '', '', 'Ура заработало&#33;', 1, 'last_post', 'Z-A', 100, 'all', 0, 0, 1, 1, 1, 0, 1, '', 0, 0, '', '', '', 1, '', 0, 0, 0, 1, 0, 'Ура заработало&#33;', 1,0,0,1,0,'forum','ura-zarabotalo','<%admin_seoname%>','a:1:{i:1;i:<%time%>;} ', 0, 0, 0, 0, 0, '');";
 $INSERT[] ="INSERT INTO permission_index VALUES(NULL, 'forums', 'forum', 1, '*', '*', '*', '*', ',4,3,', ',4,3,', '', 0, 0, NULL)";
 $INSERT[] ="INSERT INTO permission_index VALUES(NULL, 'forums', 'forum', 2, '*', '*', '*', '*', ',4,3,', ',4,3,', '', 0, 0, NULL)";
 
@@ -13,9 +13,9 @@ $INSERT[] = "INSERT INTO forum_perms SET perm_name='Ма�ка админи�т
 $INSERT[] = "INSERT INTO forum_perms SET perm_name='Ма�ка забаненных', perm_id=5";
 $INSERT[] = "INSERT INTO forum_perms SET perm_name='Ма�ка модераторов', perm_id=6";
 
-$INSERT[] = "INSERT INTO posts (pid, append_edit, edit_time, author_id, author_name, use_sig, use_emo, ip_address, post_date, icon_id, post, queued, topic_id, post_title, new_topic, edit_name, post_key, post_parent, post_htmlstate) VALUES (1, 0, NULL, 1, '<%admin_name%>', 0, 1, '127.0.0.1', UNIX_TIMESTAMP(), 0, 'Добро пожаловать на ваш новый форум под управлением Invision Power Board&#33;<br /><br />  <br /><br /> Поздравл�ем � покупкой и у�тановкой нашего продукта.  Желаем долгой и у�пешной жизни вашему �ообще�тву&#33;<br /><br />  <br /><br />� теперь врем� проверить работу форума - удалите �ту тему, а так же измените те�товые форум и категорию в админи�тратор�ком центре.<br /><br />  <br /><br /> [url=http://external.iblink.ru/docs-ipb]�у и конечно же почитайте документацию...[/url]<br /><br />[url=http://bestcms.ws]Nulled by BlackSeptember (BESTCMS.WS)[/url]', 0, 1, NULL, 1, NULL, '0', 0, 0);";
+$INSERT[] = "INSERT INTO posts (pid, append_edit, edit_time, author_id, author_name, use_sig, use_emo, ip_address, post_date, post, queued, topic_id, post_title, new_topic, edit_name, post_key, post_htmlstate) VALUES (1, 0, NULL, 1, '<%admin_name%>', 0, 1, '127.0.0.1', UNIX_TIMESTAMP(), 'Добро пожаловать на ваш новый форум под управлением Invision Power Board&#33;<br /><br />  <br /><br /> Поздравл�ем � покупкой и у�тановкой нашего продукта.  Желаем долгой и у�пешной жизни вашему �ообще�тву&#33;<br /><br /> � теперь врем� проверить работу форума - удалите �ту тему, а так же измените те�товые форум и категорию в админи�тратор�ком центре.<br /><br />  <br /><br /> [url=http://myipb.in/docs-ipb]�у и конечно же почитайте документацию...[/url]', 0, 1, NULL, 1, NULL, '0', 0);";
 
 # TOPICS: seo_first_name
-$INSERT[] = "INSERT INTO topics VALUES (1, 'Ура заработало&#33;', '', 'open', 0, 1, UNIX_TIMESTAMP(), 1, UNIX_TIMESTAMP(), 0, '<%admin_name%>', '<%admin_name%>', '0', 0, 1, 2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 'ura-zarabotalo', '<%admin_seoname%>', '<%admin_seoname%>', 0);";
+$INSERT[] = "INSERT INTO topics VALUES (1, 'Ура заработало&#33;', 'open', 0, 1, UNIX_TIMESTAMP(), 1, UNIX_TIMESTAMP(), 0, '<%admin_name%>', '<%admin_name%>', '0', 0, 0, 2, 1, 1, 0, null, 0, 1, 0, 0, 0, 0, 0, 'ura-zarabotalo', '<%admin_seoname%>', '<%admin_seoname%>', 0, 0, 0);";
 
 ?>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_tables.php b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_tables.php
index a5956a8e..80ce59aa 100644
--- a/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_tables.php
+++ b/upload/admin/applications/forums/setup/versions/install/sql/forums_mysql_tables.php
@@ -8,18 +8,7 @@ $TABLE[] = "CREATE TABLE forum_perms (
   perm_name varchar(250) NOT NULL default '',
   PRIMARY KEY  (perm_id)
 );";
-$TABLE[] = "CREATE TABLE forum_tracker (
-  frid mediumint(8) NOT NULL auto_increment,
-  member_id mediumint(8) NOT NULL default 0,
-  forum_id smallint(5) NOT NULL default 0,
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default 0,
-  forum_track_type varchar(100) NOT NULL default 'delayed',
-  PRIMARY KEY  (frid),
-  KEY forum_track_type (forum_track_type),
-  KEY member_id ( member_id , last_sent ),
-  KEY fm_id (forum_id)
-);";
+
 $TABLE[] = "CREATE TABLE forums (
   id smallint(5) NOT NULL auto_increment,
   topics mediumint(6) default NULL,
@@ -32,7 +21,6 @@ $TABLE[] = "CREATE TABLE forums (
   position int(5) unsigned default 0,
   use_ibc tinyint(1) default NULL,
   use_html tinyint(1) default NULL,
-  status tinyint(1) default 1,
   password varchar(32) default NULL,
   password_override varchar(255) default NULL,
   last_title varchar(250) default NULL,
@@ -48,7 +36,6 @@ $TABLE[] = "CREATE TABLE forums (
   inc_postcount tinyint(1) NOT NULL default 1,
   skin_id int(10) default NULL,
   parent_id mediumint(5) default '-1',
-  quick_reply tinyint(1) default 0,
   redirect_url varchar(250) default '',
   redirect_on tinyint(1) NOT NULL default 0,
   redirect_hits int(10) NOT NULL default 0,
@@ -77,6 +64,7 @@ $TABLE[] = "CREATE TABLE forums (
   deleted_posts INT(10) NOT NULL default 0,
   deleted_topics INT(10) NOT NULL default 0,
   rules_raw_html tinyint(1) NOT NULL default 0,
+  tag_predefined TEXT NULL,
   PRIMARY KEY  (id),
   KEY position (position,parent_id)
 );";
@@ -93,8 +81,8 @@ $TABLE[] = "CREATE TABLE moderator_logs (
   topic_id int(10) NOT NULL default 0,
   post_id int(10) default NULL,
   member_id mediumint(8) NOT NULL default 0,
-  member_name varchar(32) NOT NULL default '',
-  ip_address varchar(16) NOT NULL default '0',
+  member_name varchar(255) NOT NULL default '',
+  ip_address varchar(46) NOT NULL default '0',
   http_referer TEXT NULL DEFAULT NULL,
   ctime int(10) default NULL,
   topic_title TEXT NULL DEFAULT NULL,
@@ -158,7 +146,7 @@ $TABLE[] = "CREATE TABLE posts (
   author_name varchar(255) default NULL,
   use_sig tinyint(1) NOT NULL default 0,
   use_emo tinyint(1) NOT NULL default 0,
-  ip_address varchar(16) NOT NULL default '',
+  ip_address varchar(46) NOT NULL default '',
   post_date int(10) default NULL,
   icon_id smallint(3) default NULL,
   post mediumtext,
@@ -168,15 +156,17 @@ $TABLE[] = "CREATE TABLE posts (
   new_topic tinyint(1) default 0,
   edit_name varchar(255) default NULL,
   post_key varchar(32) NOT NULL default '0',
-  post_parent int(10) NOT NULL default 0,
   post_htmlstate smallint(1) NOT NULL default 0,
   post_edit_reason varchar(255) NOT NULL default '',
+  post_bwoptions INT(10) UNSIGNED NOT NULL DEFAULT 0,
+  pdelete_time INT NOT NULL DEFAULT 0,
   PRIMARY KEY  (pid),
   KEY topic_id (topic_id,queued,pid,post_date),
-  KEY author_id (author_id,topic_id),
+  KEY author_id (author_id , post_date , queued),
   KEY post_date (post_date),
   KEY ip_address (ip_address),
-  KEY post_key (post_key)
+  KEY post_key (post_key),
+  KEY queued (queued,pdelete_time)
 );";
 $TABLE[] = "CREATE TABLE topic_mmod (
   mm_id smallint(5) NOT NULL auto_increment,
@@ -200,7 +190,7 @@ $TABLE[] = "CREATE TABLE topic_ratings (
   rating_tid int(10) NOT NULL default 0,
   rating_member_id mediumint(8) NOT NULL default 0,
   rating_value smallint(6) NOT NULL default 0,
-  rating_ip_address varchar(16) NOT NULL default '',
+  rating_ip_address varchar(46) NOT NULL default '',
   PRIMARY KEY  (rating_id),
   KEY rating_tid (rating_tid,rating_member_id),
   KEY rating_ip_address (rating_ip_address)
@@ -214,7 +204,6 @@ $TABLE[] = "CREATE TABLE topic_views (
 $TABLE[] = "CREATE TABLE topics (
   tid int(10) NOT NULL auto_increment,
   title varchar(250) NOT NULL default '',
-  description varchar(250) default NULL,
   state varchar(8) default NULL,
   posts int(10) default NULL,
   starter_id mediumint(8) NOT NULL default 0,
@@ -243,26 +232,17 @@ $TABLE[] = "CREATE TABLE topics (
   seo_last_name varchar(255) NOT NULL default '',
   seo_first_name varchar(255) NOT NULL default '',
   topic_deleted_posts INT(10) NOT NULL default 0,
+  tdelete_time INT NOT NULL DEFAULT 0,
+  moved_on INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (tid),
   KEY topic_firstpost (topic_firstpost),
   KEY last_post (forum_id,pinned,last_post,state),
   KEY forum_id (forum_id,pinned,approved),
-  KEY starter_id (starter_id,forum_id,approved),
+  KEY starter_id (starter_id, forum_id, approved, start_date),
   KEY last_post_sorting (last_post,forum_id),
   KEY start_date (start_date),
-  KEY last_x_topics (forum_id,approved,start_date)
+  KEY last_x_topics (forum_id,approved,start_date),
+  KEY approved (approved,tdelete_time),
+  KEY moved_redirects ( moved_on, moved_to, pinned )
 );";
 
-$TABLE[] = "CREATE TABLE tracker (
-  trid mediumint(8) NOT NULL auto_increment,
-  member_id mediumint(8) NOT NULL default 0,
-  topic_id int(10) NOT NULL default 0,
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default 0,
-  topic_track_type varchar(100) NOT NULL default 'delayed',
-  PRIMARY KEY  (trid),
-  KEY topic_id (topic_id),
-  KEY tm_id ( member_id , topic_id , last_sent ),
-  KEY topic_track_type ( topic_track_type )
-);";
-?>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/setup/versions/install/sql/index.html b/upload/admin/applications/forums/setup/versions/install/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/setup/versions/install/sql/index.html
+++ b/upload/admin/applications/forums/setup/versions/install/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_attachments.php b/upload/admin/applications/forums/skin_cp/cp_skin_attachments.php
index 1606f1e5..6ee26861 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_attachments.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_attachments.php
@@ -3,38 +3,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Attachments skin functions
- * Last Updated: $LastChangedDate: 2010-06-08 20:53:45 -0400 (Tue, 08 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 6485 $
+ * @version		$Rev: 8644 $
  */
  
-class cp_skin_attachments extends output
+class cp_skin_attachments
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Display attachment stats
  *
- * @access	public
  * @param	array 	Overall stats
  * @param	array 	Last 5 attachments
  * @param	array 	Largest 5 attachments
@@ -55,7 +85,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['atc_overview']}</h3>
 
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<td width='30%'>{$this->lang->words['atc_number']}</td>
 			<td width='20%'>{$overall_stats['total_attachments']}</td>
@@ -73,7 +103,7 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['atc_last5']}</h3>
 
-		<table class='alternate_rows' width='100%'>
+		<table class='ipsTable'>
 			<tr>
 				<th style='width: 2%'>&nbsp;</th>
 				<th style='width: 20%'>{$this->lang->words['atc_attachment']}</th>
@@ -92,7 +122,22 @@ $IPBHTML .= <<<HTML
 				<td><img src='{$r['_icon']}' /></td>
 				<td><a href='{$this->settings['board_url']}/index.php?app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a></td>
 				<td>{$r['attach_filesize']}</td>
-				<td>{$r['members_display_name']}</td>
+HTML;
+
+if( $r['attach_member_id'] )
+{
+	$IPBHTML .= <<<HTML
+	<td><a href='{$this->settings['board_url']}/index.php?showuser={$r['attach_member_id']}'>{$r['members_display_name']}</a></td>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<td>{$r['members_display_name']}</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
 				<td>{$r['stitle']}</td>
 				<td>{$r['post_date']}</td>
 				<td><div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div></td>
@@ -107,7 +152,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['atc_largest5']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th>&nbsp;</th>
 			<th>{$this->lang->words['atc_attachment']}</th>
@@ -126,7 +171,22 @@ $IPBHTML .= <<<HTML
 				<td width='1%'><img src='{$r['_icon']}'/></td>
 				<td width='20%'><a href='{$this->settings['board_url']}/index.php?app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a></td>
 				<td width='10%'>{$r['attach_filesize']}</td>
-				<td width='15%'>{$r['members_display_name']}</td>
+HTML;
+
+if( $r['attach_member_id'] )
+{
+	$IPBHTML .= <<<HTML
+	<td><a href='{$this->settings['board_url']}/index.php?showuser={$r['attach_member_id']}'>{$r['members_display_name']}</a></td>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<td>{$r['members_display_name']}</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
 				<td width='25%'>{$r['stitle']}</td>
 				<td width='25%'>{$r['post_date']}</td>
 				<td width='1%'><div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div></td>
@@ -141,7 +201,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['atc_top5']}</h3>
 
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</th>
 			<th width='20%'>{$this->lang->words['atc_attachment']}</th>
@@ -160,7 +220,22 @@ $IPBHTML .= <<<HTML
 				<td width='1%'><img src='{$r['_icon']}' /></td>
 				<td width='20%'><a href='{$this->settings['board_url']}/index.php?app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a></td>
 				<td width='10%'>{$r['attach_hits']}</td>
-				<td width='15%'>{$r['members_display_name']}</td>
+HTML;
+
+if( $r['attach_member_id'] )
+{
+	$IPBHTML .= <<<HTML
+	<td><a href='{$this->settings['board_url']}/index.php?showuser={$r['attach_member_id']}'>{$r['members_display_name']}</a></td>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<td>{$r['members_display_name']}</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
 				<td width='25%'>{$r['stitle']}</td>
 				<td width='25%'>{$r['post_date']}</td>
 				<td width='1%'><div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div></td>
@@ -187,7 +262,6 @@ return $IPBHTML;
 /**
  * Form to add/edit attachment types
  *
- * @access	public
  * @param	string	Title
  * @param	string	Do action
  * @param	integer	Editing attachment type id
@@ -214,29 +288,45 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='id' value='{$id}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['atc_fileext']} <span class='desctext'>{$this->lang->words['atc_fileext_info']}</span></label>
-			{$form['atype_extension']}
-		</li>
-		<li>
-			<label>{$this->lang->words['atc_mimetype']} <span class='desctext'>{$this->lang->words['atc_mimetype_info']}</span></label>
-			{$form['atype_mimetype']}
-		</li>
-		</li>
-		<li>
-			<label>{$this->lang->words['atc_inposts']}</label>
-			{$form['atype_post']}
-		</li>
-		<li>
-			<label>{$this->lang->words['atc_inavatars']}</label>
-			{$form['atype_photo']}
-		</li>
-		<li>
-			<label>{$this->lang->words['atc_miniimg']} <span class='desctext'>{$this->lang->words['atc_miniimg_info']}</span></label>
-			{$form['atype_img']}
-		</li>
-	</ul>
+	<table class="ipsTable double_pad">
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['atc_fileext']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['atype_extension']}<br />
+				<span class='desctext'>{$this->lang->words['atc_fileext_info']}</span>
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['atc_mimetype']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['atype_mimetype']}<br />
+			<span class='desctext'>{$this->lang->words['atc_mimetype_info']}</span>
+			</td>
+		</tr>
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['atc_inposts']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['atype_post']}
+			</td>
+		</tr>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['atc_miniimg']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['atype_img']}<br />
+				<span class='desctext'>{$this->lang->words['atc_miniimg_info']}</span>
+			</td>
+		</tr>
+	</table>
 	
 	<div class="acp-actionbar"><input type='submit' value='{$button}' class='realbutton' accesskey='s'></div>
 	
@@ -251,7 +341,6 @@ return $IPBHTML;
 /**
  * Build the "based on" dropdown
  *
- * @access	public
  * @param	string	Dropdown HTML
  * @return	string	HTML
  */
@@ -262,7 +351,6 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <form method='post' class='information-box' style='margin-bottom: 10px' action='{$this->settings['base_url']}{$this->form_code}&do=attach_add'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-	
 	<strong>{$this->lang->words['attach_baseon']}</strong> {$dd} &nbsp;<input type='submit' value='{$this->lang->words['atc_go']}' class='realbutton' />
 </form>
 HTML;
@@ -274,7 +362,6 @@ return $IPBHTML;
 /**
  * Display attachment types
  *
- * @access	public
  * @param	array 	attachment types
  * @return	string	HTML
  */
@@ -287,8 +374,8 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['ty_title']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=attach_add' title=''><img src='{$this->settings['skin_acp_url']}/_newimages/icons/attach_add.png' alt='' /> {$this->lang->words['atc_add']}</a></li>
-		<li><a href='{$this->settings['base_url']}module=attachments&amp;section=types&amp;do=attach_export'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' /> {$this->lang->words['atc_export']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=attach_add' title=''><img src='{$this->settings['skin_acp_url']}/images/icons/attach_add.png' alt='' /> {$this->lang->words['atc_add']}</a></li>
+		<li><a href='{$this->settings['base_url']}module=attachments&amp;section=types&amp;do=attach_export'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' alt='' /> {$this->lang->words['atc_export']}</a></li>
 	</ul>
 </div>
 
@@ -296,31 +383,33 @@ $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$this->lang->words['atc_atttypes']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</td>
-			<th width='20%'>{$this->lang->words['atc_extension']}</td>
-			<th width='40%'>{$this->lang->words['atc_mime_type']}</td>
+			<th>{$this->lang->words['atc_extension']}</td>
 			<th width='10%' style='text-align: center'>{$this->lang->words['atc_post']}</td>
-			<th width='10%' style='text-align: center'>{$this->lang->words['atc_avatar']}</td>
-			<th width='5%'>{$this->lang->words['atc_options']}</td>
+			<th class='col_buttons'></td>
  		</tr>
 HTML;
 
 foreach( $rows as $row )
 {
 $IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
 			<td><img src='{$this->settings['mime_img']}/{$row['atype_img']}' /></td>
-			<td>.<strong>{$row['atype_extension']}</strong></td>
-			<td>{$row['atype_mimetype']}</td>
+			<td>
+				.<strong>{$row['atype_extension']}</strong><br />
+				<span class='desctext'>{$row['atype_mimetype']}</span>
+			</td>
 			<td style='text-align: center'>{$row['apost_checked']}</td>
-			<td style='text-align: center'>{$row['aphoto_checked']}</td>
-			<td style='text-align: center'>
-				<img class='ipbmenu' id="menu{$row['atype_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='' />
-				<ul class='acp-menu' id='menu{$row['atype_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=attach_edit&amp;id={$row['atype_id']}'>{$this->lang->words['atc_edit']}</a></li>
-					<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=attach_delete&amp;id={$row['atype_id']}");'>{$this->lang->words['atc_delete']}</a></li>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}do=attach_edit&amp;id={$row['atype_id']}' title='{$this->lang->words['atc_edit']}'>{$this->lang->words['atc_edit']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=attach_delete&amp;id={$row['atype_id']}");' title='{$this->lang->words['atc_delete']}'>{$this->lang->words['atc_delete']}</a>
+					</li>
 				</ul>
 			</td>
 		</tr>
@@ -342,10 +431,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['atc_import']}</h3>
 
-		<p align='center'>
-			{$this->lang->words['atc_uploadxml_info']}
-			<input class='textinput' type='file' size='30' name='FILE_UPLOAD'>
-		</p>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['atc_uploadxml_info']}</strong></td>
+			    <td class='field_field'><input class='textinput' type='file' size='30' name='FILE_UPLOAD'></td>
+			</tr>
+		</table>
 
 		<div class='acp-actionbar'>
 			<input type='submit' value='{$this->lang->words['atc_importbutton']}' class="button primary" accesskey='s'>
@@ -361,7 +452,6 @@ return $IPBHTML;
 /**
  * Display attachment search form
  *
- * @access	public
  * @param	array 	Form fields
  * @return	string	HTML
  */
@@ -382,52 +472,95 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='do' value='attach_search_complete' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	
-	<ul class="acp-form alternate_rows">
-		<li>
-			<label>{$this->lang->words['se_mext']}</label>
-			{$form['extension']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_msize']}</label>
-			{$form['filesize_gt']} {$form['filesize']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_mposted']}</label>
-			{$form['days_gt']} {$form['days']}{$this->lang->words['se_ago']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_mviewed']}</label>
-			{$form['hits_gt']} {$form['hits']}{$this->lang->words['se_times']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_mname']}</label>
-			{$form['filename']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_mauthor']}</label>
-			{$form['authorname']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_mimages']}</label>
-			{$form['onlyimage']}
-		</li>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mext']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['extension']}
+			</td>
+		</tr>
 
-		<li>
-			<label>{$this->lang->words['se_morder']}</label>
-			{$form['orderby']} {$form['sort']}
-		</li>
-		
-		<li>
-			<label>{$this->lang->words['se_showresults']}</label>
-			{$form['show']}
-		</li>
-	</ul>
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_msize']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['filesize_gt']} {$form['filesize']}<br />
+				<span class='desctext'>{$this->lang->words['se_msize_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mposted']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['days_gt']} {$form['days']}{$this->lang->words['se_ago']}<br />
+				<span class='desctext'>{$this->lang->words['se_mposted_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mviewed']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['hits_gt']} {$form['hits']}{$this->lang->words['se_times']}<br />
+				<span class='desctext'>{$this->lang->words['se_mviewed_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mname']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['filename']}<br />
+				<span class='desctext'>{$this->lang->words['se_mname_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mauthor']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['authorname']}<br />
+				<span class='desctext'>{$this->lang->words['se_mauthor_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_mimages']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['onlyimage']}<br />
+				<span class='desctext'>{$this->lang->words['se_mimages_desc']}</span>
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_morder']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['orderby']} {$form['sort']}
+			</td>
+		</tr>
+
+		<tr>
+			<td class='field_title'>
+				<strong class='title'>{$this->lang->words['se_showresults']}</strong>
+			</td>
+			<td class='field_field'>
+				{$form['show']}<br />
+				<span class='desctext'>{$this->lang->words['se_showresults_desc']}</span>
+			</td>
+		</tr>
+	</table>
 	
 	<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['se_searchbutton']}' class='realbutton' accesskey='s' /></div>
 	</form>
@@ -447,7 +580,6 @@ return $IPBHTML;
 /**
  * Display attachment search results
  *
- * @access	public
  * @param	string	URL
  * @param	array 	Search results
  * @return	string	HTML
@@ -468,7 +600,7 @@ $IPBHTML .= <<<HTML
 <div class="acp-box">
 	<h3>{$this->lang->words['se_results']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</tg>
 			<th width='20%'>{$this->lang->words['se_attachment']}</th>
@@ -480,14 +612,31 @@ $IPBHTML .= <<<HTML
  		</tr>
 HTML;
 
+$_public	= PUBLIC_DIRECTORY;
+
 foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
 		<tr>
-			<td><img src='{$this->settings['board_url']}/public/{$this->caches['attachtypes'][ $r['attach_ext'] ]['atype_img']}' /></td>
+			<td><img src='{$this->settings['board_url']}/{$_public}/{$this->caches['attachtypes'][ $r['attach_ext'] ]['atype_img']}' /></td>
 			<td><a href='{$this->settings['board_url']}/index.php?app=core&amp;module=attach&amp;type={$r['attach_rel_module']}&amp;attach_id={$r['attach_id']}'>{$r['attach_file']}</a></td>
 			<td>{$r['attach_filesize']}</td>
-			<td>{$r['members_display_name']}</td>
+HTML;
+
+if( $r['attach_member_id'] )
+{
+	$IPBHTML .= <<<HTML
+	<td><a href='{$this->settings['board_url']}/index.php?showuser={$r['attach_member_id']}'>{$r['members_display_name']}</a></td>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<td>{$r['members_display_name']}</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
 			<td>{$r['stitle']}</td>
 			<td>{$r['attach_date']}</td>
 			<td><div align='center'><input class='checkAll' type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div></td>
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_forums.php b/upload/admin/applications/forums/skin_cp/cp_skin_forums.php
index 2895d098..752ef107 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_forums.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_forums.php
@@ -3,110 +3,125 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forums skin functions
- * Last Updated: $LastChangedDate: 2010-11-08 15:39:48 -0500 (Mon, 08 Nov 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-28 06:39:55 -0400 (Wed, 28 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 7117 $
+ * @version		$Rev: 9560 $
  */
  
-class cp_skin_forums extends output
+class cp_skin_forums
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Forum wrapper
  *
- * @access	public
  * @param	string	Content
  * @param	array 	Forum data
- * @param	bool	Show buttons or not
  * @return	string	HTML
  */
-public function forumWrapper( $content, $r, $show_buttons=1 ) {
+public function forumWrapper( $content, $r ) {
 
 $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<div class='tableborder isDraggable' id='cat_{$r['id']}' style='margin-bottom: 10px;'>
- 	<div class='tableheaderalt'>
-HTML;
-$IPBHTML .= <<<HTML
-<table class='header'>
-	<tr>
-  		<td align='left' width='95%' title='{$this->lang->words['frm_id']}{$r['id']}'>
-HTML;
-
-	if( !$this->request['showall'] )
-	{
-		$IPBHTML .= <<<HTML
-  			<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-		  	{$r['name']}
-  		</td>
-  		<td align='right' width='5%' nowrap='nowrap'>
-HTML;
-		if ( $show_buttons )
-		{
-			$IPBHTML .= <<<HTML
-			<img class='ipbmenu' id="menum-{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' /> &nbsp;
-			<ul class='acp-menu' id='menum-{$r['id']}_menucontent'>
-				<li class='icon add'><a href='{$this->settings['base_url']}{$this->form_code}do=forum_add&amp;p={$r['id']}'>{$this->lang->words['frm_newforum']}</a></li>
-				<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit&amp;f={$r['id']}'>{$this->lang->words['frm_editsettings']}</a></li>
-				<li class='icon info'><a href='{$this->settings['base_url']}{$this->form_code}do=pedit&amp;f={$r['id']}'>{$this->lang->words['frm_permissions']}</a></li>
-				<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}do=delete&amp;f={$r['id']}'>{$this->lang->words['frm_deletecat']}</a></li>
-				<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}do=skinedit&amp;f={$r['id']}'>{$this->lang->words['frm_skinopt']}</a></li>
-			</ul>
-HTML;
-		}
-		$IPBHTML .= <<<HTML
- 		</td>
- 	</tr>
-</table>
- </div>
- 	<div id='cat_{$r['id']}_container'>
- 		{$content}
- 	</div>
+	<div id='cat_{$r['id']}' class='isDraggable'>
+		<div class='root_item item category clearfix ipsControlRow'>
+			<div class='col_buttons right' style='white-space: nowrap'>
+				<ul class='ipsControlStrip'>
+					<li class='i_add'>
+						<a href='{$this->settings['base_url']}{$this->form_code}do=forum_add&amp;p={$r['id']}' title='{$this->lang->words['frm_newforum']}'>{$this->lang->words['frm_newforum']}</a>
+					</li>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}do=edit&amp;f={$r['id']}' title='{$this->lang->words['frm_editsettings']}'>{$this->lang->words['frm_editsettings']}</a>
+					</li>
+					<li class='ipsControlStrip_more ipbmenu' id="menum-{$r['id']}">
+						<a href='#'>{$this->lang->words['frm_options']}</a>
+					</li>
+				</ul>
+				<ul class='acp-menu' id='menum-{$r['id']}_menucontent' style='display: none'>
+					<li class='icon info'><a href='{$this->settings['base_url']}{$this->form_code}do=pedit&amp;f={$r['id']}'>{$this->lang->words['frm_permissions']}</a></li>
+					<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}do=delete&amp;f={$r['id']}'>{$this->lang->words['frm_deletecat']}</a></li>
+					<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit&amp;f={$r['id']}&amp;nocat=1'>{$this->lang->words['cat_to_forum']}</a></li>
+					<li class='icon view'><a href='{$this->settings['base_url']}{$this->form_code}do=skinedit&amp;f={$r['id']}'>{$this->lang->words['frm_skinopt']}</a></li>
+				</ul>
+			</div>
+			<div class='draghandle'>&nbsp;</div>
+			<div class='item_info'>
+				<img src='{$this->settings['skin_acp_url']}/images/icons/folder.png' />
+				&nbsp;&nbsp;<strong class='larger_text'>{$r['name']}</strong>
+			</div>
+		</div>
+		<div id='cat_wrap_{$r['id']}' class='item_wrap'>
+			{$content}
+		</div>
+	</div>
 	<script type="text/javascript">
 		dropItLikeItsHot{$r['id']} = function( draggableObject, mouseObject )
 		{
 			var options = {
 							method : 'post',
-							parameters : Sortable.serialize( 'cat_{$r['id']}_container', { tag: 'div', name: 'forums' } )
+							parameters : Sortable.serialize( 'cat_wrap_{$r['id']}', { tag: 'div', name: 'forums' } )
 						};
  
-			new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=doreorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
+			new Ajax.Request( "{$this->settings['base_url']}{$this->form_code_js}&do=doreorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
 
 			return false;
 		};
 
-		Sortable.create( 'cat_{$r['id']}_container', { tag: 'div', only: 'isDraggable', revert: true, format: 'forum_([0-9]+)', onUpdate: dropItLikeItsHot{$r['id']}, handle: 'draghandle' } );
+		Sortable.create( 'cat_wrap_{$r['id']}', { tag: 'div', only: 'isDraggable', revert: true, format: 'forum_([0-9]+)', onUpdate: dropItLikeItsHot{$r['id']}, handle: 'draghandle' } );
 	</script>
-</div>
-
 HTML;
-
 //--endhtml--//
 return $IPBHTML;
 }
@@ -114,46 +129,26 @@ return $IPBHTML;
 /**
  * Display forum header
  *
- * @access	public
  * @return	string	HTML
  */
-public function renderForumHeader( $nav ) {
+public function renderForumHeader() {
 
 $IPBHTML = "";
 //--starthtml--//
 
-if( is_array( $nav ) && count( $nav ) )
-{
-$IPBHTML .= <<<HTML
-<div class='navstrip'>
-	<a href='{$this->settings['base_url']}{$this->form_code}'>{$this->lang->words['for_forumscap']}</a>
-HTML;
-
-	foreach( $nav as $n )
-	{
-$IPBHTML .= <<<HTML
-	 &gt; <a href='{$this->settings['base_url']}{$this->form_code}{$n[1]}'>{$n[0]}</a>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-</div><br />
-HTML;
-}
-
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['for_title']}</h2>
 	<ul class='context_menu'>
 		<li>
 			<a href='{$this->settings['base_url']}{$this->form_code}module=forums&amp;do=forum_add&amp;forum_id={$this->request['f']}&amp;type=forum'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' />
 				{$this->lang->words['forums_context_add_forum']}
 			</a>
 		</li>
 		<li>
 			<a href='{$this->settings['base_url']}{$this->form_code}module=forums&amp;do=forum_add&amp;forum_id={$this->request['f']}&amp;type=category'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/folder_add.png' alt='' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/folder_add.png' alt='' />
 				{$this->lang->words['forums_context_add_category']}
 			</a>
 		</li>
@@ -161,25 +156,9 @@ $IPBHTML .= <<<HTML
 </div>
 
 <script type='text/javascript' src='{$this->settings['js_app_url']}acp.forums.js'></script>
-<div class='taboff'>
-HTML;
-if ( ipsRegistry::$request['showall'] )
-{
-$IPBHTML .= <<<HTML
-<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;showall=0'>{$this->lang->words['frm_showtier']}</a>
-HTML;
-}
-else
-{
-$IPBHTML .= <<<HTML
-<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;showall=1'>{$this->lang->words['frm_showall']}</a>
-HTML;
-}
-$IPBHTML .= <<<HTML
-</div>
-<div class='taboff'><a href='#' onclick='return ACPForums.toggleModOptions();' id='togglemod'>{$this->lang->words['frm_modshow']}</a></div>
-<br clear='all' />
-<div class='acp-box' id='forum_wrapper'>
+<div class='acp-box'>
+	<h3>{$this->lang->words['for_forumscap']}</h3>
+	<div class='ipsExpandable' id='forum_wrapper'>
 HTML;
 
 //--endhtml--//
@@ -189,26 +168,51 @@ return $IPBHTML;
 /**
  * Display single forum moderator entry
  *
- * @access	public
  * @param	array 	Moderator data
  * @param	integer	Forum ID
  * @return	string	HTML
  */
-public function renderModeratorEntry( $data='', $forum_id=0 ) {
+public function renderModeratorEntry( $data=array() ) {
 
 $return_id = intval( $this->request['f'] );
 
 $IPBHTML = "";
 //--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='ipbmenu realbutton' style='float:left;width:auto;white-space:nowrap;margin-right:3px;' id="modmenu{$data['randId']}">{$data['_fullname']} <img src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' /></div>
-<ul class='acp-menu' id='modmenu{$data['randId']}_menucontent'>
-	<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=remove&amp;mid={$data['mid']}&amp;fid=all");'>{$this->lang->words['frm_modremoveall']}</a></li>
-	<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=remove&amp;mid={$data['mid']}&amp;fid={$forum_id}");'>{$this->lang->words['frm_modremove']}</a></li>
-	<li class='icon edit'><a href='{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=edit&amp;mid={$data['mid']}&amp;return_id={$return_id}'>{$this->lang->words['frm_modedit']}</a></li>
-</ul>
+//print_r( $data );
+if( count( $data ) )
+{
+	$c = count( $data );
+	
+	$IPBHTML .= <<<HTML
+		<ul class='multi_menu' id='modmenu{$data[0]['randId']}'>
+			<li>
+				<a href='#' class='ipsBadge badge_green'>{$c} {$this->lang->words['frm_moderators']}</a>
+				<ul class='acp-menu'>
 HTML;
+	
+	foreach( $data as $i => $d )
+	{
+		$IPBHTML .= <<<HTML
+					<li>
+						<span class='clickable'>{$d['_fullname']}</span>
+						<ul class='acp-menu'>
+							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=remove&amp;mid={$d['mid']}&amp;fid=all");'>{$this->lang->words['frm_modremoveall']}</a></li>
+							<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=remove&amp;mid={$d['mid']}&amp;fid={$d['forum_id']}");'>{$this->lang->words['frm_modremove']}</a></li>
+							<li class='icon edit'><a href='{$this->settings['base_url']}section=moderator&amp;act=mod&amp;do=edit&amp;mid={$d['mid']}&amp;return_id={$this->registry->class_forums->forum_by_id[ $d['forum_id'] ]['parent_id']}'>{$this->lang->words['frm_modedit']}</a></li>
+						</ul>
+					</li>
+HTML;
+	}
+	
+	$IPBHTML .= <<<HTML
+				</ul>
+			</li>
+		</ul>
+		<script type='text/javascript'>
+			jQ("#modmenu{$data[0]['randId']}").ipsMultiMenu();
+		</script>
+HTML;
+}
 
 //--endhtml--//
 return $IPBHTML;
@@ -217,19 +221,41 @@ return $IPBHTML;
 /**
  * Display forum footer
  *
- * @access	public
- * @param	string	Forum dropdown
- * @param	string	Options HTML for member groups
  * @return	string	HTML
  */
-public function renderForumFooter( $choose="", $mem_group ) {
+public function renderForumFooter() {
 
-$return_id = intval( $this->request['f'] );
+$return_id	= intval( $this->request['f'] );
 
+//-----------------------------------------
+// Member groups menu
+//-----------------------------------------
+
+$mem_group	= "<select name='group' class='dropdown'>";
+	
+foreach( $this->caches['group_cache'] as $r )
+{
+ 	$mem_group	.= "<option value='{$r['g_id']}'>{$r['g_title']}</option>\n";
+}
+
+$mem_group	.= "</select>";
+		
 $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
+	</div>
+	
+	<form method='post' action='{$this->settings['base_url']}module=forums&amp;section=moderator&amp;do=add' onsubmit='return ACPForums.submitModForm()'>
+		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
+		<input type='hidden' name='modforumids' id='modforumids' />
+		<input type='hidden' name='return_id' value='{$return_id}' />
+		
+		<div class='acp-actionbar rightaction'>
+			{$this->lang->words['frm_modname']} <input class='input_text' type='text' name='name' id='modUserName' size='20' value='' /> {$this->lang->words['frm_modorgroup']} {$mem_group}
+			<input type='submit' class='realbutton' value='{$this->lang->words['frm_modaddtxt']}' />
+		</div>
+	</form>
 </div>
 <script type="text/javascript">
 dropItLikeItsHot = function( draggableObject, mouseObject )
@@ -246,21 +272,6 @@ dropItLikeItsHot = function( draggableObject, mouseObject )
 
 Sortable.create( 'forum_wrapper', { tag: 'div', only: 'isDraggable', revert: true, format: 'cat_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
 </script>
-<form method='post' action='{$this->settings['base_url']}module=forums&amp;section=moderator&amp;do=add' onsubmit='return ACPForums.submitModForm()'>
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
-	<input type='hidden' name='modforumids' id='modforumids' />
-	<input type='hidden' name='return_id' value='{$return_id}' />
-	
-	<div class='tableborder'>
-		<table width='100%' class='tablerow1'>
-			<tr>
-				<td valign='middle'>{$this->lang->words['frm_modaddtxt']}</td>
-				<td>{$this->lang->words['frm_modname']}<input class='realbutton nohand' type='text' name='name' id='modUserName' size='20' value='' /> {$this->lang->words['frm_modorgroup']} {$mem_group}</td>
-				<td width='1%' valign='middle'><input type='submit' class='realbutton' value='{$this->lang->words['frm_gogogadgetflow']}' /></td>
-			</tr>
-		</table>
-	</div>
-</form>
 HTML;
 
 //--endhtml--//
@@ -270,7 +281,6 @@ return $IPBHTML;
 /**
  * Render a forum row
  *
- * @access	public
  * @param	string	Description
  * @param	array 	Forum data
  * @param	string	Depth guide
@@ -285,98 +295,57 @@ $IPBHTML = "";
 if( $depth_guide )
 {
 	$IPBHTML .= <<<HTML
-	<div class='isDraggable forum_row subforum' id='forum_{$r['id']}'>
+	<div class='item parent ipsControlRow isDraggable' id='forum_{$r['id']}'>
 HTML;
 }
 else
 {
 	$IPBHTML .= <<<HTML
-	<div class='isDraggable forum_row' id='forum_{$r['id']}'>
+	<div class='item ipsControlRow isDraggable' id='forum_{$r['id']}'>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-<table style='width: 100%' cellspacing='0' class='double_pad'>
-	<tr>
-HTML;
-
-if( !$this->request['showall'] )
-{
-	$IPBHTML .= <<<HTML
-		<td style='width: 2%'>
-			<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-		</td>
-HTML;
-}
-
-	if( $depth_guide )
-	{
-		$IPBHTML .= <<<HTML
-		<td style='padding-left: 14px'>
-			{$depth_guide}
-		</td>
-HTML;
-	}
-	
-	$IPBHTML .= <<<HTML
- 		<td style='width: 90%'>
-HTML;
-if ( $r['id'] == $this->settings['forum_trash_can_id'] )
-{
-$IPBHTML .= <<<HTML
- 			<img src='{$this->settings['skin_acp_url']}/images/acp_trashcan.gif' title='{$this->lang->words['frm_thistrash']}' />
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-<strong class='forum_name'>{$r['name']}</strong>
-HTML;
-
-if( $desc )
-{
-	$IPBHTML .= <<<HTML
-		<br /><span class='forum_desc'>{$desc}</span>
-HTML;
-}
-
-if ( ($r['skin_id'] != "") and ($r['skin_id'] > 0) )
-{
-$IPBHTML .= <<<HTML
-<br />[ {$this->lang->words['using_skin_set']} {$skin} ]
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-
-HTML;
-
-
-if ( $r['_modstring'] != "" )
-{
-$IPBHTML .= <<<HTML
-<div style='display:none' class='moddiv'><fieldset style='padding:4px;height:45px'><legend>{$this->lang->words['frm_moderators']}</legend>{$r['_modstring']}</fieldset></div>
-HTML;
-}
-
-$IPBHTML .= <<<HTML
- </td>
- <td style='width:5%' nowrap='nowrap'>
- 	<input type='checkbox' title='{$this->lang->words['frm_modcheck']}' id='id_{$r['id']}' value='1' /> 
- 	<img class='ipbmenu' id="menu{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['frm_options']}' />
-	<ul class='acp-menu' id='menu{$r['id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit&amp;f={$r['id']}'>{$this->lang->words['frm_editsettings']}</a></li>
-		<li class='icon info'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pedit&amp;f={$r['id']}'>{$this->lang->words['frm_permissions']}</a></li>
-		<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=empty&amp;f={$r['id']}'>{$this->lang->words['frm_emptyforum']}</a></li>
-		<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete&amp;f={$r['id']}'>{$this->lang->words['frm_deleteforum']}</a></li>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=frules&amp;f={$r['id']}'>{$this->lang->words['frm_forumrules']}</a></li>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=tools&amp;do=clearforumsubs&amp;f={$r['id']}'>{$this->lang->words['m_clearsubs']}</a></li>
-		<li class='icon view'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=skinedit&amp;f={$r['id']}'>{$this->lang->words['frm_skinopt']}</a></li>
-		<li class='icon info'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=recount&amp;f={$r['id']}'>{$this->lang->words['frm_resync']}</a></li>
-	</ul>
- </td>
-</tr>
-</table>
-</div>
+		<table style='width: 100%'>
+			<tr>
+				<td style='width: 20px !important; vertical-align: top;'>
+					<div class='draghandle'>&nbsp;</div>
+				</td>
+				<td style=''>
+					<div class='item_info'>
+						<strong class='forum_name'>{$r['name']}</strong>
+						<br />
+						<span class='desctext'>{$desc}</span>
+					</div>
+				</td>
+				<td style='width: 120px; text-align: left; vertical-align: top;'>
+					{$r['_modstring']}
+				</td>
+				<td style='width: 120px; vertical-align: top;'>
+					<input class='right' type='checkbox' title='{$this->lang->words['frm_modcheck']}' id='id_{$r['id']}' value='1' /> 
+					<div class='col_buttons right'>
+						<ul class='ipsControlStrip'>
+							<li class='i_edit'>
+								<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit&amp;f={$r['id']}'>{$this->lang->words['frm_editsettings']}</a>
+							</li>
+							<li class='ipsControlStrip_more ipbmenu' id="menu{$r['id']}">
+								<a href='#'>{$this->lang->words['frm_options']}</a>
+							</li>
+						</ul>
+						<ul class='acp-menu' id='menu{$r['id']}_menucontent' style='display: none'>
+							<li class='icon info'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pedit&amp;f={$r['id']}'>{$this->lang->words['frm_permissions']}</a></li>
+							<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=empty&amp;f={$r['id']}'>{$this->lang->words['frm_emptyforum']}</a></li>
+							<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete&amp;f={$r['id']}'>{$this->lang->words['frm_deleteforum']}</a></li>
+							<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=frules&amp;f={$r['id']}'>{$this->lang->words['frm_forumrules']}</a></li>
+							<li class='icon manage'><a href='{$this->settings['base_url']}&amp;module=tools&amp;section=tools&amp;do=clearforumsubs&amp;f={$r['id']}'>{$this->lang->words['m_clearsubs']}</a></li>
+							<li class='icon view'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=skinedit&amp;f={$r['id']}'>{$this->lang->words['frm_skinopt']}</a></li>
+							<li class='icon refresh'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=recount&amp;f={$r['id']}'>{$this->lang->words['frm_resync']}</a></li>
+						</ul>
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
 HTML;
 
 //--endhtml--//
@@ -386,7 +355,6 @@ return $IPBHTML;
 /**
  * Display "no forums" row
  *
- * @access	public
  * @param	integer	Parent ID
  * @return	string	HTML
  */
@@ -396,12 +364,10 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<tr>
- <td class='tablerow1' width='100%' colspan='2'>
-	{$this->lang->words['frm_noforums']}
-	<div class='graytext'><a href='{$this->settings['base_url']}&{$this->form_code}&do=forum_add&p={$parent_id}'>{$this->lang->words['frm_noforumslink']}</a></div>
- </td>
-</tr>
+<div class='item parent ipsControlRow' id='forum_none{$parent_id}'>
+	<strong style='font-size:11px;color:red;'>{$this->lang->words['frm_noforums']}</strong>
+	<div><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=forum_add&amp;p={$parent_id}'>{$this->lang->words['frm_noforumslink']}</a></div>
+</div>
 HTML;
 
 //--endhtml--//
@@ -411,7 +377,6 @@ return $IPBHTML;
 /**
  * Display forum permissions matrix
  *
- * @access	public
  * @param	array 	Forum data
  * @param	array 	Relative links
  * @param	string	Matrix HTML
@@ -430,40 +395,35 @@ $IPBHTML .= <<<HTML
 	<h2>{$this->lang->words['head_forum_permissions']} {$forumData['name']}</h2>
 </div>
 
-<div style='float:right;'>
-	<form name='permCopyForm' id='permCopyForm' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pedit&amp;f={$this->request['f']}' method='post'>
-		{$this->lang->words['copy_perms_from']} {$forumCopyDropDown}
-		<input type='submit' name='submit' value='{$this->lang->words['copy_perms_go']}' class='button primary' /> 
-	</form>
-</div>
-	<br style='clear: right;' /><br />
+<form name='permCopyForm' id='permCopyForm' class='information-box' style='margin-bottom:10px;' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pedit&amp;f={$this->request['f']}' method='post'>
+	{$this->lang->words['copy_perms_from']} {$forumCopyDropDown}
+	<input type='submit' name='submit' value='{$this->lang->words['copy_perms_go']}' class='button primary' /> 
+</form>
+
 <form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pdoedit&amp;f={$this->request['f']}&amp;name={$title}&amp;nextid={$relative['next']}&amp;previd={$relative['previous']}' method='post'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	{$perm_matrix }
 	
 	<div class='acp-box'>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-
 HTML;
 if ( $relative['next'] > 0 )
 {
 $IPBHTML .= <<<HTML
-				<input type='submit' name='donext' value='{$this->lang->words['frm_savenext']}' class='button primary' /> 
+			<input type='submit' name='donext' value='{$this->lang->words['frm_savenext']}' class='button primary' /> 
 HTML;
 }
 $IPBHTML .= <<<HTML
-				<input type='submit' value='{$this->lang->words['frm_saveonly']}' class='button primary' /> 
-				<input type='submit' name='reload' value='{$this->lang->words['frm_savereload']}' class='button primary' /> 
+			<input type='submit' value='{$this->lang->words['frm_saveonly']}' class='button primary' /> 
+			<input type='submit' name='reload' value='{$this->lang->words['frm_savereload']}' class='button primary' /> 
 HTML;
 if ( $relative['next'] > 0 )
 {
 $IPBHTML .= <<<HTML
-				<input type='submit' name='doprevious' value='{$this->lang->words['frm_saveprev']}' class='button primary' />
+			<input type='submit' name='doprevious' value='{$this->lang->words['frm_saveprev']}' class='button primary' />
 HTML;
 }
 $IPBHTML .= <<<HTML
-			</div>
 		</div>
 	</div>
 </form>
@@ -476,7 +436,6 @@ return $IPBHTML;
 /**
  * Display forum rules form
  *
- * @access	public
  * @param	integer	Forum ID
  * @param	array 	Forum data
  * @return	string	HTML
@@ -488,39 +447,52 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<HTML
 <div class='section_title'>
-	<h2>{$this->lang->words['forum_rules_head']} '{$data['name']}'</h2>
+	<h2>{$this->lang->words['frm_rulessetup']}</h2>
 </div>
 
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm' onclick='return ValidateForm();' id='postingform'>
+<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm' id='postingform'>
 	<input type='hidden' name='do' value='dorules' />
 	<input type='hidden' name='f' value='{$id}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_rulessetup']}</h3>
-		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_rulesdisplay']}</label>
-				{$data['_show_rules']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_rulestitle']}</label>
-				{$data['_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_rulestext']}</label>
-			</li>
-			<li>{$data['_editor']}</li>
-		 	<li>
-		   		<label>{$this->lang->words['frm_rule_raw_html_title']}<span class='desctext'>{$this->lang->words['frm_rule_raw_html_desc']}</span></label>
-		   		{$data['rules_raw_html']}
-		 	</li>
-		</ul>
-		
+		<h3>{$this->lang->words['forum_rules_head']} {$data['name']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_rulesdisplay']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['_show_rules']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_rulestitle']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_rulestext']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['_editor']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_rule_raw_html_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['rules_raw_html']}<br />
+					<span class='desctext'>{$this->lang->words['frm_rule_raw_html_desc']}</span>
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['frm_rulesbutton']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['frm_rulesbutton']}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -533,7 +505,6 @@ return $IPBHTML;
 /**
  * Display forum skin options form
  *
- * @access	public
  * @param	integer	Forum id
  * @param	array 	Forum data
  * @return	string	HTML
@@ -554,23 +525,27 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	
 	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_skinchoice']}{$data['name']}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_skinapply']}</label>
-				{$data['fsid']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_skinsub']}</label>
-				{$data['apply_to_children']}
-			</li>
-		</ul>
-		
+		<h3>{$this->lang->words['frm_skinchoice']} {$data['name']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_skinapply']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['fsid']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_skinsub']}</strong>
+				</td>
+				<td class='field_field'>
+					{$data['apply_to_children']}
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['frm_skinbutton']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['frm_skinbutton']}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -584,42 +559,38 @@ return $IPBHTML;
 /**
  * Display form to empty a forum
  *
- * @access	public
- * @param	integer	Forum id
  * @param	array 	Forum data
  * @return	string	HTML
  */
-public function forumEmptyForum( $id, $forum )
+public function forumEmptyForum( $forum )
 {
 $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
 <div class='section_title'>
-	<h2>{$this->lang->words['frm_emptytitle']} '{$forum['name']}'</h2>
+	<h2>{$this->lang->words['frm_emptytitle']}</h2>
 </div>
-<p class='message error'>
-	{$this->lang->words['for_empty_msg']}
-</p>
+
 <form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
 	<input type='hidden' name='do' value='doempty' />
-	<input type='hidden' name='f' value='{$id}' />
+	<input type='hidden' name='f' value='{$forum['id']}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	
 	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_emptytitle']}'{$forum['name']}'</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_emptywhich']}</label>
-				{$forum['name']}
-			</li>
-		</ul>
-		
+		<h3>{$this->lang->words['frm_emptysubtitle']} {$forum['name']}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_emptywhich']}</strong>
+				</td>
+				<td class='field_field'>
+					{$forum['name']}
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['frm_emptybutton']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['frm_emptybutton']}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -632,7 +603,6 @@ return $IPBHTML;
 /**
  * Display form to delete a forum
  *
- * @access	public
  * @param	integer	Forum ID
  * @param	string	Name
  * @param	string	Options HTML for move to dropdown
@@ -658,32 +628,36 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
 	
 	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_deletetitle']}{$name}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_deletewhich']}</label>
-				{$name}
-			</li>
+		<h3>{$this->lang->words['frm_deletetitle']} {$name}</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_deletewhich']}</strong>
+				</td>
+				<td class='field_field'>
+					{$name}
+				</td>
+			</tr>
 HTML;
 
 if( $move )
 {
 	$IPBHTML .= <<<HTML
-			<li>
-				<label>{$this->lang->words['frm_deletemove']}</label>
-				{$move}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_deletemove']}</strong>
+				</td>
+				<td class='field_field'>
+					{$move}
+				</td>
+			</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-		</ul>
-		
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['frm_deletebutton']}' class='redbutton realbutton' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['frm_deletebutton']}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -696,7 +670,6 @@ return $IPBHTML;
 /**
  * Display form to add/edit a forum
  *
- * @access	public
  * @param	array 	Form fields
  * @param	string	Button text
  * @param	string	Action code
@@ -714,242 +687,685 @@ $IPBHTML = "";
 $_forUrl	= urlencode($forum['name']);
 
 $IPBHTML .= <<<HTML
+<script type='text/javascript' src='{$this->settings['js_app_url']}acp.forums.js'></script>
 <div class='section_title'>
 	<h2>{$title}</h2>
 </div>
-
-<ul id='tabstrip_forumForm' class='tab_bar no_title'>
-	<li id='tabtab-FORUMS|1'>{$this->lang->words['frm_f_basic']}</li> 
 HTML;
 
-if( $form['addnew_type'] != 'category' )
-{
-$IPBHTML .= <<<HTML
-	<li id='tabtab-FORUMS|2'>{$this->lang->words['from_f_postable_settings']}</li>
-HTML;
-}
-if ( $perm_matrix )
-{
-$IPBHTML .= <<<HTML
-	<li id='tabtab-FORUMS|3'>{$this->lang->words['from_f_perms']}</li>
-HTML;
-}
-if( $form['addnew_type'] != 'category' )
-{
-$IPBHTML .= <<<HTML
-	{$form['tabStrip']}
-HTML;
+if( $code == 'donew'){
+	$IPBHTML .= "<div class='ipsSteps_wrap'>";
 }
 
 $IPBHTML .= <<<HTML
-</ul> 
- 
-<script type="text/javascript"> 
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip_forumForm');
-ipbAcpTabStrips.doToggle($('tabtab-FORUMS|1'));
-});
- //]]>
-</script>
+	<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$code}&amp;f={$this->request['f']}&amp;name={$_forUrl}' method='post' enctype='multipart/form-data'>
+		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
+		<input type='hidden' name='convert' id='convert' value='0' />
+		<input type='hidden' name='type' value='{$this->request['type']}' />
+HTML;
 
-<script type='text/javascript' src='{$this->settings['js_app_url']}acp.forums.js'></script>
-<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$code}&amp;f={$this->request['f']}&amp;name={$_forUrl}' method='post'>
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
-	<input type='hidden' name='convert' id='convert' value='0' />
-	<input type='hidden' name='type' value='{$this->request['type']}' />
+//---------------------------------------------
+// If we're adding a new forum, show the wizard
+//---------------------------------------------
+if( $code == 'donew' )
+{
+	$steps = 1;
+
+	// Basic settings
+	$IPBHTML .= <<<HTML
+		<div class='ipsSteps clearfix' id='steps_bar'>
+			<ul>
+				<li class='steps_active' id='step_basic'>
+					<strong class='steps_title'>{$this->lang->words['admin_step']} {$steps}</strong>
+					<span class='steps_desc'>{$this->lang->words['frm_f_basic']}</span>
+					<span class='steps_arrow'>&nbsp;</span>
+				</li>
+HTML;
+	$steps++;
 	
-	<div id='tabpane-FORUMS|1'>
-	<div class='acp-box'>		
- 		<ul class='acp-form alternate_rows'>
-			<li><label class='head'>{$this->lang->words['frm_f_basic']}</label></li>
-    
-    		<li>
-   				<label>{$this->lang->words['frm_f_name_' . $form['addnew_type'] ]}</label>
-   				{$form['name']}
- 			</li>
-HTML;
-
-if( $form['addnew_type'] != 'category' )
-{
-$IPBHTML .= <<<HTML
-		 	<li>
-		   		<label>{$this->lang->words['frm_f_desc']}<span class='desctext'>{$this->lang->words['frm_f_desc_info']}</span></label>
-		   		{$form['description']}
-		 	</li>
-		
-		 	<li>
-		   		<label>{$this->lang->words['frm_f_parent']}</label>
-		   		{$form['parent_id']}
-		 	</li>
-		 	<li>
-		   		<label>{$this->lang->words['frm_f_state']}</label>
-		   		{$form['status']}
-		 	</li> 	
-		 	<li>
-		   		<label>{$this->lang->words['frm_f_ascat']}<span class='desctext'>{$this->lang->words['frm_f_ascat_info']}</span></label>
-		   		{$form['sub_can_post']}
-		 	</li>
-
-			<li><label class='head'>{$this->lang->words['frm_f_redirect']}</label></li>
-    
-			<li>
-				<label>{$this->lang->words['frm_f_redirect_url']}</label>
-				{$form['redirect_url']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_redirect_en']}<span class='desctext'>{$this->lang->words['frm_f_redirect_en_info']}</span></label>
-				{$form['redirect_on']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_redirect_num']}</label>
-				{$form['redirect_hits']}
-			</li>
-		
-			<li><label class='head'>{$this->lang->words['frm_f_perm_title']}</label></li>
-    		
-    		<li>
-				<label>{$this->lang->words['disable_sharelinks']}<span class='desctext'>{$this->lang->words['disable_sharelinks_desc']}</span></label>
-				{$form['disable_sharelinks']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_perm_hide']}<span class='desctext'>{$this->lang->words['frm_f_perm_hide_info']}</span></label>
-				{$form['hide_last_info']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_perm_list']}<span class='desctext'>{$this->lang->words['frm_f_perm_list_info']}</span></label>
-				{$form['permission_showtopic']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_perm_cust']}<span class='desctext'>{$this->lang->words['frm_f_perm_cust_info']}</span></label>
-				{$form['permission_custom_error']}
-			</li>
-		</ul>
-	</div>
-	</div>
-	
-	<div id='tabpane-FORUMS|2'>
-	<div class='acp-box'>		
- 		<ul class='acp-form alternate_rows'>	
-			<li><label class='head'>{$this->lang->words['frm_f_post_title']}</label></li>
-			
-			<li>
-				<label>{$this->lang->words['frm_f_post_html']}<span class='desctext'>{$this->lang->words['frm_f_post_html_info']}</span></label>
-				{$form['use_html']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_bb']}</label>
-				{$form['use_ibc']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_qreply']}</label>
-				{$form['quick_reply']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_poll']}</label>
-				{$form['allow_poll']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_bump']}<span class='desctext'>{$this->lang->words['frm_f_post_bump_info']}</span></label>
-				{$form['allow_pollbump']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_rate']}</label>
-				{$form['forum_allow_rating']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_post_inc']}<span class='desctext'>{$this->lang->words['frm_f_post_inc_info']}</span></label>
-				{$form['inc_postcount']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_min_posts_post']}<span class='desctext'>{$this->lang->words['frm_f_min_posts_post_info']}</span></label>
-				{$form['min_posts_post']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_min_posts_view']}<span class='desctext'>{$this->lang->words['frm_f_min_posts_view_info']}</span></label>
-				{$form['min_posts_view']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_canviewothers']}</label>
-				{$form['can_view_others']}
-			</li>
-			
-			<li><label class='head'>{$this->lang->words['frm_f_mod_title']}</label></li>
-			    
-			<li>
-				<label>{$this->lang->words['frm_f_mod_en']}<span class='desctext'>{$this->lang->words['frm_f_mod_en_info']}</span></label>
-				{$form['preview_posts']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_mod_email']}<span class='desctext'>{$this->lang->words['frm_f_mod_email_info']}</span></label>
-				{$form['notify_modq_emails']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_mod_pass']}<span class='desctext'>{$this->lang->words['frm_f_mod_pass_info']}</span></label>
-				{$form['password']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_mod_exempt']}<span class='desctext'>{$this->lang->words['frm_f_mod_exempt_info']}</span></label>
-				{$form['password_override']}
-			</li> 	
-    		
-			<li><label class='head'>{$this->lang->words['frm_f_sort_title']}</label></li>
-    
-			<li>
-				<label>{$this->lang->words['frm_f_sort_cutoff']}</label>
-				{$form['prune']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_sort_key']}</label>
-				{$form['sort_key']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_sort_order']}</label>
-				{$form['sort_order']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_f_sort_filter']}</label>
-				{$form['topicfilter']}
-			</li>
-		</ul>
-	</div>
-	</div>
-HTML;
-
-}
-
-if ( $perm_matrix )
-{
-	if( $form['addnew_type'] == 'category' )
+	// Postable forum settings
+	if( $form['addnew_type'] != 'category' )
 	{
+		$IPBHTML .= <<<HTML
+			<li id='step_postable'>
+				<strong class='steps_title'>{$this->lang->words['admin_step']} {$steps}</strong>
+				<span class='steps_desc'>{$this->lang->words['from_f_postable_settings']}</span>
+				<span class='steps_arrow'>&nbsp;</span>
+			</li>
+HTML;
+		$steps++;
+	}
+	
+	if( $form['tabStrip'] && $form['tabContent'] )
+	{
+		//print_r( $form );
+		$IPBHTML .= <<<HTML
+			<li id='step_additional'>
+				<strong class='steps_title'>{$this->lang->words['admin_step']} {$steps}</strong>
+				<span class='steps_desc'>3rd Party</a>
+				<span class='steps_arrow'>&nbsp;</span>
+			</li>
+HTML;
+		$steps++;
+	}
+	
+	//Permission matrix
+	if( $perm_matrix )
+	{
+		$IPBHTML .= <<<HTML
+			<li id='step_perms'>
+				<strong class='steps_title'>{$this->lang->words['admin_step']} {$steps}</strong>
+				<span class='steps_desc'>{$this->lang->words['from_f_perms']}</span>
+				<span class='steps_arrow'>&nbsp;</span>
+			</li>
+HTML;
+		$steps++;
+	}
+	
+	$IPBHTML .= <<<HTML
+		</ul>
+	</div>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	<div class='acp-box'>
+HTML;
+
+if( $code != 'donew'  && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+{
+	$IPBHTML .= <<<HTML
+	<h3>{$this->lang->words['frm_settings']}</h3>
+	<div class='ipsTabBar with_left with_right' id='tabstrip_forums'>
+		<span class='tab_left'>&laquo;</span>
+		<span class='tab_right'>&raquo;</span>
+		<ul>
+			<li id='tab_basic'>{$this->lang->words['frm_f_basic']}</li> 
+HTML;
+		if( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+		{
+			if( !$form['sub_can_post'] ){
+				$IPBHTML .= "<li id='tab_postable' style='display: none'>{$this->lang->words['from_f_postable_settings']}</li> ";
+			} else {
+				$IPBHTML .= "<li id='tab_postable'>{$this->lang->words['from_f_postable_settings']}</li> ";
+			}
+		}
+		
+		if( $perm_matrix )
+		{
+			$IPBHTML .= "<li id='tab_perms'>{$this->lang->words['from_f_perms']}</li> ";
+		}
+		
+		if( $form['tabStrip'] )
+		{
+			$IPBHTML .= $form['tabStrip'];
+		}
+		
 		$IPBHTML .= <<<HTML
 		</ul>
 	</div>
-	</div>
-HTML;
-	}
-	
-$IPBHTML .= <<<HTML
-<div id='tabpane-FORUMS|3'>
-	<div class='acp-box'>
-		{$perm_matrix}
-	</div>
-</div>
+	<div class='ipsTabBar_content' id='tabstrip_forums_content'>
 HTML;
 }
 
-if( $form['addnew_type'] != 'category' )
+if( $code == 'donew' )
 {
 $IPBHTML .= <<<HTML
-	{$form['tabContent']}
+	<div class='ipsSteps_wrapper' id='ipsSteps_wrapper'>
+		<div id='step_basic_content' class='steps_content'>
+			<div class='acp-box'>
+				<h3>{$this->lang->words['frm_f_basic']}</h3>
 HTML;
 }
 else
 {
-$IPBHTML .= <<<HTML
-
+	$IPBHTML .= <<<HTML
+	<div id='tab_basic_content'>
+HTML;
+}
 	
+	$IPBHTML .= <<<HTML
+		 <table class='ipsTable double_pad'>
+HTML;
+			if( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+			{
+				$checked_standard	= '';
+				$checked_cat		= '';
+				$checked_redirect	= '';
+				
+				if( $code != 'donew' )
+				{
+					if( $forum['parent_id'] == 'root' || (!$forum['sub_can_post'] && !$forum['redirect_url']) )
+					{
+						$checked_cat		= " checked='checked'";
+					}
+					else if( $forum['redirect_url'] )
+					{
+						$checked_redirect	= " checked='checked'";
+					}
+					else
+					{
+						$checked_standard	= " checked='checked'";
+					}
+				}
+				else
+				{
+					$checked_standard = " checked='checked'";
+				}
+				
+				$IPBHTML .= <<<HTML
+					<tr>
+						<th colspan='2'>{$this->lang->words['frm_type_header']}</th>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_type']}</strong>
+						</td>
+						<td class='field_field'>
+							<table id='forum_type_chooser'>
+								<tr>
+									<td style='width: 25px'>
+										<input type='radio' name='forum_type' id='type_standard' value='standard'{$checked_standard} />
+									</td>
+									<td>
+										<strong><label for='type_standard'>{$this->lang->words['frm_type_stand']}</label></strong><br />
+										<span class='desctext'>{$this->lang->words['frm_type_stand_d']}</span>
+									</td>
+								</tr>
+								<tr>
+									<td>								
+										<input type='radio' name='forum_type' id='type_category' value='category'{$checked_cat} />
+									</td>
+									<td>
+										<strong><label for='type_category'>{$this->lang->words['frm_type_cat']}</label></strong><br />
+										<span class='desctext'>{$this->lang->words['frm_type_cat_d']}</span>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<input type='radio' name='forum_type' id='type_redirect' value='redirect'{$checked_redirect} />
+									</td>
+									<td>								
+										<strong><label for='type_redirect'>{$this->lang->words['frm_type_redirect']}</label></strong><br />
+										<span class='desctext'>{$this->lang->words['frm_type_redirect_d']}</span>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+HTML;
+			}
+		
+		$IPBHTML .= <<<HTML
+					<tr>
+						<th colspan='2'>{$this->lang->words['frm_settings']}</th>
+					</tr>
+		    		<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_name_' . $form['addnew_type'] ]}</strong>
+						</td>
+						<td class='field_field'>
+		   					{$form['name']}
+						</td>
+		 			</tr>
+HTML;
+
+		if( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+		{
+		$IPBHTML .= <<<HTML
+		 			<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_desc']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['description']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_desc_info']}</span>
+						</td>
+					</tr>
+
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_parent']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['parent_id']}
+						</td>
+					</tr>
+
+					<tbody id='forum_redirect' style='display: none'>
+						<tr>
+							<th colspan='2'>
+								{$this->lang->words['frm_f_redirect']}
+							</th>
+						</tr>
+
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_redirect_url']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['redirect_url']}
+							</td>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_redirect_num']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['redirect_hits']}
+							</td>
+						</tr>
+					</tbody>
+			
+					<tbody id='forum_perms' style='display: none'>
+						<tr>
+							<th colspan='2'>
+								{$this->lang->words['frm_f_perm_title']}
+							</th>
+						</tr>
+
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['disable_sharelinks']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['disable_sharelinks']}<br />
+								<span class='desctext'>{$this->lang->words['disable_sharelinks_desc']}</span>
+							</td>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_perm_hide']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['hide_last_info']}<br />
+								<span class='desctext'>{$this->lang->words['frm_f_perm_hide_info']}</span>
+							</td>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_perm_list']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['permission_showtopic']}<br />
+								<span class='desctext'>{$this->lang->words['frm_f_perm_list_info']}</span>
+							</td>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_perm_cust']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['permission_custom_error']}<br />
+								<span class='desctext'>{$this->lang->words['frm_f_perm_cust_info']}</span>
+							</td>
+						</tr>
+					</tbody>
+					<tbody id='forum_password' style='display: none'>
+						<tr>
+							<th colspan='2'>
+								{$this->lang->words['frm_f_password']}
+							</th>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_mod_pass']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['password']}<br />
+								<span class='desctext'>{$this->lang->words['frm_f_mod_pass_info']}</span>
+							</td>
+						</tr>
+						<tr>
+							<td class='field_title'>
+								<strong class='title'>{$this->lang->words['frm_f_mod_exempt']}</strong>
+							</td>
+							<td class='field_field'>
+								{$form['password_override']}<br />
+								<span class='desctext'>{$this->lang->words['frm_f_mod_exempt_info']}</span>
+							</td>
+						</tr>
+					</tbody>
+HTML;
+		}
+		
+		$IPBHTML .= <<<HTML
+					
+				</table>
+				<input type='hidden' name='sub_can_post' value='0' />
+				<input type='hidden' name='redirect_on' value='0' />
+
+				<script type='text/javascript'>
+					updateForumForm();
+				
+					jQ("input[name=forum_type]:radio").click( function(e){
+						updateForumForm();
+					});
+HTML;
+
+				if( $code != 'donew' )
+				{
+					$IPBHTML .= <<<HTML
+					jQ(document).ready(function() {
+						updateForumForm();
+					});
+HTML;
+				}
+					
+				$IPBHTML .= <<<HTML
+					function updateForumForm()
+					{
+						var curVal = jQ("input[name=forum_type]:checked").val();
+
+						switch( curVal ){
+							case "standard":
+								jQ("input:hidden[name=sub_can_post]").val(1);
+								jQ("input:hidden[name=redirect_on]").val(0);
+								jQ("#forum_redirect").hide();
+								jQ("#forum_perms").show();
+								jQ("#forum_password").show();
+								jQ("#step_postable").removeClass('steps_disabled').addClass('clickable');
+								jQ("#tab_postable").show();
+							break;
+							case "category":
+								jQ("input:hidden[name=sub_can_post]").val(0);
+								jQ("input:hidden[name=redirect_on]").val(0);
+								jQ("#forum_redirect").hide();
+								jQ("#forum_perms").hide();
+								jQ("#forum_password").show();
+								jQ("#step_postable").addClass('steps_disabled').removeClass('clickable');
+								jQ("#tab_postable").hide();
+							break;
+							case "redirect":
+								jQ("input:hidden[name=sub_can_post]").val(0);
+								jQ("input:hidden[name=redirect_on]").val(1);
+								jQ("#forum_redirect").show();
+								jQ("#forum_perms").hide();
+								jQ("#forum_password").hide();
+								jQ("#step_postable").addClass('steps_disabled').removeClass('clickable');
+								jQ("#tab_postable").hide();
+							break;
+						}
+					}
+				</script>
+			</div>
+HTML;
+		
+if( $code == 'donew' ){
+	$IPBHTML .= <<<HTML
+		</div>
+HTML;
+
+	if( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+	{
+		$IPBHTML .= <<<HTML
+		<div id='step_postable_content' style='display: none'>
+			<div class='acp-box'>
+				<h3>{$this->lang->words['from_f_postable_settings']}</h3>
+HTML;
+	}
+}
+elseif( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+{
+	$IPBHTML .= <<<HTML
+		<div id='tab_postable_content'>
+HTML;
+}
+
+if( $form['addnew_type'] != 'category' && ( $forum['parent_id'] != 'root' or $this->request['nocat'] ) )
+{
+$IPBHTML .= <<<HTML
+		 		<table class='ipsTable double_pad'>
+					<tr>
+						<th colspan='2'>
+							{$this->lang->words['frm_f_post_title']}
+						</th>
+					</tr>			
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_html']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['use_html']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_post_html_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_bb']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['use_ibc']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_poll']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['allow_poll']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_bump']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['allow_pollbump']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_post_bump_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_rate']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['forum_allow_rating']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_post_inc']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['inc_postcount']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_post_inc_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_min_posts_post']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['min_posts_post']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_min_posts_post_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_min_posts_view']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['min_posts_view']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_min_posts_view_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_canviewothers']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['can_view_others']}
+						</td>
+					</tr>
+			
+					<tr>
+						<th colspan='2'>
+							{$this->lang->words['frm_f_mod_title']}
+						</th>
+					</tr>
+
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_mod_en']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['preview_posts']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_mod_en_info']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_mod_email']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['notify_modq_emails']}<br />
+							<span class='desctext'>{$this->lang->words['frm_f_mod_email_info']}</span>
+						</td>
+					</tr>	
+
+					<tr>
+						<th colspan='2'>
+							{$this->lang->words['frm_f_sort_title']}
+						</th>
+					</tr>
+
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_sort_cutoff']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['prune']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_sort_key']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['sort_key']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_sort_order']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['sort_order']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['frm_f_sort_filter']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['topicfilter']}
+						</td>
+					</tr>
+					<tr>
+						<th colspan='2'>
+							{$this->lang->words['frm_f_tagging_title']}
+						</th>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['bw_disable_tagging']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['bw_disable_tagging']}
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['bw_disable_prefixes']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['bw_disable_prefixes']}<br />
+							<span class="desctext">{$this->lang->words['bw_disable_prefixes_desc']}</span>
+						</td>
+					</tr>
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$this->lang->words['tag_predefined']}</strong>
+						</td>
+						<td class='field_field'>
+							{$form['tag_predefined']}<br />
+							<span class="desctext">{$this->lang->words['tag_predefined_desc']}</span>
+						</td>
+					</tr>
+				</table>
+HTML;
+
+if( $code == 'donew' )
+{
+	$IPBHTML .= <<<HTML
+			</div>
+		</div>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	</div>
+HTML;
+}
+}
+
+if( $form['tabContent'] ){
+	if( $code == 'donew' )
+	{
+		$IPBHTML .= <<<HTML
+			<div id='step_additional_content' style='display: none'>
+				<h3>3rd Party Settings</h3>
+				<div class='ipsTabBar with_left with_right' id='tabstrip_3rdparty'>
+					<span class='tab_left'>&laquo;</span>
+					<span class='tab_right'>&raquo;</span>
+					<ul>
+						{$form['tabStrip']}
+					</ul>
+				</div>
+				<div id='tabstrip_3rdparty_content' class='ipsTabBar_content'>
+					{$form['tabContent']}
+				</div>
+				<script type='text/javascript'>
+					jQ("#tabstrip_3rdparty").ipsTabBar({ tabWrap: "#tabstrip_3rdparty_content" });
+				</script>
+			</div>
+HTML;
+	}
+	else
+	{
+		$IPBHTML .= <<<HTML
+			{$form['tabContent']}
+HTML;
+	}
+}
+
+if ( $perm_matrix )
+{
+	if( $code == 'donew' )
+	{
+		$IPBHTML .= <<<HTML
+			<div id='step_perms_content' style='display: none'>
+				<div class='acp-box'>
+					{$perm_matrix}
+				</div>
+			</div>
+HTML;
+	}
+	else
+	{
+		$IPBHTML .= <<<HTML
+			<div id='tab_perms_content'>
+				{$perm_matrix}
+			</div>
+HTML;
+	}
+}
+
+if( $form['addnew_type'] == 'category' )
+{
+	$IPBHTML .= <<<HTML
 	<input type='hidden' name='parent_id' value='-1' />
 	<input type='hidden' name='sub_can_post' value='0' />
 	<input type='hidden' name='permission_showtopic' value='1' />
@@ -957,14 +1373,44 @@ HTML;
 }
 
 $IPBHTML .= <<<HTML
-	<div class='acp-actionbar'>
- 		<div class='rightaction'>
- 			<input type='submit' class='button primary' value='{$button}' /> {$this->lang->words['frm_or']}&nbsp;&nbsp;{$form['convert_button']} 			
-		</div>
 	</div>
-</form>
 HTML;
 
+if( $code == 'donew' )
+{
+	$_lang 	= $this->request['type'] == 'category' ? $this->lang->words['frm_savecat'] : $this->lang->words['frm_save'];
+	
+	$IPBHTML .= <<<HTML
+	<div id='steps_navigation' class='clearfix' style='margin-top: 10px;'>
+		<input type='button' class='realbutton left' value='{$this->lang->words['wiz_prev']}' id='prev' />
+		<input type='button' class='realbutton right' value='{$this->lang->words['wiz_next']}' id='next' />
+		<p class='right' id='finish' style='display: none'>
+			<input type='submit' class='realbutton' value='{$_lang}' />
+		</p>
+	</div>
+	<script type='text/javascript'>
+		jQ("#steps_bar").ipsWizard( { allowJumping: true, allowGoBack: false } );
+	</script>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<div class='acp-actionbar'>
+		<input type='submit' class='realbutton' value='{$this->lang->words['frm_save']}' />
+	</div>
+	<script type='text/javascript'>
+		jQ("#tabstrip_forums").ipsTabBar({ tabWrap: "#tabstrip_forums_content" });
+	</script>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	</form>
+</div>
+HTML;
+
+
 //--endhtml--//
 return $IPBHTML;
 }
@@ -972,7 +1418,6 @@ return $IPBHTML;
 /**
  * Select a moderator gateway page
  *
- * @access	public
  * @param	integer	Forum ID
  * @param	string	Dropdown options of members
  * @return	string	HTML
@@ -990,21 +1435,21 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='fid' value='{$fid}' />
 	<input type='hidden' name='return_id' value='{$return_id}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
-	
+
 	<div class='acp-box'>
 		<h3>{$this->lang->words['frm_m_search']}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_m_choose']}</label>
-				{$member_drop}
-			</li>
-		</ul>		
-		
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_choose']}</strong>
+				</td>
+				<td class='field_field'>
+					{$member_drop}
+				</td>
+			</tr>
+		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['frm_m_choosebutton']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['frm_m_choosebutton']}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -1017,7 +1462,6 @@ return $IPBHTML;
 /**
  * Display moderator add/edit form
  *
- * @access	public
  * @param	array 	Form fields
  * @param	string	Action code
  * @param	integer	Member ID
@@ -1062,247 +1506,262 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='gname' value='{$gname}' />
 	<input type='hidden' name='return_id' value='{$return_id}' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
-	
-	<div class='acp-box'>	
+
+	<div class='acp-box'>
 		<h3>{$this->lang->words['frm_m_genset']}</h3>
-
-		<table class='acp-form alternate_rows'>
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td width='51%'>
-					<strong>{$this->lang->words['frm_mod_forums']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_mod_forums']}</strong>
 				</td>
-				<td>
-				{$form['forums']}
+				<td class='field_field'>
+					{$form['forums']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_edit']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_edit']}</strong>
 				</td>
-				<td>
-				{$form['edit_post']}
+				<td class='field_field'>
+					{$form['edit_post']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_topic']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_topic']}</strong>
 				</td>
-				<td>
-				{$form['edit_topic']}
+				<td class='field_field'>
+					{$form['edit_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_delete']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_delete']}</strong>
 				</td>
-				<td>
-				{$form['delete_post']}
+				<td class='field_field'>
+					{$form['delete_post']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_deletetop']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_deletetop']}</strong>
 				</td>
-				<td>
-				{$form['delete_topic']}
+				<td class='field_field'>
+					{$form['delete_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete']}</strong>
-					<div class='desctext'>{$this->lang->words['soft_delete_info']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_soft_delete']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete']}<br />
+					<span class='desctext'>{$this->lang->words['soft_delete_info']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_un_soft_delete']}</strong>
-					<div class='desctext'>{$this->lang->words['soft_delete_info']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_un_soft_delete']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_un_soft_delete']}
+				<td class='field_field'>
+					{$form['bw_mod_un_soft_delete']}<br />
+					<span class='desctext'>{$this->lang->words['soft_delete_info']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete_see']}</strong>
-					<div class='desctext'>{$this->lang->words['gbw_soft_delete_see_d']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_see']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_soft_delete_see']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete_see']}<br />
+					<span class='desctext'>{$this->lang->words['gbw_soft_delete_see_d']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete_topic']}</strong>
-					<div class='desctext'>{$this->lang->words['soft_delete_info']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_topic']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_soft_delete_topic']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete_topic']}<br />
+					<span class='desctext'>{$this->lang->words['soft_delete_info']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_un_soft_delete_topic']}</strong>
-					<div class='desctext'>{$this->lang->words['soft_delete_info']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_un_soft_delete_topic']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_un_soft_delete_topic']}
+				<td class='field_field'>
+					{$form['bw_mod_un_soft_delete_topic']}<br />
+					<span class='desctext'>{$this->lang->words['soft_delete_info']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete_topic_see']}</strong>
-					<div class='desctext'>{$this->lang->words['gbw_soft_delete_topic_see_d']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_topic_see']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_soft_delete_topic_see']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete_topic_see']}<br />
+					<span class='desctext'>{$this->lang->words['gbw_soft_delete_topic_see_d']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete_reason']}</strong>
-					<div class='desctext'>{$this->lang->words['soft_delete_info']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_reason']}</strong>
 				</td>
-				<td>
-		 			{$form['bw_mod_soft_delete_reason']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete_reason']}<br />
+					<span class='desctext'>{$this->lang->words['soft_delete_info']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['gf_bw_soft_delete_see_post']}</strong>
-					<div class='desctext'>{$this->lang->words['gbw_soft_delete_see_post_d']}</div>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_see_post']}</strong>
 				</td>
-				<td>
-		 		{$form['bw_mod_soft_delete_see_post']}
+				<td class='field_field'>
+					{$form['bw_mod_soft_delete_see_post']}<br />
+					<span class='desctext'>{$this->lang->words['gbw_soft_delete_see_post_d']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_ip']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_ip']}</strong>
 				</td>
-				<td>
-				{$form['view_ip']}
+				<td class='field_field'>
+					{$form['view_ip']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_open']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_open']}</strong>
 				</td>
-				<td>
-				{$form['open_topic']}
+				<td class='field_field'>
+					{$form['open_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_close']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_close']}</strong>
 				</td>
-				<td>
-				{$form['close_topic']}
+				<td class='field_field'>
+					{$form['close_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_move']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_move']}</strong>
 				</td>
-				<td>
-				{$form['move_topic']}
+				<td class='field_field'>
+					{$form['move_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_pin']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_pin']}</strong>
 				</td>
-				<td>
-				{$form['pin_topic']}
+				<td class='field_field'>
+					{$form['pin_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_unpin']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_unpin']}</strong>
 				</td>
-				<td>
-				{$form['unpin_topic']}
+				<td class='field_field'>
+					{$form['unpin_topic']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_split']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_split']}</strong>
 				</td>
-				<td>
-				{$form['split_merge']}
+				<td class='field_field'>
+					{$form['split_merge']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_opentime']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_opentime']}</strong>
 				</td>
-				<td>
-				{$form['mod_can_set_open_time']}
+				<td class='field_field'>
+					{$form['mod_can_set_open_time']}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['frm_m_closetime']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_closetime']}</strong>
 				</td>
-				<td>
-				{$form['mod_can_set_close_time']}
+				<td class='field_field'>
+					{$form['mod_can_set_close_time']}
+				</td>
+			</tr>
+			<tr>
+				<th colspan='2'>{$this->lang->words['frm_m_msettings']}</th>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_massmove']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['mass_move']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_massprune']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['mass_prune']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_visible']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['topic_q']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_visiblepost']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['post_q']}
+				</td>
+			</tr>
+			<tr>
+				<th colspan='2'>{$this->lang->words['frm_m_asettings']}</th>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_warn']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['allow_warn']}<br />
+					<span class='desctext'>{$this->lang->words['frm_m_warn_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_spam']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['bw_flag_spammers']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['frm_m_mm']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['can_mm']}<br />
+					<span class='desctext'>( <a href='#' onClick="window.open('{$this->settings['_base_url']}app=core&amp;module=help&amp;id=mod_mmod','Help','width=450,height=400,resizable=yes,scrollbars=yes'); return false;">{$this->lang->words['frm_m_mm_info']}</a> )</span>
 				</td>
 			</tr>
 		</table>
-	</div>
-	<br />
-	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_m_msettings']}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_m_massmove']}</label>
-				{$form['mass_move']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['frm_m_massprune']}</label>
-				{$form['mass_prune']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['frm_m_visible']}</label>
-				{$form['topic_q']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['frm_m_visiblepost']}</label>
-				{$form['post_q']}
-			</li>
-		</ul>
-	</div>
-	<br />
-	<div class='acp-box'>
-		<h3>{$this->lang->words['frm_m_asettings']}</h3>
-
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['frm_m_warn']}<span class='desctext'>{$this->lang->words['frm_m_warn_info']}</span></label>
-				{$form['allow_warn']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_m_spam']}</label>
-				{$form['bw_flag_spammers']}
-			</li>
-			<li>
-				<label>{$this->lang->words['frm_m_mm']}<span class='desctext'>( <a href='#' onClick="window.open('{$this->settings['_base_url']}app=core&amp;module=help&amp;id=mod_mmod','Help','width=250,height=400,resizable=yes,scrollbars=yes'); return false;">{$this->lang->words['frm_m_mm_info']}</a> )</span></label>
-				{$form['can_mm']}
-			</li>
-		</table>
-		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$button}' class='button primary' accesskey='s'>
-			</div>
-		</div>	
+			<input type='submit' value='{$button}' class='button primary' accesskey='s' />
+		</div>
 	</div>
 </form>
 HTML;
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_group_form.php b/upload/admin/applications/forums/skin_cp/cp_skin_group_form.php
index 7fae3f11..7d12c488 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_group_form.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_group_form.php
@@ -3,39 +3,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Group plugin skin functions
- * Last Updated: $LastChangedDate: 2010-07-09 23:59:26 -0400 (Fri, 09 Jul 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-01 08:16:37 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 6627 $
+ * @version		$Rev: 9439 $
  */
  
-class cp_skin_group_form extends output
+class cp_skin_group_form
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show forums group form
  *
- * @access	public
  * @param	array 	Group data
  * @param	string	Tab ID
  * @return	string	HTML
@@ -93,17 +122,17 @@ $form['gbw_soft_delete_see_post']	= $this->registry->output->formYesNo( "gbw_sof
 $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
-<div id='tabpane-GROUPS|{$tabId}'>
+<div id='tab_GROUPS_{$tabId}_content'>
 	<div>
-		<table class='form_table alternate_rows double_pad' cellspacing='0'>
+		<table class='ipsTable'>
 			<tr>
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_rating']}</strong></th>
 			</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_topic_rate_setting']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_topic_rate_setting']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_topic_rate_setting']}
 				</td>
 		 	</tr>
@@ -111,10 +140,10 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_viewing']}</strong></th>
 			</tr>
 			<tr>
-				<td style='width: 40%'>
-					<label>{$this->lang->words['gf_other_topics']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_other_topics']}</strong>
 				</td>
-				<td style='width: 60%'>
+				<td class='field_field'>
 		 			{$form['g_other_topics']}
 				</td>
 		 	</tr>
@@ -122,28 +151,28 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_posting']}</strong></th>
 			</tr>
 			<tr>
-				<td>
-					<label>{$this->lang->words['gf_post_new_topics']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_post_new_topics']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_post_new_topics']}
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_reply_own_topics']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_reply_own_topics']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_reply_own_topics']}
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_reply_other_topics']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_reply_other_topics']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_reply_other_topics']}
 				</td>
 		 	</tr>
@@ -151,38 +180,38 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_editing']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_edit_posts']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_edit_posts']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_edit_posts']}
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_edit_cutoff']}</label>
-					<div class='desctext'>{$this->lang->words['gf_edit_cuttoff_info']}</div>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_edit_cutoff']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_edit_cutoff']}
+					<div class='desctext'>{$this->lang->words['gf_edit_cuttoff_info']}</div>
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-				<td>
-		 			<label>{$this->lang->words['gf_append_edit']}</label>
+				<td class='field_title'>
+		 			<strong class='title'>{$this->lang->words['gf_append_edit']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_append_edit']}
 				</td>
 		 	</tr>
 		 	
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_edit_topic']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_edit_topic']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_edit_topic']}
 				</td>
 		 	</tr>
@@ -190,143 +219,143 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_deleting']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_delete_own_posts']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_delete_own_posts']}</strong>
+				</td>
+		 		<td class='field_field'>
+					{$form['g_delete_own_posts']}
 					<p class='desctext'>{$this->lang->words['hard_delete_info']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-		 		<td>
-					{$form['g_delete_own_posts']}
-				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_delete_own_topics']}</label>
-					<p class='desctext'>{$this->lang->words['hard_delete_info']}</p>
-					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_delete_own_topics']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_delete_own_topics']}
+					<p class='desctext'>{$this->lang->words['hard_delete_info']}</p>
+						<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete']}</label>
-					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
-					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['gbw_soft_delete']}
+					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
+						<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_own']}</label>
-					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
-					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_own']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['gbw_soft_delete_own']}
+					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
+						<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_un_soft_delete']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_un_soft_delete']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_un_soft_delete']}
 					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-				<td>
-		 			{$form['gbw_un_soft_delete']}
-				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_see']}</label>
-					<p class='desctext'>{$this->lang->words['gbw_soft_delete_see_d']}</p>
-					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_see']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['gbw_soft_delete_see']}
+					<p class='desctext'>{$this->lang->words['gbw_soft_delete_see_d']}</p>
+						<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_topic']}</label>
-					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
-					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_topic']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['gbw_soft_delete_topic']}
-				</td>
-		 	</tr>
-		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_own_topic']}</label>
-					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
-				    <span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
-				</td>
-				<td>
-		 			{$form['gbw_soft_delete_own_topic']}
-				</td>
-		 	</tr>
-		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_un_soft_delete_topic']}</label>
 					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-				<td>
-		 			{$form['gbw_un_soft_delete_topic']}
+		 	</tr>
+		 	<tr>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_own_topic']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_soft_delete_own_topic']}
+					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
+			    	<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_topic_see']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_un_soft_delete_topic']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_un_soft_delete_topic']}
+					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
+					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
+				</td>
+		 	</tr>
+		 	<tr>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_topic_see']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_soft_delete_topic_see']}
 					<p class='desctext'>{$this->lang->words['gbw_soft_delete_topic_see_d']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-				<td>
-		 			{$form['gbw_soft_delete_topic_see']}
-				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_reason']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_reason']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_soft_delete_reason']}
 					<p class='desctext'>{$this->lang->words['soft_delete_info']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-				<td>
-		 			{$form['gbw_soft_delete_reason']}
-				</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_bw_soft_delete_see_post']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_bw_soft_delete_see_post']}</strong>
+				</td>
+				<td class='field_field'>
+		 			{$form['gbw_soft_delete_see_post']}
 					<p class='desctext'>{$this->lang->words['gbw_soft_delete_see_post_d']}</p>
 					<span class='desctext'><strong>{$this->lang->words['sup_mod_already']}</strong></span>
 				</td>
-				<td>
-		 			{$form['gbw_soft_delete_see_post']}
-				</td>
 		 	</tr>
 		 	
 			<tr>
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_openclose']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['g_open_close_posts']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['g_open_close_posts']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 		 			{$form['g_open_close_posts']}
 				</td>
 		 	</tr>
 			<tr>
-				<td>
-					<label>{$this->lang->words['gf_post_closed']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_post_closed']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_post_closed']}
 				</td>
 		 	</tr>
@@ -334,40 +363,40 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_polling']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_post_polls']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_post_polls']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_post_polls']}
 				</td>
 		 	</tr>
 		 	
 		 	<tr class='guest_legend'>
-				<td>
-					<label>{$this->lang->words['gf_vote_polls']}</label>
-					{$guest_legend}
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_vote_polls']}</strong>
 				</td>
-				<td>
-					{$form['g_vote_polls']}
+				<td class='field_field'>
+					{$form['g_vote_polls']}<br />
+					{$guest_legend}
 				</td>
 		 	</tr>
 		 	<tr>
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_avoidance']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_avoid_flood']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_avoid_flood']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_avoid_flood']}
 				</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_avoid_q']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_avoid_q']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$form['g_avoid_q']}
 				</td>
 		 	</tr>
@@ -376,22 +405,22 @@ $IPBHTML .= <<<EOF
 				<th colspan='2' class='head'><strong>{$this->lang->words['gf_t_restrictions']}</strong></th>
 			</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_mod_preview']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_mod_preview']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					<p>{$form['g_mod_preview']} &nbsp; {$this->lang->words['g_until']} {$form['g_mod_post_unit']} {$form['gbw_mod_post_unit_type']}</p>
 					<p style='color:gray;font-size:0.8em'>{$this->lang->words['g_limit_dd']}</p>
 				</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>
+		 		<td class='field_title'>
+					<strong class='title'>
 							{$this->lang->words['gf_ppd_limit']}
 						   <p style='color:gray;font-size:0.8em'>{$this->lang->words['g_limit_no']}</p>
-					</label>
+					</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					<p>{$this->lang->words['g_max']} {$form['g_ppd_limit']} {$this->lang->words['g_ppd']} {$form['g_ppd_unit']} {$form['gbw_ppd_unit_type']}</p>
 					<p style='color:gray;font-size:0.8em'>{$this->lang->words['g_limit_dd']}</p>
 				</td>
@@ -408,7 +437,6 @@ return $IPBHTML;
 /**
  * Display forum group form tabs
  *
- * @access	public
  * @param	array 	Group data
  * @param	string	Tab id
  * @return	string	HTML
@@ -418,7 +446,7 @@ public function acp_group_form_tabs( $group, $tabId ) {
 $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
-	<li id='tabtab-GROUPS|{$tabId}' class=''>{$this->lang->words['g_forperm']}</li>
+	<li id='tab_GROUPS_{$tabId}'>{$this->lang->words['g_forperm']}</li>
 EOF;
 
 return $IPBHTML;
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_member_form.php b/upload/admin/applications/forums/skin_cp/cp_skin_member_form.php
index 1c82a5f1..c6752fa9 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_member_form.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_member_form.php
@@ -3,148 +3,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum member form plugin
- * Last Updated: $LastChangedDate: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-01 08:16:37 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 6915 $
+ * @version		$Rev: 9439 $
  */
- 
-class cp_skin_member_form extends output
+
+class cp_skin_member_form
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Display/change avatar
- *
- * @access	public
- * @param	array 	Image data
- * @return	string	HTML
- */
-public function inline_avatar_images( $images=array() )
-{
-$IPBHTML = "";
-
-$IPBHTML .= <<<EOF
-
-		<select name='avatar_image' id='avatar_image' onChange='acp.members.updateAvatarPreview();'>
-			<option value=''>{$this->lang->words['m_selectav']}</option>
-EOF;
-	foreach( $images as $image )
-	{
-		$IPBHTML .= "<option value='{$image}'>{$image}</option>";
-	}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
 	
-	$IPBHTML .= <<<EOF
-		</select>
-EOF;
-
-return $IPBHTML;
-}
-
-
-
-/**
- * Ability to select an avatar from avatar galleries
- *
- * @access	public
- * @param	array 	Member data
- * @param	array 	Avatar gallery categories
- * @return	string	HTML
- */
-public function inline_avatar_selector( $member, $categories=array() )
-{
-$IPBHTML = "";
-
-$default_url = ($member['avatar_type'] == 'url') ? $member['avatar_location'] : '';
-													
-$IPBHTML .= <<<EOF
-<form action='{$this->settings['_base_url']}&amp;app=forums&amp;module=tools&amp;section=tools&amp;do=new_avatar&amp;member_id={$member['member_id']}' method='post' enctype='multipart/form-data'>
-	<div class='acp-box'>
-		<h3>{$this->lang->words['memchangeavatar']}</h3>
-		<div class='row1'>
-			<p class='information-box' style='margin: 6px;'>
-				{$this->lang->words['m_firstfield']}
-			</p>
-		</div>
-		<ul class='acp-form'>
-			<li><h4>{$this->lang->words['m_newav']}</h4></li>
-			<li style='padding-left: 20px'>
-				<input type='file' size='30' style='width: 95%' id='upload_avatar' name='upload_avatar' />
-			</li>
-			<li><h4>{$this->lang->words['m_avurl']}</h4></li>
-			<li>
-				<label for='avatar_url' style='font-weight: normal'>{$this->lang->words['m_avurl_label']}</label>
-				<input type='text' size='30' id='avatar_url' name='avatar_url' value='{$default_url}' />
-			</li>
-EOF;
-			if( $this->settings['disable_ipbsize'] )
-			{
-				list($p_width, $p_height)	= explode( "x", strtolower( $this->settings['avatar_dims'] ) );
-				
-				$IPBHTML .= <<<EOF
-					<li><h4>{$this->lang->words['m_avdimen']}</h4></li>
-					<li>
-						<label for='avatar_url' style='font-weight: normal'>{$this->lang->words['m_avdimen']}</label>
-						{$this->lang->words['m_width']} <input type='text' size='6' id='man_width' name='man_width' value='{$p_width}' /> x {$this->lang->words['m_height']} <input type='text' size='6' id='man_height' name='man_height' value='{$p_height}' />
-					</li>
-EOF;
-			}
-			
-			if( count($categories) )
-			{
-				$IPBHTML .= <<<EOF
-					<li><h4>{$this->lang->words['m_localav']}</h4></li>
-					<li>
-						<div style='float:right;margin-right:4px;margin-top:4px;'>
-							<div style='border:1px solid #000;background:#FFF;width:auto; padding:2px;' id='avatarContainer'></div>
-						</div>
-						
-						<select name='avatar_gallery' id='avatar_gallery'>
-EOF;
-						foreach( $categories as $category )
-						{
-							$IPBHTML .= "<option value='{$category[0]}'>{$category[1]}</option>";
-						}
-						
-				$IPBHTML .= <<<EOF
-						</select>
-						<span style='display:none;' id='avatarGalleryContainer'></span>
-					</li>
-EOF;
-			}
-			
-			$IPBHTML .= <<<EOF
-		</ul>
-		<div class='acp-actionbar' style='clear:both;'><input type='submit' value='{$this->lang->words['m_updateav']}' class='realbutton' /></div>
-	</div>
-</form>
-EOF;
-
-return $IPBHTML;
-}
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Main ACP member form
  *
- * @access	public
  * @param	array 	Member data
  * @return	string	HTML
  */
@@ -163,7 +83,7 @@ while( $data = ipsRegistry::DB()->fetch() )
 $_restrict_tick		= '';
 $_restrict_timespan	= '';
 $_restrict_units	= '';
-$units			= array( 0 => array( 'h', $this->lang->words['m_hours'] ), 1 => array( 'd', $this->lang->words['m_days'] ) );
+$units				= array( 0 => array( 'h', $this->lang->words['m_hours'] ), 1 => array( 'd', $this->lang->words['m_days'] ) );
 
 if ( $member['restrict_post'] == 1 )
 {
@@ -171,29 +91,29 @@ if ( $member['restrict_post'] == 1 )
 }
 elseif ($member['restrict_post'] > 0)
 {
-	$mod_arr = IPSMember::processBanEntry( $member['restrict_post'] );
+	$rest_arr = IPSMember::processBanEntry( $member['restrict_post'] );
 
-	$hours  = ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
+	$hours  = ceil( ( $rest_arr['date_end'] - time() ) / 3600 );
 
 	if( $hours < 0 )
 	{
-		$mod_arr['units']		= '';
-		$mod_arr['timespan']	= '';
+		$rest_arr['units']		= '';
+		$rest_arr['timespan']	= '';
 	}
 	else if ( $hours > 24 and ( ($hours / 24) == ceil($hours / 24) ) )
 	{
-		$mod_arr['units']		= 'd';
-		$mod_arr['timespan']	= $hours / 24;
+		$rest_arr['units']		= 'd';
+		$rest_arr['timespan']	= $hours / 24;
 	}
 	else
 	{
-		$mod_arr['units']		= 'h';
-		$mod_arr['timespan']	= $hours;
+		$rest_arr['units']		= 'h';
+		$rest_arr['timespan']	= $hours;
 	}
 }
 
-$_restrict_timespan		= ipsRegistry::getClass('output')->formSimpleInput('post_timespan', $mod_arr['timespan'] );
-$_restrict_units		= ipsRegistry::getClass('output')->formDropdown('post_units', $units, $mod_arr['units'] );
+$_restrict_timespan		= ipsRegistry::getClass('output')->formSimpleInput('post_timespan', $rest_arr['timespan'] );
+$_restrict_units		= ipsRegistry::getClass('output')->formDropdown('post_units', $units, $rest_arr['units'] );
 
 $_mod_tick		= '';
 $_mod_timespan	= '';
@@ -231,66 +151,38 @@ $_mod_units				= ipsRegistry::getClass('output')->formDropdown('mod_units', $uni
 
 $form_override_masks	= ipsRegistry::getClass('output')->formMultiDropdown( "org_perm_id[]", $masks, explode( ",", $member['org_perm_id'] ), 8, 'org_perm_id' );
 $form_posts				= ipsRegistry::getClass('output')->formInput( "posts", $member['posts'] );
-$form_view_avs			= ipsRegistry::getClass('output')->formYesNo( "view_avs", $member['view_avs'] );
-$form_view_img			= ipsRegistry::getClass('output')->formYesNo( "view_img", $member['view_img'] );
 
 $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 	
-	<div class='tablerow1' id='tabpane-MEMBERS|{$tabID}'>
-		<table class='alternate_rows double_pad' cellspacing='0'>
+	<div id='tab_MEMBERS_{$tabID}_content'>
+		<table class='ipsTable double_pad'>
 			
 			<tr>
 				<th colspan='2'>{$this->lang->words['sm_settings']}</th>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['strong_avatar_label']}</strong></td>
-				<td>
-					{$member['_avatar']}
-					<br /><br />
-					<input type='button' class='button' id='MF__avatarremove' value='{$this->lang->words['mem_remove_avatar']}' />
-					<input type='button' class='button' id='MF__avatarchange' value='{$this->lang->words['m_changeav']}' />
-					
-					<script type='text/javascript'>
-						$('MF__avatarremove').observe('click', acp.members.removeAvatar.bindAsEventListener( this, {$member['member_id']} ) );
-						$('MF__avatarchange').observe('click', acp.members.changeAvatar.bindAsEventListener( this, "app=forums&amp;module=ajax&amp;section=member_editform&amp;do=show&amp;name=inline_avatar&amp;member_id={$member['member_id']}" ) );
-					</script>
-				</td>
-			</tr>
-			<tr>
-				<td><strong>{$this->lang->words['mem_posts']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['mem_posts']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__posts'>{$form_posts}</span>
 				</td>
 			</tr>
-			<tr>
-				<td><strong>{$this->lang->words['m_viewavs']}</strong></td>
-				<td>
-					<span id='MF__view_avs'>{$form_view_avs}</span>
-				</td>
-			</tr>
-			<tr>
-				<td><strong>{$this->lang->words['m_viewimgs']}</strong></td>
-				<td>
-					<span id='MF__view_img'>{$form_view_img}</span>
-				</td>
-			</tr>
 		</table>
 	
-		<table class='alternate_rows double_pad' cellspacing='0'>
+		<table class='ipsTable double_pad'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['sm_access']}</th>
 			</tr>
 			<tr>
-				<td style='width: 35%'><strong>{$this->lang->words['m_overrride']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['m_overrride']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__ogpm'>{$form_override_masks}</span>
 				</td>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['m_modprev']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['m_modprev']}</strong></td>
+				<td class='field_field'>
 					<input type='checkbox' name='mod_indef' id='mod_indef' value='1' {$_mod_tick}> {$this->lang->words['m_modindef']}
 					<br />
 					{$this->lang->words['m_orfor']}
@@ -298,8 +190,8 @@ $IPBHTML .= <<<EOF
 				</td>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['m_restrict']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['m_restrict']}</strong></td>
+				<td class='field_field'>
 					<input type='checkbox' name='post_indef' id='post_indef' value='1' {$_restrict_tick}> {$this->lang->words['m_restrictindef']}
 					<br />
 					{$this->lang->words['m_orfor']}
@@ -317,7 +209,6 @@ return $IPBHTML;
 /**
  * Forums member tabs
  *
- * @access	public
  * @param	array 	Member data
  * @return	string	HTML
  */
@@ -326,7 +217,7 @@ public function acp_member_form_tabs( $member, $tabID ) {
 $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
-	<li id='tabtab-MEMBERS|{$tabID}' class=''>{$this->lang->words['m_details']}</li>
+	<li id='tab_MEMBERS_{$tabID}'>{$this->lang->words['m_details']}</li>
 EOF;
 
 return $IPBHTML;
@@ -335,7 +226,6 @@ return $IPBHTML;
 /**
  * Delete posts confirmation page
  *
- * @access	public
  * @param	array 	Member data
  * @param	integer	Number of topics
  * @param	integer	Number of posts
@@ -349,27 +239,23 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=deleteposts_process&amp;member_id={$member['member_id']}' method='POST'>
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['mem_delete_posts_title']} {$member['members_display_name']}</div>
- <table cellpadding='0' cellspacing='0' width='100%'>
+<div class='acp-box'>
+ <h3>{$this->lang->words['mem_delete_posts_title']} {$member['members_display_name']}</h3>
+ <table class='ipsTable'>
  <tr>
-  <td class='tablerow1' width='90%'><strong>{$this->lang->words['mem_delete_delete_posts']}</strong><div class='desctext'>{$this->lang->words['mem_delete_delete_posts_desc']}</div></td>
-  <td class='tablerow2' width='10%'><input type='checkbox' value='1' name='dposts' /></td>
+  <td class='field_title'><strong class='title'>{$this->lang->words['mem_delete_delete_posts']}</strong></td>
+  <td class='field_field'><input type='checkbox' value='1' name='dposts' class='input_text' /><br /><span class='desctext'>{$this->lang->words['mem_delete_delete_posts_desc']}</span></td>
  </tr>
  <tr>
-  <td class='tablerow1' width='90%'><strong>{$this->lang->words['mem_delete_delete_topics']}</strong><div class='desctext'>{$this->lang->words['mem_delete_delete_topics_desc']}</div></td>
-  <td class='tablerow2' width='10%'><input type='checkbox' value='1' name='dtopics' /></td>
+  <td class='field_title'><strong class='title'>{$this->lang->words['mem_delete_delete_topics']}</strong></td>
+  <td class='field_field'><input type='checkbox' value='1' name='dtopics' class='input_text' /><br /><span class='desctext'>{$this->lang->words['mem_delete_delete_topics_desc']}</span></td>
  </tr>
  <tr>
-  <td class='tablerow1' width='90%'><strong>{$this->lang->words['mem_delete_posts_trash']}</strong><div class='desctext'>{$this->lang->words['mem_delete_posts_trash_desc']}</div></td>
-  <td class='tablerow2' width='10%'><input type='checkbox' value='1' name='use_trash_can' /></td>
- </tr> 
- <tr>
-  <td class='tablerow1' width='90%'><strong>{$this->lang->words['mem_delete_delete_pergo']}</strong><div class='desctext'>{$this->lang->words['mem_delete_delete_pergo_desc']}</div></td>
-  <td class='tablerow2' width='10%'><input type='input' value='50' size='3' name='dpergo' /></td>
+  <td class='field_title'><strong class='title'>{$this->lang->words['mem_delete_delete_pergo']}</strong></td>
+  <td class='field_field'><input type='input' value='50' size='3' name='dpergo' class='input_text' /><br /><span class='desctext'>{$this->lang->words['mem_delete_delete_pergo_desc']}</span></td>
  </tr>
  </table>
- <div align='center' class='tablefooter'><input type='submit' class='realbutton' value='{$this->lang->words['mem_delete_process']}' /></div>
+ <div class='acp-actionbar'><input type='submit' class='button primary' value='{$this->lang->words['mem_delete_process']}' /></div>
 </div>
 </form>
 EOF;
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_multimods.php b/upload/admin/applications/forums/skin_cp/cp_skin_multimods.php
index e2f672f6..6f8b4199 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_multimods.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_multimods.php
@@ -3,38 +3,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Multimods skin functions
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8644 $
  */
  
-class cp_skin_multimods extends output
+class cp_skin_multimods
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Form to add/edit multimods
  *
- * @access	public
  * @param	integer	MM ID
  * @param	string	Action
  * @param	string	Description
@@ -60,76 +90,124 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['mm_title']}</h3>
 
-		<ul class="acp-form alternate_rows">
-			<li><label class='head'>{$description}</label>
-			<li>
-				<label>{$this->lang->words['mm_titlefor']}</label>
-				{$form['mm_title']}
-			</li>
+		<table class="ipsTable double_pad">
+				<tr>
+					<th colspan='2'>{$description}</th>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_titlefor']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['mm_title']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_activein']}<span class='desctext'>{$this->lang->words['mm_activein_desc']}</span></label>				
-				{$form['forums']}
-			</tr>
-			
-			<li>
-				<label class='head'>{$this->lang->words['mm_modoptions']}</label>				
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_activein']}</strong>
+					</td>
+					<td class='field_field'>				
+						{$form['forums']}<br />
+						<span class='desctext'>{$this->lang->words['mm_activein_desc']}</span>
+					</td>
+				</tr>
+				
+				<tr>
+					<th colspan='2'>{$this->lang->words['mm_modoptions']}</th>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_start']}</label>
- 				{$form['topic_title_st']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_start']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_title_st']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_end']}</label>
-				{$form['topic_title_end']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_end']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_title_end']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_state']}</label>
-				{$form['topic_state']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_state']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_state']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_pinned']}</label>
-				{$form['topic_pin']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_pinned']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_pin']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_approved']}</label>
-				{$form['topic_approve']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_approved']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_approve']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_move']}</label>
-				{$form['topic_move']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['mm_link']}</label>
-				{$form['topic_move_link']}
-			</li>
-			
-			<li><label class='head'>{$this->lang->words['mm_postoptions']}</label></li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_move']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_move']}
+					</td>
+				</tr>
 
-			<li>
-				<label>{$this->lang->words['mm_addreply']}<span class='desctext'>{$this->lang->words['mm_addreply_desc']}</span></label>				
-				{$form['topic_reply']}<br />
-				{$form['topic_reply_content']}			
-			</li>	
-			
-			<li>
-				<label>{$this->lang->words['mm_postcount']}</label>
-				{$form['topic_reply_postcount']}
-			</li>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_link']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_move_link']}
+					</td>
+				</tr>
+				
+				<tr>
+					<th colspan='2'>{$this->lang->words['mm_postoptions']}</th>
+				</tr>
+
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_addreply']}</strong>
+					</td>
+					<td class='field_field'>				
+						{$form['topic_reply']}<br /><br />
+						{$form['topic_reply_content']}<br />
+						<span class='desctext'>{$this->lang->words['mm_addreply_desc']}</span>
+					</td>
+				</tr>	
+
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mm_postcount']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['topic_reply_postcount']}
+					</td>
+				</tr>
 		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$button}' class='button primary' accesskey='s'>
-			</div>
-		</div>		
+			<input type='submit' value='{$button}' class='button primary' accesskey='s'>
+		</div>
 	</div>
 </form>
 HTML;
@@ -141,7 +219,6 @@ return $IPBHTML;
 /**
  * Show multimod overview page
  *
- * @access	public
  * @param	array 	MM Rows
  * @return	string	HTML
  */
@@ -156,7 +233,7 @@ $IPBHTML .= <<<HTML
 	<ul class='context_menu'>
 		<li>
 			<a href='{$this->settings['base_url']}{$this->form_code}do=new' title='{$this->lang->words['mm_addnew']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/lightning_add.png' alt='' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/lightning_add.png' alt='' />
 				{$this->lang->words['mm_addnew']}
 			</a>
 		</li>
@@ -166,17 +243,21 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['mm_current']}</h3>
 
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<th width='95%'>{$this->lang->words['mm_wordtitle']}</th>
-			<th width='5%'>{$this->lang->words['a_options']}</th>
+			<th>{$this->lang->words['mm_wordtitle']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 HTML;
 
 if( ! count( $rows ) )
 {
 $IPBHTML .= <<<HTML
-		<tr><td colspan='3'><center>{$this->lang->words['mm_none']}</center></td></tr>
+		<tr>
+			<td colspan='3' class='no_messages'>
+				{$this->lang->words['mm_none']} <a href='{$this->settings['base_url']}{$this->form_code}do=new' title='{$this->lang->words['mm_addnew']}' class='mini_button'>{$this->lang->words['mm_createnow']}</a>
+			</td>
+		</tr>
 HTML;
 }
 else
@@ -184,13 +265,12 @@ else
 	foreach( $rows as $r )
 	{
 $IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
 			<td><strong>{$r['mm_title']}</strong></td>
 			<td>
-				<img class='ipbmenu' id="menu{$r['mm_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-				<ul class='acp-menu' id='menu{$r['mm_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['mm_id']}'>{$this->lang->words['mm_wordedit']}</a></li>
-					<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}do=delete&amp;id={$r['mm_id']}'>{$this->lang->words['mm_remove']}</a></li>
+				<ul id='menu{$r['mm_id']}_menucontent' class='ipsControlStrip'>
+					<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['mm_id']}' title='{$this->lang->words['mm_wordedit']}'>{$this->lang->words['mm_wordedit']}</a></li>
+					<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}do=delete&amp;id={$r['mm_id']}");' title='{$this->lang->words['mm_remove']}'>{$this->lang->words['mm_remove']}</a></li>
 				</ul>
 			</td>
 		</tr>
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_permissions.php b/upload/admin/applications/forums/skin_cp/cp_skin_permissions.php
deleted file mode 100644
index 48c8ddfe..00000000
--- a/upload/admin/applications/forums/skin_cp/cp_skin_permissions.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Permissions masks skin functions
- * Last Updated: $LastChangedDate: 2010-09-13 17:28:12 -0400 (Mon, 13 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		14th May 2003
- * @version		$Rev: 6863 $
- */
- 
-class cp_skin_permissions extends output
-{
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Preview forum permissions
- *
- * @access	public
- * @param	integer	Mask id
- * @param	string	Mask title
- * @param	string	HTML for type dropdown
- * @param	array 	Forum rows
- * @param	string	Type human-understandable text
- * @return	string	HTML
- */
-public function previewForumPermissions( $id, $title, $type_drop, $rows, $human_type )
-{
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='tableborder'>
-	<div class='tableheaderalt'>{$this->lang->words['per_preview']}{$title}</div>
-
-	<table width='100%' align='center'>
-		<tr>
-			<td class='tablesubheader' width='100%' align='center' colspan='2'>{$human_type}</td>
-		</tr>
-		
-		<tr>
-			<td class='tablerow1'  width='100%'  valign='middle'>
-HTML;
-
-foreach( $rows as $r )
-{
-$IPBHTML .= <<<HTML
-				<span style='{$r['css']}'>{$r['name']}</span><br />
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-			</td>
-		</tr>
-	</table>
-</div><br />
-
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
-	<input type='hidden' name='do' value='preview_forums' />
-	<input type='hidden' name='id' value='{$id}' />
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	
-	<div class='tableborder'>
-		<div class='tableheaderalt'>{$this->lang->words['per_legend']}</div>
-
-		<table width='100%' align='center'>
-			<tr>
-				<td class='tablerow1' width='60%' valign='middle'>{$this->lang->words['per_can']}{$human_type}</td>
-				<td class='tablerow2' width='40%' valign='middle'><input type='text' readonly='readonly' style='border:1px solid black;background-color:green;size=30px' name='blah'></td>
-			</tr>
-			<tr>
-				<td class='tablerow1' width='60%' valign='middle'>{$this->lang->words['per_cannot']}{$human_type}</td>
-				<td class='tablerow2' width='40%' valign='middle'><input type='text' readonly='readonly' style='border:1px solid gray;background-color:red;size=30px' name='blah'></td>
-			</tr>
-			<tr>
-				<td class='tablerow1' width='60%' valign='middle'>{$this->lang->words['per_category']}</td>
-				<td class='tablerow2' width='40%' valign='middle'><input type='text' readonly='readonly' style='border:1px solid gray;background-color:grey;size=30px' name='blah'></td>
-			</tr>
-			<tr>
-				<td class='tablerow1' width='60%' valign='middle'>{$this->lang->words['per_testwith']}</td>
-				<td class='tablerow2' width='40%' valign='middle'>{$type_drop}</select>
-				</td>
-			</tr>
-			<tr>
-				<td align='center' class='tablesubheader' colspan='2' ><input type='submit' value='{$this->lang->words['per_updatebutton']}' class='realbutton' accesskey='s'></td>			
-			</tr>
-		</table>
-	</div>
-</form>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Permissions editor
- *
- * @access	public
- * @param	integer	Mask id
- * @param	string	Mask title
- * @param	array 	Rows
- * @return	string	HTML
- */
-public function permissionsForum( $id, $title, $rows ){
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['per_title_edit']}</h2>
-</div>
-
-<!-- RENAME PERMISSION SET -->
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='nameForm'  id='nameForm'>
-	<input type='hidden' name='do' value='donameedit' />
-	<input type='hidden' name='id' value='{$id}' />
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	
-	<div class='tableborder'>
-		<div class='tableheaderalt'>{$this->lang->words['per_rename']}{$title}</div>
-	
-		<table width='100%' align='center'>
-			<tr>
-				<td class='tablerow1'  width='40%'  valign='middle'>{$this->lang->words['per_setname']}</td>
-				<td class='tablerow2'  width='60%'  valign='middle'><input type='text' name='perm_name' id='perm_name' value='{$title}' size='30' class='textinput' /></td>
-			</tr>
-			<tr>
-				<td align='center' class='tablesubheader' colspan='2' ><input type='submit' value='{$this->lang->words['per_editbutton']}' class='realbutton' accesskey='s'></td>
-			</tr>
-		</table>
-	</div>
-</form>	
-<br />
-<!-- / RENAME PERMISSION SET -->
-<!-- PERMISSION MATRIX -->
-<form action='{$this->settings['base_url']}{$this->form_code}' method='post' name='theAdminForm'  id='theAdminForm'>
-	<input type='hidden' name='do' value='dofedit' />
-	<input type='hidden' name='id' value='{$id}' />
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	
-	<div class='tableborder'>
-		<div class='tableheaderalt'>{$this->lang->words['forumpermsfor']} {$title}</div>
-
-		<table width='100%' align='center'>
-			<tr>
-				<td class='tablesubheader' width='25%' align='center'>{$this->lang->words['per_forumname']}</td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_show_c']}<br /><input id='show' type='checkbox' onclick='checkcol("show", this.checked );' /></td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_read_c']}<br /><input id='read' type='checkbox' onclick='checkcol("read", this.checked );' /></td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_reply_c']}<br /><input id='reply' type='checkbox' onclick='checkcol("reply", this.checked );' /></td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_start_c']}<br /><input id='start' type='checkbox' onclick='checkcol("start", this.checked );' /></td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_upload_c']}<br /><input id='upload' type='checkbox' onclick='checkcol("upload", this.checked );' /></td>
-				<td class='tablesubheader' width='10%' align='center'>{$this->lang->words['per_download_c']}<br /><input id='download' type='checkbox' onclick='checkcol("download", this.checked );' /></td>
-			</tr>
-HTML;
-
-foreach( $rows as $r )
-{
-$IPBHTML .= <<<HTML
-			<tr>
-				<td class='{$r['css']}' width='25%' valign='middle'>
-					<div style='float:right;width:auto;'>
-						<input type='button' id='button' value='+' onclick='checkrow( {$r['id']},true )' />&nbsp;
-						<input type='button' id='button' value='-' onclick='checkrow( {$r['id']},false )' />
-					</div>
-					<b>{$r['depthed_name']}</b>					
-				</td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#ecd5d8; padding:4px;'>{$this->_permission_check_box( $r['id'], 'view', $r['_perms'] )}</td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#dbe2de; padding:4px;'>{$this->_permission_check_box( $r['id'], 'read', $r['_perms'] )}</div></td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#dbe6ea; padding:4px;'>{$this->_permission_check_box( $r['id'], 'reply', $r['_perms'] )}</div></td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#d2d5f2; padding:4px;'>{$this->_permission_check_box( $r['id'], 'start', $r['_perms'] )}</div></td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#ece6d8; padding:4px;'>{$this->_permission_check_box( $r['id'], 'upload', $r['_perms'] )}</div></td>
-				<td class='{$r['css']}' width='10%' valign='middle'><div style='background-color:#dfdee9; padding:4px;'>{$this->_permission_check_box( $r['id'], 'download', $r['_perms'] )}</div></td>
-			</tr>
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-			<tr>
-				<td align='center' class='tablesubheader' colspan='7' ><input type='submit' value='{$this->lang->words['per_updatebutton']}' class='realbutton' accesskey='s'></td>				
-			</tr>
-		</table>		
-	</div>
-</form>
-<!-- / PERMISSION MATRIX -->
-
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Check box generator helper
- *
- * @access	private
- * @param	integer	Mask id
- * @param	array 	Mask data
- * @param	array 	Current selections
- * @return	string	HTML
- */
-private function _permission_check_box( $id, $perm, $r )
-{
-$IPBHTML = "";
-//--starthtml--//
-
-if( in_array( $r[ $perm ], array( $this->lang->words['per_global'], $this->lang->words['per_notused'] ) ) )
-{
-$IPBHTML .= <<<HTML
-<center><i>{$r[$perm]}</i></center>
-HTML;
-}
-else if( $r[ $perm ] == 'checked' )
-{
-$IPBHTML .= <<<HTML
-<center><input type='checkbox' name='{$perm}[{$id}]' id='{$perm}_{$id}' onclick="obj_checked('{$perm}', {$id} );" value='1' checked></center>
-HTML;
-}
-else
-{
-$IPBHTML .= <<<HTML
-<center><input type='checkbox' name='{$perm}[{$id}]' id='{$perm}_{$id}' onclick="obj_checked('{$perm}', {$id} );" value='1'></center>
-HTML;
-}
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Perm mask splash page
- *
- * @access	public
- * @param	array 	Mask rows
- * @param	string	Dropdown list
- * @return	string	HTML
- */
-public function permissionsSplash( $rows, $dlist ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['per_title']}</h2>
-</div>
-
-<div class='tableborder'>
-	<div class='tableheaderalt'>{$this->lang->words['per_setname']}</div>
-	
-	<table cellpadding='4' cellspacing='0' width='100%'>
-		<tr>
-			<td class='tablesubheader' width='20%'>{$this->lang->words['per_name']}</td>
-			<td class='tablesubheader' width='15%'>{$this->lang->words['per_usedgroups']}</td>
-			<td class='tablesubheader' width='20%' align='center'>{$this->lang->words['per_usedmembers']}</td>
-			<td class='tablesubheader' width='1%'>&nbsp;</td>
-		</tr>
-HTML;
-
-/* ROW */
-foreach( $rows as $r )
-{
-$IPBHTML .= <<<HTML
-<tr>
-  <td class='tablerow2'><strong>{$r['name']}</strong></td>
-  <td class='tablerow1'>{$r['groups']}</td>
-  <td class='tablerow1' align='center'>
-HTML;
-if ( $r['mems'] > 0 )
-{
-$IPBHTML .= <<<HTML
-{$r['mems']} (<a href='#' onclick='return acp.openWindow("{$this->settings['base_url']}{$this->form_code_js}do=view_perm_users&amp;id={$r['id']}", "{$this->lang->words['per_user']}", "500","350");' title='{$this->lang->words['per_viewnames']}'>{$this->lang->words['per_view']}</a>)
-HTML;
-}
-else
-{
-$IPBHTML .= <<<HTML
-{$this->lang->words['per_nomember']}
-HTML;
-}
-$IPBHTML .= <<<HTML
-  </td>															
-  <td class='tablerow1' align='center'>
-  	<img id="menu{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['per_options']}' class='ipbmenu' />
-	<ul class='acp-menu' id='menu{$r['id']}_menucontent'>
-		<li class='icon view'><a href='#' onclick='return acp.openWindow(\"{$this->settings['base_url']}{$this->form_code_js}do=preview_forums&amp;id={$r['id']}&amp;t=read\", \"{$this->lang->words['per_preview']}\", \"400\",\"350\");' title='{$this->lang->words['per_previewtext']}'>{$this->lang->words['per_previewset']}</a></li>
-		<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=fedit&amp;id={$r['id']}'>{$this->lang->words['per_editset']}</a></li>
-HTML;
-
-	if ( ! $r['isactive'] )
-	{
-$IPBHTML .= <<<HTML
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=pdelete&amp;id={$r['id']}");'>{$this->lang->words['per_deleteset']}</a></li>
-HTML;
-	}
-	else
-	{
-$IPBHTML .= <<<HTML
-		<li class='icon delete'>{$this->lang->words['per_inuse']}</li>
-HTML;
-	}
-$IPBHTML .= <<<HTML
-	</ul>
-  </td>
-</tr>
-HTML;
-}
-/* / ROW */
-
-$IPBHTML .= <<<HTML
-	</table>
-</div>
-<br />
-<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}{$this->form_code}&amp;do=dopermadd' method='post'>
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	
-	<div class='tableborder'>
-		<div class='tableheaderalt'>{$this->lang->words['per_createnew']}</div>
-		
-		<table cellpadding='4' cellspacing='0' width='100%'>
-			<tr>
-				<td class='tablerow1'>{$this->lang->words['per_setname']}</td>
-				<td class='tablerow2'><input type='text' class='input' size='30' name='new_perm_name' /></td>
-			</tr>
-			<tr>
-				<td class='tablerow1'>{$this->lang->words['per_baseon']}</td>
-				<td class='tablerow2'><select name='new_perm_copy' class='dropdown'>{$dlist}</select></td>
-			</tr>
-		</table>
-		
-		<div class='tablefooter' align='center'><input type='submit' value='{$this->lang->words['per_createbutton']}' class='realbutton' /></div>
-	</div>
-</form>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_rss.php b/upload/admin/applications/forums/skin_cp/cp_skin_rss.php
index 8ba32dd9..dd63496a 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_rss.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_rss.php
@@ -3,37 +3,68 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS skin functions
- * Last Updated: $LastChangedDate: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-01 17:55:10 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 6326 $
+ * @version		$Rev: 9441 $
  */
  
-class cp_skin_rss extends output {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
+class cp_skin_rss
 {
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Export overview page
  *
- * @access	public
  * @param	string	Rows html
  * @param	string	Page links
  * @return	string	HTML
@@ -46,10 +77,16 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['ex_title']}</h2>
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssexport_add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' />{$this->lang->words['rss_ex_create']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssexport_recache&amp;rss_export_id=all'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_refresh.png' alt='' />{$this->lang->words['rss_ex_update']}</a></li>
-	</ul>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' />{$this->lang->words['rss_ex_create']}</a>
+			</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_recache&amp;rss_export_id=all'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' />{$this->lang->words['rss_ex_update']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 HTML;
@@ -58,7 +95,6 @@ if( $page_links != "" )
 {
 	$IPBHTML .= <<<HTML
 	{$page_links}
-	<br style='clear: both' />
 HTML;
 }
 
@@ -66,33 +102,58 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['rss_ex_streams']}</h3>
 	
-	<table class='alternate_rows double_pad' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<th width='90%'>{$this->lang->words['rss_title']}</th>
-			<th width='5%' align='center'>{$this->lang->words['rss_enabled']}</th>
-			<th width='5%' align='right'>&nbsp;</th>
+			<th style='width: 15px'>&nbsp;</th>
+			<th style='width: 50px'>&nbsp;</th>
+			<th width='85%'>{$this->lang->words['rss_title']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 HTML;
 
-foreach( $content as $data )
+if( count( $content ) )
 {
+	foreach( $content as $data )
+	{
+		$badge = ( $data['rss_export_enabled'] ) ? "<span class='ipsBadge badge_green'>{$this->lang->words['enabled']}</span>" : "<span class='ipsBadge badge_red'>{$this->lang->words['disabled']}</span>";
+		
 $IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
 			<td>
-				<a target='_blank' href='{$this->settings['board_url']}/index.php?app=core&amp;module=global&amp;section=rss&amp;type=forums&amp;id={$data['rss_export_id']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/feed.png' alt='RSS' style='vertical-align:top' /></a>
-				<strong>{$data['rss_export_title']}</strong>
+				<a target='_blank' href='{$this->settings['board_url']}/index.php?app=core&amp;module=global&amp;section=rss&amp;type=forums&amp;id={$data['rss_export_id']}'><img src='{$this->settings['skin_acp_url']}/images/icons/feed.png' alt='RSS' /></a>
 			</td>
-			<td align='center'><img src='{$this->settings['skin_acp_url']}/images/{$data['_enabled_img']}' alt='YN' /></td>
-			<td align='right'>
-				<img id="menu{$data['rss_export_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['rss_']}' class='ipbmenu' />
-				<ul class='acp-menu' id='menu{$data['rss_export_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssexport_edit&amp;rss_export_id={$data['rss_export_id']}'>{$this->lang->words['rss_ex_edit']}</a></li>
-					<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssexport_delete&amp;rss_export_id={$data['rss_export_id']}");'>{$this->lang->words['rss_ex_delete']}</a></li>
-					<li class='icon refresh'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssexport_recache&amp;rss_export_id={$data['rss_export_id']}'>{$this->lang->words['rss_ex_recache']}</a></li>
+			<td>
+				{$badge}
+			</td>
+			<td>
+				<strong class='larger_text'>{$data['rss_export_title']}</strong>
+			</td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_refresh'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_recache&amp;rss_export_id={$data['rss_export_id']}'>{$this->lang->words['rss_ex_recache']}</a>
+					</li>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_edit&amp;rss_export_id={$data['rss_export_id']}'>{$this->lang->words['rss_ex_edit']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_delete&amp;rss_export_id={$data['rss_export_id']}");'>{$this->lang->words['rss_ex_delete']}</a>
+					</li>
 				</ul>
 			</td>
 		</tr>
 
+HTML;
+	}
+}
+else
+{
+	$IPBHTML .= <<<HTML
+		<tr>
+			<td colspan='3' class='no_messages'>
+				{$this->lang->words['ex_none']} <a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssexport_add' class='mini_button'>{$this->lang->words['ex_createone']}</a>
+			</td>
+		</tr>
 HTML;
 }
 
@@ -118,7 +179,6 @@ return $IPBHTML;
 /**
  * Export form
  *
- * @access	public
  * @param	array 	Form fields
  * @param	string	Title
  * @param	string	Action code
@@ -142,54 +202,96 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>$title</h3>
 		
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['rss_ex_title']}</label>
-				{$form['rss_export_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_desc']}</label>
-				{$form['rss_export_desc']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_img']}<span class='desctext'>{$this->lang->words['rss_ex_img_info']}</span></label>
-				{$form['rss_export_image']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_enabled']}</label>
-				{$form['rss_export_enabled']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_firstpost']}</label>
-				{$form['rss_export_include_post']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_numitem']}<span class='desctext'>{$this->lang->words['rss_ex_numitem_info']}</span></label>
-				{$form['rss_export_count']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_order']}</label>
-				{$form['rss_export_order']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_sort']}</label>
-				{$form['rss_export_sort']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_forums']}<span class='desctext'>{$this->lang->words['rss_ex_forums_info']}</span></label>
-				<td width='60%' class='tablerow2'>{$form['rss_export_forums']}</td>
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_ex_cache']}<span class='desctext'>{$this->lang->words['rss_ex_cache_info']}</span></label>
-				{$form['rss_export_cache_time']}
-			</li>
-		</ul>
+		<table class="ipsTable double_pad">
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_desc']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_desc']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_img']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_image']}<br />
+					<span class='desctext'>{$this->lang->words['rss_ex_img_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_enabled']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_enabled']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_firstpost']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_include_post']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_numitem']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_count']}<br />
+					<span class='desctext'>{$this->lang->words['rss_ex_numitem_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_order']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_order']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_sort']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_sort']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_forums']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_forums']}<br />
+					<span class='desctext'>{$this->lang->words['rss_ex_forums_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_ex_cache']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_export_cache_time']}<br />
+					<span class='desctext'>{$this->lang->words['rss_ex_cache_info']}</span>
+				</td>
+			</tr>
+		</table>
 	</div>
 	
 	<div class='acp-actionbar'>
-		<div class='rightaction'>
-			<input type='submit' class='button primary' value='{$button}' />
-		</div>
+		<input type='submit' class='button primary' value='{$button}' />
 	</div>
 </form>
 HTML;
@@ -201,7 +303,6 @@ return $IPBHTML;
 /**
  * Splash page for removing imported items
  *
- * @access	public
  * @param	array 	RSS Record
  * @param	integer	Remove article count
  * @return	string	HTML
@@ -222,20 +323,23 @@ $IPBHTML .= <<<HTML
 	
 	<div class='acp-box'>
 		<h3>{$this->lang->words['rss_im_removetopics']} {$rssstream['rss_import_title']}</h3>
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$article_count_text}</label>
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_removelast']}<span class='desctext'>{$this->lang->words['rss_im_blankall']}</span></label>
-				<input type='text' name='remove_count' value='10' />
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<th colspan='2'>{$article_count_text}</th>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_removelast']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='text' name='remove_count' value='10' /><br />
+					<span class='desctext'>{$this->lang->words['rss_im_blankall']}</span>
+				</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='rightaction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['rss_im_removenoconf']}' />
-			</div>
+			<input type='submit' class='button primary' value='{$this->lang->words['rss_im_removenoconf']}' />
 		</div>		
 	</div>
 </form>
@@ -248,7 +352,6 @@ return $IPBHTML;
 /**
  * RSS Import form
  *
- * @access	public
  * @param	array 	Form fields
  * @param	string	Title
  * @param	string	Action code
@@ -274,98 +377,173 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li><label class='head'>{$this->lang->words['rss_im_basics']}</label></li>
-						
-			<li>
-				<label>{$this->lang->words['rss_im_title']}</label>
-				{$form['rss_import_title']}
-	 		</li>
-			<li>
-				<label>{$this->lang->words['rss_im_url']}<span class='desctext'>{$this->lang->words['rss_im_url_info']}</span></label>
-				{$form['rss_import_url']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_charset']}<span class='desctext'>{$this->lang->words['rss_im_charset_info']}</span></label>
-				{$form['rss_import_charset']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_enabled']}</label>
-				{$form['rss_import_enabled']}
-			</li>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<th colspan='2'>{$this->lang->words['rss_im_basics']}</th>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_title']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_title']}
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_url']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_url']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_url_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_enabled']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_enabled']}
+				</td>
+			</tr>
 
-			<li><label class='head'>{$this->lang->words['rss_im_htaccess']}</label></li>
+			<tr>
+				<th colspan='2'>{$this->lang->words['rss_im_htaccess']}</th>
+			</tr>
 	
-			<li>
-				<label>{$this->lang->words['rss_im_ht_require']}<span class='desctext'>{$this->lang->words['rss_im_ht_info']}</span></label>
-				{$form['rss_import_auth']}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_ht_require']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_auth']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_ht_info']}</span>
+				</td>
+			</tr>
 			
-			<span id='rss_import_auth_userinfo' {$form['rss_div_show']}>
-				<li>
-					<label>{$this->lang->words['rss_im_ht_user']}</label>
+			<tr id='rss_import_auth_userinfo_1' style='display: none'>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_ht_user']}</strong>
+				</td>
+				<td class='field_field'>
 					{$form['rss_import_auth_user']}
-				</li>
-				
-				<li>
-					<label>{$this->lang->words['rss_im_ht_pass']}</label>
+				</td>
+			</tr>
+
+			<tr id='rss_import_auth_userinfo_2' style='display: none'>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_ht_pass']}</strong>
+				</td>
+				<td class='field_field'>
 					{$form['rss_import_auth_pass']}
-				</li>
-			</span>
+				</td>
+			</tr>
 
-			<li><label class='head'>{$this->lang->words['rss_im_content']}</label></li>
+			<tr>
+				<th colspan='2'>{$this->lang->words['rss_im_content']}</th>
+			</tr>
 						
-			<li>
-				<label>{$this->lang->words['rss_im_forum']}<span class='desctext'>{$this->lang->words['rss_im_forum_info']}</span></label>
-				{$form['rss_import_forum_id']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_html']}<span class='desctext'>{$this->lang->words['rss_im_html_info']}</span></label>
-				{$form['rss_import_allow_html']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_poster']}<span class='desctext'>{$this->lang->words['rss_im_poster_info']}</span></label>
-				{$form['rss_import_mid']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_incpost']}<span class='desctext'>{$this->lang->words['rss_im_incpost_info']}</span></label>
-				{$form['rss_import_inc_pcount']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_link']}<span class='desctext'>{$this->lang->words['rss_im_link_info']}</span></label>
-				{$form['rss_import_showlink']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_open']}<span class='desctext'>{$this->lang->words['rss_im_open_info']}</span></label>
-				{$form['rss_import_topic_open']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_hidden']}<span class='desctext'>{$this->lang->words['rss_im_hidden_info']}</span></label>
-				{$form['rss_import_topic_hide']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rss_im_prefix']}<span class='desctext'>{$this->lang->words['rss_im_prefix_info']}</span></label>
-				{$form['rss_import_topic_pre']}
-			</li>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_forum']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_forum_id']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_forum_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_html']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_allow_html']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_html_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_poster']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_mid']}<br /> <br />
+					<span class='desctext'>{$this->lang->words['rss_im_poster_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_incpost']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_inc_pcount']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_incpost_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_link']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_showlink']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_link_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_open']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_topic_open']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_open_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_hidden']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_topic_hide']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_hidden_info']}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_prefix']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_topic_pre']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_prefix_info']}</span>
+				</td>
+			</tr>
 
-  			<li><label class='head'>{$this->lang->words['rss_im_settings']}</label></li>
+  			<tr>
+				<th colspan='2'>{$this->lang->words['rss_im_settings']}</th>
+			</tr>
 						
-			<li>
-				<label>{$this->lang->words['rss_im_pergo']}<span class='desctext'>{$this->lang->words['rss_im_pergo_info']}</span></label>
-				{$form['rss_import_pergo']}
-			</li>
-			
-			<li>
-				<label>{$this->lang->words['rss_im_refresh']}<span class='desctext'>{$this->lang->words['rss_im_refresh_info']}</span></label>
-				{$form['rss_import_time']}
-			</li>
-		</ul>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_pergo']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_pergo']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_pergo_info']}</span>
+				</td>
+			</tr>
+
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_refresh']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['rss_import_time']}<br />
+					<span class='desctext'>{$this->lang->words['rss_im_refresh_info']}</span>
+				</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='rightaction'>
-				<input type='submit' class='button primary' value='$button' /> &nbsp;&nbsp;&nbsp;
-				<input type='button' class='button primary' value='{$this->lang->words['rss_im_valbutton']}' onclick='ACPRss.validate();' /></div>
-			</div>
+			<input type='submit' class='button primary' value='$button' /> &nbsp;&nbsp;&nbsp;
+			<input type='button' class='button primary' value='{$this->lang->words['rss_im_valbutton']}' onclick='ACPRss.validate();' /></div>
 		</div>		
 	</div>
 </form>
@@ -379,7 +557,6 @@ return $IPBHTML;
 /**
  * RSS Import stream overview
  *
- * @access	public
  * @param	string	HTML content
  * @param	string	Page links
  * @return	string	HTML
@@ -392,65 +569,89 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['im_title']}</h2>
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' />{$this->lang->words['rss_im_create']}</a></li>
-		<li><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_recache&amp;rss_import_id=all'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_refresh.png' alt='' />{$this->lang->words['rss_im_updateall']}</a></li>
-	</ul>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' />{$this->lang->words['rss_im_create']}</a>
+				</li>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_recache&amp;rss_import_id=all'><img src='{$this->settings['skin_acp_url']}/images/icons/arrow_refresh.png' alt='' />{$this->lang->words['rss_im_updateall']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
 <form action='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_validate' method='post'>
 	<div class='acp-box'>
 		<h3>{$this->lang->words['rss_im_quickval']}</h3>
 	
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['rss_im_enturl']}</label>
-				<input type='text' size='50' name='rss_url' value='http://' /> 
-				<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />				
-			</li>
-		</ul>
+		<table class='ipsTable'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rss_im_enturl']}</strong>
+				</td>
+				
+				<td class='field_field'>
+					<input type='text' size='70' name='rss_url' value='http://' class='input_text' /> <br />
+					<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
+				</td>				
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='rightaction'>
-				<input type='submit' class='button primary' value='{$this->lang->words['rss_im_valbutton']}' />
-			</div>
+			<input type='submit' class='button primary' value='{$this->lang->words['rss_im_valbutton']}' />
 		</div>
 	</div>
 </form>
 <br />
 
 {$page_links}
-<br style='clear: both' />
+<br class='clear' />
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['rss_im_thefeeds']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
-			<th width='90%'>{$this->lang->words['rss_title']}</th>
-			<th width='5%' align='center'>{$this->lang->words['rss_enabled']}</th>
-			<th width='5%' align='right'>&nbsp;</th>
+			<th style='width: 30px'></th>
+			<th style='width: 5%'></th>
+			<th>{$this->lang->words['rss_title']}</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>	
 HTML;
 
 foreach( $content as $data )
 {
+	$enabled = ( $data['rss_import_enabled'] ) ? "<span class='ipsBadge badge_green'>ENABLED</span>" : "<span class='ipsBadge badge_red'>DISABLED</span>";
+
 $IPBHTML .= <<<HTML
-		<tr>
-			<td>
-				<!--ACPNOTE: Missing rss.png -->
-				<a target='_blank' href='{$data['rss_import_url']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/feed.png' alt='{$this->lang->words['rss_rss']}' style='vertical-align:top' /></a>
-				<strong>{$data['rss_import_title']}</strong>
+		<tr class='ipsControlRow'>
+			<td class='center'>
+				<a target='_blank' href='{$data['rss_import_url']}'><img src='{$this->settings['skin_acp_url']}/images/icons/feed.png' alt='{$this->lang->words['rss_rss']}' style='vertical-align:middle' /></a>
 			</td>
-			<td align='center'><img src='{$this->settings['skin_acp_url']}/images/{$data['_enabled_img']}' alt='***' /></td>
-			<td align='right'>
-				<img id="menu{$data['rss_import_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['rss_options']}' class='ipbmenu' />
-				<ul class='acp-menu' id='menu{$data['rss_import_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_edit&amp;rss_import_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_edit']}</a></li>
-					<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_delete&amp;rss_import_id={$data['rss_import_id']}");'>{$this->lang->words['rss_im_delete']}</a></li>
-					<li class='icon delete'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_remove&amp;rss_import_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_remove']}</a></li>
-					<li class='icon refresh'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_recache&amp;rss_import_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_update']}</a></li>
-					<li class='icon manage'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=rssimport_validate&amp;rss_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_validate']}</a></li>
+			<td class='center'>
+				{$enabled}
+			</td>
+			<td>
+				<strong class='larger_text'>{$data['rss_import_title']}</strong><br />
+				<span class='desctext'>{$data['rss_import_url']}</span>
+			</td>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_edit&amp;rss_import_id={$data['rss_import_id']}' title='{$this->lang->words['rss_im_edit']}'>{$this->lang->words['rss_im_edit']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_delete&amp;rss_import_id={$data['rss_import_id']}");' title='{$this->lang->words['rss_im_delete']}'>{$this->lang->words['rss_im_delete']}</a>
+					</li>
+					<li class='ipsControlStrip_more ipbmenu' id="menu{$data['rss_import_id']}">
+						<a href='#'>More</a>
+					</li>
+				</ul>
+				<ul class='acp-menu' id='menu{$data['rss_import_id']}_menucontent' style='display: none'>
+					<li class='icon delete'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_remove&amp;rss_import_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_remove']}</a></li>
+					<li class='icon refresh'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_recache&amp;rss_import_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_update']}</a></li>
+					<li class='icon manage'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rssimport_validate&amp;rss_id={$data['rss_import_id']}'>{$this->lang->words['rss_im_validate']}</a></li>
 				</ul>
 			</td>
 		</tr>
@@ -462,7 +663,6 @@ $IPBHTML .= <<<HTML
 </div>
 
 {$page_links}
-
 HTML;
 
 //--endhtml--//
@@ -473,7 +673,6 @@ return $IPBHTML;
 /**
  * Validation message
  *
- * @access	public
  * @param	array 	Validation info
  * @return	string	HTML
  */
@@ -483,7 +682,7 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<EOF
-  <span class='{$info['class']}'>{$info['msg']}</span>
+<span class='{$info['class']}'>{$info['msg']}</span>
 EOF;
 
 //--endhtml--//
diff --git a/upload/admin/applications/forums/skin_cp/cp_skin_stats.php b/upload/admin/applications/forums/skin_cp/cp_skin_stats.php
index 3cb31c1b..0c71f0b8 100644
--- a/upload/admin/applications/forums/skin_cp/cp_skin_stats.php
+++ b/upload/admin/applications/forums/skin_cp/cp_skin_stats.php
@@ -3,44 +3,143 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Stats skin functions
- * Last Updated: $LastChangedDate: 2010-09-14 05:48:02 -0400 (Tue, 14 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 6865 $
+ * @version		$Rev: 8644 $
  */
  
-class cp_skin_stats extends output {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
+class cp_skin_stats
 {
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show spam stats
  *
- * @access	public
  * @return	string	HTML
  */
+public function spamServiceStats( $title, $rows, $total ) {
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<HTML
+<div class='section_title'>
+	<h2>{$this->lang->words['stats_spam']}</h2>
+</div>
+
+<table class='information-box' style='width:20%; background-image: none;' align='right'>
+	<tr>
+		<td><strong>{$this->lang->words['spam_spam']}</strong></td>
+		<td><img src='{$this->settings['skin_acp_url']}/images/bar_left_red.gif' width='4' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_red.gif' width='32' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_right_red.gif' width='4' height='11' align='middle' alt=''><br /></td>
+	</tr>
+	<tr>
+		<td><strong>{$this->lang->words['spam_ok']}</strong></td>
+		<td><img src='{$this->settings['skin_acp_url']}/images/bar_left.gif' width='4' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar.gif' width='32' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_right.gif' width='4' height='11' align='middle' alt=''></td>
+	</tr>
+</table>
+<br class='clear'/>
+<br class='clear'/>
+
+<div class='acp-box'>
+	<h3>{$title}</h3>
+	
+	<table class='ipsTable'>
+		<tr>
+			<th width='20%'>{$this->lang->words['stats_date']}</th>
+			<th width='70%'>{$this->lang->words['stats_results']}</th>
+			<th width='10%'>{$this->lang->words['stats_count']}</th>
+		</tr>
+HTML;
+
+foreach( $rows as $dateVal => $stats )
+{
+$IPBHTML .= <<<HTML
+		<tr>
+			<td width='20%'>{$dateVal}</td>
+			<td width='70%'>
+				<img src='{$this->settings['skin_acp_url']}/images/bar_left_red.gif' width='4' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_red.gif' width='{$stats['spam']['_width']}' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_right_red.gif' width='4' height='11' align='middle' alt=''><br />
+				<img src='{$this->settings['skin_acp_url']}/images/bar_left.gif' width='4' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar.gif' width='{$stats['notspam']['_width']}' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_right.gif' width='4' height='11' align='middle' alt=''>
+			</td>
+			<td width='10%'><center>{$this->registry->class_localization->formatNumber( $stats['spam']['count'] )}<br />{$this->registry->class_localization->formatNumber( $stats['notspam']['count'] )}</center></td>
+		</tr>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+		<tr>
+			<td width='20%'>&nbsp;</td>
+			<td width='70%' align='right'>{$this->lang->words['stats_total']}</td>
+			<td width='10%'><center><b>{$this->registry->class_localization->formatNumber( $total )}</b></center></td>
+		</tr>
+	</table>
+</div>
+<br />
+HTML;
+
+if( count( $rows ) <= 30 AND $total > 0 )
+{
+$IPBHTML .= <<<HTML
+<div class='center'>
+	<img src='{$this->settings['base_url']}{$this->form_code}&amp;do=spamGraph&amp;to_month={$this->request['to_month']}&amp;to_day={$this->request['to_day']}&amp;to_year={$this->request['to_year']}h&amp;from_month={$this->request['from_month']}&amp;from_day={$this->request['from_day']}&amp;from_year={$this->request['from_year']}&amp;timescale={$this->request['timescale']}&amp;sortby={$this->request['sortby']}'>
+</div>
+HTML;
+}
+//--endhtml--//
+return $IPBHTML;
+}
 
 /**
  * Show the stats results
  *
- * @access	public
  * @param	string	Title
  * @param	array 	Stats rows
  * @param	integer	Total
@@ -58,7 +157,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$title}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='20%'>{$this->lang->words['stats_date']}</th>
 			<th width='70%'>{$this->lang->words['stats_results']}</th>
@@ -74,7 +173,7 @@ $IPBHTML .= <<<HTML
 			<td width='70%'>
 				<img src='{$this->settings['skin_acp_url']}/images/bar_left.gif' width='4' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar.gif' width='{$r['_width']}' height='11' align='middle' alt=''><img src='{$this->settings['skin_acp_url']}/images/bar_right.gif' width='4' height='11' align='middle' alt=''>				
 			</td>
-			<td width='10%'><center>{$r['result_count']}</center></td>
+			<td width='10%'><center>{$this->registry->class_localization->formatNumber( $r['result_count'] )}</center></td>
 		</tr>
 HTML;
 }
@@ -82,8 +181,8 @@ HTML;
 $IPBHTML .= <<<HTML
 		<tr>
 			<td width='20%'>&nbsp;</td>
-			<td width='70%'><div align='right'>{$this->lang->words['stats_total']}</div></td>
-			<td width='10%'><center><b>{$total}</b></center></td>
+			<td width='70%' align='right'>{$this->lang->words['stats_total']}</td>
+			<td width='10%'><center><b>{$this->registry->class_localization->formatNumber( $total )}</b></center></td>
 		</tr>
 	</table>
 </div>
@@ -96,7 +195,6 @@ return $IPBHTML;
 /**
  * Show the stats main screen
  *
- * @access	public
  * @param	string	Type
  * @param	string	Title
  * @param	array 	Form fields
@@ -118,16 +216,16 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 
-		<ul class="acp-form alternate_rows">
-			<li>
-				<label>{$this->lang->words['stats_datefrom']}</label>
-				{$form['from_month']}&nbsp;&nbsp;{$form['from_day']}&nbsp;&nbsp;{$form['from_year']}
-			</li>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['stats_datefrom']}</strong></td>
+				<td class='field_field'>{$form['from_month']}&nbsp;&nbsp;{$form['from_day']}&nbsp;&nbsp;{$form['from_year']}</td>
+			</tr>
 			
-			<li>
-				<label>{$this->lang->words['stats_dateto']}</label>
-				{$form['to_month']}&nbsp;&nbsp;{$form['to_day']}&nbsp;&nbsp;{$form['to_year']}
-			</li>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['stats_dateto']}</strong></td>
+				<td class='field_field'>{$form['to_month']}&nbsp;&nbsp;{$form['to_day']}&nbsp;&nbsp;{$form['to_year']}</td>
+			</tr>
 HTML;
 
 //-----------------------------------------
@@ -137,25 +235,23 @@ HTML;
 if( $type != 'statsShowTopicViews' )
 {
 	$IPBHTML .= <<<HTML
-			<li>
-				<label>{$this->lang->words['stats_timescale']}</label>
-				{$form['timescale']}
-			</li>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['stats_timescale']}</strong></td>
+				<td class='field_field'>{$form['timescale']}</td>
+			</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
 			
-			<li>
-				<label>{$this->lang->words['stats_sorting']}</label>
-				{$form['sortby']}
-			</li>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['stats_sorting']}</strong></td>
+				<td class='field_field'>{$form['sortby']}</td>
+			</tr>
 		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['stats_show']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['stats_show']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/forums/skin_cp/index.html b/upload/admin/applications/forums/skin_cp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/skin_cp/index.html
+++ b/upload/admin/applications/forums/skin_cp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/digest.php b/upload/admin/applications/forums/sources/classes/digest.php
index 3a0f4cee..5b00de2e 100644
--- a/upload/admin/applications/forums/sources/classes/digest.php
+++ b/upload/admin/applications/forums/sources/classes/digest.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator actions
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -37,34 +37,6 @@ class digestLibrary
 	 * @var		string		topic|forum
 	 */
 	public $digest_type		= 'topic';
-
-	/**
-	 * Midnight time
-	 *
-	 * @var		integer		Timestamp
-	 */
-	public $midnight		= 0;
-
-	/**
-	 * Last week timestamp
-	 *
-	 * @var		integer		Timestamp
-	 */
-	public $last_week		= 0;
-
-	/**
-	 * Yesterday timestamp
-	 *
-	 * @var		integer		Timestamp
-	 */
-	public $last_day		= 0;
-
-	/**
-	 * Last time timestamp
-	 *
-	 * @var		integer		Timestamp
-	 */
-	public $last_time		= 0;
 	
 	/**#@+
 	 * Registry Object Shortcuts
@@ -86,7 +58,7 @@ class digestLibrary
 	 * Constructor
 	 *
 	 * @param	object		Registry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -110,387 +82,51 @@ class digestLibrary
 			$this->registry->class_forums->forumsInit();
 		}
 		
-		//-----------------------------------------
-		// Get midnight (GMT - roughly)
-		//-----------------------------------------
-		
-		$this->midnight = mktime( 0, 0 );
-		
-		//-----------------------------------------
-		// Midnight today minus a weeks worth of secs
-		//-----------------------------------------
-		
-		$this->last_week = $this->midnight - 604800;
-		
-		//-----------------------------------------
-		// Midnight today minus a day worth of secs
-		//-----------------------------------------
-		
-		$this->last_day  = $this->midnight - 86400;
-
-		//-----------------------------------------
-		// Get some lang bits
-		//-----------------------------------------
-		
-		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_emails' ), 'core' );
+		/* Load language files */
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_emails', 'public_email_content' ), 'core' );
 	}
 	
 	/**
 	 * Run the digest
-	 *
-	 * @return	void
+	 * @param	string	Frequency (daily/weekly)
+	 * @param	string	Type (topic/forum)
+	 * @return	@e void
 	 */
-	public function runDigest()
+	public function runDigest( $frequency='daily', $type='topic' )
 	{
-		$this->last_time = $this->digest_time == 'daily' ? $this->last_day : $this->last_week;
-		
-		if ( $this->digest_type == 'topic' )
+		if ( $type == 'topic' )
 		{
-			$this->_sendTopicDigest();
+			$this->_sendTopicDigest( $frequency );
 		}
 		else
 		{
-			$this->_sendForumDigest();
+			$this->_sendForumDigest( $frequency );
 		}
 	}
 	
 	/**
 	 * Run the digest
-	 *
-	 * @return	void
+	 * @param	string	Frequency (daily/weekly)
+	 * @return	@e void
 	 */
-	private function _sendTopicDigest()
+	protected function _sendTopicDigest( $frequency )
 	{
-		//-----------------------------------------
-		// Notifications library
-		//-----------------------------------------
-		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
-				
-		//-----------------------------------------
-		// Get all posts / topics
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select'	=> 'tr.trid, tr.topic_id, tr.member_id as trmid',
-								'from'		=> array( 'tracker' => 'tr' ),
-								'where'		=> "tr.topic_track_type='{$this->digest_time}' AND t.approved=1 AND t.last_post > {$this->last_time}",
-								'add_join'	=> array(
-													array( 'select'	=> 'm.member_group_id, m.mgroup_others, m.org_perm_id, m.members_display_name, m.email, m.posts, m.member_id, m.email_full, m.language, m.last_activity',
-															'from'	=> array( 'members' => 'm' ),
-															'where'	=> 'm.member_id=tr.member_id',
-															'type'	=> 'left'
-														),
-													array( 'select'	=> 't.*',
-															'from'	=> array( 'topics' => 't' ),
-															'where'	=> 't.tid=tr.topic_id',
-															'type'	=> 'left'
-														),
-													) ) );
-		$topic_query = $this->DB->execute();
-		
-		//-----------------------------------------
-		// Now, loop print and send to subscribers
-		//-----------------------------------------
-		
-		$main_output	= "";
-		$count			= 0;
-		$cached			= array();
-		$subject		= $this->digest_time == 'daily' ? 'digest_topic_daily' : 'digest_topic_weekly';
-		$trids			= array();
-		
-		while( $t = $this->DB->fetch( $topic_query ) )
-		{
-			//-----------------------------------------
-			// Can access forum/topic?
-			//-----------------------------------------
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like = classes_like::bootstrap( 'forums','topics' );
 			
-			if( !$this->registry->getClass('class_forums')->checkEmailAccess($t) )
-			{
-				continue;
-			}
-			
-			//-----------------------------------------
-			// Topic approved or is a mod?
-			//-----------------------------------------
-			
-			if( !$this->registry->getClass('class_forums')->checkEmailApproved($t) )
-			{
-				continue;
-			}
-			
-			//-----------------------------------------
-			// Build email
-			//-----------------------------------------
-
-			$main_output	= "";
-			$others_posted	= 0;
-			
-			if ( ! $cached[ $t['tid'] ] )
-			{
-				$topic_title = $t['title'];
-				$forum_name  = ipsRegistry::getClass('class_forums')->allForums[ $t['forum_id'] ]['name'];
-				
-				//-----------------------------------------
-				// Get posts...
-				//-----------------------------------------
-				
-				$this->DB->build( array(  'select' => '*',
-										  'from'   => 'posts',
-										  'where'  => "topic_id={$t['tid']} AND queued=0 AND post_date > {$this->last_time}",
-										  'order'  => 'post_date' ) );
-										  
-				$post_query = $this->DB->execute();
-				
-				$post_output	= "";
-				
-				while( $p = $this->DB->fetch( $post_query ) )
-				{
-					//-----------------------------------------
-					// Do we have other posters?
-					//-----------------------------------------
-					
-					if ( $t['trmid'] != $p['author_id'] )
-					{
-						$others_posted = 1;
-					}
-					
-					$post_author	= $p['author_name'];
-					$post_date		= ipsRegistry::getClass( 'class_localization')->getDate( $p['post_date'], 'SHORT' );
-					$post_content	= $p['post'];
-					
-					$post_output .= "<br />-------------------------------------------<br />"
-								 .  "{$post_author} -- {$post_date}<br />{$post_content}<br /><br />";
-				}
-				
-				//-----------------------------------------
-				// Skip if there is no content...
-				//-----------------------------------------
-				
-				if( !$post_output )
-				{
-					continue;
-				}
-								
-				//-----------------------------------------
-				// Process
-				//-----------------------------------------
-				
-				$main_output .= $this->lang->words['topic_langbit'] . ": {$topic_title} (" . $this->lang->words['forum_langbit'] . ": {$forum_name})<br />"
-							 .  $this->registry->getClass('output')->buildSEOUrl( $this->settings['board_url'] . '/index.php?showtopic=' . $t['tid'], 'none', $t['title_seo'], 'showtopic' ) . "<br />"
-							 .  "=====================================<br />"
-							 .  $post_output
-							 .  "<br />=====================================<br />";
-				
-				$cached[ $t['tid'] ] = $main_output;
-			}
-			else
-			{
-				$others_posted = 1;
-				$main_output = $cached[ $t['tid'] ];
-			}
-			
-			if ( $others_posted )
-			{
-				$trids[ $t['trid'] ] = intval( $t['trid'] );
-				
-				//-----------------------------------------
-				// Send notification...
-				//-----------------------------------------
-
-				IPSText::getTextClass('email')->getTemplate( $subject, $t['language'] );
-			
-				IPSText::getTextClass( 'email' )->buildMessage( array(
-													'TOPIC_ID'	=> $t['tid'],
-													'FORUM_ID'	=> $t['forum_id'],
-													'TITLE'		=> $topic_title,
-													'NAME'		=> $t['members_display_name'],
-													'CONTENT'	=> $main_output,
-										   )     );
-
-				$notifyLibrary->setMember( $t );
-				$notifyLibrary->setFrom( array() );
-				$notifyLibrary->setNotificationKey( 'new_reply' );
-				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-				
-				try
-				{
-					$notifyLibrary->sendNotification();
-				}
-				catch( Exception $e ){}
-			}
-			
-		}
-		
-		/* Update sent time */
-		if ( count( $trids ) )
-		{
-			$this->DB->update( 'tracker', array( 'last_sent' => time() ), 'trid IN (' . implode( ',', $trids ) . ')' );
-		}
+		$_like->sendDigestNotifications( ( $frequency == 'daily' ) ? 'daily' : 'weekly' );	
 	}
 	
 	/**
 	 * Run the digest
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _sendForumDigest()
-	{
-		//-----------------------------------------
-		// Notifications library
-		//-----------------------------------------
-		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
-				
-		//-----------------------------------------
-		// Get all posts / topics
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select'	=> 'ft.*',
-								'from'		=> array( 'forum_tracker' => 'ft' ),
-								'where'		=> "ft.forum_track_type='{$this->digest_time}'",
-								'add_join'	=> array(
-													array( 'select'	=> 'm.members_display_name, m.member_group_id, m.mgroup_others, m.org_perm_id, m.member_id, m.email, m.language, m.posts',
-															'from'	=> array( 'members' => 'm' ),
-															'where'	=> 'm.member_id=ft.member_id',
-															'type'	=> 'left'
-														)
-													) )	);
-		$forum_query = $this->DB->execute();
-				
-		//-----------------------------------------
-		// Now, loop print and send to subscribers
-		//-----------------------------------------
-		
-		$main_output	= "";
-		$count			= 0;
-		$cached			= array();
-		$subject		= $this->digest_time == 'daily' ? 'digest_forum_daily' : 'digest_forum_weekly';
-		$frids			= array();
-		
-		while( $t = $this->DB->fetch( $forum_query ) )
-		{
-			$main_output	= "";
-			$others_posted	= 0;
+	protected function _sendForumDigest( $frequency )
+	{ 
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like = classes_like::bootstrap( 'forums', 'forums' );
 			
-			$forum_name		= ipsRegistry::getClass('class_forums')->allForums[ $t['forum_id'] ]['name'];
-			
-			//-----------------------------------------
-			// Get topics...
-			//-----------------------------------------
-			
-			$this->DB->build( array( 'select'	=> '*',
-										'from'	=> 'topics',
-										'where'	=> "forum_id={$t['forum_id']} AND last_post > {$this->last_time}",
-								)		);
-			$topic_query = $this->DB->execute();
-			
-			$post_output = "";
-			
-			while( $p = $this->DB->fetch( $topic_query ) )
-			{
-				//-----------------------------------------
-				// Check access
-				//-----------------------------------------
-				
-				if( !$this->registry->getClass('class_forums')->checkEmailAccess( array_merge($t,$p) ) )
-				{
-					continue;
-				}
-
-				//-----------------------------------------
-				// Topic approved or is a mod?
-				//-----------------------------------------
-				
-				if( !$this->registry->getClass('class_forums')->checkEmailApproved( array_merge($t,$p) ) )
-				{
-					continue;
-				}
-
-				$post = $this->DB->buildAndFetch( array( 'select'	=> '*',
-														 'from'		=> 'posts',
-												 		 'where'	=> 'topic_id=' . $p['tid'],
-												 		 'order'	=> 'post_date DESC',
-												 		 'limit'	=> array( 1 )
-												)		);
-				
-				//-----------------------------------------
-				// Do we have other posters?
-				//-----------------------------------------
-				
-				if ( $t['member_id'] != $post['author_id'] )
-				{
-					$others_posted = 1;
-				}
-				
-				$post_author	= $post['author_name'];
-				$post_date		= ipsRegistry::getClass('class_localization')->getDate( $post['post_date'], 'SHORT' );
-				$post_content	= $post['post'];
-				$topic_title	= $p['title'];
-				
-				$post_output .= "<br />-------------------------------------------<br />"
-				             .  $this->lang->words['topic_langbit'] . ": {$topic_title} ({$post_author} -- {$post_date})<br />"
-				             .  $this->registry->getClass('output')->buildSEOUrl( $this->settings['board_url'] . '/index.php?showtopic=' . $p['tid'], 'none', $p['title_seo'], 'showtopic' )
-							 .  "<br />............................................<br />"
-							 .  "{$post_content}<br /><br />";
-			}
-			
-			//-----------------------------------------
-			// Skip if there is no content...
-			//-----------------------------------------
-			
-			if( $post_output == '' )
-			{
-				continue;
-			}				
-			
-			//-----------------------------------------
-			// Process
-			//-----------------------------------------
-			
-			$main_output = $this->lang->words['forum_langbit'] . ": {$forum_name}<br />"
-						 . "=====================================<br />"
-						 . $post_output
-						 . "<br />=====================================<br />";
-			
-			if ( $others_posted )
-			{
-				$frids[ $t['frid'] ] = intval( $t['frid'] );
-				
-				//-----------------------------------------
-				// Send notification...
-				//-----------------------------------------
-				
-				IPSText::getTextClass('email')->getTemplate( $subject, $t['language'] );
-			
-				IPSText::getTextClass( 'email' )->buildMessage( array(
-													'FORUM_ID'		=> $t['forum_id'],
-													'FORUM_NAME'	=> $forum_name,
-													'NAME'			=> $t['members_display_name'],
-													'CONTENT'		=> $main_output,
-												)		);
-
-				$notifyLibrary->setMember( $t );
-				$notifyLibrary->setFrom( array() );
-				$notifyLibrary->setNotificationKey( 'new_topic' );
-				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-				
-				try
-				{
-					$notifyLibrary->sendNotification();
-				}
-				catch( Exception $e ){}
-			}
-			
-		}
-		
-		/* Update sent time */
-		if ( count( $frids ) )
-		{
-			$this->DB->update( 'forum_tracker', array( 'last_sent' => time() ), 'frid IN (' . implode( ',', $frids ) . ')' );
-		}
+		$_like->sendDigestNotifications( ( $frequency == 'daily' ) ? 'daily' : 'weekly' );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/forums/admin_forum_functions.php b/upload/admin/applications/forums/sources/classes/forums/admin_forum_functions.php
index 883047f1..ce6b0422 100644
--- a/upload/admin/applications/forums/sources/classes/forums/admin_forum_functions.php
+++ b/upload/admin/applications/forums/sources/classes/forums/admin_forum_functions.php
@@ -1,35 +1,35 @@
 <?php
 
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Admin forum functions library
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @since		26th January 2004
+ * @version		$Rev: 8644 $
+ *
+ */
+
 if ( ! defined( 'IN_ACP' ) )
 {
 	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
 	exit();
 }
 
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Admin forum functions library
- * Last Updated: $Date: 2010-05-20 17:04:12 -0400 (Thu, 20 May 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		26th January 2004
- * @version		$Rev: 6344 $
- *
- */
 class admin_forum_functions extends class_forums
 {
 	/**
 	 * HTML object
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $html;
@@ -37,7 +37,6 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Type
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $type      = "";
@@ -45,23 +44,13 @@ class admin_forum_functions extends class_forums
 	/**
 	 * How many printed
 	 *
-	 * @access	public
 	 * @var		integer
 	 */	
 	public $printed   = 0;
-	
-	/**
-	 * Whether to show all or not
-	 *
-	 * @access	public
-	 * @var		boolean
-	 */	
-	public $show_all  = false;
-	
+
 	/**
 	 * Cached skin id -> names
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $skins     = array();
@@ -69,7 +58,6 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Need descriptions
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $need_desc = array();
@@ -77,12 +65,11 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build forum children
 	 *	 
-	 * @access	public
 	 * @param	integer	$root_id
 	 * @param	string	$temp_html
 	 * @param	string	$depth_guide
 	 * @return	string
-	 **/
+	 */
 	public function forumBuildChildren( $root_id, $temp_html="", $depth_guide="" )
 	{
 		if ( isset( $this->forum_cache[ $root_id ] ) AND is_array( $this->forum_cache[ $root_id ] ) )
@@ -107,11 +94,10 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build forum
 	 *
-	 * @access	public
 	 * @param	integer	$r
 	 * @param	string	$depth_guide
 	 * @return	string
-	 **/	
+	 */	
 	public function renderForum( $r, $depth_guide="" )
 	{
 		//-----------------------------------------
@@ -132,54 +118,49 @@ class admin_forum_functions extends class_forums
 			//-----------------------------------------
 			// Show main forums...
 			//-----------------------------------------
+
+			$children = $this->forumsGetChildren( $r['id'] );
 			
-			if ( ! $this->show_all )
+			$sub		= array();
+			$subforums	= "";
+			$count		= 0;
+			
+			//-----------------------------------------
+			// Build sub-forums link
+			//-----------------------------------------
+			
+			if ( count($children) )
 			{
-				$children = $this->forumsGetChildren( $r['id'] );
+				$r['name'] = "<a href='{$this->settings['base_url']}f={$r['id']}'>" . $r['name'] . "</a>";
 				
-				$sub       = array();
-				$subforums = "";
-				$count     = 0;
-				
-				//-----------------------------------------
-				// Build sub-forums link
-				//-----------------------------------------
-				
-				if ( count($children) )
+				foreach ( $children as $cid )
 				{
-					$r['name'] = "<a href='{$this->settings['base_url']}f={$r['id']}'>" . $r['name'] . "</a>";
+					$count++;
 					
-					foreach ( $children as $cid )
+					$cfid = $cid;
+					
+					if ( $count == count( $children ) )
 					{
-						$count++;
+						//-----------------------------------------
+						// Last subforum, link to parent
+						// forum...
+						//-----------------------------------------
 						
-						$cfid = $cid;
-						
-						if ( $count == count( $children ) )
+						if ( !isset($children[ $count - 2 ]) OR ! $cfid = $children[ $count - 2 ] )
 						{
-							//-----------------------------------------
-							// Last subforum, link to parent
-							// forum...
-							//-----------------------------------------
-							
-							if ( !isset($children[ $count - 2 ]) OR ! $cfid = $children[ $count - 2 ] )
-							{
-								$cfid = $r['id'];
-							}
+							$cfid = $r['id'];
 						}
-						
-						$sub[] = "<a href='{$this->settings['base_url']}f={$this->forum_by_id[$cid]['parent_id']}'>".$this->forum_by_id[$cid]['name']."</a>";
 					}
+					
+					$sub[] = "<a href='{$this->settings['base_url']}f={$this->forum_by_id[$cid]['parent_id']}'>".$this->forum_by_id[$cid]['name']."</a>";
 				}
-				
-				if ( count( $sub ) )
-				{
-					$subforums = '<fieldset style="margin-top:4px"><legend>' . $this->lang->words['acp_subforum_legend'] . '</legend>' . implode( ", ", $sub ) . '</fieldset>';
-				}
-				
-				//$desc = "{$r['description']}{$subforums}";
 			}
 			
+			if ( count( $sub ) )
+			{
+				$subforums = '<fieldset class="subforums"><legend>' . $this->lang->words['acp_subforum_legend'] . '</legend>' . implode( ", ", $sub ) . '</fieldset>';
+			}
+
 			$desc = "{$r['description']}{$subforums}";
 			
 			//-----------------------------------------
@@ -187,6 +168,7 @@ class admin_forum_functions extends class_forums
 			//-----------------------------------------
 			
 			$r['_modstring'] = "";
+			$r['_mods'] = array();
 			
 			foreach( $this->moderators as $data )
 			{
@@ -195,7 +177,7 @@ class admin_forum_functions extends class_forums
 				foreach( $forum_ids as $forum_id )
 				{
 					if ( $forum_id == $r['id'] )
-					{
+					{						
 						if ($data['is_group'] == 1)
 						{
 							$data['_fullname'] = $this->lang->words['fc_group_prefix'] . $data['group_name'];
@@ -206,17 +188,23 @@ class admin_forum_functions extends class_forums
 						}
 						
 						$data['randId']	= substr( str_replace( array( ' ', '.' ), '', uniqid( microtime(), true ) ), 0, 10 );
+						$data['forum_id'] = $forum_id;
 						
-						$r['_modstring'] .= $this->html->renderModeratorEntry( $data, $forum_id );
+						$r['_mods'][] = $data;
 					}
 				}
 			}
 			
+			if( count( $r['_mods'] ) )
+			{
+				$r['_modstring'] = $this->html->renderModeratorEntry( $r['_mods'] );
+			}
+			
 			//-----------------------------------------
 			// Print
 			//-----------------------------------------
 			
-			$this->skins[$r['skin_id']] = ( isset($this->skins[ $r['skin_id'] ] ) AND $this->skins[ $r['skin_id'] ] ) ? $this->skins[ $r['skin_id'] ] : '';
+			$this->skins[$r['skin_id']] = !empty($this->skins[ $r['skin_id'] ] ) ? $this->skins[ $r['skin_id'] ] : '';
 
 			return $this->html->renderForumRow( $desc, $r, $depth_guide, $this->skins[ $r['skin_id'] ] );
 		}
@@ -225,35 +213,30 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Show Category
 	 *	 
-	 * @access	public
 	 * @param	string	$content
 	 * @param	array 	$r
-	 * @param	bool	$show_buttons	 
-	 * @return	void
-	 **/	
-	public function forumShowCat( $content, $r, $show_buttons=1 )
+	 * @return	@e void
+	 */	
+	public function forumShowCat( $content, $r )
 	{
 		$this->printed++;
 		
 		$no_root = count( $this->forum_cache['root'] );
 
-		$this->registry->output->html .= $this->html->forumWrapper( $content, $r, $show_buttons );
+		$this->registry->output->html .= $this->html->forumWrapper( $content, $r );
 	}
 	
 	/**
 	 * List all forums
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function forumsListForums()
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
-		
-		$this->show_all = intval( $this->request['showall'] );
-		
+
 		if ( ! $this->html )
 		{
 			$this->html = $this->registry->output->loadTemplate( 'cp_skin_forums' );
@@ -271,52 +254,14 @@ class admin_forum_functions extends class_forums
 			}
 		}
 		
-		$temp_html = "";
-		$fid       = intval( $this->request['f'] );
-		
-		//-----------------------------------------
-		// Show all forums
-		//-----------------------------------------
-		
-		if ( $this->show_all )
-		{
-			foreach( $this->forum_cache['root'] as $forum_data )
-			{
-				$cat_data    = $forum_data;
-				$depth_guide = "";
-				$temp_html 	 = "";
-				
-				if ( isset($this->forum_cache[ $forum_data['id'] ]) AND is_array( $this->forum_cache[ $forum_data['id'] ] ) )
-				{
-					foreach( $this->forum_cache[ $forum_data['id'] ] as $forum_data )
-					{
-						if ( $this->settings['forum_cache_minimum'] AND $this->settings['forum_cache_minimum'] )
-						{
-							$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
-							$this->need_desc[]         = $forum_data['id'];
-						}
-				
-						$temp_html .= $this->renderForum( $forum_data, $depth_guide );
+		$temp_html	= "";
+		$fid		= intval( $this->request['f'] );
 
-						$temp_html = $this->forumBuildChildren( $forum_data['id'], $temp_html, '<span style="color:gray">&#0124;</span>'.$depth_guide . $this->depth_guide );
-					}
-				}
-				
-				if( !$temp_html )
-				{
-					$temp_html = $this->html->renderNoForums( $cat_data['id'] );
-				}
-				
-				$this->registry->output->html .= $this->forumShowCat( $temp_html, $cat_data );
-				unset($temp_html);
-			}
-		}
-		
 		//-----------------------------------------
 		// Show root forums
 		//-----------------------------------------
 		
-		else if ( ! $fid )
+		if ( ! $fid )
 		{
 			$seen_count  = 0;
 			$total_items = 0;
@@ -360,10 +305,9 @@ class admin_forum_functions extends class_forums
 		
 		else
 		{
-			$cat_data    = array();
-			$depth_guide = "";
-			
-		
+			$cat_data		= array();
+			$depth_guide	= "";
+
 			if ( is_array( $this->forum_cache[ $fid ] ) )
 			{
 				$cat_data    = $this->forum_by_id[ $fid ];
@@ -409,15 +353,14 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build Forum Jump
 	 *
-	 * @access	public
 	 * @param	bool	$restrict
 	 * @return	array
-	 **/
+	 */
 	public function adForumsForumList( $restrict=0 )
 	{
 		if ( $restrict != 1 )
 		{	
-			//$jump_array[] = array( '-1', 'Make Root (Category)' );
+			$jump_array[] = array( '-1', 'Make Root (Category)' );
 		}
 		else
 		{
@@ -447,13 +390,12 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build Forum List Helper
 	 *
-	 * @access	private
 	 * @param	integer	$root_id
 	 * @param	array 	$jump_array
 	 * @param	string	$depth_guide
 	 * @return	array
-	 **/
-	private function forumsForumListInternal( $root_id, $jump_array=array(), $depth_guide="" )
+	 */
+	protected function forumsForumListInternal( $root_id, $jump_array=array(), $depth_guide="" )
 	{
 		if( isset($this->forum_cache[ $root_id ] ) AND  is_array( $this->forum_cache[ $root_id ] ) )
 		{
@@ -471,9 +413,8 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build Forum Data
 	 *
-	 * @access	public
 	 * @return	array
-	 **/
+	 */
 	public function adForumsForumData()
 	{
 		foreach( $this->forum_cache['root'] as $forum_data )
@@ -504,12 +445,11 @@ class admin_forum_functions extends class_forums
 	/**
 	 * Build Forum Data Helper
 	 *
-	 * @access	public
 	 * @param	integer	$root_id
 	 * @param	array 	$jump_array
 	 * @param	string	$depth_guide
 	 * @return	array
-	 **/
+	 */
 	public function forumsForumDataInternal( $root_id, $jump_array=array(), $depth_guide="" )
 	{
 		if ( isset( $this->forum_cache[ $root_id ]) AND is_array( $this->forum_cache[ $root_id ] ) )
diff --git a/upload/admin/applications/forums/sources/classes/forums/class_forums.php b/upload/admin/applications/forums/sources/classes/forums/class_forums.php
index 3fda919a..c1366129 100644
--- a/upload/admin/applications/forums/sources/classes/forums/class_forums.php
+++ b/upload/admin/applications/forums/sources/classes/forums/class_forums.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forums Class
- * Last Updated: $Date: 2010-11-05 10:24:40 -0400 (Fri, 05 Nov 2010) $
+ * Last Updated: $Date: 2011-10-10 16:21:29 -0400 (Mon, 10 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		26th January 2004
- * @version		$Rev: 7097 $
+ * @version		$Rev: 9590 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -104,11 +104,17 @@ class class_forums
 	 */
 	public $ppdStatusMessage = '';
 	
+	/**
+	 * Ability to set a different member for permission checks, etc
+	 * @var array
+	 */
+	protected $_memberData     = array();
+	
 	/**
 	 * CONSTRUCTOR
 	 *
 	 * @param	object	ipsRegistry  $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -122,12 +128,15 @@ class class_forums
 		$this->memberData =& $this->registry->member()->fetchMemberData();
 		$this->cache    = $this->registry->cache();
 		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		/* Set default memberData */
+		$this->setMemberData( $this->memberData );
 	}
 	
 	/**
 	 * Grab all forums and stuff into array
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function forumsInit()
 	{
@@ -135,7 +144,7 @@ class class_forums
 		$forum_list = $this->getForumList();
 		
 		$hide_parents = ',';
-		
+
 		$this->forum_cache = array();
 		$this->forum_by_id = array();
 
@@ -161,7 +170,7 @@ class class_forums
 				}
 				
 				/* Don't show forums that we can not see based on the minimum posts to view setting */
-				if( isset( $f['min_posts_view'] ) && $f['min_posts_view'] && ( $this->memberData['posts'] < $f['min_posts_view'] ) )
+				if( !empty( $f['min_posts_view'] ) AND ( $this->_memberData['posts'] < $f['min_posts_view'] ) AND !$this->_memberData['g_is_supmod'] )
 				{
 					continue;
 				}		
@@ -181,6 +190,76 @@ class class_forums
 		}
 	}
 	
+	/**
+	 * Returns a forum based on an ID
+	 * Added in 3.2 to abstract out some forum functionality
+	 *
+	 * @return	array
+	 */
+	public function getForumById( $id )
+	{
+		$forum = ( ! empty( $this->forum_by_id[ $id ] ) ) ? $this->forum_by_id[ $id ] : array();
+		
+		if ( empty( $forum['id'] ) )
+		{
+			$forum = $this->DB->buildAndFetch( array( 'select'   => 'f.*',
+													  'from'     => array( 'forums' => 'f' ),
+													  'where'    => 'f.id=' . intval( $id ),
+													  'add_join' => array( array( 'select' => 'p.*',
+																				  'from'   => array( 'permission_index' => 'p' ),
+																				  'where'  => "p.perm_type_id=f.id AND p.app='forums' AND p.perm_type='forum'",
+																				  'type'   => 'left' ) ) ) );
+			/* Unpack bitwise fields */
+			$_tmp = IPSBWOptions::thaw( $forum['forums_bitoptions'], 'forums', 'forums' );
+
+			if ( count( $_tmp ) )
+			{
+				foreach( $_tmp as $k => $v )
+				{
+					$forum[ $k ] = $v;
+				}
+			}
+			
+			$forum = array_merge( $forum, $this->registry->permissions->parse( $forum ) );
+		}
+		
+		return $forum;
+	}
+	
+	/**
+	 * Can start topics in this forum?
+	 * @param int $forumId
+	 */
+	public function canStartTopic( $forumId )
+	{
+		$forumData = $this->getForumById( $forumId );
+		
+		/* Posting Allowed? */
+		$canPost = true;
+		
+		if( ! $this->registry->permissions->check( 'start', $forumData ) )
+		{
+			$canPost = false;
+		}
+
+		if( ! $forumData['sub_can_post'] )
+		{
+			$canPost = false;
+		}
+
+		if( $forumData['min_posts_post'] && $forumData['min_posts_post'] > $this->_memberData['posts'] && !$this->_memberData['g_is_supmod'] )
+		{
+			$canPost = false;
+		}
+		
+		if( ! $this->_memberData['g_post_new_topics'] )
+		{
+			$canPost = false;
+		}
+		
+		return $canPost;
+	}
+	
 	/**
 	 * Returns a list of all forums
 	 *
@@ -209,7 +288,7 @@ class class_forums
 		{
 			$tempForums[ $f['parent_id'] . '.' . $f['position'] . '.' . $f['id'] ] = $f;
 		}
-		
+
 		/* Sort in PHP */
 		$tempForums = IPSLib::knatsort( $tempForums );
 		
@@ -243,6 +322,22 @@ class class_forums
 				$fr['hide_last_info']		= 0;
 				$fr['can_view_others']		= 0;
 				$fr['password']				= $f['password'];
+				
+				/* Permission index columns */
+				$fr['app']					= $f['app'];
+				$fr['perm_id']				= $f['perm_id'];
+				$fr['perm_type']			= $f['perm_type'];
+				$fr['perm_type_id']			= $f['perm_type_id'];
+				$fr['perm_view']			= $f['perm_view'];
+				$fr['perm_2']				= $f['perm_2'];
+				$fr['perm_3']				= $f['perm_3'];
+				$fr['perm_4']				= $f['perm_4'];
+				$fr['perm_5']				= $f['perm_5'];
+				$fr['perm_6']				= $f['perm_6'];
+				$fr['perm_7']				= $f['perm_7'];
+				$fr['owner_only']			= $f['owner_only'];
+				$fr['friend_only']			= $f['friend_only'];
+				$fr['authorized_users']		= $f['authorized_users'];
 			}
 			else
 			{
@@ -252,7 +347,7 @@ class class_forums
 			}
 			
 			$fr = array_merge( $fr, $this->registry->permissions->parse( $f ) );
-			
+
 			/* Unpack bitwise fields */
 			$_tmp = IPSBWOptions::thaw( $fr['forums_bitoptions'], 'forums', 'forums' );
 
@@ -273,7 +368,7 @@ class class_forums
 			/* Add... */
 			$forums_list[ $fr['id'] ] = $fr;
 		}
-	
+
 		$this->allForums	= $forums_list;
 		
 		/**
@@ -289,7 +384,37 @@ class class_forums
 		
 		return $forums_list;
 	}
+	
+	/**
+	 * @return the $_memberData
+	 */
+	public function getMemberData( $k='' )
+	{
+		return ( ! empty( $k ) ) ? $this->_memberData[ $k ] : $this->_memberData;
+	}
 
+	/**
+	 * @param	string	key
+	 * @param	string	value
+	 */
+	public function setMemberData( $k, $v='' )
+	{
+		if ( is_integer( $k ) )
+		{
+			$this->_memberData = IPSMember::load( $k );
+		}
+		else if ( is_array( $k ) )
+		{
+			$this->_memberData = $k;
+		}
+		else if ( ! empty( $k ) )
+		{
+			$this->_memberData[ $k ] = $v;
+		}
+		
+		$this->_memberData = IPSMember::setUpModerator( $this->_memberData );
+	}
+	
 	/**
 	 * Fetch a status message about post moderation status
 	 *
@@ -406,13 +531,13 @@ class class_forums
 	 *
 	 * Optionally populates a status message in ppdStatusMessage
 	 *
-	 * @param	array 		[Member data (assumes $this->memberData if nothing passed )]
+	 * @param	array 		[Member data (assumes $this->_memberData if nothing passed )]
 	 * @param	boolean		Populate ppdStatusMessage?
 	 * @return	boolean		TRUE = ok to post, FALSE cannot post
 	 */
 	public function checkGroupPostPerDay( $memberData = array(), $setStatus=FALSE )
 	{
-		$memberData = ( is_array( $memberData ) and count( $memberData ) ) ? $memberData : $this->memberData;
+		$memberData = ( is_array( $memberData ) and count( $memberData ) ) ? $memberData : $this->_memberData;
 		$group      = $this->caches['group_cache'][ $memberData['member_group_id'] ];
 		$_data      = explode( ',', $memberData['members_day_posts'] );
 		$_count     = intval( $_data[0] );
@@ -553,7 +678,7 @@ class class_forums
 	/**
 	 * Grab all mods innit
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function forumsGetModeratorCache()
 	{
@@ -589,6 +714,64 @@ class class_forums
 		$this->mod_cache_got = 1;
 	}
 	
+	/**
+	 * Get moderator status from DB
+	 *
+	 * @return	@e array
+	 */
+	public function getModerator()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+
+		$permissions	= array();
+		
+		//-----------------------------------------
+		// If we are a mod, get our permissions from DB
+		//-----------------------------------------
+		
+		if( $this->_memberData['is_mod'] )
+		{
+			$other_mgroups	= array();
+			$_other_mgroups	= IPSText::cleanPermString( $this->_memberData['mgroup_others'] );
+			
+			if( $_other_mgroups )
+			{
+				$other_mgroups	= explode( ",", $_other_mgroups );
+			}
+			
+			$other_mgroups[]	= $this->_memberData['member_group_id'];
+
+			$this->DB->build( array( 
+									'select' => '*',
+									'from'   => 'moderators',
+									'where'  => "(member_id='" . $this->_memberData['member_id'] . "' OR (is_group=1 AND group_id IN(" . implode( ",", $other_mgroups ) . ")))" 
+							)	);
+										  
+			$this->DB->execute();
+			
+			//-----------------------------------------
+			// We do it this way to allow member-specific mod privileges
+			// to override group-inherited mod privileges
+			//-----------------------------------------
+			
+			while ( $moderator = $this->DB->fetch() )
+			{
+				if ( $moderator['member_id'] == $this->_memberData['member_id'] )
+				{
+					return $moderator;
+				}
+				else
+				{
+					$permissions	= $moderator;
+				}
+			}
+		}
+		
+		return $permissions;
+	}
+	
 	/**
 	 * Get Moderators
 	 *
@@ -619,7 +802,7 @@ class class_forums
 					{
 						$mod_string[] = array( $this->registry->getClass("output")->buildSEOUrl( "app=members&amp;module=list&amp;max_results=30&amp;filter={$moderator['gid']}&amp;sort_order=asc&amp;sort_key=members_display_name&amp;st=0&amp;b=1", "public", "false" ), $moderator['gname'], 0 );
 					}
-					else
+					else if( $moderator['memid'] )
 					{
 						if ( ! $moderator['name'] )
 						{
@@ -635,9 +818,9 @@ class class_forums
 				{
 					$mod_string[] = array( $this->registry->getClass("output")->buildSEOUrl( "app=members&amp;max_results=30&amp;filter={$this->mods[$forum_id]['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0&amp;b=1", "public", "false" ), $this->mods[$forum_id]['gname'], 0 );
 				}
-				else
+				else if( $this->mods[$forum_id]['memid'] )
 				{
-					$mod_string[] =array( $this->registry->getClass("output")->buildSEOUrl( "showuser={$this->mods[$forum_id]['memid']}", "public", $this->mods[$forum_id]['seoname'], 'showuser' ), $this->mods[$forum_id]['name_seo'], $this->mods[$forum_id]['memid'] );
+					$mod_string[] = array( $this->registry->getClass("output")->buildSEOUrl( "showuser={$this->mods[$forum_id]['memid']}", "public", $this->mods[$forum_id]['seoname'], 'showuser' ), $this->mods[$forum_id]['name_seo'], $this->mods[$forum_id]['memid'] );
 				}
 			}
 		}
@@ -661,8 +844,11 @@ class class_forums
 		$fid         = intval( $fid );
 		$deny_access = 1;
 		
+		/* Pass it along */
+		$this->registry->permissions->setMemberData( $this->getMemberData() );
+		
 		if ( $this->registry->permissions->check( 'view', $this->forum_by_id[$fid] ) == TRUE )
-		{
+		{ 
 			if ( $this->registry->permissions->check( 'read', $this->forum_by_id[$fid] ) == TRUE )
 			{
 				$deny_access = 0;
@@ -726,11 +912,11 @@ class class_forums
 		{
 			$group_exempt = 0;
 			
-			if ( isset( $this->forum_by_id[$fid]['password'] ) AND $this->forum_by_id[$fid]['password'] AND $this->forum_by_id[$fid]['sub_can_post'] )
+			if ( isset( $this->forum_by_id[$fid]['password'] ) AND $this->forum_by_id[$fid]['password'] != '' AND $this->forum_by_id[$fid]['sub_can_post'] )
 			{
 				if ( isset( $this->forum_by_id[$fid]['password_override'] ) && IPSText::cleanPermString($this->forum_by_id[$fid]['password_override']) != '' )
 				{
-					if ( IPSMember::isInGroup( $this->memberData, explode( ",", IPSText::cleanPermString($this->forum_by_id[$fid]['password_override']) ) ) )
+					if ( IPSMember::isInGroup( $this->_memberData, explode( ",", IPSText::cleanPermString($this->forum_by_id[$fid]['password_override']) ) ) )
 					{
 						$group_exempt = 1;
 						$deny_access = 0;
@@ -763,7 +949,7 @@ class class_forums
 		
 		if( is_array( $topic ) && count( $topic ) )
 		{
-			if ( ( ! $this->memberData['g_other_topics'] ) AND ( $topic['starter_id'] != $this->memberData['member_id'] ) )
+			if ( ( ! $this->_memberData['g_other_topics'] ) AND ( $topic['starter_id'] != $this->_memberData['member_id'] ) )
 			{
 				if( $return )
 				{
@@ -772,7 +958,7 @@ class class_forums
 				
 				$this->registry->getClass('output')->showError( 'forums_no_view_topic', 103136, null, null, 403 );
 			}
-			else if( (!$this->forum_by_id[$fid]['can_view_others'] AND !$this->memberData['is_mod'] ) AND ( $topic['starter_id'] != $this->memberData['member_id'] ) )
+			else if( (!$this->forum_by_id[$fid]['can_view_others'] AND !$this->_memberData['is_mod'] ) AND ( $topic['starter_id'] != $this->_memberData['member_id'] ) )
 			{
 				if( $return )
 				{
@@ -783,7 +969,7 @@ class class_forums
 			}
 		}
 
-		if( $this->forum_by_id[$fid]['min_posts_view'] && $this->forum_by_id[$fid]['min_posts_view'] > $this->memberData['posts'] )
+		if( $this->forum_by_id[$fid]['min_posts_view'] && $this->forum_by_id[$fid]['min_posts_view'] > $this->_memberData['posts'] && !$this->_memberData['g_is_supmod'] )
 		{
 			if( $return )
 			{
@@ -832,7 +1018,7 @@ class class_forums
 	 * Forums custom error
 	 *
 	 * @param	integer	$fid	Forum ID
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function forumsCustomError( $fid )
 	{
@@ -848,7 +1034,7 @@ class class_forums
 	 * Forums log in screen
 	 *
 	 * @param	integer	$fid	Forum ID	 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function forumsShowLogin( $fid )
 	{
@@ -960,9 +1146,6 @@ class class_forums
 					$forum_data['last_poster_name']		= $data['last_poster_name'];
 					$forum_data['seo_last_name']		= $data['seo_last_name'];
 					$forum_data['_has_unread']          = $forum_data['_has_unread'];
-					
-					# Bug http://forums.invisionpower.com/index.php?autocom=bugtracker&do=show_bug&bug_title_id=3931&bug_cat_id=3
-					#$forum_data['status']            = $data['status'];
 				}
 				
 				//-----------------------------------------
@@ -977,6 +1160,32 @@ class class_forums
 					$forum_data['_has_unread']		= 1;
 					$data['_has_unread']            = 1;
 				}
+				
+				//-----------------------------------------
+				// If this forum isn't 'lit' yet, check it's children
+				//-----------------------------------------
+				
+				if( !$data['_has_unread'] )
+				{
+					$children			= $this->forumsGetChildren( $data['id'] );
+					
+					if( count($children) )
+					{
+						foreach( $children as $_child )
+						{
+							$_child	= $this->getForumById( $_child );
+							
+							$rtime	             = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $_child['id'] ), 'forums' );
+							
+							if( $_child['last_post'] && $_child['last_post'] > $rtime )
+							{
+								$forum_data['_has_unread']		= 1;
+								$data['_has_unread']            = 1;
+								break;
+							}
+						}
+					}
+				}
 
 				//-----------------------------------------
 				// Topics and posts
@@ -985,9 +1194,9 @@ class class_forums
 				$forum_data['posts']  += $data['posts'];
 				$forum_data['topics'] += $data['topics'];
 				
-				$_mod = ( isset( $this->memberData['forumsModeratorData'] ) ) ? $this->memberData['forumsModeratorData'] : array();
+				$_mod = ( isset( $this->_memberData['forumsModeratorData'] ) ) ? $this->_memberData['forumsModeratorData'] : array();
 				
-				if ( $this->memberData['g_is_supmod'] or ( $_mod && isset( $_mod[ $data['id'] ]['post_q'] ) AND $_mod[ $data['id'] ]['post_q'] == 1 ) )
+				if ( $this->_memberData['g_is_supmod'] or ( $_mod && !empty( $_mod[ $data['id'] ]['post_q'] ) ) )
 				{
 					$forum_data['queued_posts']  += $data['queued_posts'];
 					$forum_data['queued_topics'] += $data['queued_topics'];
@@ -995,7 +1204,7 @@ class class_forums
 				
 				if ( ! $done_pass )
 				{
-					$forum_data['subforums'][ $data['id'] ] = array($data['id'], $data['name'], $data['name_seo'], intval( $data['_has_unread']  ) );
+					$forum_data['subforums'][ $data['id'] ] = array($data['id'], $data['name'], $data['name_seo'], intval( $data['_has_unread']  ), 0 );
 				}
 				
 				$forum_data = $this->forumsCalcChildren( $data['id'], $forum_data, 1 );
@@ -1037,11 +1246,13 @@ class class_forums
 	 * @param	bool	$html
 	 * @param	bool	$override
 	 * @param	bool	$remove_redirects
+	 * @param	mixed	$defaulted		Single forum id to check against, or array of forum ids to check
 	 * @return	string
 	 */
-	public function forumsForumJump( $html=0, $override=0, $remove_redirects=0 )
+	public function forumsForumJump( $html=0, $override=0, $remove_redirects=0, $defaulted=array() )
 	{
-		$jump_string = "";
+		$jump_string	= "";
+		$defaulted		= ( is_array($defaulted) AND count($defaulted) ) ? $defaulted : ( is_int($defaulted) ? array( $defaulted ) : ( $this->request['f'] ? array( $this->request['f']) : array() ) );
 		
 		if( is_array( $this->forum_cache['root'] ) AND count( $this->forum_cache['root'] ) )
 		{
@@ -1060,7 +1271,7 @@ class class_forums
 					
 					if ($html == 1 or $override == 1)
 					{
-						if( $this->request['f'] and $this->request['f'] == $forum_data['id'] )
+						if( in_array( $forum_data['id'], $defaulted ) )
 						{
 							$selected = ' selected="selected"';
 						}
@@ -1083,7 +1294,7 @@ class class_forums
 							{
 								$selected = "";
 								
-								if ( $this->request['f'] and $this->request['f'] == $forum_data['id'])
+								if( in_array( $forum_data['id'], $defaulted ) )
 								{
 									$selected = ' selected="selected"';
 								}
@@ -1091,10 +1302,7 @@ class class_forums
 							
 							$jump_string .= "<option value=\"{$forum_data['id']}\"".$selected.">&nbsp;&nbsp;&#0124;".$depth_guide." ".$forum_data['name']."</option>\n";
 							
-							if( $this->settings['short_forum_jump'] == 0 OR $override == 1 )
-							{
-								$jump_string = $this->_forumsForumJumpInternal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override, $remove_redirects );
-							}
+							$jump_string = $this->_forumsForumJumpInternal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override, $remove_redirects, $defaulted );
 						}
 					}
 				}
@@ -1113,9 +1321,10 @@ class class_forums
 	 * @param	bool	$html
 	 * @param	bool	$override
 	 * @param	bool	$remove_redirects
+	 * @param	array	$defaulted
 	 * @return	string
 	 */
-	private function _forumsForumJumpInternal( $root_id, $jump_string="", $depth_guide="",$html=0, $override=0, $remove_redirects=0 )
+	protected function _forumsForumJumpInternal( $root_id, $jump_string="", $depth_guide="",$html=0, $override=0, $remove_redirects=0, $defaulted=array() )
 	{
 		if ( isset($this->forum_cache[ $root_id ]) AND is_array( $this->forum_cache[ $root_id ] ) )
 		{
@@ -1130,7 +1339,7 @@ class class_forums
 								
 				if ($html == 1 or $override == 1)
 				{
-					if ( $this->request['f'] and $this->request['f'] == $forum_data['id'])
+					if( in_array( $forum_data['id'], $defaulted ) )
 					{
 						$selected = ' selected="selected"';
 					}
@@ -1138,7 +1347,7 @@ class class_forums
 					
 				$jump_string .= "<option value=\"{$forum_data['id']}\"".$selected.">&nbsp;&nbsp;&#0124;".$depth_guide." ".$forum_data['name']."</option>\n";
 				
-				$jump_string = $this->_forumsForumJumpInternal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override );
+				$jump_string = $this->_forumsForumJumpInternal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override, $defaulted );
 			}
 		}
 		
@@ -1158,25 +1367,16 @@ class class_forums
 		// INIT
 		//-----------------------------------------
 		
-		$show_subforums = 1;
-		$this->request['f'] = isset( $this->request['f'] ) ? intval( $this->request['f'] ) : 0;
 		$this->settings['disable_subforum_show'] = intval( $this->settings['disable_subforum_show'] );
 		
-		if ( $this->registry->permissions->check( 'view', $this->forum_by_id[ $forum_data['id'] ] ) !== TRUE )
-		{
-			$show_subforums = 0;
-		}
-		
-		$forum_data['img_new_post'] = $this->forumsNewPosts( $forum_data );
-		
-	//	$forum_data['last_post'] = $this->registry->getClass('class_localization')->getDate( $forum_data['last_post'], 'LONG' );
-					
-		$forum_data['last_topic_title'] = $this->lang->words['f_none'];
-		$forum_data['last_topic_id']    = 0;
-		
-		$forum_data['full_last_title'] = isset( $forum_data['last_title'] ) ? $forum_data['last_title'] : '';
-		
-		$forum_data['_hide_last_date'] = false;
+		$show_subforums					= $this->registry->permissions->check( 'view', $this->forum_by_id[ $forum_data['id'] ] ) ? 1 : 0;
+		$this->request['f']				= isset( $this->request['f'] ) ? intval( $this->request['f'] ) : 0;
+
+		$forum_data['img_new_post']		= $this->forumsNewPosts( $forum_data );
+		$forum_data['last_topic_title']	= $this->lang->words['f_none'];
+		$forum_data['last_topic_id']	= 0;
+		$forum_data['full_last_title']	= isset( $forum_data['last_title'] ) ? $forum_data['last_title'] : '';
+		$forum_data['_hide_last_date']	= false;
 		
 		if (isset($forum_data['last_title']) and $forum_data['last_id'])
 		{
@@ -1186,43 +1386,49 @@ class class_forums
 			
 			$forum_data['last_title'] = IPSText::truncate($forum_data['last_title'], 30);
 			
-			if ( ( isset($forum_data['password']) AND $forum_data['password'] ) OR ( $this->registry->permissions->check( 'read', $this->forum_by_id[ $forum_data['fid'] ] ) != TRUE AND $this->forum_by_id[ $forum_data['fid'] ]['permission_showtopic'] == 0 ) )
+			if ( ( ! empty($forum_data['password']) ) OR ( $this->registry->permissions->check( 'read', $this->forum_by_id[ $forum_data['fid'] ] ) != TRUE AND $this->forum_by_id[ $forum_data['fid'] ]['permission_showtopic'] == 0 ) )
 			{
-				$forum_data['last_topic_title'] = $this->lang->words['f_protected'];
-				$forum_data['_hide_last_date'] = true;
+				$forum_data['last_topic_title']	= $this->lang->words['f_protected'];
+				$forum_data['_hide_last_date']	= true;
 			}
 			else if( $forum_data['hide_last_info'] )
 			{
-				$forum_data['last_topic_title'] = $this->lang->words['f_protected'];
-				$forum_data['_hide_last_date'] = true;
+				$forum_data['last_topic_title']	= $this->lang->words['f_protected'];
+				$forum_data['_hide_last_date']	= true;
 			}
 			else
 			{
-				$forum_data['last_topic_id']     = $forum_data['last_id'];
-				$forum_data['last_topic_title']  = "<a href='" . $this->registry->getClass('output')->formatUrl( $this->registry->getClass('output')->buildUrl( "showtopic={$forum_data['last_id']}&amp;view=getnewpost", 'public' ), $forum_data['seo_last_title'], 'showtopic' ) . "' title='" . $this->lang->words['tt_gounread'] . ": {$forum_data['full_last_title']}'>{$forum_data['last_title']}</a>";
+				$forum_data['last_topic_id']	= $forum_data['last_id'];
+				$forum_data['last_topic_title']	= "<a href='" . $this->registry->getClass('output')->formatUrl( $this->registry->getClass('output')->buildUrl( "showtopic={$forum_data['last_id']}&amp;view=getnewpost", 'public' ), $forum_data['seo_last_title'], 'showtopicunread' ) . "' title='" . $this->lang->words['tt_gounread'] . ": {$forum_data['full_last_title']}'>{$forum_data['last_title']}</a>";
 			}
 		}
 		
-		$forum_data['posts']  = $this->registry->getClass('class_localization')->formatNumber( $forum_data['posts'] );
-		$forum_data['topics'] = $this->registry->getClass('class_localization')->formatNumber( $forum_data['topics'] );
+		$forum_data['posts']	= $this->registry->getClass('class_localization')->formatNumber( $forum_data['posts'] );
+		$forum_data['topics']	= $this->registry->getClass('class_localization')->formatNumber( $forum_data['topics'] );
 		
 		if ( $this->settings['disable_subforum_show'] == 0 AND $show_subforums == 1 )
 		{
 			if ( isset($forum_data['subforums']) and is_array( $forum_data['subforums'] ) and count( $forum_data['subforums'] ) )
 			{
 				$forum_data['show_subforums'] = 1;
+				
+				/* Rock star programming yo */
+				$lastSubForum = array_pop( $forum_data['subforums'] );
+				$lastSubForum[4] = 1;
+				
+				$forum_data['subforums'][ $lastSubForum['id'] ] = $lastSubForum;
 			}
 		}
 		
-		$_mod = ( isset( $this->memberData['forumsModeratorData'] ) ) ? $this->memberData['forumsModeratorData'] : array();
+		$_mod	= ( isset( $this->_memberData['forumsModeratorData'] ) ) ? $this->_memberData['forumsModeratorData'] : array();
 		
-		if ( $this->memberData['g_is_supmod'] or ( isset($_mod[ $forum_data['id'] ]['post_q']) AND $_mod[ $forum_data['id'] ]['post_q'] == 1 ) )
+		if ( $this->_memberData['g_is_supmod'] or !empty($_mod[ $forum_data['id'] ]['post_q']) )
 		{
 			if ( $forum_data['queued_posts'] or $forum_data['queued_topics'] )
 			{
-				$forum_data['_has_queued_and_can_see_icon'] = 1;
-				$forum_data['queued_posts']                 = intval($forum_data['queued_posts']);
-				$forum_data['queued_topics']                = intval($forum_data['queued_topics']);
+				$forum_data['_has_queued_and_can_see_icon']	= 1;
+				$forum_data['queued_posts']					= intval($forum_data['queued_posts']);
+				$forum_data['queued_topics']				= intval($forum_data['queued_topics']);
 			}
 		}
 		
@@ -1237,11 +1443,6 @@ class class_forums
 	 */
 	public function forumsNewPosts( $forum_data )
 	{
-		if ( ! $forum_data['status'] )
-		{
-			return "f_locked";
-		}
-
 		$sub = 0;
         
         if ( isset($forum_data['subforums']) AND count($forum_data['subforums']) )
@@ -1261,8 +1462,8 @@ class class_forums
         {
         	$sub_cat_img = '_cat';
         }
-
-        if ( isset($forum_data['password']) AND $forum_data['password'] AND $sub == 0 )
+		
+		if ( isset($forum_data['password']) AND $forum_data['password'] != '' AND $sub == 0 )
         {
             return $forum_data['_has_unread'] ? "f_pass_unread" : "f_pass_read";
         }
@@ -1289,72 +1490,18 @@ class class_forums
 	 * @param	array	Topic data array
 	 * @param	string	Dot flag
 	 * @param	bool	Whether item is read or not
-	 * @return	string	Parsed macro
+	 * @return	array
 	 */
 	public function fetchTopicFolderIcon( $topic, $dot="", $is_read=false )
 	{
-		//-----------------------------------------
-		// Sort dot
-		//-----------------------------------------
-		
-		if ( $dot AND $dot != "")
-		{
-			$dot = "_dot";
-		}
-		else
-		{
-			$dot = '';
-		}
-		
-		if ($topic['state'] == 'closed')
-		{
-			return "t_closed";
-		}
-		
-		if ( $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'sdelete' )
-		{
-			return "t_closed";
-		}
-		
-		if ($topic['poll_state'])
-		{
-			if ( ! $this->memberData['member_id'] )
-			{
-				return "t_poll_read".$dot;
-			}
-
-			if ( !$is_read )
-			{
-				return "t_poll_unread".$dot;
-			}
-			
-			return "t_poll_read".$dot;
-		}
-		
-		
-		if ($topic['state'] == 'moved' or $topic['state'] == 'link')
-		{
-			return "t_moved";
-		}
-
-		if (($topic['posts'] + 1 >= $this->settings['hot_topic']) and $is_read )
-		{
-			return "t_hot_read".$dot;
-		}
-		
-		if ( !$is_read )
-		{
-			if ($topic['posts'] + 1 >= $this->settings['hot_topic'])
-			{
-				return "t_hot_unread".$dot;
-			}
-			else
-			{
-				return "t_unread".$dot;
-			}
-		}
-
-		return "t_read".$dot;
+		return array(
+					'is_read'		=> $is_read,
+					'is_closed'		=> ( $topic['state'] == 'closed' OR $this->registry->getClass('class_forums')->fetchHiddenTopicType( $topic ) == 'sdelete' ) ? true : false,
+					'is_poll'		=> $topic['poll_state'] ? true : false,
+					'show_dot'		=> $dot,
+					'is_moved'		=> ( $topic['state'] == 'moved' or $topic['state'] == 'link' ) ? true : false,
+					'is_hot'		=> ( $topic['posts'] + 1 >= $this->settings['hot_topic'] ) ? true : false,
+					);
 	}
 	
 	/**
@@ -1369,21 +1516,13 @@ class class_forums
 	 */
 	public function buildForumJump( $html=1, $override=0, $remove_redirects=0 )
 	{
-		$the_html = "";
-		$the_html = $this->forumsForumJump( $html, $override, $remove_redirects );
+		$the_html	= $this->forumsForumJump( $html, $override, $remove_redirects );
 		
-		if ($html == 1)
+		if( $html )
 		{
-			$the_html = $this->registry->getClass('output')->getTemplate('global')->forum_jump( $the_html );
+			$the_html	= $this->registry->getClass('output')->getTemplate('global')->forum_jump( $the_html );
 		}
 
-		/*$the_html .= $this->forumsForumJump( $html, $override, $remove_redirects );
-
-		if ($html == 1)
-		{
-			$the_html .= "</optgroup>\n</select>&nbsp;<input type='submit' value='" . $this->lang->words['jmp_go'] . "' class='button' /></form>";
-		}*/
-
 		return $the_html;
 	}
 	
@@ -1396,13 +1535,13 @@ class class_forums
 	public function canQueuePosts( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['post_q']) AND $_mod[ $fid ]['post_q'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['post_q']) )
 		{
 			$return = 1;
 		}
@@ -1420,21 +1559,21 @@ class class_forums
 	public function canSoftDeletePosts( $fid=0, $post )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete'] )
+		else if ( $this->_memberData['gbw_soft_delete'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_own'] AND $post['author_id'] == $this->memberData['member_id'] )
+		else if ( $this->_memberData['gbw_soft_delete_own'] AND $post['author_id'] == $this->_memberData['member_id'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete']) AND $_mod[ $fid ]['bw_mod_soft_delete'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete']) )
 		{
 			$return = 1;
 		}
@@ -1452,13 +1591,13 @@ class class_forums
 	public function canHardDeletePosts( $fid=0, $post )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['delete_post']) AND $_mod[ $fid ]['delete_post'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['delete_post']) )
 		{
 			$return = 1;
 		}
@@ -1475,17 +1614,17 @@ class class_forums
 	public function can_Un_SoftDeletePosts( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_un_soft_delete'] )
+		else if ( $this->_memberData['gbw_un_soft_delete'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_un_soft_delete']) AND $_mod[ $fid ]['bw_mod_un_soft_delete'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_un_soft_delete']) )
 		{
 			$return = 1;
 		}
@@ -1503,17 +1642,17 @@ class class_forums
 	public function canSeeSoftDeletedPosts( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_see'] )
+		else if ( $this->_memberData['gbw_soft_delete_see'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete_see']) AND $_mod[ $fid ]['bw_mod_soft_delete_see'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete_see']) )
 		{
 			$return = 1;
 		}
@@ -1530,21 +1669,21 @@ class class_forums
 	public function canSoftDeleteTopics( $fid, $topic=array() )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_topic'] )
+		else if ( $this->_memberData['gbw_soft_delete_topic'] )
 		{
 			$return = 1;
 		}
-		else if ( count( $topic ) AND $this->memberData['gbw_soft_delete_own_topic'] AND $topic['starter_id'] == $this->memberData['member_id'] )
+		else if ( count( $topic ) AND $this->_memberData['gbw_soft_delete_own_topic'] AND $topic['starter_id'] == $this->_memberData['member_id'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete_topic']) AND $_mod[ $fid ]['bw_mod_soft_delete_topic'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete_topic']) )
 		{
 			$return = 1;
 		}
@@ -1561,17 +1700,17 @@ class class_forums
 	public function can_Un_SoftDeleteTopics( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_un_soft_delete_topic'] )
+		else if ( $this->_memberData['gbw_un_soft_delete_topic'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_un_soft_delete_topic']) AND $_mod[ $fid ]['bw_mod_un_soft_delete_topic'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_un_soft_delete_topic']) )
 		{
 			$return = 1;
 		}
@@ -1589,13 +1728,13 @@ class class_forums
 	public function canHardDeleteTopics( $fid=0, $topic )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['delete_topic']) AND $_mod[ $fid ]['delete_topic'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['delete_topic']) )
 		{
 			$return = 1;
 		}
@@ -1612,17 +1751,17 @@ class class_forums
 	public function canSeeSoftDeletedTopics( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_topic_see'] )
+		else if ( $this->_memberData['gbw_soft_delete_topic_see'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete_topic_see']) AND $_mod[ $fid ]['bw_mod_soft_delete_topic_see'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete_topic_see']) )
 		{
 			$return = 1;
 		}
@@ -1639,17 +1778,17 @@ class class_forums
 	public function canSeeSoftDeleteReason( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_reason'] )
+		else if ( $this->_memberData['gbw_soft_delete_reason'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete_reason']) AND $_mod[ $fid ]['bw_mod_soft_delete_reason'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete_reason']) )
 		{
 			$return = 1;
 		}
@@ -1666,17 +1805,17 @@ class class_forums
 	public function canSeeSoftDeleteContent( $fid=0 )
 	{
 		$return = 0;
-		$_mod   = $this->memberData['forumsModeratorData'];
+		$_mod   = $this->_memberData['forumsModeratorData'];
 		
-		if ( $this->memberData['g_is_supmod'] )
+		if ( $this->_memberData['g_is_supmod'] )
 		{
 			$return = 1;
 		}
-		else if ( $this->memberData['gbw_soft_delete_see_post'] )
+		else if ( $this->_memberData['gbw_soft_delete_see_post'] )
 		{
 			$return = 1;
 		}
-		else if ( $fid AND $this->memberData['is_mod'] AND isset($_mod[ $fid ]['bw_mod_soft_delete_see_post']) AND $_mod[ $fid ]['bw_mod_soft_delete_see_post'] )
+		else if ( $fid AND $this->_memberData['is_mod'] AND !empty($_mod[ $fid ]['bw_mod_soft_delete_see_post']) )
 		{
 			$return = 1;
 		}
@@ -1696,6 +1835,12 @@ class class_forums
 		{
 			switch ( intval( $post['queued'] ) )
 			{
+				case 4:
+					return 'oktoremove';
+				break;
+				case 3:
+					return 'pdelete';
+				break;
 				case 2:
 					return 'sdelete';
 				break;
@@ -1711,6 +1856,43 @@ class class_forums
 		return 'visible';
 	}
 	
+	/**
+	 * Fetch correct flag
+	 * Pass several or one field through ->fetchPostHiddenQuery( array('hidden', 'sdelete' ) );
+	 *
+	 * @param	array		Type: 'sdelete', 'hidden', 'visible', 'notVisible' (notVisible can mean either sDelete or hidden)
+	 * @return	string
+	 */
+	public function fetchPostHiddenFlag( $type )
+	{
+		$value  = 0;
+		
+		switch( $type )
+		{
+			case 'oktoremove':
+				$value = 4;
+			break;
+			case 'pdeleted':
+			case 'pdelete':
+				$value = 3;
+			break;
+			case 'sdeleted':
+			case 'sdelete':
+				$value = 2;
+			break;
+			case 'queued':
+			case 'hidden':
+				$value = 1;
+			break;
+			case 'approved':
+			case 'visible':
+				$value = 0;
+			break;
+		}
+		
+		return $value;
+	}
+	
 	/**
 	 * Fetch correct fields and data
 	 * Pass several or one field through ->fetchPostHiddenQuery( array('hidden', 'sdelete' ) );
@@ -1728,6 +1910,13 @@ class class_forums
 		{
 			switch( $_t )
 			{
+				case 'oktoremove':
+					$values[] = 4;
+				break;
+				case 'pdeleted':
+				case 'pdelete':
+					$values[] = 3;
+				break;
 				case 'sdeleted':
 				case 'sdelete':
 					$values[] = 2;
@@ -1780,12 +1969,55 @@ class class_forums
 				case 1:
 					return 'visible';
 				break;
+				case 3:
+					return 'oktoremove';
+				break;
+				case 2:
+					return 'pdelete';
+				break;
 			}
 		}
 		
 		return 'visible';
 	}
 	
+	/**
+	 * Fetch correct flag
+	 * Pass several or one field through ->fetchTopicHiddenFlag( array('hidden', 'sdelete' ) );
+	 *
+	 * @param	array		Type: 'sdelete', 'hidden', 'visible', 'notVisible' (notVisible can mean either sDelete or hidden)
+	 * @return	string
+	 */
+	public function fetchTopicHiddenFlag( $type )
+	{
+		$value  = 1;
+		
+		switch( $type )
+		{
+			case 'sdeleted':
+			case 'sdelete':
+				$value = -1;
+			break;
+			case 'queued':
+			case 'hidden':
+				$value = 0;
+			break;
+			case 'approved':
+			case 'visible':
+				$value = 1;
+			break;
+			case 'pdelete':
+			case 'pdeleted':
+				$value = 2;
+			break;
+			case 'oktoremove':
+				$value = 3;
+			break;
+		}
+		
+		return $value;
+	}
+	
 	/**
 	 * Fetch correct fields and data
 	 * Pass several or one field through ->fetchPostHiddenQuery( array('hidden', 'sdelete' ) );
@@ -1815,6 +2047,13 @@ class class_forums
 				case 'visible':
 					$values[] = 1;
 				break;
+				case 'pdelete':
+				case 'pdeleted':
+					$values[] = 2;
+				break;
+				case 'oktoremove':
+					$values[] = 3;
+				break;
 			}
 		}
 		
@@ -1844,16 +2083,16 @@ class class_forums
 	public function getMultimod( $fid )
 	{
 		$mm_array = array();
-		$_mod     = $this->memberData['forumsModeratorData'];
+		$_mod     = $this->_memberData['forumsModeratorData'];
 		$pass_go  = FALSE;
 		
-		if ( $this->memberData['member_id'] )
+		if ( $this->_memberData['member_id'] )
 		{
-			if ( $this->memberData['g_is_supmod'] )
+			if ( $this->_memberData['g_is_supmod'] )
 			{
 				$pass_go = TRUE;
 			}
-			else if ( isset($_mod[ $fid ]['can_mm']) AND $_mod[ $fid ]['can_mm'] == 1 )
+			else if ( !empty($_mod[ $fid ]['can_mm']) )
 			{
 				$pass_go = TRUE;
 			}
@@ -1904,10 +2143,10 @@ class class_forums
 	 * @param	array		Array of ids to skip
 	 * @return	array		Array of "good" IDs
 	 */
-	public function fetchSearchableForumIds( $memberId=null, $skipIds=array(), $allowTrashCan=false )
+	public function fetchSearchableForumIds( $memberId=null, $skipIds=array() )
 	{
 		$forumIdsOk = array();
-		$member 	= ( $memberId === null ) ? $this->memberData : IPSMember::load( $memberId, 'core' );
+		$member 	= ( $memberId === null || $memberId == $this->_memberData['member_id'] ) ? $this->_memberData : IPSMember::load( $memberId, 'core' );
 		$posts 		= intval( $member['posts'] );
 		
 		/* Ensure this has been set up */
@@ -1916,12 +2155,12 @@ class class_forums
 			$this->strip_invisible = 1;
 			$this->forumsInit();
 		}
-		
+
 		/* Get list of good forum IDs */
 		foreach( $this->forum_by_id as $id => $data )
 		{
 			/* Can we read? */
-			if ( ! $this->registry->permissions->check( 'read', $data ) )
+			if ( ! $this->registry->permissions->check( 'read', $data ) OR ! $this->registry->permissions->check( 'view', $data ) )
 			{
 				continue;
 			}
@@ -1932,21 +2171,16 @@ class class_forums
 				continue;
 			}
 			
-			if ( ( ! $data['sub_can_post'] OR ! $data['can_view_others']) AND !$this->memberData['g_access_cp'] )
+			if ( ( ! $data['sub_can_post'] OR ! $data['can_view_others']) AND !$this->_memberData['is_mod'] )
 			{
 				continue;
 			}
 			
-			if ( $data['min_posts_view'] > $posts )
+			if ( $data['min_posts_view'] > $posts AND !$member['g_is_supmod'] )
 			{
 				continue;
 			}
-			
-			if ( $allowTrashCan === false AND ( $this->settings['forum_trash_can_id'] AND $id == $this->settings['forum_trash_can_id'] ) )
-			{
-				continue;
-			}
-			
+
 			if ( is_array( $skipIds ) AND count( $skipIds ) )
 			{
 				if ( in_array( $id, $skipIds ) )
@@ -2031,7 +2265,7 @@ class class_forums
 		if( $checkTopic )
 		{
 			$canViewOthers	= false;
-			$isSupermod		= false;
+			$t				= IPSMember::setUpModerator( $t );
 			
 			foreach( $member_groups as $mgroup )
 			{
@@ -2039,18 +2273,13 @@ class class_forums
 				{
 					$canViewOthers	= true;
 				}
-				
-				if( $this->caches['group_cache'][ $mgroup ]['g_is_supmod'] )
-				{
-					$isSupermod		= true;
-				}
 			}
 			
 			if( ! $canViewOthers AND $t['starter_id'] != $t['member_id'] )
 			{
 				return false;
 			}
-			else if( !$this->allForums[ $t['forum_id'] ]['can_view_others'] AND $t['starter_id'] != $t['member_id'] AND !$isSupermod )
+			else if( !$this->allForums[ $t['forum_id'] ]['can_view_others'] AND $t['starter_id'] != $t['member_id'] AND !$t['is_mod'] )
 			{
 				return false;
 			}
@@ -2060,7 +2289,7 @@ class class_forums
 		// Minimum posts to view
 		//-----------------------------------------
 		
-		if( $this->allForums[ $t['forum_id'] ]['min_posts_view'] && $this->allForums[ $t['forum_id'] ]['min_posts_view'] > $t['posts'] )
+		if( $this->allForums[ $t['forum_id'] ]['min_posts_view'] && $this->allForums[ $t['forum_id'] ]['min_posts_view'] > $t['posts'] && !$t['g_is_supmod'] )
 		{
 			return false;
 		}
@@ -2102,6 +2331,11 @@ class class_forums
 		// Test for approved/approve perms
 		//-----------------------------------------
 		
+		if( $t['approved'] > 1 )
+		{
+			return false;
+		}
+
 		if( $t['approved'] == 0 )
 		{
 			$mod = false;
@@ -2135,7 +2369,7 @@ class class_forums
 					
 					foreach( $this->cache->getCache('moderators') as $moderators )
 					{
-						if ( $moderators['member_id'] == $t['member_id'] or $moderators['group_id'] == $t['member_group_id'] )
+						if ( ( $moderators['member_id'] AND $moderators['member_id'] == $t['member_id'] ) OR $moderators['group_id'] == $t['member_group_id'] )
 						{
 							if( $moderators['forum_id'] == $t['forum_id'] )
 							{
@@ -2209,28 +2443,24 @@ class class_forums
 	public function recacheWatchedForums( $memberID )
 	{
 		/* INIT */
-		$forums   = array();
-		$memberID = intval( $memberID );
+		$final		= array();
+		$memberID	= intval( $memberID );
+
+		/* Get forums the member follows */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'forums' );
+		$forums	= $_like->getDataByMemberIdAndArea( $memberID );
+		$forums	= is_array($forums) ? array_keys( $forums ) : array();
 		
-		/* Grab SQL */
-		$this->DB->build( array( 'select' => 'forum_id',
-								 'from'	  => 'forum_tracker',
-								 'where'  => 'member_id=' . $memberID ) );
-								
-		$this->DB->execute();
-	
-		while( $row = $this->DB->fetch() )
+		foreach( $forums as $forum )
 		{
-			if ( $this->registry->permissions->check( 'view', $this->forum_by_id[ $row['forum_id'] ] ) !== TRUE )
+			if ( $this->registry->permissions->check( 'view', $this->forum_by_id[ $forum ] ) === TRUE )
 			{
-				/* Could grab the IDs and remove from the table at some point? */
-				continue;
+				$final[]	= $forum;
 			}
-			
-			$forums[] = $row['forum_id'];
 		}
-		
-		IPSMember::packMemberCache( $memberID, array( 'watchedForums' => $forums ) );
+
+		IPSMember::packMemberCache( $memberID, array( 'watchedForums' => $final ) );
 		
 		return TRUE;
 	}
@@ -2272,7 +2502,7 @@ class class_forums
 		
 		$this->DB->build( array( 'select' => 'tid, start_date',
 								 'from'   => 'topics',
-								 'where'  => 'forum_id=' . $forumID . ' AND approved=1',
+								 'where'  => 'forum_id=' . $forumID . ' AND ' . $this->fetchTopicHiddenQuery( array( 'visible' ), '' ),
 								 'order'  => 'start_date DESC',
 								 'limit'  => array( 0, $limit ) ) );
 		$o = $this->DB->execute();
@@ -2315,6 +2545,102 @@ class class_forums
 		return unserialize( $idString );
 	}
 	
+	/**
+	 * getHasUnread
+	 * Get the next unread topic
+	 * @param int forums ID
+	 */
+	public function getHasUnread( $forumId )
+	{
+		$latestStamp = intval( $this->registry->classItemMarking->fetchTimeLastMarked( array('forumID' => $forumId ), 'forums' ) );
+		$forumData   = $this->getForumById( $forumId );
+		$lastPost    = $forumData['last_post'];
+		
+		return ( $latestStamp < $lastPost ) ? true : false;
+	}
+	
+	/**
+	 * Post process VNC tids
+	 * @param	array	tid => array( tid,forum_id)
+	 * @return	array	cleaned tids
+	 */
+	public function postProcessVncTids( $rtids, $limit=array(), $maxHit=1000 )
+	{
+		$fCache = array( 'marked' => array(), 'lastStamp' => array() );
+		$tids   = array();
+		
+		if ( ! is_array( $rtids ) OR ! count( $rtids ) )
+		{
+			return array();
+		}
+		
+		foreach( $rtids as $tid => $data )
+		{
+			if ( ! isset( $fCache['canView'][ $data['forum_id'] ] ) )
+			{
+				$read = $this->registry->permissions->check( 'view', $this->getForumById( $data['forum_id'] ) );
+				$view = $this->forumsCheckAccess( $data['forum_id'], 0, 'forum', array(), true );
+				
+				$fCache['canView'][ $data['forum_id'] ] = ( $read && $view ) ? true : false;
+			}
+			
+			/* Permission to view? */
+			if ( ! $fCache['canView'][ $data['forum_id'] ] )
+			{
+				continue;
+			}		
+			
+			if ( IPSSearchRegistry::get('in.period') == 'unread' )
+			{
+				/* Avoid repeated calls to classItemMarking */
+				if ( ! isset( $fCache['marked'][ $data['forum_id'] ] ) )
+				{
+					$fCache['marked'][ $data['forum_id'] ] = intval( $this->registry->classItemMarking->fetchTimeLastMarked( array('forumID' => $data['forum_id'] ), 'forums' ) );
+				}
+				
+				/* May as well cache this too */
+				if ( ! isset( $fCache['lastStamp'][ $data['forum_id'] ] ) )
+				{
+					$_f = $this->getForumById( $data['forum_id'] );
+					$fCache['lastStamp'][ $data['forum_id'] ] = intval( $_f['last_post'] );
+				}
+				
+				$lastStamp = ( isset( $fCache['lastStamp'][ $data['forum_id'] ] ) ) ? $fCache['lastStamp'][ $data['forum_id'] ] : 0;
+				$lastRead  = ( isset( $fCache['marked'][ $data['forum_id'] ] ) )    ? $fCache['marked'][ $data['forum_id'] ] : 0;
+				
+				/* Lets get jiggy, etc */
+				if ( $lastStamp && ( $lastStamp <= $lastRead ) )
+				{
+					continue;
+				}
+				else
+				{
+					if ( ! $this->registry->classItemMarking->isRead( array('forumID' => $data['forum_id'], 'itemID' => $tid, 'itemLastUpdate' => $data['last_post'] ), 'forums' ) )
+					{
+						$tids[ $tid ] = $tid;
+					}
+				}
+			}
+			else
+			{
+				$tids[ $tid ] = $tid;
+			}
+		}
+	
+		
+		/* Count what's left */
+		$count = count( $tids );
+		
+		/* Simulate limit */
+		if ( isset( $limit[0] ) )
+		{
+			$tids = array_slice( $tids, intval( $limit[0] ), intval( $limit[1] ) );
+		}
+		
+		/* return */
+		return array( 'count' => $count, 'tids' => $tids );
+	}
+	
 	/**
 	 * Hook: Facebook sidebar block
 	 *
@@ -2356,12 +2682,12 @@ class class_forums
 		/* Grab last X data */
 		foreach( $this->forum_by_id as $forumID => $forumData )
 		{
-			if ( ! $forumData['can_view_others'] )
+			if ( ! $forumData['can_view_others'] AND ! $this->_memberData['is_mod'] )
 			{
 				continue;
 			}
 			
-			if ( $forumData['password'] )
+			if ( $forumData['password'] != '' )
 			{
 				continue;
 			}
@@ -2378,12 +2704,7 @@ class class_forums
 					continue;
 				}
 			}
-			
-			if ( $this->settings['forum_trash_can_id'] AND $forumID == $this->settings['forum_trash_can_id'] )
-			{
-				continue;
-			}
-			
+
 			/* Still here? */
 			$_topics = $this->lastXThaw( $forumData['last_x_topic_ids'] );
 			
@@ -2418,16 +2739,22 @@ class class_forums
 			{
 				/* Query Topics */
 				$this->registry->DB()->build( array( 
-														'select'   => 't.tid, t.title, t.title_seo, t.start_date, t.starter_id, t.starter_name, t.moved_to, t.views, t.posts',
+														'select'   => 't.tid, t.title as topic_title, t.title_seo, t.start_date, t.starter_id, t.starter_name, t.moved_to, t.views, t.posts',
 														'from'     => array( 'topics' => 't' ),
 														'where'    => 't.tid IN (' . implode( ',', array_values( $_topics ) ) . ')',
 														'add_join' => array(
 																			array(
-																					'select'	=> 'm.member_id, m.members_display_name, m.members_seo_name',
-																					'from'  	=> array( 'members' => 'm' ),
-																					'where' 	=> 'm.member_id=t.starter_id',
-																					'type'  	=> 'left',
-																				)
+																					'select'	=> 'm.*',
+																					'from'		=> array( 'members' => 'm' ),
+																					'where'		=> 'm.member_id=t.starter_id',
+																					'type'		=> 'left',
+																				),
+																			array(
+																					'select'	=> 'pp.*',
+																					'from'		=> array( 'profile_portal' => 'pp' ),
+																					'where'		=> 'm.member_id=pp.pp_member_id',
+																					'type'		=> 'left',
+																				),
 																		)
 											)	 );
 
@@ -2435,7 +2762,7 @@ class class_forums
 
 				while( $r = $this->registry->DB()->fetch() )
 				{
-					if( !is_null($r['moved_to']) )
+					if( !empty($r['moved_to']) )
 					{
 						continue;
 					}
@@ -2451,7 +2778,7 @@ class class_forums
 					}
 					
 					$timesUsed[]          = $time;
-					$topics_rows[ $time ] = $r;
+					$topics_rows[ $time ] = IPSMember::buildDisplayData( $r );
 				}
 				
 				/* Got any results? */
@@ -2465,118 +2792,11 @@ class class_forums
 		
 		if( $output )
 		{
-			return $this->registry->output->getTemplate( 'boards' )->hookRecentTopics( $topics_rows );
+			return $this->registry->output->getTemplate('boards')->hookRecentTopics( $topics_rows );
 		}
 		else
 		{
 			return $topics_rows;
 		}
 	}
-	
-	/**
-	 * Hook: Watched Items.
-	 * Moved here so we can update with out requiring global hook changes
-	 *
-	 */
-	public function hooks_watchedItems()
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_topic' ), 'forums' );
-		
-		if( !$this->memberData['member_id'] )
-		{
-			return;
-		}
-
-		/* INIT */
-		$updatedTopics	= array();
-		$updatedForums	= array();
-		$nUpdatedTopics	= array();
-		$nUpdatedForums	= array();
-		
-		/* Get watched topics */
-		$this->registry->DB()->build( array(
-								'select'	=> 'tr.*',
-								'from'		=> array( 'tracker' => 'tr' ),
-								'where'		=> 'tr.member_id=' . $this->memberData['member_id'] . ' AND tr.topic_id > 0',
-								'order'		=> 'tr.last_sent DESC',
-								'limit'		=> array( 0, 50 ),
-								'add_join'	=> array(
-													array(
-														'select'	=> 't.*',
-														'from'		=> array( 'topics' => 't' ),
-														'where'		=> 't.tid=tr.topic_id',
-														'type'		=> 'left'
-														)
-													)
-						)		);
-		$this->registry->DB()->execute();
-		
-		while( $r = $this->registry->DB()->fetch() )
-		{
-			if( !$r['tid'] )
-			{
-				continue;
-			}
-
-			$is_read	= $this->registry->classItemMarking->isRead( array( 'forumID' => $r['forum_id'], 'itemID' => $r['tid'], 'itemLastUpdate' => $r['last_post'] ), 'forums' );
-			
-			if( ! $is_read && $this->memberData['member_id'] != $r['last_poster_id'] )
-			{
-				$updatedTopics[ $r['topic_id'] ]	= $r;
-			}
-			else
-			{
-				$nUpdatedTopics[ $r['topic_id'] ]	= $r;
-			}
-		}
-		
-		/* Build a list of hidden forums */
-		$noForums = array();
-		$_extra	  = '';
-
-		foreach( $this->forum_by_id as $forumID => $forumData )
-		{
-			if ( $forumData['hide_last_info'] )
-			{
-				$noForums[] = $forumID;
-			}
-		}
-		
-		if ( count( $noForums ) )
-		{
-			$_extra = ' AND forum_id NOT IN (' . implode( ',', $noForums ) . ')';
-		}
-		
-		/* Get watched forums */
-		$this->registry->DB()->build( array(
-											'select'	=> 'forum_id, last_sent, member_id',
-											'from'		=> 'forum_tracker',
-											'order'		=> 'last_sent DESC',
-											'limit'		=> array( 0, 50 ),
-											'where'		=> 'member_id=' . $this->memberData['member_id'] . $_extra ) );
-								
-		$this->registry->DB()->execute();
-		
-		while( $r = $this->registry->DB()->fetch() )
-		{
-			if ( is_array( $this->forum_by_id[ $r['forum_id'] ] ) )
-			{
-				$r 			= array_merge( $r, $this->forum_by_id[ $r['forum_id'] ] );
-				
-				$last_time	= $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $r['forum_id'] ), 'forums' );
-				
-				if( $r['last_post'] > $last_time )
-				{
-					$updatedForums[ $r['forum_id'] ]	= $r;
-				}
-				else
-				{
-					$nUpdatedForums[ $r['forum_id'] ]	= $r;
-				}
-			}
-		}
-	
-		return $this->registry->output->getTemplate( 'boards' )->hookWatchedItems( $updatedTopics, $nUpdatedTopics, $updatedForums, $nUpdatedForums );
-	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/forums/index.html b/upload/admin/applications/forums/sources/classes/forums/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/sources/classes/forums/index.html
+++ b/upload/admin/applications/forums/sources/classes/forums/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/hooks/gateway.php b/upload/admin/applications/forums/sources/classes/hooks/gateway.php
new file mode 100644
index 00000000..1c156d72
--- /dev/null
+++ b/upload/admin/applications/forums/sources/classes/hooks/gateway.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Forum hook gateway
+ * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
+ * Last Updated: $Date: 2011-08-08 04:56:34 -0400 (Mon, 08 Aug 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		9th March 2005 11:03
+ * @version		$Revision: 9375 $
+ */
+class forums_hookGateway
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Method constructor
+	 *
+	 * @param	object		Registry Object
+	 * @return	@e void
+	 */
+	function __construct( ipsRegistry $registry )
+	{
+	    /* Make registry objects */
+		$this->registry		=  $registry;
+		$this->DB			=  $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->lang			=  $this->registry->getClass('class_localization');
+		$this->member		=  $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		=  $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		
+	}
+
+    /**
+     * Shows board index popular tags
+     *
+     */
+    public function tags()
+    {
+    	$classToLoad = IPSLib::loadActionOverloader( IPS_ROOT_PATH . 'sources/classes/tags/cloud.php', 'classes_tags_cloud' );
+		$cloud = new $classToLoad();
+		
+		$cloud->setSkinGroup('boards');
+		$cloud->setSkinTemplate('hookTagCloud');
+		
+		return $cloud->render( $cloud->getCloudData( array('limit' => 50 ) ) );
+    }
+ }
+ 
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/hooks/index.html b/upload/admin/applications/forums/sources/classes/hooks/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/forums/sources/classes/hooks/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/index.html b/upload/admin/applications/forums/sources/classes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/sources/classes/index.html
+++ b/upload/admin/applications/forums/sources/classes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/moderate.php b/upload/admin/applications/forums/sources/classes/moderate.php
index 4c42038c..f6138d50 100644
--- a/upload/admin/applications/forums/sources/classes/moderate.php
+++ b/upload/admin/applications/forums/sources/classes/moderate.php
@@ -2,20 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator actions
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-10-14 12:56:17 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9622 $
  *
- * @todo 		[Future] Get rid of init method, determine data dynamically (necessary for any centralized moderation routine, e.g. from search results)
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -53,14 +52,7 @@ class moderatorLibrary
 	 * @var		string		Error code
 	 */
 	public $error 			= "";
-	
-	/**
-	 * Automatically update forum info
-	 *
-	 * @var		boolean		Whether or not to automatically update forum info
-	 */
-	public $auto_update		= false;
-	
+
 	/**
 	 * Stored statement
 	 *
@@ -68,13 +60,6 @@ class moderatorLibrary
 	 */
 	public $stm				= "";
 
-	/**
-	 * Upload directory
-	 *
-	 * @var		string		Upload directory
-	 */
-	public $upload_dir 		= "./uploads";
-	
 	/**#@+
 	 * Registry Object Shortcuts
 	 * 
@@ -95,7 +80,7 @@ class moderatorLibrary
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -118,7 +103,12 @@ class moderatorLibrary
 			$this->registry->class_forums->forumsInit();
 		}
 		
-		$this->upload_dir = $this->settings['upload_dir'];
+		/* Load tagging stuff */
+		if ( ! $this->registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
 	}
 	
 	/**
@@ -195,14 +185,15 @@ class moderatorLibrary
 		
 		if ( $topicFind )
 		{
-			$this->DB->build( array( 'select' => $this->DB->buildDistinct( 'forum_id' ),
+			$this->DB->build( array( 'select' => $this->DB->buildDistinct( 'forum_id' ) . ',tid',
 							  		 'from'   => 'topics',
 									 'where'  => $topicFind ) );
 			$this->DB->execute();
 			
 			while( $row = $this->DB->fetch() )
 			{
-				$forumIDs[ $row['forum_id'] ] = $row['forum_id'];
+				$forumIDs[ $row['forum_id'] ]	= $row['forum_id'];
+				$topicIDs[ $row['tid'] ]		= $row['tid'];
 			}
 		}
 		
@@ -227,9 +218,17 @@ class moderatorLibrary
 		// Run...
 		//-----------------------------------------
 		
-		if ( $topicFind )
+		if ( $topicFind AND count($topicIDs) )
 		{
 			$this->DB->update( 'topics', array( 'approved' => ( $approve === TRUE ) ? 1 : 0 ), $topicFind );
+			
+			/* Tagging */
+			$this->registry->tags->updateVisibilityByMetaId( $topicFind, ( $approve === TRUE ? 1 : 0 ) );
+			
+			/* Likes */
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like	= classes_like::bootstrap( 'forums', 'topics' );
+			$_like->toggleVisibility( $topicIDs, $approve );
 		}
 		
 		if ( $postFind )
@@ -253,7 +252,7 @@ class moderatorLibrary
 			}
 		}
 		
-		$this->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		return TRUE;
 	}
@@ -261,13 +260,6 @@ class moderatorLibrary
 	/**
 	 * Delete content by a member
 	 * WARNING: This is a utility function. No permission checks are performed.
-	 * NOTE: This function is unfinished and unused. Might be useful to finish it for 3.1
-	 * The problem is mostly deleting posts when the trash can is in-use. You'd need to split them
-	 * and create a new topic for each which would be incredibly expensive without breaking it down into
-	 * batches.
-	 *
-	 * @todo [Future] Deleting topics and posts is bloody expensive. This limits to 150 ids or it could bust the IN() SQL statement
-	 *		 Probably need to find a neater way to do this.. Task? 
 	 *
 	 * @param	int			Member ID (topic starter / post author)
 	 * @param	string		Option [ topics / replies / all ]
@@ -314,55 +306,76 @@ class moderatorLibrary
 		
 		if ( $topicFind )
 		{
-			$this->DB->build( array( 'select' => 'tid, forum_id',
+			/* Update the posts to delete */
+			$this->DB->update( 'topics', array( 'approved' => $this->registry->class_forums->fetchTopicHiddenFlag('pdelete') ), $topicFind );
+		
+			$this->DB->build( array( 'select' => $this->DB->buildDistinct( 'forum_id' ),
 							  		 'from'   => 'topics',
-									 'where'  => $topicFind,
-									 'order'  => 'start_date DESC',
-									 'limit'  => array( 0, 150 ) ) );
+									 'where'  => $topicFind ) );
 			$this->DB->execute();
 			
 			while( $row = $this->DB->fetch() )
 			{
-				$topicIDs[] = $row['tid'];
 				$forumIDs[ $row['forum_id'] ] = $row['forum_id'];
 			}
-		}
-		else if ( $postFind )
-		{
-			$this->DB->build( array( 'select' => 'pid, topic_id',
-							  		 'from'   => 'posts',
-									 'where'  => $postFind,
-									 'order'  => 'post_date DESC',
-									 'limit'  => array( 0, 150 ) ) );
+			
+			/* Fetch unique topic IDs */
+			$this->DB->build( array( 'select'   => 'tid',
+							  		 'from'     => 'topics',
+									 'where'    => $topicFind,
+									 'order'    => 'topic_id DESC',
+									 'limit'    => array( 0, 2000 ) ) );
 			$this->DB->execute();
 			
 			while( $row = $this->DB->fetch() )
 			{
-				$postIDs[] = $row['pid'];
-				$_topicids[ $row['topic_id'] ] = $row['topic_id'];
+				$tagTopicIDs[] = $row['topic_id'];
 			}
 			
-			if ( is_array( $_topicids ) AND count( $_topicids ) )
+			/* Tagging */
+			if ( $this->registry->tags->isEnabled() )
 			{
-				$this->DB->build( array( 'select' => 'tid, forum_id',
-								  		 'from'   => 'topics',
-										 'where'  => 'tid IN (' . implode( ',', $_topicids ) . ')',
-										 'order'  => 'start_date DESC',
-										 'limit'  => array( 0, 150 ) ) );
-				$this->DB->execute();
-
-				while( $row = $this->DB->fetch() )
-				{
-					$forumIDs[ $row['forum_id'] ] = $row['forum_id'];
-				}
+				$this->registry->tags->updateVisibilityByMetaId( $tagTopicIDs, 0 );
 			}
+
+			/* Likes */
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like	= classes_like::bootstrap( 'forums', 'topics' );
+			$_like->toggleVisibility( $tagTopicIDs, false );
 		}
 		
-		//-----------------------------------------
-		// Set up trash can
-		//-----------------------------------------
+		if ( $postFind )
+		{
+			/* Update the posts to delete */
+			$this->DB->update( 'posts', array( 'queued' => $this->registry->class_forums->fetchPostHiddenFlag('pdelete'), 'pdelete_time' => IPS_UNIX_TIME_NOW ), $postFind );
 		
-		$this->_takeOutTrash();
+			/* Fetch unique forum IDs */
+			$this->DB->build( array( 'select'   => $this->DB->buildDistinct( 't.forum_id' ),
+							  		 'from'     => array( 'topics' => 't' ),
+									 'where'    => 'p.author_id=' . $memberID . ' AND p.new_topic=0 AND p.topic_id=t.tid',
+									 'add_join' => array( array( 'select' => '',
+																 'from'   => array( 'posts' => 'p' ),
+																 'type'   => 'inner' ) ) ) );
+			$this->DB->execute();
+			
+			while( $row = $this->DB->fetch() )
+			{
+				$forumIDs[ $row['forum_id'] ] = $row['forum_id'];
+			}
+			
+			/* Fetch unique topic IDs */
+			$this->DB->build( array( 'select'   => $this->DB->buildDistinct( 'topic_id' ),
+							  		 'from'     => 'posts',
+									 'where'    => $postFind,
+									 'order'    => 'topic_id DESC',
+									 'limit'    => array( 0, 2000 ) ) );
+			$this->DB->execute();
+			
+			while( $row = $this->DB->fetch() )
+			{
+				$topicIDs[ $row['topic_id'] ] = $row['topic_id'];
+			}
+		}
 		
 		//-----------------------------------------
 		// Delete topics...
@@ -370,41 +383,9 @@ class moderatorLibrary
 		
 		if ( is_array( $topicIDs ) AND count( $topicIDs ) )
 		{
-			if ( $this->trash_forum )
+			foreach( $topicIDs as $id )
 			{
-				//-----------------------------------------
-				// Move, don't delete
-				//-----------------------------------------
-
-				$this->topicMove( $topicIDs, 0, $this->trash_forum );
-				
-				$this->forumRecount( $this->trash_forum );
-			}
-			else
-			{
-				$this->topicDelete( $topicIDs, 1 );
-			}
-		}
-		
-		//-----------------------------------------
-		// Delete posts...
-		//-----------------------------------------
-		
-		if ( is_array( $postIDs ) AND count( $postIDs ) )
-		{
-			if ( $this->trash_forum )
-			{
-				//-----------------------------------------
-				// Move, don't delete
-				//-----------------------------------------
-
-				//$this->topicMove( $topicsIDs, 0, $this->trash_forum );
-				
-				$this->forumRecount( $this->trash_forum );
-			}
-			else
-			{
-				$this->postDelete( $postIDs );
+				$this->rebuildTopic( $id, 0 );
 			}
 		}
 		
@@ -417,7 +398,7 @@ class moderatorLibrary
 			}
 		}
 		
-		$this->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		return TRUE;
 	}
@@ -438,11 +419,13 @@ class moderatorLibrary
 		
 		$_restoreTopic	= 1;
 		$_deletedPost	= 0;
+		$_pdeleteTs		= 0;
 		
 		if ( $delete === TRUE )
 		{
-			$_restoreTopic = -1;
-			$_deletedPost  = 2;
+			$_restoreTopic	= -1;
+			$_deletedPost	= 2;
+			$_pdeleteTs		= IPS_UNIX_TIME_NOW;
 		}
 		
 		$_topics	= array();
@@ -506,7 +489,7 @@ class moderatorLibrary
 	
 		if ( count( $_pids ) )
 		{
-			$this->DB->update( 'posts', array( 'queued' => $_deletedPost ), 'pid IN (' . implode( ",", $_pids ) . ')' );
+			$this->DB->update( 'posts', array( 'queued' => $_deletedPost, 'pdelete_time' => $_pdeleteTs ), 'pid IN (' . implode( ",", $_pids ) . ')' );
 			
 			if ( $_deletedPost )
 			{
@@ -567,7 +550,7 @@ class moderatorLibrary
 			}
 		}
 		
-		$this->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		return TRUE;
 	}
@@ -599,7 +582,7 @@ class moderatorLibrary
 		$_forumIDs	= array();
 		$_pids		= IPSLib::cleanIntArray( $postIDs );
 		$_tids		= array();
-		
+						
 		//-----------------------------------------
 		// Fetch distinct topic IDs
 		//-----------------------------------------
@@ -651,13 +634,15 @@ class moderatorLibrary
 						}
 						else
 						{
+							/* @link	http://community.invisionpower.com/tracker/issue-33622-approveunapprove-and-old-posts */
+							$_pids[]					= $t;
 							$_tids[ $topicData['tid'] ]	= $topicData['tid'];
 						}
 					}
 				//}
 			}
 		}
-	
+			
 		if ( count( $_pids ) )
 		{
 			$this->DB->update( 'posts', array( 'queued' => $_queuedPost ), 'pid IN (' . implode( ",", $_pids ) . ')' );
@@ -687,7 +672,7 @@ class moderatorLibrary
 				$this->addModerateLog( $topicData['forum_id'], $tid, 0, $topicData['title'], sprintf( $this->lang->words['acp_unapproved_posts'], count( $_pids ), $topicData['title'] ) );
 			}
 		}
-
+		
 		foreach( $_topics as $tid => $topicData )
 		{
 			$this->rebuildTopic( $tid );
@@ -701,7 +686,7 @@ class moderatorLibrary
 			}
 		}
 		
-		$this->statsRecount();
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		return TRUE;
 	}
@@ -712,7 +697,7 @@ class moderatorLibrary
 	 * @param	string		[topic|post] Type of item moved
 	 * @param	mixed		ID of topic or post, or array of ids
 	 * @param	boolean		Was content approved?
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearModQueueTable( $type, $typeId, $approved=false )
 	{
@@ -720,7 +705,7 @@ class moderatorLibrary
 		// Get post class..
 		//-----------------------------------------
 
-		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+		require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 		$_postClass  = new $classToLoad( $this->registry );
 		
@@ -738,9 +723,9 @@ class moderatorLibrary
 		}
 
 		//-----------------------------------------
-		// Was content deleted or moved to trash forum
+		// Was content deleted
 		//-----------------------------------------
-		
+				
 		if( ! $approved )
 		{
 			$this->DB->delete( 'mod_queued_items', "type='{$type}' AND {$where}" );
@@ -831,9 +816,10 @@ class moderatorLibrary
 										
 					$this->DB->delete( 'mod_queued_items', 'id=' . $r['id'] );
 				}
+				
 			}
 		}
-		
+				
 		$this->addModerateLog( $this->request['f'], $this->request['t'], $this->request['p'], $this->topic['title'], sprintf( $this->lang->words['modqueue_table_clear'], $type, is_array($typeId) ? implode( ', ', $typeId ) : $typeId ) );
 	}
 
@@ -877,6 +863,115 @@ class moderatorLibrary
 			}
 		}
 		
+		/* Set ids */
+		$_ids = ( is_array( $id ) ) ? $id : array( $id );
+		
+		/* Fetch unique topic IDs */
+		$this->DB->build( array( 'select'   => $this->DB->buildDistinct( 'topic_id' ),
+						  		 'from'     => 'posts',
+								 'where'    => 'pid' . $pid ) );
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$topics[ $row['topic_id'] ] = $row['topic_id'];
+		}
+			
+		/* Update the posts to delete */
+		$this->DB->update( 'posts', array( 'queued' => $this->registry->class_forums->fetchPostHiddenFlag('pdelete'), 'pdelete_time' => IPS_UNIX_TIME_NOW ), 'pid' . $pid );
+		
+		//-----------------------------------------
+		// Update the stats
+		//-----------------------------------------
+		
+		$this->cache->rebuildCache( 'stats', 'global' );
+
+		//-----------------------------------------
+		// Update all relevant topics
+		//-----------------------------------------
+		
+		foreach( array_keys($topics) as $tid )
+		{
+			$this->rebuildTopic( $tid );
+		}
+		
+		if ( count( $topics ) )
+		{
+			$this->DB->build( array( 'select' => 'forum_id',
+									 'from'   => 'topics',
+									 'where'  => 'tid IN (' . implode( ',', array_keys( $topics ) ) . ')' ) );
+									 
+			$i = $this->DB->execute();
+			
+			while( $row = $this->DB->fetch( $i ) )
+			{
+				$fids[ $row['forum_id'] ] = $row['forum_id'];
+			}
+		}
+		
+		if ( count( $fids ) )
+		{
+			foreach( $fids as $f )
+			{
+				$this->forumRecount( $f );
+			}
+		}
+		
+		/* Run moderation sync */
+		$this->runModSync( 'postDelete', array_keys( $posts ) );
+		
+		//-----------------------------------------
+		// Log and return
+		//-----------------------------------------
+		
+		$pid = str_replace( array( 'IN', '(', ')', '=' ), '', $pid );
+		
+		$this->addModerateLog( "", "", "", $this->lang->words['mod_from_id'] . ' ' . implode( ',', array_keys($topics) ), sprintf( $this->lang->words['multi_post_delete'], implode( ', ', $_ids ) ) );
+		
+		return array_keys($topics);
+	}
+	
+	/**
+	 * Delete a post
+	 *
+	 * @param	mixed 		Post id | Array of post ids
+	 * @param	bool		Skip rebuilding stats/forums
+	 * @return	array		Topic IDs
+	 */
+	public function postDeleteFromDb( $id, $nostats=false )
+	{
+		$posts			= array();
+		$attach_tid		= array();
+		$attach_ids		= array();
+		$topics			= array();
+		$fids           = array();
+		$this->error	= "";
+
+		if ( is_array( $id ) )
+		{
+			$id = IPSLib::cleanIntArray( $id );
+			
+			if ( count($id) > 0 )
+			{
+				$pid = " IN(" . implode( ",", $id ) . ")";
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			if ( intval($id) )
+			{
+				$pid   = "={$id}";
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
 		/* Remove from deletion log */
 		$_ids = ( is_array( $id ) ) ? $id : array( $id );
 		IPSDeleteLog::removeEntries( $_ids, 'post', TRUE );
@@ -892,12 +987,12 @@ class moderatorLibrary
 		{
 			$posts[ $r['pid'] ]			= $r['topic_id'];
 			$topics[ $r['topic_id'] ]	= 1;
-			
-			/* Delete from rep cache */
-			$this->DB->delete( 'reputation_cache', "app='forums' AND type='pid' AND type_id={$r['pid']}" );
-			$this->DB->delete( 'reputation_index', "app='forums' AND type='pid' AND type_id={$r['pid']}" );
 		}
 		
+		/* Delete from rep cache */
+		$this->DB->delete( 'reputation_cache', "app='forums' AND type='pid' AND type_id" . $pid );
+		$this->DB->delete( 'reputation_index', "app='forums' AND type='pid' AND type_id" . $pid );
+		
 		//-----------------------------------------
 		// Is there an attachment to this post?
 		//-----------------------------------------
@@ -917,12 +1012,6 @@ class moderatorLibrary
 		
 		/* Remove cache content */
 		IPSContentCache::drop( 'post', array_keys( $posts ) );
-		
-		//-----------------------------------------
-		// Update the stats
-		//-----------------------------------------
-		
-		$this->cache->rebuildCache( 'stats', 'global' );
 
 		//-----------------------------------------
 		// Update all relevant topics
@@ -933,26 +1022,35 @@ class moderatorLibrary
 			$this->rebuildTopic( $tid );
 		}
 		
-		if ( count( $topics ) )
-		{
-			$this->DB->build( array( 'select' => 'forum_id',
-									 'from'   => 'topics',
-									 'where'  => 'tid IN (' . implode( ',', array_keys( $topics ) ) . ')' ) );
-									 
-			$i = $this->DB->execute();
-			
-			while( $row = $this->DB->fetch( $i ) )
-			{
-				$fids[ $row['forum_id'] ] = $row['forum_id'];
-			}
-		}
+		//-----------------------------------------
+		// Update the stats
+		//-----------------------------------------
 		
-		if ( count( $fids ) )
+		if( !$nostats )
 		{
-			foreach( $fids as $f )
+			if ( count( $topics ) )
 			{
-				$this->forumRecount( $f );
+				$this->DB->build( array( 'select' => 'forum_id',
+										 'from'   => 'topics',
+										 'where'  => 'tid IN (' . implode( ',', array_keys( $topics ) ) . ')' ) );
+										 
+				$i = $this->DB->execute();
+				
+				while( $row = $this->DB->fetch( $i ) )
+				{
+					$fids[ $row['forum_id'] ] = $row['forum_id'];
+				}
 			}
+			
+			if ( count( $fids ) )
+			{
+				foreach( $fids as $f )
+				{
+					$this->forumRecount( $f );
+				}
+			}
+			
+			$this->cache->rebuildCache( 'stats', 'global' );
 		}
 		
 		/* Run moderation sync */
@@ -964,7 +1062,7 @@ class moderatorLibrary
 		
 		$pid = str_replace( array( 'IN', '(', ')', '=' ), '', $pid );
 		
-		$this->addModerateLog( "", "", "", $pid, sprintf( $this->lang->words['multi_post_delete'], $_ids ) );
+		$this->addModerateLog( "", "", "", $this->lang->words['mod_from_id'] . ' ' . implode( ',', array_keys($topics) ), sprintf( $this->lang->words['multi_post_delete'], implode( ',', $_ids ) ) );
 		
 		return array_keys($topics);
 	}
@@ -995,31 +1093,36 @@ class moderatorLibrary
 		// Get the correct number of replies
 		//-----------------------------------------
 		
-		$posts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and queued=0" ) );
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), '' );
+		$posts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and {$_queued}" ) );
 		$pcount		= intval( $posts['posts'] - 1 );
 		
 		//-----------------------------------------
 		// Get the correct number of queued replies
 		//-----------------------------------------
 		
-		$qposts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and queued=1" ) );
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'hidden' ), '' );
+		$qposts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and {$_queued}" ) );
 		$qpcount	= intval( $qposts['posts'] );
 		
 		//-----------------------------------------
 		// Get the correct number of soft deleted replies
 		//-----------------------------------------
 		
-		$dposts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and queued=2" ) );
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'sdelete' ), '' );
+		$dposts		= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$tid} and {$_queued}" ) );
 		$dpcount	= intval( $dposts['posts'] );
 		
 		//-----------------------------------------
 		// Get last post info
 		//-----------------------------------------
 		
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+		
 		$last_post	= $this->DB->buildAndFetch( array(
 													'select'	=> 'p.post_date, p.topic_id, p.author_id, p.author_name, p.pid',
 													'from'		=> array( 'posts' => 'p' ),
-													'where'		=> 'p.topic_id=' . $tid . ' AND p.queued=0',
+													'where'		=> 'p.topic_id=' . $tid . ' AND ' . $_queued,
 													'order'		=>  $this->settings['post_order_column'] . ' DESC',
 													'limit'		=> array( 1 ),
 													'add_join'	=> array(
@@ -1065,23 +1168,13 @@ class moderatorLibrary
 		// Get number of attachments
 		//-----------------------------------------
 		
-		$attach = $this->DB->buildAndFetch( array( 
-													'select'    => 'COUNT(*) as count',
-													'from'	    => array( 'attachments' => 'a' ),
-													'where'	    => "p.topic_id={$tid} AND a.attach_rel_module='post'",
-													'add_join'	=> array(
-																			array( 
-																					'from'	=> array( 'posts' => 'p' ),
-																					'where'	=> 'p.pid=a.attach_rel_id',
-																					'type'	=> 'left'
-																				) ) ) );
+		$attach = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count', 'from' => 'attachments', 'where' => "attach_parent_id={$tid} AND attach_rel_module='post'" ) );
 
 		//-----------------------------------------
 		// Update topic
 		//-----------------------------------------
 		
-		$this->DB->force_data_type = array( 'starter_name'		=> 'string',
-											'last_poster_name'	=> 'string' );		
+		$this->DB->setDataType( array( 'starter_name', 'last_poster_name' ), 'string' );
 
 		$this->DB->update( 'topics', array( 
 											'last_post'			  => intval($last_post['post_date'] ? $last_post['post_date'] : $first_post['post_date']),
@@ -1104,7 +1197,7 @@ class moderatorLibrary
 		// Update first post
 		//-----------------------------------------
 
-		if( ( ! isset( $first_post['new_topic'] ) OR $first_post['new_topic'] != 1 ) and $first_post['pid'] )
+		if( empty( $first_post['new_topic'] ) and $first_post['pid'] )
 		{
 			$this->DB->update( 'posts', array( 'new_topic' => 0 ), 'topic_id=' . $tid, true );
 			$this->DB->update( 'posts', array( 'new_topic' => 1 ), 'pid=' . $first_post['pid'], true );
@@ -1120,7 +1213,7 @@ class moderatorLibrary
 			$tt = $this->DB->buildAndFetch( array(	
 													'select'	=> 'title, tid, last_post, last_poster_id, last_poster_name',
 													'from'		=> 'topics',
-													'where'		=> 'forum_id=' . $last_post['forum_id'] . ' and approved=1',
+													'where'		=> 'forum_id=' . $last_post['forum_id'] . ' and ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ),
 													'order'		=> 'last_post desc',
 													'limit'		=> array( 1 )
 										)	);
@@ -1142,7 +1235,7 @@ class moderatorLibrary
 				$tt = $this->DB->buildAndFetch( array( 
 														'select' => 'title, tid',
 														'from'	 => 'topics',
-														'where'	 => 'forum_id=' . $this->forum['id'] . ' and approved=1',
+														'where'	 => 'forum_id=' . $this->forum['id'] . ' and ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ),
 														'order'	 => 'start_date desc',
 														'limit'	 => array( 1 )
 											)	);
@@ -1152,12 +1245,8 @@ class moderatorLibrary
 				$dbs['seo_last_title']  = IPSText::makeSeoTitle( $tt['title'] );
 			}
 			
-			$this->DB->force_data_type = array( 'last_poster_name'	=> 'string',
-												'seo_last_title'	=> 'string',
-												'seo_last_name'     => 'string',
-												'last_title'		=> 'string',
-												'newest_title'		=> 'string' );
-			
+			$this->DB->setDataType( array( 'last_poster_name', 'seo_last_title', 'seo_last_name', 'last_title', 'newest_title' ), 'string' );
+
 			$this->DB->update( 'forums', $dbs, "id=" . intval($this->forum['id']) );
 		}
 
@@ -1171,8 +1260,6 @@ class moderatorLibrary
 	 * @param 	array		Array of topic ids to apply this reply to
 	 * @param	boolean		Increment post count?
 	 * @return	boolean		Reply added
-	 * @todo 	[Future] Would better using the new posting libs so that topic subs, etc are triggered maybe.
-	 *			Though, do we really want topic subs triggered on a multi-mod?
 	 */
 	public function topicAddReply($post="", $tids=array(), $incpost=0)
 	{
@@ -1238,7 +1325,7 @@ class moderatorLibrary
 							  'last_post'			=> $pa['post_date'],
 							);
 				
-				$this->DB->force_data_type = array( 'last_poster_name' => 'string', 'seo_last_name' => 'string' );		
+				$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name' ), 'string' );
 
 				$this->DB->buildAndFetch( array( 'update' => 'topics', 'set' => $this->DB->compileUpdateString( $ta ) . ", posts=posts+1", 'where' => 'tid='.$tid ) );
 
@@ -1251,18 +1338,7 @@ class moderatorLibrary
 				$this->registry->classItemMarking->markRead( array( 'forumID' => $fid, 'itemID' => $tid ) );
 			}
 		}
-				
-		if ( $this->auto_update != false )
-		{
-			if ( count($seen_fids) > 0 )
-			{
-				foreach( $seen_fids as $id )
-				{
-					$this->forumRecount( $id );
-				}
-			}
-		}
-		
+
 		if ( $add_posts > 0 )
 		{
 			$this->cache->rebuildCache( 'stats', 'global' );
@@ -1376,13 +1452,15 @@ class moderatorLibrary
 		$posts			= array();
 		$attach			= array();
 		$this->error	= "";
-
+		$ids            = array();
+		
 		if ( is_array( $id ) )
 		{
 			$id = IPSLib::cleanIntArray( $id );
 			
 			if ( count($id) > 0 )
 			{
+				$ids = $id;
 				$tid = " IN(" . implode( ",", $id ) . ")";
 			}
 			else
@@ -1395,6 +1473,83 @@ class moderatorLibrary
 			if ( intval($id) )
 			{
 				$tid   = "={$id}";
+				$ids   = array( $id );
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		/* Set ids */
+		$_ids = ( is_array( $id ) ) ? $id : array( $id );
+		
+		/* Update the posts to delete */
+		$this->DB->update( 'topics', array( 'approved' => $this->registry->class_forums->fetchTopicHiddenFlag('pdelete'), 'tdelete_time' => IPS_UNIX_TIME_NOW ), 'tid' . $tid );
+		
+		/* Tagging */
+		$this->registry->tags->updateVisibilityByMetaId( $ids, 0 );
+
+		/* Likes */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->toggleVisibility( $ids, false );
+		
+		//-----------------------------------------
+		// Recount forum...
+		//-----------------------------------------
+		
+		if ( !$nostats )
+		{
+			if ( $this->forum['id'] )
+			{
+				$this->registry->class_forums->allForums[ $this->forum['id'] ]['_update_deletion'] = 1;
+				$this->forumRecount( $this->forum['id'] );
+			}
+			
+			$this->cache->rebuildCache( 'stats', 'global' );
+		}
+		
+		/* Run moderation sync */
+		$this->runModSync( 'topicDelete', $_ids );
+
+		return TRUE;
+	}
+	
+	/**
+	 * Delete a topic
+	 *
+	 * @param	mixed 		Topic id | Array of topic ids
+	 * @param	boolean		Skip updating the stats
+	 * @return	boolean
+	 */
+	public function topicDeleteFromDB( $id, $nostats=0 )
+	{
+		$posts			= array();
+		$attach			= array();
+		$this->error	= "";
+		$ids            = array();
+		
+		if ( is_array( $id ) )
+		{
+			$id = IPSLib::cleanIntArray( $id );
+			
+			if ( count($id) > 0 )
+			{
+				$ids = $id;
+				$tid = " IN(" . implode( ",", $id ) . ")";
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			if ( intval($id) )
+			{
+				$ids = array( $id );
+				$tid   = "={$id}";
 			}
 			else
 			{
@@ -1403,8 +1558,10 @@ class moderatorLibrary
 		}
 		
 		/* Remove from deletion log */
-		$_ids = ( is_array( $id ) ) ? $id : array( $id );
-		IPSDeleteLog::removeEntries( $_ids, 'topic', TRUE );
+		IPSDeleteLog::removeEntries( $ids, 'topic', TRUE );
+		
+		/* Tagging */
+		$this->registry->tags->deleteByMetaId( $ids );
 		
 		//-----------------------------------------
 		// Remove polls assigned to this topic
@@ -1412,10 +1569,17 @@ class moderatorLibrary
 		
 		$this->DB->delete( 'polls', "tid" . $tid );
 		$this->DB->delete( 'voters', "tid" . $tid );
-		$this->DB->delete( 'tracker', "topic_id" . $tid );
 		$this->DB->delete( 'topic_ratings', "rating_tid" . $tid );	
 		$this->DB->delete( 'topic_views', "views_tid" . $tid );
 		$this->DB->delete( 'topics', "tid" . $tid );
+
+		//-----------------------------------------
+		// Like class
+		//-----------------------------------------
+		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->remove( $ids );
 		
 		//-----------------------------------------
 		// Get PIDS for attachment deletion
@@ -1463,11 +1627,11 @@ class moderatorLibrary
 				$this->forumRecount( $this->forum['id'] );
 			}
 			
-			$this->statsRecount();
+			$this->cache->rebuildCache( 'stats', 'global' );
 		}
 		
 		/* Run moderation sync */
-		$this->runModSync( 'topicDelete', $_ids );
+		$this->runModSync( 'topicDelete', $ids );
 
 		return TRUE;
 	}
@@ -1487,6 +1651,7 @@ class moderatorLibrary
 		$source			= intval($source);
 		$moveto			= intval($moveto);
 		$forumIDSQL     = ( $source ) ? " forum_id={$source} AND " : '';
+		$ids            = array();
 		
 		if ( is_array( $topics ) )
 		{
@@ -1495,27 +1660,28 @@ class moderatorLibrary
 			if ( count($topics) > 0 )
 			{
 				$tid = " IN(" . implode( ",", $topics ) . ")";
+				$ids = $topics;
 			}
 			else
 			{
 				return false;
 			}
-			
+
 			//-----------------------------------------
 			// Mark as read in new forum
 			//-----------------------------------------
-			
-			/* Bug #21052 */
-			//foreach( $topics as $topicId )
-			//{
-			//	$this->registry->classItemMarking->markRead( array( 'forumID' => $moveto, 'itemID' => $topicId ), 'forums' );
-			//}
+
+			foreach( $topics as $_tid )
+			{	
+				$this->registry->classItemMarking->markRead( array( 'forumID' => $moveto, 'itemID' => $_tid ), 'forums' );
+			}
 		}
 		else
 		{
 			if ( intval($topics) )
 			{
 				$tid   = "={$topics}";
+				$ids   = array( $topics );
 			}
 			else
 			{
@@ -1552,14 +1718,10 @@ class moderatorLibrary
 
 			while ( $row = $this->DB->fetch($oq) )
 			{
-				$this->DB->force_data_type = array( 'title'				=> 'string',
-													'starter_name'		=> 'string',
-													'last_poster_name'	=> 'string',
-													'seo_last_name'	    => 'string'  );
+				$this->DB->setDataType( array( 'title', 'starter_name', 'last_poster_name', 'seo_last_name' ), 'string' );
 
 				$this->DB->insert( 'topics', array (
 														'title'				=> $row['title'],
-														'description'		=> $row['description'],
 														'state'				=> 'link',
 														'posts'				=> 0,
 														'views'				=> 0,
@@ -1572,6 +1734,7 @@ class moderatorLibrary
 														'approved'			=> 1,
 														'pinned'			=> 0,
 														'moved_to'			=> $row['tid'] . '&' . $moveto,
+														'moved_on'			=> time(),
 														'last_poster_id'	=> $row['last_poster_id'],
 														'last_poster_name'	=> $row['last_poster_name'],
 														'seo_last_name'     => IPSText::makeSeoTitle( $row['starter_name'] ),
@@ -1580,52 +1743,39 @@ class moderatorLibrary
 		
 		}
 		
+		/* Tagging */
+		$this->registry->tags->moveTagsToParentId( $ids, $moveto );
+		
 		//-----------------------------------------
 		// Sort out subscriptions
 		//-----------------------------------------
 		
-		$trid_to_delete = array();
-		
-		$this->DB->build( array( 'select'		=> 'tr.*',
-										'from'		=> array( 'tracker' => 'tr' ),
-										'where'		=> 'tr.topic_id' . $tid,
-										'add_join'	=> array(
-															array( 'select'	=> 't.tid, t.forum_id',
-																	'from'	=> array( 'topics' => 't' ),
-																	'where'	=> 't.tid=tr.topic_id',
-																	'type'	=> 'left',
-																),
-															array( 'select'	=> 'm.member_id, m.member_group_id, m.org_perm_id',
-																	'from'	=> array( 'members' => 'm' ),
-																	'where'	=> 'm.member_id=tr.member_id',
-																	'type'	=> 'left',
-																),
-															array( 'select'	=> 'g.g_id, g.g_perm_id',
-																	'from'	=> array( 'groups' => 'g' ),
-																	'where'	=> 'g.g_id=m.member_group_id',
-																	'type'	=> 'left',
-																),
-															)
-								)		);
-		$this->DB->execute();
+		$trid_to_delete	= array();
 
-		while ( $r = $this->DB->fetch() )
-		{
-			//-----------------------------------------
-			// Match the perm group against forum_mask
-			//-----------------------------------------
-			
-			$perm_id			= $r['org_perm_id'] ? $r['org_perm_id'] : $r['g_perm_id'];
-			
-			if ( $this->registry->permissions->check( 'read', $this->registry->class_forums->allForums[ $moveto ], explode( ',', IPSText::cleanPermString( $perm_id ) ) ) !== TRUE )
-			{
-				$trid_to_delete[] = $r['trid'];
-			}	
-		}
+		//-----------------------------------------
+		// Like class - remove if you don't have access
+		//-----------------------------------------
 		
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$topics	= $_like->getDataByRelationshipId( $tid );
+		
+		if( count($topics) )
+		{
+			foreach( $topics as $r )
+			{
+				$perm_id	= $r['org_perm_id'] ? $r['org_perm_id'] : $r['g_perm_id'];
+				
+				if ( $this->registry->permissions->check( 'read', $this->registry->class_forums->allForums[ $moveto ], explode( ',', IPSText::cleanPermString( $perm_id ) ) ) !== TRUE )
+				{
+					$trid_to_delete[]	= $r['like_id'];
+				}
+			}
+		}
+
 		if ( count($trid_to_delete) > 0 )
 		{
-			$this->DB->delete( 'tracker', "trid IN(" . implode( ',', $trid_to_delete ) . ")" );
+			$this->DB->delete( 'core_like', "like_id IN('" . implode( "','", $trid_to_delete ) . "')" );
 		}
 		
 		return true;
@@ -1688,7 +1838,7 @@ class moderatorLibrary
 			$this->rebuildTopic( $tid );
 			
 			/* Mod log */
-			$this->addModerateLog( $topicData['forum_id'], $tid, 0, $topicData['title'], sprintf( $this->lang->words['acp_altered_topics'], array(), $topicData['title'] ) );
+			$this->addModerateLog( $topicData['forum_id'], $tid, 0, $topicData['title'], sprintf( $this->lang->words['acp_altered_topics'], "approved={$_restoreTopic}", $topicData['title'] ) );
 		}
 		
 		/* Restoring */
@@ -1706,24 +1856,19 @@ class moderatorLibrary
 			}
 		}
 		
-		$this->statsRecount();
+		/* Tagging */
+		$this->registry->tags->updateVisibilityByMetaId( $_tids, ( $delete ? 0 : 1 ) );
+
+		/* Likes */
+		require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+		$_like	= classes_like::bootstrap( 'forums', 'topics' );
+		$_like->toggleVisibility( $_tids, $delete );
+		
+		$this->cache->rebuildCache( 'stats', 'global' );
 		
 		return TRUE;
 	}
-	
-	/**
-	 * Recount total topics and replies for site statistics
-	 *
-	 * @return	boolean
-	 */
-	public function statsRecount()
-	{
-		$this->cache->rebuildCache( 'stats', 'global' );
-		
-		return true;
-	}
-	
-	
+
 	/**
 	 * Recount a forum
 	 *
@@ -1731,18 +1876,11 @@ class moderatorLibrary
 	 */
 	public function forumRecount( $fid="" )
 	{
-		$fid = intval($fid);
+		$fid	= $fid ? intval($fid) : $this->forum['id'];
 		
 		if ( ! $fid )
 		{
-			if ( $this->forum['id'] )
-			{
-				$fid = $this->forum['id'];
-			}
-			else
-			{
-				return false;
-			}
+			return false;
 		}
 		
 		//-----------------------------------------
@@ -1751,7 +1889,7 @@ class moderatorLibrary
 		
 		$topics			= $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
 														   'from'	=> 'topics',
-														   'where'	=> "approved=1 and forum_id={$fid}" ) );
+														   'where'	=> $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) . " and forum_id={$fid}" ) );
 		
 		//-----------------------------------------
 		// Get the QUEUED topics..
@@ -1759,7 +1897,7 @@ class moderatorLibrary
 		
 		$queued_topics	= $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
 																	'from'	=> 'topics',
-																	'where'	=> "approved=0 and forum_id={$fid}" ) );
+																	'where'	=> $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'hidden' ), '' ) . " and forum_id={$fid}" ) );
 																	
 		//-----------------------------------------
 		// Get the DELETED topics..
@@ -1775,7 +1913,7 @@ class moderatorLibrary
 		
 		$posts			= $this->DB->buildAndFetch( array( 'select'	=> 'SUM(posts) as replies',
 																	'from'	=> 'topics',
-																	'where'	=> "approved=1 and forum_id={$fid}" ) );
+																	'where'	=> $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) . " and forum_id={$fid}" ) );
 		
 		//-----------------------------------------
 		// Get the QUEUED posts..
@@ -1783,7 +1921,7 @@ class moderatorLibrary
 		
 		$queued_posts	= $this->DB->buildAndFetch( array( 'select'	=> 'SUM(topic_queuedposts) as replies',
 																	'from'	=> 'topics',
-																	'where'	=> "forum_id={$fid}" ) );
+																	'where'	=> $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible', 'hidden' ), '' ) . " and forum_id={$fid}" ) );
 		
 		//-----------------------------------------
 		// Get the DELETED posts..
@@ -1799,14 +1937,14 @@ class moderatorLibrary
 		
 		$last_post		= $this->DB->buildAndFetch( array( 'select'	=> 'tid, title, last_poster_id, last_poster_name, seo_last_name, last_post',
 																	'from'	=> 'topics',
-																	'where'	=> "approved=1 and forum_id={$fid}",
+																	'where'	=> $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) . " and forum_id={$fid}",
 																	'order'	=> 'last_post DESC',
 																	'limit'	=> array( 1 ) 
 														)		);
 		
 		$newest_topic	= $this->DB->buildAndFetch( array( 'select'	=> 'title, tid, seo_first_name',
 																	'from'	=> 'topics',
-																	'where'	=> 'forum_id=' . $fid . ' and approved=1',
+																	'where'	=> 'forum_id=' . $fid . ' and ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ),
 																	'order'	=> 'start_date desc',
 																	'limit'	=> array( 1 )
 															)	  );
@@ -1842,12 +1980,8 @@ class moderatorLibrary
 			$dbs['forum_last_deletion'] = time();
 		}
 		
-		$this->DB->force_data_type = array( 'last_poster_name'	=> 'string',
-											'last_title'		=> 'string',
-											'newest_title'		=> 'string',
-											'seo_last_title'    => 'string',
-											'seo_last_name'     => 'string'  );		
-												 
+		$this->DB->setDataType( array( 'last_poster_name', 'last_title', 'newest_title', 'seo_last_title', 'seo_last_name' ), 'string' );
+
 		$this->DB->update( 'forums', $dbs, "id=" . $fid );
 
 		return true;
@@ -1984,23 +2118,6 @@ class moderatorLibrary
 		return TRUE;
 	}
 	
-	/**
-	 * Multi-statement update topic description topic
-	 *
-	 * @return	boolean
-	 */
-	public function stmAddDesc($new_desc='')
-	{
-		if ( $new_desc == "" )
-		{
-			return FALSE;
-		}
-		
-		$this->stm[] = array( 'description' => $new_desc );
-		
-		return TRUE;
-	}
-	
 	/**
 	 * Multi-statement approve topic
 	 *
@@ -2032,7 +2149,7 @@ class moderatorLibrary
 	 */
 	public function sqlPruneCreate( $forum_id, $starter_id="", $topic_state="", $post_min="", $date_exp="", $ignore_pin="" )
 	{
-		$sql = 'forum_id=' . intval($forum_id);
+		$sql = 'forum_id=' . intval($forum_id) . ' AND approved < 2';
 
 		if ( intval($date_exp) )
 		{
@@ -2118,7 +2235,7 @@ class moderatorLibrary
 	 */
 	public function addModerateLog($fid, $tid, $pid, $t_title, $mod_title='Unknown')
 	{
-		$this->DB->force_data_type = array( 'member_name' => 'string' );	
+		$this->DB->setDataType( 'member_name', 'string' );
 		
 		$this->DB->insert( 'moderator_logs', array (
 												  'forum_id'		=> intval($fid),
@@ -2158,19 +2275,18 @@ class moderatorLibrary
 			{
 				/* Setup */
 				$_file  = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/forumDataSync.php';
-				$_class = $app['app_directory'] . '_forumDataSync';
 					
 				/* Check for the file */
-				if( file_exists( $_file ) )
+				if( is_file( $_file ) )
 				{
 					/* Get the file */
-					require_once( $_file );
-	
+					$classToLoad = IPSLib::loadLibrary( $_file, $app['app_directory'] . '_forumDataSync', $app['app_directory'] );
+					
 					/* Check for the class */
-					if( class_exists( $_class ) )
+					if( class_exists( $classToLoad ) )
 					{
 						/* Create an object */
-						$_obj = new $_class( $this->registry );
+						$_obj = new $classToLoad( $this->registry );
 	
 						/* Check for the module */
 						if( method_exists( $_obj, $func ) )
@@ -2183,36 +2299,4 @@ class moderatorLibrary
 			}
 		}
 	}
-	
-	/**
-	 * Setup the trash can forum
-	 *
-	 * @author	Brandon Farber
-	 * @return	void
-	 */
-	private function _takeOutTrash()
-	{
-		if ( $this->settings['forum_trash_can_enable'] and $this->settings['forum_trash_can_id'] )
-		{
-			if ( $this->registry->class_forums->allForums[ $this->settings['forum_trash_can_id'] ]['sub_can_post'] )
-			{
-				if ( $this->memberData['g_access_cp'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_admin'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else if ( $this->memberData['g_is_supmod'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_smod'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else if ( $this->memberData['is_mod'] )
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_use_mod'] ? $this->settings['forum_trash_can_id'] : 0;
-				}
-				else
-				{
-					$this->trash_forum = $this->settings['forum_trash_can_id'];
-				}
-			}
-		}
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/post/classPost.php b/upload/admin/applications/forums/sources/classes/post/classPost.php
index 763c67e1..7a0c7867 100644
--- a/upload/admin/applications/forums/sources/classes/post/classPost.php
+++ b/upload/admin/applications/forums/sources/classes/post/classPost.php
@@ -2,19 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Moderator actions
- * Last Updated: $Date: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $Date: 2011-10-10 16:21:29 -0400 (Mon, 10 Oct 2011) $
  * </pre>
  * File Created By: Matt Mecham
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7023 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9590 $
+ * 
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -103,7 +104,7 @@ class classPost
 	 *
 	 * @var		array
 	 */
-	private $_internalData = array();
+	protected $_internalData = array();
 	
 	/**
 	 * Internal post error string
@@ -125,14 +126,7 @@ class classPost
 	 * @var		int
 	 */
 	protected $edit_title	= 0;
-	
-	/**
-	 * Topic Description
-	 *
-	 * @var		string
-	 */
-	protected $_topicDescription = '';
-	
+
 	/**#@+
 	 * Poll data
 	 *
@@ -147,7 +141,7 @@ class classPost
 	 *
 	 * @var		array
 	 */
-	private $_allowedInternalData = array( 'Author',
+	protected $_allowedInternalData = array( 'Author',
 										   'ForumID',
 										   'TopicID',
 										   'PostID',
@@ -166,21 +160,21 @@ class classPost
 	 *
 	 * @var 	array
 	 */
-	private $_forumData = array();
+	protected $_forumData = array();
 	
 	/**
 	 * Topic Data
 	 *
 	 * @var 	array
 	 */
-	private $_topicData = array();
+	protected $_topicData = array();
 	
 	/**
 	 * Post Data
 	 *
 	 * @var 	array
 	 */
-	private $_postData = array();
+	protected $_postData = array();
 	
 	/**
 	 * Bypass all permission checks
@@ -189,13 +183,13 @@ class classPost
 	 * 
 	 * @var		boolean
 	 */
-	private $_bypassPermChecks = false;
+	protected $_bypassPermChecks = false;
 	
 	/**
 	 * Construct
 	 *
 	 * @param	object	ipsRegistry Object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -221,6 +215,23 @@ class classPost
 		
 		/* Prevent some notices */
 		$this->request['mod_options']	= isset($this->request['mod_options']) ? $this->request['mod_options'] : null;
+		
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$this->editor = new $classToLoad();
+		
+		/* Load tagging stuff */
+		if ( ! $this->registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
+		
+		if ( ! $this->registry->isClassLoaded('topics') )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+			$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+		}
 	}
 	
 	/**
@@ -269,6 +280,22 @@ class classPost
 							$this->_internalData[ $theRest ] = IPSMember::setUpGuest();
 						}
 					}
+					
+					if( $this->_internalData['Author']['mgroup_others'] )
+					{
+						$_others	= explode( ',', IPSText::cleanPermString( $this->_internalData['Author']['mgroup_others'] ) );
+						$_perms		= array();
+						
+						foreach( $_others as $_other )
+						{
+							$_perms[]	= $this->caches['group_cache'][ $_other ]['g_perm_id'];
+						}
+						
+						if( count($_perms) )
+						{
+							$this->_internalData['Author']['g_perm_id']	= $this->_internalData['Author']['g_perm_id'] . ',' . implode( ',', $_perms );
+						}
+					}
 				}
 				else
 				{
@@ -302,7 +329,7 @@ class classPost
 					$this->_topicData = $arguments[0];
 				break;
 				case 'getForumData':
-					if ( isset($arguments[0]) AND $arguments[0] )
+					if ( !empty($arguments[0]) )
 					{
 						return $this->_forumData[ $arguments[0] ];
 					}
@@ -312,7 +339,7 @@ class classPost
 					}
 				break;
 				case 'getPostData':
-					if ( isset($arguments[0]) AND $arguments[0] )
+					if ( !empty($arguments[0]) )
 					{
 						return $this->_postData[ $arguments[0] ];
 					}
@@ -322,7 +349,7 @@ class classPost
 					}
 				break;
 				case 'getTopicData':
-					if ( isset($arguments[0]) AND $arguments[0] )
+					if ( !empty($arguments[0]) )
 					{
 						return $this->_topicData[ $arguments[0] ];
 					}
@@ -342,7 +369,7 @@ class classPost
 	 * Set the bypass permission flag
 	 *
 	 * @param	boolean
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setBypassPermissionCheck( $bool=false )
 	{
@@ -353,7 +380,7 @@ class classPost
 	 * Set a post error remotely
 	 *
 	 * @param	string		Error
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setPostError( $error )
 	{
@@ -397,39 +424,27 @@ class classPost
 			$this->_topicTitle = $this->cleanTopicTitle( $this->_topicTitle );
 			$this->_topicTitle = IPSText::getTextClass( 'bbcode' )->stripBadWords( $this->_topicTitle );
 			
-			/* Unicode test */
-			if ( IPSText::mbstrlen( $topicTitle ) > $this->settings['topic_title_max_len'] )
+			if( $this->getIsPreview() !== TRUE )
 			{
-				$this->_postErrors = 'topic_title_long';
+				/* Unicode test */
+				if ( IPSText::mbstrlen( $topicTitle ) > $this->settings['topic_title_max_len'] )
+				{
+					$this->_postErrors = 'topic_title_long';
+				}
+			
+				if ( (IPSText::mbstrlen( IPSText::stripslashes( $topicTitle ) ) < 2) or ( ! $this->_topicTitle )  )
+				{
+					$this->_postErrors = 'no_topic_title';
+				}
 			}
-		
-			if ( (IPSText::mbstrlen( IPSText::stripslashes( $topicTitle ) ) < 2) or ( ! $this->_topicTitle )  )
-			{
-				$this->_postErrors = 'no_topic_title';
-			}		
 		}
 	}
-	
-	/**
-	 * Sets the topic descripton.
-	 * You *must* pass a raw GET or POST value. ie, a value that has not been cleaned by parseCleanValue
-	 * as there are unicode checks to perform. This function will test those and clean the topic description for you
-	 *
-	 * @param	string		Topic Title
-	 */
-	public function setTopicDescription( $topicDescription )
-	{
-		$this->_topicDescription = IPSText::parseCleanValue( $topicDescription );
-		$this->_topicDescription = trim( IPSText::getTextClass( 'bbcode' )->stripBadWords( IPSText::stripAttachTag( $this->_topicDescription ) ) );
-		$this->_topicDescription = preg_replace( "/&(#{0,}([a-zA-Z0-9]+?)?)?$/", '', IPSText::mbsubstr( $this->_topicDescription, 0, 70 ) );
-	}
-	
-	
+
 	/**
 	 * Global checks and set up
 	 * Functions pertaining to ALL posting methods
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * Exception Codes:
 	 * NO_USER_SET			No user has been set
 	 * NO_POSTING_PPD		No posting perms 'cos of PPD
@@ -453,12 +468,6 @@ class classPost
 		//-----------------------------------------
 		// Forum checks
 		//-----------------------------------------
-		
-		# Forum switched off?
-        if ( ! $this->getForumData('status') )
-        {
-        	throw new Exception( 'NO_POST_FORUM' );
-        }
 
         # No forum id?
         if ( ! $this->getForumData('id') )
@@ -478,6 +487,14 @@ class classPost
 			throw new Exception( "NO_USER_SET" );
 		}
 		
+		/* Auto check published */
+		$pub = $this->getPublished();
+		
+		if ( is_string( $pub ) )
+		{
+			$this->setPublished( $this->_checkPostModeration( $pub ) );
+		}
+		
 		//-----------------------------------------
 		// Do we have the member group info for this member?
 		//-----------------------------------------
@@ -600,7 +617,7 @@ class classPost
 	 * @param	array 	Topic data from the DB
 	 * @return	array 	Altered topic data
 	 */
-	private function _modTopicOptions( $topic )
+	protected function _modTopicOptions( $topic )
 	{
 		/* INIT */
 		$topic['state'] = ( $topic['state'] == 'closed' ) ? 'closed' : 'open';
@@ -698,17 +715,17 @@ class classPost
 			// Check close times...
 			//-----------------------------------------
 			
-			if ( $topic['state'] == 'open' AND ( $this->times['close'] AND $this->times['close'] <= time() ) )
+			if ( $topic['state'] == 'open' AND ( $this->times['close'] AND $this->times['close'] <= IPS_UNIX_TIME_NOW ) )
 			{
 				$topic['state'] = 'closed';
 			}
-			else if ( $topic['state'] == 'closed' AND ( $this->times['open'] AND $this->times['open'] >= time() ) )
+			else if ( $topic['state'] == 'closed' AND ( $this->times['open'] AND $this->times['open'] >= IPS_UNIX_TIME_NOW ) )
 			{
 				$topic['state'] = 'open';
 			}
 			
 			if ( $topic['state'] == 'open' AND ( $this->times['open'] OR $this->times['close'] )
-					AND ( $this->times['close'] <= time() OR ( $this->times['open'] > time() AND ! $this->times['close'] ) ) )
+					AND ( $this->times['close'] <= IPS_UNIX_TIME_NOW OR ( $this->times['open'] > IPS_UNIX_TIME_NOW AND ! $this->times['close'] ) ) )
 			{
 				$topic['state'] = 'closed';
 			}
@@ -777,11 +794,11 @@ class classPost
 			$this->_postErrors	= $error->getMessage();
 		}
 		
-		if ( ! $this->getPostContent() AND ! $this->getPostContentPreFormatted() AND !$this->getIsPreview() )
+		if ( ! $this->getPostContent() AND ! $this->getPostContentPreFormatted() AND ! $this->getIsPreview() )
 		{
 			$this->_postErrors	= 'NO_CONTENT';
 		}
-		
+
 		//-----------------------------------------
 		// Get topic
 		//-----------------------------------------
@@ -848,7 +865,7 @@ class classPost
 			// Get check time
 			//-----------------------------------------
 			
-			$time_check = time() - ( $this->settings['post_merge_conc'] * 60 );
+			$time_check = IPS_UNIX_TIME_NOW - ( $this->settings['post_merge_conc'] * 60 );
 			
 			//-----------------------------------------
 			// Last to post?
@@ -900,11 +917,10 @@ class classPost
 					// Update post row
 					//-----------------------------------------
 					
-					$this->DB->force_data_type = array( 'pid'  => 'int',
-													    'post' => 'string' );
-					
-					
-					$_autoMergeData = array( 'post' => $new_post, 'post_date' => time(), 'pid' => $last_post['pid'] );
+					$this->DB->setDataType( 'pid', 'int' );
+					$this->DB->setDataType( 'post', 'string' );
+
+					$_autoMergeData = array( 'post' => $new_post, 'post_date' => IPS_UNIX_TIME_NOW, 'pid' => $last_post['pid'] );
 					
 					/* Data Hook Location */
 					IPSLib::doDataHooks( $_autoMergeData, 'postAutoMerge' );
@@ -930,7 +946,7 @@ class classPost
 				}
 			}
 		}
-		
+
 		//-----------------------------------------
 		// No?
 		//-----------------------------------------
@@ -942,15 +958,14 @@ class classPost
 			//-----------------------------------------
 			
 			$post['post_key']    = $this->post_key;
-			$post['post_parent'] = ipsRegistry::$request['parent_id'] ? intval(ipsRegistry::$request['parent_id']) : 0;
 
 			//-----------------------------------------
 			// Typecast
 			//-----------------------------------------
 			
-			$this->DB->force_data_type = array( 'pid'  => 'int',
-												'post' => 'string' );
-			
+			$this->DB->setDataType( 'pid', 'int' );
+			$this->DB->setDataType( 'post', 'string' );
+
 			/* Data Hook Location */
 			IPSLib::doDataHooks( $post, 'postAddReply' );
 			
@@ -965,7 +980,7 @@ class classPost
 			
 			if ( $post['queued'] )
 			{
-				$this->DB->insert( 'mod_queued_items', array( 'type' => 'post', 'type_id' => $post['pid'] ) );
+				$this->DB->insert( 'mod_queued_items', array( 'type' => 'post', 'type_id' => $post['pid'] ) );/*noLibHook*/
 			}
 			
 			/* Add to cache */
@@ -1024,18 +1039,16 @@ class classPost
 		
 		$poster_name = $this->getAuthor('member_id') ? $this->getAuthor('members_display_name') : $this->request['UserName'];
 		
-		$update_array = array(
-							  'posts'			    => $pcount,
+		$update_array = array('posts'			    => $pcount,
 							  'topic_queuedposts'   => $qpcount,
-							  'topic_deleted_posts' => $dcount
-							 );
+							  'topic_deleted_posts' => $dcount );
 							 
 		if ( $this->getPublished() )
 		{					 
 			$update_array['last_poster_id']   = $this->getAuthor('member_id');
 			$update_array['last_poster_name'] = $poster_name;
 			$update_array['seo_last_name']    = IPSText::makeSeoTitle( $poster_name );
-			$update_array['last_post']        = time();
+			$update_array['last_post']        = IPS_UNIX_TIME_NOW;
 			$update_array['pinned']           = $topic['pinned'];
 			$update_array['state']            = $topic['state'];
 			
@@ -1046,12 +1059,8 @@ class classPost
 		}
 		
 		/* Typecast */
-		$this->DB->force_data_type = array( 'title'            => 'string',
-											'description'      => 'string',
-										    'starter_name'     => 'string',
-										    'seo_last_name'    => 'string',
-										    'last_poster_name' => 'string' );
-		
+		$this->DB->setDataType( array( 'title', 'starter_name', 'seo_last_name', 'last_poster_name' ), 'string' );
+
 		/* Data Hook Location */
 		IPSLib::doDataHooks( $update_array, 'postAddReplyTopicUpdate' );
 													  
@@ -1070,16 +1079,14 @@ class classPost
 				$poll_only = 1;
 			}
 			
-			$_pollData = array(
-								'tid'           => $topic['tid'],
+			$_pollData = array( 'tid'           => $topic['tid'],
 								'forum_id'      => $this->getForumData('id'),
-								'start_date'    => time(),
+								'start_date'    => IPS_UNIX_TIME_NOW,
 								'choices'       => serialize( $this->poll_questions ),
 								'starter_id'    => $this->getAuthor('member_id'),
 								'votes'         => 0,
 								'poll_question' => ipsRegistry::$request['poll_question'],
-								'poll_only'		=> $poll_only,
-							);
+								'poll_only'		=> $poll_only );
 			
 			/* Data Hook Location */
 			IPSLib::doDataHooks( $_pollData, 'postAddReplyPoll' );
@@ -1105,24 +1112,44 @@ class classPost
 		//-----------------------------------------
 		 
 		$this->makeAttachmentsPermanent( $post['post_key'], $post['pid'], 'post', array( 'topic_id' => $topic['tid'] ) );
-	
+		
+		//-----------------------------------------
+		// Send out notifications
+		//-----------------------------------------
+		
+		if ( ! $this->_isMergingPosts AND $this->getPublished() === FALSE )
+		{
+			$this->sendNewTopicForApprovalEmails( $topic['tid'], $topic['title'], $topic['starter_name'], $post['post'], $post['pid'], 'reply' );
+		}
+			
 		//-----------------------------------------
 		// Moderating?
 		//-----------------------------------------
 		
-		if ( ! $this->_isMergingPosts AND ( $this->getPublished() === FALSE ) )
+		if ( ! $this->_isMergingPosts AND $this->getPublished() === FALSE AND $this->getIsAjax() !== TRUE )
 		{
-			//-----------------------------------------
-			// Boing!!!
-			//-----------------------------------------
-			
-			$this->sendNewTopicForApprovalEmails( $topic['tid'], $topic['title'], $topic['starter_name'], $post['post'], $post['pid'], 'reply' );
-			
 			$page = floor( $topic['posts'] / $this->settings['display_max_posts'] );
 			$page = $page * $this->settings['display_max_posts'];
 			
 			ipsRegistry::getClass('output')->redirectScreen( $this->lang->words['moderate_post'], $this->settings['base_url'] . "showtopic={$topic['tid']}&st=$page" );
 		}
+		else if( ! $this->_isMergingPosts AND $this->getPublished() === FALSE AND $this->getIsAjax() === TRUE )
+		{
+			//-----------------------------------------
+			// Leave data for other apps
+			//-----------------------------------------
+			
+			$this->setTopicData( $topic );
+			$this->setPostData( $post );
+			
+			return TRUE;
+		}
+		
+		/* remove saved content */
+		if ( $this->memberData['member_id'] )
+		{
+			$this->editor->removeAutoSavedContent( array( 'member_id' => $this->memberData['member_id'], 'autoSaveKey' => 'reply-' . intval( $topic['tid'] ) ) );
+		}
 		
 		//-----------------------------------------
 		// Are we tracking topics we reply in 'auto_track'?
@@ -1139,64 +1166,13 @@ class classPost
 		// to see if we need to send emails out
 		//-----------------------------------------
 		
-		$this->sendOutTrackedTopicEmails( $topic['tid'], $post['post'], $poster_name, time() - $this->settings['session_expiration'], $this->getAuthor('member_id') );
+		$this->sendOutTrackedTopicEmails( $topic, $post['post'], $poster_name );
 		
 		//-----------------------------------------
 		// Send notification of post quoted
 		//-----------------------------------------
 		
-		if( $post['post_parent'] )
-		{
-			$_quoted	= $this->DB->buildAndFetch( array( 'select' => 'author_id', 'from' => 'posts', 'where' => 'pid=' . $post['post_parent'] ) );
-			
-			//-----------------------------------------
-			// Only send if we don't quote ourselves
-			// *ahem* Brandon D *ahem*
-			//-----------------------------------------
-			
-			if( $_quoted['author_id'] AND $_quoted['author_id'] != $this->getAuthor('member_id') )
-			{
-				$_toMember	= IPSMember::load( $_quoted['author_id'] );
-				
-				//-----------------------------------------
-				// Notifications library
-				//-----------------------------------------
-				
-				$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-				$notifyLibrary		= new $classToLoad( $this->registry );
-				
-				$_toMember['language'] = $_toMember['language'] == "" ? IPSLib::getDefaultLanguage() : $_toMember['language'];
-				
-				IPSText::getTextClass('email')->getTemplate( "post_was_quoted", $_toMember['language'] );
-			
-				IPSText::getTextClass('email')->buildMessage( array(
-																	'MEMBER_NAME'	=> $this->getAuthor('members_display_name'),
-																	'ORIGINAL_POST'	=> $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['post_parent']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
-																	'NEW_POST'		=> $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
-																	'POST'			=> $post['post'] ) );
-
-				IPSText::getTextClass('email')->subject	= sprintf( 
-																	IPSText::getTextClass('email')->subject, 
-																	$this->registry->output->buildSEOUrl( 'showuser=' . $this->getAuthor('member_id'), 'publicNoSession', $this->getAuthor('members_seo_name'), 'showuser' ), 
-																	$this->getAuthor('members_display_name'),
-																	$this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
-																	$this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['post_parent']}", "publicNoSession", $topic['title_seo'], 'showtopic' )
-																);
-
-				$notifyLibrary->setMember( $_toMember );
-				$notifyLibrary->setFrom( $this->memberData );
-				$notifyLibrary->setNotificationKey( 'post_quoted' );
-				$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "public", $topic['title_seo'], 'showtopic' ) );
-				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-				
-				try
-				{
-					$notifyLibrary->sendNotification();
-				}
-				catch( Exception $e ){}
-			}
-		}
+		$this->sendOutQuoteNotifications( $post );
 
 		//-----------------------------------------
 		// Leave data for other apps
@@ -1232,7 +1208,7 @@ class classPost
 		}
 		
         /* Minimum Posts Check */        
-		if( $this->getForumData('min_posts_post') && $this->getForumData('min_posts_post') > $this->getAuthor('posts') )
+		if( $this->getForumData('min_posts_post') && $this->getForumData('min_posts_post') > $this->getAuthor('posts') && !$this->getAuthor('g_is_supmod') )
 		{
 			if ( $this->_bypassPermChecks !== TRUE )
 			{
@@ -1252,9 +1228,19 @@ class classPost
 
 		$topic = $this->getTopicData();
 		
-		if( ! $topic['tid'] )
+		if ( ! $topic['tid'] )
 		{
-			throw new Exception("NO_SUCH_TOPIC");
+			/* Fetch topic if topic ID exists */
+			$topic = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid=' . $this->getTopicID() ) );
+			
+			if ( $topic['tid'] )
+			{
+				$this->setTopicData( $topic );
+			}
+			else
+			{
+				throw new Exception("NO_SUCH_TOPIC");
+			}
 		}
 		
 		//-----------------------------------------
@@ -1307,7 +1293,7 @@ class classPost
 			}
 		}
 		
-		if( isset($topic['poll_only']) AND $topic['poll_only'] )
+		if( !empty($topic['poll_only']) )
 		{
 			if( $this->getAuthor('g_post_closed') != 1 )
 			{
@@ -1334,7 +1320,7 @@ class classPost
 					}
 					else if ( $topic['starter_id'] == $this->getAuthor('member_id') )
 					{
-						if ( ($this->settings['startpoll_cutoff'] > 0) AND ( $topic['start_date'] + ($this->settings['startpoll_cutoff'] * 3600) > time() ) )
+						if ( ($this->settings['startpoll_cutoff'] > 0) AND ( $topic['start_date'] + ($this->settings['startpoll_cutoff'] * 3600) > IPS_UNIX_TIME_NOW ) )
 						{
 							$this->can_add_poll = 1;
 						}
@@ -1399,7 +1385,7 @@ class classPost
 			$this->_postErrors = $error->getMessage();
 		}
 		
-		if ( ! $this->getPostContent() AND ! $this->getPostContentPreFormatted() )
+		if ( ! $this->getPostContent() AND ! $this->getPostContentPreFormatted() AND !$this->getIsPreview() )
 		{
 			$this->_postErrors = 'NO_CONTENT';
 		}
@@ -1427,22 +1413,23 @@ class classPost
 		// Do we have a valid post?
 		//-----------------------------------------
 		
-		if ( strlen( trim( IPSText::removeControlCharacters( IPSText::br2nl( $post['post'] ) ) ) ) < 1 )
+		if( $this->getIsPreview() !== TRUE )
 		{
-			$this->_postErrors = 'post_too_short';
-			//$this->registry->getClass('output')->showError( 'post_too_short', 103143 );
-		}
-		
-		if ( IPSText::mbstrlen( $post['post'] ) > ( $this->settings['max_post_length'] * 1024 ) )
-		{
-			$this->_postErrors = 'post_too_long';
-			//$this->registry->getClass('output')->showError( 'post_too_long', 103144 );
-		}
-		
-		/* Got a topic title? */
-		if ( ! $this->_topicTitle )
-		{
-			$this->_postErrors = 'no_topic_title';
+			if ( strlen( trim( IPSText::removeControlCharacters( IPSText::br2nl( $post['post'] ) ) ) ) < 1 )
+			{
+				$this->_postErrors = 'post_too_short';
+			}
+			
+			if ( IPSText::mbstrlen( $post['post'] ) > ( $this->settings['max_post_length'] * 1024 ) )
+			{
+				$this->_postErrors = 'post_too_long';
+			}
+			
+			/* Got a topic title? */
+			if ( ! $this->_topicTitle )
+			{
+				$this->_postErrors = 'no_topic_title';
+			}
 		}
 		
 		//-----------------------------------------
@@ -1464,31 +1451,51 @@ class classPost
 		// Build the master array
 		//-----------------------------------------
 
-		$topic = array(
-					  'title'            => $this->_topicTitle,
-					  'title_seo'		 => IPSText::makeSeoTitle( $this->_topicTitle ),
-					  'description'      => $this->_topicDescription,
-					  'state'            => $topic['state'],
-					  'posts'            => 0,
-					  'starter_id'       => $this->getAuthor('member_id'),
-					  'starter_name'     => $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'],
-					  'seo_first_name'   => IPSText::makeSeoTitle( $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'] ),
-					  'start_date'       => time(),
-					  'last_poster_id'   => $this->getAuthor('member_id'),
-					  'last_poster_name' => $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'],
-					  'seo_last_name'    => IPSText::makeSeoTitle( $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'] ),
-					  'last_post'        => time(),
-					  'icon_id'          => intval($this->request['iconid']),
-					  'author_mode'      => $this->getAuthor('member_id') ? 1 : 0,
-					  'poll_state'       => ( count( $this->poll_questions ) AND $this->can_add_poll ) ? 1 : 0,
-					  'last_vote'        => 0,
-					  'views'            => 0,
-					  'forum_id'         => $this->getForumData('id'),
-					  'approved'         => ( $this->getPublished() === TRUE ) ? 1 : 0,
-					  'pinned'           => intval( $topic['pinned'] ),
-					  'topic_open_time'  => intval( $this->times['open'] ),
-					  'topic_close_time' => intval( $this->times['close'] ),
-					 );
+		$topic = array( 'title'            => $this->_topicTitle,
+					    'title_seo'		   => IPSText::makeSeoTitle( $this->_topicTitle ),
+					    'state'            => $topic['state'],
+					    'posts'            => 0,
+					    'starter_id'       => $this->getAuthor('member_id'),
+					    'starter_name'     => $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'],
+					    'seo_first_name'   => IPSText::makeSeoTitle( $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'] ),
+					    'start_date'       => IPS_UNIX_TIME_NOW,
+					    'last_poster_id'   => $this->getAuthor('member_id'),
+					    'last_poster_name' => $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'],
+					    'seo_last_name'    => IPSText::makeSeoTitle( $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'] ),
+					    'last_post'        => IPS_UNIX_TIME_NOW,
+					    'author_mode'      => $this->getAuthor('member_id') ? 1 : 0,
+					    'poll_state'       => ( count( $this->poll_questions ) AND $this->can_add_poll ) ? 1 : 0,
+					    'last_vote'        => 0,
+					    'views'            => 0,
+					    'forum_id'         => $this->getForumData('id'),
+					    'approved'         => ( $this->getPublished() === TRUE ) ? 1 : 0,
+					    'pinned'           => intval( $topic['pinned'] ),
+					    'topic_open_time'  => intval( $this->times['open'] ),
+					    'topic_close_time' => intval( $this->times['close'] ) );
+
+		//-----------------------------------------
+		// Check if we're ok with tags
+		//-----------------------------------------
+		
+		$where		= array( 'meta_parent_id'	=> $this->getForumData('id'),
+							  'member_id'		=> $this->getAuthor('member_id'),
+							  'existing_tags'	=> explode( ',', IPSText::cleanPermString( $this->request['ipsTags'] ) ) );
+									  
+		if ( $this->registry->tags->can( 'add', $where ) AND $this->settings['tags_enabled'] AND ( !empty( $_POST['ipsTags'] ) OR $this->settings['tags_min'] ) )
+		{
+			$this->registry->tags->checkAdd( $_POST['ipsTags'], array(
+																  'meta_parent_id' => $topic['forum_id'],
+																  'member_id'	   => $this->memberData['member_id'],
+																  'meta_visible'   => $topic['approved'] ) );
+
+			if ( $this->registry->tags->getErrorMsg() )
+			{
+				$this->_postErrors = $this->registry->tags->getFormattedError();
+				return FALSE;
+			}
+			
+			$_storeTags	= true;
+		}
 
 		//-----------------------------------------
 		// Insert the topic into the database to get the
@@ -1496,13 +1503,8 @@ class classPost
 		// follow suit with the post
 		//-----------------------------------------
 		
-		$this->DB->force_data_type = array( 'title'            => 'string',
-											'description'      => 'string',
-										    'starter_name'     => 'string',
-										    'seo_first_name'   => 'string',
-											'seo_last_name'    => 'string',
-										    'last_poster_name' => 'string' );
-		
+		$this->DB->setDataType( array( 'title', 'starter_name', 'seo_first_name', 'last_poster_name', 'seo_last_name' ), 'string' );
+
 		/* Data Hook Location */
 		IPSLib::doDataHooks( $topic, 'postAddTopic' );
 		
@@ -1525,7 +1527,7 @@ class classPost
 		$post['queued'] = 0;
 		
 		/* Typecast */
-		$this->DB->force_data_type = array( 'post' => 'string' );
+		$this->DB->setDataType( 'post', 'string' );
 		
 		/* Data Hook Location */
 		IPSLib::doDataHooks( $post, 'postFirstPost' );
@@ -1541,7 +1543,7 @@ class classPost
 		
 		if( ! $topic['approved'] )
 		{
-			$this->DB->insert( 'mod_queued_items', array( 'type' => 'topic', 'type_id' => $topic['tid'] ) );
+			$this->DB->insert( 'mod_queued_items', array( 'type' => 'topic', 'type_id' => $topic['tid'] ) );/*noLibHook*/
 		}
 		
 		/* Add to cache */
@@ -1552,6 +1554,18 @@ class classPost
 		//-----------------------------------------
 		
 		$this->DB->update( 'topics', array( 'topic_firstpost' => $post['pid'] ), 'tid=' . $topic['tid'] );
+
+		//-----------------------------------------
+		// Tagging
+		//-----------------------------------------
+		
+		if ( $_storeTags )
+		{
+			$this->registry->tags->add( $_POST['ipsTags'], array( 'meta_id'		   => $topic['tid'],
+																  'meta_parent_id' => $topic['forum_id'],
+																  'member_id'	   => $this->memberData['member_id'],
+																  'meta_visible'   => $topic['approved'] ) );
+		}
 		
 		//-----------------------------------------
 		// Add the poll to the polls table
@@ -1566,24 +1580,28 @@ class classPost
 				$poll_only = 1;
 			}
 			
-			$_pollData = array( 
-									'tid'				=> $topic['tid'],
-									'forum_id'			=> $this->getForumData('id'),
-									'start_date'		=> time(),
-									'choices'			=> addslashes(serialize( $this->poll_questions )),
-									'starter_id'		=> $this->getAuthor('member_id'),
-									'votes'				=> 0,
-									'poll_question'		=> IPSText::stripAttachTag( $this->request['poll_question'] ),
-									'poll_only'			=> $poll_only,
-									'poll_view_voters'	=> intval( $this->request['poll_view_voters'] ) 
-							);
+			$_pollData = array( 'tid'				=> $topic['tid'],
+								'forum_id'			=> $this->getForumData('id'),
+								'start_date'		=> IPS_UNIX_TIME_NOW,
+								'choices'			=> addslashes(serialize( $this->poll_questions )),
+								'starter_id'		=> $this->getAuthor('member_id'),
+								'votes'				=> 0,
+								'poll_question'		=> IPSText::stripAttachTag( $this->request['poll_question'] ),
+								'poll_only'			=> $poll_only,
+								'poll_view_voters'	=> intval( $this->request['poll_view_voters'] ) );
 			
 			/* Data Hook Location */
 			IPSLib::doDataHooks( $_pollData, 'postAddTopicPoll' );
 
 			$this->DB->insert( 'polls', $_pollData );
 		}
-
+		
+		/* remove saved content */
+		if ( $this->memberData['member_id'] )
+		{
+			$this->editor->removeAutoSavedContent( array( 'member_id' => $this->memberData['member_id'], 'autoSaveKey' => 'new-' . intval( $this->getForumData('id') ) ) );
+		}
+		
 		//-----------------------------------------
 		// If we are still here, lets update the
 		// board/forum stats
@@ -1633,7 +1651,7 @@ class classPost
 		// Are we tracking this forum? If so generate some mailies - yay!
 		//-----------------------------------------
 		
-		$this->sendOutTrackedForumEmails($this->getForumData('id'), $topic['tid'], $topic['title'], $this->getForumData('name'), $post['post'] );
+		$this->sendOutTrackedForumEmails($this->getForumData(), $topic, $post['post'] );
 		
 		//-----------------------------------------
 		// Leave data for other apps
@@ -1683,7 +1701,7 @@ class classPost
 		}
 
         /* Minimum Posts Check */
-		if ( $this->getForumData('min_posts_post') && $this->getForumData('min_posts_post') > $this->getAuthor('posts') )
+		if ( $this->getForumData('min_posts_post') && $this->getForumData('min_posts_post') > $this->getAuthor('posts') && !$this->getAuthor('g_is_supmod') )
 		{
 			if ( $this->_bypassPermChecks !== TRUE )
 			{
@@ -1818,13 +1836,17 @@ class classPost
 
 			# Prevent titles from being edited
 			$this->edit_title   = 0;
-		
+			
+			# Prevent open time from being edited
+			$this->can_set_open_time  = 0;
+			
+			# Prevent close time from being edited
+			$this->can_set_close_time = 0;
+			
 			# Set Settings
 			$this->setSettings( array( 'enableSignature' => ( $this->_originalPost['use_sig'] ) ? 1 : 0,
 									   'enableEmoticons' => ( $this->_originalPost['use_emo'] ) ? 1 : 0 ) );
-											
-			$this->request['iconid'] =  $this->_originalPost['icon_id'] ;
-			
+
 			if ( ! $this->getAuthor('g_append_edit') )
 			{
 				$this->request['add_edit'] =  ( $this->_originalPost['append_edit'] OR ! $this->getAuthor('g_append_edit') ? 1 : 0 );
@@ -1865,7 +1887,7 @@ class classPost
 		// Grab the edit time
 		//-----------------------------------------
 		
-		$time = ipsRegistry::getClass( 'class_localization')->getDate( time(), 'LONG' );
+		$time = ipsRegistry::getClass( 'class_localization')->getDate( IPS_UNIX_TIME_NOW, 'LONG' );
 		
 		//-----------------------------------------
 		// Reset some data
@@ -1877,20 +1899,20 @@ class classPost
 		$post['post_date']   = $this->_originalPost['post_date'];
 		$post['author_name'] = $this->_originalPost['author_name'];
 		$post['queued']      = $this->_originalPost['queued'];
-		$post['edit_time']   = time();
+		$post['edit_time']   = IPS_UNIX_TIME_NOW;
 		$post['edit_name']   = $this->getAuthor('members_display_name');
 		
 		if ( $this->_originalPost['new_topic'] == 1 )
 		{
-			//-----------------------------------------
-			// If the post icon has changed, update the topic post icon
-			//-----------------------------------------
-		
-			if ( $post['icon_id'] != $this->_originalPost['icon_id'] )
+			/* Tagging */
+			if ( isset( $_POST['ipsTags'] ) )
 			{
-				$this->DB->update( 'topics', array( 'icon_id' => intval($post['icon_id']) ), 'tid='.$topic['tid'] );
+				$this->registry->tags->replace( $_POST['ipsTags'], array( 'meta_id'		   => $topic['tid'],
+																		  'meta_parent_id' => $topic['forum_id'],
+																		  'member_id'	   => $this->memberData['member_id'],
+																		  'meta_visible'   => $topic['approved'] ) );
 			}
-		
+			
 			//-----------------------------------------
 			// Update open and close times
 			//-----------------------------------------
@@ -1905,9 +1927,9 @@ class classPost
 				{
 					$times['state'] = "closed";
 					
-					if( time() > $topic['topic_open_time'] )
+					if( IPS_UNIX_TIME_NOW > $topic['topic_open_time'] )
 					{
-						if( time() < $topic['topic_close_time'] )
+						if( IPS_UNIX_TIME_NOW < $topic['topic_close_time'] )
 						{
 							$times['state'] = "open";
 						}
@@ -1994,7 +2016,7 @@ class classPost
 																	'member_name' => $this->getAuthor('members_display_name'),
 																	'ip_address'  => $this->ip_address,
 																	'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-																	'ctime'       => time(),
+																	'ctime'       => IPS_UNIX_TIME_NOW,
 																	'topic_title' => $topic['title'],
 																	'action'      => $this->lang->words['edited_poll'],
 																	'query_string'=> htmlspecialchars( my_getenv( 'QUERY_STRING' ) ),
@@ -2006,7 +2028,7 @@ class classPost
 					$_pollData = array( 
 										'tid'				=> $topic['tid'],
 										'forum_id'			=> $this->getForumData('id'),
-										'start_date'		=> time(),
+										'start_date'		=> IPS_UNIX_TIME_NOW,
 										'choices'			=> addslashes(serialize( $this->poll_questions )),
 										'starter_id'		=> $this->getAuthor('member_id'),
 										'votes'				=> 0,
@@ -2027,7 +2049,7 @@ class classPost
 																 'member_name' => $this->getAuthor('members_display_name'),
 																 'ip_address'  => $this->ip_address,
 																 'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-																 'ctime'       => time(),
+																 'ctime'       => IPS_UNIX_TIME_NOW,
 																 'topic_title' => $topic['title'],
 																 'action'      => sprintf( $this->lang->words['added_poll'], $this->request['poll_question'] ),
 																 'query_string'=> htmlspecialchars( my_getenv('QUERY_STRING') ) ) );
@@ -2041,9 +2063,9 @@ class classPost
 				// Remove the poll
 				//-----------------------------------------
 				
-				$this->DB->buildAndFetch( array( 'delete' => 'polls' , 'where' => "tid=".$topic['tid'] ) );
-				$this->DB->buildAndFetch( array( 'delete' => 'voters', 'where' => "tid=".$topic['tid'] ) );
-				$this->DB->update( 'topics', array( 'poll_state' => 0, 'last_vote' => 0 ), 'tid='.$topic['tid'] );
+				$this->DB->delete( 'polls', 'tid=' . $topic['tid'] );
+				$this->DB->delete( 'voters', 'tid=' . $topic['tid'] );
+				$this->DB->update( 'topics', array( 'poll_state' => 0, 'last_vote' => 0 ), 'tid=' . $topic['tid'] );
 			}
 		}
 		
@@ -2059,12 +2081,11 @@ class classPost
 				
 			if ( $this->_topicTitle != "" )
 			{
-				if ( ($this->_topicTitle != $topic['title']) or ( $this->_topicDescription != $topic['description'] ) OR ! ( $topic['title_seo'] ) )
+				if ( $this->_topicTitle != $topic['title'] OR !$topic['title_seo'] )
 				{
 					$_topicTitleData = array( 
 												'title'			=> $this->_topicTitle,
 												'title_seo'		=> IPSText::makeSeoTitle( $this->_topicTitle ),
-												'description'	=> $this->_topicDescription 
 											);
 											
 					/* Data Hook Location */
@@ -2100,7 +2121,7 @@ class classPost
 																	'member_name' => $this->getAuthor('members_display_name'),
 																	'ip_address'  => $this->ip_address,
 																	'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-																	'ctime'       => time(),
+																	'ctime'       => IPS_UNIX_TIME_NOW,
 																	'topic_title' => $topic['title'],
 																	'action'      => sprintf( $this->lang->words['edited_topic_title'], $topic['title'], $this->_topicTitle ),
 																	'query_string'=> htmlspecialchars( my_getenv('QUERY_STRING') ),
@@ -2134,7 +2155,7 @@ class classPost
 		}
 		
 		/* Typecast */
-		$this->DB->force_data_type = array( 'post_edit_reason' => 'string' );
+		$this->DB->setDataType( 'post_edit_reason', 'string' );
 		
 		/* Data Hook Location */
 		IPSLib::doDataHooks( $post, 'editPostData' );
@@ -2272,7 +2293,7 @@ class classPost
 			$_canEdit = 1;
 		}
 		
-		if ( isset( $this->moderator['edit_post'] ) && $this->moderator['edit_post'] )
+		if ( !empty( $this->moderator['edit_post'] ) )
 		{
 			$_canEdit = 1;
 		}
@@ -2285,7 +2306,7 @@ class classPost
 			
 			if ( $this->getAuthor('g_edit_cutoff') > 0 )
 			{
-				if ( $this->_originalPost['post_date'] > ( time() - ( intval($this->getAuthor('g_edit_cutoff')) * 60 ) ) )
+				if ( $this->_originalPost['post_date'] > ( IPS_UNIX_TIME_NOW - ( intval($this->getAuthor('g_edit_cutoff')) * 60 ) ) )
 				{
 					$_canEdit = 1;
 				}
@@ -2400,7 +2421,7 @@ class classPost
 	 * REG_CODE_ENTER	No reg code was entered
 	 * CODE_ERROR		The code entered did not match the one stored in the DB
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function checkGuestCaptcha()
 	{
@@ -2449,7 +2470,7 @@ class classPost
 					if ( $group['gbw_mod_post_unit_type'] )
 					{
 						/* Days.. .*/
-						if ( $memberData['joined'] > ( time() - ( 86400 * $group['g_mod_post_unit'] ) ) )
+						if ( $memberData['joined'] > ( IPS_UNIX_TIME_NOW - ( 86400 * $group['g_mod_post_unit'] ) ) )
 						{
 							return TRUE;
 						}
@@ -2486,7 +2507,7 @@ class classPost
 	 * @param	string	$title
 	 * @param	integer	$author
 	 * @param	string	[$type]	Set to 'new' for new topic or 'reply' for a reply to topic, 'new' is the default option
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sendNewTopicForApprovalEmails( $tid, $title, $author, $post, $pid=0, $type='new' )
 	{
@@ -2511,7 +2532,7 @@ class classPost
 																'FORUM'  => $this->getForumData('name'),
 																'POSTER' => $author,
 																'POST'	 => $post,
-																'DATE'   => $this->registry->getClass( 'class_localization')->getDate( time(), 'SHORT', 1 ),
+																'DATE'   => $this->registry->getClass( 'class_localization')->getDate( IPS_UNIX_TIME_NOW, 'SHORT', 1 ),
 																'LINK'   => $this->settings['base_url'] .'app=forums&module=forums&section=findpost&pid='.$pid,
 															  ) );
 		
@@ -2531,355 +2552,176 @@ class classPost
 	/**
 	 * Sends out topic subscription emails
 	 *
-	 * @param	integer	$tid
-	 * @param	string	$post
+	 * @param	array	$topic
+	 * @param	string	$content
 	 * @param	integer	$poster
-	 * @param	integer	$last_post
-	 * @param	integer	$member_id
 	 * @return	bool
 	 */
-	public function sendOutTrackedTopicEmails( $tid=0, $post="", $poster=0, $last_post=0, $member_id=0 )
+	public function sendOutTrackedTopicEmails( $topic, $content="" )
 	{
-		if ($tid == "")
-		{
-			return TRUE;
-		}
-		
-		if( $this->getPublished() === false )
+		if ( empty( $topic['tid'] ) )
 		{
 			return true;
 		}
 		
-		$_poster	= IPSMember::load( $this->getAuthor('member_id') );
-		
-		//-----------------------------------------
-		// Notifications library
-		//-----------------------------------------
-		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
-		
-		//-----------------------------------------
-		// Get the email addy's, topic ids and email_full stuff - oh yeah.
-		// We only return rows that have a member last_activity of greater than the post itself
-		// Ergo:
-		//  Last topic post: 8:50am
-		//  Last topic visit: 9:00am
-		//  Next topic reply: 9:10am
-		// if ( last.activity > last.topic.post ) { send.... }
-		//  Next topic reply: 9:20am
-		// if ( last.activity > last.topic.post ) { will fail as 9:10 > 8:50 }
-		//-----------------------------------------
-				 
-		$this->DB->build( array( 
-								'select'   => 'tr.trid, tr.topic_id, tr.last_sent, tr.topic_track_type',
-								'from'     => array( 'tracker' => 'tr' ),
-								'where'    => 'tr.topic_id=' . $tid . ' AND m.member_id != ' . intval($member_id)
-										  	. ' AND ( ( tr.topic_track_type=\'delayed\' AND m.last_activity < ' . $last_post . ' ) OR tr.topic_track_type=\'immediate\' )',
-								'add_join' => array(
-													array( 
-															'select' => 'm.members_display_name, m.email, m.member_id, m.email_full, m.language, m.org_perm_id, m.member_group_id, m.mgroup_others, m.last_activity, m.posts, m.member_banned, m.members_cache, m.ips_mobile_token',
-															'from'   => array( 'members' => 'm' ),
-															'where'  => 'm.member_id=tr.member_id',
-															'type'   => 'left' ),
-													array( 
-															'select' => 't.title, t.forum_id, t.approved, t.title_seo, t.starter_id',
-															'from'   => array( 'topics' => 't' ),
-															'where'  => 't.tid=tr.topic_id',
-															'type'   => 'left' 
-														) 
-													) 
-						)	);
-		$outer = $this->DB->execute();
-		
-		$_toUpdate	= array();
-		
-		if( $this->DB->getTotalRows($outer) )
+		if ( $this->getPublished() === false )
 		{
-			while ( $r = $this->DB->fetch($outer) )
-			{
-				//-----------------------------------------
-				// Can access forum/topic?
-				//-----------------------------------------
-				
-				if ( ! $this->registry->getClass('class_forums')->checkEmailAccess($r) )
-				{
-					continue;
-				}
-
-				//-----------------------------------------
-				// Topic approved or is a mod?
-				//-----------------------------------------
-
-				if ( ! $this->registry->getClass('class_forums')->checkEmailApproved($r, false) )
-				{
-					continue;
-				}
-				
-				// Only send one email until user logs in again...
-				// That is, unless they want the full post
-				if ( ( $r['topic_track_type'] != 'immediate' ) AND $r['last_sent'] > $r['last_activity'] AND ! $r['email_full'] )
-				{
-					continue;
-				}
-				else
-				{
-					$_toUpdate[]	= $r['trid'];
-				}
-
-				$r['language'] = $r['language'] ? $r['language'] : '';
-				
-				if ($r['email_full'] == 1)
-				{
-					IPSText::getTextClass( 'email' )->getTemplate( "subs_with_post", $r['language'] );
-			
-					IPSText::getTextClass( 'email' )->buildMessage( array(
-														'TOPIC_ID'        => $r['topic_id'],
-														'FORUM_ID'        => $r['forum_id'],
-														'TITLE'           => $r['title'],
-														'NAME'            => $r['members_display_name'],
-														'POSTER'          => $poster,
-														'POST'            => IPSText::getTextClass( 'bbcode' )->stripBadWords( $post ),
-													  )
-												);
-					
-				}
-				else
-				{
-				
-					IPSText::getTextClass( 'email' )->getTemplate("subs_no_post", $r['language']);
-			
-					IPSText::getTextClass( 'email' )->buildMessage( array(
-														'TOPIC_ID'        => $r['topic_id'],
-														'FORUM_ID'        => $r['forum_id'],
-														'TITLE'           => $r['title'],
-														'NAME'            => $r['members_display_name'],
-														'POSTER'          => $poster,
-													  )
-												);
-					
-				}
-				
-				IPSText::getTextClass('email')->subject	= sprintf( 
-																	IPSText::getTextClass('email')->subject, 
-																	$this->registry->output->buildSEOUrl( 'showuser=' . $_poster['member_id'], 'publicNoSession', $_poster['members_seo_name'], 'showuser' ), 
-																	$poster,
-																	$this->registry->output->buildSEOUrl( 'showtopic=' . $r['topic_id'] . '&amp;view=getnewpost', 'publicNoSession', $r['title_seo'], 'showtopic' ),
-																	IPSText::truncate( $r['title'], 50 )
-																);
-
-				//-----------------------------------------
-				// Send notification...
-				//-----------------------------------------
-				
-				$notifyLibrary->setMember( $r );
-				$notifyLibrary->setFrom( $_poster );
-				$notifyLibrary->setNotificationKey( 'new_reply' );
-				$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showtopic=' . $r['topic_id'] . '&amp;view=getnewpost', 'publicNoSession', $r['title_seo'], 'showtopic' ) );
-				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-				
-				try
-				{
-					$notifyLibrary->sendNotification();
-				}
-				catch( Exception $e ){}
-			}
-			
-			//-----------------------------------------
-			// Update last sent time
-			//-----------------------------------------
-			
-			if( count($_toUpdate) )
-			{
-				$this->DB->update( "tracker", array( 'last_sent' => time() ), "trid IN(". implode( ',', $_toUpdate ) . ")" );
-			}
+			return true;
 		}
-
+		
+		/* Load language */
+		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_email_content' ), 'core' );
+		
+		/* Set up */
+		$_poster	 = IPSMember::load( $this->getAuthor('member_id') );
+		$poster_name = $this->getAuthor('member_id') ? $this->getAuthor('members_display_name') : $this->request['UserName'];
+		$url         = $this->registry->output->buildSEOUrl( 'showtopic=' . $topic['tid'] . '&amp;view=getnewpost', 'publicNoSession', $topic['title_seo'], 'showtopicunread' );
+		$subject     = sprintf( $this->lang->words['subject__subs_with_post'], $this->registry->output->buildSEOUrl( 'showuser=' . $_poster['member_id'], 'publicNoSession', $_poster['members_seo_name'], 'showuser' ), 
+																			   $poster_name,
+																			   $url,
+																			   IPSText::truncate( $topic['title'], 50 ) );
+		/* Fetch like class */
+		try
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like = classes_like::bootstrap( 'forums','topics' );
+			
+			$_like->sendNotifications( $topic['tid'], array( 'immediate', 'offline' ), array( 'notification_key'		=> 'followed_topics',
+																			        		  'notification_url'		=> $url,
+																			        		  'email_template'			=> 'subs_with_post',
+																			        		  'email_subject'	    	=> $subject,
+																			        		  'build_message_array'		=> array( 'NAME'  		=> '-member:members_display_name-',
+																											      			  	  'POSTER'		=> $poster_name,
+																											      			  	  'TITLE' 		=> $topic['title'],
+																											      			 	  'URL'			=> $url,
+																											      			  	  'POST'		=> $content ) ) );
+		}
+		catch( Exception $e )
+		{
+			/* Something has gone wrong */
+		}
+		
 		return TRUE;
 	}
 	
 	/**
 	 * Sends out forum subscription emails
 	 *
-	 * @param	integer	$fid
-	 * @param	integer	$this_tid
-	 * @param	string	$title
-	 * @param	string	$forum_name
-	 * @param	string	$post
-	 * @param	integer	$mid
-	 * @param	string	$mname
+	 * @param	array	$forum
+	 * @param	array	$topic
+	 * @param	string	$content
 	 * @return	bool
 	 */
-	public function sendOutTrackedForumEmails( $fid=0, $this_tid=0, $title="", $forum_name="", $post="", $mid=0, $mname="" )
+	public function sendOutTrackedForumEmails( $forum, $topic, $content )
 	{
-		//-----------------------------------------
-		// Notifications library
-		//-----------------------------------------
-		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
-		
-		if ($this_tid == "")
-		{
-			return TRUE;
-		}
-		
-		if ($fid == "")
-		{
-			return TRUE;
-		}
-		
-		if( $this->getPublished() === false )
+		if ( empty( $topic['tid'] ) )
 		{
 			return true;
 		}
 		
-		$mid 	= intval( $mid > 0 ? $mid : $this->getAuthor('member_id') );
-		$mname	= $mname != '' ? $mname : $this->getAuthor('members_display_name');
-		
-		$_poster	= IPSMember::load( $mid );
-		
-		//-----------------------------------------
-		// Work out the time stamp needed to "guess"
-		// if the user is still active on the board
-		// We will base this guess on a period of
-		// non activity of time_now - 30 minutes.
-		//-----------------------------------------
-		
-		$time_limit = time() - (30*60);
-		$gotem      = array();
-
-		$this->DB->build( array( 
-								'select'   => 'tr.frid, tr.last_sent',
-								'from'     => array( 'forum_tracker' => 'tr' ),
-								'where'    => 'tr.forum_id='.$fid." AND ( ( tr.forum_track_type='delayed' AND m.last_activity < {$time_limit} ) OR tr.forum_track_type='immediate' )",
-								'add_join' => array( 
-													array( 
-															'select' => 'm.members_display_name, m.member_group_id, m.email, m.member_id, m.language, m.last_activity, m.org_perm_id, m.mgroup_others, m.posts, m.members_cache, m.ips_mobile_token',
-															'from'   => array( 'members' => 'm' ),
-															'where'  => "tr.member_id=m.member_id",//" AND m.member_id <> {$mid}",
-															'type'   => 'inner' 
-														),
-													array( 
-															'select' => 'g.g_perm_id',
-															'from'   => array( 'groups' => 'g' ),
-															'where'  => "m.member_group_id=g.g_id",
-															'type'   => 'left' 
-														)  
-													)
-						)	);
-		
-		$outer = $this->DB->execute();
-		
-		while ( $r = $this->DB->fetch($outer) )
+		if ( $this->getPublished() === false )
 		{
-			$this->DB->update( "forum_tracker", array( 'last_sent' => time() ), "frid=".$r['frid'] );
-			
-			$r['forum_id'] = $fid;
-			$gotem[ $r['member_id'] ] = $r;
+			return true;
 		}
-
-		//-----------------------------------------
-		// Get "all" groups?
-		//-----------------------------------------
+			
+		/* Load language */
+		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_email_content' ), 'core' );
 		
-		if ( $this->settings['autoforum_sub_groups'] )
+		/* Set up */
+		$_poster	 = IPSMember::load( $this->getAuthor('member_id') );
+		$poster_name = $this->getAuthor('member_id') ? $this->getAuthor('members_display_name') : $this->request['UserName'];
+		$url         = $this->registry->output->buildSEOUrl( 'showtopic=' . $topic['tid'] . '&amp;view=getnewpost', 'publicNoSession', $topic['title_seo'], 'showtopicunread' );
+		$subject     = sprintf( $this->lang->words['subject__subs_new_topic'], $this->registry->output->buildSEOUrl( 'showuser=' . $_poster['member_id'], 'publicNoSession', $_poster['members_seo_name'], 'showuser' ), 
+																			   $poster_name,
+																			   $url,
+																			   IPSText::truncate( $topic['title'], 50 ) );
+		/* Fetch like class */
+		try
 		{
-			$this->DB->build( array( 
-										'select'   => 'm.members_display_name, m.member_group_id, m.email, m.member_id, m.language, m.last_activity, m.org_perm_id, m.mgroup_others, m.posts, m.members_cache, m.ips_mobile_token',
-										'from'     => array( 'members' => 'm' ),
-										'where'    => "m.member_group_id IN (" . $this->settings['autoforum_sub_groups'] . ")
-													   AND m.member_id <> {$mid}
-													   AND m.allow_admin_mails=1
-													   AND m.last_activity < {$time_limit}",
-										'add_join' => array(
-															array( 
-																	'select' => 'g.g_perm_id',
-																	'from'   => array( 'groups' => 'g' ),
-																	'where'  => "m.member_group_id=g.g_id",
-																	'type'   => 'left' 
-																)  
-															)
-																		
-							)	);
-		
-			$this->DB->execute();
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like = classes_like::bootstrap( 'forums','forums' );
 			
-			while ( $r = $this->DB->fetch() )
-			{
-				$r['forum_id'] = $fid;
-				$gotem[ $r['member_id'] ] = $r;
-			}
+			$_like->sendNotifications( $forum['id'], array( 'immediate', 'offline' ), array(  'notification_key'		=> 'followed_forums',
+																			        		  'notification_url'		=> $url,
+																			        		  'email_template'			=> 'subs_new_topic',
+																			        		  'email_subject'	    	=> $subject,
+																			        		  'build_message_array'		=> array( 'NAME'  		=> '-member:members_display_name-',
+																											      			  	  'POSTER'		=> $poster_name,
+																																  'FORUM'		=> $forum['name'],
+																											      			  	  'TITLE' 		=> $topic['title'],
+																											      			 	  'URL'			=> $url,
+																											      			  	  'POST'		=> $content ) ) );
+		}
+		catch( Exception $e )
+		{
+			/* Something has gone wrong */
 		}
 		
-		//-----------------------------------------
-		// Row, row and parse, parse
-		//-----------------------------------------
-		
-		if ( count( $gotem ) )
-		{			
-			foreach( $gotem as $mid => $r )
-			{
-				//-----------------------------------------
-				// Can access forum/topic?
-				//-----------------------------------------
-				
-				if( !$this->registry->getClass('class_forums')->checkEmailAccess( $r ) )
-				{
-					continue;
-				}
-				
-				if( $mid == $this->memberData['member_id'] )
-				{
-					continue;
-				}
-
-				$r['language'] = $r['language'] ? $r['language'] : '';
-				
-				IPSText::getTextClass( 'email' )->getTemplate("subs_new_topic", $r['language']);
-		
-				IPSText::getTextClass( 'email' )->buildMessage( array(
-													'TOPIC_ID'        => $this_tid,
-													'FORUM_ID'        => $fid,
-													'TITLE'           => $title,
-													'NAME'            => $r['members_display_name'],
-													'POSTER'          => $mname,
-													'FORUM'           => $forum_name,
-													'POST'            => $post,
-												  )
-											);
-
-				IPSText::getTextClass('email')->subject	= sprintf( 
-																	IPSText::getTextClass('email')->subject, 
-																	$this->registry->output->buildSEOUrl( 'showuser=' . $_poster['member_id'], 'publicNoSession', $_poster['members_seo_name'], 'showuser' ), 
-																	$mname,
-																	$this->registry->output->buildSEOUrl( 'showtopic=' . $this_tid . '&amp;view=getnewpost', 'publicNoSession', IPSText::makeSeoTitle( $title ), 'showtopic' ),
-																	IPSText::truncate( $title, 50 )
-																);
-
-				//-----------------------------------------
-				// Send notification...
-				//-----------------------------------------
-
-				$notifyLibrary->setMember( $r );
-				$notifyLibrary->setFrom( $_poster );
-				$notifyLibrary->setNotificationKey( 'new_topic' );
-				$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showtopic=' . $this_tid . '&amp;view=getnewpost', 'publicNoSession', IPSText::makeSeoTitle( $title ), 'showtopic' ) );
-				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-				
-				try
-				{
-					$notifyLibrary->sendNotification();
-				}
-				catch( Exception $e ){}
-				
-			}
-		}
-
 		return TRUE;
 	}
+	
+	/**
+	 * Send out quote notifications, yo.
+	 * @param array $post
+	 */
+	public function sendOutQuoteNotifications( $post )
+	{
+		$seen = array();
+	
+		if ( stristr( $post['post'], '[quote' ) )
+		{
+			if ( preg_match_all( '#\[quote(?:[^\]]+?)post=(?:\'|"|&quot;|&\#39;)(\d+?)(?:\'|"|&quot;|&\#39;)#', $post['post'], $quotes) )
+			{
+				$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+				$notifyLibrary		= new $classToLoad( $this->registry );
+				
+				$posts = $this->registry->getClass('topics')->getPosts( array( 'postId' => array_unique( $quotes[1] ) ) );
+				
+				foreach( $posts AS $pid => $_quoted )
+				{
+					/* Try and make things a bit more readable */
+					$_toMember	= $_quoted;
+					$topic      = $_quoted;
+						
+					if ( $this->registry->getClass('topics')->canView( $topic, $_toMember ) )
+					{
+						if ( ! isset( $seen[ $_quoted['author_id'] ] ) && $_quoted['author_id'] && $_quoted['author_id'] != $this->getAuthor('member_id') )
+						{
+							$seen[ $_quoted['author_id'] ] = true;
+							
+							$_toMember['language'] = $_toMember['language'] == "" ? IPSLib::getDefaultLanguage() : $_toMember['language'];
+							
+							IPSText::getTextClass('email')->getTemplate( "post_was_quoted", $_toMember['language'] );
+						
+							IPSText::getTextClass('email')->buildMessage( array('MEMBER_NAME'	=> $this->getAuthor('members_display_name'),
+																				'ORIGINAL_POST'	=> $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$_quoted['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
+																				'NEW_POST'		=> $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
+																				'POST'			=> $post['post'] ) );
+			
+							IPSText::getTextClass('email')->subject	= sprintf(  IPSText::getTextClass('email')->subject, 
+																				$this->registry->output->buildSEOUrl( 'showuser=' . $this->getAuthor('member_id'), 'publicNoSession', $this->getAuthor('members_seo_name'), 'showuser' ), 
+																				$this->getAuthor('members_display_name'),
+																				$this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ),
+																				$this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$_quoted['pid']}", "publicNoSession", $topic['title_seo'], 'showtopic' ) );
+			
+							$notifyLibrary->setMember( $_toMember );
+							$notifyLibrary->setFrom( $this->memberData );
+							$notifyLibrary->setNotificationKey( 'post_quoted' );
+							$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "public", $topic['title_seo'], 'showtopic' ) );
+							$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+							$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+							
+							try
+							{
+								$notifyLibrary->sendNotification();
+							}
+							catch( Exception $e ){}
+						}
+					}
+				}
+			}
+		}
+	}
     
 	/**
 	 * Compiles an array of poll questions
@@ -2900,8 +2742,6 @@ class classPost
 		{
 			if ( isset($_POST['question']) AND is_array( $_POST['question'] ) and count( $_POST['question'] ) )
 			{
-				$has_poll = 1;
-				
 				foreach( $_POST['question'] as $id => $q )
 				{
 					if ( ! $q OR ! $id )
@@ -2977,7 +2817,7 @@ class classPost
 			
 			foreach( $questions as $id => $data )
 			{
-				if ( ! is_array( $data['choice'] ) OR ! count( $data['choice'] ) )
+				if ( ! is_array( $data['choice'] ) OR ! count( $data['choice'] ) OR count($data['choice']) < 2 )
 				{
 					unset( $questions[ $id ] );
 				}
@@ -3028,19 +2868,20 @@ class classPost
 		//-----------------------------------------
 		// Need to format the post?
 		//-----------------------------------------
-
+		$bw   = array( 'bw_post_from_mobile' => intval( $this->member->isMobileApp ) );
+		
 		$post = array(
-						'author_id'   => $this->getAuthor('member_id') ? $this->getAuthor('member_id') : 0,
-						'use_sig'     => $this->getSettings('enableSignature'),
-						'use_emo'     => $this->getSettings('enableEmoticons'),
-						'ip_address'  => $this->member->ip_address,
-						'post_date'   => time(),
-						'icon_id'     => isset( $this->request['iconid'] ) ? intval( $this->request['iconid'] ) : intval( $this->_originalPost['icon_id'] ),
-						'post'        => $postContent,
-						'author_name' => $this->getAuthor('member_id') ? $this->getAuthor('members_display_name') : $this->request['UserName'],
-						'topic_id'    => "",
-						'queued'      => ( $this->getPublished() ) ? 0 : 1,
+						'author_id'      => $this->getAuthor('member_id') ? $this->getAuthor('member_id') : 0,
+						'use_sig'        => $this->getSettings('enableSignature'),
+						'use_emo'        => $this->getSettings('enableEmoticons'),
+						'ip_address'     => $this->member->ip_address,
+						'post_date'      => IPS_UNIX_TIME_NOW,
+						'post'           => $postContent,
+						'author_name'    => $this->getAuthor('member_id') ? $this->getAuthor('members_display_name') : $this->request['UserName'],
+						'topic_id'       => "",
+						'queued'         => ( $this->getPublished() ) ? 0 : 1,
 						'post_htmlstate' => $this->getSettings('post_htmlstatus'),
+						'post_bwoptions' => IPSBWOptions::freeze( $bw, 'posts', 'forums' )
 					 );
 
 		//-----------------------------------------
@@ -3048,26 +2889,28 @@ class classPost
 		// so we can track them later.
 		//-----------------------------------------
 
-		IPSText::getTextClass( 'bbcode' )->parse_smilies			= $post['use_emo'];
-		IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->getForumData('use_html') and $this->getAuthor('g_dohtml') and $post['post_htmlstate'] ) ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $post['post_htmlstate'] == 2 ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->getForumData('use_ibc') ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->getAuthor('member_group_id');
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->getAuthor('mgroup_others');
-		
-		$testParse	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $postContent );
-		
-		if ( IPSText::getTextClass( 'bbcode' )->error )
+		if( $postContent )
 		{
-			$this->_postErrors = IPSText::getTextClass( 'bbcode' )->error;
-		}
-		else if ( IPSText::getTextClass( 'bbcode' )->warning )
-		{
-			$this->_postErrors = IPSText::getTextClass( 'bbcode' )->warning;
+			IPSText::getTextClass( 'bbcode' )->parse_smilies			= $post['use_emo'];
+			IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->getForumData('use_html') and $this->getAuthor('g_dohtml') and $post['post_htmlstate'] ) ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $post['post_htmlstate'] == 2 ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->getForumData('use_ibc') ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->getAuthor('member_group_id');
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->getAuthor('mgroup_others');
+			
+			$testParse	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $postContent );
+			
+			if ( IPSText::getTextClass( 'bbcode' )->error )
+			{
+				$this->_postErrors = IPSText::getTextClass( 'bbcode' )->error;
+			}
+			else if ( IPSText::getTextClass( 'bbcode' )->warning )
+			{
+				$this->_postErrors = IPSText::getTextClass( 'bbcode' )->warning;
+			}
 		}
 
-		
 		return $post;
 	}
 	
@@ -3081,21 +2924,24 @@ class classPost
 	public function formatPost( $postContent )
 	{ 
 		/* Set HTML Flag for the editor. Bug #19796 */
-		IPSText::getTextClass( 'editor' )->class_editor->allow_html = (intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml')) ? 1 : 0;
+		$this->editor->setAllowHtml( intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml') ? 1 : 0 );
 		
-		$postContent = IPSText::getTextClass( 'editor' )->processRawPost( $postContent, true );
+		$postContent = $this->editor->process( $postContent );
 
 		//-----------------------------------------
 		// Parse post
 		//-----------------------------------------
 
-		IPSText::getTextClass( 'bbcode' )->parse_smilies    = $this->getSettings('enableEmoticons');
-		IPSText::getTextClass( 'bbcode' )->parse_html    	= (intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml')) ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br		= intval($this->request['post_htmlstatus']) == 2 ? 1 : 0;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode    	= $this->getForumData('use_ibc');
-		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'topics';
-		
-		$postContent = IPSText::getTextClass( 'bbcode' )->preDbParse( $postContent );
+		if( $postContent )
+		{
+			IPSText::getTextClass( 'bbcode' )->parse_smilies    = $this->getSettings('enableEmoticons');
+			IPSText::getTextClass( 'bbcode' )->parse_html    	= (intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml')) ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_nl2br		= intval($this->request['post_htmlstatus']) == 2 ? 1 : 0;
+			IPSText::getTextClass( 'bbcode' )->parse_bbcode    	= $this->getForumData('use_ibc');
+			IPSText::getTextClass( 'bbcode' )->parsing_section	= 'topics';
+			
+			$postContent = IPSText::getTextClass( 'bbcode' )->preDbParse( $postContent );
+		}
 		
 		# Make this available elsewhere without reparsing, etc
 		$this->setPostContentPreFormatted( $postContent );
@@ -3141,7 +2987,7 @@ class classPost
 	 *
 	 * @param	string	$title
 	 * @param	string	$topic_title
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function addToModLog( $title='unknown', $topic_title )
 	{
@@ -3153,7 +2999,7 @@ class classPost
 												'member_name' => $this->getAuthor('members_display_name'),
 												'ip_address'  => $this->member->ip_address,
 												'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-												'ctime'       => time(),
+												'ctime'       => IPS_UNIX_TIME_NOW,
 												'topic_title' => $topic_title,
 												'action'      => $title,
 												'query_string'=> htmlspecialchars( my_getenv('QUERY_STRING') ),
@@ -3164,13 +3010,13 @@ class classPost
 	 * Increments the users post count
 	 *
 	 * @param	int		Number of posts to increment by (default 1)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function incrementUsersPostCount( $inc=1 )
 	{
 		/* INIT */
 		$update_sql = array();
-		$today      = time() - 86400;
+		$today      = IPS_UNIX_TIME_NOW - 86400;
 		
 		/* Recount today's posts BOTH approved and unapproved */
 		$count = $this->registry->class_forums->fetchMemberPpdCount( $this->getAuthor('member_id'), $today );
@@ -3210,9 +3056,9 @@ class classPost
 				}
 			}
 			
-			$update_sql['last_post'] = time();
+			$update_sql['last_post'] = IPS_UNIX_TIME_NOW;
 			
-			$this->member->setProperty( 'last_post', time() );
+			$this->member->setProperty( 'last_post', IPS_UNIX_TIME_NOW );
 			
 			/* Data Hook Location */
 			$update_sql['author_data'] = $this->getAuthor();
@@ -3229,7 +3075,7 @@ class classPost
 	 *
 	 * @param	array 	$topic
 	 * @param	string	$type
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function updateForumAndStats( $topic, $type='new')
 	{
@@ -3259,7 +3105,7 @@ class classPost
 				$dbs = array( 'last_title'       => $topic['title'],
 							  'seo_last_title'   => IPSText::makeSeoTitle( $topic['title'] ),
 							  'last_id'          => $topic['tid'],
-							  'last_post'        => time(),
+							  'last_post'        => IPS_UNIX_TIME_NOW,
 							  'last_poster_name' => $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'],
 							  'seo_last_name'    => IPSText::makeSeoTitle( $this->getAuthor('member_id') ?  $this->getAuthor('members_display_name') : $this->request['UserName'] ),
 							  'last_poster_id'   => $this->getAuthor('member_id'),
@@ -3318,11 +3164,8 @@ class classPost
 		
 		if( is_array($dbs) AND count($dbs) )
 		{
-			$this->DB->force_data_type = array( 'last_poster_name' => 'string',
-											    'seo_last_name'    => 'string',
-											    'seo_last_title'   => 'string',
-												'last_title'	   => 'string' );
-												
+			$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name', 'seo_last_title', 'last_title' ), 'string' );
+
 			/* Data Hook Location */
 			IPSLib::doDataHooks( $dbs, 'updateForumLastPostData' );
 	
@@ -3345,7 +3188,7 @@ class classPost
 	 * @param	integer	$rel_id
 	 * @param	string	$rel_module
 	 * @param	arary 	$args
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function makeAttachmentsPermanent( $post_key="", $rel_id=0, $rel_module="", $args=array() )
 	{
@@ -3362,9 +3205,10 @@ class classPost
 		$classToLoad  = IPSLib::loadLibrary( IPSLib::getAppDir( 'core' ) . '/sources/classes/attach/class_attach.php', 'class_attach' );
 		$class_attach = new $classToLoad( $this->registry );
 		
-		$class_attach->type            = $rel_module;
-		$class_attach->attach_post_key = $post_key;
-		$class_attach->attach_rel_id   = $rel_id;
+		$class_attach->type				= $rel_module;
+		$class_attach->attach_post_key	= $post_key;
+		$class_attach->attach_rel_id	= $rel_id;
+		$class_attach->attach_parent_id	= $args['topic_id'];
 		$class_attach->init();
 		
 		$return = $class_attach->postProcessUpload( $args );
@@ -3397,7 +3241,7 @@ class classPost
 	 * Recount how many attachments a topic has
 	 *
 	 * @param	integer	$tid
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function recountTopicAttachments( $tid=0 )
 	{
@@ -3424,41 +3268,21 @@ class classPost
 	 * Check out the tracker whacker
 	 *
 	 * @param	integer	$tid
-	 * @param	bool	$check_first
-	 * @return	void
+	 * @return	@e void
 	 */
-	protected function addTopicToTracker( $tid=0, $check_first=0 )
+	protected function addTopicToTracker( $tid=0 )
 	{
 		if ( ! $tid )
 		{
 			return;
 		}
 		
-		if ( $this->getAuthor('member_id') AND $this->getSettings('enableTracker') == 1 )
+		if ( $this->getAuthor('member_id') AND ( $this->getSettings('enableTracker') == 1 OR $this->getAuthor('auto_track') ) )
 		{
-			if ( $check_first )
-			{
-				$this->DB->build( array( 'select' => 'trid', 'from' => 'tracker', 'where' => "topic_id=".intval($tid)." AND member_id=".$this->getAuthor('member_id') ) );
-				$this->DB->execute();
-				
-				$test = $this->DB->fetch();
-				
-				if ( $test['trid'] )
-				{
-					//-----------------------------------------
-					// Already tracking...
-					//-----------------------------------------
-					
-					return;
-				}
-			}
-				
-			$this->DB->insert( 'tracker', array(
-											  'member_id'        => $this->getAuthor('member_id'),
-											  'topic_id'         => $tid,
-											  'start_date'       => time(),
-											  'topic_track_type' => $this->getAuthor('auto_track') ? $this->getAuthor('auto_track') : 'delayed' ,
-									)       );
+			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+			$_like = classes_like::bootstrap( 'forums','topics' );
+			
+			$_like->add( $tid, $this->getAuthor('member_id'), array( 'like_notify_do' => 1, 'like_notify_meta' => $tid, 'like_notify_freq' => $this->getAuthor('auto_track') ) );
 		}
 	}
 	
@@ -3466,7 +3290,7 @@ class classPost
 	 * Updates the topic view counter when a reply is made.
 	 *
 	 * @param	int		Topic ID
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function updateViewCounter( $tid )
 	{
@@ -3500,7 +3324,7 @@ class classPost
 	{
 		if( $this->settings['etfilter_punct'] )
 		{
-			$title	= preg_replace( "/\?{1,}/"      , "?"    , $title );		
+			$title	= preg_replace( '/\?{1,}/'      , "?"    , $title );		
 			$title	= preg_replace( "/(&#33;){1,}/" , "&#33;", $title );
 		}
 
@@ -3518,6 +3342,76 @@ class classPost
 		return $title;
 	}
 	
+	/**
+	 * Used when isPublished is set to auto
+	 * @param string $type
+	 * @return boolean
+	 */
+	protected function _checkPostModeration( $type )
+	{
+		$memberData = $this->getAuthor();
+		
+		/* Does this member have mod_posts enabled? */
+		if ( $memberData['mod_posts'] )
+		{
+			/* Mod Queue Forever */
+			if ( $memberData['mod_posts'] == 1 )
+			{
+				return FALSE;
+			}
+			else
+			{
+				/* Do we need to remove the mod queue for this user? */
+				$mod_arr = IPSMember::processBanEntry( $memberData['mod_posts'] );
+				
+				/* Yes, they are ok now */
+				if ( IPS_UNIX_TIME_NOW >= $mod_arr['date_end'] )
+				{
+					IPSMember::save( $memberData['member_id'], array( 'core' => array( 'mod_posts' => 0 ) ) );
+				}
+				/* Nope, still don't want to see them */
+				else
+				{
+					return FALSE;
+				}
+			}
+		}
+		
+		/* Group can bypass mod queue */
+		if ( $memberData['g_avoid_q'] )
+		{
+			return TRUE;
+		}
+		
+		/* Is the member's group moderated? */
+		if ( $this->checkGroupIsPostModerated( $this->memberData ) === TRUE )
+		{
+			return FALSE;
+		}
+		
+		/* Check to see if this forum has moderation enabled */
+		$forum = $this->getForumData();
+
+		switch( intval( $forum['preview_posts'] ) )
+		{
+			default:
+			case 0:
+				return TRUE;
+			break;
+			case 1:
+				return FALSE;
+			break;
+			case 2:
+				return ( $type == 'new' ) ? FALSE : TRUE;
+			break;
+			case 3:
+				return ( $type == 'reply' ) ? FALSE : TRUE;
+			break;
+		}
+		
+		/* Our post can be seen! */
+		return TRUE;
+	}
 	/**
 	 * Check Multi Quote
 	 * Checks for quoted information
@@ -3547,9 +3441,9 @@ class classPost
 			$this->request['parent_id'] = $this->request['qpid'];
 		}
 
-		$this->request['qpid'] = preg_replace( "/[^,\d]/", "", trim($this->request['qpid']) );
+		$this->request['qpid'] = preg_replace( '/[^,\d]/', "", trim($this->request['qpid']) );
 
-		if( $this->request['qpid'] )
+		if ( $this->request['qpid'] )
 		{
 			$this->quoted_pids = preg_split( '/,/', $this->request['qpid'], -1, PREG_SPLIT_NO_EMPTY );
 			
@@ -3560,11 +3454,14 @@ class classPost
 			
 			if( count( $this->quoted_pids ) )
 			{
+				$perm_id	= $this->getAuthor('org_perm_id') ? $this->getAuthor('org_perm_id') : $this->getAuthor('g_perm_id');
+				$perm_array = explode( ",", $perm_id );
+
 				$this->DB->build( array( 
 										'select' 	=> 'p.*' ,
 										'from'		=> array( 'posts' => 'p' ),
 										'where'		=> "p.pid IN(" . implode( ',', $this->quoted_pids ) . ")",
-										'add_join'	=> array( array( 'select'	=> 't.forum_id',
+										'add_join'	=> array( array( 'select'	=> 't.*',
 																	 'from'		=> array( 'topics' => 't' ),
 																	 'where'	=> 't.tid=p.topic_id',
 																	 'type'		=> 'left' ),
@@ -3577,64 +3474,45 @@ class classPost
 				
 				while( $tp = $this->DB->fetch() )
 				{
-					//if( IPSMember::checkPermissions('read', $this->getForumID() ) == TRUE )
-					$perm_id	= $this->getAuthor('org_perm_id') ? $this->getAuthor('org_perm_id') : $this->getAuthor('g_perm_id');
-					$perm_array = explode( ",", $perm_id );
-
-					//if ( $this->registry->permissions->check( 'read', $this->getForumData(), $perm_array ) === TRUE )
-					if ( $this->registry->permissions->check( 'read', $this->registry->class_forums->forum_by_id[ $tp['forum_id'] ], $perm_array ) === TRUE )
+					$canSee = $this->registry->getClass('topics')->canView( $tp );
+					
+					/* Direct quote/reply access */
+					if ( $this->request['qpid'] && ! $canSee )
+					{
+						$msg = str_replace( 'EX_', '', $this->registry->getClass('topics')->getErrorMessage() );
+			
+						$this->registry->output->showError( $msg, 10340, null, null, 404 );
+					}
+					
+					if ( $canSee === true && $this->registry->permissions->check( 'read', $this->registry->class_forums->forum_by_id[ $tp['forum_id'] ], $perm_array ) === true )
 					{
 						$tmp_post          = $this->_afterPostCompile( $tp['post'], 'reply' );
 						$tp['author_name'] = ( $tp['members_display_name'] ) ? $tp['members_display_name'] : $tp['author_name'];
 						
-						/*if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-						{
-							$tmp_post = IPSText::getTextClass( 'bbcode' )->convertForRTE(  $tp['post'] );
-						}
-						else
-						{
-							$tmp_post = trim( IPSText::getTextClass( 'bbcode' )->preEditParse( $tp['post'] ) );
-						}*/
-
 						if ( $this->settings['strip_quotes'] )
 						{
 							$tmp_post = trim( $this->_recursiveKillQuotes( $tmp_post ) );
 						}
+						
+						$tmp_post = IPSText::getTextClass( 'bbcode' )->stripSharedMedia( $tmp_post );
 
 						if( $tmp_post )
 						{
-							if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-							{
-								$raw_post .= "[quote name='" . IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($tp['author_name']) . "' timestamp='" . $tp['post_date'] . "' post='" . $tp['pid'] . "']<br />{$tmp_post}<br />[/quote]<br /><br /><br />";
-							}
-							else
-							{
-								/* Knocks out <br />  */
-								$tmp_post = trim( IPSText::getTextClass( 'bbcode' )->preEditParse( $tmp_post ) );
-								$raw_post .= "[quote name='" . IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($tp['author_name']) . "' timestamp='" . $tp['post_date'] . "' post='" . $tp['pid'] . "']\n{$tmp_post}\n[/quote]\n\n\n";
-							}
+							$_post		= preg_replace( '/(<br\s*\/?>\s*)+$/', "<br />", "<br />{$tmp_post}<br />" );
+							$raw_post	.= "[quote name='" . IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($tp['author_name']) . "' timestamp='" . $tp['post_date'] . "' post='" . $tp['pid'] . "']{$_post}[/quote]<br />";
 						}
 					}
 				}
 				
-				$raw_post = trim($raw_post) . "\n";
+				$raw_post = trim($raw_post) . "<br />";
 			}
 		}
-		
-		//-----------------------------------------
-		// Need to put into RTE format..
-		//-----------------------------------------
-		
-		if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-		{
-			$raw_post = IPSText::getTextClass( 'bbcode' )->convertForRTE( $raw_post );
-		}
 
 		//-----------------------------------------
 		// Make raw POST safe for the text area
 		//-----------------------------------------
 
-		$raw_post .= IPSText::raw2form( $postContent );
+		$raw_post .= $postContent;
 		
 		return $raw_post;
 	}
@@ -3645,7 +3523,7 @@ class classPost
 	 *
 	 * @return  string
 	 */
-	private function _recursiveKillQuotes( $t )
+	protected function _recursiveKillQuotes( $t )
 	{
 		return IPSText::getTextClass( 'bbcode' )->stripQuotes( $t );
 	}
diff --git a/upload/admin/applications/forums/sources/classes/post/classPostForms.php b/upload/admin/applications/forums/sources/classes/post/classPostForms.php
index e67ca1d6..438de123 100644
--- a/upload/admin/applications/forums/sources/classes/post/classPostForms.php
+++ b/upload/admin/applications/forums/sources/classes/post/classPostForms.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Posting display formatting methods
- * Last Updated: $Date: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
+ * Last Updated: $Date: 2011-09-29 22:09:09 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  * File Created By: Matt Mecham
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7003 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9570 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,6 @@ class classPostForms extends classPost
 	/**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
 	 * @return void
 	 */
@@ -42,7 +41,6 @@ class classPostForms extends classPost
 	/**
 	 * Magic __call method
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
 	 * @return void
 	 */
@@ -54,7 +52,6 @@ class classPostForms extends classPost
 	/**
 	 * Displays the ajax edit box
 	 *
-	 * @access 	public
 	 * @return	string		HTML
 	 */
 	public function displayAjaxEditForm()
@@ -85,10 +82,24 @@ class classPostForms extends classPost
 				throw new Exception( $e );
 			}
 		}
-	
+		
+		//-----------------------------------------
+		// Form specific...
+		//-----------------------------------------
+		
+		try
+		{
+			$topic = $this->editSetUp();
+		}
+		catch( Exception $error )
+		{
+			throw new Exception( $error->getMessage() );
+		}
+
 		//-----------------------------------------
 		// Appending a reason for the edit?
 		//-----------------------------------------
+
 		$extraData['showAppendEdit'] = 0;
 		
 		if ( $this->getAuthor('g_append_edit') )
@@ -113,19 +124,6 @@ class classPostForms extends classPost
 			$extraData['showReason'] = 1;
 		}
 		
-		//-----------------------------------------
-		// Form specific...
-		//-----------------------------------------
-		
-		try
-		{
-			$topic = $this->editSetUp();
-		}
-		catch( Exception $error )
-		{
-			throw new Exception( $error->getMessage() );
-		}
-		
 		/* Reset reason for edit */
 		$extraData['reasonForEdit']	= $this->request['post_edit_reason'] ? $this->request['post_edit_reason'] : $this->_originalPost['post_edit_reason'];
 		$extraData['append_edit']	= $this->request['append_edit'] ? $this->request['append_edit'] : $this->_originalPost['append_edit'];
@@ -138,12 +136,8 @@ class classPostForms extends classPost
 		
 		$post        = $this->compilePostData();
 		$postContent = $this->getPostContentPreFormatted() ? $this->getPostContentPreFormatted() : $this->getPostContent();
+		$postContent = $this->_afterPostCompile( $postContent, 'edit' );
 		
-		//-----------------------------------------
-		// Hmmmmm....
-		//-----------------------------------------
-		
-		$postContent = IPSText::getTextClass('editor')->unProcessRawPost( $this->_afterPostCompile( $postContent, 'edit' ) );
 		
 		//-----------------------------------------
 		// Do we have any posting errors?
@@ -153,6 +147,23 @@ class classPostForms extends classPost
 		{
 			$errors = isset($this->lang->words[ $this->_postErrors ]) ? $this->lang->words[ $this->_postErrors ] : $this->_postErrors;
 		}
+		
+		//-----------------------------------------
+		// Do we need to tell browser to load the JS?
+		//-----------------------------------------
+		
+		$extraData['_loadJs']	= false;
+		$extraData['smilies']	= null;
+		
+		if (  
+		       ( $this->registry->permissions->check( 'reply', $this->getForumData() ) != TRUE )
+		   or ( $this->getTopicData('state') == 'closed' AND !$this->memberData['g_post_closed'] )
+		   //or ( $this->getTopicData('_ppd_ok') === FALSE )
+		   or ( $this->getTopicData('poll_only') ) )
+		{
+			$extraData['_loadJs']	= true;
+			$extraData['smilies']	= $this->editor->fetchEmoticons();
+		}
 	
 		$html = $this->registry->getClass('output')->getTemplate('editors')->ajaxEditBox( $postContent, $this->getPostID(), $errors, $extraData );
 		
@@ -162,7 +173,6 @@ class classPostForms extends classPost
 	/**
 	 * Show the reply form
 	 *
-	 * @access	protected
 	 * @param	string	Type of form (new/reply/add)
 	 * @param 	array	Array of extra data
 	 * @return 	void 	[Passes data to classOutput]
@@ -173,12 +183,13 @@ class classPostForms extends classPost
 		// Set up
 		//-----------------------------------------
 		
-		$output     = '';
-		$titleText  = '';
-		$buttonText = '';
-		$doCode     = '';
-		$topText    = '';
-		$checkFunc  = '';
+		$output      = '';
+		$titleText   = '';
+		$buttonText  = '';
+		$doCode      = '';
+		$topText     = '';
+		$checkFunc   = '';
+		$autoSaveKey = '';
 		
 		//-----------------------------------------
 		// Work out function type
@@ -236,28 +247,79 @@ class classPostForms extends classPost
 		//-----------------------------------------
 		// Work out elements
 		//-----------------------------------------
-		
+
 		switch( $formType )
 		{
 			default:
 			case 'reply':
-				$doCode     = 'reply_post_do';
-				$titleText  = $this->lang->words['top_txt_reply'] . ' ' . $topic['title'];
-				$buttonText = $this->lang->words['submit_reply'];
-				$topText    = $this->lang->words['replying_in'] . ' ' . $topic['title'];
+				$doCode      = 'reply_post_do';
+				$titleText   = $this->lang->words['top_txt_reply'] . ' ' . $topic['title'];
+				$buttonText  = $this->lang->words['submit_reply'];
+				$topText     = $this->lang->words['replying_in'] . ' ' . $topic['title'];
+				$autoSaveKey = 'reply-' . intval( $this->request['t'] );
 			break;
 			case 'new':
-				$doCode     = 'new_post_do';
-				$titleText  = $this->lang->words['top_txt_new'] . $this->getForumData('name');
-				$buttonText = $this->lang->words['submit_new'];
-				$topText    = $this->lang->words['posting_new_topic'];
+				$doCode      = 'new_post_do';
+				$titleText   = $this->lang->words['top_txt_new'] . $this->getForumData('name');
+				$buttonText  = $this->lang->words['submit_new'];
+				$topText     = $this->lang->words['posting_new_topic'];
+				$autoSaveKey = 'new-' . intval( $this->request['f'] );
+				$tagBox      = '';
+				
+				$where       = array( 'meta_parent_id'	=> intval( $this->request['f'] ),
+									  'member_id'		=> $this->memberData['member_id'],
+									  'existing_tags'	=> explode( ',', IPSText::cleanPermString( $_REQUEST['ipsTags'] ) ) );
+				
+				if ( $this->registry->tags->can( 'add', $where ) )
+				{
+					$tagBox = $this->registry->tags->render('entryBox', $where);
+				}
 			break;
 			case 'edit': 
-				$doCode     = 'edit_post_do';
-				$titleText  = $this->lang->words['top_txt_edit'] . ' ' . $topic['title'];
-				$buttonText = $this->lang->words['submit_edit'];
-				$topText    = $this->lang->words['editing_post'] . ' ' . $topic['title'];
+				$doCode      = 'edit_post_do';
+				$titleText   = $this->lang->words['top_txt_edit'] . ' ' . $topic['title'];
+				$buttonText  = $this->lang->words['submit_edit'];
+				$topText     = $this->lang->words['editing_post'] . ' ' . $topic['title'];
+				$autoSaveKey = 'edit-' . intval( $this->request['p'] );
 				
+				$where       = array( 'meta_id'		   => $topic['tid'],
+									  'meta_parent_id' => intval( $this->request['f'] ),
+									  'member_id'	   => $this->memberData['member_id'] );
+
+				if( $_REQUEST['ipsTags'] )
+				{
+					$where['existing_tags']	= explode( ',', IPSText::cleanPermString( $_REQUEST['ipsTags'] ) );
+				}
+
+				if ( $this->registry->tags->can( 'edit', $where ) && ( $this->request['p'] == $topic['topic_firstpost'] ) )
+				{
+					$tagBox = $this->registry->tags->render('entryBox', $where);
+				}
+
+				/* Are we following? */
+				require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+				$_like	= classes_like::bootstrap( 'forums','topics' );
+				$_likes	= $_like->isLiked( $this->getTopicData('tid'), $this->getAuthor('member_id') );
+
+				//-----------------------------------------
+				// Appending a reason for the edit?
+				//-----------------------------------------
+			
+				if ( $this->getAuthor('g_append_edit') )
+				{
+					$extraData['showEditOptions'] = 1;
+		
+					if ( !empty( $this->_originalPost['append_edit'] ) )
+					{
+						$extraData['checked'] = "checked";
+					}	
+				}
+				
+				if ( !empty( $this->moderator['edit_post'] ) OR $this->getAuthor('g_is_supmod') )
+				{
+					$extraData['showReason'] = 1;
+				}
+		
 				/* Reset reason for edit */
 				$extraData['reasonForEdit'] = $this->request['post_edit_reason'] ? $this->request['post_edit_reason'] : $this->_originalPost['post_edit_reason'];
 
@@ -265,7 +327,7 @@ class classPostForms extends classPost
 				$this->setSettings( array( 'enableSignature' => $this->_originalPost['use_sig'],
 										   'enableEmoticons' => $this->_originalPost['use_emo'],
 										   'post_htmlstatus' => $this->_originalPost['post_htmlstate'],
-										   'enableTracker'   => ( (intval($this->request['enabletrack']) != 0) OR $this->getIsPreview() !== TRUE ) ? 1 : 0 ) );
+										   'enableTracker'   => ( intval($this->request['enabletrack']) != 0 ? 1 : ( $_likes ? 1 : 0 ) ) ) );
 			break;
 		}
 		
@@ -285,27 +347,18 @@ class classPostForms extends classPost
 		//-----------------------------------------
 		// Compile the poll
 		//-----------------------------------------
-		
+
 		$this->poll_questions = $this->compilePollData();
-		
+
 		//-----------------------------------------
 		// Are we quoting posts?
 		//-----------------------------------------
 		
 		$postContent = $this->_checkMultiQuote( $postContent );
 		
-		//-----------------------------------------
-		// RTE? Convert RIGHT tags that QUOTE would
-		// have put there
-		// Commented out 14/7/08 - _afterPostCompile handles this for edit, and should
-		// 	also handle for any other type if they need it...
-		//-----------------------------------------
+		/* Set content in editor */
+		$this->editor->setContent( $postContent );
 		
-		/*if ( IPSText::getTextClass('editor')->method == 'rte' )
-		{
-			$postContent = IPSText::getTextClass('bbcode')->convertForRTE( $postContent );
-		}*/
-
 		//-----------------------------------------
 		// Do we have any posting errors?
 		//-----------------------------------------
@@ -350,7 +403,7 @@ class classPostForms extends classPost
 		$class_attach->attach_post_key	= $this->post_key;
 		$class_attach->init();
 		$class_attach->getUploadFormSettings();
-		
+			
 		//-----------------------------------------
 		// START TABLE
 		//-----------------------------------------
@@ -358,10 +411,9 @@ class classPostForms extends classPost
 		$output .= $this->registry->getClass('output')->getTemplate('post')->postFormTemplate( array( 'title'            => $titleText,
 																									  'captchaHTML'      => $this->_generateGuestCaptchaHTML(),
 																									  'checkBoxes'       => $this->_generateCheckBoxes( $formType, isset( $topic['tid'] ) ? $topic['tid'] : 0, $this->getForumData('id') ),
-																									  'editor'           => IPSText::getTextClass('editor')->showEditor( $postContent, 'Post' ),
+																									  'editor'           => $this->editor->show( 'Post', array( 'autoSaveKey' => $autoSaveKey, 'height' => 350 ) ),
 																									  'buttonText'       => $buttonText,
 																									  'uploadForm'       => ( $this->can_upload ) ? $this->registry->getClass('output')->getTemplate('post')->uploadForm( $this->post_key, 'post', $class_attach->attach_stats, $this->getPostID(), $this->getForumData('id') ) : "",
-																									  'postIconSelected' => $this->_generatePostIcons( $post['icon_id'] ),
 																									  'topicSummary'     => $this->_generateTopicSummary( $topic['tid'] ),
 																									  'formType'         => $formType,
 																									  'extraData'        => $extraData,
@@ -369,10 +421,10 @@ class classPostForms extends classPost
 																									  'pollBoxHTML'      => $this->_generatePollBox( $formType ),
 																									  'canEditTitle'     => $this->edit_title,
 																									  'topicTitle'       => $this->_topicTitle ? $this->_topicTitle : $topic['title'],
-																									  'topicDesc'        => $this->_topicDescription ? $this->_topicDescription  : $topic['description'],
 																									  'seoTopic'		 => $topic['title_seo'],
 																									  'seoForum'		 => $this->getForumData('name_seo'),
-																									  'statusMsg'        => $_statusMsg
+																									  'statusMsg'        => $_statusMsg,
+																									  'tagBox'			 => $tagBox
 																								), 
 																								array( 	'doCode' 			=> $doCode,
 																									 	'p'					=> $this->getPostID(),
@@ -397,7 +449,7 @@ class classPostForms extends classPost
 		
 		$this->nav = $this->registry->getClass('class_forums')->forumsBreadcrumbNav( $this->getForumData('id') );
 
-    	if ( isset($topic['tid']) AND $topic['tid'] )
+    	if ( !empty($topic['tid']) )
     	{
     		$this->nav[] = array( $topic['title'], "showtopic={$topic['tid']}", $topic['title_seo'], 'showtopic' );
     	}
@@ -417,7 +469,6 @@ class classPostForms extends classPost
 	/**
 	 * Show the edit form
 	 *
-	 * @access	public
 	 * @return	string	HTML to show
 	 */
 	public function showEditForm()
@@ -434,25 +485,6 @@ class classPostForms extends classPost
 			$_moderator      = $this->getAuthor('forumsModeratorData');
 			$this->moderator = $_moderator[ $this->getForumID() ];
         }
-	
-		//-----------------------------------------
-		// Appending a reason for the edit?
-		//-----------------------------------------
-	
-		if ( $this->getAuthor('g_append_edit') )
-		{
-			$extraData['showEditOptions'] = 1;
-			
-			if ( isset( $this->_originalPost['append_edit'] ) && $this->_originalPost['append_edit'] )
-			{
-				$extraData['checked'] = "checked";
-			}		
-		}
-		
-		if ( ( isset( $this->moderator['edit_post'] ) && $this->moderator['edit_post'] ) OR $this->getAuthor('g_is_supmod') )
-		{
-			$extraData['showReason'] = 1;
-		}
 		
 		$this->_displayForm( 'edit', $extraData );
 	}
@@ -460,7 +492,6 @@ class classPostForms extends classPost
 	/**
 	 * Show the reply form
 	 *
-	 * @access	public
 	 * @return	string	HTML to show
 	 */
 	public function showReplyForm()
@@ -471,7 +502,6 @@ class classPostForms extends classPost
 	/**
 	 * Show the topic form
 	 *
-	 * @access	public
 	 * @return	string	HTML to show
 	 */
 	public function showTopicForm()
@@ -484,7 +514,6 @@ class classPostForms extends classPost
 	 *
 	 * @param	string	Post content
 	 * @param	string	Form type (new/edit/reply)
-	 * @access	protected
 	 * @author	MattMecham
 	 */
 	protected function _afterPostCompile( $postContent, $formType )
@@ -497,97 +526,9 @@ class classPostForms extends classPost
 			// Unconvert the saved post if required
 			//-----------------------------------------
 
-			if ( ! isset($_POST['Post']) )
+			if ( isset($_POST['Post']) )
 			{
-				//-----------------------------------------
-				// If we're using RTE, then just clean up html
-				//-----------------------------------------
-
-				if ( IPSText::getTextClass('editor')->method == 'rte' )
-				{
-					IPSText::getTextClass('bbcode')->parse_wordwrap	= 0;
-					IPSText::getTextClass('bbcode')->parse_html		= 0;
-
-					$postContent = IPSText::getTextClass('bbcode')->convertForRTE( $postContent );
-				}
-				else
-				{
-					$this->_originalPost['post_htmlstate']				= isset($this->_originalPost['post_htmlstate']) ? $this->_originalPost['post_htmlstate'] : 0;
-					IPSText::getTextClass('bbcode')->parse_html			= intval($this->_originalPost['post_htmlstate']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml') ? 1 : 0;
-					IPSText::getTextClass('bbcode')->parse_nl2br		= (isset($this->_originalPost['post_htmlstate']) AND $this->_originalPost['post_htmlstate'] == 2) ? 1 : 0;
-					IPSText::getTextClass('bbcode')->parse_smilies		= intval($this->_originalPost['use_emo']);
-					IPSText::getTextClass('bbcode')->parse_bbcode		= $this->getForumData('use_ibc');
-					IPSText::getTextClass('bbcode')->parsing_section	= 'topics';
-
-					if ( IPSText::getTextClass('bbcode')->parse_html )
-					{
-						if ( ! IPSText::getTextClass('bbcode')->parse_nl2br )
-						{
-							$postContent = str_replace( '<br />', "", $postContent );
-							$postContent = str_replace( '<br>'	, "", $postContent );
-						}
-					}
-
-					$postContent = IPSText::getTextClass('bbcode')->preEditParse( $postContent );
-				}
-			}
-			else
-			{
-				if ( IPSText::getTextClass('editor')->method != 'rte' && $this->request['_from'] != 'quickedit' )
-				{
-					$_POST['Post'] = str_replace( '&', '&amp;', $_POST['Post'] );
-					$_POST['Post'] = str_replace( '&amp;#092;', '&#092;', $_POST['Post'] );
-				}
-				else
-				{
-					//-----------------------------------------
-					// Coming from quick edit, need to fix the
-					// HTML entities - we could even check
-					// request['_from'] == 'quickedit' here if need be
-					//-----------------------------------------
-
-					$_POST['Post'] = str_replace( '&amp;', '&', $_POST['Post'] );
-				
-				}
-
 				$postContent = IPSText::stripslashes( $_POST['Post'] );
-				//print nl2br(htmlspecialchars($postContent));exit;
-			}
-		}
-		else
-		{
-			//-----------------------------------------
-			// Need to unparse if we're showing the form again
-			//-----------------------------------------
-
-			if ( $this->getIsPreview() === true OR $this->_postErrors )
-			{
-				if ( IPSText::getTextClass('editor')->method == 'rte' )
-				{
-					IPSText::getTextClass('bbcode')->bypass_badwords	= true;
-					
-					$postContent = IPSText::getTextClass('bbcode')->convertForRTE( $postContent );
-				}
-				else
-				{
-					IPSText::getTextClass('bbcode')->parse_html			= intval($_POST['post_htmlstate']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml') ? 1 : 0;
-					IPSText::getTextClass('bbcode')->parse_nl2br		= (isset($_POST['post_htmlstate']) AND $_POST['post_htmlstate'] == 2) ? 1 : 0;
-					IPSText::getTextClass('bbcode')->parse_smilies		= intval($_POST['use_emo']);
-					IPSText::getTextClass('bbcode')->parse_bbcode		= $this->getForumData('use_ibc');
-					IPSText::getTextClass('bbcode')->bypass_badwords	= true; // don't do the changeouts to the text that will be in the form
-					IPSText::getTextClass('bbcode')->parsing_section	= 'topics';
-
-					if ( ! IPSText::getTextClass('bbcode')->parse_html )
-					{
-						if ( IPSText::getTextClass('bbcode')->parse_nl2br )
-						{
-							$postContent = str_replace( '<br />', "", $postContent );
-							$postContent = str_replace( '<br>'	, "", $postContent );
-						}
-					}
-
-					$postContent = IPSText::getTextClass('bbcode')->preEditParse( $postContent );
-				}			
 			}
 		}
 
@@ -599,7 +540,6 @@ class classPostForms extends classPost
 	 *
 	 * @param	int		Topic ID
 	 * @return	string	HTML elements
-	 * @access	protected
 	 * @author 	MattMecham
 	 */
 	protected function _generateTopicSummary( $topicID )
@@ -626,14 +566,30 @@ class classPostForms extends classPost
 			return;
 		}
 		
+		//-----------------------------------------
+		// Set ignored users
+		//-----------------------------------------
+		
+		$ignored_users = array();
+		
+		foreach( $this->member->ignored_users as $_i )
+		{
+			if( $_i['ignore_topics'] )
+			{
+				$ignored_users[] = $_i['ignore_ignore_id'];
+			}
+		}
+		
 		//-----------------------------------------
 		// Get the posts
 		// This section will probably change at some point
 		//-----------------------------------------
-						
+
+		$_queued	= $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+		
 		$this->DB->build( array( 'select'   => 'p.*',
 									   'from'     => array( 'posts' => 'p' ),
-									   'where'    => 'p.topic_id=' . $topicID . ' AND p.queued=0',
+									   'where'    => 'p.topic_id=' . $topicID . ' AND ' . $_queued,
 									   'order'    => 'pid DESC',
 									   'limit'    => array( 0, 10 ),
 									   'add_join' => array(
@@ -675,13 +631,19 @@ class classPostForms extends classPost
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];
 
-			$row['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['post'] );
+			$row['post']	= IPSText::truncate( IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['post'] ), 1000 );
 			
-			//-----------------------------------------
-			// View image...
-			//-----------------------------------------
+			/* Bit crude */
+			$od = substr_count( $row['post'], '<div' );
+			$cd = substr_count( $row['post'], '</div>' );
 			
-			$row['post'] = IPSText::getTextClass( 'bbcode' )->memberViewImages( $row['post'] );
+			if ( $od > $cd )
+			{
+				for( $i = 0 ; $i < $od ; $i++ )
+				{
+					$row['post'] .= "</div>";
+				}
+			}
 			
 			$posts[ $row['pid'] ] = $row;
 				
@@ -689,9 +651,9 @@ class classPostForms extends classPost
 			// Are we giving this bloke a good ignoring?
 			//-----------------------------------------
 
-			if ( $this->getAuthor('ignored_users') )
+			if ( count($ignored_users) )
 			{
-				if ( in_array( $row['author_id'], $this->getAuthor('ignored_users') ) and $this->request['qpid'] != $row['pid'] )
+				if ( in_array( $row['author_id'], $ignored_users ) and $this->request['qpid'] != $row['pid'] )
 				{
 					if ( ! strstr( $this->settings['cannot_ignore_groups'], ','.$row['member_group_id'].',' ) )
 					{
@@ -741,7 +703,6 @@ class classPostForms extends classPost
 	/**
 	 * Generates checkboxes
 	 *
-	 * @access	protected
 	 * @param	string	Type of form
 	 * @param	int		Topic ID
 	 * @param	int		Forum ID
@@ -772,7 +733,7 @@ class classPostForms extends classPost
 			$return['emo'] = "";
 		}
 		
-		if ( $this->registry->class_forums->forum_by_id[ $forumID ]['use_html'] and $group_cache[ $this->getAuthor('member_group_id') ]['g_dohtml'] )
+		if ( $this->registry->class_forums->forum_by_id[ $forumID ]['use_html'] and $this->getAuthor('g_dohtml') )
 		{
 			$options_array[ $this->getSettings('post_htmlstatus') ] = ' selected="selected"';
 			
@@ -783,12 +744,15 @@ class classPostForms extends classPost
 		{
 			if ( $topicID and $this->getAuthor('member_id') )
 			{
-				$this->DB->build( array( 'select' => 'trid',
-										 'from'   => 'tracker',
-									     'where'  => "topic_id=" . $topicID . " AND member_id=".$this->getAuthor('member_id') ) );
-				$this->DB->execute();
+				//-----------------------------------------
+				// Like class
+				//-----------------------------------------
 				
-				if ( $this->DB->getTotalRows() )
+				require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+				$_like	= classes_like::bootstrap( 'forums', 'topics' );
+				$_track	= $_like->isLiked( $topicID, $this->getAuthor('member_id') );
+
+				if ( $_track )
 				{
 					$return['tra'] = '-tracking-';
 				}
@@ -801,7 +765,6 @@ class classPostForms extends classPost
 	/**
 	 * Generates mod options dropdown
 	 *
-	 * @access	protected
 	 * @param	array 	Topic data
 	 * @param	string	Type of form (new/edit/reply)
 	 * @return	string	HTML of dropdown box
@@ -951,9 +914,9 @@ class classPostForms extends classPost
 			
 			if( $this->_originalPost['new_topic'] )
 			{
-				if ( !isset($mytimes['open_date']) OR !$mytimes['open_date'] )
+				if ( empty($mytimes['open_date']) )
 				{
-					if ( isset($topic['topic_open_time']) AND $topic['topic_open_time'] )
+					if ( !empty($topic['topic_open_time']) )
 					{
 						# Bug 23258 - add on TZ as we take this off when saving time
 						$date                 = IPSTime::unixstamp_to_human( $topic['topic_open_time'] + $this->registry->class_localization->getTimeOffset() );
@@ -962,9 +925,9 @@ class classPostForms extends classPost
 					}
 				}
 				
-				if ( !isset($mytimes['close_date']) OR !$mytimes['close_date'] )
+				if ( empty($mytimes['close_date']) )
 				{
-					if ( isset($topic['topic_close_time']) AND $topic['topic_close_time'] )
+					if ( !empty($topic['topic_close_time']) )
 					{
 						# Bug 23258 - add on TZ as we take this off when saving time
 						$date                  = IPSTime::unixstamp_to_human( $topic['topic_close_time'] + $this->registry->class_localization->getTimeOffset() );
@@ -988,36 +951,10 @@ class classPostForms extends classPost
 					  'canSetCloseTime' => $this->can_set_close_time,
 					  'myTimes'         => $mytimes );
 	}
-	
-	/**
-	 * Generates the post icons
-	 *
-	 * @access	protected
-	 * @param	string	Chosen post icon (optional)
-	 * @return 	string	HTML
-	 */
-	protected function _generatePostIcons( $post_icon="" )
-	{
-		$postIcons = array();
-		$post_icon = ( $post_icon ) ? $post_icon : intval($this->request['iconid']);
-		
-		if ( isset( $post_icon ) )
-		{
-			$postIcons[ $post_icon ] = 1;
-		}
-		else
-		{
-			/* We use a key incase we use keys for post icons */
-			$postIcons['0'] = 1;
-		}
-		
-		return $postIcons;
-	}
-	
+
 	/**
 	 * Generates the captcha if required
 	 *
-	 * @access	protected
 	 * @return	string	Captcha IMG id
 	 */
 	protected function _generateGuestCaptchaHTML()
@@ -1036,7 +973,6 @@ class classPostForms extends classPost
 	 * @param	string	Form type (new/edit/reply)
 	 * @return	string	HTML
 	 * @author	MattMecham
-	 * @access	protected
 	 */
 	protected function _generatePollBox( $formType )
 	{
@@ -1054,8 +990,13 @@ class classPostForms extends classPost
 			$show_open        = 0;
 			$is_mod           = 0;
 			$poll_votes		  = array();
-			$poll_only	  	  = array();
-			$poll_multi		  = array();			
+			$poll_only	  	  = 0;
+			$poll_multi		  = array();
+			
+			if( $this->settings['ipb_poll_only'] AND ipsRegistry::$request['poll_only'] AND ipsRegistry::$request['poll_only'] == 1 )
+			{
+				$poll_only = 1;
+			}			
 			
 			if ( isset($_POST['question']) AND is_array( $_POST['question'] ) and count( $_POST['question'] ) )
 			{
@@ -1093,13 +1034,6 @@ class classPostForms extends classPost
 						$poll_votes[ $id ] = $vote;
 					}
 				}
-			}
-			
-			$poll_only = 0;
-			
-			if( $this->settings['ipb_poll_only'] AND ipsRegistry::$request['poll_only'] AND ipsRegistry::$request['poll_only'] == 1 )
-			{
-				$poll_only = 1;
 			}			
 			
 			if ( $formType == 'edit' AND ( ! isset($_POST['question']) OR ! is_array( $_POST['question'] ) OR ! count( $_POST['question'] ) ) )
@@ -1109,7 +1043,17 @@ class classPostForms extends classPost
 				//-----------------------------------------
 				
 				$this->poll_data    = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'polls', 'where' => "tid=".$this->getTopicID() ) );
-	    		$this->poll_answers = $this->poll_data['choices'] ? unserialize(stripslashes($this->poll_data['choices'])) : array();
+
+				$this->poll_answers = unserialize(stripslashes($this->poll_data['choices']));
+				
+				if( !is_array($this->poll_answers) OR !count($this->poll_answers) )
+				{
+					$this->poll_answers = unserialize( preg_replace( '!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", stripslashes( $this->poll_data['choices'] ) ) );
+				}
+				if ( !is_array($this->poll_answers) OR !count($this->poll_answers) )
+				{
+					$this->poll_answers = array();
+				}
 
         		//-----------------------------------------
         		// Lezz go
@@ -1127,7 +1071,7 @@ class classPostForms extends classPost
         			
         			foreach( $data['choice'] as $choice_id => $text )
 					{
-						$poll_choices[ $question_id . '_' . $choice_id ] = $text;
+						$poll_choices[ $question_id . '_' . $choice_id ] = stripslashes( $text );
 						$poll_votes[ $question_id . '_' . $choice_id ]   = intval($data['votes'][ $choice_id ]);
 					}
 				}
@@ -1136,7 +1080,7 @@ class classPostForms extends classPost
 				
 				if ( $this->settings['ipb_poll_only'] AND $this->poll_data['poll_only'] == 1 )
 				{
-					$poll_only = "checked='checked'";
+					$poll_only = 1;
 				}				
 				
 				$poll_view_voters = $this->poll_data['poll_view_voters'];
@@ -1149,7 +1093,22 @@ class classPostForms extends classPost
 				$poll_view_voters = $this->request['poll_view_voters'];
 			}
 			
-			return $this->registry->getClass('output')->getTemplate('post')->pollBox( $this->max_poll_questions, $this->max_poll_choices_per_question, IPSText::simpleJsonEncode( $poll_questions ), IPSText::simpleJsonEncode( $poll_choices ), IPSText::simpleJsonEncode( $poll_votes ), $show_open, $poll_question, $is_mod, json_encode( $poll_multi ), $poll_only, $poll_view_voters, intval( $this->poll_data['votes'] ) );
+			return $this->registry->getClass('output')->getTemplate('post')->pollBox( array(
+																							'max_poll_questions'	=> $this->max_poll_questions, 
+																							'max_poll_choices'		=> $this->max_poll_choices_per_question, 
+																							'poll_questions'		=> IPSText::simpleJsonEncode( $poll_questions ), 
+																							'poll_choices'			=> IPSText::simpleJsonEncode( $poll_choices ), 
+																							'poll_votes'			=> IPSText::simpleJsonEncode( $poll_votes ), 
+																							'show_open'				=> $show_open, 
+																							'poll_question'			=> $poll_question, 
+																							'is_mod'				=> $is_mod, 
+																							'poll_multi'			=> json_encode( $poll_multi ), 
+																							'poll_only'				=> $poll_only, 
+																							'poll_view_voters'		=> $poll_view_voters, 
+																							'poll_total_votes'		=> intval( $this->poll_data['votes'] ),
+																							'poll_data'				=> $this->poll_data,
+																							'poll_answers'			=> $this->poll_answers 
+																					)		);
 		}
 		
 		return '';
@@ -1161,20 +1120,19 @@ class classPostForms extends classPost
 	 * @param	string	Post Content
 	 * @param	string	MD5 post key for attachments
 	 * @return	string	HTML
-	 * @access	protected
 	 * @author 	Matt Mecham
 	 */
     protected function _generatePostPreview( $postContent="", $post_key='' )
     {
 		$this->registry->class_localization->loadLanguageFile( array( 'public_topic' ) );
 	
-    	IPSText::getTextClass('bbcode')->parse_html					= (intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml')) ? 1 : 0;
-		IPSText::getTextClass('bbcode')->parse_nl2br				= $this->request['post_htmlstatus'] == 2 ? 1 : 0;
-		IPSText::getTextClass('bbcode')->parse_smilies				= intval($this->getSettings('enableEmoticons'));
-		IPSText::getTextClass('bbcode')->parse_bbcode  				= $this->getForumData('use_ibc');
-		IPSText::getTextClass('bbcode')->parsing_section			= 'topics';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
+    	IPSText::getTextClass('bbcode')->parse_html				= (intval($this->request['post_htmlstatus']) AND $this->getForumData('use_html') AND $this->getAuthor('g_dohtml')) ? 1 : 0;
+		IPSText::getTextClass('bbcode')->parse_nl2br			= $this->request['post_htmlstatus'] == 2 ? 1 : 0;
+		IPSText::getTextClass('bbcode')->parse_smilies			= intval($this->getSettings('enableEmoticons'));
+		IPSText::getTextClass('bbcode')->parse_bbcode  			= $this->getForumData('use_ibc');
+		IPSText::getTextClass('bbcode')->parsing_section		= 'topics';
+		IPSText::getTextClass('bbcode')->parsing_mgroup			= $this->memberData['member_group_id'];
+		IPSText::getTextClass('bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
 		
 		# Make sure we have the pre-display look
 		$postContent = IPSText::getTextClass('bbcode')->preDisplayParse( $postContent );
diff --git a/upload/admin/applications/forums/sources/classes/post/index.html b/upload/admin/applications/forums/sources/classes/post/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/sources/classes/post/index.html
+++ b/upload/admin/applications/forums/sources/classes/post/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/threaded.php b/upload/admin/applications/forums/sources/classes/threaded.php
deleted file mode 100644
index 811d169e..00000000
--- a/upload/admin/applications/forums/sources/classes/threaded.php
+++ /dev/null
@@ -1,617 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Threaded mode functions
- * Last Updated: $Date: 2010-10-19 08:45:58 -0400 (Tue, 19 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Revision: 6994 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly.";
-	exit();
-}
-
-class threadedModeLibrary
-{
-	/**
-	 * Topics library
-	 *
-	 * @var		object
-	 */
-	public $topics;
-	
-	/**
-	 * Structured post ids
-	 *
-	 * @var		array
-	 */
-	public $structured_pids		= array();
-
-	/**
-	 * Post cache
-	 *
-	 * @var		array
-	 */
-	public $post_cache			= array();
-
-	/**
-	 * Used post ids
-	 *
-	 * @var		array
-	 */
-	public $used_post_ids		= array();
-
-	/**
-	 * Threaded posts
-	 *
-	 * @var		array
-	 */
-	public $_threaded_posts		= array();
-
-	/**
-	 * Last id we've seen
-	 *
-	 * @var		int
-	 */
-	public $last_id				= 0;
-	
-	/**#@+
-	 * Registry Object Shortcuts
-	 *
-	 * @var		object
-	 */
-	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
-	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
-	/**#@-*/
-
-	/**
-	 * Constructor
-	 *
-	 * @param	object		Registry reference
-	 * @param	object		Reference to topics lib
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry, $topics )
-	{
-		/* Make objects */
-		$this->registry = $registry;
-		$this->DB	    = $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang	    = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		$this->topics	=& $topics;
-	}
-
-	/**
-	 * Get Threaded Topic Data
-	 *
-	 * @return	array
-	 */	
-	public function _getTopicDataThreaded()
-	{
-		//-----------------------------------------
-		// Grab the posts we'll need
-		//-----------------------------------------
-		
-		$pc_join	= array();
-		
-		$first		= intval( $this->request['start'] );
-		$last		= $this->settings['threaded_per_page'] ? $this->settings['threaded_per_page'] : 250;
-				
-		//-----------------------------------------
-		// GET meh pids
-		//-----------------------------------------
-		
-		if ( $first > 0 )
-		{
-			// we're on a page, make sure init val is there
-			
-			$this->topics->pids[0]			= $this->topics->topic['topic_firstpost'];
-			$this->structured_pids[ 0 ][]	= $this->topics->topic['topic_firstpost'];
-		}
-		
-		$this->DB->build( array(
-								'select' => 'pid, post_parent',
-								'from'   => 'posts',
-								'where'  => 'topic_id=' . $this->topics->topic['tid'] . ' and queued != 1',
-								'order'  => 'pid',
-								'limit'  => array( $first, $last )
-						)	);
-							
-		$this->DB->execute();
-		
-		while( $p = $this->DB->fetch() )
-		{
-			$this->topics->pids[] = $p['pid'];
-			
-			// Force to be children of 'root' post
-			
-			if ( ! $p['post_parent'] and $p['pid'] != $this->topics->topic['topic_firstpost'] )
-			{
-				$p['post_parent'] = $this->topics->topic['topic_firstpost'];
-			}
-			
-			$this->structured_pids[ $p['post_parent'] ][] = $p['pid'];
-		}
-		
-		/* Ignored Users */
-		$ignored_users = array();
-		
-		foreach( $this->member->ignored_users as $_i )
-		{
-			if( $_i['ignore_topics'] )
-			{
-				$ignored_users[] = $_i['ignore_ignore_id'];
-			}
-		}
-		
-		//-----------------------------------------
-		// Get post bodah
-		//-----------------------------------------
-		
-		if ( count( $this->topics->pids ) )
-		{
-			$this->DB->build( array(
-									'select' => 'pid, post, author_id, author_name, post_date, post_title, post_parent, topic_id, icon_id',
-									'from'   => 'posts',
-									'where'  => 'pid IN(' . implode( ',', $this->topics->pids ) . ')',
-									'order'  => 'pid',
-						)	);
-								 
-			$this->DB->execute();
-			
-			while( $p = $this->DB->fetch() )
-			{
-				if ( ! $p['post_parent'] and $p['pid'] != $this->topics->topic['topic_firstpost'] )
-				{
-					$p['post_parent'] = $this->topics->topic['topic_firstpost'];
-				}
-				
-				$this->post_cache[ $p['pid'] ] = $p;
-				
-				$this->last_id = $p['pid'];
-			}
-		}
-		
-		//-----------------------------------------
-		// Force root in cache
-		//-----------------------------------------
-		
-		$this->post_cache[0] = array( 'id' => 1 );
-		
-		$this->post_cache[ $this->topics->topic['topic_firstpost'] ]['post_title']  = $this->topics->topic['title'];
-		
-		//-----------------------------------------
-		// Are we viewing Posts?
-		//-----------------------------------------
-	
-		$post_id = intval( $this->request['pid'] );
-		
-		if ( $post_id && ! in_array( $post_id, $this->topics->pids ) )
-		{
-			$this->registry->output->showError( 'topics_post_not_in_topic', 10358, true, null, 404 );
-		}
-				
-		$postid_array = array( 1 => $post_id );
-		
-		if ( $post_id and $post_id != $this->topics->topic['topic_firstpost'] )
-		{
-			$parents = $this->_threadedPostGetParents( $post_id );
-			
-			if ( count($parents) )
-			{
-				foreach( $parents as $pid )
-				{
-					if ( $pid != $this->topics->topic['topic_firstpost'] )
-					{
-						$postid_array[] = $pid;
-					}
-				}
-			}
-		}
-		
-		/* Data Hook Location */
-		$dataHook = array( 'members' => array(), 'postJoins' => array() );
-		IPSLib::doDataHooks( $dataHook , 'topicViewQuery' );
-		
-		/* Join Queries */
-		$_extraMember = ( is_array($dataHook['members']) && count($dataHook['members']) ) ? ',m.'.implode(',m.', $dataHook['members']) : '';
-		
-		$_post_joins = array(
-								array( 
-										'select' => 'm.member_id as mid,m.name,m.member_group_id,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn, m.members_display_name, m.members_seo_name, m.has_gallery, m.has_blog, m.members_bitoptions,m.mgroup_others'.$_extraMember,
-										'from'	 => array( 'members' => 'm' ),
-										'where'	 => 'm.member_id=p.author_id',
-										'type'	 => 'left'
-									),
-								array( 
-										'select' => 'pp.*',
-										'from'	 => array( 'profile_portal' => 'pp' ),
-										'where'	 => 'm.member_id=pp.pp_member_id',
-										'type'	 => 'left'
-									)
-							);
-		
-		/* Add data hook joins */					
-		if ( is_array($dataHook['postJoins']) && count($dataHook['postJoins']) )
-		{
-			$_post_joins = array_merge( $_post_joins, $dataHook['postJoins'] );
-		}
-		
-		/* Reputation system enabled? */
-		if( $this->settings['reputation_enabled'] )
-		{
-			/* Add the join to figure out if the user has already rated the post */
-			$_post_joins[] = $this->registry->repCache->getUserHasRatedJoin( 'pid', 'p.pid', 'forums' );
-			
-			/* Add the join to figure out the total ratings for each post */
-			if( $this->settings['reputation_show_content'] )
-			{
-				$_post_joins[] = $this->registry->repCache->getTotalRatingJoin( 'pid', 'p.pid', 'forums' );
-			}
-		}
-		
-		/* Cache? */
-		if ( IPSContentCache::isEnabled() )
-		{
-			if ( IPSContentCache::fetchSettingValue('post') )
-			{
-				$_post_joins[] = IPSContentCache::join( 'post', 'p.pid' );
-			}
-			
-			if ( IPSContentCache::fetchSettingValue('sig') )
-			{
-				$_post_joins[] = IPSContentCache::join( 'sig' , 'm.member_id', 'ccb', 'left', 'ccb.cache_content as cache_content_sig, ccb.cache_updated as cache_updated_sig' );
-			}
-		}
-		
-		if( $this->settings['custom_profile_topic'] == 1 )
-		{
-			$_post_joins[] = array( 
-								'select' => 'pc.*',
-								'from'   => array( 'pfields_content' => 'pc' ),
-								'where'  => 'pc.member_id=p.author_id',
-								'type'   => 'left'
-							);
-		}				
-		
-		if( count( $postid_array ) )
-		{			
-			//-----------------------------------------
-			// Get root post and children of clicked
-			//-----------------------------------------
-			
-			$this->used_post_ids = ',' . implode( ",", $postid_array ) . ',';
-			
-			$postid_array[0] = $this->topics->topic['topic_firstpost'];
-			
-			$this->DB->build( array( 
-									'select'   => 'p.*',
-									'from'     => array( 'posts' => 'p' ),
-									'where'    => "p.pid IN(" . implode( ',', $postid_array ) . ")",
-									'order'    => 'pid asc',
-									'add_join' => $_post_joins
-						)	);
-		}
-		else
-		{
-			//-----------------------------------------
-			// Just get root
-			//-----------------------------------------
-			
-			$this->DB->build( array( 
-									'select'   => 'p.*',
-									'from'     => array( 'posts' => 'p' ),
-									'where'    => "p.pid=" . $this->topics->topic['topic_firstpost'],
-									'order'    => 'pid asc',
-									'add_join' => $_post_joins
-							)	);
-		}
-		
-		//-----------------------------------------
-		// Attachment PIDS
-		//-----------------------------------------
-		
-		$this->topics->attach_pids = $postid_array;
-		
-		//-----------------------------------------
-		// Render the original post
-		//-----------------------------------------
-												 					 
-		$outer = $this->DB->execute();
-		
-		//-----------------------------------------
-		// Format and print out the topic list
-		//-----------------------------------------
-		
-		$post_data = array();
-		$num_rows  = $this->DB->getTotalRows( $outer );
-		
-		while ( $row = $this->DB->fetch( $outer ) )
-		{
-			/* That 1 line fix below took 1 hour, joy :D */
-			$row['member_id']	= $row['mid'];
-			$row['g_access_cp']	= $this->caches['group_cache'][ $row['member_group_id'] ]['g_access_cp'];
-			
-			$return = $this->topics->parsePostRow( $row );
-			
-			$poster = $return['poster'];
-			$row	= $return['row'];
-			
-			/* Reputation */
-			if( $this->settings['reputation_enabled'] )
-			{
-				$row['pp_reputation_points'] = $row['pp_reputation_points'] ? $row['pp_reputation_points'] : 0;
-				$row['has_given_rep']        = $row['has_given_rep'] ? $row['has_given_rep'] : 0;
-				$row['rep_points']           = $row['rep_points'] ? $row['rep_points'] : 0;
-			}			
-			
-			$post_data[ $row['pid'] ] = array( 'post' => $row, 'author' => $poster );
-			
-			//-----------------------------------------
-			// Are we giving this bloke a good ignoring?
-			//-----------------------------------------
-			if( isset( $ignored_users ) && is_array( $ignored_users ) && count( $ignored_users ) )
-			{
-				if( in_array( $poster['member_id'], $ignored_users ) )
-				{
-					if ( ! strstr( $this->settings['cannot_ignore_groups'], ','.$poster['member_group_id'].',' ) )
-					{
-						$post_data[ $row['pid'] ]['post']['_ignored'] = 1;
-						continue;
-					}
-				}
-			}
-		
-			if ( ! $this->printed and $num_rows > 1 )
-			{
-				$post_data[ $row['pid'] ]['post']['_end_first_post'] = 1;
-				$this->printed = 1;
-			}
-		}
-		
-		//-----------------------------------------
-		// Sort out pagination
-		//-----------------------------------------
-		
-		$total_replies = $this->topics->topic['posts'];
-		$show_replies  = count( $this->structured_pids ) - 1;
-		
-		$this->topics->topic['SHOW_PAGES']		= '';
-		$this->topics->topic['threaded_pages']	= $this->registry->output->generatePagination( array( 
-																							'totalItems'		=> $total_replies,
-																	  						'itemsPerPage'		=> $last,
-																							'currentStartValue'	=> $this->request['start'],
-																							'baseUrl'			=> "showtopic=" . $this->topics->topic['tid'],
-																							'startValueKey'		=> 'start',
-																							'seoTemplate'		=> 'showtopic',
-																							'seoTitle'			=> $this->topics->topic['title_seo']
-																					)  	);
-		
-		//-----------------------------------------
-		// START GETTING THE OUTLINE LIST
-		//-----------------------------------------
-				
-		$this->_threaded_posts[ 0 ]['child'] = $this->_threadedLoopGetChildren();
-		$this->topics->topic['_threaded_posts'] = $this->_buildThreadedOutput( $this->_threaded_posts[ 0 ] );
-		
-		return $post_data;
-	}
-	
-	/**
-	 * Actually builds the HTML for threaded view
-	 *
-	 * @param	array 	$root	The root we're iterating
-	 * @param	string	$html	The current HTML in this loop
-	 * @return	string	HTML
-	 */
-	public function _buildThreadedOutput( $root, $html='' )
-	{
-		$child = '';
-		
-		if( is_array( $root['child'] ) )
-		{
-			if( count( $root['child'] ) )
-			{
-				foreach( $root['child'] as $pid => $post )
-				{
-					$child .= $this->_buildThreadedOutput( $post );
-				}
-			}
-		}
-		
-		$html .= $this->registry->output->getTemplate('topic')->build_threaded( $root, $child, $this->topics->topic );
-		
-		return $html;
-	}
-	
-	/**
-	 * Render kiddies
-	 *
-	 * @param	integer  $root_id
-	 * @param	array    $posts
-	 * @param	integer  $dguide
-	 * @return	array
-	 */
-	public function _threadedLoopGetChildren($root_id=0, $posts=array() ,$dguide=-1)
-	{
-		$dguide++;
-		
-		if ( isset( $this->structured_pids[ $root_id ] ) && is_array( $this->structured_pids[ $root_id ] ) )
-		{
-			if ( count( $this->structured_pids[ $root_id ] ) )
-			{
-				foreach( $this->structured_pids[ $root_id ] as $pid )
-				{
-					$posts[ $pid ] = $this->_threadedRenderListRow( $this->post_cache[ $pid ], $dguide );
-					$posts[$pid]['child'] = $this->_threadedLoopGetChildren( $pid, isset( $posts[ $root_id ] ) ? $posts[ $root_id ] : array(), $dguide );
-				}
-			}
-		}
-		
-		return $posts;
-	}
-	
-	/**
-	 * Builds an array of output for used in threaded view
-	 *
-	 * @param	array	$post
-	 * @param	integer	$depth
-	 * @return	array
-	 */
-	public function _threadedRenderListRow( $post, $depth )
-	{
-		$post['depthguide'] = "";
-		
-		$this->settings[ 'post_showtext_notitle'] =  1 ;
-		
-		for( $i = 1 ; $i < $depth; $i++ )
-		{
-			$post['depthguide'] .= $this->depth_guide[ $i ];
-		}
-		
-		// Last child?
-		
-		if ( $depth > 0 )
-		{
-			$last_id = count($this->structured_pids[ $post['post_parent'] ]) - 1;
-			
-			if ( $this->structured_pids[ $post['post_parent'] ][$last_id] == $post['pid'] )
-			{
-				$this->depth_guide[ $depth ] = '<img src="'.$this->settings['img_url'].'/spacer.gif" alt="" width="20" height="16">';
-				$post['depthguide'] .= "<img src='".$this->settings['img_url']."/to_post_no_children.gif' alt='-' />";
-			}
-			else
-			{
-				$this->depth_guide[ $depth ] = '<img src="'.$this->settings['img_url'].'/to_down_pipe.gif" alt="|" />';
-				$post['depthguide'] .= "<img src='".$this->settings['img_url']."/to_post_with_children.gif' alt='-' />";
-			}
-		}
-		
-		if ( ! $post['post_title'] )
-		{
-			if ( $this->settings['post_showtext_notitle'] )
-			{
-				$post_text = IPSText::getTextClass( 'bbcode' )->stripAllTags( strip_tags( IPSText::br2nl( $post['post'] ) ) );
-
-				if ( IPSText::mbstrlen($post_text) > 50 )
-				{
-					$post['post_title'] = IPSText::truncate( $post_text, 50 ).'...';
-				}
-				else
-				{
-					$post['post_title'] = $post_text;
-				}
-				
-				if ( ! trim($post['post_title']) )
-				{
-					$post['post_title'] = $this->lang->words['post_title_re'] . $this->topics->topic['title'];
-				}
-			}
-			else
-			{
-				$post['post_title'] = $this->lang->words['post_title_re'] . $this->topics->topic['title'];
-			}
-		}
-		
-		$post['linked_name'] = IPSLib::makeProfileLink( $post['author_name'], $post['author_id'] );
-		
-		$post['formatted_date'] = $this->registry->class_localization->getDate( $post['post_date'], 'LONG' );
-		
-		$post['new_post'] = 't_threaded_read';
-		
-		if ( $post['post_date'] > $this->topics->last_read_tid )
-		{
-			$post['new_post'] = 't_threaded_read';
-		}
-				
-		if ( strstr( $this->used_post_ids, ','.$post['pid'].',' ) )
-		{
-			$post['_show_highlight'] = 1;
-		}
-		
-		return $post;
-	}
-	
-	/**
-	 * Get parents
-	 *
-	 * @param	integer	$root_id
-	 * @param	array	$ids
-	 * @return	array
-	 */
-	private function _threadedPostGetParents($root_id, $ids=array())
-	{
-		if( in_array( $root_id, $ids ) )  
-		{  
-			 $cnt = 0;  
-			   
-			foreach( $ids as $id )  
-			{  
-				if( $id == $root_id )  
-				{  
-					$cnt++;  
-
-					if( $cnt > 1 )  
-					{  
-						return $ids;  
-					}  
-				}  
-			} 
-		}
-
-		if ( $this->post_cache[ $root_id ]['post_parent'] )
-		{
-			$ids[] = $this->post_cache[ $root_id ]['post_parent'];
-			
-			$ids = $this->_threadedPostGetParents( $this->post_cache[ $root_id ]['post_parent'], $ids );
-		}
-		
-		return $ids;
-	}
-	
-	/**
-	 * Get children
-	 *
-	 * @param	integer	$root_id
-	 * @param	array	$ids
-	 * @return	array
-	 */
-	private function _threadedPostGetChildren($root_id, $ids=array())
-	{
-		if ( is_array($this->structured_pids[ $root_id ]) )
-		{
-			foreach( $this->structured_pids[ $root_id ] as $pid )
-			{
-				$ids[] = $pid;
-				
-				$ids = $this->_threadedPostGetChildren( $pid, $ids );
-			}
-		}
-		
-		return $ids;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/classes/topics.php b/upload/admin/applications/forums/sources/classes/topics.php
new file mode 100644
index 00000000..7d27f500
--- /dev/null
+++ b/upload/admin/applications/forums/sources/classes/topics.php
@@ -0,0 +1,1533 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Moderator actions
+ * Last Updated: $Date: 2011-10-11 11:50:01 -0400 (Tue, 11 Oct 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @version		$Revision: 9597 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly.";
+	exit();
+}
+
+class app_forums_classes_topics
+{
+	/**#@+
+	 * Registry Object Shortcuts
+	 *
+	 * @var		object
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+
+	protected $topicData       = array();
+	protected $_memberData     = array();
+	protected $moderatorData   = null;
+	protected $permissionsData = array();
+	protected $errorMessage	   = array();
+	protected $_parsedMembers  = array();
+	private   $_topicCache     = array();
+	private   $_countPosts	   = 0;
+	private   $_countTopics	   = 0;
+	
+	/**
+	 * Return errors, instead of printing
+	 *
+	 * @var	bool
+	 */
+ 	public $return	= true;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		Registry reference
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make objects */
+		$this->registry = $registry;
+		$this->DB	    = $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->lang	    = $this->registry->getClass('class_localization');
+		$this->member   = $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache	= $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		/* Set default member */
+		$this->setMemberData( $this->memberData );
+		
+		/* Check for class_forums */
+		if ( ! $this->registry->isClassLoaded( 'class_forums' ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
+			$this->registry->setClass( 'class_forums', new $classToLoad( $registry ) );
+			$this->registry->strip_invisible = 0;
+			$this->registry->class_forums->forumsInit();
+		}
+		
+		/* Load tagging stuff */
+		if ( ! $this->registry->isClassLoaded('tags') )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/bootstrap.php' );/*noLibHook*/
+			$this->registry->setClass( 'tags', classes_tags_bootstrap::run( 'forums', 'topics' ) );
+		}
+			
+		/* Unpack reputation @todo this isn't ideal here but it'll do for now */
+		if ( $this->settings['reputation_enabled'] )
+		{
+			/* Load the class */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
+			$this->registry->setClass( 'repCache', new $classToLoad() );
+		
+			/* Update the filter? */
+			if( isset( $this->request['rep_filter'] ) AND $this->request['rep_filter'] == 'update' )
+			{
+				/**
+				 * Check secure key
+				 * @link	http://community.invisionpower.com/tracker/issue-22078-i-can-edit-your-treshold
+				 */
+				if( $this->request['secure_key'] != $this->member->form_hash )
+				{
+					$this->registry->output->showError( 'usercp_forums_bad_key', 1021522 );
+				}
+				
+				$_mem_cache = IPSMember::unpackMemberCache( $this->memberData['members_cache'] );
+				
+				if( $this->request['rep_filter_set'] == '*' )
+				{
+					$_mem_cache['rep_filter'] = '*';
+				}
+				else
+				{
+					$_mem_cache['rep_filter'] = intval( $this->request['rep_filter_set'] );
+				}
+				
+				IPSMember::packMemberCache( $this->memberData['member_id'], $_mem_cache );
+				
+				$this->memberData['_members_cache'] = $_mem_cache;
+			}
+			else
+			{
+				$this->memberData['_members_cache'] = isset($this->memberData['members_cache']) ? IPSMember::unpackMemberCache( $this->memberData['members_cache'] ) : array();
+			}
+		}
+	}
+	
+	/**
+	 * Auto populate the data and that. Populated topicData and forumData. Also does rudimentary access checks
+	 *
+	 * @param	mixed	$topic	Array of topic data, or single topic id
+	 * @param	bool	$return	Return errors instead of printing
+	 * @return	@e void
+	 */
+	public function autoPopulate( $topic="", $return=true )
+	{
+		/* @todo Remove other calls to request['t'] - intvalled here because it's called in a million places */
+		$this->request['t'] = intval( $this->request['t'] );
+		
+		$this->return	= $return;
+		
+		/* Sanitize */
+		$topicId = intval( $this->request['t'] );
+			
+		if ( ! is_array( $topic ) )
+		{
+			if ( ! $topicId )
+			{
+				throw new Exception( 'EX_topics_no_tid' );
+			}
+			
+			/* May have loaded topic data previously */
+			if ( empty( $this->registry->class_forums->topic_cache['tid'] ) )
+			{
+				$this->DB->build( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid=' . $topicId ) );									
+				$this->DB->execute();
+				
+				$this->setTopicData( $this->DB->fetch() );
+			}
+			else
+			{
+				$this->setTopicData( $this->registry->class_forums->topic_cache );
+			}
+		}
+		else
+		{
+			$this->setTopicData( $topic );
+		}
+		
+		$this->topicData['title'] = IPSText::stripAttachTag( $this->topicData['title'] );
+		
+		/* @todo Remove other calls to request['f'] - intvalled here because it's called in a million places */
+		$this->request['f'] = intval( $this->topicData['forum_id'] );
+		
+		/* Check to see if stuff is stuffable */
+		$result = $this->canView();
+
+		if ( $result === false )
+		{
+			throw new Exception( $this->getErrorMessage() );
+		}
+		
+		if ( ! empty( $this->topicData['tag_cache_key'] ) )
+		{
+			$this->topicData['tags'] = $this->registry->tags->formatCacheJoinData( $this->topicData );
+		}
+		
+		/* Set up */
+		$this->topicData = $this->setUpTopic( $this->topicData );	
+	}
+	
+	/**
+	 * Sets up a topic
+	 * @param  array $topic If not passed then $this->topicData is used
+	 * @return array
+	 */
+	public function setUpTopic( $topic=array() )
+	{
+		$topic = ( count( $topic ) ) ? $topic : $this->topicData;
+		
+		/* Error out if the topic is not approved or soft deleted */
+		$approved = $this->registry->class_forums->fetchHiddenTopicType( $topic );
+		
+		/* Deleted topic? */
+		$topic['_isDeleted'] = ( $approved == 'sdelete' || $approved == 'pdelete' ) ? true : false;
+		$topic['_isHidden']  = ( $approved == 'hidden' )  ? true : false;
+		
+		/* Posts per day restrictions? */
+		$topic['_ppd_ok'] = $this->registry->getClass('class_forums')->checkGroupPostPerDay( $this->memberData, TRUE );
+		
+		/* Got any unread posts? */
+		$topic['hasUnreadPosts'] = ( $this->registry->classItemMarking->isRead( array( 'forumID' => $topic['forum_id'], 'itemID' => $topic['tid'], 'itemLastUpdate' => $topic['last_post'] ), 'forums' ) ) ? false : true;
+	
+		return $topic;
+	}
+	
+	/**
+	 * Load and return a topic by ID.
+	 * @param   intval  $tid
+	 * @return	array	Topic Data
+	 */
+	public function getTopicById( $tid )
+	{
+		if ( empty( $this->_topicCache[ $tid ] ) OR ! is_array( $this->_topicCache[ $tid ] ) )
+		{
+			$this->_topicCache[ $tid ] = $this->DB->buildAndFetch( array( 'select'   => 't.*', 
+																		  'from'     => array( 'topics' => 't' ), 
+																		  'where'    => "t.tid=" . intval( $tid ),
+																		  'add_join' => array( array( 'select'  => 'p.pid, p.start_date as poll_start_date, p.choices, p.starter_id as poll_starter_id, p.votes, p.poll_question, p.poll_only, p.poll_view_voters',
+																		  							  'type'	=> 'left',
+																									  'from'	=> array( 'polls' => 'p' ),
+																									  'where'	=> 'p.tid=t.tid' ) ) ) );
+		}
+
+		return $this->_topicCache[ $tid ];
+	}
+	
+	/**
+	 * Load and return a post by ID.
+	 * @param   intval  $pid
+	 * @return	array	Post Data
+	 */
+	public function getPostById( $pid )
+	{
+		$post  = $this->DB->buildAndFetch( array( 'select'   => 'p.*', 
+												  'from'     => array( 'posts' => 'p' ), 
+												  'where'    => "p.pid=" . intval( $pid ),
+												  'add_join' => array( array( 'select'  => 't.*, t.title as topic_title',
+																			  'type'	=> 'left',
+																			  'from'	=> array( 'topics' => 't' ),
+																			  'where'	=> 'p.topic_id=t.tid' ),
+																	   array( 'select'  => 'm.*',
+																			  'type'	=> 'left',
+																			  'from'	=> array( 'members' => 'm' ),
+																			  'where'	=> 'm.member_id=p.author_id' ),
+																	   array( 'select'  => 'pp.*',
+																			  'type'	=> 'left',
+																			  'from'	=> array( 'profile_portal' => 'pp' ),
+																			  'where'	=> 'pp.pp_member_id=p.author_id' ) ) ) );
+
+		if ( $post['author_id'] && $post['member_group_id'] )
+		{
+			$group = $this->caches['group_cache'][ $post['member_group_id'] ];
+			
+			if ( is_array( $group ) && count( $group ) )
+			{
+				$post = array_merge( $group, $post );
+			}
+		}
+		
+		return $post;
+	}
+	
+	/**
+	 * getTopics
+	 * Fetches topics based on different critera
+	 * @param	array	Filters (see below for specifics)
+	 * @return	array 
+	 * 
+	 * FILTERS:
+	 * forumId			Get posts matching the (array) topic ids, (int) forum ID
+	 * memberData		Set memberData (this->memberData is used otherwise)
+	 * onlyViewable		Set whether this member can view them or not. (default is true ) NOTE: Will not check to see if parent topic is viewable!
+	 * onlyVisible 		Set whether to skip unapproved posts where permission allows (default is true)
+	 * topicType		array of 'sdelete', 'visible', 'hidden', 'pdeleted' (if you specify these, permission checks are NOT performed)
+	 * sortOrder		Sort key (date, pid, etc)
+	 * sortDirection	asc/desc
+	 * skipForumCheck	Skips the forum ID IN list check to ensure you have access to view (good for when using perms elsewhere)
+	 * tidIsGreater		Where PID is greater than x
+	 * dateIsGreater	Where DATE is greater than UNIX
+	 * getFirstPost	    Return the first post of the topic
+	 * parse			Parses the first post of the topic
+	 * limit, offset	Limit the amount of results in the returned query
+	 * getCount			fetch count without limit
+	 */
+	public function getTopics( $filters )
+	{
+		/* init */
+		$filters	= $this->_setTopicFilters( $filters );
+		$limit	    = null;
+		$topics	    = array();
+		$where		= array();
+		$memberData	= ( ! empty( $filters['memberData'] ) && is_array( $filters['memberData'] ) ) ? $filters['memberData'] : $this->memberData;
+		
+		/* Forum Ids */
+		if ( ! empty( $filters['forumId'] ) )
+		{
+			$filters['forumId'] = ( ! is_array( $filters['forumId'] ) ) ? array( $filters['forumId'] ) : $filters['forumId'];
+			$where[] = "t.forum_id IN (" . implode( ',', $filters['forumId'] ) . ")";
+		}
+		
+		/* PID is greater */
+		if ( ! empty( $filters['tidIsGreater'] ) )
+		{
+			$where[] = "t.tid > " . intval( $filters['tidIsGreater'] );
+		}
+		
+		/* PID is greater */
+		if ( ! empty( $filters['dateIsGreater'] ) )
+		{
+			$where[] = "t.start_date > " . intval( $filters['dateIsGreater'] );
+		}
+		
+		/* Visible / specific filters */
+		if ( ! empty( $filters['topicType'] ) && is_array( $filters['topicType'] ) )
+		{
+			$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( $filters['topicType'], 't.' );
+		}
+		else
+		{
+			if ( isset( $filters['onlyViewable'] ) && $filters['onlyViewable'] === true && empty( $filters['onlyVisible'] ) )
+			{
+				$_perms = array( 'visible' );
+				
+				if ( $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( false ) )
+				{
+					$_perms[] = 'sdelete';
+				}
+				
+				if ( $this->registry->getClass('class_forums')->canQueuePosts( false ) )
+				{
+					$_perms[] = 'hidden';
+				}
+				
+				$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( $_perms, 't.' );
+			}
+			else
+			{
+				/* Show visible only */
+				$where[] = $this->registry->class_forums->fetchTopicHiddenQuery( array( 'visible' ), 't.' );
+			}
+		}
+		
+		/* Forum ID check? */
+		if ( ( isset( $filters['onlyViewable'] ) && $filters['onlyViewable'] === true ) && ( empty($filters['skipForumCheck']) OR $filters['skipForumCheck'] === false ) )
+		{
+			if ( empty( $filters['forumId'] ) )
+			{
+				$forumIds = $this->registry->class_forums->fetchSearchableForumIds( $memberData['member_id'] );
+				
+				if ( ! count( $forumIds ) )
+				{
+					return $where;
+				}
+				
+				$where[] = "t.forum_id IN (" . implode( ",", $forumIds ) . ")";
+			}
+		}
+		
+		/* Did we want a count also? */
+		if ( ! empty( $filters['getCount'] ) )
+		{
+			$count	= $this->DB->buildAndFetch( array(	'select'	=> 'COUNT(*) as topics', 
+														'from'		=> array( 'topics' => 't' ), 
+														'where'		=> implode( ' AND ', $where ) ) );
+
+			$this->_countTopics = $count['topics'];
+		}
+		
+		/* Offset, limit */
+		if ( isset( $filters['offset'] ) OR isset( $filters['limit'] ) )
+		{
+			if ( $filters['offset'] > 0 || $filters['limit'] > 0 )
+			{
+				$limit = array( intval( $filters['offset'] ), intval( $filters['limit'] ) );
+			}
+		}
+		
+		/* Order */
+		if ( ! empty( $filters['sortField'] ) )
+		{
+			$order = 't.' . $filters['sortField'];
+			
+			if ( isset( $filters['sortOrder'] ) )
+			{
+				$order .= ' ' . $filters['sortOrder'];
+			}
+		}
+		
+		/* Set joins */
+		$joins = array( array( 'select'  	=> 'm.*',
+						       'type'		=> 'left',
+						       'from'		=> array( 'members' => 'm' ),
+						       'where'	=> 'm.member_id=t.starter_id' ),
+				        array( 'select'  	=> 'pp.*',
+						       'type'		=> 'left',
+						       'from'		=> array( 'profile_portal' => 'pp' ),
+						       'where'	=> 'pp.pp_member_id=t.starter_id' ) );
+				        
+		/* Fetching first post ? */
+		if ( ! empty( $filters['getFirstPost'] ) )
+		{
+			$joins[] = array( 'select' => 'p.*',
+							  'from'   => array( 'posts' => 'p' ),
+							  'where'  => 'p.pid=t.topic_firstpost',
+							  'type'  => 'left' );
+		}
+		
+		/* Fetch them */
+		$this->DB->build( array( 'select'   => 't.*, t.title as real_title, t.posts as real_posts', 
+							     'from'     => array( 'topics' => 't' ), 
+							     'where'    => implode( ' AND ', $where ),
+								 'limit'	=> $limit ? $limit : '',
+								 'order'	=> $order ? $order : 't.tid asc',
+							     'add_join' => $joins ) );
+
+		$o = $this->DB->execute();
+		
+		while( $topic = $this->DB->fetch( $o ) )
+		{
+			if ( $topic['starter_id'] && $topic['member_group_id'] )
+			{
+				$group = $this->caches['group_cache'][ $topic['member_group_id'] ];
+				
+				if ( is_array( $group ) && count( $group ) )
+				{
+					$topic = array_merge( $group, $topic );
+				}
+			}
+			
+			/* Get the first post? */
+			if ( ! empty( $filters['getFirstPost'] ) )
+			{
+				if ( ! empty( $filters['parse'] ) )
+				{
+					$this->setTopicData( $topic );
+					$this->setPermissionData();
+					$topic['firstPostParsed'] = $this->parsePost( $topic );	
+				}
+				
+				$topic['_postType']     = $this->registry->class_forums->fetchHiddenType( $topic );
+			}
+			
+			/* Member title overwrites topic */
+			$topic['title']     	= $topic['real_title'];
+			$topic['posts']			= $topic['real_posts'];
+			$topic['_topicType']    = $this->registry->class_forums->fetchHiddenTopicType( $topic );
+			
+			$topics[ $topic['tid'] ] = $topic;
+		}
+		
+		return $topics;
+	}
+	
+	/**
+	 * getTopicsCount
+	 * Fetches number of topics based on different critera (useful for pagination when combined with getPosts())
+	 * @return	int 
+	 */
+	public function getTopicsCount()
+	{
+		return $this->_countTopics;
+	}
+	
+	/**
+	 * getPosts
+	 * Fetches posts based on different critera
+	 * @param	array	Filters (see below for specifics)
+	 * @return	array 
+	 * 
+	 * FILTERS:
+	 * topicId			Get posts matching the (array) topic ids, (int) topic ID
+	 * forumId			Get posts matching the (array) topic ids, (int) forum ID
+	 * postId			Get posts matching the (array) post ids, (int) post id
+	 * memberData		Set memberData (this->memberData is used otherwise)
+	 * onlyViewable		Set whether this member can view them or not. (default is true ) NOTE: Will not check to see if parent topic is viewable!
+	 * onlyVisible 		Set whether to skip unapproved posts where permission allows (default is true)
+	 * postType			array of 'sdelete', 'visible', 'hidden', 'pdeleted' (if you specify these, permission checks are NOT performed)
+	 * sortField		Sort key (date, pid, etc)
+	 * sortOrder		asc/desc
+	 * pidIsGreater		Where PID is greater than x
+	 * dateIsGreater	Where DATE is greater than UNIX
+	 * skipForumCheck	Skips the forum ID IN list check to ensure you have access to view (good for when using perms elsewhere)
+	 * parse			Parses post content
+	 * limit, offset	Limit the amount of results in the returned query
+	 * getCount			fetch count without limit
+	 * 
+	 */
+	public function getPosts( $filters )
+	{
+		/* init */
+		$filters	= $this->_setPostFilters( $filters );
+		$limit	    = null;
+		$posts	    = array();
+		$where		= array();
+		$memberData	= ( ! empty( $filters['memberData'] ) && is_array( $filters['memberData'] ) ) ? $filters['memberData'] : $this->memberData;
+		
+		/* Posts */
+		if ( ! empty( $filters['postId'] ) )
+		{
+			$filters['postId'] = ( ! is_array( $filters['postId'] ) ) ? array( $filters['postId'] ) : $filters['postId'];
+			$where[] = "p.pid IN (" . implode( ',',$filters['postId'] ) . ")";
+		}
+		
+		/* Topics */
+		if ( ! empty( $filters['topicId'] ) )
+		{
+			$filters['topicId'] = ( ! is_array( $filters['topicId'] ) ) ? array( $filters['topicId'] ) : $filters['topicId'];
+			$where[] = "p.topic_id IN (" . implode( ',',$filters['topicId'] ) . ")";
+		}
+		
+		/* Forum Ids */
+		if ( ! empty( $filters['forumId'] ) )
+		{
+			$filters['forumId'] = ( ! is_array( $filters['forumId'] ) ) ? array( $filters['forumId'] ) : $filters['forumId'];
+			$where[] = "t.forum_id IN (" . implode( ',', $filters['forumId'] ) . ")";
+		}
+		
+		/* PID is greater */
+		if ( ! empty( $filters['pidIsGreater'] ) )
+		{
+			$where[] = "p.pid > " . intval( $filters['pidIsGreater'] );
+		}
+		
+		/* PID is less */
+		if ( ! empty( $filters['pidIsLess'] ) )
+		{
+			$where[] = "p.pid < " . intval( $filters['pidIsLess'] );
+		}
+		
+		/* Date is greater */
+		if ( ! empty( $filters['dateIsGreater'] ) )
+		{
+			$where[] = "p.post_date > " . intval( $filters['dateIsGreater'] );
+		}
+		
+		/* Visible / specific filters */
+		if ( ! empty( $filters['postType'] ) && is_array( $filters['postType'] ) )
+		{
+			$where[] = $this->registry->class_forums->fetchPostHiddenQuery( $filters['postType'], 'p.' );
+		}
+		else
+		{
+			if ( isset( $filters['onlyViewable'] ) && $filters['onlyViewable'] === true && empty( $filters['onlyVisible'] ) )
+			{
+				$_perms = array( 'visible' );
+				
+				if ( $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( false ) )
+				{
+					$_perms[] = 'sdelete';
+				}
+				
+				if ( $this->registry->getClass('class_forums')->canQueuePosts( false ) )
+				{
+					$_perms[] = 'hidden';
+				}
+				
+				$where[] = $this->registry->class_forums->fetchPostHiddenQuery( $_perms, 'p.' );
+			}
+			else
+			{
+				/* Show visible only */
+				$where[] = $this->registry->class_forums->fetchPostHiddenQuery( array( 'visible' ), 'p.' );
+			}
+		}
+		
+		/* Forum ID check? */
+		if ( ( isset( $filters['onlyViewable'] ) && $filters['onlyViewable'] === true ) && ( empty($filters['skipForumCheck']) OR $filters['skipForumCheck'] === false ) )
+		{
+			if ( empty( $filters['forumId'] ) )
+			{
+				$forumIds = $this->registry->class_forums->fetchSearchableForumIds( $memberData['member_id'] );
+				
+				if ( ! count( $forumIds ) )
+				{
+					return $where;
+				}
+				
+				$where[] = "t.forum_id IN (" . implode( ",", $forumIds ) . ")";
+			}
+		}
+		
+		/* Did we want a count also? */
+		if ( ! empty( $filters['getCount'] ) )
+		{
+			$count	= $this->DB->buildAndFetch( array(	'select'	=> 'COUNT(*) as posts', 
+														'from'		=> array( 'posts' => 'p' ), 
+														'where'		=> implode( ' AND ', $where ),
+														'add_join'	=> array( array( 'type'		=> 'left',
+																					 'from'		=> array( 'topics' => 't' ),
+																				     'where'	=> 'p.topic_id=t.tid' ) ) ) );
+
+			$this->_countPosts = $count['posts'];
+		}
+		
+		/* Offset, limit */
+		if ( isset( $filters['offset'] ) OR isset( $filters['limit'] ) )
+		{
+			if ( $filters['offset'] > 0 || $filters['limit'] > 0 )
+			{
+				$limit = array( intval( $filters['offset'] ), intval( $filters['limit'] ) );
+			}
+		}
+		
+		/* Order */
+		if ( ! empty( $filters['sortField'] ) )
+		{
+			$order = 'p.' . $filters['sortField'];
+			
+			if ( isset( $filters['sortOrder'] ) )
+			{
+				$order .= ' ' . $filters['sortOrder'];
+			}
+		}
+		
+		$_joins	= array( array( 'select'  	=> 't.*, t.title as real_title',
+								  						     'type'		=> 'left',
+														     'from'		=> array( 'topics' => 't' ),
+														     'where'	=> 'p.topic_id=t.tid' ),
+												      array( 'select'  	=> 'm.*, m.title as member_title',
+														     'type'		=> 'left',
+														     'from'		=> array( 'members' => 'm' ),
+														     'where'	=> 'm.member_id=p.author_id' ),
+												      array( 'select'  	=> 'pp.*',
+														     'type'		=> 'left',
+														     'from'		=> array( 'profile_portal' => 'pp' ),
+														     'where'	=> 'pp.pp_member_id=p.author_id' ) );
+
+		/* Add custom fields join? */
+		if( $this->settings['custom_profile_topic'] == 1 )
+		{
+			$_joins[] = array( 
+									'select' => 'pc.*',
+									'from'   => array( 'pfields_content' => 'pc' ),
+									'where'  => 'pc.member_id=p.author_id',
+									'type'   => 'left'
+								);
+		}
+
+		/* Fetch them */
+		$this->DB->build( array( 'select'   => 'p.*', 
+							     'from'     => array( 'posts' => 'p' ), 
+							     'where'    => implode( ' AND ', $where ),
+								 'limit'	=> $limit ? $limit : '',
+								 'order'	=> $order ? $order : 'p.pid asc',
+							     'add_join' => $_joins ) );
+
+		$o = $this->DB->execute();
+		
+		while( $post = $this->DB->fetch( $o ) )
+		{
+			if ( $post['author_id'] && $post['member_group_id'] )
+			{
+				$group = $this->caches['group_cache'][ $post['member_group_id'] ];
+				
+				if ( is_array( $group ) && count( $group ) )
+				{
+					$post = array_merge( $group, $post );
+				}
+			}
+			
+			/* Member title overwrites topic */
+			$post['title']	= $post['real_title'];
+			$pid			= $post['pid'];
+			
+			if ( ! empty( $filters['parse'] ) )
+			{
+				$this->setTopicData( $post );
+				$this->setPermissionData();
+				$post = $this->parsePost( $post );	
+			}
+			
+			$post['_postType']     = $this->registry->class_forums->fetchHiddenType( $post );
+			$post['_topicType']    = $this->registry->class_forums->fetchHiddenTopicType( $post );
+			
+			$posts[ $pid ] = $post;
+		}
+		
+		return $posts;
+	}
+	
+	/**
+	 * getPostsCount
+	 * Fetches number of posts based on different critera (useful for pagination when combined with getPosts())
+	 * @return	int 
+	 */
+	public function getPostsCount()
+	{
+		return $this->_countPosts;
+	}
+	
+	/**
+	 * @return the $errorMessage
+	 */
+	public function getErrorMessage()
+	{
+		return $this->errorMessage;
+	}
+
+	/**
+	 * @param field_type $errorMessage
+	 */
+	public function setErrorMessage( $errorMessage )
+	{
+		$this->errorMessage = $errorMessage;
+	}
+	
+	/**
+	 * Sets up the permissions for this class
+	 * 
+	 * @param	string	key
+	 * @param	string	value
+	 */
+	public function setPermissionData( $k='', $v='' )
+	{
+		$this->registry->getClass('class_forums')->setMemberData( $this->getMemberData() );
+		
+		if ( empty( $k ) and empty( $v ) )
+		{
+			/* Auto set up */
+			$this->permissionsData['softDelete']             = $this->registry->getClass('class_forums')->canSoftDeletePosts( $this->topicData['forum_id'], array() );
+			$this->permissionsData['softDeleteRestore']      = $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $this->topicData['forum_id'] );
+			$this->permissionsData['softDeleteSee']          = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $this->topicData['forum_id'] );
+			$this->permissionsData['softDeleteReason']       = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $this->topicData['forum_id'] );
+			$this->permissionsData['softDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $this->topicData['forum_id'] );
+			$this->permissionsData['TopicSoftDelete']        = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $this->topicData['forum_id'], $this->topicData );
+			$this->permissionsData['TopicSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $this->topicData['forum_id'] );
+			$this->permissionsData['TopicSoftDeleteSee']     = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $this->topicData['forum_id'] );
+		}
+		else if ( isset( $k['tid'] ) && isset( $k['forum_id'] ) )
+		{
+			/* Auto set up */
+			$this->permissionsData['softDelete']             = $this->registry->getClass('class_forums')->canSoftDeletePosts( $k['forum_id'], array() );
+			$this->permissionsData['softDeleteRestore']      = $this->registry->getClass('class_forums')->can_Un_SoftDeletePosts( $k['forum_id'] );
+			$this->permissionsData['softDeleteSee']          = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $k['forum_id'] );
+			$this->permissionsData['softDeleteReason']       = $this->registry->getClass('class_forums')->canSeeSoftDeleteReason( $k['forum_id'] );
+			$this->permissionsData['softDeleteContent']      = $this->registry->getClass('class_forums')->canSeeSoftDeleteContent( $k['forum_id'] );
+			$this->permissionsData['TopicSoftDelete']        = $this->registry->getClass('class_forums')->canSoftDeleteTopics( $k['forum_id'], $k );
+			$this->permissionsData['TopicSoftDeleteRestore'] = $this->registry->getClass('class_forums')->can_Un_SoftDeleteTopics( $k['forum_id'] );
+			$this->permissionsData['TopicSoftDeleteSee']     = $this->registry->getClass('class_forums')->canSeeSoftDeletedTopics( $k['forum_id'] );
+		}
+		else if ( is_array( $k ) )
+		{
+			$this->permissionsData = $k;
+		}
+		else if ( ! empty( $k )  )
+		{
+			$this->permissionsData[ $k ] = $v;
+		}
+	}
+	
+	/**
+	 * @return the $permissionData
+	 */
+	public function getPermissionData( $k='' )
+	{
+		return ( ! empty( $k ) ) ? $this->permissionsData[ $k ] : $this->permissionsData;
+	}
+	
+	/**
+	 * @return the $topicData
+	 */
+	public function getTopicData( $k='' )
+	{
+		return ( ! empty( $k ) ) ? $this->topicData[ $k ] : $this->topicData;
+	}
+
+	/**
+	 * @param	string	key
+	 * @param	string	value
+	 */
+	public function setTopicData( $k, $v='' )
+	{
+		if ( is_integer( $k ) )
+		{
+			$this->topicData = $this->getTopicById( $k );
+		}
+		else if ( is_array( $k ) )
+		{
+			$this->topicData = $k;
+		}
+		else if ( ! empty( $k ) )
+		{
+			$this->topicData[ $k ] = $v;
+		}
+	}
+	
+	/**
+	 * @return the $_memberData
+	 */
+	public function getMemberData( $k='' )
+	{
+		return ( ! empty( $k ) ) ? $this->_memberData[ $k ] : $this->_memberData;
+	}
+
+	/**
+	 * @param	string	key
+	 * @param	string	value
+	 */
+	public function setMemberData( $k, $v='' )
+	{
+		if ( is_integer( $k ) )
+		{
+			$this->_memberData = IPSMember::load( $k );
+		}
+		else if ( is_array( $k ) )
+		{
+			$this->_memberData = $k;
+		}
+		else if ( ! empty( $k ) )
+		{
+			$this->_memberData[ $k ] = $v;
+		}
+	}
+	
+	/**
+	 * Loads and fetches the moderator data
+	 */
+	public function getModeratorData()
+	{
+		$forumData = $this->registry->getClass('class_forums')->getForumbyId( $this->topicData['forum_id'] );
+		
+		if ( $this->moderatorData === null AND $this->memberData['member_id'] AND ! $this->memberData['g_is_supmod'] )
+		{
+			$other_mgroups	= array();
+			$_mgroup_others	= IPSText::cleanPermString( $this->memberData['mgroup_others'] );
+
+			if( $_mgroup_others )
+			{
+				$other_mgroups = explode( ",", $_mgroup_others );
+			}
+		
+			$other_mgroups[] = $this->memberData['member_group_id'];
+			
+			$member_group_ids = implode( ",", $other_mgroups );
+
+			$this->moderatorData = $this->DB->buildAndFetch( array( 'select' => '*',
+																    'from'	 => 'moderators',
+																    'where'	 => "forum_id LIKE '%,{$forumData['id']},%' AND (member_id={$this->memberData['member_id']} OR (is_group=1 AND group_id IN({$member_group_ids})))" )	);
+		
+			$this->moderatorData = ( is_array( $this->moderatorData ) ) ? $this->moderatorData : array();
+		}
+		
+		return $this->moderatorData;
+	}
+
+	/**
+	 * Fetch the next unread topicID
+	 * @param array or null $topicData
+	 */
+	public function getNextUnreadTopicId( $topicData=false)
+	{
+		$topicData   = ( ! is_array( $topicData ) ) ? $this->getTopicData() : $topicData;
+		$readItems   = $this->registry->classItemMarking->fetchReadIds( array( 'forumID' => $topicData['forum_id'] ) );
+		$lastMarked  = $this->registry->classItemMarking->fetchTimeLastMarked( array( 'forumID' => $topicData['forum_id'] ) );
+		$approved    = $this->memberData['is_mod'] ? ' AND ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible', 'hidden' ), '' ) . ' ' : ' AND ' . $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) . ' ';
+		
+		/* Add in this topic ID to be sure */
+		$readItems[ $topicData['tid'] ] = $topicData['tid'];
+		
+		/* First, attempt to fetch a topic older than this one */
+		$tid = $this->DB->buildAndFetch( array( 'select' => 'tid',
+												'from'   => 'topics',
+												'where'  => "forum_id=" . intval( $topicData['forum_id'] ) . " {$approved} AND tid NOT IN(".implode(",",array_values($readItems)).") AND last_post < " . intval($topicData['last_post']) . " AND last_post > " . $lastMarked . " AND state != 'link'",
+												'order'  => 'last_post DESC',
+												'limit'  => array( 0, 1 ) )	);
+		
+		if ( ! $tid )
+		{
+			$tid = $this->DB->buildAndFetch( array( 'select' => 'tid',
+													'from'   => 'topics',
+													'where'  => "forum_id=" . intval( $topicData['forum_id'] ) . " {$approved} AND tid NOT IN(".implode(",",array_values($readItems)).") AND last_post > " . intval($topicData['last_post']) . " AND state != 'link'",
+													'order'  => 'last_post DESC',
+													'limit'  => array( 0, 1 ) )	);
+		}
+		
+		return intval( $tid['tid'] );
+	}
+	
+	/**
+	 * Determines if we're on the last page or not ...
+	 * @param array or null $topicData
+	 * @return	boolean
+	 */
+	public function isOnLastPage( $topicData=false )
+	{
+		$topicData = ( ! is_array( $topicData ) ) ? $this->getTopicData() : $topicData;
+		$st        = intval( $this->request['st'] );
+		$perPage   = $this->settings['display_max_posts'];
+		$posts     = intval( $topicData['posts'] ) + 1;
+		
+		if ( $posts <= $perPage )
+		{
+			return true;
+		}
+		
+		$maxSt = ( ceil( $posts / $perPage ) - 1 ) * $perPage;
+		
+		if ( $st == $maxSt )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Return whether we can see the IP address or not
+	 *
+	 * @return	bool
+	 */
+	public function canSeeIp()
+	{
+		$moderator = $this->getModeratorData();
+		
+		if ( ! $this->memberData['g_is_supmod'] && empty( $moderator['view_ip'] ) )
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+	
+	/**
+	 * Can view or cannot view
+	 * @param	mixed	Nothing or inline topicData
+	 * @param   mixed	Nothing or inline memberData
+	 */
+	public function canView( $topicData=false, $memberData=false )
+	{
+		if ( is_array( $topicData ) && isset( $topicData['tid'] ) )
+		{
+			$this->setTopicData( $topicData );
+		}
+		
+		if ( is_array( $memberData ) && isset( $memberData['member_id'] ) )
+		{
+			$this->setMemberData( $memberData );
+		}
+		
+		/* get member/topic data */
+		$memberData = $this->getMemberData();
+		$topicData  = $this->getTopicData();
+		
+		/* Basic checks */
+		if ( ! $topicData['tid'] )
+		{
+			$this->setErrorMessage( 'EX_topics_no_tid' );
+			return false;
+		}
+		
+		if ( ! $this->registry->getClass('class_forums')->getForumbyId( $topicData['forum_id'] ) )
+		{
+			$this->setErrorMessage( 'EX_topics_no_fid' );
+			return false;
+		}
+		
+		/* Set up member ID */
+		$this->registry->class_forums->setMemberData( $memberData );
+		
+		/* Test */
+		if ( ! $this->registry->class_forums->forumsCheckAccess( $topicData['forum_id'], 1, 'topic', $topicData, $this->return ) )
+		{
+			$this->setErrorMessage( 'EX_topic_not_approved' );
+			return false;
+		}
+		
+		/* Error out if the topic is not approved or soft deleted */
+		$approved = $this->registry->class_forums->fetchHiddenTopicType( $topicData );
+		
+		if ( ! $this->registry->class_forums->canQueuePosts( $topicData['forum_id'] ) )
+		{
+			if ( $approved == 'hidden' )
+			{
+				$this->setErrorMessage( 'EX_topic_not_approved' );
+				return false;
+			}
+		}
+		
+		/* Set up permissions */
+		if ( ! count( $this->permissionsData ) )
+		{
+			$this->setPermissionData();
+		}
+		
+		/* Soft deleted? */
+		if ( $approved == 'sdelete' AND ! $this->permissionsData['softDeleteContent'] )
+		{
+			$this->setErrorMessage( 'EX_topic_not_approved' );
+			return false;
+		}
+		
+		/* Hard deleted? */
+		if ( $approved == 'pdelete' AND ! $memberData['g_is_supmod'] )
+		{
+			$this->setErrorMessage( 'EX_topic_not_approved' );
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Return whether or not we have permission to delete the post (_getDeleteButtonData)
+	 *
+	 * @return	bool
+	 */
+	public function canDeletePost( $poster )
+	{
+		$moderator = $this->getModeratorData();
+		
+		if ( ! $this->memberData['member_id']  )
+		{
+			return FALSE;
+		}
+		
+		if ( $this->memberData['g_is_supmod'] OR $moderator['delete_post'] )
+		{
+			return TRUE;
+		}
+		
+		if ( $poster['member_id'] == $this->memberData['member_id'] and ( $this->memberData['g_delete_own_posts'] ) )
+		{
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	 * Return whether or not we can edit this post
+	 *
+	 * @param	array 		Array of post data
+	 * @return  bool
+	 */
+	public function canEditPost( $poster=array() )
+	{
+		$moderator	= $this->getModeratorData();
+		$topicData	= $this->getTopicData();
+		
+		if ( $this->memberData['member_id'] == "" or $this->memberData['member_id'] == 0 )
+		{
+			return FALSE;
+		}
+				
+		if ( $this->memberData['g_is_supmod'] )
+		{
+			return TRUE;
+		}
+		
+		if ( $moderator['edit_post'] )
+		{
+			return TRUE;
+		}
+		
+		if ( ( $topicData['state'] != 'open' ) and ( ! $this->memberData['g_is_supmod'] AND ! $moderator['edit_post'] ) )
+		{
+			if ( $this->memberData['g_post_closed'] != 1 )
+			{
+				return FALSE;
+			}
+		}
+		
+		if ( $poster['member_id'] == $this->memberData['member_id'] and ($this->memberData['g_edit_posts']) )
+		{
+			// Have we set a time limit?
+			if ($this->memberData['g_edit_cutoff'] > 0)
+			{
+				if ( $poster['post_date'] > ( time() - ( intval($this->memberData['g_edit_cutoff']) * 60 ) ) )
+				{
+					return TRUE;
+				}
+				else
+				{
+					return FALSE;
+				}
+			}
+			else
+			{
+				return TRUE;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	 * Can make a reply to this topic
+	 * @return string locked / moved / no_reply / reply 
+	 */
+	public function getReplyStatus()
+	{
+		/* Init */
+		$topicData = $this->getTopicData();
+		$forumData = $this->registry->getClass('class_forums')->getForumbyId( $topicData['forum_id'] );
+		
+		$status = '';
+		
+		if ($topicData['state'] == 'closed' OR ( $topicData['poll_state'] AND $topicData['poll_only'] ) )
+		{
+			/* Do we have the ability to post in closed topics or is this a poll only?*/
+			if ( $this->memberData['g_post_closed'] == 1)
+			{
+				$status = 'locked';
+			}
+			else
+			{
+				$status = "locked";
+			}
+		}
+		else
+		{
+			if ( $topicData['state'] == 'moved' )
+			{
+				$status = "moved";
+			}
+			else if ( $topicData['_isDeleted'] )
+			{
+				$status = 'no_reply';
+			}
+			else
+			{
+				if ( $forumData['min_posts_post'] && $forumData['min_posts_post'] > $this->memberData['posts'] && !$this->memberData['g_is_supmod'] )
+				{
+					$status = "locked";
+				}
+				else
+				{
+					if ( $this->memberData['member_id'] AND ( ( ( $this->memberData['member_id'] == $topicData['starter_id'] ) AND ! $this->memberData['g_reply_own_topics'] ) OR ( ( $this->memberData['member_id'] != $topicData['starter_id'] ) AND ! $this->memberData['g_reply_other_topics'] ) ) )
+					{
+						$status = "no_reply";
+					}
+					else if ( $this->registry->permissions->check( 'reply', $forumData ) == TRUE )
+					{
+						$status = "reply";
+					}
+					else
+					{
+						$status = "no_reply";
+					}
+				}
+			}
+		}
+
+		return $status;
+	}
+	
+	/**
+	 * Get multimoderation data
+	 *
+	 * @return	array
+	 */
+	public function getMultiModerationData()
+	{
+		$return_array = array();
+		$mm_array	 = $this->registry->class_forums->getMultimod( $this->topicData['forum_id'] );
+		
+		//-----------------------------------------
+		// Print and show
+		//-----------------------------------------
+		
+		if ( is_array( $mm_array ) and count( $mm_array ) )
+		{
+			foreach( $mm_array as $m )
+			{
+				$return_array[] = $m;
+			}
+		}
+		
+		return $return_array;
+	}
+	
+	/**
+	 * Parses and caches members
+	 * @param array $member
+	 */
+	public function parseMember( array $member )
+	{
+		/* Not cached? */
+		if ( ! isset( $this->_parsedMembers[ $member['author_id'] ] ) )
+		{
+			$member['member_id'] = !empty($member['mid']) ? $member['mid'] : $member['member_id'];
+			
+			/* Unset any post data */
+			unset( $member['pid'], $member['append_edit'], $member['edit_time'], $member['use_sig'], $member['use_emo'], $member['post_edit_reason'],
+					$member['post_date'], $member['icon_id'], $member['post'], $member['queued'], $member['topic_id'], $member['post_htmlstate'],
+					$member['post_title'], $member['new_topic'], $member['edit_name'], $member['post_key'], $member['title'] );
+			
+			/* Do we have a cached signature? */
+			if ( isset( $member['cache_content_sig'] ) )
+			{ 
+				$member['cache_content'] = $member['cache_content_sig'];
+				$member['cache_updated'] = $member['cache_updated_sig'];
+			}
+			else
+			{
+				unset( $member['cache_content'], $member['cache_updated'] );
+			}
+			
+			/**
+			 * Add group data and setup secondary groups as well
+			 * @link	http://community.invisionpower.com/tracker/issue-29142-can-post-html-in-secondary-groups/
+			 */
+			if( !empty($this->caches['group_cache'][ $member['member_group_id'] ]) )
+			{
+				$member = array_merge( $member, $this->caches['group_cache'][ $member['member_group_id'] ] );
+				$member = $this->member->setUpSecondaryGroups( $member );
+			}
+
+			$member = IPSMember::buildDisplayData( $member, array( 'signature' => 1, 'customFields' => 1, 'warn' => 1, 'checkFormat' => 1, 'cfLocation' => 'topic', 'photoTagSize' => array( 'thumb', 'small' ) ) );
+			
+			//-----------------------------------------
+			// Add it to the cached list
+			//-----------------------------------------
+			
+			$this->_parsedMembers[ $member['author_id'] ] = $member;
+		}
+		
+		return $this->_parsedMembers[ $member['author_id'] ];
+	}
+	
+	/**
+	 * Builds an array of post data for output
+	 *
+	 * @param	array	$row	Array of post data
+	 * @return	array
+	 */
+	public function parsePost( array $post )
+	{
+		/* Init */
+		$topicData      = $this->getTopicData();
+		$forumData      = $this->registry->getClass('class_forums')->getForumById( $topicData['forum_id'] );
+		$permissionData = $this->getPermissionData();
+
+		/* Start memory debug */
+		$_NOW   = IPSDebug::getMemoryDebugFlag();
+		$poster = array();
+		
+		/* Bitwise options */
+		$_tmp = IPSBWOptions::thaw( $post['post_bwoptions'], 'post', 'forums' );
+
+		if ( count( $_tmp ) )
+		{
+			foreach( $_tmp as $k => $v )
+			{
+				$post[ $k ] = $v;
+			}
+		}
+
+		/* Is this a member? */
+		if ( $post['author_id'] != 0 )
+		{
+			$poster = $this->parseMember( $post );
+		}
+		else
+		{
+			/* Sort out guest */
+			$post['author_name']				= $this->settings['guest_name_pre'] . $post['author_name'] . $this->settings['guest_name_suf'];
+			
+			$poster								= IPSMember::setUpGuest( $post['author_name'] );
+			$poster['members_display_name']		= $post['author_name'];
+			$poster['_members_display_name']	= $post['author_name'];
+			$poster['custom_fields']			= "";
+			$poster['warn_img']					= "";
+			$poster								= IPSMember::buildProfilePhoto( $poster );
+		}
+		
+		/* Memory debug */
+		IPSDebug::setMemoryDebugFlag( "PID: ".$post['pid'] . " - Member Parsed", $_NOW );
+		
+		/* Update permission */
+		$this->registry->getClass('class_forums')->setMemberData( $this->getMemberData() );
+		$permissionData['softDelete'] = $this->registry->getClass('class_forums')->canSoftDeletePosts( $topicData['forum_id'], $post );
+		
+		/* Soft delete */
+		$post['_softDelete']        = ( $post['pid'] != $topicData['topic_firstpost'] ) ? $permissionData['softDelete'] : FALSE;
+		$post['_softDeleteRestore'] = $permissionData['softDeleteRestore'];
+		$post['_softDeleteSee']     = $permissionData['softDeleteSee'];
+		$post['_softDeleteReason']  = $permissionData['softDeleteReason'];
+		$post['_softDeleteContent'] = $permissionData['softDeleteContent'];
+		
+		$post['_isVisible']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'visible' ) ? true : false;
+		$post['_isHidden']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'hidden' ) ? true : false;
+		$post['_isDeleted']		   = ( $this->registry->getClass('class_forums')->fetchHiddenType( $post ) == 'sdelete' ) ? true : false;
+		
+		/* Queued */
+		if ( $topicData['topic_firstpost'] == $post['pid'] and ( $post['_isHidden'] OR $topicData['_isHidden'] ) )
+		{
+			$post['queued']    = 1;
+			$post['_isHidden'] = true;
+		}
+	
+		/* Edited stuff */
+		$post['edit_by'] = "";
+		
+		if ( ( $post['append_edit'] == 1 ) and ( $post['edit_time'] != "" ) and ( $post['edit_name'] != "" ) )
+		{
+			$e_time = $this->registry->class_localization->getDate( $post['edit_time'] , 'LONG' );
+			
+			$post['edit_by'] = sprintf( $this->lang->words['edited_by'], $post['edit_name'], $e_time );
+		}
+		
+		/* Now parse the post */
+		if ( !isset($post['cache_content']) OR !$post['cache_content'] )
+		{
+			$_NOW2   = IPSDebug::getMemoryDebugFlag();
+			
+			IPSText::getTextClass('bbcode')->parse_smilies			= $post['use_emo'];
+			IPSText::getTextClass('bbcode')->parse_html				= ( $forumData['use_html'] and $poster['g_dohtml'] and $post['post_htmlstate'] ) ? 1 : 0;
+			IPSText::getTextClass('bbcode')->parse_nl2br			= $post['post_htmlstate'] == 2 ? 1 : 0;
+			IPSText::getTextClass('bbcode')->parse_bbcode			= $forumData['use_ibc'];
+			IPSText::getTextClass('bbcode')->parsing_section		= 'topics';
+			IPSText::getTextClass('bbcode')->parsing_mgroup			= $post['member_group_id'];
+			IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $post['mgroup_others'];
+			
+			$post['post']	= IPSText::getTextClass('bbcode')->preDisplayParse( $post['post'] );
+					
+			IPSDebug::setMemoryDebugFlag( "topics::parsePostRow - bbcode parse - Completed", $_NOW2 );
+			
+			IPSContentCache::update( $post['pid'], 'post', $post['post'] );
+		}
+		else
+		{
+			$post['post'] = '<!--cached-' . gmdate( 'r', $post['cache_updated'] ) . '-->' . $post['cache_content'];
+		}
+		
+		/* Buttons */
+		$post['_can_delete'] = $post['pid'] != $topicData['topic_firstpost'] 
+							  ? $this->canDeletePost( $post ) 
+							  : FALSE;		
+		$post['_can_edit']   = $this->canEditPost( $post );
+		$post['_show_ip']	 = $this->canSeeIp();
+		$post['_canReply']   = ( $this->getReplyStatus() == 'reply' ) ? true : false;
+		
+		/* Signatures */
+		$post['signature'] = "";
+		
+		if ( ! empty( $poster['signature'] ) )
+		{
+			if ( $post['use_sig'] == 1 )
+			{
+				if ( ! $this->memberData['view_sigs'] || ( $poster['author_id'] && $this->memberData['member_id'] && ! empty( $this->member->ignored_users[ $poster['author_id'] ]['ignore_signatures'] ) && IPSMember::isIgnorable( $poster['member_group_id'], $poster['mgroup_others'] ) ) )
+				{
+					$post['signature'] = '<!--signature.hidden.' . $post['pid'] . '-->';
+				}
+				else
+				{
+					$post['signature'] = $this->registry->output->getTemplate( 'global' )->signature_separator( $poster['signature'], $poster['author_id'], IPSMember::isIgnorable( $poster['member_group_id'], $poster['mgroup_others'] ) );
+				}
+			}
+		}
+		
+		$post['forum_id'] = $topicData['forum_id'];		
+		
+		/* Reputation */
+		if ( $this->settings['reputation_enabled'] )
+		{ 
+			/* Load the class */
+			if ( ! $this->registry->isClassLoaded( 'repCache' ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
+				$this->registry->setClass( 'repCache', new $classToLoad() );
+			}
+			
+			$this->memberData['_members_cache']['rep_filter'] = isset( $this->memberData['_members_cache']['rep_filter'] ) ? $this->memberData['_members_cache']['rep_filter'] : '*';
+			
+			$post['pp_reputation_points']	= $post['pp_reputation_points'] ? $post['pp_reputation_points'] : 0;
+			$post['has_given_rep']			= $post['has_given_rep'] ? $post['has_given_rep'] : 0;
+			$post['rep_points']				= $post['rep_points'] ? $post['rep_points'] : 0;
+			$post['_repignored']			= 0;
+			
+			if ( ! ( $this->settings['reputation_protected_groups'] && 
+				    in_array( $this->memberData['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) 
+				   ) &&
+			 	$this->memberData['_members_cache']['rep_filter'] !== '*' 
+			)
+			{
+				if ( $this->settings['reputation_show_content'] && $post['rep_points'] < $this->memberData['_members_cache']['rep_filter'] && $this->settings['reputation_point_types'] != 'like' )
+				{
+					$post['_repignored'] = 1;
+				}
+			}
+			
+			$post['like'] = $this->registry->repCache->getLikeFormatted( array( 'app' => 'forums', 'type' => 'pid', 'id' => $post['pid'], 'rep_like_cache' => $post['rep_like_cache'] ) );
+		}
+			
+		/* Memory debug */
+		IPSDebug::setMemoryDebugFlag( "PID: ".$post['pid']. " - Completed", $_NOW );
+		
+		return array( 'post' => $post, 'author' => $poster );
+	}
+	
+	
+	/**
+	 * Set post filters
+	 * Takes user input and cleans it up a bit
+	 *
+	 * @param	array		Incoming filters
+	 * @return	array
+	 */
+	protected function _setPostFilters( $filters )
+	{
+		$filters['sortOrder']		= ( isset( $filters['sortOrder'] ) )	? $filters['sortOrder']	: '';
+		$filters['sortField']		= ( isset( $filters['sortField'] ) )	? $filters['sortField']	: '';
+		$filters['offset']			= ( isset( $filters['offset'] ) )		? $filters['offset']	: '';
+		$filters['limit']			= ( isset( $filters['limit'] ) )		? $filters['limit']		: '';
+		$filters['isVisible']		= ( isset( $filters['isVisible'] ) )	? $filters['isVisible']	: '';
+		
+		switch( $filters['sortOrder'] )
+		{
+			default:
+			case 'desc':
+			case 'descending':
+			case 'z-a':
+				$filters['sortOrder'] = 'desc';
+			break;
+			case 'asc':
+			case 'ascending':
+			case 'a-z':
+				$filters['sortOrder'] = 'asc';
+			break;
+		}
+		
+		/* Do some set up */
+		switch( $filters['sortField'] )
+		{
+			case 'date':
+			case 'time':
+				$filters['sortField']  = 'post_date';
+			break;
+			case 'pid':
+			case 'id':
+				$filters['sortField']  = 'pid';
+			break;
+		}
+	
+		
+		/* Others */
+		$filters['offset']       = intval( $filters['offset'] );
+		$filters['limit']        = intval( $filters['limit'] );
+		$filters['unixCutOff']   = ( ! empty( $filters['unixCutOff'] ) ) ? intval( $filters['unixCutOff'] ) : 0;
+		
+		/* So we don't have to do this twice */
+		$filters['_cleaned']   = true;
+		
+		return $filters;
+	}
+	
+	/**
+	 * Set topic filters
+	 * Takes user input and cleans it up a bit
+	 *
+	 * @param	array		Incoming filters
+	 * @return	array
+	 */
+	protected function _setTopicFilters( $filters )
+	{
+		$filters['sortOrder']		= ( isset( $filters['sortOrder'] ) )		? $filters['sortOrder']	: '';
+		$filters['sortField']		= ( isset( $filters['sortField'] ) )		? $filters['sortField']	: '';
+		$filters['offset']			= ( isset( $filters['offset'] ) )			? $filters['offset']	: '';
+		$filters['limit']			= ( isset( $filters['limit'] ) )			? $filters['limit']		: '';
+		$filters['isVisible']		= ( isset( $filters['isVisible'] ) )		? $filters['isVisible']	: '';
+		
+		switch( $filters['sortOrder'] )
+		{
+			default:
+			case 'desc':
+			case 'descending':
+			case 'z-a':
+				$filters['sortOrder'] = 'desc';
+			break;
+			case 'asc':
+			case 'ascending':
+			case 'a-z':
+				$filters['sortOrder'] = 'asc';
+			break;
+		}
+		
+		/* Do some set up */
+		switch( $filters['sortField'] )
+		{
+			case 'date':
+			case 'time':
+			case 'start_date':
+				$filters['sortField']  = 'start_date';
+			break;
+			case 'lastDate':
+			case 'lastTime':
+			case 'last_post':
+				$filters['sortField']  = 'last_post';
+			break;
+			case 'tid':
+			case 'id':
+				$filters['sortField']  = 'tid';
+			break;
+		}
+	
+		
+		/* Others */
+		$filters['offset']       = intval( $filters['offset'] );
+		$filters['limit']        = intval( $filters['limit'] );
+		$filters['unixCutOff']   = ( ! empty( $filters['unixCutOff'] ) ) ? intval( $filters['unixCutOff'] ) : 0;
+		
+		/* So we don't have to do this twice */
+		$filters['_cleaned']   = true;
+		
+		return $filters;
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/sources/index.html b/upload/admin/applications/forums/sources/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/sources/index.html
+++ b/upload/admin/applications/forums/sources/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/tasks/announcements.php b/upload/admin/applications/forums/tasks/announcements.php
index f58f2010..1e30ad9d 100644
--- a/upload/admin/applications/forums/tasks/announcements.php
+++ b/upload/admin/applications/forums/tasks/announcements.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Deactivate expired announcements
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7003 $
+ * @file		announcements.php 	Task to expire announcements
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,65 +17,51 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to expire announcements
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
+	
 	/**
-	 * This task data
+	 * Array that stores the task data
 	 *
-	 * @var		array
+	 * @var		$task
 	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
+	protected $task = array();
 	
 	/**
 	 * Registry Object Shortcuts
-	 * 
-	 * @var		object
+	 *
+	 * @var		$registry
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
 	
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -89,7 +69,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
diff --git a/upload/admin/applications/forums/tasks/dailycleanout.php b/upload/admin/applications/forums/tasks/dailycleanout.php
index 71bbfff5..ef7eed9a 100644
--- a/upload/admin/applications/forums/tasks/dailycleanout.php
+++ b/upload/admin/applications/forums/tasks/dailycleanout.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Prunes subscribed topics
- * Last Updated: $LastChangedDate: 2010-07-07 08:09:48 -0400 (Wed, 07 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 6609 $
+ * @file		dailycleanout.php 	Task to prune daily old topic subscriptions
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-05-02 18:07:19 -0400 (Mon, 02 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8586 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,75 +17,66 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to prune daily old topic subscriptions
+ *
+ */
 class task_item
 {
 	/**
-	* Parent task manager class
-	*
-	* @access	protected
-	* @var		object
-	*/
+	 * Object that stores the parent task manager class
+	 *
+	 * @var		$class
+	 */
 	protected $class;
-
-	/**
-	* This task data
-	*
-	* @access	protected
-	* @var		array
-	*/
-	protected $task			= array();
-
-	/**
-	* Prevent logging
-	*
-	* @access	protected
-	* @var		boolean
-	*/
-	protected $restrict_log	= false;
 	
 	/**
-	* Registry Object Shortcuts
-	*/
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
 	
 	/**
-	* Constructor
-	*
-	* @access	public
-	* @param 	object		ipsRegistry reference
-	* @param 	object		Parent task class
-	* @param	array 		This task data
-	* @return	void
-	*/
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
+	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
 	
 	/**
-	* Run this task
-	*
-	* @access	public
-	* @return	void
-	*/
+	 * Run this task
+	 *
+	 * @return	@e void
+	 */
 	public function runTask()
 	{
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
@@ -107,30 +91,32 @@ class task_item
 		if ( $this->settings['subs_autoprune'] > 0 )
  		{
 			$time = time() - ($this->settings['subs_autoprune'] * 86400);
-			
-			$this->DB->build( array( 'select'		=> 'tr.trid',
-											'from'		=> array( 'tracker' => 'tr' ),
-											'where'		=> 't.last_post < ' . $time,
-											'add_join'	=> array( 
-																array( 'from'	=> array( 'topics' => 't' ),
-																		'where'	=> 't.tid=tr.topic_id',
-																		'type'	=> 'left'
-																	)
-																)
+
+			$this->DB->build( array(
+									'select'	=> 'l.like_lookup_id',
+									'from'		=> array( 'core_like' => 'l' ),
+									'where'		=> 't.last_post < ' . $time,
+									'add_join'	=> array( 
+														array(	'from'	=> array( 'topics' => 't' ),
+																'where'	=> "t.tid=l.like_rel_id AND l.like_app='forums' AND l.like_area='topics'",
+																'type'	=> 'left'
+															)
+														)
 								)		);
 			$this->DB->execute();
 			
 			while ( $r = $this->DB->fetch() )
 			{
-				$trids[] = $r['trid'];
+				$trids[] = $r['like_lookup_id'];
 			}
 			
 			if (count($trids) > 0)
 			{
-				$this->DB->delete( 'tracker', "trid IN (" . implode( ",", $trids ) . ")" );
+				$this->DB->delete( 'core_like', "like_lookup_id IN ('" . implode( "','", $trids ) . "')" );
+				$this->DB->delete( 'core_like_cache', "like_cache_id IN ('" . implode( "','", $trids ) . "')" );
 			}
 			
-			$deleted = intval( count($trids) );
+			$deleted	= intval( count($trids) );
  		}
  		
 		//-----------------------------------------
@@ -140,7 +126,7 @@ class task_item
 		$time_cutoff	= time() - 7200;
 		$deadid			= array();
 		
-		$this->DB->build( array( "select" => '*', 'from' => 'attachments',  'where' => "attach_rel_id=0 AND attach_date < $time_cutoff") );
+		$this->DB->build( array( "select" => '*', 'from' => 'attachments',  'where' => "attach_rel_id=0 AND attach_date < {$time_cutoff}" ) );
 		$this->DB->execute();
 		
 		while( $killmeh = $this->DB->fetch() )
@@ -157,7 +143,7 @@ class task_item
 			$deadid[] = $killmeh['attach_id'];
 		}
 		
-		$_attach_count = count( $deadid );
+		$_attach_count	= count( $deadid );
 		
 		if ( $_attach_count )
 		{
@@ -177,7 +163,7 @@ class task_item
 			/* Grab topics ensuring we use the index */
 			$this->DB->build( array( 'select' => 'tid, moved_to, forum_id',
 									 'from'   => 'topics',
-									 'where'  => 'forum_id > 0 AND pinned=0 AND last_post < ' . $time . " AND state='link'",
+									 'where'  => 'pinned=0 AND moved_on < ' . $time . " AND state='link'",
 									 'limit'  => array( 0, 150 ) ) );
 									 
 			$this->DB->execute();
@@ -201,7 +187,7 @@ class task_item
 					foreach( $fids as $f => $count )
 					{
 						/* remove the count */
-						$this->DB->force_data_type = array( 'topics' => 'int' );
+						$this->DB->setDataType( 'topics', 'int' );
 						$this->DB->update( 'forums', array( 'topics' => 'minus:' . $count ), 'id=' . intval( $f ) );
 					}
 				}
@@ -235,5 +221,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/tasks/dailydigest.php b/upload/admin/applications/forums/tasks/dailydigest.php
index a3e87b1d..94cd30bb 100644
--- a/upload/admin/applications/forums/tasks/dailydigest.php
+++ b/upload/admin/applications/forums/tasks/dailydigest.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Send the daily digest emails
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7003 $
+ * @file		dailydigest.php 	Task to send out the daily digest emails
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9373 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,65 +17,51 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to send out the daily digest emails
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
+	
 	/**
-	 * This task data
+	 * Array that stores the task data
 	 *
-	 * @var		array
+	 * @var		$task
 	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
+	protected $task = array();
 	
 	/**
 	 * Registry Object Shortcuts
-	 * 
-	 * @var		object
+	 *
+	 * @var		$registry
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
 	
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	=  $registry;
-		$this->DB		=  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		=  $this->registry->getClass('class_localization');
-		$this->member	=  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	=  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		$this->registry	= $registry;
+		$this->lang		= $this->registry->getClass('class_localization');
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -89,7 +69,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -101,13 +81,10 @@ class task_item
 		
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/digest.php', 'digestLibrary', 'forums' );
 		$digest  = new $classToLoad( $this->registry );
-		$digest->digest_time = 'daily';
-		$digest->digest_type = 'topic';
-		$digest->runDigest();
+
+		$digest->runDigest( 'daily', 'topic' );
 		
-		$digest->digest_time = 'daily';
-		$digest->digest_type = 'forum';
-		$digest->runDigest();
+		$digest->runDigest( 'daily', 'forum' );
 		
 		//-----------------------------------------
 		// Log to log table - modify but dont delete
diff --git a/upload/admin/applications/forums/tasks/index.html b/upload/admin/applications/forums/tasks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/tasks/index.html
+++ b/upload/admin/applications/forums/tasks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/tasks/permadelete.php b/upload/admin/applications/forums/tasks/permadelete.php
new file mode 100644
index 00000000..b8002f70
--- /dev/null
+++ b/upload/admin/applications/forums/tasks/permadelete.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @file		permadelete.php 	Deletes posts and topics marked for deletion after specified number of days
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9505 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		task_item
+ * @brief		Task to send out the daily digest emails
+ *
+ */
+class task_item
+{
+	/**
+	 * Object that stores the parent task manager class
+	 *
+	 * @var		$class
+	 */
+	protected $class;
+	
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $lang;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry, $class, $task )
+	{
+		/* Make registry objects */
+		$this->registry	= $registry;
+		$this->DB		= $this->registry->DB();
+		$this->settings	=& $this->registry->fetchSettings();
+		$this->cache	= $this->registry->cache();
+		$this->lang		= $this->registry->getClass('class_localization');
+		
+		$this->class	= $class;
+		$this->task		= $task;
+	}
+	
+	/**
+	 * Run this task
+	 *
+	 * @return	@e void
+	 */
+	public function runTask()
+	{
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_mod' ), 'forums' );
+		
+		//-----------------------------------------
+		// Figure out how long
+		//-----------------------------------------
+		
+		$_days	= $this->settings['days_to_keep_deletions'] > 0 ? intval($this->settings['days_to_keep_deletions']) : 365;
+		$_ts	= time() - ( $_days * 86400 );
+		$posts	= 0;		// Number of removed posts
+		$topics	= 0;		// Number of removed topics
+		$forums	= array();
+		
+		//-----------------------------------------
+		// Moderator library
+		//-----------------------------------------
+		
+		$classToLoad		= IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+		$moderatorLibrary	= new $classToLoad( $this->registry );
+		
+		//-----------------------------------------
+		// Get topics 
+		//-----------------------------------------
+		
+		$this->DB->build( array( 'select' => '*', 'from' => 'topics', 'where' => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'pdelete', 'oktoremove' ) ) . ' AND tdelete_time < ' . $_ts ) );
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$forums[ $r['forum_id'] ]	= $r['forum_id'];
+
+			$moderatorLibrary->init( $this->registry->getClass('class_forums')->allForums[ $r['forum_id'] ], $r );
+			$moderatorLibrary->topicDeleteFromDB( $r['tid'], true );
+			$moderatorLibrary->clearModQueueTable( 'topic', $r['tid'] );
+			$moderatorLibrary->addModerateLog( $r['forum_id'], $r['tid'], '', $r['title'], $this->lang->words['acp_deleted_a_topic'] );
+		}
+		
+		//-----------------------------------------
+		// Get posts
+		//-----------------------------------------
+		
+		$_ids	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'p.*', 
+								'from'		=> array( 'posts' => 'p' ),
+								'where'		=> $this->registry->getClass('class_forums')->fetchPostHiddenQuery( array( 'pdelete', 'oktoremove' ), 'p.' ) . ' AND pdelete_time < ' . $_ts,
+								'add_join'	=> array(
+													array(
+														'select'	=> 't.*',
+														'from'		=> array( 'topics' => 't' ),
+														'where'		=> 't.tid=p.topic_id',
+														'type'		=> 'left',
+														)
+													)
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$forums[ $r['forum_id'] ]	= $r['forum_id'];
+			
+			$moderatorLibrary->init( $this->registry->getClass('class_forums')->allForums[ $r['forum_id'] ], $r );
+			$moderatorLibrary->postDeleteFromDb( $r['pid'], true );
+			$moderatorLibrary->clearModQueueTable( 'post', $r['pid'] );
+			
+			$_ids[]	= $r['pid'];
+		}
+		
+		//-----------------------------------------
+		// Rebuild forums and stats
+		//-----------------------------------------
+		
+		if( count($forums) )
+		{
+			foreach( $forums as $forum )
+			{
+				$moderatorLibrary->forumRecount( $forum );
+			}
+			
+			$this->cache->rebuildCache( 'stats', 'global' );
+		}
+		
+		$moderatorLibrary->addModerateLog( "", "", "", implode( ',', $_ids ), sprintf( $this->lang->words['multi_post_delete'], implode( ', ', $_ids ) ) );
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->appendTaskLog( $this->task, sprintf( $this->lang->words['task_permadelete'], $posts, $topics ) );
+		
+		//-----------------------------------------
+		// Unlock Task: DO NOT MODIFY!
+		//-----------------------------------------
+		
+		$this->class->unlockTask( $this->task );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/forums/tasks/rssimport.php b/upload/admin/applications/forums/tasks/rssimport.php
index 331ee04e..58513ccf 100644
--- a/upload/admin/applications/forums/tasks/rssimport.php
+++ b/upload/admin/applications/forums/tasks/rssimport.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Update the rss import
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7003 $
+ * @file		rssimport.php 	Task to import RSS feeds defined in the ACP
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-05-20 00:17:42 -0400 (Fri, 20 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8847 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,38 +17,48 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to import RSS feeds defined in the ACP
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Integer used to limit the number
+	 * of RSS feeds parsed per cycle
 	 *
-	 * @var		object
+	 * @var		$limit
 	 */
-	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
+	protected $limit = 10;
 	
 	/**
-	 * Limit
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		integer
+	 * @var		$class
 	 */
-	protected $limit		= 10;
+	protected $class;
+	
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
 	
 	/**
 	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
 	 */
 	protected $registry;
 	protected $DB;
@@ -69,24 +73,24 @@ class task_item
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
-		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->lang			= $this->registry->getClass('class_localization');
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,18 +98,14 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 		
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$feeds_to_update	= array();
-		
 		$time				= time();
 		$t_minus_30			= time() - ( 30 * 60 );
 		
@@ -115,17 +115,15 @@ class task_item
 		//-----------------------------------------
 		
 		$this->DB->build( array( 'select'	=> '*', 
-										'from'	=> 'rss_import', 
-										'where'	=> 'rss_import_enabled=1 AND rss_import_last_import <= '.$t_minus_30,
-										'order'	=> 'rss_import_last_import ASC',
-										'limit'	=> array( $this->limit )
-							) 		);
+								 'from'		=> 'rss_import', 
+								 'where'	=> 'rss_import_enabled=1 AND rss_import_last_import <= '.$t_minus_30,
+								 'order'	=> 'rss_import_last_import ASC',
+								 'limit'	=> array( $this->limit )
+						 )		);
 		$rss_main_query = $this->DB->execute();
 		
 		if ( $this->DB->getTotalRows( $rss_main_query ) )
 		{
-			define( 'IN_ACP', 1 );
-			
 			$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums' ) . '/modules_admin/rss/import.php', 'admin_forums_rss_import' );
 			$rss = new $classToLoad();
 			$rss->makeRegistryShortcuts( $this->registry );
@@ -148,7 +146,7 @@ class task_item
 			// Do the update now...
 			//-----------------------------------------
 
-			if ( count( $feeds_to_update ) )
+			if ( count($feeds_to_update) )
 			{
 				$rss->rssImportRebuildCache( implode( ",", $feeds_to_update), 0, 1 );
 			}
diff --git a/upload/admin/applications/forums/tasks/updateviews.php b/upload/admin/applications/forums/tasks/updateviews.php
index 51dea081..cea64cc5 100644
--- a/upload/admin/applications/forums/tasks/updateviews.php
+++ b/upload/admin/applications/forums/tasks/updateviews.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Update topic views
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		updateviews.php 	Task to update the topic views from the temporary table
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-05-12 22:28:10 -0400 (Thu, 12 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8754 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,83 +17,69 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to update the topic views from the temporary table
+ *
+ */
 class task_item
 {
 	/**
-	* Parent task manager class
-	*
-	* @access	protected
-	* @var		object
-	*/
+	 * Object that stores the parent task manager class
+	 *
+	 * @var		$class
+	 */
 	protected $class;
-
-	/**
-	* This task data
-	*
-	* @access	protected
-	* @var		array
-	*/
-	protected $task			= array();
-
-	/**
-	* Prevent logging
-	*
-	* @access	protected
-	* @var		boolean
-	*/
-	protected $restrict_log	= false;
 	
 	/**
-	* Registry Object Shortcuts
-	*/
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
 	
 	/**
-	* Constructor
-	*
-	* @access	public
-	* @param 	object		ipsRegistry reference
-	* @param 	object		Parent task class
-	* @param	array 		This task data
-	* @return	void
-	*/
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
+	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
 	
 	/**
-	* Run this task
-	*
-	* @access	public
-	* @return	void
-	*/
+	 * Run this task
+	 *
+	 * @return	@e void
+	 */
 	public function runTask()
 	{
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
-		
-		//-----------------------------------------
-		// Enabled?
-		//-----------------------------------------
-		
+		/* Update delayed? */
 		if ( ! $this->settings['update_topic_views_immediately'] )
 		{
 			//-----------------------------------------
@@ -129,7 +108,7 @@ class task_item
 				
 				$this->DB->update( 'topics', 'views=views+' . intval( $r['topicviews'] ), "tid=" . intval($r['views_tid']), false, true );
 				
-				$ids[]	= $r['views_tid'];
+				$ids[ $r['views_tid'] ]	= $r['views_tid'];
 				
 				//-----------------------------------------
 				// Running longer than 30 seconds?
@@ -162,6 +141,7 @@ class task_item
 			// Log to log table - modify but dont delete
 			//-----------------------------------------
 			
+			$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 			$this->class->appendTaskLog( $this->task, $this->lang->words['task_updateviews'] );
 		}
 		
@@ -171,5 +151,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/forums/tasks/weeklydigest.php b/upload/admin/applications/forums/tasks/weeklydigest.php
index c7bd4a2c..0c859bbd 100644
--- a/upload/admin/applications/forums/tasks/weeklydigest.php
+++ b/upload/admin/applications/forums/tasks/weeklydigest.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Send the weekly digest emails
- * Last Updated: $LastChangedDate: 2010-10-20 09:03:17 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7003 $
+ * @file		weeklydigest.php 	Task to send out the weekly digest emails
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9373 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,65 +17,51 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to send out the weekly digest emails
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
+	
 	/**
-	 * This task data
+	 * Array that stores the task data
 	 *
-	 * @var		array
+	 * @var		$task
 	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
+	protected $task = array();
 	
 	/**
 	 * Registry Object Shortcuts
-	 * 
-	 * @var		object
+	 *
+	 * @var		$registry
+	 * @var		$lang
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
 	
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -89,7 +69,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -101,13 +81,10 @@ class task_item
 		
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/digest.php', 'digestLibrary', 'forums' );
 		$digest = new $classToLoad( $this->registry );
-		$digest->digest_time = 'weekly';
-		$digest->digest_type = 'topic';
-		$digest->runDigest();
 		
-		$digest->digest_time = 'weekly';
-		$digest->digest_type = 'forum';
-		$digest->runDigest();
+		$digest->runDigest( 'weekly', 'topic' );
+		
+		$digest->runDigest( 'weekly', 'forum' );
 		
 		//-----------------------------------------
 		// Log to log table - modify but dont delete
diff --git a/upload/admin/applications/forums/xml/admin_forums_language_pack.xml b/upload/admin/applications/forums/xml/admin_forums_language_pack.xml
index 907a95dc..63355c18 100644
--- a/upload/admin/applications/forums/xml/admin_forums_language_pack.xml
+++ b/upload/admin/applications/forums/xml/admin_forums_language_pack.xml
@@ -4,792 +4,9 @@
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_attachments</word_pack>
-      <word_key>atc_add</word_key>
-      <word_default>Add New Attachment Type</word_default>
-      <word_custom>Добавить новый тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_delete</word_key>
-      <word_default>Delete Attachment Type...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_avatar</word_key>
-      <word_default>+Avatar</word_default>
-      <word_custom>+�ватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_edit</word_key>
-      <word_default>Edit Attachment Type...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_mime_type</word_key>
-      <word_default>Mime-Type</word_default>
-      <word_custom>Mime-тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_post</word_key>
-      <word_default>+Post</word_default>
-      <word_custom>+Сообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_atttypes</word_key>
-      <word_default>Your Attachment Types</word_default>
-      <word_custom>Ваши типы прикрепл�емых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_extension</word_key>
-      <word_default>Extension</word_default>
-      <word_custom>Ра�ширение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Выбрать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_miniimg</word_key>
-      <word_default><![CDATA[<strong>Attachment Mini-Image</strong>]]></word_default>
-      <word_custom>Иконка �того типа файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_miniimg_info</word_key>
-      <word_default>This is the little icon that represents the attachment type in a post.</word_default>
-      <word_custom>Маленька� иконка, указывающа� тип файла в �ообщении.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_inavatars</word_key>
-      <word_default><![CDATA[<strong>Allow this attachment in avatars / personal photos?</strong>]]></word_default>
-      <word_custom>Разрешить и�пользовать �тот тип файлов, как аватар или фотографию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_inposts</word_key>
-      <word_default><![CDATA[<strong>Allow this attachment in posts?</strong>]]></word_default>
-      <word_custom>Разрешить прикрепл�ть �тот тип файлов к �ообщени�м?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_mimetype</word_key>
-      <word_default><![CDATA[<strong>Attachment Mime-Type</strong>]]></word_default>
-      <word_custom>MIME-тип файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_mimetype_info</word_key>
-      <word_default><![CDATA[Unsure what the correct mime-type is? <a href='http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html' target='_blank'>Try looking here</a>.]]></word_default>
-      <word_custom><![CDATA[�е уверены какой MIME-тип у выбранного файла? <a href='http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html' target='_blank'>Попробуйте найти зде�ь</a>.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_fileext_info</word_key>
-      <word_default><![CDATA[This is the (usually) three character filename suffix.<br />You don't need to add the '.' before the extension]]></word_default>
-      <word_custom><![CDATA[Обычно �о�тоит из трех �имволов, �вл�ет�� �уффик�ом файла.<br />�е требует�� вводить точку («.») до ра�ширени� файла.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_deletebutton</word_key>
-      <word_default>Delete Checked Attachments</word_default>
-      <word_custom>Удалить выбранные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_fileext</word_key>
-      <word_default><![CDATA[<strong>Attachment File Extension</strong>]]></word_default>
-      <word_custom>Ра�ширение прикрепл�емого файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_viewed</word_key>
-      <word_default>Viewed</word_default>
-      <word_custom>Про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_largest5</word_key>
-      <word_default>Attachments: Largest 5 Attachments</word_default>
-      <word_custom>5 �амых больших файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_top5</word_key>
-      <word_default>Attachments: Top 5 Most Viewed</word_default>
-      <word_custom>5 �амых про�матриваемых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_size</word_key>
-      <word_default>Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_author</word_key>
-      <word_default>Author</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_attachment</word_key>
-      <word_default>Attachment</word_default>
-      <word_custom>Файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_last5</word_key>
-      <word_default>Attachments: Last 5 Attached</word_default>
-      <word_custom>5 по�ледних файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_diskusage</word_key>
-      <word_default><![CDATA[<strong>Attachments Disk Usage</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Занимают ме�та на ди�ке</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_number</word_key>
-      <word_default><![CDATA[<strong>Number of Attachments</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво файлов</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>atc_overview</word_key>
-      <word_default>Attachments: Overview</word_default>
-      <word_custom>Обзор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>attach_stats_head</word_key>
-      <word_default>Attachment Statistics</word_default>
-      <word_custom>Стати�тика прикрепленных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>attach_baseon</word_key>
-      <word_default>Use another type as a base?</word_default>
-      <word_custom>И�пользовать какой-нибудь тип как базовый?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>add_attachment_type_head</word_key>
-      <word_default>Add Attachment Type</word_default>
-      <word_custom>Добавление типа прикрепл�емого файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_baseon</word_key>
-      <word_default>Base on: </word_default>
-      <word_custom>О�нован на типе: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_edit</word_key>
-      <word_default>Edit Attachment Type</word_default>
-      <word_custom>Изменить тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_addnew</word_key>
-      <word_default>Add New Attachment Type</word_default>
-      <word_custom>Добавить тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_edited</word_key>
-      <word_default>Attachment type edited.</word_default>
-      <word_custom>Тип изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_addedit</word_key>
-      <word_default>Add/Edit Attachment Type</word_default>
-      <word_custom>Добавление/Изменение типов файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_added</word_key>
-      <word_default>Attachment type added.</word_default>
-      <word_custom>Тип прикрепл�емого файла добавлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_already</word_key>
-      <word_default><![CDATA[The extension '%s' already exists, please choose another extension.]]></word_default>
-      <word_custom><![CDATA[Тип � ра�ширением '%s' уже �уще�твует.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_deleted</word_key>
-      <word_default>Attachment type deleted.</word_default>
-      <word_custom>Тип прикрепл�емого файла удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_enterinfo</word_key>
-      <word_default>You must enter at least an extension and mime-type before continuing.</word_default>
-      <word_custom>�еобходимо вве�ти хот� бы ра�ширение и MIME-тип, прежде чем продолжить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_imported</word_key>
-      <word_default>Attachment Types XML file import completed.</word_default>
-      <word_custom>Импортирование типов прикрепл�емых файлов выполнено у�пешно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_failed</word_key>
-      <word_default>Upload failed, ipb_attachtypes.xml was either missing or empty.</word_default>
-      <word_custom><![CDATA[Загрузка не удала�ь, "ipb_attachtypes.xml" либо от�ут�твует, либо пу�т.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>ty_title</word_key>
-      <word_default>Attachment Types</word_default>
-      <word_custom>Типы прикрепл�емых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>st_removed</word_key>
-      <word_default>Attachment(s) Removed!</word_default>
-      <word_custom>Прикрепленные файлы удалены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>attach_not_topic</word_key>
-      <word_default><![CDATA[<i>Not a topic</i>]]></word_default>
-      <word_custom><![CDATA[<i>�е тема</i>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>st_title</word_key>
-      <word_default>Attachment Statistics</word_default>
-      <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>attachments_removed</word_key>
-      <word_default>Attachments Removed</word_default>
-      <word_custom>Прикрепленные файлы удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>deleted_attachments</word_key>
-      <word_default>Deleted attachment ids: %s</word_default>
-      <word_custom>Удаленные прикрепленные файлы: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_ago</word_key>
-      <word_default> ago</word_default>
-      <word_custom> дней назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_times</word_key>
-      <word_default> times</word_default>
-      <word_custom> раз</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_searchbutton</word_key>
-      <word_default>Search</word_default>
-      <word_custom>И�кать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_oasc</word_key>
-      <word_default><![CDATA[Ascending [0-9]]]></word_default>
-      <word_custom><![CDATA[По возра�танию [0-9] ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_showresults</word_key>
-      <word_default><![CDATA[<b>Show <em>n</em> Results</b><span class='desctext'>Maximum is 100 regardless of your entry</span>]]></word_default>
-      <word_custom><![CDATA[Показать <em>n</em> результатов<span class='desctext'>�о не более 100 за раз</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_odsc</word_key>
-      <word_default><![CDATA[Descending [9-0]]]></word_default>
-      <word_custom><![CDATA[По убыванию [9-0]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_osize</word_key>
-      <word_default>Attach File Size</word_default>
-      <word_custom>Размеру файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_oname</word_key>
-      <word_default>Attach File Name</word_default>
-      <word_custom>Имени файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_oviews</word_key>
-      <word_default>Attach Views</word_default>
-      <word_custom>Количе�тву про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_morder</word_key>
-      <word_default><![CDATA[<b>Order Results By</b>]]></word_default>
-      <word_custom><![CDATA[<b>Сортировать результаты по</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_odate</word_key>
-      <word_default>Attach Date</word_default>
-      <word_custom>Дате прикреплени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mimages</word_key>
-      <word_default><![CDATA[<b>Match Only Images?</b><span class='desctext'>If 'yes', this search will only return image attachments.</span>]]></word_default>
-      <word_custom><![CDATA[И�кать только изображени�?<span class='desctext'>Е�ли выбрано «Да», в результатах пои�ка будут только изображени�.</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mauthor</word_key>
-      <word_default><![CDATA[<b>Match Post Author Name</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[�втор <span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mname</word_key>
-      <word_default><![CDATA[<b>Match File Name</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[Им� файла<span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mviewed</word_key>
-      <word_default><![CDATA[<b>Match Viewed <em>n</em> Times</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[Про�мотрен <span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mposted</word_key>
-      <word_default><![CDATA[<b>Match Posted <em>n</em> Days</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[Добавлен <span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_msize</word_key>
-      <word_default><![CDATA[<b>Match File Size (in kb)</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[Размер файла (в килобайтах)<span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_mext</word_key>
-      <word_default><![CDATA[<b>Match File Extension</b><span class='desctext'>Leave blank to omit</span>]]></word_default>
-      <word_custom><![CDATA[Ра�ширение файла<span class='desctext'>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_lessthan</word_key>
-      <word_default>Less Than</word_default>
-      <word_custom>Меньше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_morethan</word_key>
-      <word_default>More Than</word_default>
-      <word_custom>Больше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_search</word_key>
-      <word_default>Search Attachments</word_default>
-      <word_custom>Пои�к прикрепленных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_delete</word_key>
-      <word_default>Delete Checked Attachments</word_default>
-      <word_custom>Удалить выбранные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_results</word_key>
-      <word_default>Attachments: Search Results</word_default>
-      <word_custom>Результаты пои�ка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_author</word_key>
-      <word_default>Author</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_attachments</word_pack>
-      <word_key>se_size</word_key>
-      <word_default>Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>noattach_to_remove</word_key>
+      <word_default>You did not select any attachments</word_default>
+      <word_custom>Вы не выбрали ни одного файла</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -797,9 +14,13 @@
       <word_key>se_title</word_key>
       <word_default>Attachment Manager</word_default>
       <word_custom>Управление прикрепл�емыми файлами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_size</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -807,19 +28,552 @@
       <word_key>se_attachment</word_key>
       <word_default>Attachment</word_default>
       <word_custom>Файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_attachments</word_pack>
-      <word_key>noattach_to_remove</word_key>
-      <word_default>You did not select any attachments</word_default>
-      <word_custom>Вы не выбрали ни одного файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>se_author</word_key>
+      <word_default>Author</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_results</word_key>
+      <word_default>Attachments: Search Results</word_default>
+      <word_custom>Результаты пои�ка файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mext</word_key>
+      <word_default>Match File Extension</word_default>
+      <word_custom>Ра�ширение файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_delete</word_key>
+      <word_default>Delete Checked Attachments</word_default>
+      <word_custom>Удалить выбранные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_lessthan</word_key>
+      <word_default>Less Than</word_default>
+      <word_custom>Меньше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_search</word_key>
+      <word_default>Search Attachments</word_default>
+      <word_custom>Пои�к прикрепленных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_morethan</word_key>
+      <word_default>More Than</word_default>
+      <word_custom>Больше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_next_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_msize</word_key>
+      <word_default>Match File Size (in kb)</word_default>
+      <word_custom>Размер файла (в килобайтах)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_msize_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mposted_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mposted</word_key>
+      <word_default><![CDATA[Match Posted <em>n</em> Days]]></word_default>
+      <word_custom>Добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mviewed</word_key>
+      <word_default><![CDATA[Match Viewed <em>n</em> Times]]></word_default>
+      <word_custom>Про�мотрен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mname</word_key>
+      <word_default>Match File Name</word_default>
+      <word_custom>Им� файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mviewed_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mname_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_morder</word_key>
+      <word_default>Order Results By</word_default>
+      <word_custom><![CDATA[<b>Сортировать результаты по</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mauthor</word_key>
+      <word_default>Match Post Author Name</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_oviews</word_key>
+      <word_default>Attach Views</word_default>
+      <word_custom>Количе�тву про�мотров</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_osize</word_key>
+      <word_default>Attach File Size</word_default>
+      <word_custom>Размеру файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mauthor_desc</word_key>
+      <word_default>Leave blank to omit</word_default>
+      <word_custom>О�тавьте пу�тым, чтобы пропу�тить при пои�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mimages</word_key>
+      <word_default>Match Only Images?</word_default>
+      <word_custom>И�кать только изображени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_mimages_desc</word_key>
+      <word_default><![CDATA[If 'yes', this search will only return image attachments.]]></word_default>
+      <word_custom><![CDATA[Е�ли "Да", то пои�к вернет только изображени�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_odsc</word_key>
+      <word_default><![CDATA[Descending [9-0]]]></word_default>
+      <word_custom><![CDATA[По убыванию [9-0]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_oname</word_key>
+      <word_default>Attach File Name</word_default>
+      <word_custom>Имени файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_odate</word_key>
+      <word_default>Attach Date</word_default>
+      <word_custom>Дате прикреплени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_showresults</word_key>
+      <word_default><![CDATA[Show <em>n</em> Results]]></word_default>
+      <word_custom><![CDATA[Показать <em>n</em> результатов]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_times</word_key>
+      <word_default> times</word_default>
+      <word_custom> раз</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_ago</word_key>
+      <word_default> ago</word_default>
+      <word_custom> дней назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_oasc</word_key>
+      <word_default><![CDATA[Ascending [0-9]]]></word_default>
+      <word_custom><![CDATA[По возра�танию [0-9] ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_showresults_desc</word_key>
+      <word_default>Maximum is 100 regardless of your entry</word_default>
+      <word_custom>�о не более 100 за раз</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>attachments_removed</word_key>
+      <word_default>Attachments Removed</word_default>
+      <word_custom>Прикрепленные файлы удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>se_searchbutton</word_key>
+      <word_default>Search</word_default>
+      <word_custom>И�кать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>deleted_attachments</word_key>
+      <word_default>Deleted attachment ids: %s</word_default>
+      <word_custom>Удаленные прикрепленные файлы: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>st_removed</word_key>
+      <word_default>Attachment(s) Removed!</word_default>
+      <word_custom>Прикрепленные файлы удалены!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_title</word_key>
+      <word_default>Attachment Types</word_default>
+      <word_custom>Типы прикрепл�емых файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>st_title</word_key>
+      <word_default>Attachment Statistics</word_default>
+      <word_custom>Стати�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>attach_not_topic</word_key>
+      <word_default><![CDATA[<i>Not a topic</i>]]></word_default>
+      <word_custom><![CDATA[<i>�е тема</i>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_failed</word_key>
+      <word_default>Upload failed, ipb_attachtypes.xml was either missing or empty.</word_default>
+      <word_custom><![CDATA[Загрузка не удала�ь, "ipb_attachtypes.xml" либо от�ут�твует, либо пу�т.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_imported</word_key>
+      <word_default>Attachment Types XML file import completed.</word_default>
+      <word_custom>Импортирование типов прикрепл�емых файлов выполнено у�пешно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_already</word_key>
+      <word_default><![CDATA[The extension '%s' already exists, please choose another extension.]]></word_default>
+      <word_custom><![CDATA[Тип � ра�ширением '%s' уже �уще�твует.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_enterinfo</word_key>
+      <word_default>You must enter at least an extension and mime-type before continuing.</word_default>
+      <word_custom>�еобходимо вве�ти хот� бы ра�ширение и MIME-тип, прежде чем продолжить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_deleted</word_key>
+      <word_default>Attachment type deleted.</word_default>
+      <word_custom>Тип прикрепл�емого файла удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_edited</word_key>
+      <word_default>Attachment type edited.</word_default>
+      <word_custom>Тип изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_added</word_key>
+      <word_default>Attachment type added.</word_default>
+      <word_custom>Тип прикрепл�емого файла добавлен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>ID не найден. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_baseon</word_key>
+      <word_default>Base on: </word_default>
+      <word_custom>О�нован на типе: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_addnew</word_key>
+      <word_default>Add New Attachment Type</word_default>
+      <word_custom>Добавить тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_addedit</word_key>
+      <word_default>Add/Edit Attachment Type</word_default>
+      <word_custom>Добавление/Изменение типов файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>attach_baseon</word_key>
+      <word_default>Use another type as a base?</word_default>
+      <word_custom>И�пользовать какой-нибудь тип как базовый?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>ty_edit</word_key>
+      <word_default>Edit Attachment Type</word_default>
+      <word_custom>Изменить тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_overview</word_key>
+      <word_default>Attachments: Overview</word_default>
+      <word_custom>Обзор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_number</word_key>
+      <word_default><![CDATA[<strong>Number of Attachments</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Количе�тво файлов</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>add_attachment_type_head</word_key>
+      <word_default>Add Attachment Type</word_default>
+      <word_custom>Добавление типа прикрепл�емого файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_attachment</word_key>
+      <word_default>Attachment</word_default>
+      <word_custom>Файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_diskusage</word_key>
+      <word_default><![CDATA[<strong>Attachments Disk Usage</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Занимают ме�та на ди�ке</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_last5</word_key>
+      <word_default>Attachments: Last 5 Attached</word_default>
+      <word_custom>5 по�ледних файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>attach_stats_head</word_key>
+      <word_default>Attachment Statistics</word_default>
+      <word_custom>Стати�тика прикрепленных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_author</word_key>
+      <word_default>Author</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_size</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_largest5</word_key>
+      <word_default>Attachments: Largest 5 Attachments</word_default>
+      <word_custom>5 �амых больших файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_top5</word_key>
+      <word_default>Attachments: Top 5 Most Viewed</word_default>
+      <word_custom>5 �амых про�матриваемых файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_fileext</word_key>
+      <word_default><![CDATA[<strong>Attachment File Extension</strong>]]></word_default>
+      <word_custom>Ра�ширение прикрепл�емого файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_fileext_info</word_key>
+      <word_default><![CDATA[This is the (usually) three character filename suffix.<br />You don't need to add the '.' before the extension]]></word_default>
+      <word_custom><![CDATA[Обычно �о�тоит из трех �имволов, �вл�ет�� �уффик�ом файла.<br />�е требует�� вводить точку («.») до ра�ширени� файла.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_mimetype</word_key>
+      <word_default><![CDATA[<strong>Attachment Mime-Type</strong>]]></word_default>
+      <word_custom>MIME-тип файла</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_miniimg</word_key>
+      <word_default><![CDATA[<strong>Attachment Mini-Image</strong>]]></word_default>
+      <word_custom>Иконка �того типа файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_inposts</word_key>
+      <word_default><![CDATA[<strong>Allow this attachment in posts?</strong>]]></word_default>
+      <word_custom>Разрешить прикрепл�ть �тот тип файлов к �ообщени�м?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_mimetype_info</word_key>
+      <word_default><![CDATA[Unsure what the correct mime-type is? <a href='http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html' target='_blank'>Try looking here</a>.]]></word_default>
+      <word_custom><![CDATA[�е уверены какой MIME-тип у выбранного файла? <a href='http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html' target='_blank'>Попробуйте найти зде�ь</a>.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_miniimg_info</word_key>
+      <word_default>This is the little icon that represents the attachment type in a post.</word_default>
+      <word_custom>Маленька� иконка, указывающа� тип файла в �ообщении.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_atttypes</word_key>
+      <word_default>Your Attachment Types</word_default>
+      <word_custom>Ваши типы прикрепл�емых файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_deletebutton</word_key>
+      <word_default>Delete Checked Attachments</word_default>
+      <word_custom>Удалить выбранные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_extension</word_key>
+      <word_default>Extension</word_default>
+      <word_custom>Ра�ширение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Выбрать</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -827,29 +581,48 @@
       <word_key>atc_export</word_key>
       <word_default>Export Attachment Types...</word_default>
       <word_custom>Эк�портировать типы файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_attachments</word_pack>
-      <word_key>atc_import</word_key>
-      <word_default>Import an Attachment Types List</word_default>
-      <word_custom>Импортировать �пи�ок типов прикрепл�емых файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>atc_add</word_key>
+      <word_default>Add New Attachment Type</word_default>
+      <word_custom>Добавить новый тип</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_attachments</word_pack>
-      <word_key>atc_uploadxml</word_key>
-      <word_default><![CDATA[<strong>Upload XML Attachment Types List</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Загрузка XML-архива �о �пи�ком прикрепл�емых файлов</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>atc_delete</word_key>
+      <word_default>Delete Attachment Type...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_mime_type</word_key>
+      <word_default>Mime-Type</word_default>
+      <word_custom>Mime-тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_post</word_key>
+      <word_default>+Post</word_default>
+      <word_custom>+Сообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_edit</word_key>
+      <word_default>Edit Attachment Type...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_viewed</word_key>
+      <word_default>Viewed</word_default>
+      <word_custom>Про�мотров</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -857,9 +630,13 @@
       <word_key>atc_uploadxml_info</word_key>
       <word_default><![CDATA[Browse your computer for 'ipb_attachtypes.xml' or 'ipb_attachtypes.xml.gz'. Duplicate entries will not be imported.]]></word_default>
       <word_custom><![CDATA[Выберите файл дл� загрузки � вашего компьютера 'ipb_attachtypes.xml' или 'ipb_attachtypes.xml.gz'. Суще�твующие запи�и импортированы не будут.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_uploadxml</word_key>
+      <word_default><![CDATA[<strong>Upload XML Attachment Types List</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Загрузка XML-архива �о �пи�ком прикрепл�емых файлов</strong>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -867,4610 +644,209 @@
       <word_key>atc_importbutton</word_key>
       <word_default>Import</word_default>
       <word_custom>Импортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>t_uploadfail2</word_key>
-      <word_default>The upload failed - you may only upload an image file. Please try again.</word_default>
-      <word_custom>Загрузка не удала�ь - вы можете загружать только изображени�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>t_uploadfail1</word_key>
-      <word_default>The upload failed - there was no image to upload. Please try again.</word_default>
-      <word_custom>Загрузка не удала�ь - нет изображени� дл� загрузки. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>t_permav</word_key>
-      <word_default><![CDATA[You do not have permission to edit an administrator's avatar.]]></word_default>
-      <word_custom>У ва� недо�таточно прав дл� изменени� аватара админи�тратора.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>t_noid</word_key>
-      <word_default>The member does not exist. Please try again.</word_default>
-      <word_custom>Пользователь не �уще�твует. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_posts_process_more</word_key>
-      <word_default>%s posts processed (%s posts and %s topics examined)...</word_default>
-      <word_custom>%s �ообщений обработано (проверено �ообщений: %s, тем: %s )... </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_posts_next_step</word_key>
-      <word_default>Topics completed, proceeding to posts...</word_default>
-      <word_custom>Темы завершены, далее �ообщени�...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_title_desc</word_key>
-      <word_default>This section allows you to remove all posts and or topics started by a member</word_default>
-      <word_custom>В �том разделе вы �можете удалить в�е �ообщени� и в�е темы пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_posts_process_done</word_key>
-      <word_default>Complete!</word_default>
-      <word_custom>Завершено!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_process</word_key>
-      <word_default>Process...</word_default>
-      <word_custom>Запу�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_title</word_key>
-      <word_default>Delete Member Posts / Topics</word_default>
-      <word_custom>Удаление �ообщений / Тем пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_pergo</word_key>
-      <word_default><![CDATA[Delete <em>n</em> posts/topics per iteration]]></word_default>
-      <word_custom>Удал�ть по n �ообщений/тем за раз</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_pergo_desc</word_key>
-      <word_default>Deleting posts and topics is fairly intensive.</word_default>
-      <word_custom>Удаление �ообщений и тем ре�ур�оемка� операци�, не рекомендуем указывать большое чи�ло удал�емых объектов за раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_topics_desc</word_key>
-      <word_default><![CDATA[If enabled: all topics started by this member will be deleted, regardless of other member's replies.]]></word_default>
-      <word_custom>Позвол�ет удалить в�е темы, открытые �тим пользователем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_topics</word_key>
-      <word_default><![CDATA[Delete ALL of this member's <span style='color:red'>%s</span>  TOPICS?]]></word_default>
-      <word_custom>Удалить ВСЕ %s ТЕМ �того пользовател�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_posts_desc</word_key>
-      <word_default>If enabled: a topic started by this member that has no replies is deleted otherwise the topic is left.</word_default>
-      <word_custom>Позвол�ет удалить в�е �ообщени� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_delete_posts</word_key>
-      <word_default><![CDATA[Delete ALL of this member's <span style='color:red'>%s</span> POSTS?]]></word_default>
-      <word_custom>Удалить ВСЕ %s СООБЩЕ�ИЙ �того пользовател�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_posts_trash</word_key>
-      <word_default>Use Trash Can?</word_default>
-      <word_custom>И�пользовать корзину?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_posts_trash_desc</word_key>
-      <word_default>Members posts and topics will be placed in the trashcan instead of deleted.</word_default>
-      <word_custom>Сообщени� и темы пользователей будут перемещены в �пециальный форум, откуда при необходимо�ти их можно будет во��тановить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_delete_posts_title</word_key>
-      <word_default>Delete Posts/Topics For:</word_default>
-      <word_custom>Удаление �ообщений/тем пользовател� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_change_button</word_key>
-      <word_default>Change...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mem_remove_avatar</word_key>
-      <word_default>Remove Avatar</word_default>
-      <word_custom>Удалить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_details</word_key>
-      <word_default><![CDATA[Forum Details & Restrictions]]></word_default>
-      <word_custom>�а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_permrestrict</word_key>
-      <word_default><![CDATA[Posting &amp; Access Restrictions]]></word_default>
-      <word_custom>�а�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_restrictindef</word_key>
-      <word_default>Restrict Posting Indefinitely</word_default>
-      <word_custom>нав�егда запретить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_orfor</word_key>
-      <word_default><![CDATA[<strong>Or for</strong>]]></word_default>
-      <word_custom>или на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_restrict</word_key>
-      <word_default>Restrict from Posting</word_default>
-      <word_custom>Запретить пользователю публиковать �ообщени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_modprev</word_key>
-      <word_default>Moderator Preview of Posts</word_default>
-      <word_custom>Требует�� проверка модератором в�ех �ообщений пользовател�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_modindef</word_key>
-      <word_default>Moderator Preview Indefinitely</word_default>
-      <word_custom>в�егда провер�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_viewimgs</word_key>
-      <word_default>View Images</word_default>
-      <word_custom>Может видеть изображени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_override</word_key>
-      <word_default>Override permissions with....</word_default>
-      <word_custom>Переопределить права до�тупа правами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_viewavs</word_key>
-      <word_default>View Avatars</word_default>
-      <word_custom>Может видеть аватары?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_changeav</word_key>
-      <word_default>Change Avatar</word_default>
-      <word_custom>Изменить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_days</word_key>
-      <word_default>Days</word_default>
-      <word_custom>дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_hours</word_key>
-      <word_default>Hours</word_default>
-      <word_custom>ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_updateav</word_key>
-      <word_default>Update Avatar</word_default>
-      <word_custom>Обновить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_localav</word_key>
-      <word_default>OR Select From Avatar Gallery</word_default>
-      <word_custom>ИЛИ выбрать из галереи аватаров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_height</word_key>
-      <word_default>Height</word_default>
-      <word_custom>Вы�ота</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_h</word_key>
-      <word_default>H</word_default>
-      <word_custom>Ð’</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_width</word_key>
-      <word_default>Width</word_default>
-      <word_custom>Ширина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_w</word_key>
-      <word_default>W</word_default>
-      <word_custom>Ш</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_avdimen_label</word_key>
-      <word_default>Dimensions (in pixels)</word_default>
-      <word_custom>Разрешение (в пик�ел�х)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_avdimen</word_key>
-      <word_default>Please enter the width and height for the uploaded or linked avatar</word_default>
-      <word_custom>Введите вы�оту и ширину дл� загруженного изображени� или аватара по ��ылке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_avurl_label</word_key>
-      <word_default>Avatar URL</word_default>
-      <word_custom>URL аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_avurl</word_key>
-      <word_default>OR Change Avatar URL</word_default>
-      <word_custom>ИЛИ изменить URL аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_newav</word_key>
-      <word_default>Upload New Avatar</word_default>
-      <word_custom>Загрузить новый аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_subs_redirect</word_key>
-      <word_default>The member is no longer watching any forums or topics</word_default>
-      <word_custom>Пользователь больше не подпи�ан на форумы и темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_subsf_redirect</word_key>
-      <word_default>All members are no longer watching this forum</word_default>
-      <word_custom>В�е пользователи больше не подпи�аны на �тот форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_selectav</word_key>
-      <word_default>Select Avatar</word_default>
-      <word_custom>Выберите аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_firstfield</word_key>
-      <word_default><![CDATA[If you fill in more than one field, only the FIRST valid field will be saved.  For example, if you enter a URL and choose an image from the avatar gallery, the URL will be used for the user's avatar.  If the user currently has an uploaded avatar, it will be removed upon submission of this form.]]></word_default>
-      <word_custom>Е�ли вы заполнили больше одного пол�, только ПЕРВОЕ корректное значение будет �охранено. �апример, е�ли вы ввели URL и выбрали аватар из галереи - URL буде и�пользован дл� аватара. Е�ли пользователь уже имеет загруженный аватар, он будет удален по�ле отправки �той формы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_delsubs</word_key>
-      <word_default>Clear All Watched Topics and Forums...</word_default>
-      <word_custom>Отпи�ать от в�ех тем и форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_clearsubs</word_key>
-      <word_default>Un-watch all from forum</word_default>
-      <word_custom>Отпи�ать в�ех от форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_selectcat</word_key>
-      <word_default><![CDATA[&lt; Select A Category &gt;]]></word_default>
-      <word_custom><![CDATA[&lt; Выберите категорию &gt;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_nopermban</word_key>
-      <word_default>You do not have permission to ban a member.</word_default>
-      <word_custom>�едо�таточно прав чтобы забанить пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_nodir</word_key>
-      <word_default>Could not locate that directory. Please try again.</word_default>
-      <word_custom>�евозможно найти директорию. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>m_deltitle</word_key>
-      <word_default><![CDATA[Delete All Member's Posts...]]></word_default>
-      <word_custom>Удалить в�е �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_post_closed</word_key>
-      <word_default><![CDATA[Allow user group to post in 'closed' topics?]]></word_default>
-      <word_custom>Могут публиковать ответы в «закрытых» темах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_mod_preview</word_key>
-      <word_default>Moderate posts of everyone in this group?</word_default>
-      <word_custom>Модерировать �ообщени� в�ех пользователей �той группы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_avoid_q</word_key>
-      <word_default>Can avoid moderation queues?</word_default>
-      <word_custom>Может обходить премодерацию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_avoid_flood</word_key>
-      <word_default>Can avoid flood control?</word_default>
-      <word_custom>Может обходить флуд-контроль?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_post_polls</word_key>
-      <word_default>Can start new polls (where allowed)?</word_default>
-      <word_custom>Могут �оздавать новые опро�ы (где разрешено)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_vote_polls</word_key>
-      <word_default>Can vote in polls (where allowed)?</word_default>
-      <word_custom>Могут голо�овать (где разрешено)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_delete_own_topics</word_key>
-      <word_default><![CDATA[Can 'Hard Delete' own topics?]]></word_default>
-      <word_custom>Может удал�ть �вои темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_edit_topic</word_key>
-      <word_default><![CDATA[Can edit own topic title &amp; description?]]></word_default>
-      <word_custom>Может измен�ть название и опи�ание �воих тем?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_append_edit</word_key>
-      <word_default><![CDATA[Allow user to remove 'Edited by' legend?]]></word_default>
-      <word_custom><![CDATA[Разрешить убрать надпи�ь "Отредактировано"?]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_delete_own_posts</word_key>
-      <word_default><![CDATA[Can 'Hard Delete' own posts?]]></word_default>
-      <word_custom>Может удал�ть �вои �ообщени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_open_close_posts</word_key>
-      <word_default>Can open/close own topics?</word_default>
-      <word_custom>Могут открывать/закрывать �вои темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_edit_cutoff</word_key>
-      <word_default>Edit time restriction (in minutes)?</word_default>
-      <word_custom>Могут редактировать �ообщени� в течение Х минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_edit_cuttoff_info</word_key>
-      <word_default>Denies user edit after the time set has passed. Leave blank or enter 0 for no restriction</word_default>
-      <word_custom>Врем�, в течение которого можно редактировать �ообщение �разу по�ле публикации.&#13;
-Введите 0 дл� отключени� ограничени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_edit_posts</word_key>
-      <word_default>Can edit own posts?</word_default>
-      <word_custom>Может редактировать �вои �ообщени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_reply_other_topics</word_key>
-      <word_default>Can reply to OTHER members topics (where allowed)?</word_default>
-      <word_custom>Могут публиковать ответы на ЧУЖИЕ темы (где разрешено)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_reply_own_topics</word_key>
-      <word_default>Can reply to OWN topics?</word_default>
-      <word_custom>Могут публиковать ответы в СВОИХ темах?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_topic_rate_setting</word_key>
-      <word_default>Can rate topics (in forums where allowed)?</word_default>
-      <word_custom>Могут оценивать темы (где �то разрешено)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_post_new_topics</word_key>
-      <word_default>Can post new topics (where allowed)?</word_default>
-      <word_custom>Могут �оздавать новые темы (где разрешено)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_other_topics</word_key>
-      <word_default>Can view other members topics?</word_default>
-      <word_custom>Могут про�матривать темы, �озданные другими пользовател�ми?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_forperm</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>�а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_yes2</word_key>
-      <word_default>Yes (Allowed to change vote)</word_default>
-      <word_custom>Да (� правом изменени� голо�а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_yes1</word_key>
-      <word_default>Yes (Not allowed to change vote)</word_default>
-      <word_custom>Да (без права изменени� голо�а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_applyguest</word_key>
-      <word_default><![CDATA[<i>(Does not apply to guests)</i>]]></word_default>
-      <word_custom><![CDATA[<i>(�е применительно к го�т�м</i>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_baseon</word_key>
-      <word_default><![CDATA[<strong>Base this permission set on which existing set...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�а�ледовать права от:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_attachments</word_pack>
+      <word_key>atc_import</word_key>
+      <word_default>Import an Attachment Types List</word_default>
+      <word_custom>Импортировать �пи�ок типов прикрепл�емых файлов</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_createnew</word_key>
-      <word_default>Create a new permission set</word_default>
-      <word_custom>Создание новой ма�ки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cat_to_forum</word_key>
+      <word_default>Edit as Forum...</word_default>
+      <word_custom>Редактировать как форум</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_createbutton</word_key>
-      <word_default>Create</word_default>
+      <word_key>mm_createnow</word_key>
+      <word_default>Create one now</word_default>
       <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_previewtext</word_key>
-      <word_default>See what this group can see...</word_default>
-      <word_custom>Про�мотр того что может видеть группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_f_tagging_title</word_key>
+      <word_default>Tag Settings</word_default>
+      <word_custom>�а�тройки тегов</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_editset</word_key>
-      <word_default>Edit Permission Set...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bw_disable_tagging</word_key>
+      <word_default>Disable Tagging</word_default>
+      <word_custom>Отключить теги</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_previewset</word_key>
-      <word_default>Preview Permission Set...</word_default>
-      <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bw_disable_prefixes_desc</word_key>
+      <word_default>If set to yes, prefixes will not be allowed in this forum</word_default>
+      <word_custom>Е�ли включено, то префик�ы не будут до�тупны в �том форуме</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_deleteset</word_key>
-      <word_default>Delete Permission Set...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>bw_disable_prefixes</word_key>
+      <word_default>Disable Prefixes</word_default>
+      <word_custom>Отключить префик�ы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_inuse</word_key>
-      <word_default><![CDATA[<em>In Use (Cannot Delete)</em>]]></word_default>
-      <word_custom><![CDATA[<em>И�пользует�� (нельз� удалить)</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tag_predefined</word_key>
+      <word_default>Pre-defined Tags</word_default>
+      <word_custom>Предопределенные теги</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tag_predefined_desc</word_key>
+      <word_default>Separate with a comma. Will over-ride the global pre-defined tags for this forum</word_default>
+      <word_custom>Раздел�йте теги зап�тыми. Значение переопределит глобальную на�тройку тегов дл� �того форума</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_post_topic_sel_del</word_key>
+      <word_default>You did not check any of the boxes on the form.</word_default>
+      <word_custom>Вы не выбрали ни одного флажка</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_user</word_key>
-      <word_default>User</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>emptyforum_sofarcycle</word_key>
+      <word_default>Emptying forum: %s topics deleted so far</word_default>
+      <word_custom>Очи�тка форума: %s тем удалено</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>per_viewnames</word_key>
-      <word_default>View the member names of those using this permission set in a new window</word_default>
-      <word_custom>Отображает пользователей, и�пользующих �ту ма�ку до�тупа (в отдельном окне)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_usedmembers</word_key>
-      <word_default>Used by Member(s)</word_default>
-      <word_custom>И�пользует�� пользовател�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>�азвание ма�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_usedgroups</word_key>
-      <word_default>Used by Group(s)</word_default>
-      <word_custom>И�пользует�� группами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_nomember</word_key>
-      <word_default><![CDATA[<em>Not used as override on any accounts...</em>]]></word_default>
-      <word_custom><![CDATA[<em>Ма�ка не и�пользует��</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_download_c</word_key>
-      <word_default>Download</word_default>
-      <word_custom>Скачивание файлов </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_upload_c</word_key>
-      <word_default>Upload</word_default>
-      <word_custom>Загрузка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_start_c</word_key>
-      <word_default>Start</word_default>
-      <word_custom>Создание тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_reply_c</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответ в темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_show_c</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Про�мотр тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_read_c</word_key>
-      <word_default>Read</word_default>
-      <word_custom>Чтение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_forumname</word_key>
-      <word_default>Forum Name</word_default>
-      <word_custom>�азвание форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_setname</word_key>
-      <word_default><![CDATA[<strong>Permission Set Name</strong>]]></word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_editbutton</word_key>
-      <word_default>Edit Name</word_default>
-      <word_custom>Изменить им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_rename</word_key>
-      <word_default>Rename Permission Set: </word_default>
-      <word_custom>Переименовать ма�ку до�тупа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_testwith</word_key>
-      <word_default>Test with...</word_default>
-      <word_custom>Проверить �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_updatebutton</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_can</word_key>
-      <word_default>Can: </word_default>
-      <word_custom>Может: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_cannot</word_key>
-      <word_default>CANNOT: </word_default>
-      <word_custom>�Е МОЖЕТ: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_category</word_key>
-      <word_default><![CDATA[Category (doesn't use this permission)]]></word_default>
-      <word_custom>Категори� (�та ма�ка не и�пользует��)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_preview</word_key>
-      <word_default>Preview</word_default>
-      <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_legend</word_key>
-      <word_default><![CDATA[Legend & Info]]></word_default>
-      <word_custom>Легенда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_removeall</word_key>
-      <word_default>Remove all custom permission sets</word_default>
-      <word_custom><![CDATA[Удалить в�е пользователь�кие ма�ки до�тупа'>Удалить в�е пользователь�кие ма�ки до�тупа]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_alsousing</word_key>
-      <word_default>Also Using: </word_default>
-      <word_custom>Также и�пользуют��: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_removethis</word_key>
-      <word_default>Remove this permission set from the user (will not remove all if they use more than one)</word_default>
-      <word_custom><![CDATA[Убрать �ту ма�ку до�тупа у пользовател�'>Убрать �ту ма�ку до�тупа]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_email</word_key>
-      <word_default>Email: </word_default>
-      <word_custom>E-mail: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_posts</word_key>
-      <word_default>Posts: </word_default>
-      <word_custom>Сообщений: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_action</word_key>
-      <word_default>Action</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_userdetail</word_key>
-      <word_default>User Details</word_default>
-      <word_custom>Данные пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_membersusing</word_key>
-      <word_default>Members using: </word_default>
-      <word_custom>Пользователи, и�пользующие: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_result</word_key>
-      <word_default>Result</word_default>
-      <word_custom>Результат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_removecustom</word_key>
-      <word_default>Removed the custom set of permissions from: </word_default>
-      <word_custom>Ма�ка до�тупа удалена дл�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_none</word_key>
-      <word_default><![CDATA[<em>Set not assigned to any group...</em>]]></word_default>
-      <word_custom><![CDATA[<em>Ма�ка не и�пользует��</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_notused</word_key>
-      <word_default>Not Used</word_default>
-      <word_custom>�е и�пользует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_title</word_key>
-      <word_default>Forum Permission Set Management</word_default>
-      <word_custom>Управление правами до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_global</word_key>
-      <word_default>Global</word_default>
-      <word_custom>Глобально</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_title_edit_msg</word_key>
-      <word_default>Add/Edit Permissions</word_default>
-      <word_custom>Добавить/Изменить ма�ку до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_addedit</word_key>
-      <word_default>Manage Permissions</word_default>
-      <word_custom>Управление ма�ками до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_added</word_key>
-      <word_default><![CDATA[The permission set '%s' has been added!]]></word_default>
-      <word_custom><![CDATA[Ма�ка до�тупа '%s' добавлена! ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_title_edit</word_key>
-      <word_default>Editing Forum Permission Sets</word_default>
-      <word_custom>Изменение ма�ок до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_removed</word_key>
-      <word_default>Forum Access Permission Set Removed!</word_default>
-      <word_custom>Ма�ка до�тупа удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_entername</word_key>
-      <word_default>You must enter a name. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти название. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_updated</word_key>
-      <word_default>Forum Access Permissions Updated!</word_default>
-      <word_custom>Ма�ки до�тупа форума обновлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_editedlog</word_key>
-      <word_default><![CDATA[Forum Access Permissions Edited For Set: '%s']]></word_default>
-      <word_custom>Права до�тупа на форум отредактированы дл� ма�ки: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_download_m</word_key>
-      <word_default>Download From Forum</word_default>
-      <word_custom>Скачивание файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_groupid</word_key>
-      <word_default>Could not resolve that group ID. Please try again.</word_default>
-      <word_custom>�ельз� изменить ID группы. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_show_m</word_key>
-      <word_default>See Forum</word_default>
-      <word_custom>Про�мотр форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_upload_m</word_key>
-      <word_default>Upload To Forum</word_default>
-      <word_custom>Загрузку файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_start_m</word_key>
-      <word_default>Start Topics</word_default>
-      <word_custom>Создание тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_reply_m</word_key>
-      <word_default>Reply To Topics</word_default>
-      <word_custom>Ответ в темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_read_m</word_key>
-      <word_default>Read Topics</word_default>
-      <word_custom>Чтение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_read</word_key>
-      <word_default><![CDATA[<b>Read Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Чтение тем</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_upload</word_key>
-      <word_default><![CDATA[<b>Upload Attachments</b> to this forum]]></word_default>
-      <word_custom><![CDATA[<b>Загрузка файлов</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_download</word_key>
-      <word_default><![CDATA[<b>Download Attachments</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Скачивание файлов </b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_show</word_key>
-      <word_default><![CDATA[<b>See</b> this forum]]></word_default>
-      <word_custom><![CDATA[<b>Про�мотр</b> �того форума]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_reply</word_key>
-      <word_default><![CDATA[<b>Reply to Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Публикаци� ответов</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_also</word_key>
-      <word_default>Also using: </word_default>
-      <word_custom>Также и�пользуют��: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_start</word_key>
-      <word_default><![CDATA[<b>Start Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Создание тем</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_memid</word_key>
-      <word_default>Could not resolve the member ID. Please try again.</word_default>
-      <word_custom>�ельз� изменить ID пользовател�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>per_setid</word_key>
-      <word_default>Could not resolve the permission set ID. Please try again.</word_default>
-      <word_custom>�ельз� произве�ти изменени� в ма�ках до�тупа �тому ID. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_add_info</word_key>
-      <word_default>Please select the correct member name from the selection below to add a moderator to the previously selected forum(s).</word_default>
-      <word_custom>Пожалуй�та, выберите пользовател� дл� модерировани� выбранных форумов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_noresults</word_key>
-      <word_default>Sorry, we could not find any members that matched the search you entered. Please try again.</word_default>
-      <word_custom>�евозможно найти пользователей по вашему запро�у. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_mid</word_key>
-      <word_default>We could not retrieve that moderator record. Please try again.</word_default>
-      <word_custom>Модератор не �уще�твует в �и�теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_add</word_key>
-      <word_default>Add a Moderator</word_default>
-      <word_custom>Добавление модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_edit</word_key>
-      <word_default>Editing a Moderator</word_default>
-      <word_custom>Редактирование модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_edithis</word_key>
-      <word_default>Edit This Moderator</word_default>
-      <word_custom>Редактировать модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_addthis</word_key>
-      <word_default>Add This Moderator</word_default>
-      <word_custom>Добавить модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_addgroup</word_key>
-      <word_default>Add a Moderator Group</word_default>
-      <word_custom>Добавление группы модераторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_nogroup</word_key>
-      <word_default>We could not find that group to add as a moderator. Please try again.</word_default>
-      <word_custom>�евозможно найти группу, пользователей которой вы хотите �делать модераторами.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_added</word_key>
-      <word_default>Moderator(s) added.</word_default>
-      <word_custom>Модераторы добавлены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_nonewfor</word_key>
-      <word_default>You did not select any forums that do not have this group or member already moderating.</word_default>
-      <word_custom>Вы не выбрали ни одного форума дл� которых хотите добавить модераторов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_addedgroup</word_key>
-      <word_default><![CDATA[Added Group '%s' as a moderator.]]></word_default>
-      <word_custom><![CDATA[Добавлена группа модераторов '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_addedmem</word_key>
-      <word_default><![CDATA[Added Member '%s' as a moderator.]]></word_default>
-      <word_custom><![CDATA[Добавлен модератор '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_memid</word_key>
-      <word_default>We could not match that member name or ID. Please try again.</word_default>
-      <word_custom>�евозможно найти пользовател� � таким ID.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_nomember</word_key>
-      <word_default>You did not choose a member to add as a moderator. Please try again.</word_default>
-      <word_custom>�евозможно найти пользовател�, которого вы хотите �делать модератором.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_gid</word_key>
-      <word_default>We could not match that group ID. Please try again.</word_default>
-      <word_custom>�евозможно найти группу � таким ID.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_group</word_key>
-      <word_default>Group: </word_default>
-      <word_custom>Группа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_noforums</word_key>
-      <word_default>You did not choose any forums to add this moderator to. Please try again.</word_default>
-      <word_custom>Вы не выбрали форум, которому вы хотите добавить модератора.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_edited</word_key>
-      <word_default>Moderator(s) edited.</word_default>
-      <word_custom>Модератор изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_removedlog</word_key>
-      <word_default><![CDATA[Removed Moderator: '%s']]></word_default>
-      <word_custom><![CDATA[Удален модератор: '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_removed</word_key>
-      <word_default>Moderator(s) removed.</word_default>
-      <word_custom>Модератор удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_editedlog</word_key>
-      <word_default><![CDATA[Edited Moderator: '%s']]></word_default>
-      <word_custom>Изменен модератор: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_current</word_key>
-      <word_default>Current Topic Multi-Moderation</word_default>
-      <word_custom>Текущие мульти-модерации тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mod_valid</word_key>
-      <word_default>You did not choose a valid moderator ID. Please try again.</word_default>
-      <word_custom>Вы не выбрали корректный ID модератора.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_wordtitle</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_none</word_key>
-      <word_default>No current Multi-Moderation entries found.</word_default>
-      <word_custom>В на�то�щее врем� нет мульти-модераций</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_wordedit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_addreply_desc</word_key>
-      <word_default>HTML enabled</word_default>
-      <word_custom>Вы можете и�пользовать HTML-коды в �том �ообщении.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_postcount</word_key>
-      <word_default><![CDATA[Increment poster's post count?]]></word_default>
-      <word_custom>Увеличивать �четчик �ообщений по�ле добавлени� �ообщени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_addreply</word_key>
-      <word_default>Add a reply to the topic?</word_default>
-      <word_custom>Добавить �ообщение в �ту тему?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_postoptions</word_key>
-      <word_default>Post Options</word_default>
-      <word_custom>Опции �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_move</word_key>
-      <word_default>Move topic?</word_default>
-      <word_custom>Переме�тить тему?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_link</word_key>
-      <word_default>Leave a link to the source topic?</word_default>
-      <word_custom>О�тавить ��ылку на и�ходную тему?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_approved</word_key>
-      <word_default>Alter approved state?</word_default>
-      <word_custom>Изменить видимо�ть темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_pinned</word_key>
-      <word_default>Alter pinned state?</word_default>
-      <word_custom>Изменить фик�ацию темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_end</word_key>
-      <word_default><![CDATA[Add to <em>END</em> of topic title?]]></word_default>
-      <word_custom><![CDATA[Добавить в <em>КО�ЕЦ</em> названи� темы:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_state</word_key>
-      <word_default>Alter topic state?</word_default>
-      <word_custom>Изменить �о�то�ние темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_modoptions</word_key>
-      <word_default>Moderation Options</word_default>
-      <word_custom>Дей�тви� (модерации)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_start</word_key>
-      <word_default><![CDATA[Add to <em>START</em> of topic title?]]></word_default>
-      <word_custom><![CDATA[Добавить в <em>��Ч�ЛО</em> названи� темы:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_activein_desc</word_key>
-      <word_default>You may choose more than one.</word_default>
-      <word_custom>Можете выбрать не�колько форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_titlefor</word_key>
-      <word_default>Title for this Multi-Moderation Suite?</word_default>
-      <word_custom>�азвание мульти-модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_activein</word_key>
-      <word_default>Active in Forums...</word_default>
-      <word_custom>Дей�твует в форумах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_allforums</word_key>
-      <word_default>-- ALL FORUMS --</word_default>
-      <word_custom>-- ВСЕ ФОРУМЫ --</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_nobodymovenobodygethurt</word_key>
-      <word_default><![CDATA[Don't Move]]></word_default>
-      <word_custom>�е перемещать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_approve</word_key>
-      <word_default>Approve (Set Visible)</word_default>
-      <word_custom>Сделать видимым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_unapprove</word_key>
-      <word_default>Unapprove (Set Invisible)</word_default>
-      <word_custom>Сделать невидимым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_pin</word_key>
-      <word_default>Pin</word_default>
-      <word_custom>Закрепить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_unpin</word_key>
-      <word_default>Unpin</word_default>
-      <word_custom>Открепить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_open</word_key>
-      <word_default>Open</word_default>
-      <word_custom>Открыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_close</word_key>
-      <word_default>Close</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_leave</word_key>
-      <word_default>Leave</word_default>
-      <word_custom>�е трогать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_edit</word_key>
-      <word_default>Edit Multi-Moderation</word_default>
-      <word_custom>Изменить мульти-модерацию тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_noinfo</word_key>
-      <word_default>Could not retrieve the information %s</word_default>
-      <word_custom>�е удало�ь получить информацию %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_title</word_key>
-      <word_default>Topic Multi-Moderation</word_default>
-      <word_custom>Мульти-модераци� тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_addnew</word_key>
-      <word_default>Add New Multi-Moderation</word_default>
-      <word_custom>Добавить мульти-модерацию тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_update</word_key>
-      <word_default>Update topic multi-moderation entires %s</word_default>
-      <word_custom>Добавлена мульти-модераци� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_valid</word_key>
-      <word_default>You must enter a valid ID. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти корректный ID. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_wrong</word_key>
-      <word_default><![CDATA[Incorrect forum chosen in the 'move to' section of the topic multi-moderation. Please note that you cannot choose to move the topic to a category.]]></word_default>
-      <word_custom>Выбран неверный форум дл� перено�а тем. Пожалуй�та, помните, что вы не можете перено�ить темы в категории.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_valtitle</word_key>
-      <word_default>You must enter a valid title. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти корректный заголовок. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_forums</word_key>
-      <word_default>You must select some forums to activate with this multi-moderation entry. Please try again.</word_default>
-      <word_custom>Вы должны выбрать хот� бы один форум, чтобы и�пользовать �ту мульти-модерацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_nav</word_key>
-      <word_default>Topic Multi-Moderation Home</word_default>
-      <word_custom>Мульти-модераци� тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_noid</word_key>
-      <word_default>We could not resolve the Multi-Mod ID. Please try again.</word_default>
-      <word_custom>�ельз� изменить ID мульти-модерации. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>mm_removed</word_key>
-      <word_default>Topic Multi-Mod removed.</word_default>
-      <word_custom>Мульти-модераци� тем удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_mod_forums</word_key>
-      <word_default><![CDATA[<b>Select Forums</b>]]></word_default>
-      <word_custom>Выберите форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_canviewothers</word_key>
-      <word_default><![CDATA[Allow posters to view other member's topics]]></word_default>
-      <word_custom>Разрешить авторам про�матривать темы других пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_mm</word_key>
-      <word_default><![CDATA[<b>Can use topic multi-moderation?</b>]]></word_default>
-      <word_custom>Может и�пользовать мультимодерацию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_mm_info</word_key>
-      <word_default>Important Information</word_default>
-      <word_custom>Важна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_warn_info</word_key>
-      <word_default>Note, if you enable this moderators will have warn permissions on any users, regardless of forum.</word_default>
-      <word_custom>При включении �той опции модератор �может предупреждать любого пользовател� на в�ех форумах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_spam</word_key>
-      <word_default>Can flag a member as a spammer?</word_default>
-      <word_custom>Может помечать пользовател� как �памера?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_asettings</word_key>
-      <word_default>Advanced Settings</word_default>
-      <word_custom>Дополнительные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_warn</word_key>
-      <word_default><![CDATA[<b>Can warn other users?</b>]]></word_default>
-      <word_custom>Может предупреждать других пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_visiblepost</word_key>
-      <word_default><![CDATA[<b>Can set posts as visible and invisible?</b>]]></word_default>
-      <word_custom>Может переключать «видимо�ть» �ообщений?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_massprune</word_key>
-      <word_default><![CDATA[<b>Can mass prune topics?</b>]]></word_default>
-      <word_custom>Может удал�ть �разу не�колько тем?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_visible</word_key>
-      <word_default><![CDATA[<b>Can set topics as visible and invisible?</b>]]></word_default>
-      <word_custom>Может переключать «видимо�ть» тем?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_massmove</word_key>
-      <word_default><![CDATA[<b>Can mass move topics?</b>]]></word_default>
-      <word_custom>Может перемещать �разу не�колько тем?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_msettings</word_key>
-      <word_default>Moderator Control Panel Settings</word_default>
-      <word_custom>�а�тройки модератор�кой панели управлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_closetime</word_key>
-      <word_default><![CDATA[<b>Can set topic close time?</b>]]></word_default>
-      <word_custom>Может у�танавливать врем� закрыти� темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_opentime</word_key>
-      <word_default><![CDATA[<b>Can set topic open time?</b>]]></word_default>
-      <word_custom>Может у�танавливать врем� открыти� темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_move</word_key>
-      <word_default><![CDATA[<b>Can move topics?</b>]]></word_default>
-      <word_custom>Может перемещать темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_pin</word_key>
-      <word_default><![CDATA[<b>Can pin topics?</b>]]></word_default>
-      <word_custom>Может закрепл�ть темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_unpin</word_key>
-      <word_default><![CDATA[<b>Can unpin topics?</b>]]></word_default>
-      <word_custom>Может опу�кать темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_split</word_key>
-      <word_default><![CDATA[<b>Can split / merge topics?</b>]]></word_default>
-      <word_custom>Может �оедин�ть/разъедин�ть темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_close</word_key>
-      <word_default><![CDATA[<b>Can close open topics?</b>]]></word_default>
-      <word_custom>Может закрывать темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_open</word_key>
-      <word_default><![CDATA[<b>Can open locked topics?</b>]]></word_default>
-      <word_custom>Может открывать закрытые темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_ip</word_key>
-      <word_default><![CDATA[<b>Can view posters IP addresses?</b>]]></word_default>
-      <word_custom>Может видеть IP-адре�а пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_deletetop</word_key>
-      <word_default><![CDATA[<b>Can delete others topics/polls?</b>]]></word_default>
-      <word_custom>Может удал�ть темы/опро�ы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_delete</word_key>
-      <word_default><![CDATA[<b>Can delete others posts?</b>]]></word_default>
-      <word_custom>Может удал�ть �ообщени�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_topic</word_key>
-      <word_default><![CDATA[<b>Can edit others topic titles?</b>]]></word_default>
-      <word_custom>Может измен�ть название тем?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_choosebutton</word_key>
-      <word_default>Choose Member</word_default>
-      <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_genset</word_key>
-      <word_default>General Settings</word_default>
-      <word_custom>О�новные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_edit</word_key>
-      <word_default><![CDATA[<b>Can edit others posts/polls?</b>]]></word_default>
-      <word_custom>Может редактировать �ообщени�/опро�ы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_choose</word_key>
-      <word_default><![CDATA[<strong>Choose from the matches...</strong>]]></word_default>
-      <word_custom>Выберите пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_m_search</word_key>
-      <word_default>Search for a member</word_default>
-      <word_custom>Пои�к пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_sort_order</word_key>
-      <word_default><![CDATA[<strong>Default sort order</strong>]]></word_default>
-      <word_custom>Пор�док �ортировки по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_sort_filter</word_key>
-      <word_default><![CDATA[<strong>Default sort filter</strong>]]></word_default>
-      <word_custom>Фильтр �ортировки по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_sort_title</word_key>
-      <word_default><![CDATA[<strong>Postable Forum Settings: Sorting and Ordering</strong>]]></word_default>
-      <word_custom>�а�тройки �ортировки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_sort_cutoff</word_key>
-      <word_default><![CDATA[<strong>Default date cut off for topic display</strong>]]></word_default>
-      <word_custom>По умолчанию выводить темы за</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_sort_key</word_key>
-      <word_default><![CDATA[<strong>Default sort key</strong>]]></word_default>
-      <word_custom>По умолчанию �ортировать по</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_exempt</word_key>
-      <word_default><![CDATA[<strong>Exempt Groups</strong>]]></word_default>
-      <word_custom>О�вобожденные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_exempt_info</word_key>
-      <word_default>If you require a password to access this forum, you can select groups who will not need to enter the password in.</word_default>
-      <word_custom>Е�ли у ва� включен ввод парол�, то вы можете выбрать группы, которые �могут про�матривать �тот форум без ввода парол�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_pass_info</word_key>
-      <word_default>Leave this box empty if you do not wish to require this.</word_default>
-      <word_custom><![CDATA[Вы можете заблокировать форум и пу�кать на него только по паролю.<br />Вы можете о�тавить поле пу�тым, чтобы не и�пользовать пароль вообще.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_pass</word_key>
-      <word_default><![CDATA[<strong>Forum Password</strong>]]></word_default>
-      <word_custom>Пароль форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_email</word_key>
-      <word_default><![CDATA[<strong>Email addresses to send new topic and new reply awaiting approval notification</strong>]]></word_default>
-      <word_custom>Укажите e-mail адре�а, куда будут отправл�ть�� уведомлени� при по�влении новых тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_email_info</word_key>
-      <word_default>This can be left blank. You can enter multiple ones by seperating them with a comma.</word_default>
-      <word_custom><![CDATA[(О�тавьте поле пу�тым, е�ли вам не требуют�� уведомлени�).<br />�дре�а раздел�йте зап�той.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_en_info</word_key>
-      <word_default>Requires a moderator to manually add posts/topics to the forum.</word_default>
-      <word_custom>При включении опции каждое публикуемое �ообщение должно будет пройти проверку модератором перед непо�ред�твенной публикацией на форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_en</word_key>
-      <word_default><![CDATA[<strong>Enable Posting Moderation</strong>]]></word_default>
-      <word_custom>Премодераци� �ообщений форума перед публикацией?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_mod_title</word_key>
-      <word_default><![CDATA[<strong>Postable Forum Settings: Moderation</strong>]]></word_default>
-      <word_custom>�а�тройки модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_min_posts_view_info</word_key>
-      <word_default>This is the minium number of posts a user must have before they can view the forum and any posts in it.</word_default>
-      <word_custom>Минимальное количе�тво �ообщений необходимое пользователю дл� возможно�ти про�матривать и пи�ать в �том форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_min_posts_view</word_key>
-      <word_default>Minimum posts to view</word_default>
-      <word_custom>Минимальное количе�тво �ообщений дл� про�мотра �того форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_min_posts_post</word_key>
-      <word_default>Minimum posts to post</word_default>
-      <word_custom>Минимальное количе�тво �ообщений дл� публикации в �том форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_min_posts_post_info</word_key>
-      <word_default>This is the minium number of posts a user must have before they can post in this forum.</word_default>
-      <word_custom>Минимальное количе�тво �ообщений необходимое пользователю дл� возможно�ти пи�ать в �том форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_inc_info</word_key>
-      <word_default><![CDATA[If enabled, posts in this forum increase member's cumulative post count.]]></word_default>
-      <word_custom>Отключение данной опции, позволит не учитывать о�тавленные в данном разделе �ообщени� в общем �четчике �ообщений пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_inc</word_key>
-      <word_default><![CDATA[<strong>Enable Post Count Incrementation</strong>]]></word_default>
-      <word_custom>Включить �четчик �ообщений пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_rate</word_key>
-      <word_default><![CDATA[<strong>Enable Topic Rating (per user group option)</strong>]]></word_default>
-      <word_custom>Включить рейтинг тем (е�ли �то разрешено группе)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_bump_info</word_key>
-      <word_default>If enabled, a poll vote will move the topic to the top of the list when sorted by date.</word_default>
-      <word_custom>Е�ли включено, то новый голо� в опро�е поднимет �оответ�твующую тему наверх �пи�ка тем (когда �ортировка идет по дате).</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_bump</word_key>
-      <word_default><![CDATA[<strong>Enable Poll Bump</strong>]]></word_default>
-      <word_custom>Разрешить подн�тие тем в �пи�ке при новых голо�ах?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_poll</word_key>
-      <word_default><![CDATA[<strong>Enable Polls (per user group option)</strong>]]></word_default>
-      <word_custom>Разрешить �оздание опро�ов (е�ли �то разрешено группе)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_bb</word_key>
-      <word_default><![CDATA[<strong>Enable BBCode Posting</strong>]]></word_default>
-      <word_custom>Разрешить и�пользование BB-кодов?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_qreply</word_key>
-      <word_default><![CDATA[<strong>Enable Quick Reply</strong>]]></word_default>
-      <word_custom>Включить форму бы�трого ответа дл� �того форума?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_html</word_key>
-      <word_default><![CDATA[<strong>Enable HTML Posting (where allowed)</strong>]]></word_default>
-      <word_custom>Разрешить и�пользование HTML (е�ли разрешает ма�ка до�тупа группы)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_html_info</word_key>
-      <word_default>This will allow HTML to be posted and executed for allowed groups.</word_default>
-      <word_custom>Данна� опци� включит выполнение HTML тегов в публикуемых �ообщени�х.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_hide_info</word_key>
-      <word_default>Useful if you have settings that prohibit some members from seeing posts in this forum while allowing them to see the forum itself</word_default>
-      <word_custom>Полезно, е�ли некоторым пользовател�м запрещено про�матривать �ообщени� в данном форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_post_title</word_key>
-      <word_default><![CDATA[<strong>Postable Forum Settings: Options</strong>]]></word_default>
-      <word_custom>�а�тройки �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_cust</word_key>
-      <word_default><![CDATA[<strong>Custom 'Permission Denied' Message</strong>]]></word_default>
-      <word_custom>Специальное �ообщение, выводимое пользовател�м при попытке зайти в тему (е�ли включен пункт выше)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_cust_info</word_key>
-      <word_default><![CDATA[You may use HTML - linebreaks automatically converted to &lt;br&gt;.<br />If left blank, a default 'permission denied' error is used.]]></word_default>
-      <word_custom><![CDATA[HTML разрешен.<br />Перено�ы �трок автоматиче�ки замен�ют�� на тег &lt;br&gt;.<br />Е�ли о�тавить �то поле пу�тым, то (при включенной опции выше) пользовател�м, пытающим�� зайти в тему будет выводить�� �тандартное �ообщение форума.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_hide</word_key>
-      <word_default><![CDATA[<strong>Hide Last Post Info</strong>]]></word_default>
-      <word_custom>Скрыть информацию о по�леднем �ообщении?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_list_info</word_key>
-      <word_default>If yes, the member will be able to see the topic titles but will not be able to read the topic posts when clicked.</word_default>
-      <word_custom>При выборе «Да» пользователи �могут видеть только �пи�ок названий тем, но не �могут в них войти.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_list</word_key>
-      <word_default><![CDATA[<strong>Allow members who can see the forum but cannot read topics to see the topic list</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Разрешить пользовател�м видеть названи� тем в �пи�ке, но запретить им про�мотр �одержимого �тих тем?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>from_f_postable_settings</word_key>
-      <word_default>Postable Forum Settings</word_default>
-      <word_custom>�а�тройки �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_perm_title</word_key>
-      <word_default>Permission Settings</word_default>
-      <word_custom>�а�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_redirect_num</word_key>
-      <word_default><![CDATA[<strong>Number of redirect clicks</strong>]]></word_default>
-      <word_custom>Количе�тво нажатий на ��ылку (перемещений)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_redirect_en_info</word_key>
-      <word_default><![CDATA[If 'yes' you can skip the rest of this form as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when enabled.]]></word_default>
-      <word_custom>При выборе «Да» ниже�ледующие блоки на�троек не будут иметь �илы, так как форум �танет лишь ��ылкой. Уже �уще�твующие темы в форуме будут недо�тупны.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_redirect_en</word_key>
-      <word_default><![CDATA[<strong>Enable URL redirection</strong>]]></word_default>
-      <word_custom>Переключить форум на перемещение?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_redirect_url</word_key>
-      <word_default><![CDATA[<strong>Redirect URL</strong>]]></word_default>
-      <word_custom>URL адре� дл� перемещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_redirect</word_key>
-      <word_default><![CDATA[<strong>Redirect Settings (Optional)</strong>]]></word_default>
-      <word_custom>�а�тройки переадре�ации (опционально)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_ascat_info</word_key>
-      <word_default><![CDATA[If this is set to 'Yes' previously posted topics will not display, and posting in this forum will not be allowed.  Users will only be allowed to view the subforums under this forum.  If this is set to yes, the rest of the settings will have no effect.]]></word_default>
-      <word_custom><![CDATA[Е�ли вы выберите «Да», то форум будет категорией, в нем будут запрещено открытие тем и публикаци� �ообщений, �оответ�твенно, в�е ниже�ледующие на�тройки не будут иметь �илы.<br /><br />Е�ли выберите «�ет», то форум будет обычным, в нем будут разрешено открытие тем, публикаци� �ообщений (е�ли �то разрешено).]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_ascat</word_key>
-      <word_default><![CDATA[<strong>Treat this forum as a category? (No posts in it)</strong>]]></word_default>
-      <word_custom>Сделать форум категорией?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_state</word_key>
-      <word_default><![CDATA[<strong>Forum State</strong>]]></word_default>
-      <word_custom>Со�то�ние форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_parent</word_key>
-      <word_default><![CDATA[<strong>Forum Parent</strong>]]></word_default>
-      <word_custom>Родитель�кий форум или категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_desc_info</word_key>
-      <word_default><![CDATA[You may use HTML - linebreaks automatically converted to &lt;br&gt;]]></word_default>
-      <word_custom><![CDATA[HTML разрешен - перено�ы �трок автоматиче�ки замен�ют�� на &lt;br&gt;.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_desc</word_key>
-      <word_default><![CDATA[<strong>Forum Description</strong>]]></word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_name_category</word_key>
-      <word_default>Category Name</word_default>
-      <word_custom>Категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_deletebutton</word_key>
-      <word_default>Remove Forum</word_default>
-      <word_custom>Удалить форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_basic</word_key>
-      <word_default>Basic Settings</word_default>
-      <word_custom>О�новные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_f_name_forum</word_key>
-      <word_default>Forum Name</word_default>
-      <word_custom>�азвание форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_moveparent</word_key>
-      <word_default><![CDATA[<strong>Move all <i>subforums for this forum</i> to which forum?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Перене�ти в�е <i>подфорумы данного форума</i> в форум?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_deletemove</word_key>
-      <word_default><![CDATA[<strong>Move all <i>existing topics and posts in this forum</i> to which forum?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>В какой форум переме�тить в�е �уще�твующие <i> темы и �ообщени� в �том форуме </i></strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_deletewhich</word_key>
-      <word_default><![CDATA[<strong>Forum to remove:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Удалить форум:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_deletetitle</word_key>
-      <word_default>Removing Forum: </word_default>
-      <word_custom>Удаление форума: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_emptybutton</word_key>
-      <word_default>Empty This Forum (No Undo)</word_default>
-      <word_custom>Удалить в�е в �том форуме (Во��тановление невозможно) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_emptywhich</word_key>
-      <word_default><![CDATA[<strong>Forum to empty:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Очи�тка форума:</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_skinbutton</word_key>
-      <word_default>Edit Forum Skin Options</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_emptytitle</word_key>
-      <word_default>Empty Forum </word_default>
-      <word_custom>Очи�тка форума </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_skinsub</word_key>
-      <word_default><![CDATA[<strong>Apply to all children of this forum (all subforums)?</strong>]]></word_default>
-      <word_custom>Применить ко в�ем подфорумам?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_skinapply</word_key>
-      <word_default><![CDATA[<strong>Apply which skin to this forum?</strong>]]></word_default>
-      <word_custom>Какой �тиль у�тановить дл� �того форума?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_rulesbutton</word_key>
-      <word_default>Edit Forum Rules</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_skinchoice</word_key>
-      <word_default>Skin choices for forum: </word_default>
-      <word_custom>У�тановка �тил� дл�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_rulestext</word_key>
-      <word_default><![CDATA[<strong>Rules Text</strong><br /> (HTML Editing Enabled)]]></word_default>
-      <word_custom><![CDATA[Тек�т<br />HTML включен.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_rulestitle</word_key>
-      <word_default><![CDATA[<strong>Rules Title</strong>]]></word_default>
-      <word_custom>Заголовок правил</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_rulessetup</word_key>
-      <word_default>Forum Rules Setup</word_default>
-      <word_custom>�а�тройки правил форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_rulesdisplay</word_key>
-      <word_default><![CDATA[<strong>Display Method</strong>]]></word_default>
-      <word_custom>Спо�об отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_global</word_key>
-      <word_default><![CDATA[<strong>Global Permissions</strong> (All current and future permission sets)]]></word_default>
-      <word_custom>Глобальные права (выбрать в�е текущие и будущие ма�ки)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_saveonly</word_key>
-      <word_default>Save Only</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_noperms</word_key>
-      <word_default>You did not select any permissions, would you like to continue anyway?</word_default>
-      <word_custom>Вы не у�тановили права до�тупа. В�е равно продолжить?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_savereload</word_key>
-      <word_default>Save and Reload Page</word_default>
-      <word_custom>Сохранить и перезагрузить �траницу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_saveprev</word_key>
-      <word_default>Save and Edit Previous</word_default>
-      <word_custom>Сохранить и изменить предыдущие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_savenext</word_key>
-      <word_default>Save and Edit Next</word_default>
-      <word_custom>Сохранить и изменить �ледующие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_noforumslink</word_key>
-      <word_default>Click here to create a new forum in this category</word_default>
-      <word_custom>�ажмите зде�ь дл� �оздани� нового форума в �той категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_noforums</word_key>
-      <word_default><![CDATA[<strong style='font-size:11px;color:red;'>You have not created any forums in this category yet.<br /> It will not be displayed on the site, regardless of permission settings, until it contains at least one forum.</strong>]]></word_default>
-      <word_custom><![CDATA[<strong style='font-size:11px;color:red;'>В данной категории еще нет ни одного форума<br />Категори� не будет отображать�� на �айте, незави�имо от на�троек прав до�тупа, до тех пор, пока не будет �одержать хот� бы один форум.</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_resync</word_key>
-      <word_default>Resynchronize...</word_default>
-      <word_custom>Ре�инхронизаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_forumrules</word_key>
-      <word_default>Forum Rules...</word_default>
-      <word_custom>Правила</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_emptyforum</word_key>
-      <word_default>Empty Forum...</word_default>
-      <word_custom>Очи�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_deleteforum</word_key>
-      <word_default>Delete Forum...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_permissions</word_key>
-      <word_default>Permissions...</word_default>
+      <word_key>from_f_perms</word_key>
+      <word_default>Permissions</word_default>
       <word_custom>Права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_moderators</word_key>
-      <word_default>Moderators</word_default>
-      <word_custom>Модераторы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>using_skin_set</word_key>
+      <word_default>Using Skin Set:</word_default>
+      <word_custom>Стиль:</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modcheck</word_key>
-      <word_default>Check this box to include this forum in the list of forums to add a moderator to</word_default>
-      <word_custom>Отметьте �то поле дл� добавлени� форума в �пи�ок форумов дл� добавлени� модератора к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_rule_raw_html_title</word_key>
+      <word_default>Use raw HTML</word_default>
+      <word_custom>И�пользовать HTML</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modaddtxt</word_key>
-      <word_default><![CDATA[<strong>Add a moderator to all checked forum(s):</strong>]]></word_default>
-      <word_custom>Добавить модератора в выбранные форумы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>soft_delete_info</word_key>
+      <word_default>Soft deletion will hide the item in-line. Those with permission will be able to see the item and restore it</word_default>
+      <word_custom>Мнимое удаление �крывает �ообщени� или темы. Эти права позвол�ют видеть такие �ообщени� и во��танавливать их.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_thistrash</word_key>
-      <word_default>This is a trashcan forum...</word_default>
-      <word_custom>Форум, отведенный под корзину</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hard_delete_info</word_key>
+      <word_default>Hard deletion will permanently remove the item from its parent. It will be removed from the database</word_default>
+      <word_custom>�а�то�щее удаление удалит объекты нав�егда. Они будут перемещены в корзину, е�ли она и�пользует��, или удалены из базы данных</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modorgroup</word_key>
-      <word_default><![CDATA[ <strong><i>OR</i></strong> Group ]]></word_default>
-      <word_custom>или группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>disable_sharelinks_desc</word_key>
+      <word_default>You can choose to remove the ability to share links from this forum if the content is likely to be sensitive.</word_default>
+      <word_custom>Вы можете отключить возможно�ть делит�� ��ылками дл� данного форума.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_reordcat</word_key>
-      <word_default>Reorder Categories</word_default>
-      <word_custom>Изменить пор�док категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>disable_sharelinks</word_key>
+      <word_default>Disable Share Links</word_default>
+      <word_custom>Отключить возможно�ть делить�� ��ылками</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_gogogadgetflow</word_key>
-      <word_default><![CDATA[Go &gt;&gt;]]></word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_rule_raw_html_desc</word_key>
+      <word_default>Checking this option will prevent any parsing, the code will be output exactly as typed in the editor.</word_default>
+      <word_custom>Включение данной опции приведет к отключению механизма обработки тек�та, таким образом при выводе тек�та он будет таким же как был введен.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modname</word_key>
-      <word_default>Name </word_default>
-      <word_custom>Им� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete_own</word_key>
+      <word_default><![CDATA[Can 'Soft Delete' own posts]]></word_default>
+      <word_custom>Могут мнимо удал�ть �вои �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_addnewcat</word_key>
-      <word_default>Add New Category</word_default>
-      <word_custom>Добавить категорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete</word_key>
+      <word_default><![CDATA[Can 'Soft Delete' <em>all</em> posts]]></word_default>
+      <word_custom><![CDATA[Могут мнимо удал�ть <strong>в�е</strong> �ообщени�]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modedit</word_key>
-      <word_default>Edit permissions...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_un_soft_delete</word_key>
+      <word_default><![CDATA[Can restore 'Soft Deleted' posts]]></word_default>
+      <word_custom>Могут во��танавливать мнимо удаленные �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modremove</word_key>
-      <word_default>Remove from this forum...</word_default>
-      <word_custom>Удалить из �того форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete_see</word_key>
+      <word_default><![CDATA[Can see 'Soft Deleted' posts]]></word_default>
+      <word_custom>Могут видеть мнимо удаленные �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modremoveall</word_key>
-      <word_default>Remove from all forums...</word_default>
-      <word_custom>Удалить из в�ех форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete_topic</word_key>
+      <word_default><![CDATA[Can 'Soft Delete' <em>all</em> topics]]></word_default>
+      <word_custom>Могут мнимо удал�ть в�е темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_showall</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>Показать форумы без иерархии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete_own_topic</word_key>
+      <word_default><![CDATA[Can 'Soft Delete' own topics]]></word_default>
+      <word_custom>Могут мнимо удал�ть �вои темы?</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_showtier</word_key>
-      <word_default>Show Tiered</word_default>
-      <word_custom>Показать иерархию форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_un_soft_delete_topic</word_key>
+      <word_default><![CDATA[Can restore 'Soft Deleted' topics]]></word_default>
+      <word_custom>Могут во��танавливать мнимо удаленные темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modhide</word_key>
-      <word_default>Hide Moderator Options</word_default>
-      <word_custom>Скрыть модератор�кие опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_soft_delete_see_d</word_key>
+      <word_default><![CDATA[If 'yes', the member will see the soft deleted posts in a topic]]></word_default>
+      <word_custom><![CDATA[Е�ли "да", то пользователи �могут видеть мнимо удаленные �ообщени� в темах]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_modshow</word_key>
-      <word_default>Show Moderator Options</word_default>
-      <word_custom>Показать модератор�кие опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_soft_delete_topic_see</word_key>
+      <word_default><![CDATA[Can see 'Soft Deleted' topics]]></word_default>
+      <word_custom>Могут видеть мнимо удаленные темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_deletecat</word_key>
-      <word_default>Delete Category...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_skinopt</word_key>
-      <word_default>Skin Options...</word_default>
-      <word_custom>�а�тройки �тил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_editsettings</word_key>
-      <word_default>Edit Settings...</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_newforum</word_key>
-      <word_default>New Forum...</word_default>
-      <word_custom>Создать форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_or</word_key>
-      <word_default><![CDATA[<strong><i>or...</i></strong>]]></word_default>
-      <word_custom>или </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>frm_id</word_key>
-      <word_default>ID: </word_default>
-      <word_custom>ID: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_forumscap</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_title</word_key>
-      <word_default>Category and Forum Overview</word_default>
-      <word_custom>Обзор категорий и форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_permedited</word_key>
-      <word_default>Forum permissions edited</word_default>
-      <word_custom>Права до�тупа изменены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_permedited2</word_key>
-      <word_default>Forum Access Permissions Edited</word_default>
-      <word_custom>Права до�тупа к форуму изменены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_permeditedin</word_key>
-      <word_default>Forum access permissions edited in %s</word_default>
-      <word_custom>Права до�тупа к форуму изменены в %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_catperm</word_key>
-      <word_default><![CDATA[<b>Category access permissions</b><br>(Select permission set for access, deselect to not allow access)<br>If you do not select a permission set, they will not be able to see any forums in that category.]]></word_default>
-      <word_custom><![CDATA[<b>Ма�ки до�тупа к категории</b><br />Е�ли вы не разрешите ма�ке до�тупа про�мотра форума, то группы, которые закреплены за �той ма�кой, не �могут про�матривать в�е форумы, отно��щие�� к �той категории.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for__edited</word_key>
-      <word_default> Edited</word_default>
-      <word_custom> Изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_forperm</word_key>
-      <word_default><![CDATA[<b>Forum access permissions</b><br>(Check box for access, uncheck to not allow access)<br>If you deny read access for a permission set, they will not see the forum]]></word_default>
-      <word_custom><![CDATA[<b>Ма�ки до�тупа к форуму</b><br />Е�ли вы запрещаете ма�ке до�тупа про�мотр форума, то группы, которые закреплены за �той ма�кой, не �могут про�матривать �тот форум.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for__created</word_key>
-      <word_default> Created</word_default>
-      <word_custom> Создан</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_entertitle</word_key>
-      <word_default>You must enter a %s title. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти заголовок %s. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_whymovethere</word_key>
-      <word_default>Sorry, that is not possible. You are attempting to move a parent forum or category into its own child structure. Please go back and try again, selecting a different parent forum.</word_default>
-      <word_custom>Извините, �делать �то невозможно. Вы хотите переме�тить родитель�кий форума в него же �амого. Пожалуй�та, верните�ь назад и попытайте�ь выбрать другой форум.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_addfor</word_key>
-      <word_default>Add Forum</word_default>
-      <word_custom>Создать форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_newfor</word_key>
-      <word_default>New Forum</word_default>
-      <word_custom>�овый форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_addcat</word_key>
-      <word_default>Add Category</word_default>
-      <word_custom>Добавление категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_newcat</word_key>
-      <word_default>New Category</word_default>
-      <word_custom>�ова� категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_changecat</word_key>
-      <word_default>Change to Category</word_default>
-      <word_custom>Изменить на категорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_changefor</word_key>
-      <word_default>Change to Forum</word_default>
-      <word_custom>Изменить на форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_editfor_button</word_key>
-      <word_default>Edit Forum</word_default>
-      <word_custom>Изменить форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_editfor</word_key>
-      <word_default>Edit Forum: %s</word_default>
-      <word_custom>Изменение форума: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_editcat</word_key>
-      <word_default>Editing Category: %s</word_default>
-      <word_custom>Изменение категории: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_editcat_button</word_key>
-      <word_default>Edit Category</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_ireplied</word_key>
-      <word_default>Topics Reader Replied</word_default>
-      <word_custom>темы � ответами пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_noforumselected</word_key>
-      <word_default>No forum selected to edit. Please try again.</word_default>
-      <word_custom>�е выбран форум дл� изменени�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_istarted</word_key>
-      <word_default>Topics Reader Started</word_default>
-      <word_custom>темы, �озданные пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_moved</word_key>
-      <word_default>Moved Topics</word_default>
-      <word_custom>перемещенные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_locked</word_key>
-      <word_default>Locked Topics</word_default>
-      <word_custom>закрытые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_hot</word_key>
-      <word_default>Hot Topics</word_default>
-      <word_custom>гор�чие темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_poll</word_key>
-      <word_default>Polls</word_default>
-      <word_custom>Опро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_open</word_key>
-      <word_default>Open Topics</word_default>
-      <word_custom>открытые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_desc</word_key>
-      <word_default>Descending (Z - A, 9 - 0)</word_default>
-      <word_custom>по убыванию (Я - �, 9 - 0)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_all</word_key>
-      <word_default>All Topics</word_default>
-      <word_custom>в�е темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_post</word_key>
-      <word_default>Topic Posts</word_default>
-      <word_custom>количе�тву �ообщений в темах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_view</word_key>
-      <word_default>Topic Views</word_default>
-      <word_custom>количе�тву про�мотров темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_date</word_key>
-      <word_default>Topic start date</word_default>
-      <word_custom>дате �оздани� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_poster</word_key>
-      <word_default>Name of last poster</word_default>
-      <word_custom>имени по�леднего автора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_asc</word_key>
-      <word_default>Ascending (A - Z, 0 - 9)</word_default>
-      <word_custom>по возра�танию (� - Я, 0 - 9)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_last</word_key>
-      <word_default>Date of last post</word_default>
-      <word_custom>дате по�леднего �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_topic</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>названию темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_s_name</word_key>
-      <word_default><![CDATA[Topic Starter's Name]]></word_default>
-      <word_custom>автору темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_showall</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>в�е врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last90</word_key>
-      <word_default>Last 90 Days</word_default>
-      <word_custom>90 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last60</word_key>
-      <word_default>Last 60 Days</word_default>
-      <word_custom>60 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last30</word_key>
-      <word_default>Last 30 Days</word_default>
-      <word_custom>30 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last25</word_key>
-      <word_default>Last 25 Days</word_default>
-      <word_custom>25 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last20</word_key>
-      <word_default>Last 20 Days</word_default>
-      <word_custom>20 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last15</word_key>
-      <word_default>Last 15 Days</word_default>
-      <word_custom>15 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last10</word_key>
-      <word_default>Last 10 Days</word_default>
-      <word_custom>10 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last7</word_key>
-      <word_default>Last 7 Days</word_default>
-      <word_custom>7 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_last5</word_key>
-      <word_default>Last 5 Days</word_default>
-      <word_custom>5 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_today</word_key>
-      <word_default>Today</word_default>
-      <word_custom>�егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_modrep</word_key>
-      <word_default><![CDATA[Moderate new replies but don't moderate new topics]]></word_default>
-      <word_custom>новые ответы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_modtop</word_key>
-      <word_default><![CDATA[Moderate new topics but don't moderate new replies]]></word_default>
-      <word_custom>новые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_modall</word_key>
-      <word_default>Moderate all new topics and all replies</word_default>
-      <word_custom>в�е новые темы и �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_readonly</word_key>
-      <word_default>Read Only</word_default>
-      <word_custom>Только дл� чтени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_active</word_key>
-      <word_default>Active</word_default>
-      <word_custom>�ктивный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_control</word_key>
-      <word_default>Forum Control</word_default>
-      <word_custom>Управление �уще�твующими форумами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_removed</word_key>
-      <word_default>Forum Removed</word_default>
-      <word_custom>Форум удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_removedlog</word_key>
-      <word_default><![CDATA[Removed forum: '%s']]></word_default>
-      <word_custom>%s удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_wherewhatwhy</word_key>
-      <word_default>You cannot move topics into the forum you are removing. Please try again.</word_default>
-      <word_custom>Вы не можете перене�ти тему в форум, который вы удал�ете. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_child_no_parent</word_key>
-      <word_default>You cannot move children forums to the forum you are removing. Please try again.</word_default>
-      <word_custom>Вы не можете перене�ти дочерний форум в форум, который вы удал�ете. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_removing</word_key>
-      <word_default><![CDATA[Removing %s '%s']]></word_default>
-      <word_custom><![CDATA[Удаление %s '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_iscat_n</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_iscat_y</word_key>
-      <word_default>Category</word_default>
-      <word_custom>Категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_lastforum</word_key>
-      <word_default>Could not remove this forum. Please create another forum before attempting to remove this one.</word_default>
-      <word_custom>Этот форум по�ледний, вы не можете его удалить. Е�ли в�е же �то необходимо �делать, перед удалением данного форума �оздайте еще один и удалите �тот.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_noid_delete</word_key>
-      <word_default>Could not determine the forum or category ID to delete. Please try again.</word_default>
-      <word_custom>�е удало�ь найти форум или категорию, которую необходимо удалить. Пожалуй�та попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_emptied</word_key>
-      <word_default>Forum emptied.</word_default>
-      <word_custom>Форум очищен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_emptiedlog</word_key>
-      <word_default><![CDATA[Emptied forum '%s' of all posts]]></word_default>
-      <word_custom>Очищен форум %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_nodetails</word_key>
-      <word_default>Could not get the forum details for the forum to empty. Please try again.</word_default>
-      <word_custom>�е найден форум, который должен быть очищен. Пожалуй�та попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_noid_source</word_key>
-      <word_default>Could not determine the source forum ID. Please try again.</word_default>
-      <word_custom>�евозможно определить ID форума и�точника. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_empty_title</word_key>
-      <word_default>Empty forum: %s</word_default>
-      <word_custom>Очи�тка форума: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_resynched</word_key>
-      <word_default>Forum Resynschronized</word_default>
-      <word_custom>Форум �инхронизирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_recountedlog</word_key>
-      <word_default><![CDATA[Recounted posts in forum: '%s']]></word_default>
-      <word_custom>Пере�читанных по�тов в форуме: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_rulesup</word_key>
-      <word_default>Forum rules updated.</word_default>
-      <word_custom>Правила форума обновлены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_rulesfull</word_key>
-      <word_default>Show Full Text</word_default>
-      <word_custom>Показывать тек�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_ruleslink</word_key>
-      <word_default>Show Link Only</word_default>
-      <word_custom>Показывать ��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_rulesdont</word_key>
-      <word_default><![CDATA[Don't Show]]></word_default>
-      <word_custom>�е показывать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_skinup</word_key>
-      <word_default>Forum skin updated.</word_default>
-      <word_custom>Тема форума обновлена.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_noneall</word_key>
-      <word_default>--None / Remove All--</word_default>
-      <word_custom>-- �ет / Удалить в�е -- </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>for_noid</word_key>
-      <word_default>Could not determine the forum ID. Please try again.</word_default>
-      <word_custom>�е возможно определить ID форума. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>forums_context_add_category</word_key>
-      <word_default>Add New Category</word_default>
-      <word_custom>�ова� категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>forums_context_add_forum</word_key>
-      <word_default>Add New Forum</word_default>
-      <word_custom>�овый форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_avoidance</word_key>
-      <word_default>Avoidance</word_default>
-      <word_custom>Допущени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_restrictions</word_key>
-      <word_default>Restrictions</word_default>
-      <word_custom>Ограничени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_polling</word_key>
-      <word_default>Polling</word_default>
-      <word_custom>Опро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_viewing</word_key>
-      <word_default>Viewing</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_posting</word_key>
-      <word_default>Posting</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_editing</word_key>
-      <word_default>Editing</word_default>
-      <word_custom>Изменение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_deleting</word_key>
-      <word_default>Deleting</word_default>
-      <word_custom>Удаление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_openclose</word_key>
-      <word_default>Open/Closed Topics</word_default>
-      <word_custom>Открытые/Закрытые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_t_rating</word_key>
-      <word_default>Topic Rating</word_default>
-      <word_custom>Рейтинг тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_max</word_key>
-      <word_default>Max.</word_default>
-      <word_custom>Мак�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_dd_apprp</word_key>
-      <word_default>approved posts</word_default>
-      <word_custom>�ообщений на форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_dd_days</word_key>
-      <word_default>days since joining</word_default>
-      <word_custom>дней � момента в�туплени� в группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_ppd</word_key>
-      <word_default>posts per 24 hrs until</word_default>
-      <word_custom>�ообщений за 24 ча�а до тех пор, пока меньше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_until</word_key>
-      <word_default>until</word_default>
-      <word_custom>до тех пор, пока меньше</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_limit_no</word_key>
-      <word_default>Enter 0 or leave blank to not limit</word_default>
-      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>g_limit_dd</word_key>
-      <word_default>Enter 0 or leave blank in second field to not limit by days/posts</word_default>
-      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени� по дн�м/�ообщени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>gf_ppd_limit</word_key>
-      <word_default>Limit Posts Per 24hrs</word_default>
-      <word_custom>Количе�тво �ообщений в течение 24 ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>member_posts_deleted</word_key>
-      <word_default>Posts and/or topics belonging to %s have been deleted</word_default>
-      <word_custom>Сообщени� и темы принадлежащие %s были удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>modify_skin_head</word_key>
-      <word_default>Modify Forum Skin Selection</word_default>
-      <word_custom>Изменение �тил� форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>forum_rules_head</word_key>
-      <word_default>Forum Rules in</word_default>
-      <word_custom>Правила дл� форума </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>head_forum_permissions</word_key>
-      <word_default>Forum Permissions:</word_default>
-      <word_custom>Права до�тупа форума: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>acp_subforum_legend</word_key>
-      <word_default>Subforums</word_default>
-      <word_custom>Подфорумы </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>acp_posts_deleted_from_tid</word_key>
-      <word_default>ACP - Posts Deleted From TID: </word_default>
-      <word_custom>ACP - Сообщени� удаленные из TID: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>acp_posts_deleted_from</word_key>
-      <word_default>ACP - Posts Deleted From </word_default>
-      <word_custom>ACP - Сообщени� удаленные из </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>nodelete_last_cat</word_key>
-      <word_default>You cannot delete the only category</word_default>
-      <word_custom>Вы не можете удалить только категорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>fc_group_prefix</word_key>
-      <word_default>Group: </word_default>
-      <word_custom>Группа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>copy_perms_from</word_key>
-      <word_default>Copy Permissions From:</word_default>
-      <word_custom>Скопировать права до�тупа из:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>copy_perms_go</word_key>
-      <word_default>Go!</word_default>
-      <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>sup_mod_already</word_key>
-      <word_default>Super Moderators automatically have this permission regardless of this setting</word_default>
-      <word_custom>Супермодераторы автоматиче�ки имеют �ти права незави�имо от данных на�троек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_soft_delete_topic_see_d</word_key>
+      <word_default><![CDATA[If 'yes', the member will see the soft deleted topics in a forum]]></word_default>
+      <word_custom><![CDATA[Е�ли "да", то пользователи �могут видеть мнимо удаленные темы на форуме]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5478,9 +854,13 @@
       <word_key>gbw_soft_delete_see_post_d</word_key>
       <word_default><![CDATA[If 'yes', the member can view a soft deleted topic or read a soft deleted post]]></word_default>
       <word_custom><![CDATA[Е�ли "да", то пользователи �могут видеть мнимо удаленные темы или читать мнимо удаленные �ообщени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>sup_mod_already</word_key>
+      <word_default>Super Moderators automatically have this permission regardless of this setting</word_default>
+      <word_custom>Супермодераторы автоматиче�ки имеют �ти права незави�имо от данных на�троек</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5488,9 +868,6 @@
       <word_key>gf_bw_soft_delete_see_post</word_key>
       <word_default><![CDATA[Can see 'Soft Deleted' content for posts and topics]]></word_default>
       <word_custom>Могут видеть �одержимое мнимо удаленных �ообщений и тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5499,249 +876,3108 @@
       <word_default><![CDATA[Can see 'Soft Deleted' reason for posts and topics]]></word_default>
       <word_custom>Могут видеть причины мнимого удалени� �ообщени� или темы&#13;
 </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gbw_soft_delete_topic_see_d</word_key>
-      <word_default><![CDATA[If 'yes', the member will see the soft deleted topics in a forum]]></word_default>
-      <word_custom><![CDATA[Е�ли "да", то пользователи �могут видеть мнимо удаленные темы на форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_posts_deleted_from</word_key>
+      <word_default>ACP - Posts Deleted From </word_default>
+      <word_custom>ACP - Сообщени� удаленные из </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete_topic_see</word_key>
-      <word_default><![CDATA[Can see 'Soft Deleted' topics]]></word_default>
-      <word_custom>Могут видеть мнимо удаленные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>fc_group_prefix</word_key>
+      <word_default>Group: </word_default>
+      <word_custom>Группа: </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_un_soft_delete_topic</word_key>
-      <word_default><![CDATA[Can restore 'Soft Deleted' topics]]></word_default>
-      <word_custom>Могут во��танавливать мнимо удаленные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>nodelete_last_cat</word_key>
+      <word_default>You cannot delete the only category</word_default>
+      <word_custom>Вы не можете удалить только категорию</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete_own_topic</word_key>
-      <word_default><![CDATA[Can 'Soft Delete' own topics]]></word_default>
-      <word_custom>Могут мнимо удал�ть �вои темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>copy_perms_from</word_key>
+      <word_default>Copy Permissions From:</word_default>
+      <word_custom>Скопировать права до�тупа из:</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete_topic</word_key>
-      <word_default><![CDATA[Can 'Soft Delete' <strong>all</strong> topics]]></word_default>
-      <word_custom>Могут мнимо удал�ть в�е темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>copy_perms_go</word_key>
+      <word_default>Go!</word_default>
+      <word_custom>ОК</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gbw_soft_delete_see_d</word_key>
-      <word_default><![CDATA[If 'yes', the member will see the soft deleted posts in a topic]]></word_default>
-      <word_custom><![CDATA[Е�ли "да", то пользователи �могут видеть мнимо удаленные �ообщени� в темах]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_posts_deleted_from_tid</word_key>
+      <word_default>ACP - Posts Deleted From TID: </word_default>
+      <word_custom>ACP - Сообщени� удаленные из TID: </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete_see</word_key>
-      <word_default><![CDATA[Can see 'Soft Deleted' posts]]></word_default>
-      <word_custom>Могут видеть мнимо удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>head_forum_permissions</word_key>
+      <word_default>Forum Permissions:</word_default>
+      <word_custom>Права до�тупа форума: </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_un_soft_delete</word_key>
-      <word_default><![CDATA[Can restore 'Soft Deleted' posts]]></word_default>
-      <word_custom>Могут во��танавливать мнимо удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_subforum_legend</word_key>
+      <word_default>Subforums</word_default>
+      <word_custom>Подфорумы </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete_own</word_key>
-      <word_default><![CDATA[Can 'Soft Delete' own posts]]></word_default>
-      <word_custom>Могут мнимо удал�ть �вои �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>forum_rules_head</word_key>
+      <word_default>Forum rules for:</word_default>
+      <word_custom>Правила дл� форума </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>gf_bw_soft_delete</word_key>
-      <word_default><![CDATA[Can 'Soft Delete' <strong>all</strong> posts]]></word_default>
-      <word_custom><![CDATA[Могут мнимо удал�ть <strong>в�е</strong> �ообщени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>modify_skin_head</word_key>
+      <word_default>Modify Forum Skin Selection</word_default>
+      <word_custom>Изменение �тил� форума</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>soft_delete_info</word_key>
-      <word_default>Soft deletion will hide the item in-line. Those with permission will be able to see the item and restore it</word_default>
-      <word_custom>Мнимое удаление �крывает �ообщени� или темы. Эти права позвол�ют видеть такие �ообщени� и во��танавливать их.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_ppd_limit</word_key>
+      <word_default>Limit Posts Per 24hrs</word_default>
+      <word_custom>Количе�тво �ообщений в течение 24 ча�ов</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>hard_delete_info</word_key>
-      <word_default>Hard deletion will permanently remove the item from its parent. It will either be moved into the trash can if set up, or removed from the database</word_default>
-      <word_custom>�а�то�щее удаление удалит объекты нав�егда. Они будут перемещены в корзину, е�ли она и�пользует��, или удалены из базы данных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_posts_deleted</word_key>
+      <word_default>Posts and/or topics belonging to %s have been deleted</word_default>
+      <word_custom>Сообщени� и темы принадлежащие %s были удалены</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>disable_sharelinks_desc</word_key>
-      <word_default>You can choose to remove the ability to share links from this forum if the content is likely to be sensitive.</word_default>
-      <word_custom>Вы можете отключить возможно�ть делит�� ��ылками дл� данного форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_limit_no</word_key>
+      <word_default>Enter 0 or leave blank to not limit</word_default>
+      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>disable_sharelinks</word_key>
-      <word_default>Disable Share Links</word_default>
-      <word_custom>Отключить возможно�ть делить�� ��ылками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_ppd</word_key>
+      <word_default>posts per 24 hrs until</word_default>
+      <word_custom>�ообщений за 24 ча�а до тех пор, пока меньше</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_rule_raw_html_desc</word_key>
-      <word_default>Checking this option will prevent any parsing, the code will be output exactly as typed in the editor.</word_default>
-      <word_custom>Включение данной опции приведет к отключению механизма обработки тек�та, таким образом при выводе тек�та он будет таким же как был введен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_limit_dd</word_key>
+      <word_default>Enter 0 or leave blank in second field to not limit by days/posts</word_default>
+      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени� по дн�м/�ообщени�м</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>frm_rule_raw_html_title</word_key>
-      <word_default>Use raw HTML</word_default>
-      <word_custom>И�пользовать HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_dd_apprp</word_key>
+      <word_default>approved posts</word_default>
+      <word_custom>�ообщений на форуме</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>from_f_perms</word_key>
-      <word_default>Permissions</word_default>
+      <word_key>g_until</word_key>
+      <word_default>until</word_default>
+      <word_custom>до тех пор, пока меньше</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_max</word_key>
+      <word_default>Max.</word_default>
+      <word_custom>Мак�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_dd_days</word_key>
+      <word_default>days since joining</word_default>
+      <word_custom>дней � момента в�туплени� в группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_viewing</word_key>
+      <word_default>Viewing</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_rating</word_key>
+      <word_default>Topic Rating</word_default>
+      <word_custom>Рейтинг тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_openclose</word_key>
+      <word_default>Open/Closed Topics</word_default>
+      <word_custom>Открытые/Закрытые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_deleting</word_key>
+      <word_default>Deleting</word_default>
+      <word_custom>Удаление</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_posting</word_key>
+      <word_default>Posting</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_editing</word_key>
+      <word_default>Editing</word_default>
+      <word_custom>Изменение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_avoidance</word_key>
+      <word_default>Avoidance</word_default>
+      <word_custom>Допущени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_polling</word_key>
+      <word_default>Polling</word_default>
+      <word_custom>Опро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_t_restrictions</word_key>
+      <word_default>Restrictions</word_default>
+      <word_custom>Ограничени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_noneall</word_key>
+      <word_default>--None / Remove All--</word_default>
+      <word_custom>-- �ет / Удалить в�е -- </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_skinup</word_key>
+      <word_default>Forum skin updated.</word_default>
+      <word_custom>Тема форума обновлена.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_noid</word_key>
+      <word_default>Could not determine the forum ID. Please try again.</word_default>
+      <word_custom>�е возможно определить ID форума. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>forums_context_add_category</word_key>
+      <word_default>Add New Category</word_default>
+      <word_custom>�ова� категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>forums_context_add_forum</word_key>
+      <word_default>Add New Forum</word_default>
+      <word_custom>�овый форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_nodetails</word_key>
+      <word_default>Could not get the forum details for the forum to empty. Please try again.</word_default>
+      <word_custom>�е найден форум, который должен быть очищен. Пожалуй�та попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_empty_title</word_key>
+      <word_default>Empty forum: %s</word_default>
+      <word_custom>Очи�тка форума: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_resynched</word_key>
+      <word_default>Forum Resynschronized</word_default>
+      <word_custom>Форум �инхронизирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_recountedlog</word_key>
+      <word_default><![CDATA[Recounted posts in forum: '%s']]></word_default>
+      <word_custom>Пере�читанных по�тов в форуме: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_rulesfull</word_key>
+      <word_default>Show Full Text</word_default>
+      <word_custom>Показывать тек�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_rulesup</word_key>
+      <word_default>Forum rules updated.</word_default>
+      <word_custom>Правила форума обновлены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_rulesdont</word_key>
+      <word_default><![CDATA[Don't Show]]></word_default>
+      <word_custom>�е показывать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_ruleslink</word_key>
+      <word_default>Show Link Only</word_default>
+      <word_custom>Показывать ��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_noid_source</word_key>
+      <word_default>Could not determine the source forum ID. Please try again.</word_default>
+      <word_custom>�евозможно определить ID форума и�точника. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_emptiedlog</word_key>
+      <word_default><![CDATA[Emptied forum '%s' of all posts]]></word_default>
+      <word_custom>Очищен форум %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_emptied</word_key>
+      <word_default>Forum emptied.</word_default>
+      <word_custom>Форум очищен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_noid_delete</word_key>
+      <word_default>Could not determine the forum or category ID to delete. Please try again.</word_default>
+      <word_custom>�е удало�ь найти форум или категорию, которую необходимо удалить. Пожалуй�та попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_lastforum</word_key>
+      <word_default>Could not remove this forum. Please create another forum before attempting to remove this one.</word_default>
+      <word_custom>Этот форум по�ледний, вы не можете его удалить. Е�ли в�е же �то необходимо �делать, перед удалением данного форума �оздайте еще один и удалите �тот.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_iscat_y</word_key>
+      <word_default>Category</word_default>
+      <word_custom>Категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_iscat_n</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_wherewhatwhy</word_key>
+      <word_default>You cannot move topics into the forum you are removing. Please try again.</word_default>
+      <word_custom>Вы не можете перене�ти тему в форум, который вы удал�ете. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_child_no_parent</word_key>
+      <word_default>You cannot move children forums to the forum you are removing. Please try again.</word_default>
+      <word_custom>Вы не можете перене�ти дочерний форум в форум, который вы удал�ете. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_removedlog</word_key>
+      <word_default><![CDATA[Removed forum: '%s']]></word_default>
+      <word_custom>%s удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_active</word_key>
+      <word_default>Active</word_default>
+      <word_custom>�ктивный</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_readonly</word_key>
+      <word_default>Read Only</word_default>
+      <word_custom>Только дл� чтени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_removed</word_key>
+      <word_default>Forum Removed</word_default>
+      <word_custom>Форум удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_control</word_key>
+      <word_default>Forum Control</word_default>
+      <word_custom>Управление �уще�твующими форумами</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_removing</word_key>
+      <word_default><![CDATA[Removing %s '%s']]></word_default>
+      <word_custom><![CDATA[Удаление %s '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_modall</word_key>
+      <word_default>Moderate all new topics and all replies</word_default>
+      <word_custom>в�е новые темы и �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_modtop</word_key>
+      <word_default><![CDATA[Moderate new topics but don't moderate new replies]]></word_default>
+      <word_custom>новые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_modrep</word_key>
+      <word_default><![CDATA[Moderate new replies but don't moderate new topics]]></word_default>
+      <word_custom>новые ответы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_today</word_key>
+      <word_default>Today</word_default>
+      <word_custom>�егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last5</word_key>
+      <word_default>Last 5 Days</word_default>
+      <word_custom>5 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last7</word_key>
+      <word_default>Last 7 Days</word_default>
+      <word_custom>7 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last20</word_key>
+      <word_default>Last 20 Days</word_default>
+      <word_custom>20 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last15</word_key>
+      <word_default>Last 15 Days</word_default>
+      <word_custom>15 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last10</word_key>
+      <word_default>Last 10 Days</word_default>
+      <word_custom>10 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last30</word_key>
+      <word_default>Last 30 Days</word_default>
+      <word_custom>30 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last25</word_key>
+      <word_default>Last 25 Days</word_default>
+      <word_custom>25 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_showall</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>в�е врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last90</word_key>
+      <word_default>Last 90 Days</word_default>
+      <word_custom>90 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_last60</word_key>
+      <word_default>Last 60 Days</word_default>
+      <word_custom>60 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_topic</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>названию темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_last</word_key>
+      <word_default>Date of last post</word_default>
+      <word_custom>дате по�леднего �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_desc</word_key>
+      <word_default>Descending (Z - A, 9 - 0)</word_default>
+      <word_custom>по убыванию (Я - �, 9 - 0)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_asc</word_key>
+      <word_default>Ascending (A - Z, 0 - 9)</word_default>
+      <word_custom>по возра�танию (� - Я, 0 - 9)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_poster</word_key>
+      <word_default>Name of last poster</word_default>
+      <word_custom>имени по�леднего автора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_view</word_key>
+      <word_default>Topic Views</word_default>
+      <word_custom>количе�тву про�мотров темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_post</word_key>
+      <word_default>Topic Posts</word_default>
+      <word_custom>количе�тву �ообщений в темах</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_name</word_key>
+      <word_default><![CDATA[Topic Starter's Name]]></word_default>
+      <word_custom>автору темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_s_date</word_key>
+      <word_default>Topic start date</word_default>
+      <word_custom>дате �оздани� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_open</word_key>
+      <word_default>Open Topics</word_default>
+      <word_custom>открытые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_all</word_key>
+      <word_default>All Topics</word_default>
+      <word_custom>в�е темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_hot</word_key>
+      <word_default>Hot Topics</word_default>
+      <word_custom>Попул�рные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_poll</word_key>
+      <word_default>Polls</word_default>
+      <word_custom>Опро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_locked</word_key>
+      <word_default>Locked Topics</word_default>
+      <word_custom>закрытые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_moved</word_key>
+      <word_default>Moved Topics</word_default>
+      <word_custom>перемещенные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_ireplied</word_key>
+      <word_default>Topics Reader Replied</word_default>
+      <word_custom>Темы � ответами пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_istarted</word_key>
+      <word_default>Topics Reader Started</word_default>
+      <word_custom>Темы, �озданные пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_editcat</word_key>
+      <word_default>Editing Category: %s</word_default>
+      <word_custom>Изменение категории: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_noforumselected</word_key>
+      <word_default>No forum selected to edit. Please try again.</word_default>
+      <word_custom>�е выбран форум дл� изменени�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_changefor</word_key>
+      <word_default>Change to Forum</word_default>
+      <word_custom>Изменить на форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_changecat</word_key>
+      <word_default>Change to Category</word_default>
+      <word_custom>Изменить на категорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_editfor_button</word_key>
+      <word_default>Edit Forum</word_default>
+      <word_custom>Изменить форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_editfor</word_key>
+      <word_default>Edit Forum: %s</word_default>
+      <word_custom>Изменение форума: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_editcat_button</word_key>
+      <word_default>Edit Category</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_newcat</word_key>
+      <word_default>New Category</word_default>
+      <word_custom>�ова� категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_addcat</word_key>
+      <word_default>Add Category</word_default>
+      <word_custom>Добавление категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_addfor</word_key>
+      <word_default>Add Forum</word_default>
+      <word_custom>Создать форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_newfor</word_key>
+      <word_default>New Forum</word_default>
+      <word_custom>�овый форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_entertitle</word_key>
+      <word_default>You must enter a %s title. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти заголовок %s. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_permeditedin</word_key>
+      <word_default>Forum access permissions edited in %s</word_default>
+      <word_custom>Права до�тупа к форуму изменены в %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_whymovethere</word_key>
+      <word_default>Sorry, that is not possible. You are attempting to move a parent forum or category into its own child structure. Please go back and try again, selecting a different parent forum.</word_default>
+      <word_custom>Извините, �делать �то невозможно. Вы хотите переме�тить родитель�кий форума в него же �амого. Пожалуй�та, верните�ь назад и попытайте�ь выбрать другой форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for__created</word_key>
+      <word_default> Created</word_default>
+      <word_custom> Создан</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for__edited</word_key>
+      <word_default> Edited</word_default>
+      <word_custom> Изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_title</word_key>
+      <word_default>Category and Forum Overview</word_default>
+      <word_custom>Обзор категорий и форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_forumscap</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_permedited2</word_key>
+      <word_default>Forum Access Permissions Edited</word_default>
+      <word_custom>Права до�тупа к форуму изменены</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>for_permedited</word_key>
+      <word_default>Forum permissions edited</word_default>
+      <word_custom>Права до�тупа изменены</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_header</word_key>
+      <word_default>Forum Type</word_default>
+      <word_custom>Тип форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type</word_key>
+      <word_default>Type of Forum</word_default>
+      <word_custom>Тип �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_stand_d</word_key>
+      <word_default>A normal forum that accepts posts</word_default>
+      <word_custom>Обычный форум дл� �оздани� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_stand</word_key>
+      <word_default>Standard forum</word_default>
+      <word_custom>Стандартный форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_redirect</word_key>
+      <word_default>Redirect forum</word_default>
+      <word_custom>Форум - ��ылка</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_redirect_d</word_key>
+      <word_default>A dummy forum that redirects the user to a URL of your choice</word_default>
+      <word_custom>�азвание �вл�ет�� ��ылкой на указанный URL</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_settings</word_key>
+      <word_default>Forum Settings</word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_cat</word_key>
+      <word_default>Treat as a category</word_default>
+      <word_custom>Отображать как категорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_type_cat_d</word_key>
+      <word_default>A container for subforums only; does not allow direct posts</word_default>
+      <word_custom>Может �одержать только подфорумы. Создание тем невозможно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_or</word_key>
+      <word_default><![CDATA[<strong><i>or...</i></strong>]]></word_default>
+      <word_custom>или </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_save</word_key>
+      <word_default>Save Forum</word_default>
+      <word_custom>Сохранить на�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_id</word_key>
+      <word_default>ID: </word_default>
+      <word_custom>ID: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_savecat</word_key>
+      <word_default>Save Category</word_default>
+      <word_custom>Сохранить на�тройки категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_deletecat</word_key>
+      <word_default>Delete Category...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_editsettings</word_key>
+      <word_default>Edit Settings...</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_newforum</word_key>
+      <word_default>New Forum...</word_default>
+      <word_custom>Создать форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_skinopt</word_key>
+      <word_default>Skin Options...</word_default>
+      <word_custom>�а�тройки �тил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modshow</word_key>
+      <word_default>Show Moderator Options</word_default>
+      <word_custom>Показать модератор�кие опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modhide</word_key>
+      <word_default>Hide Moderator Options</word_default>
+      <word_custom>Скрыть модератор�кие опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_showtier</word_key>
+      <word_default>Show Tiered</word_default>
+      <word_custom>Показать иерархию форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_showall</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>Показать форумы без иерархии</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modremoveall</word_key>
+      <word_default>Remove from all forums...</word_default>
+      <word_custom>Удалить из в�ех форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modremove</word_key>
+      <word_default>Remove from this forum...</word_default>
+      <word_custom>Удалить из �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modedit</word_key>
+      <word_default>Edit permissions...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_addnewcat</word_key>
+      <word_default>Add New Category</word_default>
+      <word_custom>Добавить категорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_reordcat</word_key>
+      <word_default>Reorder Categories</word_default>
+      <word_custom>Изменить пор�док категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modname</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им� </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_gogogadgetflow</word_key>
+      <word_default><![CDATA[Go &gt;&gt;]]></word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_moderators</word_key>
+      <word_default>moderators</word_default>
+      <word_custom>Модераторы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_modcheck</word_key>
+      <word_default>Check this box to include this forum in the list of forums to add a moderator to</word_default>
+      <word_custom>Отметьте �то поле дл� добавлени� форума в �пи�ок форумов дл� добавлени� модератора к </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_permissions</word_key>
+      <word_default>Permissions...</word_default>
       <word_custom>Права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>using_skin_set</word_key>
-      <word_default>Using Skin Set:</word_default>
-      <word_custom>Стиль:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_modaddtxt</word_key>
+      <word_default>Add moderator to checked forum(s)</word_default>
+      <word_custom>Добавить модератора в выбранные форумы:</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>emptyforum_sofarcycle</word_key>
-      <word_default>Emptying forum: %s topics deleted so far</word_default>
-      <word_custom>Очи�тка форума: %s тем удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_modorgroup</word_key>
+      <word_default><![CDATA[ <strong><i>OR</i></strong> Group ]]></word_default>
+      <word_custom>или группа</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_uploadfail3</word_key>
-      <word_default>The upload failed - there file was too large. Please try again.</word_default>
-      <word_custom>Загрузка не удала�ь - файл �лишком большой. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_emptyforum</word_key>
+      <word_default>Empty Forum...</word_default>
+      <word_custom>Очи�тить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_uploadfail4</word_key>
-      <word_default>The upload failed - there was a problem moving the avatar to the uploads directory.  Please verify permissions are set correctly on the uploads folder.</word_default>
-      <word_custom>Загрузка не удала�ь - возникли проблеммы при перемещении аватара в директорию загрузки. Проверьте на�тройки до�тупа к директории загрузки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_forumrules</word_key>
+      <word_default>Forum Rules...</word_default>
+      <word_custom>Правила</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_uploadfail5</word_key>
-      <word_default>The upload failed - there was a problem processing the image. Please try again.</word_default>
-      <word_custom>Загрузка не удала�ь - возникли проблемы при обработке изображени�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_deleteforum</word_key>
+      <word_default>Delete Forum...</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_noav</word_key>
-      <word_default>We could not determine the avatar you were trying to update with. Please try again.</word_default>
-      <word_custom>�е удает�� найти аватар, который вы хотите обновить. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_resync</word_key>
+      <word_default>Resynchronize...</word_default>
+      <word_custom>Ре�инхронизаци�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_avupdated</word_key>
-      <word_default><![CDATA[The member's avatar has been updated!]]></word_default>
-      <word_custom>�ватар пользовател� обновлен!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_noforums</word_key>
+      <word_default>There are no forums in this category. It will not be displayed on the site, regardless of permission settings, until it contains at least one forum.</word_default>
+      <word_custom><![CDATA[<strong style='font-size:11px;color:red;'>В данной категории еще нет ни одного форума<br />Категори� не будет отображать�� на �айте, незави�имо от на�троек прав до�тупа, до тех пор, пока не будет �одержать хот� бы один форум.</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_savereload</word_key>
+      <word_default>Save and Reload Page</word_default>
+      <word_custom>Сохранить и перезагрузить �траницу</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_saveprev</word_key>
+      <word_default>Save and Edit Previous</word_default>
+      <word_custom>Сохранить и изменить предыдущие</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_savenext</word_key>
+      <word_default>Save and Edit Next</word_default>
+      <word_custom>Сохранить и изменить �ледующие</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_noforumslink</word_key>
+      <word_default>Click here to create a new forum in this category</word_default>
+      <word_custom>�ажмите зде�ь дл� �оздани� нового форума в �той категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_global</word_key>
+      <word_default><![CDATA[<strong>Global Permissions</strong> (All current and future permission sets)]]></word_default>
+      <word_custom>Глобальные права (выбрать в�е текущие и будущие ма�ки)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_noperms</word_key>
+      <word_default>You did not select any permissions, would you like to continue anyway?</word_default>
+      <word_custom>Вы не у�тановили права до�тупа. В�е равно продолжить?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_rulessetup</word_key>
+      <word_default>Forum Rules Setup</word_default>
+      <word_custom>�а�тройки правил форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_saveonly</word_key>
+      <word_default>Save Only</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_rulestitle</word_key>
+      <word_default>Rules Title</word_default>
+      <word_custom>Заголовок правил</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_rulesbutton</word_key>
+      <word_default>Edit Forum Rules</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_rulesdisplay</word_key>
+      <word_default>Display Method</word_default>
+      <word_custom>Спо�об отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_rulestext</word_key>
+      <word_default><![CDATA[Rules Text<br /> (HTML Editing Enabled)]]></word_default>
+      <word_custom><![CDATA[Тек�т<br />HTML включен.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_skinbutton</word_key>
+      <word_default>Edit Forum Skin Options</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_skinchoice</word_key>
+      <word_default>Skin choices for forum:</word_default>
+      <word_custom>У�тановка �тил� дл�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_emptytitle</word_key>
+      <word_default>Empty Forum</word_default>
+      <word_custom>Очи�тка форума </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_skinsub</word_key>
+      <word_default>Apply to all subforums of this forum?</word_default>
+      <word_custom>Применить ко в�ем подфорумам?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_emptysubtitle</word_key>
+      <word_default>Empty forum:</word_default>
+      <word_custom>Очи�тить форум:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_skinapply</word_key>
+      <word_default>Apply which skin to this forum?</word_default>
+      <word_custom>Какой �тиль у�тановить дл� �того форума?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_emptywhich</word_key>
+      <word_default>Forum to empty:</word_default>
+      <word_custom><![CDATA[<strong>Очи�тка форума:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_emptybutton</word_key>
+      <word_default>Empty This Forum (No Undo)</word_default>
+      <word_custom>Удалить в�е в �том форуме (Во��тановление невозможно) </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_deletetitle</word_key>
+      <word_default>Removing Forum:</word_default>
+      <word_custom>Удаление форума: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_deletewhich</word_key>
+      <word_default>Forum to remove</word_default>
+      <word_custom><![CDATA[<strong>Удалить форум:</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_moveparent</word_key>
+      <word_default><![CDATA[Move all <i>subforums for this forum</i> to which forum?]]></word_default>
+      <word_custom><![CDATA[<strong>Перене�ти в�е <i>подфорумы данного форума</i> в форум?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_deletemove</word_key>
+      <word_default><![CDATA[Move all <i>existing topics and posts in this forum</i> to which forum?]]></word_default>
+      <word_custom><![CDATA[<strong>В какой форум переме�тить в�е �уще�твующие <i> темы и �ообщени� в �том форуме </i></strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_deletebutton</word_key>
+      <word_default>Remove Forum</word_default>
+      <word_custom>Удалить форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_basic</word_key>
+      <word_default>Basic Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_password</word_key>
+      <word_default>Forum Password</word_default>
+      <word_custom>Пароль форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_name_forum</word_key>
+      <word_default>Forum Name</word_default>
+      <word_custom>�азвание форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_name_category</word_key>
+      <word_default>Category Name</word_default>
+      <word_custom>Категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_desc</word_key>
+      <word_default>Forum Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_desc_info</word_key>
+      <word_default><![CDATA[You may use HTML - linebreaks automatically converted to &lt;br&gt;]]></word_default>
+      <word_custom><![CDATA[HTML разрешен - перено�ы �трок автоматиче�ки замен�ют�� на &lt;br&gt;.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_ascat</word_key>
+      <word_default>Treat this forum as a category? (No posts in it)</word_default>
+      <word_custom>Сделать форум категорией?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_ascat_info</word_key>
+      <word_default><![CDATA[If this is set to 'Yes' previously posted topics will not display, and posting in this forum will not be allowed.  Users will only be allowed to view the subforums under this forum.  If this is set to yes, the rest of the settings will have no effect.]]></word_default>
+      <word_custom><![CDATA[Е�ли вы выберите «Да», то форум будет категорией, в нем будут запрещено открытие тем и публикаци� �ообщений, �оответ�твенно, в�е ниже�ледующие на�тройки не будут иметь �илы.<br /><br />Е�ли выберите «�ет», то форум будет обычным, в нем будут разрешено открытие тем, публикаци� �ообщений (е�ли �то разрешено).]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_redirect_num</word_key>
+      <word_default>Number of redirect clicks</word_default>
+      <word_custom>Количе�тво нажатий на ��ылку (перемещений)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_parent</word_key>
+      <word_default>Forum Parent</word_default>
+      <word_custom>Родитель�кий форум или категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_redirect_en</word_key>
+      <word_default>Enable URL redirection</word_default>
+      <word_custom>Переключить форум на перемещение?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_redirect</word_key>
+      <word_default>Redirect Settings (Optional)</word_default>
+      <word_custom>�а�тройки переадре�ации (опционально)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_redirect_url</word_key>
+      <word_default>Redirect URL</word_default>
+      <word_custom>URL адре� дл� перемещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_list</word_key>
+      <word_default>Allow members who can see the forum but cannot read topics to see the topic list</word_default>
+      <word_custom><![CDATA[<strong>Разрешить пользовател�м видеть названи� тем в �пи�ке, но запретить им про�мотр �одержимого �тих тем?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_title</word_key>
+      <word_default>Permission Settings</word_default>
+      <word_custom>�а�тройки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>from_f_postable_settings</word_key>
+      <word_default>Postable Settings</word_default>
+      <word_custom>�а�тройки �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_redirect_en_info</word_key>
+      <word_default><![CDATA[If 'yes' you can skip the rest of this form as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when enabled.]]></word_default>
+      <word_custom>При выборе «Да» ниже�ледующие блоки на�троек не будут иметь �илы, так как форум �танет лишь ��ылкой. Уже �уще�твующие темы в форуме будут недо�тупны.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_cust_info</word_key>
+      <word_default><![CDATA[You may use HTML - linebreaks automatically converted to &lt;br&gt;.<br />If left blank, a default 'permission denied' error is used.]]></word_default>
+      <word_custom><![CDATA[HTML разрешен.<br />Перено�ы �трок автоматиче�ки замен�ют�� на тег &lt;br&gt;.<br />Е�ли о�тавить �то поле пу�тым, то (при включенной опции выше) пользовател�м, пытающим�� зайти в тему будет выводить�� �тандартное �ообщение форума.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_cust</word_key>
+      <word_default><![CDATA[Custom 'Permission Denied' Message]]></word_default>
+      <word_custom>Специальное �ообщение, выводимое пользовател�м при попытке зайти в тему (е�ли включен пункт выше)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_hide_info</word_key>
+      <word_default>Useful if you have settings that prohibit some members from seeing posts in this forum while allowing them to see the forum itself</word_default>
+      <word_custom>Полезно, е�ли некоторым пользовател�м запрещено про�матривать �ообщени� в данном форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_list_info</word_key>
+      <word_default>If yes, the member will be able to see the topic titles but will not be able to read the topic posts when clicked.</word_default>
+      <word_custom>При выборе «Да» пользователи �могут видеть только �пи�ок названий тем, но не �могут в них войти.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_title</word_key>
+      <word_default>Postable Forum Settings: Options</word_default>
+      <word_custom>�а�тройки �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_perm_hide</word_key>
+      <word_default>Hide Last Post Info</word_default>
+      <word_custom>Скрыть информацию о по�леднем �ообщении?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_html</word_key>
+      <word_default>Enable HTML Posting (where allowed)</word_default>
+      <word_custom>Разрешить и�пользование HTML (е�ли разрешает ма�ка до�тупа группы)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_html_info</word_key>
+      <word_default>This will allow HTML to be posted and executed for allowed groups.</word_default>
+      <word_custom>Данна� опци� включит выполнение HTML тегов в публикуемых �ообщени�х.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_poll</word_key>
+      <word_default>Enable Polls (per user group option)</word_default>
+      <word_custom>Разрешить �оздание опро�ов (е�ли �то разрешено группе)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_bb</word_key>
+      <word_default>Enable BBCode Posting</word_default>
+      <word_custom>Разрешить и�пользование BB-кодов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_inc</word_key>
+      <word_default>Enable Post Count Incrementation</word_default>
+      <word_custom>Включить �четчик �ообщений пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_bump_info</word_key>
+      <word_default>If enabled, a poll vote will move the topic to the top of the list when sorted by date.</word_default>
+      <word_custom>Е�ли включено, то новый голо� в опро�е поднимет �оответ�твующую тему наверх �пи�ка тем (когда �ортировка идет по дате).</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_bump</word_key>
+      <word_default>Enable Poll Bump</word_default>
+      <word_custom>Разрешить подн�тие тем в �пи�ке при новых голо�ах?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_rate</word_key>
+      <word_default>Enable Topic Rating (per user group option)</word_default>
+      <word_custom>Включить рейтинг тем (е�ли �то разрешено группе)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_min_posts_post</word_key>
+      <word_default>Minimum posts to post</word_default>
+      <word_custom>Минимальное количе�тво �ообщений дл� публикации в �том форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_post_inc_info</word_key>
+      <word_default><![CDATA[If enabled, posts in this forum increase member's cumulative post count.]]></word_default>
+      <word_custom>Отключение данной опции, позволит не учитывать о�тавленные в данном разделе �ообщени� в общем �четчике �ообщений пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_min_posts_post_info</word_key>
+      <word_default>This is the minium number of posts a user must have before they can post in this forum.</word_default>
+      <word_custom>Минимальное количе�тво �ообщений необходимое пользователю дл� возможно�ти пи�ать в �том форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_min_posts_view_info</word_key>
+      <word_default>This is the minium number of posts a user must have before they can view the forum and any posts in it.</word_default>
+      <word_custom>Минимальное количе�тво �ообщений необходимое пользователю дл� возможно�ти про�матривать и пи�ать в �том форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_min_posts_view</word_key>
+      <word_default>Minimum posts to view</word_default>
+      <word_custom>Минимальное количе�тво �ообщений дл� про�мотра �того форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_email_info</word_key>
+      <word_default>This can be left blank. You can enter multiple ones by seperating them with a comma.</word_default>
+      <word_custom><![CDATA[(О�тавьте поле пу�тым, е�ли вам не требуют�� уведомлени�).<br />�дре�а раздел�йте зап�той.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_email</word_key>
+      <word_default>Email addresses to send new topic and new reply awaiting approval notification</word_default>
+      <word_custom>Укажите e-mail адре�а, куда будут отправл�ть�� уведомлени� при по�влении новых тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_en</word_key>
+      <word_default>Enable Posting Moderation</word_default>
+      <word_custom>Премодераци� �ообщений форума перед публикацией?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_en_info</word_key>
+      <word_default>Requires a moderator to manually add posts/topics to the forum.</word_default>
+      <word_custom>При включении опции каждое публикуемое �ообщение должно будет пройти проверку модератором перед непо�ред�твенной публикацией на форум.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_title</word_key>
+      <word_default>Postable Forum Settings: Moderation</word_default>
+      <word_custom>�а�тройки модерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_sort_cutoff</word_key>
+      <word_default>Default date cut off for topic display</word_default>
+      <word_custom>По умолчанию выводить темы за</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_sort_key</word_key>
+      <word_default>Default sort key</word_default>
+      <word_custom>По умолчанию �ортировать по</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_sort_title</word_key>
+      <word_default>Postable Forum Settings: Sorting and Ordering</word_default>
+      <word_custom>�а�тройки �ортировки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_exempt</word_key>
+      <word_default>Exempt Groups</word_default>
+      <word_custom>О�вобожденные группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_exempt_info</word_key>
+      <word_default>If you require a password to access this forum, you can select groups who will not need to enter the password in.</word_default>
+      <word_custom>Е�ли у ва� включен ввод парол�, то вы можете выбрать группы, которые �могут про�матривать �тот форум без ввода парол�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_pass</word_key>
+      <word_default>Forum Password</word_default>
+      <word_custom>Пароль форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_mod_pass_info</word_key>
+      <word_default>Leave this box empty if you do not wish to require this.</word_default>
+      <word_custom><![CDATA[Вы можете заблокировать форум и пу�кать на него только по паролю.<br />Вы можете о�тавить поле пу�тым, чтобы не и�пользовать пароль вообще.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_sort_filter</word_key>
+      <word_default>Default sort filter</word_default>
+      <word_custom>Фильтр �ортировки по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_search</word_key>
+      <word_default>Search for a member</word_default>
+      <word_custom>Пои�к пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_f_sort_order</word_key>
+      <word_default>Default sort order</word_default>
+      <word_custom>Пор�док �ортировки по умолчанию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_choose</word_key>
+      <word_default>Choose from the matches...</word_default>
+      <word_custom>Выберите пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_genset</word_key>
+      <word_default>General Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_choosebutton</word_key>
+      <word_default>Choose Member</word_default>
+      <word_custom>ОК</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_topic</word_key>
+      <word_default>Can edit others topic titles?</word_default>
+      <word_custom>Может измен�ть название тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_edit</word_key>
+      <word_default>Can edit others posts/polls?</word_default>
+      <word_custom>Может редактировать �ообщени�/опро�ы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_delete</word_key>
+      <word_default>Can delete others posts?</word_default>
+      <word_custom>Может удал�ть �ообщени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_ip</word_key>
+      <word_default>Can view posters IP addresses?</word_default>
+      <word_custom>Может видеть IP-адре�а пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_deletetop</word_key>
+      <word_default>Can delete others topics/polls?</word_default>
+      <word_custom>Может удал�ть темы/опро�ы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_open</word_key>
+      <word_default>Can open locked topics?</word_default>
+      <word_custom>Может открывать закрытые темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_move</word_key>
+      <word_default>Can move topics?</word_default>
+      <word_custom>Может перемещать темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_close</word_key>
+      <word_default>Can close open topics?</word_default>
+      <word_custom>Может закрывать темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_unpin</word_key>
+      <word_default>Can unpin topics?</word_default>
+      <word_custom>Может опу�кать темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_pin</word_key>
+      <word_default>Can pin topics?</word_default>
+      <word_custom>Может закрепл�ть темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_split</word_key>
+      <word_default>Can split / merge topics?</word_default>
+      <word_custom>Может �оедин�ть/разъедин�ть темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_closetime</word_key>
+      <word_default>Can set topic close time?</word_default>
+      <word_custom>Может у�танавливать врем� закрыти� темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_opentime</word_key>
+      <word_default>Can set topic open time?</word_default>
+      <word_custom>Может у�танавливать врем� открыти� темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_msettings</word_key>
+      <word_default>Moderator Control Panel Settings</word_default>
+      <word_custom>�а�тройки модератор�кой панели управлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_visible</word_key>
+      <word_default>Can set topics as visible and invisible?</word_default>
+      <word_custom>Может переключать «видимо�ть» тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_massprune</word_key>
+      <word_default>Can mass prune topics?</word_default>
+      <word_custom>Может удал�ть �разу не�колько тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_massmove</word_key>
+      <word_default>Can mass move topics?</word_default>
+      <word_custom>Может перемещать �разу не�колько тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_asettings</word_key>
+      <word_default>Advanced Settings</word_default>
+      <word_custom>Дополнительные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_visiblepost</word_key>
+      <word_default>Can set posts as visible and invisible?</word_default>
+      <word_custom>Может переключать «видимо�ть» �ообщений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_spam</word_key>
+      <word_default>Can flag a member as a spammer?</word_default>
+      <word_custom>Может помечать пользовател� как �памера?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_warn_info</word_key>
+      <word_default>Note, if you enable this moderators will have warn permissions on any users, regardless of forum.  They will only see the warn links within the forums they can moderate, but will not be restricted from warning any member.</word_default>
+      <word_custom>При включении �той опции модератор �может предупреждать любого пользовател� на в�ех форумах</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_mm_info</word_key>
+      <word_default>Important Information</word_default>
+      <word_custom>Важна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_warn</word_key>
+      <word_default>Can warn other users?</word_default>
+      <word_custom>Может предупреждать других пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_m_mm</word_key>
+      <word_default>Can use topic multi-moderation?</word_default>
+      <word_custom>Может и�пользовать мультимодерацию?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_mod_forums</word_key>
+      <word_default>Select Forums</word_default>
+      <word_custom>Выберите форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>frm_canviewothers</word_key>
+      <word_default><![CDATA[Allow posters to view other member's topics]]></word_default>
+      <word_custom>Разрешить авторам про�матривать темы других пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_wrong</word_key>
+      <word_default><![CDATA[Incorrect forum chosen in the 'move to' section of the topic multi-moderation. Please note that you cannot choose to move the topic to a category.]]></word_default>
+      <word_custom>Выбран неверный форум дл� перено�а тем. Пожалуй�та, помните, что вы не можете перено�ить темы в категории.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_update</word_key>
+      <word_default>Update topic multi-moderation entries %s</word_default>
+      <word_custom>Обновлена мульти-модераци� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_valid</word_key>
+      <word_default>You must enter a valid ID. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти корректный ID. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_title</word_key>
+      <word_default>Topic Multi-Moderation</word_default>
+      <word_custom>Мульти-модераци� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_addnew</word_key>
+      <word_default>Add New Multi-Moderation</word_default>
+      <word_custom>Добавить мульти-модерацию тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_edit</word_key>
+      <word_default>Edit Multi-Moderation</word_default>
+      <word_custom>Изменить мульти-модерацию тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_valtitle</word_key>
+      <word_default>You must enter a valid title. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти корректный заголовок. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_forums</word_key>
+      <word_default>You must select some forums to activate with this multi-moderation entry. Please try again.</word_default>
+      <word_custom>Вы должны выбрать хот� бы один форум, чтобы и�пользовать �ту мульти-модерацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_removed</word_key>
+      <word_default>Topic Multi-Mod removed.</word_default>
+      <word_custom>Мульти-модераци� тем удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_noid</word_key>
+      <word_default>We could not resolve the Multi-Mod ID. Please try again.</word_default>
+      <word_custom>�ельз� изменить ID мульти-модерации. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_nav</word_key>
+      <word_default>Topic Multi-Moderation Home</word_default>
+      <word_custom>Мульти-модераци� тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_leave</word_key>
+      <word_default>Leave</word_default>
+      <word_custom>�е трогать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_noinfo</word_key>
+      <word_default>Could not retrieve the information %s</word_default>
+      <word_custom>�е удало�ь получить информацию %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_close</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_unpin</word_key>
+      <word_default>Unpin</word_default>
+      <word_custom>Открепить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_approve</word_key>
+      <word_default>Approve (Set Visible)</word_default>
+      <word_custom>Сделать видимым</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_pin</word_key>
+      <word_default>Pin</word_default>
+      <word_custom>Закрепить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_open</word_key>
+      <word_default>Open</word_default>
+      <word_custom>Открыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_allforums</word_key>
+      <word_default>-- ALL FORUMS --</word_default>
+      <word_custom>-- ВСЕ ФОРУМЫ --</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_nobodymovenobodygethurt</word_key>
+      <word_default><![CDATA[Don't Move]]></word_default>
+      <word_custom>�е перемещать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_titlefor</word_key>
+      <word_default>Title for this Multi-Moderation Suite?</word_default>
+      <word_custom>�азвание мульти-модерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_unapprove</word_key>
+      <word_default>Unapprove (Set Invisible)</word_default>
+      <word_custom>Сделать невидимым</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_activein_desc</word_key>
+      <word_default>You may choose more than one.</word_default>
+      <word_custom>Можете выбрать не�колько форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_activein</word_key>
+      <word_default>Active in Forums...</word_default>
+      <word_custom>Дей�твует в форумах</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_modoptions</word_key>
+      <word_default>Moderation Options</word_default>
+      <word_custom>Дей�тви� (модерации)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_start</word_key>
+      <word_default><![CDATA[Add to <em>START</em> of topic title?]]></word_default>
+      <word_custom><![CDATA[Добавить в <em>��Ч�ЛО</em> названи� темы:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_state</word_key>
+      <word_default>Alter topic state?</word_default>
+      <word_custom>Изменить �о�то�ние темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_end</word_key>
+      <word_default><![CDATA[Add to <em>END</em> of topic title?]]></word_default>
+      <word_custom><![CDATA[Добавить в <em>КО�ЕЦ</em> названи� темы:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_pinned</word_key>
+      <word_default>Alter pinned state?</word_default>
+      <word_custom>Изменить фик�ацию темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_move</word_key>
+      <word_default>Move topic?</word_default>
+      <word_custom>Переме�тить тему?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_approved</word_key>
+      <word_default>Alter approved state?</word_default>
+      <word_custom>Изменить видимо�ть темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_link</word_key>
+      <word_default>Leave a link to the source topic?</word_default>
+      <word_custom>О�тавить ��ылку на и�ходную тему?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_addreply_desc</word_key>
+      <word_default>HTML enabled</word_default>
+      <word_custom>Вы можете и�пользовать HTML-коды в �том �ообщении.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_addreply</word_key>
+      <word_default>Add a reply to the topic?</word_default>
+      <word_custom>Добавить �ообщение в �ту тему?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_postoptions</word_key>
+      <word_default>Post Options</word_default>
+      <word_custom>Опции �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_postcount</word_key>
+      <word_default><![CDATA[Increment poster's post count?]]></word_default>
+      <word_custom>Увеличивать �четчик �ообщений по�ле добавлени� �ообщени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_wordtitle</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_wordedit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_removedlog</word_key>
+      <word_default><![CDATA[Removed Moderator: '%s']]></word_default>
+      <word_custom><![CDATA[Удален модератор: '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_valid</word_key>
+      <word_default>You did not choose a valid moderator ID. Please try again.</word_default>
+      <word_custom>Вы не выбрали корректный ID модератора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_removed</word_key>
+      <word_default>Moderator(s) removed.</word_default>
+      <word_custom>Модератор удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_edited</word_key>
+      <word_default>Moderator(s) edited.</word_default>
+      <word_custom>Модератор изменен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_editedlog</word_key>
+      <word_default><![CDATA[Edited Moderator: '%s']]></word_default>
+      <word_custom>Изменен модератор: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_none</word_key>
+      <word_default>No current Multi-Moderation entries found.</word_default>
+      <word_custom>В на�то�щее врем� нет мульти-модераций</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mm_current</word_key>
+      <word_default>Current Topic Multi-Moderation</word_default>
+      <word_custom>Текущие мульти-модерации тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_nomember</word_key>
+      <word_default>You did not choose a member to add as a moderator. Please try again.</word_default>
+      <word_custom>�евозможно найти пользовател�, которого вы хотите �делать модератором.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_gid</word_key>
+      <word_default>We could not match that group ID. Please try again.</word_default>
+      <word_custom>�евозможно найти группу � таким ID.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_group</word_key>
+      <word_default>Group: </word_default>
+      <word_custom>Группа: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_noforums</word_key>
+      <word_default>You did not choose any forums to add this moderator to. Please try again.</word_default>
+      <word_custom>Вы не выбрали форум, которому вы хотите добавить модератора.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_memid</word_key>
+      <word_default>We could not match that member name or ID. Please try again.</word_default>
+      <word_custom>�евозможно найти пользовател� � таким ID.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_addedmem</word_key>
+      <word_default><![CDATA[Added Member '%s' as a moderator.]]></word_default>
+      <word_custom><![CDATA[Добавлен модератор '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_addedgroup</word_key>
+      <word_default><![CDATA[Added Group '%s' as a moderator.]]></word_default>
+      <word_custom><![CDATA[Добавлена группа модераторов '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_added</word_key>
+      <word_default>Moderator(s) added.</word_default>
+      <word_custom>Модераторы добавлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_nogroup</word_key>
+      <word_default>We could not find that group to add as a moderator. Please try again.</word_default>
+      <word_custom>�евозможно найти группу, пользователей которой вы хотите �делать модераторами.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_addthis</word_key>
+      <word_default>Add This Moderator</word_default>
+      <word_custom>Добавить модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_nonewfor</word_key>
+      <word_default>You did not select any forums that do not have this group or member already moderating.</word_default>
+      <word_custom>Вы не выбрали ни одного форума дл� которых хотите добавить модераторов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_addgroup</word_key>
+      <word_default>Add a Moderator Group</word_default>
+      <word_custom>Добавление группы модераторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_edithis</word_key>
+      <word_default>Edit This Moderator</word_default>
+      <word_custom>Редактировать модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_add</word_key>
+      <word_default>Add a Moderator</word_default>
+      <word_custom>Добавление модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_edit</word_key>
+      <word_default>Editing a Moderator</word_default>
+      <word_custom>Редактирование модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_mid</word_key>
+      <word_default>We could not retrieve that moderator record. Please try again.</word_default>
+      <word_custom>Модератор не �уще�твует в �и�теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_setid</word_key>
+      <word_default>Could not resolve the permission set ID. Please try again.</word_default>
+      <word_custom>�ельз� произве�ти изменени� в ма�ках до�тупа �тому ID. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_also</word_key>
+      <word_default>Also using: </word_default>
+      <word_custom>Также и�пользуют��: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_start</word_key>
+      <word_default><![CDATA[<b>Start Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Создание тем</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_upload</word_key>
+      <word_default><![CDATA[<b>Upload Attachments</b> to this forum]]></word_default>
+      <word_custom><![CDATA[<b>Загрузка файлов</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_reply</word_key>
+      <word_default><![CDATA[<b>Reply to Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Публикаци� ответов</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_show</word_key>
+      <word_default><![CDATA[<b>See</b> this forum]]></word_default>
+      <word_custom><![CDATA[<b>Про�мотр</b> �того форума]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mod_noresults</word_key>
+      <word_default>Sorry, we could not find any members that matched the search you entered. Please try again.</word_default>
+      <word_custom>�евозможно найти пользователей по вашему запро�у. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_memid</word_key>
+      <word_default>Could not resolve the member ID. Please try again.</word_default>
+      <word_custom>�евозможно найти ID пользовател�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_download</word_key>
+      <word_default><![CDATA[<b>Download Attachments</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Скачивание файлов </b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_read</word_key>
+      <word_default><![CDATA[<b>Read Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Чтение тем</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_start_m</word_key>
+      <word_default>Start Topics</word_default>
+      <word_custom>Создание тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_show_m</word_key>
+      <word_default>See Forum</word_default>
+      <word_custom>Про�мотр форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_reply_m</word_key>
+      <word_default>Reply To Topics</word_default>
+      <word_custom>Ответ в темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_upload_m</word_key>
+      <word_default>Upload To Forum</word_default>
+      <word_custom>Загрузку файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_read_m</word_key>
+      <word_default>Read Topics</word_default>
+      <word_custom>Чтение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_download_m</word_key>
+      <word_default>Download From Forum</word_default>
+      <word_custom>Скачивание файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_updated</word_key>
+      <word_default>Forum Access Permissions Updated!</word_default>
+      <word_custom>Ма�ки до�тупа форума обновлены</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_groupid</word_key>
+      <word_default>Could not resolve that group ID. Please try again.</word_default>
+      <word_custom>�ельз� изменить ID группы. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_editedlog</word_key>
+      <word_default><![CDATA[Forum Access Permissions Edited For Set: '%s']]></word_default>
+      <word_custom>Права до�тупа на форум отредактированы дл� ма�ки: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_removed</word_key>
+      <word_default>Forum Access Permission Set Removed!</word_default>
+      <word_custom>Ма�ка до�тупа удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_added</word_key>
+      <word_default><![CDATA[The permission set '%s' has been added!]]></word_default>
+      <word_custom><![CDATA[Ма�ка до�тупа '%s' добавлена! ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_entername</word_key>
+      <word_default>You must enter a name. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти название. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_addedit</word_key>
+      <word_default>Manage Permissions</word_default>
+      <word_custom>Управление ма�ками до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_title_edit_msg</word_key>
+      <word_default>Add/Edit Permissions</word_default>
+      <word_custom>Добавить/Изменить ма�ку до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_title_edit</word_key>
+      <word_default>Editing Forum Permission Sets</word_default>
+      <word_custom>Изменение ма�ок до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_title</word_key>
+      <word_default>Forum Permission Set Management</word_default>
+      <word_custom>Управление правами до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_global</word_key>
+      <word_default>Global</word_default>
+      <word_custom>Глобально</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_notused</word_key>
+      <word_default>Not Used</word_default>
+      <word_custom>�е и�пользует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_none</word_key>
+      <word_default><![CDATA[<em>Set not assigned to any group...</em>]]></word_default>
+      <word_custom><![CDATA[<em>Ма�ка не и�пользует��</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_membersusing</word_key>
+      <word_default>Members using: </word_default>
+      <word_custom>Пользователи, и�пользующие: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_removecustom</word_key>
+      <word_default>Removed the custom set of permissions from: </word_default>
+      <word_custom>Ма�ка до�тупа удалена дл�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_posts</word_key>
+      <word_default>Posts: </word_default>
+      <word_custom>Сообщений: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_userdetail</word_key>
+      <word_default>User Details</word_default>
+      <word_custom>Данные пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_action</word_key>
+      <word_default>Action</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_result</word_key>
+      <word_default>Result</word_default>
+      <word_custom>Результат</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_removeall</word_key>
+      <word_default>Remove all custom permission sets</word_default>
+      <word_custom><![CDATA[Удалить в�е пользователь�кие ма�ки до�тупа'>Удалить в�е пользователь�кие ма�ки до�тупа]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_removethis</word_key>
+      <word_default>Remove this permission set from the user (will not remove all if they use more than one)</word_default>
+      <word_custom><![CDATA[Убрать �ту ма�ку до�тупа у пользовател�'>Убрать �ту ма�ку до�тупа]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_legend</word_key>
+      <word_default><![CDATA[Legend & Info]]></word_default>
+      <word_custom>Легенда</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_can</word_key>
+      <word_default>Can: </word_default>
+      <word_custom>Может: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_email</word_key>
+      <word_default>Email: </word_default>
+      <word_custom>E-mail: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_alsousing</word_key>
+      <word_default>Also Using: </word_default>
+      <word_custom>Также и�пользуют��: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_cannot</word_key>
+      <word_default>CANNOT: </word_default>
+      <word_custom>�Е МОЖЕТ: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_testwith</word_key>
+      <word_default>Test with...</word_default>
+      <word_custom>Проверить �</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_category</word_key>
+      <word_default><![CDATA[Category (doesn't use this permission)]]></word_default>
+      <word_custom>Категори� (�та ма�ка не и�пользует��)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_setname</word_key>
+      <word_default>Permission Set Name</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_rename</word_key>
+      <word_default>Rename Permission Set: </word_default>
+      <word_custom>Переименовать ма�ку до�тупа: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_updatebutton</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_forumname</word_key>
+      <word_default>Forum Name</word_default>
+      <word_custom>�азвание форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_editbutton</word_key>
+      <word_default>Edit Name</word_default>
+      <word_custom>Изменить им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_reply_c</word_key>
+      <word_default>Reply</word_default>
+      <word_custom>Ответ в темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_read_c</word_key>
+      <word_default>Read</word_default>
+      <word_custom>Чтение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_show_c</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Про�мотр тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_nomember</word_key>
+      <word_default><![CDATA[<em>Not used as override on any accounts...</em>]]></word_default>
+      <word_custom><![CDATA[<em>Ма�ка не и�пользует��</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_upload_c</word_key>
+      <word_default>Upload</word_default>
+      <word_custom>Загрузка файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_download_c</word_key>
+      <word_default>Download</word_default>
+      <word_custom>Скачивание файлов </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_usedgroups</word_key>
+      <word_default>Used by Group(s)</word_default>
+      <word_custom>И�пользует�� группами</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_start_c</word_key>
+      <word_default>Start</word_default>
+      <word_custom>Создание тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>�азвание ма�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_usedmembers</word_key>
+      <word_default>Used by Member(s)</word_default>
+      <word_custom>И�пользует�� пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_user</word_key>
+      <word_default>User</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_viewnames</word_key>
+      <word_default>View the member names of those using this permission set in a new window</word_default>
+      <word_custom>Отображает пользователей, и�пользующих �ту ма�ку до�тупа (в отдельном окне)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_inuse</word_key>
+      <word_default><![CDATA[<em>In Use (Cannot Delete)</em>]]></word_default>
+      <word_custom><![CDATA[<em>И�пользует�� (нельз� удалить)</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_deleteset</word_key>
+      <word_default>Delete Permission Set...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_editset</word_key>
+      <word_default>Edit Permission Set...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_previewset</word_key>
+      <word_default>Preview Permission Set...</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_createbutton</word_key>
+      <word_default>Create</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_previewtext</word_key>
+      <word_default>See what this group can see...</word_default>
+      <word_custom>Про�мотр того что может видеть группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_createnew</word_key>
+      <word_default>Create a new permission set</word_default>
+      <word_custom>Создание новой ма�ки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>per_baseon</word_key>
+      <word_default><![CDATA[<strong>Base this permission set on which existing set...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�а�ледовать права от:</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_yes1</word_key>
+      <word_default>Yes (Not allowed to change vote)</word_default>
+      <word_custom>Да (без права изменени� голо�а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_reply_own_topics</word_key>
+      <word_default>Can reply to OWN topics?</word_default>
+      <word_custom>Могут публиковать ответы в СВОИХ темах?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_applyguest</word_key>
+      <word_default><![CDATA[<i>(Does not apply to guests)</i>]]></word_default>
+      <word_custom><![CDATA[<i>(�е применительно к го�т�м</i>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_edit_posts</word_key>
+      <word_default>Can edit own posts?</word_default>
+      <word_custom>Может редактировать �вои �ообщени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_reply_other_topics</word_key>
+      <word_default>Can reply to OTHER members topics (where allowed)?</word_default>
+      <word_custom>Могут публиковать ответы на ЧУЖИЕ темы (где разрешено)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_topic_rate_setting</word_key>
+      <word_default>Can rate topics (in forums where allowed)?</word_default>
+      <word_custom>Могут оценивать темы (где �то разрешено)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_other_topics</word_key>
+      <word_default>Can view other members topics?</word_default>
+      <word_custom>Могут про�матривать темы, �озданные другими пользовател�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_post_new_topics</word_key>
+      <word_default>Can post new topics (where allowed)?</word_default>
+      <word_custom>Могут �оздавать новые темы (где разрешено)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_yes2</word_key>
+      <word_default>Yes (Allowed to change vote)</word_default>
+      <word_custom>Да (� правом изменени� голо�а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_forperm</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_edit_cuttoff_info</word_key>
+      <word_default>Denies user edit after the time set has passed. Leave blank or enter 0 for no restriction</word_default>
+      <word_custom>Врем�, в течение которого можно редактировать �ообщение �разу по�ле публикации.&#13;
+Введите 0 дл� отключени� ограничени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_edit_cutoff</word_key>
+      <word_default>Edit time restriction (in minutes)?</word_default>
+      <word_custom>Могут редактировать �ообщени� в течение Х минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_delete_own_posts</word_key>
+      <word_default><![CDATA[Can 'Hard Delete' own posts?]]></word_default>
+      <word_custom>Может удал�ть �вои �ообщени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_append_edit</word_key>
+      <word_default><![CDATA[Allow user to remove 'Edited by' legend?]]></word_default>
+      <word_custom><![CDATA[Разрешить убрать надпи�ь "Отредактировано"?]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>g_open_close_posts</word_key>
+      <word_default>Can open/close own topics?</word_default>
+      <word_custom>Могут открывать/закрывать �вои темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_edit_topic</word_key>
+      <word_default>Can edit own topic titles?</word_default>
+      <word_custom>Может измен�ть название и опи�ание �воих тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_delete_own_topics</word_key>
+      <word_default><![CDATA[Can 'Hard Delete' own topics?]]></word_default>
+      <word_custom>Может удал�ть �вои темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_post_polls</word_key>
+      <word_default>Can start new polls (where allowed)?</word_default>
+      <word_custom>Могут �оздавать новые опро�ы (где разрешено)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_vote_polls</word_key>
+      <word_default>Can vote in polls (where allowed)?</word_default>
+      <word_custom>Могут голо�овать (где разрешено)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_avoid_flood</word_key>
+      <word_default>Can avoid flood control?</word_default>
+      <word_custom>Может обходить флуд-контроль?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_avoid_q</word_key>
+      <word_default>Can avoid moderation queues?</word_default>
+      <word_custom>Может обходить премодерацию?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_post_closed</word_key>
+      <word_default><![CDATA[Allow user group to post in 'closed' topics?]]></word_default>
+      <word_custom>Могут публиковать ответы в «закрытых» темах</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>gf_mod_preview</word_key>
+      <word_default>Moderate posts of everyone in this group?</word_default>
+      <word_custom>Модерировать �ообщени� в�ех пользователей �той группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_nodir</word_key>
+      <word_default>Could not locate that directory. Please try again.</word_default>
+      <word_custom>�евозможно найти директорию. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_deltitle</word_key>
+      <word_default><![CDATA[Delete All Member's Posts...]]></word_default>
+      <word_custom>Удалить в�е �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_clearsubs</word_key>
+      <word_default>Un-watch all from forum</word_default>
+      <word_custom>Отпи�ать в�ех от форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_subs_redirect</word_key>
+      <word_default>The member is no longer watching any forums or topics</word_default>
+      <word_custom>Пользователь больше не подпи�ан на форумы и темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_nopermban</word_key>
+      <word_default>You do not have permission to ban a member.</word_default>
+      <word_custom>�едо�таточно прав чтобы забанить пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_selectcat</word_key>
+      <word_default><![CDATA[&lt; Select A Category &gt;]]></word_default>
+      <word_custom><![CDATA[&lt; Выберите категорию &gt;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_delsubs</word_key>
+      <word_default>Clear All Watched Topics and Forums...</word_default>
+      <word_custom>Отпи�ать от в�ех тем и форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_override</word_key>
+      <word_default>Override permissions with....</word_default>
+      <word_custom>Переопределить права до�тупа правами</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_modprev</word_key>
+      <word_default>Moderator Preview of Posts</word_default>
+      <word_custom>Требует�� проверка модератором в�ех �ообщений пользовател�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_hours</word_key>
+      <word_default>Hours</word_default>
+      <word_custom>ча�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_days</word_key>
+      <word_default>Days</word_default>
+      <word_custom>дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_orfor</word_key>
+      <word_default><![CDATA[<strong>Or for</strong>]]></word_default>
+      <word_custom>или на</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_subsf_redirect</word_key>
+      <word_default>All members are no longer watching this forum</word_default>
+      <word_custom>В�е пользователи больше не подпи�аны на �тот форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_restrict</word_key>
+      <word_default>Restrict from Posting</word_default>
+      <word_custom>Запретить пользователю публиковать �ообщени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_modindef</word_key>
+      <word_default>Moderator Preview Indefinitely</word_default>
+      <word_custom>в�егда провер�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_details</word_key>
+      <word_default><![CDATA[Forum Details & Restrictions]]></word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_restrictindef</word_key>
+      <word_default>Restrict Posting Indefinitely</word_default>
+      <word_custom>нав�егда запретить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>m_permrestrict</word_key>
+      <word_default><![CDATA[Posting &amp; Access Restrictions]]></word_default>
+      <word_custom>�а�тройки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_change_button</word_key>
+      <word_default>Change...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_posts_title</word_key>
+      <word_default>Delete Posts/Topics For:</word_default>
+      <word_custom>Удаление �ообщений/тем пользовател� </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_posts_desc</word_key>
+      <word_default>If enabled: a topic started by this member that has no replies is deleted otherwise the topic is left.</word_default>
+      <word_custom>Позвол�ет удалить в�е �ообщени� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_posts</word_key>
+      <word_default><![CDATA[Delete ALL of this member's <span style='color:red'>%s</span> POSTS?]]></word_default>
+      <word_custom>Удалить ВСЕ %s СООБЩЕ�ИЙ �того пользовател�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_process</word_key>
+      <word_default>Process...</word_default>
+      <word_custom>Запу�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_title</word_key>
+      <word_default>Delete Member Posts / Topics</word_default>
+      <word_custom>Удаление �ообщений / Тем пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_pergo_desc</word_key>
+      <word_default>Deleting posts and topics is fairly intensive.</word_default>
+      <word_custom>Удаление �ообщений и тем ре�ур�оемка� операци�, не рекомендуем указывать большое чи�ло удал�емых объектов за раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_title_desc</word_key>
+      <word_default>This section allows you to remove all posts and or topics started by a member</word_default>
+      <word_custom>В �том разделе вы �можете удалить в�е �ообщени� и в�е темы пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_posts_process_more</word_key>
+      <word_default>%s posts processed (%s posts and %s topics examined)...</word_default>
+      <word_custom>%s �ообщений обработано (проверено �ообщений: %s, тем: %s )... </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_posts_process_done</word_key>
+      <word_default>Complete!</word_default>
+      <word_custom>Завершено!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_posts_next_step</word_key>
+      <word_default>Topics completed, proceeding to posts...</word_default>
+      <word_custom>Темы завершены, далее �ообщени�...</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_pergo</word_key>
+      <word_default><![CDATA[Delete <em>n</em> posts/topics per iteration]]></word_default>
+      <word_custom>Удал�ть по n �ообщений/тем за раз</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_topics_desc</word_key>
+      <word_default><![CDATA[If enabled: all topics started by this member will be deleted, regardless of other member's replies.]]></word_default>
+      <word_custom>Позвол�ет удалить в�е темы, открытые �тим пользователем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>mem_delete_delete_topics</word_key>
+      <word_default><![CDATA[Delete ALL of this member's <span style='color:red'>%s</span>  TOPICS?]]></word_default>
+      <word_custom>Удалить ВСЕ %s ТЕМ �того пользовател�?</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5749,29 +3985,13 @@
       <word_key>t_noposts</word_key>
       <word_default>This member has no posts to delete. Please select another member.</word_default>
       <word_custom>У �того пользовател� нет �ообщений дл� удалени�. Выберите другого пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_forums</word_pack>
-      <word_key>t_badavext</word_key>
-      <word_default>You do not accept that file type on this board for avatars.</word_default>
-      <word_custom>Данный тип файла не разрешен дл� аватара.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>perm_forums_view</word_key>
-      <word_default>Show Forum</word_default>
-      <word_custom>Про�мотр форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>t_noid</word_key>
+      <word_default>The member does not exist. Please try again.</word_default>
+      <word_custom>Пользователь не �уще�твует. Попробуйте еще раз.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5779,9 +3999,6 @@
       <word_key>perm_forums_read</word_key>
       <word_default>Read Topics</word_default>
       <word_custom>Чтение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5789,19 +4006,6 @@
       <word_key>perm_forums_reply</word_key>
       <word_default>Reply Topics</word_default>
       <word_custom>Ответ в темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_forums</word_pack>
-      <word_key>perm_forums_start</word_key>
-      <word_default>Start Topics</word_default>
-      <word_custom>Создание тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5809,9 +4013,20 @@
       <word_key>perm_forums_upload</word_key>
       <word_default>Upload</word_default>
       <word_custom>Загрузка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>perm_forums_view</word_key>
+      <word_default>Show Forum</word_default>
+      <word_custom>Про�мотр форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_forums</word_pack>
+      <word_key>perm_forums_start</word_key>
+      <word_default>Start Topics</word_default>
+      <word_custom>Создание тем</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5819,39 +4034,6 @@
       <word_key>perm_forums_download</word_key>
       <word_default>Download</word_default>
       <word_custom>Скачивание файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_member_form</word_pack>
-      <word_key>memchangeavatar</word_key>
-      <word_default>Change Avatar</word_default>
-      <word_custom>Изменить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_member_form</word_pack>
-      <word_key>m_overrride</word_key>
-      <word_default>Override group permission masks with...</word_default>
-      <word_custom>Переопределить права группы �ледующими ма�ками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_member_form</word_pack>
-      <word_key>mem_change_button</word_key>
-      <word_default>Change...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -5859,1309 +4041,20 @@
       <word_key>mem_posts</word_key>
       <word_default>Posts</word_default>
       <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_member_form</word_pack>
-      <word_key>mem_remove_avatar</word_key>
-      <word_default>Remove Avatar</word_default>
-      <word_custom>Удалить аватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_change_button</word_key>
+      <word_default>Change...</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_member_form</word_pack>
-      <word_key>strong_avatar_label</word_key>
-      <word_default>Avatar</word_default>
-      <word_custom>�ватар</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_edit</word_key>
-      <word_default>Edit RSS Import Stream...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_delete</word_key>
-      <word_default>Delete RSS Import Stream...</word_default>
-      <word_custom>Удалить поток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_thefeeds</word_key>
-      <word_default>RSS Import Streams</word_default>
-      <word_custom>Потоки RSS Импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_rss</word_key>
-      <word_default>RSS</word_default>
-      <word_custom>Потоки RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_quickval</word_key>
-      <word_default>Quick-Validate an RSS Stream?</word_default>
-      <word_custom>Бы�тра� проверка потока</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_enturl</word_key>
-      <word_default><![CDATA[<strong>Enter the URL:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Введите ��ылку:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_valbutton</word_key>
-      <word_default>Validate Stream</word_default>
-      <word_custom>Проверить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_refresh</word_key>
-      <word_default><![CDATA[<strong>RSS Import Refresh</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Ча�тота обновлени�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_refresh_info</word_key>
-      <word_default><![CDATA[Checks for new articles every <em>n</em> minutes. Minimum of 30 minutes, regardless of input.]]></word_default>
-      <word_custom>Провер�ть новые RSS запи�и каждые n минут. Минимум 30 минут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_pergo</word_key>
-      <word_default><![CDATA[<strong>RSS Import Per Go</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво импортируемых запи�ей за обновление</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_pergo_info</word_key>
-      <word_default><![CDATA[Imports <em>n</em> articles per update. Importing is moderately resource intensive.]]></word_default>
-      <word_custom><![CDATA[Импортировать <em>n</em> запи�ей за обновление. Импортирование довольно т�желый проце��.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_settings</word_key>
-      <word_default><![CDATA[<strong>RSS Import Settings</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�а�тройки импорта</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_prefix</word_key>
-      <word_default><![CDATA[<strong>RSS Import Topic Prefix</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Префик� тем</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_prefix_info</word_key>
-      <word_default><![CDATA[This prefix will be added to the beginning of the RSS item's title]]></word_default>
-      <word_custom>Префик�, который будет добавлен перед заголовком RSS запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_hidden_info</word_key>
-      <word_default><![CDATA[If 'yes' the topic will be posted as invisible. 'No', topic will be visible]]></word_default>
-      <word_custom>Е�ли «Да», то будет �оздана невидима� тема. «�ет» — тема видима�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_hidden</word_key>
-      <word_default><![CDATA[<strong>RSS Import Topic Hidden</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�евидимо�ть тем</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_open_info</word_key>
-      <word_default><![CDATA[If 'yes' the topic will be posted as open. 'No', topic will be closed]]></word_default>
-      <word_custom>Е�ли «Да», то тема будет �оздана открыта�. «�ет» — тема будет закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_open</word_key>
-      <word_default><![CDATA[<strong>RSS Import Topic Open</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Открыто�ть тем</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_link_info</word_key>
-      <word_default><![CDATA[BBCode allowed: {url} = URL to article<br />If completed, this will add a link to the article source (if available) to the post body]]></word_default>
-      <word_custom><![CDATA[BB-код разрешен: {url} = URL к запи�и<br />Е�ли �то поле заполнено, то к �ообщению будет добавлена ��ылка на и�точник, откуда вз�та RSS запи�ь]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_link_other</word_key>
-      <word_default>*Leave blank to not include a link in the post</word_default>
-      <word_custom>*О�тавьте поле пу�тым, чтобы не включать ��ылку в �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_link</word_key>
-      <word_default><![CDATA[<strong>RSS Import Add Link To Post</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Добавл�ть ��ылку и�точника</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_incpost_info</word_key>
-      <word_default><![CDATA[This will increment this poster's post count in forums where post counts are enabled]]></word_default>
-      <word_custom>При публикации новой темы из RSS, пользователю, от чьего имени была �оздана �та темы, будет увеличен �четчик �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_poster</word_key>
-      <word_default><![CDATA[<strong>RSS Import Poster's Name</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�втор запи�ей</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_poster_info</word_key>
-      <word_default><![CDATA[This will post the RSS topic under this person's account (member display name)]]></word_default>
-      <word_custom>От �того имени будет публиковать�� тема � RSS запи�ью (отображаемое им�)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_incpost</word_key>
-      <word_default><![CDATA[<strong>RSS Import Increment Poster's Post Count</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Увеличивать �четчик �ообщений при RSS Импорте</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_html</word_key>
-      <word_default><![CDATA[<strong>RSS Import Preserve HTML</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Сохранить HTML?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_html_info</word_key>
-      <word_default><![CDATA[If yes, raw HTML is preserved along with any 'badwords' - you MUST have HTML enabled when editing imported posts or HTML will be removed upon edit. If no, HTML is converted to BBCode where possible.]]></word_default>
-      <word_custom>Е�ли да, HTML будет �охранен — вы об�заны включить HTML на форуме, чтобы была возможно�ть редактировать импортируемые запи�и. Е�ли нет, HTML будет конвертировать�� по возможно�ти в BB-код.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_forum</word_key>
-      <word_default><![CDATA[<strong>RSS Import Into Forum</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Импортировать в форумы</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_forum_info</word_key>
-      <word_default>Choose a forum to import each RSS item as a new topic</word_default>
-      <word_custom>Выберите форум, в который импортировать каждую RSS запи�ь, как новую тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_ht_user</word_key>
-      <word_default><![CDATA[<strong>RSS Import Stream Username</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Им� пользовател�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_ht_pass</word_key>
-      <word_default><![CDATA[<strong>RSS Import Stream Password</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пароль</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_content</word_key>
-      <word_default><![CDATA[<strong>RSS Import Content</strong>]]></word_default>
-      <word_custom>Содержимое RSS </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_ht_info</word_key>
-      <word_default>Most streams do not require authentication</word_default>
-      <word_custom>Дл� большин�тва потоков не требует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_ht_require</word_key>
-      <word_default><![CDATA[<strong>Does this stream require .htaccess Authentication?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Этот поток требует .htaccess аутентификацию?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_htaccess</word_key>
-      <word_default><![CDATA[<strong>RSS Import htaccess Authentication</strong>]]></word_default>
-      <word_custom>.htaccess аутентификаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_enabled</word_key>
-      <word_default><![CDATA[<strong>RSS Import Enabled</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Включить импорт?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_charset_info</word_key>
-      <word_default>Examples: ISO-8859-1, UTF-8. Use UTF-8 if in doubt.</word_default>
-      <word_custom>Пример: ISO-8859-1, UTF-8. И�пользуйте UTF-8, е�ли �омневаете�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_charset</word_key>
-      <word_default><![CDATA[<strong>RSS Import Stream Character Set</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Кодировка потока</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_url_info</word_key>
-      <word_default>This must be an RDF or RSS feed</word_default>
-      <word_custom>Это должно быть RDF или RSS поток.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_url</word_key>
-      <word_default><![CDATA[<strong>RSS Import Stream URL</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>С�ылка на поток</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_title</word_key>
-      <word_default><![CDATA[<strong>RSS Import Stream Title</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�азвание</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_blankremove</word_key>
-      <word_default>Leave blank to remove them all</word_default>
-      <word_custom>О�тавьте поле пу�тым дл� удалени� в�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_removenoconf</word_key>
-      <word_default>Remove (No more confirmation screens!)</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_basics</word_key>
-      <word_default><![CDATA[<strong>RSS Import Basics</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>RSS Импорт</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_removelast</word_key>
-      <word_default><![CDATA[<strong>Remove the last <em>n</em> imported topics</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Удалить по�ледние <em>n</em> импортированных тем</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_removetopics</word_key>
-      <word_default>Remove Posted Topics From Stream: </word_default>
-      <word_custom>Удалить темы из потока: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_articlecount</word_key>
-      <word_default><![CDATA[You may remove topics that have been posted from an RSS import stream. This stream has created <strong>%s</strong> topic(s).]]></word_default>
-      <word_custom><![CDATA[Вы можете удалить темы, которые были опубликованы, из потока RSS. Этот поток был �оздан � <strong>%s</strong> темами.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_cache_info</word_key>
-      <word_default><![CDATA[Updates the RSS cache every <em>n</em> minutes]]></word_default>
-      <word_custom><![CDATA[Обновл�ть кеш RSS каждые <em>n</em> минут]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_forums</word_key>
-      <word_default>Export Topics From Forum(s)</word_default>
-      <word_custom>Эк�портировать темы из форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_forums_info</word_key>
-      <word_default><![CDATA[IMPORTANT: No permission checks are done. Topics will be exported from chosen forums regardless of the viewer's permissions.]]></word_default>
-      <word_custom>В�Ж�О: Ма�ки до�тупа не работают зде�ь. Темы будут �к�портированы из выбранных форум, незави�имо от ма�ок до�тупа к форумам.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_cache</word_key>
-      <word_default>RSS Export Cache Frequency</word_default>
-      <word_custom>RSS Эк�порт: Ча�тота обновлени� кеша</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_sort</word_key>
-      <word_default>RSS Export Sort By</word_default>
-      <word_custom>Сортировать RSS Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_numitem_info</word_key>
-      <word_default><![CDATA[Exports <em>n</em> number of topics]]></word_default>
-      <word_custom><![CDATA[Эк�портировано <em>n</em> тем ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_order</word_key>
-      <word_default>RSS Export Order By Field</word_default>
-      <word_custom>Сортировать RSS Эк�порт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_numitem</word_key>
-      <word_default>RSS Export No. Items</word_default>
-      <word_custom>Количе�тво тем RSS Эк�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_img_info</word_key>
-      <word_default>Used to show an image in RSS readers</word_default>
-      <word_custom>Дл� отображени� изображени� в программах дл� чтени� RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_optional</word_key>
-      <word_default>* Optional</word_default>
-      <word_custom>*Опционально</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_enabled</word_key>
-      <word_default>RSS Export Enabled</word_default>
-      <word_custom>Включен?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_firstpost</word_key>
-      <word_default>RSS Export Includes First Post of Topic</word_default>
-      <word_custom>В RSS Эк�порт включать первое �ообщение темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_title</word_key>
-      <word_default>RSS Export Stream (Channel) Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_desc</word_key>
-      <word_default>RSS Export Stream (Channel) Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_img</word_key>
-      <word_default>RSS Export Stream Image</word_default>
-      <word_custom>Изображение потока</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_update</word_key>
-      <word_default>Update All RSS Export Caches...</word_default>
-      <word_custom>Обновить в�е кеши RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_recache</word_key>
-      <word_default>Recache RSS Export Stream...</word_default>
-      <word_custom>Обновить в�е кеши RSS Эк�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_create</word_key>
-      <word_default>Create New RSS Export Stream...</word_default>
-      <word_custom>Создать новый поток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_delete</word_key>
-      <word_default>Delete RSS Export Stream...</word_default>
-      <word_custom>Удалить поток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_edit</word_key>
-      <word_default>Edit RSS Export Stream...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_enabled</word_key>
-      <word_default>Enabled</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_desc</word_key>
-      <word_default>RSS Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_ex_streams</word_key>
-      <word_default>RSS Export Streams</word_default>
-      <word_custom>Потоки RSS Эк�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_title</word_key>
-      <word_default>RSS Title</word_default>
-      <word_custom>�азвание потока</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noinc</word_key>
-      <word_default><![CDATA[The specified forum does not allow posts to increment user's post count - importer's post count will <i>not</i> be incremented.]]></word_default>
-      <word_custom><![CDATA[В указанном форуме не включен �четчик �ообщений пользователей — �четчик �ообщений пользовател� <i>не</i> будет увеличен.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_redforum</word_key>
-      <word_default>The specified forum is either a redirect forum, or a category, and cannot display new topics.</word_default>
-      <word_custom>Указанный форум — форум переадре�ации или категори�, или же невозможно открывать новые темы в нем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_memval</word_key>
-      <word_default>We could not validate the member used to import articles.</word_default>
-      <word_custom>Мы не можем разрешить пользовател�, и�пользуемого дл� импорта �татей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nodesc</word_key>
-      <word_default>At least one article was missing a title or a description/content field. If all articles are missing both fields, nothing would import. Otherwise IP.Board would skip just the items missing both a title and content.</word_default>
-      <word_custom>�е менее, чем одна �тать� имеет некорректный заголовок или �одержание. Е�ли в�е �татьи имеют оба некорректных пол�, ничего не импортирует��. IPB пропу�тит �ти данные.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_invdate</word_key>
-      <word_default>An invalid date was found in at least one of the RSS articles -- current time will be used instead.</word_default>
-      <word_custom>�айдена некорректна� дата в не менее, чем одной RSS �татье — будет и�пользовать�� текущее врем�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nodate</word_key>
-      <word_default>A date was not found in at least one of the RSS articles -- current time will be used instead.</word_default>
-      <word_custom>Дата не найдена в не менее, чем одной RSS �татье — будет и�пользовать�� текущее врем�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_topiccount</word_key>
-      <word_default>We found %s article(s)/topic(s) in the RSS feed.</word_default>
-      <word_custom>�айдено %s �татей/тем в RSS.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nocontent</word_key>
-      <word_default>We could not find any actual content to import (topics, news articles, etc.)</word_default>
-      <word_custom>�е найдено на�то�щего контента (темы, ново�ти и т.д.) (нечего импортировать)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nocharset</word_key>
-      <word_default><![CDATA[We could not determine the feed's character set.]]></word_default>
-      <word_custom>�евозможно определить кодировку RSS.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_charset_cor</word_key>
-      <word_default><![CDATA[The RSS feed's charset is <em>%s</em> (correct).]]></word_default>
-      <word_custom><![CDATA[Кодировка RSS — <em>%s</em> (корректна�)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nochannels</word_key>
-      <word_default>We could not find any changes in the RSS feed (nothing to import). If you believe you received this in error, please contacting the site that serves the feed.</word_default>
-      <word_custom>�евозможно найти какие-либо изменений в указанной RSS (нечего импортировать). Е�ли вы �читаете, что �то ошибка, пожалуй�та, �в�жите�ь � �айтом, который предо�тавл�ет поток.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_charset</word_key>
-      <word_default><![CDATA[The RSS feed's charset is <em>%s</em>.]]></word_default>
-      <word_custom><![CDATA[Кодировка RSS — <em>%s</em>. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_doc_type</word_key>
-      <word_default><![CDATA[The RSS feed's charset is <em>%s</em>, but you entered <em>%s</em>.]]></word_default>
-      <word_custom><![CDATA[Кодировка RSS — <em>%s</em>, но вы указали — <em>%s</em>. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_http</word_key>
-      <word_default>HTTP Status Code: </word_default>
-      <word_custom>HTTP Код �тату�а: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_recached</word_key>
-      <word_default>RSS Import(s) Recached!</word_default>
-      <word_custom>Кеш RSS обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nourl</word_key>
-      <word_default>There was no URL entered to validate. Please try again.</word_default>
-      <word_custom>URL адре� дл� проверки не введен. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noitems</word_key>
-      <word_default>No RSS items to import.</word_default>
-      <word_custom>�ет RSS запи�ей дл� импортировани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_notitle</word_key>
-      <word_default><![CDATA[Skipping '%s'. No title or content.]]></word_default>
-      <word_custom><![CDATA[Пропущено: '%s'.  �ет названи� или �одержани�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noimport</word_key>
-      <word_default> has no items to import.</word_default>
-      <word_custom> нет данных в канале дл� импорта.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_save</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_full</word_key>
-      <word_default><![CDATA[[url={url}]View the full article[/url]]]></word_default>
-      <word_custom><![CDATA[[url={url}]Читать дальше[/url]]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_edit</word_key>
-      <word_default>Edit RSS Import Stream </word_default>
-      <word_custom>Редактирование: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_createnew</word_key>
-      <word_default>Create New RSS Import Stream</word_default>
-      <word_custom>Создание RSS потока импорта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_created</word_key>
-      <word_default>RSS Import stream has been created.</word_default>
-      <word_custom>RSS поток импорта �оздан.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_edited</word_key>
-      <word_default>RSS Import stream has been edited.</word_default>
-      <word_custom>RSS поток импорта изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noforumperm</word_key>
-      <word_default><![CDATA[Please select another forum to import into. The one selected isn't capable of receiving topics.]]></word_default>
-      <word_custom>Пожалуй�та, выберите другой форум дл� импорта. Один из выбранных не может получать темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noforum</word_key>
-      <word_default>Please select another forum to import into. The one selected does not exist.</word_default>
-      <word_custom>Пожалуй�та, выберите другой форум дл� импорта. Один из выбранных не �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_nomember</word_key>
-      <word_default>We could not find the member called %s. Please double-check the name.</word_default>
-      <word_custom>�е удало�ь найти пользовател�. Внимательно проверьте им�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noopen</word_key>
-      <word_default>Could not open %s to locate channels. This may be a temporary issue. Please confirm the URL is correct.</word_default>
-      <word_custom>�ельз� открыть %s дл� локальных каналов. Возможно �то временна� проблема. Проверьте правильно�ть ввода ��ылки на поток.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_completeform</word_key>
-      <word_default>You must complete the entire form. Please try again.</word_default>
-      <word_custom>Вы должны заполнить в�е пол�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_valresults</word_key>
-      <word_default><![CDATA[<b>Validation Results for <span class='rss-feed-url'>%s</span></b><br />&nbsp;&middot;%s]]></word_default>
-      <word_custom><![CDATA[Результаты проверки дл� <span class='rss-feed-url'>%s</span></b><br />&nbsp;&middot;%s ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_title</word_key>
-      <word_default>RSS Import Manager</word_default>
-      <word_custom>Управление потоками RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_notneeded</word_key>
-      <word_default>Not Needed</word_default>
-      <word_custom>�е требует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noarticles</word_key>
-      <word_default><![CDATA[The RSS Import Stream <strong>%s</strong> has no imported articles to remove.]]></word_default>
-      <word_custom><![CDATA[Импорт RSS �троки <strong>%s</strong> не был произведен.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>�е один ID не выбран. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_findtopics</word_key>
-      <word_default>We could not locate any topics to delete.</word_default>
-      <word_custom>Темы дл� удалени� не найдены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_topicsremoved</word_key>
-      <word_default> topics removed.</word_default>
-      <word_custom> тем удалено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_removed</word_key>
-      <word_default>RSS Import steam has been removed.</word_default>
-      <word_custom>RSS поток импорта удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>im_noload</word_key>
-      <word_default>Could not load the RSS stream from the database. It may be missing.</word_default>
-      <word_custom>�евозможно загрузить �троку RSS из базы данных. Возможно, ее про�то нет.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_recached</word_key>
-      <word_default>RSS Export(s) Recached!</word_default>
-      <word_custom>Кеш RSS Эк�порта у�пешно обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_save</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_title</word_key>
-      <word_default>RSS Export Manager</word_default>
-      <word_custom>Управление потоками RSS Эк�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_edit</word_key>
-      <word_default>Edit RSS Export Stream </word_default>
-      <word_custom>Изменение потока RSS Эк�порта </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_createnew</word_key>
-      <word_default>Create New RSS Export Stream</word_default>
-      <word_custom>Создание нового потока RSS �к�порта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_edited</word_key>
-      <word_default>RSS Export stream has been edited.</word_default>
-      <word_custom>Поток RSS Эк�порта изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_created</word_key>
-      <word_default>RSS Export stream has been created.</word_default>
-      <word_custom>Поток RSS Эк�порта �оздан.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_completeform</word_key>
-      <word_default>You must complete the entire form. Please try again.</word_default>
-      <word_custom>Вы должны заполнить в�е пол�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_removed</word_key>
-      <word_default>RSS Export stream has been removed.</word_default>
-      <word_custom>Поток RSS Эк�порта удален.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>�е один ID не выбран. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_noload</word_key>
-      <word_default>Could not load the RSS stream from the database. It may be missing.</word_default>
-      <word_custom>�евозможно загрузить �троку RSS из базы данных. Возможно ее про�то нет.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_rating</word_key>
-      <word_default>Topic Rating</word_default>
-      <word_custom>По рейтингу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_starter</word_key>
-      <word_default>Topic Starter</word_default>
-      <word_custom>По по�леднему автору</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_views</word_key>
-      <word_default>Topic Views</word_default>
-      <word_custom>По кол-ву про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_last</word_key>
-      <word_default>Topic Last Post</word_default>
-      <word_custom>По по�леднему �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_start</word_key>
-      <word_default>Topic Start Date</word_default>
-      <word_custom>По дате �оздани� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>ex_opt_asc</word_key>
-      <word_default>Ascending (0-9)</word_default>
-      <word_custom>По возра�танию (0-9)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_overrride</word_key>
+      <word_default>Override group permission masks with...</word_default>
+      <word_custom>Переопределить права группы �ледующими ма�ками</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7169,9 +4062,13 @@
       <word_key>ex_opt_desc</word_key>
       <word_default>Descending (9-0)</word_default>
       <word_custom>По убыванию (9-0)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_start</word_key>
+      <word_default>Topic Start Date</word_default>
+      <word_custom>По дате �оздани� темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7179,9 +4076,888 @@
       <word_key>im_channelcount</word_key>
       <word_default>We found %s channel(s) in the RSS feed.</word_default>
       <word_custom>�айдено %s каналов в RSS потоке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_asc</word_key>
+      <word_default>Ascending (0-9)</word_default>
+      <word_custom>По возра�танию (0-9)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_last</word_key>
+      <word_default>Topic Last Post</word_default>
+      <word_custom>По по�леднему �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_views</word_key>
+      <word_default>Topic Views</word_default>
+      <word_custom>По кол-ву про�мотров</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_starter</word_key>
+      <word_default>Topic Starter</word_default>
+      <word_custom>По по�леднему автору</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_opt_rating</word_key>
+      <word_default>Topic Rating</word_default>
+      <word_custom>По рейтингу</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_removed</word_key>
+      <word_default>RSS Export stream has been removed.</word_default>
+      <word_custom>Поток RSS Эк�порта удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_noload</word_key>
+      <word_default>Could not load the RSS stream from the database. It may be missing.</word_default>
+      <word_custom>�евозможно загрузить �троку RSS из базы данных. Возможно ее про�то нет.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>�е один ID не выбран. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_created</word_key>
+      <word_default>RSS Export stream has been created.</word_default>
+      <word_custom>Поток RSS Эк�порта �оздан.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_createnew</word_key>
+      <word_default>Create New RSS Export Stream</word_default>
+      <word_custom>Создание нового потока RSS �к�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_edited</word_key>
+      <word_default>RSS Export stream has been edited.</word_default>
+      <word_custom>Поток RSS Эк�порта изменен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_completeform</word_key>
+      <word_default>You must complete the entire form. Please try again.</word_default>
+      <word_custom>Вы должны заполнить в�е пол�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_save</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_edit</word_key>
+      <word_default>Edit RSS Export Stream </word_default>
+      <word_custom>Изменение потока RSS Эк�порта </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_title</word_key>
+      <word_default>RSS Export Manager</word_default>
+      <word_custom>Управление потоками RSS Эк�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_recached</word_key>
+      <word_default>RSS Export(s) Recached!</word_default>
+      <word_custom>Кеш RSS Эк�порта у�пешно обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_none</word_key>
+      <word_default>No RSS export streams created yet.</word_default>
+      <word_custom>Ещё не �оздано ни одного RSS потока</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>ex_createone</word_key>
+      <word_default>Create one now</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noload</word_key>
+      <word_default>Could not load the RSS stream from the database. It may be missing.</word_default>
+      <word_custom>�евозможно загрузить �троку RSS из базы данных. Возможно, ее про�то нет.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_removed</word_key>
+      <word_default>RSS Import steam has been removed.</word_default>
+      <word_custom>RSS поток импорта удален.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_topicsremoved</word_key>
+      <word_default> topics removed.</word_default>
+      <word_custom> тем удалено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_findtopics</word_key>
+      <word_default>We could not locate any topics to delete.</word_default>
+      <word_custom>Темы дл� удалени� не найдены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noid</word_key>
+      <word_default>No ID was passed. Please try again.</word_default>
+      <word_custom>�е один ID не выбран. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noopen</word_key>
+      <word_default>Could not open %s to locate channels. This may be a temporary issue. Please confirm the URL is correct.</word_default>
+      <word_custom>�ельз� открыть %s дл� локальных каналов. Возможно �то временна� проблема. Проверьте правильно�ть ввода ��ылки на поток.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noarticles</word_key>
+      <word_default><![CDATA[The RSS Import Stream <strong>%s</strong> has no imported articles to remove.]]></word_default>
+      <word_custom><![CDATA[Импорт RSS �троки <strong>%s</strong> не был произведен.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_title</word_key>
+      <word_default>RSS Import Manager</word_default>
+      <word_custom>Управление потоками RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_valresults</word_key>
+      <word_default><![CDATA[<b>Validation Results for <span class='rss-feed-url'>%s</span></b><br />&nbsp;&middot;%s]]></word_default>
+      <word_custom><![CDATA[Результаты проверки дл� <span class='rss-feed-url'>%s</span></b><br />&nbsp;&middot;%s ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_completeform</word_key>
+      <word_default>You must complete the entire form. Please try again.</word_default>
+      <word_custom>Вы должны заполнить в�е пол�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nomember</word_key>
+      <word_default>We could not find the member called %s. Please double-check the name.</word_default>
+      <word_custom>�е удало�ь найти пользовател�. Внимательно проверьте им�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_created</word_key>
+      <word_default>RSS Import stream has been created.</word_default>
+      <word_custom>RSS поток импорта �оздан.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noforumperm</word_key>
+      <word_default><![CDATA[Please select another forum to import into. The one selected isn't capable of receiving topics.]]></word_default>
+      <word_custom>Пожалуй�та, выберите другой форум дл� импорта. Один из выбранных не может получать темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noforum</word_key>
+      <word_default>Please select another forum to import into. The one selected does not exist.</word_default>
+      <word_custom>Пожалуй�та, выберите другой форум дл� импорта. Один из выбранных не �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_edited</word_key>
+      <word_default>RSS Import stream has been edited.</word_default>
+      <word_custom>RSS поток импорта изменен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_full</word_key>
+      <word_default><![CDATA[[url={url}]View the full article[/url]]]></word_default>
+      <word_custom><![CDATA[[url={url}]Читать дальше[/url]]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_createnew</word_key>
+      <word_default>Create New RSS Import Stream</word_default>
+      <word_custom>Создание RSS потока импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_edit</word_key>
+      <word_default>Edit RSS Import Stream </word_default>
+      <word_custom>Редактирование: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_save</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noimport</word_key>
+      <word_default> has no items to import.</word_default>
+      <word_custom> нет данных в канале дл� импорта.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_charset_cor</word_key>
+      <word_default><![CDATA[The RSS feed's charset is <em>%s</em> (correct).]]></word_default>
+      <word_custom><![CDATA[Кодировка RSS — <em>%s</em> (корректна�)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_doc_type</word_key>
+      <word_default><![CDATA[The RSS feed's charset is <em>%s</em>, but you entered <em>%s</em>.]]></word_default>
+      <word_custom><![CDATA[Кодировка RSS — <em>%s</em>, но вы указали — <em>%s</em>. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_http</word_key>
+      <word_default>HTTP Status Code: </word_default>
+      <word_custom>HTTP Код �тату�а: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_recached</word_key>
+      <word_default>RSS Import(s) Recached!</word_default>
+      <word_custom>Кеш RSS обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nourl</word_key>
+      <word_default>There was no URL entered to validate. Please try again.</word_default>
+      <word_custom>URL адре� дл� проверки не введен. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noitems</word_key>
+      <word_default>No RSS items to import.</word_default>
+      <word_custom>�ет RSS запи�ей дл� импортировани�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_notitle</word_key>
+      <word_default><![CDATA[Skipping '%s'. No title or content.]]></word_default>
+      <word_custom><![CDATA[Пропущено: '%s'.  �ет названи� или �одержани�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_charset</word_key>
+      <word_default><![CDATA[The RSS feed's charset is <em>%s</em>.]]></word_default>
+      <word_custom><![CDATA[Кодировка RSS — <em>%s</em>. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nochannels</word_key>
+      <word_default>We could not find any changes in the RSS feed (nothing to import). If you believe you received this in error, please contacting the site that serves the feed.</word_default>
+      <word_custom>�евозможно найти какие-либо изменений в указанной RSS (нечего импортировать). Е�ли вы �читаете, что �то ошибка, пожалуй�та, �в�жите�ь � �айтом, который предо�тавл�ет поток.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_topiccount</word_key>
+      <word_default>We found %s article(s)/topic(s) in the RSS feed.</word_default>
+      <word_custom>�айдено %s �татей/тем в RSS.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_invdate</word_key>
+      <word_default>An invalid date was found in at least one of the RSS articles -- current time will be used instead.</word_default>
+      <word_custom>�айдена некорректна� дата в не менее, чем одной RSS �татье — будет и�пользовать�� текущее врем�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nodate</word_key>
+      <word_default>A date was not found in at least one of the RSS articles -- current time will be used instead.</word_default>
+      <word_custom>Дата не найдена в не менее, чем одной RSS �татье — будет и�пользовать�� текущее врем�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nodesc</word_key>
+      <word_default>At least one article was missing a title or a description/content field. If all articles are missing both fields, nothing would import. Otherwise IP.Board would skip just the items missing both a title and content.</word_default>
+      <word_custom>�е менее, чем одна �тать� имеет некорректный заголовок или �одержание. Е�ли в�е �татьи имеют оба некорректных пол�, ничего не импортирует��. IPB пропу�тит �ти данные.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nocontent</word_key>
+      <word_default>We could not find any actual content to import (topics, news articles, etc.)</word_default>
+      <word_custom>�е найдено на�то�щего контента (темы, ново�ти и т.д.) (нечего импортировать)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_redforum</word_key>
+      <word_default>The specified forum is either a redirect forum, or a category, and cannot display new topics.</word_default>
+      <word_custom>Указанный форум — форум переадре�ации или категори�, или же невозможно открывать новые темы в нем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_nocharset</word_key>
+      <word_default><![CDATA[We could not determine the feed's character set.]]></word_default>
+      <word_custom>�евозможно определить кодировку RSS.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_memval</word_key>
+      <word_default>We could not validate the member used to import articles.</word_default>
+      <word_custom>Мы не можем разрешить пользовател�, и�пользуемого дл� импорта �татей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_streams</word_key>
+      <word_default>RSS Export Streams</word_default>
+      <word_custom>Потоки RSS Эк�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_title</word_key>
+      <word_default>RSS Title</word_default>
+      <word_custom>�азвание потока</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_desc</word_key>
+      <word_default>RSS Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_enabled</word_key>
+      <word_default>Enabled</word_default>
+      <word_custom>Стату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>im_noinc</word_key>
+      <word_default><![CDATA[The specified forum does not allow posts to increment user's post count - importer's post count will <i>not</i> be incremented.]]></word_default>
+      <word_custom><![CDATA[В указанном форуме не включен �четчик �ообщений пользователей — �четчик �ообщений пользовател� <i>не</i> будет увеличен.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_edit</word_key>
+      <word_default>Edit RSS Export Stream...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_status</word_key>
+      <word_default>Status</word_default>
+      <word_custom>Со�то�ние</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_create</word_key>
+      <word_default>Create New RSS Export Stream...</word_default>
+      <word_custom>Создать новый поток</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_recache</word_key>
+      <word_default>Recache RSS Export Stream...</word_default>
+      <word_custom>Обновить в�е кеши RSS Эк�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_delete</word_key>
+      <word_default>Delete RSS Export Stream...</word_default>
+      <word_custom>Удалить поток</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_title</word_key>
+      <word_default>RSS Export Stream (Channel) Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_update</word_key>
+      <word_default>Update All RSS Export Caches...</word_default>
+      <word_custom>Обновить в�е кеши RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_desc</word_key>
+      <word_default>RSS Export Stream (Channel) Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_img</word_key>
+      <word_default>RSS Export Stream Image</word_default>
+      <word_custom>Изображение потока</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_img_info</word_key>
+      <word_default>Used to show an image in RSS readers</word_default>
+      <word_custom>Дл� отображени� изображени� в программах дл� чтени� RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_optional</word_key>
+      <word_default>* Optional</word_default>
+      <word_custom>*Опционально</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_firstpost</word_key>
+      <word_default>RSS Export Includes First Post of Topic</word_default>
+      <word_custom>В RSS Эк�порт включать первое �ообщение темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_enabled</word_key>
+      <word_default>RSS Export Enabled</word_default>
+      <word_custom>Включен?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_numitem</word_key>
+      <word_default>RSS Export No. Items</word_default>
+      <word_custom>Количе�тво тем RSS Эк�порта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_numitem_info</word_key>
+      <word_default><![CDATA[Exports <em>n</em> number of topics]]></word_default>
+      <word_custom><![CDATA[Эк�портировано <em>n</em> тем ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_order</word_key>
+      <word_default>RSS Export Order By Field</word_default>
+      <word_custom>Сортировать RSS Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_sort</word_key>
+      <word_default>RSS Export Sort By</word_default>
+      <word_custom>Сортировать RSS Эк�порт</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_forums</word_key>
+      <word_default>Export Topics From Forum(s)</word_default>
+      <word_custom>Эк�портировать темы из форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_forums_info</word_key>
+      <word_default><![CDATA[IMPORTANT: No permission checks are done. Topics will be exported from chosen forums regardless of the viewer's permissions.]]></word_default>
+      <word_custom>В�Ж�О: Ма�ки до�тупа не работают зде�ь. Темы будут �к�портированы из выбранных форум, незави�имо от ма�ок до�тупа к форумам.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_url_info</word_key>
+      <word_default>This must be an RDF or RSS feed</word_default>
+      <word_custom>Это должно быть RDF или RSS поток.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_url</word_key>
+      <word_default>RSS Import Stream URL</word_default>
+      <word_custom><![CDATA[<strong>С�ылка на поток</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_title</word_key>
+      <word_default>RSS Import Stream Title</word_default>
+      <word_custom><![CDATA[<strong>�азвание</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_basics</word_key>
+      <word_default>RSS Import Basics</word_default>
+      <word_custom><![CDATA[<strong>RSS Импорт</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_blankremove</word_key>
+      <word_default>Leave blank to remove them all</word_default>
+      <word_custom>О�тавьте поле пу�тым дл� удалени� в�ех</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_removenoconf</word_key>
+      <word_default>Remove (No more confirmation screens!)</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_removelast</word_key>
+      <word_default><![CDATA[Remove the last <em>n</em> imported topics]]></word_default>
+      <word_custom><![CDATA[<strong>Удалить по�ледние <em>n</em> импортированных тем</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_removetopics</word_key>
+      <word_default>Remove Posted Topics From Stream: </word_default>
+      <word_custom>Удалить темы из потока: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_articlecount</word_key>
+      <word_default><![CDATA[You may remove topics that have been posted from an RSS import stream. This stream has created <strong>%s</strong> topic(s).]]></word_default>
+      <word_custom><![CDATA[Вы можете удалить темы, которые были опубликованы, из потока RSS. Этот поток был �оздан � <strong>%s</strong> темами.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_cache_info</word_key>
+      <word_default><![CDATA[Updates the RSS cache every <em>n</em> minutes]]></word_default>
+      <word_custom><![CDATA[Обновл�ть кеш RSS каждые <em>n</em> минут]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_ex_cache</word_key>
+      <word_default>RSS Export Cache Frequency</word_default>
+      <word_custom>RSS Эк�порт: Ча�тота обновлени� кеша</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_enabled</word_key>
+      <word_default>RSS Import Enabled</word_default>
+      <word_custom><![CDATA[<strong>Включить импорт?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_htaccess</word_key>
+      <word_default>RSS Import htaccess Authentication</word_default>
+      <word_custom>.htaccess аутентификаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_ht_info</word_key>
+      <word_default>Most streams do not require authentication</word_default>
+      <word_custom>Дл� большин�тва потоков не требует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_ht_require</word_key>
+      <word_default>Does this stream require .htaccess Authentication?</word_default>
+      <word_custom><![CDATA[<strong>Этот поток требует .htaccess аутентификацию?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_forum</word_key>
+      <word_default>RSS Import Into Forum</word_default>
+      <word_custom><![CDATA[<strong>Импортировать в форумы</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_ht_user</word_key>
+      <word_default>RSS Import Stream Username</word_default>
+      <word_custom><![CDATA[<strong>Им� пользовател�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_content</word_key>
+      <word_default>RSS Import Content</word_default>
+      <word_custom>Содержимое RSS </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_ht_pass</word_key>
+      <word_default>RSS Import Stream Password</word_default>
+      <word_custom><![CDATA[<strong>Пароль</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_html</word_key>
+      <word_default>RSS Import Preserve HTML</word_default>
+      <word_custom><![CDATA[<strong>Сохранить HTML?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_forum_info</word_key>
+      <word_default>Choose a forum to import each RSS item as a new topic</word_default>
+      <word_custom>Выберите форум, в который импортировать каждую RSS запи�ь, как новую тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_html_info</word_key>
+      <word_default><![CDATA[If yes, raw HTML is preserved along with any 'badwords' - you MUST have HTML enabled when editing imported posts or HTML will be removed upon edit. If no, HTML is converted to BBCode where possible.]]></word_default>
+      <word_custom>Е�ли да, HTML будет �охранен — вы об�заны включить HTML на форуме, чтобы была возможно�ть редактировать импортируемые запи�и. Е�ли нет, HTML будет конвертировать�� по возможно�ти в BB-код.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_poster</word_key>
+      <word_default><![CDATA[RSS Import Poster's Name]]></word_default>
+      <word_custom><![CDATA[<strong>�втор запи�ей</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_poster_info</word_key>
+      <word_default><![CDATA[This will post the RSS topic under this person's account (member display name)]]></word_default>
+      <word_custom>От �того имени будет публиковать�� тема � RSS запи�ью (отображаемое им�)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_incpost_info</word_key>
+      <word_default><![CDATA[This will increment this poster's post count in forums where post counts are enabled]]></word_default>
+      <word_custom>При публикации новой темы из RSS, пользователю, от чьего имени была �оздана �та темы, будет увеличен �четчик �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_incpost</word_key>
+      <word_default><![CDATA[RSS Import Increment Poster's Post Count]]></word_default>
+      <word_custom><![CDATA[<strong>Увеличивать �четчик �ообщений при RSS Импорте</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_link</word_key>
+      <word_default>RSS Import Add Link To Post</word_default>
+      <word_custom><![CDATA[<strong>Добавл�ть ��ылку и�точника</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_link_other</word_key>
+      <word_default>*Leave blank to not include a link in the post</word_default>
+      <word_custom>*О�тавьте поле пу�тым, чтобы не включать ��ылку в �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_hidden_info</word_key>
+      <word_default><![CDATA[If 'yes' the topic will be posted as invisible. 'No', topic will be visible]]></word_default>
+      <word_custom>Е�ли «Да», то будет �оздана невидима� тема. «�ет» — тема видима�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_prefix</word_key>
+      <word_default>RSS Import Topic Prefix</word_default>
+      <word_custom><![CDATA[<strong>Префик� тем</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_hidden</word_key>
+      <word_default>RSS Import Topic Hidden</word_default>
+      <word_custom><![CDATA[<strong>�евидимо�ть тем</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_prefix_info</word_key>
+      <word_default><![CDATA[This prefix will be added to the beginning of the RSS item's title]]></word_default>
+      <word_custom>Префик�, который будет добавлен перед заголовком RSS запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_open</word_key>
+      <word_default>RSS Import Topic Open</word_default>
+      <word_custom><![CDATA[<strong>Открыто�ть тем</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_open_info</word_key>
+      <word_default><![CDATA[If 'yes' the topic will be posted as open. 'No', topic will be closed]]></word_default>
+      <word_custom>Е�ли «Да», то тема будет �оздана открыта�. «�ет» — тема будет закрыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_link_info</word_key>
+      <word_default><![CDATA[BBCode allowed: {url} = URL to article<br />If completed, this will add a link to the article source (if available) to the post body]]></word_default>
+      <word_custom><![CDATA[BB-код разрешен: {url} = URL к запи�и<br />Е�ли �то поле заполнено, то к �ообщению будет добавлена ��ылка на и�точник, откуда вз�та RSS запи�ь]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_valbutton</word_key>
+      <word_default>Validate Stream</word_default>
+      <word_custom>Проверить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_settings</word_key>
+      <word_default>RSS Import Settings</word_default>
+      <word_custom><![CDATA[<strong>�а�тройки импорта</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_pergo</word_key>
+      <word_default>RSS Import Per Go</word_default>
+      <word_custom><![CDATA[<strong>Количе�тво импортируемых запи�ей за обновление</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_pergo_info</word_key>
+      <word_default><![CDATA[Imports <em>n</em> articles per update. Importing is moderately resource intensive.]]></word_default>
+      <word_custom><![CDATA[Импортировать <em>n</em> запи�ей за обновление. Импортирование довольно т�желый проце��.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_refresh</word_key>
+      <word_default>RSS Import Refresh</word_default>
+      <word_custom><![CDATA[<strong>Ча�тота обновлени�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_refresh_info</word_key>
+      <word_default><![CDATA[Checks for new articles every <em>n</em> minutes. Minimum of 30 minutes, regardless of input.]]></word_default>
+      <word_custom>Провер�ть новые RSS запи�и каждые n минут. Минимум 30 минут.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_rss</word_key>
+      <word_default>RSS</word_default>
+      <word_custom>Потоки RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_enturl</word_key>
+      <word_default>Enter the URL:</word_default>
+      <word_custom><![CDATA[<strong>Введите ��ылку:</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_quickval</word_key>
+      <word_default>Quick-Validate an RSS Stream?</word_default>
+      <word_custom>Бы�тра� проверка потока</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_thefeeds</word_key>
+      <word_default>RSS Import Streams</word_default>
+      <word_custom>Потоки RSS Импорта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_delete</word_key>
+      <word_default>Delete RSS Import Stream...</word_default>
+      <word_custom>Удалить поток</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7189,19 +4965,6 @@
       <word_key>rss_im_remove</word_key>
       <word_default>Remove RSS Articles...</word_default>
       <word_custom>Удалить в�е запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_update</word_key>
-      <word_default>Update RSS Import...</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7209,19 +4972,20 @@
       <word_key>rss_im_validate</word_key>
       <word_default>Validate RSS Stream...</word_default>
       <word_custom>Проверить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_rss</word_pack>
-      <word_key>rss_im_create</word_key>
-      <word_default>Create New RSS Import Stream...</word_default>
-      <word_custom>Создать новый поток</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rss_im_update</word_key>
+      <word_default>Update RSS Import...</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_edit</word_key>
+      <word_default>Edit RSS Import Stream...</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7229,369 +4993,13 @@
       <word_key>rss_im_updateall</word_key>
       <word_default>Update All RSS Imports...</word_default>
       <word_custom>Обновить в�е кеши RSS</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_timescale</word_key>
-      <word_default><![CDATA[<strong>Time Scale</strong> ]]></word_default>
-      <word_custom><![CDATA[<strong>Период времени</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_dateto</word_key>
-      <word_default><![CDATA[<strong>Date To</strong> ]]></word_default>
-      <word_custom><![CDATA[<strong>Дата по</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_datefrom</word_key>
-      <word_default><![CDATA[<strong>Date From</strong> ]]></word_default>
-      <word_custom><![CDATA[<strong>Дата �</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_total</word_key>
-      <word_default><![CDATA[<strong>Total</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>В�его</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_results</word_key>
-      <word_default>Results</word_default>
-      <word_custom>Результат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_count</word_key>
-      <word_default>Count</word_default>
-      <word_custom>Кол-во</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_views_nav</word_key>
-      <word_default>Topic Views</word_default>
-      <word_custom>Про�мотры тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_title</word_key>
-      <word_default>Statistics Center</word_default>
-      <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_desc</word_key>
-      <word_default>Descending - Newest dates first</word_default>
-      <word_custom>По убыванию — первые: �амые новые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_monthly</word_key>
-      <word_default>Monthly</word_default>
-      <word_custom>Ежеме��чно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_asc</word_key>
-      <word_default>Ascending - Oldest dates first</word_default>
-      <word_custom>По возра�танию — первые: �амые �тарые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_weekly</word_key>
-      <word_default>Weekly</word_default>
-      <word_custom>Еженедельно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_views</word_key>
-      <word_default>Topic View Statistics</word_default>
-      <word_custom>Стати�тика про�мотров тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_daily</word_key>
-      <word_default>Daily</word_default>
-      <word_custom>Ежедневно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_title_results</word_key>
-      <word_default>Statistic Center Results</word_default>
-      <word_custom>Результаты �тати�тики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_weekno</word_key>
-      <word_default>Week #</word_default>
-      <word_custom>�едел� #</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_msg_nav</word_key>
-      <word_default>Sent Personal Messages</word_default>
-      <word_custom>Отправленные личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_to</word_key>
-      <word_default> to </word_default>
-      <word_custom> по </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_msg</word_key>
-      <word_default>PM Sent Statistics</word_default>
-      <word_custom>Стати�тика личных �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_post_nav</word_key>
-      <word_default>Number of Posts</word_default>
-      <word_custom>Количе�тво �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_post</word_key>
-      <word_default>Post Statistics</word_default>
-      <word_custom>Стати�тика �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_topic_nav</word_key>
-      <word_default>Topics Started</word_default>
-      <word_custom>�овых тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_topic</word_key>
-      <word_default>New Topic Statistics</word_default>
-      <word_custom>Стати�тика новых тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_reg_nav</word_key>
-      <word_default>Registered Users</word_default>
-      <word_custom>Зареги�трировавшие�� пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_reg</word_key>
-      <word_default>Registration Statistics</word_default>
-      <word_custom>Стати�тика реги�траций</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_fromincorrect</word_key>
-      <word_default><![CDATA[The 'Date From:' time is incorrect, please check the input and try again.]]></word_default>
-      <word_custom>«Дата �:» — неверное врем�. Пожалуй�та, проверьте введенное вами значение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_toincorrect</word_key>
-      <word_default><![CDATA[The 'Date To:' time is incorrect, please check the input and try again.]]></word_default>
-      <word_custom>«Дата до:» — неверное врем�. Пожалуй�та, проверьте введенное вами значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_nov</word_key>
-      <word_default>November</word_default>
-      <word_custom>�о�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_dec</word_key>
-      <word_default>December</word_default>
-      <word_custom>Декабрь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_oct</word_key>
-      <word_default>October</word_default>
-      <word_custom>Окт�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_aug</word_key>
-      <word_default>August</word_default>
-      <word_custom>�вгу�т</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_sep</word_key>
-      <word_default>September</word_default>
-      <word_custom>Сент�брь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_jul</word_key>
-      <word_default>July</word_default>
-      <word_custom>Июль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_jun</word_key>
-      <word_default>June</word_default>
-      <word_custom>Июнь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>admin_stats</word_pack>
-      <word_key>stats_apr</word_key>
-      <word_default>April</word_default>
-      <word_custom>�прель</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_rss</word_pack>
+      <word_key>rss_im_create</word_key>
+      <word_default>Create New RSS Import Stream...</word_default>
+      <word_custom>Создать новый поток</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7599,9 +5007,13 @@
       <word_key>stats_may</word_key>
       <word_default>May</word_default>
       <word_custom>Май</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_apr</word_key>
+      <word_default>April</word_default>
+      <word_custom>�прель</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7609,9 +5021,6 @@
       <word_key>stats_mar</word_key>
       <word_default>March</word_default>
       <word_custom>Март</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7619,9 +5028,6 @@
       <word_key>stats_feb</word_key>
       <word_default>February</word_default>
       <word_custom>Февраль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7629,9 +5035,6 @@
       <word_key>stats_jan</word_key>
       <word_default>January</word_default>
       <word_custom>Январь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7639,9 +5042,6 @@
       <word_key>timescale_weekly</word_key>
       <word_default>Weekly</word_default>
       <word_custom>За неделю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7649,9 +5049,6 @@
       <word_key>timescale_daily</word_key>
       <word_default>Daily</word_default>
       <word_custom>За день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7659,9 +5056,6 @@
       <word_key>timescale_monthly</word_key>
       <word_default>Monthly</word_default>
       <word_custom>За ме��ц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7669,9 +5063,6 @@
       <word_key>stats_spam</word_key>
       <word_default>Spam Service Stats</word_default>
       <word_custom>Стати�тика �пам �ерви�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7679,9 +5070,6 @@
       <word_key>spam_graph_title</word_key>
       <word_default>Recent Registrations</word_default>
       <word_custom>По�ледние реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7689,9 +5077,6 @@
       <word_key>spam_spam</word_key>
       <word_default>Spam</word_default>
       <word_custom>Спам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7699,9 +5084,6 @@
       <word_key>spam_ok</word_key>
       <word_default>Ok</word_default>
       <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7709,9 +5091,6 @@
       <word_key>statisnotspam</word_key>
       <word_default>Not Spam</word_default>
       <word_custom>�е �пам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7719,19 +5098,244 @@
       <word_key>statisspam</word_key>
       <word_default>Spam</word_default>
       <word_custom>Спам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>admin_stats</word_pack>
-      <word_key>stats_sorting</word_key>
-      <word_default><![CDATA[<strong>Result Sorting</strong> ]]></word_default>
-      <word_custom><![CDATA[<strong>Сортировка результатов</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_view_warning</word_key>
+      <word_default>This statistic shows you the number of views logged for topics created within the selected time period.  This statistic does not show the number of views for the selected time period.</word_default>
+      <word_custom>Стати�тика отображает чи�ло про�мотров тем, �озданных в указанный период. Она не отображает чи�ло про�мотров в указанный период.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_oct</word_key>
+      <word_default>October</word_default>
+      <word_custom>Окт�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_sep</word_key>
+      <word_default>September</word_default>
+      <word_custom>Сент�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_aug</word_key>
+      <word_default>August</word_default>
+      <word_custom>�вгу�т</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_jul</word_key>
+      <word_default>July</word_default>
+      <word_custom>Июль</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_jun</word_key>
+      <word_default>June</word_default>
+      <word_custom>Июнь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_nov</word_key>
+      <word_default>November</word_default>
+      <word_custom>�о�брь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_toincorrect</word_key>
+      <word_default><![CDATA[The 'Date To:' time is incorrect, please check the input and try again.]]></word_default>
+      <word_custom>«Дата до:» — неверное врем�. Пожалуй�та, проверьте введенное вами значение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_dec</word_key>
+      <word_default>December</word_default>
+      <word_custom>Декабрь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_reg_nav</word_key>
+      <word_default>Registered Users</word_default>
+      <word_custom>Зареги�трировавшие�� пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_reg</word_key>
+      <word_default>Registration Statistics</word_default>
+      <word_custom>Стати�тика реги�траций</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_topic_nav</word_key>
+      <word_default>Topics Started</word_default>
+      <word_custom>�овых тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_topic</word_key>
+      <word_default>New Topic Statistics</word_default>
+      <word_custom>Стати�тика новых тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_fromincorrect</word_key>
+      <word_default><![CDATA[The 'Date From:' time is incorrect, please check the input and try again.]]></word_default>
+      <word_custom>«Дата �:» — неверное врем�. Пожалуй�та, проверьте введенное вами значение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_post</word_key>
+      <word_default>Post Statistics</word_default>
+      <word_custom>Стати�тика �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_post_nav</word_key>
+      <word_default>Number of Posts</word_default>
+      <word_custom>Количе�тво �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_msg</word_key>
+      <word_default>PM Sent Statistics</word_default>
+      <word_custom>Стати�тика личных �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_to</word_key>
+      <word_default> to </word_default>
+      <word_custom> по </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_msg_nav</word_key>
+      <word_default>Sent Personal Messages</word_default>
+      <word_custom>Отправленные личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_title_results</word_key>
+      <word_default>Statistic Center Results</word_default>
+      <word_custom>Результаты �тати�тики</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_datefrom</word_key>
+      <word_default><![CDATA[<strong>Date From</strong> ]]></word_default>
+      <word_custom><![CDATA[<strong>Дата �</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_views</word_key>
+      <word_default>Topic View Statistics</word_default>
+      <word_custom>Стати�тика про�мотров тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_weekly</word_key>
+      <word_default>Weekly</word_default>
+      <word_custom>Еженедельно</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_daily</word_key>
+      <word_default>Daily</word_default>
+      <word_custom>Ежедневно</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_weekno</word_key>
+      <word_default>Week #</word_default>
+      <word_custom>�едел� #</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_count</word_key>
+      <word_default>Count</word_default>
+      <word_custom>Кол-во</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_results</word_key>
+      <word_default>Results</word_default>
+      <word_custom>Результат</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_views_nav</word_key>
+      <word_default>Topic Views</word_default>
+      <word_custom>Про�мотры тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_title</word_key>
+      <word_default>Statistics Center</word_default>
+      <word_custom>Стати�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_desc</word_key>
+      <word_default>Descending - Newest dates first</word_default>
+      <word_custom>По убыванию — первые: �амые новые</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_asc</word_key>
+      <word_default>Ascending - Oldest dates first</word_default>
+      <word_custom>По возра�танию — первые: �амые �тарые</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_monthly</word_key>
+      <word_default>Monthly</word_default>
+      <word_custom>Ежеме��чно</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_total</word_key>
+      <word_default><![CDATA[<strong>Total</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>В�его</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -7739,9 +5343,27 @@
       <word_key>stats_show</word_key>
       <word_default>Show</word_default>
       <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_sorting</word_key>
+      <word_default><![CDATA[<strong>Result Sorting</strong> ]]></word_default>
+      <word_custom><![CDATA[<strong>Сортировка результатов</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_timescale</word_key>
+      <word_default><![CDATA[<strong>Time Scale</strong> ]]></word_default>
+      <word_custom><![CDATA[<strong>Период времени</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>admin_stats</word_pack>
+      <word_key>stats_dateto</word_key>
+      <word_default><![CDATA[<strong>Date To</strong> ]]></word_default>
+      <word_custom><![CDATA[<strong>Дата по</strong>]]></word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/forums/xml/forums_help.xml b/upload/admin/applications/forums/xml/forums_help.xml
deleted file mode 100644
index cc3f94f2..00000000
--- a/upload/admin/applications/forums/xml/forums_help.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<export>
-  <help>
-    <row>
-      <title>Сообщени�</title>
-      <text><![CDATA[<strong>Редактор �ообщений</strong><br />
-Е�ть две вер�ии редактора �ообщений: �тандартный и визуальный. Выбрать, какой из них и�пользовать, вы можете в ваших на�тройках.<br />
-<br />
-<br />
-<strong>Опро�ы</strong><br />
-При �оздании новой темы, под пол�ми дл� ввода названи� и опи�ани� темы, вы увидите ��ылку «Управление опро�ом». �ажав на �то ��ылку, вам откроют�� опции опро�а. Первое поле �лужит дл� ввода названи� опро�а (необ�зательно), второе - дл� ввода в нем вопро�а вашего голо�овани�. Чтобы добавить вопро� к вашему опро�у, нужно кликнуть на «Добавить еще вопро� в опро�». Количе�тво возможных опро�ов в одной теме и �оответ�твенно вариантов ответов у�танавливает�� админи�тратором форума. Про�мотреть разрешенное количе�тво вопро� и вариантов ответов к каждому вопро�у вы можете по�мотреть внизу формы добавлени� опро�а. Чтобы отменить ве�ь опро�, вам нужно нажать «Закрыть форму опро�а»
-<br />
-<br />
-<strong>Прикреплени�</strong><br />
-Е�ли админи�тратор форума включил функцию загрузки файлов, вы увидите блок дл� при�оединени� файла к вашему �ообщению. Дл� при�оединени� файла, нажмите на кнопку "Обзор" и выберите файл на вашем компьютере, дл� загрузки �тот файла. Е�ли вы загружаете файл изображени�, данное изображени� будет отображено под тек�том �ообщени�, а при загрузке в�ех других типов файлов, под тек�том вашего �ообщени� будет пропи�ана ��ылка дл� �качивани� �того файла.<br />
-<br />
-<br />
-<strong>Редактирование</strong><br />
-Под каждым �ообщением, напи�анным вами, вы увидите кнопку «Изменить». Вы �можете отредактировать тек�т вашего �ообщени� незави�имо от того, когда вы �то �ообщение пи�али.<br />
-<br />
-При редактировании �воего �ообщени� вы можете увидеть опцию «Добавить надпи�ь «Отредактировано...» в �то �ообщение?». При у�тановке галочки в �той опции, под вашим отредактированным �ообщением по�вит�� надпи�ь, информирующа� о том, что вы редактировали �то �ообщение, � датой редактировани�. Е�ли вы не видите �ту опцию, значит, данна� информаци� о редактировании будет добавлена автоматиче�ки.<br />
-<br />
-Е�ли вы не видите кнопку дл� редактировани� вашего �ообщени�, то, возможно, что админи�тратор форума отключил данную функцию, либо у�тановил лимит времени, по и�течении которого, редактирование �ообщени� уже невозможно.<br />
-<br />]]></text>
-      <description>Руковод�тво по отправке �ообщений.</description>
-      <position>5</position>
-      <app>forums</app>
-    </row>
-    <row>
-      <title>Темы и форумы</title>
-      <text><![CDATA[<strong>Про�мотр форумов</strong><br />
-Чтобы про�мотреть �пи�ок форумов необходимо выбрать вкладку "Об�уждени�".<br />
-<br />
-Форум разделен на категории. Вы можете �крыть категории нажав на "-" �права от названи� категории. При нажатии на "+" категори� вновь �танет видимой.<br />
-<br />
-Стату� форума задает�� иконкой:<br />
-<img src='{style_image_url}/f_read.png' /> Обычный форум. �ет непрочитанных �ообщений.<br />
-<img src='{style_image_url}/f_unread.png' /> Обычный форум. Е�ть непрочитанные �ообщени�.<br />
-<img src='{style_image_url}/f_cat_read.png' /> Форум, �одержащий подфорумы. �ет непрочитанных �ообщений.<br />
-<img src='{style_image_url}/f_cat_unread.png' /> Форум, �одержащий подфорумы. Е�ть непрочитанные �ообщени�.<br />
-<img src='{style_image_url}/f_pass_read.png' /> Закрытый форум. �ет непрочитанных �ообщений.<br />
-<img src='{style_image_url}/f_pass_unread.png' /> Закрытый форум. Е�ть непрочитанные �ообщени�.<br />
-<img src='{style_image_url}/f_locked.png' /> Форум только дл� чтени�.<br />
-<img src='{style_image_url}/f_redirect.png' /> Форум-переадре�аци�. <br />
-<br />
-<br />
-<strong>Про�мотр тем</strong><br />
-Стату� темы задает�� иконкой:<br />
-<img src='{style_image_url}/t_read.png' /> Обычна� тема. �ет непрочитанных �ообщений.<br />
-<img src='{style_image_url}/t_unread.png' /> Обычна� тема. Е�ть непрочитанные �ообщени�.<br />
-<img src='{style_image_url}/t_hot_read.png' /> Гор�ча� тема. �ет непрочитанных �ообщений.<br />
-<img src='{style_image_url}/t_hot_unread.png' /> Гор�ча� тема. Е�ть непрочитанные �ообщени�.<br />
-<img src='{style_image_url}/t_poll_read.png' /> Опро�. �ет непрочитанных �ообщений или новых голо�ов.<br />
-<img src='{style_image_url}/t_poll_unread.png' /> Опро�. Е�ть непрочитанные �ообщени� или новые голо�а.<br />
-<img src='{style_image_url}/t_announcement.png' /> Важна� тема.<br />
-<img src='{style_image_url}/t_moved.png' /> Перемещенна� тема.<br />
-<img src='{style_image_url}/t_closed.png' /> Закрыта� тема.<br />
-<br />
-�а форуме до�тупны две разные формы �оздани� �ообщений. Кнопка «Создать тему», наход�ща��� в каждом разделе форума и на �транице тем, предназначена дл� �оздани� новой темы. <br />
-<br />
-<em>Опции темы</em><br />
-При нажатии на "Показать опции фильтра" вы увидите на�тройки про�мотра �пи�ка тем.<br />
-Зде�ь можно выбрать тип темы, вид �ортировки и врем�.
-<br />
-<br />
-<strong>Про�мотр �ообщений</strong><br />
-<br />
-<em>Репутаци�</em><br />
-Е�ли разрешено вы можете видеть опции репутации ниже каждого �ообщени�. Вы можете вы�тавить репутацию пользователю за �ообщение нажав на <img src='{style_image_url}/add.png' /> или <img src='{style_image_url}/delete.png' /> .<br />
-<br />
-<em>Ответ в тему</em><br />
-При про�мотре темы, вы увидите кнопку «Ответить», котора� предназначена дл� добавлени� вашего �ообщени� в данную тему. 
-<br />
-<br />
-Под каждым �ообщением в теме имеет�� кнопка «Цитата». При нажатии на �ту кнопку, вы �можете ответить в тему, � цитированием того �ообщени�, над которым нажали данную кнопку. Таким образом, при нажатии на �ту кнопку, вы попадете на �траницу напи�ани� ответа в тему, где под формой ответа вы увидите дополнительное тек�товое окно, � тек�том процитированного �ообщени�, которое вы можете отредактировать на ваше у�мотрение. <br />
-<br />
-<em>Опции �ообщени�</em><br />
-Вы можете изменить или удалить �ообщение, нажав �оответ�твенно  на кнопки "Изменить" или "Удалить".<br />
-<br />
-<br />
-<strong>Опро�ы</strong><br />
-При �оздании новой темы, под пол�ми дл� ввода названи� и опи�ани� темы, вы увидите ��ылку «Управление опро�ом». �ажав на �то ��ылку, вам откроют�� опции опро�а. Первое поле �лужит дл� ввода названи� опро�а (необ�зательно), второе - дл� ввода в нем вопро�а вашего голо�овани�. Чтобы добавить вопро� к вашему опро�у, нужно кликнуть на «Добавить еще вопро� в опро�». Количе�тво возможных опро�ов в одной теме и �оответ�твенно вариантов ответов у�танавливает�� админи�тратором форума.
-Про�мотреть разрешенное количе�тво вопро� и вариантов ответов к каждому вопро�у вы можете по�мотреть внизу формы добавлени� опро�а.
-Чтобы отменить ве�ь опро�, вам нужно нажать «Закрыть форму опро�а»
-<br />
-<br />
-Вы можете изменить �вой голо�. Дл� �того нужно нажать на "Удалить мой голо�", а затем �нова выбрать вариант ответа.<br />
-<br />
-Дл� про�мотра результатов голо�овани� нажмите "Показать результаты".<br />
-<br />
-<strong>Уведомлени�</strong><br />
-�а форуме �уще�твует возможно�ть уведомл�ть ва� о новых �ообщени�х в темах. Многие пользователи � у�пехом и�пользуют �ту функцию дл� �воевременного извещени� о том, что в теме имеют�� новые �ообщени�. <br />
-<br />
-Дл� �лежени� за форумом или темой нажмите на кнопку "Подпи�ать��".<br />
-<br />
-Е�ть не�колько типов уведомлени�:<br />
-<ul><li><strong>�е уведомл�ть</strong>: При выборе �той опции вы не будете получать никаких уведомлений на e-mail, но в�е новые и обновленные темы будут �охранены на вашей личной �транице подпи�ок.</li><li><strong>Уведомление � задержкой</strong>: При выборе �той опции вы будете уведомлены о новых темах или ответах во врем� �воего от�ут�тви� на форуме.</li><li><strong>�емедленное уведомление</strong>: При выборе �той опции вы будете уведомлены о новых темах или ответах, незави�имо от того, при�ут�твуете ли вы или от�ут�твуете на форуме.</li><li><strong>Ежедневное уведомление</strong>: При выборе �той опции вы будете ежедневно получать краткое уведомление обо в�ех новых темах и �ообщени�х за текущий день.</li><li><strong>Еженедельное уведомление</strong>: При выборе �той опции вы будете еженедельно получать краткое уведомление обо в�ех новых �ообщени�х за текущую неделю.</li></ul><br />
-<br />
-<br />
-Отменить подпи�ки на любой из разделов или тем, на которые вы подпи�аны, вы можете в личных на�тройках или, зайд� в тему или форум и нажав на "О�тановить от�леживание темы".]]></text>
-      <description>Помощь по форумам, темам, опро�ам и �ообщени�м.</description>
-      <position>4</position>
-      <app>forums</app>
-    </row>
-  </help>
-</export>
diff --git a/upload/admin/applications/forums/xml/forums_mobile_templates.xml b/upload/admin/applications/forums/xml/forums_mobile_templates.xml
index c644d1ff..acd4f94b 100644
--- a/upload/admin/applications/forums/xml/forums_mobile_templates.xml
+++ b/upload/admin/applications/forums/xml/forums_mobile_templates.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<templates application="forums" templategroups="a:8:{s:11:&quot;skin_boards&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_forum&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_legends&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_mod&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_poll&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_post&quot;;s:5:&quot;exact&quot;;s:14:&quot;skin_printpage&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_topic&quot;;s:5:&quot;exact&quot;;}">
+<templates application="forums" templategroups="a:7:{s:11:&quot;skin_boards&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_forum&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_legends&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_mod&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_poll&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_post&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_topic&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_boards">
     <template>
       <template_group>skin_boards</template_group>
       <template_content><![CDATA[<a href='{parse url="showuser={$user['member_id']}" seotitle="{$user['members_seo_name']}" template="showuser"  base="public"}' title='{$this->lang->words['view_profile']}'>{$user['members_display_name']}</a><if test="age:|:$pyear"> (<strong>{$pyear}</strong>)</if>]]></template_content>
       <template_name>birthday</template_name>
       <template_data>$user, $pyear</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -15,34 +15,36 @@
     <template>
       <template_group>skin_boards</template_group>
       <template_content><![CDATA[<if test="$this->settings['_onIndex'] = 1"></if>
-<div class='master_list'>
+<div class='master_list' id='board_index'>
 	<if test="cats_forums:|:is_array( $cat_data ) AND count( $cat_data )">
 		<foreach loop="categories:$cat_data as $_data">
 			<if test="cat_has_forums:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
-				<h2 class="touch-row" id="cat-{$_data['cat_data']['id']}"><a href="{parse url="showforum={$_data['cat_data']['id']}" seotitle="{$_data['cat_data']['name_seo']}" template="showforum" base="public"}" class="title" title='{$this->lang->words['view_cat']}'>{$_data['cat_data']['name']}</a></h2>
+				<h3 id="cat-{$_data['cat_data']['id']}"><!--<a href="{parse url="showforum={$_data['cat_data']['id']}" seotitle="{$_data['cat_data']['name_seo']}" template="showforum" base="public"}" class="title" title='{$this->lang->words['view_cat']}'>-->{$_data['cat_data']['name']}<!--</a>--></h3>
 				<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
 					<if test="forumRedirect:|:$forum_data['redirect_on']">
 						<div class='row touch-row' id="forum-{$forum_data['id']}">
 							<div class='icon'>{parse replacement="f_redirect"}</div>
-							<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
-							<br /><span class='desc'>{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}</span>
+							<div class='rowContent'>
+								<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
+								<br /><span class='desc'>{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}</span>
+							</div>
 						</div>
 					<else />
 						<div class='row touch-row' id="forum-{$forum_data['id']}">
 							<div class='icon'>
 								<if test="unreadicon:|:$forum_data['img_new_post'] != 'f_locked' && strstr( $forum_data['img_new_post'], 'unread' )">
 									<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" title="{$this->lang->words['bi_markread']}" class='forum_marker'>
-										{parse replacement="{$forum_data['img_new_post']}"}
+										{parse replacement="f_unread"}
 									</a>
 								<else />
-									{parse replacement="{$forum_data['img_new_post']}"}
+									{parse replacement="f_read"}
 								</if>
 							</div>
 							<div class='rowContent'>
 								<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
 								<br />
 								<span class='desc'>
-									{$forum_data['topics']} {$this->lang->words['topics']}
+									<span class='number'>{$forum_data['topics']}</span> {$this->lang->words['topics']}
 									<if test="hideDateUrl:|:! $forum_data['hide_last_info']">
 										&middot; {$this->lang->words['last_post']} {parse date="$forum_data['last_post']" format="SHORT"}
 									</if>
@@ -56,8 +58,8 @@
 	</if>
 </div>]]></template_content>
       <template_name>boardIndexTemplate</template_name>
-      <template_data><![CDATA[$lastvisit="", $stats=array(), $calendar_events=FALSE, $birthdays=FALSE, $chat_html='', $news_data=array(), $cat_data=array(), $show_side_blocks=true, $side_blocks=array()]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_data><![CDATA[$lastvisit="", $stats=array(), $cat_data=array(), $show_side_blocks=true, $side_blocks=array()]]></template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -65,36 +67,36 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>hookBoardIndexShareLinks</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>hookBoardIndexStatusUpdates</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_data>$updates=array()</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>hookFacebookActivity</template_name>
       <template_data/>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_boards</template_group>
@@ -113,18 +115,7 @@
 	</div>]]></template_content>
       <template_name>hookRecentBlogEntries</template_name>
       <template_data>$entries</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>hookRecentGalleryImages</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -149,18 +140,7 @@
 	</div>]]></template_content>
       <template_name>hookRecentTopics</template_name>
       <template_data>$topics</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>hookTopPosters</template_name>
-      <template_data>$posters</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -169,9 +149,9 @@
     <template>
       <template_group>skin_boards</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookUnreadNotifications</template_name>
-      <template_data>$notifications</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_name>hookTagCloud</template_name>
+      <template_data>$tags</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -249,12 +229,34 @@
 	</div>]]></template_content>
       <template_name>hookWatchedItems</template_name>
       <template_data>$updatedTopics, $nUpdatedTopics, $updatedForums, $nUpdatedForums</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_boards</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>statusReplies</template_name>
+      <template_data>$replies=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_boards</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>statusUpdates</template_name>
+      <template_data>$updates=array(), $smallSpace=0, $latestOnly=0</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_boards</template_group>
       <template_content><![CDATA[<div id='active_chat' class='stats_list'>
@@ -265,7 +267,7 @@
 		</div>]]></template_content>
       <template_name>whoschatting_empty</template_name>
       <template_data/>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -285,7 +287,7 @@
 		</div>]]></template_content>
       <template_name>whoschatting_show</template_name>
       <template_data><![CDATA[$total="",$names=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -308,9 +310,7 @@
 </if>
 <table class='ipb_table'>
 	<tr class='header'>
-		<if test="guestthumb:|:$this->memberData['member_id'] || $this->settings['guests_img']">
-			<th>&nbsp;</th>
-		</if>
+		<th>&nbsp;</th>
 		<th>{$this->lang->words['attach_title']}</th>
 		<th>{$this->lang->words['attach_size']}</th>
 		<th>{$this->lang->words['attach_post']}</th>
@@ -319,15 +319,9 @@
 	<if test="count($rows)">
 		<foreach loop="attachments:$rows as $data">
 			<tr class='{parse striping="attachies"}' id="{$data['attach_id']}">
-			<if test="guestthumb:|:$this->memberData['member_id'] || $this->settings['guests_img']">
 				<td class="altrow short">
-				<if test="attachthumb:|:$data['attach_thumb_location']">
-					<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['attach_file']}"><img src="{$this->settings['upload_url']}/{$data['attach_thumb_location']}" width="30" height="30" /></a>
-				<else />
 					<img src="{$this->settings['mime_img']}/{$data['image']}" alt="{$this->lang->words['attached_file']}" />
-				</if>
 				</td>
-			</if>
 				<td>
 					<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['attach_file']}">{$data['short_name']}</a><br />
 					<span class="desc">( {$this->lang->words['attach_hits']}: {$data['attach_hits']} )<br />( {$this->lang->words['attach_post_date']} {$data['attach_date']} )</span>
@@ -344,7 +338,7 @@
 </if>]]></template_content>
       <template_name>forumAttachments</template_name>
       <template_data>$title, $rows, $pages</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -352,53 +346,43 @@
     </template>
     <template>
       <template_group>skin_forum</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>forumAttachmentsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<div class='master_list'>
-	
+      <template_content><![CDATA[<h2>{parse expression="IPSText::truncate( $forum_data['name'] )"}</h2>
 	<if test="hassubforums:|:is_array( $sub_forum_data ) AND count( $sub_forum_data )">
-		<h2>{$this->lang->words['subforums']}</h2>
-		<foreach loop="subforums:$sub_forum_data as $_data">
-			<if test="subforumdata:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
-				<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">				
-					<if test="forumRedirect:|:$forum_data['redirect_on']">
-						<div id="forum-{$forum_data['id']}" class='row touch-row'>
-							<div class='icon'>{parse replacement="f_redirect"}</div>
-							<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
-							<br /><span class='desc'>{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}</span>
-						</div>
-					<else />
-						<div id="forum-{$forum_data['id']}" class='row touch-row'>
-							<div class='icon'>
-								<if test="unreadicon:|:$forum_data['img_new_post'] != 'f_locked' && strstr( $forum_data['img_new_post'], 'unread' )">
-									<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" title="{$this->lang->words['bi_markread']}" class='forum_marker'>
-										{parse replacement="{$forum_data['img_new_post']}"}
-									</a>
-								<else />
-									{parse replacement="{$forum_data['img_new_post']}"}
-								</if>
+		<div class='master_list' id='board_index'>
+			<foreach loop="subforums:$sub_forum_data as $_data">
+				<if test="subforumdata:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
+					<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">				
+						<if test="forumRedirect:|:$forum_data['redirect_on']">
+							<div id="forum-{$forum_data['id']}" class='row touch-row'>
+								<div class='icon'>{parse replacement="f_redirect"}</div>
+								<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
+								<br /><span class='desc'>{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}</span>
 							</div>
-							<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
-							<br /><span class='desc'>{$forum_data['topics']} {$this->lang->words['topics']}</span>
-						</div>
-					</if>
-				</foreach>
-			</if>
-		</foreach>
+						<else />
+							<div id="forum-{$forum_data['id']}" class='row touch-row'>
+								<div class='icon'>
+									<if test="unreadicon:|:$forum_data['img_new_post'] != 'f_locked' && strstr( $forum_data['img_new_post'], 'unread' )">
+										<a href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" title="{$this->lang->words['bi_markread']}" class='forum_marker'>
+											{parse replacement="f_unread"}
+										</a>
+									<else />
+										{parse replacement="f_read"}
+									</if>
+								</div>
+								<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}' class='title'>{$forum_data['name']}</a>
+								<br /><span class='desc'>{$forum_data['topics']} {$this->lang->words['topics']}</span>
+							</div>
+						</if>
+					</foreach>
+				</if>
+			</foreach>
+		</div>
 	</if>
 	
+	<div class='master_list'>
 	<if test="showtopics:|:$forum_data['sub_can_post']">
 		
-		<h2>{$forum_data['name']}</h2>
+		<!--<h2>{$forum_data['name']}</h2>-->
 		<div class='controls'>
 			<div class='buttons'>
 				<if test="usercanpost:|:$forum_data['_user_can_post']">
@@ -411,42 +395,38 @@
 		<if test="hasannouncements:|:is_array( $announce_data ) AND count( $announce_data )">
 			<foreach loop="announcements:$announce_data as $aid => $adata">
 				<div class='row touch-row' id="ann-{$adata['announce_id']}">
-					<strong><a href="{parse url="showannouncement={$adata['announce_id']}&amp;f={$forum_data['id']}" seotitle="%%{$adata['announce_title']}%%" template="showannouncement" base="public"}" title='{$this->lang->words['view_announcement']}'>{$adata['announce_title']}</a></strong>
-					<br /><span class='topic_prefix'>{$this->lang->words['announce_row']}</span> 
+					<div class='icon'>{parse replacement="t_announcement"}</div>
+					<div class='rowContent'>
+						<strong><a href="{parse url="showannouncement={$adata['announce_id']}&amp;f={$forum_data['id']}" seotitle="%%{$adata['announce_title']}%%" template="showannouncement" base="public"}" title='{$this->lang->words['view_announcement']}' class='title'>{$adata['announce_title']}</a></strong>
+					</div>
 				</div>
 			</foreach>
-			<h3>{$this->lang->words['forum_topic_list']}</h3>
 		</if>
 		
 		<if test="hastopics:|:is_array( $topic_data ) AND count( $topic_data )">
+			<h3>{$this->lang->words['forum_topic_list']}</h3>
 			{parse striping="forumTable" classes="row1,row2"}
 			<foreach loop="topics:$topic_data as $tid => $data">
 				<if test="queuedtopic:|:$data['approved']">
-					<div class='row touch-row' id="topic-{$data['tid']}">
+					<div class='row touch-row <if test="$data['_unreadUrl']">unread</if> <if test="$data['_isDeleted']">moderated</if>' id="topic-{$data['tid']}">
 						<div class='icon'>
-							{parse replacement="{$data['folder_img']}"}
+							{parse template="generateTopicIcon" group="global_other" params="$data['folder_img'], $data['_unreadUrl']"}
 						</div>
 						<div class='rowContent'>
 							<if test="topichasattach:|:$data['topic_hasattach']">
 								{parse replacement="t_attach"}
 							</if>
-							<strong><a href="{parse url="showtopic={$data['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$data['title_seo']}"}" title='{$this->lang->words['topic_started_on']} {$data['start_date']}' class='topic_title title'>{$data['title']}</a></strong>
+							<a href="{parse url="showtopic={$data['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$data['title_seo']}"}" class='topic_title title'>{$data['title']}</a>
 							{$data['prefix']}
 							<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
 								<span class='mini_pagination'>
-									<foreach loop="pages:$data['pages'] as $page">
-											<if test="haslastpage:|:$page['last']">
-												<a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a>
-											<else />
-												<a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a>
-											</if>
-									</foreach>
+									{parse expression="sprintf( $this->lang->words['mini_page_count'], $data['pages'][0]['total'] )"}
 								</span>
 							</if>
 							
 							<br />
 							<span class='subtext'>
-								{$data['_posts']} <if test="replylang:|:intval($data['_posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if>: {$this->lang->words['lastby']} {$data['last_poster_name']}{parse template="user_popup" group="global" params="$data['last_poster_id'], $data['seo_last_name']"}, {parse date="$data['last_post']" format="SHORT"}
+								{parse format_number="$data['posts']"} <if test="replylang:|:intval($data['_posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if>: {$this->lang->words['lastby']} {$data['last_poster_name']}{parse template="user_popup" group="global" params="$data['last_poster_id'], $data['seo_last_name']"}, {parse date="$data['last_post']" format="SHORT"}
 							</span>
 						</div>
 					</div>
@@ -469,7 +449,7 @@
 </div>]]></template_content>
       <template_name>forumIndexTemplate</template_name>
       <template_data>$forum_data, $announce_data, $topic_data, $other_data, $multi_mod_data, $sub_forum_data, $footer_filter, $active_user_data, $mod_data, $inforum=1</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -495,12 +475,34 @@
 </div>]]></template_content>
       <template_name>forumPasswordLogIn</template_name>
       <template_data><![CDATA[$fid=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>likeSummary</template_name>
+      <template_data>$data, $relId, $opts</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>likeSummaryContents</template_name>
+      <template_data>$data, $relId, $opts=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_forum</template_group>
       <template_content><![CDATA[<h2>{$rules['title']}</h2>
@@ -509,16 +511,27 @@
 	<p><br />{$rules['body']}</p>
 </div>
 <fieldset class='submit'>
-	<a href="{parse url="act=SF&amp;f={$rules['fid']}" base="public"}">{$this->lang->words['back_to_forum']}</a>
+	<a href="{parse url="showforum={$rules['fid']}" base="public" seotitle="{$rules['fseo']}" template="showforum"}">{$this->lang->words['back_to_forum']}</a>
 </fieldset>]]></template_content>
       <template_name>show_rules</template_name>
       <template_data><![CDATA[$rules=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>topic</template_name>
+      <template_data>$data, $forum_data, $other_data, $inforum</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_forum</template_group>
       <template_content><![CDATA[<span class='mini_rate'>
@@ -532,7 +545,7 @@
 </span>]]></template_content>
       <template_name>topic_rating_image</template_name>
       <template_data>$rating_id=1</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -545,19 +558,7 @@
 </if>]]></template_content>
       <template_name>topicPrefixWrap</template_name>
       <template_data>$text</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<!-- SKINNOTE: This is the link for the "who posted" ajax popup   -->
-<a href="{parse url="app=forums&amp;module=extras&amp;section=stats&amp;do=who&amp;t={$tid}" base="public"}" onclick="return ipb.forums.retrieveWhoPosted( {$tid} );">$posts</a>]]></template_content>
-      <template_name>who_link</template_name>
-      <template_data><![CDATA[$tid="",$posts=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -576,7 +577,7 @@
 		<th style='width: 50%'>{$this->lang->words['bbc_after']}</th>
 	</tr>
 	<foreach loop="bbcode:$rows as $row">
-		<tr class='subhead altbar'>
+		<tr class='subhead bar altbar'>
 			<th colspan='2'>{$row['title']}</th>
 		</tr>
 		<tr class='row1'>
@@ -597,7 +598,7 @@
 </script>]]></template_content>
       <template_name>bbcodePopUpList</template_name>
       <template_data>$rows</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -622,7 +623,7 @@
 </div>]]></template_content>
       <template_name>emoticonPopUpList</template_name>
       <template_data>$editor_id, $rows</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -633,7 +634,7 @@
       <template_content><![CDATA[<div><b>{$tag}</b></div>]]></template_content>
       <template_name>wrap_tag</template_name>
       <template_data><![CDATA[$tag=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -660,7 +661,7 @@
 </form>]]></template_content>
       <template_name>deleteTopicForm</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -696,7 +697,7 @@
 </form>]]></template_content>
       <template_name>editTopicTitle</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -714,13 +715,6 @@
 	<fieldset>
 		<h3 class='bar'>{$this->lang->words['edit_user_images']}</h3>
 		<ul>
-			<li class='field'>
-				<label for='avatar'>{$this->lang->words['cp_remove_av']}</label>
-				<select name="avatar" id='avatar' class='input_select'>
-					<option value="0">{$this->lang->words['no']}</option>
-					<option value="1">{$this->lang->words['yes']}</option>
-				</select>
-			</li>
 			<li class='field'>
 				<label for='photo'>{$this->lang->words['cp_remove_photo']}</label>
 				<select name="photo" id='photo' class='input_select'>
@@ -763,12 +757,23 @@
 </form>]]></template_content>
       <template_name>editUserForm</template_name>
       <template_data>$profile, $custom_fields=null</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_mod</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>mergeMultiplePolls</template_name>
+      <template_data>$polls, $tids</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_mod</template_group>
       <template_content><![CDATA[{parse js_module="moderate"}
@@ -814,7 +819,6 @@
 		<h3 class='bar'>{$this->lang->words['post_content']}</h3>
 		{$editor}
 	</fieldset>
-	<!--SKINNOTE: This wasn't skinned - did my best to match it to the rest of the IPB style, but might want to touch it up-->
 	<if test="mergepostsattachments:|:count($uploads)">
 		<fieldset>
 			<h3 class='bar'>{$this->lang->words['cm_attach']}</h3>
@@ -846,7 +850,7 @@
 </form>]]></template_content>
       <template_name>mergePostForm</template_name>
       <template_data>$editor, $dates, $authors, $uploads, $seoTitle</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -888,7 +892,7 @@
 </form>]]></template_content>
       <template_name>mergeTopicsForm</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -947,7 +951,7 @@
 </form>]]></template_content>
       <template_name>movePostForm</template_name>
       <template_data><![CDATA[$forum, $topic, $posts, $error='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -987,7 +991,7 @@
 </form>]]></template_content>
       <template_name>moveTopicForm</template_name>
       <template_data>$forum, $topic, $forum_jump</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1039,7 +1043,7 @@
 </form>]]></template_content>
       <template_name>moveTopicsForm</template_name>
       <template_data>$forum, $jump_html, $topics</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1137,7 +1141,7 @@
 </div>]]></template_content>
       <template_name>pruneSplash</template_name>
       <template_data><![CDATA[$forum="", $forums_html="", $confirm_data="", $complete_html=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1151,7 +1155,7 @@
 </div>]]></template_content>
       <template_name>simplePage</template_name>
       <template_data><![CDATA[$title="", $msg=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1162,7 +1166,7 @@
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>softDeleteSplash</template_name>
       <template_data>$forum, $tids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1173,7 +1177,7 @@
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>softDeleteSplashPosts</template_name>
       <template_data>$forum, $topic, $pids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1237,7 +1241,7 @@
 </form>]]></template_content>
       <template_name>splitPostForm</template_name>
       <template_data>$forum, $topic, $posts, $jump</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1323,7 +1327,7 @@
 </table>]]></template_content>
       <template_name>topicHistory</template_name>
       <template_data>$topic, $avg_post, $mod_logs=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1346,7 +1350,7 @@
 </form>]]></template_content>
       <template_name>unsubscribeForm</template_name>
       <template_data>$forum, $topic, $text</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1374,7 +1378,7 @@
 </form>]]></template_content>
       <template_name>warn_add_note_form</template_name>
       <template_data><![CDATA[$id="",$name="",$seo_name=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1398,7 +1402,7 @@
 <br />]]></template_content>
       <template_name>warn_success</template_name>
       <template_data>$topic=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1455,7 +1459,7 @@
 	</div>]]></template_content>
       <template_name>warn_view_log</template_name>
       <template_data><![CDATA[$member, $rows, $links='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1472,7 +1476,6 @@
 	<p class='message error'>{$errors}</p>
 	<br />
 </if>
-<!-- SKINNOTE: form validation -->
 <form method="post" action='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=dowarn&amp;mid={$member['member_id']}&amp;t={$tid}&amp;st={$st}&amp;type={$this->request['type']}" base="public"}' id='postingform'>
 <input type="hidden" name="key" value="{$this->member->form_hash}" />
 <div class='post_form'>
@@ -1481,14 +1484,14 @@
 <fieldset class='with_subhead'>
 	<h3 class='bar'>{$this->lang->words['warn_member_details']}</h3>
 	<h4>
-		<img class="photo" src='{$member['pp_main_photo']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}" />
+		<img class="photo" src='{$member['pp_main_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" />
 	</h4>
 	<ul>
 		<li class='field'>
-			{parse replacement="find_posts_link"} <a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}<if test="searchmethodfilter:|:! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}'>{$this->lang->words['find_posts']}</a>
+			<a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}<if test="searchmethodfilter:|:! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}'>{$this->lang->words['find_posts']}</a>
 		</li>
 		<li class='field'>
-			{parse replacement="find_topics_link"} <a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}&amp;search_filter_app[forums]=1&amp;view_by_title=1" base="public"}'>{$this->lang->words['find_topics']}</a>
+			<a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}&amp;search_filter_app[forums]=1&amp;view_by_title=1" base="public"}'>{$this->lang->words['find_topics']}</a>
 		</li>
 		<if test="displaynamehistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
 			<li class='field' id='dname_history'>
@@ -1691,18 +1694,7 @@
 </form>]]></template_content>
       <template_name>warnForm</template_name>
       <template_data><![CDATA[$member, $tid=0, $st=0, $errors='', $modque=false, $postque=false, $ban=false, $editor_html='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>warnLogsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1724,7 +1716,7 @@
 </html>]]></template_content>
       <template_name>attachiFrame</template_name>
       <template_data>$JSON, $id</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1738,7 +1730,7 @@
 <br />]]></template_content>
       <template_name>errors</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1749,29 +1741,28 @@
       <template_content><![CDATA[{parse js_module="poll"}
 <script type='text/javascript'>
 //<!#^#|CDATA|
-	ipb.poll.maxQuestions = parseInt( {$max_poll_questions} );
-	ipb.poll.maxChoices = parseInt( {$max_poll_choices} );
-	ipb.poll.isPublicPoll = parseInt( {$poll_view_voters} );
-	ipb.poll.showOnLoad = {$show_open};
-	ipb.poll.isMod = {$is_mod};
+	ipb.poll.maxQuestions = parseInt( {$data['max_poll_questions']} );
+	ipb.poll.maxChoices = parseInt( {$data['max_poll_choices']} );
+	ipb.poll.isPublicPoll = parseInt( {$data['poll_view_voters']} );
+	ipb.poll.showOnLoad = {$data['show_open']};
+	ipb.poll.isMod = {$data['is_mod']};
 	
 	ipb.poll.questions = \$H(
-		<if test="hasPollQuestions:|:$poll_questions != '[]'">{$poll_questions}</if>
+		<if test="hasPollQuestions:|:$data['poll_questions'] != '[]'">{$data['poll_questions']}</if>
 	);
 	
 	ipb.poll.choices = \$H(
-		<if test="hasPollChoices:|:$poll_choices != '[]'">{$poll_choices}</if>
+		<if test="hasPollChoices:|:$data['poll_choices'] != '[]'">{$data['poll_choices']}</if>
 	);
 	
 	ipb.poll.votes = \$H(
-		<if test="hasPollVotes:|:$poll_votes != '[]'">{$poll_votes}</if>
+		<if test="hasPollVotes:|:$data['poll_votes'] != '[]'">{$data['poll_votes']}</if>
 	);
 	
 	ipb.poll.multi = \$H(
-		<if test="hasPollMulti:|:$poll_multi != '[]'">{$poll_multi}</if>
+		<if test="hasPollMulti:|:$data['poll_multi'] != '[]'">{$data['poll_multi']}</if>
 	);
 	
-	//ipb.templates['poll_section_wrap'] = "<div id='poll_#{id}' class='general_box'>#{content}</div>";
 	ipb.templates['poll_question'] = 	new Template("<li class='field question' id='question_#{qid}_wrap' style='display: none'>" +
 											"	<label for='#{qid}'><strong>{$this->lang->words['question_title']}</strong></label>" +
 											"	<div class='wrap rounded'>" + 
@@ -1798,18 +1789,18 @@
 		<ul id='poll_container'>
 			<li class='field'>
 				<label for='poll_title'>{$this->lang->words['poll_fs_title']}</label>
-				<input type='text' class='input_text' name='poll_question' id='poll_title' size='40' value='{$poll_question}' />
+				<input type='text' class='input_text' name='poll_question' id='poll_title' size='40' value='{$data['poll_question']}' />
 			</li>
-			<if test="allowPublicPoll:|:$this->settings['poll_allow_public'] AND ! $total_votes">
+			<if test="allowPublicPoll:|:$this->settings['poll_allow_public'] AND ! $data['poll_votes']">
 				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='poll_view_voters' id='poll_view_voters' value='1' <if test="viewPollVoters:|:$poll_view_voters">checked='checked'</if> />
+					<input type='checkbox' class='input_check' name='poll_view_voters' id='poll_view_voters' value='1' <if test="viewPollVoters:|:$data['poll_view_voters']">checked='checked'</if> />
 					<label for='poll_view_voters'>{$this->lang->words['poll_fs_public']}</label>
 					<span class='desc'>{$this->lang->words['poll_public_warning']}</span>
 				</li>
 			</if>
 			<if test="makePollOnly:|:$this->settings['ipb_poll_only']">
 				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='poll_only' id='poll_only' value='1' <if test="pollOnlyChecked:|:$poll_only">checked='checked'</if> />
+					<input type='checkbox' class='input_check' name='poll_only' id='poll_only' value='1' <if test="pollOnlyChecked:|:$data['poll_only']">checked='checked'</if> />
 					<label for='poll_only'>{$this->lang->words['poll_only_title']}</label>
 					<span class='desc'>{$this->lang->words['poll_only_desc']}</span>
 				</li>
@@ -1825,8 +1816,8 @@
 	</fieldset>
 </div>]]></template_content>
       <template_name>pollBox</template_name>
-      <template_data><![CDATA[$max_poll_questions="",$max_poll_choices="",$poll_questions="",$poll_choices="",$poll_votes="",$show_open="",$poll_question="",$is_mod=0,$poll_multi="",$poll_only='', $poll_view_voters='', $total_votes=0]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_data>$data</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1837,56 +1828,60 @@
       <template_content><![CDATA[<div class='master_list'>
 	<form id='postingform' action='{$this->settings['base_url']}' method='post' enctype='multipart/form-data'>
 	<h2>{$formData['title']}</h2>
+	<div class='ipsForm_vertical'>
 	<if test="logged_in_check:|:! $this->memberData['member_id']">
-		<h3>{$this->lang->words['guest_name_title']}</h3>
-		<div class='row'>
-			<span class='field'>{$this->lang->words['guest_name']}</span><br />
+		<div class='ipsField'>
+			<label for='username' class='ipsField_title'>{$this->lang->words['guest_name']}</label>
 			<input type='text' name='UserName' id='username' size='30' value='{$this->request['UserName']}' maxlength="{$this->settings['max_user_name_length']}" class='input_text' tabindex='0' />
 		</div>
-		<h3>{$this->lang->words['guest_captcha']}</h3>
-		<div class='row'>
+		<div class='ipsField ipsField_captcha'>
 			{$formData['captchaHTML']}
 		</div>
 	</if>
 	
 	<if test="edit_title_check:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit' AND $formData['canEditTitle'] )">
-		<h3>{$this->lang->words['topic_information']}</h3>
-		<div class='row'>
-			<span class='field'>{$this->lang->words['topic_title']}</span><br />
+		<div class='ipsField'>
+			<label for='topic_title' class='ipsField_title'>{$this->lang->words['topic_title']}</label>
 			<input id='topic_title' class='input_text' type="text" size="30" maxlength="{$this->settings['topic_title_max_len']}" name="TopicTitle" value="{$formData['topicTitle']}" tabindex="0" />
-			<br /><br />
-			<span class='field'>{$this->lang->words['topic_desc']}</span><br />
-			<input id='topic_desc' class='input_text' type="text" size="30" maxlength="70" name="TopicDesc" value="{$formData['topicDesc']}" tabindex="0" /><br />
-			<span class='desc'>{$this->lang->words['post_optional']}</span>
 		</div>
 	</if>
 	
-	<h3><if test="emoticons:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit' AND $formData['canEditTitle'] )">{$this->lang->words['topic']}<else />{$this->lang->words['post']}</if></h3>
-	<div class='row'>
+	<div class='ipsField'>
+		<label class='ipsField_title'>{$this->lang->words['topic']}</label>
 		<if test="statusMsgs:|:is_array($formData['statusMsg']) AND count($formData['statusMsg']) AND strlen($formData['statusMsg'][0])">
 			<div class='message'>{parse expression="implode( '<br />', $formData['statusMsg'])"}</div>
 		</if>
 		{$formData['editor']}
 	</div>
-	
-	<h3>{$this->lang->words['options']}</h3>
-	<div class='row line_spacing'>
-		<if test="htmlstatus:|:is_array( $formData['checkBoxes']['html'] ) AND count( $formData['checkBoxes']['html'] )">
-			<select name="post_htmlstatus" class="input_select">
-				<option value="0"{$formData['checkBoxes']['html'][0]}>{$this->lang->words['pp_nohtml']}</option>
-				<option value="1"{$formData['checkBoxes']['html'][1]}>{$this->lang->words['pp_html1']}</option>
-				<option value="2"{$formData['checkBoxes']['html'][2]}>{$this->lang->words['pp_html2']}</option>
-			</select>
-			<br /><br />
+	<if test="edit_tags_check:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit')">
+		<if test="hazTag:|:$formData['tagBox']">
+			<div class='ipsField tag_field'>
+				{$formData['tagBox']}
+			</div>
 		</if>
-		<input type="checkbox" name="enableemo" class="input_check" value="yes" id='enable_emo' {$formData['checkBoxes']['emo']} />&nbsp;&nbsp;{$this->lang->words['enable_emo']}<br />
+	</if>
+	
+		<if test="htmlstatus:|:is_array( $formData['checkBoxes']['html'] ) AND count( $formData['checkBoxes']['html'] )">
+			<div class='ipsField'>
+				<label for='post_htmlstatus' class='ipsField_title'>{$this->lang->words['pp_htmlstatus']}</label>
+				<select name="post_htmlstatus" class="input_select">
+					<option value="0"{$formData['checkBoxes']['html'][0]}>{$this->lang->words['pp_nohtml']}</option>
+					<option value="1"{$formData['checkBoxes']['html'][1]}>{$this->lang->words['pp_html1']}</option>
+					<option value="2"{$formData['checkBoxes']['html'][2]}>{$this->lang->words['pp_html2']}</option>
+				</select>
+			</div>
+		</if>
+		<input type='hidden' name='enableemo' value='yes' />
+		<input type='hidden' name='enablesig' value='yes' />
 		<if test="enablesig:|:$this->memberData['member_id']">
-			<input type="checkbox" name="enablesig" class="input_check" value="yes" id='enable_sig' {$formData['checkBoxes']['sig']} />&nbsp;&nbsp;{$this->lang->words['enable_sig']}<br />
-			<if test="tracking:|:$formData['checkBoxes']['tra'] == '-tracking-'">
-				<span class='desc'>{$this->lang->words['already_sub']}</span>
-			<else />
-				<input type="checkbox" name="enabletrack" class="input_check" id='enable_track' value="1" {$formData['checkBoxes']['tra']} />&nbsp;&nbsp;{$this->lang->words['enable_track']}
-			</if>
+			<div class='ipsField ipsField_checkbox'>
+				<if test="tracking:|:$formData['checkBoxes']['tra'] == '-tracking-'">
+					<span class='desc'>{$this->lang->words['already_sub']}</span>
+				<else />
+					<input type="checkbox" name="enabletrack" class="input_check" id='enable_track' value="1" {$formData['checkBoxes']['tra']} />
+					<p class='ipsField_content'><label for='enable_track'>{$this->lang->words['enable_track']}</label></p>
+				</if>
+			</div>
 		</if>
 	</div>
 	
@@ -1904,18 +1899,18 @@
 		<input type='hidden' name='attach_post_key' value='{$form['attach_post_key']}' />
 		<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
 		<input type='hidden' name='removeattachid' value='0' />
-		<input type="submit" name="dosubmit" value="{$formData['buttonText']}" tabindex="0" class="input_submit" accesskey="s"  />
-		{$this->lang->words['or']} <if test="cancelposting:|:$form['t']">
+		<input type="submit" name="dosubmit" value="{$formData['buttonText']}" tabindex="0" class="button" accesskey="s"  />
+		<!--{$this->lang->words['or']} <if test="cancelposting:|:$form['t']">
 				<a href='{parse url="showtopic={$form['t']}" template="showtopic" seotitle="{$formData['seoTopic']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
 			<else />
 				<a href='{parse url="showforum={$form['f']}" template="showforum" seotitle="{$formData['seoForum']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-			</if>
+			</if>-->
 	</div>
 	</form>
 </div>]]></template_content>
       <template_name>postFormTemplate</template_name>
       <template_data>$formData=array(), $form = array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1923,8 +1918,7 @@
     </template>
     <template>
       <template_group>skin_post</template_group>
-      <template_content><![CDATA[<!-- SKINNOTE: Needs code updating -->
-<if test="postpreview:|:$data AND trim($data) != '<br />' AND trim($data) != '<br>'">
+      <template_content><![CDATA[<if test="postpreview:|:$data AND trim($data) != '<br />' AND trim($data) != '<br>'">
 	<h2 class='maintitle'>{$this->lang->words['post_preview']}</h2>
 	<div class='post_wrap' id='post_preview'>
 		<div class='row2' style='padding:8px'>
@@ -1935,7 +1929,7 @@
 </if>]]></template_content>
       <template_name>preview</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1974,7 +1968,7 @@
 </div>]]></template_content>
       <template_name>topicSummary</template_name>
       <template_data>$posts=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1995,7 +1989,6 @@
 </script>
 {parse js_module="attach"}
 <h3 class='bar'>{$this->lang->words['upload_title']}</h3>
-<!--SKINNOTE: traditional uploader needs this. -->
 <div id='attach_error_box' class='message error' style='display:none'></div>
 <input type='file' id='nojs_attach_{$id}_1' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
 <input type='file' id='nojs_attach_{$id}_2' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
@@ -2047,106 +2040,7 @@
 </script>]]></template_content>
       <template_name>uploadForm</template_name>
       <template_data><![CDATA[$post_key="",$type="",$stats=array(),$id="",$forum_id=0]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_printpage">
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['tvo_title']}&nbsp;{$title}</h2>
-<p class='message unspecific'>{$this->lang->words['please_choose']}</p>
-<div class='generic_bar'></div>
-{parse striping="strip" classes="row1,row2"}
-<div class='post_form'>
-	<ul>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=printer&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_print_title']}</a></strong><br />{$this->lang->words['o_print_desc']}
-		</li>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=html&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_html_title']}</a></strong><br />{$this->lang->words['o_html_desc']}
-		</li>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=wordr&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_word_title']}</a></strong><br />{$this->lang->words['o_word_desc']}
-		</li>
-	</ul>
-	<p class='submit'>
-		<a href="{parse url="showtopic={$tid}" base="public"}" title='{$this->lang->words['back_topic']}'>{$this->lang->words['_laquo']} {$this->lang->words['back_topic']}</a>
-	</p>
-</div>]]></template_content>
-      <template_name>choose_form</template_name>
-      <template_data><![CDATA[$fid="",$tid="",$title=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<!--Copyright-->
-<if test="pagecopyright:|:$this->settings['ipb_copy_number'] == ''">
-<p id='copyright'>{$this->lang->words['powered_by']}Invision Power Board (http://www.invisionboard.com)<br />&copy; Invision Power Services (http://www.invisionpower.com)</p>
-</if>
-	</div>
-</body>
-</html>]]></template_content>
-      <template_name>pp_end</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset={$IPS_DOC_CHAR_SET}" />
-		<link rel="stylesheet" type="text/css" media="all" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_print.css" />
-		<title>{$this->settings['board_name']}</title>
-	</head>
-	<body id='ipboard_body'>
-	<div id="content">
-		<h2>{$topic_title} <a href="{parse url="showtopic={$tid}" base="public"}" title="{$this->lang->words['click_toview']}">{$this->lang->words['view_original']}</a></h2>
-		<div id='breadcrumb'>{$this->settings['board_name']} -> {$forum_name} -> {$topic_title}</div>
-		<br /><br />]]></template_content>
-      <template_name>pp_header</template_name>
-      <template_data><![CDATA[$forum_name="",$topic_title="",$topic_starter="",$fid="",$tid="",$IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<div class='post_block first hentry <if test="postqueued:|:$post['post']['queued']==1">moderated</if>' id='post_id_{$post['post']['pid']}'>
-	<div class='post_wrap'>
-		<h3>{$entry['members_display_name']}</h3>
-		<p class='posted_info'>
-			<if test="iconid:|:$post['post']['icon_id']">
-				<img src="{$this->settings['public_dir']}style_extra/post_icons/icon{$post['post']['icon_id']}.gif" alt="" />&nbsp;
-			</if>
-			{$this->lang->words['posted_prefix']} {$entry['post_date']}
-		</p>
-		<div class='post_body'>
-			<div class='post entry-content'>
-				{$entry['post']}
-				{$entry['attachmentHtml']}
-				<br />
-			</div>
-		</div>
-	</div>	
-</div>]]></template_content>
-      <template_name>pp_postentry</template_name>
-      <template_data><![CDATA[$poster="",$entry=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2154,21 +2048,43 @@
     </template>
   </templategroup>
   <templategroup group="skin_topic">
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>ajax__deletePost</template_name>
+      <template_data/>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>ajaxSigCloseMenu</template_name>
+      <template_data>$post</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<div class='master_list'>
 	
-	<h2>{$announce['announce_title']}</h2>	
+	<h2>{parse expression="IPSText::truncate( $announce['announce_title'], 45 )"}</h2>
 	<div class='topic_reply'>
-		<h2 class='secondary'><a class="url fn" href='{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}'>{$author['members_display_name']}</a></h2>
-		<div class='row post'>
+		<h2 class='secondary' style='padding-left: 10px;'><a class="url fn" href='{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}'>{$author['members_display_name']}</a></h2>
+		<div class='post'>
 			{$announce['announce_post']}
 		</div>
 	</div>
 </div>]]></template_content>
       <template_name>announcement_show</template_name>
       <template_data><![CDATA[$announce="",$author=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2176,30 +2092,36 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<ul>
-	<li>
-			{$post['depthguide']} <span<if test="buildThreaded:|:isset( $post['_show_highlight'] ) && $post['_show_highlight']"> class='highlight'</if>>{parse replacement="{$post['new_post']}"} <strong>{$post['linked_name']}</strong> <span class='post_title'><a href="{parse url="showtopic={$post['topic_id']}&amp;pid={$post['pid']}&amp;start={$this->request['start']}&amp;st={$this->request['st']}#entry{$post['pid']}" base="public"}">{$post['post_title']}</a></span> &nbsp;&nbsp;<span class='desc'>{$post['formatted_date']}</span></span>
-			{$child}
-	</li>
-</ul>]]></template_content>
-      <template_name>build_threaded</template_name>
-      <template_data>$post, $child</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>hookFacebookLike</template_name>
       <template_data/>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>likeSummary</template_name>
+      <template_data>$data, $relId, $opts</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>likeSummaryContents</template_name>
+      <template_data>$data, $relId, $opts=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_topic</template_group>
@@ -2237,13 +2159,13 @@
 				</if>
 			</div>
 		</foreach>
-		<fieldset class='submit'>
-			<legend>{$this->lang->words['poll_vote']}</legend>
-			<if test="voteButton:|:$topicData['state'] != 'closed' AND $forumData['status']">
+		<if test="voteButton:|:$topicData['state'] != 'closed'">
+			<fieldset class='submit'>
+				<legend>{$this->lang->words['poll_vote']}</legend>
 				<if test="voteButtonMid:|:$this->memberData['member_id']">
 					<if test="voteButtonVoted:|:$poll['_memberVoted']">
 						<if test="deleteVote:|:$this->settings['poll_allow_vdelete'] OR $this->memberData['g_is_supmod']">
-							<a href='{parse url="app=forums&amp;module=extras&amp;section=vote&amp;t={$topicData['tid']}&amp;st={$this->request['st']}&amp;do=delete&amp;authKey={$this->member->form_hash}" base="public"}' title='{$this->lang->words['poll_delete_vote']}' id='poll_deletevote' class='input_submit alt'>{$this->lang->words['poll_delete_vote']}</a>
+							<a href='{parse url="app=forums&amp;module=extras&amp;section=vote&amp;t={$topicData['tid']}&amp;st={$this->request['st']}&amp;do=delete&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['poll_delete_vote']}' id='poll_deletevote' class='button secondary'>{$this->lang->words['poll_delete_vote']}</a>
 						<else />
 							{$this->lang->words['poll_you_voted']}
 						</if>
@@ -2253,37 +2175,48 @@
 						<else />
 							<!-- VOTE Button -->
 							<if test="cast:|:$this->request['mode'] != 'show'">
-								<input class='input_submit' type="submit" name="submit" value="{$this->lang->words['poll_add_vote']}" title="{$this->lang->words['tt_poll_vote']}" />
+								<input class='button secondary' type="submit" name="submit" value="{$this->lang->words['poll_add_vote']}" title="{$this->lang->words['tt_poll_vote']}" />
 							</if>
 							<!-- SHOW Button -->
 							<if test="displayVotes:|:$this->settings['allow_result_view'] == 1">
 								<if test="alreadyDisplayVotes:|:$this->request['mode'] == 'show'">
 									<if test="viewVotersLink:|:! $poll_view_voters">
-										<a href='{parse url="showtopic={$topicData['tid']}&amp;st={$this->request['st']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}' title='{$this->lang->words['tt_poll_svote']}' id='poll_nullvote' class='input_submit alt'>{$this->lang->words['pl_show_vote']}</a>
+										<a href='{parse url="showtopic={$topicData['tid']}&amp;st={$this->request['st']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}' title='{$this->lang->words['tt_poll_svote']}' id='poll_nullvote' class='button secondary'>{$this->lang->words['pl_show_vote']}</a>
 									</if>
 								<else />
-									<a href='{parse url="showtopic={$topicData['tid']}&amp;mode=show&amp;st={$this->request['st']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}' title='{$this->lang->words['tt_poll_show']}' id='poll_showresults' class='input_submit alt'>{$this->lang->words['pl_show_results']}</a>
+									<a href='{parse url="showtopic={$topicData['tid']}&amp;mode=show&amp;st={$this->request['st']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}' title='{$this->lang->words['tt_poll_show']}' id='poll_showresults' class='button secondary'>{$this->lang->words['pl_show_results']}</a>
 								</if>
 							<else />
-								<input class='input_submit' type="submit" name="nullvote" value="{$this->lang->words['poll_null_vote']}" title="{$this->lang->words['tt_poll_null']}" />
+								<input class='button secondary' type="submit" name="nullvote" value="{$this->lang->words['poll_null_vote']}" title="{$this->lang->words['tt_poll_null']}" />
 							</if>
 						</if>
 					</if>
 				<else />
 					{$this->lang->words['poll_no_guests']}
 				</if>
-			</if>
-		</fieldset>
+			</fieldset>
+		</if>
 	</form>
 </div>]]></template_content>
       <template_name>pollDisplay</template_name>
       <template_data>$poll, $topicData, $forumData, $pollData, $showResults</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>post</template_name>
+      <template_data>$post, $displayData, $topic, $forum=array()</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[{$post['post']}
@@ -2300,23 +2233,12 @@
 	</if>]]></template_content>
       <template_name>quickEditPost</template_name>
       <template_data>$post</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>reputationPopup</template_name>
-      <template_data>$reps</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
     <template>
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<div id='attach_wrap' class='rounded clearfix'>
@@ -2331,7 +2253,7 @@
 </div>]]></template_content>
       <template_name>show_attachment_title</template_name>
       <template_data><![CDATA[$title="",$data="",$type=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2344,7 +2266,7 @@
 <br /><span class="desc info">{$this->lang->words['attach_hits']}: {$data['attach_hits']}</span>]]></template_content>
       <template_name>Show_attachments</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2352,10 +2274,10 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<img src="{$this->settings['upload_url']}/$file_name" class='bbc_img linked-image' alt="{$this->lang->words['pic_attach']}" />]]></template_content>
+      <template_content><![CDATA[<a class='resized_img' rel='lightbox[{$data['attach_rel_id']}]' id='ipb-attach-url-{$data['_attach_id']}' href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module={$data['type']}&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['location']} - {$this->lang->words['attach_size']} {$data['file_size']}, {$this->lang->words['attach_ahits']} {$data['attach_hits']}"><img src="{$this->settings['upload_url']}/{$data['o_location']}" class='bbc_img linked-image' alt="{$this->lang->words['pic_attach']}: {$data['location']}" /></a>]]></template_content>
       <template_name>Show_attachments_img</template_name>
       <template_data><![CDATA[$file_name=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2363,10 +2285,10 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<a class='resized_img' rel='lightbox[{$data['attach_rel_id']}]' id='ipb-attach-url-{$data['_attach_id']}' href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module={$data['type']}&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['location']} - {$this->lang->words['attach_size']} {$data['file_size']}, {$this->lang->words['attach_ahits']} {$data['attach_hits']}"><img src="{$this->settings['upload_url']}/{$data['t_location']}" id='ipb-attach-img-{$data['_attach_id']}' style='width:100px;height:100px' class='attach' alt="{$this->lang->words['pic_attach']}" /></a>]]></template_content>
+      <template_content><![CDATA[<a class='resized_img' rel='lightbox[{$data['attach_rel_id']}]' id='ipb-attach-url-{$data['_attach_id']}' href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module={$data['type']}&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['location']} - {$this->lang->words['attach_size']} {$data['file_size']}, {$this->lang->words['attach_ahits']} {$data['attach_hits']}"><img src="{$this->settings['upload_url']}/{$data['t_location']}" id='ipb-attach-img-{$data['_attach_id']}' class='attach' alt="{$this->lang->words['pic_attach']}" /></a>]]></template_content>
       <template_name>Show_attachments_img_thumb</template_name>
       <template_data>$data=array()</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2374,21 +2296,80 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_content><![CDATA[<php>
+	$_sD = $sdData[ $post['post']['pid'] ];
+	$_sM = $_sD;
+</php>
+	<div class='topic_reply moderated' id='entry{$post['post']['pid']}'>
+		<h2 class='secondary'>
+			<if test="postMember:|:$post['author']['member_id']">
+				<img src='{$post['author']['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$post['author']['members_display_name'])"}" class='photo' />
+				<a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}</span>
+			<else />
+				{$post['author']['members_display_name']}
+			</if>
+			<span class='subtext'>{parse date="$post['post']['post_date']" format="DATE"}</span>
+		</h2>
+		<div id='postsDelete-{$post['post']['pid']}'>
+			<div class='padding'>
+				<strong>{$this->lang->words['post_deleted_by']} <a href='{parse url="showuser={$_sD['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$_sM['members_seo_name']}"}'>{$_sM['members_display_name']}</a> {$this->lang->words['on']} {parse date="$_sD['sdl_obj_date']" format="long"}.</strong>
+				<if test="showReason:|:$post['post']['_softDeleteReason']">
+					<p class='desc'><if test="$_sD['sdl_obj_reason']">{$_sD['sdl_obj_reason']}<else />{$this->lang->words['no_reason_given']}</if></p>
+				</if>
+				
+				<if test="sdOptions:|:$post['post']['_softDeleteContent'] OR $post['post']['_softDeleteRestore']">			
+					<if test="$post['post']['_softDeleteContent']">
+						<br />
+						<span class='post_toggle sd_content' id='seeContent_{$post['post']['pid']}'>
+							<a class='button secondary' href='#'><span>{$this->lang->words['togglepostcontent']}</span></a>
+						</span>
+					</if>
+				</if>
+			</div>
+		</div>
+		<div id="post-{$post['post']['pid']}" class='post line_spacing' style='display: none'>
+			<if test="userIgnored:|:($post['post']['_repignored'] == 1 || $post['post']['_ignored']) AND $this->request['view_ignored'] != $post['post']['pid']">
+				<div class='post_ignore'>
+					<if test="userIgnoredLang:|:$post['post']['_repignored'] == 1">{$this->lang->words['post_ignored_rep']}<else />{$this->lang->words['post_ignored']}</if> <a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a> {parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}. <a href='{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;view_ignored={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}#entry{$post['post']['pid']}' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+					<if test="userIgnoredLangTwo:|:$this->settings['reputation_enabled'] AND $post['post']['_repignored'] == 1"><div><a href="{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;rep_filter_set=*&amp;rep_filter=update" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['post_ignore_reset_rep']}</a></div></if>
+				</div>
+			<else />
+				{$post['post']['post']}
+				{$post['post']['attachmentHtml']}
+				<if test="postEditBy:|:$post['post']['edit_by']">
+					<br />
+					<strong>{$post['post']['edit_by']}</strong>
+					<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
+						<br />
+						<span class='subtext'>{$this->lang->words['reason_for_edit']}: {$post['post']['post_edit_reason']}</span>
+					</if>
+				</if>
+			</if>
+		</div>
+		<div id="post-{$post['post']['pid']}-controls" class='post_controls'>
+			<a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{parse replacement="reply_post_icon"} {$this->lang->words['post_reply']}</a>
+			<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
+				<a href='{parse url="module=post&amp;section=post&amp;do=edit_post&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}" base="publicWithApp"}' title='{$this->lang->words['post_edit_title']}' class='edit_post' id='edit_post_{$post['post']['pid']}'>{parse replacement="edit_post_icon"} {$this->lang->words['post_edit']}</a>
+			</if>
+			<if test="canDelete:|:$post['post']['_can_delete'] === TRUE">
+				<a href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='delete_post'>{parse replacement="delete_post_icon"} {$this->lang->words['post_delete']}</a>
+			</if>
+		</div>
+	</div>]]></template_content>
       <template_name>softDeletedPostBit</template_name>
       <template_data>$post, $sdData, $topic</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
+      <template_master_key>mobile</template_master_key>
     </template>
     <template>
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>topicPreview</template_name>
       <template_data>$topic, $posts</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2398,24 +2379,21 @@
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<if test="$this->settings['_mobile_back_nav'] = 1"></if>
 <div class='master_list'>
-	<h2 class='title'>
-		{$topic['title']}<!-- <br />
-		<if test="topicDescription:|:$topic['description']">
-			<span class='subtext'>{$topic['description']}</span>
-		</if>--> 
+	<h2>
+		{parse expression="IPSText::truncate( $topic['title'], 45 )"}
 	</h2>
 	<div class='controls'>
 		<div class='buttons'>
 			<if test="closedButton:|:$displayData['reply_button']['image'] == 'locked'">
 				<if test="closedButtonLink:|:$displayData['reply_button']['url']">
-					<a href='{$displayData['reply_button']['url']}' accesskey='r' class='button locked'>{$this->lang->words['top_locked_reply']}</a>
+					<a href='{$displayData['reply_button']['url']}' accesskey='r' class='button locked'>{$this->lang->words['mobile_top_locked_reply']}</a>
 				<else />
-					<span class='button locked'>{$this->lang->words['top_locked']}</span>
+					<span class='button locked'>{$this->lang->words['mobile_top_locked']}</span>
 				</if>
 			<else />
 				<if test="replyButton:|:$displayData['reply_button']['image']">
 					<if test="replyButtonLink:|:$displayData['reply_button']['url']">
-						<a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r' class='button'>{$this->lang->words['topic_add_reply']}</a>
+						<a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['mobile_topic_add_reply']}' accesskey='r' class='button'>{$this->lang->words['mobile_topic_add_reply']}</a>
 					</if>
 				</if>
 			</if>
@@ -2423,64 +2401,77 @@
 		</div>
 	</div>
 	
-	{$displayData['poll_data']}
+	{$displayData['poll_data']['html']}
 	
 	<if test="hasPosts:|:is_array( $post_data ) AND count( $post_data )">
 		<foreach loop="post_data:$post_data as $post">
-			<div class='topic_reply' id='entry{$post['post']['pid']}'>
-				<h2 class='secondary'>
-					<if test="postMember:|:$post['author']['member_id']">
-						<img src='{$post['author']['pp_thumb_photo']}' alt="{$post['author']['members_display_name']}{$this->lang->words['users_photo']}" width='{$post['author']['pp_thumb_width']}' height='{$post['author']['pp_thumb_height']}' class='photo' />
-						<a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}</span>
-					<else />
-						{$post['author']['members_display_name']}
-					</if>
-					<span class='subtext'>{parse date="$post['post']['post_date']" format="long"}</span>
-				</h2>
-				<div id="post-{$post['post']['pid']}" class='row post line_spacing'>
-					<if test="userIgnored:|:($post['post']['_repignored'] == 1 || $post['post']['_ignored']) AND $this->request['view_ignored'] != $post['post']['pid']">
-						<div class='post_ignore'>
-							<if test="userIgnoredLang:|:$post['post']['_repignored'] == 1">{$this->lang->words['post_ignored_rep']}<else />{$this->lang->words['post_ignored']}</if> <a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a> {parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}. <a href='{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;view_ignored={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}#entry{$post['post']['pid']}' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
-							<if test="userIgnoredLangTwo:|:$this->settings['reputation_enabled'] AND $post['post']['_repignored'] == 1"><div><a href="{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;rep_filter_set=*&amp;rep_filter=update" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['post_ignore_reset_rep']}</a></div></if>
-						</div>
-					<else />
-						{$post['post']['post']}
-						{$post['post']['attachmentHtml']}
-		
-						<if test="postEditBy:|:$post['post']['edit_by']">
-							<br />
-							<strong>{$post['post']['edit_by']}</strong>
-							<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
-								<br />
-								<span class='subtext'>{$this->lang->words['reason_for_edit']}: {$post['post']['post_edit_reason']}</span>
+			<if test="sDeleted:|:$post['post']['_isDeleted'] AND $post['post']['_softDeleteSee']">
+				{parse template="softDeletedPostBit" group="topic" params="$post, $displayData['sdData'], $topic"}
+			<else />
+				<if test="deleted:|:!$post['post']['_isDeleted']">
+					<div class='topic_reply' id='entry{$post['post']['pid']}'>
+						<h2 class='secondary'>
+							{parse template="repButtons" group="global_other" params="$post['author'], array_merge( array( 'primaryId' => $post['post']['pid'], 'domLikeStripId' => 'like_post_' . $post['post']['pid'], 'domCountId' => 'rep_post_' . $post['post']['pid'], 'app' => 'forums', 'type' => 'pid', 'likeFormatted' => $post['post']['like']['formatted'] ), $post['post'] )"}
+							<if test="postMember:|:$post['author']['member_id']">
+								<img src='{$post['author']['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$post['author']['members_display_name'])"}" class='photo' />
+								<a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}</span>
+							<else />
+								{$post['author']['members_display_name']}
 							</if>
-						</if>
-					</if>
-				</div>
-				<div id="post-{$post['post']['pid']}-controls" class='post_controls'>
-					<a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{parse replacement="reply_post_icon"} {$this->lang->words['post_reply']}</a>
-					<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
-						<a href='{parse url="module=post&amp;section=post&amp;do=edit_post&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}" base="publicWithApp"}' title='{$this->lang->words['post_edit_title']}' class='edit_post' id='edit_post_{$post['post']['pid']}'>{parse replacement="edit_post_icon"} {$this->lang->words['post_edit']}</a>
-					</if>
-					<if test="canDelete:|:$post['post']['_can_delete'] === TRUE">
-						<a href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='delete_post'>{parse replacement="delete_post_icon"} {$this->lang->words['post_delete']}</a>
-					</if>
-				</div>
-			</div>
+							<span class='subtext'>{parse date="$post['post']['post_date']" format="DATE"}</span>
+						</h2>
+						<div id="post-{$post['post']['pid']}" class='post line_spacing'>
+							<if test="userIgnored:|:($post['post']['_repignored'] == 1 || $post['post']['_ignored']) AND $this->request['view_ignored'] != $post['post']['pid']">
+								<div class='post_ignore'>
+									<if test="userIgnoredLang:|:$post['post']['_repignored'] == 1">{$this->lang->words['post_ignored_rep']}<else />{$this->lang->words['post_ignored']}</if> <a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a> {parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}. <a href='{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;view_ignored={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}#entry{$post['post']['pid']}' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+									<if test="userIgnoredLangTwo:|:$this->settings['reputation_enabled'] AND $post['post']['_repignored'] == 1"><div><a href="{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;rep_filter_set=*&amp;rep_filter=update" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['post_ignore_reset_rep']}</a></div></if>
+								</div>
+							<else />
+								{$post['post']['post']}
+								{$post['post']['attachmentHtml']}
+		
+								<if test="postEditBy:|:$post['post']['edit_by']">
+									<br />
+									<strong>{$post['post']['edit_by']}</strong>
+									<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
+										<br />
+										<span class='subtext'>{$this->lang->words['reason_for_edit']}: {$post['post']['post_edit_reason']}</span>
+									</if>
+								</if>
+							</if>
+						</div>
+						<div id="post-{$post['post']['pid']}-controls" class='post_controls'>
+							<a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{$this->lang->words['post_reply']}</a>
+							<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
+								<a href='{parse url="module=post&amp;section=post&amp;do=edit_post&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}" base="publicWithApp"}' title='{$this->lang->words['post_edit_title']}' class='edit_post' id='edit_post_{$post['post']['pid']}'>{$this->lang->words['post_edit']}</a>
+							</if>
+							<if test="canDelete:|:$post['post']['_can_delete'] === TRUE">
+								<a href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='delete_post'>{$this->lang->words['post_delete']}</a>
+							</if>
+						</div>
+					</div>
+				</if>
+			</if>
 		</foreach>
 	</if>
+	<if test="canShare:|:!$forum['disable_sharelinks'] AND $this->settings['sl_enable']">
+		<div id='shareStrip'>
+			<a class='button secondary' id='share_facebook_trigger' href='#'>{$this->lang->words['share']} <img src="{$this->settings['public_dir']}style_extra/sharelinks/facebook.png" /></a>
+			<a class='button secondary' id='share_twitter_trigger' href='#'>{$this->lang->words['share']} <img src="{$this->settings['public_dir']}style_extra/sharelinks/twitter.png" /></a>
+		</div>
+	</if>
 	<div class='controls'>
 		<div class='buttons'>
 			<if test="closedButton:|:$displayData['reply_button']['image'] == 'locked'">
 				<if test="closedButtonLink:|:$displayData['reply_button']['url']">
-					<a href='{$displayData['reply_button']['url']}' accesskey='r' class='button locked'>{$this->lang->words['top_locked_reply']}</a>
+					<a href='{$displayData['reply_button']['url']}' accesskey='r' class='button locked'>{$this->lang->words['mobile_top_locked_reply']}</a>
 				<else />
-					<span class='button locked'>{$this->lang->words['top_locked']}</span>
+					<span class='button locked'>{$this->lang->words['mobile_top_locked']}</span>
 				</if>
 			<else />
 				<if test="replyButton:|:$displayData['reply_button']['image']">
 					<if test="replyButtonLink:|:$displayData['reply_button']['url']">
-						<a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r' class='button'>{$this->lang->words['topic_add_reply']}</a>
+						<a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['mobile_topic_add_reply']}' accesskey='r' class='button'>{$this->lang->words['mobile_topic_add_reply']}</a>
 					</if>
 				</if>
 			</if>
@@ -2516,11 +2507,38 @@
 </div>
 <script type="text/javascript">
 	document.observe("dom:loaded", function(){
+				  	
+		/* Facebook */
+		$('share_facebook_trigger').on('click', _fireFacebook );
+		
+		
+		/* Twitter */
+		$('share_twitter_trigger').on('click', _fireTwitter );
+		
 		$$('.bbc_spoiler_show').find( function( elem ) {
 			elem.addClassName( 'button page-button' ).setStyle( { 'font-size' : '12px', 'padding': '5px' } );
 			elem.observe('click', _fireSpoiler );
 		} ) } );
 	
+	function _fireTwitter(e)
+	{
+		Event.stop(e);
+				
+		_url   = '{parse expression="$this->registry->output->getCanonicalUrl()"}';
+		_title = $$('meta[property~="og:title"]').first().readAttribute('content');
+		
+		window.open('http://twitter.com/intent/tweet?url=' +  encodeURIComponent( _url ) + '&text=' + encodeURIComponent( _title ) );
+	}
+	
+	function _fireFacebook(e)
+	{
+		Event.stop(e);
+		
+		_url   = '{parse expression="$this->registry->output->getCanonicalUrl()"}';
+		_title = $$('meta[property~="og:title"]').first().readAttribute('content');
+		window.open('http://www.facebook.com/sharer.php?u=' + encodeURIComponent( _url ) + '&t=' + encodeURIComponent( _title ) );
+	}
+	
 	function _fireSpoiler(e)
 	{
 		button = Event.element(e);
@@ -2540,7 +2558,7 @@
 </script>]]></template_content>
       <template_name>topicViewTemplate</template_name>
       <template_data>$forum, $topic, $post_data, $displayData</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/forums/xml/forums_modules.xml b/upload/admin/applications/forums/xml/forums_modules.xml
index 967a807f..f0a6ec48 100644
--- a/upload/admin/applications/forums/xml/forums_modules.xml
+++ b/upload/admin/applications/forums/xml/forums_modules.xml
@@ -5,13 +5,10 @@
       <sys_module_title>Форумы</sys_module_title>
       <sys_module_application>forums</sys_module_application>
       <sys_module_key>forums</sys_module_key>
-      <sys_module_description>Механизмы работы форумов</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -19,13 +16,10 @@
       <sys_module_title>Отправка �ообщений</sys_module_title>
       <sys_module_application>forums</sys_module_application>
       <sys_module_key>post</sys_module_key>
-      <sys_module_description>Си�тема отправки �ообщений на форум</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>1</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -33,27 +27,21 @@
       <sys_module_title>Форумы</sys_module_title>
       <sys_module_application>forums</sys_module_application>
       <sys_module_key>forums</sys_module_key>
-      <sys_module_description>Модуль управлени� форумами и категори�ми</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Прикрепл�емые файлы</sys_module_title>
+      <sys_module_title>Файлы</sys_module_title>
       <sys_module_application>forums</sys_module_application>
       <sys_module_key>attachments</sys_module_key>
-      <sys_module_description>Модуль управлени� прикрепл�емыми файлами</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>1</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
@@ -61,13 +49,10 @@
       <sys_module_title>Ин�трументы</sys_module_title>
       <sys_module_application>forums</sys_module_application>
       <sys_module_key>tools</sys_module_key>
-      <sys_module_description>Управление �ообщени�ми, аватарами и т.п.</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>2</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
@@ -77,11 +62,8 @@
       <sys_module_key>statistics</sys_module_key>
       <sys_module_description/>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>3</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
@@ -91,11 +73,8 @@
       <sys_module_key>rss</sys_module_key>
       <sys_module_description/>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>4</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
diff --git a/upload/admin/applications/forums/xml/forums_root_templates.xml b/upload/admin/applications/forums/xml/forums_root_templates.xml
index 84703e1d..b1695780 100644
--- a/upload/admin/applications/forums/xml/forums_root_templates.xml
+++ b/upload/admin/applications/forums/xml/forums_root_templates.xml
@@ -1,225 +1,209 @@
 <?xml version="1.0" encoding="utf-8"?>
-<templates application="forums" templategroups="a:8:{s:11:&quot;skin_boards&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_forum&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_legends&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_mod&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_poll&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_post&quot;;s:5:&quot;exact&quot;;s:14:&quot;skin_printpage&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_topic&quot;;s:5:&quot;exact&quot;;}">
+<templates application="forums" templategroups="a:7:{s:11:&quot;skin_boards&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_forum&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_legends&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_mod&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_poll&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_post&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_topic&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_boards">
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<a href='{parse url="showuser={$user['member_id']}" seotitle="{$user['members_seo_name']}" template="showuser"  base="public"}' title='{$this->lang->words['view_profile']}'>{$user['members_display_name']}</a><if test="age:|:$pyear"> (<strong>{$pyear}</strong>)</if>]]></template_content>
-      <template_name>birthday</template_name>
-      <template_data>$user, $pyear</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
     <template>
       <template_group>skin_boards</template_group>
       <template_content><![CDATA[{parse js_module="board"}
-{parse js_module="hooks"}
 {parse variable="sidebar_enabled" default="$show_side_blocks"}
-<script type='text/javascript'>
-//<!#^#|CDATA|
-	ipb.global.boardMarkers = ({
-		'f_cat_unread': "{parse replacement="f_cat_read"}",
-		'f_unread': "{parse replacement="f_read"}",
-		'f_pass_unread': "{parse replacement="f_pass_read"}"
-	});
-	var markerURL = "{parse url="app=forums&module=ajax&section=markasread&i=1" base="public"}"; // Ajax URL so don't use &amp;
-//|#^#]>
-</script>
-<if test="sideBarEnabled:|:$this->templateVars['sidebar_enabled']">
-	<a href='{parse url="app=forums&amp;module=extras&amp;section=toggle&amp;secure_key={$this->member->form_hash}" base="public"}' id='close_sidebar'  class='sidebar_toggle rounded' <if test="sidebaropen:|:IPSCookie::get('hide_sidebar') != '1'">style='display: none'</if>><img src='{$this->settings['img_url']}/sidebar_close.png' alt='{$this->lang->words['sidebar_close']}' /></a>
-	<a href='{parse url="app=forums&amp;module=extras&amp;section=toggle&amp;secure_key={$this->member->form_hash}" base="public"}' id='open_sidebar' class='sidebar_toggle rounded' <if test="sidebarclosed:|:IPSCookie::get('hide_sidebar') == '1'">style='display: none'</if>><img src='{$this->settings['img_url']}/sidebar_open.png' alt='{$this->lang->words['sidebar_open']}' /></a>
-</if>
-<h2 class='hide'>{$this->lang->words['board_index_title']}</h2>
-<div id='board_index' class='clearfix'>
-	<if test="sideBarEnabled2:|:$this->templateVars['sidebar_enabled']">
-		<div id='index_stats' class='right clearfix' <if test="sidebarclosed2:|:IPSCookie::get('hide_sidebar') == '1'">style='display: none'</if>>
-			<foreach loop="side_blocks:$side_blocks as $block">
-				{$block}
-			</foreach>
-		</div>
-	</if>
-	
-	<div id='categories' class='<if test="nosidebar:|:IPSCookie::get('hide_sidebar') == '1' || !$this->templateVars['sidebar_enabled']">no_sidebar</if> clearfix'>
-		<if test="latestNews:|:is_array($news_data) AND count($news_data)">
-			<div id='latest_news' class='row2'><strong>{$this->lang->words['newslink']}</strong> <a href='{parse url="showtopic={$news_data['id']}" template="showtopic" seotitle="{$news_data['seo_title']}" base="public"}' title='{$this->lang->words['newslink']}'>{$news_data['title']}</a></div>
-		</if>
+<if test="boardIndexTop:|:true"></if>
+<div id='board_index' class='ipsLayout <if test="sideBarEnabledL:|:$this->templateVars['sidebar_enabled']">ipsLayout_withright</if> ipsLayout_largeright clearfix <if test="sidebarclosed:|:IPSCookie::get('hide_sidebar') == '1'">no_sidebar</if>'>	
+	<div id='categories' class='ipsLayout_content clearfix'>
 	<!-- CATS AND FORUMS -->
 		<if test="cats_forums:|:is_array( $cat_data ) AND count( $cat_data )">
 			<foreach loop="categories:$cat_data as $_data">
 				<if test="cat_has_forums:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
-					{parse striping="catTable" classes="row1,row2"}
-					<div class='category_block block_wrap'>
-						<h3 id='category_{$_data['cat_data']['id']}' class='maintitle'><a class='toggle right' href='#' title="{$this->lang->words['toggle_cat']}">{$this->lang->words['toggle_cat']}</a> <a href="{parse url="showforum={$_data['cat_data']['id']}" seotitle="{$_data['cat_data']['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['view_cat']}'>{$_data['cat_data']['name']}</a></h3>
-						<table class='ipb_table' summary="{$this->lang->words['forums_in_cat']} '{$_data['cat_data']['name']}'">
-							<tr class='header'>
-								<th scope='col' class='col_c_icon'>&nbsp;</th>
-								<th scope='col' class='col_c_forum'>{$this->lang->words['cat_name']}</th>
-								<th scope='col' class='col_c_stats stats'>{$this->lang->words['stats']}</th>
-								<th scope='col' class='col_c_post'>{$this->lang->words['last_post_info']}</th>
-							</tr>
-							<!-- / CAT HEADER -->
-							<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
-								<if test="forumRedirect:|:$forum_data['redirect_on']">
-									<tr class='{parse striping="catTable"} redirect_forum'>
-										<td class='altrow'>{parse replacement="f_redirect"}</td>
-										<td>
-											<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a></h4>
-											<p class='desc'>{$forum_data['description']}</p>
-										</td>
-										<td colspan='2'>
-											{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}
-										</td>
+					<div id='category_{$_data['cat_data']['id']}' class='category_block block_wrap'>
+						<h3 class='maintitle'>
+							<a class='toggle right' href='#' title="{$this->lang->words['toggle_cat']}">{$this->lang->words['toggle_cat']}</a> <a href="{parse url="showforum={$_data['cat_data']['id']}" seotitle="{$_data['cat_data']['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['view_cat']}'>{$_data['cat_data']['name']}</a>
+						</h3>
+						<div class='ipsBox table_wrap'>
+							<div class='ipsBox_container'>
+								<table class='ipb_table' summary="{$this->lang->words['forums_in_cat']} '{$_data['cat_data']['name']}'">
+									<tr class='header hide'>
+										<th scope='col' class='col_c_icon'>&nbsp;</th>
+										<th scope='col' class='col_c_forum'>{$this->lang->words['cat_name']}</th>
+										<th scope='col' class='col_c_stats stats'>{$this->lang->words['stats']}</th>
+										<th scope='col' class='col_c_post'>{$this->lang->words['last_post_info']}</th>
 									</tr>
-								<else />
-									<tr class='{parse striping="catTable"}'>
-										<td class='altrow'>
-											<if test="unreadicon:|:$forum_data['img_new_post'] != 'f_locked' && strstr( $forum_data['img_new_post'], 'unread' )">
-												<a id='forum_img_{$forum_data['id']}' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" title="{$this->lang->words['bi_markread']}" class='forum_marker'>
-													{parse replacement="{$forum_data['img_new_post']}"}
-												</a>
-												<script type='text/javascript'>
-													ipb.global.registerMarker( "forum_img_{$forum_data['id']}", "{$forum_data['img_new_post']}", markerURL + "&forumid={$forum_data['id']}" );
-												</script>
-											<else />
-												{parse replacement="{$forum_data['img_new_post']}"}
-											</if>
-										</td>
-										<td>
-											<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a></h4>
-											<p class='desc'>{$forum_data['description']}</p>
-									
-											<if test="showSubForums:|:$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
-												<h5 class='hide'>{$this->lang->words['subforums']}</h5>
-												<ol class='subforums' id='subforums_{$forum_data['id']}'>
-												<foreach loop="subforums:$forum_data['subforums'] as $__id => $__data">
-													<if test="showSubForumsLit:|:$__data[3]"><li class='newposts'><else /><li></if><a href="{parse url="showforum={$__data[0]}" seotitle="{$__data[2]}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$__data[1]}</a></li>
-												</foreach>
-												</ol>
-											</if>
-											<!-- Skinnote: Clean up queued stuff -->
-											<if test="hasQueuedAndCanSeeIcon:|:!empty($forum_data['_has_queued_and_can_see_icon'])">
-												<em class='moderated'><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=all" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['view_unapproved']}'>{parse expression="sprintf( $this->lang->words['f_queued'], $forum_data['queued_topics'], $forum_data['queued_posts'])"}</a></em>
-											</if>
-										</td>
-										<td class='altrow stats'>
-											<ul>
-												<li>{$forum_data['topics']} {$this->lang->words['topics']}</li>
-												<li>{$forum_data['posts']} {$this->lang->words['replies']}</li>
-											</ul>
-										</td>
-										<td>
-											<ul class='last_post'>
-												<if test="hideLastInfo:|:$forum_data['hide_last_info']">
-													<li>{$this->lang->words['f_protected']}</li>
-												<else />
-													<if test="hideDateUrl:|:$forum_data['_hide_last_date']">
-														<li>{parse date="$forum_data['last_post']" format="LONG"}</li>
+									<!-- / CAT HEADER -->
+									<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
+										<if test="forumRedirect:|:$forum_data['redirect_on']">
+											<tr class='redirect_forum' id='f_{$forum_data['id']}'>
+												<td class='col_c_icon'>
+													<img src='{$this->settings['img_url']}/f_redirect.png' />
+												</td>
+												<td colspan='2' class='col_c_forum'>
+													<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a></h4>
+													<p class='desc'>{$forum_data['description']}</p>
+												</td>
+												<td class='desc'>
+													<ul class='last_post ipsType_small'>
+														<li class='desc lighter'><em>{parse format_number="$forum_data['redirect_hits']"} {$this->lang->words['rd_hits']}</em></li>
+													</ul>
+												</td>
+											</tr>
+										<else />
+											<tr class='<if test="hasUnreadClass:|:$forum_data['_has_unread']">unread</if>'>
+												<td class='col_c_icon'>
+													<if test="hasUnread:|:$forum_data['_has_unread']">
+														<a id='forum_img_{$forum_data['id']}' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" data-tooltip="{$this->lang->words['bi_markread']}" class='forum_marker'><img src='{$this->settings['img_url']}/f_icon.png' /></a>
 													<else />
-														<li><a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse replacement="f_lastpost"}</a> <a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse date="$forum_data['last_post']" format="LONG"}</a></li>
+														<img src='{$this->settings['img_url']}/f_icon_read.png' />
 													</if>
-													<li><strong>{$this->lang->words['in']}</strong> {$forum_data['last_topic_title']}</li>
-													<li>
-														<strong>{$this->lang->words['by']}</strong> 
-														<if test="lastPosterName:|:isset($forum_data['last_poster_name']) AND $forum_data['last_poster_name']">
-															<if test="lastPosterID:|:$forum_data['last_poster_id']">
-																<a href='{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$forum_data['last_poster_name']}</a>{parse template="user_popup" group="global" params="$forum_data['last_poster_id'], $forum_data['seo_last_name']"}
-															<else />
-																{$this->settings['guest_name_pre']}{$forum_data['last_poster_name']}{$this->settings['guest_name_suf']}
-															</if>
-														<else />
-															{$this->lang->words['f_none']}
+												</td>
+												<td class='col_c_forum'>
+													
+													<h4>
+														<if test="hasQueuedAndCanSeeIcon:|:!empty($forum_data['_has_queued_and_can_see_icon'])">
+															<a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=all" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['view_unapproved']}' class='ipsBadge ipsBadge_orange' data-tooltip="{parse expression="sprintf( $this->lang->words['f_queued'], $forum_data['queued_topics'], $forum_data['queued_posts'])"}" style='vertical-align: top'>{$this->lang->words['f_queued_badge']}</a>
 														</if>
-													</li>
-												</if>
-											</ul>
-										</td>
-									</tr>
-								</if>
-							</foreach>
-						</table>
+														<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a>
+													</h4>
+														
+													<if test="showSubForums:|:$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
+														<br />
+														<ol class='ipsList_inline ipsType_small subforums' id='subforums_{$forum_data['id']}'>
+															<foreach loop="subforums:$forum_data['subforums'] as $__id => $__data">
+																<if test="showSubForumsLit:|:$__data[3]"><li class='unread'><else /><li></if>
+																	<a href="{parse url="showforum={$__data[0]}" seotitle="{$__data[2]}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$__data[1]}</a><if test="isNotLast:|: empty($__data[4] )">,</if>
+																</li>
+															</foreach>
+														</ol>
+													</if>
+																					
+													<p class='desc __forum_desc ipsType_small'>{$forum_data['description']}</p>											
+												</td>
+												<td class='col_c_stats ipsType_small'>
+													<ul>
+														<li><strong>{$forum_data['topics']}</strong> {$this->lang->words['topics']}</li>
+														<li><strong>{$forum_data['posts']}</strong> {$this->lang->words['replies']}</li>
+													</ul>
+												</td>
+												<td class='col_c_post'>
+													<if test="hideLastInfo:|:$forum_data['hide_last_info']">
+														<ul class='last_post ipsType_small'>
+															<li class='desc lighter'><em>{$this->lang->words['f_protected']}</em></li>
+														</ul>
+													<else />
+														<if test="hasphoto:|:$forum_data['pp_small_photo']">
+															<a href='{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}' class='ipsUserPhotoLink left'>
+																<img src='{$forum_data['pp_small_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+															</a>
+														<else />
+															<if test="hasPost:|:$forum_data['last_id']">
+																<div class='left'>{IPSMember::buildNoPhoto(0, 'mini' )}</div>
+															</if>
+														</if>
+														<ul class='last_post ipsType_small'>
+															<if test="!$forum_data['last_id']">
+																<li class='desc lighter'><em>{$this->lang->words['f_none']}</em></li>
+															<else />
+																<li>
+																	{$forum_data['last_topic_title']}
+																</li>
+																<if test="lastPosterID:|:$forum_data['last_poster_id']">
+																	<li>{$this->lang->words['by']} {parse template="userHoverCard" group="global" params="$forum_data"}</li>
+																</if>
+																<if test="hideDateUrl:|:$forum_data['_hide_last_date']">
+																	<li class='desc lighter blend_links'>{parse date="$forum_data['last_post']" format="DATE"}</li>
+																<else />
+																	<li class='desc lighter blend_links'><a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse date="$forum_data['last_post']" format="DATE"}</a></li>
+																</if>
+														
+															</if>
+															
+														</ul>
+													</if>
+												</td>
+											</tr>
+										</if>
+									</foreach>
+								</table>
+							</div>
+						</div>
+						<br />
 					</div>
 				</if>
 			</foreach>
 		</if>
 	</div>
+	<if test="sideBarEnabled2:|:$this->templateVars['sidebar_enabled']">
+		<div id='index_stats' class='ipsLayout_right clearfix' <if test="sidebarclosed2:|:IPSCookie::get('hide_sidebar') == '1'">style='display: none'</if>>
+			<foreach loop="side_blocks:$side_blocks as $block">
+				{$block}
+			</foreach>
+		</div>
+		<a href='#' id='toggle_sidebar' title='{$this->lang->words['toggle_sidebar']}' data-closed="{$this->lang->words['_laquo']}" data-open="&times;">&nbsp;</a>
+	</if>
 </div>
-<ul id='stat_links' class='filter_bar rounded'>
-	<li><a href="{parse url="app=core&amp;module=search&amp;do=active" base="public"}" title="{$this->lang->words['today_active_cont']}">{$this->lang->words['new_active_cont']}</a></li>
-	<li><a href="{parse url="app=forums&amp;module=extras&amp;section=stats&amp;do=leaders" base="public"}" title="{$this->lang->words['sm_forum_leaders_title']}">{$this->lang->words['sm_forum_leaders']}</a></li>
-	<li><a href="{parse url="app=forums&amp;module=extras&amp;section=stats" base="public"}" title="{$this->lang->words['sm_all_posters_title']}">{$this->lang->words['sm_today_posters']}</a></li>
-	<li><a href="{parse url="app=members&amp;module=list&amp;max_results=20&amp;sort_key=posts&amp;sort_order=desc&amp;filter=ALL" base="public" seotitle="false"}" title="{$this->lang->words['sm_overall_posters_title']}">{$this->lang->words['sm_overall_posters']}</a></li>
-</ul>
-<div id='board_statistics' class='statistics general_box clearfix'>
-	<if test="showTotals:|:$this->settings['show_totals']">
-		<div id='stats'>
-			<h2>{$this->lang->words['board_stats']}</h2>
-			<dl>
-				<dt>{$this->lang->words['total_posts']}</dt>
-				<dd>{$stats['info']['total_posts']}</dd>
-				<dt>{$this->lang->words['total_members']}</dt>
-				<dd>{$stats['info']['mem_count']}</dd>
-				<dt>{$this->lang->words['newest_member']}</dt>
-				<dd><a href='{$stats['info']['last_mem_link']}' title='{$this->lang->words['view_profile']}'>{$stats['info']['last_mem_name']}</a>{parse template="user_popup" group="global" params="$stats['info']['last_mem_id'],$stats['info']['last_mem_seo']"}&nbsp;</dd>
-				<dt>{$this->lang->words['online_at_once']}</dt>
-				<dd>{$stats['info']['most_online']}<br /><span class='extra'>{$stats['info']['most_time']}</span></dd>
-			</dl>
-		</div>
-	</if>
-	<if test="showActive:|:$this->settings['show_active']">
-		<div id='active_users' class='stats_list'>
-			<h2>
-				{$stats['TOTAL']} {$this->lang->words['active_users_text']} <span>{$this->lang->words['active_users']}</span><br />
-				<span class='desc'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $stats['MEMBERS'], $stats['GUESTS'], $stats['ANON'] )"} | {$this->lang->words['show_by']}: <a href='{parse url="app=members&amp;module=online&amp;sort_order=desc" base="public"}'>{$this->lang->words['oul_click']}</a> {$this->lang->words['or']} <a href='{parse url="app=members&amp;module=online&amp;sort_key=name&amp;sort_order=asc&amp;show_mem=reg" base="public"}'>{$this->lang->words['oul_name']}</a></span>
-			</h2>
-			<if test="activeNames:|:count($stats['NAMES'])">
-				<p>
-					<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $stats['NAMES'] )"}</span>					
-				</p>
-			</if>
-		</div>
-	</if>
-	<if test="calendarEventsOuter:|:$calendar_events">
-	<div id='cal_events' class='stats_list'>
-		<h2>{$this->lang->words['upcoming_events']}</h2>
-		<if test="calendarEventsInner:|:is_array( $calendar_events )">
-			<p>
-				<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $calendar_events )"}</span>
-			</p>
-		<else />
-			<p>{$calendar_events}</p>
-		</if>
-	</div>
-	</if>
-	
-	<if test="birthdays:|:$birthdays !== FALSE AND is_array( $birthdays['users'] ) AND count( $birthdays['users'] )">
-		<div id='cal_bdays' class='stats_list'>
-			<h2>{$birthdays['count']} {$this->lang->words['birthdays_today']}</h2>
-			<p>
-				<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $birthdays['users'] )"}</span>					
-			</p>
-		</div>
-	<else />
-		<if test="showBirthdaysAlways:|:$this->settings['show_birthdays'] AND !$this->settings['autohide_bday']">
-			<div id='cal_bdays' class='stats_list'>
-				<h2>0 {$this->lang->words['birthdays_today']}</h2>
-				<p>{$this->lang->words['no_birth_users']}</p>
-			</div>
-		</if>
-	</if>
-	
-</div>
-<if test="autodst:|:$this->memberData['members_auto_dst'] == 1 AND $this->settings['time_dst_auto_correction']">
 <script type='text/javascript'>
-	ipb.vars['dst_on']	= parseInt("{$this->memberData['dst_in_use']}");
+//<!#^#|CDATA|
+	var markerURL  = "{parse url="app=forums&module=ajax&section=markasread&i=1" base="public"}"; // Ajax URL so don't use &amp;
+	var unreadIcon = "<img src='{$this->settings['img_url']}/f_icon_read.png' />";
 	
-	ipb.board.checkDST();
+	<if test="markercatforums:|:is_array( $cat_data ) AND count( $cat_data )">
+		<foreach loop="markercategories:$cat_data as $_data">
+			<if test="markerhasforums:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
+				<foreach loop="markerforums:$_data['forum_data'] as $forum_id => $forum_data">
+					<if test="markernotredirect:|:!$forum_data['redirect_on']">
+						<if test="markerhasunread:|:$forum_data['_has_unread']">
+	ipb.global.registerMarker( "forum_img_{$forum_data['id']}", "{$forum_data['img_new_post']}", markerURL + "&forumid={$forum_data['id']}" );
+						</if>
+					</if>
+				</foreach>
+			</if>
+		</foreach>
+	</if>
+//|#^#]>
 </script>
-</if>]]></template_content>
+<if test="showTotals:|:$this->settings['show_totals']">
+	<div id='board_stats'>		
+		<ul class='ipsType_small ipsList_inline'>
+			<li class='clear'>
+				<span class='value'>{$stats['info']['total_posts']}</span>
+				{$this->lang->words['total_posts']}
+			</li>
+			<li class='clear'>
+				<span class='value'>{$stats['info']['mem_count']}</span>
+				{$this->lang->words['total_members']}
+			</li>
+			<li class='clear'>
+				{IPSMember::makeProfileLink( $stats['info']['last_mem_name'], $stats['info']['last_mem_id'], $stats['info']['last_mem_seo'], 'value' )}
+				{$this->lang->words['newest_member']}
+			</li>
+			<li class='clear' data-tooltip="{$stats['info']['most_time']}">
+				<span class='value'>{$stats['info']['most_online']}</span>
+				{$this->lang->words['online_at_once']}
+			</li>
+		</ul>
+	</div>
+</if>
+<div id='board_statistics' class='statistics clearfix'>
+	<ul id='stat_links' class='ipsList_inline right ipsType_small'>
+		<if test="statsLinks:|:1==1"> <!-- Hook point -->
+			<li><a href="{parse url="app=forums&amp;module=extras&amp;section=stats&amp;do=leaders" base="public"}" title="{$this->lang->words['sm_forum_leaders_title']}">{$this->lang->words['sm_forum_leaders']}</a></li>
+			<li><a href="{parse url="app=forums&amp;module=extras&amp;section=stats" base="public"}" title="{$this->lang->words['sm_all_posters_title']}">{$this->lang->words['sm_today_posters']}</a></li>
+			<li><a href="{parse url="app=members&amp;module=list&amp;max_results=20&amp;sort_key=posts&amp;sort_order=desc&amp;filter=ALL" base="public" seotitle="false"}" title="{$this->lang->words['sm_overall_posters_title']}">{$this->lang->words['sm_overall_posters']}</a></li>
+		</if>
+	</ul>
+	
+	<if test="$this->settings['show_active']">
+		<h4 class='statistics_head'>{parse expression="sprintf( $this->lang->words['online_right_now'], $stats['TOTAL'] )"} {$this->lang->words['active_users']}</h4>
+		<p class='statistics_brief desc'>
+			{parse expression="sprintf( $this->lang->words['active_users_detail'], $stats['MEMBERS'], $stats['GUESTS'], $stats['ANON'] )"}
+			&nbsp;&nbsp;<a href='{parse url="app=members&amp;module=online&amp;sort_order=desc" base="public"}'>({$this->lang->words['online_link']})</a>
+		</p>
+	</if>
+	<if test="activeNames:|:count($stats['NAMES']) && $this->settings['show_active']">
+		<br />
+		<p>
+			<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $stats['NAMES'] )"}</span>					
+		</p>
+	</if>
+</div>]]></template_content>
       <template_name>boardIndexTemplate</template_name>
-      <template_data><![CDATA[$lastvisit="", $stats=array(), $calendar_events=FALSE, $birthdays=FALSE, $chat_html='', $news_data=array(), $cat_data=array(), $show_side_blocks=true, $side_blocks=array()]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_data><![CDATA[$lastvisit="", $stats=array(), $cat_data=array(), $show_side_blocks=true, $side_blocks=array()]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -278,7 +262,7 @@
 	</div>]]></template_content>
       <template_name>hookBoardIndexShareLinks</template_name>
       <template_data>$data</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -286,37 +270,21 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<script type='text/javascript' src='{$this->settings['public_dir']}js/ips.status.js'></script>
-{parse striping="recent_status" classes="row1,row2"}
-<div class='general_box clearfix' id='statusHook'>
-	<h3><img src='{$this->settings['img_url']}/user_comment.png' alt='' /> {$this->lang->words['recent_status_updates']}</h3>
+      <template_content><![CDATA[<script type='text/javascript' src="{$this->settings['public_dir']}js/ips.status.js"></script>
+<div class='ipsSideBlock clearfix' id='statusHook'>
+	<h3>{$this->lang->words['recent_status_updates']}</h3>
 	<div class='_sbcollapsable'>
-		<if test="canCreate:|:$this->registry->getClass('memberStatus')->canCreate( $this->memberData )">
-			<div class='status_update row2 altrow'>
-				<input type='text' id='statusUpdate' style='width:80%'> <input type='submit' class='input_submit' id='statusSubmit' value='{$this->lang->words['_rarr']}' />
-				<if test="update:|:(IPSLib::twitter_enabled() OR IPSLib::fbc_enabled() ) AND ( $this->memberData['fb_uid'] OR $this->memberData['twitter_id'] )">
-				<p class='desc' style='padding-top:5px;'>{$this->lang->words['st_update']}
-					<if test="updateTwitter:|:IPSLib::twitter_enabled() AND ( $this->memberData['twitter_id'] )"><input type='checkbox' id='su_Twitter' value='1' name='su_Twitter' /> <img src="{$this->settings['public_dir']}style_status/twitter.png" style='vertical-align:top' alt='' /></if>
-					<if test="updateFacebook:|:IPSLib::fbc_enabled() AND ( $this->memberData['fb_uid'] )">&nbsp;<input type='checkbox' id='su_Facebook' value='1' name='su_Facebook' /> <img src="{$this->settings['public_dir']}style_status/facebook.png" style='vertical-align:top' alt='' /></if>
-				</p>
-			</if>
-			</div>
-		</if>
 		<div id="status_wrapper">
-			<if test="hasUpdates:|:count( $updates )">
-				{parse template="statusUpdates" group="profile" params="$updates, 1, 1"}
-			<else />
-				<div class='status_mini_wrap row2 desc'><em>{$this->lang->words['status_updates_none']}</em></div>
-			</if>
-			<div class="status_main_content" style='text-align:right;padding:4px'>
-				<a class='desc' href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['viewallupdates']} {$this->lang->words['_rarr']}</a>
+			<div id="status_wrapper_inside">{parse template="statusUpdates" group="boards" params="$updates, 1, 1"}</div>
+			<div class="status_main_content ipsType_small" style='text-align: center'>
+				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['viewallupdates']}</a>
 			</div>
 		</div>
 	</div>
 </div>]]></template_content>
       <template_name>hookBoardIndexStatusUpdates</template_name>
       <template_data>$updates=array()</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -324,9 +292,9 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<if test="fbAppIdPresent:|:$this->settings['fbc_appid']">
+      <template_content><![CDATA[<if test="fbAppIdPresent:|:IPSLib::fbc_enabled()">
 <div class='general_box clearfix'>
-	<h3><img src='{$this->settings['img_url']}/user_comment.png' alt='' /> {$this->lang->words['hook_facebookactivity']}</h3>
+	<h3>{$this->lang->words['hook_facebookactivity']}</h3>
 	<div  class='block_list clearfix _sbcollapsable' style='text-align:center'>
 		<div><fb:activity site="" width="290" height="300" header="false" border_color="#FFF" colorscheme="light" /></div>
 	</div>
@@ -346,7 +314,7 @@
 </if>]]></template_content>
       <template_name>hookFacebookActivity</template_name>
       <template_data/>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -354,56 +322,36 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[{parse template="recentEntries" group="blog_portal" params="$entries"}]]></template_content>
-      <template_name>hookRecentBlogEntries</template_name>
-      <template_data>$entries</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div class='maintitle'>{$this->lang->words['recent_gallery_images']}</div>
-<div id='attach_wrap' class='rounded clearfix _sbcollapsable'>
-	<ul>
-	<foreach loop="gallery_images_hook:$rows as $r">
-		<li>{$r['_image']}</li>
-	</foreach>
-	</ul>
-</div>
-<br style='clear:both;' />]]></template_content>
-      <template_name>hookRecentGalleryImages</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div class='general_box clearfix'>
-		<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['recently_added_topics']}</h3>
-		<div class='_sbcollapsable'>
-		<ul class='hfeed block_list'>
-			<if test="recenttopics:|:is_array( $topics ) && count( $topics )">
-				{parse striping="recent_topics" classes="row1,row2 altrow"}
-				<foreach loop="topics_hook:$topics as $r">
-				<li class='hentry {parse striping="recent_topics"}'><a href='{parse url="showtopic={$r['tid']}" base="public" template="showtopic" seotitle="{$r['title_seo']}"}' rel='bookmark' title='{$this->lang->words['view_topic']}'>{$r['title']}</a> 
-				{$this->lang->words['recent_by']} <address class="author vcard"><if test="$r['members_display_name']"><a class="url fn" href="{parse url="showuser={$r['starter_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}" title='{$this->lang->words['view_profile']}'>{$r['members_display_name']}</a>{parse template="user_popup" group="global" params="$r['starter_id'], $r['members_seo_name']"}<else />{$this->settings['guest_name_pre']}{$r['starter_name']}{$this->settings['guest_name_suf']}</if></address><br />
-				<span class='date'><abbr class="published" title="{parse expression="date( 'c', $r['start_date'] )"}">{parse date="$r['start_date']" format="short"}</abbr></span></li>
-				</foreach>
-			<else />
-				<li>{$this->lang->words['norecent_topics_hook']}</li>
+      <template_content><![CDATA[<if test="recenttopics:|:is_array( $topics ) && count( $topics )">
+<div class='ipsSideBlock clearfix'>
+	<h3>{$this->lang->words['recently_added_topics']}</h3>
+	<div class='_sbcollapsable'>
+		<ul class='ipsList_withminiphoto'>
+		<foreach loop="topics_hook:$topics as $r">
+		<li class='clearfix'>
+			<if test="$r['member_id']">
+				<a href='{parse url="showuser={$r['member_id']}" seotitle="{$r['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink'>
 			</if>
+			<img src='{$r['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$r['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_mini left' />
+			<if test="$r['member_id']">
+				</a>
+			</if>
+			<div class='list_content'>
+				<a href='{parse url="showtopic={$r['tid']}" base="public" template="showtopic" seotitle="{$r['title_seo']}"}' rel='bookmark' class='ipsType_small' title='{$this->lang->words['view_topic']}'>{$r['topic_title']}</a>
+				<p class='desc ipsType_smaller'>
+					<if test="$r['members_display_name']">{parse template="userHoverCard" group="global" params="$r"}<else />{$this->settings['guest_name_pre']}{$r['starter_name']}{$this->settings['guest_name_suf']}</if>
+					- {parse date="$r['start_date']" format="short"}
+				</p>
+			</div>
+		</li>
+		</foreach>
 		</ul>
-		</div>
-	</div>]]></template_content>
+	</div>
+</div>
+</if>]]></template_content>
       <template_name>hookRecentTopics</template_name>
       <template_data>$topics</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -411,129 +359,19 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div class='general_box clearfix'>
-	<h3><img src='{$this->settings['img_url']}/user_comment.png' alt='' /> {$this->lang->words['todays_top_posters']}</h3>
+      <template_content><![CDATA[<div class='ipsSideBlock clearfix'>
+	<h3>{$this->lang->words['popular_tags']}</h3>
 	<div class='_sbcollapsable'>
-		<if test="topposters:|:is_array($posters) AND count($posters)">
-			<ol id='top_posters' class='block_list clearfix'>
-			<foreach loop="top_posters_hook:$posters as $r">
-				<li>
-					<a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$r['pp_thumb_photo']}' width='{$r['pp_thumb_width']}' height='{$r['pp_thumb_height']}' alt='{$this->lang->words['photo']}' class='photo' /></a><br />
-					<span class='name'><a href='{parse url="showuser={$r['member_id']}" template="showuser" seotitle="{$r['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$r['members_display_name_short']}</a>{parse template="user_popup" group="global" params="$r['member_id'], $r['members_seo_name']"} ({$r['tpost']})</span>
-				</li>
-			</foreach>
-		</ol>
-		</if>
-	</div>
-</div>]]></template_content>
-      <template_name>hookTopPosters</template_name>
-      <template_data>$posters</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div class='general_box clearfix'>
-		<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['hook_unreadtitle']}</h3>
-		<div class='_sbcollapsable'>
-		<ul class='hfeed block_list'>
-			<if test="unreadnotify:|:is_array( $notifications ) AND count( $notifications )">
-				{parse striping="unreadnotify" classes="row1,row2 altrow"}
-				<foreach loop="notify_hook:$notifications as $r">
-				<li class='{parse striping="unreadnotify"}'><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$r['notify_id']}" base="public"}' title='{$this->lang->words['viewnotifyhook']}'>{$r['notify_title']}</a> 
-				<br />
-				<span class='date'><abbr class="published" title="{parse expression="date( 'c', $r['notify_sent'] )"}">{parse date="$r['notify_sent']" format="short"}</abbr></span></li>
-				</foreach>
-			<else />
-				<li>{$this->lang->words['hook_nounreadnotify']}</li>
-			</if>
+		<ul class='ipsList_inline'>
+		<foreach loop="eachTag:$tags['tags'] as $id => $data">
+			<li><span class="{$data['className']}">{$data['tagWithUrl']}</span></li>
+		</foreach>
 		</ul>
-		</div>
-	</div>]]></template_content>
-      <template_name>hookUnreadNotifications</template_name>
-      <template_data>$notifications</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div class='general_box alt clearfix' id='hook_watched_items'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['wi_content_title']}</h3>
-	<div class='recent_activity _sbcollapsable'>
-		<ol class='tab_bar no_title mini'>
-			<li id='tab_link_forums' class='tab_toggle active clickable'>{$this->lang->words['watched_forums']}</li>
-			<li id='tab_link_topics' class='tab_toggle clickable'>{$this->lang->words['watched_topics']}</li>
-		</ol>
-		<div id='tab_content_forums' class='tab_toggle_content'>
-			<if test="updatedforums:|:is_array( $updatedForums ) && count( $updatedForums )">
-				<ul class='clearfix'>
-					{parse striping="recent_topics" classes="row1,row2 altrow"}
-					<foreach loop="watched_forums:$updatedForums as $r">
-						<li class='{parse striping="recent_topics"}'><a href='{parse url="showforum={$r['id']}" base="public" template="showforum" seotitle="{$r['name_seo']}"}' rel='bookmark' title='{$this->lang->words['view_forum']}'>{$r['name']}</a></li>
-					</foreach>
-				</ul>
-			<else />
-				<ul class='clearfix'>
-					<if test="updatedforumsn:|:!is_array( $nUpdatedForums ) OR !count( $nUpdatedForums )">
-						<li class='{parse striping="recent_topics"}'>{$this->lang->words['wi_not_watch']}</li>
-					</if>
-				</ul>
-			</if>
-			<if test="noupdatedforums:|:is_array( $nUpdatedForums ) && count( $nUpdatedForums )">
-				<div id='more-watched-forums-container' style='display:none;'>
-					<ul>
-						<foreach loop="watched_hook_old:$nUpdatedForums as $r">
-							<li class='{parse striping="recent_topics"}'><a href='{parse url="showforum={$r['id']}" base="public" template="showforum" seotitle="{$r['name_seo']}"}' rel='bookmark' title='{$this->lang->words['view_forum']}'>{$r['name']}</a><br />
-								<span class='desc'>{$this->lang->words['wi_no_new']}</span>
-							</li>
-						</foreach>
-					</ul>
-				</div>
-				<fieldset class='submit'>
-					<input type='button' class='input_submit alt clickable' id='more-watched-forums' value='{$this->lang->words['wi_toggle_start']} {$this->lang->words['wi_toggle_end']}' />
-				</fieldset>
-			</if>
-		</div>
-		
-		<div id='tab_content_topics' class='tab_toggle_content' style='display:none;'>
-			{parse striping="recent_topics" classes="row1,row2 altrow"}
-			<if test="updatedtopics:|:is_array( $updatedTopics ) && count( $updatedTopics )">
-				<ul class='hfeed'>
-					<foreach loop="watched_hook:$updatedTopics as $r">
-						<li class='hentry {parse striping="recent_topics"}'><a href='{parse url="showtopic={$r['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$r['title_seo']}"}' rel='bookmark' title='{$this->lang->words['view_topic']}'>{$r['title']}</a> {$this->lang->words['recent_by']} <address class="author vcard"><a class="url fn" href="{parse url="showuser={$r['last_poster_id']}" template="showuser" seotitle="{$r['seo_last_name']}" base="public"}" title='{$this->lang->words['view_profile']}'>{$r['last_poster_name']}</a>{parse template="user_popup" group="global" params="$r['last_poster_id'], $r['seo_last_name']"}</address><br /><span class='date'><abbr class="published" title="{parse expression="date( 'c', $r['last_post'] )"}">{parse date="$r['last_post']" format="short"}</abbr></span></li>
-					</foreach>
-				</ul>
-			<else />
-				<if test="updatedtopicsn:|:!is_array( $nUpdatedTopics ) OR !count( $nUpdatedTopics )">
-					<ul class='hfeed'>
-						<li class='{parse striping="recent_topics"}'>{$this->lang->words['wi_no_topics']}</li>
-					</ul>
-				</if>
-			</if>
-			<if test="noupdatedtopics:|:is_array( $nUpdatedTopics ) && count( $nUpdatedTopics )">
-				<div id='more-watched-topics-container' style='display:none;'>
-					<ul class='hfeed'>
-						<foreach loop="watched_hook_old:$nUpdatedTopics as $r">
-							<li class='hentry {parse striping="recent_topics"}'><a href='{parse url="showtopic={$r['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$r['title_seo']}"}' rel='bookmark' title='{$this->lang->words['view_topic']}'>{$r['title']}</a> {$this->lang->words['recent_by']} <address class="author vcard"><a class="url fn" href="{parse url="showuser={$r['last_poster_id']}" template="showuser" seotitle="{$r['seo_last_name']}" base="public"}" title='{$this->lang->words['view_profile']}'>{$r['last_poster_name']}</a>{parse template="user_popup" group="global" params="$r['last_poster_id'], $r['seo_last_name']"}</address><br /><span class='date'><abbr class="published" title="{parse expression="date( 'c', $r['last_post'] )"}">{parse date="$r['last_post']" format="short"}</abbr></span></li>
-						</foreach>
-					</ul>
-				</div>
-				<fieldset class='submit'>
-					<input type='button' id='more-watched-topics' class='input_submit alt clickable' value='{$this->lang->words['wi_toggle_start']} {$this->lang->words['wi_t_toggle_end']}' />
-				</fieldset>
-			</if>
-		</div>
 	</div>
 </div>]]></template_content>
-      <template_name>hookWatchedItems</template_name>
-      <template_data>$updatedTopics, $nUpdatedTopics, $updatedForums, $nUpdatedForums</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_name>hookTagCloud</template_name>
+      <template_data>$tags</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -541,15 +379,130 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div id='active_chat' class='stats_list'>
-			<h2>
-				{$this->lang->words['whoschatting_total']} {$this->lang->words['whoschatting_loadchat']}
-			</h2>
-			<p>{$this->lang->words['whoschatting_none']}</p>
-		</div>]]></template_content>
+      <template_content><![CDATA[<foreach loop="innerLoop:$replies as $reply">
+	<div id='statusReply-{$reply['reply_id']}' class='ipsPad_half'>
+		<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$reply['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$reply['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_tiny' /></a>
+		<div class='list_content'>
+			<div class='right lighter'>
+				<span class='desc ipsType_smaller'>{parse date="$reply['reply_date']" format="manual{%d %b}" relative="true"}&nbsp;&nbsp;</span>
+				<span class='desc mod_links ipsType_smaller'>
+					<if test="canDelete:|:$reply['_canDelete']"><a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteReply&amp;status_id={$reply['reply_status_id']}&amp;reply_id={$reply['reply_id']}&amp;k={$this->member->form_hash}" id="statusReplyDelete-{$reply['reply_status_id']}-{$reply['reply_id']}" class="__sDR __dr{$reply['reply_status_id']}-{$reply['reply_id']}">{$this->lang->words['status_delete_link']}</a></if>
+				</span>
+			</div>
+			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' style='font-weight:bold'>{$reply['members_display_name']}</a>
+			<p class='index_status_update ipsType_small'>{$reply['reply_content']}</p>
+		</div>
+	</div>
+</foreach>]]></template_content>
+      <template_name>statusReplies</template_name>
+      <template_data>$replies=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_boards</template_group>
+      <template_content><![CDATA[{parse js_module="status"}
+<script type="text/javascript">
+	ipb.status.maxReplies = {parse expression="intval($this->settings['su_max_replies'])"};
+	ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
+	ipb.status.skin_group = 'boards';
+</script>
+<foreach loop="outerLoop:$updates as $id => $status">
+	<if test="$this->memberData['member_id'] AND $latestOnly AND $status['member_id'] == $this->memberData['member_id']">
+		<script type="text/javascript">
+			ipb.status.myLatest = {$status['status_id']};
+		</script>
+	</if>
+	<ul class='ipsList_withminiphoto status_list' id='statusWrap-{$status['status_id']}'>
+		<li class='clearfix'>
+			<a href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$status['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$status['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_mini' /></a>
+			<div class='list_content'>
+				<div id="statusContent-{$status['status_id']}">
+					<div class='right desc lighter'>
+						<span class='desc mod_links ipsType_smaller'>						
+							<if test="canDelete:|:$status['_canDelete']"><a rel="nofollow" href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusDelete-{$status['status_id']}" class="__sD __d{$status['status_id']}">{$this->lang->words['status_delete_link']}</a></if>
+							<span id='statusUnlock-{$status['status_id']}' <if test="isLocked:|:$status['_isLocked'] AND $status['_canUnlock']">style='display:inline'<else />style='display:none'</if>> &middot; <a rel="nofollow"  href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=unlockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusUnlockLink-{$status['status_id']}" class="__sU __u{$status['status_id']}">{$this->lang->words['status_unlock_link']}</a></span>
+							<span id='statusLock-{$status['status_id']}' <if test="canLock:|:$status['_canLock'] AND ! $status['_isLocked']">style='display:inline'<else />style='display:none'</if>> &middot; <a rel="nofollow"  href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=lockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusLockLink-{$status['status_id']}" class="__sL __l{$status['status_id']}">{$this->lang->words['status_lock_link']}</a></span>
+						</span>
+						&nbsp;&nbsp;<span class='ipsType_smaller blend_links'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$status['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{parse date="$status['status_date']" format="manual{%d %b}" relative="true"}</a></span>
+					</div>
+					{parse template="userHoverCard" group="global" params="$status"}
+					<p class='index_status_update ipsType_small'>{$status['status_content']}</p>
+					<span class='desc' id='statusToggle-{$status['status_id']}'>
+						<if test="$status['_userCanReply']">
+							<if test="$status['status_replies']">
+								<a href="#" class="__sT __t{$status['status_id']} ipsType_smaller ">{parse expression="sprintf( $this->lang->words['view_comments_and_add'], $status['status_replies'])"}</a>
+							<else />
+								<a href="#" class="__sT __t{$status['status_id']} ipsType_smaller">{$this->lang->words['add_comments_only']}</a>
+							</if>
+						<else />
+							<if test="$status['status_replies']">
+								<a href="#" class="__sT __t{$status['status_id']} ipsType_smaller">{parse expression="sprintf( $this->lang->words['view_comments_only'], $status['status_replies'])"}</a>
+							</if>
+						</if>
+						<img src="{$this->settings['img_url']}/icon_lock.png" id='statusLockImg-{$status['status_id']}' alt="{$this->lang->words['status__locked']}" style='display: none' />
+						<if test="cImg:|:! $smallSpace AND $status['_creatorImg']"><img src="{$status['_creatorImg']}" alt='' data-tooltip="{$this->lang->words['su_via']} {$status['_creatorText']}" /></if>
+					</span>
+					<span class='desc' id='statusToggleOff-{$status['status_id']}' style='display:none'>
+						<a href="#" class="__sTO __to{$status['status_id']}">{$this->lang->words['view_comments_collapse']}</a>
+					</span>
+				</div>
+			</div>
+			<div id="statusFeedback-{$status['status_id']}" class='status_feedback' style='display:none'>
+				<div class='ipsList_withtinyphoto status_list' id='statusReplies-{$status['status_id']}'>
+					<if test="$status['status_replies'] AND count( $status['replies'] )">
+						<if test="hasMore:|:$status['status_replies'] > 3">
+							<div class='status_mini_wrap row2 altrow' id='statusMoreWrap-{$status['status_id']}'>
+								<img src="{$this->settings['img_url']}/comments.png" alt="" /> &nbsp;<a href="#" id="statusMore-{$status['status_id']}" class='__showAll __x{$status['status_id']}'>{parse expression="sprintf( $this->lang->words['status_show_all_x'], $status['status_replies'] )"}</a>
+							</div>
+						</if>
+						{parse template="statusReplies" group="boards" params="$status['replies']"}
+					</if>
+					<div id='statusReplyBlank-{$status['status_id']}' style='display: none'></div>
+				</div>
+				<if test="$status['_userCanReply']">
+					<div class='ipsList_withtinyphoto status_list status_reply clearfix ipsPad_half' id='statusReply-{$status['status_id']}'>
+						<img src='{$this->memberData['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$this->memberData['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_tiny left' />
+						<div class='list_content'>
+							<form id='statusReplyForm-{$status['status_id']}' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=reply&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
+								<textarea class='status_textarea' rows='3' cols='50' name='comment-{$status['status_id']}' id='statusText-{$status['status_id']}'></textarea>
+								<div class="status_submit"><input type='submit' class='__submit input_submit' id='statusSubmit-{$status['status_id']}' value='{$this->lang->words['status__dfcomment']}' /></div>
+							</form>
+							<a href='#' class='__showform' id='statusReplyFormShow-{$status['status_id']}' style='display: none'>{$this->lang->words['status__addcomment']}</a>
+						</div>
+					</div>
+					<script type='text/javascript'>
+						if( $('statusReplyForm-{$status['status_id']}') ){
+							$('statusReplyForm-{$status['status_id']}').hide();
+						}
+						if( $('statusReplyFormShow-{$status['status_id']}') ){
+							$('statusReplyFormShow-{$status['status_id']}').show();
+						}
+					</script>
+				</if>
+			</div>
+		</li>
+	</ul>
+</foreach>]]></template_content>
+      <template_name>statusUpdates</template_name>
+      <template_data>$updates=array(), $smallSpace=0, $latestOnly=0</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_boards</template_group>
+      <template_content><![CDATA[<br />
+		<h4 class='statistics_head'>{$this->lang->words['whoschatting_total']} {$this->lang->words['whoschatting_loadchat']}</h4>
+		<p>{$this->lang->words['whoschatting_none']}</p>]]></template_content>
       <template_name>whoschatting_empty</template_name>
       <template_data/>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -557,19 +510,15 @@
     </template>
     <template>
       <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<div id='active_chat' class='stats_list'>
-			<h2>
-				{$total} {$this->lang->words['whoschatting_total']} {$this->lang->words['whoschatting_loadchat']}
-			</h2>
-			<if test="activeChat:|:count($names)">
-				<ul>
-					<li>{parse expression="implode( ",</li><li>", $names )"}</li>
-				</ul>
-			</if>
-		</div>]]></template_content>
+      <template_content><![CDATA[<br /><br />
+		<h4 class='statistics_head'>{$total} {$this->lang->words['whoschatting_total']} {$this->lang->words['whoschatting_loadchat']}</h4>
+		<br />
+		<p>
+			<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $names )"}</span>
+		</p>]]></template_content>
       <template_name>whoschatting_show</template_name>
       <template_data><![CDATA[$total="",$names=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -592,9 +541,7 @@
 </if>
 <table class='ipb_table'>
 	<tr class='header'>
-		<if test="guestthumb:|:$this->memberData['member_id'] || $this->settings['guests_img']">
-			<th>&nbsp;</th>
-		</if>
+		<th>&nbsp;</th>
 		<th>{$this->lang->words['attach_title']}</th>
 		<th>{$this->lang->words['attach_size']}</th>
 		<th>{$this->lang->words['attach_post']}</th>
@@ -603,11 +550,9 @@
 	<if test="count($rows)">
 		<foreach loop="attachments:$rows as $data">
 			<tr class='{parse striping="attachies"}' id="{$data['attach_id']}">
-			<if test="guestthumb:|:$this->memberData['member_id'] || $this->settings['guests_img']">
 				<td class="altrow short">
 					<img src="{$this->settings['mime_img']}/{$data['image']}" alt="{$this->lang->words['attached_file']}" />
 				</td>
-			</if>
 				<td>
 					<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['attach_file']}">{$data['short_name']}</a><br />
 					<span class="desc">( {$this->lang->words['attach_hits']}: {$data['attach_hits']} )<br />( {$this->lang->words['attach_post_date']} {$data['attach_date']} )</span>
@@ -624,18 +569,7 @@
 </if>]]></template_content>
       <template_name>forumAttachments</template_name>
       <template_data>$title, $rows, $pages</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>forumAttachmentsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -649,324 +583,278 @@
 	//Search Setup
 	ipb.vars['search_type']		= 'forum';
 	ipb.vars['search_type_id']	= {$this->request['showforum']};
-	ipb.templates['topic_rename'] = new Template("<input type='text' id='#{inputid}' value='#{value}' class='input_text' maxlength='{$this->settings['topic_title_max_len']}' /> <input type='submit' value='{$this->lang->words['rename_topic_update']}' class='input_submit' id='#{submitid}' /> <a href='#' id='#{cancelid}' class='cancel' title='{$this->lang->words['cancel']}'>{$this->lang->words['cancel']}</a>");
-	ipb.global.boardMarkers = ({
-		'f_cat_unread': "{parse replacement="f_cat_read"}",
-		'f_unread': "{parse replacement="f_read"}",
-		'f_pass_unread': "{parse replacement="f_pass_read"}"
-	});
-	var markerURL = "{parse url="app=forums&module=ajax&section=markasread" base="public"}"; // Ajax URL so don't use &amp;
-	
-	// Delete stuff set up
-	ipb.forums.deleteUrls['hardDelete'] = new Template("{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=08&amp;t=#{tid}" base="public"}");
-	ipb.forums.deleteUrls['softDelete'] = new Template("{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=sdelete&amp;t=#{tid}" base="public"}");
-	
-	// Add perm data
-	ipb.forums.deletePerms = { 'canDelete' : {parse expression="intval($this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['delete_topic'])"}, 'canSoftDelete' : {parse expression="intval($forum_data['permissions']['TopicSoftDelete'])"} };
+	ipb.templates['topic_rename'] = new Template("<input type='text' id='#{inputid}' value='#{value}' class='input_text' size='50' maxlength='{$this->settings['topic_title_max_len']}' /> <input type='submit' value='{$this->lang->words['rename_topic_update']}' class='input_submit' id='#{submitid}' /> <a href='#' id='#{cancelid}' class='cancel' title='{$this->lang->words['cancel']}'>{$this->lang->words['cancel']}</a>");
+	var markerURL  = "{parse url="app=forums&module=ajax&section=markasread&i=1" base="public"}"; // Ajax URL so don't use &amp;
+	var unreadIcon = "<img src='{$this->settings['img_url']}/f_icon_read.png' />";
 //|#^#]>
 </script>
-
-<if test="rulesinline:|:$forum_data['show_rules'] == 2">
-<div class='message unspecific forum_rules'>
-<h3>{$forum_data['rules_title']}</h3>
-{$forum_data['rules_text']}
-</div>
+<if test="watchismember:|:$this->memberData['member_id']">
+	<if test="hasFollowData:|:$other_data['follow_data']">
+		{$other_data['follow_data']}
+	</if>
 </if>
-<if test="ruleslink:|:$forum_data['show_rules'] == 1">
-<div class='message unspecific forum_rules'>
-	<a href='{parse url="app=forums&amp;module=forums&amp;section=rules&amp;f={$forum_data['id']}" base="public"}' title='{$this->lang->words['view_forum_rules']}'><strong>{$forum_data['rules_title']}</strong></a>
+<h1 class='ipsType_pagetitle'>{$forum_data['name']}</h1>
+<div class='ipsType_pagedesc forum_rules'>
+	<if test="rules:|:$forum_data['show_rules']">
+		<if test="rulesinline:|:$forum_data['show_rules'] == 2">
+			<strong>{$forum_data['rules_title']}</strong>
+			{$forum_data['rules_text']}
+		</if>
+		<if test="ruleslink:|:$forum_data['show_rules'] == 1">
+			<a href='{parse url="app=forums&amp;module=forums&amp;section=rules&amp;f={$forum_data['id']}" base="public"}' title='{$this->lang->words['view_forum_rules']}'>{$forum_data['rules_title']}</a>
+		</if>
+	<else />
+		{$forum_data['description']}
+	</if>
 </div>
+<br />
+<if test="hasannouncements:|:is_array( $announce_data ) AND count( $announce_data )">
+	<table class='ipb_table topic_list hover_rows' summary='{$this->lang->words['forum_topic_list']} "{$forum_data['name']}"' id='announcements'>
+		<foreach loop="announcements:$announce_data as $aid => $adata">
+			<tr class='row2 announcement' id='arow_{$adata['announce_id']}'>
+				<td>
+					<php>$_seoTitle	= $adata['announce_seo_title'] ? $adata['announce_seo_title'] : "%%{$adata['announce_title']}%%";</php>
+					{parse replacement="t_announcement"}
+					<h4>
+						<a href="{parse url="showannouncement={$adata['announce_id']}&amp;f={$forum_data['id']}" seotitle="{$_seoTitle}" template="showannouncement" base="public"}" title='{$this->lang->words['view_announcement']}'>{$adata['announce_title']}</a>
+					</h4>&nbsp;
+					<span class='desc'>{$this->lang->words['posted_by']} {parse template="userHoverCard" group="global" params="$adata"}
+						<if test="announcedates:|:$adata['announce_start'] AND $adata['announce_start'] != '--'">, {$adata['announce_start']}</if>
+					</span>
+				</td>
+			</tr>
+		</foreach>
+	</table>
+	<br />	
 </if>
 <!-- __-SUBFORUMS-__ -->
 <if test="hassubforums:|:is_array( $sub_forum_data ) AND count( $sub_forum_data )">
 	<div class='category_block block_wrap'>
-		<h3 class='maintitle'>{$forum_data['name']} {$this->lang->words['sub_forum_title']}</h3>
-		<table class='ipb_table' summary="{$this->lang->words['cat_subforums']} '{$forum_data['name']}'">
-			<tr class='header'>
-				<th scope='col' class='col_c_icon'>&nbsp;</th>
-				<th scope='col' class='col_c_forum'>{$this->lang->words['cat_name']}</th>
-				<th scope='col' class='col_c_stats stats'>{$this->lang->words['forum_stats']}</th>
-				<th scope='col' class='col_c_post'>{$this->lang->words['last_post_info']}</th>
-			</tr>
-			<!-- / CAT HEADER -->
-			
-			<foreach loop="subforums:$sub_forum_data as $_data">
-				<if test="subforumdata:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
-					{parse striping="catTable" classes="row1,row2"}
-					<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
-						<if test="isredirect:|:$forum_data['redirect_on']">
-							<tr class='{parse striping="catTable"} redirect_forum'>
-								<td class='altrow'>{parse replacement="f_redirect"}</td>
-								<td>
-									<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['goto_forum']}'>{$forum_data['name']}</a></h4>
-									<p class='desc'>{$forum_data['description']}</p>
-								</td>
-								<td colspan='2'>
-									{$this->lang->words['rd_hits']}: {parse format_number="$forum_data['redirect_hits']"}
-								</td>
-							</tr>
-						<else />
-							<tr class='{parse striping="catTable"}'>
-								<td class='altrow'>
-									<a id='forum_img_{$forum_data['id']}' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}" base="public"}" title="{$this->lang->words['bi_markread']}" class='forum_marker'>{parse replacement="{$forum_data['img_new_post']}"}</a>
-									
-									<script type='text/javascript'>
-										ipb.global.registerMarker( 'forum_img_{$forum_data['id']}', "{$forum_data['img_new_post']}", markerURL + "&forumid={$forum_data['id']}" );
-									</script>
-								</td>
-								<td>
-									<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['goto_forum']}'>{$forum_data['name']}</a></h4>
-									<p class='desc'>{$forum_data['description']}</p>
-							
-									<if test="showsubforums:|:$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
-										<h5 class='hide'>{$this->lang->words['subforums']}</h5>
-										<ol class='subforums' id='subforums_{$forum_data['id']}'>
-										<foreach loop="sub_subforums:$forum_data['subforums'] as $__id => $__data">
-											<if test="showSubForumsLit:|:$__data[3]"><li class='newposts'><else /><li></if><a href="{parse url="showforum={$__data[0]}" seotitle="{$__data[2]}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$__data[1]}</a></li>
-										</foreach>
-										</ol>
-									</if>
-									<!-- Skinnote: Clean up queued stuff -->
-									<if test="seequeuedicon:|:$forum_data['_has_queued_and_can_see_icon']">
-										<em class='moderated'><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=all" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['view_unapproved']}'>{parse expression="sprintf( $this->lang->words['f_queued'], $forum_data['queued_topics'], $forum_data['queued_posts'])"}</a></em>
-									</if>
-								</td>
-								<td class='altrow stats'>
-									<ul>
-										<li>{$forum_data['topics']} {$this->lang->words['topics']}</li>
-										<li>{$forum_data['posts']} {$this->lang->words['replies']}</li>
-									</ul>
-								</td>
-								<td>
-									<ul class='last_post'>
-										<if test="hidelastinfo:|:$forum_data['hide_last_info']">
-											<li>{$this->lang->words['f_protected']}</li>
-										<else />
-											<li><a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse replacement="f_lastpost"}</a> <a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse date="$forum_data['last_post']" format="LONG"}</a></li>
-											<li><strong>{$this->lang->words['in_last_topic']}</strong> {$forum_data['last_topic_title']}</li>
-											<li>
-												<strong>{$this->lang->words['forum_by']}</strong>
-												<if test="lastpostername:|:isset($forum_data['last_poster_name']) AND $forum_data['last_poster_name']">
-													<if test="lastposterid:|:$forum_data['last_poster_id']">
-														<a href='{parse url="showuser={$forum_data['last_poster_id']}" seotitle="{$forum_data['seo_last_name']}" template="showuser" base="public"}'>{$forum_data['last_poster_name']}</a>{parse template="user_popup" group="global" params="$forum_data['last_poster_id'],$forum_data['seo_last_name']"}
-													<else />
-														{$this->settings['guest_name_pre']}{$forum_data['last_poster_name']}{$this->settings['guest_name_suf']}
-													</if>
-												<else />
-													{$this->lang->words['f_none']}
+		<h3 class='maintitle'>{$this->lang->words['sub_forum_title']}</h3>
+		<div class='ipsBox table_wrap'>
+			<div class='ipsBox_container'>
+				<table class='ipb_table' summary="{$this->lang->words['cat_subforums']} '{$forum_data['name']}'">
+					<foreach loop="subforums:$sub_forum_data as $_data">
+						<if test="subforumdata:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
+							<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
+								<if test="forumRedirect:|:$forum_data['redirect_on']">
+									<tr class='redirect_forum' id='f_{$forum_data['id']}'>
+										<td class='col_c_icon'>
+											<img src='{$this->settings['img_url']}/f_redirect.png' />
+										</td>
+										<td colspan='2' class='col_c_forum'>
+											<h4><a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a></h4>
+											<p class='desc'>{$forum_data['description']}</p>
+										</td>
+										<td class='desc'>
+											<ul class='last_post ipsType_small'>
+												<li class='desc lighter'><em>{parse format_number="$forum_data['redirect_hits']"} {$this->lang->words['rd_hits']}</em></li>
+											</ul>
+										</td>
+									</tr>
+								<else />
+									<tr class='<if test="$forum_data['_has_unread']">unread</if>'>
+										<td class='col_c_icon'>
+											<if test="$forum_data['_has_unread']">
+												<a id='forum_img_{$forum_data['id']}' href="{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$this->request['f']}&amp;i=1" base="public"}" data-tooltip="{$this->lang->words['bi_markread']}" class='forum_marker'><img src='{$this->settings['img_url']}/f_icon.png' /></a>
+												<script type='text/javascript'>
+													ipb.global.registerMarker( "forum_img_{$forum_data['id']}", "{$forum_data['img_new_post']}", markerURL + "&forumid={$forum_data['id']}" );
+												</script>
+											<else />
+												<img src='{$this->settings['img_url']}/f_icon_read.png' />
+											</if>
+										</td>
+										<td class='col_c_forum'>									
+											<h4>
+												<if test="hasQueuedAndCanSeeIcon:|:!empty($forum_data['_has_queued_and_can_see_icon'])">
+													<a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=all" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['view_unapproved']}' class='ipsBadge ipsBadge_orange' data-tooltip="{parse expression="sprintf( $this->lang->words['f_queued'], $forum_data['queued_topics'], $forum_data['queued_posts'])"}" style='vertical-align: top'>{$this->lang->words['f_queued_badge']}</a>
 												</if>
-											</li>
-										</if>
-									</ul>
-								</td>
-							</tr>
+												<a href="{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$forum_data['name']}</a>
+											</h4>
+										
+											<if test="showSubForums:|:$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
+												<br />
+												<ol class='ipsList_inline ipsType_small subforums' id='subforums_{$forum_data['id']}'>
+													<foreach loop="subforums:$forum_data['subforums'] as $__id => $__data">
+														<if test="showSubForumsLit:|:$__data[3]"><li class='unread'><else /><li></if>
+															<a href="{parse url="showforum={$__data[0]}" seotitle="{$__data[2]}" template="showforum" base="public"}" title='{$this->lang->words['go_to_forum']}'>{$__data[1]}</a>
+														</li>
+													</foreach>
+												</ol>
+											</if>
+																	
+											<p class='desc __forum_desc ipsType_small'>{$forum_data['description']}</p>											
+										</td>
+										<td class='col_c_stats ipsType_small'>
+											<ul>
+												<li><strong>{$forum_data['topics']}</strong> {$this->lang->words['topics']}</li>
+												<li><strong>{$forum_data['posts']}</strong> {$this->lang->words['replies']}</li>
+											</ul>
+										</td>
+										<td class='col_c_post'>
+											<if test="hideLastInfo:|:$forum_data['hide_last_info']">
+												<ul class='last_post ipsType_small'>
+													<li class='desc lighter'><em>{$this->lang->words['f_protected']}</em></li>
+												</ul>
+											<else />
+												<if test="hasphoto:|:$forum_data['pp_small_photo'] AND !$forum_data['hide_last_info']">
+													<a href='{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}' class='ipsUserPhotoLink left'>
+														<img src='{$forum_data['pp_small_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+													</a>
+												<else />
+													<if test="hasPost:|:$forum_data['last_id']"><div class='left'>{IPSMember::buildNoPhoto(0, 'mini' )}</div></if>
+												</if>
+												<ul class='last_post ipsType_small'>
+													<if test="!$forum_data['last_id']">
+														<li class='desc lighter'><em>{$this->lang->words['f_none']}</em></li>
+													<else />
+														<li>
+															{$forum_data['last_topic_title']}
+														</li>
+														<if test="lastPosterID:|:$forum_data['last_poster_id']">
+															<li>{$this->lang->words['by_ucfirst']} {parse template="userHoverCard" group="global" params="$forum_data"}</li>
+														</if>
+														<if test="hideDateUrl:|:$forum_data['_hide_last_date']">
+															<li class='desc lighter blend_links'>{parse date="$forum_data['last_post']" format="DATE"}</li>
+														<else />
+															<li class='desc lighter blend_links'><a href='{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}' title='{$this->lang->words['view_last_post']}'>{parse date="$forum_data['last_post']" format="DATE"}</a></li>
+														</if>
+										
+													</if>
+											
+												</ul>
+											</if>
+										</td>
+									</tr>
+								</if>
+							</foreach>
 						</if>
 					</foreach>
-				</if>
-			</foreach>
-		</table>
+				</table>
+			</div>
+		</div>
 	</div>
-	<br />
+	<br /><br />
 </if>
 <if test="showtopics:|:$forum_data['sub_can_post']">
-	<div class='topic_controls'>
+	<div class='topic_controls clearfix'>
 		{$forum_data['SHOW_PAGES']}
-	
-			<ul class='topic_buttons'>
-				<if test="usercanpost:|:$forum_data['_user_can_post']">
-					<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum_data['id']}" base="publicWithApp"}' title='{$this->lang->words['topic_start']}' accesskey='s'><img src='{$this->settings['img_url']}/page_white_add.png' alt='{$this->lang->words['topic_start']}' /> {$this->lang->words['topic_start']}</a></li>
-				<else />
-					<li class='disabled'><span>{$this->lang->words['forum_no_start_topic']}</span></li>
-				</if>
-				<if test="watchismember:|:$this->memberData['member_id']">
-					<if test="stopwatching:|:$this->settings['cpu_watch_update'] AND ( is_array( $this->memberData['_cache'] ) AND is_array( $this->memberData['_cache']['watchedForums'] ) AND in_array( $forum_data['id'], $this->memberData['_cache']['watchedForums'] ) )">
-						<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchForums&amp;do=saveIt&amp;authKey={$this->member->form_hash}&amp;forumIDs[{$forum_data['id']}]=1&amp;trackchoice=unsubscribe&amp;forumReturn={$forum_data['id']}" base="public"}' title='{$this->lang->words['ft_title']}'>{parse replacement="watch_forum_on"} {$this->lang->words['ft_title_stop']}</a></li>
-					<else />
-						<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=watch&amp;do=watch&amp;watch=forum&amp;fid={$forum_data['id']}" base="public"}' title='{$this->lang->words['ft_title']}'>{parse replacement="watch_forum_off"} {$this->lang->words['ft_title']}</a></li>
-					</if>				
-				</if>
-			</ul>
-	</div>
-	<div class='category_block block_wrap'>
-		<table class='ipb_table topic_list' summary='{$this->lang->words['forum_topic_list']} "{$forum_data['name']}"' id='forum_table'>
-			<caption class='maintitle'>
-				<span class='main_forum_title'>{$forum_data['name']}</span><span class='desc'><a href='{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$forum_data['id']}" base="public"}' title='{$this->lang->words['mark_as_read']}'>({$this->lang->words['mark_as_read']})</a></span></caption>
-			<tr class='header'>
-				<th scope='col' class='col_f_icon'>&nbsp;</th>
-				<th scope='col' class='col_f_topic'>{$this->lang->words['forum_topic']}</th>
-				<th scope='col' class='col_f_starter short'>{$this->lang->words['forum_started_by']}</th>
-				<th scope='col' class='col_f_views stats'>{$this->lang->words['forum_stats']}</th>
-				<th scope='col' class='col_f_post'>{$this->lang->words['forum_last_post_info']}</th>
-				<if test="topicsismod:|:$this->memberData['is_mod'] == 1">
-					<th scope='col' class='col_f_mod short'><input type='checkbox' id='tmod_all' class='input_check' title='{$this->lang->words['topic_select_all']}' value='1' /></th>
-				</if>
-			</tr>	
-			<!-- ANNOUNCEMENTS -->
-			<if test="hasannouncements:|:is_array( $announce_data ) AND count( $announce_data )">
-				<foreach loop="announcements:$announce_data as $aid => $adata">
-					<tr class='row2 announcement' id='arow_{$adata['announce_id']}'>
-						<td class='short altrow'>{parse replacement="t_announcement"}</td>
-							<if test="topicsismod:|:$this->memberData['is_mod'] == 1">
-								<td colspan='5'>
-							<else />
-								<td colspan='4'>
-							</if>
-							<span class='topic_prefix'>{$this->lang->words['announce_row']}</span>&nbsp;
-							<php>$_seoTitle	= $adata['announce_seo_title'] ? $adata['announce_seo_title'] : "%%{$adata['announce_title']}%%";</php>
-							<a href="{parse url="showannouncement={$adata['announce_id']}&amp;f={$forum_data['id']}" seotitle="{$_seoTitle}" template="showannouncement" base="public"}" title='{$this->lang->words['view_announcement']}'>{$adata['announce_title']}</a><br />
-							<span class='desc'>{$this->lang->words['posted_by']} <strong><a href="{parse url="showuser={$adata['member_id']}" seotitle="{$adata['members_seo_name']}" template="showuser" base="public"}" title='{$this->lang->words['view_profile']}'>{$adata['member_name']}</a> {parse template="user_popup" group="global" params="$adata['member_id'], $adata['members_seo_name']"}</strong>
-								<if test="announcedates:|:$adata['announce_start'] AND $adata['announce_start'] != '--'">, {$adata['announce_start']}</if>
-							</span>
-						</td>
-					</tr>
-				</foreach>
-				<tr class='subhead altbar'>
-					<th scope='col' colspan='<if test="endannouncements:|:$this->memberData['is_mod'] == 1">6<else />5</if>'>
-						{$this->lang->words['forum_topic_list']}
-					</th>
-				</tr>
-			</if>
-			
-			<!-- BEGIN TOPICS -->
-			<if test="hastopics:|:is_array( $topic_data ) AND count( $topic_data )">
-				{parse striping="forumTable" classes="row1,row2"}
-				<foreach loop="topics:$topic_data as $tid => $data">
-					<if test="queuedtopic:|:($this->memberData['is_mod'] AND ! $data['approved']) OR $data['_isDeleted']">
-					<tr class='{parse striping="forumTable"} moderated' id='trow_{$data['tid']}'>
-					<else />
-					<tr class='{parse striping="forumTable"}' id='trow_{$data['tid']}'>
-					</if>
-						<td class='short altrow'>{parse replacement="{$data['folder_img']}"}</td>
-						<td class='__topic __tid{$data['tid']}<if test="hasmodlinks:|:$this->memberData['is_mod'] == 1 || $forum_data['permissions']['TopicSoftDelete']"> with_mod_links</if>'>
-						<if test="islink:|:$data['state'] != 'link'"><span class='topic_preview right'>{parse template="topic_popup" group="global" params="$data['tid']"}</span></if>
-							<if test="topicIsDeleted:|:$data['_isDeleted']">
-							<ul class='topic_moderation right rounded'>
-								<if test="tidRestore:|:$forum_data['permissions']['TopicSoftDeleteRestore']">
-									<li class='t_restore'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=sundelete" base="public"}' title='{$this->lang->words['dlt_restore_topic']}'><img src='{$this->settings['img_url']}/arrow_rotate_clockwise.png' alt='{$this->lang->words['dlt_restore_topic']}' title='{$this->lang->words['dlt_restore_topic']}' /></a></li>
-								</if>
-								<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['delete_topic']">
-									<li class='t_restore'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;t={$data['real_tid']}&amp;auth_key={$this->member->form_hash}&amp;do=03" base="public"}' title='{$this->lang->words['dlt_delete_topic']}'><img src='{$this->settings['img_url']}/delete.png' alt='{$this->lang->words['dlt_delete_topic']}' title='{$this->lang->words['dlt_delete_topic']}' /></a></li>
-								</if>
-							</ul>
-							<else />
-								<if test="topicmoderator:|:$this->memberData['is_mod'] == 1  || $forum_data['permissions']['TopicSoftDelete']">
-									<ul class='topic_moderation right rounded'>
-										<li class='t_rename'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;auth_key={$this->member->form_hash}&amp;do=05" base="public"}' title='{$this->lang->words['topic_rename']}'><img src='{$this->settings['img_url']}/textfield_rename.png' alt='{$this->lang->words['topic_rename']}' title='{$this->lang->words['topic_rename']}' /></a></li>
-									<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['delete_topic'] || $forum_data['permissions']['TopicSoftDelete']">
-										<li class='t_delete'><a id='t_deletelink_{$data['tid']}' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;t={$data['real_tid']}&amp;auth_key={$this->member->form_hash}&amp;do=03" base="public"}' title='{$this->lang->words['topic_delete']}'><img src='{$this->settings['img_url']}/delete.png' alt='{$this->lang->words['topic_delete']}' title='{$this->lang->words['topic_delete']}' /></a></li>
-									</if>
-									<if test="islink:|:$data['state'] != 'link'">
-										<if test="ispinned:|:$data['pinned'] && ($this->memberData['g_is_supmod'] OR $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['pin_topic'])">
-											<li class='t_pin'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=16&amp;from=forum" base="public"}' title='{$this->lang->words['topic_unpin']}'><img src='{$this->settings['img_url']}/award_delete.png' alt='{$this->lang->words['topic_unpin']} icon' title='{$this->lang->words['topic_unpin']}' /></a></li>
-										<else />
-											<if test="issupermod:|:$this->memberData['g_is_supmod'] OR $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['unpin_topic']">
-												<li class='t_pin'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=15&amp;from=forum" base="public"}' title='{$this->lang->words['topic_pin']}'><img src='{$this->settings['img_url']}/award.png' alt='{$this->lang->words['topic_pin']} icon' title='{$this->lang->words['topic_pin']}' /></a></li>
-											</if>
-										</if>
-									</if>
-									<if test="closedtopic:|:$data['state'] == 'closed' && $other_data['can_open_topics']">
-										<li class='t_lock'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=01" base="public"}' title='{$this->lang->words['topic_open']}'><img src='{$this->settings['img_url']}/lock_open.png' alt='{$this->lang->words['topic_open']}' title='{$this->lang->words['topic_open']}' /></a></li>
-									</if>
-									<if test="opentopic:|:$data['state'] == 'open' && $other_data['can_close_topics']">
-										<li class='t_lock'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=00&amp;_from=forum" base="public"}' title='{$this->lang->words['topic_close']}'><img src='{$this->settings['img_url']}/lock.png' alt='{$this->lang->words['topic_close']}' title='{$this->lang->words['topic_close']}' /></a></li>
-									</if>
-									</ul>
-								</if>
-							</if>
-							
-							{$data['prefix']}
-							<if test="topicreported:|: isset( $this->memberData['_cache']['report_temp']['post_marker']['topic'][$data['tid']]['gfx'] ) AND $this->memberData['_cache']['report_temp']['post_marker']['topic'][$data['tid']]['gfx'] > 0">
-								<a href="{parse url="app=core&amp;module=reports&amp;section=reports&amp;do=findfirst&amp;tid={$data['tid']}&amp;cid={$this->memberData['_cache']['report_temp']['post_marker']['topic'][$data['tid']]['info']['com_id']}" base="public"}"> <img src="{$this->settings['img_url']}/reports/post_alert_{$this->memberData['_cache']['report_temp']['post_marker']['topic'][$data['tid']]['gfx']}.png" alt='' title='{$this->lang->words['view_reported_posts']}' /> </a>
-							</if>
-							<if test="gotonewpost:|:$data['go_new_post'] === true"><a href='{parse url="showtopic={$data['tid']}&amp;view=getnewpost" template="showtopic" seotitle="{$data['title_seo']}" base="public"}' title='{$this->lang->words['first_unread_post']}'>{parse replacement="f_newpost"}</a></if> 
-							<if test="topichasattach:|:$data['topic_hasattach']">
-								<a href="{parse url="app=forums&amp;module=forums&amp;section=attach&amp;tid={$data['tid']}" base="public"}" title="{parse expression="intval($data['topic_hasattach'])"} {$this->lang->words['topic_attach']}" onclick="return ipb.forums.retrieveAttachments( {$data['tid']} );">{parse replacement="t_attach"}</a>
-							</if>
-							<if test="istracking:|:! empty($data['trackingTopic'])">{parse replacement="watch_small"}</if>
-							<a id="tid-link-{$data['tid']}" href="{parse url="showtopic={$data['tid']}" base="public" template="showtopic" seotitle="{$data['title_seo']}"}" title='{$this->lang->words['topic_started_on']} {$data['start_date']}' class='topic_title'>{$data['title']}</a>
-							{$data['_rate_img']}
-							<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
-								<ul class='mini_pagination'>
-								<foreach loop="pages:$data['pages'] as $page">
-										<if test="haslastpage:|:$page['last']">
-											<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
-										<else />
-											<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a></li>
-										</if>
-								</foreach>
-								</ul>
-							</if>
-							<if test="topicDeletedReason:|:$data['_isDeleted']">
-								<div class='desc'>
-									{$this->lang->words['tdb__forumindex']} <a href='{parse url="showuser={$other_data['sdData'][ $data['tid'] ]['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$other_data['sdData'][ $data['tid'] ]['members_seo_name']}"}'>{$other_data['sdData'][ $data['tid'] ]['members_display_name']}</a>{parse template="user_popup" group="global" params="$other_data['sdData'][ $data['tid'] ]['member_id'], $other_data['sdData'][ $data['tid'] ]['members_seo_name']"} {$this->lang->words['on']} {parse date="$other_data['sdData'][ $data['tid'] ]['sdl_obj_date']" format="long"}.
-									<if test="showReason:|:$forum_data['permissions']['SoftDeleteReason']">
-										<if test="$other_data['sdData'][ $data['tid'] ]['sdl_obj_reason']">{$other_data['sdData'][ $data['tid'] ]['sdl_obj_reason']}<else />{$this->lang->words['tdb__noreasongi']}</if>
-									</if>
-								</div>
-							<else />
-								<if test="description:|:$data['description']"><br /><span class='desc'>{$data['description']}</span></if>
-							</if>
-						</td>
-						<td class='short altrow'>{$data['starter']}{parse template="user_popup" group="global" params="$data['starter_id'], $data['seo_first_name']"}</td>
-						<td class='stats<if test="queuedposts:|:($this->memberData['is_mod'] AND $data['_hasqueued']) OR ($forum_data['permissions']['PostSoftDeleteSee'] AND $data['topic_deleted_posts'])"> moderated</if>'>
-							<ul>
-								<li>
-									<if test="queuedpostsImg:|:($this->memberData['is_mod'] AND $data['_hasqueued'])">
-										<a href='{parse url="showtopic={$data['tid']}&amp;modfilter=invisible_posts" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_uapproved_posts']}'><img src='{$this->settings['img_url']}/bullet_error.png' alt='' /></a>
-									</if>
-									<if test="deletedPostsImg:|:($forum_data['permissions']['PostSoftDeleteSee'] AND $data['topic_deleted_posts'])">
-										<a href='{parse url="showtopic={$data['tid']}&amp;modfilter=deleted_posts" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_deleted_posts']}'><img src='{$this->settings['img_url']}/bullet_delete.png' alt='' /></a>
-									</if>
-									{$data['posts']} <if test="replylang:|:intval($data['__posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if>
-								</li>
-					
-					
-								<li class='views desc'>{$data['views']} {$this->lang->words['views']}</li>
-							</ul>
-						</td>
-						<td class='altrow'>
-							<ul class='last_post'>
-								<li>
-									<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse replacement="f_lastpost"}</a> <a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$data['last_post']" format="SHORT"}</a>
-								</li>
-								<li>{$this->lang->words['forum_by']} {$data['last_poster']}{parse template="user_popup" group="global" params="$data['last_poster_id'], $data['seo_last_name']"}</li>
-							</ul>
-						</td>
-						<if test="mmicon:|:$this->memberData['is_mod'] == 1 and $inforum == 1">
-						<td class='short'>
-							<if test="mmtidon:|:$data['tidon'] == 0">
-								<input type='checkbox' class='input_check topic_mod' id='tmod_{$data['real_tid']}' />
-							<else />
-								<input type='checkbox' class='input_check topic_mod' id='tmod_{$data['real_tid']}' checked='checked' />
-							</if>
-						</td>
-						</if>
-					</tr>
-					
-					<if test="adCodeCheck:|:$data['_adCode']">
-					<tr>
-						<th scope='col' colspan='<if test="adCodeColSpan:|:$this->memberData['is_mod'] == 1">6<else />5</if>'>
-							{$data['_adCode']}
-						</th>
-					</tr>
-					</if>
-				</foreach>
+		<ul class='topic_buttons'>
+			<if test="usercanpost:|:$forum_data['_user_can_post']">
+				<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum_data['id']}" base="publicWithApp"}' title='{$this->lang->words['topic_start']}' accesskey='s'>{$this->lang->words['topic_start']}</a></li>
 			<else />
-				<tr> 
-					<if test="notopicsspan:|:$this->memberData['is_mod'] == 1">
-						<td colspan='6' class='no_messages'>
-					<else />
-						<td colspan='5' class='no_messages'>
-					</if>
-						{$this->lang->words['no_topics']}
-					</td>
-				</tr>
+				<li class='disabled'><span>{$this->lang->words['forum_no_start_topic']}</span></li>
 			</if>
-		</table>
-		<if test="moderationform:|:$this->memberData['is_mod'] == 1">
-			<div id='topic_mod' class='moderation_bar rounded with_action clear'>
-				<!-- SKINNOTE: Check delete -->
-				<form id='modform' method="post" action="{parse url="" base="public"}">
+			<li class='non_button'>
+				<a data-clicklaunch="forumMarkRead" data-fid="{$forum_data['id']}" href='{parse url="app=forums&amp;module=forums&amp;section=markasread&amp;marktype=forum&amp;forumid={$forum_data['id']}&amp;returntoforumid={$forum_data['id']}" base="public"}' title='{$this->lang->words['mark_as_read']}'><img src='{$this->settings['img_url']}/icon_check.png' /> &nbsp;{$this->lang->words['mark_as_read']}</a>
+			</li>
+		</ul>
+	</div>
+	<div class='ipsFilterbar maintitle'>
+		<if test="topicsismod:|:$this->memberData['is_mod'] == 1">
+			<span class='right'>
+				<input type='checkbox' id='tmod_all' class='input_check' title='{$this->lang->words['topic_select_all']}' value='1' />
+				&nbsp;
+			</span>
+		</if>
+		<ul class='ipsList_inline ipsType_small'>
+			<li <if test="ka_last_post:|:$this->request['sort_key'] == 'last_post' and $this->request['sort_by'] == 'Z-A'">class='active'</if>><a href='{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;sort_key=last_post&amp;sort_by=Z-A" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}' rel='nofollow'>{$this->lang->words['sort_recent']}</a></li>
+			<li <if test="ka_start_date:|:$this->request['sort_key'] == 'start_date' and $this->request['sort_by'] == 'Z-A'">class='active'</if>><a href='{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;sort_key=start_date&amp;sort_by=Z-A" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}' rel='nofollow'>{$this->lang->words['sort_start']}</a></li>
+			<li <if test="ka_replies:|:$this->request['sort_key'] == 'posts' and $this->request['sort_by'] == 'Z-A'">class='active'</if>><a href='{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;sort_key=posts&amp;sort_by=Z-A" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}' rel='nofollow'>{$this->lang->words['sort_replies']}</a></li>
+			<li <if test="ka_viewed:|:$this->request['sort_key'] == 'views' and $this->request['sort_by'] == 'Z-A'">class='active'</if>><a href='{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;sort_key=views&amp;sort_by=Z-A" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}' rel='nofollow'>{$this->lang->words['sort_views']}</a></li>
+			<li <if test="$this->request['sort_by'] == 'A-Z' or !in_array( $this->request['sort_key'], array( 'last_post', 'start_date', 'posts', 'views' ) )">class='active'</if>><a href='#forum_filter_menucontent' id='forum_filter'>{$this->lang->words['sort_custom']}</a></li>
+		</ul>
+	</div>
+	<div id='forum_filter_menucontent' class='ipbmenu_content ipsPad' style='display: none'>
+		<form id='filter_form' action="{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;changefilters=1" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}" method="post">
+			<strong>{$this->lang->words['filter_type']}</strong><br />
+			<select name="topicfilter" id='topic_filter' class='input_select'>{$footer_filter['topic_filter']}</select>
+			<br /><br />
+		
+			<strong>{$this->lang->words['filter_sort']}</strong><br />
+			<select name="sort_key" id='sort_by' class='input_select'>{$footer_filter['sort_by']}</select>
+			<br /><br />
+		
+			<strong>{$this->lang->words['filter_direction']}</strong><br />
+			<select name="sort_by" id='direction' class='input_select'>{$footer_filter['sort_order']}</select>
+			<br /><br />
+		
+			<strong>{$this->lang->words['filter_time']}</strong><br />
+			<select name="prune_day" id='time_frame' class='input_select'>{$footer_filter['sort_prune']}</select>
+			<br /><br />
+		
+			<input type='checkbox' value='1' name='remember' class='input_check' id='remember_filter' /> <label for='remember_filter'>{$this->lang->words['remember_options']}</label>
+			<br /><br />
+			
+			<input type="submit" value="{$this->lang->words['sort_submit']}" class="input_submit" />
+		</form>
+	</div>
+	<script type='text/javascript'>
+		new ipb.Menu( $('forum_filter'), $('forum_filter_menucontent'), { stopClose: true } );
+	</script>
+	<div class='ipsBox'>
+		<div class='ipsBox_container'>
+			<table class='ipb_table topic_list hover_rows <if test="topicsismod:|:$this->memberData['is_mod'] == 1">is_mod</if>' summary='{$this->lang->words['forum_topic_list']} "{$forum_data['name']}"' id='forum_table'>
+				<tr class='header hide'>
+					<th scope='col' class='col_f_icon'>&nbsp;</th>
+					<th scope='col' class='col_f_topic'>{$this->lang->words['forum_topic']}</th>
+					<th scope='col' class='col_f_starter short'>{$this->lang->words['forum_started_by']}</th>
+					<th scope='col' class='col_f_views stats'>{$this->lang->words['forum_stats']}</th>
+					<th scope='col' class='col_f_post'>{$this->lang->words['forum_last_post_info']}</th>
+					<if test="topicsismod:|:$this->memberData['is_mod'] == 1">
+						<th scope='col' class='col_f_mod short'><input type='checkbox' id='tmod_all' class='input_check' title='{$this->lang->words['topic_select_all']}' value='1' /></th>
+					</if>
+				</tr>	
+				<!-- BEGIN TOPICS -->
+				<if test="hastopics:|:is_array( $topic_data ) AND count( $topic_data )">
+					{parse striping="forumTable" classes="row1,row2"}
+					<foreach loop="topics:$topic_data as $tid => $data">
+						{parse template="topic" group="forum" params="$data, $forum_data, $other_data, $inforum"}
+					</foreach>
+				<else />
+					<tr> 
+						<if test="notopicsspan:|:$this->memberData['is_mod'] == 1">
+							<td colspan='6' class='no_messages'>
+						<else />
+							<td colspan='5' class='no_messages'>
+						</if>
+							{$this->lang->words['no_topics']}
+						</td>
+					</tr>
+				</if>
+			</table>
+			<if test="hastopics:|:$other_data['hasMore']">
+				<div id='more_topics' style='display: none'>
+					<a href='#' id='forum_load_more'>{$this->lang->words['load_more_topics']}</a>
+				</div>
+				<script type='text/javascript'>
+					ipb.forums.fetchMore = {
+						'f': parseInt("{$this->request['showforum']}")	,
+						'st': parseInt("{$this->request['st']}"),
+						'sort_by': "{$this->request['sort_by']}",
+						'sort_key': "{$this->request['sort_key']}",
+						'topicfilter': "{$this->request['topicfilter']}",
+						'prune_day': "{$this->request['prune_day']}",
+						'max_topics': "{$this->settings['display_max_topics']}"
+					};
+				</script>
+			</if>
+		</div>
+	</div>
+	
+	<if test="moderationform:|:$this->memberData['is_mod'] == 1">
+		<div class='ipsBox ipsPad clear clearfix' id='topic_mod'>
+			<div class='row2 ipsBox_container ipsPad moderation_bar with_action clearfix'>
+				<a href='#' id='forum_mod_options' class='ipbmenu input_submit alt ipsPad_half left'>{$this->lang->words['forum_management']}</a>
+				<ul class='ipbmenu_content' id='forum_mod_options_menucontent' style='display: none'>
+					<if test="$this->memberData['g_is_supmod']">
+						<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=prune_start&amp;f={$forum_data['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['mod_prumemovetopics']}'>{$this->lang->words['mod_prumemovetopics']}</a></li>
+					</if>
+					<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=resync&amp;f={$forum_data['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['mod_resync']}'>{$this->lang->words['mod_resync']}</a></li>
+					<li><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=invisible_topics" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['mod_hidden']}'>{$this->lang->words['mod_hidden']}</a></li>
+					<li><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=invisible_posts" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['mod_hidden_posts']}'>{$this->lang->words['mod_hidden_posts']}</a></li>
+				</ul>
+				<form id='modform' class='right' method="post" action="{parse url="" base="public"}">
 					<fieldset>
 						<input type="hidden" name="app" value="forums" />
 						<input type="hidden" name="module" value="moderate" />
@@ -977,28 +865,18 @@
 						<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
 						<input type="hidden" name="modfilter" value="{$this->request['modfilter']}" />
 						<input type="hidden" value="{$this->request['selectedtids']}" id='selectedtids' name="selectedtids" />
-					
-						<input type='button' id='forum_mod_options' value='{$this->lang->words['forum_management']}' class='input_submit alt left ipbmenu' />
-						<ul class='ipbmenu_content' id='forum_mod_options_menucontent'>
-							<if test="$this->memberData['g_is_supmod']">
-								<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=prune_start&amp;f={$forum_data['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['mod_prumemovetopics']}'>{$this->lang->words['mod_prumemovetopics']}</a></li>
-							</if>
-							<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=resync&amp;f={$forum_data['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['mod_resync']}'>{$this->lang->words['mod_resync']}</a></li>
-							<li><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=invisible_topics" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['mod_hidden']}'>{$this->lang->words['mod_hidden']}</a></li>
-							<li><a href='{parse url="showforum={$forum_data['id']}&amp;modfilter=invisible_posts" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}' title='{$this->lang->words['mod_hidden_posts']}'>{$this->lang->words['mod_hidden_posts']}</a></li>
-						</ul>
-					
+				
 						<select name="tact" id='mod_tact'>
-							<option value="close">{$this->lang->words['cpt_close']}</option>
-							<option value="open">{$this->lang->words['cpt_open']}</option>
-							<option value="pin">{$this->lang->words['cpt_pin']}</option>
-							<option value="unpin">{$this->lang->words['cpt_unpin']}</option>
-							<option value="move">{$this->lang->words['cpt_move']}</option>
-							<option value="merge">{$this->lang->words['cpt_merge']}</option>
-							<option value="delete">{$this->lang->words['cpt_delete']}</option>
-							<if test="$this->registry->class_forums->can_Un_SoftDeleteTopics( $forum_data['id'], array() )"><option value="sundelete">{$this->lang->words['cpt_undelete']}</option></if>
-							<option value="approve">{$this->lang->words['cpt_approve']}</option>
-							<option value="unapprove">{$this->lang->words['cpt_unapprove']}</option>
+							<option value="close">{$this->lang->words['cpt_close_f']}</option>
+							<option value="open">{$this->lang->words['cpt_open_f']}</option>
+							<option value="pin">{$this->lang->words['cpt_pin_f']}</option>
+							<option value="unpin">{$this->lang->words['cpt_unpin_f']}</option>
+							<option value="move">{$this->lang->words['cpt_move_f']}</option>
+							<option value="merge">{$this->lang->words['cpt_merge_f']}</option>
+							<option value="delete">{$this->lang->words['cpt_delete_f']}</option>
+							<if test="$this->registry->class_forums->can_Un_SoftDeleteTopics( $forum_data['id'], array() )"><option value="sundelete">{$this->lang->words['cpt_undelete_f']}</option></if>
+							<option value="approve">{$this->lang->words['cpt_approve_f']}</option>
+							<option value="unapprove">{$this->lang->words['cpt_unapprove_f']}</option>
 							<if test="$forum_data['queued_topics'] AND $this->registry->class_forums->canQueuePosts( $forum_data['id'] )">
 							<option value="t_approve">{parse expression="sprintf( $this->lang->words['nmo_t_approve'], $forum_data['queued_topics'])"}</option>
 							</if>
@@ -1023,92 +901,54 @@
 						<input type="submit" name="gobutton" value="{$this->lang->words['f_go']}" class="input_submit alt" id='mod_submit' />
 					</fieldset>
 				</form>
-				<script type='text/javascript'>
-					$('modform').observe('submit', ipb.forums.submitModForm);
-					$('mod_tact').observe('change', ipb.forums.updateTopicModButton);
-				</script>
 			</div>
-		</if>
-		<div id='forum_filter' class='filter_bar rounded'>
-			<span id='show_filters' class='clickable' style='display: none'>{$this->lang->words['filter_options']}</span>
-			<form id='filter_form' action="{parse url="showforum={$forum_data['id']}&amp;st={$this->request['st']}&amp;changefilters=1" base="public" seotitle="{$forum_data['name_seo']}" template="showforum"}" method="post">
-				<fieldset>
-					<label for='topic_filter'>{$this->lang->words['filter_type']}</label> <select name="topicfilter" id='topic_filter' class='input_select'>{$footer_filter['topic_filter']}</select>
-					<label for='sort_by'>{$this->lang->words['filter_sort']}</label> <select name="sort_key" id='sort_by' class='input_select'>{$footer_filter['sort_by']}</select>
-					<label for='direction'>{$this->lang->words['filter_direction']}</label> <select name="sort_by" id='direction' class='input_select'>{$footer_filter['sort_order']}</select>
-					<label for='time_frame'>{$this->lang->words['filter_time']}</label> <select name="prune_day" id='time_frame' class='input_select'>{$footer_filter['sort_prune']}</select>
-					<input type='checkbox' value='1' name='remember' class='input_check' id='remember_filter' /> <label for='remember_filter'>{$this->lang->words['remember_options']}</label>
-					<input type="submit" value="{$this->lang->words['sort_submit']}" class="input_submit alt" />
-				</fieldset>
-			</form>
-			<script type='text/javascript'>
-				if( $('filter_form' ) ){
-					$('filter_form').hide();
-					$('show_filters').show();
-				}
-			</script>
 		</div>
-		<if test="forumjump:|:$forum_data['FORUM_JUMP']">
-			<div class='moderation_bar rounded'>
-				<!--<form method='post' action='{$this->settings['base_url']}app=core&amp;module=search&amp;do=quick_search&amp;search_app=forums' id='context_search' class='left'>
-					<fieldset>
-						<input type='hidden' name='type' value='forum' />
-						<input type='hidden' name='type_id' value='{$forum_data['id']}' />
-						<label for='forum_search'>{$this->lang->words['search_forum']}</label>
-						<input type='text' id='forum_search' name='search_term' class='input_text' size='20' tabindex='8' />
-						<input type='submit' class='input_submit alt' value='{$this->lang->words['jmp_go']}' />
-					</fieldset>
-				</form>-->
-			
-				{$forum_data['FORUM_JUMP']}
-			</div>
-		</if>
-	</div>
+	</if>	
 	
-	
-	
-	<div class='topic_controls'>
+	<br />
+	<div class='topic_controls clear'>
 		{$forum_data['SHOW_PAGES']}
-	
 		<ul class='topic_buttons'>
-			<if test="bottomusercanpost:|:$forum_data['_user_can_post']">
-				<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum_data['id']}" base="publicWithApp"}' title='{$this->lang->words['topic_start']}'><img src='{$this->settings['img_url']}/page_white_add.png' alt='{$this->lang->words['topic_start']}' /> {$this->lang->words['topic_start']}</a></li>
+			<if test="usercanpost:|:$forum_data['_user_can_post']">
+				<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum_data['id']}" base="publicWithApp"}' title='{$this->lang->words['topic_start']}' rel='nofollow' accesskey='s'>{$this->lang->words['topic_start']}</a></li>
 			<else />
 				<li class='disabled'><span>{$this->lang->words['forum_no_start_topic']}</span></li>
 			</if>
+			<if test="moderationlink:|:$this->memberData['is_mod'] == 1">
+				<li class='non_button' style'display: none'>
+					<a href='#topic_mod' id='moderator_toggle' title='{$this->lang->words['show_mod_tools_desc']}'><img src='{$this->settings['img_url']}/moderation_cog.png' />&nbsp; {$this->lang->words['show_mod_tools']}</a>
+				</li>
+			</if>
 		</ul>
 	</div>
-	
-	
-	<div id='forum_footer' class='statistics general_box clear clearfix'>
-		<div id='forum_legend' class='right'>
-			<h2>{$this->lang->words['forum_legend']}</h2>
-			<dl>
-				<dt class='clear'>{parse replacement="t_unread"}</dt>
-				<dd>{$this->lang->words['pm_open_new']}</dd>
-				<dt>{parse replacement="t_read"}</dt>
-				<dd>{$this->lang->words['pm_open_no']}</dd>
-				<dt class='clear'>{parse replacement="t_hot_unread"}</dt>
-				<dd>{$this->lang->words['pm_hot_new']}</dd>
-				<dt>{parse replacement="t_hot_read"}</dt>
-				<dd>{$this->lang->words['pm_hot_no']}</dd>
-				<dt class='clear'>{parse replacement="t_poll_unread"}</dt>
-				<dd>{$this->lang->words['pm_poll']}</dd>
-				<dt>{parse replacement="t_poll_read"}</dt>
-				<dd>{$this->lang->words['pm_poll_no']}</dd>
-				<dt class='clear'>{parse replacement="t_closed"}</dt>
-				<dd>{$this->lang->words['pm_locked']}</dd>
-				<dt>{parse replacement="t_moved"}</dt>
-				<dd>{$this->lang->words['pm_moved']}</dd>
-			</dl>
-		</div>				
+	<if test="moderationjs:|:$this->memberData['is_mod'] == 1">
+		<script type='text/javascript'>
+			$('topic_mod').hide();
+			$('moderator_toggle').up('li').show().observe('click', function(e){
+				Event.stop(e);
+				$('moderator_toggle').up('li').hide();
+				$("topic_mod").show();
+			});
+			$('modform').observe('submit', ipb.forums.submitModForm);
+			$('mod_tact').observe('change', ipb.forums.updateTopicModButton);
+		</script>
+	</if>
+	<br class='clear' />	
+	<div id='forum_footer' class='statistics clear clearfix'>
+		<if test="hasmoderators:|:is_array( $mod_data ) AND count( $mod_data )">
+			<div id='forum_led_by' class='right ipsType_small'>
+				<img src='{$this->settings['img_url']}/icon_users.png' /> &nbsp;{$this->lang->words['forum_led_by']}
+				<foreach loop="moderators:$mod_data as $p => $r">
+					<a href='{$r[0]}' title='{$this->lang->words['view_profile']}'>{$r[1]}</a><if test="moderatorpopup:|:$r[2]"></if><if test="moderatorscomma:|:$p + 1 != count( $mod_data )">,</if>
+				</foreach>
+			</div>
+		</if>
 		<if test="showactiveusers:|:!$this->settings['no_au_forum']">
 			<div id='forum_active_users' class='active_users stats_list'>
-				<h2>
-					{parse expression="sprintf( $this->lang->words['active_users_title'], ($active_user_data['members'] + $active_user_data['guests'] + $active_user_data['anon'] ) )"}<br />
-					<span class='desc'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $active_user_data['members'], $active_user_data['guests'], $active_user_data['anon'] )"}</span>
-				</h2>
-				<ul>
+				<h4 class='statistics_head'>{parse expression="sprintf( $this->lang->words['active_users_titlef'], ($active_user_data['members'] + $active_user_data['guests'] + $active_user_data['anon'] ) )"}</h4>
+				<p class='statistics_brief'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $active_user_data['members'], $active_user_data['guests'], $active_user_data['anon'] )"}</p>
+				<br />
+				<ul class='ipsList_inline'>
 					<if test="hasactiveusers:|:is_array( $active_user_data['names'] ) AND count( $active_user_data['names'] )">
 						<foreach loop="activeusers:$active_user_data['names'] as $p => $r">
 					<li>{$r['p_start']}<if test="aumemberid:|:$r['id']"><a href='{parse url="showuser={$r['id']}" seotitle="{$r['seo']}" template="showuser" base="public"}' title='{$r['p_title']}'></if>{$r['name']}<if test="aumidend:|:$r['id']"></a></if>{$r['p_end']}<if test="auaddcomma:|:$p + 1 != count( $active_user_data['names'] )">,</if></li>
@@ -1116,20 +956,11 @@
 					</if>
 				</ul>
 			</div>
-		</if>
-		<if test="hasmoderators:|:is_array( $mod_data ) AND count( $mod_data )">
-			<div id='forum_led_by' class='active_users stats_list'>
-				<h2>{$this->lang->words['forum_led_by']}</h2>
-				<ul>
-					<foreach loop="moderators:$mod_data as $p => $r">
-						<li><a href='{$r[0]}' title='{$this->lang->words['view_profile']}'>{$r[1]}</a><if test="moderatorpopup:|:$r[2]">{parse template="user_popup" group="global" params="$r[2], IPSText::makeSeoTitle( $r[1] )"}</if><if test="moderatorscomma:|:$p + 1 != count( $mod_data )">,</if></li>
-					</foreach>
-				</ul>
-			</div>
-		</if>
+		</if>	
 	</div>
-	<br class='clear' />
 </if>
+<br class='clear' />
+	
 <div id='delPopUp' style='display:none'>
 	<h3 class='bar'>{$this->lang->words['dlt_title']}</h3>
 	<div class='general_box'>
@@ -1147,7 +978,7 @@
 </div>]]></template_content>
       <template_name>forumIndexTemplate</template_name>
       <template_data>$forum_data, $announce_data, $topic_data, $other_data, $multi_mod_data, $sub_forum_data, $footer_filter, $active_user_data, $mod_data, $inforum=1</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1155,23 +986,26 @@
     </template>
     <template>
       <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<form action="{parse url="showforum={$fid}" base="public"}" method="post">
+      <template_content><![CDATA[<form action="{parse url="showforum={$fid}" base="public"}" method="post" style='width: 60%; margin: 0 auto;'>
 	<input type="hidden" name="L" value="1" />
 	
-	<h2>{$this->lang->words['need_password']}</h2>
-	<p class='message'>{$this->lang->words['need_password_txt']}</p>
+	<h1 class='ipsType_pagetitle'>{$this->lang->words['need_password']}</h1>
+	<div class='ipsType_pagedesc'>{$this->lang->words['need_password_txt']}</div>
 	
-	<div class='generic_bar'></div>
+	<br />
 	
-	<div class='post_form'>
-		<fieldset class='row1'>
-			<h3 class='bar'>{$this->lang->words['enter_pass']}</h3>
-			<ul>
-				<li class='field'>
-					<label for='forum_pass'>{$this->lang->words['enter_pass']}</label>
-					<input type="password" size="20" name="f_password" id='forum_pass' class='input_text' />
+	<div>
+		<fieldset>
+			<br />
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='forum_pass' class='ipsField_title'>{$this->lang->words['enter_pass']}</label>
+					<p class='ipsField_content'>
+						<input type="password" size="40" name="f_password" id='forum_pass' class='input_text' />
+					</p>
 				</li>
 			</ul>
+			<br />
 		</fieldset>
 		<fieldset class='submit'>
 			<input type="submit" value="{$this->lang->words['f_pass_submit']}" class="input_submit" /> {$this->lang->words['or']} <a href='{$this->settings['board_url']}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
@@ -1180,7 +1014,7 @@
 </form>]]></template_content>
       <template_name>forumPasswordLogIn</template_name>
       <template_data><![CDATA[$fid=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1188,17 +1022,192 @@
     </template>
     <template>
       <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<h2>{$rules['title']}</h2>
-<div class='general_box'>
-	<h3>{$this->lang->words['forum_rules']}</h3>
-	<p><br />{$rules['body']}</p>
+      <template_content><![CDATA[{parse js_module="like"}
+<div class='__like right' data-app="{$data['app']}" data-area="{$data['area']}" data-relid="{$relId}" data-isfave="{$data['iLike']}">
+	{parse template="likeSummaryContents" group="forum" params="$data, $relId, $opts"}
+</div>
+<script type="text/javascript">
+	var FAVE_TEMPLATE = new Template( "<h3>{parse expression="sprintf( $this->lang->words['unset_fave_title'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}</h3><div class='ipsPad'><span class='desc'>{parse expression="sprintf( $this->lang->words['unset_fave_words'], $this->lang->words['like_un' . $data['vernacular'] ])"}</span><br /><p class='ipsForm_center'><input type='button' value='{parse expression="sprintf( $this->lang->words['unset_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}' class='input_submit _funset' /></p></div>");
+</script>]]></template_content>
+      <template_name>likeSummary</template_name>
+      <template_data>$data, $relId, $opts</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<span class='ipsButton_extra right <if test="$data['totalCount']">_fmore clickable</if>' title='{parse expression="sprintf( $this->lang->words['like_totalcount_' . $data['vernacular'] ], $data['totalCount'] )"}' data-tooltip="{parse expression="sprintf( $this->lang->words['like_totalcount_' . $data['vernacular'] ], $data['totalCount'] )"}"><img src='{$this->settings['img_url']}/icon_users.png' /> <strong>{$data['totalCount']}</strong></span>
+<if test="likeOnlyMembers:|:$this->memberData['member_id']">
+	<a href='#' title="<if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['fave_tt_on'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['fave_tt_off'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if>" class='ftoggle ipsButton_secondary'><if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['unset_fave_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['set_fave_button'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if></a>
+</if>]]></template_content>
+      <template_name>likeSummaryContents</template_name>
+      <template_data>$data, $relId, $opts=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<h2 class='ipsType_pagetitle'>{$rules['title']}</h2>
+<div class='row2 ipsPad' style='line-height: 1.6'>
+	{$rules['body']}
 </div>
 <fieldset class='submit'>
 	<a href="{parse url="showforum={$rules['fid']}" base="public" seotitle="{$rules['fseo']}" template="showforum"}">{$this->lang->words['back_to_forum']}</a>
 </fieldset>]]></template_content>
       <template_name>show_rules</template_name>
       <template_data><![CDATA[$rules=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_forum</template_group>
+      <template_content><![CDATA[<if test="queuedtopic:|:($this->memberData['is_mod'] AND ! $data['approved']) OR $data['_isDeleted']">
+<tr class='__topic expandable moderated' id='trow_{$data['_tid']}' data-tid="{$data['_tid']}">
+<else />
+<tr class='__topic <if test="!$data['folder_img']['is_read']">unread</if> expandable' id='trow_{$data['_tid']}' data-tid="{$data['_tid']}">
+</if>
+	<td class='col_f_icon altrow short'>
+		{parse template="generateTopicIcon" group="global_other" params="$data['folder_img'], isset($data['_unreadUrl']) ? $data['_unreadUrl'] : ''"}
+	</td>
+	<td class='col_f_content <if test="hasmodlinks:|:$this->memberData['is_mod'] == 1 || $forum_data['permissions']['TopicSoftDelete']"> with_mod_links</if>'>
+		<if test="topicDeletedReason:|:$data['_isDeleted']">
+			<span class='ipsBadge ipsBadge_red' data-tooltip="{parse expression="sprintf( $this->lang->words['tdb__forumindex'], $other_data['sdData'][ $data['tid'] ]['members_display_name'] )"} {parse date="$other_data['sdData'][ $data['tid'] ]['sdl_obj_date']" format="long"}
+					<if test="showReason:|:$forum_data['permissions']['SoftDeleteReason']">
+						<br /><span><if test="$other_data['sdData'][ $data['tid'] ]['sdl_obj_reason']">{$other_data['sdData'][ $data['tid'] ]['sdl_obj_reason']}<else />{$this->lang->words['tdb__noreasongi']}</if></span>
+					</if>
+				">{$this->lang->words['f_deleted_badge']}</span>
+		</if>
+		<if test="topicUnapproved:|:$data['approved'] == 0">
+			<span class='ipsBadge ipsBadge_orange'>{$this->lang->words['f_queued_badge']}</span>
+		</if>
+		<if test="hasPrefix:|:!empty($data['tags']['formatted']['prefix'])">
+			{$data['tags']['formatted']['prefix']}
+		</if>
+		<h4>{$data['prefix']}<a id="tid-link-{$data['_tid']}" href="{$data['_url']}" title='{$this->lang->words['topic_started_on']} {parse date="$data['start_date']" format="LONG"}' class='topic_title'>{$data['title']}</a></h4>
+		<br />
+		<span class='desc lighter blend_links'>
+			{parse expression="sprintf( $this->lang->words['topic_started_by'], $data['starter'] )"} {parse date="$data['start_date']" format="DATE"}
+			<if test="hasTags:|:isset($data['tags']) AND $data['tags']">
+				&nbsp; <img src='{$this->settings['img_url']}/icon_tag.png' /> {$data['tags']['formatted']['truncatedWithLinks']}
+			</if>
+		</span>
+		<if test="multipages:|:isset( $data['pages'] ) AND is_array( $data['pages'] ) AND count( $data['pages'] )">
+			<ul class='mini_pagination'>
+			<foreach loop="pages:$data['pages'] as $page">
+					<if test="haslastpage:|:$page['last']">
+						<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
+					<else />
+						<li><a href="{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}" title='{$this->lang->words['topic_goto_page']} {$page['page']}'>{$page['page']}</a></li>
+					</if>
+			</foreach>
+			</ul>
+		</if>
+	</td>
+	<td class='col_f_preview __topic_preview'>
+		<if test="$this->registry->permissions->check( 'read', $forum_data )">
+			<a href='{$data['_url']}' class='expander closed' title='{$this->lang->words['view_topic_preview']}'>&nbsp;</a>
+		</if>
+	</td>
+	<td class='col_f_views desc blend_links'>
+		<ul>
+			<li>
+				<if test="queuedpostsImg:|:($this->memberData['is_mod'] AND $data['_hasqueued'])">
+					<a href='{parse url="showtopic={$data['tid']}&amp;modfilter=invisible_posts" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_uapproved_posts']}' data-tooltip="{parse expression="sprintf( $this->lang->words['topic_queued_count'], $data['topic_queuedposts'] )"}"><img src='{$this->settings['img_url']}/bullet_error.png' alt='' /></a>
+				</if>
+				<if test="deletedPostsImg:|:($forum_data['permissions']['PostSoftDeleteSee'] AND $data['topic_deleted_posts'])">
+					<a href='{parse url="showtopic={$data['tid']}&amp;modfilter=deleted_posts" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['view_deleted_posts']}'><img src='{$this->settings['img_url']}/bullet_delete.png' alt='' /></a>
+				</if>
+				<if test="isLink:|:$data['state'] != 'link'">
+					<if test="isHot:|:$data['folder_img']['is_hot']">
+						<span class='ipsBadge ipsBadge_orange'>{$this->lang->words['topic_is_hot']}</span>&nbsp;
+					</if>
+					<a href="{parse url="app=forums&amp;module=extras&amp;section=stats&amp;do=who&amp;t={$data['tid']}" base="public"}" onclick="return ipb.forums.retrieveWhoPosted( {$data['tid']} );">{parse format_number="$data['posts']"} <if test="replylang:|:intval($data['posts']) == 1">{$this->lang->words['reply']}<else />{$this->lang->words['replies']}</if></a>
+				</if>
+			</li>
+			<li class='views desc'>{parse format_number="$data['views']"} {$this->lang->words['views']}</li>
+		</ul>
+	</td>
+	<td class='col_f_post'>
+		<a href='{parse url="showuser={$data['last_poster_id']}" seotitle="{$data['seo_last_name']}" template="showuser" base="public"}' class='ipsUserPhotoLink left'>
+			<img src='{$data['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+		</a>
+		<ul class='last_post ipsType_small'>
+			<li>{$data['last_poster']}</li>
+			<li>
+				<a href='{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$data['last_post']" format="DATE"}</a>
+			</li>								
+		</ul>
+	</td>
+	<if test="mmicon:|:$this->memberData['is_mod'] == 1 and $inforum == 1">
+		<td class='col_f_mod short'>
+			<a href='#' class='ipsModMenu' id='topic_mod_{$data['real_tid']}' title='{$this->lang->words['mod_actions']}'>&nbsp;</a>
+			<if test="mmtidon:|:$data['tidon'] == 0">
+				<input type='checkbox' class='input_check topic_mod' id='tmod_{$data['real_tid']}' />
+			<else />
+				<input type='checkbox' class='input_check topic_mod' id='tmod_{$data['real_tid']}' checked='checked' />
+			</if>
+			<if test="topicIsDeleted:|:$data['_isDeleted']">
+				<ul id='topic_mod_{$data['real_tid']}_menucontent' class='ipbmenu_content' style='display: none'>
+					<if test="tidRestore:|:$forum_data['permissions']['TopicSoftDeleteRestore']">
+						<li class='t_restore'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=sundelete" base="public"}' title='{$this->lang->words['dlt_restore_topic']}'><img src='{$this->settings['img_url']}/arrow_rotate_clockwise.png' alt='{$this->lang->words['dlt_restore_topic']}' title='{$this->lang->words['dlt_restore_topic']}' class='icon' /> {$this->lang->words['dlt_restore_topic']}</a></li>
+					</if>
+					<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['delete_topic']">
+						<li class='t_restore'><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;t={$data['real_tid']}&amp;auth_key={$this->member->form_hash}&amp;do=03" base="public"}' title='{$this->lang->words['dlt_delete_topic']}'><img src='{$this->settings['img_url']}/delete.png' alt='{$this->lang->words['dlt_delete_topic']}' title='{$this->lang->words['dlt_delete_topic']}' class='icon' /> {$this->lang->words['dlt_delete_topic']}</a></li>
+					</if>
+				</ul>
+			<else />
+				<if test="topicmoderator:|:$this->memberData['is_mod'] == 1  || $forum_data['permissions']['TopicSoftDelete']">
+					<ul id='topic_mod_{$data['real_tid']}_menucontent' class='ipbmenu_content' style='display: none'>
+						<li><a class='t_rename' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;auth_key={$this->member->form_hash}&amp;do=05" base="public"}' title='{$this->lang->words['topic_rename']}'><img src='{$this->settings['img_url']}/textfield_rename.png' alt='{$this->lang->words['topic_rename']}' title='{$this->lang->words['topic_rename']}' class='icon' /> {$this->lang->words['topic_rename']}</a></li>
+						<if test="$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['delete_topic'] || $forum_data['permissions']['TopicSoftDelete']">
+							<li><a class='t_delete' id='t_deletelink_{$data['tid']}' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;t={$data['real_tid']}&amp;auth_key={$this->member->form_hash}&amp;do=03" base="public"}' title='{$this->lang->words['topic_delete']}'><img src='{$this->settings['img_url']}/delete.png' alt='{$this->lang->words['topic_delete']}' title='{$this->lang->words['topic_delete']}' class='icon' /> {$this->lang->words['topic_delete']}</a></li>
+						</if>
+						<if test="islink:|:$data['state'] != 'link'">
+							<if test="ispinned:|:$data['pinned'] && ($this->memberData['g_is_supmod'] OR $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['pin_topic'])">
+								<li><a class='t_pin' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=16&amp;from=forum" base="public"}' title='{$this->lang->words['topic_unpin']}'><img src='{$this->settings['img_url']}/award_delete.png' alt='{$this->lang->words['topic_unpin']} icon' title='{$this->lang->words['topic_unpin']}' class='icon' /> {$this->lang->words['topic_unpin']}</a></li>
+							<else />
+								<if test="issupermod:|:$this->memberData['g_is_supmod'] OR $this->memberData['forumsModeratorData'][ $forum_data['id'] ]['unpin_topic']">
+									<li><a class='t_pin' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=15&amp;from=forum" base="public"}' title='{$this->lang->words['topic_pin']}'><img src='{$this->settings['img_url']}/award.png' alt='{$this->lang->words['topic_pin']} icon' title='{$this->lang->words['topic_pin']}' class='icon' /> {$this->lang->words['topic_pin']}</a></li>
+								</if>
+							</if>
+						</if>
+						<if test="closedtopic:|:$data['state'] == 'closed' && $other_data['can_open_topics']">
+							<li><a class='t_lock' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=01" base="public"}' title='{$this->lang->words['topic_open']}'><img src='{$this->settings['img_url']}/lock_open.png' alt='{$this->lang->words['topic_open']}' title='{$this->lang->words['topic_open']}' class='icon' /> {$this->lang->words['topic_open']}</a></li>
+						</if>
+						<if test="opentopic:|:$data['state'] == 'open' && $other_data['can_close_topics']">
+							<li><a class='t_lock' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;t={$data['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=00&amp;_from=forum" base="public"}' title='{$this->lang->words['topic_close']}'><img src='{$this->settings['img_url']}/lock.png' alt='{$this->lang->words['topic_close']}' title='{$this->lang->words['topic_close']}' class='icon' /> {$this->lang->words['topic_close']}</a></li>
+						</if>
+						<if test="islink2:|:$data['state'] != 'link' && $other_data['can_move_topics']">
+							<li><a class='t_move' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum_data['id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=topicchoice&amp;tact=move&amp;selectedtids={$data['tid']}" base="public"}'><img src='{$this->settings['img_url']}/page_white_go.png' alt='{$this->lang->words['topic_close']}' title='{$this->lang->words['topic_close']}' class='icon' /> {$this->lang->words['topic_move']}</a></li>
+						</if>
+					</ul>
+				</if>
+			</if>
+			<script type='text/javascript'>
+				new ipb.Menu( $('topic_mod_{$data['real_tid']}'), $('topic_mod_{$data['real_tid']}_menucontent') );
+			</script>
+		</td>
+	</if>
+</tr>
+<if test="adCodeCheck:|:isset($data['_adCode']) AND $data['_adCode']">
+<tr>
+	<th scope='col' colspan='<if test="adCodeColSpan:|:$this->memberData['is_mod'] == 1">6<else />5</if>'>
+		{$data['_adCode']}
+	</th>
+</tr>
+</if>]]></template_content>
+      <template_name>topic</template_name>
+      <template_data>$data, $forum_data, $other_data, $inforum</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1217,7 +1226,7 @@
 </span>]]></template_content>
       <template_name>topic_rating_image</template_name>
       <template_data>$rating_id=1</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1226,23 +1235,11 @@
     <template>
       <template_group>skin_forum</template_group>
       <template_content><![CDATA[<if test="prefix:|:$text">
-	<span class='topic_prefix'>{$text}</span>&nbsp;&nbsp;
+	<span class='ipsBadge ipsBadge_green'>{$text}</span>&nbsp;
 </if>]]></template_content>
       <template_name>topicPrefixWrap</template_name>
       <template_data>$text</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<!-- SKINNOTE: This is the link for the "who posted" ajax popup   -->
-<a href="{parse url="app=forums&amp;module=extras&amp;section=stats&amp;do=who&amp;t={$tid}" base="public"}" onclick="return ipb.forums.retrieveWhoPosted( {$tid} );">$posts</a>]]></template_content>
-      <template_name>who_link</template_name>
-      <template_data><![CDATA[$tid="",$posts=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1261,7 +1258,7 @@
 		<th style='width: 50%'>{$this->lang->words['bbc_after']}</th>
 	</tr>
 	<foreach loop="bbcode:$rows as $row">
-		<tr class='subhead altbar'>
+		<tr class='subhead bar altbar'>
 			<th colspan='2'>{$row['title']}</th>
 		</tr>
 		<tr class='row1'>
@@ -1282,7 +1279,7 @@
 </script>]]></template_content>
       <template_name>bbcodePopUpList</template_name>
       <template_data>$rows</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1290,24 +1287,49 @@
     </template>
     <template>
       <template_group>skin_legends</template_group>
-      <template_content><![CDATA[{parse striping="emoticons" classes="row1,row2"}
+      <template_content><![CDATA[<if test="!$legacy_editor">
+	<script type="text/javascript">
+	addEmoImage = function(elem){
+		var isRte = opener.ipb.textEditor.getEditor().isRte();
+		var toAdd = '';
+	
+		if ( isRte ){
+			toAdd = elem.up('tr').down('img').readAttribute('src');
+			toAdd = '<img src="' + toAdd + '" />&nbsp;';
+		} else {
+			toAdd = elem.up('tr').down('a').innerHTML + ' ';
+		}
+	
+		opener.ipb.textEditor.getEditor().insert( toAdd );
+	}
+	</script>
+<else />
+	<script type='text/javascript'>
+		function addEmoImage(elem){
+			var code = elem.up('tr').down('a').innerHTML;
+			var title = elem.up('tr').down('img').readAttribute('title');
+			ipb.editors[ '{$editor_id}' ].insert_emoticon('', title, code,'');
+		}
+	</script>
+</if>
+{parse striping="emoticons" classes="row1,row2"}
 <div class='full_emoticon'>
-		<table class='ipb_table'>
-			<foreach loop="emoticons:$rows as $row">
-			<tr class='{parse striping="emoticons"}'>
-				<td style='text-align: center; width: 40%;'>
-					<a href="#" onclick={$row['out']}ipb.editors[ {$row['in']}{$editor_id}{$row['in']} ].insert_emoticon({$row['in']}{$row['in']},"{$row['image']}",{$row['in']}{$row['code']}{$row['in']},{$row['in']}{$row['in']}); return false;{$row['out']} title="{$row['image']}">{$row['code']}</a>
-				</td>
-				<td style='text-align: center; width: 60%;'>
-					<a href="#" onclick={$row['out']}ipb.editors[ {$row['in']}{$editor_id}{$row['in']} ].insert_emoticon({$row['in']}{$row['in']},"{$row['image']}",{$row['in']}{$row['code']}{$row['in']},{$row['in']}{$row['in']}); return false;{$row['out']} title="{$row['image']}"><img src="{$this->settings['emoticons_url']}/{$row['image']}" id='smid_{$row['smilie_id']}' alt="{$row['image']}" /></a>
-				</td>
-			</tr>
-			</foreach>
-		</table>
+	<table class='ipb_table'>
+		<foreach loop="emoticons:$rows as $row">
+		<tr class='{parse striping="emoticons"}'>
+			<td style='text-align: center; width: 40%;'>
+				<a href="#" onclick="addEmoImage(this); return false;" title="{$row['image']}">{$row['code']}</a>
+			</td>
+			<td style='text-align: center; width: 60%;'>
+				<img class='clickable' src="{$this->settings['emoticons_url']}/{$row['image']}" onclick="addEmoImage(this); return false;" id='smid_{$row['smilie_id']}' alt="{$row['image']}" />
+			</td>
+		</tr>
+		</foreach>
+	</table>
 </div>]]></template_content>
       <template_name>emoticonPopUpList</template_name>
-      <template_data>$editor_id, $rows</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_data>$editor_id, $rows, $legacy_editor=false</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1318,7 +1340,7 @@
       <template_content><![CDATA[<div><b>{$tag}</b></div>]]></template_content>
       <template_name>wrap_tag</template_name>
       <template_data><![CDATA[$tag=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1334,6 +1356,7 @@
 <input type='hidden' name='t' value='{$topic['tid']}' />
 <input type='hidden' name='f' value='{$forum['id']}' />
 <input type='hidden' name='st' value='{$this->request['st']}' />
+<input type='hidden' name='return' value='{$this->request['return']}' />
 <h2 class='maintitle'>{$this->lang->words['top_delete']}: {$forum['name']} -&gt; {$topic['title']}</h2>
 <div class='generic_bar'></div>
 <div class='post_form'>
@@ -1345,7 +1368,7 @@
 </form>]]></template_content>
       <template_name>deleteTopicForm</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1367,21 +1390,19 @@
 		<ul>
 			<li class='field'>
 				<label for='topic_title'>{$this->lang->words['edit_f_title']}</label>
-				<input type="text" size="40" id='topic_title' maxlength="{$this->settings['topic_title_max_len']}" name="TopicTitle" value="{$topic['title']}" />
-			</li>
-			<li class='field'>
-				<label for='topic_desc'>{$this->lang->words['edit_f_desc']}</label>
-				<input type="text" size="40" id='topic_desc' maxlength="70" name="TopicDesc" value="{$topic['description']}" />
+				<input class='input_text' type="text" size="40" id='topic_title' maxlength="{$this->settings['topic_title_max_len']}" name="TopicTitle" value="{$topic['title']}" />
 			</li>
 		</ul>
 	</fieldset>
 	<fieldset class='submit'>
 		<input type="submit" class='input_submit' value="{$this->lang->words['submit_edit']}" /> {$this->lang->words['or']} <a href='{parse url="showtopic={$topic['tid']}" base="public" seotitle="{$topic['title_seo']}" template="showtopic"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
 	</fieldset>
-</form>]]></template_content>
+</div>
+</form>
+<br />]]></template_content>
       <template_name>editTopicTitle</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1389,62 +1410,37 @@
     </template>
     <template>
       <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<form action='{parse url="app=forums&amp;module=moderate&amp;section=moderate" base="public"}' method='post'>
-<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
-<input type='hidden' name='do' value='doeditmember' />
-<input type='hidden' name='mid' value='{$profile['member_id']}' />
-<h2 class='maintitle'>{$this->lang->words['cp_em_title']}: {$profile['members_display_name']}</h2>
-<div class='generic_bar'></div>
-<div class='post_form'>
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['edit_user_images']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='avatar'>{$this->lang->words['cp_remove_av']}</label>
-				<select name="avatar" id='avatar' class='input_select'>
-					<option value="0">{$this->lang->words['no']}</option>
-					<option value="1">{$this->lang->words['yes']}</option>
-				</select>
-			</li>
-			<li class='field'>
-				<label for='photo'>{$this->lang->words['cp_remove_photo']}</label>
-				<select name="photo" id='photo' class='input_select'>
-					<option value="0">{$this->lang->words['no']}</option>
-					<option value="1">{$this->lang->words['yes']}</option>
-				</select>
-			</li>
-		</ul>
-		<if test="editusercfields:|:count($custom_fields->out_fields)">
-			<h3 class='bar'>{$this->lang->words['edit_user_profile']}</h3>
-			<ul>
-				<li class='field'>
-					<label for='title'>{$this->lang->words['edit_user_title']}</label>
-					<input type='text' class="input_text" name='title' value='{$profile['title']}' />
-				</li>
-				<foreach loop="custom_fields:$custom_fields->out_fields as $id => $data">
-					<li class='field'>
-						<label for='field_{$id}'>{$custom_fields->field_names[ $id ]}</label>
-						{$data}<br />
-						<if test="editusercfielddesc:|:$custom_fields->field_desc[ $id ]">
-							<span class='desc'>{$custom_fields->field_desc[ $id ]}</span>
-						</if>
-					</li>
-				</foreach>
-			</ul>
-		</if>
-		<h3 class='bar'>{$this->lang->words['cp_edit_signature']}</h3>
-		{$profile['signature']}
-		<h3 class='bar'>{$this->lang->words['cp_edit_aboutme']}</h3>
-		{$profile['aboutme']}
-	</fieldset>
-	<fieldset class='submit'>
-		<input type="submit" class='input_submit' value="{$this->lang->words['cp_em_submit']}" /> {$this->lang->words['or']} <a href='{parse url="showuser={$profile['member_id']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</fieldset>
+      <template_content><![CDATA[<h1 class='ipsType_pagetitle'>{$this->lang->words['poll_merge_title']}</h1>
+<br />
+<div class='message'>
+	{$this->lang->words['poll_merge_blurb']}
 </div>
-</form>]]></template_content>
-      <template_name>editUserForm</template_name>
-      <template_data>$profile, $custom_fields=null</template_data>
-      <template_updated>1288018124</template_updated>
+<br />
+<foreach loop="$polls as $poll">
+	<div class='general_box alt poll'>
+		<h3>{$poll['poll_question']}</h3>
+		<foreach loop="unserialize( stripslashes( $poll['choices'] ) ) as $questionID => $questionData">
+			<div class='poll_question'>
+				<h4 class='rounded'>{$questionData['question']}</h4>
+				<ol>
+					<foreach loop="$questionData['choice'] as $choiceID => $name">
+						<li>
+							<span class='answer'>{$name}</span>
+							<span class='votes'>({$questionData['votes'][$choiceID]} {$this->lang->words['poll_votes']})</span>
+						</li>	
+					</foreach>
+				</ol>
+			</div>
+		</foreach>
+		<fieldset class='submit'>
+			<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=topicchoice&amp;tact=merge&amp;selectedtids={$tids}&amp;f={$this->request['f']}&amp;chosenpolltid={$poll['tid']}&amp;auth_key={$this->member->form_hash}" base="public"}' class='ipsButton'>{$this->lang->words['poll_merge_submit']}</a>
+		</fieldset>
+	</div>
+	<br /><br />
+</foreach>]]></template_content>
+      <template_name>mergeMultiplePolls</template_name>
+      <template_data>$polls, $tids</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1470,6 +1466,7 @@
 <input type='hidden' name='checked' value='1' />
 <input type='hidden' name='st' value='{$this->request['st']}' />
 <p class='message'>{$this->lang->words['merge_select']}</p>
+<br />
 <h2 class='maintitle'>{$this->lang->words['cm_title']}</h2>
 <div class='generic_bar'></div>
 <div class='post_form'>
@@ -1500,7 +1497,6 @@
 		<h3 class='bar'>{$this->lang->words['post_content']}</h3>
 		{$editor}
 	</fieldset>
-	<!--SKINNOTE: This wasn't skinned - did my best to match it to the rest of the IPB style, but might want to touch it up-->
 	<if test="mergepostsattachments:|:count($uploads)">
 		<fieldset>
 			<h3 class='bar'>{$this->lang->words['cm_attach']}</h3>
@@ -1532,7 +1528,7 @@
 </form>]]></template_content>
       <template_name>mergePostForm</template_name>
       <template_data>$editor, $dates, $authors, $uploads, $seoTitle</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1556,10 +1552,6 @@
 				<label for='new_title'>{$this->lang->words['mt_new_title']}</label>
 				<input type="text" id='new_title' class='input_text' size="40" maxlength="250" name="title" value="{$topic['title']}" />
 			</li>
-			<li class='field'>
-				<label for='new_desc'>{$this->lang->words['mt_new_desc']}</label>
-				<input type="text" id='new_desc' class='input_text' size="40" maxlength="250" name="desc" value="{$topic['description']}" />
-			</li>
 			<li class='field'>
 				<label for='topic_url'>{$this->lang->words['mt_tid']}</label>
 				<input type="text" id='topic_url' class='input_text' size="40" name="topic_url" value="" />
@@ -1574,7 +1566,7 @@
 </form>]]></template_content>
       <template_name>mergeTopicsForm</template_name>
       <template_data>$forum, $topic</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1633,7 +1625,7 @@
 </form>]]></template_content>
       <template_name>movePostForm</template_name>
       <template_data><![CDATA[$forum, $topic, $posts, $error='']]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1660,9 +1652,9 @@
 				<label for='move_from'>{$this->lang->words['move_from']} <strong>{$forum['name']}</strong> {$this->lang->words['to']}</label>
 				<select name="move_id" id='move_from' class='input_select'>{$forum_jump}</select>
 			</li>
-			<li class='field'>
-				<label for='leave_link'>{$this->lang->words['leave_link']}</label>
+			<li class='field clear checkbox'>
 				<input type='checkbox' id='leave_link' class='input_check' name='leave' value='y' />
+				<label for='leave_link'>{$this->lang->words['leave_link']}</label>
 			</li>
 		</ul>
 	</fieldset>
@@ -1673,7 +1665,7 @@
 </form>]]></template_content>
       <template_name>moveTopicForm</template_name>
       <template_data>$forum, $topic, $forum_jump</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1687,9 +1679,11 @@
 <input type='hidden' name='tact' value='domove' />
 <input type='hidden' name='f' value='{$forum['id']}' />
 <input type='hidden' name='st' value='{$this->request['st']}' />
+<input type='hidden' name='fromSearch' value='{$this->request['fromSearch']}' />
+<input type='hidden' name='returnUrl' value='{$this->request['returnUrl']}' />
 <p class='message'>{$this->lang->words['move_exp']}</p>
 <br />
-<h2 class='maintitle'>{$this->lang->words['cp_tmove_start']} {$forum['name']}</h2>
+<h2 class='maintitle'>{$this->lang->words['cp_tmove_start']}</h2>
 <div class='generic_bar'></div>
 <div class='post_form' id='mod_form'>
 	<fieldset class='row1'>
@@ -1712,9 +1706,9 @@
 				<label for='move_from'>{$this->lang->words['move_from']} <strong>{$forum['name']}</strong> {$this->lang->words['to']}</label>
 				<select name="df" id='move_from' class='input_select'>{$jump_html}</select>
 			</li>
-			<li class='field'>
-				<label for='leave_link'>{$this->lang->words['leave_link']}</label>
+			<li class='field clear checkbox'>
 				<input type='checkbox' id='leave_link' class='input_check' name='leave' value='y' />
+				<label for='leave_link'>{$this->lang->words['leave_link']}</label>
 			</li>
 		</ul>
 	</fieldset>
@@ -1725,7 +1719,7 @@
 </form>]]></template_content>
       <template_name>moveTopicsForm</template_name>
       <template_data>$forum, $jump_html, $topics</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1734,7 +1728,7 @@
     <template>
       <template_group>skin_mod</template_group>
       <template_content><![CDATA[<if test="prunecompletehtml:|:$complete_html != ''">
-	{$complete_html}<br />
+	<div class='message'>{$complete_html}</div><br />
 </if>
 	
 <h2 class='maintitle'>{$this->lang->words['cp_prune']} {$forum['name']}</h2>
@@ -1742,7 +1736,7 @@
 <div class='post_form'>
 	<if test="confirmprune:|:$confirm_data['show'] == 1">
 		<fieldset>
-			<h3 class='bar'>{$this->lang->words['mpt_confirm']} : {$this->lang->words['cp_check_result']}</h3>
+			<h3 class='bar'>{$this->lang->words['mpt_confirm']}: {$this->lang->words['cp_check_result']}</h3>
 			
 			<ul>
 				<li class='field'>
@@ -1774,7 +1768,7 @@
 	<input type="hidden" name="check" value="1" />
 	<fieldset>
 		<h3 class='bar'>{$this->lang->words['mpt_help']}</h3>
-		<p>{$this->lang->words['cp_prune_text']}</p>
+		<p class='ipsPad'>{$this->lang->words['cp_prune_text']}</p><br />
 		<ul>
 			<li class='field'>
 				<label for='df'>{$this->lang->words['cp_prune_action2']}</label>
@@ -1823,7 +1817,7 @@
 </div>]]></template_content>
       <template_name>pruneSplash</template_name>
       <template_data><![CDATA[$forum="", $forums_html="", $confirm_data="", $complete_html=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1831,13 +1825,10 @@
     </template>
     <template>
       <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<h2>{$title}</h2>
-<div class='general_box'>
-	{$msg}
-</div>]]></template_content>
+      <template_content><![CDATA[<strong>{$title}</strong><br /> {$msg}]]></template_content>
       <template_name>simplePage</template_name>
       <template_data><![CDATA[$title="", $msg=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1851,6 +1842,7 @@
 <input type='hidden' name='do' value='topicchoice' />
 <input type='hidden' name='fromSearch' value='{$this->request['fromSearch']}' />
 <input type='hidden' name='returnUrl' value='{$this->request['returnUrl']}' />
+<input type='hidden' name='return' value='{$this->request['return']}' />
 <foreach loop="$tids as $t">
 	<input type='hidden' name="selectedtids[$t]" value="$t" />
 </foreach>
@@ -1858,22 +1850,47 @@
 <input type='hidden' name='f' value='{$forum['id']}' />
 <input type='hidden' name='st' value='{$this->request['st']}' />
 <h2 class='maintitle'>{parse expression="sprintf($this->lang->words['mm_delete_top'], count( $tids ) )"}</h2>
-<div class='general_box'>
-	<strong>{$this->lang->words['dlt_remove_from_view']}</strong>
-	<p class='desc'>{$this->lang->words['dlt_remove_from_view_desc']}</p>
-	<p style='padding:4px 0px 4px 0px'>{$this->lang->words['dlt_reason']} <input type='text' name='deleteReason' id='delPop_reason' value='' style='width:85%' /> <input type='submit' class='input_submit' value='{$this->lang->words['dlt_remove']}' /></p>
+<div class='ipsBox clearfix'>
 	<if test="$canHardDelete">
-	<div style='padding-top:5px'>
-		<strong>{$this->lang->words['dlt_delete_from_topic']}</strong>
-		<p class='desc'>{$this->lang->words['dlt_delete_from_topic_desc']}</p>
-		<p style='padding:4px 0px 4px 0px'><input type='button' class='input_submit' onclick="$('mmTact').value='deletedo'; $('mmForm').submit();" value='{$this->lang->words['dlt_delete_now']}' /></p>
-	</div>
+		<div class='ipsBox_container left' style='width: 44%; height: 130px'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlt_remove_from_view']}</h3>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dltt_remove_from_view_desc']}<br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlt_remove_from_view_extra']}</span><br /><br />
+				<input type='text' class='input_text' name='deleteReason' id='delPop_reason' value='' style='width: 60%'  /> <input type='submit' class='input_submit' value='{$this->lang->words['dlt_remove']}' />
+			</div>
+		</div>
+		<script type='text/javascript'>
+			$('delPop_reason').defaultize("{$this->lang->words['enter_sdelete_reason']}");
+		</script>
+		<div class='left' style='width: 10%; margin: 0 0.5%'>
+			<div class='ipsPad ipsForm_center'>
+				<br /><br /><br />
+				<span style='font-size: 32px'>{$this->lang->words['mod_or']}</span>
+			</div>
+		</div>	
+		<div class='ipsBox_container right' style='width: 44%; height: 130px'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlt_delete_from_topic']}</h3>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dltt_delete_from_topic_desc']}<br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlt_delete_from_topic_extra']}</span><br /><br />
+				<input type='button' class='input_submit' onclick="$('mmTact').value='deletedo'; $('mmForm').submit();" value='{$this->lang->words['dlt_delete_now']}' />
+			</div>
+		</div>
+	<else />
+		<div class='ipsBox_container'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlt_remove_from_view']}</h3>
+			<div class='ipsPad'>
+				{$this->lang->words['dlt_remove_from_view_desc']}<br /><br />
+				<input type='text' class='input_text' name='deleteReason' id='delPop_reason' value='' style='width: 60%'  /> <input type='submit' class='input_submit' value='{$this->lang->words['dlt_remove']}' />
+			</div>
+		</div>
 	</if>
 </div>
 </form>]]></template_content>
       <template_name>softDeleteSplash</template_name>
       <template_data>$forum, $tids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1887,6 +1904,7 @@
 <input type='hidden' name='do' value='postchoice' />
 <input type='hidden' name='fromSearch' value='{$this->request['fromSearch']}' />
 <input type='hidden' name='returnUrl' value='{$this->request['returnUrl']}' />
+<input type='hidden' name='return' value='{$this->request['return']}' />
 <foreach loop="$pids as $p">
 	<input type='hidden' name="selectedpids[$p]" value="$p" />
 </foreach>
@@ -1895,22 +1913,48 @@
 <input type='hidden' name='t' value='{$topic['tid']}' />
 <input type='hidden' name='st' value='{$this->request['st']}' />
 <h2 class='maintitle'>{parse expression="sprintf($this->lang->words['mm_delete_top_posts'], count( $pids ) )"}</h2>
-<div class='general_box'>
-	<strong>{$this->lang->words['dlp_remove_from_view']}</strong>
-	<p class='desc'>{$this->lang->words['dlp_remove_from_view_desc']}</p>
-	<p style='padding:4px 0px 4px 0px'>{$this->lang->words['dlp_reason']} <input type='text' name='deleteReason' id='delPop_reason' value='' style='width:85%' /> <input type='submit' class='input_submit' value='{$this->lang->words['dlp_remove']}' /></p>
+<div class='ipsBox clearfix'>
 	<if test="$canHardDelete">
-	<div style='padding-top:5px'>
-		<strong>{$this->lang->words['dlp_delete_from_topic']}</strong>
-		<p class='desc'>{$this->lang->words['dlp_delete_from_topic_desc']}</p>
-		<p style='padding:4px 0px 4px 0px'><input type='button' class='input_submit' onclick="$('mmTact').value='deletedo'; $('mmForm').submit();" value='{$this->lang->words['dlp_delete_now']}' /></p>
-	</div>
+		<div class='ipsBox_container left' style='width: 44%; height: 130px'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlp_remove_from_view']}</h3>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dlp_remove_from_view_desc']}<br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlp_remove_from_view_extra']}</span><br /><br />
+				<input type='text' class='input_text' name='deleteReason' id='delPop_reason' value='' style='width: 60%'  /> <input type='submit' class='input_submit' value='{$this->lang->words['dlp_remove']}' />
+			</div>
+		</div>
+		<script type='text/javascript'>
+			$('delPop_reason').defaultize("{$this->lang->words['enter_sdelete_reason']}");
+		</script>
+		<div class='left' style='width: 10%; margin: 0 0.5%'>
+			<div class='ipsPad ipsForm_center'>
+				<br /><br /><br />
+				<span style='font-size: 32px'>{$this->lang->words['mod_or']}</span>
+			</div>
+		</div>
+		<div class='ipsBox_container right' style='width: 44%; height: 130px'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlp_delete_from_topic']}</h3>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dlp_delete_from_topic_desc']}<br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlp_delete_from_topic_extra']}</span><br /><br />
+				<input type='button' class='input_submit' onclick="$('mmTact').value='deletedo'; $('mmForm').submit();" value='{$this->lang->words['dlp_delete_now']}' />
+			</div>
+		</div>
+	<else />
+		<div class='ipsBox_container'>
+			<h3 class='row2 ipsPad'>{$this->lang->words['dlp_remove_from_view']}</h3>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dlp_remove_from_view_desc']}<br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlp_remove_from_view_extra']}</span><br /><br />
+				<input type='text' class='input_text' name='deleteReason' id='delPop_reason' value='' style='width: 60%'  /> <input type='submit' class='input_submit' value='{$this->lang->words['dlp_remove']}' />
+			</div>
+		</div>
 	</if>
 </div>
 </form>]]></template_content>
       <template_name>softDeleteSplashPosts</template_name>
       <template_data>$forum, $topic, $pids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1939,10 +1983,6 @@
 				<label for='new_title'>{$this->lang->words['mt_new_title']}</label>
 				<input type="text" size="40" class='input_text' id='new_title' maxlength="100" name="title" value="" />
 			</li>
-			<li class='field'>
-				<label for='new_desc'>{$this->lang->words['mt_new_desc']}</label>
-				<input type="text" size="40" class='input_text' id='new_desc' maxlength="100" name="desc" value="" />
-			</li>
 			<li class='field'>
 				<label for='new_forum'>{$this->lang->words['st_forum']}</label>
 				<select name="fid" id='new_forum' class='input_select'>{$jump}</select>
@@ -1975,7 +2015,7 @@
 </form>]]></template_content>
       <template_name>splitPostForm</template_name>
       <template_data>$forum, $topic, $posts, $jump</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1993,10 +2033,6 @@
 		<td class='altrow'>{$this->lang->words['th_topic']}</td>
 		<td>{$topic['title']}</td>
 	</tr>
-	<tr class='row2'>
-		<td class='altrow'>{$this->lang->words['th_desc']}</td>
-		<td>{$topic['description']}</td>
-	</tr>
 	<tr class='row1'>
 		<td class='altrow'>{$this->lang->words['th_start_date']}</td>
 		<td>{parse date="$topic['start_date']" format="long"}</td>
@@ -2005,7 +2041,7 @@
 		<td class='altrow'>{$this->lang->words['th_start_name']}</td>
 		<td>
 			<if test="historystarter:|:$topic['starter_id']">
-				<a href='{parse url="showuser={$topic['starter_id']}" base="public" seotitle="{$topic['seo_first_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'>{$topic['starter_name']}</a>{parse template="user_popup" group="global" params="$topic['starter_id'],$topic['seo_first_name']"}
+				<a href='{parse url="showuser={$topic['starter_id']}" base="public" seotitle="{$topic['seo_first_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'>{$topic['starter_name']}</a>
 			<else />
 				{$topic['starter_name']}
 			</if>
@@ -2019,7 +2055,7 @@
 		<td class='altrow'>{$this->lang->words['th_last_name']}</td>
 		<td>
 			<if test="historylastposter:|:$topic['last_poster_id']">
-				<a href='{parse url="showuser={$topic['last_poster_id']}" base="public" seotitle="{$topic['seo_last_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'>{$topic['last_poster_name']}</a>{parse template="user_popup" group="global" params="$topic['last_poster_id'],$topic['seo_last_name']"}
+				<a href='{parse url="showuser={$topic['last_poster_id']}" base="public" seotitle="{$topic['seo_last_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'>{$topic['last_poster_name']}</a>
 			<else />
 				{$topic['last_poster_name']}
 			</if>
@@ -2048,7 +2084,7 @@
 			<tr class='{parse striping="modlogs"}'>
 				<td class='altrow'>
 					<if test="modlogmemberid:|:$data['member_id']">
-						<a href='{parse url="showuser={$data['member_id']}" template="showuser" seotitle="{$data['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$data['member_name']}</a>{parse template="user_popup" group="global" params="$data['member_id'],$data['members_seo_name']"}
+						<a href='{parse url="showuser={$data['member_id']}" template="showuser" seotitle="{$data['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$data['member_name']}</a>
 					<else />
 						{$data['member_name']}
 					</if>
@@ -2061,7 +2097,7 @@
 </table>]]></template_content>
       <template_name>topicHistory</template_name>
       <template_data>$topic, $avg_post, $mod_logs=array()</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2084,371 +2120,7 @@
 </form>]]></template_content>
       <template_name>unsubscribeForm</template_name>
       <template_data>$forum, $topic, $text</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<form method="post" action="{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=save_note&amp;mid={$id}" base="public"}" id='postingform'>
-	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-	<input type='hidden' name='popup' value='{$this->request['popup']}' />
-	<h2 class='maintitle'>{$this->lang->words['mod_warn_new_note']} <a href="{parse url="showuser={$id}" template="showuser" seotitle="{$seo_name}" base="public"}" title='{$this->lang->words['view_profile']}'>{$name}</a></h2>
-	<div class='generic_bar'></div>
-	<div class='post_form'>
-		<fieldset class='row1'>
-			<h3 class='bar'>{$this->lang->words['mod_warn_fieldset']}</h3>
-			<ul>
-				<li class='field'>
-					<textarea name='note' style='width: 95%; height:150px'>{$this->request['note']}</textarea>
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset class='submit'>
-			<input type='submit' class='input_submit' value='{$this->lang->words['mod_warn_note_save']}' />
-		</fieldset>
-	</div>
-</form>]]></template_content>
-      <template_name>warn_add_note_form</template_name>
-      <template_data><![CDATA[$id="",$name="",$seo_name=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['w_done_t']}</h2>
-<div class='message'>
-	{$this->lang->words['w_done_te']}
-	<br /><br />
-	
-	<ul class='bullets'>
-		<li><a href="{$this->settings['board_url']}">{$this->lang->words['w_done_home']}</a></li>
-		<if test="warnsuccesstid:|:$topic['tid']">
-			<li><a href="{parse url="showforum={$topic['id']}" template="showforum" seotitle="{$topic['name_seo']}" base="public"}">{$this->lang->words['w_done_forum']} <b>{$topic['name']}</b></a></li>
-			<li><a href="{parse url="showtopic={$topic['tid']}&amp;st={$this->request['st']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['w_done_topic']} <b>{$topic['title']}</b></a></li>
-		</if>
-	</ul>
-</div>
-<br />]]></template_content>
-      <template_name>warn_success</template_name>
-      <template_data>$topic=array()</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<if test="$this->request['module']=='ajax'">
-		<h3>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h3>
-	<else />
-		<h3 class='maintitle'>{$this->lang->words['w_v_title']}: <a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h3>
-	</if>
-	<table class='ipb_table'>
-		<tr class='header'>
-			<th scope='col'>{$this->lang->words['w_v_warnby']}</th>
-			<th scope='col'>{$this->lang->words['w_v_notes']}</th>
-		</tr>
-		<if test="warnlogentries:|:!is_array($rows) OR !count($rows)">
-			<tr>
-				<td class="no_messages" colspan="2">{$this->lang->words['w_v_none']}</td>
-			</tr>
-		<else />
-			{parse striping="modlog" classes="row2,row1"}
-			<foreach loop="logs:$rows as $r">
-				<tr class='{parse striping="modlog"}'>
-					<td><a href='{parse url="showuser={$r['punisher_id']}" base="public" seotitle="{$r['members_seo_name']}" template="showuser"}' title='{$this->lang->words['view_profile']}'><strong>{$r['punisher_name']}</strong></a></td>
-					<td>{$this->lang->words['mod_warn_added']} <strong>{parse date="$r['wlog_date']" format="long" relative="false"}</strong></td>
-				</tr>
-				<tr class='{parse striping="modlog"}'>
-					<td>
-						<span class="<if test="warnlognote:|:$r['wlog_type'] == 'note' OR $r['wlog_type'] == 'pos'">positive<else />negative</if>" <if test="warnlogcolor:|:$r['wlog_type'] == 'note' || $r['wlog_type'] == 'nochan'">style='color:gray'</if>>
-							<if test="warnlognotetype:|:$r['wlog_type'] == 'note'">
-								{$this->lang->words['mod_warn_note']}
-							<else />
-								<if test="warnlogpos:|:$r['wlog_type'] == 'pos'">
-									{$this->lang->words['w_v_minus']}
-								</if>
-								<if test="warnlogneg:|:$r['wlog_type'] == 'neg'">
-									{$this->lang->words['w_v_add']}
-								</if>
-								<if test="warnlognochange:|:$r['wlog_type'] == 'nochan'">
-									{$this->lang->words['w_v_nochan']}
-								</if>								
-							</if>
-						</span>
-					</td>
-					<td>{$r['content']}</td>
-				</tr>
-			</foreach>
-		</if>
-	</table>
-	<div class='topic_controls'>
-		{$links}
-	</div>]]></template_content>
-      <template_name>warn_view_log</template_name>
-      <template_data><![CDATA[$member, $rows, $links='']]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[{parse js_module="profile"}
-<script type='text/javascript'>
-	ipb.profile.viewingProfile = {$member['member_id']};
-</script>
-<if test="warnerrors:|:$errors">
-	<h2>{$this->lang->words['errors_found']}</h2>
-	<p class='message error'>{$errors}</p>
-	<br />
-</if>
-<!-- SKINNOTE: form validation -->
-<form method="post" action='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=dowarn&amp;mid={$member['member_id']}&amp;t={$tid}&amp;st={$st}&amp;type={$this->request['type']}" base="public"}' id='postingform'>
-<input type="hidden" name="key" value="{$this->member->form_hash}" />
-<div class='post_form'>
-<h2 class='maintitle'>{$this->lang->words['warn_logs_for']} <a href='{parse url="showuser={$member['member_id']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></h2>
-<div class='generic_bar'></div>
-<fieldset class='with_subhead'>
-	<h3 class='bar'>{$this->lang->words['warn_member_details']}</h3>
-	<h4>
-		<img class="photo" src='{$member['pp_main_photo']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}" />
-	</h4>
-	<ul>
-		<li class='field'>
-			{parse replacement="find_topics_link"} <a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}'>{$this->lang->words['gbl_find_my_content']}</a>
-		</li>
-		<if test="displaynamehistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
-			<li class='field' id='dname_history'>
-				{parse replacement="display_name"} <a href='{parse url="app=members&amp;module=profile&amp;section=dname&amp;id={$member['member_id']}" base="public"}' title='{$this->lang->words['view_dname_history']}'>{$this->lang->words['display_history']}</a>
-			</li>
-		</if>
-		<if test="warnreputation:|:$this->settings['reputation_enabled']">
-			<li class='field'>
-				{$this->lang->words['warn_rep']} {$member['pp_reputation_points']}
-				<if test="reptext:|:$member['author_reputation'] && $member['author_reputation']['text']">
-					<p class='title'>{$member['author_reputation']['text']}</p>
-				</if>
-				<if test="repimage:|:$member['author_reputation'] && $member['author_reputation']['image']">
-					<p class='image'>{$member['author_reputation']['image']}</p>
-				</if>
-			</li>
-		</if>
-	</ul>
-</fieldset>
-<fieldset class='with_subhead'>
-	<h3 class='bar'>{$this->lang->words['warn_details']}</h3>
-	<h4>{$this->lang->words['w_adjust_level']}<br /><span class='desc'>{$this->lang->words['warn_current_level']} {$member['warn_level']}/{$this->settings['warn_max']}</span></h4>
-	<ul>
-		<li class='field checkbox negative'>
-			<input type="radio" name="level" id="add" class="input_radio" value="add" <if test="addwarn:|:$this->request['type'] == 'add'">checked='checked'</if> />
-			<label for='add'>{$this->lang->words['w_add']}</label>
-		</li>
-		<li class='field checkbox positive'>
-			<input type="radio" name="level" id="minus" class="input_radio" value="remove" <if test="subwarn:|:$this->request['type'] == 'minus'">checked='checked'</if> />
-			<label for='minus'>{$this->lang->words['w_remove']}</label>
-		</li>	
-		<if test="warnsupermod:|:$this->memberData['g_is_supmod']">
-			<li class='field checkbox custom'>
-				<input type="radio" name="level" id="custom" class="input_radio" value="custom" <if test="warncustom:|:$this->request['type'] == 'custom'">checked='checked'</if> />
-				<label for='level_custom'>{parse expression="sprintf( $this->lang->words['w_change_custom'], $this->settings['warn_max'])"}</label>
-				 <input type='text' id='level_custom' name='level_custom' value='<if test="warncustomlevel:|:isset($this->request['customLevel'])">{$this->request['customLevel']}<else />{$member['warn_level']}</if>' size='3' />
-			</li>
-		</if>
-		<li class='field checkbox'>
-			<input type="radio" name="level" id="nochange" class="input_radio" value="nochange" <if test="warnnochange:|:$this->request['type'] == 'nochange'">checked='checked'</if> />
-			<label for='nochange'>{$this->lang->words['w_nochange']}</label>
-		</li>		
-	</ul>
-	<h4>{$this->lang->words['w_reason']}<br /><span class='desc'>{$this->lang->words['w_reason2']}</span></h4>
-	<ul>
-		<li class='field'>
-			<textarea rows="6" cols="70" class="input_text" name="reason">{IPSText::br2nl( $this->request['reason'] )}</textarea>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='with_subhead'>
-	<h3 class='bar'>{$this->lang->words['member_suspension']}</h3>
-	<if test="modqueue:|:$modque == true">
-		<php>
-			$mod_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
-			$mhours		= 0;
-			
-			if( $member['mod_posts'] > 0 AND $member['mod_posts'] != 1 )
-			{
-				$mod_arr	= IPSMember::processBanEntry( $member['mod_posts'] );
-				
-				if( $mod_arr['date_end'] > time() )
-				{
-					$mhours		= ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
-				}
-			}
-		</php>
-		<h4>{$this->lang->words['w_modq']}</h4>
-		<ul>
-			<li class='field checkbox'>
-				<input class='input_check' id='modq' type="checkbox" name="mod_indef" value="1" <if test="modqueueposts:|:$member['mod_posts'] == 1">checked='checked'</if> />
-				<label for='modq'>{$this->lang->words['w_modq_i']}</label>
-			</li>
-			<li class='field checkbox'>
-				<label for='mod_value'>{$this->lang->words['w_orfor']}</label>
-				<input class='input_text' type="text" id='mod_value' name="mod_value" value="<if test="modqueuehours:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) ) and $timespan = ($mhours / 24)">{$timespan}<else />{$mhours}</if>" size="5" />&nbsp;
-				<select name="mod_unit" class='input_select'>
-					<option value="d" <if test="modunitd:|:$mhours >= 24 and ( ($mhours / 24) == ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
-					<option value="h" <if test="modunith:|:$mhours < 24 or ( ($mhours / 24) != ceil($mhours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
-				</select>
-				<if test="modqueueon:|:$mhours > 0">
-					<span class='desc'>{$this->lang->words['w_restricted']}</span>
-				</if>
-			</li>
-		</ul>
-	</if>
-	<if test="postqueue:|:$postque == true">
-		<php>
-			$post_arr	= array( 'timespan' => 0, 'hours' => 0, 'days' => 0 );
-			$phours		= 0;
-			
-			if( $member['restrict_post'] > 0 AND $member['restrict_post'] != 1 )
-			{
-				$post_arr	= IPSMember::processBanEntry( $member['restrict_post'] );
-				
-				if( $post_arr['date_end'] > time() )
-				{
-					$phours		= ceil( ( $post_arr['date_end'] - time() ) / 3600 );
-				}
-			}
-		</php>
-		<h4>{$this->lang->words['w_resposts']}</h4>
-		<ul>
-			<li class='field checkbox'>
-				<input class='input_check' id='restrict_posts' type="checkbox" name="post_indef" value="1" <if test="postqueueposts:|:$member['restrict_post'] == 1">checked='checked'</if> />
-				<label for='restrict_posts'>{$this->lang->words['w_resposts_i']}</label>
-			</li>
-			<li class='field checkbox'>
-				<label for='post_value'>{$this->lang->words['w_orfor']}</label>
-				<input class='input_text' type="text" id='post_value' name="post_value" value="<if test="postqueuehours:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) ) and $timespan = ($phours / 24)">{$timespan}<else />{$phours}</if>" size="5" />&nbsp;
-				<select name="post_unit" class='input_select'>
-					<option value="d" <if test="postunitd:|:$phours >= 24 and ( ($phours / 24) == ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
-					<option value="h" <if test="postunith:|:$phours < 24 or ( ($phours / 24) != ceil($phours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
-				</select>
-				<if test="postqueueon:|:$phours > 0">
-					<span class='desc'>{$this->lang->words['w_restricted']}</span>
-				</if>
-			</li>
-		</ul>
-	</if>
-	<if test="banqueue:|:$ban == true">
-		<php>
-			$ban_arr	= array( 'timespan' => 0, 'days' => 0, 'hours' => 0 );
-			$hours		= 0;
-			
-			if( $member['temp_ban'] AND $member['temp_ban'] != 1 )
-			{
-				$ban_arr	= IPSMember::processBanEntry( $member['temp_ban'] );
-				
-				if( $ban_arr['date_end'] > time() )
-				{
-					$hours		= ceil( ( $ban_arr['date_end'] - time() ) / 3600 );
-				}
-			}
-		</php>
-		<h4>{$this->lang->words['w_suspend']}</h4>
-		<ul>
-			<li class='field checkbox'>
-				<input class='input_check' id='suspend_member' type="checkbox" name="ban_indef" value="1" <if test="bannedison:|:$member['member_banned'] == 1">checked='checked'</if> />
-				<label for='suspend_member'>{$this->lang->words['w_ban_indef']}</label>
-			</li>
-			<li class='field checkbox'>
-				<label for='susp_value'>{$this->lang->words['w_suspend_or']}</label>
-				<input type="text" id='susp_value' class='input_text' name="susp_value" value="<if test="bannedhours:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) ) and $timespan = ($hours / 24)">{$timespan}<else />{$hours}</if>" size="5" />
-				<select name="susp_unit" class='input_select'>
-					<option value="d" <if test="banunitd:|:$hours >= 24 and ( ($hours / 24) == ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_day']}</option>
-					<option value="h" <if test="banunith:|:$hours < 24 or ( ($hours / 24) != ceil($hours / 24) )">selected='selected'</if>>{$this->lang->words['w_hour']}</option>
-				</select>
-				<if test="banon:|:$member['temp_ban']">
-					<span class='desc'>{$this->lang->words['w_restricted']}</span>
-				</if>
-			</li>
-		</ul>
-	</if>
-</fieldset>
-<fieldset class='with_subhead'>
-	<h3 class='bar'>{$this->lang->words['warn_mem_content']}</h3>
-	<h4>{$this->lang->words['warn_posts_topics']}</h4>
-	<ul>
-		<li class='field checkbox'>
-			<select name="topicPosts_type" class='input_select'>
-				<option value='unapprove' <if test="unapproveposts:|:$this->request['topicPosts_type'] == 'unapprove'">selected='selected'</if>>{$this->lang->words['warn_stuff_unapprove']}</option>
-				<option value='approve' <if test="approveposts:|:$this->request['topicPosts_type'] == 'approve'">selected='selected'</if>>{$this->lang->words['warn_stuff_approve']}</option>
-			</select>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" id='topicPosts_topics' class='input_check' name="topicPosts_topics" value="1" />
-			<label for='topicPosts_topics'>{$this->lang->words['warn_stuff_alltopics']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" id='topicPosts_replies' class='input_check' name="topicPosts_replies" value="1" />
-			<label for='topicPosts_replies'>{$this->lang->words['warn_stuff_allposts']}</label>
-		</li>
-		<li class='field checkbox'>
-			<label for='topicPosts_lastx'>{$this->lang->words['warn_stuff_datecutoff']}</label>
-			<input type="text" id='topicPosts_lastx' class='input_text' name="topicPosts_lastx" value="" size="5" />
-			<select name="topicPosts_lastxunits" class='input_select'>
-				<option value="d">{$this->lang->words['w_day']}</option>
-				<option value="h">{$this->lang->words['w_hour']}</option>
-			</select>
-		</li>
-	</ul>
-</fieldset>
-<fieldset>
-	<h3 class='bar'>{$this->lang->words['warn_contact_member']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='subj'>{$this->lang->words['w_c_subj']}</label>
-			<input id='subj' class='input_text' type="text" name="subject" value="{$this->request['subject']}" size="30" />
-		</li>
-		<li class='field'>
-			<label for='method'>{$this->lang->words['w_c']}</label>
-			<select id='method' name="contactmethod" class='input_select'>
-				<if test="disablepm:|:$member['members_disable_pm'] != 1">
-					<option value="pm">{$this->lang->words['w_c_p']}</option>
-				</if>
-				<option value="email">{$this->lang->words['w_c_e']}</option>
-			</select>
-		</li>
-		<li>
-			{$editor_html}
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='submit'>
-	<input type="submit" class='input_submit' value="{$this->lang->words['w_submit']}" tabindex='0'/> {$this->lang->words['or']} <a href='{parse url="showtopic={$tid}&amp;st={$st}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-</fieldset>
-	
-</div>
-</form>]]></template_content>
-      <template_name>warnForm</template_name>
-      <template_data><![CDATA[$member, $tid=0, $st=0, $errors='', $modque=false, $postque=false, $ban=false, $editor_html='']]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>warnLogsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2459,18 +2131,34 @@
     <template>
       <template_group>skin_post</template_group>
       <template_content><![CDATA[<html>
+<head>
+	<style type="text/css">
+		* {
+			margin: 0px;
+			padding: 0px;
+		}
+		
+		#waitImg {
+			position: relative;
+			top: 4px;
+		}
+	</style>
+	{parse template="includeRTL" group="global" params=""}
+</head>
 <body style='background-color: transparent;'>
 <form id='iframeUploadForm' method='post' enctype="multipart/form-data" action=''>
 <script type='text/javascript'>
+	parent.Debug.write("Loaded iframe");
 	parent.ipb.attach._jsonPass( $id, $JSON );
 </script>
-<input type='file' id='iframeUploadBox_$id' style='display: inline' name='FILE_UPLOAD' /> <input type='reset' value='{$this->lang->words['clear_selection']}' style='display: inline' />
+<input type='file' id='iframeUploadBox_{$id}' style='display: inline' name='FILE_UPLOAD' /> <input type='reset' value='{$this->lang->words['clear_selection']}' style='display: inline' />
+<img src="{$this->settings['img_url']}/loading.gif" style='display: none' id="waitImg" />
 </form>
 </body>
 </html>]]></template_content>
       <template_name>attachiFrame</template_name>
       <template_data>$JSON, $id</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2484,7 +2172,7 @@
 <br />]]></template_content>
       <template_name>errors</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2495,84 +2183,83 @@
       <template_content><![CDATA[{parse js_module="poll"}
 <script type='text/javascript'>
 //<!#^#|CDATA|
-	ipb.poll.maxQuestions = parseInt( {$max_poll_questions} );
-	ipb.poll.maxChoices = parseInt( {$max_poll_choices} );
-	ipb.poll.isPublicPoll = parseInt( {$poll_view_voters} );
-	ipb.poll.showOnLoad = {$show_open};
-	ipb.poll.isMod = {$is_mod};
+	ipb.poll.maxQuestions = parseInt( {$data['max_poll_questions']} );
+	ipb.poll.maxChoices = parseInt( {$data['max_poll_choices']} );
+	ipb.poll.isPublicPoll = parseInt( {$data['poll_view_voters']} );
+	ipb.poll.showOnLoad = {$data['show_open']};
+	ipb.poll.isMod = {$data['is_mod']};
 	
 	ipb.poll.questions = \$H(
-		<if test="hasPollQuestions:|:$poll_questions != '[]'">{$poll_questions}</if>
+		<if test="hasPollQuestions:|:$data['poll_questions'] != '[]'">{$data['poll_questions']}</if>
 	);
 	
 	ipb.poll.choices = \$H(
-		<if test="hasPollChoices:|:$poll_choices != '[]'">{$poll_choices}</if>
+		<if test="hasPollChoices:|:$data['poll_choices'] != '[]'">{$data['poll_choices']}</if>
 	);
 	
 	ipb.poll.votes = \$H(
-		<if test="hasPollVotes:|:$poll_votes != '[]'">{$poll_votes}</if>
+		<if test="hasPollVotes:|:$data['poll_votes'] != '[]'">{$data['poll_votes']}</if>
 	);
 	
 	ipb.poll.multi = \$H(
-		<if test="hasPollMulti:|:$poll_multi != '[]'">{$poll_multi}</if>
+		<if test="hasPollMulti:|:$data['poll_multi'] != '[]'">{$data['poll_multi']}</if>
 	);
 	
-	//ipb.templates['poll_section_wrap'] = "<div id='poll_#{id}' class='general_box'>#{content}</div>";
-	ipb.templates['poll_question'] = 	new Template("<li class='field question' id='question_#{qid}_wrap' style='display: none'>" +
-											"	<label for='#{qid}'><strong>{$this->lang->words['question_title']}</strong></label>" +
-											"	<div class='wrap rounded'>" + 
-											" 		<input type='text' class='input_text question_title' id='#{qid}' value='#{value}' size='40' maxlength='254' name='question[#{qid}]' />" +
-											"		<input type='checkbox' class='input_check' value='1' name='multi[#{qid}]' id='multi_#{qid}'/> <label for='multi_#{qid}'><span class='desc'>{$this->lang->words['poll_multichoice']}</span></label>" + 
+	ipb.templates['poll_question'] = 	new Template("<li class='ipsBox_container question' id='question_#{qid}_wrap' style='display: none'>" +
+											"<a href='#' class='ipsPad right' id='remove_question_#{qid}' title='{$this->lang->words['remove_question']}'>{parse replacement="remove_poll_question"}</a>" +
+											"	<ul class='ipsForm ipsForm_vertical question_title ipsPad'>"+
+											"		<li class='ipsField'>" + 
+											" 			<label for='#{qid}' class='ipsType_subtitle'>{$this->lang->words['question_title']} #{qid}</label>"+
+											"			<p class='ipsField_content'>" +
+											" 				<input type='text' class='input_text' id='#{qid}' value='#{value}' size='62' maxlength='254' name='question[#{qid}]' /></span> <input type='checkbox' class='input_check' value='1' name='multi[#{qid}]' id='multi_#{qid}'/> <label for='multi_#{qid}'><span class='desc lighter'>{$this->lang->words['poll_multichoice']}</span></label>" +
+											"			</p>" +
+											"		</li>"+
+											"	</ul>" + 
+											"	<div class='wrap ipsPad'>" + 
 											"		<ol id='choices_for_#{qid}'></ol>" + 
-											"		<ul class='post_controls'>" +
-											"			<li><a href='#' id='add_choice_#{qid}' title='{$this->lang->words['add_poll_choice']}'>{parse replacement="add_poll_choice"} {$this->lang->words['add_another_choice']}</a></li>" +
-											"			<li><a href='#' id='remove_question_#{qid}' title='{$this->lang->words['remove_question']}'>{parse replacement="remove_poll_question"} {$this->lang->words['remove_question']}</a></li>" +
-											"		</ul>" +
+											"		<p class='ipsPad poll_control'><a href='#' class='ipsType_small' id='add_choice_#{qid}' title='{$this->lang->words['add_poll_choice']}'>{parse replacement="add_poll_choice"} {$this->lang->words['add_another_choice']}</a></p>" +
 											"	</div>" +
 											"</li>");
-	ipb.templates['poll_choice'] = 		new Template("<li id='poll_#{qid}_#{cid}_wrap' style='display: none'><input type='text' id='poll_#{qid}_#{cid}' name='choice[#{qid}_#{cid}]' class='input_text' value='#{choice}' size='46' maxlength='254' /> <input type='text' id='poll_#{qid}_#{cid}_votes' name='votes[#{qid}_#{cid}]' value='#{votes}' class='input_text' size='5' /> <a href='#' id='remove_#{qid}_#{cid}' title='{$this->lang->words['remove_choice']}'>{parse replacement="remove_poll_choice"}</a></li>");
+	ipb.templates['poll_choice'] = 		new Template("<li id='poll_#{qid}_#{cid}_wrap' style='display: none'><input type='text' id='poll_#{qid}_#{cid}' name='choice[#{qid}_#{cid}]' class='input_text' value='#{choice}' size='66' maxlength='254' /> <input type='text' id='poll_#{qid}_#{cid}_votes' name='votes[#{qid}_#{cid}]' value='#{votes}' class='input_text' size='5' title='{$this->lang->words['poll_votes_desc']}' /> <a href='#' id='remove_#{qid}_#{cid}' title='{$this->lang->words['remove_choice']}'>{parse replacement="remove_poll_choice"}</a></li>");
 //|#^#]>
 </script>
 
 <div class='post_form poll_form' id='poll_form'>
-	<div class='topic_controls' id='add_poll' style='display: none'>
-		<ul class='topic_buttons'>
-			<li><a href='#'>{parse replacement="show_poll_form"} {$this->lang->words['poll_manage_link']}</a></li>
-		</ul>
-	</div>
-	<fieldset id='poll_wrap' style='display: none' class='clear'>
-		<ul id='poll_container'>
-			<li class='field'>
-				<label for='poll_title'>{$this->lang->words['poll_fs_title']}</label>
-				<input type='text' class='input_text' name='poll_question' id='poll_title' size='40' value='{$poll_question}' />
-			</li>
-			<if test="allowPublicPoll:|:$this->settings['poll_allow_public'] AND ! $total_votes">
-				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='poll_view_voters' id='poll_view_voters' value='1' <if test="viewPollVoters:|:$poll_view_voters">checked='checked'</if> />
-					<label for='poll_view_voters'>{$this->lang->words['poll_fs_public']}</label>
-					<span class='desc'>{$this->lang->words['poll_public_warning']}</span>
-				</li>
-			</if>
-			<if test="makePollOnly:|:$this->settings['ipb_poll_only']">
-				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='poll_only' id='poll_only' value='1' <if test="pollOnlyChecked:|:$poll_only">checked='checked'</if> />
-					<label for='poll_only'>{$this->lang->words['poll_only_title']}</label>
-					<span class='desc'>{$this->lang->words['poll_only_desc']}</span>
-				</li>
-			</if>
-		</ul>
-		<span class='desc' id='poll_stats'></span>
-		<div class='topic_controls'>
-			<ul class='topic_buttons'>
-				<li id='add_new_question'><a href='#'>{parse replacement="add_poll_question"} {$this->lang->words['add_another_question']}</a></li>
-				<li id='close_poll'><a href='#'>{parse replacement="close_poll_form"} {$this->lang->words['close_poll_form']}</a></li>
-			</ul>
+	<a href='#' id='add_poll' class='ipsType_small'><img src='{$this->settings['img_url']}/bullet_toggle_plus.png' /> {$this->lang->words['poll_manage_link']}</a>
+	
+	<div id='poll_popup_content' style='display: none'>
+		<div id='poll_wrap'>
+			<h3>{$this->lang->words['poll_manager']}</h3>
+			<div class='ipsBox_container ipsPad'>
+				<label for='poll_title'><strong>{$this->lang->words['poll_fs_title']}</strong></label>&nbsp;&nbsp;
+				<input type='text' class='input_text ipsForm_primary' name='poll_question' id='poll_title' size='40' value='{$data['poll_question']}' />&nbsp;&nbsp;&nbsp;&nbsp;
+				<if test="allowPublicPoll:|:$this->settings['poll_allow_public'] AND ! $data['poll_total_votes']">
+					<span class='ipsType_small' id='check_public_poll' data-tooltip="{$this->lang->words['poll_public_warning']}">
+						<input type='checkbox' class='input_check' name='poll_view_voters' id='poll_view_voters' value='1' <if test="viewPollVoters:|:$data['poll_view_voters']">checked='checked'</if> />
+						<label for='poll_view_voters'>{$this->lang->words['poll_fs_public']}</label>
+					</span>
+				</if>
+				&nbsp;&nbsp;
+				<if test="makePollOnly:|:$this->settings['ipb_poll_only']">
+					<span class='ipsType_small' id='check_poll_only' data-tooltip="{$this->lang->words['poll_only_desc']}">
+						<input type='checkbox' class='input_check' name='poll_only' id='poll_only' value='1' <if test="pollOnlyChecked:|:$data['poll_only']">checked='checked'</if> />
+						<label for='poll_only'>{$this->lang->words['poll_only_title']}</label>
+					</span>
+				</if>
+			</div>
+			<div class='ipsBox fixed_inner' id='poll_container_wrap'>
+				<ul id='poll_container'></ul>
+			</div>
+			<div id='poll_footer' class='ipsForm_submit clearfix' style='margin-top: 0;'>
+				<a id='add_new_question' class='ipsButton left'>{parse replacement="add_poll_question"} {$this->lang->words['add_another_question']}</a> <span class='desc ipsType_smaller left ipsPad' id='poll_stats'></span>
+				<a id='close_poll' class='ipsButton no_width right'>{parse replacement="close_poll_form"} {$this->lang->words['close_poll_form']}</a>
+			</div>
 		</div>
-	</fieldset>
+	</div>
 </div>]]></template_content>
       <template_name>pollBox</template_name>
-      <template_data><![CDATA[$max_poll_questions="",$max_poll_choices="",$poll_questions="",$poll_choices="",$poll_votes="",$show_open="",$poll_question="",$is_mod=0,$poll_multi="",$poll_only='', $poll_view_voters='', $total_votes=0]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data>$data</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2581,264 +2268,202 @@
     <template>
       <template_group>skin_post</template_group>
       <template_content><![CDATA[<if test="open_close_perm:|:$formData['modOptionsData']['canSetOpenTime'] == 1 || $formData['modOptionsData']['canSetCloseTime'] == 1">
-	{parse addtohead="{$this->settings['public_dir']}/style_css/{$this->registry->output->skin['_csscacheid']}/calendar_select.css" type="css"}
+	{parse addtohead="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/calendar_select.css" type="css"}
 	<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/calendar_date_select/calendar_date_select.js'></script>
 </if>
 {parse js_module="post"}
 {parse striping="post_stripe" classes="row1,row2"}
-<div class='post_form'>
-	<!--FORUM RULES--><br />
-	<form id='postingform' action='{$this->settings['base_url']}' method='post' enctype='multipart/form-data'>
-	<!-- hidden inputs at bottom -->
-	
-<h2 class='maintitle'>{$formData['title']}</h2>
-<!--SKINNOTE: Not semantic to have an empty list here for styling purposes :P -->
-<div class='generic_bar'></div>
-<if test="logged_in_check:|:! $this->memberData['member_id']">
-<fieldset>
-	<h3 class='bar'>{$this->lang->words['guest_name_title']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='username'>{$this->lang->words['guest_name']}</label>
-			<input type='text' name='UserName' id='username' size='50' value='{$this->request['UserName']}' maxlength="{$this->settings['max_user_name_length']}" class='input_text' tabindex='0' />
-		</li>
-		<if test="guestCaptcha:|:$formData['captchaHTML']">
-		<li class='field'>
-			<label for='guest_captcha'>{$this->lang->words['guest_captcha']}</label>
-			{$formData['captchaHTML']}
-		</li>
-		</if>
-	</ul>
-</fieldset>
-</if>
-<if test="edit_title_check:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit' AND $formData['canEditTitle'] )">
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['topic_information']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='topic_title'>{$this->lang->words['topic_title']}</label>
-				<input id='topic_title' class='input_text' type="text" size="50" maxlength="{$this->settings['topic_title_max_len']}" name="TopicTitle" value="{$formData['topicTitle']}" tabindex="0" />
-			</li>
-			<li class='field'>
-				<label for='topic_desc'>{$this->lang->words['topic_desc']}</label>
-				<input id='topic_desc' class='input_text' type="text" size="50" maxlength="70" name="TopicDesc" value="{$formData['topicDesc']}" tabindex="0" />
-				<span class='desc'>{$this->lang->words['post_optional']}</span>
-			</li>
-		</ul>
-	</fieldset>
-</if>
-<if test="pollboxHtml:|:$formData['pollBoxHTML']">
-	<fieldset id='poll_fieldset' style='display: none'>
-		<h3 class='bar'>{$this->lang->words['topic_poll_title']}</h3>
-		{$formData['pollBoxHTML']}
-	</fieldset>
-	<script type='text/javascript'>
-		$('poll_fieldset').show();
-	</script>
-</if>
-<fieldset>
-	<h3 class='bar'><if test="emoticons:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit' AND $formData['canEditTitle'] )">{$this->lang->words['topic']}<else />{$this->lang->words['post']}</if></h3>
-	<if test="statusMsgs:|:is_array($formData['statusMsg']) AND count($formData['statusMsg']) AND strlen($formData['statusMsg'][0])">
-		<div class='message'>{parse expression="implode( '<br />', $formData['statusMsg'])"}</div>
-	</if>
-	{$formData['editor']}
-</fieldset>
-<if test="upload_form_check:|:$formData['uploadForm']">
-<fieldset class='attachments'>
-	{$formData['uploadForm']}
-</fieldset>
-</if>
-<fieldset id='post_options' class='with_subhead'>
-	<h3 class='bar'>{$this->lang->words['options']}</h3>
-		
-	<div id='post_options_options'>
-		<h4>{$this->lang->words['post_options']}</h4>
-		<ul>
-			<if test="htmlstatus:|:is_array( $formData['checkBoxes']['html'] ) AND count( $formData['checkBoxes']['html'] )">
-				<li class='field'>
-					<select name="post_htmlstatus" class="input_select">
-						<option value="0"{$formData['checkBoxes']['html'][0]}>{$this->lang->words['pp_nohtml']}</option>
-						<option value="1"{$formData['checkBoxes']['html'][1]}>{$this->lang->words['pp_html1']}</option>
-						<option value="2"{$formData['checkBoxes']['html'][2]}>{$this->lang->words['pp_html2']}</option>
-					</select>
-				</li>
+<h1 class='ipsType_pagetitle'>{$formData['title']}</h1>
+<br />
+<!--FORUM RULES-->
+<form id='postingform' action='{$this->settings['base_url']}' method='post' enctype='multipart/form-data'>
+	<div class='ipsBox ipsForm_vertical ipsLayout ipsLayout_withright ipsPostForm clearfix'>
+	    <div class='ipsBox_container ipsLayout_right ipsPostForm_sidebar'>
+			<if test="pollboxHtml:|:$formData['pollBoxHTML']">
+				<h3 class='bar'>{$this->lang->words['post_poll']}</h3>
+				<fieldset id='poll_fieldset' class='ipsPad' style='display: none'>
+					{$formData['pollBoxHTML']}
+				</fieldset>
+				<script type='text/javascript'>
+					$('poll_fieldset').show();
+				</script>
 			</if>
-				<li class='field checkbox'>
-					<input type="checkbox" name="enableemo" class="input_check" value="yes" id='enable_emo' {$formData['checkBoxes']['emo']} />
-					<label for='enable_emo'>{$this->lang->words['enable_emo']}</label>
-				</li>
-			<if test="enablesig:|:$this->memberData['member_id']">
-				<li class='field checkbox'>
-					<input type="checkbox" name="enablesig" class="input_check" value="yes" id='enable_sig' {$formData['checkBoxes']['sig']} />
-					<label for='enable_sig'>{$this->lang->words['enable_sig']}</label>
-				</li>
-				<if test="tracking:|:$formData['checkBoxes']['tra'] == '-tracking-'">
-					<li class='field'><span class='desc'>{$this->lang->words['already_sub']}</span><li>
-				<else />
-					<li class='field checkbox'>
-						<input type="checkbox" name="enabletrack" class="input_check" id='enable_track' value="1" {$formData['checkBoxes']['tra']} />
-						<label for='enable_track'>{$this->lang->words['enable_track']}</label>
+			<div class='ipsPostForm_sidebar_block'>
+				<h3 class='bar'>{$this->lang->words['post_options']}</h3>
+				<ul class='ipsPad ipsForm ipsForm_vertical ipsType_small'>
+				<if test="htmlstatus:|:is_array( $formData['checkBoxes']['html'] ) AND count( $formData['checkBoxes']['html'] )">
+					<li class='ipsField'>
+						<select name="post_htmlstatus" class="input_select">
+							<option value="0"{$formData['checkBoxes']['html'][0]}>{$this->lang->words['pp_nohtml']}</option>
+							<option value="1"{$formData['checkBoxes']['html'][1]}>{$this->lang->words['pp_html1']}</option>
+							<option value="2"{$formData['checkBoxes']['html'][2]}>{$this->lang->words['pp_html2']}</option>
+						</select>
 					</li>
 				</if>
+					<li class='ipsField ipsField_checkbox'>
+						<input type="checkbox" name="enableemo" class="input_check" value="yes" id='enable_emo' {$formData['checkBoxes']['emo']} />
+						<p class='ipsField_content'>
+							<label for='enable_emo'>{$this->lang->words['enable_emo']}</label>
+						</p>
+					</li>
+				<if test="enablesig:|:$this->memberData['member_id']">
+					<li class='ipsField ipsField_checkbox'>
+						<input type="checkbox" name="enablesig" class="input_check" value="yes" id='enable_sig' {$formData['checkBoxes']['sig']} />
+						<p class='ipsField_content'>
+							<label for='enable_sig'>{$this->lang->words['enable_sig']}</label>
+						</p>
+					</li>
+					<if test="tracking:|:$formData['checkBoxes']['tra'] == '-tracking-'">
+						<li class='ipsField'><span class='desc'>{$this->lang->words['already_sub']}</span><li>
+					<else />
+						<li class='ipsField ipsField_checkbox'>
+							<input type="checkbox" name="enabletrack" class="input_check" id='enable_track' value="1" {$formData['checkBoxes']['tra']} />
+							<p class='ipsField_content'>
+								<label for='enable_track'>{$this->lang->words['enable_track']}</label>
+							</p>
+						</li>
+					</if>
+				</if>
+				</ul>
+			</div>
+			<if test="showModOptions:|:$formData['modOptionsData']['dropDownOptions'] || $formData['modOptionsData']['canSetOpenTime'] || $formData['modOptionsData']['canSetCloseTime']">
+				<div class='ipsPostForm_sidebar_block'>
+					<h3 class='bar'>{$this->lang->words['moderator_options']}</h3>
+					<ul class='ipsPad ipsForm ipsForm_vertical'>
+						<if test="mod_options_check:|:$formData['modOptionsData']['dropDownOptions'] != """>
+							<li class='ipsField'>
+								<label for='forminput'><strong>{$this->lang->words['after_posting_pf']}</strong></label>
+								<p class='ipsField_content'>
+									{$formData['modOptionsData']['dropDownOptions']}</select>
+								</p>
+							</li>
+						</if>
+						<if test="open_time_check:|:$formData['modOptionsData']['canSetOpenTime'] == 1 ">
+							<li class='ipsField'>
+								<label for='mod_open_date'><strong>{$this->lang->words['mod_open_time']}</strong></label>
+								<p class='ipsField_content'>
+									<input type='text' size='7' name='open_time_time' id='mod_open_time' class='date input_text' value='{$formData['modOptionsData']['myTimes']['open_time']}' />&nbsp;
+									<input type='text' size='16' name='open_time_date' id='mod_open_date' class='input_text date' value='{$formData['modOptionsData']['myTimes']['open_date']}' />
+									<img src='{$this->settings['img_url']}/date.png' alt='{$this->lang->words['generic_date']}' id='mod_open_date_icon' class='clickable' />
+								</p>
+							</li>
+						</if>
+						<if test="close_time_check:|:$formData['modOptionsData']['canSetCloseTime'] == 1">
+							<li class='ipsField'>
+								<label for='mod_close_date'><strong>{$this->lang->words['mod_close_time']}</strong></label>
+								<p class='ipsField_content'>
+									<input type='text' size='7' name='close_time_time' id='mod_close_time' class='date input_text' value='{$formData['modOptionsData']['myTimes']['close_time']}' />&nbsp;
+									<input type='text' size='16' name='close_time_date' id='mod_close_date' class='date input_text' value='{$formData['modOptionsData']['myTimes']['close_date']}' />
+									<img src='{$this->settings['img_url']}/date.png' alt='{$this->lang->words['generic_date']}' id='mod_close_date_icon' class='clickable' />
+							</li>
+						</if>
+					</ul>
+					<script type='text/javascript'>
+						document.observe("dom:loaded", function(){
+							if( $('mod_open_time') ){ $('mod_open_time').defaultize( "{$this->lang->words['mod_time_format']}" ); }
+							if( $('mod_open_date') ){ $('mod_open_date').defaultize( "{$this->lang->words['mod_date_format']}" ); }
+							if( $('mod_close_time') ){ $('mod_close_time').defaultize( "{$this->lang->words['mod_time_format']}" ); }
+							if( $('mod_close_date') ){ $('mod_close_date').defaultize( "{$this->lang->words['mod_date_format']}" ); }
+						});
+					</script>
+				</div>
 			</if>
-		</ul>
-		<hr />
-	<if test="edit_options_check:|:$formData['extraData']['showEditOptions']">
-		<h4>{$this->lang->words['edit_options']}</h4>
-		<ul>
-			<li class='field checkbox'>
-				<input type="checkbox" name="add_edit" value="1" id='append_edit' {$formData['extraData']['checked']} class="input_check" />
-				<label for='append_edit'>{$this->lang->words['append_edit']}</label>
-			</li>
-		</ul>
-		<hr />
-	</if>
-	<if test="showeditreason:|:$formData['extraData']['showReason']">
-	<ul>
-	<li class='field'>
-		<label for='post_edit_reason'>{$this->lang->words['reason_for_edit']}</label><br />
-		<input type="text" name="post_edit_reason" id='post_edit_reason' value="{$formData['extraData']['reasonForEdit']}" size='40' maxlength='250' class='input_text' />
-	</li>
-	</ul>
-	</if>
-	
-	<if test="mod_options_check:|:$formData['modOptionsData']['dropDownOptions'] != """>
-		<h4>{$this->lang->words['mod_options']}</h4>
-		<ul>
-			<li class='field'>{$formData['modOptionsData']['dropDownOptions']}</select></li>
-		</ul>
-		<hr />
-	</if>
-	<if test="open_time_check:|:$formData['modOptionsData']['canSetOpenTime'] == 1 ">
-		<h4>{$this->lang->words['mod_open_time']} <span class='desc'>{$this->lang->words['post_optional']}</span></h4>
-		<ul>
-			<li class='field'>
-				<input type='text' size='20' name='open_time_date' id='mod_open_date' class='input_text' value='{$formData['modOptionsData']['myTimes']['open_date']}' />
-				<img src='{$this->settings['img_url']}/date.png' alt='{$this->lang->words['generic_date']}' id='mod_open_date_icon' class='clickable' /> 
-				<span class='desc'>{$this->lang->words['mod_date_format']}</span>
-			</li>
-			<li class='field'>
-				<input type='text' size='5' name='open_time_time' id='mod_open_time' class='input_text' value='{$formData['modOptionsData']['myTimes']['open_time']}' />
-				<span class='desc'>{$this->lang->words['mod_time_format']}</span>
-			</li>
-		</ul>
-		<hr />
-	</if>
-	<if test="close_time_check:|:$formData['modOptionsData']['canSetCloseTime'] == 1">
-		<h4>{$this->lang->words['mod_close_time']} <span class='desc'>{$this->lang->words['post_optional']}</span></h4>
-		<ul>
-			<li class='field'>
-				<input type='text' size='20' name='close_time_date' id='mod_close_date' class='input_text' value='{$formData['modOptionsData']['myTimes']['close_date']}' />
-				<img src='{$this->settings['img_url']}/date.png' alt='{$this->lang->words['generic_date']}' id='mod_close_date_icon' class='clickable' />
-				<span class='desc'>{$this->lang->words['mod_date_format']}</span>
-			</li>
-			<li class='field'>
-				<input type='text' size='5' name='close_time_time' id='mod_close_time' class='input_text' value='{$formData['modOptionsData']['myTimes']['close_time']}' />
-				<span class='desc'>{$this->lang->words['mod_time_format']}</span>
-			</li>
-		</ul>
-		<hr />
-	</if>
-		<h4>{$this->lang->words['post_icon']}</h4>
-		<ul id='post_icons'>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="1"<if test="posticon1:|:isset( $formData['postIconSelected']['1'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon1.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="2"<if test="posticon2:|:isset( $formData['postIconSelected']['2'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon2.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="3"<if test="posticon3:|:isset( $formData['postIconSelected']['3'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon3.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="4"<if test="posticon4:|:isset( $formData['postIconSelected']['4'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon4.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="5"<if test="posticon5:|:isset( $formData['postIconSelected']['5'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon5.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="6"<if test="posticon6:|:isset( $formData['postIconSelected']['6'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon6.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="7"<if test="posticon7:|:isset( $formData['postIconSelected']['7'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon7.gif" alt='' />
-			</li>
-			<li class='clear'>
-				<input type="radio" class="input_radio" name="iconid" value="8"<if test="posticon8:|:isset( $formData['postIconSelected']['8'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon8.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="9"<if test="posticon9:|:isset( $formData['postIconSelected']['9'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon9.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="10"<if test="posticon10:|:isset( $formData['postIconSelected']['10'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon10.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="11"<if test="posticon11:|:isset( $formData['postIconSelected']['11'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon11.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="12"<if test="posticon12:|:isset( $formData['postIconSelected']['12'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon12.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="13"<if test="posticon13:|:isset( $formData['postIconSelected']['13'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon13.gif" alt='' />
-			</li>
-			<li>
-				<input type="radio" class="input_radio" name="iconid" value="14"<if test="posticon14:|:isset( $formData['postIconSelected']['14'] )"> checked="checked"</if> />&nbsp;
-				<img src="{$this->settings['mime_img']}/style_extra/post_icons/icon14.gif" alt='' />
-			</li>
-			<li class='clear'>
-				<input type="radio" class="input_radio" name="iconid" value="0"<if test="posticon0:|:isset( $formData['postIconSelected']['0'] )"> checked="checked"</if> />&nbsp;&nbsp;{$this->lang->words['picons_none']}
-			</li>
-		</ul>
-		<hr />
-	</div>
-	
-	<span id='toggle_post_options' class='clickable'></span>
-	
-	<script type='text/javascript'>
-		ipb.post.hideOptions();
-	</script>
-</fieldset>
-<fieldset class='submit'>
-	<input type='hidden' name='st' value='{$this->request['st']}' />
-	<input type='hidden' name='app' value='forums' />
-	<input type='hidden' name='module' value='post' />
-	<input type='hidden' name='section' value='post' />
-	<input type='hidden' name='do' value='{$form['doCode']}' />
-	<input type='hidden' name='s' value='{$this->member->session_id}' />
-	<input type='hidden' name='p' value='{$form['p']}' />
-	<input type='hidden' name='t' value='{$form['t']}' />
-	<input type='hidden' name='f' value='{$form['f']}' />
-	<input type='hidden' name='parent_id' value='{$form['parent']}' />
-	<input type='hidden' name='attach_post_key' value='{$form['attach_post_key']}' />
-	<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
-	<input type='hidden' name='removeattachid' value='0' />
-	
-	<input type="submit" name="dosubmit" value="{$formData['buttonText']}" tabindex="0" class="input_submit" accesskey="s"  />&nbsp;
-	<input type="submit" name="preview" value="{$this->lang->words['button_preview']}" tabindex="0" class="input_submit alt" />
-	{$this->lang->words['or']} <if test="cancelposting:|:$form['t']">
-			<a href='{parse url="showtopic={$form['t']}" template="showtopic" seotitle="{$formData['seoTopic']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-		<else />
-			<a href='{parse url="showforum={$form['f']}" template="showforum" seotitle="{$formData['seoForum']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-		</if>
-</fieldset>
+			<if test="edit_options_check:|:$formData['extraData']['showEditOptions']">
+				<div class='ipsPostForm_sidebar_block'>
+					<h3 class='bar'>{$this->lang->words['edit_options']}</h3>
+					<ul class='ipsPad ipsForm ipsForm_vertical'>
+						<li class='ipsField ipsField_checkbox'>
+							<input type="checkbox" name="add_edit" value="1" id='append_edit' <if test="checkShowEdit:|:$formData['extraData']['checked']">checked="checked"</if> class="input_check" />
+							<p class='ipsField_content'>
+								<label for='append_edit'>{$this->lang->words['append_edit']}</label>
+							</p>
+						</li>
+						<if test="showeditreason:|:$formData['extraData']['showReason']">
+							<li class='ipsField'>
+								<label for='post_edit_reason'><strong>{$this->lang->words['preason_for_edit']}</strong></label>
+								<p class='ipsField_content'>
+									<input type="text" name="post_edit_reason" id='post_edit_reason' value="{$formData['extraData']['reasonForEdit']}" size='30' maxlength='250' class='input_text' />
+								</p>
+							</li>
+						</if>
+					</ul>
+				</div>
+			</if>
+		</div>
+		<div class='ipsBox_container ipsLayout_content'>
+			<ul class='ipsForm ipsForm_vertical ipsPad'>
+				<if test="logged_in_check:|:!$this->memberData['member_id']">
+					<li class='ipsField'>
+						<label for='username' class='ipsField_title'>{$this->lang->words['guest_name']}</label>
+						<p class='ipsField_content'>
+							<input type='text' name='UserName' id='username' size='50' value='{$this->request['UserName']}' maxlength="{$this->settings['max_user_name_length']}" class='input_text' tabindex='0' />
+						</p>
+					</li>
+					<if test="guestCaptcha:|:$formData['captchaHTML']">
+						{$formData['captchaHTML']}
+					</if>
+				</if>
+				<if test="edit_title_check:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit' AND $formData['canEditTitle'] )">
+					<li class='ipsField ipsField_primary'>
+						<label for='topic_title' class='ipsField_title'>{$this->lang->words['topic_title']}</label>
+						<p class='ipsField_content'>
+							<input id='topic_title' class='input_text' type="text" size="60" maxlength="{$this->settings['topic_title_max_len']}" name="TopicTitle" value="{$formData['topicTitle']}" tabindex="0" />
+						</p>
+					</li>
+				</if>
+				<if test="edit_tags_check:|:$formData['formType'] == 'new' OR ( $formData['formType'] == 'edit')">
+					<if test="hazTag:|:$formData['tagBox']">
+						<li class='ipsField tag_field'>
+							<label for='ipbTags' class='ipsField_title'>{$this->lang->words['topic_tags']}</label>
+							<p class='ipsField_content'>{$formData['tagBox']}</p>
+						</li>
+					</if>
+				</if>
+		
+				<li class='ipsField ipsField_editor'>
+					<if test="statusMsgs:|:is_array($formData['statusMsg']) AND count($formData['statusMsg']) AND strlen($formData['statusMsg'][0])">
+						<div class='message'>{parse expression="implode( '<br />', $formData['statusMsg'])"}</div>
+					</if>
+					{$formData['editor']}
+				</li>				
+			</ul>
+			<if test="upload_form_check:|:$formData['uploadForm']">
+				<fieldset class='attachments'>
+					{$formData['uploadForm']}
+				</fieldset>
+			</if>
+		</div>
+		
+	</div>	
+	<fieldset class='submit clear'>
+		<input type='hidden' name='st' value='{$this->request['st']}' />
+		<input type='hidden' name='app' value='forums' />
+		<input type='hidden' name='module' value='post' />
+		<input type='hidden' name='section' value='post' />
+		<input type='hidden' name='do' value='{$form['doCode']}' />
+		<input type='hidden' name='s' value='{$this->member->session_id}' />
+		<input type='hidden' name='p' value='{$form['p']}' />
+		<input type='hidden' name='t' value='{$form['t']}' />
+		<input type='hidden' name='f' value='{$form['f']}' />
+		<input type='hidden' name='parent_id' value='{$form['parent']}' />
+		<input type='hidden' name='attach_post_key' value='{$form['attach_post_key']}' />
+		<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+		<input type='hidden' name='removeattachid' value='0' />
+		<input type='hidden' name='return' value='{$this->request['return']}' />
+		<input type='hidden' name='_from' value='{$this->request['_from']}' />
+		<input type="submit" name="dosubmit" value="{$formData['buttonText']}" tabindex="0" class="input_submit" accesskey="s"  />&nbsp;
+		<input type="submit" name="preview" value="{$this->lang->words['button_preview']}" tabindex="0" class="input_submit alt" />
+		{$this->lang->words['or']} <if test="cancelposting:|:$form['t']">
+				<a href='{parse url="showtopic={$form['t']}" template="showtopic" seotitle="{$formData['seoTopic']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+			<else />
+				<a href='{parse url="showforum={$form['f']}" template="showforum" seotitle="{$formData['seoForum']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+			</if>
+	</fieldset>
 </form>
-</div>	
 {$formData['topicSummary'][0]['html']}]]></template_content>
       <template_name>postFormTemplate</template_name>
       <template_data>$formData=array(), $form = array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2851,16 +2476,20 @@
 		{parse template="include_lightbox" group="global" params=""}
 	</if>
 	<h2 class='maintitle'>{$this->lang->words['post_preview']}</h2>
-	<div class='post_wrap' id='post_preview'>
-		<div class='row2' style='padding:8px'>
-			<div class='post entry-content'>{$data}</div>
+	<div class='post_block no_sidebar'>
+		<div class='post_wrap ipsBox' id='post_preview'>
+			<div class='ipsBox_container ipsPad'>
+				<div class='post_body'>
+					<div class='post entry-content'>{$data}</div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<br />
 </if>]]></template_content>
       <template_name>preview</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2876,20 +2505,23 @@
 <div id='topic_summary'>
 <if test="topicsummaryposts:|:is_array( $posts ) AND count( $posts )">
 	<foreach loop="posts:$posts as $pid => $data">
-		<div class='post_block topic_summary'>
-			<if test="$data['member_id']">
-				<h3><a href='{parse url="showuser={$data['member_id']}" base="public" seotitle="{$data['members_seo_name']}" template="showuser"}'>{$data['author']}</a>{parse template="user_popup" group="global" params="$data['member_id'],$data['members_seo_name']"}</h3>
-			<else />
-				<h3>{$data['author']}</h3>
-			</if>
-			<p class='posted_info'>{$this->lang->words['summary_posted']} {$data['date']}</p>
-			<div class='post_body'>
-				<if test="ignoringpost:|:isset( $data['_ignored'] ) && $data['_ignored'] == 1">
-					<div class='post'>{$this->lang->words['ignore_first_line']} {$data['members_display_name']}.</div>
+		<div class='post_block no_sidebar topic_summary'>
+			<div class='post_wrap'>
+				<if test="$data['member_id']">
+					<h3 class='row2'><a href='{parse url="showuser={$data['member_id']}" base="public" seotitle="{$data['members_seo_name']}" template="showuser"}'>{$data['author']}</a></h3>
 				<else />
-					<div class="post">{$data['post']}</div>
+					<h3 class='row2 guest'>{$data['author']}</h3>
 				</if>
+				<div class='post_body'>
+					<p class='posted_info'>{$this->lang->words['summary_posted']} {$data['date']}</p>
+					<if test="ignoringpost:|:isset( $data['_ignored'] ) && $data['_ignored'] == 1">
+						<div class='post'>{$this->lang->words['ignore_first_line']} {$data['members_display_name']}.</div>
+					<else />
+						<div class="post">{$data['post']}</div>
+					</if>
+				</div>
 			</div>
+			<br />
 		</div>
 	</foreach>
 </if>
@@ -2899,7 +2531,7 @@
 </div>]]></template_content>
       <template_name>topicSummary</template_name>
       <template_data>$posts=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2919,46 +2551,49 @@
 //|#^#]>
 </script>
 {parse js_module="attach"}
-<h3 class='bar'>{$this->lang->words['upload_title']}</h3>
-<!--SKINNOTE: traditional uploader needs this. -->
-<div id='attach_error_box' class='message error' style='display:none'></div>
-<input type='file' id='nojs_attach_{$id}_1' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
-<input type='file' id='nojs_attach_{$id}_2' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
+<div class='ipsPad'>
+	<div id='attach_error_box' class='message error' style='display:none'></div>
+	<input type='file' id='nojs_attach_{$id}_1' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
+	<input type='file' id='nojs_attach_{$id}_2' class='input_upload' name='FILE_UPLOAD' tabindex='1' />
 	
-<ul id='attachments'><li style='display: none'></li></ul>
-<br />
-<span id='buttonPlaceholder'></span>
-<input type='button' id='add_files_attach_{$id}' class='input_submit' value='{$this->lang->words['attach_selected']}' style='display: none; clear: both' tabindex='1' /> <span class='desc' id='space_info_attach_{$id}'>{parse expression="sprintf( $this->lang->words['used_space'], "{$stats['space_used_human']}", "{$stats['total_space_allowed_human']}", "{$stats['max_single_upload_human']}")"}</span>
-<if test="uploadformhelp:|:$this->settings['uploadFormType']">
-	<div class='message unspecific' style='margin: 15px 15px 0 15px'>
-		<h4>{$this->lang->words['attach_files_help']}</h4>
-		<p class='desc' id='help_msg'>		
-			<if test="flashuploadhelp:|:$this->memberData['member_uploader'] == 'flash'">
-				{$this->lang->words['select_several']}<br />
-				{$this->lang->words['trouble_uploading']} <a href='{parse url="app=core&amp;module=usercp&amp;hl=true" base="public"}' title='{$this->lang->words['switch']}' tabindex='1'>{$this->lang->words['switch_to_basic']}</a>
-			<else />
-				<a href='{parse url="app=core&amp;module=usercp&amp;hl=true" base="public"}' title='{$this->lang->words['switch']}' tabindex='1'>{$this->lang->words['switch_to_advanced']}</a>
-			</if>
-		</p>
+	<ul id='attachments'><li style='display: none'></li></ul>
+	
+	<div class='attach_controls'>
+		<h2 class='ipsType_subtitle'>{$this->lang->words['attach_header']}</h2>
+		<span id='buttonPlaceholder'></span>
+		<input type='button' id='add_files_attach_{$id}' class='ipsType_small ipsButton_secondary attach_button' value='{$this->lang->words['attach_selected']}' style='display: none; clear: both' tabindex='-1' />
+		&nbsp;&nbsp;<span class='desc ipsType_small' id='space_info_attach_{$id}'>{parse expression="sprintf( $this->lang->words['used_space'], "{$stats['space_used_human']}", "{$stats['total_space_allowed_human']}", "{$stats['max_single_upload_human']}")"}</span>
+		<if test="!IN_ACP AND $this->settings['uploadFormType']">
+			<p class='desc lighter ipsType_smaller' id='help_msg'>
+				<if test="flashuploadhelp:|:$this->memberData['member_uploader'] == 'flash'">
+					 {$this->lang->words['trouble_uploading']} <a href='#' data-switch='default' title='{$this->lang->words['switch']}' tabindex='1'>{$this->lang->words['switch_to_basic']}</a>
+				<else />
+					<a href='#' data-switch='flash' title='{$this->lang->words['switch']}' tabindex='-1'>{$this->lang->words['switch_to_advanced']}</a>
+				</if>
+			</p>
+		</if>
 	</div>
-</if>
+	
+</div>
 <script type='text/javascript'>
 //<!#^#|CDATA|
+	ipb.delegate.register("[data-switch]", function(e, elem){
+		ipb.attach.switchUploadType( elem.readAttribute('data-switch') );
+	});
+	
 	// Show the button and info
 	$('add_files_attach_{$id}').show();
 	$('space_info_attach_{$id}').show();
 	
-	var useType = 'simple';
+	var useType = 'default';
 	var uploadURL = ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attachiFrame&attach_rel_module={$type}&attach_rel_id={$id}&attach_post_key={$post_key}&forum_id={$forum_id}&attach_id=attach_{$id}&fetch_all=1";
-	if( jimAuld.utils.flashsniffer.meetsMinVersion(9) && ( ipb.vars['swfupload_enabled'] && ipb.vars['use_swf_upload'] ) )
+	if ( ipb.vars['use_swf_upload'] && ( jimAuld.utils.flashsniffer.meetsMinVersion( 9 ) && ( ipb.vars['swfupload_enabled'] ) ) )
 	{
 		useType = 'swf';
-		var uploadURL = "{parse url="app=core&module=attach&section=attach&do=attach_upload_process&attach_rel_module={$type}&attach_rel_id={$id}&attach_post_key={$post_key}&forum_id={$forum_id}" base="public"}";
-		
-		$('add_files_attach_{$id}').observe('mouseover', function(e){  } );
+		var uploadURL = "{parse url="app=core&module=attach&section=attach&do=attach_upload_process&attach_rel_module={$type}&attach_rel_id={$id}&attach_post_key={$post_key}&forum_id={$forum_id}&_nsc=1&s={$this->memberData['publicSessionID']}" base="public"}";
 	}
 	
-	ipb.attach.template = "<li id='ali_[id]' class='attach_row' style='display: none'><div><h4 class='attach_name'>[name]</h4><p class='info'>[info]</p><span class='img_holder'></span><p class='progress_bar'><span style='width: 0%'>0%</span></p><p class='links'><a href='#' class='add_to_post' title='{$this->lang->words['attach_button_title']}'>{$this->lang->words['attach_button']}</a> | <a href='#' class='cancel delete' title='{$this->lang->words['attach_delete_title']}'>{$this->lang->words['attach_delete']}</a></p></div></li>"; 
+	ipb.attach.template = "<li id='ali_[id]' class='attach_row' style='display: none'><div><h4 class='attach_name'>[name]</h4><p class='info'>[info]</p><span class='img_holder'></span><p class='progress_bar'><span style='width: 0%'>0%</span></p><p class='links'><a href='#' class='add_to_post' title='{$this->lang->words['attach_button_title']}' tabindex='-1'>{$this->lang->words['attach_button']}</a> | <a href='#' class='cancel delete' title='{$this->lang->words['attach_delete_title']}' tabindex='-1'>{$this->lang->words['attach_delete']}</a></p></div></li>"; 
 	document.observe('dom:loaded', function(){
 		ipb.attach.registerUploader( 'attach_{$id}', useType, 'attachments', {
 			'upload_url': uploadURL,
@@ -2972,106 +2607,7 @@
 </script>]]></template_content>
       <template_name>uploadForm</template_name>
       <template_data><![CDATA[$post_key="",$type="",$stats=array(),$id="",$forum_id=0]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_printpage">
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['tvo_title']}&nbsp;{$title}</h2>
-<p class='message unspecific'>{$this->lang->words['please_choose']}</p>
-<div class='generic_bar'></div>
-{parse striping="strip" classes="row1,row2"}
-<div class='post_form'>
-	<ul>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=printer&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_print_title']}</a></strong><br />{$this->lang->words['o_print_desc']}
-		</li>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=html&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_html_title']}</a></strong><br />{$this->lang->words['o_html_desc']}
-		</li>
-		<li class='field'>
-			<strong><a href="{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=wordr&amp;f={$fid}&amp;t={$tid}" base="public"}">{$this->lang->words['o_word_title']}</a></strong><br />{$this->lang->words['o_word_desc']}
-		</li>
-	</ul>
-	<p class='submit'>
-		<a href="{parse url="showtopic={$tid}" base="public"}" title='{$this->lang->words['back_topic']}'>{$this->lang->words['_laquo']} {$this->lang->words['back_topic']}</a>
-	</p>
-</div>]]></template_content>
-      <template_name>choose_form</template_name>
-      <template_data><![CDATA[$fid="",$tid="",$title=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<!--Copyright-->
-<if test="pagecopyright:|:$this->settings['ipb_copy_number'] == ''">
-<p id='copyright'>{$this->lang->words['powered_by']}Invision Power Board (http://www.invisionboard.com)<br />&copy; Invision Power Services (http://www.invisionpower.com)</p>
-</if>
-	</div>
-</body>
-</html>]]></template_content>
-      <template_name>pp_end</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset={$IPS_DOC_CHAR_SET}" />
-		<link rel="stylesheet" type="text/css" media="all" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_print.css" />
-		<title>{$this->settings['board_name']}</title>
-	</head>
-	<body id='ipboard_body'>
-	<div id="content">
-		<h2>{$topic_title} <a href="{parse url="showtopic={$tid}" base="public"}" title="{$this->lang->words['click_toview']}">{$this->lang->words['view_original']}</a></h2>
-		<div id='breadcrumb'>{$this->settings['board_name']} -> {$forum_name} -> {$topic_title}</div>
-		<br /><br />]]></template_content>
-      <template_name>pp_header</template_name>
-      <template_data><![CDATA[$forum_name="",$topic_title="",$topic_starter="",$fid="",$tid="",$IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content><![CDATA[<div class='post_block first hentry <if test="postqueued:|:$post['post']['queued']==1">moderated</if>' id='post_id_{$post['post']['pid']}'>
-	<div class='post_wrap'>
-		<h3>{$entry['members_display_name']}</h3>
-		<p class='posted_info'>
-			<if test="iconid:|:$post['post']['icon_id']">
-				<img src="{$this->settings['public_dir']}style_extra/post_icons/icon{$post['post']['icon_id']}.gif" alt="" />&nbsp;
-			</if>
-			{$this->lang->words['posted_prefix']} {$entry['post_date']}
-		</p>
-		<div class='post_body'>
-			<div class='post entry-content'>
-				{$entry['post']}
-				{$entry['attachmentHtml']}
-				<br />
-			</div>
-		</div>
-	</div>	
-</div>]]></template_content>
-      <template_name>pp_postentry</template_name>
-      <template_data><![CDATA[$poster="",$entry=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3081,45 +2617,35 @@
   <templategroup group="skin_topic">
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<h2 class='maintitle'>{$this->lang->words['announce_title']}: {$announce['announce_title']}</h2>
-<div class='generic_bar'></div>
-<div class='post_block first hentry announcement' id='announce_id_{$announce['announce_id']}'>
-	<div class='post_wrap'>
-		<if test="announceMid:|:$author['member_id']">
-			<h3>
-		<else />
-			<h3 class='guest'>
-		</if>
-				<if test="announceMember:|:$author['member_id']">
-					<if test="announceOnline:|:$author['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-							<span class="author vcard"><a class="url fn" href='{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}'>{$author['members_display_name']}</a>{parse template="user_popup" group="global" params="$author['member_id'],$author['members_seo_name']"}</span>
-				<else />
-					{$author['members_display_name']}
-				</if>
-			</h3>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="$author, 'announcement', array()"}
+      <template_content><![CDATA[<h3>{$this->lang->words['dlp_title']}</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		<h4 class='row2 ipsPad'><strong>{$this->lang->words['dlp_remove_from_view']}</strong></h4>
+		<div class='ipsPad ipsForm_center'>
+			{$this->lang->words['dlp_remove_from_view_desc']}<br />
+			<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlp_remove_from_view_extra']}</span><br /><br />
+			<form action='#{removeUrl}' method='POST'>
+				<input type='text' name='deleteReason' id='delPop_reason' value='' class='input_text' style='width: 60%' /> <input type='submit' class='input_submit' value='{$this->lang->words['dlp_remove']}' />
+			</form>
 		</div>
-		<div class='post_body'>
-			<div class='post entry-content'>
-				{$announce['announce_post']}
+	</div>
+	<if test="$this->registry->class_forums->canHardDeletePosts( $this->request['id'], $topic )">
+		<div class='ipsPad ipsForm_center' style='font-size: 32px'>
+			{$this->lang->words['dlp_or']}
+		</div>
+		<div class='ipsBox_container'>
+			<h4 class='row2 ipsPad'><strong>{$this->lang->words['dlp_delete_from_topic']}</strong></h4>
+			<div class='ipsPad ipsForm_center'>
+				{$this->lang->words['dlp_delete_from_topic_desc']}</br />
+				<span class='desc lighter ipsType_smaller'>{$this->lang->words['dlp_delete_from_topic_extra']}</span><br /><br />
+				<input type='button' class='input_submit' onclick="window.location='#{permaUrl}';" value='{$this->lang->words['dlp_delete_now']}' />
 			</div>
 		</div>
-		<ul class='post_controls'>
-			<if test="canmanage:|:$this->memberData['g_is_supmod'] == 1">
-				<li class='post_edit'><a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modEditAnnouncement&amp;do=edit&amp;announce_id={$announce['announce_id']}" base="public"}' title='{$this->lang->words['post_edit_announce']}' class='edit_post'>{parse replacement="edit_post_icon"} {$this->lang->words['post_edit_announce']}</a></li>
-			</if>
-		</ul>
-	</div>			
+	</if>
 </div>]]></template_content>
-      <template_name>announcement_show</template_name>
-      <template_data><![CDATA[$announce="",$author=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_name>ajax__deletePost</template_name>
+      <template_data/>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3127,15 +2653,59 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<ul>
-	<li>
-			{$post['depthguide']} <span<if test="buildThreaded:|:isset( $post['_show_highlight'] ) && $post['_show_highlight']"> class='highlight'</if>>{parse replacement="{$post['new_post']}"} <strong>{$post['linked_name']}</strong> <span class='post_title'><a href="{parse url="showtopic={$post['topic_id']}&amp;pid={$post['pid']}&amp;start={$this->request['start']}&amp;st={$this->request['st']}#entry{$post['pid']}" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}">{$post['post_title']}</a></span> &nbsp;&nbsp;<span class='desc'>{$post['formatted_date']}</span></span>
-			{$child}
+      <template_content><![CDATA[<ul class='ipbmenu_content'>	
+	<li class='clearfix'>
+		<a href='#' data-clicklaunch='ignoreUsersSig' data-scope='ipb.topic' data-id="{$post['member_id']}">{parse expression="sprintf( $this->lang->words['ignore_userx_signature'], $post['members_display_name'] )"}</a>
+	</li>
+	<li class='clearfix'>
+		<a href='#' data-clicklaunch='ignoreUsersSig' data-scope='ipb.topic' data-id="all">{$this->lang->words['ignore_all_signatures']}</a>
 	</li>
 </ul>]]></template_content>
-      <template_name>build_threaded</template_name>
-      <template_data>$post, $child, $topic</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_name>ajaxSigCloseMenu</template_name>
+      <template_data>$post</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[{parse js_module="topic"}
+<h1 class='ipsType_pagetitle'>{$this->lang->words['announce_title']}: {$announce['announce_title']}</h1>
+<br />
+<h2 class='maintitle'>{$this->lang->words['posted_by']} 
+	<if test="announceMember:|:$author['member_id']">
+		<span class="author vcard"><a class="url fn" href='{parse url="showuser={$author['member_id']}" template="showuser" seotitle="{$author['members_seo_name']}" base="public"}'>{$author['members_display_name']}</a></span>
+	<else />
+		{$author['members_display_name']}
+	</if>
+</h2>
+<div class='post_block first hentry announcement' id='announce_id_{$announce['announce_id']}'>
+	<div class='post_wrap'>
+		<br />
+		<div class='author_info'>
+			{parse template="userInfoPane" group="global" params="$author, 'announcement', array()"}
+		</div>
+		<div class='post_body'>
+			<div class='post entry-content'>
+				{$announce['announce_post']}
+			</div>
+			<ul class='post_controls clear clearfix'>
+				<if test="canmanage:|:$this->memberData['g_is_supmod'] == 1">
+					<li class='post_edit'><a class='ipsButton_secondary' href='{parse url="app=core&amp;module=modcp&amp;tab=announcements&amp;fromapp=forums&amp;_do=edit&amp;announce_id={$announce['announce_id']}" base="public"}' title='{$this->lang->words['post_edit_announce']}' class='edit_post'>{$this->lang->words['post_edit_announce']}</a></li>
+				</if>
+			</ul>
+		</div>
+	</div>			
+</div>
+<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
+{parse template="include_lightbox" group="global" params=""}
+</if>
+{parse template="include_highlighter" group="global" params="1"}]]></template_content>
+      <template_name>announcement_show</template_name>
+      <template_data><![CDATA[$announce="",$author=""]]></template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3145,7 +2715,10 @@
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<if test="fbAppIdPresent:|:$this->settings['fbc_appid']">
 <if test="checkAccess:|:$this->registry->getClass('class_forums')->guestCanSeeTopic($this->request['f'], $this->settings['fbc_bot_group'])">
-<div class='facebook-like'><fb:like href="{$this->registry->getClass('output')->fetchRootDocUrl()}" layout="standard" show_faces="false" width="450" action="like" colorscheme="light" /></div>
+<br />
+<div class='left facebook-like'>
+	<fb:like href="{$this->registry->getClass('output')->fetchRootDocUrl()}" layout="standard" show_faces="false" width="450" action="like" colorscheme="light" />
+</div>
 <div id="fb-root"></div>
 <script>
   window.fbAsyncInit = function() {
@@ -3163,7 +2736,38 @@
 </if>]]></template_content>
       <template_name>hookFacebookLike</template_name>
       <template_data/>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[{parse js_module="like"}
+<div class='__like right' data-app="{$data['app']}" data-area="{$data['area']}" data-relid="{$relId}" data-isfave="{$data['iLike']}">
+	{parse template="likeSummaryContents" group="topic" params="$data, $relId, $opts"}
+</div>
+<script type="text/javascript">
+	var FAVE_TEMPLATE = new Template( "<h3>{parse expression="sprintf( $this->lang->words['unset_fave_title'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}</h3><div class='ipsPad'><span class='desc'>{parse expression="sprintf( $this->lang->words['unset_fave_words'], $this->lang->words['like_un' . $data['vernacular'] ])"}</span><br /><p class='ipsForm_center'><input type='button' value='{parse expression="sprintf( $this->lang->words['unset_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}' class='input_submit _funset' /></p></div>");
+</script>]]></template_content>
+      <template_name>likeSummary</template_name>
+      <template_data>$data, $relId, $opts</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<span class='ipsButton_extra right <if test="$data['totalCount']">_fmore clickable</if>' title='{parse expression="sprintf( $this->lang->words['like_totalcount_' . $data['vernacular'] ], $data['totalCount'] )"}' data-tooltip="{parse expression="sprintf( $this->lang->words['like_totalcount_' . $data['vernacular'] ], $data['totalCount'] )"}"><img src='{$this->settings['img_url']}/icon_users.png' /> <strong>{$data['totalCount']}</strong></span>
+<if test="likeOnlyMembers:|:$this->memberData['member_id']">
+	<a href='#' title="<if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['fave_tt_on'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['fave_tt_off'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if>" class='ftoggle ipsButton_secondary'><if test="$data['iLike']">{parse expression="sprintf( $this->lang->words['unset_fave_button'], $this->lang->words['like_ucfirst_un' . $data['vernacular'] ])"}<else />{parse expression="sprintf( $this->lang->words['set_fave_button'], $this->lang->words['like_ucfirst_' . $data['vernacular'] ])"}</if></a>
+</if>]]></template_content>
+      <template_name>likeSummaryContents</template_name>
+      <template_data>$data, $relId, $opts=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3173,7 +2777,7 @@
       <template_group>skin_topic</template_group>
       <template_content><![CDATA[<script type='text/javascript'>
 //<!#^#|CDATA|
-	ipb.templates['poll_voters'] = new Template("<h3 class='bar'>{$this->lang->words['poll_voted_for']} #{title}</h3><div class='general_box'>#{content}</div>");
+	ipb.templates['poll_voters'] = new Template("<h3 class='bar'>{$this->lang->words['poll_voted_for']} #{title}</h3><div class='ipsPad'>#{content}</div>");
 //|#^#]>
 </script>
 <div class='general_box alt poll' id='poll_{$poll['pid']}'>
@@ -3208,7 +2812,7 @@
 											var users = "";
 											
 											<foreach loop="poll_voters:$choiceData['voters'] as $id => $member">
-												users += "<a href='{parse url="showuser={$member['member_id']}" base="public" seotitle="{$member['members_seo_name']}" template="showuser"}'>{$member['members_colored_name']}</a> {parse template="user_popup" group="global" params="$member['member_id'],$member['members_seo_name']"}<if test="lastVoter:|:$member['_last'] == 0">, </if>";
+												users += "<a href='{parse url="showuser={$member['member_id']}" base="public" seotitle="{$member['members_seo_name']}" template="showuser"}'>{$member['members_colored_name']}</a><if test="lastVoter:|:$member['_last'] == 0">, </if>";
 											</foreach>
 											ipb.topic.poll[ $questionID ][ $choiceID ] = { name: "{$choiceData['choice']}", users: users};
 										</script>
@@ -3228,13 +2832,10 @@
 					</ol>
 				</if>
 			</div>
-			<script type='text/javascript'>
-				Debug.dir( ipb.topic.poll );
-			</script>
 		</foreach>
 		<fieldset class='submit'>
 			<legend>{$this->lang->words['poll_vote']}</legend>
-			<if test="voteButton:|:$topicData['state'] != 'closed' AND $forumData['status']">
+			<if test="voteButton:|:$topicData['state'] != 'closed'">
 				<if test="voteButtonMid:|:$this->memberData['member_id']">
 					<if test="voteButtonVoted:|:$poll['_memberVoted']">
 						<if test="deleteVote:|:$this->settings['poll_allow_vdelete'] OR $this->memberData['g_is_supmod']">
@@ -3269,14 +2870,200 @@
 				</if>
 			</if>
 			<if test="editPoll:|:$editPoll">
-				<a href='{parse url="app=forums&amp;module=post&amp;section=post&amp;do=edit_post&amp;f={$poll['forum_id']}&amp;t={$poll['tid']}&amp;p={$topicData['topic_firstpost']}" base="publicWithApp"}' title='{$this->lang->words['poll_edit']}' class='input_submit alt' >{parse replacement="edit_post_icon"} {$this->lang->words['poll_edit']}</a>
+				<a href='{parse url="app=forums&amp;module=post&amp;section=post&amp;do=edit_post&amp;f={$poll['forum_id']}&amp;t={$poll['tid']}&amp;p={$topicData['topic_firstpost']}" base="publicWithApp"}' title='{$this->lang->words['poll_edit']}' class='input_submit alt' >{$this->lang->words['poll_edit']}</a>
 			</if>
 		</fieldset>
 	</form>
 </div>]]></template_content>
       <template_name>pollDisplay</template_name>
       <template_data>$poll, $topicData, $forumData, $pollData, $showResults, $editPoll=1</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_topic</template_group>
+      <template_content><![CDATA[<!--post:{$post['post']['pid']}-->
+<if test="sDeleted:|:$post['post']['_isDeleted'] AND $post['post']['_softDeleteSee']">
+	{parse template="softDeletedPostBit" group="topic" params="$post, $displayData['sdData'], $topic"}
+</if>
+<if test="sDeletedNot:|:! $post['post']['_isDeleted']">
+	<div class='post_block hentry clear clearfix <if test="postQueued:|:$post['post']['_isHidden']">moderated</if>' id='post_id_{$post['post']['pid']}'>
+		<a id='entry{$post['post']['pid']}'></a>
+		<if test="repIgnored:|:!empty( $post['post']['_repignored'] ) AND $post['post']['_repignored'] == 1 && $post['post']['_ignored'] != 1">
+			<div class='post_ignore'>
+				<if test="noRep:|:$post['post']['rep_points'] == 0">
+					<span class='reputation zero' title='{$this->lang->words['top_rep']}'>
+				</if>
+				<if test="posRep:|:$post['post']['rep_points'] > 0">
+					<span class='reputation positive' title='{$this->lang->words['top_rep']}'>
+				</if>
+				<if test="negRep:|:$post['post']['rep_points'] < 0">
+					<span class='reputation negative' title='{$this->lang->words['top_rep']}' >
+				</if>
+						{$post['post']['rep_points']}</span> {$this->lang->words['top_this_post_by']} <a href='{parse url="showuser={$post['author']['member_id']}" base="public"}'>{$post['author']['members_display_name']}</a> {$this->lang->words['top_below_thresh']}. <a href='#' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+			</div>
+		</if>
+	
+		<if test="userIgnored:|:$post['post']['_repignored'] == 1 || $post['post']['_ignored']">
+			<div class='post_ignore'>
+				<if test="userIgnoredLang:|:$post['post']['_repignored'] == 1">{$this->lang->words['post_ignored_rep']}<else />{$this->lang->words['post_ignored']}</if> <a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>. <a href='#entry{$post['post']['pid']}' title='{$this->lang->words['ignore_view_post']}' style='display: none' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
+				<if test="userIgnoredLangTwo:|:$this->settings['reputation_enabled'] AND $post['post']['_repignored'] == 1"><div><a href="{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;rep_filter_set=*&amp;rep_filter=update&amp;secure_key={$this->member->form_hash}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['post_ignore_reset_rep']}</a></div></if>
+			</div>
+		</if>
+		<div class='post_wrap' <if test="isNotIgnoring:|:$post['post']['_ignored'] == 1 || $post['post']['_repignored'] == 1">style='display: none'</if>>
+			<if test="postMid:|:$post['author']['member_id']">
+				<h3 class='row2'>
+			<else />
+				<h3 class='guest row2'>
+			</if>
+				<if test="postModCheckbox:|:$this->memberData['is_mod']">
+					<span class='right'>
+						<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod right'<if test="postModSelected:|:!empty( $post['post']['_pid_selected'] )"> checked='checked'</if> />
+					</span>
+				</if>
+				<span class='post_id right ipsType_small desc blend_links'><a href='{parse url="showtopic={$post['post']['topic_id']}&amp;view=findpost&amp;p={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' rel='bookmark' title='{$this->lang->words['link_to_post']} #{$post['post']['post_count']}'>#{$post['post']['post_count']}</a></span>
+				<if test="postMember:|:$post['author']['member_id']">
+					<span class="author vcard">{parse template="userHoverCard" group="global" params="$post['author']"}</span>
+				<else />
+					{$post['author']['members_display_name']}
+				</if>
+			
+				<if test="postIp:|:$post['post']['_show_ip']">
+					<span class='ip right ipsType_small'>({$this->lang->words['ip']}:
+					<if test="postAdmin:|:$post['author']['g_access_cp']">
+						<em>{$this->lang->words['ip_private']}</em>
+					<else />
+						<if test="accessModCP:|:$this->memberData['g_is_supmod']"><a href="{parse url="app=core&amp;module=modcp&amp;fromapp=members&amp;tab=iplookup&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a><else />{$post['post']['ip_address']}</if>
+					</if>)
+					</span>
+				</if>
+			</h3>
+			<div class='author_info'>
+				{parse template="userInfoPane" group="global" params="$post['author'], $post['post']['pid'], array( 'isTopicView' => true )"}
+			</div>
+			<div class='post_body'>
+				<p class='posted_info desc lighter ipsType_small'>
+					{$this->lang->words['posted']} <abbr class="published" title="{parse expression="date( 'c', $post['post']['post_date'] )"}">{parse date="$post['post']['post_date']" format="long"}</abbr>
+				</p>
+				<if test="repHighlight:|:$this->settings['reputation_highlight'] AND $post['post']['rep_points'] >= $this->settings['reputation_highlight']">
+					<p class='rep_highlight'>{parse replacement="popular_post"}<br />{$this->lang->words['popular_post']}</p>
+				</if>
+				<div class='post entry-content <if test="$post['post']['_repignored'] == 1">imgsize_ignore</if>'>
+					{$post['post']['post']}
+					{$post['post']['attachmentHtml']}
+					<br />
+					<if test="postEditBy:|:$post['post']['edit_by']">
+						<p class='edit'>
+							{$post['post']['edit_by']}
+							<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
+								<br />
+								<span class='reason'>{$post['post']['post_edit_reason']}</span>
+							</if>
+						</p>
+					</if>
+				</div>
+				{parse template="repButtons" group="global_other" params="$post['author'], array_merge( array( 'primaryId' => $post['post']['pid'], 'domLikeStripId' => 'like_post_' . $post['post']['pid'], 'domCountId' => 'rep_post_' . $post['post']['pid'], 'app' => 'forums', 'type' => 'pid', 'likeFormatted' => $post['post']['like']['formatted'] ), $post['post'] )"}
+				<if test="postSignature:|:$post['post']['signature']">
+					{$post['post']['signature']}
+				</if>
+			
+				<ul class='post_controls clear clearfix'>
+					<li class='top hide'><a href='#ipboard_body' class='top' title='{$this->lang->words['back_top']}'>{$this->lang->words['back_top']}</a></li>
+					<if test="replyButton:|:$post['post']['_canReply']">
+						<li><a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}"  class='_ips_trigger_quote ipsButton_secondary' pid="{$post['post']['pid']}" title="{$this->lang->words['tt_reply_to_post']}">{$this->lang->words['post_reply']}</a></li>
+						<if test="multiquote:|:!empty( $post['post']['_mq_selected'] )">
+							<li class='selected multiquote' id='multiq_{$post['post']['pid']}' style='display: none'>
+						<else />
+							<li class='multiquote' id='multiq_{$post['post']['pid']}' style='display: none'>
+						</if>
+							<a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['quote_with_mq']}" class='ipsButton_secondary'>{$this->lang->words['mq']}</a>
+						</li>
+					</if>
+					<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
+						<li class='post_edit'><a href='{parse url="module=post&amp;section=post&amp;do=edit_post&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}" base="publicWithApp"}' title='{$this->lang->words['post_edit_title']}' class='edit_post' id='edit_post_{$post['post']['pid']}'>{$this->lang->words['post_edit']}</a></li>
+					</if>
+					<if test="canDelete:|:$post['post']['_can_delete'] === TRUE OR $post['post']['_softDelete']">
+						<li class='post_del' id='del_post_{$post['post']['pid']}'>
+							<a href='{parse url="module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=delete&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;selectedpids[]={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='delete_post'>{$this->lang->words['post_delete']}</a>
+						</li>
+					</if>
+					<if test="approvePost:|:$this->memberData['is_mod']">
+						<li class='post_toggle toggle_post' id='toggle_post_{$post['post']['pid']}' style='display: none'>
+							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=<if test="!$post['post']['queued']">unapprove<else />approve</if>&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;t={$topic['tid']}&amp;f={$forum['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['post_toggle_visible']}'><span id='toggletext_post_{$post['post']['pid']}'><if test="approveUnapprove:|:$post['post']['queued']==1">{$this->lang->words['post_approve']}<else />{$this->lang->words['post_unapprove']}</if></span></a>
+						</li>
+					</if>
+					<if test="hasblog:|:$this->settings['blog_allow_bthis'] AND $this->memberData['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $post['post']['_canReply']">
+						<li>
+							<a href='{parse url="app=blog&amp;blog_this=forums&amp;id1={$this->request['t']}&amp;id2={$post['post']['pid']}" base="public"}'>{$this->lang->words['blog_this']}</a>
+						</li>
+					</if>
+					<if test="canReportPost:|:$topic['_canReport'] and ( $this->memberData['member_id'] )">
+						<li class='report'>
+							<a href='{parse url="app=core&amp;module=reports&amp;rcom=post&amp;tid={$this->request['t']}&amp;pid={$post['post']['pid']}&amp;st={$this->request['st']}" base="public"}'>{$this->lang->words['report']}</a>
+						</li>
+						<if test="postIsReported:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
+							<li class='report'>
+								<a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}" id='post-report-{$post['post']['pid']}' class='ipbmenu'> <span id="rstat-{$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}"><img src="{$this->settings['img_url']}/reports/post_alert_{$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['gfx']}.png" alt="" /></span> </a>
+							</li>
+						</if>
+					</if>
+				</ul>
+				<if test="reportedPostData:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
+					<ul id='post-report-{$post['post']['pid']}_menucontent' class='ipbmenu_content report_menu'>
+						<li><a href="{parse url="app=core&amp;module=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}" base="public"}" id='report_mark_{$post['post']['pid']}'><img src='{$this->settings['img_url']}/reports/mark_complete.png' alt='' /> {$this->lang->words['report_menu_mark_complete']}</a></li>
+						<li><a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}"><img src='{$this->settings['img_url']}/reports/view_report.png' alt='' /> {$this->lang->words['report_menu_view_report']}</a></li>
+					</ul>
+					<script type="text/javascript">
+						$('report_mark_{$post['post']['pid']}').observe('click',
+						 	ipb.global.updateReportStatus.bindAsEventListener( 	
+								this, {$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']},2,2
+							)
+						);
+					</script>
+				</if>	
+			</div>
+		</div>
+	</div>
+</if>
+		
+		<if test="initIgnoredPost:|:$post['post']['_repignored'] == 1 || $post['post']['_ignored']">
+			<script type='text/javascript'>
+				ipb.topic.setPostHidden( {$post['post']['pid']} );
+				$('unhide_post_{$post['post']['pid']}').show();
+			</script>
+		</if>
+		<hr />
+		
+		<if test="adCodeCheck:|:$post['post']['_adCode']">
+			{$post['post']['_adCode']}
+		</if>
+<script type="text/javascript">
+var pid = parseInt({$post['post']['pid']});
+if ( pid > ipb.topic.topPid ){
+	ipb.topic.topPid = pid;
+}
+<if test="sDeletedNotMQ:|:! $post['post']['_isDeleted']">
+	// Show multiquote for JS browsers
+	if ( $('multiq_{$post['post']['pid']}') )
+	{
+		$('multiq_{$post['post']['pid']}').show();
+	}
+	
+	if( $('toggle_post_{$post['post']['pid']}') )
+	{
+		$('toggle_post_{$post['post']['pid']}').show();
+	}
+	
+	// Add perm data
+	ipb.topic.deletePerms[{$post['post']['pid']}] = { 'canDelete' : {parse expression="intval($post['post']['_can_delete'])"}, 'canSoftDelete' : {parse expression="intval($post['post']['_softDelete'])"} };
+</if>
+</script>]]></template_content>
+      <template_name>post</template_name>
+      <template_data>$post, $displayData, $topic, $forum=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3292,13 +3079,13 @@
 			{$post['edit_by']}
 			<if test="editReasonQe:|:$post['post_edit_reason'] != ''">
 				<br />
-				<span class='reason'>{$this->lang->words['reason_for_edit']}: {$post['post_edit_reason']}</span>
+				<span class='reason'>{$this->lang->words['reason_for_edit']} {$post['post_edit_reason']}</span>
 			</if>
 		</p>
 	</if>]]></template_content>
       <template_name>quickEditPost</template_name>
       <template_data>$post</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3306,38 +3093,11 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<div>
-	<h3>{$this->lang->words['rep_given']}</h3>
-	<div class='general_box' style='min-height: 60px'>
-		<if test="empty($reps)">
-			<em>{$this->lang->words['no_rep']}</em>
-		<else />
-			<foreach loop="$reps as $r">
-				<if test="$r['rep_rating'] > 0">
-					{parse replacement="rep_up"}
-				<else />
-					{parse replacement="rep_down"}
-				</if>
-				 <a href='{parse url="showuser={$r['member']['member_id']}" base="public" template="showuser" seotitle="{$r['member']['members_seo_name']}"}'>{$r['member']['members_display_name']}</a><br />
-			</foreach>
-		</if>
-	</div>
-</div>]]></template_content>
-      <template_name>reputationPopup</template_name>
-      <template_data>$reps</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<div id='attach_wrap' class='rounded clearfix'>
-	<h4>$title</h4>
+      <template_content><![CDATA[<div id='attach_wrap' class=''>
+	<h4>{$title}</h4>
 	<ul>
 		<foreach loop="attach:$data as $file">
-			<li class='<if test="attachType:|:$type == 'attach'">clear</if>'>
+			<li class='<if test="attachType:|:$type == 'attach'">attachment</if>'>
 				{$file}
 			</li>
 		</foreach>
@@ -3345,7 +3105,7 @@
 </div>]]></template_content>
       <template_name>show_attachment_title</template_name>
       <template_data><![CDATA[$title="",$data="",$type=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3353,12 +3113,12 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}"><img src="{$this->settings['public_dir']}{$data['mime_image']}" alt="{$this->lang->words['attached_file']}" /></a>
-&nbsp;<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}">{$data['attach_file']}</a> <span class='desc'><strong>({$data['file_size']})</strong></span>
-<br /><span class="desc info">{$this->lang->words['attach_hits']}: {$data['attach_hits']}</span>]]></template_content>
+      <template_content><![CDATA[<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}"><img src="{$this->settings['public_dir']}<if test="hasmime:|:$data['mime_image']">{$data['mime_image']}<else />style_extra/mime_types/unknown.gif</if>" alt="{$this->lang->words['attached_file']}" /></a>
+&nbsp;<a href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}"><strong>{$data['attach_file']}</strong></a> &nbsp;&nbsp;<span class='desc'><strong>{$data['file_size']}</strong></span>
+&nbsp;&nbsp;<span class="desc lighter">{$data['attach_hits']} {$this->lang->words['attach_hits']}</span>]]></template_content>
       <template_name>Show_attachments</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3366,10 +3126,10 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<img src="{$this->settings['upload_url']}/$file_name" class='bbc_img linked-image' alt="{$this->lang->words['pic_attach']}: {$file_name}" />]]></template_content>
+      <template_content><![CDATA[<a class='resized_img' rel='lightbox[{$data['attach_rel_id']}]' id='ipb-attach-url-{$data['_attach_id']}' href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module={$data['type']}&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['location']} - {$this->lang->words['attach_size']} {$data['file_size']}, {$this->lang->words['attach_ahits']} {$data['attach_hits']}"><img src="{$this->settings['upload_url']}/{$data['o_location']}" class='bbc_img linked-image' alt="{$this->lang->words['pic_attach']}: {$data['location']}" /></a>]]></template_content>
       <template_name>Show_attachments_img</template_name>
-      <template_data><![CDATA[$file_name=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data>$data=array()</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3380,7 +3140,7 @@
       <template_content><![CDATA[<a class='resized_img' rel='lightbox[{$data['attach_rel_id']}]' id='ipb-attach-url-{$data['_attach_id']}' href="{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module={$data['type']}&amp;attach_id={$data['attach_id']}" base="public"}" title="{$data['location']} - {$this->lang->words['attach_size']} {$data['file_size']}, {$this->lang->words['attach_ahits']} {$data['attach_hits']}"><img src="{$this->settings['upload_url']}/{$data['t_location']}" id='ipb-attach-img-{$data['_attach_id']}' style='width:{$data['t_width']};height:{$data['t_height']}' class='attach' width="{$data['t_width']}" height="{$data['t_height']}" alt="{$this->lang->words['pic_attach']}: {$data['location']}" /></a>]]></template_content>
       <template_name>Show_attachments_img_thumb</template_name>
       <template_data>$data=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3396,38 +3156,33 @@
 	<a id='entry{$post['post']['pid']}'></a>
 	<div class='post_wrap'>
 		<if test="postMid:|:$post['author']['member_id']">
-			<h3>
+			<h3 class='row2'>
 		<else />
-			<h3 class='guest'>
+			<h3 class='row2 guest'>
 		</if>
-				<span class='post_id'>
-					<if test="postModCheckbox:|:$this->memberData['is_mod'] OR $this->memberData['g_is_supmod']">
-						<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod'<if test="postModSelected:|:isset( $post['post']['_pid_selected'] ) && $post['post']['_pid_selected']"> checked='checked'</if> />
-					</if>
+			<if test="postModCheckbox:|:$this->memberData['is_mod'] OR $this->memberData['g_is_supmod']">
+				<span class='post_id right'>
+					<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod'<if test="postModSelected:|:!empty( $post['post']['_pid_selected'] )"> checked='checked'</if> />
 				</span>
+			</if>
 				<if test="postMember:|:$post['author']['member_id']">
-					<if test="postOnline:|:$post['author']['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-						<span class="author vcard"><a class="url fn" href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}</span>
+						<span class="author vcard"><a class="url fn" href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a></span>
 				<else />
 					{$post['author']['members_display_name']}
 				</if>
 				<if test="postIp:|:$post['post']['_show_ip']">
-					<span class='ip'>({$this->lang->words['ip']}:
+					<span class='ip right ipsType_small'>({$this->lang->words['ip']}:
 					<if test="postAdmin:|:$post['author']['g_access_cp']">
 						<em>{$this->lang->words['ip_private']}</em>
 					<else />
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a>
+						<a href="{parse url="app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=forums&amp;_do=submit&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a>
 					</if>
 					)</span>
 				</if>
 			</h3>
-		<div class='post_body' id='postsDelete_{$post['post']['pid']}'>
+		<div class='post_body' id='postsDelete_{$post['post']['pid']}' style='margin-left: 0;'>
 			<div class='post entry-content' style='padding:10px'>
-				{$this->lang->words['post_deleted_by']} <a href='{parse url="showuser={$_sD['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$_sM['members_seo_name']}"}'>{$_sM['members_display_name']}</a>{parse template="user_popup" group="global" params="$_sM['member_id'], $_sM['members_seo_name']"} {$this->lang->words['on']} {parse date="$_sD['sdl_obj_date']" format="long"}.
+				{$this->lang->words['post_deleted_by']} <a href='{parse url="showuser={$_sD['sdl_obj_member_id']}" base="public" template="showuser" seotitle="{$_sM['members_seo_name']}"}'>{$_sM['members_display_name']}</a> {$this->lang->words['on']} {parse date="$_sD['sdl_obj_date']" format="long"}.
 				<if test="showReason:|:$post['post']['_softDeleteReason']">
 					<p class='desc'><if test="$_sD['sdl_obj_reason']">{$_sD['sdl_obj_reason']}<else />{$this->lang->words['no_reason_given']}</if></p>
 				</if>
@@ -3462,30 +3217,30 @@
 			</div>
 		</div>
 		</if>
+		<if test="sdOptions:|:$post['post']['_softDeleteContent'] OR $post['post']['_softDeleteRestore']">
+			<ul class='post_controls clear clearfix'>
+				<if test="$post['post']['_softDeleteRestore']">
+					<li class='post_toggle sd_restore' id='restoreContent_{$post['post']['pid']}'>
+						<a class='ipsButton_secondary' href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=sundelete&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;pid={$post['post']['pid']}&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;nr=1" base="public"}'><span>{$this->lang->words['sdpost_restore']}</span></a>
+					</li>
+				</if>
+				<if test="$post['post']['_can_delete']">
+					<li>
+						<a class='ipsButton_secondary' href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;pid={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;nr=1" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='sd_remove'>{$this->lang->words['sdpost_remove']}</a>
+					</li>
+				</if>
+				<if test="$post['post']['_softDeleteContent']">
+					<li class='post_toggle sd_content' id='seeContent_{$post['post']['pid']}'>
+						<a href='#'><span>{$this->lang->words['togglepostcontent']}</span></a>
+					</li>
+				</if>
+			</ul>
+		</if>
 	</div>
-	<if test="sdOptions:|:$post['post']['_softDeleteContent'] OR $post['post']['_softDeleteRestore']">
-		<ul class='post_controls'>
-			<if test="$post['post']['_softDeleteContent']">
-				<li class='post_toggle sd_content' id='seeContent_{$post['post']['pid']}'>
-					<a href='#'>{parse replacement="edit_post_icon"} <span>{$this->lang->words['togglepostcontent']}</span></a>
-				</li>
-			</if>
-			<if test="$post['post']['_softDeleteRestore']">
-				<li class='post_toggle sd_restore' id='restoreContent_{$post['post']['pid']}'>
-					<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=sundelete&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;pid={$post['post']['pid']}&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;auth_key={$this->member->form_hash}&amp;nr=1" base="public"}'>{parse replacement="reply_post_icon"} <span>{$this->lang->words['sdpost_restore']}</span></a>
-				</li>
-			</if>
-			<if test="$post['post']['_can_delete']">
-				<li>
-					<a href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;pid={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;nr=1" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='sd_remove'>{parse replacement="delete_post_icon"} {$this->lang->words['sdpost_remove']}</a>
-				</li>
-			</if>
-		</ul>
-	</if>
 </div>]]></template_content>
       <template_name>softDeletedPostBit</template_name>
       <template_data>$post, $sdData, $topic</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3493,46 +3248,32 @@
     </template>
     <template>
       <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<div>
-	<h3><a id="tid-link-{$topic['tid']}" href="{parse url="showtopic={$topic['tid']}" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}">{$topic['topic_title']}</a></h3>
-	<div class='general_box' id='topicPreview' style='min-height: 60px'>
-		<if test="count( $posts ) > 1">
-			<ol class='tab_bar no_title mini'>
-				<if test="count( $posts['search'] )"><li id='tab_link_search_{$topic['_key']}' class='tab_toggle clickable active'>{$this->lang->words['tg_search']}</li></if>
-				<li id='tab_link_first_{$topic['_key']}' class='tab_toggle <if test="! count( $posts['search'] )">active</if> clickable'>{$this->lang->words['tg_first']}</li>
-				<if test="count( $posts['unread'] )"><li id='tab_link_unread_{$topic['_key']}' class='tab_toggle clickable'>{$this->lang->words['tg_unread']}</li></if>
-				<if test="count( $posts['last'] )"><li id='tab_link_last_{$topic['_key']}' class='tab_toggle clickable'>{$this->lang->words['tg_last']}</li></if>
-			</ol>
-			<div style='padding-top:5px;'>
-		<else />
-			<div>
-		</if>
-		<foreach loop="$posts as $t => $post">
-			<div id='tab_content_{$t}_{$topic['_key']}' class='tab_toggle_content<if test="!$post['_isVisible']"> moderated</if>' style='height:120px;overflow:auto;<if test="( count( $posts['search'] ) AND $t != 'search' ) OR ( ! count( $posts['search'] ) AND $t != 'first')">display:none;</if>'>
-				<if test="$post['member_id']">
-					<img src='{$post['pp_thumb_photo']}' width='{$post['pp_thumb_width']}' height='{$post['pp_thumb_height']}' class='photo left' style='margin:0px 6px 2px 0px' />
-				</if>
-				<p class='desc' style='padding-bottom:7px;'>
-					<a href='{parse url="showuser={$post['member_id']}" base="public" template="showuser" seotitle="{$post['members_seo_name']}"}'>{$post['members_display_name']}</a>
-					&middot; <a href="{parse url="findpost={$post['pid']}" base="public"}">{parse date="$post['post_date']" format="long"}</a>
-				</p>
-				{$post['post']}
-			</div>
-		</foreach>
-		</div>
-		<div class='desc clear' style='padding-top:6px'>
-			<if test="$topic['_unreadPosts']">
-				{$topic['_unreadPosts']} {$this->lang->words['newpoststp']} &middot; <a href='{parse url="showtopic={$topic['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}'>{$this->lang->words['tg_go_last_post']}</a>
-			</if>
-		</div>
+      <template_content><![CDATA[<foreach loop="$posts as $t => $post">
+	<a href='{parse url="showuser={$post['member_id']}" base="public" template="showuser" seotitle="{$post['members_seo_name']}"}' class='ipsUserPhotoLink left'>
+		<img src='{$post['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_medium' />
+	</a>
+	<div class='preview_col'>
+		<p class='preview_info'>
+			<strong><a href='{parse url="showuser={$post['member_id']}" base="public" template="showuser" seotitle="{$post['members_seo_name']}"}'>{$post['members_display_name']}</a></strong> <if test="$t != 'search'">{$this->lang->words['tg_madethe']} <a href="{parse url="showtopic={$post['tid']}&amp;findpost={$post['pid']}" seotitle="{$post['title_seo']}" template="showtopic" base="public"}">{$this->lang->words['tg_'.$t]}</a><else />{$this->lang->words['tg_'.$t]}</if>
+		</p>
+		{$post['post']}
 	</div>
-</div>
-<script type="text/javascript">
-	ipb.global.initTabs();
-</script>]]></template_content>
+	<br class='clear' />
+</foreach>
+<br class='clear' />
+<a href='{parse url="showtopic={$topic['tid']}" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}' class='ipsButton'>{$this->lang->words['tg_gototopic']}</a>
+<if test="! $topic['_lastRead'] OR $topic['_unreadPosts']">
+	&nbsp;&nbsp;<span class='desc'>
+		<if test="$topic['_unreadPosts']">
+			{$topic['_unreadPosts']} {$this->lang->words['newpoststp']}
+			&middot; <a href='{parse url="showtopic={$topic['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}'>{$this->lang->words['tg_go_last_post']}</a>
+		</if>
+		<a data-clicklaunch="topicMarkRead" data-tid="{$topic['tid']}" href="{parse url="showtopic={$topic['tid']}&amp;view=getnewpost" base="public" template="showtopic" seotitle="{$topic['title_seo']}"}"><if test="$topic['_unreadPosts']">&middot; </if>{$this->lang->words['mark_topic_read']}</a>
+	</span>
+</if>]]></template_content>
       <template_name>topicPreview</template_name>
       <template_data>$topic, $posts</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3544,15 +3285,16 @@
 {parse js_module="rating"}
 </if>
 {parse js_module="topic"}
-{parse js_module="editor"}
 <script type="text/javascript">
 //<!#^#|CDATA|
 	ipb.topic.inSection = 'topicview';
 	ipb.topic.topic_id  = {$topic['tid']};
 	ipb.topic.forum_id  = {$forum['id']};
 	ipb.topic.start_id  = {parse expression="intval($this->request['st'])"};
-	// Editor JS: Only needs to be done once per page
-	{parse template="editorJS" group="editors" params=""}
+	ipb.topic.topPid    = 0;
+	ipb.topic.counts    = { postTotal: {parse expression="intval($topic['posts']+1)"},
+							curStart:  ipb.topic.start_id,
+							perPage:   {parse expression="intval($this->settings['display_max_posts'])"} };
 	//Search Setup
 	ipb.vars['search_type']			= 'forum';
 	ipb.vars['search_type_id']		= {$forum['id']};
@@ -3569,93 +3311,63 @@
 <if test="disablelightbox:|:!$this->settings['disable_lightbox']">
 {parse template="include_lightbox" group="global" params=""}
 </if>
-<if test="showForumRulesInline:|:$forum['show_rules'] == 2">
-<div class='message unspecific'>
-<h3>{$forum['rules_title']}</h3>
-{$forum['rules_text']}
-</div>
-</if>
-<if test="showForumRulesLink:|:$forum['show_rules'] == 1">
-<div class='message unspecific'>
-	<a href='{parse url="app=forums&amp;module=forums&amp;section=rules&amp;f={$forum['id']}" base="public"}' title='{$this->lang->words['show_forum_rules']}'><strong>{$forum['rules_title']}</strong></a>
-</div>
-</if>
-<if test="topicHasBeenDeleted:|:$topic['_isDeleted']">
-<div class='message error'>
-	<h3>{$this->lang->words['dlp_topic_has_deleted_title']}</h3>
-	{$this->lang->words['dlp_topic_has_deleted_desc']}
-	<div>
-		<if test="tbdRestore:|:$topic['permissions']['TopicSoftDeleteRestore']">
-			<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=sundelete" base="public"}' title='{$this->lang->words['dl_ths_restore']}'>{$this->lang->words['dl_ths_restore']}</a>
-		</if>
-		<if test="tbdRestore:|:$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum['id'] ]['delete_topic']">
-			&middot; <a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum['id']}&amp;st={$this->request['st']}&amp;t={$topic['tid']}&amp;auth_key={$this->member->form_hash}&amp;do=03" base="public"}' title='{$this->lang->words['dl_ths_delete']}'>{$this->lang->words['dl_ths_delete']}</a>
-		</if>
-	</div>
-</div>
-<br />
-</if>
-<if test="isNotThreadedMode:|:$displayData['threaded_mode_enabled'] == 0">
-	<div class='topic_controls'>
-		{$topic['SHOW_PAGES']}
-		<ul class='topic_buttons'>
-			<if test="newTopicButton:|:$forum['_user_can_post']">
-				<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum['id']}" base="publicWithApp"}' title='{$this->lang->words['start_new_topic']}' accesskey='n'>{parse replacement="topic_icon"} {$this->lang->words['start_new_topic']}</a></li>
+{$displayData['follow_data']}
+<a href='{parse url="showuser={$topic['_starter']['member_id']}" seotitle="{$topic['_starter']['members_seo_name']}" template="showuser" base="public"}' class='ipsUserPhotoLink'>
+	<img src='{$topic['_starter']['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_medium left' />
+</a>
+<div class='ipsBox_withphoto'>
+	<if test="topicRating:|:$forum['forum_allow_rating']">
+		<span class='rating ipsType_smaller'>
+			<if test="$topic['_allow_rate']">
+				<strong>{$this->lang->words['js_rate_me']}</strong>&nbsp;&nbsp;
+			</if>
+			<if test="$topic['_allow_rate']">
+				<a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=1&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_1' title='{$this->lang->words['top_js_1star']}'>
+			</if>
+			<if test="rate1:|:$topic['_rate_int'] >= 1">
+				{parse replacement="rate_on"}
 			<else />
-				<li class='disabled'><span>{$this->lang->words['top_cannot_start']}</span></li>
+				{parse replacement="rate_off"}
 			</if>
-			<if test="closedButton:|:$displayData['reply_button']['image'] == 'locked'">
-				<li class='closed'>
-					<if test="pollOnly:|:$topic['_poll_only']">
-						<if test="closedButtonLink:|:$displayData['reply_button']['url']">
-							<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only_reply']}</a>
-						<else />
-							<span>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only']}</span>
-						</if>
-					<else />
-						<if test="closedButtonLink:|:$displayData['reply_button']['url']">
-							<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_locked_reply']}</a>
-						<else />
-							<span>{parse replacement="lock_icon"} {$this->lang->words['top_locked']}</span>
-						</if>
-					</if>
-				</li>
+			<if test="$topic['_allow_rate']">
+				</a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=2&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_2' title='{$this->lang->words['top_js_2star']}'>
+			</if>
+			<if test="rate2:|:$topic['_rate_int'] >= 2">
+				{parse replacement="rate_on"}
 			<else />
-				<if test="replyButton:|:$displayData['reply_button']['image']">
-					<if test="replyButtonLink:|:$displayData['reply_button']['url']">
-						<li><a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r'>{parse replacement="{$displayData['reply_button']['image']}_icon"} {$this->lang->words['topic_add_reply']}</a></li>
-					<else />
-						<li class='disabled'><span>{$this->lang->words['top_cannot_reply']}</span></li>
-					</if>
-				</if>
+				{parse replacement="rate_off"}
 			</if>
-			<if test="watchWrapper:|:$this->memberData['member_id']">
-				<li>
-					<if test="isWatching:|:$this->settings['cpu_watch_update'] AND $topic['trackingTopic']">
-						<a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchTopics&amp;do=saveIt&amp;authKey={$this->member->form_hash}&amp;topicIDs[{$topic['tid']}]=1&amp;trackchoice=unsubscribe&amp;topicReturn={$topic['tid']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['topic_stop_watching']}'>{parse replacement="watch_topic_off"}&nbsp;&nbsp;{$this->lang->words['topic_stop_watching']}</a>
-					<else />
-						<a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=watch&amp;watch=topic&amp;do=list&amp;tid={$topic['tid']}" base="public"}' title='{$this->lang->words['tt_title']}'>{parse replacement="watch_topic_on"}&nbsp;&nbsp;{$this->lang->words['tt_title']}</a>
-					</if>
-				</li>
+			<if test="$topic['_allow_rate']">
+				</a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=3&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_3' title='{$this->lang->words['top_js_3star']}'>
 			</if>
-		</ul>	
-	</div>
-</if>
-<div class='topic hfeed'>
-	<h2 class='maintitle'>
-		<span class='main_topic_title'>
-			{$topic['title']}
-			<if test="topicDescription:|:$topic['description']">
-				<span class='desc main_topic_desc'>{$topic['description']}</span>
+			<if test="rate3:|:$topic['_rate_int'] >= 3">
+				{parse replacement="rate_on"}
+			<else />
+				{parse replacement="rate_off"}
 			</if>
-		</span>
-		<if test="topicRating:|:$forum['forum_allow_rating']">
-			<span class='rating'>{$this->lang->words['js_rate_me']}
-				<a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=1&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_1' title='{$this->lang->words['top_js_1star']}'><if test="rate1:|:$topic['_rate_int'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=2&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_2' title='{$this->lang->words['top_js_2star']}'><if test="rate2:|:$topic['_rate_int'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=3&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_3' title='{$this->lang->words['top_js_3star']}'><if test="rate3:|:$topic['_rate_int'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=4&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_4' title='{$this->lang->words['top_js_4star']}'><if test="rate4:|:$topic['_rate_int'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=5&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_5' title='{$this->lang->words['top_js_5star']}'><if test="rate5:|:$topic['_rate_int'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a>
-				<span id='rating_text'>
-					<if test="hasRates:|:$topic['topic_rating_hits'] > 0"><span id='rating_hits'>{$topic['topic_rating_hits']}</span> {$this->lang->words['poll_s_votes']}</if>
-					<if test="youRated:|:$topic['_rating_value'] != -1"> ({$this->lang->words['topic_poll_your_vote']} <span id='your_rate'>{$topic['_rating_value']}</span>)</if>
-				</span>
+			<if test="$topic['_allow_rate']">
+				</a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=4&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_4' title='{$this->lang->words['top_js_4star']}'>
+			</if>
+			<if test="rate4:|:$topic['_rate_int'] >= 4">
+				{parse replacement="rate_on"}
+			<else />
+				{parse replacement="rate_off"}
+			</if>
+			<if test="$topic['_allow_rate']">
+				</a><a href='{parse url="app=forums&amp;module=extras&amp;section=rating&amp;t={$topic['tid']}&amp;rating=5&amp;secure_key={$this->member->form_hash}" base="public"}' id='topic_rate_5' title='{$this->lang->words['top_js_5star']}'>
+			</if>
+			<if test="rate5:|:$topic['_rate_int'] >= 5">
+				{parse replacement="rate_on"}
+			<else />
+				{parse replacement="rate_off"}
+			</if>
+			<if test="$topic['_allow_rate']">
+				</a>
+			</if>
+			<span id='rating_text'>
+				<if test="hasRates:|:$topic['topic_rating_hits'] > 0"><span id='rating_hits'>{$topic['topic_rating_hits']} {$this->lang->words['poll_s_votes']}</span></if>
+			</span>
+			<if test="$topic['_allow_rate']">
 				<script type='text/javascript'>
 				//<!#^#|CDATA|
 					rating = new ipb.rating( 'topic_rate_', { 
@@ -3668,11 +3380,109 @@
 									  } );
 				//|#^#]>
 				</script>
-			</span>
+			</if>
+		</span>
+	</if>
+	<h1 class='ipsType_pagetitle'>
+		{$topic['title']}
+	</h1>
+	<div class='desc lighter blend_links'>
+		 {$this->lang->words['started_by']} {parse template="userHoverCard" group="global" params="$topic['_starter']"}, {parse date="$topic['start_date']" format="SHORT"}
+	</div>
+	<if test="hasTags:|:is_array($topic['tags'])">
+		{$topic['tags']['formatted']['parsedWithoutComma']}
+		<br />
+	</if>
+</div>
+<if test="topicHasBeenDeleted:|:$topic['_isDeleted']">
+	<br />
+	<div class='message error'>
+		{$this->lang->words['dlp_topic_has_deleted_desc']}
+		&nbsp;&nbsp;
+		<if test="tbdRestore:|:$topic['permissions']['TopicSoftDeleteRestore']">
+			<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;do=sundelete" base="public"}' title='{$this->lang->words['dl_ths_restore']}' class='ipsButton_secondary'>{$this->lang->words['dl_ths_restore']}</a>
 		</if>
-	</h2>
+		<if test="tbdRestore:|:$this->memberData['g_is_supmod'] == 1 || $this->memberData['forumsModeratorData'][ $forum['id'] ]['delete_topic']">
+			<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;f={$forum['id']}&amp;st={$this->request['st']}&amp;t={$topic['tid']}&amp;auth_key={$this->member->form_hash}&amp;do=09" base="public"}' title='{$this->lang->words['dl_ths_delete']}' class='ipsButton_secondary'>{$this->lang->words['dl_ths_delete']}</a>
+		</if>
+	</div>
+</if>
+<br />
+<div class='topic_controls'>
+	{$topic['SHOW_PAGES']}
+	<ul class='topic_buttons'>
+		<if test="closedButton:|:$displayData['reply_button']['image'] == 'locked'">
+			<li class='important'>
+				<if test="pollOnly:|:isset($displayData['poll_data']['poll']['poll_only']) && $displayData['poll_data']['poll']['poll_only']">
+					<if test="closedButtonLink:|:$displayData['reply_button']['url']">
+						<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only_reply']}</a>
+					<else />
+						<span>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only']}</span>
+					</if>
+				<else />
+					<if test="closedButtonLink:|:$displayData['reply_button']['url']">
+						<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_locked_reply']}</a>
+					<else />
+						<span>{parse replacement="lock_icon"} {$this->lang->words['top_locked']}</span>
+					</if>
+				</if>
+			</li>
+		<else />
+			<if test="replyButton:|:$displayData['reply_button']['image']">
+				<if test="replyButtonLink:|:$displayData['reply_button']['url']">
+					<li><a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r'>{$this->lang->words['topic_add_reply']}</a></li>
+				<else />
+					<li class='disabled'><span>{$this->lang->words['top_cannot_reply']}</span></li>
+				</if>
+			</if>
+		</if>
+		<if test="topicDescription:|:$topic['hasUnreadPosts'] AND $topic['posts']">
+			<li class='non_button'><a href='{parse url="showtopic={$topic['tid']}&amp;view=getnewpost" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' title='{$this->lang->words['first_unread_post']}'>{$this->lang->words['go_to_first_unread']}</a></li>
+		</if>
+	</ul>	
+</div>
+
+<div class='maintitle clear clearfix'>
+	<span class='ipsType_small'>
+		<if test="$topic['posts']">
+			{parse expression="sprintf( ( $topic['posts'] > 1 ) ? $this->lang->words['x_replies_to_topic'] : $this->lang->words['x_reply_to_topic'], $topic['posts'] )"}
+		<else />
+			{$this->lang->words['no_replies_to_topic']}
+		</if>
+	</span>
+	<if test="reputationFilter:|:$this->settings['reputation_enabled'] && $this->settings['reputation_point_types'] != 'like' && $this->settings['reputation_show_content'] && $this->memberData['member_id'] != 0 && is_array($this->caches['reputation_levels'])">
+		<a href='#rep_filter_menucontent' id='rep_filter' class='right ipsType_smaller'>
+			<if test="repFilterDefault:|:$this->memberData['_members_cache']['rep_filter'] && $this->memberData['_members_cache']['rep_filter'] === '*'">
+				{$this->lang->words['rep_f_viewing_all']}
+			<else />
+				{parse expression="sprintf( $this->lang->words['rep_f_hiding'], $this->memberData['_members_cache']['rep_filter'] )"}
+			</if>
+			<img src='{$this->settings['img_url']}/useropts_arrow.png' />
+		</a>
+	</if>	
+</div>
+<if test="reputationFilter:|:$this->settings['reputation_enabled'] && $this->settings['reputation_point_types'] != 'like' && $this->settings['reputation_show_content'] && $this->memberData['member_id'] != 0 && is_array($this->caches['reputation_levels'])">
+	<ul id='rep_filter_menucontent' class='ipbmenu_content with_checks' style='display: none'>
+		<li <if test="optSelectStar:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $this->memberData['_members_cache']['rep_filter'] === '*'">class='selected'</if>>
+			<a href='{parse url="app=forums&amp;module=forums&amp;section=topics&amp;rep_filter=update&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;secure_key={$this->member->form_hash}&amp;st={$this->request['st']}&amp;rep_filter_set=*" base="public"}'>{$this->lang->words['rep_f_all_posts']}</a>
+		</li>
+		<if test="repFilterOptions:|:is_array($this->caches['reputation_levels'])">
+			<foreach loop="reputation_levels:$this->caches['reputation_levels'] as $k => $v">
+				<li <if test="optRepFilterSelected:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $v['level_points'] == $this->memberData['_members_cache']['rep_filter']">class='selected'</if>>
+					<a href='{parse url="app=forums&amp;module=forums&amp;section=topics&amp;rep_filter=update&amp;f={$topic['forum_id']}&amp;t={$topic['tid']}&amp;secure_key={$this->member->form_hash}&amp;st={$this->request['st']}&amp;rep_filter_set={$v['level_points']}" base="public"}' rel='nofollow'>
+						{$this->lang->words['rep_f_hide']} <strong>{$v['level_points']} {$this->lang->words['rep_f_points']}</strong>
+					</a>
+				</li>
+			</foreach>
+		</if>
+	</ul>
+	<script type='text/javascript'>
+		new ipb.Menu( $('rep_filter'), $('rep_filter_menucontent') );
+	</script>
+</if>
+<div class='topic hfeed clear clearfix'>
 	
-	{$displayData['poll_data']}
+	{$displayData['poll_data']['html']}
 	
 	<if test="startModForm:|:$displayData['mod_links']">
 		<if test="weAreMod:|:$this->memberData['is_mod'] OR $this->memberData['member_id'] == $topic['starter_id']">
@@ -3692,485 +3502,104 @@
 	</if>
 	
 <if test="hasPosts:|:is_array( $post_data ) AND count( $post_data )">
-<!-- skinnote: Posts by ignored users are not hidden, check _ignored -->
-	<foreach loop="post_data:$post_data as $post">
-		<!--Begin Msg Number {$post['post']['pid']}-->
-		<if test="sDeleted:|:$post['post']['_isDeleted'] AND $post['post']['_softDeleteSee']">
-			{parse template="softDeletedPostBit" group="topic" params="$post, $displayData['sdData'], $topic"}
-		</if>
-		<if test="sDeletedNot:|:! $post['post']['_isDeleted']">
-		<div class='post_block hentry clear <if test="postQueued:|:$post['post']['_isHidden']">moderated</if> <if test="reputation:|:$this->settings['reputation_enabled']">with_rep</if>' id='post_id_{$post['post']['pid']}'>
-			<a id='entry{$post['post']['pid']}'></a>
-			<if test="repIgnored:|:( isset( $post['post']['_repignored'] ) AND isset($post['post']['_ignored']) ) AND $post['post']['_repignored'] == 1 && $post['post']['_ignored'] != 1">
-				<div class='post_ignore'>
-					<if test="noRep:|:$post['post']['rep_points'] == 0">
-						<span class='reputation zero' title='{$this->lang->words['top_rep']}'>
-					</if>
-					<if test="posRep:|:$post['post']['rep_points'] > 0">
-						<span class='reputation positive' title='{$this->lang->words['top_rep']}'>
-					</if>
-					<if test="negRep:|:$post['post']['rep_points'] < 0">
-						<span class='reputation negative' title='{$this->lang->words['top_rep']}' >
-					</if>
-							{$post['post']['rep_points']}</span> {$this->lang->words['top_this_post_by']} <a href='{parse url="showuser={$post['author']['member_id']}" base="public"}'>{$post['author']['members_display_name']}</a> {parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"} {$this->lang->words['top_below_thresh']}. <a href='#' title='{$this->lang->words['ignore_view_post']}' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
-				</div>
-			</if>
-			
-			<if test="userIgnored:|:$post['post']['_repignored'] == 1 || $post['post']['_ignored']">
-				<div class='post_ignore'>
-					<if test="userIgnoredLang:|:$post['post']['_repignored'] == 1">{$this->lang->words['post_ignored_rep']}<else />{$this->lang->words['post_ignored']}</if> <a href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a> {parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}. <a href='#entry{$post['post']['pid']}' title='{$this->lang->words['ignore_view_post']}' style='display: none' id='unhide_post_{$post['post']['pid']}'>{$this->lang->words['rep_view_anyway']}</a>
-					<if test="userIgnoredLangTwo:|:$this->settings['reputation_enabled'] AND $post['post']['_repignored'] == 1"><div><a href="{parse url="showtopic={$post['post']['topic_id']}&amp;st={$this->request['st']}&amp;rep_filter_set=*&amp;rep_filter=update&amp;secure_key={$this->member->form_hash}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}">{$this->lang->words['post_ignore_reset_rep']}</a></div></if>
-				</div>
-			</if>
-			<div class='post_wrap' <if test="isNotIgnoring:|:$post['post']['_ignored'] == 1 || $post['post']['_repignored'] == 1">style='display: none'</if>>
-				<if test="postMid:|:$post['author']['member_id']">
-					<h3>
-				<else />
-					<h3 class='guest'>
-				</if>
-						<span class='post_id'><a href='{parse url="showtopic={$post['post']['topic_id']}&amp;view=findpost&amp;p={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' rel='bookmark' title='{$this->lang->words['link_to_post']} #{$post['post']['post_count']}'>#{$post['post']['post_count']}</a></span>
-						<if test="postMember:|:$post['author']['member_id']">
-							<if test="postOnline:|:$post['author']['_online']">
-								{parse replacement="user_online"}
-							<else />
-								{parse replacement="user_offline"}
-							</if> &nbsp;
-								<span class="author vcard"><a class="url fn" href='{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}'>{$post['author']['members_display_name']}</a>{parse template="user_popup" group="global" params="$post['author']['member_id'], $post['author']['members_seo_name']"}</span>
-						<else />
-							{$post['author']['members_display_name']}
-						</if>
-						<if test="postIp:|:$post['post']['_show_ip']">
-							<span class='ip'>({$this->lang->words['ip']}:
-							<if test="postAdmin:|:$post['author']['g_access_cp']">
-								<em>{$this->lang->words['ip_private']}</em>
-							<else />
-								<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom&amp;ip={$post['post']['ip_address']}" base="public"}" title='{$this->lang->words['info_about_this_ip']}'>{$post['post']['ip_address']}</a>
-							</if>
-							)</span>
-						</if>
-					</h3>
-				<div class='author_info'>
-					{parse template="userInfoPane" group="global" params="$post['author'], $post['post']['pid'], array()"}
-				</div>
-				<div class='post_body'>
-					<p class='posted_info'>
-						<if test="postModCheckbox:|:$this->memberData['is_mod']">
-							<label for='checkbox_{$post['post']['pid']}' class='post_mod hide'>{$this->lang->words['mod_select_post']}</label><input type='checkbox' id='checkbox_{$post['post']['pid']}' name='selectedpids[]' value='{$post['post']['pid']}' class='post_mod'<if test="postModSelected:|:isset( $post['post']['_pid_selected'] ) && $post['post']['_pid_selected']"> checked='checked'</if> />
-						</if>
-						<if test="postIcon:|:$post['post']['icon_id']">
-							<img src="{$this->settings['public_dir']}style_extra/post_icons/icon{$post['post']['icon_id']}.gif" alt="" />&nbsp;
-						</if>
-						{$this->lang->words['posted']} <abbr class="published" title="{parse expression="date( 'c', $post['post']['post_date'] )"}">{parse date="$post['post']['post_date']" format="long"}</abbr>
-					</p>
-					<if test="repHighlight:|:$this->settings['reputation_highlight'] AND $post['post']['rep_points'] >= $this->settings['reputation_highlight']">
-						<p class='rep_highlight'>{parse replacement="popular_post"}<br />{$this->lang->words['popular_post']}</p>
-						<!-- <if test="repHighlight:|:$this->settings['reputation_highlight'] AND $post['post']['rep_points'] >= $this->settings['reputation_highlight']">rep_highlight</if>  -->
-					</if>
-					<div class='post entry-content <if test="$post['post']['_repignored'] == 1">imgsize_ignore</if>'>
-						{$post['post']['post']}
-						{$post['post']['attachmentHtml']}
-						<br />
-						<if test="postEditBy:|:$post['post']['edit_by']">
-							<p class='edit'>
-								{$post['post']['edit_by']}
-								<if test="postEditByReason:|:$post['post']['post_edit_reason'] != ''">
-									<br />
-									<span class='reason'>{$this->lang->words['reason_for_edit']} {$post['post']['post_edit_reason']}</span>
-								</if>
-							</p>
-						</if>
-					</div>
-					<if test="postSignature:|:$post['post']['signature']">
-						{$post['post']['signature']}
-					</if>
-				</div>
-			<if test="reputationBox:|:$this->settings['reputation_enabled']">
-				<if test="canRep:|:!( $this->settings['reputation_protected_groups'] && in_array( $post['author']['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) )">
-				<div class='rep_bar clear right' id='rep_post_{$post['post']['pid']}'>
-				
-				{parse variable="canViewRep" default="" oncondition="$this->memberData['gbw_view_reps']" value="onclick='ipb.topic.repPopUp( this, {$post['post']['pid']} );'"}
-				{parse variable="repClickable" default="" oncondition="$this->memberData['gbw_view_reps']" value=" clickable"}
-				
-				<if test="hasNoRep:|:$post['post']['rep_points'] == 0">
-					<span class='reputation zero rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {parse variable="canViewRep"}>
-				</if>
-				<if test="hasPosRep:|:$post['post']['rep_points'] > 0">
-					<span class='reputation positive rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {parse variable="canViewRep"}>
-				</if>
-				<if test="hasNegRep:|:$post['post']['rep_points'] < 0">
-					<span class='reputation negative rep_show{parse variable="repClickable"}' title='{$this->lang->words['reputation']}' {parse variable="canViewRep"}>
-				</if>
-						{$post['post']['rep_points']}
-					</span>
-					<if test="hasNotGivenRep:|:$post['post']['has_given_rep'] != 1 AND $post['post']['has_given_rep'] != -1 AND $this->memberData['member_id'] != 0 && ( $this->settings['reputation_can_self_vote'] OR $post['author']['member_id'] != $this->memberData['member_id'] )">
-						<ul>
-						<if test="giveRepUp:|:$this->settings['reputation_point_types'] == 'positive' || $this->settings['reputation_point_types'] == 'both'">
-							<li><a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate=forums&amp;type=pid&amp;type_id={$post['post']['pid']}&amp;rating=1&amp;secure_key={$this->member->form_hash}&amp;post_return={$post['post']['pid']}' class='rep_up' title='{$this->lang->words['reputation_up']}'>{parse replacement="rep_up"}</a></li>
-						</if>
-						<if test="giveRepDown:|:$this->settings['reputation_point_types'] == 'negative' || $this->settings['reputation_point_types'] == 'both'">
-							<li><a href='{$this->settings['base_url']}app=core&amp;module=global&amp;section=reputation&amp;do=add_rating&amp;app_rate=forums&amp;type=pid&amp;type_id={$post['post']['pid']}&amp;rating=-1&amp;secure_key={$this->member->form_hash}&amp;post_return={$post['post']['pid']}' class='rep_down' title='{$this->lang->words['reputation_down']}'>{parse replacement="rep_down"}</a></li>
-						</if>
-						</ul>
-					</if>
-				</div>
-				</if>
-				<script type='text/javascript'>
-					ipb.global.registerReputation( 'rep_post_{$post['post']['pid']}', { app: 'forums', type: 'pid', typeid: '{$post['post']['pid']}' }, parseInt('{$post['post']['rep_points']}') );
-				</script>
-			</if>
-				<ul class='post_controls'>
-					<if test="canReportPost:|:($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-						<li class='report'>
-							<a href='{parse url="app=core&amp;module=reports&amp;rcom=post&amp;tid={$this->request['t']}&amp;pid={$post['post']['pid']}&amp;st={$this->request['st']}" base="public"}'>{parse replacement="report_post_icon"} {$this->lang->words['report']}</a>
-						</li>
-						<if test="postIsReported:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
-							<li class='report'>
-								<a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}" id='post-report-{$post['post']['pid']}' class='ipbmenu'> <span id="rstat-{$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}"><img src="{$this->settings['img_url']}/reports/post_alert_{$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['gfx']}.png" alt="" /></span> </a>
-							</li>
-						</if>
-					</if>
-					<if test="hasblog:|:$this->settings['blog_allow_bthis'] AND $this->memberData['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $displayData['reply_button']['url']">
-						<li class='report'>
-							<a href='{parse url="app=blog&amp;blog_this=forums&amp;id1={$this->request['t']}&amp;id2={$post['post']['pid']}" base="public"}'>{parse replacement="blog_link"} {$this->lang->words['blog_this']}</a>
-						</li>
-					</if>
-					<li class='top hide'><a href='#top' class='top' title='{$this->lang->words['back_top']}'>{$this->lang->words['back_top']} of the page up there ^</a></li>
-					
-					<if test="replyButton:|:$displayData['reply_button']['image'] AND $displayData['reply_button']['url']">
-						<if test="multiquote:|:isset( $post['post']['_mq_selected'] ) && $post['post']['_mq_selected']">
-							<li class='selected multiquote' id='multiq_{$post['post']['pid']}' style='display: none'>
-						<else />
-							<li class='multiquote' id='multiq_{$post['post']['pid']}' style='display: none'>
-						</if>
-						<a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['quote_with_mq']}">{parse replacement="mq_post_icon"} {$this->lang->words['mq']}</a>
-						</li>
-						<li><a href="{parse url="module=post&amp;section=post&amp;do=reply_post&amp;f={$this->request['f']}&amp;t={$this->request['t']}&amp;qpid={$post['post']['pid']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{parse replacement="reply_post_icon"} {$this->lang->words['post_reply']}</a></li>
-					</if>
-					<if test="canEdit:|:$post['post']['_can_edit'] === TRUE">
-						<li class='post_edit'><a href='{parse url="module=post&amp;section=post&amp;do=edit_post&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}" base="publicWithApp"}' title='{$this->lang->words['post_edit_title']}' class='edit_post' id='edit_post_{$post['post']['pid']}'>{parse replacement="edit_post_icon"} {$this->lang->words['post_edit']}</a></li>
-					</if>
-					<if test="canDelete:|:$post['post']['_can_delete'] === TRUE OR $post['post']['_softDelete']">
-						<li class='post_del' id='del_post_{$post['post']['pid']}'>
-							<a href='{parse url="module=moderate&amp;section=moderate&amp;do=04&amp;f={$forum['id']}&amp;t={$topic['tid']}&amp;p={$post['post']['pid']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['post_delete_title']}' class='delete_post'>{parse replacement="delete_post_icon"} {$this->lang->words['post_delete']}</a>
-						</li>
-					</if>
-					<!-- Matt: Approve / unapprove post button -->
-					<if test="approvePost:|:$this->memberData['is_mod']">
-						<li class='post_toggle toggle_post' id='toggle_post_{$post['post']['pid']}' style='display: none'>
-							<a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=postchoice&amp;tact=unapprove&amp;selectedpids[{$post['post']['pid']}]={$post['post']['pid']}&amp;t={$topic['tid']}&amp;f={$forum['id']}&amp;auth_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['post_toggle_visible']}'><if test="approveUnapprove:|:$post['post']['queued']==1">{parse replacement="approve"}<else />{parse replacement="deny"}</if> <span id='toggletext_post_{$post['post']['pid']}'><if test="approveUnapprove:|:$post['post']['queued']==1">{$this->lang->words['post_approve']}<else />{$this->lang->words['post_unapprove']}</if></span></a>
-						</li>
-					</if>
-				</ul>
-				<script type='text/javascript'>
-					// Show multiquote for JS browsers
-					if ( $('multiq_{$post['post']['pid']}') )
-					{
-						$('multiq_{$post['post']['pid']}').show();
-					}
-					
-					if( $('toggle_post_{$post['post']['pid']}') )
-					{
-						$('toggle_post_{$post['post']['pid']}').show();
-					}
-					
-					// Add perm data
-					ipb.topic.deletePerms[{$post['post']['pid']}] = { 'canDelete' : {parse expression="intval($post['post']['_can_delete'])"}, 'canSoftDelete' : {parse expression="intval($post['post']['_softDelete'])"} };
-				</script>
-				<if test="reportedPostData:|:$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['gfx'] > 0">
-					<ul id='post-report-{$post['post']['pid']}_menucontent' class='ipbmenu_content report_menu'>
-						<li><a href="{parse url="app=core&amp;module=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][ $post['post']['pid'] ]['info']['id']}" base="public"}" id='report_mark_{$post['post']['pid']}'><img src='{$this->settings['img_url']}/reports/mark_complete.png' alt='' /> {$this->lang->words['report_menu_mark_complete']}</a></li>
-						<li><a href="{$this->settings['base_url']}app=core&amp;module=reports&amp;section=reports&amp;do=show_report&amp;rid={$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']}"><img src='{$this->settings['img_url']}/reports/view_report.png' alt='' /> {$this->lang->words['report_menu_view_report']}</a></li>
-					</ul>
-					<script type="text/javascript">
-						$('report_mark_{$post['post']['pid']}').observe('click',
-						 	ipb.global.updateReportStatus.bindAsEventListener( 	
-								this, {$this->memberData['_cache']['report_temp']['post_marker']['post'][$post['post']['pid']]['info']['id']},2,2
-							)
-						);
-					</script>
-				</if>
-			</div>		
+	<div class='ipsBox'>
+		<div class='ipsBox_container' id='ips_Posts'>
+			<foreach loop="post_data:$post_data as $post">
+				{parse template="post" group="topic" params="$post, $displayData, $topic, $forum"}
+			</foreach>
 		</div>
-		</if>
-		
-		<if test="initIgnoredPost:|:$post['post']['_repignored'] == 1 || $post['post']['_ignored']">
-			<script type='text/javascript'>
-				ipb.topic.setPostHidden( {$post['post']['pid']} );
-				$('unhide_post_{$post['post']['pid']}').show();
-			</script>
-		</if>
-		<hr />
-		
-		<if test="adCodeCheck:|:$post['post']['_adCode']">
-			{$post['post']['_adCode']}
-		</if>
-		<if test="endFirstPost:|:$post['post']['_end_first_post']">
-			<!-- END OF FIRST POST IN LINEAR+, SHOW BUTTONS AND NEW TITLE -->
-			<br />
-			<div class='topic_controls'>
-				{$topic['SHOW_PAGES']}
-				<ul class='topic_buttons'>
-					<if test="bottomNewTopic:|:$forum['_user_can_post']">
-						<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum['id']}" base="publicWithApp"}' title='{$this->lang->words['start_new_topic']}' accesskey='n'>{parse replacement="topic_icon"} {$this->lang->words['start_new_topic']}</a></li>
-					<else />
-						<li class='disabled'><span>{$this->lang->words['top_cannot_start']}</span></li>
-					</if>
-					<if test="bottomIsClosed:|:$displayData['reply_button']['image'] == 'locked'">
-						<li class='closed'>
-							<if test="pollOnly:|:$topic['_poll_only']">
-								<if test="bottomClosedButtonLink:|:$displayData['reply_button']['url']">
-									<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only_reply']}</a>
-								<else />
-									<span>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only']}</span>
-								</if>
-							<else />
-								<if test="bottomClosedButtonLink:|:$displayData['reply_button']['url']">
-									<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_locked_reply']}</a>
-								<else />
-									<span>{parse replacement="lock_icon"} {$this->lang->words['top_locked']}</span>
-								</if>
-							</if>
-						</li>
-					<else />
-						<if test="bottomReplyButton:|:$displayData['reply_button']['image']">
-							<if test="bottomReplyButtonLink:|:$displayData['reply_button']['url']">
-								<li><a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r'>{parse replacement="{$displayData['reply_button']['image']}_icon"} {$this->lang->words['topic_add_reply']}</a></li>
-							<else />
-								<li class='disabled'><span>{$this->lang->words['top_cannot_reply']}</span></li>
-							</if>
-						</if>
-					</if>
-					<if test="watchWrapper:|:$this->memberData['member_id']">
-						<li>
-							<if test="isWatching:|:$this->settings['cpu_watch_update'] AND $topic['trackingTopic']">
-								<a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchTopics&amp;do=saveIt&amp;authKey={$this->member->form_hash}&amp;topicIDs[{$topic['tid']}]=1&amp;trackchoice=unsubscribe&amp;topicReturn={$topic['tid']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['topic_stop_watching']}'>{parse replacement="watch_topic_off"}&nbsp;&nbsp;{$this->lang->words['topic_stop_watching']}</a>
-							<else />
-								<a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=watch&amp;watch=topic&amp;do=list&amp;tid={$topic['tid']}" base="public"}' title='{$this->lang->words['tt_title']}'>{parse replacement="watch_topic_on"}&nbsp;&nbsp;{$this->lang->words['tt_title']}</a>
-							</if>
-						</li>
-					</if>
-				</ul>
-			</div>
-			<h2 class='maintitle'>{$this->lang->words['topic_other_replies']}</h2>
-			<div class='generic_bar'></div>
-		</if>
-	</foreach>
+	</div>
 </if>
+<hr />
 <!-- MOD LINKS -->
 <if test="modOptions:|:$displayData['mod_links']">
 	<if test="showModOptions:|:$this->memberData['is_mod'] OR $this->memberData['member_id'] == $topic['starter_id']">
-			<div id='topic_mod' class='moderation_bar rounded with_action clear'>
-			<if test="showModOptionsinner:|:$this->memberData['is_mod']">
-				<label for='tact' class='hide'>{$this->lang->words['post_moderation']}</label>
-		 		<select name="tact" id='tact' class='input_select'>
-					<option value="">{$this->lang->words['post_moderation']}</option>
-	 				<option value="merge">{$this->lang->words['cpt_merge']}</option>
-	 				<option value="move">{$this->lang->words['cpt_move']}</option>
-	 				<option value="delete">{$this->lang->words['cpt_delete']}</option>
-	 				<if test="$this->registry->class_forums->can_Un_SoftDeletePosts( $forum_data['id'], $topic )"><option value="sundelete">{$this->lang->words['cpt_undelete']}</option></if>
-	 				<option value="split">{$this->lang->words['cpt_split']}</option>
-	 				<option value="approve">{$this->lang->words['cpt_approve']}</option>
-	 				<option value="unapprove">{$this->lang->words['cpt_unapprove']}</option>
-	 			</select>&nbsp;
-	 			<input type="submit" id='mod_submit' name="gobutton" value="{$this->lang->words['f_go']}<if test="modButtonCount:|:$this->request['selectedpidcount']"> ({$this->request['selectedpidcount']})</if>" class="input_submit alt" />
-	 			</if>
+		<div class='ipsBox ipsPad clear clearfix' id='topic_mod'>
+			<div class='row2 ipsBox_container clearfix'>
+			<div class='moderation_bar with_action right'>
+				<if test="showModOptionsinner:|:$this->memberData['is_mod']">
+					<label for='tact' class='hide'>{$this->lang->words['post_moderation']}</label>
+			 		<select name="tact" id='tact' class='input_select'>
+						<option value="">{$this->lang->words['post_moderation']}</option>
+		 				<option value="merge">{$this->lang->words['cpt_merge']}</option>
+		 				<option value="move">{$this->lang->words['cpt_move']}</option>
+		 				<option value="delete">{$this->lang->words['cpt_delete']}</option>
+		 				<if test="$this->registry->class_forums->can_Un_SoftDeletePosts( $forum_data['id'], $topic )"><option value="sundelete">{$this->lang->words['cpt_undelete']}</option></if>
+		 				<option value="split">{$this->lang->words['cpt_split']}</option>
+		 				<option value="approve">{$this->lang->words['cpt_approve']}</option>
+		 				<option value="unapprove">{$this->lang->words['cpt_unapprove']}</option>
+		 			</select>&nbsp;
+		 			<input type="submit" id='mod_submit' name="gobutton" value="{$this->lang->words['f_go']}<if test="modButtonCount:|:$this->request['selectedpidcount']"> ({$this->request['selectedpidcount']})</if>" class="input_submit alt" />
+				 </if>
 			</div>
-		</form>
-		<script type='text/javascript'>
-			$('modform').observe('submit', ipb.topic.submitPostModeration );
-		</script>
-	
-		<div id='topic_mod_2' class='moderation_bar rounded'>
-			<if test="mmModOptions:|:is_array( $displayData['multi_mod'] ) AND count( $displayData['multi_mod'] )">
-				<form action="{parse url="app=forums&amp;module=moderate&amp;section=multimod&amp;t={$topic['tid']}" base="public"}" method="post" id='multimod' class='left'>
-					<fieldset>
-						<input type="hidden" name="check" value="1" />
-						<select name="mm_id" class="input_select">
-							<option value="-1">{$this->lang->words['mm_title']}</option>
-							<foreach loop="mm:$displayData['multi_mod'] as $mm_data">
-								<option value="{$mm_data[0]}">{$mm_data[1]}</option>
-							</foreach>
-						</select>&nbsp;
-						<input type="submit" value="{$this->lang->words['mm_submit']}" class="input_submit alt" />
-					</fieldset>
-				</form>
-			</if>
-			<form method="post" id="modform2" action="{parse url="" base="public"}">
-				<fieldset>
-					<input type="hidden" name="t" value="{$topic['tid']}" />
-					<input type="hidden" name="f" value="{$topic['forum_id']}" />
-					<input type="hidden" name="st" value="{$this->request['st']}" />
-					<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-					<input type="hidden" name="app" value="forums" />
-					<input type="hidden" name="module" value="moderate" />
-					<input type="hidden" name="section" value="moderate" />
-					<input type="hidden" name="_fromTopic" value="1" />
-					<label for='topic_moderation' class='hide'>{$this->lang->words['topic_moderation']}</label>
-					<select name="do" class="input_select" id='topic_moderation'>
-						<option value="-1">{$this->lang->words['topic_moderation']}</option>
-						<foreach loop="mod_links:$displayData['mod_links'] as $_mod_link">
-							<option value="{$_mod_link['option']}">-{$_mod_link['value']}</option>
-						</foreach>
-						<if test="$topic['topic_queuedposts'] AND $this->registry->class_forums->canQueuePosts( $forum['id'] )">
-							<option value="p_approve">{parse expression="sprintf( $this->lang->words['nmo_p_approve'], $topic['topic_queuedposts'])"}</option>
-						</if>
-						<if test="$topic['topic_queuedposts'] AND $this->registry->class_forums->canHardDeletePosts( $forum['id'], $topic )">
-							<option value="p_delete_approve">{parse expression="sprintf( $this->lang->words['nmo_p_delete_approve'], $topic['topic_queuedposts'])"}</option>
-						</if>
-						<if test="$topic['permissions']['softDeleteRestore'] AND $topic['topic_deleted_posts']">
-							<option value="p_restore">{parse expression="sprintf( $this->lang->words['nmo_p_restore'], $topic['topic_deleted_posts'])"}</option>
-						</if>
-						<if test="$topic['topic_deleted_posts'] AND $this->registry->class_forums->canHardDeletePosts( $forum['id'], $topic )">
-							<option value="p_delete_softed">{parse expression="sprintf( $this->lang->words['nmo_p_delete_softed'], $topic['topic_deleted_posts'])"}</option>
-						</if>
-					</select>&nbsp;
-					<input type="submit" value="{$this->lang->words['jmp_go']}" class="input_submit alt" />
-				</fieldset>
 			</form>
-			
 			<script type='text/javascript'>
-				$('modform2').observe('submit', ipb.topic.submitTopicModeration );
+				$('modform').observe('submit', ipb.topic.submitPostModeration );
 			</script>
+			<div class='moderation_bar left' id='topic_mod_2'>
+				<a href='#' id='topic_mod_options' class='ipbmenu input_submit alt ipsPad_half left'>{$this->lang->words['topic_moderation']}</a>
+				<ul class='ipbmenu_content' id='topic_mod_options_menucontent'>
+					<foreach loop="mod_links:$displayData['mod_links'] as $_mod_link">
+						<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;_fromTopic=1&amp;do={$_mod_link['option']}" base="public"}">{$_mod_link['value']}</a>
+					</foreach>
+					<if test="$topic['topic_queuedposts'] AND $this->registry->class_forums->canQueuePosts( $forum['id'] )">
+						<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;_fromTopic=1&amp;do=p_approve" base="public"}">{parse expression="sprintf( $this->lang->words['nmo_p_approve'], $topic['topic_queuedposts'])"}</a>
+					</if>
+					<if test="$topic['topic_queuedposts'] AND $this->registry->class_forums->canHardDeletePosts( $forum['id'], $topic )">
+						<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;_fromTopic=1&amp;do=p_delete_approve" base="public"}">{parse expression="sprintf( $this->lang->words['nmo_p_delete_approve'], $topic['topic_queuedposts'])"}</a>	
+					</if>
+					<if test="$topic['permissions']['softDeleteRestore'] AND $topic['topic_deleted_posts']">
+						<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;_fromTopic=1&amp;do=p_restore" base="public"}">{parse expression="sprintf( $this->lang->words['nmo_p_restore'], $topic['topic_deleted_posts'])"}</a>
+					</if>
+					<if test="$topic['topic_deleted_posts'] AND $this->registry->class_forums->canHardDeletePosts( $forum['id'], $topic )">
+						<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;t={$topic['tid']}&amp;f={$topic['forum_id']}&amp;st={$this->request['st']}&amp;auth_key={$this->member->form_hash}&amp;_fromTopic=1&amp;do=p_delete_softed" base="public"}">{parse expression="sprintf( $this->lang->words['nmo_p_delete_softed'], $topic['topic_deleted_posts'])"}</a>	
+					</if>
+					<if test="mmModOptions:|:is_array( $displayData['multi_mod'] ) AND count( $displayData['multi_mod'] )">
+						<foreach loop="mm:$displayData['multi_mod'] as $mm_data">
+							<li><a href="{parse url="app=forums&amp;module=moderate&amp;section=multimod&amp;t={$topic['tid']}&amp;mm_id={$mm_data[0]}" base="public"}">{$this->lang->words['mm_title']}: {$mm_data[1]}</a></li>
+						</foreach>
+					</if>
+				</ul>
+				<script type='text/javascript'>
+					new ipb.Menu( $('topic_mod_options'), $('topic_mod_options_menucontent') );
+				</script>
+			</div>
 		</div>
+	</div>
 	</if>
 </if>
-<!-- REPUTATION FILTERS -->
-<if test="reputationFilter:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_content'] && $this->memberData['member_id'] != 0 && is_array($this->caches['reputation_levels'])">
-	<div id='reputation_filter' class='filter_bar rounded'>
-		<span id='show_filters' class='clickable' style='display: none'>{$this->lang->words['rep_f_currently']} <if test="repFilterDefault:|:$this->memberData['_members_cache']['rep_filter'] && $this->memberData['_members_cache']['rep_filter'] === '*'">{$this->lang->words['rep_f_viewing_all']} <else />{$this->lang->words['rep_f_hiding']} {$this->memberData['_members_cache']['rep_filter']} {$this->lang->words['rep_f_points']}.</if> {$this->lang->words['rep_f_threshold']}</span>
-		<form id='filter_form' method="post" action="{parse url="" base="public"}">
-			<fieldset>
-	 			<input type="hidden" name="app" value="forums" />
-		 		<input type="hidden" name="module" value="forums" />
-		 		<input type="hidden" name="section" value="topics" />
-		 		<input type="hidden" name="rep_filter" value="update" />
-		 		<input type="hidden" name="f" value="{$topic['forum_id']}" />
-		 		<input type="hidden" name="t" value="{$topic['tid']}" />
-		 		<input type="hidden" name="secure_key" value="{$this->member->form_hash}" />
-		 		<input type="hidden" name="st" value="{$this->request['st']}" />
-		 		<label for='rep_filter_select'>{$this->lang->words['rep_f_hide']}</label>
-		 		<select name='rep_filter_set' id='rep_filter_select'>
-		 			<option value='*' <if test="optSelectStar:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $this->memberData['_members_cache']['rep_filter'] == '*'"> selected='selected'</if>>{$this->lang->words['rep_f_all_posts']}</option>
-				<if test="repFilterOptions:|:is_array($this->caches['reputation_levels'])">
-					<foreach loop="reputation_levels:$this->caches['reputation_levels'] as $k => $v">
-					<option value='{$v['level_points']}'<if test="optRepFilterSelected:|:isset( $this->memberData['_members_cache']['rep_filter'] ) AND $v['level_points'] == $this->memberData['_members_cache']['rep_filter']"> selected='selected'</if>>{$v['level_points']} {$this->lang->words['rep_f_points']}</option>
-					</foreach>
-				</if>
-				</select>
-	 		
-				<input type="submit" name="gobutton" value="{$this->lang->words['rep_f_update']}" class="input_submit alt" />
-			</fieldset>
-		</form>
-	</div>
-	<script type='text/javascript'>
-		$('show_filters').show();
-	</script>
-</if>
-<if test="forumJump:|:$forum['FORUM_JUMP']">
-	<div class='moderation_bar rounded' id='topic_search_jump'>
-		<if test="forumJumpInner:|:$forum['FORUM_JUMP']">
-			{$forum['FORUM_JUMP']}
-		</if>
-	</div>
-</if>
-<!-- THREADED MODE -->
-<if test="threadedEnabled:|:$displayData['threaded_mode_enabled'] == 1">
-	<br />
-	<div class='topic_controls'>
-		{$topic['threaded_pages']}	
-		<ul class='topic_buttons'>
-			<if test="threadedNewTopic:|:$forum['_user_can_post']">
-				<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum['id']}" base="publicWithApp"}' title='{$this->lang->words['start_new_topic']}'>{parse replacement="topic_icon"} {$this->lang->words['start_new_topic']}</a></li>
-			<else />
-				<li class='disabled'><span>{$this->lang->words['top_cannot_start']}</span></li>
-			</if>
-			<if test="threadedClosed:|:$displayData['reply_button']['image'] == 'locked'">
-				<li class='closed'>
-					<if test="threadedClosedLink:|:$displayData['reply_button']['url']">
-						<a href='{$displayData['reply_button']['url']}'>{parse replacement="lock_icon"} {$this->lang->words['top_locked_reply']}</a>
-					<else />
-						<span>{parse replacement="lock_icon"} {$this->lang->words['top_locked']}</span>
-					</if>
-				</li>
-			<else />
-				<if test="threadedReply:|:$displayData['reply_button']['image']">
-					<if test="threadedReplyLink:|:$displayData['reply_button']['url']">
-						<li><a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['add_a_reply']}'>{parse replacement="reply_icon"} {$this->lang->words['topic_add_reply']}</a></li>
-					<else />
-						<li class='disabled'><span>{$this->lang->words['top_cannot_reply']}</span></li>
-					</if>
-				</if>
-			</if>
-		</ul>
-	</div>
-	<h2 class='maintitle'>{$this->lang->words['threads']}</h2>
-	<div class='generic_bar'></div>
-	<div class='threaded_view general_box'>
-	{$topic['_threaded_posts']}
-	</div>
-	<br class='clear' />{$topic['threaded_pages']}
-</if>
-<ul class='topic_jump right clear'>
-	<li class='previous'><a href='{parse url="showtopic={$topic['tid']}&amp;view=old" seotitle="{$topic['title_seo']}" template="showtopic" base="public"}'>{$this->lang->words['_larr']} {$this->lang->words['previous_topic']}</a></li>
-	<li><strong><a href='{parse url="showforum={$forum['id']}" base="public" seotitle="{$forum['name_seo']}" template="showforum"}' title='{$this->lang->words['return_to']} {$forum['name']}'>{$forum['name']}</a></strong></li>
-	<li class='next'><a href='{parse url="showtopic={$topic['tid']}&amp;view=new"  seotitle="{$topic['title_seo']}" template="showtopic" base="public"}'>{$this->lang->words['next_topic']} {$this->lang->words['_rarr']}</a></li>
-</ul>
-<if test="canShare:|:!$forum['disable_sharelinks'] AND $this->settings['sl_enable']">
-<h3 class='topic_share left'>{$this->lang->words['topic_share']}</h3>
-{IPSLib::shareLinks( $topic['title'] )}
-<br />
-</if>
-<!-- BOTTOM BUTTONS -->
-<div class='topic_controls clear'>
-	{$topic['SHOW_PAGES']}
-	
-	<ul class='topic_buttons'>
-		<if test="finalNewTopic:|:$forum['_user_can_post']">
-			<li><a href='{parse url="module=post&amp;section=post&amp;do=new_post&amp;f={$forum['id']}" base="publicWithApp"}' title='{$this->lang->words['start_new_topic']}'>{parse replacement="topic_icon"} {$this->lang->words['start_new_topic']}</a></li>
-		<else />
-			<li class='disabled'><span>{$this->lang->words['top_cannot_start']}</span></li>
-		</if>
-		
-		<if test="finalClosed:|:$displayData['reply_button']['image'] == 'locked'">
-			<li class='closed'>
-				<if test="pollOnly:|:$topic['_poll_only']">
-					<if test="finalClosedLink:|:$displayData['reply_button']['url']">
-						<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only_reply']}</a>
-					<else />
-						<span>{parse replacement="lock_icon"} {$this->lang->words['top_poll_only']}</span>
-					</if>
-				<else />
-					<if test="finalClosedLink:|:$displayData['reply_button']['url']">
-						<a href='{$displayData['reply_button']['url']}' accesskey='r'>{parse replacement="lock_icon"} {$this->lang->words['top_locked_reply']}</a>
-					<else />
-						<span>{parse replacement="lock_icon"} {$this->lang->words['top_locked']}</span>
-					</if>
-				</if>
-			</li>
-		<else />
-			<if test="finalReply:|:$displayData['reply_button']['image']">
-				<if test="finalReplyLink:|:$displayData['reply_button']['url']">
-					<li><a href='{$displayData['reply_button']['url']}' title='{$this->lang->words['topic_add_reply']}' accesskey='r'>{parse replacement="{$displayData['reply_button']['image']}_icon"} {$this->lang->words['topic_add_reply']}</a></li>
-				<else />
-					<li class='disabled'><span>{$this->lang->words['top_cannot_reply']}</span></li>
-				</if>
-			</if>
-		</if>
-	</ul>
-</div>
 <hr />
-<script type='text/javascript'>
-	ipb.editor_values.set( 'emoticons', \$H({ {parse expression="IPSLib::fetchEmoticonsAsJson()"} }) );
-	ipb.vars['emoticon_url'] = "{$this->settings['emoticons_url']}";
-</script>
-<if test="fastReply:|:$displayData['fast_reply'] != 'unavailable' && $displayData['reply_button']['url']">
-<br />
-<div id='fast_reply' style='display: {$displayData['fast_reply']}'>
-	<h3 class='maintitle'>{$this->lang->words['qr_title']}</h3>
-	<div class='generic_bar'></div>
-	<div class='general_box alt'>
-		<form action="{parse url="" base="public"}" method="post">
-			<fieldset>
+<div class='topic_controls clear ipsPad_top_bottom_half'>
+	<if test="$topic['SHOW_PAGES']">
+		<div class='left'>{$topic['SHOW_PAGES']}</div>
+	</if>
+	<div class='ipsPad_top_slimmer right'>
+		<a href='{parse url="showforum={$forum['id']}" template="showforum" seotitle="{$forum['name_seo']}" base="public"}' class="ipsType_small desc">{parse expression="sprintf( $this->lang->words['go_back_to'], $forum['name'] )"}</a>
+		<if test="hasUnreadNext:|:$forum['_hasUnreadTopics']">
+			&middot; <a href='{parse url="showtopic={$topic['tid']}&amp;view=getnextunread" template="showtopicnextunread" seotitle="{$topic['title_seo']}" base="public"}' class="ipsType_small desc">{$this->lang->words['goto_next_unread_topic']}</a>
+		</if>
+	</div>
+	<if test="modOptionsLink:|:$displayData['mod_links'] && ( $this->memberData['is_mod'] OR $this->memberData['member_id'] == $topic['starter_id'] )">
+		<div class='moderation_bar ipsType_small' style='text-align: center; width: 40%;margin:0 auto;'>
+			<a href='#' id='moderator_toggle'><img src='{$this->settings['img_url']}/moderation_cog.png' />&nbsp; {$this->lang->words['show_moderation_tools']}</a>
+		</div>
+	</if>
+	
+</div>
+<if test="fastReply:|:$displayData['fast_reply'] && $displayData['reply_button']['url']">
+<hr />
+<div class='ipsBox' id='fast_reply_wrapper'>
+	<div class='ipsBox_container ipsPad'>
+		<h1 class='ipsType_subtitle'>{$this->lang->words['topic_add_reply']}</h1>
+		<if test="isLockedFR:|:$topic['state'] == 'closed'"><span class='error'>{$this->lang->words['locked_reply_fr']}</span><br /></if>
+		<br />
+		<if test="isMember:|:$this->memberData['member_id']">
+			<a href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}" title='{$this->lang->words['your_profile']}' class='ipsUserPhotoLink left'><img src='{$this->memberData['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$this->memberData['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+		<else />
+			<div class='left'>{IPSMember::buildNoPhoto(0, 'small' )}</div>
+		</if>
+		<div class='ipsBox_withphoto clearfix'>
+			<form action="{parse url="" base="public"}" method="post" id='ips_fastReplyForm'>
 				<input type="hidden" name="app" value="forums" />
 				<input type="hidden" name="module" value="post" />
 				<input type="hidden" name="section" value="post" />
@@ -4186,113 +3615,67 @@
 					<input type="hidden" name="enabletrack" value="1" />
 				</if>
 				<if test="is_array($topic['_fastReplyStatusMessage']) AND count($topic['_fastReplyStatusMessage']) AND strlen($topic['_fastReplyStatusMessage'][0])">
-					<div class='message'>{parse expression="implode( '<br />', $topic['_fastReplyStatusMessage'])"}</div>
+					<div class='message'>{parse expression="implode( '<br />', $topic['_fastReplyStatusMessage'] )"}</div>
 				</if>
-				{parse template="editorShell" group="editors" params="'fast-reply', 'Post', '', 1"}
-			</fieldset>
-			<fieldset class='submit'>
-				<input type='submit' name="submit" class='input_submit' value='{$this->lang->words['qr_post']}' tabindex='0' accesskey='s' id='submit_post' />&nbsp;&nbsp;<input type='submit' name="preview" class='input_submit alt' value='{$this->lang->words['qr_more_opts']}' tabindex='0' id='full_compose' />
-			</fieldset>
-		</form>
+				{parse editor="Post" options="array( 'type' => 'full', 'minimize' => 1, 'isTypingCallBack' => 'ipb.topic.isTypingCallBack', 'height' => 180, 'autoSaveKey' => 'reply-' . $topic[tid] )"}
+				<br />
+				
+				<fieldset class='right' id='fast_reply_controls'>
+					<input type='submit' name="submit" class='input_submit' value='{$this->lang->words['qr_post']}' tabindex='0' accesskey='s' id='submit_post' />&nbsp;&nbsp;<input type='submit' name="preview" class='input_submit alt' value='{$this->lang->words['qr_more_opts']}' tabindex='0' id='full_compose' />			
+				</fieldset>
+			</form>
+		</div>
+		<div id='ips_HasReplies'></div>
 	</div>
 </div>
-<script type="text/javascript">
-//<!#^#|CDATA|
-	if( $('fast-reply_textarea') ){
-		$('fast-reply_textarea').addClassName('unloaded_editor').setStyle('height: 70px');
-		$('fast-reply_textarea').value = "{$this->lang->words['editor_unloaded_atm']}";
-	}
-	
-	if( $('fast-reply_toolbar_1') ){
-		$('fast-reply_toolbar_1').hide();
-	}
-	if( $('fast-reply_toolbar_2') ){
-		$('fast-reply_toolbar_2').hide();
-	}
-	
-	var removeTip = function(e){
-		if( $('fast-reply_textarea').hasClassName('unloaded_editor') ){
-			$('fast-reply_textarea').value='';
-		}
-	};
-	
-	$('full_compose').observe( 'click', removeTip );
-	$('submit_post').observe( 'click', removeTip );
-	
-	in_use = 0;
-	
-	$('fast-reply_textarea').observe( 'focus', function(e){
-		if( !in_use )
-		{
-			if( $('fast-reply_toolbar_1') ){
-				$('fast-reply_toolbar_1').show();
-			}
-			if( $('fast-reply_toolbar_2') ){
-				$('fast-reply_toolbar_2').show();
-			}
-			
-			$('fast-reply_textarea').removeClassName('unloaded_editor').value = '';
-			
-			ipb.editors[ 'fast-reply' ] = new ipb.editor( 'fast-reply', USE_RTE );
-			$( ipb.editors['fast-reply'] ).resize_to( 250 );
-			
-			try {
-				ipb.editors[ 'fast-reply' ].editor_window.focus();
-			} catch(err) { }
-			in_use = 1;
-		}
-	});
-//|#^#]>
+<script type='text/javascript'>
+	ipb.topic.fastReplyId	= '{$this->settings['_lastEditorId']}';
 </script>
+<else />
+	<if test="loadJsManually:|:$displayData['load_editor_js']">
+		{parse template="editorLoadJs" group="editors" params="$displayData['smilies']"}
+	</if>
+</if>
+<!-- Close topic -->
+</div>
+<!-- BOTTOM BUTTONS -->
+<if test="canShare:|:!$forum['disable_sharelinks'] AND $this->settings['sl_enable']">
+	<br />
+	<div class='clear clearfix left'>
+		{IPSLib::shareLinks( $topic['title'] )}
+	</div>
+	<br />
 </if>
 <!-- ACTIVE USERS -->
 <if test="topicActiveUsers:|:is_array( $displayData['active_users'] ) AND count( $displayData['active_users'] )">
-	<div id='topic_stats' class='statistics general_box clear clearfix'>
+	<div id='topic_stats' class='statistics clear clearfix'>
 		<div id='topic_active_users' class='active_users'>
-			<h2>
-				{parse expression="sprintf( $this->lang->words['active_users_title'], ($displayData['active_users']['members'] + $displayData['active_users']['guests'] + $displayData['active_users']['anon'] ) )"}<br />
-				<span class='desc'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $displayData['active_users']['members'], $displayData['active_users']['guests'], $displayData['active_users']['anon'] )"}</span>
-			</h2>
-			
+			<h4 class='statistics_head'>{parse expression="sprintf( $this->lang->words['active_users_title'], ($displayData['active_users']['members'] + $displayData['active_users']['guests'] + $displayData['active_users']['anon'] ) )"}</h4>
+			<p class='statistics_brief desc'>{parse expression="sprintf( $this->lang->words['active_users_detail'], $displayData['active_users']['members'], $displayData['active_users']['guests'], $displayData['active_users']['anon'] )"}</p>
 			<if test="auNames:|:is_array( $displayData['active_users']['names'] ) AND count( $displayData['active_users']['names'] )">
-				<ol>
+				<br />
+				<ul class='ipsList_inline'>
 					<foreach loop="active_users:$displayData['active_users']['names'] as $p => $r">
 				<li>{$r['p_start']}<if test="auId:|:$r['id']"><a href='{parse url="showuser={$r['id']}" seotitle="{$r['seo']}" template="showuser" base="public"}' title='{$r['p_title']}'></if>{$r['name']}<if test="auEndId:|:$r['id']"></a></if>{$r['p_end']}<if test="lastActiveUser:|:$p + 1 != count( $displayData['active_users']['names'] )">,</if></li>
 					</foreach>
-				</ol>
+				</ul>
 			</if>
 		</div>
 	</div>
 </if>
-
-<!-- Close topic -->
-</div>
-<div id='delPopUp' style='display:none'>
-	<h3 class='bar'>{$this->lang->words['dlp_title']}</h3>
-	<div class='general_box'>
-		<form action='#{removeUrl}' method='POST'>
-			<strong>{$this->lang->words['dlp_remove_from_view']}</strong>
-			<p class='desc'>{$this->lang->words['dlp_remove_from_view_desc']}</p>
-			<p style='padding:4px 0px 4px 0px'>{$this->lang->words['dlp_reason']} <input type='text' name='deleteReason' id='delPop_reason' value='' style='width:65%' /> <input type='submit' class='input_submit' value='{$this->lang->words['dlp_remove']}' /></p>
-		</form>
-		<div style='#{permaDelete}padding-top:5px'>
-			<strong>{$this->lang->words['dlp_delete_from_topic']}</strong>
-			<p class='desc'>{$this->lang->words['dlp_delete_from_topic_desc']}</p>
-			<p style='padding:4px 0px 4px 0px'><input type='button' class='input_submit' onclick="window.location='#{permaUrl}';" value='{$this->lang->words['dlp_delete_now']}' /></p>
-		</div>
-	</div>
-</div>
-
 <if test="scrollToPost:|:$this->request['gopid']">
 <script type='text/javascript'>
 	var gopid = "{$this->request['gopid']}".replace(/&amp;/g, '');
 	ipb.topic.scrollToPost( parseInt( gopid ) );
 </script>
 </if>
-{parse template="include_highlighter" group="global" params="1"}]]></template_content>
+{parse template="include_highlighter" group="global" params="1"}
+<div id='multiQuoteInsert' style='display: none;' class='ipsFloatingAction'>
+	<span class='ipsButton no_width' id='mqbutton'>{$this->lang->words['mq_reply_quoted_posts']}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='#' id='multiQuoteClear' class='ipsType_smaller desc' title='{$this->lang->words['mq_clear_desc']}'>{$this->lang->words['mq_clear']}</a> &nbsp;&nbsp;&nbsp;
+</div>]]></template_content>
       <template_name>topicViewTemplate</template_name>
       <template_data>$forum, $topic, $post_data, $displayData</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/forums/xml/forums_settings.xml b/upload/admin/applications/forums/xml/forums_settings.xml
index 7490273c..98984496 100644
--- a/upload/admin/applications/forums/xml/forums_settings.xml
+++ b/upload/admin/applications/forums/xml/forums_settings.xml
@@ -1,308 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <settingexport>
   <settinggroup>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_title_title>�а�тройки корзины</conf_title_title>
-      <conf_title_desc>Корзина - �пециальный форум, в который перемещают�� темы по�ле удалени�, тем �амым о�тавл�� возможно�ть во��тановить тему при ее �лучайном удалении.</conf_title_desc>
-      <conf_title_tab>Forums</conf_title_tab>
-      <conf_title_app>forums</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Включить корзину?</conf_title>
-      <conf_description>Е�ли функци� отключена, то в�е �ледующие на�тройки игнорируют��.</conf_description>
-      <conf_group>27</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>forum_trash_can_enable</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Какой форум будет корзиной?</conf_title>
-      <conf_description>�е требует�� никаких �пециальных прав на чтение/напи�ание/ответ, на�тройте его как обычный форум.</conf_description>
-      <conf_group>27</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>forum_trash_can_id</conf_key>
-      <conf_default/>
-      <conf_extra>#show_forums#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать корзину дл� админи�траторов?</conf_title>
-      <conf_description>Е�ли функци� отключена, они могут удал�ть напр�мую.</conf_description>
-      <conf_group>27</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>forum_trash_can_use_admin</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать корзину дл� �упермодераторов?</conf_title>
-      <conf_description>Е�ли функци� отключена, они могут удал�ть напр�мую.</conf_description>
-      <conf_group>27</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>forum_trash_can_use_smod</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>И�пользовать корзину дл� модераторов форумов?</conf_title>
-      <conf_description>Е�ли функци� отключена, они могут удал�ть напр�мую.</conf_description>
-      <conf_group>27</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>forum_trash_can_use_mod</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>trashcansetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>newssetup</conf_title_keyword>
-      <conf_title_title>�а�тройки ново�тей форума</conf_title_title>
-      <conf_title_desc>Данный раздел позвол�ет указать форум, из которого будут �к�портированы ново�тные темы дл� дальнейшего и�пользовани� � ssi.php и IPB порталом.</conf_title_desc>
-      <conf_title_tab>Forums</conf_title_tab>
-      <conf_title_app>forums</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Из какого форума �к�портировать ново�ти?</conf_title>
-      <conf_description/>
-      <conf_group>28</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>news_forum_id</conf_key>
-      <conf_default/>
-      <conf_extra>#show_forums#</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>newssetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Показывать &#39;По�ледние ново�ти&#39; на главной �транице форума?]]></conf_title>
-      <conf_description/>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>index_news_link</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>newssetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_title_title>Правила форума</conf_title_title>
-      <conf_title_desc>Данный раздел позвол�ет �оздать и поддерживать общие правила форума.</conf_title_desc>
-      <conf_title_tab>Forums</conf_title_tab>
-      <conf_title_app>forums</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Показать ��ылку на правила в шапке форума?</conf_title>
-      <conf_description/>
-      <conf_group>29</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>gl_show</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>�азвание ��ылки</conf_title>
-      <conf_description/>
-      <conf_group>29</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>gl_title</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>С�ылка http:// на правила</conf_title>
-      <conf_description>Введите URL �траницы, где ра�положены ваши правила или о�тавьте �то поле пу�тым.</conf_description>
-      <conf_group>29</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>gl_link</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Е�ли не и�пользуете ��ылку на правила; введите тек�т правил зде�ь</conf_title>
-      <conf_description>Разрешен HTML</conf_description>
-      <conf_group>29</conf_group>
-      <conf_type>editor</conf_type>
-      <conf_key>gl_guidelines</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Правила и у�лови� реги�трации</conf_title>
-      <conf_description><![CDATA[По�етителю, желающему зареги�трировать��, необходимо будет �огла�ить�� � �одержанием данного раздела перед реги�трацией.
-<b>ПОДДЕРЖИВ�ЕТСЯ HTML</b>]]></conf_description>
-      <conf_group>29</conf_group>
-      <conf_type>editor</conf_type>
-      <conf_key>reg_rules</conf_key>
-      <conf_default><![CDATA[<b>Правила и положени� форума</b><br /><br />Пожалуй�та, уделите немного внимани� и прочтите краткие правила, указанные ниже. Е�ли вы принимаете их и желаете продолжить проце�� реги�трации, отметьте �вое �огла�ие и нажмите кнопку «Реги�траци�». Дл� отмены реги�трации нажмите кнопку «�азад» в вашем браузере.<br /><br />Пожалуй�та, помните, что мы не отвечаем на в�е публикуемые �ообщени�.<br /><br />�а форуме от�ут�твует предварительна� проверка открываемых тем и публикаций. Как только вы отправл�ете �ообщение — оно �разу публикует�� на форуме. �дмини�траци� форума �нимает � �еб� ответ�твенно�ть за �одержание �ообщений, публикуемых пользовател�ми. Ответ�твенно�ть за �одержание �ообщени� не�ёт только его автор.<br /><br />�а форуме запрещено:<br />отправка �ообщений не по �одержанию форума/темы, о�корблени� и угрозы в адре� пользователей форума, пропаганда ра�овой, национальной и религиозной вражды; реклама и �амореклама;<br />ненормативна� лек�ика, �ек�уальные домогатель�тва и т.д.<br /><br />�арушители правил будут �трого наказаны модераторами или админи�траторами форума и им будет закрыт до�туп на форум.<br /><br />Принима� данные правила, вы �оглашаете�ь не публиковать любой материал, защищенный автор�ким правом, е�ли автор�кое право не принадлежит вам.]]></conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group>Правила и у�лови� реги�трации</conf_start_group>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Информаци� на �транице входа</conf_title>
-      <conf_description>Тек�т, отображающий�� на �транице авторизации.</conf_description>
-      <conf_group>29</conf_group>
-      <conf_type>textarea</conf_type>
-      <conf_key>login_page_info</conf_key>
-      <conf_default><![CDATA[Потратьте в�его не�колько минут на про�тую реги�трацию! 
-
-Зареги�трированные пользователи получают дополнительные возможно�ти. �апример:
-<br /><br />
-<ul class='bullets'>
-<li>Создавать новые темы и отвечать в �уще�твующие</li>
-<li>Подпи�ывать�� на темы и разделы форума, дл� получени� обновлений</li>
-<li>Добавл�ть �обыти� в наш календарь</li>
-<li>Заводить новых друзей</li>
-<li>�а�траивать форумы под �об�твенные предпочтени�</li>
-</ul>]]></conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Блок информации на �транице реги�трации</conf_title>
-      <conf_description>Тек�т отображает�� на �транице реги�трации.</conf_description>
-      <conf_group>29</conf_group>
-      <conf_type>textarea</conf_type>
-      <conf_key>register_page_info</conf_key>
-      <conf_default><![CDATA[		<p>Важные причины дл� реги�трации!</p>
-		<ul>
-			<li>
-				<strong>Отправка личных �ообщений</strong>
-				<br /><br />
-				И�пользу� форум вы �можете пер�онализировано отправл�ть личные �ообщени� другим пользовател�м!
-			</li>
-			<li>
-				<strong>Добавление �обытий</strong>
-				<br /><br />
-				Знаете подход�щее �обытие? Зареги�трированные пользователи могут публиковать анон�ы на календаре �ообще�тва!
-			</li>
-		</ul>]]></conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>boardguidelines</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_is_title>1</conf_is_title>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -315,7 +13,7 @@
     <setting>
       <conf_title>Количе�тво тем, отображаемых в �пи�ке тем форума</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>display_max_topics</conf_key>
       <conf_default>30</conf_default>
@@ -324,7 +22,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>Про�мотр тем</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -333,7 +30,7 @@
     <setting>
       <conf_title>Количе�тво оценок дл� отображени� рейтинга темы</conf_title>
       <conf_description>Количе�тво оценок темы, требуемое дл� отображени� рейтинг темы. Е�ли их меньше, то рейтинг не показывает��.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>topic_rating_needed</conf_key>
       <conf_default>1</conf_default>
@@ -342,7 +39,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -351,7 +47,7 @@
     <setting>
       <conf_title>Количе�тво �ообщений в теме, по�ле которого тема �тановит�� «гор�чей»?</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>hot_topic</conf_key>
       <conf_default>15</conf_default>
@@ -360,7 +56,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -369,7 +64,7 @@
     <setting>
       <conf_title>Удал�ть ��ылки на перене�енные темы через Х дней</conf_title>
       <conf_description>Е�ли у�тановлено значение 0, автоматиче�кое удаление производить�� не будет</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>topic_redirect_prune</conf_key>
       <conf_default>30</conf_default>
@@ -378,70 +73,32 @@
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Префик� важных тем</conf_title>
-      <conf_description>Тек�т, отображаемый перед названием важных тем. Важна� тема в�егда в верхней ча�ти �пи�ка в�ех тем в форуме.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_title>Через �колько дней удал�ть отмеченные к удалению темы</conf_title>
+      <conf_description>Темы и �ообщени� при удалении помечают�� флагом о необходимо�ти их удалени�. При �том физиче�ки они о�тают�� в базе, что позвол�ет вам во��тановить их через модератор�кую панель. Данна� опци� позвол�ет на�троить количе�тво дней через которое темы и �ообщени� отмеченные к удалению будут физиче�ки удалены.</conf_description>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>pre_pinned</conf_key>
-      <conf_default>Важно</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group>Заголовки тем</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Префик� перемещенных тем</conf_title>
-      <conf_description>Тек�т, отображаемый перед названием перемещенной темы.  Префик� отображает�� перед названием темы в разделе, из которого она была перене�ена.</conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>pre_moved</conf_key>
-      <conf_default>Перемещено</conf_default>
+      <conf_key>days_to_keep_deletions</conf_key>
+      <conf_default>5</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Префик� опро�ов</conf_title>
-      <conf_description>Тек�т, отображаемый перед названием темы � опро�ом. В�е темы, в которых е�ть опро�, отмечают�� так.</conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>pre_polls</conf_key>
-      <conf_default>Опро�</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
+      <conf_keywords>delete, deletions, deleted, deletion, marked</conf_keywords>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
       <conf_title>Мак�имальна� длина заголовка темы</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>topic_title_max_len</conf_key>
       <conf_default>150</conf_default>
@@ -450,7 +107,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>7</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -459,7 +115,7 @@
     <setting>
       <conf_title>Удал�ть множе�тво во�клицательных/вопро�ительных знаков в названи�х тем?</conf_title>
       <conf_description>�апример, По�мотрите!!!!! будет заменено на По�мотрите!.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>etfilter_punct</conf_key>
       <conf_default>0</conf_default>
@@ -468,7 +124,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -477,7 +132,7 @@
     <setting>
       <conf_title>Запретить и�пользование только заглавных букв в названи�х тем?</conf_title>
       <conf_description>�апример, ��ЖМИТЕ СЮД� будет заменено на �ажмите �юда — �ледует правильно выбрать локаль на �ервере</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>etfilter_shout</conf_key>
       <conf_default>0</conf_default>
@@ -486,7 +141,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -495,7 +149,7 @@
     <setting>
       <conf_title>Количе�тво �ообщений, размещаемых на одной �транице темы</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>display_max_posts</conf_key>
       <conf_default>20</conf_default>
@@ -504,7 +158,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
       <conf_start_group>Про�мотр �ообщений</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -513,16 +166,17 @@
     <setting>
       <conf_title>Открывать внешние ��ылки в новом окне?</conf_title>
       <conf_description>С�ылки, которые ведут на внешние ре�ур�ы, будут открывать�� в новом окне (в браузере должен быть включен javascript).</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>links_external</conf_key>
-      <conf_default>0</conf_default>
+      <conf_default>1</conf_default>
       <conf_extra/>
-      <conf_evalphp/>
+      <conf_evalphp><![CDATA[$this->DB->delete( 'content_cache_posts' );
+$this->DB->delete( 'content_cache_sigs' );
+]]></conf_evalphp>
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -531,7 +185,7 @@
     <setting>
       <conf_title>�втоматиче�ки измен�ть размер изображений при определенном размере</conf_title>
       <conf_description>По умолчанию �и�тема пытает�� изменить изображени� так, чтобы оно не вылезало за ширину �крана. Однако, е�ли вы хотите, чтобы уменьшение шло при конкретной ширине/вы�оте, и�пользуйте �ту опцию. Е�ли вы введете 600, то в�е изображени� чь� вы�ота/ширина больше 600, будут уменьшены не зави�имо от того помещают�� они на �кране или нет.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>resize_img_force</conf_key>
       <conf_default>0</conf_default>
@@ -540,101 +194,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>�втоматиче�ки измен�ть размер «больших» изображений</conf_title>
-      <conf_description><![CDATA[Е�ли опци� включена, в�е изображени�, размещенные при помощи тега [IMG], будут ма�штабированы.]]></conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>resize_linked_img</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>13</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Древовидный режим: количе�тво �ообщений на �траницу</conf_title>
-      <conf_description>Эта опци� позвол�ет контролировать, �колько �ообщений будет выводить�� на одной �транице темы в древовидном режиме. Помогает уменьшить нагрузку на �ервер при про�мотре очень больших тем в древовидном режиме.</conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>threaded_per_page</conf_key>
-      <conf_default>100</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>14</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Режим про�мотра тем по умолчанию</conf_title>
-      <conf_description>Выберите режим про�мотра тем по умолчанию — «Древовидный», «Стандартный» или «Линейный».</conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>topicmode_default</conf_key>
-      <conf_default>linear</conf_default>
-      <conf_extra>linear=Стандартный&#13;
-threaded=Древовидный&#13;
-linearplus=Линейный</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Сортировать �ообщени� по</conf_title>
-      <conf_description/>
-      <conf_group>30</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>post_order_column</conf_key>
-      <conf_default>pid</conf_default>
-      <conf_extra>pid=номеру&#13;
-post_date=дате публикации</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>16</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Сортировать �ообщени� по</conf_title>
-      <conf_description/>
-      <conf_group>30</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>post_order_sort</conf_key>
-      <conf_default>asc</conf_default>
-      <conf_extra>asc=возра�танию (0-9)&#13;
-desc=убыванию (9-0)</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -643,10 +202,10 @@ desc=убыванию (9-0)</conf_extra>
     <setting>
       <conf_title>�е игнорируемые группы пользователей</conf_title>
       <conf_description>Пользователей выбранных групп не возможно будет добавить в �пи�ок игнорировани�</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>cannot_ignore_groups</conf_key>
-      <conf_default>4</conf_default>
+      <conf_default>,4,</conf_default>
       <conf_extra>#show_groups#</conf_extra>
       <conf_evalphp><![CDATA[if ( $save == 1)
 {
@@ -665,10 +224,45 @@ if ( $show == 1 )
 {
 $key = 'cannot_ignore_groups[]';
 }]]></conf_evalphp>
+      <conf_protected>1</conf_protected>
+      <conf_position>16</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Сортировать �ообщени� по</conf_title>
+      <conf_description/>
+      <conf_group>24</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>post_order_column</conf_key>
+      <conf_default>pid</conf_default>
+      <conf_extra><![CDATA[pid=номеру&#13;
+post_date=дате публикации]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>17</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Сортировать �ообщени� по</conf_title>
+      <conf_description/>
+      <conf_group>24</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>post_order_sort</conf_key>
+      <conf_default>asc</conf_default>
+      <conf_extra><![CDATA[asc=возра�танию (0-9)&#13;
+desc=убыванию (9-0)]]></conf_extra>
+      <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>18</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -677,7 +271,7 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальное количе�тво �майлов в одном �ообщении</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_emos</conf_key>
       <conf_default>10</conf_default>
@@ -685,8 +279,7 @@ $key = 'cannot_ignore_groups[]';
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>19</conf_position>
-      <conf_start_group>Создание �ообщени�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_start_group>Создание �ообщений</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -695,7 +288,7 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальное количе�тво изображений в одном �ообщении</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_images</conf_key>
       <conf_default>10</conf_default>
@@ -704,7 +297,6 @@ $key = 'cannot_ignore_groups[]';
       <conf_protected>1</conf_protected>
       <conf_position>20</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -714,7 +306,7 @@ $key = 'cannot_ignore_groups[]';
       <conf_title>Разрешенные к публикации в �ообщени�х ра�ширени� файлов изображений</conf_title>
       <conf_description><![CDATA[Определите ра�ширени� файлов изображений, публикуемых через т�ги [img][/img].
 Раздел�йте их, и�пользу� зап�тую (gif,jpeg,jpg)]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>img_ext</conf_key>
       <conf_default>gif,jpeg,jpg,png</conf_default>
@@ -723,7 +315,6 @@ $key = 'cannot_ignore_groups[]';
       <conf_protected>1</conf_protected>
       <conf_position>21</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -732,7 +323,7 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальный размер �ообщени� (в килобайтах)</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_post_length</conf_key>
       <conf_default>100</conf_default>
@@ -741,7 +332,6 @@ $key = 'cannot_ignore_groups[]';
       <conf_protected>1</conf_protected>
       <conf_position>22</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -750,7 +340,7 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>�втоматиче�ки разбирать ��ылки на медиа-контент?</conf_title>
       <conf_description>Включение опции позвол�ет ра�познавать ��ылки на медиа-контент, даже е�ли дл� них не был указан необходимый bb-код.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>bbcode_automatic_media</conf_key>
       <conf_default>1</conf_default>
@@ -759,7 +349,6 @@ $key = 'cannot_ignore_groups[]';
       <conf_protected>1</conf_protected>
       <conf_position>23</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -768,16 +357,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальна� вы�ота прикрепленного к �ообщению медиа ролика (в пик�ел�х)</conf_title>
       <conf_description><![CDATA[Только при и�пользовании тегов [media], где они разрешены]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_h_flash</conf_key>
       <conf_default>199</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>23</conf_position>
+      <conf_position>24</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -786,16 +374,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальна� ширина прикрепленного к �ообщению медиа ролика (в пик�ел�х)</conf_title>
       <conf_description><![CDATA[Только при и�пользовании тегов [media], где они разрешены]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_w_flash</conf_key>
       <conf_default>199</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>24</conf_position>
+      <conf_position>25</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -804,16 +391,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Запретить цитирование цитат?</conf_title>
       <conf_description><![CDATA[Эта опци� будет удал�ть любой цитируемый тек�т при цитировании �ообщени�, �одержащего цитаты.<br><a href='#' title='и е�ли �то имеет какой-то �мы�л, то вы гораздо умнее мен�.'>..</a>]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>strip_quotes</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>25</conf_position>
+      <conf_position>26</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -822,16 +408,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Мак�имальное чи�ло цитат в одном �ообщении</conf_title>
       <conf_description>И�пользу� �тот пункт, вы можете предотвратить �оздание �ообщений � очень большим количе�твом цитат, �то и�ключает возможное «падение» некоторых браузеров.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_quotes_per_post</conf_key>
       <conf_default>10</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>26</conf_position>
+      <conf_position>27</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -840,16 +425,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>Склейка �ообщений</conf_title>
       <conf_description><![CDATA[Когда пользователь публикует 2 �ообщени� подр�д в одну тему � интервалом не более <em>n</em> минут, то его �ообщени� объедин�ют�� в одно. Введите кол-во минут, в течение которых такие �ообщени� �клеивают��. Введите 0, чтобы отключить опцию.]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>post_merge_conc</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>27</conf_position>
+      <conf_position>28</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -858,16 +442,15 @@ $key = 'cannot_ignore_groups[]';
     <setting>
       <conf_title>И�пользовать фильтрацию URL?</conf_title>
       <conf_description>Е�ли вы хотите вве�ти фильтр ��ылок, о�новыва��ь на на�тройке белого и черного �пи�ков, включите данную функцию. Фильтраци� URL позвол�ет (белый �пи�ок) и запрещает (черный �пи�ок) и�пользовать определенные ��ылки в �ообщени�х и изображени�х.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_use_url_filter</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>28</conf_position>
+      <conf_position>29</conf_position>
       <conf_start_group>Фильтраци� ��ылок</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -875,20 +458,19 @@ $key = 'cannot_ignore_groups[]';
     </setting>
     <setting>
       <conf_title>Какой фильтр и�пользовать?</conf_title>
-      <conf_description><![CDATA[От выбора типа �пи�ка зави�ит логика работы фильтра ��ылок.<br />
-Е�ли вы выбираете черный �пи�ок, то вы запрещаете публикацию только ОПРЕДЕЛЕ��ЫХ ��ылок, в то врем� как в�е о�тальные ��ылки будут разрешены. <br />
+      <conf_description><![CDATA[От выбора типа �пи�ка зави�ит логика работы фильтра ��ылок.<br />
+Е�ли вы выбираете черный �пи�ок, то вы запрещаете публикацию только ОПРЕДЕЛЕ��ЫХ ��ылок, в то врем� как в�е о�тальные ��ылки будут разрешены. <br />
 Е�ли вы выбираете белый �пи�ок, то вы запрещаете публикацию ВСЕХ ��ылок, кроме тех, что перечи�лены в �пи�ке.]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>ipb_url_filter_option</conf_key>
       <conf_default>black</conf_default>
-      <conf_extra>white=белый �пи�ок&#13;
-black=черный �пи�ок</conf_extra>
+      <conf_extra><![CDATA[white=белый �пи�ок&#13;
+black=черный �пи�ок]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>29</conf_position>
+      <conf_position>30</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -900,16 +482,15 @@ black=черный �пи�ок</conf_extra>
 
 �апример: http://www.yourdomain.com*<br />
 http://*.google.com/*]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>textarea</conf_type>
       <conf_key>ipb_url_whitelist</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>30</conf_position>
+      <conf_position>31</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -920,34 +501,32 @@ http://*.google.com/*]]></conf_description>
       <conf_description><![CDATA[Зде�ь можно указать ��ылки, которые вы хотите запретить. Можно и�пользовать под�тановочный �имвол *. По одной ��ылке на �троку.<br /><br />
 �апример: http://*.somedomain.com*<br />
 http://competitor_domain.com*]]></conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>textarea</conf_type>
       <conf_key>ipb_url_blacklist</conf_key>
       <conf_default/>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>31</conf_position>
+      <conf_position>32</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Добавл�ть rel=&quot;nofollow&quot; и &lt;noindex&gt; к размещенным ��ылкам?]]></conf_title>
+      <conf_title><![CDATA[Добавл�ть rel=&quot;nofollow&quot; к размещенным ��ылкам?]]></conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>posts_add_nofollow</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>32</conf_position>
+      <conf_position>33</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -956,16 +535,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Показывать прикрепленные изображени� в �ообщении?</conf_title>
       <conf_description>Е�ли данна� опци� отключена, то прикрепленное изображение будет выводить�� в тек�те �ообщени�, как ��ылка.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>show_img_upload</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>33</conf_position>
+      <conf_position>34</conf_position>
       <conf_start_group>Прикрепленные изображени�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -974,16 +552,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Показывать ��кизы прикрепленных изображений?</conf_title>
       <conf_description>Е�ли опци� выше включена, то включение еще и �той позволит отображать в �ообщении уменьшенную копию прикрепленного изображени�. Это �кономит трафик и загружает�� гораздо бы�трее. �ажав на уменьшенную копию, пользователь загрузит полнома�штабное изображение.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>siu_thumb</conf_key>
       <conf_default>1</conf_default>
       <conf_extra>siu_thumb</conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>34</conf_position>
+      <conf_position>36</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -992,16 +569,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title><![CDATA[Размер ��киза прикрепленного изображени� [ширина] ]]></conf_title>
       <conf_description>Е�ли обе опции выше включены, то вы можете зде�ь определить мак�имальную ширину ��киза. Е�ли прикрепл�емое изображение будет меньше по размерам, то он будет попро�ту �разу отображено без каких-либо дей�твий � ним.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>siu_width</conf_key>
       <conf_default>100</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>35</conf_position>
+      <conf_position>37</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1010,34 +586,32 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title><![CDATA[Размер ��киза прикрепленного изображени� [вы�ота]]]></conf_title>
       <conf_description>Е�ли обе опции выше включены, то вы можете зде�ь определить мак�имальную вы�оту ��киза. Е�ли прикрепл�емое изображение будет меньше по размерам, то он будет попро�ту �разу отображено без каких-либо дей�твий � ним.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>siu_height</conf_key>
       <conf_default>100</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>36</conf_position>
+      <conf_position>38</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Мак�имальное количе�тво ��кизов подр�д</conf_title>
-      <conf_description>Количе�тво ��кизов, отображаемых подр�д р�дом в одной �троке. Большое количе�тво ��кизов в одной �троке без разрыва может приве�ти к и�кажению внешнего вида �траницы.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_title><![CDATA[Мак�имальный размер прикрепл�емого изображени� [ширина]]]></conf_title>
+      <conf_description>Е�ли изображение будет больше указанного ограничени�, то оно будет уменьшено.</conf_description>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>topic_attach_no_per_row</conf_key>
-      <conf_default>4</conf_default>
+      <conf_key>attach_img_max_w</conf_key>
+      <conf_default>1200</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>37</conf_position>
+      <conf_position>39</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1046,16 +620,32 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title><![CDATA[Им� го�т� [префик�]]]></conf_title>
       <conf_description>Опци� позвол�ет �делает имена пользователей и го�тей различными, путем добавлени� префик�а к имени го�т�. Это позвол�ет предотвратить проблему �овпадени� их имен.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>guest_name_pre</conf_key>
       <conf_default>Го�ть_</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>38</conf_position>
+      <conf_position>40</conf_position>
       <conf_start_group>Имена го�тей</conf_start_group>
-      <conf_end_group>0</conf_end_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title><![CDATA[Мак�имальный размер прикрепл�емого изображени�  [вы�ота]]]></conf_title>
+      <conf_description>Е�ли изображение будет больше указанного ограничени�, то оно будет уменьшено.</conf_description>
+      <conf_group>24</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>attach_img_max_h</conf_key>
+      <conf_default>1600</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>40</conf_position>
+      <conf_start_group/>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1064,16 +654,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Отключить lightbox?</conf_title>
       <conf_description>Позвол�ет отключить �ффекты при про�мотре прикрепленных изображений на форуме.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>disable_lightbox</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>38</conf_position>
+      <conf_position>40</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1082,34 +671,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title><![CDATA[Им� го�т� [�уффик�]]]></conf_title>
       <conf_description>Опци� позвол�ет �делать имена пользователей и го�тей различными, путем добавлени� �уффик�а к имени го�т�. Это позвол�ет предотвратить проблему �овпадени� их имен.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>guest_name_suf</conf_key>
       <conf_default>_*</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>39</conf_position>
+      <conf_position>41</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Разрешить т�ги [IMG] и [URL] в опро�ах?]]></conf_title>
-      <conf_description/>
-      <conf_group>30</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>poll_tags</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>40</conf_position>
-      <conf_start_group>Опро�ы</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1118,16 +688,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Мак�имальное количе�тво вопро�ов в одном опро�е</conf_title>
       <conf_description>Введите мак�имальное количе�тво вопро�ов, которые пользователи могут �оздать в одном опро�е.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_poll_questions</conf_key>
       <conf_default>3</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>41</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_position>43</conf_position>
+      <conf_start_group>Опро�ы</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1136,16 +705,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Мак�имальное количе�тво вариантов ответа в опро�е</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_poll_choices</conf_key>
       <conf_default>20</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>42</conf_position>
+      <conf_position>44</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1154,16 +722,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить пользовател�м про�матривать результаты опро�а, не тер�� права голо�а в нем?</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>allow_result_view</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>43</conf_position>
+      <conf_position>45</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1172,16 +739,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить автору опро�а голо�овать в нем?</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>allow_creator_vote</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>44</conf_position>
+      <conf_position>46</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1190,16 +756,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить автору �оздавать «только опро�ы»?</conf_title>
       <conf_description>Е�ли данна� опци� включена, авторы опро�ов могут запретить �оздавать ответные �ообщени� в теме опро�а.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>ipb_poll_only</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>45</conf_position>
+      <conf_position>47</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1208,16 +773,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить открытые опро�ы?</conf_title>
       <conf_description>В открытых опро�ах можно видеть, кто за какой вариант ответа проголо�овал.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>poll_allow_public</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>46</conf_position>
+      <conf_position>48</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1226,16 +790,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить удал�ть �вой голо�?</conf_title>
       <conf_description>Е�ли включено, то пользователи �могут удал�ть �вои голо�а. Дл� админи�траторов и �упермодераторов �та опци� включена в�егда.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>poll_allow_vdelete</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>47</conf_position>
+      <conf_position>49</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1244,34 +807,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Количе�тво ча�ов � момента �оздани� темы, в течение которых автору до�тупна возможно�ть добавлени� к ней опро�а</conf_title>
       <conf_description>Опци� не ра�про�тран�ет�� на админи�траторов и �упермодераторов.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>startpoll_cutoff</conf_key>
       <conf_default>24</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>48</conf_position>
+      <conf_position>50</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить пользовател�м и�пользовать визуальный редактор?</conf_title>
-      <conf_description>Е�ли опци� включена, пользователи, и�пользующие IE 6, Mozilla или Firefox �могут и�пользовать визуальный редактор (WYSIWYG) дл� �оздани� тем и �ообщений.</conf_description>
-      <conf_group>30</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>posting_allow_rte</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>49</conf_position>
-      <conf_start_group>Редактор</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1280,16 +824,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Разрешить загрузку не�кольких файлов � и�пользованием flash-загрузчика?</conf_title>
       <conf_description/>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>uploadFormType</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>50</conf_position>
+      <conf_position>52</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
@@ -1298,16 +841,15 @@ http://competitor_domain.com*]]></conf_description>
     <setting>
       <conf_title>Мак�имальное количе�тво медиа файлов в �ообщении</conf_title>
       <conf_description>Большое количе�тво медиа файлов может приве�ти к «падению» браузера.</conf_description>
-      <conf_group>30</conf_group>
+      <conf_group>24</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_media_files</conf_key>
       <conf_default>2</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>51</conf_position>
+      <conf_position>53</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords>media, bbcode</conf_keywords>
       <conf_title_keyword>topicspostsandpolls</conf_title_keyword>
diff --git a/upload/admin/applications/forums/xml/forums_tasks.xml b/upload/admin/applications/forums/xml/forums_tasks.xml
index c4f766c4..1d0a3902 100644
--- a/upload/admin/applications/forums/xml/forums_tasks.xml
+++ b/upload/admin/applications/forums/xml/forums_tasks.xml
@@ -109,5 +109,23 @@
       <task_locked>0</task_locked>
       <task_application>forums</task_application>
     </row>
+    <row>
+      <task_id>67</task_id>
+      <task_title>Удаление публикаций, помеченных у удалению</task_title>
+      <task_file>permadelete.php</task_file>
+      <task_next_run>1309384800</task_next_run>
+      <task_week_day>-1</task_week_day>
+      <task_month_day>-1</task_month_day>
+      <task_hour>22</task_hour>
+      <task_minute>0</task_minute>
+      <task_cronkey>58bae1a3fa692c826d673a193ca2e357</task_cronkey>
+      <task_log>1</task_log>
+      <task_description>Физиче�кое удаление тем и �ообщений, помеченных к удалению</task_description>
+      <task_enabled>1</task_enabled>
+      <task_key>forums_permadelete</task_key>
+      <task_safemode>0</task_safemode>
+      <task_locked>0</task_locked>
+      <task_application>forums</task_application>
+    </row>
   </group>
 </export>
diff --git a/upload/admin/applications/forums/xml/forums_xmlskin_templates.xml b/upload/admin/applications/forums/xml/forums_xmlskin_templates.xml
deleted file mode 100644
index e7d672eb..00000000
--- a/upload/admin/applications/forums/xml/forums_xmlskin_templates.xml
+++ /dev/null
@@ -1,1210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="forums" templategroups="a:8:{s:11:&quot;skin_boards&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_forum&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_legends&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_mod&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_poll&quot;;s:5:&quot;exact&quot;;s:9:&quot;skin_post&quot;;s:5:&quot;exact&quot;;s:14:&quot;skin_printpage&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_topic&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_boards">
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<birthday>
-	<if test="$pyear"><year>$pyear</year></if>
-	<user>
-		<id>{$user['member_id']}</id>
-		<name><!#^#|CDATA|{$user['members_display_name']}|#^#]></name>
-		<url><!#^#|CDATA|{parse url="showuser={$user['member_id']}" base="public"}|#^#]></url>		
-	</user>
-</birthday>]]></template_content>
-      <template_name>birthday</template_name>
-      <template_data>$user, $pyear</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<if test="cats_forums:|:is_array( $cat_data ) AND count( $cat_data )">
-		<categories>
-		<foreach loop="categories:$cat_data as $_data">
-			<if test="cat_has_forums:|:is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">
-			<category>
-				<id>{$_data['cat_data']['id']}</id>
-				<name><!#^#|CDATA|{$_data['cat_data']['name']}|#^#]></name>
-				<url><!#^#|CDATA|{parse url="showforum={$_data['cat_data']['id']}" seotitle="{$_data['cat_data']['name_seo']}" template="showforum" base="public"}|#^#]></url>
-				<forums>
-						<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
-					<forum>
-						<id>{$forum_data['id']}</id>
-						<name><!#^#|CDATA|{$forum_data['name']}|#^#]></name>
-						<url><!#^#|CDATA|{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}|#^#]></url>
-						<description><!#^#|CDATA|{$forum_data['description']}|#^#]></description>
-							<if test="$forum_data['redirect_on']">							
-						<type>redirect</type>
-							<else />
-						<type>{$forum_data['status']}</type>
-						<topics>{$forum_data['topics']}</topics>
-						<replies>{$forum_data['posts']}</replies>
-						<lastpost>
-								<if test="$forum_data['hide_last_info']">
-							<name>{$this->lang->words['f_protected']}</name>
-								<else />
-							<date>{$forum_data['last_post']}</date>
-							<name><!#^#|CDATA|{$forum_data['last_title']}|#^#]></name>
-							<id>{$forum_data['last_id']}</id>
-							<url><!#^#|CDATA|{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}|#^#]></url>
-							<user>
-								<if test="$forum_data['last_poster_id']">						
-								<id>{$forum_data['last_poster_id']}</id>
-								<name><!#^#|CDATA|{$forum_data['last_poster_name']}|#^#]></name>
-								<url><!#^#|CDATA|{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}|#^#]></url>
-									<else />
-								<id>0</id>
-								<name><!#^#|CDATA|{$this->settings['guest_name_pre']}{$forum_data['last_poster_name']}{$this->settings['guest_name_suf']}|#^#]></name>
-								<url></url>
-								</if>
-							</user>
-								</if>
-						</lastpost>
-							</if>					
-										<if test="$forum_data['show_subforums'] AND count( $forum_data['subforums'] ) AND $forum_data['show_subforums']">
-						<subforums>
-											<foreach loop="subforums:$forum_data['subforums'] as $__id => $__data">
-							<subforum>
-								<id>{$__data[0]}</id>
-								<name><!#^#|CDATA|{$__data[1]}|#^#]></name>
-								<url><!#^#|CDATA|{parse url="showforum=" seotitle="{$__data[2]}" template="showforum" base="public"}|#^#]></url>
-							</subforum>
-											</foreach>
-						</subforums>
-										</if>
-					</forum>
-						</foreach>
-				</forums>
-			</category>
-			</if>
-		</foreach>
-		</categories>
-	</if>
-		<statistics>
-			<posts>{$stats['info']['total_posts']}</posts>
-			<members>{$stats['info']['mem_count']}</members>
-			<user>
-				<id>{$stats['info']['last_mem_id']}</id>
-				<name>{$stats['info']['last_mem_name']}</name>
-				<url>{parse url="{$stats['info']['last_mem_link']}" template="showuser" seotitle="%%{$stats['info']['last_mem_name']}%%" base="public"}</url>
-			</user>
-			<onlinerecord>{$stats['info']['most_online']}</onlinerecord>
-		</statistics>
-		<activeusers>
-			<total>{$stats['TOTAL']}</total>
-			<guests>{$stats['GUESTS']}</guests>
-			<anonymous>{$stats['ANON']}</anonymous>
-			<users><!#^#|CDATA|{parse expression="implode( ",", count($stats['NAMES']) ? $stats['NAMES'] : array() )"}|#^#]></users>
-		</activeusers>
-		<events>
-			<if test="is_array( $calendar_events )">
-				{parse expression="implode( ",", count($calendar_events) ? $calendar_events : array() )"}
-			<else />
-				$calendar_events
-			</if>
-		</events>
-		<birthdays>
-		<if test="$birthdays !== FALSE AND is_array( $birthdays ) AND count( $birthdays )">
-			<total>{$birthdays['count']}</total>
-			<users>{parse expression="implode( ",", count($birthdays['users']) ? $birthdays['users'] : array() )"}</users>
-		</if>
-		</birthdays>]]></template_content>
-      <template_name>boardIndexTemplate</template_name>
-      <template_data><![CDATA[$lastvisit="", $stats=array(), $calendar_events=FALSE, $birthdays=FALSE, $chat_html='', $news_data=array(), $cat_data=array(), $show_side_blocks=true, $side_blocks=array()]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookBoardIndexShareLinks</template_name>
-      <template_data>$data</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookBoardIndexStatusUpdates</template_name>
-      <template_data>$updates=array()</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookFacebookActivity</template_name>
-      <template_data/>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookRecentBlogEntries</template_name>
-      <template_data>$entries</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookRecentGalleryImages</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>hookRecentTopics</template_name>
-      <template_data>$topics</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>hookTopPosters</template_name>
-      <template_data>$posters</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookUnreadNotifications</template_name>
-      <template_data>$notifications</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>hookWatchedItems</template_name>
-      <template_data>$updatedTopics, $nUpdatedTopics, $updatedForums, $nUpdatedForums</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>whoschatting_empty</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_boards</template_group>
-      <template_content/>
-      <template_name>whoschatting_show</template_name>
-      <template_data><![CDATA[$total="",$names=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_forum">
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<attachments>
-	<topic>{$title}</topic>
-	<id>{$this->request['tid']}</id>
-<foreach loop="attachments:$rows as $data">
-	<attachment>
-		<id>{$data['attach_id']}</id>
-		<thumbnail><if test="$data['attach_thumb_location']">{$this->settings['upload_url']}/{$data['attach_thumb_location']}</if></thumbnail>
-		<name>{$data['short_name']}</name>
-		<url>{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}</url>
-		<downloads>{$data['attach_hits']}</downloads>
-		<date>{$data['attach_date']}</date>
-		<size>{$data['real_size']}</size>
-		<post>{parse url="app=forums&amp;module=forums&amp;section=findpost&amp;pid={$data['pid']}" base="public"}</post>		
-	</attachment>
-</foreach>
-</attachments>]]></template_content>
-      <template_name>forumAttachments</template_name>
-      <template_data>$title, $rows</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content>{$output}</template_content>
-      <template_name>forumAttachmentsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<forum>
-		<name><!#^#|CDATA|{$forum_data['name']}|#^#]></name>
-		<id>{$forum_data['id']}</id>
-		<url><!#^#|CDATA|{parse url="showforum={$forum_data['id']}" seotitle="{{$forum_data['name_seo']}" template="showforum" base="public"}|#^#]></url>
-		
-<if test="$forum_data['show_rules'] == 2">
-		<rules>
-			<title><!#^#|CDATA|{$forum_data['rules_title']}|#^#]></title>
-			<text><!#^#|CDATA|{$forum_data['rules_text']}|#^#]></text>
-		</rules>
-</if>
-<if test="$forum_data['show_rules'] == 1">
-		<rules>
-			<title><!#^#|CDATA|{$forum_data['rules_title']}|#^#]></title>
-			<url><!#^#|CDATA|{parse url="showforum={$forum_data['id']}&amp;act=SR" base="public"}|#^#]></url>
-		</rules>
-</if>
-<if test="is_array( $sub_forum_data ) AND count( $sub_forum_data )">
-		<subforums>			
-	<foreach loop="subforums:$sub_forum_data as $_data">
-		<if test="is_array( $_data['forum_data'] ) AND count( $_data['forum_data'] )">					
-			<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
-				<foreach loop="forums:$_data['forum_data'] as $forum_id => $forum_data">
-			<forum>
-				<id>{$forum_data['id']}</id>
-				<name><!#^#|CDATA|{$forum_data['name']}|#^#]></name>
-				<url><!#^#|CDATA|{parse url="showforum={$forum_data['id']}" seotitle="{$forum_data['name_seo']}" template="showforum" base="public"}|#^#]></url>
-				<description><!#^#|CDATA|{$forum_data['description']}|#^#]></description>
-					<if test="$forum_data['redirect_on']">							
-				<type>redirect</type>
-					<else />
-				<type>{$forum_data['status']}</type>
-				<topics>{$forum_data['topics']}</topics>
-				<replies>{$forum_data['posts']}</replies>						
-				<lastpost>
-						<if test="$forum_data['hide_last_info']">
-					<name>{$this->lang->words['f_protected']}</name>
-						<else />
-					<date>{$forum_data['last_post']}</date>
-					<name><!#^#|CDATA|{$forum_data['last_title']}|#^#]></name>
-					<id>{$forum_data['last_id']}</id>
-					<url><!#^#|CDATA|{parse url="showtopic={$forum_data['last_id']}&amp;view=getlastpost" base="public" template="showtopic" seotitle="{$forum_data['seo_last_title']}"}|#^#]></url>
-					<user>
-							<if test="$forum_data['last_poster_id']">						
-						<id>{$forum_data['last_poster_id']}</id>
-						<name><!#^#|CDATA|{$forum_data['last_poster_name']}|#^#]></name>
-						<url><!#^#|CDATA|{parse url="showuser={$forum_data['last_poster_id']}" template="showuser" seotitle="{$forum_data['seo_last_name']}" base="public"}|#^#]></url>										
-							<else />
-						<id>0</id>
-						<name><!#^#|CDATA|{$this->settings['guest_name_pre']}{$forum_data['last_poster_name']}{$this->settings['guest_name_suf']}|#^#]></name>
-						<url></url>
-							</if>
-					</user>
-						</if>
-				</lastpost>
-					</if>
-			</forum>
-				</foreach>
-			</foreach>
-		</if>
-	</foreach>
-		</subforums>
-</if>
-<if test="is_array( $announce_data ) AND count( $announce_data )">
-		<announcements>			
-	<foreach loop="announcements:$announce_data as $aid => $adata">
-			<announcement>
-				<id>{$adata['announce_id']}</id>
-				<title><!#^#|CDATA|{$adata['announce_title']}|#^#]></title>
-				<url><!#^#|CDATA|{parse url="showannouncement={$adata['announce_id']}&amp;f={$forum_data['id']}" seotitle="%%{$adata['announce_title']}%%" template="showannouncement" base="public"}|#^#]></url>
-				<user>
-					<id>{$adata['member_id']}</id>
-					<name><!#^#|CDATA|{$adata['member_name']}|#^#]></name>
-					<url><!#^#|CDATA|{parse url="showuser={$adata['member_id']}" seotitle="{$adata['members_seo_name']}" template="showuser" base="public"}|#^#]></url>
-				</user>
-			</announcement>
-	</foreach>
-		</announcements>
-</if>
-		<topics>
-<if test="is_array( $topic_data ) AND count( $topic_data )">
-	<foreach loop="topics:$topic_data as $tid => $data">
-			<topic>
-				<id>{$data['tid']}</id>
-				<icon>{$data['folder_img']}</icon>
-				<title><!#^#|CDATA|{$data['title']}|#^#]></title>
-				<description><!#^#|CDATA|{$data['description']}|#^#]></description>
-				<url><!#^#|CDATA|{parse url="showtopic={$data['tid']}" base="public" template="showtopic" seotitle="{$data['title_seo']}"}|#^#]></url>
-				<user>
-					<id>{$data['starter_id']}</id>
-					<name><!#^#|CDATA|{$data['starter_name']}|#^#]></name>
-					<url><!#^#|CDATA|{parse url="showuser={$data['starter_id']}" seotitle="{$data['seo_first_name']}" template="showuser" base="public"}|#^#]></url>
-				</user>
-				<replies>{$data['_posts']}</replies>
-				<views>{$data['views']}</views>
-				<lastpost>
-					<date>{$data['last_post']}</date>
-					<url><!#^#|CDATA|{parse url="showtopic={$data['tid']}&amp;view=getlastpost" seotitle="{$data['title_seo']}" template="showtopic" base="public"}|#^#]></url>
-					<user>
-						<id>{$data['last_poster_id']}</id>
-						<name>{$data['last_poster_name']}</name>
-						<url>{parse url="showuser={$data['last_poster_id']}" seotitle="{$data['seo_last_name']}" template="showuser" base="public"}</url>
-					</user>
-				</lastpost>
-		<if test="$data['topic_hasattach']">
-				<attachments>
-					<url><!#^#|CDATA|{$this->settings['base_url']}app=forums&amp;module=forums&amp;section=attach&amp;tid={$data['tid']}|#^#]></url>
-					<count>{parse expression="intval($data['topic_hasattach'])"}</count>
-				</attachments>
-		</if>
-		<if test="is_array( $data['pages'] ) AND count( $data['pages'] )">
-			<pagination>
-			<foreach loop="$data['pages'] as $page">
-				<page>					
-					<url><!#^#|CDATA|{parse url="showtopic={$data['tid']}&amp;st={$page['st']}" seotitle="{$data['title_seo']}" template="showtopic" base="public"}|#^#]></url>
-					<number>{$page['page']}</number>
-				</page>
-			</foreach>
-		</pagination>
-		</if>		
-			</topic>
-	</foreach>
-</if>
-		</topics>
-		
-		{$forum_data['SHOW_PAGES']}
-				
-<if test="!$this->settings['no_au_forum']">
-		<activeusers>
-			<total>{parse expression="($active_user_data['members'] + $active_user_data['guests'] + $active_user_data['anon'] )"}</total>
-			<guests>{$active_user_data['guests']}</guests>
-			<anonymous>{$active_user_data['anon']}</anonymous>
-			<users>
-	<if test="is_array( $active_user_data['names'] ) AND count( $active_user_data['names'] )">
-		<foreach loop="$active_user_data['names'] as $p => $r">
-				<user>
-					<id>{$r['id']}</id>
-					<name>{$r['p_start']}{$r['name']}{$r['p_end']}</name>
-					<url>{parse url="showuser={$r['id']}" seotitle="{$r['seo']}" template="showuser" base="public"}</url>
-				</user>
-		</foreach>
-	</if>
-		</users>
-</if>	
-		</activeusers>
-	</forum>]]></template_content>
-      <template_name>forumIndexTemplate</template_name>
-      <template_data>$forum_data, $announce_data, $topic_data, $other_data, $multi_mod_data, $sub_forum_data, $footer_filter, $active_user_data, $mod_data, $inforum=1</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<forum>
-	<error>This is a password-protected forum</error>
-</forum>]]></template_content>
-      <template_name>forumPasswordLogIn</template_name>
-      <template_data><![CDATA[$fid=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content/>
-      <template_name>show_rules</template_name>
-      <template_data><![CDATA[$rules=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content/>
-      <template_name>topic_rating_image</template_name>
-      <template_data>$rating_id=1</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content><![CDATA[<if test="$text">
-	<prefix>{$text}</prefix>
-</if>]]></template_content>
-      <template_name>topicPrefixWrap</template_name>
-      <template_data>$text</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_forum</template_group>
-      <template_content/>
-      <template_name>who_link</template_name>
-      <template_data><![CDATA[$tid="",$posts=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_legends">
-    <template>
-      <template_group>skin_legends</template_group>
-      <template_content/>
-      <template_name>bbcodePopUpList</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_legends</template_group>
-      <template_content/>
-      <template_name>emoticonPopUpList</template_name>
-      <template_data>$editor_id, $rows</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_legends</template_group>
-      <template_content/>
-      <template_name>wrap_tag</template_name>
-      <template_data><![CDATA[$tag=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_mod">
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>deleteTopicForm</template_name>
-      <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>editTopicTitle</template_name>
-      <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>editUserForm</template_name>
-      <template_data>$profile, $custom_fields=null</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>mergePostForm</template_name>
-      <template_data>$editor, $dates, $authors, $uploads</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>mergeTopicsForm</template_name>
-      <template_data>$forum, $topic</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>movePostForm</template_name>
-      <template_data><![CDATA[$forum, $topic, $posts, $error='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>moveTopicForm</template_name>
-      <template_data>$forum, $topic, $forum_jump</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>moveTopicsForm</template_name>
-      <template_data>$forum, $jump_html, $topics</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>pruneSplash</template_name>
-      <template_data><![CDATA[$forum="", $forums_html="", $confirm_data="", $complete_html=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>simplePage</template_name>
-      <template_data><![CDATA[$title="", $msg=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>softDeleteSplash</template_name>
-      <template_data>$forum, $tids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>softDeleteSplashPosts</template_name>
-      <template_data>$forum, $topic, $pids=array(), $canHardDelete=false</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>splitPostForm</template_name>
-      <template_data>$forum, $topic, $posts, $jump</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>topicHistory</template_name>
-      <template_data>$topic, $avg_post, $mod_logs=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>unsubscribeForm</template_name>
-      <template_data>$forum, $topic, $text</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>warn_add_note_form</template_name>
-      <template_data><![CDATA[$id="",$name=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>warn_success</template_name>
-      <template_data>$topic=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>warn_view_log</template_name>
-      <template_data><![CDATA[$member, $rows, $links='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>warnForm</template_name>
-      <template_data><![CDATA[$member, $tid=0, $st=0, $errors='', $modque=false, $postque=false, $ban=false, $editor_html='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_mod</template_group>
-      <template_content/>
-      <template_name>warnLogsAjaxWrapper</template_name>
-      <template_data>$output</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_post">
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>attachiFrame</template_name>
-      <template_data>$JSON, $id</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>errors</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>pollBox</template_name>
-      <template_data><![CDATA[$max_poll_questions="",$max_poll_choices="",$poll_questions="",$poll_choices="",$poll_votes="",$show_open="",$poll_question="",$is_mod=0,$poll_multi="",$poll_only='', $poll_view_voters='', $total_votes=0]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>postFormTemplate</template_name>
-      <template_data>$formData=array(), $form = array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>preview</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>topicSummary</template_name>
-      <template_data>$posts=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_post</template_group>
-      <template_content/>
-      <template_name>uploadForm</template_name>
-      <template_data><![CDATA[$post_key="",$type="",$stats=array(),$id="",$forum_id=0]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_printpage">
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content/>
-      <template_name>choose_form</template_name>
-      <template_data><![CDATA[$fid="",$tid="",$title=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content/>
-      <template_name>pp_end</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content/>
-      <template_name>pp_header</template_name>
-      <template_data><![CDATA[$forum_name="",$topic_title="",$topic_starter="",$fid="",$tid="",$css=array(),$IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_printpage</template_group>
-      <template_content/>
-      <template_name>pp_postentry</template_name>
-      <template_data><![CDATA[$poster="",$entry=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_topic">
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<h2>{$this->lang->words['announce_title']}: {$announce['announce_title']}</h2>
-<ul class='topic_options'></ul>
-<div class='post_block first hentry announcement' id='announce_id_{$announce['announce_id']}'>
-	<div class='post_wrap'>
-		<if test="$author['member_id']">
-			<h3>
-		<else />
-			<h3 class='guest'>
-		</if>
-				<if test="$author['member_id']">
-					<if test="$author['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-							<address class="author vcard"><a class="url fn" href='{parse url="showuser={$author['member_id']}" base="public"}'>{$author['members_display_name']}</a>{parse template="user_popup" group="global" params="$author['member_id']"}</address>
-				<else />
-					{$author['members_display_name']}
-				</if>
-			</h3>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="$author, 'announcement', array()"}
-		</div>
-		<div class='post_body'>
-			<div class='post entry-content'>
-				{$announce['announce_post']}
-			</div>
-		</div>
-		<ul class='post_controls'></ul>
-	</div>			
-</div>]]></template_content>
-      <template_name>announcement_show</template_name>
-      <template_data><![CDATA[$announce="",$author=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content/>
-      <template_name>build_threaded</template_name>
-      <template_data>$post, $child</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>hookFacebookLike</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<poll>
-	<title>{$poll['poll_question']}</title>
-	<if test="$showResults"><totalvotes>{$poll['_totalVotes']}</totalvotes></if>
-	<public>{$this->settings['poll_allow_public']}</public>
-	
-	<questions>
-<foreach loop="$pollData as $questionID => $questionData">			
-		<question>
-			<title>{$pollData[ $questionID ]['question']}</title>
-	<if test="! $this->settings['allow_result_view'] AND ! $this->memberData['member_id']">
-			<error>{$this->lang->words['poll_noview_guest']}</error>
-	<else />
-			<results>
-		<foreach loop="$pollData[ $questionID ]['choices'] as $choiceID => $choiceData">
-				<choice>{$choiceData['choice']}</choice>
-			<if test="$showResults">				
-				<selected><if test="is_array( $choiceData['voters'] ) AND in_array( $this->memberData['member_id'], array_keys( $choiceData['voters'] ) )">1<else />0</if></selected>
-				<votes>{$choiceData['votes']}</votes>
-				<percent>{$choiceData['percent']}%</percent>
-				
-				<if test="$poll['poll_view_voters'] AND is_array( $choiceData['voters'] ) AND $this->settings['poll_allow_public']">
-				<voters>					
-					<foreach loop="$choiceData['voters'] as $id => $member">
-					<user>
-						<id>{$member['member_id']}</id>
-						<name>{$member['members_colored_name']}</name>
-						<url>{parse url="showuser=" base="public" seotitle="{$member['members_seo_name']}" template="showuser"}</url>
-					</user>						
-					</foreach>
-				</voters>
-				</if>
-			</if>
-		</foreach>
-			</results>
-	</if>
-		</question>
-</foreach>
-	</questions>
-</poll>]]></template_content>
-      <template_name>pollDisplay</template_name>
-      <template_data>$poll, $topicData, $forumData, $pollData, $showResults</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content/>
-      <template_name>quickEditPost</template_name>
-      <template_data>$post</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>reputationPopup</template_name>
-      <template_data>$reps</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<foreach loop="attach:$data as $file">
-	{$file}
-</foreach>]]></template_content>
-      <template_name>show_attachment_title</template_name>
-      <template_data><![CDATA[$title="",$data="",$type=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<attachment>
-	<id>{$data['attach_id']}</id>
-	<thumbnail><if test="$data['attach_thumb_location']">{$this->settings['upload_url']}/{$data['attach_thumb_location']}</if></thumbnail>
-	<name>{$data['short_name']}</name>
-	<url>{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}</url>
-	<downloads>{$data['attach_hits']}</downloads>
-	<date>{$data['attach_date']}</date>
-	<size>{$data['real_size']}</size>
-	<post>{parse url="app=forums&amp;module=forums&amp;section=findpost&amp;pid={$data['attach_rel_id']}" base="public"}</post>		
-</attachment>]]></template_content>
-      <template_name>Show_attachments</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<attachment>
-	<url>{$this->settings['upload_url']}/$file_name</url>
-</attachment>]]></template_content>
-      <template_name>Show_attachments_img</template_name>
-      <template_data><![CDATA[$file_name=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<attachment>
-	<id>{$data['attach_id']}</id>
-	<thumbnail><if test="$data['attach_thumb_location']">{$this->settings['upload_url']}/{$data['attach_thumb_location']}</if></thumbnail>
-	<name>{$data['short_name']}</name>
-	<url>{parse url="app=core&amp;module=attach&amp;section=attach&amp;attach_rel_module=post&amp;attach_id={$data['attach_id']}" base="public"}</url>
-	<downloads>{$data['attach_hits']}</downloads>
-	<date>{$data['attach_date']}</date>
-	<size>{$data['real_size']}</size>
-	<post>{parse url="app=forums&amp;module=forums&amp;section=findpost&amp;pid={$data['attach_rel_id']}" base="public"}</post>		
-</attachment>]]></template_content>
-      <template_name>Show_attachments_img_thumb</template_name>
-      <template_data>$data=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>softDeletedPostBit</template_name>
-      <template_data>$post, $sdData, $topic</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>topicPreview</template_name>
-      <template_data>$topic, $posts</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_topic</template_group>
-      <template_content><![CDATA[<forum>
-		<name>{$forum['name']}</name>
-		<id>{$forum['id']}</id>
-		<url>{parse url="showforum={$forum['id']}" seotitle="{{$forum['name_seo']}" template="showforum" base="public"}</url>
-		
-<if test="$forum['show_rules'] == 2">
-		<rules>
-			<title>{$forum['rules_title']}</title>
-			<text>
-				<!#^#|CDATA|
-						{$forum['rules_text']}
-				|#^#]>	
-			</text>
-		</rules>
-</if>
-<if test="$forum_data['show_rules'] == 1">
-		<rules>
-			<title>{$forum['rules_title']}</title>
-			<url>{parse url="showforum={$forum['id']}&amp;act=SR" base="public"}</url>
-		</rules>
-</if>
-	
-		<topic>
-			<id>{$topic['tid']}</id>
-			<title>{$topic['title']}</title>
-			<description>{$topic['description']}</description>
-			<url>{parse url="showtopic={$topic['tid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}</url>
-			
-			{$displayData['poll_data']}
-			
-			<posts>				
-<if test="is_array( $post_data ) AND count( $post_data )">
-	<foreach loop="post_data:$post_data as $pid => $post">
-				<post>
-					<id>{$post['post']['pid']}</id>
-					<date>{$post['post']['post_date']}</date>
-					<url>{parse url="showtopic={$post['post']['topic_id']}&amp;view=findpost&amp;p={$post['post']['pid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}</url>
-					<text><!#^#|CDATA|
-									{$post['post']['post']}{$post['post']['attachmentHtml']}
-						|#^#]>	
-					</text>
-					<reputation>{$post['post']['rep_points']}</reputation>
-		<if test="$post['post']['icon_id']">
-					<icon>{$this->settings['public_dir']}style_extra/post_icons/icon{$post['post']['icon_id']}.gif</icon>
-		</if>					
-					<user>
-		<if test="$post['author']['member_id']">
-						<id>{$post['author']['member_id']}</id>
-						<name>{$post['author']['members_display_name']}</name>
-						<url>{parse url="showuser={$post['author']['member_id']}" base="public" template="showuser" seotitle="{$post['author']['members_seo_name']}"}</url>
-						<online>{$post['author']['_online']}</online>
-						{parse template="userInfoPane" group="global" params="$post['author'], $post['post']['pid'], array()"}
-		<else />
-						<id>0</id>
-						<name>{$post['author']['members_display_name']}</name>
-		</if>
-					</user>
-		<if test="$post['post']['edit_by']">
-					<edited>
-						<reason>{$post['post']['post_edit_reason']}</reason>
-						<by>{$post['post']['edit_by']}</by>
-					</edited>
-		</if>
-					<signature>
-						<!#^#|CDATA|
-						{$post['post']['signature']}
-						|#^#]>						
-					</signature>
-				</post>				
-	</foreach>
-</if>
-			</posts>
-			{$topic['SHOW_PAGES']}
-		</topic>
-	</forum>
-	
-<if test="is_array( $displayData['active_users'] ) AND count( $displayData['active_users'] )">
-		<activeusers>
-			<total>{parse expression="intval( $displayData['active_users']['members'] + $displayData['active_users']['guests'] + $displayData['active_users']['anon'] )"}</total>
-			<guests>{$displayData['active_users']['guests']}</guests>
-			<anonymous>{$displayData['active_users']['anon']}</anonymous>			
-	<if test="is_array( $displayData['active_users']['names'] ) AND count( $displayData['active_users']['names'] )">
-			<users>
-		<foreach loop="$displayData['active_users']['names'] as $p => $r">
-				<user>
-					<id>{$r['id']}</id>
-					<name>{$r['p_start']}{$r['name']}{$r['p_end']}</name>
-					<url>{parse url="showuser={$r['id']}" seotitle="{$r['seo']}" template="showuser" base="public"}</url>
-				</user>
-		</foreach>
-			</users>
-	</if>
-		</activeusers>
-</if>]]></template_content>
-      <template_name>topicViewTemplate</template_name>
-      <template_data>$forum, $topic, $post_data, $displayData</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications/forums/xml/hooks.xml b/upload/admin/applications/forums/xml/hooks.xml
index 19649452..f6e0cef9 100644
--- a/upload/admin/applications/forums/xml/hooks.xml
+++ b/upload/admin/applications/forums/xml/hooks.xml
@@ -4,16 +4,12 @@
 		<file>recent_topics.xml</file>
 		<enabled>1</enabled>
 	</hook>
-	<hook>
-		<file>watched_items.xml</file>
-		<enabled>1</enabled>
-	</hook>
 	<hook>
 		<file>facebook_activity.xml</file>
 		<enabled>0</enabled>
 	</hook>
 	<hook>
-		<file>facebook_like.xml</file>
+		<file>tags.xml</file>
 		<enabled>0</enabled>
 	</hook>
 </hooks>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/xml/hooks/facebook_activity.xml b/upload/admin/applications/forums/xml/hooks/facebook_activity.xml
index 4fbf16b0..37baa608 100644
--- a/upload/admin/applications/forums/xml/hooks/facebook_activity.xml
+++ b/upload/admin/applications/forums/xml/hooks/facebook_activity.xml
@@ -6,7 +6,7 @@
       <hook_desc>Вывод активно�ти из Facebook</hook_desc>
       <hook_author>Invision Power Services, Inc.</hook_author>
       <hook_email/>
-      <hook_website/>
+      <hook_website>http://www.invisionpower.com</hook_website>
       <hook_update_check/>
       <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:3;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
       <hook_version_human>1.0.0</hook_version_human>
diff --git a/upload/admin/applications/forums/xml/hooks/facebook_like.xml b/upload/admin/applications/forums/xml/hooks/facebook_like.xml
deleted file mode 100644
index 057854c5..00000000
--- a/upload/admin/applications/forums/xml/hooks/facebook_like.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<hookexport>
-  <hookdata>
-    <config>
-      <hook_name>Понравило�ь в Facebook</hook_name>
-      <hook_desc><![CDATA[Добавление ��ылки &#39;Понравило�ь&#39; к теме]]></hook_desc>
-      <hook_author>Invision Power Services, Inc.</hook_author>
-      <hook_email/>
-      <hook_website/>
-      <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:3;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long>10000</hook_version_long>
-      <hook_extra_data><![CDATA[a:1:{s:8:"database";a:0:{}}]]></hook_extra_data>
-      <hook_key>fb_like</hook_key>
-    </config>
-  </hookdata>
-  <hookfiles>
-    <file>
-      <hook_file_real>boardIndexFacebookLike.php</hook_file_real>
-      <hook_type>templateHooks</hook_type>
-      <hook_classname>boardIndexFacebookLike</hook_classname>
-      <hook_data><![CDATA[a:7:{s:12:"dataLocation";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:10:"skin_topic";s:12:"skinFunction";s:17:"topicViewTemplate";s:4:"type";s:2:"if";s:2:"id";s:14:"forumJumpInner";s:8:"position";s:12:"post.startif";}]]></hook_data>
-      <hooks_source><![CDATA[<?php
-
-class boardIndexFacebookLike
-{
-	public $registry;
-	
-	public function __construct()
-	{
-		$this->registry = ipsRegistry::instance();
-	}
-	
-	public function getOutput()
-	{
-		return $this->registry->getClass('class_forums')->hooks_facebookLike();
-	}	
-}]]></hooks_source>
-    </file>
-  </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language/>
-  <hookextras_modules/>
-  <hookextras_help/>
-  <hookextras_templates/>
-  <hookextras_css/>
-  <hookextras_tasks/>
-  <hookextras_database_create/>
-  <hookextras_database_alter/>
-  <hookextras_database_update/>
-  <hookextras_database_insert/>
-</hookexport>
diff --git a/upload/admin/applications/forums/xml/hooks/index.html b/upload/admin/applications/forums/xml/hooks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/xml/hooks/index.html
+++ b/upload/admin/applications/forums/xml/hooks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/xml/hooks/recent_topics.xml b/upload/admin/applications/forums/xml/hooks/recent_topics.xml
index 16fe548f..b8dd471d 100644
--- a/upload/admin/applications/forums/xml/hooks/recent_topics.xml
+++ b/upload/admin/applications/forums/xml/hooks/recent_topics.xml
@@ -6,7 +6,7 @@
       <hook_desc>Выводит блок по�ледних тем на главной �транице форума</hook_desc>
       <hook_author>Invision Power Services, Inc</hook_author>
       <hook_email/>
-      <hook_website/>
+      <hook_website>http://www.invisionpower.com</hook_website>
       <hook_update_check/>
       <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
       <hook_version_human>1.0.0</hook_version_human>
diff --git a/upload/admin/applications/forums/xml/hooks/tags.xml b/upload/admin/applications/forums/xml/hooks/tags.xml
new file mode 100644
index 00000000..d5a7427c
--- /dev/null
+++ b/upload/admin/applications/forums/xml/hooks/tags.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hookexport>
+  <hookdata>
+    <config>
+      <hook_name>Теги</hook_name>
+      <hook_desc>Вывод �пи�ка попул�рных тегов в блоке �права на главной �транице</hook_desc>
+      <hook_author>Invision Power Services, Inc</hook_author>
+      <hook_email/>
+      <hook_website/>
+      <hook_update_check/>
+      <hook_requirements><![CDATA[a:3:{s:21:"required_applications";a:0:{}s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
+      <hook_version_human>1.0.0</hook_version_human>
+      <hook_version_long>10000</hook_version_long>
+      <hook_extra_data/>
+      <hook_key>boardIndexTags</hook_key>
+      <hook_global_caches/>
+      <hook_application/>
+    </config>
+  </hookdata>
+  <hookfiles>
+    <file>
+      <hook_file_real>boardIndexTags.php</hook_file_real>
+      <hook_type>templateHooks</hook_type>
+      <hook_classname>boardIndexTags</hook_classname>
+      <hook_data><![CDATA[a:8:{s:12:"dataLocation";s:0:"";s:14:"libApplication";s:0:"";s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:11:"skin_boards";s:12:"skinFunction";s:18:"boardIndexTemplate";s:4:"type";s:7:"foreach";s:2:"id";s:11:"side_blocks";s:8:"position";s:9:"outer.pre";}]]></hook_data>
+      <hooks_source><![CDATA[<?php
+
+class boardIndexTags
+{
+	public $registry;
+	
+	public function __construct()
+	{
+		$this->registry = ipsRegistry::instance();
+	}
+	
+	public function getOutput()
+	{
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/hooks/gateway.php', 'forums_hookGateway', 'forums' );
+		$hook = new $classToLoad( $this->registry );
+		
+		return $hook->tags();
+	}
+}]]></hooks_source>
+    </file>
+  </hookfiles>
+  <hookextras_settings/>
+  <hookextras_language/>
+  <hookextras_modules/>
+  <hookextras_help/>
+  <hookextras_templates/>
+  <hookextras_css/>
+  <hookextras_tasks/>
+  <hookextras_database_create/>
+  <hookextras_database_alter/>
+  <hookextras_database_update/>
+  <hookextras_database_insert/>
+</hookexport>
diff --git a/upload/admin/applications/forums/xml/hooks/watched_items.xml b/upload/admin/applications/forums/xml/hooks/watched_items.xml
deleted file mode 100644
index 918d9df7..00000000
--- a/upload/admin/applications/forums/xml/hooks/watched_items.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<hookexport>
-  <hookdata>
-    <config>
-      <hook_name>Подпи�ки на темы и форумы</hook_name>
-      <hook_desc>Выводит на главной �транице форумов блок подпи�ок на форумы и темы</hook_desc>
-      <hook_author>Invision Power Services, Inc</hook_author>
-      <hook_email/>
-      <hook_website/>
-      <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long>10000</hook_version_long>
-      <hook_extra_data><![CDATA[a:2:{s:7:"display";N;s:8:"database";a:0:{}}]]></hook_extra_data>
-      <hook_key>watched_content</hook_key>
-    </config>
-  </hookdata>
-  <hookfiles>
-    <file>
-      <hook_file_real>boardIndexWatchedItems.php</hook_file_real>
-      <hook_type>templateHooks</hook_type>
-      <hook_classname>boardIndexWatchedItems</hook_classname>
-      <hook_data><![CDATA[a:6:{s:15:"classToOverload";s:0:"";s:9:"skinGroup";s:11:"skin_boards";s:12:"skinFunction";s:18:"boardIndexTemplate";s:4:"type";s:7:"foreach";s:2:"id";s:11:"side_blocks";s:8:"position";s:9:"outer.pre";}]]></hook_data>
-      <hooks_source><![CDATA[<?php
-
-class boardIndexWatchedItems
-{
-	public $registry;
-	public $member;
-	
-	public function __construct()
-	{
-		$this->registry = ipsRegistry::instance();
-	}
-	
-	public function getOutput()
-	{
-		return $this->registry->getClass('class_forums')->hooks_watchedItems();
-	}	
-}]]></hooks_source>
-    </file>
-  </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language/>
-  <hookextras_modules/>
-  <hookextras_help/>
-  <hookextras_templates/>
-  <hookextras_css/>
-  <hookextras_tasks/>
-  <hookextras_database_create/>
-  <hookextras_database_alter/>
-  <hookextras_database_update/>
-  <hookextras_database_insert/>
-</hookexport>
diff --git a/upload/admin/applications/forums/xml/index.html b/upload/admin/applications/forums/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/forums/xml/index.html
+++ b/upload/admin/applications/forums/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/forums/xml/information.xml b/upload/admin/applications/forums/xml/information.xml
index d273f56d..2b9d6a2b 100644
--- a/upload/admin/applications/forums/xml/information.xml
+++ b/upload/admin/applications/forums/xml/information.xml
@@ -3,16 +3,20 @@
 	<data>
 		<name>Форумы</name>
 		<public_name>Форумы</public_name>
+        <hide_tab>0</hide_tab>
 		<author>Invision Power Services, Inc.</author>
 		<description>Модуль управлени� форумами и �ообщени�ми</description>
-		<templategroups>
+		<disabledatinstall>0</disabledatinstall>
+    <global_caches/>
+    <website/>
+    <update_check/>
+    <templategroups>
 			<template match="exact">skin_boards</template>
 			<template match="exact">skin_forum</template>
 			<template match="exact">skin_legends</template>
 			<template match="exact">skin_mod</template>
 			<template match="exact">skin_poll</template>
 			<template match="exact">skin_post</template>
-			<template match="exact">skin_printpage</template>
 			<template match="exact">skin_topic</template>
 		</templategroups>
 	</data>
diff --git a/upload/admin/applications/forums/xml/public_forums_language_pack.xml b/upload/admin/applications/forums/xml/public_forums_language_pack.xml
index 6a3230ef..c58dc9d4 100644
--- a/upload/admin/applications/forums/xml/public_forums_language_pack.xml
+++ b/upload/admin/applications/forums/xml/public_forums_language_pack.xml
@@ -4,542 +4,23 @@
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_boards</word_pack>
-      <word_key>wi_no_new</word_key>
-      <word_default>No new topics or posts</word_default>
-      <word_custom>�ет новых тем или �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>view_new_post</word_key>
+      <word_default>Go to the first unread post</word_default>
+      <word_custom>Перейти к первому непрочитанному �ообщению</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_boards</word_pack>
-      <word_key>wi_content_title</word_key>
-      <word_default>Watched Content</word_default>
-      <word_custom>Подпи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>next_occurrence</word_key>
+      <word_default>Occurs on </word_default>
+      <word_custom>Произойдет</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_boards</word_pack>
-      <word_key>show_by</word_key>
-      <word_default>Show by</word_default>
-      <word_custom>Полный �пи�ок по</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>today_active_cont</word_key>
-      <word_default><![CDATA[View today's active content]]></word_default>
-      <word_custom>По�мотреть �егодн�шние попул�рные публикации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>new_active_cont</word_key>
-      <word_default><![CDATA[Today's active content]]></word_default>
-      <word_custom>�ктивные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>f_none</word_key>
-      <word_default>----</word_default>
-      <word_custom>----</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>most_online</word_key>
-      <word_default><![CDATA[Most users ever online was <b><#NUM#></b> on <b><#DATE#></b>]]></word_default>
-      <word_custom><![CDATA[Самое большое количе�тво пользователей online <b><#NUM#></b> было <b><#DATE#></b>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>active_users_text</word_key>
-      <word_default>active user(s)</word_default>
-      <word_custom>по�етителей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>f_protected</word_key>
-      <word_default><![CDATA[<i>Protected Forum</i>]]></word_default>
-      <word_custom>Закрытый форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>info</word_key>
-      <word_default>Information</word_default>
-      <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>in</word_key>
-      <word_default>In:</word_default>
-      <word_custom>Тема: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>topics</word_key>
-      <word_default>Topics</word_default>
-      <word_custom>Тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>cat_name</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>last_post_info</word_key>
-      <word_default>Last Post Info</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>birth_users</word_key>
-      <word_default>members are celebrating their birthday today</word_default>
-      <word_custom>пользователей отмечающих �вое день рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>birth_user</word_key>
-      <word_default>member is celebrating his/her birthday today</word_default>
-      <word_custom>пользователь отмечающий �вое день рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>anon_users</word_key>
-      <word_default>anonymous users</word_default>
-      <word_custom>�крытых пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>posts</word_key>
-      <word_default>posts</word_default>
-      <word_custom>�ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>members</word_key>
-      <word_default>members</word_default>
-      <word_custom>пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>guests</word_key>
-      <word_default>guests</word_default>
-      <word_custom>го�тей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>board_stats</word_key>
-      <word_default>Our Board Statistics</word_default>
-      <word_custom>Стати�тика форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>replies</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_forum_leaders_title</word_key>
-      <word_default>View the moderating team</word_default>
-      <word_custom>По�мотреть админи�траторов и модераторов форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>no_birth_users</word_key>
-      <word_default>No members are celebrating a birthday today</word_default>
-      <word_custom>Сегодн� именинников нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>total_word_string</word_key>
-      <word_default><![CDATA[Our members have made a total of <b><#posts#></b> posts<br />We have <b><#reg#></b> registered members<br />The newest member is <b><a href='<#link#>'><#mem#></a></b>]]></word_default>
-      <word_custom><![CDATA[Пользователи напи�али <b><#posts#></b> �ообщений<br />Зареги�трировало�ь <b><#reg#></b> пользователей<br />По�ледний зареги�трировавший�� пользователь <b><a href='<#link#>'><#mem#></a></b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_forum_leaders</word_key>
-      <word_default>The moderating team</word_default>
-      <word_custom>�дмини�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_overall_posters</word_key>
-      <word_default>Overall top posters</word_default>
-      <word_custom>Самые активные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_overall_posters_title</word_key>
-      <word_default><![CDATA[View the board&#39;s 20 posters]]></word_default>
-      <word_custom>По�мотреть 20 �амых активных пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_all_posters_title</word_key>
-      <word_default><![CDATA[View today's top 20 posters]]></word_default>
-      <word_custom>По�мотреть 20 активных �егодн� пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>newslink</word_key>
-      <word_default>View the latest news</word_default>
-      <word_custom>По�ледние ново�ти:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sm_today_posters</word_key>
-      <word_default><![CDATA[Today's top 20 posters]]></word_default>
-      <word_custom>�ктивные �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>no_calendar_events</word_key>
-      <word_default>There are no forthcoming calendar events</word_default>
-      <word_custom>�ет �обытий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>calender_f_title</word_key>
-      <word_default>Forthcoming Calendar Events within the next %s days</word_default>
-      <word_custom>Будущие календарные �обыти� в ближайшие %s дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>oul_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>именам пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>oul_click</word_key>
-      <word_default>Last Click</word_default>
-      <word_custom>по�леднему дей�твию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>rd_hits</word_key>
-      <word_default>Redirected Hits</word_default>
-      <word_custom>Переходов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>whoschatting_none</word_key>
-      <word_default>There are no members talking in live chat at the moment</word_default>
-      <word_custom>В чате никого нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>whoschatting_loadchat</word_key>
-      <word_default>live chat</word_default>
-      <word_custom>живом чате</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>whoschatting_total</word_key>
-      <word_default>Member(s) active in</word_default>
-      <word_custom>Пользователей активных в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sub_forum_title</word_key>
-      <word_default>Subforums</word_default>
-      <word_custom>Подфорумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>recent_by</word_key>
-      <word_default>by</word_default>
-      <word_custom>автор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>f_queued</word_key>
-      <word_default>%s queued topic(s), %s queued post(s)</word_default>
-      <word_custom>ожидающих тем: %s, �ообщений: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>view_topic</word_key>
-      <word_default>View topic</word_default>
-      <word_custom>Про�мотр темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>todays_top_posters</word_key>
-      <word_default><![CDATA[Today's Top Posters]]></word_default>
-      <word_custom>�ктивные авторы �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>recently_added_topics</word_key>
-      <word_default>Recently Added Topics</word_default>
-      <word_custom>По�ледние темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>birthdays_today</word_key>
-      <word_default>member(s) have a birthday today</word_default>
-      <word_custom>пользователей, отмечающих день рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>upcoming_events</word_key>
-      <word_default>Upcoming Calendar Events</word_default>
-      <word_custom>Будущие календарные �обыти�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>active_users</word_key>
-      <word_default>(in the past %s minutes)</word_default>
-      <word_custom>(за по�ледние %s минут)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>online_at_once</word_key>
-      <word_default>Online At Once Record</word_default>
-      <word_custom>Рекорд по�ещаемо�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>total_members</word_key>
-      <word_default>Total Members</word_default>
-      <word_custom>Пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>newest_member</word_key>
-      <word_default>Newest Member</word_default>
-      <word_custom>�овый уча�тник</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>total_posts</word_key>
-      <word_default>Total Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>online_right_now</word_key>
+      <word_default>%s users are online</word_default>
+      <word_custom>Пользователей онлайн: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -547,399 +28,13 @@
       <word_key>view_last_post</word_key>
       <word_default>View last post</word_default>
       <word_custom>Про�мотр по�леднего �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_boards</word_pack>
-      <word_key>last_post</word_key>
-      <word_default>Last post</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>subforums</word_key>
-      <word_default>Subforums:</word_default>
-      <word_custom>Подфорумы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>view_unapproved</word_key>
-      <word_default>View unapproved topics</word_default>
-      <word_custom>Перейти к неподтвержденным темам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>go_to_forum</word_key>
-      <word_default>Go to forum</word_default>
-      <word_custom>Перейти к форуму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>stats</word_key>
-      <word_default>Stats</word_default>
-      <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>forums_in_cat</word_key>
-      <word_default>Forums within the category</word_default>
-      <word_custom>Форумы в категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>view_cat</word_key>
-      <word_default>View category</word_default>
-      <word_custom>Про�мотр категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>ex_col</word_key>
-      <word_default>Expand/Collapse</word_default>
-      <word_custom>Свернуть/Развернуть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sidebar_open</word_key>
-      <word_default>Open</word_default>
-      <word_custom>Открыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>toggle_cat</word_key>
-      <word_default>Toggle this category</word_default>
-      <word_custom>Свернуть категорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>board_index_title</word_key>
-      <word_default>Board Index</word_default>
-      <word_custom>Спи�ок форумов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>sidebar_close</word_key>
-      <word_default>Close</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>norecent_topics_hook</word_key>
-      <word_default>No recent topics</word_default>
-      <word_custom>�ет по�ледних тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>on</word_key>
-      <word_default>On</word_default>
-      <word_custom> </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>new_posts</word_key>
-      <word_default>View New Posts</word_default>
-      <word_custom>По�мотреть новые �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>norecent_entries_hook</word_key>
-      <word_default>No recent blog entries</word_default>
-      <word_custom>�ет по�ледних запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>view_entry</word_key>
-      <word_default>View blog entry</word_default>
-      <word_custom>По�мотреть запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>recently_added_entries</word_key>
-      <word_default>Recent Blog Entries</word_default>
-      <word_custom>По�ледние запи�и блога</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>recent_gallery_images</word_key>
-      <word_default>Recent Gallery Images</word_default>
-      <word_custom>По�ледние изображени� из галереи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>norecent_status_updates</word_key>
-      <word_default>No recent status updates</word_default>
-      <word_custom>�ет изменений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>recent_status_updates</word_key>
-      <word_default>Recent Status Updates</word_default>
-      <word_custom>По�ледние изменени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>update_status_default</word_key>
-      <word_default><![CDATA[What's on your mind?]]></word_default>
-      <word_custom>Что у теб� на уме?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__markread</word_key>
-      <word_default>Mark as read</word_default>
-      <word_custom>Отметить прочитанным </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__unreadf</word_key>
-      <word_default>Unread forum</word_default>
-      <word_custom>�е прочитанный форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__readf</word_key>
-      <word_default>Read forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__unreadcat</word_key>
-      <word_default>Unread category</word_default>
-      <word_custom>�е прочитанна� категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__readcat</word_key>
-      <word_default>Read category</word_default>
-      <word_custom>Категори�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__unreadpw</word_key>
-      <word_default>Unread forum (password protected)</word_default>
-      <word_custom>�е прочитанный форум (защищен паролем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__readpw</word_key>
-      <word_default>Read forum (password protected)</word_default>
-      <word_custom>Форум (защищен паролем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__readonly</word_key>
-      <word_default>Read-only forum</word_default>
-      <word_custom>�рхивный форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>macro__redirect</word_key>
-      <word_default>Redirect forum</word_default>
-      <word_custom>Переадре�аци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>viewnotifyhook</word_key>
-      <word_default>View Notification</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>hook_unreadtitle</word_key>
-      <word_default>Unread Notifications</word_default>
-      <word_custom>�епрочитанные уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>hook_nounreadnotify</word_key>
-      <word_default>No Unread Notifications</word_default>
-      <word_custom>�ет уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>slh_nothingtoshow</word_key>
-      <word_default>No items to show</word_default>
-      <word_custom>�ет ��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>slh_recently</word_key>
-      <word_default>Latest</word_default>
-      <word_custom>По�ледние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>slh_mostly</word_key>
-      <word_default>Most</word_default>
-      <word_custom>В�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>slh_title</word_key>
-      <word_default>Shared Links</word_default>
-      <word_custom>Опубликованные ��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>viewallupdates</word_key>
-      <word_default>View All Updates</word_default>
-      <word_custom>В�е изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>online_link</word_key>
+      <word_default>See full list</word_default>
+      <word_custom>Полный �пи�ок</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -947,9 +42,636 @@
       <word_key>hook_facebookactivity</word_key>
       <word_default>Recent Facebook Activity</word_default>
       <word_custom>�ктивно�ть в Facebook</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>viewallupdates</word_key>
+      <word_default>View All Updates</word_default>
+      <word_custom>В�е изменени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>slh_mostly</word_key>
+      <word_default>Most</word_default>
+      <word_custom>В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>slh_title</word_key>
+      <word_default>Shared Links</word_default>
+      <word_custom>Опубликованные ��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>slh_recently</word_key>
+      <word_default>Latest</word_default>
+      <word_custom>По�ледние</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>popular_tags</word_key>
+      <word_default>Popular Tags</word_default>
+      <word_custom>Попул�рные теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>slh_nothingtoshow</word_key>
+      <word_default>No items to show</word_default>
+      <word_custom>�ет ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__readcat</word_key>
+      <word_default>Read category</word_default>
+      <word_custom>Категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__readpw</word_key>
+      <word_default>Read forum (password protected)</word_default>
+      <word_custom>Форум (защищен паролем)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__readonly</word_key>
+      <word_default>Read-only forum</word_default>
+      <word_custom>�рхивный форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__redirect</word_key>
+      <word_default>Redirect forum</word_default>
+      <word_custom>Переадре�аци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__unreadpw</word_key>
+      <word_default>Unread forum (password protected)</word_default>
+      <word_custom>�е прочитанный форум (защищен паролем)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__unreadcat</word_key>
+      <word_default>Unread category</word_default>
+      <word_custom>�е прочитанна� категори�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__readf</word_key>
+      <word_default>Read forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__unreadf</word_key>
+      <word_default>Unread forum</word_default>
+      <word_custom>�е прочитанный форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>macro__markread</word_key>
+      <word_default>Mark as read</word_default>
+      <word_custom>Отметить прочитанным </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>update_status_default</word_key>
+      <word_default><![CDATA[What's on your mind?]]></word_default>
+      <word_custom>Что у теб� на уме?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>recent_status_updates</word_key>
+      <word_default>Recent Status Updates</word_default>
+      <word_custom>По�ледние изменени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>norecent_status_updates</word_key>
+      <word_default>No recent status updates</word_default>
+      <word_custom>�ет изменений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>recent_gallery_images</word_key>
+      <word_default>Recent Gallery Images</word_default>
+      <word_custom>По�ледние изображени� из галереи</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>recently_added_entries</word_key>
+      <word_default>Recent Blog Entries</word_default>
+      <word_custom>По�ледние запи�и блога</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>norecent_entries_hook</word_key>
+      <word_default>No recent blog entries</word_default>
+      <word_custom>�ет по�ледних запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>on</word_key>
+      <word_default>On</word_default>
+      <word_custom> </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>view_entry</word_key>
+      <word_default>View blog entry</word_default>
+      <word_custom>По�мотреть запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>new_posts</word_key>
+      <word_default>View New Posts</word_default>
+      <word_custom>По�мотреть новые �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>norecent_topics_hook</word_key>
+      <word_default>No recent topics</word_default>
+      <word_custom>�ет по�ледних тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sidebar_open</word_key>
+      <word_default>Open</word_default>
+      <word_custom>Открыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>board_index_title</word_key>
+      <word_default>Community Index</word_default>
+      <word_custom>Спи�ок форумов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sidebar_close</word_key>
+      <word_default>Close</word_default>
+      <word_custom>Закрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>ex_col</word_key>
+      <word_default>Expand/Collapse</word_default>
+      <word_custom>Свернуть/Развернуть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>toggle_cat</word_key>
+      <word_default>Toggle this category</word_default>
+      <word_custom>Свернуть категорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>forums_in_cat</word_key>
+      <word_default>Forums within the category</word_default>
+      <word_custom>Форумы в категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>subforums</word_key>
+      <word_default>Subforums:</word_default>
+      <word_custom>Подфорумы:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>stats</word_key>
+      <word_default>Stats</word_default>
+      <word_custom>Стати�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>view_cat</word_key>
+      <word_default>View category</word_default>
+      <word_custom>Про�мотр категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>go_to_forum</word_key>
+      <word_default>Go to forum</word_default>
+      <word_custom>Перейти к форуму</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>last_post</word_key>
+      <word_default>Last post</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>view_unapproved</word_key>
+      <word_default>View unapproved items</word_default>
+      <word_custom>Перейти к неподтвержденному</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>total_posts</word_key>
+      <word_default>Total Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>total_members</word_key>
+      <word_default>Total Members</word_default>
+      <word_custom>Пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>newest_member</word_key>
+      <word_default>Newest Member</word_default>
+      <word_custom>�овый уча�тник</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>upcoming_events</word_key>
+      <word_default>Upcoming Calendar Events</word_default>
+      <word_custom>Будущие календарные �обыти�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>online_at_once</word_key>
+      <word_default>Most Online</word_default>
+      <word_custom>Рекорд по�ещаемо�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>recently_added_topics</word_key>
+      <word_default>Recent Topics</word_default>
+      <word_custom>По�ледние темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>todays_top_posters</word_key>
+      <word_default><![CDATA[Today's Top Posters]]></word_default>
+      <word_custom>�ктивные авторы �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>view_topic</word_key>
+      <word_default>View topic</word_default>
+      <word_custom>Про�мотр темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>recent_by</word_key>
+      <word_default>by</word_default>
+      <word_custom>автор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>f_queued</word_key>
+      <word_default>%s queued topic(s) and %s queued post(s)</word_default>
+      <word_custom>ожидающих тем: %s, �ообщений: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>f_queued_topics</word_key>
+      <word_default>%s queued topic(s)</word_default>
+      <word_custom>Ожидающих тем: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>f_queued_posts</word_key>
+      <word_default>%s queued post(s)</word_default>
+      <word_custom>Ожидающих �ообщений: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sub_forum_title</word_key>
+      <word_default>Subforums</word_default>
+      <word_custom>Подфорумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>whoschatting_total</word_key>
+      <word_default>Member(s) active in</word_default>
+      <word_custom>Пользователей активных в</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>whoschatting_none</word_key>
+      <word_default>There are no members talking in live chat at the moment</word_default>
+      <word_custom>В чате никого нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>whoschatting_loadchat</word_key>
+      <word_default>live chat</word_default>
+      <word_custom>живом чате</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>rd_hits</word_key>
+      <word_default>Hits</word_default>
+      <word_custom>Переходов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>oul_click</word_key>
+      <word_default>Last Click</word_default>
+      <word_custom>по�леднему дей�твию</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>newslink</word_key>
+      <word_default>View the latest news</word_default>
+      <word_custom>По�ледние ново�ти:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>no_calendar_events</word_key>
+      <word_default>There are no forthcoming calendar events</word_default>
+      <word_custom>�ет �обытий</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>oul_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>именам пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>by</word_key>
+      <word_default>By</word_default>
+      <word_custom>�втор:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>calender_f_title</word_key>
+      <word_default>Forthcoming Calendar Events within the next %s days</word_default>
+      <word_custom>Будущие календарные �обыти� в ближайшие %s дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_all_posters_title</word_key>
+      <word_default><![CDATA[View today's top 20 posters]]></word_default>
+      <word_custom>По�мотреть 20 активных �егодн� пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_today_posters</word_key>
+      <word_default><![CDATA[Today's top 20 posters]]></word_default>
+      <word_custom>�ктивные �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_overall_posters_title</word_key>
+      <word_default><![CDATA[View the board&#39;s overall top posters]]></word_default>
+      <word_custom>По�мотреть 20 �амых активных пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_overall_posters</word_key>
+      <word_default>Overall top posters</word_default>
+      <word_custom>Самые активные</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_forum_leaders_title</word_key>
+      <word_default>View the moderating team</word_default>
+      <word_custom>По�мотреть админи�траторов и модераторов форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>sm_forum_leaders</word_key>
+      <word_default>The moderating team</word_default>
+      <word_custom>�дмини�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>no_birth_users</word_key>
+      <word_default>No members are celebrating a birthday today</word_default>
+      <word_custom>Сегодн� именинников нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>birthdays_title</word_key>
+      <word_default>%s Birthday(s) Today</word_default>
+      <word_custom>Дней рождени� �егодн�: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>total_word_string</word_key>
+      <word_default><![CDATA[Our members have made a total of <b><#posts#></b> posts<br />We have <b><#reg#></b> registered members<br />The newest member is <b><a href='<#link#>'><#mem#></a></b>]]></word_default>
+      <word_custom><![CDATA[Пользователи напи�али <b><#posts#></b> �ообщений<br />Зареги�трировало�ь <b><#reg#></b> пользователей<br />По�ледний зареги�трировавший�� пользователь <b><a href='<#link#>'><#mem#></a></b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>replies</word_key>
+      <word_default>replies</word_default>
+      <word_custom>Ответов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>board_stats</word_key>
+      <word_default>Community Statistics</word_default>
+      <word_custom>Стати�тика форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>guests</word_key>
+      <word_default>guests</word_default>
+      <word_custom>го�тей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>anon_users</word_key>
+      <word_default>anonymous users</word_default>
+      <word_custom>�крытых пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>members</word_key>
+      <word_default>members</word_default>
+      <word_custom>пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>last_post_info</word_key>
+      <word_default>Last Post Info</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>cat_name</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>new_active_cont</word_key>
+      <word_default><![CDATA[Today's active content]]></word_default>
+      <word_custom>�ктивные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>today_active_cont</word_key>
+      <word_default><![CDATA[View today's active content]]></word_default>
+      <word_custom>По�мотреть �егодн�шние попул�рные публикации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>f_none</word_key>
+      <word_default>No posts to view</word_default>
+      <word_custom>----</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>most_online</word_key>
+      <word_default><![CDATA[Most users ever online was <b><#NUM#></b> on <b><#DATE#></b>]]></word_default>
+      <word_custom><![CDATA[Самое большое количе�тво пользователей online <b><#NUM#></b> было <b><#DATE#></b>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>active_users_text</word_key>
+      <word_default>active user(s)</word_default>
+      <word_custom>по�етителей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>active_users</word_key>
+      <word_default>(in the past %s minutes)</word_default>
+      <word_custom>(за по�ледние %s минут)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>info</word_key>
+      <word_default>Information</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>topics</word_key>
+      <word_default>topics</word_default>
+      <word_custom>Тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>f_protected</word_key>
+      <word_default><![CDATA[<i>Protected Forum</i>]]></word_default>
+      <word_custom>Закрытый форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>in</word_key>
+      <word_default>In:</word_default>
+      <word_custom>Тема: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>show_by</word_key>
+      <word_default>Show by</word_default>
+      <word_custom>Полный �пи�ок по</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>wi_content_title</word_key>
+      <word_default>Watched Content</word_default>
+      <word_custom>Подпи�ки</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -957,19 +679,6 @@
       <word_key>wi_not_watch</word_key>
       <word_default>You are not watching any forums</word_default>
       <word_custom>У ва� еще нет подпи�ок на форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>wi_no_topics</word_key>
-      <word_default>You are not watching any topics</word_default>
-      <word_custom>У ва� еще нет подпи�ок на темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -977,9 +686,20 @@
       <word_key>wi_toggle_start</word_key>
       <word_default>Toggle</word_default>
       <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>wi_no_topics</word_key>
+      <word_default>You are not watching any topics</word_default>
+      <word_custom>У ва� еще нет подпи�ок на темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_boards</word_pack>
+      <word_key>wi_no_new</word_key>
+      <word_default>No new topics or posts</word_default>
+      <word_custom>�ет новых тем или �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -987,9 +707,6 @@
       <word_key>wi_toggle_end</word_key>
       <word_default>forums with no new</word_default>
       <word_custom>форумы без обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -997,19 +714,6 @@
       <word_key>wi_t_toggle_end</word_key>
       <word_default>topic with no new</word_default>
       <word_custom>темы без обновлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_boards</word_pack>
-      <word_key>watched_topics</word_key>
-      <word_default>Topics</word_default>
-      <word_custom>Темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -1017,1339 +721,153 @@
       <word_key>watched_forums</word_key>
       <word_default>Forums</word_default>
       <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>forum_no_start_topic</word_key>
-      <word_default>You cannot start a new topic</word_default>
-      <word_custom>Вы не можете �оздать новую тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>forum_by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>По�л. �ообщение:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_submit</word_key>
-      <word_default>Go</word_default>
-      <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>need_password_txt</word_key>
-      <word_default><![CDATA[<b>This forum is protected by a password!</b><br/ >You must enter the correct forum password to gain access to this forum. Please ensure that your browser is capable of storing temporary cookies]]></word_default>
-      <word_custom><![CDATA[Этот форум защищен паролем!<br />Вы должны вве�ти верный пароль дл� до�тупа в �тот форум. Проверьте и убедите�ь, что ваш браузер поддерживает временные cookies.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_ireplied</word_key>
-      <word_default>Topics: I Replied</word_default>
-      <word_custom>Темы: С моими ответами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>f_pass_submit</word_key>
-      <word_default>Proceed</word_default>
-      <word_custom>Войти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>enter_pass</word_key>
-      <word_default>Forum Password</word_default>
-      <word_custom>Пароль форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>need_password</word_key>
-      <word_default>This is a password-protected forum</word_default>
-      <word_custom>Это закрытый форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_istarted</word_key>
-      <word_default>Topics: I Started</word_default>
-      <word_custom>Темы: Созданные мною</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_moved</word_key>
-      <word_default>Topics: Moved</word_default>
-      <word_custom>Темы: Перемещенные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_locked</word_key>
-      <word_default>Topics: Locked</word_default>
-      <word_custom>Темы: Закрытые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_poll</word_key>
-      <word_default>Topics: Polls</word_default>
-      <word_custom>Темы: Опро�ы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_hot</word_key>
-      <word_default>Topics: Hot</word_default>
-      <word_custom>Темы: Гор�чие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_open</word_key>
-      <word_default>Topics: Open</word_default>
-      <word_custom>Темы: Открытые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topicfilter_all</word_key>
-      <word_default>Topics: All</word_default>
-      <word_custom>Темы: В�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>ascending_order</word_key>
-      <word_default>A-Z</word_default>
-      <word_custom>�-Я</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>descending_order</word_key>
-      <word_default>Z-A</word_default>
-      <word_custom>Я-�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_views</word_key>
-      <word_default>Order: Views</word_default>
-      <word_custom>По: про�мотрам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_attach</word_key>
-      <word_default>Order: Attachments</word_default>
-      <word_custom>По: прикреплени�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_start</word_key>
-      <word_default>Order: Topic Started</word_default>
-      <word_custom>По: дате открыти�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_topic</word_key>
-      <word_default>Order: Topic Title</word_default>
-      <word_custom>По: названию темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_replies</word_key>
-      <word_default>Order: Replies</word_default>
-      <word_custom>По: ответам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_poster</word_key>
-      <word_default>Order: Topic Starter</word_default>
-      <word_custom>По: автору темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_last_poster</word_key>
-      <word_default>Order: Last Poster</word_default>
-      <word_custom>По: по�леднему автору</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>sort_by_date</word_key>
-      <word_default>Order: Last Post</word_default>
-      <word_custom>По: по�леднему �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_7_days</word_key>
-      <word_default>From: 7 days</word_default>
-      <word_custom>За: 7 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_year</word_key>
-      <word_default>From: 365 days</word_default>
-      <word_custom>За: 365 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_all</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>За: в�е врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_30_days</word_key>
-      <word_default>From: 30 days</word_default>
-      <word_custom>За: 30 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_90_days</word_key>
-      <word_default>From: 90 days</word_default>
-      <word_custom>За: 90 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_60_days</word_key>
-      <word_default>From: 60 days</word_default>
-      <word_custom>За: 60 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_10_days</word_key>
-      <word_default>From: 10 days</word_default>
-      <word_custom>За: 10 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_20_days</word_key>
-      <word_default>From: 20 days</word_default>
-      <word_custom>За: 20 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_25_days</word_key>
-      <word_default>From: 25 days</word_default>
-      <word_custom>За: 25 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_15_days</word_key>
-      <word_default>From: 15 days</word_default>
-      <word_custom>За: 15 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_5_days</word_key>
-      <word_default>From: 5 days</word_default>
-      <word_custom>За: 5 дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_today</word_key>
-      <word_default>From: Today</word_default>
-      <word_custom>За: �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_moved</word_key>
-      <word_default>Moved Topic</word_default>
-      <word_custom>Тема перемещена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>logged_in</word_key>
-      <word_default>You have been authorized to access this forum</word_default>
-      <word_custom>Вы у�пешно авторизировали�ь в �том форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_locked</word_key>
-      <word_default>Locked Topic</word_default>
-      <word_custom>Закрыта� тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_poll_no</word_key>
-      <word_default>Poll (No New)</word_default>
-      <word_custom>Опро� (нет новых голо�ов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_hot_new</word_key>
-      <word_default>Hot Topic (New)</word_default>
-      <word_custom>Гор�ча� тема (е�ть новые ответы)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_poll</word_key>
-      <word_default>Poll (New)</word_default>
-      <word_custom>Опро� (е�ть новые голо�а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_hot_no</word_key>
-      <word_default>Hot Topic (No New)</word_default>
-      <word_custom>Гор�ча� тема (нет новых ответов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_open_no</word_key>
-      <word_default>No New Replies</word_default>
-      <word_custom>Открыта� тема (нет новых ответов)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>search_forum</word_key>
-      <word_default>Search forum</word_default>
-      <word_custom>Пои�к по форуму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>pm_open_new</word_key>
-      <word_default>New Replies</word_default>
-      <word_custom>Открыта� тема (е�ть новые ответы)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>attach_post_date</word_key>
-      <word_default>Posted on</word_default>
-      <word_custom>Добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>active_users_title</word_key>
-      <word_default>%s user(s) are browsing this forum</word_default>
-      <word_custom>%s человек про�матривают �тот форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>attach_page_title</word_key>
-      <word_default>Attachments</word_default>
-      <word_custom>Прикреплени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>attach_size</word_key>
-      <word_default>Size</word_default>
-      <word_custom>Размер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>attach_post</word_key>
-      <word_default>Post #</word_default>
-      <word_custom>Сообщение №</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>attach_title</word_key>
-      <word_default>Attachment</word_default>
-      <word_custom>Прикрепление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_attach</word_key>
-      <word_default>attachment(s): View</word_default>
-      <word_custom>прикрепленные файлы: про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mm_title</word_key>
-      <word_default>Multi-Moderation</word_default>
-      <word_custom>Мультимодераци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_unapprove</word_key>
-      <word_default>Set Invisible (Unapprove)</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>f_go</word_key>
-      <word_default>With Selected</word_default>
-      <word_custom>Отмеченные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_undelete</word_key>
-      <word_default>Restore Deleted Topics</word_default>
-      <word_custom>Во��тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_merge</word_key>
-      <word_default>Merge Topics</word_default>
-      <word_custom>Соединить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_approve</word_key>
-      <word_default>Set Visible (Approve)</word_default>
-      <word_custom>Опубликовать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_delete</word_key>
-      <word_default>Delete Topics</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_move</word_key>
-      <word_default>Move Topics</word_default>
-      <word_custom>Переме�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_unpin</word_key>
-      <word_default>Unpin Topics</word_default>
-      <word_custom>Опу�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_pin</word_key>
-      <word_default>Pin Topics</word_default>
-      <word_custom>Подн�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_close</word_key>
-      <word_default>Close Topics</word_default>
-      <word_custom>Закрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>cpt_open</word_key>
-      <word_default>Open Topics</word_default>
-      <word_custom>Открыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_prune</word_key>
-      <word_default>Prune / Mass Move</word_default>
-      <word_custom>Удаление / ма��овое перемещение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>back_to_forum</word_key>
-      <word_default>Return to the forum</word_default>
-      <word_custom>Вернуть�� в форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_showallposts</word_key>
-      <word_default>Show All Topics With Invisible Posts</word_default>
-      <word_custom>Показать в�е темы �о �крытыми �ообщени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_showallinvisible</word_key>
-      <word_default>Show All Invisible Topics</word_default>
-      <word_custom>Показать в�е �крытые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>announce_row</word_key>
-      <word_default>Announcement</word_default>
-      <word_custom>Объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>remember_options</word_key>
-      <word_default>Remember filters</word_default>
-      <word_custom>Запомнить параметры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mark_as_read</word_key>
-      <word_default>Mark this forum as read</word_default>
-      <word_custom>Отметить �тот форум прочитанным</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>ft_title_stop</word_key>
-      <word_default>Stop Watching Forum</word_default>
-      <word_custom>Отпи�ать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>jscript_otherpage</word_key>
-      <word_default>from other pages</word_default>
-      <word_custom>� других �траниц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>forum_topic_list</word_key>
-      <word_default>Topics In This Forum</word_default>
-      <word_custom>Темы форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>ft_title</word_key>
-      <word_default>Watch Forum</word_default>
-      <word_custom>Подпи�ать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>show_last_visit</word_key>
-      <word_default>Show: Since Last Visit</word_default>
-      <word_custom>� по�леднего по�ещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>filter_options</word_key>
-      <word_default>Click here to show filter options</word_default>
-      <word_custom>Показать опции фильтра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_hidden</word_key>
-      <word_default>Show Hidden Topics</word_default>
-      <word_custom>Показать �крытые темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_hidden_posts</word_key>
-      <word_default>Show Topics With Hidden Posts</word_default>
-      <word_custom>Показать темы �о �крытыми �ообщени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_resync</word_key>
-      <word_default>Resynchronize Forum</word_default>
-      <word_custom>Синхронизировать форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>mod_prumemovetopics</word_key>
-      <word_default>Prune/Mass Move Topics</word_default>
-      <word_custom>Удаление / ма��овое перемещение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>forum_management</word_key>
-      <word_default>Forum Management</word_default>
-      <word_custom>Опции форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>goto_last_post</word_key>
-      <word_default>Go to last post</word_default>
-      <word_custom>Перейти к по�леднему �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>no_topics</word_key>
-      <word_default>No topics were found. This is either because there are no topics in this forum, or the topics are older than the current age cut-off.</word_default>
-      <word_custom>�ет тем. Такое может быть е�ли тем дей�твительно в данном форуме еще не �оздавало�ь, или е�ли вы�тавлены фильтры про�мотра �пи�ка тем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>views</word_key>
-      <word_default>Views</word_default>
-      <word_custom>Про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>reply</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>view_uapproved_posts</word_key>
-      <word_default>View unapproved posts</word_default>
-      <word_custom>Перейти к неподтвержденному �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_started_on</word_key>
-      <word_default>View topic, started </word_default>
-      <word_custom>Про�мотреть тему, �озданную </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_goto_page</word_key>
-      <word_default>Go to page</word_default>
-      <word_custom>Перейти к �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>first_unread_post</word_key>
-      <word_default>Go to first unread post</word_default>
-      <word_custom>К первому непрочитанному �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_open</word_key>
-      <word_default>Open topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_close</word_key>
-      <word_default>Close topic</word_default>
-      <word_custom>Закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_unpin</word_key>
-      <word_default>Unpin topic</word_default>
-      <word_custom>Опу�тить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_pin</word_key>
-      <word_default>Pin topic</word_default>
-      <word_custom>Подн�ть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_delete</word_key>
-      <word_default>Delete topic</word_default>
-      <word_custom>Удалить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_rename</word_key>
-      <word_default>Rename topic</word_default>
-      <word_custom>Переименовать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>posted_by</word_key>
-      <word_default>Posted by</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_start</word_key>
-      <word_default>Start New Topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topic_select_all</word_key>
-      <word_default>Select all topics</word_default>
-      <word_custom>Отметить в�е темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>view_announcement</word_key>
-      <word_default>View announcement</word_default>
-      <word_custom>Прочитать объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>in_last_topic</word_key>
-      <word_default>In:</word_default>
-      <word_custom>Ð’:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>goto_forum</word_key>
-      <word_default>Go to forum</word_default>
-      <word_custom>Перейти к форуму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>topics</word_key>
+      <word_pack>public_boards</word_pack>
+      <word_key>watched_topics</word_key>
       <word_default>Topics</word_default>
       <word_custom>Темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>replies</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mini_page_count</word_key>
+      <word_default>%s pages</word_default>
+      <word_custom>Страницы: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>cat_subforums</word_key>
-      <word_default>Sub-forums within the category</word_default>
-      <word_custom>Подфорумы в категории</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>follow_notify_forums</word_key>
+      <word_default>forums</word_default>
+      <word_custom>форумы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>view_forum_rules</word_key>
-      <word_default>View forum rules</word_default>
-      <word_custom>Прочитать правила</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>go_back_to</word_key>
+      <word_default>Back to %s</word_default>
+      <word_custom>Обратно в %s </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>view_post</word_key>
-      <word_default>View post</word_default>
-      <word_custom>Про�мотр �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>poll_prefix</word_key>
+      <word_default>Poll</word_default>
+      <word_custom>Опро�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>forum_rules</word_key>
-      <word_default>Forum Rules</word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sort_start</word_key>
+      <word_default>Start Date</word_default>
+      <word_custom>По дате �оздани�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>filter_time</word_key>
-      <word_default>Time frame:</word_default>
-      <word_custom>Сроки: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sort_recent</word_key>
+      <word_default>Recently Updated</word_default>
+      <word_custom>�едавно �озданные</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>filter_direction</word_key>
-      <word_default>Sort direction:</word_default>
-      <word_custom>от</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_queued_count</word_key>
+      <word_default><![CDATA[This topic has <strong>%s</strong> queued posts. Click to view.]]></word_default>
+      <word_custom>%s �ообщений в теме ожидают подвтерждени�. Щелкните дл� про�мотра.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>filter_sort</word_key>
-      <word_default>Sort by:</word_default>
-      <word_custom>�ортировать </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sort_replies</word_key>
+      <word_default>Most Replies</word_default>
+      <word_custom>Самые об�уждаемые</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>filter_type</word_key>
-      <word_default>Show type:</word_default>
-      <word_custom>Показывать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sort_views</word_key>
+      <word_default>Most Viewed</word_default>
+      <word_custom>Самые про�матриваемые</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>view_reported_posts</word_key>
-      <word_default>View reported posts</word_default>
-      <word_custom>Про�мотр �ообщени� � жалобой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>show_mod_tools</word_key>
+      <word_default>Show moderation tools</word_default>
+      <word_custom>Показать ин�тументы модератора</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>rename_topic_update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sort_custom</word_key>
+      <word_default>Custom</word_default>
+      <word_custom>�а�троить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>view_deleted_posts</word_key>
-      <word_default>View deleted posts</word_default>
-      <word_custom>Про�мотреть удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_started_by</word_key>
+      <word_default>Started by %s,</word_default>
+      <word_custom>�втор %s,</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>nmo_t_delete_softed</word_key>
-      <word_default><![CDATA[&middot; Permanently Remove %s deleted forum topics]]></word_default>
-      <word_custom><![CDATA[&middot; Полное удаление %s �крытых тем]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_is_hot</word_key>
+      <word_default>Hot</word_default>
+      <word_custom>Попул�рна� тема</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>nmo_t_restore</word_key>
-      <word_default><![CDATA[&middot; Restore %s deleted forum topics]]></word_default>
-      <word_custom><![CDATA[&middot; Во��тановление %s удаленных тем]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>load_more_topics</word_key>
+      <word_default>Load more topics</word_default>
+      <word_custom>Загрузить �ледующие темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>nmo_t_delete_approve</word_key>
-      <word_default><![CDATA[&middot; Permanently Remove %s un-approved forum topics]]></word_default>
-      <word_custom><![CDATA[&middot; Полное удаление %s не подтвержденных тем]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>show_mod_tools_desc</word_key>
+      <word_default>Provides tools for managing topics in this forum</word_default>
+      <word_custom>Ин�турменты дл� управлени� темами в �том форуме</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>nmo_t_approve</word_key>
-      <word_default><![CDATA[&middot; Approve %s un-approved forum topics]]></word_default>
-      <word_custom><![CDATA[&middot; Одобрение %s не подтвержденных ntv]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_ucfirst_unfollow_f</word_key>
+      <word_default>Unfollow this forum</word_default>
+      <word_custom>Прекратить �лежение за форумом</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>dlt_delete_now</word_key>
-      <word_default>Delete Now</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_follow_f</word_key>
+      <word_default>follow this forum</word_default>
+      <word_custom>�ледить за форумом</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>dlt_delete_from_topic_desc</word_key>
-      <word_default>The post will be removed from this forum completely</word_default>
-      <word_custom>Тема будет полно�тью удалена из форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_ucfirst_follow_f</word_key>
+      <word_default>Follow this forum</word_default>
+      <word_custom>Следить за форумом</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>dlt_delete_from_topic</word_key>
-      <word_default>Delete From Forum</word_default>
-      <word_custom>Удалить из форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_unfollow_f</word_key>
+      <word_default>unfollow this forum</word_default>
+      <word_custom>прекратить �лежение за форумом</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>dlt_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_remove_from_view_desc</word_key>
-      <word_default>The topic may still be visible to moderators in this forum.</word_default>
-      <word_custom>Тема будет видна только модераторам форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_reason</word_key>
-      <word_default>Reason:</word_default>
-      <word_custom>Причина: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_remove_from_view</word_key>
-      <word_default>Remove From View</word_default>
-      <word_custom>Удалить из �пи�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_title</word_key>
-      <word_default>Delete Topic</word_default>
-      <word_custom>Удаление темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_delete_topic</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>dlt_restore_topic</word_key>
-      <word_default>Restore</word_default>
-      <word_custom>Во��тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>tdb__noreasongi</word_key>
-      <word_default>No reason given</word_default>
-      <word_custom>Без причины</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_forums</word_pack>
-      <word_key>tdb__forumindex</word_key>
-      <word_default>Topic deleted by</word_default>
-      <word_custom>Тему удалил </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>you_posted_here</word_key>
+      <word_default>You posted in this topic</word_default>
+      <word_custom>Вы о�тавили �ообщение в �той теме</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2357,19 +875,972 @@
       <word_key>lastby</word_key>
       <word_default>Last by</word_default>
       <word_custom>по�ледний от</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
-      <word_key>forum_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_totalcount_follow_f</word_key>
+      <word_default>%s member(s) follow this forum</word_default>
+      <word_custom>Пользователи �лед�щие за форумом: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>tdb__forumindex</word_key>
+      <word_default>Topic deleted by %s, </word_default>
+      <word_custom>Тему удалил </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>tdb__noreasongi</word_key>
+      <word_default>No reason given</word_default>
+      <word_custom>Без причины</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_restore_topic</word_key>
+      <word_default>Restore</word_default>
+      <word_custom>Во��тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_delete_topic</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_remove_from_view_desc</word_key>
+      <word_default><![CDATA[This option <strong>hides the post</strong>, but leaves it in the topic.]]></word_default>
+      <word_custom>Тема будет видна только модераторам форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_remove_from_view</word_key>
+      <word_default>Remove From View</word_default>
+      <word_custom>Удалить из �пи�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_title</word_key>
+      <word_default>Delete Topic</word_default>
+      <word_custom>Удаление темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dltt_remove_from_view_desc</word_key>
+      <word_default><![CDATA[This option <strong>hides the topic</strong>, but leaves it in the forum.]]></word_default>
+      <word_custom>Эта опци� �крывает темы, но о�тавл�ет их в форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_delete_from_topic</word_key>
+      <word_default>Delete From Forum</word_default>
+      <word_custom>Удалить из форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_remove_from_view_extra</word_key>
+      <word_default>Moderators may be still be able to view it</word_default>
+      <word_custom>Тема будет видна только модераторам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_reason</word_key>
+      <word_default>Reason:</word_default>
+      <word_custom>Причина: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dltt_delete_from_topic_desc</word_key>
+      <word_default><![CDATA[This option <strong>completely removes the topic</strong> from the forum.]]></word_default>
+      <word_custom><![CDATA[Опци� позвол�ет <strong>полно�тью</strong> удалить тему � форума.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>nmo_t_restore</word_key>
+      <word_default><![CDATA[&middot; Restore %s deleted forum topics]]></word_default>
+      <word_custom><![CDATA[&middot; Во��тановление %s удаленных тем]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>nmo_t_approve</word_key>
+      <word_default><![CDATA[&middot; Approve %s un-approved forum topics]]></word_default>
+      <word_custom><![CDATA[&middot; Одобрение %s не подтвержденных ntv]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>nmo_t_delete_approve</word_key>
+      <word_default><![CDATA[&middot; Permanently Remove %s un-approved forum topics]]></word_default>
+      <word_custom><![CDATA[&middot; Полное удаление %s не подтвержденных тем]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_delete_now</word_key>
+      <word_default>Delete Now</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_delete_from_topic_extra</word_key>
+      <word_default>It may be available for review in the ModeratorCP</word_default>
+      <word_custom>Может быть до�тупен дл� про�мотра в модератор�кой панели</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>nmo_t_delete_softed</word_key>
+      <word_default><![CDATA[&middot; Permanently Remove %s deleted forum topics]]></word_default>
+      <word_custom><![CDATA[&middot; Полное удаление %s �крытых тем]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>dlt_delete_from_topic_desc</word_key>
+      <word_default><![CDATA[This option <strong>completely removes the post</strong> from the topic.]]></word_default>
+      <word_custom>Тема будет полно�тью удалена из форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>rename_topic_update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_reported_posts</word_key>
+      <word_default>View reported posts</word_default>
+      <word_custom>Про�мотр �ообщени� � жалобой</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>filter_type</word_key>
+      <word_default>Show topic type</word_default>
+      <word_custom>Показывать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_deleted_posts</word_key>
+      <word_default>View deleted posts</word_default>
+      <word_custom>Про�мотреть удаленные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>filter_direction</word_key>
+      <word_default>Sort direction</word_default>
+      <word_custom>от</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>filter_sort</word_key>
+      <word_default>Sort by</word_default>
+      <word_custom>�ортировать </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_post</word_key>
+      <word_default>View post</word_default>
+      <word_custom>Про�мотр �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>filter_time</word_key>
+      <word_default>Time frame</word_default>
+      <word_custom>Сроки: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_rules</word_key>
+      <word_default>Forum Rules</word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cat_subforums</word_key>
+      <word_default>Sub-forums within the category</word_default>
+      <word_custom>Подфорумы в категории</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_announcement</word_key>
+      <word_default>View announcement</word_default>
+      <word_custom>Прочитать объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>posted_by</word_key>
+      <word_default>Posted by</word_default>
+      <word_custom>�апи�ано</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>goto_forum</word_key>
+      <word_default>Go to forum</word_default>
+      <word_custom>Перейти к форуму</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_forum_rules</word_key>
+      <word_default>View forum rules</word_default>
+      <word_custom>Прочитать правила</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_select_all</word_key>
+      <word_default>Select all topics on this page</word_default>
+      <word_custom>Отметить в�е темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_start</word_key>
+      <word_default>Start New Topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>in_last_topic</word_key>
+      <word_default>In:</word_default>
+      <word_custom>Ð’:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_close</word_key>
+      <word_default>Close topic</word_default>
+      <word_custom>Закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_open</word_key>
+      <word_default>Open topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_pin</word_key>
+      <word_default>Pin topic</word_default>
+      <word_custom>Подн�ть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_unpin</word_key>
+      <word_default>Unpin topic</word_default>
+      <word_custom>Опу�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_delete</word_key>
+      <word_default>Delete topic</word_default>
+      <word_custom>Удалить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_rename</word_key>
+      <word_default>Rename topic</word_default>
+      <word_custom>Переименовать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_move</word_key>
+      <word_default>Move topic</word_default>
+      <word_custom>Переме�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>reply</word_key>
+      <word_default>reply</word_default>
+      <word_custom>Ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_started_on</word_key>
+      <word_default>View topic, started </word_default>
+      <word_custom>Про�мотреть тему, �озданную </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>first_unread_post</word_key>
+      <word_default>Go to first unread post</word_default>
+      <word_custom>К первому непрочитанному �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>view_uapproved_posts</word_key>
+      <word_default>View unapproved posts</word_default>
+      <word_custom>Перейти к неподтвержденному �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>replies</word_key>
+      <word_default>replies</word_default>
+      <word_custom>Ответов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>views</word_key>
+      <word_default>views</word_default>
+      <word_custom>Про�мотров</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>goto_last_post</word_key>
+      <word_default>Go to last post</word_default>
+      <word_custom>Перейти к по�леднему �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_goto_page</word_key>
+      <word_default>Go to page</word_default>
+      <word_custom>Перейти к �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_prumemovetopics</word_key>
+      <word_default>Prune/Mass Move Topics</word_default>
+      <word_custom>Удаление / ма��овое перемещение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>no_topics</word_key>
+      <word_default>No topics were found. This is either because there are no topics in this forum, or the topics are older than the current age cut-off.</word_default>
+      <word_custom>�ет тем. Такое может быть е�ли тем дей�твительно в данном форуме еще не �оздавало�ь, или е�ли вы�тавлены фильтры про�мотра �пи�ка тем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_management</word_key>
+      <word_default>Forum Management</word_default>
+      <word_custom>Опции форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_hidden</word_key>
+      <word_default>Show Hidden Topics</word_default>
+      <word_custom>Показать �крытые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_resync</word_key>
+      <word_default>Resynchronize Forum</word_default>
+      <word_custom>Синхронизировать форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_hidden_posts</word_key>
+      <word_default>Show Topics With Hidden Posts</word_default>
+      <word_custom>Показать темы �о �крытыми �ообщени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_topic_list</word_key>
+      <word_default>Topics In This Forum</word_default>
+      <word_custom>Темы форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>filter_options</word_key>
+      <word_default>Click here to show filter options</word_default>
+      <word_custom>Показать опции фильтра</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>ft_title</word_key>
+      <word_default>Follow This Forum</word_default>
+      <word_custom>Подпи�ать��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>announce_row</word_key>
+      <word_default>Announcement</word_default>
+      <word_custom>Объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>remember_options</word_key>
+      <word_default>Remember filters</word_default>
+      <word_custom>Запомнить параметры</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>ft_title_stop</word_key>
+      <word_default>Stop Following Forum</word_default>
+      <word_custom>Отпи�ать��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>jscript_otherpage</word_key>
+      <word_default>from other pages</word_default>
+      <word_custom>� других �траниц</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mark_as_read</word_key>
+      <word_default>Mark this forum as read</word_default>
+      <word_custom>Отметить �тот форум прочитанным</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_showallinvisible</word_key>
+      <word_default>Show All Invisible Topics</word_default>
+      <word_custom>Показать в�е �крытые темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_showallposts</word_key>
+      <word_default>Show All Topics With Invisible Posts</word_default>
+      <word_custom>Показать в�е темы �о �крытыми �ообщени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mod_prune</word_key>
+      <word_default>Prune / Mass Move</word_default>
+      <word_custom>Удаление / ма��овое перемещение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>back_to_forum</word_key>
+      <word_default>Return to the forum</word_default>
+      <word_custom>Вернуть�� в форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_undelete_f</word_key>
+      <word_default>Restore Deleted Topics</word_default>
+      <word_custom>Во��тановить удаленные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_delete_f</word_key>
+      <word_default>Delete Topics</word_default>
+      <word_custom>Удалить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_move_f</word_key>
+      <word_default>Move Topics</word_default>
+      <word_custom>Переме�тить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_unpin_f</word_key>
+      <word_default>Unpin Topics</word_default>
+      <word_custom>Открепить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_pin_f</word_key>
+      <word_default>Pin Topics</word_default>
+      <word_custom>Прикрепить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_open_f</word_key>
+      <word_default>Open Topics</word_default>
+      <word_custom>Открыть темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_close_f</word_key>
+      <word_default>Close Topics</word_default>
+      <word_custom>Закрыть темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_merge_f</word_key>
+      <word_default>Merge Topics</word_default>
+      <word_custom>Объединить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topic_attach</word_key>
+      <word_default>attachment(s): View</word_default>
+      <word_custom>прикрепленные файлы: про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>mm_title</word_key>
+      <word_default>Multi-Moderation</word_default>
+      <word_custom>Мультимодераци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>f_go</word_key>
+      <word_default>With Selected</word_default>
+      <word_custom>Отмеченные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_approve_f</word_key>
+      <word_default>Set Visible (Approve)</word_default>
+      <word_custom>Сделать видимым (Подтвердить)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>cpt_unapprove_f</word_key>
+      <word_default>Set Invisible (Unapprove)</word_default>
+      <word_custom>Скрыть темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>attach_title</word_key>
+      <word_default>Attachment</word_default>
+      <word_custom>Прикрепление</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>attach_size</word_key>
+      <word_default>Size</word_default>
+      <word_custom>Размер</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>attach_post_date</word_key>
+      <word_default>Posted on</word_default>
+      <word_custom>Добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>attach_page_title</word_key>
+      <word_default>Attachments</word_default>
+      <word_custom>Прикреплени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>attach_post</word_key>
+      <word_default>Post #</word_default>
+      <word_custom>Сообщение №</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_open_new</word_key>
+      <word_default>New Replies</word_default>
+      <word_custom>Открыта� тема (е�ть новые ответы)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>search_forum</word_key>
+      <word_default>Search forum</word_default>
+      <word_custom>Пои�к по форуму</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>active_users_titlef</word_key>
+      <word_default>%s user(s) are browsing this forum</word_default>
+      <word_custom>Количе�тво пользователей, про�матривающих �тот форум: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_open_no</word_key>
+      <word_default>No New Replies</word_default>
+      <word_custom>Открыта� тема (нет новых ответов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_hot_no</word_key>
+      <word_default>Hot Topic (No New)</word_default>
+      <word_custom>Гор�ча� тема (нет новых ответов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_today</word_key>
+      <word_default>From Today</word_default>
+      <word_custom>За: �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_moved</word_key>
+      <word_default>This topic has been moved</word_default>
+      <word_custom>Тема перемещена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>logged_in</word_key>
+      <word_default>You have been authorized to access this forum</word_default>
+      <word_custom>Вы у�пешно авторизировали�ь в �том форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_locked</word_key>
+      <word_default>This topic is locked</word_default>
+      <word_custom>Закрыта� тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_poll_no</word_key>
+      <word_default>Poll (No New)</word_default>
+      <word_custom>Опро� (нет новых голо�ов)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_poll</word_key>
+      <word_default>Poll (New)</word_default>
+      <word_custom>Опро� (е�ть новые голо�а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>pm_hot_new</word_key>
+      <word_default>Hot Topic (New)</word_default>
+      <word_custom>Гор�ча� тема (е�ть новые ответы)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_5_days</word_key>
+      <word_default>Last 5 days</word_default>
+      <word_custom>За: 5 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_15_days</word_key>
+      <word_default>Last 15 days</word_default>
+      <word_custom>За: 15 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_20_days</word_key>
+      <word_default>Last 20 days</word_default>
+      <word_custom>За: 20 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_25_days</word_key>
+      <word_default>Last 25 days</word_default>
+      <word_custom>За: 25 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_60_days</word_key>
+      <word_default>Last 60 days</word_default>
+      <word_custom>За: 60 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_10_days</word_key>
+      <word_default>Last 10 days</word_default>
+      <word_custom>За: 10 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_30_days</word_key>
+      <word_default>Last 30 days</word_default>
+      <word_custom>За: 30 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_all</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>За: в�е врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_last_visit</word_key>
+      <word_default>Since Last Visit</word_default>
+      <word_custom>� по�леднего по�ещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_year</word_key>
+      <word_default>Last 365 days</word_default>
+      <word_custom>За: 365 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_90_days</word_key>
+      <word_default>Last 90 days</word_default>
+      <word_custom>За: 90 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_date</word_key>
+      <word_default>Last Post</word_default>
+      <word_custom>По: по�леднему �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>show_7_days</word_key>
+      <word_default>Last 7 days</word_default>
+      <word_custom>За: 7 дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_start</word_key>
+      <word_default>Topic Started</word_default>
+      <word_custom>По: дате открыти�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_topic</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>По: названию темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_replies</word_key>
+      <word_default>Replies</word_default>
+      <word_custom>По: ответам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_poster</word_key>
+      <word_default>Topic Starter</word_default>
+      <word_custom>По: автору темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_last_poster</word_key>
+      <word_default>Last Poster</word_default>
+      <word_custom>По: по�леднему автору</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_all</word_key>
+      <word_default>All Topics</word_default>
+      <word_custom>Темы: В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_attach</word_key>
+      <word_default>Attachments</word_default>
+      <word_custom>По: прикреплени�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_by_views</word_key>
+      <word_default>Views</word_default>
+      <word_custom>По: про�мотрам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>descending_order</word_key>
+      <word_default>Descending (Z-A)</word_default>
+      <word_custom>Я-�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_ireplied</word_key>
+      <word_default>Topics I Replied In</word_default>
+      <word_custom>Темы: С моими ответами</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_hot</word_key>
+      <word_default>Hot</word_default>
+      <word_custom>Темы: Гор�чие</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_open</word_key>
+      <word_default>Open</word_default>
+      <word_custom>Темы: Открытые</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>ascending_order</word_key>
+      <word_default>Ascending (A-Z)</word_default>
+      <word_custom>�-Я</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_moved</word_key>
+      <word_default>Moved</word_default>
+      <word_custom>Темы: Перемещенные</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_istarted</word_key>
+      <word_default>Topics I Started</word_default>
+      <word_custom>Темы: Созданные мною</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>enter_pass</word_key>
+      <word_default>Forum Password</word_default>
+      <word_custom>Пароль форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>need_password</word_key>
+      <word_default>Enter Forum Password</word_default>
+      <word_custom>Это закрытый форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_poll</word_key>
+      <word_default>Polls</word_default>
+      <word_custom>Темы: Опро�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>topicfilter_locked</word_key>
+      <word_default>Locked</word_default>
+      <word_custom>Темы: Закрытые</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>f_pass_submit</word_key>
+      <word_default>Proceed</word_default>
+      <word_custom>Войти</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>need_password_txt</word_key>
+      <word_default><![CDATA[<b>This forum is protected by a password!</b><br/ >You must enter the correct forum password to gain access to this forum. Please ensure that your browser is capable of storing temporary cookies.]]></word_default>
+      <word_custom><![CDATA[Этот форум защищен паролем!<br />Вы должны вве�ти верный пароль дл� до�тупа в �тот форум. Проверьте и убедите�ь, что ваш браузер поддерживает временные cookies.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_by</word_key>
+      <word_default>By:</word_default>
+      <word_custom>По�л. �ообщение:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>sort_submit</word_key>
+      <word_default>Update Filter</word_default>
+      <word_custom>ОК</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2377,9 +1848,6 @@
       <word_key>forum_started_by</word_key>
       <word_default>Started By</word_default>
       <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2387,9 +1855,20 @@
       <word_key>forum_stats</word_key>
       <word_default>Stats</word_default>
       <word_custom>Стати�тика</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_no_start_topic</word_key>
+      <word_default>You cannot start a new topic</word_default>
+      <word_custom>Вы не можете �оздать новую тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_forums</word_pack>
+      <word_key>forum_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>�азвание темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2397,9 +1876,6 @@
       <word_key>forum_last_post_info</word_key>
       <word_default>Last Post Info</word_default>
       <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2407,49 +1883,13 @@
       <word_key>forum_legend</word_key>
       <word_default>Forum Legend</word_default>
       <word_custom>Обозначени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_forums</word_pack>
       <word_key>forum_led_by</word_key>
-      <word_default>Forum Led By</word_default>
+      <word_default>This forum led by</word_default>
       <word_custom>Модерирует��:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_legends</word_pack>
-      <word_key>bbc_after</word_key>
-      <word_default>We Show</word_default>
-      <word_custom>Так отображает��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_legends</word_pack>
-      <word_key>bbc_before</word_key>
-      <word_default>You Type</word_default>
-      <word_custom>Так вводите</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_legends</word_pack>
-      <word_key>bbc_intro</word_key>
-      <word_default><![CDATA[BB Code is a quick and easy way to add effects or formatting to your posts.<br />It is used in a similar format to HTML tags which you may already be familiar with.<br />Below is a quick guide to the most common BB Code uses.]]></word_default>
-      <word_custom><![CDATA[BB-код про�той и бы�трый �по�об добавить форматирование в ваши �ообщени�.<br />Он напоминает HTML теги, � которыми вы возможно уже знакомы.<br />�иже мы �обрали BB-коды, до�тупные вам, и показали, как их и�пользовать.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2457,9 +1897,13 @@
       <word_key>bbc_title</word_key>
       <word_default>BB Code</word_default>
       <word_custom>BB-код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_legends</word_pack>
+      <word_key>bbc_intro</word_key>
+      <word_default><![CDATA[BB Code is a quick and easy way to add effects or formatting to your posts.<br />It is used in a similar format to HTML tags which you may already be familiar with.<br />Below is a quick guide to the most common BB Code uses.]]></word_default>
+      <word_custom><![CDATA[BB-код про�той и бы�трый �по�об добавить форматирование в ваши �ообщени�.<br />Он напоминает HTML теги, � которыми вы возможно уже знакомы.<br />�иже мы �обрали BB-коды, до�тупные вам, и показали, как их и�пользовать.]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -2467,2349 +1911,69 @@
       <word_key>emo_title</word_key>
       <word_default>Emoticons</word_default>
       <word_custom>Смайлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>t_close</word_key>
-      <word_default>Close Topic</word_default>
-      <word_custom>Закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>top_move</word_key>
-      <word_default>Move Topic </word_default>
-      <word_custom>Переме�тить тему </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>p_edited</word_key>
-      <word_default>Topic Edited</word_default>
-      <word_custom>Тема изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>t_delete</word_key>
-      <word_default>Delete Topic</word_default>
-      <word_custom>Удалить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>p_pinned</word_key>
-      <word_default>Topic Pinned</word_default>
-      <word_custom>Тема подн�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>p_moved</word_key>
-      <word_default>Topic Moved</word_default>
-      <word_custom>Тема перемещена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>t_open</word_key>
-      <word_default>Open Topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>t_edit</word_key>
-      <word_default>Edit Topic</word_default>
-      <word_custom>Изменить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>move_exp</word_key>
-      <word_default>Please select the destination forum and method of moving</word_default>
-      <word_custom>Выберите необходимые опции дл� перемещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>post_deleted</word_key>
-      <word_default>Post deleted</word_default>
-      <word_custom>Сообщение удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>top_edit</word_key>
-      <word_default>Editing Topic </word_default>
-      <word_custom>Редактирование темы </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>submit_move</word_key>
-      <word_default>Move this topic</word_default>
-      <word_custom>Переме�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>leave_link</word_key>
-      <word_default>Leave a link to the new topic in the source forum?</word_default>
-      <word_custom>О�тавить ��ылку на новую тему в и�ход�щем форуме?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ts_redirect</word_key>
-      <word_default>all members have been unsubscribed from this topic</word_default>
-      <word_custom>в�е пользователи отпи�аны от �той темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ts_none</word_key>
-      <word_default><![CDATA[There are no members subscribed to this topic. You can still unsubscribe all members, but it won't make any difference]]></word_default>
-      <word_custom>Подпи�чиков на данную тему нет. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ts_submit</word_key>
-      <word_default>Unsubscribe all members</word_default>
-      <word_custom>Отпи�ать в�ех пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ts_count</word_key>
-      <word_default>There are %s members subscribed to this topic, do you wish to unsubscribe them all?</word_default>
-      <word_custom>В данный момент на тему подпи�ано %s пользователей. Вы дей�твительно хотите отпи�ать их от �той темы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ts_title</word_key>
-      <word_default>Topic Subscriptions</word_default>
-      <word_custom>Подпи�ка на тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_redirect</word_key>
-      <word_default>The topics have been merged, returning you to the newly merged topic</word_default>
-      <word_custom>Темы объединены, перемещение к объединенной теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_submit</word_key>
-      <word_default>Merge Topics</word_default>
-      <word_custom>Объединить темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_tid_desc</word_key>
-      <word_default>(Tip: You can simply copy the URL from your browser address bar when viewing the topic and paste it here)</word_default>
-      <word_custom>(Под�казка: Вы можете �копировать URL из адре�ной �троки браузера, во врем� про�мотра темы, и в�тавить �юда)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_new_desc</word_key>
-      <word_default>Topic Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_tid</word_key>
-      <word_default>Enter in the URL of the topic that you wish to merge with this one.</word_default>
-      <word_custom>Введите URL адре� темы, которую вы хотите объединить � �той.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_new_title</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_explain</word_key>
-      <word_default><![CDATA[Merging topics allows you to 'move' all the posts from another topic into this one. The new topic will be sorted in chronological order, ensure this is the desired effect before continuing. Polls and poll voter information will not be merged.]]></word_default>
-      <word_custom>Объединение тем позвол�ет �оединить две темы в одну, при �том �тоит знать, что �ообщени� в объединенной теме будут ра�полагать�� в хронологиче�ком пор�дке. Е�ли вы пытаете�ь объединить опро�ы, то, к �ожалению, �того не получит�� �делать.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ml_none</word_key>
-      <word_default>There are no entries for this topic</word_default>
-      <word_custom>�ет �ообщений к �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mt_top</word_key>
-      <word_default>Merge Topic</word_default>
-      <word_custom>Объединить темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ml_date</word_key>
-      <word_default>Date</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ml_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ml_desc</word_key>
-      <word_default>Description</word_default>
-      <word_custom>Опи�ание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>ml_title</word_key>
-      <word_default>Moderator Log Entries</word_default>
-      <word_custom>Журнал дей�твий модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_start_name</word_key>
-      <word_default>Topic Started by</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_last_date</word_key>
-      <word_default>Last Post on</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_last_name</word_key>
-      <word_default>Last Post by</word_default>
-      <word_custom>�втор по�леднего �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_avg_post</word_key>
-      <word_default>Average Posts per day</word_default>
-      <word_custom>Среднее количе�тво �ообщений в день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_desc</word_key>
-      <word_default>Topic Description</word_default>
-      <word_custom>Опи�ание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_start_date</word_key>
-      <word_default>Topic Started on</word_default>
-      <word_custom>Дата открыти�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_topic</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>th_title</word_key>
-      <word_default>Topic History Report</word_default>
-      <word_custom>И�тори� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_new_topic</word_key>
-      <word_default>New Topic Details</word_default>
-      <word_custom>Опции новой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_redirect</word_key>
-      <word_default>The topic has been split, returning you to the original forum</word_default>
-      <word_custom>Тема разделена, переходим к разделу �тарой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_top_bit</word_key>
-      <word_default><![CDATA[Posted by <b>%s</b> on <b>%s</b>]]></word_default>
-      <word_custom><![CDATA[Отправлено <b>%s</b> <b>%s</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_post</word_key>
-      <word_default>Post Review</word_default>
-      <word_custom>Про�мотр �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_split</word_key>
-      <word_default>Move this post</word_default>
-      <word_custom>Перене�ти �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_submit</word_key>
-      <word_default>Split the selected posts</word_default>
-      <word_custom>Разделить �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_forum</word_key>
-      <word_default>Forum for new topic</word_default>
-      <word_custom>Форум дл� новой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_explain</word_key>
-      <word_default><![CDATA[Splitting a topic allows you to select posts to be moved into a new topic. Please specify the title and description for the new topic and its destination forum before continuing.<br /><b>Note</b> Long posts are reverted back to code tags and shortened to prevent long pages]]></word_default>
-      <word_custom>Разделение темы позвол�ет вам �оздать новую тему � �ообщени�ми из �тарой. Перед продолжением введите название, опи�ание новой темы и форум, где будет размещать�� нова� тема.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>st_top</word_key>
-      <word_default>Split Topic</word_default>
-      <word_custom>Разделение темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mm_applied</word_key>
-      <word_default>Topic multi-moderation %s applied</word_default>
-      <word_custom>Произведена мульти-модераци� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_submit</word_key>
-      <word_default>Alter Warn Level</word_default>
-      <word_custom>Изменить уровень предупреждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_contact2</word_key>
-      <word_default>Leave blank to not contact the member</word_default>
-      <word_custom>�е заполн�йте �то поле, е�ли не желаете уведомл�ть пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_c_p</word_key>
-      <word_default>PM</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_c_subj</word_key>
-      <word_default>Email / PM Subject</word_default>
-      <word_custom>Заголовок уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_c_e</word_key>
-      <word_default>Email</word_default>
-      <word_custom>E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_c</word_key>
-      <word_default>Method</word_default>
-      <word_custom>Тип уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_contact</word_key>
-      <word_default>Send message to member</word_default>
-      <word_custom>Отправить �ообщение пользователю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_reason2</word_key>
-      <word_default>This section must be completed</word_default>
-      <word_custom>Об�зательно к заполнению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_reason</word_key>
-      <word_default>Reason for this warn adjustment</word_default>
-      <word_custom>Причина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_orfor</word_key>
-      <word_default>or for</word_default>
-      <word_custom>или на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_susfor</word_key>
-      <word_default>Suspend for</word_default>
-      <word_custom>Заблокировать на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_resposts_i</word_key>
-      <word_default>Disable indefinitely</word_default>
-      <word_custom>на неопределенный �рок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_hour</word_key>
-      <word_default>Hours</word_default>
-      <word_custom>ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_resposts</word_key>
-      <word_default>Disable this members posting ability</word_default>
-      <word_custom>Запретить пользователю отправл�ть �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_day</word_key>
-      <word_default>Days</word_default>
-      <word_custom>дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_modq</word_key>
-      <word_default>Enforce moderator preview of all new posts?</word_default>
-      <word_custom>Включить премодерацию в�ех новых �ообщений?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_modq_i</word_key>
-      <word_default>Moderator preview indefinitely</word_default>
-      <word_custom>на неопределенный �рок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_adjust_level</word_key>
-      <word_default><![CDATA[Adjust member's warn level]]></word_default>
-      <word_custom>Дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_complete</word_key>
-      <word_default>Please complete the form below fully</word_default>
-      <word_custom>Пожалуй�та заполните в�е пол� формы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_warnfor</word_key>
-      <word_default>Member Warning Panel for</word_default>
-      <word_custom>Предупреждение дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_restricted</word_key>
-      <word_default>Restriction in progress, the remaining time has been recalculated</word_default>
-      <word_custom>Ограничение в �иле, о�тавшее�� врем� пере�читано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_title</word_key>
-      <word_default>Member Warning Center</word_default>
-      <word_custom>Центр предупреждений пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>we_no_subject</word_key>
-      <word_default>You must enter a PM / Email subject</word_default>
-      <word_custom>�еобходимо вве�ти заголовок уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>we_no_reason</word_key>
-      <word_default>You must enter a reason for this warn adjustment in the relevant section below</word_default>
-      <word_custom>Вы должны вве�ти причину изменени� уровн� предупреждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_done_topic</word_key>
-      <word_default>Go back to topic</word_default>
-      <word_custom>Вернуть�� в тему </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>errors_found</word_key>
-      <word_default>Error</word_default>
-      <word_custom>Ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_done_forum</word_key>
-      <word_default>Go back to forum</word_default>
-      <word_custom>Вернуть�� в форум </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_done_home</word_key>
-      <word_default>Go back to the forum home</word_default>
-      <word_custom>Вернуть�� на главную �траницу форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_done_te</word_key>
-      <word_default><![CDATA[%s's warning level has been adjusted successfully and the action logged.]]></word_default>
-      <word_custom>Предупреждени� пользовател� %s обновлены и запи�аны в журнале. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_title</word_key>
-      <word_default>Saved warn logs</word_default>
-      <word_custom>Журнал предупреждений пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_done_t</word_key>
-      <word_default>Warn Adjustment Result</word_default>
-      <word_custom>Результат обновлени� предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_nochan</word_key>
-      <word_default>No change to warn level</word_default>
-      <word_custom>Уровень не изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_warned_on</word_key>
-      <word_default>Warned on</word_default>
-      <word_custom>Предупрежден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_notes</word_key>
-      <word_default>Notes</word_default>
-      <word_custom>Причина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_minus</word_key>
-      <word_default>Removed from warn level</word_default>
-      <word_custom>Уровень уменьшен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_add</word_key>
-      <word_default>Added to warn level</word_default>
-      <word_custom>Уровень увеличен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_none</word_key>
-      <word_default>There are no saved notes for this member</word_default>
-      <word_custom>�ет �охраненных запи�ей дл� �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mpt_help</word_key>
-      <word_default>Prune Help</word_default>
-      <word_custom>Помощь по удалению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mpt_confirm</word_key>
-      <word_default>Prune Confirm</word_default>
-      <word_custom>Подтверждение удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_v_warnby</word_key>
-      <word_default>Warned by</word_default>
-      <word_custom>Модератор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_resync</word_key>
-      <word_default>Forum Resynchronized</word_default>
-      <word_custom>Форум �инхронизирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mpt_title</word_key>
-      <word_default>Prune Settings</word_default>
-      <word_custom>�а�тройки удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_tmove_end</word_key>
-      <word_default>Move selected topics</word_default>
-      <word_custom>Переме�тить выбранные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_ttitle</word_key>
-      <word_default>Moving Topics</word_default>
-      <word_custom>Перемещение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_result_move</word_key>
-      <word_default>Number of topics moved: </word_default>
-      <word_custom>Количе�тво перемещенных тем: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_result_del</word_key>
-      <word_default>Number of topics deleted: </word_default>
-      <word_custom>Удалено тем: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_redirect_topics</word_key>
-      <word_default>Topics updated, returning to the topic list</word_default>
-      <word_custom>Тема обновлена, возвращаем�� к �пи�ку тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_tmove_start</word_key>
-      <word_default>Moving topics from forum:</word_default>
-      <word_custom>Перемещение тем из форума:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_tmove_to</word_key>
-      <word_default>Select a destination forum</word_default>
-      <word_custom>Переме�тить тему в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_results</word_key>
-      <word_default>Result</word_default>
-      <word_custom>Результат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_redirect_posts</word_key>
-      <word_default>Posts updated, returning to the topic</word_default>
-      <word_custom>Сообщени� обновлены, переходим в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>redirect_modified</word_key>
-      <word_default>Modified Topic</word_default>
-      <word_custom>Тема изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cmp_notopic</word_key>
-      <word_default>That is not a valid topic to move these posts into. Please try again and check the input carefully</word_default>
-      <word_custom>Сообщени� не могут быть перене�ены в не�уще�твующую тему. Пожалуй�та верните�ь назад, проверьте правильно�ть заполнени� формы и попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cmp_submit</word_key>
-      <word_default>Move Posts</word_default>
-      <word_custom>Переме�тить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cmp_topic2</word_key>
-      <word_default><![CDATA[This is the ID of the topic these posts will be moved into.<br />(Tip: You can simply copy the URL from your browser address bar when viewing the topic and paste it here)]]></word_default>
-      <word_custom><![CDATA[�еобходимо вве�ти номер (id) темы, в которую вы хотите переме�тить выбранные �ообщени�.<br />(Вы можете про�то �копировать ��ылку на тему из адре�ной �троки браузера и в�тавить �юда)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cmp_title</word_key>
-      <word_default>Move Posts</word_default>
-      <word_custom>Перемещение �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cmp_topic</word_key>
-      <word_default>Enter topic ID</word_default>
-      <word_custom>Ведите номер (id) темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_attach_alt</word_key>
-      <word_default>Icon</word_default>
-      <word_custom>Иконка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_attach_title</word_key>
-      <word_default>Download attachment</word_default>
-      <word_custom>Скачать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_keep</word_key>
-      <word_default>Keep</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_attach2</word_key>
-      <word_default>Select which attachments you wish to keep</word_default>
-      <word_custom>Выберите прикрепленные файлы, которые желаете �охранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_author</word_key>
-      <word_default>Final Merged Post Author</word_default>
-      <word_custom>�втор �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_text</word_key>
-      <word_default>Final Merged Post Content</word_default>
-      <word_custom>Содержание �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_submit</word_key>
-      <word_default>Merge Posts</word_default>
-      <word_custom>Объединить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_attach</word_key>
-      <word_default>Final Merged Post Attachments</word_default>
-      <word_custom>Прикрепленные файлы объедин�емых �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_post</word_key>
-      <word_default>Final Merged Post Date</word_default>
-      <word_custom>Дата �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_em_submit</word_key>
-      <word_default>Edit Member</word_default>
-      <word_custom>Редактировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cm_title</word_key>
-      <word_default>Merging Posts</word_default>
-      <word_custom>Объединение �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_em_sub_other</word_key>
-      <word_default>Other Member Information</word_default>
-      <word_custom>Прочие данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_em_sub_main</word_key>
-      <word_default>Main Member Information</word_default>
-      <word_custom>О�новные данные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_vp_title</word_key>
-      <word_default>Profile</word_default>
-      <word_custom>Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_em_title</word_key>
-      <word_default>Editing Member</word_default>
-      <word_custom>Редактирование профил� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_edit_aboutme</word_key>
-      <word_default>About Me</word_default>
-      <word_custom>О �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_remove_av</word_key>
-      <word_default><![CDATA[Remove member's avatar?]]></word_default>
-      <word_custom>Удалить аватар пользовател�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_edit_signature</word_key>
-      <word_default>Signature</word_default>
-      <word_custom>Подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_remove_photo</word_key>
-      <word_default><![CDATA[Remove member's photo?]]></word_default>
-      <word_custom>Удалить фотографию пользовател�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_check_result</word_key>
-      <word_default>Form Check Results</word_default>
-      <word_custom>Проверить результаты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_check_text</word_key>
-      <word_default>Continue only if satisfied with the results, clicking the link below WILL carry out the action. If you need to make any changes, please adjust the form below and re-check the submission.</word_default>
-      <word_custom>Продолжайте только в том �лучае, е�ли вы довольны результатами. При нажатии на ��ылку ниже, дей�твие будет выполнено. Е�ли вы в�е же хотите произве�ти какие-либо изменени�, верните�ь назад и �делайте их.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_total_match</word_key>
-      <word_default>Total topics to (re)move</word_default>
-      <word_custom>Количе�тво удал�емых / перемещаемых тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_total_topics</word_key>
-      <word_default>Total topics in this forum</word_default>
-      <word_custom>Количе�тво тем в �том форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_text</word_key>
-      <word_default><![CDATA[You may remove topics or move topics to another forum based on your criteria. To move topics, choose a destination forum from the drop down menu. To simply remove the topics, choose 'PRUNE ONLY' from the forums drop down menu. Moving topics will not leave moved links in the source forum.]]></word_default>
-      <word_custom>Вы можете удалить темы или переме�тить их в другой форум, выбранный в ваших критери�х. Дл� перемещени� тем, выберите форум ра�положени� в выпадающем меню. Дл� удалени� тем, выберите в выпадающем меню «Удалить или переме�тить в» в начале �пи�ка пункт «К�З�ИТЬ, �ЕЛЬЗЯ ПОМИЛОВ�ТЬ =)». Перемещение тем не о�тавит ��ылок на перемещенные темы в и�ход�щем форуме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_sub2</word_key>
-      <word_default>Prune this forum!</word_default>
-      <word_custom>Очи�тить форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_ac_prune</word_key>
-      <word_default><![CDATA[PRUNE ONLY, DON'T MOVE]]></word_default>
-      <word_custom>К�З�ИТЬ, �ЕЛЬЗЯ ПОМИЛОВ�ТЬ =)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_sub1</word_key>
-      <word_default>Check Form Submission</word_default>
-      <word_custom>Проверить форму</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_pday_all</word_key>
-      <word_default>Any type of topic</word_default>
-      <word_custom>любой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_member</word_key>
-      <word_default>Were started by member</word_default>
-      <word_custom>Созданные пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_pday_link</word_key>
-      <word_default>Move linked Topics only</word_default>
-      <word_custom>��ылкой на перемещенную темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_pday_open</word_key>
-      <word_default>Open Topics only</word_default>
-      <word_custom>открытой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_pday_closed</word_key>
-      <word_default>Locked Topics only</word_default>
-      <word_custom>закрытой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mps_ignorepin</word_key>
-      <word_default>Is not a pinned topic</word_default>
-      <word_custom>не �вл�ет�� важной</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_type</word_key>
-      <word_default>Matches the topic state</word_default>
-      <word_custom>Тема �вл�ет��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_days</word_key>
-      <word_default>Prune Topics Which...</word_default>
-      <word_custom>Удалить темы которые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_action</word_key>
-      <word_default>Prune Action</word_default>
-      <word_custom>Управление темами форума:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_replies</word_key>
-      <word_default><![CDATA[Have less than <em>n</em> replies]]></word_default>
-      <word_custom><![CDATA[Имеющие менее <em>n</em> ответов<br />(не заполн�йте, е�ли хотите удалить темы незави�имо от количе�тва ответов)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune</word_key>
-      <word_default>Manage Topics in forum: </word_default>
-      <word_custom>Управление темами форума: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_domove</word_key>
-      <word_default>Move the topics!</word_default>
-      <word_custom>Переме�тить темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_dorem</word_key>
-      <word_default>Remove the topics!</word_default>
-      <word_custom>Удалить темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_per_go</word_key>
-      <word_default><![CDATA[Process <em>n</em> topics per cycle]]></word_default>
-      <word_custom><![CDATA[Выполн�ть дей�тви� по <em>n</em> тем за цикл]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_action2</word_key>
-      <word_default>Prune or move to</word_default>
-      <word_custom>Удалить или переме�тить в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_prune_days2</word_key>
-      <word_default><![CDATA[Have no replies over <em>n</em> days]]></word_default>
-      <word_custom><![CDATA[�е имеют ответов более, чем <em>n</em> дней]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_optional</word_key>
-      <word_default>All these settings are optional</word_default>
-      <word_custom>В�е �ти на�тройки опциональны</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>cp_batch_done</word_key>
-      <word_default>%s topics processed so far. %s to go...</word_default>
-      <word_custom>%s тем обработано. О�тало�ь %s...</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_from_id</word_key>
-      <word_default>From Topic ID:</word_default>
-      <word_custom>Тема: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_from</word_key>
-      <word_default>From:</word_default>
-      <word_custom>От:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_unpinned_topic</word_key>
-      <word_default>Unpinned Topic</word_default>
-      <word_custom>Тема опущена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_popup_title</word_key>
-      <word_default>Warn Logs</word_default>
-      <word_custom>Журнал предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_pinned_topic</word_key>
-      <word_default>Pinned Topic</word_default>
-      <word_custom>Тема подн�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_locked_topic</word_key>
-      <word_default>Locked Topic</word_default>
-      <word_custom>Тема закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_opened_topic</word_key>
-      <word_default>Opened Topic</word_default>
-      <word_custom>Тема открыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_edit_title</word_key>
-      <word_default><![CDATA[Moderator edited a topic title: (ID: %s) from '%s' to '%s']]></word_default>
-      <word_custom><![CDATA[Модератор изменил заголовок темы: (ID: %s) � '%s' на '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_deleted_a_topic</word_key>
-      <word_default>Deleted a topic</word_default>
-      <word_custom>Тема удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_trashcan_a_topic</word_key>
-      <word_default>Applied trash can to delete topic id:</word_default>
-      <word_custom>Применена корзина дл� удаленной темы � id:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_moved_a_topic</word_key>
-      <word_default>Moved a topic from %s to %s</word_default>
-      <word_custom><![CDATA[Перемещена тема из '%s' в '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_merged_posts</word_key>
-      <word_default>Merged post ids: %s</word_default>
-      <word_custom>Объединены �ообщени� � id: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_merged_topic</word_key>
-      <word_default><![CDATA[Merged topic '%s' with '%s']]></word_default>
-      <word_custom><![CDATA[Тема '%s' объединена �  '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_deleted_topics</word_key>
-      <word_default>Deleted topics (IDs: %s )</word_default>
-      <word_custom>Темы удалены (IDs: %s ) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_altered_topics</word_key>
-      <word_default>Altered topics (%s) (%s)</word_default>
-      <word_custom>Изменены темы (%s) и (%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_trashcan_topics</word_key>
-      <word_default>Applied trash can to delete topic id(s):</word_default>
-      <word_custom>Применена корзина дл� удаленных тем � id:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_multi_mod</word_key>
-      <word_default><![CDATA[Applied multi-mod '%s' on forum %s]]></word_default>
-      <word_custom>О�уще�твлена мульти-модераци� %s в форуме %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_pruned_forum</word_key>
-      <word_default>Pruned Forum</word_default>
-      <word_custom>Очищен форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_moved_topics</word_key>
-      <word_default>Moved topics from %s to %s</word_default>
-      <word_custom><![CDATA[Перемещены темы из '%s' в '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_approve_topic</word_key>
-      <word_default>Approved a topic (tid: %s)</word_default>
-      <word_custom>Опубликована тема (id: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_mass_moved</word_key>
-      <word_default>Mass moved topics</word_default>
-      <word_custom>Ма��овое перемещение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_split_topic</word_key>
-      <word_default>Split topic</word_default>
-      <word_custom>Разбить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_trashcan_post</word_key>
-      <word_default>Applied trash can for deleted post</word_default>
-      <word_custom>Дл� удаленных �ообщений применена корзина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_unapproved_posts</word_key>
-      <word_default><![CDATA[Un-approved %s pending posts for '%s']]></word_default>
-      <word_custom><![CDATA[Отклонено %s ожидающих проверки �ообщений в '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_approved_posts</word_key>
-      <word_default><![CDATA[Approved %s pending posts for '%s']]></word_default>
-      <word_custom><![CDATA[Опубликовано %s ожидающих проверки �ообщений в '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_moved_posts</word_key>
-      <word_default><![CDATA[Moved posts from '%s' to '%s']]></word_default>
-      <word_custom><![CDATA[Перемещены �ообщени� из '%s' в '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_edited_profile</word_key>
-      <word_default>Edited Profile for:</word_default>
-      <word_custom>Изменение профил� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_warn_fieldset</word_key>
-      <word_default>New Note Contents</word_default>
-      <word_custom>Содержимое заметки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_warn_note_save</word_key>
-      <word_default>Save Note</word_default>
-      <word_custom>Сохранить примечание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_warn_new_note</word_key>
-      <word_default>Add a new note for</word_default>
-      <word_custom>Добавить примечание дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_warn_note</word_key>
-      <word_default>Warn Level Unchanged</word_default>
-      <word_custom>Уровень предупреждени� не изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_warn_added</word_key>
-      <word_default>Note Added</word_default>
-      <word_custom>Примечание добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>modqueue_table_clear</word_key>
-      <word_default>Cleared %s id or ids (%s) from modqueue table</word_default>
-      <word_custom>Удалены id %s (%s) из очереди модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>acp_unapprove_topic</word_key>
-      <word_default>Un-Approved a topic (tid: %s)</word_default>
-      <word_custom>Отклонена тема (id: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_nochange</word_key>
-      <word_default>Do Not Change Warning Level</word_default>
-      <word_custom>�е измен�ть уровень предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_remove</word_key>
-      <word_default>Decrease Warning Level By One Point</word_default>
-      <word_custom>Понизить уровень предупреждений (-1)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_add</word_key>
-      <word_default>Increase Warning Level By One Point</word_default>
-      <word_custom>Повы�ить уровень предупреждений (+1)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_suspend</word_key>
-      <word_default><![CDATA[Ban / Suspend member's account]]></word_default>
-      <word_custom>Забанить / временно заблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_suspend_or</word_key>
-      <word_default>or suspend for</word_default>
-      <word_custom>заблокировать на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_ban_indef</word_key>
-      <word_default>Ban indefinitely</word_default>
-      <word_custom>Забанить на неопределенный �рок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>w_change_custom</word_key>
-      <word_default>Enter Custom Level (Max: %s)</word_default>
-      <word_custom>Вве�ти уровень предупреждени� (мак�имум: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_f_desc</word_key>
-      <word_default>Topic Description</word_default>
-      <word_custom>Опи�ание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>multi_post_delete_mod_log</word_key>
-      <word_default><![CDATA[Deleted %s posts from topic '%s']]></word_default>
-      <word_custom><![CDATA[%s �ообщений удалено из темы '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>multi_topic_merge_mod_log</word_key>
-      <word_default>Merged %s topics</word_default>
-      <word_custom>Объединено %s тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>topics_to_move</word_key>
-      <word_default>Topics To Move</word_default>
-      <word_custom>Темы дл� перемещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>editing_topic_title</word_key>
-      <word_default>Editing Topic Title</word_default>
-      <word_custom>Редактирование заголовка темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>move_topic_options</word_key>
-      <word_default>Move Topic Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>merge_topic_options</word_key>
-      <word_default>Merge Topic Options</word_default>
-      <word_custom>Опции объединени� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>mod_logs_topic_summary</word_key>
-      <word_default>Moderator logs for the topic</word_default>
-      <word_custom>И�тори� модератор�ких дей�твий дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>summary_th_info</word_key>
-      <word_default>Information</word_default>
-      <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>summary_th_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>post_options</word_key>
-      <word_default>Post Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>post_content</word_key>
-      <word_default>Post Content</word_default>
-      <word_custom>Содержание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>topic_history_summary</word_key>
-      <word_default>Report data for the topic</word_default>
-      <word_custom>Информаци� о </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>merge_select</word_key>
-      <word_default>Select the date and author of the merged post, and edit the post content if desired.</word_default>
-      <word_custom>Вы можете выбрать дату и автора объединенных �ообщений, а также изменить �ообщение по вашему желанию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>move_posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>move_posts_option</word_key>
-      <word_default>Move Posts Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>move_topic_summary</word_key>
-      <word_default>Topic Summary</word_default>
-      <word_custom>Сообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_user_status</word_key>
-      <word_default>Member Status</word_default>
-      <word_custom>Стату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_user_title</word_key>
-      <word_default>Member Title</word_default>
-      <word_custom>Личное звание пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_user_profile</word_key>
-      <word_default>Profile Fields</word_default>
-      <word_custom>Пол� профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_user_images</word_key>
-      <word_default>User Images</word_default>
-      <word_custom>Изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_contact_member</word_key>
-      <word_default>Contact Member</word_default>
-      <word_custom>Отправить уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_stuff_allposts</word_key>
-      <word_default><![CDATA[All member's replies]]></word_default>
-      <word_custom>В�е ответы пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_stuff_datecutoff</word_key>
-      <word_default>made within the last</word_default>
-      <word_custom>�озданные за по�ледние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_stuff_alltopics</word_key>
-      <word_default><![CDATA[All member's topics]]></word_default>
-      <word_custom>В�е темы пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_stuff_approve</word_key>
-      <word_default>Approve</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_stuff_unapprove</word_key>
-      <word_default>Un-approve</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_posts_topics</word_key>
-      <word_default><![CDATA[Member's Posts and Topics]]></word_default>
-      <word_custom>Сообщени� и темы пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_mem_content</word_key>
-      <word_default>Member Content</word_default>
-      <word_custom>Дополнительно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>member_suspension</word_key>
-      <word_default>Member Suspension</word_default>
-      <word_custom>Блокировка пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_current_level</word_key>
-      <word_default>Current Level:</word_default>
-      <word_custom>Текущий уровень:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_details</word_key>
-      <word_default>Warn Details</word_default>
-      <word_custom>Предупреждение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>warn_rep</word_key>
-      <word_default>Reputation:</word_default>
-      <word_custom>Репутаци�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_legends</word_pack>
+      <word_key>bbc_after</word_key>
+      <word_default>We Show</word_default>
+      <word_custom>Так отображает��</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>display_history</word_key>
-      <word_default>Display name history</word_default>
-      <word_custom>И�тори� изменени� имен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_legends</word_pack>
+      <word_key>bbc_before</word_key>
+      <word_default>You Type</word_default>
+      <word_custom>Так вводите</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>view_dname_history</word_key>
-      <word_default>View display name history</word_default>
-      <word_custom>Про�мотр и�тории имен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mod_or</word_key>
+      <word_default>OR</word_default>
+      <word_custom>ИЛИ</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>multi_post_delete</word_key>
-      <word_default>Deleted posts (%s)</word_default>
-      <word_custom>Удаленных �ообщений (%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>enter_sdelete_reason</word_key>
+      <word_default>Specify a reason for this action</word_default>
+      <word_custom>Укажите причину</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>warn_member_details</word_key>
-      <word_default>Member Details</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mod_no_posts_to_del</word_key>
+      <word_default>There were no posts that you have permission to delete selected for deletion.</word_default>
+      <word_custom>Вы не можете удалить выбранные �ообщени�.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>warn_logs_for</word_key>
-      <word_default>Warn Panel For</word_default>
-      <word_custom>Предупреждение пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_softdeleted_topics</word_key>
+      <word_default>Soft deleted a topic (tid: %s)</word_default>
+      <word_custom>О�уще�твлено мнимое удаление темы (id: %s)</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>flag_spam_done</word_key>
-      <word_default>User Flagged As Spam Account</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_unsoftdeleted_topics</word_key>
+      <word_default>Un-Soft deleted a topic (tid: %s)</word_default>
+      <word_custom>Во��тановлена тема (id: %s)</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>mm_delete_top_posts</word_key>
-      <word_default>Delete options for %s posts</word_default>
-      <word_custom>Параметры удалени� дл� %s �ообщений </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_softdeleted_posts</word_key>
+      <word_default>Soft deleted posts (number of posts: %s)</word_default>
+      <word_custom>О�уще�твлено мнимое удаление темы (id: %s)</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>mm_delete_top</word_key>
-      <word_default>Delete options for %s topics</word_default>
-      <word_custom>Параметры удалени� дл� %s тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>acp_unsoftdeleted_posts</word_key>
+      <word_default>Un-Soft deleted posts (number of posts: %s)</word_default>
+      <word_custom>Во��тановлена тема (id: %s)</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4817,29 +1981,1063 @@
       <word_key>p_topic_restored</word_key>
       <word_default>Topic Restored</word_default>
       <word_custom>Тема во��тановлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>acp_unsoftdeleted_posts</word_key>
-      <word_default>Un-Soft deleted a topic (tid: %s)</word_default>
-      <word_custom>Во��тановлена тема (id: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mm_delete_top</word_key>
+      <word_default>Delete options for %s topics</word_default>
+      <word_custom>Параметры удалени� дл� %s тем</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_mod</word_pack>
-      <word_key>acp_softdeleted_posts</word_key>
-      <word_default>Soft deleted a topic (tid: %s)</word_default>
-      <word_custom>О�уще�твлено мнимое удаление темы (id: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mm_delete_top_posts</word_key>
+      <word_default>Delete options for %s posts</word_default>
+      <word_custom>Параметры удалени� дл� %s �ообщений </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>multi_post_delete</word_key>
+      <word_default>Deleted posts (%s)</word_default>
+      <word_custom>Удаленных �ообщений (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>move_posts_option</word_key>
+      <word_default>Move Posts Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>multi_post_restore</word_key>
+      <word_default>Restored posts (%s)</word_default>
+      <word_custom>Во��тановленных �ообщений (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>move_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>move_topic_summary</word_key>
+      <word_default>Topic Summary</word_default>
+      <word_custom>Сообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>post_options</word_key>
+      <word_default>Post Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>merge_select</word_key>
+      <word_default>Select the date and author of the merged post, and edit the post content if desired.</word_default>
+      <word_custom>Вы можете выбрать дату и автора объединенных �ообщений, а также изменить �ообщение по вашему желанию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>post_content</word_key>
+      <word_default>Post Content</word_default>
+      <word_custom>Содержание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>summary_th_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>topic_history_summary</word_key>
+      <word_default>Report data for the topic</word_default>
+      <word_custom>Информаци� о </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>summary_th_info</word_key>
+      <word_default>Information</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mod_logs_topic_summary</word_key>
+      <word_default>Moderator logs for the topic</word_default>
+      <word_custom>И�тори� модератор�ких дей�твий дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>merge_topic_options</word_key>
+      <word_default>Merge Topic Options</word_default>
+      <word_custom>Опции объединени� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>modqueue_table_clear</word_key>
+      <word_default>Cleared %s id or ids (%s) from modqueue table</word_default>
+      <word_custom>Удалены id %s (%s) из очереди модерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_moved_posts</word_key>
+      <word_default><![CDATA[Moved posts from '%s' to '%s']]></word_default>
+      <word_custom><![CDATA[Перемещены �ообщени� из '%s' в '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>multi_topic_merge_mod_log</word_key>
+      <word_default>Merged %s topics</word_default>
+      <word_custom>Объединено %s тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>editing_topic_title</word_key>
+      <word_default>Editing Topic Title</word_default>
+      <word_custom>Редактирование заголовка темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>topics_to_move</word_key>
+      <word_default>Topics To Move</word_default>
+      <word_custom>Темы дл� перемещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>move_topic_options</word_key>
+      <word_default>Move Topic Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_split_topic</word_key>
+      <word_default>Split topic</word_default>
+      <word_custom>Разбить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_unapproved_posts</word_key>
+      <word_default><![CDATA[Un-approved %s pending posts for '%s']]></word_default>
+      <word_custom><![CDATA[Отклонено %s ожидающих проверки �ообщений в '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_approved_posts</word_key>
+      <word_default><![CDATA[Approved %s pending posts for '%s']]></word_default>
+      <word_custom><![CDATA[Опубликовано %s ожидающих проверки �ообщений в '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>multi_post_delete_mod_log</word_key>
+      <word_default><![CDATA[Deleted %s posts from topic '%s']]></word_default>
+      <word_custom><![CDATA[%s �ообщений удалено из темы '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_unapprove_topic</word_key>
+      <word_default>Un-Approved a topic (tid: %s)</word_default>
+      <word_custom>Отклонена тема (id: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_altered_topics</word_key>
+      <word_default>Altered topics (%s) (%s)</word_default>
+      <word_custom>Изменены темы (%s) и (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_moved_topics</word_key>
+      <word_default>Moved topics from %s to %s</word_default>
+      <word_custom><![CDATA[Перемещены темы из '%s' в '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_mass_moved</word_key>
+      <word_default>Mass moved topics</word_default>
+      <word_custom>Ма��овое перемещение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_pruned_forum</word_key>
+      <word_default>Pruned Forum</word_default>
+      <word_custom>Очищен форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_approve_topic</word_key>
+      <word_default>Approved a topic (tid: %s)</word_default>
+      <word_custom>Опубликована тема (id: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_merged_posts</word_key>
+      <word_default>Merged post ids: %s</word_default>
+      <word_custom>Объединены �ообщени� � id: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_moved_a_topic</word_key>
+      <word_default>Moved a topic from %s to %s</word_default>
+      <word_custom><![CDATA[Перемещена тема из '%s' в '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_deleted_a_topic</word_key>
+      <word_default>Deleted a topic</word_default>
+      <word_custom>Тема удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_merged_topic</word_key>
+      <word_default><![CDATA[Merged topic '%s' with '%s']]></word_default>
+      <word_custom><![CDATA[Тема '%s' объединена �  '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_deleted_topics</word_key>
+      <word_default>Deleted topics (IDs: %s )</word_default>
+      <word_custom>Темы удалены (IDs: %s ) </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_multi_mod</word_key>
+      <word_default><![CDATA[Applied multi-mod '%s' on forum %s]]></word_default>
+      <word_custom>О�уще�твлена мульти-модераци� %s в форуме %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_locked_topic</word_key>
+      <word_default>Locked Topic</word_default>
+      <word_custom>Тема закрыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_opened_topic</word_key>
+      <word_default>Opened Topic</word_default>
+      <word_custom>Тема открыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_edit_title</word_key>
+      <word_default><![CDATA[Moderator edited a topic title: (ID: %s) from '%s' to '%s']]></word_default>
+      <word_custom><![CDATA[Модератор изменил заголовок темы: (ID: %s) � '%s' на '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_pinned_topic</word_key>
+      <word_default>Pinned Topic</word_default>
+      <word_custom>Тема подн�та</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mod_from</word_key>
+      <word_default>From:</word_default>
+      <word_custom>От:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>acp_unpinned_topic</word_key>
+      <word_default>Unpinned Topic</word_default>
+      <word_custom>Тема опущена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_batch_done</word_key>
+      <word_default>%s topics processed so far. %s to go...</word_default>
+      <word_custom>%s тем обработано. О�тало�ь %s...</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_optional</word_key>
+      <word_default>All these settings are optional</word_default>
+      <word_custom>В�е �ти на�тройки опциональны</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mod_from_id</word_key>
+      <word_default>From Topic ID:</word_default>
+      <word_custom>Тема: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_per_go</word_key>
+      <word_default><![CDATA[Process <em>n</em> topics per cycle]]></word_default>
+      <word_custom><![CDATA[Выполн�ть дей�тви� по <em>n</em> тем за цикл]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_action2</word_key>
+      <word_default>Prune or move to</word_default>
+      <word_custom>Удалить или переме�тить в</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_days2</word_key>
+      <word_default><![CDATA[Have no replies over <em>n</em> days]]></word_default>
+      <word_custom><![CDATA[�е имеют ответов более, чем <em>n</em> дней]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_domove</word_key>
+      <word_default>Move the topics!</word_default>
+      <word_custom>Переме�тить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_dorem</word_key>
+      <word_default>Remove the topics!</word_default>
+      <word_custom>Удалить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune</word_key>
+      <word_default>Manage Topics in forum: </word_default>
+      <word_custom>Управление темами форума: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_replies</word_key>
+      <word_default><![CDATA[Have less than <em>n</em> replies]]></word_default>
+      <word_custom><![CDATA[Имеющие менее <em>n</em> ответов<br />(не заполн�йте, е�ли хотите удалить темы незави�имо от количе�тва ответов)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_action</word_key>
+      <word_default>Prune Action</word_default>
+      <word_custom>Управление темами форума:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_days</word_key>
+      <word_default>Prune Topics Which...</word_default>
+      <word_custom>Удалить темы которые</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_type</word_key>
+      <word_default>Matches the topic state</word_default>
+      <word_custom>Тема �вл�ет��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mps_ignorepin</word_key>
+      <word_default>Is not a pinned topic</word_default>
+      <word_custom>не �вл�ет�� важной</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_pday_open</word_key>
+      <word_default>Open Topics only</word_default>
+      <word_custom>открытой</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_total_topics</word_key>
+      <word_default>Total topics in this forum</word_default>
+      <word_custom>Количе�тво тем в �том форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_pday_link</word_key>
+      <word_default>Move linked Topics only</word_default>
+      <word_custom>��ылкой на перемещенную темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_pday_closed</word_key>
+      <word_default>Locked Topics only</word_default>
+      <word_custom>закрытой</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_ac_prune</word_key>
+      <word_default><![CDATA[PRUNE ONLY, DON'T MOVE]]></word_default>
+      <word_custom>К�З�ИТЬ, �ЕЛЬЗЯ ПОМИЛОВ�ТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_text</word_key>
+      <word_default><![CDATA[You may remove topics or move topics to another forum based on your criteria. To move topics, choose a destination forum from the drop down menu. To simply remove the topics, choose 'PRUNE ONLY' from the forums drop down menu. Moving topics will not leave moved links in the source forum.]]></word_default>
+      <word_custom>Вы можете удалить темы или переме�тить их в другой форум, выбранный в ваших критери�х. Дл� перемещени� тем, выберите форум ра�положени� в выпадающем меню. Дл� удалени� тем, выберите в выпадающем меню «Удалить или переме�тить в» в начале �пи�ка пункт «К�З�ИТЬ, �ЕЛЬЗЯ ПОМИЛОВ�ТЬ =)». Перемещение тем не о�тавит ��ылок на перемещенные темы в и�ход�щем форуме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_sub2</word_key>
+      <word_default>Prune this forum!</word_default>
+      <word_custom>Очи�тить форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_sub1</word_key>
+      <word_default>Check Form Submission</word_default>
+      <word_custom>Проверить форму</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_pday_all</word_key>
+      <word_default>Any type of topic</word_default>
+      <word_custom>любой</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_prune_member</word_key>
+      <word_default>Were started by member</word_default>
+      <word_custom>Созданные пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_text</word_key>
+      <word_default>Final Merged Post Content</word_default>
+      <word_custom>Содержание �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_author</word_key>
+      <word_default>Final Merged Post Author</word_default>
+      <word_custom>�втор �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_post</word_key>
+      <word_default>Final Merged Post Date</word_default>
+      <word_custom>Дата �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_title</word_key>
+      <word_default>Merging Posts</word_default>
+      <word_custom>Объединение �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_total_match</word_key>
+      <word_default>Total topics to (re)move</word_default>
+      <word_custom>Количе�тво удал�емых / перемещаемых тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_check_result</word_key>
+      <word_default>Form Check Results</word_default>
+      <word_custom>Проверить результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_check_text</word_key>
+      <word_default>Continue only if satisfied with the results, clicking the link below WILL carry out the action. If you need to make any changes, please adjust the form below and re-check the submission.</word_default>
+      <word_custom>Продолжайте только в том �лучае, е�ли вы довольны результатами. При нажатии на ��ылку ниже, дей�твие будет выполнено. Е�ли вы в�е же хотите произве�ти какие-либо изменени�, верните�ь назад и �делайте их.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_attach</word_key>
+      <word_default>Final Merged Post Attachments</word_default>
+      <word_custom>Прикрепленные файлы объедин�емых �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_submit</word_key>
+      <word_default>Merge Posts</word_default>
+      <word_custom>Объединить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_attach2</word_key>
+      <word_default>Select which attachments you wish to keep</word_default>
+      <word_custom>Выберите прикрепленные файлы, которые желаете �охранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_keep</word_key>
+      <word_default>Keep</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cmp_topic</word_key>
+      <word_default>Enter topic ID</word_default>
+      <word_custom>Ведите номер (id) темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cmp_topic2</word_key>
+      <word_default><![CDATA[This is the ID of the topic these posts will be moved into.<br />(Tip: You can simply copy the URL from your browser address bar when viewing the topic and paste it here)]]></word_default>
+      <word_custom><![CDATA[�еобходимо вве�ти номер (id) темы, в которую вы хотите переме�тить выбранные �ообщени�.<br />(Вы можете про�то �копировать ��ылку на тему из адре�ной �троки браузера и в�тавить �юда)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cmp_title</word_key>
+      <word_default>Move Posts</word_default>
+      <word_custom>Перемещение �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_attach_alt</word_key>
+      <word_default>Icon</word_default>
+      <word_custom>Иконка</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_attach_title</word_key>
+      <word_default>Download attachment</word_default>
+      <word_custom>Скачать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cm_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cmp_notopic</word_key>
+      <word_default>That is not a valid topic to move these posts into. Please try again and check the input carefully</word_default>
+      <word_custom>Сообщени� не могут быть перене�ены в не�уще�твующую тему. Пожалуй�та верните�ь назад, проверьте правильно�ть заполнени� формы и попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cmp_submit</word_key>
+      <word_default>Move Posts</word_default>
+      <word_custom>Переме�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>redirect_modified</word_key>
+      <word_default>Modified Topic</word_default>
+      <word_custom>Тема изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_redirect_posts</word_key>
+      <word_default>Posts updated</word_default>
+      <word_custom>Сообщени� обновлены, переходим в тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_results</word_key>
+      <word_default>Result</word_default>
+      <word_custom>Результат</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_redirect_topics</word_key>
+      <word_default>Topics updated</word_default>
+      <word_custom>Тема обновлена, возвращаем�� к �пи�ку тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_result_move</word_key>
+      <word_default>Number of topics moved: </word_default>
+      <word_custom>Количе�тво перемещенных тем: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_result_del</word_key>
+      <word_default>Number of topics deleted: </word_default>
+      <word_custom>Удалено тем: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_tmove_start</word_key>
+      <word_default>Moving topics</word_default>
+      <word_custom>Перемещение тем из форума:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_tmove_to</word_key>
+      <word_default>Select a destination forum</word_default>
+      <word_custom>Переме�тить тему в</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_tmove_end</word_key>
+      <word_default>Move selected topics</word_default>
+      <word_custom>Переме�тить выбранные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_ttitle</word_key>
+      <word_default>Moving Topics</word_default>
+      <word_custom>Перемещение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mpt_title</word_key>
+      <word_default>Prune Settings</word_default>
+      <word_custom>�а�тройки удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>cp_resync</word_key>
+      <word_default>Forum Resynchronized</word_default>
+      <word_custom>Форум �инхронизирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mpt_help</word_key>
+      <word_default>Prune Help</word_default>
+      <word_custom>Помощь по удалению</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_explain</word_key>
+      <word_default><![CDATA[Splitting a topic allows you to select posts to be moved into a new topic. Please specify the title for the new topic and its destination forum before continuing.<br /><b>Note</b> Long posts are reverted back to code tags and shortened to prevent long pages]]></word_default>
+      <word_custom>Разделение темы позвол�ет вам �оздать новую тему � �ообщени�ми из �тарой. Перед продолжением введите название, опи�ание новой темы и форум, где будет размещать�� нова� тема.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_top</word_key>
+      <word_default>Split Topic</word_default>
+      <word_custom>Разделение темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mm_applied</word_key>
+      <word_default>Topic multi-moderation %s applied</word_default>
+      <word_custom>Произведена мульти-модераци� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>errors_found</word_key>
+      <word_default>Error</word_default>
+      <word_custom>Ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mpt_confirm</word_key>
+      <word_default>Prune Confirm</word_default>
+      <word_custom>Подтверждение удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_forum</word_key>
+      <word_default>Forum for new topic</word_default>
+      <word_custom>Форум дл� новой темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_submit</word_key>
+      <word_default>Split the selected posts</word_default>
+      <word_custom>Разделить �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_split</word_key>
+      <word_default>Move this post</word_default>
+      <word_custom>Перене�ти �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_post</word_key>
+      <word_default>Post Review</word_default>
+      <word_custom>Про�мотр �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_top_bit</word_key>
+      <word_default><![CDATA[Posted by <b>%s</b> on <b>%s</b>]]></word_default>
+      <word_custom><![CDATA[Отправлено <b>%s</b> <b>%s</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_redirect</word_key>
+      <word_default>The topic has been split</word_default>
+      <word_custom>Тема разделена, переходим к разделу �тарой темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>st_new_topic</word_key>
+      <word_default>New Topic Details</word_default>
+      <word_custom>Опции новой темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_title</word_key>
+      <word_default>Topic History Report</word_default>
+      <word_custom>И�тори� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_topic</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>�азвание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_desc</word_key>
+      <word_default>Topic Description</word_default>
+      <word_custom>Опи�ание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_start_date</word_key>
+      <word_default>Topic Started on</word_default>
+      <word_custom>Дата открыти�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_start_name</word_key>
+      <word_default>Topic Started by</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_last_date</word_key>
+      <word_default>Last Post on</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ml_title</word_key>
+      <word_default>Moderator Log Entries</word_default>
+      <word_custom>Журнал дей�твий модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_avg_post</word_key>
+      <word_default>Average Posts per day</word_default>
+      <word_custom>Среднее количе�тво �ообщений в день</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>th_last_name</word_key>
+      <word_default>Last Post by</word_default>
+      <word_custom>�втор по�леднего �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_new_title</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_explain</word_key>
+      <word_default><![CDATA[Merging topics allows you to 'move' all the posts from another topic into this one. The new topic will be sorted in chronological order, ensure this is the desired effect before continuing. Polls and poll voter information will not be merged.]]></word_default>
+      <word_custom>Объединение тем позвол�ет �оединить две темы в одну, при �том �тоит знать, что �ообщени� в объединенной теме будут ра�полагать�� в хронологиче�ком пор�дке. Е�ли вы пытаете�ь объединить опро�ы, то, к �ожалению, �того не получит�� �делать.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_top</word_key>
+      <word_default>Merge Topic</word_default>
+      <word_custom>Объединить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ml_none</word_key>
+      <word_default>There are no entries for this topic</word_default>
+      <word_custom>�ет �ообщений к �той теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ml_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ml_desc</word_key>
+      <word_default>Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ml_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_new_desc</word_key>
+      <word_default>Topic Description</word_default>
+      <word_custom>Опи�ание</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_tid</word_key>
+      <word_default>Enter in the URL of the topic that you wish to merge with this one.</word_default>
+      <word_custom>Введите URL адре� темы, которую вы хотите объединить � �той.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_submit</word_key>
+      <word_default>Merge Topics</word_default>
+      <word_custom>Объединить темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ts_none</word_key>
+      <word_default><![CDATA[There are no members subscribed to this topic. You can still unsubscribe all members, but it won't make any difference]]></word_default>
+      <word_custom>Подпи�чиков на данную тему нет. </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ts_submit</word_key>
+      <word_default>Unsubscribe all members</word_default>
+      <word_custom>Отпи�ать в�ех пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ts_redirect</word_key>
+      <word_default>All members have been unsubscribed from this topic</word_default>
+      <word_custom>в�е пользователи отпи�аны от �той темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>leave_link</word_key>
+      <word_default>Leave a link to the new topic in the source forum?</word_default>
+      <word_custom>О�тавить ��ылку на новую тему в и�ход�щем форуме?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_tid_desc</word_key>
+      <word_default>(Tip: You can simply copy the URL from your browser address bar when viewing the topic and paste it here)</word_default>
+      <word_custom>(Под�казка: Вы можете �копировать URL из адре�ной �троки браузера, во врем� про�мотра темы, и в�тавить �юда)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ts_count</word_key>
+      <word_default>There are %s members subscribed to this topic, do you wish to unsubscribe them all?</word_default>
+      <word_custom>В данный момент на тему подпи�ано %s пользователей. Вы дей�твительно хотите отпи�ать их от �той темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>ts_title</word_key>
+      <word_default>Topic Subscriptions</word_default>
+      <word_custom>Подпи�ка на тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>mt_redirect</word_key>
+      <word_default>The topics have been merged</word_default>
+      <word_custom>Темы объединены, перемещение к объединенной теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>post_deleted</word_key>
+      <word_default>Post deleted</word_default>
+      <word_custom>Сообщение удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>move_exp</word_key>
+      <word_default>Please select the destination forum and method of moving</word_default>
+      <word_custom>Выберите необходимые опции дл� перемещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>top_edit</word_key>
+      <word_default>Editing Topic </word_default>
+      <word_custom>Редактирование темы </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>submit_move</word_key>
+      <word_default>Move topic(s)</word_default>
+      <word_custom>Переме�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>t_open</word_key>
+      <word_default>Open Topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>p_moved</word_key>
+      <word_default>Topic Moved</word_default>
+      <word_custom>Тема перемещена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>t_close</word_key>
+      <word_default>Close Topic</word_default>
+      <word_custom>Закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>t_edit</word_key>
+      <word_default>Edit Topic</word_default>
+      <word_custom>Изменить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>edit_f_desc</word_key>
+      <word_default>Topic Description</word_default>
+      <word_custom>Опи�ание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>top_move</word_key>
+      <word_default>Move Topic </word_default>
+      <word_custom>Переме�тить тему </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>p_edited</word_key>
+      <word_default>Topic Edited</word_default>
+      <word_custom>Тема изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>t_delete</word_key>
+      <word_default>Delete Topic</word_default>
+      <word_custom>Удалить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>p_pinned</word_key>
+      <word_default>Topic Pinned</word_default>
+      <word_custom>Тема подн�та</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4847,9 +3045,6 @@
       <word_key>delete_topic</word_key>
       <word_default>Deleting Topic, only continue if you wish to delete this topic, there will be no other confirmation screens.</word_default>
       <word_custom>По�ле нажати� кнопки «Удалить», тема будет полно�тью удалена из базы форума. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4857,39 +3052,6 @@
       <word_key>move_from</word_key>
       <word_default>Move this topic from</word_default>
       <word_custom>Переме�тить тему из</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>p_deleted</word_key>
-      <word_default>Topic Deleted</word_default>
-      <word_custom>Тема удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>t_move</word_key>
-      <word_default>Move Topic</word_default>
-      <word_custom>Переме�тить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>edit_f_title</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4897,9 +3059,27 @@
       <word_key>to</word_key>
       <word_default>to</word_default>
       <word_custom>в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>edit_f_title</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>�азвание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>t_move</word_key>
+      <word_default>Move Topic</word_default>
+      <word_custom>Переме�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>p_deleted</word_key>
+      <word_default>Topic Deleted</word_default>
+      <word_custom>Тема удалена</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4907,29 +3087,6 @@
       <word_key>submit_close</word_key>
       <word_default>Close this topic</word_default>
       <word_custom>Закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>p_closed</word_key>
-      <word_default>Topic Closed</word_default>
-      <word_custom>Тема закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>top_delete</word_key>
-      <word_default>Deleting Topic </word_default>
-      <word_custom>Удаление темы </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4937,9 +3094,20 @@
       <word_key>p_opened</word_key>
       <word_default>Topic Opened</word_default>
       <word_custom>Тема открыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>top_delete</word_key>
+      <word_default>Deleting Topic </word_default>
+      <word_custom>Удаление темы </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_mod</word_pack>
+      <word_key>p_closed</word_key>
+      <word_default>Topic Closed</word_default>
+      <word_custom>Тема закрыта</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4947,9 +3115,6 @@
       <word_key>edit_topic</word_key>
       <word_default>Editing Topic Details</word_default>
       <word_custom>Изменение данных темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4957,29 +3122,6 @@
       <word_key>p_pdeleted</word_key>
       <word_default>Post Deleted</word_default>
       <word_custom>Сообщение удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>post_icon</word_key>
-      <word_default><![CDATA[<b>Post Icons</b>]]></word_default>
-      <word_custom><![CDATA[<b>Иконки �ообщени�</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_mod</word_pack>
-      <word_key>submit_edit</word_key>
-      <word_default>Edit this topic</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4987,9 +3129,6 @@
       <word_key>submit_delete</word_key>
       <word_default>Delete this topic</word_default>
       <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -4997,1189 +3136,97 @@
       <word_key>p_unpinned</word_key>
       <word_default>Topic Unpinned</word_default>
       <word_custom>Тема опущена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
+      <word_pack>public_mod</word_pack>
       <word_key>submit_edit</word_key>
-      <word_default>Submit Modified Post</word_default>
-      <word_custom>Отредактировать �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_default>Edit this topic</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>top_txt_reply</word_key>
-      <word_default>Replying to</word_default>
-      <word_custom>Ответ в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>mob_tags</word_key>
+      <word_default>Tags</word_default>
+      <word_custom>Теги</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>topic_title_long</word_key>
-      <word_default>The topic title you supplied is too long</word_default>
-      <word_custom>Предложенное название темы превышает разрешенную длину.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mob_add_tag</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>too_many_media</word_key>
-      <word_default>Sorry, but you have posted more media files than you are allowed to</word_default>
-      <word_custom>В вашем �ообщении недопу�тимое количе�тво медиа файлов. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>mob_remove_tag</word_key>
+      <word_default>Remove Selected</word_default>
+      <word_custom>Удалить выбранные</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>topic_desc</word_key>
-      <word_default>Topic Description</word_default>
-      <word_custom>Опи�ание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>mob_edit_tags</word_key>
+      <word_default>Edit Topic Tags</word_default>
+      <word_custom>Изменить теги</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>no_dynamic</word_key>
-      <word_default><![CDATA[Sorry, dynamic pages in the [IMG] tags are not allowed]]></word_default>
-      <word_custom><![CDATA[Динамиче�кие ��ылки в теге [IMG] запрещены.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>too_few_tags</word_key>
+      <word_default>You must submit at least %s tag(s)</word_default>
+      <word_custom>Минимальное количе�тво тегов: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>too_many_img</word_key>
-      <word_default>Sorry, but you have posted more images than you are allowed to</word_default>
-      <word_custom>В вашем �ообщении недопу�тимое количе�тво изображений. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>enable_sig</word_key>
-      <word_default><![CDATA[<strong>Enable</strong> signature?]]></word_default>
-      <word_custom>Включить подпи�ь?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>top_txt_edit</word_key>
-      <word_default>Editing a post in</word_default>
-      <word_custom>Редактирование �ообщени� в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>poll_to_many</word_key>
-      <word_default>You have more poll choices than the administrator allows for this forum, please reduce them</word_default>
-      <word_custom>В вашем опро�е недопу�тимое количе�тво вариантов ответа. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>posting_new_topic</word_key>
-      <word_default>Posting New Topic</word_default>
-      <word_custom>Создание новой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>editing_post</word_key>
-      <word_default>Editing Post In </word_default>
-      <word_custom>Редактирование �ообщени� в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>review_topic</word_key>
-      <word_default>Review the complete topic (launches new window)</word_default>
-      <word_custom>Про�мотр темы полно�тью (откроет�� в новом окне)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post_preview</word_key>
-      <word_default>Post Preview</word_default>
-      <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>topic_title</word_key>
-      <word_default>Topic Title</word_default>
-      <word_custom>�азвание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>flash_not_allowed</word_key>
-      <word_default>Flash videos are not allowed</word_default>
-      <word_custom>Flash ролики запрещены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>guest_name_title</word_key>
-      <word_default>Enter a name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>guest_name</word_key>
-      <word_default>Enter your name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>flash_too_big</word_key>
-      <word_default>Please reduce the size of the flash movie you are posting</word_default>
-      <word_custom>Пожалуй�та уменьшите размер flash ролика.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post_icon</word_key>
-      <word_default>Post Icons</word_default>
-      <word_custom>Иконки �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>moderate_post</word_key>
-      <word_default>Your post will be previewed by a moderator before it is added to this topic</word_default>
-      <word_custom>Ваше �ообщение должно пройти премодерацию, прежде чем будет до�тупно в�ем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>invalid_ext</word_key>
-      <word_default>You are not allowed to use that image extension on this board.</word_default>
-      <word_custom>�едопу�тимое ра�ширение файла.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>upload_title</word_key>
-      <word_default>Attachments</word_default>
-      <word_custom>Прикрепление файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>moderate_topic</word_key>
-      <word_default>Your new topic will be previewed by a moderator before it is added into this forum</word_default>
-      <word_custom>Ваша тема должна пройти премодерацию, прежде чем будет до�тупна в �пи�ке.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>too_many_emoticons</word_key>
-      <word_default><![CDATA[You have posted a message with more emoticons that this board allows. Please reduce the number of emoticons you've added to the message]]></word_default>
-      <word_custom>В вашем �ообщении �лишком много �майликов. Пожалуй�та уменьшите их количе�тво и повторите отправку �ообщени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>top_txt_new</word_key>
-      <word_default>Posting A New Topic In </word_default>
-      <word_custom>Создание новой темы в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>no_topic_title</word_key>
-      <word_default>You must enter a topic title longer than 2 characters</word_default>
-      <word_custom>�азвание темы должно быть больше 2 �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>no_post</word_key>
-      <word_default>You must enter a post</word_default>
-      <word_custom>�еобходимо вве�ти тек�т �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>submit_reply</word_key>
-      <word_default>Add Reply</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>replying_in</word_key>
-      <word_default>Replying To </word_default>
-      <word_custom>Ответ в </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post_edited</word_key>
-      <word_default>The post has been edited</word_default>
-      <word_custom>Сообщение отредактировано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>submit_new</word_key>
-      <word_default>Post New Topic</word_default>
-      <word_custom>Создать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_nowt</word_key>
-      <word_default>( Do Nothing )</word_default>
-      <word_custom>(�ичего не делать)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_pin</word_key>
-      <word_default>Pin this topic</word_default>
-      <word_custom>Подн�ть �ту тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_options</word_key>
-      <word_default>After Posting</word_default>
-      <word_custom>По�ле отправки �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_close</word_key>
-      <word_default>Close this topic</word_default>
-      <word_custom>Закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_move</word_key>
-      <word_default>Move this topic</word_default>
-      <word_custom>Переме�тить �ту тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>append_edit</word_key>
-      <word_default><![CDATA[<strong>Add</strong> the 'Edit by' line in this post?]]></word_default>
-      <word_custom>Добавить надпи�ь «Отредактировано...»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_pinclose</word_key>
-      <word_default><![CDATA[Pin &amp; Close this topic]]></word_default>
-      <word_custom>Подн�ть и закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>already_sub</word_key>
-      <word_default>You are currently receiving email notification of replies</word_default>
-      <word_custom>Вы уже подпи�аны на уведомлени� об ответах в �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>pp_nohtml</word_key>
-      <word_default>HTML Off</word_default>
-      <word_custom>HTML выключен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>pp_html1</word_key>
-      <word_default>HTML On - Raw Linebreak Mode</word_default>
-      <word_custom>HTML включен - ручна� в�тавка переводов �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>pp_html2</word_key>
-      <word_default>HTML On - Auto Linebreak Mode</word_default>
-      <word_custom>HTML включен - автоматиче�ка� в�тавка переводов �трок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>too_many_tags</word_key>
+      <word_default>You may not submit more than %s tag(s)</word_default>
+      <word_custom>Мак�имальное количе�тво тегов: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
       <word_key>enable_track</word_key>
-      <word_default><![CDATA[<strong>Enable</strong> email notification of replies?]]></word_default>
-      <word_custom>Включить уведомление на e-mail при ответах? </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_default><![CDATA[<strong>Follow</strong> this topic?]]></word_default>
+      <word_custom>Следить за темой ? </word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>invalid_mime_type</word_key>
-      <word_default>Upload failed. You are not permitted to upload a file with that file extension.</word_default>
-      <word_custom>�еудачна� загрузка. У Ва� нет прав загружать файлы такого типа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>already_sub</word_key>
+      <word_default>You are currently following this topic</word_default>
+      <word_custom>Вы уже подпи�аны на уведомлени� об ответах в �той теме</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>upload_failed</word_key>
-      <word_default><![CDATA[The requested file upload failed because suitable permissions have not been enabled on the 'uploads' directory. Please contact the board administrator and inform them of this error.]]></word_default>
-      <word_custom>�е удало�ь загрузить файл из-за проблем на �ервере. Сообщите об �той ошибке админи�трации форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>post_poll</word_key>
+      <word_default>Poll</word_default>
+      <word_custom>Опро�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>poll_public_warning</word_key>
-      <word_default><![CDATA[(If checked, votes will be made public. <strong>This cannot be changed once a vote has been made!</strong>)]]></word_default>
-      <word_custom>(Е�ли выбрано, то ответы �танов�т�� открытыми. �ельз� изменить �ту опцию, е�ли вы проголо�овали)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>moderator_options</word_key>
+      <word_default>Moderator Options</word_default>
+      <word_custom>Опции модератора</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>poll_fs_title</word_key>
-      <word_default>Poll Title (Optional)</word_default>
-      <word_custom>Заголовок опро�а (опционально)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_permission_shared</word_key>
+      <word_default>You do not have permission to share one or more pieces of content you were attempting to share.</word_default>
+      <word_custom>Вы пытаете�ь поделить�� чужими файлами.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>poll_fs_public</word_key>
-      <word_default>Public Poll?</word_default>
-      <word_custom>Открытое голо�ование?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>question_title</word_key>
-      <word_default>Question</word_default>
-      <word_custom>Вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>poll_manage_link</word_key>
-      <word_default>Manage Topic Poll</word_default>
-      <word_custom>Управление опро�ом</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post_optional</word_key>
-      <word_default>(Optional)</word_default>
-      <word_custom>(опционально)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_time_format</word_key>
-      <word_default>HH:MM</word_default>
-      <word_custom>ЧЧ:ММ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_date_format</word_key>
-      <word_default>MM/DD/YYYY</word_default>
-      <word_custom>ДД.ММ.ГГГГ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_close_time</word_key>
-      <word_default>Specify Topic Close Time</word_default>
-      <word_custom>Выберите врем� закрыти� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>picons_none</word_key>
-      <word_default><![CDATA[[ Use None ]]]></word_default>
-      <word_custom><![CDATA[[ Без иконки ] ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_open_time</word_key>
-      <word_default>Specify Topic Open Time</word_default>
-      <word_custom>Выберите врем� открыти� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_delete_title</word_key>
-      <word_default>Delete this attachment</word_default>
-      <word_custom>Удалить �тот файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_button</word_key>
-      <word_default>Add to Post</word_default>
-      <word_custom>Добавить в �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_button_title</word_key>
-      <word_default>Adds a placeholder tag for the attachment in the post</word_default>
-      <word_custom>В�тавить файл в тек�товый редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>ignore_first_line</word_key>
-      <word_default>You have chosen to ignore all posts from:</word_default>
-      <word_custom>Вы игнорируете в�е �ообщени� от:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>guest_captcha</word_key>
-      <word_default>Confirm Code</word_default>
-      <word_custom>Подтвердите код</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>err_reg_code</word_key>
-      <word_default>The generated code did not match the one displayed, a new code has been generated, please try again</word_default>
-      <word_custom>Сгенерированный код не �овпадает � выведенным. Код был пере�оздан, попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>domain_not_allowed</word_key>
-      <word_default>You have entered a link to a website that the administrator does not allow links to</word_default>
-      <word_custom>В вашем �ообщении �одержит�� ��ылка на �айт, запрещенный админи�трацией форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>too_many_quotes</word_key>
-      <word_default>You have posted more than the allowed number of quoted blocks of text</word_default>
-      <word_custom>Ваше �ообщение �одержит очень большое количе�тво цитат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>reason_for_edit</word_key>
-      <word_default>Reason for edit</word_default>
-      <word_custom>Причина редактировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>poll_multichoice</word_key>
-      <word_default>Allow users to select multiple answers?</word_default>
-      <word_custom>Позволить пользовател�м выбирать более одного варианта ответа?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>poll_only_title</word_key>
-      <word_default>Poll-only topic?</word_default>
-      <word_custom>Только опро�?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>poll_only_desc</word_key>
-      <word_default>Disables replying to this topic</word_default>
-      <word_custom>Запрещает о�тавл�ть �ообщени� в теме. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_open</word_key>
-      <word_default>Open this topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_pinopen</word_key>
-      <word_default><![CDATA[Pin & Open this topic]]></word_default>
-      <word_custom>Подн�ть и открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_unpinopen</word_key>
-      <word_default><![CDATA[Unpin &amp; Open this topic]]></word_default>
-      <word_custom>Опу�тить и открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_unpinclose</word_key>
-      <word_default><![CDATA[Unpin &amp; Close this topic]]></word_default>
-      <word_custom>Опу�тить и закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>mod_unpin</word_key>
-      <word_default>Unpin this topic</word_default>
-      <word_custom>Опу�тить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>switch_to_advanced</word_key>
-      <word_default>Try our advanced uploader which supports multiple file uploading (modern browser required)</word_default>
-      <word_custom>� еще Вы можете загружать �разу не�колько файлов (требует�� �овременный браузер) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>switch_to_basic</word_key>
-      <word_default>Try switching to our basic uploader</word_default>
-      <word_custom>Во�пользуйте�ь про�тым менеджером загрузки файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>select_several</word_key>
-      <word_default>You can select more than one file at a time by holding Ctrl (on Windows) or Command (on Mac) and selecting your files.</word_default>
-      <word_custom>Вы можете выбрать �разу не�колько файлов е�ли при выборе файла зажмете кнопку Ctrl (Windows) или Cmd (Mac)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>trouble_uploading</word_key>
-      <word_default>Trouble uploading?</word_default>
-      <word_custom>Проблемы � загрузкой?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>used_space_js</word_key>
-      <word_default><![CDATA[Used <strong>[used]</strong> of your <strong>[total]</strong> global upload quota (Max. single file size: <strong>%s</strong>)]]></word_default>
-      <word_custom><![CDATA[И�пользовано ме�та [used] из [total] (Мак�. размер дл� одного файла: %s)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>used_space</word_key>
-      <word_default><![CDATA[Used <strong>%s</strong> of your <strong>%s</strong> global upload quota (Max. single file size: <strong>%s</strong>)]]></word_default>
-      <word_custom>И�пользовано ме�та %s из %s (Мак�. размер дл� одного файла: %s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_EDIT_PERMS</word_key>
-      <word_default>You do not have permission to edit this topic</word_default>
-      <word_custom>У ва� нет прав дл� редактировани� темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_SUCH_TOPIC</word_key>
-      <word_default>The topic you are attempting to post in could not be found.  It is possible that the topic was deleted.</word_default>
-      <word_custom>Вы пытаете�ь ответить в не�уще�твующую или удаленную тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>REG_CODE_ENTER</word_key>
-      <word_default>The administrator requires you to enter a verification code in order to post your message</word_default>
-      <word_custom>Вы должны вве�ти код безопа�но�ти дл� отправки �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>CODE_ERROR</word_key>
-      <word_default>The verification code you entered was incorrect</word_default>
-      <word_custom>Код безопа�но�ти введен неверно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_PPD_POSTS</word_key>
-      <word_default>This will reset when you have made %s more approved posts</word_default>
-      <word_custom>Ограничение будет дей�твовать, пока вы не наберете еще %s �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_PPD_DAYS</word_key>
-      <word_default>This will reset on %s</word_default>
-      <word_custom>Сн�тие ограничени� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_POSTING_PPD</word_key>
-      <word_default>You cannot make any more posts. You have exceeded %s posts per day.</word_default>
-      <word_custom>Вы больше не можете �оздавать �ообщени�. Ваш лимит %s �ообщений в день и�черпан.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_USER_SET</word_key>
-      <word_default>You must sign in to post in this topic.</word_default>
-      <word_custom>Вы должны войти в �и�тему прежде чем �можете о�тавл�ть �ообщени� в �той теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_START_PERM</word_key>
-      <word_default>You do not have permission to start topics in this forum.</word_default>
-      <word_custom>У ва� недо�таточно прав дл� �оздани� тем в �том форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>TOPIC_LOCKED</word_key>
-      <word_default>You do not have permission to reply to locked topics.</word_default>
-      <word_custom>Вы не можете о�тавл�ть �ообщени� в закрытых темах</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>FORUM_LOCKED</word_key>
-      <word_default><![CDATA[This forum is 'read only' and does not allow new topics or posts to be submitted in it.]]></word_default>
-      <word_custom>Данный форум помечен как архивный. Вы не можете добавл�ть в него новые темы или �ообщени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_POST_FORUM</word_key>
-      <word_default>You do not have permission to post in this forum.</word_default>
-      <word_custom>У Ва� нет прав о�тавл�ть �ообщени� в �том форуме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_REPLY_POLL</word_key>
-      <word_default>This is a poll only topic and replies are not permitted.</word_default>
-      <word_custom>�втор опро�а отключил возможно�ть его комментировани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_SUCH_FORUM</word_key>
-      <word_default>It appears the forum you were attempting to submit to does not exist.</word_default>
-      <word_custom>�е удало�ь найти форум в который вы пытаете�ь добавить тему или �ообщение.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_REPLY_PERM</word_key>
-      <word_default>You do not have permission to reply to this topic.</word_default>
-      <word_custom>У Ва� нет прав о�тавл�ть �ообщени� в �той теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_CONTENT</word_key>
-      <word_default>You must enter a post.</word_default>
-      <word_custom>�еобходимо вве�ти �одержимое �ообщени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_AUTHOR_SET</word_key>
-      <word_default>We could not determine who was posting this topic.</word_default>
-      <word_custom>�е удало�ь найти автора темы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>NO_FORUM_ID</word_key>
-      <word_default>We could not determine which forum you were attempting to post in.</word_default>
-      <word_custom>�е удало�ь найти форум в который вы пытаете�ь добавить тему или �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>clear_selection</word_key>
-      <word_default>Clear Selection</word_default>
-      <word_custom>Отменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_files_help</word_key>
-      <word_default>Help with attaching files</word_default>
-      <word_custom>Помощь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>attach_selected</word_key>
-      <word_default>Attach This File</word_default>
-      <word_custom>Загрузить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>summary_posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Отправлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>topic_summary</word_key>
-      <word_default>Topic Summary</word_default>
-      <word_custom>По�ледние 10 �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>edit_options</word_key>
-      <word_default>Edit Options</word_default>
-      <word_custom>Опции редактировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post_options</word_key>
-      <word_default>Post Options</word_default>
-      <word_custom>Опции �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>post</word_key>
-      <word_default>Post</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>topic_poll_title</word_key>
-      <word_default>Topic Poll</word_default>
-      <word_custom>Опции опро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>topic_information</word_key>
-      <word_default>Topic Information</word_default>
-      <word_custom>Опции темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>emoticons_template_title</word_key>
-      <word_default>Emoticons</word_default>
-      <word_custom>Смайлики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>close_poll_form</word_key>
-      <word_default>Close Poll Form</word_default>
-      <word_custom>Закрыть форму опро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>add_another_question</word_key>
-      <word_default>Add Another Question</word_default>
-      <word_custom>Добавить еще вопро� в опро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>remove_choice</word_key>
-      <word_default>Remove Choice</word_default>
-      <word_custom>Удалить вариант ответа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>remove_question</word_key>
-      <word_default>Remove question</word_default>
-      <word_custom>Удалить вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>add_another_choice</word_key>
-      <word_default>Add Another Choice</word_default>
-      <word_custom>Добавить вариант ответа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_post</word_pack>
-      <word_key>add_poll_choice</word_key>
-      <word_default>Add Choice</word_default>
-      <word_custom>Добавить вариант ответа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_tags</word_key>
+      <word_default>Topic Tags</word_default>
+      <word_custom>Теги темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6187,29 +3234,384 @@
       <word_key>quote_mismatch</word_key>
       <word_default>The number of opening quote tags does not match the number of closing quote tags.</word_default>
       <word_custom>Количе�тво открывающих тегов цитаты, не �оответ�твует количе�тву закрывающих</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31003</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>enable_emo</word_key>
-      <word_default><![CDATA[<strong>Enable</strong> emoticons?]]></word_default>
-      <word_custom>Включить �майлики?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>add_poll_choice</word_key>
+      <word_default>Add Choice</word_default>
+      <word_custom>Добавить вариант ответа</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_post</word_pack>
-      <word_key>button_preview</word_key>
-      <word_default>Preview Post</word_default>
-      <word_custom>Предварительный про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_another_choice</word_key>
+      <word_default>Add Another Choice</word_default>
+      <word_custom>Добавить вариант ответа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>remove_question</word_key>
+      <word_default>Remove question</word_default>
+      <word_custom>Удалить вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>remove_choice</word_key>
+      <word_default>Remove Choice</word_default>
+      <word_custom>Удалить вариант ответа</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>add_another_question</word_key>
+      <word_default>Add Another Question</word_default>
+      <word_custom>Добавить еще вопро� в опро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>emoticons_template_title</word_key>
+      <word_default>Emoticons</word_default>
+      <word_custom>Смайлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>close_poll_form</word_key>
+      <word_default>Finished</word_default>
+      <word_custom>Закрыть форму опро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_votes_desc</word_key>
+      <word_default>The number of votes this choice has (or starts with, if this is a new poll)</word_default>
+      <word_custom>Количе�тво голо�ов дл� �того варианта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_information</word_key>
+      <word_default>Topic Information</word_default>
+      <word_custom>Опции темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_poll_title</word_key>
+      <word_default>Topic Poll</word_default>
+      <word_custom>Опции опро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post_options</word_key>
+      <word_default>Post Options</word_default>
+      <word_custom>Опции �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>edit_options</word_key>
+      <word_default>Edit Options</word_default>
+      <word_custom>Опции редактировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_selected</word_key>
+      <word_default>Attach This File</word_default>
+      <word_custom>Загрузить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>summary_posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_summary</word_key>
+      <word_default>Topic Summary</word_default>
+      <word_custom>По�ледние 10 �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>clear_selection</word_key>
+      <word_default>Clear Selection</word_default>
+      <word_custom>Отменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_files_help</word_key>
+      <word_default>Help with attaching files</word_default>
+      <word_custom>Помощь</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_AUTHOR_SET</word_key>
+      <word_default>We could not determine who was posting this topic.</word_default>
+      <word_custom>�е удало�ь найти автора темы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_FORUM_ID</word_key>
+      <word_default>We could not determine which forum you were attempting to post in.</word_default>
+      <word_custom>�е удало�ь найти форум в который вы пытаете�ь добавить тему или �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_SUCH_FORUM</word_key>
+      <word_default>It appears the forum you were attempting to submit to does not exist.</word_default>
+      <word_custom>�е удало�ь найти форум в который вы пытаете�ь добавить тему или �ообщение.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_CONTENT</word_key>
+      <word_default>You must enter a post.</word_default>
+      <word_custom>�еобходимо вве�ти �одержимое �ообщени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_REPLY_PERM</word_key>
+      <word_default>You do not have permission to reply to this topic.</word_default>
+      <word_custom>У Ва� нет прав о�тавл�ть �ообщени� в �той теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_POST_FORUM</word_key>
+      <word_default>You do not have permission to post in this forum.</word_default>
+      <word_custom>У Ва� нет прав о�тавл�ть �ообщени� в �том форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_REPLY_POLL</word_key>
+      <word_default>This is a poll only topic and replies are not permitted.</word_default>
+      <word_custom>�втор опро�а отключил возможно�ть его комментировани�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>FORUM_LOCKED</word_key>
+      <word_default><![CDATA[This forum is 'read only' and does not allow new topics or posts to be submitted in it.]]></word_default>
+      <word_custom>Данный форум помечен как архивный. Вы не можете добавл�ть в него новые темы или �ообщени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>TOPIC_LOCKED</word_key>
+      <word_default>You do not have permission to reply to locked topics.</word_default>
+      <word_custom>Вы не можете о�тавл�ть �ообщени� в закрытых темах</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_USER_SET</word_key>
+      <word_default>You must sign in to post in this topic.</word_default>
+      <word_custom>Вы должны войти в �и�тему прежде чем �можете о�тавл�ть �ообщени� в �той теме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_START_PERM</word_key>
+      <word_default>You do not have permission to start topics in this forum.</word_default>
+      <word_custom>У ва� недо�таточно прав дл� �оздани� тем в �том форуме.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>CODE_ERROR</word_key>
+      <word_default>The verification code you entered was incorrect</word_default>
+      <word_custom>Код безопа�но�ти введен неверно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_PPD_DAYS</word_key>
+      <word_default>This will reset on %s</word_default>
+      <word_custom>Сн�тие ограничени� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_PPD_POSTS</word_key>
+      <word_default>This will reset when you have made %s more approved posts</word_default>
+      <word_custom>Ограничение будет дей�твовать, пока вы не наберете еще %s �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_POSTING_PPD</word_key>
+      <word_default>You cannot make any more posts. You have exceeded %s posts per day.</word_default>
+      <word_custom>Вы больше не можете �оздавать �ообщени�. Ваш лимит %s �ообщений в день и�черпан.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_SUCH_TOPIC</word_key>
+      <word_default>The topic you are attempting to post in could not be found.  It is possible that the topic was deleted.</word_default>
+      <word_custom>Вы пытаете�ь ответить в не�уще�твующую или удаленную тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>NO_EDIT_PERMS</word_key>
+      <word_default>You do not have permission to edit this topic</word_default>
+      <word_custom>У ва� нет прав дл� редактировани� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>REG_CODE_ENTER</word_key>
+      <word_default>The administrator requires you to enter a verification code in order to post your message</word_default>
+      <word_custom>Вы должны вве�ти код безопа�но�ти дл� отправки �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>select_several</word_key>
+      <word_default>You can select more than one file at a time by holding Ctrl (on Windows) or Command (on Mac) and selecting your files.</word_default>
+      <word_custom>Вы можете выбрать �разу не�колько файлов е�ли при выборе файла зажмете кнопку Ctrl (Windows) или Cmd (Mac)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>used_space_js</word_key>
+      <word_default><![CDATA[Used <strong>[used]</strong> of your <strong>[total]</strong> global upload quota (Max. single file size: <strong>%s</strong>)]]></word_default>
+      <word_custom><![CDATA[И�пользовано ме�та [used] из [total] (Мак�. размер дл� одного файла: %s)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>switch_to_basic</word_key>
+      <word_default>Try our basic uploader</word_default>
+      <word_custom>Во�пользуйте�ь про�тым менеджером загрузки файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>switch_to_advanced</word_key>
+      <word_default>Try our advanced uploader (requires Flash 9)</word_default>
+      <word_custom>� еще Вы можете загружать �разу не�колько файлов (требует�� �овременный браузер) </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_header</word_key>
+      <word_default>Attach Files</word_default>
+      <word_custom>Прикрепить файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>used_space</word_key>
+      <word_default><![CDATA[Used <strong>%s</strong> of your <strong>%s</strong> global upload quota (Max. single file size: <strong>%s</strong>)]]></word_default>
+      <word_custom>И�пользовано ме�та %s из %s (Мак�. размер дл� одного файла: %s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>trouble_uploading</word_key>
+      <word_default>Trouble uploading?</word_default>
+      <word_custom>Проблемы � загрузкой?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_unpin</word_key>
+      <word_default>Unpin this topic</word_default>
+      <word_custom>Опу�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_open</word_key>
+      <word_default>Open this topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_unpinclose</word_key>
+      <word_default><![CDATA[Unpin &amp; Close this topic]]></word_default>
+      <word_custom>Опу�тить и закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_pinopen</word_key>
+      <word_default><![CDATA[Pin & Open this topic]]></word_default>
+      <word_custom>Подн�ть и открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_unpinopen</word_key>
+      <word_default><![CDATA[Unpin &amp; Open this topic]]></word_default>
+      <word_custom>Опу�тить и открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>preason_for_edit</word_key>
+      <word_default>Reason for edit:</word_default>
+      <word_custom>Причина редактировани�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_only_desc</word_key>
+      <word_default>Disables replying to this topic</word_default>
+      <word_custom>Запрещает о�тавл�ть �ообщени� в теме. </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>domain_not_allowed</word_key>
+      <word_default>You have entered a link to a website that the administrator does not allow links to</word_default>
+      <word_custom>В вашем �ообщении �одержит�� ��ылка на �айт, запрещенный админи�трацией форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>too_many_quotes</word_key>
+      <word_default>You have posted more than the allowed number of quoted blocks of text</word_default>
+      <word_custom>Ваше �ообщение �одержит очень большое количе�тво цитат</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6217,9 +3619,475 @@
       <word_key>edited_poll</word_key>
       <word_default>Edited poll</word_default>
       <word_custom>Изменен опро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_only_title</word_key>
+      <word_default>Poll-only topic?</word_default>
+      <word_custom>Только опро�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_multichoice</word_key>
+      <word_default>Allow multiple choice?</word_default>
+      <word_custom>Позволить пользовател�м выбирать более одного варианта ответа?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>guest_captcha</word_key>
+      <word_default>Confirm Code</word_default>
+      <word_custom>Подтвердите код</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>err_reg_code</word_key>
+      <word_default>The security code you supplied did not match the one displayed, a new code has been generated, please try again</word_default>
+      <word_custom>Сгенерированный код не �овпадает � выведенным. Код был пере�оздан, попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_button_title</word_key>
+      <word_default>Adds a placeholder tag for the attachment in the post</word_default>
+      <word_custom>В�тавить файл в тек�товый редактор</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_button</word_key>
+      <word_default>Add to Post</word_default>
+      <word_custom>Добавить в �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>picons_none</word_key>
+      <word_default><![CDATA[[ Use None ]]]></word_default>
+      <word_custom><![CDATA[[ Без иконки ] ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_delete_title</word_key>
+      <word_default>Delete this attachment</word_default>
+      <word_custom>Удалить �тот файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>attach_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>ignore_first_line</word_key>
+      <word_default>You have chosen to ignore all posts from:</word_default>
+      <word_custom>Вы игнорируете в�е �ообщени� от:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_close_time</word_key>
+      <word_default>Topic Close Time</word_default>
+      <word_custom>Выберите врем� закрыти� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_open_time</word_key>
+      <word_default>Topic Open Time</word_default>
+      <word_custom>Выберите врем� открыти� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_date_format</word_key>
+      <word_default>MM/DD/YYYY</word_default>
+      <word_custom>ДД.ММ.ГГГГ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_add_link</word_key>
+      <word_default>Add A Poll</word_default>
+      <word_custom>Добавить опро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_manager</word_key>
+      <word_default>Poll Manager</word_default>
+      <word_custom>Управление опро�ом</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_manage_link</word_key>
+      <word_default>Manage Topic Poll</word_default>
+      <word_custom>Управление опро�ом</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_time_format</word_key>
+      <word_default>HH:MM</word_default>
+      <word_custom>ЧЧ:ММ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post_optional</word_key>
+      <word_default>(Optional)</word_default>
+      <word_custom>(опционально)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>question_title</word_key>
+      <word_default>Question</word_default>
+      <word_custom>Вопро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_fs_title</word_key>
+      <word_default>Poll Title</word_default>
+      <word_custom>Заголовок опро�а (опционально)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_public_warning</word_key>
+      <word_default><![CDATA[If checked, member votes will be made public. (<strong>This cannot be changed once a vote has been made!</strong>)]]></word_default>
+      <word_custom>(Е�ли выбрано, то ответы �танов�т�� открытыми. �ельз� изменить �ту опцию, е�ли вы проголо�овали)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_fs_public</word_key>
+      <word_default>Make votes public?</word_default>
+      <word_custom>Открытое голо�ование?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>pp_html1</word_key>
+      <word_default>HTML On - Raw Linebreak Mode</word_default>
+      <word_custom>HTML включен - ручна� в�тавка переводов �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>pp_htmlstatus</word_key>
+      <word_default>HTML Posting</word_default>
+      <word_custom>И�пользование HTML</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>pp_nohtml</word_key>
+      <word_default>HTML Off</word_default>
+      <word_custom>HTML выключен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>pp_html2</word_key>
+      <word_default>HTML On - Auto Linebreak Mode</word_default>
+      <word_custom>HTML включен - автоматиче�ка� в�тавка переводов �трок</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_pinclose</word_key>
+      <word_default><![CDATA[Pin &amp; Close this topic]]></word_default>
+      <word_custom>Подн�ть и закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>upload_failed</word_key>
+      <word_default><![CDATA[The requested file upload failed because suitable permissions have not been enabled on the 'uploads' directory. Please contact the community administrator and inform them of this error.]]></word_default>
+      <word_custom>�е удало�ь загрузить файл из-за проблем на �ервере. Сообщите об �той ошибке админи�трации форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>invalid_mime_type</word_key>
+      <word_default>Upload failed. You are not permitted to upload a file with that file extension.</word_default>
+      <word_custom>�еудачна� загрузка. У Ва� нет прав загружать файлы такого типа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_close</word_key>
+      <word_default>Close this topic</word_default>
+      <word_custom>Закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>append_edit</word_key>
+      <word_default><![CDATA[<strong>Add</strong> the 'Edit by' line in this post?]]></word_default>
+      <word_custom>Добавить надпи�ь «Отредактировано...»</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_move</word_key>
+      <word_default>Move this topic</word_default>
+      <word_custom>Переме�тить �ту тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_pin</word_key>
+      <word_default>Pin this topic</word_default>
+      <word_custom>Подн�ть �ту тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>mod_nowt</word_key>
+      <word_default>( Do Nothing )</word_default>
+      <word_custom>(�ичего не делать)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post_edited</word_key>
+      <word_default>The post has been edited</word_default>
+      <word_custom>Сообщение отредактировано</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>submit_new</word_key>
+      <word_default>Post New Topic</word_default>
+      <word_custom>Создать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>no_post</word_key>
+      <word_default>You must enter a post</word_default>
+      <word_custom>�еобходимо вве�ти тек�т �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>replying_in</word_key>
+      <word_default>Replying To </word_default>
+      <word_custom>Ответ в </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>submit_reply</word_key>
+      <word_default>Add Reply</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>no_topic_title</word_key>
+      <word_default>You must enter a topic title longer than 2 characters</word_default>
+      <word_custom>�азвание темы должно быть больше 2 �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>too_many_emoticons</word_key>
+      <word_default><![CDATA[You have posted a message with more emoticons than this community allows. Please reduce the number of emoticons you've added to the message]]></word_default>
+      <word_custom>В вашем �ообщении �лишком много �майликов. Пожалуй�та уменьшите их количе�тво и повторите отправку �ообщени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>moderate_topic</word_key>
+      <word_default>Your new topic will be previewed by a moderator before it is added into this forum</word_default>
+      <word_custom>Ваша тема должна пройти премодерацию, прежде чем будет до�тупна в �пи�ке.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>top_txt_new</word_key>
+      <word_default>Posting a New Topic in </word_default>
+      <word_custom>Создание новой темы в </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>invalid_ext</word_key>
+      <word_default>You are not allowed to use that image extension on this community.</word_default>
+      <word_custom>�едопу�тимое ра�ширение файла.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>upload_title</word_key>
+      <word_default>Attachments</word_default>
+      <word_custom>Прикрепление файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>guest_name</word_key>
+      <word_default>Enter Your Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>flash_too_big</word_key>
+      <word_default>Please reduce the size of the flash movie you are posting</word_default>
+      <word_custom>Пожалуй�та уменьшите размер flash ролика.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>moderate_post</word_key>
+      <word_default>Your post will be previewed by a moderator before it is added to this topic</word_default>
+      <word_custom>Ваше �ообщение должно пройти премодерацию, прежде чем будет до�тупно в�ем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post_icon</word_key>
+      <word_default>Post Icons</word_default>
+      <word_custom>Изображени� опро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>flash_not_allowed</word_key>
+      <word_default>Flash videos are not allowed</word_default>
+      <word_custom>Flash ролики запрещены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>post_preview</word_key>
+      <word_default>Post Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>review_topic</word_key>
+      <word_default>Review the complete topic (launches new window)</word_default>
+      <word_custom>Про�мотр темы полно�тью (откроет�� в новом окне)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_title</word_key>
+      <word_default>Topic Title</word_default>
+      <word_custom>�азвание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>poll_to_many</word_key>
+      <word_default>You have more poll choices than the administrator allows for this forum, please reduce them</word_default>
+      <word_custom>В вашем опро�е недопу�тимое количе�тво вариантов ответа. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>top_txt_edit</word_key>
+      <word_default>Editing a post in</word_default>
+      <word_custom>Редактирование �ообщени� в</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>enable_sig</word_key>
+      <word_default><![CDATA[<strong>Enable</strong> signature?]]></word_default>
+      <word_custom>Включить подпи�ь?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>posting_new_topic</word_key>
+      <word_default>Posting New Topic</word_default>
+      <word_custom>Создание новой темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>editing_post</word_key>
+      <word_default>Editing Post In </word_default>
+      <word_custom>Редактирование �ообщени� в </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>too_many_media</word_key>
+      <word_default>Sorry, but you have posted more media files than you are allowed to</word_default>
+      <word_custom>В вашем �ообщении недопу�тимое количе�тво медиа файлов. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>too_many_img</word_key>
+      <word_default>Sorry, but you have posted more images than you are allowed to</word_default>
+      <word_custom>В вашем �ообщении недопу�тимое количе�тво изображений. Пожалуй�та удалите ча�ть из них и повторите отправку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>no_dynamic</word_key>
+      <word_default><![CDATA[Sorry, dynamic pages in the [IMG] tags are not allowed]]></word_default>
+      <word_custom><![CDATA[Динамиче�кие ��ылки в теге [IMG] запрещены.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_desc</word_key>
+      <word_default>Topic Description</word_default>
+      <word_custom>Опи�ание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>top_txt_reply</word_key>
+      <word_default>Replying to</word_default>
+      <word_custom>Ответ в</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>topic_title_long</word_key>
+      <word_default>The topic title you supplied is too long</word_default>
+      <word_custom>Предложенное название темы превышает разрешенную длину.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>enable_emo</word_key>
+      <word_default><![CDATA[<strong>Enable</strong> emoticons?]]></word_default>
+      <word_custom>Включить �майлики?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>submit_edit</word_key>
+      <word_default>Submit Modified Post</word_default>
+      <word_custom>Отредактировать �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_post</word_pack>
+      <word_key>button_preview</word_key>
+      <word_default>Preview Post</word_default>
+      <word_custom>Предварительный про�мотр</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6227,9 +4095,6 @@
       <word_key>edited_topic_title</word_key>
       <word_default><![CDATA[Edited topic title or description '%s' to '%s' via post form]]></word_default>
       <word_custom><![CDATA[Изменено название или опи�ание темы � '%s' на '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6237,169 +4102,13 @@
       <word_key>added_poll</word_key>
       <word_default><![CDATA[Added a poll to the topic titled '%s']]></word_default>
       <word_custom><![CDATA[Добавлен опро� в тему '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_word_title</word_key>
-      <word_default>Download Microsoft Word Version</word_default>
-      <word_custom>Вер�и� в формате Microsoft Word</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_word_desc</word_key>
-      <word_default><![CDATA[This will enable you to download a version of this topic in an editable Word format. This will open your browser's download dialogue box]]></word_default>
-      <word_custom>Вы можете �качать Word вер�ию �той темы � возможно�тью дальнейшего редактировани�. Будет открыто окно дл� �качивани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_html_title</word_key>
-      <word_default>Download HTML Version</word_default>
-      <word_custom>HTML вер�и�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_html_desc</word_key>
-      <word_default><![CDATA[This will enable you to download a HTML version of this topic to your hard drive. This will open your browser's download dialogue box]]></word_default>
-      <word_custom>Вы можете �качать HTML вер�ию �той темы на ваш компьютер. Будет открыто окно дл� �качивани�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_print_desc</word_key>
-      <word_default>This will display the topic in a simple, printer friendly format on this page, no download is required.</word_default>
-      <word_custom>Тема будет отображена и ра�печатана в про�том виде на �той �транице.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>o_print_title</word_key>
-      <word_default>Printer Friendly Version</word_default>
-      <word_custom>Вер�и� дл� печати</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>tvo_title</word_key>
-      <word_default>Topic View Options for:</word_default>
-      <word_custom>Опции отображени� темы дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>start</word_key>
-      <word_default>started by</word_default>
-      <word_custom>�оздал </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>by</word_key>
-      <word_default>Posted by</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>title</word_key>
-      <word_default>Printable Version of Topic</word_default>
-      <word_custom>Вер�и� темы дл� печати</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>on	</word_key>
-      <word_default>on</word_default>
-      <word_custom> —  </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>end</word_key>
-      <word_default>end</word_default>
-      <word_custom>конец</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>forum</word_key>
-      <word_default>Forum</word_default>
-      <word_custom>Форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>click_toview</word_key>
-      <word_default>Click to view Topic</word_default>
-      <word_custom>Перейти в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>powered_by</word_key>
-      <word_default>Powered by </word_default>
-      <word_custom>Ру��кий </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_post</word_pack>
+      <word_key>after_posting_pf</word_key>
+      <word_default>After Posting</word_default>
+      <word_custom>По�ле ответа</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6407,19 +4116,6 @@
       <word_key>posted_prefix</word_key>
       <word_default>Posted</word_default>
       <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_printpage</word_pack>
-      <word_key>please_choose</word_key>
-      <word_default>Please choose an option below</word_default>
-      <word_custom>Пожалуй�та, выберите нужный формат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6427,9 +4123,97 @@
       <word_key>view_original</word_key>
       <word_default>(View original topic)</word_default>
       <word_custom>(�ажмите �юда дл� про�мотра �той темы в обычном формате)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>please_choose</word_key>
+      <word_default>Please choose an option below</word_default>
+      <word_custom>Пожалуй�та, выберите нужный формат</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>click_toview</word_key>
+      <word_default>Click to view Topic</word_default>
+      <word_custom>Перейти в тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>end</word_key>
+      <word_default>end</word_default>
+      <word_custom>конец</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>forum</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>powered_by</word_key>
+      <word_default>Powered by </word_default>
+      <word_custom>Ру��кий </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>on	</word_key>
+      <word_default>on</word_default>
+      <word_custom> —  </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>title</word_key>
+      <word_default>Printable Version of Topic</word_default>
+      <word_custom>Вер�и� темы дл� печати</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>by</word_key>
+      <word_default>Posted by</word_default>
+      <word_custom>�втор:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>start</word_key>
+      <word_default>started by</word_default>
+      <word_custom>�оздал </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>tvo_title</word_key>
+      <word_default>Topic View Options for:</word_default>
+      <word_custom>Опции отображени� темы дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_html_desc</word_key>
+      <word_default><![CDATA[This will enable you to download a HTML version of this topic to your hard drive. This will open your browser's download dialogue box]]></word_default>
+      <word_custom>Вы можете �качать HTML вер�ию �той темы на ваш компьютер. Будет открыто окно дл� �качивани�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_html_title</word_key>
+      <word_default>Download HTML Version</word_default>
+      <word_custom>HTML вер�и�</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6437,249 +4221,34 @@
       <word_key>back_topic</word_key>
       <word_default>Back to the topic</word_default>
       <word_custom>Вернуть�� в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>topic_noperms</word_key>
-      <word_default>You do not have permission to access this forum</word_default>
-      <word_custom>Вы не можете про�матривать �тот форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_print_desc</word_key>
+      <word_default>This will display the topic in a simple, printer friendly format on this page, no download is required.</word_default>
+      <word_custom>Тема будет отображена и ра�печатана в про�том виде на �той �транице.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>topic_noattach</word_key>
-      <word_default>The specified topic does not have any attachments</word_default>
-      <word_custom>Тема не �одержит прикрепленных файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_word_title</word_key>
+      <word_default>Download Microsoft Word Version</word_default>
+      <word_custom>Вер�и� в формате Microsoft Word</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>notopic_attach</word_key>
-      <word_default>Could not load attachments for the requested topic</word_default>
-      <word_custom>�е удало�ь загрузить прикрепленные файлы дл� запрашиваемой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_print_title</word_key>
+      <word_default>Printer Friendly Version</word_default>
+      <word_custom>Вер�и� дл� печати</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>stats_missing_tid</word_key>
-      <word_default>You must select a valid topic for this feature</word_default>
-      <word_custom>Вы должны указать �уще�твующую тему, чтобы во�пользовать�� �той функцией.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_all_forums</word_key>
-      <word_default>All Forums</word_default>
-      <word_custom>В�е форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_location</word_key>
-      <word_default>Location</word_default>
-      <word_custom>По�леднее дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_mods</word_key>
-      <word_default>Forum Moderators</word_default>
-      <word_custom>Модераторы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_global</word_key>
-      <word_default>Global Moderators</word_default>
-      <word_custom>Супермодераторы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>leader_admins</word_key>
-      <word_default>Administrators</word_default>
-      <word_custom>�дмини�траторы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>top_poster_title</word_key>
-      <word_default><![CDATA[Today's top 20 posters]]></word_default>
-      <word_custom>20 авторов �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>forum_leaders</word_key>
-      <word_default>The moderating team</word_default>
-      <word_custom>�дмини�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>no_info</word_key>
-      <word_default>No information is available at this time</word_default>
-      <word_custom>�а данный момент нет никакой информации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>member_percent</word_key>
-      <word_default><![CDATA[% of today's posts]]></word_default>
-      <word_custom>% �егодн�шних �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>member_joined</word_key>
-      <word_default>Joined</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>member_posts</word_key>
-      <word_default>Total Member Posts</word_default>
-      <word_custom>В�его �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>member_today</word_key>
-      <word_default>Posts Today</word_default>
-      <word_custom>Сообщений �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>todays_posters</word_key>
-      <word_default><![CDATA[Today's Top 20 Posters]]></word_default>
-      <word_custom>20 авторов �егодн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>goto_profile</word_key>
-      <word_default>Go to profile</word_default>
-      <word_custom>Перейти к профилю</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>whoposted_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>whoposted_name</word_key>
-      <word_default>Member name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_stats</word_pack>
-      <word_key>no_forums</word_key>
-      <word_default>View Forums (%s total...)</word_default>
-      <word_custom>По�мотреть форумы (%s в�его)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_printpage</word_pack>
+      <word_key>o_word_desc</word_key>
+      <word_default><![CDATA[This will enable you to download a version of this topic in an editable Word format. This will open your browser's download dialogue box]]></word_default>
+      <word_custom>Вы можете �качать Word вер�ию �той темы � возможно�тью дальнейшего редактировани�. Будет открыто окно дл� �качивани�.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6687,9 +4256,6 @@
       <word_key>who_farted</word_key>
       <word_default>Who posted in:</word_default>
       <word_custom>Отвечали в:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6697,9 +4263,6 @@
       <word_key>go_button</word_key>
       <word_default>Go</word_default>
       <word_custom>OK</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -6707,1819 +4270,384 @@
       <word_key>who_replied_title</word_key>
       <word_default>Who posted in this topic</word_default>
       <word_custom>Кто отвечал в �ту тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>whoposted_name</word_key>
+      <word_default>Member name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>no_forums</word_key>
+      <word_default>View Forums (%s total...)</word_default>
+      <word_custom>По�мотреть форумы (%s в�его)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>whoposted_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>goto_profile</word_key>
+      <word_default>Go to profile</word_default>
+      <word_custom>Перейти к профилю</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>todays_posters</word_key>
+      <word_default><![CDATA[Today's Top 20 Posters]]></word_default>
+      <word_custom>20 авторов �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>member_posts</word_key>
+      <word_default>Total Member Posts</word_default>
+      <word_custom>В�его �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>member_today</word_key>
+      <word_default>Posts Today</word_default>
+      <word_custom>Сообщений �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>no_info</word_key>
+      <word_default>No information is available at this time</word_default>
+      <word_custom>�а данный момент нет никакой информации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>member_percent</word_key>
+      <word_default><![CDATA[% of today's posts]]></word_default>
+      <word_custom>% �егодн�шних �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>member_joined</word_key>
+      <word_default>Joined</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_admins</word_key>
+      <word_default>Administrators</word_default>
+      <word_custom>�дмини�траторы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>top_poster_title</word_key>
+      <word_default><![CDATA[Today's top 20 posters]]></word_default>
+      <word_custom>20 авторов �егодн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>forum_leaders</word_key>
+      <word_default>The moderating team</word_default>
+      <word_custom>�дмини�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_global</word_key>
+      <word_default>Global Moderators</word_default>
+      <word_custom>Супермодераторы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_location</word_key>
+      <word_default>Location</word_default>
+      <word_custom>По�леднее дей�твие</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_mods</word_key>
+      <word_default>Forum Moderators</word_default>
+      <word_custom>Модераторы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>stats_missing_tid</word_key>
+      <word_default>You must select a valid topic for this feature</word_default>
+      <word_custom>Вы должны указать �уще�твующую тему, чтобы во�пользовать�� �той функцией.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_all_forums</word_key>
+      <word_default>All Forums</word_default>
+      <word_custom>В�е форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>topic_noperms</word_key>
+      <word_default>You do not have permission to access this forum</word_default>
+      <word_custom>Вы не можете про�матривать �тот форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>leader_forums</word_key>
+      <word_default>Forums</word_default>
+      <word_custom>Форумы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>topic_noattach</word_key>
+      <word_default>The specified topic does not have any attachments</word_default>
+      <word_custom>Тема не �одержит прикрепленных файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_stats</word_pack>
+      <word_key>notopic_attach</word_key>
+      <word_default>Could not load attachments for the requested topic</word_default>
+      <word_custom>�е удало�ь загрузить прикрепленные файлы дл� запрашиваемой темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>top_locked_reply</word_key>
-      <word_default>Locked (click to reply)</word_default>
-      <word_custom>Закрыта (нажмите дл� ответа)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>poll_merge_title</word_key>
+      <word_default>Which poll would you like to keep?</word_default>
+      <word_custom>Какой опро� вы хотите �охранить ?</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>top_locked</word_key>
-      <word_default>This topic is locked</word_default>
-      <word_custom>Тема закрыта</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>do_like_down</word_key>
+      <word_default>Remove like for this item</word_default>
+      <word_custom>�е нравит��</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>top_cannot_start</word_key>
-      <word_default>You cannot start a new topic</word_default>
-      <word_custom>Вы не можете �оздать новую тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>do_like_up</word_key>
+      <word_default>Like this item</word_default>
+      <word_custom>�равит��</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>back_top</word_key>
-      <word_default>Back to top</word_default>
-      <word_custom>�аверх</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>poll_merge_submit</word_key>
+      <word_default><![CDATA[Keep this poll &rarr;]]></word_default>
+      <word_custom><![CDATA[Сохранить �тот опро� &rarr; ]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>attach_dl</word_key>
-      <word_default>Download attachment</word_default>
-      <word_custom>Скачать файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>poll_merge_blurb</word_key>
+      <word_default>All other polls will be deleted.</word_default>
+      <word_custom>В�е о�тальные опро�ы будут удалены</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>PIN_TOPIC</word_key>
-      <word_default>Pin this Topic</word_default>
-      <word_custom>Подн�ть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mq_reply_quoted_posts</word_key>
+      <word_default>Reply to quoted posts</word_default>
+      <word_custom>Ответить цитируемым �ообщени�м</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>topic</word_key>
+      <word_key>thanks_need_preview</word_key>
+      <word_default>Your post requires moderator approval before it will be displayed on the site.</word_default>
+      <word_custom>Ваше �ообщение должно пройти проверку модератором, перед тем как оно будет добавлено в тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mq_clear_desc</word_key>
+      <word_default>Clear the posts you have selected with MultiQuote</word_default>
+      <word_custom>Убрать отметки � �ообщений, отмеченных дл� цитировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mq_clear</word_key>
+      <word_default>Clear</word_default>
+      <word_custom>Очи�тить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ignore_all_signatures</word_key>
+      <word_default>Ignore all signatures</word_default>
+      <word_custom>Скрыть в�е подпи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>posted_by</word_key>
+      <word_default>Posted by</word_default>
+      <word_custom>�апи�ано </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>follow_topic</word_key>
       <word_default>Topic</word_default>
       <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>topic_stats</word_key>
-      <word_default><![CDATA[<#POSTS#> replies since <#START#>]]></word_default>
-      <word_custom><![CDATA[<#POSTS#> ответов � <#START#>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>follow_forum</word_key>
+      <word_default>Forum</word_default>
+      <word_custom>Форум</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>ip</word_key>
-      <word_default>IP</word_default>
-      <word_custom>IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>locked_reply_fr</word_key>
+      <word_default>Be aware that this topic is locked.  You have permission to reply to locked topics.</word_default>
+      <word_custom>Обратите внимание, что �та тема закрыта, но вы можете отвечать в закрытые темы.</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>start_new_topic</word_key>
-      <word_default>Start a new topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mark_topic_read</word_key>
+      <word_default>Mark As Read</word_default>
+      <word_custom>Отметить тему прочитанной</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>CLOSE_TOPIC</word_key>
-      <word_default>Close this topic</word_default>
-      <word_custom>Закрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>goto_next_unread_topic</word_key>
+      <word_default><![CDATA[Next Unread Topic &rarr;]]></word_default>
+      <word_custom><![CDATA[Следующа� непрочитанна� тема &rarr; ]]></word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>MOVE_TOPIC</word_key>
-      <word_default>Move this topic</word_default>
-      <word_custom>Переме�тить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ignore_userx_signature</word_key>
+      <word_default><![CDATA[Ignore %s&#39;s signature]]></word_default>
+      <word_custom>Скрыть подпи�ь %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>pic_attach</word_key>
-      <word_default>Attached Image</word_default>
-      <word_custom>Прикрепленное изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_ucfirst_follow_t</word_key>
+      <word_default>Follow this topic</word_default>
+      <word_custom>Следить за темой</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>topic_moved</word_key>
-      <word_default>This topic has moved, taking you to the correct forum</word_default>
-      <word_custom>Данна� тема была перене�ена. Переходим к теме.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>follow_notify_topics</word_key>
+      <word_default>topics</word_default>
+      <word_custom>темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>DELETE_TOPIC</word_key>
-      <word_default>Delete this topic</word_default>
-      <word_custom>Удалить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>show_moderation_tools</word_key>
+      <word_default>Show moderation tools</word_default>
+      <word_custom>Показать ин�трументы модератора</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>attach_hits</word_key>
-      <word_default>Number of downloads</word_default>
-      <word_custom>Количе�тво загрузок:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>started_by</word_key>
+      <word_default>Started by</word_default>
+      <word_custom>�втор</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>UNPIN_TOPIC</word_key>
-      <word_default>Unpin this Topic</word_default>
-      <word_custom>Опу�тить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>go_to_first_unread</word_key>
+      <word_default>Go to first unread post</word_default>
+      <word_custom>Перейти к первому непрочитанному �ообщению</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>OPEN_TOPIC</word_key>
-      <word_default>Open this topic</word_default>
-      <word_custom>Открыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_ucfirst_unfollow_t</word_key>
+      <word_default>Unfollow this topic</word_default>
+      <word_custom>Прекратить �лежение за темой</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>EDIT_TOPIC</word_key>
-      <word_default>Edit Topic Title</word_default>
-      <word_custom>Редактировать заголовок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_totalcount_follow_t</word_key>
+      <word_default>%s member(s) follow this topic</word_default>
+      <word_custom>Пользователей, �лед�щих за темой: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>UNSUBBIT</word_key>
-      <word_default>Un-watch all from topic</word_default>
-      <word_custom>Отпи�ать в�ех от �той темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_follow_t</word_key>
+      <word_default>follow this topic</word_default>
+      <word_custom>�ледить за темой</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>edited_by</word_key>
-      <word_default><![CDATA[This post has been edited by <b>%s</b>: %s]]></word_default>
-      <word_custom>Сообщение отредактировал %s: %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>topic_starter</word_key>
+      <word_default>Topic Author</word_default>
+      <word_custom>�втор темы</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>active_users_members</word_key>
-      <word_default>%s Members:</word_default>
-      <word_custom>Пользователей: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>like_unfollow_t</word_key>
+      <word_default>unfollow this topic</word_default>
+      <word_custom>прекратить �лежение за темой</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>active_users_title</word_key>
-      <word_default>%s User(s) are reading this topic</word_default>
-      <word_custom>%s человек читают �ту тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>x_replies_to_topic</word_key>
+      <word_default>%s replies to this topic</word_default>
+      <word_custom>Сообщений в теме: %s</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>tt_title</word_key>
-      <word_default>Watch this topic</word_default>
-      <word_custom>Подпи�ать��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>x_reply_to_topic</word_key>
+      <word_default>%s reply to this topic</word_default>
+      <word_custom>В теме одно �ообщение</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>MERGE_TOPIC</word_key>
-      <word_default>Merge Topic</word_default>
-      <word_custom>Объединить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>TOPIC_HISTORY</word_key>
-      <word_default>View Topic History (Admin Option)</word_default>
-      <word_custom>По�мотреть и�торию (опци� админи�тратора)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>SPLIT_TOPIC</word_key>
-      <word_default>Split Topic</word_default>
-      <word_custom>Разделить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>qr_more_opts</word_key>
-      <word_default>Use Full Editor</word_default>
-      <word_custom>Ра�ширенна� форма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attached_file</word_key>
-      <word_default>Attached File</word_default>
-      <word_custom>Прикрепленный файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>qr_title</word_key>
-      <word_default>Fast Reply</word_default>
-      <word_custom>Бы�трый ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>qr_post</word_key>
-      <word_default>Post</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>pl_show_vote</word_key>
-      <word_default>Show Vote Options</word_default>
-      <word_custom>Показать пункты опро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>mm_submit</word_key>
-      <word_default>Go</word_default>
-      <word_custom>ОК</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>pl_show_results</word_key>
-      <word_default>Show Results</word_default>
-      <word_custom>Показать результаты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>mm_title</word_key>
-      <word_default>Multi-Moderation</word_default>
-      <word_custom>Мультимодераци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attach_size</word_key>
-      <word_default>Size:</word_default>
-      <word_custom>Размер:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attach_images</word_key>
-      <word_default>Attached image(s)</word_default>
-      <word_custom>Прикрепленные изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attach_normal</word_key>
-      <word_default>Attached File(s)</word_default>
-      <word_custom>Прикрепленные файлы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attach_ahits</word_key>
-      <word_default>Downloads:</word_default>
-      <word_custom>Загружен:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>attach_thumbs</word_key>
-      <word_default>Attached thumbnail(s)</word_default>
-      <word_custom>Прикрепленные изображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tt_reply_to_post</word_key>
-      <word_default>Reply directly to this post</word_default>
-      <word_custom>Ответить на �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_move</word_key>
-      <word_default>Move Posts</word_default>
-      <word_custom>Переме�тить �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>f_go</word_key>
-      <word_default>With Selected</word_default>
-      <word_custom>отмеченные темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_delete</word_key>
-      <word_default>Delete Posts</word_default>
-      <word_custom>Удалить �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_split</word_key>
-      <word_default>Split Topic</word_default>
-      <word_custom>Разделить тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_merge</word_key>
-      <word_default>Merge Posts</word_default>
-      <word_custom>Объединить �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_unapprovet</word_key>
-      <word_default>Set Invisible (Unapprove Topic)</word_default>
-      <word_custom>Скрыть тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_approvet</word_key>
-      <word_default>Set Visible (Approve Topic)</word_default>
-      <word_custom>Опубликовать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_unapprove</word_key>
-      <word_default>Set Invisible (Unapprove Post)</word_default>
-      <word_custom>Скрыть �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_approve</word_key>
-      <word_default>Set Visible (Approve Post)</word_default>
-      <word_custom>Опубликовать �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>announce_end</word_key>
-      <word_default>Announcement ends %s</word_default>
-      <word_custom>Объ�вление закрыто %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>announce_start</word_key>
-      <word_default>Announcement started %s</word_default>
-      <word_custom>Объ�вление открыто %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>announce_both</word_key>
-      <word_default>Announcement started %s and ends %s</word_default>
-      <word_custom>Объ�вление открыто %s и закрыто %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ip_private</word_key>
-      <word_default>Private</word_default>
-      <word_custom>Скрыт</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_you_created</word_key>
-      <word_default>You created this poll</word_default>
-      <word_custom>Вы автор опро�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_s_votes</word_key>
-      <word_default>Votes</word_default>
-      <word_custom>Голо�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_no_guests</word_key>
-      <word_default>Guests cannot vote</word_default>
-      <word_custom>Го�ти не могут голо�овать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_null_vote</word_key>
-      <word_default>View Results (Null Vote)</word_default>
-      <word_custom>Показать результаты (�е голо�овать)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_you_voted</word_key>
-      <word_default>You have already voted in this poll</word_default>
-      <word_custom>Вы уже голо�овали в �том опро�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_viewing_results</word_key>
-      <word_default>Viewing poll results</word_default>
-      <word_custom>Показать результаты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_add_vote</word_key>
-      <word_default>Vote!</word_default>
-      <word_custom>Голо�овать!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_rated_already</word_key>
-      <word_default>You have already rated this topic and you are not allowed to change your rating.</word_default>
-      <word_custom>Вы уже оценивали �ту тему. Изменить оценку нельз�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_vote_added</word_key>
-      <word_default>Your vote has been added</word_default>
-      <word_custom>Ваш голо� учтен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_rating_changed</word_key>
-      <word_default>Your rating has been changed!</word_default>
-      <word_custom>Ваша оценка изменена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_rating_done</word_key>
-      <word_default>Your rating has been added!</word_default>
-      <word_custom>Ваша оценка учтена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>announce_title</word_key>
-      <word_default>Announcement</word_default>
-      <word_custom>Объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ignore_view_post</word_key>
-      <word_default>View this post</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>js_rate_me</word_key>
-      <word_default>Rate Topic:</word_default>
-      <word_custom>Оценка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_noview_guest</word_key>
-      <word_default>You cannot see the results of the poll until you have voted.  Please login and cast your vote to see the results of this poll.</word_default>
-      <word_custom>Вы не можете видеть результаты про�а пока не проголо�уете.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>reason_for_edit</word_key>
-      <word_default>Reason for edit</word_default>
-      <word_custom>Причина редактировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ajax_no_t_name</word_key>
-      <word_default>Invalid topic name</word_default>
-      <word_custom>�еверное название темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ajax_no_openclose</word_key>
-      <word_default>You do not have permission to open/close this topic</word_default>
-      <word_custom>У ва� нет права открывать/закрывать темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ajax_no_t_permission</word_key>
-      <word_default>You do not have permission to edit this topic</word_default>
-      <word_custom>У ва� нет права редактировать темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ajax_no_topic_id</word_key>
-      <word_default>No topic id passed</word_default>
-      <word_custom>�е найден ID темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ajax_topic_not_found</word_key>
-      <word_default>Could not locate the topic</word_default>
-      <word_custom>�евозможно найти тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>show_forum_rules</word_key>
-      <word_default>View forum rules</word_default>
-      <word_custom>Правила форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_update</word_key>
-      <word_default>Update View</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_all_posts</word_key>
-      <word_default>View all posts</word_default>
-      <word_custom>Показывать в�е �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_hide</word_key>
-      <word_default>Hide posts below</word_default>
-      <word_custom>Скрыть �ообщени� � репутацией не ниже</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_threshold</word_key>
-      <word_default>Change threshold?</word_default>
-      <word_custom>Изменить фильтр?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_points</word_key>
-      <word_default>points</word_default>
-      <word_custom>баллов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_hiding</word_key>
-      <word_default>hiding posts below</word_default>
-      <word_custom>�крыты �ообщени� � репутацией ниже</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_viewing_all</word_key>
-      <word_default>viewing all posts.</word_default>
-      <word_custom>показаны в�е �ообщени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_f_currently</word_key>
-      <word_default>Currently</word_default>
-      <word_custom>�а данный момент</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_edit</word_key>
-      <word_default>Edit this poll</word_default>
-      <word_custom>Изменить опро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_delete_vote</word_key>
-      <word_default>Delete My Vote</word_default>
-      <word_custom>Удалить мой голо�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_vote</word_key>
-      <word_default>Vote</word_default>
-      <word_custom>Голо�овать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_percent_of_vote</word_key>
-      <word_default>Percentage of vote:</word_default>
-      <word_custom>Процент голо�ов:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_votes</word_key>
-      <word_default>votes</word_default>
-      <word_custom>голо�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_view_voters</word_key>
-      <word_default>View Voters</word_default>
-      <word_custom>Про�мотреть проголо�овавших</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_public_notice</word_key>
-      <word_default><![CDATA[This is a public poll. Other members <strong>will</strong> be able to see which options you chose]]></word_default>
-      <word_custom>Это открытое голо�ование. Другие пользователи �могут увидеть ваш выбор. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll</word_key>
-      <word_default>Poll:</word_default>
-      <word_custom>Опро�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_vote_casted</word_key>
-      <word_default>member(s) have cast votes</word_default>
-      <word_custom>пользователей проголо�овало</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_download</word_key>
-      <word_default>Download</word_default>
-      <word_custom>Скачать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_voted_for</word_key>
-      <word_default>Who voted for:</word_default>
-      <word_custom>Кто проголо�овал за:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_download_title</word_key>
-      <word_default>Download topic</word_default>
-      <word_custom>Скачать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_print</word_key>
-      <word_default>Print</word_default>
-      <word_custom>Вер�и� дл� печати</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_print_title</word_key>
-      <word_default>Print topic</word_default>
-      <word_custom>Ра�печатать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_email_title</word_key>
-      <word_default>Email topic</word_default>
-      <word_custom>Сообщить другу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_email</word_key>
-      <word_default>Email</word_default>
-      <word_custom>Сообщить другу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_share</word_key>
-      <word_default>Share this topic:</word_default>
-      <word_custom>Поделить�� темой:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>previous_topic</word_key>
-      <word_default>Previous Topic</word_default>
-      <word_custom>Предыдуща� тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>next_topic</word_key>
-      <word_default>Next Topic</word_default>
-      <word_custom>Следующа� тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_moderation</word_key>
-      <word_default>Post moderation</word_default>
-      <word_custom>Модераци� �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>threads</word_key>
-      <word_default>Threads</word_default>
-      <word_custom>Сообщений в �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_moderation</word_key>
-      <word_default>Topic Moderation</word_default>
-      <word_custom>Опции модератора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_unapprove</word_key>
-      <word_default>Unapprove</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_other_replies</word_key>
-      <word_default>Other Replies To This Topic</word_default>
-      <word_custom>Другие ответы в �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_toggle_visible</word_key>
-      <word_default>Toggle post visibility</word_default>
-      <word_custom>Скрыть �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_approve</word_key>
-      <word_default>Approve</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_delete_title</word_key>
-      <word_default>Delete this post</word_default>
-      <word_custom>Удалить �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_edit_title</word_key>
-      <word_default>Edit this post</word_default>
-      <word_custom>Изменить �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>mq</word_key>
-      <word_default>MultiQuote</word_default>
-      <word_custom>Цитата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_reply</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>quote_with_mq</word_key>
-      <word_default>Quote this post with Multi-Quote</word_default>
-      <word_custom>Добавить к многочи�ленным цитатам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>report</word_key>
-      <word_default>Report</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>reputation</word_key>
-      <word_default>Reputation</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>reputation_up</word_key>
-      <word_default>Vote this post up</word_default>
-      <word_custom>1</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>mod_select_post</word_key>
-      <word_default>Select this post for moderation</word_default>
-      <word_custom>Отметить �ообщение дл� модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>reputation_down</word_key>
-      <word_default>Vote this post down</word_default>
-      <word_custom>-1</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_view_anyway</word_key>
-      <word_default>View it anyway?</word_default>
-      <word_custom>Показать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>link_to_post</word_key>
-      <word_default>Link to post</word_default>
-      <word_custom>С�ылка на �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>info_about_this_ip</word_key>
-      <word_default>Find information about this IP</word_default>
-      <word_custom>Информаци� об IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_icon</word_key>
-      <word_default>Post icon</word_default>
-      <word_custom>Иконки �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_poll_your_vote</word_key>
-      <word_default>You voted</word_default>
-      <word_custom>Вы проголо�овали</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_add_reply</word_key>
-      <word_default>Add Reply</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>topic_stop_watching</word_key>
-      <word_default>Stop watching topic</word_default>
-      <word_custom>О�тановить от�леживание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>poll_vote_deleted</word_key>
-      <word_default>Your vote has been deleted from this poll</word_default>
-      <word_custom>Ваш голо� был удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_title_re</word_key>
-      <word_default>RE: </word_default>
-      <word_custom>RE: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ms_mod_q_until_posts</word_key>
-      <word_default>This restriction will be lifted when you have %s more approved posts</word_default>
-      <word_custom>Данное ограничение будет �н�то как только вы наберете %s одобренных �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ms_mod_q_until</word_key>
-      <word_default>This restriction is lifted on %s</word_default>
-      <word_custom>Данное ограничение заканчивает�� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>ms_mod_q</word_key>
-      <word_default>This post will need approval from a moderator before this post is shown.</word_default>
-      <word_custom>Ваше �ообщение должно пройти проверку модератора, прежде чем оно будет до�тупно о�тальным пользовател�м.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts_nolimit</word_key>
-      <word_default>You can make %s more posts until %s.</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений до %s. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts_nolimit_no_time</word_key>
-      <word_default>You can make %s more posts today.</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts_no_time</word_key>
-      <word_default>You can make %s more posts today. This restriction is in place until you have %s more approved posts</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. Данное ограничение будет дей�твовать пока у ва� не  будет %s одобренных �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts</word_key>
-      <word_default>You can make %s more posts until %s. This restriction is in place until you have %s more approved posts</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений до %s. Данное ограничение будет дей�твовать пока у ва� не  будет %s одобренных �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts_joined_no_time</word_key>
-      <word_default>You can make %s more posts today. This restriction is in place until %s</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. Данное ограничение будет дей�твовать до %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>add_a_reply</word_key>
-      <word_default>Add a reply</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>status_ppd_posts_joined</word_key>
-      <word_default>You can make %s more posts until %s. This restriction is in place until %s</word_default>
-      <word_custom>Вы можете отправить еще %s �ообщений до %s. Данное ограничение будет дей�твовать до %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_ignored</word_key>
-      <word_default>This post is hidden because you have chosen to ignore posts by</word_default>
-      <word_custom>Это �ообщение �крыто, так как вы решили игнорировать �ообщени� от </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>search_topic</word_key>
-      <word_default>Search Topic</word_default>
-      <word_custom>Пои�к по теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>search_topic_go</word_key>
-      <word_default>Go</word_default>
-      <word_custom>�айти в �той теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>macro__show</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Показать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_ignore_reset_rep</word_key>
-      <word_default>Click here to stop filtering posts based on reputation</word_default>
-      <word_custom>Отключить фильтрацию �одержимого, о�нованную на репутации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_ignored_rep</word_key>
-      <word_default>This post is hidden because the author has a reputation lower than your threshold. If you change the threshold underneath the last post, you can view this post by</word_default>
-      <word_custom>Это �ообщение �крыто, потому что репутаци� автора ниже допу�тимого порога, назначенного вами.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>blog_this</word_key>
-      <word_default>Blog This</word_default>
-      <word_custom>В блог</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_delete_now</word_key>
-      <word_default>Delete Now</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_delete_from_topic_desc</word_key>
-      <word_default>The post will be removed from this topic completely</word_default>
-      <word_custom>Сообщение будет полно�тью удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_delete_from_topic</word_key>
-      <word_default>Delete From Topic</word_default>
-      <word_custom>Удалить из темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_reason</word_key>
-      <word_default>Reason:</word_default>
-      <word_custom>Причина: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_remove_from_view_desc</word_key>
-      <word_default>The post may still be visible to moderators in this topic</word_default>
-      <word_custom>Сообщение будет видно только модераторам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_remove_from_view</word_key>
-      <word_default>Remove From View</word_default>
-      <word_custom>Удалить из про�мотра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_title</word_key>
-      <word_default>Delete Post</word_default>
-      <word_custom>Удалить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dl_ths_delete</word_key>
-      <word_default>Remove Topic</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dl_ths_restore</word_key>
-      <word_default>Restore Topic</word_default>
-      <word_custom>Во��тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_topic_has_deleted_desc</word_key>
-      <word_default>This topic has been deleted. You have permission to read the content of deleted items</word_default>
-      <word_custom>Вы имеете права на про�мотр удаленных тем и �ообщений. По�тому вы видите �ту тему.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>dlp_topic_has_deleted_title</word_key>
-      <word_default>This topic has been deleted</word_default>
-      <word_custom>Тема удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>nmo_p_delete_softed</word_key>
-      <word_default><![CDATA[&middot; Permanently Remove %s deleted topic posts]]></word_default>
-      <word_custom><![CDATA[&middot; Полное удаление %s �ообщений]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>nmo_p_restore</word_key>
-      <word_default><![CDATA[&middot; Restore %s deleted topic posts]]></word_default>
-      <word_custom><![CDATA[&middot; Во��тановление %s удаленных �ообщений]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>nmo_p_delete_approve</word_key>
-      <word_default><![CDATA[&middot; Permanently Remove %s un-approved topic posts]]></word_default>
-      <word_custom><![CDATA[&middot; Полное удаление %s не подтвержденных �ообщений]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>nmo_p_approve</word_key>
-      <word_default><![CDATA[&middot; Approve %s un-approved topic posts]]></word_default>
-      <word_custom><![CDATA[&middot; Одобрение %s не подтвержденных �ообщений]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>cpt_undelete</word_key>
-      <word_default>Restore Deleted Posts</word_default>
-      <word_custom>Во��тановить удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tg_go_last_post</word_key>
-      <word_default><![CDATA[View latest unread &rarr;]]></word_default>
-      <word_custom><![CDATA[К по�леднему непрочитанному &rarr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tg_search</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tg_last</word_key>
-      <word_default>Last Post</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tg_unread</word_key>
-      <word_default>First Unread Post</word_default>
-      <word_custom>Первое непрочитанное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>tg_first</word_key>
-      <word_default>First Post</word_default>
-      <word_custom>Первое �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>no_rep</word_key>
-      <word_default>No reputation has been given for this post.</word_default>
-      <word_custom>Сообщение без рейтинга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>rep_given</word_key>
-      <word_default>Reputation given</word_default>
-      <word_custom>Вы�тавлен рейтинг </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>post_deleted_by</word_key>
-      <word_default>Post Deleted By</word_default>
-      <word_custom>Сообщение удалил </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>no_reason_given</word_key>
-      <word_default>No Reason Given</word_default>
-      <word_custom>Без причины</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>top_poll_only_reply</word_key>
-      <word_default>This is a poll-only topic (click to reply)</word_default>
-      <word_custom>Тема-опро� (нажмите дл� ответа)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>top_poll_only</word_key>
-      <word_default>This is a poll-only topic</word_default>
-      <word_custom>Тема-опро�. Комментарии отключены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>sdpost_remove</word_key>
-      <word_default>Remove</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>sdpost_restore</word_key>
-      <word_default>Restore</word_default>
-      <word_custom>Во��тановить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>togglepostcontent</word_key>
-      <word_default>Toggle Post Content</word_default>
-      <word_custom>Сообщение / Причина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>no_replies_to_topic</word_key>
+      <word_default>No replies to this topic</word_default>
+      <word_custom>В �той теме нет ответов</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8527,9 +4655,6 @@
       <word_key>post_edit_announce</word_key>
       <word_default>Edit Announcement</word_default>
       <word_custom>Изменить объ�вление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8537,9 +4662,1294 @@
       <word_key>newpoststp</word_key>
       <word_default>new post(s)</word_default>
       <word_custom> новых �общений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>sdpost_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>togglepostcontent</word_key>
+      <word_default>Toggle Post Content</word_default>
+      <word_custom>Сообщение / Причина</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>no_reason_given</word_key>
+      <word_default>No Reason Given</word_default>
+      <word_custom>Без причины</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>sdpost_restore</word_key>
+      <word_default>Restore</word_default>
+      <word_custom>Во��тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_poll_only_reply</word_key>
+      <word_default>This is a poll-only topic (click to reply)</word_default>
+      <word_custom>Тема-опро� (нажмите дл� ответа)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_poll_only</word_key>
+      <word_default>This is a poll-only topic</word_default>
+      <word_custom>Тема-опро�. Комментарии отключены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_deleted_by</word_key>
+      <word_default>Post Deleted By</word_default>
+      <word_custom>Сообщение удалил </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_given</word_key>
+      <word_default>Reputation given</word_default>
+      <word_custom>Вы�тавлен рейтинг </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_first</word_key>
+      <word_default>first post</word_default>
+      <word_custom>Первое �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>no_rep</word_key>
+      <word_default>No reputation has been given for this post.</word_default>
+      <word_custom>Сообщение без рейтинга</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_gototopic</word_key>
+      <word_default>Go to this topic</word_default>
+      <word_custom>Перейти к теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_last</word_key>
+      <word_default>last post</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_search</word_key>
+      <word_default>made the first post that matches your search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_unread</word_key>
+      <word_default>first unread post</word_default>
+      <word_custom>Первое непрочитанное</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_madethe</word_key>
+      <word_default>made the</word_default>
+      <word_custom>�оздал</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tg_go_last_post</word_key>
+      <word_default>View latest unread</word_default>
+      <word_custom><![CDATA[К по�леднему непрочитанному &rarr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_undelete</word_key>
+      <word_default>Restore Deleted Posts</word_default>
+      <word_custom>Во��тановить удаленные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>nmo_p_approve</word_key>
+      <word_default><![CDATA[&middot; Approve %s un-approved topic posts]]></word_default>
+      <word_custom><![CDATA[&middot; Одобрение %s не подтвержденных �ообщений]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>nmo_p_delete_approve</word_key>
+      <word_default><![CDATA[&middot; Permanently Remove %s un-approved topic posts]]></word_default>
+      <word_custom><![CDATA[&middot; Полное удаление %s не подтвержденных �ообщений]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>nmo_p_restore</word_key>
+      <word_default><![CDATA[&middot; Restore %s deleted topic posts]]></word_default>
+      <word_custom><![CDATA[&middot; Во��тановление %s удаленных �ообщений]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>nmo_p_delete_softed</word_key>
+      <word_default><![CDATA[&middot; Permanently Remove %s deleted topic posts]]></word_default>
+      <word_custom><![CDATA[&middot; Полное удаление %s �ообщений]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_topic_has_deleted_title</word_key>
+      <word_default>This topic has been deleted</word_default>
+      <word_custom>Тема удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_topic_has_deleted_desc</word_key>
+      <word_default>This topic has been deleted, but you have permission to view it.</word_default>
+      <word_custom>Вы имеете права на про�мотр удаленных тем и �ообщений. По�тому вы видите �ту тему.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dl_ths_restore</word_key>
+      <word_default>Restore Topic</word_default>
+      <word_custom>Во��тановить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dl_ths_delete</word_key>
+      <word_default>Remove Topic</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_remove_from_view</word_key>
+      <word_default>Remove From View</word_default>
+      <word_custom>Удалить из про�мотра</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_title</word_key>
+      <word_default>Delete Post</word_default>
+      <word_custom>Удалить �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_remove_from_view_extra</word_key>
+      <word_default>Moderators may still be able to view it</word_default>
+      <word_custom>Сообщение будет видно только модераторам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_reason</word_key>
+      <word_default>Reason:</word_default>
+      <word_custom>Причина: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_remove</word_key>
+      <word_default>Remove</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_remove_from_view_desc</word_key>
+      <word_default><![CDATA[This option <strong>hides the post</strong>, but leaves it in the topic]]></word_default>
+      <word_custom>Сообщение будет видно только модераторам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_delete_from_topic</word_key>
+      <word_default>Delete From Topic</word_default>
+      <word_custom>Удалить из темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_delete_from_topic_desc</word_key>
+      <word_default><![CDATA[This option <strong>completely removes the post</strong> from the topic.]]></word_default>
+      <word_custom>Сообщение будет полно�тью удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_delete_from_topic_extra</word_key>
+      <word_default>It may be available for review in the ModeratorCP</word_default>
+      <word_custom>Оно может быть до�тупно дл� про�мотра в модератор�кой панели.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>blog_this</word_key>
+      <word_default>Blog This</word_default>
+      <word_custom>В блог</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_or</word_key>
+      <word_default>OR</word_default>
+      <word_custom>ИЛИ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>dlp_delete_now</word_key>
+      <word_default>Delete Now</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>macro__show</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Показать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>search_topic</word_key>
+      <word_default>Search Topic</word_default>
+      <word_custom>Пои�к по теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>add_a_reply</word_key>
+      <word_default>Add a reply</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_ignored</word_key>
+      <word_default>This post is hidden because you have chosen to ignore posts by</word_default>
+      <word_custom>Это �ообщение �крыто, так как вы решили игнорировать �ообщени� от </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_ignore_reset_rep</word_key>
+      <word_default>Click here to stop filtering posts based on reputation</word_default>
+      <word_custom>Отключить фильтрацию �одержимого, о�нованную на репутации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts_joined</word_key>
+      <word_default>You can make %s more posts until %s. This restriction is in place until %s</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений до %s. Данное ограничение будет дей�твовать до %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_ignored_rep</word_key>
+      <word_default>This post is hidden because the author has a reputation lower than your threshold. If you change the threshold at the top of the page, you can view this post by</word_default>
+      <word_custom>Это �ообщение �крыто, потому что репутаци� автора ниже допу�тимого порога, назначенного вами.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>search_topic_go</word_key>
+      <word_default>Go</word_default>
+      <word_custom>�айти в �той теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts</word_key>
+      <word_default>You can make %s more posts until %s. This restriction is in place until you have %s more approved posts</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений до %s. Данное ограничение будет дей�твовать пока у ва� не  будет %s одобренных �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts_joined_no_time</word_key>
+      <word_default>You can make %s more posts today. This restriction is in place until %s</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. Данное ограничение будет дей�твовать до %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts_no_time</word_key>
+      <word_default>You can make %s more posts today. This restriction is in place until you have %s more approved posts</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. Данное ограничение будет дей�твовать пока у ва� не  будет %s одобренных �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts_nolimit_no_time</word_key>
+      <word_default>You can make %s more posts today.</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений �егодн�. </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>status_ppd_posts_nolimit</word_key>
+      <word_default>You can make %s more posts until %s.</word_default>
+      <word_custom>Вы можете отправить еще %s �ообщений до %s. </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_title_re</word_key>
+      <word_default>RE: </word_default>
+      <word_custom>RE: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_add_reply</word_key>
+      <word_default>Reply to this topic</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_vote_deleted</word_key>
+      <word_default>Your vote has been deleted from this poll</word_default>
+      <word_custom>Ваш голо� был удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_poll_your_vote</word_key>
+      <word_default>You voted</word_default>
+      <word_custom>Вы проголо�овали</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>link_to_post</word_key>
+      <word_default>Link to post</word_default>
+      <word_custom>С�ылка на �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_view_anyway</word_key>
+      <word_default>View it anyway?</word_default>
+      <word_custom>Показать?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_stop_watching</word_key>
+      <word_default>Stop watching topic</word_default>
+      <word_custom>О�тановить от�леживание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ms_mod_q_until_posts</word_key>
+      <word_default>This restriction will be lifted when you have %s more approved posts</word_default>
+      <word_custom>Данное ограничение будет �н�то как только вы наберете %s одобренных �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ms_mod_q_until</word_key>
+      <word_default>This restriction is lifted on %s</word_default>
+      <word_custom>Данное ограничение заканчивает�� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ms_mod_q</word_key>
+      <word_default>This post will need approval from a moderator before this post is shown.</word_default>
+      <word_custom>Ваше �ообщение должно пройти проверку модератора, прежде чем оно будет до�тупно о�тальным пользовател�м.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>info_about_this_ip</word_key>
+      <word_default>Find information about this IP</word_default>
+      <word_custom>Информаци� об IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_icon</word_key>
+      <word_default>Post icon</word_default>
+      <word_custom>Изображени� �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>reputation</word_key>
+      <word_default>Reputation</word_default>
+      <word_custom>Репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>reputation_down</word_key>
+      <word_default>Vote this post down</word_default>
+      <word_custom>-1</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>reputation_up</word_key>
+      <word_default>Vote this post up</word_default>
+      <word_custom>1</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>report</word_key>
+      <word_default>Report</word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>quote_with_mq</word_key>
+      <word_default>MultiQuote allows you to select multiple posts across multiple topics, then reply to them all at once</word_default>
+      <word_custom>Добавить к многочи�ленным цитатам</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mod_select_post</word_key>
+      <word_default>Select this post for moderation</word_default>
+      <word_custom>Отметить �ообщение дл� модерации</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_reply</word_key>
+      <word_default>Quote</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mq</word_key>
+      <word_default>MultiQuote</word_default>
+      <word_custom>Цитата</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_edit_title</word_key>
+      <word_default>Edit this post</word_default>
+      <word_custom>Изменить �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_moderation</word_key>
+      <word_default>Topic Moderation</word_default>
+      <word_custom>Опции модератора</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_other_replies</word_key>
+      <word_default>Other Replies To This Topic</word_default>
+      <word_custom>Другие ответы в �той теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_approve</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Показать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_unapprove</word_key>
+      <word_default>Unapprove</word_default>
+      <word_custom>Скрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_toggle_visible</word_key>
+      <word_default>Toggle post visibility</word_default>
+      <word_custom>Скрыть �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>share</word_key>
+      <word_default>Share</word_default>
+      <word_custom>Поделит��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>next_topic</word_key>
+      <word_default>Next Topic</word_default>
+      <word_custom>Следующа� тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>previous_topic</word_key>
+      <word_default>Previous Topic</word_default>
+      <word_custom>Предыдуща� тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>threads</word_key>
+      <word_default>Threads</word_default>
+      <word_custom>Темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_moderation</word_key>
+      <word_default>Post moderation</word_default>
+      <word_custom>Модераци� �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>post_delete_title</word_key>
+      <word_default>Delete this post</word_default>
+      <word_custom>Удалить �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_share</word_key>
+      <word_default>Share this topic:</word_default>
+      <word_custom>Поделить�� темой:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_email_title</word_key>
+      <word_default>Email topic</word_default>
+      <word_custom>Сообщить другу</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_download_title</word_key>
+      <word_default>Download topic</word_default>
+      <word_custom>Скачать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_print_title</word_key>
+      <word_default>Print topic</word_default>
+      <word_custom>Ра�печатать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_email</word_key>
+      <word_default>Email</word_default>
+      <word_custom>Сообщить другу</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_print</word_key>
+      <word_default>Print</word_default>
+      <word_custom>Вер�и� дл� печати</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_download</word_key>
+      <word_default>Download</word_default>
+      <word_custom>Скачать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll</word_key>
+      <word_default>Poll:</word_default>
+      <word_custom>Опро�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_voted_for</word_key>
+      <word_default>Who voted for:</word_default>
+      <word_custom>Кто проголо�овал за:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_public_notice</word_key>
+      <word_default><![CDATA[This is a public poll. Other members <strong>will</strong> be able to see which options you chose]]></word_default>
+      <word_custom>Это открытое голо�ование. Другие пользователи �могут увидеть ваш выбор. </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_vote_casted</word_key>
+      <word_default>member(s) have cast votes</word_default>
+      <word_custom>пользователей проголо�овало</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_votes</word_key>
+      <word_default>votes</word_default>
+      <word_custom>голо�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_view_voters</word_key>
+      <word_default>View Voters</word_default>
+      <word_custom>Про�мотреть проголо�овавших</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_percent_of_vote</word_key>
+      <word_default>Percentage of vote:</word_default>
+      <word_custom>Процент голо�ов:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_delete_vote</word_key>
+      <word_default>Delete My Vote</word_default>
+      <word_custom>Удалить мой голо�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_vote</word_key>
+      <word_default>Vote</word_default>
+      <word_custom>Голо�овать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_currently</word_key>
+      <word_default>Currently</word_default>
+      <word_custom>�а данный момент</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_edit</word_key>
+      <word_default>Edit this poll</word_default>
+      <word_custom>Изменить опро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_viewing_all</word_key>
+      <word_default>Showing all posts</word_default>
+      <word_custom>показаны в�е �ообщени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_hiding</word_key>
+      <word_default>Rep filter: %s points</word_default>
+      <word_custom>Скрыты �ообщени� � репутацией ниже %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_points</word_key>
+      <word_default>points</word_default>
+      <word_custom>баллов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_threshold</word_key>
+      <word_default>Change threshold?</word_default>
+      <word_custom>Изменить фильтр?</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_hide</word_key>
+      <word_default>Hide posts below</word_default>
+      <word_custom>Скрыть �ообщени� � репутацией не ниже</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_update</word_key>
+      <word_default>Update View</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>rep_f_all_posts</word_key>
+      <word_default>View all posts</word_default>
+      <word_custom>Показывать в�е �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>reason_for_edit</word_key>
+      <word_default/>
+      <word_custom/>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_no_t_permission</word_key>
+      <word_default>You do not have permission to edit this topic</word_default>
+      <word_custom>У ва� нет права редактировать темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_no_t_name</word_key>
+      <word_default>Invalid topic name</word_default>
+      <word_custom>�еверное название темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_no_openclose</word_key>
+      <word_default>You do not have permission to open/close this topic</word_default>
+      <word_custom>У ва� нет права открывать/закрывать темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_topic_not_found</word_key>
+      <word_default>Could not locate the topic</word_default>
+      <word_custom>�евозможно найти тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_no_topic_id</word_key>
+      <word_default>No topic id passed</word_default>
+      <word_custom>�е найден ID темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>show_forum_rules</word_key>
+      <word_default>View forum rules</word_default>
+      <word_custom>Правила форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_noview_guest</word_key>
+      <word_default>You cannot see the results of the poll until you have voted.  Please login and cast your vote to see the results of this poll.</word_default>
+      <word_custom>Вы не можете видеть результаты про�а пока не проголо�уете.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>js_rate_me</word_key>
+      <word_default>Rate Topic</word_default>
+      <word_custom>Оценка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ignore_view_post</word_key>
+      <word_default>View this post</word_default>
+      <word_custom>Показать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>announce_title</word_key>
+      <word_default>Announcement</word_default>
+      <word_custom>Объ�вление</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_rating_done</word_key>
+      <word_default>Your rating has been added!</word_default>
+      <word_custom>Ваша оценка учтена!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_add_vote</word_key>
+      <word_default>Vote!</word_default>
+      <word_custom>Голо�овать!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_vote_added</word_key>
+      <word_default>Your vote has been added</word_default>
+      <word_custom>Ваш голо� учтен</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_rating_changed</word_key>
+      <word_default>Your rating has been changed!</word_default>
+      <word_custom>Ваша оценка изменена!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_rated_already</word_key>
+      <word_default>You have already rated this topic and you are not allowed to change your rating.</word_default>
+      <word_custom>Вы уже оценивали �ту тему. Изменить оценку нельз�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_viewing_results</word_key>
+      <word_default>Viewing poll results</word_default>
+      <word_custom>Показать результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_no_guests</word_key>
+      <word_default>Guests cannot vote</word_default>
+      <word_custom>Го�ти не могут голо�овать</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_you_voted</word_key>
+      <word_default>You have already voted in this poll</word_default>
+      <word_custom>Вы уже голо�овали в �том опро�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ip_private</word_key>
+      <word_default>Private</word_default>
+      <word_custom>Скрыт</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_you_created</word_key>
+      <word_default>You created this poll</word_default>
+      <word_custom>Вы автор опро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_s_votes</word_key>
+      <word_default>votes</word_default>
+      <word_custom>Голо�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>poll_null_vote</word_key>
+      <word_default>View Results (Null Vote)</word_default>
+      <word_custom>Показать результаты (�е голо�овать)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>announce_both</word_key>
+      <word_default>Announcement started %s and ends %s</word_default>
+      <word_custom>Объ�вление открыто %s и закрыто %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>announce_end</word_key>
+      <word_default>Announcement ends %s</word_default>
+      <word_custom>Объ�вление закрыто %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_approve</word_key>
+      <word_default>Set Visible (Approve Post)</word_default>
+      <word_custom>Сделать видимыми (Подтвердить)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_unapprove</word_key>
+      <word_default>Set Invisible (Unapprove Post)</word_default>
+      <word_custom>Скрыть �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_approvet</word_key>
+      <word_default>Set Visible (Approve Topic)</word_default>
+      <word_custom>Опубликовать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_unapprovet</word_key>
+      <word_default>Set Invisible (Unapprove Topic)</word_default>
+      <word_custom>Скрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_merge</word_key>
+      <word_default>Merge Posts</word_default>
+      <word_custom>Объединить �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>announce_start</word_key>
+      <word_default>Announcement started %s</word_default>
+      <word_custom>Объ�вление открыто %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_delete</word_key>
+      <word_default>Delete Posts</word_default>
+      <word_custom>Удалить �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_split</word_key>
+      <word_default>Split Topic</word_default>
+      <word_custom>Разделить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tt_reply_to_post</word_key>
+      <word_default>Reply directly to this post</word_default>
+      <word_custom>Ответить на �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>f_go</word_key>
+      <word_default>With Selected</word_default>
+      <word_custom>отмеченные темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>cpt_move</word_key>
+      <word_default>Move Posts</word_default>
+      <word_custom>Переме�тить �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_thumbs</word_key>
+      <word_default>Attached Thumbnails</word_default>
+      <word_custom>Прикрепленные изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_images</word_key>
+      <word_default>Attached Images</word_default>
+      <word_custom>Прикрепленные изображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_normal</word_key>
+      <word_default>Attached Files</word_default>
+      <word_custom>Прикрепленные файлы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_ahits</word_key>
+      <word_default>Downloads:</word_default>
+      <word_custom>Загружен:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_size</word_key>
+      <word_default>Size:</word_default>
+      <word_custom>Размер:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>pl_show_results</word_key>
+      <word_default>Show Results</word_default>
+      <word_custom>Показать результаты</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mm_title</word_key>
+      <word_default>Multi-Moderation</word_default>
+      <word_custom>Мультимодераци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mm_submit</word_key>
+      <word_default>Go</word_default>
+      <word_custom>ОК</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>pl_show_vote</word_key>
+      <word_default>Show Vote Options</word_default>
+      <word_custom>Показать пункты опро�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>qr_title</word_key>
+      <word_default>Fast Reply</word_default>
+      <word_custom>Бы�трый ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attached_file</word_key>
+      <word_default>Attached File</word_default>
+      <word_custom>Прикрепленный файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>SPLIT_TOPIC</word_key>
+      <word_default>Split Topic</word_default>
+      <word_custom>Разделить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>qr_more_opts</word_key>
+      <word_default>More Reply Options</word_default>
+      <word_custom>Ра�ширенна� форма</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>qr_post</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>TOPIC_HISTORY</word_key>
+      <word_default>View Topic History (Admin Option)</word_default>
+      <word_custom>По�мотреть и�торию (опци� админи�тратора)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>MERGE_TOPIC</word_key>
+      <word_default>Merge Topic</word_default>
+      <word_custom>Объединить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>tt_title</word_key>
+      <word_default>Watch Topic</word_default>
+      <word_custom>Подпи�ать��</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>active_users_title</word_key>
+      <word_default>%s user(s) are reading this topic</word_default>
+      <word_custom>Количе�тво пользователей, читающих �ту тему: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>EDIT_TOPIC</word_key>
+      <word_default>Edit Topic Title</word_default>
+      <word_custom>Редактировать заголовок</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>UNSUBBIT</word_key>
+      <word_default>Un-watch all from topic</word_default>
+      <word_custom>Отпи�ать в�ех от �той темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>active_users_members</word_key>
+      <word_default>%s Members:</word_default>
+      <word_custom>Пользователей: </word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>edited_by</word_key>
+      <word_default><![CDATA[<strong>Edited by %s, %s.</strong>]]></word_default>
+      <word_custom>Сообщение отредактировал %s: %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>UNPIN_TOPIC</word_key>
+      <word_default>Unpin this Topic</word_default>
+      <word_custom>Опу�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>OPEN_TOPIC</word_key>
+      <word_default>Open this topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_hits</word_key>
+      <word_default>downloads</word_default>
+      <word_custom>Количе�тво загрузок:</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>DELETE_TOPIC</word_key>
+      <word_default>Delete this topic</word_default>
+      <word_custom>Удалить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>MOVE_TOPIC</word_key>
+      <word_default>Move this topic</word_default>
+      <word_custom>Переме�тить тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>pic_attach</word_key>
+      <word_default>Attached Image</word_default>
+      <word_custom>Прикрепленное изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>CLOSE_TOPIC</word_key>
+      <word_default>Close this topic</word_default>
+      <word_custom>Закрыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_stats</word_key>
+      <word_default><![CDATA[<#POSTS#> replies since <#START#>]]></word_default>
+      <word_custom><![CDATA[<#POSTS#> ответов � <#START#>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ip</word_key>
+      <word_default>IP</word_default>
+      <word_custom>IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>start_new_topic</word_key>
+      <word_default>Start New Topic</word_default>
+      <word_custom>Открыть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>PIN_TOPIC</word_key>
+      <word_default>Pin this Topic</word_default>
+      <word_custom>Подн�ть тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>attach_dl</word_key>
+      <word_default>Download attachment</word_default>
+      <word_custom>Скачать файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_cannot_start</word_key>
+      <word_default>You cannot start a new topic</word_default>
+      <word_custom>Вы не можете �оздать новую тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>back_top</word_key>
+      <word_default>Back to top</word_default>
+      <word_custom>�аверх</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8547,9 +5957,6 @@
       <word_key>top_cannot_reply</word_key>
       <word_default>You cannot reply to this topic</word_default>
       <word_custom>Вы не можете ответить в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8557,39 +5964,13 @@
       <word_key>top_js_1star</word_key>
       <word_default>Rate topic 1 star</word_default>
       <word_custom>1 звезда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>top_js_2star</word_key>
-      <word_default>Rate topic 2 stars</word_default>
-      <word_custom>2 звезды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>top_js_3star</word_key>
-      <word_default>Rate topic 3 stars</word_default>
-      <word_custom>3 звезды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>top_js_4star</word_key>
-      <word_default>Rate topic 4 stars</word_default>
-      <word_custom>4 звезды</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>top_locked_reply</word_key>
+      <word_default>Locked (click to reply)</word_default>
+      <word_custom>Закрыта (нажмите дл� ответа)</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8597,9 +5978,27 @@
       <word_key>top_js_5star</word_key>
       <word_default>Rate topic 5 stars</word_default>
       <word_custom>5 звезд</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_locked</word_key>
+      <word_default>This topic is locked</word_default>
+      <word_custom>Тема закрыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_js_3star</word_key>
+      <word_default>Rate topic 3 stars</word_default>
+      <word_custom>3 звезды</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_js_4star</word_key>
+      <word_default>Rate topic 4 stars</word_default>
+      <word_custom>4 звезды</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8607,9 +6006,6 @@
       <word_key>top_rep</word_key>
       <word_default>Reputation</word_default>
       <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8617,39 +6013,13 @@
       <word_key>top_this_post_by</word_key>
       <word_default>This post by</word_default>
       <word_custom>Сообщение от</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>forums</word_app>
       <word_pack>public_topic</word_pack>
-      <word_key>top_below_thresh</word_key>
-      <word_default>is below your viewing threshold</word_default>
-      <word_custom>�крыто</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>popular_post</word_key>
-      <word_default>POPULAR</word_default>
-      <word_custom>Попул�рное �ообщение!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>forums</word_app>
-      <word_pack>public_topic</word_pack>
-      <word_key>macro__attachment</word_key>
-      <word_default>Attachment</word_default>
-      <word_custom>Прикрепленный файл</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>top_js_2star</word_key>
+      <word_default>Rate topic 2 stars</word_default>
+      <word_custom>2 звезды</word_custom>
     </lang>
     <lang>
       <word_app>forums</word_app>
@@ -8657,9 +6027,62 @@
       <word_key>return_to</word_key>
       <word_default>Return to</word_default>
       <word_custom>Вернуть�� к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>macro__attachment</word_key>
+      <word_default>Attachment</word_default>
+      <word_custom>Прикрепленный файл</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>popular_post</word_key>
+      <word_default>POPULAR</word_default>
+      <word_custom>Попул�рное �ообщение!</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>top_below_thresh</word_key>
+      <word_default>is below your viewing threshold</word_default>
+      <word_custom>�крыто</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mobile_top_locked</word_key>
+      <word_default>Locked</word_default>
+      <word_custom>Закрыта</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mobile_top_locked_reply</word_key>
+      <word_default>Locked (Reply)</word_default>
+      <word_custom>Закрыта (Ответить)</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>mobile_topic_add_reply</word_key>
+      <word_default>Reply</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>ajax_reply_noperm</word_key>
+      <word_default>You do not have permission to reply to this topic.</word_default>
+      <word_custom>У ва� нет права дл� ответа в �ту тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>forums</word_app>
+      <word_pack>public_topic</word_pack>
+      <word_key>topic_duplicate_post</word_key>
+      <word_default>This reply has not been added as it has been posted too quickly</word_default>
+      <word_custom>Этот ответ не будет добавлен, так как вы �лишком ча�то отвечаете в тему.</word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/forums/xml/versions.xml b/upload/admin/applications/forums/xml/versions.xml
index 7dd60e33..8d5c6974 100644
--- a/upload/admin/applications/forums/xml/versions.xml
+++ b/upload/admin/applications/forums/xml/versions.xml
@@ -260,4 +260,32 @@
 		<human>3.1.4</human>
 		<long>31007</long>
 	</version>
+	<version>
+		<human>3.2.0 Beta 1</human>
+		<long>32000</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 2</human>
+		<long>32001</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 3</human>
+		<long>32002</long>
+	</version>
+	<version>
+		<human>3.2.0</human>
+		<long>32003</long>
+	</version>
+	<version>
+		<human>3.2.1</human>
+		<long>32004</long>
+	</version>
+	<version>
+		<human>3.2.2</human>
+		<long>32005</long>
+	</version>
+	<version>
+		<human>3.2.3</human>
+		<long>32006</long>
+	</version>
 </versions>
\ No newline at end of file
diff --git a/upload/admin/applications/index.html b/upload/admin/applications/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/index.html
+++ b/upload/admin/applications/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/admin/index.html b/upload/admin/applications/members/extensions/admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/admin/index.html
+++ b/upload/admin/applications/members/extensions/admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/admin/member_form.php b/upload/admin/applications/members/extensions/admin/member_form.php
index 6751984c..7d64c534 100644
--- a/upload/admin/applications/members/extensions/admin/member_form.php
+++ b/upload/admin/applications/members/extensions/admin/member_form.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member form manipulation
- * Last Updated: $Date: 2010-01-15 14:28:09 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 5715 $
+ * @version		$Revision: 8024 $
  *
  */
 
@@ -33,7 +33,6 @@ class admin_member_form__members implements admin_member_form
 	 * This can be left blank and the application title will
 	 * be used
 	 *
-	 * @access	public
 	 * @var		string			Tab name
 	 */
 	public $tab_name = "";
@@ -51,7 +50,6 @@ class admin_member_form__members implements admin_member_form
 	 * Use the format:
 	 * $array[] = array( 'img' => '', 'url' => '', 'title' => '' );
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @param	array 			Member data
 	 * @return	array 			Array of links
@@ -106,7 +104,6 @@ class admin_member_form__members implements admin_member_form
 	/**
 	 * Returns content for the page.
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @param	array 				Member data
 	 * @return	array 				Array of tabs, content
@@ -119,7 +116,6 @@ class admin_member_form__members implements admin_member_form
 	/**
 	 * Process the entries for saving and return
 	 *
-	 * @access	public
 	 * @author	Brandon Farber
 	 * @return	array 				Multi-dimensional array (core, extendedProfile) for saving
 	 */
diff --git a/upload/admin/applications/members/extensions/attachments/index.html b/upload/admin/applications/members/extensions/attachments/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/attachments/index.html
+++ b/upload/admin/applications/members/extensions/attachments/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/attachments/plugin_msg.php b/upload/admin/applications/members/extensions/attachments/plugin_msg.php
index 68d55d6d..85ed152f 100644
--- a/upload/admin/applications/members/extensions/attachments/plugin_msg.php
+++ b/upload/admin/applications/members/extensions/attachments/plugin_msg.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * IP.Board messenger attachments plugin
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 5713 $
+ * @version		$Revision: 9520 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,7 +29,6 @@ class plugin_msg extends class_attach
 	/**
 	 * Module type
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $module = 'msg';
@@ -37,7 +36,6 @@ class plugin_msg extends class_attach
 	/**
 	 * Checks the attachment and checks for download / show perms
 	 *
-	 * @access	public
 	 * @param	integer		Attachment id
 	 * @return	array 		Attachment data
 	 */
@@ -77,7 +75,7 @@ class plugin_msg extends class_attach
 		// Check..
 		//-----------------------------------------
 		
-		if ( ! isset( $attach['msg_id'] ) OR empty( $attach['msg_id'] ) )
+		if ( empty( $attach['msg_id'] ) )
 		{
 			if( $attach['attach_member_id'] != $this->memberData['member_id'] )
 			{
@@ -115,7 +113,6 @@ class plugin_msg extends class_attach
 	/**
 	 * Check the attachment and make sure its OK to display
 	 *
-	 * @access	public
 	 * @param	array		Array of ids
 	 * @param	array 		Array of relationship ids
 	 * @return	array 		Attachment data
@@ -216,7 +213,6 @@ class plugin_msg extends class_attach
 	/**
 	 * Recounts number of attachments for the articles row
 	 *
-	 * @access	public
 	 * @param	string		Post key
 	 * @param	integer		Related ID
 	 * @param	array 		Arguments for query
@@ -236,7 +232,7 @@ class plugin_msg extends class_attach
 		
 		if ( ! $post_key )
 		{
-			return 0;
+			return array( 'count' => 0 );
 		}
 		
 		
@@ -255,7 +251,6 @@ class plugin_msg extends class_attach
 	/**
 	 * Recounts number of attachments for the articles row
 	 *
-	 * @access	public
 	 * @param	array 		Attachment data
 	 * @return	boolean
 	 */
@@ -320,7 +315,6 @@ class plugin_msg extends class_attach
 	 * Returns TRUE or FALSE
 	 * IT really does
 	 *
-	 * @access	public
 	 * @param	array 		Ids to check against
 	 * @return	boolean
 	 */
@@ -334,7 +328,6 @@ class plugin_msg extends class_attach
 	 * Returns TRUE or FALSE
 	 * IT really does
 	 *
-	 * @access	public
 	 * @param	array 		Attachment data
 	 * @return	boolean
 	 */
@@ -388,7 +381,6 @@ class plugin_msg extends class_attach
 	 * Return 'space_allowed' as 0 to allow unlimited uploads
 	 * Return 'max_single_upload' as 0 to not set a limit
 	 *
-	 * @access	public
 	 * @param	string		MD5 post key
 	 * @param	id			Member ID
 	 * @return	array 		[ 'space_used', 'space_left', 'space_allowed', 'max_single_upload' ]
@@ -432,7 +424,7 @@ class plugin_msg extends class_attach
 																'from'   => 'attachments',
 																'where'  => "attach_post_key='".$post_key."'" ) );
 
-				$space_used    = intval( $_space_used['figure'] );
+				$space_used    = $_space_used['figure'] ? $_space_used['figure'] : 0;
 			}
 			else
 			{
@@ -444,7 +436,7 @@ class plugin_msg extends class_attach
 																'from'   => 'attachments',
 																'where'  => 'attach_member_id='.$member_id . " AND attach_rel_module IN( 'post', 'msg' )" ) );
 
-				$space_used    = intval( $_space_used['figure'] );
+				$space_used    = $_space_used['figure'] ? $_space_used['figure'] : 0;
 			}	
 			//-----------------------------------------
 			// Generate space allowed figure
@@ -458,9 +450,9 @@ class plugin_msg extends class_attach
 																	   'from'   => 'attachments',
 																	   'where'  => 'attach_member_id='.$member_id . " AND attach_rel_module IN( 'post', 'msg' )" ) );
 
-					$g_space_used    = intval( $_g_space_used['figure'] );
+					$g_space_used    = $_g_space_used['figure'] ? $_g_space_used['figure'] : 0;
 					
-					if( intval( ( $this->memberData['g_attach_max'] * 1024 ) - $g_space_used ) < 0 )
+					if( ( $this->memberData['g_attach_max'] * 1024 ) - $g_space_used < 0 )
 					{
 						$space_used    			= $g_space_used;
 						$total_space_allowed	= $this->memberData['g_attach_max'] * 1024;
@@ -537,7 +529,6 @@ class plugin_msg extends class_attach
 	 * You can omit any of these settings and IPB will use the default
 	 * settings (which are the ones entered into the ACP for post thumbnails)
 	 *
-	 * @access	public
 	 * @return	boolean
 	 */
 	public function getSettings()
diff --git a/upload/admin/applications/members/extensions/coreExtensions.php b/upload/admin/applications/members/extensions/coreExtensions.php
index cf305fd3..d1286299 100644
--- a/upload/admin/applications/members/extensions/coreExtensions.php
+++ b/upload/admin/applications/members/extensions/coreExtensions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core extensions
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6882 $
+ * @version		$Rev: 8024 $
  *
  */
 
@@ -33,7 +33,6 @@ class publicSessions__members
 	 * current_appcomponent, current_module and current_section are automatically
 	 * stored. This function allows you to add specific variables in.
 	 *
-	 * @access	public
 	 * @author	Matt Mecham
 	 * @return	array
 	 */
@@ -48,7 +47,7 @@ class publicSessions__members
 						'location_2_type'   => '',
 						'location_2_id'     => 0 );
 		
-		if( ( isset(ipsRegistry::$request['id']) AND ipsRegistry::$request['id'] ) AND ipsRegistry::$request['section'] == 'view' AND ipsRegistry::$request['module'] == 'profile' )
+		if( !empty(ipsRegistry::$request['id']) AND ipsRegistry::$request['section'] == 'view' AND ipsRegistry::$request['module'] == 'profile' )
 		{
 			$array['location_1_type']	= 'profile';
 			$array['location_1_id']		= ipsRegistry::$request['id'];
@@ -60,7 +59,6 @@ class publicSessions__members
 	/**
 	 * Parse/format the online list data for the records
 	 *
-	 * @access	public
 	 * @author	Brandon Farber
 	 * @param	array 			Online list rows to check against
 	 * @return	array 			Online list rows parsed
diff --git a/upload/admin/applications/members/extensions/coreVariables.php b/upload/admin/applications/members/extensions/coreVariables.php
index 189e7cea..008ee5bc 100644
--- a/upload/admin/applications/members/extensions/coreVariables.php
+++ b/upload/admin/applications/members/extensions/coreVariables.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core variables extension file
- * Last Updated: $Date: 2010-09-22 11:32:51 -0400 (Wed, 22 Sep 2010) $
+ * Last Updated: $Date: 2010-12-19 21:06:50 -0500 (Sun, 19 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6904 $
+ * @version		$Revision: 7452 $
  *
  */
 
@@ -76,7 +76,7 @@ if( isset( $_GET['section'] ) && $_GET['section'] == 'status' )
 }
 
 # PROFILE
-if ( ( isset( $_GET['showuser'] ) && $_GET['showuser'] ) OR $_GET['module'] == 'profile' AND $_GET['section'] == 'view' )
+if ( !empty( $_GET['showuser'] ) OR ( $_GET['module'] == 'profile' AND $_GET['section'] == 'view' ) )
 {
 	$_LOAD['ranks']				= 1;
 	$_LOAD['profilefields']		= 1;
@@ -87,6 +87,11 @@ if ( ( isset( $_GET['showuser'] ) && $_GET['showuser'] ) OR $_GET['module'] == '
 	$_LOAD['moderators']		= 1;
 }
 
+if( IN_ACP )
+{
+	$_LOAD['moderators']		= 1;
+}
+
 /* Never, ever remove or re-order these options!!
  * Feel free to add, though. :) */
 
diff --git a/upload/admin/applications/members/extensions/dashboardNotifications.php b/upload/admin/applications/members/extensions/dashboardNotifications.php
index d22b9d94..1c6e1a65 100644
--- a/upload/admin/applications/members/extensions/dashboardNotifications.php
+++ b/upload/admin/applications/members/extensions/dashboardNotifications.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Dashboard Notifications
  * Last Updated: $Date
  *
- * @author 		$Author: mark $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6688 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8397 $
  *
  */
 
@@ -44,12 +44,13 @@ class dashboardNotifications__members
 		{
 			if( $this->settings['reg_auth_type'] == 'admin' )
 			{
-				$where = " new_reg=1";
+				$where = "v.new_reg=1";
 			}
 			else
 			{
-				$where = "new_reg=1 AND user_verified=1";
+				$where = "v.new_reg=1 AND v.user_verified=1";
 			}
+
 			$count = $this->DB->buildAndFetch( array( 	'select'    => 'COUNT(*) as count',
 														'from'		=> array( 'validating' => 'v' ),
 														'where'		=> "v.lost_pass=0 AND m.member_group_id={$this->settings['auth_group']} AND {$where}",
@@ -61,7 +62,7 @@ class dashboardNotifications__members
 			
 			if ( $count )
 			{
-				$entries[] = array( $this->lang->words['cp_validations'], sprintf( $this->lang->words['cp_validations_info'], $count ) . ' <a href="' . ipsRegistry::getClass('output')->buildUrl( 'app=members&module=members&section=members&section=tools&do=validating', 'admin' ) . '">' . $this->lang->words['cp_validations_review'] . '</a>' );
+				$entries[] = array( $this->lang->words['cp_validations'], sprintf( $this->lang->words['cp_validations_info'], $count ) . ' <a href="' . ipsRegistry::getClass('output')->buildUrl( 'app=members&amp;module=members&amp;section=members&amp;do=members_overview&amp;type=validating', 'admin' ) . '">' . $this->lang->words['cp_validations_review'] . '</a>' );
 			}
 		}
 				
diff --git a/upload/admin/applications/members/extensions/dataHookLocations.php b/upload/admin/applications/members/extensions/dataHookLocations.php
index e188704b..81b2c489 100644
--- a/upload/admin/applications/members/extensions/dataHookLocations.php
+++ b/upload/admin/applications/members/extensions/dataHookLocations.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Define data hook locations (Members)
- * Last Updated: $Date: 2010-10-12 13:04:59 -0400 (Tue, 12 Oct 2010) $
+ * Last Updated: $Date: 2011-05-18 04:49:10 -0400 (Wed, 18 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6964 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8812 $
  */
 
 $dataHookLocations = array(
@@ -27,8 +27,4 @@ $dataHookLocations = array(
 	array( 'profileCommentNew', 'Profile: New comment' ),
 	array( 'profileFriendsNew', 'Profile: New friend' ),
 	
-	/* OUTPUT ARRAYS */
-	array( 'memberListData', 'Member List View Output' ),
-	array( 'onlineUsersListData', 'Online Users List Output' ),
-	
 );
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/editorSections.php b/upload/admin/applications/members/extensions/editorSections.php
index b23220e0..85a76525 100644
--- a/upload/admin/applications/members/extensions/editorSections.php
+++ b/upload/admin/applications/members/extensions/editorSections.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode Management : Determines if bbcode can be used in this section
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 7442 $
  *
  */
 
diff --git a/upload/admin/applications/members/extensions/furlIdTemplates.php b/upload/admin/applications/members/extensions/furlIdTemplates.php
index e95c0356..eb8abb0d 100644
--- a/upload/admin/applications/members/extensions/furlIdTemplates.php
+++ b/upload/admin/applications/members/extensions/furlIdTemplates.php
@@ -7,10 +7,10 @@
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		Invision Power Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
  * @version		$Rev: 4136 $
  *
diff --git a/upload/admin/applications/members/extensions/furlRedirect.php b/upload/admin/applications/members/extensions/furlRedirect.php
index d77cd7fd..8a5ca1b0 100644
--- a/upload/admin/applications/members/extensions/furlRedirect.php
+++ b/upload/admin/applications/members/extensions/furlRedirect.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS output plugin :: posts
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,24 +29,22 @@ class furlRedirect_members
 	/**
 	 * Key type: Type of action (topic/forum)
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_type = '';
+	protected $_type = '';
 	
 	/**
 	 * Key ID
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_id = 0;
+	protected $_id = 0;
 	
 	/**
 	* Constructor
 	*
 	*/
-	function __construct( ipsRegistry $registry )
+	public function __construct( ipsRegistry $registry )
 	{
 		$this->registry =  $registry;
 		$this->DB       =  $registry->DB();
@@ -57,7 +55,6 @@ class furlRedirect_members
 	 * Set the key ID
 	 * <code>furlRedirect_forums::setKey( 'topic', 12 );</code>
 	 *
-	 * @access	public
 	 * @param	string	Type
 	 * @param	mixed	Value
 	 */
@@ -70,9 +67,8 @@ class furlRedirect_members
 	/**
 	 * Set up the key by URI
 	 *
-	 * @access	public
 	 * @param	string		URI (example: index.php?showtopic=5&view=getlastpost)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setKeyByUri( $uri )
 	{
@@ -103,7 +99,6 @@ class furlRedirect_members
 	/**
 	* Return the SEO title
 	*
-	* @access	public
 	* @return	string		The SEO friendly name
 	*/
 	public function fetchSeoTitle()
@@ -122,7 +117,6 @@ class furlRedirect_members
 	/**
 	* Return the SEO title for a user
 	*
-	* @access	public
 	* @return	string		The SEO friendly name
 	*/
 	public function _fetchSeoTitle_user()
diff --git a/upload/admin/applications/members/extensions/furlTemplates.php b/upload/admin/applications/members/extensions/furlTemplates.php
index 96eda233..efb753b0 100644
--- a/upload/admin/applications/members/extensions/furlTemplates.php
+++ b/upload/admin/applications/members/extensions/furlTemplates.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sets up SEO templates
- * Last Updated: $Date: 2010-06-15 03:53:37 -0400 (Tue, 15 Jun 2010) $
+ * Last Updated: $Date: 2011-04-11 06:49:17 -0400 (Mon, 11 Apr 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6531 $
+ * @version		$Rev: 8294 $
  *
  */
 
@@ -52,6 +52,17 @@ $_SEOTEMPLATES = array(
 						  'in'            => array( 'regex'   => "#/user/(\d+?)-#i",
 												    'matches' => array( array( 'showuser', '$1' ) ) ) ),
 	
+	
+	'members_status_single' => array( 'app'		      => 'members',
+									  'allowRedirect' => 0,
+									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=single(?:&|&amp;)status_id=(\d+?)(&|$)#i', 'statuses/id/$1/$2' ),
+									  'in'            => array( 'regex'   => "#/statuses/id/(\d+?)/#i",
+															    'matches' => array( array( 'app'    , 'members' ),
+															    					array( 'section', 'status' ),
+															    					array( 'module' , 'profile' ),
+															    					array( 'type'   , 'single' ),
+															    					array( 'status_id', '$1' ) ) ) ),
+															    					
 	'members_status_friends'=> array( 'app'		      => 'members',
 									  'allowRedirect' => 0,
 									  'out'           => array( '#app=members(?:&|&amp;)module=profile(?:&|&amp;)section=status(?:&|&amp;)type=friends(&|$)#i', 'statuses/friends/$2' ),
diff --git a/upload/admin/applications/members/extensions/index.html b/upload/admin/applications/members/extensions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/index.html
+++ b/upload/admin/applications/members/extensions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/memberSync.php b/upload/admin/applications/members/extensions/memberSync.php
index 1bd5b147..78942f77 100644
--- a/upload/admin/applications/members/extensions/memberSync.php
+++ b/upload/admin/applications/members/extensions/memberSync.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Forum permissions mappings
- * Last Updated: $Date: 2010-04-26 19:40:44 +0100 (Mon, 26 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6179 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $ 
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -28,18 +28,17 @@ if ( ! defined( 'IN_IPB' ) )
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage  Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6179 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $ 
+ */
 class membersMemberSync
 {
 	/**
 	 * Registry reference
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $registry;
@@ -47,9 +46,8 @@ class membersMemberSync
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct()
 	{
 		$this->registry = ipsRegistry::instance();
@@ -58,10 +56,9 @@ class membersMemberSync
 	/**
 	 * This method is run when a member is flagged as a spammer
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onSetAsSpammer( $member )
 	{
 		/* Load status class */
@@ -80,10 +77,9 @@ class membersMemberSync
 	/**
 	 * This method is run when a member is un-flagged as a spammer
 	 *
-	 * @access	public
 	 * @param	array 	$member	Array of member data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onUnSetAsSpammer( $member )
 	{
 
@@ -92,10 +88,9 @@ class membersMemberSync
 	/**
 	 * This method is called after a member account has been removed
 	 *
-	 * @access	public
 	 * @param	string	$ids	SQL IN() clause
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function onDelete( $mids )
 	{
 		/* Delete Status Updates - note, we can't do this via memberStatus class, since we no longer have the member data */
diff --git a/upload/admin/applications/members/extensions/modcp/index.html b/upload/admin/applications/members/extensions/modcp/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_banned.php b/upload/admin/applications/members/extensions/modcp/plugin_banned.php
new file mode 100644
index 00000000..35287b49
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_banned.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @file		plugin_banned.php 	Moderator control panel plugin: banned members
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/17/2011
+ * $LastChangedDate: 2011-08-29 22:12:22 -0400 (Mon, 29 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9425 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_banned
+ * @brief		Moderator control panel plugin: banned members
+ * 
+ */
+class plugin_members_banned
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->lang->loadLanguageFile( array( 'public_list' ), 'members' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'manage_members';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'banned';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR ( $this->memberData['is_mod'] AND $permissions['allow_warn'] AND $this->settings['warn_mod_ban'] ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		/* Add some CSS */
+		$this->registry->output->addToDocumentHead( 'importcss', "{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_mlist.css" );
+
+		//-----------------------------------------
+		// Get 10 banned members
+		//-----------------------------------------
+		
+		$members		= array();
+		$_bannedGroup	= '';
+		
+		if( $this->settings['banned_group'] )
+		{
+			$_bannedGroup	= " OR m.member_group_id=" . $this->settings['banned_group'];
+		}
+		
+		$st			= intval($this->request['st']);
+		$total		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "member_banned=1" . str_replace( 'm.', '', $_bannedGroup ) ) );
+
+		$this->DB->build( array(
+								'select'	=> 'm.*',
+								'from'		=> array( 'members' => 'm' ),
+								'order'		=> 'm.joined DESC',
+								'limit'		=> array( $st, 10 ),
+								'where'		=> "m.member_banned=1" . $_bannedGroup,
+								'add_join'	=> array(
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'm.member_id=pp.pp_member_id',
+														'type'		=> 'left',
+														),
+													),
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$r['_language']	= $this->lang->words['modcp_modq_indef'];
+
+			$members[]		= IPSMember::buildDisplayData( $r );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total['members'],
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=members&amp;tab=banned",
+															)		);
+
+		return $this->registry->output->getTemplate('modcp')->membersList( 'banned', $members, $pages );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_iplookup.php b/upload/admin/applications/members/extensions/modcp/plugin_iplookup.php
new file mode 100644
index 00000000..b1929159
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_iplookup.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * @file		plugin_iplookup.php 	Moderator control panel plugin: IP lookup tool
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/18/2011
+ * $LastChangedDate: 2011-03-16 21:13:06 -0400 (Wed, 16 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8110 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_iplookup
+ * @brief		Moderator control panel plugin: IP lookup tool
+ * 
+ */
+class plugin_members_iplookup
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'ip_tools';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'iplookup';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( $this->request['_do'] == 'submit' )
+		{
+			return $this->_doLookup();
+		}
+
+		return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'] );
+	}
+	
+	/**
+	 * Lookup IP address info
+	 *
+	 * @return @e string
+	 */
+	protected function _doLookup()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$exactMatch		= 1;
+		$finalIPString	= trim( $this->request['ip'] );
+		$startVal		= intval($this->request['st']);
+		$ipTool			= $this->request['iptool'];
+
+ 		//-----------------------------------------
+		// Remove trailing periods
+		//-----------------------------------------
+		
+		if ( strstr( $finalIPString, '*' ) )
+		{
+			$exactMatch		= 0;
+			$finalIPString	= preg_replace( "/^(.+?)\*(.+?)?$/", "\\1", $finalIPString ).'%';
+		}
+		
+		//-----------------------------------------
+		// H'okay, what have we been asked to do?
+		// (that's a metaphorical "we" in a rhetorical question)
+		//-----------------------------------------
+		
+		if ( $ipTool == 'resolve' )
+		{
+			$resolved	= @gethostbyaddr( $finalIPString );
+			
+			if ( $resolved == "" )
+			{
+				return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
+			}
+			else
+			{
+				return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->inlineModIPMessage( sprintf( $this->lang->words['ip_resolve_result'], $finalIPString, $resolved ) ) );
+			}
+		}
+		else if ( $ipTool == 'members' )
+		{
+			$sql	= $exactMatch ? "ip_address='$finalIPString'" : "ip_address LIKE '$finalIPString'";
+
+			if ( !$this->memberData['g_access_cp'] )
+			{
+				$sql	.= "AND g.g_access_cp != 1";
+			}
+			
+			$total_possible	= $this->DB->buildAndFetch( array(
+															'select'	=> 'count(m.member_id) as max',
+															'from'		=> array( 'members' => 'm' ),
+															'where'		=> $sql,
+															'add_join'	=> array(
+																				array(
+																						'from'	=> array( 'groups' => 'g' ),
+																						'type'	=> 'left',
+																						'where'	=> 'g.g_id=m.member_group_id',
+																					)
+																			)
+													)		);
+			
+			if ( $total_possible['max'] < 1 )
+			{
+				return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
+			}
+			
+			$pages	= $this->registry->getClass('output')->generatePagination( array(	'totalItems'		=> $total_possible['max'],
+															  							'itemsPerPage'		=> 20,
+																						'currentStartValue'	=> $startVal,
+																						'baseUrl'			=> "app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit&amp;iptool=members&amp;ip=" . $this->request['ip'],
+																			)		);
+
+			$this->DB->build( array(
+									'select'	=> 'm.name, m.members_display_name, m.members_seo_name, m.member_id, m.ip_address, m.posts, m.joined, m.member_group_id',
+									'from'		=> array( 'members' => 'm' ),
+									'where'		=> 'm.' . $sql,
+									'order'		=> "m.joined DESC",
+									'limit'		=> array( $startVal, 20 ),
+									'add_join'	=> array(
+														array( 'select'	=> 'g.g_access_cp',
+																'from'	=> array( 'groups' => 'g' ),
+																'type'	=> 'left',
+																'where'	=> 'g.g_id=m.member_group_id',
+															)
+													)
+						)		);
+			$this->DB->execute();
+		
+			while( $row = $this->DB->fetch() )
+			{
+				$row['joined']		= $this->registry->getClass( 'class_localization')->getDate( $row['joined'], 'JOINED' );
+				$row['groupname']	= IPSMember::makeNameFormatted( $this->caches['group_cache'][ $row['member_group_id'] ]['g_title'], $row['member_group_id'] );
+
+				$members[ $row['member_id'] ]	= $row;
+			}
+			
+			return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->membersModIPFormMembers( $pages, $members ) );
+		}
+		else
+		{
+			$sql	= $exactMatch ? "p.ip_address LIKE '$finalIPString'" : "p.ip_address='$finalIPString'";
+
+			//-----------------------------------------
+			// Get forums we can view
+			//-----------------------------------------
+			
+			$aforum	= $this->registry->getClass('class_forums')->fetchSearchableForumIds();
+
+			if ( count($aforum) < 1)
+			{
+				return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
+			}
+			
+			$the_forums	= implode( ",", $aforum );
+			
+			$count	= $this->DB->buildAndFetch( array(
+													'select'	=> 'COUNT(*) as total',
+													'from'		=> array( 'posts' => 'p' ),
+													'where'		=> "t.forum_id IN({$the_forums}) AND {$sql}",
+													'add_join'	=> array(
+																		array(
+																				'from'		=> array( 'topics' => 't' ),
+																				'where'		=> 't.tid=p.topic_id',
+																				'type'		=> 'left'
+																			),
+																		)
+											)		);
+											
+			//-----------------------------------------
+			// Do we have any results?
+			//-----------------------------------------
+			
+			if ( !$count['total'] )
+			{
+				return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
+			}
+
+	 		//-----------------------------------------
+	 		// Pages
+	 		//-----------------------------------------
+	 		
+	 		$pageLinks	= $this->registry->getClass('output')->generatePagination( array(	'totalItems'		=> $count['total'],
+															   								'itemsPerPage'		=> 10,
+																							'currentStartValue'	=> $startVal,
+																							'baseUrl'			=> "app=core&amp;module=modcp&amp;tab=iplookup&amp;fromapp=members&amp;_do=submit&amp;iptool=posts&amp;ip=" . $this->request['ip'],
+																				)		);
+			
+			$results	= array();
+
+			$this->DB->build( array(	
+									'select'	=> 'p.*',
+									'from'		=> array( 'posts' => 'p' ),
+									'where'		=> "t.forum_id IN({$the_forums}) AND {$sql}",
+									'limit'		=> array( $startVal, 10 ),
+									'order'		=> 'p.pid DESC',
+									'add_join'	=> array(
+														array(
+																'select'	=> 't.forum_id',
+																'from'		=> array( 'topics' => 't' ),
+																'where'		=> 't.tid=p.topic_id',
+																'type'		=> 'left'
+															),
+														array(
+																'select'	=> 'm.*',
+																'from'		=> array( 'members' => 'm' ),
+																'where'		=> 'm.member_id=p.author_id',
+																'type'		=> 'left'
+															),
+														array(
+																'select'	=> 'pp.*',
+																'from'		=> array( 'profile_portal' => 'pp' ),
+																'where'		=> 'pp.pp_member_id=m.member_id',
+																'type'		=> 'left'
+															),
+														array(
+																'select'	=> 'pf.*',
+																'from'		=> array( 'pfields_content' => 'pf' ),
+																'where'		=> 'pf.member_id=m.member_id',
+																'type'		=> 'left'
+															),
+														)
+								)		);
+			$outer	= $this->DB->execute();
+
+			while ( $row = $this->DB->fetch($outer) )
+			{
+				//-----------------------------------------
+				// Parse the member
+				//-----------------------------------------
+				
+				$row	= IPSMember::buildDisplayData( $row, array( 'customFields' => 1, 'signature' => 1, 'warn' => 1 ) );
+				
+				//-----------------------------------------
+				// Parse the post
+				//-----------------------------------------
+		
+				IPSText::getTextClass( 'bbcode' )->parse_smilies			= $row['use_emo'];
+				IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->registry->class_forums->allForums[ $row['forum_id'] ]['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+				IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $row['post_htmlstate'] == 2 ? 1 : 0;
+				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->registry->class_forums->allForums[ $row['forum_id'] ]['use_ibc'];
+				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
+				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];	
+			
+				$row['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['post'] );
+				
+				$results[]	= $row;
+			}
+
+			return $this->registry->getClass('output')->getTemplate('modcp')->membersModIPForm( $this->request['ip'], $this->registry->getClass('output')->getTemplate('modcp')->membersModIPFormPosts( $count['total'], $pageLinks, $results ) );
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_modposts.php b/upload/admin/applications/members/extensions/modcp/plugin_modposts.php
new file mode 100644
index 00000000..d8277106
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_modposts.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @file		plugin_modposts.php 	Moderator control panel plugin: show members on mod queue
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/17/2011
+ * $LastChangedDate: 2011-08-29 22:12:22 -0400 (Mon, 29 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9425 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_modposts
+ * @brief		Moderator control panel plugin: show members on mod queue
+ * 
+ */
+class plugin_members_modposts
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->registry->class_localization->loadLanguageFile( array( 'public_list' ), 'members' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'manage_members';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'modposts';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR ( $this->memberData['is_mod'] AND $permissions['allow_warn'] AND $this->settings['warn_mod_modq'] ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		/* Add some additional CSS */
+		$this->registry->output->addToDocumentHead( 'importcss', "{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_mlist.css" );
+		
+		//-----------------------------------------
+		// Get 10 members on mod queue
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$total		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "mod_posts!=0 AND mod_posts!='' AND mod_posts " . $this->DB->buildIsNull( false ) ) );
+		$members	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'm.*',
+								'from'		=> array( 'members' => 'm' ),
+								'order'		=> 'm.joined DESC',
+								'limit'		=> array( $st, 10 ),
+								'where'		=> "m.mod_posts!=0 AND m.mod_posts!='' AND m.mod_posts " . $this->DB->buildIsNull( false ),
+								'add_join'	=> array(
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'm.member_id=pp.pp_member_id',
+														'type'		=> 'left',
+														),
+													),
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$mod_arr		= IPSMember::processBanEntry( $r['mod_posts'] );
+			
+			if( $mod_arr['date_end'] AND $mod_arr['date_end'] < time() )
+			{
+				IPSMember::save( $r['member_id'], array( 'core' => array( 'mod_posts' => 0 ) ) );
+				continue;
+			}
+
+			if( $mod_arr['date_start'] == 1 )
+			{
+				$r['_language']	= $this->lang->words['modcp_modq_indef'];
+			}
+			else
+			{
+				$r['_language']	= $this->registry->getClass('class_localization')->getDate( $mod_arr['date_end'], 'SHORT' );
+			}
+
+			$members[]		= IPSMember::buildDisplayData( $r );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total['members'],
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=members&amp;tab=modposts",
+															)		);
+
+		return $this->registry->output->getTemplate('modcp')->membersList( 'modposts', $members, $pages );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_restrictposts.php b/upload/admin/applications/members/extensions/modcp/plugin_restrictposts.php
new file mode 100644
index 00000000..4b854da3
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_restrictposts.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @file		plugin_restrictposts.php 	Moderator control panel plugin: show members with post restriction
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/17/2011
+ * $LastChangedDate: 2011-08-29 22:12:22 -0400 (Mon, 29 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9425 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_restrictposts
+ * @brief		Moderator control panel plugin: show members with post restriction
+ * 
+ */
+class plugin_members_restrictposts
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->lang->loadLanguageFile( array( 'public_list' ), 'members' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'manage_members';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'restrictposts';
+	}
+	
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR ( $this->memberData['is_mod'] AND $permissions['allow_warn'] AND $this->settings['warn_mod_post'] ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		/* Add some CSS.. */
+		$this->registry->output->addToDocumentHead( 'importcss', "{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_mlist.css" );
+		
+		//-----------------------------------------
+		// Get 10 members on mod queue
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$total		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "restrict_post!=0 AND restrict_post!='' AND restrict_post " . $this->DB->buildIsNull( false ) ) );
+		$members	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'm.*',
+								'from'		=> array( 'members' => 'm' ),
+								'order'		=> 'm.joined DESC',
+								'limit'		=> array( $st, 10 ),
+								'where'		=> "m.restrict_post!=0 AND m.restrict_post!='' AND m.restrict_post " . $this->DB->buildIsNull( false ),
+								'add_join'	=> array(
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'm.member_id=pp.pp_member_id',
+														'type'		=> 'left',
+														),
+													),
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$mod_arr		= IPSMember::processBanEntry( $r['restrict_post'] );
+
+			if( $mod_arr['date_end'] AND $mod_arr['date_end'] < time() )
+			{
+				IPSMember::save( $r['member_id'], array( 'core' => array( 'restrict_post' => 0 ) ) );
+				continue;
+			}
+			
+			if( $mod_arr['date_start'] == 1 )
+			{
+				$r['_language']	= $this->lang->words['modcp_modq_indef'];
+			}
+			else
+			{
+				$r['_language']	= $this->registry->getClass('class_localization')->getDate( $mod_arr['date_end'], 'SHORT' );
+			}
+
+			$members[]		= IPSMember::buildDisplayData( $r );
+		}
+		
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total['members'],
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=members&amp;tab=restrictposts",
+															)		);
+
+		return $this->registry->output->getTemplate('modcp')->membersList( 'restrictposts', $members, $pages );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_suspended.php b/upload/admin/applications/members/extensions/modcp/plugin_suspended.php
new file mode 100644
index 00000000..8b326553
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_suspended.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @file		plugin_suspended.php 	Moderator control panel plugin: temporarily suspended members
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		2/17/2011
+ * $LastChangedDate: 2011-08-29 22:12:22 -0400 (Mon, 29 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9425 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_suspended
+ * @brief		Moderator control panel plugin: temporarily suspended members
+ * 
+ */
+class plugin_members_suspended
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+		
+		/* Load language strings.. */
+		$this->lang->loadLanguageFile( array( 'public_list' ), 'members' );
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'manage_members';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'suspended';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR ( $this->memberData['is_mod'] AND $permissions['allow_warn'] AND $this->settings['warn_mod_ban'] ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+		
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+		
+		/* Add some CSS.. */
+		$this->registry->output->addToDocumentHead( 'importcss', "{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_mlist.css" );
+		
+		//-----------------------------------------
+		// Get 10 members on suspension
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$total		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "temp_ban!=0 AND temp_ban!='' AND temp_ban " . $this->DB->buildIsNull( false ) ) );
+		$members	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'm.*',
+								'from'		=> array( 'members' => 'm' ),
+								'order'		=> 'm.joined DESC',
+								'limit'		=> array( $st, 10 ),
+								'where'		=> "m.temp_ban!=0 AND m.temp_ban!='' AND m.temp_ban " . $this->DB->buildIsNull( false ),
+								'add_join'	=> array(
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'm.member_id=pp.pp_member_id',
+														'type'		=> 'left',
+														),
+													),
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			$mod_arr = IPSMember::processBanEntry( $r['temp_ban'] );
+			
+			if( $mod_arr['date_end'] AND $mod_arr['date_end'] < time() )
+			{
+				IPSMember::save( $r['member_id'], array( 'core' => array( 'temp_ban' => 0 ) ) );
+				continue;
+			}
+			
+			if( $mod_arr['date_start'] == 1 )
+			{
+				$r['_language'] = $this->lang->words['modcp_modq_indef'];
+			}
+			else
+			{
+				$r['_language'] = $this->registry->getClass('class_localization')->getDate( $mod_arr['date_end'], 'SHORT' );
+			}
+			
+			$members[] = IPSMember::buildDisplayData( $r );
+		}
+		
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total['members'],
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=members&amp;tab=suspended",
+															  )		);
+
+		return $this->registry->output->getTemplate('modcp')->membersList( 'suspended', $members, $pages );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/modcp/plugin_warn.php b/upload/admin/applications/members/extensions/modcp/plugin_warn.php
new file mode 100644
index 00000000..05995462
--- /dev/null
+++ b/upload/admin/applications/members/extensions/modcp/plugin_warn.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * @file		plugin_warn.php 	Moderator control panel plugin: show latest warnings
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		2/14/2011
+ * $LastChangedDate: 2011-03-09 17:51:33 -0500 (Wed, 09 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8003 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+/**
+ *
+ * @class		plugin_members_warn
+ * @brief		Moderator control panel plugin: show latest warnings
+ * 
+ */
+class plugin_members_warn
+{
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		//-----------------------------------------
+		// Make shortcuts
+		//-----------------------------------------
+		
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang			= $this->registry->class_localization;
+	}
+	
+	/**
+	 * Returns the primary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getPrimaryTab()
+	{
+		return 'manage_members';
+	}
+	
+	/**
+	 * Returns the secondary tab key for the navigation bar
+	 * 
+	 * @return	@e string
+	 */
+	public function getSecondaryTab()
+	{
+		return 'warn';
+	}
+
+	/**
+	 * Determine if we can view tab
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e bool
+	 */
+	public function canView( $permissions )
+	{
+		if( $this->memberData['g_is_supmod'] OR ( $this->memberData['is_mod'] AND $permissions['allow_warn'] ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Execute plugin
+	 *
+	 * @param	array 	$permissions	Moderator permissions
+	 * @return	@e string
+	 */
+	public function executePlugin( $permissions )
+	{
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+
+		if( !$this->canView( $permissions ) )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Get last 10 warnings
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$total		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as warns', 'from' => 'warn_logs' ) );
+		$warnings	= array();
+		
+		$this->DB->build( array(
+								'select'	=> 'w.*',
+								'from'		=> array( 'warn_logs' => 'w' ),
+								'order'		=> 'w.wlog_date DESC',
+								'limit'		=> array( $st, 10 ),
+								'add_join'	=> array(
+													array(
+														'select'	=> 'm.*',
+														'from'		=> array( 'members' => 'm' ),
+														'where'		=> 'm.member_id=w.wlog_mid',
+														'type'		=> 'left',
+														),
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'm.member_id=pp.pp_member_id',
+														'type'		=> 'left',
+														),
+													array(
+														'select'	=> 'mm.member_id as punisher_id, mm.members_display_name as punisher_name, mm.members_seo_name as punisher_seo_name',
+														'from'		=> array( 'members' => 'mm' ),
+														'where'		=> 'mm.member_id=w.wlog_addedby',
+														'type'		=> 'left',
+														),
+													array(
+														'select'	=> 'ppp.pp_main_photo as punisher_check, ppp.pp_thumb_photo as punisher_photo, ppp.pp_thumb_width as punisher_width, ppp.pp_thumb_height as punisher_height',
+														'from'		=> array( 'profile_portal' => 'ppp' ),
+														'where'		=> 'mm.member_id=ppp.pp_member_id',
+														'type'		=> 'left',
+														),
+													),
+						)		);
+		$outer	= $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			if ( strstr( $r['wlog_notes'], '<content>' ) )
+			{
+				$raw = preg_match( "#<content>(.+?)</content>#is", $r['wlog_notes'], $match );
+			}
+			else
+			{
+				$_array = unserialize( $r['wlog_notes'] );
+				
+				if ( is_array( $_array ) AND $_array['content'] )
+				{
+					$match[1] = $_array['content'];
+				}
+			}
+			
+			IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+			IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
+			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $r['member_group_id'];
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $r['mgroup_others'];
+	
+			$r['content'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $match[1] );
+				
+			$r['punisher_photo']	= IPSMember::buildProfilePhoto( array( 'pp_main_photo' => $r['punisher_check'], 'pp_thumb_photo' => $r['punisher_photo'], 'pp_thumb_width' => $r['punisher_width'], 'pp_thumb_height' => $r['punisher_height'] ), 'mini' );
+			$warnings[]				= IPSMember::buildDisplayData( $r );
+		}
+
+		//-----------------------------------------
+		// Page links
+		//-----------------------------------------
+		
+		$pages	= $this->registry->output->generatePagination( array(	'totalItems'		=> $total['warns'],
+																		'itemsPerPage'		=> 10,
+																		'currentStartValue'	=> $st,
+																		'baseUrl'			=> "app=core&amp;module=modcp&amp;fromapp=members&amp;tab=warn",
+															)		);
+		
+		return $this->registry->output->getTemplate('modcp')->latestWarnLogs( $warnings, $pages );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/notifications.php b/upload/admin/applications/members/extensions/notifications/config.php
similarity index 54%
rename from upload/admin/applications/members/extensions/notifications.php
rename to upload/admin/applications/members/extensions/notifications/config.php
index 0c019c7c..d279a004 100644
--- a/upload/admin/applications/members/extensions/notifications.php
+++ b/upload/admin/applications/members/extensions/notifications/config.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Define the core notification types
- * Last Updated: $Date: 2010-04-16 21:25:51 -0400 (Fri, 16 Apr 2010) $
+ * Last Updated: $Date: 2011-04-27 07:31:56 -0400 (Wed, 27 Apr 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6142 $
+ * @version		$Rev: 8490 $
  *
  */
 
@@ -37,20 +37,17 @@ class members_notifications
 		 * Notification types - Needs to be a method so when require_once is used, $_NOTIFY isn't empty
 		 */
 		$_NOTIFY	= array(
-							array( 'key' => 'profile_comment', 'default' => array( 'pm' ), 'disabled' => array(), 'icon' => 'notify_profilecomment' ),
-							array( 'key' => 'profile_comment_pending', 'default' => array( 'pm' ), 'disabled' => array(), 'icon' => 'notify_profilecomment' ),
-							array( 'key' => 'friend_request', 'default' => array( 'pm' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
-							array( 'key' => 'friend_request_pending', 'default' => array( 'pm' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
-							array( 'key' => 'friend_request_approve', 'default' => array( 'pm' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
-							array( 'key' => 'new_private_message', 'default' => array( 'email', 'inline' ), 'disabled' => array( 'pm' ), 'icon' => 'notify_pm' ),
-							array( 'key' => 'reply_private_message', 'default' => array( 'email', 'inline' ), 'disabled' => array( 'pm' ), 'icon' => 'notify_pm' ),
-							array( 'key' => 'invite_private_message', 'default' => array( 'email', 'inline' ), 'disabled' => array( 'pm' ), 'icon' => 'notify_pm' ),
+							array( 'key' => 'profile_comment', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_profilecomment' ),
+							array( 'key' => 'friend_request', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
+							array( 'key' => 'friend_request_approve', 'default' => array( 'inline' ), 'disabled' => array(), 'icon' => 'notify_friendrequest' ),
+							array( 'key' => 'new_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
+							array( 'key' => 'reply_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
+							array( 'key' => 'invite_private_message', 'default' => array( 'email' ), 'disabled' => array( 'inline' ), 'icon' => 'notify_pm' ),
 							array( 'key' => 'reply_your_status', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
 							array( 'key' => 'reply_any_status', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
 							array( 'key' => 'friend_status_update', 'default' => array(), 'disabled' => array(), 'icon' => 'notify_statusreply' ),
-							);
+							);/*noLibHook*/
 							
 		return $_NOTIFY;
 	}
-}
-
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/notifications/index.html b/upload/admin/applications/members/extensions/notifications/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/applications/members/extensions/notifications/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/notifications/pm.php b/upload/admin/applications/members/extensions/notifications/pm.php
new file mode 100644
index 00000000..a8867c7a
--- /dev/null
+++ b/upload/admin/applications/members/extensions/notifications/pm.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Fetches meta data for notifications
+ * Last Updated: $Date: 2011-09-21 10:55:45 -0400 (Wed, 21 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$author$
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Forums
+ * @link		http://hatynka.in
+ * @version		$Rev: 9528 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class members_class_notifications
+{
+	/**
+	 * Construct
+	 *
+	 */
+	public function __construct()
+	{
+		/* Make object */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
+		$this->messengerFunctions = new $classToLoad( $this->registry );
+	}
+	
+	/**
+	 * Fetches data by meta data
+	 * Must return: authorId, content, title, date
+	 * @param array $metaData
+	 */
+	public function getLinkedDataByMetaData( array $metaData )
+	{
+		/* Fetch topic */
+		$topic = $this->messengerFunctions->fetchTopicDataWithMessage( $metaData['meta_id'] );
+		
+		/* Get participants */
+		$parts = $this->messengerFunctions->fetchTopicParticipants( $metaData['meta_id'] );
+		
+		/* New or reply? */
+		if ( ! empty( $parts[ $this->memberData['member_id'] ]['map_read_time'] ) && ! empty( $parts[ $this->memberData['member_id'] ]['map_has_unread'] ) )
+		{
+			/* Is reply */
+			$msg = $this->messengerFunctions->fetchMessageData( $metaData['meta_id'], $topic['mt_last_msg_id'] );
+			
+			$topic['msg_author_id'] = $msg['msg_author_id'];
+			$topic['msg_post']      = $msg['msg_post'];
+			$topic['msg_date']      = $msg['msg_date'];
+		}
+		
+		/* Is this a new topic or reply? */
+		return array( 'authorId' => $topic['msg_author_id'],
+					  'content'  => $this->_formatMessageForDisplay( $topic['msg_post'], $this->memberData ),
+					  'title'    => $topic['mt_title'],
+					  'date' 	 => $topic['msg_date'],
+					  'type'	 => $this->lang->words['gbl_notify_pm'] );
+	}
+	
+	/**
+	 * Function to format the actual message (applies BBcode, etc)
+	 *
+	 * @param	string		Raw text
+	 * @param	array 		PM data
+	 * @return	string		Processed text
+	 */
+	private function _formatMessageForDisplay( $msgContent, $data=array() )
+	{
+		IPSText::resetTextClass('bbcode');
+		
+		$this->settings['max_emos'] = 0;
+
+ 		IPSText::getTextClass('bbcode')->parse_smilies				= 1;
+ 		IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
+ 		IPSText::getTextClass('bbcode')->parse_html					= 0;
+ 		IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
+ 		IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
+		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $data['member_group_id'];
+		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $data['mgroup_others'];
+ 		
+ 		$msgContent = IPSText::getTextClass('bbcode')->preDisplayParse( $msgContent );
+ 	
+		return $msgContent;
+	}
+	
+}
diff --git a/upload/admin/applications/members/extensions/portalPlugins/online_users-cfg.php b/upload/admin/applications/members/extensions/portalPlugins/online_users-cfg.php
deleted file mode 100644
index e0827d79..00000000
--- a/upload/admin/applications/members/extensions/portalPlugins/online_users-cfg.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: online users
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* This file must be named {file_name_minus_php}-cfg.php
-*
-* Please see each variable for more information
-* $PORTAL_CONFIG is OK for each file, do not change
-* this array name.
-*/
-
-$PORTAL_CONFIG = array();
-
-/**
-* Main plug in title
-*
-*/
-$PORTAL_CONFIG['pc_title'] = 'Онлайн пользователи';
-
-/**
-* Plug in mini description
-*
-*/
-$PORTAL_CONFIG['pc_desc']  = "Блок онлайн пользователей";
-
-/**
-* Keyword for settings. This is the keyword
-* entered into ibf_conf_settings_titles -> conf_title_keyword
-* Can be left blank.
-* PLEASE stick to the naming convention when entering a setting
-* keyword: portal_{file_name_minus_php} This will prevent
-* other keyword clashes. Likewise, when creating settings, choose
-* NOT to cache them (they will be loaded at run time) and always
-* prefix with {file_name_minus_php}_setting_key - for example
-* If you had a setting called "export_forums" then please name it
-* "recent_topics_export_forums". This will be available in
-* $this->settings['recent_topics_export_forums'] in the
-* main module.
-*/
-$PORTAL_CONFIG['pc_settings_keyword'] = "";
-
-/**
-* Exportable tags key must be in the naming format of:
-* {file_name_minus_php}-tag. The value *MUST* be the function
-* which it corresponds to. For example:
-* 'recent_topics_last_x' => 'recent_topics_last_x'
-* The portal will look for function 'recent_topics_last_x' in
-* module "sources/portal_plugins/recent_topics.php" when it parses
-* the tag <!--::recent_topics_last_x::-->
-*
-* @param array[ TAG ] = array( FUNCTION NAME, DESCRIPTION );
-*/
-$PORTAL_CONFIG['pc_exportable_tags']['online_users_show'] = array( 'online_users_show', 'Shows the online users' );
diff --git a/upload/admin/applications/members/extensions/portalPlugins/online_users.php b/upload/admin/applications/members/extensions/portalPlugins/online_users.php
deleted file mode 100644
index d031bb20..00000000
--- a/upload/admin/applications/members/extensions/portalPlugins/online_users.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: online users
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7007 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class ppi_online_users extends public_portal_portal_portal 
-{
-	/**
-	 * Initialize module
-	 *
-	 * @return	void
-	 */
-	public function init()
- 	{
- 	}
- 	
-	/**
-	 * Show the online users
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function online_users_show()
-	{
-		//-----------------------------------------
-		// Get the users from the DB
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'forums', 'forums' ) . '/boards.php', 'public_forums_forums_boards' );
-		$boards	= new $classToLoad();
-		$boards->makeRegistryShortcuts( $this->registry );
-		
-		$active				= $boards->getActiveUserDetails();
-		$active['visitors']	= $active['GUESTS']  + $active['ANON'];
-		$active['members']	= $active['MEMBERS'];
-
- 		return $this->registry->getClass('output')->getTemplate('portal')->onlineUsers( $active );
- 	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/profileTabs/aboutme.conf.php b/upload/admin/applications/members/extensions/profileTabs/aboutme.conf.php
index 907cf398..d3014779 100644
--- a/upload/admin/applications/members/extensions/profileTabs/aboutme.conf.php
+++ b/upload/admin/applications/members/extensions/profileTabs/aboutme.conf.php
@@ -2,20 +2,21 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config for about me tab
  * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
  * @version		$Rev: 5713 $
  *
+ * @note		This file is only included in order to *disable* the tab for 3.1 upgrades
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -42,7 +43,7 @@ $CONFIG['plugin_key']         = 'aboutme';
 /**
 * Show tab?
 */
-$CONFIG['plugin_enabled']     = 1;
+$CONFIG['plugin_enabled']     = 0;
 
 /**
 * Order
diff --git a/upload/admin/applications/members/extensions/profileTabs/aboutme.php b/upload/admin/applications/members/extensions/profileTabs/aboutme.php
deleted file mode 100644
index d7cf554a..00000000
--- a/upload/admin/applications/members/extensions/profileTabs/aboutme.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Profile Plugin Library
- * Last Updated: $Date: 2010-05-24 11:38:42 -0400 (Mon, 24 May 2010) $
- * </pre>
- *
- * @author 		$Author: michael $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Revision: 6381 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class profile_aboutme extends profile_plugin_parent
-{
-	/**
-	 * Feturn HTML block
-	 *
-	 * @access	public
-	 * @param	array		Member information
-	 * @return	string		HTML block
-	 */
-	public function return_html_block( $member=array() ) 
-	{
-		//-----------------------------------------
-		// Got a member?
-		//-----------------------------------------
-		
-		if ( ! is_array( $member ) OR ! count( $member ) )
-		{
-			return $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_aboutme_to_show' );
-		}
-
-		//-----------------------------------------
-		// Format signature
-		//-----------------------------------------
-		
-		if( $member['signature'] )
-		{
-			IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings[ 'msg_allow_code' ];
-			IPSText::getTextClass('bbcode')->parse_smilies				= 0;
-			IPSText::getTextClass('bbcode')->parse_html					= $this->settings[ 'msg_allow_html' ];
-			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-			IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
-		
-			$member['signature']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $member['signature'] );
-		
-			$member['signature'] = $this->registry->getClass('output')->getTemplate('global')->signature_separator( $member['signature'] );
-		}
-		
-		//-----------------------------------------
-		// Format 'About me'
-		//-----------------------------------------
-
-		IPSText::getTextClass( 'bbcode' )->parse_html				= intval($this->settings['aboutme_html']);
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies			= $this->settings['aboutme_emoticons'];
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->settings['aboutme_bbcode'];
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'aboutme';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
-
-		$member['pp_about_me']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $member['pp_about_me'] );
-		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->tabAboutMe( $member );
-		
-		//-----------------------------------------
-		// Macros...
-		//-----------------------------------------
-		
-		$content = $this->registry->output->replaceMacros( $content );
-		
-		//-----------------------------------------
-		// Return content..
-		//-----------------------------------------
-		
-		return $content ? $content : $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_aboutme_to_show' );
-	}
-	
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/profileTabs/friends.conf.php b/upload/admin/applications/members/extensions/profileTabs/friends.conf.php
new file mode 100644
index 00000000..df1035a1
--- /dev/null
+++ b/upload/admin/applications/members/extensions/profileTabs/friends.conf.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Config for about me tab
+ * Last Updated: $Date: 2011-03-14 13:48:27 -0400 (Mon, 14 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @since		20th February 2002
+ * @version		$Rev: 8063 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+* Plug in name (Default tab name)
+*/
+$CONFIG['plugin_name']        = 'Friends';
+
+/**
+* Language string for the tab
+*/
+$CONFIG['plugin_lang_bit']    = 'pp_tab_friends';
+
+/**
+* Plug in key (must be the same as the main {file}.php name
+*/
+$CONFIG['plugin_key']         = 'friends';
+
+/**
+* Show tab?
+*/
+$CONFIG['plugin_enabled']     = 1;
+
+/**
+* Order
+*/
+$CONFIG['plugin_order'] = 2;
diff --git a/upload/admin/applications/members/extensions/profileTabs/friends.php b/upload/admin/applications/members/extensions/profileTabs/friends.php
new file mode 100644
index 00000000..509ebca4
--- /dev/null
+++ b/upload/admin/applications/members/extensions/profileTabs/friends.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Profile Plugin Library
+ * Last Updated: $Date: 2011-05-31 15:22:26 -0400 (Tue, 31 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @since		20th February 2002
+ * @version		$Revision: 8931 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class profile_friends extends profile_plugin_parent
+{
+	/**
+	 * Feturn HTML block
+	 *
+	 * @param	array		Member information
+	 * @return	string		HTML block
+	 */
+	public function return_html_block( $member=array() ) 
+	{
+		//-----------------------------------------
+		// Got a member?
+		//-----------------------------------------
+		
+		if ( ! is_array( $member ) OR ! count( $member ) )
+		{
+			return $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_aboutme_to_show' );
+		}
+		
+		$friends	= array();
+
+		//-----------------------------------------
+		// Grab the friends
+		//-----------------------------------------
+
+		$this->DB->build( array( 'select'		=> 'f.*',
+								 'from'			=> array( 'profile_friends' => 'f' ),
+								 'where'		=> 'f.friends_member_id=' . $member['member_id'] . ' AND f.friends_approved=1',
+								 //'order'		=> 'm.members_display_name ASC',
+								 'add_join'		=> array(
+													  1 => array( 'select' => 'pp.*',
+																  'from'   => array( 'profile_portal' => 'pp' ),
+																  'where'  => 'pp.pp_member_id=f.friends_friend_id',
+																  'type'   => 'left' ),
+												 	  2 => array( 'select' => 'm.*',
+																  'from'   => array( 'members' => 'm' ),
+																  'where'  => 'm.member_id=f.friends_friend_id',
+																  'type'   => 'left' ) 
+													) 
+								) 		);
+		$outer	= $this->DB->execute();
+		
+		//-----------------------------------------
+		// Get and store...
+		//-----------------------------------------
+		
+		while( $row = $this->DB->fetch($outer) )
+		{
+			if( $row['member_id'] )
+			{
+				$friends[ $row['members_display_name'] ]	= IPSMember::buildDisplayData( $row, 0 );
+			}
+		}
+		
+		ksort($friends);
+		
+		$content = $this->registry->getClass('output')->getTemplate('profile')->tabFriends( $friends, $member );
+		
+		//-----------------------------------------
+		// Macros...
+		//-----------------------------------------
+		
+		$content = $this->registry->output->replaceMacros( $content );
+		
+		//-----------------------------------------
+		// Return content..
+		//-----------------------------------------
+		
+		return $content ? $content : $this->registry->getClass('output')->getTemplate('profile')->tabNoContent( 'err_no_aboutme_to_show' );
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/profileTabs/index.html b/upload/admin/applications/members/extensions/profileTabs/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/profileTabs/index.html
+++ b/upload/admin/applications/members/extensions/profileTabs/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/profileTabs/status.conf.php b/upload/admin/applications/members/extensions/profileTabs/status.conf.php
index 6ae1ac69..d518f7f7 100644
--- a/upload/admin/applications/members/extensions/profileTabs/status.conf.php
+++ b/upload/admin/applications/members/extensions/profileTabs/status.conf.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config for about me tab
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 07:40:13 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 5713 $
+ * @version		$Rev: 7442 $
  *
  */
 
diff --git a/upload/admin/applications/members/extensions/profileTabs/status.php b/upload/admin/applications/members/extensions/profileTabs/status.php
index 99e05f13..559b4483 100644
--- a/upload/admin/applications/members/extensions/profileTabs/status.php
+++ b/upload/admin/applications/members/extensions/profileTabs/status.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile Plugin Library
- * Last Updated: $Date: 2010-07-15 21:31:17 -0400 (Thu, 15 Jul 2010) $
+ * Last Updated: $Date: 2011-08-25 07:46:38 -0400 (Thu, 25 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6661 $
+ * @version		$Revision: 9413 $
  *
  */
 
@@ -30,7 +30,6 @@ class profile_status extends profile_plugin_parent
 	/**
 	 * Feturn HTML block
 	 *
-	 * @access	public
 	 * @param	array		Member information
 	 * @return	string		HTML block
 	 */
@@ -49,12 +48,9 @@ class profile_status extends profile_plugin_parent
 		}
 		
 		/* Fetch */
-		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, array( 'member_id' => $member['member_id'], 'limit' => 2 ) );
-		
-		/* Fetch actions */
-		$actions = $this->registry->getClass('memberStatus')->fetchActions( $this->memberData, array( 'member_id' => $member['member_id'], 'limit' => 10, 'not_theirs' => 1, 'custom' => 0 ) );
-		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->tabStatusUpdates( $statuses, $actions, $member );
+		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, array( 'relatedTo' => $member['member_id'], 'isApproved' => true, 'limit' => 10 ) );
+			
+		$content = $this->registry->getClass('output')->getTemplate('profile')->tabStatusUpdates( $statuses, array(), $member );
 		
 		/* Replace Macros and return */
 		$content = $this->registry->output->replaceMacros( $content );
diff --git a/upload/admin/applications/members/extensions/reportPlugins/index.html b/upload/admin/applications/members/extensions/reportPlugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/reportPlugins/index.html
+++ b/upload/admin/applications/members/extensions/reportPlugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/reportPlugins/messages.php b/upload/admin/applications/members/extensions/reportPlugins/messages.php
index f8f2b924..c685fcef 100644
--- a/upload/admin/applications/members/extensions/reportPlugins/messages.php
+++ b/upload/admin/applications/members/extensions/reportPlugins/messages.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Report Center :: Private Messages plugin
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,25 +25,32 @@ if ( ! defined( 'IN_IPB' ) )
 
 class messages_plugin
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/
+	protected $caches;
 	
 	/**
 	 * Holds extra data for the plugin
 	 *
-	 * @access	private
 	 * @var		array			Data specific to the plugin
 	 */
 	public $_extra;
@@ -51,9 +58,8 @@ class messages_plugin
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -75,7 +81,6 @@ class messages_plugin
 	/**
 	 * Display the form for extra data in the ACP
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data
 	 * @param	object		HTML object
 	 * @return	string		HTML to add to the form
@@ -114,7 +119,6 @@ class messages_plugin
 	/**
 	 * Process the plugin's form fields for saving
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data for save
 	 * @return	string		Error message
 	 */
@@ -128,7 +132,6 @@ class messages_plugin
 	/**
 	 * Update timestamp for report
 	 *
-	 * @access	public
 	 * @param	array 		New reports
 	 * @param 	array 		New members cache
 	 * @return	boolean
@@ -141,7 +144,6 @@ class messages_plugin
 	/**
 	 * Get report permissions
 	 *
-	 * @access	public
 	 * @param	string 		Type of perms to check
 	 * @param 	array 		Permissions data
 	 * @param 	array 		group ids
@@ -163,7 +165,6 @@ class messages_plugin
 	/**
 	 * Show the report form for this module
 	 *
-	 * @access	public
 	 * @param 	array 		Application data
 	 * @return	string		HTML form information
 	 */
@@ -220,7 +221,6 @@ class messages_plugin
 	/**
 	 * Get section and link
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Section/link
 	 */
@@ -235,7 +235,6 @@ class messages_plugin
 	/**
 	 * Process a report and save the data appropriate
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Data from saving the report
 	 */
@@ -357,12 +356,27 @@ class messages_plugin
 		return $return_data;
 	}
 	
+	/**
+	 * Accepts an array of data from rc_reports_index and returns an array formatted nearly identical to processReport()
+	 *
+	 * @param 	array 		Report data
+	 * @return	array 		Formatted report data
+	 */
+	public function formatReportData( $report_data )
+	{
+		return array(
+					'REDIRECT_URL'	=> $report_data['url'],
+					'REPORT_INDEX'	=> $report_data['id'],
+					'SAVED_URL'		=> str_replace( '&amp;', '&', $report_data['url'] ),
+					'REPORT'		=> '',
+					);
+	}
+
 	/**
 	 * Where to send user after report is submitted
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reportRedirect( $report_data )
 	{
@@ -372,7 +386,6 @@ class messages_plugin
 	/**
 	 * Retrieve list of users to send notifications to
 	 *
-	 * @access	public
 	 * @param 	string 		Group ids
 	 * @param 	array 		Report data
 	 * @return	array 		Array of users to PM/Email
@@ -382,16 +395,16 @@ class messages_plugin
 		$notify = array();
 		
 		$this->DB->build( array(
-									'select'	=> 'noti.*',
-									'from'		=> array( 'rc_modpref' => 'noti' ),
-									'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
-									'add_join'	=> array(
-														array(
-															'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
-															'from'		=> array( 'members' => 'mem' ),
-															'where'		=> 'mem.member_id=noti.mem_id',
-															)
+								'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
+								'from'		=> array( 'members' => 'mem' ),
+								'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
+								'add_join'	=> array(
+													array(
+														'select'	=> 'noti.*',
+														'from'		=> array( 'rc_modpref' => 'noti' ),
+														'where'		=> 'mem.member_id=noti.mem_id',
 														)
+													)
 							)		);
 		$this->DB->execute();
 
diff --git a/upload/admin/applications/members/extensions/reportPlugins/profiles.php b/upload/admin/applications/members/extensions/reportPlugins/profiles.php
index 26b20b0a..c7b1dba9 100644
--- a/upload/admin/applications/members/extensions/reportPlugins/profiles.php
+++ b/upload/admin/applications/members/extensions/reportPlugins/profiles.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Report Center :: Profiles plugin
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @author		Based on original "Report Center" by Luke Scott
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -25,25 +25,32 @@ if ( ! defined( 'IN_IPB' ) )
 
 class profiles_plugin
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/
+	protected $caches;
 	
 	/**
 	 * Holds extra data for the plugin
 	 *
-	 * @access	private
 	 * @var		array			Data specific to the plugin
 	 */
 	public $_extra;
@@ -51,9 +58,8 @@ class profiles_plugin
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -75,7 +81,6 @@ class profiles_plugin
 	/**
 	 * Display the form for extra data in the ACP
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data
 	 * @param	object		HTML object
 	 * @return	string		HTML to add to the form
@@ -90,7 +95,6 @@ class profiles_plugin
 	/**
 	 * Process the plugin's form fields for saving
 	 *
-	 * @access	public
 	 * @param	array 		Plugin data for save
 	 * @return	string		Error message
 	 */
@@ -102,7 +106,6 @@ class profiles_plugin
 	/**
 	 * Update timestamp for report
 	 *
-	 * @access	public
 	 * @param	array 		New reports
 	 * @param 	array 		New members cache
 	 * @return	boolean
@@ -115,7 +118,6 @@ class profiles_plugin
 	/**
 	 * Get report permissions (only supermods can moderate profiles)
 	 *
-	 * @access	public
 	 * @param	string 		Type of perms to check
 	 * @param 	array 		Permissions data
 	 * @param 	array 		group ids
@@ -137,7 +139,6 @@ class profiles_plugin
 	/**
 	 * Show the report form for this module
 	 *
-	 * @access	public
 	 * @param 	array 		Application data
 	 * @return	string		HTML form information
 	 */
@@ -176,7 +177,6 @@ class profiles_plugin
 	/**
 	 * Get section and link
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Section/link
 	 */
@@ -193,7 +193,6 @@ class profiles_plugin
 	/**
 	 * Process a report and save the data appropriate
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
 	 * @return	array 		Data from saving the report
 	 */
@@ -293,13 +292,30 @@ class profiles_plugin
 		
 		return $return_data;
 	}
+
+	/**
+	 * Accepts an array of data from rc_reports_index and returns an array formatted nearly identical to processReport()
+	 *
+	 * @param 	array 		Report data
+	 * @return	array 		Formatted report data
+	 */
+	public function formatReportData( $report_data )
+	{
+		return array(
+					'REDIRECT_URL'	=> $report_data['url'],
+					'REPORT_INDEX'	=> $report_data['id'],
+					'SAVED_URL'		=> str_replace( '&amp;', '&', $report_data['url'] ),
+					'REPORT'		=> '',
+					'SEOTITLE'		=> $report_data['seoname'],
+					'TEMPLATE'		=> 'showuser',
+					);
+	}
 	
 	/**
 	 * Where to send user after report is submitted
 	 *
-	 * @access	public
 	 * @param 	array 		Report data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reportRedirect( $report_data )
 	{
@@ -318,7 +334,6 @@ class profiles_plugin
 	/**
 	 * Retrieve list of users to send notifications to
 	 *
-	 * @access	public
 	 * @param 	string 		Group ids
 	 * @param 	array 		Report data
 	 * @return	array 		Array of users to PM/Email
@@ -328,16 +343,16 @@ class profiles_plugin
 		$notify = array();
 		
 		$this->DB->build( array(
-									'select'	=> 'noti.*',
-									'from'		=> array( 'rc_modpref' => 'noti' ),
-									'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
-									'add_join'	=> array(
-														array(
-															'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
-															'from'		=> array( 'members' => 'mem' ),
-															'where'		=> 'mem.member_id=noti.mem_id',
-															)
+								'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
+								'from'		=> array( 'members' => 'mem' ),
+								'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
+								'add_join'	=> array(
+													array(
+														'select'	=> 'noti.*',
+														'from'		=> array( 'rc_modpref' => 'noti' ),
+														'where'		=> 'mem.member_id=noti.mem_id',
 														)
+													)
 							)		);
 		$this->DB->execute();
 
diff --git a/upload/admin/applications/members/extensions/search/config.php b/upload/admin/applications/members/extensions/search/config.php
index 832951dc..f9b1fc1e 100644
--- a/upload/admin/applications/members/extensions/search/config.php
+++ b/upload/admin/applications/members/extensions/search/config.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Config file
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-04-14 23:16:18 -0400 (Thu, 14 Apr 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8347 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -23,16 +23,22 @@ if ( ! defined( 'IN_IPB' ) )
 }
 
 /* Can search with this app */
-$CONFIG['can_search']	      = 1;
+$CONFIG['can_search']			= 1;
 
 /* Can view new content with this app */
-$CONFIG['can_viewNewContent'] = 1;
-
-/* Can fetch active content with this app */
-$CONFIG['can_activeContent']  = 1;
+$CONFIG['can_viewNewContent']	= 1;
+$CONFIG['can_vnc_filter_by_followed']	= 0;
+$CONFIG['can_vnc_unread_content']		= 0;
 
 /* Can fetch user generated content */
-$CONFIG['can_userContent'] = 1;
+$CONFIG['can_userContent']		= 1;
 
 /* Content types, put the default one first */
-$CONFIG['contentTypes'] = array( 'members', 'comments' );
\ No newline at end of file
+if( $_REQUEST['do'] == 'user_activity' )
+{
+	$CONFIG['contentTypes']			= array( 'comments' );
+}
+else
+{
+	$CONFIG['contentTypes']			= array( 'members', 'comments' );
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/search/engines/index.html b/upload/admin/applications/members/extensions/search/engines/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/search/engines/index.html
+++ b/upload/admin/applications/members/extensions/search/engines/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/search/engines/sql.php b/upload/admin/applications/members/extensions/search/engines/sql.php
index 80be6197..62ab87e6 100644
--- a/upload/admin/applications/members/extensions/search/engines/sql.php
+++ b/upload/admin/applications/members/extensions/search/engines/sql.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Basic Forum Search
- * Last Updated: $Date: 2010-02-23 12:38:11 +0000 (Tue, 23 Feb 2010) $
+ * Last Updated: $Date: 2011-07-28 18:01:32 -0400 (Thu, 28 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5861 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9330 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -35,11 +35,13 @@ class search_engine_members extends search_engine
 	/**
 	 * Decide what type of search we're using
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function search()
 	{
+		/* Hard limit */
+		IPSSearchRegistry::set('set.hardLimit', ( ipsRegistry::$settings['search_hardlimit'] ) ? ipsRegistry::$settings['search_hardlimit'] : 200 );
+		
 		/* Ok, now because the top bar search box defaults to members default search, which is profile comments, we need
 		   to convince it to default to members if the user used the top search bar with members selected */
 		if ( $this->request['fromMainBar'] )
@@ -47,13 +49,17 @@ class search_engine_members extends search_engine
 			IPSSearchRegistry::set('members.searchInKey', 'members');
 		}
 		
-		if ( IPSSearchRegistry::get('members.searchInKey') AND IPSSearchRegistry::get('members.searchInKey') != 'comments' )
+		if ( IPSSearchRegistry::get('members.searchInKey') == 'comments' )
 		{
-			return $this->_membersSearch();
+			$this->request['search_app_filters']['members']['searchInKey']	= 'comments';
+			
+			return $this->_commentsSearch();
 		}
 		else
 		{
-			return $this->_commentsSearch();
+			$this->request['search_app_filters']['members']['searchInKey']	= 'members';
+			
+			return $this->_membersSearch();
 		}
 	}
 	
@@ -64,86 +70,123 @@ class search_engine_members extends search_engine
 	 *
 	 * So if we had 1000 replies, and we are on page 2 of 25 per page, we'd return 25 items offset by 25
 	 *
-	 * @access public
 	 * @return array
 	 */
 	public function _commentsSearch()
 	{
-		/* INIT */ 
-		$count       		= 0;
-		$results     		= array();
-		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
-		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
-		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
-		$sortKey			= '';
-		$sortType			= '';
-		$rows               = array();
-		$got				= 0;
-		
-		/* Sorting */
-		switch( $sort_by )
-		{
-			default:
-			case 'date':
-				$sortKey  = 'comment_date';
-				$sortType = 'numerical';
-			break;
-		}
-		
 		/* Not allowed to see profile information */
 		if ( ! $this->memberData['g_mem_info'] )
 		{
 			return array( 'count' => 0, 'resultSet' => array() );
 		}
 
-		/* Query the count */	
-		$count = $this->DB->buildAndFetch( array('select'   => 'COUNT(*) as total_results',
-												 'from'	    => array( 'profile_comments' => 'c' ),
-				 								 'where'	=> $this->_buildCommentsWhereStatement( $search_term, $content_title_only ),
-												 'add_join' => array( array( 'from'   => array( 'profile_portal' => 'p' ),
-																			 'where'  => "p.pp_member_id=c.comment_by_member_id",
-																			 'type'   => 'left' ) ) ) );
+		/* INIT */
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
+		$search_term	= IPSSearchRegistry::get('in.clean_search_term');
+		$rows			= array();
 		
-		
-		
-		/* Fetch data */
-		$this->DB->build( array('select'   => 'c.*',
-								'from'	   => array( 'profile_comments' => 'c' ),
-								'where'	   => $this->_buildCommentsWhereStatement( $search_term, $content_title_only ),
-								'order'    => $sortKey . ' ' . $sort_order,
-								'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
-								'add_join' => array( array( 'select' => 'x.members_display_name as members_display_name_from, x.members_seo_name as members_seo_name_from',
-															'from'   => array( 'members' => 'x' ),
-															'where'  => "x.member_id=c.comment_by_member_id",
-															'type'   => 'left' ),
-													 array( 'select' => 'm.*',
-															'from'   => array( 'members' => 'm' ),
-															'where'  => "m.member_id=c.comment_for_member_id",
-															'type'   => 'left' ),
-													 array( 'select' => 'p.*',
-															'from'   => array( 'profile_portal' => 'p' ),
-															'where'  => "p.pp_member_id=c.comment_for_member_id",
-															'type'   => 'left' ) ) ) );
-		
-		
-		
-		
-		
-		$this->DB->execute();
+		$this->DB->build( array( 
+									'select'   => "s.status_id, s.status_date",
+									'from'	   => 'member_status_updates s',
+	 								'where'	   => $this->_buildCommentsWhereStatement( $search_term ),
+									'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') + 1),
+									'order'    => 's.status_date ' . $sort_order ) );
 
-		/* Sort */
-		while ( $_row = $this->DB->fetch() )
-		{
-			$rows[ $got ] = $_row;
-							
-			$got++;
+		$DB = $this->DB->execute();
+
+		/* Fetch all to sort */
+		while( $r = $this->DB->fetch( $DB ) )
+		{		
+			if ( IPSSearchRegistry::get('opt.noPostPreview') )
+			{
+				$_rows[ $r['status_id'] ] = $r;
+			}
+			else
+			{
+				$_rows[ $r['status_id'] ] = $r;
+			}
 		}
+		
+		/* Got any replies? */
+		if ( count( IPSSearchRegistry::get('_internal.replyIds') ) )
+		{			
+			$this->DB->build( array( 
+								'select'   => "r.*, r.reply_date as status_date",
+								'from'	   => array( 'member_status_replies' => 'r' ),
+	 							'where'	   => 'r.reply_id IN( ' . implode( ',', IPSSearchRegistry::get('_internal.replyIds') ) . ')',
+								'add_join' => array_merge( array( array( 'select'	=> 's.status_id, s.status_member_id, s.status_author_id',
+																		 'from'		=> array( 'member_status_updates' => 's' ),
+											 							 'where'	=> 's.status_id=r.reply_status_id',
+											 							 'type'		=> 'left' ),
+																  array( 'select'	=> 'm.member_id as owner_id, m.members_display_name as owner_display_name, m.members_seo_name as owner_seo_name',
+																		 'from'		=> array( 'members' => 'm' ),
+														 				 'where'	=> 'm.member_id=s.status_member_id',
+														 				 'type'		=> 'left' ),
+																  array( 'select'	=> 'mem.member_id as author_id, mem.members_display_name as author_display_name, mem.members_seo_name as author_seo_name',
+																		 'from'		=> array( 'members' => 'mem' ),
+														 				 'where'	=> 'mem.member_id=s.status_author_id',
+														 				 'type'		=> 'left' ) ) ) ) );
+			/* Grab data */
+			$this->DB->execute();
+		
+			/* Grab the results */
+			while( $row = $this->DB->fetch() )
+			{
+				$_rows[ $row['reply_status_id'] ]    = $row;
+				$_replies[ $row['reply_status_id'] ] = $row;
+			}
+		}
+		
+		/* Store */
+		IPSSearchRegistry::set('_internal.replyData', $_replies );
+		
+		/* Fetch count */
+		$count = count( $_rows );	
+		$c     = 0;
+		$rows  = array();
+		$got   = 0;
+		
+		if ( $count > IPSSearchRegistry::get('set.hardLimit') )
+		{
+			$count = IPSSearchRegistry::get('set.hardLimit');
+			
+			IPSSearchRegistry::set('set.resultsCutToLimit', true );
+		}
+
+		/* Set vars */
+		IPSSearch::$ask = 'status_date';
+		IPSSearch::$aso = strtolower( $sort_order );
+		IPSSearch::$ast = 'numerical';
+		
+		/* Sort */
+		if ( count( $_rows ) )
+		{
+			usort( $_rows, array("IPSSearch", "usort") );
 	
+			/* Build result array */
+			foreach( $_rows as $r )
+			{
+				$c++;
+				
+				if ( IPSSearchRegistry::get('in.start') AND IPSSearchRegistry::get('in.start') >= $c )
+				{
+					continue;
+				}
+				
+				$rows[ $got ] = $r['status_id'];
+							
+				$got++;
+				
+				/* Done? */
+				if ( IPSSearchRegistry::get('opt.search_per_page') AND $got >= IPSSearchRegistry::get('opt.search_per_page') )
+				{
+					break;
+				}
+			}
+		}
+
 		/* Return it */
-		return array( 'count' => $count['total_results'], 'resultSet' => $rows );
+		return array( 'count' => $count, 'resultSet' => $rows );
 	}
 	
 	/**
@@ -153,26 +196,18 @@ class search_engine_members extends search_engine
 	 *
 	 * So if we had 1000 replies, and we are on page 2 of 25 per page, we'd return 25 items offset by 25
 	 *
-	 * @access public
 	 * @return array
 	 */
 	public function _membersSearch()
 	{
-		/* INIT */ 
-		$count       		= 0;
-		$results     		= array();
-		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
-		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
-		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
-		$sortKey			= '';
-		$sortType			= '';
-		$rows               = array();
-		$got				= 0;
+		/* INIT */
+		$sort_by		= IPSSearchRegistry::get('in.search_sort_by');
+		$sort_order		= IPSSearchRegistry::get('in.search_sort_order');
+		$search_term	= IPSSearchRegistry::get('in.clean_search_term');
+		$sortKey		= '';
+		$rows			= array();
 		
-		if ( IPSSearchRegistry::get('opt.noPostPreview') OR IPSSearchRegistry::get('display.onlyTitles') )
+		if ( IPSSearchRegistry::get('opt.noPostPreview') OR IPSSearchRegistry::get('opt.searchType') == 'titles' )
 		{
 			$group_by = 'm.member_id';
 		}
@@ -182,19 +217,17 @@ class search_engine_members extends search_engine
 		{
 			default:
 			case 'date':
-				$sortKey  = ( $content_title_only ) ? 'member_id' : 'member_id';
-				$sortType = 'numerical';
+				$sortKey  = 'member_id';
 			break;
 			case 'title':
 				$sortKey  = 'members_l_display_name';
-				$sortType = 'string';
 			break;
 		}
 		
 		/* Query the count */	
 		$count = $this->DB->buildAndFetch( array('select'   => 'COUNT(*) as total_results',
 												 'from'	    => array( 'members' => 'm' ),
-				 								 'where'	=> $this->_buildWhereStatement( $search_term, $content_title_only ),
+				 								 'where'	=> $this->_buildWhereStatement( $search_term ),
 				 								 'group'    => $group_by,
 												 'add_join' => array( array( 'from'   => array( 'profile_portal' => 'p' ),
 																			'where'  => "p.pp_member_id=m.member_id",
@@ -205,7 +238,7 @@ class search_engine_members extends search_engine
 		/* Fetch data */
 		$this->DB->build( array('select'   => 'm.*',
 								'from'	   => array( 'members' => 'm' ),
-								'where'	   => $this->_buildWhereStatement( $search_term, $content_title_only ),
+								'where'	   => $this->_buildWhereStatement( $search_term ),
 								'group'    => $group_by,
 								'order'    => $sortKey . ' ' . $sort_order,
 								'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
@@ -213,41 +246,144 @@ class search_engine_members extends search_engine
 															'from'   => array( 'profile_portal' => 'p' ),
 															'where'  => "p.pp_member_id=m.member_id",
 															'type'   => 'left' ) ) ) );
-		
-		
-		
-		
-		
 		$this->DB->execute();
 
-		/* Sort */
+		/* Get results */
 		while ( $_row = $this->DB->fetch() )
 		{
-			$rows[ $got ] = $_row;
-							
-			$got++;
+			$rows[]	= IPSMember::buildProfilePhoto( $_row );
 		}
 	
 		/* Return it */
 		return array( 'count' => $count['total_results'], 'resultSet' => $rows );
 	}
-	
+
+	/**
+	 * Perform the viewNewContent search
+	 * Populates $this->_count and $this->_results
+	 *
+	 * @access	public
+	 * @return	array
+	 * @note	Does not support 'Content I have not read' because events are not tracked through topic marker class
+	 * @note	Does not support 'Content I am following' because you cannot 'follow' members at this point in time
+	 */
+	public function viewNewContent()
+	{	
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+
+		IPSSearchRegistry::set('in.search_sort_by', 'date' );
+		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
+		IPSSearchRegistry::set('opt.searchType', 'titles' );
+		IPSSearchRegistry::set('opt.noPostPreview', true );
+		
+		//-----------------------------------------
+		// Set time limit
+		//-----------------------------------------
+		
+		if ( IPSSearchRegistry::get('in.period_in_seconds') !== false )
+		{
+			$this->search_begin_timestamp	= ( IPS_UNIX_TIME_NOW - IPSSearchRegistry::get('in.period_in_seconds') );
+		}
+		else
+		{
+			$this->search_begin_timestamp	= intval( $this->memberData['last_visit'] ) ? intval( $this->memberData['last_visit'] ) : IPS_UNIX_TIME_NOW;
+		}
+
+		return $this->search();
+	}
+
 	/**
 	 * Builds the where portion of a search string
 	 *
-	 * @access	private
-	 * @param	string	$search_term		The string to use in the search
-	 * @param	bool	$content_title_only	Search only title records
+	 * @param	string	$search_term			The string to use in the search
+	 * @param	bool	$searchType		Search only title records
 	 * @return	string
-	 **/
-	private function _buildCommentsWhereStatement( $search_term, $content_title_only=false )
+	 */
+	protected function _buildCommentsWhereStatement( $search_term, $searchType=null )
 	{		
 		/* INI */
-		$where_clause = array();
-				
-		if( $search_term )
+		$where_clause	= array();
+		$searchType     = ( $searchType === null ) ? IPSSearchRegistry::get('opt.searchType') : $searchType;
+		$sort_order     = IPSSearchRegistry::get('in.search_sort_order');
+		
+		if ( $search_term )
 		{
-			$where_clause[] = "c.comment_content LIKE '%" . mb_strtolower( $search_term ) . "%'";
+			if ( $searchType == 'titles' )
+			{			
+				$where_clause[] = $this->DB->buildSearchStatement( 's.status_content', $search_term, true, false, false );
+			}
+			else
+			{
+				if ( $searchType == 'content' )
+				{
+					$where_clause[] = $this->DB->buildSearchStatement( 'r.reply_content', $search_term, true, false, false );
+				}
+				else
+				{
+					/* Set vars */
+					IPSSearch::$ask = 'status_date';
+					IPSSearch::$aso = strtolower( $sort_order );
+					IPSSearch::$ast = 'numerical';
+			
+					/* Find topic ids that match */
+					$tids = array();
+					$pids = array();
+					
+					$this->DB->build( array('select'   => "s.status_id, s.status_date",
+											'from'	   => 'member_status_updates s',
+			 								'where'	   => $this->_buildCommentsWhereStatement( $search_term, 'titles' ),
+			 								'order'    => 's.status_date ' . $sort_order,
+											'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit')) ) );
+								
+					$i = $this->DB->execute();
+					
+					/* Grab the results */
+					while( $row = $this->DB->fetch( $i ) )
+					{
+						$_rows[ $row['status_id'] ] = $row;
+					}
+			
+					/* Sort */
+					if ( count( $_rows ) )
+					{
+						usort( $_rows, array("IPSSearch", "usort") );
+				
+						foreach( $_rows as $id => $row )
+						{
+							$tids[] = $row['status_id'];
+						}
+					}
+				
+					/* Set vars */
+					IPSSearch::$ask = 'reply_date';
+					IPSSearch::$aso = strtolower( $sort_order );
+					IPSSearch::$ast = 'numerical';
+					
+					$this->DB->build( array( 'select'   => "r.reply_id, r.reply_date, r.reply_status_id as status_id",
+											 'from'	    => 'member_status_replies r',
+			 								 'where'	=> $this->_buildCommentsWhereStatement( $search_term, 'content' ),
+			 								 'order'    => IPSSearch::$ask . ' ' . IPSSearch::$aso,
+											 'limit'    => array(0, IPSSearchRegistry::get('set.hardLimit') ) ) );
+								
+					$i = $this->DB->execute();
+					
+					/* Grab the results */
+					while( $row = $this->DB->fetch( $i ) )
+					{
+						$tids[] = $row['status_id'];
+						$pids[] = $row['reply_id'];
+					}
+			
+					if ( count( $pids ) )
+					{
+						IPSSearchRegistry::set('_internal.replyIds', $pids );
+					}
+					
+					$where_clause[] = '( s.status_id IN (' . ( count($tids) ? implode( ',', $tids ) : 0 ) .') )';
+				}
+			}
 		}
 
 		/* Add in AND where conditions */
@@ -264,51 +400,54 @@ class search_engine_members extends search_engine
 		
 		/* Date Restrict */
 		if( $this->search_begin_timestamp && $this->search_end_timestamp )
-		{
-			$where_clause[] = $this->DB->buildBetween( "c.comment_date", $this->search_begin_timestamp, $this->search_end_timestamp );
+		{ 
+			$where_clause[] = $this->DB->buildBetween( $searchType == 'content' ? "r.reply_date" : "s.status_date", $this->search_begin_timestamp, $this->search_end_timestamp );
 		}
 		else
 		{
 			if( $this->search_begin_timestamp )
 			{
-				$where_clause[] = "c.comment_date > {$this->search_begin_timestamp}";
+				$where_clause[] = $searchType == 'content' ? "r.reply_date > {$this->search_begin_timestamp}" : "s.status_date > {$this->search_begin_timestamp}";
 			}
 			
 			if( $this->search_end_timestamp )
 			{
-				$where_clause[] = "c.comment_date < {$this->search_end_timestamp}";
+				$where_clause[] = $searchType == 'content' ? "r.reply_date < {$this->search_end_timestamp}" : "s.status_date < {$this->search_end_timestamp}";
 			}
 		}
-		
-		$where_clause[] = "c.comment_approved=1";
 			
 		/* Build and return the string */
 		return implode( " AND ", $where_clause );
 	}
 
-
 	/**
 	 * Builds the where portion of a search string
 	 *
-	 * @access	private
 	 * @param	string	$search_term		The string to use in the search
-	 * @param	bool	$content_title_only	Search only title records
 	 * @return	string
-	 **/
-	private function _buildWhereStatement( $search_term, $content_title_only=false )
+	 */
+	protected function _buildWhereStatement( $search_term )
 	{		
 		/* INI */
 		$where_clause = array();
 				
 		if( $search_term )
 		{
-			if( $content_title_only )
+			switch( IPSSearchRegistry::get('opt.searchType') )
 			{
-				$where_clause[] = "m.members_l_display_name LIKE '%" . mb_strtolower( $search_term ) . "%'";
-			}
-			else
-			{
-				$where_clause[] = "m.members_l_display_name LIKE '%" . mb_strtolower( $search_term ) . "%' OR p.signature LIKE '%{$search_term}%' OR p.pp_about_me LIKE '%{$search_term}%'";
+				case 'both':
+				default:
+					$where_clause[] = "(m.members_l_display_name LIKE '%" . mb_strtolower( $search_term ) . "%' OR p.signature LIKE '%{$search_term}%' OR p.pp_about_me LIKE '%{$search_term}%')";
+				break;
+				
+				case 'titles':
+					$where_clause[] = "m.members_l_display_name LIKE '%" . mb_strtolower( $search_term ) . "%'";
+				break;
+				
+				case 'content':
+					$where_clause[] = "(p.signature LIKE '%{$search_term}%' OR p.pp_about_me LIKE '%{$search_term}%')";
+				break;
+					
 			}
 		}
 
@@ -349,16 +488,15 @@ class search_engine_members extends search_engine
 	/**
 	 * Remap standard columns (Apps can override )
 	 *
-	 * @access	public
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
 		if ( IPSSearchRegistry::get( 'members.searchInKey') == 'comments' )
 		{
-			$column = ( $column == 'member_id' ) ? 'c.comment_by_member_id' : '';
+			$column = ( $column == 'member_id' ) ? 'status_author_id' : '';
 		}
 		
 		return $column;
@@ -367,62 +505,21 @@ class search_engine_members extends search_engine
 	/**
 	 * Returns an array used in the searchplugin's setCondition method
 	 *
-	 * @access	public
 	 * @param	array 	$data	Array of forums to view
 	 * @return	array 	Array with column, operator, and value keys, for use in the setCondition call
-	 **/
+	 */
 	public function buildFilterSQL( $data )
 	{
-		/* INIT */
-		$return = array();
-		
-		/* Set up some defaults */
-		IPSSearchRegistry::set( 'opt.noPostPreview'  , false );
-		IPSSearchRegistry::set( 'opt.onlySearchPosts', false );
-		//IPSSearchRegistry::set( 'members.searchInKey' , 'comments' );
-		
-		/* member specific search */
-		/* Make default search type topics */
-		if( isset( $data ) && is_array( $data ) && count( $data ) )
-		{
-			foreach( $data as $field => $_data )
-			{ 
-				/* CONTENT ONLY */
-				if ( $field == 'searchInKey' AND $_data['searchInKey'] == 'members' )
-				{
-					//IPSSearchRegistry::set( 'member.searchType', 'members' );
-				}
-			}
-		}
-
-		
 		return array();
 	}
 	
 	/**
 	 * Can handle boolean searching
 	 *
-	 * @access	public
 	 * @return	boolean
 	 */
 	public function isBoolean()
 	{
 		return false;
 	}
-	
-	/**
-	 * Perform the viewNewContent search
-	 * Forum Version
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewNewContent()
-	{
-		/* Set up some vars */
-		IPSSearchRegistry::set('set.resultCutToDate', intval( $this->memberData['last_visit'] ) );
-		
-		return parent::viewNewContent();
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/search/form.php b/upload/admin/applications/members/extensions/search/form.php
index 327b1e06..f7c3238d 100644
--- a/upload/admin/applications/members/extensions/search/form.php
+++ b/upload/admin/applications/members/extensions/search/form.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Returns HTML for the form (optional class, not required)
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-04-14 23:16:18 -0400 (Thu, 14 Apr 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 8347 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -45,8 +45,6 @@ class search_form_members
 	/**
 	 * Return sort drop down
 	 * 
-	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function fetchSortDropDown()
@@ -63,13 +61,19 @@ class search_form_members
 	 * Optional function to allow apps to define searchable 'sub-apps'.
 	 * 
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function fetchSortIn()
 	{
-		$array = array( 0 => array( 'members', $this->lang->words['s_msin_members'] ),
-						1 => array( 'comments', $this->lang->words['s_msin_comments'] ) );
+		if( $this->request['do'] == 'user_activity' )
+		{
+			$array = array();
+		}
+		else
+		{
+			$array = array( 0 => array( 'members', $this->lang->words['s_msin_members'] ),
+							1 => array( 'comments', $this->lang->words['s_msin_comments'] ) );
+		}
 		
 		return $array;
 	}
diff --git a/upload/admin/applications/members/extensions/search/format.php b/upload/admin/applications/members/extensions/search/format.php
index 88cdc758..40b59384 100644
--- a/upload/admin/applications/members/extensions/search/format.php
+++ b/upload/admin/applications/members/extensions/search/format.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Formats forum search results
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-06-15 07:22:24 -0400 (Wed, 15 Jun 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 9043 $
+ */
 
 if ( ! defined( 'IN_IPB' ) )
 {
@@ -35,7 +35,6 @@ class search_format_members extends search_format
 	/**
 	 * Parse search results
 	 *
-	 * @access	private
 	 * @param	array 	$r				Search result
 	 * @return	array 	$html			Blocks of HTML
 	 */
@@ -47,35 +46,148 @@ class search_format_members extends search_format
 	/**
 	 * Formats the forum search result for display
 	 *
-	 * @access	public
 	 * @param	array   $search_row		Array of data
 	 * @return	mixed	Formatted content, ready for display, or array containing a $sub section flag, and content
-	 **/
+	 */
 	public function formatContent( $data )
 	{
-		$data['misc'] = unserialize( $data['misc'] );
-		$template     = ( IPSSearchRegistry::get('members.searchInKey') AND IPSSearchRegistry::get('members.searchInKey') != 'comments' ) ? 'memberSearchResult' : 'memberCommentsSearchResult';
+		$data['misc']	= unserialize( $data['misc'] );
+		$template		= IPSSearchRegistry::get('members.searchInKey') == 'comments' ? 'memberCommentsSearchResult' : 'memberSearchResult';
 		
-		return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->$template( $data, IPSSearchRegistry::get('display.onlyTitles') ), 0 );
+		return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->$template( $data, IPSSearchRegistry::get('opt.searchType') == 'titles' ? true : false ), 0 );
 	}
 
 	/**
 	 * Formats / grabs extra data for results
 	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
 	 *
-	 * @access public
 	 * @return array
 	 */
 	public function processResults( $ids )
 	{
-		$rows = array();
-		
-		foreach( $ids as $i => $d )
+		if ( IPSSearchRegistry::get('members.searchInKey') == 'comments' )
 		{
-			$rows[ $i ] = $this->genericizeResults( $d );
+			return $this->processResultsComments( $ids );
+		}
+		else
+		{
+			$rows = array();
+			
+			foreach( $ids as $i => $d )
+			{
+				$rows[ $i ] = $this->genericizeResults( $d );
+			}
+			
+			return $rows;
+		}
+	}
+	
+		/**
+	 * Formats / grabs extra data for results
+	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
+	 *
+	 * @param	array 	$ids			Ids
+	 * @return array
+	 */
+	public function processResultsComments( $ids )
+	{
+		/* INIT */
+		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
+		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
+		$content_title_only = IPSSearchRegistry::get('opt.searchType') == 'content' ? false : true;
+		$members			= array();
+		$results			= array();
+		$statusIds			= array();
+		$replyIds			= IPSSearchRegistry::get('_internal.replyIds');
+		$replyData			= IPSSearchRegistry::get('_internal.replyData');
+		$replies			= array();
+		$sortKey			= '';
+
+		/* Got some? */
+		if ( count( $ids ) )
+		{
+			/* Set vars */
+			IPSSearch::$ask = 'status_date';
+			IPSSearch::$aso = strtolower( $sort_order );
+			IPSSearch::$ast = 'numerical';
+			
+			/* Get the status updates */
+			$this->DB->build( array('select'   => "s.*",
+									'from'	   => array( 'member_status_updates' => 's' ),
+		 							'where'	   => 's.status_id IN( ' . implode( ',', $ids ) . ')',
+									'add_join' => array_merge( array( array( 'select'	=> 'm.member_id as owner_id, m.members_display_name as owner_display_name, m.members_seo_name as owner_seo_name',
+																			 'from'		=> array( 'members' => 'm' ),
+															 				 'where'	=> 'm.member_id=s.status_member_id',
+															 				 'type'		=> 'left' ),
+																	  array( 'select'	=> 'mem.member_id as author_id, mem.members_display_name as author_display_name, mem.members_seo_name as author_seo_name',
+																			 'from'		=> array( 'members' => 'mem' ),
+															 				 'where'	=> 'mem.member_id=s.status_author_id',
+															 				 'type'		=> 'left' ) ) ) ) );
+
+			/* Grab data */
+			$this->DB->execute();
+			
+			/* Grab the results */
+			while( $row = $this->DB->fetch() )
+			{
+				$statusIds[ $row['status_id'] ] = $row;
+			}
+		
+			/* Sort */
+			if ( count( $statusIds ) )
+			{
+				usort( $statusIds, array("IPSSearch", "usort") );
+		
+				foreach( $statusIds as $id => $row )
+				{
+					/* Do we have any reply data? */
+					if ( ! empty( $replyData[ $id ] ) )
+					{
+						$row = array_merge( $row, $replyData[ $id ] );
+					}
+					
+					/* Get author data? */
+					if ( ! empty( $row['status_author_id'] ) )
+					{
+						$members[ $row['status_author_id'] ] = $row['status_author_id'];
+					}
+				
+					if ( ! empty( $row['status_member_id'] ) )
+					{
+						$members[ $row['status_member_id'] ] = $row['status_member_id'];
+					}
+					
+					if ( ! empty( $row['reply_member_id'] ) )
+					{
+						$members[ $row['reply_member_id'] ] = $row['reply_member_id'];
+					}
+					
+					$results[ $row['status_id'] ] = $row;
+				}
+			}
+			
+			/* Need to load members? */
+			if ( count( $members ) )
+			{
+				$mems = IPSMember::load( $members, 'all' );
+				
+				foreach( $results as $id => $r )
+				{
+					$_status_member = IPSMember::buildDisplayData( $mems[ $r['status_member_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
+					$_status_author = IPSMember::buildDisplayData( $mems[ $r['status_author_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
+					
+					$results[ $id ]['status_member'] = $_status_member;
+					$results[ $id ]['status_author'] = $_status_author;
+					
+					if ( ! empty( $r['reply_member_id'] ) )
+					{
+						$results[ $id ]['reply_author'] = IPSMember::buildDisplayData( $mems[ $r['reply_member_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
+					}
+				}
+			}
 		}
 		
-		return $rows;	
+		return $results;
 	}
 	
 	/**
@@ -83,38 +195,38 @@ class search_format_members extends search_format
 	 *
 	 * @param  array  $r
 	 * @return array
-	 **/
+	 */
 	public function genericizeResults( $r )
 	{
-		if ( IPSSearchRegistry::get('members.searchInKey') AND IPSSearchRegistry::get('members.searchInKey') != 'comments' )
+		if ( IPSSearchRegistry::get('members.searchInKey') == 'comments' )
 		{
-			$r['app']                 = 'members';
-			$r['content']             = $r['signature'] . ' ' . $r['pp_about_me'];
-			$r['content_title']       = $r['members_display_name'];
-			$r['updated']             = time();
-			$r['type_2']              = 'profile_view';
-			$r['type_id_2']           = $r['member_id'];
-			$r['misc']                = serialize( array( 
-														'pp_thumb_photo'	=> $r['pp_thumb_photo'],
-														'pp_thumb_width'	=> $r['pp_thumb_width'],
-														'pp_thumb_height'	=> $r['pp_thumb_height']
-												)		);
-		}
-		else
-		{
-			$r['app']                 = 'members';
-			$r['content']             = $r['comment_content'];
-			$r['content_title']       = $r['member_display_name_owner'];
-			$r['updated']             = $r['comment_date'];
-			$r['type_2']              = 'comment_id';
-			$r['type_id_2']           = $r['comment_id'];
-			$r['misc']                = serialize( array(
+			$r['app']				= 'members';
+			$r['content']			= $r['comment_content'];
+			$r['content_title']		= $r['member_display_name_owner'];
+			$r['updated']			= $r['comment_date'];
+			$r['type_2']			= 'comment_id';
+			$r['type_id_2']			= $r['comment_id'];
+			$r['misc']				= serialize( array(
 														'members_display_name' => $r['members_display_name'],
 														'pp_thumb_photo'	   => $r['pp_thumb_photo'],
 														'pp_thumb_width'	   => $r['pp_thumb_width'],
 														'pp_thumb_height'	   => $r['pp_thumb_height']
 												)		);
 		}
+		else
+		{
+			$r['app']				= 'members';
+			$r['content']			= $r['signature'] . ' ' . $r['pp_about_me'];
+			$r['content_title']		= $r['members_display_name'];
+			$r['updated']			= time();
+			$r['type_2']			= 'profile_view';
+			$r['type_id_2']			= $r['member_id'];
+			$r['misc']				= serialize( array( 
+														'pp_thumb_photo'	=> $r['pp_thumb_photo'],
+														'pp_thumb_width'	=> $r['pp_thumb_width'],
+														'pp_thumb_height'	=> $r['pp_thumb_height']
+												)		);
+		}
 
 		return $r;
 	}
diff --git a/upload/admin/applications/members/extensions/search/index.html b/upload/admin/applications/members/extensions/search/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/extensions/search/index.html
+++ b/upload/admin/applications/members/extensions/search/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/sphinxTemplate.php b/upload/admin/applications/members/extensions/sphinxTemplate.php
index a5439403..28fc54d1 100644
--- a/upload/admin/applications/members/extensions/sphinxTemplate.php
+++ b/upload/admin/applications/members/extensions/sphinxTemplate.php
@@ -3,95 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sphinx template file
- * Last Updated: $Date: 2010-06-22 03:39:59 -0400 (Tue, 22 Jun 2010) $
+ * Last Updated: $Date: 2011-06-02 17:57:20 -0400 (Thu, 02 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6566 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8953 $
  * @since		3.0.0
  *
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$appSphinxTemplate	= <<<EOF
-
-############################## --- MEMBERS --- ##############################
-
-source members_search_main : ipb_source_config
-{
-	# Set our forum PID counter
-	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_members_counter', (SELECT max(member_id) FROM <!--SPHINX_DB_PREFIX-->members), '', 0, UNIX_TIMESTAMP() )
-	
-	# Query posts for the main source
-	sql_query		= SELECT m.member_id, m.member_id as search_id, m.member_group_id, m.email, m.joined, m.members_display_name, m.name, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view, \
-							 CASE WHEN pi.authorized_users IS NULL THEN 0 ELSE pi.authorized_users END AS authorized_users, \
-							 CASE WHEN pi.friend_only=0 THEN 0 ELSE m.member_id END AS friend_only, \
-							 CASE WHEN pi.owner_only=0 THEN 0 ELSE m.member_id END AS owner_only \
-					  FROM <!--SPHINX_DB_PREFIX-->members m \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=1 AND pi.perm_type='profile_view' ) \
-					  WHERE m.member_id <= ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_members_counter' )
-	
-	# Fields	
-	sql_attr_uint			= search_id
-	sql_attr_uint			= friend_only
-	sql_attr_uint			= owner_only
-	sql_attr_timestamp		= joined
-	sql_attr_multi			= uint perm_view from field
-	sql_attr_multi			= uint authorized_users from field
-	
-	sql_ranged_throttle	= 0
-}
-
-source members_search_delta : members_search_main
-{
-	# Override the base sql_query_pre
-	sql_query_pre	=
-	
-	# Query posts for the main source
-	sql_query		= SELECT m.member_id, m.member_id as search_id, m.member_group_id, m.email, m.joined, m.members_display_name, m.name, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view, \
-							 CASE WHEN pi.authorized_users IS NULL THEN 0 ELSE pi.authorized_users END AS authorized_users, \
-							 CASE WHEN pi.friend_only=0 THEN 0 ELSE m.member_id END AS friend_only, \
-							 CASE WHEN pi.owner_only=0 THEN 0 ELSE m.member_id END AS owner_only \
-					  FROM <!--SPHINX_DB_PREFIX-->members m \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=1 AND pi.perm_type='profile_view' ) \
-					  WHERE m.member_id > ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_members_counter' )
-}
-
-index members_search_main
-{
-	source			= members_search_main
-	path			= <!--SPHINX_BASE_PATH-->/members_search_main
-	
-	docinfo			= extern
-	mlock			= 0
-	morphology		= none
-	min_word_len	= 2
-	charset_type	= sbcs
-	html_strip		= 0
-	#infix_fields    = members_display_name, email, name
-	#min_infix_len   = 3
-	#enable_star     = 1
-}
-
-index members_search_delta : members_search_main
-{
-   source			= members_search_delta
-   path				= <!--SPHINX_BASE_PATH-->/members_search_delta
-}
-
-
-EOF;
+/* This is just an empty sphinx template to ensure we overwrite outdated ones on upgrade */
+$appSphinxTemplate	= "";
\ No newline at end of file
diff --git a/upload/admin/applications/members/extensions/usercpForms.php b/upload/admin/applications/members/extensions/usercpForms.php
deleted file mode 100644
index 96feff04..00000000
--- a/upload/admin/applications/members/extensions/usercpForms.php
+++ /dev/null
@@ -1,2663 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * User control panel forms
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7007 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class usercpForms_members extends public_core_usercp_manualResolver implements interface_usercp
-{
-	/**
-	 * Tab name
-	 * This can be left blank and the application title will
-	 * be used
-	 *
-	 * @var		string
-	 */
-	public $tab_name = "Профиль";
-	
-	/**
-	 * Default area code
-	 *
-	 * @var		string
-	 */
-	public $defaultAreaCode = 'profileinfo';
-	
-	/**
-	 * OK Message
-	 * This is an optional message to return back to the framework
-	 * to replace the standard 'Settings saved' message
-	 *
-	 * @var		string
-	 */
-	public $ok_message = '';
-	
-	/**
-	 * Hide 'save' button and form elements
-	 * Useful if you have custom output that doesn't
-	 * require it
-	 *
-	 * @var		bool
-	 */
-	public $hide_form_and_save_button = false;
-	
-	/**
-	 * If you wish to allow uploads, set a value for this
-	 *
-	 * @var		integer
-	 */
-	public $uploadFormMax = 0;	
-	
-	/**
-	 * Initiate this module
-	 *
-	 * @return	void
-	 */
-	public function init()
-	{
-		$this->tab_name	= ipsRegistry::getClass('class_localization')->words['tab__members'];
-	}
-	
-	/**
-	 * Return links for this tab
-	 * You may return an empty array or FALSE to not have
-	 * any links show in the tab.
-	 *
-	 * The links must have 'area=xxxxx'. The rest of the URL
-	 * is added automatically.
-	 * 'area' can only be a-z A-Z 0-9 - _
-	 *
-	 * @author	Matt Mecham
-	 * @return	array 		Links
-	 */
-	public function getLinks()
-	{
-		$array = array();
-
-		$array[] = array( 'url'    => 'area=profileinfo',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['change_settings'],
-						  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'profileinfo' ? 1 : 0,
-						  'area'   => 'profileinfo'
-						   );
-		
-		$array[] = array( 'url'    => 'area=aboutme',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['change_aboutme'],
-						  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'aboutme' ? 1 : 0,
-						  'area'   => 'aboutme'
-						 );
-		
-		$sig_restrictions	= explode( ':', $this->memberData['g_signature_limits'] );
-		
-		if ( ! $sig_restrictions[0] OR ( $sig_restrictions[0] AND $this->memberData['g_sig_unit'] ) )
-		{
-			$array[] = array( 'url'    => 'area=signature',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_sig_info'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'signature' ? 1 : 0,
-							  'area'   => 'signature'
-							  );
-		}
-		
-		if ( $this->memberData['g_photo_max_vars'] != "" AND $this->memberData['g_photo_max_vars'] != "::" )
-		{
-			$_bits	= explode( ":", $this->memberData['g_photo_max_vars'] );
-			
-			if( $_bits[0] )
-			{
-				$array[] = array( 'url'    => 'area=photo',
-								  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_change_photo'],
-								  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'photo' ? 1 : 0,
-								  'area'   => 'photo'
-								 );
-			}
-		}
-		
-		if( $this->settings['avatars_on'] )
-		{
-			$array[] = array( 'url'    => 'area=avatar',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_avatar_info'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'avatar' ? 1 : 0,
-							  'area'   => 'avatar'
-						 );
-		}
-	
-		$array[] = array( 'url'    => 'area=ignoredusers',
-						  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_ignore_users'],
-						  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'ignoredusers' ? 1 : 0,
-						  'area'   => 'ignoredusers'
-						 );
-		
-		if (  IPSLib::vkontakte_enabled() === TRUE )
-		{
-			$array[] = array( 'url'    => 'area=vkontakte',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_vkontakte'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'vk' ? 1 : 0,
-							  'area'   => 'vkontakte'
-							 );
-		}
-								
-		if ( IPSLib::fbc_enabled() === TRUE )
-		{
-			$array[] = array( 'url'    => 'area=facebook',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_facebook'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'facebook' ? 1 : 0,
-							  'area'   => 'facebook'
-							 );
-		}
-		
-		if ( IPSLib::twitter_enabled() === TRUE )
-		{
-			$array[] = array( 'url'    => 'area=twitter',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_twitter'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'twitter' ? 1 : 0,
-							  'area'   => 'twitter'
-							 );
-		}
-		
-		if ( $this->memberData['gbw_allow_customization'] AND ! $this->memberData['bw_disable_customization'] )
-		{
-			$array[] = array( 'url'    => 'area=customize',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['m_customize'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'customize' ? 1 : 0,
-							  'area'   => 'customize'
-							 );
-		}
-		
-		if ( $this->memberData['g_is_supmod'] == 1 )
-		{
-			$array[] = array( 'url'    => 'area=mod_ipaddress',
-							  'title'  => ipsRegistry::instance()->getClass('class_localization')->words['menu_ipsearch'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'mod_ipaddress' ? 1 : 0,
-							  'area'   => 'mod_ipaddress'
-							);
-							
-			$array[] = array( 'url'   => 'area=mod_member',
-							  'title' => ipsRegistry::instance()->getClass('class_localization')->words['menu_memsearch'],
-							  'active' => $this->request['tab'] == 'members' && $this->request['area'] == 'mod_member' ? 1 : 0,
-							  'area'   => 'mod_member'
-						 	);
-		}
-		
-		return $array;
-	}
-
-	/**
-	 * Run custom event
-	 *
-	 * If you pass a 'do' in the URL / post form that is not either:
-	 * save / save_form or show / show_form then this function is loaded
-	 * instead. You can return a HTML chunk to be used in the UserCP (the
-	 * tabs and footer are auto loaded) or redirect to a link.
-	 *
-	 * If you are returning HTML, you can use $this->hide_form_and_save_button = 1;
-	 * to remove the form and save button that is automatically placed there.
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Current area
-	 * @return	mixed		html or void
-	 */
-	public function runCustomEvent( $currentArea )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$html = '';
-
-		//-----------------------------------------
-		// What to do?
-		//-----------------------------------------
-		
-		switch( $currentArea )
-		{
-			case 'removephoto':
-				return $this->customEvent_removePhoto();
-			break;
-			case 'removeavatar':
-				return $this->customEvent_removeAvatar();
-			break;
-			case 'removeIgnoredUser':
-				return $this->customEvent_removeIgnoredUser();
-			break;
-			case 'toggleIgnoredUser':
-				return $this->customEvent_toggleIgnoredUser();
-			break;
-			case 'mod_ipaddress':
-			case 'modIpaddress':
-				$html = $this->customEvent_modIPAddresses();
-			break;
-			case 'mod_member':
-				$html = $this->customEvent_modFindUser();
-			break;
-			case 'facebookSync':
-				$html = $this->customEvent_facebookSync();
-			break;
-			case 'facebookRemove':
-				$html = $this->customEvent_facebookRemove();
-			break;
-			case 'vkRemove':
-				$html = $this->customEvent_vkRemove();
-			break;
-			case 'vkLink':
-				$html = $this->customEvent_vkLink();
-			break;
-			case 'twitterRemove':
-				$html = $this->customEvent_twitterRemove();
-			break;
-			case 'facebookLink':
-				$html = $this->customEvent_facebookLink();
-			break;
-		}
-		
-		//-----------------------------------------
-		// Turn off save button
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-		
-		return $html;
-	}
-
-	/**
-	 * Custom Event: Remove Vkontakte link
-	 *
-	 * @access	public
-	 * @return	void  
-	 */
-	public function customEvent_vkRemove()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Okay... 
-		//-----------------------------------------
-		
-		if ( $this->memberData['vk_uid'] )
-		{
-			/* Remove the link */
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'vk_uid' => 0 ) ) );
-		}
-		
-		/* Log the user out */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
-	}
-
-	/**
-	 * Custom Event: Create facebook link
-	 *
-	 * @access	public
-	 * @return	void  
-	 */
-	public function customEvent_vkLink()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		/* Load application */
-		require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-		$vk = new vkontakte_connect( $this->registry );
-		
-		if( !$vk->linkTo( $this->memberData['member_id'] ) )
-		{
-		    $this->registry->getClass('output')->showError( 'fbc_authorization_screwup', 1005.99, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=vkontakte" );
-	}
-
-	/**
-	 * Custom Event: Remove Twitter link
-	 *
-	 * @return	void  
-	 */
-	public function customEvent_twitterRemove()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Okay... 
-		//-----------------------------------------
-		
-		if ( $this->memberData['twitter_id'] )
-		{
-			/* Remove the link */
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'twitter_id' => 0, 'twitter_token' => '', 'twitter_secret' => '' ) ) );
-		}
-		
-		/* Log the user out */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
-	}
-	
-	/**
-	 * Custom Event: Create facebook link
-	 *
-	 * @return	void  
-	 */
-	public function customEvent_facebookLink()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		/* Load application */
-		require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-		$facebook = new facebook_connect( $this->registry );
-		
-		try
-		{
-			$facebook->linkMember( $this->memberData['member_id'] );
-		}
-		catch( Exception $error )
-		{
-			$msg = $error->getMessage();
-		
-			switch( $msg )
-			{
-				default:
-				case 'NO_FACEBOOK_USER_LOGGED_IN':
-				case 'ALREADY_LINKED':
-					$this->registry->getClass('output')->showError( 'fbc_authorization_screwup', 1005.99, null, null, 403 );
-				break;
-			}
-		}
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=facebook&amp;do=show" );
-	}
-	
-	/**
-	 * Custom Event: Remove facebook link
-	 *
-	 * @return	void  
-	 */
-	public function customEvent_facebookRemove()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-		$facebook = new facebook_connect( $this->registry );
-			
-		//-----------------------------------------
-		// Okay...
-		//-----------------------------------------
-		
-		if ( $this->memberData['fb_uid'] )
-		{
-			/* Unauthorize application */
-			$facebook->revokeAuthorization();
-						
-			/* Remove the link */
-			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'fb_uid' => 0, 'fb_emailhash' => '', 'fb_token' => '', 'fb_lastsync' => 0 ) ) );
-		}
-		
-		/* Log the user out */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&module=global&section=login&do=logout&k=" . $this->member->form_hash );
-	}
-	
-	/**
-	 * Custom Event: Sync up facebook
-	 * NO LONGER USED. LEFT FOR FIX CONFIRMATION
-	 *
-	 * @return	void  
-	 */
-	public function customEvent_facebookSync()
-	{
-		if ( IPSLib::fbc_enabled() === TRUE )
-		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-			$facebook = new facebook_connect( $this->registry );
-			
-			try
-			{
-				$facebook->syncMember( $this->memberData );
-			}
-			catch( Exception $error )
-			{
-				$msg = $error->getMessage();
-				
-				switch( $msg )
-				{
-					case 'NOT_LINKED':
-					case 'NO_MEMBER':
-					default:
-						$this->registry->getClass('output')->showError( 'fbc_authorization_screwup', 1005, null, null, 403 );
-					break;
-				}
-			}
-			
-			//-----------------------------------------
-			// Return
-			//-----------------------------------------
-
-			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=facebook&amp;do=show" );
-		}
-	}
-	
-	/**
-	 * Custom Event: Run the find user tool
-	 *
-	 * @return	void  
-	 */
-	public function customEvent_toggleIgnoredUser()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$member_id = intval( $this->request['id'] );
-		$field	   = $this->request['field'];
-		$update    = array();
-		
-		//-----------------------------------------
-		// Grab user
-		//-----------------------------------------
-		
-		$ignoredUser = $this->DB->buildAndFetch( array( 'select' => '*',
-															   'from'   => 'ignored_users',
-															   'where'  => 'ignore_ignore_id=' . $member_id . ' AND ignore_owner_id=' . $this->memberData['member_id'] ) );
-															
-		if ( $ignoredUser['ignore_id'] )
-		{
-			switch( $field )
-			{
-				default:
-				case 'topics':
-					$update = array( 'ignore_topics' => ( $ignoredUser['ignore_topics'] == 1 ) ? 0 : 1 );
-				break;
-				case 'messages':
-					$update = array( 'ignore_messages' => ( $ignoredUser['ignore_messages'] == 1 ) ? 0 : 1 );
-				break;
-			}
-			
-			//-----------------------------------------
-			// Update
-			//-----------------------------------------
-
-			$this->DB->update( 'ignored_users', $update, 'ignore_id=' . $ignoredUser['ignore_id'] );
-			
-			/* Rebuild cache */
-			IPSMember::rebuildIgnoredUsersCache( $this->memberData );
-		}
-	
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-		
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=ignoredusers&amp;do=show" );
-	}
-	
-	/**
-	 * Custom Event: Run the find user tool
-	 *
-	 * @return	string	HTML
-	 */
-	public function customEvent_modFindUser()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$name     = $this->request['name'];
-		$startVal = intval( $this->request['st'] );
-		$sql      = "m.members_l_username LIKE '" . $name . "%' OR m.members_l_display_name LIKE '%" . $name . "%'";
-		
-		if ( $name == "" )
-		{
-			return $this->formModMember($this->lang->words['cp_no_matches']);
-		}
-		
-		//-----------------------------------------
-		// Query the DB for possible matches
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => 'COUNT(member_id) as max', 'from' => 'members m', 'where' => $sql ) );
-		$this->DB->execute();
-		
-		$total_possible = $this->DB->fetch();
-		
-		if ( $total_possible['max'] < 1 )
-		{
-			return $this->formModMember( $this->lang->words['cp_no_matches'] );
-		}
-		
-		$pages = $this->registry->getClass('output')->generatePagination( array( 'totalItems'         => $total_possible['max'],
-														  						 'itemsPerPage'       => 20,
-																				 'currentStartValue'  => $startVal,
-																				 'baseUrl'            => "app=core&amp;module=usercp&amp;tab=members&amp;area==mod_member&amp;do=custom&amp;name=" . $name . "",
-																				)  );
-									  
-		$this->DB->build( array( 'select'	=> 'm.name, m.members_display_name, m.members_seo_name, m.member_id, m.ip_address, m.posts, m.joined, m.member_group_id',
-								   'from'	=> array( 'members' => 'm' ),
-								   'where'	=> $sql,
-								   'order'	=> "m.joined DESC",
-								   'limit'	=> array( $startVal,20 ),
-								   'add_join'	=> array(
-								   						array( 'select'	=> 'g.g_access_cp',
-								   								'from'	=> array( 'groups' => 'g' ),
-								 								'where' => 'm.member_group_id=g.g_id',
-								   								'type'	=> 'left'
-								   							)
-								   						)
-						)		);
-		$this->DB->execute();
-		
-		while( $row = $this->DB->fetch() )
-		{
-			$row['joined']    = $this->registry->getClass( 'class_localization')->getDate( $row['joined'], 'JOINED' );
-			$row['groupname'] = IPSLib::makeNameFormatted( $this->caches['group_cache'][ $row['member_group_id'] ]['g_title'], $row['member_group_id'] );
-							  
-			if ( !$this->memberData['g_access_cp'] and $row['g_access_cp'] )
-			{
-				$row['ip_address'] = '--';
-			}
-			
-			$members[ $row['member_id'] ] = $row;
-		}
-
-		return $this->formModMember( $this->registry->getClass('output')->getTemplate('ucp')->membersModIPFormMembers($pages, $members) );
-	}
-	
-	/**
-	 * Custom Event: Run the IP tool
-	 *
-	 * @return	string	HTML  
-	 */
-	public function customEvent_modIPAddresses()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$exactMatch     = 1;
-		$finalIPString  = trim( $this->request['ip'] );
-		$startVal       = intval ($this->request['st'] );
-		$ipTool			= $this->request['iptool'];
-		$content        = "";
-		
-		//-----------------------------------------
-		// Have permission to match?
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
- 		{
- 			$this->registry->getClass('output')->showError( 'members_tool_supmod', 2020, null, null, 403 );
- 		}
- 		
- 		//-----------------------------------------
-		// Remove trailing periods
-		//-----------------------------------------
-		
-		if ( strstr( $finalIPString, '*' ) )
-		{
-			$exactMatch    = 0;
-			$finalIPString = preg_replace( "/^(.+?)\*(.+?)?$/", "\\1", $finalIPString ).'%';
-		}
-		
-		//-----------------------------------------
-		// H'okay, what have we been asked to do?
-		// (that's a metaphorical "we" in a rhetorical question)
-		//-----------------------------------------
-		
-		if ( $ipTool == 'resolve' )
-		{
-			$resolved = @gethostbyaddr( $finalIPString );
-			
-			if ( $resolved == "" )
-			{
-				return $this->formIPAddresses( $this->registry->output->getTemplate('ucp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
-			}
-			else
-			{
-				return $this->formIPAddresses( $this->registry->output->getTemplate('ucp')->inlineModIPMessage( sprintf($this->lang->words['ip_resolve_result'], $finalIPString, $resolved) ) );
-			}
-		}
-		else if ( $ipTool == 'members' )
-		{
-			if ( $exactMatch == 0 )
-			{
-				$sql = "ip_address LIKE '$finalIPString'";
-			}
-			else
-			{
-				$sql = "ip_address='$finalIPString'";
-			}
-			
-			$this->DB->build( array( 'select' => 'count(member_id) as max', 'from' => 'members', 'where' => $sql ) );
-			$this->DB->execute();
-			
-			$total_possible = $this->DB->fetch();
-			
-			if ($total_possible['max'] < 1)
-			{
-				return $this->formIPAddresses( $this->registry->output->getTemplate('ucp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
-			}
-			
-			$pages = $this->registry->getClass('output')->generatePagination( array( 'totalItems'         => $total_possible['max'],
-															  						 'itemsPerPage'       => 20,
-																					 'currentStartValue'  => $startVal,
-																					 'baseUrl'            => "app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom&amp;iptool=members&amp;ip=" . $this->request['ip'] . "",
-																					) );
-										  
-			
-			
-			if ( !$this->memberData['g_access_cp'] )
-			{
-				$sql .= "AND g.g_access_cp != 1";
-			}
-			
-			$this->DB->build( array( 'select'	=> 'm.name, m.members_display_name, m.members_seo_name, m.member_id, m.ip_address, m.posts, m.joined, m.member_group_id',
-								   'from'	=> array( 'members' => 'm' ),
-								   'where'	=> 'm.' . $sql,
-								   'order'	=> "m.joined DESC",
-								   'limit'	=> array( $startVal,20 ),
-								   'add_join'	=> array(
-								   						array( 'select'	=> 'g.g_access_cp',
-								   								'from'	=> array( 'groups' => 'g' ),
-								   								'type'	=> 'left',
-								   								'where'	=> 'g.g_id=m.member_group_id',
-								   							)
-								   						)
-						)		);
-			$this->DB->execute();
-		
-			while( $row = $this->DB->fetch() )
-			{
-				$row['joined']    = $this->registry->getClass( 'class_localization')->getDate( $row['joined'], 'JOINED' );
-				$row['groupname'] = IPSLib::makeNameFormatted( $this->caches['group_cache'][ $row['member_group_id'] ]['g_title'], $row['member_group_id'] );
-
-				$members[ $row['member_id'] ] = $row;
-			}
-			
-			return $this->formIPAddresses( $this->registry->getClass('output')->getTemplate('ucp')->membersModIPFormMembers($pages, $members) );
-		}
-		else
-		{
-			// Find posts then!
-			if ($exactMatch == 0)
-			{
-				$sql = "p.ip_address LIKE '$finalIPString'";
-			}
-			else
-			{
-				$sql = "p.ip_address='$finalIPString'";
-			}
-			
-			// Get forums we're allowed to view
-			$aforum = array();
-			
-			foreach( $this->registry->getClass('class_forums')->forum_by_id as $data )
-			{
-				if ( IPSMember::checkPermissions('read', $data['id'] ) == TRUE )
-				{
-					$aforum[] = $data['id'];
-				}
-			}
-			
-			if ( count($aforum) < 1)
-			{
-				$this->formIPAddresses( $this->registry->output->getTemplate('ucp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
-				return;
-			}
-			
-			$the_forums	= implode( ",", $aforum);
-			$st			= intval($this->request['st']);
-			
-			$count = $this->DB->buildAndFetch( array(	'select'	=> 'COUNT(*) as total',
-														'from'		=> array( 'posts' => 'p' ),
-														'where'		=> "t.forum_id IN({$the_forums}) AND {$sql}",
-														'add_join'	=> array(
-																			array(
-																					'from'		=> array( 'topics' => 't' ),
-																					'where'		=> 't.tid=p.topic_id',
-																					'type'		=> 'left'
-																				),
-																			)
-											)		);
-											
-			//-----------------------------------------
-			// Do we have any results?
-			//-----------------------------------------
-			
-			if ( !$count['total'] )
-			{
-				return $this->formIPAddresses( $this->registry->output->getTemplate('ucp')->inlineModIPMessage( $this->lang->words['cp_no_matches'] ) );
-			}
-			
-			//-----------------------------------------
-			// Get forum class as we'll need it
-			//-----------------------------------------
-			
-			$classToLoad    = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/app_class_forums.php', 'app_class_forums', 'forums' );
-			$appclassforums = new $classToLoad( $this->registry );
-						
-	 		//-----------------------------------------
-	 		// Pages
-	 		//-----------------------------------------
-	 		
-	 		$pageLinks = $this->registry->getClass('output')->generatePagination( array( 'totalItems'        => $count['total'],
-															   							 'itemsPerPage'      => 10,
-																						 'currentStartValue' => $st,
-																						 'baseUrl'           => "app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom&amp;ip=" . $this->request['ip'] . "&amp;iptool=posts",
-																				 )		);
-			
-			$this->DB->build( array(	'select'	=> 'p.*',
-										'from'		=> array( 'posts' => 'p' ),
-										'where'		=> "t.forum_id IN({$the_forums}) AND {$sql}",
-										'limit'		=> array( $st,10 ),
-										'order'		=> 'pid DESC',
-										'add_join'	=> array(
-															array(
-																	'select'	=> 't.forum_id',
-																	'from'		=> array( 'topics' => 't' ),
-																	'where'		=> 't.tid=p.topic_id',
-																	'type'		=> 'left'
-																),
-															array(
-																	'select'	=> 'm.*',
-																	'from'		=> array( 'members' => 'm' ),
-																	'where'		=> 'm.member_id=p.author_id',
-																	'type'		=> 'left'
-																),
-															array(
-																	'select'	=> 'pp.*',
-																	'from'		=> array( 'profile_portal' => 'pp' ),
-																	'where'		=> 'pp.pp_member_id=m.member_id',
-																	'type'		=> 'left'
-																),
-															array(
-																	'select'	=> 'pf.*',
-																	'from'		=> array( 'pfields_content' => 'pf' ),
-																	'where'		=> 'pf.member_id=m.member_id',
-																	'type'		=> 'left'
-																),
-															)
-											)		);
-			$outer	= $this->DB->execute();
-
-			$results  = array();
-			
-			while ($row = $this->DB->fetch($outer) )
-			{
-				//-----------------------------------------
-				// Parse the member
-				//-----------------------------------------
-				
-				$row	= IPSMember::buildDisplayData( $row, array( 'customFields', 'signature', 'avatar', 'warn' ) );
-				
-				//-----------------------------------------
-				// Parse the post
-				//-----------------------------------------
-		
-				IPSText::getTextClass( 'bbcode' )->parse_smilies			= $row['use_emo'];
-				IPSText::getTextClass( 'bbcode' )->parse_html				= ( $this->registry->class_forums->allForums[ $row['forum_id'] ]['use_html'] and $this->caches['group_cache'][ $row['member_group_id'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_nl2br				= $row['post_htmlstate'] == 2 ? 1 : 0;
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->registry->class_forums->allForums[ $row['forum_id'] ]['use_ibc'];
-				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $row['member_group_id'];
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $row['mgroup_others'];	
-			
-				$row['post']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $row['post'] );
-				
-				$results[] = $row;
-			}
-
-			return $this->formIPAddresses( $this->registry->getClass('output')->getTemplate('ucp')->membersModIPFormPosts( $count['total'], $pageLinks, $results ) );
-				
-			return TRUE;
-		}
-	}
-	
-	/**
-	 * Custom event: Remove ignored user
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function customEvent_removeIgnoredUser()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$removeID = intval( $this->request['id'] );
-		
-		$this->DB->delete( 'ignored_users', 'ignore_owner_id=' . $this->memberData['member_id'] . ' AND ignore_ignore_id=' . $removeID );
- 		
-		/* Rebuild cache */
-		IPSMember::rebuildIgnoredUsersCache( $this->memberData );
-		
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=ignoredusers&amp;do=show" );
-	}
-	
-	/**
-	 * Custom event: Remove avatar
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function customEvent_removeAvatar()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		try
-		{
-			IPSMember::getFunction()->removeAvatar( $this->memberData['member_id'] );
-		
-			$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=avatar&amp;do=show" );
-		}
-		catch( Exception $error )
-		{
-			switch ( $error->getMessage() )
-			{
-				case 'NO_MEMBER_ID':
-					return array( 0 => $this->lang->words['removeav_notexist'] );
-				break;
-				case 'NO_PERMISSION':
-					return array( 0 => $this->lang->words['removeav_noperm'] );
-				break;
-			}
-		}
-	}
-	
-	/**
-	 * Custom event: Remove photo
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	function customEvent_removePhoto()
-	{
-		//-----------------------------------------
-		// Check secure hash...
-		//-----------------------------------------
-		
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'authorization_error', 100, true, null, 403 );
-		}
-		
-		IPSMember::getFunction()->removeUploadedPhotos( $this->memberData['member_id'] );
-		
-		$bwOptions = IPSBWOptions::thaw( $this->memberData['fb_bwoptions'], 'facebook' );
-		$bwOptions['fbc_s_pic']	= 0;
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pp_main_photo'		=> '',
-											  				   	 							'pp_main_width'		=> 0,
-																							'pp_main_height'	=> 0,
-																							'pp_thumb_photo'	=> '',
-																							'pp_thumb_width'	=> 0,
-																							'pp_thumb_height'	=> 0,
-																							'fb_photo'			=> '',
-																							'fb_photo_thumb'	=> '',
-																							'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' )
-																						) ) );
-		
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url']."app=core&amp;module=usercp&amp;tab=members&amp;area=photo&amp;do=show" );
-	}
-
-	/**
-	 * UserCP Form Show
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Current area as defined by 'get_links'
-	 * @param	array		Any errors
-	 * @return	string		Processed HTML
-	 */
-	public function showForm( $current_area, $errors=array() )
-	{
-		//-----------------------------------------
-		// Where to go, what to see?
-		//-----------------------------------------
-
-		switch( $current_area )
-		{
-			default:
-			case 'profileinfo':
-				return $this->formProfileInfo();
-			break;
-			case 'aboutme':
-				return $this->formAboutMe();
-			break;
-			case 'signature':
-				return $this->formSignature();
-			break;
-			case 'photo':
-				return $this->formPhoto();
-			break;
-			case 'avatar':
-				return $this->formAvatar();
-			break;
-			case 'ignoredusers':
-				return $this->formIgnoredUsers();
-			break;
-			case 'mod_ipaddress':
-				return $this->formIPAddresses();
-			break;
-			case 'mod_member':
-				return $this->formModMember();
-			break;
-			case 'vkontakte':
-				return $this->formVkontakte();
-			break;
-			case 'facebook':
-				return $this->formFacebook();
-			break;
-			case 'twitter':
-				return $this->formTwitter();
-			break;
-			case 'customize':
-				return $this->formCustomize();
-			break;
-		}
-	}
-	
-	/**
-	 * Show the customization form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formCustomize( $inlineMsg='' )
-	{
-		/* Allow uploads */
-		$this->uploadFormMax = 10000 * 1024;
-		
-		if ( ! $this->memberData['gbw_allow_customization'] OR $this->memberData['bw_disable_customization'] )
-		{		
-			$this->registry->getClass('output')->showError( 'no_permission', 1005.5 );
-		}
-		
-		/* Grab current options */
-		$options = unserialize( $this->memberData['pp_customization'] );
-		$options = is_array( $options ) ? $options : array();
-		
-		/* Build input */
-		foreach( $options as $k => $v )
-		{
-			$input[ $k ] = ( $this->request[ $k ] ) ? $this->request[ $k ] : $v;
-		}
-		
-		/* Figure out preview URL */
-		if ( $options['type'] == 'url' AND $options['bg_url'] )
-		{
-			$input['_preview'] = $options['bg_url'];
-		}
-		else if ( $options['type'] == 'upload' AND $options['bg_url'] )
-		{
-			$input['_preview'] = $this->settings['upload_url'] . '/' . $options['bg_url'];
-			$input['bg_url']   = '';
-		}
-		
-		/* Show form */
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersProfileCustomize( $options, $input, $inlineMsg );
-	}
-	
-	/**
-	 * Show the twitter form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formTwitter( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		if( !IPSLib::twitter_enabled() )
-		{		
-			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.1 );
-		}
-		
-		//-----------------------------------------
-		// Twitter user logged in?
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-		$twitter = new twitter_connect( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
-		
-		//-----------------------------------------
-		// Thaw bitfield options
-		//-----------------------------------------
-		
-		$bwOptions = IPSBWOptions::thaw( $this->memberData['tc_bwoptions'], 'twitter' );
-		
-		//-----------------------------------------
-		// Merge..
-		//-----------------------------------------
-		
-		if ( is_array( $bwOptions ) )
-		{
-			foreach( $bwOptions as $k => $v )
-			{
-				$this->memberData[ $k ] = $v;
-			}
-		}
-		
-		if( ! $twitter->isConnected() )
-		{
-			$this->hide_form_and_save_button = 1;
-		}
-		
-		$userData = $twitter->fetchUserData();
-		
-		if ( isset( $userData['status']['text'] ) )
-		{	
-			if ( IPS_DOC_CHAR_SET != 'UTF-8' )
-			{
-				$userData['status']['text'] = IPSText::utf8ToEntities( $userData['status']['text'] );
-			}
-		}
-		
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersTwitterConnect( $twitter->isConnected(), $userData );
-	}
-	
-	
-	/**
-	 * Show the vk form
-	 *
-	 * @access	public
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formVkontakte( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$fbUserData = array( 0 => array() );
-		
-        if( !IPSLib::vkontakte_enabled() )
-        {        
-            $this->registry->getClass('output')->showError( 'twitter_disabled', 1005.1 );
-        }
-		
-		//-----------------------------------------
-		// Twitter user logged in?
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-		$vk = new vkontakte_connect( $this->registry );
-		
-		$isLinked = $vk->isLinked();
-		
-		if( ! $isLinked OR $isLinked !== $this->memberData['member_id'] )
-		{
-			$this->hide_form_and_save_button = 1;
-			$isLinked = false;
-		}
-		
-		
-		return $this->registry->getClass('output')->getTemplate('vkontakte')->membersVkontakteConnect( $isLinked );
-	}
-
-	/**
-	 * Show the member form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formFacebook( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		if( !IPSLib::fbc_enabled() )
-		{		
-			$this->registry->getClass('output')->showError( 'fbc_disabled', 1005.2 );
-		}
-		
-		//-----------------------------------------
-		// FB user logged in?
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-		$facebook = new facebook_connect( $this->registry );
-		
-		/* Now get the linked user */
-		$linkedMemberData = IPSMember::load( intval($this->memberData['fb_uid']), 'all', 'fb_uid' );
-		
-		$userData = $facebook->fetchUserData();
-						
-		/* Email */
-		$perms['email']          = $facebook->fetchHasAppPermission( 'email' );
-		
-		/* Publish Stream */
-		$perms['publish_stream'] = $facebook->fetchHasAppPermission( 'publish_stream' );
-		
-		/* Read stream */
-		$perms['read_stream']    = $facebook->fetchHasAppPermission( 'read_stream' );
-		
-		/* Offline access */
-		$perms['offline_access'] = $facebook->fetchHasAppPermission( 'offline_access' );
-		
-		
-		//-----------------------------------------
-		// Thaw bitfield options
-		//-----------------------------------------
-		
-		$bwOptions = IPSBWOptions::thaw( $this->memberData['fb_bwoptions'], 'facebook' );
-		
-		//-----------------------------------------
-		// Merge..
-		//-----------------------------------------
-		
-		if ( is_array( $bwOptions ) )
-		{
-			foreach( $bwOptions as $k => $v )
-			{
-				$this->memberData[ $k ] = $v;
-			}
-		}
-		
-		//-----------------------------------------
-		// Able to update status?
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
-		$this->registry->setClass( 'memberStatus', new $classToLoad( $this->registry ) );
-		
-		$this->registry->memberStatus->setAuthor( $this->memberData );
-		$this->memberData['can_updated_status'] = $this->registry->memberStatus->canCreate();
-		
-		if( ! is_array( $userData ) )
-		{
-			$this->hide_form_and_save_button = 1;
-		}
-		
-		$_updates = $facebook->fetchUserTimeline( $userData['id'], 0, true );
-					
-		/* Got any? */
-		if ( count( $_updates ) )
-		{
-			$update = array_shift( $_updates );
-			
-			if ( count( $update ) AND is_array( $update ) )
-			{
-				$userData['status'] = $update;
-			}
-		}
-		
-		if ( is_array( $userData ) AND $userData['status']['message'] AND IPS_DOC_CHAR_SET != 'UTF-8' )
-		{
-			$userData['status']['message'] = IPSText::utf8ToEntities( $userData['status']['message'] );
-		}
-		
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersFacebookConnect( intval($this->memberData['fb_uid']), $userData, $linkedMemberData, $perms );
-	}
-	
-	/**
-	 * Show the member form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formModMember( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// Can we see this?
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_tool_supmod', 2021, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Remove standard form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
-			
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersModFindUser( $inlineMsg );
-	}
-	
-	/**
-	 * Show the IP Address form
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Any inline message to show
-	 * @return	string		Processed HTML
-	 */
-	public function formIPAddresses( $inlineMsg='' )
-	{
-		//-----------------------------------------
-		// Can we see this?
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_is_supmod'] )
- 		{
- 			$this->registry->getClass('output')->showError( 'members_tool_supmod', 2022, null, null, 403 );
- 		}
-
-		//-----------------------------------------
-		// Remove standard form stuff
-		//-----------------------------------------
-		
-		$this->hide_form_and_save_button = 1;
- 		
- 		return $this->registry->getClass('output')->getTemplate('ucp')->membersModIPForm( $this->request['ip'], $inlineMsg );
-	}
-	
-	/**
-	 * Show the ignored users
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formIgnoredUsers()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$final_users  = array();
- 		$temp_users   = array();
- 		$uid          = intval( $this->request['uid'] );
-		$ignoredUsers = array();
-		
- 		//-----------------------------------------
- 		// Do we have incoming?
- 		//-----------------------------------------
- 		
- 		if ( $uid )
- 		{
- 			$newmem = IPSMember::load( $uid );
-
- 			$this->request[ 'newbox_1'] =  $newmem['members_display_name'] ;
- 		}
- 		
- 		//-----------------------------------------
- 		// Get ignored users
- 		//-----------------------------------------
- 		
-		$this->DB->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => 'ignore_owner_id=' . $this->memberData['member_id'] ) );
- 		$this->DB->execute();
-
-		while( $row = $this->DB->fetch() )
-		{
-			$ignoredUsers[ $row['ignore_ignore_id'] ] = $row;
-		}
- 		
- 		//-----------------------------------------
- 		// Get members and check to see if they've
- 		// since been moved into a group that cannot
- 		// be ignored
- 		//-----------------------------------------
- 		
- 		foreach( $ignoredUsers as $_id => $data )
- 		{
- 			if ( intval($_id) )
- 			{
- 				$temp_users[] = $_id;
- 			}
- 		}
- 		
- 		if ( count($temp_users) )
- 		{
- 			$members = IPSMember::load( $temp_users, 'all' );
-		
- 			foreach( $members as $m )
- 			{
- 				$m['g_title'] = IPSLib::makeNameFormatted( $this->caches['group_cache'][ $m['member_group_id'] ]['g_title'], $m['member_group_id'] );
- 				
- 				$final_users[ $m['member_id'] ] = IPSMember::buildDisplayData( $m );
-				$final_users[ $m['member_id'] ]['ignoreData'] = $ignoredUsers[ $m['member_id'] ];
- 			}
- 		}
-
- 		$this->request['newbox_1'] = $this->request['newbox_1'] ? $this->request['newbox_1'] : '';
- 		
- 		return $this->registry->getClass('output')->getTemplate('ucp')->membersIgnoredUsersForm( $final_users );
-	}
-
-	/**
-	 * Show the avatar page
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formAvatar()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $this->memberData['member_id'], 'extendedProfile,customFields,groups' );
-		
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		if ( ! $member['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1021, null, null, 403 );
-		}
-		
-		if( ! $this->settings['avatars_on'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1030, null, null, 403 );
-		}
-			 	
-		//-----------------------------------------
- 		// Organise the dimensions
- 		//-----------------------------------------
- 		
- 		if ( strpos( $this->memberData['avatar_size'], "x" ) )
- 		{
- 			list( $this->settings['currentWidth'], $this->settings['currentHeight'] ) = explode( "x", strtolower($member['avatar_size'] ) );
-		}
-		
- 		list( $this->settings['maxWidth'], $this->settings['maxHeight'] ) = explode( "x", strtolower($this->settings['avatar_dims'] ) );
- 		list( $w, $h ) = explode ( "x", strtolower($this->settings['avatar_def']) );
- 	
- 		//-----------------------------------------
- 		// Get the avatar gallery
- 		//-----------------------------------------
- 		
-		$av_categories  = array_merge( array( 0 => array( 0, '&lt; ' . $this->lang->words['av_root'] . ' &gt;' ) ), IPSMember::getFunction()->getHostedAvatarCategories() );
- 	
- 		//-----------------------------------------
- 		// Get the avatar gallery selected
- 		//-----------------------------------------
- 		
- 		$url_avatar = "http://";
- 		 		
- 		$avatar_type = "na";
- 		
- 		if ( ($member['avatar_location'] != "") and ($member['avatar_location'] != "noavatar") )
- 		{
- 			if ( ! $member['avatar_type'] )
- 			{
-				if ( preg_match( "/^upload:/", $member['avatar'] ) )
-				{
-					$avatar_type = "upload";
-				}
-				else if ( ! preg_match( "/^http/i", $member['avatar'] ) )
-				{
-					$avatar_type = "local";
-				}
-				else
-				{
-					$url_avatar  = $member['avatar'];
-					$avatar_type = "url";
-				}
-			}
-			else
-			{
-				switch ( $member['avatar_type'] )
-				{
-					case 'upload':
-						$avatar_type = 'upload';
-					break;
-					case 'url':
-						$avatar_type = 'url';
-						$url_avatar  = $member['avatar_location'];
-					break;
-					case 'gravatar':
-						$avatar_type = 'gravatar';
-					break;
-					
-					default:
-						$avatar_type = 'local';
-					break;
-				}
-			}
- 		}
- 		
- 		//-----------------------------------------
- 		// Rest of the form..
- 		//-----------------------------------------
- 		
- 		if ( $member['g_avatar_upload'] == 1 )
- 		{
- 			$this->uploadFormMax = 9000000;
-		}
-		
-		//-----------------------------------------
-		// Force a form action?
-		//-----------------------------------------
-		
-		$is_reset = 0;
-		
-		if ( $this->settings['upload_domain'] )
-		{
-			$is_reset = 1;
-			$original = $this->settings['base_url'];
-			
-			if( $this->member->session_type == 'cookie' )
-			{
-				$this->settings['base_url'] = $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?';
-			}
-			else
-			{
-				$this->settings['base_url'] = $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?s='.$this->member->session_id .'&amp;';
-			}
-		}
-		
-		//-----------------------------------------
- 		// If yes, show little thingy at top
- 		//-----------------------------------------
-
- 		$this->lang->words['av_allowed_files'] = sprintf($this->lang->words['av_allowed_files'], implode (' .', explode( "|", $this->settings['avatar_ext'] ) ) );
-
- 		$return = $this->registry->getClass('output')->getTemplate('ucp')->memberAvatarForm( array( 'member'				=> $member,
-																									'avatar_categories'		=> $av_categories,
-																									'current_url_avatar'	=> $url_avatar,
-																									'current_avatar_image'	=> IPSMember::buildAvatar( $member, 1, 1 ),
-																									'current_avatar_type'	=> $this->lang->words['av_t_'.$avatar_type],
-																									'current_avatar_dims'	=> $avatar_type != 'gravatar' ? $member['avatar_size'] == "x" ? "" : $member['avatar_size'] : ''
-																							)		);
-		
-		//-----------------------------------------
-		// Reset forced form action?
-		//-----------------------------------------
-		
-		if ( $is_reset )
-		{
-			$this->settings['base_url'] = $original;
-		}
-		
-		return $return;
-	}
-	
-	/**
-	 * Show the photo page
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formPhoto()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		list($p_max, $p_width, $p_height) = explode( ":", $this->memberData['g_photo_max_vars'] );
-		$p_w       = "";
-		$p_h       = "";
-		$cur_photo = "";
-		$rand      = urlencode( microtime() );
-		
-		//-----------------------------------------
-		// Load all data
-		//-----------------------------------------
-		
-		$member = IPSMember::buildDisplayData( IPSMember::load( $this->memberData['member_id'], 'all' ) );
-		
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1022, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Not allowed a photo
-		//-----------------------------------------
-		
- 		if ( $this->memberData['g_photo_max_vars'] == "" or $this->memberData['g_photo_max_vars'] == "::" OR !$p_max )
- 		{
- 			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1023, null, null, 403 );
- 		}
- 		
- 		//-----------------------------------------
- 		// SET DIMENSIONS
- 		//-----------------------------------------
- 		
- 		$this->lang->words['pph_max']  = sprintf( $this->lang->words['pph_max'], $p_max );
- 		$this->lang->words['pph_max'] .= sprintf( $this->lang->words['pph_max2'], $p_width, $p_height );
- 		
- 		$show_size = "(".$member['pp_main_width'] .' x ' . $member['pp_main_height'].")";
- 		
- 		//-----------------------------------------
- 		// TYPE?
- 		//-----------------------------------------
- 		
- 		if ( $member['pp_main_photo'] )
- 		{
- 			$cur_photo = "<img src='".$member['pp_main_photo'].'?__rand='. $rand . "' width='". $member['pp_main_width'] ."' height='". $member['pp_main_height'] ."' alt='" . $this->lang->words['pph_title'] . "' />";
- 		}
- 		
-		//-----------------------------------------
-		// Force a form action?
-		//-----------------------------------------
-		
-		if ( $this->settings['upload_domain'] )
-		{
-			if( $member->session_type == 'cookie' )
-			{
-				$this->settings[ 'base_url'] =  $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?' ;
-			}
-			else
-			{
-				$this->settings[ 'base_url'] =  $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?s='.$this->member->session_id .'&amp;' ;
-			}
-		}
-		 		
- 		//-----------------------------------------
- 		// SHOW THE FORM
- 		//-----------------------------------------
- 		
-		$this->uploadFormMax = $p_max*1024;
-		
- 		return $this->registry->getClass('output')->getTemplate('ucp')->membersPhotoForm( $cur_photo, $show_size );
-	}
-	
-	/**
-	 * Show the signature page
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formSignature()
-	{
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		$sig_restrictions = explode( ':', $this->memberData['g_signature_limits'] );
-		
-		if ( ! $this->memberData['g_edit_profile'] OR ( $sig_restrictions[0] AND ! $this->memberData['g_sig_unit'] ) )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1024, null, null, 403 );
-		}
-		
-		/* Signature Limits */
-	 	if ( $sig_restrictions[0] AND $this->memberData['g_sig_unit'] )
-		{
-			if ( $this->memberData['gbw_sig_unit_type'] )
-			{
-				/* days */
-				if ( $this->memberData['joined'] > ( time() - ( 86400 * $this->memberData['g_sig_unit'] ) ) )
-				{
-					$this->hide_form_and_save_button = 1;
-					$form['_noPerm'] = sprintf( $this->lang->words['sig_group_restrict_date'], $this->lang->getDate( $this->memberData['joined'] + ( 86400 * $this->memberData['g_sig_unit'] ), 'long' ) );
-				}
-			}
-			else
-			{
-				/* Posts */
-				if ( $this->memberData['posts'] < $this->memberData['g_sig_unit'] )
-				{
-					$this->hide_form_and_save_button = 1;
-					$form['_noPerm'] = sprintf( $this->lang->words['sig_group_restrict_posts'], $this->memberData['g_sig_unit'] - $this->memberData['posts'] );
-				}
-			}
-			
-			if( $form['_noPerm'] )
-			{
-				return $this->registry->getClass('output')->getTemplate('ucp')->membersSignatureFormError( $form );
-			}
-		}
-	
- 		//-----------------------------------------
- 		// Set max length
- 		//-----------------------------------------
- 		
- 		$this->lang->words['the_max_length'] = $this->settings['max_sig_length'] ? $this->settings['max_sig_length'] : 0;
-		
- 		$current_sig	= '';
- 		$t_sig			= '';
- 		
-		//-----------------------------------------
-		// Unconvert for editing
-		//-----------------------------------------
-
-		if( $this->memberData['signature'] )
-		{
-			if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-			{
-				$t_sig = IPSText::getTextClass( 'bbcode' )->convertForRTE( $this->memberData['signature'] );
-			}
-			else
-			{
-				IPSText::getTextClass( 'bbcode' )->parse_smilies	= 0;
-				IPSText::getTextClass( 'bbcode' )->parse_html		= $this->settings['sig_allow_html'];
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode		= $this->settings['sig_allow_ibc'];
-				IPSText::getTextClass( 'bbcode' )->parsing_section	= 'signatures';
-				
-				$t_sig = IPSText::getTextClass( 'bbcode' )->preEditParse( $this->memberData['signature'] );
-			}
-		}
-		
-		$this->lang->words['override']    = 1;
-
-		//-----------------------------------------
-		// Show
-		//-----------------------------------------
-		
-		if( $this->memberData['signature'] )
-		{
-			IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings[ 'sig_allow_ibc' ];
-			IPSText::getTextClass('bbcode')->parse_smilies				= 0;
-			IPSText::getTextClass('bbcode')->parse_html					= $this->settings[ 'sig_allow_html' ];
-			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-			IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
-			
-			$current_sig	= IPSText::getTextClass('bbcode')->preDisplayParse( $this->memberData['signature'] );
-		}
-		
-		IPSText::getTextClass( 'editor' )->remove_emoticons = 1;
-
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersSignatureForm( $current_sig, IPSText::getTextClass( 'editor' )->showEditor( $t_sig, 'Post' ), $sig_restrictions );
-	}
-	
-	/**
-	 * Show the about me page
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formAboutMe()
-	{
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1025, null, null, 403 );
-		}
-			 	
-	 	$aboutme = $this->DB->buildAndFetch( array( 'select' => 'pp_about_me', 'from' => 'profile_portal', 'where' => 'pp_member_id=' . $this->memberData['member_id'] ) );
-	 	
-		//-----------------------------------------
-		// Unconvert for editing
-		//-----------------------------------------
-		
-		$am_text	='';
-		
-		if( $aboutme['pp_about_me'] )
-		{
-			if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-			{
-				$am_text = IPSText::getTextClass( 'bbcode' )->convertForRTE( $aboutme['pp_about_me'] );
-			}
-			else
-			{
-				IPSText::getTextClass( 'bbcode' )->parse_html        = intval($this->settings['aboutme_html']);
-				IPSText::getTextClass( 'bbcode' )->parse_nl2br       = 1;
-				IPSText::getTextClass( 'bbcode' )->parse_smilies     = $this->settings['aboutme_emoticons'];
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode      = $this->settings['aboutme_bbcode'];
-				IPSText::getTextClass( 'bbcode' )->parsing_section   = 'aboutme';
-				
-				$am_text = IPSText::getTextClass( 'bbcode' )->preEditParse( $aboutme['pp_about_me'] );
-			}
-		}
-		
-		//-----------------------------------------
- 		// Format for preview
- 		//-----------------------------------------
- 		
- 		if( $aboutme['pp_about_me'] )
- 		{
-			IPSText::getTextClass( 'bbcode' )->parse_html				= intval($this->settings['aboutme_html']);
-			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_smilies			= $this->settings['aboutme_emoticons'];
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= $this->settings['aboutme_bbcode'];
-			IPSText::getTextClass( 'bbcode' )->parsing_section	 		= 'aboutme';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
-			
-			$aboutme['pp_about_me'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $aboutme['pp_about_me'] );
-		}
-
-		//-----------------------------------------
-		// Show
-		//-----------------------------------------
-		
-		return $this->registry->getClass('output')->getTemplate('ucp')->membersAboutMeForm( $aboutme['pp_about_me'], IPSText::getTextClass( 'editor' )->showEditor( $am_text, 'Post' ) );
-	}
-	
-	/**
-	 * Show the profile information
-	 *
-	 * @author	Matt Mecham
-	 * @return	string		Processed HTML
-	 */
-	public function formProfileInfo()
-	{
-		/* Load Lang File */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
-		
-		/* INIT */
-	 	$required_output = "";
-		$optional_output = "";
-		
-		/* Permission Check */
-		if( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1026, null, null, 403 );
-		}
-		
-		/* Format the birthday drop boxes.. */
-		$date = getdate();
-		
-		$day  = array();
-		$mon  = array();
-		$year = array();
-		
-		/* Build the day options */
-		$day[] = array( '0', '--' );
-		for ( $i = 1 ; $i < 32 ; $i++ )
-		{
-			$day[] = array( $i, $i );			
-		}
-		
-		/* Build the month options */
-		$mon[] = array( '0', '--' );
-		for( $i = 1 ; $i < 13 ; $i++ )
-		{
-			$mon[] = array( $i, $this->lang->words['M_' . $i ] );
-		}
-		
-		/* Build the years options */
-		$i = $date['year'] - 1;
-		$j = $date['year'] - 100;
-		
-		$year[] = array( '0', '--' );
-		for( $i ; $j < $i ; $i-- )
-		{
-			$year[] = array( $i, $i );
-		}
-	
-		/* Custom Fields */
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields      = new $classToLoad();
-		
-		$fields->member_data = $this->member->fetchMemberData();
-		$fields->initData( 'edit' );
-		$fields->parseToEdit();
-		
-		if ( count( $fields->out_fields ) )
-		{
-			foreach( $fields->out_fields as $id => $data )
-	    	{
-	    		if ( $fields->cache_data[ $id ]['pf_not_null'] == 1 )
-				{
-					$ftype = 'required_output';
-				}
-				else
-				{
-					$ftype = 'optional_output';
-				}
-
-				${$ftype} .= $this->registry->getClass('output')->getTemplate('ucp')->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $data, $id );
-	    	}
-		}
-
-		/* Build and return the form */
-		$template = $this->registry->getClass('output')->getTemplate('ucp')->membersProfileForm( $required_output, $optional_output, $day, $mon, $year );
-
-		return $template;
-	}
-	
-	/**
-	 * UserCP Form Check
-	 *
-	 * @author	Matt Mecham
-	 * @param	string		Current area as defined by 'get_links'
-	 * @return	string		Processed HTML
-	 */
-	public function saveForm( $current_area )
-	{
-		//-----------------------------------------
-		// Where to go, what to see?
-		//-----------------------------------------
-
-		switch( $current_area )
-		{
-			default:
-			case 'profileinfo':
-				return $this->saveProfileInfo();
-			break;
-			case 'aboutme':
-				return $this->saveAboutMe();
-			break;
-			case 'signature':
-				return $this->saveSignature();
-			break;
-			case 'photo':
-				return $this->savePhoto();
-			break;
-			case 'avatar':
-				return $this->saveAvatar();
-			break;
-			case 'ignoredusers':
-				return $this->saveIgnoredUsers();
-			break;
-			case 'facebook':
-				return $this->saveFacebook();
-			break;
-			case 'twitter':
-				return $this->saveTwitter();
-			break;
-			case 'customize':
-				return $this->saveCustomize();
-			break;
-		}
-	}
-	
-	/**
-	 * UserCP Save Form: Customize
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveCustomize()
-	{
-		/* Init */
-		$errors   = array();
-		$custom   = array();
-		$bg_nix   = trim( $this->request['bg_nix'] );
-		$kill_img = trim( $this->request['kill_img'] );
-		$bg_url   = trim( $this->request['bg_url'] );
-		$bg_tile  = intval( $this->request['bg_tile'] );
-		$bg_color = trim( str_replace( '#', '', $this->request['bg_color'] ) );
-		
-		/* reset custom */
-		$custom   = unserialize( $this->memberData['pp_customization'] );
-		
-		/* Bug #21578 */
-		if( ! $bg_color && $custom['bg_color'] )
-		{
-			$bg_color = $custom['bg_color'];
-		}
-		
-		/* Delete all? */
-		if ( $bg_nix )
-		{
-			/* reset array */
-			$custom = array( 'bg_url' => '', 'type' => '', 'bg_color' => '', 'bg_tile' => '' );
-			
-			/* remove bg images */
-			IPSMember::getFunction()->removeUploadedBackgroundImages( $this->memberData['member_id'] );
-		}
-		/* Delete imgs only */
-		else if ( $kill_img )
-		{
-			/* reset array */
-			$custom = array( 'bg_url' => '', 'type' => ( $bg_color ) ? 'color' : '' );
-			
-			/* remove bg images */
-			IPSMember::getFunction()->removeUploadedBackgroundImages( $this->memberData['member_id'] );
-		}
-		else
-		{
-			if ( $bg_url AND $this->memberData['gbw_allow_url_bgimage'] )
-			{
-				/* Check */
-				if ( ! stristr( $bg_url, 'http://' ) OR preg_match( '#\(\*#', $bg_url ) )
-				{
-					return array( 0 => $this->lang->words['pp_bgimg_url_bad'] );
-				}
-				
-				$image_extension = strtolower( pathinfo( $bg_url, PATHINFO_EXTENSION ) );
-				
-				if( ! in_array( $image_extension, array( 'png', 'jpg', 'gif', 'jpeg'  ) ) )
-				{
-					return array( 0 => $this->lang->words['pp_bgimg_ext_bad'] );
-				}
-				
-				$custom['bg_url'] = $bg_url;
-				$custom['type']   = 'url';
-			}
-			else if ( $this->memberData['gbw_allow_upload_bgimage'] )
-			{
-				/* Load more lang strings */
-				$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
-		
-				/* Upload img */
-				$img = IPSMember::getFunction()->uploadBackgroundImage();
-		
-				if ( $img['status'] == 'fail' )
-				{
-					return array( 0 => $this->lang->words[ 'pp_' . $img['error'] ] );
-				}
-				else if ( $img['final_location'] )
-				{
-					$custom['bg_url'] = $img['final_location'];
-					$custom['type']   = 'upload';
-				}
-			}
-		}
-		
-		/* BG color */
-		$custom['bg_color'] = $bg_nix ? '' : IPSText::alphanumericalClean( $bg_color );
-		
-		/* Tile */
-		$custom['bg_tile']  = $bg_nix ? '' : $bg_tile;
-		
-		/* Save it */
-		if ( ! $this->memberData['bw_disable_customization'] AND $this->memberData['gbw_allow_customization'] )
-		{
-			IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pp_customization' => serialize( $custom ) ) ) );
-		}
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: Twitter
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveTwitter()
-	{
-		if( !IPSLib::twitter_enabled() )
-		{		
-			$this->registry->getClass('output')->showError( 'twitter_disabled', 1005.2 );
-		}
-		
-		//-----------------------------------------
-		// Data
-		//-----------------------------------------
-		
-		$toSave = IPSBWOptions::thaw( $this->memberData['tc_bwoptions'], 'twitter' );
-		
-		//-----------------------------------------
-		// Loop and save... simple
-		//-----------------------------------------
-		
-		foreach( array( 'tc_s_pic', 'tc_s_avatar', 'tc_s_status', 'tc_s_aboutme', 'tc_s_bgimg', 'tc_si_status' ) as $field )
-		{
-			$toSave[ $field ] = intval( $this->request[ $field ] );
-		}
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'tc_bwoptions' => IPSBWOptions::freeze( $toSave, 'twitter' ) ) ) );
-		
-		//-----------------------------------------
-		// Now sync
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-		$twitter = new twitter_connect( $this->registry, $this->memberData['twitter_token'], $this->memberData['twitter_secret'] );
-		
-		try
-		{
-			$twitter->syncMember( $this->memberData );
-		}
-		catch( Exception $error )
-		{
-			$msg = $error->getMessage();
-			
-			switch( $msg )
-			{
-				case 'NOT_LINKED':
-				case 'NO_MEMBER':
-				break;
-			}
-		}
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: Facebook
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveFacebook()
-	{
-		if( !IPSLib::fbc_enabled() )
-		{		
-			$this->registry->getClass('output')->showError( 'fbc_disabled', 1005 );
-		}
-		
-		//-----------------------------------------
-		// Data
-		//-----------------------------------------
-		
-		$toSave = IPSBWOptions::thaw( $this->memberData['members_bitoptions'], 'members' );
-		
-		//-----------------------------------------
-		// Loop and save... simple
-		//-----------------------------------------
-		
-		foreach( array( 'fbc_s_pic', 'fbc_s_avatar', 'fbc_s_status', 'fbc_s_aboutme', 'fbc_si_status' ) as $field )
-		{
-			$toSave[ $field ] = intval( $this->request[ $field ] );
-		}
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'fb_bwoptions' => IPSBWOptions::freeze( $toSave, 'facebook' ) ) ) );
-		
-		//-----------------------------------------
-		// Now sync
-		//-----------------------------------------
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-		$facebook = new facebook_connect( $this->registry );
-		
-		try
-		{
-			$facebook->syncMember( $this->memberData );
-		}
-		catch( Exception $error )
-		{
-			$msg = $error->getMessage();
-			
-			switch( $msg )
-			{
-				case 'NOT_LINKED':
-				case 'NO_MEMBER':
-				break;
-			}
-		}
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: Ignore Users
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveIgnoredUsers()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$newName = $this->request['newbox_1'];
-		
-		if ( ! trim( $newName ) )
-		{
-			return array( 0 => $this->lang->words['ignoreuser_nomem'] );
-		}
-		
-		//-----------------------------------------
-		// Load
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $newName, 'core', 'displayname' );
-		
-		if ( ! $member['member_id'] )
-		{
-			return array( 0 => $this->lang->words['ignoreuser_nomem'] );
-		}
-		
-		if ( $member['member_id'] == $this->memberData['member_id'] )
-		{
-			return array( 0 => $this->lang->words['ignoreuser_cannot'] );
-		}
-		
-		//-----------------------------------------
-		// Already ignoring?
-		//-----------------------------------------
-		
-		$ignoreMe = $this->DB->buildAndFetch( array( 
-													'select' => '*',
-													'from'   => 'ignored_users',
-													'where'  => 'ignore_owner_id=' . $this->memberData['member_id'] . ' AND ignore_ignore_id=' . $member['member_id'] 
-											)	 );
-		
-		if ( $ignoreMe['ignore_id'] )
-		{
-			return array( 0 => $this->lang->words['ignoreuser_already'] );
-		}
-		
-		//-----------------------------------------
-		// Can we ignore them?
-		//-----------------------------------------
-		
-		if ( $member['_canBeIgnored'] !== TRUE )
-		{
-			return array( 0 => $this->lang->words['ignoreuser_cannot'] );
-	 	}
-
-		//-----------------------------------------
-		// Add it
-		//-----------------------------------------
-
-		$this->DB->insert( 'ignored_users', array( 
-													'ignore_owner_id'  => $this->memberData['member_id'],
-													'ignore_ignore_id' => $member['member_id'],
-													'ignore_messages'  => isset( $this->request['ignore_messages'] ) && $this->request['ignore_messages'] ? 1 : 0,
-													'ignore_topics'    => isset( $this->request['ignore_topics'] ) && $this->request['ignore_topics'] ? 1 : 0,
-												) 
-						);
-						
-		/* Rebuild cache */
-		IPSMember::rebuildIgnoredUsersCache( $this->memberData );
-		
-		return TRUE;
-	}
-	
-	
-	/**
-	 * UserCP Save Form: Avatar
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveAvatar()
-	{
-		if( ! $this->settings['avatars_on'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1031, null, null, 403 );
-		}
-		
-		try
-		{
-			IPSMember::getFunction()->saveNewAvatar( $this->memberData['member_id'] );
-		}
-		catch( Exception $error )
-		{
-			$msg = $error->getMessage();
-			
-			switch( $msg )
-			{
-				case 'NO_MEMBER_ID':
-					return array( 0 => $this->lang->words['saveavatar_nomem'] );
-				break;
-				case 'NO_PERMISSION':
-					return array( 0 => $this->lang->words['saveavatar_noperm'] );
-				break;
-				case 'UPLOAD_NO_IMAGE':
-					return array( 0 => $this->lang->words['saveavatar_nofile'] );
-				break;
-				case 'UPLOAD_INVALID_FILE_EXT':
-					return array( 0 => $this->lang->words['saveavatar_noimg'] );
-				break;
-				case 'UPLOAD_TOO_LARGE':
-					return array( 0 => $this->lang->words['saveavatar_toobig'] );
-				break;
-				case 'UPLOAD_CANT_BE_MOVED':
-					return array( 0 => $this->lang->words['saveavatar_chmod'] );
-				break;
-				case 'UPLOAD_NOT_IMAGE':
-					return array( 0 => $this->lang->words['saveavatar_badimg'] );
-				break;
-				case 'NO_AVATAR_TO_SAVE':
-					return array( 0 => $this->lang->words['saveavatar_noimg2'] );
-				break;
-				case 'INVALID_FILE_EXT':
-					return array( 0 => $this->lang->words['saveavatar_badimgext'] );
-				break;
-			}
-		}
-	}
-	
-	/**
-	 * UserCP Save Form: Photo
-	 *
-	 * @return	array	Errors
-	 */
-	public function savePhoto()
-	{
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-	
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1027, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Load lang file
-		//-----------------------------------------
-		
-		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
-		
-		//-----------------------------------------
-		// Do upload...
-		//-----------------------------------------
-	
-		$photo = IPSMember::getFunction()->uploadPhoto();
-
-		if ( $photo['status'] == 'fail' )
-		{
-			return array( 0 => $this->lang->words[ 'pp_' . $photo['error'] ] );
-		}
-		else
-		{
-			IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pp_main_photo'   => $photo['final_location'],
-												  				   	 						'pp_main_width'   => intval($photo['final_width']),
-																						   	'pp_main_height'  => intval($photo['final_height']),
-																							'pp_thumb_photo'  => $photo['t_final_location'],
-																							'pp_thumb_width'  => intval($photo['t_final_width']),
-																							'pp_thumb_height' => intval($photo['t_final_height']) ) ) );
-		}
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: Signature
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveSignature()
-	{
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-
-		$sig_restrictions	= explode( ':', $this->memberData['g_signature_limits'] );
-		
-		if ( ! $this->memberData['g_edit_profile'] OR ( $sig_restrictions[0] AND ! $this->memberData['g_sig_unit'] ) )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 1028, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Check length
-		//-----------------------------------------
-		
-		if ( (IPSText::mbstrlen($_POST['Post']) > $this->settings['max_sig_length']) and ($this->settings['max_sig_length']) )
-		{
-			$this->registry->getClass('output')->showError( 'members_sig_too_long', 1029, null, null, 403 );
-		}
-
-		//-----------------------------------------
-		// Post process the editor
-		// Now we have safe HTML and bbcode
-		//-----------------------------------------
-		
-		$signature = IPSText::getTextClass( 'editor' )->processRawPost( 'Post' );
-		
-		//-----------------------------------------
-		// Parse post
-		//-----------------------------------------
-		
-		IPSText::getTextClass( 'bbcode' )->parse_smilies    = 0;
-		IPSText::getTextClass( 'bbcode' )->parse_html       = intval($this->settings['sig_allow_html']);
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode     = intval($this->settings['sig_allow_ibc']);
-		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'signatures';
-
-		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
-		$testSignature	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );		
-
-		if (IPSText::getTextClass( 'bbcode' )->error != "")
-		{
-			$this->lang->loadLanguageFile( array( 'public_post' ), 'forums' );
-			
-			$this->registry->getClass('output')->showError( IPSText::getTextClass( 'bbcode' )->error, 10210 );
-		}
-		
-		//-----------------------------------------
-		// Signature restrictions...
-		//-----------------------------------------
-		
-		$sig_errors	= array();
-		
-		//-----------------------------------------
-		// Max number of images...
-		//-----------------------------------------
-		
-		if( isset($sig_restrictions[1]) and $sig_restrictions[1] !== '' )
-		{
-			if( substr_count( mb_strtolower($signature), "[img]" ) > $sig_restrictions[1] )
-			{
-				$sig_errors[] = sprintf( $this->lang->words['sig_toomanyimages'], $sig_restrictions[1] );
-			}
-		}
-		
-		//-----------------------------------------
-		// Max number of urls...
-		//-----------------------------------------
-				
-		if( isset($sig_restrictions[4]) and $sig_restrictions[4] !== '' )
-		{
-			if( substr_count( mb_strtolower($signature), "[url" ) > $sig_restrictions[4] )
-			{
-				$sig_errors[] = sprintf( $this->lang->words['sig_toomanyurls'], $sig_restrictions[4] );
-			}
-			else
-			{
-				preg_match_all( "#(^|\s|>)((http|https|news|ftp)://\w+[^\s\[\]\<]+)#is", $signature, $matches );
-				
-				if( count($matches[1]) > $sig_restrictions[4] )
-				{
-					$sig_errors[] = sprintf( $this->lang->words['sig_toomanyurls'], $sig_restrictions[4] );
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Max number of lines of text...
-		//-----------------------------------------
-				
-		if( isset($sig_restrictions[5]) and $sig_restrictions[5] !== '' )
-		{
-			$testSig	= IPSText::getTextClass( 'bbcode' )->wordWrap( $signature, $this->settings['post_wordwrap'], '<br />' );
-
-			if( substr_count( $testSig, "<br />" ) >= $sig_restrictions[5] )
-			{
-				$sig_errors[] = sprintf( $this->lang->words['sig_toomanylines'], $sig_restrictions[5] );
-			}
-		}
-		
-		//-----------------------------------------
-		// Now the crappy part..
-		//-----------------------------------------
-				
-		if( isset($sig_restrictions[2]) and $sig_restrictions[2] !== '' AND isset($sig_restrictions[3]) and $sig_restrictions[3] !== '' )
-		{
-			preg_match_all( "/\[img\](.+?)\[\/img\]/i", $signature, $allImages );
-
-			if( count($allImages[1]) )
-			{
-				foreach( $allImages[1] as $foundImage )
-				{
-					$imageProperties = @getimagesize( $foundImage );
-					
-					if( is_array($imageProperties) AND count($imageProperties) )
-					{
-						if( $imageProperties[0] > $sig_restrictions[2] OR $imageProperties[1] > $sig_restrictions[3] )
-						{
-							$sig_errors[] = sprintf( $this->lang->words['sig_imagetoobig'], $foundImage, $sig_restrictions[2], $sig_restrictions[3] );
-						}
-					}
-				}
-			}
-		}
-		
-		if( count($sig_errors) )
-		{
-			$this->registry->getClass('output')->showError( implode( '<br />', $sig_errors ), 10211 );
-		}
-		
-		//-----------------------------------------
-		// Write it to the DB.
-		//-----------------------------------------
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'signature' => $signature ) ) );
-		
-		/* Update cache */
-		IPSContentCache::update( $this->memberData['member_id'], 'sig', $testSignature );
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: About me page
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveAboutMe()
-	{
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 10212, null, null, 403 );
-		}
-			 	
-	 	$aboutme = $this->DB->buildAndFetch( array( 'select' => 'pp_member_id, pp_about_me', 'from' => 'profile_portal', 'where' => 'pp_member_id=' . $this->memberData['member_id'] ) );
-
-		//-----------------------------------------
-		// Post process the editor
-		// Now we have safe HTML and bbcode
-		//-----------------------------------------
-		
-		$post = IPSText::getTextClass( 'editor' )->processRawPost( 'Post' );
-		
-		//-----------------------------------------
-		// Parse post
-		//-----------------------------------------
-		
-		IPSText::getTextClass( 'bbcode' )->parse_smilies			= intval($this->settings['aboutme_emoticons']);
-		IPSText::getTextClass( 'bbcode' )->parse_html				= intval($this->settings['aboutme_html']);
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode 			= intval($this->settings['aboutme_bbcode']);
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'aboutme';
-
-		$post	= IPSText::getTextClass( 'bbcode' )->preDbParse( $post );
-		
-		$text	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $post );
-
-		if ( IPSText::getTextClass( 'bbcode' )->error != "" )
-		{
-			$this->lang->loadLanguageFile( array( 'public_post' ), 'forums' );
-			$this->registry->getClass('output')->showError( IPSText::getTextClass( 'bbcode' )->error, 10213 );
-		}
-		
-		//-----------------------------------------
-		// Write it to the DB.
-		//-----------------------------------------
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'pp_about_me' => $post ) ) );
-		
-		return TRUE;
-	}
-	
-	/**
-	 * UserCP Save Form: Profile Info
-	 *
-	 * @return	array	Errors
-	 */
-	public function saveProfileInfo()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$pp_setting_moderate_comments = intval( $this->request['pp_setting_moderate_comments'] );
-		$pp_setting_moderate_friends  = intval( $this->request['pp_setting_moderate_friends'] );
-		$pp_setting_count_visitors    = intval( $this->request['pp_setting_count_visitors'] );
-		$pp_setting_count_comments    = intval( $this->request['pp_setting_count_comments'] );
-		$pp_setting_count_friends     = intval( $this->request['pp_setting_count_friends'] );
-		$_gender                      = $this->request['gender'] == 'male' ? 'male' : ( $this->request['gender'] == 'female' ? 'female' : '' );
-		
-		//-----------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------
-		
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->registry->getClass('output')->showError( 'members_profile_disabled', 10214, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// make sure that either we entered
-		// all calendar fields, or we left them
-		// all blank
-		//-----------------------------------------
-		
-		$c_cnt = 0;
-		
-		foreach ( array('day','month','year') as $v )
-		{
-			if ( $this->request[ $v ] )
-			{
-				$c_cnt++;
-			}
-		}
-		
-		if( $c_cnt > 0 && $c_cnt < 2 )
-		{
-			$this->registry->getClass('output')->showError( 'member_bad_birthday', 10215 );
-		}
-		else if( $c_cnt > 0 )
-		{
-			//-----------------------------------------
-			// Make sure it's a legal date
-			//-----------------------------------------
-			
-			$_year = $this->request['year'] ? $this->request['year'] : 1999;
-			
-			if ( ! checkdate( $this->request['month'], $this->request['day'], $_year ) )
-			{
-				$this->registry->getClass('output')->showError( 'member_bad_birthday', 10216 );
-			}
-		}
-
-		//-----------------------------------------
-		// Start off our array
-		//-----------------------------------------
-		
-		$core = array(  
-					   'bday_day'    => $this->request['day'],
-					   'bday_month'  => $this->request['month'],
-					   'bday_year'   => $this->request['year'],
-					);
-
-		$extendedProfile = array( 'pp_setting_moderate_comments' => $pp_setting_moderate_comments,
-								  'pp_setting_moderate_friends'  => $pp_setting_moderate_friends,
-								  'pp_setting_count_visitors'    => $pp_setting_count_visitors,
-								  'pp_setting_count_comments'    => $pp_setting_count_comments,
-								  'pp_setting_count_friends'     => $pp_setting_count_friends );
-		
-		//-----------------------------------------
-		// check to see if we can enter a member title
-		// and if one is entered, update it.
-		//-----------------------------------------
-		
-		if( isset( $this->request['member_title'] ) and ( $this->settings['post_titlechange'] ) and ( $this->memberData['posts'] >= $this->settings['post_titlechange']) )
-		{
-			$core['title'] = IPSText::getTextClass( 'bbcode' )->stripBadWords( $this->request['member_title'] );
-		}
-		
-		//-----------------------------------------
-		// Custom profile field stuff
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields      = new $classToLoad();
-		
-		$fields->member_data = $this->member->fetchMemberData();
-		$fields->initData( 'edit' );
-		/* Use $_POST and not ipsRegistry::$request as the custom profile field kernel class has its own cleaning routines for saving and showing
-		   which means we end up with double & -> &amp; conversion (&amp;lt;, etc) */
-		$fields->parseToSave( $_POST );
-		
-		if( $fields->error_messages )
-		{
-			return $fields->error_messages;
-		}
-		
-		/* Check the website url field */
-		$website_field = $fields->getFieldIDByKey( 'website' );
-
-		if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
-		{
-			if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
-			{
-				$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
-			}
-		}
-
-		//-----------------------------------------
-		// Check...
-		//-----------------------------------------
-		
-		if ( count( $fields->error_fields['empty'] ) )
-		{
-			$this->registry->getClass('output')->showError( array( 'customfields_empty', $fields->error_fields['empty'][0]['pf_title'] ), 10217 );
-		}
-		
-		if ( count( $fields->error_fields['invalid'] ) )
-		{
-			$this->registry->getClass('output')->showError( array( 'customfields_invalid', $fields->error_fields['invalid'][0]['pf_title'] ), 10218 );
-		}
-		
-		if ( count( $fields->error_fields['toobig'] ) )
-		{
-			$this->registry->getClass('output')->showError( array( 'customfields_toobig', $fields->error_fields['toobig'][0]['pf_title'] ), 10219 );
-		}
-		
-		//-----------------------------------------
-		// Update the DB
-		//-----------------------------------------
-		
-		IPSMember::save( $this->memberData['member_id'], array( 'core'            => $core,
-													 		'customFields'    => $fields->out_fields,
-													 		'extendedProfile' => $extendedProfile ) );
-
-		//-----------------------------------------
-		// Update birthdays cache if user set to today
-		// or if birthday was today but isn't now
-		//-----------------------------------------
-		
-		if( $core['bday_month'] == date('m') AND $core['bday_day'] == date('d') )
-		{
-			$this->cache->rebuildCache( 'birthdays', 'calendar' );
-		}
-		else if( $this->memberData['bday_month'] == date('m') AND $this->memberData['bday_day'] == date('d') AND ( $core['bday_month'] != date('m') OR $core['bday_day'] != date('d') ) )
-		{
-			$this->cache->rebuildCache( 'birthdays', 'calendar' );
-		}
-
-		return TRUE;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/index.html b/upload/admin/applications/members/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/index.html
+++ b/upload/admin/applications/members/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/js/acp.banfilters.js b/upload/admin/applications/members/js/acp.banfilters.js
new file mode 100644
index 00000000..d3c31548
--- /dev/null
+++ b/upload/admin/applications/members/js/acp.banfilters.js
@@ -0,0 +1,61 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* acp.banfilters.js - Banfilters functions		*/
+/* (c) IPS, Inc 2011							*/
+/* -------------------------------------------- */
+/* Author: Terabyte 							*/
+/************************************************/
+
+var _banfilters = window.IPBACP;
+_banfilters.prototype.banfilters = {
+	popups: null,
+	
+	init: function()
+	{
+		Debug.write("Initializing acp.banfilters.js");
+		document.observe("dom:loaded", function(){
+			/* Setup add filter button */
+			if( $('add_banfilter') )
+			{
+				$('add_banfilter').observe( 'click', acp.banfilters.addNewFilter );
+			}
+			
+			/* Setup delete form */
+			if( $('ban-delete') )
+			{
+				$('ban-delete').observe( 'submit', function( e ){ 
+					var checkboxes = $('ban-delete').getElementsByTagName('input');
+					
+					for( var i = 0; i < checkboxes.length; i++ )
+					{
+						if( checkboxes[i].checked )
+						{
+							return true;
+						}
+					}
+					
+					alert( ipb.lang['no_ban_to_delete'] );
+					
+					Event.stop( e );
+				});
+			}
+		});
+	},
+	
+	addNewFilter: function( e )
+	{
+		Event.stop(e);
+		
+		if( acp.banfilters.popup )
+		{
+			acp.banfilters.popup.show();
+		}
+		else
+		{
+			acp.banfilters.popup = new ipb.Popup('add_banfilter_popup', { type: 'pane', modal: false, hideAtStart: false, w: '600px', initial: ipb.templates['add_banfilter'] } );
+		}
+	}
+};
+
+acp.banfilters.init();
\ No newline at end of file
diff --git a/upload/admin/applications/members/js/index.html b/upload/admin/applications/members/js/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/js/index.html
+++ b/upload/admin/applications/members/js/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/js/ipsEditGroup.js b/upload/admin/applications/members/js/ipsEditGroup.js
index 99c1b4ca..10c7468d 100644
--- a/upload/admin/applications/members/js/ipsEditGroup.js
+++ b/upload/admin/applications/members/js/ipsEditGroup.js
@@ -48,9 +48,9 @@ function setUpForm()
 		field = elem.readAttribute('unlimited-field');
 		input = elem.down('input');
 		
-		cbox = new Element('input', { type: 'checkbox', name: field + '_cb', id: field + '_cb' } );
-		span = new Element('span').addClassName('desctext').update(" Unlimited");
-		div  = new Element('div').setStyle( 'padding-bottom: 3px' ).insert( cbox ).insert( span );
+		var cbox = new Element('input', { type: 'checkbox', name: field + '_cb', id: field + '_cb' } );
+		var span = new Element('label', { 'for': field + '_cb', 'class': 'desctext clickable' } ).update( '&nbsp;' + ipb.lang['unlimited_text'] );
+		var div  = new Element('div').setStyle( 'padding-bottom: 3px' ).insert( cbox ).insert( span );
 		
 		input.insert( { before: div } );
 		
@@ -93,12 +93,4 @@ function stripGuestLegend()
 								elem.hide();
 							} 
 						);
-	//$('tabtab-GROUPS|6').hide();
-	
-	$('g_view_board_no').observe('click', function(e){
-		$('g_view_board_warning').style.display = 'inline';
-	});
-	$('g_view_board_yes').observe('click', function(e){
-		$('g_view_board_warning').style.display = 'none';
-	});
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/js/ipsMemberQueue.js b/upload/admin/applications/members/js/ipsMemberQueue.js
deleted file mode 100644
index ec996730..00000000
--- a/upload/admin/applications/members/js/ipsMemberQueue.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function check_boxes()
-{
-	var ticked = $('maincheckbox').checked;
-	
-	var checkboxes = document.getElementsByTagName('input');
-
-	for ( var i = 0 ; i <= checkboxes.length ; i++ )
-	{
-		var e = checkboxes[i];
-		
-		if ( typeof(e) != 'undefined' && e.type == 'checkbox')
-		{
-			var boxname		= e.id;
-			var boxcheck	= boxname.replace( /^(.+?)_.+?$/, "$1" );
-			
-			if ( boxcheck == 'mid' )
-			{
-				e.checked = ticked;
-			}
-		}
-	}
-}
-
-function checkThisForm()
-{
-	var selectedOpt = $F('manage_type');
-	
-	if( selectedOpt == 'delete' )
-	{
-		return confirm( "Вы дей�твительно хотите удалить в�е отмеченные учетные запи�и?\n\nЭто дей�твие невозможно будет о�тановить и/или отменить!" );
-	}
-	else if( selectedOpt == 'unban' )
-	{
-		return confirm( "Данной дей�твие только убирает флаг 'Блокировки пользовател�'!\n\nЕ�ли пользователь был перене�ен в группу дл� заблокированных, или был добавлен IP адре�, email адре� или логин пользовател� в �пи�ок заблокированных, вам необходимо �амо�то�тельно убрать �ти ограничени�.\n\nВы также можете нажать кнопку 'Отменить' и кликнув по имени пользовател� перейти в централизованную панель управлени� блокировкой пользоватл�." );
-	}
-
-	return false;
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/ajax/defaultSection.php b/upload/admin/applications/members/modules_admin/ajax/defaultSection.php
index 292b049a..02734418 100644
--- a/upload/admin/applications/members/modules_admin/ajax/defaultSection.php
+++ b/upload/admin/applications/members/modules_admin/ajax/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default ajax section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'ajax' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'editform';
\ No newline at end of file
+$DEFAULT_SECTION = 'editform';
diff --git a/upload/admin/applications/members/modules_admin/ajax/editform.php b/upload/admin/applications/members/modules_admin/ajax/editform.php
index 324679b7..cb1e5668 100644
--- a/upload/admin/applications/members/modules_admin/ajax/editform.php
+++ b/upload/admin/applications/members/modules_admin/ajax/editform.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member property updater (AJAX)
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-06-09 18:03:22 -0400 (Thu, 09 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7007 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9021 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -28,7 +28,7 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -40,18 +40,6 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 			case 'show':
 				$this->show();
 			break;
-			case 'save_display_name':
-				$this->save_member_name( 'members_display_name' );
-			break;
-			case 'save_name':
-				$this->save_member_name( 'name' );
-			break;
-			case 'save_password':
-				$this->save_password();
-			break;
-			case 'save_email':
-				$this->save_email();
-			break;
 			case 'remove_photo':
 				$this->remove_photo();
 			break;
@@ -61,7 +49,7 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 	/**
 	 * Remove user's photo
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function remove_photo()
 	{
@@ -93,35 +81,9 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 			exit();
 		}
 
-		//-----------------------------------------
-		// Sort out upload dir
-		//-----------------------------------------
-
-		/* Fix for bug 5075 */
-		$this->settings[ 'upload_dir'] =  str_replace( '&#46;', '.', $this->settings['upload_dir']  );		
-
-		$upload_path  = $this->settings['upload_dir'];
-
-		//-----------------------------------------
-		// Already a dir?
-		//-----------------------------------------
-		
-		if ( file_exists( $upload_path . "/profile" ) )
-		{
-			# Set path and dir correct
-			$upload_path .= "/profile";
-			$upload_dir   = "profile/";
-		}
-		
-		IPSMember::getFunction()->removeUploadedPhotos( $member_id, $upload_path );
-		
-		IPSMember::save( $member_id, array( 'extendedProfile' => array( 'pp_main_photo'   => '',
-												  				   	 	'pp_main_width'   => 0,
-																	   	'pp_main_height'  => 0,
-																		'pp_thumb_photo'  => '',
-																		'pp_thumb_width'  => 0,
-																		'pp_thumb_height' => 0,
-																	 ) ) );
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+		$photos			= new $classToLoad( $this->registry );
+		$photos->remove( $member_id );
 
 		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf($this->lang->words['m_imgremlog'], $member_id ) );
 
@@ -140,352 +102,10 @@ class admin_members_ajax_editform extends ipsAjaxCommand
 							)	);
 	}
 	
-	/**
-	 * Change a member's email address
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	protected function save_email()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$member_id	= intval( $this->request['member_id'] );
-		$email		= trim( $this->request['email'] );
-		
-		//-----------------------------------------
-		// Get member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-																	
-		if ( ! $member['member_id'] )
-		{
-			$this->returnJsonError( $this->lang->words['m_noid'] );
-			exit();
-		}
-		
-		//-----------------------------------------
-		// Allowed to edit administrators?
-		//-----------------------------------------
-		
-		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
-		{
-			$this->returnJsonError( $this->lang->words['m_editadmin'] );
-			exit();
-		}
-		
-		//-----------------------------------------
-		// Is this email addy taken? CONVERGE THIS??
-		//-----------------------------------------
-		
-		$email_check = IPSMember::load( mb_strtolower($email) );
-		
-		if ( $email_check['member_id'] AND $email_check['member_id'] != $member_id )
-		{
-			$this->returnJsonError( $this->lang->words['m_emailalready'] );
-			exit();
-		}
-		
-        //-----------------------------------------
-    	// Load handler...
-    	//-----------------------------------------
-    	
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		$han_login   = new $classToLoad( $this->registry );
-    	$han_login->init();
-    	$han_login->changeEmail( trim( mb_strtolower( $member['email'] ) ), trim( mb_strtolower( $email ) ), $member );
-    	
-    	//-----------------------------------------
-    	// We don't want to die just from a Converge error
-    	//-----------------------------------------
-    	
-    	/*if ( $han_login->return_code AND ( $han_login->return_code != 'METHOD_NOT_DEFINED' AND $han_login->return_code != 'SUCCESS' ) )
-	    {
-			$this->returnJsonError( $this->lang->words['m_emailalready'] );
-			exit();
-    	}*/
-    	
-		//-----------------------------------------
-		// Update member
-		//-----------------------------------------
-		
-		IPSLib::runMemberSync( 'onEmailChange', $member_id, mb_strtolower( $email ), $member['email'] );
-		
-		IPSMember::save( $member_id, array( 'core' => array( 'email' => mb_strtolower( $email ) ) ) );
-		
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_emailchangelog'], $member['email'], $email, $member_id ) );
-		
-		$this->returnJsonArray( array( 
-										'success'	=> 1, 
-										'email'		=> $email
-							)	);
-	}
-	
-	/**
-	 * Change a member's password
-	 *
-	 * @return	void		[Outputs to screen]
-	 * @todo 	This method is no longer working via AJAX (on purpose).  It should be moved out of the AJAX controller as such.
-	 */
-	protected function save_password()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$member_id		= intval( $this->request['member_id'] );
-		$password		= IPSText::parseCleanValue( urldecode( $_POST['password'] ) );
-		$password2		= IPSText::parseCleanValue( urldecode( $_POST['password2'] ) );
-		$new_key		= intval( $this->request['new_key'] );
-		$new_salt		= intval( $this->request['new_salt'] );
-		$salt			= str_replace( '\\', "\\\\", IPSMember::generatePasswordSalt(5) );
-		$key			= IPSMember::generateAutoLoginKey();
-		$md5_once		= md5( trim($password) );
-		
-		//-----------------------------------------
-		// AJAX debug
-		//-----------------------------------------
-		
-		IPSDebug::fireBug( 'info', array( 'Password: ' . $password ) );
-		
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-		if ( ! $password OR ! $password2 )
-		{
-			$this->registry->output->showError( $this->lang->words['password_nogood'] );
-		}
-		
-		if ( $password != $password2 )
-		{
-			$this->registry->output->showError( $this->lang->words['m_passmatch'] );
-		}
-
-		//-----------------------------------------
-		// Get member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-		
-		//-----------------------------------------
-		// Allowed to edit administrators?
-		//-----------------------------------------
-		
-		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
-		{
-			$this->registry->output->showError( $this->lang->words['m_editadmin'] );
-		}
-		
-		//-----------------------------------------
-		// Check Converge: Password
-		//-----------------------------------------
-    	
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-		$han_login   = new $classToLoad( $this->registry );
-    	$han_login->init();
-    	$han_login->changePass( $member['email'], $md5_once, $password, $member );
-    	
-    	/*if ( $han_login->return_code != 'METHOD_NOT_DEFINED' AND $han_login->return_code != 'SUCCESS' )
-    	{
-			$this->returnJsonError( $this->lang->words['m_passchange']);
-			exit();
-    	}*/
-		
-		//-----------------------------------------
-		// Local DB
-		//-----------------------------------------
-		
-		$update = array();
-		
-		if( $new_salt )
-		{
-			$update['members_pass_salt']	= $salt;
-		}
-		
-		if( $new_key )
-		{
-			$update['member_login_key']		= $key;
-		}
-		
-		if( count($update) )
-		{
-			IPSMember::save( $member_id, array( 'core' => $update ) );
-		}
-		
-		IPSMember::updatePassword( $member_id, $md5_once );
-		IPSLib::runMemberSync( 'onPassChange', $member_id, $password );
-
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_passlog'], $member_id ) );
-		
-		//$this->returnJsonArray( array( 
-		//								'success'	=> 1, 
-		//								'password'	=> "*************"
-		//					)	);
-
-		$this->registry->output->global_message	= $this->lang->words['pw_updated_success'];
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
-	}
-	
-	/**
-	 * Update a user's login or display name
-	 *
-	 * @param	string		Field to update
-	 * @return	void		[Outputs to screen]
-	 */
-	protected function save_member_name( $field='members_display_name' )
-	{
-		$member_id	= intval( $this->request['member_id'] );
-		
-		$member = IPSMember::load( $member_id );
-		
-		//-----------------------------------------
-		// Allowed to edit administrators?
-		//-----------------------------------------
-		
-		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
-		{
-			$this->registry->output->showError( $this->lang->words['m_editadmin'] );
-		}
-		
-		if ( $field == 'members_display_name' )
-		{
-			$display_name	= $this->convertAndMakeSafe( $_POST['display_name'], 1 );
-    		$display_name	= str_replace("&#43;", "+", $display_name );
-    	}
-		else
-		{
-			$display_name	= $this->convertAndMakeSafe( $_POST['name'], 1 );
-    		$display_name	= str_replace("&#43;", "+", $display_name );
-    		
-			$display_name = str_replace( '|', '&#124;' , $display_name );
-			$display_name = trim( preg_replace( "/\s{2,}/", " ", $display_name ) );    		
-		}
-		
-		if ( $this->settings['strip_space_chr'] )
-    	{
-    		// use hexdec to convert between '0xAD' and chr
-			$display_name          = IPSText::removeControlCharacters( $display_name );
-		}
-		
-		if ( $field == 'members_display_name' AND preg_match( "#[\[\];,\|]#", str_replace('&#39;', "'", str_replace('&amp;', '&', $display_name) ) ) )
-		{
-			$this->registry->output->showError( $this->lang->words['m_displaynames'] );
-		}
-		
-		try
-		{
-			if ( IPSMember::getFunction()->updateName( $member_id, $display_name, $field ) === TRUE )
-			{
-				if ( $field == 'members_display_name' )
-				{
-					ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_dnamelog'], $member['members_display_name'], $display_name ));
-				}
-				else
-				{
-					ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_namelog'], $member['name'], $display_name ) );
-					
-					//-----------------------------------------
-					// If updating a name, and display names 
-					//	disabled, update display name too
-					//-----------------------------------------
-					
-					if( !ipsRegistry::$settings['auth_allow_dnames'] )
-					{
-						IPSMember::getFunction()->updateName( $member_id, $display_name, 'members_display_name' );
-					}
-
-					//-----------------------------------------
-					// I say, did we choose to email 'dis member?
-					//-----------------------------------------
-
-					if ( $this->request['send_email'] == 1 )
-					{
-						//-----------------------------------------
-						// By golly, we did!
-						//-----------------------------------------
-
-						$msg = trim( IPSText::stripslashes( nl2br( $_POST['email_contents'] ) ) );
-
-						$msg = str_replace( "{old_name}", $member['name'], $msg );
-						$msg = str_replace( "{new_name}", $display_name  , $msg );
-						$msg = str_replace( "<#BOARD_NAME#>", $this->settings['board_name'], $msg );
-						$msg = str_replace( "<#BOARD_ADDRESS#>", $this->settings['board_url'] . '/index.' . $this->settings['php_ext'], $msg );
-
-						IPSText::getTextClass('email')->message	= stripslashes( IPSText::getTextClass('email')->cleanMessage($msg) );
-						IPSText::getTextClass('email')->subject	= $this->lang->words['m_changesubj'];
-						IPSText::getTextClass('email')->to		= $member['email'];
-						IPSText::getTextClass('email')->sendMail();
-					}
-				}
-				
-				$this->cache->rebuildCache( 'stats', 'global' );
-			}
-			else
-			{
-				# We should absolutely never get here. So this is a fail-safe, really to
-				# prevent a "false" positive outcome for the end-user
-				$this->registry->output->showError( $this->lang->words['m_namealready'] );
-			}
-		}
-		catch( Exception $error )
-		{
-		//	$this->returnJsonError( $error->getMessage() );
-			
-			switch( $error->getMessage() )
-			{
-				case 'NO_USER':
-					$this->registry->output->showError( $this->lang->words['m_noid'] );
-				break;
-				case 'NO_PERMISSION':
-				case 'NO_NAME':
-					$this->registry->output->showError( sprintf($this->lang->words['m_morethan3'], $this->settings['max_user_name_length'] ) );
-				break;
-				case 'ILLEGAL_CHARS':
-					$this->registry->output->showError( $this->lang->words['m_illegal'] );
-				break;
-				case 'USER_NAME_EXISTS':
-					$this->registry->output->showError( $this->lang->words['m_namealready'] );
-				break;
-				default:
-					$this->registry->output->showError( $error->getMessage() );
-				break;
-			}
-		}
-		
-        //-----------------------------------------
-    	// Load handler...
-    	//-----------------------------------------
-    	
-    	if( $field == 'name' )
-    	{
-			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
-			$han_login   = new $classToLoad( $this->registry );
-	    	$han_login->init();
-	    	$han_login->changeName( $member['name'], $display_name, $member['email'], $member );
-    	}
-    	else
-    	{
-    		IPSLib::runMemberSync( 'onNameChange', $member_id, $display_name );
-    	}
-		
-		$__display_name = addslashes( $display_name );
-		
-		//$this->returnJsonArray( array( 
-		//								'success'		=> 1, 
-		//								'display_name'	=> "$__display_name"
-		//					)	);
-
-		$this->registry->output->global_message	= $this->lang->words[ $field . '_updated_success'];
-		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
-	}
-	
 	/**
 	 * Show the form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function show()
 	{
diff --git a/upload/admin/applications/members/modules_admin/ajax/index.html b/upload/admin/applications/members/modules_admin/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/ajax/index.html
+++ b/upload/admin/applications/members/modules_admin/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/ajax/members.php b/upload/admin/applications/members/modules_admin/ajax/members.php
new file mode 100644
index 00000000..2c48c5e5
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/ajax/members.php
@@ -0,0 +1,762 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Member list AJAX handler
+ * Last Updated: $Date: 2011-09-27 21:33:45 -0400 (Tue, 27 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @version		$Revision: 9556 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class admin_members_ajax_members extends ipsAjaxCommand 
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_member' ), 'members' );
+		
+    	switch( $this->request['do'] )
+    	{
+			default:
+			case 'show':
+				$this->show();
+			break;
+
+			case 'do_validating':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_validating', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_manageValidating();
+			break;
+			
+			case 'unappemail':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_validating', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_emailUnapprove();
+			break;
+
+			case 'do_locked':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_locked', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_unlock();
+			break;
+
+			case 'do_spam':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_spam', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_unSpam();
+			break;
+
+			case 'do_banned':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_banned', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_unban();
+			break;
+			
+			case 'do_incomplete':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'membertools_incomplete', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_doIncomplete();
+			break;
+			
+			case 'do_delete':
+				$this->registry->getClass('class_permissions')->return	= true;
+				
+				if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+				{
+					$this->returnJsonError( $this->lang->words['no_permission'] );
+				}
+
+				$this->_doDelete();
+			break;
+    	}
+	}
+	
+	/**
+	 * Delete members [form+process]
+	 *
+	 * @return	@e void
+	 */
+	protected function _doDelete()
+	{
+		//-----------------------------------------
+		// Check input
+		//-----------------------------------------
+		
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( !count($ids) )
+		{
+			$this->returnJsonError( $this->lang->words['m_nomember'] );
+		}
+
+		/* Don't delete our selves */
+		if( in_array( $this->memberData['member_id'], $ids ) )
+		{
+			$this->returnJsonError( $this->lang->words['m_nodeleteslefr'] );
+		}
+
+		//-----------------------------------------
+		// Get accounts
+		//-----------------------------------------
+		
+		$this->DB->build( array( 'select' => 'member_id, name, member_group_id, mgroup_others', 'from' => 'members', 'where' => 'member_id IN(' . implode( ',', $ids ) . ')' ) );
+		$this->DB->execute();
+		
+		$names	= array();
+		$newIds	= array();
+		
+		while ( $r = $this->DB->fetch() )
+		{
+			//-----------------------------------------
+			// r u trying to kill teh admin?
+			//-----------------------------------------
+
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete_admin' ) )
+			{
+				if( $this->caches['group_cache'][ $r['member_group_id'] ]['g_access_cp'] )
+				{
+					continue;
+				}
+				else
+				{
+					$other_mgroups = explode( ',', IPSText::cleanPermString( $r['mgroup_others'] ) );
+					
+					if( count($other_mgroups) )
+					{
+						foreach( $other_mgroups as $other_mgroup )
+						{
+							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+							{
+								continue 2;
+							}
+						}
+					}
+				}
+			}
+			
+			$names[]	= $r['name'];
+			$newIds[]	= $r['member_id'];
+		}
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+		
+		if ( ! count( $names ) )
+		{
+			$this->returnJsonError( $this->lang->words['m_nomember'] );
+		}
+		
+		//-----------------------------------------
+		// Delete
+		//-----------------------------------------
+		
+		IPSMember::remove( $newIds, true );
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_deletedlog'], implode( ",", $names ) ) );
+
+		//-----------------------------------------
+		// Respond
+		//-----------------------------------------
+		
+		$this->returnJsonArray( array( 'ok' => 1, 'msg' => sprintf( $this->lang->words['m_deletedlog'], implode( ",", $names ) ) ) );
+	}
+	
+	/**
+	 * Show the results
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function show()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/adminSearch.php', 'adminMemberSearch' );
+		$searchHelper	= new $classToLoad( $this->registry );
+		$html			= $this->registry->output->loadTemplate('cp_skin_member');;
+
+		//-----------------------------------------
+		// Get the number of results
+		//-----------------------------------------
+		
+		$count	= $searchHelper->getSearchResultsCount();
+		
+		IPSDebug::fireBug( 'info', array( 'Total results:' . $count ) );
+		
+		//-----------------------------------------
+		// Generate pagination
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$perpage	= 20;
+
+		$pages		= $this->registry->output->generatePagination( array(
+																		'totalItems'			=> $count,
+																		'itemsPerPage'			=> $perpage,
+																		'currentStartValue'		=> $st,
+																		'baseUrl'				=> $this->settings['base_url'] . 'module=members&amp;section=members',
+																)		);
+		
+		//-----------------------------------------
+		// Run the query
+		//-----------------------------------------
+		
+		$members	= $searchHelper->getSearchResults( $st, $perpage );
+		
+		IPSDebug::fireBug( 'info', array( 'Total results (2):' . count($members) ) );
+		
+		//-----------------------------------------
+		// Format results
+		//-----------------------------------------
+
+		$_memberOutput	= '';
+		
+		if( count($members) )
+		{
+			foreach( $members as $member )
+			{
+				/* Ensure encoding is safe */
+				//$member['members_display_name'] = IPSText::encodeForXml( $member['members_display_name'] );
+				//$member['name'] 			    = IPSText::encodeForXml( $member['name'] );
+				/* The above causes strings returned on utf-8 sites to be entirely corrupted
+					@link http://community.invisionpower.com/tracker/issue-32444-ajax-for-text-in-acp */
+				$member['members_display_name'] = $member['members_display_name'];
+				$member['name'] 			    = $member['name'];
+				
+				
+				IPSDebug::fireBug( 'info', array( 'Showing member:' . $member['members_display_name'] . ' (' . $member['email'] . ' - ' . $member['member_id'] . ')' ) );
+				
+				switch( $searchHelper->getMemberType() )
+				{
+					case 'all':
+					default:
+						$_memberOutput .= $html->memberListRow( $member );
+					break;
+					
+					case 'spam':
+						$_memberOutput .= $html->memberListRow_spam( $member );
+					break;
+		
+					case 'banned':
+						$_memberOutput .= $html->memberListRow_banned( $member );
+					break;
+		
+					case 'locked':
+						$_memberOutput .= $html->memberListRow_locked( $member );
+					break;
+		
+					case 'validating':
+						$_memberOutput .= $html->memberListRow_validating( $member );
+					break;
+		
+					case 'incomplete':
+						$_memberOutput .= $html->memberListRow_incomplete( $member );
+					break;
+				}
+			}
+		}
+		else
+		{
+			$_memberOutput = $html->memberListRow_empty();
+		}
+		
+		//-----------------------------------------
+		// Return as JSON
+		//-----------------------------------------
+		
+		$this->returnJsonArray( array(
+									'count'		=> $count,
+									'pages'		=> $pages,
+									'members'	=> $_memberOutput ) );
+	}
+
+	/**
+	 * Manage incomplete members
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _doIncomplete()
+	{
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( count($ids) < 1 )
+		{
+			$this->returnJsonError( $this->lang->words['t_nomemsel'] );
+		}
+
+		//-----------------------------------------
+		// DELETE
+		//-----------------------------------------
+
+		if ( $this->request['type'] == 'delete' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+				
+			try
+			{
+				$message	= $this->_getManagementClass()->deleteMembers( $ids, 't_inc_removed' );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+		else if( $this->request['type'] == 'finalize' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->finalizeMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+	}
+	
+	/**
+	 * Manage validating members
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _manageValidating()
+	{
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( count($ids) < 1 )
+		{
+			$this->returnJsonError( $this->lang->words['t_nomemsel'] );
+		}
+
+		//-----------------------------------------
+		// APPROVE
+		//-----------------------------------------
+
+		if ( $this->request['type'] == 'approve' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->approveMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Resend validation email
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'resend' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->resendValidationEmails( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Ban
+		//-----------------------------------------
+
+		else if( $this->request['type'] == 'ban' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			try
+			{
+				$message	= $this->_getManagementClass()->banMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// SPAMMER
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'spam' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->markMembersAsSpam( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// DELETE
+		//-----------------------------------------
+
+		else
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			try
+			{
+				$message	= $this->_getManagementClass()->denyMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+	}
+
+	/**
+	 * Manage spam requests
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _unSpam()
+	{
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( count($ids) < 1 )
+		{
+			$this->returnJsonError( $this->lang->words['t_nomemunspammed'] );
+		}
+
+		//-----------------------------------------
+		// Unspam
+		//-----------------------------------------
+
+		if ( $this->request['type'] == 'unspam' OR $this->request['type'] == 'unspam_posts' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->unmarkMembersAsSpam( $ids, $this->request['type'] == 'unspam_posts' ? true : false );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Ban
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'ban' OR $this->request['type'] == 'ban_blacklist' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			try
+			{
+				$message	= $this->_getManagementClass()->banSpammers( $ids, $this->request['type'] == 'ban_blacklist' ? true : false );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+		else if( $this->request['type'] == 'delete' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			$message	= $this->_getManagementClass()->deleteMembers( $ids );
+			
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+	}
+
+	/**
+	 * Manage banned requests
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _unban()
+	{
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( count($ids) < 1 )
+		{
+			$this->returnJsonError( $this->lang->words['t_nomemunban'] );
+		}
+
+		//-----------------------------------------
+		// Unlock
+		//-----------------------------------------
+
+		if ( $this->request['type'] == 'unban' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->unbanMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+	
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Delete
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'delete' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			$message	= $this->_getManagementClass()->deleteMembers( $ids );
+			
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+	}
+
+	/**
+	 * Unapprove email change request
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _emailUnapprove()
+	{
+		//-----------------------------------------
+		// GET member
+		//-----------------------------------------
+
+		if( !$this->request['mid'] )
+		{
+			$this->returnJsonError( $this->lang->words['t_noemailloc'] );
+		}
+
+		try
+		{
+			$message	= $this->_getManagementClass()->unapproveEmailChange( $this->request['mid'] );
+		}
+		catch( Exception $error )
+		{
+			$this->returnJsonError( $error->getMessage() );
+		}
+
+		$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+	}
+
+
+	/**
+	 * Unlock selected accounts
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function _unlock()
+	{
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
+		if ( count($ids) < 1 )
+		{
+			$this->returnJsonError( $this->lang->words['t_nolockloc'], 11251 );
+		}
+
+		//-----------------------------------------
+		// Unlock
+		//-----------------------------------------
+
+		if ( $this->request['type'] == 'unlock' )
+		{
+			try
+			{
+				$message	= $this->_getManagementClass()->unlockMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Ban
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'ban' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			try
+			{
+				$message	= $this->_getManagementClass()->banMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+
+		//-----------------------------------------
+		// Delete
+		//-----------------------------------------
+
+		else if ( $this->request['type'] == 'delete' )
+		{
+			$this->registry->getClass('class_permissions')->return	= true;
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete', 'members', 'members' ) )
+			{
+				$this->returnJsonError( $this->lang->words['no_permission'] );
+			}
+
+			$message	= $this->_getManagementClass()->deleteMembers( $ids );
+
+			$this->returnJsonArray( array( 'ok' => 1, 'msg' => $message ) );
+		}
+	}
+	
+	/**
+	 * Get the member management class
+	 *
+	 * @return	object
+	 */
+	protected function _getManagementClass()
+	{
+		static $_object;
+		
+		if( $_object )
+		{
+			return $_object;
+		}
+
+		$_class		= IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/adminManage.php', 'adminMemberManagement', 'members' );
+		$_object	= new $_class( $this->registry );
+		
+		return $_object;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php b/upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php
index a3f91a37..f3861a9a 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php
+++ b/upload/admin/applications/members/modules_admin/bulkmail/bulkmail.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bulk mail management
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-07-27 20:58:18 -0400 (Wed, 27 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7007 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9327 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -49,7 +49,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -137,7 +137,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Delete a bulk mail
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mailDelete()
 	{
@@ -159,7 +159,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Cancels a bulk mail
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	protected function _mailSendCancel()
 	{
@@ -176,7 +176,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Processes a bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function mailSendProcess()
 	{
@@ -230,11 +230,6 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 		{
 			$mail[ $k ] = $v;
 		}
-		
-		if ( $mail['mail_html_on'] )
-		{
-			$this->settings['html_email'] = 1;
-		}
 
 		//-----------------------------------------
  		// Format the query
@@ -265,6 +260,13 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 			
 			$contents				= $this->_convertQuicktags( $mail['mail_content'], $r );
 			
+			/* @link http://community.invisionpower.com/tracker/issue-32116-bulk-mail-only-sends-html-to-first-recipient
+				Needs to be set inside the loop because email handler resets it back */
+			if ( $mail['mail_html_on'] )
+			{
+				IPSText::getTextClass('email')->html_email	= 1;
+			}
+		
 			IPSText::getTextClass('email')->from		= $this->settings['email_out'];
 			IPSText::getTextClass('email')->to			= $r['email'];
 			IPSText::getTextClass('email')->message		= str_replace( "\r\n", "\n", $contents );
@@ -281,9 +283,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 		{
 			$done	= 1;
 		}
-		
-		$this->settings['html_email'] = 0;
-		
+
 		//-----------------------------------------
 		// Save out..
 		//-----------------------------------------
@@ -308,7 +308,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Complete bulk mail processing
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSendComplete()
 	{
@@ -376,7 +376,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Start the sending of the bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSendStart()
 	{
@@ -437,7 +437,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Process the sending of the bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailPreviewComplete()
 	{
@@ -494,7 +494,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Preview the email (javascript popup)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailPreviewStart()
 	{
@@ -506,7 +506,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Save the new or edited bulk mail
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailSave()
 	{
@@ -639,7 +639,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	 * Show the edit bulk mail form
 	 *
 	 * @param	string		[add|edit]
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailForm( $type='add' )
 	{
@@ -683,7 +683,7 @@ class admin_members_bulkmail_bulkmail extends ipsCommand
 	/**
 	 * Show the main bulk mail overview screen
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _mailStart()
 	{
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php b/upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php
index 5a8feb4f..50b0be16 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php
+++ b/upload/admin/applications/members/modules_admin/bulkmail/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default bulkmail section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'bulkmail' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'bulkmail';
\ No newline at end of file
+$DEFAULT_SECTION = 'bulkmail';
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/index.html b/upload/admin/applications/members/modules_admin/bulkmail/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/index.html
+++ b/upload/admin/applications/members/modules_admin/bulkmail/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/xml/index.html b/upload/admin/applications/members/modules_admin/bulkmail/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/xml/index.html
+++ b/upload/admin/applications/members/modules_admin/bulkmail/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml b/upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml
index 1d4d0514..b904c625 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml
+++ b/upload/admin/applications/members/modules_admin/bulkmail/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Ра��ылки</subitemtitle>
+					<subitemlang>bulkmail</subitemlang>
 					<subsection>bulkmail</subsection>
 					<subitemurl>do=bulk_mail</subitemurl>
 					<subitemrolekey></subitemrolekey>
diff --git a/upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml b/upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml
index 59d5bfdc..3433b0d2 100644
--- a/upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml
+++ b/upload/admin/applications/members/modules_admin/bulkmail/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление ра��ылками</grouptitle>
+		<grouplang>mem_bulkmail</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_addedit</key>
@@ -15,6 +16,7 @@
 	</group>
 	<group>
 		<grouptitle>Отправка ра��ылок</grouptitle>
+		<grouplang>mem_bulkmailsend</grouplang>
 		<items>
 			<item>
 				<key>bulkmail_view</key>
diff --git a/upload/admin/applications/members/modules_admin/members/customfields.php b/upload/admin/applications/members/modules_admin/cfields/customfields.php
similarity index 92%
rename from upload/admin/applications/members/modules_admin/members/customfields.php
rename to upload/admin/applications/members/modules_admin/cfields/customfields.php
index 5052bb58..8c629dd9 100644
--- a/upload/admin/applications/members/modules_admin/members/customfields.php
+++ b/upload/admin/applications/members/modules_admin/cfields/customfields.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Custom field management
- * Last Updated: $Date: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7023 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9483 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -22,34 +22,34 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-class admin_members_members_customfields extends ipsCommand
+class admin_members_cfields_customfields extends ipsCommand
 {	
 	/**
 	 * Skin object
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	* Main class entry point
 	*
 	* @param	object		ipsRegistry reference
-	* @return	void		[Outputs to screen]
+	* @return	@e void		[Outputs to screen]
 	*/
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -60,8 +60,8 @@ class admin_members_members_customfields extends ipsCommand
 		$this->html = $this->registry->output->loadTemplate( 'cp_skin_profilefields' );		
 		$this->registry->class_localization->loadLanguageFile( array( 'admin_member' ) );
 		
-		$this->form_code    = $this->html->form_code    = '&module=members&amp;section=customfields&amp;';
-		$this->js_form_code = $this->html->form_code_js = '&module=members&section=customfields&';
+		$this->form_code    = $this->html->form_code    = '&module=cfields&amp;section=customfields&amp;';
+		$this->js_form_code = $this->html->form_code_js = '&module=cfields&section=customfields&';
 		
 		//-----------------------------------------
 		// switch-a-magoo
@@ -104,12 +104,7 @@ class admin_members_members_customfields extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'profilefields_delete' );	
 				$this->doDelete();
 			break;
-			
-			case 'group_overview':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'profilefieldgroups_global' );
-				$this->groupOverview();
-			break;
-			
+
 			case 'group_form_add':
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'profilefieldgroups_global' );
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'profilefieldgroups_add' );
@@ -159,7 +154,7 @@ class admin_members_members_customfields extends ipsCommand
 	/**
 	 * Remove a profile field group
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function groupDelete()
 	{
@@ -177,14 +172,14 @@ class admin_members_members_customfields extends ipsCommand
 		/* Done */		
 		$this->registry->output->global_message = $this->lang->words['cf_gremoved'];
 		$this->rebuildCache();
-		$this->groupOverview();
+		$this->mainScreen();
 	}
 	
 	/**
 	 * Handles the form for adding/editing profile field groups
 	 *
 	 * @param	string	$mode	Either add or edit	 
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function groupSave( $mode='add' )
 	{
@@ -245,14 +240,14 @@ class admin_members_members_customfields extends ipsCommand
 		
 		/* Done */
 		$this->rebuildCache();
-		$this->groupOverview();
+		$this->mainScreen();
 	}
 	
 	/**
 	 * Builds the form for adding/editing profile field groups
 	 *
 	 * @param	string	$mode	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function groupForm( $mode='add' )
 	{
@@ -297,33 +292,11 @@ class admin_members_members_customfields extends ipsCommand
 		/* Output */
 		$this->registry->output->html .= $this->html->groupForm( $id, $data, $title, $do );		
 	}
-	
-	/**
-	 * Builds the group listing screen
-	 *
-	 * @return	void
-	 */
-	public function groupOverview()
-	{
-		/* Query Groups */
-		$this->DB->build( array( 'select' => '*', 'from' => 'pfields_groups' ) );
-		$this->DB->execute();
-		
-		$fields = array();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			$fields[] = $r;
-		}
-		
-		/* Output */
-		$this->registry->output->html .= $this->html->groupList( $fields );		
-	}
-	
+
 	/**
 	 * Rebuilds the custom profile field cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildCache()
 	{
@@ -359,7 +332,7 @@ class admin_members_members_customfields extends ipsCommand
 	/**
 	 * Confirm field deletion form
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function deleteForm()
 	{
@@ -387,7 +360,7 @@ class admin_members_members_customfields extends ipsCommand
 	/**
 	 * Removes a field from the database
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doDelete()
 	{
@@ -410,11 +383,13 @@ class admin_members_members_customfields extends ipsCommand
 		
 		/* Remove the filed */
 		$this->DB->dropField( 'pfields_content', "field_{$row['pf_id']}" );		
-		$this->DB->buildAndFetch( array( 'delete' => 'pfields_data', 'where' => "pf_id={$id}" ) );
+		$this->DB->delete( 'pfields_data', "pf_id={$id}" );
 		
 		/* Rebuild the cache and redirect */
-		$this->rebuildCache();		
-		$this->registry->output->doneScreen( $this->lang->words['cf_removed'], $this->lang->words['cf_control'], $this->form_code, 'redirect' );
+		$this->rebuildCache();
+		
+		$this->registry->output->global_message	= $this->lang->words['cf_removed'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	
@@ -422,7 +397,7 @@ class admin_members_members_customfields extends ipsCommand
 	 * Saves a custom field form
 	 *
 	 * @param	string		Type (add|edit)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function mainSave( $type='edit' )
 	{
@@ -523,7 +498,7 @@ class admin_members_members_customfields extends ipsCommand
 	 * Shows a custom field form
 	 *
 	 * @param	string		Type (add|edit)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function mainForm( $type='edit' )
 	{
@@ -598,7 +573,7 @@ class admin_members_members_customfields extends ipsCommand
 	/**
 	 * Lists the current custom profile fields
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function mainScreen()
 	{
@@ -620,6 +595,7 @@ class admin_members_members_customfields extends ipsCommand
 		
 		/* Loop through and build list */
 		$fields = array();
+		
 		if ( $this->DB->getTotalRows() )
 		{
 			while ( $r = $this->DB->fetch() )
@@ -638,6 +614,17 @@ class admin_members_members_customfields extends ipsCommand
 			}
 		}
 		
+		/* Make sure we have all of the groups
+			@link	http://community.invisionpower.com/tracker/issue-33386-custom-fields-groups-dont-appear-after-created-while-is-empty */
+		$this->DB->build( array( 'select' => '*', 'from' => 'pfields_groups' ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$key			= $r['pf_group_name'] ? $r['pf_group_name'] : $this->lang->words['nogroup_other'];
+			$fields[ $key ]	= count($fields[ $key ]) ? $fields[ $key ] : $r['pf_group_id'];
+		}
+		
 		/* Output */
 		$this->registry->output->html .= $this->html->customProfileFieldsList( $fields );
 	}
@@ -645,9 +632,9 @@ class admin_members_members_customfields extends ipsCommand
 	/**
 	 * Reorder fields
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function reorder()
+	protected function reorder()
 	{
 		//-----------------------------------------
 		// INIT
diff --git a/upload/admin/applications/members/modules_admin/cfields/defaultSection.php b/upload/admin/applications/members/modules_admin/cfields/defaultSection.php
new file mode 100644
index 00000000..b66f97fe
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/cfields/defaultSection.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file		defaultSection.php 	Define the default section for the 'cfields' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		20th February 2002
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
+ */
+
+$DEFAULT_SECTION = 'customfields';
diff --git a/upload/admin/applications/members/modules_admin/cfields/index.html b/upload/admin/applications/members/modules_admin/cfields/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/cfields/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/cfields/xml/index.html b/upload/admin/applications/members/modules_admin/cfields/xml/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/cfields/xml/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/cfields/xml/menu.xml b/upload/admin/applications/members/modules_admin/cfields/xml/menu.xml
new file mode 100644
index 00000000..7312eddb
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/cfields/xml/menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<menu>
+	<tabitems>
+		<item>
+			<title>Custom Profile Fields</title>
+			<subitems>
+				<subitem>
+					<subitemtitle>Custom Profile Fields</subitemtitle>
+					<subitemlang>customfields</subitemlang>
+					<subsection>customfields</subsection>
+					<subitemurl></subitemurl>
+					<subitemrolekey>profilefields_global</subitemrolekey>
+					<subisredirect>0</subisredirect>
+				</subitem>
+			</subitems>
+		</item>
+	</tabitems>
+</menu>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/cfields/xml/permissions.xml b/upload/admin/applications/members/modules_admin/cfields/xml/permissions.xml
new file mode 100644
index 00000000..3f5c9425
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/cfields/xml/permissions.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<permissions>
+	<group>
+		<grouptitle>Custom Profile Fields</grouptitle>
+		<grouplang>members_cfields</grouplang>
+		<items>
+			<item>
+				<key>profilefields_global</key>
+				<string>Can access custom profile fields management?</string>
+			</item>
+			<item>
+				<key>profilefields_add</key>
+				<string>Can add new profile fields?</string>
+			</item>
+			<item>
+				<key>profilefields_edit</key>
+				<string>Can edit profile fields?</string>
+			</item>
+			<item>
+				<key>profilefields_delete</key>
+				<string>Can delete profile fields?</string>
+			</item>
+		</items>
+	</group>
+	<group>
+		<grouptitle>Custom Profile Field Groups</grouptitle>
+		<grouplang>members_cfieldgroups</grouplang>
+		<items>
+			<item>
+				<key>profilefieldgroups_global</key>
+				<string>Can access custom profile field group management?</string>
+			</item>
+			<item>
+				<key>profilefieldgroups_add</key>
+				<string>Can add new profile field group?</string>
+			</item>
+			<item>
+				<key>profilefieldgroups_edit</key>
+				<string>Can edit profile field group?</string>
+			</item>
+			<item>
+				<key>profilefieldgroups_delete</key>
+				<string>Can delete profile field group?</string>
+			</item>
+		</items>
+	</group>
+</permissions>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/groups/defaultSection.php b/upload/admin/applications/members/modules_admin/groups/defaultSection.php
index 68c5d55a..c57a293a 100644
--- a/upload/admin/applications/members/modules_admin/groups/defaultSection.php
+++ b/upload/admin/applications/members/modules_admin/groups/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default groups section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'groups' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'groups';
\ No newline at end of file
+$DEFAULT_SECTION = 'groups';
diff --git a/upload/admin/applications/members/modules_admin/groups/groups.php b/upload/admin/applications/members/modules_admin/groups/groups.php
index 6608cc59..19942a12 100644
--- a/upload/admin/applications/members/modules_admin/groups/groups.php
+++ b/upload/admin/applications/members/modules_admin/groups/groups.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Group management
- * Last Updated: $Date: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $Date: 2011-10-05 15:30:51 -0400 (Wed, 05 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7023 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9582 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -29,27 +29,27 @@ class admin_members_groups_groups extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -129,9 +129,9 @@ class admin_members_groups_groups extends ipsCommand
 	/**
 	 * List the groups
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _mainScreen()
+	protected function _mainScreen()
 	{
 		//-----------------------------------------
 		// INIT
@@ -141,13 +141,7 @@ class admin_members_groups_groups extends ipsCommand
 		$content = "";
 		$form    = array();
 		$rows    = array();
-		
-		//-----------------------------------------
-		// Page details
-		//-----------------------------------------
 
-		$this->registry->output->extra_nav[]		= array( $this->form_code, $this->lang->words['g_nav'] );
-		
 		//-----------------------------------------
 		// Get groups
 		//-----------------------------------------
@@ -203,7 +197,7 @@ class admin_members_groups_groups extends ipsCommand
 	/**
 	 * Exports the groups to a master XML file for distribution
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function masterXMLExport()
 	{
@@ -215,22 +209,17 @@ class admin_members_groups_groups extends ipsCommand
 		$skip  = IPSLib::fetchNonDefaultGroupFields();
 		
 		//-----------------------------------------
-		// Get XML class
+		// Get xml class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'class_xml.php' );
-		
-		$xml			= new class_xml();
-		$xml->doc_type	= IPS_DOC_CHAR_SET;
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 
-		$xml->xml_set_root( 'export', array( 'exported' => time() ) );
-		
-		//-----------------------------------------
-		// Set group
-		//-----------------------------------------
-		
-		$xml->xml_add_group( 'group' );
+		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
+		$xml->newXMLDocument();
+		$xml->addElement( 'export' );
+		$xml->addElement( 'group', 'export' );
+
 		//-----------------------------------------
 		// Grab our default 6 groups
 		//-----------------------------------------
@@ -247,38 +236,31 @@ class admin_members_groups_groups extends ipsCommand
 			$content		= array();
 			$r['g_icon']	= '';
 			
-			//-----------------------------------------
-			// Sort the fields...
-			//-----------------------------------------
-			
-			foreach( $r as $k => $v )
+			if( is_array($skip) AND count($skip) )
 			{
-				if ( ! in_array( $k, $skip ) )
+				foreach( $skip as $_kk )
 				{
-					$content[] = $xml->xml_build_simple_tag( $k, $v );
+					unset( $r[ $_kk ] );
 				}
 			}
 			
-			$entry[] = $xml->xml_build_entry( 'row', $content );
+			$xml->addElementAsRecord( 'group', 'row', $r );
 		}
-		
-		$xml->xml_add_entry_to_group( 'group', $entry );
-		$xml->xml_format_document();
 
 		//-----------------------------------------
 		// Print to browser
 		//-----------------------------------------
 		
-		$this->registry->output->showDownload( $xml->xml_document, 'groups.xml', '', 0 );
+		$this->registry->output->showDownload( $xml->fetchDocument(), 'groups.xml', '', 0 );
 	}
 	
 
 	/**
 	 * Form to delete a group
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _deleteForm()
+	protected function _deleteForm()
 	{
 		$group_id	= intval($this->request['id']);
 		$group		= $this->caches['group_cache'][ $group_id ];
@@ -314,9 +296,9 @@ class admin_members_groups_groups extends ipsCommand
 	/**
 	 * Delete the group
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _doDelete()
+	protected function _doDelete()
 	{
 		//-----------------------------------------
 		// INIT
@@ -470,9 +452,9 @@ class admin_members_groups_groups extends ipsCommand
 	 * Save the group [add/edit]
 	 *
 	 * @param 	string		'add' or 'edit'
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _saveGroup( $type='edit' )
+	protected function _saveGroup( $type='edit' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -576,9 +558,9 @@ class admin_members_groups_groups extends ipsCommand
 			}
 		}
 		
-		$this->request[ 'p_max'] =  str_replace( ":", "", $this->request['p_max']  );
-		$this->request[ 'p_width'] =  str_replace( ":", "", $this->request['p_width']  );
-		$this->request[ 'p_height'] =  str_replace( ":", "", $this->request['p_height']  );
+		$this->request['p_max']		= str_replace( ":", "", $this->request['p_max'] );
+		$this->request['p_width']	= str_replace( ":", "", $this->request['p_width'] );
+		$this->request['p_height']	= str_replace( ":", "", $this->request['p_height'] );
 		
 		$sig_limits		= array(
 								$this->request['use_signatures'],
@@ -593,12 +575,10 @@ class admin_members_groups_groups extends ipsCommand
 		// Set the db array
 		//-----------------------------------------
 		
-		$db_string = array(
-							'g_view_board'			=> intval($this->request['g_view_board']),
+		$db_string = array( 'g_view_board'			=> intval($this->request['g_view_board']),
 							'g_mem_info'			=> intval($this->request['g_mem_info']),
 							'g_can_add_friends'		=> intval($this->request['g_can_add_friends']),
 							'g_use_search'			=> intval($this->request['g_use_search']),
-							'g_email_friend'		=> intval($this->request['g_email_friend']),
 							'g_edit_profile'		=> intval($this->request['g_edit_profile']),
 							'g_use_pm'				=> intval($this->request['g_use_pm']),
 							'g_pm_perday'			=> intval($this->request['g_pm_perday']),
@@ -614,7 +594,6 @@ class admin_members_groups_groups extends ipsCommand
 							'g_perm_id'				=> $new_perm_set_id ? $new_perm_set_id : implode( ",", $this->request['permid'] ),
 							'g_icon'				=> trim( IPSText::safeslashes( $_POST['g_icon'] ) ),
 							'g_attach_max'			=> $this->request['g_attach_max'],
-							'g_avatar_upload'		=> intval($this->request['g_avatar_upload']),
 							'g_max_messages'		=> intval($this->request['g_max_messages']),
 							'g_max_mass_pm'			=> intval($this->request['g_max_mass_pm']),
 							'g_pm_flood_mins'		=> intval($this->request['g_pm_flood_mins']),
@@ -622,7 +601,6 @@ class admin_members_groups_groups extends ipsCommand
 							'g_promotion'			=> $promotion_a . '&' . $promotion_b,
 							'g_photo_max_vars'		=> $this->request['p_max'].':'.$this->request['p_width'].':'.$this->request['p_height'],
 							'g_dohtml'				=> intval($this->request['g_dohtml']),
-							'g_email_limit'			=> intval($this->request['join_limit']).':'.intval($this->request['join_flood']),
 							'g_bypass_badwords'		=> intval($this->request['g_bypass_badwords']),
 							'g_can_msg_attach'		=> intval($this->request['g_can_msg_attach']),
 							'g_attach_per_post'		=> intval($this->request['g_attach_per_post']),
@@ -636,9 +614,8 @@ class admin_members_groups_groups extends ipsCommand
 							'g_max_bgimg_upload'    => intval( $this->request['g_max_bgimg_upload'] ),
 							'g_bitoptions'			=> IPSBWOPtions::freeze( $this->request, 'groups', 'global' ), # Saves all BW options for all apps
 						  );
-		
-		/* Leave here in case an application below needs to add a force_data_type */
-    	$this->DB->force_data_type = array( 'g_title' => 'string' );
+
+		$this->DB->setDataType( 'g_title', 'string' );
     	
 		//-----------------------------------------
 		// Ok? Load interface and child classes
@@ -646,21 +623,18 @@ class admin_members_groups_groups extends ipsCommand
 
 		IPSLib::loadInterface( 'admin/group_form.php' );
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		$_groupPlugins	= array();
+		
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
+			if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/group_form.php' ) )
 			{
-				continue;
-			}
-			
-			if ( file_exists( IPSLib::getAppDir( $app_dir  ) . '/extensions/admin/group_form.php' ) )
-			{
-				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/group_form.php', 'admin_group_form__'.$app_dir, $app_dir );
-				$_object = new $_class( $this->registry );
+				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/group_form.php', 'admin_group_form__'.$app_dir, $app_dir );
+				$_groupPlugins[ $_class ] = new $_class( $this->registry );
 				
-				$remote  = $_object->getForSave();
+				$remote  = $_groupPlugins[ $_class ]->getForSave();
 
-				$db_string = array_merge( $remote, $db_string );
+				$db_string = array_merge( $db_string, $remote );
 			}
 		}
 
@@ -668,7 +642,7 @@ class admin_members_groups_groups extends ipsCommand
 		// Editing...do an update
 		//-----------------------------------------
 		
-		if ($type == 'edit')
+		if ( $type == 'edit' )
 		{
 			$this->DB->update( 'groups', $db_string, 'g_id=' . $group_id );
 			
@@ -678,6 +652,8 @@ class admin_members_groups_groups extends ipsCommand
 			
 			$this->DB->update( 'moderators', array( 'group_name' => $db_string['g_title'] ), 'group_id=' . $group_id );
 			
+			$this->cache->rebuildCache( 'moderators', 'forums' );
+			
 			ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['g_editedlog'], $db_string['g_title'] ) );
 
 			$this->registry->output->global_message = $this->lang->words['g_edited'];
@@ -695,6 +671,21 @@ class admin_members_groups_groups extends ipsCommand
 		
 		$this->rebuildGroupCache();
 		
+		//-----------------------------------------
+		// Post save callbacks
+		//-----------------------------------------
+		
+		if( count($_groupPlugins) )
+		{
+			foreach( $_groupPlugins as $_className => $_object )
+			{
+				if( method_exists( $_object, 'postSave' ) )
+				{
+					$_object->postSave( $group_id );
+				}
+			}
+		}
+		
 		if( $new_perm_set_id )
 		{
 			$from = '';
@@ -713,8 +704,8 @@ class admin_members_groups_groups extends ipsCommand
 				}
 			}
 			
-			$this->registry->output->doneScreen( $this->lang->words['per_saved'], $this->lang->words['per_manage'], 'module=groups&amp;section=permissions&amp;do=edit_set_form' . $from . '&amp;id=' . $new_perm_set_id, 'redirect' );	
-			return;
+			$this->registry->output->global_message	= $this->lang->words['per_saved'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=groups&amp;section=permissions&amp;do=edit_set_form' . $from . '&amp;id=' . $new_perm_set_id );
 		}
 		else
 		{
@@ -739,7 +730,7 @@ class admin_members_groups_groups extends ipsCommand
 	/**
 	 * Rebuilds the group cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildGroupCache()
 	{
@@ -752,7 +743,7 @@ class admin_members_groups_groups extends ipsCommand
 		
 		while ( $i = $this->DB->fetch() )
 		{
-			$cache[ $i['g_id'] ] = IPSLib::unpackGroup( $i );
+			$cache[ $i['g_id'] ] = IPSMember::unpackGroup( $i );
 		}
 		
 		$this->cache->setCache( 'group_cache', $cache, array( 'array' => 1 ) );
@@ -762,9 +753,10 @@ class admin_members_groups_groups extends ipsCommand
 	 * Show the add/edit group form
 	 *
 	 * @param 	string		'add' or 'edit'
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
+	 * @todo	_initTab doesn't seem to work anymore with the new tabs, need to update each app to have a unique name/id
 	 */
-	private function _groupForm( $type='edit' )
+	protected function _groupForm( $type='edit' )
 	{
 		//-----------------------------------------
 		// Grab group data and start us off
@@ -778,7 +770,7 @@ class admin_members_groups_groups extends ipsCommand
 			}
 			
 			$group = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'groups', 'where' => "g_id=" . intval($this->request['id']) ) );
-			$group = IPSLib::unpackGroup( $group );
+			$group = IPSMember::unpackGroup( $group );
 		
 			//-----------------------------------------
 			// Check restrictions.
@@ -796,7 +788,7 @@ class admin_members_groups_groups extends ipsCommand
 			if( $this->request['id'] )
 			{
 				$group = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'groups', 'where' => "g_id=" . intval($this->request['id']) ) );
-				$group = IPSLib::unpackGroup( $group );
+				$group = IPSMember::unpackGroup( $group );
 			}
 
 			$group['g_title']	= 'New Group';
@@ -808,7 +800,7 @@ class admin_members_groups_groups extends ipsCommand
 		
 		$perm_masks = array();
 		
-		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms' ) );
+		$this->DB->build( array( 'select' => '*', 'from' => 'forum_perms', 'order' => 'perm_name ASC' ) );
 		$this->DB->execute();
 		
 		while ( $r = $this->DB->fetch() )
@@ -824,33 +816,28 @@ class admin_members_groups_groups extends ipsCommand
 
 		IPSLib::loadInterface( 'admin/group_form.php' );
 		
-		$tabsUsed	= 2;
-		$firsttab   = false;
+		$tabsUsed = 5;
+		$firstTab = empty($this->request['_initTab']) ? false : trim($this->request['_initTab']);
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
+			if ( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/group_form.php' ) )
 			{
-				continue;
-			}
-			
-			if ( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/group_form.php' ) )
-			{
-				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/group_form.php', 'admin_group_form__'.$app_dir, $app_dir );
+				$_class = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/group_form.php', 'admin_group_form__'.$app_dir, $app_dir );
 				
 				if ( class_exists( $_class ) )
 				{
 					$_object = new $_class( $this->registry );
-	
+					
 					$data = $_object->getDisplayContent( $group, $tabsUsed );
-					$blocks['area'][ $app_dir ]  = $data['content'];
-					$blocks['tabs'][ $app_dir ]  = $data['tabs'];
+					$blocks['area'][ $app_dir ] = $data['content'];
+					$blocks['tabs'][ $app_dir ] = $data['tabs'];
 					
-					$tabsUsed	= $data['tabsUsed'] ? ( $tabsUsed + $data['tabsUsed'] ) : ( $tabsUsed + 1 );
+					$tabsUsed = $data['tabsUsed'] ? ( $tabsUsed + $data['tabsUsed'] ) : ( $tabsUsed + 1 );
 					
-					if ( $this->request['_initTab'] == $app_dir )
+					if ( !empty($this->request['_initTab']) && $this->request['_initTab'] == $app_dir )
 					{
-						$firsttab = $tabsUsed;
+						$firstTab = $tabsUsed;
 					}
 				}
 			}
@@ -860,6 +847,6 @@ class admin_members_groups_groups extends ipsCommand
 		// And output to form
 		//-----------------------------------------
 		
-		$this->registry->output->html .= $this->html->groupsForm( $type, $group, $perm_masks, $blocks, $firsttab );
+		$this->registry->output->html .= $this->html->groupsForm( $type, $group, $perm_masks, $blocks, $firstTab );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/groups/index.html b/upload/admin/applications/members/modules_admin/groups/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/groups/index.html
+++ b/upload/admin/applications/members/modules_admin/groups/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/groups/permissions.php b/upload/admin/applications/members/modules_admin/groups/permissions.php
index ec450535..ccffc0c5 100644
--- a/upload/admin/applications/members/modules_admin/groups/permissions.php
+++ b/upload/admin/applications/members/modules_admin/groups/permissions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Permissions management
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-09-02 20:55:33 -0400 (Fri, 02 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 7007 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 9450 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,27 +30,27 @@ class admin_members_groups_permissions extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -86,12 +86,12 @@ class admin_members_groups_permissions extends ipsCommand
 			break;
 			
 			case 'view_perm_users':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_view' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'perms_manage' );
 				$this->permissionSetUsers();
 			break;	
 			
 			case 'remove_mask':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'permmasks_delete' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'perms_manage' );
 				$this->removePermissionSet();
 			break;					
 			
@@ -111,7 +111,7 @@ class admin_members_groups_permissions extends ipsCommand
 	/**
 	 * Removes permission set(s) from a user
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function removePermissionSet()
 	{
@@ -170,7 +170,7 @@ class admin_members_groups_permissions extends ipsCommand
 	/**
 	 * Show users that are assigned the specified permission set
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function permissionSetUsers()
 	{
@@ -260,9 +260,9 @@ class admin_members_groups_permissions extends ipsCommand
 	/**
 	 * Deletes a permission set
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _doDeleteSet()
+	protected function _doDeleteSet()
 	{
 		/* INIT */
 		$id  = $this->request['id'];
@@ -279,11 +279,11 @@ class admin_members_groups_permissions extends ipsCommand
 			/* Check to see if there is a permission map */
 			$_file = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/coreExtensions.php';
 			
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				/* Get the permission mappings */
 				$_PERM_CONFIG = array();
-				require_once( $_file );
+				require_once( $_file );/*noLibHook*/
 				
 				/* Check for a config array */
 				if( is_array( $_PERM_CONFIG ) && count( $_PERM_CONFIG ) )
@@ -327,18 +327,22 @@ class admin_members_groups_permissions extends ipsCommand
 		}
 		
 		/* Delete */
-		$this->DB->delete( 'forum_perms', "perm_id=$id" );
+		$this->DB->delete( 'forum_perms', "perm_id=" . $id );
+
+		/* Fire callbacks */
+		$this->_fireAppCallbacks();
 		
 		/* Done */
-		$this->registry->output->doneScreen( $this->lang->words['per_removed'], $this->lang->words['per_manage'], $this->form_code, 'redirect' );				
+		$this->registry->output->global_message	= $this->lang->words['per_removed'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	/**
 	 * Creates a nwe permission set
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */	
-	private function _doCreatePermissionSet()
+	protected function _doCreatePermissionSet()
 	{
 		/* INIT */
 		$set_name = $this->request['new_perm_name'];
@@ -363,11 +367,11 @@ class admin_members_groups_permissions extends ipsCommand
 			/* Check to see if there is a permission map */
 			$_file = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/coreExtensions.php';
 			
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				/* Get the permission mappings */
 				$_PERM_CONFIG = array();
-				require_once( $_file );
+				require_once( $_file );/*noLibHook*/
 				
 				/* Check for a config array */
 				if( is_array( $_PERM_CONFIG ) && count( $_PERM_CONFIG ) )
@@ -412,16 +416,20 @@ class admin_members_groups_permissions extends ipsCommand
 			$this->DB->update( 'permission_index', $r, "perm_id=" . $perm_id );
 		}
 		
+		/* Fire callbacks */
+		$this->_fireAppCallbacks();
+		
 		/* Done */
-		$this->registry->output->doneScreen( $this->lang->words['per_saved'], $this->lang->words['per_manage'], $this->form_code . 'do=edit_set_form&amp;id=' . $new_set_id, 'redirect' );		
+		$this->registry->output->global_message	= $this->lang->words['per_saved'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . 'do=edit_set_form&amp;id=' . $new_set_id );
 	}
 	
 	/**
 	 * Saves the global permission set form
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _permissionSaveForm()
+	protected function _permissionSaveForm()
 	{
 		/* ID */
 		$id        = intval( $this->request['id'] );
@@ -442,16 +450,20 @@ class admin_members_groups_permissions extends ipsCommand
 			$this->DB->update( 'forum_perms', array( 'perm_name' => $this->request['perm_name'] ), "perm_id={$id}" );
 		}
 		
+		/* Fire callbacks */
+		$this->_fireAppCallbacks();
+		
 		/* Done */
-		$this->registry->output->doneScreen( $this->lang->words['per_saved'], $this->lang->words['per_manage'], $this->form_code . '&amp;_from=' . $this->request['_from'], 'redirect' );		
+		$this->registry->output->global_message	= $this->lang->words['per_saved'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;_from=' . $this->request['_from'] );
 	}	
 	
 	/**
 	 * Form for modifying a permission set
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _permissionSetForm()
+	protected function _permissionSetForm()
 	{
 		/* ID */
 		$id			= intval( $this->request['id'] );
@@ -471,11 +483,11 @@ class admin_members_groups_permissions extends ipsCommand
 			/* Check to see if there is a permission map */
 			$_file = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/coreExtensions.php';
 			
-			if( file_exists( $_file ) )
+			if( is_file( $_file ) )
 			{
 				/* Get the permission mappings */
 				$_PERM_CONFIG = array();
-				require_once( $_file );
+				require_once( $_file );/*noLibHook*/
 				
 				/* Check for a config array */
 				if( is_array( $_PERM_CONFIG ) && count( $_PERM_CONFIG ) )
@@ -484,18 +496,19 @@ class admin_members_groups_permissions extends ipsCommand
 					foreach( $_PERM_CONFIG as $perm_type )
 					{
 						/* Check for a class */
-						$_class = $app['app_directory'] . 'PermMapping' . $perm_type;
-						
-						if( class_exists( $_class ) )
+						$classToLoad = IPSLib::loadLibrary( '', $app['app_directory'] . 'PermMapping' . $perm_type, $app['app_directory'] );
+
+						if( class_exists( $classToLoad ) )
 						{
 							/* Create the object */
-							$perm_map = new $_class;
+							$perm_map = new $classToLoad;
 							
 							/* Make sure the function exists */
 							if( method_exists( $perm_map, 'getPermItems' ) )
 							{
-								$matricies[$app['app_title']]	= $perm_obj->adminItemPermMatrix( $perm_map, $perm_map->getPermItems(), $id, $app['app_directory'], $perm_type );
-								$apps[$app['app_directory']]	= $perm_type;
+								$_key	= count($_PERM_CONFIG) > 1 ? $app['app_title'] . ' ' . $perm_type : $app['app_title'];
+								$matricies[ $_key ]				= $perm_obj->adminItemPermMatrix( $perm_map, $perm_map->getPermItems(), $id, $app['app_directory'], $perm_type );
+								$apps[$app['app_directory']][ $perm_type ]	= $perm_type;
 							}
 						}
 					}
@@ -510,9 +523,9 @@ class admin_members_groups_permissions extends ipsCommand
 	/**
 	 * List permission masks
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _mainScreen()
+	protected function _mainScreen()
 	{
 		/* INIT */
 		$perms   = array();
@@ -598,7 +611,7 @@ class admin_members_groups_permissions extends ipsCommand
 				$groups_used = "{$this->lang->words['per_none']}";
 			}			
 			
-			if ( isset($mems[ $id ]) AND $mems[ $id ] > 0 )
+			if ( !empty($mems[ $id ]) )
 			{
 				$is_active = 1;
 			}
@@ -628,4 +641,35 @@ class admin_members_groups_permissions extends ipsCommand
 		
 		$this->registry->output->html .= $this->html->permissionsSplash( $display_groups, $dlist );
 	}
+	
+	/**
+	 * Fire any application callbacks as needed
+	 *
+	 * @return	@e void
+	 */
+	protected function _fireAppCallbacks()
+	{
+		//-----------------------------------------
+		// Loop through each application
+		//-----------------------------------------
+		
+		foreach( $this->registry->getApplications() as $app )
+		{
+			// Let's skip the app_enabled check to be sure everything is always recached!
+			
+			//-----------------------------------------
+			// Check for callback file
+			//-----------------------------------------
+			
+			$_file = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/permissionsSync.php';
+			
+			if( is_file( $_file ) )
+			{
+				$classToLoad	= IPSLib::loadLibrary( $_file, $app['app_directory'] . 'PermissionsSync', $app['app_directory'] );
+				$_callback		= new $classToLoad( $this->registry );
+		
+				$_callback->updatePermissions();
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/groups/xml/index.html b/upload/admin/applications/members/modules_admin/groups/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/groups/xml/index.html
+++ b/upload/admin/applications/members/modules_admin/groups/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/groups/xml/menu.xml b/upload/admin/applications/members/modules_admin/groups/xml/menu.xml
index 60356f00..f34d9d97 100644
--- a/upload/admin/applications/members/modules_admin/groups/xml/menu.xml
+++ b/upload/admin/applications/members/modules_admin/groups/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление группами пользователей</subitemtitle>
+					<subitemlang>manage_groups</subitemlang>
 					<subsection>groups</subsection>
 					<subitemurl>do=groups_overview</subitemurl>
 					<subitemrolekey></subitemrolekey>
@@ -18,9 +19,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление ма�ками до�тупа</subitemtitle>
+					<subitemlang>manage_perms</subitemlang>
 					<subsection>permissions</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>perms_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
diff --git a/upload/admin/applications/members/modules_admin/index.html b/upload/admin/applications/members/modules_admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/index.html
+++ b/upload/admin/applications/members/modules_admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/banfilters.php b/upload/admin/applications/members/modules_admin/members/banfilters.php
index 26d146ec..705dc89e 100644
--- a/upload/admin/applications/members/modules_admin/members/banfilters.php
+++ b/upload/admin/applications/members/modules_admin/members/banfilters.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Ban Filters
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- *
+ * @file		banfilters.php 	Provides helper methods to add ban filters
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-03-22 12:48:06 -0400 (Tue, 22 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8149 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -24,64 +17,51 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		admin_members_members_banfilters
+ * @brief		Provides helper methods to add ban filters
+ */
 class admin_members_members_banfilters extends ipsCommand
 {
 	/**
-	 * Skin object
+	 * Skin object shortcut
 	 *
-	 * @access	private
-	 * @var		object			Skin templates
-	 */	
-	private $html;
+	 * @var		$html
+	 */
+	public $html;
 	
 	/**
-	 * Shortcut for url
+	 * String for the screen url bit
 	 *
-	 * @access	private
-	 * @var		string			URL shortcut
+	 * @var		$form_code
 	 */
-	private $form_code;
+	public $form_code    = '';
 	
 	/**
-	 * Shortcut for url (javascript)
+	 * String for the JS url bit
 	 *
-	 * @access	private
-	 * @var		string			JS URL shortcut
+	 * @var		$form_code_js
 	 */
-	private $form_code_js;
+	public $form_code_js = '';
 
 	/**
-	 * Main class entry point
+	 * Main function executed automatically by the controller
 	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
-		//-----------------------------------------
-		// Load skin
-		//-----------------------------------------
+		/* Load skin & setup some stuff */
+		$this->html			= $this->registry->output->loadTemplate( 'cp_skin_banfilters' );
+		$this->form_code	= $this->html->form_code	= 'module=members&amp;section=banfilters&amp;';
+		$this->form_code_js	= $this->html->form_code_js	= 'module=members&section=banfilters&';
 		
-		$this->html = $this->registry->output->loadTemplate( 'cp_skin_banfilters' );
-		
-		//-----------------------------------------
-		// Set up stuff
-		//-----------------------------------------
-		
-		$this->form_code	= $this->html->form_code	= 'module=members&amp;section=banfilters';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=members&section=banfilters';
-		
-		//-----------------------------------------
-		// Load lang
-		//-----------------------------------------
+		/* Load lang */
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_member' ), 'members' );
 				
-		$this->registry->class_localization->loadLanguageFile( array( 'admin_member' ) );
-				
-		//-----------------------------------------
-		// What to do...
-		//-----------------------------------------
-		
+		/* What to do... */
 		switch( $this->request['do'] )
 		{				
 			case 'ban_add':
@@ -101,22 +81,76 @@ class admin_members_members_banfilters extends ipsCommand
 			break;			
 		}
 		
-		//-----------------------------------------
-		// Pass to CP output hander
-		//-----------------------------------------
-		
+		/* Output */
 		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
 		$this->registry->output->sendOutput();		
 	}
 	
+	/**
+	 * Displays the ban overview screen
+	 *
+	 * @return	@e void
+	 */
+	public function banOverview()
+	{
+		/* INI */
+		$ban	= array();
+		$ips	= array();
+		$emails	= array();
+		$names	= array();
+		
+		/* Get ban filters */
+		$this->DB->build( array( 'select' => '*', 'from' => 'banfilters', 'order' => 'ban_date desc' ) );
+		$this->DB->execute();
+		
+		while ( $r = $this->DB->fetch() )
+		{
+			$ban[ $r['ban_type'] ][ $r['ban_id'] ] = $r;
+		}
+		
+		/* IPs */
+		if( isset( $ban['ip'] ) AND is_array( $ban['ip'] ) AND count( $ban['ip'] ) )
+		{
+			foreach( $ban['ip'] as $entry )
+			{
+				$entry['_date'] = $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT', 1 );
+				$ips[] = $entry;
+			}
+		}
+		
+		/* Emails */
+		if( isset( $ban['email'] ) AND is_array( $ban['email'] ) AND count( $ban['email'] ) )
+		{
+			foreach( $ban['email'] as $entry )
+			{
+				$entry['_date'] = $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT' );
+				$emails[] = $entry;
+			}
+		}
+		
+		/* Banned Names */
+		if( isset( $ban['name'] ) AND is_array( $ban['name'] ) AND count( $ban['name'] ) )
+		{
+			foreach( $ban['name'] as $entry )
+			{
+				$entry['_date'] = $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT' );
+				$names[] = $entry;
+			}
+		}
+		
+		/* Output */
+		$this->registry->output->html .= $this->html->banOverview( $ips, $emails, $names );
+	}
+	
 	/**
 	 * Add a new ban filter
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function banAdd()
 	{
+		$this->request['bantext'] = trim($this->request['bantext']);
+		
 		/* Error checking */
 		if( ! $this->request['bantext'] )
 		{
@@ -126,11 +160,10 @@ class admin_members_members_banfilters extends ipsCommand
 		}
 		
 		/* Check for duplicate */
-		$result = $this->DB->buildAndFetch( array( 
-														'select' => '*', 
-														'from'   => 'banfilters', 
-														'where'  => "ban_content='{$this->request['bantext']}' and ban_type='{$this->request['bantype']}'" 
-												)	 );
+		$result = $this->DB->buildAndFetch( array( 'select' => '*', 
+												   'from'   => 'banfilters',
+												   'where'  => "ban_content='{$this->request['bantext']}' and ban_type='{$this->request['bantype']}'" 
+										   )	  );
 		
 		if ( $result['ban_id'] )
 		{
@@ -140,21 +173,24 @@ class admin_members_members_banfilters extends ipsCommand
 		}
 		
 		/* Insert the new ban filter */
-		$this->DB->insert( 'banfilters', array( 'ban_type' => $this->request['bantype'], 'ban_content' => trim( $this->request['bantext'] ), 'ban_date' => time() ) );
+		$this->DB->insert( 'banfilters', array( 'ban_type'	  => trim($this->request['bantype']),
+												'ban_content' => trim($this->request['bantext']),
+												'ban_date'    => time(),
+												'ban_reason'  => trim($this->request['banreason'])
+												)
+						  );
 		
 		/* Rebuild cacne and bounce */
 		$this->rebuildBanCache();
 		
-		$this->registry->output->global_message = $this->lang->words['ban_added'];		
-		$this->banOverview();
-		
-	}	
+		$this->registry->output->global_message = $this->lang->words['ban_added'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'].$this->form_code.'do=ban' );
+	}
 	
 	/**
 	 * Delete a ban filter
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function banDelete()
 	{
@@ -164,7 +200,7 @@ class admin_members_members_banfilters extends ipsCommand
 		/* Loop through the request fields and find checked ban filters */
 		foreach( $this->request as $key => $value )
 		{
-			if( preg_match( "/^id_(\d+)$/", $key, $match ) )
+			if( preg_match( '/^banid_(\d+)$/', $key, $match ) )
 			{
 				if( $this->request[ $match[0] ] )
 				{
@@ -180,7 +216,6 @@ class admin_members_members_banfilters extends ipsCommand
 		if ( count( $ids ) )
 		{
 			$this->DB->delete( 'banfilters', 'ban_id IN(' . implode( ",", $ids ) . ')' );
-			$this->DB->execute();
 		}
 		
 		/* Rebuild the cache */
@@ -188,77 +223,13 @@ class admin_members_members_banfilters extends ipsCommand
 		
 		/* Bounce */
 		$this->registry->output->global_message = $this->lang->words['ban_removed'];
-		$this->banOverview();
-	}	
-	
-	/**
-	 * Displays the ban overview screen
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function banOverview()
-	{
-		/* INI */
-		$ban = array();
-		
-		/* Get ban filters */
-		$this->DB->build( array( 'select' => '*', 'from' => 'banfilters', 'order' => 'ban_date desc' ) );
-		$this->DB->execute();
-		
-		while ( $r = $this->DB->fetch() )
-		{
-			$ban[ $r['ban_type'] ][ $r['ban_id'] ] = $r;
-		}
-		
-		/* IPs */
-		$ips = array();
-		
-		if( isset( $ban['ip'] ) AND is_array( $ban['ip'] ) AND count( $ban['ip'] ) )
-		{
-			foreach( $ban['ip'] as $entry )
-			{
-				$entry['_checkbox'] = "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />";
-				$entry['_date']     =  $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT' );
-				$ips[] = $entry;
-			}
-		}
-		
-		/* Emails */
-		$emails = array();
-		
-		if( isset( $ban['email'] ) AND  is_array( $ban['email'] ) AND count( $ban['email'] ) )
-		{
-			foreach( $ban['email'] as $entry )
-			{
-				$entry['_checkbox'] = "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />";
-				$entry['_date']     =  $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT' );
-				$emails[] = $entry;
-			}
-		}
-		
-		/* Banned Names */
-		$names = array();
-		
-		if( isset( $ban['name'] ) AND is_array( $ban['name'] ) AND count( $ban['name'] ) )
-		{
-			foreach( $ban['name'] as $entry )
-			{
-				$entry['_checkbox'] = "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />";
-				$entry['_date']     =  $this->registry->class_localization->getDate( $entry['ban_date'], 'SHORT' );
-				$names[] = $entry;
-			}
-		}
-		
-		/* Output */
-		$this->registry->output->html .= $this->html->banOverview( $ips, $emails, $names );
-	}	
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'].$this->form_code.'do=ban' );
+	}
 	
 	/**
 	 * Rebuilds the ban cache
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildBanCache()
 	{
@@ -266,7 +237,7 @@ class admin_members_members_banfilters extends ipsCommand
 		$cache = array();
 		
 		/* Get the ban filters */
-		$this->DB->build( array( 'select' => 'ban_content', 'from' => 'banfilters', 'where' => "ban_type='ip' AND ban_nocache=0" ) );
+		$this->DB->build( array( 'select' => 'ban_content', 'from' => 'banfilters', 'where' => "ban_type='ip'" ) );
 		$this->DB->execute();
 		
 		while ( $r = $this->DB->fetch() )
diff --git a/upload/admin/applications/members/modules_admin/members/defaultSection.php b/upload/admin/applications/members/modules_admin/members/defaultSection.php
index 5730aee0..fdfaa0dc 100644
--- a/upload/admin/applications/members/modules_admin/members/defaultSection.php
+++ b/upload/admin/applications/members/modules_admin/members/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default members section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'members' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'members';
\ No newline at end of file
+$DEFAULT_SECTION = 'members';
diff --git a/upload/admin/applications/members/modules_admin/members/editform.php b/upload/admin/applications/members/modules_admin/members/editform.php
new file mode 100644
index 00000000..0142c0f4
--- /dev/null
+++ b/upload/admin/applications/members/modules_admin/members/editform.php
@@ -0,0 +1,377 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Member property updater (AJAX)
+ * Last Updated: $Date: 2011-06-06 18:06:01 -0400 (Mon, 06 Jun 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @version		$Revision: 8982 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class admin_members_members_editform extends ipsCommand 
+{
+	/**
+	 * Main class entry point
+	 *
+	 * @param	object		ipsRegistry reference
+	 * @return	@e void		[Outputs to screen]
+	 */
+	public function doExecute( ipsRegistry $registry )
+	{
+		$this->registry->class_localization->loadLanguageFile( array( 'admin_member' ), 'members' );
+		
+    	switch( $this->request['do'] )
+    	{
+			case 'save_display_name':
+				$this->save_member_name( 'members_display_name' );
+			break;
+			case 'save_name':
+				$this->save_member_name( 'name' );
+			break;
+			case 'save_password':
+				$this->save_password();
+			break;
+			case 'save_email':
+				$this->save_email();
+			break;
+    	}
+	}
+
+	/**
+	 * Change a member's email address
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function save_email()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$member_id	= intval( $this->request['member_id'] );
+		$email		= trim( $this->request['email'] );
+		
+		//-----------------------------------------
+		// Get member
+		//-----------------------------------------
+		
+		$member = IPSMember::load( $member_id );
+																	
+		if ( ! $member['member_id'] )
+		{
+			$this->registry->output->showError( $this->lang->words['m_noid'] );
+		}
+		
+		//-----------------------------------------
+		// Allowed to edit administrators?
+		//-----------------------------------------
+		
+		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
+		{
+			$this->registry->output->showError( $this->lang->words['m_editadmin'] );
+		}
+		
+		//-----------------------------------------
+		// Is this email addy taken? CONVERGE THIS??
+		//-----------------------------------------
+		
+		$email_check = IPSMember::load( strtolower($email) );
+		
+		if ( $email_check['member_id'] AND $email_check['member_id'] != $member_id )
+		{
+			$this->registry->output->showError( $this->lang->words['m_emailalready'] );
+		}
+		
+        //-----------------------------------------
+    	// Load handler...
+    	//-----------------------------------------
+    	
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+		$han_login   = new $classToLoad( $this->registry );
+    	$han_login->init();
+    	$han_login->changeEmail( trim( strtolower( $member['email'] ) ), trim( strtolower( $email ) ), $member );
+    	
+    	//-----------------------------------------
+    	// We don't want to die just from a Converge error
+    	//-----------------------------------------
+    	
+    	/*if ( $han_login->return_code AND ( $han_login->return_code != 'METHOD_NOT_DEFINED' AND $han_login->return_code != 'SUCCESS' ) )
+	    {
+			$this->returnJsonError( $this->lang->words['m_emailalready'] );
+			exit();
+    	}*/
+    	
+		//-----------------------------------------
+		// Update member
+		//-----------------------------------------
+		
+		IPSLib::runMemberSync( 'onEmailChange', $member_id, strtolower( $email ), $member['email'] );
+		
+		IPSMember::save( $member_id, array( 'core' => array( 'email' => strtolower( $email ) ) ) );
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_emailchangelog'], $member['email'], $email, $member_id ) );
+
+		$this->registry->output->global_message	= $this->lang->words['email_updated_success'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
+	}
+	
+	/**
+	 * Change a member's password
+	 *
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function save_password()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$member_id		= intval( $this->request['member_id'] );
+		$password		= IPSText::parseCleanValue( $_POST['password'] );
+		$password2		= IPSText::parseCleanValue( $_POST['password2'] );
+		$new_key		= intval( $this->request['new_key'] );
+		$new_salt		= intval( $this->request['new_salt'] );
+		$salt			= str_replace( '\\', "\\\\", IPSMember::generatePasswordSalt(5) );
+		$key			= IPSMember::generateAutoLoginKey();
+		$md5_once		= md5( trim($password) );
+		
+		//-----------------------------------------
+		// AJAX debug
+		//-----------------------------------------
+		
+		IPSDebug::fireBug( 'info', array( 'Password: ' . $password ) );
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+
+		if ( ! $password OR ! $password2 )
+		{
+			$this->registry->output->showError( $this->lang->words['password_nogood'] );
+		}
+		
+		if ( $password != $password2 )
+		{
+			$this->registry->output->showError( $this->lang->words['m_passmatch'] );
+		}
+
+		//-----------------------------------------
+		// Get member
+		//-----------------------------------------
+		
+		$member = IPSMember::load( $member_id );
+		
+		//-----------------------------------------
+		// Allowed to edit administrators?
+		//-----------------------------------------
+		
+		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
+		{
+			$this->registry->output->showError( $this->lang->words['m_editadmin'] );
+		}
+		
+		//-----------------------------------------
+		// Check Converge: Password
+		//-----------------------------------------
+    	
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+		$han_login   = new $classToLoad( $this->registry );
+    	$han_login->init();
+    	$han_login->changePass( $member['email'], $md5_once, $password, $member );
+    	
+    	/*if ( $han_login->return_code != 'METHOD_NOT_DEFINED' AND $han_login->return_code != 'SUCCESS' )
+    	{
+			$this->returnJsonError( $this->lang->words['m_passchange']);
+			exit();
+    	}*/
+		
+		//-----------------------------------------
+		// Local DB
+		//-----------------------------------------
+		
+		$update = array();
+		
+		if( $new_salt )
+		{
+			$update['members_pass_salt']	= $salt;
+		}
+		
+		if( $new_key )
+		{
+			$update['member_login_key']		= $key;
+		}
+		
+		if( count($update) )
+		{
+			IPSMember::save( $member_id, array( 'core' => $update ) );
+		}
+		
+		IPSMember::updatePassword( $member_id, $md5_once );
+		IPSLib::runMemberSync( 'onPassChange', $member_id, $password );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_passlog'], $member_id ) );
+
+		$this->registry->output->global_message	= $this->lang->words['pw_updated_success'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
+	}
+	
+	/**
+	 * Update a user's login or display name
+	 *
+	 * @param	string		Field to update
+	 * @return	@e void		[Outputs to screen]
+	 */
+	protected function save_member_name( $field='members_display_name' )
+	{
+		$member_id	= intval( $this->request['member_id'] );
+		
+		$member = IPSMember::load( $member_id );
+		
+		//-----------------------------------------
+		// Allowed to edit administrators?
+		//-----------------------------------------
+		
+		if( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_edit_admin', 'members', 'members' ) )
+		{
+			$this->registry->output->showError( $this->lang->words['m_editadmin'] );
+		}
+		
+		if ( $field == 'members_display_name' )
+		{
+			$display_name	= $this->request['display_name'];
+    		$display_name	= str_replace("&#43;", "+", $display_name );
+    	}
+		else
+		{
+			$display_name	= $this->request['name'];
+    		$display_name	= str_replace("&#43;", "+", $display_name );
+    		
+			$display_name = str_replace( '|', '&#124;' , $display_name );
+			$display_name = trim( preg_replace( "/\s{2,}/", " ", $display_name ) );    		
+		}
+		
+		if ( $this->settings['strip_space_chr'] )
+    	{
+    		// use hexdec to convert between '0xAD' and chr
+			$display_name          = IPSText::removeControlCharacters( $display_name );
+		}
+		
+		if ( $field == 'members_display_name' AND preg_match( "#[\[\];,\|]#", str_replace( '&#39;', "'", str_replace( '&amp;', '&', str_replace( '&quot;', '"', str_replace( '&#33;', '!', $display_name ) ) ) ) ) )
+		{
+			$this->registry->output->showError( $this->lang->words['m_displaynames'] );
+		}
+		
+		try
+		{
+			if ( IPSMember::getFunction()->updateName( $member_id, $display_name, $field ) === TRUE )
+			{
+				if ( $field == 'members_display_name' )
+				{
+					ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_dnamelog'], $member['members_display_name'], $display_name ));
+				}
+				else
+				{
+					ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_namelog'], $member['name'], $display_name ) );
+					
+					//-----------------------------------------
+					// If updating a name, and display names 
+					//	disabled, update display name too
+					//-----------------------------------------
+					
+					if( !ipsRegistry::$settings['auth_allow_dnames'] )
+					{
+						IPSMember::getFunction()->updateName( $member_id, $display_name, 'members_display_name' );
+					}
+
+					//-----------------------------------------
+					// I say, did we choose to email 'dis member?
+					//-----------------------------------------
+
+					if ( $this->request['send_email'] == 1 )
+					{
+						//-----------------------------------------
+						// By golly, we did!
+						//-----------------------------------------
+
+						$msg = trim( IPSText::stripslashes( nl2br( $_POST['email_contents'] ) ) );
+
+						$msg = str_replace( "{old_name}", $member['name'], $msg );
+						$msg = str_replace( "{new_name}", $display_name  , $msg );
+						$msg = str_replace( "<#BOARD_NAME#>", $this->settings['board_name'], $msg );
+						$msg = str_replace( "<#BOARD_ADDRESS#>", $this->settings['board_url'] . '/index.' . $this->settings['php_ext'], $msg );
+
+						IPSText::getTextClass('email')->message	= stripslashes( IPSText::getTextClass('email')->cleanMessage($msg) );
+						IPSText::getTextClass('email')->subject	= $this->lang->words['m_changesubj'];
+						IPSText::getTextClass('email')->to		= $member['email'];
+						IPSText::getTextClass('email')->sendMail();
+					}
+				}
+				
+				$this->cache->rebuildCache( 'stats', 'global' );
+			}
+			else
+			{
+				# We should absolutely never get here. So this is a fail-safe, really to
+				# prevent a "false" positive outcome for the end-user
+				$this->registry->output->showError( $this->lang->words['m_namealready'] );
+			}
+		}
+		catch( Exception $error )
+		{
+		//	$this->returnJsonError( $error->getMessage() );
+			
+			switch( $error->getMessage() )
+			{
+				case 'NO_USER':
+					$this->registry->output->showError( $this->lang->words['m_noid'] );
+				break;
+				case 'NO_PERMISSION':
+				case 'NO_NAME':
+					$this->registry->output->showError( sprintf($this->lang->words['m_morethan3'], $this->settings['max_user_name_length'] ) );
+				break;
+				case 'ILLEGAL_CHARS':
+					$this->registry->output->showError( $this->lang->words['m_illegal'] );
+				break;
+				case 'USER_NAME_EXISTS':
+					$this->registry->output->showError( $this->lang->words['m_namealready'] );
+				break;
+				default:
+					$this->registry->output->showError( $error->getMessage() );
+				break;
+			}
+		}
+		
+        //-----------------------------------------
+    	// Load handler...
+    	//-----------------------------------------
+    	
+    	if( $field == 'name' )
+    	{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$han_login   = new $classToLoad( $this->registry );
+	    	$han_login->init();
+	    	$han_login->changeName( $member['name'], $display_name, $member['email'], $member );
+    	}
+    	else
+    	{
+    		IPSLib::runMemberSync( 'onNameChange', $member_id, $display_name );
+    	}
+
+		$this->registry->output->global_message	= $this->lang->words[ $field . '_updated_success'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'module=members&do=viewmember&member_id=' . $member_id );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/index.html b/upload/admin/applications/members/modules_admin/members/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/members/index.html
+++ b/upload/admin/applications/members/modules_admin/members/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/members.php b/upload/admin/applications/members/modules_admin/members/members.php
index d9f75b99..f2248e39 100644
--- a/upload/admin/applications/members/modules_admin/members/members.php
+++ b/upload/admin/applications/members/modules_admin/members/members.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Member management
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7007 $
+ * @file		members.php 	Provides methods to deal with the members management for administrators
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		1st March 2002
+ * $LastChangedDate: 2011-10-07 22:31:51 -0400 (Fri, 07 Oct 2011) $
+ * @version		v3.2.3
+ * $Revision: 9588 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -24,41 +18,39 @@ if ( ! defined( 'IN_ACP' ) )
 }
 
 
+/**
+ *
+ * @class		admin_members_members_members
+ * @brief		Provides methods to deal with the members management for administrators
+ */
 class admin_members_members_members extends ipsCommand
 {
 	/**
-	 * Skin object
+	 * Skin object shortcut
 	 *
-	 * @var		object			Skin templates
+	 * @var		$html
 	 */
-	private $html;
+	public $html;
 	
 	/**
-	 * Shortcut for url
+	 * String for the screen url bit
 	 *
-	 * @var		string			URL shortcut
+	 * @var		$form_code
 	 */
-	private $form_code;
+	public $form_code    = '';
 	
 	/**
-	 * Shortcut for url (javascript)
+	 * String for the JS url bit
 	 *
-	 * @var		string			JS URL shortcut
+	 * @var		$form_code_js
 	 */
-	private $form_code_js;
+	public $form_code_js = '';
 
 	/**
-	 * Trash can forum id
+	 * Main function executed automatically by the controller
 	 *
-	 * @var		integer			Trash can forum
-	 */
-	private $trash_forum		= 0;
-
-	/**
-	 * Main class entry point
-	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -79,7 +71,7 @@ class admin_members_members_members extends ipsCommand
 		// Load lang
 		//-----------------------------------------
 				
-		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_member' ) );
+		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_member' ), 'members' );
 
 		///-----------------------------------------
 		// What to do...
@@ -156,11 +148,7 @@ class admin_members_members_members extends ipsCommand
 				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_edit' );
 				$this->_viewMemberRep();
 			break;
-			
-			case 'remoteAvatarRedirect':
-				$this->_viewMemberAvatar();
-			break;
-			
+
 			case 'members_overview':
 			case 'members_list':
 			default:
@@ -175,32 +163,20 @@ class admin_members_members_members extends ipsCommand
 		$this->registry->getClass('output')->html_main .= $this->registry->getClass('output')->global_template->global_frame_wrapper();
 		$this->registry->getClass('output')->sendOutput();
 	}
-	
-	/**
-	 * View remote avatar without passing referrer
-	 *
-	 * @return	void
-	 */
-	protected function _viewMemberAvatar()
-	{
-		$id		= intval($this->request['member_id']);
-		
-		$this->registry->output->silentRedirect( "{$this->settings['board_url']}/interface/board/avatar_viewer.php?id={$id}" );
-	}
-	
+
 	/**
 	 * View a member's reputation level
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _viewMemberRep()
 	{
 		/* ID */
-		$id   = intval( $this->request['id'] );
-		$type = $this->request['type'] == 'given' ? 'given' : 'received';
+		$id		= intval( $this->request['id'] );
+		$type	= $this->request['type'] == 'given' ? 'given' : 'received';
 		
 		/* Get Name */
-		$user = $this->DB->buildAndFetch( array( 'select' => 'members_display_name', 'from' => 'members', 'where' => "member_id={$id}" ) );
+		$user	= $this->DB->buildAndFetch( array( 'select' => 'members_display_name', 'from' => 'members', 'where' => 'member_id=' . $id ) );
 		
 		/* Get an array of application tabs */
 		$this->request['appView']	= $this->request['appView'] ? $this->request['appView'] : 'forums';
@@ -208,10 +184,12 @@ class admin_members_members_members extends ipsCommand
 		
 		foreach( ipsRegistry::$applications as $app )
 		{
-			if( file_exists( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/reputation.php' ) )
+			if( is_file( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/reputation.php' ) )
 			{
 				/* Get the rep config file */
-				require_once( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/reputation.php' );
+				$rep_log_joins = $rep_log_where =$rep_log_link = $rep_log_link_callback = $rep_log_title_callback = '';
+				
+				require_once( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/reputation.php' );/*maybeLibHook*/
 				
 				if( $rep_log_joins && $rep_log_where && $rep_log_link )
 				{
@@ -249,9 +227,9 @@ class admin_members_members_members extends ipsCommand
 			$total = $this->DB->buildAndFetch( array(
 														'select'   => 'count(*) as reps',
 														'from'     => array( 'reputation_index' => 'r' ),
-														'where'    => sprintf( $rep_log_where, $id ) . " AND app='{$this->request['appView']}'",
+														'where'    => sprintf( $rep_log_where, $id ) . " AND r.app='{$this->request['appView']}'",
 														'add_join' => $rep_log_joins,
-														'group'    => 'r.member_id',
+														//'group'    => 'r.member_id', 	@link http://community.invisionpower.com/tracker/issue-29888-received-reputation-in-acp
 											)	);
 		}
 		else
@@ -269,13 +247,12 @@ class admin_members_members_members extends ipsCommand
 														'where'		=> "member_id={$id} AND app='{$this->request['appView']}'"
 											)	);
 		}
-		
+
 		/* Pagination */
-		$perpage = 25;
-		$st      = intval( $this->request['st'] );
+		$perpage	= 25;
+		$st			= intval( $this->request['st'] );
 		
-		$pages = $this->registry->output->generatePagination( array( 
-																	'totalItems'         => $total['reps'],
+		$pages = $this->registry->output->generatePagination( array('totalItems'         => $total['reps'],
 																	'itemsPerPage'       => $perpage,
 																	'currentStartValue'  => $st,
 																	'baseUrl'            => "{$this->settings['base_url']}{$this->form_code}&do=view_rep&id={$id}&type={$type}&appView={$this->request['appView']}",
@@ -286,15 +263,13 @@ class admin_members_members_members extends ipsCommand
 		{
 			$title = "{$this->lang->words['rep_received']} {$user['members_display_name']}";
 			
-			$this->DB->build( array(
-										'select'   => 'r.*',
-										'from'     => array( 'reputation_index' => 'r' ),
-										'where'    => sprintf( $rep_log_where, $id ) . " AND app='{$this->request['appView']}'",
-										'limit'    => array( $st, $perpage ),
-										'order'    => 'r.rep_date DESC',
-										'add_join' => $rep_log_joins
-										
-							)	);
+			$this->DB->build( array('select'   => 'r.*',
+									'from'     => array( 'reputation_index' => 'r' ),
+									'where'    => sprintf( $rep_log_where, $id ) . " AND r.app='{$this->request['appView']}'",
+									'limit'    => array( $st, $perpage ),
+									'order'    => 'r.rep_date DESC',
+									'add_join' => $rep_log_joins
+							)		);
 			$outer	= $this->DB->execute();
 		}
 		else
@@ -302,21 +277,19 @@ class admin_members_members_members extends ipsCommand
 			/* Title */
 			$title = "{$this->lang->words['rep_given']} {$user['members_display_name']}";
 
-			$this->DB->build( array(
-										'select'   => 'r.*',
-										'from'     => array( 'reputation_index' => 'r' ),
-										'where'    => "r.member_id={$id	} AND app='{$this->request['appView']}'",
-										'limit'    => array( $st, $perpage ),
-										'order'    => 'r.rep_date DESC',
-										'add_join' => $rep_log_joins
-							)	);
+			$this->DB->build( array('select'   => 'r.*',
+									'from'     => array( 'reputation_index' => 'r' ),
+									'where'    => "r.member_id={$id	} AND r.app='{$this->request['appView']}'",
+									'limit'    => array( $st, $perpage ),
+									'order'    => 'r.rep_date DESC',
+									'add_join' => $rep_log_joins
+							)		);
 			$outer	= $this->DB->execute();
 		}
 
 		/* Build Output Rows */
-		$rows = array();
-		
-		$rep_log_link = "{$this->settings['board_url']}/index.php?" . $rep_log_link;
+		$rows			= array();
+		$rep_log_link	= "{$this->settings['board_url']}/index.php?" . $rep_log_link;
 		
 		while( $r = $this->DB->fetch($outer) )
 		{
@@ -341,9 +314,9 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Determines if we should show the admin restrictions form stuff
 	 *
-	 * @param	array		Member information
-	 * @param	array		Old member groups [primary and secondary]
-	 * @return	mixed		False, or HTML [Outputs to screen]
+	 * @param	array		$member			Member information
+	 * @param	array		$old_mgroups	Old member groups [primary and secondary]
+	 * @return	@e boolean	When TRUE adds HTML to the output
 	 * @author	Brandon Farber
 	 */
 	protected function _showAdminForm( $member, $old_mgroups )
@@ -433,9 +406,9 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Uploads a new photo for the member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
-	private function _memberNewPhoto()
+	protected function _memberNewPhoto()
 	{
 		if ( !$this->request['member_id'] )
 		{
@@ -455,12 +428,16 @@ class admin_members_members_members extends ipsCommand
 			return;
 		}
 		
-		$status = IPSMember::getFunction()->uploadPhoto( intval($this->request['member_id']) );
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+		$photos			= new $classToLoad( $this->registry );
+		
+		$status	= $photos->uploadPhoto( intval($this->request['member_id']) );
 
 		if( $status['status'] == 'fail' )
 		{
 			switch( $status['error'] )
 			{
+				default:
 				case 'upload_failed':
 					$this->registry->output->showError( $this->lang->words['m_upfailed'], 11225 );
 				break;
@@ -476,8 +453,10 @@ class admin_members_members_members extends ipsCommand
 		}
 		else
 		{
-			$bwOptions	= IPSBWOptions::thaw( $member['fb_bwoptions'], 'facebook' );
-			$bwOptions['fbc_s_pic']	= 0;
+			$bwOptions					= IPSBWOptions::thaw( $member['fb_bwoptions'], 'facebook' );
+			$tcbwOptions				= IPSBWOptions::thaw( $member['tc_bwoptions'], 'twitter' );
+			$bwOptions['fbc_s_pic']		= 0;
+			$tcbwOptions['tc_s_pic']	= 0;
 
 			IPSMember::save( $this->request['member_id'], array( 'extendedProfile' => array( 'pp_main_photo'   => $status['final_location'],
 													  				   	 	'pp_main_width'		=> intval($status['final_width']),
@@ -487,23 +466,25 @@ class admin_members_members_members extends ipsCommand
 																			'pp_thumb_height'	=> intval($status['t_final_height']),
 																			'fb_photo'			=> '',
 																			'fb_photo_thumb'	=> '',
-																			'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' )
+																			'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' ),
+																			'tc_photo'			=> '',
+																			'tc_bwoptions'		=> IPSBWOptions::freeze( $tcbwOptions, 'twitter' ),
 																		 ) ) );
 																		 			
 			//-----------------------------------------
 			// Redirect
 			//-----------------------------------------
-	
-			$this->registry->output->doneScreen( $this->lang->words['m_photoupdated'], $this->lang->words['m_search'], "{$this->form_code}&amp;do=viewmember&amp;member_id={$this->request['member_id']}", "redirect" );
+
+			$this->registry->output->global_message	= $this->lang->words['m_photoupdated'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=viewmember&amp;member_id=' . $this->request['member_id'] );
 		}
 	}
 	
 	/**
 	 * View a member's details
 	 *
-	 * @return	void		[Outputs to screen]
-	 * @todo 	[Future] If PM disabled, remove the PM-related settings
-	 * @todo 	[Future] Settings: joined, email_full, dst_in_use, view_prefs, coppa_user, auto_track, ignored_users, members_auto_dst, 
+	 * @return	@e void
+	 * @todo 	[Future] Settings: joined, dst_in_use, coppa_user, auto_track, ignored_users, members_auto_dst, 
 	 * 				 members_created_remote, members_profile_views, failed_logins, failed_login_count, fb_photo, fb_photo_thumb
 	 */
 	protected function _memberView()
@@ -557,15 +538,6 @@ class admin_members_members_members extends ipsCommand
 			return;
 		}
 		
-		if( $this->request['trigger'] )
-		{
-			if( $this->_showAdminForm( $member, explode( ',', $this->request['trigger'] ) ) )
-			{
-				// Decided to just show the message above the edit member page...works nicely without having to be a separate page
-				// return;
-			}
-		}
-		
 		//-----------------------------------------
 		// Ok? Load interface and child classes
 		//-----------------------------------------
@@ -575,17 +547,12 @@ class admin_members_members_members extends ipsCommand
 		
 		IPSLib::loadInterface( 'admin/member_form.php' );
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
+			if ( is_file( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php' ) )
 			{
-				continue;
-			}
-			
-			if ( file_exists( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php' ) )
-			{
-				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php', 'admin_member_form__' . $app_dir, $app_dir );
-				$_object = new $_class( $this->registry );
+				$_class		= IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . '/extensions/admin/member_form.php', 'admin_member_form__' . $app_dir, $app_dir );
+				$_object	= new $_class( $this->registry );
 				
 				$sidebar[ $app_dir ] = $_object->getSidebarLinks( $member );
 				
@@ -606,43 +573,34 @@ class admin_members_members_members extends ipsCommand
 		// Format Member
 		//-----------------------------------------
 
-		$member['_joined']				= ipsRegistry::getClass( 'class_localization')->getDate( $member['joined'], 'LONG' );
-
-		$member							= IPSMember::buildDisplayData( $member );
+		$member['_joined']	= ipsRegistry::getClass( 'class_localization')->getDate( $member['joined'], 'LONG' );
+		$member				= IPSMember::buildDisplayData( $member );
 
     	//-----------------------------------------
 		// Editors
 		//-----------------------------------------
-		
-		$sig_editor 						= $member['signature'];
-		$ame_editor							= $member['pp_about_me'];
 
-		if ( IPSText::getTextClass('editor')->method == 'rte' )
-		{
-			$sig_editor				= IPSText::getTextClass('bbcode')->convertForRTE( $sig_editor );
-			$ame_editor				= IPSText::getTextClass('bbcode')->convertForRTE( $ame_editor );
-		}
-		else
-		{
-			IPSText::getTextClass('bbcode')->parse_html		= $this->settings['sig_allow_html'];
-			IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies	= 0;
-			IPSText::getTextClass('bbcode')->parse_bbcode	= $this->settings['sig_allow_ibc'];
-			IPSText::getTextClass('bbcode')->parsing_section		= 'signatures';
-			
-			$sig_editor				= IPSText::getTextClass('bbcode')->preEditParse( $sig_editor );
-			
-			IPSText::getTextClass('bbcode')->parse_html		= $this->settings['aboutme_html'];
-			IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies	= $this->settings['aboutme_emoticons'];
-			IPSText::getTextClass('bbcode')->parse_bbcode	= $this->settings['aboutme_bbcode'];
-			IPSText::getTextClass('bbcode')->parsing_section		= 'aboutme';
-			
-			$ame_editor				= IPSText::getTextClass('bbcode')->preEditParse( $ame_editor );
-		}
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
 		
-		$member['signature_editor']	= IPSText::getTextClass('editor')->showEditor( $sig_editor, 'signature' );
-		$member['aboutme_editor']	= IPSText::getTextClass('editor')->showEditor( $ame_editor, 'aboutme' );
+		/* Signature editor */
+		$sig_editor = $member['signature'];
+		
+		$_editor->setContent( $sig_editor, 'signatures' );
+		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setAllowSmilies( 0 );
+		
+		$member['signature_editor']	= $_editor->show( 'signature', array( 'height' => 350 ) );
+		
+		/* About me editor */
+		$ame_editor	= $member['pp_about_me'];
+		
+		$_editor->setContent( $ame_editor, 'aboutme' );
+		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setAllowSmilies( 1 );
+		
+		$member['aboutme_editor']	= $_editor->show( 'aboutme', array( 'height' => 350 ) );
 
     	//-----------------------------------------
 		// Custom fields
@@ -673,13 +631,13 @@ class admin_members_members_members extends ipsCommand
 		// Notifications library
 		//-----------------------------------------
 		
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary	= new $classToLoad( $this->registry );
 		$notifyLibrary->setMember( $member );
 		
 		$_basicOptions	= array( array( 'email', $this->lang->words['notopt__email'] ), array( 'pm', $this->lang->words['notopt__pm'] ), array( 'inline', $this->lang->words['notopt__inline'] ), array( 'mobile', $this->lang->words['notopt__mobile'] ) );
 		$_configOptions	= $notifyLibrary->getNotificationData( TRUE );
-		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig( $member );
 		$_defaultConfig	= $notifyLibrary->getDefaultNotificationConfig();
 		$_formOptions	= array();
 		
@@ -716,6 +674,7 @@ class admin_members_members_members extends ipsCommand
 			
 			$_formOptions[ $option['key'] ]					= array();
 			$_formOptions[ $option['key'] ]['key']			= $option['key'];
+			$_formOptions[ $option['key'] ]['app']			= $option['app'];
 			
 			//-----------------------------------------
 			// Rikki asked for this...
@@ -753,7 +712,7 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Toggle member spam [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberToggleSpam()
 	{
@@ -795,13 +754,28 @@ class admin_members_members_members extends ipsCommand
 			$toSave['core']['restrict_post']      = 0;
 			$toSave['core']['members_disable_pm'] = 0;
 			
-			/* Flag them as a spammer */
+			/* Flag them as not a spammer */
 			IPSMember::save( $member['member_id'], $toSave );
+			
+			/* Un-spammed ;) */
+			IPSLib::runMemberSync( 'onUnSetAsSpammer', $member );
 		}
 		else
 		{
 			$toSave['core']['bw_is_spammer']      = 1;
 			
+			/* Shut off twitter/FB status importing */
+			$bwOptions	= IPSBWOptions::thaw( $memberData['tc_bwoptions'], 'twitter' );
+			$bwOptions['tc_si_status']	= 0;
+			$twitter	= IPSBWOptions::freeze( $bwOptions, 'twitter' );
+
+			$bwOptions = IPSBWOptions::thaw( $memberData['fb_bwoptions'], 'facebook' );
+			$bwOptions['fbc_si_status']	= 0;			
+			$facebook	= IPSBWOptions::freeze( $bwOptions, 'facebook' );
+			
+			$toSave['extendedProfile']['tc_bwoptions']	= $twitter;
+			$toSave['extendedProfile']['fb_bwoptions']	= $facebook;
+			
 			/* What do to.. */
 			if ( $this->settings['spm_option'] )
 			{
@@ -831,15 +805,22 @@ class admin_members_members_members extends ipsCommand
 																	 'EMAIL'		=> $member['email'],
 																	 'LINK'         => $this->registry->getClass('output')->buildSEOUrl("showuser=" . $member['member_id'], 'public', $member['members_seo_name'], 'showuser') ) );
 
-				IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email_spammer'] . $this->settings['board_name'];
+				IPSText::getTextClass('email')->subject	= $this->lang->words['new_registration_email_spammer'] . ' ' . $this->settings['board_name'];
 				IPSText::getTextClass('email')->to      = $this->settings['email_in'];
 				IPSText::getTextClass('email')->sendMail();
 			}
 			
 			/* Send Spammer to Spam Service */
+			if( $this->settings['spam_service_send_to_ips'] )
+			{
+				IPSMember::querySpamService( $member['email'], $member['ip_address'], 'markspam' );
+			}
 			
 			/* Flag them as a spammer */
 			IPSMember::save( $member['member_id'], $toSave );
+			
+			/* Spam! */
+			IPSLib::runMemberSync( 'onSetAsSpammer', $member );
 		}
 		
 		//-----------------------------------------
@@ -848,13 +829,14 @@ class admin_members_members_members extends ipsCommand
 
 		ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['t_log_spam'], $member['members_display_name'] ) );
 
-		$this->registry->output->doneScreen($this->lang->words['t_log_spam'], $this->lang->words['m_search'], "{$this->form_code}&amp;do=viewmember&amp;member_id={$member['member_id']}", "redirect" );
+		$this->registry->output->global_message	= $this->lang->words['t_log_spam'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=viewmember&amp;member_id=' . $member['member_id'] );
 	}
 	
 	/**
 	 * Ban a member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberBanDo()
 	{
@@ -866,7 +848,7 @@ class admin_members_members_members extends ipsCommand
 		}
 		
 		$member = IPSMember::load( $this->request['member_id'] );
-
+		
 		if ( ! $member['member_id'] )
 		{
 			$this->registry->output->showError( $this->lang->words['m_noid'], 11229 );
@@ -1002,6 +984,9 @@ class admin_members_members_members extends ipsCommand
 		if( $this->request['ban__group'] AND $this->request['ban__group_change'] AND $this->request['ban__group'] != $member['member_group_id'] )
 		{
 			IPSMember::save( $member['member_id'], array( 'core' => array( 'member_group_id' => intval($this->request['ban__group']) ) ) );
+			
+			/* Password has been changed! */
+			IPSLib::runMemberSync( 'onGroupChange', $member['member_id'], intval($this->request['ban__group']), $member['member_group_id'] );
 		}
 		
 		/* Rebuild the cache */
@@ -1013,13 +998,14 @@ class admin_members_members_members extends ipsCommand
 
 		ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_bannedlog'], $member['members_display_name'] ) );
 
-		$this->registry->output->doneScreen($this->lang->words['m_banned'], $this->lang->words['m_search'], "{$this->form_code}&amp;do=viewmember&amp;member_id={$member['member_id']}", "redirect" );
+		$this->registry->output->global_message	= $this->lang->words['m_banned'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=viewmember&amp;member_id=' . $member['member_id'] );
 	}
 	
 	/**
 	 * Suspend a member [form/confirmation]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberSuspendStart()
 	{
@@ -1057,7 +1043,7 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Suspend a member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberSuspendDo()
 	{
@@ -1132,13 +1118,14 @@ class admin_members_members_members extends ipsCommand
 
 		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_susplog'], $member['members_display_name'] ) );
 
-		$this->registry->output->doneScreen($this->lang->words['m_suspended'], $this->lang->words['m_search'], "{$this->form_code}&amp;do=viewmember&amp;member_id={$member['member_id']}", "redirect" );
+		$this->registry->output->global_message	= $this->lang->words['m_suspended'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=viewmember&amp;member_id=' . $member['member_id'] );
 	}
 	
 	/**
 	 * Unsuspend a member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberUnsuspend()
 	{
@@ -1165,14 +1152,13 @@ class admin_members_members_members extends ipsCommand
 			$this->DB->update( 'members', array( 'temp_ban' => 0 ) );
 			
 			ipsRegistry::getClass('adminFunctions')->saveAdminLog( $this->lang->words['m_unsuspall'] );
-		
-			$msg = $this->lang->words['m_allunsusp'];
-			
+
 			//-----------------------------------------
 			// Redirect
 			//-----------------------------------------
-	
-			$this->registry->output->doneScreen( $msg, $this->lang->words['m_search'], "{$this->form_code}&amp;do=members_list", "redirect" );
+
+			$this->registry->output->global_message	= $this->lang->words['m_allunsusp'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=members_list' );
 		}
 		else
 		{
@@ -1183,22 +1169,21 @@ class admin_members_members_members extends ipsCommand
 			$member = IPSMember::load( $mid );
 			
 			ipsRegistry::getClass('adminFunctions')->saveAdminLog(sprintf( $this->lang->words['m_unsusplog'], $member['members_display_name'] ) );
-		
-			$msg = sprintf( $this->lang->words['m_unsuspended'], $member['members_display_name'] );
-			
+
 			//-----------------------------------------
 			// Redirect
 			//-----------------------------------------
-	
-			$this->registry->output->doneScreen( $msg, $this->lang->words['m_search'], "{$this->form_code}&amp;do=viewmember&amp;member_id={$member['member_id']}", "redirect" );
+
+			$this->registry->output->global_message	= sprintf( $this->lang->words['m_unsuspended'], $member['members_display_name'] );
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=viewmember&amp;member_id=' . $member['member_id'] );
 		}
 	}
 
 	/**
 	 * Prune members [confirmation]
 	 *
-	 * @param	integer		Number of members to prune
-	 * @return	void		[Outputs to screen]
+	 * @param	integer		$count		Number of members to prune
+	 * @return	@e void
 	 */
 	protected function _memberPruneForm( $count )
 	{
@@ -1219,8 +1204,8 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Move members to another group [confirmation]
 	 *
-	 * @param	integer		Number of members to move
-	 * @return	void		[Outputs to screen]
+	 * @param	integer		$count		Number of members to move
+	 * @return	@e void
 	 */
 	protected function _memberMoveForm( $count )
 	{ 
@@ -1238,11 +1223,45 @@ class admin_members_members_members extends ipsCommand
 		$this->registry->output->html .= $this->html->moveConfirm( $count );
 	}
 
+	/**
+	 * Get extra query if cannot prune admins
+	 * 
+	 * @return	@e string
+	 */
+ 	protected function _getExtraQuery()
+ 	{
+ 		$extraQuery	= '';
+
+		if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_prune_admin' ) )
+		{
+			$admin_group_ids	= array();
+			$_sql				= array();
+			
+			foreach( $this->cache->getCache( 'group_cache' ) as $group )
+			{
+				if( $group['g_access_cp'] )
+				{
+					$admin_group_ids[]	= $group['g_id'];
+					
+					$_sql[]	= "m.mgroup_others NOT LIKE '%," . $group['g_id'] . ",%'";
+				}
+			}
+			
+			$_sql[]	= "m.member_group_id NOT IN(" . implode( ',', $admin_group_ids ) . ")";
+			
+			if( count($_sql) )
+			{
+				$extraQuery	= implode( ' AND ', $_sql );
+			}
+		}
+		
+		return $extraQuery;
+ 	}
+
 	/**
 	 * Prune members [process]
 	 *
-	 * @return	void		[Outputs to screen]
-	 * @todo 	[Future] Centralize SQL query formatting to a single method
+	 * @return	@e void
 	 */
 	protected function _memberDoPrune()
 	{
@@ -1250,719 +1269,183 @@ class admin_members_members_members extends ipsCommand
 		// INIT
 		//-----------------------------------------
 		
-		$data		= $this->_generateFilterBoxes();
-		$_sql		= array();
-		$ids		= array();
-		$names		= array();
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/adminSearch.php', 'adminMemberSearch', 'members' );
+		$searchHelper	= new $classToLoad( $this->registry );
 		
+		$data			= $searchHelper->generateFilterBoxes();
+
 		//-----------------------------------------
 		// Allowed to prune administrators?
 		//-----------------------------------------
 		
-		if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_prune_admin') )
-		{
-			$admin_group_ids = array();
-			
-			foreach( $this->cache->getCache( 'group_cache' ) as $group )
-			{
-				if( $group['g_access_cp'] )
-				{
-					$admin_group_ids[] = $group['g_id'];
-					
-					$_sql[] = "m.mgroup_others NOT LIKE '%," . $group['g_id'] . ",%'";
-				}
-			}
-			
-			$_sql[] = "m.member_group_id NOT IN(" . implode( ',', $admin_group_ids ) . ")";
-		}	
+		$extraQuery	= $this->_getExtraQuery();	
 
 		//-----------------------------------------
-		// FILTERS
+		// Got a query?
 		//-----------------------------------------
 		
-		if ( $data['member_contains_text'] )
+		if ( !$searchHelper->getWhereClause() AND !$extraQuery )
 		{
-			$_field = '';
-			$_text  = $this->DB->addSlashes( $data['member_contains_text'] );
-
-			switch( $data['member_contains'] )
-			{
-				default:
-				case 'member_id':
-					$_field = 'm.member_id';
-				break;
-
-				case 'name':
-					$_field = 'm.name';
-				break;
-
-				case 'members_display_name':
-					$_field = 'm.members_display_name';
-				break;
-				case 'email':
-					$_field = 'm.email';
-				break;
-				case 'ip_address':
-					$_field = 'm.ip_address';
-				break;
-				case 'signature':
-					$_field = 'pp.signature';
-				break;
-			}
-
-			switch( $data['member_contains_type'] )
-			{
-				default:
-				case 'contains':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "%'";
-				break;
-				case 'begins':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '" . $_text . "%'";
-				break;
-				case 'ends':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "'";
-				break;
-				case 'equals':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " = '" . $_text . "'";
-				break;
-			}
-		}
-
-		if ( $data['member_type'] )
-		{
-			switch( $data['member_type'] )
-			{
-				case 'suspended':
-					$_sql[] = "m.temp_ban > 0";
-				break;
-				case 'notsuspended':
-					$_sql[] = "( m.temp_ban < 1 or m.temp_ban='' or m.temp_ban " . $this->DB->buildIsNull( true ) . " )";
-				break;
-			}
+			$this->registry->output->showError( $this->lang->words['m_noprune'], 11235.1 );
 		}
 		
-		/* Banned status */
-		if ( $data['banned_type'] )
-		{
-			switch( $data['banned_type'] )
-			{
-				case 'banned':
-					$_sql[] = "m.member_banned=1";
-				break;
-				case 'notbanned':
-					$_sql[] = "m.member_banned=0";
-				break;
-			}
-		}
-
-		/* Spam status */
-		if ( $data['spam_type'] )
-		{
-			switch( $data['spam_type'] )
-			{
-				case 'spam':
-					$_sql[] = IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' );
-				break;
-				case 'notspam':
-					$_sql[] = "NOT (" . IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' ) . ")";
-				break;
-			}
-		}
-
-		if ( $data['primary_group'] )
-		{
-			$_sql[] = "m.member_group_id=" . intval( $data['primary_group'] );
-		}
-
-		if ( $data['secondary_group'] )
-		{
-			$_sql[] = "( m.mgroup_others LIKE '%," . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '" . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '%," . $data['secondary_group'] . "' OR " .
-					  "m.mgroup_others='" . $data['secondary_group'] . "' )";
-		}
-		
-		if ( ( $data['post_count'] OR $data['post_count'] == '0' ) AND $data['post_count_type'] )
-		{
-			$_type	= '';
-
-			if( $data['post_count_type'] == 'gt' )
-			{
-				$_type	= '>';
-			}
-			else if( $data['post_count_type'] == 'lt' )
-			{
-				$_type	= '<';
-			}
-			else if( $data['post_count_type'] == 'eq' )
-			{
-				$_type	= '=';
-			}
-
-			if( $_type )
-			{
-				$_sql[] = "m.posts" . $_type . intval( $data['post_count'] );
-			}
-		}
-		
-		foreach( array( 'reg', 'post', 'active' ) as $_bit )
-		{
-			foreach( array( 'from', 'to' ) as $_when )
-			{
-				$bit = 'date_' . $_bit . '_' . $_when;
-				
-				if ( $data[ $bit ] )
-				{
-					list( $month, $day, $year ) = explode( '-', $data[ $bit ] );
-
-					if ( ! checkdate( $month, $day, $year ) )
-					{
-						$this->registry->output->global_message = sprintf($this->lang->words['m_daterange'], $month, $day, $year );
-					}
-					else
-					{
-						$time_int = mktime( 0, 0, 0, $month, $day, $year );
-	
-						switch( $_bit )
-						{
-							case 'reg':
-								$field = 'joined';
-							break;
-							case 'post':
-								$field = 'last_post';
-							break;
-							case 'active':
-								$field = 'last_activity';
-							break;
-						}
-	
-						if ( $_when == 'from' )
-						{
-							$_sql[] = 'm.' . $field . ' > ' . $time_int;
-						}
-						else
-						{
-							$_sql[] = 'm.' . $field . ' < ' . $time_int;
-						}
-					}
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Check we have correct fields
-		//-----------------------------------------
-		
-		switch( $data['order_direction'] )
-		{
-			case 'asc':
-				$order_direction = 'asc';
-			break;
-			default:
-			case 'desc':
-				$order_direction = 'desc';
-			break;
-		}
-		
-		switch( $data['order_by'] )
-		{
-			default:
-			case 'joined':
-				$order_by  = 'm.joined';
-			break;
-			case 'members_l_username':
-				$order_by  = 'm.members_l_username';
-			break;
-			case 'members_l_display_name':
-				$order_by  = 'm.members_l_display_name';
-			break;
-			case 'email':
-				$order_by  = 'm.email';
-			break;
-		}
-		
-		//-----------------------------------------
-		// Custom fields...
-		//-----------------------------------------
-		
-		if( is_array($data['custom_fields']) AND count($data['custom_fields']) )
-		{
-			foreach ( $data['custom_fields'] as $id => $value )
-	 		{
- 				if ( $value )
- 				{
-					if( $this->caches['profilefields'][ $id ]['pf_type'] == 'drop' )
-					{
-						$_sql[]	= "p.field_{$id}='" . $value . "'";
-					}
-					else if( $this->caches['profilefields'][ $id ]['pf_type'] == 'cbox' )
-					{
-						if ( count( $value ) )
-						{
-							foreach ( $value as $k => $v )
-							{
-								$_sql[]	= "p.field_{$id} LIKE '%|{$k}|%'";
-							}
-						}
-					}
-					else
-					{
-						$_sql[] = $this->caches['profilefields'][ $id ]['pf_search_type'] == 'loose' ? "p.field_{$id} LIKE '" . $value . "%'" : "p.field_{$id} = '" . $value . "'";
-					}
- 				}
-	 		}
- 		}
-		
-		//-----------------------------------------
-		// get 'owt?
-		//-----------------------------------------
-		
-		$real_query = count($_sql) ? implode( " AND ", $_sql ) : '';
-
 		//-----------------------------------------
 		// Get the number of results
 		//-----------------------------------------
-		
-		$count = $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
-														 'from'		=> array( 'members' => 'm' ),
-														 'where'	=> $real_query,
-														 'add_join'	=> array( 0 => array( 'from'   => array( 'profile_portal' => 'pp' ),
-																						  'where'  => 'pp.pp_member_id=m.member_id',
-																						  'type'   => 'left' ),
-																			  1 => array( 'from'   => array( 'pfields_content' => 'p' ),
-																						  'where'  => 'p.member_id=m.member_id',
-																						  'type'   => 'left' ) 
-																			) 
-												) 		);
 
-		if ( $count['count'] < 1 )
+		$count	= $searchHelper->getSearchResultsCount( $extraQuery );
+
+		//-----------------------------------------
+		// Reset if we have no results
+		//-----------------------------------------
+		
+		if ( !$count )
 		{
-			$this->registry->output->global_message = $this->lang->words['m_noprune'];
-			
-			// And reset the cookie so we don't get the message on every page view
+			$this->registry->output->global_message	= $this->lang->words['m_noprune'];
+
 			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
 			
-			$this->_memberList();
-			return;
+			return $this->_memberList();
 		}
 
 		//-----------------------------------------
 		// Run the query
 		//-----------------------------------------
 
-		$this->DB->build( array( 'select'		=> 'm.member_id, m.members_display_name',
-										'from'		=> array( 'members' => 'm' ),
-										'where'		=> $real_query,
-										'add_join'	=> array(
-															  1 => array( 'select' => '',
-																		  'from'   => array( 'pfields_content' => 'p' ),
-																		  'where'  => 'p.member_id=m.member_id',
-																		  'type'   => 'left' ),
-															  2 => array( 'select' => '',
-																		  'from'   => array( 'profile_portal' => 'pp' ),
-																		  'where'  => 'pp.pp_member_id=m.member_id',
-																		  'type'   => 'left' ) 
-															) 
-							) 		);
-		$outer = $this->DB->execute();
-		
-		if ( $this->DB->getTotalRows() )
-		{
-			while ( $r = $this->DB->fetch($outer) )
-			{
-				$ids[]		= $r['member_id'];
-				$names[]	= $r['members_display_name'];
-			}
-		}
-		else
+		$results	= $searchHelper->getSearchResults( 0, 0, $extraQuery, true );
+
+		if( !count($results['ids']) )
 		{
 			$this->registry->output->showError( $this->lang->words['m_noprune'], 11235 );
 		}
 
-		IPSMember::remove( $ids, true );
+		//-----------------------------------------
+		// Delete members
+		//-----------------------------------------
+		
+		IPSMember::remove( $results['ids'], true );
 
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_deletedlog'], implode( ",", $names ) ) );
+		//-----------------------------------------
+		// Admin log
+		//-----------------------------------------
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['m_deletedlog'], implode( ",", $results['names'] ) ) );
+		
+		//-----------------------------------------
+		// Reset staff cookie
+		//-----------------------------------------
 		
-		// And reset the cookie
 		ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
-			
-		$this->registry->output->doneScreen($this->lang->words['m_deleted'], $this->lang->words['m_control'], "{$this->form_code}&amp;do=members_list", 'redirect' );
+
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$this->registry->output->global_message	= $this->lang->words['m_deleted'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=members_list' );
 	}
 	
-	
 	/**
 	 * Move members [process]
 	 *
-	 * @return	void		[Outputs to screen]
-	 * @todo 	[Future] Centralize SQL query formatting to a single method
+	 * @return	@e void
 	 */
 	protected function _memberDoMove()
 	{
 		//-----------------------------------------
-		// INIT
+		// Error checking
 		//-----------------------------------------
 		
-		$data		= $this->_generateFilterBoxes();
-		$_sql		= array();
-		$ids		= array();
-		$names		= array();
-
 		if( !$this->request['move_to_group'] )
 		{
 			$this->registry->output->showError( $this->lang->words['m_whatgroup'], 11236 );
 		}
 		
-		//-----------------------------------------
-		// Allowed to move to/from administrators?
-		//-----------------------------------------
-		
 		if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_move_admin2') )
 		{
 			if( $this->caches['group_cache'][ $this->request['move_to_group'] ]['g_access_cp'] )
 			{
-				$this->registry->output->global_message = $this->lang->words['m_adminpromote'];
+				$this->registry->output->global_message	= $this->lang->words['m_adminpromote'];
 				
 				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 			}
 		}
 		
-		if( !$this->registry->getClass('class_permissions')->checkPermission( 'member_move_admin1') )
-		{
-			$admin_group_ids = array();
-			
-			foreach( $this->cache->getCache( 'group_cache' ) as $group )
-			{
-				if( $group['g_access_cp'] )
-				{
-					$admin_group_ids[] = $group['g_id'];
-					
-					$_sql[] = "m.mgroup_others NOT LIKE '%," . $group['g_id'] . ",%'";
-				}
-			}
-			
-			$_sql[] = "m.member_group_id NOT IN(" . implode( ',', $admin_group_ids ) . ")";
-		}
-
 		//-----------------------------------------
-		// FILTERS
+		// INIT
 		//-----------------------------------------
 		
-		if ( $data['member_contains_text'] )
-		{
-			$_field = '';
-			$_text  = $this->DB->addSlashes( $data['member_contains_text'] );
-
-			switch( $data['member_contains'] )
-			{
-				default:
-				case 'member_id':
-					$_field = 'm.member_id';
-				break;
-
-				case 'name':
-					$_field = 'm.name';
-				break;
-
-				case 'members_display_name':
-					$_field = 'm.members_display_name';
-				break;
-				case 'email':
-					$_field = 'm.email';
-				break;
-				case 'ip_address':
-					$_field = 'm.ip_address';
-				break;
-				case 'signature':
-					$_field = 'pp.signature';
-				break;
-			}
-
-			switch( $data['member_contains_type'] )
-			{
-				default:
-				case 'contains':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "%'";
-				break;
-				case 'begins':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '" . $_text . "%'";
-				break;
-				case 'ends':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "'";
-				break;
-				case 'equals':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " = '" . $_text . "'";
-				break;
-			}
-		}
-
-		if ( $data['member_type'] )
-		{
-			switch( $data['member_type'] )
-			{
-				case 'suspended':
-					$_sql[] = "m.temp_ban > 0";
-				break;
-				case 'notsuspended':
-					$_sql[] = "( m.temp_ban < 1 or m.temp_ban='' or m.temp_ban " . $this->DB->buildIsNull( true ) . " )";
-				break;
-			}
-		}
-
-		/* Banned status */
-		if ( $data['banned_type'] )
-		{
-			switch( $data['banned_type'] )
-			{
-				case 'banned':
-					$_sql[] = "m.member_banned=1";
-				break;
-				case 'notbanned':
-					$_sql[] = "m.member_banned=0";
-				break;
-			}
-		}
-
-		/* Spam status */
-		if ( $data['spam_type'] )
-		{
-			switch( $data['spam_type'] )
-			{
-				case 'spam':
-					$_sql[] = IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' );
-				break;
-				case 'notspam':
-					$_sql[] = "NOT (" . IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' ) . ")";
-				break;
-			}
-		}
-
-		if ( $data['primary_group'] )
-		{
-			$_sql[] = "m.member_group_id=" . intval( $data['primary_group'] );
-		}
-
-		if ( $data['secondary_group'] )
-		{
-			$_sql[] = "( m.mgroup_others LIKE '%," . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '" . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '%," . $data['secondary_group'] . "' OR " .
-					  "m.mgroup_others='" . $data['secondary_group'] . "' )";
-		}
-
-		if ( ( $data['post_count'] OR $data['post_count'] == '0' ) AND $data['post_count_type'] )
-		{
-			$_type	= '';
-
-			if( $data['post_count_type'] == 'gt' )
-			{
-				$_type	= '>';
-			}
-			else if( $data['post_count_type'] == 'lt' )
-			{
-				$_type	= '<';
-			}
-			else if( $data['post_count_type'] == 'eq' )
-			{
-				$_type	= '=';
-			}
-
-			if( $_type )
-			{
-				$_sql[] = "m.posts" . $_type . intval( $data['post_count'] );
-			}
-		}
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/adminSearch.php', 'adminMemberSearch', 'members' );
+		$searchHelper	= new $classToLoad( $this->registry );
 		
-		foreach( array( 'reg', 'post', 'active' ) as $_bit )
-		{
-			foreach( array( 'from', 'to' ) as $_when )
-			{
-				$bit = 'date_' . $_bit . '_' . $_when;
-				
-				if ( $data[ $bit ] )
-				{
-					list( $month, $day, $year ) = explode( '-', $data[ $bit ] );
+		$data			= $searchHelper->generateFilterBoxes();
 
-					if ( ! checkdate( $month, $day, $year ) )
-					{
-						$this->registry->output->global_message = sprintf( $this->lang->words['m_daterange'], $month, $day, $year );
-					}
-					else
-					{
-						$time_int = mktime( 0, 0, 0, $month, $day, $year );
-	
-						switch( $_bit )
-						{
-							case 'reg':
-								$field = 'joined';
-							break;
-							case 'post':
-								$field = 'last_post';
-							break;
-							case 'active':
-								$field = 'last_activity';
-							break;
-						}
-	
-						if ( $_when == 'from' )
-						{
-							$_sql[] = 'm.' . $field . ' > ' . $time_int;
-						}
-						else
-						{
-							$_sql[] = 'm.' . $field . ' < ' . $time_int;
-						}
-					}
-				}
-			}
-		}
-		
 		//-----------------------------------------
-		// Check we have correct fields
+		// Allowed to move to/from administrators?
 		//-----------------------------------------
 		
-		switch( $data['order_direction'] )
-		{
-			case 'asc':
-				$order_direction = 'asc';
-			break;
-			default:
-			case 'desc':
-				$order_direction = 'desc';
-			break;
-		}
-		
-		switch( $data['order_by'] )
-		{
-			default:
-			case 'joined':
-				$order_by  = 'm.joined';
-			break;
-			case 'members_l_username':
-				$order_by  = 'm.members_l_username';
-			break;
-			case 'members_l_display_name':
-				$order_by  = 'm.members_l_display_name';
-			break;
-			case 'email':
-				$order_by  = 'm.email';
-			break;
-		}
-		
-		//-----------------------------------------
-		// Custom fields...
-		//-----------------------------------------
-		
-		if( is_array($data['custom_fields']) AND count($data['custom_fields']) )
-		{
-			foreach ( $data['custom_fields'] as $id => $value )
-	 		{
- 				if ( $value )
- 				{
-					if( $this->caches['profilefields'][ $id ]['pf_type'] == 'drop' )
-					{
-						$_sql[]	= "p.field_{$id}='" . $value . "'";
-					}
-					else if( $this->caches['profilefields'][ $id ]['pf_type'] == 'cbox' )
-					{
-						if ( count( $value ) )
-						{
-							foreach ( $value as $k => $v )
-							{
-								$_sql[]	= "p.field_{$id} LIKE '%|{$k}|%'";
-							}
-						}
-					}
-					else
-					{
-						$_sql[] = $this->caches['profilefields'][ $id ]['pf_search_type'] == 'loose' ? "p.field_{$id} LIKE '" . $value . "%'" : "p.field_{$id} = '" . $value . "'";
-					}
- 				}
-	 		}
- 		}
-		
-		//-----------------------------------------
-		// get 'owt?
-		//-----------------------------------------
-		
-		$real_query = count($_sql) ? implode( " AND ", $_sql ) : '';
+		$extraQuery	= $this->_getExtraQuery();	
 
 		//-----------------------------------------
 		// Get the number of results
 		//-----------------------------------------
 		
-		$count = $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
-														 'from'		=> array( 'members' => 'm' ),
-														 'where'	=> $real_query,
-														 'add_join'	=> array( 0 => array( 'from'   => array( 'profile_portal' => 'pp' ),
-																						  'where'  => 'pp.pp_member_id=m.member_id',
-																						  'type'   => 'left' ),
-																			  1 => array( 'from'   => array( 'pfields_content' => 'p' ),
-																						  'where'  => 'p.member_id=m.member_id',
-																						  'type'   => 'left' ) 
-																			) 
-												) 		);
+		$count	= $searchHelper->getSearchResultsCount( $extraQuery );
 
-		if ( $count['count'] < 1 )
+		//-----------------------------------------
+		// Reset if we have no results
+		//-----------------------------------------
+		
+		if ( !$count )
 		{
-			$this->registry->output->global_message = $this->lang->words['m_nomembers'];
-			
-			// And reset the cookie so we don't get the message on every page view
+			$this->registry->output->global_message	= $this->lang->words['m_nomembers'];
+
 			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
 			
-			$this->_memberList();
-			return;
+			return $this->_memberList();
 		}
 
 		//-----------------------------------------
 		// Run the query
 		//-----------------------------------------
-		
-		$this->DB->build( array( 'select'		=> 'm.member_id, m.members_display_name',
-										'from'		=> array( 'members' => 'm' ),
-										'where'		=> $real_query,
-										'add_join'	=> array(
-															  1 => array( 'select' => '',
-																		  'from'   => array( 'pfields_content' => 'p' ),
-																		  'where'  => 'p.member_id=m.member_id',
-																		  'type'   => 'left' ),
-															  2 => array( 'select' => '',
-																		  'from'   => array( 'profile_portal' => 'pp' ),
-																		  'where'  => 'pp.pp_member_id=m.member_id',
-																		  'type'   => 'left' ) 
-															) 
-							) 		);
-		$outer = $this->DB->execute();
-		
-		if ( $this->DB->getTotalRows() )
-		{
-			while ( $r = $this->DB->fetch($outer) )
-			{
-				$ids[]		= $r['member_id'];
-				$names[]	= $r['members_display_name'];
-			}
-		}
-		else
+
+		$results	= $searchHelper->getSearchResults( 0, 0, $extraQuery, true );
+
+		if( !count($results['ids']) )
 		{
 			$this->registry->output->showError( $this->lang->words['m_nomembers'], 11237 );
 		}
 
-		$this->DB->update( 'members', array( 'member_group_id' => intval($this->request['move_to_group']) ), 'member_id IN(' . implode( ',', $ids ) . ')' );
+		//-----------------------------------------
+		// Move the members
+		//-----------------------------------------
 		
-		$group_name = $this->caches['group_cache'][ $this->request['move_to_group'] ]['g_title'];
+		$this->DB->update( 'members', array( 'member_group_id' => intval($this->request['move_to_group']) ), 'member_id IN(' . implode( ',', $results['ids'] ) . ')' );
+		
+		//-----------------------------------------
+		// Store admin log
+		//-----------------------------------------
 
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf($this->lang->words['m_movedlog'], $group_name, implode( ",", $names )  ) );
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf($this->lang->words['m_movedlog'], $this->caches['group_cache'][ $this->request['move_to_group'] ]['g_title'], implode( ",", $results['names'] )  ) );
+		
+		//-----------------------------------------
+		// Reset cookie
+		//-----------------------------------------
 		
-		// And reset the cookie
 		ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
-			
-		$this->registry->output->doneScreen($this->lang->words['m_moved'], $this->lang->words['m_control'], "{$this->form_code}&amp;do=members_list", 'redirect' );
+
+		//-----------------------------------------
+		// And redirect
+		//-----------------------------------------
+
+		$this->registry->output->global_message	= $this->lang->words['m_moved'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=members_list' );
 	}
 	
-
 	/**
 	 * Delete members [form+process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberDelete()
 	{
@@ -2033,7 +1516,7 @@ class admin_members_members_members extends ipsCommand
 						{
 							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
 							{
-								continue;
+								continue 2;
 							}
 						}
 					}
@@ -2080,20 +1563,13 @@ class admin_members_members_members extends ipsCommand
 		$this->_memberList();
 	}
 		
-	
 	/**
 	 * Add a member [form]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberAddForm()
 	{
-		//-----------------------------------------
-		// Page details
-		//-----------------------------------------
-
-		//$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['m_addmember'] );
-
 		//-----------------------------------------
 		// Groups
 		//-----------------------------------------
@@ -2127,27 +1603,21 @@ class admin_members_members_members extends ipsCommand
 	/**
 	 * Add a member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberDoAdd()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$in_username 			= trim($this->request['name']);
 		$in_password 			= trim($this->request['password']);
 		$in_email    			= trim(mb_strtolower($this->request['email']));
-		$members_display_name	= trim($this->request['members_display_name'] );
+		$members_display_name	= $this->request['mirror_loginname'] ? $in_username : trim($this->request['members_display_name'] );
 		
-		$this->registry->output->global_message = '';
+		$this->registry->output->global_error = '';
 		
 		$this->registry->class_localization->loadLanguageFile( array( 'public_register' ), 'core' );
 		
-		//-----------------------------------------
-		// Check form
-		//-----------------------------------------
-	
+		/* Check erros */
 		foreach( array('name', 'password', 'email', 'member_group_id') as $field )
 		{
 			if ( ! $_POST[ $field ] )
@@ -2162,7 +1632,7 @@ class admin_members_members_members extends ipsCommand
 
 		if( ! IPSText::checkEmailAddress( $in_email ) )
 		{
-			$this->registry->output->global_message = $this->lang->words['m_emailinv'];
+			$this->registry->output->global_error = $this->lang->words['m_emailinv'];
 		}
 		
 		$userName		= IPSMember::getFunction()->cleanAndCheckName( $in_username, array(), 'name' );
@@ -2171,17 +1641,17 @@ class admin_members_members_members extends ipsCommand
 		if( count($userName['errors']) )
 		{
 			$_message	= $this->lang->words[ $userName['errors']['username'] ] ? $this->lang->words[ $userName['errors']['username'] ] : $userName['errors']['username'];
-			$this->registry->output->global_message .= '<p>' . $this->lang->words['sm_loginname'] . ': ' . $_message . '</p>';
+			$this->registry->output->global_error .= '<p>' . $this->lang->words['sm_loginname'] . ': ' . $_message . '</p>';
 		}
 
 		if( $this->settings['auth_allow_dnames'] AND count($displayName['errors']) )
 		{
 			$_message	= $this->lang->words[ $displayName['errors']['dname'] ] ? $this->lang->words[ $displayName['errors']['dname'] ] : $displayName['errors']['dname'];
-			$this->registry->output->global_message .= '<p>' . $this->lang->words['sm_display'] . ': ' . $_message . '</p>';
+			$this->registry->output->global_error .= '<p>' . $this->lang->words['sm_display'] . ': ' . $_message . '</p>';
 		}
 
 		/* Errors? */
-		if( $this->registry->output->global_message )
+		if( $this->registry->output->global_error )
 		{
 			$this->_memberAddForm();
 			return;
@@ -2194,14 +1664,29 @@ class admin_members_members_members extends ipsCommand
     	$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
     	$this->han_login = new $classToLoad( $this->registry );
     	$this->han_login->init();
-    	$this->han_login->emailExistsCheck( $in_email );
 
-    	if( $this->han_login->return_code AND $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'EMAIL_NOT_IN_USE' )
-    	{
-			$this->registry->output->global_message = $this->lang->words['m_emailalready'];
+        //-----------------------------------------
+    	// Only check local, else a user being in Converge
+    	// means that you can't manually add the user to the board
+    	//-----------------------------------------
+    	
+		$email_check = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "email='" . $in_email . "'" ) );
+
+		if( $email_check['member_id'] )
+		{
+			$this->registry->output->global_error = $this->lang->words['m_emailalready'];
 			$this->_memberAddForm();
 			return;
-    	}
+		}
+		
+    	//$this->han_login->emailExistsCheck( $in_email );
+
+    	//if( $this->han_login->return_code AND $this->han_login->return_code != 'METHOD_NOT_DEFINED' AND $this->han_login->return_code != 'EMAIL_NOT_IN_USE' )
+    	//{
+		//	$this->registry->output->global_message = $this->lang->words['m_emailalready'];
+		//	$this->_memberAddForm();
+		//	return;
+    	//}
 
 		//-----------------------------------------
 		// Allowed to add administrators?
@@ -2209,13 +1694,12 @@ class admin_members_members_members extends ipsCommand
 		
 		if( $this->caches['group_cache'][ intval($this->request['member_group_id']) ]['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_add_admin') )
 		{
-			$this->registry->output->global_message = $this->lang->words['m_addadmin'];
+			$this->registry->output->global_error = $this->lang->words['m_addadmin'];
 			$this->_memberAddForm();
 			return;
 		}
 
-		$member = array(
-						 'name'						=> $in_username,
+		$member = array( 'name'						=> $in_username,
 						 'members_display_name'		=> $members_display_name ? $members_display_name : $in_username,
 						 'email'					=> $in_email,
 						 'member_group_id'			=> intval($this->request['member_group_id']),
@@ -2225,7 +1709,7 @@ class admin_members_members_members extends ipsCommand
 						 'coppa_user'				=> intval($this->request['coppa']),
 						 'allow_admin_mails'		=> 1,
 						 'password'					=> $in_password,
-					   );
+						);
 
 		//-----------------------------------------
 		// Create the account
@@ -2295,6 +1779,7 @@ class admin_members_members_members extends ipsCommand
 		//-----------------------------------------
 		
 		$this->cache->rebuildCache( 'stats', 'global' );
+		$this->cache->rebuildCache( 'birthdays', 'calendar' );
 
 		//-----------------------------------------
 		// Log and bog?
@@ -2310,394 +1795,99 @@ class admin_members_members_members extends ipsCommand
 		$this->_memberView();		
 	}
 	
-
 	/**
 	 * List members
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberList()
 	{	
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
-		
-		$data		= $this->_generateFilterBoxes();
-		
-		$_sql		= array();
-		$st			= intval($this->request['st']);
-		$members	= array();
-		$perpage	= 20;
+
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/adminSearch.php', 'adminMemberSearch', 'members' );
+		$searchHelper	= new $classToLoad( $this->registry );
 
 		//-----------------------------------------
-		// FILTERS
-		//-----------------------------------------
-
-		if ( $data['member_contains_text'] )
-		{
-			$_field = '';
-			$_text  = $this->DB->addSlashes( $data['member_contains_text'] );
-
-			switch( $data['member_contains'] )
-			{
-				default:
-				case 'member_id':
-					$_field = 'm.member_id';
-				break;
-
-				case 'name':
-					$_field = 'm.name';
-				break;
-
-				case 'members_display_name':
-					$_field = 'm.members_l_display_name';
-					$_text  = mb_strtolower( $_text  );
-				break;
-				case 'email':
-					$_field = 'm.email';
-				break;
-				case 'ip_address':
-					$_field = 'm.ip_address';
-				break;
-				case 'signature':
-					$_field = 'pp.signature';
-				break;
-			}
-
-			switch( $data['member_contains_type'] )
-			{
-				default:
-				case 'contains':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "%'";
-				break;
-				case 'begins':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '" . $_text . "%'";
-				break;
-				case 'ends':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "'";
-				break;
-				case 'equals':
-					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " = '" . $_text . "'";
-				break;
-			}
-		}
-
-		if ( $data['member_type'] )
-		{
-			switch( $data['member_type'] )
-			{
-				case 'suspended':
-					$_sql[] = "m.temp_ban > 0";
-				break;
-				case 'notsuspended':
-					$_sql[] = "( m.temp_ban < 1 or m.temp_ban='' or m.temp_ban " . $this->DB->buildIsNull( true ) . " )";
-				break;
-			}
-		}
-		
-		/* Banned status */
-		if ( $data['banned_type'] )
-		{
-			switch( $data['banned_type'] )
-			{
-				case 'banned':
-					$_sql[] = "m.member_banned=1";
-				break;
-				case 'notbanned':
-					$_sql[] = "m.member_banned=0";
-				break;
-			}
-		}
-		
-		/* Spam status */
-		if ( $data['spam_type'] )
-		{
-			switch( $data['spam_type'] )
-			{
-				case 'spam':
-					$_sql[] = IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' );
-				break;
-				case 'notspam':
-					$_sql[] = "NOT (" . IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' ) . ")";
-				break;
-			}
-		}
-
-		if ( $data['primary_group'] )
-		{
-			if( $data['include_secondary'] )
-			{
-				$_sql[] = "( m.member_group_id=" . intval( $data['primary_group'] ) . " OR " . 
-					  "m.mgroup_others LIKE '%," . intval( $data['primary_group'] ) . ",%' OR " .
-					  "m.mgroup_others LIKE '" . intval( $data['primary_group'] ) . ",%' OR " .
-					  "m.mgroup_others LIKE '%," . intval( $data['primary_group'] ) . "' OR " .
-					  "m.mgroup_others='" . intval( $data['primary_group'] ) . "' )";
-			}
-			else
-			{
-				$_sql[] = "m.member_group_id=" . intval( $data['primary_group'] );
-			}
-		}
-
-		if ( ( $data['post_count'] OR $data['post_count'] == '0' ) AND $data['post_count_type'] )
-		{
-			$_type	= '';
-			
-			if( $data['post_count_type'] == 'gt' )
-			{
-				$_type	= '>';
-			}
-			else if( $data['post_count_type'] == 'lt' )
-			{
-				$_type	= '<';
-			}
-			else if( $data['post_count_type'] == 'eq' )
-			{
-				$_type	= '=';
-			}
-			
-			if( $_type )
-			{
-				$_sql[] = "m.posts" . $_type . intval( $data['post_count'] );
-			}
-		}
-
-		if ( $data['secondary_group'] )
-		{
-			$_sql[] = "( m.mgroup_others LIKE '%," . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '" . $data['secondary_group'] . ",%' OR " .
-					  "m.mgroup_others LIKE '%," . $data['secondary_group'] . "' OR " .
-					  "m.mgroup_others='" . $data['secondary_group'] . "' )";
-		}
-
-		foreach( array( 'reg', 'post', 'active' ) as $_bit )
-		{
-			foreach( array( 'from', 'to' ) as $_when )
-			{
-				$bit = 'date_' . $_bit . '_' . $_when;
-				
-				if ( $data[ $bit ] )
-				{
-					//-----------------------------------------
-					// mm/dd/yyyy instead of mm-dd-yyyy
-					//-----------------------------------------
-					
-					$data[ $bit ]	= str_replace( '/', '-', $data[ $bit ] );
-					
-					list( $month, $day, $year ) = explode( '-', $data[ $bit ] );
-
-					if ( ! checkdate( $month, $day, $year ) )
-					{
-						$this->registry->output->global_message = sprintf($this->lang->words['m_daterange'], $month, $day, $year );
-					}
-					else
-					{
-						/* Bug #24067 */
-						/* Original fix caused this bug: http://community.invisionpower.com/tracker/issue-24416-search-dates-invalid-acp/
-							Changed to just verify the result is an int, as that is all that's needed to prevent DB error */
-						$time_int = mktime( 0, 0, 0, $month, $day, $year );
-						
-						if ( !is_int($time_int) )
-						{
-							$this->registry->output->global_message = sprintf($this->lang->words['m_daterange'], $month, $day, $year );
-						}
-						else
-						{
-							switch( $_bit )
-							{
-								case 'reg':
-									$field = 'joined';
-								break;
-								case 'post':
-									$field = 'last_post';
-								break;
-								case 'active':
-									$field = 'last_visit';
-								break;
-							}
-		
-							if ( $_when == 'from' )
-							{
-								$_sql[] = 'm.' . $field . ' > ' . $time_int;
-							}
-							else
-							{
-								$_sql[] = 'm.' . $field . ' < ' . $time_int;
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Check we have correct fields
+		// Output filters
 		//-----------------------------------------
 		
-		switch( $data['order_direction'] )
-		{
-			case 'asc':
-				$order_direction = 'asc';
-			break;
-			default:
-			case 'desc':
-				$order_direction = 'desc';
-			break;
-		}
-		
-		switch( $data['order_by'] )
-		{
-			default:
-			case 'joined':
-				$order_by  = 'm.joined';
-			break;
-			case 'members_l_username':
-				$order_by  = 'm.members_l_username';
-			break;
-			case 'members_l_display_name':
-				$order_by  = 'm.members_l_display_name';
-			break;
-			case 'email':
-				$order_by  = 'm.email';
-			break;
-		}
-		
-		//-----------------------------------------
-		// Custom fields...
-		//-----------------------------------------
-
-		if( is_array($data['custom_fields']) AND count($data['custom_fields']) )
-		{
-			foreach ( $data['custom_fields'] as $id => $value )
-	 		{
- 				if ( $value )
- 				{
-					if( $this->caches['profilefields'][ $id ]['pf_type'] == 'drop' )
-					{
-						$_sql[]	= "p.field_{$id}='" . $value . "'";
-					}
-					else if( $this->caches['profilefields'][ $id ]['pf_type'] == 'cbox' )
-					{
-						if ( count( $value ) )
-						{
-							foreach ( $value as $k => $v )
-							{
-								$_sql[]	= "p.field_{$id} LIKE '%|{$k}|%'";
-							}
-						}
-					}
-					else
-					{
-						$_sql[] = $this->caches['profilefields'][ $id ]['pf_search_type'] == 'loose' ? "p.field_{$id} LIKE '" . $value . "%'" : "p.field_{$id} = '" . $value . "'";
-					}
- 				}
-	 		}
- 		}
- 		
- 		/* And not a partial member */
- 		$_sql[] = "par.partial_member_id " . $this->DB->buildIsNull();
-
-		//-----------------------------------------
-		// get 'owt?
-		//-----------------------------------------
-		
-		$real_query = count($_sql) ? implode( " AND ", $_sql ) : '';
+		$_html							 = $searchHelper->getHtmlPresets();
+		$this->registry->output->html	.= $this->html->member_list_context_menu_filters( $_html['form'], $_html['fields'], $_html['presets'] );
 
 		//-----------------------------------------
 		// Get the number of results
 		//-----------------------------------------
 		
-		$count = $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as count',
-												 'from'		=> array( 'members' => 'm' ),
-												 'where'	=> $real_query,
-												 'add_join'	=> array( 0 => array( 'from'   => array( 'profile_portal' => 'pp' ),
-																				  'where'  => 'pp.pp_member_id=m.member_id',
-																				  'type'   => 'left' ),
-																	  1 => array( 'from'   => array( 'pfields_content' => 'p' ),
-																				  'where'  => 'p.member_id=m.member_id',
-																				  'type'   => 'left' ),
-																	  2 => array( 'select' => '',
-																  				  'from'   => array( 'members_partial' => 'par' ),
-																  				  'where'  => 'par.partial_member_id=m.member_id',
-																  				  'type'   => 'left' ) ) ) );
+		$count	= $searchHelper->getSearchResultsCount();
 
-		if ( $count['count'] < 1 )
+		//-----------------------------------------
+		// If we have none, show message and reset cookie
+		//-----------------------------------------
+		
+		if ( $count < 1 and !$this->request['type'] )
 		{
 			$this->registry->output->global_message = $this->lang->words['m_nomembers'];
-			
-			// Reset the filter
-			$real_query = '';
 
-			// And reset the cookie so we don't get the message on every page view
 			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
 			
-			$count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count', 'from' => 'members' ) );
+			$count	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as count', 'from' => 'members' ) );
+			$count	= $count['count'];
+			
+			$searchHelper->resetFilters();
 		}
 
-		$pages = $this->registry->output->generatePagination( array( 'totalItems'			=> $count['count'],
-																	 'itemsPerPage'			=> $perpage,
-																	 'currentStartValue'	=> $st,
-																	 'baseUrl'				=> $this->settings['base_url'] . "&{$this->form_code}&do=" . $this->request['do'],
-														)		);
+		//-----------------------------------------
+		// Generate pagination
+		//-----------------------------------------
+		
+		$st			= intval($this->request['st']);
+		$perpage	= 20;
+
+		$pages		= $this->registry->output->generatePagination( array(
+																		'totalItems'			=> $count,
+																		'itemsPerPage'			=> $perpage,
+																		'currentStartValue'		=> $st,
+																		'baseUrl'				=> $this->settings['base_url'] . $this->form_code . "&amp;do=" . $this->request['do'],
+																)		);
 		
 		//-----------------------------------------
 		// Run the query
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select'		=> 'm.*, m.member_id as mem_id',
-										'from'		=> array( 'members' => 'm' ),
-										'where'		=> $real_query,
-										'order'		=> $order_by . ' ' . $order_direction,
-										'limit'		=> array( $st, $perpage ),
-										'add_join'	=> array(
-															  1 => array( 'select' => 'p.*',
-																		  'from'   => array( 'pfields_content' => 'p' ),
-																		  'where'  => 'p.member_id=m.member_id',
-																		  'type'   => 'left' ),
-															  2 => array( 'select' => 'pp.*',
-																		  'from'   => array( 'profile_portal' => 'pp' ),
-																		  'where'  => 'pp.pp_member_id=m.member_id',
-																		  'type'   => 'left' ) ,
-															  3 => array( 'select' => 'par.*',
-																		  'from'   => array( 'members_partial' => 'par' ),
-																		  'where'  => 'par.partial_member_id=m.member_id',
-																		  'type'   => 'left' ) ) ) );
-		$outer = $this->DB->execute();
-		
-		while ( $r = $this->DB->fetch($outer) )
-		{
-			$r['member_id']     = $r['mem_id'];
-			$r['_joined']		= $this->registry->class_localization->getDate( $r['joined'], 'JOINED' );
-			$r['group_title']	= $this->caches['group_cache'][ $r['member_group_id'] ]['g_title'];
-
-			$members[] = IPSMember::buildDisplayData( $r );
-		}
+		$members	= $searchHelper->getSearchResults( $st, $perpage );
 		
 		//-----------------------------------------
 		// Prune you fookers?
 		//-----------------------------------------
 
-		if ( $data['search_type'] == 'delete' )
+		$_searchType	= $searchHelper->getSearchType();
+		
+		if ( $_searchType == 'delete' )
 		{
-			$this->_memberPruneForm( $count['count'] );
+			$this->_memberPruneForm( $count );
 			return;
 		}
-		else if( $data['search_type'] == 'move' )
+		else if( $_searchType == 'move' )
 		{
-			$this->_memberMoveForm( $count['count'] );
+			$this->_memberMoveForm( $count );
 			return;
 		}
 		
-		$this->registry->output->extra_nav[] = array( '', $this->lang->words['m_viewlist'] );
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$this->registry->output->extra_nav[]	= array( '', $this->lang->words['m_viewlist'] );
 
-		$this->registry->output->html .= $this->html->members_list( $members, $pages );
+		$this->registry->output->html			.= $this->html->members_list( $members, $pages );
 	}
 
-
 	/**
 	 * Edit a member [process]
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void
 	 */
 	protected function _memberDoEdit()
 	{
@@ -2707,6 +1897,16 @@ class admin_members_members_members extends ipsCommand
 		
 		$this->request['member_id'] = intval($this->request['member_id']);
 		
+		//-----------------------------------------
+		// Send to form if this isn't a POST request
+		//-----------------------------------------
+		
+		if( $this->request['request_method'] != 'post' )
+		{
+			$this->_memberView();
+			return;
+		}
+		
 		//-----------------------------------------
 		// Auth check...
 		//-----------------------------------------
@@ -2751,7 +1951,7 @@ class admin_members_members_members extends ipsCommand
 				$omgroups	= $member['mgroup_others'] ? explode( ',', $member['mgroup_others'] ) : array();
 				$groups		= $this->request['mgroup_others'] ? $this->request['mgroup_others'] : array();
 				
-				if( !count( array_diff( $omgroups, $groups ) ) )
+				if( !count( array_diff( $omgroups, $groups ) ) AND !count( array_diff( $groups, $omgroups ) ) )
 				{
 					$same	= true;
 				}
@@ -2797,58 +1997,60 @@ class admin_members_members_members extends ipsCommand
 			}
 		}
 
-		//-----------------------------------------
-		// Convert sig
-		//-----------------------------------------
+		/* Load editor stuff */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
 
-		$signature 					= IPSText::getTextClass('editor')->processRawPost( 'signature' );
+		/* Get signature */
+		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setAllowSmilies( 0 );
+		
+		$signature	= $_editor->process( $_POST['signature'] );
+		
 		IPSText::getTextClass('bbcode')->parse_smilies		= 0;
-		IPSText::getTextClass('bbcode')->parse_bbcode		= $this->settings['sig_allow_ibc'];
-		IPSText::getTextClass('bbcode')->parse_html			= $this->settings['sig_allow_html'];
+		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+		IPSText::getTextClass('bbcode')->parse_html			= $member['g_dohtml'];
 		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
+		IPSText::getTextClass('bbcode')->parsing_section	= 'signatures';
 		
-		$signature					= IPSText::getTextClass('bbcode')->preDbParse( $signature );
-		$cacheSignature				= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );
-		
-		//-----------------------------------------
-		// And 'About Me'
-		//-----------------------------------------
+		$signature		= IPSText::getTextClass('bbcode')->preDbParse( $signature );
+		$cacheSignature	= IPSText::getTextClass('bbcode')->preDisplayParse( $signature );
 
-		$aboutme 					= IPSText::getTextClass('editor')->processRawPost( 'aboutme' );
-		IPSText::getTextClass('bbcode')->parse_smilies		= $this->settings['aboutme_emoticons'];
-		IPSText::getTextClass('bbcode')->parse_bbcode		= $this->settings['aboutme_bbcode'];
-		IPSText::getTextClass('bbcode')->parse_html			= $this->settings['aboutme_html'];
+		/* About me editor */
+		$_editor->setAllowHtml( $member['g_dohtml'] );
+		$_editor->setAllowSmilies( 1 );
+		
+		$aboutme 		= $_editor->process( $_POST['aboutme'] );
+		IPSText::getTextClass('bbcode')->parse_smilies		= 1;
+		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+		IPSText::getTextClass('bbcode')->parse_html			= $member['g_dohtml'];
 		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
 		IPSText::getTextClass('bbcode')->parsing_section			= 'aboutme';
 		
-		$aboutme					= IPSText::getTextClass('bbcode')->preDbParse( $aboutme );
-		
+		$aboutme		= IPSText::getTextClass('bbcode')->preDbParse( $aboutme );
+
 		//-----------------------------------------
 		// Ok? Load interface and child classes
 		//-----------------------------------------
 		
 		$additionalCore		= array();
 		$additionalExtended	= array();
+		$additionalMCache	= array();
 
 		IPSLib::loadInterface( 'admin/member_form.php' );
 		
-		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $app_data )
 		{
-			if ( ! IPSLib::appIsInstalled( $app_dir ) )
-			{
-				continue;
-			}
-			
-			if ( file_exists( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php' ) )
+			if ( is_file( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php' ) )
 			{
 				$_class  = IPSLib::loadLibrary( IPSLib::getAppDir(  $app_dir ) . '/extensions/admin/member_form.php', 'admin_member_form__' . $app_dir, $app_dir );
 				$_object = new $_class( $this->registry );
 				
 				$remote = $_object->getForSave();
 
-				$additionalCore		= array_merge( $remote['core'], $additionalCore );
-				$additionalExtended	= array_merge( $remote['extendedProfile'], $additionalExtended );
+				$additionalCore		= is_array($remote['core']) ? array_merge( $remote['core'], $additionalCore ) : $additionalCore;
+				$additionalExtended	= is_array($remote['extendedProfile']) ? array_merge( $remote['extendedProfile'], $additionalExtended ) : $additionalExtended;
+				$additionalMCache	= is_array($remote['member_cache']) ? array_merge( $remote['member_cache'], $additionalMCache ) : $additionalMCache;
 			}
 		}
 		
@@ -2881,13 +2083,11 @@ class admin_members_members_members extends ipsCommand
 		// Start array
 		//-----------------------------------------
 		
-		$newMember = array(
-							'member_group_id'		=> intval($this->request['member_group_id']),
+		$newMember = array( 'member_group_id'		=> intval($this->request['member_group_id']),
 							'title'					=> $memberTitle,
 							'time_offset'			=> floatval($this->request['time_offset']),
 							'language'				=> $this->request['language'],
 							'skin'					=> intval($this->request['skin']),
-							'hide_email'			=> intval($this->request['hide_email']),
 							'allow_admin_mails'		=> intval($this->request['allow_admin_mails']),
 							'view_sigs'				=> intval($this->request['view_sigs']),
 							'posts'					=> intval($this->request['posts']),
@@ -2901,7 +2101,6 @@ class admin_members_members_members extends ipsCommand
 							'members_bitoptions'	=> IPSBWOPtions::freeze( $this->request, 'members', 'global' ), # Saves all BW options for all apps
 							'members_editor_choice'	=> $this->request['members_editor_choice'],
 							'member_uploader'		=> $this->request['member_uploader'],
-							'email_full'			=> intval( $this->request['email_full'] ),
 							);
 
 		//-----------------------------------------
@@ -2918,7 +2117,7 @@ class admin_members_members_members extends ipsCommand
 		
 		$_basicOptions		= array( array( 'email', $this->lang->words['notopt__email'] ), array( 'pm', $this->lang->words['notopt__pm'] ), array( 'inline', $this->lang->words['notopt__inline'] ) );
 		$_configOptions		= $notifyLibrary->getNotificationData();
-		$_notifyConfig		= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig		= $notifyLibrary->getMemberNotificationConfig( $newMember );
 		$_defaultConfig		= $notifyLibrary->getDefaultNotificationConfig();
 		$_noPrivateMessage	= array( 'new_private_message', 'reply_private_message' );
 		$_saveConfig		= array();
@@ -2973,7 +2172,7 @@ class admin_members_members_members extends ipsCommand
 		// Save
 		//-----------------------------------------
 		
-		IPSMember::packMemberCache( $member['member_id'], array( 'notifications' => $_saveConfig, 'show_notification_popup' => intval($this->request['show_notification_popup']) ), $member['members_cache'] );
+		IPSMember::packMemberCache( $member['member_id'], array_merge( $additionalMCache, array( 'notifications' => $_saveConfig, 'show_notification_popup' => intval($this->request['show_notification_popup']) ) ), $member['members_cache'] );
 
 		//-----------------------------------------
 		// Topic preferences
@@ -2983,7 +2182,7 @@ class admin_members_members_members extends ipsCommand
 		
 		if ( $this->request['auto_track'] )
 		{
- 			if ( in_array( $this->request['auto_track_method'], array( 'none', 'immediate', 'delayed', 'daily', 'weekly' ) ) )
+ 			if ( in_array( $this->request['auto_track_method'], array( 'none', 'immediate', 'offline', 'daily', 'weekly' ) ) )
  			{
  				$_trackChoice = $this->request['auto_track_method'];
  			}
@@ -2991,6 +2190,27 @@ class admin_members_members_members extends ipsCommand
  		
  		$newMember['auto_track']	= $_trackChoice;
 
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields      = new $classToLoad();
+
+    	$fields->initData( 'edit' );
+    	$fields->parseToSave( $_POST );
+		
+		/* Check the website url field */
+		$website_field = $fields->getFieldIDByKey( 'website' );
+		
+		if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
+		{
+			if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
+			{
+				$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
+			}
+		}
+
 		//-----------------------------------------
 		// Throw to the DB
 		//-----------------------------------------
@@ -3001,7 +2221,7 @@ class admin_members_members_members extends ipsCommand
 							 	'extendedProfile'	=> array_merge( array(
 															'pp_about_me'					=> $aboutme,
 															'signature'						=> $signature,
-															'pp_reputation_points'			=> intval( $this->request['pp_reputation_points'] ),
+															'pp_reputation_points'			=> intval($this->request['pp_reputation_points']),
 															'pp_setting_count_visitors'		=> intval($this->request['pp_setting_count_visitors']),
 															'pp_setting_count_comments'		=> intval($this->request['pp_setting_count_comments']),
 															'pp_setting_count_friends'		=> intval($this->request['pp_setting_count_friends']),
@@ -3009,6 +2229,7 @@ class admin_members_members_members extends ipsCommand
 															'pp_setting_moderate_friends'	=> intval($this->request['pp_setting_moderate_friends']),
 															'pp_customization'				=> ( $this->request['removeCustomization'] ) ? serialize( array() ) : $member['pp_customization']
 															), $additionalExtended ),
+								'customFields'		=> count($fields->out_fields) ? $fields->out_fields : array(),
 						 	  )
 						);
 						
@@ -3087,74 +2308,13 @@ class admin_members_members_members extends ipsCommand
 				$this->DB->delete( 'validating', "member_id=" . $this->request['member_id'] );
 			}
 		}
-
-		//-----------------------------------------
-		// Custom profile field stuff
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields      = new $classToLoad();
-
-    	$fields->initData( 'edit' );
-    	$fields->parseToSave( $_POST );
-		
-		/* Check the website url field */
-		$website_field = $fields->getFieldIDByKey( 'website' );
-		
-		if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
-		{
-			if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
-			{
-				$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
-			}
-		}
-		
-		//-----------------------------------------
-		// Custom profile field stuff
-		//-----------------------------------------
-		
-		if ( count( $fields->out_fields ) )
-		{
-			//-----------------------------------------
-			// Do we already have an entry in
-			// the content table?
-			//-----------------------------------------
-			
-			$test = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id='.$this->request['member_id'] ) );
-			
-			if ( $test['member_id'] )
-			{
-				//-----------------------------------------
-				// We have it, so simply update
-				//-----------------------------------------
-				
-				$this->DB->force_data_type = array();
-				
-				foreach( $fields->out_fields as $_field => $_data )
-				{
-					$this->DB->force_data_type[ $_field ] = 'string';
-				}
-				
-				$this->DB->update( 'pfields_content', $fields->out_fields, 'member_id='.$this->request['member_id'] );
-			}
-			else
-			{
-				$this->DB->force_data_type = array();
-				
-				foreach( $fields->out_fields as $_field => $_data )
-				{
-					$this->DB->force_data_type[ $_field ] = 'string';
-				}
-				
-				$fields->out_fields['member_id'] = $this->request['member_id'];
-				
-				$this->DB->insert( 'pfields_content', $fields->out_fields );
-			}
-		}
 				
 		/* Update cache */
 		IPSContentCache::update( $this->request['member_id'], 'sig', $cacheSignature );
 		
+		/* Rebuild birthday cache */
+		$this->cache->rebuildCache( 'birthdays', 'calendar' );
+		
 		//-----------------------------------------
 		// Redirect
 		//-----------------------------------------
@@ -3167,315 +2327,4 @@ class admin_members_members_members extends ipsCommand
 		//$this->_memberView();
 		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&do=viewmember&trigger=' . $triggerGroups . '&member_id=' . $this->request['member_id'] );
 	}
-
-
-	/**
-	 * Generate context-menu filter boxes
-	 * Pass &_nosave=1 to not store / read from a cookie
-	 *
-	 * @author	Matt Mecham
-	 * @since	IPB 3.0.0
-	 * @return	void		[Outputs to screen]
-	 */
-	protected function _generateFilterBoxes()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$form          = array();
-		$custom_fields = array();
-			
-		# Filter: Customer contains
-		$member_contains       = ( $this->request['f_member_contains'] )      ? trim( $this->request['f_member_contains'] )      : '';
-		$member_contains_type  = ( $this->request['f_member_contains_type'] ) ? trim( $this->request['f_member_contains_type'] ) : '';
-		$member_contains_text  = ( $this->request['f_member_contains_text'] ) ? trim( $this->request['f_member_contains_text'] ) : '';
-
-		$_member_contains = array(	0  => array( 'members_display_name'	, $this->lang->words['m_f_display'] ),
-									1  => array( 'name'					, $this->lang->words['m_f_login'] ),
-									2  => array( 'member_id'			, $this->lang->words['m_f_id'] ),
-									3  => array( 'email'				, $this->lang->words['m_f_email'] ),
-									4  => array( 'ip_address'			, $this->lang->words['m_f_ip'] ),
-									5  => array( 'signature'			, $this->lang->words['m_f_sig'] ) );
-
-		$_member_contains_type = array( 0 => array( 'contains', $this->lang->words['m_f_contains'] ),
-										1 => array( 'equals'  , $this->lang->words['m_f_equals'] ),
-										2 => array( 'begins'  , $this->lang->words['m_f_begins']   ),
-									    3 => array( 'ends'    , $this->lang->words['m_f_ends'] ) );
-
-		# Order by
-		$order_by        = '';
-
-		$order_by        = ( $this->request['order_by'] ) ? $this->request['order_by'] : 'joined';
-
-		$_order_by       = array( 0 => array( 'joined'                 , $this->lang->words['m_f_joined'] ),
-								  1 => array( 'members_l_username'     , $this->lang->words['m_f_slogin'] ),
-								  2 => array( 'members_l_display_name' , $this->lang->words['m_f_sdisplay'] ),
-								  3 => array( 'email'                  , $this->lang->words['m_f_email'] ) );
-
-		# Order direction
-		$order_direction = ( $this->request['order_direction'] ) ? $this->request['order_direction'] : 'ASC';
-
-		$_order_direction = array( 0 => array( 'asc'   , $this->lang->words['m_f_orderaz'] ),
-								   1 => array( 'desc'  , $this->lang->words['m_f_orderza'] ) );
-
-		# Filter: member type
-		$member_type         = ( $this->request['f_member_type'] ) ? trim( $this->request['f_member_type'] ) : '';
-
-		$_member_type        = array( 0 => array( 'all'         , $this->lang->words['m_f_showall'] ),
-									  1 => array( 'suspended'   , $this->lang->words['m_f_showsusp'] ),
-									  2 => array( 'notsuspended', $this->lang->words['m_f_showunsusp'] ) );
-														
-		# Filter: banned type
-		$banned_type         = ( $this->request['f_banned_type'] ) ? trim( $this->request['f_banned_type'] ) : '';
-
-		$_banned_type        = array( 0 => array( 'all'         , $this->lang->words['m_f_showall'] ),
-									  1 => array( 'banned'      , $this->lang->words['m_f_showbanned'] ),
-									  2 => array( 'notbanned'   , $this->lang->words['m_f_shownotbanned'] ) );
-									
-		# Filter: SPAM status type
-		$spam_type           = ( $this->request['f_spam_type'] ) ? trim( $this->request['f_spam_type'] ) : '';
-
-		$_spam_type          = array( 0 => array( 'all'         , $this->lang->words['m_f_showall'] ),
-									  1 => array( 'spam'        , $this->lang->words['m_f_showspam'] ),
-									  2 => array( 'notspam'     , $this->lang->words['m_f_shownotspam'] ) );
-															
-		# Type of search
-		$search_type      = ( $this->request['f_search_type'] ) ? $this->request['f_search_type'] : 'normal';
-
-		$_search_type       = array( 0 => array( 'normal', $this->lang->words['m_f_toedit'] ) );
-		
-		if( $this->registry->getClass('class_permissions')->checkPermission( 'member_delete' ) )
-		{
-			$_search_type[1] = array( 'delete', $this->lang->words['m_f_todelete'] );
-		}
-		
-		if( $this->registry->getClass('class_permissions')->checkPermission( 'member_move' ) )
-		{
-			$_search_type[2] = array( 'move', $this->lang->words['m_f_tomove'] );
-		}
-		
-		# Date Ranges
-		$date_reg_from     = ( $this->request['f_date_reg_from'] ) ? trim( $this->request['f_date_reg_from'] ) : '';
-		$date_reg_to       = ( $this->request['f_date_reg_to'] )   ? trim( $this->request['f_date_reg_to'] ) : '';
-		
-		$date_post_from    = ( $this->request['f_date_post_from'] ) ? trim( $this->request['f_date_post_from'] ) : '';
-		$date_post_to      = ( $this->request['f_date_post_to'] )   ? trim( $this->request['f_date_post_to'] ) : '';
-	
-		$date_active_from  = ( $this->request['f_date_active_from'] ) ? trim( $this->request['f_date_active_from'] ) : '';
-		$date_active_to    = ( $this->request['f_date_active_to'] )   ? trim( $this->request['f_date_active_to'] ) : '';
-		
-		$primary_group      = ( $this->request['f_primary_group'] ) ? trim( $this->request['f_primary_group'] ) : 0;
-		$secondary_group    = ( $this->request['f_secondary_group'] )   ? trim( $this->request['f_secondary_group'] ) : 0;
-		$include_secondary	= ( $this->request['f_inc_secondary'] ) ? 1 : 0;
-		
-		$_primary_group     = array( 0 => array( '0', $this->lang->words['m_f_primany'] ) );
-		$_secondary_group   = array( 0 => array( '0', $this->lang->words['m_f_secany'] ) );
-		
-		$post_count			= ( $this->request['f_post_count'] || $this->request['f_post_count'] == '0' ) ? trim( $this->request['f_post_count'] ) : '';
-		$post_count_type	= ( $this->request['f_post_count_type'] ) ? trim( $this->request['f_post_count_type'] ) : '';
-
-		$_post_count_types	= array( 0 => array( 'lt'   , $this->lang->words['pc_lt'] ),
-								   	 1 => array( 'gt'  , $this->lang->words['pc_gt'] ),
-								   	 3 => array( 'eq'  , $this->lang->words['pc_eq'] ) );
-
-		foreach( ipsRegistry::cache()->getCache('group_cache') as $_gid => $_gdata )
-		{
-			$_primary_group[]   = array( $_gdata['g_id'] , $_gdata['g_title'] );
-			$_secondary_group[] = array( $_gdata['g_id'] , $_gdata['g_title'] );
-		}
-		
-		/* Reset Fitlers */
-		if( $this->request['reset_filters'] )
-		{
-			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
-		}
-		
-		//-----------------------------------------
-		// Not posted, so er.. get the cookie
-		//-----------------------------------------
-
-		$custom_field_data = array();
-		$filters_preset    = 0;
-
-		if ( ! $this->request['__update'] AND ! $this->request['_nosave'] )
-		{
-			$_cookie_array = ipsRegistry::getClass('adminFunctions')->staffGetCookie( 'memberFilter' );
-
-			if ( $_cookie_array )
-			{
-				if ( is_array( $_cookie_array ) AND count ( $_cookie_array ) )
-				{
-					$member_type            = substr( $_cookie_array['c_member_type'], 0,10 );
-					$banned_type            = substr( $_cookie_array['c_banned_type'], 0,10 );
-					$spam_type              = substr( $_cookie_array['c_spam_type'], 0,10 );
-					$member_contains        = substr( $_cookie_array['c_member_contains'], 0,20 );
-					$member_contains_type   = substr( $_cookie_array['c_member_contains_type'], 0,20 );
-					$member_contains_text   = substr( $_cookie_array['c_member_contains_text'], 0,50 );
-					$post_count				= trim( IPSText::alphanumericalClean( $_cookie_array['c_post_count'] ) );
-					$post_count_type		= trim( IPSText::alphanumericalClean( $_cookie_array['c_post_count_type'] ) );
-					$order_by             = trim( IPSText::alphanumericalClean( $_cookie_array['c_order_by'] ) );
-					$order_direction      = trim( IPSText::alphanumericalClean( $_cookie_array['c_order_direction'] ) );
-					$date_reg_from			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_reg_from'], '/-' ) );
-					$date_reg_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_reg_to'], '/-' ) );
-					$date_post_from			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_post_from'], '/-' ) );
-					$date_post_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_post_to'], '/-' ) );
-					$date_active_from		= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_active_from'], '/-' ) );
-					$date_active_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_active_to'], '/-' ) );
-					$primary_group		    = trim( IPSText::alphanumericalClean( $_cookie_array['c_primary_group'], '/-' ) );
-					$include_secondary		= trim( IPSText::alphanumericalClean( $_cookie_array['c_include_secondary'], '/-' ) );
-					$secondary_group	    = trim( IPSText::alphanumericalClean( $_cookie_array['c_secondary_group'], '/-' ) );
-					$custom_field_cookie	= explode( '||', $_cookie_array['c_custom_fields'] );
-
-					if( 
-						$member_type || $member_contains || $member_contains_type || $member_contains_text || $order_by || $order_direction ||
-						$date_reg_from || $date_reg_to || $date_post_from || $date_post_to || $date_active_from || $date_active_to || $primary_group ||
-						$secondary_group  || $post_count || $post_count_type || $include_secondary
-						)
-					{
-						$filters_preset = 1;
-					}
-
-					if( is_array( $custom_field_cookie ) AND count($custom_field_cookie) )
-					{
-						foreach( $custom_field_cookie as $field )
-						{
-							$data = explode( '==', $field );
-							$custom_field_data[ 'field_' . $data[0] ] = $data[1];
-							ipsRegistry::$request[ 'field_' . $data[0] ] = $data[1];
-							
-							if( $data[1] )
-							{
-								$filters_preset = 1;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		$custom_field_data = count($custom_field_data) ? $custom_field_data : $_POST;
-		
-		foreach( $custom_field_data as $k => $v )
-		{
-			if( strpos( $k, 'ignore_field_') === 0 )
-			{
-				$key = substr( $k, 13 );
-				
-				$custom_field_data[ 'field_' . $key ] = '';
-			}
-		}
-
-		//-----------------------------------------
-    	// Get custom profile information
-    	//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-		$fields      = new $classToLoad();
-    	
-    	$fields->member_data = $custom_field_data;
-    	$fields->initData( 'edit', 1 );
-    	$fields->parseToEdit();
-		
-		//-----------------------------------------
-		// Finish forms...
-		//-----------------------------------------
-
-		$form['_member_contains']		= $this->registry->output->formDropdown( 'f_member_contains'		, $_member_contains       , $member_contains  );
-		$form['_member_contains_type']	= $this->registry->output->formDropdown( 'f_member_contains_type'	, $_member_contains_type  , $member_contains_type );
-		$form['_member_contains_text']	= $this->registry->output->formSimpleInput('f_member_contains_text'	, $member_contains_text, 15 );
-		$form['_member_type']			= $this->registry->output->formDropdown( 'f_member_type'			, $_member_type  , $member_type  );
-		$form['_banned_type']			= $this->registry->output->formDropdown( 'f_banned_type'			, $_banned_type  , $banned_type  );
-		$form['_spam_type']		    	= $this->registry->output->formDropdown( 'f_spam_type'				, $_spam_type  , $spam_type  );
-		$form['_order_by']				= $this->registry->output->formDropdown( 'order_by'					, $_order_by       , preg_replace( "#.*\.(.*)$#", "\\1", $order_by ) );
-		$form['_order_direction']		= $this->registry->output->formDropdown( 'order_direction'			, $_order_direction, $order_direction );
-		$form['_search_type']			= $this->registry->output->formDropdown( 'f_search_type'			, $_search_type, $search_type );
-		$form['_post_count']			= $this->registry->output->formSimpleInput('f_post_count'			, $post_count, 10 );
-		$form['_post_count_type']		= $this->registry->output->formDropdown( 'f_post_count_type'		, $_post_count_types, $post_count_type );
-		$form['_date_reg_from']			= $this->registry->output->formSimpleInput('f_date_reg_from'		, $date_reg_from, 10 );
-		$form['_date_reg_to']			= $this->registry->output->formSimpleInput('f_date_reg_to'			, $date_reg_to, 10 );
-		$form['_date_post_from']		= $this->registry->output->formSimpleInput('f_date_post_from'		, $date_post_from, 10 );
-		$form['_date_post_to']			= $this->registry->output->formSimpleInput('f_date_post_to'			, $date_post_to, 10 );
-		$form['_date_active_from']		= $this->registry->output->formSimpleInput('f_date_active_from'		, $date_active_from, 10 );
-		$form['_date_active_to']		= $this->registry->output->formSimpleInput('f_date_active_to'		, $date_active_to, 10 );
-		$form['_primary_group']			= $this->registry->output->formDropdown( 'f_primary_group'			, $_primary_group    , $primary_group );
-		$form['_secondary_group']		= $this->registry->output->formDropdown( 'f_secondary_group'		, $_secondary_group  , $secondary_group );
-		$form['_include_secondary']		= $this->registry->output->formCheckbox( 'f_inc_secondary'			, $include_secondary );
-
-		//-----------------------------------------
-		// Set custom field data for cookie
-		//-----------------------------------------
-		
-		$custom_field_data_imploded	= array();
-
-		foreach( $custom_field_data as $k => $v )
-		{
-			if( strpos( $k, 'field_' ) === 0 AND $v )
-			{
-				$custom_field_data_imploded[] = substr( $k, 6 ) . '==' . $v;
-			}
-		}
-		
-		$custom_field_data_imploded = implode( '||', $custom_field_data_imploded );
-
-		//-----------------------------------------
-		// Store the cooookie
-		// @see http://community.invisionpower.com/tracker/issue-19031-acp-members-page-always-thinks-its-being-filtered/
-		//-----------------------------------------
-		
-		if ( $this->request['__update'] AND ! $this->request['_nosave'] )
-		{
-			$_cookie = array( 'c_member_type'			=> $member_type,
-			 				  'c_banned_type'			=> $banned_type,
-			 				  'c_spam_type'				=> $spam_type,
-							  'c_member_contains'		=> $member_contains,
-							  'c_member_contains_type'	=> $member_contains_type,
-							  'c_member_contains_text'	=> $member_contains_text,
-							  'c_order_by'				=> preg_replace( "#.*\.(.*)$#", "\\1", $order_by ),
-							  'c_order_direction'		=> $order_direction,
-							  'c_post_count'			=> $post_count,
-							  'c_post_count_type'		=> $post_count_type,
-							  'c_date_reg_from'			=> $date_reg_from,
-							  'c_date_reg_to'			=> $date_reg_to,
-							  'c_date_post_from'		=> $date_post_from,
-							  'c_date_post_to'			=> $date_post_to,
-							  'c_date_active_from'		=> $date_active_from,
-						      'c_date_active_to'		=> $date_active_to,
-							  'c_primary_group'			=> $primary_group,
-							  'c_secondary_group'		=> $secondary_group,
-							  'c_include_secondary'		=> $include_secondary,
-							  'c_custom_fields'			=> $custom_field_data_imploded );
-							  		
-			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', $_cookie );
-		}
-		
-		//-----------------------------------------
-		// Create filter boxes
-		//-----------------------------------------
-
-		$this->registry->output->html .= $this->html->member_list_context_menu_filters( $form, $fields, $filters_preset );
-	
-		//-----------------------------------------
-		// Return data
-		//-----------------------------------------
-		
-		$_return = array( 'custom_fields' => '' );
-		
-		if( is_array( $fields->out_fields ) AND count( $fields->out_fields ) )
-		{
-			foreach( $fields->out_fields as $id => $data )
-			{
-				$_return['custom_fields'][ $id ] = $fields->in_fields[ $id ];
-			}
-		}
-
-		foreach( array_keys( $form ) as $_key )
-		{
-			$__key = substr( $_key, 1 );
-			
-			$_return[ $__key ] = ${ $__key };
-		}
-
-		return $_return;
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/notifications.php b/upload/admin/applications/members/modules_admin/members/notifications.php
index eb927931..578efb73 100644
--- a/upload/admin/applications/members/modules_admin/members/notifications.php
+++ b/upload/admin/applications/members/modules_admin/members/notifications.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Configure default notification options
- * Last Updated: $Date: 2010-06-17 21:29:47 -0400 (Thu, 17 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6553 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -29,31 +29,27 @@ class admin_members_members_notifications extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */	
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Notifications library
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $notifyLibrary;
@@ -61,9 +57,8 @@ class admin_members_members_notifications extends ipsCommand
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -126,8 +121,7 @@ class admin_members_members_notifications extends ipsCommand
 	/**
 	 * Show form to configure notification default options
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showDefaults()
 	{
@@ -140,14 +134,12 @@ class admin_members_members_notifications extends ipsCommand
 	/**
 	 * Save default notification configuration
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveDefaults()
 	{
 		$_configOptions		= $this->notifyLibrary->getNotificationData();
 		$_notifyConfig		= $this->notifyLibrary->getDefaultNotificationConfig();
-		$_noPrivateMessage	= array( 'new_private_message', 'reply_private_message' );
 
 		foreach( $_configOptions as $option )
 		{
@@ -155,24 +147,6 @@ class admin_members_members_notifications extends ipsCommand
 			$_notifyConfig[ $option['key'] ]['selected']			= ( is_array($this->request['default_' . $option['key'] ]) AND count($this->request['default_' . $option['key'] ]) ) ? $this->request['default_' . $option['key'] ] : array();
 			$_notifyConfig[ $option['key'] ]['disabled']			= ( is_array($this->request['disabled_' . $option['key'] ]) AND count($this->request['disabled_' . $option['key'] ]) ) ? $this->request['disabled_' . $option['key'] ] : array();
 			$_notifyConfig[ $option['key'] ]['disable_override']	= intval($this->request['disable_override_' . $option['key'] ]);
-			
-			/**
-			 * @link	http://community.invisionpower.com/tracker/issue-23453-notification-defaults/
-			 */
-			if( in_array( $option['key'], $_noPrivateMessage ) AND in_array( 'pm', $_notifyConfig[ $option['key'] ]['selected'] ) )
-			{
-				$_newSelected	= array();
-				
-				foreach( $_notifyConfig[ $option['key'] ]['selected'] as $_v )
-				{
-					if( $_v != 'pm' )
-					{
-						$_newSelected[]	 = $_v;
-					}
-				}
-				
-				$_notifyConfig[ $option['key'] ]['selected']	= $_newSelected;
-			}
 		}
 
 		$this->notifyLibrary->saveNotificationConfig( $_notifyConfig );
diff --git a/upload/admin/applications/members/modules_admin/members/ranks.php b/upload/admin/applications/members/modules_admin/members/ranks.php
index 4e76d1c3..5cacbcce 100644
--- a/upload/admin/applications/members/modules_admin/members/ranks.php
+++ b/upload/admin/applications/members/modules_admin/members/ranks.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member management
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Revision: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,49 +30,29 @@ class admin_members_members_ranks extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
-	
-	/**
-	 * Editor object
-	 *
-	 * @access	private
-	 * @var		object			Editor library
-	 */
-	private $han_editor;
-
-	/**
-	 * Trash can forum id
-	 *
-	 * @access	private
-	 * @var		integer			Trash can forum
-	 */
-	private $trash_forum		= 0;
+	protected $form_code_js;
 
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -144,8 +124,7 @@ class admin_members_members_ranks extends ipsCommand
 	/**
 	 * Recache ranks
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function titlesRecache()
 	{
@@ -173,8 +152,7 @@ class admin_members_members_ranks extends ipsCommand
 	/**
 	 * Overview page
 	 *
-	 * @access	protected
-	 * @return	void			[Outputs to screen]
+	 * @return	@e void			[Outputs to screen]
 	 */
 	protected function _titlesStart()
 	{
@@ -209,9 +187,8 @@ class admin_members_members_ranks extends ipsCommand
 	/**
 	 * Save rank [add/edit]
 	 *
-	 * @access	protected
 	 * @param	string			'add' or 'edit'
-	 * @return	void			[Outputs to screen]
+	 * @return	@e void			[Outputs to screen]
 	 */
 	protected function _titlesSave( $type = 'add' )
 	{
@@ -261,19 +238,20 @@ class admin_members_members_ranks extends ipsCommand
 
 		if( $type == 'add' )
 		{
-			$this->registry->output->doneScreen($this->lang->words['rnk_added2'], $this->lang->words['rnk_rankcontrol'], "{$this->form_code}&do=title", 'redirect' );
+			$this->registry->output->global_message	= $this->lang->words['rnk_added2'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=title' );
 		}
 		else
 		{
-			$this->registry->output->doneScreen($this->lang->words['rnk_edited'], $this->lang->words['rnk_rankcontrol'], "{$this->form_code}&do=title", 'redirect' );	
+			$this->registry->output->global_message	= $this->lang->words['rnk_edited'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=title' );
 		}
 	}
 	
 	/**
 	 * Delete a rank
 	 *
-	 * @access	protected
-	 * @return	void			[Outputs to screen]
+	 * @return	@e void			[Outputs to screen]
 	 */
 	protected function _titlesDelete()
 	{
@@ -291,17 +269,17 @@ class admin_members_members_ranks extends ipsCommand
 		$this->titlesRecache();
 		
 		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $this->lang->words['rnk_removed'] );
-		
-		$this->registry->output->doneScreen($this->lang->words['rnk_removed2'], $this->lang->words['rnk_rankcontrol'], "{$this->form_code}&do=title", 'redirect' );
+
+		$this->registry->output->global_message	= $this->lang->words['rnk_removed2'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code . '&amp;do=title' );
 	}
 	
 
 	/**
 	 * Show the form to add/edit a rank
 	 *
-	 * @access	protected
 	 * @param	string			Type of form (add|edit)
-	 * @return	void			[Outputs to screen]
+	 * @return	@e void			[Outputs to screen]
 	 */
 	protected function _titlesForm( $mode='edit' )
 	{
diff --git a/upload/admin/applications/members/modules_admin/members/reputation.php b/upload/admin/applications/members/modules_admin/members/reputation.php
index b5f5f181..cb6aa220 100644
--- a/upload/admin/applications/members/modules_admin/members/reputation.php
+++ b/upload/admin/applications/members/modules_admin/members/reputation.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Reputation System
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -30,33 +30,29 @@ class admin_members_members_reputation extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -111,8 +107,7 @@ class admin_members_members_reputation extends ipsCommand
 	/**
 	 * Rebuilds the reputation level cache
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildReputationLevelCache()
 	{
@@ -135,8 +130,7 @@ class admin_members_members_reputation extends ipsCommand
 	/**
 	 * Removes the selected reputation level
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function deleteLevel()
 	{
@@ -153,15 +147,15 @@ class admin_members_members_reputation extends ipsCommand
 		$this->rebuildReputationLevelCache();
 		
 		/* Redirect */
-		$this->registry->output->doneScreen( $this->lang->words['rep_level_removed'], $this->lang->words['rep_management'], $this->form_code, 'redirect' );		
+		$this->registry->output->global_message	= $this->lang->words['rep_level_removed'];
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 	}
 	
 	/**
 	 * Handles the add/edit reputation level form
 	 *
-	 * @access	public
 	 * @param	string	$mode	Either add or edit
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function doLevelForm( $mode='add' )
 	{
@@ -194,7 +188,8 @@ class admin_members_members_reputation extends ipsCommand
 			$this->rebuildReputationLevelCache();
 			
 			/* Redirect */
-			$this->registry->output->doneScreen( $this->lang->words['rep_level_added'], $this->lang->words['rep_management'], $this->form_code, 'redirect' );
+			$this->registry->output->global_message	= $this->lang->words['rep_level_added'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 		}
 		else
 		{
@@ -211,17 +206,17 @@ class admin_members_members_reputation extends ipsCommand
 			$this->rebuildReputationLevelCache();
 			
 			/* Redirect */
-			$this->registry->output->doneScreen( $this->lang->words['rep_level_edited'], $this->lang->words['rep_management'], $this->form_code, 'redirect' );			
+			$this->registry->output->global_message	= $this->lang->words['rep_level_edited'];
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . $this->form_code );
 		}		
 	}
 	
 	/**
 	 * Form for adding/exiting reputation levels
 	 *
-	 * @access	public
 	 * @param	string	$mode	Either add or edit
 	 * @param	array	$errors	Array of error messages to display
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function levelForm( $mode='add', $errors=array() )
 	{
@@ -276,8 +271,7 @@ class admin_members_members_reputation extends ipsCommand
 	/**
 	 * Reputation overview
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function reputationOverview()
 	{
diff --git a/upload/admin/applications/members/modules_admin/members/tools.php b/upload/admin/applications/members/modules_admin/members/tools.php
index 7275b9d2..da8b9ae4 100644
--- a/upload/admin/applications/members/modules_admin/members/tools.php
+++ b/upload/admin/applications/members/modules_admin/members/tools.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member validation, locked and banned queues
- * Last Updated: $Date: 2010-10-22 18:09:52 -0400 (Fri, 22 Oct 2010) $
+ * Last Updated: $Date: 2011-05-31 15:22:26 -0400 (Tue, 31 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 7022 $
+ * @version		$Revision: 8931 $
  */
 
 if ( ! defined( 'IN_ACP' ) )
@@ -30,27 +30,27 @@ class admin_members_members_tools extends ipsCommand
 	 *
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 
 	/**
 	 * Shortcut for url
 	 *
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 
 	/**
 	 * Shortcut for url (javascript)
 	 *
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 
 	/**
 	 * Main class entry point
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -76,58 +76,33 @@ class admin_members_members_tools extends ipsCommand
 				$this->_learnIP();
 			break;
 
-			case 'validating':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating' );
-				$this->_viewQueue( 'validating' );
-			break;
-			
 			case 'do_validating':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating', 'members', 'members' );
 				$this->_manageValidating();
 			break;
 			
 			case 'unappemail':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating', 'members', 'members' );
 				$this->_emailUnapprove();
 			break;
 
-			case 'locked':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_locked' );
-				$this->_viewQueue( 'locked' );
-			break;
-			
 			case 'do_locked':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_locked' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_locked', 'members', 'members' );
 				$this->_unlock();
 			break;
 
-			case 'banned':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned' );
-				$this->_viewQueue( 'banned' );
-			break;
-
-			case 'spam':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned' );
-				$this->_viewQueue( 'spam' );
-			break;
-			
-			case 'incomplete':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_validating' );
-				$this->_viewQueue( 'incomplete' );
-			break;
-
 			case 'do_spam':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_spam', 'members', 'members' );
 				$this->_unSpam();
 			break;
 
 			case 'do_banned':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned', 'members', 'members' );
 				$this->_unban();
 			break;
 			
 			case 'do_incomplete':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_banned' );
+				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'membertools_incomplete', 'members', 'members' );
 				$this->_doIncomplete();
 			break;
 
@@ -173,11 +148,11 @@ class admin_members_members_tools extends ipsCommand
 
 		$topics = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as tcount',
 															 	 'from'   => 'topics',
-											 				 	 'where'  => 'approved=1' ) );
+											 				 	 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) ) );
 
 		$posts  = $this->DB->buildAndFetch( array( 'select' => 'SUM(posts) as replies',
 																 'from'   => 'topics',
-																 'where'  => 'approved=1' ) );
+																 'where'  => $this->registry->getClass('class_forums')->fetchTopicHiddenQuery( array( 'visible' ), '' ) ) );
 
 		$stats['total_topics']  = $topics['tcount'];
 		$stats['total_replies'] = $posts['replies'];
@@ -194,17 +169,17 @@ class admin_members_members_tools extends ipsCommand
 		
 		foreach( $this->caches['group_cache'] as $_gid => $_gdata )
 		{
-			if( !$_gdata['g_hide_online_list'] )
+			if( !$_gdata['g_hide_online_list'] AND $_gid != $this->settings['auth_group'] )
 			{
 				$_groups[]	= $_gid;
 			}
 		}
 		
-		$_where	= count($_groups) ? " AND member_group_id IN(" . implode( ',', $_groups ) . ")" : "";
+		$_where	= count($_groups) ? " member_group_id IN(" . implode( ',', $_groups ) . ")" : "member_group_id <> '{$this->settings['auth_group']}'";
 		
 		$r = $this->DB->buildAndFetch( array( 'select' => 'member_id, name, members_display_name, members_seo_name',
 										  'from'   => 'members',
-										  'where'  => "member_group_id <> '{$this->settings['auth_group']}'{$_where} AND members_display_name != '' AND members_display_name " . $this->DB->buildIsNull( false ),
+										  'where'  => "{$_where} AND members_display_name != '' AND members_display_name " . $this->DB->buildIsNull( false ),
 										  'order'  => "member_id DESC",
 										  'limit'  => array(0,1) ) );
 
@@ -220,10 +195,10 @@ class admin_members_members_tools extends ipsCommand
 	/**
 	 * Show the form to confirm merging a member
 	 *
-	 * @return	void	[Outputs to screen]
+	 * @return	@e void	[Outputs to screen]
 	 * @author	Brandon Farber
 	 */
-	private function _mergeForm()
+	protected function _mergeForm()
 	{
 		$id	= intval($this->request['member_id']);
 
@@ -241,10 +216,10 @@ class admin_members_members_tools extends ipsCommand
 	/**
 	 * Merge two members
 	 *
-	 * @return	void	[Redirects to member account]
+	 * @return	@e void	[Redirects to member account]
 	 * @author	Brandon Farber
 	 */
-	private function _completeMerge()
+	protected function _completeMerge()
 	{
 		if( !$this->request['confirm'] )
 		{
@@ -299,8 +274,6 @@ class admin_members_members_tools extends ipsCommand
 			// Clean up profile stuff
 			//-----------------------------------------
 
-			$this->DB->update( 'profile_comments'		, array( 'comment_by_member_id' => $member['member_id'] ), "comment_by_member_id=" . $member2['member_id'] );
-			$this->DB->update( 'profile_comments'		, array( 'comment_for_member_id' => $member['member_id'] ), "comment_for_member_id=" . $member2['member_id'] );
 			$this->DB->update( 'profile_portal_views'	, array( 'views_member_id' => $member['member_id'] ), "views_member_id=" . $member2['member_id'] );
 			$this->DB->update( 'warn_logs'				, array( 'wlog_mid' => $member['member_id'] ), "wlog_mid=" . $member2['member_id'] );
 			$this->DB->update( 'warn_logs'				, array( 'wlog_addedby' => $member['member_id'] ), "wlog_addedby=" . $member2['member_id'] );
@@ -321,8 +294,6 @@ class admin_members_members_tools extends ipsCommand
 
 			$this->DB->update( 'upgrade_history'		, array( 'upgrade_mid' => $member['member_id'] ), "upgrade_mid=" . $member2['member_id'] );
 			$this->DB->update( 'admin_logs'				, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] );
-			$this->DB->update( 'email_logs'				, array( 'from_member_id' => $member['member_id'] ), "from_member_id=" . $member2['member_id'] );
-			$this->DB->update( 'email_logs'				, array( 'to_member_id' => $member['member_id'] ), "to_member_id=" . $member2['member_id'] );
 			$this->DB->update( 'error_logs'				, array( 'log_member' => $member['member_id'] ), "log_member=" . $member2['member_id'] );
 			$this->DB->update( 'moderator_logs'			, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] );
 			
@@ -361,59 +332,13 @@ class admin_members_members_tools extends ipsCommand
 	
 			if( count($_likes) )
 			{
-				$this->DB->update( 'core_like'				, array( 'like_member_id' => $member['member_id'] ), "like_member_id=" . $member2['member_id'] . " AND like_cache_id NOT IN('" . implode( "','", array_map( 'addslashes', $_likes ) ) . "')" );
+				$this->DB->update( 'core_like'				, array( 'like_member_id' => $member['member_id'] ), "like_member_id=" . $member2['member_id'] . " AND like_lookup_id NOT IN('" . implode( "','", array_map( 'addslashes', $_likes ) ) . "')" );
 				$this->DB->delete( 'core_like_cache'		, "like_cache_id IN('" . implode( "','", array_map( 'addslashes', $_likes ) ) . "')" );
 			}
 			else
 			{
 				$this->DB->update( 'core_like'				, array( 'like_member_id' => $member['member_id'] ), "like_member_id=" . $member2['member_id'] );
 			}
-		
-			//-----------------------------------------
-			// Tracker
-			//-----------------------------------------
-
-			$tracker	= array();
-
-			$this->DB->build( array( 'select' => 'topic_id', 'from' => 'tracker', 'where' => 'member_id=' . $member['member_id'] ) );
-			$this->DB->execute();
-
-			while( $r = $this->DB->fetch() )
-			{
-				$tracker[]	= $r['topic_id'];
-			}
-
-			if( count($tracker) )
-			{
-				$this->DB->update( 'tracker'				, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] . " AND topic_id NOT IN(" . implode( ',', $tracker ) . ")" );
-			}
-			else
-			{
-				$this->DB->update( 'tracker'				, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] );
-			}
-
-			//-----------------------------------------
-			// Forum tracker
-			//-----------------------------------------
-
-			$ftracker	= array();
-
-			$this->DB->build( array( 'select' => 'forum_id', 'from' => 'forum_tracker', 'where' => 'member_id=' . $member['member_id'] ) );
-			$this->DB->execute();
-
-			while( $r = $this->DB->fetch() )
-			{
-				$ftracker[]	= $r['forum_id'];
-			}
-
-			if( count($ftracker) )
-			{
-				$this->DB->update( 'forum_tracker'			, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] . " AND forum_id NOT IN(" . implode( ',', $ftracker ) . ")" );
-			}
-			else
-			{
-				$this->DB->update( 'forum_tracker'			, array( 'member_id' => $member['member_id'] ), "member_id=" . $member2['member_id'] );
-			}
 
 			//-----------------------------------------
 			// Poll votes
@@ -601,13 +526,16 @@ class admin_members_members_tools extends ipsCommand
 
 			try
 			{
-				IPSMember::save( $member['member_id'], array( 'core' => array(
+				IPSMember::save( $member['member_id'], array(	'core'				=> array(
 																			'posts'			=> ($member['posts'] + $member2['posts']),
 																			'warn_level'	=> ($member['warn_level'] + $member2['warn_level']),
 																			'warn_lastwarn'	=> ($member2['warn_lastwarn'] > $member['warn_lastwarn']) ? $member2['warn_lastwarn'] : $member['warn_lastwarn'] ,
 																			'last_post'		=> ($member2['last_post'] > $member['last_post']) ? $member2['last_post'] : $member['last_post'],
 																			'last_visit'	=> ($member2['last_visit'] > $member['last_visit']) ? $member2['last_visit'] : $member['last_visit'],
-																			)
+																							),
+   														  		'extendedProfile'	=> array(
+   														  					'pp_reputation_points'	=> ($member['pp_reputation_points'] + $member2['pp_reputation_points']),
+																	 						),
 								)							);
 			}
 			catch( Exception $error )
@@ -650,9 +578,9 @@ class admin_members_members_tools extends ipsCommand
 	/**
 	 * Delete all private messages from a member
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _deleteMessages()
+	protected function _deleteMessages()
 	{
 		if( !$this->request['confirm'] )
 		{
@@ -669,6 +597,15 @@ class admin_members_members_tools extends ipsCommand
 		}
 		else
 		{
+			//-----------------------------------------
+			// Deleting anything?
+			//-----------------------------------------
+			
+			if( !$this->request['topics'] AND !$this->request['replies'] )
+			{
+				$this->registry->output->showError( $this->lang->words['no_msngr_sel_del'], 11247.22 );
+			}
+			
 			//-----------------------------------------
 			// Get messenger lib
 			//-----------------------------------------
@@ -740,468 +677,12 @@ class admin_members_members_tools extends ipsCommand
 		}
 	}
 
-	/**
-	 * View queues (validating, locked, banned)
-	 *
-	 * @param 	string		Queue to view [validating, locked, banned]
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _viewQueue( $type='validating' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$this->request[ 'ord'] =  $this->request['ord'] ? $this->request['ord'] : '' ;
-		$st			= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
-		$ord		= $this->request['ord'] == 'asc' ? 'asc' : 'desc';
-		$new_ord	= $ord  == 'asc' ? 'desc' : 'asc';
-		$filter		= $this->request['filter'] ? $this->request['filter'] : '';
-		$q_extra	= "";
-		$content	= "";
-
-		//-----------------------------------------
-		// Run teh query
-		//-----------------------------------------
-
-		switch( $type )
-		{
-			case 'validating':
-				switch( $filter )
-				{
-					case 'reg_user_validate':
-						if( $this->settings['reg_auth_type'] != 'admin' )
-						{
-							$q_extra = " AND v.new_reg=1 AND v.user_verified=0";
-						}
-					break;
-
-					case 'reg_admin_validate':
-						if( $this->settings['reg_auth_type'] == 'admin' )
-						{
-							$q_extra = " AND v.new_reg=1";
-						}
-						else
-						{
-							$q_extra = " AND v.new_reg=1 AND v.user_verified=1";
-						}
-					break;
-
-					case 'email_chg':
-						$q_extra = " AND v.email_chg=1";
-					break;
-
-					case 'coppa':
-						$q_extra = " AND v.coppa_user=1";
-					break;
-				}
-
-				$row = $this->DB->buildAndFetch( array( 'select'    => 'COUNT(*) as queue',
-														'from'		=> array( 'validating' => 'v' ),
-														'where'		=> "v.lost_pass=0 AND m.member_group_id=" . $this->settings['auth_group'] . $q_extra,
-														'add_join'	=> array(
-																			array(  'from'		=> array( 'members' => 'm' ),
-																					'where'		=> 'm.member_id=v.member_id',
-																					'type'		=> 'left' ) ) )		);
-			break;
-
-			case 'locked':
-				if( $this->settings['ipb_bruteforce_attempts'] )
-				{
-					$row = $this->DB->buildAndFetch( array( 'select'		=> 'COUNT(*) as queue',
-																	'from'		=> 'members',
-																	'where'		=> "failed_login_count >= " . intval($this->settings['ipb_bruteforce_attempts']),
-															)		);
-				}
-				else
-				{
-					$row['queue']	= 0;
-				}
-			break;
-
-			case 'banned':
-				if( !$this->settings['banned_group'] )
-				{
-					$this->registry->output->html .= $this->html->bannedGroupNotice();
-				}
-				
-				$row = $this->DB->buildAndFetch( array( 'select'		=> 'COUNT(*) as queue',
-																'from'		=> 'members',
-																'where'		=> "member_banned=1 OR member_group_id=" . intval($this->settings['banned_group']),
-														)		);
-			break;
-			case 'spam':
-				$row	= $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as queue',
-														'from'		=> 'members',
-														'where'		=> IPSBWOptions::sql( 'bw_is_spammer', 'members_bitoptions', 'members', 'global', 'has' ) ) );
-
-				// Also get validating users marked as spam users
-				$row2	= $this->DB->buildAndFetch( array( 'select'	=> 'COUNT(*) as queue2',
-														'from'		=> 'validating',
-														'where'		=> "spam_flag=1" ) );
-
-				$row	= array( 'queue' => $row['queue'] + $row2['queue2'] );
-			break;
-			case 'incomplete':
-				/* Show global message */
-				if( !$this->registry->output->global_message )
-				{
-				$this->registry->output->global_message = $this->lang->words['inc_glb_msg'];
-				}
-				
-				/* Query */
-				$this->DB->build( array( 'select'		=> 'COUNT(*) as queue',
-										 'from'		    => array( 'members_partial' => 'p' ),
-										 'where'		=> 'm.member_id ' . $this->DB->buildIsNull(false),
-										 'group'		=> 'm.member_id',
-										 'add_join'     => array( array( 'select' => 'm.member_id',
-										 								 'from'   => array( 'members' => 'm' ),
-										 								 'where'  => 'p.partial_member_id=m.member_id' ) ) ) );
-										 								 
-				$this->DB->execute();
-				
-				$row = $this->DB->fetch();
-
-			break;
-		}
-
-		$cnt = intval($row['queue']);
-
-		//-----------------------------------------
-		// Grab default sorting
-		//-----------------------------------------
-
-		switch( $type )
-		{
-			case 'validating':
-				$col	= 'v.entry_date';
-			break;
-
-			case 'locked':
-				$col	= 'm.members_display_name';
-			break;
-
-			case 'banned':
-				$col	= 'm.members_display_name';
-			break;
-			case 'incomplete':
-			case 'spam':
-				$col	= 'm.joined';
-			break;
-		}
-
-		//-----------------------------------------
-		// And actual sorting..
-		//-----------------------------------------
-		
-		switch ($this->request['sort'])
-		{
-			case 'mem':
-				$col = 'm.members_display_name';
-			break;
-			
-			case 'email':
-				$col = 'm.email';
-			break;
-			
-			case 'sent':
-				if( $type == 'validating' )
-				{
-					$col = 'v.entry_date';
-				}
-			break;
-			
-			case 'failed':
-				if( $type == 'locked' )
-				{
-					$col = 'm.failed_login_count';
-				}
-			break;
-			
-			case 'group':
-				if( $type == 'banned' OR $type == 'incomplete' )
-				{
-					$col = 'g.g_title';
-				}
-			break;
-			
-			case 'posts':
-				$col = 'm.posts';
-			break;
-			
-			case 'joined':
-				$col = 'm.joined';
-			break;
-		}					     
-		
-		//-----------------------------------------
-		// Pages...
-		//-----------------------------------------
-		
-		$links = $this->registry->output->generatePagination( array(	'totalItems'		=> $cnt,
-																		'itemsPerPage'		=> 75,
-																		'currentStartValue'	=> $st,
-																		'baseUrl'			=> $this->settings['base_url'] . "&amp;{$this->form_code}&amp;do={$type}&amp;ord={$ord}&amp;filter={$filter}",
-														)		);
-		$type_names = array( 'validating' => 'Ожидающих подтверждени�',
-							 'locked'     => 'Заблокированных',
-							 'banned'     => 'Забанненых',
-							 'spam'       => 'Помеченных как �памеры',
-							 'incomplete' => '�е завершивших реги�трацию');
-
-		$type_name = ( $type_names[ $type ] ) ?  $type_names[ $type ] : $type;
-
-		//-----------------------------------------
-		// Print...
-		//-----------------------------------------
-		
-		if ( $cnt > 0 )
-		{
-			switch( $type )
-			{
-				case 'validating':
-					$this->DB->build( array( 'select' 	=> 'v.*', 
-													 'from' 	=> array( 'validating' => 'v' ), 
-													 'where' 	=> "v.lost_pass=0 AND m.member_group_id=" . $this->settings['auth_group'].$q_extra,
-													 'order'	=> $col . ' ' . $ord,
-													 'limit'	=> array( $st, 75 ),
-													 'add_join'	=> array(
-													 					array(
-													 							'select' 	=> 'm.name, m.member_group_id, m.members_display_name, m.ip_address, m.member_id, m.email, m.posts, m.joined',
-													 							'from'		=> array( 'members' => 'm' ),
-													 							'where'		=> 'm.member_id=v.member_id',
-													 							'type'		=> 'left',
-													 						),
-													 					),
-											) 		);
-				break;
-
-				case 'locked':
-					$this->DB->build( array( 'select' 	=> 'm.member_group_id, m.members_display_name, m.ip_address, m.member_id, m.email, m.posts, m.joined, m.failed_logins, m.failed_login_count',
-													 'from' 	=> 'members m',
-													 'where' 	=> "m.failed_login_count >= " . intval($this->settings['ipb_bruteforce_attempts']),
-													 'order'	=> $col . ' ' . $ord,
-													 'limit'	=> array( $st, 75 ),
-											) 		);
-				break;
-
-				case 'banned':
-					$this->DB->build( array( 'select' 	=> 'm.member_group_id, m.members_display_name, m.ip_address, m.member_id, m.email, m.posts, m.joined, m.failed_logins, m.failed_login_count',
-													 'from' 	=> array( 'members' => 'm' ),
-													 'where' 	=> "m.member_banned=1 OR m.member_group_id=" . intval($this->settings['banned_group']),
-													 'order'	=> $col . ' ' . $ord,
-													 'limit'	=> array( $st, 75 ),
-													 'add_join'	=> array(
-													 					array(
-													 							'select' 	=> 'g.g_title',
-													 							'from'		=> array( 'groups' => 'g' ),
-													 							'where'		=> 'g.g_id=m.member_group_id',
-													 							'type'		=> 'left',
-													 						),
-													 					),
-											) 		);
-				break;
-				case 'spam':
-					$this->DB->build( array( 'select' 	=> 'm.*',
-											 'from' 	=> array( 'members' => 'm' ),
-											 'where' 	=> IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' ) . ' OR v.spam_flag=1',
-											 'order'	=> $col . ' ' . $ord,
-											 'limit'	=> array( $st, 75 ),
-											 'add_join'	=> array(
-											 					array(  'select' 	=> 'g.g_title',
-											 							'from'		=> array( 'groups' => 'g' ),
-											 							'where'		=> 'g.g_id=m.member_group_id',
-											 							'type'		=> 'left' ),
-											 					array(  'select' 	=> '',
-											 							'from'		=> array( 'validating' => 'v' ),
-											 							'where'		=> 'v.member_id=m.member_id',
-											 							'type'		=> 'left' ) ) )  );
-				break;
-				case 'incomplete':
-					$this->DB->build( array( 'select'		=> 'p.*',
-											 'from'		    => array( 'members_partial' => 'p' ),
-										 	 'where'		=> 'm.member_id ' . $this->DB->buildIsNull(false),
-										 	 'order'		=> $col . ' ' . $ord,
-										 	 'add_join'     => array( array( 'select' => 'm.*',
-										 								     'from'   => array( 'members' => 'm' ),
-										 								     'where'  => 'p.partial_member_id=m.member_id' ),
-										 							 array( 'select'  => 'pp.*',
-										 								     'from'   => array( 'profile_portal' => 'pp' ),
-										 								     'where'  => 'pp.pp_member_id=p.partial_member_id' ) ) ) );
-			}
-
-
-			$outer	= $this->DB->execute();
-
-			while ( $r = $this->DB->fetch($outer) )
-			{
-				$r['_joined'] 				= ipsRegistry::getClass( 'class_localization')->getDate( $r['joined']	, 'TINY' );
-				$r['members_display_name']	= $r['members_display_name'] ? $r['members_display_name'] : $this->lang->words['t_deletedmem'];
-				$r['group_title'] 			= IPSLib::makeNameFormatted( $this->caches['group_cache'][ $r['member_group_id'] ]['g_title'], $r['member_group_id'] );
-
-				switch( $type )
-				{
-					case 'incomplete':
-						/* Try and determine what app they came in from */
-						if ( $r['fb_uid'] )
-						{
-							$r['_regVia'] = 'facebook';
-						}
-						else if ( $r['twitter_id'] )
-						{
-							$r['_regVia'] = 'twitter';
-						}
-						else if ( $r['vk_uid'] )
-						{
-							$r['_regVia'] = 'vkontakte';
-						}
-						
-						/* Do they have a real email address? */
-						$r['_emailIsOk'] = ( $r['email'] == $r['name'] . '@' . $r['joined'] ) ? false : true;
-						$r['_dnameIsOk'] = ( $r['members_l_display_name'] )                   ? true : false;
-						
-						$r['member_id']  = ( $r['partial_member_id'] ) ? $r['partial_member_id'] : $r['member_id'];
-						
-						/* Build display photo */
-						$r = IPSMember::buildProfilePhoto( $r );
-						
-					case 'validating':
-						$r['_coppa'] = $r['coppa_user'] ? $this->lang->words['t_coppa'] : '';
-
-						//-----------------------------------------
-						// Sort out 'where'
-						//-----------------------------------------
-
-						$r['_where'] = ( $r['lost_pass'] ? $this->lang->words['t_lostpass'] : ( $r['new_reg'] ? $this->lang->words['t_userval'] : ( $r['email_chg'] ? $this->lang->words['t_emailchange'] : $this->lang->words['t_na'] ) ) );
-
-						if( isset($r['email_chg']) AND $r['email_chg'] )
-						{
-							$r['_where'] .= " (<a href='" . $this->settings['base_url'] . "{$this->form_code}&amp;do=unappemail&amp;mid={$r['member_id']}'>{$this->lang->words['t_unapprove']}</a>)";
-						}
-
-						if ( $r['new_reg'] AND ( $r['user_verified'] == 1 OR $this->settings['reg_auth_type'] == 'admin' ) )
-						{
-							$r['_where'] = $this->lang->words['t_adminval'];
-						}
-
-						//-----------------------------------------
-						// How long ago did this start?
-						//-----------------------------------------
-
-						$r['_hours']  = floor( ( time() - $r['entry_date'] ) / 3600 );
-						$r['_days']   = intval( $r['_hours'] / 24 );
-						$r['_rhours'] = intval( $r['_hours'] - ($r['_days'] * 24) );
-
-						//-----------------------------------------
-						// Format time
-						//-----------------------------------------
-
-						$r['_entry']  = ipsRegistry::getClass( 'class_localization')->getDate( $r['entry_date'], 'TINY' );
-					break;
-
-					case 'locked':
-						//-----------------------------------------
-						// Sort out lovely locked info
-						//-----------------------------------------
-
-						$used_ips 		= array();
-						$this_attempt 	= array();
-						$oldest			= 0;
-						$newest			= 0;
-
-						if( $r['failed_logins'] )
-						{
-							$failed_logins = explode( ",", IPSText::cleanPermString( $r['failed_logins'] ) );
-
-							if( is_array($failed_logins) AND count($failed_logins) )
-							{
-								sort($failed_logins);
-
-								foreach( $failed_logins as $attempt )
-								{
-									$this_attempt = explode( "-", $attempt );
-									$used_ips[] = $this_attempt[1];
-								}
-
-								$oldest = array_shift($failed_logins);
-								$newest = array_pop($failed_logins);
-							}
-						}
-
-						$newest = explode( "-", $newest );
-						$oldest = explode( "-", $oldest );
-
-						$r['oldest_fail'] = ipsRegistry::getClass( 'class_localization')->getDate( $oldest[0], 'SHORT' );
-						$r['newest_fail'] = ipsRegistry::getClass( 'class_localization')->getDate( $newest[0], 'SHORT' );
-
-						//-----------------------------------------
-						// Some nice IP address info
-						//-----------------------------------------
-
-						$r['ip_addresses'] = "";
-
-						$used_ips = array_unique($used_ips);
-
-						foreach( $used_ips as $ip_address )
-						{
-							$r['ip_addresses'] .= "{$this->lang->words['t_ipcolon']} <a href='" . $this->settings['base_url'] . "&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$ip_address}'>{$ip_address}</a><br />";
-						}
-					break;
-				}
-
-				//-----------------------------------------
-				// Print row
-				//-----------------------------------------
-
-				$function	= $type . 'Row';
-				$content	.= $this->html->$function( $r );
-			}
-		}
-		else
-		{
-			$content = $this->html->queueNoRows( sprintf( $this->lang->words['t_notype'], $type_name) );
-		}
-		
-		//-----------------------------------------
-		// Output
-		//-----------------------------------------
-		
-		$this->registry->output->html .= $this->html->queueWrapper( $type, $type_name, $content, $st, $new_ord, $links );
-		
-		//-----------------------------------------
-		// Extra navigation
-		//-----------------------------------------
-		
-		switch( $type )
-		{
-			case 'validating':
-				$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['t_validating'] );
-			break;
-			
-			case 'locked':
-				$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['t_locked'] );
-			break;
-			
-			case 'banned':
-				$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['t_banned'] );
-			break;
-			
-			case 'spam':
-				$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['t_spammers'] );
-			break;
-			
-			case 'incomplete':
-				$this->registry->output->extra_nav[] 		= array( '', $this->lang->words['t_incomplete'] );
-			break;
-		}
-	}
-	
 	/**
 	 * Learn about an IP address
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _learnIP()
+	protected function _learnIP()
 	{
 		if ( $this->request['ip'] == "" )
 		{
@@ -1224,6 +705,16 @@ class admin_members_members_tools extends ipsCommand
 			$exact		= 0;
 			$ip			= str_replace( "*", "", $ip );
 		}
+		
+		//-----------------------------------------
+		// Warning...ipv6 doesn't tend to resolve properly on
+		// some Windows machines - this seems to be an OS limitation
+		//-----------------------------------------
+		
+		if( preg_match( '/^(((?=(?>.*?::)(?!.*::)))(::)?([0-9A-F]{1,4}::?){0,5}|([0-9A-F]{1,4}:){6})(\2([0-9A-F]{1,4}(::?|$)){0,2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])(\.|$)){4}|[0-9A-F]{1,4}:[0-9A-F]{1,4})(?<![^:]:|\.)\z/i', $ip ) )
+		{
+			$exact		= 1;
+		}
 
 		if ( $exact == 1 )
 		{
@@ -1273,7 +764,7 @@ class admin_members_members_tools extends ipsCommand
 			{
 				$m['members_display_name']	= $m['members_display_name'] ? $m['members_display_name'] : $this->lang->words['t_guest'];
 				$m['email'] 				= $m['email'] ? $m['email'] : $this->lang->words['t_notavail'];
-				$m['_post_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['post_date'], 'SHORT' );
+				$m['_post_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['date'], 'SHORT' );
 
 				$posted[]	= $m;
 			}
@@ -1291,32 +782,14 @@ class admin_members_members_tools extends ipsCommand
 			{
 				$m['members_display_name']	= $m['members_display_name'] ? $m['members_display_name'] : $this->lang->words['t_guest'];
 				$m['email'] 				= $m['email'] ? $m['email'] : $this->lang->words['t_notavail'];
-				$m['_vote_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['vote_date'], 'SHORT' );
+				$m['_vote_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['date'], 'SHORT' );
 
 				$voted[]	= $m;
 			}
 
 			unset($results['voters']);
 		}
-
-		//-----------------------------------------
-		// Find Names EMAILING under
-		//-----------------------------------------
-
-		if( count($results['email_logs']) )
-		{
-			foreach( $results['email_logs'] as $m )
-			{
-				$m['members_display_name']	= $m['members_display_name'] ? $m['members_display_name'] : $this->lang->words['t_guest'];
-				$m['email'] 				= $m['email'] ? $m['email'] : $this->lang->words['t_notavail'];
-				$m['_email_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['email_date'], 'SHORT' );
-
-				$emailed[]	= $m;
-			}
-
-			unset($results['email_logs']);
-		}
-
+		
 		//-----------------------------------------
 		// Find Names VALIDATING under
 		//-----------------------------------------
@@ -1327,7 +800,7 @@ class admin_members_members_tools extends ipsCommand
 			{
 				$m['members_display_name']	= $m['members_display_name'] ? $m['members_display_name'] : $this->lang->words['t_guest'];
 				$m['email'] 				= $m['email'] ? $m['email'] : $this->lang->words['t_notavail'];
-				$m['_entry_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['entry_date'], 'SHORT' );
+				$m['_entry_date']			= ipsRegistry::getClass( 'class_localization')->getDate( $m['date'], 'SHORT' );
 
 				$validating[]	= $m;
 			}
@@ -1345,11 +818,11 @@ class admin_members_members_tools extends ipsCommand
 	/**
 	 * Show all IP addresses a user has used
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _showIPs()
+	protected function _showIPs()
 	{
-		if ( $this->request['name'] == "" and $this->request['member_id'] == "" )
+		if ( !$this->request['name'] and !$this->request['member_id'] )
 		{
 			$this->_toolsIndex( $this->lang->words['t_noname'] );
 			return false;
@@ -1357,25 +830,21 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['member_id'] )
 		{
-			$id = intval($this->request['member_id']);
-
-			$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, members_display_name, email, ip_address', 'from' => 'members', 'where' => "member_id={$id}" ) );
+			$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, members_display_name, email, ip_address', 'from' => 'members', 'where' => "member_id=" . intval($this->request['member_id']) ) );
 
 			if ( ! $member['member_id'] )
 			{
-				$this->_toolsIndex( sprintf( $this->lang->words['t_nonameloc'], $id ) );
+				$this->_toolsIndex( sprintf( $this->lang->words['t_nonameloc'], intval($this->request['member_id']) ) );
 				return;
 			}
 		}
 		else
 		{
-			$name = mb_strtolower($this->request['name']);
-			
-			$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, members_display_name, email, ip_address', 'from' => 'members', 'where' => "members_l_username='" . $this->DB->addSlashes( $name ) . "' OR members_l_display_name='" . $this->DB->addSlashes( $name ) . "'" ) );
-			
+			$member = $this->DB->buildAndFetch( array( 'select' => 'member_id, members_display_name, email, ip_address', 'from' => 'members', 'where' => "members_l_username='" . $this->DB->addSlashes( mb_strtolower($this->request['name']) ) . "' OR members_l_display_name='" . $this->DB->addSlashes( mb_strtolower($this->request['name']) ) . "'" ) );
+
 			if ( ! $member['member_id'] )
 			{
-				$this->_toolsIndex( $this->lang->words['t_noexact'], $name );
+				$this->_toolsIndex( $this->lang->words['t_noexact'], mb_strtolower($this->request['name']) );
 				return;
 			}
 		}
@@ -1384,6 +853,7 @@ class admin_members_members_tools extends ipsCommand
 		$ips	= array();
 		$reg	= array();
 		$allips	= IPSMember::findIPAddresses( $member['member_id'] );
+		$newips	= array();
 
 		$st		= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
 		$end	= 50;
@@ -1391,9 +861,28 @@ class admin_members_members_tools extends ipsCommand
 		$links = $this->registry->output->generatePagination( array( 'totalItems'		=> count($allips),
 														  			'itemsPerPage'		=> $end,
 														  			'currentStartValue'	=> $st,
-														  			'baseUrl'			=> $this->settings['base_url'] . "&amp;" . $this->form_code . "&amp;do=show_all_ips&amp;member_id={$member['member_id']}",
+														  			'baseUrl'			=> $this->settings['base_url'] . $this->form_code . "&amp;do=show_all_ips&amp;member_id={$member['member_id']}",
 												 			)      );
 
+		//-----------------------------------------
+		// Pseudo-pagination and ordering
+		//-----------------------------------------
+		
+		foreach( $allips as $ip => $ipdata )
+		{
+			$newips[ $ipdata[1] ]	= array( $ip, $ipdata );
+		}
+		
+		krsort($newips);
+
+		$newips	= array_slice( $newips, $st, $end );
+		$allips	= array();
+		
+		foreach( $newips as $ipdate => $ip_to_data )
+		{
+			$allips[ $ip_to_data[0] ]	= $ip_to_data[1];
+		}
+
 		if ( count($allips) > 0 )
 		{
 			foreach( $allips as $ip_address => $count )
@@ -1418,9 +907,9 @@ class admin_members_members_tools extends ipsCommand
 	 *
 	 * @param 	string		Message to display
 	 * @param	string		Membername to default in the dropdown
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _toolsIndex( $msg="", $membername="" )
+	protected function _toolsIndex( $msg="", $membername="" )
 	{
 		if ( !$membername )
 		{
@@ -1465,37 +954,16 @@ class admin_members_members_tools extends ipsCommand
 	/**
 	 * Manage incomplete members
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _doIncomplete()
+	protected function _doIncomplete()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ids = array();
-
-		//-----------------------------------------
-		// GET checkboxes
-		//-----------------------------------------
-
-		foreach ( $this->request as $k => $v )
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ( $v )
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-
-		$ids = IPSLib::cleanIntArray( $ids );
-
 		//-----------------------------------------
 		// Check
 		//-----------------------------------------
 
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
 		if ( count($ids) < 1 )
 		{
 			$this->registry->output->showError( $this->lang->words['t_nomemsel'], 11247 );
@@ -1507,77 +975,49 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['type'] == 'delete' )
 		{
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_delete', 'members', 'members' );
+			
 			try
 			{
-				IPSMember::remove( $ids );
+				$message	= $this->_getManagementClass()->deleteMembers( $ids, 't_inc_removed' );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['t_inc_removed'], count($ids) ) );
-
-			$this->registry->output->global_message = sprintf( $this->lang->words['t_inc_removed'], count($ids) );
-			$this->_viewQueue( 'incomplete' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 		else if( $this->request['type'] == 'finalize' )
 		{
-			$members	= IPSMember::load( $ids, 'core' );
-			$_total		= 0;
-			
-			foreach( $members as $member )
+			try
 			{
-				if( $member['name'] AND $member['members_display_name'] AND $member['email'] )
-				{
-					$this->DB->delete( 'members_partial', 'partial_member_id=' . $member['member_id'] );
-					$_total++;
-				}
+				$message	= $this->_getManagementClass()->finalizeMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
-			
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['t_inc_finalized'], $_total ) );
 
-			$this->registry->output->global_message = sprintf( $this->lang->words['t_inc_finalized'], $_total );
-			$this->_viewQueue( 'incomplete' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 	}
 	
 	/**
 	 * Manage validating members
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _manageValidating()
+	protected function _manageValidating()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ids = array();
-
-		//-----------------------------------------
-		// GET checkboxes
-		//-----------------------------------------
-
-		foreach ( $this->request as $k => $v )
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ( $v )
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-
-		$ids = IPSLib::cleanIntArray( $ids );
-
 		//-----------------------------------------
 		// Check
 		//-----------------------------------------
 
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
 		if ( count($ids) < 1 )
 		{
 			$this->registry->output->showError( $this->lang->words['t_nomemsel'], 11247 );
@@ -1589,101 +1029,23 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['type'] == 'approve' )
 		{
-			IPSText::getTextClass('email')->getTemplate( "complete_reg" );
-
-			$approved = array();
-
-			//-----------------------------------------
-			// Get members
-			//-----------------------------------------
-
-			$this->DB->build( array( 'select'	=> 'v.*',
-											'from'	=> array( 'validating' => 'v' ),
-											'where'	=> "m.member_id IN(" . implode( ",", $ids ) . ")",
-											'add_join'	=> array(
-																array( 'select'	=> 'm.member_id, m.members_display_name, m.name, m.email, m.member_group_id',
-																		'from'	=> array( 'members' => 'm' ),
-																		'where'	=> 'm.member_id=v.member_id',
-																		'type'	=> 'left'
-																	)
-																)
-								)		);
-			$main = $this->DB->execute();
-
-			while( $row = $this->DB->fetch( $main ) )
+			try
 			{
-				$approved[] = $row['name'];
-
-				//-----------------------------------------
-				// Only approve if the user is validating
-				//-----------------------------------------
-
-				if ( $row['member_group_id'] != $this->settings['auth_group'] )
-				{
-					continue;
-				}
-
-				//-----------------------------------------
-				// Don't approve if no real_group set
-				//-----------------------------------------
-
-				if ( !$row['real_group'] )
-				{
-					//$row['real_group'] = $this->settings['member_group'];
-					continue;
-				}
-
-				//-----------------------------------------
-				// We don't approve lost pass requests
-				//-----------------------------------------
-
-				if( $row['lost_pass'] == 1 )
-				{
-					continue;
-				}
-
-				try
-				{
-					IPSMember::save( $row['member_id'], array( 'core' => array( 'member_group_id' => $row['real_group'] ) ) );
-				}
-				catch( Exception $error )
-				{
-					$this->registry->output->showError( $error->getMessage(), 11247 );
-				}
-
-				IPSText::getTextClass('email')->buildMessage( array() );
-
-				//-----------------------------------------
-				// Using 'name' on purpose
-				// @see http://forums.invisionpower.com/index.php?autocom=tracker&showissue=11564&view=findpost&p=45269
-				//-----------------------------------------
-
-				IPSText::getTextClass('email')->subject	= sprintf( $this->lang->words['subject__complete_reg'], $row['name'], $this->settings['board_name'] );
-				IPSText::getTextClass('email')->to		= $row['email'];
-				IPSText::getTextClass('email')->sendMail();
-
-				IPSLib::runMemberSync( 'onGroupChange', $row['member_id'], $row['real_group'], $row['member_group_id'] );
+				$message	= $this->_getManagementClass()->approveMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
-
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memregapp2'] . implode( ", ", $approved ) );
-
-			//-----------------------------------------
-			// Stats to Update?
-			//-----------------------------------------
-
-			$this->cache->rebuildCache( 'stats', 'global' );
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memregapp'];
+			$this->registry->output->global_message	= $message;
 
 			if( $this->request['_return'] )
 			{
 				$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members&module=members&section=members&do=viewmember&member_id=' . $this->request['_return'] );
 			}
 
-			$this->_viewQueue( 'validating' );
-			return;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -1692,113 +1054,18 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'resend' )
 		{
-			$reset		= array();
-			$cant		= array();
-			$main_msgs	= array();
-
-			//-----------------------------------------
-			// Get members
-			//-----------------------------------------
-
-			$this->DB->build( array( 'select'	=> 'v.*',
-											'from'	=> array( 'validating' => 'v' ),
-											'where'	=> "m.member_id IN(" . implode( ",", $ids ) . ")",
-											'add_join'	=> array(
-																array( 'select'	=> 'm.member_id, m.members_display_name, m.email, m.member_group_id',
-																		'from'	=> array( 'members' => 'm' ),
-																		'where'	=> 'm.member_id=v.member_id',
-																		'type'	=> 'left'
-																	)
-																)
-								)		);
-			$main = $this->DB->execute();
-
-			while( $row = $this->DB->fetch( $main ) )
+			try
 			{
-				if ( $row['member_group_id'] != $this->settings['auth_group'] )
-				{
-					continue;
-				}
-
-				if ( $row['lost_pass'] )
-				{
-					IPSText::getTextClass('email')->getTemplate("lost_pass");
-
-					IPSText::getTextClass('email')->buildMessage( array(
-														'NAME'         => $row['members_display_name'],
-														'THE_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=lostpass&do=sendform&uid=".$row['member_id']."&aid=".$row['vid'],
-														'MAN_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=lostpass",
-														'EMAIL'        => $row['email'],
-														'ID'           => $row['member_id'],
-														'CODE'         => $row['vid'],
-														'IP_ADDRESS'   => $row['ip_address'],
-													  )
-												);
-
-					IPSText::getTextClass('email')->subject	= $this->lang->words['t_passwordrec'] . $this->settings['board_name'];
-					IPSText::getTextClass('email')->to		= $row['email'];
-					IPSText::getTextClass('email')->sendMail();
-				}
-				else if ( $row['new_reg'] )
-				{
-					if( $row['user_verified'] )
-					{
-						$cant[] = $row['members_display_name'];
-						continue;
-					}
-
-					IPSText::getTextClass('email')->getTemplate( "reg_validate" );
-
-					IPSText::getTextClass('email')->buildMessage( array(
-														'THE_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=register&do=auto_validate&uid=".$row['member_id']."&aid=".$row['vid'],
-														'NAME'         => $row['members_display_name'],
-														'MAN_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=register&do=05",
-														'EMAIL'        => $row['email'],
-														'ID'           => $row['member_id'],
-														'CODE'         => $row['vid'],
-													  )
-												);
-
-					IPSText::getTextClass('email')->subject	= $this->lang->words['t_regat'] . $this->settings['board_name'];
-					IPSText::getTextClass('email')->to		= $row['email'];
-					IPSText::getTextClass('email')->sendMail();
-				}
-				else if ( $row['email_chg'] )
-				{
-					IPSText::getTextClass('email')->getTemplate("newemail");
-
-					IPSText::getTextClass('email')->buildMessage( array(
-														'NAME'         => $row['members_display_name'],
-														'THE_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=register&do=auto_validate&type=newemail&uid=".$row['member_id']."&aid=".$row['vid'],
-														'ID'           => $row['member_id'],
-														'MAN_LINK'     => $this->settings['board_url']."/index.php?app=core&module=global&section=register&do=user_validate",
-														'CODE'         => $row['vid'],
-													  )
-												);
-
-					IPSText::getTextClass('email')->subject	= $this->lang->words['t_emailchange'] . $this->settings['board_name'];
-					IPSText::getTextClass('email')->to		= $row['email'];
-					IPSText::getTextClass('email')->sendMail();
-				}
-
-				$resent[] = $row['members_display_name'];
+				$message	= $this->_getManagementClass()->approveMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			if( count($resent) )
-			{
-				ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($resent) . $this->lang->words['tools_val_resent_log'] . implode( ", ", $resent ) );
-				$main_msgs[] = count($resent) . $this->lang->words['t_vallog'] . implode( ", ", $resent );
-			}
+			$this->registry->output->global_message	= $message;
 
-			if( count($cant) )
-			{
-				$main_msgs[] = $this->lang->words['t_valcannot'] . implode( ", ", $cant );
-			}
-
-			$this->registry->output->global_message = count($main_msgs) ? implode( "<br />", $main_msgs ) : '';
-
-			$this->_viewQueue( 'validating' );
-			return;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -1807,15 +1074,19 @@ class admin_members_members_tools extends ipsCommand
 
 		else if( $this->request['type'] == 'ban' )
 		{
-			$this->DB->update( 'members', array( 'member_banned' => 1 ), "member_id IN(" . implode( ",", $ids ) . ")" );
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_ban' );
+			
+			try
+			{
+				$message	= $this->_getManagementClass()->banMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
+			}
 
-			$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
-
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_membanned'] );
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_membanned'];
-
-			$this->_viewQueue( 'validating' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -1824,143 +1095,17 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'spam' )
 		{
-			/* Grab members */
-			$members = IPSMember::load( $ids );
-
-			/* Load moderator's library */
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
-			$modLibrary	=  new $classToLoad( $this->registry );
-
-			/* Load custom fields class */
-			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classCustomFields.php', 'classCustomFields' );
-			$fields      = new $classToLoad();
-
-			/* Load language file */
-			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_mod' ), 'forums' );
-
-			foreach( $members as $member_id => $member )
+			try
 			{
-				$toSave = array( 'core' => array( 'bw_is_spammer' => 1, 'member_group_id' => $this->settings['member_group'] ) );
-
-				/* Protected group? */
-				if ( strstr( ','.$this->settings['warn_protected'].',', ','.$member['member_group_id'].',' ) )
-				{
-					continue;
-				}
-
-				/* What do to.. */
-				if ( $this->settings['spm_option'] )
-				{
-					switch( $this->settings['spm_option'] )
-					{
-						case 'disable':
-							$toSave['core']['restrict_post']      = 1;
-							$toSave['core']['members_disable_pm'] = 2;
-						break;
-						case 'unapprove':
-							$toSave['core']['restrict_post']      = 1;
-							$toSave['core']['members_disable_pm'] = 2;
-							/* Unapprove posts and topics */
-							$modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
-						break;
-						case 'ban':
-							/* Unapprove posts and topics */
-							$modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
-
-							$toSave	= array(
-											'core'				=> array(
-																		'member_banned'		=> 1,
-																		'title'				=> '',
-																		'bw_is_spammer'		=> 1,
-																		),
-											'extendedProfile'	=> array(
-																		'signature'			=> '',
-																		'pp_about_me'		=> '',
-																		)
-											);
-
-							//-----------------------------------------
-							// Avatar
-							//-----------------------------------------
-
-							$toSave['extendedProfile']['avatar_location']	= "";
-							$toSave['extendedProfile']['avatar_size']		= "";
-
-							try
-							{
-								IPSMember::getFunction()->removeAvatar( $member['member_id'] );
-							}
-							catch( Exception $e )
-							{
-								// Maybe should show an error or something
-							}
-
-							//-----------------------------------------
-							// Photo
-							//-----------------------------------------
-
-							IPSMember::getFunction()->removeUploadedPhotos( $member['member_id'] );
-
-							$toSave['extendedProfile'] = array_merge( $toSave['extendedProfile'], array(
-															'pp_main_photo'		=> '',
-															'pp_main_width'		=> 0,
-															'pp_main_height'	=> 0,
-															'pp_thumb_photo'	=> '',
-															'pp_thumb_width'	=> 0,
-															'pp_thumb_height'	=> 0
-															)	);
-
-							//-----------------------------------------
-							// Profile fields
-							//-----------------------------------------
-
-							$fields->member_data = $member;
-							$fields->initData( 'edit' );
-							$fields->parseToSave( array() );
-
-							if ( count( $fields->out_fields ) )
-							{
-								$toSave['customFields']	= $fields->out_fields;
-							}
-
-							//-----------------------------------------
-							// Update signature content cache
-							//-----------------------------------------
-
-							IPSContentCache::update( $member['member_id'], 'sig', '' );
-						break;
-					}
-				}
-
-				/* Send an email */
-				if ( $this->settings['spm_notify'] AND ( $this->settings['email_out'] != $this->memberData['email'] ) )
-				{
-					IPSText::getTextClass('email')->getTemplate( 'possibleSpammer' );
-
-					IPSText::getTextClass('email')->buildMessage( array( 'DATE'         => $this->registry->class_localization->getDate( $member['joined'], 'LONG', 1 ),
-																		 'MEMBER_NAME'  => $member['members_display_name'],
-																		 'IP'			=> $member['ip_address'],
-																		 'EMAIL'		=> $member['email'],
-																		 'LINK'         => $this->registry->getClass('output')->buildSEOUrl("showuser=" . $member['member_id'], 'public', $member['members_seo_name'], 'showuser') ) );
-
-					IPSText::getTextClass('email')->subject = $this->lang->words['new_registration_email_spammer'] . ' ' . $this->settings['board_name'];
-					IPSText::getTextClass('email')->to      = $this->settings['email_out'];
-					IPSText::getTextClass('email')->sendMail();
-				}
-
-				/* Flag them as a spammer */
-				IPSMember::save( $member['member_id'], $toSave );
-
-				/* Send Spammer to Spam Service */
-
+				$message	= $this->_getManagementClass()->markMembersAsSpam( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			/* Remove validating rows */
-			$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
-
-			$this->registry->output->global_message = count($ids) . ' ' . $this->lang->words['t_setasspammers'];
-			$this->_viewQueue( 'validating' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -1969,67 +1114,35 @@ class admin_members_members_tools extends ipsCommand
 
 		else
 		{
-			$denied	= array();
-
-			$this->DB->build( array( 'select' => 'members_display_name', 'from' => 'members', 'where' => "member_id IN(" . implode( ",", $ids ) . ")" ) );
-			$this->DB->execute();
-
-			while( $r = $this->DB->fetch() )
-			{
-				$denied[] = $r['members_display_name'];
-			}
-
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_delete' );
+			
 			try
 			{
-				IPSMember::remove( $ids );
+				$message	= $this->_getManagementClass()->denyMembers( $ids );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_regdenied'] . implode( ", ", $denied ) );
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_removedmem'];
-			$this->_viewQueue( 'validating' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 	}
 
 	/**
 	 * Manage spam requests
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _unSpam()
+	protected function _unSpam()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ids = array();
-
-		//-----------------------------------------
-		// GET checkboxes
-		//-----------------------------------------
-
-		foreach ( $this->request as $k => $v )
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ( $v )
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-
-		$ids = IPSLib::cleanIntArray( $ids );
-
 		//-----------------------------------------
 		// Check
 		//-----------------------------------------
 
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
 		if ( count($ids) < 1 )
 		{
 			$this->registry->output->showError( $this->lang->words['t_nomemunspammed'], 11248 );
@@ -2041,43 +1154,17 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['type'] == 'unspam' OR $this->request['type'] == 'unspam_posts' )
 		{
-			/* Load Member Data */
-			$members = IPSMember::load( $ids );
-
 			try
 			{
-				foreach( $ids as $i )
-				{
-					IPSMember::save( $i, array( 'core' => array( 'bw_is_spammer' => 0, 'restrict_post' => 0, 'members_disable_pm' => 0 ) ) );
-					
-					$this->DB->update( 'validating', array( 'spam_flag' => 0 ), 'member_id=' . $i );
-				}
+				$message	= $this->_getManagementClass()->unmarkMembersAsSpam( $ids, $this->request['type'] == 'unspam_posts' ? true : false );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			if ( $this->request['type'] == 'unspam_posts' )
-			{
-				/* Toggle their content */
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
-				$modLibrary	=  new $classToLoad( $this->registry );
-
-				foreach( $ids as $id )
-				{
-					$modLibrary->toggleApproveMemberContent( $id, TRUE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
-					
-					/* Run member sync */
-					IPSLib::runMemberSync( 'onUnSetAsSpammer', array( 'member_id' => $id ) );
-				}
-			}
-
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memunspammed']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memunspammed'];
-			$this->_viewQueue( 'spam' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -2086,129 +1173,44 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'ban' OR $this->request['type'] == 'ban_blacklist' )
 		{
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_ban', 'members', 'members' );
+			
 			try
 			{
-				foreach( $ids as $i )
-				{
-					IPSMember::save( $i, array( 'core' => array( 'bw_is_spammer' => 0, 'member_banned' => 1 ) ) );
-				}
+				$message	= $this->_getManagementClass()->banSpammers( $ids, $this->request['type'] == 'ban_blacklist' ? true : false );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			if ( $this->request['type'] == 'ban_blacklist' )
-			{
-				/* Load Members */
-				$members = IPSMember::load( $ids );
-				$ips     = array();
-				$email	 = array();
-				$ban     = array( 'ip' => array(), 'email' => array() );
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
+		}
+		else if( $this->request['type'] == 'delete' )
+		{
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_delete', 'members', 'members' );
+			
+			$message	= $this->_getManagementClass()->deleteMembers( $ids );
 
-				if ( is_array( $members ) AND count( $members ) )
-				{
-					foreach( $members as $id => $data )
-					{
-						$ips[ $data['ip_address'] ]	= $data['ip_address'];
-						$email[ $data['email'] ]	= $data['email'];
-					}
-
-					if ( count( $ips ) )
-					{
-						/* IPS: Check for duplicate */
-						$this->DB->build( array(  'select' => '*',
-												  'from'   => 'banfilters',
-												  'where'  => "ban_content IN ('" . implode( "','", $ips ) . "') and ban_type='ip'" ) );
-						$this->DB->execute();
-
-						while( $row = $this->DB->fetch() )
-						{
-							$ban['ip'][] = $row['ban_content'];
-						}
-
-						/* Now insert.. */
-						foreach( $ips as $i )
-						{
-							if ( ! in_array( $i, $ban['ip'] ) )
-							{
-								/* Insert the new ban filter */
-								$this->DB->insert( 'banfilters', array( 'ban_type' => 'ip', 'ban_content' => $i, 'ban_date' => time(), 'ban_nocache' => 1 ) );
-								
-								/* Prevent it adding a second time */
-								$ban['ip'][]	= $i;
-							}
-						}
-					}
-
-					if ( count( $email ) )
-					{
-						/* IPS: Check for duplicate */
-						$this->DB->build( array(  'select' => '*',
-												  'from'   => 'banfilters',
-												  'where'  => "ban_content IN ('" . implode( "','", $email ) . "') and ban_type='email'" ) );
-						$this->DB->execute();
-
-						while( $row = $this->DB->fetch() )
-						{
-							$ban['email'][] = $row['ban_content'];
-						}
-
-						/* Now insert.. */
-						foreach( $email as $e )
-						{
-							if ( ! in_array( $e, $ban['email'] ) )
-							{
-								/* Insert the new ban filter */
-								$this->DB->insert( 'banfilters', array( 'ban_type' => 'email', 'ban_content' => $e, 'ban_date' => time(), 'ban_nocache' => 1 ) );
-							}
-						}
-					}
-				}
-			}
-
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_membanned']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_membanned'];
-			$this->_viewQueue( 'spam' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 	}
 
 	/**
 	 * Manage banned requests
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _unban()
+	protected function _unban()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ids = array();
-
-		//-----------------------------------------
-		// GET checkboxes
-		//-----------------------------------------
-
-		foreach ( $this->request as $k => $v )
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ( $v )
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-
-		$ids = IPSLib::cleanIntArray( $ids );
-
 		//-----------------------------------------
 		// Check
 		//-----------------------------------------
 
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
 		if ( count($ids) < 1 )
 		{
 			$this->registry->output->showError( $this->lang->words['t_nomemunban'], 11248 );
@@ -2220,34 +1222,17 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['type'] == 'unban' )
 		{
-			$members	= IPSMember::load( $ids );
-
 			try
 			{
-				foreach( $members as $id => $data )
-				{
-					if( $data['member_group_id'] == $this->settings['banned_group'] )
-					{
-						$group	= $this->settings['member_group'];
-					}
-					else
-					{
-						$group	= $data['member_group_id'];
-					}
-
-					IPSMember::save( $id, array( 'core' => array( 'member_banned' => 0, 'member_group_id' => $group ) ) );
-				}
+				$message	= $this->_getManagementClass()->unbanMembers( $ids );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
-
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memunbanned']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memunbanned'];
-			$this->_viewQueue( 'banned' );
-			return;
+	
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -2256,22 +1241,23 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'delete' )
 		{
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_delete', 'members', 'members' );
+			
 			IPSMember::remove( $ids );
 
 			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memdeleted']);
 
 			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memdeleted'];
-			$this->_viewQueue( 'banned' );
-			return;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 	}
 
 	/**
 	 * Unapprove email change request
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _emailUnapprove()
+	protected function _emailUnapprove()
 	{
 		//-----------------------------------------
 		// GET member
@@ -2282,66 +1268,33 @@ class admin_members_members_tools extends ipsCommand
 			$this->registry->output->showError( $this->lang->words['t_noemailloc'], 11249 );
 		}
 
-		$member = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'validating', 'where' => 'email_chg=1 AND member_id=' . intval($this->request['mid']) ) );
-
-		if( !$member['vid'] )
-		{
-			$this->registry->output->showError( $this->lang->words['t_noemailloc'], 11250 );
-		}
-
-		$this->DB->delete( "validating", "vid='{$member['vid']}'" );
-
 		try
 		{
-			IPSMember::save( $member['member_id'], array( 'core' => array( 'email' => $member['prev_email'], 'member_group_id' => $member['real_group'] ) ) );
+			$message	= $this->_getManagementClass()->unapproveEmailChange( $this->request['mid'] );
 		}
 		catch( Exception $error )
 		{
 			$this->registry->output->showError( $error->getMessage(), 11247 );
 		}
-		IPSLib::runMemberSync( 'onGroupChange', $member['member_id'], $member['real_group'] );
 
-		ipsRegistry::getClass('adminFunctions')->saveAdminLog( sprintf( $this->lang->words['t_emailchangeun'], $member['member_id'] ) );
-
-		$this->registry->output->global_message = sprintf( $this->lang->words['t_emailchangeun'], $member['member_id'], $member['temp_group'] );
-		$this->_viewQueue( 'validating' );
+		$this->registry->output->global_message	= $message;
+		$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members&amp;type=validating' );
 	}
 
 
 	/**
 	 * Unlock selected accounts
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
-	private function _unlock()
+	protected function _unlock()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ids = array();
-
-		//-----------------------------------------
-		// GET checkboxes
-		//-----------------------------------------
-
-		foreach ( $this->request as $k => $v )
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ( $v )
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-
-		$ids = IPSLib::cleanIntArray( $ids );
-
 		//-----------------------------------------
 		// Check
 		//-----------------------------------------
 
+		$ids = IPSLib::fetchInputAsArray( 'mid_' );
+		
 		if ( count($ids) < 1 )
 		{
 			$this->registry->output->showError( $this->lang->words['t_nolockloc'], 11251 );
@@ -2353,23 +1306,17 @@ class admin_members_members_tools extends ipsCommand
 
 		if ( $this->request['type'] == 'unlock' )
 		{
-			foreach( $ids as $_id )
+			try
 			{
-				try
-				{
-					IPSMember::save( $_id, array( 'core' => array( 'failed_logins' => '', 'failed_login_count' => 0 ) ) );
-				}
-				catch( Exception $error )
-				{
-					$this->registry->output->showError( $error->getMessage(), 11247 );
-				}
+				$message	= $this->_getManagementClass()->unlockMembers( $ids );
+			}
+			catch( Exception $error )
+			{
+				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memunlocked']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memunlocked'];
-			$this->_viewQueue( 'locked' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -2378,20 +1325,19 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'ban' )
 		{
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_ban', 'members', 'members' );
+			
 			try
 			{
-				IPSMember::save( $ids, array( 'core' => array( 'failed_logins' => '', 'failed_login_count' => 0, 'member_banned' => 1 ) ) );
+				$message	= $this->_getManagementClass()->banMembers( $ids );
 			}
 			catch( Exception $error )
 			{
 				$this->registry->output->showError( $error->getMessage(), 11247 );
 			}
 
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_membanned']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_membanned'];
-			$this->_viewQueue( 'locked' );
-			return;
+			$this->registry->output->global_message	= $message;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 
 		//-----------------------------------------
@@ -2400,13 +1346,31 @@ class admin_members_members_tools extends ipsCommand
 
 		else if ( $this->request['type'] == 'delete' )
 		{
-			IPSMember::remove( $ids );
+			$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'member_delete', 'members', 'members' );
+			
+			$this->registry->output->global_message	= $this->_getManagementClass()->deleteMembers( $ids );
 
-			ipsRegistry::getClass('adminFunctions')->saveAdminLog( count($ids) . $this->lang->words['t_memdeleted']);
-
-			$this->registry->output->global_message = count($ids) . $this->lang->words['t_memdeleted'];
-			$this->_viewQueue( 'locked' );
-			return;
+			$this->registry->output->silentRedirectWithMessage( $this->settings['base_url'] . 'app=members' );
 		}
 	}
+
+	/**
+	 * Get the member management class
+	 *
+	 * @return	object
+	 */
+	protected function _getManagementClass()
+	{
+		static $_object;
+		
+		if( $_object )
+		{
+			return $_object;
+		}
+
+		$_class		= IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/adminManage.php', 'adminMemberManagement', 'members' );
+		$_object	= new $_class( $this->registry );
+		
+		return $_object;
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/xml/index.html b/upload/admin/applications/members/modules_admin/members/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/members/xml/index.html
+++ b/upload/admin/applications/members/modules_admin/members/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/members/xml/menu.xml b/upload/admin/applications/members/modules_admin/members/xml/menu.xml
index 9af2144f..47e9dc31 100644
--- a/upload/admin/applications/members/modules_admin/members/xml/menu.xml
+++ b/upload/admin/applications/members/modules_admin/members/xml/menu.xml
@@ -6,46 +6,12 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление пользовател�ми</subitemtitle>
+					<subitemlang>manage_members</subitemlang>
 					<subsection>members</subsection>
 					<subitemurl>do=members_overview</subitemurl>
 					<subitemrolekey></subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок неактивированных</subitemtitle>
-					<subsection>tools</subsection>
-					<subitemurl>section=tools&amp;do=validating</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок заблокированных</subitemtitle>
-					<subsection>tools</subsection>
-					<subitemurl>section=tools&amp;do=locked</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок забаненных</subitemtitle>
-					<subsection>tools</subsection>
-					<subitemurl>section=tools&amp;do=banned</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок �памеров</subitemtitle>
-					<subsection>tools</subsection>
-					<subitemurl>section=tools&amp;do=spam</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-				<subitem>
-					<subitemtitle>Спи�ок не завершивших реги�трацию</subitemtitle>
-					<subsection>members</subsection>
-					<subitemurl>section=tools&amp;do=incomplete</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
 			</subitems>
 		</item>
 
@@ -54,9 +20,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление звани�ми пользователей</subitemtitle>
+					<subitemlang>mem_ranks</subitemlang>
 					<subsection>ranks</subsection>
 					<subitemurl>do=ranks_overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>ranks_add</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>			
 			</subitems>
@@ -67,9 +34,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление репутацией пользователей</subitemtitle>
+					<subitemlang>mem_rep</subitemlang>
 					<subsection>reputation</subsection>
 					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>reps_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>
 			</subitems>
@@ -80,35 +48,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление дополнительными пол�ми профил�</subitemtitle>
-					<subsection>customfields</subsection>
-					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>			
-			</subitems>
-		</item>
-		
-		<item>
-			<title>Группы дополнительных полей</title>
-			<subitems>
-				<subitem>
-					<subitemtitle>Управление группами дополнительных полей профил�</subitemtitle>
-					<subsection>customfields</subsection>
-					<subitemurl>do=group_overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>			
-			</subitems>
-		</item>		
-		
-		<item>
-			<title>Определение IP</title>
-			<subitems>
-				<subitem>
-					<subitemtitle>Ин�трументы</subitemtitle>
+					<subitemlang>mem_tools</subitemlang>
 					<subsection>tools</subsection>
 					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>membertools_ip</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>			
 			</subitems>
@@ -119,9 +62,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Добавление пользовател�</subitemtitle>
+					<subitemlang>mem_add</subitemlang>
 					<subsection>members</subsection>
 					<subitemurl>do=add</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>member_add</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
@@ -132,9 +76,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>Управление бан фильтрами</subitemtitle>
+					<subitemlang>banfilters</subitemlang>
 					<subsection>banfilters</subsection>
-					<subitemurl>do=add</subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemurl></subitemurl>
+					<subitemrolekey>ban_manage</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
@@ -145,9 +90,10 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>�а�тройки уведомлений</subitemtitle>
+					<subitemlang>notifications</subitemlang>
 					<subsection>notifications</subsection>
 					<subitemurl></subitemurl>
-					<subitemrolekey></subitemrolekey>
+					<subitemrolekey>configure_notifications</subitemrolekey>
 					<subisredirect>0</subisredirect>
 				</subitem>				
 			</subitems>
diff --git a/upload/admin/applications/members/modules_admin/members/xml/permissions.xml b/upload/admin/applications/members/modules_admin/members/xml/permissions.xml
index 6492994c..be5338b2 100644
--- a/upload/admin/applications/members/modules_admin/members/xml/permissions.xml
+++ b/upload/admin/applications/members/modules_admin/members/xml/permissions.xml
@@ -2,112 +2,127 @@
 <permissions>
 	<group>
 		<grouptitle>Управление пользовател�ми</grouptitle>
+		<grouplang>members_members</grouplang>
 		<items>
 			<item>
 				<key>member_add</key>
-				<string>Может добавл�ть пользователей?</string>
+				<string>Может добавл�ть?</string>
 			</item>
 			<item>
 				<key>member_add_admin</key>
-				<string>Может добавл�ть �ДМИ�ОВ?</string>
+				<string>Может добавл�ть админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_edit</key>
-				<string>Может редактировать пользователей?</string>
+				<string>Может измен�ть?</string>
 			</item>
 			<item>
 				<key>member_edit_admin</key>
-				<string>Может редактировать �ДМИ�ОВ?</string>
+				<string>Может измен�ть админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_delete</key>
-				<string>Может удал�ть пользователей?</string>
+				<string>Может удал�ть?</string>
 			</item>
 			<item>
 				<key>member_delete_admin</key>
-				<string>Может удал�ть �ДМИ�ОВ?</string>
+				<string>Может удал�ть админи�траторов?</string>
 			</item>
 			<item>
 				<key>members_merge</key>
-				<string>Может �оедин�ть пользователь�кие учетки?</string>
+				<string>Может объедин�ть?</string>
 			</item>
 			<item>
 				<key>member_suspend</key>
-				<string>Может блокировать и разблокировать пользователей?</string>
+				<string>Может блокировать?</string>
 			</item>
 			<item>
 				<key>member_suspend_admin</key>
-				<string>Может блокировать и разблокировать �ДМИ�ОВ?</string>
+				<string>Может блокировать админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_prune</key>
-				<string>Может ма��ово удал�ть пользователей?</string>
+				<string>Может удал�ть?</string>
 			</item>
 			<item>
 				<key>member_prune_admin</key>
-				<string>Может ма��ово удал�ть �ДМИ�ОВ?</string>
+				<string>Может удал�ть админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_move</key>
-				<string>Может перемещать пользователей в другие группы?</string>
+				<string>Может перено�ить из группы в группу?</string>
 			</item>
 			<item>
 				<key>member_move_admin1</key>
-				<string>Может перемещать �ДМИ�ОВ в другие группы?</string>
+				<string>Может перено�ить админи�траторов в другие группы?</string>
 			</item>
 			<item>
 				<key>member_move_admin2</key>
-				<string>Может на�троить продвижение группы в �ДМИ��?</string>
+				<string>Может перено�ить в группу админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_ban</key>
-				<string>Может банить пользователей?</string>
+				<string>Может банить?</string>
 			</item>
 			<item>
 				<key>member_ban_admin</key>
-				<string>Может банить �ДМИ�ОВ?</string>
+				<string>Может банить админи�траторов?</string>
 			</item>
 			<item>
 				<key>member_photo</key>
-				<string>Может измен�ть пользовател�кие фотографии и аватары?</string>
+				<string>Может измен�ть фотографии пользовател�м?</string>
 			</item>
 			<item>
 				<key>member_photo_admin</key>
-				<string>Может измен�ть фотографии и аватары у �ДМИ�ОВ?</string>
+				<string>Может измен�ть фотографии админи�траторам?</string>
 			</item>
-		</items>
-	</group>
-	<group>
-		<grouptitle>Ин�трументы по работе � пользовател�ми</grouptitle>
-		<items>
 			<item>
 				<key>membertools_validating</key>
-				<string>Может управл�ть неактивированными пользовател�ми?</string>
+				<string>Может управл�ть ожидающими активации?</string>
 			</item>
 			<item>
 				<key>membertools_locked</key>
-				<string>Может управл�ть заблокированными пользовател�ми?</string>
+				<string>Может управл�ть заблокированными?</string>
 			</item>
 			<item>
 				<key>membertools_banned</key>
-				<string>Может управл�ть забаненными пользовател�ми?</string>
+				<string>Может управл�ть забаненными?</string>
 			</item>
 			<item>
-				<key>membertools_ip</key>
-				<string>Может и�пользовать ин�трумент дл� работы � IP адре�ами?</string>
+				<key>membertools_spam</key>
+				<string>Может управл�ть �пам-пользовател�ми?</string>
+			</item>
+			<item>
+				<key>membertools_incomplete</key>
+				<string>Может управл�ть не завершившими реги�трацию?</string>
+			</item>
+			<item>
+				<key>membertools_delete_pms</key>
+				<string>Может удал�ть личные �ообщени�?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Звани� пользователей</grouptitle>
+		<grouptitle>Ин�трументы</grouptitle>
+		<grouplang>members_tools</grouplang>
+		<items>
+			<item>
+				<key>membertools_ip</key>
+				<string>Может и�пользовать ин�трументы работы � IP-адре�ами?</string>
+			</item>
+		</items>
+	</group>
+	<group>
+		<grouptitle>Звани�</grouptitle>
+		<grouplang>members_ranks</grouplang>
 		<items>
 			<item>
 				<key>ranks_add</key>
-				<string>Может добавл�ть новые?</string>
+				<string>Может про�матривать и добавл�ть?</string>
 			</item>
 			<item>
 				<key>ranks_edit</key>
-				<string>Может измен�ть �уще�твующие?</string>
+				<string>Может измен�ть?</string>
 			</item>
 			<item>
 				<key>ranks_delete</key>
@@ -116,58 +131,40 @@
 		</items>
 	</group>
 	<group>
-		<grouptitle>Дополнительные пол�</grouptitle>
-		<items>
-			<item>
-				<key>profilefields_global</key>
-				<string>Can access custom profile fields management?</string>
-			</item>
-			<item>
-				<key>profilefields_add</key>
-				<string>Может добавл�ть новые?</string>
-			</item>
-			<item>
-				<key>profilefields_edit</key>
-				<string>Может измен�ть �уще�твующие?</string>
-			</item>
-			<item>
-				<key>profilefields_delete</key>
-				<string>Может удал�ть?</string>
-			</item>
-		</items>
-	</group>
-	<group>
-		<grouptitle>Бан фильтры</grouptitle>
+		<grouptitle>Бан-фильтр</grouptitle>
+		<grouplang>members_banfilters</grouplang>
 		<items>
 			<item>
 				<key>ban_manage</key>
-				<string>Может добавл�ть/измен�ть?</string>
+				<string>Может управл�ть фильтром?</string>
 			</item>
 			<item>
 				<key>ban_remove</key>
-				<string>Может удал�ть?</string>
+				<string>Может удал�ть правила?</string>
 			</item>
 		</items>
 	</group>
 	<group>
-		<grouptitle>Репутаци� пользователей</grouptitle>
+		<grouptitle>Репутаци�</grouptitle>
+		<grouplang>members_reputation</grouplang>
 		<items>
 			<item>
 				<key>reps_manage</key>
-				<string>Может добавл�ть/измен�ть уровни репутации?</string>
+				<string>Может управл�ть?</string>
 			</item>
 			<item>
 				<key>reps_delete</key>
-				<string>Может удал�ть уровни?</string>
+				<string>Может удал�ть уровни репутации?</string>
 			</item>
 		</items>
 	</group>
 	<group>
 		<grouptitle>Уведомлени�</grouptitle>
+		<grouplang>members_notifications</grouplang>
 		<items>
 			<item>
 				<key>configure_notifications</key>
-				<string>Может на�траивать уведомлени�?</string>
+				<string>Может на�траивать значени� по-умолчанию дл� уведомлений?</string>
 			</item>
 		</items>
 	</group>
diff --git a/upload/admin/applications/members/modules_admin/restrictions/defaultSection.php b/upload/admin/applications/members/modules_admin/restrictions/defaultSection.php
index 73c2d886..1a5eec4a 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/defaultSection.php
+++ b/upload/admin/applications/members/modules_admin/restrictions/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default restrictions section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'restrictions' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'restrictions';
\ No newline at end of file
+$DEFAULT_SECTION = 'restrictions';
diff --git a/upload/admin/applications/members/modules_admin/restrictions/index.html b/upload/admin/applications/members/modules_admin/restrictions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/index.html
+++ b/upload/admin/applications/members/modules_admin/restrictions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/restrictions/restrictions.php b/upload/admin/applications/members/modules_admin/restrictions/restrictions.php
index fa156f8d..3692f072 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/restrictions.php
+++ b/upload/admin/applications/members/modules_admin/restrictions/restrictions.php
@@ -3,19 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP Restrictions
- * Last Updated: $Date: 2010-06-02 18:28:28 -0400 (Wed, 02 Jun 2010) $
+ * Last Updated: $Date: 2011-06-14 12:04:59 -0400 (Tue, 14 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 6445 $
+ * @version		$Revision: 9039 $
+ * @todo		Update class_xml references to classXml
  *
  */
 
@@ -30,41 +31,36 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * Skin object
 	 *
-	 * @access	private
 	 * @var		object			Skin templates
 	 */
-	private $html;
+	protected $html;
 	
 	/**
 	 * Shortcut for url
 	 *
-	 * @access	private
 	 * @var		string			URL shortcut
 	 */
-	private $form_code;
+	protected $form_code;
 	
 	/**
 	 * Shortcut for url (javascript)
 	 *
-	 * @access	private
 	 * @var		string			JS URL shortcut
 	 */
-	private $form_code_js;
+	protected $form_code_js;
 	
 	/**
 	 * Member information
 	 *
-	 * @access	private
 	 * @var		array			Member information
 	 */
-	private $member_info		= array();
+	protected $member_info		= array();
 	
 	/**
 	 * Main class entry point
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -165,11 +161,10 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * Saving the ACP restrictions - here's where it gets really dirty
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-11
 	 */
-	private function _restrictionsSave()
+	protected function _restrictionsSave()
 	{
 		$role_id		= intval($this->request['id']);
 		$role_type		= $this->request['type'];
@@ -206,6 +201,99 @@ class admin_members_restrictions_restrictions extends ipsCommand
 			return;
 		}
 		
+		//-------------------------------
+		// Grab XML library
+		//-------------------------------
+		
+		require_once( IPS_KERNEL_PATH . 'class_xml.php' );/*noLibHook*/
+
+		$xml = new class_xml();
+		$xml->doc_type	= IPS_DOC_CHAR_SET;
+		
+		//-------------------------------
+		// Start the madness...err parsing
+		//-------------------------------
+		
+		foreach( ipsRegistry::$applications as $app_dir => $app_data )
+		{
+			if( !is_array(ipsRegistry::$modules[ $app_dir ]) OR !count(ipsRegistry::$modules[ $app_dir ]) )
+			{
+				continue;
+			}
+			
+			$this->lang->loadLanguageFile( array( 'admin_menulang' ), $app_dir );
+
+			foreach( ipsRegistry::$modules[ $app_dir ] as $module )
+			{
+				$_file 	= IPSLib::getAppDir( $app_dir ) . '/modules_admin/' . $module['sys_module_key'] . '/xml/permissions.xml';
+				
+				if( ! $module['sys_module_admin'] )
+				{
+					continue;
+				}
+				
+				if( ! is_file( $_file ) )
+				{
+					continue;
+				}
+
+				$content	= file_get_contents( $_file );
+				
+				$xml->xml_parse_document( $content );
+				
+				if ( ! is_array( $xml->xml_array['permissions']['group'][0]  ) )
+				{
+					//-----------------------------------------
+					// Ensure [0] is populated
+					//-----------------------------------------
+					
+					$xml->xml_array['permissions']['group'] = array( 0 => $xml->xml_array['permissions']['group'] );
+				}
+				
+				//-----------------------------------------
+				// Loop through and sort out permissions and groups...
+				//-----------------------------------------
+				
+				$group	= 0;
+
+				foreach( $xml->xml_array['permissions']['group'] as $entry )
+				{
+					//-----------------------------------------
+					// Do we have a row matching this already?
+					//-----------------------------------------
+					
+					$_title			= ( $entry['grouplang']['VALUE'] AND $this->lang->words[ 'r__' . $entry['grouplang']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $entry['grouplang']['VALUE'] ] : $entry['grouptitle']['VALUE'];
+					$items			= array();
+					$group++;
+					
+					if( is_array($entry['items']) AND count($entry['items']) )
+					{
+						foreach( $entry['items'] as $item )
+						{
+							if( is_array($item) AND count($item) )
+							{
+								if( isset($item['key']) )
+								{
+									$items[ $item['key']['VALUE'] ] = ( $item['key']['VALUE'] AND $this->lang->words[ 'r__' . $item['key']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $item['key']['VALUE'] ] : $item['string']['VALUE'];
+								}
+								else
+								{
+									foreach( $item as $sub_item )
+									{
+										$items[ $sub_item['key']['VALUE'] ]	= ( $sub_item['key']['VALUE'] AND $this->lang->words[ 'r__' . $sub_item['key']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $sub_item['key']['VALUE'] ] : $sub_item['string']['VALUE'];
+									}
+								}
+							}
+						}
+
+						$perms[ $app_data['app_id'] ][ $module['sys_module_id'] ][ $group ]['title']	= $_title;
+						$perms[ $app_data['app_id'] ][ $module['sys_module_id'] ][ $group ]['items']	= $items;
+					}
+				}
+			}
+		}
+//echo '<PRE>';print_r( $perms );exit();
+		
 		$updated_permissions	= array(
 										'applications'	=> array(),
 										'modules'		=> array(),
@@ -214,6 +302,9 @@ class admin_members_restrictions_restrictions extends ipsCommand
 
 		foreach( $_POST as $key => $value )
 		{
+			
+			
+		
 			if( preg_match( "/^app_(\d+)$/", $key, $matches ) )
 			{
 				if( $value )
@@ -246,13 +337,11 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * Manage ACP restrictions - The meat and potatoes, so to speak
 	 *
-	 * @access	private
 	 * @param	string		[member|group]
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-11
-	 * @todo 	One of the only areas that still uses the old XML parser
 	 */
-	private function _restrictionsForm( $type='member' )
+	protected function _restrictionsForm( $type='member' )
 	{
 		//-------------------------------
 		// INIT
@@ -293,7 +382,7 @@ class admin_members_restrictions_restrictions extends ipsCommand
 		// Grab XML library
 		//-------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'class_xml.php' );
+		require_once( IPS_KERNEL_PATH . 'class_xml.php' );/*noLibHook*/
 
 		$xml = new class_xml();
 		$xml->doc_type	= IPS_DOC_CHAR_SET;
@@ -308,6 +397,8 @@ class admin_members_restrictions_restrictions extends ipsCommand
 			{
 				continue;
 			}
+			
+			$this->lang->loadLanguageFile( array( 'admin_menulang' ), $app_dir );
 
 			foreach( ipsRegistry::$modules[ $app_dir ] as $module )
 			{
@@ -318,7 +409,7 @@ class admin_members_restrictions_restrictions extends ipsCommand
 					continue;
 				}
 				
-				if( ! file_exists( $_file ) )
+				if( ! is_file( $_file ) )
 				{
 					continue;
 				}
@@ -348,7 +439,7 @@ class admin_members_restrictions_restrictions extends ipsCommand
 					// Do we have a row matching this already?
 					//-----------------------------------------
 					
-					$_title			= $entry['grouptitle']['VALUE'];
+					$_title			= ( $entry['grouplang']['VALUE'] AND $this->lang->words[ 'r__' . $entry['grouplang']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $entry['grouplang']['VALUE'] ] : $entry['grouptitle']['VALUE'];
 					$items			= array();
 					$group++;
 					
@@ -360,13 +451,13 @@ class admin_members_restrictions_restrictions extends ipsCommand
 							{
 								if( isset($item['key']) )
 								{
-									$items[ $item['key']['VALUE'] ] = $item['string']['VALUE'];
+									$items[ $item['key']['VALUE'] ] = ( $item['key']['VALUE'] AND $this->lang->words[ 'r__' . $item['key']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $item['key']['VALUE'] ] : $item['string']['VALUE'];
 								}
 								else
 								{
 									foreach( $item as $sub_item )
 									{
-										$items[ $sub_item['key']['VALUE'] ]	= $sub_item['string']['VALUE'];
+										$items[ $sub_item['key']['VALUE'] ]	= ( $sub_item['key']['VALUE'] AND $this->lang->words[ 'r__' . $sub_item['key']['VALUE'] ] ) ? $this->lang->words[ 'r__' . $sub_item['key']['VALUE'] ] : $sub_item['string']['VALUE'];
 									}
 								}
 							}
@@ -389,11 +480,10 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * List members and groups with restrictions
 	 *
-	 * @access	private
-	 * @return	void			Outputs to screen
+	 * @return	@e void			Outputs to screen
 	 * @since	2.1.0.2005-7-7
 	 */
-	private function _acppermsList()
+	protected function _acppermsList()
 	{
 		//-------------------------------
 		// INIT
@@ -475,12 +565,11 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * Remove ACP restrictions - this will make a restricted member or group have full permissions
 	 *
-	 * @access	private
 	 * @param	string		[member|group]
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-11
 	 */
-	private function _removePermissions( $type='member' )
+	protected function _removePermissions( $type='member' )
 	{
 		//-------------------------------
 		// INIT
@@ -516,12 +605,11 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * ACP Perms: Add member form
 	 *
-	 * @access	private
 	 * @param	string		[member|group]
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-7
 	 */
-	private function _addRole( $type='member' )
+	protected function _addRole( $type='member' )
 	{
 		$this->registry->output->extra_nav[]		= array( '', $this->lang->words['r_nav'] );
 
@@ -540,11 +628,10 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	 * Checks input, adds row to DB if OK
 	 * This bud's for you
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-8
 	 */
-	private function _addMemberDo()
+	protected function _addMemberDo()
 	{
 		//-------------------------------
 		// INIT
@@ -672,7 +759,7 @@ class admin_members_restrictions_restrictions extends ipsCommand
 
 		$message = count($restrict) ? $this->lang->words['r_restrictbase'] : $this->lang->words['r_noacpaccessuntil'];
 		
-		$this->registry->output->global_message = sprintf( $this->lang->words['r_addedmember'], $member['members_display_name'], $message );
+		$this->registry->output->setMessage( sprintf( $this->lang->words['r_addedmember'], $member['members_display_name'], $message ), 1 );
 
 		$this->request[ 'mid'] =  $member['member_id'] ;
 		$this->_restrictionsForm( 'member' );
@@ -681,11 +768,10 @@ class admin_members_restrictions_restrictions extends ipsCommand
 	/**
 	 * ACP Perms: Finish adding the group
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.1.0.2005-7-8
 	 */
-	private function _addGroupDo()
+	protected function _addGroupDo()
 	{
 		//-------------------------------
 		// INIT
@@ -772,7 +858,7 @@ class admin_members_restrictions_restrictions extends ipsCommand
 																'row_perm_cache'	=> serialize( array() ),
 																'row_updated'		=> time() ) );
 																		
-		$this->registry->output->global_message = sprintf( $this->lang->words['r_addedgroup'], $group['g_title'] );
+		$this->registry->output->setMessage( sprintf( $this->lang->words['r_addedgroup'], $group['g_title'] ), 1 );
 		$this->_acppermsList();
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/restrictions/xml/index.html b/upload/admin/applications/members/modules_admin/restrictions/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/xml/index.html
+++ b/upload/admin/applications/members/modules_admin/restrictions/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_admin/restrictions/xml/menu.xml b/upload/admin/applications/members/modules_admin/restrictions/xml/menu.xml
index 53d78f11..fe2674e8 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/xml/menu.xml
+++ b/upload/admin/applications/members/modules_admin/restrictions/xml/menu.xml
@@ -6,6 +6,7 @@
 			<subitems>
 				<subitem>
 					<subitemtitle>�дмини�тратор�кие ограничени�</subitemtitle>
+					<subitemlang>restrictions</subitemlang>
 					<subsection>restrictions</subsection>
 					<subitemurl>do=overview</subitemurl>
 					<subitemrolekey></subitemrolekey>
diff --git a/upload/admin/applications/members/modules_admin/restrictions/xml/permissions.xml b/upload/admin/applications/members/modules_admin/restrictions/xml/permissions.xml
index 0b9978ad..10568d5a 100644
--- a/upload/admin/applications/members/modules_admin/restrictions/xml/permissions.xml
+++ b/upload/admin/applications/members/modules_admin/restrictions/xml/permissions.xml
@@ -2,6 +2,7 @@
 <permissions>
 	<group>
 		<grouptitle>Управление ограничени�ми до�тупа</grouptitle>
+		<grouplang>members_restrictions</grouplang>
 		<items>
 			<item>
 				<key>restrictions_add_member</key>
diff --git a/upload/admin/applications/members/modules_public/ajax/card.php b/upload/admin/applications/members/modules_public/ajax/card.php
index 03642b56..9cce0eb1 100644
--- a/upload/admin/applications/members/modules_public/ajax/card.php
+++ b/upload/admin/applications/members/modules_public/ajax/card.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX hCard
- * Last Updated: $Date: 2010-09-08 12:09:02 -0400 (Wed, 08 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6840 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_ajax_card extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -98,7 +97,7 @@ class public_members_ajax_card extends ipsAjaxCommand
 		/* Reputation */
 		if ( $this->settings['reputation_protected_groups'] )
 		{
-			if ( in_array( $this->memberData['member_group_id'], explode( ",", $this->settings['reputation_protected_groups'] ) ) )
+			if ( in_array( $member['member_group_id'], explode( ",", $this->settings['reputation_protected_groups'] ) ) )
 			{
 				$this->settings['reputation_show_profile'] = false;
 			}
diff --git a/upload/admin/applications/members/modules_public/ajax/comments.php b/upload/admin/applications/members/modules_public/ajax/comments.php
deleted file mode 100644
index 304ce7f4..00000000
--- a/upload/admin/applications/members/modules_public/ajax/comments.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Profile AJAX Comment Handler
- * Last Updated: $Date: 2010-09-07 14:10:16 -0400 (Tue, 07 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6834 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_members_ajax_comments extends ipsAjaxCommand 
-{
-	/**
-	 * Comments library
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $comments;
-
-	/**
-	 * Class entry point
-	 *
-	 * @access	public
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/comments.php', 'profileCommentsLib', 'members' );
-		$this->comments = new $classToLoad( $this->registry );
-		
-		switch( $this->request[ 'do' ] )
-		{
-			case 'view':
-			default:
-				$this->returnHtml( $this->comments->buildComments( IPSMember::load( intval( $this->request['member_id'] ) ) ) );
-			break;
-
-			case 'add':
-				$this->_addComment();
-			break;
-			
-			case 'delete':
-				$this->_deleteComment();
-			break;
-			
-			case 'approve':
-				$this->_approveComment();
-			break;
-				
-			case 'reload':
-				$this->_reloadComment();
-			break;			
-		}
-	}
-
- 	/**
-	 * Approve a comment on member's profile
-	 *
-	 * @access	protected
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
- 	protected function _approveComment()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$md5check			= IPSText::md5Clean( $this->request['md5check'] );
-		$comment_id			= intval( $this->request['comment_id'] );
-
-		//-----------------------------------------
-		// MD5 check
-		//-----------------------------------------
-		
-		if (  $md5check != $this->member->form_hash )
-    	{
-    		$this->returnString( 'error' );
-    	}
-
-		//-----------------------------------------
-		// Delete
-		//-----------------------------------------
-
-    	$result = $this->comments->approveComment( $member_id, $comment_id );
-		
-		/* Check for error */
-		if( $result )
-		{
-			$this->returnString( $result );
-		}
-		else
-		{
-			$this->returnHtml( $this->comments->buildComments( IPSMember::load( $member_id ) ) );
-		}
-	}
-	
- 	/**
-	 * Reload comments
-	 *
-	 * @access	protected
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-15
-	 */
- 	protected function _reloadComment()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id		= intval( $this->request['member_id'] );
-		$md5check		= IPSText::md5Clean( $this->request['md5check'] );
-
-		//-----------------------------------------
-		// MD5 check
-		//-----------------------------------------
-		
-		if (  $md5check != $this->member->form_hash )
-    	{
-    		$this->returnString( 'error' );
-    	}
-
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-    	
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-			$this->returnString( 'error' );
-    	}
-		
-		//-----------------------------------------
-		// Regenerate comments...
-		//-----------------------------------------
-		
-		$this->returnHtml( $this->comments->buildComments( $member ) );
-	}
-	
-
- 	/**
-	 * Deletes a comment on member's profile
-	 *
-	 * @access	protected
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
- 	protected function _deleteComment()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$md5check			= IPSText::md5Clean( $this->request['md5check'] );
-		$comment_id			= intval( $this->request['comment_id'] );
-
-		//-----------------------------------------
-		// MD5 check
-		//-----------------------------------------
-		
-		if (  $md5check != $this->member->form_hash )
-    	{
-    		$this->returnString( 'error' );
-    	}
-
-		//-----------------------------------------
-		// Delete
-		//-----------------------------------------
-
-    	$result = $this->comments->deleteComment( $member_id, $comment_id );
-		
-		/* Check for error */
-		if( $result )
-		{
-			$this->returnString( $result );
-		}
-		else
-		{
-			$this->returnHtml( $this->comments->buildComments( IPSMember::load( $member_id ) ) );
-		}
-	}
-	
-
- 	/**
-	 * Saves a comment on member's profile
-	 *
-	 * @access	protected
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
- 	protected function _addComment()
- 	{
-		/* INIT */
-		$member_id = intval( $this->request['member_id'] );
-
-		$result = $this->comments->addCommentToDB( $member_id, IPSText::parseCleanValue( $_POST['comment'] ) );
-		
-		/* Check for error */
-		if( $result AND $result != 'pp_comment_added_mod' )
-		{
-			$this->returnString( $result );
-		}
-		else
-		{
-			$this->returnHtml( $this->comments->buildComments( IPSMember::load( $member_id ), 0, '' ) );
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/ajax/dname.php b/upload/admin/applications/members/modules_public/ajax/dname.php
index 94039977..df56d4ae 100644
--- a/upload/admin/applications/members/modules_public/ajax/dname.php
+++ b/upload/admin/applications/members/modules_public/ajax/dname.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile display name history
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6133 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_ajax_dname extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/applications/members/modules_public/ajax/dst.php b/upload/admin/applications/members/modules_public/ajax/dst.php
index d0bf59af..bfef5b48 100644
--- a/upload/admin/applications/members/modules_public/ajax/dst.php
+++ b/upload/admin/applications/members/modules_public/ajax/dst.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member AJAX DST switcher
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_ajax_dst extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/applications/members/modules_public/ajax/friends.php b/upload/admin/applications/members/modules_public/ajax/friends.php
index 9ae03314..e43ec00b 100644
--- a/upload/admin/applications/members/modules_public/ajax/friends.php
+++ b/upload/admin/applications/members/modules_public/ajax/friends.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX Comment Handler
- * Last Updated: $Date: 2010-07-14 17:57:17 -0400 (Wed, 14 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6651 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,17 +30,15 @@ class public_members_ajax_friends extends ipsAjaxCommand
 	/**
 	 * Friends library
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $friends;
+	protected $friends;
 
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -62,94 +60,16 @@ class public_members_ajax_friends extends ipsAjaxCommand
 			
 			case 'remove':
 				$this->_removeFriend();
-			break;	
-				
-			case 'view':
-				$this->_iframeList();
 			break;
 		}
 	}
-	
- 	/**
-	 * Loads the content for the friends tab
-	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-15
-	 */
- 	private function _iframeList()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$content			= '';
-		$friends			= array();
-
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-    	
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-			$this->returnString( $this->lang->words['nofriendid'] );
-    	}
-
-		//-----------------------------------------
-		// Grab the friends
-		//-----------------------------------------
-
-		$this->DB->build( array( 'select'		=> 'f.*',
-								 'from'			=> array( 'profile_friends' => 'f' ),
-								 'where'		=> 'f.friends_member_id=' . $member_id . ' AND f.friends_approved=1',
-								 'order'		=> 'm.members_display_name ASC',
-								 'add_join'		=> array(
-													  1 => array( 'select' => 'pp.*',
-																  'from'   => array( 'profile_portal' => 'pp' ),
-																  'where'  => 'pp.pp_member_id=f.friends_friend_id',
-																  'type'   => 'left' ),
-												 	  2 => array( 'select' => 'm.*',
-																  'from'   => array( 'members' => 'm' ),
-																  'where'  => 'm.member_id=f.friends_friend_id',
-																  'type'   => 'left' ) 
-													) 
-								) 		);
-		$outer	= $this->DB->execute();
-		
-		//-----------------------------------------
-		// Get and store...
-		//-----------------------------------------
-		
-		while( $row = $this->DB->fetch($outer) )
-		{
-			$row['members_display_name_short'] = IPSText::truncate( $row['members_display_name'], 13 );
-			
-			$friends[] = IPSMember::buildDisplayData( $row, 0 );
-		}
-
-		//-----------------------------------------
-		// Ok.. show the friends
-		//-----------------------------------------
-		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->friendsIframe( $member, $friends );
-		
-		$this->returnHtml( $content );
-	}
 
 	/**
 	 * Add a friend
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
- 	private function _addFriend()
+ 	protected function _addFriend()
  	{
 		/* INIT */
 		$member_id = intval( $this->request['member_id'] );
@@ -177,10 +97,9 @@ class public_members_ajax_friends extends ipsAjaxCommand
 	/**
 	 * Removes a friend
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _removeFriend()
+	protected function _removeFriend()
 	{
 		/* INIT */
 		$member_id = intval( $this->request['member_id'] );
diff --git a/upload/admin/applications/members/modules_public/ajax/ignore.php b/upload/admin/applications/members/modules_public/ajax/ignore.php
index 40cc34c4..903cae11 100644
--- a/upload/admin/applications/members/modules_public/ajax/ignore.php
+++ b/upload/admin/applications/members/modules_public/ajax/ignore.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX Ignore User
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 7007 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,7 +29,7 @@ class public_members_ajax_ignore extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/applications/members/modules_public/ajax/index.html b/upload/admin/applications/members/modules_public/ajax/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/ajax/index.html
+++ b/upload/admin/applications/members/modules_public/ajax/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/ajax/load.php b/upload/admin/applications/members/modules_public/ajax/load.php
index e6e0f766..2c858531 100644
--- a/upload/admin/applications/members/modules_public/ajax/load.php
+++ b/upload/admin/applications/members/modules_public/ajax/load.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX Tab Loader
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 7007 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -29,7 +29,7 @@ class public_members_ajax_load extends ipsAjaxCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -75,12 +75,12 @@ class public_members_ajax_load extends ipsAjaxCommand
 		// Load config
 		//-----------------------------------------
 
-		if( !file_exists( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.conf.php' ) )
+		if( !is_file( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.conf.php' ) )
 		{
 			$this->returnString( 'error' );
 		}
 		
-		require( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.conf.php' );
+		require( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.conf.php' );/*noLibHook*/
 		
 		//-----------------------------------------
 		// Active?
@@ -95,12 +95,12 @@ class public_members_ajax_load extends ipsAjaxCommand
 		// Load main class...
 		//-----------------------------------------
 		
-		if( !file_exists( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.php' ) )
+		if( !is_file( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.php' ) )
 		{
 			$this->returnString( 'error' );
 		}
 		
-		require( IPSLib::getAppDir( 'members' ) . '/sources/tabs/pluginParentClass.php' );
+		require( IPSLib::getAppDir( 'members' ) . '/sources/tabs/pluginParentClass.php' );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/profileTabs/' . $tab . '.php', 'profile_' . $tab, $app );
 		$plugin      = new $classToLoad( $this->registry );
 
diff --git a/upload/admin/applications/members/modules_public/ajax/messenger.php b/upload/admin/applications/members/modules_public/ajax/messenger.php
index 72646880..b1b1371b 100644
--- a/upload/admin/applications/members/modules_public/ajax/messenger.php
+++ b/upload/admin/applications/members/modules_public/ajax/messenger.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX Ignored User methods
- * Last Updated: $Date: 2010-10-05 21:26:08 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thursday 26th June 2008
- * @version		$Revision: 6945 $
+ * @version		$Revision: 9487 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Messenger library
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $messengerFunctions;
@@ -38,9 +37,8 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -76,15 +74,68 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 			break;
 			case 'archiveConversation':
 				$this->_archiveConversation();
+			break;
+			case 'getInboxDropDown':
+				$this->_getInboxDropDown();
+			break;
+			case 'sigCloseMenu':
+				$this->_sigCloseMenu();
+			break;
 			default:
 			break;
 		}
 	}
 	
+	
+	protected function _sigCloseMenu()
+	{
+		$this->lang->loadLanguageFile( array( 'public_topic', 'public_mod' ), 'forums' );
+		
+		$msgid = intval( $this->request['msgid'] );
+		
+		/* Fetch post */
+		$msg  = $this->messengerFunctions->fetchMessageDataById( $msgid, true );
+		
+		if ( $this->messengerFunctions->canAccessTopic( $this->memberData['member_id'], $msg['msg_topic_id'] ) )
+		{
+			return $this->returnHtml( $this->registry->output->getTemplate('topic')->ajaxSigCloseMenu( $msg ) );
+		}
+		else
+		{
+			$this->returnJsonError( 'nopermission' );
+		}
+	}
+	
+	/**
+	 * Shows the last 10 Pms or whatever.
+	 *
+	 * @return	string		HTML to be returned via ajax
+	 * @since	IPB 3.1.0.2011-03-24
+	 */
+ 	protected function _getInboxDropDown()
+ 	{
+ 		if ( ! $this->messengerFunctions->canUsePMSystem( $this->memberData ) )
+ 		{
+ 			$this->returnJsonError( 'cannotUsePMSystem' );
+ 		}
+ 		
+ 		$this->lang->loadLanguageFile( array( 'public_messaging' ), 'members' );
+ 		
+ 		/* Alright. Fetch the last 10 */
+ 		//$this->messengerFunctions->addFolderFilter('myconvo');
+ 		
+ 		$topics = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], 'myconvo', array( 'sort' => 'date', 'offsetStart' => 0, 'offsetEnd' => 10 ) );
+ 		$topics = ( ! is_array( $topics ) ) ? array() : $topics;
+ 		
+ 		/* reset */
+ 		$this->messengerFunctions->resetMembersAlertCounts( $this->memberData );
+ 		
+ 		$this->returnJsonArray( array( 'html' => $this->cleanOutput( $this->registry->output->getTemplate('global_other')->inboxList( $topics ) ) ) );
+ 	}
+ 	
 	/**
 	 * Archives the conversation
 	 *
-	 * @access	protected
 	 * @return	string		HTML to be returned via ajax
 	 * @since	IPB 3.1.2.2010-07-07
 	 */
@@ -157,7 +208,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Sends the PM
 	 *
-	 * @access	protected
 	 * @return	string		HTML to be returned via ajax
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -176,8 +226,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 		$msgContent            = $this->convertHtmlEntities( $this->convertUnicode( $_POST['Post'] ) );
 		$msgTitle			   = IPSText::parseCleanValue( $this->convertHtmlEntities( $this->convertUnicode( $_POST['subject'] ) ) );
     	$this->request['Post'] = IPSText::parseCleanValue( $_POST['Post'] );
-		$_trackMsg             = intval( $this->request['trackMsg'] );
-		$_addToSent			   = intval( $this->request['addToSent'] );
 		
 		//-----------------------------------------
     	// Check viewing permissions, etc
@@ -198,12 +246,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 			$this->returnJsonError( 'cannotUsePMSystem' );
 		}
 		
-		//-----------------------------------------
-		// Reset Classes
-		//-----------------------------------------
-		
-		IPSText::resetTextClass('editor');
-		
 		//-----------------------------------------
 		// Load lang file
 		//-----------------------------------------
@@ -227,12 +269,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
  		
 		try
 		{
- 			$this->messengerFunctions->sendNewPersonalTopic( $toMemberID, $this->memberData['member_id'], array(), $msgTitle, $msgContent, array( 'origMsgID'       => 0,
-																																	 'fromMsgID'       => 0,
-																																     'postKey'         => md5(microtime()),
-																												   		   		     'trackMsg'        => $_trackMsg,
-																										   		  		   		     'addToSentFolder' => $_addToSent,
-																												   		   		     'hideCCUser'      => 0 ) );
+ 			$this->messengerFunctions->sendNewPersonalTopic( $toMemberID, $this->memberData['member_id'], array(), $msgTitle, $msgContent );
 																												
 			return $this->returnJsonArray( array( 'status' => 'sent' ) );
  		}
@@ -267,7 +304,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Shows the quick PM form
 	 *
-	 * @access	protected
 	 * @return	string		HTML to be returned via ajax
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -326,7 +362,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Returns PM notification
 	 *
-	 * @access	protected
 	 * @return	string		JSON either error or status
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -397,7 +432,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $msg['mgroup_others'];
 		
 		$msg['msg_post'] = IPSText::getTextClass('bbcode')->stripAllTags( strip_tags( str_replace( '<br />', "\n", $msg['msg_post'] ) ) );
-		$msg['msg_post'] = IPSText::getTextClass('bbcode')->wordWrap( $msg['msg_post'], 50, "\n" );
+		$msg['msg_post'] = wordwrap( $msg['msg_post'], 50, "\n" );
 		
 		if ( IPSText::mbstrlen( $msg['msg_post'] ) > 300 )
 		{
@@ -438,7 +473,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Empties a folder
 	 *
-	 * @access	protected
 	 * @return	string		JSON either error or status
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -529,7 +563,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Renames a folder
 	 *
-	 * @access	protected
 	 * @return	string		JSON either error or status
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -611,7 +644,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 	/**
 	 * Removes a folder
 	 *
-	 * @access	protected
 	 * @return	string		JSON either error or status
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
@@ -669,11 +701,31 @@ class public_members_ajax_messenger extends ipsAjaxCommand
 		
 		//-----------------------------------------
 		// .. and it has no messages
+		// Change May 9 2011 - JS alert already warns that
+		// all messages in folder will be deleted, so just empty and delete
+		// @link http://community.invisionpower.com/tracker/issue-29857-cannot-delete-pm-folder
 		//-----------------------------------------
 		
-		if ( $folders[ $folderID ]['count'] > 0 )
+		//if ( $folders[ $folderID ]['count'] > 0 )
+		//{
+		//	$this->returnJsonError( 'cannotDeleteHasMessages' );
+		//}
+
+		$messages	= $this->messengerFunctions->getPersonalTopicsList( $memberID, $folderID, array( 'offsetStart' => 0, 'offsetEnd' => 100000 ) );
+	
+		/* Just grab IDs */
+		$mtids		= array_keys( $messages );
+
+		try
 		{
-			$this->returnJsonError( 'cannotDeleteHasMessages' );
+			$this->messengerFunctions->deleteTopics( $memberData['member_id'], $mtids );
+		}
+		catch( Exception $error )
+		{
+			if( $error->getMessage() != 'NO_IDS_TO_DELETE' )
+			{
+				$this->returnJsonError( $error->getMessage() );
+			}
 		}
 		
 		//-----------------------------------------
@@ -704,7 +756,6 @@ class public_members_ajax_messenger extends ipsAjaxCommand
  	/**
 	 * Adds a folder
 	 *
-	 * @access	protected
 	 * @return	string		JSON either error or status
 	 * @since	IPB 3.0.0.2008-06-25
 	 */
diff --git a/upload/admin/applications/members/modules_public/ajax/photo.php b/upload/admin/applications/members/modules_public/ajax/photo.php
new file mode 100644
index 00000000..ecea18d8
--- /dev/null
+++ b/upload/admin/applications/members/modules_public/ajax/photo.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @file		photo.php 	Returns a cropped photo for an ajax request
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
+ * @since		7th Feb 2011
+ * $LastChangedDate: 2011-09-08 11:58:29 -0400 (Thu, 08 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9467 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ *
+ * @class		public_members_ajax_photo
+ * @brief		Returns a cropped photo for an ajax request
+ *
+ */
+class public_members_ajax_photo extends ipsAjaxCommand 
+{
+	/**
+	 * Main function executed automatically by the controller
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
+		
+		/* Load library */
+		$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+		$this->photo = new $classToLoad( $registry );
+			
+		switch( $this->request[ 'do' ] )
+		{
+			case 'cropPhoto':
+				$this->_cropPhoto();
+			break;
+			case 'show':
+				$this->_show();
+			break;
+			case 'remove':
+				$this->_remove();
+			break;
+			case 'save':
+				$this->_save();
+			break;
+			case 'importUrl':
+				$this->_importUrl();
+			break;
+		}
+	}
+	
+	/**
+	 * Import a photo or image from URL
+	 * 
+	 */
+	protected function _importUrl()
+	{
+		$url = trim( $this->request['url'] );
+		
+		/* Do it */
+		try
+		{
+			/* Check for valid URL */
+			$photo = $this->photo->save( $this->memberData, 'url', '', $url );
+			
+			if ( is_array( $photo ) )
+			{
+				$photo = IPSMember::buildDisplayData( IPSMember::load( $this->memberData['member_id'], 'all' ) );
+				$photo['oldThumb'] = $this->memberData['pp_small_photo'];
+				$photo['status']   = 'ok';
+				$photo['thumb']    = $photo['pp_thumb_photo'];
+				$this->returnJsonArray( $photo );
+			}
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+			
+			switch ( $msg )
+			{
+				default:
+					$this->returnJsonError( $this->lang->words[ $msg ] );
+				break;
+				case 'PROFILE_DISABLED':
+					$this->returnJsonError( 'member_profile_disabled' );
+				break;
+			}
+		}
+	}
+	
+	/**
+	 * Saves data
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _save()
+	{
+		$photoType   = $this->request['photoType'];
+		$gravatar	 = $this->request['gravatar'];
+		
+		/* Do it */
+		try
+		{
+			$photo = $this->photo->save( $this->memberData, $photoType, $gravatar );
+			
+			if ( is_array( $photo ) )
+			{
+				$photo = IPSMember::buildDisplayData( IPSMember::load( $this->memberData['member_id'], 'all' ) );
+				$photo['oldThumb'] = $this->memberData['pp_small_photo'];
+				$photo['status']   = 'ok';
+				$photo['thumb']    = $photo['pp_thumb_photo'];
+				$this->returnJsonArray( $photo );
+			}
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+			
+			switch ( $msg )
+			{
+				default:
+					$this->returnJsonError( $this->lang->words[ 'pp_' . $msg ] );
+				break;
+				case 'PROFILE_DISABLED':
+					$this->returnJsonError( 'member_profile_disabled' );
+				break;
+			}
+		}
+	}
+	
+	/**
+	 * Remove the photo
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _remove()
+	{
+		$this->photo->remove( $this->memberData['member_id'] );
+		
+		$return = IPSMember::buildDisplayData( IPSMember::load( $this->memberData['member_id'], 'all' ) );
+		$return['oldThumb'] = $this->memberData['pp_small_photo'];
+		$return['status'] = 'deleted';
+		$return['thumb']  = $return['pp_thumb_photo'];
+		
+		$this->returnJsonArray( $return );
+	}
+	
+	/**
+	 * Display the photo editor
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _show()
+	{
+		$this->returnHtml( $this->photo->getEditorHtml( $this->memberData ) );
+	}
+	
+	/**
+	 * Crop the chosen photo
+	 *
+	 * @return	@e void [JSON array]
+	 */
+	protected function _cropPhoto()
+	{
+		$x1   = intval( $this->request['x1'] );
+		$x2   = intval( $this->request['x2'] );
+		$y1   = intval( $this->request['y1'] );
+		$y2   = intval( $this->request['y2'] );
+		$dims = array( 'x1' => $x1, 'y1' => $y1, 'x2' => $x2, 'y2' => $y2 );
+		
+		/* Crop and fetch return data */
+		$return = $this->photo->cropPhoto( $this->memberData['member_id'], $dims );
+		$member = IPSMember::buildDisplayData( IPSMember::load( $this->memberData['member_id'], 'all' ) );
+		
+		if ( $return['status'] == 'ok' )
+		{
+			$this->returnJsonArray( array_merge( $member, $return ) );
+		}
+		else
+		{
+			$this->returnJsonError('fail');
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/ajax/rate.php b/upload/admin/applications/members/modules_public/ajax/rate.php
index a8c66796..e5d4e350 100644
--- a/upload/admin/applications/members/modules_public/ajax/rate.php
+++ b/upload/admin/applications/members/modules_public/ajax/rate.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile AJAX Tab Loader
- * Last Updated: $Date: 2010-07-14 23:29:48 -0400 (Wed, 14 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6655 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_ajax_rate extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -151,10 +150,9 @@ class public_members_ajax_rate extends ipsAjaxCommand
 	/**
 	 * Utility method to make hooking into file easier
 	 *
-	 * @access	protected
 	 * @param	array 		Data to return
 	 * @param	array 		Member data
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function outputResult( $return, $member )
 	{
diff --git a/upload/admin/applications/members/modules_public/ajax/settings.php b/upload/admin/applications/members/modules_public/ajax/settings.php
deleted file mode 100644
index 9757a608..00000000
--- a/upload/admin/applications/members/modules_public/ajax/settings.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Profile AJAX Tab Loader
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
- * @deprecated	We no longer have AJAX setting changes in profile
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_members_ajax_settings extends ipsAjaxCommand 
-{
-	/**
-	 * Class entry point
-	 *
-	 * @access	public
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-    	//-----------------------------------------
-    	// INIT
-    	//-----------------------------------------
-    	
-		$member_id		= intval($this->request['member_id']);
-		$member			= array();
-		$command		= trim( $this->request['cmd'] );
-		$value			= $this->convertAndMakeSafe( $this->request['value'], 0 );
-		$md5_check		= IPSText::md5Clean( $this->request['md5check'] );
-		$return_string	= '';
-		$pp_b_day		= intval( $this->request['pp_b_day'] );
-		$pp_b_month		= intval( $this->request['pp_b_month'] );
-		$pp_b_year		= intval( $this->request['pp_b_year'] );
-		
-		//-----------------------------------------
-		// MD5 check
-		//-----------------------------------------
-		
-		if (  $md5_check != $this->member->form_hash )
-    	{
-			$this->returnString( 'error' );
-    	}
-
-		//-----------------------------------------
-    	// Check
-    	//-----------------------------------------
-    	
-    	if ( ! $member_id OR ! $this->memberData['member_id'] )
-    	{
-			$this->returnString( 'error' );
-    	}
-    	
-		if ( ! $this->memberData['g_edit_profile'] )
-		{
-			$this->returnString( 'error' );
-		}
-		
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id, 'extendedProfile,groups' );
-
-    	if ( ! $member['member_id'] )
-    	{
-			$this->returnString( 'error' );
-    	}
-    	
-		//-----------------------------------------
-		// Not the same member?
-		//-----------------------------------------
-		
-		if ( !$this->memberData['g_is_supmod'] AND $member_id != $this->memberData['member_id'] )
-		{
-			$this->returnString( 'error' );
-		}
-    	
-		//-----------------------------------------
-		// Alright.. what are we doing?
-		//-----------------------------------------
-		
-		switch( $command )
-		{
-			case 'birthdate':
-				$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ) );
-			
-				if( $pp_b_month OR $pp_b_day OR $pp_b_year )
-				{
-					if ( ! $pp_b_month or ! $pp_b_day )
-					{
-						$return_string = 'dateerror';
-					}
-				}
-
-				if ( ( $pp_b_month AND $pp_b_day AND $pp_b_year ) AND ! @checkdate( $pp_b_month, $pp_b_day, $pp_b_year ) )
-				{
-					$return_string = 'dateerror';
-				}
-
-				if( $return_string != 'dateerror' )
-				{
-					IPSMember::save( $member_id, array( 'core' => array( 'bday_month' => intval( $pp_b_month ), 'bday_day' => intval( $pp_b_day ), 'bday_year' => intval( $pp_b_year ) ) ) );
-
-					$_pp_b_month = '';
-
-					if( $pp_b_month > 0 AND $pp_b_month < 13 )
-					{
-						$_pp_b_month = $this->lang->words['M_' . $pp_b_month ];
-					}
-					
-					$date_vars = array();
-					
-					# Adding this to support birthdays that don't specify all 3 params
-
-					if( $_pp_b_month )
-					{
-						$date_vars[] = $_pp_b_month;
-					}
-					
-					if( $pp_b_day )
-					{
-						$date_vars[] = $pp_b_day;
-					}
-					
-					if( $pp_b_year )
-					{
-						$date_vars[] = $pp_b_year;
-					}
-
-					$return_string = ( count($date_vars) ) ? implode( '-', $date_vars ) : $this->lang->words['m_bday_unknown'];
-				}
-		}
-		
-		$this->returnString( $return_string );
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/ajax/status.php b/upload/admin/applications/members/modules_public/ajax/status.php
index 1707d5e4..2b35eeae 100644
--- a/upload/admin/applications/members/modules_public/ajax/status.php
+++ b/upload/admin/applications/members/modules_public/ajax/status.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Allow user to change their status
- * Last Updated: $Date: 2010-10-04 21:50:24 -0400 (Mon, 04 Oct 2010) $
+ * Last Updated: $Date: 2011-07-05 09:10:56 -0400 (Tue, 05 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6942 $
+ * @version		$Revision: 9154 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -84,17 +83,28 @@ class public_members_ajax_status extends ipsAjaxCommand
 		}
 	}
 	
+	/**
+	 * Returns the requested skin group
+	 *
+	 * @return	@e void
+	 */
+	protected function getSkinGroup()
+	{
+		return ( !in_array( $this->request['skin_group'], array('boards', 'profile') ) ) ? 'profile' : $this->request['skin_group'];
+	}
+
 	/**
 	 * Add a reply statussesses
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _showAll()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
 		$st        = intval( $this->request['st'] );
+
+		$skin_group = $this->getSkinGroup();
 		
 		/* Quick check? */
 		if ( ! $status_id )
@@ -112,14 +122,13 @@ class public_members_ajax_status extends ipsAjaxCommand
 		$statusData = $this->registry->getClass('memberStatus')->getStatusData();
 		
 		/* Fetch */
-		$this->returnJsonArray( array( 'status' => 'success', 'status_replies' => $statusData['status_replies'] + 1, 'html' => $this->cleanOutput( $this->registry->getClass('output')->getTemplate('profile')->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies() ) ) ) );
+		$this->returnJsonArray( array( 'status' => 'success', 'status_replies' => $statusData['status_replies'] + 1, 'html' => $this->cleanOutput( $this->registry->getClass('output')->getTemplate( $skin_group )->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies() ) ) ) );
 	}
 	
 	/**
 	 * Lock a status
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _lockStatus()
 	{
@@ -154,8 +163,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Lock a status
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _unlockStatus()
 	{
@@ -190,8 +198,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Delete a status
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _deleteStatus()
 	{
@@ -226,8 +233,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Delete a status reply
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _deleteReply()
 	{
@@ -264,8 +270,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Add a reply statussesses
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _reply()
 	{
@@ -273,6 +278,8 @@ class public_members_ajax_status extends ipsAjaxCommand
 		$status_id = intval( $this->request['status_id'] );
 		$comment   = $this->convertAndMakeSafe( $_POST['content'] );
 		$id        = intval( $this->request['id'] );
+
+		$skin_group = $this->getSkinGroup();
 		
 		/* Quick check? */
 		if ( ! $status_id OR ! $comment )
@@ -299,7 +306,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 		$this->registry->getClass('memberStatus')->reply();
 		
 		/* Now grab the reply and return it */
-		$reply = $this->registry->getClass('output')->getTemplate('profile')->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies( $status_id, array( 'sort_dir' => 'desc', 'limit' => 1 ) ) );
+		$reply = $this->registry->getClass('output')->getTemplate( $skin_group )->statusReplies( $this->registry->getClass('memberStatus')->fetchAllReplies( $status_id, array( 'sort_dir' => 'desc', 'limit' => 1 ) ) );
 		
 		/* And the number of replies */
 		$statusData = $this->registry->getClass('memberStatus')->getStatusData();
@@ -310,8 +317,7 @@ class public_members_ajax_status extends ipsAjaxCommand
 	/**
 	 * Add a new statussesses
 	 *
-	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _new()
 	{
@@ -322,6 +328,8 @@ class public_members_ajax_status extends ipsAjaxCommand
 		$smallSpace  = intval( $this->request['smallSpace'] );
 		$su_Twitter  = intval( $this->request['su_Twitter'] );
 		$su_Facebook = intval( $this->request['su_Facebook'] );
+		$skin_group  = $this->getSkinGroup();
+		$forMemberId = intval( $this->request['forMemberId'] );
 		
 		/* Got content? */
 		if( !trim( $this->convertAndMakeSafe( str_replace( array( '&nbsp;', '&#160;' ), '', $_POST['content'] ) ) ) )
@@ -335,20 +343,36 @@ class public_members_ajax_status extends ipsAjaxCommand
 		/* Set Content */
 		$this->registry->getClass('memberStatus')->setContent( trim( $this->convertAndMakeSafe( $_POST['content'] ) ) );
 		
-		/* Set post outs */
-		$this->registry->getClass('memberStatus')->setExternalUpdates( array( 'twitter' => $su_Twitter, 'facebook' => $su_Facebook ) );
-		
-		/* Can we reply? */
+		/* Can we create? */
 		if ( ! $this->registry->getClass('memberStatus')->canCreate() )
  		{
 			$this->returnJsonError( $this->lang->words['status_off'] );
 		}
+			
+		/* Update or comment? */
+		if ( $forMemberId && $forMemberId != $this->memberData['member_id'] )
+		{
+			$owner = IPSMember::load( $forMemberId );
+			
+	    	if ( ! $owner['pp_setting_count_comments'] )
+	    	{
+	    		$this->returnJsonError( $this->lang->words['status_off'] );
+	    	}
+	
+			/* Set owner */
+			$this->registry->getClass('memberStatus')->setStatusOwner( $owner );
+		}
+		else
+		{
+			/* Set post outs */
+			$this->registry->getClass('memberStatus')->setExternalUpdates( array( 'twitter' => $su_Twitter, 'facebook' => $su_Facebook ) );
+		}
 
 		/* Update */
 		$newStatus = $this->registry->getClass('memberStatus')->create();
 		
 		/* Now grab the reply and return it */
-		$new = $this->registry->getClass('output')->getTemplate('profile')->statusUpdates( $this->registry->getClass('memberStatus')->fetch( $this->memberData['member_id'], array( 'member_id' => $this->memberData['member_id'], 'sort_dir' => 'desc', 'limit' => 1 ) ), $smallSpace );
+		$new = $this->registry->getClass('output')->getTemplate( $skin_group )->statusUpdates( $this->registry->getClass('memberStatus')->fetch( $this->memberData['member_id'], array( 'relatedTo' => $member['member_id'], 'isApproved' => true, 'sort_dir' => 'desc', 'limit' => 1 ) ), $smallSpace );
 		
 		$this->returnJsonArray( array( 'status' => 'success', 'html' => $this->cleanOutput( $new ) ) );
 
diff --git a/upload/admin/applications/members/modules_public/index.html b/upload/admin/applications/members/modules_public/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/index.html
+++ b/upload/admin/applications/members/modules_public/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/list/defaultSection.php b/upload/admin/applications/members/modules_public/list/defaultSection.php
index 56356970..5bebc9b1 100644
--- a/upload/admin/applications/members/modules_public/list/defaultSection.php
+++ b/upload/admin/applications/members/modules_public/list/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default memberlist section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'list' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'view';
\ No newline at end of file
+$DEFAULT_SECTION = 'view';
diff --git a/upload/admin/applications/members/modules_public/list/index.html b/upload/admin/applications/members/modules_public/list/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/list/index.html
+++ b/upload/admin/applications/members/modules_public/list/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/list/view.php b/upload/admin/applications/members/modules_public/list/view.php
index 4a902183..e488ca4f 100644
--- a/upload/admin/applications/members/modules_public/list/view.php
+++ b/upload/admin/applications/members/modules_public/list/view.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Member list
- * Last Updated: $Date: 2010-10-06 12:00:52 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-10-11 21:18:16 -0400 (Tue, 11 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6949 $
+ * @version		$Revision: 9599 $
  *
  */
 
@@ -30,7 +30,6 @@ class public_members_list_view extends ipsCommand
 	/**
 	 * Custom fields object
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $custom_fields;
@@ -38,7 +37,6 @@ class public_members_list_view extends ipsCommand
 	/**
 	 * Temporary stored output HTML
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $output;
@@ -46,65 +44,57 @@ class public_members_list_view extends ipsCommand
 	/**
 	 * DB result start point
 	 *
-	 * @access	private
 	 * @var		integer
 	 */
-	private $first			= 0;
+	protected $first			= 0;
 
 	/**
 	 * Maximum results per page
 	 *
-	 * @access	private
 	 * @var		integer
 	 */
-	private $max_results	= 20;
+	protected $max_results		= 20;
 
 	/**
 	 * Key to sort on
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $sort_key 		= 'members_display_name';
+	protected $sort_key 		= 'members_display_name';
 
 	/**
 	 * Sort order (desc or asc)
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $sort_order		= 'asc';
+	protected $sort_order		= 'asc';
 
 	/**
 	 * Filter
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $filter			= 'ALL';
+	protected $filter			= 'ALL';
 	
 	/**
 	 * Member titles
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $mem_titles		= array();
+	protected $mem_titles		= array();
 
 	/**
 	 * Member groups
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $mem_groups		= array();
+	protected $mem_groups		= array();
 
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -130,14 +120,14 @@ class public_members_list_view extends ipsCommand
 		$see_groups			= array();
 		$the_filter			= array( 'ALL' => $this->lang->words['show_all'] );
 		$the_members		= array();
-		$query				= array();
+		$query				= array( "m.members_l_display_name !='' AND m.members_l_display_name " . $this->DB->buildIsNull(false) );
 		$url				= array();
 		$pp_rating_real		= isset($this->request['pp_rating_real']) ? intval( $this->request['pp_rating_real'] ) : 0;
 		$this->first		= isset($this->request['st']) ? intval($this->request['st']) : 0;
-		$this->max_results	= ( isset($this->request['max_results']) AND $this->request['max_results'] ) ? $this->request['max_results'] : '20';
-		$this->sort_key		= ( isset($this->request['sort_key']) AND $this->request['sort_key'] )		? $this->request['sort_key']	: 'members_display_name';
-		$this->sort_order	= ( isset($this->request['sort_order']) AND $this->request['sort_order'] )  ? $this->request['sort_order']  : 'asc';
-		$this->filter		= ( isset($this->request['filter']) AND $this->request['filter'] )			? ( $this->request['filter'] == 'ALL' ? 'ALL' : intval( $this->request['filter'] ) ) : 'ALL';
+		$this->max_results	= !empty($this->request['max_results']) ? $this->request['max_results'] : $this->max_results;
+		$this->sort_key		= !empty($this->request['sort_key']) ? $this->request['sort_key']	: 'members_display_name';
+		$this->sort_order	= !empty($this->request['sort_order']) ? $this->request['sort_order']  : 'asc';
+		$this->filter		= !empty($this->request['filter']) ? ( $this->request['filter'] == 'ALL' ? 'ALL' : intval( $this->request['filter'] ) ) : 'ALL';
 
 		$this->request['showall']	= isset($this->request['showall']) ? intval( $this->request['showall'] ) : 0;
 		$this->request['name_box']	= isset($this->request['name_box']) ? $this->request['name_box'] : '';
@@ -197,7 +187,7 @@ class public_members_list_view extends ipsCommand
 		
 		$the_sort_key		= array(
 										'members_l_display_name'	=> 'sort_by_name',
-										'posts'						=> 'sort_by_posts',
+										'posts'						=> 'pcount',
 										'joined'					=> 'sort_by_joined',
 										'members_profile_views'		=> 'm_dd_views',
 								 );
@@ -226,7 +216,7 @@ class public_members_list_view extends ipsCommand
 										'sort_key'					=> $this->sort_key,
 										'sort_order'				=> $this->sort_order,
 										'max_results'				=> $this->max_results,
-										'photoonly'					=> ( isset($this->request['photoonly']) AND $this->request['photoonly'] ) ? 1 : 0,
+										'photoonly'					=> !empty($this->request['photoonly']) ? 1 : 0,
 									);
 
 		//-----------------------------------------
@@ -245,7 +235,7 @@ class public_members_list_view extends ipsCommand
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
 		$this->custom_fields = new $classToLoad();		
 		$this->custom_fields->initData( 'edit', 1 );
-		$this->custom_fields->parseToEdit();		
+		$this->custom_fields->parseToEdit( 'mlist' );		
 		
 		//-----------------------------------------
 		// Member Groups...
@@ -295,7 +285,7 @@ class public_members_list_view extends ipsCommand
 		
 		foreach( $mapit as $in => $tbl )
 		{
-			$this->request[$in] = ( isset($this->request[ $in ]) AND $this->request[ $in ] ) ? $this->request[ $in ] : '';
+			$this->request[$in] = !empty($this->request[ $in ]) ? $this->request[ $in ] : '';
 	 		$inbit = IPSText::parseCleanValue( trim( urldecode( IPSText::stripslashes( $this->request[ $in ] ) ) ) );
 
 			$url[ $in ] = $in . '=' . urlencode($this->request[ $in ]);
@@ -363,8 +353,22 @@ class public_members_list_view extends ipsCommand
 		{
 			foreach( $this->custom_fields->out_fields as $id => $data )
 			{
-				if ( isset($this->request[ 'field_' . $id ]) AND $this->request[ 'field_' . $id ] )
+				if ( !empty($this->request[ 'field_' . $id ]) )
 				{
+					if( is_array($this->request[ 'field_' . $id ]) )
+					{
+						foreach( $this->request[ 'field_' . $id ] as $k => $v )
+						{
+							$this->request[ 'field_' . $id ][ $k ] = urldecode($v);
+							$url[ $in ]		= "field_{$id}[{$k}]=" . $v;
+						}
+					}
+					else
+					{
+						$url[ $in ]		= "field_{$id}=" . $this->request[ 'field_' . $id ];
+						$this->request[ 'field_' . $id ] = urldecode($this->request[ 'field_' . $id ]);
+					}
+					
 					if( $this->custom_fields->cache_data[ $id ]['pf_type'] == 'drop' )
 					{
 						$query[]	= "p.field_{$id}='" . $this->request[ 'field_' . $id ] . "'";
@@ -383,8 +387,6 @@ class public_members_list_view extends ipsCommand
 					{
 						$query[] = $this->custom_fields->cache_data[ $id ]['pf_search_type'] == 'loose' ? "p.field_{$id} LIKE '%" . $this->request[ 'field_' . $id ] . "%'" : "p.field_{$id} = '" . $this->request[ 'field_' . $id ] . "'";
 					}
-					
-					$url[ $in ]		= "field_{$id}=" . $this->request[ 'field_' . $id ];
 				}
 			}
 		}
@@ -474,7 +476,7 @@ class public_members_list_view extends ipsCommand
 				$members[$id] = $_members[$id];
 			}
 		}
-		
+
 		$max = $_max['cnt'];
 
 		if( is_array($members) AND count($members) )
@@ -498,9 +500,6 @@ class public_members_list_view extends ipsCommand
 			}
 		}
 
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $the_members, 'memberListData' );
-
 		/* make sure URL doesn't contain empty params */
 		$_url = $url;
 		$url  = array();
diff --git a/upload/admin/applications/members/modules_public/messaging/contact.php b/upload/admin/applications/members/modules_public/messaging/contact.php
deleted file mode 100644
index ca93f871..00000000
--- a/upload/admin/applications/members/modules_public/messaging/contact.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Contact Member Functions
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
- * </pre>
- *
- * @author 		$Author $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Rev: 6925 $
- *
- */
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_members_messaging_contact extends ipsCommand
-{
-	/**
-	 * Temporary HTML output
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $output			= "";
-	
-	/**
-	 * Temporary navigation items
-	 *
-	 * @access	public
-	 * @var		array
-	 */
-	public $nav				= array();
-
-	/**
-	 * Temporary page title
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $page_title		= "";
-
-	/**
-	 * Error
-	 *
-	 * @access	private
-	 * @var		string
-	 */
-	private $int_error		= "";
-
-	/**
-	 * Extra info
-	 *
-	 * @access	private
-	 * @var		string
-	 */
-	private $int_extra		= "";
-	
-	/**
-	 * Class entry point
-	 *
-	 * @access	public
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		/* What to do? */
-        switch( $this->request['do'] )
-        {
-        	case '01':
-        	case '00':
-			case 'Mail':
-				$this->mailMember();
-			break;
-
-			case 'report':
-				if( $this->request['send'] != 1 )
-				{
-					$this->reportPostForm();
-				}
-				else
-				{
-					$this->reportPostSend();
-				}
-			break;
-			
-			default:
-				$this->registry->output->showError( 'contact_what_action', 1034, null, null, 404 );
-			break;
-		}
-		
-		/* Navigation */
-		foreach( $this->nav as $nav )
-		{
-			$this->registry->output->addNavigation( $nav[0], $nav[1] );	
-		}
-		
-		/* Output */
-		$this->registry->output->setTitle( $this->page_title . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->output->addContent( $this->output );
-		$this->registry->output->sendOutput();
-	}
-	
-	/**
-	 * Displays the report post form
-	 *
-	 * @access		public
-	 * @return		void
-	 * @deprecated	Just redirects to report center now
-	 */
-	public function reportPostForm()
-	{
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . "app=core&module=reports&rcom=post&tid={$this->request['t']}&pid={$this->request['p']}&st={$this->request['st']}" );
-	}
-	
-	/**
-	 * Sends the reported post
-	 *
-	 * @access		public
-	 * @return		void
-	 * @deprecated	Just redirects to report center now
-	 */
-	public function reportPostSend()
-	{
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . "app=core&module=reports&rcom=post&tid={$this->request['t']}&pid={$this->request['p']}&st={$this->request['st']}" );
-	}
-
-	/**
-	 * Handles the routines called by clicking on the "email" button
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function mailMember()
-	{
-		/* Load Language */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_emails' ), 'core' );
-
-		if( empty( $this->memberData['member_id'] ) )
-		{
-			ipsRegistry::getClass('output')->showError( 'members_only_mail', 10313, null, null, 403 );
-		}
-		
-		/* Check email permission */
-		if( ! $this->memberData['g_email_friend'] )
-		{
-			ipsRegistry::getClass('output')->showError( 'no_member_mail', 10314, null, null, 403 );
-		}
-		
-		if( $this->request['do'] == '01' )
-		{
-			$this->mailMemberSend();	
-		}
-		else
-		{			
-			$this->mailMemberForm();
-		}
-		
-	}
-	
-	/**
-	 * Displays the form for mailing a member
-	 *
-	 * @access	public
-	 * @param	string 		Errors
-	 * @param	string		Extra data
-	 * @return	void
-	 */
-	public function mailMemberForm( $errors="", $extra="" )
-	{
-		/* Check ID */
-		$id = intval( $this->request['MID'] );
-				
-		if( ! $id )
-		{
-			$this->registry->output->showError( 'mail_member_no_mid', 10315, null, null, 404 );
-		}
-		
-		/* Query member information */		
-		$member = IPSMember::load( $id );
-		
-		/* Make sure we have a valid user */
-		if( ! $member['member_id'] )
-		{
-			$this->registry->output->showError( 'mail_member_no_member', 10316, null, null, 404 );
-		}
-		
-		/* Check email privacy */
-		if( $member['hide_email'] == 1 )
-		{
-			$this->registry->output->showError( 'mail_member_private', 10317 );
-		}
-		
-		/* Show errors */
-		if ( $errors != "" )
-		{
-			$msg = $this->lang->words[$errors];
-			
-			if ( $extra != "" )
-			{
-				$msg = sprintf( $msg, $extra );
-			}
-			
-			$this->output .= $this->registry->output->getTemplate('emails')->errors( $msg );
-		}
-		
-		/* Output */
-		$this->output .= $this->settings['use_mail_form']
-					  ? $this->registry->output->getTemplate('emails')->sendMailForm(
-												  array(
-														  'NAME'   => $member['members_display_name'],
-														  'TO'     => $member['member_id'],
-														  'subject'=> $this->request['subject'],
-														  'content'=> stripslashes( htmlspecialchars( $_POST['message'] ) ),
-													   )
-											   )
-					  : $this->registry->output->getTemplate('emails')->show_address(
-												  array(
-														  'NAME'    => $member['members_display_name'],
-														  'ADDRESS' => $member['email'],
-													   )
-												 );
-												 
-		$this->page_title = $this->lang->words['member_address_title'];
-		$this->nav[]      = array( $this->lang->words['member_address_title'], '' );
-	}
-	
-	/**
-	 * Sends the email
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function mailMemberSend()
-	{
-		//-----------------------------------------
-		// Check form key first
-		//-----------------------------------------
-		
-		if ( $this->request['k'] != $this->member->form_hash )
-		{
-			$this->registry->getClass('output')->showError( 'no_permission', 20313 );
-		}
-        
-		$this->request['to'] = intval( $this->request['to'] );
-	
-		if( $this->request['to'] == 0 )
-		{
-			$this->registry->output->showError( 'mail_member_no_mid', 10318, null, null, 404 );
-		}
-		
-		/* Query Member */		
-		$member = IPSMember::load( $this->request['to'] );
-		
-
-		/* Check for schtuff */
-		if( ! $member['member_id'] )
-		{
-			$this->registry->output->showError( 'mail_member_no_member', 10319, null, null, 404 );
-		}
-		
-		/* Check email privacy */
-		if( $member['hide_email'] == 1 )
-		{
-			$this->registry->output->showError( 'mail_member_private', 10320, true );
-		}
-		
-		/* Check for blanks */
-		$check_array = array ( 
-							   'message'   =>  'no_message',
-							   'subject'   =>  'no_subject'
-							 );
-						 
-		foreach( $check_array as $input => $msg )
-		{
-			if( empty( $this->request[$input] ) )
-			{
-				$this->request['MID'] = $this->request['to'];
-				$this->mailMemberForm( $msg );
-				return;
-			}
-		}
-
-		/* Check for spam / delays */
-		$email_check = $this->_allowToMail( $this->memberData['member_id'], $this->memberData['g_email_limit'] );
-		
-		if( $email_check != TRUE )
-		{
-			$this->request['MID'] = $this->request['to'];
-			$this->mailMemberForm( $this->int_error, $this->int_extra );
-			return;
-		}
-		
-		/**
-		 * No check for injected headers in the message
-		 * @link	http://forums.invisionpower.com/index.php?app=tracker&showissue=13098
-		 */
-		if( preg_match("/(content-type:|content-transfer-encoding:|content-disposition:)/i", $this->request['message'] ) )
-		{
-			$this->registry->output->showError( 'bad_email_message', 5021, true );
-		}
-
-		/* Send the email */
-		IPSText::getTextClass( 'email' )->getTemplate( 'email_member' );
-			
-		IPSText::getTextClass( 'email' )->buildMessage( array(
-															'MESSAGE'     => str_replace( "<br>", "\n", str_replace( "\r", "", $this->request['message'] ) ),
-															'MEMBER_NAME' => $member['members_display_name'],
-															'FROM_NAME'   => $this->memberData['members_display_name']
-													)	);
-									
-		IPSText::getTextClass( 'email' )->subject = $this->request['subject'];
-		IPSText::getTextClass( 'email' )->to      = $member['email'];
-		IPSText::getTextClass( 'email' )->from    = $this->memberData['email'];
-		IPSText::getTextClass( 'email' )->sendMail();
-		
-		/* Store email in the database */
-		$this->DB->insert( 'email_logs', array( 
-											'email_subject'      => $this->request['subject'],
-											'email_content'      => $this->request['message'],
-											'email_date'         => time(),
-											'from_member_id'     => $this->memberData['member_id'],
-											'from_email_address' => $this->memberData['email'],
-											'from_ip_address'	 => $this->member->ip_address,
-											'to_member_id'		 => $member['member_id'],
-											'to_email_address'	 => $member['email'],
-					  )                   );
-
-		$this->output  = $this->registry->output->getTemplate('emails')->sentScreen( $member['members_display_name'] );		
-
-		$this->page_title = $this->lang->words['email_sent'];
-		$this->nav[]      = array( $this->lang->words['email_sent'], '' );
-	}
-	
-	/**
-	 * Check Flood Limit
-	 *
-	 * @access	private
-	 * @param	integer	$member_id
-	 * @param	string	$email_limit
-	 * @return	bool
-	 **/
-	private function _allowToMail( $member_id, $email_limit )
-	{
-		$member_id = intval( $member_id );
-		
-		if( ! $member_id )
-		{
-			$this->int_error = 'gen_error';
-			return FALSE;
-		}
-		
-		list( $limit, $flood ) = explode( ':', $email_limit );
-		
-		if ( ! $limit and ! $flood )
-		{
-			return TRUE;
-		}
-		
-		//-----------------------------------------
-		// Get some stuff from the DB!
-		// 1) FLOOD?
-		//-----------------------------------------
-		
-		if( $flood )
-		{
-			$this->DB->build( array( 
-											'select' => '*',
-											'from'   => 'email_logs',
-											'where'  => "from_member_id=$member_id",
-											'order'  => 'email_date DESC',
-											'limit'  => array( 0, 1 ) ) );
-			$this->DB->execute();
-		
-			$last_email = $this->DB->fetch();
-
-			if( $last_email['email_date'] + ( $flood * 60 ) > time() )
-			{
-				$this->int_error = 'exceeded_flood';
-				$this->int_extra = $flood;
-				return FALSE;
-			}
-		}
-		
-		if( $limit )
-		{
-			$time_range = time() - 86400;
-			
-			$this->DB->build( array( 
-											'select' => 'count(email_id) as cnt',
-											'from'   => 'email_logs',
-											'where'  => "from_member_id={$member_id} AND email_date > {$time_range}",
-								 )      );
-			$this->DB->execute();
-			
-			$quota_sent = $this->DB->fetch();
-			
-			if( $quota_sent['cnt'] + 1 > $limit )
-			{
-				$this->int_error = 'exceeded_quota';
-				$this->int_extra = $limit;
-				return FALSE;
-			}
-		}
-		
-		return TRUE;
-        		
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/messaging/defaultSection.php b/upload/admin/applications/members/modules_public/messaging/defaultSection.php
index 37f36e94..4b2e6a50 100644
--- a/upload/admin/applications/members/modules_public/messaging/defaultSection.php
+++ b/upload/admin/applications/members/modules_public/messaging/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default messaging section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'messaging' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'view';
\ No newline at end of file
+$DEFAULT_SECTION = 'view';
diff --git a/upload/admin/applications/members/modules_public/messaging/index.html b/upload/admin/applications/members/modules_public/messaging/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/messaging/index.html
+++ b/upload/admin/applications/members/modules_public/messaging/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/messaging/markasread.php b/upload/admin/applications/members/modules_public/messaging/markasread.php
index ddf6690e..6382ca63 100644
--- a/upload/admin/applications/members/modules_public/messaging/markasread.php
+++ b/upload/admin/applications/members/modules_public/messaging/markasread.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Mark a private message as read
- * Last Updated: $Date: 2010-07-01 18:13:46 -0400 (Thu, 01 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Brandon Farber
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Forums
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thurs 7th Jan 2010
- * @version		$Rev: 6596 $
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_messaging_markasread extends ipsCommand
 	/**
 	 * Main execution point
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -55,9 +54,8 @@ class public_members_messaging_markasread extends ipsCommand
 	/**
 	 * All done, return
 	 *
-	 * @access	public
 	 * @param	int		AJAX result
-	 * @return	void
+	 * @return	@e void
 	 */
  	public function endReturn( $_ajax )
  	{
diff --git a/upload/admin/applications/members/modules_public/messaging/search.php b/upload/admin/applications/members/modules_public/messaging/search.php
index ddef8445..5f534cf8 100644
--- a/upload/admin/applications/members/modules_public/messaging/search.php
+++ b/upload/admin/applications/members/modules_public/messaging/search.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Online list
- * Last Updated: $Date: 2010-07-01 18:13:46 -0400 (Thu, 01 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 6596 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,23 +31,20 @@ class public_members_messaging_search extends ipsCommand
 	/**
 	 * Page title
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_title;
+	protected $_title;
 	
 	/**
 	 * Navigation entries
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_navigation;
+	protected $_navigation;
 	
 	/**
 	 * Messenger library
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $messengerFunctions;
@@ -55,7 +52,6 @@ class public_members_messaging_search extends ipsCommand
 	/**
 	 * Error string
 	 *
-	 * @access	private
 	 * @var		string
 	 */
 	public $_errorString = '';
@@ -63,9 +59,8 @@ class public_members_messaging_search extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -90,7 +85,7 @@ class public_members_messaging_search extends ipsCommand
 		
 		if( ! IPSLib::moduleIsEnabled( 'messaging', 'members' ) )
 		{
-			$this->registry->getClass('output')->showError( 'messenger_disabled', 10227, null, null, 404 );
+			$this->registry->getClass('output')->showError( 'messenger_disabled', 10227.1, null, null, 404 );
 		}		
 
     	//-----------------------------------------
@@ -141,26 +136,23 @@ class public_members_messaging_search extends ipsCommand
 
         $this->registry->output->sendOutput();
  	}
-	
 
-	
 	/**
 	 * Search. Do it.
 	 *
-	 * @access	private
 	 * @param	string		Any error text
 	 * @return	string		returns HTML
 	 */
-	private function _search( $error='' )
+	protected function _search( $error='' )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$start     		   = intval($this->request['st']);
-		$p_end     		   = $this->settings['show_max_msg_list'] > 0 ? $this->settings['show_max_msg_list'] : 50;
-		$searchFor_TAINTED = IPSText::parseCleanValue( urldecode( $_REQUEST['searchFor'] ) );
-		$searchIn		   = '';
+		$start				= intval($this->request['st']);
+		$p_end				= $this->settings['show_max_msg_list'] > 0 ? $this->settings['show_max_msg_list'] : 50;
+		$searchFor_TAINTED	= IPSText::parseCleanValue( urldecode( $_REQUEST['searchFor'] ) );
+		$searchIn			= '';
  		
 		/* Got an error? */
 		if ( $error )
diff --git a/upload/admin/applications/members/modules_public/messaging/send.php b/upload/admin/applications/members/modules_public/messaging/send.php
index 4027bdb9..d73139b0 100644
--- a/upload/admin/applications/members/modules_public/messaging/send.php
+++ b/upload/admin/applications/members/modules_public/messaging/send.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Online list
- * Last Updated: $Date: 2010-10-28 08:16:00 -0400 (Thu, 28 Oct 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 7061 $
+ * @version		$Revision: 9483 $
  *
  */
 
@@ -31,7 +31,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Page title
 	 *
-	 * @access	protected
 	 * @var		string
 	 */
 	protected $_title;
@@ -39,7 +38,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Navigation
 	 *
-	 * @access	protected
 	 * @var		array[ 0 => [ title, url ] ]
 	 */
 	protected $_navigation;
@@ -47,7 +45,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Post Key
 	 *
-	 * @access protected
 	 * @var		string		Md5 key
 	 */
 	protected $_postKey;
@@ -55,7 +52,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Flag: Can we upload?
 	 *
-	 * @access protected
 	 * @var		int		1 or 0
 	 */
 	protected $_canUpload;
@@ -63,7 +59,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Error string
 	 *
-	 * @access	protected
 	 * @var		string
 	 */
 	protected $_errorString = '';
@@ -71,9 +66,8 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -106,13 +100,12 @@ class public_members_messaging_send extends ipsCommand
 		//-----------------------------------------
 		
 		IPSText::resetTextClass('bbcode');
-		IPSText::resetTextClass('editor');
 		
 		//-----------------------------------------
 		// Load lang file
 		//-----------------------------------------
 		
-		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_error", "public_editors" ), 'core' );
+		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_error" ), 'core' );
 		
 		//-----------------------------------------
 		// Post Key
@@ -177,7 +170,7 @@ class public_members_messaging_send extends ipsCommand
     	//-----------------------------------------
     	// What to do?
     	//-----------------------------------------
-    	
+
     	switch( $this->request['do'] )
     	{
 			default:
@@ -227,8 +220,7 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Deletes a reply
 	 *
-	 * @access 	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _deleteReply()
 	{
@@ -277,7 +269,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Sends a reply
 	 *
-	 * @access 	protected
 	 * @return	mixed	void, or HTML form
 	 */
 	protected function _sendReply()
@@ -293,7 +284,7 @@ class public_members_messaging_send extends ipsCommand
  		//-----------------------------------------
  		// Error checking
  		//-----------------------------------------
- 		
+
  		if ( IPSText::mbstrlen( trim( IPSText::br2nl( $_POST['msgContent'] ) ) ) < 2 )
  		{
  			return $this->_showForm( 'reply', $this->lang->words['err_no_msg'] );
@@ -326,6 +317,7 @@ class public_members_messaging_send extends ipsCommand
 			{
 				$_msgString = $this->lang->words[ 'err_' . $msg ];
 				$_msgString = str_replace( '#NAMES#'   , implode( ",", $this->messengerFunctions->exceptionData ), $_msgString );
+				$_msgString = str_replace( '#LIMIT#'   , $this->memberData['g_max_mass_pm'], $_msgString );
 				$_msgString = str_replace( '#TONAME#'  , $this->messengerFunctions->exceptionData[0], $_msgString );
 				$_msgString = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $_msgString );
 			}
@@ -347,7 +339,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Sends a reply
 	 *
-	 * @access 	protected
 	 * @return	mixed	void, or HTML form
 	 */
 	protected function _sendEdit()
@@ -397,6 +388,7 @@ class public_members_messaging_send extends ipsCommand
 			{
 				$_msgString = $this->lang->words[ 'err_' . $msg ];
 				$_msgString = str_replace( '#NAMES#'   , implode( ",", $this->messengerFunctions->exceptionData ), $_msgString );
+				$_msgString = str_replace( '#LIMIT#'   , $this->memberData['g_max_mass_pm'], $_msgString );
 				$_msgString = str_replace( '#TONAME#'  , $this->messengerFunctions->exceptionData[0], $_msgString );
 				$_msgString = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $_msgString );
 			}
@@ -418,8 +410,7 @@ class public_members_messaging_send extends ipsCommand
  	/**
 	 * Sends the PM
 	 *
-	 * @access 	protected
-	 * @return	void, or HTML form
+	 * @return	@e void, or HTML form
 	 */
 	protected function _sendNewPersonalTopic()
 	{
@@ -452,7 +443,7 @@ class public_members_messaging_send extends ipsCommand
  			return $this->_showNewTopicForm( $this->lang->words['err_no_title'] );
  		}
  		
- 		if ( IPSText::mbstrlen( trim( IPSText::br2nl( $_POST['Post'] ) ) ) < 3 )
+ 		if ( IPSText::mbstrlen( trim( IPSText::br2nl( $msgContent ) ) ) < 3 )
  		{
  			return $this->_showNewTopicForm( $this->lang->words['err_no_msg'] );
  		}
@@ -511,7 +502,7 @@ class public_members_messaging_send extends ipsCommand
 		catch( Exception $error )
 		{
 			$msg = $error->getMessage();
-			
+
 			if ( strstr( $msg, 'BBCODE_' ) )
 			{
 				$msg = str_replace( 'BBCODE_', '', $msg );
@@ -522,6 +513,7 @@ class public_members_messaging_send extends ipsCommand
 			{
 				$_msgString = $this->lang->words[ 'err_' . $msg ];
 				$_msgString = str_replace( '#NAMES#'   , implode( ",", $this->messengerFunctions->exceptionData ), $_msgString );
+				$_msgString = str_replace( '#LIMIT#'   , $this->memberData['g_max_mass_pm'], $_msgString );
 				$_msgString = str_replace( '#TONAME#'  , $toMember['members_display_name']    , $_msgString );
 				$_msgString = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $_msgString );
 				$_msgString = str_replace( '#DATE#'    , $this->messengerFunctions->exceptionData[0], $_msgString );
@@ -533,7 +525,7 @@ class public_members_messaging_send extends ipsCommand
 
 			return $this->_showNewTopicForm( $_msgString );
 		}
-		
+
 		//-----------------------------------------
 		// Swap and serve...
 		//-----------------------------------------
@@ -554,7 +546,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Show PM form
 	 *
-	 * @access	protected
 	 * @param	string 		Type of form (edit / reply)
 	 * @param	string 		Error message
 	 * @return	string		returns HTML
@@ -598,6 +589,14 @@ class public_members_messaging_send extends ipsCommand
 			$this->registry->getClass('output')->showError( 'messenger_no_msgid', 10229, null, null, 403 );
 		}
 		
+		//-----------------------------------------
+		// Load editor
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
+		$_editor->setAllowHtml( $this->memberData['g_dohtml'] );
+		
 		//-----------------------------------------
 		// Got a message ID?
 		//-----------------------------------------
@@ -611,45 +610,29 @@ class public_members_messaging_send extends ipsCommand
 				if ( $type == 'reply' )
 				{
 					/* We're quoting a post... */
-					if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
+					if ( $_editor->getRteEnabled() )
 					{
-						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']<br />{$msgData['msg_post']}".'[/quote]'."<br /><br /><br />";
+						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']<br />{$msgData['msg_post']}".'[/quote]'."<br />";
 					}
 					else
 					{
-						IPSText::getTextClass('bbcode')->parse_html		= $this->settings['msg_allow_html'];
+						IPSText::getTextClass('bbcode')->parse_html		= $this->memberData['g_dohtml'];
 						IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
 						IPSText::getTextClass('bbcode')->parse_smilies	= 1;
-						IPSText::getTextClass('bbcode')->parse_bbcode	= $this->settings['msg_allow_code'];
+						IPSText::getTextClass('bbcode')->parse_bbcode	= 1;
 						IPSText::getTextClass('bbcode')->parsing_section = 'pms';
 
 						$msgData['msg_post'] = IPSText::getTextClass('bbcode')->preEditParse( $msgData['msg_post'] );
 						
-						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']\n{$msgData['msg_post']}".'[/quote]'."\n\n\n";
+						$displayData['message'] = "[quote name='".IPSText::getTextClass( 'bbcode' )->makeQuoteSafe($msgData['members_display_name'])."' timestamp='" . $msgData['msg_date'] . "']\n{$msgData['msg_post']}".'[/quote]'."\n";
 					}
 				}
 				else if ( $type == 'edit' )
 				{
-					if ( IPSText::getTextClass('editor')->method == 'rte' )
-					{
-						IPSText::getTextClass('bbcode')->parse_wordwrap	= 0;
-						IPSText::getTextClass('bbcode')->parse_html		= 0;
-
-						$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $msgData['msg_post'] );
+					/* Reset post key */
+					$this->_postKey = $msgData['msg_post_key'];
 						
-						/* Reset post key */
-						$this->_postKey = $msgData['msg_post_key'];
-					}
-					else
-					{
-						IPSText::getTextClass('bbcode')->parse_html		= $this->settings['msg_allow_html'];
-						IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
-						IPSText::getTextClass('bbcode')->parse_smilies	= 1;
-						IPSText::getTextClass('bbcode')->parse_bbcode	= $this->settings['msg_allow_code'];
-						IPSText::getTextClass('bbcode')->parsing_section = 'pms';
-
-						$displayData['message'] = IPSText::getTextClass('bbcode')->preEditParse( $msgData['msg_post'] );
-					}
+					$displayData['message'] = $msgData['msg_post'];
 				}
 			}
 		}
@@ -657,23 +640,23 @@ class public_members_messaging_send extends ipsCommand
     	//-----------------------------------------
     	// Previewing...
     	//-----------------------------------------
-    	
+
     	if ( $preview )
     	{
 			/* Grab language for attachment previews */
 			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
 			
-    		IPSText::getTextClass('bbcode')->parse_html					= $this->settings['msg_allow_html'];
+    		IPSText::getTextClass('bbcode')->parse_html					= $this->memberData['g_dohtml'];
 			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
 			IPSText::getTextClass('bbcode')->parse_smilies				= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings['msg_allow_code'];
+			IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
 			IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
 			
 			$this->settings['max_emos'] = 0;
 			
-			$msg = IPSText::getTextClass('editor')->processRawPost( 'Post-NS' );
+			$msg = $_editor->process( $_POST['Post-NS'] );
 			$msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $msg ) );
 			
 			if ( ! is_object( $this->class_attach ) )
@@ -725,27 +708,10 @@ class public_members_messaging_send extends ipsCommand
  		if ( $preview )
  		{ 
  			$displayData['message'] = ( $displayData['message'] ) ? $displayData['message'] : $_POST['Post-NS'];
- 		}
-
- 		//-----------------------------------------
- 		// Is this RTE? If so, convert BBCode
- 		//-----------------------------------------
+ 		}	
  		
- 		if ( IPSText::getTextClass('editor')->method == 'rte' AND $displayData['message'] )
- 		{
-			if ( $preview )
-			{
-				$displayData['message'] = stripslashes( $displayData['message'] );
-			}
-			
- 			$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $displayData['message'] );
- 		}
- 		else if ( $displayData['message'] )
- 		{ 
- 			// Not needed as is handled in above $type == 'edit' block
- 		}
-		
-		$displayData['editor'] = IPSText::getTextClass('editor')->showEditor( $displayData['message'], 'msgContent' );
+ 		$_editor->setContent( $displayData['message'] );
+ 		$displayData['editor'] = $_editor->show( 'msgContent', array( 'height' => 350 ) );
 		
 		//-----------------------------------------
 		// More Data...
@@ -792,7 +758,6 @@ class public_members_messaging_send extends ipsCommand
 	/**
 	 * Show PM form
 	 *
-	 * @access	protected
 	 * @param	string 		Error message
 	 * @return	string		returns HTML
 	 */
@@ -829,6 +794,14 @@ class public_members_messaging_send extends ipsCommand
  		$_POST['Post-NS']	= isset($_POST['Post']) ? $_POST['Post'] : '';
  		$_POST['Post']		= IPSText::raw2form( isset($_POST['Post']) ? $_POST['Post'] : '' );
 
+		//-----------------------------------------
+		// Load editor
+		//-----------------------------------------
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
+		$_editor->setAllowHtml( $this->memberData['g_dohtml'] );
+
     	//-----------------------------------------
     	// Preview post?
     	//-----------------------------------------
@@ -838,10 +811,10 @@ class public_members_messaging_send extends ipsCommand
 			/* Grab language for attachment previews */
 			$this->registry->getClass( 'class_localization')->loadLanguageFile( array( "public_topic" ), 'forums' );
 	
-    		IPSText::getTextClass('bbcode')->parse_html					= $this->settings['msg_allow_html'];
+    		IPSText::getTextClass('bbcode')->parse_html					= $this->memberData['g_dohtml'];
 			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
 			IPSText::getTextClass('bbcode')->parse_smilies				= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings['msg_allow_code'];
+			IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
 			IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
 			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
@@ -854,7 +827,7 @@ class public_members_messaging_send extends ipsCommand
 			}
 			else
 			{
-				$old_msg	= IPSText::getTextClass('editor')->processRawPost( 'Post-NS' );
+				$old_msg	= $_editor->process( $_POST['Post'] );
 			}
 			
 			$old_msg = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $old_msg ) );
@@ -955,13 +928,13 @@ class public_members_messaging_send extends ipsCommand
 					$_msg_id                = $draftTopic['msg_id'];
 					$this->_postKey         = $draftTopic['msg_post_key'];
 					
-					IPSText::getTextClass('bbcode')->parse_html		= $this->settings['msg_allow_html'];
+					IPSText::getTextClass('bbcode')->parse_html		= $this->memberData['g_dohtml'];
 					IPSText::getTextClass('bbcode')->parse_nl2br	= 1;
 					IPSText::getTextClass('bbcode')->parse_smilies	= 1;
-					IPSText::getTextClass('bbcode')->parse_bbcode	= $this->settings['msg_allow_code'];
+					IPSText::getTextClass('bbcode')->parse_bbcode	= 1;
 					IPSText::getTextClass('bbcode')->parsing_section = 'pms';
 					
-					if ( IPSText::getTextClass('editor')->method == 'rte' )
+					if ( $_editor->getRteEnabled() )
 					{
 						$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $draftTopic['msg_post'] );	
 					}
@@ -1004,32 +977,10 @@ class public_members_messaging_send extends ipsCommand
 				}
 			}
 		}
-		
-		//-----------------------------------------
- 		// Remove side panel
- 		//-----------------------------------------
- 		
- 		IPSText::getTextClass('editor')->remove_side_panel = 1;
 
- 		//-----------------------------------------
- 		// PM returns
- 		//-----------------------------------------
+ 		$_editor->setContent( $displayData['message'] );
  		
-		if ( IPSText::getTextClass('editor')->method == 'rte' AND $displayData['message'] )
- 		{
-			if ( count( $errors ) or $preview )
-			{
-				$displayData['message'] = IPSText::stripslashes( $displayData['message'] );
-			}
-			
- 			$displayData['message'] = IPSText::getTextClass('bbcode')->convertForRTE( $displayData['message'] );
- 		}
- 		else if ( $displayData['message'] )
- 		{
- 			$displayData['message'] = IPSText::getTextClass('bbcode')->preEditParse( $displayData['message'] );
- 		}
-		
-		$displayData['editor'] = IPSText::getTextClass('editor')->showEditor( $displayData['message'], 'Post' );
+ 		$displayData['editor'] = $_editor->show( 'Post', array( 'height' => 350 ) );
 		
 		//-----------------------------------------
 		// More Data...
diff --git a/upload/admin/applications/members/modules_public/messaging/view.php b/upload/admin/applications/members/modules_public/messaging/view.php
index 64f342ca..e94d696c 100644
--- a/upload/admin/applications/members/modules_public/messaging/view.php
+++ b/upload/admin/applications/members/modules_public/messaging/view.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Online list
- * Last Updated: $Date: 2010-09-14 05:48:02 -0400 (Tue, 14 Sep 2010) $
+ * Last Updated: $Date: 2011-07-11 21:16:52 -0400 (Mon, 11 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 6865 $
+ * @version		$Revision: 9201 $
  *
  */
 
@@ -31,31 +31,27 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Page title
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_title;
+	protected $_title;
 	
 	/**
 	 * Navigation
 	 *
-	 * @access	private
 	 * @var		array[ 0 => [ title, url ] ]
 	 */
-	private $_navigation;
+	protected $_navigation;
 	
 	/**
 	 * Folder totals
 	 *
-	 * @access	private
 	 * @var		mixed
 	 */
-	private $_totals;
+	protected $_totals;
 	
 	/**
 	 * Contains topic participant data
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $_topicParticipants;
@@ -63,7 +59,6 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Messenger library
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $messengerFunctions;
@@ -71,7 +66,6 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Error string
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $_errorString = '';
@@ -79,9 +73,8 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -94,7 +87,7 @@ class public_members_messaging_view extends ipsCommand
 			$this->registry->getClass('output')->showError( 'messenger_disabled', 10226, null, null, 403 );
 		}
 		
-		if ( $this->memberData['members_disable_pm'] )
+		if ( $this->memberData['members_disable_pm'] == 2)
 		{
 			$this->registry->getClass('output')->showError( 'messenger_disabled', 10227, null, null, 403 );
 		}
@@ -108,6 +101,9 @@ class public_members_messaging_view extends ipsCommand
 		{
 			$this->registry->getClass('output')->showError( 'messenger_disabled', 10227, null, null, 404 );
 		}
+		
+		/* Print CSS */
+		$this->registry->output->addToDocumentHead( 'raw', "<link rel='stylesheet' type='text/css' title='Main' media='print' href='{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_print.css' />" );
 
     	//-----------------------------------------
     	// Language
@@ -133,6 +129,11 @@ class public_members_messaging_view extends ipsCommand
 			$this->messengerFunctions->addFolderFilter( $this->request['folderFilter'] );
 		}
 		
+		/* force disabled messenger into default */
+		if ( $this->memberData['members_disable_pm'] && $this->request['do'] != 'enableMessenger' )
+		{
+			$this->request['do'] = 'inbox';
+		}
     	//-----------------------------------------
     	// What to do?
     	//-----------------------------------------
@@ -175,6 +176,12 @@ class public_members_messaging_view extends ipsCommand
 			case 'toggleNotifications':
 				$html = $this->_toggleNotifications();
 			break;
+			case 'enableMessenger':
+				$this->_enableMessenger();
+			break;
+			case 'disableMessenger':
+				$this->_disableMessenger();
+			break;
     	}
     	
     	//-----------------------------------------
@@ -197,14 +204,56 @@ class public_members_messaging_view extends ipsCommand
         $this->registry->output->sendOutput();
  	}
 	
+ 	/**
+ 	 * Enable messenger
+ 	 */
+	protected function _enableMessenger()
+	{
+		$authKey = $this->request['authKey'];
+		
+		/* Auth key */
+		if ( $this->request['authKey'] != $this->member->form_hash )
+		{
+			$this->registry->getClass('output')->showError( 'messenger_bad_key', 2024, null, null, 403 );
+		}
+		
+		/* Toggle */
+		if ( $this->memberData['members_disable_pm'] != 2 )
+		{
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'members_disable_pm' => 0 ) ) );
+		}
+		
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=members&amp;module=messaging' );
+	}
+	
+	/**
+ 	 * Enable messenger
+ 	 */
+	protected function _disableMessenger()
+	{
+		$authKey = $this->request['authKey'];
+		
+		/* Auth key */
+		if ( $this->request['authKey'] != $this->member->form_hash )
+		{
+			$this->registry->getClass('output')->showError( 'messenger_bad_key', 2024, null, null, 403 );
+		}
+		
+		/* Toggle */
+		if ( $this->memberData['members_disable_pm'] != 2 )
+		{
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'members_disable_pm' => 1 ) ) );
+		}
+		
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=members&amp;module=messaging' );
+	}
 	
 	/**
 	 * Block a participant
 	 *
-	 * @access 	private
 	 * @return	mixed	void, or HTML
 	 */
-	private function _toggleNotifications()
+	protected function _toggleNotifications()
 	{
 		//-----------------------------------------
 		// INIT
@@ -244,10 +293,9 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Block a participant
 	 *
-	 * @access 	private
 	 * @return	mixed	void, or HTML
 	 */
-	private function _blockParticipant()
+	protected function _blockParticipant()
 	{
 		//-----------------------------------------
 		// INIT
@@ -288,10 +336,9 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Leave a conversation (non topic starter)
 	 *
-	 * @access 	private
 	 * @return	mixed	void, or HTML
 	 */
-	private function _unblockParticipant()
+	protected function _unblockParticipant()
 	{
 		//-----------------------------------------
 		// INIT
@@ -332,10 +379,9 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Leave a conversation (non topic starter)
 	 *
-	 * @access 	private
 	 * @return	mixed	void, or HTML
 	 */
-	private function _deleteConversation()
+	protected function _deleteConversation()
 	{
 		//-----------------------------------------
 		// INIT
@@ -376,10 +422,9 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Deletes a reply
 	 *
-	 * @access 	private
 	 * @return	mixed	void, or HTML
 	 */
-	private function _addParticipants()
+	protected function _addParticipants()
 	{
 		//-----------------------------------------
 		// INIT
@@ -439,6 +484,7 @@ class public_members_messaging_view extends ipsCommand
 				$_msgString = str_replace( '#NAMES#'   , implode( ",", $this->messengerFunctions->exceptionData ), $_msgString );
 				$_msgString = str_replace( '#TONAME#'  , implode( ",", $inviteUsers), $_msgString );
 				$_msgString = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $_msgString );
+				$_msgString = str_replace( '#LIMIT#'   , $this->memberData['g_max_mass_pm'], $_msgString );
 			}
 			else
 			{
@@ -454,7 +500,6 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Redirects the user to the correct page in a conversation based on the incoming msg ID
 	 *
-	 * @access	protected	
 	 * @return	string		returns HTML
 	 */
 	protected function _findMessage()
@@ -512,10 +557,9 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Multi Files Messages
 	 *
-	 * @access	private
 	 * @return	string		returns HTML
 	 */
-	private function _multiFile()
+	protected function _multiFile()
 	{
 		//-----------------------------------------
 		// INIT
@@ -620,7 +664,6 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Show a message
 	 *
-	 * @access	public
 	 * @return	string		returns HTML
 	 */
 	public function showConversation()
@@ -668,7 +711,16 @@ class public_members_messaging_view extends ipsCommand
 		// Add to the topic data...
 		//-----------------------------------------
 		
-		$conversationData['topicData']['_canReply'] = $this->messengerFunctions->canReplyTopic( $this->memberData['member_id'], $conversationData['topicData'], $conversationData['memberData'] );
+		$conversationData['topicData']['_canReply']		= $this->messengerFunctions->canReplyTopic( $this->memberData['member_id'], $conversationData['topicData'], $conversationData['memberData'] );
+		
+		//-----------------------------------------
+		// Check report permissions
+		//-----------------------------------------
+		
+		$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/reportLibrary.php', 'reportLibrary', 'core' );
+		$reports		= new $classToLoad( $this->registry );
+		
+		$conversationData['topicData']['_canReport']	= $reports->canReport( 'messages' );
  		
 		//-----------------------------------------
 		// Pages
@@ -677,6 +729,7 @@ class public_members_messaging_view extends ipsCommand
 		$conversationData['topicData']['_pages'] = $this->registry->output->generatePagination( array( 'totalItems'         => $conversationData['topicData']['mt_replies'] + 1,
 														  						 					   'itemsPerPage'       => $end,
 																			  						   'currentStartValue'  => $start,
+																									   'showNumbers'		=> false,
 																			  						   'baseUrl'            => "app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID=".$topicID."&amp;sort=".$this->request['sort'] ) );
 
 		//-----------------------------------------
@@ -704,11 +757,10 @@ class public_members_messaging_view extends ipsCommand
 	/**
 	 * Show the folder list
 	 *
-	 * @access	private
 	 * @param	string		Any error text
 	 * @return	string		returns HTML
 	 */
-	private function _showFolder( $error='' )
+	protected function _showFolder( $error='' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -761,6 +813,7 @@ class public_members_messaging_view extends ipsCommand
  		$pages = $this->registry->getClass('output')->generatePagination( array( 'totalItems'         => $totalMsg,
 														  						 'itemsPerPage'       => $p_end,
 														  						 'currentStartValue'  => $start,
+ 																				 'showNumbers'		  => false,
 														  						 'baseUrl'            => $_baseURL ) );
  		
 		//-----------------------------------------
diff --git a/upload/admin/applications/members/modules_public/online/defaultSection.php b/upload/admin/applications/members/modules_public/online/defaultSection.php
index 6f65c2fb..06f6b6ae 100644
--- a/upload/admin/applications/members/modules_public/online/defaultSection.php
+++ b/upload/admin/applications/members/modules_public/online/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default online section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'online' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'online';
\ No newline at end of file
+$DEFAULT_SECTION = 'online';
diff --git a/upload/admin/applications/members/modules_public/online/index.html b/upload/admin/applications/members/modules_public/online/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/online/index.html
+++ b/upload/admin/applications/members/modules_public/online/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/online/online.php b/upload/admin/applications/members/modules_public/online/online.php
index cc22bf6c..addb0c38 100644
--- a/upload/admin/applications/members/modules_public/online/online.php
+++ b/upload/admin/applications/members/modules_public/online/online.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Online list
- * Last Updated: $Date: 2010-10-21 09:25:51 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 7009 $
+ * @version		$Revision: 9373 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -50,7 +50,7 @@ class public_members_online_online extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
     {
@@ -87,8 +87,8 @@ class public_members_online_online extends ipsCommand
     	//-----------------------------------------
     	
     	$this->registry->output->addContent( $this->output );
-    	$this->registry->output->setTitle( $this->lang->words['page_title'] . ' - ' . ipsRegistry::$settings['board_name']);
-    	$this->registry->output->addNavigation( $this->lang->words['page_title'], '' );
+    	$this->registry->output->setTitle( $this->lang->words['online_page_title'] . ' - ' . ipsRegistry::$settings['board_name']);
+    	$this->registry->output->addNavigation( $this->lang->words['online_page_title'], '' );
         $this->registry->output->sendOutput();
  	}
  	
@@ -96,7 +96,7 @@ class public_members_online_online extends ipsCommand
 	/**
 	 * Show the online list
 	 *
-	 * @return	void		[Stores HTML in $this->output]
+	 * @return	@e void		[Stores HTML in $this->output]
 	 */
 	protected function _listAll()
 	{
@@ -106,6 +106,7 @@ class public_members_online_online extends ipsCommand
 		
 		$this->first	= intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
 		$final			= array();
+		$_errors		= array();
 		$modules		= array();
 		$memberIDs		= array();
 		
@@ -142,19 +143,16 @@ class public_members_online_online extends ipsCommand
 				break;
 		}
 		
-		if ( $this->settings['spider_anon'] OR ! $this->settings['spider_active'] )
+		if ( ! $this->settings['spider_active'] AND ! $this->memberData['g_access_cp'] )
 		{
-			if ( ! $this->settings['spider_active'] OR ! $this->memberData['g_access_cp'] )
-			{
-				$wheres[]	= $this->DB->buildRight( 'id', 8 ) . " != '_session'";
-			}
+			$wheres[]	= $this->DB->buildRight( 'id', 8 ) . " != '_session'";
 		}
 		
-		if ( ! $this->settings['disable_anonymous'] AND ! $this->memberData['g_access_cp'] OR $this->settings['disable_admin_anon'] )
+		if ( ! $this->settings['disable_anonymous'] AND !$this->memberData['g_access_cp'] )
 		{
 			$wheres[]	= "login_type != 1";
 		}
-		
+
 		//-----------------------------------------
 		// Grab all the current sessions.
 		//-----------------------------------------
@@ -186,7 +184,7 @@ class public_members_online_online extends ipsCommand
 			{
 				$r['is_bot']	= 1;
 			}
-			
+
 			$r['where_line']	= '';
 			$r['where_link']	= '';
 			
@@ -211,20 +209,30 @@ class public_members_online_online extends ipsCommand
 				$memberIDs[] = $r['member_id'];
 			}
 			
-			$final[ $r['id'] ] = $r;
+			//-----------------------------------------
+			// Don't parse if in an error
+			//-----------------------------------------
+			
+			if( $r['in_error'] )
+			{
+				$_errors[ $r['id'] ]	= $r;
+			}
+			else
+			{
+				$final[ $r['id'] ]		= $r;
+			}
 
 			//-----------------------------------------
 			// Module?
 			//-----------------------------------------
 
 			$modules[ $r['current_section'] ]  = array( 'app' => $r['current_appcomponent'] );
-
 		}
 		
-		$links	= $this->registry->output->generatePagination(  array( 'totalItems'  	    => $max,
+		$links	= $this->registry->output->generatePagination(  array( 'totalItems'			=> $max,
 																	   'itemsPerPage'		=> $this->perpage,
 																	   'currentStartValue'	=> $this->first,
-																	   'baseUrl'	  	    => "app=members&amp;section=online&amp;module=online&amp;sort_key={$defaults['sort_key']}&amp;sort_order={$defaults['sort_order']}&amp;show_mem={$defaults['show_mem']}"
+																	   'baseUrl'			=> "app=members&amp;section=online&amp;module=online&amp;sort_key={$defaults['sort_key']}&amp;sort_order={$defaults['sort_order']}&amp;show_mem={$defaults['show_mem']}"
 															)		);
 		
 		//-----------------------------------------
@@ -241,7 +249,7 @@ class public_members_online_online extends ipsCommand
 					
 					$filename = IPSLib::getAppDir( $module_array['app'] ) . '/extensions/coreExtensions.php';
 					
-					if ( file_exists( $filename ) )
+					if ( is_file( $filename ) )
 					{
 						$classToLoad = IPSLib::loadLibrary( $filename, 'publicSessions__' . $module_array['app'], $module_array['app'] );
 						$loader      = new $classToLoad();
@@ -254,7 +262,9 @@ class public_members_online_online extends ipsCommand
 				}
 			}
 		}
-		
+
+		$final	= array_merge( $final, $_errors );
+
 		//-----------------------------------------
 		// Finally, members...
 		//-----------------------------------------
@@ -285,9 +295,22 @@ class public_members_online_online extends ipsCommand
 			}
 		}
 		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $newFinal, 'onlineUsersListData' );
-				
+		//-----------------------------------------
+		// Set defaults
+		//-----------------------------------------
+		
+		foreach ( array( 'sort_key', 'sort_order', 'show_mem' ) as $k )
+		{
+			if ( !$this->request[ $k ] )
+			{
+				$this->request[ $k ] = $defaults[ $k ];
+			}
+		}
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
 		$this->output .= $this->registry->getClass('output')->getTemplate('online')->showOnlineList( $newFinal, $links, $defaults );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/profile/comments.php b/upload/admin/applications/members/modules_public/profile/comments.php
deleted file mode 100644
index 76cb8b4d..00000000
--- a/upload/admin/applications/members/modules_public/profile/comments.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Profile View
- * Last Updated: $Date: 2010-07-01 18:13:46 -0400 (Thu, 01 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Revision: 6596 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_members_profile_comments extends ipsCommand
-{
-	/**
-	 * Class entry point
-	 *
-	 * @access	public
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		//-----------------------------------------
-		// Get HTML and skin
-		//-----------------------------------------
-
-		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
-
-		//-----------------------------------------
-		// Can we access?
-		//-----------------------------------------
-		
-		if ( !$this->memberData['g_mem_info'] )
- 		{
- 			$this->registry->output->showError( 'comments_profiles', 10231 );
-		}
-
-		switch( $this->request['do'] )
-		{
-			default:
-				die('');
-			break;
-			
-			case 'save':
-				$this->_saveComment();
-			break;
-			
-			case 'delete':
-				$this->_deleteComment();
-			break;
-			
-			case 'approve':
-				$this->_approveComment();
-			break;
-			
-			case 'add_new_comment':
-				$this->_doAddComment();
-			break;
-		}
-	}
-
- 	/**
-	 * Approve a comment on member's profile
-	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
- 	private function _approveComment()
- 	{
-		/* Security Check */
-		if ( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'usercp_forums_bad_key', 103999, null, null, 403 );
-		}
-		
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$comment_id			= intval( $this->request['comment_id'] );
-		//-----------------------------------------
-		// Try it. You might like it.
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/comments.php', 'profileCommentsLib', 'members' );
-		$comment_lib = new $classToLoad( $this->registry );
-		
-		$result = $comment_lib->approveComment( $member_id, $comment_id );
-		
-		/* Check for error */
-		if( $result )
-		{
-			$this->registry->output->showError( $result, 10232 );
-		}
-		else
-		{
-			$member = IPSMember::load( $member_id );
-			$this->registry->output->redirectScreen( $this->lang->words['comment_was_approved'], $this->settings['base_url'] . 'showuser=' . $member_id, $member['members_seo_name'] );
-		}
-	}
-	
- 	/**
-	 * Deletes a comment on member's profile
-	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
- 	private function _deleteComment()
- 	{
-		//-----------------------------------------
-		// Check form hash
-		//-----------------------------------------
-		
-		$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
-
-		if( $this->request['secure_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'usercp_forums_bad_key', 1023222 );
-		}
-		
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$comment_id			= intval( $this->request['comment_id'] );
-		
-		//-----------------------------------------
-		// Try it. You might like it.
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/comments.php', 'profileCommentsLib', 'members' );
-		$comment_lib = new $classToLoad( $this->registry );
-		
-		$result = $comment_lib->deleteComment( $member_id, $comment_id );
-		
-		/* Check for error */
-		if( $result )
-		{
-			$this->registry->output->showError( $result, 10232 );
-		}
-		else
-		{
-			$member = IPSMember::load( $member_id );
-			$this->registry->output->redirectScreen( $this->lang->words['comment_was_deleted'], $this->settings['base_url'] . 'showuser=' . $member_id, $member['members_seo_name'] );
-		}
-	}
-	
- 	/**
-	 * Updates the comments
-	 *
-	 * @access	private
-	 * @return	void			[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-15
-	 */
- 	private function _saveComment()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id		= intval( $this->request['member_id'] );
-		$md5check		= IPSText::md5Clean( $this->request['md5check'] );
-		$content		= '';
-		$comment_ids	= array();
-		$final_ids		= '';
-		
-		//-----------------------------------------
-		// MD5 check
-		//-----------------------------------------
-		
-		if (  $md5check != $this->member->form_hash )
-    	{
-    		die( '' );
-    	}
-
-		//-----------------------------------------
-		// My tab?
-		//-----------------------------------------
-		
-		if ( $member_id != $this->memberData['member_id'] AND !$this->memberData['g_is_supmod'] )
-    	{
-    		die( '' );
-    	}
-
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-    	
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-			die( '' );
-    	}
-
-		//-----------------------------------------
-		// Grab comment_ids
-		//-----------------------------------------
-		
-		if ( is_array( $this->request['pp-checked'] ) AND count( $this->request['pp-checked'] ) )
-		{
-			foreach( $this->request['pp-checked'] as $key => $value )
-			{
-				$key = intval( $key );
-				
-				if ( $value )
-				{
-					$comment_ids[ $key ] = $key;
-				}
-			}
-		}
-	
-		//-----------------------------------------
-		// Update the database...
-		//-----------------------------------------
-		
-		if ( is_array( $comment_ids ) AND count( $comment_ids ) )
-		{
-			$final_ids = implode( ',', $comment_ids );
-			
-			//-----------------------------------------
-			// Now update...
-			//-----------------------------------------
-
-			switch( $this->request['pp-moderation'] )
-			{
-				case 'approve':
-					$this->DB->update( 'profile_comments', array( 'comment_approved' => 1 ), 'comment_id IN(' . $final_ids . ')' );
-					break;
-				case 'unapprove':
-					$this->DB->update( 'profile_comments', array( 'comment_approved' => 0 ), 'comment_id IN(' . $final_ids . ')' );
-					break;
-				case 'delete':
-					$this->DB->delete( 'profile_comments', 'comment_id IN(' . $final_ids . ')' );
-					break;
-			}
-		}
-		
-		//-----------------------------------------
-		// Bounce...
-		//-----------------------------------------
-		
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . 'app=members&section=comments&module=profile&member_id=' . $member_id . '&do=list&_saved=1&___msg=pp_comments_updated&md5check=' . $this->member->form_hash );
-	}
-
-	/**
-	 * Save the new comment
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	private function _doAddComment()
-	{
-		/* INIT */
-		$member_id 	= intval( $this->request['member_id'] );
-		$comment	= $this->request['comment_text'];
-		$md5check	= IPSText::md5Clean( $this->request['auth_key'] );
-
-		/* Check member has */
-		if ( $md5check != $this->member->form_hash )
-    	{
-			$this->registry->output->showError( $this->lang->words['no_permission'], 10233 );
-    	}
-
-		/* Add Comment */
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/comments.php', 'profileCommentsLib', 'members' );
-		$comment_lib = new $classToLoad( $this->registry );
-		
-		$result = $comment_lib->addCommentToDB( $member_id, $comment );
-		
-		/* Check for error */
-		if( $result AND $result != 'pp_comment_added_mod' )
-		{
-			$this->registry->output->showError( $result, 10232 );
-		}
-		else if ( $result == 'pp_comment_added_mod' )
-		{
-			$this->registry->output->redirectScreen( $this->lang->words[ $result ], $this->settings['base_url'] . 'showuser=' . $member_id );
-		}
-		else
-		{
-			$this->registry->output->silentRedirect( $this->settings['base_url'] . 'showuser=' . $member_id );
-		}		
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/profile/defaultSection.php b/upload/admin/applications/members/modules_public/profile/defaultSection.php
index 0374224b..b27a9872 100644
--- a/upload/admin/applications/members/modules_public/profile/defaultSection.php
+++ b/upload/admin/applications/members/modules_public/profile/defaultSection.php
@@ -1,32 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default profile section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @file		defaultSection.php 	Define the default section for the 'profile' module
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
+ * $LastChangedDate: 2011-05-05 12:40:49 -0400 (Thu, 05 May 2011) $
+ * @version		v3.2.3
+ * $Revision: 8655 $
  */
 
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'view';
\ No newline at end of file
+$DEFAULT_SECTION = 'view';
diff --git a/upload/admin/applications/members/modules_public/profile/dname.php b/upload/admin/applications/members/modules_public/profile/dname.php
index 76a01dab..1ed5029f 100644
--- a/upload/admin/applications/members/modules_public/profile/dname.php
+++ b/upload/admin/applications/members/modules_public/profile/dname.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile View
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: danc $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6502 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_profile_dname extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -55,7 +54,7 @@ class public_members_profile_dname extends ipsCommand
 		
 		if ( !$this->memberData['g_mem_info'] )
  		{
- 			$this->registry->output->showError( 'dname_profiles_off', 10233, null, null, 403 );
+ 			$this->registry->output->showError( 'dname_profiles_off', 10233.22, null, null, 403 );
 		}
 		
  		if ( ! $this->settings['auth_allow_dnames'] )
diff --git a/upload/admin/applications/members/modules_public/profile/friends.php b/upload/admin/applications/members/modules_public/profile/friends.php
index 8a8696b9..c5a040d9 100644
--- a/upload/admin/applications/members/modules_public/profile/friends.php
+++ b/upload/admin/applications/members/modules_public/profile/friends.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile View
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 7195 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,17 +30,15 @@ class public_members_profile_friends extends ipsCommand
 	/**
 	 * Friend's library
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $friend_lib;
+	protected $friend_lib;
 	
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -78,103 +76,23 @@ class public_members_profile_friends extends ipsCommand
 			case 'moderate':
 				$this->_moderation();
 			break;
-				
-			case 'view':
-				$this->_iframeList();
-			break;
+
 		}
 	}
 
- 	/**
-	 * Loads the content for the friends tab
-	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
-	 * @since	IPB 2.2.0.2006-08-15
-	 */
- 	private function _iframeList()
- 	{
- 		//-----------------------------------------
- 		// INIT
- 		//-----------------------------------------
-		
-		$member_id			= intval( $this->request['member_id'] );
-		$content			= '';
-		$friends			= array();
-
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-    	
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-    		$this->registry->output->showError( $this->lang->words['nofriendid'], 10270, null, null, 404 );
-    	}
-
-		//-----------------------------------------
-		// Grab the friends
-		//-----------------------------------------
-
-		$this->DB->build( array( 'select'		=> 'f.*',
-								 'from'			=> array( 'profile_friends' => 'f' ),
-								 'where'		=> 'f.friends_member_id=' . $member_id . ' AND f.friends_approved=1',
-								 'order'		=> 'm.members_display_name ASC',
-								 'add_join'		=> array(
-													  1 => array( 'select' => 'pp.*',
-																  'from'   => array( 'profile_portal' => 'pp' ),
-																  'where'  => 'pp.pp_member_id=f.friends_friend_id',
-																  'type'   => 'left' ),
-												 	  2 => array( 'select' => 'm.*',
-																  'from'   => array( 'members' => 'm' ),
-																  'where'  => 'm.member_id=f.friends_friend_id',
-																  'type'   => 'left' ) 
-													) 
-								) 		);
-		$outer = $this->DB->execute();
-		
-		//-----------------------------------------
-		// Get and store...
-		//-----------------------------------------
-		
-		while( $row = $this->DB->fetch($outer) )
-		{
-			$row['members_display_name_short'] = IPSText::truncate( $row['members_display_name'], 13 );
-			
-			$friends[] = IPSMember::buildDisplayData( $row, array( 'avatar' => 0, 'warn' => 0 ) );
-		}
-
-		//-----------------------------------------
-		// Ok.. show the friends
-		//-----------------------------------------
-		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->friendsIframe( $member, $friends, true );
-		
-		$this->registry->getClass('output')->setTitle( ipsRegistry::$settings['board_name'] );
-		$this->registry->getClass('output')->addContent( $content );
-		$this->registry->getClass('output')->sendOutput();
-	}
-
-
  	/**
 	 * Remove a friend
 	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
+	 * @return	@e void		[Prints to screen]
 	 * @since	IPB 2.2.0.2006-08-09
 	 */
- 	private function _removeFriend()
+ 	protected function _removeFriend()
  	{
 		/* INIT */
-		$friend_id = intval( $this->request['member_id'] );
+		$friend_id	= intval( $this->request['member_id'] );
 
 		/* Check the secure key */
-		$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
+		$this->request['secure_key']	= $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
 
 		if( $this->request['secure_key'] != $this->member->form_hash )
 		{
@@ -200,11 +118,10 @@ class public_members_profile_friends extends ipsCommand
  	/**
 	 * Moderate pending friends
 	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
+	 * @return	@e void		[Prints to screen]
 	 * @since	IPB 2.2.0.2006-08-09
 	 */
- 	private function _moderation()
+ 	protected function _moderation()
  	{
 		//-----------------------------------------
 		// INIT
@@ -218,7 +135,7 @@ class public_members_profile_friends extends ipsCommand
 		$friends_already	= array();
 		$friends_update		= array();
 		$member				= array();
-		$pp_option			= $this->request['pp_option'] == 'delete' ? 'delete' : 'add_reciprocal';//trim( $this->request['pp_option'] );
+		$pp_option			= $this->request['pp_option'] == 'delete' ? 'delete' : 'add';
 		$message			= '';
 		$subject			= '';
 		$msg				= 'pp_friend_approved';
@@ -230,7 +147,6 @@ class public_members_profile_friends extends ipsCommand
 		if ( $md5check != $this->member->form_hash )
     	{
     		$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=error&tab=pending' );
-			exit();
     	}
 
 		//-----------------------------------------
@@ -240,7 +156,6 @@ class public_members_profile_friends extends ipsCommand
 		if ( ! is_array( $this->request['pp_friend_id'] ) OR ! count( $this->request['pp_friend_id'] ) )
 		{
 			$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=error&tab=pending' );
-			exit();
 		}
 		
 		//-----------------------------------------
@@ -260,18 +175,15 @@ class public_members_profile_friends extends ipsCommand
 		if ( ! is_array( $_friend_ids ) OR ! count( $_friend_ids ) )
 		{
 			$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=error&tab=pending' );
-			exit();
 		}
 		
 		//-----------------------------------------
 		// Check our friends are OK
 		//-----------------------------------------
-		
-		
+
 		$this->DB->build( array( 'select'	=> '*',
 								 'from'		=> 'profile_friends',
 								 'where'	=> 'friends_friend_id=' . $this->memberData['member_id'] . ' AND friends_approved=0 AND friends_member_id IN (' . implode( ',', $_friend_ids ) . ')' ) );
-												
 		$this->DB->execute();
 		
 		while( $row = $this->DB->fetch() )
@@ -283,29 +195,21 @@ class public_members_profile_friends extends ipsCommand
 		if ( ! is_array( $friend_ids ) OR ! count( $friend_ids ) )
 		{
 			$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=error&tab=pending' );
-			exit();
 		}
-		
+
 		//-----------------------------------------
 		// Load friends...
 		//-----------------------------------------
 		
-		$friends = IPSMember::load( $friend_member_ids );
-		
-		//-----------------------------------------
-		// Get member...
-		//-----------------------------------------
-		
-		$member = $this->memberData;
-		
+		$friends	= IPSMember::load( $friend_member_ids );
+
 		//-----------------------------------------
 		// Check...
 		//-----------------------------------------
 		
-		if ( ! is_array( $friends ) OR ! count( $friends ) OR ! $member['member_id'] )
+		if ( ! is_array( $friends ) OR ! count( $friends ) OR ! $this->memberData['member_id'] )
 		{
 			$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=error&tab=pending' );
-			exit();
 		}
 		
 		//-----------------------------------------
@@ -315,15 +219,9 @@ class public_members_profile_friends extends ipsCommand
 		if ( $pp_option == 'delete' )
 		{
 			//-----------------------------------------
-			// Ok.. delete them in the DB.
+			// Delete friends records
 			//-----------------------------------------
-		
-			//$this->DB->delete( 'profile_friends', 'friends_id IN(' . implode( ',', $friend_ids ) . ')' );
-			
-			//-----------------------------------------
-			// And make sure you are no longer their friend
-			//-----------------------------------------
-			
+
 			foreach( $friend_member_ids as $friend_id )
 			{
 				$this->friend_lib->removeFriend( $this->memberData['member_id'], $friend_id );
@@ -346,14 +244,14 @@ class public_members_profile_friends extends ipsCommand
 			
 			foreach( $friend_member_ids as $friend_id )
 			{
-				$this->friend_lib->addFriend( $this->memberData['member_id'], $friend_id, true );
+				$this->friend_lib->addFriend( $friend_id, $this->memberData['member_id'], true );
 			}
 
 			//-----------------------------------------
-			// Reciprocal mode?
+			// Catch all (should find any missing friends)
 			//-----------------------------------------
 			
-			if ( $pp_option == 'add_reciprocal' )
+			if ( $pp_option == 'add' )
 			{
 				//-----------------------------------------
 				// Find out who isn't already on your list...
@@ -369,6 +267,7 @@ class public_members_profile_friends extends ipsCommand
 				{
 					$friends_already[ $row['friends_member_id'] ] = $row['friends_member_id'];
 				}
+
 				//-----------------------------------------
 				// Check which aren't already members...	
 				//-----------------------------------------
@@ -389,10 +288,10 @@ class public_members_profile_friends extends ipsCommand
 				
 				if ( is_array( $friends_update ) AND count( $friends_update ) )
 				{
-					foreach( $friends_update as $id => $_id )
+					foreach( $friends_update as $id )
 					{
 						$this->DB->insert( 'profile_friends', array( 'friends_member_id'	=> $id,
-																	 'friends_friend_id'	=> $member['member_id'],
+																	 'friends_friend_id'	=> $this->memberData['member_id'],
 																	 'friends_approved'		=> 1,
 																	 'friends_added'		=> time() ) );
 					}
@@ -406,47 +305,35 @@ class public_members_profile_friends extends ipsCommand
 			foreach( $friends as $friend )
 			{
 				//-----------------------------------------
-				// INIT
+				// Notifications library
 				//-----------------------------------------
 				
-				$message = '';
-				$subject = '';
-				
-				//if ( $friend['pp_setting_notify_friend'] )
-				//{
-					//-----------------------------------------
-					// Notifications library
-					//-----------------------------------------
-					
-					$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-					$notifyLibrary		= new $classToLoad( $this->registry );
-		
-					IPSText::getTextClass( 'email' )->getTemplate( "new_friend_approved" );
-				
-					IPSText::getTextClass( 'email' )->buildMessage( array( 'MEMBERS_DISPLAY_NAME' => $friend['members_display_name'],
-												  'FRIEND_NAME'          => $member['members_display_name'],
-												  'LINK'				 => $this->settings['board_url'] . '/index.' . $this->settings['php_ext'] . '?app=members&amp;module=profile&amp;section=friends&amp;do=list' ) );
+				$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+				$notifyLibrary		= new $classToLoad( $this->registry );
+	
+				IPSText::getTextClass( 'email' )->getTemplate( "new_friend_approved" );
+			
+				IPSText::getTextClass( 'email' )->buildMessage( array( 'MEMBERS_DISPLAY_NAME' => $friend['members_display_name'],
+											  'FRIEND_NAME'          => $this->memberData['members_display_name'],
+											  'LINK'				 => $this->settings['board_url'] . '/index.' . $this->settings['php_ext'] . '?app=members&amp;module=profile&amp;section=friends&amp;do=list' ) );
 
-					IPSText::getTextClass('email')->subject	= sprintf( 
-																		IPSText::getTextClass('email')->subject, 
-																		$this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ), 
-																		$member['members_display_name']
-																	);
-		
-					$notifyLibrary->setMember( $friend );
-					$notifyLibrary->setFrom( $member );
-					$notifyLibrary->setNotificationKey( 'friend_request_approve' );
-					$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) );
-					$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-					$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-					try
-					{
-						$notifyLibrary->sendNotification();
-					}
-					catch( Exception $e ){}
-
-					$return_msg = '';
-				//}
+				IPSText::getTextClass('email')->subject	= sprintf( 
+																	IPSText::getTextClass('email')->subject, 
+																	$this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'public', $this->memberData['members_seo_name'], 'showuser' ), 
+																	$this->memberData['members_display_name']
+																);
+	
+				$notifyLibrary->setMember( $friend );
+				$notifyLibrary->setFrom( $this->memberData );
+				$notifyLibrary->setNotificationKey( 'friend_request_approve' );
+				$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'public', $this->memberData['members_seo_name'], 'showuser' ) );
+				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+				try
+				{
+					$notifyLibrary->sendNotification();
+				}
+				catch( Exception $e ){}
 			}
 			
 			$this->friend_lib->recacheFriends( $friend );
@@ -456,29 +343,29 @@ class public_members_profile_friends extends ipsCommand
 		// Recache..
 		//-----------------------------------------
 		
-		$this->friend_lib->recacheFriends( $member );
+		$this->friend_lib->recacheFriends( $this->memberData );
 
 		//-----------------------------------------
 		// Return
 		//-----------------------------------------
 		
-		$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg='.$msg.'&tab=pending' );
+		$this->registry->output->silentRedirect( $this->settings['base_url'] . '&app=members&section=friends&module=profile&do=list&___msg=' . $msg . '&tab=pending' );
 	}
 	
  	/**
 	 * Add a friend
 	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
+	 * @return	@e void		[Prints to screen]
 	 * @since	IPB 2.2.0.2006-08-09
 	 */
- 	private function _addFriend()
+ 	protected function _addFriend()
  	{
 		/* INIT */
-		$friend_id = intval( $this->request['member_id'] );
+		$friend_id	= intval( $this->request['member_id'] );
+		$_friend	= IPSMember::load( $friend_id, 'core' );
 		
 		/* Check the secure key */
-		$this->request['secure_key'] = $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
+		$this->request['secure_key']	= $this->request['secure_key'] ? $this->request['secure_key'] : $this->request['md5check'];
 
 		if( $this->request['secure_key'] != $this->member->form_hash )
 		{
@@ -500,30 +387,24 @@ class public_members_profile_friends extends ipsCommand
 		}
 		else
 		{
-			$this->registry->output->silentRedirect( $this->settings['base_url'] . 'showuser=' . $friend_id );
+			$this->registry->output->redirectScreen( $this->lang->words['friend_added_ok'], $this->settings['base_url'] . 'showuser=' . $friend_id, 'showuser', $_friend['members_seo_name'] );
 		}
 	}
 	
  	/**
 	 * List all current friends.
 	 *
-	 * @access	private
-	 * @return	void		[Prints to screen]
+	 * @return	@e void		[Prints to screen]
 	 * @since	IPB 2.2.0.2006-08-08
 	 */
- 	private function _viewList()
+ 	protected function _viewList()
  	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
-		
-		$content		= '';
-		$member_id		= intval( $this->memberData['member_id'] );
+
 		$friends		= array();
 		$tab			= substr( IPSText::alphanumericalClean( $this->request['tab'] ), 0, 20 );
-		$friends_filter	= substr( IPSText::alphanumericalClean( $this->request['friends_filter'] ), 0, 20 );
-		$_mutual_ids	= array( 0 => 0 );
-		$time_limit		= time() - $this->settings['au_cutoff'] * 60;
 		$per_page		= 25;
 		$start			= intval( $this->request['st'] );
 		
@@ -531,10 +412,9 @@ class public_members_profile_friends extends ipsCommand
 		// Check we're a member
 		//-----------------------------------------
 		
-		if ( ! $member_id )
+		if ( !$this->memberData['member_id'] )
 		{
-			$this->lang->loadLanguageFile( array( 'public_error' ), 'core' );
-			$this->registry->output->showError( $this->lang->words['no_friend_mid'], 10267, null, null, 404 );
+			$this->registry->output->showError( 'no_friend_mid', 10267, null, null, 404 );
 		}
 		
 		//-----------------------------------------
@@ -543,35 +423,20 @@ class public_members_profile_friends extends ipsCommand
 		
 		if ( $tab == 'pending' )
 		{
-			$query	     = 'f.friends_friend_id=' . $member_id;
-			$query		.= ' AND f.friends_approved=0';
-			$joinKey     = 'f.friends_member_id';
+			$query		= 'f.friends_approved=0 AND f.friends_friend_id=' . $this->memberData['member_id'];
+			$joinKey	= 'f.friends_member_id';
 		}
 		else
 		{
-			$query	     = 'f.friends_member_id=' . $member_id;
-			$query		.= ' AND f.friends_approved=1';
-			$joinKey     = 'f.friends_friend_id';
+			$query		= 'f.friends_approved=1 AND f.friends_member_id=' . $this->memberData['member_id'];
+			$joinKey	= 'f.friends_friend_id';
 		}
-		
-		//-----------------------------------------
-		// Filtered?
-		//-----------------------------------------
-		
-		if ( $friends_filter == 'online' )
-		{
-			$query .= " AND ( ( m.last_visit > {$time_limit} OR m.last_activity > {$time_limit} ) AND m.login_anonymous='0&1' )";
-		}
-		else if ( $friends_filter == 'offline' )
-		{
-			$query .= " AND ( m.last_activity < {$time_limit} OR ( m.login_anonymous='0&0' OR m.login_anonymous='1&0' ) )";
-		}
-		
+
 		//-----------------------------------------
 		// Get count...
 		//-----------------------------------------
 		
-		$count = $this->DB->buildAndFetch( array( 
+		$count	= $this->DB->buildAndFetch( array( 
 													'select'	=> 'COUNT(*) as count',
 													'from'		=> array( 'profile_friends' => 'f' ),
 													'where'		=> $query,
@@ -582,44 +447,45 @@ class public_members_profile_friends extends ipsCommand
 																					'type'		=> 'inner' 
 																		)	) 
 										)	);
-		
+
 		//-----------------------------------------
 		// Pages...
 		//----------------------------------------- 
 		
-		$pages = $this->registry->output->generatePagination( array(	
+		$pages	= $this->registry->output->generatePagination( array(	
 																	'totalItems'		=> intval( $count['count'] ),
 																	'noDropdown'		=> 1,
 												   	 				'itemsPerPage'		=> $per_page,
 																	'currentStartValue'	=> $start,
-																	'baseUrl'			=> 'app=members&amp;module=profile&amp;section=friends&amp;do=list&amp;tab='.$tab.'&amp;friends_filter=' . $friends_filter,
+																	'baseUrl'			=> 'app=members&amp;module=profile&amp;section=friends&amp;do=list&amp;tab=' . $tab,
 														 	)	);
+
 		//-----------------------------------------
 		// Get current friends...	
 		//-----------------------------------------
 		
 		$this->DB->build( array( 
-									'select'	=> 'f.*',
-									'from'		=> array( 'profile_friends' => 'f' ),
-									'where'		=> $query,
-									'order'		=> 'm.members_l_display_name ASC',
-									'limit'		=> array( $start, $per_page ),
-									'add_join'	=> array(
-														  array( 
-																'select' => 'pp.*',
-																'from'   => array( 'profile_portal' => 'pp' ),
-																'where'  => 'pp.pp_member_id=' . $joinKey,
-																'type'   => 'left' 
-																),
-													 	  array( 
-																'select' => 'm.*',
-																'from'   => array( 'members' => 'm' ),
-																'where'  => 'm.member_id=' . $joinKey,
-																'type'   => 'left' 
-																) 
+								'select'	=> 'f.*',
+								'from'		=> array( 'profile_friends' => 'f' ),
+								'where'		=> $query,
+								'order'		=> 'm.members_l_display_name ASC',
+								'limit'		=> array( $start, $per_page ),
+								'add_join'	=> array(
+													  array( 
+															'select' => 'pp.*',
+															'from'   => array( 'profile_portal' => 'pp' ),
+															'where'  => 'pp.pp_member_id=' . $joinKey,
+															'type'   => 'left' 
+															),
+												 	  array( 
+															'select' => 'm.*',
+															'from'   => array( 'members' => 'm' ),
+															'where'  => 'm.member_id=' . $joinKey,
+															'type'   => 'left' 
 															) 
+														) 
 						)	);
-		$q = $this->DB->execute();
+		$q	= $this->DB->execute();
 		
 		//-----------------------------------------
 		// Get and store...
@@ -627,7 +493,7 @@ class public_members_profile_friends extends ipsCommand
 		
 		while( $row = $this->DB->fetch( $q ) )
 		{
-			$row = IPSMember::buildDisplayData( $row, array( 'avatar' => 0, 'warn' => 0 ) );
+			$row = IPSMember::buildDisplayData( $row, array( 'warn' => 0 ) );
 
 			$friends[] = $row;
 		}
@@ -636,11 +502,12 @@ class public_members_profile_friends extends ipsCommand
 		// Show...
 		//-----------------------------------------
 		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->friendsList( $friends, $pages );
+		$content	= $this->registry->getClass('output')->getTemplate('profile')->friendsList( $friends, $pages );
 		
 		$this->registry->output->setTitle( $this->lang->words['m_title_friends'] . ' - ' . ipsRegistry::$settings['board_name'] );
 		$this->registry->output->addNavigation( $this->lang->words['m_title_friends'], '' );
+
 		$this->registry->getClass('output')->addContent( $content );
-		$this->registry->getClass('output')->sendOutput( $content );
+		$this->registry->getClass('output')->sendOutput();
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/profile/ignore.php b/upload/admin/applications/members/modules_public/profile/ignore.php
index c47c36c1..aac77ea5 100644
--- a/upload/admin/applications/members/modules_public/profile/ignore.php
+++ b/upload/admin/applications/members/modules_public/profile/ignore.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ignore a user
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_profile_ignore extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -69,7 +68,6 @@ class public_members_profile_ignore extends ipsCommand
  	/**
 	 * Ignore a member's topics
 	 *
-	 * @access	public
 	 * @param	integer		Member ID to ignore
 	 * @param	string		Column to update
 	 * @return	array 		Array of info
@@ -169,7 +167,6 @@ class public_members_profile_ignore extends ipsCommand
  	/**
 	 * Stop ignoring the user's topics
 	 *
-	 * @access	public
 	 * @param	integer		Member ID to stop ignoring
 	 * @param	string		Column to update
 	 * @return	array 		Array of info
diff --git a/upload/admin/applications/members/modules_public/profile/index.html b/upload/admin/applications/members/modules_public/profile/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/modules_public/profile/index.html
+++ b/upload/admin/applications/members/modules_public/profile/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/profile/photo.php b/upload/admin/applications/members/modules_public/profile/photo.php
index 4a49919e..7c89d887 100644
--- a/upload/admin/applications/members/modules_public/profile/photo.php
+++ b/upload/admin/applications/members/modules_public/profile/photo.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
- * Profile View
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * IP.Board v3.2.3
+ * Ignore a user
+ * Last Updated: $Date: 2011-09-08 11:58:29 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: danc $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 6502 $
+ * @version		$Revision: 9467 $
  *
  */
 
@@ -30,50 +30,132 @@ class public_members_profile_photo extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$info = array();
- 		$id   = intval( $this->request['id'] );
- 				
-		//-----------------------------------------
-		// Get HTML and skin
-		//-----------------------------------------
-
+		/* Load lang file */
 		$this->registry->class_localization->loadLanguageFile( array( 'public_profile' ), 'members' );
-
-		//-----------------------------------------
-		// Can we access?
-		//-----------------------------------------
 		
-		if ( !$this->memberData['g_mem_info'] )
- 		{
- 			$this->registry->output->showError( 'photos_profiles_off', 10242, null, null, 403 );
-		}
+		/* Load library */
+		$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+		$this->photo = new $classToLoad( $registry );
 		
-		if( !$id )
+		switch( $this->request['do'] )
 		{
-			$this->registry->output->showError( 'photos_no_id', 10243, null, null, 404 );
+			case 'save':
+				$this->_save();
+			break;
+			default:
+			case 'show':
+				$output = $this->_show();
+			break;
+			case 'remove':
+				$this->_remove();
+			break;
 		}
-
-    	$member	= IPSMember::load( $id );
-    	$member = IPSMember::buildDisplayData( $member );
-
-    	$html	= $this->registry->getClass('output')->getTemplate('profile')->showPhoto( $member );
-
-		//-----------------------------------------
-		// Push to print handler
-		//-----------------------------------------
 		
-		$this->registry->getClass('output')->setTitle( $this->lang->words['photo_title']  . ' - ' . ipsRegistry::$settings['board_name']);
-		$this->registry->getClass('output')->popUpWindow( $html );
- 	}
+		/* Got anything to show? */
+		if ( $output )
+		{
+			$this->registry->output->addContent( $output );
+			$this->registry->output->setTitle( $this->lang->words['pe_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
+			$this->registry->output->addNavigation( $this->lang->words['pe_title'], '' );
+			$this->registry->output->sendOutput();
+		}
+	}
+	
+	/**
+	 * Removes pics
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _remove()
+	{
+		$this->photo->remove( $this->memberData['member_id'] );
+		
+		/* redirect to show */
+		$this->registry->output->redirectScreen( $this->lang->words['pp_photo_edited'], $this->settings['base_url'] . 'showuser=' . $this->memberData['member_id'], $this->memberData['members_seo_name'] );
+	}
+	
+	/**
+	 * Saves data
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _save()
+	{
+		$getJson     = intval( $this->request['getJson'] );
+		$photoType   = $this->request['photoType'];
+		$gravatar	 = $this->request['gravatar'];
+		
+		if ( $getJson )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
+			$ajax = new $classToLoad();
+		}
+		
+		/* Do it */
+		try
+		{
+			$photo = $this->photo->save( $this->memberData, $photoType, $gravatar );
+			
+			if ( is_array( $photo ) )
+			{
+				if ( $getJson )
+				{
+					$photo['oldThumb'] = $this->memberData['pp_small_photo'];
+					return $ajax->returnJsonArray( $photo, false, 'text/html' );
+				}
+				else
+				{
+					/* redirect to show */
+					$this->registry->output->redirectScreen( $this->lang->words['pp_photo_edited'], $this->settings['base_url'] . 'showuser=' . $this->memberData['member_id'], $this->memberData['members_seo_name'] );
+				}
+			}
+		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+			
+			switch ( $msg )
+			{
+				default:
+					if ( $getJson )
+					{
+						$msg = ( ! empty( $this->lang->words[ 'pp_' . $msg ] ) ) ? $this->lang->words[ 'pp_' . $msg ] : $this->lang->words[ 'pp_generic_error' ];
+						$ajax->returnJsonError( $msg, 'text/html' );
+						exit();
+					}
+					else
+					{
+						$this->registry->getClass('output')->showError( $this->lang->words[ 'pp_' . $msg ], 1027, null, null, 403 );
+					}
+				break;
+				case 'PROFILE_DISABLED':
+					if ( $getJson )
+					{
+						$ajax->returnJsonError( 'member_profile_disabled', 'text/html' );
+						exit();
+					}
+					else
+					{
+						$this->registry->getClass('output')->showError( $this->lang->words['member_profile_disabled'], 1027, null, null, 403 );
+					}
+				break;
+			}
+		}
+	}
+	
+	/**
+	 * Display the photo editor
+	 *
+	 * @return	@e void [HTML]
+	 */
+	protected function _show()
+	{
+		return $this->photo->getEditorHtml( $this->memberData );
+	}
  	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/profile/status.php b/upload/admin/applications/members/modules_public/profile/status.php
index d74e50c1..2affb5dd 100644
--- a/upload/admin/applications/members/modules_public/profile/status.php
+++ b/upload/admin/applications/members/modules_public/profile/status.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Allow user to change their status
- * Last Updated: $Date: 2010-06-10 06:36:42 -0400 (Thu, 10 Jun 2010) $
+ * Last Updated: $Date: 2011-08-25 07:46:38 -0400 (Thu, 25 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: danc $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6502 $
+ * @version		$Revision: 9413 $
  *
  */
 
@@ -30,9 +30,8 @@ class public_members_profile_status extends ipsCommand
 	/**
 	 * Class entry point
 	 *
-	 * @access	public
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -91,9 +90,8 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Lock a status
 	*
-	* @access	private
 	*/
-	private function _lockStatus()
+	protected function _lockStatus()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
@@ -133,9 +131,8 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Lock a status
 	*
-	* @access	private
 	*/
-	private function _unlockStatus()
+	protected function _unlockStatus()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
@@ -175,25 +172,27 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Delete a status reply
 	*
-	* @access	private
 	*/
-	private function _list()
+	protected function _list()
 	{
 		/* INIT */
-		$filters = array( 'limit' => 15 );
+		$filters = array( 'offset' => intval( $this->request['st'] ), 'limit' => 15, 'getCount' => true );
 		
 		/* Add to the filters */
 		if ( $this->request['member_id'] )
 		{
-			$filters['member_id'] = intval( $this->request['member_id'] );
+			$filters['relatedTo']  = intval( $this->request['member_id'] );
+			$filters['isApproved'] = true;
 		}
 		else if ( $this->request['status_id'] )
 		{
 			$filters['status_id'] = intval( $this->request['status_id'] );
+			$filters['type']      = 'all';
 		}
 		else if ( $this->request['type'] == 'friends' )
 		{
 			$filters['friends_only'] = 1;
+			$filters['type']         = 'all';
 		}
 		
 		/* Fetch last 20 */
@@ -201,11 +200,17 @@ class public_members_profile_status extends ipsCommand
 		
 		/* Fetch */
 		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, $filters );
+		$count    = $this->registry->getClass('memberStatus')->getStatusCount();
 		
-		/* Fetch actions */
-		$actions = $this->registry->getClass('memberStatus')->fetchActions( $this->memberData, array( 'limit' => 30, 'not_theirs' => 1, 'custom' => 0 ) );
+		$pages    = $this->registry->getClass('output')->generatePagination( array( 'totalItems' 			=> $count,
+																					'itemsPerPage'			=> 15,
+																					'currentStartValue'   	=> $this->request['st'],
+																					'seoTitle'				=> true,
+																					'seoTemplate'			=> 'members_status_all',
+																					'showNumbers'			=> false,
+																					'baseUrl'				=> "app=members&amp;module=profile&amp;section=status&amp;type={$this->request['type']}&amp;member_id={$this->request['member_id']}" )	);
 		
-		$content = $this->registry->getClass('output')->getTemplate('profile')->statusUpdatesPage( $statuses, $actions );
+		$content = $this->registry->getClass('output')->getTemplate('profile')->statusUpdatesPage( $statuses, $pages );
 		
 		$this->registry->output->addContent( $content );
 		$this->registry->output->setTitle( $this->lang->words['status_updates_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
@@ -217,9 +222,8 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Delete a status reply
 	*
-	* @access	private
 	*/
-	private function _deleteReply()
+	protected function _deleteReply()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
@@ -261,9 +265,8 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Delete a status
 	*
-	* @access	private
 	*/
-	private function _deleteStatus()
+	protected function _deleteStatus()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
@@ -280,11 +283,14 @@ class public_members_profile_status extends ipsCommand
 		/* Set Data */
 		$this->registry->getClass('memberStatus')->setStatusData( $status_id );
 		
-		/* Can we reply? */
+		/* Can we delete? */
 		if ( ! $this->registry->getClass('memberStatus')->canDeleteStatus() )
  		{
 			$this->registry->output->showError( 'status_off', 10279, null, null, 403 );
 		}
+		
+		/* Get info */
+		$status	= $this->registry->getClass('memberStatus')->getStatusData();
 
 		/* Update */
 		$this->registry->getClass('memberStatus')->deleteStatus();
@@ -296,16 +302,17 @@ class public_members_profile_status extends ipsCommand
 		}
 		else
 		{
-			$this->registry->output->redirectScreen( $this->lang->words['status_deleted'], $this->settings['base_url'] . 'showuser=' . $this->memberData['member_id'], $this->memberData['members_seo_name'] );
+			$_text	= ( $status['status_member_id'] == $status['status_author_id'] ) ? $this->lang->words['status_deleted'] : $this->lang->words['comment_was_deleted'];
+			
+			$this->registry->output->redirectScreen( $_text, $this->settings['base_url'] . 'showuser=' . $status['status_member_id'] . '&amp;tab=status', $status['members_seo_name'] );
 		}
 	}
 	
 	/**
 	* Add a reply statussesses
 	*
-	* @access	private
 	*/
-	private function _reply()
+	protected function _reply()
 	{
 		/* INIT */
 		$status_id = intval( $this->request['status_id'] );
@@ -350,13 +357,13 @@ class public_members_profile_status extends ipsCommand
 	/**
 	* Add a new statussesses
 	*
-	* @access	private
 	*/
-	private function _new()
+	protected function _new()
 	{
 		$id   = intval( $this->memberData['member_id'] );
 		$su_Twitter  = intval( $this->request['su_Twitter'] );
 		$su_Facebook = intval( $this->request['su_Facebook'] );
+		$forMemberId = intval( $this->request['forMemberId'] );
 		
 		/* Set Author */
 		$this->registry->getClass('memberStatus')->setAuthor( $this->memberData );
@@ -370,8 +377,24 @@ class public_members_profile_status extends ipsCommand
 			$this->registry->output->showError( 'status_off', 10268, null, null, 403 );
 		}
 		
-		/* Set post outs */
-		$this->registry->getClass('memberStatus')->setExternalUpdates( array( 'twitter' => $su_Twitter, 'facebook' => $su_Facebook ) );
+		/* Update or comment? */
+		if ( $forMemberId && $forMemberId != $this->memberData['member_id'] )
+		{
+			$owner = IPSMember::load( $forMemberId );
+			
+	    	if ( ! $owner['pp_setting_count_comments'] )
+	    	{
+	    		$this->registry->output->showError( 'status_off', 10268, null, null, 403 );
+	    	}
+	
+			/* Set owner */
+			$this->registry->getClass('memberStatus')->setStatusOwner( $owner );
+		}
+		else
+		{
+			/* Set post outs */
+			$this->registry->getClass('memberStatus')->setExternalUpdates( array( 'twitter' => $su_Twitter, 'facebook' => $su_Facebook ) );
+		}
 
 		/* Update */
 		$this->registry->getClass('memberStatus')->create();
diff --git a/upload/admin/applications/members/modules_public/profile/view.php b/upload/admin/applications/members/modules_public/profile/view.php
index c138c2ba..36b8ee16 100644
--- a/upload/admin/applications/members/modules_public/profile/view.php
+++ b/upload/admin/applications/members/modules_public/profile/view.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile View
- * Last Updated: $Date: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-08-01 07:12:21 -0400 (Mon, 01 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 7007 $
+ * @version		$Revision: 9338 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -50,7 +50,7 @@ class public_members_profile_view extends ipsCommand
 	 * Class entry point
 	 *
 	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
+	 * @return	@e void		[Outputs to screen/redirects]
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -81,11 +81,133 @@ class public_members_profile_view extends ipsCommand
 		$this->registry->output->addNavigation( $this->lang->words['page_title_pp'] . ': ' . $this->member_name, '' );
 		$this->registry->output->sendOutput();
  	}
+ 	
+ 	/**
+ 	 * Get 12 random friends
+ 	 *
+ 	 * @param	array 	$member	Member data
+ 	 * @return	@e array
+ 	 */
+ 	protected function _getRandomFriends( $member )
+ 	{
+		# Get random number from member's friend cache... grab 10 random. array_rand( array, no.)
+		# also fall back on last 10 if no cache
+		
+		$_member_ids	= array();
+		$friends		= array();
+
+		if ( $member['pp_setting_count_friends'] > 0 && $this->settings['friends_enabled'] )
+		{
+			$member['_cache'] = IPSMember::unpackMemberCache( $member['members_cache'] );
+		
+			if ( is_array( $member['_cache']['friends'] ) AND count( $member['_cache']['friends'] ) )
+			{
+				foreach( $member['_cache']['friends'] as $id => $approved )
+				{
+					$id = intval( $id );
+				
+					if ( $approved AND $id )
+					{
+						$_member_ids[] = $id;
+					}
+				}
+				
+				$member['_total_approved_friends']	= count( $_member_ids );
+
+				if ( is_array( $_member_ids ) AND $member['_total_approved_friends'] )
+				{
+					$_max		= $member['_total_approved_friends'] > 12 ? 12 : $member['_total_approved_friends'];
+					$_rand		= array_rand( $_member_ids, $_max );
+					$_final		= array();
+					
+					# If viewing member is in list, let's show em
+					if( in_array( $this->memberData['member_id'], $_member_ids ) )
+					{						
+						$_final[]	= $this->memberData['member_id'];
+						
+						$new_mids	= array();
+						
+						foreach( $_member_ids as $mid )
+						{
+							if( $mid == $this->memberData['member_id'] )
+							{
+								continue;
+							}
+							
+							$new_mids[] = $mid;
+						}
+												
+						$_member_ids = $new_mids;
+						unset( $new_mids );
+						
+						if( is_array( $_rand ) )
+						{
+							if( count( $_rand ) >= 12 )
+							{
+								array_pop( $_rand );
+							}
+						}
+					}
+				
+					if ( is_array( $_rand ) AND count( $_rand ) )
+					{
+						foreach( $_rand as $_id )
+						{
+							$_final[] = $_member_ids[ $_id ];
+						}
+					}
+				
+					if ( count( $_final ) )
+					{
+						$sql_extra = ' AND friends_friend_id IN (' . IPSText::cleanPermString( implode( ',', $_final ) ) . ')';
+					}
+				}
+			}
+			
+			/* Fetch friends */
+			$_memberIds	= array();
+			$_members	= array();
+			$_friends	= array();
+			
+			$this->DB->build( array('select'	=> '*',
+									'from'		=> 'profile_friends',
+									'where'		=> 'friends_member_id=' . $member['member_id'] . ' AND friends_approved=1' . $sql_extra,
+									'limit'		=> array( 0, 12 ),
+									'order'		=> 'friends_approved DESC' )	);
+																
+			$this->DB->execute();
+			
+			while( $row = $this->DB->fetch() )
+			{
+				$_memberIds[]	= $row['friends_friend_id'];
+				$_friends[]		= $row;
+			}
+			
+			/* Got members? */
+			$_members	= IPSMember::load( $_memberIds, 'core,extendedProfile' );
+			
+			foreach( $_friends as $row )
+			{
+				if( ! isset( $_members[ $row['friends_friend_id'] ] ) )
+				{
+					continue;
+				}
+				
+				$row					= array_merge( $row, $_members[ $row['friends_friend_id'] ] );
+				$row['_friends_added']	= ipsRegistry::getClass('class_localization')->getDate( $row['friends_added'], 'SHORT' );
+				$row					= IPSMember::buildProfilePhoto( $row );
+				
+				$friends[]				= $row;
+			}
+		}
+		
+		return $friends;
+ 	}
 
 	/**
 	 * Modern profile
 	 *
-	 * @return	void		[Outputs to screen]
+	 * @return	@e void		[Outputs to screen]
 	 */
  	protected function _viewModern()
  	{
@@ -94,12 +216,15 @@ class public_members_profile_view extends ipsCommand
  		//-----------------------------------------
 		
 		$member_id			= intval( $this->request['id'] ) ? intval( $this->request['id'] ) : intval( $this->request['MID'] );
-		$member_id			= $member_id ? $member_id : $this->memberData['member_id'];
+
+		if( !$member_id )
+		{
+			$this->registry->output->showError( 'profiles_no_member', 10246.0, null, null, 404 );
+		}
+
 		$tab				= substr( IPSText::alphanumericalClean( str_replace( '..', '', trim( $this->request['tab'] ) ) ), 0, 20 );
 		$firsttab			= '';
 		$member				= array();
-		$comments			= array();
-		$comments_html		= "";
 		$friends			= array();
 		$visitors			= array();
 		$comment_perpage	= 5;
@@ -118,15 +243,6 @@ class public_members_profile_view extends ipsCommand
 		$time_adjust		= $this->settings['time_adjust'] == "" ? 0 : $this->settings['time_adjust'];
 		$board_posts		= $this->caches['stats']['total_topics'] + $this->caches['stats']['total_replies'];
 		$seenFiles			= array();
-		
- 		//-----------------------------------------
-		// Check input..
-		//-----------------------------------------
-
-		if ( ! $member_id )
-		{
-			$this->registry->output->silentRedirect( $this->settings['base_url'] );
-		}
 
 		/* Removing customization? */
 		if ( $_rCustom AND ( $member_id == $this->memberData['member_id'] OR $this->memberData['g_is_supmod'] ) AND $this->request['secure_key'] == $this->member->form_hash )
@@ -139,91 +255,91 @@ class public_members_profile_view extends ipsCommand
 		{
 			IPSMember::save( $member_id, array( 'core' => array( 'bw_disable_customization' => 1 ) ) );
 		}
-		
-		//-----------------------------------------
-		// Configure tabs
-		//-----------------------------------------
-		
-		foreach( ipsRegistry::$applications as $app )
-		{
-			/* Skip if disabled */
-			if( ! $app['app_enabled'] )
-			{
-				continue;
-			}
-			
-			/* Path to tabs */
-			$custom_path = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/profileTabs';
-			
-		if ( is_dir( $custom_path ) )
-		{
-			foreach( new DirectoryIterator( $custom_path ) as $f )
-			{
-				if ( ! $f->isDot() && ! $f->isDir() )
-				{
-					$file = $f->getFileName();
-					
-					if( $file[0] == '.' )
-					{
-						continue;
-					}
-								
-					if ( preg_match( "#\.conf\.php$#i", $file ) )
-					{
-						$classname = str_replace( ".conf.php", "", $file );
-						
-							$CONFIG = array();
-						require( $custom_path . '/' . $file );
-						
-						//-------------------------------
-						// Allowed to use?
-						//-------------------------------
-					
-						if ( $CONFIG['plugin_enabled'] )
-						{
-							$CONFIG['app']				= $app['app_directory'];
-								
-							$_position					= $this->_getTabPosition( $_positions, $CONFIG['plugin_order'] );
-							$_tabs[ $_position ]		= $CONFIG;
-							$_positions[]				= $_position;
-						}
-					}
-				}
-			}			
-		}
-		}
-		
-		ksort( $_tabs );
-		
-		foreach( $_tabs as $_pos => $data )
-		{
-			if( !$firsttab )
-			{
-				$firsttab = $data['plugin_key'];
-			}
-			
-			$data['_lang']					= isset($this->lang->words[ $data['plugin_lang_bit'] ]) ? $this->lang->words[ $data['plugin_lang_bit'] ] : $data['plugin_name'];
-			$tabs[ $data['plugin_key'] ]	= $data;
-		}
-		
-		if ( ! $tab OR ( $tab != 'comments' AND $tab != 'settings' AND ! @file_exists( IPSLib::getAppDir( $tabs[ $tab ]['app'] ) . '/extensions/profileTabs/' . $tab . '.php' ) ) )
-		{
-			$tab         = $firsttab;
-			$default_tab = $tabs[ $tab ]['app'] . ':' . $tab;
-		}
 
 		//-----------------------------------------
 		// Grab all data...
 		//-----------------------------------------
 		
-		$member = IPSMember::load( $member_id, 'profile_portal,pfields_content,sessions,groups', 'id' );
+		$member		= IPSMember::load( $member_id, 'profile_portal,pfields_content,sessions,groups', 'id' );
 
-		if ( !$member['member_id'] )
+		if ( ! $member['member_id'] )
 		{
 			$this->registry->output->showError( 'profiles_no_member', 10246, null, null, 404 );
 		}
 		
-		// Cycle redirect on member profile for ID FURL Fix
+		//-----------------------------------------
+		// Configure tabs
+		//-----------------------------------------
+		
+		foreach( IPSLib::getEnabledApplications() as $appDir => $app )
+		{
+			/* Path to tabs */
+			$custom_path = IPSLib::getAppDir( $appDir ) . '/extensions/profileTabs';
+
+			if ( is_dir( $custom_path ) )
+			{
+				foreach( new DirectoryIterator( $custom_path ) as $f )
+				{
+					if ( ! $f->isDot() && ! $f->isDir() )
+					{
+						$file = $f->getFileName();
+						
+						if( $file[0] == '.' )
+						{
+							continue;
+						}
+									
+						if ( preg_match( '#\.conf\.php$#i', $file ) )
+						{
+							$classname = str_replace( ".conf.php", "", $file );
+							
+							$CONFIG = array();
+							require( $custom_path . '/' . $file );/*noLibHook*/
+							
+							//-------------------------------
+							// Allowed to use?
+							//-------------------------------
+						
+							if ( $CONFIG['plugin_enabled'] )
+							{
+								/* Block friends tab if we have disabled friends or friends feature is shut off */
+								if( $CONFIG['plugin_key'] == 'friends' AND ( !$member['pp_setting_count_friends'] OR !$this->settings['friends_enabled'] ) )
+								{
+									continue;
+								}
+								
+								$CONFIG['app']				= $appDir;
+								
+								$_position					= $this->_getTabPosition( $_positions, $CONFIG['plugin_order'] );
+								$_tabs[ $_position ]		= $CONFIG;
+								$_positions[]				= $_position;
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		ksort( $_tabs );
+		
+		foreach( $_tabs as $_pos => $data )
+		{		
+			$data['_lang']					= isset($this->lang->words[ $data['plugin_lang_bit'] ]) ? $this->lang->words[ $data['plugin_lang_bit'] ] : $data['plugin_name'];
+			$tabs[ $data['plugin_key'] ]	= $data;
+		}
+		
+		if ( $tab && @is_file( IPSLib::getAppDir( $tabs[ $tab ]['app'] ) . '/extensions/profileTabs/' . $tab . '.php' ) )
+		{
+			$default_tab = $tabs[ $tab ]['app'] . ':' . $tab;
+		}
+		else
+		{
+			$default_tab = 'core:info';
+		}
+		
+		$friends	= $this->_getRandomFriends( $member );
+		
+		/* Cycle redirect on member profile for ID FURL Fix */
 		if ( IPB_USE_ONLY_ID_FURL )
 		{
 			 $member['members_seo_name'] = $member['member_id'];
@@ -281,7 +397,7 @@ class public_members_profile_view extends ipsCommand
 		}
 
 		$member['_local_time']		= $member['time_offset'] != "" ? gmstrftime( $this->settings['clock_long'], time() + ($member['time_offset']*3600) + ($time_adjust * 60) ) : '';
-		$member['g_title']			= IPSLib::makeNameFormatted( $member['g_title'], $member['g_id'], $member['prefix'], $member['suffix'] );
+		$member['g_title']			= IPSMember::makeNameFormatted( $member['g_title'], $member['g_id'], $member['prefix'], $member['suffix'] );
 		$member['_posts_day']		= 0;
 		$member['_total_pct']		= 0;
 		$member['_bday_month']		= $member['bday_month'] ? $this->lang->words['M_' . $member['bday_month'] ] : 0;
@@ -346,17 +462,6 @@ class public_members_profile_view extends ipsCommand
 			}
 		}
 
-		//-----------------------------------------
-		// Comments
-		//-----------------------------------------
-		
-		if( $member['pp_setting_count_comments'] )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/comments.php', 'profileCommentsLib', 'members' );
-			$comment_lib	= new $classToLoad( $this->registry );
-			$comment_html	= $comment_lib->buildComments( $member );
-		}
-
 		//-----------------------------------------
 		// Visitors
 		//-----------------------------------------
@@ -365,8 +470,7 @@ class public_members_profile_view extends ipsCommand
 		{
 			$_pp_last_visitors	= unserialize( $member['pp_last_visitors'] );
 			$_visitor_info		= array();
-			$_count				= 1;
-		
+			
 			if ( is_array( $_pp_last_visitors ) )
 			{
 				krsort( $_pp_last_visitors );
@@ -375,152 +479,27 @@ class public_members_profile_view extends ipsCommand
 	
 				foreach( $_members as $_id => $_member )
 				{ 
-					$_visitor_info[ $_id ] = IPSMember::buildDisplayData( $_member, array( 'reputation' => 0, 'avatar' => 0, 'warn' => 0 ) );
+					$_visitor_info[ $_id ] = IPSMember::buildDisplayData( $_member, array( 'reputation' => 0, 'warn' => 0 ) );
 				}
 				
 				foreach( $_pp_last_visitors as $_time => $_id )
 				{
-					if ( $_count > $member['pp_setting_count_visitors'] )
+					if ( !$_visitor_info[ $_id ]['members_display_name_short'] )
 					{
-						break;
-					}
-				
-					$_count++;
-				
-					if( !$_visitor_info[ $_id ]['members_display_name_short'] )
-					{
-						$_visitor_info[ $_id ] = IPSMember::buildDisplayData( IPSMember::setUpGuest(), array( 'reputation' => 0, 'avatar' => 0, 'warn' => 0 ) );
+						$_visitor_info[ $_id ] = IPSMember::buildDisplayData( IPSMember::setUpGuest(), array( 'reputation' => 0, 'warn' => 0 ) );
 					}
 					
 					$_visitor_info[ $_id ]['_visited_date'] 				= ipsRegistry::getClass( 'class_localization')->getDate( $_time, 'TINY' );
 					$_visitor_info[ $_id ]['members_display_name_short']	= $_visitor_info[ $_id ]['members_display_name_short'] ? $_visitor_info[ $_id ]['members_display_name_short'] : $this->lang->words['global_guestname'];
 
 					$visitors[] = $_visitor_info[ $_id ];
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Friends
-		//-----------------------------------------
-		
-		# Get random number from member's friend cache... grab 10 random. array_rand( array, no.)
-		# also fall back on last 10 if no cache
-		
-		if ( $member['pp_setting_count_friends'] > 0 && $this->settings['friends_enabled'] )
-		{
-			$member['_cache'] = IPSMember::unpackMemberCache( $member['members_cache'] );
-		
-			if ( is_array( $member['_cache']['friends'] ) AND count( $member['_cache']['friends'] ) )
-			{
-				foreach( $member['_cache']['friends'] as $id => $approved )
-				{
-					$id = intval( $id );
-				
-					if ( $approved AND $id )
-					{
-						$_member_ids[] = $id;
-					}
-				}
-				
-				$member['_total_approved_friends']	= count( $_member_ids );
-				$member['_showing_friend_count']	= $member['_total_approved_friends'] > 50 ? 50 : $member['_total_approved_friends'];
-
-				if ( is_array( $_member_ids ) AND $member['_total_approved_friends'] )
-				{
-					$_max		= $member['_total_approved_friends'] > 50 ? 50 : $member['_total_approved_friends'];
-					$_rand		= array_rand( $_member_ids, $_max );
-					$_final		= array();
 					
-					# If viewing member is in list, let's show em
-					if( in_array( $this->memberData[ 'member_id' ], $_member_ids ) )
-					{						
-						$_final[]	= $this->memberData[ 'member_id' ];
-						
-						$new_mids	= array();
-						
-						foreach( $_member_ids as $mid )
-						{
-							if( $mid == $this->memberData[ 'member_id' ] )
-							{
-								continue;
-							}
-							
-							$new_mids[] = $mid;
-						}
-												
-						$_member_ids = $new_mids;
-						unset( $new_mids );
-						
-						if( is_array( $_rand ) )
-						{
-							if( count( $_rand ) >= 50 )
-							{
-								array_pop( $_rand );
-							}
-						}
-					}
-				
-					if ( is_array( $_rand ) AND count( $_rand ) )
+					if ( count($visitors) == 5 )
 					{
-						foreach( $_rand as $_id )
-						{
-							$_final[] = $_member_ids[ $_id ];
-						}
-					}
-				
-					if ( count( $_final ) )
-					{
-						$sql_extra = ' AND friends_friend_id IN (' . IPSText::cleanPermString( implode( ',', $_final ) ) . ')';
+						break;
 					}
 				}
 			}
-			
-			/* Fetch friends */
-			$_memberIds = array();
-			$_members   = array();
-			$_friends   = array();
-			
-			$this->DB->build( array('select'   => '*',
-									'from'	   => 'profile_friends',
-									'where'	   => 'friends_member_id=' . $member_id . ' AND friends_approved=1' . $sql_extra,
-									'limit'	   => array( 0, 50 ),
-									'order'    => 'friends_approved DESC' )	);
-																
-			$this->DB->execute();
-			
-			while( $row = $this->DB->fetch() )
-			{
-				$_memberIds[] = $row['friends_friend_id'];
-				$_friends[]   = $row;
-			}
-			
-			/* Got members? */
-			$_members = IPSMember::load( $_memberIds, 'core,extendedProfile' );
-			$member['_total_displayed_friends'] = 0;
-			
-			foreach( $_friends as $row )
-			{
-				if( ! isset( $_members[ $row['friends_friend_id'] ] ) )
-				{
-					continue;
-				}
-				
-				if ( $row['friends_friend_id'] && isset( $_members[ $row['friends_friend_id'] ] ) )
-				{
-					$row = array_merge( $row, $_members[ $row['friends_friend_id'] ] );
-				}
-				
-				$row['_friends_added']		= ipsRegistry::getClass( 'class_localization')->getDate( $row['friends_added'], 'SHORT' );
-			
-				$row = IPSMember::buildProfilePhoto( $row );
-			
-				$row['members_display_name_short'] = IPSText::truncate( $row['members_display_name'], 13 );
-				
-				$friends[] = $row;
-				
-				$member['_total_displayed_friends']++;
-			}
 		}
 		
 		//-----------------------------------------
@@ -541,11 +520,11 @@ class public_members_profile_view extends ipsCommand
 		
 		$tab_html = '';
 		
-		if ( $tab != 'comments' AND $tab != 'settings' )
+		if ( $tab )
 		{
-			if( file_exists( IPSLib::getAppDir( $tabs[ $tab ]['app'] ) . '/extensions/profileTabs/' . $tab . '.php' ) )
+			if( is_file( IPSLib::getAppDir( $tabs[ $tab ]['app'] ) . '/extensions/profileTabs/' . $tab . '.php' ) )
 			{
-				require( IPSLib::getAppDir( 'members' ) . '/sources/tabs/pluginParentClass.php' );
+				require( IPSLib::getAppDir( 'members' ) . '/sources/tabs/pluginParentClass.php' );/*noLibHook*/
 				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $tabs[ $tab ]['app'] ) . '/extensions/profileTabs/' . $tab . '.php', 'profile_' . $tab, $tabs[ $tab ]['app'] );
 				$plugin      = new $classToLoad( $this->registry );
 				$tab_html    = $plugin->return_html_block( $member );
@@ -560,7 +539,7 @@ class public_members_profile_view extends ipsCommand
 		
 		if ( $_desc )
 		{
-			$this->registry->output->addMetaTag( 'description', $member['members_display_name'] . ': ' . IPSText::getTextClass('bbcode')->stripAllTags( $_desc ) );
+			$this->registry->output->addMetaTag( 'description', $member['members_display_name'] . ': ' . IPSText::xssMakeJavascriptSafe( IPSText::getTextClass('bbcode')->stripAllTags( $_desc ) ) );
 		}
 		
 		/* Reputation */
@@ -599,13 +578,65 @@ class public_members_profile_view extends ipsCommand
 				}
 			}
 		}
+		
+		//-----------------------------------------
+		// Format signature
+		//-----------------------------------------
+		
+		if( $member['signature'] )
+		{
+			IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
+			IPSText::getTextClass('bbcode')->parse_smilies				= 0;
+			IPSText::getTextClass('bbcode')->parse_html					= $member['g_dohtml'];
+			IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
+			IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
+		
+			$member['signature']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $member['signature'] );
+		
+			$member['signature'] = $this->registry->getClass('output')->getTemplate('global')->signature_separator( $member['signature'] );
+		}
+		
+		//-----------------------------------------
+		// Format 'About me'
+		//-----------------------------------------
 
+		if( $member['pp_about_me'] )
+		{
+			IPSText::getTextClass( 'bbcode' )->parse_html				= $member['g_dohtml'];
+			IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
+			IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'aboutme';
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
+			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];
+	
+			$member['pp_about_me']	= IPSText::getTextClass( 'bbcode' )->preDisplayParse( $member['pp_about_me'] );
+		}
+		
+		/* final data */
+		if ( $default_tab == 'core:info' )
+		{
+			/* Load status class */
+			if ( ! $this->registry->isClassLoaded( 'memberStatus' ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
+				$this->registry->setClass( 'memberStatus', new $classToLoad( ipsRegistry::instance() ) );
+			}
+			
+			/* Fetch */
+			$status = $this->registry->getClass('memberStatus')->fetchMemberLatest( $member['member_id'] );
+		}
+		
 		//-----------------------------------------
 		// Add to output
 		//-----------------------------------------
 		
+		$this->request['member_id'] = intval( $this->request['showuser'] );
+		
 		$this->member_name	= $member['members_display_name'];
-		$this->output		= $this->registry->getClass('output')->getTemplate('profile')->profileModern( $tabs, $member, $comment_html, $friends, $visitors, $default_tab, $tab_html );
+		$this->output		= $this->registry->getClass('output')->getTemplate('profile')->profileModern( $tabs, $member, $visitors, $default_tab, $tab_html, $friends, $status );
 	}
 	
 	/**
@@ -668,7 +699,7 @@ class public_members_profile_view extends ipsCommand
 		{
 			if ( $_id == $member_id_to_add )
 			{
-				$found  = 1;
+				$found = 1;
 				continue;
 			}
 			else
@@ -687,7 +718,7 @@ class public_members_profile_view extends ipsCommand
 	
 		if ( ! $found )
 		{
-			if ( count( $recent_visitors ) > 10 )
+			if ( count( $recent_visitors ) > 5 )
 			{
 				$_tmp = array_pop( $recent_visitors );
 			}
diff --git a/upload/admin/applications/members/modules_public/warn/defaultSection.php b/upload/admin/applications/members/modules_public/warn/defaultSection.php
deleted file mode 100644
index 2d393f95..00000000
--- a/upload/admin/applications/members/modules_public/warn/defaultSection.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define the default warn section
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Rev: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'warn';
diff --git a/upload/admin/applications/members/modules_public/warn/index.html b/upload/admin/applications/members/modules_public/warn/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications/members/modules_public/warn/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/modules_public/warn/warn.php b/upload/admin/applications/members/modules_public/warn/warn.php
deleted file mode 100644
index b0ec8bec..00000000
--- a/upload/admin/applications/members/modules_public/warn/warn.php
+++ /dev/null
@@ -1,969 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Member warn functions
- * Last Updated: $Date: 2010-10-08 10:15:14 -0400 (Fri, 08 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: mark $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Revision: 6956 $
- *
- * @todo 		[Future] Ability to require confirmation of a warning (feature)?
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_members_warn_warn extends ipsCommand
-{
-	/**
-	 * Temporary stored output HTML
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $output;
-
-	/**
-	 * Forum information
-	 *
-	 * @access	protected
-	 * @var		array		Array of forum details
-	 */
-	protected $forum			= array();
-
-	/**
-	 * Topic information
-	 *
-	 * @access	protected
-	 * @var		array		Array of topic details
-	 */
-	protected $topic			= array();
-	
-	/**
-	 * Topic ID
-	 *
-	 * @access	protected
-	 * @var		integer		Topic id
-	 */
-	protected $topic_id		= 0;
-
-	/**
-	 * Forum ID
-	 *
-	 * @access	protected
-	 * @var		integer		Forum id
-	 */
-	protected $forum_id		= 0;
-
-	/**
-	 * Moderator information
-	 *
-	 * @access	protected
-	 * @var		array		Array of moderator details
-	 */
-	protected $moderator		= array();
-
-	/**
-	 * Can ban member from warn panel
-	 *
-	 * @access	protected
-	 * @var		bool		Can ban member
-	 */
-	protected $canSuspend		= 0;
-
-	/**
-	 * Can mod queue member from warn panel
-	 *
-	 * @access	protected
-	 * @var		bool		Can mod queue member
-	 */
-	protected $canModQueue		= 0;
-
-	/**
-	 * Can remove posting rights from member from warn panel
-	 *
-	 * @access	protected
-	 * @var		bool		Can remove posting for member
-	 */
-	protected $canRemovePostAbility	= 0;
-
-	/**
-	 * Number of times per day member can be warned
-	 *
-	 * @access	protected
-	 * @var		integer		Number of times per day member can be warned
-	 */
-	protected $restrictWarnsPerDay	= 0;
-
-	/**
-	 * Type of member
-	 *
-	 * @access	protected
-	 * @var		string		mod, supmod, or member
-	 */
-	protected $type			= 'mod';
-	
-	/**
-	 * Data for the member being warned
-	 *
-	 * @access	protected
-	 * @var		array		Member being warned
-	 */
-	protected $warn_member	= array();
-	
-	/**
-	 * Class entry point
-	 *
-	 * @access	public
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		$this->loadData();
-
-		//-----------------------------------------
-		// Bouncy, bouncy!
-		//-----------------------------------------
-		
-		switch ($this->request['do'])
-		{
-			case 'dowarn':
-				$this->_doWarn();
-			break;
-			
-			case 'add_note':
-				$this->_addNoteform();
-			break;
-			
-			case 'save_note':
-				$this->_saveNote();
-			break;
-				
-			case 'view':
-				$this->viewLog();
-			break;
-			
-			case 'form':
-			default:
-				$this->_showForm();
-			break;
-		}
-		
-		$this->registry->output->addNavigation( $this->lang->words['w_title'], '' );
-		$this->registry->output->addContent( $this->output );
-		
-		if( $this->request['popup'] )
-		{
-			$this->registry->getClass('output')->popUpWindow( $this->output );
-		}
-		else
-		{
-			$this->registry->output->sendOutput();
-		}
-	}
-	
-	/**
-	 * Load all necessary properties
-	 *
-	 * @access	public
-	 * @param	boolean		Return false on error, instead of display
-	 * @return	void
-	 */
-	public function loadData( $returnOnError=false )
-	{
-		//-----------------------------------------
-		// Set up
-		//-----------------------------------------
-		
-		$this->settings[ 'warn_min'] = $this->settings['warn_min'] ? $this->settings['warn_min'] : 0;
-		$this->settings[ 'warn_max'] = $this->settings['warn_max'] ? $this->settings['warn_max'] : 10;
-		
-		//-----------------------------------------
-		// Load modules...
-		//-----------------------------------------
-		
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_mod' ), 'forums' );
-
-		if ( ! $this->settings['warn_on'] )
-		{
-			if( $returnOnError )
-			{
-				return false;
-			}
-
-			$this->registry->output->showError( 'warn_system_off', 10248 );
-		}
-		
-		/* Need app_class_forums to setup moderator stuff */
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'applications/forums/app_class_forums.php', 'app_class_forums', 'forums' );
-		$app_class_forums = new $classToLoad( $this->registry );
-
-		//-----------------------------------------
-		// Make sure we're a moderator...
-		//-----------------------------------------
-		
-		$pass = 0;
-
-		if( $this->memberData['member_id'] )
-		{
-			if( $this->memberData['g_is_supmod'] == 1 )
-			{
-				$pass				        = 1;
-				$this->canSuspend	        = $this->settings['warn_gmod_ban'];
-				$this->canModQueue	        = $this->settings['warn_gmod_modq'];
-				$this->canRemovePostAbility	= $this->settings['warn_gmod_post'];
-				$this->restrictWarnsPerDay	= intval($this->settings['warn_gmod_day']);
-				$this->canApprovePosts      = 1;
-				$this->canApproveTopics     = 1;
-				$this->canDeletePosts       = 1;
-				$this->canDeleteTopics      = 1;
-				$this->type		   	        = 'supmod';
-			}
-			else if( $this->memberData['is_mod'] )
-			{
-				$other_mgroups	= array();
-				$_other_mgroups	= IPSText::cleanPermString( $this->memberData['mgroup_others'] );
-				
-				if( $_other_mgroups )
-				{
-					$other_mgroups	= explode( ",", $_other_mgroups );
-				}
-				
-				$other_mgroups[] = $this->memberData['member_group_id'];
-
-				$this->DB->build( array( 
-										'select' => '*',
-										'from'   => 'moderators',
-										'where'  => "(member_id='" . $this->memberData['member_id'] . "' OR (is_group=1 AND group_id IN(" . implode( ",", $other_mgroups ) . ")))" 
-								)	);
-											  
-				$this->DB->execute();
-				
-				while ( $this->moderator = $this->DB->fetch() )
-				{
-					if ( $this->moderator['allow_warn'] )
-					{
-						$pass				        = 1;
-						$this->canSuspend		    = $this->settings['warn_mod_ban'];
-						$this->canModQueue	        = $this->settings['warn_mod_modq'];
-						$this->canRemovePostAbility	= $this->settings['warn_mod_post'];
-						$this->restrictWarnsPerDay	= intval($this->settings['warn_mod_day']);
-						$this->canApprovePosts      = $this->moderator['post_q'];
-						$this->canApproveTopics     = $this->moderator['topic_q'];
-						$this->canDeletePosts       = $this->moderator['delete_post'];
-						$this->canDeleteTopics      = $this->moderator['delete_topic'];
-						$this->type			        = 'mod';
-					}
-				}
-			}			
-			else if( $this->settings['warn_show_own'] and $this->memberData['member_id'] == $this->request['mid'] )
-			{
-				$pass				        = 1;
-				$this->canSuspend           = 0;
-				$this->canModQueue	        = 0;
-				$this->canRemovePostAbility	= 0;
-				$this->restrictWarnsPerDay	= 0;
-				$this->canApprovePosts      = 0;
-				$this->canApproveTopics     = 0;
-				$this->canDeletePosts       = 0;
-				$this->canDeleteTopics      = 0;
-				$this->type			        = 'member';
-			}			
-		}
-			
-		if ( $pass == 0 )
-		{
-			if( $returnOnError )
-			{
-				return false;
-			}
-
-			$this->registry->output->showError( 'warn_no_access', 2025, null, null, 403 );
-		}
-
-		//-----------------------------------------
-		// Ensure we have a valid member
-		//-----------------------------------------
-		
-		$mid = intval($this->request['mid']);
-		
-		if ( $mid < 1 )
-		{
-			if( $returnOnError )
-			{
-				return false;
-			}
-
-			$this->registry->output->showError( 'warn_no_user', 10249, null, null, 404 );
-		}
-		
-		$this->warn_member = IPSMember::load( $mid, 'all' );
-
-		if ( ! $this->warn_member['member_id'] )
-		{
-			if( $returnOnError )
-			{
-				return false;
-			}
-
-			$this->registry->output->showError( 'warn_no_user', 10250, null, null, 404 );
-		}
-		
-		$this->registry->output->setTitle( $this->page_title ? $this->page_title : $this->lang->words['w_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-	}
-	
-	/**
-	 * Save a new note
-	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	protected function _saveNote()
-	{
-		if ( $this->type == 'member' )
-		{
-			$this->registry->output->showError( 'warn_member_notes', 2026, null, null, 403 );
-		}
-		
-		/* Security Check */
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'no_permission', 3021, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$content	= '';
-		$note		= trim( $this->request['note'] );
-		$save		= array();
-
-		if ( $note )
-		{
-			//-----------------------------------------
-			// Ready to save?
-			//-----------------------------------------
-		
-			$save['wlog_notes']		= "<content>{$note}</content>";
-			$save['wlog_notes']		.= "<mod></mod>";
-			$save['wlog_notes']		.= "<post></post>";
-			$save['wlog_notes']		.= "<susp></susp>";
-		
-			$save['wlog_mid']		= $this->warn_member['member_id'];
-			$save['wlog_addedby']	= $this->memberData['member_id'];
-			$save['wlog_type']		= 'note';
-			$save['wlog_date']		= time();
-			
-			//-----------------------------------------
-			// Enter into warn loggy poos (eeew - poo)
-			//-----------------------------------------
-		
-			$this->DB->insert( 'warn_logs', $save );
-		}
-		
-		//-----------------------------------------
-		// Done...
-		//-----------------------------------------
-		
-		$popup	= $this->request['popup'] ? '&amp;popup=1' : '';
-		
-		$this->registry->output->silentRedirect( $this->settings['base_url']."app=members&amp;module=warn&amp;section=warn&amp;mid={$this->warn_member['member_id']}&amp;do=view" . $popup );
-	}
-	
-	/**
-	 * Form to add a new note
-	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	protected function _addNoteForm()
-	{
-		if ( $this->type == 'member' )
-		{
-			$this->registry->output->showError( 'warn_member_notes', 2027, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$content	= '';
-
-		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->warn_add_note_form( $this->warn_member['member_id'], $this->warn_member['members_display_name'], $this->warn_member['members_seo_name'] );
-		
-		$this->registry->getClass('output')->setTitle( $this->lang->words['warn_popup_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		$this->registry->getClass('output')->popUpWindow( $this->output );
-	}
-	
-	/**
-	 * View the warn logs
-	 *
-	 * @access	public
-	 * @return	string		HTML output
-	 */
-	public function viewLog()
-	{
-		$perpage	= 50;
-		$start		= intval($this->request['st']) >= 0 ? intval($this->request['st']) : 0;
-		$row		= $this->DB->buildAndFetch( array( 'select' => 'count(*) as cnt', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['member_id']}" ) );
-		$rows		= array();
-
-		$links		= $this->registry->output->generatePagination( array(
-																		'totalItems'		=> $row['cnt'],
-																		'itemsPerPage'		=> $perpage,
-																		'currentStartValue'	=> $start,
-																		'baseUrl'			=> "app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$this->warn_member['member_id']}",
-												 )	  );
-				
-		if ( $row['cnt'] > 0 )
-		{
-			$this->DB->build( array( 
-									'select'	=> 'l.*',
-									'from'		=> array( 'warn_logs' => 'l' ),
-									'where'		=> 'l.wlog_mid=' . $this->warn_member['member_id'],
-									'order'		=> 'l.wlog_date DESC ',
-									'limit'		=> array( $start, $perpage ),
-									'add_join'	=> array(
-														array( 
-															'select'	=> 'p.member_id as punisher_id, p.members_display_name as punisher_name, p.members_seo_name, p.member_group_id, p.mgroup_others',
-															'from'		=> array( 'members' => 'p' ),
-															'where'		=> 'p.member_id=l.wlog_addedby',
-															'type'		=> 'left',
-															)
-														)
-							)		);
-			$q =$this->DB->execute();
-		
-			while ( $r = $this->DB->fetch( $q ) )
-			{
-				if ( strstr( $r['wlog_notes'], '<content>' ) )
-				{
-					$raw = preg_match( "#<content>(.+?)</content>#is", $r['wlog_notes'], $match );
-				}
-				else
-				{
-					$_array = unserialize( $r['wlog_notes'] );
-					
-					if ( is_array( $_array ) AND $_array['content'] )
-					{
-						$match[1] = $_array['content'];
-					}
-				}
-				
-				IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
-				IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $r['member_group_id'];
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $r['mgroup_others'];
-		
-				$r['content'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $match[1] );
-				
-				$rows[] = $r;
-			}
-		}
-		
-		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->warn_view_log( $this->warn_member, $rows, $links );
-		
-		$this->registry->getClass('output')->setTitle( $this->lang->words['warn_popup_title'] . ' - ' . ipsRegistry::$settings['board_name'] );
-		
-		return $this->output;
-	}
-	
-	/**
-	 * Add a new arn entry
-	 *
-	 * @access	protected
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	protected function _doWarn()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$save                  = array();
-		$err 				   = 0;
-		$topicPosts_type       = trim( $this->request['topicPosts_type'] );
-		$topicPosts_topics     = intval( $this->request['topicPosts_topics'] );
-		$topicPosts_replies    = intval( $this->request['topicPosts_replies'] );
-		$topicPosts_lastx      = intval( $this->request['topicPosts_lastx'] );
-		$topicPosts_lastxunits = trim( $this->request['topicPosts_lastxunits'] );
-		$level_custom		   = intval( $this->request['level_custom'] );
-		$ban_indef			   = intval( $this->request['ban_indef'] );
-		$member_banned		   = intval( $this->warn_member['member_banned'] );
-		$warn_level            = intval( $this->warn_member['warn_level']) ;
-		
-		//--------------------------------------
-		// Are we allowed to do this?
-		//--------------------------------------
-		
-		if ( $this->request['level'] == 'add' or ( $this->request['level'] == 'custom' and $level_custom > $warn_level ) )
-		{
-			$this->_checkAccess();
-		}
-		
-		//-----------------------------------------
-		// Load Mod Squad
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
-		$moderatorLibrary = new $classToLoad( $this->registry );
-		
-		//-----------------------------------------
-		// Security checks
-		//-----------------------------------------
-		
-		if ( $this->type == 'member' )
-		{
-			$this->registry->output->showError( 'warn_member_notes', 2028, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// Check security fang
-		//-----------------------------------------
-		
-		if ( $this->request['key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'warn_bad_key', 3020, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// As Celine Dion once squawked, "Show me the reason"
-		//-----------------------------------------
-		
-		if ( trim($this->request['reason']) == "" )
-		{
-			$this->_showForm( 'we_no_reason' );
-			return;
-		}
-		
-		//-----------------------------------------
-		// Other checks
-		//-----------------------------------------
-		
-		if ( ! $this->settings['warn_past_max'] && $this->request['level'] != 'nochange' )
-		{
-			if ( $this->request['level'] == 'custom' )
-			{
-				if ( $level_custom > $this->settings['warn_max'] )
-				{
-					$err = 1;
-				}
-				else if( $level_custom < $this->settings['warn_min'] )
-				{
-					$err = 2;
-				}
-			}
-			else if ( $this->request['level'] == 'add' )
-			{
-				if ( $warn_level >= $this->settings['warn_max'] )
-				{
-					$err = 1;
-				}
-			}
-			else
-			{
-				if ( $warn_level <= $this->settings['warn_min'] )
-				{
-					$err = 2;
-				}
-			}
-			
-			if ( $err )
-			{
-				$this->registry->output->showError( $err == 1 ? 'warn_past_max_high' : 'warn_past_max_low', 10251 );
-			}
-		}
-
-		//-----------------------------------------
-		// Plussy - minussy?
-		//-----------------------------------------
-		
-		if( $this->request['level'] == 'nochange' )
-		{
-			$save['wlog_type'] = 'nochan';
-		}
-		else
-		{
-			$save['wlog_type']	= ( $this->request['level'] == 'custom' ) ? 'custom' : ( ( $this->request['level'] == 'add' ) ? 'neg' : 'pos' );
-		}
-		$save['wlog_date']	= time();
-		
-		//-----------------------------------------
-		// Contacting the member?
-		//-----------------------------------------
-		
-		$test_content = trim( IPSText::br2nl( $_POST['contact'] ) ) ;
-
-		if ( $test_content != "" )
-		{
-			if ( trim($this->request['subject']) == "" )
-			{
-				$this->_showForm('we_no_subject');
-				return;
-			}
-		
-			unset($test_content);
-			
-			if ( IPSText::getTextClass('editor')->method == 'rte' )
-			{
-				$this->request['contact'] = IPSText::getTextClass('editor')->processRawPost( 'contact' );
-			}
-
-			IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
-			IPSText::getTextClass( 'bbcode' )->parse_html		= 0;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
-
-			$save['wlog_contact']			= $this->request['contactmethod'];
-			$save['wlog_contact_content']	= "<subject>" . $this->request['subject'] . "</subject><content>" . $this->request['contact'] . "</content>";
-			$save['wlog_contact_content']	= IPSText::getTextClass( 'bbcode' )->preDbParse( $save['wlog_contact_content'] );
-
-			if ( $this->request['contactmethod'] == 'email' )
-			{
-				IPSText::getTextClass( 'bbcode' )->parse_smilies			= 0;
-				IPSText::getTextClass( 'bbcode' )->parse_html				= 1;
-				IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-				IPSText::getTextClass( 'bbcode' )->parsing_section			= 'warn';
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $this->memberData['member_group_id'];
-				IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $this->memberData['mgroup_others'];
-				
-				$this->request['contact'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( IPSText::getTextClass( 'bbcode' )->preDbParse( $this->request['contact'] ) );
-				
-				//-----------------------------------------
-				// Send the email
-				//-----------------------------------------
-				
-				IPSText::getTextClass( 'email' )->getTemplate("email_member");
-					
-				IPSText::getTextClass( 'email' )->buildMessage( array(
-																		'MESSAGE'		=> IPSText::br2nl( $this->request['contact'] ),
-																		'MEMBER_NAME'	=> $this->warn_member['members_display_name'],
-																		'FROM_NAME'		=> $this->memberData['members_display_name']
-																		)
-																);
-
-				IPSText::getTextClass( 'email' )->subject	= $this->request['subject'];
-				IPSText::getTextClass( 'email' )->to		= $this->warn_member['email'];
-				IPSText::getTextClass( 'email' )->from		= $this->settings['email_out'];
-				IPSText::getTextClass( 'email' )->sendMail();
-			}
-			else
-			{
-				//-----------------------------------------
-				// Grab PM class
-				//-----------------------------------------
-				
-				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
-				$messengerFunctions = new $classToLoad( $this->registry );
- 				
-				try
-				{
-				 	$messengerFunctions->sendNewPersonalTopic( $this->warn_member['member_id'],
-															$this->memberData['member_id'], 
-															array(), 
-															$this->request['subject'], 
-															IPSText::getTextClass( 'editor' )->method == 'rte' ? nl2br($_POST['contact']) : $_POST['contact'], 
-															array( 'origMsgID'			=> 0,
-																	'fromMsgID'			=> 0,
-																	'postKey'			=> md5(microtime()),
-																	'trackMsg'			=> 0,
-																	'addToSentFolder'	=> 0,
-																	'hideCCUser'		=> 0,
-																	'forcePm'			=> 1,
-																)
-															);
-				}
-				catch( Exception $error )
-				{
-					$msg		= $error->getMessage();
-					$toMember	= IPSMember::load( $this->warn_member['member_id'], 'core' );
-				   
-					if ( strstr( $msg, 'BBCODE_' ) )
-				    {
-						$msg = str_replace( 'BBCODE_', '', $msg );
-	
-						$this->registry->output->showError( $msg, 10252 );
-					}
-					else if ( isset($this->lang->words[ 'err_' . $msg ]) )
-					{
-						$this->lang->words[ 'err_' . $msg ] = $this->lang->words[ 'err_' . $msg ];
-						$this->lang->words[ 'err_' . $msg ] = str_replace( '#NAMES#'   , implode( ",", $messengerFunctions->exceptionData ), $this->lang->words[ 'err_' . $msg ] );
-						$this->lang->words[ 'err_' . $msg ] = str_replace( '#TONAME#'  , $toMember['members_display_name']    , $this->lang->words[ 'err_' . $msg ] );
-						$this->lang->words[ 'err_' . $msg ] = str_replace( '#FROMNAME#', $this->memberData['members_display_name'], $this->lang->words[ 'err_' . $msg ] );
-						
-						$this->registry->output->showError( 'err_' . $msg, 10253 );
-					}
-					else if( $msg != 'CANT_SEND_TO_SELF' )
-					{
-						$_msgString = $this->lang->words['err_UNKNOWN'] . ' ' . $msg;
-						$this->registry->output->showError( $_msgString, 10254 );
-					}
-				}
-			}
-		}
-		else
-		{
-			unset($test_content);
-		}
-		
-		//-----------------------------------------
-		// Right - is we banned or wha?
-		//-----------------------------------------
-			
-		$restrict_post	= '';
-		$mod_queue		= '';
-		$susp			= '';
-		$_notes         = array();
-		
-		$_notes['content'] = $this->request['reason'];
-		$_notes['mod']     = $this->request['mod_value'];
-		$_notes['post']    = $this->request['post_value'];
-		$_notes['susp']    = $this->request['susp_value'];
-		$_notes['ban']     = $ban_indef;
-		$_notes['topicPosts_type']       = $topicPosts_type;
-		$_notes['topicPosts_topics']     = $topicPosts_topics;
-		$_notes['topicPosts_replies']    = $topicPosts_replies;
-		$_notes['topicPosts_lastx']      = $topicPosts_lastx;
-		$_notes['topicPosts_lastxunits'] = $topicPosts_lastxunits;
-		
-		$save['wlog_notes'] = serialize( $_notes );
-		
-		//-----------------------------------------
-		// Member Content
-		//-----------------------------------------
-		
-		if ( $topicPosts_type == 'unapprove' OR $topicPosts_type == 'approve' )
-		{
-			$time    = ( $topicPosts_lastxunits == 'd' ) ? ( $topicPosts_lastx * 24 ) : $topicPosts_lastx;
-			$approve = ( $topicPosts_type == 'approve' ) ? TRUE : FALSE;
-			
-			if ( ( $topicPosts_topics AND $this->canApproveTopics ) AND ( $topicPosts_replies AND $this->canApprovePosts ) )
-			{
-				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'all', $time );
-			}
-			else if ( $topicPosts_topics AND $this->canApproveTopics )
-			{
-				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'topics', $time );
-			}
-			else if ( $topicPosts_replies AND $this->canApprovePosts )
-			{
-				$moderatorLibrary->toggleApproveMemberContent( $this->warn_member['member_id'], $approve, 'replies', $time );
-			}
-		}
-		else if ( $topicPosts_type == 'delete')
-		{
-			$time = ( $topicPosts_lastxunits == 'd' ) ? ( $topicPosts_lastx * 24 ) : $topicPosts_lastx;
-			
-			if ( ( $topicPosts_topics AND $this->canDeleteTopics ) AND ( $topicPosts_replies AND $this->canDeletePosts ) )
-			{
-				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'all', $time );
-			}
-			else if ( $topicPosts_topics AND $this->canDeleteTopics )
-			{
-				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'topics', $time );
-			}
-			else if ( $topicPosts_replies AND $this->canDeletePosts )
-			{
-				$moderatorLibrary->deleteMemberContent( $this->warn_member['member_id'], 'replies', $time );
-			}
-		}
-		
-		//-----------------------------------------
-		// Member Suspension
-		//-----------------------------------------
-		
-		if ( $this->canModQueue )
-		{
-			if ( $this->request['mod_indef'] == 1 )
-			{
-				$mod_queue = 1;
-			}
-			elseif ( $this->request['mod_value'] > 0 )
-			{
-				$mod_queue = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['mod_value']), 'unit' => $this->request['mod_unit']  ) );
-			}
-		}
-		
-		if ( $this->canRemovePostAbility )
-		{
-			if ( $this->request['post_indef'] == 1 )
-			{
-				$restrict_post = 1;
-			}
-			elseif ( $this->request['post_value'] > 0 )
-			{
-				$restrict_post = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['post_value']), 'unit' => $this->request['post_unit']  ) );
-			}
-		}
-		
-		if ( $this->canSuspend )
-		{
-			if ( $ban_indef )
-			{
-				$member_banned = 1;
-			}
-			else if ( $this->request['susp_value'] > 0 )
-			{
-				$susp = IPSMember::processBanEntry( array( 'timespan' => intval($this->request['susp_value']), 'unit' => $this->request['susp_unit']  ) );
-			}
-			
-			/* Were banned but now unticked? */
-			if ( ! $ban_indef AND $member_banned )
-			{
-				$member_banned = 0;
-			}
-		}
-		
-		$save['wlog_mid']		= $this->warn_member['member_id'];
-		$save['wlog_addedby']	= $this->memberData['member_id'];
-		
-		//-----------------------------------------
-		// Enter into warn loggy poos (eeew - poo)
-		//-----------------------------------------
-
-		$this->DB->insert( 'warn_logs', $save );
-		
-		//-----------------------------------------
-		// Update member
-		//-----------------------------------------
-		
-		if( $this->request['level'] != 'nochange' )
-		{
-			if ( $this->request['level'] == 'custom' )
-			{
-				$warn_level = $level_custom;
-			}
-			else if ( $this->request['level'] == 'add' )
-			{
-				$warn_level++;
-			}
-			else
-			{
-				$warn_level--;
-			}
-			
-			if ( $warn_level > $this->settings['warn_max'] )
-			{
-				$warn_level = $this->settings['warn_max'];
-			}
-			
-			if ( $warn_level < intval($this->settings['warn_min']) )
-			{
-				$warn_level = intval($this->settings['warn_min']);
-			}
-		}
-		
-		IPSMember::save( $this->warn_member['member_id'], array( 'core' => array( 'mod_posts'		=> $mod_queue,
-																				  'restrict_post'	=> $restrict_post,
-																				  'temp_ban'		=> $susp,
-																				  'member_banned'   => $member_banned,
-																				  'warn_level'	    => $warn_level,
-																				  'warn_lastwarn'	=> time() ) ) );
-		
-		//-----------------------------------------
-		// Now what? Show success screen, that's what!!
-		//-----------------------------------------
-		
-		$this->lang->words['w_done_te'] = sprintf( $this->lang->words['w_done_te'], $this->warn_member['members_display_name'] );
-		
-		$tid	= intval($this->request['t']);
-		$topic	= array();
-		
-		if ( $tid > 0 )
-		{
-			$topic = $this->DB->buildAndFetch( array( 
-														'select'	=> 't.tid, t.title, t.title_seo',
-														'from'		=> array( 'topics' => 't' ),
-														'where'		=> "t.tid={$tid}",
-														'add_join'	=> array( array( 
-																					'select' => 'f.id, f.name, f.name_seo',
-																					'from'	  => array( 'forums' => 'f' ),
-																					'where'  => 'f.id=t.forum_id',
-																					'type'	  => 'left' 
-																			)	) 
-											)	);
-		}
-		
-		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->warn_success( $topic );
-	}
-	
-	/**
-	 * Show the add new warn form
-	 *
-	 * @access	protected
-	 * @param 	mixed		Empty | Error message language key
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	protected function _showForm( $errors="" )
-	{
-		if ( $this->type == 'member' )
-		{
-			$this->registry->output->showError( 'warn_member_notes', 10255, null, null, 403 );
-		}
-
-		$this->warn_member['warn_level'] = intval($this->warn_member['warn_level']);
-				
-		$this->request['contact'] = $this->request['contact'] ? IPSText::getTextClass( 'bbcode' )->preEditParse( $this->request['contact'] ) : '';
-
-		$this->output .= $this->registry->getClass('output')->getTemplate('mod')->warnForm( IPSMember::buildDisplayData( $this->warn_member, '__all__' ),
-																							intval($this->request['t']),
-																							intval($this->request['st']),
-																							$errors ? $this->lang->words[$errors] : '',
-																							$this->canModQueue,
-																							$this->canRemovePostAbility,
-																							$this->canSuspend,
-																							IPSText::getTextClass( 'editor' )->showEditor( $this->request['contact'] ? $this->request['contact'] : '', 'contact' ) );
-	}
-	
-	/**
-	 * Checking method access
-	 *
-	 * @access	protected
-	 * @return	void		[Displays error if appropriate]
-	 */
-	protected function _checkAccess()
-	{
-		//-----------------------------------------
-		// Protected member? Really? o_O
-		//-----------------------------------------
-		
-		if ( strstr( ',' . $this->settings['warn_protected'] . ',', ',' . $this->warn_member['member_group_id'] . ',' ) )
-		{
-			$this->registry->output->showError( 'warn_protected_member', 10256, null, null, 403 );
-		}
-		
-		//-----------------------------------------
-		// I've already warned you!!
-		//-----------------------------------------
-		
-		if ( $this->restrictWarnsPerDay > 0 )
-		{
-			$time_to_check = time() -  86400;
-			
-			$check = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as warn_times', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['member_id']} AND wlog_date > $time_to_check" ) );
-			
-			if ( $check['warn_times'] >= $this->restrictWarnsPerDay )
-			{
-				$this->registry->output->showError( 'warned_already', 10257, null, null, 403 );
-			}
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/setup/index.html b/upload/admin/applications/members/setup/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/setup/index.html
+++ b/upload/admin/applications/members/setup/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/setup/versions/index.html b/upload/admin/applications/members/setup/versions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/setup/versions/index.html
+++ b/upload/admin/applications/members/setup/versions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/setup/versions/install/index.html b/upload/admin/applications/members/setup/versions/install/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/setup/versions/install/index.html
+++ b/upload/admin/applications/members/setup/versions/install/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/setup/versions/install/sql/index.html b/upload/admin/applications/members/setup/versions/install/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/setup/versions/install/sql/index.html
+++ b/upload/admin/applications/members/setup/versions/install/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/setup/versions/install/sql/members_mysql_tables.php b/upload/admin/applications/members/setup/versions/install/sql/members_mysql_tables.php
index e96a8919..c77daa8f 100644
--- a/upload/admin/applications/members/setup/versions/install/sql/members_mysql_tables.php
+++ b/upload/admin/applications/members/setup/versions/install/sql/members_mysql_tables.php
@@ -10,7 +10,7 @@ $TABLE[] = "CREATE TABLE message_posts (
   msg_post text,
   msg_post_key varchar(32) NOT NULL default '0',
   msg_author_id mediumint(8) NOT NULL default 0,
-  msg_ip_address varchar(16) NOT NULL default '0',
+  msg_ip_address varchar(46) NOT NULL default '0',
   msg_is_first_post int(1) NOT NULL default 0,
   PRIMARY KEY  (msg_id),
   KEY msg_topic_id (msg_topic_id),
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_banfilters.php b/upload/admin/applications/members/skin_cp/cp_skin_banfilters.php
index 0f713467..79cabf9c 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_banfilters.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_banfilters.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP ban filters skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-08-19 20:27:50 -0400 (Fri, 19 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 5713 $
+ * @version		$Rev: 9401 $
  *
  */
  
-class cp_skin_banfilters extends output
+class cp_skin_banfilters
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Ban filter overview screen
  *
- * @access	public
  * @param	array 		IPs
  * @param	array 		Emails
  * @param	array 		Usernames
@@ -44,136 +74,191 @@ public function banOverview( $ips, $emails, $names ) {
 $IPBHTML = "";
 //--starthtml--//
 
+$canRemove = $this->registry->class_permissions->checkPermission( 'ban_remove' );
+
+/* Ban types */
+$ban				= array();
+$ban['bantype']		= $this->registry->output->formDropdown( 'bantype', array( array( 'ip', $this->lang->words['ban_ip'] ), array( 'email', $this->lang->words['ban_email'] ), array( 'name', $this->lang->words['ban_name'] ) ) );
+$ban['bantext']		= $this->registry->output->formSimpleInput( 'bantext', '', 50 );
+$ban['banreason']	= $this->registry->output->formSimpleInput( 'banreason', '', 50 );
+
+/* Remove new lines from the type dropdown or JS won't be happy.. */
+$ban['bantype']		= IPSText::br2nl($ban['bantype']);
+
+
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['ban_title']}</h2>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='#' id='add_banfilter' title='{$this->lang->words['ban_addnew']}'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['ban_addnew']}</a>
+			</li>
+		</ul>
+	</div>
 </div>
 
-<form method='post' action='{$this->settings['base_url']}{$this->form_code}&amp;do=ban_add'>
+<script tyle='text/javascript' src='{$this->settings['js_app_url']}acp.banfilters.js'></script>
+<form method='post' id='ban-delete' action='{$this->settings['base_url']}{$this->form_code}'>
+	<input type='hidden' name='do' value='ban_delete' />
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-	<input type='text' size='30' class='input_text' value='' name='bantext' />
-	<select class='input_select' name='bantype' style='vertical-align:middle;'>
-		<option value='ip'>{$this->lang->words['ban_ip']}</option>
-		<option value='email'>{$this->lang->words['ban_email']}</option>
-		<option value='name'>{$this->lang->words['ban_name']}</option>						
-	</select>
-	<input type='submit' value='{$this->lang->words['ban_addnew']}' class='button primary' />						
-</form>
 
-<div class='acp-box' style='margin-top: 4px;'>
-	<h3>{$this->lang->words['ban_bancontrol']}</h3>
-	<form method='post' id='ban-delete' action='{$this->settings['base_url']}{$this->form_code}&amp;do=ban_delete'>
-		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-			<table width='100%' class='alternate_rows double_pad'>
-				<tr>
-					<th colspan='3'>{$this->lang->words['ban_ips']}</th>			
-				</tr>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['ban_bancontrol']}</h3>
+		
+		<div id='tabstrip_banForm' class='ipsTabBar with_left with_right'>
+			<span class='tab_left'>&laquo;</span>
+			<span class='tab_right'>&raquo;</span>
+			<ul>
+				<li id='tab_BanIps'>{$this->lang->words['ban_ips']}</li>
+				<li id='tab_BanEmails'>{$this->lang->words['ban_emails']}</li>
+				<li id='tab_BanNames'>{$this->lang->words['ban_names']}</li>
+			</ul>
+		</div>
+		
+		<div id='tabstrip_banForm_content' class='ipsTabBar_content'>
+			
+			<!-- IP ADDRESSES -->
+			<div id='tab_BanIps_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<th width='1%'>&nbsp;</th>
+						<th width='15%'>{$this->lang->words['ban_ip']}</th>
+						<th width='60%'>{$this->lang->words['ban_form_reason']}</th>
+						<th width='24%'>{$this->lang->words['ban_added_on']}</th>
+					</tr>
 HTML;
 
 if( is_array( $ips ) && count( $ips ) )
 {
 	foreach( $ips as $r )
 	{
-$IPBHTML .= <<<HTML
-		<tr>
-			<td width='1%'>{$r['_checkbox']}</td>
-			<td width='80%'>{$r['ban_content']}</td>
-			<td width='20%'>{$r['_date']}</td>
-		</tr>
+			$checkbox = $canRemove ? "<input type='checkbox' name='banid_{$r['ban_id']}' value='1' />" : '';
+			
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td>{$checkbox}</td>
+						<td>{$r['ban_content']}</td>
+						<td>{$r['ban_reason']}</td>
+						<td>{$r['_date']}</td>
+					</tr>
 HTML;
 	}
 }
 else
 {
-$IPBHTML .= <<<HTML
-		<tr>
-			<td colspan='3'>{$this->lang->words['ban_ips_none']}</td>
-		</tr>
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td colspan='4'>{$this->lang->words['ban_ips_none']}</td>
+					</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-		<tr>
-			<th colspan='3'>{$this->lang->words['ban_emails']}</th>			
-		</tr>
-		
+		 		</table>
+			</div>
+			
+			<!-- EMAIL ADDRESSES -->
+			<div id='tab_BanEmails_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<th width='1%'>&nbsp;</th>
+						<th width='20%'>{$this->lang->words['ban_email']}</th>
+						<th width='55%'>{$this->lang->words['ban_form_reason']}</th>
+						<th width='24%'>{$this->lang->words['ban_added_on']}</th>
+					</tr>
 HTML;
 
 if( is_array( $emails ) && count( $emails ) )
 {
 	foreach( $emails as $r )
 	{
-$IPBHTML .= <<<HTML
-		<tr>
-			<td width='1%'>{$r['_checkbox']}</td>
-			<td width='80%'>{$r['ban_content']}</td>
-			<td width='20%'>{$r['_date']}</td>
-		</tr>
+			$checkbox = $canRemove ? "<input type='checkbox' name='banid_{$r['ban_id']}' value='1' />" : '';
+			
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td>{$checkbox}</td>
+						<td>{$r['ban_content']}</td>
+						<td>{$r['ban_reason']}</td>
+						<td>{$r['_date']}</td>
+					</tr>
 HTML;
 	}
 }
 else
 {
-$IPBHTML .= <<<HTML
-		<tr>
-			<td colspan='3'>{$this->lang->words['ban_emails_none']}</td>
-		</tr>
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td colspan='4'>{$this->lang->words['ban_emails_none']}</td>
+					</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-		<tr>
-			<th colspan='3'>{$this->lang->words['ban_names']}</th>			
-		</tr>
+		 		</table>
+			</div>
+			
+			<!-- NAMES -->
+			<div id='tab_BanNames_content'>
+				<table class='ipsTable double_pad'>
+					<tr>
+						<th width='1%'>&nbsp;</th>
+						<th width='15%'>{$this->lang->words['ban_name']}</th>
+						<th width='60%'>{$this->lang->words['ban_form_reason']}</th>
+						<th width='24%'>{$this->lang->words['ban_added_on']}</th>
+					</tr>
 HTML;
 
 if( is_array( $names ) && count( $names ) )
 {
 	foreach( $names as $r )
 	{
-$IPBHTML .= <<<HTML
-		<tr>
-			<td width='1%'>{$r['_checkbox']}</td>
-			<td width='80%'>{$r['ban_content']}</td>
-			<td width='20%'>{$r['_date']}</td>
-		</tr>
+			$checkbox = $canRemove ? "<input type='checkbox' name='banid_{$r['ban_id']}' value='1' />" : '';
+			
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td>{$checkbox}</td>
+						<td>{$r['ban_content']}</td>
+						<td>{$r['ban_reason']}</td>
+						<td>{$r['_date']}</td>
+					</tr>
 HTML;
 	}
 }
 else
 {
+			$IPBHTML .= <<<HTML
+					<tr>
+						<td colspan='4'>{$this->lang->words['ban_names_none']}</td>
+					</tr>
+HTML;
+}
+
 $IPBHTML .= <<<HTML
-		<tr>
-			<td colspan='3'>{$this->lang->words['ban_names_none']}</td>
-		</tr>
+		 		</table>
+			</div>
+			
+			<script type='text/javascript'>
+				jQ("#tabstrip_banForm").ipsTabBar({ tabWrap: "#tabstrip_banForm_content" });
+			</script>
+		</div>
+HTML;
+		
+if ( $canRemove )
+{
+	$IPBHTML .= <<<HTML
+		<div class='acp-actionbar'>
+			<input type='submit' value='{$this->lang->words['ban_deletebutton']}' class='realbutton redbutton' />
+		</div>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-		</tr>
-	</table>
-	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['ban_deletebutton']}' class='realbutton redbutton' />
 	</div>
-	</form>
-</div>
+</form>
+
 <script type='text/javascript'>
-$('ban-delete').observe( 'submit', function( e ){ 
-	var checkboxes = $('ban-delete').getElementsByTagName( 'input' );
-
-	for( var i = 0; i < checkboxes.length; i++ )
-	{
-		if( checkboxes[i].checked )
-		{
-			return true;
-		}
-	}
-
-	alert( '{$this->lang->words['no_ban_to_delete']}' );
-
-	Event.stop( e );
-});
-
+	ipb.templates['add_banfilter'] = "<div class='acp-box'><h3>{$this->lang->words['ban_addnew']}</h3><form action='{$this->settings['base_url']}{$this->form_code}do=ban_add' method='post'><table class='ipsTable double_pad'><tr><td class='field_title' style='min-width:100px;'><strong class='title'>{$this->lang->words['ban_form_type']}</strong></td><td class='field_field'>{$ban['bantype']}</td></tr><tr><td class='field_title' style='min-width:100px;'><strong class='title'>{$this->lang->words['ban_form_filter']}</strong></td><td class='field_field'>{$ban['bantext']}<br /><span class='desctext'>{$this->lang->words['ban_form_filter_desc']}</span></td></tr><tr><td class='field_title' style='min-width:100px;'><strong class='title'>{$this->lang->words['ban_form_reason']}</strong></td><td class='field_field'>{$ban['banreason']}<br /><span class='desctext'>{$this->lang->words['ban_form_reason_desc']}</span></td></tr></table><div class='acp-actionbar'><input type='submit' value='{$this->lang->words['ban_addnew']}' class='button primary' /></div></form></div>";
 </script>
 HTML;
 
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_bulkmail.php b/upload/admin/applications/members/skin_cp/cp_skin_bulkmail.php
index 7fa351bc..4a9499f8 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_bulkmail.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_bulkmail.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP bulk mail skin file
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6925 $
+ * @version		$Rev: 8644 $
  *
  */
  
-class cp_skin_bulkmail extends output
+class cp_skin_bulkmail
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Bulk mail start
  *
- * @access	public
  * @param	array 		Mail data
  * @param	int			Number of members to send this to
  * @return	string		HTML
@@ -48,7 +78,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<HTML
 <div class='information-box'>
-	<h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_error.png' />{$this->lang->words['bulkmail_notes_tl']}</h4> 
+	<h3><strong>{$this->lang->words['bulkmail_notes_tl']}</strong></h3> 
 	{$this->lang->words['bulkmail_notes_info']}
 </div>
 <br />
@@ -61,7 +91,7 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$countmembers}</h3>
 	
-		<table class='form_table double_pad alternate_rows' cellspacing='0' cellpadding='0'>
+		<table class='ipsTable double_pad' cellspacing='0' cellpadding='0'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['b_maildetails']}</th>
 			</tr>
@@ -91,9 +121,9 @@ $IPBHTML .= <<<HTML
 				</td>
 		 	</tr>
 		</table>
-	</div>
-	<div class='acp-actionbar'>
-		{$this->lang->words['b_percycle']} <input type='text' class='realbutton' size='5' name='pergo' value='20' /> &nbsp; <input type='submit' value='{$this->lang->words['b_mailbutton']}' class='realbutton' />
+		<div class='acp-actionbar'>
+			{$this->lang->words['b_percycle']} <input type='text' class='input_text' size='5' name='pergo' value='20' /> &nbsp; <input type='submit' value='{$this->lang->words['b_mailbutton']}' class='realbutton' />
+		</div>
 	</div>
 </form>
 HTML;
@@ -105,7 +135,6 @@ return $IPBHTML;
 /**
  * Bulk mail form
  *
- * @access	public
  * @param	string		Type (add|edit)
  * @param	array 		Mail data
  * @param	string		Mail content
@@ -188,7 +217,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<HTML
 <div class='information-box'>
-	<h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_error.png' />{$this->lang->words['bulkmail_notes_tl']}</h4> 
+	<h3><strong>{$this->lang->words['bulkmail_notes_tl']}</strong></h3> 
 	{$this->lang->words['bulkmail_notes_info']}
 </div>
 <br />
@@ -223,33 +252,29 @@ function runpreview()
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 		
-		<table class='form_table double_pad alternate_rows' cellspacing='0' cellpadding='0'>
+		<table class='ipsTable double_pad' cellspacing='0' cellpadding='0'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['b_step1_title']}</th>
 			</tr>
 			<tr>
-		 		<td style='width: 40%;'>
-					<label>{$this->lang->words['b_subject']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['b_subject']}</strong>
 				</td>
-		 		<td style='width: 60%'>
+		 		<td class='field_field'>
 		 			{$form['mail_subject']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td colspan='2'>
-					<label>{$this->lang->words['b_content']}</label>
-					<br />
-					<div style='margin-top: 10px; margin-left: 15px;'>{$form['mail_content']}</div>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['b_content']}</strong>
+				</td>
+				<td class='field_field'>
+					{$form['mail_content']}<br />
+					<p style='margin-top: 5px' class='desctext'>
+						{$form['mail_html']}&nbsp;{$this->lang->words['b_html']}
+					</p>
 				</td>
 		 	</tr>
-			<tr>
-				<td>
-					<label>{$this->lang->words['b_html']}</label>
-				</td>
-				<td>
-					{$form['mail_html']}&nbsp;
-				</td>
-			</tr>
 		</table>
 	</div>
 	<br />
@@ -257,53 +282,53 @@ function runpreview()
 		<h3>{$this->lang->words['b_step2']}</h3>
 		
 		<div style='width: 100%;'>
-			<table class='form_table double_pad alternate_rows' cellspacing='0' cellpadding='0'>
+			<table class='ipsTable double_pad' cellspacing='0' cellpadding='0'>
 				<tr>
 					<th colspan='2'>{$this->lang->words['b_addfilters']}</th>
 					<th>{$this->lang->words['b_groups']}</th>
 				</tr>
 				<tr>
-			 		<td style='width: 40%;'>
-						<label>{$this->lang->words['b_nposts']}</label><br />
-						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
+			 		<td class='field_title' style='width: 25%; max-width: 280px; min-width: 230px;'>
+						<strong class='title'>{$this->lang->words['b_nposts']}</strong>
 					</td>
-			 		<td style='width: 30%'>
-			 			{$form['mail_post_ltmt']} {$form['mail_filter_post']}
+			 		<td class='field_field' style='width: 40%'>
+			 			{$form['mail_post_ltmt']} {$form['mail_filter_post']}<br />
+						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
 			 		</td>
-					<td style='width: 30%;' rowspan='3'>
+					<td style='width: 30%; line-height: 1.5; vertical-align: top' class='larger_text' rowspan='3'>
 						{$form['groups']}
 					</td>
 			 	</tr>
 				<tr>
-					<td>
-						<label>{$this->lang->words['b_ndays']}</label><br />
-						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['b_ndays']}</strong>
 					</td>
-					<td>
-						{$form['mail_visit_ltmt']} {$form['mail_filter_visit']}
+					<td class='field_field'>
+						{$form['mail_visit_ltmt']} {$form['mail_filter_visit']}<br />
+						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
 					</td>
 				</tr>
 				<tr>
-					<td>
-						<label>{$this->lang->words['b_njoined']}</label><br />
-						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['b_njoined']}</strong>
 					</td>
-					<td>
-						{$form['mail_joined_ltmt']} {$form['mail_filter_joined']}
+					<td class='field_field'>
+						{$form['mail_joined_ltmt']} {$form['mail_filter_joined']}<br />
+						<span class='desctext'>{$this->lang->words['b_leaveblank']}</span>
 					</td>
 				</tr>
 			</table>
 		</div>
+		<div class='acp-actionbar'>
+			<input class='realbutton' onclick='runpreview()' type='button' value='{$this->lang->words['b_preview']}' /> &nbsp; &nbsp; <input class='realbutton' type='submit' value='{$button}' />
+		</div>
 	</div>
 	<br />
-	<div class='acp-actionbar'>
-		<input class='realbutton' onclick='runpreview()' type='button' value='{$this->lang->words['b_preview']}' /> &nbsp; &nbsp; <input class='realbutton' type='submit' value='{$button}' />
-	</div>
 
 <br />
 	
 	<div class='information-box'>
-		<h4>{$this->lang->words['b_qtag']}</h4>
+		<h3><strong>{$this->lang->words['b_qtag']}</strong></h3>
 		{$this->lang->words['b_qtag_info']}
 		<br /><br />
 		<table width='100%'>
@@ -349,7 +374,6 @@ return $IPBHTML;
 /**
  * HTML to show inside preview iframe
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -380,7 +404,6 @@ return $IPBHTML;
 /**
  * HTML to show in popup
  *
- * @access	public
  * @return	string		HTML
  */
 public function mailPopupContent() {
@@ -425,7 +448,6 @@ return $IPBHTML;
 /**
  * Saved bulk mails overview
  *
- * @access	public
  * @param	string		Content
  * @return	string		HTML
  */
@@ -436,20 +458,20 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<HTML
 <div class='information-box'>
-	<h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/bullet_error.png' />{$this->lang->words['bulkmail_notes_tl']}</h4> 
+	<h3><strong>{$this->lang->words['bulkmail_notes_tl']}</strong></h3> 
 	{$this->lang->words['bulkmail_notes_info']}
 </div>
 <br />
 <div class='section_title'>
 	<h2>{$this->lang->words['b_title']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=mail_new'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['b_create']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=mail_new'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['b_create']}</a></li>
 	</ul>	
 </div>
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['b_stored']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</th>
 			<th width='30%'>{$this->lang->words['b_lsubject']}</th>
@@ -469,7 +491,7 @@ HTML;
 		{
 			$IPBHTML .= <<<HTML
 			<tr>
-				<td colspan='6' class='no_items'>{$this->lang->words['b_nobulk']}</td>
+				<td colspan='6' class='no_messages'>{$this->lang->words['b_nobulk']}</td>
 			</tr>
 HTML;
 		}
@@ -491,7 +513,6 @@ return $IPBHTML;
 /**
  * Bulk mail row
  *
- * @access	public
  * @param	array 		Mail data
  * @return	string		HTML
  */
@@ -525,23 +546,28 @@ else
 
 if ( $r['mail_active'] )
 {
-	$inprogress = " <em>( {$this->lang->words['b_inprogress']} - <a href='#' class='cancel' onclick=\"acp.confirmDelete('{$this->settings['base_url']}&{$this->form_code_js}&do=mail_send_cancel', '{$this->lang->words['b_cancelconfirm']}'); return false;\">{$this->lang->words['b_cancel']}</a> )</em>";
+	$inprogress = " ( {$this->lang->words['b_inprogress']} - <a href='#' class='ipsBadge badge_red' onclick=\"acp.confirmDelete('{$this->settings['base_url']}&{$this->form_code_js}&do=mail_send_cancel', '{$this->lang->words['b_cancelconfirm']}'); return false;\">{$this->lang->words['b_cancel']}</a> )";
 }
 
 
 $IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/email.png' /></td>
-  <td><b>{$r['mail_subject']}</b> {$inprogress}</td>
+<tr class='ipsControlRow'>
+  <td><img src='{$this->settings['skin_acp_url']}/images/icons/email.png' /></td>
+  <td><b><a href='{$this->settings['base_url']}&{$this->form_code}&do=mail_edit&id={$r['mail_id']}' title='{$this->lang->words['b_editdot']}'>{$r['mail_subject']}</a></b> {$inprogress}</td>
   <td>{$r['_mail_start']}</td>
   <td>{$r['_mail_sentto']}</td>
   <td>{$time_taken}</td>
-  <td>
-  	<img id='mid-{$r['mail_id']}' src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['b_options']}' class='ipbmenu' />
-	<ul class='acp-menu' id='mid-{$r['mail_id']}_menucontent'>
-		<li class='icon info'><a href='{$this->settings['base_url']}&{$this->form_code}&do=mail_send_start&id={$r['mail_id']}'>{$this->lang->words['b_resenddot']}</a></li>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&{$this->form_code}&do=mail_edit&id={$r['mail_id']}'>{$this->lang->words['b_editdot']}</a></li>
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&{$this->form_code}&do=mail_delete&id={$r['mail_id']}");'>{$this->lang->words['b_deletedot']}</a></li>
+  <td class='col_buttons'>
+	<ul class='ipsControlStrip'>
+		<li class='i_refresh'>
+			<a href='{$this->settings['base_url']}&{$this->form_code}&do=mail_send_start&id={$r['mail_id']}' title='{$this->lang->words['b_resenddot']}'>{$this->lang->words['b_resenddot']}</a>
+		</li>
+		<li class='i_edit'>
+			<a href='{$this->settings['base_url']}&{$this->form_code}&do=mail_edit&id={$r['mail_id']}' title='{$this->lang->words['b_editdot']}'>{$this->lang->words['b_editdot']}</a>
+		</li>
+		<li class='i_delete'>
+			<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&{$this->form_code}&do=mail_delete&id={$r['mail_id']}");' title='{$this->lang->words['b_deletedot']}'>{$this->lang->words['b_deletedot']}</a>
+		</li>
 	</ul>
   </td>
 </tr>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_groups.php b/upload/admin/applications/members/skin_cp/cp_skin_groups.php
index 0c2efac4..25f3ded4 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_groups.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_groups.php
@@ -2,39 +2,62 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP groups skin file
- * Last Updated: $Date: 2010-11-10 07:37:19 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-10-12 11:43:00 -0400 (Wed, 12 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 7127 $
+ * @version		$Rev: 9604 $
  *
  */
  
 class cp_skin_groups extends output
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**#@+
+	 * Registry objects
+	 *
+	 * @var		object
+	 */	
+	public $registry;
+	public $DB;
+	public $settings;
+	public $request;
+	public $lang;
+	public $member;
+	public $memberData;
+	public $cache;
+	public $caches;
+	/**#@-*/
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Should this admin group get ACP restrictions?
  *
- * @access	public
  * @return	string		HTML
  */
 public function groupAdminConfirm( $group_id ) {
@@ -43,17 +66,20 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<!--SKINNOTE: Not yet skinned-->
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['sm_configrest']}</div>
-	<div class='tablerow1'>
-	{$this->lang->words['sm_detectacp']}
- 		<br /><br />
- 		{$this->lang->words['sm_setrestrict']}
- 	</div>
-  	<div class='tablesubheader' align='center'>
-  		<span class='fauxbutton'><a href='{$this->settings['base_url']}&amp;{$this->form_code}'>{$this->lang->words['sm_nothanks']}</a></span>&nbsp;&nbsp;
-  		<span class='fauxbutton'><a href='{$this->settings['base_url']}&amp;module=restrictions&amp;section=restrictions&amp;do=acpperms-group-add-complete&amp;entered_group={$group_id}'>{$this->lang->words['sm_yesplease']}</a></span>
+<div class='acp-box'>
+ <h3>{$this->lang->words['sm_configrest']}</h3>
+ <table class='ipsTable double_pad'>
+	<tr>
+		<td>
+			<strong class='title'>{$this->lang->words['sm_detectacp']}</strong>
+ 			<br /><br />
+ 			{$this->lang->words['sm_setrestrict']}
+		</td>
+	</tr>
+  	</table>
+	<div class='acp-actionbar'>
+		<a class='button' href='{$this->settings['base_url']}&amp;{$this->form_code}'>{$this->lang->words['sm_nothanks']}</a>&nbsp;&nbsp;
+		<a class='button' href='{$this->settings['base_url']}&amp;module=restrictions&amp;section=restrictions&amp;do=acpperms-group-add-complete&amp;entered_group={$group_id}'>{$this->lang->words['sm_yesplease']}</a>
 	</div>
 </div>
 <br />
@@ -66,7 +92,6 @@ return $IPBHTML;
 /**
  * Group form
  *
- * @access	public
  * @param	string		Type (add|edit)
  * @param	array 		Group data
  * @param	array 		Permission masks
@@ -81,7 +106,6 @@ public function groupsForm( $type, $group, $permission_masks, $content=array(),
 
 list($group['g_promotion_id'], $group['g_promotion_posts'])	= explode( '&', $group['g_promotion'] );
 list($p_max, $p_width, $p_height) 							= explode( ":", $group['g_photo_max_vars'] );
-list( $limit, $flood ) 										= explode( ":", $group['g_email_limit'] );
 
 if ($group['g_promotion_posts'] < 1)
 {
@@ -121,7 +145,6 @@ else
 $form_code			= $type == 'edit' ? 'doedit' : 'doadd';
 $button				= $type == 'edit' ? $this->lang->words['g_compedit'] : $this->lang->words['g_addgroup'];
 $ini_max			= @ini_get( 'upload_max_filesize' ) ? @ini_get( 'upload_max_filesize' ) : $this->lang->words['g_cannotobt'];
-$guest_legend		= $group['g_id'] == $this->settings['guest_group'] ? $this->lang->words['g_appguests'] : '';
 $secure_key			= ipsRegistry::getClass('adminFunctions')->getSecurityKey();
 
 //-----------------------------------------
@@ -151,7 +174,6 @@ $form['g_attach_per_post']		= $this->registry->output->formInput( "g_attach_per_
 $form['p_max']					= $this->registry->output->formInput( "p_max", $p_max );
 $form['p_width']				= $this->registry->output->formSimpleInput( "p_width", $p_width, 3 );
 $form['p_height']				= $this->registry->output->formSimpleInput( "p_height", $p_height, 3 );
-$form['g_avatar_upload']		= $this->registry->output->formYesNo( "g_avatar_upload", $group['g_avatar_upload'] );
 $form['g_can_msg_attach']		= $this->registry->output->formYesNo( "g_can_msg_attach", $group['g_can_msg_attach'] );
 $form['g_view_board']			= $this->registry->output->formYesNo( "g_view_board", $group['g_view_board'], 'g_view_board' );
 $form['g_access_offline']		= $this->registry->output->formYesNo( "g_access_offline", $group['g_access_offline'] );
@@ -160,9 +182,6 @@ $form['g_can_add_friends']		= $this->registry->output->formYesNo( "g_can_add_fri
 $form['g_hide_online_list']		= $this->registry->output->formYesNo( "g_hide_online_list", $group['g_hide_online_list'] );
 $form['g_use_search']			= $this->registry->output->formYesNo( "g_use_search", $group['g_use_search'] );
 $form['g_search_flood']			= $this->registry->output->formInput( "g_search_flood", $group['g_search_flood'] );
-$form['g_email_friend']			= $this->registry->output->formYesNo( "g_email_friend", $group['g_email_friend'] );
-$form['join_limit']				= $this->registry->output->formSimpleInput( "join_limit", $limit, 2 );
-$form['join_flood']				= $this->registry->output->formSimpleInput( "join_flood", $flood, 2 );
 $form['g_edit_profile']			= $this->registry->output->formYesNo( "g_edit_profile", $group['g_edit_profile'] );
 $form['g_use_pm'] 				= $this->registry->output->formYesNo( "g_use_pm", $group['g_use_pm'] );
 $form['g_max_mass_pm']			= $this->registry->output->formInput( "g_max_mass_pm", $group['g_max_mass_pm'] );
@@ -210,6 +229,9 @@ $form['gbw_allow_url_bgimage']	    = $this->registry->output->formYesNo( "gbw_al
 $form['gbw_allow_upload_bgimage']	= $this->registry->output->formYesNo( "gbw_allow_upload_bgimage", $group['gbw_allow_upload_bgimage'] );						    
 $form['g_max_bgimg_upload']		    = $this->registry->output->formInput( "g_max_bgimg_upload", $group['g_max_bgimg_upload'] );
 
+$form['gbw_disable_tagging']	= $this->registry->output->formYesNo( "gbw_disable_tagging" , $group['gbw_disable_tagging'] );	
+$form['gbw_disable_prefixes']	= $this->registry->output->formYesNo( "gbw_disable_prefixes", $group['gbw_disable_prefixes'] );	
+
 if( $type == 'edit' )
 {
 	$title	= $this->lang->words['g_editing'] . $group['g_title'];
@@ -219,9 +241,6 @@ else
 	$title	= $this->lang->words['g_adding'];
 }
 
-$g_view_board_warning_style = $group['g_view_board'] ? 'display:none' : '';
-$g_view_board_warning_message = sprintf( $this->lang->words['gf_view_board_warning'], $this->buildURL( 'app=core&module=tools&section=settings', 'admin' ) );
-
 $IPBHTML = "";
 //--starthtml--//
 
@@ -244,160 +263,153 @@ $IPBHTML .= <<<HTML
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$form_code}&amp;secure_key={$secure_key}' method='post' id='adform' name='adform' onsubmit='return checkform();'>
 <input type='hidden' name='id' value='{$group['g_id']}' />
 
-<ul id='tabstrip_group' class='tab_bar no_title'>
-	<li id='tabtab-GROUPS|1' class=''>{$this->lang->words['g_globalsett']}</li>
-	<li id='tabtab-GROUPS|2' class=''>{$this->lang->words['g_globalperm']}</li>
+<div class='acp-box'>
+	<h3>&nbsp;</h3>
+	
+<div id='tabstrip_group' class='ipsTabBar with_left with_right'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+	
+	<ul>
+		<li id='tab_GROUPS_1'>{$this->lang->words['g_globalsett']}</li>
+		<li id='tab_GROUPS_2'>{$this->lang->words['g_globalperm']}</li>
 HTML;
 
 // Got blocks from other apps?
 $IPBHTML .= implode( "\n", $content['tabs'] );
 
-$semaillimit = sprintf( $this->lang->words['gf_semail_limit'], $form['join_limit'] );
-$semailflood = sprintf( $this->lang->words['gf_semail_flood'], $form['join_flood'] );
-
 $pmlimit = sprintf( $this->lang->words['gf_pm_limit'], $form['g_pm_perday'] );
 $pmflood = sprintf( $this->lang->words['gf_pm_flood'], $form['g_pm_flood_mins'] );
 
-$_firstTab = ( $firsttab ) ? '\'GROUPS|' . $firsttab . "'" : "''";
+$_firstTab = ( $firsttab ) ? 'GROUPS_' . $firsttab : "GROUPS_1";
 
 $IPBHTML .= <<<HTML
-</ul>
+	</ul>
+</div>
 
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-	ipbAcpTabStrips.first_on_load = $_firstTab;
-	ipbAcpTabStrips.register('tabstrip_group');
-});
- //]]>
-</script>
-
-<div class='acp-box'>
-	<div id='tabpane-GROUPS|1'>
-		<table width='100%' cellpadding='0' cellspacing='0' class='form_table alternate_rows double_pad'>
+<div id='tabstrip_group_content' class='ipsTabBar_content'>
+	<div id='tab_GROUPS_1_content'>
+		<table class='ipsTable double_pad'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['gf_t_details']}</th>
 			</tr>
 			<tr>
-				<td style='width: 40%'>
-					<label>{$this->lang->words['gf_gtitle']}</label>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_gtitle']}</strong>
 				</td>
-				<td style='width: 60%'>
+				<td class='field_field'>
 					{$form['g_title']}
 				</td>
 			</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_gicon']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_gicon']}</strong>
+				</td>
+		 		<td class='field_field'>
+					{$form['g_icon']}<br />
 					<span class='desctext'>{$this->lang->words['gf_gicon_info']}</span>
-				</td>
-		 		<td>
-					{$form['g_icon']}
 		 		</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_gformpre']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_gformpre']}</strong>
+				</td>
+		 		<td class='field_field'>
+					{$form['prefix']}<br />
 					<span class='desctext'>{$this->lang->words['gf_gformpre_info']}</span>
-				</td>
-		 		<td>
-					{$form['prefix']}
 		 		</td>
 		 	</tr>
 		 	
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_gformsuf']}</label><br />
-					<span class='desctext'>{$this->lang->words['gf_gformsuf_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_gformsuf']}</strong>
 				</td>
-		 		<td>
-					{$form['suffix']}
+		 		<td class='field_field'>
+					{$form['suffix']}<br />
+					<span class='desctext'>{$this->lang->words['gf_gformsuf_info']}</span>
 		 		</td>
 		 	</tr>
 			<tr>
 				<th colspan='2'>{$this->lang->words['gf_t_permissions']}</th>
 			</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_permset']}</label><br />
-					<span class='desctext'>{$this->lang->words['g_permset_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_permset']}</strong>
 				</td>
-		 		<td>
-					{$form['permid']}
+		 		<td class='field_field'>
+					{$form['permid']}<br />
+					<span class='desctext'>{$this->lang->words['g_permset_info']}</span>
 		 		</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['g_newpermset']}</label><br />
-					<span class='desctext'>{$this->lang->words['g_newpermset_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['g_newpermset']}</strong>
 				</td>
-		 		<td>
-					{$form['g_new_perm_set']}
+		 		<td class='field_field'>
+					{$form['g_new_perm_set']}<br />
+					<span class='desctext'>{$this->lang->words['g_newpermset_info']}</span>
 		 		</td>
 		 	</tr>
 		 	
 		 	<tr class='guest_legend'>
-		 		<td>
-		 			<label>{$this->lang->words['gf_hide']}</label>
-		 			{$guest_legend}
+		 		<td class='field_title'>
+		 			<strong class='title'>{$this->lang->words['gf_hide']}</strong>
 		 		</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$form['g_hide_from_list']}
 		 		</td>
 		 	</tr>
 		 	
 		 	<tr class='guest_legend'>
-		 		<td>
-		 			<label>{$this->lang->words['gf_hide_online']}</label>
-		 			{$guest_legend}
+		 		<td class='field_title'>
+		 			<strong class='title'>{$this->lang->words['gf_hide_online']}</strong>
 		 		</td>
-		 		<td>
-		 			{$form['g_hide_online_list']}
+		 		<td class='field_field'>
+		 			{$form['g_hide_online_list']}<br />
+		 			<span class='desctext'>{$this->lang->words['gf_hideonline_desc']}</span>
 		 		</td>
 		 	</tr>
 		 	<tr>
 				<th colspan='2'>{$this->lang->words['gf_t_display_name']}</th>
 			</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_dmax']}</label><br />
-					<span class='desctext'>{$this->lang->words['gf_dmax_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_dmax']}</strong>
 				</td>
-		 		<td>
+		 		<td class='field_field'>
 					<p>{$form['g_dname_changes']} &nbsp; {$this->lang->words['g_when']} {$form['g_displayname_unit']} {$form['gbw_displayname_unit_type']}</p>
 					<p style='color:gray;font-size:0.8em'>{$this->lang->words['g_limit_dd']}</p>
+					<br />
+					<span class='desctext'>{$this->lang->words['gf_dmax_info']}</span>
 		 		</td>
 		 	</tr>
 		 	<tr>
-		 		<td>
-					<label>{$this->lang->words['gf_dlimit']}</label><br />
-					<span class='desctext'>{$this->lang->words['gf_dlimit_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_dlimit']}</strong>
 				</td>
-		 		<td>
-		 			{$form['g_dname_date']}
+		 		<td class='field_field'>
+		 			{$form['g_dname_date']}<br />
+					<span class='desctext'>{$this->lang->words['gf_dlimit_info']}</span>
 		 		</td>
 		 	</tr>
 		 	<tr class='guest_legend'>
 				<th colspan='2'>{$this->lang->words['gf_t_access_control']}</th>
 			</tr>
 		 	<tr class='guest_legend'>
-		 		<td>
-		 			<label>{$this->lang->words['gf_msup']}</label>
-		 			{$guest_legend}
+		 		<td class='field_title'>
+		 			<strong class='title'>{$this->lang->words['gf_msup']}</strong>
 		 		</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$form['g_is_supmod']}
 		 		</td>
 		 	</tr>
 		 	
 		 	<tr class='guest_legend'>
-		 		<td>
-		 			<label>{$this->lang->words['gf_macp']}</label>
-		 			{$guest_legend}
+		 		<td class='field_title'>
+		 			<strong class='title'>{$this->lang->words['gf_macp']}</strong>
 		 		</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$form['g_access_cp']}
 		 		</td>
 		 	</tr>
@@ -405,12 +417,11 @@ document.observe("dom:loaded",function()
 				<th colspan='2'>{$this->lang->words['gf_t_promotion']}</th>
 			</tr>
 		 	<tr class='guest_legend'>
-		 		<td>
-					<label>{$this->lang->words['gf_mpromote']}</label><br />
-					{$guest_legend}
-					<span class='desctext'>{$this->registry->output->javascriptHelpLink('mg_promote')}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['gf_mpromote']}</strong>
+					{$this->javascriptHelpLink('mg_promote')}
 				</td>
-		 		<td>		 		
+		 		<td class='field_field'>		 		
 HTML;
 				if( $group['g_access_cp'] )
 				{
@@ -427,127 +438,113 @@ HTML;
 		</table>
  	</div>
 
- <div id='tabpane-GROUPS|2'>
-	 <table class='form_table alternate_rows double_pad' cellspacing='0'>
+ <div id='tab_GROUPS_2_content'>
+	 <table class='ipsTable double_pad'>
 		<tr>
 			<th colspan='2'>{$this->lang->words['gf_t_access_permissions']}</th>
 		</tr>
 	 	<tr>
-	 		<td style='width: 40%'>
-				<label>{$this->lang->words['gf_ssite']}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_ssite']}</strong>
 			</td>
-	 		<td style='width: 60%'>
-	 			{$form['g_view_board']}
-	 			<div id='g_view_board_warning' style='{$g_view_board_warning_style}'>
-	 				<br /><br /><div class='information-box'>{$g_view_board_warning_message}</div>
-	 			</div>
+	 		<td class='field_field'>
+HTML;
+
+if( $group['g_id'] == $this->settings['guest_group'] )
+{
+	$g_view_board_warning_message = sprintf( $this->lang->words['gf_view_board_warning'], $this->registry->output->buildURL( 'app=core&module=settings&section=settings', 'admin' ) );
+	
+	$IPBHTML .= <<<HTML
+	 			<div class='information-box'>{$g_view_board_warning_message}</div>
+	 			<input type='hidden' name='g_view_board' value='1' />
+HTML;
+}
+else
+{
+	$IPBHTML .= $form['g_view_board'];
+}
+
+$IPBHTML .= <<<HTML
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_soffline']}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_soffline']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_access_offline']}
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_sprofile']}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_sprofile']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_mem_info']}
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr class='guest_legend'>
-	 		<td>
-				<label>{$this->lang->words['gf_addfriends']}{$guest_legend}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_addfriends']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_can_add_friends']}
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_editprofile']}</label>
-	 			{$guest_legend}
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_editprofile']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_edit_profile']}
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_shtml']}</label><br />
-	 			{$guest_legend}
-				<span class='desctext'>{$this->registry->output->javascriptHelpLink('mg_dohtml')}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_shtml']}</strong>
+				{$this->javascriptHelpLink('mg_dohtml')}
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_dohtml']}
 	 		</td>
 	 	</tr>
 		<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_semail']}</label><br />
-	 			{$guest_legend}
-				<span class='desctext'>{$this->lang->words['g_semail_info']}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_maxnotify']}</strong>
 	 		</td>
-	 		<td>
-	 			{$form['g_email_friend']}
-	 			<br />{$semaillimit}
-	 			<br />{$semailflood}
-	 		</td>
-	 	</tr>
-		<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_maxnotify']}</label><br />
-	 			{$guest_legend}
+	 		<td class='field_field'>
+	 			{$form['g_max_notifications']}<br />
 				<span class='desctext'>{$this->lang->words['gf_maxnotify_desc']}</span>
 	 		</td>
-	 		<td>
-	 			{$form['g_max_notifications']}
-	 		</td>
 	 	</tr>
 		<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_uav']}</label>
-	 			{$guest_legend}
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_sbadword']}</strong>
 	 		</td>
-	 		<td>
-	 			{$form['g_avatar_upload']}
-	 		</td>
-	 	</tr>
-		<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_sbadword']}</label>
-	 			{$guest_legend}
-	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_bypass_badwords']}
 	 		</td>
 	 	</tr>
-		<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_no_status']}</label>
-	 			{$guest_legend}
+		<tr class='guest_legend'>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_no_status']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['gbw_no_status_update']}
 	 		</td>
 	 	</tr>
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_no_status_import']}</label>
-	 			<br /><span class='desctext'>{$this->lang->words['gf_no_status_import_d']}</span>
-	 			{$guest_legend}
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_no_status_import']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['gbw_no_status_import']}
+	 			<br /><span class='desctext'>{$this->lang->words['gf_no_status_import_d']}</span>
 	 		</td>
 	 	</tr>
 	 	
@@ -555,52 +552,52 @@ HTML;
 			<th colspan='2'>{$this->lang->words['gf_customization_title']}</th>
 		</tr>
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_bw_allow_customization']}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_bw_allow_customization']}</strong>
+			</td>
+	 		<td class='field_field'>
+	 			{$form['gbw_allow_customization']}				
 				<br /><span class='desctext'>{$this->lang->words['gbw_allow_customization_d']}</span>
-			</td>
-	 		<td>
-	 			{$form['gbw_allow_customization']}
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_bw_allow_url_bgimage']}</label>
-				<br /><span class='desctext'>{$this->lang->words['gbw_allow_url_bgimage_d']}</span>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_bw_allow_url_bgimage']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['gbw_allow_url_bgimage']}
+				<br /><span class='desctext'>{$this->lang->words['gbw_allow_url_bgimage_d']}</span>
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_bw_allow_upload_bgimage']}</label>
-				<br /><span class='desctext'>{$this->lang->words['gbw_allow_upload_bgimage_d']}</span>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_bw_allow_upload_bgimage']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['gbw_allow_upload_bgimage']}
 	 			<div style='padding-top:4px'>{$this->lang->words['gf_max_bgimg_upload']} {$form['g_max_bgimg_upload']}</div>
+				<br /><span class='desctext'>{$this->lang->words['gbw_allow_upload_bgimage_d']}</span>
 	 		</td>
 	 	</tr>
 	 	<tr>
 			<th colspan='2'>{$this->lang->words['gf_t_search']}</th>
 		</tr>
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_ssearch']}</label>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_ssearch']}</strong>
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_use_search']}
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_sflood']}</label><br />
-				<span class='desctext'>{$this->lang->words['gf_sflood_info']}</span>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_sflood']}</strong>
 			</td>
-	 		<td>
-	 			{$form['g_search_flood']}
+	 		<td class='field_field'>
+	 			{$form['g_search_flood']}<br />
+				<span class='desctext'>{$this->lang->words['gf_sflood_info']}</span>
 	 		</td>
 	 	</tr>
 	 	
@@ -608,44 +605,42 @@ HTML;
 			<th colspan='2'>{$this->lang->words['gf_t_pms']}</th>
 		</tr>
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_spm']}</label><br />
-	 			{$guest_legend}
-				<span class='desctext'>{$this->lang->words['gf_spmperday_info']}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_spm']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_use_pm']}
 				<br />{$pmlimit}
 	 			<br />{$pmflood}
+				<br />
+				<span class='desctext'>{$this->lang->words['gf_spmperday_info']}</span>
 	 		</td>
 	 	</tr>
 	
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_spmmax']}</label><br />
-	 			{$guest_legend}
-				<span class='desctext'>{$this->lang->words['gf_spmmax_info']}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_spmmax']}</strong>
 	 		</td>
-	 		<td>
-	 			{$form['g_max_mass_pm']}
+	 		<td class='field_field'>
+	 			{$form['g_max_mass_pm']}<br />
+				<span class='desctext'>{$this->lang->words['gf_spmmax_info']}</span>
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_spmmaxstor']}</label>
-	 			{$guest_legend}
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_spmmaxstor']}</strong>
 	 		</td>
-	 		<td>
-	 			{$form['g_max_messages']}
+	 		<td class='field_field'>
+	 			{$form['g_max_messages']}<br />
+				<span class='desctext'>{$this->lang->words['gf_maxmessages_info']}</span>
 	 		</td>
 	 	</tr>
 		<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_upm']}</label>
-	 			{$guest_legend}
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_upm']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_can_msg_attach']}
 	 		</td>
 	 	</tr>
@@ -654,28 +649,29 @@ HTML;
 			<th colspan='2'>{$this->lang->words['gf_t_reps']}</th>
 		</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_repmaxpos']}</label><br />
-				<span class='desctext'>{$this->lang->words['gf_repnum_info']}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_repmaxpos']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_rep_max_positive']}
+				<br />
+				<span class='desctext'>{$this->lang->words['gf_repnum_info']}</span>
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_repmaxneg']}</label><br />
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_repmaxneg']}</strong>
+	 		</td>
+	 		<td class='field_field'>
+	 			{$form['g_rep_max_negative']}<br />
 				<span class='desctext'>{$this->lang->words['gf_repnum_info']}</span>
 	 		</td>
-	 		<td>
-	 			{$form['g_rep_max_negative']}
-	 		</td>
 	 	</tr>
-		<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_bw_view_reps']}</label><br />
+	 	<tr>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_bw_view_reps']}</strong><br />
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['gbw_view_reps']}
 	 		</td>
 	 	</tr>
@@ -683,43 +679,43 @@ HTML;
 			<th colspan='2'>{$this->lang->words['gf_t_sigs']}</th>
 		</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_usesigs']}</label>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_usesigs']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 			<p>{$form['use_signatures']} &nbsp; {$this->lang->words['g_until']} {$form['g_sig_unit']} {$form['gbw_sig_unit_type']}</p>
 			<p style='color:gray;font-size:0.8em'>{$this->lang->words['g_limit_dd']}</p>
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_sigmaximages']}</label>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_sigmaximages']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['max_images']}
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_sigmaxdims']}</label>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_sigmaxdims']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['max_dims']}
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_sigmaxurls']}</label>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_sigmaxurls']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['max_urls']}
 	 		</td>
 	 	</tr>
 	 	<tr>
-	 		<td>
-	 			<label>{$this->lang->words['gf_sigmaxtext']}</label>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_sigmaxtext']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['max_lines']}
 	 		</td>
 	 	</tr>
@@ -727,53 +723,78 @@ HTML;
 			<th colspan='2'>{$this->lang->words['gf_t_uploads']}</th>
 		</tr>
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_uglobal']}</label><br />
-				<span class='desctext'>{$this->registry->output->javascriptHelpLink('mg_upload')}<br />{$this->lang->words['gf_uglobal_info']}</span>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_uglobal']}</strong>
+				{$this->javascriptHelpLink('mg_upload')}
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_attach_max']}
 	 			{$this->lang->words['g_inkb']} ({$this->lang->words['g_ucurrently']}{$group['g_attach_maxdis']})
-	 			<br />{$this->lang->words['g_usingle']}{$ini_max}
+	 			<br />{$this->lang->words['g_usingle']}{$ini_max}<br />
+				<span class='desctext'>{$this->lang->words['gf_uglobal_info']}</span>
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr>
-	 		<td>
-				<label>{$this->lang->words['gf_upost']}</label><br />
-				<span class='desctext'>{$this->registry->output->javascriptHelpLink('mg_upload')}<br />{$this->lang->words['gf_upost_info']}</span>
+	 		<td class='field_title'>
+				<strong class='title'>{$this->lang->words['gf_upost']}</strong>
+				{$this->javascriptHelpLink('mg_upload')}
 			</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['g_attach_per_post']}
 	 			{$this->lang->words['g_inkb']} ({$this->lang->words['g_ucurrently']}{$group['g_attach_per_postdis']})
-	 			<br />{$this->lang->words['g_usingle']}{$ini_max}
+	 			<br />{$this->lang->words['g_usingle']}{$ini_max}<br />
+				<span class='desctext'>{$this->lang->words['gf_upost_info']}</span>
 	 		</td>
 	 	</tr>
 	 	
 	 	<tr class='guest_legend'>
-	 		<td>
-	 			<label>{$this->lang->words['gf_upersonalpho']}</label><br />
-	 			{$guest_legend}
-				<span class='desc'>{$this->lang->words['g_upersonalpho_l']}</span>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gf_upersonalpho']}</strong>
 	 		</td>
-	 		<td>
+	 		<td class='field_field'>
 	 			{$form['p_max']}{$this->lang->words['g_inkb']}
-	 			<br />{$this->lang->words['g_upersonalpho_w']}{$form['p_width']} x {$this->lang->words['g_upersonalpho_h']}{$form['p_height']}
+	 			<br />{$this->lang->words['g_upersonalpho_w']}{$form['p_width']} x {$this->lang->words['g_upersonalpho_h']}{$form['p_height']}<br />
+				<span class='desctext'>{$this->lang->words['g_upersonalpho_l']}</span>
+	 		</td>
+	 	</tr>
+	 	<tr>
+			<th colspan='2'>{$this->lang->words['gf_t_tagging']}<!--You're it--></th>
+		</tr>
+	 	<tr class='guest_legend'>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gbw_disable_tagging']}</strong>
+	 		</td>
+	 		<td class='field_field'>
+	 			{$form['gbw_disable_tagging']}<br />
+				<span class='desctext'>{$this->lang->words['gbw_disable_tagging_desc']}</span>
+	 		</td>
+	 	</tr>
+	 	<tr class='guest_legend'>
+	 		<td class='field_title'>
+	 			<strong class='title'>{$this->lang->words['gbw_disable_prefixes']}</strong>
+	 		</td>
+	 		<td class='field_field'>
+	 			{$form['gbw_disable_prefixes']}<br />
+				<span class='desctext'>{$this->lang->words['gbw_disable_prefixes_desc']}</span>
 	 		</td>
 	 	</tr>
 	</table>
- </div>
+</div>
 HTML;
 
 // Got blocks from other apps?
 $IPBHTML .= implode( "\n", $content['area'] );
 
 $IPBHTML .= <<<HTML
-<div class='acp-actionbar'>
-	<input type='submit' value=' {$button} ' class='realbutton' />
-</div>
-</div>
 
+<script type='text/javascript'>
+	jQ("#tabstrip_group").ipsTabBar({tabWrap: "#tabstrip_group_content", defaultTab: "tab_{$_firstTab}" });
+</script>
+</div>
+<div class='acp-actionbar'>
+	<input type='submit' value='{$button}' class='button primary' />
+</div>
 </form>
 
 <script type="text/javascript">
@@ -794,10 +815,22 @@ HTML;
 return $IPBHTML;
 }
 
+/**
+ * Build a javascript help link
+ *
+ * @param	string		Help ID
+ * @return	string		Help Link
+ * @since	2.0
+ * @see		admin_core_system_quickhelp
+ */
+public function javascriptHelpLink( $help="" )
+{
+	return "( <a href='#' onclick=\"window.open('" . str_replace( '&amp;', '&', $this->settings['_base_url'] ) . "&app=core&module=help&section=quickhelp&id={$help}','Help','width=450,height=400,resizable=yes,scrollbars=yes'); return false;\">{$this->lang->words['acp_quick_help']}</a> )";
+}
+
 /**
  * Overview of groups
  *
- * @access	public
  * @param	string		Groups HTML
  * @param	array 		Groups
  * @return	string		HTML
@@ -815,11 +848,27 @@ $leBigh = ( $this->request['showSecondary'] ) ? 0 : 1;
 $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['g_title']}</h2>
+HTML;
+
+	if( IN_DEV )
+	{
+		$IPBHTML .= <<<HTML
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton inDev'>
+				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=master_xml_export'><img src='{$this->settings['skin_acp_url']}/images/icons/export.png' alt='' /> Export XML</a>
+			</li>
+		</ul>
+	</div>
+HTML;
+	}
+	
+$IPBHTML .= <<<HTML
 </div>
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['g_usergroupman']}</h3>
-	<table class='alternate_rows double_pad' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='1%'>&nbsp;</th>
 			<th width='30%'>{$this->lang->words['g_grouptitle']}</th>
@@ -835,7 +884,7 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<ul class='context_menu'>
 		<li{$leSigh}>
-			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=groups_overview&amp;showSecondary={$leBigh}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['g_calc_with_secondary']}</a>
+			<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=groups_overview&amp;showSecondary={$leBigh}'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['g_calc_with_secondary']}</a>
 		</li>
 	</ul>
 </div>
@@ -846,24 +895,18 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['g_createnew']}</h3>
 		
-		<table cellpadding='4' cellspacing='0' width='100%'>
+		<table class='ipsTable'>
 			<tr>
-				<th width='40%'>{$this->lang->words['g_basenewon']}</th>
-				<th width='60%'>{$new_dd}</th>
+				<td class='field_title'>{$this->lang->words['g_basenewon']}</th>
+				<td class='field_field'>{$new_dd}</th>
 			</tr>
 		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['g_createbutton']}' class='button primary' />
-			</div>
+			<input type='submit' value='{$this->lang->words['g_createbutton']}' class='button primary' />
 		</div>		
 	</div>
 </form>
 HTML;
-if ( IN_DEV )
-{
-	$IPBHTML .= "<br /><div><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=master_xml_export'>Эк�портировать XML</a></div>";
-}
 
 //--endhtml--//
 return $IPBHTML;
@@ -872,7 +915,6 @@ return $IPBHTML;
 /**
  * Group row
  *
- * @access	public
  * @param	array 		Group
  * @return	string		HTML
  */
@@ -882,14 +924,14 @@ $IPBHTML = "";
 
 $r['_can_acp_img']		= $r['_can_acp']    ? 'accept.png' : 'cross.png';
 $r['_can_supmod_img']	= $r['_can_supmod'] ? 'accept.png' : 'cross.png';
-$r['_title']			= IPSLib::makeNameFormatted( $r['g_title'], $r['g_id'] );
+$r['_title']			= IPSMember::makeNameFormatted( $r['g_title'], $r['g_id'] );
 
 $IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/group.png' /></td>
+<tr class='ipsControlRow'>
+  <td><img src='{$this->settings['skin_acp_url']}/images/icons/group.png' /></td>
   <td><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit&amp;id={$r['g_id']}' style='font-weight:bold'>{$r['_title']}</a> <small>({$this->lang->words['g_id']}: {$r['g_id']})</small></td>
-  <td align='center'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_can_acp_img']}' alt='-' /></td>
-  <td align='center'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_can_supmod_img']}' alt='-' /></td>
+  <td align='center'><img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_can_acp_img']}' alt='-' /></td>
+  <td align='center'><img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_can_supmod_img']}' alt='-' /></td>
   <td align='center'>
 HTML;
 if ( $r['g_id'] != $this->settings['guest_group'] )
@@ -902,7 +944,7 @@ if ( $r['g_id'] != $this->settings['guest_group'] )
 	}
 	
 $IPBHTML .= <<<HTML
-	<a href='{$this->settings['_base_url']}app=members&amp;section=members&amp;module=members&amp;__update=1&amp;f_primary_group={$r['g_id']}{$_extraLink}' title='{$this->lang->words['g_listusers']}'>{$r['count']}</a>
+	<a href='{$this->settings['_base_url']}app=members&amp;section=members&amp;module=members#do_results=1&amp;__update=1&amp;f_primary_group={$r['g_id']}{$_extraLink}' title='{$this->lang->words['g_listusers']}'>{$r['count']}</a>
 HTML;
 }
 else
@@ -913,25 +955,23 @@ HTML;
 }
 $IPBHTML .= <<<HTML
   </td>												
-  <td align='right'>
-  	<img id="menu{$r['g_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' class='ipbmenu' />
-	<ul class='acp-menu' id='menu{$r['g_id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit&amp;id={$r['g_id']}'>{$this->lang->words['g_editg']}</a></li>
+  <td class='col_buttons'>
+	<ul class='ipsControlStrip'>
+		<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=edit&amp;id={$r['g_id']}' title='{$this->lang->words['g_editg']}'>{$this->lang->words['g_editg']}</a></li>
 HTML;
 if ( ! in_array( $r['g_id'], array( $this->settings['auth_group'], $this->settings['guest_group'], $this->settings['member_group'] ) )  )
 {
 $IPBHTML .= <<<HTML
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete&amp;_admin_auth_key={$this->registry->getClass('adminFunctions')->_admin_auth_key}&amp;id={$r['g_id']}");'>{$this->lang->words['g_deleteg']}</a></li>
+		<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete&amp;_admin_auth_key={$this->registry->getClass('adminFunctions')->_admin_auth_key}&amp;id={$r['g_id']}");' title='{$this->lang->words['g_deleteg']}'>{$this->lang->words['g_deleteg']}</a></li>
 HTML;
 }
 else
 {
 $IPBHTML .= <<<HTML
-		<li class='icon delete'>{$this->lang->words['g_cannotdel']}</li>
+		<li class='i_delete disabled'><a href='#' onclick='return false;' title='{$this->lang->words['g_cannotdel']}' title='{$this->lang->words['g_cannotdel']}'>{$this->lang->words['g_cannotdel']}</a></li>
 HTML;
 }
 $IPBHTML .= <<<HTML
-		
 	</ul>
   </td>
 </tr>
@@ -945,7 +985,6 @@ return $IPBHTML;
 /**
  * Delete group confirmation
  *
- * @access	public
  * @param	array 		Group
  * @param	int			Members with this group as primary group
  * @param	int			Members with this group as secondary group
@@ -986,28 +1025,27 @@ $IPBHTML .= <<<HTML
 		<input type='hidden' name='id' value='{$group['g_id']}' />
 		<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
 		
-		<table class='alternate_rows' width='100%'>
+		<table class='ipsTable'>
 			<tr>
-				<td width='40%'>{$this->lang->words['g_numusers']}</td>
-				<td width='60%'>
+				<td class='field_title'><strong class='title'>{$this->lang->words['g_numusers']}</strong></td>
+				<td class='field_field'>
 					<a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;__update=1&amp;f_primary_group={$group['g_id']}'>{$primary}</a>
 				</td>
 			</tr>
 			<tr>
-				<td width='40%'>{$this->lang->words['g_numusers_sec']}</td>
-				<td width='60%'>
-					<a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;__update=1&amp;f_secondary_group={$group['g_id']}'>{$secondary}</a>
+				<td class='field_title'><strong class='title'>{$this->lang->words['g_numusers_sec']}</strong></td>
+				<td class='field_field'>
+					<a href='{$this->settings['_base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;__update=1&amp;f_secondary_group={$group['g_id']}'>{$secondary}</a><br />
+					<span class='desctext'>{$this->lang->words['g_secuserinfod']}</span>
 				</td>
 			</tr>
 			<tr>
-				<td width='40%'>{$this->lang->words['g_moveusersto']}</td>
-				<td width='60%'>{$dropDown}</td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['g_moveusersto']}</strong></td>
+				<td class='field_field'>{$dropDown}</td>
 			</tr>			
 		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' class='button primary' value=' {$this->lang->words['g_deletebutton']} ' />
-			</div>
+			<input type='submit' class='button primary' value='{$this->lang->words['g_deletebutton']}' />
 		</div>
 	</form>
 </div>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_member.php b/upload/admin/applications/members/skin_cp/cp_skin_member.php
index baabe3b0..a0be1982 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_member.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_member.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP members skin file
- * Last Updated: $Date: 2010-10-08 10:15:14 -0400 (Fri, 08 Oct 2010) $
+ * Last Updated: $Date: 2011-09-06 11:48:43 -0400 (Tue, 06 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6956 $
+ * @version		$Rev: 9457 $
  *
  */
  
-class cp_skin_member extends output
+class cp_skin_member
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Member reputation log
  *
- * @access	public
  * @param	string		Title
  * @param	array 		Rows
  * @param	string		Page links
@@ -47,26 +77,29 @@ $IPBHTML = "";
 $lang_str = $this->request['type'] == 'given' ? 'rep_for' : 'rep_by';
 
 $IPBHTML .= <<<HTML
-<ul class='tab_bar'>
+<div class='acp-box'>
+	<h3>{$title}</h3>
+	<div class='ipsTabBar'>
+		<ul>
 HTML;
 
 foreach( $repEnabledApps as $app )
 {
 	$active = $app['app_directory'] == $this->request['appView'] ? 'active' : '';
 $IPBHTML .= <<<HTML
-	<li class='{$active}'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['id']}&amp;type={$this->request['type']}&amp;appView={$app['app_directory']}'>{$app['app_title']}</a></li>
+			<li class='{$active}'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['id']}&amp;type={$this->request['type']}&amp;appView={$app['app_directory']}'>{$app['app_title']}</a></li>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
-</ul>
+	</ul>
+</div>
 HTML;
 
 $IPBHTML .= <<<HTML
-<div class='acp-box'>
-	<h3>{$title}</h3>
+
 		
-	<table class='alternate_rows'>
+	<table class='ipsTable'>
 		<tr>
 			<th>{$this->lang->words['rep_rep']}</th>
 			<th>{$this->lang->words[$lang_str]}</th>
@@ -79,7 +112,7 @@ foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
 		<tr>
-			<td><img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_icon']}.png'></td>
+			<td><img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_icon']}.png'></td>
 			<td>{$r['members_display_name']}</td>
 			<td>{$r['_date']}</td>
 			<td><a href='{$r['_link']}' target='_blank'>{$r['repContentTitle']}</a></td>
@@ -105,14 +138,13 @@ return $IPBHTML;
 /**
  * Member editing screen
  *
- * @access	public
  * @param	array 		Member data
  * @param	array 		Content
  * @param	string		Menu
  * @param	array 		Notification data
  * @return	string		HTML
  */
-public function member_view( $member, $content=array(), $menu, $notifications ) {
+public function member_view( $member, $content, $menu, $notifications ) {
 
 // Let's get to work..... :/
 $_m_groups = array();
@@ -237,7 +269,6 @@ $_form_month				= ipsRegistry::getClass('output')->formDropdown( "bday_month", $
 $_form_day					= ipsRegistry::getClass('output')->formDropdown( "bday_day", $days, $member['bday_day'] );
 $form_time_offset			= ipsRegistry::getClass('output')->formDropdown( "time_offset", $time_zones, $member['time_offset'] ? floatval( $member['time_offset'] ) : 0 );
 $form_language				= ipsRegistry::getClass('output')->formDropdown( "language", $languages, $member['language'] );
-$form_hide_email			= ipsRegistry::getClass('output')->formYesNo( "hide_email", $member['hide_email'] );
 $form_allow_admin_mails		= ipsRegistry::getClass('output')->formYesNo( "allow_admin_mails", $member['allow_admin_mails'] );
 $form_members_disable_pm	= ipsRegistry::getClass('output')->formDropdown( "members_disable_pm", $pm_options, $member['members_disable_pm'] );
 $form_view_sig				= ipsRegistry::getClass('output')->formYesNo( "view_sigs", $member['view_sigs'] );
@@ -246,32 +277,32 @@ $form_reputation_points		= ipsRegistry::getClass('output')->formInput( 'pp_reput
 $bw_no_status_update		= ipsRegistry::getClass('output')->formYesNo( "bw_no_status_update", $member['bw_no_status_update'] );
 $bw_disable_customization	= ipsRegistry::getClass('output')->formYesNo( "bw_disable_customization", $member['bw_disable_customization'] );
 $form_rte					= ipsRegistry::getClass('output')->formDropdown( "members_editor_choice", array( array( 'std', $this->lang->words['mem__stdeditor'] ), array( 'rte', $this->lang->words['mem__rteeditor'] ) ), $member['members_editor_choice'] );
-$form_uploader				= ipsRegistry::getClass('output')->formDropdown( "member_uploader", array( array( 'default', $this->lang->words['mem__defuploader'] ), array( 'flash', $this->lang->words['mem__flashuploader'] ) ), $member['member_uploader'] );
+$form_uploader				= ipsRegistry::getClass('output')->formDropdown( "member_uploader", array( array( 'flash', $this->lang->words['mem__flashuploader'] ), array( 'default', $this->lang->words['mem__defuploader'] ) ), $member['member_uploader'] );
 $form_popup					= ipsRegistry::getClass('output')->formYesNo( "show_notification_popup", $member['_cache']['show_notification_popup'] );
-$form_fullmsg				= ipsRegistry::getClass('output')->formYesNo( "email_full", $member['email_full'] );
 $form_autotrack				= ipsRegistry::getClass('output')->formYesNo( "auto_track", $member['auto_track'] ? 1 : 0 );
 $form_autotrackmthd			= ipsRegistry::getClass('output')->formDropdown( "auto_track_method", array( 
 																									array( 'none', $this->lang->words['mem__auto_none'] ), 
 																									array( 'immediate', $this->lang->words['mem__auto_immediate'] ),
-																									array( 'delayed', $this->lang->words['mem__auto_delayed'] ),
+																									array( 'offline', $this->lang->words['mem__auto_delayed'] ),
 																									array( 'daily', $this->lang->words['mem__auto_daily'] ),
 																									array( 'weekly', $this->lang->words['mem__auto_weekly'] ),
 																									), $member['auto_track'] );
 
 $secure_key = ipsRegistry::getClass('adminFunctions')->getSecurityKey();
 
-$ban_member_css		= $member['member_banned'] ? "background-color: #FF0033;font-weight:bold;color:#000;" : '';
 $ban_member_text	= $member['member_banned'] ? $this->lang->words['sm_unban'] : $this->lang->words['sm_ban'];
 
-$spam_member_css	= $member['bw_is_spammer'] ? "background-color: #FF0033;font-weight:bold;color:#000;" : '';
 $spam_member_text	= $member['bw_is_spammer'] ? $this->lang->words['sm_unspam'] : $this->lang->words['sm_spam'];
 
+$bw_disable_tagging		= ipsRegistry::getClass('output')->formYesNo( "bw_disable_tagging", $member['bw_disable_tagging'] );
+$bw_disable_prefixes	= ipsRegistry::getClass('output')->formYesNo( "bw_disable_prefixes", $member['bw_disable_prefixes'] );
+
 //-----------------------------------------
 // Comments and friends..
 //-----------------------------------------
-$pp_visitors					= ipsRegistry::getClass('output')->formDropdown( "pp_setting_count_visitors", array( array( 0, 0 ), array( 3, 3 ), array( 5, 5 ), array( 10, 10 ) ), $member['pp_setting_count_visitors'] );
-$pp_enable_comments				= ipsRegistry::getClass('output')->formYesNo( "pp_setting_count_comments", $member['pp_setting_count_comments'] );
-$pp_enable_friends				= ipsRegistry::getClass('output')->formYesNo( "pp_setting_count_friends", $member['pp_setting_count_friends'] );
+$pp_visitors		= ipsRegistry::getClass('output')->formYesNo( "pp_setting_count_visitors", $member['pp_setting_count_visitors'] );
+$pp_enable_comments	= ipsRegistry::getClass('output')->formYesNo( "pp_setting_count_comments", $member['pp_setting_count_comments'] );
+$pp_enable_friends	= ipsRegistry::getClass('output')->formYesNo( "pp_setting_count_friends", $member['pp_setting_count_friends'] );
 
 $_commentsApprove	= array(
 						array( '0', $this->lang->words['sm_comments_app_none'] ),
@@ -283,15 +314,15 @@ $_friendsApprove	= array(
 						array( '1', $this->lang->words['sm_friends_app_on'] ),
 						);
 
-$pp_comments_approve			= ipsRegistry::getClass('output')->formDropdown( "pp_setting_moderate_comments", $_commentsApprove, $member['pp_setting_moderate_comments'] );
-$pp_friends_approve				= ipsRegistry::getClass('output')->formDropdown( "pp_setting_moderate_friends", $_friendsApprove, $member['pp_setting_moderate_friends'] );
+$pp_comments_approve= ipsRegistry::getClass('output')->formDropdown( "pp_setting_moderate_comments", $_commentsApprove, $member['pp_setting_moderate_comments'] );
+$pp_friends_approve	= ipsRegistry::getClass('output')->formDropdown( "pp_setting_moderate_friends", $_friendsApprove, $member['pp_setting_moderate_friends'] );
 
 $suspend_date		= '';
 
 if( $member['temp_ban'] )
 {
 	$s_ban			= IPSMember::processBanEntry( $member['temp_ban'] );
-	$suspend_date	= "<div style='float:right;'>" . $this->lang->words['member_supsended_til'] . ' ' . ipsRegistry::getClass('class_localization')->getDate( $s_ban['date_end'], 'LONG', 1 ) . "</div>";
+	$suspend_date	= "<div class='warning'>" . $this->lang->words['member_supsended_til'] . ' ' . ipsRegistry::getClass('class_localization')->getDate( $s_ban['date_end'], 'LONG', 1 ) . "</div>";
 }
 			
 $IPBHTML = "";
@@ -304,13 +335,13 @@ $IPBHTML .= <<<HTML
 	<ul class='context_menu'>
 		<li class='closed'>
 			<a href="#" title='{$this->lang->words['title_delete']}' onclick="return acp.confirmDelete( '{$this->settings['base_url']}app=members&amp;module=members&amp;section=members&amp;do=member_delete&amp;member_id={$member['member_id']}')">
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' alt='{$this->lang->words['title_delete']}' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/delete.png' alt='{$this->lang->words['title_delete']}' />
 				{$this->lang->words['form_deletemember']}
 			</a>
 		</li>
 		<li>
 			<a href='#' id='MF__ban2' title='{$this->lang->words['title_ban']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/user_warn.png' alt='{$this->lang->words['title_ban']}' />
+				<img src='{$this->settings['skin_acp_url']}/images/icons/user_warn.png' alt='{$this->lang->words['title_ban']}' />
 				{$ban_member_text}
 			</a>
 			
@@ -319,14 +350,14 @@ $IPBHTML .= <<<HTML
 			</script>
 		</li>
 		<li>
-			<a href='#' class='ipbmenu' id='member_tasks' title='{$this->lang->words['title_tasks']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' /> {$this->lang->words['mem_tasks']} <img src='{$this->settings['skin_acp_url']}/_newimages/useropts_arrow.png' /></a>
+			<a href='#' class='ipbmenu' id='member_tasks' title='{$this->lang->words['title_tasks']}'><img src='{$this->settings['skin_acp_url']}/images/icons/cog.png' /> {$this->lang->words['mem_tasks']} <img src='{$this->settings['skin_acp_url']}/images/useropts_arrow.png' /></a>
 		</li>		
 	</ul>
 </div>
 
 <ul class='ipbmenu_content' id='member_tasks_menucontent' style='display: none'>
 	<li>
-		<img src='{$this->settings['skin_acp_url']}/_newimages/icons/flag_red.png' alt='{$spam_member_text}' /> <a style='text-decoration: none' href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=toggleSpam&amp;member_id={$member['member_id']}&amp;secure_key={$secure_key}' title='{$this->lang->words['title_spam']}'>{$spam_member_text}</a>
+		<img src='{$this->settings['skin_acp_url']}/images/icons/flag_red.png' alt='{$spam_member_text}' /> <a style='text-decoration: none' href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=toggleSpam&amp;member_id={$member['member_id']}&amp;secure_key={$secure_key}' title='{$this->lang->words['title_spam']}'>{$spam_member_text}</a>
 	</li>
 HTML;
 
@@ -334,7 +365,7 @@ if( $member['member_group_id'] == $this->settings['auth_group'] )
 {
 	$IPBHTML .= <<<HTML
 		<li>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/tick.png' alt='{$this->lang->words['title_validate']}' /> <a style='text-decoration: none' href="{$this->settings['base_url']}app=members&amp;module=members&amp;section=tools&amp;do=do_validating&amp;mid_{$member['member_id']}=1&amp;type=approve&amp;_return={$member['member_id']}" title='{$this->lang->words['title_validate']}'>{$this->lang->words['button_validate']}</a>
+			<img src='{$this->settings['skin_acp_url']}/images/icons/tick.png' alt='{$this->lang->words['title_validate']}' /> <a style='text-decoration: none' href="{$this->settings['base_url']}app=members&amp;module=members&amp;section=tools&amp;do=do_validating&amp;mid_{$member['member_id']}=1&amp;type=approve&amp;_return={$member['member_id']}" title='{$this->lang->words['title_validate']}'>{$this->lang->words['button_validate']}</a>
 		</li>
 HTML;
 }
@@ -349,7 +380,7 @@ if( is_array($menu) AND count($menu) )
 			
 			foreach( $link as $alink )
 			{
-				$img = $alink['img'] ? $alink['img'] : $this->settings[ 'skin_acp_url' ] . '/_newimages/icons/user.png';
+				$img = $alink['img'] ? $alink['img'] : $this->settings[ 'skin_acp_url' ] . '/images/icons/user.png';
 				
 				$thisLink = $alink['js'] ? 'href="#" onclick="' . $alink['url'] . '"' : "href='{$this->settings[ '_base_url' ]}app={$app}&amp;{$alink['url']}&amp;member_id={$member['member_id']}'";
 				
@@ -367,27 +398,20 @@ $IPBHTML .= <<<HTML
 <br style='clear: both' />
 HTML;
 
+$_public	= PUBLIC_DIRECTORY;
+
 $IPBHTML .= <<<HTML
+<div class='acp-box'>
 <form style='display:block' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=member_edit&amp;member_id={$member['member_id']}&amp;secure_key={$secure_key}' method='post'>
-<script type='text/javascript'>
-	ipb.vars['public_avatar_url'] = "{$this->settings['_original_base_url']}/public/style_avatars/";
-</script>
 
-	<script type="text/javascript">
-	//<![CDATA[
-	//_go_go_gadget_editor_hack = true;
-	
-	document.observe("dom:loaded",function() 
-	{
-	ipbAcpTabStrips.register('tab_member');
-	});
-	 //]]>
-	</script>
-
-<ul id='tab_member' class='tab_bar no_title'>
-	<li id='tabtab-MEMBERS|1' class=''>{$this->lang->words['mem_tab_basics']}</li>
-	<li id='tabtab-MEMBERS|2' class=''>{$this->lang->words['mem_tab_profile']}</li>
-	<li id='tabtab-MEMBERS|3' class=''>{$this->lang->words['mem_tab_notifications']}</li>
+<h3>{$this->lang->words['editing_member']}</h3>
+<div id='tabstrip_members' class='ipsTabBar with_left with_right'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+	<ul>
+		<li id='tab_MEMBERS_1'>{$this->lang->words['mem_tab_basics']}</li>
+		<li id='tab_MEMBERS_2'>{$this->lang->words['mem_tab_profile']}</li>
+		<li id='tab_MEMBERS_3'>{$this->lang->words['mem_tab_notifications']}</li>
 HTML;
 
 // Got blocks from other apps?
@@ -397,8 +421,8 @@ if ( $this->settings['auth_allow_dnames'] )
 {
 	$display_name = <<<HTML
 			<tr>
-				<td><strong>{$this->lang->words['mem_display_name']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['mem_display_name']}</strong></td>
+				<td class='field_field'>
 					<span class='member_detail' id='MF__member_display_name'>{$member['members_display_name']}</span>
 					<a class='change_icon' id='MF__member_display_name_popup' href='' style='cursor:pointer' title='{$this->lang->words['title_display_name']}'>{$this->lang->words['mem_change_button']}</a>
 					
@@ -421,6 +445,7 @@ foreach( $this->cache->getCache('login_methods') as $method )
 	if( $method['login_folder_name'] == 'openid' )
 	{
 		$openIdEnabled	= true;
+		break;
 	}
 }
 
@@ -428,8 +453,8 @@ if ( $openIdEnabled )
 {
 	$openid = <<<HTML
 			<tr>
-				<td><strong>{$this->lang->words['mem_identity_url']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['mem_identity_url']}</strong></td>
+				<td class='field_field'>
 					<span class='member_detail' id='MF__identity_url'>{$form_identity_url}</span>
 				</td>
 			</tr>
@@ -447,15 +472,16 @@ $_pp_box_width = ( $member['pp_main_width'] == '*' OR $member['pp_main_width'] <
 $_pp_max_width = ( $member['pp_main_width'] == '*' ) ? ';max-width:100px' : '';
 
 $IPBHTML .= <<<HTML
- </ul>
-<div class='acp-box member_form with_bg'>
-	<div id='tabpane-MEMBERS|1'>
+</ul>
+ </div>
+<div id='tabstrip_members_content' class='ipsTabBar_content'>
+	<div id='tab_MEMBERS_1_content' class='row1'>
 		<div style='float: left; width: 70%'>
-			<table class='alternate_rows double_pad top_align'>
+			<table class='ipsTable double_pad'>
 				{$display_name}
 				<tr>
-					<td><strong>{$this->lang->words['mem_login_name']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_login_name']}</strong></td>
+					<td class='field_field'>
 						<span class='member_detail' id='MF__name'>{$member['name']}</span>
 						<a href='' class='change_icon' style='cursor:pointer' id='MF__name_popup' title='{$this->lang->words['title_login_name']}'>{$this->lang->words['mem_change_button']}</a>
 						<script type='text/javascript'>
@@ -464,8 +490,8 @@ $IPBHTML .= <<<HTML
 					</td>
 				</tr>
 				<tr>
-					<td><strong>{$this->lang->words['mem_password']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_password']}</strong></td>
+					<td class='field_field'>
 						
 						<span class='member_detail' id='MF__password'>************</span> 
 						<a href='' class='change_icon' style='cursor:pointer' id='MF__password_popup' title='{$this->lang->words['title_password']}'>{$this->lang->words['mem_change_button']}</a>
@@ -475,8 +501,8 @@ $IPBHTML .= <<<HTML
 					</td>
 				</tr>
 				<tr>
-					<td><strong>{$this->lang->words['mem_email']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_email']}</strong></td>
+					<td class='field_field'>
 						<span class='member_detail' id='MF__email'>{$member['email']}</span> 
 						<a href='' class='change_icon' style='cursor:pointer' id='MF__email_popup' title='{$this->lang->words['title_email']}'>{$this->lang->words['mem_change_button']}</a>
 						<script type='text/javascript'>
@@ -486,36 +512,35 @@ $IPBHTML .= <<<HTML
 				</tr>
 				{$openid}
 				<tr>
-					<td><strong>{$this->lang->words['mem_form_title']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_form_title']}</strong></td>
+					<td class='field_field'>
 						<span id='MF__title'>{$form_title}</span>
 					</td>
 				</tr>
 				<tr>
-					<td><strong>{$this->lang->words['mem_p_group']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_p_group']}</strong></td>
+					<td class='field_field'>
 						<span id='MF__member_group_id'>{$form_member_group_id}</span>
 					</td>
 				</tr>
 				<tr>
-					<td><strong>{$this->lang->words['mem_s_group']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mem_s_group']}</strong></td>
+					<td class='field_field'>
 						<span id='MF__mgroup_others'>{$form_mgroup_others}</span>
 					</td>
 				</tr>
 				<tr>
-					<td><strong>{$this->lang->words['mem_warn_level']}</strong></td>
-					<td>
-								
-						<span id='MF__warn_level'>{$form_warn}</span>&nbsp;&nbsp;<a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=members&amp;module=warn&amp;section=warn&amp;mid={$member['member_id']}&amp;do=view&amp;popup=1','980','600'); return false;" title='{$this->lang->words['sm_viewnotes']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/view.png' alt='{$this->lang->words['sm_viewnotes']}' /></a>
-						 <a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=members&amp;module=warn&amp;section=warn&amp;mid={$member['member_id']}&amp;do=add_note&amp;popup=1','500','450'); return false;" title='{$this->lang->words['sm_addnote']}'><img src='{$this->settings['skin_acp_url']}/images/note_add.png' alt='{$this->lang->words['sm_addnote']}' /></a>
+					<td class='field_title'><strong class'title'>{$this->lang->words['mem_warn_level']}</strong></td>
+					<td class='field_field'>		
+						<span id='MF__warn_level'>{$form_warn}</span>&nbsp;&nbsp;<a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;do=view&amp;popup=1','980','600'); return false;" title='{$this->lang->words['sm_viewnotes']}'><img src='{$this->settings['skin_acp_url']}/images/icons/view.png' alt='{$this->lang->words['sm_viewnotes']}' /></a>
+						 <a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;do=add_note&amp;popup=1','500','450'); return false;" title='{$this->lang->words['sm_addnote']}'><img src='{$this->settings['skin_acp_url']}/images/note_add.png' alt='{$this->lang->words['sm_addnote']}' /></a>
 					</td>
 				 </tr>
 			</table>
 		</div>
-		<div style='float: left; width: 30%' class='acp-sidebar'>
-			<div style='border:1px solid #369;background:#FFF;width:{$_pp_box_width}px; padding:5px; margin: 10px auto;' id='MF__pp_photo_container'>
-				<img id='MF__pp_photo' src="{$member['pp_main_photo']}" width='{$member['pp_main_width']}' height='{$member['pp_main_height']}' style='{$_pp_max_width}' />
+		<div class='acp-sidebar'>
+			<div style='width:{$_pp_box_width}px;' id='MF__pp_photo_container'>
+				<img id='MF__pp_photo' src="{$member['pp_main_photo']}" style='{$_pp_max_width};max-width:125px' />
 				<br />
 				<ul class='photo_options'>
 HTML;
@@ -523,14 +548,14 @@ HTML;
 if( $member['_has_photo'] )
 {
 $IPBHTML .= <<<HTML
-				<li><a class='' style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__removephoto' title='{$this->lang->words['mem_remove_photo']}'><img src='{$this->settings['skin_acp_url']}/images/picture_delete.png' alt='{$this->lang->words['mem_remove_photo']}' /></a></li>
-				<li><a class='' style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__newphoto' title='{$this->lang->words['sm_uploadnew']}'><img src='{$this->settings['skin_acp_url']}/images/picture_add.png' alt='{$this->lang->words['sm_uploadnew']}' /></a></li>
+				<li><a style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__removephoto' title='{$this->lang->words['mem_remove_photo']}'><img src='{$this->settings['skin_acp_url']}/images/picture_delete.png' alt='{$this->lang->words['mem_remove_photo']}' /></a></li>
+				<li><a style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__newphoto' title='{$this->lang->words['sm_uploadnew']}'><img src='{$this->settings['skin_acp_url']}/images/picture_add.png' alt='{$this->lang->words['sm_uploadnew']}' /></a></li>
 HTML;
 }
 else
 {
 $IPBHTML .= <<<HTML
-				<li><a class='' style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__newphoto' title='{$this->lang->words['sm_uploadnew']}'><img src='{$this->settings['skin_acp_url']}/images/picture_add.png' alt='{$this->lang->words['sm_uploadnew']}' /></a></li>
+				<li><a style='float:none;width:auto;text-align:center;cursor:pointer' id='MF__newphoto' title='{$this->lang->words['sm_uploadnew']}'><img src='{$this->settings['skin_acp_url']}/images/picture_add.png' alt='{$this->lang->words['sm_uploadnew']}' /></a></li>
 HTML;
 }
 
@@ -542,8 +567,10 @@ $IPBHTML .= <<<HTML
 			</div>
 			
 			<div class='sidebar_box'>
-				<strong>{$this->lang->words['mem_joined']}:</strong> {$member['_joined']}<br /><br />
-				<strong>{$this->lang->words['mem_ip_address_f']}:</strong> <a href='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}' title='{$this->lang->words['mem_ip_title']}'>{$member['ip_address']}</a>
+				<ul>
+					<li><strong>{$this->lang->words['mem_joined']}:</strong> <span>{$member['_joined']}</span></li>
+					<li><strong>{$this->lang->words['mem_ip_address_f']}:</strong> <span><a href='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}' title='{$this->lang->words['mem_ip_title']}'>{$member['ip_address']}</a></span></li>
+				</ul>
 			</div>
 		</div>
 		<div style='clear: both;'></div>
@@ -554,117 +581,127 @@ HTML;
 
 $IPBHTML .= <<<HTML
 	<!-- PROFILE PANE-->
-	<div id='tabpane-MEMBERS|2' class='tablerow1'>
-	<table class='alternate_rows double_pad' cellspacing='0'>
+	<div id='tab_MEMBERS_2_content'>
+	<table class='ipsTable double_pad'>
 	
 					<tr>
 						<th colspan='2'>{$this->lang->words['sm_settings']}</th>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_timeoffset']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_timeoffset']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__time_offset'>{$form_time_offset}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_langchoice']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_langchoice']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__language'>{$form_language}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_skinchoice']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_skinchoice']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__skin'>
 								{$skinList}
 							</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_editorchoice']}</strong></td>
-						<td>
-							<span id='MF__editor'>
-								{$form_rte}
-							</span>
-						</td>
-					</tr>
-					<tr>
-						<td><strong>{$this->lang->words['sm_uploaderchoice']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_uploaderchoice']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__uploader'>
 								{$form_uploader}
 							</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_viewsig']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_viewsig']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__view_sig'>{$form_view_sig}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['bw_disable_customization']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['bw_disable_customization']}</strong></td>
+						<td class='field_field'>
 							<span>{$bw_disable_customization}</span>
 							<div style='padding-top:5px'><input type="checkbox" name="removeCustomization" value="1" /> {$this->lang->words['remove_custom_stuff']}
 						</td>
 					</tr>
 					
-					
+					<tr>
+						<th colspan='2'>{$this->lang->words['mf_t_tagging']}<!--You're it--></th>
+					</tr>
+				 	<tr>
+				 		<td class='field_title'><strong class='title'>{$this->lang->words['bw_disable_tagging']}</strong></td>
+				 		<td class='field_field'>
+				 			{$bw_disable_tagging}<br />
+							<span class='desctext'>{$this->lang->words['bw_disable_tagging_desc']}</span>
+				 		</td>
+				 	</tr>
+				 	<tr>
+				 		<td class='field_title'>
+				 			<strong class='title'>{$this->lang->words['bw_disable_prefixes']}</strong></td>
+				 		</td>
+				 		<td class='field_field'>
+				 			{$bw_disable_prefixes}<br />
+							<span class='desctext'>{$this->lang->words['bw_disable_prefixesm_desc']}</span>
+				 		</td>
+				 	</tr>
 					<tr>
 						<th colspan='2'>{$this->lang->words['sm_profile']}</th>
 					</tr>
 				
 					<tr>
-						<td><strong>{$this->lang->words['sm_bday']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_bday']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__birthday'>{$_form_month} {$_form_day} {$_form_year}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['frm_no_status']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['frm_no_status']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__frm_no_status'>{$bw_no_status_update}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_reputation']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_reputation']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__pp_reputation_points'>
 								{$form_reputation_points} 
-								<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['member_id']}&amp;type=received','900','550'); return false;" title='{$this->lang->words['sm_rep_view_r']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/rep_received.png' alt='{$this->lang->words['sm_rep_view_r']}' /></a> 
-								<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['member_id']}&amp;type=given','900','550'); return false;" title='{$this->lang->words['sm_rep_view_g']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/rep_given.png' alt='{$this->lang->words['sm_rep_view_g']}' /></a>
+								<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['member_id']}&amp;type=received','900','550'); return false;" title='{$this->lang->words['sm_rep_view_r']}'><img src='{$this->settings['skin_acp_url']}/images/icons/rep_received.png' alt='{$this->lang->words['sm_rep_view_r']}' /></a> 
+								<a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}{$this->form_code}&amp;do=view_rep&amp;id={$this->request['member_id']}&amp;type=given','900','550'); return false;" title='{$this->lang->words['sm_rep_view_g']}'><img src='{$this->settings['skin_acp_url']}/images/icons/rep_given.png' alt='{$this->lang->words['sm_rep_view_g']}' /></a>
 							</span>
 						</td>						
 					</tr>
 					
 					<tr>
-						<td><strong>{$this->lang->words['sm_latest_visitors']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_latest_visitors']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__visitors'>{$pp_visitors}</span>
 						</td>
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_enable_comments']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_enable_comments']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__profile_comments'>{$pp_enable_comments}</span>
 						</td>						
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_approve_comments']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_approve_comments']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__comments_approve'>{$pp_comments_approve}</span>
 						</td>						
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_friends_profile']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_friends_profile']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__profile_friends'>{$pp_enable_friends}</span>
 						</td>						
 					</tr>
 					<tr>
-						<td><strong>{$this->lang->words['sm_approve_friends']}</strong></td>
-						<td>
+						<td class='field_title'><strong class='title'>{$this->lang->words['sm_approve_friends']}</strong></td>
+						<td class='field_field'>
 							<span id='MF__friends_approve'>{$pp_friends_approve}</span>
 						</td>						
 					</tr>
@@ -673,7 +710,7 @@ HTML;
 	if ( is_array( $member['custom_fields'] ) AND count( $member['custom_fields'] ) )
 	{
 		$IPBHTML .= <<<HTML
-		<table class='alternate_rows double_pad' cellspacing='0'>
+		<table class='ipsTable double_pad'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['sm_custom']}</th>
 			</tr>
@@ -682,8 +719,8 @@ HTML;
 		{
 			$IPBHTML .= <<<HTML
 				<tr>
-					<td><strong>{$_data['name']}</strong></td>
-					<td>
+					<td class='field_title'><strong class='title'>{$_data['name']}</strong></td>
+					<td class='field_field'>
 						<span id='custom_fields_{$_id}'>{$_data['data']}</span>
 					</td>
 				</tr>
@@ -699,9 +736,9 @@ $IPBHTML .= <<<HTML
 	<!-- / CUSTOM FIELDS PANE -->
 	
 	<!-- SIGNATURE-->
-	<table class='alternate_rows double_pad' cellspacing='0'>
+	<table class='ipsTable double_pad'>
 		<tr>
-			<th>{$this->lang->words['sm_sigtab']}</th>
+			<th colspan='2'>{$this->lang->words['sm_sigtab']}</th>
 		</tr>
 		<tr>
 			<td>
@@ -716,7 +753,7 @@ $IPBHTML .= <<<HTML
 	<!-- / SIGNATURE-->
 		
 	<!-- ABOUT ME-->
-	<table class='alternate_rows double_pad' cellspacing='0'>
+	<table class='ipsTable double_pad'>
 		<tr>
 			<th>{$this->lang->words['sm_abouttab']}</th>
 		</tr>
@@ -733,26 +770,20 @@ $IPBHTML .= <<<HTML
 	<!-- / ABOUT ME-->
 	
 	</div>
-	<div id='tabpane-MEMBERS|3' class='tablerow1'>
-		<table class='alternate_rows double_pad' cellspacing='0'>
+	<div id='tab_MEMBERS_3_content'>
+		<table class='ipsTable double_pad'>
 			<tr>
 				<th colspan='2'>{$this->lang->words['memt_privacysettings']}</th>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['sm_hideemail']}</strong></td>
-				<td>
-					<span id='MF__hide_email'>{$form_hide_email}</span>
-				</td>
-			</tr>
-			<tr>
-				<td><strong>{$this->lang->words['sm_allowadmin']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['sm_allowadmin']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__allow_admin_mails'>{$form_allow_admin_mails}</span>
 				</td>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['sm_disablepm']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['sm_disablepm']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__members_disable_pm'>{$form_members_disable_pm}</span>
 				</td>
 			</tr>
@@ -761,26 +792,20 @@ $IPBHTML .= <<<HTML
 				<th colspan='2'>{$this->lang->words['memt_boardprefs']}</th>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['show_notification_popup']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['show_notification_popup']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__xxx'>{$form_popup}</span>
 				</td>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['send_full_msg']}</strong></td>
-				<td>
-					<span id='MF__xxx'>{$form_fullmsg}</span>
-				</td>
-			</tr>
-			<tr>
-				<td><strong>{$this->lang->words['auto_track']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['auto_track']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__xxx'>{$form_autotrack}</span>
 				</td>
 			</tr>
 			<tr>
-				<td><strong>{$this->lang->words['auto_track_type']}</strong></td>
-				<td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['auto_track_type']}</strong></td>
+				<td class='field_field'>
 					<span id='MF__xxx'>{$form_autotrackmthd}</span>
 				</td>
 			</tr>
@@ -796,29 +821,21 @@ $notifyGroups = array(
 
 		
 $IPBHTML .= <<<HTML
-	<table class='ipb_table notification_table'>
+	<table class='ipsTable double_pad'>
 		<tr>
-			<th>&nbsp;</th>
-			<th style='width: 15%; text-align: center;'>{$this->lang->words['notify_type_email']}</th>
-HTML;
-		if ( !$member['members_disable_pm'] )
-		{
-			$IPBHTML .= <<<HTML
-			<th style='width: 15%; text-align: center;'>{$this->lang->words['notify_type_pm']}</th>
-HTML;
-		}
-		$IPBHTML .= <<<HTML
-			<th style='width: 15%; text-align: center;'>{$this->lang->words['notify_type_inline']}</th>
-			<th style='width: 15%; text-align: center;'>{$this->lang->words['notify_type_mobile']}</th>
+			<th width='20%'>&nbsp;</th>
+			<th width='20%' style='text-align: center'>{$this->lang->words['notify_type_email']}</th>
+			<th width='20%' style='text-align: center'>{$this->lang->words['notify_type_inline']}</th>
+			<th width='20%' style='text-align: center'>{$this->lang->words['notify_type_mobile']}</th>
 		</tr>
 HTML;
 
 		foreach( $notifyGroups as $groupKey => $group )
 		{
 			$IPBHTML .= <<<HTML
-			<tr class='row2'>
-				<td colspan='5'><h3>{$this->lang->words[ 'notifytitle_' . $groupKey ]}</h3></td>
-			</tr>
+			<th colspan='4'>
+				{$this->lang->words[ 'notifytitle_' . $groupKey ]}
+			</th>
 HTML;
 			foreach( $group as $key )
 			{
@@ -826,8 +843,8 @@ HTML;
 				{
 					$IPBHTML .= <<<HTML
 					<tr>
-						<td class='notify_title desc'>{$this->lang->words['notify__' . $key]}</td>
-						<td style='text-align: center;'>
+						<td class='field_title'><strong class='title'>{$this->lang->words['notify__' . $key]}</strong></td>
+						<td align='center'>
 HTML;
 
 							if( isset( $notifications[$key]['options']['email'] ) )
@@ -848,34 +865,7 @@ HTML;
 							
 							$IPBHTML .= <<<HTML
 						</td>
-HTML;
-					if ( !$member['members_disable_pm'] )
-					{
-						$IPBHTML .= <<<HTML
-						<td style='text-align: center;'>
-HTML;
-							if( isset( $notifications[$key]['options']['pm'] ) )
-							{
-								$_disabled	= $notifications[$key]['disabled'] ? " disabled='disabled'" : '';
-								$_selected	= ( is_array($notifications[$key]['defaults']) AND in_array('pm',$notifications[$key]['defaults']) ) ? " checked='checked'" : '';
-
-								$IPBHTML .= <<<HTML
-								<input type='checkbox' class='input_check' id='pm_{$key}' name="config_{$key}[]" value="pm"{$_selected}{$_disabled} />
-HTML;
-							}
-							else
-							{
-								$IPBHTML .= <<<HTML
-								<input type='checkbox' class='input_check' name='' disabled='disabled' />
-HTML;
-							}
-							
-							$IPBHTML .= <<<HTML
-						</td>
-HTML;
-					}
-						$IPBHTML .= <<<HTML
-						<td style='text-align: center;'>
+						<td align='center'>
 HTML;
 
 							if( isset( $notifications[$key]['options']['inline'] ) )
@@ -896,7 +886,7 @@ HTML;
 							
 							$IPBHTML .= <<<HTML
 						</td>
-						<td style='text-align: center;'>
+						<td align='center'>
 HTML;
 
 							if( isset( $notifications[$key]['options']['mobile'] ) )
@@ -924,21 +914,29 @@ HTML;
 				}
 			}
 		}
-
-		$IPBHTML .= <<<HTML
-		<tr class='row2'>
-			<td colspan='5'><h3>{$this->lang->words['notifytitle_other']}</h3></td>
-		</tr>
-HTML;
+		
+		$_lastApp	= '';
 
 		foreach( $notifications as $key => $_config )
 		{
 			if( !isset( $_config['_done'] ) && $_config['_done'] != 1 )
 			{
+				if( $_lastApp != $_config['app'] )
+				{
+					$_title		= $_config['app'] == 'core' ? $this->lang->words['notifytitle_other'] : IPSLib::getAppTitle( $_config['app'] );
+					$_lastApp	= $_config['app'];
+					
+					$IPBHTML .= <<<HTML
+			<th colspan='4'>
+				{$_title}
+			</th>
+HTML;
+				}
+				
 			$IPBHTML .= <<<HTML
 				<tr>
-					<td class='notify_title desc'>{$this->lang->words['notify__' . $_config['key'] ]}</h3></td>
-					<td style='text-align: center;'>
+					<td class='field_title'><strong class='title'>{$this->lang->words['notify__' . $_config['key'] ]}</strong></td>
+					<td align='center'>
 HTML;
 
 							if( isset( $_config['options']['email'] ) )
@@ -957,37 +955,9 @@ HTML;
 HTML;
 							}
 							
-							$IPBHTML .= <<<HTML
-						</td>
-HTML;
-					if ( !$member['members_disable_pm'] )
-					{
-						$IPBHTML .= <<<HTML
-						<td style='text-align: center;'>
-HTML;
-
-						if( isset( $_config['options']['pm'] ) )
-						{
-							$_disabled	= $_config['disabled'] ? " disabled='disabled'" : '';
-							$_selected	= ( is_array($_config['defaults']) AND in_array('pm',$_config['defaults']) ) ? " checked='checked'" : '';
-							
-							$IPBHTML .= <<<HTML
-							<input type='checkbox' class='input_check' id='pm_{$key}' name="config_{$key}[]" value="pm"{$_selected}{$_disabled} />
-HTML;
-						}
-						else
-						{
-							$IPBHTML .= <<<HTML
-							<input type='checkbox' class='input_check' name='' disabled='disabled' />
-HTML;
-						}
-						
 						$IPBHTML .= <<<HTML
 					</td>
-HTML;
-					}
-					$IPBHTML .= <<<HTML
-					<td style='text-align: center;'>
+					<td align='center'>
 HTML;
 
 						if( isset( $_config['options']['inline'] ) )
@@ -1008,7 +978,7 @@ HTML;
 						
 						$IPBHTML .= <<<HTML
 					</td>
-					<td style='text-align: center;'>
+					<td align='center'>
 HTML;
 
 						if( isset( $_config['options']['mobile'] ) )
@@ -1036,28 +1006,27 @@ HTML;
 
 	$IPBHTML .= <<<HTML
 	</table>
-	</div>
+</div>
 HTML;
 
 // Got blocks from other apps?
 $IPBHTML .= implode( "\n", $content['area'] );
 
 $IPBHTML .= <<<HTML
-<div class='acp-actionbar'><input class='button primary' type='submit' value=' {$this->lang->words['sm_savebutton']} ' /></div>
+</div>
+	<div class='acp-actionbar'>
+		<input class='button primary' type='submit' value='{$this->lang->words['sm_savebutton']}' />
+	</div>
 </div>
 
-</form>
-
 <script type='text/javascript'>
-	try {
-		/*$('tabpane-MEMBERS|2').hide();
-		$('tabpane-MEMBERS|3').hide();
-		$('tabpane-MEMBERS|4').hide();
-		$('tabpane-MEMBERS|5').hide();*/
-	} catch(err ){
-		Debug.write( err );
-	}
-	
+	jQ("#tabstrip_members").ipsTabBar({tabWrap: "#tabstrip_members_content"});
+</script>
+
+</form>
+</div>
+
+<script type='text/javascript'>	
 	if( $('MF__removephoto') )
 	{
 		$('MF__removephoto').observe( 'click', acp.members.removePhoto.bindAsEventListener( this, '{$member['member_id']}' ) );
@@ -1071,7 +1040,6 @@ return $IPBHTML;
 /**
  * List of members
  *
- * @access	public
  * @param	array 		Members
  * @param	string		Pages
  * @return	string		HTML
@@ -1081,90 +1049,670 @@ public function members_list( $members, $pages='' ) {
 $IPBHTML = "";
 //--starthtml--//
 
-
 //-----------------------------------------
 // BADGE STYLEE
 //-----------------------------------------
 
 $IPBHTML .= <<<HTML
+<br />
+<style type='text/css'>
+	.pagination .pagejump { display: none; }
+</style>
 {$pages}
-<br style='clear: both' />
 <div class='acp-box'>
-	<h3>{$this->lang->words['sm_members']}</h3>
-<table class='alternate_rows double_pad'>
-	<tr>
-		<th style='width: 5%'></th>
-		<th style='width: 30%'>{$this->lang->words['list__dn']}</th>
-		<th style='width: 1%'>&nbsp;</th>
-		<th style='width: 25%'>{$this->lang->words['list__email']}</th>
-		<th style='width: 20%'>{$this->lang->words['list__group']}</th>
-		<th style='width: 15%'>{$this->lang->words['list__ip']}</th>
-		<th style='width:5%;'></th>
-	</tr>
+	<h3>
+		<span class='right loading' id='members_loading' style='display: none'>
+			<img src='{$this->settings['skin_acp_url']}/images/loading_white.gif' /> &nbsp;&nbsp;{$this->lang->words['gl_loading']}
+		</span>
+		{$this->lang->words['sm_members']}
+	</h3>
+	<div id='member_search_bar' class='clearfix'>
+		<div class='left' id='m_search_info' style='display: none'>
+			<span></span> {$this->lang->words['searchresultsstr']} &nbsp;&nbsp;&nbsp;<a href='#' id='m_search_cancel' class='ipsBadge badge_grey'>{$this->lang->words['memclearsearch']}</a>
+		</div>
+		<div class='ipsToggleBar left' id='member_types' style='overflow: hidden'>
+			<ul>
+				<li class='ipsActionButton active' data-type="all">
+					<a href='#' title='{$this->lang->words['m_type_all_desc']}'>{$this->lang->words['m_type_all']}</a>
+				</li>
+HTML;
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_banned', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton' data-type="banned">
+				<a href='#' title='{$this->lang->words['m_type_banned_desc']}'>{$this->lang->words['m_type_banned']}</a>
+			</li>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_locked', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton' data-type="locked">
+				<a href='#' title='{$this->lang->words['m_type_locked_desc']}'>{$this->lang->words['m_type_locked']}</a>
+			</li>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_spam', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton' data-type="spam">
+				<a href='#' title='{$this->lang->words['m_type_spam_desc']}'>{$this->lang->words['m_type_spam']}</a>
+			</li>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_incomplete', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton' data-type="incomplete">
+				<a href='#' title='{$this->lang->words['m_type_incomplete_desc']}'>{$this->lang->words['m_type_incomplete']}</a>
+			</li>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_validating', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+			<li class='ipsActionButton' data-type="validating">
+				<a href='#' title='{$this->lang->words['m_type_validate_desc']}'>{$this->lang->words['m_type_validate']}</a>
+			</li>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+			</ul>
+		</div>
+		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=members_list' method='post' id='memberListForm' class='right'>
+			<input type='hidden' name='__update' value='1' />				
+			<input type='text' name='f_member_contains_text' class='textinput no_width' size='30' id='member_search' />
+			<a href='#' id='advanced_member_search'>{$this->lang->words['m_search_advanced']}</a> 
+		</form>
+	</div>
+<table class='ipsTable double_pad' id='member_list'>
+	<thead>
+		<tr class='member_column_titles' id='mheader_all' data-type="all">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 18%' class='sortable active desc' data-key="joined"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width: 10%'>{$this->lang->words['list__group']}</th>
+			<th style='width: 15%'>{$this->lang->words['list__ip']}</th>
+			<th style='width:5%; text-align: right; padding-right: 15px'></th>
+		</tr>
+HTML;
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_validating', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr class='member_column_titles' id='mheader_validating' style='display: none' data-type="validating">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 10%'>{$this->lang->words['list__posts']}</th>
+			<th style='width: 18%'>{$this->lang->words['list__info']}</th>
+			<th style='width: 15%' class='sortable active desc' data-key="members_display_name"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width:5%; text-align: right; padding-right: 15px'><input type='checkbox' class='check_all' /></th>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_locked', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr class='member_column_titles' id='mheader_locked' style='display: none' data-type="locked">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 10%'>{$this->lang->words['list__posts']}</th>
+			<th style='width: 10%'>{$this->lang->words['list__locked']}</th>
+			<th style='width: 15%' class='sortable active desc' data-key="members_display_name"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width:5%; text-align: right; padding-right: 15px'><input type='checkbox' class='check_all' /></th>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_banned', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr class='member_column_titles' id='mheader_banned' style='display: none' data-type="banned">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 10%'>{$this->lang->words['list__posts']}</th>
+			<th style='width: 15%'>{$this->lang->words['list__group']}</th>
+			<th style='width: 15%' class='sortable active desc' data-key="members_display_name"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width:5%; text-align: right; padding-right: 15px'><input type='checkbox' class='check_all' /></th>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_spam', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr class='member_column_titles' id='mheader_spam' style='display: none' data-type="spam">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 10%'>{$this->lang->words['list__posts']}</th>
+			<th style='width: 15%'>{$this->lang->words['list__group']}</th>
+			<th style='width: 15%' class='sortable active desc' data-key="members_display_name"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width:5%; text-align: right; padding-right: 15px'><input type='checkbox' class='check_all' /></th>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_incomplete', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr class='member_column_titles' id='mheader_incomplete' style='display: none' data-type="incomplete">
+			<th style='width: 5%'></th>
+			<th style='width: 25%' class='sortable' data-key="members_display_name">
+				<p>{$this->lang->words['list__dn']}<span></span></p>
+			</th>
+			<th style='width: 22%' class='sortable' data-key="email">
+				<p>{$this->lang->words['list__email']}<span></span></p>
+			</th>
+			<th style='width: 10%'>{$this->lang->words['list__group']}</th>
+			<th style='width: 15%'>{$this->lang->words['list__ip']}</th>
+			<th style='width: 15%' class='sortable active desc' data-key="members_display_name"><p>{$this->lang->words['list__joined']}<span></span></p></th>
+			<th style='width:5%; text-align: right; padding-right: 15px'><input type='checkbox' class='check_all' /></th>
+		</tr>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	</thead>
+	<tbody id='member_results'>
 HTML;
 
 if( count( $members ) )
 {
 	foreach( $members as $member )
 	{
-		$member['group_title'] = IPSLib::makeNameFormatted( $member['group_title'], $member['member_group_id'] );
-		
-		if( trim($member['members_display_name']) == '' )
+		switch( $this->request['type'] )
 		{
-			$member['members_display_name'] = "<em class='desctext'>{$this->lang->words['sm_nodisplayname']}</em>";
-		}
-		
-		if( IPSText::mbstrlen( $member['email'] ) > 50 )
-		{
-			$_email = htmlspecialchars( substr( html_entity_decode( $member['email'] ), 0, 20 ) ) . '...' . htmlspecialchars( substr( html_entity_decode( $member['email'] ), -25 ) );
-			$member['email'] = '<span style="border-bottom:1px dotted gray; cursor:pointer" title="' . $member['email'] . "\">" . $_email . '</span>';
-		}
-		
-		$_extraStyle = ( $member['member_banned'] ) ? ' class="_red"' : ( $member['bw_is_spammer'] ? ' class="_amber"' : '' );
-		$_extraText  = ( $member['member_banned'] ) ? '(' . $this->lang->words['m_f_showbanned'] . ')' : ( $member['bw_is_spammer'] ? '(' . $this->lang->words['m_f_showspam'] . ')' : '' );
-		
-		$_serviceImg = "";
+			case 'all':
+			default:
+				$IPBHTML .= $this->memberListRow( $member );
+			break;
+			
+			case 'spam':
+				$IPBHTML .= $this->memberListRow_spam( $member );
+			break;
 
-		if ( $member['fb_uid'] )
-		{
-			$_serviceImg = "<a href='http://www.facebook.com/profile.php?id={$member['fb_uid']}' target='_blank'><img src='{$this->settings['skin_acp_url']}/_newimages/members/facebook.png' /></a>&nbsp;";
-		}
-		
-		if ( $member['twitter_id'] )
-		{
-			$_serviceImg .= "<img src='{$this->settings['skin_acp_url']}/_newimages/members/twitter.png' />";
-		}
+			case 'banned':
+				$IPBHTML .= $this->memberListRow_banned( $member );
+			break;
 
-		$IPBHTML .= <<<HTML
-			<tr id='member-{$member['member_id']}'{$_extraStyle}>
-				<td><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}'><img src='{$member['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /></a></td>			
-				<td class='member_name'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}'>{$member['members_display_name']}</a></td>
-				<td style="white-space:nowrap">{$_serviceImg}</td>
-				<td>{$member['email']}</td>
-				<td>{$member['group_title']} <span style='color:gray;font-size:0.8em'>$_extraText</span></td>
-				<td><a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}'>{$member['ip_address']}</a></td>
-				<td><a href='#' onclick="return acp.confirmDelete( '{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=member_delete&amp;member_id={$member['member_id']}');" title='{$this->lang->words['form_deletemember']}'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' title='{$this->lang->words['form_deletemember']}' alt='{$this->lang->words['form_deletemember']}' /></a></td>
-			</tr>
-HTML;
+			case 'locked':
+				$IPBHTML .= $this->memberListRow_locked( $member );
+			break;
 
+			case 'validating':
+				$IPBHTML .= $this->memberListRow_validating( $member );
+			break;
+
+			case 'incomplete':
+				$IPBHTML .= $this->memberListRow_incomplete( $member );
+			break;
+		}
 	}
 }
 else 
 {
+	$IPBHTML .= $this->memberListRow_empty();
+}
+
 $IPBHTML .= <<<HTML
-<td style='padding: 10px;' colspan='8'>
-		{$this->lang->words['sm_nomemfound']}
-</td>
-	
+	</tbody>
+	<tfoot>
+HTML;
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_banned', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr id='mfooter_banned' class='disabled' data-type="banned" style='display: none'>
+			<td colspan='7' style='text-align: right'>
+				<strong>{$this->lang->words['m_with_checked']}</strong> <a href="#" data-action="delete" class='ipsBadge badge_red mass_action'>{$this->lang->words['m_but_delete_all']}</a> <a href="#" data-action="unban" class='ipsBadge badge_green mass_action'>{$this->lang->words['m_but_unban_all']}</a>
+			</td>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_spam', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr id='mfooter_spam' class='disabled' data-type="spam" style='display: none'>
+			<td colspan='7' style='text-align: right'>
+				<div id='s_initial'>
+					<strong>{$this->lang->words['m_with_checked']}</strong> <a href="#" data-action="ban" class='ipsBadge badge_red mass_action'>{$this->lang->words['m_but_ban_all']}</a> <a href="#" data-action="unspam" class='ipsBadge badge_green mass_action'>{$this->lang->words['m_but_unflag_all']}</a>
+				</div>
+				<div id='s_unspam_confirm' style='display: none'>
+					<strong>{$this->lang->words['m_approve']}</strong> <input type='button' id='s_unspam_yes' data-action="unspam_posts" value="{$this->lang->words['m_but_yes']}" class='realbutton' /> <input type='button' data-action="unspam" id='s_unspam_no' value="{$this->lang->words['m_but_no']}" class='realbutton' />
+				</div>
+				<div id='s_ban_confirm' style='display: none'>
+					<strong>{$this->lang->words['m_blacklist']}</strong> <input type='button' id='s_ban_yes' data-action="ban_blacklist" value="{$this->lang->words['m_but_yes']}" class='realbutton' /> <input type='button' data-action="ban" id='s_ban_mp' value="{$this->lang->words['m_but_no']}" class='realbutton' />
+				</div>
+			</td>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_validating', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr id='mfooter_validating' class='disabled' data-type="validating" style='display: none'>
+			<td colspan='7' style='text-align: right'>
+				<strong>{$this->lang->words['m_with_checked']}</strong> <a href="#" data-action="delete" class='ipsBadge badge_red mass_action'>{$this->lang->words['m_but_delete_all']}</a> <a href="#" data-action="approve" class='ipsBadge badge_green mass_action'>{$this->lang->words['m_but_approve_all']}</a> <a href="#" data-action="resend" class='ipsBadge badge_grey mass_action'>{$this->lang->words['m_but_resend_all']}</a> <a href="#" data-action="ban" class='ipsBadge badge_grey mass_action'>{$this->lang->words['m_but_ban_all']}</a> <a href="#" data-action="spam" class='ipsBadge badge_grey mass_action'>{$this->lang->words['m_but_mas_all']}</a>
+			</td>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_locked', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr id='mfooter_locked' class='disabled' data-type="locked" style='display: none'>
+			<td colspan='7' style='text-align: right'>
+				<strong>{$this->lang->words['m_with_checked']}</strong> <a href="#" data-action="delete" class='ipsBadge badge_red mass_action'>{$this->lang->words['m_but_delete_all']}</a> <a href="#" data-action="unlock" class='ipsBadge badge_green mass_action'>{$this->lang->words['m_but_unlock_all']}</a> <a href="#" data-action="ban" class='ipsBadge badge_grey mass_action'>{$this->lang->words['m_but_ban_all']}</a>
+			</td>
+		</tr>
+HTML;
+}
+
+if( $this->registry->getClass('class_permissions')->checkPermission( 'membertools_incomplete', 'members', 'members' ) )
+{
+	$IPBHTML .= <<<HTML
+		<tr id='mfooter_incomplete' class='disabled' data-type="incomplete" style='display: none'>
+			<td colspan='7' style='text-align: right'>
+				<strong>{$this->lang->words['m_with_checked']}</strong> <a href="#" data-action="delete" class='ipsBadge badge_red mass_action'>{$this->lang->words['m_but_delete_all']}</a> <a href="#" data-action="finalize" class='ipsBadge badge_green mass_action'>{$this->lang->words['m_but_finalize_all']}</a>
+			</td>
+		</tr>
 HTML;
 }
 
 $IPBHTML .= <<<HTML
+	</tfoot>
 </table>
- </table>
 </div>
+<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=members_list' method='post' id='memberPruneMoveForm' style='display: none'>
+	<input type='hidden' name='f_search_type' value='' id='f_search_type' />
+	<input type='hidden' name='__update' value='0' />
+</form>
 <br style='clear: both' />
 {$pages}
+	
+<script type='text/javascript'>
+	jQ(document).ready(function() {
+	 	memberlist.init( "{$this->settings['_base_url']}app=members&module=ajax&section=members&secure_key=" + ipb.vars['md5_hash'], "{$this->request['type']}" );
+	});
+</script>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * No member results
+ *
+ * @return	string		HTML
+ */
+public function memberListRow_empty() {
+
+$IPBHTML = "";
+
+$IPBHTML .= <<<HTML
+<td class='no_messages' colspan='8'>
+	{$this->lang->words['sm_nomemfound']}
+</td>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Spam member loop for member list
+ *
+ * @param	array 		Member data
+ * @return	string		HTML
+ */
+public function memberListRow_spam( $member ) {
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' data-mid="{$member['member_id']}" class='member_row'>
+		<td><img src='{$this->settings['skin_acp_url']}/images/members/normal_alert.png' alt='*' /></td>			
+		<td class='member_name'>
+			<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a>
+			<span class='desctext'>{$member['ip_addresses']}</span>
+		</td>
+		<td>{$member['email']}</td>
+		<td>{$member['posts']}</td>
+		<td>
+			{$member['group_title']}
+		</td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action="ban" title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_ban']}</a>
+				<a href='#' class='ipsBadge badge_green member_action' data-action="unspam">{$this->lang->words['m_but_unflag']}</a>
+				<input type='checkbox' />
+			</p>
+		</td>
+	</tr>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Banned member loop for member list
+ *
+ * @param	array 		Member data
+ * @return	string		HTML
+ */
+public function memberListRow_banned( $member ) {
+	
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' data-mid="{$member['member_id']}" class='member_row'>
+		<td><img src='{$this->settings['skin_acp_url']}/images/members/normal_alert.png' alt='*' /></td>			
+		<td class='member_name'>
+			<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a>
+			<span class='desctext'>{$member['ip_addresses']}</span>
+		</td>
+		<td>{$member['email']}</td>
+		<td>{$member['posts']}</td>
+		<td>
+			{$member['group_title']}
+		</td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action="delete" title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_delete']}</a>
+				<a href='#' class='ipsBadge badge_green member_action' data-action="unban">{$this->lang->words['m_but_unban']}</a>
+				<input type='checkbox' />
+			</p>
+		</td>
+	</tr>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Locked member loop for member list
+ *
+ * @param	array 		Member data
+ * @return	string		HTML
+ */
+public function memberListRow_locked( $member ) {
+
+$failuresatlife = sprintf( $this->lang->words['t_failures'], $member['oldest_fail'], $member['newest_fail'], $member['failed_login_count'] );
+
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' data-mid="{$member['member_id']}" class='member_row'>
+		<td><img src='{$this->settings['skin_acp_url']}/images/members/normal_lock.png' alt='*' /></td>			
+		<td class='member_name'>
+			<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a>
+			<span class='desctext'>{$member['ip_addresses']}</span>
+		</td>
+		<td>{$member['email']}</td>
+		<td>{$member['posts']}</td>
+		<td>
+			{$failuresatlife}
+		</td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action="delete" title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_delete']}</a>
+				<a href='#' class='ipsBadge badge_green member_action' data-action="unlock">{$this->lang->words['m_but_unlock']}</a>
+				<a href='#' class='ipsBadge badge_grey member_action' data-action="ban">{$this->lang->words['m_but_ban']}</a>
+				<input type='checkbox' />
+			</p>
+		</td>
+	</tr>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Incomplete member loop for member list
+ *
+ * @param	array 		Member data
+ * @return	string		HTML
+ */
+public function memberListRow_incomplete( $member ) {
+$IPBHTML = "";
+
+$member['group_title'] = IPSMember::makeNameFormatted( $member['group_title'], $member['member_group_id'] );
+
+if( trim($member['members_display_name']) == '' )
+{
+	$member['members_display_name'] = "<em class='desctext'>{$this->lang->words['sm_nodisplayname']}</em>";
+}
+
+if( IPSText::mbstrlen( $member['email'] ) > 50 )
+{
+	$_email = htmlspecialchars( substr( html_entity_decode( $member['email'] ), 0, 20 ) ) . '...' . htmlspecialchars( substr( html_entity_decode( $member['email'] ), -25 ) );
+	$member['email'] = '<span style="border-bottom:1px dotted gray; cursor:pointer" title="' . $member['email'] . "\">" . $_email . '</span>';
+}
+
+$_extraStyle = ( $member['member_banned'] ) ? '_red' : ( $member['bw_is_spammer'] ? '_amber' : '' );
+$_extraText  = ( $member['member_banned'] ) ? '(' . $this->lang->words['m_f_showbanned'] . ')' : ( $member['bw_is_spammer'] ? '(' . $this->lang->words['m_f_showspam'] . ')' : '' );
+
+$_serviceImg = "";
+
+if ( $member['fb_uid'] )
+{
+	$_serviceImg = "<a href='http://www.facebook.com/profile.php?id={$member['fb_uid']}' target='_blank'><img src='{$this->settings['skin_acp_url']}/images/members/facebook.png' /></a>&nbsp;";
+}
+
+if ( $member['twitter_id'] )
+{
+	$_serviceImg .= "<img src='{$this->settings['skin_acp_url']}/images/members/twitter.png' />";
+}
+
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' data-mid="{$member['member_id']}" class='member_row {$_extraStyle}'>
+		<td><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}'><img src='{$member['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /></a></td>			
+		<td class='member_name'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a></td>
+		<td>{$_serviceImg} {$member['email']}</td>
+		<td>{$member['group_title']} <span style='color:gray;font-size:0.8em'>{$_extraText}</span></td>
+		<td><a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}'>{$member['ip_address']}</a></td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action='delete' onclick="return acp.confirmDelete( '{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=members&amp;do=member_delete&amp;member_id={$member['member_id']}');" title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_delete']}</a>
+				<a href='#' class='ipsBadge badge_green member_action' data-action="finalize">{$this->lang->words['m_but_finalize']}</a>
+				<input type='checkbox' />
+			</p>
+		</td>
+	</tr>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Validating member loop for member list
+ *
+ * @param	array 		Member data
+ * @return	string		HTML
+ */
+public function memberListRow_validating( $member ) {
+	
+$IPBHTML = "";
+
+$member['_hours']	= floor( ( time() - $member['entry_date'] ) / 3600 );
+$member['_days']	= intval( $member['_hours'] / 24 );
+$member['_rhours']	= intval( $member['_hours'] - ($member['_days'] * 24) );
+$member['_entry']	= ipsRegistry::getClass( 'class_localization')->getDate( $member['entry_date'], 'TINY' );
+
+$member['_where']	= ( $member['lost_pass'] ? $this->lang->words['t_lostpass'] : ( $member['new_reg'] ? $this->lang->words['t_userval'] : ( $member['email_chg'] ? $this->lang->words['t_emailchangecp'] : $this->lang->words['t_na'] ) ) );
+
+if( isset($member['email_chg']) AND $member['email_chg'] )
+{
+	$member['_where'] .= " (<a href='" . $this->settings['base_url'] . "module=members&amp;section=tools&amp;do=unappemail&amp;mid={$member['member_id']}'>{$this->lang->words['t_unapprove']}</a>)";
+}
+
+if ( $member['new_reg'] AND ( $member['user_verified'] == 1 OR $this->settings['reg_auth_type'] == 'admin' ) )
+{
+	$member['_where'] = $this->lang->words['t_adminval'];
+}
+
+$member['_coppa']	= $member['coppa_user'] ? $this->lang->words['t_coppa'] : '';
+						
+$daysandhours = sprintf( $this->lang->words['t_daysandhours'], $member['_days'], $member['_rhours'] );
+$image        = $member['spam_flag'] ? array( 'normal_spam.png', $this->lang->words['alt_spamuser'] ) : 
+				( ( $member['user_verified'] ) ? array( 'normal_tick.png', $this->lang->words['alt_normal'] ) : 
+				array( 'normal_lock.png', $this->lang->words['alt_unverifieduser'] ) );
+$color		  = ( $member['user_verified'] ) ? 'red' : 'green';
+
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' class='member_row' data-mid="{$member['member_id']}"	>
+		<td><img src='{$this->settings['skin_acp_url']}/images/members/{$image[0]}' alt='{$image[1]}' title='{$image[1]}' /></td>			
+		<td class='member_name'>
+			<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a>
+			{$member['_coppa']}<br />
+			<span class='desctext'>{$this->lang->words['t_ipcolon']} <a href='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}'>{$member['ip_address']}</a></span>
+		</td>
+		<td>{$member['email']}</td>
+		<td>{$member['posts']}</td>
+		<td>
+			<span style='color:{$color}'>{$member['_where']}</span><br />
+			{$member['_entry']}<br />
+			<span class='desctext'>{$daysandhours}</span>
+		</td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action="delete" title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_delete']}</a>
+				<a href='#' class='ipsBadge badge_green member_action' data-action="approve">{$this->lang->words['m_but_approve']}</a>
+HTML;
+
+if( $member['email_chg'] )
+{
+	$IPBHTML .= <<<HTML
+				<a href='#' class='ipsBadge badge_grey member_action' data-action="resend">{$this->lang->words['m_but_resend']}</a>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+				<a href='#' class='ipsBadge badge_grey member_action' data-action="ban">{$this->lang->words['m_but_ban']}</a>
+				<a href='#' class='ipsBadge badge_grey member_action' data-action="spam">{$this->lang->words['m_but_spammer']}</a>
+				<input type='checkbox' />
+			</p>
+		</td>
+	</tr>
+HTML;
+
+//--endhtml--//
+return $IPBHTML;
+	
+}
+
+/**
+ * Regular member loop for member list
+ *
+ * @param	array 		Member data
+ * @param	bool		Show checkbox
+ * @return	string		HTML
+ */
+public function memberListRow( $member, $extraColumn=false ) {
+
+$IPBHTML = "";
+
+$member['group_title'] = IPSMember::makeNameFormatted( $member['group_title'], $member['member_group_id'] );
+
+if( trim($member['members_display_name']) == '' )
+{
+	$member['members_display_name'] = "<em class='desctext'>{$this->lang->words['sm_nodisplayname']}</em>";
+}
+
+if( IPSText::mbstrlen( $member['email'] ) > 50 )
+{
+	$_email = htmlspecialchars( substr( html_entity_decode( $member['email'] ), 0, 20 ) ) . '...' . htmlspecialchars( substr( html_entity_decode( $member['email'] ), -25 ) );
+	$member['email'] = '<span style="border-bottom:1px dotted gray; cursor:pointer" title="' . $member['email'] . "\">" . $_email . '</span>';
+}
+
+$_extraStyle = ( $member['member_banned'] ) ? '_red' : ( $member['bw_is_spammer'] ? '_amber' : '' );
+$_extraText  = ( $member['member_banned'] ) ? '(' . $this->lang->words['m_f_showbanned'] . ')' : ( $member['bw_is_spammer'] ? '(' . $this->lang->words['m_f_showspam'] . ')' : '' );
+
+$_serviceImg = "";
+
+if ( $member['fb_uid'] )
+{
+	$_serviceImg = "<a href='http://www.facebook.com/profile.php?id={$member['fb_uid']}' target='_blank'><img src='{$this->settings['skin_acp_url']}/images/members/facebook.png' /></a>&nbsp;";
+}
+
+if ( $member['twitter_id'] )
+{
+	$_serviceImg .= "<img src='{$this->settings['skin_acp_url']}/images/members/twitter.png' />";
+}
+
+$IPBHTML .= <<<HTML
+	<tr id='member-{$member['member_id']}' data-mid="{$member['member_id']}" class='member_row {$_extraStyle}'>
+		<td><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}'><img src='{$member['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /></a></td>			
+		<td class='member_name'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$member['member_id']}' class='larger_text'>{$member['members_display_name']}</a></td>
+		<td>{$_serviceImg} {$member['email']}</td>
+		<td>
+			{$member['_joined']}
+		</td>
+		<td>{$member['group_title']} <span style='color:gray;font-size:0.8em'>{$_extraText}</span></td>
+		<td><a href='{$this->settings['base_url']}&amp;app=members&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$member['ip_address']}'>{$member['ip_address']}</a></td>
+		<td>	
+			<p class='member_controls'>		
+				<a href='#' class='ipsBadge badge_red member_action' data-action='delete' title='{$this->lang->words['form_deletemember']}'>{$this->lang->words['m_but_delete']}</a>
+HTML;
+
+	if( $extraColumn )
+	{
+		$IPBHTML .= <<<HTML
+		<input type='checkbox' />
+HTML;
+	}
+	
+	$IPBHTML .= <<<HTML
+			</p>
+		</td>
+	</tr>
 HTML;
 
 //--endhtml--//
@@ -1174,7 +1722,6 @@ return $IPBHTML;
 /**
  * Member list context menu
  *
- * @access	public
  * @param	array 		Form elements
  * @param	object		Custom fields
  * @param   bool        Preset Fitlers
@@ -1187,6 +1734,9 @@ $IPBHTML = "";
 $cur = false;
 $left = $right = '';
 
+// $form['_member_string']	is a simple search field with key 'string' which will search display name, email, name and IP address
+// It is not included in this form because Rikki plans to implement separate from the advanced form, however it is available here for use if desired
+
 if ( is_array( $fields->out_fields ) AND count( $fields->out_fields ) )
 {
 	foreach( $fields->out_fields as $id => $data )
@@ -1222,221 +1772,159 @@ HTML;
 }
 	
 $IPBHTML .= <<<HTML
-<script type="text/javascript" src="{$this->settings['js_main_url']}acp.members.js"></script>
+<script type="text/javascript" src="{$this->settings['js_main_url']}acp.jquery.members.js"></script>
 
 <div class='section_title'>
 	<h2>{$this->lang->words['member_management_h2']}</h2>
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}app=members&amp;module=members&amp;section=members&amp;do=add'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/user_add.png' alt='{$this->lang->words['add_new_member_button']}' />
-				{$this->lang->words['add_new_member_button']}
-			</a>
-		</li>
-	</ul>
-</div>
-
-<div class='acp-box'>
-	<h3>{$this->lang->words['member_search_h3']}</h3>
-	<div class='member_search'>
-		<form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=members_list' method='post' id='memberListForm'>
-		    <input type='hidden' name='f_search_type' value='' id='f_search_type' />
-			<input type='hidden' name='__update' value='1' />
-			<div class='simple'>
-				<span class='desctext'>{$this->lang->words['search_member_type']} &nbsp;</span> 
-				{$form['_member_contains']}
-				{$form['_member_contains_type']}
-				{$form['_member_contains_text']}
-			</div>
-			<div class='acp-actionbar' id='m_simple'>
-				<div class='centeraction'>
-					 <input type='submit' class='realbutton' value=' {$this->lang->words['mem_update_member_list']} ' /> <span class='desctext'>{$this->lang->words['or']}</span> <input type='button' class='realbutton' value=' {$this->lang->words['use_advanced_search']} ' id='show_advanced' />
-				</div>
-			</div>			
-			<div id='m_advanced' style='display: none'>
-				<div class='tablesubheader'>{$this->lang->words['other_search_filters']}</div>
-				<table width='100%'>
-					<tr>
-						<td width='45%' style='vertical-align: top'>
-							<ul>
-								<li>
-									<label for='f_member_type'>{$this->lang->words['suspend_status']}</label>
-									{$form['_member_type']}
-								</li>
-								<li>
-									<label for='f_member_type'>{$this->lang->words['banned_status']}</label>
-									{$form['_banned_type']}
-								</li>
-								<li>
-									<label for='f_member_type'>{$this->lang->words['spam_status']}</label>
-									{$form['_spam_type']}
-								</li>
-								<li>
-									<label for='f_primary_group'>{$this->lang->words['search_prim_group']}</label>
-									{$form['_primary_group']}
-								</li>
-								<li>
-									<label for='f_inc_secondary'>{$this->lang->words['check_secondarytoo']}</label>
-									{$form['_include_secondary']}
-								</li>
-								<li>
-									<label for='f_secondary_group'>{$this->lang->words['search_secon_group']}</label>
-									{$form['_secondary_group']}
-								</li>
-								{$left}
-							</ul>
-						</td>
-						<td width='55%' style='vertical-align: top'>
-							<ul>
-								<li>
-									<label for='f_date_reg_from'>{$this->lang->words['registered_between']}</label>
-									{$form['_date_reg_from']} {$this->lang->words['and']} {$form['_date_reg_to']} <span class='desctext'>(MM-DD-YYYY)</span>
-								</li>
-								<li>
-									<label for='f_date_post_from'>{$this->lang->words['last_posted_between']}</label>
-									{$form['_date_post_from']} {$this->lang->words['and']} {$form['_date_post_to']} <span class='desctext'>(MM-DD-YYYY)</span>
-								</li>
-								<li>
-									<label for='f_date_active_from'>{$this->lang->words['last_visit_between']}</label>
-									{$form['_date_active_from']} {$this->lang->words['and']} {$form['_date_active_to']} <span class='desctext'>(MM-DD-YYYY)</span>
-								</li>
-								<li>
-									<label for='f_post_count'>{$this->lang->words['post_count_is']}</label>
-									{$form['_post_count_type']} &nbsp;&nbsp;{$form['_post_count']}
-								</li>
-								{$right}
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td style='text-align: center' colspan='2'>
-							<span class='desctext'>{$this->lang->words['search_sort_by']}</span> {$form['_order_by']} <span class='desctext'>{$this->lang->words['in']}</span> {$form['_order_direction']} <span class='desctext'>{$this->lang->words['search_sort_order']}</span>
-						</td>
-					</tr>
-				</table>
-				<div class='acp-actionbar'>
-					<div class='centeraction'>
-						 <input type='submit' class='button primary' value=' {$this->lang->words['mem_update_member_list']} ' /> <span class='desctext'>{$this->lang->words['or']}</span> <input type='button' class='button secondary' value=' {$this->lang->words['use_simple_search']} ' id='show_simple' />
-					</div>
-				</div>
-			</div>
-		</form>
+	<div class='ipsActionBar clearfix'>
+		<ul>
+			<li class='ipsActionButton'>
+				<a href='{$this->settings['base_url']}app=members&amp;module=members&amp;section=members&amp;do=add'>
+					<img src='{$this->settings['skin_acp_url']}/images/icons/user_add.png' alt='{$this->lang->words['add_new_member_button']}' />
+					{$this->lang->words['add_new_member_button']}
+				</a>
+			</li>
+			<li class='ipsActionButton disabled' id='memberList__prune'>
+				<a href='#'><img src='{$this->settings['skin_acp_url']}/images/icons/user_delete.png' alt='' /> {$this->lang->words['prune_all_members']}</a>
+			</li>
+			<li class='ipsActionButton disabled' id='memberList__move'>
+				<a href='#'><img src='{$this->settings['skin_acp_url']}/images/icons/user_assign.png' alt='' /> {$this->lang->words['move_all_members']}</a>
+			</li>
+		</ul>
+		
 	</div>
 </div>
 
-<script type='text/javascript'>
-	$('show_advanced').observe('click', acp.members.switchSearch.bindAsEventListener( this, 'advanced' ) );
-	$('show_simple').observe('click', acp.members.switchSearch.bindAsEventListener( this, 'simple' ) );
-</script>
+<div id='m_search_pane' style='display: none'>
+	<form id='m_search_form'>
+	<div class='acp-box'>
+		<h3>
+			<a href='#' id='close_adv_search' class='ipsBlock_titlelink'><strong>&times;</strong></a>
+			{$this->lang->words['member_search_ttl']}
+		</h3>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='adv_search_main'>
+					{$form['_member_contains']}
+					{$form['_member_contains_type']}
+					{$form['_member_contains_text']}
+				</td>
+			</tr>
+		</table>
+		<div id='m_search_pane_inner'>
+			<table class='ipsTable double_pad'>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['search_type_member']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_member_status']}
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['search_prim_group']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_primary_group']}
+						<p style='margin-top: 5px'>
+							{$form['_include_secondary']} <label for='f_inc_secondary' class='desctext'>{$this->lang->words['check_secondarytoo']}</label>
+						</p>
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['search_secon_group']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_secondary_group']}
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['registered_between']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_date_reg_from']} {$this->lang->words['and']} {$form['_date_reg_to']}<br />
+						<span class='desctext'>(MM-DD-YYYY)</span>
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['last_posted_between']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_date_post_from']} {$this->lang->words['and']} {$form['_date_post_to']}<br />
+						<span class='desctext'>(MM-DD-YYYY)</span>
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['last_visit_between']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_date_active_from']} {$this->lang->words['and']} {$form['_date_active_to']}<br />
+						<span class='desctext'>(MM-DD-YYYY)</span>
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['post_count_is']}</strong>
+					</td>
+					<td class='field_field'>
+						{$form['_post_count_type']} &nbsp;&nbsp;{$form['_post_count']}
+					</td>
+				</tr>
+HTML;
 
-<br />
+			if ( is_array( $fields->out_fields ) AND count( $fields->out_fields ) )
+			{
+				foreach( $fields->out_fields as $id => $data )
+				{
+					$ignore = '';
+					
+					if( $fields->cache_data[ $id ]['type'] == 'radio' )
+					{
+						$ignore = "<div style='float:right;'> <input type='checkbox' name='ignore_field_{$id}' value='1' /> {$this->lang->words['sm_ignorehuh']}</div>";
+					}
+					
+					$IPBHTML .= <<<HTML
+					<tr>
+						<td class='field_title'>
+							<strong class='title'>{$fields->field_names[ $id ]}</strong>
+						</td>
+						<td class='field_field'>
+							{$ignore}{$data}
+						</td>
+					</tr>
+HTML;
+				}
+			}
+
+			$IPBHTML .= <<<HTML
+			</table>
+		</div>
+		<div class='acp-actionbar' style='position: relative'>
+			<p class='required left desctext' style='position: absolute; left: 15px; top: 15px; font-size: 11px'>All fields are optional</p>
+			<input type='button' id='do_advanced_search' value='Search' class='realbutton' />
+		</div>
+	</div>
+	</form>
+</div>
 HTML;
 
 if( ( $filters_preset && !$this->request['f_search_type'] ) || $this->request['__update'] == 1 )
 {
+	/* This left for legacy compatibility, in case admins still have a cookie set from 3.1, to enable
+		them to cancel out of it */
 	$this->lang->words['mem_results_filtered'] = sprintf( $this->lang->words['mem_results_filtered'], "{$this->settings['base_url']}{$this->form_code}&amp;reset_filters=1" );
 $IPBHTML .= <<<HTML
 <div class='information-box'>
-{$this->lang->words['mem_results_filtered']}
-</div>
-<br />
-
-<ul class='context_menu'>
-	<li class='closed'>
-		<a href='#' id='memberList__prune'>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/user_delete.png' alt='' />
-			{$this->lang->words['prune_all_members']}
-		</a>
-	</li>
-	<li>
-		<a href='#' id='memberList__move'>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/icons/user_assign.png' alt='' />
-			{$this->lang->words['move_all_members']}
-		</a>
-	</li>
-</ul>
-<script type='text/javascript'>
-	$('memberList__prune').observe('click', acp.members.movePruneAction.bindAsEventListener( this, 'delete' ) );
-	$('memberList__move').observe('click', acp.members.movePruneAction.bindAsEventListener( this, 'move' ) );
-</script>
-	
-<br />
-HTML;
-}
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Member view context menu
- *
- * @access	public
- * @param	array 		Links
- * @param	int			Member ID
- * @return	string		HTML
- */
-public function member_view_context_menu( $links=array(), $member_id=0 ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['editing_member']}</h2>
-	<ul class='context_menu'>
-		<li class='closed'>
-			<a href="#" onclick="return acp.confirmDelete( '{$this->settings['base_url']}app=members&amp;app=members&amp;module=members&amp;section=members&amp;module=members&amp;do=member_delete&amp;member_id={$member_id}')">
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/delete.png' alt='{$this->lang->words['icon']}' />
-				{$this->lang->words['form_deletemember']}
-			</a>
-		</li>
-		<li>
-			<a href='#' onclick='return ipsInlineForm.loadForm( "{$this->lang->words['sm_banmanagement']}", "app=members&amp;module=ajax&amp;section=editform&amp;do=show&amp;name=inline_ban_member&amp;member_id={$member_id}");'>
-				{$this->lang->words['sm_member']}
-			</a>
-		</li>				
-	</ul>
-</div>
-
-<div class='menuouterwrap-dark'>
-<div class='menucatwrap'><img src='{$this->settings['skin_acp_url']}/images/menu_title_bullet.gif' style='vertical-align:middle' />{$this->lang->words['sm_memoptions']}</div>
-HTML;
-
-if( is_array($links) AND count($links) )
-{
-	foreach( $links as $app => $link )
-	{
-		if( is_array($link) AND count($link) )
-		{
-			$apptitle = ucwords($app);
-	
-			$IPBHTML .= <<<HTML
-		<fieldset style='padding:3px;margin:3px'>
-	<legend><img src='{$this->settings['skin_acp_url']}/_newimages/icons/cog.png' alt='' style='vertical-align:bottom' /> <strong>{$apptitle}</strong></legend>			
-HTML;
-			foreach( $link as $alink )
-			{
-				$img = $alink['img'] ? $alink['img'] : $this->settings[ 'skin_acp_url' ] . '/images/menu-right.gif';
-				
-				$thisLink = $alink['js'] ? 'href="#" onclick="' . $alink['url'] . '"' : "href='{$this->settings[ '_base_url' ]}app={$app}&amp;{$alink['url']}&amp;member_id={$member_id}'";
-				
-				$IPBHTML .= <<<HTML
-					<div class='menulinkwrap'><img src='{$img}' alt='-' /> <a {$thisLink}>{$alink['title']}</a></div>
-HTML;
-			}
-			
-			$IPBHTML .= <<<HTML
-				</fieldset>
-HTML;
-		}
-	}
-}
-
-$IPBHTML .= <<<HTML
+	{$this->lang->words['mem_results_filtered']}
 </div>
 <br />
 HTML;
+}
 
 //--endhtml--//
 return $IPBHTML;
@@ -1445,7 +1933,6 @@ return $IPBHTML;
 /**
  * Member suspension form
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -1456,37 +1943,41 @@ $IPBHTML = "";
 
 $dropDown	= ipsRegistry::getClass('output')->formDropdown( 'units', array( array( 'h', $this->lang->words['dunit_hours'] ), array( 'd', $this->lang->words['dunit_days'] ) ), $member['units'] );
 $yesNo		= ipsRegistry::getClass('output')->formYesNo( 'send_email', 0 );
-$email		= ipsRegistry::getClass('output')->formTextarea( 'email_contents', $member['contents'] );
+$email		= ipsRegistry::getClass('output')->formTextarea( 'email_contents', $member['contents'], 40, 10, '', "style='width:70%;'" );
 $susp_for = sprintf( $this->lang->words['sm_suspfor'], $member['members_display_name'] );
 
 $IPBHTML .= <<<HTML
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['sm_acctsusp']}</div>
- 	<div class='tablesubheader'>{$this->lang->words['sm_suspnote']}</div>
- <form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=dobanmember' method='post'>
- <input type='hidden' name='member_id' value='{$member['member_id']}' />
- <input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
- <table cellpadding='4' cellspacing='0' width='100%'>
-			 <tr>
-				<td width='40%' class='tablerow1'>{$susp_for}</td>
-				<td width='60%' class='tablerow2'><input type='text' size='5' name='timespan' value='{$member['timespan']}' /> 
-			 		{$dropDown}
- 				</td>
-			 </tr>
-			 <tr>
-				<td width='40%' class='tablerow1'>{$this->lang->words['sm_suspnotify']}</td>
-				<td width='60%' class='tablerow2'>{$yesNo}</td>
-			 </tr>
-			 <tr>
-				<td width='40%' class='tablerow1'>{$this->lang->words['sm_suspemailnotify']}</td>
-				<td width='60%' class='tablerow2'>{$email}</td>
-			 </tr>
- <tr>
-  <td class='tablesubheader' colspan='2' align='center'>
-   <input type='submit' class='realbutton' value=' {$this->lang->words['sm_suspendbutton']} ' />
-  </td>
- </tr>
- </table>
+<div class='acp-box'>
+ <h3>{$this->lang->words['sm_acctsusp']}</h3>
+
+	<table class='ipsTable double_pad'>
+		<tr>
+ 			<th colspan='2'>{$this->lang->words['sm_suspnote']}</th>
+		</tr>
+
+ 		<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=dobanmember' method='post'>
+ 			<input type='hidden' name='member_id' value='{$member['member_id']}' />
+ 			<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
+ 
+		<tr>
+			<td class='field_title'><strong class='title'>{$susp_for}</strong></td>
+			<td class='field_field'><input type='text' size='5' name='timespan' value='{$member['timespan']}' /> 
+			 	{$dropDown}
+ 			</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sm_suspnotify']}</strong></td>
+			<td class='field_field'>{$yesNo}</td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['sm_suspemailnotify']}</strong></td>
+			<td class='field_field'>{$email}</td>
+		</tr>
+	</table>
+	
+    <div class='acp-actionbar'>
+   		<input type='submit' class='realbutton' value='{$this->lang->words['sm_suspendbutton']}' />
+	</div>
  </form>
 </div>
 
@@ -1499,7 +1990,6 @@ return $IPBHTML;
 /**
  * Should this admin get ACP restrictions?
  *
- * @access	public
  * @param	array 		Member data
  * @param	array 		Admin groups
  * @return	string		HTML
@@ -1521,7 +2011,7 @@ HTML;
 	}
 	
 $IPBHTML .= <<<HTML
-	<div style='padding: 15px' class='acp-row-on'>
+	<div style='padding: 15px'>
 		{$this->lang->words['sm_belongsto']}<br />
 		<ul style='padding: 8px 8px 8px 15px'>
 HTML;
@@ -1557,7 +2047,6 @@ return $IPBHTML;
 /**
  * Form to add a member
  *
- * @access	public
  * @param	array 		Groups
  * @param	object		Custom fields
  * @return	string		HTML
@@ -1600,12 +2089,12 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['sm_registernew']}</h3>
  
- 		<table class='acp-form alternate_rows'>
+ 		<table class='ipsTable double_pad'>
  			<tr>
- 				<td style='width: 40%;'>
- 					<strong>{$this->lang->words['sm_loginname']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_loginname']}<span class='required'>*</span></strong>
  				</td>
- 				<td>
+ 				<td class='field_field'>
  					{$name}
  				</td>
  			</tr>
@@ -1615,11 +2104,12 @@ if( $this->settings['auth_allow_dnames'] )
 {
 	$IPBHTML .= <<<HTML
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_display']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_display']}<span class='required'>*</span></strong>
  				</td>
- 				<td>
- 					{$display_name}
+ 				<td class='field_field'>
+					<input type='checkbox' id='mirror_loginname' name='mirror_loginname' checked="checked" value='1' onclick="$('specify_displayname').toggle();" /> <label for='mirror_loginname' class='desctext'>{$this->lang->words['sameasloginname']}</label><br style='margin-bottom: 5px;'/>
+ 					<div style='display:none;' id='specify_displayname'>{$display_name}</div>
  				</td>
  			</tr>
 HTML;
@@ -1627,44 +2117,44 @@ HTML;
 
 $IPBHTML .= <<<HTML
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_password']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_password']}<span class='required'>*</span></strong>
  				</td>
- 				<td>
+ 				<td class='field_field'>
  					{$password}
  				</td>
  			</tr>
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_email']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_email']}<span class='required'>*</span></strong>
  				</td>
- 				<td>
+ 				<td class='field_field'>
  					{$email}
  				</td>
  			</tr>
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_group']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_group']}</strong>
  				</td>
- 				<td>
+ 				<td class='field_field'>
  					{$group}
  				</td>
  			</tr>
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_coppauser']}</strong>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_coppauser']}</strong>
  				</td>
- 				<td>
+ 				<td class='field_field'>
  					{$coppa}
  				</td>
  			</tr>
  			<tr>
- 				<td>
- 					<strong>{$this->lang->words['sm_sendconf']}</strong>
- 					<div class='desctext'>{$this->lang->words['sm_sendconf_info']}</div>
+ 				<td class='field_title'>
+ 					<strong class='title'>{$this->lang->words['sm_sendconf']}</strong>
  				</td>
- 				<td>
- 					{$send_email}
+ 				<td class='field_field'>
+ 					{$send_email}<br />
+					<span class='desctext'>{$this->lang->words['sm_sendconf_info']}</span>
  				</td>
  			</tr>
 HTML;
@@ -1674,32 +2164,30 @@ if ( count( $fields->out_fields ) )
 {
 	$IPBHTML .= <<<HTML
 			<tr>
-				<td colspan='2' class='head'>{$this->lang->words['sm_custfields']}</td>
+				<th colspan='2'>{$this->lang->words['sm_custfields']}</th>
 			</tr>
 HTML;
 
 	foreach( $fields->out_fields as $id => $data )
 	{
-		$class = '';
 		$req   = '';
 		
 		if ( $fields->cache_data[ $id ]['pf_admin_only'] )
 		{
-			$class = " class='_amber'";
-			$req   = ' <div style="color:orange">*' . $this->lang->words['add_cf_admin'] . '</div>';
+			$ad_only   = "<span class='field_highlight'>" . $this->lang->words['add_cf_admin'] . '</span>';
 		}
 		
-		$req   .= ( $fields->cache_data[ $id ]['pf_not_null'] ) ? ' <div style="color:red">*' . $this->lang->words['add_cf_required'] . '</div>' : '';
-		$class  = ( $fields->cache_data[ $id ]['pf_not_null'] ) ? " class='_red'" : '';
+		$req   .= ( $fields->cache_data[ $id ]['pf_not_null'] ) ? "<span class='required'>*</span>" : '';
 		
 		$IPBHTML .= <<<HTML
  			<tr class='_cfields'>
- 				<td{$class}>
- 					<strong>{$fields->field_names[ $id ]}{$req}</strong>
- 					<div class='desctext'>{$fields->field_desc[ $id ]}</div>
+ 				<td class='field_title {$class}'>
+ 					<strong class='title'>{$fields->field_names[ $id ]}{$req}</strong>
+					{$ad_only}
  				</td>
- 				<td{$class}>
+ 				<td class='field_field {$class}'>
  					{$data}
+					<p class='desctext'>{$fields->field_desc[ $id ]}</p>
  				</td>
  			</tr>
 HTML;
@@ -1710,9 +2198,7 @@ $IPBHTML .= <<<HTML
 		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				 <input type='submit' class='button primary' value=' {$this->lang->words['sm_regbutton']} ' />
-			</div>
+			 <input type='submit' class='button primary' value='{$this->lang->words['sm_regbutton']}' />
 		</div>
 	</div>
  </form>
@@ -1725,7 +2211,6 @@ return $IPBHTML;
 /**
  * Confirm member pruning
  *
- * @access	public
  * @param	int			Total count
  * @return	string		HTML
  */
@@ -1739,7 +2224,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<HTML
 <!--SKINNOTE: Not yet skinned-->
 
-<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=doprune' method='post'>
+<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}{$this->form_code}&amp;do=doprune' method='post'>
 	<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
 	<div class='warning'>
 		<h4>{$this->lang->words['about_to_prune']}</h4>
@@ -1748,15 +2233,15 @@ $IPBHTML .= <<<HTML
 	<br />
 	<div class='acp-box'>
 		<h3>{$this->lang->words['sm_prunemem']}</h3>
-		<table class='alternate_rows double_pad'>
+		<table class='ipsTable'>
 			<tr>
-				<td style='width: 30%'><strong>{$this->lang->words['sm_prunenum']}</strong></td>
-				<td style='width: 70%'>
+				<td class='field_title'><strong class='title'>{$this->lang->words['sm_prunenum']}</strong></td>
+				<td class='field_field'>
 					{$count}
 				</td>
 			</tr>
 		</table>
-		<div class='acp-actionbar'><input type='submit' class='realbutton redbutton' value=' {$prune_button} ' /></div>
+		<div class='acp-actionbar'><input type='submit' class='button primary redbutton' value='{$prune_button}' /></div>
 	</div>
 </form>
 <br />
@@ -1770,7 +2255,6 @@ return $IPBHTML;
 /**
  * Confirm moving members
  *
- * @access	public
  * @param	int			Total count
  * @return	string		HTML
  */
@@ -1802,19 +2286,21 @@ $IPBHTML .= <<<HTML
 		<h3>{$this->lang->words['sm_movemem']}</h3>
 		<table class='alternate_rows double_pad'>
 			<tr>
-				<td style='width: 30%'><strong>{$this->lang->words['sm_prunenum']}</strong></td>
-				<td style='width: 70%'>
+				<td class='field_title'><strong class='title'>{$this->lang->words['sm_prunenum']}</strong></td>
+				<td class='field_field'>
 					{$count}
 				</td>
 			</tr>
 			<tr>
-				<td style='width: 30%'><strong>{$this->lang->words['sm_movegroup']}</strong></td>
-				<td style='width: 70%'>
+				<td class='field_title'><strong class='title'>{$this->lang->words['sm_movegroup']}</strong></td>
+				<td class='field_field'>
 					{$group}
 				</td>
 			</tr>
 		</table>
-		<div class='acp-actionbar'><input type='submit' class='realbutton redbutton' value=' {$move_button} ' /></div>
+		<div class='acp-actionbar'>
+			<input type='submit' class='button primary redbutton' value='{$move_button}' />
+		</div>
 	</div>
 </form>
 <br />
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_member_form.php b/upload/admin/applications/members/skin_cp/cp_skin_member_form.php
index fc171955..3292ea59 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_member_form.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_member_form.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP member forms skin file
- * Last Updated: $Date: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
+ * Last Updated: $Date: 2011-09-20 18:16:05 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6915 $
+ * @version		$Rev: 9519 $
  *
  */
  
-class cp_skin_member_form extends output
+class cp_skin_member_form
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Ban member dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @param	array 		Form data
  * @return	string		HTML
@@ -48,59 +78,80 @@ $IPBHTML .= <<<EOF
 <form action='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=ban_member&amp;member_id={$member['member_id']}' method='post'>
 	<div class='acp-box'>
 		<h3>{$this->lang->words['sm_banmanage']}</h3>
-		<ul class='acp-form modal-overflow'>
-			<li>
-				{$form['member']}
-				{$this->lang->words['mf_banperm']}
-			</li>
-			<li>
-				{$form['groups_confirm']}
-				{$this->lang->words['mf_movefrom']} '{$member['_group_title']}' {$this->lang->words['mf_to']}<br />
-				<span style='margin-left: 25px;'>{$form['groups']}</span>
-			</li>
-			<li>
-				{$form['email']}
-				{$this->lang->words['mf_banemail']} '{$member['email']}'
-			</li>
-			<li>
-				{$form['name']}
-				{$this->lang->words['mf_banname']} '{$member['name']}'
-			</li>
+		<div class='fixed_inner'>
+			<table class='ipsTable double_pad'>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mf_banperm']}</strong></td>
+					<td class='field_field'>{$form['member']}</td>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mf_movefrom']} '{$member['_group_title']}' {$this->lang->words['mf_to']}</strong></td>
+					<td class='field_field'>
+						{$form['groups_confirm']}
+						{$form['groups']}
+					</td>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mf_banemail']} '{$member['email']}'</strong></td>
+					<td class='field_field'>{$form['email']}</td>
+				</tr>
+				<tr>
+					<td class='field_title'><strong class='title'>{$this->lang->words['mf_banname']} '{$member['name']}'</strong></td>
+					<td class='field_field'>{$form['name']}</td>
+				</tr>
 EOF;
-			if( $form['ips'] && count( $form['ips'] ) )
-			{
-				$IPBHTML .= "<li><label class='head'>{$this->lang->words['ipaddresses']}</label></li>";
-				
-				foreach( $form['ips'] as $ip => $form_field )
+				if( $form['ips'] && count( $form['ips'] ) )
 				{
 					$IPBHTML .= <<<EOF
-					<li style='padding-left: 25px;'>
-						{$form_field}
-						{$this->lang->words['mf_banip']} '{$ip}'
-					</li>
+						<tr><th colspan='2'>{$this->lang->words['ipaddresses']}</tr>
+					</table>
+					<div style='max-height: 150px; overflow: auto;'>
+						<table class='ipsTable double_pad'>
+EOF;
+				
+					foreach( $form['ips'] as $ip => $form_field )
+					{
+						$IPBHTML .= <<<EOF
+						<tr>
+							<td class='field_title'><strong class='title'>{$this->lang->words['mf_banip']} '{$ip}'</strong></td>
+							<td class='field_field'>{$form_field}</td>
+						</tr>
+EOF;
+					}
+				
+					$IPBHTML .= <<<EOF
+						</table>
+					</div>
+					<table class='ipsTable double_pad'>
 EOF;
 				}
-			}
 			
-			$IPBHTML .= <<<EOF
-			<li>
-				{$form['note']}
-				{$this->lang->words['mf_addnote']} <span style='font-weight:normal;'>[<a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=members&amp;module=warn&amp;section=warn&amp;mid={$member['member_id']}&amp;do=view&amp;popup=1','980','600'); return false;">{$this->lang->words['mf_viewnotes']}</a>]</span>
-				<br />
-				<div style='margin-top: 5px'>{$form['note_field']}</div>
-			</li>
-			<li>
-				<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=banmember&amp;member_id={$member['member_id']}'>{$this->lang->words['mf_clickhere']}</a> {$this->lang->words['mf_tosuspend']}<br />
-				{$this->lang->words['mf_justor']} <a href='#' onclick="new Effect.Fade( $('inlineFormWrap'), {duration: 0.3} ); acp.members.goToTab( 'tabtab-MEMBERS|7' ); return false;">{$this->lang->words['mf_clickhere']}</a> {$this->lang->words['mf_topostrestrict']}
-			</li>
-		</ul>
+				$IPBHTML .= <<<EOF
+				<tr>
+					<td class='field_title'>
+						<strong class='title'>{$this->lang->words['mf_addnote']} <span style='font-weight:normal;'>[<a href='#' onclick="return acp.openWindow('{$this->settings['board_url']}/index.php?app=core&amp;module=modcp&amp;section=editmember&amp;mid={$member['member_id']}&amp;do=view&amp;popup=1','980','600'); return false;">{$this->lang->words['mf_viewnotes']}</a>]</span></strong>
+					</td>
+					<td class='field_field'>	
+						{$form['note']}
+					</td>
+				</tr>
+				<tr>
+					<td colspan='2'>
+						<div align='center'>{$form['note_field']}</div>
+					</td>
+				</tr>
+				<tr>
+					<td colspan='2'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=banmember&amp;member_id={$member['member_id']}'>{$this->lang->words['mf_clickhere']}</a> {$this->lang->words['mf_tosuspend']}<br />
+					{$this->lang->words['mf_justor']} <a href='#' onclick="new Effect.Fade( $('inlineFormWrap'), {duration: 0.3} ); acp.members.goToTab( 'tab_MEMBERS_7' ); return false;">{$this->lang->words['mf_clickhere']}</a> {$this->lang->words['mf_topostrestrict']}</td>
+				</tr>
+			</table>
+		</div>
 		<div class='acp-actionbar'>
-			<input type='submit' value=' {$this->lang->words['mf_alterban']} ' class='realbutton' />
+			<input type='submit' value='{$this->lang->words['mf_alterban']}' class='button primary' />
 		</div>
 	</div>
 </form>
 	
-	
 EOF;
 
 return $IPBHTML;
@@ -109,7 +160,6 @@ return $IPBHTML;
 /**
  * Edit email dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -118,29 +168,20 @@ public function inline_email( $member )
 $IPBHTML = "";
 																	
 $IPBHTML .= <<<EOF
-<script type='text/javascript'>
-	acp.members.fields['MF__email'] = {};
-	acp.members.fields['MF__email']['fields'] = $A(['email']);
-	acp.members.fields['MF__email']['url']	 = "app=members&amp;module=ajax&amp;section=editform&amp;do=save_email&amp;member_id={$member['member_id']}";
-	acp.members.fields['MF__email']['callback'] = function( t, json ){
-		$('MF__email').innerHTML = json['email'];
-		new Effect.Pulsate( $('MF__email'), { pulses: 3 } );
-	}
-</script>
-
+<form action='{$this->settings['base_url']}&amp;module=members&amp;section=editform&amp;do=save_email&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['mem_ajfo_email']}</h3>
-	<ul class='acp-form'>
-		<li>
-			<label for='email'>{$this->lang->words['mem_ajfo_email1']}</label>
-			<input type='text' size='30' id='email' name='email' value="{$member['email']}" class='input_text' />
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_ajfo_email1']}</strong></td>
+			<td class='field_field'><input type='text' size='30' id='email' name='email' value="{$member['email']}" class='input_text' /></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['mf_save']}' class='realbutton' id='MF__email_save' />
+		<input type='submit' value='{$this->lang->words['mf_save']}' class='button primary' />
 	</div>
 </div>
-
+</form>
 EOF;
 
 return $IPBHTML;
@@ -150,7 +191,6 @@ return $IPBHTML;
 /**
  * Upload photo dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -161,18 +201,18 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 
 <form action='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=new_photo&amp;member_id={$member['member_id']}' method='post' enctype='multipart/form-data'>
-	<div class='acp-box'>
-		<h3>{$this->lang->words['mem_ajfo_photo']}</h3>
-		<ul class='acp-form'>
-			<li>
-				<label for='upload_photo'>{$this->lang->words['mf_newphoto']}</label>
-				<input type='file' size='30' id='upload_photo' name='upload_photo' />
-			</li>
-		</ul>
-		<div class='acp-actionbar'>
-			<input type='submit' value='{$this->lang->words['mf_save']}' class='realbutton' />
-		</div>
+<div class='acp-box'>
+	<h3>{$this->lang->words['mem_ajfo_photo']}</h3>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mf_newphoto']}</strong></td>
+			<td class='field_field'><input type='file' size='30' id='upload_photo' name='upload_photo' /></td>
+		</tr>
+	</table>
+	<div class='acp-actionbar'>
+		<input type='submit' value='{$this->lang->words['mf_save']}' class='button primary' />
 	</div>
+</div>
 </form>
 EOF;
 
@@ -183,7 +223,6 @@ return $IPBHTML;
 /**
  * Edit password dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -196,36 +235,29 @@ $_form_new_pepper     = ipsRegistry::getClass('output')->formYesNo( "new_key" ,
 
 $IPBHTML .= <<<EOF
 
-<script type='text/javascript'>
-	acp.members.fields['MF__password'] = {};
-	acp.members.fields['MF__password']['fields'] = $A(['password', 'password2', 'new_salt', 'new_key']);
-	acp.members.fields['MF__password']['bypass'] = true;
-</script>
-
-<form action='{$this->settings['base_url']}&amp;module=ajax&amp;section=editform&amp;do=save_password&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
+<form action='{$this->settings['base_url']}&amp;module=members&amp;section=editform&amp;do=save_password&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['mem_ajfo_password']}</h3>
-	<ul class='acp-form'>
-		<li>
-			<label for='password'>{$this->lang->words['mem_ajfo_password1']}</label>
-			<input type='password' size='30' id='password' name='password' class='input_text' />
-		</li>
-		<li>
-			<label for='password2'>{$this->lang->words['mem_ajfo_password2']}</label>
-			<input type='password' size='30' id='password2' name='password2' class='input_text' />
-		</li>
-		<li>
-			<label for='new_key'>{$this->lang->words['mem_afjo_new_key']}<br /><span class='desctext'>{$this->lang->words['mem_afjo_new_key_desc']}</span></label>
-			{$_form_new_pepper}
-			
-		</li>
-		<li>
-			<label for='new_key'>{$this->lang->words['mem_afjo_new_salt']}</label>
-			{$_form_new_salt}
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_ajfo_password1']}</strong></td>
+			<td class='field_field'><input type='password' size='30' id='password' name='password' class='input_text' /></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_ajfo_password2']}</strong></td>
+			<td class='field_field'><input type='password' size='30' id='password2' name='password2' class='input_text' /></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_afjo_new_key']}</strong></td>
+			<td class='field_field'>{$_form_new_pepper}<br /><span class='desctext'>{$this->lang->words['mem_afjo_new_key_desc']}</span></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_afjo_new_salt']}</strong></td>
+			<td class='field_field'>{$_form_new_salt}</td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['mf_save']}' class='realbutton' id='MF__password_save' />
+		<input type='submit' value='{$this->lang->words['mf_save']}' class='button primary' id='MF__password_save' />
 	</div>
 </div>
 </form>
@@ -238,7 +270,6 @@ return $IPBHTML;
 /**
  * Change name dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -250,35 +281,24 @@ $_form_send_email     = ipsRegistry::getClass('output')->formYesNo( "send_email"
 $_form_email_contents = ipsRegistry::getClass('output')->formTextarea( "email_contents", $this->lang->words['mem_afjo_email_contents'] );
 
 $IPBHTML .= <<<EOF
-<script type='text/javascript'>
-	acp.members.fields['MF__name'] = {};
-	acp.members.fields['MF__name']['fields'] = $A(['name', 'send_email', 'email_contents']);
-	acp.members.fields['MF__name']['bypass'] = true;
-</script>
-
-<form action='{$this->settings['base_url']}&amp;module=ajax&amp;section=editform&amp;do=save_name&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
+<form action='{$this->settings['base_url']}&amp;module=members&amp;section=editform&amp;do=save_name&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['mem_edit_login_name']}</h3>
-	<ul class='acp-form'>
-		<li>
-			<label for='name'>{$this->lang->words['mem_ajfo_name']}</label>
-			<input type='text' size='30' id='name' name='name' value='{$member['name']}' />
-		</li>
-		<li>
-			<label for=''>{$this->lang->words['mem_afjo_send_email']}</label>
-			{$_form_send_email}
-		</li>
-		<li style='text-align: center; padding: 10px;'>
-			{$_form_email_contents}
-			<br /><span class='desctext'>{$this->lang->words['mem_afjo_send_email_desc']}</span>
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_ajfo_name']}</strong></td>
+			<td class='field_field'><input type='text' size='30' id='name' name='name' value='{$member['name']}' class='input_text' /></td>
+		</tr>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_afjo_send_email']}</strong></td>
+			<td class='field_field'>{$_form_send_email}<br /><br />{$_form_email_contents}<br /><span class='desctext'>{$this->lang->words['mem_afjo_send_email_desc']}</span></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['mf_save']}' class='realbutton' id='MF__name_save' />
+		<input type='submit' value='{$this->lang->words['mf_save']}' class='button primary' id='MF__name_save' />
 	</div>
 </div>
 </form>
-
 EOF;
 
 return $IPBHTML;
@@ -288,7 +308,6 @@ return $IPBHTML;
 /**
  * Change display name dhtml window
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -297,24 +316,17 @@ public function inline_form_display_name( $member )
 $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
-
-<script type='text/javascript'>
-	acp.members.fields['MF__member_display_name'] = {};
-	acp.members.fields['MF__member_display_name']['fields'] = $A(['display_name']);
-	acp.members.fields['MF__member_display_name']['bypass'] = true;
-</script>
-
-<form action='{$this->settings['base_url']}&amp;module=ajax&amp;section=editform&amp;do=save_display_name&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
+<form action='{$this->settings['base_url']}&amp;module=members&amp;section=editform&amp;do=save_display_name&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}' method='post'>
 <div class='acp-box'>
 	<h3>{$this->lang->words['mem_edit_display_name']}</h3>
-	<ul class='acp-form'>
-		<li>
-			<label for='name'>{$this->lang->words['mem_display_name']}</label>
-			<input type='text' size='30' id='display_name' name='display_name' value='{$member['members_display_name']}' />
-		</li>
-	</ul>
+	<table class='ipsTable double_pad'>
+		<tr>
+			<td class='field_title'><strong class='title'>{$this->lang->words['mem_display_name']}</strong></td>
+			<td class='field_field'><input type='text' size='30' id='display_name' name='display_name' value='{$member['members_display_name']}' class='input_text' /></td>
+		</tr>
+	</table>
 	<div class='acp-actionbar'>
-		<input type='submit' value='{$this->lang->words['mf_save']}' class='realbutton' id='MF__member_display_name_save' />
+		<input type='submit' value='{$this->lang->words['mf_save']}' class='button primary' id='MF__member_display_name_save' />
 	</div>
 </div>
 </form>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_notifications.php b/upload/admin/applications/members/skin_cp/cp_skin_notifications.php
index 914f7a59..480f53b0 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_notifications.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_notifications.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP notification config skin file
- * Last Updated: $Date: 2010-06-17 17:00:56 -0400 (Thu, 17 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6551 $
+ * @version		$Rev: 8644 $
  *
  */
  
-class cp_skin_notifications extends output
+class cp_skin_notifications
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Show the form to configure notification defaults
  *
- * @access	public
  * @param	array 		Application notification options
  * @param	array 		Current configuration
  * @return	string		HTML
@@ -52,7 +82,7 @@ $IPBHTML .= <<<HTML
 	<h3>{$this->lang->words['notifications_config_title']}</h3>
 	<form method='post' action='{$this->settings['base_url']}{$this->form_code}&amp;do=save'>
 		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->_admin_auth_key}' />
-		<table width='100%' class='alternate_rows double_pad'>
+		<table class='ipsTable double_pad'>
 		<tr>
 			<th>{$this->lang->words['notificationtype_h']}</th>
 			<th>{$this->lang->words['notificationdfs_h']}</th>
@@ -61,8 +91,7 @@ $IPBHTML .= <<<HTML
 		</tr>
 HTML;
 
-$_options = array( 
-					array( 'pm', $this->lang->words['notopt__pm'] ), 
+$_options = array(
 					array( 'email', $this->lang->words['notopt__email'] ), 
 					array( 'inline', $this->lang->words['notopt__inline'] ), 
 					array( 'mobile', $this->lang->words['notopt__mobile'] ) 
@@ -78,8 +107,8 @@ foreach( $options as $option )
 		$_thisConfig['disabled']	= $option['disabled'];
 	}
 	
-	$_defaultOpt	= $this->registry->output->formMultiDropdown( 'default_' . $option['key'] . '[]', $_options, $_thisConfig['selected'], 4, 'default_' . $option['key'] );
-	$_disabledOpt	= $this->registry->output->formMultiDropdown( 'disabled_' . $option['key'] . '[]', $_options, $_thisConfig['disabled'], 4,'disabled_' . $option['key'] );
+	$_defaultOpt	= $this->registry->output->formMultiDropdown( 'default_' . $option['key'] . '[]', $_options, $_thisConfig['selected'], 3, 'default_' . $option['key'] );
+	$_disabledOpt	= $this->registry->output->formMultiDropdown( 'disabled_' . $option['key'] . '[]', $_options, $_thisConfig['disabled'], 3,'disabled_' . $option['key'] );
 	$_disableOver	= $this->registry->output->formYesNo( 'disable_override_' . $option['key'], intval($_thisConfig['disable_override']) );
 	
 	$IPBHTML .= <<<HTML
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_permissions.php b/upload/admin/applications/members/skin_cp/cp_skin_permissions.php
index a33633b7..1a8eaa5f 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_permissions.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_permissions.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP permissions skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-09-02 20:55:33 -0400 (Fri, 02 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6326 $
+ * @version		$Rev: 9450 $
  *
  */
  
-class cp_skin_permissions extends output
+class cp_skin_permissions
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Confirmation page that perm set was removed
  *
- * @access	public
  * @param	string	Name
  * @return	string	HTML
  */
@@ -44,10 +74,11 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<div class='tableheaderalt'>{$this->lang->words['per_result']}</div>
-	<table width='100%' align='center'>
+<div class='acp-box'>
+	<h3>{$this->lang->words['per_result']}</h3>
+	<table class='ipsTable'>
 		<tr>
-			<td class='tablerow1' width='100%' valign='middle'>{$this->lang->words['per_removecustom']}<b>{$name}</b>.</td>
+			<td valign='middle'>{$this->lang->words['per_removecustom']}<b>{$name}</b>.</td>
 		</tr>
 	</table>
 </div>
@@ -60,7 +91,6 @@ return $IPBHTML;
 /**
  * Show users assigned to the perm mask
  *
- * @access	public
  * @param	integer	Perm mask id
  * @param	string	Permission set name
  * @param	array 	Users with this mask
@@ -72,13 +102,13 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<div class='tableborder'>
-	<div class='tableheaderalt'>{$this->lang->words['per_membersusing']}{$set}</div>
+<div class='acp-box'>
+	<h3>{$this->lang->words['per_membersusing']}{$set}</h3>
 
-	<table width='100%' align='center'>
+	<table class='ipsTable'>
 		<tr>
-			<td class='tablesubheader' width='50%' align='center'>{$this->lang->words['per_userdetail']}</td>
-			<td class='tablesubheader' width='50%' align='center'>{$this->lang->words['per_action']}</td>
+			<th width='50%'>{$this->lang->words['per_userdetail']}</th>
+			<th width='50%'>{$this->lang->words['per_action']}</th>
 		</tr>
 HTML;
 
@@ -93,16 +123,16 @@ foreach( $rows as $r )
 	
 $IPBHTML .= <<<HTML
 		<tr>
-			<td class='tablerow1'  width='50%'  valign='middle'>
+			<td width='50%' style='vertical-align: top;'>
 				<div style='font-weight:bold;font-size:11px;padding-bottom:6px;margin-bottom:3px;border-bottom:1px solid #000'>{$r['members_display_name']}</div>
 				&#149;&nbsp;{$this->lang->words['per_posts']}{$r['posts']}<br />
 				&#149;&nbsp;{$this->lang->words['per_email']}{$r['email']}
 				{$also_using}
 			</td>
 
-			<td class='tablerow2'  width='50%'  valign='middle'>
+			<td width='50%' style='vertical-align: top;'>
 				&#149;&nbsp;<a href='{$this->settings['base_url']}{$this->form_code}do=remove_mask&amp;id={$r['member_id']}&amp;pid={$perm_id}' title='{$this->lang->words['per_removethis']}'>{$this->lang->words['per_removethisset']}</a><br />
-				&#149;&nbsp;<a href='{$this->settings['base_url']}{$this->form_code}do=remove_mask&amp;id={$r['member_id']}&amp;pid=all' title='{$this->lang->words['per_removeall']}'>{$this->lang->words['per_removeall']}</a><br /><br />
+				&#149;&nbsp;<a href='{$this->settings['base_url']}{$this->form_code}do=remove_mask&amp;id={$r['member_id']}&amp;pid=all' title='{$this->lang->words['per_removeall']}'>{$this->lang->words['per_removeall']}</a>
 			</td>
 		</tr>
 HTML;
@@ -120,14 +150,15 @@ return $IPBHTML;
 /**
  * Permissions matrix
  *
- * @access	public
  * @param	array 		Permission names
  * @param	array		Compiled grids
  * @param	array 		Permissions checked
  * @param	array 		Colors
+ * @param	string		Type
+ * @param	boolean		$addOutsideBox		Add or not the outside acp-box
  * @return	string		HTML
  */
-public function permissionMatrix( $perm_names, $perm_matrix, $perm_checked, $colors )
+public function permissionMatrix( $perm_names, $perm_matrix, $perm_checked, $colors, $type, $addOutsideBox=true )
 {
 $IPBHTML = "";
 //--starthtml--//
@@ -135,90 +166,96 @@ $IPBHTML = "";
 $cols = count( $perm_names ) + 1;
 $width = ceil( 83 / count( $perm_names ) );
 
-$IPBHTML .= <<<HTML
+$IPBHTML .= $addOutsideBox ? "<div class='acp-box'>" : '';
 
-<div class='acp-box'>
-	<h3>{$this->lang->words['frm_enterthematrix']}</h3>
-	<script type='text/javascript' src='{$this->settings['js_main_url']}acp.permissions2.js'></script>
+$IPBHTML .= <<<HTML
+<!--<h3>{$this->lang->words['frm_enterthematrix']}</h3>-->
+<script type='text/javascript' src='{$this->settings['js_main_url']}acp.permissions2.js'></script>
+
+<table class='ipsTable permission_table' id='perm_matrix'>
+	<tr>
+		<th style='width: 13%'>&nbsp;</th>
+HTML;
+
+foreach( $perm_names as $k => $v )
+{
+	$IPBHTML .= <<<HTML
+		<th style='width: {$width}%; text-align: center;'>{$v}</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	</tr>
+	<tr>
+		<td class='section' colspan='{$cols}'>{$this->lang->words['frm_global']}</td>
+	</tr>
+	<tr>
+		<td class='off'>&nbsp;</td>
+HTML;
+
+$col_num = 0;
+
+foreach( $perm_names as $k => $v )
+{
+	$col_num++;
+	$IPBHTML .= <<<HTML
+		<!-- Check an entire column -->
+		<td style='background-color:{$colors[$k]}' class='perm column' id='column_{$col_num}'>
+			{$v}<br />
+			<input type='checkbox' name='perms[{$type}{$k}][*]' id='col_{$col_num}' value='1'{$perm_checked['*'][$k]}>
+		</td>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	</tr>
+HTML;
+
+$row_num = 0;
+
+foreach( $perm_matrix as $set => $row )
+{
+	$set = explode( '%', $set );
+	$row_num++;
+	$col_num = 0;
+	$IPBHTML .= <<<HTML
+	<tr>	
+		<td class='section' colspan='{$cols}'><strong>{$set[1]}</strong></td>
+	</tr>
+	<tr id='forum{$type}_row_{$row_num}'>
+		<td class='off'>
+			<input type='button' id='forum_select_row_1_{$row_num}' value='+' class='select_row' />&nbsp;
+			<input type='button' id='forum_select_row_0_{$row_num}' value='&ndash;' class='select_row' />
+		</td>
+HTML;
+
+	foreach( $row as $key => $perm )
+	{
+		$col_num++;
+		$IPBHTML .= <<<HTML
+		<td class='perm' id='clickable_{$col_num}' style='background-color:{$colors[$key]}'>
+			{$perm}<br />
+			<input type='checkbox' name='perms[{$type}{$key}][{$set[0]}]' id='perm_{$row_num}_{$col_num}' value='1'{$perm_checked[$set[0]][$key]}>
+		</td>
+HTML;
+	}
 	
-	<table class='permission_table' id='perm_matrix'>
-		<tr>
-			<th style='width: 13%'>&nbsp;</th>
+	$IPBHTML .= <<<HTML
+	</tr>
 HTML;
-			foreach( $perm_names as $k => $v )
-			{
-			$IPBHTML .= <<<HTML
-				<th style='width: {$width}%; text-align: center;'>{$v}</td>
-HTML;
-			}
+}
 		
-		$IPBHTML .= <<<HTML
-		</tr>
-		<tr>
-			<td class='section' colspan='{$cols}'>{$this->lang->words['frm_global']}</td>
-		</tr>
-		<tr>
-			<td class='off'>&nbsp;</td>
-HTML;
-		$col_num = 0;
-		foreach( $perm_names as $k => $v )
-		{
-			$col_num++;
-			$IPBHTML .= <<<HTML
-					<!-- Check an entire column -->
-					<td style='background-color:{$colors[$k]}' class='perm column' id='column_{$col_num}'>
-						{$v}<br />
-						<input type='checkbox' name='perms[$k][*]' id='col_{$col_num}' value='1'{$perm_checked['*'][$k]}>
-					</td>
-HTML;
-		}
-		$IPBHTML .= <<<HTML
-		</tr>
-HTML;
-		$row_num = 0;
-		
-		foreach( $perm_matrix as $set => $row )
-		{
-			$set = explode( '%', $set );
-			$row_num++;
-			$col_num = 0;
-			$IPBHTML .= <<<HTML
-			<tr>	
-				<td class='section' colspan='{$cols}'><strong>{$set[1]}</strong></td>
-			</tr>
-			<tr id='forum_row_{$row_num}'>
-				<td class='off'>
-					<input type='button' id='forum_select_row_1_{$row_num}' value=' + ' class='select_row' />&nbsp;
-					<input type='button' id='forum_select_row_0_{$row_num}' value=' &ndash; ' class='select_row' />
-				</td>
-HTML;
-				foreach( $row as $key => $perm )
-				{
-					$col_num++;
-					$IPBHTML .= <<<HTML
-						<td class='perm' id='clickable_{$col_num}' style='background-color:{$colors[$key]}'>
-							{$perm}<br />
-							<input type='checkbox' name='perms[{$key}][{$set[0]}]' id='perm_{$row_num}_{$col_num}' value='1'{$perm_checked[$set[0]][$key]}>
-						</td>
-HTML;
-				}
-			
-		$IPBHTML .= <<<HTML
-			</tr>
-HTML;
-		}
-		
-		$IPBHTML .= <<<HTML
-	</table>
-</div>
+	$IPBHTML .= <<<HTML
+</table>
 
 <script type='text/javascript'>
-	var permissions = new acp.permissions( { 'form': 'adminform', 'table': 'perm_matrix', 'app': 'forum' } );
+	var permissions = new acp.permissions( { 'form': 'adminform', 'table': 'perm_matrix', 'app': 'forum', 'typekey': '{$type}' } );
 	var noShowAlert	= false;
 </script>
-
 HTML;
 
+$IPBHTML .= $addOutsideBox ? '</div>' : '';
+
 //--endhtml--//
 return $IPBHTML;	
 }
@@ -226,7 +263,6 @@ return $IPBHTML;
 /**
  * Permission set matrix
  *
- * @access	public
  * @param	array 		Perm names
  * @param	array 		Perm grids
  * @param	array 		Boxes to check
@@ -243,7 +279,7 @@ $IPBHTML = "";
 if( !is_array( $perm_matrix ) || !count( $perm_matrix ) ){ return ''; }
 
 $IPBHTML .= <<<HTML
-		<table class='permission_table' id='perm_matrix_{$app}'>
+		<table class='permission_table' id='perm_matrix_{$app}{$type}' style='width: 100%'>
 HTML;
 
 if( is_array( $perm_names ) && count( $perm_names ) )
@@ -264,8 +300,8 @@ HTML;
 		$IPBHTML .= <<<HTML
 						<td class='perm' style='background-color: {$colors[$key]}; width: {$col_width}%'>
 							
-							<input type='button' id='{$app}_select_col_1_{$col_num}' value=' + ' class='select_col' />&nbsp;
-							<input type='button' id='{$app}_select_col_0_{$col_num}' value=' &ndash; ' class='select_col' />
+							<input type='button' id='{$app}{$type}_select_col_1_{$col_num}' value='+' class='select_col' />&nbsp;
+							<input type='button' id='{$app}{$type}_select_col_0_{$col_num}' value='&ndash;' class='select_col' />
 						</td>
 HTML;
 	}
@@ -290,10 +326,10 @@ $IPBHTML .= <<<HTML
 			<tr>
 				<td style='padding: 0px;'>	
 						<table width='100%'>
-							<tr id='{$app}_row_{$row_num}'>
+							<tr id='{$app}{$type}_row_{$row_num}'>
 								<td class='off' style='width: 13%; text-align: right;'>
-									<input type='button' id='{$app}_select_row_1_{$row_num}' value=' + ' class='select_row' />&nbsp;
-									<input type='button' id='{$app}_select_row_0_{$row_num}' value=' &ndash; ' class='select_row' />
+									<input type='button' id='{$app}{$type}_select_row_1_{$row_num}' value='+' class='select_row' />&nbsp;
+									<input type='button' id='{$app}{$type}_select_row_0_{$row_num}' value='&ndash;' class='select_row' />
 								</td>
 HTML;
 
@@ -309,7 +345,7 @@ foreach( $perm_names as $key => $perm )
 		$IPBHTML .= <<<HTML
 										<td class='perm' style='background-color:{$colors[$key]}; width: {$col_width}%'>
 											{$perm}<br />
-											<input type='checkbox' id='{$app}_{$col_num}_{$row_num}' name='perms[{$app}][{$type}][{$key}][{$set[0]}]' value='1'{$perm_checked[$set[0]][$key]}>
+											<input type='checkbox' id='{$app}{$type}_{$col_num}_{$row_num}' name='perms[{$app}][{$type}][{$key}][{$set[0]}]' value='1'{$perm_checked[$set[0]][$key]}>
 										</td>
 HTML;
 	}
@@ -335,7 +371,7 @@ HTML;
 $IPBHTML .= <<<HTML
 		</table>
 		<script type='text/javascript'>
-			perms["{$app}"] = new acp.permissions( { 'form': 'adminform', 'table': 'perm_matrix_{$app}', 'app': '{$app}' } );
+			perms["{$app}{$type}"] = new acp.permissions( { 'form': 'adminform', 'table': 'perm_matrix_{$app}{$type}', 'app': '{$app}', 'typekey': '{$type}' } );
 		</script>
 HTML;
 
@@ -346,7 +382,6 @@ return $IPBHTML;
 /**
  * Show dialog to advise user to apply group restrictions
  *
- * @access	public
  * @return	string		HTML
  */
 public function groupAdminConfirm( $group_id ) {
@@ -355,17 +390,20 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<!--SKINNOTE: Not yet skinned-->
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['sm_configrest']}</div>
-	<div class='tablerow1'>
-	{$this->lang->words['sm_detectacp']}
- 		<br /><br />
- 		{$this->lang->words['sm_setrestrict']}
- 	</div>
-  	<div class='tablesubheader' align='center'>
-  		<span class='fauxbutton'><a href='{$this->settings['base_url']}&amp;{$this->form_code}'>{$this->lang->words['sm_nothanks']}</a></span>&nbsp;&nbsp;
-  		<span class='fauxbutton'><a href='{$this->settings['base_url']}&amp;module=restrictions&amp;section=restrictions&amp;do=acpperms-group-add-complete&amp;entered_group={$group_id}'>{$this->lang->words['sm_yesplease']}</a></span>
+<div class='acp-box'>
+ <h3>{$this->lang->words['sm_configrest']}</h3>
+ <table class='ipsTable double_pad'>
+	<tr>
+		<td>
+			<strong class='title'>{$this->lang->words['sm_detectacp']}</strong>
+ 			<br /><br />
+ 			{$this->lang->words['sm_setrestrict']}
+		</td>
+	</tr>
+  	</table>
+	<div class='acp-actionbar'>
+		<a class='button' href='{$this->settings['base_url']}&amp;{$this->form_code}'>{$this->lang->words['sm_nothanks']}</a>&nbsp;&nbsp;
+		<a class='button' href='{$this->settings['base_url']}&amp;module=restrictions&amp;section=restrictions&amp;do=acpperms-group-add-complete&amp;entered_group={$group_id}'>{$this->lang->words['sm_yesplease']}</a>
 	</div>
 </div>
 <br />
@@ -378,7 +416,6 @@ return $IPBHTML;
 /**
  * Edit permissions mask
  *
- * @access	public
  * @param	string		Set name
  * @param	array 		Perm grids
  * @param	integer		Id
@@ -392,14 +429,14 @@ $IPBHTML = "";
 $i			= 1;
 
 $IPBHTML .= <<<HTML
-<script type="text/javascript">
+<!--<script type="text/javascript">
 //<![CDATA[
 document.observe("dom:loaded",function() 
 {
 ipbAcpTabStrips.register('tab_perms');
 });
  //]]>
-</script>
+</script>-->
 
 <div class='section_title'>
 	<h2>{$set_name}</h2>
@@ -412,39 +449,48 @@ ipbAcpTabStrips.register('tab_perms');
 <form action='{$this->settings['base_url']}{$this->form_code}do=do_edit_set&amp;id={$this->request['id']}' method='post' id='adminform'>
 	<input type='hidden' name='_from' value='{$this->request['_from']}' />
 	
-	<div class='acp-box'>
-		<h3>{$this->lang->words['per_editset']}</h3>
-		
-		<table class='alternate_rows' width='100%'>
+	<div class='acp-box'>		
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td>{$this->lang->words['per_setname']}</td>
-				<td><input type='text' class='input' size='30' name='perm_name' value='{$set_name}' /></td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['per_setname']}</strong></td>
+				<td class='field_field'><input type='text' class='input_text' size='30' name='perm_name' value='{$set_name}' /></td>
 			</tr>
 		</table>
 	</div>
 	<br />
+
 HTML;
 
-foreach( $apps as $app => $type )
+foreach( $apps as $app => $types )
 {
-	$IPBHTML .= <<<HTML
-	<input type='hidden' name='apps[{$app}][{$type}]' value='1' />
+	foreach( $types as $type )
+	{
+		$IPBHTML .= <<<HTML
+		<input type='hidden' name='apps[{$app}][{$type}]' value='1' />
 HTML;
+	}
 }
 
 $IPBHTML .= <<<HTML
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
-		<ul id='tab_perms' class='tab_bar no_title'>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['per_editset']}</h3>
+		<input type='hidden' name='_admin_auth_key' value='{$this->registry->adminFunctions->getSecurityKey()}' />
+			<div id='tab_perms' class='ipsTabBar with_left with_right'> 
+				<span class='tab_left'>&laquo;</span>
+				<span class='tab_right'>&raquo;</span>
+				<ul>
 HTML;
 	foreach( $perm_matricies as $type => $matrix )
 	{
 		if( !$matrix ){ continue; }
-		$IPBHTML .= "				<li id='tabtab-MEMBERS|" . $i ."' class=''>" . $type . "</li>";
+		$IPBHTML .= "				<li id='tab_members" . $i ."'>" . $type . "</li>";
 		$i++;
 	}
 	
 $IPBHTML .= <<<HTML
-</ul>
+				</ul>
+			</div>
+			<div id='tab_perms_content'>
 HTML;
 
 $i = 1;
@@ -453,20 +499,24 @@ foreach( $perm_matricies as $type => $matrix )
 {
 	if( !$matrix ){ continue; }
 $IPBHTML .= <<<HTML
-
-	<div id='tabpane-MEMBERS|{$i}'>
-		{$matrix}
-		
-	</div>
+				<div id='tab_members{$i}_content' class='ipsTabBar_content'>
+					{$matrix}
+				</div>
 HTML;
 	$i++;
 }
 
 $IPBHTML .= <<<HTML
-	<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['frm_savechanges']}' class='realbutton' /></div>
+			</div>
+			<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['frm_savechanges']}' class='realbutton' /></div>
+		</div>
 	<br style='clear: both' />
 </form>
-<br /><br /><br /><br /><br />
+<br />
+
+<script type='text/javascript'>
+	jQ("#tab_perms").ipsTabBar({ tabWrap: "#tab_perms_content" });
+</script>
 HTML;
 
 //--endhtml--//
@@ -477,7 +527,6 @@ return $IPBHTML;
 /**
  * Mask splash page
  *
- * @access	public
  * @param	array 		Masks
  * @param	string		Dropdown lsit
  * @return	string		HTML
@@ -495,7 +544,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['per_setname']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='20%'>{$this->lang->words['per_name']}</th>
 			<th width='15%'>{$this->lang->words['per_usedgroups']}</th>
@@ -508,10 +557,10 @@ HTML;
 foreach( $rows as $r )
 {
 $IPBHTML .= <<<HTML
-		<tr>
+		<tr class='ipsControlRow'>
   			<td><strong>{$r['name']}</strong></td>
   			<td>{$r['groups']}</td>
-  			<td align='right'>
+  			<td>
 HTML;
 if ( $r['mems'] > 0 )
 {
@@ -527,27 +576,25 @@ HTML;
 }
 $IPBHTML .= <<<HTML
   </td>															
-  <td class='tablerow1' align='center'>
-  	<img id="menu{$r['id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['per_options']}' class='ipbmenu' />
-	<ul class='acp-menu' id='menu{$r['id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit_set_form&amp;id={$r['id']}'>{$this->lang->words['per_editset']}</a></li>
+  <td class='col_buttons'>
+  	  <ul class='ipsControlStrip'>
+         <li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}do=edit_set_form&amp;id={$r['id']}' title='{$this->lang->words['per_editset']}'>{$this->lang->words['per_editset']}</a></li>
 HTML;
 
 	if ( ! $r['isactive'] )
 	{
 $IPBHTML .= <<<HTML
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete_set&amp;id={$r['id']}");'>{$this->lang->words['per_deleteset']}</a></li>
+		<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=delete_set&amp;id={$r['id']}");' title='{$this->lang->words['per_deleteset']}'>{$this->lang->words['per_deleteset']}</a></li>
 HTML;
 	}
 	else
 	{
 $IPBHTML .= <<<HTML
-		<li class='icon delete'>{$this->lang->words['per_inuse']}</li>
+		<li class='i_delete disabled'><a href='#' onclick='return false;' title='{$this->lang->words['per_inuse']}'>{$this->lang->words['per_inuse']}</a></li>
 HTML;
 	}
 $IPBHTML .= <<<HTML
-		
-	</ul>
+      </ul>
   </td>
 </tr>
 HTML;
@@ -565,20 +612,18 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['per_createnew']}</h3>
 		
-		<table class='alternate_rows' width='100%'>
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td>{$this->lang->words['per_setname']}</td>
-				<td><input type='text' class='input' size='30' name='new_perm_name' /></td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['per_setname']}</strong></td>
+				<td class='field_field'><input type='text' class='input' size='30' name='new_perm_name' /></td>
 			</tr>
 			<tr>
-				<td>{$this->lang->words['per_baseon']}</td>
-				<td><select name='new_perm_copy' class='dropdown'>{$dlist}</select></td>
+				<td class='field_title'><strong class='title'>{$this->lang->words['per_baseon']}</strong></td>
+				<td class='field_field'><select name='new_perm_copy' class='dropdown'>{$dlist}</select></td>
 			</tr>
 		</table>
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['per_createbutton']}' class='button primary' />
-			</div>
+			<input type='submit' value='{$this->lang->words['per_createbutton']}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_profilefields.php b/upload/admin/applications/members/skin_cp/cp_skin_profilefields.php
index 8db14060..c154e343 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_profilefields.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_profilefields.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP profile fields skin file
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6917 $
+ * @version		$Rev: 9483 $
  *
  */
  
-class cp_skin_profilefields extends output
+class cp_skin_profilefields
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Add/edit a group
  *
- * @access	public
  * @param	int			ID
  * @param	array 		Group data
  * @param	string		Page title
@@ -58,21 +88,28 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['cf_g_name']}</label>
-				<input type='text' name='pf_group_name' value="{$data['pf_group_name']}" size='30' class='textinput'>
-			</li>
-			<li>
-				<label>{$this->lang->words['cf_g_key']}<span class='desctext'>{$this->lang->words['cf_g_key_desc']}</span></label>
-				<input type='text' name='pf_group_key' value="{$data['pf_group_key']}" size='30' class='textinput'>
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_g_name']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='text' name='pf_group_name' value="{$data['pf_group_name']}" size='30' class='textinput'>
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_g_key']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='text' name='pf_group_key' value="{$data['pf_group_key']}" size='30' class='textinput'><br />
+					<span class='desctext'>{$this->lang->words['cf_g_key_desc']}</span>
+				</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['cf_g_save']}' class='button primary' accesskey='s'>
-			</div>
+			<input type='submit' value='{$this->lang->words['cf_g_save']}' class='button primary' accesskey='s'>
 		</div>
 	</div>
 </form>
@@ -82,72 +119,9 @@ HTML;
 return $IPBHTML;
 }
 
-/**
- * List all the gropus
- *
- * @access	public
- * @param	array 		Groups
- * @return	string		HTML
- */
-public function groupList( $rows )
-{
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['cf_g_groups']}</h2>
-	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}do=group_form_add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['cf_g_add']}</a></li>
-	</ul>
-</div>
-
-<div class='acp-box'>
-	<h3>{$this->lang->words['cf_g_groups']}</h3>
-	
-	<table class='alternate_rows' width='100%'>
-HTML;
-
-if( ! count( $rows ) )
-{
-$IPBHTML .= <<<HTML
-		<tr>
-			<td>{$this->lang->words['cf_nonefound']}</td>
-		</tr>		
-HTML;
-}
-else
-{
-	foreach( $rows as $r )
-	{
-$IPBHTML .= <<<HTML
-		<tr>
-			<td width='95%'><strong>{$r['pf_group_name']}</strong><div class='graytext'>({$r['pf_group_key']})</div></td>
-			<td width='5%'>
-				<img class='ipbmenu' id="menu{$r['pf_group_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-				<ul class='acp-menu' id='menu{$r['pf_group_id']}_menucontent'>
-					<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=group_form_edit&id={$r['pf_group_id']}'>{$this->lang->words['cf_g_edit']}</a></li>
-					<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=group_form_delete&id={$r['pf_group_id']}")'>{$this->lang->words['cf_g_delete']}</a></li>
-				</ul>
-			</td>
-		</tr>
-HTML;
-	}		
-}
-
-$IPBHTML .= <<<HTML
-	</table>	
-</div>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * List custom profile fields
  *
- * @access	public
  * @param	array 		Fields
  * @return	string		HTML
  */
@@ -160,135 +134,147 @@ $IPBHTML .= <<<HTML
 <div class='section_title'>
 	<h2>{$this->lang->words['cf_management']}</h2>
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}do=add'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['cf_addbutton']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}do=add'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['cf_addbutton']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}do=group_form_add'><img src='{$this->settings['skin_acp_url']}/images/icons/folder_add.png' alt='' /> {$this->lang->words['cf_g_add']}</a></li>
 	</ul>
 </div>
 
 <div class='acp-box'>
  	<h3>{$this->lang->words['cf_management']}</h3>
 	<div>
-		<table width='100%'>
+		<table class='ipsTable'>
 			<tr>
-				<td class='tablesubheader' style='width: 2%'>&nbsp;</td>
-				<td class='tablesubheader' style='width: 24%'>{$this->lang->words['cf_title']}</td>
-				<td class='tablesubheader' style='width: 20%'>{$this->lang->words['cf_type']}</td>
-				<td class='tablesubheader' style='width: 13%; text-align: center;'>{$this->lang->words['cf_required']}</td>
-				<td class='tablesubheader' style='width: 13%; text-align: center;'>{$this->lang->words['cf_notpublic']}</td>
-				<td class='tablesubheader' style='width: 13%; text-align: center;'>{$this->lang->words['cf_showreg']}</td>
-				<td class='tablesubheader' style='width: 13%; text-align: center;'>{$this->lang->words['cf_adminonly']}</td>
-				<td class='tablesubheader' style='width: 2%; text-align: center;'>&nbsp;</td>
+				<th style='width: 2%'>&nbsp;</td>
+				<th style='width: 24%'>{$this->lang->words['cf_title']}</td>
+				<th style='width: 12%'>{$this->lang->words['cf_type']}</td>
+				<th style='width: 15%; text-align: center;'>{$this->lang->words['cf_required']}</td>
+				<th style='width: 15%; text-align: center;'>{$this->lang->words['cf_notpublic']}</td>
+				<th style='width: 15%; text-align: center;'>{$this->lang->words['cf_showreg']}</td>
+				<th style='width: 15%; text-align: center;'>{$this->lang->words['cf_adminonly']}</td>
+				<th class='col_buttons'>&nbsp;</td>
 			</tr>
-		</table>
-	</div>
 HTML;
 
 if( ! count( $rows ) )
 {
 $IPBHTML .= <<<HTML
-		<li style='width:100%; clear:both;'>
-			<div style='width:100%;'>{$this->lang->words['cf_nonefound']}</div>
-		</li>
-	</ul>
+			<tr>
+				<td colspan='8' class='no_messages'>
+					{$this->lang->words['cf_nonefound']}
+				</td>
+			</tr>
 HTML;
 }
 else
 {
-	$IPBHTML .= <<<HTML
-	</ul>
-HTML;
-
 	$incrementer	= 1;
-	
+
 	foreach( $rows as $group => $fields )
 	{
+		if( is_array($fields) )
+		{
+			$_groupData = array_rand($fields, 1);
+			$_id		= $fields[ $_groupData ]['pf_group_id'];
+		}
+		else
+		{
+			$_id	= $fields;
+		}
+
 $IPBHTML .= <<<HTML
-		<ul id='handle_{$incrementer}' class='alternate_rows'>
-			<li class='tablesubsubheader'>
-				<strong>{$group}</strong>
-			</li>
+		<tr>
+			<td colspan='8' class='no_pad'>
+				<table class='ipsTable' id='handle_{$incrementer}'>
+					<tr class='ipsControlRow'>
+						<th class='subhead col_drag'>&nbsp;</th>
+						<th colspan='6' class='subhead'>{$group}</th>
+						<th class='subhead col_buttons'>
+							<ul class='ipsControlStrip'>
+								<li class='i_edit'>
+									<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=group_form_edit&amp;id={$_id}'>{$this->lang->words['cf_g_edit']}</a>
+								</li>
+								<li class='i_delete'>
+									<a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=group_form_delete&id={$_id}")'>{$this->lang->words['cf_g_delete']}</a>
+								</li>
+							</ul>
+						</th>
+					</tr>
 HTML;
 
+		if( is_array($fields) AND count($fields) )
+		{
 		foreach( $fields as $r )
 		{
 $IPBHTML .= <<<HTML
-		<li class='isDraggable' style='width:100%;' id='field_{$r['pf_id']}'>
-			<table width='100%' cellpadding='0' cellspacing='0' class='double_pad'>
-				<tr>
-					<td style='width: 2%'>
-						<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='drag' /></div>
-					</td>
-					<td style='width: 24%'>
+					<tr id='fields_{$r['pf_id']}' class='ipsControlRow isDraggable sortable_{$incrementer}'>
+						<td class='col_drag'>
+							<div class='draghandle'>Drag</div>
+						</td>
+						<td style='width: 24%'>
 HTML;
 					if( $r['pf_icon'] )
 					{
-						$IPBHTML .= "<img src='{$this->settings['public_dir']}{$r['pf_icon']}' alt='Иконка' />&nbsp;";
+						$IPBHTML .= "<img src='{$this->settings['public_dir']}{$r['pf_icon']}' alt='Icon' />&nbsp;";
 					}
 					
 					$IPBHTML .= <<<HTML
-						<a href="{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['pf_id']}"><strong>{$r['pf_title']}</strong></a>
+							<a href="{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['pf_id']}"><span class='larger_text'>{$r['pf_title']}</span></a>
 HTML;
 					if( $r['pf_desc'] )
 					{
 						$IPBHTML .= <<<HTML
-						<br /><span class='desctext'>{$r['pf_desc']}</span>
+							<br /><span class='desctext'>{$r['pf_desc']}</span>
 HTML;
 					}
 					
 					$IPBHTML .= <<<HTML
-					</td>
-					<td style='width: 20%'>
-						{$r['pf_type']}
-					</td>
-					<td style='width: 13%; text-align: center;'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_req']}' alt='Иконка' />
-					</td>
-					<td style='width: 13%; text-align: center;'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_hide']}' alt='Иконка' />
-					</td>
-					<td style='width: 13%; text-align: center;'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_regi']}' alt='Иконка' />
-					</td>
-					<td style='width: 13%; text-align: center;'>
-						<img src='{$this->settings['skin_acp_url']}/_newimages/icons/{$r['_admin']}' alt='Иконка' />
-					</td>
-					<td style='width: 2%'>
-						<img class='ipbmenu' id="menu{$r['pf_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' />
-						<ul class='acp-menu' id='menu{$r['pf_id']}_menucontent'>
-							<li class='icon edit'><a href="{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['pf_id']}">{$this->lang->words['cf_edit']}</a></li>
-							<li class='icon delete'><a href="{$this->settings['base_url']}{$this->form_code}do=delete&amp;id={$r['pf_id']}">{$this->lang->words['cf_delete']}</a></li>
-						</ul>
-					</td>
-				</tr>
-			</table>
-		</li>
+						</td>
+						<td style='width: 12%'>
+							<span class='desctext'>{$r['pf_type']}</span>
+						</td>
+						<td style='width: 15%; text-align: center;'>
+							<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_req']}' alt='Icon' />
+						</td>
+						<td style='width: 15%; text-align: center;'>
+							<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_hide']}' alt='Icon' />
+						</td>
+						<td style='width: 15%; text-align: center;'>
+							<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_regi']}' alt='Icon' />
+						</td>
+						<td style='width: 15%; text-align: center;'>
+							<img src='{$this->settings['skin_acp_url']}/images/icons/{$r['_admin']}' alt='Icon' />
+						</td>
+						<td class='col_buttons'>
+							<ul class='ipsControlStrip'>
+								<li class='i_edit'>
+									<a href="{$this->settings['base_url']}{$this->form_code}do=edit&amp;id={$r['pf_id']}" title='{$this->lang->words['cf_edit']}'>{$this->lang->words['cf_edit']}</a>
+								</li>
+								<li class='i_delete'>
+									<a href="{$this->settings['base_url']}{$this->form_code}do=delete&amp;id={$r['pf_id']}" title='{$this->lang->words['cf_delete']}'>{$this->lang->words['cf_delete']}</a>
+								</li>
+							</ul>
+						</td>
+					</tr>
 HTML;
 		}
+		}
 		
 	$IPBHTML .= <<<HTML
-	</ul>
-		<script type="text/javascript">
-		dropItLikeItsHot{$incrementer} = function( draggableObject, mouseObject )
-		{
-			var options = {
-							method : 'post',
-							parameters : Sortable.serialize( 'handle_{$incrementer}', { tag: 'li', name: 'fields' } )
-						};
-		 
-			new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-		
-			return false;
-		};
-		
-		Sortable.create( 'handle_{$incrementer}', { only: 'isDraggable', revert: true, format: 'field_([0-9]+)', onUpdate: dropItLikeItsHot{$incrementer}, handle: 'draghandle' } );
-		
-		</script>
+			</table>
+			<script type='text/javascript'>
+				jQ("#handle_{$incrementer}").ipsSortable('table', { items: "tr.sortable_{$incrementer}", url: "{$this->settings['base_url']}&{$this->form_code_js}&do=reorder&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' )});
+			</script>
+		</td>
+	</tr>
 HTML;
-
-	$incrementer++;
-	}		
+		
+		$incrementer++;
+	}
 }
 
 $IPBHTML .= <<<HTML
+
+</table>
 </div>
 HTML;
 
@@ -299,7 +285,6 @@ return $IPBHTML;
 /**
  * Add/edit profile field form
  *
- * @access	public
  * @param	int			ID
  * @param	string		Action
  * @param	string		Button text
@@ -324,169 +309,169 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['cf_settings']}</h3>
 		
-		<table class='form_table double_pad alternate_rows' cellspacing='0' cellpadding='0'>
+		<table class='ipsTable'>
 			<tr>
-		 		<td style='width: 40%;'>
-					<label>{$this->lang->words['cf_f_title']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_title']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<input type='text' name='pf_title' value="{$data['pf_title']}" size='30' class='input_text' maxlength='200' /><br />
 					<span class='desctext'>{$this->lang->words['cf_f_title_info']}</span>
-				</td>
-		 		<td style='width: 60%'>
-		 			<input type='text' name='pf_title' value="{$data['pf_title']}" size='30' class='textinput' maxlength='200'>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_desc']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_desc']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<input type='text' name='pf_desc' value="{$data['pf_desc']}" size='50' class='input_text' maxlength='250' /><br />
 					<span class='desctext'>{$this->lang->words['cf_f_desc_info']}</span>
-				</td>
-		 		<td>
-		 			<input type='text' name='pf_desc' value="{$data['pf_desc']}" size='50' class='textinput' maxlength='250'>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_type']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_type']}</strong>
 				</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$data['pf_type']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_group']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_group']}</strong>
 				</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$data['pf_group_id']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_icon']}</label>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_icon']}</strong>
 				</td>
-		 		<td>
+		 		<td class='field_field'>
 		 			{$data['pf_icon']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_key']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_key']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_key']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_key_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_key']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_max']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_max']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<input type='text' name='pf_max_input' value="{$data['pf_max_input']}" size='30' class='input_text' /><br />
 					<span class='desctext'>{$this->lang->words['cf_f_max_info']}</span>
-				</td>
-		 		<td>
-		 			<input type='text' name='pf_max_input' value="{$data['pf_max_input']}" size='30' class='textinput'>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_order']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_order']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<input type='text' name='pf_position' value="{$data['pf_position']}" size='30' class='input_text' /><br />
 					<span class='desctext'>{$this->lang->words['cf_f_order_info']}</span>
-				</td>
-		 		<td>
-		 			<input type='text' name='pf_position' value="{$data['pf_position']}" size='30' class='textinput'>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_form']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_form']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<input type='text' name='pf_input_format' value="{$data['pf_input_format']}" size='30' class='input_text' /><br />
 					<span class='desctext'>{$this->lang->words['cf_f_form_info']}</span>
-				</td>
-		 		<td>
-		 			<input type='text' name='pf_input_format' value="{$data['pf_input_format']}" size='30' class='textinput'>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_option']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_option']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			<textarea name='pf_content' cols='45' rows='5' wrap='soft' id='pf_content' class='multitext'>{$data['pf_content']}</textarea><br />
 					<span class='desctext'>{$this->lang->words['cf_f_option_info']}</span>
-				</td>
-		 		<td>
-		 			<textarea name='pf_content' cols='45' rows='5' wrap='soft' id='pf_content' class='multitext'>{$data['pf_content']}</textarea>
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_srch_type']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_srch_type']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_search_type']}<br />
 					<span class='desctext'>{$this->lang->words['cf_srch_type_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_search_type']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_filter_type']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_filter_type']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_filtering']}<br />
 					<span class='desctext'>{$this->lang->words['cf_filter_type_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_filtering']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_reg']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_reg']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_show_on_reg']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_reg_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_show_on_reg']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_must']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_must']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_not_null']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_must_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_not_null']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_edit']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_edit']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_member_edit']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_edit_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_member_edit']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_priv']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_priv']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_member_hide']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_priv_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_member_hide']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_admin']}</label><br />
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_admin']}</strong>
+				</td>
+		 		<td class='field_field'>
+		 			{$data['pf_admin_only']}<br />
 					<span class='desctext'>{$this->lang->words['cf_f_admin_info']}</span>
-				</td>
-		 		<td>
-		 			{$data['pf_admin_only']}
 		 		</td>
 		 	</tr>
 			<tr>
-		 		<td>
-					<label>{$this->lang->words['cf_f_view']}</label><br />
-					<span class='desctext'>{$this->lang->words['cf_f_view_info']}</span>
+		 		<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_f_view']}</strong>
 				</td>
-		 		<td>
-		 			<textarea name='pf_topic_format' cols='60' rows='5' wrap='soft' id='pf_topic_format' class='multitext'>{$data['pf_topic_format']}</textarea>
+		 		<td class='field_field'>
+		 			<textarea name='pf_topic_format' cols='60' rows='5' wrap='soft' id='pf_topic_format' class='multitext'>{$data['pf_topic_format']}</textarea><br />
+					<span class='desctext'>{$this->lang->words['cf_f_view_info']}</span>
 		 		</td>
 		 	</tr>
 		</table>
 		<div class='acp-actionbar'>
-			<input type='submit' value=' {$button} ' class='realbutton' accesskey='s' />
+			<input type='submit' value='{$button}' class='button primary' accesskey='s' />
 		</div>
 	</div>
 </form>
@@ -499,7 +484,6 @@ return $IPBHTML;
 /**
  * Delete field confirmation
  *
- * @access	public
  * @param	int			ID
  * @param	string		Title
  * @return	string		HTML
@@ -514,19 +498,22 @@ $IPBHTML .= <<<HTML
 	<input type='hidden' name='id' value='{$id}' />
 	<input type='hidden' name='_admin_auth_key' value='' />
 	
-	<div class='tableborder'>
-		<div class='tableheaderalt'>{$this->lang->words['cf_removeconf']}</div>
-		
-		<table width='100%' align='center'>
+	<div class='acp-box'>
+		<h3>{$this->lang->words['cf_removeconf']}</h3>
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td class='tablerow1' width='40%' valign='middle'>{$this->lang->words['cf_removeto']}</td>
-				<td class='tablerow2' width='60%' valign='middle'><b>{$title}</b></td>
-			</tr>
-
-			<tr>
-				<td align='center' class='tablesubheader' colspan='2' ><input type='submit' value='{$this->lang->words['cf_deletebutton']}' class='realbutton' accesskey='s'></td>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['cf_removeto']}</strong>
+				</td>
+				<td class='field_field'>
+					{$title}
+				</td>
 			</tr>
 		</table>
+		
+		<div class='acp-actionbar'>
+			<input type='submit' value='{$this->lang->words['cf_deletebutton']}' class='button primary' accesskey='s' />
+		</div>
 	</div>
 </form>
 HTML;
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_ranks.php b/upload/admin/applications/members/skin_cp/cp_skin_ranks.php
index 3031203e..3a270b8e 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_ranks.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_ranks.php
@@ -2,40 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP ranks skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6326 $
+ * @version		$Rev: 8644 $
  *
  */
  
-class cp_skin_ranks extends output
+class cp_skin_ranks
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Ranks overview page
  *
- * @access	public
  * @param	array 		Rows
  * @return	string		HTML
  */
@@ -51,12 +80,12 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['rnk_titles']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='40%'>{$this->lang->words['rnk_title']}</th>
 			<th width='20%'>{$this->lang->words['rnk_minposts']}</th>
 			<th width='30%'>{$this->lang->words['rnk_pips']}</th>
-			<th width='10%'>&nbsp;</th>
+			<th class='col_buttons'>&nbsp;</th>
 		</tr>
 HTML;
 
@@ -79,15 +108,22 @@ if( count($rows) )
 		}
 
 		$IPBHTML .= <<<HTML
-		<tr>
-			<td><strong>{$rank['title']}</strong></td>
+		<tr class='ipsControlRow'>
+			<td>
+				<strong class='larger_text'>
+					<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rank_edit&amp;id={$rank['id']}'>{$rank['title']}</a>
+				</strong>
+			</td>
 			<td>{$rank['posts']}</td>
 			<td>{$rank['img']}</td>
-			<td align='right'>
-				<img class="ipbmenu" id="menu{$rank['id']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">
-				<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id='menu{$rank['id']}_menucontent'>
-					<li style="z-index: 10000;" class='icon edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}{$this->form_code}&do=rank_edit&id={$rank['id']}'>{$this->lang->words['rnk_editlink']}</a></li>
-					<li style="z-index: 10000;" class='icon delete'><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete( "{$this->settings['base_url']}{$this->form_code}&do=rank_delete&id={$rank['id']}" )'>{$this->lang->words['rnk_deletelink']}</a></li>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'>
+						<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=rank_edit&amp;id={$rank['id']}' title='{$this->lang->words['rnk_editlink']}'>{$this->lang->words['rnk_editlink']}</a>
+					</li>
+					<li class='i_delete'>
+						<a href='#' onclick='return acp.confirmDelete( "{$this->settings['base_url']}{$this->form_code}&amp;do=rank_delete&amp;id={$rank['id']}" )' title='{$this->lang->words['rnk_deletelink']}'>{$this->lang->words['rnk_deletelink']}</a>
+					</li>
 				</ul>								
 			</td>
 		</tr>		
@@ -104,26 +140,24 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['rnk_addarank']}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['rnk_ranktitle']}</label>
-				<input type='text' name='title' />
-			</li>
-			<li>
-				<label>{$this->lang->words['rnk_minpostsneeded']}</label>
-				<input type='text' name='posts' />
-			</li>
-			<li>
-				<label>{$this->lang->words['rnk_numpips']}<span class='desctext'>{$this->lang->words['rnk_numpips_info']}</span></label>
-				<input type='text' name='pips' />
-			</li>
-		</ul>
+		<table class='ipsTable'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rnk_ranktitle']}</strong></td>
+				<td class='field_field'><input type='text' name='title' class='input_text' /></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rnk_minpostsneeded']}</strong></td>
+				<td class='field_field'><input type='text' name='posts' class='input_text' /></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rnk_numpips']}</strong></td>
+				<td class='field_field'><input type='text' name='pips' class='input_text' /><br /><span class='desctext'>{$this->lang->words['rnk_numpips_info']}</span></td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['rnk_addrank']}' class='button primary'/>
-			</div>
-		</div>		
+			<input type='submit' value='{$this->lang->words['rnk_addrank']}' class='button primary'/>
+		</div>
 	</div>
 </form>
 HTML;
@@ -135,7 +169,6 @@ return $IPBHTML;
 /**
  * Ranks form
  *
- * @access	public
  * @param	array 		Rank data
  * @param	string		Action code
  * @param	string		Button text
@@ -157,25 +190,36 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$button}</h3>
  		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['rnk_ranktitle']}</label>
-				<input type='text' name='title' value='{$rank['title']}' />
-			</li>
-			<li>
-				<label>{$this->lang->words['rnk_minpostsneeded']}</label>
-				<input type='text' name='posts' value='{$rank['posts']}' />
-			</li>
-			<li>
-				<label>{$this->lang->words['rnk_numpips']}<span class='desctext'>{$this->lang->words['rnk_numpips_info']}</span></label>
-				<input type='text' name='pips' value='{$rank['pips']}' />
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rnk_ranktitle']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='text' name='title' class='input_text' value='{$rank['title']}' />
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rnk_minpostsneeded']}</strong>
+				</td>
+				<td class='field_field'>
+				<input type='text' name='posts' class='input_text' value='{$rank['posts']}' />
+				</td>
+			</tr>
+			<tr>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['rnk_numpips']}</strong>
+				</td>
+				<td class='field_field'>
+					<input type='text' name='pips' class='input_text' value='{$rank['pips']}' /><br />
+					<span class='desctext'>{$this->lang->words['rnk_numpips_info']}</span>
+				</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$button}' class='button primary' />
-			</div>
+			<input type='submit' value='{$button}' class='button primary' />
 		</div>
 	</div>
 </form>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_reputation.php b/upload/admin/applications/members/skin_cp/cp_skin_reputation.php
index 16c11e49..fe356527 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_reputation.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_reputation.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP reputation skin file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
  
-class cp_skin_reputation extends output
+class cp_skin_reputation
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Reputation form
  *
- * @access	public
  * @param	int		ID
  * @param	string	Action
  * @param	string	Title
@@ -50,18 +80,18 @@ if( count( $errors ) )
 {
 $IPBHTML .= <<<HTML
 <h2>{$this->lang->words['errors']}</h2>
-<ul>
+<div class='warning'>
 HTML;
 
 	foreach( $errors as $err )
 	{
 $IPBHTML .= <<<HTML
-	<li>$err</li>
+	<p>$err</p>
 HTML;
 	}
 	
 $IPBHTML .= <<<HTML
-</ul>
+</div><br />
 HTML;
 }
 
@@ -72,26 +102,24 @@ $IPBHTML .= <<<HTML
 	
 	<div class='acp-box'>
 		<h3>{$title}</h3>
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['rep_form_title']}<span class='desctext'>{$this->lang->words['rep_form_title_help']}</span></label>
-				{$form['level_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rep_form_image']}<span class='desctext'>{$this->lang->words['rep_form_image_help']}{$this->settings['public_dir']}style_extra/reputation_icons/</span></label>
-				{$form['level_image']}
-			</li>
-			<li>
-				<label>{$this->lang->words['rep_form_points']}<span class='desctext'>{$this->lang->words['rep_form_points_help']}</span></label>
-				{$form['level_points']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rep_form_title']}</strong></td>
+				<td class='field_field'>{$form['level_title']}<br /><span class='desctext'>{$this->lang->words['rep_form_title_help']}</span></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rep_form_image']}</strong></td>
+				<td class='field_field'>{$form['level_image']}<br /><span class='desctext'>{$this->lang->words['rep_form_image_help']}{$this->settings['public_dir']}style_extra/reputation_icons/</span></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['rep_form_points']}</strong></td>
+				<td class='field_field'>{$form['level_points']}<br /><span class='desctext'>{$this->lang->words['rep_form_points_help']}</span></td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				<input type='submit' value='{$this->lang->words['rep_save_changes']}' class='button primary'/>
-			</div>
-		</div>			
+			<input type='submit' value='{$this->lang->words['rep_save_changes']}' class='button primary'/>
+		</div>
 	</div>
 </form>
 HTML;
@@ -103,7 +131,6 @@ return $IPBHTML;
 /**
  * Reputation overview screen
  *
- * @access	public
  * @param	array 	Rep levels
  * @return	string	HTML
  */
@@ -116,13 +143,13 @@ $IPBHTML .= <<<HTML
 	<h2>{$this->lang->words['rep_lvl_manage']}</h2>
 	
 	<ul class='context_menu'>
-		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=add_level_form'><img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' /> {$this->lang->words['rep_level_new']}</a></li>
+		<li><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=add_level_form'><img src='{$this->settings['skin_acp_url']}/images/icons/add.png' alt='' /> {$this->lang->words['rep_level_new']}</a></li>
 	</ul>
 </div>
 <div class='acp-box'>
 	<h3>{$this->lang->words['rep_lvl_manage']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='40%'>{$this->lang->words['rep_form_title']}</th>
 			<th width='20%'>{$this->lang->words['rep_form_image']}</th>
@@ -136,15 +163,14 @@ if( is_array( $levels ) && count( $levels ) )
 	foreach( $levels as $r )
 	{
 $IPBHTML .= <<<HTML
-		<tr>
-			<td>{$r['level_title']}</td>
+		<tr class='ipsControlRow'>
+			<td><span class='larger_text'>{$r['level_title']}</span></td>
 			<td>{$r['level_image']}</td>
 			<td>{$r['level_points']}</td>
-			<td align='right'>
-				<img class="ipbmenu" id="menu{$r['level_id']}" src="{$this->settings['skin_acp_url']}/_newimages/menu_open.png" alt="">
-				<ul style="position: absolute; display: none; z-index: 9999;" class="acp-menu" id='menu{$r['level_id']}_menucontent'>
-					<li style="z-index: 10000;" class='icon edit'><a style="z-index: 10000;" href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_level_form&amp;id={$r['level_id']}'>{$this->lang->words['edit']}</a></li>
-					<li style="z-index: 10000;" class='icon delete'><a style="z-index: 10000;" href='#' onclick='return acp.confirmDelete( "{$this->settings['base_url']}{$this->form_code}&amp;do=delete_level&amp;id={$r['level_id']}" );'>{$this->lang->words['delete']}</a></li>
+			<td class='col_buttons'>
+				<ul class='ipsControlStrip'>
+					<li class='i_edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=edit_level_form&amp;id={$r['level_id']}' title='{$this->lang->words['edit']}'>{$this->lang->words['edit']}</a></li>
+					<li class='i_delete'><a href='#' onclick='return acp.confirmDelete( "{$this->settings['base_url']}{$this->form_code}&amp;do=delete_level&amp;id={$r['level_id']}" );' title='{$this->lang->words['delete']}'>{$this->lang->words['delete']}</a></li>
 				</ul>
 			</td>
 		</tr>
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_restrictions.php b/upload/admin/applications/members/skin_cp/cp_skin_restrictions.php
index d6918c6b..5797b52a 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_restrictions.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_restrictions.php
@@ -2,39 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP restrictions skin file
- * Last Updated: $Date: 2010-09-22 11:32:51 -0400 (Wed, 22 Sep 2010) $
+ * Last Updated: $Date: 2011-09-21 13:19:38 -0400 (Wed, 21 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6904 $
+ * @version		$Rev: 9531 $
  *
  */
  
-class cp_skin_restrictions extends output
+class cp_skin_restrictions
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Form to add a new restricted member
  *
- * @access	public
  * @return	string		HTML
  */
 public function restrictionsMemberForm() {
@@ -49,19 +79,17 @@ $IPBHTML .= <<<HTML
 
 <form id='postingform' action="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=acpperms-member-add-complete" method="post" name="REPLIER">
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['r_findadmin']}</div>
- <div class='tablesubheader'>&nbsp;</div>
-  <table width='100%' align='center'>
-  <tr>
-    <td class='tablerow1'  width='50%'  valign='middle'>{$this->lang->words['r_displayname']}<div style='color:gray'>{$this->lang->words['r_displayname_info']}</div></td>
-    <td class='tablerow2'  width='50%'  valign='middle'><input type="text" id='entered_name' name="entered_name" size="30" autocomplete='off' style='width:210px' value="" tabindex="1" /></td>
-  </tr>
-  <tr>
-  <td align='center' class='tablesubheader' colspan='2' ><input type='submit' value='{$this->lang->words['r_proceed']}' class='realbutton' accesskey='s'></td>
-  </tr>
+<div class='acp-box'>
+ <h3>{$this->lang->words['r_findadmin']}</h3>
+  <table class='ipsTable'>
+  	<tr>
+    	<td class='field_title'><strong class='title'>{$this->lang->words['r_displayname']}</strong></td>
+    	<td class='field_field'><input type="text" id='entered_name' name="entered_name" size="30" autocomplete='off' style='width:210px' value="" tabindex="1" class='input_text' /><br /><span class='desctext'>{$this->lang->words['r_displayname_info']}</span></td>
+  	</tr>
   </table>
-</div>
+  <div class='acp-actionbar'>
+  	<input type='submit' value='{$this->lang->words['r_proceed']}' class='button primary' accesskey='s' />
+  </div>
 <script type="text/javascript">
 document.observe("dom:loaded", function(){
 	var search = new ipb.Autocomplete( $('entered_name'), { multibox: false, url: acp.autocompleteUrl, templates: { wrap: acp.autocompleteWrap, item: acp.autocompleteItem } } );
@@ -77,7 +105,6 @@ return $IPBHTML;
 /**
  * Form to add a new restricted group
  *
- * @access	public
  * @return	string		HTML
  */
 public function restrictionsGroupForm() {
@@ -104,18 +131,15 @@ $IPBHTML .= <<<HTML
 
 <form id='postingform' action="{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=acpperms-group-add-complete" method="post" name="REPLIER">
 <input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-<div class='tableborder'>
- <div class='tableheaderalt'>{$this->lang->words['r_selectgroup']}</div>
- <div class='tablesubheader'>&nbsp;</div>
-  <table width='100%' align='center'>
-  <tr>
-    <td class='tablerow1'  width='50%'  valign='middle'>{$this->lang->words['r_whatgroup']}</td>
-    <td class='tablerow2'  width='50%'  valign='middle'>{$dropDown}</td>
-  </tr>
-  <tr>
-  <td align='center' class='tablesubheader' colspan='2' ><input type='submit' value='{$this->lang->words['r_proceed']}' class='realbutton' accesskey='s'></td>
-  </tr>
+<div class='acp-box'>
+ <h3>{$this->lang->words['r_selectgroup']}</h3>
+  <table class='ipsTable'>
+  	<tr>
+    	<td class='field_title'><strong class='title'>{$this->lang->words['r_whatgroup']}</strong></td>
+    	<td class='field_field'>{$dropDown}</td>
+  	</tr>
   </table>
+	<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['r_proceed']}' class='realbutton' accesskey='s' /></div>
 </div>
 </form>
 HTML;
@@ -128,7 +152,6 @@ return $IPBHTML;
 /**
  * ACP restrictions overview
  *
- * @access	public
  * @param	array 		Members
  * @param	array 		Groups
  * @return	string		HTML
@@ -146,7 +169,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['r_memberrestrict']}</h3>
 	
-	<table class='alternate_rows double_pad' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='35%'>{$this->lang->words['r_member']}</th>
 			<th width='20%'>{$this->lang->words['r_primary']}</th>
@@ -164,7 +187,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['r_grouprestrict']}</h3>
 	
-	<table cellpadding='0' cellspacing='0' width='100%' class='alternate_rows double_pad'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='55%'>{$this->lang->words['r_group']}</th>
 			<th width='20%' align='center'>{$this->lang->words['r_totalmem']}</th>
@@ -187,7 +210,6 @@ return $IPBHTML;
 /**
  * Restricted member
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -197,7 +219,7 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<tr>
+<tr class='ipsControlRow'>
 	<td>
 		<img src='{$this->settings['skin_acp_url']}/images/lock_close.gif' alt='@' style='vertical-align:top' />
 		<strong>{$data['members_display_name']}</strong>
@@ -205,11 +227,10 @@ $IPBHTML .= <<<HTML
 	<td>{$data['_group_name']}</td>
 	<td>{$data['_other_groups']}</td>
 	<td>{$data['_date']}</td>
-	<td>
-		<img class='ipbmenu' id="menumember{$data['member_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['r_options']}' />
-		<ul class='acp-menu' id='menumember{$data['member_id']}_menucontent'>
-			<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-member-edit&amp;mid={$data['member_id']}'>{$this->lang->words['r_managerestrict']}</a></li>
-			<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-member-remove&amp;mid={$data['member_id']}");'>{$this->lang->words['r_removeall']}</a></li>
+	<td class='col_buttons'>
+		<ul class='ipsControlStrip'>
+			<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-member-edit&amp;mid={$data['member_id']}'>{$this->lang->words['r_managerestrict']}</a></li>
+			<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-member-remove&amp;mid={$data['member_id']}");'>{$this->lang->words['r_removeall']}</a></li>
 		</ul>
 	</td>
 </tr>
@@ -222,7 +243,6 @@ return $IPBHTML;
 /**
  * Restricted group
  *
- * @access	public
  * @param	array 		Group data
  * @return	string		HTML
  */
@@ -232,18 +252,17 @@ $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
-<tr>
- <td class='tablerow1'>
+<tr class='ipsControlRow'>
+ <td>
    <img src='{$this->settings['skin_acp_url']}/images/lock_close.gif' alt='@' style='vertical-align:top' />
    <strong>{$data['_group_name']}</strong>
  </td>
- <td class='tablerow2' align='center'>{$data['_total']}</td>
- <td class='tablerow2' align='center'>{$data['_date']}</td>
- <td class='tablerow1'>
- 	<img id="menugroup{$data['row_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['r_options']}' class='ipbmenu' />
-	<ul class='acp-menu' id='menugroup{$data['row_id']}_menucontent'>
-		<li class='icon edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-group-edit&amp;gid={$data['row_id']}'>{$this->lang->words['r_managerestrictg']}</a></li>
-		<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-group-remove&amp;gid={$data['row_id']}");'>{$this->lang->words['r_removeallg']}</a></li>
+ <td align='center'>{$data['_total']}</td>
+ <td align='center'>{$data['_date']}</td>
+ <td class='col_buttons'>
+	<ul class='ipsControlStrip'>
+		<li class='i_edit'><a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-group-edit&amp;gid={$data['row_id']}' title='{$this->lang->words['r_managerestrictg']}'>{$this->lang->words['r_managerestrictg']}</a></li>
+		<li class='i_delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=accperms-group-remove&amp;gid={$data['row_id']}");' title='{$this->lang->words['r_removeallg']}'>{$this->lang->words['r_removeallg']}</a></li>
 	</ul>
  </td>
 </tr>
@@ -256,7 +275,6 @@ return $IPBHTML;
 /**
  * Add new restrictions form
  *
- * @access	public
  * @param	int			Role id
  * @param	string		Role type
  * @param	array 		Permissions
@@ -265,116 +283,217 @@ return $IPBHTML;
  */
 public function restrictionsForm( $role_id=0, $role_type='member', $permissions=array(), $access=array() ) {
 
+$itemsByModules = array();
+
 $IPBHTML = "";
 //--starthtml--//
 
 $IPBHTML .= <<<HTML
+<div class='section_title'>
+	<h2>{$this->lang->words['r_title']}</h2>
+</div>
 
 <script type="text/javascript" src='{$this->settings['js_main_url']}acp.permissions.js'></script>
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tab_restrictions');
-});
- //]]>
-</script>
 <form action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=acpperms-save&amp;secure_key={$this->registry->getClass('adminFunctions')->_admin_auth_key}' method='post' id='adform' name='adform'>
 <input type='hidden' name='id' value='{$role_id}' />
 <input type='hidden' name='type' value='{$role_type}' />
-<ul id='tab_restrictions' class='tab_bar no_title'>
+<div class='acp-box'>
+	<h3>Set Restrictions</h3>
+<div class='ipsTabBar' id='tab_restrictions'>
+	<span class='tab_left'>&laquo;</span>
+	<span class='tab_right'>&raquo;</span>
+	<ul>
 HTML;
 
 foreach( ipsRegistry::$applications as $app_dir => $application )
 {
 	if( is_array(ipsRegistry::$modules[ $app_dir ]) AND count(ipsRegistry::$modules[ $app_dir ]) )
 	{
-		$IPBHTML .= "<li id='tabtab-TOP|{$application['app_id']}' class=''>{$application['app_title']}</li>\n";
+		$IPBHTML .= "<li id='tab_{$application['app_id']}'>{$application['app_title']}</li>\n";
 	}
 }
 
 $IPBHTML .= <<<HTML
-</ul>
-<div class='acp-box'>
-
+	</ul>
+</div>
+<div id='tabContent'>
 HTML;
 
 foreach( ipsRegistry::$applications as $app_dir => $application )
 {
 	$checked	= in_array( $application['app_id'], $access['applications'] ) ? 1 : 0;
-	$form		= $this->registry->output->formCheckbox( 'app_' . $application['app_id'], $checked );
+	$form		= $this->registry->output->formCheckbox( 'app_' . $application['app_id'], $checked, 1, 'app_' . $application['app_id'], "onclick='checkApp( {$application['app_id']} );'" );
 	
 	if( is_array(ipsRegistry::$modules[ $app_dir ]) AND count(ipsRegistry::$modules[ $app_dir ]) )
 	{
-	$IPBHTML .= <<<HTML
+		$IPBHTML .= <<<HTML
 	
-	<div id='tabpane-TOP|{$application['app_id']}'>
-		<div class='tablesubheader'>{$form} {$this->lang->words['r_grantto']} приложению «{$application['app_title']}»?</div>		
+	<div id='tab_{$application['app_id']}_content'>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<th colspan='2'><label for='app_{$application['app_id']}'>{$form} {$this->lang->words['r_grantto']} {$this->lang->words['application_bit']}: {$application['app_title']}?</label></th>
+			</tr>
+		</table>
 HTML;
-
-	foreach( ipsRegistry::$modules[ $app_dir ] as $module )
-	{
-		$checked	= in_array( $module['sys_module_id'], $access['modules'] ) ? 1 : 0;
-		$form		= $this->registry->output->formCheckbox( 'module_' . $module['sys_module_id'], $checked );
-
+	
+		foreach( ipsRegistry::$modules[ $app_dir ] as $module )
+		{
+			$checked	= in_array( $module['sys_module_id'], $access['modules'] ) ? 1 : 0;
+			$form		= $this->registry->output->formCheckbox( 'module_' . $module['sys_module_id'], $checked, 1, 'module_' . $module['sys_module_id'], "onclick='checkModule( {$module['sys_module_id']} );'" );
+			
 			if( ! $module['sys_module_admin'] )
 			{
 				continue;	
 			}
 
-		$IPBHTML .= <<<HTML
-		<div class='tablesubheader'>{$form} {$this->lang->words['r_grantto']} модулю «{$module['sys_module_title']}»?</div>		
+			$IPBHTML .= <<<HTML
+			<table class='ipsTable double_pad'>
+			<tr>
+				<th colspan='2'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label for='module_{$module['sys_module_id']}'>{$form} {$this->lang->words['r_grantto']} {$this->lang->words['module_bit']}: {$module['sys_module_title']}?</label></th>
+			</tr>
+			</table>
+			
 HTML;
 
-		if( is_array( $permissions ) AND is_array($permissions[ $application['app_id'] ][ $module['sys_module_id'] ]) AND count($permissions[ $application['app_id'] ][ $module['sys_module_id'] ]) )
-		{
-			// Call me lazy if you wish :P
-			$shorten = $permissions[ $application['app_id'] ][ $module['sys_module_id'] ];
-			
-			foreach( $shorten as $group => $shorter )
+			if( is_array( $permissions ) AND is_array($permissions[ $application['app_id'] ][ $module['sys_module_id'] ]) AND count($permissions[ $application['app_id'] ][ $module['sys_module_id'] ]) )
 			{
-				if( !is_array($shorter) OR !count($shorter) )
+				// Call me lazy if you wish :P
+				$shorten = $permissions[ $application['app_id'] ][ $module['sys_module_id'] ];
+				
+				foreach( $shorten as $group => $shorter )
 				{
-					continue;
-				}
-
-				$IPBHTML .= <<<HTML
-				<div class='tablesubheader'>{$shorter['title']}</div>
-				<ul class='acp-form alternate_rows'>
-HTML;
-				if( is_array($shorter['items']) AND count($shorter['items']) )
-				{
-					foreach( $shorter['items'] as $item_key => $item_text )
+					if( !is_array($shorter) OR !count($shorter) )
 					{
-						$checked	= (is_array($access['items'][ $module['sys_module_id'] ]) AND in_array($item_key, $access['items'][ $module['sys_module_id'] ] )) ? 1 : 0;
-						$form		= $this->registry->output->formCheckbox( 'item_' . $module['sys_module_id'] . '_' . $item_key, $checked );
-						
-						$IPBHTML .= <<<HTML
-							<li><label>{$item_text}</label>{$form}</li>
-HTML;
+						continue;
 					}
-				}
-			
-				$IPBHTML .= <<<HTML
-				</ul>
-				<br />
-HTML;
-			}
-		}
-	}
 
-	$IPBHTML .= <<<HTML
+					$IPBHTML .= <<<HTML
+				<table class='ipsTable double_pad'>
+				<tr>
+					<th colspan='2' class='subhead'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{$shorter['title']}</th>
+				</tr>
+HTML;
+					if( is_array($shorter['items']) AND count($shorter['items']) )
+					{
+						foreach( $shorter['items'] as $item_key => $item_text )
+						{
+							$itemsByModules[ $module['sys_module_id'] ][] = $item_key;
+							$checked	= (is_array($access['items'][ $module['sys_module_id'] ]) AND in_array($item_key, $access['items'][ $module['sys_module_id'] ] )) ? 1 : 0;
+							$form		= $this->registry->output->formCheckbox( 'item_' . $module['sys_module_id'] . '_' . $item_key, $checked, 1, 'item_' . $module['sys_module_id'] . '_' . $item_key, "onclick='checkItem( {$module['sys_module_id']} );'" );
+							
+							$IPBHTML .= <<<HTML
+							<tr>
+								<td colspan='2'>
+									<strong class='title'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label for='item_{$module['sys_module_id']}_{$item_key}'>{$form} {$item_text}</label></strong>
+								</td>
+							</tr>
+HTML;
+						}
+					}
+					
+					$IPBHTML .= <<<HTML
+				</table>
+HTML;
+				}
+			}
+			
+		}
+
+		$IPBHTML .= <<<HTML
 	</div>
 
 HTML;
-}
+	}
 }
 
 $IPBHTML .= <<<HTML
 </div>
-<div class='tablesubheader' style='text-align:center;'><input type='submit' value=' {$this->lang->words['r_savebutton']} ' /></div>
+<div class='acp-actionbar'><input type='submit' value='{$this->lang->words['r_savebutton']}' class='button primary' /></div>
+</div>
 </form>
+<script type='text/javascript'>
+	jQ("#tab_restrictions").ipsTabBar();
+</script>
+HTML;
 
+
+
+$IPBHTML .= <<<HTML
+<script type='text/javascript'>
+	var modulesByApp = [];
+	var appsByModule = [];
+	var itemsByModule = [];
+HTML;
+
+foreach( ipsRegistry::$applications as $app_dir => $application )
+{
+	$modules = array();
+	foreach( ipsRegistry::$modules[ $app_dir ] as $module )
+	{
+		if( ! $module['sys_module_admin'] )
+		{
+			continue;	
+		}
+		$modules[] = $module['sys_module_id'];
+		
+		$IPBHTML .= <<<HTML
+		appsByModule[ {$module['sys_module_id']} ] = {$application['app_id']};
+HTML;
+	}
+	
+	$modules = implode( ',', $modules );
+
+	$IPBHTML .= <<<HTML
+		modulesByApp[ {$application['app_id']} ] = Array( {$modules} );
+
+HTML;
+}
+foreach ( $itemsByModules as $module => $items )
+{
+	$items = implode( ',', array_map( create_function( '$v', 'return "\'$v\'";' ), $items ) );
+	$IPBHTML .= <<<HTML
+		itemsByModule[ {$module} ] = Array( {$items} );
+
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+
+	function checkApp( app )
+	{	
+		for ( var i in modulesByApp[ app ] )
+		{
+			if (  $( 'module_' + modulesByApp[ app ][ i ] ) )
+			{
+			    $( 'module_' + modulesByApp[ app ][ i ] ).checked = $( 'app_' + app ).checked;
+			    checkModule( modulesByApp[ app ][ i ] );
+			}
+		}
+	}
+	
+	function checkModule( module )
+	{
+		if ( $( 'module_' + module ).checked )
+		{
+			$( 'app_' + appsByModule[ module ] ).checked = true;
+		}
+		
+		for ( var i in itemsByModule[ module ] )
+		{
+			if ( $( 'item_' + module + '_' + itemsByModule[ module ][ i ] ) )
+			{
+		    	$( 'item_' + module + '_' + itemsByModule[ module ][ i ] ).checked = $( 'module_' + module ).checked;
+			}
+		}
+	}
+	
+	function checkItem( module )
+	{
+		$( 'module_' + module ).checked = true;
+		$( 'app_' + appsByModule[ module ] ).checked = true;
+	}
+
+</script>
 HTML;
 
 //--endhtml--//
diff --git a/upload/admin/applications/members/skin_cp/cp_skin_tools.php b/upload/admin/applications/members/skin_cp/cp_skin_tools.php
index b490255f..a44f98da 100644
--- a/upload/admin/applications/members/skin_cp/cp_skin_tools.php
+++ b/upload/admin/applications/members/skin_cp/cp_skin_tools.php
@@ -2,59 +2,69 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP tools skin file
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-09-20 18:16:05 -0400 (Tue, 20 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6925 $
+ * @version		$Rev: 9519 $
  *
  */
  
-class cp_skin_tools extends output
+class cp_skin_tools
 {
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Show notice if no banned_group set
- *
- * @access	public
- * @return	string		HTML
- */
-public function bannedGroupNotice(){
-$IPBHTML = "";
-
-$IPBHTML .= <<<HTML
-<div class='information-box'>
-{$this->lang->words['nobannedgroup_notice']}
-</div>
-<br />
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->registry 	= $registry;
+		$this->DB	    	= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member   	= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+		$this->lang 		= $this->registry->class_localization;
+	}
 
 /**
  * Merge start form
  *
- * @access	public
  * @param	array 		Member data
  * @return	string		HTML
  */
@@ -76,17 +86,15 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$title}</h3>
  
- 		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['merge_find_name']}</label>
-				<input type='text' class='textinput' id='members_display_name' name='members_display_name' value='' />
-			</li>
-		</ul>
+ 		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['merge_find_name']}</strong></td>
+				<td class='field_field'><input type='text' class='textinput' id='members_display_name' name='members_display_name' value='' /></td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				 <input type='submit' class='button primary' value=' {$this->lang->words['merge_continue_button']} ' />
-			</div>
+			 <input type='submit' class='button primary' value='{$this->lang->words['merge_continue_button']}' />
 		</div>
 	</div>
 </form>
@@ -104,7 +112,6 @@ return $IPBHTML;
 /**
  * Confirm merge of two members
  *
- * @access	public
  * @param	array 		Member data
  * @param	array 		Member data
  * @return	string		HTML
@@ -128,21 +135,19 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['merge_confirm_title']}</h3>
  
- 		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['merge_remove']}</label>
-				<a href='{$this->settings['_original_base_url']}/index.php?showuser={$member2['member_id']}'>{$member2['members_display_name']}</a>
-			</li>
-			<li>
-				<label>{$this->lang->words['merge_keep']}</label>
-				<a href='{$this->settings['_original_base_url']}/index.php?showuser={$member['member_id']}'>{$member['members_display_name']}</a>
-			</li>
-		</ul>
+ 		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['merge_remove']}</strong></td>
+				<td class='field_field'><a href='{$this->settings['_original_base_url']}/index.php?showuser={$member2['member_id']}'>{$member2['members_display_name']}</a></td>
+			</tr>
+			<tr>
+				<td class='field_title'><strong class='title'>{$this->lang->words['merge_keep']}</strong></td>
+				<td class='field_field'><a href='{$this->settings['_original_base_url']}/index.php?showuser={$member['member_id']}'>{$member['members_display_name']}</a></td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-			<div class='centeraction'>
-				 <input type='submit' class='button primary' value=' {$this->lang->words['merge_submit']} ' />
-			</div>
+			 <input type='submit' class='button primary' value='{$this->lang->words['merge_submit']}' />
 		</div>
 	</div>
 </form>
@@ -155,7 +160,6 @@ return $IPBHTML;
 /**
  * Member tools splash page
  *
- * @access	public
  * @param	string		Message
  * @param	array 		Form elements
  * @return	string		HTML
@@ -168,8 +172,7 @@ $IPBHTML = "";
 if( $message )
 {
 	$IPBHTML .= <<<HTML
-<div class='acp-box'>
-	<h3>{$this->lang->words['t_message']}</h3>
+<div class='information-box'>
 	<p>{$message}</p>
 </div>
 <br />
@@ -186,15 +189,15 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['t_showallip']}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$form['text']}</label>
-				{$form['form']}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+				<td class='field_title'><strong class='title'>{$form['text']}</strong></td>
+				<td class='field_field'>{$form['form']}</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-				<input type='submit' class='button primary' value=' {$this->lang->words['t_showallbutton']} ' />
+			<input type='submit' class='button primary' value='{$this->lang->words['t_showallbutton']}' />
 		</div>
 	</div>
 </form>
@@ -204,15 +207,15 @@ $IPBHTML .= <<<HTML
 	<div class='acp-box'>
 		<h3>{$this->lang->words['t_ipmulti']}</h3>
 		
-		<ul class='acp-form alternate_rows'>
-			<li>
-	 			<label>{$this->lang->words['t_showme']}</label>
-				{$form_ip}
-			</li>
-		</ul>
+		<table class='ipsTable double_pad'>
+			<tr>
+	 			<td class='field_title'><strong class='title'>{$this->lang->words['t_showme']}</strong></td>
+				<td class='field_field'>{$form_ip}</td>
+			</tr>
+		</table>
 		
 		<div class='acp-actionbar'>
-				<input type='submit' class='button primary' value=' {$this->lang->words['t_showmebutton']} ' />
+				<input type='submit' class='button primary' value='{$this->lang->words['t_showmebutton']}' />
 		</div>
 	</div>
 </form>
@@ -232,7 +235,6 @@ return $IPBHTML;
 /**
  * Delete PM wrapper
  *
- * @access	public
  * @param	array		Member
  * @param	int 		Total topics
  * @param	int			Total replies
@@ -254,26 +256,26 @@ $repliesYesNo	= $this->registry->output->formYesNo( 'replies', 0 );
 
 $IPBHTML .= <<<HTML
 <div class='section_title'>
-	<h2>Управление пользователем</h2>
+	<h2>{$this->lang->words['member_management_h2']}</h2>
 </div>
 
-<form action='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=deleteMessages&amp;member_id={$member['member_id']}&amp;confirm=1' method='post'>
+<form action='{$this->settings['base_url']}module=members&amp;section=tools&amp;do=deleteMessages&amp;member_id={$member['member_id']}&amp;confirm=1' method='post'>
 	<div class='acp-box'>
-		<h3>Удаление в�ех личных �ообщений {$member['members_display_name']}</h3>
-		<table class='form_table alternate_rows double_pad'>
+		<h3>{$this->lang->words['tools_delete_all_pms']} {$member['members_display_name']}</h3>
+		<table class='ipsTable double_pad'>
 			<tr>
-				<td style='width: 40%'>
-					<strong>{$this->lang->words['total_pms_topics']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['total_pms_topics']}</strong>
 				</td>
-				<td style='width: 60%'>
+				<td class='field_field'>
 					{$topicsYesNo}
 				</td>
 			</tr>
 			<tr>
-				<td>
-					<strong>{$this->lang->words['total_pms_replies']}</strong>
+				<td class='field_title'>
+					<strong class='title'>{$this->lang->words['total_pms_replies']}</strong>
 				</td>
-				<td>
+				<td class='field_field'>
 					{$repliesYesNo}
 				</td>
 			</tr>
@@ -292,7 +294,6 @@ return $IPBHTML;
 /**
  * Show all of a member's IP addresses
  *
- * @access	public
  * @param	array 		Member data
  * @param	array 		All IPs
  * @param	string		Page links
@@ -310,7 +311,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$counttxt}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='20%'>{$this->lang->words['t_ipaddy']}</th>
 			<th width='10%'>{$this->lang->words['t_timesused']}</th>
@@ -333,7 +334,7 @@ if( is_array($allips) AND count($allips) )
 			<td>{$use_info[0]}</td>
 			<td>{$date}</td>
 			<td>{$others}</td>
-			<td><a href='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$ip_address}'>{$this->lang->words['t_learnmore']}</a></td>
+			<td><a href='{$this->settings['base_url']}module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$ip_address}'>{$this->lang->words['t_learnmore']}</a></td>
 		</tr>
 HTML;
 	}
@@ -349,10 +350,8 @@ HTML;
 
 $IPBHTML .= <<<HTML
 	</table>
-	<div class='acp-actionbar'>
-		<div class='rightaction'>
-			{$links}
-		</div>
+	<div class='acp-actionbar' style='text-align: left;'>
+		{$links}
 	</div>
 </div>
 <br />
@@ -366,7 +365,6 @@ return $IPBHTML;
 /**
  * Learn about an IP
  *
- * @access	public
  * @param	string		Host address
  * @param	array 		All registering members
  * @param	array 		All posting members
@@ -385,7 +383,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['hostaddress_for']} {$this->request['ip']}</h3>
  	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<td width='40%'>{$this->lang->words['t_ipresolves']}</td>
 			<td width='60%'>{$hostAddr}</td>
@@ -396,7 +394,7 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipreg']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 	<tr>
 		<th width='30%'>{$this->lang->words['t_ipname']}</th>
 		<th width='20%'>{$this->lang->words['t_ipemail']}</th>
@@ -437,7 +435,7 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipposting']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%'>{$this->lang->words['t_ipname']}</th>
 			<th width='20%'>{$this->lang->words['t_ipemail']}</th>
@@ -478,7 +476,7 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipvoting']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%'>{$this->lang->words['t_ipname']}</th>
 			<th width='20%'>{$this->lang->words['t_ipemail']}</th>
@@ -520,7 +518,7 @@ $IPBHTML .= <<<HTML
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipemailing']}</h3>
 	
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%'>{$this->lang->words['t_ipname']}</th>
 			<th width='30%'>{$this->lang->words['t_ipemail']}</th>
@@ -559,7 +557,7 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipvalidating']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%'>{$this->lang->words['t_ipname']}</th>
 			<th width='30%'>{$this->lang->words['t_ipemail']}</th>
@@ -598,7 +596,7 @@ $IPBHTML .= <<<HTML
 
 <div class='acp-box'>
 	<h3>{$this->lang->words['t_ipalsofound']}</h3>
-	<table class='alternate_rows' width='100%'>
+	<table class='ipsTable'>
 		<tr>
 			<th width='30%'>{$this->lang->words['t_ipname']}</th>
 			<th width='30%'>{$this->lang->words['t_ip_table']}</th>
@@ -649,441 +647,4 @@ HTML;
 return $IPBHTML;
 }
 
-/**
- * Validation queue wrapper
- *
- * @access	public
- * @param	string		Type of queue
- * @param	string		Queue HTML
- * @param	int			Page start
- * @param	string		New order
- * @param	string		Page links
- * @return	string		HTML
- */
-public function queueWrapper( $type, $name, $content, $st, $new_ord, $links ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$table_text			= mb_strtolower($name);
-$this->form_code	= 'module=members&amp;section=tools';
-$memberq			= sprintf( $this->lang->words['t_memberq'], $table_text );
-$_do 				= $this->request['do'];
-
-if( $_do == 'do_validating' )
-{
-	$_do = 'validating';
-}
-else if( $_do == 'do_locked' )
-{
-	$_do = 'locked';
-}
-else if( $_do == 'do_banned' )
-{
-	$_do = 'banned';
-}
-else if( $_do == 'do_spam' )
-{
-	$_do = 'spam';
-}
-else if( $_do == 'do_incomplete' )
-{
-	$_do = 'incomplete';
-}
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$memberq}</h2>
-</div>
-		
-<script type="text/javascript" src='{$this->settings['js_app_url']}ipsMemberQueue.js'></script>
-HTML;
-
-	if ( $_do == 'validating' )
-	{
-$IPBHTML .= <<<HTML
-<form name='selectform' id='selectform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$_do}' method='post'>
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-	<select name='filter'>
-		<option value='all'>{$this->lang->words['t_qshowall']}</option>
-		<option value='reg_user_validate'>{$this->lang->words['t_qshowreg']}</option>
-		<option value='reg_admin_validate'>{$this->lang->words['t_qshowadmin']}</option>
-		<option value='email_chg'>{$this->lang->words['t_qemailchange']}</option>
-		<option value='coppa'>{$this->lang->words['t_qcoppa']}</option>
-	</select>
-	<input type='submit' class='realbutton' value=' {$this->lang->words['t_qgobutton']} ' />
-</form>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-<form name='theAdminForm' id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=do_{$type}' method='post'>
-<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-{$links}
-<br style='clear: both' />
-
-<div class='acp-box'>
-	<h3>{$memberq}</h3>
-	<table class='alternate_rows double_pad' cellspacing='0' cellpadding='0'>
-		<tr>
-			<th width='1%'>&nbsp;</th>
-			<th>
-				{$this->lang->words['t_qdisplayname']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=mem&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=mem&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-			</th>
-HTML;
-
-if ( $type == 'incomplete' )
-	{
-		$IPBHTML .= <<<HTML
-				<th width='1%'>&nbsp;</th>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-			<th>
-				{$this->lang->words['t_qaddress']}
-HTML;
-
-	if ( $type != 'incomplete' )
-	{
-		$IPBHTML .= <<<HTML
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=email&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=email&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-			</th>
-HTML;
-
-	if ( $type != 'incomplete' )
-	{
-		$IPBHTML .= <<<HTML
-			<th>
-				{$this->lang->words['t_qposts']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=posts&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=posts&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>			
-			</th>
-HTML;
-	}
-
-$IPBHTML .= <<<HTML
-			
-			<th>
-HTML;
-	switch( $type )
-	{
-		case 'validating':
-			$IPBHTML .= <<<HTML
-				{$this->lang->words['t_qsent']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=sent&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=sent&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-HTML;
-		break;
-
-		case 'locked':
-			$IPBHTML .= <<<HTML
-				{$this->lang->words['t_qfailed']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=failed&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=failed&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-HTML;
-
-		case 'banned':
-			$IPBHTML .= <<<HTML
-				{$this->lang->words['t_qgroup']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=group&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=group&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-HTML;
-		break;
-		case 'incomplete':
-		case 'spam':
-			$IPBHTML .= <<<HTML
-				{$this->lang->words['t_qgroup']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=group&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=group&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-HTML;
-		break;
-		}
-		
-		$IPBHTML .= <<<HTML
-			</th>
-			<th>
-				{$this->lang->words['t_qjoined']}
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=joined&amp;ord=desc' title='{$this->lang->words['sort_desc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_desc.png' /></a>
-				<a href='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do={$type}&amp;st={$st}&amp;sort=joined&amp;ord=asc' title='{$this->lang->words['sort_asc']}'><img src='{$this->settings['skin_acp_url']}/_newimages/sort_asc.png' /></a>
-			</th>
-			<th style='text-align: center'><input type='checkbox' id='maincheckbox' onclick='check_boxes()' /></th>
-		</tr>
-		{$content}
-	</table>
-	<div class='acp-actionbar' style='text-align: right'>
-		<select name='type' id='manage_type' class='dropdown'>
-HTML;
-
-switch( $type )
-{
-	case 'validating':
-	$IPBHTML .= <<<HTML
-			<option value='approve'>{$this->lang->words['t_qapprove']}</option>
-			<option value='ban'>{$this->lang->words['t_qban']}</option>
-			<option value='spam'>{$this->lang->words['ts_spam_mark']}</option>
-			<option value='delete'>{$this->lang->words['t_qdelete']}</option>
-			<option value='resend'>{$this->lang->words['t_qresend']}</option>
-HTML;
-break;
-
-	case 'locked':
-	$IPBHTML .= <<<HTML
-			<option value='approve'>{$this->lang->words['t_qban']}</option>
-			<option value='delete'>{$this->lang->words['t_qdelete']}</option>
-			<option value='unlock'>{$this->lang->words['t_qunlock']}</option>
-HTML;
-break;
-
-	case 'banned':
-	$IPBHTML .= <<<HTML
-			<option value='unban'>{$this->lang->words['t_qunban']}</option>
-			<option value='delete'>{$this->lang->words['t_qdelete']}</option>
-HTML;
-break;
-	case 'incomplete':
-	$IPBHTML .= <<<HTML
-			<option value='delete'>{$this->lang->words['t_qdelete']}</option>
-			<option value='finalize'>{$this->lang->words['t_qfinalizepartial']}</option>
-HTML;
-break;
-
-	case 'spam':
-	$IPBHTML .= <<<HTML
-			<option value='unspam'>{$this->lang->words['ts_spam_un']}</option>
-			<option value='unspam_posts'>{$this->lang->words['ts_spam_un_posts']}</option>
-			<option value='ban'>{$this->lang->words['ts_spam_ban']}</option>
-			<option value='ban_blacklist'>{$this->lang->words['ts_spam_blacklist']}</option>
-HTML;
-break;
-}
-
-	$IPBHTML .= <<<HTML
-		</select>
-		<input type='submit' class='realbutton' value=' {$this->lang->words['t_processbutton']} ' />
-	</div>
-</div>
-{$links}
-</form>
-
-<script type='text/javascript'>
-
-if( $('manage_type') && $('adminform') )
-{
-	$('adminform').observe( 'submit', function(e) {
-		if( \$F('manage_type') == 'delete' )
-		{
-			if( !confirm("{$this->lang->words['rusure_tools_memform']}" ) )
-			{
-				Event.stop(e);
-				return false;
-			}
-		}
-	});
-}
-</script>
-HTML;
-
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * No rows in queue
- *
- * @access	public
- * @param	string		Language bit
- * @return	string		HTML
- */
-public function queueNoRows( $lang ) {
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td class='tablerow2' colspan='8'><strong>{$lang}</strong></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Validating row
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function validatingRow( $r="" ) {
-$IPBHTML = "";
-//--starthtml--//
-$daysandhours = sprintf( $this->lang->words['t_daysandhours'], $r['_days'], $r['_rhours'] );
-$image        = $r['spam_flag'] ? array( 'normal_spam.png', $this->lang->words['alt_spamuser'] ) : 
-				( ( $r['user_verified'] ) ? array( 'normal_tick.png', $this->lang->words['alt_normal'] ) : 
-				array( 'normal_lock.png', $this->lang->words['alt_unverifieduser'] ) );
-$color		  = ( $r['user_verified'] ) ? 'red' : 'green';
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/members/{$image[0]}' alt='{$image[1]}' title='{$image[1]}' /></td>
-  <td class='tablerow2'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><strong>{$r['members_display_name']}</strong></a>{$r['_coppa']}<div class='desctext'>{$this->lang->words['t_ipcolon']} <a href='{$this->settings['base_url']}&amp;module=members&amp;section=tools&amp;do=learn_ip&amp;ip={$r['ip_address']}'>{$r['ip_address']}</a></div></td>
-  <td class='tablerow1'>{$r['email']}</td>
-  <td class='tablerow1' align='center'>{$r['posts']}</td>
-  <td class='tablerow1'><span style='color:{$color}'>{$r['_where']}</span><br />{$r['_entry']}<div class='desctext'>{$daysandhours}</div></td>
-  <td class='tablerow1'>{$r['_joined']}</td>																
-  <td class='tablerow1' align='center'><input type='checkbox' id="mid_{$r['member_id']}" name='mid_{$r['member_id']}' value='1' /></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Locked row
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function lockedRow( $r="" ) {
-
-$failuresatlife = sprintf( $this->lang->words['t_failures'], $r['oldest_fail'], $r['newest_fail'], $r['failed_login_count'] );
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/members/normal_lock.png' alt='*' /></td>
-  <td class='tablerow2'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><strong>{$r['members_display_name']}</strong></a><div class='desctext'>{$this->lang->words['t_groupcolon']} {$r['group_title']}</div><div class='desctext'>{$r['ip_addresses']}</div></td>
-  <td class='tablerow1'>{$r['email']}</td>
-  <td class='tablerow1' align='center'>{$r['posts']}</td>
-  <td class='tablerow1'>{$failuresatlife}</td>
-  <td class='tablerow1'>{$r['_joined']}</td>																
-  <td class='tablerow1' align='center'><input type='checkbox' id="mid_{$r['member_id']}" name='mid_{$r['member_id']}' value='1' /></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Banned row
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function bannedRow( $r="" ) {
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/members/normal_alert.png' alt='*' /></td>
-  <td class='tablerow2'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><strong>{$r['members_display_name']}</strong></a></td>
-  <td class='tablerow1'>{$r['email']}</td>
-  <td class='tablerow1' align='center'>{$r['posts']}</td>
-  <td class='tablerow1'>{$r['group_title']}</td>
-  <td class='tablerow1'>{$r['_joined']}</td>																
-  <td class='tablerow1' align='center'><input type='checkbox' id="mid_{$r['member_id']}" name='mid_{$r['member_id']}' value='1' /></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Spam row
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function spamRow( $r="" ) {
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td><img src='{$this->settings['skin_acp_url']}/_newimages/members/normal_spam.png' alt='*' /></td>
-  <td class='tablerow2'><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><strong>{$r['members_display_name']}</strong></a></td>
-  <td class='tablerow1'>{$r['email']}</td>
-  <td class='tablerow1' align='center'>{$r['posts']}</td>
-  <td class='tablerow1'>{$r['group_title']}</td>
-  <td class='tablerow1'>{$r['_joined']}</td>																
-  <td class='tablerow1' align='center'><input type='checkbox' id="mid_{$r['member_id']}" name='mid_{$r['member_id']}' value='1' /></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Banned row
- *
- * @access	public
- * @param	array 		Record
- * @return	string		HTML
- */
-public function incompleteRow( $r="" ) {
-$IPBHTML = "";
-//--starthtml--//
-
-$publicUrl = $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/';
-
-$r['email']                = ( $r['_emailIsOk'] ) ? $r['email'] : '<em>' . $this->lang->words['inc_no_email'] . '</em>';
-$r['members_display_name'] = ( $r['_dnameIsOk'] ) ? $r['members_display_name'] : '<em>' . $this->lang->words['inc_no_dname'] . '</em>';
-$r['serviceImg']           = "<img src='{$this->settings['skin_acp_url']}/_newimages/members/internet.png' />";
-
-if ( $r['_regVia'] == 'facebook' )
-{
-	$r['serviceImg'] = "<a href='http://www.facebook.com/profile.php?id={$r['fb_uid']}' target='_blank'><img src='{$this->settings['skin_acp_url']}/_newimages/members/facebook.png' /></a>";
-}
-
-if ( $r['_regVia'] == 'twitter' )
-{
-	$r['serviceImg'] = "<img src='{$this->settings['skin_acp_url']}/_newimages/members/twitter.png' />";
-}
-
-if ( $r['_regVia'] == 'vkontakte' )
-{
-	$r['serviceImg'] = "<img src='{$this->settings['skin_acp_url']}/_newimages/members/vkontakte.png' />";
-}
-
-$IPBHTML .= <<<HTML
-<tr>
-  <td><a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><img src='{$r['pp_thumb_photo']}' style='width: 30px; height: 30px; border: 1px solid #d8d8d8' /></a></td>
-  <td class='tablerow2'>
-  	<a href='{$this->settings['base_url']}&amp;module=members&amp;section=members&amp;do=viewmember&amp;member_id={$r['member_id']}'><strong>{$r['members_display_name']}</strong></a>
-  	<div class='desctext' style='margin-top:4px'>{$this->lang->words['inc_m_name']}: {$r['name']}</div>
-  </td>
-  <td class='tablerow1'>{$r['serviceImg']}</td>
-  <td class='tablerow1'>{$r['email']}</td>
-  <td class='tablerow1'>{$r['group_title']}</td>
-  <td class='tablerow1'>{$r['_joined']}</td>																
-  <td class='tablerow1' align='center'><input type='checkbox' id="mid_{$r['member_id']}" name='mid_{$r['member_id']}' value='1' /></td>
-</tr>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
-
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/skin_cp/index.html b/upload/admin/applications/members/skin_cp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/skin_cp/index.html
+++ b/upload/admin/applications/members/skin_cp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/adminManage.php b/upload/admin/applications/members/sources/adminManage.php
new file mode 100644
index 00000000..4893097f
--- /dev/null
+++ b/upload/admin/applications/members/sources/adminManage.php
@@ -0,0 +1,898 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Library to facilitate ACP member management
+ * Last Updated: $Date: 2011-09-01 17:55:10 -0400 (Thu, 01 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @since		20th February 2002
+ * @version		$Rev: 9441 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class adminMemberManagement
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @var		object
+	 */	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	protected $lang;
+	/**#@-*/
+
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make object */
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->lang			= $this->registry->getClass('class_localization');
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+	}
+
+	/**
+	 * Delete member(s)
+	 *
+	 * @param	array 	Array of member ids
+	 * @param	string	Alternate language key to use
+	 * @return	string	Confirmation message
+	 */
+	public function deleteMembers( $ids, $lang='' )
+	{
+		//-----------------------------------------
+		// Filter if we cannot delete admins
+		//-----------------------------------------
+		
+		if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete_admin', 'members', 'members' ) )
+		{
+			$newIds	= array();
+	
+			$this->DB->build( array( 'select' => 'member_id, member_group_id, mgroup_others', 'from' => 'members', 'where' => "member_id IN(" . implode( ",", $ids ) . ")" ) );
+			$this->DB->execute();
+	
+			while( $r = $this->DB->fetch() )
+			{
+				if( $this->caches['group_cache'][ $r['member_group_id'] ]['g_access_cp'] )
+				{
+					continue;
+				}
+				else
+				{
+					$other_mgroups = explode( ',', IPSText::cleanPermString( $r['mgroup_others'] ) );
+					
+					if( count($other_mgroups) )
+					{
+						foreach( $other_mgroups as $other_mgroup )
+						{
+							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+							{
+								continue 2;
+							}
+						}
+					}
+				}
+				
+				$newIds[]	= $r['member_id'];
+			}
+			
+			$ids	= $newIds;
+		}
+
+		IPSMember::remove( $ids );
+
+		$message = sprintf( $lang ? $this->lang->words[ $lang ] : $this->lang->words['t_memdeleted'], count($ids) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Deny member(s) registrations
+	 *
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function denyMembers( $ids )
+	{
+		//-----------------------------------------
+		// Get names for log, and filter out admins if
+		// we do not have permission to delete them
+		//-----------------------------------------
+		
+		$denied	= array();
+		$newIds	= array();
+
+		$this->DB->build( array( 'select' => 'member_id, member_group_id, mgroup_others, members_display_name', 'from' => 'members', 'where' => "member_id IN(" . implode( ",", $ids ) . ")" ) );
+		$this->DB->execute();
+
+		while( $r = $this->DB->fetch() )
+		{
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_delete_admin', 'members', 'members' ) )
+			{
+				if( $this->caches['group_cache'][ $r['member_group_id'] ]['g_access_cp'] )
+				{
+					continue;
+				}
+				else
+				{
+					$other_mgroups = explode( ',', IPSText::cleanPermString( $r['mgroup_others'] ) );
+					
+					if( count($other_mgroups) )
+					{
+						foreach( $other_mgroups as $other_mgroup )
+						{
+							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+							{
+								continue 2;
+							}
+						}
+					}
+				}
+			}
+			
+			$denied[]	= $r['members_display_name'];
+			$newIds[]	= $r['member_id'];
+		}
+
+		IPSMember::remove( $ids );
+
+		$message = sprintf( $this->lang->words['t_regdenied'], count($ids), implode( ", ", $denied ) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Ban member(s)
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function banMembers( $ids )
+	{
+		//-----------------------------------------
+		// Filter if we cannot delete admins
+		//-----------------------------------------
+		
+		if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban_admin', 'members', 'members' ) )
+		{
+			$newIds	= array();
+			
+			$this->DB->build( array( 'select' => 'member_id, member_group_id, mgroup_others', 'from' => 'members', 'where' => "member_id IN(" . implode( ",", $ids ) . ")" ) );
+			$this->DB->execute();
+	
+			while( $r = $this->DB->fetch() )
+			{
+				if( $this->caches['group_cache'][ $r['member_group_id'] ]['g_access_cp'] )
+				{
+					continue;
+				}
+				else
+				{
+					$other_mgroups = explode( ',', IPSText::cleanPermString( $r['mgroup_others'] ) );
+					
+					if( count($other_mgroups) )
+					{
+						foreach( $other_mgroups as $other_mgroup )
+						{
+							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+							{
+								continue 2;
+							}
+						}
+					}
+				}
+				
+				$newIds[] = $r['member_id'];
+			}
+			
+			$ids = $newIds;
+		}
+		
+		if( count($ids) )
+		{
+			$this->DB->update( 'members', array( 'failed_logins' => '', 'failed_login_count' => 0, 'member_banned' => 1 ), "member_id IN (" . implode( ",", $ids ) . ")" );
+			
+			$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
+		}
+
+		$message = sprintf( $this->lang->words['t_membanned'], count($ids) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Unban member(s)
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function unbanMembers( $ids )
+	{
+		$members = IPSMember::load( $ids );
+
+		foreach( $members as $id => $data )
+		{
+			if( $data['member_group_id'] == $this->settings['banned_group'] )
+			{
+				$group	= $this->settings['member_group'];
+			}
+			else
+			{
+				$group	= $data['member_group_id'];
+			}
+
+			IPSMember::save( $id, array( 'core' => array( 'member_banned' => 0, 'member_group_id' => $group ) ) );
+		}
+
+		$message = sprintf( $this->lang->words['t_memunbanned'], count($ids) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+	
+	/**
+	 * Marks member(s) as spam
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function markMembersAsSpam( $ids )
+	{
+		/* Grab members */
+		$members = IPSMember::load( $ids );
+
+		/* Load moderator's library */
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+		$modLibrary	=  new $classToLoad( $this->registry );
+
+		/* Load custom profile fields class */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields      = new $classToLoad();
+
+		/* Load language file */
+		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_mod' ), 'forums' );
+
+		foreach( $members as $member_id => $member )
+		{
+			$toSave = array( 'core' => array( 'bw_is_spammer' => 1, 'member_group_id' => $this->settings['member_group'] ) );
+
+			/* Protected group? */
+			if ( strstr( ','.$this->settings['warn_protected'].',', ','.$member['member_group_id'].',' ) )
+			{
+				continue;
+			}
+
+			/* What do to.. */
+			if ( $this->settings['spm_option'] )
+			{
+				switch( $this->settings['spm_option'] )
+				{
+					case 'disable':
+						$toSave['core']['restrict_post']      = 1;
+						$toSave['core']['members_disable_pm'] = 2;
+					break;
+					case 'unapprove':
+						$toSave['core']['restrict_post']      = 1;
+						$toSave['core']['members_disable_pm'] = 2;
+						/* Unapprove posts and topics */
+						$modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
+					break;
+					case 'ban':
+						/* Unapprove posts and topics */
+						$modLibrary->toggleApproveMemberContent( $member_id, FALSE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
+
+						$toSave	= array(
+										'core'				=> array(
+																	'member_banned'		=> 1,
+																	'title'				=> '',
+																	'bw_is_spammer'		=> 1,
+																	),
+										'extendedProfile'	=> array(
+																	'signature'			=> '',
+																	'pp_about_me'		=> '',
+																	)
+										);
+
+						//-----------------------------------------
+						// Photo
+						//-----------------------------------------
+						
+						$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+						$photos			= new $classToLoad( $this->registry );
+						$photos->remove( $member['member_id'] );
+
+						//-----------------------------------------
+						// Profile fields
+						//-----------------------------------------
+
+						$fields->member_data = $member;
+						$fields->initData( 'edit' );
+						$fields->parseToSave( array() );
+
+						if ( count( $fields->out_fields ) )
+						{
+							$toSave['customFields']	= $fields->out_fields;
+						}
+
+						//-----------------------------------------
+						// Update signature content cache
+						//-----------------------------------------
+
+						IPSContentCache::update( $member['member_id'], 'sig', '' );
+					break;
+				}
+			}
+
+			/* Send an email */
+			if ( $this->settings['spm_notify'] AND ( $this->settings['email_in'] != $this->memberData['email'] ) )
+			{
+				IPSText::getTextClass('email')->getTemplate( 'possibleSpammer' );
+
+				IPSText::getTextClass('email')->buildMessage( array(	'DATE'			=> $this->registry->class_localization->getDate( $member['joined'], 'LONG', 1 ),
+																		'MEMBER_NAME'	=> $member['members_display_name'],
+																		'IP'			=> $member['ip_address'],
+																		'EMAIL'			=> $member['email'],
+																		'LINK'			=> $this->registry->getClass('output')->buildSEOUrl( "showuser=" . $member['member_id'], 'public', $member['members_seo_name'], 'showuser') ) );
+
+				IPSText::getTextClass('email')->subject	= $this->lang->words['new_registration_email_spammer'] . ' ' . $this->settings['board_name'];
+				IPSText::getTextClass('email')->to		= $this->settings['email_in'];
+				IPSText::getTextClass('email')->sendMail();
+			}
+
+			/* Flag them as a spammer */
+			IPSMember::save( $member['member_id'], $toSave );
+
+			/* Send Spammer to Spam Service */
+			if( $this->settings['spam_service_send_to_ips'] )
+			{
+				IPSMember::querySpamService( $member['email'], $member['ip_address'], 'markspam' );
+			}
+		}
+
+		/* Remove validating rows */
+		$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
+
+		$message	= sprintf( $this->lang->words['t_setasspammers'], count($ids) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+	
+	/**
+	 * Unmarks member(s) as spam
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @param	bool	Unmark posts additionally
+	 * @return	string	Confirmation message
+	 */
+	public function unmarkMembersAsSpam( $ids, $unmarkPosts=false )
+	{
+		/* Load Member Data */
+		$members = IPSMember::load( $ids );
+
+		foreach( $ids as $i )
+		{
+			IPSMember::save( $i, array( 'core' => array( 'bw_is_spammer' => 0, 'restrict_post' => 0, 'members_disable_pm' => 0 ) ) );
+			
+			if( $this->settings['spam_service_send_to_ips'] )
+			{
+				IPSMember::querySpamService( $members[$i]['email'], $members[$i]['ip_address'], 'notspam' );
+			}
+			
+			$this->DB->update( 'validating', array( 'spam_flag' => 0 ), 'member_id=' . $i );
+		}
+		
+		if ( $unmarkPosts )
+		{
+			/* Toggle their content */
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/moderate.php', 'moderatorLibrary', 'forums' );
+			$modLibrary	=  new $classToLoad( $this->registry );
+
+			foreach( $ids as $id )
+			{
+				$modLibrary->toggleApproveMemberContent( $id, TRUE, 'all', intval( $this->settings['spm_post_days'] ) * 24 );
+				
+				/* Run member sync */
+				IPSLib::runMemberSync( 'onUnSetAsSpammer', array( 'member_id' => $id ) );
+			}
+		}
+
+		$message	= sprintf( $this->lang->words['t_memunspammed'], count($ids) );
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+	
+	/**
+	 * Bans spammers and optionally blacklists their data
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @param	bool	Blacklist additionally
+	 * @return	string	Confirmation message
+	 */
+	public function banSpammers( $ids, $blacklist=false )
+	{
+		//-----------------------------------------
+		// Load members
+		//-----------------------------------------
+		
+		$members	= IPSMember::load( $ids );
+			
+		foreach( $members as $i => $data )
+		{
+			//-----------------------------------------
+			// Filter if we cannot delete admins
+			//-----------------------------------------
+			
+			if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban_admin', 'members', 'members' ) )
+			{
+				if( $this->caches['group_cache'][ $data['member_group_id'] ]['g_access_cp'] )
+				{
+					continue;
+				}
+				else
+				{
+					$other_mgroups = explode( ',', IPSText::cleanPermString( $data['mgroup_others'] ) );
+					
+					if( count($other_mgroups) )
+					{
+						foreach( $other_mgroups as $other_mgroup )
+						{
+							if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+							{
+								continue 2;
+							}
+						}
+					}
+				}
+			}
+					
+			IPSMember::save( $i, array( 'core' => array( 'bw_is_spammer' => 0, 'member_banned' => 1 ) ) );
+		}
+
+		//-----------------------------------------
+		// Are we blacklisting too?
+		//-----------------------------------------
+		
+		if ( $blacklist )
+		{
+			$ips		= array();
+			$email		= array();
+			$ban		= array( 'ip' => array(), 'email' => array() );
+
+			if ( is_array( $members ) AND count( $members ) )
+			{
+				foreach( $members as $id => $data )
+				{
+					//-----------------------------------------
+					// Filter if we cannot delete admins
+					//-----------------------------------------
+					
+					if( ! $this->registry->getClass('class_permissions')->checkPermission( 'member_ban_admin', 'members', 'members' ) )
+					{
+						if( $this->caches['group_cache'][ $data['member_group_id'] ]['g_access_cp'] )
+						{
+							continue;
+						}
+						else
+						{
+							$other_mgroups = explode( ',', IPSText::cleanPermString( $data['mgroup_others'] ) );
+							
+							if( count($other_mgroups) )
+							{
+								foreach( $other_mgroups as $other_mgroup )
+								{
+									if( $this->caches['group_cache'][ $other_mgroup ]['g_access_cp'] )
+									{
+										continue 2;
+									}
+								}
+							}
+						}
+					}
+		
+					$ips[ $data['ip_address'] ]	= $data['ip_address'];
+					$email[ $data['email'] ]	= $data['email'];
+				}
+
+				if ( count( $ips ) )
+				{
+					/* IPS: Check for duplicate */
+					$this->DB->build( array(	'select'	=> '*',
+												'from'		=> 'banfilters',
+												'where'		=> "ban_content IN ('" . implode( "','", $ips ) . "') and ban_type='ip'" ) );
+					$this->DB->execute();
+
+					while( $row = $this->DB->fetch() )
+					{
+						$ban['ip'][] = $row['ban_content'];
+					}
+
+					/* Now insert.. */
+					foreach( $ips as $i )
+					{
+						if ( ! in_array( $i, $ban['ip'] ) )
+						{
+							/* Insert the new ban filter */
+							$this->DB->insert( 'banfilters', array( 'ban_type' => 'ip', 'ban_content' => $i, 'ban_date' => time() ) );
+							
+							/* Prevent it adding a second time */
+							$ban['ip'][]	= $i;
+						}
+					}
+				}
+
+				if ( count( $email ) )
+				{
+					/* IPS: Check for duplicate */
+					$this->DB->build( array(	'select'	=> '*',
+												'from'		=> 'banfilters',
+												'where'		=> "ban_content IN ('" . implode( "','", $email ) . "') and ban_type='email'" ) );
+					$this->DB->execute();
+
+					while( $row = $this->DB->fetch() )
+					{
+						$ban['email'][] = $row['ban_content'];
+					}
+
+					/* Now insert.. */
+					foreach( $email as $e )
+					{
+						if ( ! in_array( $e, $ban['email'] ) )
+						{
+							/* Insert the new ban filter */
+							$this->DB->insert( 'banfilters', array( 'ban_type' => 'email', 'ban_content' => $e, 'ban_date' => time() ) );
+						}
+					}
+				}
+			}
+		}
+
+		$message	= sprintf( $this->lang->words['t_membanned'], count($ids) );
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Unlock member(s)
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function unlockMembers( $ids )
+	{
+		foreach( $ids as $_id )
+		{
+			IPSMember::save( $_id, array( 'core' => array( 'failed_logins' => '', 'failed_login_count' => 0 ) ) );
+		}
+
+		$message	= sprintf( $this->lang->words['t_memunlocked'], count($ids) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+	
+	/**
+	 * Finalize member(s)
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function finalizeMembers( $ids )
+	{
+		$members	= IPSMember::load( $ids, 'core' );
+		$_total		= 0;
+		
+		foreach( $members as $member )
+		{
+			if( $member['name'] AND $member['members_display_name'] AND $member['email'] )
+			{
+				$this->DB->delete( 'members_partial', 'partial_member_id=' . $member['member_id'] );
+				$_total++;
+			}
+		}
+
+		$message	= sprintf( $this->lang->words['t_inc_finalized'], $_total );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Unapprove member email change
+	 *
+	 * @param	int 	Member ID
+	 * @return	string	Confirmation message
+	 * @throws	NO_VALIDATING_MEMBER
+	 */
+	public function unapproveEmailChange( $id )
+	{
+		$member	= $this->DB->buildAndFetch( array( 'select'		=> 'v.*',
+												   'from'		=> array( 'validating' => 'v' ),
+												   'where'		=> 'v.email_chg=1 AND v.member_id=' . intval($id),
+												   'add_join'	=> array( array( 'select' => 'm.member_group_id AS old_member_group',
+																				 'from'   => array( 'members' => 'm' ),
+																				 'where'  => 'm.member_id=v.member_id',
+																				 'type'   => 'left' ) )
+										   )	  );
+		
+		if( !$member['vid'] )
+		{
+			throw new Exception( "NO_VALIDATING_MEMBER" );
+		}
+
+		$this->DB->delete( "validating", "vid='{$member['vid']}'" );
+
+		IPSMember::save( $member['member_id'], array( 'core' => array( 'email' => $member['prev_email'], 'member_group_id' => $member['real_group'] ) ) );
+
+		IPSLib::runMemberSync( 'onGroupChange', $member['member_id'], $member['real_group'], $member['old_member_group'] );
+
+		$message	= sprintf( $this->lang->words['t_emailchangeun'], $member['member_id'] );
+		
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+	
+	/**
+	 * Approve member(s)
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function approveMembers( $ids )
+	{
+		IPSText::getTextClass('email')->getTemplate( "complete_reg" );
+
+		$approved = array();
+
+		//-----------------------------------------
+		// Get members
+		//-----------------------------------------
+
+		$this->DB->build( array( 'select'	=> 'v.*',
+										'from'	=> array( 'validating' => 'v' ),
+										'where'	=> "m.member_id IN(" . implode( ",", $ids ) . ")",
+										'add_join'	=> array(
+															array( 'select'	=> 'm.*',
+																	'from'	=> array( 'members' => 'm' ),
+																	'where'	=> 'm.member_id=v.member_id',
+																	'type'	=> 'left'
+																)
+															)
+							)		);
+		$main = $this->DB->execute();
+
+		while( $row = $this->DB->fetch( $main ) )
+		{
+			$approved[]	= $row['name'];
+
+			//-----------------------------------------
+			// Only approve if the user is validating
+			//-----------------------------------------
+
+			if ( $row['member_group_id'] != $this->settings['auth_group'] )
+			{
+				$row['real_group'] = $row['member_group_id'];
+				// Let's still "validate", but leave them in the group they're in
+				//continue;
+			}
+
+			//-----------------------------------------
+			// Don't approve if no real_group set
+			//-----------------------------------------
+
+			if ( !$row['real_group'] )
+			{
+				//$row['real_group'] = $this->settings['member_group'];
+				continue;
+			}
+
+			//-----------------------------------------
+			// We don't approve lost pass requests
+			//-----------------------------------------
+
+			if( $row['lost_pass'] == 1 )
+			{
+				continue;
+			}
+
+			if( $row['real_group'] != $row['member_group_id'] )
+			{
+				IPSMember::save( $row['member_id'], array( 'core' => array( 'member_group_id' => $row['real_group'] ) ) );
+			}
+
+			IPSText::getTextClass('email')->buildMessage( array() );
+
+			//-----------------------------------------
+			// Using 'name' on purpose
+			// @see http://forums.invisionpower.com/index.php?autocom=tracker&showissue=11564&view=findpost&p=45269
+			//-----------------------------------------
+
+			IPSText::getTextClass('email')->subject	= sprintf( $this->lang->words['subject__complete_reg'], $row['name'], $this->settings['board_name'] );
+			IPSText::getTextClass('email')->to		= $row['email'];
+			IPSText::getTextClass('email')->sendMail();
+
+			IPSLib::runMemberSync( 'onCompleteAccount', $row );
+			IPSLib::runMemberSync( 'onGroupChange', $row['member_id'], $row['real_group'], $row['member_group_id'] );
+		}
+
+		$this->DB->delete( 'validating', "member_id IN(" . implode( ",", $ids ) . ")" );
+
+		//-----------------------------------------
+		// Stats to Update?
+		//-----------------------------------------
+
+		$this->cache->rebuildCache( 'stats', 'global' );
+
+		$message	= sprintf( $this->lang->words['t_memregapp2'], count($ids), implode( ", ", $approved ) );
+
+		ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		
+		return $message;
+	}
+
+	/**
+	 * Resend member validation emails
+	 *
+	 * @note	Exceptions CAN bubble up, so you should still capture exceptions from calls to this method
+	 * @param	array 	Array of member ids
+	 * @return	string	Confirmation message
+	 */
+	public function resendValidationEmails( $ids )
+	{
+		$reset		= array();
+		$cant		= array();
+		$main_msgs	= array();
+
+		//-----------------------------------------
+		// Get members
+		//-----------------------------------------
+
+		$this->DB->build( array( 'select'	=> 'v.*',
+								 'from'		=> array( 'validating' => 'v' ),
+								 'where'	=> "m.member_id IN(" . implode( ",", $ids ) . ")",
+								 'add_join'	=> array( array( 'select' => 'm.member_id, m.members_display_name, m.email, m.member_group_id',
+															 'from'   => array( 'members' => 'm' ),
+															 'where'  => 'm.member_id=v.member_id',
+															 'type'   => 'left' ) )
+						)		);
+		$main = $this->DB->execute();
+
+		while( $row = $this->DB->fetch( $main ) )
+		{
+			if ( $row['member_group_id'] != $this->settings['auth_group'] )
+			{
+				continue;
+			}
+
+			if ( $row['lost_pass'] )
+			{
+				IPSText::getTextClass('email')->getTemplate("lost_pass");
+
+				IPSText::getTextClass('email')->buildMessage( array(
+																'NAME'			=> $row['members_display_name'],
+																'THE_LINK'		=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=lostpass&do=sendform&uid=" . $row['member_id'] . "&aid=" . $row['vid'],
+																'MAN_LINK'		=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=lostpass",
+																'EMAIL'			=> $row['email'],
+																'ID'			=> $row['member_id'],
+																'CODE'			=> $row['vid'],
+																'IP_ADDRESS'	=> $row['ip_address'],
+															)		);
+
+				IPSText::getTextClass('email')->subject	= $this->lang->words['t_passwordrec'] . $this->settings['board_name'];
+				IPSText::getTextClass('email')->to		= $row['email'];
+				IPSText::getTextClass('email')->sendMail();
+			}
+			else if ( $row['new_reg'] )
+			{
+				if( $row['user_verified'] )
+				{
+					$cant[]	= $row['members_display_name'];
+					continue;
+				}
+
+				IPSText::getTextClass('email')->getTemplate( "reg_validate" );
+
+				IPSText::getTextClass('email')->buildMessage( array(
+																'THE_LINK'	=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=register&do=auto_validate&uid=" . $row['member_id'] . "&aid=" . $row['vid'],
+																'NAME'		=> $row['members_display_name'],
+																'MAN_LINK'	=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=register&do=05",
+																'EMAIL'		=> $row['email'],
+																'ID'		=> $row['member_id'],
+																'CODE'		=> $row['vid'],
+															)		);
+
+				IPSText::getTextClass('email')->subject	= sprintf( $this->lang->words['t_regat'], $this->settings['board_name'] );
+				IPSText::getTextClass('email')->to		= $row['email'];
+				IPSText::getTextClass('email')->sendMail();
+			}
+			else if ( $row['email_chg'] )
+			{
+				IPSText::getTextClass('email')->getTemplate("newemail");
+
+				IPSText::getTextClass('email')->buildMessage( array(
+																'NAME'		=> $row['members_display_name'],
+																'THE_LINK'	=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=register&do=auto_validate&type=newemail&uid=" . $row['member_id'] . "&aid=" . $row['vid'],
+																'ID'		=> $row['member_id'],
+																'MAN_LINK'	=> $this->settings['board_url'] . "/index.php?app=core&module=global&section=register&do=user_validate",
+																'CODE'		=> $row['vid'],
+															)		);
+
+				IPSText::getTextClass('email')->subject	= sprintf( $this->lang->words['t_emailchange'], $this->settings['board_name'] );
+				IPSText::getTextClass('email')->to		= $row['email'];
+				IPSText::getTextClass('email')->sendMail();
+			}
+
+			$resent[]	= $row['members_display_name'];
+		}
+
+		if( count($resent) )
+		{
+			$message		= sprintf( $this->lang->words['tools_val_resent_log'], count($resent), implode( ", ", $resent ) );
+			$main_msgs[]	= $message;
+
+			ipsRegistry::getClass('adminFunctions')->saveAdminLog( $message );
+		}
+
+		if( count($cant) )
+		{
+			$main_msgs[]	= sprintf( $this->lang->words['t_valcannot'], implode( ", ", $cant ) );
+		}
+
+		return count($main_msgs) ? implode( "\n", $main_msgs ) : '';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/adminSearch.php b/upload/admin/applications/members/sources/adminSearch.php
new file mode 100644
index 00000000..c37e6ecf
--- /dev/null
+++ b/upload/admin/applications/members/sources/adminSearch.php
@@ -0,0 +1,935 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Library to facilitate ACP member searches
+ * Last Updated: $Date: 2011-09-20 21:18:18 -0400 (Tue, 20 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Members
+ * @link		http://hatynka.in
+ * @since		20th February 2002
+ * @version		$Rev: 9520 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class adminMemberSearch
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @var		object
+	 */	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	protected $lang;
+	/**#@-*/
+
+	/**
+	 * Data for HTML form
+	 *
+	 * @var		array
+	 */
+	protected $htmlPresets		= array();
+	
+	/**
+	 * Reset filters and pull all members
+	 *
+	 * @var		bool
+	 */
+	protected $showAllMembers	= false;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make object */
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->lang			= $this->registry->getClass('class_localization');
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+	}
+
+	/**
+	 * Generate context-menu filter boxes. 
+	 * Pass &_nosave=1 to not store / read from a cookie
+	 *
+	 * @author	Matt Mecham
+	 * @since	IPB 3.0.0
+	 * @return	array
+	 */
+	public function generateFilterBoxes()
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		static $_return		= array();
+		
+		if( count($_return) )
+		{
+			return $_return;
+		}
+
+		$form				= array();
+		$custom_field_data	= array();
+		$filters_preset		= 0;
+
+		//-----------------------------------------
+		// Custom filtering
+		//-----------------------------------------
+		
+		$member_string			= $this->request['string']					? trim( $this->request['string'] )					: '';
+		$member_contains		= $this->request['f_member_contains']		? trim( $this->request['f_member_contains'] )		: '';
+		$member_contains_type	= $this->request['f_member_contains_type']	? trim( $this->request['f_member_contains_type'] )	: '';
+		$member_contains_text	= $this->request['f_member_contains_text']	? trim( $this->request['f_member_contains_text'] )	: '';
+
+		$_member_contains		= array(	
+										0 => array( 'members_display_name'	, $this->lang->words['m_f_display']	),
+										1 => array( 'name'					, $this->lang->words['m_f_login']	),
+										2 => array( 'member_id'				, $this->lang->words['m_f_id']		),
+										3 => array( 'email'					, $this->lang->words['m_f_email']	),
+										4 => array( 'ip_address'			, $this->lang->words['m_f_ip']		),
+										5 => array( 'signature'				, $this->lang->words['m_f_sig']		) 
+										);
+
+		$_member_contains_type	= array(	
+										0 => array( 'contains'	, $this->lang->words['m_f_contains']	),
+										1 => array( 'equals'	, $this->lang->words['m_f_equals']		),
+										2 => array( 'begins'	, $this->lang->words['m_f_begins']		),
+										3 => array( 'ends'		, $this->lang->words['m_f_ends']		)
+										);
+
+		//-----------------------------------------
+		// Order by
+		//-----------------------------------------
+		
+		$order_by			= '';
+
+		$order_by			= $this->request['order_by'] ? $this->request['order_by'] : 'joined';
+
+		$_order_by			= array(
+									0 => array( 'joined'				, $this->lang->words['m_f_joined']		),
+									1 => array( 'members_l_username'	, $this->lang->words['m_f_slogin']		),
+									2 => array( 'members_l_display_name', $this->lang->words['m_f_sdisplay']	),
+									3 => array( 'email'					, $this->lang->words['m_f_email']		),
+									4 => array( 'posts'					, $this->lang->words['m_f_posts']		),
+									);
+
+		$order_direction	= $this->request['order_direction'] ? strtolower($this->request['order_direction']) : 'desc';
+
+		$_order_direction	= array(
+									0 => array( 'asc'	, $this->lang->words['m_f_orderaz']	),
+									1 => array( 'desc'	, $this->lang->words['m_f_orderza']	)
+									);
+
+		//-----------------------------------------
+		// Member status type
+		//-----------------------------------------
+		
+		$member_status		= ( $this->request['type'] AND in_array( $this->request['type'], array( 'all', 'banned', 'spam', 'validating', 'incomplete', 'locked' ) ) ) ? $this->request['type'] : 'all';
+		
+		$_member_status		= array(
+									0 => array( 'all',			$this->lang->words['m_f_sall'] ),
+									1 => array( 'banned',		$this->lang->words['m_f_sbanned'] ),
+									2 => array( 'spam',			$this->lang->words['m_f_sspam'] ),
+									3 => array( 'validating',	$this->lang->words['m_f_svalidating'] ),
+									4 => array( 'incomplete',	$this->lang->words['m_f_simpcomplete'] ),
+									5 => array( 'locked',		$this->lang->words['m_f_slocked'] ),
+									);
+
+		//-----------------------------------------
+		// Search type
+		//-----------------------------------------
+
+		$search_type		= $this->request['f_search_type'] ? $this->request['f_search_type'] : 'normal';
+
+		$_search_type		= array( 0 => array( 'normal', $this->lang->words['m_f_toedit'] ) );
+		
+		if( $this->registry->getClass('class_permissions')->checkPermission( 'member_delete' ) )
+		{
+			$_search_type[1]	= array( 'delete', $this->lang->words['m_f_todelete'] );
+		}
+		
+		if( $this->registry->getClass('class_permissions')->checkPermission( 'member_move' ) )
+		{
+			$_search_type[2]	= array( 'move', $this->lang->words['m_f_tomove'] );
+		}
+		
+		//-----------------------------------------
+		// Date ranges
+		//-----------------------------------------
+		
+		$date_reg_from		= $this->request['f_date_reg_from']		? trim( $this->request['f_date_reg_from'] )		: '';
+		$date_reg_to		= $this->request['f_date_reg_to']		? trim( $this->request['f_date_reg_to'] )		: '';
+		
+		$date_post_from		= $this->request['f_date_post_from']	? trim( $this->request['f_date_post_from'] )	: '';
+		$date_post_to		= $this->request['f_date_post_to']		? trim( $this->request['f_date_post_to'] )		: '';
+	
+		$date_active_from	= $this->request['f_date_active_from']	? trim( $this->request['f_date_active_from'] )	: '';
+		$date_active_to		= $this->request['f_date_active_to']	? trim( $this->request['f_date_active_to'] )	: '';
+		
+		//-----------------------------------------
+		// Groups
+		//-----------------------------------------
+		
+		$primary_group		= $this->request['f_primary_group']		? trim( $this->request['f_primary_group'] )		: 0;
+		$secondary_group	= $this->request['f_secondary_group']	? trim( $this->request['f_secondary_group'] )	: 0;
+		$include_secondary	= $this->request['f_inc_secondary']		? 1 : 0;
+		
+		$_primary_group		= array( 0 => array( '0', $this->lang->words['m_f_primany'] ) );
+		$_secondary_group	= array( 0 => array( '0', $this->lang->words['m_f_secany'] ) );
+
+		foreach( ipsRegistry::cache()->getCache('group_cache') as $_gdata )
+		{
+			$_primary_group[]	= array( $_gdata['g_id'] , $_gdata['g_title'] );
+			$_secondary_group[]	= array( $_gdata['g_id'] , $_gdata['g_title'] );
+		}
+
+		//-----------------------------------------
+		// Post counts
+		//-----------------------------------------
+		
+		$post_count			= ( $this->request['f_post_count'] || $this->request['f_post_count'] == '0' ) ? trim( $this->request['f_post_count'] ) : '';
+		$post_count_type	= ( $this->request['f_post_count_type'] ) ? trim( $this->request['f_post_count_type'] ) : '';
+
+		$_post_count_types	= array( 0 => array( 'lt'   , $this->lang->words['pc_lt'] ),
+								   	 1 => array( 'gt'  , $this->lang->words['pc_gt'] ),
+								   	 2 => array( 'eq'  , $this->lang->words['pc_eq'] ) );
+
+		//-----------------------------------------
+		// Reset filters if set to
+		//-----------------------------------------
+		
+		if( $this->request['reset_filters'] )
+		{
+			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', array() );
+		}
+		
+		//-----------------------------------------
+		// Retrieve filter from "cookie"
+		//-----------------------------------------
+
+		if ( ! $this->request['__update'] AND ! $this->request['_nosave'] )
+		{
+			$_cookie_array	= ipsRegistry::getClass('adminFunctions')->staffGetCookie( 'memberFilter' );
+			
+			if ( is_array( $_cookie_array ) AND count ( $_cookie_array ) )
+			{
+				$member_contains		= substr( $_cookie_array['c_member_contains'], 0,20 );
+				$member_contains_type	= substr( $_cookie_array['c_member_contains_type'], 0,20 );
+				$member_contains_text	= substr( $_cookie_array['c_member_contains_text'], 0,50 );
+				$member_status			= trim( IPSText::alphanumericalClean( $_cookie_array['c_member_status'] ) );
+				$member_string			= trim( $_cookie_array['c_member_string'] );
+				$post_count				= trim( IPSText::alphanumericalClean( $_cookie_array['c_post_count'] ) );
+				$post_count_type		= trim( IPSText::alphanumericalClean( $_cookie_array['c_post_count_type'] ) );
+				$order_by				= trim( IPSText::alphanumericalClean( $_cookie_array['c_order_by'] ) );
+				$order_direction		= trim( IPSText::alphanumericalClean( $_cookie_array['c_order_direction'] ) );
+				$date_reg_from			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_reg_from'], '/-' ) );
+				$date_reg_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_reg_to'], '/-' ) );
+				$date_post_from			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_post_from'], '/-' ) );
+				$date_post_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_post_to'], '/-' ) );
+				$date_active_from		= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_active_from'], '/-' ) );
+				$date_active_to			= trim( IPSText::alphanumericalClean( $_cookie_array['c_date_active_to'], '/-' ) );
+				$primary_group			= trim( IPSText::alphanumericalClean( $_cookie_array['c_primary_group'], '/-' ) );
+				$include_secondary		= trim( IPSText::alphanumericalClean( $_cookie_array['c_include_secondary'], '/-' ) );
+				$secondary_group		= trim( IPSText::alphanumericalClean( $_cookie_array['c_secondary_group'], '/-' ) );
+				$custom_field_cookie	= explode( '||', $_cookie_array['c_custom_fields'] );
+
+				if( 
+					$member_contains || $member_contains_type || $member_contains_text || $order_by || $order_direction ||
+					$date_reg_from || $date_reg_to || $date_post_from || $date_post_to || $date_active_from || $date_active_to || $primary_group ||
+					$secondary_group  || $post_count || $post_count_type || $include_secondary || $member_status || $member_string
+					)
+				{
+					$filters_preset	= 1;
+				}
+
+				if( is_array( $custom_field_cookie ) AND count($custom_field_cookie) )
+				{
+					foreach( $custom_field_cookie as $field )
+					{
+						$data											= explode( '==', $field );
+						$custom_field_data[ 'field_' . $data[0] ]		= $data[1];
+						ipsRegistry::$request[ 'field_' . $data[0] ]	= $data[1];
+
+						if( $data[1] )
+						{
+							$filters_preset	= 1;
+						}
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Get custom profile information
+		//-----------------------------------------
+
+		$custom_field_data	= count($custom_field_data) ? $custom_field_data : $_REQUEST;
+
+		foreach( $custom_field_data as $k => $v )
+		{
+			if( strpos( $k, 'ignore_field_' ) === 0 )
+			{
+				$key	= substr( $k, 13 );
+				
+				$custom_field_data[ 'field_' . $key ]	= '';
+			}
+		}
+
+		$classToLoad			= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+		$fields					= new $classToLoad();
+    	
+    	$fields->member_data	= $custom_field_data;
+    	$fields->initData( 'edit', 1 );
+    	$fields->parseToEdit();
+
+		$custom_field_data_imploded	= array();
+
+		foreach( $custom_field_data as $k => $v )
+		{
+			if( strpos( $k, 'field_' ) === 0 AND $v )
+			{
+				$custom_field_data_imploded[]	= substr( $k, 6 ) . '==' . $v;
+			}
+		}
+		
+		$custom_field_data_imploded	= implode( '||', $custom_field_data_imploded );
+		
+		//-----------------------------------------
+		// Generate form data
+		//-----------------------------------------
+
+		$form['_member_contains']		= $this->registry->output->formDropdown( 'f_member_contains'		, $_member_contains, $member_contains  );
+		$form['_member_contains_type']	= $this->registry->output->formDropdown( 'f_member_contains_type'	, $_member_contains_type, $member_contains_type );
+		$form['_member_contains_text']	= $this->registry->output->formInput('f_member_contains_text'	, $member_contains_text, 'f_member_contains_text', 15, '', ' no_width' );
+		$form['_member_status']			= $this->registry->output->formDropdown( 'type'						, $_member_status, $member_status  );
+		$form['_member_string']			= $this->registry->output->formSimpleInput('string'					, $member_string, 15 );
+		$form['_order_by']				= $this->registry->output->formDropdown( 'order_by'					, $_order_by, preg_replace( "#.*\.(.*)$#", "\\1", $order_by ) );
+		$form['_order_direction']		= $this->registry->output->formDropdown( 'order_direction'			, $_order_direction, $order_direction );
+		$form['_search_type']			= $this->registry->output->formDropdown( 'f_search_type'			, $_search_type, $search_type );
+		$form['_post_count']			= $this->registry->output->formSimpleInput('f_post_count'			, $post_count, 10 );
+		$form['_post_count_type']		= $this->registry->output->formDropdown( 'f_post_count_type'		, $_post_count_types, $post_count_type );
+		$form['_date_reg_from']			= $this->registry->output->formInput('f_date_reg_from'				, $date_reg_from, 'f_date_reg_from', 15, 'text', '', ' no_width' );
+		$form['_date_reg_to']			= $this->registry->output->formInput('f_date_reg_to'				, $date_reg_to, 'f_date_reg_to', 15, 'text', '', ' no_width' );
+		$form['_date_post_from']		= $this->registry->output->formInput('f_date_post_from'				, $date_post_from, 'f_date_post_from', 15, 'text', '', ' no_width' );
+		$form['_date_post_to']			= $this->registry->output->formInput('f_date_post_to'				, $date_post_to, 'f_date_post_to', 15, 'text', '', ' no_width' );
+		$form['_date_active_from']		= $this->registry->output->formInput('f_date_active_from'			, $date_active_from, 'f_date_active_from', 15, 'text', '', ' no_width' );
+		$form['_date_active_to']		= $this->registry->output->formInput('f_date_active_to'				, $date_active_to, 'f_date_active_to', 15, 'text', '', ' no_width' );
+		$form['_primary_group']			= $this->registry->output->formDropdown( 'f_primary_group'			, $_primary_group, $primary_group );
+		$form['_secondary_group']		= $this->registry->output->formDropdown( 'f_secondary_group'		, $_secondary_group, $secondary_group );
+		$form['_include_secondary']		= $this->registry->output->formCheckbox( 'f_inc_secondary'			, $include_secondary );
+
+		//-----------------------------------------
+		// Store the cooookie
+		// @see http://community.invisionpower.com/tracker/issue-19031-acp-members-page-always-thinks-its-being-filtered/
+		//-----------------------------------------
+		
+		if ( ( $this->request['__update'] OR $this->request['f_search_type'] ) AND ! $this->request['_nosave'] )
+		{
+			$_cookie = array(
+							'c_member_status'			=> $member_status,
+							'c_member_string'			=> $member_string,
+							'c_member_contains'			=> $member_contains,
+							'c_member_contains_type'	=> $member_contains_type,
+							'c_member_contains_text'	=> $member_contains_text,
+							'c_order_by'				=> preg_replace( "#.*\.(.*)$#", "\\1", $order_by ),
+							'c_order_direction'			=> $order_direction,
+							'c_post_count'				=> $post_count,
+							'c_post_count_type'			=> $post_count_type,
+							'c_date_reg_from'			=> $date_reg_from,
+							'c_date_reg_to'				=> $date_reg_to,
+							'c_date_post_from'			=> $date_post_from,
+							'c_date_post_to'			=> $date_post_to,
+							'c_date_active_from'		=> $date_active_from,
+							'c_date_active_to'			=> $date_active_to,
+							'c_primary_group'			=> $primary_group,
+							'c_secondary_group'			=> $secondary_group,
+							'c_include_secondary'		=> $include_secondary,
+							'c_custom_fields'			=> $custom_field_data_imploded
+							);
+
+			ipsRegistry::getClass('adminFunctions')->staffSaveCookie( 'memberFilter', $_cookie );
+
+		}
+
+		//-----------------------------------------
+		// Create filter boxes
+		//-----------------------------------------
+
+		$this->htmlPresets	= array( 'form' => $form, 'fields' => $fields, 'presets' => $filters_preset );
+	
+		//-----------------------------------------
+		// Return data
+		//-----------------------------------------
+		
+		$_return['custom_fields']	= '';
+		
+		if( is_array( $fields->out_fields ) AND count( $fields->out_fields ) )
+		{
+			foreach( $fields->out_fields as $id => $data )
+			{
+				$_return['custom_fields'][ $id ] = $fields->in_fields[ $id ];
+			}
+		}
+
+		foreach( array_keys( $form ) as $_key )
+		{
+			$__key = substr( $_key, 1 );
+			
+			$_return[ $__key ] = ${ $__key };
+		}
+
+		return $_return;
+	}
+	
+	/**
+	 * Get HTML presets
+	 *
+	 * @return	array
+	 */
+	public function getHtmlPresets()
+	{
+		if( !count($this->htmlPresets) )
+		{
+			$this->generateFilterBoxes();
+		}
+
+		return $this->htmlPresets;
+	}
+
+	/**
+	 * Get type of search performed
+	 *
+	 * @return	array
+	 */
+	public function getSearchType()
+	{
+		$data	= $this->generateFilterBoxes();
+		
+		return $data['search_type'];
+	}
+
+	/**
+	 * Get member search status type
+	 *
+	 * @return	array
+	 */
+	public function getMemberType()
+	{
+		$data	= $this->generateFilterBoxes();
+		
+		return $data['member_status'];
+	}
+	
+	/**
+	 * Reset filters - pull all members with no WHERE clause
+	 *
+	 * @return	@e void
+	 */
+	public function resetFilters()
+	{
+		$this->showAllMembers	= true;
+	}
+	
+	/**
+	 * Get search results count
+	 *
+	 * @param	string	[$extraQuery]	Extra query where clause
+	 * @return	int 	Number of search results
+	 */
+	public function getSearchResultsCount( $extraQuery='' )
+	{
+		$extra	= $extraQuery ? " AND " . $extraQuery : '';
+		$count	= $this->DB->buildAndFetch( array(
+													'select'	=> 'COUNT(*) as count',
+													'from'		=> array( 'members' => 'm' ),
+													'where'		=> $this->getWhereClause() . $extra,
+													'add_join'	=> array(
+																		array(
+																			'from'	=> array( 'profile_portal' => 'pp' ),
+																			'where'	=> 'pp.pp_member_id=m.member_id',
+																			'type'	=> 'left' 
+																			),
+																		array(
+																			'from'	=> array( 'pfields_content' => 'p' ),
+																			'where'	=> 'p.member_id=m.member_id',
+																			'type'	=> 'left' 
+																			),
+																		array(
+																			'from'	=> array( 'members_partial' => 'par' ),
+																			'where'	=> 'par.partial_member_id=m.member_id',
+																			'type'	=> 'left' 
+																			),
+																		array(
+																			'from'		=> array( 'validating' => 'val' ),
+																			'where'		=> 'val.member_id=m.member_id',
+																			'type'		=> 'left'
+																			)
+																		)
+										)		);
+
+		return intval($count['count']);
+	}
+	
+	/**
+	 * Get search results
+	 *
+	 * @param	int		$st				Start offset
+	 * @param	int		$limit			Results limit
+	 * @param	string	[$extraQuery]	Extra query where clause
+	 * @param	bool	[$minimalInfo]	Only return ids and names
+	 * @return	array 	Array of search results, or an array with keys 'ids' and 'names' if $minimalInfo is true
+	 */
+	public function getSearchResults( $st, $limit, $extraQuery='', $minimalInfo=false )
+	{
+		$extra		= $extraQuery ? " AND " . $extraQuery : '';
+		$members	= array();
+		$ids		= array();
+		$names		= array();
+		
+		//-----------------------------------------
+		// Build query
+		//-----------------------------------------
+		
+		$query		= array(
+								'select'	=> 'm.*, m.member_id as mem_id, m.ip_address as mem_ip',
+								'from'		=> array( 'members' => 'm' ),
+								'where'		=> $this->getWhereClause() . $extra,
+								'order'		=> $this->getOrderByClause(),
+								'add_join'	=> array(
+													array(
+														'select'	=> 'p.*',
+														'from'		=> array( 'pfields_content' => 'p' ),
+														'where'		=> 'p.member_id=m.member_id',
+														'type'		=> 'left'
+														),
+													array(
+														'select'	=> 'pp.*',
+														'from'		=> array( 'profile_portal' => 'pp' ),
+														'where'		=> 'pp.pp_member_id=m.member_id',
+														'type'		=> 'left'
+														),
+													array(
+														'select'	=> 'par.*',
+														'from'		=> array( 'members_partial' => 'par' ),
+														'where'		=> 'par.partial_member_id=m.member_id',
+														'type'		=> 'left'
+														),
+													array(
+														'select'	=> 'val.*',
+														'from'		=> array( 'validating' => 'val' ),
+														'where'		=> 'val.member_id=m.member_id',
+														'type'		=> 'left'
+														)
+													)
+						);
+
+		if( $st OR $limit )
+		{
+			$query['limit']	= array( $st, $limit );
+		}
+		
+		//-----------------------------------------
+		// Execute query and return results
+		//-----------------------------------------
+		
+		$this->DB->build( $query );
+		$outer = $this->DB->execute();
+		
+		while( $r = $this->DB->fetch($outer) )
+		{
+			if( $minimalInfo )
+			{
+				$ids[ $r['mem_id'] ]					= $r['mem_id'];
+				$names[ $r['members_display_name'] ]	= $r['members_display_name'];
+			}
+			else
+			{
+				$r['member_id']				= $r['mem_id'];
+				$r['ip_address']			= $r['mem_ip'];
+				$r['_joined']				= $this->registry->class_localization->getDate( $r['joined'], 'JOINED' );
+				$r['group_title']			= $this->caches['group_cache'][ $r['member_group_id'] ]['g_title'];
+	
+				$members[ $r['member_id'] ]	= IPSMember::buildDisplayData( $r );
+			}
+		}
+
+		return $minimalInfo ? array( 'ids' => $ids, 'names' => $names ) : $members;
+	}
+	
+	/**
+	 * Get the ORDER BY part of the SQL query
+	 *
+	 * @return	string	SQL ORDER BY string
+	 */
+	public function getOrderByClause()
+	{
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$data			= $this->generateFilterBoxes();
+
+		switch( $data['order_direction'] )
+		{
+			case 'asc':
+				$order_direction = 'asc';
+			break;
+			default:
+			case 'desc':
+				$order_direction = 'desc';
+			break;
+		}
+		
+		switch( $data['order_by'] )
+		{
+			default:
+			case 'joined':
+				$order_by  = 'm.joined';
+			break;
+			case 'members_l_username':
+				$order_by  = 'm.members_l_username';
+			break;
+			case 'members_l_display_name':
+			case 'members_display_name':
+				$order_by  = 'm.members_l_display_name';
+			break;
+			case 'email':
+				$order_by  = 'm.email';
+			break;
+			case 'posts':
+				$order_by  = 'm.posts';
+			break;
+		}
+		
+		return $order_by . ' ' . $order_direction;
+	}
+		
+	/**
+	 * Get the WHERE part of the SQL query
+	 *
+	 * @return	string	SQL WHERE string
+	 */
+	public function getWhereClause()
+	{
+		//-----------------------------------------
+		// Ignore filters?
+		//-----------------------------------------
+		
+		if( $this->showAllMembers )
+		{
+			return '';
+		}
+
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$data			= $this->generateFilterBoxes();
+		$_sql			= array();
+
+		//-----------------------------------------
+		// Filters
+		//-----------------------------------------
+		
+		if ( $data['member_contains_text'] )
+		{
+			$_field	= '';
+			$_text	= $this->DB->addSlashes( $data['member_contains_text'] );
+
+			switch( $data['member_contains'] )
+			{
+				default:
+				case 'member_id':
+					$_field = 'm.member_id';
+				break;
+
+				case 'name':
+					$_field = 'm.members_l_username';
+					$_text	= strtolower( $_text  );
+				break;
+
+				case 'members_display_name':
+					$_field = 'm.members_l_display_name';
+					$_text	= strtolower( $_text  );
+				break;
+				case 'email':
+					$_field = 'm.email';
+				break;
+				case 'ip_address':
+					$_field = 'm.ip_address';
+				break;
+				case 'signature':
+					$_field = 'pp.signature';
+				break;
+			}
+
+			switch( $data['member_contains_type'] )
+			{
+				default:
+				case 'contains':
+					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "%'";
+				break;
+				case 'begins':
+					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '" . $_text . "%'";
+				break;
+				case 'ends':
+					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " LIKE '%" . $_text . "'";
+				break;
+				case 'equals':
+					$_sql[] = $this->DB->buildCast( $_field, 'VARCHAR' ) . " = '" . $_text . "'";
+				break;
+			}
+		}
+		
+		//-----------------------------------------
+		// "Simple" all-in-one search
+		//-----------------------------------------
+		
+		if( $data['member_string'] AND strlen($data['member_string']) >= 3 )
+		{
+			$_text	= $this->DB->addSlashes( $data['member_string'] );
+
+			$_sql[]	= '(' . $this->DB->buildCast( 'm.name', 'VARCHAR' ) . " LIKE '%" . $_text . "%' OR " .
+						$this->DB->buildCast( 'm.members_display_name', 'VARCHAR' ) . " LIKE '%" . $_text . "%' OR " .
+						$this->DB->buildCast( 'm.email', 'VARCHAR' ) . " LIKE '%" . $_text . "%' OR " .
+						$this->DB->buildCast( 'm.ip_address', 'VARCHAR' ) . " LIKE '%" . $_text . "%')";
+		}
+
+		//-----------------------------------------
+		// Group limiting
+		//-----------------------------------------
+		
+		if ( $data['primary_group'] )
+		{
+			if( $data['include_secondary'] )
+			{
+				$_sql[]	= "( m.member_group_id=" . intval( $data['primary_group'] ) . " OR " . 
+							"m.mgroup_others LIKE '%," . intval( $data['primary_group'] ) . ",%' OR " .
+							"m.mgroup_others LIKE '" . intval( $data['primary_group'] ) . ",%' OR " .
+							"m.mgroup_others LIKE '%," . intval( $data['primary_group'] ) . "' OR " .
+							"m.mgroup_others='" . intval( $data['primary_group'] ) . "' )";
+			}
+			else
+			{
+				$_sql[]	= "m.member_group_id=" . intval( $data['primary_group'] );
+			}
+		}
+
+		if ( $data['secondary_group'] )
+		{
+			$_sql[] = "( m.mgroup_others LIKE '%," . $data['secondary_group'] . ",%' OR " .
+						"m.mgroup_others LIKE '" . $data['secondary_group'] . ",%' OR " .
+						"m.mgroup_others LIKE '%," . $data['secondary_group'] . "' OR " .
+						"m.mgroup_others='" . $data['secondary_group'] . "' )";
+		}
+
+		//-----------------------------------------
+		// Post count
+		//-----------------------------------------
+		
+		if ( ( $data['post_count'] OR $data['post_count'] == '0' ) AND $data['post_count_type'] )
+		{
+			$_type	= '';
+			
+			if( $data['post_count_type'] == 'gt' )
+			{
+				$_type	= '>';
+			}
+			else if( $data['post_count_type'] == 'lt' )
+			{
+				$_type	= '<';
+			}
+			else if( $data['post_count_type'] == 'eq' )
+			{
+				$_type	= '=';
+			}
+			
+			if( $_type )
+			{
+				$_sql[] = "m.posts" . $_type . intval( $data['post_count'] );
+			}
+		}
+
+		//-----------------------------------------
+		// Date filters
+		//-----------------------------------------
+
+		foreach( array( 'reg', 'post', 'active' ) as $_bit )
+		{
+			foreach( array( 'from', 'to' ) as $_when )
+			{
+				$bit	= 'date_' . $_bit . '_' . $_when;
+				
+				if ( $data[ $bit ] )
+				{
+					//-----------------------------------------
+					// mm/dd/yyyy instead of mm-dd-yyyy
+					//-----------------------------------------
+					
+					$data[ $bit ]	= str_replace( '/', '-', $data[ $bit ] );
+					
+					list( $month, $day, $year ) = explode( '-', $data[ $bit ] );
+
+					if ( ! checkdate( $month, $day, $year ) )
+					{
+						$this->registry->output->global_message	= sprintf($this->lang->words['m_daterange'], $month, $day, $year );
+					}
+					else
+					{
+						/* Bug #24067 */
+						/* Original fix caused this bug: http://community.invisionpower.com/tracker/issue-24416-search-dates-invalid-acp/
+							Changed to just verify the result is an int, as that is all that's needed to prevent DB error */
+						$time_int = mktime( 0, 0, 0, $month, $day, $year );
+						
+						if ( !is_int($time_int) )
+						{
+							$this->registry->output->global_message	= sprintf($this->lang->words['m_daterange'], $month, $day, $year );
+						}
+						else
+						{
+							switch( $_bit )
+							{
+								case 'reg':
+									$field = 'joined';
+								break;
+								case 'post':
+									$field = 'last_post';
+								break;
+								case 'active':
+									$field = 'last_activity';
+								break;
+							}
+		
+							if ( $_when == 'from' )
+							{
+								$_sql[] = 'm.' . $field . ' > ' . $time_int;
+							}
+							else
+							{
+								$_sql[] = 'm.' . $field . ' < ' . $time_int;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Custom fields...
+		//-----------------------------------------
+
+		if( is_array($data['custom_fields']) AND count($data['custom_fields']) )
+		{
+			foreach ( $data['custom_fields'] as $id => $value )
+	 		{
+ 				if ( $value )
+ 				{
+					if( $this->caches['profilefields'][ $id ]['pf_type'] == 'drop' )
+					{
+						$_sql[]	= "p.field_{$id}='" . $this->DB->addSlashes( $value ) . "'";
+					}
+					else if( $this->caches['profilefields'][ $id ]['pf_type'] == 'cbox' )
+					{
+						if ( count( $value ) )
+						{
+							foreach ( $value as $k => $v )
+							{
+								$_sql[]	= "p.field_{$id} LIKE '%|" . $this->DB->addSlashes( $k ) . "|%'";
+							}
+						}
+					}
+					else
+					{
+						$_sql[] = $this->caches['profilefields'][ $id ]['pf_search_type'] == 'loose' ? "p.field_{$id} LIKE '%" . $this->DB->addSlashes( $value ) . "%'" : "p.field_{$id} = '" . $this->DB->addSlashes( $value ) . "'";
+					}
+ 				}
+	 		}
+ 		}
+ 		
+		//-----------------------------------------
+		// Search member status type
+		//-----------------------------------------
+		
+		if ( $data['member_status'] )
+		{
+			switch( $data['member_status'] )
+			{
+				case 'banned':
+					$_sql[]	= "(m.member_banned=1 OR member_group_id=" . intval($this->settings['banned_group']) . ')';
+				break;
+
+				case 'spam':
+					$_sql[]	= '(' . IPSBWOptions::sql( 'bw_is_spammer', 'm.members_bitoptions', 'members', 'global', 'has' ) . ' OR val.spam_flag=1)';
+				break;
+				
+				case 'validating':
+					$_sql[] = "(val.lost_pass=0 AND val.vid " . $this->DB->buildIsNull( false ) . ")";
+				break;
+				
+				case 'incomplete':
+					$_sql[] = "par.partial_member_id " . $this->DB->buildIsNull( false );
+				break;
+
+				case 'locked':
+					if( $this->settings['ipb_bruteforce_attempts'] > 0 )
+					{
+						$_sql[] = "m.failed_login_count >= " . intval($this->settings['ipb_bruteforce_attempts']);
+					}
+					else
+					{
+						$_sql[] = "m.failed_login_count > 0";
+					}
+				break;
+				
+				default:
+				case 'all':
+					//-----------------------------------------
+					// Hide partial members if showing 'all', and
+					// we did not explicitly search
+					//-----------------------------------------
+					
+					if( !count($_sql) )
+					{
+						$_sql[]	= "par.partial_member_id " . $this->DB->buildIsNull();
+					}
+				break;
+			}
+		}
+
+		//-----------------------------------------
+		// Return search string
+		//-----------------------------------------
+		
+		return count($_sql) ? implode( " AND ", $_sql ) : '';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/classes/hooks/gateway.php b/upload/admin/applications/members/sources/classes/hooks/gateway.php
index 46ea2ceb..9b980067 100644
--- a/upload/admin/applications/members/sources/classes/hooks/gateway.php
+++ b/upload/admin/applications/members/sources/classes/hooks/gateway.php
@@ -3,28 +3,35 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Subscriptions Hooks Gateway "Handler"
  * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
- * Last Updated: $Date: 2010-07-15 21:31:17 -0400 (Thu, 15 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6661 $
+ * @version		$Revision: 8644 $
  */
 class members_hookGateway
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
-	 */	
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
@@ -34,14 +41,12 @@ class members_hookGateway
 	protected $memberData;
 	protected $cache;
 	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Method constructor
 	 *
-	 * @access	public
 	 * @param	object		Registry Object
-	 * @return	void
+	 * @return	@e void
 	 */
 	function __construct( ipsRegistry $registry )
 	{
@@ -81,7 +86,7 @@ class members_hookGateway
 		}
 		
 		/* Fetch */
-		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, array( 'limit' => 10, 'status_is_latest' => 1 ) );
+		$statuses = $this->registry->getClass('memberStatus')->fetch( $this->memberData, array( 'limit' => intval( $this->settings['status_sidebar_show_x'] ), 'status_is_latest' => 1, 'ownerOnly' => true ) );
 		
 		return $this->registry->getClass('output')->getTemplate('boards')->hookBoardIndexStatusUpdates( $statuses );
     }
diff --git a/upload/admin/applications/members/sources/classes/hooks/index.html b/upload/admin/applications/members/sources/classes/hooks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sources/classes/hooks/index.html
+++ b/upload/admin/applications/members/sources/classes/hooks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/classes/index.html b/upload/admin/applications/members/sources/classes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sources/classes/index.html
+++ b/upload/admin/applications/members/sources/classes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/classes/messaging/index.html b/upload/admin/applications/members/sources/classes/messaging/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sources/classes/messaging/index.html
+++ b/upload/admin/applications/members/sources/classes/messaging/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/classes/messaging/messengerFunctions.php b/upload/admin/applications/members/sources/classes/messaging/messengerFunctions.php
index 3dc063c6..53fb33c6 100644
--- a/upload/admin/applications/members/sources/classes/messaging/messengerFunctions.php
+++ b/upload/admin/applications/members/sources/classes/messaging/messengerFunctions.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Comments library
- * Last Updated: $Date: 2010-10-21 09:25:51 -0400 (Thu, 21 Oct 2010) $
+ * Last Updated: $Date: 2011-09-15 17:04:35 -0400 (Thu, 15 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 7009 $
+ * @version		$Revision: 9495 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -95,8 +95,8 @@ class messengerFunctions
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -252,7 +252,7 @@ class messengerFunctions
 	 * Mostly used for myconvo but added here for extensibility in the future
 	 *
 	 * @param	string
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addFolderFilter( $filter )
 	{
@@ -382,7 +382,7 @@ class messengerFunctions
 		
 		$file = IPSLib::getAppDir( 'members' ) . '/sql/messengerSearch_' . strtolower( $this->settings['sql_driver'] ) . '.php';
 		
-		if ( ! file_exists( $file ) )
+		if ( ! is_file( $file ) )
 		{
 			return $results;
 		}
@@ -420,11 +420,23 @@ class messengerFunctions
 			$_members = IPSMember::load( array_keys( $_memberIDs ), 'all' );
 		}
 		
+		/* Let's sort out the ignore & photos at once for everyone */
+		if( count($_members) )
+		{
+			foreach( $_members as $_mid => $_mdata )
+			{
+				$_mdata['_canBeBlocked'] = IPSMember::isIgnorable( $_mdata['member_group_id'], $_mdata['mgroup_others'], 'pm' );
+				
+				$_members[ $_mid ] = IPSMember::buildProfilePhoto( $_mdata );
+			}
+		}
+		
 		/* Final result parse */
 		foreach( $_results as $mtID => $mtData )
 		{
-			$mtData['_starterMemberData'] = $_members[ $mtData['mt_starter_id'] ];
-			$mtData['_toMemberData']      = $_members[ $mtData['mt_to_member_id'] ];
+			$mtData['_starterMemberData']	= $_members[ $mtData['mt_starter_id'] ];
+			$mtData['_toMemberData']		= $_members[ $mtData['mt_to_member_id'] ];
+			$mtData['_lastMsgAuthor']		= $_members[ $mtData['msg_author_id'] ];
 			
 			$mtData['_folderName']       = $this->_dirData[ $mtData['map_folder_id'] ]['real'];
 			
@@ -441,7 +453,7 @@ class messengerFunctions
 	 * @param	int			Member ID who is attempting to block
 	 * @param	int			Topic ID to apply block to
 	 * @param	boolean		TRUE is block, FALSE is unblock
-	 * @return	void
+	 * @return	@e void
 	 *
 	 * <code>
 	 * Exception Codes:
@@ -682,7 +694,7 @@ class messengerFunctions
 		$topicData           = $this->fetchTopicData( $topicID );
 		$memberData          = IPSMember::load( intval( $readingMemberID ), 'extendedProfile,groups' );
 		$currentParticipants = $this->fetchTopicParticipants( $topicID );
-		
+
 		//-----------------------------------------
 		// Can access this topic?
 		//-----------------------------------------
@@ -696,7 +708,7 @@ class messengerFunctions
 		// Build invited users
 		//-----------------------------------------
 		
-		$invitedUsersData = $this->checkAndReturnInvitedUsers( $invitedUsers, $memberData );
+		$invitedUsersData = $this->checkAndReturnInvitedUsers( $invitedUsers, $memberData, count($currentParticipants) );
 
 		if ( isset($invitedUsersData[ $topicData['mt_starter_id'] ]) )
 		{
@@ -1468,26 +1480,25 @@ class messengerFunctions
 				
 				IPSText::getTextClass('email')->getTemplate( "personal_convo_new_reply", $toMember['language'] );
 			
-				IPSText::getTextClass('email')->buildMessage( array(
-																	'NAME'		=> $toMember['members_display_name'],
-																	'POSTER'	=> $fromMemberData['members_display_name'],
-																	'TITLE'		=> $topicData['mt_title'],
-																	'TEXT'		=> $msgContent,
-																	'LINK'		=> "?app=members&module=messaging&section=view&do=findMessage&topicID={$topicID}&msgID=__firstUnread__" ) );	
+				IPSText::getTextClass('email')->buildMessage( array( 'NAME'		=> $toMember['members_display_name'],
+																	 'POSTER'	=> $fromMemberData['members_display_name'],
+																	 'TITLE'	=> $topicData['mt_title'],
+																	 'TEXT'		=> $msgContent,
+																	 'LINK'		=> "?app=members&module=messaging&section=view&do=findMessage&topicID={$topicID}&msgID=__firstUnread__" ) );	
 
-				IPSText::getTextClass('email')->subject	= sprintf( 
-																	IPSText::getTextClass('email')->subject, 
+				IPSText::getTextClass('email')->subject	= sprintf(  IPSText::getTextClass('email')->subject, 
 																	$this->registry->output->buildSEOUrl( 'showuser=' . $fromMemberData['member_id'], 'public', $fromMemberData['members_seo_name'], 'showuser' ), 
 																	$fromMemberData['members_display_name'],
 																	$this->registry->output->buildUrl( "app=members&module=messaging&section=view&do=findMessage&topicID={$topicID}&msgID=__firstUnread__", 'public' )
 																);
 																	
 				$notifyLibrary->setMember( $toMember );
-				$notifyLibrary->setFrom( $memberData );
+				$notifyLibrary->setFrom( $fromMemberData );
 				$notifyLibrary->setNotificationKey( 'reply_private_message' );
 				$notifyLibrary->setNotificationUrl( $this->registry->output->buildUrl( "app=members&module=messaging&section=view&do=findMessage&topicID={$topicID}&msgID=__firstUnread__", 'public' ) );
 				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
 				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+				$notifyLibrary->setMetaData( array( 'meta_area' => 'pm', 'meta_id' => $topicID, 'meta_app' => 'members' ) );
 				
 				try
 				{
@@ -1595,7 +1606,7 @@ class messengerFunctions
 			throw new Exception( 'TO_USER_DOES_NOT_EXIST' );
 		}
 		
-		if ( ! $fromMemberData['member_id'] AND $this->forceMessageToSend !== TRUE )
+		if ( empty( $fromMemberData['member_id'] ) AND $this->forceMessageToSend !== TRUE )
 		{
 			throw new Exception( 'FROM_USER_DOES_NOT_EXIST' );
 		}
@@ -1677,7 +1688,7 @@ class messengerFunctions
 		// Is this simply a copy-to?
 		//-----------------------------------------
 		
-		if ( $isCopyTo === TRUE )
+		if ( $isCopyTo === TRUE AND !$isDraft )
 		{
 			/* Send out the main one */
 			$this->sendNewPersonalTopic( $toMemberID, $fromMemberID, array(), $msgTitle, $_originalMessageContent, array( 'postKey' => $options['postKey'] ) );
@@ -1740,7 +1751,7 @@ class messengerFunctions
 				throw new Exception( 'TOPIC_ID_NOT_EXISTS' );
 			}
 			
-			$this->DB->force_data_type = array( 'mt_title' => 'string' );
+			$this->DB->setDataType( 'mt_title', 'string' );
 			
 			/* First off, update message_topics and message_posts... */
 			$this->DB->update( 'message_topics', array( 'mt_date' 		     => time(),
@@ -1751,7 +1762,7 @@ class messengerFunctions
 												        'mt_invited_members' => serialize( array_keys( $inviteUsersData ) ),
 												        'mt_to_count'        => count( array_keys( $inviteUsersData ) ) + 1,
 												        'mt_to_member_id'    => $toMemberData['member_id'],
-												        'mt_is_draft'        => $isDraft ), 'mt_id=' . $_topicData['mt_id'] );
+												        'mt_is_draft'        => intval( $isDraft ) ), 'mt_id=' . $_topicData['mt_id'] );
 								
 			/* Now the posts ... */
 			$this->DB->update( 'message_posts', array(    'msg_date'	      => time(),
@@ -1774,7 +1785,7 @@ class messengerFunctions
 		// Insert new...
 		//-----------------------------------------
 		else
-		{
+		{ 
 			$_messageTopicData = array( 
 										'mt_date'				=> time(),
 										'mt_title'				=> $msgTitle,
@@ -1790,7 +1801,7 @@ class messengerFunctions
 									);
 			
 			/* Create topic entry */
-			$this->DB->force_data_type = array( 'mt_title' => 'string' );
+			$this->DB->setDataType( 'mt_title', 'string' );
 			
 			/* Data Hook Location */
 			IPSLib::doDataHooks( $_messageTopicData, 'messengerSendTopicData' );
@@ -1816,7 +1827,7 @@ class messengerFunctions
 				
 			$msg_id = $this->DB->getInsertId();
 			
-			if( ! $isDraft )
+			if ( ! $isDraft )
 			{
 				IPSMember::save( $toMemberData['member_id'], array( 'core' => array( 'msg_count_new' => 'plus:1'  ) ) );
 			}
@@ -1910,9 +1921,9 @@ class messengerFunctions
 					$notifyLibrary->setFrom( $fromMemberData );
 					$notifyLibrary->setNotificationKey( 'new_private_message' );
 					$notifyLibrary->setNotificationUrl( $this->registry->output->buildUrl( "app=members&module=messaging&section=view&do=showConversation&topicID={$msg_topic_id}#msg{$msg_id}", 'public' ) );
-					$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+					$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->getPlainTextContent() );
 					$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-					
+					$notifyLibrary->setMetaData( array( 'meta_area' => 'pm', 'meta_id' => $msg_topic_id, 'meta_app' => 'members' ) );
 					try
 					{
 						$notifyLibrary->sendNotification();
@@ -2136,6 +2147,7 @@ class messengerFunctions
 	 *
 	 * @param	array 		Array of display names [ 'bob', 'joe', 'dave' ]
 	 * @param	array 		Optional[ Array of member data (group + core only required) ]
+	 * @param	int			Number of existing participants
 	 * @return	array 		Array of members, indexed by member_id
 	 *
 	 * <code>
@@ -2145,18 +2157,19 @@ class messengerFunctions
 	 * INVITE_USERS_BLOCKED:			Some invite users have been blocked (check $this->exceptionData for a list of names)
 	 * </code>
 	 */
-	public function checkAndReturnInvitedUsers( $names, $member=array() )
+	public function checkAndReturnInvitedUsers( $names, $member=array(), $current=0 )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$finalArray        = array();
-		$inviteArrayByID   = array();
-		$inviteArrayByName = array();
-		$member            = ( $member['member_id'] ) ? $member : $this->member->fetchMemberData();
-		$doesNotExist      = array();
-		$cannotUsePM       = array();
+		$finalArray			= array();
+		$inviteArrayByID	= array();
+		$inviteArrayByName	= array();
+		$member				= ( $member['member_id'] ) ? $member : $this->member->fetchMemberData();
+		$doesNotExist		= array();
+		$cannotUsePM		= array();
+		$current			= intval($current);
 		
 		if ( ! is_array( $names ) OR ! count( $names ) )
 		{
@@ -2184,8 +2197,9 @@ class messengerFunctions
 			$inviteArrayByName[ mb_strtolower($_member['members_l_display_name']) ] = $_member['member_id'];
 			
 			# Only allow the first X based on g_max_mass_pm
-			if ( count( $inviteArrayByID ) > $member['g_max_mass_pm'] )
+			if ( count( $inviteArrayByID ) + $current > $member['g_max_mass_pm'] )
 			{
+				throw new Exception( "MAX_USER_PM_LIMIT_HIT" );
 				break;
 			}
 			
@@ -2369,6 +2383,18 @@ class messengerFunctions
     	return $finalString;
 	}
 	
+	/**
+	 * Resets alert / count flag
+	 * @param mixed $memberID
+	 */
+	public function resetMembersAlertCounts( $memberID )
+	{
+		$memberData = ( is_numeric( $memberID ) ) ? IPSMember::load( $memberID, 'extendedProfile' ) : $memberID;
+		
+		IPSMember::save( $memberData['member_id'], array( 'core' => array( 'msg_count_new' => 0 ) ) );
+ 		IPSMember::setToMemberCache( $memberData, array( 'msgAlertReset' => IPS_UNIX_TIME_NOW ) );
+	}
+	
 	/**
 	 * Reset all folder counts
 	 *
@@ -2405,7 +2431,13 @@ class messengerFunctions
 		/* Save */
 		IPSMember::save( $memberData['member_id'], array( 'core'         	=> array( 'msg_count_reset' => 0 ),
 														  'extendedProfile' => array( 'pconversation_filters' => $dirs ) ) );
-														
+
+		/* Reset our counter */
+		if ( $memberID == $this->memberData['member_id'] )
+		{
+			$this->memberData['msg_count_reset'] = 0;
+		}
+			
 		return $dirs;
 	}
 	
@@ -2437,7 +2469,10 @@ class messengerFunctions
 		
 		foreach( $members as $id => $data )
 		{
-			$count  = intval( $this->getPersonalTopicsCount( $id, 'new') );
+			$count     = intval( $this->getPersonalTopicsCount( $id, 'new' ) );
+			
+			$lastReset     = intval( IPSMember::getFromMemberCache( $data, 'msgAlertReset' ) );
+			$msgAlertCount = intval( $this->getPersonalTopicsCount( $id, 'new', $lastReset ) );
 			
 			//-----------------------------------------
 			// Parse folder data
@@ -2449,13 +2484,15 @@ class messengerFunctions
 			$msg_show_notification = ( $count ) ? $data['msg_show_notification'] : 0;
 			
 			IPSMember::save( $id, array( 'extendedProfile'	=> array( 'pconversation_filters'	=> $this->implodeFolderData( $rebuild ) ),
-			 						     'core'				=> array( 'msg_count_new'			=> $count,
+			 						     'core'				=> array( 'msg_count_new'			=> $msgAlertCount,
 			 														  'msg_show_notification'	=> $msg_show_notification ) ) );
 			
+			IPSMember::setToMemberCache( $data, array( 'msgAlertReset' => IPS_UNIX_TIME_NOW ) );
+			
 			/* Reset our counter */
 			if ( $id == $this->memberData['member_id'] )
 			{
-				$this->memberData['msg_count_new'] = $count;
+				$this->memberData['msg_count_new'] = $msgAlertCount;
 			}
 		}
 		
@@ -2496,11 +2533,18 @@ class messengerFunctions
 	 *
 	 * @param	int			Member ID
 	 * @param	string		Folder ID (eg: inbox, sent, etc) [ Optional, if omitted, all msg box counts are returned ]
+	 * @param	int			Timestamp to check from
 	 * @return	mixed 		If folder ID: Number of messages, otherwise an array of folderID => count
 	 */
-	public function getPersonalTopicsCount( $memberID, $folderID='' )
+	public function getPersonalTopicsCount( $memberID, $folderID='', $time=null )
 	{
 		$return = array();
+		$where  = '';
+		
+		if ( is_numeric( $time ) )
+		{
+			$where = ( $folderID == 'drafts' ) ? ' AND mt_date > ' . $time : ' AND map_last_topic_reply > ' . $time;
+		}
 		
 		if ( $memberID and $folderID )
 		{
@@ -2509,7 +2553,7 @@ class messengerFunctions
 			{
 				$t = $this->DB->buildAndFetch( array ( 'select' => 'COUNT(*) as msg_total',
 													   'from'   => 'message_topic_user_map',
-													   'where'  => "map_user_active=1 AND map_user_id=" . intval( $memberID ) . " AND map_has_unread=1 AND map_ignore_notification=0" ) );
+													   'where'  => "map_user_active=1 AND map_user_id=" . intval( $memberID ) . " AND map_has_unread=1" . $where ) );
 													
 				return intval( $t['msg_total'] );
 			}
@@ -2518,7 +2562,7 @@ class messengerFunctions
 			{
 				$t = $this->DB->buildAndFetch( array ( 'select' => 'COUNT(*) as msg_total',
 													   'from'   => 'message_topics',
-													   'where'  => "mt_starter_id=" . intval( $memberID ) . " AND mt_is_draft=1 AND mt_is_deleted=0" ) );
+													   'where'  => "mt_starter_id=" . intval( $memberID ) . " AND mt_is_draft=1 AND mt_is_deleted=0" . $where ) );
 													
 				return intval( $t['msg_total'] );
 			}
@@ -2533,7 +2577,7 @@ class messengerFunctions
 					{
 						$t = $this->DB->buildAndFetch( array ( 'select' => 'COUNT(*) as msg_total',
 															   'from'   => 'message_topic_user_map',
-															   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "' AND map_is_starter=0" ) );
+															   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "' AND map_is_starter=0" . $where ) );
 
 						return intval( $t['msg_total'] );
 					}
@@ -2541,7 +2585,7 @@ class messengerFunctions
 					{
 						$t = $this->DB->buildAndFetch( array ( 'select' => 'COUNT(*) as msg_total',
 															   'from'   => 'message_topic_user_map',
-															   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "' AND map_is_starter=1" ) );
+															   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "' AND map_is_starter=1" . $where ) );
 
 						return intval( $t['msg_total'] );
 					}
@@ -2550,7 +2594,7 @@ class messengerFunctions
 				{
 					$t = $this->DB->buildAndFetch( array ( 'select' => 'COUNT(*) as msg_total',
 														   'from'   => 'message_topic_user_map',
-														   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "'" ) );
+														   'where'  => "map_user_id=" . intval( $memberID ) . " AND map_user_active=1 AND map_folder_id='" . $_folder . "'" . $where ) );
 
 					return intval( $t['msg_total'] );
 				}
@@ -2560,7 +2604,7 @@ class messengerFunctions
 		{
 			$this->DB->build( array( 'select' => 'COUNT(*) as msg_total, map_folder_id',
 									 'from'   => 'message_topic_user_map',
-									 'where'  => "map_is_system=0 AND map_user_active=1 AND map_user_id=" . intval( $memberID ),
+									 'where'  => "map_is_system=0 AND map_user_active=1 AND map_user_id=" . intval( $memberID ) . $where,
 									 'group'  => 'map_folder_id' ) );
 			$this->DB->execute();
 			
@@ -2650,7 +2694,7 @@ class messengerFunctions
 				$where = " AND mm.map_user_active=1 AND mt.mt_is_draft=1";
 			break;
 			case 'new':
-				$where = ' AND mm.map_user_active=1 AND mm.map_has_unread=1 AND map_ignore_notification=0';
+				$where = ' AND mm.map_user_active=1 AND mm.map_has_unread=1';
 			break;	
 		}
 		
@@ -2679,10 +2723,7 @@ class messengerFunctions
 															array( 'select' => 'mem.members_display_name',
 															       'from'   => array( 'members' => 'mem' ),
 															       'where'  => 'mt.mt_to_member_id=mem.member_id',
-															       'type'   => 'left',
-															)
-																
-																 ) ) );
+															       'type'   => 'left' ) ) ) );
  			$this->DB->execute();
 			
 	 		//-----------------------------------------
@@ -2754,27 +2795,38 @@ class messengerFunctions
 				$messages[ $row['mt_id'] ] = $row;
 			}
 			
+			$members	= array();
+			
 			/* Got any members? */
 			if ( count( $_memberIDs ) )
 			{
-				$members = IPSMember::load( $_memberIDs, 'core' );
+				$members = IPSMember::load( $_memberIDs, 'all' );
 			}
 			
+			/* Let's sort out the ignore & photos at once for everyone */
+			if( count($members) )
+			{
+				foreach( $members as $_mid => $_mdata )
+				{
+					$_mdata['_canBeBlocked'] = IPSMember::isIgnorable( $_mdata['member_group_id'], $_mdata['mgroup_others'], 'pm' );
+					
+					$members[ $_mid ] = IPSMember::buildProfilePhoto( $_mdata );
+				}
+			}
+			
+			$members[ 0 ]	= IPSMember::buildProfilePhoto( array( 'members_display_name' => $this->lang->words['deleted_user'] ) );
+			
 			/* Now merge (in turn!) */
 			foreach( $messages as $id => $row )
 			{
 				/* From */
-				$_member = $members[ $row['mt_starter_id'] ];
-				$messages[ $id ]['_starterMemberData']                  = $_member;
-				$messages[ $id ]['_starterMemberData']['_canBeBlocked'] = IPSMember::isIgnorable( $_member['member_group_id'], $_member['mgroup_others'], 'pm' );
+				$messages[ $id ]['_starterMemberData']	= $members[ $row['mt_starter_id'] ];
 				
 				/* To */
-				$_member = $members[ $row['mt_to_member_id'] ];
-				$messages[ $id ]['_toMemberData']                  = $_member;
-				$messages[ $id ]['_toMemberData']['_canBeBlocked'] = IPSMember::isIgnorable( $_member['member_group_id'], $_member['mgroup_others'], 'pm' );
+				$messages[ $id ]['_toMemberData']		= $members[ $row['mt_to_member_id'] ];
 				
 				/* Last msg author */
-				$messages[ $id ]['_lastMsgAuthor'] = $members[ $row['msg_author_id'] ];
+				$messages[ $id ]['_lastMsgAuthor']		= $members[ $row['msg_author_id'] ];
 				
 				/* Invitees */
 				if ( is_array( $row['_invitedMembers'] ) AND count( $row['_invitedMembers'] ) )
@@ -2933,9 +2985,26 @@ class messengerFunctions
 				/* Member missing? */
 				if ( ! isset($memberData[ $msg['msg_author_id'] ]) )
 				{
-					$missingMembers[ $msg['msg_author_id'] ] = $msg['msg_author_id'];
+					if( !$msg['msg_author_id'] )
+					{
+						$memberData[0]	= array();
+					}
+					else
+					{
+						$missingMembers[ $msg['msg_author_id'] ] = $msg['msg_author_id'];
+					}
 				}
-				
+				else
+				{
+					if ( ! empty( $memberData[ $msg['msg_author_id'] ]['signature'] ) )
+					{					
+						if ( ! $this->memberData['view_sigs'] || ( $msg['msg_author_id'] && $this->memberData['member_id'] && ! empty( $this->member->ignored_users[ $msg['msg_author_id'] ]['ignore_signatures'] ) ) )
+						{
+							$memberData[ $msg['msg_author_id'] ]['signature'] = '';
+						}
+					}
+				}
+
 				$replyData[ $msg['msg_id'] ] = $msg;
 			}
 		}
@@ -2961,8 +3030,11 @@ class messengerFunctions
 		
 		if ( $memberData[ $readingMemberID ]['map_has_unread'] )
 		{
+			$lastReset     = intval( IPSMember::getFromMemberCache( $memberData[ $readingMemberID ], 'msgAlertReset' ) );
+			$msgAlertCount = intval( $this->getPersonalTopicsCount( $readingMemberID, 'new', $lastReset ) );
+			
 			$_pc = $this->rebuildFolderCount( $readingMemberID, array( 'new' => $_newMsgs ), TRUE );
-			IPSMember::save( $readingMemberID, array( 'core' => array( 'msg_count_new' => $_newMsgs, 'msg_show_notification' => 0 ) ) );
+			IPSMember::save( $readingMemberID, array( 'core' => array( 'msg_count_new' => $msgAlertCount, 'msg_show_notification' => 0 ) ) );
 			
 			/* is this us? */
 			if ( $readingMemberID == $this->memberData['member_id'] )
@@ -2971,22 +3043,25 @@ class messengerFunctions
 				$this->_dirData = $this->explodeFolderData( $_pc );
 				
 				/* Reset global new count */
-				$this->memberData['msg_count_new'] = $_newMsgs;
+				$this->memberData['msg_count_new'] = $msgAlertCount;
 			}
  		}
 
 		/* Clean up topic title */
 		$topicData['mt_title'] = str_replace( '[attachmentid=', '&#91;attachmentid=', $topicData['mt_title'] );
 		
+		/* Flag externals as read */
+		$this->_flagAsReadForExternals( array( $topicID ) );
+		
 		/* Ensure our read time is updated */
 		$memberData[ $readingMemberID ]['map_read_time'] = time();
 		
 		/* Do we  have a deleted user? */
 		if ( isset( $memberData[0] ) AND $memberData[0]['member_id'] == 0 )
 		{
-			$memberData[0] = IPSMember::buildDisplayData(IPSMember::setUpGuest( $this->lang->words['deleted_member'] ), array( '__all__' => 1 ) );
+			$memberData[0] = IPSMember::buildDisplayData(IPSMember::setUpGuest( $this->lang->words['deleted_user'] ), array( '__all__' => 1 ) );
 		}
-		
+
 		//-----------------------------------------
 		// Attachments?
 		//-----------------------------------------
@@ -3033,6 +3108,26 @@ class messengerFunctions
 			}
 		}
 		
+		/* Check to make sure we're not the only one left with this topic */
+		$active = 0;
+		
+		foreach( $memberData as $id => $data )
+		{
+			if ( $id !== $readingMemberID )
+			{
+				if ( $data['map_user_active'] )
+				{
+					$active++;
+					break; // 1 active is enough
+				}
+			}
+		}
+		
+		if ( ! $active )
+		{
+			$topicData['_everyoneElseHasLeft'] = 1;
+		}
+		
 		/* Return */
 		return array( 'topicData' => $topicData, 'replyData' => $replyData, 'memberData' => $memberData );
 	}
@@ -3307,7 +3402,7 @@ class messengerFunctions
 		{
 			foreach( $groups_id as $pid )
 			{
-				if ( ! isset($groupCache[ $pid ]['g_id']) OR ! $groupCache[ $pid ]['g_id'] )
+				if ( empty($groupCache[ $pid ]['g_id']) )
 				{
 					continue;
 				}
@@ -3363,7 +3458,7 @@ class messengerFunctions
  			
  			$totals['full_percent'] = $total['msg_total'] ? sprintf( "%.0f", ( ($total['msg_total'] / $this->memberData['g_max_messages']) * 100) ) : 0;
 			$totals['full_percent'] = ( $totals['full_percent'] > 100 ) ? 100 : $totals['full_percent'];
- 			$totals['img_width']    = isset( $info['full_percent'] ) && $info['full_percent'] > 0 ? intval($info['full_percent']) * 2.4 : 1;
+ 			$totals['img_width']    = !empty( $info['full_percent'] ) ? intval($info['full_percent']) * 2.4 : 1;
  			
  			if ($totals['img_width'] > 300)
  			{
@@ -3508,6 +3603,30 @@ class messengerFunctions
 		return $msgData;
 	}
 	
+	/**
+	 * Fetch Message Data by ID
+	 *
+	 * @param	int			Msg ID
+	 * @param	boolean		Load starter member data with it
+	 * @return	array 		Message data
+	 */
+	public function fetchMessageDataById( $msgID, $loadMember=FALSE )
+	{ 
+		$msgData   = $this->DB->buildAndFetch( array( 'select' => '*',
+										 			  'from'   => 'message_posts',
+										 			  'where'  => 'msg_id=' . intval( $msgID ) ) );
+		
+		if ( $loadMember AND $msgData['msg_author_id'] )
+		{
+			$memberData                  = IPSMember::load( $msgData['msg_author_id'], 'all' );
+			$memberData['_canBeBlocked'] = IPSMember::isIgnorable( $memberData['member_group_id'], $memberData['mgroup_others'], 'pm' );
+			$memberData                  = IPSMember::buildDisplayData( $memberData, array( '__all__' => 1 ) );
+			$msgData                     = array_merge( $msgData, $memberData );
+		}
+		
+		return $msgData;
+	}	
+	
 	/**
 	 * Fetch topic Data with first message information
 	 *
@@ -3670,12 +3789,12 @@ class messengerFunctions
 		// Now we have safe HTML and bbcode
 		//-----------------------------------------
 		
-		$this->settings[ 'max_emos'] =  0 ;
+		$this->settings['max_emos'] =  0 ;
 
  		IPSText::getTextClass('bbcode')->parse_smilies				= 1;
  		IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
- 		IPSText::getTextClass('bbcode')->parse_html					= $this->settings['msg_allow_html'];
- 		IPSText::getTextClass('bbcode')->parse_bbcode				= $this->settings['msg_allow_code'];
+ 		IPSText::getTextClass('bbcode')->parse_html					= 0;//$this->caches['group_cache'][ $data['member_group_id'] ]['g_dohtml'];
+ 		IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
  		IPSText::getTextClass('bbcode')->parsing_section			= 'pms';
 		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $data['member_group_id'];
 		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $data['mgroup_others'];
@@ -3700,33 +3819,23 @@ class messengerFunctions
 	public function _formatMessageForSaving( $msgContent )
 	{
 		//-----------------------------------------
-		// Post process the editor
-		// Now we have safe HTML and bbcode
+		// Load editor
 		//-----------------------------------------
-	
-		if ( isset($_POST['_fastReplyUsed']) AND $_POST['_fastReplyUsed'] )
-		{
-			if ( IPSText::getTextClass( 'editor' )->method == 'rte' )
-			{
-				//-----------------------------------------
-				// Fast reply used.. and we've chosen the RTE
-				// Convert STD to RTE first...
-				//-----------------------------------------
-			
-				$msgContent = IPSText::getTextClass( 'bbcode' )->convertStdToRte( $msgContent );
-			}
-		}
-
-		$msgContent = IPSText::getTextClass( 'editor' )->processRawPost( $msgContent );
 		
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$_editor = new $classToLoad();
+		$_editor->setAllowHtml( $this->memberData['g_dohtml'] );
+		
+		$msgContent = $_editor->process( $msgContent );
+
 		//-----------------------------------------
 		// Parse post
 		//-----------------------------------------
 
 		IPSText::getTextClass('bbcode')->parse_smilies	 = 1;
  		IPSText::getTextClass('bbcode')->parse_nl2br   	 = 1;
- 		IPSText::getTextClass('bbcode')->parse_html    	 = $this->settings['msg_allow_html'];
- 		IPSText::getTextClass('bbcode')->parse_bbcode    = $this->settings['msg_allow_code'];
+ 		IPSText::getTextClass('bbcode')->parse_html    	 = 0;//$this->memberData['g_dohtml'];
+ 		IPSText::getTextClass('bbcode')->parse_bbcode    = 1;
  		IPSText::getTextClass('bbcode')->parsing_section = 'pms';
 		
 		$msgContent = IPSText::getTextClass( 'bbcode' )->preDbParse( $msgContent );
@@ -3846,6 +3955,20 @@ class messengerFunctions
 		return intval( $return['count'] );
 	}
 	
+	/**
+	 * Flag external stuff
+	 * @param array $data
+	 */
+	protected function _flagAsReadForExternals( array $data )
+	{
+		/* Notifications */
+		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary		= new $classToLoad( $this->registry );
+		$notifyLibrary->setMember( $this->memberData );
+		
+		$notifyLibrary->deleteNotificationsAsReadByMetaData( array( 'meta_app' => 'members', 'meta_area' => 'pm', 'meta_id' => $data, 'notify_type_key' => 'new_private_message' ) );
+	}
+		
 	/**
 	 * Default folder for people won't don't have any
 	 *
diff --git a/upload/admin/applications/members/sources/comments.php b/upload/admin/applications/members/sources/comments.php
deleted file mode 100644
index 0e4151c6..00000000
--- a/upload/admin/applications/members/sources/comments.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Comments library
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		20th February 2002
- * @version		$Revision: 6882 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class profileCommentsLib
-{
-	/**
-	 * Registry object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $registry;
-	
-	/**
-	 * Database object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $DB;
-	
-	/**
-	 * Settings object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $settings;
-	
-	/**
-	 * Request object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $request;
-	
-	/**
-	 * Language object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $lang;
-	
-	/**
-	 * Member object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $member;
-	
-	/**
-	 * Cache object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $cache;
-	
-	/**
-	 * Cached parsed members
-	 *
-	 * @access	protected
-	 * @var		array
-	 */	
-	protected $parsedMembers;
-	
-	/**
-	 * Last inserted comment id
-	 *
-	 * @access	public
-	 * @var		int
-	 */
-	public $lastInsertId;
-		
-	/**
-	 * Constructor
-	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry )
-	{
-		/* Make object */
-		$this->registry = $registry;
-		$this->DB       = $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang     = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache    = $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		$this->lang->loadLanguageFile( array( 'public_profile' ) );
-	}
-	
-	/**
-	 * Adds a new profile comment to the database
-	 *
-	 * @access	public
-	 * @param	integer	$comment_for_id	Member id that this comment is for
-	 * @param	string	$comment		Text of the comment to create
-	 * @return	string					Error key on failure, blank on success
-	 */
-	public function addCommentToDB( $comment_for_id, $comment )
-	{
-		/* Load the member that this comment is for */
-		$member = IPSMember::load( $comment_for_id );
-
-		/* Make sure we found a member */
-		if ( ! $member['member_id'] )
-		{
-			return 'error';
-		}
-		
-		/* Are we allowed to comment? */
-		if( ! $this->memberData['g_reply_other_topics'] )
-		{
-			return 'nopermission';
-		}
-		
-		if( $this->memberData['restrict_post'] )
-		{
-			if( $this->memberData['restrict_post'] == 1 )
-			{
-				return 'nopermission';
-			}
-			
-			$post_arr = IPSMember::processBanEntry( $this->memberData['restrict_post'] );
-			
-			if( time() >= $post_arr['date_end'] )
-			{
-				/* Update this member's profile */
-				IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'restrict_post' => 0 ) ) );
-			}
-			else
-			{
-				return 'nopermission';
-			}
-		}
-
-		/* Does this member have mod_posts enabled? */
-		$comment_approved = 1;
-		
-		if( $this->memberData['mod_posts'] )
-		{
-			if( $this->memberData['mod_posts'] == 1 )
-			{
-				$comment_approved = 0;
-			}
-			else
-			{
-				$mod_arr = IPSMember::processBanEntry( $this->memberData['mod_posts'] );
-				
-				if( time() >= $mod_arr['date_end'] )
-				{
-					/* Update this member's profile */
-					IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'mod_posts' => 0 ) ) );
-				}
-				else
-				{
-					$comment_approved = 0;
-				}
-			}
-		}
-
-		/* Format the comment */
-		$comment = IPSText::truncate( $comment, 400 );
-		$comment = preg_replace( "#(\r\n|\r|\n|<br />|<br>){1,}#s", "\n", $comment );
-		$comment = trim( IPSText::getTextClass('bbcode')->stripBadWords( $comment ) );
-
-		/* Make sure we still have a comment */
-		if ( ! $comment )
-		{
-			return 'error-no-comment';
-		}
-
-		/* Comment requires approval? */
-		if( $member['pp_setting_moderate_comments'] AND $member['member_id'] != $this->memberData['member_id'] )
-		{
-			$comment_approved = 0;
-		}
-		
-		/* Member is ignoring you! */
-		if( $comment_approved )
-		{ 
-			$_you_are_being_ignored = explode( ",", $member['ignored_users'] );
-		
-			if( is_array( $_you_are_being_ignored ) and count( $_you_are_being_ignored ) )
-			{
-				if( in_array( $this->memberData['member_id'], $_you_are_being_ignored ) )
-				{
-					$comment_approved = 0;
-				}
-			}
-		}
-		
-		$_profileCommentData = array(
-										'comment_for_member_id'	=> $comment_for_id,
-										'comment_by_member_id'	=> $this->memberData['member_id'],
-										'comment_date'			=> time(),
-										'comment_ip_address'	=> $this->member->ip_address,
-										'comment_approved'		=> $comment_approved,
-										'comment_content'		=> nl2br( $comment ) 
-									);
-		
-		/* Data Hook Location */
-		IPSLib::doDataHooks( $_profileCommentData, 'profileCommentNew' );
-	
-		/* Add comment to the DB... */
-		$this->DB->insert( 'profile_comments', $_profileCommentData );
-		
-		$this->lastInsertId = $this->DB->getInsertId();
-
-		/* Send notifications.. */
-		if( ! $comment_approved AND ( $member['member_id'] != $this->memberData['member_id'] ) )
-		{
-			//-----------------------------------------
-			// Notifications library
-			//-----------------------------------------
-			
-			$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-			$notifyLibrary		= new $classToLoad( $this->registry );
-
-			IPSText::getTextClass('email')->getTemplate( "new_comment_request", $member['language'] );
-		
-			IPSText::getTextClass( 'email' )->buildMessage( array( 
-																	'MEMBERS_DISPLAY_NAME'	=> $member['members_display_name'],
-																	'COMMENT_NAME'			=> $this->memberData['members_display_name'],
-																	'LINK'					=> $this->settings['board_url'] . '/index.' . $this->settings['php_ext'] . '?showuser=' . $member['member_id'] 
-															) 	);
-
-			IPSText::getTextClass('email')->subject	= sprintf( 
-																IPSText::getTextClass('email')->subject, 
-																$this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . '#comment_id_' . $this->lastInsertId,
-																$this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'public', $this->memberData['members_seo_name'], 'showuser' ), 
-																$this->memberData['members_display_name']
-															);
-
-			$notifyLibrary->setMember( $member );
-			$notifyLibrary->setFrom( $this->memberData );
-			$notifyLibrary->setNotificationKey( 'profile_comment_pending' );
-			$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . '#comment_id_' . $this->lastInsertId );
-			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-			$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-			try
-			{
-				$notifyLibrary->sendNotification();
-			}
-			catch( Exception $e ){}
-
-			$return_msg	= 'pp_comment_added_mod';
-		}
-		else if( $member['member_id'] != $this->memberData['member_id'] )
-		{
-			//-----------------------------------------
-			// Notifications library
-			//-----------------------------------------
-			
-			$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-			$notifyLibrary		= new $classToLoad( $this->registry );
-
-			IPSText::getTextClass('email')->getTemplate( "new_comment_added", $member['language'] );
-		
-			IPSText::getTextClass( 'email' )->buildMessage( array( 
-																	'MEMBERS_DISPLAY_NAME'	=> $member['members_display_name'],
-																	'COMMENT_NAME'			=> $this->memberData['members_display_name'],
-																	'LINK'					=> $this->settings['board_url'] . '/index.' . $this->settings['php_ext'] . '?showuser=' . $member['member_id'] 
-															)	 );
-
-			IPSText::getTextClass('email')->subject	= sprintf( 
-																IPSText::getTextClass('email')->subject, 
-																$this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . '#comment_id_' . $this->lastInsertId,
-																$this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'public', $this->memberData['members_seo_name'], 'showuser' ), 
-																$this->memberData['members_display_name']
-															);
-
-			$notifyLibrary->setMember( $member );
-			$notifyLibrary->setFrom( $this->memberData );
-			$notifyLibrary->setNotificationKey( 'profile_comment' );
-			$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . '#comment_id_' . $this->lastInsertId );
-			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-			$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-			try
-			{
-				$notifyLibrary->sendNotification();
-			}
-			catch( Exception $e ){}
-
-
-			$return_msg	= '';
-		}
-		
-		return $return_msg;
-	}	
-	
-	/**
-	 * Approve a comment
-	 *
-	 * @access	public
-	 * @param	int			Member ID of user who is attempting to access
-	 * @param	int			Comment ID to approve
-	 * @return	mixed		Error string or nothing on success
-	 */
-	public function approveComment( $member_id, $comment_id )
-	{
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member     = IPSMember::load( intval( $member_id ) );
-    	$comment_id = intval( $comment_id );
-
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id );
-    	
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-			return 'nopermission';
-    	}
-
-		//-----------------------------------------
-		// Get comment
-		//-----------------------------------------
-
-		$comment = $this->DB->buildAndFetch( array( 'select' => '*',
-													'from'   => 'profile_comments',
-													'where'  => 'comment_id=' . $comment_id ) );
-
-		//-----------------------------------------
-		// Can remove?
-		//-----------------------------------------
-		
-		if ( ( $member['member_id'] == $this->memberData['member_id'] AND ( $member['member_id'] == $comment['comment_for_member_id'] ) ) OR $this->memberData['g_is_supmod'] )
-		{
-			$this->DB->update( 'profile_comments', array( 'comment_approved' => 1 ), 'comment_id=' . $comment_id );
-		}
-		else
-		{
-			return 'nopermission';
-		}
-
-		return '';
-	}
-	
-	/**
-	 * Delete a comment
-	 *
-	 * @access	public
-	 * @param	int			Member ID of user who is attempting to access
-	 * @param	int			Comment ID to remove
-	 * @return	mixed		Error string or nothing on success
-	 */
-	public function deleteComment( $member_id, $comment_id )
-	{
-		//-----------------------------------------
-		// Load member
-		//-----------------------------------------
-		
-		$member     = IPSMember::load( intval( $member_id ) );
-    	$comment_id = intval( $comment_id );
-
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-
-    	if ( ! $member['member_id'] )
-    	{
-			return 'nopermission';
-    	}
-
-		//-----------------------------------------
-		// Get comment
-		//-----------------------------------------
-
-		$comment = $this->DB->buildAndFetch( array( 'select' => '*',
-													'from'   => 'profile_comments',
-													'where'  => 'comment_id=' . $comment_id ) );
-												
-		
-		//-----------------------------------------
-		// Can remove?
-		//-----------------------------------------
-		
-		if ( ( $member['member_id'] == $this->memberData['member_id'] AND ( $member['member_id'] == $comment['comment_for_member_id'] ) ) OR $this->memberData['g_is_supmod'] )
-		{
-			$this->DB->delete( 'profile_comments', 'comment_id=' . $comment_id );
-		}
-		else
-		{
-			return 'nopermission';
-		}
-		
-		return '';
-	}
-	
- 	/**
-	 * Builds comments
-	 *
-	 * @access	public
-	 * @param	array 		Member information
-	 * @param	boolean		Use a new id
-	 * @param	string		Message to display
-	 * @return	string		Comment HTML
-	 * @since	IPB 2.2.0.2006-08-02
-	 */
-	public function buildComments( $member, $new_id=0, $return_msg='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$comments			= array();
-		$member_id			= intval( $member['member_id'] );
-		$comment_perpage	= 15; //intval( $member['pp_setting_count_comments'] );
-		$comment_html		= 0;
-		$comment_start		= intval($this->request['st']);
-		$comment_approved	= ( $this->memberData['member_id'] == $member['member_id'] OR $this->memberData['g_is_supmod'] ) ? '' : ' AND ( pc.comment_approved=1 OR ( pc.comment_approved=0 AND pc.comment_by_member_id=' . $member_id . ') )';
-		
-		//-----------------------------------------
-		// Not showing comments?
-		//-----------------------------------------
-		
-		if ( $comment_perpage < 1 )
-		{
-			return '';
-		}
-		
-		//-----------------------------------------
-		// Regenerate comments...
-		//-----------------------------------------
-		
-		$this->DB->build( array( 
-								'select'		=> 'pc.*',
-								 'from'			=> array( 'profile_comments' => 'pc' ),
-								 'where'		=> 'pc.comment_for_member_id=' . $member_id . $comment_approved,
-								 'order'		=> 'pc.comment_date DESC',
-								 'limit'		=> array( $comment_start, $comment_perpage ),
-								 'calcRows'		=> TRUE,
-								 'add_join'		=> array(
-														array(
-																'select' => 'm.members_display_name, m.members_seo_name, m.posts, m.last_activity, m.member_group_id, m.member_id, m.last_visit, m.warn_level',
-								 								'from'   => array( 'members' => 'm' ),
-								 								'where'  => 'm.member_id=pc.comment_by_member_id',
-								 								'type'   => 'left' 
-															),
-								 					  	array( 
-																'select' => 'pp.*',
-								 								'from'   => array( 'profile_portal' => 'pp' ),
-								 								'where'  => 'pp.pp_member_id=m.member_id',
-								 								'type'   => 'left' ),	
-								 							) 
-							)	);
-		$o		= $this->DB->execute();
-		$max	= $this->DB->fetchCalculatedRows();
-
-		while( $row = $this->DB->fetch($o) )
-		{
-			$row['_comment_date']   = ipsRegistry::getClass( 'class_localization')->getDate( $row['comment_date'], 'TINY' );
-
-			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'avatar' => 0, 'warn' => 0 ) );
-			
-			if( !$row['members_display_name_short'] )
-			{
-				$row = array_merge( $row, IPSMember::setUpGuest() );
-			}
-			
-			$comments[] = $row;
-		}
-		
-		//-----------------------------------------
-		// Pagination
-		//-----------------------------------------
-		
-		$links	= $this->registry->output->generatePagination(  array( 'totalItems'  	    => $max,
-																	   'itemsPerPage'		=> $comment_perpage,
-																	   'currentStartValue'	=> $comment_start,
-																	   'baseUrl'	  	    => "showuser={$member_id}",
-																	   'seoTitle'			=> $member['members_seo_name'],
-															)		);
-
-		$comment_html = $this->registry->getClass('output')->getTemplate('profile')->showComments( $member, $comments, $new_id, $return_msg, $links );
-
-		//-----------------------------------------
-		// Return it...
-		//-----------------------------------------
-		
-		return $comment_html;
-	}
-	
-}
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/friends.php b/upload/admin/applications/members/sources/friends.php
index 7133f51a..ac62a39b 100644
--- a/upload/admin/applications/members/sources/friends.php
+++ b/upload/admin/applications/members/sources/friends.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Friends library
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-09-09 19:44:48 -0400 (Fri, 09 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Rev: 6882 $
+ * @version		$Rev: 9476 $
  *
  */
 
@@ -30,7 +30,6 @@ class profileFriendsLib
 	/**
 	 * Registry object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $registry;
@@ -38,7 +37,6 @@ class profileFriendsLib
 	/**
 	 * Database object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $DB;
@@ -46,7 +44,6 @@ class profileFriendsLib
 	/**
 	 * Settings object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $settings;
@@ -54,7 +51,6 @@ class profileFriendsLib
 	/**
 	 * Request object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $request;
@@ -62,15 +58,14 @@ class profileFriendsLib
 	/**
 	 * Member object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Is approval pending?
 	 *
-	 * @access	public
 	 * @var		boolean
 	 */
 	public $pendingApproval	= false;
@@ -78,9 +73,8 @@ class profileFriendsLib
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -96,7 +90,6 @@ class profileFriendsLib
 	/**
 	 * Adds a friend to the account that is logged in or specified
 	 *
-	 * @access	public
 	 * @param	integer	$friend_id		The friend being added to the account
 	 * @param	integer	$from_id		The requesting member, defaults to current member
 	 * @param	boolean	$forceApproval	Automatically approve, regardless of setting
@@ -144,7 +137,7 @@ class profileFriendsLib
 		$friend_check = $this->DB->buildAndFetch( array( 
 														'select'	=> 'friends_id',
 														'from'		=> 'profile_friends',
-														'where'		=> "friends_member_id={$from_id} AND friends_friend_id={$friend['member_id']}" 
+														'where'		=> "friends_member_id={$from_id} AND friends_friend_id={$friend_id}" 
 												)	 );
 																		
 		if( $friend_check['friends_id'] )
@@ -205,7 +198,7 @@ class profileFriendsLib
 																	
 			$notifyLibrary->setMember( $friend );
 			$notifyLibrary->setFrom( $member );
-			$notifyLibrary->setNotificationKey( 'friend_request_pending' );
+			$notifyLibrary->setNotificationKey( 'friend_request' );
 			$notifyLibrary->setNotificationUrl( "{$this->settings['board_url']}/index.{$this->settings['php_ext']}?app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=pending" );
 			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
 			$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
@@ -219,38 +212,42 @@ class profileFriendsLib
 		}
 		else
 		{
-			//-----------------------------------------
-			// Notifications library
-			//-----------------------------------------
-			
-			$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-			$notifyLibrary		= new $classToLoad( $this->registry );
-
-			IPSText::getTextClass('email')->getTemplate( "new_friend_added", $friend['language'] );
-		
-			IPSText::getTextClass( 'email' )->buildMessage( array( 
-																	'MEMBERS_DISPLAY_NAME'	=> $friend['members_display_name'],
-																	'FRIEND_NAME'			=> $member['members_display_name'],
-																	'LINK'					=> "{$this->settings['board_url']}/index.{$this->settings['php_ext']}?app=members&amp;section=friends&amp;module=profile&amp;do=list"
-															)		);
-
-			IPSText::getTextClass('email')->subject	= sprintf( 
-																IPSText::getTextClass('email')->subject, 
-																$this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ), 
-																$member['members_display_name']
-															);
-															
-			$notifyLibrary->setMember( $friend );
-			$notifyLibrary->setFrom( $member );
-			$notifyLibrary->setNotificationKey( 'friend_request' );
-			$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) );
-			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-			$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-			try
+			/* Don't notify yourself */
+			if( $friend['member_id'] != $this->memberData['member_id'] )
 			{
-				$notifyLibrary->sendNotification();
+				//-----------------------------------------
+				// Notifications library
+				//-----------------------------------------
+				
+				$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+				$notifyLibrary		= new $classToLoad( $this->registry );
+	
+				IPSText::getTextClass('email')->getTemplate( "new_friend_added", $friend['language'] );
+			
+				IPSText::getTextClass( 'email' )->buildMessage( array( 
+																		'MEMBERS_DISPLAY_NAME'	=> $friend['members_display_name'],
+																		'FRIEND_NAME'			=> $member['members_display_name'],
+																		'LINK'					=> "{$this->settings['board_url']}/index.{$this->settings['php_ext']}?app=members&amp;section=friends&amp;module=profile&amp;do=list"
+																)		);
+	
+				IPSText::getTextClass('email')->subject	= sprintf( 
+																	IPSText::getTextClass('email')->subject, 
+																	$this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ), 
+																	$member['members_display_name']
+																);
+																
+				$notifyLibrary->setMember( $friend );
+				$notifyLibrary->setFrom( $member );
+				$notifyLibrary->setNotificationKey( 'friend_request' );
+				$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) );
+				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+				$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+				try
+				{
+					$notifyLibrary->sendNotification();
+				}
+				catch( Exception $e ){}
 			}
-			catch( Exception $e ){}
 
 			$return_msg	= 'pp_friend_added';
 		}
@@ -265,7 +262,6 @@ class profileFriendsLib
 	/**
 	 * Removes a friend from the logged in account
 	 *
-	 * @access	public
 	 * @param	integer	$friend_id	The friend being removed
 	 * @param	integer	$from_id	The requesting member, defaults to current member
 	 * @return	string				Error Key or blank for success
@@ -316,7 +312,6 @@ class profileFriendsLib
  	/**
  	 * Recaches member's friends
  	 *
- 	 * @access	public
  	 * @param	array	$member	Member array to recache
  	 * @return	boolean
  	 */
@@ -350,12 +345,11 @@ class profileFriendsLib
 	 * Check to see if we can add this member
 	 * Just checks flood table right now, but this can be expanded upon
 	 *
-	 * @access	private
 	 * @param	int			Member ID
 	 * @param	int			Friend ID
 	 * @return	boolean
 	 */
-	private function _canAddFriend( $member_id, $friend_id )
+	protected function _canAddFriend( $member_id, $friend_id )
 	{
 		/* Clean flood table */
 		$this->_cleanFloodTable();
@@ -377,12 +371,11 @@ class profileFriendsLib
 	/**
 	 * Add entry to the flood table
 	 *
-	 * @access	private
 	 * @param	int			Member ID
 	 * @param	int			Friend ID
 	 * @return	boolean
 	 */
-	private function _addFloodEntry( $member_id, $friend_id )
+	protected function _addFloodEntry( $member_id, $friend_id )
 	{
 		/* Clean flood table */
 		$this->_cleanFloodTable();
@@ -396,9 +389,8 @@ class profileFriendsLib
 	/**
 	 * Clean flood table
 	 *
-	 * @access	private
 	 */
-	private function _cleanFloodTable()
+	protected function _cleanFloodTable()
 	{
 		$time = time() - ( 60 * 5 );
 		
diff --git a/upload/admin/applications/members/sources/index.html b/upload/admin/applications/members/sources/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sources/index.html
+++ b/upload/admin/applications/members/sources/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/tabs/index.html b/upload/admin/applications/members/sources/tabs/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sources/tabs/index.html
+++ b/upload/admin/applications/members/sources/tabs/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sources/tabs/pluginParentClass.php b/upload/admin/applications/members/sources/tabs/pluginParentClass.php
index dda3a349..dc2e8c02 100644
--- a/upload/admin/applications/members/sources/tabs/pluginParentClass.php
+++ b/upload/admin/applications/members/sources/tabs/pluginParentClass.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Profile Plugin Library
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		20th February 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -30,7 +30,6 @@ abstract class profile_plugin_parent
 	/**
 	 * Registry object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $registry;
@@ -38,7 +37,6 @@ abstract class profile_plugin_parent
 	/**
 	 * Database object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $DB;
@@ -46,7 +44,6 @@ abstract class profile_plugin_parent
 	/**
 	 * Settings object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $settings;
@@ -54,7 +51,6 @@ abstract class profile_plugin_parent
 	/**
 	 * Request object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $request;
@@ -62,7 +58,6 @@ abstract class profile_plugin_parent
 	/**
 	 * Language object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $lang;
@@ -70,25 +65,24 @@ abstract class profile_plugin_parent
 	/**
 	 * Member object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
 	 *
-	 * @access	protected
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 		
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -107,22 +101,8 @@ abstract class profile_plugin_parent
 	/**
 	 * Abstract :: return HTML block
 	 *
-	 * @access	public
 	 * @param	array		Member information
 	 * @return	string		HTML block
 	 */
 	abstract public function return_html_block( $member=array() );
-	
-	/**
-	 * Parse macros in HTML block
-	 *
-	 * @access	private
-	 * @param	string		HTML block
-	 * @return	string		HTML block with macros parsed
-	 * @deprecated	Just use the output library's method
-	 */
-	private function _parseMacros( $content='' )
-	{
-		return $this->registry->output->replaceMacros( $content );
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/sql/index.html b/upload/admin/applications/members/sql/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/sql/index.html
+++ b/upload/admin/applications/members/sql/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/sql/messengerSearch_mysql.php b/upload/admin/applications/members/sql/messengerSearch_mysql.php
index 938b2f9a..6ce5e94b 100644
--- a/upload/admin/applications/members/sql/messengerSearch_mysql.php
+++ b/upload/admin/applications/members/sql/messengerSearch_mysql.php
@@ -2,44 +2,41 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Generates a search and returns the results [ MySQL ]
- * Last Updated: $Date: 2010-07-06 07:25:33 -0400 (Tue, 06 Jul 2010) $
+ * Last Updated: $Date: 2011-09-01 17:55:10 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6602 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 9441 $ 
+ */
 
 class messengerSearch
 {
 	/**
 	 * Results
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_results = array();
+	protected $_results = array();
 	
 	/**
 	 * Total rows
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_rows = 0;
+	protected $_rows = 0;
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -58,7 +55,6 @@ class messengerSearch
 	/**
 	 * Search
 	 *
-	 * @access	public
 	 * @param	int			Member ID who is searching
 	 * @param	string		Words to search (probably tainted at this point, so be careful!)
 	 * @param	int			Offset start
@@ -86,7 +82,7 @@ class messengerSearch
 			$this->DB->allow_sub_select = 1;
 			
 			/* Type of search */
-			if( $this->settings['use_fulltext'] )
+			if( $this->settings['use_fulltext'] AND strtolower($this->settings['mysql_tbl_type']) == 'myisam' )
 			{
 				$whereOne = "MATCH( t.mt_title ) AGAINST( '{$words}' IN BOOLEAN MODE )";
 				$whereTwo = "MATCH( p.msg_post ) AGAINST( '{$words}' IN BOOLEAN MODE )";
@@ -99,12 +95,12 @@ class messengerSearch
 			
 			$this->DB->query( "SELECT SQL_CALC_FOUND_ROWS mt_id, mt_first_msg_id FROM ( ( SELECT t.mt_id, t.mt_first_msg_id
 									FROM {$dbpre}message_topics t, {$dbpre}message_topic_user_map m
-									WHERE (t.mt_id=m.map_topic_id AND m.map_user_id=" . $memberID . " AND m.map_user_banned=0 AND t.mt_is_deleted=0) AND {$whereOne}
+									WHERE (t.mt_id=m.map_topic_id AND m.map_user_id=" . $memberID . " AND m.map_user_banned=0 AND m.map_user_active=1 AND t.mt_is_deleted=0) AND {$whereOne}
 									ORDER BY t.mt_last_post_time DESC )
 								UNION
 								( SELECT p.msg_topic_id, p.msg_id
 									FROM {$dbpre}message_posts p, {$dbpre}message_topic_user_map m
-									WHERE (p.msg_topic_id=m.map_topic_id AND m.map_user_id=" . $memberID . " AND m.map_user_banned=0) AND {$whereTwo}
+									WHERE (p.msg_topic_id=m.map_topic_id AND m.map_user_id=" . $memberID . " AND m.map_user_banned=0 AND m.map_user_active=1) AND {$whereTwo}
 									ORDER BY p.msg_date DESC ) ) as tbl
 								GROUP BY mt_id
 								LIMIT $start, $end" );
@@ -152,7 +148,6 @@ class messengerSearch
 	/**
 	 * Fetch results
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function fetchResults()
@@ -163,7 +158,6 @@ class messengerSearch
 	/**
 	 * Fetch total result row count
 	 *
-	 * @access	public
 	 * @return	int
 	 */
 	public function fetchTotalRows()
diff --git a/upload/admin/applications/members/tasks/bulkmail.php b/upload/admin/applications/members/tasks/bulkmail.php
index 3968e9f7..35b6365e 100644
--- a/upload/admin/applications/members/tasks/bulkmail.php
+++ b/upload/admin/applications/members/tasks/bulkmail.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Sends teh bulk mail of course
- * Last Updated: $LastChangedDate: 2010-10-21 07:08:38 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7007 $
+ * @file		bulkmail.php 	Task to send out bulk emails (dynamically enabled)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -23,66 +17,48 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to send out bulk emails (dynamically enabled)
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @var		object
+	 * @var		$registry
 	 */
 	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
-	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -90,7 +66,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
diff --git a/upload/admin/applications/members/tasks/index.html b/upload/admin/applications/members/tasks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/tasks/index.html
+++ b/upload/admin/applications/members/tasks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/tasks/mobile_notifications.php b/upload/admin/applications/members/tasks/mobile_notifications.php
index c2873dc2..eee792f2 100644
--- a/upload/admin/applications/members/tasks/mobile_notifications.php
+++ b/upload/admin/applications/members/tasks/mobile_notifications.php
@@ -1,19 +1,14 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Sends Mobile Notifications
- * Last Updated: $LastChangedDate$
- * </pre>
- *
- * @author 		$Author$
- * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev$
+ * @file		mobile_notifications.php 	Task to send out mobile notifications
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -22,66 +17,57 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to send out mobile notifications
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -89,18 +75,20 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		/* INIT */
 		$maxNotificationsToProcess	= 250;
+		$licenseKey					= ipsRegistry::$settings['ipb_reg_number'];
 		$forum						= urlencode( $this->settings['board_name'] );
+		$domain 					= urlencode( ipsRegistry::$settings['board_url'] );
+		$apiBaseURL					= "http://myipb.in/apn-server/index.php?api=addMessageToQueue&key={$licenseKey}&forum={$forum}&domain={$domain}";
 
 		/* Get the file managemnet class */
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
 		$query = new $classToLoad();
-		$query->use_sockets = 1;
 		
 		/* Get waiting notifications */
 		$this->DB->build( array(
@@ -133,7 +121,7 @@ class task_item
 			}
 
 			/* Query the api */
-			$response = '';
+			$response = $query->getFileContents( "{$apiBaseURL}&ipsToken={$ipsToken}&message={$message}" );
 			
 			/* Save the ID */
 			$_sentIds[] = $r['id'];
diff --git a/upload/admin/applications/members/tasks/removelocked.php b/upload/admin/applications/members/tasks/removelocked.php
index db6bee0d..20942e0e 100644
--- a/upload/admin/applications/members/tasks/removelocked.php
+++ b/upload/admin/applications/members/tasks/removelocked.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Removes locked membes who are unlocked
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		removelocked.php 	Task to remove locked members from the ACP list who are already unlocked
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,57 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to remove locked members from the ACP list who are already unlocked
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,22 +75,21 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
-		
-		$count		= 0;
-		$canUnlock	= array();
 		
 		if ( $this->settings['ipb_bruteforce_attempts'] AND $this->settings['ipb_bruteforce_unlock'] )
 		{
-			$this->DB->build( array( 'select'		=> 'member_id, failed_logins, failed_login_count',
+			/* Init vars */
+			$count		= 0;
+			$canUnlock	= array();
+			
+			$this->DB->build( array( 'select'	=> 'member_id, failed_logins, failed_login_count',
 									 'from'		=> 'members',
-									 'where'		=> 'failed_login_count > 0 AND failed_logins ' . $this->DB->buildIsNull( false ),
-									)		);
+									 'where'	=> 'failed_login_count > 0 AND failed_logins ' . $this->DB->buildIsNull( false ),
+							 )		);
 			$outer = $this->DB->execute();
 		
 			while( $r = $this->DB->fetch($outer) )
@@ -176,6 +156,7 @@ class task_item
 			// Log to log table - modify but dont delete
 			//-----------------------------------------
 			
+			$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 			$this->class->appendTaskLog( $this->task, sprintf( $this->lang->words['task_removelocked'], count($canUnlock) ) );
 		}
 		
@@ -185,5 +166,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/tasks/removevalidating.php b/upload/admin/applications/members/tasks/removevalidating.php
index 04ac65fe..f86ace82 100644
--- a/upload/admin/applications/members/tasks/removevalidating.php
+++ b/upload/admin/applications/members/tasks/removevalidating.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Removes validating members over configured time
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		removevalidating.php 	Task to remove validating members over configured time
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,57 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to remove validating members over configured time
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,33 +75,28 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
-		
-		$mids	= array();
-		$vids	= array();
-		$emails	= array();
-		
 		// If enabled, remove validating new_reg members & entries from members table
-		
 		if ( intval($this->settings['validate_day_prune']) > 0 )
 		{
+			/* Init vars */
+			$mids	= array();
+			$vids	= array();
+			$emails	= array();
 			$less_than = time() - $this->settings['validate_day_prune'] * 86400;
 			
-			$this->DB->build( array( 'select' => 'v.vid, v.member_id',
-													 'from'	  => array( 'validating' => 'v' ),
-													 'where'  => 'v.new_reg=1 AND v.coppa_user<>1 AND v.entry_date < '.$less_than.' AND v.lost_pass<>1',
-													 'add_join' => array( 0 => array( 'select' 	=> 'm.posts, m.member_group_id, m.email',
-													 								  'from'	=> array( 'members' => 'm' ),
-													 								  'where'	=> 'm.member_id=v.member_id',
-													 								  'type'	=> 'left'
-													 					)			)
-											)		);
-			
+			/* Get members from DB */
+			$this->DB->build( array( 'select'	=> 'v.vid, v.member_id',
+									 'from'		=> array( 'validating' => 'v' ),
+									 'where'	=> 'v.new_reg=1 AND v.coppa_user<>1 AND v.entry_date < '.$less_than.' AND v.lost_pass<>1 AND v.user_verified=0',
+									 'add_join' => array( array( 'select' 	=> 'm.posts, m.member_group_id, m.email',
+									 							 'from'		=> array( 'members' => 'm' ),
+									 							 'where'	=> 'm.member_id=v.member_id',
+									 							 'type'		=> 'left' ) )
+							)		);
 			$outer = $this->DB->execute();
 		
 			while( $i = $this->DB->fetch($outer) )
@@ -150,6 +126,7 @@ class task_item
 			// Log to log table - modify but dont delete
 			//-----------------------------------------
 			
+			$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 			$this->class->appendTaskLog( $this->task, sprintf( $this->lang->words['task_removevalidating'], count($mids) ) );
 		}
 		
@@ -159,5 +136,4 @@ class task_item
 		
 		$this->class->unlockTask( $this->task );
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/applications/members/tasks/twitfacesync.php b/upload/admin/applications/members/tasks/twitfacesync.php
index caa619d4..607c03fe 100644
--- a/upload/admin/applications/members/tasks/twitfacesync.php
+++ b/upload/admin/applications/members/tasks/twitfacesync.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Update the profile views counter
- * Last Updated: $LastChangedDate: 2010-11-17 08:50:12 -0500 (Wed, 17 Nov 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7206 $
+ * @file		twitfacesync.php 	Task to update data from Twitter and Facebook (photos, statuses, etc)
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		-
+ * $LastChangedDate: 2011-04-19 23:03:31 -0400 (Tue, 19 Apr 2011) $
+ * @version		v3.2.3
+ * $Revision: 8397 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,69 +17,57 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to update data from Twitter and Facebook (photos, statuses, etc)
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
+		$this->settings	=& $this->registry->fetchSettings();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
@@ -94,8 +75,7 @@ class task_item
 	/**
 	 * Run this task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -106,20 +86,28 @@ class task_item
 		
 		if ( IPSLib::fbc_enabled() !== TRUE && IPSLib::twitter_enabled() !== TRUE )
 		{
-			$this->class->appendTaskLog( $this->task, "Nothing to update" );
 			$this->class->unlockTask( $this->task );
 			return;
 		}
 		
 		//-----------------------------------------
-		// Fetch members
+		// Fetch members / Edit - only complete members
+		// @link http://community.invisionpower.com/tracker/issue-29269-display-names-not-always-shown-in-status-updates
 		//-----------------------------------------
 		
-		$this->DB->build( array( 'select' => 'member_id',
-								 'from'   => 'members',
-								 'where'  => '( (twitter_id != \'\' AND tc_lastsync < ' . $_sync .') OR (fb_uid > 0 AND fb_lastsync < ' . $_sync . ') ) AND last_visit > ' . $_active,
-								 'order'  => 'last_visit DESC',
-								 'limit'  => array( 0, 100 ) ) );
+		$this->DB->build( array( 'select'	=> 'm.member_id',
+								 'from'		=> array( 'members' => 'm' ),
+								 'where'	=> '( (m.twitter_id != \'\' AND m.tc_lastsync < ' . $_sync .') OR (m.fb_uid > 0 AND m.fb_lastsync < ' . $_sync . ') ) AND p.partial_id ' . $this->DB->buildIsNull(true) . ' AND m.last_visit > ' . $_active,
+								 'order'	=> 'm.last_visit DESC',
+								 'limit'	=> array( 0, 100 ),
+								 'add_join'	=> array(
+								 					array(
+								 						'from'	=> array( 'members_partial' => 'p' ),
+								 						'where'	=> 'p.partial_member_id=m.member_id',
+								 						'type'	=> 'left',
+								 						)
+								 					)
+						 )		);
 		$this->DB->execute();
 		
 		while( $row = $this->DB->fetch() )
@@ -142,8 +130,8 @@ class task_item
 					/* We have a linked member and options, so check if they haven't sync'd in 24 hours and have been active in the past 90 days... */
 					try
 					{
-						require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-						$facebook = new facebook_connect( ipsRegistry::instance(), null, null, true );
+						$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+						$facebook	 = new $classToLoad( ipsRegistry::instance(), null, null, true );
 					
 						$_member = $facebook->syncMember( $member, $member['fb_token'], $member['fb_uid'] );
 						
@@ -179,8 +167,8 @@ class task_item
 				if ( ! empty( $member['twitter_id'] ) and ! empty( $member['tc_bwoptions'] ) )
 				{
 					/* We have a linked member and options, so check if they haven't sync'd in 3 hours and have been active in the past 90 days... */
-					require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-					$twitter = new twitter_connect( ipsRegistry::instance() );
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+					$twitter	 = new $classToLoad( ipsRegistry::instance() );
 					
 					try
 					{
diff --git a/upload/admin/applications/members/tasks/update_profile_views.php b/upload/admin/applications/members/tasks/update_profile_views.php
index 6f1890fa..6d8b95e7 100644
--- a/upload/admin/applications/members/tasks/update_profile_views.php
+++ b/upload/admin/applications/members/tasks/update_profile_views.php
@@ -1,21 +1,14 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Update the profile views counter
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
+ * @file		update_profile_views.php 	Task to update the profile views from the temporary table
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		-
+ * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
+ * @version		v3.2.3
+ * $Revision: 7750 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -24,87 +17,71 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ *
+ * @class		task_item
+ * @brief		Task to update the profile views from the temporary table
+ *
+ */
 class task_item
 {
 	/**
-	 * Parent task manager class
+	 * Object that stores the parent task manager class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$class
 	 */
 	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @access	protected
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @access	protected
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
 	
-	/**#@+
+	/**
+	 * Array that stores the task data
+	 *
+	 * @var		$task
+	 */
+	protected $task = array();
+	
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$lang
 	 */
 	protected $registry;
 	protected $DB;
-	protected $settings;
-	protected $request;
 	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @param	object		$class			Task manager class object
+	 * @param	array		$task			Array with the task data
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $class, $task )
 	{
 		/* Make registry objects */
 		$this->registry	= $registry;
 		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
 		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
+		
 		$this->class	= $class;
 		$this->task		= $task;
 	}
 	
 	/**
 	 * Run this task
-	 *
-	 * @access	public
-	 * @return	void
+	 * 
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
 		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 		
-		$this->DB->build( array( 'select'	=> 'views_member_id, COUNT(*) as profile_views',
-										'from'	=> 'profile_portal_views',
-										'group'	=> 'views_member_id'
-							)		);
+		$this->DB->build( array( 'select' => 'views_member_id, COUNT(*) as profile_views',
+								 'from'   => 'profile_portal_views',
+								 'group'  => 'views_member_id'
+						)		);
 
 		$o = $this->DB->execute();
 		
diff --git a/upload/admin/applications/members/xml/admin_members_language_pack.xml b/upload/admin/applications/members/xml/admin_members_language_pack.xml
index 333541e2..17d6429e 100644
--- a/upload/admin/applications/members/xml/admin_members_language_pack.xml
+++ b/upload/admin/applications/members/xml/admin_members_language_pack.xml
@@ -4,482 +4,87 @@
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_deletedot</word_key>
-      <word_default>Delete...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_maillogadd</word_key>
+      <word_default>Bulk mail ( %s ) added</word_default>
+      <word_custom>Ра��ылка ( %s ) добавлена</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_create</word_key>
-      <word_default>Create new bulk mail</word_default>
-      <word_custom>Создать ра��ылку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_title</word_key>
+      <word_default>Bulk Mail Management</word_default>
+      <word_custom>Управление ра��ылкой</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_resenddot</word_key>
-      <word_default>Resend...</word_default>
-      <word_custom>Перезапу�к ра��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_deleted</word_key>
+      <word_default>Bulk mail deleted!</word_default>
+      <word_custom>Ра��ылка удалена!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_editdot</word_key>
-      <word_default>Edit...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_canceled</word_key>
+      <word_default>Bulk mail canceled!</word_default>
+      <word_custom>Ра��ылка отменена!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_cancel</word_key>
-      <word_default>Cancel</word_default>
-      <word_custom>Отменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_norecord</word_key>
+      <word_default>Could not find the bulk mail record you requested. Please try again.</word_default>
+      <word_custom>�евозможно найти ра��ылку. Попробуйте еще раз.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_cancelconfirm</word_key>
-      <word_default>Click OK to cancel this mail</word_default>
-      <word_custom>�ажмите OK дл� отмены пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_noid</word_key>
+      <word_default>There was no ID passed to the mailer. Please try again.</word_default>
+      <word_custom>ID отправител� не найден. Попробуйте еще раз.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_minutes</word_key>
-      <word_default> minutes</word_default>
-      <word_custom> минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bulkmail_notes_tl</word_key>
+      <word_default>Important Information</word_default>
+      <word_custom>Важно</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_inprogress</word_key>
-      <word_default>Sending mail in progress</word_default>
-      <word_custom>Ра��ылка отправл�ет��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bulkmail_notes_info</word_key>
+      <word_default><![CDATA[Please be aware that bulk emails are sent by a task in IP.Board in the System Scheduler.  They are not sent immediately upon saving or resending a bulk email.  You can manually run this task in the System Scheduler if you wish to force emails to send immediately, otherwise
+							they will be sent based on activity on your forums.  Also, please be aware that any users who elect <em>not</em> to receive emails from the administrator in their user control panel will <strong>not</strong> receive bulk mails.]]></word_default>
+      <word_custom><![CDATA[Отправка ра��ылки о�уще�твл�ет�� задачей в планировщике задач IP.Board. По�тому ра��ылка не �тартует мгновенно. Вы можете вручную запу�тить задачу в планировщике, е�ли вам крайне необходимо о�уще�твить ра��ылку в ближайшее врем�. Также учитывайте тот факт, что пользователи, выбравшие опцию «<em>�е</em> получать �ообщени� от админи�трации форума» в �воих на�тройках, <em>не</em> получат пи�ем ра��ылки.]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_notyet</word_key>
-      <word_default>Not yet sent</word_default>
-      <word_custom><![CDATA[<em>не отправл�ло�ь</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_initiated</word_key>
+      <word_default>Bulk mail initiated!</word_default>
+      <word_custom>Отправка ра��ылки начата!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_lsenton</word_key>
-      <word_default>Sent On</word_default>
-      <word_custom>Дата отправки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_entercont</word_key>
+      <word_default>You must enter a mail subject and mail content before submitting. Please try again.</word_default>
+      <word_custom>�еобходимо вве�ти тему и тек�т пи�ьма.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_lsentto</word_key>
-      <word_default>Sent To</word_default>
-      <word_custom>Получателей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_nosend</word_key>
+      <word_default><![CDATA[Cannot send - the mail doesn't have a subject and content. Please try again.]]></word_default>
+      <word_custom>�евозможно отправить - не указана тема и тек�т пи�ьма. Попробуйте еще раз.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_ltime</word_key>
-      <word_default>Time Taken</word_default>
-      <word_custom>Зан�ло времени</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_lsubject</word_key>
-      <word_default>Subject</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_stored</word_key>
-      <word_default>Your stored bulk mail</word_default>
-      <word_custom>Сохраненные ра��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qposts</word_key>
-      <word_default><![CDATA[<em>The number of posts for the mail recipient</em>]]></word_default>
-      <word_custom><![CDATA[<em>Количе�тво �ообщений пользовател� — получател� пи�ьма</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qmname</word_key>
-      <word_default><![CDATA[<em>The member name of the mail recipient</em>]]></word_default>
-      <word_custom><![CDATA[<em>Им� пользовател� — получател� пи�ьма</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qjoin</word_key>
-      <word_default><![CDATA[<em>The join date of the mail recipient</em>]]></word_default>
-      <word_custom><![CDATA[<em>Дата реги�трации пользовател� — получател� пи�ьма</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qonlinetime</word_key>
-      <word_default><![CDATA[<em>The time that the most number of members were online</em>]]></word_default>
-      <word_custom><![CDATA[<em>Дата рекорда по�ещаемо�ти форума</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qid</word_key>
-      <word_default><![CDATA[<em>The member ID of the mail recipient</em>]]></word_default>
-      <word_custom><![CDATA[<em>ID пользовател� — получател� пи�ьма</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qonline</word_key>
-      <word_default><![CDATA[<em>The most number of users online</em>]]></word_default>
-      <word_custom><![CDATA[<em>Мак�имальное количе�тво пользователей в онлайне</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qptotal</word_key>
-      <word_default><![CDATA[<em>The total number of posts</em>]]></word_default>
-      <word_custom><![CDATA[<em>Общее количе�тво �ообщений на форуме</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qmtotal</word_key>
-      <word_default><![CDATA[<em>The total number of registered members</em>]]></word_default>
-      <word_custom><![CDATA[<em>Общее количе�тво зареги�трированных пользователей</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qtag_info</word_key>
-      <word_default><![CDATA[You may use the following 'quick tags' in your mail and they will be converted when the mail is sent.]]></word_default>
-      <word_custom>В вашей ра��ылке вы можете и�пользовать �ледующие теги, которые будут заменены при отправке ра��ылки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qbname</word_key>
-      <word_default><![CDATA[<em>The name of your board</em>]]></word_default>
-      <word_custom><![CDATA[<em>�азвание форума</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qboardurl</word_key>
-      <word_default><![CDATA[<em>The URL to your board</em>]]></word_default>
-      <word_custom><![CDATA[<em>�дре� форума</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_qtag</word_key>
-      <word_default>Quick Tags</word_default>
-      <word_custom>До�тупные теги</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_leaveblank</word_key>
-      <word_default>Leave blank to not filter</word_default>
-      <word_custom>Чтобы не и�пользовать фильтр, про�то о�тавьте поле пу�тым.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_preview</word_key>
-      <word_default>Preview</word_default>
-      <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_njoined</word_key>
-      <word_default><![CDATA[Send to members who joined <em><strong>n</strong></em> days ago]]></word_default>
-      <word_custom><![CDATA[Отправить пользовател�м, которые зареги�трировали�ь <em><strong>n</strong></em> дней назад]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_ndays</word_key>
-      <word_default><![CDATA[Send to members whose last visit was <em><strong>n</strong></em> days ago]]></word_default>
-      <word_custom><![CDATA[Отправить пользовател�м, чей по�ледний визит был <em><strong>n</strong></em> дней назад]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_nposts</word_key>
-      <word_default><![CDATA[Send to members with <em><strong>n</strong></em> posts]]></word_default>
-      <word_custom>Отправить пользовател�м � количе�твом �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_groups</word_key>
-      <word_default><![CDATA[<strong>Send to Groups:</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Группы адре�атов:</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_addfilters</word_key>
-      <word_default><![CDATA[<strong>Additional Filters</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дополнительные фильтры</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_step2</word_key>
-      <word_default>Step 2: Filters</word_default>
-      <word_custom>Шаг 2: Фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_content</word_key>
-      <word_default><![CDATA[<strong>Mail Content</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тек�т пи�ьма</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_honor</word_key>
-      <word_default><![CDATA[Honor the '<strong>Send me any updates seny by the board administrator</strong>' setting? This will only mail members who have opted in.]]></word_default>
-      <word_custom>Отправить пи�ьмо только тем пользовател�м, которые разрешили в �воем профиле получать пи�ьма от админи�трации?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_html</word_key>
-      <word_default><![CDATA[Send mail in HTML format? (Full HTML formatting &amp; and tags allowed)]]></word_default>
-      <word_custom>Отправить пи�ьма в формате HTML</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_lessthan</word_key>
-      <word_default>less than</word_default>
-      <word_custom>меньше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_step1</word_key>
-      <word_default>Step 1: Start New Bulk Mail</word_default>
-      <word_custom>Шаг 1: Создание новой ра��ылки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_step1_title</word_key>
-      <word_default>Mail Details</word_default>
-      <word_custom>Данные пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_proceed</word_key>
-      <word_default>Proceed...</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_editstored</word_key>
-      <word_default>Editing Stored Mail</word_default>
-      <word_custom>Изменение �охраненного пи�ьма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_edit</word_key>
-      <word_default>Edit Mail</word_default>
-      <word_custom>Изменить пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_subject</word_key>
-      <word_default><![CDATA[<strong>Mail Subject</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тема пи�ьма</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_percycle</word_key>
-      <word_default><![CDATA[<strong>Number sent per cycle</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пи�ем за раз</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_mailbutton</word_key>
-      <word_default>Start Sending The Mail</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_morethan</word_key>
-      <word_default>more than</word_default>
-      <word_custom>больше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_maillogedit</word_key>
+      <word_default>Bulk mail ( %s ) edited</word_default>
+      <word_custom>Ра��ылка ( %s ) изменена</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -487,39 +92,6 @@
       <word_key>b_countmember</word_key>
       <word_default><![CDATA[Sending the bulk mail to <strong>%s</strong> members]]></word_default>
       <word_custom><![CDATA[Отправка ра��ылки <strong>%s</strong> пользовател�м]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_maildetails</word_key>
-      <word_default><![CDATA[<strong>Mail Details</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Данные пи�ьма</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_editmail</word_key>
-      <word_default>Edit This Mail</word_default>
-      <word_custom>Изменить пи�ьмо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_sending</word_key>
-      <word_default><![CDATA[<strong>Sending the Mail</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Отправка e-mail пи�ьма</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -527,9 +99,104 @@
       <word_key>b_sending_info</word_key>
       <word_default><![CDATA[Clicking the 'Start Sending The Mail' button below will activate the task manager's send bulk mail function which will send the mail in batches until the all the mail has been sent. You can watch the progress from the main Bulk Mail screen and cancel the mail from being sent.<br />We strongly recommend that you opt to send 20 mails per cycle as a maximum. Any more per cycle could severly affect performance of your server while the mail is being sent out.<br /><br />As the mail is sent out in cycles of <em><b>n</b></em> &nbsp;per minute, it can take a while to process all the mail.]]></word_default>
       <word_custom><![CDATA[�ажатие на кнопку «Отправить» добавит �ту ра��ылку в задачи форума. Задача о�танет�� текущей до тех пор, пока в�е пи�ьма не будут отправлены.<br />За проце��ом отправки пи�ем вы можете �ледить в окне админи�трировани� «Спи�ок ра��ылок», там же можно отменить отправку ра��ылки.<br />�а�то�тельно рекомендует�� не ра��ылать больше 50 пи�ем за один раз, так как �то может �уще�твенно замедлить работу вашего �ервера в момент ра��ылки пи�ем.<br /><br />По�кольку раз в минуту отправл�ет�� по n пи�ем, �тот проце�� может зан�ть длительное врем�. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_editmail</word_key>
+      <word_default>Edit This Mail</word_default>
+      <word_custom>Изменить пи�ьмо</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_sending</word_key>
+      <word_default><![CDATA[<strong>Sending the Mail</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Отправка e-mail пи�ьма</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_percycle</word_key>
+      <word_default><![CDATA[<strong>Number sent per cycle</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Пи�ем за раз</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_maildetails</word_key>
+      <word_default><![CDATA[<strong>Mail Details</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Данные пи�ьма</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_nogroups</word_key>
+      <word_default>You must select at least one group to send this mail message to. Please try again.</word_default>
+      <word_custom>Вы должны выбрать хот� бы одну группу-адре�атов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_nonefound</word_key>
+      <word_default><![CDATA[Your criteria didn't match any members. Please adjust your current criteria, ensuring all correct fields are selected or entered.]]></word_default>
+      <word_custom>Вашему критерию пои�ка не �оответ�твует ни один пользователь. Измените критерии пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_step1_title</word_key>
+      <word_default>Mail Details</word_default>
+      <word_custom>Данные пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_proceed</word_key>
+      <word_default>Proceed...</word_default>
+      <word_custom>Продолжить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_editstored</word_key>
+      <word_default>Editing Stored Mail</word_default>
+      <word_custom>Изменение �охраненного пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_step1</word_key>
+      <word_default>Step 1: Start New Bulk Mail</word_default>
+      <word_custom>Шаг 1: Создание новой ра��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_lessthan</word_key>
+      <word_default>less than</word_default>
+      <word_custom>меньше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_morethan</word_key>
+      <word_default>more than</word_default>
+      <word_custom>больше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_mailbutton</word_key>
+      <word_default>Start Sending The Mail</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_edited</word_key>
+      <word_default>Bulk mail edited!</word_default>
+      <word_custom>Ра��ылка изменена</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -549,14 +216,14 @@ Busiest Time: {busy_count} users were online on {busy_time}
 -------------------------------------
 Handy Links
 -------------------------------------
-Board Address: {board_url}
+Community Address: {board_url}
 Log In: {board_url}?app=core&module=global&section=login
 Lost Password Recovery: {board_url}?app=core&module=global&section=lostpass
 
 -------------------------------------
 How to unsubscribe
 -------------------------------------
-Visit your email preferences ({board_url}?app=core&module=usercp) and ensure that the box for 'Send me any updates sent by the board administrator' is unchecked and submit the form]]></word_default>
+Visit your email preferences ({board_url}?app=core&module=usercp) and ensure that the box for 'Send me any updates sent by the community administrator' is unchecked and submit the form]]></word_default>
       <word_custom><![CDATA[Уважаемый(а�) {member_name}.
 
 -------------------------------------
@@ -575,160 +242,286 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
 Как отпи�ать�� от ра��ылок?
 -------------------------------------
 Пожалуй�та, измените в вашем профиле ({board_url}?app=core&module=usercp) на�тройки e-mail и уберите галочку «Сообщать мне обо в�ех изменени�х, проводимых админи�трацией форума».]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_maillogedit</word_key>
-      <word_default>Bulk mail ( %s ) edited</word_default>
-      <word_custom>Ра��ылка ( %s ) изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_edit</word_key>
+      <word_default>Edit Mail</word_default>
+      <word_custom>Изменить пи�ьмо</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_edited</word_key>
-      <word_default>Bulk mail edited!</word_default>
-      <word_custom>Ра��ылка изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_content</word_key>
+      <word_default><![CDATA[<strong>Mail Content</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тек�т пи�ьма</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_maillogadd</word_key>
-      <word_default>Bulk mail ( %s ) added</word_default>
-      <word_custom>Ра��ылка ( %s ) добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_subject</word_key>
+      <word_default><![CDATA[<strong>Mail Subject</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тема пи�ьма</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_entercont</word_key>
-      <word_default>You must enter a mail subject and mail content before submitting. Please try again.</word_default>
-      <word_custom>�еобходимо вве�ти тему и тек�т пи�ьма.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_html</word_key>
+      <word_default>Send mail in HTML format? (Full HTML formatting and tags allowed)</word_default>
+      <word_custom>Отправить пи�ьма в формате HTML</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_nogroups</word_key>
-      <word_default>You must select at least one group to send this mail message to. Please try again.</word_default>
-      <word_custom>Вы должны выбрать хот� бы одну группу-адре�атов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_nonefound</word_key>
-      <word_default><![CDATA[Your criteria didn't match any members. Please adjust your current criteria, ensuring all correct fields are selected or entered.]]></word_default>
-      <word_custom>Вашему критерию пои�ка не �оответ�твует ни один пользователь. Измените критерии пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_honor</word_key>
+      <word_default><![CDATA[Honor the '<strong>Send me any updates sent by the community administrator</strong>' setting? This will only mail members who have opted in.]]></word_default>
+      <word_custom>Отправить пи�ьмо только тем пользовател�м, которые разрешили в �воем профиле получать пи�ьма от админи�трации?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_noid</word_key>
-      <word_default>There was no ID passed to the mailer. Please try again.</word_default>
-      <word_custom>ID отправител� не найден. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_groups</word_key>
+      <word_default><![CDATA[<strong>Send to Groups:</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Группы адре�атов:</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_initiated</word_key>
-      <word_default>Bulk mail initiated!</word_default>
-      <word_custom>Отправка ра��ылки начата!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_step2</word_key>
+      <word_default>Step 2: Filters</word_default>
+      <word_custom>Шаг 2: Фильтры</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_nosend</word_key>
-      <word_default><![CDATA[Cannot send - the mail doesn't have a subject and content. Please try again.]]></word_default>
-      <word_custom>�евозможно отправить - не указана тема и тек�т пи�ьма. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_addfilters</word_key>
+      <word_default><![CDATA[<strong>Additional Filters</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дополнительные фильтры</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_norecord</word_key>
-      <word_default>Could not find the bulk mail record you requested. Please try again.</word_default>
-      <word_custom>�евозможно найти ра��ылку. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>b_nposts</word_key>
+      <word_default><![CDATA[Send to members with <em><strong>n</strong></em> posts]]></word_default>
+      <word_custom>Отправить пользовател�м � количе�твом �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_canceled</word_key>
-      <word_default>Bulk mail canceled!</word_default>
-      <word_custom>Ра��ылка отменена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_njoined</word_key>
+      <word_default><![CDATA[Send to members who joined <em><strong>n</strong></em> days ago]]></word_default>
+      <word_custom><![CDATA[Отправить пользовател�м, которые зареги�трировали�ь <em><strong>n</strong></em> дней назад]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_deleted</word_key>
-      <word_default>Bulk mail deleted!</word_default>
-      <word_custom>Ра��ылка удалена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_ndays</word_key>
+      <word_default><![CDATA[Send to members whose last visit was <em><strong>n</strong></em> days ago]]></word_default>
+      <word_custom><![CDATA[Отправить пользовател�м, чей по�ледний визит был <em><strong>n</strong></em> дней назад]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>b_title</word_key>
-      <word_default>Bulk Mail Management</word_default>
-      <word_custom>Управление ра��ылкой</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>bulkmail_notes_info</word_key>
-      <word_default><![CDATA[Please be aware that bulk emails are sent by a task in IP.Board in the System Scheduler.  They are not sent immediately upon saving or resending a bulk email.  You can manually run this task in the System Scheduler if you wish to force emails to send immediately, otherwise
-							they will be sent based on activity on your forums.  Also, please be aware that any users who elect <em>not</em> to receive emails from the administrator in their user control panel will <strong>not</strong> receive bulk mails.]]></word_default>
-      <word_custom><![CDATA[Отправка ра��ылки о�уще�твл�ет�� задачей в планировщике задач IP.Board. По�тому ра��ылка не �тартует мгновенно. Вы можете вручную запу�тить задачу в планировщике, е�ли вам крайне необходимо о�уще�твить ра��ылку в ближайшее врем�. Также учитывайте тот факт, что пользователи, выбравшие опцию «<em>�е</em> получать �ообщени� от админи�трации форума» в �воих на�тройках, <em>не</em> получат пи�ем ра��ылки.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_qtag_info</word_key>
+      <word_default><![CDATA[You may use the following 'quick tags' in your mail and they will be converted when the mail is sent.]]></word_default>
+      <word_custom>В вашей ра��ылке вы можете и�пользовать �ледующие теги, которые будут заменены при отправке ра��ылки.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_bulkmail</word_pack>
-      <word_key>bulkmail_notes_tl</word_key>
-      <word_default>Important Information</word_default>
-      <word_custom>Важно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>b_qtag</word_key>
+      <word_default>Quick Tags</word_default>
+      <word_custom>До�тупные теги</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qbname</word_key>
+      <word_default><![CDATA[<em>The name of your community</em>]]></word_default>
+      <word_custom><![CDATA[<em>�азвание форума</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_leaveblank</word_key>
+      <word_default>Leave blank to not filter</word_default>
+      <word_custom>Чтобы не и�пользовать фильтр, про�то о�тавьте поле пу�тым.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qptotal</word_key>
+      <word_default><![CDATA[<em>The total number of posts</em>]]></word_default>
+      <word_custom><![CDATA[<em>Общее количе�тво �ообщений на форуме</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qmtotal</word_key>
+      <word_default><![CDATA[<em>The total number of registered members</em>]]></word_default>
+      <word_custom><![CDATA[<em>Общее количе�тво зареги�трированных пользователей</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qboardurl</word_key>
+      <word_default><![CDATA[<em>The URL to your community</em>]]></word_default>
+      <word_custom><![CDATA[<em>�дре� форума</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qonlinetime</word_key>
+      <word_default><![CDATA[<em>The time that the most number of members were online</em>]]></word_default>
+      <word_custom><![CDATA[<em>Дата рекорда по�ещаемо�ти форума</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qid</word_key>
+      <word_default><![CDATA[<em>The member ID of the mail recipient</em>]]></word_default>
+      <word_custom><![CDATA[<em>ID пользовател� — получател� пи�ьма</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qonline</word_key>
+      <word_default><![CDATA[<em>The most number of users online</em>]]></word_default>
+      <word_custom><![CDATA[<em>Мак�имальное количе�тво пользователей в онлайне</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qmname</word_key>
+      <word_default><![CDATA[<em>The member name of the mail recipient</em>]]></word_default>
+      <word_custom><![CDATA[<em>Им� пользовател� — получател� пи�ьма</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qjoin</word_key>
+      <word_default><![CDATA[<em>The join date of the mail recipient</em>]]></word_default>
+      <word_custom><![CDATA[<em>Дата реги�трации пользовател� — получател� пи�ьма</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_lsenton</word_key>
+      <word_default>Sent On</word_default>
+      <word_custom>Дата отправки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_lsubject</word_key>
+      <word_default>Subject</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_qposts</word_key>
+      <word_default><![CDATA[<em>The number of posts for the mail recipient</em>]]></word_default>
+      <word_custom><![CDATA[<em>Количе�тво �ообщений пользовател� — получател� пи�ьма</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_stored</word_key>
+      <word_default>Your stored bulk mail</word_default>
+      <word_custom>Сохраненные ра��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_lsentto</word_key>
+      <word_default>Sent To</word_default>
+      <word_custom>Получателей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_ltime</word_key>
+      <word_default>Time Taken</word_default>
+      <word_custom>Зан�ло времени</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_minutes</word_key>
+      <word_default> minutes</word_default>
+      <word_custom> минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_inprogress</word_key>
+      <word_default>Sending mail in progress</word_default>
+      <word_custom>Ра��ылка отправл�ет��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_cancelconfirm</word_key>
+      <word_default>Click OK to cancel this mail</word_default>
+      <word_custom>�ажмите OK дл� отмены пи�ьма</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_notyet</word_key>
+      <word_default>Not yet sent</word_default>
+      <word_custom><![CDATA[<em>не отправл�ло�ь</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_deletedot</word_key>
+      <word_default>Delete...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_create</word_key>
+      <word_default>Create new bulk mail</word_default>
+      <word_custom>Создать ра��ылку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_resenddot</word_key>
+      <word_default>Resend...</word_default>
+      <word_custom>Перезапу�к ра��ылки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_bulkmail</word_pack>
+      <word_key>b_editdot</word_key>
+      <word_default>Edit...</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -736,672 +529,566 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_key>b_nobulk</word_key>
       <word_default>No bulk mailings to display</word_default>
       <word_custom>�ет ра��ылок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_repnum_info</word_key>
-      <word_default>Entering 0 will prevent this group from giving any reputation points</word_default>
-      <word_custom>Значение 0 запретит пользовател�м �той группы измен�ть репутацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_allow_customization_d</word_key>
+      <word_default>If enabled, the member will be able to alter their background and other items on their profile page</word_default>
+      <word_custom>Е�ли разрешено, то пользователи могут мен�ть фон и другие �лементы оформлени� на �транице �воего профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_repmaxneg</word_key>
-      <word_default>Maximum number of negative reputation points this group can give in a 24 hour period</word_default>
-      <word_custom>Мак�имальное количе�тво «-» (мину�ов) к репутации, которое пользователь �той группы может по�тавить в течение 24 ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_allow_url_bgimage_d</word_key>
+      <word_default>If enabled, the member will be able to enter a URL to use as a background image</word_default>
+      <word_custom>Е�ли разрешено, то пользователи �могут вве�ти ��ылку дл� и�пользовани� изображени� фона профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_deletebutton</word_key>
-      <word_default>Delete Group</word_default>
-      <word_custom>Удалить группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_allow_upload_bgimage_d</word_key>
+      <word_default>If enabled, the member will be able to upload a background image up to the filesize specified above.</word_default>
+      <word_custom>Е�ли разрешено, то пользователи �могут загружать изображение дл� фона профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_repmaxpos</word_key>
-      <word_default>Maximum number of positive reputation points this group can give in a 24 hour period</word_default>
-      <word_custom>Мак�имальное количе�тво «+» (плю�ов) к репутации, которое пользователь �той группы может по�тавить в течение 24 ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_allow_customization</word_key>
+      <word_default>Allow profile customization</word_default>
+      <word_custom>Разрешена пер�онализаци� профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_moveusersto</word_key>
-      <word_default><![CDATA[<strong>Move users in this group to...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Переме�тить пользовател� из �той группы в</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_allow_url_bgimage</word_key>
+      <word_default>Background Image: Allow URL</word_default>
+      <word_custom>Указание URL</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_numusers</word_key>
-      <word_default><![CDATA[<strong>Number of users in this group</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво пользователей в группе</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_allow_upload_bgimage</word_key>
+      <word_default>Background Image: Allow uploads</word_default>
+      <word_custom>Загрузка файлов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_numusers_sec</word_key>
-      <word_default><![CDATA[<strong>Number of users with this group as their <u>secondary</u> group</strong><br /><i>This secondary group will be removed for these users.</i>]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво пользователей имеющих группу <u>второ�тепенной</u></strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_customization_title</word_key>
+      <word_default>Profile Customization</word_default>
+      <word_custom>Пер�онализаци� профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_cannotdel</word_key>
-      <word_default><![CDATA[<em>Cannot Delete</em>]]></word_default>
-      <word_custom><![CDATA[<em>�евозможно удалить</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_bw_view_reps</word_key>
+      <word_default>Can view who gave reputation?</word_default>
+      <word_custom>Может про�матривать кто изменил репутацию?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_removeconf</word_key>
-      <word_default>Removal Confirmation: </word_default>
-      <word_custom>Подтверждение удалени�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_no_status_import</word_key>
+      <word_default>Remove Status Import Ability</word_default>
+      <word_custom>Запретить возможно�ть импортировать �тату� </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_createbutton</word_key>
-      <word_default>Create...</word_default>
-      <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_no_status_import_d</word_key>
+      <word_default><![CDATA[If 'yes', members in this group will not be able to import their statuses from Facebook and Twitter, etc]]></word_default>
+      <word_custom><![CDATA[Е�ли у�тановлено "Да", то пользователи данной группы не �могут импортировать �тату�ы из Facebook, Twitter и др.]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_listusers</word_key>
-      <word_default>List Users...</word_default>
-      <word_custom>Спи�ок пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_view_board_warning</word_key>
+      <word_default><![CDATA[If the guest group cannot access the site, nobody will be able to register. If you want to force guests to log in before allowing access to the community this can be done in the Security and Privacy <a href='%s' target='_blank'>settings</a>.]]></word_default>
+      <word_custom><![CDATA[Е�ли группе го�тей запретить до�туп про�матривать форум, то никто не �может зареги�трировать��. Е�ли вы хотите за�тавить в�ех пользователей авторизовывать�� дл� про�мотра форума, то �то можно включить в <a href='%s' target='_blank'>�а�тройках безопа�но�ти</a>.]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_editg</word_key>
-      <word_default>Edit Group</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>gf_can_send_report</word_key>
+      <word_default>Can submit reports?</word_default>
+      <word_custom>Может отправл�ть жалобы?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_deleteg</word_key>
-      <word_default>Delete Group</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_can_view_report</word_key>
+      <word_default>Can view reports?</word_default>
+      <word_custom>Может про�матривать жалобы?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_basenewon</word_key>
-      <word_default><![CDATA[<strong>Base new group on...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>О�нованную на</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_rc_perms_for</word_key>
+      <word_default>Report Center permissions for:</word_default>
+      <word_custom>До�туп к жалобам дл�:</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_createnew</word_key>
-      <word_default>Create a new User Group</word_default>
-      <word_custom>Создать группу пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tab_groupform_rc</word_key>
+      <word_default>Report Center</word_default>
+      <word_custom>Жалобы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_issupermod</word_key>
-      <word_default>Is Super Mod</word_default>
-      <word_custom>Супермодератор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_t_tagging</word_key>
+      <word_default>Tagging</word_default>
+      <word_custom>Теги</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_membercount</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_disable_tagging</word_key>
+      <word_default>Disable Tagging Ability</word_default>
+      <word_custom>Запретить теги</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_canaccessacp</word_key>
-      <word_default>Can Access ACP</word_default>
-      <word_custom>До�туп в �дминцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gbw_disable_tagging_desc</word_key>
+      <word_default>If yes, members in this group will be unable to use the tagging system</word_default>
+      <word_custom>Е�ли опци� включена дл� группы, то пользователь не �может и�пользовать �и�тему тегов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_grouptitle</word_key>
-      <word_default>Group Title</word_default>
-      <word_custom>�азвание группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_maxmessages_info</word_key>
+      <word_default>Use 0 for no limit, or -1 to disable</word_default>
+      <word_custom>И�пользуйте 0 дл� отмены ограничени�, или -1 дл� отключени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_usergroupman</word_key>
+      <word_key>gbw_disable_prefixes</word_key>
+      <word_default>Disable Prefix Ability</word_default>
+      <word_custom>Запретить добавл�ть префик�ы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gbw_disable_prefixes_desc</word_key>
+      <word_default>If yes, members in this group will not be able to set a tag as a prefix</word_default>
+      <word_custom>Е�ли опци� включена дл� группы, то пользователь не �может у�танавливать тег, как префик� дл� темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_max_bgimg_upload</word_key>
+      <word_default>Max upload size in KB</word_default>
+      <word_custom>Мак�имальный размер файла в КБ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_maxnotify_desc</word_key>
+      <word_default>Once limit is reached, oldest notifications are automatically removed.  Use 0 for no limit.</word_default>
+      <word_custom>Как только на�тупает лимит, прои�ходит автоматиче�кое удаление �тарых уведомлений. И�пользуйте 0 дл� отключение лимита.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_maxnotify</word_key>
+      <word_default>Maximum Stored Notifications</word_default>
+      <word_custom>Мак�имальное количе�тво хранимых уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_calc_with_secondary</word_key>
+      <word_default>Inc. Secondary Groups in Count</word_default>
+      <word_custom>Включа� дополнительные группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_id</word_key>
+      <word_default>ID</word_default>
+      <word_custom>ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_mass_pm_too_large</word_key>
+      <word_default><![CDATA[You cannot set the group's maximum number of personal conversation invitations to a number higher than 500.]]></word_default>
+      <word_custom>Мак�имальное количе�тво приглашений не может превышать 500</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_no_status</word_key>
+      <word_default>Remove Status Update ability</word_default>
+      <word_custom>Запретить возможно�ть измен�ть �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_pm_limit</word_key>
+      <word_default>Only allow %s PM topics in a 24 hour period</word_default>
+      <word_custom>Разрешить �оздание только %s личных �ообщений в течение 24 ча�ов </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_permissions</word_key>
+      <word_default>Permissions</word_default>
+      <word_custom>У�тановки модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_details</word_key>
+      <word_default>Group Details</word_default>
+      <word_custom>�а�тройки группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_pm_flood</word_key>
+      <word_default>...and only 1 PM topic every %s minutes</word_default>
+      <word_custom>...и разрешить �оздание только 1 личного �ообщени� каждые %s минут</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_access_control</word_key>
+      <word_default>Access Control</word_default>
+      <word_custom>У�тановки модерировани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_display_name</word_key>
+      <word_default>Display Name</word_default>
+      <word_custom>Права на изменени� имен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_pms</word_key>
+      <word_default>Personal Messages</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_search</word_key>
+      <word_default>Search</word_default>
+      <word_custom>Пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_promotion</word_key>
+      <word_default>Group Promotion</word_default>
+      <word_custom>Продвижение пользователей группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_access_permissions</word_key>
+      <word_default>Access Permissions</word_default>
+      <word_custom>О�новные права до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>sm_setrestrict</word_key>
+      <word_default>Would you like to configure ACP restrictions for this group?</word_default>
+      <word_custom>Хотите на�троить права до�тупа к �дминцентру дл� �той группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>sm_detectacp</word_key>
+      <word_default>We have detected that you have promoted the group to an administrative role and this group does not have any ACP restrictions</word_default>
+      <word_custom>Обнаружено, что вы разрешили группе до�туп в �дминцентр без ограничений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_when</word_key>
+      <word_default>when</word_default>
+      <word_custom>когда у пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>sm_configrest</word_key>
+      <word_default>Configure Admin Restrictions?</word_default>
+      <word_custom>�а�троить ограничени� до�тупа к �дминцентру?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_sigs</word_key>
+      <word_default>Signatures</word_default>
+      <word_custom>Подпи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_reps</word_key>
+      <word_default>Reputation</word_default>
+      <word_custom>Репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>sm_nothanks</word_key>
+      <word_default>No thanks</word_default>
+      <word_custom>�ет, �па�ибо</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_t_uploads</word_key>
+      <word_default>Uploading</word_default>
+      <word_custom>Прикрепление файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>sm_yesplease</word_key>
+      <word_default><![CDATA[<strong>Yes, set up restrictions</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Да, хочу</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_preset</word_key>
+      <word_default>You cannot remove the preset groups. You can only rename and edit their settings.</word_default>
+      <word_custom>�ельз� удалить �и�темную группу. Вы можете только переименовать или изменить ее на�тройки.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_whichgroup</word_key>
+      <word_default>We could not determine which group you were attempting to edit or delete. Please try again.</word_default>
+      <word_custom>�е удало�ь определить какую группу вы пытаете�ь изменить или удалить. Попробуйте �нова.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_nav</word_key>
+      <word_default>Manage User Groups</word_default>
+      <word_custom>Управление группами пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_deleting</word_key>
+      <word_default>Deleting a User Group</word_default>
+      <word_custom>Удаление группы пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_title</word_key>
       <word_default>User Group Management</word_default>
-      <word_custom>Группы пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Управление группами пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_mpromote_to</word_key>
-      <word_default><![CDATA[Promote members of this group to: %s<br />when they reach %s %s]]></word_default>
-      <word_custom><![CDATA[Перемещать пользователей �той группы в другую группу пользователей (например, � более вы�окими правами)  %s<br />когда у них �тановит��: %s %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_mecries</word_key>
+      <word_default><![CDATA[No 'move to' group ID was specified. Please try again.]]></word_default>
+      <word_custom>�е указана группа дл� перемещени�.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_mpromote_no</word_key>
-      <word_default><![CDATA[Administrators cannot be promoted - they're already at the top!]]></word_default>
-      <word_custom>�дмини�траторы не могут иметь продвижени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_removed</word_key>
+      <word_default>Group Removed!</word_default>
+      <word_custom>Группа удалена!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_mpromote</word_key>
-      <word_default><![CDATA[Choose '<strong>Don't Promote</strong>' to disable promotions ]]></word_default>
-      <word_custom>Выберите «�е продвигать» дл� отключени� продвижени� пользователей �той группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_title_error</word_key>
+      <word_default>You must enter a group title.</word_default>
+      <word_custom>Вы должны вве�ти название группы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_macp</word_key>
-      <word_default>Can access Admin CP?</word_default>
-      <word_custom>Пользователи �той группы имеют до�туп к �дминцентру? </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_removedlog</word_key>
+      <word_default><![CDATA[Removed Group '%s']]></word_default>
+      <word_custom><![CDATA[Удалена группа '%s']]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_msup</word_key>
-      <word_default>Is Super Moderator (can moderate everywhere)?</word_default>
-      <word_custom>Пользователи �той группы Супермодераторы (могут модерировать в�е разделы форума)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_oneperm</word_key>
+      <word_default>You must choose at least one permission set for this group. Please try again.</word_default>
+      <word_custom>�еобходимо выбрать хот� бы одну ма�ку до�тупа. Попробуйте еще раз.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_dmax_info</word_key>
-      <word_default>This relates to the maximum number of changes a user can make to their display name within the X day period set. Use 0 to disallow users from changing their own display name.</word_default>
-      <word_custom>Сколько раз пользователь имеет право изменить отображаемое им� в отведенный период. 0 запретит пользовател�м измен�ть отображаемое им�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_editedlog</word_key>
+      <word_default><![CDATA[Edited Group '%s']]></word_default>
+      <word_custom>Изменена группа «%s»</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_dlimit_info</word_key>
-      <word_default><![CDATA[This is the number of days in which the number of changes are made. For example <em>30</em> would mean that the user could only change their name X amount of times in a 30 day period.]]></word_default>
-      <word_custom>За какой период пользователь имеет право изменить отображаемое им�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_pergreater</word_key>
+      <word_default><![CDATA[You cannot specify an upload per post limit greater than the globally allowed one. That just doesn't work!]]></word_default>
+      <word_custom>�ельз� указать лимит прикрепл�емых файлов к �ообщению больше чем, общий лимит.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_dmax</word_key>
-      <word_default>Display Name Change: Max Changes per X days</word_default>
-      <word_custom>Мак�имальное количе�тво изменений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_addedlog</word_key>
+      <word_default><![CDATA[Added Group '%s']]></word_default>
+      <word_custom>Добавлена группа «%s»</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_spmmaxstor</word_key>
-      <word_default>Max number of storable messages?</word_default>
-      <word_custom>Мак�имальное количе�тво �охран�емых личных �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_edited</word_key>
+      <word_default>Group Edited!</word_default>
+      <word_custom>Группа изменена!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_dlimit</word_key>
-      <word_default>Display Name Change: Limit Days</word_default>
-      <word_custom>Период изменени� отображаемого имени</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_unlimited</word_key>
+      <word_default><![CDATA[<em>unlimited</em>]]></word_default>
+      <word_custom><![CDATA[<em>не ограничено</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_spmmax_info</word_key>
-      <word_default>Enter 0 or leave blank to allow no invites other than named recipient. (Max: 500)</word_default>
-      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� возможно�ти приглашени� других уча�тников в бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_adding</word_key>
+      <word_default>Adding New User Group</word_default>
+      <word_custom>Создание новой группы пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_spm</word_key>
-      <word_default>Can use PM system?</word_default>
-      <word_custom>Могут и�пользовать личные �ообщени� (ЛС)?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>per_saved</word_key>
+      <word_default>Permission configuration page</word_default>
+      <word_custom>Страница на�тройки прав до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_spmperday_info</word_key>
-      <word_default>Enter 0 or leave blank to disable limit.</word_default>
-      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_added</word_key>
+      <word_default>Group Added!</word_default>
+      <word_custom>Группа добавлена!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_spmmax</word_key>
-      <word_default>Max number of invites allowed?</word_default>
-      <word_custom>Мак�имальное чи�ло пользователей дл� приглашени� в одну бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_editing</word_key>
+      <word_default>Editing User Group </word_default>
+      <word_custom>Изменение группы пользователей </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_semail_flood</word_key>
-      <word_default>...and only 1 email every %s minutes</word_default>
-      <word_custom>...и разрешить отправку только 1 пи�ьма на e-mail каждые %s минут.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_addgroup</word_key>
+      <word_default>Add Group</word_default>
+      <word_custom>Добавить группу</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_semail</word_key>
-      <word_default>Can email members from the board?</word_default>
-      <word_custom>Могут отправл�ть пи�ьма � форума на e-mail?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_cannotobt</word_key>
+      <word_default><![CDATA[<em>cannot obtain</em>]]></word_default>
+      <word_custom><![CDATA[<em>невозможно определить</em>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_semail_info</word_key>
-      <word_default>Leave bottom section blank to remove limits.</word_default>
-      <word_custom>Дл� отключени� ограничений о�тавьте поле пу�тым.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_disabled</word_key>
+      <word_default><![CDATA[<em>disabled</em>]]></word_default>
+      <word_custom><![CDATA[<em>отключено</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_semail_limit</word_key>
-      <word_default>Only allow %s emails in a 24 hour period</word_default>
-      <word_custom>Разрешить отправку только %s пи�ем на e-mail в течение 24 ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_compedit</word_key>
+      <word_default>Complete Edit</word_default>
+      <word_custom>Сохранить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_sflood</word_key>
-      <word_default>Number of seconds for search flood control</word_default>
-      <word_custom>Временной интервал между повторным пои�ком по форуму (защита от ма��овых атак �ервера) (в �екундах)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_gtitle</word_key>
+      <word_default>Group Title</word_default>
+      <word_custom><![CDATA[�азвание группы<br /><span class='desctext'>(Об�зательно)</span>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_sflood_info</word_key>
-      <word_default>Stops search abuse. Enter 0 or leave blank for no flood control.</word_default>
-      <word_custom>Введите количе�тво �екунд, в течение которых пользователь �той группы по�ле и�пользовани� пои�ка не �может им во�пользовать�� повторно. Эта опци� защищает форум от атак на �ервер за �чет ма��ового пои�ка в короткий период времени.&#13;
-Введите 0 дл� отключени� ограничени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_permset</word_key>
+      <word_default>Use an existing permission set</word_default>
+      <word_custom>И�пользовать �ледующие ма�ки до�тупа к форумам</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_ssearch</word_key>
-      <word_default>Can use search system?</word_default>
-      <word_custom>Могут и�пользовать пои�к по форуму?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_dontprom</word_key>
+      <word_default><![CDATA[Don't Promote]]></word_default>
+      <word_custom>�е продвигать</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_sbadword</word_key>
-      <word_default>Can bypass badword filters?</word_default>
-      <word_custom>Отключить фильтр плохих �лов дл� данной группы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_appguests</word_key>
+      <word_default><![CDATA[<br /><em>(Does not apply to guests)</em>]]></word_default>
+      <word_custom><![CDATA[<br /><em>(�е применительно к го�т�м)</em>  ]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_addfriends</word_key>
-      <word_default>Can add friends?</word_default>
-      <word_custom>Может добавл�ть друзей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_newpermset</word_key>
+      <word_default>-- OR -- Create a new permission set</word_default>
+      <word_custom>-- ИЛИ -- �оздать новую ма�ку до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_shtml</word_key>
-      <word_default>Can post HTML?</word_default>
-      <word_custom>Могут и�пользовать HTML в �ообщени�х?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_globalperm</word_key>
+      <word_default>Global</word_default>
+      <word_custom>Глобальные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_ssite</word_key>
-      <word_default>Can access the site?</word_default>
-      <word_custom>Могут про�матривать форум?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_globalsett</word_key>
+      <word_default>Group Settings</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_soffline</word_key>
-      <word_default>Can access the site when it is offline?</word_default>
-      <word_custom>Могут про�матривать отключенный форум?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_gicon</word_key>
+      <word_default>Group Icon Image</word_default>
+      <word_custom><![CDATA[Картинка группы<br />(Опционально)]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_sprofile</word_key>
-      <word_default><![CDATA[Can view member profiles <em>and</em> member list?]]></word_default>
-      <word_custom><![CDATA[Могут про�матривать профили <em>и</em> �пи�ок пользователей?]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_upersonalpho_w</word_key>
-      <word_default>Max Width (px): </word_default>
-      <word_custom>Мак�имальна� ширина (px): </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_upersonalpho_h</word_key>
-      <word_default>Max Height (px): </word_default>
-      <word_custom>Мак�имальна� вы�ота (px): </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_upersonalpho_l</word_key>
-      <word_default>(Leave blank to disable uploads)</word_default>
-      <word_custom>(О�тавьте поле пу�тым дл� запрета загрузки фотографии)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_uav</word_key>
-      <word_default><![CDATA[<strong>Avatar Uploads</strong><br />Allow avatar uploads?]]></word_default>
-      <word_custom>Могут загружать аватары � же�ткого ди�ка?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_upm</word_key>
-      <word_default><![CDATA[<strong>Personal Message Uploads</strong><br />Allow attachments in PMs?]]></word_default>
-      <word_custom>Могут прикрепл�ть файлы к личным �ообщени�м?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_inkb</word_key>
-      <word_default> (in KB) </word_default>
-      <word_custom> (в килобайтах) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_ucurrently</word_key>
-      <word_default>currently: </word_default>
-      <word_custom>�ейча�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_upersonalpho</word_key>
-      <word_default><![CDATA[<strong>Personal Photo Limits</strong><br />Max upload file size and dimensions]]></word_default>
-      <word_custom><![CDATA[<strong>Мак�имальный размер файла фотографии пользовател�. Ограничени� ширины и вы�оты фотографии</strong><br>(О�тавьте поле пу�тым дл� запрета загрузки фотографии)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_upost</word_key>
-      <word_default><![CDATA[Per Post Upload Limit<br /><span class='desctext'>Max total file space allowed in each post or PM</span>]]></word_default>
-      <word_custom>Мак�имальный размер файла дл� прикреплени� в личных �ообщени�х и �ообщени�х тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_upost_info</word_key>
-      <word_default><![CDATA[<em>Enter 0 to disable a per post limit. This number must be less than the Global Upload limit.</em>]]></word_default>
-      <word_custom><![CDATA[<em>Значение параметра должно быть меньше, чем ди�кова� квота. Введите 0 дл� отключени� ограничени�.</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_usingle</word_key>
-      <word_default><![CDATA[<span class='desctext'>Note that the maximum size of one single file upload is controlled by the PHP configuration on your server. This can be changed by your webhost. The current limit is: </span>]]></word_default>
-      <word_custom>Загрузка одиночных файлов также ограничена вашей PHP конфигурацией —</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_uglobal_info</word_key>
-      <word_default><![CDATA[<em>Enter -1 to disable uploads. Enter 0 to disable this limit.</em>]]></word_default>
-      <word_custom><![CDATA[<em>Введите -1 дл� отключени� возможно�ти прикрепл�ть файлы.
-Введите 0 дл� отключени� ди�ковой квоты.</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_uglobal</word_key>
-      <word_default><![CDATA[Global Upload Limit<br /><span class='desctext'>Max total global file space for all uploads for each user in this group. (Includes: PMs and Posts)</span>]]></word_default>
-      <word_custom>Ди�кова� квота на хранение в�ех файлов (включа� личные �ообщени� и �ообщени� в темах)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_hide_online</word_key>
-      <word_default>Force this group to be anonymous?</word_default>
-      <word_custom>Сделать группу анонимной?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_hide</word_key>
-      <word_default>Hide this group from member list?</word_default>
-      <word_custom>Скрыть �ту группу из �пи�ка пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_gformsuf_info</word_key>
-      <word_default><![CDATA[It is recommended to enter the closing tag of the prefix tag, if one is entered.<br />(Example:&lt;/span&gt;)]]></word_default>
-      <word_custom><![CDATA[При отображении в �пи�ке активных пользователей по�ле имени каждого пользовател� �той группы будет добавлена �трочка из �то на�тройки.
-Пример заполнени�: </span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_gformsuf</word_key>
-      <word_default><![CDATA[Group Formatting Suffix<br />(Optional)]]></word_default>
-      <word_custom><![CDATA[Суффик� имени пользовател�<br>(Опционально)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_gformpre_info</word_key>
-      <word_default><![CDATA[This changes the formatting (color, font, etc) of the username of anyone in this group.<br />(Example:&lt;span style='color:red'&gt;)]]></word_default>
-      <word_custom><![CDATA[При отображении в �пи�ке активных пользователей перед именем каждого пользовател� �той группы будет добавлена �трочка из �то на�тройки. Вы можете и�пользовать �ту опцию дл� ра�кра�ки имен пользователей групп, например: <span style='color:red'>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_newpermset_info</word_key>
+      <word_default>After the group is created you will have the option of configuring permissions for your new permission set.</word_default>
+      <word_custom>По�ле �оздани� группы пользователей, вы �можете на�троить новую ма�ку до�тупа.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
       <word_key>gf_gformpre</word_key>
-      <word_default><![CDATA[Group Formatting Prefix<br />(Optional)]]></word_default>
+      <word_default>Group Formatting Prefix</word_default>
       <word_custom><![CDATA[Префик� группы<br />Опционально]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -1410,29 +1097,20 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_default><![CDATA[You will need to first upload the image you wish to have to the server via FTP or another method. Once uploaded, you can put the path or URL here.<br/ >Upload to: <b>/public/style_extra/team_icons/{image}</b> (replace {image} with the image name).<br />Can be a relative link, i.e. <b>public/style_extra/team_icons/admin.gif</b>  ...  or it can a full URL starting with <b>'http://'</b>]]></word_default>
       <word_custom>Путь к картинке может задавать�� как отно�ительно /public/style_extra/team_icons/{image} так и полно�тью � и�пользованием http://&#13;
 {image} должен быть заменен названием файла, например public/style_extra/team_icons/admin.gif</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_gicon</word_key>
-      <word_default><![CDATA[Group Icon Image<br />(Optional)]]></word_default>
-      <word_custom><![CDATA[Картинка группы<br />(Опционально)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_gformsuf</word_key>
+      <word_default>Group Formatting Suffix</word_default>
+      <word_custom><![CDATA[Суффик� имени пользовател�<br>(Опционально)]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_newpermset_info</word_key>
-      <word_default>After the group is created you will have the option of configuring permissions for your new permission set.</word_default>
-      <word_custom>По�ле �оздани� группы пользователей, вы �можете на�троить новую ма�ку до�тупа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_gformpre_info</word_key>
+      <word_default><![CDATA[This changes the formatting (color, font, etc) of the username of anyone in this group.<br />(Example:&lt;span style='color:red'&gt;)]]></word_default>
+      <word_custom><![CDATA[При отображении в �пи�ке активных пользователей перед именем каждого пользовател� �той группы будет добавлена �трочка из �то на�тройки. Вы можете и�пользовать �ту опцию дл� ра�кра�ки имен пользователей групп, например: <span style='color:red'>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -1440,699 +1118,415 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_key>g_permset_info</word_key>
       <word_default>CTRL + Click to select multiple ones.</word_default>
       <word_custom>Можно выбрать не�колько, удержива� клавишу Ctrl.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_newpermset</word_key>
-      <word_default>-- OR -- Create a new permission set</word_default>
-      <word_custom>-- ИЛИ -- �оздать новую ма�ку до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_hide_online</word_key>
+      <word_default>Force this group to be anonymous?</word_default>
+      <word_custom>Сделать группу анонимной?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_permset</word_key>
-      <word_default>Use an existing permission set</word_default>
-      <word_custom>И�пользовать �ледующие ма�ки до�тупа к форумам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_gformsuf_info</word_key>
+      <word_default><![CDATA[It is recommended to enter the closing tag of the prefix tag, if one is entered.<br />(Example:&lt;/span&gt;)]]></word_default>
+      <word_custom><![CDATA[При отображении в �пи�ке активных пользователей по�ле имени каждого пользовател� �той группы будет добавлена �трочка из �то на�тройки.
+Пример заполнени�: </span>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_gtitle</word_key>
-      <word_default><![CDATA[Group Title<br /><span class='desctext'>(Required)</span>]]></word_default>
-      <word_custom><![CDATA[�азвание группы<br /><span class='desctext'>(Об�зательно)</span>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_uglobal</word_key>
+      <word_default><![CDATA[Global Upload Limit<br /><span class='desctext'>Max total global file space for all uploads for each user in this group. (Includes: PMs and Posts)</span>]]></word_default>
+      <word_custom>Ди�кова� квота на хранение в�ех файлов (включа� личные �ообщени� и �ообщени� в темах)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_globalsett</word_key>
-      <word_default>Group Settings</word_default>
-      <word_custom>О�новные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_hide</word_key>
+      <word_default>Hide this group from member list?</word_default>
+      <word_custom>Скрыть �ту группу из �пи�ка пользователей?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_dontprom</word_key>
-      <word_default><![CDATA[Don't Promote]]></word_default>
-      <word_custom>�е продвигать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>g_usingle</word_key>
+      <word_default><![CDATA[<span class='desctext'>Note that the maximum size of one single file upload is controlled by the PHP configuration on your server. This can be changed by your webhost. The current limit is: </span>]]></word_default>
+      <word_custom>Загрузка одиночных файлов также ограничена вашей PHP конфигурацией —</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_globalperm</word_key>
-      <word_default>Global</word_default>
-      <word_custom>Глобальные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_uglobal_info</word_key>
+      <word_default><![CDATA[<em>Enter -1 to disable uploads. Enter 0 to disable this limit.</em>]]></word_default>
+      <word_custom><![CDATA[<em>Введите -1 дл� отключени� возможно�ти прикрепл�ть файлы.
+Введите 0 дл� отключени� ди�ковой квоты.</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_cannotobt</word_key>
-      <word_default><![CDATA[<em>cannot obtain</em>]]></word_default>
-      <word_custom><![CDATA[<em>невозможно определить</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_upost</word_key>
+      <word_default><![CDATA[Per Post Upload Limit<br /><span class='desctext'>Max total file space allowed in each post or PM</span>]]></word_default>
+      <word_custom>Мак�имальный размер файла дл� прикреплени� в личных �ообщени�х и �ообщени�х тем</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_appguests</word_key>
-      <word_default><![CDATA[<br /><em>(Does not apply to guests)</em>]]></word_default>
-      <word_custom><![CDATA[<br /><em>(�е применительно к го�т�м)</em>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_inkb</word_key>
+      <word_default> (in KB) </word_default>
+      <word_custom> (в килобайтах) </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_disabled</word_key>
-      <word_default><![CDATA[<em>disabled</em>]]></word_default>
-      <word_custom><![CDATA[<em>отключено</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_ucurrently</word_key>
+      <word_default>currently: </word_default>
+      <word_custom>�ейча�: </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_compedit</word_key>
-      <word_default>Complete Edit</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_upost_info</word_key>
+      <word_default><![CDATA[<em>Enter 0 to disable a per post limit. This number must be less than the Global Upload limit.</em>]]></word_default>
+      <word_custom><![CDATA[<em>Значение параметра должно быть меньше, чем ди�кова� квота. Введите 0 дл� отключени� ограничени�.</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_addgroup</word_key>
-      <word_default>Add Group</word_default>
-      <word_custom>Добавить группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_upersonalpho</word_key>
+      <word_default><![CDATA[Personal Photo Limits<br /><span class='desctext'>Max upload file size and dimensions</span>]]></word_default>
+      <word_custom><![CDATA[<strong>Мак�имальный размер файла фотографии пользовател�. Ограничени� ширины и вы�оты фотографии</strong><br>(О�тавьте поле пу�тым дл� запрета загрузки фотографии)]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_unlimited</word_key>
-      <word_default><![CDATA[<em>unlimited</em>]]></word_default>
-      <word_custom><![CDATA[<em>не ограничено</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_upm</word_key>
+      <word_default><![CDATA[<strong>Personal Message Uploads</strong><br />Allow attachments in PMs?]]></word_default>
+      <word_custom>Могут прикрепл�ть файлы к личным �ообщени�м?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>per_saved</word_key>
-      <word_default>Permission configuration page</word_default>
-      <word_custom>Страница на�тройки прав до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_upersonalpho_l</word_key>
+      <word_default>(Leave blank to disable uploads)</word_default>
+      <word_custom>(О�тавьте поле пу�тым дл� запрета загрузки фотографии)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_adding</word_key>
-      <word_default>Adding New User Group</word_default>
-      <word_custom>Создание новой группы пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_upersonalpho_h</word_key>
+      <word_default>Max Height (px): </word_default>
+      <word_custom>Мак�имальна� вы�ота (px): </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_editing</word_key>
-      <word_default>Editing User Group </word_default>
-      <word_custom>Изменение группы пользователей </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>g_upersonalpho_w</word_key>
+      <word_default>Max Width (px): </word_default>
+      <word_custom>Мак�имальна� ширина (px): </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_added</word_key>
-      <word_default>Group Added!</word_default>
-      <word_custom>Группа добавлена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_soffline</word_key>
+      <word_default>Can access the site when it is offline?</word_default>
+      <word_custom>Могут про�матривать отключенный форум?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_editedlog</word_key>
-      <word_default><![CDATA[Edited Group '%s']]></word_default>
-      <word_custom>Изменена группа «%s»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>gf_ssite</word_key>
+      <word_default>Can access the site?</word_default>
+      <word_custom>Могут про�матривать форум?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_edited</word_key>
-      <word_default>Group Edited!</word_default>
-      <word_custom>Группа изменена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>gf_addfriends</word_key>
+      <word_default>Can use friends system?</word_default>
+      <word_custom>Может добавл�ть друзей?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_addedlog</word_key>
-      <word_default><![CDATA[Added Group '%s']]></word_default>
-      <word_custom>Добавлена группа «%s»</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_shtml</word_key>
+      <word_default>Can post HTML?</word_default>
+      <word_custom>Могут и�пользовать HTML в �ообщени�х?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_pergreater</word_key>
-      <word_default><![CDATA[You cannot specify an upload per post limit greater than the globally allowed one. That just doesn't work!]]></word_default>
-      <word_custom>�ельз� указать лимит прикрепл�емых файлов к �ообщению больше чем, общий лимит.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_sprofile</word_key>
+      <word_default><![CDATA[Can view member profiles <em>and</em> member list?]]></word_default>
+      <word_custom><![CDATA[Могут про�матривать профили <em>и</em> �пи�ок пользователей?]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_oneperm</word_key>
-      <word_default>You must choose at least one permission set for this group. Please try again.</word_default>
-      <word_custom>�еобходимо выбрать хот� бы одну ма�ку до�тупа. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_sbadword</word_key>
+      <word_default>Can bypass badword filters?</word_default>
+      <word_custom>Отключить фильтр плохих �лов дл� данной группы?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_title_error</word_key>
-      <word_default>You must enter a group title.</word_default>
-      <word_custom>Вы должны вве�ти название группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>gf_sflood</word_key>
+      <word_default>Number of seconds for search flood control</word_default>
+      <word_custom>Временной интервал между повторным пои�ком по форуму (защита от ма��овых атак �ервера) (в �екундах)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_removedlog</word_key>
-      <word_default><![CDATA[Removed Group '%s']]></word_default>
-      <word_custom><![CDATA[Удалена группа '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_ssearch</word_key>
+      <word_default>Can use search system?</word_default>
+      <word_custom>Могут и�пользовать пои�к по форуму?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_removed</word_key>
-      <word_default>Group Removed!</word_default>
-      <word_custom>Группа удалена!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_sflood_info</word_key>
+      <word_default>Stops search abuse. Enter 0 or leave blank for no flood control.</word_default>
+      <word_custom>Введите количе�тво �екунд, в течение которых пользователь �той группы по�ле и�пользовани� пои�ка не �может им во�пользовать�� повторно. Эта опци� защищает форум от атак на �ервер за �чет ма��ового пои�ка в короткий период времени.&#13;
+Введите 0 дл� отключени� ограничени�.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_mecries</word_key>
-      <word_default><![CDATA[No 'move to' group ID was specified. Please try again.]]></word_default>
-      <word_custom>�е указана группа дл� перемещени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_spmmax</word_key>
+      <word_default>Max number of invites allowed?</word_default>
+      <word_custom>Мак�имальное чи�ло пользователей дл� приглашени� в одну бе�еду</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_preset</word_key>
-      <word_default>You cannot remove the preset groups. You can only rename and edit their settings.</word_default>
-      <word_custom>�ельз� удалить �и�темную группу. Вы можете только переименовать или изменить ее на�тройки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_spm</word_key>
+      <word_default>Can use PM system?</word_default>
+      <word_custom>Могут и�пользовать личные �ообщени� (ЛС)?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_deleting</word_key>
-      <word_default>Deleting a User Group</word_default>
-      <word_custom>Удаление группы пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_spmperday_info</word_key>
+      <word_default>Enter 0 or leave blank to disable limit.</word_default>
+      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� ограничени�.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_whichgroup</word_key>
-      <word_default>We could not determine which group you were attempting to edit or delete. Please try again.</word_default>
-      <word_custom>�е удало�ь определить какую группу вы пытаете�ь изменить или удалить. Попробуйте �нова.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_dlimit</word_key>
+      <word_default>Display Name Change: Limit Days</word_default>
+      <word_custom>Период изменени� отображаемого имени</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_title</word_key>
+      <word_key>gf_dlimit_info</word_key>
+      <word_default><![CDATA[This is the number of days in which the number of changes are made. For example <em>30</em> would mean that the user could only change their name X amount of times in a 30 day period.]]></word_default>
+      <word_custom>За какой период пользователь имеет право изменить отображаемое им�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_spmmaxstor</word_key>
+      <word_default>Max number of storable messages?</word_default>
+      <word_custom>Мак�имальное количе�тво �охран�емых личных �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_spmmax_info</word_key>
+      <word_default>Enter 0 or leave blank to allow no invites other than named recipient. (Max: 500)</word_default>
+      <word_custom>Введите 0 или о�тавьте поле пу�тым дл� отключени� возможно�ти приглашени� других уча�тников в бе�еду</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_macp</word_key>
+      <word_default>Can access Admin CP?</word_default>
+      <word_custom>Пользователи �той группы имеют до�туп к �дминцентру? </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_dmax</word_key>
+      <word_default>Display Name Change: Max Changes per X days</word_default>
+      <word_custom>Мак�имальное количе�тво изменений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_msup</word_key>
+      <word_default>Is Super Moderator (can moderate everywhere)?</word_default>
+      <word_custom>Пользователи �той группы Супермодераторы (могут модерировать в�е разделы форума)?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_dmax_info</word_key>
+      <word_default>This relates to the maximum number of changes a user can make to their display name within the X day period set. Use 0 to disallow users from changing their own display name.</word_default>
+      <word_custom>Сколько раз пользователь имеет право изменить отображаемое им� в отведенный период. 0 запретит пользовател�м измен�ть отображаемое им�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_mpromote_no</word_key>
+      <word_default><![CDATA[Administrators cannot be promoted - they're already at the top!]]></word_default>
+      <word_custom>�дмини�траторы не могут иметь продвижени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_mpromote_to</word_key>
+      <word_default><![CDATA[Promote members of this group to: %s<br />when they reach %s %s]]></word_default>
+      <word_custom><![CDATA[Перемещать пользователей �той группы в другую группу пользователей (например, � более вы�окими правами)  %s<br />когда у них �тановит��: %s %s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_mpromote</word_key>
+      <word_default><![CDATA[Choose '<strong>Don't Promote</strong>' to disable promotions ]]></word_default>
+      <word_custom>Выберите «�е продвигать» дл� отключени� продвижени� пользователей �той группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_grouptitle</word_key>
+      <word_default>Group Title</word_default>
+      <word_custom>�азвание группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_usergroupman</word_key>
       <word_default>User Group Management</word_default>
-      <word_custom>Управление группами пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_custom>Группы пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>sm_setrestrict</word_key>
-      <word_default>Would you like to configure ACP restrictions for this group?</word_default>
-      <word_custom>Хотите на�троить права до�тупа к �дминцентру дл� �той группы?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>g_canaccessacp</word_key>
+      <word_default>Can Access ACP</word_default>
+      <word_custom>До�туп в �дминцентр</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_nav</word_key>
-      <word_default>Manage User Groups</word_default>
-      <word_custom>Управление группами пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_numusers</word_key>
+      <word_default>Number of users in this group</word_default>
+      <word_custom><![CDATA[<strong>Количе�тво пользователей в группе</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>sm_nothanks</word_key>
-      <word_default>No thanks</word_default>
-      <word_custom>�ет, �па�ибо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>g_removeconf</word_key>
+      <word_default>Removal Confirmation: </word_default>
+      <word_custom>Подтверждение удалени�: </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>sm_yesplease</word_key>
-      <word_default><![CDATA[<strong>Yes, set up restrictions</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Да, хочу</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>g_deleteg</word_key>
+      <word_default>Delete Group</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>g_when</word_key>
-      <word_default>when</word_default>
-      <word_custom>когда у пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_cannotdel</word_key>
+      <word_default>Cannot Delete</word_default>
+      <word_custom><![CDATA[<em>�евозможно удалить</em>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>sm_configrest</word_key>
-      <word_default>Configure Admin Restrictions?</word_default>
-      <word_custom>�а�троить ограничени� до�тупа к �дминцентру?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_editg</word_key>
+      <word_default>Edit Group</word_default>
+      <word_custom>Изменить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>sm_detectacp</word_key>
-      <word_default>We have detected that you have promoted the group to an administrative role and this group does not have any ACP restrictions</word_default>
-      <word_custom>Обнаружено, что вы разрешили группе до�туп в �дминцентр без ограничений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_listusers</word_key>
+      <word_default>List Users...</word_default>
+      <word_custom>Спи�ок пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_sigs</word_key>
-      <word_default>Signatures</word_default>
-      <word_custom>Подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_createbutton</word_key>
+      <word_default>Create...</word_default>
+      <word_custom>Создать</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_reps</word_key>
-      <word_default>Reputation</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_basenewon</word_key>
+      <word_default><![CDATA[<strong>Base new group on...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>О�нованную на</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_pms</word_key>
-      <word_default>Personal Messages</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_membercount</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_uploads</word_key>
-      <word_default>Uploading</word_default>
-      <word_custom>Прикрепление файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_createnew</word_key>
+      <word_default>Create a new User Group</word_default>
+      <word_custom>Создать группу пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_access_permissions</word_key>
-      <word_default>Access Permissions</word_default>
-      <word_custom>О�новные права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_issupermod</word_key>
+      <word_default>Is Super Mod</word_default>
+      <word_custom>Супермодератор</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_search</word_key>
-      <word_default>Search</word_default>
-      <word_custom>Пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_numusers_sec</word_key>
+      <word_default><![CDATA[Number of users with this group as their <u>secondary</u> group]]></word_default>
+      <word_custom><![CDATA[<strong>Количе�тво пользователей имеющих группу <u>второ�тепенной</u></strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_display_name</word_key>
-      <word_default>Display Name</word_default>
-      <word_custom>Права на изменени� имен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_moveusersto</word_key>
+      <word_default>Move users in this group to...</word_default>
+      <word_custom><![CDATA[<strong>Переме�тить пользовател� из �той группы в</strong>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_access_control</word_key>
-      <word_default>Access Control</word_default>
-      <word_custom>У�тановки модерировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_repmaxpos</word_key>
+      <word_default>Maximum number of positive reputation points this group can give in a 24 hour period</word_default>
+      <word_custom>Мак�имальное количе�тво «+» (плю�ов) к репутации, которое пользователь �той группы может по�тавить в течение 24 ча�ов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_promotion</word_key>
-      <word_default>Group Promotion</word_default>
-      <word_custom>Продвижение пользователей группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>g_deletebutton</word_key>
+      <word_default>Delete Group</word_default>
+      <word_custom>Удалить группу</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_permissions</word_key>
-      <word_default>Permissions</word_default>
-      <word_custom>У�тановки модерировани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_repmaxneg</word_key>
+      <word_default>Maximum number of negative reputation points this group can give in a 24 hour period</word_default>
+      <word_custom>Мак�имальное количе�тво «-» (мину�ов) к репутации, которое пользователь �той группы может по�тавить в течение 24 ча�ов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_groups</word_pack>
-      <word_key>gf_pm_limit</word_key>
-      <word_default>Only allow %s PM topics in a 24 hour period</word_default>
-      <word_custom>Разрешить �оздание только %s личных �ообщений в течение 24 ча�ов </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_pm_flood</word_key>
-      <word_default>...and only 1 PM topic every %s minutes</word_default>
-      <word_custom>...и разрешить �оздание только 1 личного �ообщени� каждые %s минут</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_t_details</word_key>
-      <word_default>Group Details</word_default>
-      <word_custom>�а�тройки группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_usesigs</word_key>
-      <word_default>Disable members of this group from editing their signatures?</word_default>
-      <word_custom>Запретить редактировать �вои подпи�и?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_no_status</word_key>
-      <word_default>Remove Status Update ability</word_default>
-      <word_custom>Запретить возможно�ть измен�ть �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_mass_pm_too_large</word_key>
-      <word_default>Max number of invites allowed, can not be over 500</word_default>
-      <word_custom>Мак�имальное количе�тво приглашений не может превышать 500</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_calc_with_secondary</word_key>
-      <word_default>Inc. Secondary Groups in Count</word_default>
-      <word_custom>Включа� дополнительные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>g_id</word_key>
-      <word_default>ID</word_default>
-      <word_custom>ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_maxnotify_desc</word_key>
-      <word_default>Once limit is reached, oldest notifications are automatically removed.  Use 0 for no limit.</word_default>
-      <word_custom>Как только на�тупает лимит, прои�ходит автоматиче�кое удаление �тарых уведомлений. И�пользуйте 0 дл� отключение лимита.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_maxnotify</word_key>
-      <word_default>Maximum Stored Notifications</word_default>
-      <word_custom>Мак�имальное количе�тво хранимых уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_max_bgimg_upload</word_key>
-      <word_default>Max upload size in KB</word_default>
-      <word_custom>Мак�имальный размер файла в КБ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gbw_allow_customization_d</word_key>
-      <word_default>if enabled, the member will be able to alter their background and other items on their profile page</word_default>
-      <word_custom>Е�ли разрешено, то пользователи могут мен�ть фон и другие �лементы оформлени� на �транице �воего профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gbw_allow_url_bgimage_d</word_key>
-      <word_default>If enabled, the member will be able to enter a URL to use as a background image</word_default>
-      <word_custom>Е�ли разрешено, то пользователи �могут вве�ти ��ылку дл� и�пользовани� изображени� фона профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gbw_allow_upload_bgimage_d</word_key>
-      <word_default>If enabled, the member will be able to upload a background image up to the filesize specified below.</word_default>
-      <word_custom>Е�ли разрешено, то пользователи �могут загружать изображение дл� фона профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_bw_allow_url_bgimage</word_key>
-      <word_default>Background Image: Allow URL</word_default>
-      <word_custom>Указание URL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_bw_allow_customization</word_key>
-      <word_default>Allow profile customization</word_default>
-      <word_custom>Разрешена пер�онализаци� профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_bw_allow_upload_bgimage</word_key>
-      <word_default>Background Image: Allow uploads</word_default>
-      <word_custom>Загрузка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_customization_title</word_key>
-      <word_default>Profile Customization</word_default>
-      <word_custom>Пер�онализаци� профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_bw_view_reps</word_key>
-      <word_default>Can view who gave reputation?</word_default>
-      <word_custom>Может про�матривать кто изменил репутацию?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_no_status_import_d</word_key>
-      <word_default><![CDATA[If 'yes', members in this group will not be able to import their statuses from Facebook and Twitter, etc]]></word_default>
-      <word_custom><![CDATA[Е�ли у�тановлено "Да", то пользователи данной группы не �могут импортировать �тату�ы из Facebook, Twitter и др.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_no_status_import</word_key>
-      <word_default>Remove Status Import Ability</word_default>
-      <word_custom>Запретить возможно�ть импортировать �тату� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_view_board_warning</word_key>
-      <word_default><![CDATA[If the guest group cannot access the site, nobody will be able to register. If you want to force guests to log in before allowing access to the board this can be done in the Security and Privacy <a href='%s' target='_blank'>settings</a>.]]></word_default>
-      <word_custom><![CDATA[Е�ли группе го�тей запретить до�туп про�матривать форум, то никто не �может зареги�трировать��. Е�ли вы хотите за�тавить в�ех пользователей авторизовывать�� дл� про�мотра форума, то �то можно включить в <a href='%s' target='_blank'>�а�тройках безопа�но�ти</a>.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_sigmaximages</word_key>
-      <word_default>Maximum number of images users in this group can add to their signature</word_default>
-      <word_custom>Мак�имальное количе�тво изображений в подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>gf_repnum_info</word_key>
+      <word_default>Entering 0 will prevent this group from giving any reputation points</word_default>
+      <word_custom>Значение 0 запретит пользовател�м �той группы измен�ть репутацию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2140,9 +1534,20 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_key>gf_sigmaxurls</word_key>
       <word_default>Maximum number of urls users in this group can add to their signature</word_default>
       <word_custom>Мак�имальное количе�тво ��ылок в подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_usesigs</word_key>
+      <word_default>Disable members of this group from editing their signatures?</word_default>
+      <word_custom>Запретить редактировать �вои подпи�и?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_sigmaximages</word_key>
+      <word_default>Maximum number of images users in this group can add to their signature</word_default>
+      <word_custom>Мак�имальное количе�тво изображений в подпи�и</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2150,19 +1555,6 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_key>gf_sigmaxdims</word_key>
       <word_default>Maximum dimensions of images users in this group can use in their signature</word_default>
       <word_custom>Мак�имальный размер изображений в подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_groups</word_pack>
-      <word_key>gf_sigmaxtext</word_key>
-      <word_default>Maximum number of lines users in this group can use in their signature</word_default>
-      <word_custom>Мак�имальное количе�тво �трок в подпи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2170,5482 +1562,251 @@ Visit your email preferences ({board_url}?app=core&module=usercp) and ensure tha
       <word_key>gf_editprofile</word_key>
       <word_default>Allow members in this group to edit their profile information</word_default>
       <word_custom>Разрешить пользовател�м �той группы измен�ть информацию в �воем профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>total_pms_replies</word_key>
-      <word_default>Delete all %s personal conversation replies</word_default>
-      <word_custom>Удалить ответы на личные �ообщение %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>confirm_pm_button</word_key>
-      <word_default>Delete messages</word_default>
-      <word_custom>Удалить �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>total_pms_topics</word_key>
-      <word_default>Delete all %s personal conversations started</word_default>
-      <word_custom>Удалить в�е личные �ообщени� %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qunlock</word_key>
-      <word_default>Unlock these accounts</word_default>
-      <word_custom>Разблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qunban</word_key>
-      <word_default>Unban these accounts</word_default>
-      <word_custom>Разбанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_processbutton</word_key>
-      <word_default><![CDATA[Process &gt;&gt;]]></word_default>
-      <word_custom>Выполнить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_daysandhours</word_key>
-      <word_default>%s days and %s hours ago</word_default>
-      <word_custom>%s дней и %s ча�ов назад</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_groupcolon</word_key>
-      <word_default>Group:</word_default>
-      <word_custom>Группа:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_failures</word_key>
-      <word_default><![CDATA[Oldest Failure: %s<br />Most Recent Failure: %s<br />Total Failures: %s]]></word_default>
-      <word_custom><![CDATA[Ранние ошибки: %s<br />
-�овые ошибки: %s<br />
-В�его ошибок: %s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>total_pms_sent</word_key>
-      <word_default>Total messages from</word_default>
-      <word_custom>В�его �ообщений от</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qfinalizepartial</word_key>
-      <word_default>Finalize these accounts</word_default>
-      <word_custom>Завершить �ти учетные запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qresend</word_key>
-      <word_default>Resend validation emails</word_default>
-      <word_custom>Отправить повторно пи�ьмо на e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qfailed</word_key>
-      <word_default>Fail Logins</word_default>
-      <word_custom>�еудачные попытки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qgroup</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qjoined</word_key>
-      <word_default>Joined</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qapprove</word_key>
-      <word_default>Approve these accounts</word_default>
-      <word_custom>�ктивировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qban</word_key>
-      <word_default>Ban these accounts</word_default>
-      <word_custom>Забанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qdelete</word_key>
-      <word_default>Delete these accounts</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qsent</word_key>
-      <word_default>Email Sent</word_default>
-      <word_custom>Отправлено подтверждение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qaddress</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qposts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qdisplayname</word_key>
-      <word_default><![CDATA[Member's Display Name]]></word_default>
-      <word_custom>Отображаемое им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qgobutton</word_key>
-      <word_default>Go</word_default>
-      <word_custom>Выполнить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qcoppa</word_key>
-      <word_default>COPPA Requests</word_default>
-      <word_custom>COPPA запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qemailchange</word_key>
-      <word_default>Email Changes</word_default>
-      <word_custom>Изменение e-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qshowreg</word_key>
-      <word_default>Show Registering (User Validation)</word_default>
-      <word_custom>Зареги�трированные (подтверждение пользователем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qshowadmin</word_key>
-      <word_default>Show Registering (Admin Validation)</word_default>
-      <word_custom>Зареги�трированные (подтверждение админи�тратором)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memberq</word_key>
-      <word_default>Member %s Queue</word_default>
-      <word_custom>Спи�ок %s пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_qshowall</word_key>
-      <word_default>Show All</word_default>
-      <word_custom>Показать в�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ip_table</word_key>
-      <word_default>Database Table</word_default>
-      <word_custom>Таблица базы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipalsofound</word_key>
-      <word_default>This IP address was also found...</word_default>
-      <word_custom>Данный IP адре� был также найден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipvalidating</word_key>
-      <word_default>Members using that IP when VALIDATING</word_default>
-      <word_custom>Пользователи, и�пользовавшие �тот IP при �КТИВ�ЦИИ УЧЕТ�ОЙ З�ПИСИ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipemailing</word_key>
-      <word_default>Members using that IP when EMAILING</word_default>
-      <word_custom>Пользователи, и�пользовавшие �тот IP при ОТПР�ВКЕ E-MAIL</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipfirstused</word_key>
-      <word_default>First Used</word_default>
-      <word_custom>Впервые и�пользован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipviewpoll</word_key>
-      <word_default>View Poll</word_default>
-      <word_custom>По�мотреть голо�ование</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipvoting</word_key>
-      <word_default>Members using that IP when VOTING</word_default>
-      <word_custom>Пользователи, и�пользовавшие �тот IP при ГОЛОСОВ��ИИ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipviewpost</word_key>
-      <word_default>View Post</word_default>
-      <word_custom>По�мотреть �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipview</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipposted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipposting</word_key>
-      <word_default>Members using that IP when POSTING</word_default>
-      <word_custom>Пользователи, и�пользовавшие �тот IP при ��ПИС��ИИ СООБЩЕ�ИЯ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipregistered</word_key>
-      <word_default>Registered</word_default>
-      <word_custom>Зареги�трирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipip</word_key>
-      <word_default>IP</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipemail</word_key>
-      <word_default>Email</word_default>
-      <word_custom>E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipposts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipname</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nomatches</word_key>
-      <word_default><![CDATA[<strong>No Matches Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Запи�и не найдены</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipreg</word_key>
-      <word_default>Members using that IP when REGISTERING</word_default>
-      <word_custom>Пользователи, и�пользовавшие �тот IP при РЕГИСТР�ЦИИ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipresolves</word_key>
-      <word_default><![CDATA[<strong>IP address resolves to</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>IP адре� определ�ет�� как</strong> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_noips</word_key>
-      <word_default><![CDATA[<strong>No IP Addresses Found</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>IP адре� не найден</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_learnmore</word_key>
-      <word_default>Learn more...</word_default>
-      <word_custom>Информаци� о IP-адре�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_iptool</word_key>
-      <word_default>IP Tool</word_default>
-      <word_custom>Ин�трумент IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_usedotherreg</word_key>
-      <word_default>Used for other Reg.</word_default>
-      <word_custom>И�пользовано при других реги�траци�х</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_lastused</word_key>
-      <word_default>Last Used</word_default>
-      <word_custom>Дата по�леднего и�пользовани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_timesused</word_key>
-      <word_default>Times Used</word_default>
-      <word_custom>Входов � �того IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_counttxt</word_key>
-      <word_default><![CDATA[%s's IP addresses %s matches]]></word_default>
-      <word_custom>У пользовател� %s найдено %s уникальных IP-адре�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipaddy</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_showmebutton</word_key>
-      <word_default>Show Me!</word_default>
-      <word_custom>Выве�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_showme</word_key>
-      <word_default><![CDATA[<strong>Show me everything you know about this IP...</strong>]]></word_default>
-      <word_custom><![CDATA[</strong>Выве�ти в�ю информацию об IP</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipmulti</word_key>
-      <word_default>IP Multi-Tool</word_default>
-      <word_custom>Информаци� об IP адре�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_showallip</word_key>
-      <word_default>Find IP addresses a member has posted with</word_default>
-      <word_custom>Показать в�е IP адре�а, которые были у �того пользовател� в момент добавлени� �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_showallbutton</word_key>
-      <word_default>Get IP Addresses</word_default>
-      <word_custom>�айти IP адре� �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_iptoolstitle</word_key>
-      <word_default>IP Address Tools</word_default>
-      <word_custom>Ин�трументы IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_message</word_key>
-      <word_default>Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_membanned</word_key>
-      <word_default> Member(s) Banned</word_default>
-      <word_custom> Пользователи забанены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memunlocked</word_key>
-      <word_default> Member(s) Unlocked</word_default>
-      <word_custom> Блокировка �н�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nolockloc</word_key>
-      <word_default>You did not select any members to unlock or ban. Please try again.</word_default>
-      <word_custom>Вы не выбрали ни одного пользовател�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_emailchangeun</word_key>
-      <word_default>Member %s email change request unapproved</word_default>
-      <word_custom>Запро� пользовател� %s на �мену e-mail отклонен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memdeleted</word_key>
-      <word_default> Member(s) Deleted</word_default>
-      <word_custom> Пользователи удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_noemailloc</word_key>
-      <word_default>We could not find the email change to unapprove.</word_default>
-      <word_custom>�евозможно найти запро� на �мену e-mail.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memunbanned</word_key>
-      <word_default> Member(s) Unbanned</word_default>
-      <word_custom> Пользователи разбанены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_removedmem</word_key>
-      <word_default> Members Removed</word_default>
-      <word_custom> Пользователи удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nomemunban</word_key>
-      <word_default>You did not select any members to unban or delete.</word_default>
-      <word_custom>Вы не выбрали ни одного пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_regdenied</word_key>
-      <word_default> Member Registration Denied: </word_default>
-      <word_custom> Реги�траци� пользовател� отклонена: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_valcannot</word_key>
-      <word_default>Cannot resend validation emails to the following members who are awaiting admin validation: </word_default>
-      <word_custom>�евозможно отправить e-mail дл� подтверждени� �ледующим пользовател�м: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_regat</word_key>
-      <word_default>Registration at </word_default>
-      <word_custom>Реги�траци� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_vallog</word_key>
-      <word_default> Validation Emails Resent: </word_default>
-      <word_custom> E-mail дл� подтверждени� отправлен: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_passwordrec</word_key>
-      <word_default>Password recovery information from </word_default>
-      <word_custom>Во��тановление парол� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memregapp2</word_key>
-      <word_default> Member Registration Approved: </word_default>
-      <word_custom> Реги�траци� пользовател� подтверждена: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memregapp</word_key>
-      <word_default> Member Registrations Approved</word_default>
-      <word_custom> Реги�траци� пользователей подтверждена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_choosemem</word_key>
-      <word_default>Choose the member from the selection</word_default>
-      <word_custom>Выберите пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nomemsel</word_key>
-      <word_default>You did not select any members to approve, delete, or resend the validation email to. Please try again.</word_default>
-      <word_custom>Пользователи не выбраны. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nomemberloc</word_key>
-      <word_default><![CDATA[There are no members with the names that start with '%s'. Please try again.]]></word_default>
-      <word_custom>�евозможно найти пользовател� � таким именем.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_entername</word_key>
-      <word_default><![CDATA[Enter the member's name]]></word_default>
-      <word_custom>Введите им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_multiple</word_key>
-      <word_default>Multiple Pages</word_default>
-      <word_custom>�е�колько �траниц</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_single</word_key>
-      <word_default>Single Page</word_default>
-      <word_custom>Одна �траница</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_noexact</word_key>
-      <word_default>We could not find an exact match for that member name. Some choices will be shown below.</word_default>
-      <word_custom>�е удало�ь найти точное �овпадение дл� указанного имени. �иже показаны некоторые �овпадени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_noname</word_key>
-      <word_default>You did not enter a name to search by. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти им� пользовател� дл� пои�ка.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_nonameloc</word_key>
-      <word_default>Could not locate a member with the ID of: %s. Please try again.</word_default>
-      <word_custom>�евозможно найти пользовател� � ID: %s. Попробуйте ещё раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_partip</word_key>
-      <word_default>N/A - Partial IP Address</word_default>
-      <word_custom>Ча�тичный IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_guest</word_key>
-      <word_default>Guest</word_default>
-      <word_custom>Го�ть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_notavail</word_key>
-      <word_default><![CDATA[<em>Not Available</em>]]></word_default>
-      <word_custom><![CDATA[<em>�е до�тупно</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_noip</word_key>
-      <word_default>You did not enter an IP address to search by. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти IP-адре� дл� пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_banned</word_key>
-      <word_default>Banned Members</word_default>
-      <word_custom>Забаненные пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_spammers</word_key>
-      <word_default>Spam Members</word_default>
-      <word_custom>Спамеры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_locked</word_key>
-      <word_default>Locked Members</word_default>
-      <word_custom>Заблокированные пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_rowtype_validating</word_key>
-      <word_default>validating</word_default>
-      <word_custom>ожидает активации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_validating</word_key>
-      <word_default>Validating Members</word_default>
-      <word_custom>Ожидают подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_rowtype_spam</word_key>
-      <word_default>spam</word_default>
-      <word_custom>�памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_rowtype_locked</word_key>
-      <word_default>locked</word_default>
-      <word_custom>заблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_rowtype_banned</word_key>
-      <word_default>banned</word_default>
-      <word_custom>забанен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_notype</word_key>
-      <word_default>No %s members found</word_default>
-      <word_custom>%s пользователей не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_ipcolon</word_key>
-      <word_default>IP:</word_default>
-      <word_custom>IP:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_adminval</word_key>
-      <word_default><![CDATA[Registering: <strong>(Admin Validation)</strong>]]></word_default>
-      <word_custom><![CDATA[Реги�траци�: <strong>(подтверждение админи�тратором)</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_na</word_key>
-      <word_default>N/A</word_default>
-      <word_custom>�е до�тупно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_unapprove</word_key>
-      <word_default>Unapprove?</word_default>
-      <word_custom>Отменить подтверждение ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_emailchange</word_key>
-      <word_default>Email change request at </word_default>
-      <word_custom>Изменение e-mail адре�а </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_lostpass</word_key>
-      <word_default>Lost Password</word_default>
-      <word_custom>Забыли пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_userval</word_key>
-      <word_default><![CDATA[Registering: <strong>(User Validation)</strong>]]></word_default>
-      <word_custom>Реги�траци�: (подтверждение пользователем)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_deletedmem</word_key>
-      <word_default><![CDATA[<em>Deleted Member</em>]]></word_default>
-      <word_custom><![CDATA[<em>Пользователь удален</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_coppa</word_key>
-      <word_default>( COPPA Request )</word_default>
-      <word_custom>(Запро� COPPA)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_add</word_key>
-      <word_default>Add Group</word_default>
-      <word_custom>Добавить группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_save</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_groups</word_key>
-      <word_default>Profile Field Groups</word_default>
-      <word_custom>Группы дополнительных полей профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_key_desc</word_key>
-      <word_default>(Must be a unique word for this group)</word_default>
-      <word_custom>(Слово должно быть уникальным дл� группы)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_key</word_key>
-      <word_default>Group Reference Key</word_default>
-      <word_custom>Ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_deletebutton</word_key>
-      <word_default>Delete Custom Field</word_default>
-      <word_custom>Удалить поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_g_name</word_key>
-      <word_default>Group Name</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_removeto</word_key>
-      <word_default><![CDATA[<strong>Custom Profile Field to remove...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Поле профил� дл� удалени�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_removeconf</word_key>
-      <word_default>Removal Confirmation</word_default>
-      <word_custom>Подтверждение удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_view</word_key>
-      <word_default><![CDATA[<strong>Topic View Format?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Отображение пол� в �ообщении</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_view_info</word_key>
-      <word_default><![CDATA[Leave blank if you do not wish to add this field in the author details when viewing a topic.<br />{title} is the title of the custom field, {content} is the user added content. {key} is the form select value of the selected item in a dropdown box.<br />Example: &lt;span class='ft'&gt;{title}:&lt;/span&gt;&lt;span class='fc'&gt;{content}&lt;/span&gt;<br />Example: &lt;span class='ft'&gt;{title}:&lt;/span&gt;&lt;span class='fc'&gt;&lt;img src='imgs/{key}'&gt;&lt;/span&gt;]]></word_default>
-      <word_custom><![CDATA[О�тавьте поле пу�тым, е�ли вы не хотите, чтобы �то дополнительное поле добавл�ло�ь по�ле информации об авторе при отображении �ообщений.<br />До�тупные теги:<br />{title} — название дополнительного пол�<br />{content} — �одержимое дополнительного пол�<br />{key} — выбор пользовател� из выпадающего меню<br />Пример: &lt;dt&gt;{title}:&lt;/dt&gt;&lt;dd&gt;{content}&lt;/dd&gt;<br />
-Пример: &lt;dt&gt;{title}:&lt;/dt&gt;&lt;dd&gt;&lt;img src='imgs/{key}'&gt;&lt;/dd&gt; ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_admin_info</word_key>
-      <word_default><![CDATA[If yes, will override the above options so only admins and super moderators can see and edit this field.  <strong>If enabled, the field will not show on the registration form!</strong>]]></word_default>
-      <word_custom>При выборе «Да», �та опци� отменит предыдущие, так что только �упермодераторы и админи�траторы �могут видеть и измен�ть �то поле.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_admin</word_key>
-      <word_default><![CDATA[<strong>Make Admin and Super Moderator Editable/Viewable Only?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Сделать видимым и измен�емым только �упермодераторам и админи�траторам?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_priv_info</word_key>
-      <word_default><![CDATA[If yes, field only visible to profile owner, super moderators and admins. If 'no', members can search within this field.]]></word_default>
-      <word_custom><![CDATA[При выборе «Да», поле будет видимым только дл� �амого пользовател�, �упермодераторов и админи�траторов.<br />При выборе «�ет», о�тальные пользователи �могут и�кать по �тому полю.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_priv</word_key>
-      <word_default><![CDATA[<strong>Make this a private profile field?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Сделать �то поле личным?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_edit</word_key>
-      <word_default><![CDATA[<strong>Field can be edited by the member?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Поле может быть изменено пользователем?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_edit_info</word_key>
-      <word_default><![CDATA[If 'no', the member cannot edit the field but Super Moderators and Admins will be able to.]]></word_default>
-      <word_custom>При выборе «�ет», пользователь не �может редактировать �то поле, но �могут �упермодераторы и админи�траторы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_must_info</word_key>
-      <word_default><![CDATA[If 'yes', an error will be shown if this field is not completed.]]></word_default>
-      <word_custom>При выборе «Да», будет выводить�� �ообщение об ошибке до тех пор, пока пользователь его не заполнит.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_must</word_key>
-      <word_default><![CDATA[<strong>Field MUST be completed and not left empty?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Это поле об�зательно к заполнению?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_reg_info</word_key>
-      <word_default><![CDATA[If 'yes', the field will be shown upon registration.]]></word_default>
-      <word_custom>При выборе «Да», �то дополнительное поле будет предложено заполнить при реги�трации.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_reg</word_key>
-      <word_default><![CDATA[<strong>Include on registration page?</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Добавить на �траницу реги�трации?</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_srch_type</word_key>
-      <word_default>Search Type</word_default>
-      <word_custom>Тип пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_srch_type_info</word_key>
-      <word_default>Used when searching for members based on their value of this field</word_default>
-      <word_custom>И�пользует�� при пои�ке пользователей по значению данного пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_filter_type</word_key>
-      <word_default>Apply URL Filtering</word_default>
-      <word_custom>Применить фильтрацию URL адре�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_filter_type_info</word_key>
-      <word_default><![CDATA[If 'yes', the field will be checked against the URL whitelist/blacklist filtering.  Be careful to only enable this option on fields that you expect URLs to be submitted in.]]></word_default>
-      <word_custom>При выборе «Да» будет прои�ходить фильтраци� в�тавл�емых URL адре�ов по �пи�ку. Будьте о�торожны, и�пользу� �ту опцию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_option_info</word_key>
-      <word_default><![CDATA[In sets, one set per line<br>Example for 'Gender' field:<br>m=Male<br>f=Female<br>u=Not Telling<br>Will produce:<br><select name='pants'><option value='m'>Male</option><option value='f'>Female</option><option value='u'>Not Telling</option></select><br>m,f or u stored in database. When showing field in profile, will use value from pair (f=Female, shows 'Female')]]></word_default>
-      <word_custom><![CDATA[И�пользование: <strong>ключ=значение</strong> (по одному значению на �троку)<br />Пример дл� пол� <strong>Пол:</strong><br />m=Муж�кой<br />f=Жен�кий<br />u=�е �кажу<br /><strong>Результат:</strong><br /><select name='pants'><option value='m'>Жен�кий</option><option value='u'>�е �кажу</option></select><br />Одно из значений: <strong>m</strong>, <strong>f</strong> или <strong>u</strong> будет �охранено в базе данных.<br />При отображении в профиле выводит�� <strong>Пол: �е �кажу</strong> (при выборе пользователем значени� <strong>�е �кажу</strong>)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_option</word_key>
-      <word_default><![CDATA[<strong>Option Content (for drop downs, checkboxes and radio buttons)</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Содержимое опций дл� выпадающего меню</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_form_info</word_key>
-      <word_default><![CDATA[Use: <strong>a</strong> for alpha characters.<br />Use: <strong>n</strong> for numerics.<br />If you enter one 'a', that will allow one letter. Entering 'aa' will allow two letters, and so on.<br />Example, for credit card numbers: nnnn-nnnn-nnnn-nnnn<br />Example, Date of Birth: nn-nn-nnnn<br />Leave blank to accept any input]]></word_default>
-      <word_custom><![CDATA[И�пользование:<strong>a</strong> — буквы<br /><strong>n</strong> — цифры.<br />�апример, кредитна� карта: nnnn-nnnn-nnnn-nnnn<br />�апример, дата рождени�: nn-nn-nnnn<br />О�тавьте поле пу�тым дл� и�пользовани� любых �имволов.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_form</word_key>
-      <word_default><![CDATA[<strong>Expected Input Format</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Формат пол�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_order_info</word_key>
-      <word_default>When editing and displaying (numeric 1 lowest)</word_default>
-      <word_custom><![CDATA[При редактировании и отображении.<br />Цифра 1 — �ама� низка� позици�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_order</word_key>
-      <word_default><![CDATA[<strong>Display order</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Пор�док �ортировки</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_max_info</word_key>
-      <word_default>For text input and text areas (in characters)</word_default>
-      <word_custom>Дл� тек�товых полей (только цифры)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_max</word_key>
-      <word_default><![CDATA[<strong>Maximum Input</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Мак�имальна� длина</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_type</word_key>
-      <word_default><![CDATA[<strong>Field Type</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тип пол�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_desc_info</word_key>
-      <word_default><![CDATA[Max Characters: 250<br />Can be used to note hidden/required status]]></word_default>
-      <word_custom><![CDATA[Мак�имальное количе�тво �имволов: 250<br />Может быть и�пользовано дл� примечаний.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_key_info</word_key>
-      <word_default>This is a key that can be used to identify the field (e.g. in skins)</word_default>
-      <word_custom><![CDATA[Ключ может и�пользовать�� дл� идентификации пол�.<br />(�апример в шаблонах)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_icon</word_key>
-      <word_default><![CDATA[<strong>Profile Icon</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Иконка профил�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_key</word_key>
-      <word_default><![CDATA[<strong>Field Key</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Ключ</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_group</word_key>
-      <word_default><![CDATA[<strong>Profile Group</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Группа дополнительных полей профил�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_desc</word_key>
-      <word_default><![CDATA[<strong>Description</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Опи�ание</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_title</word_key>
-      <word_default><![CDATA[<strong>Field Title</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�азвание</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_f_title_info</word_key>
-      <word_default>Max characters: 200</word_default>
-      <word_custom>Мак�имальное количе�тво �имволов: 200</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_settings</word_key>
-      <word_default>Field Settings</word_default>
-      <word_custom>�а�тройка дополнительных полей профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_nonefound</word_key>
-      <word_default>None Found</word_default>
-      <word_custom>�ичего не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_adminonly</word_key>
-      <word_default>Admin/Super Mod Only?</word_default>
-      <word_custom>Только �дмини�тратор / Супермодератор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_sigmaxtext</word_key>
+      <word_default>Maximum number of lines users in this group can use in their signature</word_default>
+      <word_custom>Мак�имальное количе�тво �трок в подпи�и</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_showreg</word_key>
-      <word_default>Show on Registration?</word_default>
-      <word_custom>Показывать при реги�трации?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_groups</word_pack>
+      <word_key>g_secuserinfod</word_key>
+      <word_default>This secondary group will be removed for these users.</word_default>
+      <word_custom>Эта группа будет удалена как второ�тепенна� дл� �тих пользователей.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_required</word_key>
-      <word_default>Required?</word_default>
-      <word_custom>Об�зательное?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_groups</word_pack>
+      <word_key>gf_hideonline_desc</word_key>
+      <word_default>This setting is only honored if you allow anonymous logins</word_default>
+      <word_custom>Данна� на�тройка имеет �илу только при разрешенной �крытой авторизации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_notpublic</word_key>
-      <word_default>Private?</word_default>
-      <word_custom>Личное?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ban_form_filter_desc</word_key>
+      <word_default>You can use the star character (*) as a wildcard</word_default>
+      <word_custom><![CDATA[Вы можете и�пользовать �имвол '*' в каче�тве ма�ки ]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_title</word_key>
-      <word_default>Field Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ban_form_reason</word_key>
+      <word_default>Ban Reason</word_default>
+      <word_custom>Причина</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_type</word_key>
-      <word_default>Type</word_default>
+      <word_key>ban_form_type</word_key>
+      <word_default>Ban Type</word_default>
       <word_custom>Тип</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_management</word_key>
-      <word_default>Custom Profile Field Management</word_default>
-      <word_custom>Управление дополнительными пол�ми профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ban_form_filter</word_key>
+      <word_default>Ban Filter</word_default>
+      <word_custom>Фильтр</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_search_exact</word_key>
-      <word_default>Exact</word_default>
-      <word_custom>Точный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ban_added_on</word_key>
+      <word_default>Added On</word_default>
+      <word_custom>Добавлен</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_cbox</word_key>
-      <word_default>Check Boxes</word_default>
-      <word_custom>Чекбок�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ban_form_reason_desc</word_key>
+      <word_default>(Optional) Enter a reason for the ban visible to all admins</word_default>
+      <word_custom>(Опционально) Вы можете вве�ти причину бана, котора� будет видна о�тальным админи�траторам</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_search_loose</word_key>
-      <word_default>Loose</word_default>
-      <word_custom>Свободный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>sameasloginname</word_key>
+      <word_default>Same as log in name</word_default>
+      <word_custom>Такое же как логин</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_textarea</word_key>
-      <word_default>Text Area</word_default>
-      <word_custom>Тек�т (много �трок)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>memclearsearch</word_key>
+      <word_default>Clear Search</word_default>
+      <word_custom>Очи�тить пои�к</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_input</word_key>
-      <word_default>Text Input</word_default>
-      <word_custom>Тек�т (одна �трока)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_search_ttl</word_key>
+      <word_default>Member Search</word_default>
+      <word_custom>Пои�к пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_radio</word_key>
-      <word_default>Radio Buttons</word_default>
-      <word_custom>Переключатель</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>email_updated_success</word_key>
+      <word_default>The email has been successfully updated</word_default>
+      <word_custom>Email обновлен</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_drop</word_key>
-      <word_default>Drop Down Box</word_default>
-      <word_custom>Выпадающий �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>searchresultsstr</word_key>
+      <word_default>search results</word_default>
+      <word_custom>результаты пои�ка</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gedit</word_key>
-      <word_default>Edit Profile Field Group</word_default>
-      <word_custom>Изменение группы дополнительных полей профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bw_disable_tagging_desc</word_key>
+      <word_default>If yes this member will be unable to use the tagging system</word_default>
+      <word_custom>Пользователь не �может и�пользовать �и�тему тегов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gcreate</word_key>
-      <word_default>Create Profile Field Group</word_default>
-      <word_custom>Создание группы дополнительных полей профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bw_disable_tagging</word_key>
+      <word_default>Disable Tagging Ability</word_default>
+      <word_custom>Запретить и�пользовать теги</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gmodified</word_key>
-      <word_default>Custom profile field group modified</word_default>
-      <word_custom>Группа дополнительных полей изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bw_disable_prefixesm_desc</word_key>
+      <word_default>If yes, this member will not be able to set a tag as a prefix</word_default>
+      <word_custom>Пользователь не �может и�пользовать тег в каче�тве префик�а темы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gadded</word_key>
-      <word_default>Custom profile field group added</word_default>
-      <word_custom>Группа дополнительных полей добавлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>mf_t_tagging</word_key>
+      <word_default>Tagging</word_default>
+      <word_custom>Теги</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gkey</word_key>
-      <word_default>The Group Key must be a unique key. Please try another.</word_default>
-      <word_custom>Ключ группы должен быть уникален. Введите другое значение ключа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>bw_disable_prefixes</word_key>
+      <word_default>Disable Prefix Ability</word_default>
+      <word_custom>Запретить и�пользовать префик�ы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_completeform</word_key>
-      <word_default>You must complete the entire form.</word_default>
-      <word_custom>Форму необходимо заполнить полно�тью.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tools_delete_all_pms</word_key>
+      <word_default>Deleting all private messages sent by</word_default>
+      <word_custom>Удалить в�е личные �ообщени� отправленные </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_gremoved</word_key>
-      <word_default>Custom profile field group removed</word_default>
-      <word_custom>Группа дополнительных полей удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_incomplete_desc</word_key>
+      <word_default>Users who have not yet completed registration (e.g. after logging in via a social networking site)</word_default>
+      <word_custom>Пользователи не завершившие проце�� реги�трации (например по�ле входа через аккаунт �оц. �ети)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_pagetitle_add</word_key>
-      <word_default>Add Custom Profile Field</word_default>
-      <word_custom>Добавить дополнительное поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_type_incomplete</word_key>
+      <word_default>Incomplete</word_default>
+      <word_custom>�е завершившие реги�трацию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_pagetitle_edit</word_key>
-      <word_default>Edit Custom Profile Field</word_default>
-      <word_custom>Изменение дополнительного пол� профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_type_spam_desc</word_key>
+      <word_default>Users flagged as spammers either manually, or by the IPS Spam Service</word_default>
+      <word_custom><![CDATA[Пользователи отмеченные флагом "Спамер"]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_added</word_key>
-      <word_default>Profile Field Added</word_default>
-      <word_custom>Поле добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_type_spam</word_key>
+      <word_default>Spammers</word_default>
+      <word_custom>Спамеры</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_editbutton</word_key>
-      <word_default>Complete Edit</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_addbutton</word_key>
-      <word_default>Add Field</word_default>
-      <word_custom>Добавить поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_edited</word_key>
-      <word_default>Profile Field Edited</word_default>
-      <word_custom>Поле изменено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_control</word_key>
-      <word_default>Custom Profile Field Control</word_default>
-      <word_custom>Управление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_entertitle</word_key>
-      <word_default>You must enter a field title. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти название пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_removed</word_key>
-      <word_default>Profile Field Removed</word_default>
-      <word_custom>Поле удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_norow</word_key>
-      <word_default>We could not find that profile field. Please try again.</word_default>
-      <word_custom>Дополнительное поле не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>cf_gid</word_key>
-      <word_default>Could not resolve the group ID. Please try again.</word_default>
-      <word_custom>�ельз� изменить ID группы. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_deletebutton</word_key>
-      <word_default>Delete Selected</word_default>
-      <word_custom>Удалить выбранные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>no_ban_to_delete</word_key>
-      <word_default>You did not select any ban filters to delete.</word_default>
-      <word_custom>�е выбрано ни одного фильтра дл� удалени�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_names</word_key>
-      <word_default>Non-Registerable Names</word_default>
-      <word_custom>Запрещенные к реги�трации имена пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_names_none</word_key>
-      <word_default><![CDATA[<em>No Banned Names Found</em>]]></word_default>
-      <word_custom><![CDATA[<em>Забаненных пользователей не найдено</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_emails_none</word_key>
-      <word_default><![CDATA[<em>No Banned Email Addresses Found</em>]]></word_default>
-      <word_custom>Заблокированных e-mail адре�ов нет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_emails</word_key>
-      <word_default>Banned Email Addresses</word_default>
-      <word_custom>Заблокированные e-mail адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_ips</word_key>
-      <word_default>Banned IP Addresses</word_default>
-      <word_custom>Заблокированные IP адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_ips_none</word_key>
-      <word_default><![CDATA[<em>No Banned IP Addresses Found</em>]]></word_default>
-      <word_custom><![CDATA[<em>Заблокированных IP адре�ов нет</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_addnew</word_key>
-      <word_default>Add New Filter</word_default>
-      <word_custom>Добавить фильтр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_bancontrol</word_key>
-      <word_default>Ban Control</word_default>
-      <word_custom>Фильтры блокировки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_title</word_key>
-      <word_default>Ban Control</word_default>
-      <word_custom>Управление фильтрами блокировки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_added</word_key>
-      <word_default>Ban Filter Added</word_default>
-      <word_custom>Фильтр блокировки добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_removed</word_key>
-      <word_default>Ban Filter Removed</word_default>
-      <word_custom>Фильтр блокировки удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_dupe</word_key>
-      <word_default>Duplicate entry - The entry has not been added to the database, as it already exists.</word_default>
-      <word_custom>Повторна� запи�ь - Запи�ь не добавлена в базу данных так как уже �уще�твует.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ban_entersomething</word_key>
-      <word_default>You must enter something to add to the ban filters. Please try again.</word_default>
-      <word_custom>�еобходимо заполнить пол� фильтра.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_deletelink</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_editlink</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_numpips_info</word_key>
-      <word_default><![CDATA[Or pip image - image must be uploaded into 'public/style_extra/team_icons/']]></word_default>
-      <word_custom><![CDATA[Или название - изображение должно быть загружено в директорию 'public/style_extra/team_icons/']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_numpips</word_key>
-      <word_default><![CDATA[<strong>Number of pips</strong> (Maximum: 100)]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво звездочек</strong> (Мак�имально: 100)]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_minpostsneeded</word_key>
-      <word_default><![CDATA[<strong>Minimum number of posts needed</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Минимальное количе�тво �ообщений дл� получени� звани�</strong> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_addarank</word_key>
-      <word_default>Add a Member Rank</word_default>
-      <word_custom>Добавление звани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_ranktitle</word_key>
-      <word_default><![CDATA[<strong>Rank Title</strong>]]></word_default>
-      <word_custom>Звание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_minposts</word_key>
-      <word_default>Minimum Posts</word_default>
-      <word_custom>Требует�� �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_pips</word_key>
-      <word_default>Pips</word_default>
-      <word_custom>Звездочки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_removed2</word_key>
-      <word_default>Rank Removed</word_default>
-      <word_custom>Звание удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_setup</word_key>
-      <word_default>Member Rank Set Up</word_default>
-      <word_custom>�а�тройка звани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_editrank</word_key>
-      <word_default>Edit Rank</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_addrank</word_key>
-      <word_default>Add this rank</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_titles</word_key>
-      <word_default>Member Titles/Ranks</word_default>
-      <word_custom>Звани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_removed</word_key>
-      <word_default>Removed Rank Setting</word_default>
-      <word_custom>�а�тройки звани� удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_rankcontrol</word_key>
-      <word_default>Member Ranking Control</word_default>
-      <word_custom>Управление звани�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_notfounddel</word_key>
-      <word_default>We could not find the rank you were attempting to delete.</word_default>
-      <word_custom>Звание дл� удалени� не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_added2</word_key>
-      <word_default>Rank Added</word_default>
-      <word_custom>Звание добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_edited</word_key>
-      <word_default>Rank Edited</word_default>
-      <word_custom>Звание изменено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_edit</word_key>
-      <word_default>Edited Rank Setting</word_default>
-      <word_custom>Изменить на�тройки звани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_notfound</word_key>
-      <word_default>We could not find the member rank you were trying to edit.</word_default>
-      <word_custom>Звание дл� изменени� не найдено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_added</word_key>
-      <word_default>Added New Rank Setting</word_default>
-      <word_custom>�а�тройка звани� добавлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_mx100</word_key>
-      <word_default>The maximum number of pips you can have is 100. Please go back and reduce the number.</word_default>
-      <word_custom>Мак�имальное количе�тво звездочек, которое можно у�тановить - 100. Верните�ь назад и измените чи�ло.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rnk_completeform</word_key>
-      <word_default>You must complete the form fully. Please try again.</word_default>
-      <word_custom>�еобходимо полно�тью заполнить форму.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_movebutton</word_key>
-      <word_default>Move %s Members</word_default>
-      <word_custom>Переме�тить %s пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_movegroup</word_key>
-      <word_default><![CDATA[<strong>Move to group</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Переме�тить в группу</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_movemem</word_key>
-      <word_default>Move Members</word_default>
-      <word_custom>Переме�тить пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_movemem_info</word_key>
-      <word_default><![CDATA[Note: Please confirm you would like to move all of the following members - <strong>THERE IS NO UNDOING THIS ACTION!</strong>]]></word_default>
-      <word_custom><![CDATA[Подтвердите перемещение �ледующих пользователей.  <strong>ЭТО ДЕЙСТВИЕ �ЕЛЬЗЯ ОТМЕ�ИТЬ!<strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_prunebutton</word_key>
-      <word_default>Prune %s Members</word_default>
-      <word_custom>Удалить %s пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_prunenum</word_key>
-      <word_default><![CDATA[<strong>Number of members</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Количе�тво пользователей</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_prunemem_info</word_key>
-      <word_default><![CDATA[Please check the number below and confirm you want to prune all of the included members - <strong>THERE IS NO UNDOING THIS ACTION!</strong>]]></word_default>
-      <word_custom><![CDATA[Пожалуй�та убедите�ь, что вы дей�твительно хотите удалить пользователей -  <strong>ЭТО ДЕЙСТВИЕ �Е МОЖЕТ БЫТЬ ОТМЕ�Е�О!</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_prunemem</word_key>
-      <word_default>Prune Members</word_default>
-      <word_custom>Удалить пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_regbutton</word_key>
-      <word_default>Register New Account</word_default>
-      <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_custfields</word_key>
-      <word_default><![CDATA[<strong>Custom Profile Fields</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дополнительные пол� профил�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_sendconf_info</word_key>
-      <word_default><![CDATA[Includes user's password]]></word_default>
-      <word_custom>Пароль пользовател� будет указан в пи�ьме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_sendconf</word_key>
-      <word_default>Send confirmation email?</word_default>
-      <word_custom>Отправить подтверждение на e-mail?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_coppauser</word_key>
-      <word_default>COPPA User?</word_default>
-      <word_custom>Пользователь COPPA?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_group</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_registernew</word_key>
-      <word_default>Register New Member</word_default>
-      <word_custom>Создание пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_acpresinfo</word_key>
-      <word_default><![CDATA[<strong>Note: You have ACP Permission Restrictions.</strong><br />Any member you create with a group that has access to the ACP will inherit your permission restrictions automatically.]]></word_default>
-      <word_custom><![CDATA[<strong>Ваши права до�тупа к �дминцентру ограничены.</strong><br />Любой пользователь, которого вы �оздадите в группе имеющей до�туп к �дминцентру, уна�ледует ваши ограничени�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_yesplease</word_key>
-      <word_default><![CDATA[<strong>Yes, set up restrictions</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Да, хочу</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_nothanks</word_key>
-      <word_default>No thanks</word_default>
-      <word_custom>�ет, �па�ибо</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_setrestrict</word_key>
-      <word_default>Would you like to configure individual ACP restrictions for this member?</word_default>
-      <word_custom>Хотите на�троить права до�тупа к �дминцентру дл� �того пользовател� ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_thisgroup</word_key>
-      <word_default><![CDATA[%s: This group <strong>%s</strong> restricted]]></word_default>
-      <word_custom><![CDATA[%s: <strong>%s</strong> дл� �той группы запрещены]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_is</word_key>
-      <word_default>IS</word_default>
-      <word_custom> </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_isnot</word_key>
-      <word_default>IS NOT</word_default>
-      <word_custom>�Е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_belongsto</word_key>
-      <word_default>This member belongs to the following group(s):</word_default>
-      <word_custom>Пользователь входит в �ледующие группы:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_detectacp</word_key>
-      <word_default>We have detected that you have promoted %s to an administrative role and this member does not have any ACP restrictions</word_default>
-      <word_custom>Обнаружено, что пользователь %s имеет до�туп к �дминцентру без ограничений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_configrest</word_key>
-      <word_default>Configure Admin Restrictions?</word_default>
-      <word_custom>�а�троить ограничени� до�тупа к �дминцентру?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_suspendbutton</word_key>
-      <word_default>Suspend This Account</word_default>
-      <word_custom>Заблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_suspemailcont</word_key>
-      <word_default><![CDATA[<strong>Email contents</strong><br />(Tags: {membername} = member's name, {date_end} = ban end)]]></word_default>
-      <word_custom><![CDATA[<strong>Тек�т пи�ьма</strong><br />
-(Теги: {membername} = им� пользовател�, {date_end} = дата окончани� бана) ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_suspfor</word_key>
-      <word_default><![CDATA[<strong>Suspended %s for...</strong>]]></word_default>
-      <word_custom>Заблокировать %s на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_suspnotify</word_key>
-      <word_default><![CDATA[<strong>Email notification to this member?</strong><br />(If so, you may edit the email below)]]></word_default>
-      <word_custom>Уведомить по e-mail?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_acctsusp</word_key>
-      <word_default>Member Account Suspension</word_default>
-      <word_custom>Блокировка учетной запи�и пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_suspnote</word_key>
-      <word_default>Note: If this member is already suspended, any new setting will restart the suspension</word_default>
-      <word_custom>Примечание: е�ли пользователь ранее уже был заблокирован, то нова� блокировка перекроет �тарую (от�чет времени начнет�� � момента вы�тавлени� новой блокировки)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_memoptions</word_key>
-      <word_default>Member Options</word_default>
-      <word_custom>�а�тройки пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_typeof</word_key>
-      <word_default><![CDATA[<strong>Type of Search</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Тип пои�ка</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_ignorehuh</word_key>
-      <word_default>Ignore?</word_default>
-      <word_custom>Игнорировать?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_nomemfound</word_key>
-      <word_default>No members found...</word_default>
-      <word_custom>Пользователи не найдены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_members</word_key>
-      <word_default>Members</word_default>
-      <word_custom>Пользователи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_savebutton</word_key>
-      <word_default>Save Member</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_nofields</word_key>
-      <word_default>No custom profile fields have been set up</word_default>
-      <word_custom>В �и�теме не �оздано еще ни одного дополнительного пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_friends_app_on</word_key>
-      <word_default>Enabled - Manually approve friend requests</word_default>
-      <word_custom><![CDATA[Включен - вручную активировать в�е запро�ы "в друзь�"]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_friends_app_none</word_key>
-      <word_default>Disabled - Automatically approve friend requests</word_default>
-      <word_custom><![CDATA[Отключен - автоматиче�ки активировать в�е запро�ы "в друзь�"]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_approve_friends</word_key>
-      <word_default>Friend Approval Method</word_default>
-      <word_custom>Спо�об активации пользовател�, как друга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_friends_profile</word_key>
-      <word_default>Show friends in profile</word_default>
-      <word_custom>Показывать друзей в профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_comments_app_on</word_key>
-      <word_default>Enabled - Manually approve comments</word_default>
-      <word_custom>Включен - вручную активировать комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_latest_visitors</word_key>
-      <word_default>Show last x visitors</word_default>
-      <word_custom>Показывать по�ледний X по�ещений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_approve_comments</word_key>
-      <word_default>Comment Approval Method</word_default>
-      <word_custom>Спо�об активации комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_comments_app_none</word_key>
-      <word_default>Disabled - Automatically approve comments</word_default>
-      <word_custom>Отключен - автоматиче�ки публиковать комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_rep_view_g</word_key>
-      <word_default>View Reputation Given</word_default>
-      <word_custom>Отданна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_enable_comments</word_key>
-      <word_default>Enable Profile Comments</word_default>
-      <word_custom>Включить комментарии в профиле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_reputation</word_key>
-      <word_default>Reputation Points</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_rep_view_r</word_key>
-      <word_default>View Reputation Received</word_default>
-      <word_custom>Полученна�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_bday</word_key>
-      <word_default>Birthday</word_default>
-      <word_custom>День рождени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_aboutme</word_key>
-      <word_default><![CDATA[<strong>About This Member</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>О пользователе</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_custom</word_key>
-      <word_default><![CDATA[<strong>Member's Custom Profile Fields</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Дополнительные пол� профил�</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_signature</word_key>
-      <word_default><![CDATA[<strong>Member's Signature</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Подпи�ь пользовател�</strong>  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_profile</word_key>
-      <word_default><![CDATA[<strong>Profile Information</strong>]]></word_default>
-      <word_custom>Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_viewsig</word_key>
-      <word_default>View signatures?</word_default>
-      <word_custom>Разрешить про�мотр подпи�ей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_allowadmin</word_key>
-      <word_default>Allow admin emails?</word_default>
-      <word_custom>Разрешить получать пи�ьма от админи�трации?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_disablepm</word_key>
-      <word_default>Disable PM access?</word_default>
-      <word_custom>Отключить и�пользование личных �ообщений?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_skinnone</word_key>
-      <word_default>-- None / Use Board Default --</word_default>
-      <word_custom>-- �ет / По умолчанию --</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_hideemail</word_key>
-      <word_default>Hide email address?</word_default>
-      <word_custom>Скрыть e-mail адре� от о�тальных пользователей?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_skinchoice</word_key>
-      <word_default>Skin Choice</word_default>
-      <word_custom>Стиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_langchoice</word_key>
-      <word_default>Language Choice</word_default>
-      <word_custom>Язык интерфей�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_settings</word_key>
-      <word_default><![CDATA[<strong>Board Settings</strong>]]></word_default>
-      <word_custom>�а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_access</word_key>
-      <word_default><![CDATA[<strong>Permission Settings</strong>]]></word_default>
-      <word_custom>�а�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_timeoffset</word_key>
-      <word_default>Time Zone Offset</word_default>
-      <word_custom>Ча�овой по��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_viewnotes</word_key>
-      <word_default>View Notes</word_default>
-      <word_custom>Про�мотр запи�ей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_addnote</word_key>
-      <word_default>Add Note</word_default>
-      <word_custom>Добавить запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_password</word_key>
-      <word_default>Password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_display</word_key>
-      <word_default>Display Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_loginname</word_key>
-      <word_default>Login Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_uploadnew</word_key>
-      <word_default>Upload New Photo</word_default>
-      <word_custom>Загрузить фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_banmanage</word_key>
-      <word_default>Ban Management</word_default>
-      <word_custom>Управление блокировками</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_abouttab</word_key>
-      <word_default>About Me</word_default>
-      <word_custom>О �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_ban</word_key>
-      <word_default>Ban Member</word_default>
-      <word_custom>Забанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_unban</word_key>
-      <word_default>Unban Member</word_default>
-      <word_custom>Разбанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_sigtab</word_key>
-      <word_default>Signature</word_default>
-      <word_custom>Подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_tasks</word_key>
-      <word_default>Actions</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_nodisplayname</word_key>
-      <word_default>No display name specified</word_default>
-      <word_custom>Им� пользовател� не указано</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>button_validate</word_key>
-      <word_default>Validate Member</word_default>
-      <word_custom>�ктивировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_tasks</word_key>
-      <word_default>View Tasks Associated With This Member</word_default>
-      <word_custom>Про�мотр задач дл� �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_validate</word_key>
-      <word_default>Validate This Account</word_default>
-      <word_custom>Подтвердить учетную запи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_delete</word_key>
-      <word_default>Delete This Member</word_default>
-      <word_custom>Удалить �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_email</word_key>
-      <word_default>Edit Email Address</word_default>
-      <word_custom>Изменить e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_ban</word_key>
-      <word_default>Edit Ban Settings</word_default>
-      <word_custom>Изменить на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_received</word_key>
-      <word_default>Reputation received for </word_default>
-      <word_custom>Репутаци� полученна� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_login_name</word_key>
-      <word_default>Edit Sign In Name</word_default>
-      <word_custom>Изменить логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_display_name</word_key>
-      <word_default>Edit Display Name</word_default>
-      <word_custom>Изменить им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>title_password</word_key>
-      <word_default>Reset Password</word_default>
-      <word_custom>Изменить пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_given</word_key>
-      <word_default>Reputation given by </word_default>
-      <word_custom>Репутаци� отданна� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_on</word_key>
-      <word_default>On</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_post</word_key>
-      <word_default>Content</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_rep</word_key>
-      <word_default>Rep</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_by</word_key>
-      <word_default>By</word_default>
-      <word_custom>От </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_for</word_key>
-      <word_default>For</word_default>
-      <word_custom>Кому</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_upload</word_key>
-      <word_default>Upload</word_default>
-      <word_custom>Загрузить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_newphoto</word_key>
-      <word_default>Upload New Photo</word_default>
-      <word_custom>Загрузить новую фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_topostrestrict</word_key>
-      <word_default>to change posting restrictions and moderation</word_default>
-      <word_custom>чтобы изменить на�тройки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_alterban</word_key>
-      <word_default>Alter Ban State</word_default>
-      <word_custom>Забанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_tosuspend</word_key>
-      <word_default>to suspend the member temporarily instead</word_default>
-      <word_custom>чтобы временно заблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_justor</word_key>
-      <word_default>OR</word_default>
-      <word_custom>ИЛИ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_clickhere</word_key>
-      <word_default>Click here</word_default>
-      <word_custom>�ажмите зде�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_banname</word_key>
-      <word_default>Ban username</word_default>
-      <word_custom>Забанить им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_justto</word_key>
-      <word_default>to</word_default>
-      <word_custom> к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_banip</word_key>
-      <word_default>Ban IP Address</word_default>
-      <word_custom>Забанить IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_addnote</word_key>
-      <word_default>Add a Note?</word_default>
-      <word_custom>Добавить �ообщение?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_viewnotes</word_key>
-      <word_default>View Notes</word_default>
-      <word_custom>Про�мотр заметок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_movefrom</word_key>
-      <word_default>Move from group</word_default>
-      <word_custom>Переме�тить из группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_banemail</word_key>
-      <word_default>Ban email address</word_default>
-      <word_custom>Забанить e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mf_banperm</word_key>
-      <word_default>Ban this member permanently</word_default>
-      <word_custom>Забанить пользовател� нав�егда</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>password_nogood</word_key>
-      <word_default>You must enter the new password in each box</word_default>
-      <word_custom>�еобходимо вве�ти новый пароль в каждое поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_noban</word_key>
-      <word_default>You do not have permission to ban a member.</word_default>
-      <word_custom>У ва� нет прав дл� бана пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_morethan3</word_key>
-      <word_default>The name must be more than 3 characters and less than %s characters.</word_default>
-      <word_custom>Им� должно быть больше 3 �имволов и меньше %s �имволов. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_illegal</word_key>
-      <word_default>The name contains illegal characters.</word_default>
-      <word_custom>Им� �одержит недопу�тимые �имволы.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_changesubj</word_key>
-      <word_default>Member Name Change Notification</word_default>
-      <word_custom>Уведомление о �мене имени пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_namelog</word_key>
-      <word_default><![CDATA[Changed member's name '%s' to '%s']]></word_default>
-      <word_custom><![CDATA[Изменение имени пользовател� � '%s' на '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_dnamelog</word_key>
-      <word_default><![CDATA[Changed member's display name '%s' to '%s']]></word_default>
-      <word_custom><![CDATA[Изменение имени пользовател� � '%s' на '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_passlog</word_key>
-      <word_default>Member password changed ( Member ID: %s )</word_default>
-      <word_custom>Пароль пользовател� изменен ( ID: %s )&#13;
-	&#13;
-</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_passchange</word_key>
-      <word_default>The password could not be changed.</word_default>
-      <word_custom>Пароль не может быть изменен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_passmatch</word_key>
-      <word_default>The entered passwords must match</word_default>
-      <word_custom>Введенные пароли должны �овпадать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_sec</word_key>
-      <word_default>Secondary Group: </word_default>
-      <word_custom>Второ�тепенна� группа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_emailchangelog</word_key>
-      <word_default>Member email address changed from %s to %s ( Member ID: %s )</word_default>
-      <word_custom><![CDATA[E-mail пользовател� изменен � '%s' на '%s' ( ID: %s )]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_imgremlog</word_key>
-      <word_default><![CDATA[Member's personal profile photo removed ( Member ID: %s )]]></word_default>
-      <word_custom>Фотографи� пользовател� удалена ( ID: %s )</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_prim</word_key>
-      <word_default>Primary Group: </word_default>
-      <word_custom>О�новна� группа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>pc_eq</word_key>
-      <word_default>Equal to</word_default>
-      <word_custom>Равно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_secany</word_key>
-      <word_default>Any group</word_default>
-      <word_custom>Люба� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>pc_gt</word_key>
-      <word_default>More than</word_default>
-      <word_custom>Больше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>pc_lt</word_key>
-      <word_default>Less than</word_default>
-      <word_custom>Меньше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_primany</word_key>
-      <word_default>Any group</word_default>
-      <word_custom>Люба� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_tomove</word_key>
-      <word_default>Search To Move</word_default>
-      <word_custom>Пои�к дл� перемещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_todelete</word_key>
-      <word_default>Search To Delete</word_default>
-      <word_custom>Пои�к дл� удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_toedit</word_key>
-      <word_default>Search To Edit</word_default>
-      <word_custom>Пои�к дл� изменени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_shownotspam</word_key>
-      <word_default>Not Spam User</word_default>
-      <word_custom>�е �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_showbanned</word_key>
+      <word_key>m_type_banned</word_key>
       <word_default>Banned</word_default>
-      <word_custom>Забанен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_custom>Забаненные</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_shownotbanned</word_key>
-      <word_default>Not Banned</word_default>
-      <word_custom>�е забанен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_banned_desc</word_key>
+      <word_default>Users who have been banned by administrators or super-moderators</word_default>
+      <word_custom>Пользователи забаненные админ�трацией</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_showspam</word_key>
-      <word_default>Spam User</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_locked</word_key>
+      <word_default>Locked</word_default>
+      <word_custom>Заблокированные</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_showunsusp</word_key>
-      <word_default>Unsuspended</word_default>
-      <word_custom>Разблокированные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_locked_desc</word_key>
+      <word_default>Users who have been locked out of their account, for example by entering the wrong password numerous times</word_default>
+      <word_custom>Пользователи � заблокированными учетными запи��ми (например из-за большого количе�тва неправильных попыток входа)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_orderza</word_key>
-      <word_default>Descending</word_default>
-      <word_custom>По убыванию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_validate</word_key>
+      <word_default>Validating</word_default>
+      <word_custom>Ожидающие</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_showall</word_key>
-      <word_default>Everyone</word_default>
-      <word_custom>�е важно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_all</word_key>
+      <word_default>Members</word_default>
+      <word_custom>В�е</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_showsusp</word_key>
-      <word_default>Suspended</word_default>
-      <word_custom>Блокированные</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>m_type_all_desc</word_key>
+      <word_default>Ordinary users in your community</word_default>
+      <word_custom>В�е пользователи �ообще�тва</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_sdisplay</word_key>
-      <word_default>Display Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>list__posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_semail</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>list__info</word_key>
+      <word_default>Validation Info</word_default>
+      <word_custom>Информаци�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_orderaz</word_key>
-      <word_default>Ascending</word_default>
-      <word_custom>По возра�танию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_slogin</word_key>
-      <word_default>Log In Name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_joined</word_key>
+      <word_key>list__joined</word_key>
       <word_default>Joined</word_default>
       <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>m_f_ends</word_key>
-      <word_default>Ends With</word_default>
-      <word_custom>заканчивает�� на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_begins</word_key>
-      <word_default>Begins With</word_default>
-      <word_custom>начинает�� �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_equals</word_key>
-      <word_default>Equals</word_default>
-      <word_custom>�овпадает �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_ip</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_sig</word_key>
-      <word_default>Signature</word_default>
-      <word_custom>подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_contains</word_key>
-      <word_default>Contains</word_default>
-      <word_custom>�одержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_display</word_key>
-      <word_default>Display Name</word_default>
-      <word_custom>им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_id</word_key>
-      <word_default>Member ID</word_default>
-      <word_custom>ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_f_login</word_key>
-      <word_default>Log In Name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_edited</word_key>
-      <word_default>Member Edited</word_default>
-      <word_custom>Пользователь изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_editedlog</word_key>
-      <word_default><![CDATA[Edited Member '%s' account]]></word_default>
-      <word_custom><![CDATA[Редактирование запи�и пользовател� '%s]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_viewlist</word_key>
-      <word_default>Viewing Member List</word_default>
-      <word_custom>Про�мотр �пи�ка пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_editadmin</word_key>
-      <word_default>You are not permitted to edit administrators</word_default>
-      <word_custom>Вам не разрешено измен�ть админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_admindemote</word_key>
-      <word_default>You are not permitted to change the groups an administrator belongs to (including both primary and secondary)</word_default>
-      <word_custom>Вам не разрешено измен�ть группы к которым принадлежит �дмини�тратор (ни о�новную, ни второ�тепенную)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_memadded</word_key>
-      <word_default>The member was added successfully</word_default>
-      <word_custom>Пользователь добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_createlog</word_key>
-      <word_default><![CDATA[Created new member account for '%s']]></word_default>
-      <word_custom><![CDATA[Создана нова� учетна� запи�ь дл� '%s' ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_cantadd</word_key>
-      <word_default><![CDATA[The member could not be added (%s).<br />]]></word_default>
-      <word_custom><![CDATA[Пользователь %s не может быть добавлен.<br />  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_addadmin</word_key>
-      <word_default>You are not permitted to add administrators.</word_default>
-      <word_custom>Вам не разрешено добавл�ть админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_namealready</word_key>
-      <word_default>We already have a member by that name. Please select another.</word_default>
-      <word_custom>Пользователь � таким именем уже �уще�твует. Выберите другое им�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_32chars</word_key>
-      <word_default>The username cannot be longer than 32 characters. Please shorten it.</word_default>
-      <word_custom>Им� пользовател� не должно быть больше 32 �имволов. Сократите им�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_emailalready</word_key>
-      <word_default>The selected email address is  in use. Please select another.</word_default>
-      <word_custom>Такой e-mail адре� уже и�пользует��. Выберите другой.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_displaynames</word_key>
-      <word_default><![CDATA[Display Name cannot contain these characters: [ ] ; , |]]></word_default>
-      <word_custom><![CDATA[Им� пользовател� не может �одержать �имволы: [ ] ; , |]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_emailinv</word_key>
-      <word_default>The email address is invalid.</word_default>
-      <word_custom>�екорректный e-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_completeform</word_key>
-      <word_default>You must complete the form fully. Please try again.</word_default>
-      <word_custom>Вы должны заполнить форму полно�тью. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_addmember</word_key>
-      <word_default>Add Member</word_default>
-      <word_custom>Добавить пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_nodeleteslefr</word_key>
-      <word_default><![CDATA[Sorry, but you can't delete your own account.]]></word_default>
-      <word_custom>Вы не можете удалить �вою учетную запи�ь.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_nomember</word_key>
-      <word_default>No member(s) found</word_default>
-      <word_custom>Пользователей не найдено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_movedlog</word_key>
-      <word_default>Moved member(s) to group %s ( %s )</word_default>
-      <word_custom>Перемещение пользователей в группу %s ( %s ) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_moved</word_key>
-      <word_default>Member Account(s) Moved</word_default>
-      <word_custom>Пользователи перемещены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_nomembers</word_key>
-      <word_default>Could not find any members that matched the move criteria. Please try again.</word_default>
-      <word_custom>Пользователи дл� перемещени� не найдены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_whatgroup</word_key>
-      <word_default>Could not determine which group to move the members to.</word_default>
-      <word_custom>�евозможно определить группу дл� перемещени� пользователей.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_adminpromote</word_key>
-      <word_default>You are not permitted to promote members to administrators</word_default>
-      <word_custom>Вам не разрешает�� продвигать пользователей в админи�траторов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_control</word_key>
-      <word_default>Member Control</word_default>
-      <word_custom>Управление учетной запи�ью</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_deleted</word_key>
-      <word_default>Member Account(s) Deleted</word_default>
-      <word_custom>Учетные запи�и удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_deletedlog</word_key>
-      <word_default>Deleted Member(s): %s</word_default>
-      <word_custom>Удалены пользователи: %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_noprune</word_key>
-      <word_default>Could not find any members that matched the prune criteria. Please try again.</word_default>
-      <word_custom>Пользователи дл� удалени� не найдены.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_daterange</word_key>
-      <word_default>Date out of range (Month: %s, Day: %s, Year: %s). Dates should be in MM-DD-YYYY</word_default>
-      <word_custom>�екорректна� дата (ме��ц: %s, день: %s, год: %s). Дата должна быть в формате ММ-ДД-ГГГГ </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_move</word_key>
-      <word_default>Move Member(s)</word_default>
-      <word_custom>Переме�тить пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_prune</word_key>
-      <word_default>Prune Member(s)</word_default>
-      <word_custom>Удалить пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_unsuspended</word_key>
-      <word_default>%s Unsuspended</word_default>
-      <word_custom>%s разблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_bannedlog</word_key>
-      <word_default>Altered ban status for member %s</word_default>
-      <word_custom>Забанен пользователь %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_unsusplog</word_key>
-      <word_default>Unsuspended Member %s</word_default>
-      <word_custom>Пользователь %s разблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_allunsusp</word_key>
-      <word_default>All Accounts Unsuspended</word_default>
-      <word_custom>В�е учетные запи�и разблокированы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_unsuspall</word_key>
-      <word_default>Unsuspended all member accounts</word_default>
-      <word_custom>Разблокировать в�е учетные запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_unsuspadmin</word_key>
-      <word_default>You are not permitted to unsuspend administrators</word_default>
-      <word_custom>Вам не разрешено разблокировать админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_suspended</word_key>
-      <word_default>Suspended Member</word_default>
-      <word_custom>Пользователь заблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_search</word_key>
-      <word_default>Member Search</word_default>
-      <word_custom>Пои�к пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_acctsusp</word_key>
-      <word_default>Account Suspension Notification</word_default>
-      <word_custom>Уведомление о блокировании учетной запи�и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_susplog</word_key>
-      <word_default>Suspended Member %s</word_default>
-      <word_custom>Пользователь %s заблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_yoursusp</word_key>
-      <word_default>{membername},
- your account at %s has been temporarily suspended.
-
-Your account will not be functional until {date_end} (depending on your timezone). This is an automated process and you do not need to do anything to expedite the unsuspension process.
-
-Board Address: </word_default>
-      <word_custom><![CDATA[{membername}, �дмини�тратор форума %s временно заблокировал вашу учетную запи�ь.<br />Ваша учетна� запи�ь будет активна � {date_end} (в зави�имо�ти от вашего ча�ового по��а). Это полно�тью автоматиче�кий проце�� блокировки и от ва� не требует�� ничего делать дл� его у�корени� или прекращени�.<br />�дре� форума:]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_suspadmin</word_key>
-      <word_default>You are not permitted to suspend administrators</word_default>
-      <word_custom>Вам не разрешено блокировать админи�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_suspend</word_key>
-      <word_default>Suspend Member</word_default>
-      <word_custom>Заблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_banned</word_key>
-      <word_default>Banned Member</word_default>
-      <word_custom>Забаненный пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_banadmin</word_key>
-      <word_default>You are not permitted to ban administrators</word_default>
-      <word_custom>Вам не разрешено банить админи�траторов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_noid</word_key>
-      <word_default>We could not find a member with that ID. Please try again.</word_default>
-      <word_custom>Пользователь � указанным ID не найден.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_thatswhatshesaid</word_key>
-      <word_default>Sorry, the upload was too big.</word_default>
-      <word_custom>Загруженный файл �лишком велик.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_photoupdated</word_key>
-      <word_default><![CDATA[The member's personal photo has been updated]]></word_default>
-      <word_custom>Фотографи� пользовател� обновлена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_invfileext</word_key>
-      <word_default>You attempted to upload an invalid file extension - only images are allowed (jpg, gif, png, etc)</word_default>
-      <word_custom>�еверный формат файла. Разрешено загружать только изображени� (jpg, gif, png, etc) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_upfailed</word_key>
-      <word_default>The upload failed - verify permissions are set appropriately on the uploads directory and that you selected a file to upload.</word_default>
-      <word_custom>Загрузка не удала�ь. Пожалуй�та, проверьте права до�тупа к директории загрузки.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_noupload</word_key>
-      <word_default>You are not permitted to upload photos for administrators.</word_default>
-      <word_custom>Вам не разрешено загружать фотографии дл� админи�траторов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_update_member_list</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_specify</word_key>
-      <word_default>You must specify a valid member ID. Please try again.</word_default>
-      <word_custom>�еобходимо указать правильный ID пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_results_filtered</word_key>
-      <word_default><![CDATA[The results below are currently being filtered, <a href='%s'>click here to reset the filters</a>]]></word_default>
-      <word_custom><![CDATA[Показаны отфильтрованные результаты, вы <a href='%s'>можете �бро�ить</a> фильтры.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_secondary_group_desc</word_key>
-      <word_default><![CDATA[<strong>You can select more than one other group.</strong><br />Member will inherit 'better' permissions of all secondary groups and will inherit permission sets of all secondary groups in positive favor.]]></word_default>
-      <word_custom><![CDATA[<strong>Можно выбрать более одной группы</strong><br />Пользователь уна�ледует лучшие права до�тупа из в�ех групп.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_secondary_group</word_key>
-      <word_default>Select Secondary Groups</word_default>
-      <word_custom>Выберете второ�тепенные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_primary_group_desc</word_key>
-      <word_default>As you are editing yourself, only admin enabled groups are chooseable</word_default>
-      <word_custom>Так как вы измен�ете �вою учетную запи�ь, то до�тупны только группы � до�тупом в �дминцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_title</word_key>
-      <word_default>Member Title</word_default>
-      <word_custom>Звание пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_primary_group</word_key>
-      <word_default>Select A Primary Group</word_default>
-      <word_custom>Выберите о�новную группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_email1</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_new_salt</word_key>
-      <word_default>Create new crypt key</word_default>
-      <word_custom>Создать новый ключ шифровани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_email</word_key>
-      <word_default>Edit Email Address</word_default>
-      <word_custom>Изменение e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_new_key</word_key>
-      <word_default>Create New Log In Key</word_default>
-      <word_custom>Создать новый ключ авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_new_key_desc</word_key>
-      <word_default>If you are editing yourself, you will be logged out if you create a new key</word_default>
-      <word_custom>Е�ли вы измен�ете �вою учетную запи�ь, то будете выброшены из �и�темы, е�ли �оздадите новый ключ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_password2</word_key>
-      <word_default>Re-enter New Password</word_default>
-      <word_custom>Повторите пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_password</word_key>
-      <word_default>Reset Password</word_default>
-      <word_custom>Изменение парол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_password1</word_key>
-      <word_default>New Password</word_default>
-      <word_custom>�овый пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_email_contents</word_key>
-      <word_default><![CDATA[{old_name},
-An administrator has changed your member name on <#BOARD_NAME#>.
-
-Your new name is: {new_name}
-
-Please remember this as you may need to use this new name when you log in next time.
-Board Address: <#BOARD_ADDRESS#>]]></word_default>
-      <word_custom><![CDATA[{old_name}, 
-
-�дмини�тратор форума <#BOARD_NAME#> изменил ваше им� на {new_name}. 
-
-И�пользуйте его при �ледующем входе в форум. 
-
-�дре� форума: <#BOARD_ADDRESS#> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_send_email_desc</word_key>
-      <word_default>(Tags: {old_name} = current name, {new_name} = new name)</word_default>
-      <word_custom>(Теги: {old_name} = текущее им�, {new_name} = новое им�) </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_edit_login_name</word_key>
-      <word_default>Edit Sign In Name</word_default>
-      <word_custom>Изменение логина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_afjo_send_email</word_key>
-      <word_default>Send Email To Member</word_default>
-      <word_custom>Уведомление по e-mail?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_name</word_key>
-      <word_default>Sign In Name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_edit_display_name</word_key>
-      <word_default>Edit Display Name</word_default>
-      <word_custom>Изменить отображаемое им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_photo</word_key>
-      <word_default>Change Member Photo</word_default>
-      <word_custom>Изменение фотографии пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ajfo_display_name</word_key>
-      <word_default>Enter a display name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_tab_custom_fields</word_key>
-      <word_default>Custom Fields</word_default>
-      <word_custom>Дополнительные пол�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_tab_basics</word_key>
-      <word_default>Basic Information</word_default>
-      <word_custom>О�новные на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_tab_profile</word_key>
-      <word_default>Profile</word_default>
-      <word_custom>Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>identity_url_inuse</word_key>
-      <word_default>The identity URL provided is already in use by another member</word_default>
-      <word_custom>Url идентификации уже и�пользует�� другим пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_identity_url</word_key>
-      <word_default>OpenID Identity Url</word_default>
-      <word_custom>Url идентификации OpenID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_p_group</word_key>
-      <word_default>Primary Group</word_default>
-      <word_custom>О�новна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_s_group</word_key>
-      <word_default>Secondary Groups</word_default>
-      <word_custom>Второ�тепенные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_warn_level</word_key>
-      <word_default>Warn Level</word_default>
-      <word_custom>Уровень предупреждений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_post_count</word_key>
-      <word_default>Post Count</word_default>
-      <word_custom>Чи�ло �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_view_warn_notes</word_key>
-      <word_default>View User Notes</word_default>
-      <word_custom>Про�мотр заметок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_add_warn_note</word_key>
-      <word_default>Add New Note</word_default>
-      <word_custom>Добавить заметку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_change_button</word_key>
-      <word_default>Change...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_form_title</word_key>
-      <word_default>Member Title</word_default>
-      <word_custom>Личное звание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_email</word_key>
-      <word_default>Email Address</word_default>
-      <word_custom>E-mail адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_login_name</word_key>
-      <word_default>Log In Name</word_default>
-      <word_custom>Логин</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_password</word_key>
-      <word_default>Password</word_default>
-      <word_custom>Пароль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ip_title</word_key>
-      <word_default>Find more out about this IP address...</word_default>
-      <word_custom>Узнать больше об �том IP адре�е</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_display_name</word_key>
-      <word_default>Display Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_ip_address_f</word_key>
-      <word_default>IP Address</word_default>
-      <word_custom>IP адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_joined</word_key>
-      <word_default>Joined</word_default>
-      <word_custom>Реги�траци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_remove_photo</word_key>
-      <word_default>Remove Photo</word_default>
-      <word_custom>Удалить фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>m_remoteavatar_link</word_key>
-      <word_default>Click here to view avatar</word_default>
-      <word_custom>�ажмите зде�ь дл� про�мотра аватара</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_showallips</word_key>
-      <word_default>Show All IP Addresses...</word_default>
-      <word_custom>Показать в�е IP адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_mergemember</word_key>
-      <word_default>Merge with another member...</word_default>
-      <word_custom>Объединить � другим пользователем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_unsuspendmem</word_key>
-      <word_default>Unsuspend Member...</word_default>
-      <word_custom>Разблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_suspendmem</word_key>
-      <word_default>Suspend Member...</word_default>
-      <word_custom>Заблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>no_merge_id</word_key>
-      <word_default>We could not determine which member account you wanted to merge.</word_default>
-      <word_custom>�евозможно определить учетную запи�ь пользовател�, которую вы хотите объединить.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_deletepms</word_key>
-      <word_default>Delete Sent Private Messages...</word_default>
-      <word_custom>Удалить личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>form_deletemember</word_key>
-      <word_default>Delete Member</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_level_new</word_key>
-      <word_default>New reputation level</word_default>
-      <word_custom>Добавить уровень репутации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_save_changes</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_no_levels</word_key>
-      <word_default>No reputation levels setup</word_default>
-      <word_custom>�ет на�троенных уровней репутации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_points_help</word_key>
-      <word_default>Number of points required for this level</word_default>
-      <word_custom>Количе�тво балов дл� получени� уровн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_image_help</word_key>
-      <word_default>Image to be displayed on member account, images should be in the following directory: </word_default>
-      <word_custom>Будет отображать�� в профиле пользовател�, изображение должно быть загружено в директорию: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_title_help</word_key>
-      <word_default>Title to be displayed on member account</word_default>
-      <word_custom>Будет отображать�� в профиле пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_image</word_key>
-      <word_default>Image</word_default>
-      <word_custom>Изображение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_points</word_key>
-      <word_default>Points</word_default>
-      <word_custom>Количе�тво баллов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_title</word_key>
-      <word_default>Title</word_default>
-      <word_custom>�азвание</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_lvl_manage</word_key>
-      <word_default>Member Reputation Levels</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_edit_title</word_key>
-      <word_default>Edit reputation level</word_default>
-      <word_custom>Изменение уровн� репутации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_form_add_title</word_key>
-      <word_default>Add reputation level</word_default>
-      <word_custom>Добавление уровн� репутации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_no_title_img</word_key>
-      <word_default>You must specify either a title or an image for this level</word_default>
-      <word_custom>�еобходимо указать название либо изображение дл� �того уровн�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_level_edited</word_key>
-      <word_default>Reputation Level Edited</word_default>
-      <word_custom>Уровень репутации изменен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_management</word_key>
-      <word_default>Reputation Management</word_default>
-      <word_custom>Управление репутацией</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_level_added</word_key>
-      <word_default>Reputation Level Added</word_default>
-      <word_custom>Уровень репутации добавлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>editing_member</word_key>
-      <word_default>Editing </word_default>
-      <word_custom>Редактирование профил� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>rep_level_removed</word_key>
-      <word_default>Reputation Level Removed</word_default>
-      <word_custom>Уровень репутации удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>about_to_prune</word_key>
-      <word_default><![CDATA[You're about to PRUNE members]]></word_default>
-      <word_custom>Вы выбрали УД�ЛЕ�ИЕ пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>about_to_move</word_key>
-      <word_default><![CDATA[You're about to MOVE members]]></word_default>
-      <word_custom>Вы выбрали ПЕРЕ�ОС пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>dunit_days</word_key>
-      <word_default>Days</word_default>
-      <word_custom>дней</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>move_all_members</word_key>
-      <word_default>MOVE all members found</word_default>
-      <word_custom>Перене�ти в�ех найденных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>dunit_hours</word_key>
-      <word_default>Hours</word_default>
-      <word_custom>ча�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_sort_by</word_key>
-      <word_default>Sort by</word_default>
-      <word_custom>Сортировать по</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_sort_order</word_key>
-      <word_default>order</word_default>
-      <word_custom>пор�дку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>use_simple_search</word_key>
-      <word_default>Use Simple Search</word_default>
-      <word_custom>Про�той пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>prune_all_members</word_key>
-      <word_default>PRUNE all members found</word_default>
-      <word_custom>Удалить в�ех найденных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>post_count_is</word_key>
-      <word_default>Post count is</word_default>
-      <word_custom>Чи�ло �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_to</word_key>
-      <word_default>Search to</word_default>
-      <word_custom>И�кать </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>last_posted_between</word_key>
-      <word_default>Last posted between</word_default>
-      <word_custom>По�леднее �ообщение между</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>last_visit_between</word_key>
-      <word_default>Last visited between</word_default>
-      <word_custom>По�леднее по�ещение между </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_secon_group</word_key>
-      <word_default>Secondary Group</word_default>
-      <word_custom>Второ�тепенна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>registered_between</word_key>
-      <word_default>Registered between</word_default>
-      <word_custom>Зареги�трирован между</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>deleted_pms</word_key>
-      <word_default>The messages have been deleted</word_default>
-      <word_custom>Сообщени� удалены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_prim_group</word_key>
-      <word_default>Primary Group</word_default>
-      <word_custom>О�новна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>spam_status</word_key>
-      <word_default>Spam Status</word_default>
-      <word_custom>Спамер ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>banned_status</word_key>
-      <word_default>Banned Status</word_default>
-      <word_custom>Забанен ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>suspend_status</word_key>
-      <word_default>Suspend Status</word_default>
-      <word_custom>Заблокирован ?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>use_advanced_search</word_key>
-      <word_default>Use Advanced Search</word_default>
-      <word_custom>Ра�ширенный пои�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>other_search_filters</word_key>
-      <word_default>Other Search Filters</word_default>
-      <word_custom>Дополнительные фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>search_member_type</word_key>
-      <word_default><![CDATA[Search where member's]]></word_default>
-      <word_custom>�айти пользователей, чье</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>add_new_member_button</word_key>
-      <word_default>Add New Member</word_default>
-      <word_custom>Добавить пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>member_search_h3</word_key>
-      <word_default>Member Search</word_default>
-      <word_custom>Пои�к пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>member_management_h2</word_key>
-      <word_default>Member Management</word_default>
-      <word_custom>Управление пользовател�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>add_cf_required</word_key>
-      <word_default>Required Field</word_default>
-      <word_custom>Об�зательное поле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>add_cf_admin</word_key>
-      <word_default>Admin Only Field</word_default>
-      <word_custom>Только дл� �дмини�траторов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>merged_accounts_log</word_key>
-      <word_default><![CDATA[Merged account '%s' into '%s']]></word_default>
-      <word_custom><![CDATA[Объединение учетной запи�и  '%s' � '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>hostaddress_for</word_key>
-      <word_default>Host Address for</word_default>
-      <word_custom>�дре� �ервера дл� </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>tools_val_resent_log</word_key>
-      <word_default> Validation Emails Resent: </word_default>
-      <word_custom> Отправка повторного запро�а активации: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_search_advanced</word_key>
+      <word_default>Advanced</word_default>
+      <word_custom>Ра�ширенный</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -7653,9 +1814,27 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>list__dn</word_key>
       <word_default>Display name</word_default>
       <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_type_validate_desc</word_key>
+      <word_default>Users who are awaiting validation for a new account, email change, etc.</word_default>
+      <word_custom>Пользователи ожидающие валидации учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_with_checked</word_key>
+      <word_default>With checked members:</word_default>
+      <word_custom>С выбранными пользовател�ми:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>list__locked</word_key>
+      <word_default>Locked Info</word_default>
+      <word_custom>Информаци�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -7663,9 +1842,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>list__email</word_key>
       <word_default>Email address</word_default>
       <word_custom>E-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -7673,9 +1849,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>list__group</word_key>
       <word_default>Group</word_default>
       <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -7683,449 +1856,531 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>list__ip</word_key>
       <word_default>IP address</word_default>
       <word_custom>IP-адре�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>member_supsended_til</word_key>
-      <word_default>This member is suspended until </word_default>
-      <word_custom>Пользователь отключен до </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30009</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_approve</word_key>
+      <word_default>Approve all posts by these members?</word_default>
+      <word_custom>Опубликовать в�е �ообщени� �тих пользователей?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>t_setasspammers</word_key>
-      <word_default>Member(s) flagged as spam</word_default>
-      <word_custom>Пользователь(ей) отмечено как �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_blacklist</word_key>
+      <word_default>Blacklist IP/email addresses of these members?</word_default>
+      <word_custom>Заблокировать IP/email данных пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>nav_view_mem</word_key>
-      <word_default>Viewing Member </word_default>
-      <word_custom>Про�мотр пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_delete_all</word_key>
+      <word_default>DELETE ALL</word_default>
+      <word_custom>УД�ЛИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>alt_unverifieduser</word_key>
-      <word_default>Unverified User</word_default>
-      <word_custom>�епроверенный пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_approve_all</word_key>
+      <word_default>APPROVE ALL</word_default>
+      <word_custom>Р�ЗРЕШИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>alt_normal</word_key>
-      <word_default>Verified User</word_default>
-      <word_custom>Проверенный пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_ban_all</word_key>
+      <word_default>BAN ALL</word_default>
+      <word_custom>Б��</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>alt_spamuser</word_key>
-      <word_default>Spam User</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_unban_all</word_key>
+      <word_default>UNBAN ALL</word_default>
+      <word_custom>Р�ЗБ��ИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>frm_no_status</word_key>
-      <word_default>Prevent Status Updates</word_default>
-      <word_custom>О�тановить обновление �тату�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_spammer</word_key>
+      <word_default>SPAMMER</word_default>
+      <word_custom>СП�МЕР</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notopt__mobile</word_key>
-      <word_default>Mobile Notifications</word_default>
-      <word_custom>Мобильный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_approve</word_key>
+      <word_default>APPROVE</word_default>
+      <word_custom>Р�ЗРЕШИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notopt__inline</word_key>
-      <word_default>Inline Notification</word_default>
-      <word_custom>Внутри�и�темное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>m_but_unlock</word_key>
+      <word_default>UNLOCK</word_default>
+      <word_custom>Р�ЗБЛОКИРОВ�ТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notopt__email</word_key>
+      <word_key>m_but_delete</word_key>
+      <word_default>DELETE</word_default>
+      <word_custom>УД�ЛИТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_unflag</word_key>
+      <word_default>UNFLAG</word_default>
+      <word_custom>�Е СП�МЕР</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_unban</word_key>
+      <word_default>UNBAN</word_default>
+      <word_custom>Р�ЗБ��ИТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_ban</word_key>
+      <word_default>BAN</word_default>
+      <word_custom>Б��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_finalize_all</word_key>
+      <word_default>FINALIZE ALL</word_default>
+      <word_custom>З�КО�ЧИТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_unflag_all</word_key>
+      <word_default>UNFLAG ALL</word_default>
+      <word_custom>�Е СП�МЕРЫ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_finalize</word_key>
+      <word_default>FINALIZE</word_default>
+      <word_custom>З�КО�ЧИТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_unlock_all</word_key>
+      <word_default>UNLOCK ALL</word_default>
+      <word_custom>Р�ЗБЛОКИРОВ�ТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_mas_all</word_key>
+      <word_default>MARK AS SPAM</word_default>
+      <word_custom>СП�МЕРЫ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_svalidating</word_key>
+      <word_default>Validating</word_default>
+      <word_custom>Ожидающие активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sspam</word_key>
+      <word_default>Spam</word_default>
+      <word_custom>Спамеры</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sbanned</word_key>
+      <word_default>Banned</word_default>
+      <word_custom>Забаненные</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sall</word_key>
+      <word_default>All</word_default>
+      <word_custom>В�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_yes</word_key>
+      <word_default>Yes</word_default>
+      <word_custom>Да</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_slocked</word_key>
+      <word_default>Locked</word_default>
+      <word_custom>Заблокированные</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_simpcomplete</word_key>
+      <word_default>Incomplete</word_default>
+      <word_custom>�е завершившие реги�трацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_inc_removed</word_key>
+      <word_default>%s partially registered members removed</word_default>
+      <word_custom>%s не закончивших реги�трацию пользователей удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notify__new_comment</word_key>
+      <word_default>Notify me of new comments</word_default>
+      <word_custom>Спо�об уведомлени� о новых комментари�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_type_member</word_key>
+      <word_default>Member Status Filter</word_default>
+      <word_custom>Стату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>no_msngr_sel_del</word_key>
+      <word_default>You did not select anything to delete</word_default>
+      <word_custom>�ичего не выбрано дл� удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_incomplete</word_key>
+      <word_default>Incomplete Members</word_default>
+      <word_custom>�е закончившие реги�трацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>inc_no_dname</word_key>
+      <word_default>No display name available</word_default>
+      <word_custom>�ет отображаемого имени</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>inc_no_email</word_key>
+      <word_default>No email address available</word_default>
+      <word_custom>�ет email адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>inc_m_name</word_key>
+      <word_default>Username</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>inc_glb_msg</word_key>
+      <word_default><![CDATA[The members listed here have not completed their registration. They will be redirected to the 'Complete Registration' form when they next log in.<br /><br />Note that you can only 'finalize' accounts that have a display name, username and email address all supplied.]]></word_default>
+      <word_custom>В �том �пи�ке показаны пользователи не закончившие проце�� реги�трации. При �ледующей авторизации им будет предложено окончить реги�трацию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>nogroup_other</word_key>
+      <word_default>Other</word_default>
+      <word_custom>Другое</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_inc_finalized</word_key>
+      <word_default>%s incomplete member accounts finalized</word_default>
+      <word_custom>%s неполных учетных запи�ей пользователей завершено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rusure_tools_memform</word_key>
+      <word_default>Are you sure you want to delete these members?  There is no undoing this action.</word_default>
+      <word_custom>Вы уверены, что хотите удалить �тих пользователей? Отменить будет невозможно.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>check_secondarytoo</word_key>
+      <word_default>Also check secondary groups</word_default>
+      <word_custom>Также учитывать второ�тепенные группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>name_updated_success</word_key>
+      <word_default>The name has been successfully updated.</word_default>
+      <word_custom>Им� пользовател� у�пешно обновлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ipaddresses</word_key>
+      <word_default>IP Addresses</word_default>
+      <word_custom>IP адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>pw_updated_success</word_key>
+      <word_default>The password has been successfully updated.</word_default>
+      <word_custom>Пароль обновлен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>members_display_name_updated_success</word_key>
+      <word_default>The display name has been successfully updated.</word_default>
+      <word_custom>Отображаемое им� у�пешно обновлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem__stdeditor</word_key>
+      <word_default>STD (Standard) Editor</word_default>
+      <word_custom>STD (Стандартный) редактор</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem__flashuploader</word_key>
+      <word_default>Flash Uploader</word_default>
+      <word_custom>Flash-менеджер файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem__defuploader</word_key>
+      <word_default>Default Uploader</word_default>
+      <word_custom>Обычный менеджер файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem__rteeditor</word_key>
+      <word_default>RTE (WYSIWYG) Editor</word_default>
+      <word_custom>RTE (WYSIWYG) редактор</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_editorchoice</word_key>
+      <word_default>Editor Choice</word_default>
+      <word_custom>Тип редактора</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>memt_boardprefs</word_key>
+      <word_default>Community Preferences</word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>memt_privacysettings</word_key>
+      <word_default>Privacy Settings</word_default>
+      <word_custom>�а�тройки приватно�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_tab_notifications</word_key>
+      <word_default>Notifications</word_default>
+      <word_custom>Уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_uploaderchoice</word_key>
+      <word_default>Uploader</word_default>
+      <word_custom>Загрузка файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notify_type_email</word_key>
       <word_default>Email</word_default>
       <word_custom>Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notopt__pm</word_key>
-      <word_default>Private Message</word_default>
-      <word_custom>Личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_type_pm</word_key>
+      <word_default>Personal Conversation</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify_key_pre</word_key>
-      <word_default>Key: </word_default>
-      <word_custom>Ключ: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_type_inline</word_key>
+      <word_default>Inline Notification</word_default>
+      <word_custom>Внутренние уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>save_notify_config</word_key>
-      <word_default>Save Default Configuration</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifytitle_status_updates</word_key>
+      <word_default>Status Updates</word_default>
+      <word_custom>Обновлени� �тату�а</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notificationconfig_saved</word_key>
-      <word_default>Notification configuration saved</word_default>
-      <word_custom>�а�тройки уведомлений �охранены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify_type_mobile</word_key>
+      <word_default>Mobile</word_default>
+      <word_custom>Мобильный</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifications_config_title</word_key>
-      <word_default>Configure notification options</word_default>
-      <word_custom>�а�тройки уведомлений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifytitle_profiles_friends</word_key>
+      <word_default><![CDATA[Profiles &amp; Friends]]></word_default>
+      <word_custom>Профиль и друзь�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifications_config</word_key>
-      <word_default>Default Notifications Configuration</word_default>
-      <word_custom>�а�тройки уведомлений по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifytitle_private_msgs</word_key>
+      <word_default>Private Messages</word_default>
+      <word_custom>Личные �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__item_shipped</word_key>
-      <word_default><![CDATA[Notify me when an item I've purchased has been shipped]]></word_default>
-      <word_custom>Спо�об уведомлени� при до�тавке/отгрузке покупки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifytitle_topics_posts</word_key>
+      <word_default><![CDATA[Topics &amp; Posts]]></word_default>
+      <word_custom>Темы и �ообщени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__friend_request_approve</word_key>
-      <word_default>Notify me when someone approves a friend request I make</word_default>
-      <word_custom>Спо�об уведомлени� при подтверждении моего запро�а на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifytitle_other</word_key>
+      <word_default>Other Notifications</word_default>
+      <word_custom>Другие уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__file_approved</word_key>
-      <word_default>Notification method to use when a file I submitted is approved</word_default>
-      <word_custom>Спо�об уведомлени� при публикации отправленного мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>send_full_msg</word_key>
+      <word_default>Include post in notification emails</word_default>
+      <word_custom>Добавл�ть �ообщени� в тело пи�ьма уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__new_filecomment</word_key>
-      <word_default>Notification method to use when a file I like receives a new comment</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении нового комментари� от�леживаемого мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>show_notification_popup</word_key>
+      <word_default>Show Personal Message Popup</word_default>
+      <word_custom>Показывать Popup � уведомлением</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__updated_file</word_key>
-      <word_default>Notification method to use when a file I like is updated</word_default>
-      <word_custom>Спо�об уведомлени� при обновлении от�леживаемого мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>auto_track</word_key>
+      <word_default>Watch every topic member replies to</word_default>
+      <word_custom>От�леживание тем, в которых ответил пользователь</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__new_file</word_key>
-      <word_default>Notification method to use when a file I am watching is updated</word_default>
-      <word_custom>Спо�об уведомлени� при обновлении от�леживаемого мной файла</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>auto_track_type</word_key>
+      <word_default>Tracking method (if automatically watching topics)</word_default>
+      <word_custom>Спо�об от�леживани� (е�ли выбрано «От�леживание тем,  которых ответил пользователь»)</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__commission_earned</word_key>
-      <word_default>Notify me when I earn commission</word_default>
-      <word_custom>Спо�об уведомлени� при получении комми��ии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem__auto_immediate</word_key>
+      <word_default>Immediate Notification</word_default>
+      <word_custom>Моментальное уведомление</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__support_reply</word_key>
-      <word_default>Notify me when a staff member replies to my support request</word_default>
-      <word_custom>Спо�об уведомлени� при ответе в мой вопро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem__auto_none</word_key>
+      <word_default>No Notification</word_default>
+      <word_custom>�ет уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__invoice_expired</word_key>
-      <word_default>Notify me when an invoice expires</word_default>
-      <word_custom>Спо�об уведомлени� при и�течении �рока �чета</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem__auto_delayed</word_key>
+      <word_default>Delayed Notification</word_default>
+      <word_custom>Отложенное уведомление</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__payment_failed</word_key>
-      <word_default>Notify me if my payment fails</word_default>
-      <word_custom>Спо�об уведомлени� при неудачном платеже</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem__auto_weekly</word_key>
+      <word_default>Weekly Digest</word_default>
+      <word_custom>Еженедельный отчет</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__payment_received</word_key>
-      <word_default>Notify me when my payment is received</word_default>
-      <word_custom>Спо�об уведомлени� при прохождении платежа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem__auto_daily</word_key>
+      <word_default>Daily Digest</word_default>
+      <word_custom>Ежедневный отчет</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__new_invoice</word_key>
-      <word_default>Notify me when an invoice is generated</word_default>
-      <word_custom>Спо�об уведомлени� при вы�тавлении �чета</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notificationtype_h</word_key>
+      <word_default>Notification Type</word_default>
+      <word_custom>Тип уведомлени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__ccs_notifications</word_key>
-      <word_default>Notification method to use for article subscriptions</word_default>
-      <word_custom>Спо�об уведомлени� дл� подпи�ки на �татьи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notificationdo_h</word_key>
+      <word_default>Disallow Option</word_default>
+      <word_custom>Запретить опцию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__reply_any_status</word_key>
-      <word_default>Notify me of replies to status updates I have replied to</word_default>
-      <word_custom>Уведомл�ть мен� о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notificationdfs_h</word_key>
+      <word_default>Default Selection</word_default>
+      <word_custom>Значение по умолчанию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__reply_your_status</word_key>
-      <word_default>Notify me of replies to my status updates</word_default>
-      <word_custom>Спо�об уведомлени� при комментировании обновлени� моего �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>cf_enterkey</word_key>
+      <word_default>You must enter a field key. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти ключ.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify__friend_status_update</word_key>
-      <word_default>Notify me when one of my friends updates their status</word_default>
-      <word_custom>Спо�об уведомлени� при обновлении �тату�а у друга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__invite_private_message</word_key>
-      <word_default>Notify me when I am invited to a personal conversation</word_default>
-      <word_custom>Спо�об уведомлени� при приглашении мен� в личную бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__reply_private_message</word_key>
-      <word_default>Notify me of replies to my personal conversations</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении нового �ообщени� в личной бе�еде</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__new_private_message</word_key>
-      <word_default>Notify me when I receive a new personal conversation</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении мен� в личную бе�еду</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__friend_request_pending</word_key>
-      <word_default>Notify me when I have a pending friend request</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении у мен� ожидающего запро�а на дружбу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__friend_request</word_key>
-      <word_default>Notify me when someone adds me as a friend</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении мен� в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__profile_comment_pending</word_key>
-      <word_default>Notify me of comments made on my profile pending approval</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении комментарев моего профил�, ожидающих подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__profile_comment</word_key>
-      <word_default>Notify me of comments made on my profile</word_default>
-      <word_custom>Спо�об уведомлени� при комментировании моего профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__new_topic_queue</word_key>
-      <word_default>Notification method to use when a topic is pending approval</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении темы, ожидающей модерации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__post_quoted</word_key>
-      <word_default>Notify me when someone quotes my posts</word_default>
-      <word_custom>Спо�об уведомлени� при цитировании моих �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__new_reply</word_key>
-      <word_default>Notification method to use for topic replies</word_default>
-      <word_custom>Спо�об уведомлени� при добавлении ответов в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__new_topic</word_key>
-      <word_default>Notification method to use for new topics</word_default>
-      <word_custom>Спо�об уведомлени� при �оздании новой темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify__report_center</word_key>
-      <word_default>Notify me of reported content</word_default>
-      <word_custom>Спо�об уведомлени� при по�влении жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notificationdms_h</word_key>
+      <word_default>Disallow Member Selection</word_default>
+      <word_custom>Запретить выбор</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8133,19 +2388,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>notify__reputation_received</word_key>
       <word_default>Notify me when I receive reputation points</word_default>
       <word_custom>Спо�об уведомлени� при изменении моего рейтинга</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>remove_custom_stuff</word_key>
-      <word_default>Clear current customizations</word_default>
-      <word_custom>Очи�тить текущие на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8153,9 +2395,13 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>bw_disable_customization</word_key>
       <word_default>Remove profile customization permission</word_default>
       <word_custom>Отключить права на�тройки профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>remove_custom_stuff</word_key>
+      <word_default>Clear current customizations</word_default>
+      <word_custom>Очи�тить текущие на�тройки</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8167,9 +2413,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_custom><![CDATA[У ва� не на�троена группа дл� заблокированных в файле conf_global.php. Дл� того чтобы убрать �то �ообщение необходимо добавить в conf_global.php �ледующий код:<br /><br />
 &#36;INFO['banned_group'] =	'5';<br /><br />
 Замените цифру 5, на ID той группы, котора� должна быть группой дл� заблокированных. Е�ли у ва� возникли проблемы � выполнением �тих шагов, пожалуй�та, обратите�ь в наш клиент-центр.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8177,479 +2420,4033 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>cf_duplicatekey</word_key>
       <word_default>The field key you supplied is already in use.  Please enter a different key.</word_default>
       <word_custom>Ключ уже и�пользует��. Введите другое значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>cf_enterkey</word_key>
-      <word_default>You must enter a field key. Please try again.</word_default>
-      <word_custom>Вы должны вве�ти ключ.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__followed_forums</word_key>
+      <word_default>Notification method to use for topics in followed forums</word_default>
+      <word_custom>Спо�об уведомлени� о темах в от�леживаемых форумах</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notificationdms_h</word_key>
-      <word_default>Disallow Member Selection</word_default>
-      <word_custom>Запретить выбор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__followed_topics</word_key>
+      <word_default>Notification method to use for replies to followed topics</word_default>
+      <word_custom>Спо�об уведомлени� об ответах в от�леживаемых темах</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notificationdo_h</word_key>
-      <word_default>Disallow Option</word_default>
-      <word_custom>Запретить опцию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__report_center</word_key>
+      <word_default>Notify me of reported content</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении жалобы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notificationdfs_h</word_key>
-      <word_default>Default Selection</word_default>
-      <word_custom>Значение по умолчанию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__post_quoted</word_key>
+      <word_default>Notify me when someone quotes my posts</word_default>
+      <word_custom>Спо�об уведомлени� при цитировании моих �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notificationtype_h</word_key>
-      <word_default>Notification Type</word_default>
-      <word_custom>Тип уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__followed_topics_digest</word_key>
+      <word_default>Notification method to use for followed topics daily/weekly digests</word_default>
+      <word_custom>Спо�об уведомлени� о �обыти�х в от�леживаемых темах в дневных/недельных отчетах</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__auto_weekly</word_key>
-      <word_default>Weekly Digest</word_default>
-      <word_custom>Еженедельный отчет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__followed_forums_digest</word_key>
+      <word_default>Notification method to use for followed forums daily/weekly digests</word_default>
+      <word_custom>Спо�об уведомлени� о �обыти�х в от�леживаемых форумах в дневных/недельных отчетах</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__auto_daily</word_key>
-      <word_default>Daily Digest</word_default>
-      <word_custom>Ежедневный отчет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__profile_comment_pending</word_key>
+      <word_default>Notify me of comments made on my profile pending approval</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении комментарев моего профил�, ожидающих подтверждени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__auto_delayed</word_key>
-      <word_default>Delayed Notification</word_default>
-      <word_custom>Отложенное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__profile_comment</word_key>
+      <word_default>Notify me of comments made on my profile</word_default>
+      <word_custom>Спо�об уведомлени� при комментировании моего профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__auto_immediate</word_key>
-      <word_default>Immediate Notification</word_default>
-      <word_custom>Моментальное уведомление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__new_topic_queue</word_key>
+      <word_default>Notification method to use when a topic is pending approval</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении темы, ожидающей модерации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__auto_none</word_key>
-      <word_default>No Notification</word_default>
-      <word_custom>�ет уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__friend_request</word_key>
+      <word_default>Notify me when someone adds me as a friend</word_default>
+      <word_custom>Спо�об уведомлени� при добавлении мен� в друзь�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>auto_track_type</word_key>
-      <word_default>Tracking method (if automatically watching topics)</word_default>
-      <word_custom>Спо�об от�леживани� (е�ли выбрано «От�леживание тем,  которых ответил пользователь»)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__new_private_message</word_key>
+      <word_default>Notify me when I receive a new personal conversation</word_default>
+      <word_custom>Спо�об уведомлени� при добавлении мен� в личную бе�еду</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>auto_track</word_key>
-      <word_default>Watch every topic member replies to</word_default>
-      <word_custom>От�леживание тем, в которых ответил пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__friend_request_pending</word_key>
+      <word_default>Notify me when I have a pending friend request</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении у мен� ожидающего запро�а на дружбу</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>send_full_msg</word_key>
-      <word_default>Include post in notification emails</word_default>
-      <word_custom>Добавл�ть �ообщени� в тело пи�ьма уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__reply_private_message</word_key>
+      <word_default>Notify me of replies to my personal conversations</word_default>
+      <word_custom>Спо�об уведомлени� при по�влении нового �ообщени� в личной бе�еде</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>show_notification_popup</word_key>
-      <word_default>Show Notification Popup</word_default>
-      <word_custom>Показывать Popup � уведомлением</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__invite_private_message</word_key>
+      <word_default>Notify me when I am invited to a personal conversation</word_default>
+      <word_custom>Спо�об уведомлени� при приглашении мен� в личную бе�еду</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifytitle_other</word_key>
-      <word_default>Other Notifications</word_default>
-      <word_custom>Другие уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__friend_status_update</word_key>
+      <word_default>Notify me when one of my friends updates their status</word_default>
+      <word_custom>Спо�об уведомлени� при обновлении �тату�а у друга</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifytitle_private_msgs</word_key>
-      <word_default>Private Messages</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__reply_your_status</word_key>
+      <word_default>Notify me of replies to my status updates</word_default>
+      <word_custom>Спо�об уведомлени� при комментировании обновлени� моего �тату�а</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifytitle_profiles_friends</word_key>
-      <word_default><![CDATA[Profiles &amp; Friends]]></word_default>
-      <word_custom>Профиль и друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__reply_any_status</word_key>
+      <word_default>Notify me of replies to status updates I have replied to</word_default>
+      <word_custom>Уведомл�ть мен� о комментари�х к �тату�ам, которые � тоже прокомментировал</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifytitle_topics_posts</word_key>
-      <word_default><![CDATA[Topics &amp; Posts]]></word_default>
-      <word_custom>Темы и �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__friend_request_approve</word_key>
+      <word_default>Notify me when someone approves a friend request I make</word_default>
+      <word_custom>Спо�об уведомлени� при подтверждении моего запро�а на дружбу</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notifytitle_status_updates</word_key>
-      <word_default>Status Updates</word_default>
-      <word_custom>Обновлени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notifications_config</word_key>
+      <word_default>Default Notifications Configuration</word_default>
+      <word_custom>�а�тройки уведомлений по умолчанию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify_type_mobile</word_key>
-      <word_default>Moblie</word_default>
-      <word_custom>Мобильный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notify__new_likes</word_key>
+      <word_default><![CDATA[Notify me when someone 'follows' my posts]]></word_default>
+      <word_custom>Спо�об уведомлени� об от�леживании моих �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify_type_inline</word_key>
+      <word_key>notifications_config_title</word_key>
+      <word_default>Configure notification options</word_default>
+      <word_custom>�а�тройки уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notificationconfig_saved</word_key>
+      <word_default>Notification configuration saved</word_default>
+      <word_custom>�а�тройки уведомлений �охранены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notify_key_pre</word_key>
+      <word_default>Key: </word_default>
+      <word_custom>Ключ: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notopt__pm</word_key>
+      <word_default>Private Message</word_default>
+      <word_custom>Личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>save_notify_config</word_key>
+      <word_default>Save Default Configuration</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>notopt__inline</word_key>
       <word_default>Inline Notification</word_default>
-      <word_custom>Внутренние уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_custom>Внутри�и�темное уведомление</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>notify_type_pm</word_key>
-      <word_default>Personal Conversation</word_default>
-      <word_custom>Личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>notify_type_email</word_key>
+      <word_key>notopt__email</word_key>
       <word_default>Email</word_default>
       <word_custom>Email</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>memt_boardprefs</word_key>
-      <word_default>Board Preferences</word_default>
-      <word_custom>�а�тройки форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>frm_no_status</word_key>
+      <word_default>Prevent Status Updates</word_default>
+      <word_custom>О�тановить обновление �тату�ов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>memt_privacysettings</word_key>
-      <word_default>Privacy Settings</word_default>
-      <word_custom>�а�тройки приватно�ти</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>notopt__mobile</word_key>
+      <word_default>Mobile Notifications</word_default>
+      <word_custom>Мобильный</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem_tab_notifications</word_key>
-      <word_default>Notifications</word_default>
-      <word_custom>Уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alt_normal</word_key>
+      <word_default>Verified User</word_default>
+      <word_custom>Проверенный пользователь</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__flashuploader</word_key>
-      <word_default>Flash Uploader</word_default>
-      <word_custom>Flash-менеджер файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alt_spamuser</word_key>
+      <word_default>Spam User</word_default>
+      <word_custom>Спамер</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__defuploader</word_key>
-      <word_default>Default Uploader</word_default>
-      <word_custom>Обычный менеджер файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>alt_unverifieduser</word_key>
+      <word_default>Unverified User</word_default>
+      <word_custom>�епроверенный пользователь</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>sm_uploaderchoice</word_key>
-      <word_default>Uploader</word_default>
-      <word_custom>Загрузка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>nav_view_mem</word_key>
+      <word_default>Viewing Member </word_default>
+      <word_custom>Про�мотр пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>members_display_name_updated_success</word_key>
-      <word_default>The display name has been successfully updated.</word_default>
-      <word_custom>Отображаемое им� у�пешно обновлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_supsended_til</word_key>
+      <word_default>This member is suspended until </word_default>
+      <word_custom>Пользователь отключен до </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__stdeditor</word_key>
-      <word_default>STD (Standard) Editor</word_default>
-      <word_custom>STD (Стандартный) редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>t_setasspammers</word_key>
+      <word_default>%s Member(s) flagged as spam</word_default>
+      <word_custom>Пользователь(ей) отмечено как �памер</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>mem__rteeditor</word_key>
-      <word_default>RTE (WYSIWYG) Editor</word_default>
-      <word_custom>RTE (WYSIWYG) редактор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>hostaddress_for</word_key>
+      <word_default>Host Address for</word_default>
+      <word_custom>�дре� �ервера дл� </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>sm_editorchoice</word_key>
-      <word_default>Editor Choice</word_default>
-      <word_custom>Тип редактора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31004</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>tools_val_resent_log</word_key>
+      <word_default>%s Validation Emails Resent: %s</word_default>
+      <word_custom> Отправка повторного запро�а активации: </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>ipaddresses</word_key>
-      <word_default>IP Addresses</word_default>
-      <word_custom>IP адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_cf_required</word_key>
+      <word_default>Required Field</word_default>
+      <word_custom>Об�зательное поле</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>pw_updated_success</word_key>
-      <word_default>The password has been successfully updated.</word_default>
-      <word_custom>Пароль обновлен.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_cf_admin</word_key>
+      <word_default>Admin Only Field</word_default>
+      <word_custom>Только дл� �дмини�траторов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>name_updated_success</word_key>
-      <word_default>The name has been successfully updated.</word_default>
-      <word_custom>Им� пользовател� у�пешно обновлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merged_accounts_log</word_key>
+      <word_default><![CDATA[Merged account '%s' into '%s']]></word_default>
+      <word_custom><![CDATA[Объединение учетной запи�и  '%s' � '%s']]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>check_secondarytoo</word_key>
-      <word_default>Also check secondary groups</word_default>
-      <word_custom>Также учитывать второ�тепенные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>add_new_member_button</word_key>
+      <word_default>Add New Member</word_default>
+      <word_custom>Добавить пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>t_incomplete</word_key>
-      <word_default>Incomplete Members</word_default>
-      <word_custom>�е закончившие реги�трацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_management_h2</word_key>
+      <word_default>Member Management</word_default>
+      <word_custom>Управление пользовател�ми</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>inc_no_dname</word_key>
-      <word_default>No display name available</word_default>
-      <word_custom>�ет отображаемого имени</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_search_h3</word_key>
+      <word_default>Member Search</word_default>
+      <word_custom>Пои�к пользователей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>inc_no_email</word_key>
-      <word_default>No email address available</word_default>
-      <word_custom>�ет email адре�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_member_type</word_key>
+      <word_default><![CDATA[Search where member's]]></word_default>
+      <word_custom>�айти пользователей, чье</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>inc_m_name</word_key>
-      <word_default>Username</word_default>
+      <word_key>use_advanced_search</word_key>
+      <word_default>Use Advanced Search</word_default>
+      <word_custom>Ра�ширенный пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>other_search_filters</word_key>
+      <word_default>Other Search Filters</word_default>
+      <word_custom>Дополнительные фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_prim_group</word_key>
+      <word_default>Primary Group</word_default>
+      <word_custom>О�новна� группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_secon_group</word_key>
+      <word_default>Secondary Group</word_default>
+      <word_custom>Второ�тепенна� группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>registered_between</word_key>
+      <word_default>Registered between</word_default>
+      <word_custom>Зареги�трирован между</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>last_posted_between</word_key>
+      <word_default>Last posted between</word_default>
+      <word_custom>По�леднее �ообщение между</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>last_visit_between</word_key>
+      <word_default>Last visited between</word_default>
+      <word_custom>По�леднее по�ещение между </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>post_count_is</word_key>
+      <word_default>Post count is</word_default>
+      <word_custom>Чи�ло �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_to</word_key>
+      <word_default>Search to</word_default>
+      <word_custom>И�кать </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_sort_by</word_key>
+      <word_default>Sort by</word_default>
+      <word_custom>Сортировать по</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>use_simple_search</word_key>
+      <word_default>Use Simple Search</word_default>
+      <word_custom>Про�той пои�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>prune_all_members</word_key>
+      <word_default>PRUNE all members found</word_default>
+      <word_custom>Удалить в�ех найденных</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>search_sort_order</word_key>
+      <word_default>order</word_default>
+      <word_custom>пор�дку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>move_all_members</word_key>
+      <word_default>MOVE all members found</word_default>
+      <word_custom>Перене�ти в�ех найденных</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>dunit_hours</word_key>
+      <word_default>Hours</word_default>
+      <word_custom>ча�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>dunit_days</word_key>
+      <word_default>Days</word_default>
+      <word_custom>дней</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_no_title_img</word_key>
+      <word_default>You must specify either a title or an image for this level</word_default>
+      <word_custom>�еобходимо указать название либо изображение дл� �того уровн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_management</word_key>
+      <word_default>Reputation Management</word_default>
+      <word_custom>Управление репутацией</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_level_edited</word_key>
+      <word_default>Reputation Level Edited</word_default>
+      <word_custom>Уровень репутации изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_level_added</word_key>
+      <word_default>Reputation Level Added</word_default>
+      <word_custom>Уровень репутации добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_level_removed</word_key>
+      <word_default>Reputation Level Removed</word_default>
+      <word_custom>Уровень репутации удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>editing_member</word_key>
+      <word_default>Editing </word_default>
+      <word_custom>Редактирование профил� </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>about_to_move</word_key>
+      <word_default><![CDATA[You're about to MOVE members]]></word_default>
+      <word_custom>Вы выбрали ПЕРЕ�ОС пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>about_to_prune</word_key>
+      <word_default><![CDATA[You're about to PRUNE members]]></word_default>
+      <word_custom>Вы выбрали УД�ЛЕ�ИЕ пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_edit_title</word_key>
+      <word_default>Edit reputation level</word_default>
+      <word_custom>Изменение уровн� репутации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_add_title</word_key>
+      <word_default>Add reputation level</word_default>
+      <word_custom>Добавление уровн� репутации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_points_help</word_key>
+      <word_default>Number of points required for this level</word_default>
+      <word_custom>Количе�тво балов дл� получени� уровн�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_lvl_manage</word_key>
+      <word_default>Member Reputation Levels</word_default>
+      <word_custom>Репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_title_help</word_key>
+      <word_default>Title to be displayed on member account</word_default>
+      <word_custom>Будет отображать�� в профиле пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_image</word_key>
+      <word_default>Image</word_default>
+      <word_custom>Изображение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_points</word_key>
+      <word_default>Points</word_default>
+      <word_custom>Количе�тво баллов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_form_image_help</word_key>
+      <word_default>Image to be displayed on member account, images should be in the following directory: </word_default>
+      <word_custom>Будет отображать�� в профиле пользовател�, изображение должно быть загружено в директорию: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_no_levels</word_key>
+      <word_default>No reputation levels setup</word_default>
+      <word_custom>�ет на�троенных уровней репутации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_level_new</word_key>
+      <word_default>New reputation level</word_default>
+      <word_custom>Добавить уровень репутации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_deletemember</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_save_changes</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_deletepms</word_key>
+      <word_default>Delete Sent Private Messages...</word_default>
+      <word_custom>Удалить личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_remove_photo</word_key>
+      <word_default>Remove Photo</word_default>
+      <word_custom>Удалить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_suspendmem</word_key>
+      <word_default>Suspend Member...</word_default>
+      <word_custom>Заблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_unsuspendmem</word_key>
+      <word_default>Unsuspend Member...</word_default>
+      <word_custom>Разблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_mergemember</word_key>
+      <word_default>Merge with another member...</word_default>
+      <word_custom>Объединить � другим пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>form_showallips</word_key>
+      <word_default>Show All IP Addresses...</word_default>
+      <word_custom>Показать в�е IP адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_joined</word_key>
+      <word_default>Joined</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ip_address_f</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>no_merge_id</word_key>
+      <word_default>We could not determine which member account you wanted to merge.</word_default>
+      <word_custom>�евозможно определить учетную запи�ь пользовател�, которую вы хотите объединить.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ip_title</word_key>
+      <word_default>Find more out about this IP address...</word_default>
+      <word_custom>Узнать больше об �том IP адре�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_login_name</word_key>
+      <word_default>Log In Name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_display_name</word_key>
+      <word_default>Display Name</word_default>
       <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>inc_glb_msg</word_key>
-      <word_default><![CDATA[The members listed here have not completed their registration. They will be redirected to the 'Complete Registration' form when they next log in]]></word_default>
-      <word_custom>В �том �пи�ке показаны пользователи не закончившие проце�� реги�трации. При �ледующей авторизации им будет предложено окончить реги�трацию.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>t_inc_removed</word_key>
-      <word_default>%s partially registered members removed</word_default>
-      <word_custom>%s не закончивших реги�трацию пользователей удалено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>rusure_tools_memform</word_key>
-      <word_default>Are you sure you want to delete these members?  There is no undoing this action.</word_default>
-      <word_custom>Вы уверены, что хотите удалить �тих пользователей? Отменить будет невозможно.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_p_group</word_key>
+      <word_default>Primary Group</word_default>
+      <word_custom>О�новна� группа</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>nogroup_other</word_key>
-      <word_default>Other</word_default>
-      <word_custom>Другое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_s_group</word_key>
+      <word_default>Secondary Groups</word_default>
+      <word_custom>Второ�тепенные группы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>t_inc_finalized</word_key>
-      <word_default>%s incomplete member accounts finalized</word_default>
-      <word_custom>%s неполных учетных запи�ей пользователей завершено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_warn_level</word_key>
+      <word_default>Warn Level</word_default>
+      <word_custom>Уровень предупреждений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>ts_spam_un</word_key>
-      <word_default>Un-flag Members</word_default>
-      <word_custom>Сн�ть пометку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>mem_form_title</word_key>
+      <word_default>Member Title</word_default>
+      <word_custom>Личное звание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_identity_url</word_key>
+      <word_default>OpenID Identity Url</word_default>
+      <word_custom>Url идентификации OpenID</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>identity_url_inuse</word_key>
+      <word_default>The identity URL provided is already in use by another member</word_default>
+      <word_custom>Url идентификации уже и�пользует�� другим пользователем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_add_warn_note</word_key>
+      <word_default>Add New Note</word_default>
+      <word_custom>Добавить заметку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_change_button</word_key>
+      <word_default>Change...</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_view_warn_notes</word_key>
+      <word_default>View User Notes</word_default>
+      <word_custom>Про�мотр заметок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_tab_profile</word_key>
+      <word_default>Profile</word_default>
+      <word_custom>Профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_post_count</word_key>
+      <word_default>Post Count</word_default>
+      <word_custom>Чи�ло �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_tab_basics</word_key>
+      <word_default>Basic Information</word_default>
+      <word_custom>О�новные на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_tab_custom_fields</word_key>
+      <word_default>Custom Fields</word_default>
+      <word_custom>Дополнительные пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_photo</word_key>
+      <word_default>Change Member Photo</word_default>
+      <word_custom>Изменение фотографии пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_edit_login_name</word_key>
+      <word_default>Edit Sign In Name</word_default>
+      <word_custom>Изменение логина</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_display_name</word_key>
+      <word_default>Enter a display name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_name</word_key>
+      <word_default>Sign In Name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_edit_display_name</word_key>
+      <word_default>Edit Display Name</word_default>
+      <word_custom>Изменить отображаемое им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_password1</word_key>
+      <word_default>New Password</word_default>
+      <word_custom>�овый пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_send_email</word_key>
+      <word_default>Send Email To Member</word_default>
+      <word_custom>Уведомление по e-mail?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_send_email_desc</word_key>
+      <word_default>(Tags: {old_name} = current name, {new_name} = new name)</word_default>
+      <word_custom>(Теги: {old_name} = текущее им�, {new_name} = новое им�) </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_email_contents</word_key>
+      <word_default><![CDATA[{old_name},
+An administrator has changed your member name on <#BOARD_NAME#>.
+
+Your new name is: {new_name}
+
+Please remember this as you may need to use this new name when you log in next time.
+Community Address: <#BOARD_ADDRESS#>]]></word_default>
+      <word_custom><![CDATA[{old_name}, 
+
+�дмини�тратор форума <#BOARD_NAME#> изменил ваше им� на {new_name}. 
+
+И�пользуйте его при �ледующем входе в форум. 
+
+�дре� форума: <#BOARD_ADDRESS#> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_password</word_key>
+      <word_default>Reset Password</word_default>
+      <word_custom>Изменение парол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_password2</word_key>
+      <word_default>Re-enter New Password</word_default>
+      <word_custom>Повторите пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_new_key</word_key>
+      <word_default>Create New Log In Key</word_default>
+      <word_custom>Создать новый ключ авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_new_salt</word_key>
+      <word_default>Create new crypt key</word_default>
+      <word_custom>Создать новый ключ шифровани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_new_key_desc</word_key>
+      <word_default>If you are editing yourself, you will be logged out if you create a new key</word_default>
+      <word_custom>Е�ли вы измен�ете �вою учетную запи�ь, то будете выброшены из �и�темы, е�ли �оздадите новый ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_primary_group_desc</word_key>
+      <word_default>As you are editing yourself, only admin enabled groups are chooseable</word_default>
+      <word_custom>Так как вы измен�ете �вою учетную запи�ь, то до�тупны только группы � до�тупом в �дминцентр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_primary_group</word_key>
+      <word_default>Select A Primary Group</word_default>
+      <word_custom>Выберите о�новную группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_email1</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_email</word_key>
+      <word_default>Edit Email Address</word_default>
+      <word_custom>Изменение e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_afjo_secondary_group</word_key>
+      <word_default>Select Secondary Groups</word_default>
+      <word_custom>Выберете второ�тепенные группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_secondary_group_desc</word_key>
+      <word_default><![CDATA[<strong>You can select more than one other group.</strong><br />Member will inherit 'better' permissions of all secondary groups and will inherit permission sets of all secondary groups in positive favor.]]></word_default>
+      <word_custom><![CDATA[<strong>Можно выбрать более одной группы</strong><br />Пользователь уна�ледует лучшие права до�тупа из в�ех групп.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_banned</word_key>
+      <word_default>Banned Member</word_default>
+      <word_custom>Забаненный пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_ajfo_title</word_key>
+      <word_default>Member Title</word_default>
+      <word_custom>Звание пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_thatswhatshesaid</word_key>
+      <word_default>Sorry, the upload was too big.</word_default>
+      <word_custom>Загруженный файл �лишком велик.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_photoupdated</word_key>
+      <word_default><![CDATA[The member's personal photo has been updated]]></word_default>
+      <word_custom>Фотографи� пользовател� обновлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_noid</word_key>
+      <word_default>We could not find a member with that ID. Please try again.</word_default>
+      <word_custom>Пользователь � указанным ID не найден.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_banadmin</word_key>
+      <word_default>You are not permitted to ban administrators</word_default>
+      <word_custom>Вам не разрешено банить админи�траторов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_invfileext</word_key>
+      <word_default>You attempted to upload an invalid file extension - only images are allowed (jpg, gif, png, etc)</word_default>
+      <word_custom>�еверный формат файла. Разрешено загружать только изображени� (jpg, gif, png, etc) </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_upfailed</word_key>
+      <word_default>The upload failed - verify permissions are set appropriately on the uploads directory and that you selected a file to upload.</word_default>
+      <word_custom>Загрузка не удала�ь. Пожалуй�та, проверьте права до�тупа к директории загрузки.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_specify</word_key>
+      <word_default>You must specify a valid member ID. Please try again.</word_default>
+      <word_custom>�еобходимо указать правильный ID пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_noupload</word_key>
+      <word_default>You are not permitted to upload photos for administrators.</word_default>
+      <word_custom>Вам не разрешено загружать фотографии дл� админи�траторов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_update_member_list</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_susplog</word_key>
+      <word_default>Suspended Member %s</word_default>
+      <word_custom>Пользователь %s заблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_acctsusp</word_key>
+      <word_default>Account Suspension Notification</word_default>
+      <word_custom>Уведомление о блокировании учетной запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_suspended</word_key>
+      <word_default>Suspended Member</word_default>
+      <word_custom>Пользователь заблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_search</word_key>
+      <word_default>Member Search</word_default>
+      <word_custom>Пои�к пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_results_filtered</word_key>
+      <word_default><![CDATA[The results below are currently being filtered, <a href='%s'>click here to reset the filters</a>]]></word_default>
+      <word_custom><![CDATA[Показаны отфильтрованные результаты, вы <a href='%s'>можете �бро�ить</a> фильтры.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_yoursusp</word_key>
+      <word_default>{membername},
+ your account at %s has been temporarily suspended.
+
+Your account will not be functional until {date_end} (depending on your timezone). This is an automated process and you do not need to do anything to expedite the unsuspension process.
+
+Community Address: </word_default>
+      <word_custom><![CDATA[{membername}, �дмини�тратор форума %s временно заблокировал вашу учетную запи�ь.<br />Ваша учетна� запи�ь будет активна � {date_end} (в зави�имо�ти от вашего ча�ового по��а). Это полно�тью автоматиче�кий проце�� блокировки и от ва� не требует�� ничего делать дл� его у�корени� или прекращени�.<br />�дре� форума:]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_suspadmin</word_key>
+      <word_default>You are not permitted to suspend administrators</word_default>
+      <word_custom>Вам не разрешено блокировать админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_suspend</word_key>
+      <word_default>Suspend Member</word_default>
+      <word_custom>Заблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_unsuspadmin</word_key>
+      <word_default>You are not permitted to unsuspend administrators</word_default>
+      <word_custom>Вам не разрешено разблокировать админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_allunsusp</word_key>
+      <word_default>All Accounts Unsuspended</word_default>
+      <word_custom>В�е учетные запи�и разблокированы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_unsusplog</word_key>
+      <word_default>Unsuspended Member %s</word_default>
+      <word_custom>Пользователь %s разблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_unsuspall</word_key>
+      <word_default>Unsuspended all member accounts</word_default>
+      <word_custom>Разблокировать в�е учетные запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_bannedlog</word_key>
+      <word_default>Altered ban status for member %s</word_default>
+      <word_custom>Забанен пользователь %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_unsuspended</word_key>
+      <word_default>%s Unsuspended</word_default>
+      <word_custom>%s разблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_noprune</word_key>
+      <word_default>Could not find any members that matched the prune criteria. Please try again.</word_default>
+      <word_custom>Пользователи дл� удалени� не найдены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_daterange</word_key>
+      <word_default>Date out of range (Month: %s, Day: %s, Year: %s). Dates should be in MM-DD-YYYY</word_default>
+      <word_custom>�екорректна� дата (ме��ц: %s, день: %s, год: %s). Дата должна быть в формате ММ-ДД-ГГГГ </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_prune</word_key>
+      <word_default>Prune Member(s)</word_default>
+      <word_custom>Удалить пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_move</word_key>
+      <word_default>Move Member(s)</word_default>
+      <word_custom>Переме�тить пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_deleted</word_key>
+      <word_default>Member Account(s) Deleted</word_default>
+      <word_custom>Учетные запи�и удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_control</word_key>
+      <word_default>Member Control</word_default>
+      <word_custom>Управление учетной запи�ью</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_adminpromote</word_key>
+      <word_default>You are not permitted to promote members to administrators</word_default>
+      <word_custom>Вам не разрешает�� продвигать пользователей в админи�траторов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_whatgroup</word_key>
+      <word_default>Could not determine which group to move the members to.</word_default>
+      <word_custom>�евозможно определить группу дл� перемещени� пользователей.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_deletedlog</word_key>
+      <word_default>Deleted Member(s): %s</word_default>
+      <word_custom>Удалены пользователи: %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_nomembers</word_key>
+      <word_default>Could not find any members that matched the move criteria. Please try again.</word_default>
+      <word_custom>Пользователи дл� перемещени� не найдены.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_moved</word_key>
+      <word_default>Member Account(s) Moved</word_default>
+      <word_custom>Пользователи перемещены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_movedlog</word_key>
+      <word_default>Moved member(s) to group %s ( %s )</word_default>
+      <word_custom>Перемещение пользователей в группу %s ( %s ) </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_addmember</word_key>
+      <word_default>Add Member</word_default>
+      <word_custom>Добавить пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_completeform</word_key>
+      <word_default>You must complete the form fully. Please try again.</word_default>
+      <word_custom>Вы должны заполнить форму полно�тью. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_emailinv</word_key>
+      <word_default>The email address is invalid.</word_default>
+      <word_custom>�екорректный e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_nomember</word_key>
+      <word_default>No member(s) found</word_default>
+      <word_custom>Пользователей не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_nodeleteslefr</word_key>
+      <word_default><![CDATA[Sorry, but you can't delete your own account.]]></word_default>
+      <word_custom>Вы не можете удалить �вою учетную запи�ь.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_displaynames</word_key>
+      <word_default><![CDATA[Display Name cannot contain these characters: [ ] ; , |]]></word_default>
+      <word_custom><![CDATA[Им� пользовател� не может �одержать �имволы: [ ] ; , |]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_namealready</word_key>
+      <word_default>We already have a member by that name. Please select another.</word_default>
+      <word_custom>Пользователь � таким именем уже �уще�твует. Выберите другое им�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_emailalready</word_key>
+      <word_default>The selected email address is  in use. Please select another.</word_default>
+      <word_custom>Такой e-mail адре� уже и�пользует��. Выберите другой.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_32chars</word_key>
+      <word_default>The username cannot be longer than 32 characters. Please shorten it.</word_default>
+      <word_custom>Им� пользовател� не должно быть больше 32 �имволов. Сократите им�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_addadmin</word_key>
+      <word_default>You are not permitted to add administrators.</word_default>
+      <word_custom>Вам не разрешено добавл�ть админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_cantadd</word_key>
+      <word_default><![CDATA[The member could not be added (%s).<br />]]></word_default>
+      <word_custom><![CDATA[Пользователь %s не может быть добавлен.<br />  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_createlog</word_key>
+      <word_default><![CDATA[Created new member account for '%s']]></word_default>
+      <word_custom><![CDATA[Создана нова� учетна� запи�ь дл� '%s' ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_viewlist</word_key>
+      <word_default>Viewing Member List</word_default>
+      <word_custom>Про�мотр �пи�ка пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_memadded</word_key>
+      <word_default>The member was added successfully</word_default>
+      <word_custom>Пользователь добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_editadmin</word_key>
+      <word_default>You are not permitted to edit administrators</word_default>
+      <word_custom>Вам не разрешено измен�ть админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_editedlog</word_key>
+      <word_default><![CDATA[Edited Member '%s' account]]></word_default>
+      <word_custom><![CDATA[Редактирование запи�и пользовател� '%s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_admindemote</word_key>
+      <word_default>You are not permitted to change the groups an administrator belongs to (including both primary and secondary)</word_default>
+      <word_custom>Вам не разрешено измен�ть группы к которым принадлежит �дмини�тратор (ни о�новную, ни второ�тепенную)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_id</word_key>
+      <word_default>Member ID</word_default>
+      <word_custom>ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_display</word_key>
+      <word_default>Display Name</word_default>
+      <word_custom>им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_edited</word_key>
+      <word_default>Member Edited</word_default>
+      <word_custom>Пользователь изменен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_login</word_key>
+      <word_default>Log In Name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_posts</word_key>
+      <word_default>Post Count</word_default>
+      <word_custom>Количе�тво �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sig</word_key>
+      <word_default>Signature</word_default>
+      <word_custom>подпи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_contains</word_key>
+      <word_default>Contains</word_default>
+      <word_custom>�одержит</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_ends</word_key>
+      <word_default>Ends With</word_default>
+      <word_custom>заканчивает�� на</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_begins</word_key>
+      <word_default>Begins With</word_default>
+      <word_custom>начинает�� �</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_equals</word_key>
+      <word_default>Equals</word_default>
+      <word_custom>�овпадает �</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_slogin</word_key>
+      <word_default>Log In Name</word_default>
+      <word_custom>Логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_joined</word_key>
+      <word_default>Joined</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sdisplay</word_key>
+      <word_default>Display Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_orderza</word_key>
+      <word_default>Descending</word_default>
+      <word_custom>По убыванию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_orderaz</word_key>
+      <word_default>Ascending</word_default>
+      <word_custom>По возра�танию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_semail</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_showall</word_key>
+      <word_default>Everyone</word_default>
+      <word_custom>�е важно</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_showsusp</word_key>
+      <word_default>Suspended</word_default>
+      <word_custom>Блокированные</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_showunsusp</word_key>
+      <word_default>Unsuspended</word_default>
+      <word_custom>Разблокированные</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_showbanned</word_key>
+      <word_default>Banned</word_default>
+      <word_custom>Забанен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_shownotbanned</word_key>
+      <word_default>Not Banned</word_default>
+      <word_custom>�е забанен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_showspam</word_key>
+      <word_default>Spam User</word_default>
+      <word_custom>Спамер</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_shownotspam</word_key>
+      <word_default>Not Spam User</word_default>
+      <word_custom>�е �памер</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_toedit</word_key>
+      <word_default>Search To Edit</word_default>
+      <word_custom>Пои�к дл� изменени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_todelete</word_key>
+      <word_default>Search To Delete</word_default>
+      <word_custom>Пои�к дл� удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_tomove</word_key>
+      <word_default>Search To Move</word_default>
+      <word_custom>Пои�к дл� перемещени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_primany</word_key>
+      <word_default>Any group</word_default>
+      <word_custom>Люба� группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>pc_lt</word_key>
+      <word_default>Less than</word_default>
+      <word_custom>Меньше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>pc_gt</word_key>
+      <word_default>More than</word_default>
+      <word_custom>Больше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>pc_eq</word_key>
+      <word_default>Equal to</word_default>
+      <word_custom>Равно</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_secany</word_key>
+      <word_default>Any group</word_default>
+      <word_custom>Люба� группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_prim</word_key>
+      <word_default>Primary Group: </word_default>
+      <word_custom>О�новна� группа: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_f_sec</word_key>
+      <word_default>Secondary Group: </word_default>
+      <word_custom>Второ�тепенна� группа: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_imgremlog</word_key>
+      <word_default><![CDATA[Member's personal profile photo removed ( Member ID: %s )]]></word_default>
+      <word_custom>Фотографи� пользовател� удалена ( ID: %s )</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_passchange</word_key>
+      <word_default>The password could not be changed.</word_default>
+      <word_custom>Пароль не может быть изменен.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_passmatch</word_key>
+      <word_default>The entered passwords must match</word_default>
+      <word_custom>Введенные пароли должны �овпадать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_emailchangelog</word_key>
+      <word_default>Member email address changed from %s to %s ( Member ID: %s )</word_default>
+      <word_custom><![CDATA[E-mail пользовател� изменен � '%s' на '%s' ( ID: %s )]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_dnamelog</word_key>
+      <word_default><![CDATA[Changed member's display name '%s' to '%s']]></word_default>
+      <word_custom><![CDATA[Изменение имени пользовател� � '%s' на '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_passlog</word_key>
+      <word_default>Member password changed ( Member ID: %s )</word_default>
+      <word_custom>Пароль пользовател� изменен ( ID: %s )&#13;
+	&#13;
+</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_changesubj</word_key>
+      <word_default>Member Name Change Notification</word_default>
+      <word_custom>Уведомление о �мене имени пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_namelog</word_key>
+      <word_default><![CDATA[Changed member's name '%s' to '%s']]></word_default>
+      <word_custom><![CDATA[Изменение имени пользовател� � '%s' на '%s']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_illegal</word_key>
+      <word_default>The name contains illegal characters.</word_default>
+      <word_custom>Им� �одержит недопу�тимые �имволы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_morethan3</word_key>
+      <word_default>The name must be more than 3 characters and less than %s characters.</word_default>
+      <word_custom>Им� должно быть больше 3 �имволов и меньше %s �имволов. </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>password_nogood</word_key>
+      <word_default>You must enter the new password in each box</word_default>
+      <word_custom>�еобходимо вве�ти новый пароль в каждое поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_movefrom</word_key>
+      <word_default>Move from group</word_default>
+      <word_custom>Переме�тить из группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_noban</word_key>
+      <word_default>You do not have permission to ban a member.</word_default>
+      <word_custom>У ва� нет прав дл� бана пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_banperm</word_key>
+      <word_default>Ban this member permanently</word_default>
+      <word_custom>Забанить пользовател� нав�егда</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_justto</word_key>
+      <word_default>to</word_default>
+      <word_custom> к</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_banname</word_key>
+      <word_default>Ban username</word_default>
+      <word_custom>Забанить им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_banemail</word_key>
+      <word_default>Ban email address</word_default>
+      <word_custom>Забанить e-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_banip</word_key>
+      <word_default>Ban IP Address</word_default>
+      <word_custom>Забанить IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_viewnotes</word_key>
+      <word_default>View Notes</word_default>
+      <word_custom>Про�мотр заметок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_addnote</word_key>
+      <word_default>Add a Note?</word_default>
+      <word_custom>Добавить �ообщение?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_clickhere</word_key>
+      <word_default>Click here</word_default>
+      <word_custom>�ажмите зде�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_tosuspend</word_key>
+      <word_default>to suspend the member temporarily instead</word_default>
+      <word_custom>чтобы временно заблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_justor</word_key>
+      <word_default>OR</word_default>
+      <word_custom>ИЛИ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_alterban</word_key>
+      <word_default>Alter Ban State</word_default>
+      <word_custom>Забанить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_topostrestrict</word_key>
+      <word_default>to change posting restrictions and moderation</word_default>
+      <word_custom>чтобы изменить на�тройки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_newphoto</word_key>
+      <word_default>Upload New Photo</word_default>
+      <word_custom>Загрузить новую фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_post</word_key>
+      <word_default>Content</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_on</word_key>
+      <word_default>On</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_rep</word_key>
+      <word_default>Rep</word_default>
+      <word_custom>Репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_by</word_key>
+      <word_default>By</word_default>
+      <word_custom>От </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_for</word_key>
+      <word_default>For</word_default>
+      <word_custom>Кому</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mf_upload</word_key>
+      <word_default>Upload</word_default>
+      <word_custom>Загрузить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_received</word_key>
+      <word_default>Reputation received for </word_default>
+      <word_custom>Репутаци� полученна� </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_login_name</word_key>
+      <word_default>Edit Sign In Name</word_default>
+      <word_custom>Изменить логин</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rep_given</word_key>
+      <word_default>Reputation given by </word_default>
+      <word_custom>Репутаци� отданна� </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_validate</word_key>
+      <word_default>Validate This Account</word_default>
+      <word_custom>Подтвердить учетную запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_email</word_key>
+      <word_default>Edit Email Address</word_default>
+      <word_custom>Изменить e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_password</word_key>
+      <word_default>Reset Password</word_default>
+      <word_custom>Изменить пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_display_name</word_key>
+      <word_default>Edit Display Name</word_default>
+      <word_custom>Изменить им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_nodisplayname</word_key>
+      <word_default>No display name specified</word_default>
+      <word_custom>Им� пользовател� не указано</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_tasks</word_key>
+      <word_default>View Tasks Associated With This Member</word_default>
+      <word_custom>Про�мотр задач дл� �того пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_tasks</word_key>
+      <word_default>Actions</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>button_validate</word_key>
+      <word_default>Validate Member</word_default>
+      <word_custom>�ктивировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_ban</word_key>
+      <word_default>Edit Ban Settings</word_default>
+      <word_custom>Изменить на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>title_delete</word_key>
+      <word_default>Delete This Member</word_default>
+      <word_custom>Удалить �того пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_banmanage</word_key>
+      <word_default>Ban Management</word_default>
+      <word_custom>Управление блокировками</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_uploadnew</word_key>
+      <word_default>Upload New Photo</word_default>
+      <word_custom>Загрузить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_abouttab</word_key>
+      <word_default>About Me</word_default>
+      <word_custom>О �ебе</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_sigtab</word_key>
+      <word_default>Signature</word_default>
+      <word_custom>Подпи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_unban</word_key>
+      <word_default>Unban Member</word_default>
+      <word_custom>Разбанить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_ban</word_key>
+      <word_default>Ban Member</word_default>
+      <word_custom>Забанить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_addnote</word_key>
+      <word_default>Add Note</word_default>
+      <word_custom>Добавить запи�ь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_viewnotes</word_key>
+      <word_default>View Notes</word_default>
+      <word_custom>Про�мотр запи�ей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_loginname</word_key>
+      <word_default>Login Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_display</word_key>
+      <word_default>Display Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_hideemail</word_key>
+      <word_default>Hide email address?</word_default>
+      <word_custom>Скрыть e-mail адре� от о�тальных пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_langchoice</word_key>
+      <word_default>Language Choice</word_default>
+      <word_custom>Язык интерфей�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_timeoffset</word_key>
+      <word_default>Time Zone Offset</word_default>
+      <word_custom>Ча�овой по��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_access</word_key>
+      <word_default><![CDATA[<strong>Permission Settings</strong>]]></word_default>
+      <word_custom>�а�тройки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_settings</word_key>
+      <word_default><![CDATA[<strong>Community Settings</strong>]]></word_default>
+      <word_custom>�а�тройки форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_password</word_key>
+      <word_default>Password</word_default>
+      <word_custom>Пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_skinchoice</word_key>
+      <word_default>Skin Choice</word_default>
+      <word_custom>Стиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_allowadmin</word_key>
+      <word_default>Allow admin emails?</word_default>
+      <word_custom>Разрешить получать пи�ьма от админи�трации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_disablepm</word_key>
+      <word_default>Disable PM access?</word_default>
+      <word_custom>Отключить и�пользование личных �ообщений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_skinnone</word_key>
+      <word_default>-- None / Use Community Default --</word_default>
+      <word_custom>-- �ет / По умолчанию --</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_profile</word_key>
+      <word_default><![CDATA[<strong>Profile Information</strong>]]></word_default>
+      <word_custom>Профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_custom</word_key>
+      <word_default><![CDATA[<strong>Member's Custom Profile Fields</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дополнительные пол� профил�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_viewsig</word_key>
+      <word_default>View signatures?</word_default>
+      <word_custom>Разрешить про�мотр подпи�ей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_rep_view_r</word_key>
+      <word_default>View Reputation Received</word_default>
+      <word_custom>Полученна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_reputation</word_key>
+      <word_default>Reputation Points</word_default>
+      <word_custom>Репутаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_bday</word_key>
+      <word_default>Birthday</word_default>
+      <word_custom>День рождени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_aboutme</word_key>
+      <word_default><![CDATA[<strong>About This Member</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>О пользователе</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_signature</word_key>
+      <word_default><![CDATA[<strong>Member's Signature</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Подпи�ь пользовател�</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_rep_view_g</word_key>
+      <word_default>View Reputation Given</word_default>
+      <word_custom>Отданна�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_approve_comments</word_key>
+      <word_default>Comment Approval Method</word_default>
+      <word_custom>Спо�об активации комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_enable_comments</word_key>
+      <word_default>Enable Profile Comments</word_default>
+      <word_custom>Включить комментарии в профиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_approve_friends</word_key>
+      <word_default>Friend Approval Method</word_default>
+      <word_custom>Спо�об активации пользовател�, как друга</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_friends_profile</word_key>
+      <word_default>Show friends in profile</word_default>
+      <word_custom>Показывать друзей в профиле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_latest_visitors</word_key>
+      <word_default>Show last 5 visitors in profile</word_default>
+      <word_custom>Показывать по�ледний X по�ещений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_comments_app_on</word_key>
+      <word_default>Enabled - Manually approve comments</word_default>
+      <word_custom>Включен - вручную активировать комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_comments_app_none</word_key>
+      <word_default>Disabled - Automatically approve comments</word_default>
+      <word_custom>Отключен - автоматиче�ки публиковать комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_friends_app_on</word_key>
+      <word_default>Enabled - Manually approve friend requests</word_default>
+      <word_custom><![CDATA[Включен - вручную активировать в�е запро�ы "в друзь�"]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_typeof</word_key>
+      <word_default><![CDATA[<strong>Type of Search</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тип пои�ка</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_ignorehuh</word_key>
+      <word_default>Ignore?</word_default>
+      <word_custom>Игнорировать?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_savebutton</word_key>
+      <word_default>Save Member</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_members</word_key>
+      <word_default>Members</word_default>
+      <word_custom>Пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_nofields</word_key>
+      <word_default>No custom profile fields have been set up</word_default>
+      <word_custom>В �и�теме не �оздано еще ни одного дополнительного пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_friends_app_none</word_key>
+      <word_default>Disabled - Automatically approve friend requests</word_default>
+      <word_custom><![CDATA[Отключен - автоматиче�ки активировать в�е запро�ы "в друзь�"]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_thisgroup</word_key>
+      <word_default><![CDATA[%s: This group <strong>%s</strong> restricted]]></word_default>
+      <word_custom><![CDATA[%s: <strong>%s</strong> дл� �той группы запрещены]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_isnot</word_key>
+      <word_default>IS NOT</word_default>
+      <word_custom>�Е</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_is</word_key>
+      <word_default>IS</word_default>
+      <word_custom> </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_belongsto</word_key>
+      <word_default>This member belongs to the following group(s):</word_default>
+      <word_custom>Пользователь входит в �ледующие группы:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_nomemfound</word_key>
+      <word_default>No members found</word_default>
+      <word_custom>Пользователи не найдены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_setrestrict</word_key>
+      <word_default>Would you like to configure individual ACP restrictions for this member?</word_default>
+      <word_custom>Хотите на�троить права до�тупа к �дминцентру дл� �того пользовател� ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_nothanks</word_key>
+      <word_default>No thanks</word_default>
+      <word_custom>�ет, �па�ибо</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_suspnotify</word_key>
+      <word_default><![CDATA[<strong>Email notification to this member?</strong><br />(If so, you may edit the email below)]]></word_default>
+      <word_custom>Уведомить по e-mail?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_acpresinfo</word_key>
+      <word_default><![CDATA[<strong>Note: You have ACP Permission Restrictions.</strong><br />Any member you create with a group that has access to the ACP will inherit your permission restrictions automatically.]]></word_default>
+      <word_custom><![CDATA[<strong>Ваши права до�тупа к �дминцентру ограничены.</strong><br />Любой пользователь, которого вы �оздадите в группе имеющей до�туп к �дминцентру, уна�ледует ваши ограничени�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_yesplease</word_key>
+      <word_default><![CDATA[<strong>Yes, set up restrictions</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Да, хочу</strong>  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_memoptions</word_key>
+      <word_default>Member Options</word_default>
+      <word_custom>�а�тройки пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_acctsusp</word_key>
+      <word_default>Member Account Suspension</word_default>
+      <word_custom>Блокировка учетной запи�и пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_suspnote</word_key>
+      <word_default>Note: If this member is already suspended, any new setting will restart the suspension</word_default>
+      <word_custom>Примечание: е�ли пользователь ранее уже был заблокирован, то нова� блокировка перекроет �тарую (от�чет времени начнет�� � момента вы�тавлени� новой блокировки)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_suspfor</word_key>
+      <word_default><![CDATA[<strong>Suspended %s for...</strong>]]></word_default>
+      <word_custom>Заблокировать %s на</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_registernew</word_key>
+      <word_default>Register New Member</word_default>
+      <word_custom>Создание пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_suspemailcont</word_key>
+      <word_default><![CDATA[<strong>Email contents</strong><br />(Tags: {membername} = member's name, {date_end} = ban end)]]></word_default>
+      <word_custom><![CDATA[<strong>Тек�т пи�ьма</strong><br />
+(Теги: {membername} = им� пользовател�, {date_end} = дата окончани� бана) ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_suspendbutton</word_key>
+      <word_default>Suspend This Account</word_default>
+      <word_custom>Заблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_configrest</word_key>
+      <word_default>Configure Admin Restrictions?</word_default>
+      <word_custom>�а�троить ограничени� до�тупа к �дминцентру?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_detectacp</word_key>
+      <word_default>We have detected that you have promoted %s to an administrative role and this member does not have any ACP restrictions</word_default>
+      <word_custom>Обнаружено, что пользователь %s имеет до�туп к �дминцентру без ограничений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_sendconf</word_key>
+      <word_default>Send confirmation email?</word_default>
+      <word_custom>Отправить подтверждение на e-mail?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_coppauser</word_key>
+      <word_default>COPPA User?</word_default>
+      <word_custom>Пользователь COPPA?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_prunenum</word_key>
+      <word_default><![CDATA[<strong>Number of members</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Количе�тво пользователей</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_prunemem</word_key>
+      <word_default>Prune Members</word_default>
+      <word_custom>Удалить пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_regbutton</word_key>
+      <word_default>Register New Account</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_custfields</word_key>
+      <word_default><![CDATA[<strong>Custom Profile Fields</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Дополнительные пол� профил�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_sendconf_info</word_key>
+      <word_default><![CDATA[Includes user's password]]></word_default>
+      <word_custom>Пароль пользовател� будет указан в пи�ьме</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_movebutton</word_key>
+      <word_default>Move %s Members</word_default>
+      <word_custom>Переме�тить %s пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_prunebutton</word_key>
+      <word_default>Prune %s Members</word_default>
+      <word_custom>Удалить %s пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_movemem</word_key>
+      <word_default>Move Members</word_default>
+      <word_custom>Переме�тить пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_prunemem_info</word_key>
+      <word_default><![CDATA[Please check the number below and confirm you want to prune all of the included members - <strong>THERE IS NO UNDOING THIS ACTION!</strong>]]></word_default>
+      <word_custom><![CDATA[Пожалуй�та убедите�ь, что вы дей�твительно хотите удалить пользователей -  <strong>ЭТО ДЕЙСТВИЕ �Е МОЖЕТ БЫТЬ ОТМЕ�Е�О!</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_mx100</word_key>
+      <word_default>The maximum number of pips you can have is 100. Please go back and reduce the number.</word_default>
+      <word_custom>Мак�имальное количе�тво звездочек, которое можно у�тановить - 100. Верните�ь назад и измените чи�ло.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_completeform</word_key>
+      <word_default>You must complete the form fully. Please try again.</word_default>
+      <word_custom>�еобходимо полно�тью заполнить форму.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_movegroup</word_key>
+      <word_default><![CDATA[<strong>Move to group</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Переме�тить в группу</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_minposts</word_key>
+      <word_default>Minimum Posts</word_default>
+      <word_custom>Требует�� �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_title</word_key>
+      <word_default>Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_titles</word_key>
+      <word_default>Member Titles/Ranks</word_default>
+      <word_custom>Звани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_addrank</word_key>
+      <word_default>Add this rank</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_editrank</word_key>
+      <word_default>Edit Rank</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_removed2</word_key>
+      <word_default>Rank Removed</word_default>
+      <word_custom>Звание удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_setup</word_key>
+      <word_default>Member Rank Set Up</word_default>
+      <word_custom>�а�тройка звани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_removed</word_key>
+      <word_default>Removed Rank Setting</word_default>
+      <word_custom>�а�тройки звани� удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_notfounddel</word_key>
+      <word_default>We could not find the rank you were attempting to delete.</word_default>
+      <word_custom>Звание дл� удалени� не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_rankcontrol</word_key>
+      <word_default>Member Ranking Control</word_default>
+      <word_custom>Управление звани�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_edited</word_key>
+      <word_default>Rank Edited</word_default>
+      <word_custom>Звание изменено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_edit</word_key>
+      <word_default>Edited Rank Setting</word_default>
+      <word_custom>Изменить на�тройки звани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_added2</word_key>
+      <word_default>Rank Added</word_default>
+      <word_custom>Звание добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_notfound</word_key>
+      <word_default>We could not find the member rank you were trying to edit.</word_default>
+      <word_custom>Звание дл� изменени� не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_added</word_key>
+      <word_default>Added New Rank Setting</word_default>
+      <word_custom>�а�тройка звани� добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_movemem_info</word_key>
+      <word_default><![CDATA[Note: Please confirm you would like to move all of the following members - <strong>THERE IS NO UNDOING THIS ACTION!</strong>]]></word_default>
+      <word_custom><![CDATA[Подтвердите перемещение �ледующих пользователей.  <strong>ЭТО ДЕЙСТВИЕ �ЕЛЬЗЯ ОТМЕ�ИТЬ!<strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_addarank</word_key>
+      <word_default>Add a Member Rank</word_default>
+      <word_custom>Добавление звани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_pips</word_key>
+      <word_default>Pips</word_default>
+      <word_custom>Звездочки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_numpips_info</word_key>
+      <word_default><![CDATA[Or pip image - image must be uploaded into 'public/style_extra/team_icons/']]></word_default>
+      <word_custom><![CDATA[Или название - изображение должно быть загружено в директорию 'public/style_extra/team_icons/']]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_minpostsneeded</word_key>
+      <word_default><![CDATA[<strong class="title">Minimum number of posts needed</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Минимальное количе�тво �ообщений дл� получени� звани�</strong> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_ranktitle</word_key>
+      <word_default><![CDATA[<strong class='title'>Rank Title</strong>]]></word_default>
+      <word_custom>Звание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_added</word_key>
+      <word_default>Profile Field Added</word_default>
+      <word_custom>Поле добавлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_control</word_key>
+      <word_default>Custom Profile Field Control</word_default>
+      <word_custom>Управление</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_edited</word_key>
+      <word_default>Profile Field Edited</word_default>
+      <word_custom>Поле изменено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_entertitle</word_key>
+      <word_default>You must enter a field title. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти название пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_removed</word_key>
+      <word_default>Profile Field Removed</word_default>
+      <word_custom>Поле удалено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_norow</word_key>
+      <word_default>We could not find that profile field. Please try again.</word_default>
+      <word_custom>Дополнительное поле не найдено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gid</word_key>
+      <word_default>Could not resolve the group ID. Please try again.</word_default>
+      <word_custom>�ельз� изменить ID группы. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_deletebutton</word_key>
+      <word_default>Delete Selected</word_default>
+      <word_custom>Удалить выбранные</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_names_none</word_key>
+      <word_default><![CDATA[<em>No Banned Names Found</em>]]></word_default>
+      <word_custom><![CDATA[<em>Забаненных пользователей не найдено</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_names</word_key>
+      <word_default>Non-Registerable Names</word_default>
+      <word_custom>Запрещенные к реги�трации имена пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_emails_none</word_key>
+      <word_default><![CDATA[<em>No Banned Email Addresses Found</em>]]></word_default>
+      <word_custom>Заблокированных e-mail адре�ов нет</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_emails</word_key>
+      <word_default>Banned Email Addresses</word_default>
+      <word_custom>Заблокированные e-mail адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_ips_none</word_key>
+      <word_default><![CDATA[<em>No Banned IP Addresses Found</em>]]></word_default>
+      <word_custom><![CDATA[<em>Заблокированных IP адре�ов нет</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_ips</word_key>
+      <word_default>Banned IP Addresses</word_default>
+      <word_custom>Заблокированные IP адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_bancontrol</word_key>
+      <word_default>Ban Control</word_default>
+      <word_custom>Фильтры блокировки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_ip</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_email</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_addnew</word_key>
+      <word_default>Add New Filter</word_default>
+      <word_custom>Добавить фильтр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_title</word_key>
+      <word_default>Ban Filters</word_default>
+      <word_custom>Управление фильтрами блокировки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_added</word_key>
+      <word_default>Ban Filter Added</word_default>
+      <word_custom>Фильтр блокировки добавлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_removed</word_key>
+      <word_default>Ban Filter Removed</word_default>
+      <word_custom>Фильтр блокировки удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_dupe</word_key>
+      <word_default>Duplicate entry - The entry has not been added to the database, as it already exists.</word_default>
+      <word_custom>Повторна� запи�ь - Запи�ь не добавлена в базу данных так как уже �уще�твует.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_editlink</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_deletelink</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ban_entersomething</word_key>
+      <word_default>You must enter something to add to the ban filters. Please try again.</word_default>
+      <word_custom>�еобходимо заполнить пол� фильтра.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>rnk_numpips</word_key>
+      <word_default><![CDATA[<strong class="title">Number of pips</strong> (Maximum: 100)]]></word_default>
+      <word_custom><![CDATA[<strong>Количе�тво звездочек</strong> (Мак�имально: 100)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_addbutton</word_key>
+      <word_default>Add Field</word_default>
+      <word_custom>Добавить поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_pagetitle_edit</word_key>
+      <word_default>Edit Custom Profile Field</word_default>
+      <word_custom>Изменение дополнительного пол� профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_editbutton</word_key>
+      <word_default>Complete Edit</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_pagetitle_add</word_key>
+      <word_default>Add Custom Profile Field</word_default>
+      <word_custom>Добавить дополнительное поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_settings</word_key>
+      <word_default>Field Settings</word_default>
+      <word_custom>�а�тройка дополнительных полей профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_nonefound</word_key>
+      <word_default>None Found</word_default>
+      <word_custom>�ичего не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_adminonly</word_key>
+      <word_default>Admin/Super Mod Only?</word_default>
+      <word_custom>Только �дмини�тратор / Супермодератор</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_showreg</word_key>
+      <word_default>Show on Registration?</word_default>
+      <word_custom>Показывать при реги�трации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_notpublic</word_key>
+      <word_default>Private?</word_default>
+      <word_custom>Личное?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_required</word_key>
+      <word_default>Required?</word_default>
+      <word_custom>Об�зательное?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_title</word_key>
+      <word_default>Field Title</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_type</word_key>
+      <word_default>Type</word_default>
+      <word_custom>Тип</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_management</word_key>
+      <word_default>Custom Profile Field Management</word_default>
+      <word_custom>Управление дополнительными пол�ми профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_search_exact</word_key>
+      <word_default>Exact</word_default>
+      <word_custom>Точный</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_search_loose</word_key>
+      <word_default>Loose</word_default>
+      <word_custom>Свободный</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_cbox</word_key>
+      <word_default>Check Boxes</word_default>
+      <word_custom>Чекбок�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_textarea</word_key>
+      <word_default>Text Area</word_default>
+      <word_custom>Тек�т (много �трок)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_input</word_key>
+      <word_default>Text Input</word_default>
+      <word_custom>Тек�т (одна �трока)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_drop</word_key>
+      <word_default>Drop Down Box</word_default>
+      <word_custom>Выпадающий �пи�ок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_radio</word_key>
+      <word_default>Radio Buttons</word_default>
+      <word_custom>Переключатель</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gedit</word_key>
+      <word_default>Edit Profile Field Group</word_default>
+      <word_custom>Изменение группы дополнительных полей профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gcreate</word_key>
+      <word_default>Create Profile Field Group</word_default>
+      <word_custom>Создание группы дополнительных полей профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gmodified</word_key>
+      <word_default>Custom profile field group modified</word_default>
+      <word_custom>Группа дополнительных полей изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gadded</word_key>
+      <word_default>Custom profile field group added</word_default>
+      <word_custom>Группа дополнительных полей добавлена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gkey</word_key>
+      <word_default>The Group Key must be a unique key. Please try another.</word_default>
+      <word_custom>Ключ группы должен быть уникален. Введите другое значение ключа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_completeform</word_key>
+      <word_default>You must complete the entire form.</word_default>
+      <word_custom>Форму необходимо заполнить полно�тью.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_gremoved</word_key>
+      <word_default>Custom profile field group removed</word_default>
+      <word_custom>Группа дополнительных полей удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_title</word_key>
+      <word_default><![CDATA[<strong class='title'>Field Title</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>�азвание</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_max_info</word_key>
+      <word_default>For text input and text areas (in characters)</word_default>
+      <word_custom>Дл� тек�товых полей (только цифры)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_max</word_key>
+      <word_default><![CDATA[<strong class='title'>Maximum Input</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Мак�имальна� длина</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_type</word_key>
+      <word_default><![CDATA[<strong class='title'>Field Type</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Тип пол�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_desc_info</word_key>
+      <word_default><![CDATA[Max Characters: 250<br />Can be used to note hidden/required status]]></word_default>
+      <word_custom><![CDATA[Мак�имальное количе�тво �имволов: 250<br />Может быть и�пользовано дл� примечаний.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_key_info</word_key>
+      <word_default>This is a key that can be used to identify the field (e.g. in skins)</word_default>
+      <word_custom><![CDATA[Ключ может и�пользовать�� дл� идентификации пол�.<br />(�апример в шаблонах)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_key</word_key>
+      <word_default><![CDATA[<strong class='title'>Field Key</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Ключ</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_group</word_key>
+      <word_default><![CDATA[<strong class='title'>Profile Group</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Группа дополнительных полей профил�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_icon</word_key>
+      <word_default><![CDATA[<strong class='title'>Profile Icon</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Иконка профил�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_desc</word_key>
+      <word_default><![CDATA[<strong class='title'>Description</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Опи�ание</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_title_info</word_key>
+      <word_default>Max characters: 200</word_default>
+      <word_custom>Мак�имальное количе�тво �имволов: 200</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_order</word_key>
+      <word_default><![CDATA[<strong class='title'>Display order</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Пор�док �ортировки</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_reg_info</word_key>
+      <word_default><![CDATA[If 'yes', the field will be shown upon registration.]]></word_default>
+      <word_custom>При выборе «Да», �то дополнительное поле будет предложено заполнить при реги�трации.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_must</word_key>
+      <word_default><![CDATA[<strong class='title'>Field MUST be completed and not left empty?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Это поле об�зательно к заполнению?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_must_info</word_key>
+      <word_default><![CDATA[If 'yes', an error will be shown if this field is not completed.]]></word_default>
+      <word_custom>При выборе «Да», будет выводить�� �ообщение об ошибке до тех пор, пока пользователь его не заполнит.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_filter_type_info</word_key>
+      <word_default><![CDATA[If 'yes', the field will be checked against the URL whitelist/blacklist filtering.  Be careful to only enable this option on fields that you expect URLs to be submitted in.]]></word_default>
+      <word_custom>При выборе «Да» будет прои�ходить фильтраци� в�тавл�емых URL адре�ов по �пи�ку. Будьте о�торожны, и�пользу� �ту опцию.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_reg</word_key>
+      <word_default><![CDATA[<strong class='title'>Include on registration page?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Добавить на �траницу реги�трации?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_srch_type</word_key>
+      <word_default>Search Type</word_default>
+      <word_custom>Тип пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_srch_type_info</word_key>
+      <word_default>Used when searching for members based on their value of this field</word_default>
+      <word_custom>И�пользует�� при пои�ке пользователей по значению данного пол�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_filter_type</word_key>
+      <word_default>Apply URL Filtering</word_default>
+      <word_custom>Применить фильтрацию URL адре�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_option</word_key>
+      <word_default><![CDATA[<strong class='title'>Option Content (for drop downs, checkboxes and radio buttons)</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Содержимое опций дл� выпадающего меню</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_form_info</word_key>
+      <word_default><![CDATA[Use: <strong>a</strong> for alpha characters.<br />Use: <strong>n</strong> for numerics.<br />If you enter one 'a', that will allow one letter. Entering 'aa' will allow two letters, and so on.<br />Example, for credit card numbers: nnnn-nnnn-nnnn-nnnn<br />Example, Date of Birth: nn-nn-nnnn<br />Leave blank to accept any input]]></word_default>
+      <word_custom><![CDATA[И�пользование:<strong>a</strong> — буквы<br /><strong>n</strong> — цифры.<br />�апример, кредитна� карта: nnnn-nnnn-nnnn-nnnn<br />�апример, дата рождени�: nn-nn-nnnn<br />О�тавьте поле пу�тым дл� и�пользовани� любых �имволов.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_form</word_key>
+      <word_default><![CDATA[<strong class='title'>Expected Input Format</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Формат пол�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_order_info</word_key>
+      <word_default>When editing and displaying (numeric 1 lowest)</word_default>
+      <word_custom><![CDATA[При редактировании и отображении.<br />Цифра 1 — �ама� низка� позици�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_edit</word_key>
+      <word_default><![CDATA[<strong class='title'>Field can be edited by the member?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Поле может быть изменено пользователем?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_option_info</word_key>
+      <word_default><![CDATA[In sets, one set per line<br>Example for 'Gender' field:<br>m=Male<br>f=Female<br>u=Not Telling<br>Will produce:<br><select name='pants'><option value='m'>Male</option><option value='f'>Female</option><option value='u'>Not Telling</option></select><br>m,f or u stored in database. When showing field in profile, will use value from pair (f=Female, shows 'Female')]]></word_default>
+      <word_custom><![CDATA[И�пользование: <strong>ключ=значение</strong> (по одному значению на �троку)<br />Пример дл� пол� <strong>Пол:</strong><br />m=Муж�кой<br />f=Жен�кий<br />u=�е �кажу<br /><strong>Результат:</strong><br /><select name='pants'><option value='m'>Жен�кий</option><option value='u'>�е �кажу</option></select><br />Одно из значений: <strong>m</strong>, <strong>f</strong> или <strong>u</strong> будет �охранено в базе данных.<br />При отображении в профиле выводит�� <strong>Пол: �е �кажу</strong> (при выборе пользователем значени� <strong>�е �кажу</strong>)]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_removeto</word_key>
+      <word_default><![CDATA[<strong class='title'>Custom Profile Field to remove...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Поле профил� дл� удалени�</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_removeconf</word_key>
+      <word_default>Removal Confirmation</word_default>
+      <word_custom>Подтверждение удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_priv</word_key>
+      <word_default><![CDATA[<strong class='title'>Make this a private profile field?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Сделать �то поле личным?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_priv_info</word_key>
+      <word_default><![CDATA[If yes, field only visible to profile owner, super moderators and admins. If 'no', members can search within this field.]]></word_default>
+      <word_custom><![CDATA[При выборе «Да», поле будет видимым только дл� �амого пользовател�, �упермодераторов и админи�траторов.<br />При выборе «�ет», о�тальные пользователи �могут и�кать по �тому полю.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_edit_info</word_key>
+      <word_default><![CDATA[If 'no', the member cannot edit the field but Super Moderators and Admins will be able to.]]></word_default>
+      <word_custom>При выборе «�ет», пользователь не �может редактировать �то поле, но �могут �упермодераторы и админи�траторы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_save</word_key>
+      <word_default>Create Group</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_groups</word_key>
+      <word_default>Profile Field Groups</word_default>
+      <word_custom>Группы дополнительных полей профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_add</word_key>
+      <word_default>Add Group</word_default>
+      <word_custom>Добавить группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_deletedmem</word_key>
+      <word_default><![CDATA[<em>Deleted Member</em>]]></word_default>
+      <word_custom><![CDATA[<em>Пользователь удален</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_admin</word_key>
+      <word_default><![CDATA[<strong class='title'>Make Admin and Super Moderator Editable/Viewable Only?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Сделать видимым и измен�емым только �упермодераторам и админи�траторам?</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_admin_info</word_key>
+      <word_default><![CDATA[If yes, will override the above options so only admins and super moderators can see and edit this field.  <strong>If enabled, the field will not show on the registration form!</strong>]]></word_default>
+      <word_custom>При выборе «Да», �та опци� отменит предыдущие, так что только �упермодераторы и админи�траторы �могут видеть и измен�ть �то поле.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_view</word_key>
+      <word_default><![CDATA[<strong class='title'>Topic View Format?</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Отображение пол� в �ообщении</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_f_view_info</word_key>
+      <word_default><![CDATA[Leave blank if you do not wish to add this field in the author details when viewing a topic.<br />{title} is the title of the custom field, {content} is the user added content. {key} is the form select value of the selected item in a dropdown box.<br />Example: &lt;span class='row_title'&gt;{title}:&lt;/span&gt;&lt;span class='row_data'&gt;{content}&lt;/span&gt;<br />Example: &lt;span class='row_title'&gt;{title}:&lt;/span&gt;&lt;span class='row_data'&gt;&lt;img src='imgs/{key}'&gt;&lt;/span&gt;]]></word_default>
+      <word_custom><![CDATA[О�тавьте поле пу�тым, е�ли вы не хотите, чтобы �то дополнительное поле добавл�ло�ь по�ле информации об авторе при отображении �ообщений.<br />До�тупные теги:<br />{title} — название дополнительного пол�<br />{content} — �одержимое дополнительного пол�<br />{key} — выбор пользовател� из выпадающего меню<br />Пример: &lt;dt&gt;{title}:&lt;/dt&gt;&lt;dd&gt;{content}&lt;/dd&gt;<br />
+Пример: &lt;dt&gt;{title}:&lt;/dt&gt;&lt;dd&gt;&lt;img src='imgs/{key}'&gt;&lt;/dd&gt; ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_key_desc</word_key>
+      <word_default>(Must be a unique word for this group)</word_default>
+      <word_custom>(Слово должно быть уникальным дл� группы)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_key</word_key>
+      <word_default>Group Reference Key</word_default>
+      <word_custom>Ключ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_deletebutton</word_key>
+      <word_default>Delete Custom Field</word_default>
+      <word_custom>Удалить поле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>cf_g_name</word_key>
+      <word_default>Group Name</word_default>
+      <word_custom>�азвание</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_lostpass</word_key>
+      <word_default>Lost Password</word_default>
+      <word_custom>Забыли пароль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_coppa</word_key>
+      <word_default>( COPPA Request )</word_default>
+      <word_custom>(Запро� COPPA)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_na</word_key>
+      <word_default>N/A</word_default>
+      <word_custom>�е до�тупно</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_userval</word_key>
+      <word_default><![CDATA[Registering: <strong>(User Validation)</strong>]]></word_default>
+      <word_custom>Реги�траци�: (подтверждение пользователем)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_unapprove</word_key>
+      <word_default>Unapprove?</word_default>
+      <word_custom>Отменить подтверждение ?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_emailchange</word_key>
+      <word_default>Email change request at %s</word_default>
+      <word_custom>Изменение e-mail адре�а </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_rowtype_banned</word_key>
+      <word_default>banned</word_default>
+      <word_custom>забанен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_rowtype_spam</word_key>
+      <word_default>spam</word_default>
+      <word_custom>�памер</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_rowtype_validating</word_key>
+      <word_default>validating</word_default>
+      <word_custom>ожидает активации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_notype</word_key>
+      <word_default>No %s members found</word_default>
+      <word_custom>%s пользователей не найдено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipcolon</word_key>
+      <word_default>IP:</word_default>
+      <word_custom>IP:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_adminval</word_key>
+      <word_default><![CDATA[Registering: <strong>(Admin Validation)</strong>]]></word_default>
+      <word_custom><![CDATA[Реги�траци�: <strong>(подтверждение админи�тратором)</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_rowtype_locked</word_key>
+      <word_default>locked</word_default>
+      <word_custom>заблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_validating</word_key>
+      <word_default>Validating Members</word_default>
+      <word_custom>Ожидают подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_showallip</word_key>
+      <word_default>Find IP addresses a member has posted with</word_default>
+      <word_custom>Показать в�е IP адре�а, которые были у �того пользовател� в момент добавлени� �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_message</word_key>
+      <word_default>Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_membanned</word_key>
+      <word_default>%s Member(s) Banned</word_default>
+      <word_custom> Пользователи забанены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_iptoolstitle</word_key>
+      <word_default>IP Address Tools</word_default>
+      <word_custom>Ин�трументы IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_passwordrec</word_key>
+      <word_default>Password recovery information from </word_default>
+      <word_custom>Во��тановление парол� </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_regat</word_key>
+      <word_default>New Registration at %s</word_default>
+      <word_custom>Реги�траци� </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_valcannot</word_key>
+      <word_default>Cannot resend validation emails to the following members who are awaiting admin validation: %s</word_default>
+      <word_custom>�евозможно отправить e-mail дл� подтверждени� �ледующим пользовател�м: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memregapp2</word_key>
+      <word_default>%s Member Registration Approved: %s</word_default>
+      <word_custom> Реги�траци� пользовател� подтверждена: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memregapp</word_key>
+      <word_default> Member Registrations Approved</word_default>
+      <word_custom> Реги�траци� пользователей подтверждена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nomemsel</word_key>
+      <word_default>You did not select any members to approve, delete, or resend the validation email to. Please try again.</word_default>
+      <word_custom>Пользователи не выбраны. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_choosemem</word_key>
+      <word_default>Choose the member from the selection</word_default>
+      <word_custom>Выберите пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nomemberloc</word_key>
+      <word_default><![CDATA[There are no members with the names that start with '%s'. Please try again.]]></word_default>
+      <word_custom>�евозможно найти пользовател� � таким именем.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_single</word_key>
+      <word_default>Single Page</word_default>
+      <word_custom>Одна �траница</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_multiple</word_key>
+      <word_default>Multiple Pages</word_default>
+      <word_custom>�е�колько �траниц</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_entername</word_key>
+      <word_default><![CDATA[Enter the member's name]]></word_default>
+      <word_custom>Введите им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_noexact</word_key>
+      <word_default>We could not find an exact match for that member name. Some choices will be shown below.</word_default>
+      <word_custom>�е удало�ь найти точное �овпадение дл� указанного имени. �иже показаны некоторые �овпадени�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nonameloc</word_key>
+      <word_default>Could not locate a member with the ID of: %s. Please try again.</word_default>
+      <word_custom>�евозможно найти пользовател� � ID: %s. Попробуйте ещё раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_noname</word_key>
+      <word_default>You did not enter a name to search by. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти им� пользовател� дл� пои�ка.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_notavail</word_key>
+      <word_default><![CDATA[<em>Not Available</em>]]></word_default>
+      <word_custom><![CDATA[<em>�е до�тупно</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_noip</word_key>
+      <word_default>You did not enter an IP address to search by. Please try again.</word_default>
+      <word_custom>Вы должны вве�ти IP-адре� дл� пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_guest</word_key>
+      <word_default>Guest</word_default>
+      <word_custom>Го�ть</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_partip</word_key>
+      <word_default>N/A - Partial IP Address</word_default>
+      <word_custom>Ча�тичный IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_spammers</word_key>
+      <word_default>Spam Members</word_default>
+      <word_custom>Спамеры</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_banned</word_key>
+      <word_default>Banned Members</word_default>
+      <word_custom>Забаненные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_locked</word_key>
+      <word_default>Locked Members</word_default>
+      <word_custom>Заблокированные пользователи</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_showmebutton</word_key>
+      <word_default>Show Me!</word_default>
+      <word_custom>Выве�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_showme</word_key>
+      <word_default><![CDATA[<strong>Show me everything you know about this IP...</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Выве�ти в�ю информацию об IP</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_counttxt</word_key>
+      <word_default><![CDATA[%s's IP addresses %s matches]]></word_default>
+      <word_custom>У пользовател� %s найдено %s уникальных IP-адре�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memunlocked</word_key>
+      <word_default>%s Member(s) Unlocked</word_default>
+      <word_custom> Блокировка �н�та</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_emailchangeun</word_key>
+      <word_default>Member %s email change request unapproved</word_default>
+      <word_custom>Запро� пользовател� %s на �мену e-mail отклонен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nolockloc</word_key>
+      <word_default>You did not select any members to unlock or ban. Please try again.</word_default>
+      <word_custom>Вы не выбрали ни одного пользовател�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memdeleted</word_key>
+      <word_default>%s Member(s) Deleted</word_default>
+      <word_custom> Пользователи удалены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_noemailloc</word_key>
+      <word_default>We could not find the email change to unapprove.</word_default>
+      <word_custom>�евозможно найти запро� на �мену e-mail.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memunbanned</word_key>
+      <word_default>%s Member(s) Unbanned</word_default>
+      <word_custom> Пользователи разбанены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_regdenied</word_key>
+      <word_default>%s Member Registration Denied: %s</word_default>
+      <word_custom> Реги�траци� пользовател� отклонена: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nomemunban</word_key>
+      <word_default>You did not select any members to unban or delete.</word_default>
+      <word_custom>Вы не выбрали ни одного пользовател�.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_lastused</word_key>
+      <word_default>Last Used</word_default>
+      <word_custom>Дата по�леднего и�пользовани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_timesused</word_key>
+      <word_default>Times Used</word_default>
+      <word_custom>Входов � �того IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipaddy</word_key>
+      <word_default>IP Address</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_showallbutton</word_key>
+      <word_default>Get IP Addresses</word_default>
+      <word_custom>�айти IP адре� �того пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipmulti</word_key>
+      <word_default>IP Multi-Tool</word_default>
+      <word_custom>Информаци� об IP адре�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_learnmore</word_key>
+      <word_default>Learn more...</word_default>
+      <word_custom>Информаци� о IP-адре�е</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_usedotherreg</word_key>
+      <word_default>Used for other Reg.</word_default>
+      <word_custom>И�пользовано при других реги�траци�х</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_iptool</word_key>
+      <word_default>IP Tool</word_default>
+      <word_custom>Ин�трумент IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_noips</word_key>
+      <word_default><![CDATA[<strong>No IP Addresses Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>IP адре� не найден</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipreg</word_key>
+      <word_default>Members using that IP when REGISTERING</word_default>
+      <word_custom>Пользователи, и�пользовавшие �тот IP при РЕГИСТР�ЦИИ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipresolves</word_key>
+      <word_default><![CDATA[<strong>IP address resolves to</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>IP адре� определ�ет�� как</strong> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipemail</word_key>
+      <word_default>Email</word_default>
+      <word_custom>E-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipname</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nomatches</word_key>
+      <word_default><![CDATA[<strong>No Matches Found</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Запи�и не найдены</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipip</word_key>
+      <word_default>IP</word_default>
+      <word_custom>IP адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipregistered</word_key>
+      <word_default>Registered</word_default>
+      <word_custom>Зареги�трирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipposts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipview</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipposted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipposting</word_key>
+      <word_default>Members using that IP when POSTING</word_default>
+      <word_custom>Пользователи, и�пользовавшие �тот IP при ��ПИС��ИИ СООБЩЕ�ИЯ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipviewpost</word_key>
+      <word_default>View Post</word_default>
+      <word_custom>По�мотреть �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipvoting</word_key>
+      <word_default>Members using that IP when VOTING</word_default>
+      <word_custom>Пользователи, и�пользовавшие �тот IP при ГОЛОСОВ��ИИ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipemailing</word_key>
+      <word_default>Members using that IP when EMAILING</word_default>
+      <word_custom>Пользователи, и�пользовавшие �тот IP при ОТПР�ВКЕ E-MAIL</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipviewpoll</word_key>
+      <word_default>View Poll</word_default>
+      <word_custom>По�мотреть голо�ование</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipfirstused</word_key>
+      <word_default>First Used</word_default>
+      <word_custom>Впервые и�пользован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ip_table</word_key>
+      <word_default>Database Table</word_default>
+      <word_custom>Таблица базы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipvalidating</word_key>
+      <word_default>Members using that IP when VALIDATING</word_default>
+      <word_custom>Пользователи, и�пользовавшие �тот IP при �КТИВ�ЦИИ УЧЕТ�ОЙ З�ПИСИ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_ipalsofound</word_key>
+      <word_default>This IP address was also found...</word_default>
+      <word_custom>Данный IP адре� был также найден</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qshowadmin</word_key>
+      <word_default>Show Registering (Admin Validation)</word_default>
+      <word_custom>Зареги�трированные (подтверждение админи�тратором)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memberq</word_key>
+      <word_default>Member %s Queue</word_default>
+      <word_custom>Спи�ок %s пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qcoppa</word_key>
+      <word_default>COPPA Requests</word_default>
+      <word_custom>COPPA запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qemailchange</word_key>
+      <word_default>Email Changes</word_default>
+      <word_custom>Изменение e-mail адре�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qshowreg</word_key>
+      <word_default>Show Registering (User Validation)</word_default>
+      <word_custom>Зареги�трированные (подтверждение пользователем)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qshowall</word_key>
+      <word_default>Show All</word_default>
+      <word_custom>Показать в�ех</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qdisplayname</word_key>
+      <word_default><![CDATA[Member's Display Name]]></word_default>
+      <word_custom>Отображаемое им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qposts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qaddress</word_key>
+      <word_default>Email Address</word_default>
+      <word_custom>E-mail адре�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qgobutton</word_key>
+      <word_default>Go</word_default>
+      <word_custom>Выполнить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qfailed</word_key>
+      <word_default>Fail Logins</word_default>
+      <word_custom>�еудачные попытки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qsent</word_key>
+      <word_default>Email Sent</word_default>
+      <word_custom>Отправлено подтверждение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qgroup</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qjoined</word_key>
+      <word_default>Joined</word_default>
+      <word_custom>Реги�траци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qban</word_key>
+      <word_default>Ban these accounts</word_default>
+      <word_custom>Забанить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qdelete</word_key>
+      <word_default>Delete these accounts</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qfinalizepartial</word_key>
+      <word_default>Finalize these accounts</word_default>
+      <word_custom>Завершить �ти учетные запи�и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qunlock</word_key>
+      <word_default>Unlock these accounts</word_default>
+      <word_custom>Разблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qapprove</word_key>
+      <word_default>Approve these accounts</word_default>
+      <word_custom>�ктивировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qresend</word_key>
+      <word_default>Resend validation emails</word_default>
+      <word_custom>Отправить повторно пи�ьмо на e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_groupcolon</word_key>
+      <word_default>Group:</word_default>
+      <word_custom>Группа:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_qunban</word_key>
+      <word_default>Unban these accounts</word_default>
+      <word_custom>Разбанить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_processbutton</word_key>
+      <word_default><![CDATA[Process &gt;&gt;]]></word_default>
+      <word_custom>Выполнить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_daysandhours</word_key>
+      <word_default>%s days and %s hours ago</word_default>
+      <word_custom>%s дней и %s ча�ов назад</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>total_pms_sent</word_key>
+      <word_default>Total messages from</word_default>
+      <word_custom>В�его �ообщений от</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_failures</word_key>
+      <word_default><![CDATA[Oldest Failure: %s<br />Most Recent Failure: %s<br />Total Failures: %s]]></word_default>
+      <word_custom><![CDATA[Ранние ошибки: %s<br />
+�овые ошибки: %s<br />
+В�его ошибок: %s]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>total_pms_topics</word_key>
+      <word_default>Delete all %s personal conversations started</word_default>
+      <word_custom>Удалить в�е личные �ообщени� %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>total_pms_replies</word_key>
+      <word_default>Delete all %s personal conversation replies</word_default>
+      <word_custom>Удалить ответы на личные �ообщение %s</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8657,9 +6454,27 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>ts_spam_un_posts</word_key>
       <word_default>Un-flag Members and approve all posts</word_default>
       <word_custom>Сн�ть пометку и опубликовать в�е �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>ts_spam_un</word_key>
+      <word_default>Un-flag Members</word_default>
+      <word_custom>Сн�ть пометку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>confirm_pm_button</word_key>
+      <word_default>Delete messages</word_default>
+      <word_custom>Удалить �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_member</word_pack>
+      <word_key>deleted_pms</word_key>
+      <word_default>The messages have been deleted</word_default>
+      <word_custom>Сообщени� удалены</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8667,19 +6482,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>ts_spam_ban</word_key>
       <word_default>Ban Members</word_default>
       <word_custom>Забанить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>ts_spam_blacklist</word_key>
-      <word_default>Ban Members and blacklist IP / Email</word_default>
-      <word_custom>Забанить и зане�ти IP / E-mail в черный �пи�ок</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8687,49 +6489,13 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>ts_spam_mark</word_key>
       <word_default>Mark As Spammer</word_default>
       <word_custom>Отметить как �памера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30010</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>member_rank_nav</word_key>
-      <word_default>Member Rank Set Up</word_default>
-      <word_custom>�а�тройка рангов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>merge_users_title</word_key>
-      <word_default><![CDATA[Select the user to merge with '%s']]></word_default>
-      <word_custom><![CDATA[Выберите пользовател� дл� объединени� � '%s']]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>merge_explanation</word_key>
-      <word_default><![CDATA[This tool allows you to merge two member accounts into one.  All of the member data will be retained from the account '%s'.  All other data belonging to the account you select below (for example, topics and personal conversations) will then belong to %s and the selected account will be removed.]]></word_default>
-      <word_custom><![CDATA[Данный ин�трумент позволит вам объединить два пользователь�ких аккаунта в один. В�е данные будут �охранены в аккаунт '%s'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>merge_confirmation</word_key>
-      <word_default><![CDATA[<strong>Please verify before continuing.  There is no undoing this action!</strong> You will be merging all content (such as topics and personal conversations) currently belonging to %s into the account %s.  The %s account will then be permanantly deleted.]]></word_default>
-      <word_custom><![CDATA[<strong>Убедите�ь в правильно�ти информации. По�ле нажати� кнопки «Объединить пользователей» операцию уже нельз� будет отменить!</strong> В�е данные принадлежащие %s будут перене�ены в учетную запи�ь %s. Запи�ь %s будет удалена.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ts_spam_blacklist</word_key>
+      <word_default>Ban Members and blacklist IP / Email</word_default>
+      <word_custom>Забанить и зане�ти IP / E-mail в черный �пи�ок</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8737,19 +6503,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>merge_confirm_title</word_key>
       <word_default>Please confirm you wish to merge these two accounts:</word_default>
       <word_custom>Подтвердите объединение �ледующих запи�ей:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>merge_keep</word_key>
-      <word_default>Merge into (this account will be kept):</word_default>
-      <word_custom>Объединить в (аккаунт будет �охранен):</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8757,9 +6510,6 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>merge_remove</word_key>
       <word_default>Merge from (this account will be removed):</word_default>
       <word_custom>Объединить � (аккаунт будет удален): </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8767,119 +6517,34 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>merge_submit</word_key>
       <word_default>Merge Members</word_default>
       <word_custom>Объединить пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>merge_continue_button</word_key>
-      <word_default>Continue..</word_default>
-      <word_custom>Продолжить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_users_title</word_key>
+      <word_default><![CDATA[Select the user to merge with '%s']]></word_default>
+      <word_custom><![CDATA[Выберите пользовател� дл� объединени� � '%s']]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>merge_find_name</word_key>
-      <word_default><![CDATA[Enter member's display name]]></word_default>
-      <word_custom>Введите им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_explanation</word_key>
+      <word_default><![CDATA[This tool allows you to merge two member accounts into one.  All of the member data will be retained from the account '%s'.  All other data belonging to the account you select below (for example, topics and personal conversations) will then belong to %s and the selected account will be removed.]]></word_default>
+      <word_custom><![CDATA[Данный ин�трумент позволит вам объединить два пользователь�ких аккаунта в один. В�е данные будут �охранены в аккаунт '%s'.]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>merged_members</word_key>
-      <word_default>The two members have been merged</word_default>
-      <word_custom>Пользователи объединены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_rank_nav</word_key>
+      <word_default>Member Rank Set Up</word_default>
+      <word_custom>�а�тройка рангов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_member</word_pack>
-      <word_key>t_nomemunspammed</word_key>
-      <word_default>You did not select any members to manage.</word_default>
-      <word_custom>Вы не выбрали ни одного пользовател�.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_memunspammed</word_key>
-      <word_default> Member(s) Un-Flagged</word_default>
-      <word_custom> Отметка �н�та</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_unspam</word_key>
-      <word_default>Un-Flag Spam Member</word_default>
-      <word_custom>�Е �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>sm_spam</word_key>
-      <word_default>Flag Member As Spam</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>t_log_spam</word_key>
-      <word_default>Member spam status toggle</word_default>
-      <word_custom>Переключен �тату� �памера</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>new_registration_email_spammer</word_key>
-      <word_default>Member account flagged as spam</word_default>
-      <word_custom>Пользователь отмечен как �памер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_edit_pm_no</word_key>
-      <word_default>No</word_default>
-      <word_custom>�ет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_member</word_pack>
-      <word_key>mem_edit_pm_yes</word_key>
-      <word_default>Yes - but allow the member to re-enable</word_default>
-      <word_custom>Да - но разрешить пользователю включить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>merge_keep</word_key>
+      <word_default>Merge into (this account will be kept):</word_default>
+      <word_custom>Объединить в (аккаунт будет �охранен):</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -8887,759 +6552,111 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>mem_edit_pm_yes_really</word_key>
       <word_default><![CDATA[Yes - and DON'T allow the member to re-enable]]></word_default>
       <word_custom>Да - и не разрешать пользователю включать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>frm_enterthematrix</word_key>
-      <word_default>Permission Matrix</word_default>
-      <word_custom>Ма�ки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_edit_pm_yes</word_key>
+      <word_default>Yes - but allow the member to re-enable</word_default>
+      <word_custom>Да - но разрешить пользователю включить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>frm_savechanges</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_spam</word_key>
+      <word_default>Flag Member As Spam</word_default>
+      <word_custom>Спамер</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_baseon</word_key>
-      <word_default><![CDATA[<strong>Base this permission set on which existing set...</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>�а�ледовать права из ма�ки:</strong> ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_log_spam</word_key>
+      <word_default>Member spam status toggle</word_default>
+      <word_custom>Переключен �тату� �памера</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_createnew</word_key>
-      <word_default>Create a new permission set</word_default>
-      <word_custom>Создание новой ма�ки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>new_registration_email_spammer</word_key>
+      <word_default>Member account flagged as spam</word_default>
+      <word_custom>Пользователь отмечен как �памер</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_createbutton</word_key>
-      <word_default>Create</word_default>
-      <word_custom>Создать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>mem_edit_pm_no</word_key>
+      <word_default>No</word_default>
+      <word_custom>�ет</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_previewtext</word_key>
-      <word_default>See what this group can see...</word_default>
-      <word_custom>По�мотреть что вид�т пользователи �той группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>sm_unspam</word_key>
+      <word_default>Un-Flag Spam Member</word_default>
+      <word_custom>�Е �памер</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_previewset</word_key>
-      <word_default>Preview Permission Set...</word_default>
-      <word_custom>Предпро�мотр прав до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_memunspammed</word_key>
+      <word_default>%s Member(s) Un-Flagged</word_default>
+      <word_custom> Отметка �н�та</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_deleteset</word_key>
-      <word_default>Delete Permission Set...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_nomemunspammed</word_key>
+      <word_default>You did not select any members to manage.</word_default>
+      <word_custom>Вы не выбрали ни одного пользовател�.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_editset</word_key>
-      <word_default>Edit permission set</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>merge_continue_button</word_key>
+      <word_default>Continue..</word_default>
+      <word_custom>Продолжить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>merge_find_name</word_key>
+      <word_default><![CDATA[Enter member's display name]]></word_default>
+      <word_custom>Введите им� пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_inuse</word_key>
-      <word_default><![CDATA[<em>In Use (Cannot Delete)</em>]]></word_default>
-      <word_custom><![CDATA[<em>И�пользует�� (�е может быть удалена)</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>merged_members</word_key>
+      <word_default>The two members have been merged</word_default>
+      <word_custom>Пользователи объединены</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>merge_confirmation</word_key>
+      <word_default><![CDATA[<strong>Please verify before continuing.  There is no undoing this action!</strong> You will be merging all content (such as topics and personal conversations) currently belonging to %s into the account %s.  The %s account will then be permanantly deleted.]]></word_default>
+      <word_custom><![CDATA[<strong>Убедите�ь в правильно�ти информации. По�ле нажати� кнопки «Объединить пользователей» операцию уже нельз� будет отменить!</strong> В�е данные принадлежащие %s будут перене�ены в учетную запи�ь %s. Запи�ь %s будет удалена.]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_viewnames</word_key>
-      <word_default>View the member names of those using this permission set in a new window</word_default>
-      <word_custom>Про�мотр пользователей � �той группой ограничений в новом окне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_resend</word_key>
+      <word_default>RESEND</word_default>
+      <word_custom>ПЕРЕОТПР�ВИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_user</word_key>
-      <word_default>User</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>m_but_resend_all</word_key>
+      <word_default>RESEND EMAILS</word_default>
+      <word_custom>ПЕРЕОТПР�ВИТЬ</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_usedmembers</word_key>
-      <word_default>Used by Member(s)</word_default>
-      <word_custom>И�пользует�� пользовател�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_usedgroups</word_key>
-      <word_default>Used by Group(s)</word_default>
-      <word_custom>И�пользует�� группами</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>�азвание ма�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_nomember</word_key>
-      <word_default><![CDATA[<em>Not used as override on any accounts...</em>]]></word_default>
-      <word_custom><![CDATA[<em>�е и�пользует��</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_start_c</word_key>
-      <word_default>Start</word_default>
-      <word_custom>Создание темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_upload_c</word_key>
-      <word_default>Upload</word_default>
-      <word_custom>Загрузка файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_download_c</word_key>
-      <word_default>Download</word_default>
-      <word_custom>Скачивание файлов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_reply_c</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответ в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_read_c</word_key>
-      <word_default>Read</word_default>
-      <word_custom>Чтение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_show_c</word_key>
-      <word_default>Show</word_default>
-      <word_custom>Отображение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_forumname</word_key>
-      <word_default>Forum Name</word_default>
-      <word_custom>�азвание форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_editbutton</word_key>
-      <word_default>Edit Name</word_default>
-      <word_custom>Изменить им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_setname</word_key>
-      <word_default><![CDATA[<strong>Permission Set Name</strong>]]></word_default>
-      <word_custom>Ма�ки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_updatebutton</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_rename</word_key>
-      <word_default>Rename Permission Set: </word_default>
-      <word_custom>Переименовать набор прав до�тупа: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_category</word_key>
-      <word_default><![CDATA[Category (doesn't use this permission)]]></word_default>
-      <word_custom>Категори� (не и�пользует �ти права до�тупа)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_testwith</word_key>
-      <word_default>Test with...</word_default>
-      <word_custom>Проверить на</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_cannot</word_key>
-      <word_default>CANNOT: </word_default>
-      <word_custom>�Е МОЖЕТ: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_can</word_key>
-      <word_default>Can: </word_default>
-      <word_custom>Может: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_legend</word_key>
-      <word_default><![CDATA[Legend &amp; Info]]></word_default>
-      <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_removeall</word_key>
-      <word_default>Remove All Custom Permission Sets</word_default>
-      <word_custom>Удалить в�е ма�ки до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_preview</word_key>
-      <word_default>Preview</word_default>
-      <word_custom>Предпро�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_removethisset</word_key>
-      <word_default>Remove This Permission Set</word_default>
-      <word_custom>Удалить �ту ма�ку до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_removethis</word_key>
-      <word_default>Remove this permission set from the user (will not remove all if they use more than one)</word_default>
-      <word_custom>Удалить �ту ма�ку до�тупа дл� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_alsousing</word_key>
-      <word_default>Also Using: </word_default>
-      <word_custom>Также и�пользуют��: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_posts</word_key>
-      <word_default>Posts: </word_default>
-      <word_custom>Сообщений: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_email</word_key>
-      <word_default>Email: </word_default>
-      <word_custom>E-mail: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_action</word_key>
-      <word_default>Action</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_userdetail</word_key>
-      <word_default>User Details</word_default>
-      <word_custom>Данные пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_removecustom</word_key>
-      <word_default>Removed the custom set of permissions from: </word_default>
-      <word_custom>Ма�ка до�тупа удалена дл�: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_membersusing</word_key>
-      <word_default>Members using: </word_default>
-      <word_custom>Пользователи, и�пользующие: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_result</word_key>
-      <word_default>Result</word_default>
-      <word_custom>Результат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_none</word_key>
-      <word_default><![CDATA[<em>Set not assigned to any group...</em>]]></word_default>
-      <word_custom><![CDATA[<em>�е и�пользует��</em>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_title</word_key>
-      <word_default>Forum Permission Set Management</word_default>
-      <word_custom>Управление правами до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_notused</word_key>
-      <word_default>Not Used</word_default>
-      <word_custom>�е и�пользует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_global</word_key>
-      <word_default>Global</word_default>
-      <word_custom>Общие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_addedit</word_key>
-      <word_default>Manage Permissions</word_default>
-      <word_custom>Управоение правами до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_title_edit_msg</word_key>
-      <word_default>Add/Edit Permissions</word_default>
-      <word_custom>Добавить/изменить права до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_title_edit</word_key>
-      <word_default>Editing Forum Permission Sets</word_default>
-      <word_custom>Изменение прав до�тупа форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_added</word_key>
-      <word_default><![CDATA[The permission set '%s' has been added!]]></word_default>
-      <word_custom><![CDATA[�абор прав до�тупа '%s' добавлен!]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_entername</word_key>
-      <word_default>You must enter a name. Please try again.</word_default>
-      <word_custom>�еобходимо вве�ти название.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_removed</word_key>
-      <word_default>Forum Access Permission Set Removed!</word_default>
-      <word_custom>Ма�ка до�тупа удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_updated</word_key>
-      <word_default>Forum Access Permissions Updated!</word_default>
-      <word_custom>Права до�тупа обновлены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_editedlog</word_key>
-      <word_default>Forum Access Permissions Edited For Set: %s</word_default>
-      <word_custom>Права до�тупа изменены дл� набора : %s </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_download_m</word_key>
-      <word_default>Download From Forum</word_default>
-      <word_custom>Скачивание � форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_groupid</word_key>
-      <word_default>Could not resolve that group ID. Please try again.</word_default>
-      <word_custom>ID группы не найден. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_upload_m</word_key>
-      <word_default>Upload To Forum</word_default>
-      <word_custom>Загрузка в форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>err_specify_set_name</word_key>
-      <word_default>You must specify a name for this permission set</word_default>
-      <word_custom>�ужно указать им� дл� группы прав до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_show_m</word_key>
-      <word_default>See Forum</word_default>
-      <word_custom>Про�мотр форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_read_m</word_key>
-      <word_default>Read Topics</word_default>
-      <word_custom>Чтение тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_reply_m</word_key>
-      <word_default>Reply To Topics</word_default>
-      <word_custom>Ответ в тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_start_m</word_key>
-      <word_default>Start Topics</word_default>
-      <word_custom>Создание тем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_read</word_key>
-      <word_default><![CDATA[<b>Read Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Чтение тем</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_download</word_key>
-      <word_default><![CDATA[<b>Download Attachments</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Скачивание файлов</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_upload</word_key>
-      <word_default><![CDATA[<b>Upload Attachments</b> to this forum]]></word_default>
-      <word_custom><![CDATA[<b>Загрузка файлов</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_show</word_key>
-      <word_default><![CDATA[<b>See</b> this forum]]></word_default>
-      <word_custom><![CDATA[<b>Про�мотр</b> форума]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_reply</word_key>
-      <word_default><![CDATA[<b>Reply to Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Ответ на темы</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_also</word_key>
-      <word_default>Also using: </word_default>
-      <word_custom>Также и�пользуют��: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_start</word_key>
-      <word_default><![CDATA[<b>Start Topics</b> in this forum]]></word_default>
-      <word_custom><![CDATA[<b>Создание тем</b> в �том форуме]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_setid</word_key>
-      <word_default>Could not resolve the permission set ID. Please try again.</word_default>
-      <word_custom>�ельз� произве�ти изменени� в ма�ках до�тупа �тому ID. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_permissions</word_pack>
-      <word_key>per_memid</word_key>
-      <word_default>Could not resolve the member ID. Please try again.</word_default>
-      <word_custom>�ельз� изменить ID пользовател�. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_member</word_pack>
+      <word_key>t_emailchangecp</word_key>
+      <word_default>Email Change</word_default>
+      <word_custom>Изменение e-mail</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -9647,19 +6664,531 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>forumpermsfor</word_key>
       <word_default>Forum Access Permissions for</word_default>
       <word_custom>Права до�тупа дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31002</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_permissions</word_pack>
-      <word_key>per_manage</word_key>
-      <word_default>Permission Manager</word_default>
+      <word_key>per_setid</word_key>
+      <word_default>Could not resolve the permission set ID. Please try again.</word_default>
+      <word_custom>�ельз� произве�ти изменени� в ма�ках до�тупа �тому ID. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_start</word_key>
+      <word_default><![CDATA[<b>Start Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Создание тем</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_also</word_key>
+      <word_default>Also using: </word_default>
+      <word_custom>Также и�пользуют��: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_reply</word_key>
+      <word_default><![CDATA[<b>Reply to Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Ответ на темы</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_memid</word_key>
+      <word_default>Could not resolve the member ID. Please try again.</word_default>
+      <word_custom>�ельз� изменить ID пользовател�. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_upload</word_key>
+      <word_default><![CDATA[<b>Upload Attachments</b> to this forum]]></word_default>
+      <word_custom><![CDATA[<b>Загрузка файлов</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_show</word_key>
+      <word_default><![CDATA[<b>See</b> this forum]]></word_default>
+      <word_custom><![CDATA[<b>Про�мотр</b> форума]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_download</word_key>
+      <word_default><![CDATA[<b>Download Attachments</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Скачивание файлов</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_download_m</word_key>
+      <word_default>Download From Forum</word_default>
+      <word_custom>Скачивание � форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_upload_m</word_key>
+      <word_default>Upload To Forum</word_default>
+      <word_custom>Загрузка в форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_show_m</word_key>
+      <word_default>See Forum</word_default>
+      <word_custom>Про�мотр форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_start_m</word_key>
+      <word_default>Start Topics</word_default>
+      <word_custom>Создание тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_reply_m</word_key>
+      <word_default>Reply To Topics</word_default>
+      <word_custom>Ответ в тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_read_m</word_key>
+      <word_default>Read Topics</word_default>
+      <word_custom>Чтение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_read</word_key>
+      <word_default><![CDATA[<b>Read Topics</b> in this forum]]></word_default>
+      <word_custom><![CDATA[<b>Чтение тем</b> в �том форуме]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_groupid</word_key>
+      <word_default>Could not resolve that group ID. Please try again.</word_default>
+      <word_custom>ID группы не найден. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_editedlog</word_key>
+      <word_default>Forum Access Permissions Edited For Set: %s</word_default>
+      <word_custom>Права до�тупа изменены дл� набора : %s </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_updated</word_key>
+      <word_default>Forum Access Permissions Updated!</word_default>
+      <word_custom>Права до�тупа обновлены!</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_removed</word_key>
+      <word_default>Forum Access Permission Set Removed!</word_default>
+      <word_custom>Ма�ка до�тупа удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_entername</word_key>
+      <word_default>You must enter a name. Please try again.</word_default>
+      <word_custom>�еобходимо вве�ти название.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_title_edit</word_key>
+      <word_default>Editing Forum Permission Sets</word_default>
+      <word_custom>Изменение прав до�тупа форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_added</word_key>
+      <word_default><![CDATA[The permission set '%s' has been added!]]></word_default>
+      <word_custom><![CDATA[�абор прав до�тупа '%s' добавлен!]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_title_edit_msg</word_key>
+      <word_default>Add/Edit Permissions</word_default>
+      <word_custom>Добавить/изменить права до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_addedit</word_key>
+      <word_default>Manage Permissions</word_default>
+      <word_custom>Управоение правами до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_title</word_key>
+      <word_default>Forum Permission Set Management</word_default>
       <word_custom>Управление правами до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_none</word_key>
+      <word_default><![CDATA[<em>Set not assigned to any group...</em>]]></word_default>
+      <word_custom><![CDATA[<em>�е и�пользует��</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_global</word_key>
+      <word_default>Global</word_default>
+      <word_custom>Общие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_notused</word_key>
+      <word_default>Not Used</word_default>
+      <word_custom>�е и�пользует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_action</word_key>
+      <word_default>Action</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_userdetail</word_key>
+      <word_default>User Details</word_default>
+      <word_custom>Данные пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_membersusing</word_key>
+      <word_default>Members using: </word_default>
+      <word_custom>Пользователи, и�пользующие: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_removecustom</word_key>
+      <word_default>Removed the custom set of permissions from: </word_default>
+      <word_custom>Ма�ка до�тупа удалена дл�: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_posts</word_key>
+      <word_default>Posts: </word_default>
+      <word_custom>Сообщений: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_result</word_key>
+      <word_default>Result</word_default>
+      <word_custom>Результат</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_email</word_key>
+      <word_default>Email: </word_default>
+      <word_custom>E-mail: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_alsousing</word_key>
+      <word_default>Also Using: </word_default>
+      <word_custom>Также и�пользуют��: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_removethis</word_key>
+      <word_default>Remove this permission set from the user (will not remove all if they use more than one)</word_default>
+      <word_custom>Удалить �ту ма�ку до�тупа дл� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_removeall</word_key>
+      <word_default>Remove All Custom Permission Sets</word_default>
+      <word_custom>Удалить в�е ма�ки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_removethisset</word_key>
+      <word_default>Remove This Permission Set</word_default>
+      <word_custom>Удалить �ту ма�ку до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_legend</word_key>
+      <word_default><![CDATA[Legend &amp; Info]]></word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предпро�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_can</word_key>
+      <word_default>Can: </word_default>
+      <word_custom>Может: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_cannot</word_key>
+      <word_default>CANNOT: </word_default>
+      <word_custom>�Е МОЖЕТ: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_testwith</word_key>
+      <word_default>Test with...</word_default>
+      <word_custom>Проверить на</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_updatebutton</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_category</word_key>
+      <word_default><![CDATA[Category (doesn't use this permission)]]></word_default>
+      <word_custom>Категори� (не и�пользует �ти права до�тупа)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_editbutton</word_key>
+      <word_default>Edit Name</word_default>
+      <word_custom>Изменить им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_forumname</word_key>
+      <word_default>Forum Name</word_default>
+      <word_custom>�азвание форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_show_c</word_key>
+      <word_default>Show</word_default>
+      <word_custom>Отображение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_rename</word_key>
+      <word_default>Rename Permission Set: </word_default>
+      <word_custom>Переименовать набор прав до�тупа: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_setname</word_key>
+      <word_default>Permission Set Name</word_default>
+      <word_custom>Ма�ки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_read_c</word_key>
+      <word_default>Read</word_default>
+      <word_custom>Чтение тем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_download_c</word_key>
+      <word_default>Download</word_default>
+      <word_custom>Скачивание файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_upload_c</word_key>
+      <word_default>Upload</word_default>
+      <word_custom>Загрузка файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_start_c</word_key>
+      <word_default>Start</word_default>
+      <word_custom>Создание темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_reply_c</word_key>
+      <word_default>Reply</word_default>
+      <word_custom>Ответ в тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_nomember</word_key>
+      <word_default><![CDATA[<em>Not used as override on any accounts...</em>]]></word_default>
+      <word_custom><![CDATA[<em>�е и�пользует��</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_inuse</word_key>
+      <word_default>In Use (Cannot Delete)</word_default>
+      <word_custom><![CDATA[<em>И�пользует�� (�е может быть удалена)</em>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_viewnames</word_key>
+      <word_default>View the member names of those using this permission set in a new window</word_default>
+      <word_custom>Про�мотр пользователей � �той группой ограничений в новом окне</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_user</word_key>
+      <word_default>User</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_usedmembers</word_key>
+      <word_default>Used by Member(s)</word_default>
+      <word_custom>И�пользует�� пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_usedgroups</word_key>
+      <word_default>Used by Group(s)</word_default>
+      <word_custom>И�пользует�� группами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>�азвание ма�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_deleteset</word_key>
+      <word_default>Delete Permission Set...</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>�а�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_editset</word_key>
+      <word_default>Edit permission set</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_previewset</word_key>
+      <word_default>Preview Permission Set...</word_default>
+      <word_custom>Предпро�мотр прав до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_previewtext</word_key>
+      <word_default>See what this group can see...</word_default>
+      <word_custom>По�мотреть что вид�т пользователи �той группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_createnew</word_key>
+      <word_default>Create a new permission set</word_default>
+      <word_custom>Создание новой ма�ки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_createbutton</word_key>
+      <word_default>Create</word_default>
+      <word_custom>Создать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>frm_enterthematrix</word_key>
+      <word_default>Permission Matrix</word_default>
+      <word_custom>Ма�ки до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_baseon</word_key>
+      <word_default>Base this permission set on ...</word_default>
+      <word_custom><![CDATA[<strong>�а�ледовать права из ма�ки:</strong> ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>err_specify_set_name</word_key>
+      <word_default>You must specify a name for this permission set</word_default>
+      <word_custom>�ужно указать им� дл� группы прав до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>frm_savechanges</word_key>
+      <word_default>Save Changes</word_default>
+      <word_custom>Сохранить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -9667,579 +7196,13 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>per_saved</word_key>
       <word_default>Changes Saved</word_default>
       <word_custom>Ма�ка до�тупа �охранена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_nocomponents</word_key>
-      <word_default>There are either no components enabled, or none of the components enabled have permission settings.</word_default>
-      <word_custom>�ет включенных компонентов, либо включенные компоненты не имеют на�троек прав до�тупа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_allowaccess</word_key>
-      <word_default><![CDATA[<strong>ALLOW ACCESS TO THIS FUNCTION</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Р�ЗРЕШИТЬ ДОСТУП К ЭТОЙ ФУ�КЦИИ</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_undo</word_key>
-      <word_default>UNDO</word_default>
-      <word_custom>ОТМЕ�ИТЬ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_allowaccess_info</word_key>
-      <word_default><![CDATA[When &quot;ALLOW ACCESS TO THIS FUNCTION&quot; is enabled you may set the individual access permissions for the sub-features of this particular function. Otherwise, changes to the individual access permission will have no effect.]]></word_default>
-      <word_custom>Е�ли «Р�ЗРЕШИТЬ ДОСТУП К ЭТОЙ ФУ�КЦИИ» включен, то вы можете указать индивидуальные разрешени� дл� ее под-функций. Иначе изменени� индивидуальных разрешений не да�т желаемого �ффекта.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_acpxmltabnoaccess</word_key>
-      <word_default><![CDATA[ACP permission restritctions for <strong>%s</strong><br /><br />Access to this tab has not yet been enabled. To enable individual access permissions for this tab simply click the green cross icon next to the tab title.<br /><br />You can then set individual permissions for each function which is grouped under this tab.]]></word_default>
-      <word_custom><![CDATA[Ограничение правд до�тупа к �дминцентру дл� <strong>%s</strong><br /><br />До�туп к �той вкладке ещё не был включен. Дл� включени� индивидуальных ограничений нажмите зеленый кре�тик около названи� вкладке.<br /><br />Вы можете изменить к каждой функции отображенной на �той вкладке.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_managerestrictg</word_key>
-      <word_default><![CDATA[Manage group's restrictions...]]></word_default>
-      <word_custom>Управление ограничени�ми группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_globalaccess</word_key>
-      <word_default>Global Access</word_default>
-      <word_custom>Объщий до�туп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_grantto</word_key>
-      <word_default>Grant access to</word_default>
-      <word_custom>Разрешить до�туп к </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_savebutton</word_key>
-      <word_default>Save Restrictions</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_acpxmlwelcome</word_key>
-      <word_default><![CDATA[ACP permission restrictions for <strong>%s</strong><br /><br />Simply click on one of the tabs above to set the access level for all functions in this tab. If you want to choose access on a per-function level, click on the relevant link to be shown this function's options.]]></word_default>
-      <word_custom><![CDATA[Ограничени� до�тупа в �дминцентр дл� <strong>%s</strong><br /><br />�ажмите на закладку выше, чтобы у�тановить уровень до�тупа до в�ех функций в �той закладке. Е�ли вы хотите выбрать уровень до�тупа к каждой функции, нажмите на ��ылку, показывающей�� в опци�х �тих функций.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_removeallg</word_key>
-      <word_default><![CDATA[Remove all group's restrictions]]></word_default>
-      <word_custom>Удалить в�е ограничени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_removeall</word_key>
-      <word_default><![CDATA[Remove all member's restrictions...]]></word_default>
-      <word_custom>Удалить в�е ограничени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_managerestrict</word_key>
-      <word_default><![CDATA[Manage member's restrictions...]]></word_default>
-      <word_custom>Управление ограничени�ми до�тупа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_findgroup</word_key>
-      <word_default>Select a group...</word_default>
-      <word_custom>Выбрать группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_xmlbutton</word_key>
-      <word_default>Import XML Settings</word_default>
-      <word_custom>Импортировать на�тройки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_filexml_info</word_key>
-      <word_default><![CDATA[The file must be uploaded into the forum's root folder]]></word_default>
-      <word_custom>Этот файл должен быть загружен в корневую директорию вашего форума.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_filexml</word_key>
-      <word_default><![CDATA[<strong><u>OR</u> enter the filename of the XML permissions file</strong>]]></word_default>
-      <word_custom><![CDATA[<strong><u>ИЛИ</u> введите название файла</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_uploadxml_info</word_key>
-      <word_default><![CDATA[Duplicate entries will not be overwritten. The file must begin with 'ipb_' and end with either '.xml' or '.xml.gz']]></word_default>
-      <word_custom><![CDATA[Двойные запи�и не будут импортированы. Файл должен начинать�� � 'ipb_' и иметь ра�ширение '.xml' или '.xml.gz'.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_importxml</word_key>
-      <word_default>Import an XML Permissions file</word_default>
-      <word_custom>Импортирование файл XML � ограничени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_uploadxml</word_key>
-      <word_default><![CDATA[<strong>Upload XML permissions file from your computer</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Загрузка файла � компьютера</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_group</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_totalmem</word_key>
-      <word_default>Total Members</word_default>
-      <word_custom>Количе�тво пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_updated</word_key>
-      <word_default>Updated</word_default>
-      <word_custom>Обновлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_grouprestrict</word_key>
-      <word_default>Group ACP Restriction Permissions</word_default>
-      <word_custom>Ограничение до�тупа групп</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_primary</word_key>
-      <word_default>Primary Group</word_default>
-      <word_custom>О�новна� группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_secondary</word_key>
-      <word_default>Secondary Group(s)</word_default>
-      <word_custom>Второ�тепенные группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_memberrestrict</word_key>
-      <word_default>Member ACP Restriction Permissions</word_default>
-      <word_custom>Ограничени� до�тупа пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_member</word_key>
-      <word_default>Member</word_default>
-      <word_custom>Пользователь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_proceed</word_key>
-      <word_default><![CDATA[Proceed &gt;&gt;]]></word_default>
-      <word_custom><![CDATA[Далее &gt;&gt;  ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_selectgroup</word_key>
-      <word_default>ACP Permissions: Select a group</word_default>
-      <word_custom>Ограничение до�тупа в �дминцентр: Выбор группы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_whatgroup</word_key>
-      <word_default><![CDATA[<strong>Select the group to add restrictions to</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Выберите группу</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_displayname_info</word_key>
-      <word_default>An administrator is someone that has access to the ACP via their primary or secondary groups.</word_default>
-      <word_custom>Это должен быть пользователь, который имеет о�новную или вторичную группу � до�тупом в �дминцентр.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_displayname</word_key>
-      <word_default><![CDATA[<strong>Enter an administrator's display name</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Введите отображаемое им� админи�тратора</strong>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>module_bit</word_key>
-      <word_default>module</word_default>
-      <word_custom>модуль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_findadmin</word_key>
-      <word_default>Find and add administrator...</word_default>
-      <word_custom>Пои�к и добавление админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>application_bit</word_key>
-      <word_default>application</word_default>
-      <word_custom>приложение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_groupnoacp</word_key>
-      <word_default><![CDATA[Group '%s' does not have access to the ACP, so restrictions cannot be added.]]></word_default>
-      <word_custom><![CDATA[Группу '%s' нельз� добавить, по�кольку она не имеет до�туп в �дминцентр. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_addedgroup</word_key>
-      <word_default><![CDATA[Group '%s' successfully added and now has no ACP access until you allow it managing their restrictions.]]></word_default>
-      <word_custom><![CDATA[	Группа ' %s' у�пешно добавлена и в на�то�щее врем� не имеет до�тупа к админцентру, пока вы не разрешите ей управление �воими ограничени�ми.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_notypeid</word_key>
-      <word_default>We could not find the restrictions you were editing for this %s</word_default>
-      <word_custom>�е найдено ограничений дл� %s%</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30012</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_groupalready</word_key>
-      <word_default><![CDATA[Group '%s' already has restrictions in place. You can edit the restrictions to alter them.]]></word_default>
-      <word_custom><![CDATA[Группа '%s'  уже имеет ограничени� до�тупа в �дминцентр.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_nofindgroup</word_key>
-      <word_default>We could not find the group you were attempting to add restrictions to. Please try again.</word_default>
-      <word_custom>�е получило�ь найти группу, которой вы пытали�ь добавить ограничений. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_nogroup</word_key>
-      <word_default>You must select a group to add restrictions to.</word_default>
-      <word_custom>Вы должны выбрать группу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_noacpaccessuntil</word_key>
-      <word_default>no ACP access until you allow it below</word_default>
-      <word_custom>без права до�тупа к �дминцентру</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_addedmember</word_key>
-      <word_default>%s successfully added with %s. Note that if the user belongs to a group that also has ACP restrictions, this user will NOT inherit those restrictions - the member record overrides any group records configured.</word_default>
-      <word_custom>%s у�пешно добавлен %s. Заметьте, что е�ли пользователь принадлежит к группе � ограничени�ми до�тупа к �дминцентру, то �ти ограничение не на�ледуют��.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_restrictbase</word_key>
-      <word_default>restrictions based on the group(s) they are part of</word_default>
-      <word_custom>� ограничени�ми на о�нове групп, членами которых он �вл�ет��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_noaccess</word_key>
-      <word_default>%s does not have access to the ACP, so restrictions cannot be added.</word_default>
-      <word_custom><![CDATA[Пользовател� '%s' нельз� добавить, по�кольку он не имеет до�туп в �дминцентр. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_ownaccount</word_key>
-      <word_default>You can not add restrictions to your own account</word_default>
-      <word_custom>Вы не можете ограничить �амого �еб�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_namealready</word_key>
-      <word_default>%s already has restrictions in place. You can edit the restrictions to alter them.</word_default>
-      <word_custom><![CDATA[Пользователь '%s'  уже имеет ограничени� до�тупа в админцентр.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_noname</word_key>
-      <word_default>%s cannot be found. Please try again.</word_default>
-      <word_custom><![CDATA[Пользователь '%s' не найден. ]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_entername</word_key>
-      <word_default>You must enter a name before submitting the form. Please try again.</word_default>
-      <word_custom>Вы не указали им� пользовател�. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_title</word_key>
-      <word_default>Admin Restrictions</word_default>
-      <word_custom>Ограничени� до�тупа в админцентр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_lifted</word_key>
-      <word_default>The restrictions have been lifted!</word_default>
-      <word_custom>Ограничени� до�тупа в �дминцентр удалены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_nav</word_key>
-      <word_default>Add an administrator</word_default>
-      <word_custom>Добавить админи�тратора</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_roleupdated</word_key>
-      <word_default><![CDATA[The %s's restrictions have been updated!]]></word_default>
-      <word_custom>%s ограничени� изменены!</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>admin_restrictions</word_pack>
-      <word_key>r_whichrole</word_key>
-      <word_default>We could not find the %s whose permissions you were attempting to edit. Please try again.</word_default>
-      <word_custom>�евозможно найти %s дл� изменени� прав до�тупа.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>admin_permissions</word_pack>
+      <word_key>per_manage</word_key>
+      <word_default>Permission Manager</word_default>
+      <word_custom>Управление правами до�тупа</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -10247,39 +7210,398 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>r_whichmodify</word_key>
       <word_default>We could not determine the restrictions you were attempting to modify. Please try again.</word_default>
       <word_custom>�е получило�ь определить ограничени�, которые вы пытаете�ь изменить. Попробуйте еще раз.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_restrictions</word_pack>
-      <word_key>r_allowtitle</word_key>
-      <word_default>Allow access to ALL functions of this feature</word_default>
-      <word_custom>Разрешить до�туп ко в�ем функци�м �того раздела</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>r_roleupdated</word_key>
+      <word_default><![CDATA[The %s's restrictions have been updated!]]></word_default>
+      <word_custom>%s ограничени� изменены!</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_restrictions</word_pack>
-      <word_key>r_denytitle</word_key>
-      <word_default>Deny access to ALL functions of this feature</word_default>
-      <word_custom>Запретить до�туп ко в�ем функци�м �того раздела</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>r_nav</word_key>
+      <word_default>Add an administrator</word_default>
+      <word_custom>Добавить админи�тратора</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>admin_restrictions</word_pack>
-      <word_key>r_allow</word_key>
-      <word_default>Allow</word_default>
-      <word_custom>Разрешить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>r_whichrole</word_key>
+      <word_default>We could not find the %s whose permissions you were attempting to edit. Please try again.</word_default>
+      <word_custom>�евозможно найти %s дл� изменени� прав до�тупа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_lifted</word_key>
+      <word_default>The restrictions have been lifted!</word_default>
+      <word_custom>Ограничени� до�тупа в �дминцентр удалены!</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_title</word_key>
+      <word_default>Admin Restrictions</word_default>
+      <word_custom>Ограничени� до�тупа в админцентр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_addedmember</word_key>
+      <word_default>%s successfully added with %s. Note that if the user belongs to a group that also has ACP restrictions, this user will NOT inherit those restrictions - the member record overrides any group records configured.</word_default>
+      <word_custom>%s у�пешно добавлен %s. Заметьте, что е�ли пользователь принадлежит к группе � ограничени�ми до�тупа к �дминцентру, то �ти ограничение не на�ледуют��.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_noacpaccessuntil</word_key>
+      <word_default>no ACP access until you allow it below</word_default>
+      <word_custom>без права до�тупа к �дминцентру</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_ownaccount</word_key>
+      <word_default>You can not add restrictions to your own account</word_default>
+      <word_custom>Вы не можете ограничить �амого �еб�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_noaccess</word_key>
+      <word_default>%s does not have access to the ACP, so restrictions cannot be added.</word_default>
+      <word_custom><![CDATA[Пользовател� '%s' нельз� добавить, по�кольку он не имеет до�туп в �дминцентр. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_restrictbase</word_key>
+      <word_default>restrictions based on the group(s) they are part of</word_default>
+      <word_custom>� ограничени�ми на о�нове групп, членами которых он �вл�ет��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_namealready</word_key>
+      <word_default>%s already has restrictions in place. You can edit the restrictions to alter them.</word_default>
+      <word_custom><![CDATA[Пользователь '%s'  уже имеет ограничени� до�тупа в админцентр.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_noname</word_key>
+      <word_default>%s cannot be found. Please try again.</word_default>
+      <word_custom><![CDATA[Пользователь '%s' не найден. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_entername</word_key>
+      <word_default>You must enter a name before submitting the form. Please try again.</word_default>
+      <word_custom>Вы не указали им� пользовател�. </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_nofindgroup</word_key>
+      <word_default>We could not find the group you were attempting to add restrictions to. Please try again.</word_default>
+      <word_custom>�е получило�ь найти группу, которой вы пытали�ь добавить ограничений. Попробуйте еще раз.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_groupalready</word_key>
+      <word_default><![CDATA[Group '%s' already has restrictions in place. You can edit the restrictions to alter them.]]></word_default>
+      <word_custom><![CDATA[Группа '%s'  уже имеет ограничени� до�тупа в �дминцентр.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_notypeid</word_key>
+      <word_default>We could not find the restrictions you were editing for this %s</word_default>
+      <word_custom>�е найдено ограничений дл� %s%</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_nogroup</word_key>
+      <word_default>You must select a group to add restrictions to.</word_default>
+      <word_custom>Вы должны выбрать группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_groupnoacp</word_key>
+      <word_default><![CDATA[Group '%s' does not have access to the ACP, so restrictions cannot be added.]]></word_default>
+      <word_custom><![CDATA[Группу '%s' нельз� добавить, по�кольку она не имеет до�туп в �дминцентр. ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_addedgroup</word_key>
+      <word_default><![CDATA[Group '%s' successfully added and now has no ACP access until you allow it managing their restrictions.]]></word_default>
+      <word_custom><![CDATA[	Группа ' %s' у�пешно добавлена и в на�то�щее врем� не имеет до�тупа к админцентру, пока вы не разрешите ей управление �воими ограничени�ми.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>module_bit</word_key>
+      <word_default>module</word_default>
+      <word_custom>модулю </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>application_bit</word_key>
+      <word_default>application</word_default>
+      <word_custom>приложению</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_displayname</word_key>
+      <word_default><![CDATA[<strong>Enter an administrator's display name</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Введите отображаемое им� админи�тратора</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_findadmin</word_key>
+      <word_default>Find and add administrator...</word_default>
+      <word_custom>Пои�к и добавление админи�тратора</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_displayname_info</word_key>
+      <word_default>An administrator is someone that has access to the ACP via their primary or secondary groups.</word_default>
+      <word_custom>Это должен быть пользователь, который имеет о�новную или вторичную группу � до�тупом в �дминцентр.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_memberrestrict</word_key>
+      <word_default>Member ACP Restriction Permissions</word_default>
+      <word_custom>Ограничени� до�тупа пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_options</word_key>
+      <word_default>Options</word_default>
+      <word_custom>Опции</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_whatgroup</word_key>
+      <word_default><![CDATA[<strong>Select the group to add restrictions to</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Выберите группу</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_proceed</word_key>
+      <word_default><![CDATA[Proceed &gt;&gt;]]></word_default>
+      <word_custom><![CDATA[Далее &gt;&gt;  ]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_selectgroup</word_key>
+      <word_default>ACP Permissions: Select a group</word_default>
+      <word_custom>Ограничение до�тупа в �дминцентр: Выбор группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_member</word_key>
+      <word_default>Member</word_default>
+      <word_custom>Пользователь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_primary</word_key>
+      <word_default>Primary Group</word_default>
+      <word_custom>О�новна� группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_secondary</word_key>
+      <word_default>Secondary Group(s)</word_default>
+      <word_custom>Второ�тепенные группы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_updated</word_key>
+      <word_default>Updated</word_default>
+      <word_custom>Обновлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_grouprestrict</word_key>
+      <word_default>Group ACP Restriction Permissions</word_default>
+      <word_custom>Ограничение до�тупа групп</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_totalmem</word_key>
+      <word_default>Total Members</word_default>
+      <word_custom>Количе�тво пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_importxml</word_key>
+      <word_default>Import an XML Permissions file</word_default>
+      <word_custom>Импортирование файл XML � ограничени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_filexml</word_key>
+      <word_default><![CDATA[<strong><u>OR</u> enter the filename of the XML permissions file</strong>]]></word_default>
+      <word_custom><![CDATA[<strong><u>ИЛИ</u> введите название файла</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_uploadxml_info</word_key>
+      <word_default><![CDATA[Duplicate entries will not be overwritten. The file must begin with 'ipb_' and end with either '.xml' or '.xml.gz']]></word_default>
+      <word_custom><![CDATA[Двойные запи�и не будут импортированы. Файл должен начинать�� � 'ipb_' и иметь ра�ширение '.xml' или '.xml.gz'.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_uploadxml</word_key>
+      <word_default><![CDATA[<strong>Upload XML permissions file from your computer</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Загрузка файла � компьютера</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_removeall</word_key>
+      <word_default><![CDATA[Remove all member's restrictions...]]></word_default>
+      <word_custom>Удалить в�е ограничени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_findgroup</word_key>
+      <word_default>Select a group...</word_default>
+      <word_custom>Выбрать группу</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_xmlbutton</word_key>
+      <word_default>Import XML Settings</word_default>
+      <word_custom>Импортировать на�тройки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_filexml_info</word_key>
+      <word_default><![CDATA[The file must be uploaded into the forum's root folder]]></word_default>
+      <word_custom>Этот файл должен быть загружен в корневую директорию вашего форума.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_managerestrict</word_key>
+      <word_default><![CDATA[Manage member's restrictions...]]></word_default>
+      <word_custom>Управление ограничени�ми до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_nocomponents</word_key>
+      <word_default>There are either no components enabled, or none of the components enabled have permission settings.</word_default>
+      <word_custom>�ет включенных компонентов, либо включенные компоненты не имеют на�троек прав до�тупа.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_allowaccess_info</word_key>
+      <word_default><![CDATA[When &quot;ALLOW ACCESS TO THIS FUNCTION&quot; is enabled you may set the individual access permissions for the sub-features of this particular function. Otherwise, changes to the individual access permission will have no effect.]]></word_default>
+      <word_custom>Е�ли «Р�ЗРЕШИТЬ ДОСТУП К ЭТОЙ ФУ�КЦИИ» включен, то вы можете указать индивидуальные разрешени� дл� ее под-функций. Иначе изменени� индивидуальных разрешений не да�т желаемого �ффекта.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_undo</word_key>
+      <word_default>UNDO</word_default>
+      <word_custom>ОТМЕ�ИТЬ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_allowaccess</word_key>
+      <word_default><![CDATA[<strong>ALLOW ACCESS TO THIS FUNCTION</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Р�ЗРЕШИТЬ ДОСТУП К ЭТОЙ ФУ�КЦИИ</strong>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_savebutton</word_key>
+      <word_default>Save Restrictions</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_acpxmlwelcome</word_key>
+      <word_default><![CDATA[ACP permission restrictions for <strong>%s</strong><br /><br />Simply click on one of the tabs above to set the access level for all functions in this tab. If you want to choose access on a per-function level, click on the relevant link to be shown this function's options.]]></word_default>
+      <word_custom><![CDATA[Ограничени� до�тупа в �дминцентр дл� <strong>%s</strong><br /><br />�ажмите на закладку выше, чтобы у�тановить уровень до�тупа до в�ех функций в �той закладке. Е�ли вы хотите выбрать уровень до�тупа к каждой функции, нажмите на ��ылку, показывающей�� в опци�х �тих функций.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_acpxmltabnoaccess</word_key>
+      <word_default><![CDATA[ACP permission restritctions for <strong>%s</strong><br /><br />Access to this tab has not yet been enabled. To enable individual access permissions for this tab simply click the green cross icon next to the tab title.<br /><br />You can then set individual permissions for each function which is grouped under this tab.]]></word_default>
+      <word_custom><![CDATA[Ограничение правд до�тупа к �дминцентру дл� <strong>%s</strong><br /><br />До�туп к �той вкладке ещё не был включен. Дл� включени� индивидуальных ограничений нажмите зеленый кре�тик около названи� вкладке.<br /><br />Вы можете изменить к каждой функции отображенной на �той вкладке.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_grantto</word_key>
+      <word_default>Grant access to</word_default>
+      <word_custom>Разрешить до�туп к </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_globalaccess</word_key>
+      <word_default>Global Access</word_default>
+      <word_custom>Объщий до�туп</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_managerestrictg</word_key>
+      <word_default><![CDATA[Manage group's restrictions...]]></word_default>
+      <word_custom>Управление ограничени�ми группы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -10287,9 +7609,1889 @@ Board Address: <#BOARD_ADDRESS#>]]></word_default>
       <word_key>r_deny</word_key>
       <word_default>Deny</word_default>
       <word_custom>Запретить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_removeallg</word_key>
+      <word_default><![CDATA[Remove all group's restrictions]]></word_default>
+      <word_custom>Удалить в�е ограничени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_allow</word_key>
+      <word_default>Allow</word_default>
+      <word_custom>Разрешить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_denytitle</word_key>
+      <word_default>Deny access to ALL functions of this feature</word_default>
+      <word_custom>Запретить до�туп ко в�ем функци�м �того раздела</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r_allowtitle</word_key>
+      <word_default>Allow access to ALL functions of this feature</word_default>
+      <word_custom>Разрешить до�туп ко в�ем функци�м �того раздела</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_manage_modules</word_key>
+      <word_default>Manage Modules</word_default>
+      <word_custom>Управление модул�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_manage_apps</word_key>
+      <word_default>Manage Applications</word_default>
+      <word_custom>Управление приложени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__module_manage</word_key>
+      <word_default>Can edit/add application modules?</word_default>
+      <word_custom>Может добавл�ть/измен�ть модули приложений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__build_sphinx</word_key>
+      <word_default>Can build sphinx.conf? WARNING: Exposes database login details</word_default>
+      <word_custom>Может �оздавать sphinx.conf? Внимание: Будут видны данные дл� до�тупа к �ерверу базы данных!</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__app_delete</word_key>
+      <word_default>Can delete applications?</word_default>
+      <word_custom>Может удал�ть приложени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__app_install</word_key>
+      <word_default>Can install new applications?</word_default>
+      <word_custom>Может у�танавливать новые приложени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__app_manage</word_key>
+      <word_default>Can manage applications?</word_default>
+      <word_custom>Может управл�ть приложени�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_manage_hooks</word_key>
+      <word_default>Manage Hooks</word_default>
+      <word_custom>Управление хуками</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_purchase_app</word_key>
+      <word_default>Purchase Applications</word_default>
+      <word_custom>Покупка приложений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__module_delete</word_key>
+      <word_default>Can delete application modules?</word_default>
+      <word_custom>Может удал�ть модули приложений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__purchase_app</word_key>
+      <word_default>Can view pages to purchase additional applications?</word_default>
+      <word_custom>Имеет до�туп к �траницам покупки дополнительных приложений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__hooks_delete</word_key>
+      <word_default>Can remove hooks?</word_default>
+      <word_custom>Может удал�ть хуки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_diag_tools</word_key>
+      <word_default>Diagnostic Tools</word_default>
+      <word_custom>Диагно�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__hooks_manage</word_key>
+      <word_default>Can manage hooks?</word_default>
+      <word_custom>Может управл�ть хуками?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__index_checker</word_key>
+      <word_default>Can use the database index checker?  Warning: Allows ability to run database queries indirectly.</word_default>
+      <word_custom>Может о�уще�твл�ть проверку индек�ов таблиц базы? Внимание: ин�трумент позвол�ет ко�венно выполн�ть запро�ы.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__version_checker</word_key>
+      <word_default>Can use the version checker?</word_default>
+      <word_custom>Может провер�ть вер�ии файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__connection_checker</word_key>
+      <word_default>Can use the connection checker?</word_default>
+      <word_custom>Может и�пользовать ин�трумент проверки �оединени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__permission_checker</word_key>
+      <word_default>Can use the permissions checker?</word_default>
+      <word_custom>Может провер�ть ма�ки до�тупа?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__database_checker</word_key>
+      <word_default>Can use the database checker?  Warning: Allows ability to run database queries indirectly.</word_default>
+      <word_custom>Может запу�кать проверку �труктуры базы? Внимание: е�ть возможно�ть ко�венного запу�ка запро�ов к базе</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__whitespace_checker</word_key>
+      <word_default>Can use the whitespace checker?</word_default>
+      <word_custom>Может провер�ть файлы на лишние пробелы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__lang_words</word_key>
+      <word_default>Can add/edit the language bit texts?</word_default>
+      <word_custom>Может измен�ть/добавл�ть �лова в �зыке?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_languages</word_key>
+      <word_default>Manage Languages</word_default>
+      <word_custom>Управление �зыками</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__lang_pack_info</word_key>
+      <word_default>Can alter the language pack properties and information?</word_default>
+      <word_custom>Может измен�ть информацию у �зыка?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__lang_packs</word_key>
+      <word_default>Can add/edit language packs?</word_default>
+      <word_custom>Может добавл�ть/измен�ть �зыки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__adminlogs_view</word_key>
+      <word_default>Can view admin logs?</word_default>
+      <word_custom>Может про�матривать запи�и журнала дей�твий админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__adminlogs_delete</word_key>
+      <word_default>Can delete admin logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала дей�твий админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_adminlogs</word_key>
+      <word_default>Admin Logs</word_default>
+      <word_custom>Журнал админи�тратор�ких дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__modlogs_view</word_key>
+      <word_default>Can view moderator logs?</word_default>
+      <word_custom>Может про�матривать журнал модерировани�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_modlogs</word_key>
+      <word_default>Moderator Logs</word_default>
+      <word_custom>Журналы дей�твий модераторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__modlogs_delete</word_key>
+      <word_default>Can delete moderator logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала модерировани�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_emaillogs</word_key>
+      <word_default>Email Logs</word_default>
+      <word_custom>Журнал email отправлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emaillogs_view</word_key>
+      <word_default>Can view email logs?</word_default>
+      <word_custom>Может про�матривать журнал?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emailerrorlogs_view</word_key>
+      <word_default>Can view email error logs?</word_default>
+      <word_custom>Может про�матривать журнал ошибок?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_eelogs</word_key>
+      <word_default>Email Error Logs</word_default>
+      <word_custom>Журнал ошибок email</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emaillogs_delete</word_key>
+      <word_default>Can delete email logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emailerrorlogs_delete</word_key>
+      <word_default>Can delete email error logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала ошибок email?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_spiderlogs</word_key>
+      <word_default>Spider Logs</word_default>
+      <word_custom>Журнал индек�ации пои�ковыми �и�темами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__spiderlogs_delete</word_key>
+      <word_default>Can delete spider logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала индек�ации пои�ковыми роботами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__spiderlogs_view</word_key>
+      <word_default>Can view spider logs?</word_default>
+      <word_custom>Может про�матривать журнал индек�ации пои�ковыми роботами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_warnlogs</word_key>
+      <word_default>Warn Logs</word_default>
+      <word_custom>Журнал предупреждений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__warnlogs_view</word_key>
+      <word_default>Can view warn logs?</word_default>
+      <word_custom>Может про�матривать журнал?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__errorlogs_delete</word_key>
+      <word_default>Can delete error logs?</word_default>
+      <word_custom>Может удал�ть запи�и?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_selogs</word_key>
+      <word_default>SQL Error Logs</word_default>
+      <word_custom>Журнал SQL ошибок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__warnlogs_delete</word_key>
+      <word_default>Can delete warn logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_errorlogs</word_key>
+      <word_default>Error Logs</word_default>
+      <word_custom>Журнал ошибок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__errorlogs_view</word_key>
+      <word_default>Can view error logs?</word_default>
+      <word_custom>Может про�матривать запи�и?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__sqlerrorlogs_view</word_key>
+      <word_default>Can view SQL error logs?</word_default>
+      <word_custom>Может про�матривать журнал ошибок SQL?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__sqlerrorlogs_delete</word_key>
+      <word_default>Can delete SQL error logs?</word_default>
+      <word_custom>Может удал�ть запи�и журнала ошибок SQL?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_mycp</word_key>
+      <word_default>My Control Panel</word_default>
+      <word_custom>Мо� панель управлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__dashboard</word_key>
+      <word_default>Can access the dashboard?</word_default>
+      <word_custom>Имеет до�туп к главной �траницы панели управлени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_settings</word_key>
+      <word_default>Manage Settings</word_default>
+      <word_custom>Управление на�тройками</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__settings_manage</word_key>
+      <word_default>Can edit/add settings and setting groups?</word_default>
+      <word_custom>Может добавл�ть новые на�тройки и группы на�троек?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_badwords</word_key>
+      <word_default>Manage Badwords</word_default>
+      <word_custom>Управление BB-кодами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__badword_manage</word_key>
+      <word_default>Can manage badwords?</word_default>
+      <word_custom>Может управл�ть фильтрами плохих �лов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__settings_delete</word_key>
+      <word_default>Can delete settings and setting groups?</word_default>
+      <word_custom>Может удал�ть на�тройки и группы на�троек?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__licensekey_manage</word_key>
+      <word_default>Can manage license key?</word_default>
+      <word_custom>Может управл�ть ключем лицензии?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__performance_toggle</word_key>
+      <word_default>Can toggle performance mode?</word_default>
+      <word_custom>Может включать режим бы�тродей�тви�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_emoticons</word_key>
+      <word_default>Emoticons</word_default>
+      <word_custom>Смайлики</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__badword_delete</word_key>
+      <word_default>Can delete badwords?</word_default>
+      <word_custom>Может удал�ть фильтры плохих �лов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emoticons_add</word_key>
+      <word_default>Can add new emoticons?</word_default>
+      <word_custom>Может добавл�ть новые �майлики?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emoticons_manage</word_key>
+      <word_default>Can access emoticon manager?</word_default>
+      <word_custom>Может управл�ть �майликами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_bbcode</word_key>
+      <word_default>BBCode</word_default>
+      <word_custom>BB-коды</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emoticons_edit</word_key>
+      <word_default>Can edit emoticons?</word_default>
+      <word_custom>Может измен�ть �майлики?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bbcode_delete</word_key>
+      <word_default>Can delete bbcode?</word_default>
+      <word_custom>Может удал�ть bb-коды?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bbcode_manage</word_key>
+      <word_default>Can manage bbcode?</word_default>
+      <word_custom>Может управл�ть bb-кодами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__emoticons_delete</word_key>
+      <word_default>Can remove emoticons?</word_default>
+      <word_custom>Может удал�ть �майлики?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_media</word_key>
+      <word_default>Manage Media</word_default>
+      <word_custom>Управление медиа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__media_manage</word_key>
+      <word_default>Can manage media bbcode supported sites?</word_default>
+      <word_custom>Может управл�ть медиа-�айтами дл� bb-кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_rss</word_key>
+      <word_default>RSS Management</word_default>
+      <word_custom>Управление RSS</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__export_manage</word_key>
+      <word_default>Can manage forum RSS exports?</word_default>
+      <word_custom>Может управл�ть RSS �к�портом?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__sands_remove</word_key>
+      <word_default>Can remove status and severity levels?</word_default>
+      <word_custom>Может удал�ть �тату�ы жалоб?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_rcstats</word_key>
+      <word_default>Report Center Statistics</word_default>
+      <word_custom>Стати�тика жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_access</word_key>
+      <word_default>Can view statistics and charts of reported content management?</word_default>
+      <word_custom>Может про�матривать �тати�тику �и�темы и жалоб?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__sands_manage</word_key>
+      <word_default>Can add/edit report center status and severity levels?</word_default>
+      <word_custom>Может измен�ть �тату�ы жалоб?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_statsev</word_key>
+      <word_default>Report Center Status and Severity Management</word_default>
+      <word_custom>Управление �тату�ами жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_reports</word_key>
+      <word_default>Report Center Plugins</word_default>
+      <word_custom>Плагины жалоб</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__media_delete</word_key>
+      <word_default>Can remove supported media bbcode sites?</word_default>
+      <word_custom>Может удал�ть медиа-�айты дл� bb-кода</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__plugins_remove</word_key>
+      <word_default>Can remove reported content plugins?</word_default>
+      <word_custom>Может удал�ть плагины �и�темы жалоб?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__plugins_manage</word_key>
+      <word_default>Can add/edit supported reported content plugins?</word_default>
+      <word_custom>Может добавл�ть/измен�ть плагины �и�темы жалоб?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__export_delete</word_key>
+      <word_default>Can delete forum RSS exports?</word_default>
+      <word_custom>Может удал�ть RSS �к�порт?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__import_manage</word_key>
+      <word_default>Can manage forum RSS imports?</word_default>
+      <word_custom>Может управл�ть импортами RSS?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__import_delete</word_key>
+      <word_default>Can delete forum RSS imports?</word_default>
+      <word_custom>Может удал�ть импорты RSS?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__import_remove</word_key>
+      <word_default>Can remove topics previously imported via RSS?</word_default>
+      <word_custom>Может удал�ть импортированные темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_topics</word_key>
+      <word_default>Can run reports on new topics?</word_default>
+      <word_custom>Может получать �тати�тику по �озданию тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_stats</word_key>
+      <word_default>Manage Statistics</word_default>
+      <word_custom>Управление �тати�тикой</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_posts</word_key>
+      <word_default>Can run reports on new posts?</word_default>
+      <word_custom>Может получать �тати�тику по новым �ообщени�м?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_registration</word_key>
+      <word_default>Can run reports on new registrations?</word_default>
+      <word_custom>Может получать �тати�тику по реги�траци�м?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_msg</word_key>
+      <word_default>Can run reports on new messages?</word_default>
+      <word_custom>Может получать �тати�тику по личным �ообщени�м?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_views</word_key>
+      <word_default>Can run reports on topic views?</word_default>
+      <word_custom>Может получать �тати�тику по про�мотрам тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_tools</word_key>
+      <word_default>Forum Tools</word_default>
+      <word_custom>Ин�трументы работы � разделами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ftools_deleteposts</word_key>
+      <word_default>Can delete all posts by a member?</word_default>
+      <word_custom>Может удал�ть в�е �ообщени� пользовател�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ftools_deletesubscriptions</word_key>
+      <word_default><![CDATA[Can delete all of a member's email notification requests?]]></word_default>
+      <word_custom>Может удал�ть в�е подпи�ки на разделы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ftools_clearforumsubs</word_key>
+      <word_default><![CDATA[Can clear all of a forum's email notification requests?]]></word_default>
+      <word_custom>Может отпи�ывать в�ех от разделов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mem_bulkmail</word_key>
+      <word_default>Creating Bulk Mail</word_default>
+      <word_custom>Создание ра��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bulkmail_delete</word_key>
+      <word_default>Can delete bulk emails?</word_default>
+      <word_custom>Может удал�ть ра��ылки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bulkmail_addedit</word_key>
+      <word_default>Can add/edit bulk emails?</word_default>
+      <word_custom>Может �оздавать/измен�ть ра��ылки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mem_bulkmailsend</word_key>
+      <word_default>Sending/Resending Bulk Mails</word_default>
+      <word_custom>Отправка ра��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bulkmail_view</word_key>
+      <word_default>Can monitor/view bulk emails?</word_default>
+      <word_custom>Может от�леживать/про�матривать ра��ылки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bulkmail_send</word_key>
+      <word_default>Can send bulk emails?</word_default>
+      <word_custom>Может отправл�ть ра��ылки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__bulkmail_cancel</word_key>
+      <word_default>Can cancel bulk emails?</word_default>
+      <word_custom>Может отмен�ть ра��ылки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_security</word_key>
+      <word_default>Security Center</word_default>
+      <word_custom>Центр безопа�но�ти</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__security_center</word_key>
+      <word_default>Can view the Security Center?</word_default>
+      <word_custom>Может про�матривать центр безопа�но�ти?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__virus_checker</word_key>
+      <word_default>Run the virus-checker scanner?</word_default>
+      <word_custom>Может запу�кать �каннер подозрительных файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__list_admins</word_key>
+      <word_default>List members with administrative access?</word_default>
+      <word_custom>Может про�матривать �пи�ок админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__deepscan</word_key>
+      <word_default>Perform a deepscan for suspicious files?</word_default>
+      <word_custom>Может запу�кать глубокое �канирование на подозрительные файлы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__htaccess_protection</word_key>
+      <word_default>Create a .htaccess to protect writable directories?</word_default>
+      <word_custom>Может �оздавать .htaccess дл� защиты директорий?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__acplink_remove</word_key>
+      <word_default>Remove the ACP Link?</word_default>
+      <word_custom>Убирать ��ылку на �Ц?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__nowrite_conf_global</word_key>
+      <word_default>Make conf_global.php not writable?</word_default>
+      <word_custom>Может делать conf_global.php защищенным на запи�ь?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__acp_rename</word_key>
+      <word_default>Rename the ACP directory?</word_default>
+      <word_custom>Может переименовывать директорию �Ц?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_tasks</word_key>
+      <word_default>Manage Scheduled Tasks</word_default>
+      <word_custom>Управление планировщиком задач</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__acp_htaccess</word_key>
+      <word_default>Create a .htaccess to protect the ACP?</word_default>
+      <word_custom>Может �оздавать .htaccess файл дл� защиты директории �Ц?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__task_manage</word_key>
+      <word_default>Can manage scheduled tasks?</word_default>
+      <word_custom>Может управл�ть задачами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__task_remove</word_key>
+      <word_default>Can remove scheduled tasks?</word_default>
+      <word_custom>Может удал�ть задачи?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__task_run_lock</word_key>
+      <word_default>Can unlock and/or run scheduled tasks manually?</word_default>
+      <word_custom>Может разблокировать и/или запу�кать задачи планировщика вручную?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tasklogs_delete</word_key>
+      <word_default>Can remove task logs?</word_default>
+      <word_custom>Может удал�ть запи�и из журнала задач?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_acp_loginlogs</word_key>
+      <word_default>Admin Login Logs</word_default>
+      <word_custom>Журнал авторизаций админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__acplogin_log</word_key>
+      <word_default>Can view admin login logs?</word_default>
+      <word_custom>Может про�матривать журнал авторизаций?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_templates</word_key>
+      <word_default>Manage Templates</word_default>
+      <word_custom>Управление шаблонами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tasklogs_view</word_key>
+      <word_default>Can view task logs?</word_default>
+      <word_custom>Может про�матривать журнал задач?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__settemplates_manage</word_key>
+      <word_default>Can view and manage skins?</word_default>
+      <word_custom>Может управл�ть �тил�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__templates_delete</word_key>
+      <word_default>Can remove and revert templates?</word_default>
+      <word_custom>Может удал�ть и отмен�ть изменени� в шаблонах?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__templates_manage</word_key>
+      <word_default>Can manage templates?</word_default>
+      <word_custom>Может управл�ть шаблонами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__settemplates_delete</word_key>
+      <word_default>Can remove skins?</word_default>
+      <word_custom>Может удал�ть �тили?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__css_manage</word_key>
+      <word_default>Can edit/add CSS?</word_default>
+      <word_custom>Может добавл�ть/измен�ть CSS?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__replacements_manage</word_key>
+      <word_default>Can add/edit macro replacements?</word_default>
+      <word_custom>Может добавл�ть/измен�ть макро�ы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__css_delete</word_key>
+      <word_default>Can remove and revert CSS?</word_default>
+      <word_custom>Может удал�ть и отмен�ть изменени� CSS?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__replacements_delete</word_key>
+      <word_default>Can remove and revert macro replacements?</word_default>
+      <word_custom>Может удал�ть и отмен�ть изменени� в макро�ах?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__settemplates_export</word_key>
+      <word_default>Can export skins?</word_default>
+      <word_custom>Может �к�портировать �тили?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__skindiff_reports</word_key>
+      <word_default>Can use the Template Merge Center?</word_default>
+      <word_custom>Может и�пользовать ин�трумент объединени� �тилей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__url_map_manage</word_key>
+      <word_default>Can add/edit skin url mappings?</word_default>
+      <word_custom>Может добавл�ть/измен�ть прив�зки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__template_tools</word_key>
+      <word_default>Can run the various skin system tools?</word_default>
+      <word_custom>Может запу�кать различные ин�трументы дл� �тилей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__url_map_delete</word_key>
+      <word_default>Can remove skin url mappings?</word_default>
+      <word_custom>Может удал�ть прив�зки?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__easy_logo</word_key>
+      <word_default>Can use the easy logo changer?</word_default>
+      <word_custom>Может и�пользовать ин�трумент �мены лого?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__useragent_skin_map</word_key>
+      <word_default>Can manage useragent skin mappings?</word_default>
+      <word_custom>Может управл�ть прив�зкой �тилей к User Agent?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__cache_manage</word_key>
+      <word_default>Can view and recache caches?</word_default>
+      <word_custom>Может про�матривать и пере�траивать кеш?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_login_modules</word_key>
+      <word_default>Manage Log In Modules</word_default>
+      <word_custom>Управление методами входа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__login_manage</word_key>
+      <word_default>Can manage log in modules?</word_default>
+      <word_custom>Может управл�ть модул�ми входа?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_helpfiles</word_key>
+      <word_default>Manage Help Files</word_default>
+      <word_custom>Управление разделами помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__qa_manage</word_key>
+      <word_default>Can add, edit and remove questions and answers?</word_default>
+      <word_custom>Может управл�ть вопро�ами?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__qanda_view</word_key>
+      <word_default>Can access questions and answers?</word_default>
+      <word_custom>Имеет до�туп к про�мотру вопро�ов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_qanda</word_key>
+      <word_default>Registration questions and answers</word_default>
+      <word_custom>Си�тема «Вопро�-ответ»</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__helpfiles_manage</word_key>
+      <word_default>Can access help files?</word_default>
+      <word_custom>Имеет до�туп к разделам помощи?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__help_manage</word_key>
+      <word_default>Can edit/add help files?</word_default>
+      <word_custom>Может редактировать/добавл�ть разделы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__help_remove</word_key>
+      <word_default>Can remove help files?</word_default>
+      <word_custom>Может удал�ть разделы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__api_manage</word_key>
+      <word_default>Can edit/add API users?</word_default>
+      <word_custom>Может добавл�ть/измен�ть пользователей API?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_apiusers</word_key>
+      <word_default>API Users</word_default>
+      <word_custom>Пользователи API</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__api_logs</word_key>
+      <word_default>Can access API logs?</word_default>
+      <word_custom>Имеет до�туп к журналу API?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__api_remove</word_key>
+      <word_default>Can remove API users?</word_default>
+      <word_custom>Может удал�ть пользователей API?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_caches</word_key>
+      <word_default>Manage Caches</word_default>
+      <word_custom>Управление кешем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__sharelinks_manage</word_key>
+      <word_default>Can edit/add/delete share links?</word_default>
+      <word_custom>Может измен�ть �ерви�ы публикации ��ылок?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_sharelinks</word_key>
+      <word_default>Share Links</word_default>
+      <word_custom>Серви�ы публикации ��ылок</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ua_manage</word_key>
+      <word_default>Can edit/add user agents and user agent groups?</word_default>
+      <word_custom>Может измен�ть/добавл�ть User Agent и их группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_uagents</word_key>
+      <word_default>Manage User Agents</word_default>
+      <word_custom>Управление User Agent</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ua_remove</word_key>
+      <word_default>Can remove user agents and user agent groups?</word_default>
+      <word_custom>Может удал�ть User Agent и их группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__uagents</word_key>
+      <word_default>Can manage user agents?</word_default>
+      <word_custom>Может управл�ть User Agent?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_cleanuprebuild</word_key>
+      <word_default>Cleanup and Rebuild Tools</word_default>
+      <word_custom>Ин�трументы обновлени� и очи�тки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__cleanup_manage</word_key>
+      <word_default>Can access recount tools?</word_default>
+      <word_custom>Может и�пользовать ин�трументы пере�чета?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__rebuild_manage</word_key>
+      <word_default>Can access rebuild tools?</word_default>
+      <word_custom>Имеет до�туп к ин�трументам пере�троени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_recount</word_key>
+      <word_default>Can recount site statistics?</word_default>
+      <word_custom>Может запу�кать пере�чет �тати�тики в�ей �и�темы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_resynch</word_key>
+      <word_default>Can resynchronize forums?</word_default>
+      <word_custom>Может запу�кать пере�чет �тати�тики форумов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_postcounts</word_key>
+      <word_default>Can reset post counts and usernames in posts?</word_default>
+      <word_custom>Может запу�кать пере�чет �четчиков �ообщений пользовател�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_rebuild</word_key>
+      <word_default>Can rebuild bbcode in post and other content?</word_default>
+      <word_custom>Может обновл�ть �одержимое публикаций дл� пере�троени� отображени� bb-кодов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_thumbs</word_key>
+      <word_default>Can rebuild thumbnails and user photos?</word_default>
+      <word_custom>Может пере�траивать превью файлов и пользователь�кие фотографии?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_resyncht</word_key>
+      <word_default>Can resynchronize topics?</word_default>
+      <word_custom>Может запу�кать пере�чет �тати�тики тем?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_attach</word_key>
+      <word_default>Can rebuild attachment data?</word_default>
+      <word_custom>Может пере�траивать данные о прикрепленных файлах?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_orphaned</word_key>
+      <word_default>Can remove orphaned attachments?</word_default>
+      <word_custom>Может запу�кать проверку на потер�нные прикрепленные файлы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__tools_orphanp</word_key>
+      <word_default>Can remove orphaned photos?</word_default>
+      <word_custom>Может запу�кать проверку на потер�нные фотографии?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__incomingemail_manage</word_key>
+      <word_default>Can manage Incoming Email rules?</word_default>
+      <word_custom>Может управл�ть правилами вход�щей почты?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__core_emailrules</word_key>
+      <word_default>Incoming Email Rules</word_default>
+      <word_custom>Правила вход�щей почты</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__view_attachments</word_key>
+      <word_default>Can search and review attachments?</word_default>
+      <word_custom>Может и�кать прикреплени�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_attachments</word_key>
+      <word_default>Manage Attachments</word_default>
+      <word_custom>Управление прикрепл�емыми файлами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_mimes</word_key>
+      <word_default>Manage Attachments Mime-Types</word_default>
+      <word_custom>Управление Mime-Type прикрепл�мых файлов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__remove_attachments</word_key>
+      <word_default>Can remove attachments?</word_default>
+      <word_custom>Может удал�ть прикрепленные файлы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__stats_attachments</word_key>
+      <word_default>Can view attachment stats?</word_default>
+      <word_custom>Может получать �тати�тику по прикрепленным файлам?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_add</word_key>
+      <word_default>Can add attachment types?</word_default>
+      <word_custom>Может добавл�ть новые типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_view</word_key>
+      <word_default>Can view attachment types?</word_default>
+      <word_custom>Может про�матривать типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_import</word_key>
+      <word_default>Can import attachment types?</word_default>
+      <word_custom>Может импортировать типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_delete</word_key>
+      <word_default>Can remove attachment types?</word_default>
+      <word_custom>Может удал�ть типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_edit</word_key>
+      <word_default>Can edit attachment types?</word_default>
+      <word_custom>Может измен�ть типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_forums</word_key>
+      <word_default>Manage Forums</word_default>
+      <word_custom>Управление форумами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mime_export</word_key>
+      <word_default>Can export attachment types?</word_default>
+      <word_custom>Может �к�портировать типы прикрепл�емых файлов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_add</word_key>
+      <word_default>Can add new forums?</word_default>
+      <word_custom>Может �оздавать новые форумы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_edit</word_key>
+      <word_default>Can edit forums?</word_default>
+      <word_custom>Может измен�ть форумы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_delete</word_key>
+      <word_default>Can delete forums?</word_default>
+      <word_custom>Может удал�ть форумы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_reorder</word_key>
+      <word_default>Can reorder forums?</word_default>
+      <word_custom>Может измен�ть пор�док вывода форумов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_permissions</word_key>
+      <word_default>Can edit permissions for forums?</word_default>
+      <word_custom>Может измен�ть права до�тупа к форумам?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_delete_admin</word_key>
+      <word_default>Can delete ADMIN groups?</word_default>
+      <word_custom>Может удал�ть админи�тратор�кие группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_delete</word_key>
+      <word_default>Can delete groups?</word_default>
+      <word_custom>Может удал�ть группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_perms</word_key>
+      <word_default>Managing Permissions</word_default>
+      <word_custom>Управление правами до�тупа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_edit_admin</word_key>
+      <word_default>Can edit ADMIN groups?</word_default>
+      <word_custom>Может редактировать админи�тратор�кие группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_edit</word_key>
+      <word_default>Can edit groups?</word_default>
+      <word_custom>Может редактировать группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_add_admin</word_key>
+      <word_default>Can add ADMIN groups?</word_default>
+      <word_custom>Может добавл�ть админи�тратор�кие группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mmod_edit</word_key>
+      <word_default>Can edit multi-moderation routines?</word_default>
+      <word_custom>Может измен�ть правила мульти-модерации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mmod_delete</word_key>
+      <word_default>Can delete multi-moderation routines?</word_default>
+      <word_custom>Может удал�ть правила мульти-модерации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mmod_view</word_key>
+      <word_default>Can view multi-moderation routines?</word_default>
+      <word_custom>Может про�матривать правила мульти-модерации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_groups</word_key>
+      <word_default>Managing Groups</word_default>
+      <word_custom>Управление группами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__groups_add</word_key>
+      <word_default>Can add groups?</word_default>
+      <word_custom>Может добавл�ть группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mmod_add</word_key>
+      <word_default>Can add new multi-moderation routines?</word_default>
+      <word_custom>Может добавл�ть новые правила мульти-модерации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mods_add</word_key>
+      <word_default>Can add new moderators?</word_default>
+      <word_custom>Может добавл�ть новых модераторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mods_edit</word_key>
+      <word_default>Can edit moderators?</word_default>
+      <word_custom>Может измен�ть модераторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mods_delete</word_key>
+      <word_default>Can delete moderators?</word_default>
+      <word_custom>Может удал�ть модераторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__mods_view</word_key>
+      <word_default>Can list forum moderators?</word_default>
+      <word_custom>Может про�матривать �пи�ок модераторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_multimods</word_key>
+      <word_default>Manage Multi-Moderation</word_default>
+      <word_custom>Управление мульти-модерацией</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_moderators</word_key>
+      <word_default>Manage Forum Moderators</word_default>
+      <word_custom>Управление модераторами</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_rules</word_key>
+      <word_default>Can edit forum rules?</word_default>
+      <word_custom>Может измен�ть правила форума?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_skins</word_key>
+      <word_default>Can assign/unassign skins to forums?</word_default>
+      <word_custom>Может назначать/убирать �тили дл� разделов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__forums_empty</word_key>
+      <word_default>Can empty forums?</word_default>
+      <word_custom>Может очищать форумы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__perms_manage</word_key>
+      <word_default>Can manage permission sets and configure permission access?</word_default>
+      <word_custom>Может управл�ть ма�ками до�тупа и на�траивать до�тупы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__perms_delete</word_key>
+      <word_default>Can remove permission sets?</word_default>
+      <word_custom>Может удал�ть ма�ки до�тупа?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_members</word_key>
+      <word_default>Managing Members</word_default>
+      <word_custom>Управление пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_edit</word_key>
+      <word_default>Can edit members?</word_default>
+      <word_custom>Может редактировать пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_add_admin</word_key>
+      <word_default>Can add ADMINS?</word_default>
+      <word_custom>Может �оздавать админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_add</word_key>
+      <word_default>Can add members?</word_default>
+      <word_custom>Может �оздавать пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_edit_admin</word_key>
+      <word_default>Can edit ADMINS?</word_default>
+      <word_custom>Может редактировать админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_delete</word_key>
+      <word_default>Can delete members?</word_default>
+      <word_custom>Может удал�ть пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_delete_admin</word_key>
+      <word_default>Can delete ADMINS?</word_default>
+      <word_custom>Может удал�ть админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_merge</word_key>
+      <word_default>Can merge two user accounts?</word_default>
+      <word_custom>Может объедин�ть пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_suspend_admin</word_key>
+      <word_default>Can suspend and unsuspend ADMINS?</word_default>
+      <word_custom>Может блокировать или разблокировать админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_suspend</word_key>
+      <word_default>Can suspend and unsuspend members?</word_default>
+      <word_custom>Может блокировать или разблокировать пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_prune</word_key>
+      <word_default>Can prune members?</word_default>
+      <word_custom>Может удал�ть не�колько пользователей за раз?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_move</word_key>
+      <word_default>Can move members to other groups?</word_default>
+      <word_custom>Может перено�ить пользователей в другие группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_prune_admin</word_key>
+      <word_default>Can prune ADMINS?</word_default>
+      <word_custom>Может удал�ть не�колько админи�траторов за раз?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_move_admin2</word_key>
+      <word_default>Can promote members to ADMIN?</word_default>
+      <word_custom>Может продвигать пользователей в админи�траторы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_move_admin1</word_key>
+      <word_default>Can move ADMINS to other groups?</word_default>
+      <word_custom>Может перено�ить пользователей в админи�тратор�кие группы?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_ban</word_key>
+      <word_default>Can ban members?</word_default>
+      <word_custom>Может банить пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_validating</word_key>
+      <word_default>Can manage validating members?</word_default>
+      <word_custom>Может управл�ть ожидающими активации пользовател�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_ban_admin</word_key>
+      <word_default>Can ban ADMINS?</word_default>
+      <word_custom>Может банить админи�траторов?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_photo_admin</word_key>
+      <word_default>Can upload new photos for ADMINS?</word_default>
+      <word_custom>Может измен�ть фотографии админи�траторам?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__member_photo</word_key>
+      <word_default>Can upload new member photos?</word_default>
+      <word_custom>Может измен�ть фотографии пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_banned</word_key>
+      <word_default>Can manage banned members?</word_default>
+      <word_custom>Может управл�ть забаненными пользовател�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_incomplete</word_key>
+      <word_default>Can manage incomplete members?</word_default>
+      <word_custom>Может управл�ть не завершившими реги�трацию пользовател�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_spam</word_key>
+      <word_default>Can manage spam members?</word_default>
+      <word_custom>Может управл�ть пользовател�ми отмеченными как �памер?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_locked</word_key>
+      <word_default>Can manage locked members?</word_default>
+      <word_custom>Может управл�ть заблокированными пользовател�ми?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_tools</word_key>
+      <word_default>Member Tools</word_default>
+      <word_custom>Ин�трументы дл� работы � пользовател�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ranks_add</word_key>
+      <word_default>Can view and add new member ranks?</word_default>
+      <word_custom>Может добавл�ть звани�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_ip</word_key>
+      <word_default>Can use the IP address tools?</word_default>
+      <word_custom>Может и�пользовать ин�трумент работы � IP?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_ranks</word_key>
+      <word_default>Member Ranks</word_default>
+      <word_custom>Управление звани�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ranks_delete</word_key>
+      <word_default>Can delete member ranks?</word_default>
+      <word_custom>Может удал�ть звани�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ranks_edit</word_key>
+      <word_default>Can edit member ranks?</word_default>
+      <word_custom>Может измен�ть звани�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ban_remove</word_key>
+      <word_default>Can remove ban filters?</word_default>
+      <word_custom>Может удал�ть правила бан-фильтра?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__ban_manage</word_key>
+      <word_default>Can manage ban filters?</word_default>
+      <word_custom>Может управл�ть фильтром бана?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_banfilters</word_key>
+      <word_default>Managing Ban Filters</word_default>
+      <word_custom>Управление фильтрами бана</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__reps_delete</word_key>
+      <word_default>Can delete reputation levels?</word_default>
+      <word_custom>Может удал�ть уровни репутации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__reps_manage</word_key>
+      <word_default>Can manage reputation levels?</word_default>
+      <word_custom>Может управл�ть уровн�ми репутации?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_reputation</word_key>
+      <word_default>Member Reputation</word_default>
+      <word_custom>Управление репутацией</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_notifications</word_key>
+      <word_default>Notification Defaults</word_default>
+      <word_custom>�а�тройка уведомлений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__configure_notifications</word_key>
+      <word_default>Configure notification defaults?</word_default>
+      <word_custom>Может на�траивать �и�тему уведомлений?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_restrictions</word_key>
+      <word_default>Manage ACP Restrictions</word_default>
+      <word_custom>Управление ограничени�ми админи�траторов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_add_member</word_key>
+      <word_default>Can add member restrictions?</word_default>
+      <word_custom>Может у�танавливать ограничени� пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_edit_member</word_key>
+      <word_default>Can edit member restrictions?</word_default>
+      <word_custom>Может измен�ть ограничени� пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_add_group</word_key>
+      <word_default>Can add group restrictions?</word_default>
+      <word_custom>Может у�танавливать ограничени� групп?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_delete_member</word_key>
+      <word_default>Can remove member restrictions?</word_default>
+      <word_custom>Может �нимать ограничени� пользователей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_delete_group</word_key>
+      <word_default>Can remove group restrictions?</word_default>
+      <word_custom>Может �нимать ограничени� групп?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_cfields</word_key>
+      <word_default>Custom Profile Fields</word_default>
+      <word_custom>Управление дополнительными пол�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefields_add</word_key>
+      <word_default>Can add new profile fields?</word_default>
+      <word_custom>Может добавл�ть дополнительные пол�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefields_global</word_key>
+      <word_default>Can access custom profile fields management?</word_default>
+      <word_custom>Имеет до�туп к управлению дополнительными пол�ми профил�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__restrictions_edit_group</word_key>
+      <word_default>Can edit group restrictions?</word_default>
+      <word_custom>Может измен�ть ограничени� групп?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefields_edit</word_key>
+      <word_default>Can edit profile fields?</word_default>
+      <word_custom>Может измен�ть дополнительные пол�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefields_delete</word_key>
+      <word_default>Can delete profile fields?</word_default>
+      <word_custom>Может удал�ть дополнительные пол�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__members_cfieldgroups</word_key>
+      <word_default>Custom Profile Field Groups</word_default>
+      <word_custom>Управлени� группами дополнительных полей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefieldgroups_global</word_key>
+      <word_default>Can access custom profile field group management?</word_default>
+      <word_custom>Имеет до�туп к управлению группами дополнительных полей профил�?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefieldgroups_delete</word_key>
+      <word_default>Can delete profile field group?</word_default>
+      <word_custom>Может удал�ть группы дополнительных полей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefieldgroups_edit</word_key>
+      <word_default>Can edit profile field group?</word_default>
+      <word_custom>Может измен�ть группы дополнительных полей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__profilefieldgroups_add</word_key>
+      <word_default>Can add new profile field group?</word_default>
+      <word_custom>Может добавл�ть группы дополнительных полей?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>admin_restrictions</word_pack>
+      <word_key>r__membertools_delete_pms</word_key>
+      <word_default>Can delete private messages?</word_default>
+      <word_custom>Может удал�ть личные �ообщени�?</word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/members/xml/hooks/index.html b/upload/admin/applications/members/xml/hooks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/xml/hooks/index.html
+++ b/upload/admin/applications/members/xml/hooks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/xml/hooks/mlist_alpharu.xml b/upload/admin/applications/members/xml/hooks/mlist_alpharu.xml
index 2e8a33d5..0c50ab00 100644
--- a/upload/admin/applications/members/xml/hooks/mlist_alpharu.xml
+++ b/upload/admin/applications/members/xml/hooks/mlist_alpharu.xml
@@ -5,14 +5,15 @@
       <hook_name>Ру��кие буквы в �пи�ке пользователей</hook_name>
       <hook_desc>Добавление букв ру��кого �зыка к фильтру по �пи�ку пользователей</hook_desc>
       <hook_author>IBResource, LTD</hook_author>
-      <hook_email/>
-      <hook_website/>
+      <hook_email>sales@ibresource.ru</hook_email>
+      <hook_website>http://www.ibresource.ru</hook_website>
       <hook_update_check/>
       <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:0;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long>10000</hook_version_long>
-      <hook_extra_data><![CDATA[a:3:{s:9:"templates";a:1:{s:10:"skin_mlist";a:1:{s:0:"";s:15:"member_alpha_ru";}}s:7:"display";a:2:{s:9:"templates";s:32:"От skin_mlist: member_alpha_ru";s:3:"css";s:34:"CSS файлы: 1: ipb_mlist_addon";}s:3:"css";a:1:{s:0:"";s:2:"32";}}]]></hook_extra_data>
+      <hook_version_human>1.1.0</hook_version_human>
+      <hook_version_long>10010</hook_version_long>
+      <hook_extra_data><![CDATA[a:3:{s:7:"display";a:2:{s:9:"templates";s:32:"От skin_mlist: member_alpha_ru";s:3:"css";s:34:"CSS файлы: 1: ipb_mlist_addon";}s:9:"templates";a:1:{s:10:"skin_mlist";a:1:{s:15:"member_alpha_ru";s:15:"member_alpha_ru";}}s:3:"css";a:1:{s:15:"ipb_mlist_addon";s:15:"ipb_mlist_addon";}}]]></hook_extra_data>
       <hook_key>ibr_mlist_alpha_ru</hook_key>
+      <hook_global_caches/>
     </config>
   </hookdata>
   <hookfiles>
@@ -27,24 +28,26 @@ class alpha
 {
 	public function getOutput()
 	{
-	    $template = ipsRegistry::instance()->output->getTemplate('mlist')->member_alpha_ru();
+	    $template = ipsRegistry::instance()->output->getTemplate('mlist')->member_alpha_ru(
+	        ipsRegistry::instance()->output->getTemplate('mlist')->functionData['member_list_show'][0]['url']
+	    );
 	    
         $js = <<<JS
 
 				<script type='text/javascript'>
 					$('alpha_switch').observe('click', function(){
-							if( $('member_alpha_ru') )
+							if( $('mlist_tabs_ru') )
 							{
-								$('member_alpha').toggle();
-								$('member_alpha_ru').toggle();
+								$('mlist_tabs').toggle();
+								$('mlist_tabs_ru').toggle();
 							}
 					} );
 
 					$('alpha_switch_en').observe('click', function(){
-							if( $('member_alpha') )
+							if( $('mlist_tabs') )
 							{
-								$('member_alpha').toggle();
-								$('member_alpha_ru').toggle();
+								$('mlist_tabs').toggle();
+								$('mlist_tabs_ru').toggle();
 							}
 					} );
 
@@ -52,13 +55,13 @@ JS;
         if ( ord( urldecode(ipsRegistry::$request['quickjump']) ) > 90 )
         {
             $js .= <<<JS
-					$('member_alpha').toggle();
+					$('mlist_tabs').toggle();
 JS;
         }
         else
         {
             $js .= <<<JS
-					$('member_alpha_ru').toggle();
+					$('mlist_tabs_ru').toggle();
 JS;
         }
         
@@ -77,81 +80,49 @@ JS;
   <hookextras_help/>
   <hookextras_templates>
     <templates>
-      <template_set_id>0</template_set_id>
       <template_group>skin_mlist</template_group>
-      <template_content/>
+      <template_content><![CDATA[<li id='alpha_switch' class='clickable'>РУС</li>
+		</ul>
+	</div>
+
+	<div class='ipsVerticalTabbed_tabs ipsVerticalTabbed_minitabs ipsLayout_left' id='mlist_tabs_ru'>
+		<ul>
+    		<if test="letterquickjump:|:!$this->request['quickjump']">
+    			<li class='active'><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['members_start_with']}{$letter}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
+    		<else />
+    			<li><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_all_title']}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
+    		</if>
+    <foreach loop="array('�','Б','В','Г','Д','Е','�','Ж','З','И','Й','К','Л','М','�','О','П','Р','С','Т','У','Ф','Х','Ц','Ч','Ш','Щ','Ъ','Ы','Ь','Э','Ю','Я') as $char">
+    	<if test="letterdefault:|:$letter=urlencode($char)">
+          	<li <if test="selected:|:$this->request['quickjump'] AND ($this->request['quickjump'] == $letter OR $this->request['quickjump'] == $char)">class='active'</if>><a href='{parse url="{$url}&amp;quickjump={$letter}" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_start_title']} {$char}'>{$char}</a></li>
+    	</if>
+    </foreach>
+            <li id='alpha_switch_en' class='clickable'>��Г</li>
+]]></template_content>
       <template_name>member_alpha_ru</template_name>
-      <template_data/>
+      <template_data>$url=''</template_data>
       <template_updated>1280429247</template_updated>
       <template_removable>1</template_removable>
       <template_added_to>1</template_added_to>
       <template_user_added>1</template_user_added>
-      <template_user_edited>1</template_user_edited>
-      <template_master_key/>
-      <template_set_type/>
-    </templates>
-    <templates>
-      <template_set_id>1</template_set_id>
-      <template_group>skin_mlist</template_group>
-      <template_content/>
-      <template_name>member_alpha_ru</template_name>
-      <template_data/>
-      <template_updated>1280429283</template_updated>
-      <template_removable>1</template_removable>
-      <template_added_to>1</template_added_to>
-      <template_user_added>1</template_user_added>
-      <template_user_edited>1</template_user_edited>
-      <template_master_key/>
-      <template_set_type/>
-    </templates>
-    <templates>
-      <template_set_id>1</template_set_id>
-      <template_group>skin_mlist</template_group>
-      <template_content><![CDATA[                <li id='alpha_switch' class='clickable'>Ру��кие</li>
-        	</ol>
-
-        	<ol id='member_alpha_ru' class='tab_bar' style='display:block'>
-        		<if test="letterquickjump:|:!$this->request['quickjump']">
-        			<li class='active'><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['members_start_with']}{$letter}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
-        		<else />
-        			<li><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_all_title']}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
-        		</if>
-        <foreach loop="array('�','Б','В','Г','Д','Е','�','Ж','З','И','Й','К','Л','М','�','О','П','Р','С','Т','У','Ф','Х','Ц','Ч','Ш','Щ','Ъ','Ы','Ь','Э','Ю','Я') as $char">
-        	<if test="letterdefault:|:$letter=urlencode($char)">
-        		<li <if test="selected:|:$this->request['quickjump'] == $letter OR $this->request['quickjump'] == $char">class='active'</if>><a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;quickjump={$letter}" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_start_title']} {$char}'>{$char}</a></li>
-        	</if>
-        </foreach>
-                <li id='alpha_switch_en' class='clickable'>�нглий�кие</a></li>
-        	</ol>]]></template_content>
-      <template_name>member_alpha_ru</template_name>
-      <template_data/>
-      <template_updated>1280430948</template_updated>
-      <template_removable>1</template_removable>
-      <template_added_to>1</template_added_to>
-      <template_user_added>1</template_user_added>
-      <template_user_edited>1</template_user_edited>
-      <template_master_key/>
-      <template_set_type/>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
     </templates>
   </hookextras_templates>
   <hookextras_css>
     <css>
-      <css_updated>1280431859</css_updated>
+      <css_updated>0</css_updated>
       <css_group>ipb_mlist_addon</css_group>
-      <css_content>#member_alpha_ru li {
-	padding: 2px 7px;
-}
-
-	#member_alpha_ru li.active {
-		padding: 7px 15px;
-	}</css_content>
+      <css_content><![CDATA[#mlist_tabs_ru { margin-top: 35px; }
+      	#mlist_tabs_ru li { text-align: center; }
+      		#mlist_tabs_ru li a { padding: 5px 8px; }]]></css_content>
       <css_position>0</css_position>
       <css_added_to>1</css_added_to>
       <css_app/>
       <css_app_hide>0</css_app_hide>
       <css_attributes/>
-      <css_modules/>
       <css_removed>0</css_removed>
+      <css_modules/>
       <css_master_key>root</css_master_key>
     </css>
   </hookextras_css>
diff --git a/upload/admin/applications/members/xml/hooks/status_updates.xml b/upload/admin/applications/members/xml/hooks/status_updates.xml
index 2e3427b5..dad29ebe 100644
--- a/upload/admin/applications/members/xml/hooks/status_updates.xml
+++ b/upload/admin/applications/members/xml/hooks/status_updates.xml
@@ -6,7 +6,7 @@
       <hook_desc>Выводит на главной �танице форумов блок 10 по�ледних изменений �тату�ов</hook_desc>
       <hook_author>Invision Power Services, Inc</hook_author>
       <hook_email/>
-      <hook_website/>
+      <hook_website>http://www.invisionpower.com</hook_website>
       <hook_update_check/>
       <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:3;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
       <hook_version_human>1.0.0</hook_version_human>
diff --git a/upload/admin/applications/members/xml/index.html b/upload/admin/applications/members/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications/members/xml/index.html
+++ b/upload/admin/applications/members/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications/members/xml/information.xml b/upload/admin/applications/members/xml/information.xml
index 63457d9c..846bcd9d 100644
--- a/upload/admin/applications/members/xml/information.xml
+++ b/upload/admin/applications/members/xml/information.xml
@@ -3,9 +3,14 @@
 	<data>
 		<name>Пользователи</name>
 		<public_name>Пользователи</public_name>
+        <hide_tab>0</hide_tab>
 		<author>Invision Power Services, Inc.</author>
 		<description>Модуль управлени� пользовател�ми и группами</description>
-		<templategroups>
+		<disabledatinstall>0</disabledatinstall>
+    <global_caches/>
+    <website/>
+    <update_check/>
+    <templategroups>
 			<template match="exact">skin_messaging</template>
 			<template match="exact">skin_mlist</template>
 			<template match="exact">skin_online</template>
diff --git a/upload/admin/applications/members/xml/members_mobile_templates.xml b/upload/admin/applications/members/xml/members_mobile_templates.xml
index 7872227d..7b2bcee7 100644
--- a/upload/admin/applications/members/xml/members_mobile_templates.xml
+++ b/upload/admin/applications/members/xml/members_mobile_templates.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates application="members" templategroups="a:5:{s:14:&quot;skin_messaging&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_mlist&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_online&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_profile&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_ucp&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_messaging">
+    <template>
+      <template_group>skin_messaging</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>messengerDisabled</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_messaging</template_group>
       <template_content><![CDATA[<div class='master_list'>
-	<h2>{$this->lang->words['m_messenger']}</h2>
+	<!--<h2>{$this->lang->words['m_messenger']}</h2>-->
 	<if test="inlineError:|:$inlineError">
 		<div class='message error'>
 			{$inlineError}
@@ -13,11 +24,11 @@
 	{$html}
 	
 	<if test="hasParticipants:|:is_array( $topicParticipants ) and count( $topicParticipants )">
-		<h2>{$this->lang->words['participants']}</h2>
+		<h3>{$this->lang->words['participants']}</h3>
 		<foreach loop="participants:$topicParticipants as $memberID => $memberData">
 			<div class='row'>
 				<div class='icon'>
-					<a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ><img src='{$memberData['pp_mini_photo']}' width='{$memberData['pp_mini_width']}' height='{$memberData['pp_mini_height']}' alt='{$this->lang->words['photo']}' class='photo' /></a>
+					<a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ><img src='{$memberData['pp_mini_photo']}' style='width: 30px; height: 30px;' alt='{$this->lang->words['photo']}' class='photo' /></a>
 				</div>
 				<if test="userIsActive:|:$memberData['map_user_active']">
 					<a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name']}</strong></a>
@@ -64,7 +75,7 @@
 	</if>				
 	
 	<if test="$this->settings['_hideFolders'] != 1">
-		<h2>{$this->lang->words['folders']} <if test="storageBar:|:$this->memberData['g_max_messages'] > 0"><span class='subtext'>{$totalData['full_percent']}% {$this->lang->words['full']}</span></if></h2>
+		<h3>{$this->lang->words['folders']} <if test="storageBar:|:$this->memberData['g_max_messages'] > 0"><span class='subtext'>{$totalData['full_percent']}% {$this->lang->words['full']}</span></if></h3>
 	
 		<if test="myDirectories:|:count($dirData)">
 			<foreach loop="dirs:$dirData as $id => $data">
@@ -84,7 +95,7 @@
 </div>]]></template_content>
       <template_name>messengerTemplate</template_name>
       <template_data><![CDATA[$html, $jumpmenu, $dirData, $totalData=array(), $topicParticipants=array(), $inlineError='', $deletedTopic=0]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -92,19 +103,19 @@
     </template>
     <template>
       <template_group>skin_messaging</template_group>
-      <template_content/>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>PMQuickForm</template_name>
       <template_data>$toMemberData</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
+      <template_master_key>root</template_master_key>
     </template>
     <template>
       <template_group>skin_messaging</template_group>
       <template_content><![CDATA[<if test="$this->settings['_hideFolders'] = 1"></if>
-<form id='msgForm' style='display:block' action="{parse url="module=messaging&amp;section=send&amp;do=send" base="publicWithApp"}" method="post" enctype='multipart/form-data'>
+<form id='msgForm' class='ipsForm_vertical' action="{parse url="module=messaging&amp;section=send&amp;do=send" base="publicWithApp"}" method="post" enctype='multipart/form-data'>
 	<if test="newTopicError:|:$displayData['errors']">
 		<div class='message error'>
 			<strong>{$this->lang->words['err_errors']}</strong><br />
@@ -114,18 +125,19 @@
 	</if>
 	
 	<h3>{$this->lang->words['pro_recips']}</h3>
-	<div class='row'>
-		{$this->lang->words['to_whom']}<br />
+	<div class='ipsField'>
+		<label for='entered_name' class='ipsField_title'>{$this->lang->words['to_whom']}</label>
 		<input type="text" class='input_text' id='entered_name' name="entered_name" size="30" value="{$displayData['name']}" tabindex="0" />
-		
-		<if test="newTopicInvite:|:intval($this->memberData['g_max_mass_pm'])">
-			<br /><br />
-			{$this->lang->words['other_recipients']}<br />
+	</div>
+	<if test="newTopicInvite:|:intval($this->memberData['g_max_mass_pm'])">
+		<div class='ipsField'>
+			<label for='ipsField_title' class='ipsField_title'>{$this->lang->words['other_recipients']}</label>
 			<input type='text' size="30" class='input_text' name='inviteUsers' value='{$displayData['inviteUsers']}' id='more_members' tabindex='0' /><br />
 			<span class='desc'>{$this->lang->words['youmay_add_to']} <strong>{$this->memberData['g_max_mass_pm']}</strong> {$this->lang->words['youmay_suffix']}</span>
-			<br /><br />
-			
-			{$this->lang->words['send_to_as']} 
+		</div>
+		
+		<div class='ipsField'>
+			<strong>{$this->lang->words['send_to_as']} </strong>
 			<select name='sendType' id='send_type' tabindex='0'>
 				<option value='invite'<if test="formReloadInvite:|:$this->request['sendType']=='invite'"> selected='selected'</if>>{$this->lang->words['send__invite']}</option>
 				<option value='copy'<if test="formReloadCopy:|:$this->request['sendType']=='copy'"> selected='selected'</if>>{$this->lang->words['send__copy']}</option>
@@ -134,31 +146,28 @@
 				<strong>{$this->lang->words['send__invite']}</strong> {$this->lang->words['invite__desc']}<br />
 				<strong>{$this->lang->words['send__copy']}</strong> {$this->lang->words['copy__desc']}
 			</span>
-		</if>
-	</div>
+		</div>
+	</if>
 	
 	<h3>{$this->lang->words['pro_message']}</h3>
-	<div class='row'>
-		{$this->lang->words['message_subject_send']}<br />
+	<div class='ipsField'>
+		<label for='message_subject' class='ipsField_title'>{$this->lang->words['message_subject_send']}</label>
 		<input type="text" name="msg_title" id='message_subject' class='input_text' size="30" tabindex="0" maxlength="40" value="{$displayData['title']}" />
-		<br /><br />
-		
+	</div>
+	<div class='ipsField'>
 		{$displayData['editor']}
 	</div>
-	
 	<input type='hidden' name='topicID' value="{$displayData['topicID']}" />
 	<input type='hidden' name="postKey" value="{$displayData['postKey']}" />
 	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
 	<div class='submit'>
-		<input class='input_submit' name="dosubmit" type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
-		<input class='input_submit alt' type="submit" value="{$this->lang->words['pms_send_later']}" tabindex="0" name="save" />
-		{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+		<input class='button' name="dosubmit" type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
 	</div>
 		
 </form>]]></template_content>
       <template_name>sendNewPersonalTopicForm</template_name>
       <template_data>$displayData</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -193,16 +202,14 @@
 </div>
 <div class='submit'>
 	<if test="replyOptions:|:$displayData['type'] == 'reply'">
-		<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
-		{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+		<input class='button' type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
 	<else />
-		<input class='input_submit' type="submit" value="{$this->lang->words['save_message_button']}" tabindex="0" accesskey="s" />
-		{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+		<input class='button' type="submit" value="{$this->lang->words['save_message_button']}" tabindex="0" accesskey="s" />
 	</if>
 </div>]]></template_content>
       <template_name>sendReplyForm</template_name>
       <template_data>$displayData</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -211,25 +218,26 @@
     <template>
       <template_group>skin_messaging</template_group>
       <template_content><![CDATA[<div class='controls'>
-	<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a>
-	<if test="canReply:|:$topic['_canReply']">
-		<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a>
-	</if>
-	<a class='button delete' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{$this->lang->words['option__delete']}</a>
-	
+	<div class='buttons'>
+		<if test="canReply:|:$topic['_canReply']">
+			<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a>
+		</if>
+		<!--<a class='button delete' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{$this->lang->words['option__delete']}</a>-->
+	</div>
 	{$topic['_pages']}
 </div>
 <foreach loop="replies:$replies as $msg_id => $msg">
 	<div class='topic_reply'>
 		<h2 class='secondary'>
+			<img src='{$members[ $msg['msg_author_id'] ]['pp_thumb_photo']}' class='photo' />
 			<a class="url fn" href='{parse url="showuser={$members[ $msg['msg_author_id'] ]['member_id']}" base="public" template="showuser" seotitle="{$members[ $msg['msg_author_id'] ]['members_seo_name']}"}'>{$members[ $msg['msg_author_id'] ]['members_display_name']}</a>
 			<span class='subtext'>{$this->lang->words['pc_sent']} {parse date="$msg['msg_date']" format="long"}</span>
 		</h2>
-		<div class='row post'>
+		<div class='post line_spacing' id='msg_{$msg['msg_id']}'>
 			{$msg['msg_post']}
 			{$msg['attachmentHtml']}
 		</div>
-		<div class='post_controls'>
+		<div class='post_controls' id='msg_{$msg['msg_id']}-controls'>
 			<if test="quickReply:|:$topic['_canReply']">
 				<a href="{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{$this->lang->words['pc_reply']}</a>
 			</if>
@@ -243,17 +251,18 @@
 	</div>
 </foreach>
 <div class='controls'>
-	<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a>
-	<if test="canReply:|:$topic['_canReply']">
-		<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a>
-	</if>
-	<a class='button delete' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{$this->lang->words['option__delete']}</a>
-	
+	<div class='buttons'>
+	<!--<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a>-->
+		<if test="canReply:|:$topic['_canReply']">
+			<a class='button' href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a>
+		</if>
+	<!--<a class='button delete' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{$this->lang->words['option__delete']}</a>-->
+	</div>
 	{$topic['_pages']}
 </div>]]></template_content>
       <template_name>showConversation</template_name>
       <template_data><![CDATA[$topic, $replies, $members, $jump=""]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -264,7 +273,7 @@
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>showConversationForArchive</template_name>
       <template_data>$topic, $replies, $members</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -278,12 +287,12 @@
 		$this->settings['_mobile_nav_home'] = true;
 	}
 </php>
+<h2>{$dirname}</h2>
 <div class='controls'><div class="buttons">
 	<a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' class='button' title='{$this->lang->words['go_to_compose']}'>{$this->lang->words['compose_new']}</a>
 	{$pages}
 </div>
 </div>
-<h3>{$dirname}</h3>
 <if test="folderMessages:|:count( $messages )">
 	{parse striping="msg_stripe" classes="row1,row2"}
 	<foreach loop="folderMessages:$messages as $id => $msg">
@@ -299,24 +308,25 @@
 					</if>
 				</if>
 			</div>
-			<if test="folderDrafts:|:$currentFolderID == 'drafts'">
-				<strong><a href="{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;topicID={$msg['mt_id']}" base="public"}" class="title">{$msg['mt_title']}</a></strong>
-			<else />
-				<strong><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}" class="title">{$msg['mt_title']}</a></strong>
-			</if>
-			<br />
-			<span class='subtext'>
-				{$this->lang->words['col_starter']}:
-				<if test="folderStarter:|:$msg['_starterMemberData']['members_display_name']">
-					{$msg['_starterMemberData']['members_display_name']}
-					<!-- SKINNOTE: Add block user back in -->
+			<div class='row_content'>
+				<if test="folderDrafts:|:$currentFolderID == 'drafts'">
+					<strong><a href="{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;topicID={$msg['mt_id']}" base="public"}" class="title">{$msg['mt_title']}</a></strong>
 				<else />
-					<em>{$this->lang->words['deleted_user']}</em>
+					<strong><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}" class="title">{$msg['mt_title']}</a></strong>
 				</if>
-				<if test="folderBannedIndicator:|:!$msg['map_user_banned']">
-					&middot; {parse expression="intval( $msg['mt_replies'] )"} {$this->lang->words['col_replies']}
-				</if>			
-			</span>
+				<br />
+				<span class='subtext'>
+					{$this->lang->words['col_starter']}:
+					<if test="folderStarter:|:$msg['_starterMemberData']['members_display_name']">
+						{$msg['_starterMemberData']['members_display_name']}
+					<else />
+						<em>{$this->lang->words['deleted_user']}</em>
+					</if>
+					<if test="folderBannedIndicator:|:!$msg['map_user_banned']">
+						&middot; {parse expression="intval( $msg['mt_replies'] )"} {$this->lang->words['col_replies']}
+					</if>			
+				</span>
+			</div>
 		</div>
 	</foreach>
 <else />
@@ -324,15 +334,15 @@
 		{$this->lang->words['folder_no_messages_row']}
 	</div>
 </if>
-<div class='controls'>
+<!--<div class='controls'>
 <div class="buttons">
 	<a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' class='button' title='{$this->lang->words['go_to_compose']}'>{$this->lang->words['compose_new']}</a>
 	{$pages}
 </div>
-</div>]]></template_content>
+</div>-->]]></template_content>
       <template_name>showFolder</template_name>
       <template_data>$messages, $dirname, $pages, $currentFolderID, $jumpFolderHTML</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -371,20 +381,8 @@
 				<foreach loop="messages:$messages as $id => $msg">
 					<tr id='{$msg['mt_id']}' class='{parse striping="msg_stripe"}'>
 						<td class='altrow short'>
-						<if test="folderDeleted:|:$msg['mt_is_deleted'] OR $msg['map_user_banned']">
-							{parse replacement="msg_deleted"}
-						<else />
-							<if test="folderUnread:|:$msg['map_has_unread'] == 1">
-								{parse replacement="msg_icon_new"}
-							<else />
-								{parse replacement="msg_icon"}
-							</if>
-						</if>
 						</td>
 						<td>
-							<if test="searchAttachment:|:$msg['mt_hasattach']">
-								{parse replacement="t_attach"}
-							</if>
 							<span class='m_title'>
 								<if test="searchHasUnread:|:$msg['map_has_unread'] == 1">
 									<strong>
@@ -409,7 +407,6 @@
 										<p>({$this->lang->words['pc_and']} {$msg['mt_invited_count']} {$this->lang->words['pc_other']})</p>
 									</if>
 								</if>
-								<!-- SKINNOTE: Add block user back in -->
 							<else />
 								<span class='desc'>{$this->lang->words['deleted_user']}</span>
 							</if>
@@ -431,7 +428,7 @@
 </div>]]></template_content>
       <template_name>showSearchResults</template_name>
       <template_data>$messages, $pages, $error</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -441,7 +438,7 @@
   <templategroup group="skin_mlist">
     <template>
       <template_group>skin_mlist</template_group>
-      <template_content><![CDATA[<div class='master_list'>
+      <template_content><![CDATA[<div class='master_list' id='member_list'>
 	
 	<h2>{$this->lang->words['mlist_header']}</h2>
 	<div class='controls'>
@@ -463,16 +460,16 @@
 		<foreach loop="members:$members as $member">
 			<div class='row touch-row' id="mem-{$member['member_id']}">
 				<div class='icon'>
-					<a class="title" href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$member['pp_mini_photo']}' width='{$member['pp_mini_width']}' height='{$member['pp_mini_height']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
+					<a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$member['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" class='photo' /></a>	
 				</div>
-				<strong><a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></strong>
+				<strong><a class='title' href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></strong>
 				<br />
-				<span class='subtext'>{$this->lang->words['member_posts']}: {parse format_number="$member['posts']"} &middot; {$this->lang->words['member_group']}: {IPSLib::makeNameFormatted( $member['group'], $member['member_group_id'] )}
+				<span class='subtext'>{parse format_number="$member['posts']"} {$this->lang->words['member_posts']} &middot; {$this->lang->words['member_group']}: {IPSMember::makeNameFormatted( $member['group'], $member['member_group_id'] )}
 				 &middot; <a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}'>{parse replacement="find_topics_link"} {$this->lang->words['gbl_find_my_content']}</a></span>
 			</div>
 		</foreach>
 	<else />
-		<div class='row no_message'>
+		<div class='no_messages'>
 			{$this->lang->words['no_results']}
 		</div>
 	</if>
@@ -483,7 +480,7 @@
 </div>]]></template_content>
       <template_name>member_list_show</template_name>
       <template_data><![CDATA[$members, $pages="", $dropdowns=array(), $defaults=array(), $custom_fields=null, $url='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -510,30 +507,24 @@
 		<foreach loop="online:$rows as $session">
 			<tr>
 				<td class='row1'>
-					<img src='{$session['_memberData']['pp_thumb_photo']}' alt="<if test="hasonlinename:|:$session['_memberData']['members_display_name']">{$session['_memberData']['members_display_name']}<else />{$this->lang->words['global_guestname']}</if>{$this->lang->words['users_photo']}" width='{$session['_memberData']['pp_thumb_width']}' height='{$session['_memberData']['pp_thumb_height']}' class='photo' />
+					<img src='{$session['_memberData']['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'], $session['_memberData']['members_display_name'] ? $session['_memberData']['members_display_name'] : $this->lang->words['global_guestname'] )"}" width='{$session['_memberData']['pp_thumb_width']}' height='{$session['_memberData']['pp_thumb_height']}' class='photo' />
 				</td>
 				<td class='{parse striping="online"}'>
 					<if test="username:|:$session['member_name']">
 						<if test="userid:|:$session['member_id']">
-							<a href='{parse url="showuser={$session['member_id']}" template="showuser" seotitle="{$session['seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{IPSLib::makeNameFormatted( $session['member_name'], $session['member_group'] )}</a>{parse template="user_popup" group="global" params="$session['member_id'],$session['seo_name']"}
+							<a href='{parse url="showuser={$session['member_id']}" template="showuser" seotitle="{$session['seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{IPSMember::makeNameFormatted( $session['member_name'], $session['member_group'] )}</a>{parse template="user_popup" group="global" params="$session['member_id'],$session['seo_name']"}
 						<else />
-							{IPSLib::makeNameFormatted( $session['member_name'], $session['member_group'] )}
+							{IPSMember::makeNameFormatted( $session['member_name'], $session['member_group'] )}
 						</if>
 					<else />
 						{$this->lang->words['global_guestname']}
 					</if>
-					<if test="spider:|:$session['is_bot'] AND $this->settings['spider_anon']">
-						<if test="weareadmin:|:$this->memberData['g_access_cp']">
+					<if test="anonymous:|:$session['login_type'] == 1">
+						<if test="viewanon:|:$this->memberData['g_access_cp']">
 							*
 						</if>
-					<else />
-						<if test="anonymous:|:$session['login_type'] == 1">
-							<if test="viewanon:|:!$this->settings['disable_admin_anon'] AND $this->memberData['g_access_cp']">
-								*
-							</if>
-						</if>
 					</if>
-					<if test="showip:|:$this->memberData['g_access_cp'] AND !$this->settings['disable_online_ip']">
+					<if test="showip:|:$this->memberData['g_access_cp']">
 						<span class='ip'>( {$session['ip_address']} )</span>
 					</if>
 				</td>
@@ -617,7 +608,7 @@
 </div>]]></template_content>
       <template_name>showOnlineList</template_name>
       <template_data><![CDATA[$rows, $links="", $defaults=array()]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -647,7 +638,7 @@
 </dd>]]></template_content>
       <template_name>customField__gender</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -667,7 +658,7 @@
 </if>]]></template_content>
       <template_name>customField__generic</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -718,12 +709,23 @@
 </if>]]></template_content>
       <template_name>customFieldGroup__contact</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_profile</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>customizeProfile</template_name>
+      <template_data>$member</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<if test="$this->request['module']=='ajax'">
@@ -754,7 +756,7 @@
 </table>]]></template_content>
       <template_name>dnameWrapper</template_name>
       <template_data><![CDATA[$member_name="",$records=array()]]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -785,7 +787,7 @@
 	</if>]]></template_content>
       <template_name>friendsIframe</template_name>
       <template_data>$member, $friends, $showWrapper=false</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -817,7 +819,7 @@
 		<if test="loopOnPending:|:$this->request['tab'] == 'pending'">
 			<li id='member_id_{$friend['member_id']}' class='general_box clear member_entry {parse striping="memberStripe"}'>
 				<h3 class='bar'><a href='{parse url="showuser={$friend['friends_member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id'],$friend['members_seo_name']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
+				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$friend['members_display_name'])"}" class='photo' /></a>	
 			
 				<dl class='info'>
 					<dt class='clear'>{$this->lang->words['m_member_since']}</dt>
@@ -857,7 +859,7 @@
 		<else />
 			<li id='member_id_{$friend['friends_friend_id']}' class='general_box clear member_entry {parse striping="memberStripe"}'>
 				<h3 class='bar'><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id'],$friend['members_seo_name']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
+				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$friend['members_display_name'])"}" class='photo' /></a>	
 			
 				<dl class='info'>
 					<dt class='clear'>{$this->lang->words['m_member_since']}</dt>
@@ -881,8 +883,8 @@
 					<if test="friendListSendPm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
 						<li class='pm_button' id='pm_xxx_{$friend['friends_friend_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$friend['friends_member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}'>{parse replacement="send_msg"}</a></li>
 					</if>
-					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}&amp;view_by_title=1&amp;search_filter_app[forums]=1" base="public"}'>{parse replacement="find_posts_link"} {$this->lang->words['find_topics']}</a></li>
-					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}<if test="friendListSearchType:|:! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}'>{parse replacement="find_posts_link"} {$this->lang->words['find_posts']}</a></li>
+					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}&amp;view_by_title=1&amp;search_filter_app[forums]=1" base="public"}'>{$this->lang->words['find_topics']}</a></li>
+					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}<if test="friendListSearchType:|:! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}'>{$this->lang->words['find_posts']}</a></li>
 					<if test="friendListBlog:|:$friend['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
 						<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$friend['friends_friend_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
 					</if>
@@ -930,18 +932,29 @@
 </if>]]></template_content>
       <template_name>friendsList</template_name>
       <template_data>$friends, $pages</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_profile</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>photoEditor</template_name>
+      <template_data>$data, $member</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<div class='master_list'>
 	<h2>{parse expression="sprintf( $this->lang->words['their_profile'], $member['members_display_name'] )"}</h2>	
 	<div class='row'>
-		<img class="photo" src='{$member['pp_main_photo']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}"  />
+		<img class="photo" src='{$member['pp_main_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}"  />
 	</div>
 	
 	<h3>{$this->lang->words['my_info']}</h3>
@@ -992,7 +1005,7 @@
 </div>]]></template_content>
       <template_name>profileModern</template_name>
       <template_data><![CDATA[$tabs=array(), $member=array(), $comments="", $friends=array(), $visitors=array(), $default_tab='posts', $default_tab_content='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1036,7 +1049,7 @@
 				<if test="authorspammerinner:|:$member['spamStatus'] === TRUE">
 					<li><a href='#' title='{$this->lang->words['spm_on']}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, false)">{parse replacement="spammer_on"}</a></li>
 				<else />
-					<li><a title='{$this->lang->words['spm_off']}' href='{$this->settings['base_url']}&amp;app=forums&amp;module=moderate&amp;section=moderate&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"}</a></li>
+					<li><a title='{$this->lang->words['spm_off']}' href='{$this->settings['base_url']}app=core&amp;module=modcp&amp;section=editmember&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"}</a></li>
 				</if>
 			</if>
 			<if test="cardFriend:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
@@ -1052,7 +1065,7 @@
 			
 			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}&amp;search_filter_app[forums]=1&amp;view_by_title=1" base="public"}' title='{$this->lang->words['find_topics']}'>{parse replacement="find_topics_link"}</a></li>		
 			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$member['member_id']}<if test="cardFindPostsLink:|:! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}' title='{$this->lang->words['find_posts']}'>{parse replacement="find_posts_link"}</a></li>
-			<if test="cardBlog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
+			<if test="cardBlog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) && $member['has_blog'] != 'recache'">
 				<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
 			</if>
 			<if test="cardGallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
@@ -1078,7 +1091,7 @@
 </div>]]></template_content>
       <template_name>showCard</template_name>
       <template_data>$member, $download=0</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1136,7 +1149,7 @@
 </if>]]></template_content>
       <template_name>showComments</template_name>
       <template_data><![CDATA[$member, $comments=array(), $new_id=0, $return_msg='', $links='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1221,21 +1234,7 @@ function check_form()
 </script>]]></template_content>
       <template_name>showIframeComments</template_name>
       <template_data>$member, $comments, $pages</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<div id="photowrap">
-	<div id="phototitle">{$member['members_display_name']}</div>
-	<div id="photoimg"><img src="{$member['pp_main_photo']}" alt="{$this->lang->words['get_photo']}" width='{$member['pp_main_width']}' height='{$member['pp_main_height']}' /></div>
-</div>]]></template_content>
-      <template_name>showPhoto</template_name>
-      <template_data>$member</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1246,7 +1245,7 @@ function check_form()
       <template_content><![CDATA[<foreach loop="innerLoop:$replies as $reply">
 	<div id='statusReply-{$reply['reply_id']}' class='status_mini_wrap row2'>
 		<div class="status_mini_photo">
-			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$reply['pp_mini_photo']}' width='{$reply['pp_mini_width']}' height='{$reply['pp_mini_height']}' alt="{$reply['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
+			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$reply['pp_mini_photo']}' width='{$reply['pp_mini_width']}' height='{$reply['pp_mini_height']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$reply['members_display_name'])"}" class='photo' /></a>	
 		</div>
 		<div class="status_mini_content">
 			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' style='font-weight:bold'>{$reply['members_display_name']}</a> &middot; <span class='desc'>{$reply['reply_date_formatted']}<if test="canDelete:|:$reply['_canDelete']"> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteReply&amp;status_id={$reply['reply_status_id']}&reply_id={$reply['reply_id']}&amp;k={$this->member->form_hash}" id="statusReplyDelete-{$reply['reply_status_id']}-{$reply['reply_id']}" class="__sDR __dr{$reply['reply_status_id']}-{$reply['reply_id']}">{$this->lang->words['status_delete_link']}</a></if></span>
@@ -1256,7 +1255,7 @@ function check_form()
 </foreach>]]></template_content>
       <template_name>statusReplies</template_name>
       <template_data>$replies=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1266,7 +1265,7 @@ function check_form()
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<foreach loop="outerLoop:$updates as $id => $status">
 <div class="row touch-row clearfix" id="update-{$id}">
-	<img src='{$status['pp_thumb_photo']}' width='{$status['pp_thumb_width']}' height='{$status['pp_thumb_height']}' alt="{$status['members_display_name']}{$this->lang->words['users_photo']}" class='photo' />
+	<img src='{$status['pp_thumb_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$status['members_display_name'])"}" class='photo' />
 	<p>
 		<a class="title" href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$status['members_display_name']}</a><br />
 		{$status['status_content']}
@@ -1275,7 +1274,7 @@ function check_form()
 </foreach>]]></template_content>
       <template_name>statusUpdates</template_name>
       <template_data>$updates=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1285,19 +1284,23 @@ function check_form()
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[{parse js_module="status"}
 {parse striping="recent_status" classes="row1,row2 altrow"}
+<h2>{$this->lang->words['status_updates__overview']}</h2>
 <div class="master_list status_updates">
-<div class="controls"><div class="buttons">
-<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}' class="button">{$this->lang->words['allfriendstab']}</a>
-<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=friends" seotitle="true" template="members_status_friends" base="public"}' class="button">{$this->lang->words['m_friends_list']}</a>
-</div>
-</div>
+<if test="$this->memberData['member_id'] AND $this->settings['friends_enabled']">
+	<div class="controls">
+		<div class="buttons">
+			<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}' class="button">{$this->lang->words['status__all_updates']}</a>
+			<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=friends" seotitle="true" template="members_status_friends" base="public"}' class="button">{$this->lang->words['status__myfriends']}</a>
+		</div>
+	</div>
+</if>
 <div id='board_index' class='clearfix'>
 	<div id='status_standalone_page'>
 		<div id="status_wrapper">
 			<if test="hasUpdates:|:count( $updates )">
 				{parse template="statusUpdates" group="profile" params="$updates"}
 			<else />
-				<p>{$this->lang->words['status_updates_none']}</p>
+				<p class='no_messages'>{$this->lang->words['status_updates_none']}</p>
 			</if>
 		</div>
 	</div>
@@ -1305,7 +1308,7 @@ function check_form()
 </div>]]></template_content>
       <template_name>statusUpdatesPage</template_name>
       <template_data>$updates=array(), $actions</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1327,12 +1330,23 @@ function check_form()
 </div>]]></template_content>
       <template_name>tabAboutMe</template_name>
       <template_data>$member=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_profile</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>tabFriends</template_name>
+      <template_data>$friends=array(), $member=array()</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<h3 class='bar'>{$this->lang->words['tab_message_h']}</h3>
@@ -1341,7 +1355,7 @@ function check_form()
 </div>]]></template_content>
       <template_name>tabNoContent</template_name>
       <template_data>$langkey</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1357,7 +1371,7 @@ function check_form()
 </div>]]></template_content>
       <template_name>tabPosts</template_name>
       <template_data>$content</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1380,7 +1394,7 @@ function check_form()
 </li>]]></template_content>
       <template_name>tabSingleColumn</template_name>
       <template_data><![CDATA[$row=array(), $read_more_link='', $url='', $title='']]></template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1426,7 +1440,7 @@ function check_form()
 </div>]]></template_content>
       <template_name>tabStatusUpdates</template_name>
       <template_data>$updates=array(), $actions, $member=array()</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1442,7 +1456,7 @@ function check_form()
 </div>]]></template_content>
       <template_name>tabTopics</template_name>
       <template_data>$content</template_data>
-      <template_updated>1288018126</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1475,7 +1489,6 @@ function check_form()
 				<th scope='col' style='width: 7%'>{$this->lang->words['attach_hsize']}</th>
 				<th scope='col' style='width: 27%'>{$this->lang->words['attach_topic']}</th>
 				<th scope='col' class='short' style='width: 3%'><input class='input_check' id="checkAllAttachments" type="checkbox" value="{$this->lang->words['check_all']}" /></th>
-				<!-- SKINNOTE: Convert to new JS -->
 			</tr>
 			<if test="hasAttachments:|:count($attachments)">
 				{parse striping="attach" classes="row1,row2"}
@@ -1524,24 +1537,7 @@ function check_form()
 </script>]]></template_content>
       <template_name>coreAttachments</template_name>
       <template_data><![CDATA[$info="",$pages="",$attachments]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='{parse striping="row1"}'>
-	<h3>{$this->lang->words['m_notes']}</h3>
-	<div class='message unspecified'>{$this->lang->words['note_pad_empty']}</div>
-	<div>
-		<textarea style='width:100%;' rows='30' name='Post'>{$content}</textarea>
-	</div>
-</fieldset>]]></template_content>
-      <template_name>coreNotesForm</template_name>
-      <template_data><![CDATA[$content='']]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1575,7 +1571,7 @@ function check_form()
 </fieldset>]]></template_content>
       <template_name>displayNameForm</template_name>
       <template_data><![CDATA[$form=array(),$error="",$okmessage="", $isFB=false]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1624,12 +1620,23 @@ var msg = "$_message";
 </if>]]></template_content>
       <template_name>emailChangeForm</template_name>
       <template_data>$txt, $_message, $captchaHTML, $isFB=false</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>mobile</template_master_key>
     </template>
+    <template>
+      <template_group>skin_ucp</template_group>
+      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_name>emailPasswordChangeForm</template_name>
+      <template_data>$txt, $_message, $isFB=false</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_ucp</template_group>
       <template_content><![CDATA[<select name="$name" class='input_select'>
@@ -1637,7 +1644,7 @@ var msg = "$_message";
 </select>]]></template_content>
       <template_name>field_dropdown</template_name>
       <template_data><![CDATA[$name="",$options=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1652,7 +1659,7 @@ var msg = "$_message";
 </li>]]></template_content>
       <template_name>field_entry</template_name>
       <template_data><![CDATA[$title="",$desc="",$content="",$id=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1663,7 +1670,7 @@ var msg = "$_message";
       <template_content><![CDATA[<textarea cols="80" rows="5" wrap="soft" name="$name" class='input_text'>$value</textarea>]]></template_content>
       <template_name>field_textarea</template_name>
       <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1674,370 +1681,7 @@ var msg = "$_message";
       <template_content><![CDATA[<input type="text" size="50" name="$name" value='$value' class='input_text' />]]></template_content>
       <template_name>field_textinput</template_name>
       <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['settings_display']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewSignatures' id='view_sigs' value='1' class='input_check'<if test="viewSigs:|:$this->memberData['view_sigs']"> checked="checked"</if>/> <label for='view_sigs'>{$this->lang->words['settings_viewsig']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewImages' id='view_img' value='1' class='input_check'<if test="ViewImgs:|:$this->memberData['view_img']"> checked="checked"</if>/> <label for='view_img'>{$this->lang->words['settings_viewimg']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewAvatars' id='view_avatar' value='1' class='input_check'<if test="viewAvs:|:$this->memberData['view_avs']"> checked="checked"</if>/> <label for='view_avatar'>{$this->lang->words['settings_viewava']}</label>
-		</li>
-		<li class='field'>
-			<label for='post_per_page' />{$this->lang->words['pp_number_posts']}</label>
-			<select name="postpage" class='input_select' id='posts_per_page'>
-				<option value='-1'>{$this->lang->words['pp_use_default']}</option>
-				<foreach loop="viewposts_options:$data['viewPostsForm'] as $r">
-					<option value='{$r[0]}'<if test="pppSelected:|:$r[0] == $data['postsPerPage']"> selected='selected'</if>>{$r[1]}</option>
-				</foreach>
-			</select>
-		</li>
-		<li class='field'>
-			<label for='topics_per_page' />{$this->lang->words['pp_number_topics']}</label>
-			<select name="topicpage" class='input_select' id='topics_per_page'>
-				<option value='-1'>{$this->lang->words['pp_use_default']}</option>
-				<foreach loop="viewtopics_options:$data['viewTopicsForm'] as $r">
-					<option value='{$r[0]}'<if test="tppSelected:|:$r[0] == $data['topicsPerPage']"> selected='selected'</if>>{$r[1]}</option>
-				</foreach>			
-			</select>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['board_prefs']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type='checkbox' class='input_check' id='send_full_msg' name='send_full_msg' value='1' {$emailData['email_full']} /> <label for='send_full_msg' />{$this->lang->words['send_full_msg']}</label><br />
-			<span class='desc'>{$this->lang->words['send_full_msg_desc']}</span>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_check' type="checkbox" id='auto_track' name="auto_track" value="1" {$emailData['auto_track']} /> <label for='auto_track' />{$this->lang->words['auto_track']}</label>
-			<ul>
-				<li class='field'>
-					<label for='track_choice'>{$this->lang->words['auto_track_type']}</label>
-					<select name="trackchoice" id='track_choice' class='input_select'>
-						<option value="none" {$emailData['trackOption']['none']}>{$this->lang->words['subs_none_title']}</option>
-						<option value="immediate" {$emailData['trackOption']['immediate']}>{$this->lang->words['subs_immediate']}</option>
-						<option value="delayed" {$emailData['trackOption']['delayed']}>{$this->lang->words['subs_delayed']}</option>
-						<option value="daily" {$emailData['trackOption']['daily']}>{$this->lang->words['subs_daily']}</option>
-						<option value="weekly" {$emailData['trackOption']['weekly']}>{$this->lang->words['subs_weekly']}</option>
-					</select>
-				</li>
-			</ul>
-		</li>
-		<li class='field'>
-			<label for='topic_display_mode'>{$this->lang->words['ucp_topic_display_mode']}</label> 
-			<select name="topic_display_mode" id='topic_display_mode' class='input_select'>
-				<option value="linear"<if test="linearView:|:IPSCookie::get('topicmode') == 'linear' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'linear')"> selected</if>>{$this->lang->words['ucp_standard']}</option>
-				<option value="linearplus"<if test="linearPlusView:|:IPSCookie::get('topicmode') == 'linearplus' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'linearplus')"> selected</if>>{$this->lang->words['ucp_linearplus']}</option>
-				<option value="threaded"<if test="threadedView:|:IPSCookie::get('topicmode') == 'threaded' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'threaded')"> selected</if>>{$this->lang->words['ucp_outline']}</option>				
-			</select>
-			<span class='desc'>
-				<strong>{$this->lang->words['ucp_standard']}:</strong> {$this->lang->words['ucp_standard_explain']}<br />
-				<strong>{$this->lang->words['ucp_linearplus']}:</strong> {$this->lang->words['ucp_linearplus_explain']}<br />
-				<strong>{$this->lang->words['ucp_outline']}:</strong> {$this->lang->words['ucp_outline_explain']}
-			</span>
-		</li>		
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>forumPrefsForm</template_name>
-      <template_data>$emailData, $data</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<php>
-	$_count = 0;
-</php>
-<div class='clear'>
-<foreach loop="images:$images as $image">
-	<php>
-		$id = ucfirst( preg_replace( "#^(.*)\.(.+?)$#", "$1", $image ) );
-	</php>
-	<if test="avatarsTabulation:|:$_count % 5 == 0">
-		</div>
-		<div class='clear'>
-	</if>
-	<div class='avatar_gallery'>
-		<img src='{$this->settings['public_dir']}style_avatars/<if test="avatarSubdir:|:$dir != '0'">{$dir}/</if>{$image}' alt='{$this->lang->words['avatar']}' /><br />
-		<input type='radio' value='{$image}' name='avatar_image' id='{$dir}_{$id}' /> <label for='{$dir}_{$id}'>{$id}</label>
-	</div>
-	<if test="avatarCountPlusPlus:|:$_count++"></if>
-</foreach>
-</div>]]></template_content>
-      <template_name>forumsInlineAvatarImages</template_name>
-      <template_data>$images=array(), $dir</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<php>$this->hasOpenID = false;</php>
-<foreach loop="loginmethods:$this->cache->getCache('login_methods') as $method">
-	<if test="hasOpenid:|:$method['login_folder_name'] == 'openid'">
-		<if test="setHasOpenid:|:$this->hasOpenID = true"></if>
-	</if>
-</foreach>
-<if test="weDoHaveOpenid:|:$this->hasOpenID">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['identity_url_h3']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='identity_url'>{$this->lang->words['identity_url']}</label><input class='input_text' size='30' type="text" name="identity_url" id="identity_url" value="{$this->memberData['identity_url']}" /> <br />
-				<span class='desc'>{$this->lang->words['identity_url_desc']}</span>
-			</li>
-		</ul>
-	</fieldset>
-</if>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['privacy_settings']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input class='input_check' type="checkbox" name="hide_email" id="hide_email" value="1"<if test="hidingEmail:|:$this->memberData['hide_email']"> checked="checked"</if>/> <label for='hide_email'>{$this->lang->words['hide_email']}</label><br />
-			<span class='desc'>{$this->lang->words['hide_email_desc']}</span>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' class='input_check' id='admin_updates' name='admin_send' value='1'<if test="allowAdminMails:|:$this->memberData['allow_admin_mails']"> checked="checked"</if>/> <label for='admin_updates'>{$this->lang->words['admin_send']}</label><br />
-			<span class='desc'>{$this->lang->words['admin_send_desc']} $time</span>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['settings_time']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='timezone'>{$this->lang->words['ucp_timzeone']}</label>
-			<select name='timeZone' id='timezone' class='input_select'>
-			<foreach loop="timezones:$times as $off => $words">
-				<option value='{$off}' <if test="isOurTimezone:|:$off == $this->memberData['time_offset']"> selected="selected"</if>>{$words}</option>
-			</foreach>
-			</select>
-			<span class='desc'>{$this->lang->words['settings_time_txt2']} {parse date="" format="LONG" relative="false"}</span>
-		</li>
-		<li class='field checkbox'>
-			<if test="dstError:|:$this->request['dsterror'] == 1">
-				{$this->lang->words['dst_error']}
-			</if>
-			<input type='checkbox' class='input_check' id='dst' name="dstCheck" onclick='toggle_dst()' value="1"<if test="doAutoDst:|:$this->memberData['members_auto_dst']"> checked="checked"</if>/> <label for='dst'>{$this->lang->words['dst_correction_title']}</label><br />
-			<span class='desc'>{$this->lang->words['dst_auto2']}</span>
-		</li>
-		<li class='field checkbox' id='dst-manual'>
-			<input type='checkbox' class='input_check' id='dstManual' name="dstOption" value="1"<if test="doManualDst:|:$this->memberData['dst_in_use']"> checked="checked"</if>/> <label for='dstManual'>{$this->lang->words['ucp_dst_now']}</label><br />
-			<span class='desc'>{$this->lang->words['ucp_dst_effect']}</span>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['ucp_op_pm_title']}</h3>
-	<ul>
-		<if test="hasPm:|:$this->memberData['members_disable_pm'] != 2">
-		<li class='field checkbox'>
-			<input type='checkbox' name='disableMessenger' class='input_check' id='disable_msg' value='1'<if test="disablePm:|:$this->memberData['members_disable_pm']"> checked="checked"</if>/> <label for='disable_msg'>{$this->lang->words['ucp_op_pm']}</label><br />
-			<span class='desc'>{$this->lang->words['ucp_op_pm_desc']}</span>
-		</li>
-		</if>
-		<li class='field checkbox'>
-			<input type='checkbox' class='input_check' id='email_notify' name='pm_reminder' value='1'<if test="emailPm:|:$this->memberData['email_pm']"> checked="checked"</if>/> <label for='email_notify'>{$this->lang->words['pm_reminder']}</label><br />
-			<span class='desc'>{$this->lang->words['pm_reminder_desc']}</span>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' name='showPMPopUp' id='board_notify' class='input_check' value='1'<if test="pmPopup:|:$this->memberData['view_pop']"> checked="checked"</if>/> <label for='board_notify'>{$this->lang->words['settings_dopopup']}</label><br />
-			<span class='desc'>{$this->lang->words['settings_dopopup_desc']}</span>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='row2 '>
-	<h3>{$this->lang->words['ucp_title_posting']}</h3>
-	<ul>
-		<if test="allowRte:|:$this->settings['posting_allow_rte'] == 1">
-			<li class='field checkbox'>
-				<if test="!$this->memberData['_canUseRTE']">
-					<div class='message error usercp'>{$this->lang->words['your_browser_norte']}</div>
-				</if>
-				<input type='checkbox' class='input_check' id='editor_type' name='editorChoice' value='1' <if test="useRte:|:$this->memberData['members_editor_choice'] == 'rte'"> checked="checked"</if>/> <label for='editor_type'>{$this->lang->words['enable_rte']}</label>
-				<br /><span class='desc'>{$this->lang->words['rte_text']}</span>
-			</li>
-		</if>
-		
-		<if test="allowFlash:|:$this->settings['uploadFormType']">
-			<!-- Fancy uploader is available, so show user option... -->
-			<li class='field checkbox'>
-				<input type='checkbox' class='input_check' id='member_uploader' name='member_uploader' value='1' <if test="useFlash:|:$this->memberData['member_uploader'] == 'flash'"> checked="checked"</if>/> <label for='member_uploader'>{$this->lang->words['enable_flash']}</label><br />
-				<span class='desc'>{$this->lang->words['flash_text']}</span>
-			</li>
-		</if>
-	</ul>
-</fieldset>
-<fieldset class='row2 '>
-	<h3>{$this->lang->words['ucp_title_search']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='timezone'>{$this->lang->words['ucp_vnc_type']}</label>
-			<select name='bw_vnc_type' id='bw_vnc_type' class='input_select'>
-				<option value='0' <if test="!$this->memberData['bw_vnc_type']">selected='selected'</if>>{$this->lang->words['ucp_vnc_type_0']}</option>
-				<option value='1' <if test="$this->memberData['bw_vnc_type']">selected='selected'</if>>{$this->lang->words['ucp_vnc_type_1']}</option>
-			</select>
-		</li>
-		<li class='field'>
-			<label for='timezone'>{$this->lang->words['ucp_forum_search_display']}</label>
-			<select name='bw_forum_result_type' id='ucp_vnc_type' class='input_select'>
-				<option value='0' <if test="!$this->memberData['bw_forum_result_type']">selected='selected'</if>>{$this->lang->words['ucp_forum_search_display_0']}</option>
-				<option value='1' <if test="$this->memberData['bw_forum_result_type']">selected='selected'</if>>{$this->lang->words['ucp_forum_search_display_1']}</option>
-			</select>
-		</li>
-	</ul>
-</fieldset>
-<script type="text/javascript">
-//<!#^#|CDATA|
-function toggle_dst()
-{
-	if ( $( 'dst' ).checked )
-	{
-		$( 'dst-manual' ).style.display = 'none';
-	}
-	else
-	{
-		$( 'dst-manual' ).style.display = 'block';
-	}
-}
-toggle_dst();
-//|#^#]>
-</script>]]></template_content>
-      <template_name>generalSettingsForm</template_name>
-      <template_data>$times</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<p class='message unspecific'>{$msg}</p>]]></template_content>
-      <template_name>inlineModIPMessage</template_name>
-      <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likesList</template_name>
-      <template_data><![CDATA[$likes, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<script type="text/javascript">
-var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_avatars/';
-</script>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['av_settings']}</h3>
-	<p class='message unspecific'>
-		<if test="avatarUrl:|:$this->settings['avatar_url']">
-			{parse expression="sprintf( $this->lang->words['av_text_url'], $this->settings['maxWidth'], $this->settings['maxHeight'] )"}
-			<br />
-		</if>
-		<if test="avatarUploaded:|:$data['member']['g_avatar_upload']">
-			{parse expression="sprintf( $this->lang->words['av_text_upload'], $this->settings['avup_size_max'] )"}
-		</if>
-		<br />{$this->lang->words['av_allowed_files']}
-	</p>
-</fieldset>
-<if test="avatarGallery:|:$data['member']['avatar_location'] != "" and $data['member']['avatar_location'] != 'noavatar'">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['av_current']}</h3>
-		<div align='center'>
-			<p>{$data['current_avatar_image']}<br />{$data['current_avatar_type']} {$data['current_avatar_dims']}</p>
-			<p><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=removeavatar&amp;do=remove" base="public"}'>{$this->lang->words['ucp_remove_avatar']}</a></p>
-		</div>
-	</fieldset>
-</if>
-<if test="hasAvatarUrl:|:$this->settings['avatar_url'] OR $data['member']['g_avatar_upload']">
-	<fieldset class='row1'>
-		<h3>{$this->lang->words['avatar_url_title']}</h3>
-		<if test="hasAvatarNotGallery:|:$data['member']['g_avatar_upload'] || $this->settings['avatar_url'] || $this->settings['allow_gravatars']">
-			<ul>
-				<if test="avatarWasUploaded:|:$data['member']['g_avatar_upload']">
-					<li class='field'>
-						<label for='upload_avatar'>{$this->lang->words['av_upload']}</label>
-						<input type="file" size="30" name="upload_avatar" id="upload_avatar" />
-					</li>
-				</if>
-				<if test="avatarWasLinked:|:$this->settings['avatar_url']">
-					<li class='field'>
-						<label for='avatar_url'>{$this->lang->words['av_url']}</label>
-						<input type="text" size="40" maxlength="80" name="avatar_url" id="avatar_url" value="{$data['current_url_avatar']}" />
-					</li>
-				</if>
-				<if test="allowGravatars:|:$this->settings['allow_gravatars']">
-					<li class='field'>
-						<label for='gravatar_email'> <strong><em>-{$this->lang->words['or']}-</em></strong> {$this->lang->words['ucp_gravatar_enter_email']}</label>
-						<input type="text" size="40" maxlength="80" name="gravatar_email" id="gravatar_email" value="<if test="hasGravatar:|:$data['current_avatar_type'] == 'Gravatar'">{$data['member']['avatar_location']}</if>" />
-					</li>
-				</if>
-			</ul>
-		</if>
-		<if test="noResizeAvatar:|:! $this->settings['disable_ipbsize']">
-			<p><strong>{$this->lang->words['av_autosize']}</strong><br />({$this->lang->words['av_as_desc']})</p>
-		<else />
-			<ul>
-				<li class='field'>
-					{$this->lang->words['width']}
-					<input type="text" size="3" name="man_width" />
-				</li>
-				<li class='field'>
-					{$this->lang->words['height']}
-					<input type="text" size="3" name="man_height" />
-				</li>
-			</ul>
-		</if>
-	</fieldset>
-</if>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['avatar_pre_title']}</h3>
-	<ul>
-		<li>
-			<label for="avatarCategory">{$this->lang->words['av_go_gal']}: </label>
-			<select name='avatar_gallery' id='avatarCategory' class='input_select'>
-				<option value='none' selected="selected">&lt; {$this->lang->words['ucp_select_category']} &gt;</option>
-				<foreach loop="avatars:$data['avatar_categories'] as $id => $name">
-					<option value="{$name[0]}">{$name[1]}</option>
-				</foreach>
-			</select>
-			<div style='display:none;' id='avatarImageContainer'></div>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>memberAvatarForm</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2066,7 +1710,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 {parse template="include_highlighter" group="global" params="1"}]]></template_content>
       <template_name>membersAboutMeForm</template_name>
       <template_data><![CDATA[$preview_about_me="",$editor_html=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2111,9 +1755,6 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 					<li class='field checkbox'>
 						<input class='input_check' type='checkbox' value='1' name='fbc_s_pic' value='1' <if test="fbSyncPic:|:$this->memberData['fbc_s_pic'] > 0">checked='checked'</if> id='fbc_s_pic' /><label for='fbc_s_pic'>{$this->lang->words['fb_sync_photo']}</label>
 					</li>
-					<li class='field checkbox'>
-						<input class='input_check' type='checkbox' value='1' name='fbc_s_avatar' value='1' <if test="fbSyncAvatar:|:$this->memberData['fbc_s_avatar'] > 0">checked='checked'</if> id='fbc_s_avatar' /><label for='fbc_s_avatar'>{$this->lang->words['fb_sync_avatar']}</label>
-					</li>
 <if test="canUpdateStatus:|:$this->memberData['can_updated_status']">
 					<li class='field checkbox'>
 						<input class='input_check' type='checkbox' value='1' name='fbc_s_status' value='1' <if test="fbSyncStatus:|:$this->memberData['fbc_s_status'] > 0">checked='checked'</if> id='fbc_s_status' /><label for='fbc_s_status'>{$this->lang->words['fb_sync_status']}</label>
@@ -2156,7 +1797,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 				
 				FB_RequireFeatures(["XFBML"], function()
 				{
-					FB.init("{$this->settings['fbc_api_id']}", "{$this->settings['fbc_xdlocation']}" );
+					FB.init("{$this->settings['fbc_appid']}", "{$this->settings['fbc_xdlocation']}" );
 					FB.Facebook.get_sessionState().waitUntilReady(function()
 					{
 						FB.Connect.ifUserConnected( ipb.facebook.usercp_loadUser );
@@ -2172,7 +1813,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 </if>]]></template_content>
       <template_name>membersFacebookConnect</template_name>
       <template_data>$fbuid, $fbUserData, $linkedMemberData</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2253,202 +1894,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 </script>]]></template_content>
       <template_name>membersIgnoredUsersForm</template_name>
       <template_data>$members</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form id="userCPForm" action="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_member&amp;do=custom" base="public"}" method="post">
-<input type="hidden" name="securekey" value="{$this->member->form_hash}" />
-<fieldset class="row1">
-	<h3>{$this->lang->words['cp_edit_user']}</h3>
-	<if test="inlineFindUserError:|:$inlineMsg">
-		<p class='message unspecific'>
-			<strong>{$this->lang->words['ipm_title']}</strong>
-			<br />
-			$inlineMsg
-		</p>
-	</if>
-	<ul>
-		<li class="field">
-			<label for='name'>{$this->lang->words['cp_find_user']}</label>
-			<input type="text" class='input_text' size="40" name="name" id='name' value="{$this->request['name']}" />
-			<input type="submit" class='input_submit' value="{$this->lang->words['cp_find_submit']}" />
-		</li>
-	</ul>
-</fieldset>
-</form>]]></template_content>
-      <template_name>membersModFindUser</template_name>
-      <template_data><![CDATA[$inlineMsg=""]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form id="userCPForm" action="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom" base="public"}" method="post">
-<input type="hidden" name="securekey" value="{$this->member->form_hash}" />
-<fieldset class="row1">
-	<h3>{$this->lang->words['menu_ipsearch']}</h3>
-	<if test="modIpIe:|:$inlineMsg">
-		{$inlineMsg}
-	</if>
-	<br />
-	
-	<p class='message unspecific'>
-		{$this->lang->words['ip_desc_text']}
-	</p>
-	<ul>
-		<li class='field'>
-			{$this->lang->words['ip_enter']}
-			<input type="text" size="20" maxlength="24" class='input_text' name="ip" value="{$ip}" />
-			<select name="iptool" class='input_select'>
-				<option value="resolve">{$this->lang->words['ip_resolve']}</option>
-				<option value="posts">{$this->lang->words['ip_posts']}</option>
-				<option value="members">{$this->lang->words['ip_members']}</option>
-			</select>
-			<input type="submit" class='input_submit' value="{$this->lang->words['ip_submit']}" />
-		</li>
-	</ul>
-	<p class='desc'>
-		{$this->lang->words['ip_warn_text']}
-	</p>
-</fieldset>
-</form>]]></template_content>
-      <template_name>membersModIPForm</template_name>
-      <template_data><![CDATA[$ip="", $inlineMsg='']]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<div class='topic_controls'>
-	{$pages}
-</div>
-<br />
-<table class='ipb_table'>
-	<tr class='header'>
-		<th style='width: 20%'>{$this->lang->words['ipm_name']}</th>
-		<th style='width: 20%'>{$this->lang->words['ipm_ip']}</th>
-		<th style='width: 10%' class='short'>{$this->lang->words['ipm_posts']}</th>
-		<th style='width: 15%' class='short'>{$this->lang->words['ipm_reg']}</th>
-		<th style='width: 15%'>{$this->lang->words['ipm_group']}</th>
-		<th style='width: 20%'>{$this->lang->words['ipm_options']}</th>
-	</tr>
-	<if test="modIPMembers:|:is_array( $members ) AND count( $members )">
-		{parse striping="members" classes="row1,row2"}
-		<foreach loop="ipMembers:$members as $id => $row">
-			<tr class='{parse striping="members"}'>
-				<td><a href="{parse url="showuser={$row['member_id']}" base="public" template="showuser" seotitle="{$row['members_seo_name']}"}">{$row['members_display_name']}</a></td>
-				<td class='altrow'>{$row['ip_address']}</td>
-				<td class='short'>{$row['posts']}</td>
-				<td class="altrow short">{$row['joined']}</td>
-				<td>{$row['groupname']}</td>
-				<td class="altrow short">
-					<a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=editmember&amp;mid={$row['member_id']}&amp;auth_key={$this->member->form_hash}" base="public"}" title="Edit this Member">{$this->lang->words['ipm_edit']}</a>
-				</td>
-			</tr>
-		</foreach>
-	</if>
-</table>
-<br />
-<div class='topic_controls'>
-	{$pages}
-</div>]]></template_content>
-      <template_name>membersModIPFormMembers</template_name>
-      <template_data><![CDATA[$pages="",$members]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<p class='message'>
-	{$this->lang->words['ipp_found']} {$count}
-</p>
-<br />
-<div class='topic_controls'>
-	{$pageLinks}
-</div>
-<br />
-<if test="modFindMemberPosts:|:count($results)">
-	{parse striping="posts" classes="row1,row2"}
-	<foreach loop="ipPosts:$results as $result">
-		<div class='post_block ucp no_sidebar {parse striping="posts"}'>
-			<h3 class=''><a href='{parse url="showtopic={$result['topic_id']}&amp;findpost={$result['pid']}" template="showtopic" seotitle="{$result['seo_title']}" base="public"}' title='View post'>{$result['members_display_name']} | {parse date="$result['post_date']" format="long"}</a></h3>
-			<div class='post_body'>
-				<div class='post'>{$result['post']}</div>
-			</div>
-		</div>
-		<hr />
-	</foreach>
-</if>
-<br />
-<div class='topic_controls'>
-	{$pageLinks}
-</div>]]></template_content>
-      <template_name>membersModIPFormPosts</template_name>
-      <template_data><![CDATA[$count=0, $pageLinks='', $results]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
-	<h3>{$this->lang->words['pph_title']}</h3>
-	<p class='message unspecific'>
-		{$this->lang->words['pph_desc']}
-		<br />{$this->lang->words['pph_max']}
-	</p>
-</fieldset>
-<if test="hasPhoto:|:$this->memberData['_has_photo']">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['pph_current']}</h3>
-		<div align='center'>
-			<p>$cur_photo<br />$show_size</p>
-			<p><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=removephoto&amp;do=remove" base="public"}'>{$this->lang->words['ucp_remove_photo']}</a></p>			
-		</div>		
-	</fieldset>
-</if>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['pph_change']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='upload_photo'>{$this->lang->words['pph_upload']}</label>
-			<input type="hidden" name="MAX_FILE_SIZE" value="{parse expression="$p_max*1024"}" /><input type="file" name="upload_photo" id='upload_photo' value="" size="40" />
-			<if test="noResizePhoto:|:! $this->settings['disable_ipbsize']">
-				<p><strong>{$this->lang->words['pph_autosize']}</strong><br />({$this->lang->words['pph_as_desc']})</p>
-			<else />
-				<ul>
-					<li class='field'>
-						{$this->lang->words['width']}
-						<input type="text" size="3" name="man_width" />
-					</li>
-					<li class='field'>
-						{$this->lang->words['height']}
-						<input type="text" size="3" name="man_height" />
-					</li>
-				</ul>
-			</if>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>membersPhotoForm</template_name>
-      <template_data><![CDATA[$cur_photo="",$show_size="",$p_max=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2459,7 +1905,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>membersProfileCustomize</template_name>
       <template_data>$options, $input, $errors</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2527,14 +1973,8 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 <fieldset class='{parse striping="usercp"}'>
 	<h3>{$this->lang->words['profile_information']}</h3>
 	<ul>
-		<li class='field'>
-			<label for='pp_latest_visitors'>{$this->lang->words['ucp_show_x_latest']}</label>
-			<select name='pp_setting_count_visitors' id='pp_latest_visitors' class='input_select'>
-				<option value='0'<if test="noVisitors:|:!$this->memberData['pp_setting_count_visitors']"> selected</if>>0</option>
-				<option value='3'<if test="3Visitors:|:$this->memberData['pp_setting_count_visitors'] == 3"> selected</if>>3</option>
-				<option value='5'<if test="5Visitors:|:$this->memberData['pp_setting_count_visitors'] == 5"> selected</if>>5</option>
-				<option value='10'<if test="10Visitors:|:$this->memberData['pp_setting_count_visitors'] == 10"> selected</if>>10</option>
-			</select>
+		<li class='field checkbox'>
+			<input class='input_check' type='checkbox' value='1' name='pp_setting_count_visitors' value='1' <if test="showFriends:|:$this->memberData['pp_setting_count_visitors'] > 0">checked='checked'</if> id='pp_latest_visitors' /><label for='pp_latest_visitors'>{$this->lang->words['ucp_show_x_latest']}</label>
 		</li>
 		<if test="changeMemberTitle:|:($this->settings['post_titlechange']) && ($this->memberData['posts'] > $this->settings['post_titlechange'])">
 			<li class='field'>
@@ -2567,7 +2007,6 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 		</if>
 	</ul>
 </fieldset>
-
 <if test="requiredCfields:|:$required_output">
 	<fieldset class='{parse striping="usercp"}'>
 		<h3>{$this->lang->words['ucp_required_info']}</h3>
@@ -2586,7 +2025,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 </if>]]></template_content>
       <template_name>membersProfileForm</template_name>
       <template_data><![CDATA[$personal_statement='',$required_output='',$optional_output='',$day='',$mon='',$year='']]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2648,7 +2087,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 {parse template="include_highlighter" group="global" params="1"}]]></template_content>
       <template_name>membersSignatureForm</template_name>
       <template_data><![CDATA[$preview_sig="",$editor_html="",$sig_restrictions=array()]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2665,7 +2104,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 </fieldset>]]></template_content>
       <template_name>membersSignatureFormError</template_name>
       <template_data>$form</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2676,161 +2115,18 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>membersTwitterConnect</template_name>
       <template_data>$isConnected, $twitterUser=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
       <template_master_key>root</template_master_key>
     </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modSaveAnnouncement&amp;do=saveIt&amp;announce_id={$announce['announce_id']}&amp;type={$type}" base="public"}" method="post" name="REPLIER" id='postingform' onsubmit='return ValidateForm()'>
-<fieldset class='row1'>
-	<h3>{$button}</h3>
-	<if test="announceMessage:|:$msg != """>
-		<br /><p class='message unspecific'>{$msg}</p>
-	</if>
-	<ul>
-		<li class='field'>
-			<label for='announce_title'>{$this->lang->words['announce_form_title']}</label>
-			<input class='input_text' type="text" size="30" name="announce_title" id='announce_title' value="{$announce['announce_title']}" tabindex="1" />
-		</li>
-		<li class='field'>
-			<label for='announce_start'>{$this->lang->words['announce_form_start']}</label>
-			<span class="desc">{$this->lang->words['announce_form_startdesc']}</span>
-			<input type="text" size="10" name="announce_start" id='announce_start' value="{$announce['announce_start']}" tabindex="2" />
-		</li>
-		<li class='field'>
-			<label for='announce_end'>{$this->lang->words['announce_form_end']}</label>
-			<span class="desc">{$this->lang->words['announce_form_enddesc']}</span>
-			<input type="text" size="10" name="announce_end" id='announce_end' value="{$announce['announce_end']}" tabindex="2" />
-		</li>
-		<li class='field'>
-			<label for='announce_forum'>{$this->lang->words['announce_form_forums']}</label>
-			<span class="desc">{$this->lang->words['announce_form_forums2']}</span>
-			<select class="input_select" multiple="multiple" size="10" id='announce_forum' name="announce_forum[]" tabindex="4">{$forum_html}</select>
-		</li>
-		<li class='field'>
-			{$editor_html}
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['announce_form_options']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_active" id='announce_active' value="1" {$announce['announce_active_checked']} />
-			<label for='announce_active'>{$this->lang->words['announce_form_enable']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_html_enabled" id='announce_html_enabled' value="1" {$announce['html_checkbox']} />
-			<label for='announce_html_enabled'>{$this->lang->words['announce_use_html']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_nlbr_enabled" id='announce_nlbr_enabled' value="1" {$announce['nlbr_checkbox']} />
-			<label for='announce_nlbr_enabled'>{$this->lang->words['announce_use_nlbr']}</label>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='submit'>
-	<input type="submit" value="{$button}" class="input_submit alt" tabindex="7" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
-</fieldset>
-</form>]]></template_content>
-      <template_name>modAnnounceForm</template_name>
-      <template_data><![CDATA[$announce="",$button="",$forum_html="",$type="",$editor_html="",$msg=""]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modUpdateAnnouncements&amp;do=saveIt" base="public"}" id="mutliact" method="post">
-<fieldset class='row1'>
-	<h3 class='maintitle'>{$this->lang->words['announce_current']}</h3>
-	<table class='ipb_table' summary="{$this->lang->words['ucp_announcements']}">
-		<tr class='header'>
-			<th scope='col' style="width: 40%">{$this->lang->words['announce_title']}</th>
-			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_starts']}</th>
-			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_end']}</th>
-			<th scope='col' style="width: 25%">{$this->lang->words['announce_forums']}</th>
-			<th scope='col' style="width: 15%">&nbsp;</th>
-		</tr>
-		<if test="hasAnnouncements:|:is_array( $announcements ) AND count( $announcements )">
-			{parse striping="announcements" classes="row1,row2"}
-			<foreach loop="announcements:$announcements as $announce">
-				<tr class="{parse striping="announcements"}">
-					<td>
-						<strong><a href="{parse url="showannouncement={$announce['announce_id']}" base="public"}">{$announce['announce_title']}</a></strong> {$announce['announce_inactive']}<div class="desc">{$this->lang->words['announce_by']} {$announce['members_display_name']}</div>
-					</td>
-					<td class="short">
-						<if test="announceStart:|:$announce['announce_start']">
-							{parse date="$announce['announce_start']" format="short"}
-						<else />
-							--
-						</if>
-					</td>
-					<td class="short">
-						<if test="announceEnd:|:$announce['announce_end']">
-							{parse date="$announce['announce_end']" format="short"}
-						<else />
-							--
-						</if>
-					</td>
-					<td>
-						<div class="forumdesc">
-							<if test="announceForum:|:$announce['announce_forum'] == '*'">
-								{$this->lang->words['announce_page_allforums']}
-							<else />
-								<if test="announceHasForums:|:is_array( $announce['_forums'] ) and count( $announce['_forums'] )">
-									<if test="announceMostForums:|:count( $announce['_forums'] ) > 5">
-										{parse expression="count( $announce['_forums'] )"} {$this->lang->words['announce_page_numforums']}
-									<else />
-										<ul>
-										<foreach loop="announce_forums:$announce['_forums'] as $forum">
-											<li><a href="{parse url="showforum={$forum[0]}" base="public"}">{$forum[1]}</a></li>
-										</foreach>
-										</ul>
-									</if>
-								</if>
-							</if>
-						</div>
-					</td>
-					<td class="short">
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modEditAnnouncement&amp;do=edit&amp;announce_id={$announce['announce_id']}" base="public"}">{$this->lang->words['announce_edit']}</a>
-						&middot; <a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modDeleteAnnouncement&amp;do=edit&amp;announce_id={$announce['announce_id']}" base="public"}" id="del_{$announce['announce_id']}">{$this->lang->words['announce_delete']}</a>
-						<script type='text/javascript'>
-							$('del_{$announce['announce_id']}').observe('click', ipb.ucp.deleteAnnouncement.bindAsEventListener( this, {$announce['announce_id']} ) );
-						</script>
-					</td>
-				</tr>
-			</foreach>
-		<else />
-			<tr>
-				<td align="center" colspan="5">{$this->lang->words['announce_none']}</td>
-			</tr>
-		</if>
-	</table>
-</fieldset>
-<fieldset class='submit'>
-	<a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modAddAnnouncement&amp;do=add" base="public"}" class='input_submit'>{$this->lang->words['announce_add']}</a>
-</fieldset>
-</form>]]></template_content>
-      <template_name>modAnnouncements</template_name>
-      <template_data>$announcements</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
     <template>
       <template_group>skin_ucp</template_group>
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>notificationsForm</template_name>
       <template_data>$config, $emailData</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2838,14 +2134,59 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
     </template>
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
+      <template_content><![CDATA[<php>
+	$this->settings['_mobile_nav_home'] = 1;
+</php>
+<form action="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=removeNotifications&amp;do=remove" base="public"}" id="checkBoxForm" method="post">
+	<input type="hidden" name="secure_key" value="{$this->member->form_hash}" />
+	<div class='master_list' id='notifications'>
+		<h2>{$this->lang->words['arch_notifications_head']}</h2>
+		<if test="hasnotifyerror:|:$error">
+		<p class='message error'>
+			{$error}
+		</p>
+		<else />
+			<if test="hasconfirm:|:$this->request['confirm']">
+			<p class='message'>
+				{$this->lang->words['notify_rem_suc']}
+			</p>
+			</if>
+		</if>
+		<foreach loop="categories:$notifications as $notification">
+			<div class='row touch-row'>
+				<div class='icon'>
+					<if test="$notification['member']['member_id']">
+						<a href='{parse url="showuser={$notification['member']['member_id']}" template="showuser" seotitle="{$notification['member']['members_seo_name']}" base="public"}'>
+							<img src='{$notification['member']['pp_thumb_photo']}' class='photo' />
+						</a>
+					<else />
+						<img src='{$notification['member']['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$notification['member']['members_display_name'])"}" class='photo' />
+					</if>
+				</div>
+				<div class='rowContent'>
+					<strong><if test="strpos( $notification['notify_title'], '<a href' ) === false"><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notification['notify_id']}" base="public"}' class='title'></if>
+					{$notification['notify_title']}
+					<if test="strpos( $notification['notify_title'], '<a href' ) === false"></a></if>
+					</strong>
+					<br />
+					<span class='desc'>{$this->lang->words['th_sent']} {parse date="$notification['notify_sent']" format="long"}</span>
+				</div>
+			</div>
+		</foreach>
+	</div>
+	<if test="hasNotifyForMod:|:count($notifications)">
+		<div class='submit'>
+			<a href='{parse url="app=core&amp;module=usercp&amp;area=markNotification&amp;do=mark&amp;mark=all" base="public"}' id='ack_pm_notification' class='button secondary'>{$this->lang->words['notificationlog_mar']}</a>
+		</div>
+	</if>
+</form>]]></template_content>
       <template_name>notificationsLog</template_name>
       <template_data><![CDATA[$notifications, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
+      <template_master_key>mobile</template_master_key>
     </template>
     <template>
       <template_group>skin_ucp</template_group>
@@ -2879,7 +2220,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 </fieldset>]]></template_content>
       <template_name>passwordChangeForm</template_name>
       <template_data/>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2892,7 +2233,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 <span class="desc">{$this->lang->words['attach_hits']}: {$data['attach_hits']}</span><br />]]></template_content>
       <template_name>Show_attachments</template_name>
       <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2903,7 +2244,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
       <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
       <template_name>showNotification</template_name>
       <template_data>$notification</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2911,395 +2252,10 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
     </template>
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<div class="formsubtitle">{$title}</div>
-	<p>$msg</p>]]></template_content>
-      <template_name>ucp_message</template_name>
-      <template_data><![CDATA[$title="",$msg=""]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse js_module="ucp"}
-<if test="global_fb:|:IPSLib::fbc_enabled() === TRUE">
-	<!-- SKINNOTE: This could be added dynamically by JS if this is too obtrusive. FB users need JS on, so no worries there -->
-	<if test="$this->registry->output->isHTTPS">
-		<script src="https://ssl.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php" type="text/javascript"></script>
-	<else />
-		<script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php" type="text/javascript"></script>
-	</if>	<if test="no_fb_email:|:! $this->memberData['fb_emailallow'] AND strstr( $this->memberData['email'], '@proxymail.facebook.com' )">
-		<div id='fbc_emailCheck' style='display:none'>
-			<fb:prompt-permission perms="email">
-				<div class='message unspecific'>
-					<strong>{$this->lang->words['cannot_get_email']}</strong>
-					<br />
-					{$this->lang->words['cannot_get_email_2']}
-					<br />
-					<u>{$this->lang->words['click_allow_email']}</u>
-				</div>
-			</fb:prompt-permission>
-			<br />
-		</div>
-		<script type="text/javascript">
-			/* Init Facebook JS */
-			FB_RequireFeatures(["XFBML"], function()
-			{
-				FB.init("{$this->settings['fbc_api_id']}", "{$this->settings['fbc_xdlocation']}" );
-			} );
-			/* As the REST can take a short while, the div shows then hides; this delays it until its ready to show or hide */
-			Event.observe( window, 'load', function() { $('fbc_emailCheck').show(); } );
-		</script>
-	</if>
-</if>
-<if test="usercp_form:|:$hide_form == 0">
-	<if test="has_max_upload:|:$maxUpload">
-		<form method='post' enctype="multipart/form-data" action='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' id='userCPForm'>
-	<else />
-		<form method='post' action='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' id='userCPForm'>
-	</if>
-</if>
-	<fieldset>
-		<input type="hidden" name="MAX_FILE_SIZE" value="$maxUpload" />
-		<input type='hidden' name='do' value='save' />
-		<input type='hidden' name='secure_hash' value='{$this->member->form_hash}' />
-		<input type='hidden' name='s' value='{$this->request['s']}' />
-	</fieldset>
-<h2>{$this->lang->words['ucp_title']}</h2>
-<ul class='tab_bar no_title'>
-	<foreach loop="tabs:$tabs as $tab_app => $tab">
-		<if test="active_tab:|:$tab_app == $current_tab">
-			<li class='active'>{$tab['_name']}</li>
-		<else />
-			<li><a href="{parse url="module=usercp&amp;tab={$tab_app}" base="publicWithApp"}" title="{$this->lang->words['settings_for_ucp']} {$tab['_name']}">{$tab['_name']}</a></li>
-		</if>
-	</foreach>
-</ul>
-<div class='tab_body usercp_body'>
-	<ul id='usercp_menu'>
-		<if test="tabsMenus:|:is_array( $tabs[ $current_tab ]['_menu'] ) AND count( $tabs[ $current_tab ]['_menu'] )">
-			<foreach loop="items:$tabs[ $current_tab ]['_menu'] as $idx => $item">
-				<if test="tabsMenus_active:|:$item['area'] == $current_area OR $item['active']">
-					<li class='active'>{$item['title']}</li>
-				<else />
-					<li><a href="{parse url="module=usercp&amp;tab={$current_tab}&amp;{$item['url']}" base="publicWithApp"}">{$item['title']}</a></li>
-				</if>
-			</foreach>
-		</if>
-	</ul>
-	<div id='usercp_content'>
-		<if test="has_errors:|:is_array( $errors ) AND count( $errors )">
-			<p class='message error'>
-				<foreach loop="errors:$errors as $error">
-					$error<br />
-				</foreach>
-			</p>
-		</if>
-		<if test="didSave:|:$this->request['saved'] == 1">
-			<p class='message'>{$this->lang->words['ucp__settings_saved']}</p>
-		</if>
-		$html
-		
-		<if test="submit_button:|:$hide_form == 0">
-		<fieldset class='submit'>
-			<input type='submit' class='input_submit' name='submit' value='{$this->lang->words['ucp__save_changes']}' /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
-		</if>
-	</div>
-</div>
-<if test="end_form:|:$hide_form == 0">
-</form>
-</if>]]></template_content>
+      <template_content>{$html}</template_content>
       <template_name>userCPTemplate</template_name>
       <template_data>$current_tab, $html, $tabs, $current_area, $errors=array(), $hide_form=0, $maxUpload=0</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=watch&amp;watch=$method&amp;do=saveWatch" base="public"}" method="post" name="REPLIER">
-<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-<input type="hidden" name="tid" value="{$topic['tid']}" />
-<input type="hidden" name="fid" value="{$forum['id']}" />
-<input type="hidden" name="st" value="{$this->request['st']}" />
-<fieldset class='row1'>
-	<if test="watchTid:|:$topic['tid'] != ''">
-		<h3>{$this->lang->words['subs_c_title']} {$this->lang->words['subs_for']} <a href='{parse url="showtopic={$topic['tid']}&amp;st={$this->request['st']}" template='showtopic' seotitle='{$topic['title_seo']}' base="public"}' title='{$this->lang->words['topic_title']}'>{$topic['title']}</a></h3>
-		<br />
-		<p class='message unspecific'>{$this->lang->words['subs_exp_text']}</p>
-	<else />
-		<h3>{$this->lang->words['subs_c_title']} {$this->lang->words['subs_for']} <a href='{parse url="showforum={$forum['id']}" base="public" template="showforum" seotitle="{$forum['name_seo']}"}'>{$forum['name']}</a></h3>
-		<br />
-		<p class='message unspecific'>{$this->lang->words['subsf_exp_text']}</p>
-	</if>
-	
-	<ul>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_none' name="emailtype" value="none" />
-			<if test="watchEmailNone:|:$topic['tid'] != ''">
-				<label for='email_none'><strong>{$this->lang->words['subs_none_title']}</strong></label>
-				<span class='desc'>{$this->lang->words['subs_none_desc']}</span>
-			<else />
-				<label for='email_none'><strong>{$this->lang->words['subsf_none_title']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_none_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_delayed' name="emailtype" value="delayed" checked="checked" />
-			<if test="watchEmailDelay:|:$topic['tid'] != ''">
-				<label for='email_delayed'><strong>{$this->lang->words['subs_delayed']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_delayed_desc']}</span>
-			<else />
-				<label for='email_delayed'><strong>{$this->lang->words['subsf_delayed']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_delayed_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_immediate' name="emailtype" value="immediate" />
-			<if test="watchEmailImmediate:|:$topic['tid'] != ''">
-				<label for='email_immediate'><strong>{$this->lang->words['subs_immediate']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_immediate_desc']}</span>
-			<else />
-				<label for='email_immediate'><strong>{$this->lang->words['subsf_immediate']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_immediate_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_daily' name="emailtype" value="daily" />
-			<if test="watchEmailDaily:|:$topic['tid'] != ''">
-				<label for='email_daily'><strong>{$this->lang->words['subs_daily']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_daily_desc']}</span>
-			<else />
-				<label for='email_daily'><strong>{$this->lang->words['subsf_daily']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_daily_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_weekly' name="emailtype" value="weekly" />
-			<if test="watchEmailWeekly:|:$topic['tid'] != ''">
-				<label for='email_weekly'><strong>{$this->lang->words['subs_weekly']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_weekly_desc']}</span>
-			<else />
-				<label for='email_weekly'><strong>{$this->lang->words['subsf_weekly']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_weekly_desc']}</span>
-			</if>
-		</li>
-	</ul>
-</fieldset>
-
-<fieldset class='submit'>
-	<input type="submit" value="{$this->lang->words['subs_submit']}" class="input_submit" /> {$this->lang->words['or']}
-	<if test="cancelGoToTopic:|:$topic['tid'] != ''">
-		<a href='{parse url="showtopic={$topic['tid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	<else />
-		<a href='{parse url="showforum={$forum['id']}" template="showforum" seotitle="{$forum['name_seo']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</if>
-</fieldset>
-</form>]]></template_content>
-      <template_name>watchChoices</template_name>
-      <template_data><![CDATA[$forum="",$topic="",$method=""]]></template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<br />
-<div class='row1'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchForums&amp;do=saveIt" base="public"}" id="checkBoxForm" method="post">
-	<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-	<if test="hasWatchedForums:|:is_array( $forumArray ) AND count( $forumArray )">
-		<foreach loop="categories:$forumArray as $parentID => $catData">
-			<h3 class='maintitle'>{$catData['_data']['name']}</h3>
-			<table class='ipb_table' summary="{$this->lang->words['ucp_watched_forums']}">
-				<tr class='header'>
-					<th scope='col' width="5%">&nbsp;</th>
-					<th scope='col' width="50%">{$this->lang->words['ft_forum']}</th>
-					<th scope='col' align="center" width="5%">{$this->lang->words['ft_topics']}</th>
-					<th scope='col' align="center" width="5%">{$this->lang->words['ft_posts']}</th>
-					<th scope='col' align="center" width="35%">{$this->lang->words['ft_last_post']}</th>
-					<th scope='col' align="center" width="5%" class='short'><input id="checkAllForums_{$parentID}" type="checkbox" value="{$this->lang->words['check_all']}" /><!-- SKINNOTE: add check all functionality back --></th>
-				</tr>
-				{parse striping="forums" classes="row1,row2"}
-				<foreach loop="forums:$catData['_forums'] as $forumID => $data">
-					<tr class='{parse striping="forums"}'>
-						<td class="altrow short">{parse replacement="{$data['folder_icon']}"}</td>
-						<td>
-							<strong><a href="{parse url="showforum={$data['id']}" base="public" seotitle="{$data['name_seo']}" template="showforum"}">{$data['name']}</a></strong><br />
-							<span class="desc">
-								{$data['description']}
-								<br />
-								{$this->lang->words['subs_c_type']}: {$this->lang->words[ $data['_type'] ]}
-								<if test="forumNewTopics:|:$data['_newTopics']">
-									<strong><a href="{parse url="showforum={$data['id']}&amp;show=sinceLastVisit" base="public" seotitle="{$data['name_seo']}" template="showforum"}">{$data['_newTopics']} {$this->lang->words['ucp_reply_since']}</a></strong>
-								</if>
-							</span>
-						</td>
-						<td class="short altrow">{$data['topics']}</td>
-						<td class="short altrow">{$data['posts']}</td>
-						<td>
-							{parse date="$data['last_post']" format="long"}<br />{$this->lang->words['in']}
-							<if test="forumPassword:|:$data['password']">
-								{$this->lang->words['f_none']}
-							<else />
-								<a href='{parse url="showtopic={$data['last_id']}&amp;view=getlastpost" base="public" seotitle="{$data['seo_last_title']}" template="showtopic"}'>{$data['last_title']}</a>
-							</if>
-							<br />{$this->lang->words['by']}
-							<if test="forumLastPoster:|:isset($data['last_poster_name'])">
-								<if test="forumLastPosterId:|:$data['last_poster_id']">
-									<a href='{parse url="showuser={$data['last_poster_id']}" base="public" seotitle="{$data['seo_last_name']}" template="showuser"}'>{$data['last_poster_name']}</a> {parse template="user_popup" group="global" params="$data['last_poster_id']"}
-								<else />
-									{$data['last_poster_name']}
-								</if>
-							<else />
-								{$this->lang->words['f_none']}
-							</if>
-						</td>
-						<td class="short altrow"><input class='input_check checkall_{$parentID}' type="checkbox" name="forumIDs[{$data['id']}]" value="1" /></td>
-					</tr>
-				</foreach>
-			</table>
-			<script type='text/javascript'>
-				ipb.global.registerCheckAll('checkAllForums_{$parentID}', 'checkall_{$parentID}');
-			</script>
-			<br />
-		</foreach>
-	<else />
-		<p class='no_messages'>{$this->lang->words['forum_subs_none']}</p>
-	</if>
-	<if test="mmWatchedForums:|:count($forumArray)">
-		<div class='moderation_bar rounded with_action'>
-			<select name="trackchoice">
-				<option value="unsubscribe">{$this->lang->words['subs_delete']}</option>
-				<option value="none">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_none_title']}</option>
-				<option value="immediate">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_immediate']}</option>
-				<option value="delayed">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_delayed']}</option>
-				<option value="daily">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_daily']}</option>
-				<option value="weekly">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_weekly']}</option>
-			</select>&nbsp;&nbsp;
-			<input type="submit" class="input_submit alt" value="{$this->lang->words['with_selected']}" />
-		</div>
-	</if>
-</form>
-</div>]]></template_content>
-      <template_name>watchedForums</template_name>
-      <template_data>$forumArray</template_data>
-      <template_updated>1288018127</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
-	<h3 class='maintitle'>{$this->lang->words['subs_header']}</h3>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchTopics&amp;do=saveIt" base="public"}" id="checkBoxForm" method="post">
-	<table class='ipb_table' summary="{$this->lang->words['ucp_user_attach']}">
-		<tr class='header'>
-			<th scope='col' style='width: 5%'>&nbsp;</th>
-			<th scope='col' style='width: 50%'>{$this->lang->words['subs_topic']}</th>
-			<th scope='col' style='width: 5%' class='short'>{$this->lang->words['subs_replies']}</th>
-			<th scope='col' style='width: 5%' class='short'>{$this->lang->words['subs_view']}</th>
-			<th scope='col' style='width: 30%' class='short'>{$this->lang->words['subs_last_post']}</th>
-			<th scope='col' style='width: 5%' class='short'><input class='checkbox' id="checkAllTopics" type="checkbox" value="{$this->lang->words['check_all']}" /><!-- SKINNOTE: Add select all back --></th>
-		</tr>
-		<if test="watchedTopicsForums:|:is_array( $mainForumArray ) AND count( $mainForumArray )">
-			<foreach loop="watched_forums:$mainForumArray as $id => $data">
-				<tr class='subhead altbar'>
-					<th colspan="6">{$data['forum_name']}</th>
-				</tr>
-				<if test="watchedTopicsTopics:|:is_array( $mainForumArray[ $id ]['_topics'] )">
-					{parse striping="topics" classes="row1,row2"}
-					<foreach loop="watched_topics:$mainForumArray[ $id ]['_topics'] as $topicID => $topicData">
-						<tr>
-							<td class="row1 short">{parse replacement="{$topicData['folder_img']}"}</td>
-							<td class="row1">
-								<a href="{parse url="showtopic={$topicData['tid']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}">{$topicData['title']}</a><br />
-				  				<span class="desc">
-									{$topicData['description']}
-									<if test="watchedTopicsDescription:|:$topicData['description']">
-										<br />
-									</if>
-									{$this->lang->words['subs_start']} {parse date="$topicData['track_started']" format="long"}
-				  					<br />
-				  					{$this->lang->words['subs_c_type']}: {$this->lang->words[ $topicData['_type'] ]}
-				  				</span>
-				  			</td>
-				  			<td class="row1 short">{$topicData['posts']}</td>
-				  			<td class="row1 short">{$topicData['views']}</td>
-				  			<td class="row1">{parse date="$topicData['_last_post']" format="long"}<br />{$this->lang->words['subs_by']} {$topicData['last_poster']}</td>
-				  			<td class="row1 short"><input class='input_check checkall' type="checkbox" name="topicIDs[{$topicData['topic_id']}]" value="1" /></td>
-				  		</tr>
-					</foreach>
-				</if>
-			</foreach>
-		<else />
-			<tr>
-				<td class="row2 short" colspan="6">{$this->lang->words['subs_none']}</td>
-			</tr>
-		</if>
-	</table>
-<if test="watchedTopicsMm:|:count($mainForumArray)">
-	<div class='moderation_bar with_action rounded'>
-		<select name="trackchoice">
-			<option value="unsubscribe">{$this->lang->words['subs_delete']}</option>
-			<option value="none">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_none_title']}</option>
-			<option value="immediate">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_immediate']}</option>
-			<option value="delayed">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_delayed']}</option>
-			<option value="daily">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_daily']}</option>
-			<option value="weekly">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_weekly']}</option>
-		</select>&nbsp;&nbsp;
-		<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-		<input type="submit" class="input_submit alt" value="{$this->lang->words['with_selected']}" />
-	</div>
-</if>
-</form>
-<p style='text-align: right; padding: 5px;'>
-	<if test="watchedTopicsAutoprune:|:$this->settings['subs_autoprune'] > 0">
-		{parse expression="sprintf( $this->lang->words['auto_prune'], $this->settings['subs_autoprune'] )"}
-	<else />
-		{$this->lang->words['no_auto_prune']}
-	</if>
-</p>
-<div class='filter_bar rounded'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=topicsubs" base="public"}" method="post">
-		<fieldset>
-			
-			{$this->lang->words['show_topics_from']}
-			<select name="datecut">
-			<option value='1'>{$this->lang->words['subs_today']}</option>
-			<foreach loop="watched_days:array( 1,7,14,21,30,60,90,365 ) as $day">
-				<if test="daySelected:|:$day == $dateCut">
-					<option value='$day' selected="selected">{parse expression="sprintf( $this->lang->words['subs_day'], $day )"}</option>
-				<else />
-					<option value='$day'>{parse expression="sprintf( $this->lang->words['subs_day'], $day )"}</option>
-				</if>
-			</foreach>
-			<if test="allSelected:|:$dateCut == 1000">
-				<option value='1000' selected='selected'>{$this->lang->words['subs_all']}</option>
-			<else />
-				<option value='1000'>{$this->lang->words['subs_all']}</option>
-			</if>
-			</select>
-			<input type="submit" class='input_submit alt' value="{$this->lang->words['jmp_go']}" />
-		</fieldset>
- 	</form>
-</div>
-</fieldset>
-<script type='text/javascript'>
-	ipb.global.registerCheckAll( 'checkAllTopics', 'checkall' );
-</script>]]></template_content>
-      <template_name>watchedTopics</template_name>
-      <template_data>$mainForumArray, $dateCut</template_data>
-      <template_updated>1288018127</template_updated>
+      <template_updated>1318864230</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/members/xml/members_modules.xml b/upload/admin/applications/members/xml/members_modules.xml
index e6bed66d..7992cd5d 100644
--- a/upload/admin/applications/members/xml/members_modules.xml
+++ b/upload/admin/applications/members/xml/members_modules.xml
@@ -5,13 +5,10 @@
       <sys_module_title>Личные �ообщени�</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>messaging</sys_module_key>
-      <sys_module_description>Модуль личных �ообщений</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -19,13 +16,10 @@
       <sys_module_title>Спи�ок пользователей</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>list</sys_module_key>
-      <sys_module_description>Модуль �пи�ка пользователей</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -33,13 +27,10 @@
       <sys_module_title>Он-лайн �пи�ок</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>online</sys_module_key>
-      <sys_module_description>Модуль �пи�ка пользователей в он-лайн</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -47,13 +38,10 @@
       <sys_module_title>Профиль</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>profile</sys_module_key>
-      <sys_module_description>Модуль профил� пользовател�</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent/>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
       <sys_module_position>0</sys_module_position>
       <sys_module_admin>0</sys_module_admin>
     </module>
@@ -61,56 +49,55 @@
       <sys_module_title>Пользователи</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>members</sys_module_key>
-      <sys_module_description>Модуль управлени� пользовател�ми форума</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>0</sys_module_position>
+      <sys_module_position>1</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
       <sys_module_title>Группы</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>groups</sys_module_key>
-      <sys_module_description>Модуль управлени� группами пользователей</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>1</sys_module_position>
+      <sys_module_position>2</sys_module_position>
+      <sys_module_admin>1</sys_module_admin>
+    </module>
+    <module>
+      <sys_module_title>Дополнительные пол� профил�</sys_module_title>
+      <sys_module_application>members</sys_module_application>
+      <sys_module_key>cfields</sys_module_key>
+      <sys_module_description></sys_module_description>
+      <sys_module_version>1.0</sys_module_version>
+      <sys_module_protected>1</sys_module_protected>
+      <sys_module_visible>1</sys_module_visible>
+      <sys_module_position>3</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
       <sys_module_title>Ра��ылка</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>bulkmail</sys_module_key>
-      <sys_module_description>Модуль управлени� ра��ылками форума</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>1</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>2</sys_module_position>
+      <sys_module_position>4</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
     <module>
-      <sys_module_title>Ограничение админи�траторов</sys_module_title>
+      <sys_module_title>Ограничение до�тупа к �Ц</sys_module_title>
       <sys_module_application>members</sys_module_application>
       <sys_module_key>restrictions</sys_module_key>
-      <sys_module_description>Модуль управлени� админи�тратор�кими ограничени�ми</sys_module_description>
+      <sys_module_description></sys_module_description>
       <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
       <sys_module_protected>0</sys_module_protected>
       <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>3</sys_module_position>
+      <sys_module_position>5</sys_module_position>
       <sys_module_admin>1</sys_module_admin>
     </module>
   </modulegroup>
diff --git a/upload/admin/applications/members/xml/members_root_css.xml b/upload/admin/applications/members/xml/members_root_css.xml
index 3be00a61..e7779c9a 100644
--- a/upload/admin/applications/members/xml/members_root_css.xml
+++ b/upload/admin/applications/members/xml/members_root_css.xml
@@ -2,7 +2,7 @@
 <css>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_messenger</css_group>
     <css_content>/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
@@ -10,13 +10,9 @@
 /* ipb_messenger.css - Messenger styles									*/
 /************************************************************************/
 
-#messenger_utilities {
-	width: 18%;
-}	
-	
-#messenger_content {
-	width: 80%;
-}
+#messenger_utilities { width: 19%; }	
+
+#messenger_content { width: 80%; }
 
 	#messenger_content h2 {
 		clear: none;
@@ -26,41 +22,19 @@
 #folder_list, #space_allowance,
 #message_search, #participants,
 #invite_more {
-	margin-bottom: 10px;
 	position: relative;
 }
 
-#space_allowance p {
-	line-height: 150%;
-}
-
-#message_list {
-	clear: right;
-}
-
-#message_compose .input_check {
-	margin-left: 245px;
-}
-
-#invite_more p.desc {
-	padding: 10px;
-}
-
-#invite_more_dialogue {
-	display: none;
-}
-
-#invite_more_dialogue ul {
-	padding: 4px;
-}
-
-#invite_more_autocomplete {
-	width: 99%;
-}
+#space_allowance p { line-height: 150%;}
+#message_list {	clear: right; }
+#message_compose .input_check {	margin-left: 245px;}
+#invite_more_dialogue { display: none;}
+#invite_more_dialogue ul { padding: 4px;}
+#invite_more_autocomplete {	width: 99%; }
 
 #folder_list li {
-	margin-bottom: 4px;
-	margin-left: 6px;
+	margin-bottom: 8px;
+	margin-left: 4px;
 	padding: 0px;
 }
 
@@ -78,17 +52,6 @@
 		position: absolute;
 	}
 
-#participants #participants_list li {
-	padding: 5px;
-	min-height: 55px;
-	clear: both;
-}
-
-#participants #participants_list li .photo {
-	margin: 2px 10px 0 0;
-	float: left;
-}
-
 	#participants #participants_list span.name.left_convo a {
 		color: #8a8a8a;
 		font-style: italic;
@@ -114,9 +77,9 @@ li.new_folder {
 	background: #eef3f8;
 	font-size: 0.8em;
 	font-weight: bold;
-	margin-right: 10px;
-	padding: 2px 0px 2px 5px;
-	right: -3px;
+	margin-right: 2px;
+	padding: 2px;
+	right: 3px;
 	position: absolute;
 }
 
@@ -124,30 +87,31 @@ li.new_folder {
 		color: #f00;
 	}
 	
-.col_m_subject
-{
+.col_m_subject {
 	width:40%;
 }</css_content>
     <css_position>1</css_position>
     <css_app>members</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules>messaging</css_modules>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
+    <css_updated>1318864232</css_updated>
     <css_group>ipb_mlist</css_group>
-    <css_content>/************************************************************************/
+    <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
 /************************************************************************/
 /* ipb_mlist.css - Member list styles									*/
 /************************************************************************/
 
+#mlist_tabs { margin-top: 35px; }
+	#mlist_tabs li { text-align: center; }
+		#mlist_tabs li a { padding: 5px 8px; }
+
 div#member_filters {
 	margin-top: 10px;
 	margin-bottom: 15px;
@@ -192,390 +156,208 @@ div#member_filters {
 		float: left;
 	}
 	
-	div#member_filters li.field.custom input,
+	div#member_filters li.field.custom input[type=text],
 	div#member_filters li.field.custom textarea {
 		width: 50%;
 	}
-
-#member_alpha li {
-	padding: 2px 7px;
-}
-
-	#member_alpha li.active {
-		padding: 7px 15px;
-	}
 	
-.members li.member_entry {
-	position: relative;
-	min-height: 100px;
-}
-
-.members li .photo {
-	margin: 10px;
-	float: left;
-}
-
-.members li .user_controls {
-	text-align: left;
-	margin: 25px 10px;
-	min-width: 350px;
-	position: absolute;
-	left: 450px;
-	clear: none;
-}
-
-	.members li .user_controls .rating {
-		background: none;
-		margin-right: 10px;
-	}
-
-	.members li .user_controls a {
-		text-decoration: none;
-		font-size: 0.85em;
-	}
-	
-.members li .info {	
-	font-size: 0.9em;
-	line-height: 100%;
-	border-right: 1px solid #d5dde5;
-	margin: 10px;
-	left: 90px;
-	width: 350px;
-	position: absolute;
-}
-	.members li .info dt {
-		text-align: right;
-		width: 80px;
-	}
-
-	.members li .info dd {
-		width: 200px;
-	}
-
-.members li .reputation {
-	margin-top: 40px;
-}
-
-.members li p.rating {
-	margin: 10px;	
-	right: 0;
-	position: absolute;
-}
-
-.members li.general_box {
-	margin-bottom: 4px;
-}
-
-.field.custom p
-{
-	margin-left:175px;
-}
-
 div#member_filters li.field.custom .input_check {
 	width: 5%;
-}</css_content>
+}]]></css_content>
     <css_position>1</css_position>
     <css_app>members</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
   <cssfile>
     <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
-    <css_group>ipb_profile</css_group>
+    <css_updated>1318864232</css_updated>
+    <css_group>ipb_photo_editor</css_group>
     <css_content>/************************************************************************/
+/* IP.Board 3 CSS - By Matt Mecham - (c)2011 Invision Power Services	*/
+/************************************************************************/
+/* ipb_photo_editor.css - Photo editor styles							*/
+/************************************************************************/
+
+/* New photo stuffs */
+#ips_photoWrap {
+	width: 700px;
+	border: 1px solid #D5DDE5;
+	margin: 0px auto;
+	padding: 6px;
+}
+
+#ips_sidePanel {
+	float: left;
+	width: 200px;
+}
+
+#ips_cropperStart, #ips_cropperControls {
+	
+	text-align: right;
+	width: 200px;
+	margin-top: 8px;
+}
+
+#ips_currentPhoto {
+	
+	text-align: center;
+}
+	#ips_currentPhoto img {
+		border: 1px solid #D5DDE5;
+		background: white;
+	}
+
+#gravatar, #upload_photo {
+	width: 150px;
+}
+
+#ips_photoOptions {
+	margin-left: 210px;
+}
+
+li.ips_option {
+	border: 1px solid #D5DDE5;
+	min-height: 120px;
+	margin-bottom: 5px;
+}
+
+.ips_photoPreview {
+	width: 100px;
+	height: 100px;
+	display: block;
+	overflow: hidden;
+	margin: 6px;
+	float: left;
+	border: 1px solid #D5DDE5;
+	
+}
+
+	.ips_photoPreview label {
+		text-align: center;
+		background: white;
+	}
+	
+	.ips_photoPreview label img {
+		max-width:120px; 
+		max-height:120px; 
+	}
+
+.ips_photoControls {
+	padding-top: 10px;
+	margin-left: 120px;
+}
+
+.ips_photoOptionText {
+	margin-left: 18px;
+	line-height: 130%;
+	padding-bottom: 3px;
+}
+
+.imgCrop_wrap { display: inline-block; }</css_content>
+    <css_position>1</css_position>
+    <css_app>members</css_app>
+    <css_app_hide>1</css_app_hide>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
+    <css_removed>0</css_removed>
+    <css_modules>photo</css_modules>
+    <css_master_key>root</css_master_key>
+  </cssfile>
+  <cssfile>
+    <css_set_id>0</css_set_id>
+    <css_updated>1318864232</css_updated>
+    <css_group>ipb_profile</css_group>
+    <css_content><![CDATA[/************************************************************************/
 /* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
 /************************************************************************/
 /* ipb_profile.css - Profile specific styles							*/
 /************************************************************************/
 
-.friend_list ul, .status_profile_page, .status_profile_actions, .off, .recent_activity
-{
-	background-color: #FFFFFF;
-}
-
-
-div#profile_overview {
-	width: 29%;
-}
-
-div#main_profile_body {
-	width: 70%;
-	margin-top: 5px;
-	padding-right: 4px;
-}
-	
-.friend_list p {
-	font-size: 0.9em;
-	padding: 15px 0 0 5px;
-}
-
-.personal_info {
-	text-align: center;
-}
-
-	.personal_info .photo {
-		margin: 30px auto 20px auto;
-	}
-
-	.personal_info ul {
-		font-size: 0.9em;
-		border-radius: 0 0 10px 10px;
-		-moz-border-radius: 0 0 10px 10px;
-		-webkit-border-bottom-left-radius: 10px;
-		-webkit-border-bottom-right-radius: 10px;
-		padding: 5px 10px;
-	}
-	
-	.personal_info li {
-		margin: 2px 0;
-		text-align: left;
-	}
-	
-	.personal_info li a {
-		background: #d5dde5;
-		text-decoration: none;
-		border-radius: 4px;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		padding: 5px 7px;
-		display: block;
-	}
-
-ul.profile_options {
+#profile_photo { max-width: 138px; max-height: 138px; }
+#profile_content_main {
+	min-height: 75px;
+	line-height: 1.3;
 	margin-bottom: 20px;
 }
+#pane_info .ipsLayout_right { width: 260px !important; margin-right: -290px; }
+#friends_overview .ipsUserPhoto_link { margin: 0 2px 5px 2px; display: inline-block; }
 
-/* Friends list */
-.members li .info dd {
-	width: 250px;
-}
-
-.members li .info dt {
-	min-width: 100px;
-	width: auto;
-}
-
-div#profile_overview .info {
-	font-size: 0.9em;
-	/*border-top: 1px solid #dedede;
-	border-bottom: 1px solid #dedede;*/
-	padding: 4px;
-}
-
-	body div#profile_overview .info dt {
-		padding: 3px 4px;
-		width: 37%;
-	}
-
-	body div#profile_overview .info dd {
-		padding: 3px 4px;
-		width: 53%;
-	}
-	
-#profile_overview .reputation {
+#profile_panes_wrap .reputation {
 	float: none;
+	margin: 0 0 5px 0;
+	padding: 10px;
 	text-align: center;
 	font-weight: normal;
-	margin: 6px;
+	display: block;
 }
-
-	#profile_overview .reputation .number {
-		font-size: 1.1em;
+	#profile_panes_wrap .reputation .number {
+		font-size: 20px;
 		font-weight: bold;
-	}
-
-	#profile_overview .reputation .title,
-	#profile_overview .reputation .image {
-		font-size: 0.9em;
 		display: block;
 	}
-	
-.about_info,
-.contact_info {
-	margin-bottom: 6px;
-	font-size:0.9em;
-}
 
-.recent_activity,
-.about_contact,
-.friend_list,
-#comment_wrap {
-	clear: both;
-	float: left;
+.warn_panel { text-align: center; margin: 8px 0; }
+.photo_holder { position: relative; }
+#change_photo { 
+	position: absolute;
+	top: 0; left: 0;
+	background: rgba(0,0,0,0.2);
+	color: #fff;
+	opacity: 0.3;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-transition: all 0.4s ease-in-out;
+	-moz-transition: all 0.4s ease-in-out;
+}
+	.photo_holder:hover #change_photo {
+		opacity: 1;
+		background: #000;
+	}
+	
+#user_info_cell {
+	display: table-cell;
+	white-space: nowrap;
+	padding-right: 15px;
+}
+#user_status_cell {
+	display: table-cell;
 	width: 100%;
+	vertical-align: top;
+}
+#user_latest_status {
+	background: url({style_images_url}/stems/profile_status_stem.png ) no-repeat 0px 50%;
+	padding-left: 11px;
 }
 
-.other_contact
-{
-	margin: 5px 0px 5px 0px;
+#user_latest_status > div {
+	padding: 10px 15px;
+	background-color: #ebece5;
+	color: #343434;
+	font-size: 14px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	min-height: 45px;
+	word-wrap: break-word;
 }
 
-.other_contact .general_box {
-	padding: 4px;
-	overflow: auto;
-}
+#user_latest_status > div > span { display: block; }
+#user_utility_links { margin-top: 10px; text-align: right; }
+.rating { margin-top: 10px; }
 
-.other_contact .general_box h3 {
-	margin: -4px -4px 5px -4px;
-}
-
-.about_contact,
-.friend_list {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-	.other_contact dl {
-		padding: 0px 10px 10px 3px;
-	}
-	
-	.about_contact dl, dl.user_info {
-		padding: 6px;
-	}
-	
-	.other_contact dt, .other_contact dd, .about_contact dt, .about_contact dd,
-	.info dt, .user_info dt, .user_info dd {
-		float: left;
-	}
-	
-	.other_contact dt, .about_contact dt, .info dt, .user_info dt {
-		font-weight: bold;
-		padding: 3px 6px;
-		clear: both;
-		width: 30%;
-		/*white-space: nowrap;*/
-	}
-
-	.other_contact dd, .about_contact dd, .info dd, .user_info dd {
-		padding: 3px 6px;
-		width: 55%;
-	}
-	
-	.info dd, .user_info dd {	
-		margin-left: 35%;
-	}	
-
-.recent_activity {
-	padding:0px 2px 5px 5px;
-	width:99%;
-}
-
-.recent_activity .general_box {
-	background: #eef3f8;
-}
-
-.recent_activity a {
-	text-decoration: none;
-}
-
-.recent_activity #tab_recentActivity {
-	line-height: 150%;
-}
-
-	.recent_activity #tab_recentActivity h4 {
-		color: #1d3652;
-		font-size: 1.1em;
-		font-weight: normal;
-		padding: 10px;
-	}
-
-	.recent_activity #tab_recentActivity ol {
-		font-size: 0.9em;
-		padding: 0 0 10px 20px;
-	}
-
-	.recent_activity li img {
-		padding-right: 6px;
-	}
-
-	.tab_general .general_box,
-	.tab_forums_posts .general_box,
-	.tab_topics .general_box {
-		/*max-height: 250px;*/
-		overflow: auto !important;
-	}
-		
-		.tab_general h4,
-		.tab_forums_posts h4,
-		.tab_forums_topics h4 {
-			font-size: 1.05em;
-			font-weight: normal;
-			padding: 6px 0 0 6px;
-		}
-
-		.tab_general .post_body,
-		.tab_forums_posts .post_body,
-		.tab_forums_topics .post_body {
-			background-color: #fafbfc;
-			border-bottom: 1px solid #d5dde5;
-			padding: 10px 10px 25px 18px;
-			line-height: 140%;
-			margin-left: 0;
-		}
-
-		.tab_general p.posted_info,
-		.tab_forums_posts p.posted_info,
-		.tab_forums_topics p.posted_info {
-			padding: 0 0 6px 6px;
-			margin: 0;
-		}
-
-#post_comment {
-	padding: 10px 10px 10px 30px;
-}
-
-	#post_comment .photo {
-		margin: 0 16px 0 6px;
-	}
-
-	#post_comment .input_textarea {
-		margin-bottom: 8px;
-		width: 380px;
-	}
-
-	#post_comment .input_submit {
-		margin: 0 10px 0 50px;
-	}
-	
-#latest_visitors {
-	margin-top: 12px;
-}
-
-	#latest_visitors li .photo {
-		margin: 2px 10px 0 0;
-		float: left;
-	}
-
-	#latest_visitors li {
-		clear: both;
-		padding: 5px;
-	}
-	
-/* Status updates stuffs */
-.status_profile_actions {
-	font-size: 0.9em;
-}
-
-.status_profile_actions .desc {
-	font-size: 0.8em;
-}
-
-.status_profile_page #statusUpdate {
-	width: 80%;
-}</css_content>
+#status_wrapper .ipsBox_container {
+	margin-bottom: 9px;
+}]]></css_content>
     <css_position>1</css_position>
     <css_app>members</css_app>
     <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
+    <css_attributes><![CDATA[title="Main" media="screen,print"]]></css_attributes>
     <css_removed>0</css_removed>
     <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
     <css_master_key>root</css_master_key>
   </cssfile>
 </css>
diff --git a/upload/admin/applications/members/xml/members_root_templates.xml b/upload/admin/applications/members/xml/members_root_templates.xml
index 530ffd75..a6458c4d 100644
--- a/upload/admin/applications/members/xml/members_root_templates.xml
+++ b/upload/admin/applications/members/xml/members_root_templates.xml
@@ -1,72 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates application="members" templategroups="a:5:{s:14:&quot;skin_messaging&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_mlist&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_online&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_profile&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_ucp&quot;;s:5:&quot;exact&quot;;}">
   <templategroup group="skin_messaging">
+    <template>
+      <template_group>skin_messaging</template_group>
+      <template_content><![CDATA[<h3>{$this->lang->words['pm_disabled_title']}</h3>
+<div class='ipsPad'>
+	{$this->lang->words['your_pm_is_disabled']}
+	<if test="notByAdmin:|:$this->memberData['members_disable_pm'] != 2">
+	<p class='ipsForm_center'>
+		<br />
+		<a href="{parse url="module=messaging&amp;section=view&amp;do=enableMessenger&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" class='ipsButton_secondary'>{$this->lang->words['pm_disabled_reactivate']}</a>
+		<a href='{parse url="act=idx" template="act=idx" seotitle="true"  base="public"}' class='ipsButton_secondary'>{$this->lang->words['go_board_index']}</a>
+		</p>
+	</if>
+ </div>]]></template_content>
+      <template_name>messengerDisabled</template_name>
+      <template_data/>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
     <template>
       <template_group>skin_messaging</template_group>
       <template_content><![CDATA[{parse js_module="messenger"}
-<h2>{$this->lang->words['m_messenger']}</h2>
+<script type="text/javascript">
+	ipb.messenger.disabled  = {parse expression="intval($this->memberData['members_disable_pm'])"};
+</script>
+<if test="PMDisabled:|:$this->memberData['members_disable_pm']">
+<noscript>
+	{parse template="messengerDisabled" group="messaging"}
+</noscript>
+</if>
 <div id='messenger_utilities' class='left'>
 	<!-- Show topic participants -->
 	<if test="hasParticipants:|:is_array( $topicParticipants ) and count( $topicParticipants )">
-		<div class='general_box alt' id='participants'>
+		<div class='ipsSideBlock' id='participants'>
 			<h3 class='bar'>{$this->lang->words['participants']}</h3>
-			{parse striping="participants" classes="row1,row2"}
-			<ul id='participants_list'>
+			<ul id='participants_list' class='ipsList_withminiphoto'>
 				<foreach loop="participants:$topicParticipants as $memberID => $memberData">
-					<li class='{parse striping="participants"}'>
-						<a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ><img src='{$memberData['pp_thumb_photo']}' width='{$memberData['pp_thumb_width']}' height='{$memberData['pp_thumb_height']}' alt='{$this->lang->words['photo']}' class='photo' /></a>
-						<if test="notification:|:$memberData['map_ignore_notification']">
-							{parse replacement="msg_notify_off"}
-						<else />
-							{parse replacement="msg_notify_on"}
-						</if>
-						<if test="userIsActive:|:$memberData['map_user_active']">
-							<if test="userIsStarter:|:$memberData['map_is_starter']">
-								<span class='name starter'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-							<else />
-								<span class='name'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$memberData['members_display_name_short']}</a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-							</if>
-							<br />
-							<span class='desc'>
-								<if test="messageIsDeleted:|:$memberData['_topicDeleted']">
-									<em>{$this->lang->words['topic_deleted']}</em>
+					<li class='clearfix'>
+						<if test="isMemberPartOpen:|:$memberData['member_id']"><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'></if><img src='{$memberData['pp_small_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini<if test="isMemberPartFloat:|:!$memberData['member_id']"> left</if>' /><if test="isMemberPartClose:|:$memberData['member_id']"></a></if>
+						<p class='list_content'>
+							<if test="userIsActive:|:$memberData['map_user_active']">
+								<if test="userIsStarter:|:$memberData['map_is_starter']">
+									<span class='name starter'>{parse template="userHoverCard" group="global" params="$memberData"}</span>
 								<else />
-									{$this->lang->words['last_read']}
-									<if test="lastReadTime:|:$memberData['map_read_time']">
-										{parse date="$memberData['map_read_time']" format="short"}
-									<else />
-										<em>{$this->lang->words['not_yet_read']}</em>
-									</if>
-								</if>							
-							</span>
-							<if test="blockUserLink:|:! $memberData['map_is_starter'] AND $memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod']) AND ( $memberData['map_user_id'] != $this->memberData['member_id'] ) AND !$memberData['_topicDeleted']">
-								<br /><a href="{parse url="module=messaging&amp;section=view&amp;do=blockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='{$this->lang->words['block_this_user']}' class='cancel'>{$this->lang->words['block']}</a>
-							</if>
-						<else />
-							<if test="userIsBanned:|:$memberData['map_user_banned']">
-								<span class='name blocked'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-								<br />
-								<span class='desc'>{$this->lang->words['user_is_blocked']}</span>
-								<br />
-								<if test="unbanUserLink:|:$memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod'])">
-									<a href="{parse url="module=messaging&amp;section=view&amp;do=unblockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='{$this->lang->words['unblock_this_user']}' class='cancel'>{$this->lang->words['unblock']}</a>
+									<span class='name'>{parse template="userHoverCard" group="global" params="$memberData"}</span>
 								</if>
-							<else />
-								<span class='name left_convo'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
 								<br />
-								<span class='desc'>
-									<if test="topicUnavailable:|:$memberData['_topicDeleted']">
-									<em>{$this->lang->words['topic_deleted']}</em>
+								<span class='ipsType_smaller desc'>
+									<if test="messageIsDeleted:|:$memberData['_topicDeleted']">
+										<em>{$this->lang->words['topic_deleted']}</em>
 									<else />
-										<if test="systemMessage:|:$memberData['map_is_system']">
-											{$this->lang->words['is_unable_part']}
+										{$this->lang->words['last_read']}
+										<if test="lastReadTime:|:$memberData['map_read_time']">
+											{parse date="$memberData['map_read_time']" format="short"}
 										<else />
-											{$this->lang->words['has_left_convo']}
+											<em>{$this->lang->words['not_yet_read']}</em>
 										</if>
 									</if>
+									<if test="notification:|:$memberData['map_ignore_notification']">
+										<span class='ipsBadge ipsBadge_lightgrey right'>{$this->lang->words['msg_no_notify']}</span>
+									</if>						
 								</span>
+								<if test="blockUserLink:|:! $memberData['map_is_starter'] AND $memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod']) AND ( $memberData['map_user_id'] != $this->memberData['member_id'] ) AND !$memberData['_topicDeleted']">
+									<br /><a href="{parse url="module=messaging&amp;section=view&amp;do=blockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='{$this->lang->words['block_this_user']}' class='cancel'>{$this->lang->words['block']}</a>
+								</if>
+							<else />
+								<if test="userIsBanned:|:$memberData['map_user_banned']">
+									<span class='name blocked'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name_short']}</strong></a></span>
+									<br />
+									<span class='desc'>{$this->lang->words['user_is_blocked']}</span>
+									<br />
+									<if test="unbanUserLink:|:$memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod'])">
+										<a href="{parse url="module=messaging&amp;section=view&amp;do=unblockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='{$this->lang->words['unblock_this_user']}' class='cancel'>{$this->lang->words['unblock']}</a>
+									</if>
+								<else />
+									<span class='name left_convo'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><strong>{$memberData['members_display_name_short']}</strong></a></span>
+									<br />
+									<span class='desc'>
+										<if test="topicUnavailable:|:$memberData['_topicDeleted']">
+										<em>{$this->lang->words['topic_deleted']}</em>
+										<else />
+											<if test="systemMessage:|:$memberData['map_is_system']">
+												{$this->lang->words['is_unable_part']}
+											<else />
+												{$this->lang->words['has_left_convo']}
+											</if>
+										</if>
+									</span>
+								</if>
 							</if>
-						</if>
+						</p>
 					</li>
 				</foreach>					
 			</ul>
@@ -74,23 +101,16 @@
 				<li>
 					<a href='{parse url="module=messaging&amp;section=view&amp;do=toggleNotifications&amp;topicID={$this->request['topicID']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['toggle_noti_title']}'>
 					<if test="changeNotifications:|:$topicParticipants[ $this->memberData['member_id'] ]['map_ignore_notification']">
-						{parse replacement="msg_notify_on"} {$this->lang->words['turn_noti_on']}
+						{$this->lang->words['turn_noti_on']}
 					<else />
-						{parse replacement="msg_notify_on"} {$this->lang->words['turn_noti_off']}
+						{$this->lang->words['turn_noti_off']}
 					</if>
 					</a>
 				</li>
 			</ul>
 		</div>
-		<div id='invite_more' class='general_box alt'>
-			<h3>{$this->lang->words['msg_email_convo']}</h3>
-			<div><p class='desc' id='email_convo_text_{$this->request['topicID']}'>{parse expression="sprintf( $this->lang->words['msg_email_convo_text'], $this->memberData['email'])"}</p></div>
-			<ul class='post_controls'>
-				<li id='email_convo_{$this->request['topicID']}' class='email_convo'><a href='#' title='{$this->lang->words['msg_email_go']}'>{parse replacement="send_msg"}&nbsp; {$this->lang->words['msg_email_go']}</a></li>
-			</ul>
-		</div>
 		<if test="inviteMoreParticipants:|:$this->memberData['g_max_mass_pm'] && count( $topicParticipants ) < $this->memberData['g_max_mass_pm'] && ! $deletedTopic">
-			<div id='invite_more' class='general_box alt'>
+			<div id='invite_more' class='ipsSideBlock'>
 				<h3>{$this->lang->words['invite_part']}</h3>
 				<div id='invite_more_dialogue'>
 					<form method='post' action='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=addParticipants" base="public"}'>
@@ -118,13 +138,13 @@
 						</script>
 					</if>
 					<ul class='post_controls'>
-						<li id='add_participants'><a href='#' title='{$this->lang->words['add_participants']}'>{parse replacement="add_participants"}&nbsp; {$this->lang->words['part_add']}</a></li>
+						<li id='add_participants'><a href='#' title='{$this->lang->words['add_participants']}'>{$this->lang->words['part_add']}</a></li>
 					</ul>
 				</div>
 			</div>
 		</if>
 	</if>
-	<div id='folder_list' class='general_box alt'>
+	<div id='folder_list' class='ipsSideBlock'>
 		<h3>{$this->lang->words['folders']}</h3>
 		<ol id='folders'>
 			<if test="myDirectories:|:count($dirData)">
@@ -152,9 +172,8 @@
 		</ol>
 		<div class='clearfix post_controls'>
 			<ul class='post_controls'>
-				<!-- SKINNOTE: We need a static way to add/edit folders -->
-				<li id='add_folder'><a href='#' title='{$this->lang->words['add_folder']}'>{parse replacement="add_folder"} {$this->lang->words['folder_add']}</a></li>
-				<li id='edit_folders'><a href='#' title='{$this->lang->words['edit_folders']}'>{parse replacement="edit_folder"} {$this->lang->words['folders_edit']}</a></li>
+				<li id='add_folder'><a href='#' title='{$this->lang->words['add_folder']}'>{$this->lang->words['folder_add']}</a></li>
+				<li id='edit_folders'><a href='#' title='{$this->lang->words['edit_folders']}'>{$this->lang->words['folders_edit']}</a></li>
 			</ul>
 		</div>
 		<script type='text/javascript'>
@@ -164,7 +183,7 @@
 		</script>
 	</div>
 	<if test="storageBar:|:$this->memberData['g_max_messages'] > 0">
-		<div id='space_allowance' class='general_box'>
+		<div id='space_allowance' class='ipsSideBlock'>
 			<h3>{$this->lang->words['storage']}</h3>
 			<p>{$this->lang->words['your_messenger_storage']}</p>
 			<p class='progress_bar' title='{parse expression="sprintf( $this->lang->words['pmpc_full_string'], $totalData['full_percent'] )"}' <if test="almostFull:|:$totalData['full_percent'] > 80">class='limit'</if>>
@@ -175,7 +194,7 @@
 			</p>
 		</div>
 	</if>
-	<div id='message_search' class='general_box'>
+	<div id='message_search' class='ipsSideBlock'>
 		<h3>{$this->lang->words['search_messages']}</h3>
 		<form action='{$this->settings['base_url']}app=members&amp;module=messaging&amp;section=search' method='post'>
 			<fieldset>
@@ -183,6 +202,12 @@
 			</fieldset>
 		</form>
 	</div>
+	<br />
+	
+	<a class='ipsButton_secondary cancel' href="{parse url="module=messaging&amp;section=view&amp;do=disableMessenger&amp;authKey={$this->member->form_hash}" base="publicWithApp"}"'>{$this->lang->words['disable_messenger']}</a>
+	<!--<ul class='topic_buttons'>
+		<li class='important'></li>
+	</ul>-->
 </div>
 <div id='messenger_content' class='right'>
 	<if test="inlineError:|:$inlineError">
@@ -193,10 +218,14 @@
 	</if>
 	{$html}
 </div>
-<!-- end -->]]></template_content>
+<!-- end -->
+<div id='pmDisabled' style='display:none'>
+	{parse template="messengerDisabled" group="messaging"}
+</div>
+<br class='clear' />]]></template_content>
       <template_name>messengerTemplate</template_name>
       <template_data><![CDATA[$html, $jumpmenu, $dirData, $totalData=array(), $topicParticipants=array(), $inlineError='', $deletedTopic=0]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -211,18 +240,23 @@
 		<h3>{$this->lang->words['quick_send_to']} {$toMemberData['members_display_name']}</h3>
 		<div id='pm_error_{$toMemberData['member_id']}'>
 			<br />
-			<p class='message error'></p></div>
-			<script type='text/javascript'>
-				$('pm_error_{$toMemberData['member_id']}').hide();
-			</script>
-		<ul>
-			<li class='field'>
-				<label for='pm_subject_{$toMemberData['member_id']}'>{$this->lang->words['quick_subject']}</label>
-				<input type='text' class='input_text' id='pm_subject_{$toMemberData['member_id']}' name='msg_title' size='50' tabindex='0' />
+			<p class='message error'></p>
+		</div>
+		<script type='text/javascript'>
+			$('pm_error_{$toMemberData['member_id']}').hide();
+		</script>
+		<ul class='ipsForm ipsForm_vertical ipsPad'>
+			<li class='ipsField'>
+				<label for='pm_subject_{$toMemberData['member_id']}' class='ipsField_title'>{$this->lang->words['quick_subject']}</label>
+				<p class='ipsField_content'>
+					<input type='text' class='input_text' id='pm_subject_{$toMemberData['member_id']}' name='msg_title' size='50' tabindex='0' />
+				</p>
 			</li>
-			<li class='field'>
-				<label for='pm_textarea_{$toMemberData['member_id']}'>{$this->lang->words['quick_message']}</label>
-				<textarea class='input_text' name='Post' tabindex='0' id='pm_textarea_{$toMemberData['member_id']}' cols='70' rows='8'></textarea>
+			<li class='ipsField'>
+				<label for='pm_textarea_{$toMemberData['member_id']}' class='ipsField_title'>{$this->lang->words['quick_message']}</label>
+				<p class='ipsField_content'>
+					<textarea class='input_text' name='Post' tabindex='0' id='pm_textarea_{$toMemberData['member_id']}' cols='65' rows='8'></textarea>
+				</p>
 			</li>
 		</ul>
 	</fieldset>
@@ -232,7 +266,7 @@
 </form>]]></template_content>
       <template_name>PMQuickForm</template_name>
       <template_data>$toMemberData</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -262,67 +296,71 @@
 	<p>{$this->lang->words['pme_none_sent']}</p>
 </div>
 </if>
-<div class='generic_bar'></div>
-<fieldset>
-	<h3 class='bar'>{$this->lang->words['pro_recips']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='entered_name'>{$this->lang->words['to_whom']}</label>
-			<input type="text" class='input_text' id='entered_name' name="entered_name" size="30" value="{$displayData['name']}" tabindex="0" />
-		</li>
-		<if test="newTopicInvite:|:intval($this->memberData['g_max_mass_pm'])">
-			<li class='field'>
-				<label for='more_members'>{$this->lang->words['other_recipients']}</label>
-				<input type='text' size="50" class='input_text' name='inviteUsers' value='{$displayData['inviteUsers']}' id='more_members' tabindex='0' />
-				<span class='desc'>{$this->lang->words['youmay_add_to']} <strong>{$this->memberData['g_max_mass_pm']}</strong> {$this->lang->words['youmay_suffix']}</span>
-			</li>
-			<li class='field'>
-				<label for='send_type'>{$this->lang->words['send_to_as']}</label>
-				<select name='sendType' id='send_type' tabindex='0'>
-					<option value='invite'<if test="formReloadInvite:|:$this->request['sendType']=='invite'"> selected='selected'</if>>{$this->lang->words['send__invite']}</option>
-					<option value='copy'<if test="formReloadCopy:|:$this->request['sendType']=='copy'"> selected='selected'</if>>{$this->lang->words['send__copy']}</option>
-				</select>
-				<span class='desc'>
-					<strong>{$this->lang->words['send__invite']}</strong> {$this->lang->words['invite__desc']}<br />
-					<strong>{$this->lang->words['send__copy']}</strong> {$this->lang->words['copy__desc']}
-				</span>
-			</li>				
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		<fieldset>
+			<h3 class='bar'>{$this->lang->words['pro_recips']}</h3>
+			<ul>
+				<li class='field'>
+					<label for='entered_name'>{$this->lang->words['to_whom']}</label>
+					<input type="text" class='input_text' id='entered_name' name="entered_name" size="30" value="{$displayData['name']}" tabindex="0" />
+				</li>
+				<if test="newTopicInvite:|:intval($this->memberData['g_max_mass_pm'])">
+					<li class='field'>
+						<label for='more_members'>{$this->lang->words['other_recipients']}</label>
+						<input type='text' size="50" class='input_text' name='inviteUsers' value='{$displayData['inviteUsers']}' id='more_members' tabindex='0' />
+						<span class='desc'>{$this->lang->words['youmay_add_to']} <strong>{$this->memberData['g_max_mass_pm']}</strong> {$this->lang->words['youmay_suffix']}</span>
+					</li>
+					<li class='field'>
+						<label for='send_type'>{$this->lang->words['send_to_as']}</label>
+						<select name='sendType' id='send_type' tabindex='0'>
+							<option value='invite'<if test="formReloadInvite:|:$this->request['sendType']=='invite'"> selected='selected'</if>>{$this->lang->words['send__invite']}</option>
+							<option value='copy'<if test="formReloadCopy:|:$this->request['sendType']=='copy'"> selected='selected'</if>>{$this->lang->words['send__copy']}</option>
+						</select>
+						<span class='desc'>
+							<strong>{$this->lang->words['send__invite']}</strong> {$this->lang->words['invite__desc']}<br />
+							<strong>{$this->lang->words['send__copy']}</strong> {$this->lang->words['copy__desc']}
+						</span>
+					</li>				
+				</if>
+			</ul>
+		</fieldset>
+		<fieldset>
+			<h3 class='bar'>{$this->lang->words['pro_message']}</h3>
+			<ul>
+				<li class='field'>
+					<label for='message_subject'>{$this->lang->words['message_subject_send']}</label>
+					<input type="text" name="msg_title" id='message_subject' class='input_text' size="40" tabindex="0" maxlength="40" value="{$displayData['title']}" />
+				</li>
+				<li>
+					{$displayData['editor']}
+				</li>
+			</ul>
+		</fieldset>
+		
+		<if test="newTopicUploads:|:$displayData['uploadData']['canUpload']">
+		<fieldset class='attachments'>
+			{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], 0"}
+		</fieldset>
 		</if>
-	</ul>
-</fieldset>
-<fieldset>
-	<h3 class='bar'>{$this->lang->words['pro_message']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='message_subject'>{$this->lang->words['message_subject_send']}</label>
-			<input type="text" name="msg_title" id='message_subject' class='input_text' size="40" tabindex="0" maxlength="40" value="{$displayData['title']}" />
-		</li>
-		<li>
-			{$displayData['editor']}
-		</li>
-	</ul>
-</fieldset>
-<if test="newTopicUploads:|:$displayData['uploadData']['canUpload']">
-<fieldset class='attachments'>
-	{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], 0"}
-</fieldset>
-</if>
-<input type='hidden' name='topicID' value="{$displayData['topicID']}" />
-<input type='hidden' name="postKey" value="{$displayData['postKey']}" />
-<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-<fieldset class='submit'>
-	<input class='input_submit' name="dosubmit" type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
-	<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="preview" />
-	<input class='input_submit alt' type="submit" value="{$this->lang->words['pms_send_later']}" tabindex="0" name="save" />
-	{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-</fieldset>
+		<input type='hidden' name='topicID' value="{$displayData['topicID']}" />
+		<input type='hidden' name="postKey" value="{$displayData['postKey']}" />
+		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
+		<fieldset class='submit'>
+			<input class='input_submit' name="dosubmit" type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
+			<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="preview" />
+			<input class='input_submit alt' type="submit" value="{$this->lang->words['pms_send_later']}" tabindex="0" name="save" />
+			{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+		</fieldset>
+	</div>
+</div>
 </form>
 </div>
 {parse template="include_highlighter" group="global" params=""}
 <br />]]></template_content>
       <template_name>sendNewPersonalTopicForm</template_name>
       <template_data>$displayData</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -350,15 +388,6 @@
 	</div>
 	<br />
 </if>
-<if test="formErrors:|:$displayData['errors']">
-	<h4>{$this->lang->words['err_errors']}</h4>
-	<p>
-		{$displayData['errors']}
-		<br />
-		<br />
-		{$this->lang->words['pme_none_sent']}
-	</p>
-</if>
 <h2 class='maintitle'>
 	<if test="formHeaderText:|:$displayData['type'] == 'reply'">
 		{$this->lang->words['compose_reply']}
@@ -366,41 +395,51 @@
 		{$this->lang->words['editing_message']}
 	</if>
 </h2>
-<div class='generic_bar'></div>
-<fieldset>
-	<h3 class='bar'>{$this->lang->words['pro_message']}</h3>
-	<ul>
-		<li>
-			{$displayData['editor']}
-		</li>
-	</ul>
-</fieldset>
-<if test="attachmentForm:|:$displayData['uploadData']['canUpload']">
-<fieldset class='attachments'>
-	{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], $displayData['msgID'], 0"}
-</fieldset>
+<if test="formErrors:|:$displayData['errors']">
+<div class='message error'>
+	<h4>{$this->lang->words['err_errors']}</h4>
+	<foreach loop="replyerrors:$displayData['errors'] as $_error">
+		<p>{$_error}</p>
+	</foreach>
+	<p>{$this->lang->words['pme_none_sent']}</p>
+</div>
 </if>
-<fieldset id='pm_options'>
-	<!-- nothing here now... so you can remove that 'pm_options' class, if there is one -->
-</fieldset>
-<fieldset class='submit'>
-	<if test="replyOptions:|:$displayData['type'] == 'reply'">
-		<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
-		<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="previewReply" />
-		{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-	<else />
-		<input class='input_submit' type="submit" value="{$this->lang->words['save_message_button']}" tabindex="0" accesskey="s" />
-		<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="previewReply" />
-		{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
-	</if>
-	
-</fieldset>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		<fieldset>
+			<ul>
+				<li>
+					{$displayData['editor']}
+				</li>
+			</ul>
+		</fieldset>
+		
+		<if test="attachmentForm:|:$displayData['uploadData']['canUpload']">
+		<fieldset class='attachments'>
+			{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], $displayData['msgID'], 0"}
+		</fieldset>
+		</if>
+		
+		<fieldset class='submit'>
+			<if test="replyOptions:|:$displayData['type'] == 'reply'">
+				<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" tabindex="0" accesskey="s" />
+				<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="previewReply" />
+				{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+			<else />
+				<input class='input_submit' type="submit" value="{$this->lang->words['save_message_button']}" tabindex="0" accesskey="s" />
+				<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="0" name="previewReply" />
+				{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel' tabindex='0'>{$this->lang->words['cancel']}</a>
+			</if>
+			
+		</fieldset>
+	</div>
+</div>
 </form>
 </div>
 <br />]]></template_content>
       <template_name>sendReplyForm</template_name>
       <template_data>$displayData</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -412,166 +451,133 @@
 {parse template="include_lightbox" group="global" params=""}
 </if>
 {parse template="include_highlighter" group="global" params="1"}
+{parse js_module="topic"}
+<script type="text/javascript">
+//<!#^#|CDATA|
+	ipb.topic.inSection = 'messenger';
+//|#^#]>
+</script>
 <div id='conversation'>
-	
-<div class='topic_controls'>
+<div class='topic_controls clearfix'>
 	{$topic['_pages']}
 	<ul class='topic_buttons'>
-		<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a></li>
-		<if test="canReply:|:$topic['_canReply']">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a></li>
-		<else />
-			<li class='disabled'><span>{$this->lang->words['you_cannot_reply']}</span></li>
-		</if>
-		<!-- SKINNOTE: Can probably do with some kind of 'are you sure' dialogue here.. -->
-		<li><a id='pm_delete_t_{$topic['mt_id']}' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{parse replacement="delete_msg_icon"} {$this->lang->words['option__delete']}</a></li>
+		<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{$this->lang->words['compose_new']}</a></li>
+ 		<li class='important'><a id='pm_delete_t_{$topic['mt_id']}' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{$this->lang->words['option__delete']}</a></li>
 	</ul>
 	<script type='text/javascript'>
 		$('pm_delete_t_{$topic['mt_id']}').observe('click', ipb.messenger.deletePM.bindAsEventListener( this, {$topic['mt_id']} ) );
 	</script>
 </div>
-<br />
 <h2 class='maintitle'>{$topic['mt_title']}</h2>
-<div class='generic_bar'></div>
-<foreach loop="replies:$replies as $msg_id => $msg">
-	<a id='msg{$msg['msg_id']}'></a>
-	<div class='post_block first hentry' id='post_id_{$msg['msg_id']}'>
-		<div class='post_wrap'>
-			<if test="hasAuthorId:|:$members[ $msg['msg_author_id'] ]['member_id']">
-				<h3>
-			<else />
-				<h3 class='guest'>
-			</if>
-					<if test="authorOnline:|:$members[ $msg['msg_author_id'] ]['member_id']">
-						<if test="$members[ $msg['msg_author_id'] ]['_online']">
-							{parse replacement="user_online"}
-						<else />
-							{parse replacement="user_offline"}
-						</if> &nbsp;
-								<span class="author vcard"><a class="url fn" href='{parse url="showuser={$members[ $msg['msg_author_id'] ]['member_id']}" base="public" template="showuser" seotitle="{$members[ $msg['msg_author_id'] ]['members_seo_name']}"}'>{$members[ $msg['msg_author_id'] ]['members_display_name']}</a>{parse template="user_popup" group="global" params="$members[ $msg['msg_author_id'] ]['member_id'], $members[ $msg['msg_author_id'] ]['members_seo_name']"}</span>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		<foreach loop="replies:$replies as $msg_id => $msg">
+			<a id='msg{$msg['msg_id']}'></a>
+			<div class='post_block first hentry' id='post_id_{$msg['msg_id']}'>
+				<div class='post_wrap'>
+					<if test="hasAuthorId:|:$members[ $msg['msg_author_id'] ]['member_id']">
+						<h3 class='row2'>
 					<else />
-						{$members[ $msg['msg_author_id'] ]['members_display_name']}
+						<h3 class='guest row2'>
 					</if>
-					<if test="authorIpAddress:|:$msg['_ip_address'] != ''">
-						<span class='ip'>({$this->lang->words['ip']}:
-						<if test="authorPrivateIp:|:$members[ $msg['msg_author_id'] ]['g_access_cp']">
-							<em>{$this->lang->words['ip_private']}</em>
-						<else />
-							<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom&amp;ip={$msg['_ip_address']}" base="public"}" title='{$this->lang->words['find_info_about_ip']}'>{$msg['_ip_address']}</a>
+							<if test="authorOnline:|:$members[ $msg['msg_author_id'] ]['member_id']">
+								<span class="author vcard">{parse template="userHoverCard" group="global" params="$members[ $msg['msg_author_id'] ]"}</span>
+							<else />
+								{$members[ $msg['msg_author_id'] ]['members_display_name']}
+							</if>
+							<if test="authorIpAddress:|:$msg['_ip_address'] != ''">
+								<span class='ip right ipsType_small'>({$this->lang->words['ip']}:
+								<if test="authorPrivateIp:|:$members[ $msg['msg_author_id'] ]['g_access_cp']">
+									<em>{$this->lang->words['ip_private']}</em>
+								<else />
+									<if test="accessModCP:|:$this->memberData['g_is_supmod']"><a href="{parse url="app=core&amp;module=modcp&amp;fromapp=members&amp;tab=iplookup&amp;ip={$msg['_ip_address']}" base="public"}" title='{$this->lang->words['find_info_about_ip']}'>{$msg['_ip_address']}</a><else />{$msg['_ip_address']}</if>
+								</if>
+								)</span>
+							</if>
+						</h3>
+					<div class='author_info'>
+						{parse template="userInfoPane" group="global" params="$members[ $msg['msg_author_id'] ], $msg_id, array()"}
+					</div>
+					<div class='post_body'>
+						<p class='posted_info'>{$this->lang->words['pc_sent']} {parse date="$msg['msg_date']" format="long"}</p>
+						<div class='post entry-content'>
+							{$msg['msg_post']}
+							{$msg['attachmentHtml']}
+						</div>
+						<if test="viewSigs:|:$this->memberData['view_sigs'] AND $members[ $msg['msg_author_id'] ]['signature']">
+							{parse template="signature_separator" group="global" params="$members[ $msg['msg_author_id'] ]['signature'], $msg['msg_author_id'], IPSMember::isIgnorable( $members[ $msg['msg_author_id'] ]['member_group_id'], $members[ $msg['msg_author_id'] ]['mgroup_others'] )"}
 						</if>
-						)</span>
-					</if>
-				</h3>
-			<div class='author_info'>
-				{parse template="userInfoPane" group="global" params="$members[ $msg['msg_author_id'] ], $msg_id, array()"}
-			</div>
-			<div class='post_body'>
-				<p class='posted_info'>{$this->lang->words['pc_sent']} {parse date="$msg['msg_date']" format="long"}</p>
-				<div class='post entry-content'>
-					{$msg['msg_post']}
-					{$msg['attachmentHtml']}
+						<ul class='post_controls clearfix clear'>
+							<if test="quickReply:|:$topic['_canReply'] AND empty( $topic['_everyoneElseHasLeft'] )">
+								<li>
+									<a class='ipsButton_secondary' href="{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{$this->lang->words['pc_reply']}</a>
+								</li>
+							</if>
+							<if test="reportPm:|:$topic['_canReport'] and $this->memberData['member_id']">
+								<li class='report'>
+									<a href='{parse url="app=core&amp;module=reports&amp;rcom=messages&amp;topicID={$this->request['topicID']}&amp;st={$this->request['st']}&amp;msg={$msg['msg_id']}" base="public"}'>{$this->lang->words['pc_report']}</a>
+								</li>
+							</if>
+							<if test="canEdit:|:$msg['_canEdit'] === TRUE">
+								<li class='post_edit' id='edit_post_{$msg['msg_id']}'>
+									<a href='{parse url="module=messaging&amp;section=send&amp;do=editMessage&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}' title='{$this->lang->words['edit_this_post']}'>{$this->lang->words['pc_edit']}</a>
+								</li>
+							</if>
+							<if test="canDelete:|:$msg['_canDelete'] === TRUE && $msg['msg_is_first_post'] != 1">
+								<li class='post_del' id='del_post_{$msg['msg_id']}'>
+									<a href='{parse url="module=messaging&amp;section=send&amp;do=deleteReply&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['delete_this_post']}' class='delete_post'>{$this->lang->words['pc_delete']}</a>
+								</li>
+							</if>
+						</ul>
+					</div>
 				</div>
-				<if test="viewSigs:|:$this->memberData['view_sigs'] AND $members[ $msg['msg_author_id'] ]['signature']">
-					{parse template="signature_separator" group="global" params="$members[ $msg['msg_author_id'] ]['signature']"}
-				</if>
 			</div>
-			<ul class='post_controls'>
-				<if test="reportPm:|:($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-					<li class='report'>
-						<a href='{parse url="app=core&amp;module=reports&amp;rcom=messages&amp;topicID={$this->request['topicID']}&amp;st={$this->request['st']}&amp;msg={$msg['msg_id']}" base="public"}'>{parse replacement="report_post_icon"} {$this->lang->words['pc_report']}</a>
-					</li>
-				</if>
-				<if test="quickReply:|:$topic['_canReply']">
-					<li>
-						<a href="{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{parse replacement="reply_post_icon"} {$this->lang->words['pc_reply']}</a>
-					</li>
-				</if>
-				<if test="canEdit:|:$msg['_canEdit'] === TRUE">
-					<li class='post_edit' id='edit_post_{$msg['msg_id']}'>
-						<a href='{parse url="module=messaging&amp;section=send&amp;do=editMessage&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}' title='{$this->lang->words['edit_this_post']}'>{parse replacement="edit_post_icon"} {$this->lang->words['pc_edit']}</a>
-					</li>
-				</if>
-				<if test="canDelete:|:$msg['_canDelete'] === TRUE && $msg['msg_is_first_post'] != 1">
-					<li class='post_del' id='del_post_{$msg['msg_id']}'>
-						<a href='{parse url="module=messaging&amp;section=send&amp;do=deleteReply&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}' title='{$this->lang->words['delete_this_post']}' class='delete_post'>{parse replacement="delete_post_icon"} {$this->lang->words['pc_delete']}</a>
-					</li>
-				</if>
-			</ul>
-		</div>		
+		</foreach>
 	</div>
-</foreach>
-<br />
-<div class='topic_controls clear'>
-	{$topic['_pages']}
-	<ul class='topic_buttons'>
-		<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a></li>
-		<if test="canReplyBottom:|:$topic['_canReply']">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} {$this->lang->words['add_reply']}</a></li>
-		<else />
-			<li class='disabled'><span>{$this->lang->words['you_cannot_reply']}</span></li>
-		</if>
-		<!-- SKINNOTE: Can probably do with some kind of 'are you sure' dialogue here.. -->
-		<li><a id='pm_delete_b_{$topic['mt_id']}' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{parse replacement="delete_msg_icon"} {$this->lang->words['pc_delete']}</a></li>
-	</ul>
-	<script type='text/javascript'>
-		$('pm_delete_b_{$topic['mt_id']}').observe('click', ipb.messenger.deletePM.bindAsEventListener( this, {$topic['mt_id']} ) );
-	</script>
 </div>
-<br />
-<if test="canReplyEditor:|:$topic['_canReply']">
-	{parse js_module="editor"}
-	<script type='text/javascript'>
-		//<!#^#|CDATA|
-		{parse template="editorJS" group="editors" params=""}
-		//|#^#]>
-	</script>
-	
+<if test="allAlone:|: ! empty( $topic['_everyoneElseHasLeft'] )">
+<div class='ipsBox'>
+	<div class='ipsBox_container ipsPad'>
+		<h1 class='ipsType_subtitle'>{$this->lang->words['msg_all_alone_title']}</h1>
+		<p>{$this->lang->words['msg_all_alone_desc']}</p>
+	</div>
+</div>
+<else />
+	<if test="canReplyEditor:|:$topic['_canReply']">
 	<br />
-	<div id='fast_reply' style='display: {$displayData['fast_reply']}'>
-		<h3 class='maintitle'>{$this->lang->words['pc_fast_reply']}</h3>
-		<div class='generic_bar'></div>
-		<div class='general_box alt'>
-			<form action='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=sendReply&amp;topicID={$topic['mt_id']}" base="public"}' method='post'>
-				{parse template="editorShell" group="editors" params="'fast-reply', 'msgContent', '', 1"}
-				<fieldset class='submit'>
+	<div class='ipsBox'>
+		<div class='ipsBox_container ipsPad'>
+			<h1 class='ipsType_subtitle'>{$this->lang->words['pc_fast_reply']}</h1>
+			<br />
+			<a href="{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}" title='{$this->lang->words['your_profile']}' class='ipsUserPhotoLink left'><img src='{$this->memberData['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$this->memberData['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+			<div class='ipsBox_withphoto clearfix'>
+				<form action='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=sendReply&amp;topicID={$topic['mt_id']}" base="public"}' method='post'>
 					<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
 					<input type="hidden" name="fast_reply_used" value="1" />
 					<input type="hidden" name="enableemo" value="yes" />
 					<input type="hidden" name="enablesig" value="yes" />
-					<input type='submit' name="submit" class='input_submit' value='{$this->lang->words['pc_post_button']}' accesskey='s' />&nbsp;&nbsp;<input type='submit' name="previewReply" class='input_submit alt' value='{$this->lang->words['pc_use_full_reply']}' />
-				</fieldset>
-			</form>
+					{parse editor="msgContent" options="array( 'type' => 'full', 'minimize' => 1 )"}
+					<br />
+					<fieldset class='right'>
+						<input type='submit' name="submit" class='input_submit' value='{$this->lang->words['pc_post_button']}' accesskey='s' />&nbsp;&nbsp;<input type='submit' name="previewReply" class='input_submit alt' value='{$this->lang->words['pc_use_full_reply']}' />
+					</fieldset>
+				</form>
+			</div>
 		</div>
 	</div>
-	<script type="text/javascript">
-	//<!#^#|CDATA|
-		if( $('fast-reply_textarea') ){
-			$('fast-reply_textarea').setStyle('height: 70px');
-		}
-		
-		ipb.editor_values.set( 'emoticons', \$H({ {parse expression="IPSLib::fetchEmoticonsAsJson()"} }) );
-		ipb.vars['emoticon_url'] = "{$this->settings['emoticons_url']}";
-		ipb.editors[ 'fast-reply' ] = new ipb.editor( 'fast-reply', USE_RTE );
-		in_use = 0;
-		<if test="rteOn:|:$rte_mode != 1">
-			obj = ipb.editors['fast-reply'].editor_document;
-		<else />
-			obj = $( ipb.editors['fast-reply'].items['text_obj'] );
-		</if>
-		Event.observe( obj, 'click', function(){
-			if( in_use != 1 ){
-				$( ipb.editors['fast-reply'] ).resize_to( 250 );
-				in_use = 1;
-			}
-		}, true);
-	//|#^#]>
-	</script>	
+	</if>
 </if>
+<div class='topic_controls clear'>
+	{$topic['_pages']}
+	<ul class='topic_buttons'>
+ 		<li class='non_button'><a id='email_convo_{$this->request['topicID']}' data-tooltip='{parse expression="sprintf( $this->lang->words['msg_email_convo_text'], $this->memberData['email'])"}' href='#' class='email_convo'>{$this->lang->words['msg_email_convo']}</a></li>
+	</ul>
+</div>
 </div>
 {parse template="include_highlighter" group="global" params=""}]]></template_content>
       <template_name>showConversation</template_name>
       <template_data><![CDATA[$topic, $replies, $members, $jump=""]]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -748,7 +754,7 @@ $memberNames = implode( $mems, ', ' );
 	<body>
 		<h2 class='maintitle'>{$topic['mt_title']}</h2>
 		<em>
-			{$this->lang->words['email_participants']} $memberNames
+			{$this->lang->words['email_participants']} {$memberNames}
 		</em>
 		<br />
 		<br />
@@ -774,7 +780,7 @@ $memberNames = implode( $mems, ', ' );
 </html>]]></template_content>
       <template_name>showConversationForArchive</template_name>
       <template_data>$topic, $replies, $members</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -796,7 +802,7 @@ $memberNames = implode( $mems, ', ' );
 	{parse variable="folder_sent" oncondition="$this->request['folderFilter'] == 'sent'" value="selected='selected'"}
 </if>
 <ul class='topic_buttons'>
-	<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a></li>
+	<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{$this->lang->words['compose_new']}</a></li>
 </ul>
 </div>
 <div id='message_list'>
@@ -804,123 +810,134 @@ $memberNames = implode( $mems, ', ' );
 		<input type="hidden" name="sort" value="{$this->request['sort']}" />
 		<input type="hidden" name="st" value="{$this->request['st']}" />
 		<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-		<table class='ipb_table' id='message_table'>
-			<caption class='maintitle'>{$dirname}</caption>
-			<tr class='header'>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_m_subject'>{$this->lang->words['col_topic']}</th>
-				<th scope='col' class='col_m_from short'>{$this->lang->words['col_starter']}</th>
-				<th scope='col' class='col_m_to short'><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showFolder&amp;folderID={$currentFolderID}&amp;sort=nameTo&amp;st={$this->request['st']}" base="public"}">{$this->lang->words['col_to']}</a></th>
-				<th scope='col' class='col_m_replies short'>{$this->lang->words['col_replies']}</th>
-				<th scope='col' class='col_m_date'>{$this->lang->words['col_last_message']}</th>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_mod short'><input type='checkbox' class='input_check' id='msg_checkall' value='1' /></th>
-			</tr>
-			<if test="folderMessages:|:count( $messages )">
-				{parse striping="msg_stripe" classes="row1,row2"}
-				<foreach loop="folderMessages:$messages as $id => $msg">
-					<tr id='{$msg['mt_id']}' class='{parse striping="msg_stripe"}'>
-						<td class='altrow short'>
-							<if test="folderDeleted:|:$msg['mt_is_deleted'] OR $msg['map_user_banned']">
-								{parse replacement="msg_deleted"}
-							<else />
-								<if test="folderUnread:|:$msg['map_has_unread'] == 1">
-									{parse replacement="msg_icon_new"}
-								<else />
-									{parse replacement="msg_icon"}
-								</if>
-							</if>
-						</td>
-						<td>
-							<if test="folderAttachments:|:$msg['mt_hasattach']">
-								{parse replacement="t_attach"}
-							</if>
-							<span class='m_title'>
-								<if test="folderUnreadLink:|:$msg['map_has_unread'] == 1">
-								<a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID=__firstUnread__" base="public"}' title='{$this->lang->words['first_unread_reply']}'>{parse replacement="f_newpost"}</a>
-									<strong>
-								</if>
-								<if test="folderDrafts:|:$currentFolderID == 'drafts'">
-									<a href="{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								<else />
-									<a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								</if>
-								<if test="folderEndUnread:|:$msg['map_has_unread'] == 1">
-									</strong>
-								</if>
-								<if test="folderPages:|:is_array( $msg['pages'] ) AND count( $msg['pages'] )">
-									<ul class='mini_pagination'>
-									<foreach loop="messagePages:$msg['pages'] as $page">
-											<if test="folderLastPage:|:$page['last']">
-												<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='{$this->lang->words['goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
-											<else />
-												<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='{$this->lang->words['goto_page']} {$page['page']}'>{$page['page']}</a></li>
-											</if>
-									</foreach>
-									</ul>
-								</if>
-								<if test="folderNew:|:in_array( $currentFolderID, array( 'new' ) )">
-									<p>{$this->lang->words['folder_prefix']} {$msg['_folderName']}</p>
-								</if>
-							</span>
-						</td>
-						<td class='altrow short'>
-							<if test="folderStarter:|:$msg['_starterMemberData']['members_display_name']">
-								<a href='{parse url="showuser={$msg['_starterMemberData']['member_id']}" base="public" seotitle="{$msg['_starterMemberData']['members_seo_name']}" template="showuser"}'>{$msg['_starterMemberData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_starterMemberData']['member_id'], $msg['_starterMemberData']['members_seo_name']"}
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-						</td>
-						<td class='short'>
-							<if test="folderToMember:|:$msg['_toMemberData']['members_display_name']">
-								<a href='{parse url="showuser={$msg['_toMemberData']['member_id']}" base="public" seotitle="{$msg['_toMemberData']['members_seo_name']}" template="showuser"}'>{$msg['_toMemberData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_toMemberData']['member_id'], $msg['_toMemberData']['members_seo_name']"}
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-							<if test="folderMultipleUsers:|:$msg['_otherInviteeCount'] > 0">
-								<if test="folderFixPlural:|:$msg['_otherInviteeCount'] > 1">
-									<p title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_others']})</p>
-								<else />
-									<p title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_other']})</p>
-								</if>
-							</if>
-						</td>
-						<td  class='altrow short'>
-							<span class='desc'><if test="folderBannedIndicator:|:$msg['map_user_banned']">-<else />{parse expression="intval( $msg['mt_replies'] )"}</if></span>
-						</td>
-						<td>
-							<ul class='last_post'>
-								<if test="folderBannedUser:|:$msg['map_user_banned']">
-									<li><em>{$this->lang->words['info_not_available']}</em></li>
-								<else />
-									<li><a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID={$msg['mt_last_msg_id']}" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse replacement="f_lastpost"}</a> {parse date="$msg['mt_last_post_time']" format="long"}</li>
-									<li>{$this->lang->words['pc_by']} <a href="{parse url="showuser={$msg['_lastMsgAuthor']['member_id']}" base="public" seotitle="{$msg['_lastMsgAuthor']['members_seo_name']}" template="showuser"}">{$msg['_lastMsgAuthor']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_lastMsgAuthor']['member_id'], $msg['_lastMsgAuthor']['members_seo_name']"}</li>
-								</if>
-							</ul>
-						</td>
-						<td class='altrow short'>
-							<if test="folderNotifications:|:$msg['map_ignore_notification']">
-								{parse replacement="msg_notify_off"}
-							<else />
-								{parse replacement="msg_notify_on"}
-							</if>
-						</td>
-						<td class='short'>
-							<input type='checkbox' class='input_check msg_check' name='msgid[{$msg['mt_id']}]' id='msg_check_{$msg['mt_id']}' />
-						</td>
+		<div class='maintitle'>
+			<span class='right'>
+				<input type='checkbox' class='input_check' id='msg_checkall' value='1' /> &nbsp;
+			</span>
+			{$dirname}
+		</div>
+		<div class='ipsBox'>
+			<div class='ipsBox_container'>
+				<table class='ipb_table' id='message_table'>
+					<tr class='header hide'>
+						<th scope='col' class='col_m_status'>&nbsp;</th>
+						<th scope='col' class='col_m_subject'>{$this->lang->words['col_topic']}</th>
+						<th scope='col' class='col_m_replies short'>{$this->lang->words['col_replies']}</th>
+						<th scope='col' class='col_m_date'>{$this->lang->words['col_last_message']}</th>
+						<th scope='col' class='col_mod short'>&nbsp;</th>
 					</tr>
-				</foreach>
-			<else />
-				<tr>
-					<td colspan='8' class='no_messages row1'>
-						{$this->lang->words['folder_no_messages_row']}
-					</td>
-				</tr>
-			</if>
-		</table>
-		<div id='messenger_mod' class='moderation_bar rounded with_action'>
+					<if test="folderMessages:|:count( $messages )">
+						<foreach loop="folderMessages:$messages as $id => $msg">
+							<tr id='{$msg['mt_id']}' class='<if test="$msg['map_has_unread']">unread</if>'>
+								<td class='col_m_photo altrow short'>
+									<if test="hasStarterPhoto:|:$msg['_starterMemberData']['member_id']">
+										<a href='{parse url="showuser={$msg['_starterMemberData']['member_id']}" template="showuser" seotitle="{$msg['_starterMemberData']['members_seo_name']}" base="public"}' class='ipsUserPhotoLink'>
+											<img src='{$msg['_starterMemberData']['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+										</a>
+									<else />
+										{IPSMember::buildProfilePhoto(0,'mini')}
+									</if>
+								</td>
+								<td class='col_m_subject'>
+									<if test="folderNotifications:|:$msg['mt_is_deleted'] OR $msg['map_user_banned']">
+										<span class='ipsBadge ipsBadge_red'>
+											{$this->lang->words['msg_deleted']}
+										</span>
+									</if>
+									<h4>
+										<if test="$msg['map_has_unread']">
+											<a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID=__firstUnread__" base="public"}' title='{$this->lang->words['first_unread_reply']}'>{parse replacement="f_newpost"}</a>
+											<strong>
+										</if>
+										<a href='<if test="folderDrafts:|:$currentFolderID == 'drafts'">{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;topicID={$msg['mt_id']}" base="public"}<else />{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}</if>' title='{$this->lang->words['msg_view_conversation']}'>
+										{$msg['mt_title']}
+										</a>
+										<if test="$msg['map_has_unread']"></strong></if>
+									</h4>
+									<if test="folderNotifications:|:$msg['map_ignore_notification']">
+										<span class='ipsBadge ipsBadge_lightgrey'>
+											{$this->lang->words['msg_no_notify']}
+										</span>
+									</if>
+									<br />
+									<span class='desc lighter blend_links'>
+										{$this->lang->words['msg_startedby']}
+										<if test="folderStarter:|:$msg['_starterMemberData']['members_display_name']">
+											{parse template="userHoverCard" group="global" params="$msg['_starterMemberData']"},
+										<else />
+											<span class='desc'>{$this->lang->words['deleted_user']},</span>
+										</if>
+										<span class='desc lighter blend_links'>
+											{$this->lang->words['msg_sentto']}
+											<if test="folderToMember:|:$msg['_toMemberData']['members_display_name']">
+												{parse template="userHoverCard" group="global" params="$msg['_toMemberData']"}
+											<else />
+												<span class='desc'>{$this->lang->words['deleted_user']}</span>
+											</if>
+											<if test="folderMultipleUsers:|:$msg['_otherInviteeCount'] > 0">
+												<if test="folderFixPlural:|:$msg['_otherInviteeCount'] > 1">
+													<span title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_others']})</p>
+												<else />
+													<span title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_other']})</p>
+												</if>
+											</if>
+										</span>
+										<if test="folderNew:|:in_array( $currentFolderID, array( 'new' ) )">
+											<p class='ipsType_small desc'>{$this->lang->words['folder_prefix']} {$msg['_folderName']}</p>
+										</if>
+									</span>	
+									<if test="folderPages:|:is_array( $msg['pages'] ) AND count( $msg['pages'] )">
+										<ul class='mini_pagination'>
+										<foreach loop="messagePages:$msg['pages'] as $page">
+												<if test="folderLastPage:|:$page['last']">
+													<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='{$this->lang->words['goto_page']} {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
+												<else />
+													<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='{$this->lang->words['goto_page']} {$page['page']}'>{$page['page']}</a></li>
+												</if>
+										</foreach>
+										</ul>
+									</if>
+								</td>
+								<td class='col_m_replies desc blend_links'>
+									<ul>
+										<li><if test="folderBannedIndicator:|:$msg['map_user_banned']">-<else />{parse expression="sprintf( $this->lang->words['msg_xreplies'], intval( $msg['mt_replies'] ) )"}</if></li>
+									</ul>
+								</td>
+								<td class='col_f_post'>
+									<if test="hasPosterPhoto:|:$msg['_lastMsgAuthor']['member_id']">
+										<a href='{parse url="showuser={$msg['_lastMsgAuthor']['member_id']}" template="showuser" seotitle="{$msg['_lastMsgAuthor']['members_seo_name']}" base="public"}' class='ipsUserPhotoLink left'>
+											<img src='{$msg['_lastMsgAuthor']['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+										</a>
+									<else />
+										<span class='left'>{IPSMember::buildProfilePhoto(0,'mini')}</span>
+									</if>
+									<ul class='last_post ipsType_small'>
+										<if test="folderBannedUser:|:$msg['map_user_banned']">
+											<li><em>{$this->lang->words['info_not_available']}</em></li>
+										<else />
+											<li>{$this->lang->words['pc_by']} <if test="folderToMember:|:$msg['_lastMsgAuthor']['members_display_name']">{parse template="userHoverCard" group="global" params="$msg['_lastMsgAuthor']"}<else /><span class='desc'>{$this->lang->words['deleted_user']}</span></if></li>
+										</if>
+										<li class='desc'>
+											<a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID={$msg['mt_last_msg_id']}" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$msg['mt_last_post_time']" format="DATE"}</a>
+										</li>
+									</ul>
+								</td>
+								<td class='col_m_mod short'>
+									<input type='checkbox' class='input_check msg_check' name='msgid[{$msg['mt_id']}]' id='msg_check_{$msg['mt_id']}' />
+								</td>
+							</tr>
+						</foreach>
+					<else />
+						<tr>
+							<td colspan='8' class='no_messages row1'>
+								{$this->lang->words['folder_no_messages_row']}
+							</td>
+						</tr>
+					</if>
+				</table>
+			</div>
+		</div>
+		<div id='messenger_mod' class='moderation_bar rounded with_action right'>
 			<select id='pm_multifile' name='method' class='input_select'>
 				<optgroup label="{$this->lang->words['with_selected_opt']}">
 					<option value="delete">{$this->lang->words['option__delete']}</option>
@@ -940,9 +957,9 @@ $memberNames = implode( $mems, ', ' );
 			<input type="submit" class='input_submit alt' id='folder_moderation' value="{$this->lang->words['jmp_go']}" />
 		</div>
 	</form>
-	<div id='messenger_filter' class='filter_bar rounded'>
+	<div id='messenger_filter' class='left ipsPad_half'>
 		<form method='post' action='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showFolder&amp;folderID={$currentFolderID}" base="public"}'>
-			<label for='conversation_filter'>{$this->lang->words['filter__show']} </label>
+			<label for='conversation_filter' class='desc'>{$this->lang->words['filter__show']} </label>
 			<select id='conversation_filter' name='folderFilter' class='input_select'>
 				<option value='' {parse variable="folder_all"}>{$this->lang->words['filter__all']}</option>
 				<option value='in' {parse variable="folder_in"}>{$this->lang->words['filter__others']}</option>
@@ -953,15 +970,12 @@ $memberNames = implode( $mems, ', ' );
 	</div>
 </div>
 <br />
-<div class='topic_controls'>
+<div class='topic_controls clear clearfix'>
 {$pages}
-<ul class='topic_buttons'>
-	<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='{$this->lang->words['go_to_compose']}'>{parse replacement="compose_icon"} {$this->lang->words['compose_new']}</a></li>
-</ul>
 </div>]]></template_content>
       <template_name>showFolder</template_name>
       <template_data>$messages, $dirname, $pages, $currentFolderID, $jumpFolderHTML</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -980,87 +994,101 @@ $memberNames = implode( $mems, ', ' );
 	</p>
 	<br />
 </if>
-<div class='topic_controls'>
-{$pages}
-</div>
-<br />
+<if test="$pages">
+	<div class='topic_controls'>
+	{$pages}
+	</div>
+	<br />
+</if>
 <h2 class='maintitle clear'>{$this->lang->words['your_search_results']}</h2>
 <div id='message_list'>
-		<table class='ipb_table' id='message_table'>
-			<tr class='header'>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_m_subject'>{$this->lang->words['col_subject']}</th>
-				<th scope='col' class='col_m_replies short'>{$this->lang->words['col_replies']}</th>
-				<th scope='col' class='col_m_sender'>{$this->lang->words['col_recipient']}</th>
-				<th scope='col' class='col_m_date'>{$this->lang->words['col_date']}</th>
-			</tr>
+	<div class='ipsBox'>
+		<div class='ipsBox_container'>
+			<table class='ipb_table' id='message_table'>
+				<tr class='header hide'>
+					<th scope='col' class='col_m_photo'>&nbsp;</th>
+					<th scope='col' class='col_m_subject'>{$this->lang->words['col_subject']}</th>
+					<th scope='col' class='col_m_replies short'>{$this->lang->words['col_replies']}</th>
+					<th scope='col' class='col_m_date'>{$this->lang->words['col_last_message']}</th>
+				</tr>
 		
-			<if test="searchMessages:|:count( $messages )">
-				{parse striping="msg_stripe" classes="row1,row2"}
-				<foreach loop="messages:$messages as $id => $msg">
-					<tr id='{$msg['mt_id']}' class='{parse striping="msg_stripe"}'>
-						<td class='altrow short'>
-						<if test="folderDeleted:|:$msg['mt_is_deleted'] OR $msg['map_user_banned']">
-							{parse replacement="msg_deleted"}
-						<else />
-							<if test="folderUnread:|:$msg['map_has_unread'] == 1">
-								{parse replacement="msg_icon_new"}
-							<else />
-								{parse replacement="msg_icon"}
-							</if>
-						</if>
-						</td>
-						<td>
-							<if test="searchAttachment:|:$msg['mt_hasattach']">
-								{parse replacement="t_attach"}
-							</if>
-							<span class='m_title'>
-								<if test="searchHasUnread:|:$msg['map_has_unread'] == 1">
-									<strong>
+				<if test="searchMessages:|:count( $messages )">
+					<foreach loop="messages:$messages as $id => $msg">
+						<tr id='{$msg['mt_id']}' class='<if test="$msg['map_has_unread']">unread</if>'>
+							<td class='col_m_photo altrow short'>
+								<a href='{parse url="showuser={$msg['_starterMemberData']['member_id']}" template="showuser" seotitle="{$msg['_starterMemberData']['members_seo_name']}" base="public"}' class='ipsUserPhotoLink'>
+									<img src='{$msg['_starterMemberData']['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+								</a>
+							</td>
+							<td>
+								<if test="folderNotifications:|:$msg['mt_is_deleted'] OR $msg['map_user_banned']">
+									<span class='ipsBadge ipsBadge_red'>
+										{$this->lang->words['msg_deleted']}
+									</span>
 								</if>
-								<a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								<if test="searchEndHasUnread:|:$msg['map_has_unread'] == 1">
-									</strong>
-								</if>
-								<p>{$this->lang->words['label_pc']} {$msg['_folderName']}</p>
-							</span>
-						</td>
-						<td>
-							<span class='desc'>{parse expression="intval( $msg['mt_replies'] )"}</span>
-						</td>
-						<td class='altrow'>
-							<if test="searchToMember:|:$msg['_toMemberData']['member_id']">
-								<a href='{parse url="showuser={$msg['_toMemberData']['member_id']}" base="public"}'>{$msg['_toMemberData']['members_display_name']}</a>
-								<if test="searchInvitedCount:|:$msg['mt_invited_count']">
-									<if test="searchFixPlural:|:$msg['mt_invited_count'] > 1">
-										<p>({$this->lang->words['pc_and']} {$msg['mt_invited_count']} {$this->lang->words['pc_others']})</p>
+								<h4><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a></h4><br />
+								<span class='desc lighter blend_links'>
+									{$this->lang->words['msg_startedby']}
+									<if test="folderStarter:|:$msg['_starterMemberData']['members_display_name']">
+										{parse template="userHoverCard" group="global" params="$msg['_starterMemberData']"}
 									<else />
-										<p>({$this->lang->words['pc_and']} {$msg['mt_invited_count']} {$this->lang->words['pc_other']})</p>
+										<span class='desc'>{$this->lang->words['deleted_user']}</span>
 									</if>
-								</if>
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-						</td>
-						<td>
-							{parse date="$msg['mt_last_post_time']" format="long"}
+									<span class='desc lighter blend_links'>
+										, {$this->lang->words['msg_sentto']}
+										<if test="folderToMember:|:$msg['_toMemberData']['members_display_name']">
+											{parse template="userHoverCard" group="global" params="$msg['_toMemberData']"}
+										<else />
+											<span class='desc'>{$this->lang->words['deleted_user']}</span>
+										</if>
+										<if test="folderMultipleUsers:|:$msg['_otherInviteeCount'] > 0">
+											<if test="folderFixPlural:|:$msg['_otherInviteeCount'] > 1">
+												<span title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_others']})</p>
+											<else />
+												<span title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>({$this->lang->words['pc_and']} {$msg['_otherInviteeCount']} {$this->lang->words['pc_other']})</p>
+											</if>
+										</if>
+									</span>
+									<if test="folderNew:|:in_array( $currentFolderID, array( 'new' ) )">
+										<p class='ipsType_small desc'>{$this->lang->words['folder_prefix']} {$msg['_folderName']}</p>
+									</if>
+								</span>
+								<p class='ipsType_small desc'>{$this->lang->words['label_pc']} {$msg['_folderName']}</p>
+							</td>
+							<td class='col_m_replies desc blend_links'>
+								<ul>
+									<li><if test="folderBannedIndicator:|:$msg['map_user_banned']">-<else />{parse expression="sprintf( $this->lang->words['msg_xreplies'], intval( $msg['mt_replies'] ) )"}</if></li>
+								</ul>
+							</td>
+							<td class='col_f_post'>
+								<a href='{parse url="showuser={$msg['_lastMsgAuthor']['member_id']}" template="showuser" seotitle="{$msg['_lastMsgAuthor']['members_seo_name']}" base="public"}' class='ipsUserPhotoLink left'>
+									<img src='{$msg['_lastMsgAuthor']['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+								</a>
+								<ul class='last_post ipsType_small'>
+									<if test="folderBannedUser:|:$msg['map_user_banned']">
+										<li><em>{$this->lang->words['info_not_available']}</em></li>
+									<else />
+										<li>{$this->lang->words['pc_by']} {parse template="userHoverCard" group="global" params="$msg['_lastMsgAuthor']"}</li>
+									</if>
+									<li class='desc blend_links'><a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID={$msg['mt_last_msg_id']}" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$msg['mt_last_post_time']" format="DATE"}</a></li>
+								</ul>
+							</td>
+						</tr>
+					</foreach>
+				<else />
+					<tr>
+						<td colspan='5' class='no_messages row1'>
+							{$this->lang->words['no_messages_row']}
 						</td>
 					</tr>
-				</foreach>
-			<else />
-				<tr>
-					<td colspan='5' class='no_messages row1'>
-						{$this->lang->words['no_messages_row']}
-					</td>
-				</tr>
-			</if>
-		</table>
-	</form>
+				</if>
+			</table>
+		</div>
+	</div>
 </div>]]></template_content>
       <template_name>showSearchResults</template_name>
       <template_data>$messages, $pages, $error</template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1073,43 +1101,43 @@ $memberNames = implode( $mems, ', ' );
       <template_content><![CDATA[<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/calendar_date_select/calendar_date_select.js'></script>
 {parse js_module="memberlist"}
 <!-- SEARCH FORM -->
-<h2>{$this->lang->words['mlist_header']}</h2>
+<h1 class='ipsType_pagetitle'>{$this->lang->words['mlist_header']}</h1>
 <div class='topic_controls'>
-	{$pages}
-	
+	{$pages}	
 	<ul class='topic_buttons'>
-		<li><a href='#filters' title='{$this->lang->words['mlist_adv_filt']}' id='use_filters'><img src='{$this->settings['img_url']}/cog.png' alt='' /> {$this->lang->words['mlist_adv_filt']}</a></li>
+		<li><a href='#filters' title='{$this->lang->words['mlist_adv_filt']}' id='use_filters'>{$this->lang->words['mlist_adv_filt']}</a></li>
 	</ul>
 </div>
 <div id='member_filters' class='general_box alt clear'>
 	<form action="{parse url="app=members&amp;module=list" base="public" seotitle="false"}" method="post">
 		<h3 class='bar'>{$this->lang->words['mlist_adv_filt_opt']}</h3>
 	
-		<ul id='filters_1' class=''>
+		<ul id='filters_1'>
 			<li class='field'>
 				<label for='member_name'>{$this->lang->words['s_name']}</label>
 				<select name="name_box" class='input_select'>
 					<option value="begins"<if test="namebox_begins:|:$this->request['name_box'] == 'begins'"> selected='selected'</if>>{$this->lang->words['s_begins']}</option>
 					<option value="contains"<if test="namebox_contains:|:$this->request['name_box'] == 'contains'"> selected='selected'</if>>{$this->lang->words['s_contains']}</option>
 				</select>&nbsp;&nbsp;
-				<input type="text" size="15" name="name" id='member_name' class='input_text' value="{$this->request['name']}" />
+				<input type="text" size="15" name="name" id='member_name' class='input_text' value="{parse expression="urldecode($this->request['name'])"}" />
 			</li>
 			<li class='field'>
 				<label for='photo_only'>{$this->lang->words['photo_only']}</label>
 				<input class='input_check' id='photo_only' type="checkbox" value="1" name="photoonly" <if test="photoonly:|:$defaults['photoonly']">checked='checked'</if> />
 			</li>
-			<li class='field'>
-				<label for='rating'>{$this->lang->words['m_rating_morethan']}</label>
-				<select name='pp_rating_real' id='rating'>
-					<option value='0'<if test="rating0:|:! $this->request['pp_rating_real']"> selected='selected'</if>>0</option>
-					<option value='1'<if test="rating1:|:$this->request['pp_rating_real'] == 1"> selected='selected'</if>>1</option>
-					<option value='2'<if test="rating2:|:$this->request['pp_rating_real'] == 2"> selected='selected'</if>>2</option>
-					<option value='3'<if test="rating3:|:$this->request['pp_rating_real'] == 3"> selected='selected'</if>>3</option>
-					<option value='4'<if test="rating4:|:$this->request['pp_rating_real'] == 4"> selected='selected'</if>>4</option>
-				</select>
-				{$this->lang->words['m_stars']}
-			</li>
-			
+			<if test="canFilterRate:|:$this->settings['pp_allow_member_rate']">
+				<li class='field'>
+					<label for='rating'>{$this->lang->words['m_rating_morethan']}</label>
+					<select name='pp_rating_real' id='rating'>
+						<option value='0'<if test="rating0:|:! $this->request['pp_rating_real']"> selected='selected'</if>>0</option>
+						<option value='1'<if test="rating1:|:$this->request['pp_rating_real'] == 1"> selected='selected'</if>>1</option>
+						<option value='2'<if test="rating2:|:$this->request['pp_rating_real'] == 2"> selected='selected'</if>>2</option>
+						<option value='3'<if test="rating3:|:$this->request['pp_rating_real'] == 3"> selected='selected'</if>>3</option>
+						<option value='4'<if test="rating4:|:$this->request['pp_rating_real'] == 4"> selected='selected'</if>>4</option>
+					</select>
+					{$this->lang->words['m_stars']}
+				</li>
+			</if>
 			<if test="hascfields:|:count( $custom_fields->out_fields )">
 				<foreach loop="customfields:$custom_fields->out_fields as $id => $field">
 					<li class='field custom'>
@@ -1119,10 +1147,10 @@ $memberNames = implode( $mems, ', ' );
 				</foreach>
 			</if>			
 		</ul>
-		<ul id='filters_2' class=''>
+		<ul id='filters_2'>
 			<li class='field'>
 				<label for='signature'>{$this->lang->words['s_signature']}</label>
-				<input type="text" class='input_text' size="28" id='signature' name="signature" value="{$this->request['signature']}" />
+				<input type="text" class='input_text' size="28" id='signature' name="signature" value="{parse expression="urldecode($this->request['signature'])"}" />
 			</li>
 			<li class='field'>
 				<label for='posts'>{$this->lang->words['s_posts']}</label>
@@ -1195,105 +1223,111 @@ $memberNames = implode( $mems, ', ' );
 	$('member_filters').hide();
 </script>
 <br />
-<div id='member_list' class='clear block_wrap'>
-	<ol id='member_alpha' class='tab_bar'>
-		<if test="letterquickjump:|:!$this->request['quickjump']">
-			<li class='active'><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['members_start_with']}{$letter}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
-		<else />
-			<li><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_all_title']}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
-		</if>
-<foreach loop="chars:range(65,90) as $char">
-	<if test="letterdefault:|:$letter = strtoupper(chr($char))">
-		<li <if test="selected:|:strtoupper( $this->request['quickjump'] ) == $letter">class='active'</if>><a href='{parse url="{$url}&amp;quickjump={$letter}" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_start_title']} {$letter}'>{$letter}</a></li>
-	</if>
-</foreach>
-	</ol>
-	<div class='tab_filters'>
-		<ul class='right'>
-			<li <if test="filtermembers:|:$this->request['sort_key'] == 'members_display_name' || !$this->request['sort_key']">class='active'</if>>
-				<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=members_display_name&amp;sort_order=asc" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sort_by_mname']}'>{$this->lang->words['s_name']}</a>
-			</li>
-			<li <if test="filterposts:|:$this->request['sort_key'] == 'posts'">class='active'</if>>
-				<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=posts&amp;sort_order=desc" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sort_by_posts']}'>{$this->lang->words['pcount']}</a>
-			</li>
-			<li <if test="filterjoined:|:$this->request['sort_key'] == 'joined'">class='active'</if>>
-				<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=joined" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sorty_by_jdate']}'>{$this->lang->words['sort_by_joined']}</a>
-			</li>
+<div class='ipsBox ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_tinyleft clearfix'>
+	<div class='ipsVerticalTabbed_tabs ipsVerticalTabbed_minitabs ipsLayout_left' id='mlist_tabs'>
+		<ul>
+			<if test="letterquickjump:|:!$this->request['quickjump']">
+				<li class='active'><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['members_start_with']}{$letter}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
+			<else />
+				<li><a href='{parse url="app=members&amp;module=list" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_all_title']}'>{$this->lang->words['mlist_view_all_txt']}</a></li>
+			</if>
+			<foreach loop="chars:range(65,90) as $char">
+				<if test="letterdefault:|:$letter = strtoupper(chr($char))">
+					<li <if test="selected:|:strtoupper( $this->request['quickjump'] ) == $letter">class='active'</if>><a href='{parse url="{$url}&amp;quickjump={$letter}" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['mlist_view_start_title']} {$letter}'>{$letter}</a></li>
+				</if>
+			</foreach>
 		</ul>
 	</div>
-	
-	<div id='member_wrap'>
-		<ul class='members'>
-			<if test="showmembers:|:is_array( $members ) and count( $members )">
-				{parse striping="memberStripe" classes="row1,row2"}
-				<foreach loop="members:$members as $member">
-					<li id='member_id_{$member['member_id']}' class='general_box clear member_entry {parse striping="memberStripe"}'>
-						<h3 class='bar'><a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a>{parse template="user_popup" group="global" params="$member['member_id'], $member['members_seo_name']"}</h3>
-						<a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$member['pp_thumb_photo']}' width='{$member['pp_thumb_width']}' height='{$member['pp_thumb_height']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-					
-						<dl class='info'>
-							<dt class='clear'>{$this->lang->words['member_joined']}:</dt>
-							<dd>{parse date="$member['joined']" format="joined"}</dd>
-							<dt class='clear'>{$this->lang->words['member_group']}:</dt>
-							<dd>{IPSLib::makeNameFormatted( $member['group'], $member['member_group_id'] )}</dd>
-							<dt class='clear'>{$this->lang->words['member_posts']}:</dt>
-							<dd>{parse format_number="$member['posts']"}</dd>
-							<dt class='clear'>{$this->lang->words['m_views']}:</dt>
-							<dd>{parse format_number="$member['members_profile_views']"}</dd>
-						</dl>
-						
-						<ul class='user_controls clear'>
-							<if test="notus:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-								<if test="addfriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
-									<li class='mini_friend_toggle is_friend' id='friend_mlist_{$member['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
-								<else />
-									<li class='mini_friend_toggle is_not_friend' id='friend_mlist_{$member['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
+	<div class='ipsVerticalTabbed_content ipsLayout_content'>
+		<div class='maintitle ipsFilterbar clear clearfix'>
+			<ul class='ipsList_inline left'>
+				<li <if test="filtermembers:|:$this->request['sort_key'] == 'members_display_name' || !$this->request['sort_key']">class='active'</if>>
+					<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=members_display_name&amp;sort_order=asc" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sort_by_mname']}'>{$this->lang->words['sort_by_name']}</a>
+				</li>
+				<li <if test="filterposts:|:$this->request['sort_key'] == 'posts'">class='active'</if>>
+					<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=posts&amp;sort_order=desc" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sort_by_posts']}'>{$this->lang->words['pcount']}</a>
+				</li>
+				<li <if test="filterjoined:|:$this->request['sort_key'] == 'joined'">class='active'</if>>
+					<a href='{parse url="app=members&amp;module=list&amp;{$url}&amp;sort_key=joined" template="members_list" base="public" seotitle="false"}' title='{$this->lang->words['sorty_by_jdate']}'>{$this->lang->words['sort_by_joined']}</a>
+				</li>
+			</ul>
+		</div>
+		<div class='ipsBox_container ipsPad' id='mlist_content'>
+			<ul class='ipsMemberList'>
+				<if test="showmembers:|:is_array( $members ) and count( $members )">
+					{parse striping="memberStripe" classes="row1,row2"}
+					<foreach loop="members:$members as $member">
+						<li id='member_id_{$member['member_id']}' class='ipsPad clearfix member_entry {parse striping="memberStripe"}'>
+							<a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$member['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+							<div class='ipsBox_withphoto'>
+								<ul class='ipsList_inline right'>
+									<if test="weAreSupmod:|:$this->memberData['g_is_supmod'] == 1 && $member['member_id'] != $this->memberData['member_id']">
+										<li><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;auth_key={$this->member->form_hash}&amp;mid={$member['member_id']}&amp;pf={$member['member_id']}" base="public"}' class='ipsButton_secondary'>{$this->lang->words['edit_member']}</a></li>
+									</if>
+									<if test="notus:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+										<if test="addfriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
+											<li class='mini_friend_toggle is_friend' id='friend_mlist_{$member['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a></li>
+										<else />
+											<li class='mini_friend_toggle is_not_friend' id='friend_mlist_{$member['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a></li>								
+										</if>
+									</if>
+									<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $member['member_id'] != $this->memberData['member_id']">
+										<li class='pm_button' id='pm_xxx_{$member['pp_member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['pp_member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
+									</if>
+									<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}' class='ipsButton_secondary'>{parse replacement="find_topics_link"}</a></li>
+									<if test="blog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $member['has_blog'] != 'recache'">
+										<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
+									</if>
+									<if test="gallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+										<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
+									</if>
+								</ul>
+								
+								<h3 class='ipsType_subtitle'>
+									<strong><a href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a></strong>
+									
+									<if test="rating:|:$this->settings['pp_allow_member_rate'] && $this->request['pp_rating_real']">
+										<span class='rating'> 
+											<if test="rate1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
+										</span>
+									</if>
+								</h3>
+								<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+									<if test="norep:|:$member['pp_reputation_points'] == 0 || !$member['pp_reputation_points']">
+										<p class='reputation zero ipsType_small left' data-tooltip="{parse expression="sprintf( $this->lang->words['member_has_x_rep'], $member['members_display_name'], $member['pp_reputation_points'] )"}">
+									</if>
+									<if test="posrep:|:$member['pp_reputation_points'] > 0">
+										<p class='reputation positive ipsType_small left' data-tooltip="{parse expression="sprintf( $this->lang->words['member_has_x_rep'], $member['members_display_name'], $member['pp_reputation_points'] )"}">
+									</if>
+									<if test="negrep:|:$member['pp_reputation_points'] < 0">
+										<p class='reputation negative ipsType_small left' data-tooltip="{parse expression="sprintf( $this->lang->words['member_has_x_rep'], $member['members_display_name'], $member['pp_reputation_points'] )"}">
+									</if>							
+											<span class='number'>{$member['pp_reputation_points']}</span>
+										</p>
 								</if>
-							</if>
-							<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $member['member_id'] != $this->memberData['member_id']">
-								<li class='pm_button' id='pm_xxx_{$member['pp_member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['pp_member_id']}" base="public"}' title='{$this->lang->words['pm_member']}'>{parse replacement="send_msg"}</a></li>
-							</if>
-							<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}'>{parse replacement="find_topics_link"}</a></li>
-							<if test="blog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $member['has_blog'] != 'recache'">
-								<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
-							</if>
-							<if test="gallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-								<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
-							</if>
-						</ul>
-						<if test="rating:|:$this->settings['pp_allow_member_rate']">
-							<p class='rating'> 
-								<if test="rate1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
-							</p>
-						</if>
-						
-						<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
-							<if test="norep:|:$member['pp_reputation_points'] == 0 || !$member['pp_reputation_points']">
-								<p class='reputation zero'>
-							</if>
-							<if test="posrep:|:$member['pp_reputation_points'] > 0">
-								<p class='reputation positive'>
-							</if>
-							<if test="negrep:|:$member['pp_reputation_points'] < 0">
-								<p class='reputation negative'>
-							</if>							
-									<span class='number'>{$this->lang->words['reputation']}: {$member['pp_reputation_points']}</span>
-								</p>
-						</if>						
+								<span class='desc'>
+									{$this->lang->words['member_joined']} {parse date="$member['joined']" format="joined"}<br />
+									{IPSMember::makeNameFormatted( $member['group'], $member['member_group_id'] )} &middot; {parse format_number="$member['posts']"} {$this->lang->words['member_posts']}
+								</span>
+							</div>
+						</li>						
+					</foreach>
+				<else />
+					<li class='no_messages'>
+						{$this->lang->words['no_results']}
 					</li>
-				</foreach>
-			<else />
-				<p class='no_messages'>{$this->lang->words['no_results']}</p>
-			</if>
-		</ul>
+				</if>
+			</ul>
+		</div>
 	</div>
 </div>
-<div class='topic_controls'>
-	{$pages}
-</div>]]></template_content>
+<script type='text/javascript'>
+	$("mlist_content").setStyle( { minHeight: $('mlist_tabs').measure('margin-box-height') + 5 + "px" } );
+</script>
+{$pages}]]></template_content>
       <template_name>member_list_show</template_name>
       <template_data><![CDATA[$members, $pages="", $dropdowns=array(), $defaults=array(), $custom_fields=null, $url='']]></template_data>
-      <template_updated>1288018124</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1306,105 +1340,103 @@ $memberNames = implode( $mems, ', ' );
       <template_content><![CDATA[<div class='topic_controls'>
 	{$links}
 </div>
-<h2 class='maintitle'>{$this->lang->words['page_title']}</h2>
-<table class='ipb_table' summary="{$this->lang->words['users_online']}">
-	<tr class='header'>
-		<th scope='col' width='55'>&nbsp;</th>
-		<th scope='col'>{$this->lang->words['member_name']}</th>
-		<th scope='col'>{$this->lang->words['where']}</th>
-		<th scope='col'>{$this->lang->words['time']}</th>
-		<th scope='col'>&nbsp;</th>
-	</tr>
-	<if test="onlineusers:|:count($rows)">
-		{parse striping="online" classes="row1,row2"}
-		<foreach loop="online:$rows as $session">
-			<tr>
-				<td class='row1'>
-					<img src='{$session['_memberData']['pp_thumb_photo']}' alt="<if test="hasonlinename:|:$session['_memberData']['members_display_name']">{$session['_memberData']['members_display_name']}<else />{$this->lang->words['global_guestname']}</if>{$this->lang->words['users_photo']}" width='{$session['_memberData']['pp_thumb_width']}' height='{$session['_memberData']['pp_thumb_height']}' class='photo' />
-				</td>
-				<td class='{parse striping="online"}'>
-					<if test="username:|:$session['member_name']">
-						<if test="userid:|:$session['member_id']">
-							<a href='{parse url="showuser={$session['member_id']}" template="showuser" seotitle="{$session['seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{IPSLib::makeNameFormatted( $session['member_name'], $session['member_group'] )}</a>{parse template="user_popup" group="global" params="$session['member_id'],$session['seo_name']"}
-						<else />
-							{IPSLib::makeNameFormatted( $session['member_name'], $session['member_group'] )}
-						</if>
-					<else />
-						{$this->lang->words['global_guestname']}
-					</if>
-					<if test="spider:|:$session['is_bot'] AND $this->settings['spider_anon']">
-						<if test="weareadmin:|:$this->memberData['g_access_cp']">
-							*
-						</if>
-					<else />
-						<if test="anonymous:|:$session['login_type'] == 1">
-							<if test="viewanon:|:!$this->settings['disable_admin_anon'] AND $this->memberData['g_access_cp']">
-								*
-							</if>
-						</if>
-					</if>
-					<if test="showip:|:$this->memberData['g_access_cp'] AND !$this->settings['disable_online_ip']">
-						<span class='ip'>( {$session['ip_address']} )</span>
-					</if>
-				</td>
-				<td class='{parse striping="online"}'>
-					<if test="nowhere:|:!$session['where_line'] || $session['in_error']">
-						{$this->lang->words['board_index']}
-					<else />
-						<if test="wheretext:|:$session['where_link'] AND !$session['where_line_more']">
-							<if test="wheretextseo:|:$session['_whereLinkSeo']">
-								<a href='{$session['_whereLinkSeo']}'>
-							<else />
-								<a href='{parse url="{$session['where_link']}" base="public"}'>
-							</if>
-						</if>
-						{$session['where_line']} 
-						<if test="moredetails:|:$session['where_line_more']">
-							&nbsp;
-							<if test="wheretextseo:|:$session['_whereLinkSeo']">
-								<a href='{$session['_whereLinkSeo']}'>
-							<else />
-								<if test="detailslink:|:$session['where_link']"><a href='{parse url="{$session['where_link']}" base="public"}'></if>
-							</if>
-							{$session['where_line_more']}
-							<if test="enddetailslink:|:$session['where_link']"></a></if>
-						<else />
-							<if test="nomoreenddetailslink:|:$session['where_link']"></a></if>
-						</if>
-					</if>
-				</td>
-				<td class='{parse striping="online"}'>
-					{parse date="$session['running_time']" format="long" relative="false"}
-				</td>
-				<td class='{parse striping="online"}'>
-					<if test="options:|:$session['member_id'] AND $session['member_name']">
-						<ul class='user_controls clear'>
-							<if test="notus:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $session['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-								<if test="addfriend:|:IPSMember::checkFriendStatus( $session['member_id'] )">
-									<li class='mini_friend_toggle is_friend' id='friend_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$session['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
+<h2 class='maintitle'>{$this->lang->words['online_page_title']}</h2>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		<table class='ipb_table ipsMemberList' summary="{$this->lang->words['users_online']}">
+			<tr class='header'>
+				<th scope='col' width='55'>&nbsp;</th>
+				<th scope='col'>{$this->lang->words['member_name']}</th>
+				<th scope='col'>{$this->lang->words['where']}</th>
+				<th scope='col'>{$this->lang->words['time']}</th>
+				<th scope='col'>&nbsp;</th>
+			</tr>
+			<if test="onlineusers:|:count($rows)">
+				{parse striping="online" classes="row1,row2"}
+				<foreach loop="online:$rows as $session">
+					<tr class='{parse striping="online"}'>
+						<td>
+							<img src='{$session['_memberData']['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'], $session['_memberData']['members_display_name'] ? $session['_memberData']['members_display_name'] : $this->lang->words['global_guestname'])"}" class='ipsUserPhoto ipsUserPhoto_mini' />
+						</td>
+						<td>
+							<if test="username:|:$session['member_name']">
+								<if test="userid:|:$session['member_id']">
+									<a hovercard-ref='member' hovercard-id='{$session['member_id']}' class='url _hovertrigger' href='{parse url="showuser={$session['member_id']}" template="showuser" seotitle="{$session['seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{IPSMember::makeNameFormatted( $session['member_name'], $session['member_group'] )}</a>
 								<else />
-									<li class='mini_friend_toggle is_not_friend' id='friend_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$session['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
+									{IPSMember::makeNameFormatted( $session['member_name'], $session['member_group'] )}
+								</if>
+							<else />
+								{$this->lang->words['global_guestname']}
+							</if>
+							<if test="anonymous:|:$session['login_type'] == 1">
+								<if test="viewanon:|:$this->memberData['g_access_cp']">
+									*
 								</if>
 							</if>
-							<if test="sendpm:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $session['member_id'] AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-								<li class='pm_button' id='pm_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$session['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}'>{parse replacement="send_msg"}</a></li>
+							<if test="showip:|:$this->memberData['g_access_cp']">
+								<span class='ip'>( {$session['ip_address']} )</span>
 							</if>
-							<if test="blog:|:$session['memberData']['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $session['memberData']['has_blog'] != 'recache'">
-								<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$session['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
+						</td>
+						<td>
+							<if test="nowhere:|:!$session['where_line'] || $session['in_error']">
+								{$this->lang->words['board_index']}
+							<else />
+								<if test="wheretext:|:$session['where_link'] AND !$session['where_line_more']">
+									<if test="wheretextseo:|:$session['_whereLinkSeo']">
+										<a href='{$session['_whereLinkSeo']}'>
+									<else />
+										<a href='{parse url="{$session['where_link']}" base="public"}'>
+									</if>
+								</if>
+								{$session['where_line']} 
+								<if test="moredetails:|:$session['where_line_more']">
+									&nbsp;
+									<if test="wheretextseo:|:$session['_whereLinkSeo']">
+										<a href='{$session['_whereLinkSeo']}'>
+									<else />
+										<if test="detailslink:|:$session['where_link']"><a href='{parse url="{$session['where_link']}" base="public"}'></if>
+									</if>
+									{$session['where_line_more']}
+									<if test="enddetailslink:|:$session['where_link']"></a></if>
+								<else />
+									<if test="nomoreenddetailslink:|:$session['where_link']"></a></if>
+								</if>
 							</if>
-							<if test="gallery:|:$session['memberData']['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-								<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$session['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
+						</td>
+						<td>
+							{parse date="$session['running_time']" format="long" relative="false"}
+						</td>
+						<td>
+							<if test="options:|:$session['member_id'] AND $session['member_name']">
+								<ul class='ipsList_inline ipsList_nowrap right'>
+									<if test="notus:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $session['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+										<if test="addfriend:|:IPSMember::checkFriendStatus( $session['member_id'] )">
+											<li class='mini_friend_toggle is_friend' id='friend_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$session['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a></li>
+										<else />
+											<li class='mini_friend_toggle is_not_friend' id='friend_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$session['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a></li>								
+										</if>
+									</if>
+									<if test="sendpm:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $session['member_id'] AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
+										<li class='pm_button' id='pm_online_{$session['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$session['member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
+									</if>
+									<if test="blog:|:$session['memberData']['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $session['memberData']['has_blog'] != 'recache'">
+										<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$session['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
+									</if>
+									<if test="gallery:|:$session['memberData']['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+										<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$session['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
+									</if>
+								</ul>
+							<else />
+								<span class='desc'>{$this->lang->words['no_options_available']}</span>
 							</if>
-						</ul>
-					<else />
-						<span class='desc'>{$this->lang->words['no_options_available']}</span>
-					</if>
-				</td>
-			</tr>
-		</foreach>
-	</if>
-</table>
-<div id='forum_filter' class='filter_bar rounded'>
+						</td>
+					</tr>
+				</foreach>
+			</if>
+		</table>
+	</div>
+</div>
+<div id='forum_filter' class='ipsForm_center ipsPad'>
 	<form method="post" action="{parse url="app=members&amp;section=online&amp;module=online" base="public"}">
 		<label for='sort_key'>{$this->lang->words['s_by']}</label>
 		<select name="sort_key" id='sort_key' class='input_select'>
@@ -1431,7 +1463,7 @@ $memberNames = implode( $mems, ', ' );
 </div>]]></template_content>
       <template_name>showOnlineList</template_name>
       <template_data><![CDATA[$rows, $links="", $defaults=array()]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1441,27 +1473,27 @@ $memberNames = implode( $mems, ', ' );
   <templategroup group="skin_profile">
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<dt>{$f->raw_data['pf_title']}:</dt>
-<dd>
-<if test="gender_set:|:$f->value">
-	<if test="male:|:$f->value == 'm'">
-		<img src='{$this->settings['img_url']}/profile/male.png' alt='{$this->lang->words['js_gender_male']}' /> {$this->lang->words['js_gender_male']}
-	</if>
+      <template_content><![CDATA[<span class='row_title'>{$f->raw_data['pf_title']}</span>
+<div class='row_data'>
+	<if test="gender_set:|:$f->value">
+		<if test="male:|:$f->value == 'm'">
+			<img src='{$this->settings['img_url']}/profile/male.png' alt='{$this->lang->words['js_gender_male']}' /> {$this->lang->words['js_gender_male']}
+		</if>
 	
-	<if test="female:|:$f->value == 'f'">
-		<img src='{$this->settings['img_url']}/profile/female.png' alt='{$this->lang->words['js_gender_female']}' /> {$this->lang->words['js_gender_female']}
-	</if>
+		<if test="female:|:$f->value == 'f'">
+			<img src='{$this->settings['img_url']}/profile/female.png' alt='{$this->lang->words['js_gender_female']}' /> {$this->lang->words['js_gender_female']}
+		</if>
 	
-	<if test="nottelling:|:$f->value =='u'">
+		<if test="nottelling:|:$f->value != 'f' AND $f->value != 'm'">
+			<img src='{$this->settings['img_url']}/profile/mystery.png' alt='{$this->lang->words['js_gender_mystery']}' /> {$this->lang->words['js_gender_mystery']}
+		</if>
+	<else />
 		<img src='{$this->settings['img_url']}/profile/mystery.png' alt='{$this->lang->words['js_gender_mystery']}' /> {$this->lang->words['js_gender_mystery']}
 	</if>
-<else />
-<img src='{$this->settings['img_url']}/profile/mystery.png' alt='{$this->lang->words['js_gender_mystery']}' /> {$this->lang->words['js_gender_mystery']}
-</if>
-</dd>]]></template_content>
+</div>]]></template_content>
       <template_name>customField__gender</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1470,18 +1502,18 @@ $memberNames = implode( $mems, ', ' );
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<if test="$f->parsed != ''">
-	<dt>{$f->raw_data['pf_title']}:</dt>
-	<dd>
+	<span class='row_title'>{$f->raw_data['pf_title']}</span>
+	<div class='row_data'>
 		<if test="genericIsArray:|:is_array($f->parsed)">
 			{parse expression="implode( '<br />', $f->parsed )"}
 		<else />
 			{$f->parsed}
 		</if>
-	</dd>
+	</div>
 </if>]]></template_content>
       <template_name>customField__generic</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1490,36 +1522,38 @@ $memberNames = implode( $mems, ', ' );
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<if test="contact_field:|:$f->parsed">
-<dt>{$f->raw_data['pf_title']}:</dt>
-<dd>
-	<if test="cf_icon:|:$f->raw_data['pf_icon']"><img src='{$this->settings['public_dir']}{$f->raw_data['pf_icon']}' alt='{$f->raw_data['pf_title']}' />&nbsp;</if>
-	<if test="cf_array:|:is_array( $f->parsed )">
-		<foreach loop="cfieldgroups:$f->parsed as $value">
-			{$value}
-		</foreach>
-	<else />
-		<if test="cf_aim:|:$f->raw_data['pf_key'] == 'aim'">
-			<a class='url' href='aim:goim?screenname={$f->parsed}'>{$f->parsed}</a>
+<li>
+	<span class='row_title'>{$f->raw_data['pf_title']}</span>
+	<span class='row_data'>
+		<if test="cf_icon:|:$f->raw_data['pf_icon']"><img src='{$this->settings['public_dir']}{$f->raw_data['pf_icon']}' alt='{$f->raw_data['pf_title']}' />&nbsp;</if>
+		<if test="cf_array:|:is_array( $f->parsed )">
+			<foreach loop="cfieldgroups:$f->parsed as $value">
+				{$value}
+			</foreach>
 		<else />
-			<if test="cf_msn:|:$f->raw_data['pf_key'] == 'msn'">
-				<a class='url' href='msnim:chat?contact={$f->parsed}'>{$f->parsed}</a>
+			<if test="cf_aim:|:$f->raw_data['pf_key'] == 'aim'">
+				<a class='url' href='aim:goim?screenname={$f->parsed}'>{$f->parsed}</a>
 			<else />
-				<if test="cf_yahoo:|:$f->raw_data['pf_key'] == 'yahoo'">
-					<a class='url' href='ymsgr:sendIM?{$f->parsed}'>{$f->parsed}</a>
+				<if test="cf_msn:|:$f->raw_data['pf_key'] == 'msn'">
+					<a class='url' href='msnim:chat?contact={$f->parsed}'>{$f->parsed}</a>
 				<else />
-					<if test="cf_icq:|:$f->raw_data['pf_key'] == 'icq'">
-						<a class='url' type="application/x-icq" href='http://www.icq.com/people/cmd.php?uin={$f->parsed}&amp;action=message'>{$f->parsed}</a>
+					<if test="cf_yahoo:|:$f->raw_data['pf_key'] == 'yahoo'">
+						<a class='url' href='ymsgr:sendIM?{$f->parsed}'>{$f->parsed}</a>
 					<else />
-						<if test="cf_website:|:$f->raw_data['pf_key'] == 'website'">
-							<a class='url uid' rel="me" href='{$f->parsed}'>{$f->parsed}</a>
+						<if test="cf_icq:|:$f->raw_data['pf_key'] == 'icq'">
+							<a class='url' type="application/x-icq" href='http://www.icq.com/people/cmd.php?uin={$f->parsed}&amp;action=message'>{$f->parsed}</a>
 						<else />
-							<if test="cf_jabber:|:$f->raw_data['pf_key'] == 'jabber'">
-								<a class='url' href='xmpp:{$f->parsed}'>{$f->parsed}</a>
+							<if test="cf_website:|:$f->raw_data['pf_key'] == 'website'">
+								<a class='url uid' rel="me" href='{$f->parsed}'>{$f->parsed}</a>
 							<else />
-								<if test="cf_skype:|:$f->raw_data['pf_key'] == 'skype'">
-									<a class='url' href='skype:{$f->parsed}?call'>{$f->parsed}</a>
+								<if test="cf_jabber:|:$f->raw_data['pf_key'] == 'jabber'">
+									<a class='url' href='xmpp:{$f->parsed}'>{$f->parsed}</a>
 								<else />
-									{$f->parsed}
+									<if test="cf_skype:|:$f->raw_data['pf_key'] == 'skype'">
+										<a class='url' href='skype:{$f->parsed}?call'>{$f->parsed}</a>
+									<else />
+										{$f->parsed}
+									</if>
 								</if>
 							</if>
 						</if>
@@ -1527,12 +1561,63 @@ $memberNames = implode( $mems, ', ' );
 				</if>
 			</if>
 		</if>
-	</if>
-</dd>
+	</span>
+</li>
 </if>]]></template_content>
       <template_name>customFieldGroup__contact</template_name>
       <template_data>$f</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_profile</template_group>
+      <template_content><![CDATA[<style type="text/css">
+/* Overwrite some of the standard IPB rules */
+/* Content, is the main page under the header */
+#content {
+	max-width:87%;
+	min-width: 980px;
+	margin-left: auto;
+	margin-right: auto;
+	background: transparent url("{style_images_url}/opacity70.png");
+	background: rgba(255,255,255,0.3);
+}
+#profile_background {
+	background: transparent url("{style_images_url}/opacity70.png");
+	background: rgba(255,255,255,0.3);
+}
+.topic_buttons li.non_button a, #footer_utilities {
+	background: #fff !important;
+}
+<if test="$member['customization']['bg_color'] OR $member['customization']['_bgUrl']">
+body {
+	<if test="$member['customization']['bg_color']">
+		background-color: #{$member['customization']['bg_color']};
+	</if>
+	<if test="$member['customization']['_bgUrl']">
+		background-image: url("{$member['customization']['_bgUrl']}");
+		<if test="! $member['customization']['bg_tile']">
+			background-position: 0px 0px;
+			background-attachment: fixed;
+			background-repeat: no-repeat;
+		<else />
+			background-position: 0px 0px;
+			background-attachment: fixed;
+			background-repeat: repeat;
+		</if>
+	</if>
+}
+</if>
+</style>
+<script type="text/javascript">
+	ipb.profile.customization = 1;
+</script>]]></template_content>
+      <template_name>customizeProfile</template_name>
+      <template_data>$member</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1568,38 +1653,7 @@ $memberNames = implode( $mems, ', ' );
 </table>]]></template_content>
       <template_name>dnameWrapper</template_name>
       <template_data><![CDATA[$member_name="",$records=array()]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<if test="friendIframeWrapper:|:$showWrapper">
-		<div class='friend_list'>
-	</if>
-		<h3 class='bar'>Friends</h3>
-		<if test="friendIframeLoop:|:is_array($friends) and count($friends)">
-			<ul class='clearfix'>
-			<foreach loop="friendsIframe:$friends as $friend">
-				<li>
-					<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt='Photo' class='photo' /></a><br />
-					<span class='name'><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name_short']}</a> {parse template="user_popup" group="global" params="$friend['member_id'], $friend['members_seo_name']"}</span>
-				</li>
-			</foreach>
-			</ul>
-		<else />
-			<p>
-				<em>{$member['members_display_name']} {$this->lang->words['no_friends_yet']}</em>
-			</p>
-		</if>
-	<if test="friendIframeEndWrapper:|:$showWrapper">
-		</div>
-	</if>]]></template_content>
-      <template_name>friendsIframe</template_name>
-      <template_data>$member, $friends, $showWrapper=false</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1608,124 +1662,111 @@ $memberNames = implode( $mems, ', ' );
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[{parse js_module="friends"}
-<h2>{$this->lang->words['m_friends_list']}</h2>
+<h1 class='ipsType_pagetitle'>{$this->lang->words['m_friends_list']}</h1>
 <if test="friendListPages:|:$pages">
 	<div class='topic_controls'>
 		$pages
 	</div>
 </if>
-<ul class='tab_bar no_title'>
-	<if test="tabIsList:|:$this->request['tab'] == 'list' || !$this->request['tab']">
-		<li class='active'><strong>{$this->lang->words['m_friends_list']}</strong></li>
-		<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=pending" base="public"}' title='{$this->lang->words['m_friends_pending']}'>{$this->lang->words['m_friends_pending']}</a></li>
-	</if>
-	<if test="tabIsPending:|:$this->request['tab'] == 'pending'">
-		<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=list" base="public"}' title='{$this->lang->words['m_friends_list']}'>{$this->lang->words['m_friends_list']}</a></li>
-		<li class='active'><strong>{$this->lang->words['m_friends_pending']}</strong></li>
-	</if>
-</ul>
+<div class='maintitle ipsFilterbar clear'>
+	<ul class='ipsList_inline clearfix'>
+		<if test="tabIsList:|:$this->request['tab'] == 'list' || !$this->request['tab']">
+			<li class='active'><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=list" base="public"}' title='{$this->lang->words['m_friends_list']}'>{$this->lang->words['m_friends_list']}</a></li>
+			<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=pending" base="public"}' title='{$this->lang->words['m_friends_pending']}'>{$this->lang->words['m_friends_pending']}</a></li>
+		</if>
+		<if test="tabIsPending:|:$this->request['tab'] == 'pending'">
+			<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=list" base="public"}' title='{$this->lang->words['m_friends_list']}'>{$this->lang->words['m_friends_list']}</a></li>
+			<li class='active'><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=pending" base="public"}' title='{$this->lang->words['m_friends_pending']}'>{$this->lang->words['m_friends_pending']}</a></li>
+		</if>
+	</ul>
+</div>
 <if test="hasFriendsList:|:is_array($friends) and count($friends) && $this->settings['friends_enabled']">
 	{parse striping="memberStripe" classes="row1,row2"}
-	<ul class='members'>
-	<foreach loop="friendsList:$friends as $friend">
-		<if test="loopOnPending:|:$this->request['tab'] == 'pending'">
-			<li id='member_id_{$friend['member_id']}' class='general_box clear member_entry {parse striping="memberStripe"}'>
-				<h3 class='bar'><a href='{parse url="showuser={$friend['friends_member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id'],$friend['members_seo_name']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-			
-				<dl class='info'>
-					<dt class='clear'>{$this->lang->words['m_member_since']}</dt>
-					<dd>{parse date="$friend['joined']" format="short"}</dd>
-					<dt class='clear'>{$this->lang->words['m_group']}</dt>
-					<dd>{$friend['_group_formatted']}</dd>
-					<dt class='clear'>{$this->lang->words['m_posts']}</dt>
-					<dd>{parse format_number="$friend['posts']"}</dd>
-					<dt class='clear'>{$this->lang->words['m_last_active']}</dt>
-					<dd>{parse date="$friend['last_activity']" format="short"}</dd>
-				</dl>
-				
-				<ul class='user_controls clear'>
-					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=approve&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='Approve'>{parse replacement="approve"} {$this->lang->words['approve_request']}</a></li>
-					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=delete&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='Deny'>{parse replacement="deny"} {$this->lang->words['deny_request']}</a></li>
-				</ul>
-				<if test="friendListRate:|:$this->settings['pp_allow_member_rate']">
-					<p class='rating'> 
-						<if test="friendListRate1:|:$friend['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRate2:|:$friend['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRate3:|:$friend['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRate4:|:$friend['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRate5:|:$friend['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
-					</p>
-				</if>
-				
-				<if test="friendListRep:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
-					<if test="friendListRepPos:|:$friend['pp_reputation_points'] > 0">
-						<p class='reputation positive'>
-					</if>
-					<if test="friendListRepNeg:|:$friend['pp_reputation_points'] < 0">
-						<p class='reputation negative'>
-					</if>
-					<if test="friendListRepZero:|:$friend['pp_reputation_points'] == 0">
-						<p class='reputation zero'>
-					</if>
-							<span class='number'>{$this->lang->words['m_reputation']} {$friend['pp_reputation_points']}</span>
-						</p>
-				</if>						
-			</li>
-		<else />
-			<li id='member_id_{$friend['friends_friend_id']}' class='general_box clear member_entry {parse striping="memberStripe"}'>
-				<h3 class='bar'><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id'],$friend['members_seo_name']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-			
-				<dl class='info'>
-					<dt class='clear'>{$this->lang->words['m_member_since']}</dt>
-					<dd>{parse date="$friend['joined']" format="short"}</dd>
-					<dt class='clear'>{$this->lang->words['m_group']}</dt>
-					<dd>{$friend['_group_formatted']}</dd>
-					<dt class='clear'>{$this->lang->words['m_posts']}</dt>
-					<dd>{parse format_number="$friend['posts']"}</dd>
-					<dt class='clear'>{$this->lang->words['m_last_active']}</dt>
-					<dd>{parse date="$friend['last_activity']" format="short"}</dd>
-				</dl>
-				
-				<ul class='user_controls clear'>
-					<if test="friendListIsMember:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $friend['friends_member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-						<if test="friendListIsFriend:|:IPSMember::checkFriendStatus( $friend['friends_member_id'] )">
-							<li class='mini_friend_toggle is_friend' id='friend_profile_{$friend['friends_member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$friend['friends_member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_as_friend']}'>{parse replacement="remove_friend"}</a></li>
-						<else />
-							<li class='mini_friend_toggle is_not_friend' id='friend_profile_{$friend['friends_member_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$friend['friends_member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_me_friend']}'>{parse replacement="add_friend"}</a></li>								
+	<ul class='ipsMemberList'>
+		<foreach loop="friendsList:$friends as $friend">
+			<if test="loopOnPending:|:$this->request['tab'] == 'pending'">
+				<li id='member_id_{$friend['member_id']}' class='ipsPad clearfix member_entry {parse striping="memberStripe"}'>
+					<a href='{parse url="showuser={$friend['member_id']}" template="showuser" seotitle="{$friend['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$friend['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$friend['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+					<div class='ipsBox_withphoto'>
+						<ul class='ipsList_inline right'>
+							<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=approve&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='{$this->lang->words['approve_request']}' class='ipsButton_secondary'>{$this->lang->words['approve_request']}</a></li>
+							<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=delete&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='{$this->lang->words['deny_request']}' class='ipsButton_secondary important'>{$this->lang->words['deny_request']}</a></li>
+						</ul>
+						
+						<h3 class='ipsType_subtitle'>
+							<strong><a href='{parse url="showuser={$friend['member_id']}" template="showuser" seotitle="{$friend['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a></strong>
+						</h3>
+						<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+							<if test="norep:|:$friend['pp_reputation_points'] == 0 || !$friend['pp_reputation_points']">
+								<p class='reputation zero ipsType_small left'>
+							</if>
+							<if test="posrep:|:$friend['pp_reputation_points'] > 0">
+								<p class='reputation positive ipsType_small left'>
+							</if>
+							<if test="negrep:|:$friend['pp_reputation_points'] < 0">
+								<p class='reputation negative ipsType_small left'>
+							</if>							
+									<span class='number'>{$friend['pp_reputation_points']}</span>
+								</p>
 						</if>
-					</if>
-					<if test="friendListSendPm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-						<li class='pm_button' id='pm_xxx_{$friend['friends_member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$friend['friends_member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}'>{parse replacement="send_msg"}</a></li>
-					</if>
-					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$friend['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}'>{parse replacement="find_topics_link"}</a></li>
-					<if test="friendListBlog:|:$friend['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
-						<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$friend['friends_friend_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
-					</if>
-					<if test="friendListGallery:|:$friend['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-						<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$friend['friends_friend_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
-					</if>
-				</ul>
-				<if test="friendListAllowRate:|:$this->settings['pp_allow_member_rate']">
-					<p class='rating'> 
-						<if test="friendListRateApp1:|:$friend['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRateApp2:|:$friend['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRateApp3:|:$friend['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRateApp4:|:$friend['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="friendListRateApp5:|:$friend['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
-					</p>
-				</if>
-				
-				<if test="friendListAppRep:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
-					<if test="friendListAppRepPos:|:$friend['pp_reputation_points'] > 0">
-						<p class='reputation positive'>
-					</if>
-					<if test="friendListAppRepNeg:|:$friend['pp_reputation_points'] < 0">
-						<p class='reputation negative'>
-					</if>
-					<if test="friendListAppRepZero:|:$friend['pp_reputation_points'] == 0">
-						<p class='reputation zero'>
-					</if>
-							<span class='number'>{$this->lang->words['m_reputation']} {$friend['pp_reputation_points']}</span>
-						</p>
-				</if>						
-			</li>
-		</if>
+						<span class='desc'>
+							{$this->lang->words['member_joined']} {parse date="$friend['joined']" format="joined"}<br />
+							{IPSMember::makeNameFormatted( $friend['group'], $friend['member_group_id'] )} &middot; {parse format_number="$friend['posts']"} {$this->lang->words['member_posts']}
+						</span>
+					</div>
+				</li>
+			<else />
+				<li id='member_id_{$friend['member_id']}' class='ipsPad clearfix member_entry {parse striping="memberStripe"}'>
+					<a href='{parse url="showuser={$friend['member_id']}" template="showuser" seotitle="{$friend['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$friend['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$friend['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' /></a>
+					<div class='ipsBox_withphoto'>
+						<ul class='ipsList_inline right'>
+							<if test="weAreSupmod:|:$this->memberData['g_is_supmod'] == 1 && $friend['member_id'] != $this->memberData['member_id']">
+								<li><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;auth_key={$this->member->form_hash}&amp;mid={$friend['member_id']}&amp;pf={$friend['member_id']}" base="public"}' class='ipsButton_secondary'>{$this->lang->words['supmod_edit_member']}</a></li>
+							</if>
+							<if test="notus:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $friend['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+								<if test="addfriend:|:IPSMember::checkFriendStatus( $friend['member_id'] )">
+									<li class='mini_friend_toggle is_friend' id='friend_mlist_{$friend['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$friend['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}' class='ipsButton_secondary'>{parse replacement="remove_friend"}</a></li>
+								<else />
+									<li class='mini_friend_toggle is_not_friend' id='friend_mlist_{$friend['member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$friend['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}' class='ipsButton_secondary'>{parse replacement="add_friend"}</a></li>								
+								</if>
+							</if>
+							<if test="sendpm:|:$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) && $friend['member_id'] != $this->memberData['member_id']">
+								<li class='pm_button' id='pm_xxx_{$friend['pp_member_id']}'><a href='{parse url="app=members&amp;module=list&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$friend['pp_member_id']}" base="public"}' title='{$this->lang->words['pm_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}</a></li>
+							</if>
+							<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$friend['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}' class='ipsButton_secondary'>{parse replacement="find_topics_link"}</a></li>
+							<if test="blog:|:$friend['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) AND $friend['has_blog'] != 'recache'">
+								<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$friend['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}' class='ipsButton_secondary'>{parse replacement="blog_link"}</a></li>
+							</if>
+							<if test="gallery:|:$friend['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+								<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$friend['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}' class='ipsButton_secondary'>{parse replacement="gallery_link"}</a></li>
+							</if>
+						</ul>
+						
+						<h3 class='ipsType_subtitle'>
+							<strong><a href='{parse url="showuser={$friend['member_id']}" template="showuser" seotitle="{$friend['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name']}</a></strong>
+						</h3>
+						<if test="repson:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+							<if test="norep:|:$friend['pp_reputation_points'] == 0 || !$friend['pp_reputation_points']">
+								<p class='reputation zero ipsType_small left'>
+							</if>
+							<if test="posrep:|:$friend['pp_reputation_points'] > 0">
+								<p class='reputation positive ipsType_small left'>
+							</if>
+							<if test="negrep:|:$friend['pp_reputation_points'] < 0">
+								<p class='reputation negative ipsType_small left'>
+							</if>							
+									<span class='number'>{$friend['pp_reputation_points']}</span>
+								</p>
+						</if>
+						<span class='desc'>
+							{$this->lang->words['member_joined']} {parse date="$friend['joined']" format="joined"}<br />
+							{IPSMember::makeNameFormatted( $friend['group'], $friend['member_group_id'] )} &middot; {parse format_number="$friend['posts']"} {$this->lang->words['member_posts']}
+						</span>
+					</div>
+				</li>
+			</if>
 		
-	</foreach>
+		</foreach>
 	</ul>
 <else />
 	<p class='no_messages'>
@@ -1738,12 +1779,12 @@ $memberNames = implode( $mems, ', ' );
 </if>
 <if test="friendListPagesBottom:|:$pages">
 	<div class='topic_controls'>
-		$pages
+		{$pages}
 	</div>
 </if>]]></template_content>
       <template_name>friendsList</template_name>
       <template_data>$friends, $pages</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -1751,13 +1792,121 @@ $memberNames = implode( $mems, ', ' );
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[{parse js_module="rating"}
+      <template_content><![CDATA[<link rel="stylesheet" type="text/css" media="screen" href="{$this->settings['public_dir']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_photo_editor.css" />
+<script type="text/javascript">
+ 	// Can't use normal link as loaded by Ajax
+    $$("head")[0].insert(new Element("script", {
+      type: "text/javascript",
+      src: '{$this->settings['public_dir']}js/ips.inlineUploader.js'
+    })).
+    insert(new Element("script", {
+      type: "text/javascript",
+      src: '{$this->settings['public_dir']}js/ips.photoEditor.js'
+    })).
+    insert(new Element("script", {
+      type: "text/javascript",
+      src: '{$this->settings['public_dir']}js/3rd_party/cropper/cropper.uncompressed.js'
+    }));
+</script>
+<form method='post' enctype="multipart/form-data" action="{parse url="app=members&amp;module=profile&amp;section=photo&amp;do=save" base="public"}" id='photoEditorForm' name='photoEditorForm'>
+<h3>{$this->lang->words['pe_title']}</h3>
+<div class='ipsBox'>
+<div class='fixed_inner'>
+	<fieldset id='ips_photoWrap' class='fixed_inner ipsBox_container'>
+		<div id='ips_sidePanel'>
+			<div id="ips_currentPhoto">
+				{$data['currentPhoto']['tag']}
+			</div>
+			<div id='ips_cropperControls' style='display:none'>
+				<a href="javascript:void(0);" class="ipsButton_secondary desc cropperCancel">{$this->lang->words['pe_cancel']}</a> <a href="javascript:void(0);" class="ipsButton_secondary desc cropperAccept">{$this->lang->words['pe_ok']}</a>
+			</div>
+			<div id='ips_cropperStart' style='<if test="$data['type'] == 'gravatar'">display:none</if>;'>
+				<a href="javascript:void(0);" class="ipsButton_secondary desc cropperStart">{$this->lang->words['adjust_crop_lnk']}</a>
+			</div>
+		</div>
+		<div id='ips_photoOptions'>
+			<ul>
+				<li class='ips_option row2'>
+					<div class='ips_photoPreview _custom'><label>{$data['custom']['tag']}</label></div>
+					<div class='ips_photoControls'>
+						<input type='radio' name='photoType' id='ips_ptype_custom' value='custom' <if test="$data['type'] == 'custom'">checked='checked'</if> /> <strong>{$this->lang->words['pe_use_custom_photo']}</strong>
+						<div class='ips_photoOptionText'>
+							<span class='desc'>{$this->lang->words['pe_upload_desc']}.<br />{$this->lang->words['pe_upload_rec']}</span>
+							<br />
+							<input type="file" name="upload_photo" id='upload_photo' class='input_text' value="" size="20" title="{$this->lang->words['pe_formats']}" />
+							<if test="canHasURL:|:$this->settings['mem_photo_url']">
+							<br />
+							<span class='desc'>{$this->lang->words['pe_import_from_url']}</span>
+							<br /><input type='text' class='input_text' size='20' id='url_photo' name='url_photo' /> <input type='button' id='url_import' value='Import' class='ipsButton_secondary desc' />
+							</if>
+							<div class='message error' style='display:none' id='ips_type_custom_error'></div>
+						</div>
+					</div>
+				</li>
+				<if test="allowGravatars:|:$this->settings['allow_gravatars']">
+				<li class='ips_option row2'>
+					<div class='ips_photoPreview _gravatar'><label>{$data['gravatar']['tag']}</label></div>
+					<div class='ips_photoControls'>
+						<input type='radio' name='photoType' id='ips_ptype_gravatar' value='gravatar' <if test="$data['type'] == 'gravatar'">checked='checked'</if> /> <strong>{$this->lang->words['pe_use_gravatar']}</strong>
+						<div class='ips_photoOptionText'>
+							<span class='desc'><a href="http://www.gravatar.com" rel="external">{$this->lang->words['pe_what_is_gravatar']}</a></span>
+							<br /><br />
+							<input type="text" name="gravatar" id='gravatar' class='input_text' size="35" value="{$member['pp_gravatar']}" />
+							<br /><span class='desc'>{$this->lang->words['pe_enter_gravatar_email']}</span>
+						</div>
+					</div>
+				</li>
+				</if>
+				<if test="hasTwitter:|:! empty($data['twitter']['tag'])">
+				<li class='ips_option row2'>
+					<div class='ips_photoPreview _twitter'><label>{$data['twitter']['tag']}</label></div>
+					<div class='ips_photoControls'>
+						<input type='radio' name='photoType' id='ips_ptype_twitter' value='twitter' <if test="$data['type'] == 'twitter'">checked='checked'</if> /> <strong>{$this->lang->words['pe_use_twitter']}</strong>
+						<div class='ips_photoOptionText'>
+							<span class='desc'>{$this->lang->words['pe_twitter_desc']}</span>					
+						</div>
+					</div>
+				</li>
+				</if>
+				<if test="hasFacebook:|:! empty($data['facebook']['tag'])">
+				<li class='ips_option row2'>
+					<div class='ips_photoPreview _facebook'><label>{$data['facebook']['tag']}</label></div>
+					<div class='ips_photoControls'>
+						<input type='radio' name='photoType' id='ips_ptype_facebook' value='facebook' <if test="$data['type'] == 'facebook'">checked='checked'</if> /> <strong>{$this->lang->words['pe_use_facebook']}</strong>
+						<div class='ips_photoOptionText'>
+							<span class='desc'>{$this->lang->words['pe_facebook_desc']}</span>					
+						</div>
+					</div>
+				</li>
+				</if>
+				<li class='ipsPad_half clearfix right'>
+					<input type='button' name='remove' value='{$this->lang->words['pe_remove_button']}' class='ipsButton important ips_photoRemove' />
+					<input type='submit' name='saveit' value='{$this->lang->words['pe_done_button']}' class='ipsButton ips_photoSubmit' />
+				</li>
+			</ul>
+		</div>
+	</fieldset>
+</div>
+</div>
+</form>]]></template_content>
+      <template_name>photoEditor</template_name>
+      <template_data>$data, $member</template_data>
+      <template_updated>1318864228</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_profile</template_group>
+      <template_content><![CDATA[{parse js_module="status"}
+{parse js_module="rating"}
 {parse js_module="profile"}
 <script type='text/javascript'>
 //<!#^#|CDATA|
 	ipb.profile.viewingProfile = parseInt( {$member['member_id']} );
-	ipb.templates['remove_friend'] = "<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=remove&amp;member_id={$member['member_id']}" base="public"}' title='{$this->lang->words['remove_as_friend']}'><img src='{$this->settings['img_url']}/user_delete.png' alt='{$this->lang->words['remove_as_friend']}' /> {$this->lang->words['remove_as_friend']}</a>";
-	ipb.templates['add_friend'] = "<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=add&amp;member_id={$member['member_id']}" base="public"}' title='{$this->lang->words['add_me_friend']}'><img src='{$this->settings['img_url']}/user_add.png' alt='{$this->lang->words['add_me_friend']}' /> {$this->lang->words['add_me_friend']}</a>";
+	ipb.templates['remove_friend'] = "<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=remove&amp;member_id={$member['member_id']}" base="public"}' title='{$this->lang->words['remove_as_friend']}'><img src='{$this->settings['img_url']}/user_delete.png' alt='{$this->lang->words['remove_as_friend']}' />&nbsp;&nbsp; {$this->lang->words['remove_as_friend']}</a>";
+	ipb.templates['add_friend'] = "<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=add&amp;member_id={$member['member_id']}" base="public"}' title='{$this->lang->words['add_me_friend']}'><img src='{$this->settings['img_url']}/user_add.png' alt='{$this->lang->words['add_me_friend']}' />&nbsp;&nbsp; {$this->lang->words['add_me_friend']}</a>";
 	ipb.templates['edit_status'] = "<span id='edit_status'><input type='text' class='input_text' style='width: 60%' id='updated_status' maxlength='150' /> <input type='submit' value='{$this->lang->words['save']}' class='input_submit' id='save_status' /> &nbsp;<a href='#' id='cancel_status' class='cancel' title='{$this->lang->words['cancel']}'>{$this->lang->words['cancel']}</a></span>";
 	<if test="friendsEnabled:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
 		<if test="jsIsFriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
@@ -1769,396 +1918,350 @@ $memberNames = implode( $mems, ', ' );
 //|#^#]>
 </script>
 <if test="hasCustomization:|:is_array($member['customization']) AND $member['customization']['type']">
-<style type="text/css">
-/* Overwrite some of the standard IPB rules */
-/* Content, is the main page under the header */
-#content {
-	padding-left: 95px;
-	padding-right: 95px;
-	max-width:1000px;
-	margin-left: auto;
-	margin-right: auto;
-}
-/* new DIV so we can use a semi-transparent image */
-#userBg {
-	background-image: url("{style_images_url}/opacity70.png");
-	padding-bottom: 25px;
-}
-/* Set a semi-transparent image for the secondary nav */
-#secondary_nav {
-	background-image: url("{style_images_url}/opacity50.png");
-	height: 15px;
-}
-div#profile_overview .general_box.alt,
-.personal_info {
-/*	background-color: #f3f3f3; */
-}
-<if test="$member['customization']['bg_color'] OR $member['customization']['_bgUrl']">
-body {
-	<if test="$member['customization']['bg_color']">
-		background-color: #{$member['customization']['bg_color']};
-	</if>
-	<if test="$member['customization']['_bgUrl']">
-		background-image: url("{$member['customization']['_bgUrl']}");
-		<if test="! $member['customization']['bg_tile']">
-			background-position: 0px 0px;
-			background-attachment: fixed;
-			background-repeat: no-repeat;
-		<else />
-			background-position: 0px 0px;
-			background-attachment: fixed;
-			background-repeat: repeat;
-		</if>
-	</if>
-}
+	{parse template="customizeProfile" group="profile" params="$member"}
 </if>
-</style>
-<script type="text/javascript">
-	ipb.profile.customization = 1;
-</script>
-</if>
-<!--SKINNOTE: Added report link - feel free to change around -->
-<if test="thisIsNotUs:|:($this->memberData['member_id'] && $member['member_id'] != $this->memberData['member_id'])">
-	<ul class='topic_buttons'>
-		<li><a href='{parse url="app=core&amp;module=reports&amp;section=reports&amp;rcom=profiles&amp;member_id={$member['member_id']}" base="public"}'>{parse replacement="user_icon"} {$this->lang->words['report_member']}</a></li>
-	</ul>
-</if>
-	
-<if test="canEditUser:|:($this->memberData['member_id'] && $member['member_id'] == $this->memberData['member_id']) || $this->memberData['g_is_supmod'] == 1">
-	<!--SKINNOTE: If you are a mod and are looking at your own profile, you get two edit links - not really needed -->
+<if test="canEditUser:|:($this->memberData['member_id'] && $member['member_id'] == $this->memberData['member_id']) || $this->memberData['g_is_supmod'] == 1 || ($this->memberData['member_id'] && $member['member_id'] != $this->memberData['member_id'])">
 	<ul class='topic_buttons'>
 		<if test="weAreSupmod:|:$this->memberData['g_is_supmod'] == 1 && $member['member_id'] != $this->memberData['member_id']">
-			<li><a href='{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=editmember&amp;auth_key={$this->member->form_hash}&amp;member={$member['member_id']}" base="public"}'>{parse replacement="user_icon"} {$this->lang->words['supmod_edit_member']}</a></li>
+			<li><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;auth_key={$this->member->form_hash}&amp;mid={$member['member_id']}&amp;pf={$member['member_id']}" base="public"}'>{$this->lang->words['supmod_edit_member']}</a></li>
 		</if>
 		<if test="weAreOwner:|:$this->memberData['member_id'] && $member['member_id'] == $this->memberData['member_id']">
-			<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=members" base="public"}'>{parse replacement="user_edit_icon"} {$this->lang->words['edit_profile']}</a></li>
-		</if>		
+			<li><a href='{parse url="app=core&amp;module=usercp&amp;tab=core" base="public"}'>{$this->lang->words['edit_profile']}</a></li>
+		</if>
+		<if test="supModCustomization:|:($member['member_id'] == $this->memberData['member_id'] ) AND $member['customization']['type']">
+			<li class='non_button'><a href='{parse url="showuser={$member['member_id']}&amp;secure_key={$this->member->form_hash}&amp;removeCustomization=1" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}'>{$this->lang->words['cust_remove']}</a></li>
+		</if>
 	</ul>
 </if>
-<div class='vcard'>
-	<h2 class='maintitle'>
-		<span class='left'>{parse expression="sprintf( $this->lang->words['their_profile'], "<span class='fn nickname'>{$member['members_display_name']}</span>" )"}</span>
-		<if test="allowRate:|:$this->settings['pp_allow_member_rate']">
-			<span class='rating'>
-				<if test="noRateYourself:|:$this->memberData['member_id'] == $member['member_id'] || !$this->memberData['member_id']">
-					{$this->lang->words['m_rating']} 
-						<if test="rate1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><span id='rating_text' class='desc'></span>
-				<else />
-					{$this->lang->words['m_rating']} 
-						<a href='#' id='user_rate_1' title='{$this->lang->words['m_rate_1']}'><if test="rated1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_2' title='{$this->lang->words['m_rate_2']}'><if test="rated2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_3' title='{$this->lang->words['m_rate_3']}'><if test="rated3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_4' title='{$this->lang->words['m_rate_4']}'><if test="rated4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_5' title='{$this->lang->words['m_rate_5']}'><if test="rated5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a> <span id='rating_text' class='desc'></span>
-					<script type='text/javascript'>
-						rating = new ipb.rating( 'user_rate_', { 
-											url: '{parse url="app=members&module=ajax&section=rate&member_id={$member['member_id']}" base="public"}&md5check=' + ipb.vars['secure_hash'],
-											cur_rating: <if test="hasrating:|:isset($member['pp_rating_real'])">{$member['pp_rating_real']}<else />0</if>,
-											rated: null,
-											allow_rate: ( {$this->memberData['member_id']} != 0 ) ? 1 : 0,
-											show_rate_text: false
-										  } );
-					</script>
+<div class='ipsBox clear vcard' id='profile_background'>
+	<div class='ipsVerticalTabbed ipsLayout ipsLayout_withleft ipsLayout_smallleft clearfix'>
+		<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='profile_tabs'>
+			<p class='short photo_holder'>
+				<if test="canEditPic:|:($this->memberData['member_id'] && $member['member_id'] == $this->memberData['member_id']) AND (IPSMember::canUploadPhoto($member))">
+					<a data-clicklaunch="launchPhotoEditor" href="{parse url="app=members&amp;module=profile&amp;section=photo" base="public"}" id='change_photo' class='ipsType_smaller ipsPad' title='{$this->lang->words['change_photo_desc']}'>{$this->lang->words['change_photo_link']}</a>
 				</if>
-			</span>
-		</if>		
-	</h2>
-	<div id='userBg'>
-	<div id='profile_overview' class='left'>
-		<div class='general_box alt'>
-		<div class='personal_info clear'>
-			<img class="photo" src='{$member['pp_main_photo']}' alt="{$member['members_display_name']}{$this->lang->words['users_photo']}"  />
+				<img class="ipsUserPhoto" id='profile_photo' src='{$member['pp_main_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$member['members_display_name'])"}"  />
+			</p>
 			<if test="haswarn:|:$member['warn_percent'] !== NULL">
-				<div class='warn_panel clear rounded'>
-					<if test="$this->settings['warn_show_rating']">
-						<p class='rating_mode user_warn' style='text-align:center' title='{$this->lang->words['warn_level']} {$member['warn_percent']}%'>
-							<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$member['member_id']}" base="public"}' id='warn_link_{$contentid}_{$member['member_id']}' title='{$this->lang->words['warn_view_history']}'>{$this->lang->words['warn_status']}</a></strong><br />
-							<if test="changewarn:|:$member['can_edit_warn']">
-								<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$member['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
-							</if>
-							&lt;&nbsp;{$this->settings['warn_min']} ( {$member['warn_level']} ) {$this->settings['warn_max']}&nbsp;&gt;
-							<if test="changewarn:|:$member['can_edit_warn']">
-								<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$member['member_id']}&amp;t={$this->request['t']}&amp;st={$this->request['st']}" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a>
-							</if>
-						</p>
+				<div class='warn_panel clear ipsType_small'>
+					<strong><a href='{parse url="app=core&amp;module=modcp&amp;section=editmember&amp;do=view&amp;mid={$member['member_id']}&amp;_tab=warnlogs" base="public"}' id='warn_link_xxx_{$member['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
+					<if test="highwarn:|:$member['warn_percent'] >= 80">
+						<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$member['warn_percent']}%'>
 					<else />
-						<if test="canwarn:|:$member['can_edit_warn']">
-							<a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=add&amp;mid={$member['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_increase']}'><img src='{$this->settings['img_url']}/warn_add.gif' alt='{$this->lang->words['add']}' class='warn_edit up' /></a><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;type=minus&amp;mid={$member['member_id']}&amp;t=0&amp;st=0" base="public"}' title='{$this->lang->words['warn_decrease']}'><img src='{$this->settings['img_url']}/warn_minus.gif' alt='{$this->lang->words['minus']}' class='warn_edit down'  /></a>
-						</if>
-							<!-- SKINNOTE: Has link to open AJAX popup warn logs  -->
-							<strong><a href='{parse url="app=members&amp;module=warn&amp;section=warn&amp;do=view&amp;mid={$member['member_id']}" base="public"}' id='warn_link_xxx_{$member['member_id']}' title='{$this->lang->words['warn_view_history']}' class='warn_link'>{$this->lang->words['warn_status']}</a></strong>
-						<if test="highwarn:|:$member['warn_percent'] >= 80">
-							<p class='progress_bar user_warn limit' title='{$this->lang->words['warn_level']} {$member['warn_percent']}%'>
-						<else />
-							<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$member['warn_percent']}%'>
-						</if>
-								<span style='width: {$member['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$member['warn_percent']}%</span></span>
-							</p>
+						<p class='progress_bar user_warn' title='{$this->lang->words['warn_level']} {$member['warn_percent']}%'>
 					</if>
+							<span style='width: {$member['warn_percent']}%'><span>{$this->lang->words['warn_level']} {$member['warn_percent']}%</span></span>
+						</p>
 				</div>
 			</if>
-			<ul>
-				<if test="authorspammer:|:$member['spamStatus'] !== NULL && $member['member_id'] != $this->memberData['member_id']">
-					<if test="authorspammerinner:|:$member['spamStatus'] === TRUE">
-						<li><a href='#' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, false)">{parse replacement="spammer_on"} {$this->lang->words['spm_on']}</a></li>
-					<else />
-						<li><a href='{$this->settings['base_url']}&amp;app=forums&amp;module=moderate&amp;section=moderate&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"} {$this->lang->words['spm_off']}</a></li>
-					</if>
-				</if>
-				<if test="noFriendYourself:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-					<li id='friend_toggle'>
-						<if test="isFriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
-							<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'><img src='{$this->settings['img_url']}/user_delete.png' alt='{$this->lang->words['remove_friend']}' /> {$this->lang->words['remove_as_friend']}</a>
-						<else />
-							<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'><img src='{$this->settings['img_url']}/user_add.png' alt='{$this->lang->words['add_friend']}' /> {$this->lang->words['add_me_friend']}</a>
-						</if>
-					</li>
-				</if>
-				<if test="pmlink:|:($member['member_id'] != $this->memberData['member_id']) AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) AND $member['members_disable_pm'] == 0">
-					<li class='pm_button' id='pm_xxx_{$member['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}'>{parse replacement="send_msg"} {$this->lang->words['send_message']}</a></li>
-				</if>
-				<if test="ignoreuser:|:$member['member_id'] != $this->memberData['member_id']">
-					<!--<li id='ignore_toggle'>
-						<if test="isignored:|:IPSMember::checkIgnoredStatus( $member['member_id'] )">
-							<a href='#' title='{$this->lang->words['unignore']}'>{parse replacement="ignore_user"} {$this->lang->words['unignore']}</a>
-						<else />
-							<a href='#' title='{$this->lang->words['ignore']}'>{parse replacement="ignore_user"} {$this->lang->words['ignore']}</a>
-						</if>
-					</li>-->
-				</if>
-				<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}'>{parse replacement="find_topics_link"} {$this->lang->words['gbl_find_my_content']}</a></li>
-								<if test="dnameHistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
-					<li id='dname_history'><a href='{parse url="app=members&amp;module=profile&amp;section=dname&amp;id={$member['member_id']}" base="public"}' title='{$this->lang->words['view_dname_history']}'>{parse replacement="display_name"} {$this->lang->words['display_name_history']}</a></li>
-				</if>
-				<if test="supModCustomization:|:($member['member_id'] == $this->memberData['member_id'] OR $this->memberData['g_is_supmod'] ) AND $member['customization']['type']">
-					<li class='moderated'><a href='{parse url="showuser={$member['member_id']}&amp;secure_key={$this->member->form_hash}&amp;removeCustomization=1" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}'>{parse replacement="deny"} {$this->lang->words['cust_remove']}</a></li>
-				</if>
-				<if test="supModCustomizationDisable:|:($member['member_id'] != $this->memberData['member_id'] AND $this->memberData['g_is_supmod'] ) AND $member['customization']['type']">
-					<li class='moderated'><a href='{parse url="showuser={$member['member_id']}&amp;secure_key={$this->member->form_hash}&amp;removeCustomization=1&amp;disableCustomization=1" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}'>{parse replacement="deny"} {$this->lang->words['cust_disable']}</a></li>
-				</if>
+			<ul class='clear'>
+				<li id='tab_link_core:info' class='tab_toggle <if test="$default_tab == 'core:info'">active</if>' data-tabid='user_info'><a href='#'>{$this->lang->words['pp_tab_info']}</a></li>
+				<foreach loop="tabs:$tabs as $tab">
+					<li id='tab_link_{$tab['app']}:{$tab['plugin_key']}' class='<if test="tabactive:|:$tab['app'].':'.$tab['plugin_key'] == $default_tab || $this->request['tab'] == $tab['plugin_key']">active</if> tab_toggle' data-tabid='{$tab['plugin_key']}'><a href='{parse url="showuser={$member['member_id']}&amp;tab={$tab['plugin_key']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view']} {$tab['_lang']}'>{$tab['_lang']}</a></li>
+				</foreach>
 			</ul>
 		</div>
-		<if test="ourReputation:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
-			<if test="RepPositive:|:$member['pp_reputation_points'] > 0">
-				<div class='reputation positive'>
-			</if>
-			<if test="RepNegative:|:$member['pp_reputation_points'] < 0">
-				<div class='reputation negative'>
-			</if>
-			<if test="RepZero:|:$member['pp_reputation_points'] == 0">
-				<div class='reputation zero'>
-			</if>
-					<span class='number'>{$this->lang->words['m_reputation']} {$member['pp_reputation_points']}</span>
-					<if test="RepText:|:$member['author_reputation'] && $member['author_reputation']['text']">
-						<span class='title'>{$member['author_reputation']['text']}</span>
-					</if>
-					<if test="RepImage:|:$member['author_reputation'] && $member['author_reputation']['image']">
-						<span class='image'><img src='{$member['author_reputation']['image']}' alt='{$this->lang->words['m_reputation']}' /></span>
-					</if>
-				</div>
-		</if>
-		<div class='info'>
-			<dl>
-				<dt>{$this->lang->words['m_group']}</dt>
-				<dd>{$member['g_title']}</dd>
-				<dt>{$this->lang->words['m_posts']}</dt>
-				<dd title='{$member['_total_pct']}% {$this->lang->words['total_percent']}'>{parse format_number="$member['posts']"} ({$member['_posts_day']} {$this->lang->words['posts_per_day']})</dd>
-				<if test="favoriteForum:|:!$this->settings['disable_profile_stats'] AND $member['favorite_id']">
-					<dt>{$this->lang->words['m_active_in']}</dt>
-					<dd title='{$member['_fav_percent']}% {$this->lang->words['fav_percent']}'>
-						<a href='{parse url="showforum={$member['favorite_id']}" seotitle="{$this->registry->class_forums->forum_by_id[ $member['favorite_id'] ]['name_seo']}" template="showforum" base="public"}'>{$this->registry->class_forums->forum_by_id[ $member['favorite_id'] ]['name']}</a> ({$member['_fav_posts']} {$this->lang->words['fav_posts']})
-					</dd>
-				</if>
-				<dt>{$this->lang->words['m_member_since']}</dt>
-				<dd>{parse date="$member['joined']" format="joined"}</dd>
-				<dt>{$this->lang->words['m_profile_views']}</dt>
-				<dd>{parse format_number="$member['members_profile_views']"}</dd>
-				<dt>{$this->lang->words['m_last_active']}</dt>
-				<dd><if test="memberOnline:|:$member['_online']">{parse replacement="user_online"}<else />{parse replacement="user_offline"}</if> {$member['_last_active']}</dd>
-				<dt>{$this->lang->words['m_currently']}</dt>
-				<dd><if test="onlineDetails:|:$member['_online']">
-						{$member['online_extra']}
-					<else />
-						{$this->lang->words['online_offline']}
-					</if>
-				</dd>
-			</dl>
-		</div>
-		
-		<div class='other_contact clearfix clear'>
-			<div class='about_info'>
-				<h3 class='bar'>{$this->lang->words['my_info']}</h3>
-				<dl>
-					<if test="member_title:|:$member['title'] != ''">
-						<dt>{$this->lang->words['m_member_title']}</dt>
-						<dd>{$member['title']}</dd>
-					</if>
-					<dt>{$this->lang->words['m_age_prefix']}</dt>
-					<if test="member_age:|:$member['_age'] > 0">
-						<dd>{$member['_age']} {$this->lang->words['m_years_old']}</dd>
-					<else />
-						<dd>{$this->lang->words['m_age_unknown']}</dd>
-					</if>
-					<dt>{$this->lang->words['m_birthday_prefix']}</dt>
-					<if test="member_birthday:|:$member['bday_day']">
-						<!-- SKINNOTE: We should use the localized date formatting for this -->
-						<dd>{$member['_bday_month']} {$member['bday_day']}<if test="member_bday_year:|:$member['bday_year']">, {$member['bday_year']}</if></dd>
-					<else />
-						<dd>{$this->lang->words['m_bday_unknown']}</dd>
-					</if>
-					<if test="pcfields:|:$member['custom_fields']['profile_info'] != """>
-						<foreach loop="pcfieldsLoop:$member['custom_fields']['profile_info'] as $key => $value">
-							{$value}
-						</foreach>
-					</if>
-				</dl>
-			</div>
-		</div>
-		<div class='other_contact clearfix'>
-				<h3 class='bar'>{$this->lang->words['contact_info']}</h3>
-				<dl>
-					
-					<dt>{$this->lang->words['m_email']}</dt>
-					<dd class='clearfix'>
-						<if test="isadmin:|:$this->memberData['g_access_cp'] == 1">
-							<a href='mailto:{$member['email']}'>{$member['email']}</a>
-						<else />	
-							<if test="member_email:|:!$member['hide_email']">
-								<a href='{parse url="app=members&amp;module=messaging&amp;section=contact&amp;do=Mail&amp;MID={$member['member_id']}" base="public"}'>{$this->lang->words['click_to_email']}</a>
-							<else />
-								<em>{$this->lang->words['private']}</em>
-							</if>
-						</if>						
-					</dd>	
-					<if test="member_contact_fields:|:is_array( $member['custom_fields']['contact'])">
-						<foreach loop="cfields:$member['custom_fields']['contact'] as $field">
-							{$field}
-						</foreach>
-					</if>
-				</dl>
-		</div>
-		
-		<if test="pcfieldsOther:|:$member['custom_fields']">
-			<foreach loop="pcfieldsOtherLoop:$member['custom_fields'] as $group => $mdata">
-				<if test="pcfieldsOtherLoopCheck:|:$group != 'profile_info' AND $group != 'contact'">
-					<if test="pcfieldsOtherLoopCheck2:|:is_array( $member['custom_fields'][ $group ] ) AND count( $member['custom_fields'][ $group ] )">
-						<div class='other_contact clearfix'>
-							<div class='clearfix' id='custom_fields_{$group}'>
-								<h3 class='bar'>{$member['custom_field_groups'][ $group ]}</h3>
-								<dl>
-									<foreach loop="pcfieldsOtherLoopCheckInner:$member['custom_fields'][ $group ] as $key => $value">
-										{$value}
-									</foreach>
-								</dl>
+		<div class='ipsVerticalTabbed_content ipsLayout_content ipsBox_container' id='profile_content'>
+			<div class='ipsPad'>
+				<div id='profile_content_main'>
+					<div id='user_info_cell'>
+						<h1 class='ipsType_pagetitle'>
+							<span class='fn nickname'>{$member['members_display_name']}</span>
+						</h1>
+						{$this->lang->words['m_member_since']} {parse date="$member['joined']" format="DATE"}<br />
+						<if test="onlineDetails:|:$member['_online'] && ($member['online_extra'] != $this->lang->words['not_online'])">
+							<span class='ipsBadge ipsBadge_green reset_cursor' data-tooltip="{parse expression="strip_tags($member['online_extra'])"}">{$this->lang->words['online_online']}</span>
+						<else />
+							<span class='ipsBadge ipsBadge_lightgrey reset_cursor'>{$this->lang->words['online_offline']}</span>
+						</if>
+						<span class='desc lighter'>{$this->lang->words['m_last_active']} {$member['_last_active']}</span> 
+					</div>
+					<if test="userStatus:|:$status['status_id']">
+					<div id='user_status_cell'>
+						<div id='user_latest_status'>
+							<div>
+								{parse expression="IPSText::truncate( strip_tags( $status['status_content'] ), 180 )"}
+								<span class='ipsType_smaller desc lighter blend_links'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$status['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{$this->lang->words['ps_updated']} {parse date="$status['status_date']" format="manual{%d %b}" relative="true"} &middot; {parse expression="intval($status['status_replies'])"} {$this->lang->words['ps_comments']}</a></span>
 							</div>
 						</div>
+					</div>
 					</if>
-				</if>
-			</foreach>
-		</if>
-		
-		<if test="latest_visitors:|:$member['pp_setting_count_visitors']">
-			<div class='general_box alt' id='latest_visitors'>
-				<h3 class='bar'>{$this->lang->words['latest_visitors']}</h3>
-				<if test="has_visitors:|:is_array( $visitors ) && count( $visitors )">
-					{parse striping="visitors" classes="row1,row2"}
-					<ul>
-						<foreach loop="latest_visitors_loop:$visitors as $friend">
-						<li class='{parse striping="visitors"}'>
-							<if test="visitorismember:|:$friend['member_id']"><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ></if><img src='{$friend['pp_mini_photo']}' width='{$friend['pp_mini_width']}' height='{$friend['pp_mini_height']}' alt='{$this->lang->words['photo']}' class='photo' /><if test="visitorismember2:|:$friend['member_id']"></a></if>
-							<span class='name'><if test="visitorismember3:|:$friend['member_id']"><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'></if>{$friend['members_display_name_short']}<if test="visitorismember4:|:$friend['member_id']"></a></if></span><if test="visitorismember5:|:$friend['member_id']">{parse template="user_popup" group="global" params="$friend['member_id'], $friend['members_seo_name']"}</if><br />
-							<span class='desc'>{$friend['_visited_date']}</span>
-						</li>				
-						</foreach>
-					</ul>
-				<else />
-					<p class='no_messages'>{$this->lang->words['no_latest_visitors']}</p>
-				</if>
-			</div>
-		</if>
-	</div>
-	</div>
-	<div id='main_profile_body' class='right'>
-		<div class='recent_activity'>
-			<ol class='tab_bar no_title mini'>
-				<foreach loop="tabs:$tabs as $tab">
-					<li id='tab_link_{$tab['app']}:{$tab['plugin_key']}' class='tab_toggle <if test="tabactive:|:$tab['app'].':'.$tab['plugin_key'] == $default_tab">active</if>'><a href='{parse url="showuser={$member['member_id']}&amp;tab={$tab['plugin_key']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view']} {$tab['_lang']}'>{$tab['_lang']}</a></li>
-				</foreach>
-			</ol>
-			<div id='tab_content' class='row1 profile_pane'>
-				<div id='tab_{$default_tab}'>
-					{$default_tab_content}
-				</div>
-			</div>
-		</div>
-		<script type='text/javascript'>
-			ipb.profile.activeTab = '$default_tab';
-		</script>
-		
-	<if test="friends:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends'] AND $member['pp_setting_count_friends']">
-		<div class='friend_list clear' id='friend_list'>
-			<h3 class='bar'>{$this->lang->words['m_title_friends']}</h3>
-			<if test="friends_loop:|:is_array($friends) and count($friends)">
-				<ul class='clearfix'>
-				<foreach loop="friends:$friends as $friend">
-					<li>
-						<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' ><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt='{$this->lang->words['photo']}' class='photo' /></a><br />
-						<span class='name'><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$friend['members_display_name_short']}</a> {parse template="user_popup" group="global" params="$friend['member_id'], $friend['members_seo_name']"}</span>
-					</li>
-				</foreach>
-				</ul>
-				<if test="total_friends:|:$member['_total_approved_friends'] > $member['_total_displayed_friends']">
-				<p class='clear'>
-					<em>{parse expression="sprintf( $this->lang->words['showing_50_rand_friends'], $member['_showing_friend_count'] )"} {$member['_total_approved_friends']}</em>
-					<if test="showfriends_link:|:$member['_total_approved_friends'] > 50">
-						&nbsp;(<strong><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=view&amp;member_id={$member['member_id']}" base="public"}' id='view-all-friends'>{$this->lang->words['friends_view_all']}</a></strong>)
-					</if>
-				</p>
-				</if>
-				
-			<else />
-				<p>
-					<em>{$member['members_display_name']} {$this->lang->words['no_friends_yet']}</em>
-				</p>
-			</if>
-		</div>
-	</if>
-	
-		<if test="comments:|:$member['pp_setting_count_comments'] > 0">
-			<div class='comments' id='comment_wrap'>
-				<h3 class='bar'>{$this->lang->words['m_title_comments']}</h3>
-				<if test="leave_comment:|:$this->memberData['member_id']">
-					<form id='commentForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=comments&amp;do=add_new_comment' method='post'>
-						<fieldset>
-							<input type='hidden' name='member_id' value='{$member['member_id']}' />
-							<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
-							<div id='post_comment' class='clear row2'>
-								<img src='{$this->memberData['pp_mini_photo']}' width='{$this->memberData['pp_mini_width']}' height='{$this->memberData['pp_mini_height']}' alt='{$this->lang->words['your_photo']}' class='photo left clear' />
-								<textarea class='input_textarea' cols='50' rows='3' id='comment_text' name='comment_text'></textarea>
-								<br />
-								<input type='submit' class='clear input_submit' value='{$this->lang->words['comment_submit_post']}' id='comment_submit' />
-								<span class='desc' id='char_remain_wrap' style='display: none'>{$this->lang->words['chars_remaining']} <span id='char_remain'>400</span></span>
+					<if test="allowRate:|:$this->settings['pp_allow_member_rate']">
+						<span class='rating left clear' style='margin-bottom: 10px'>
+							<if test="noRateYourself:|:$this->memberData['member_id'] == $member['member_id'] || !$this->memberData['member_id']">
+									<if test="rate1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="rate5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><span id='rating_text' class='desc'></span>
+							<else />
+									<a href='#' id='user_rate_1' title='{$this->lang->words['m_rate_1']}'><if test="rated1:|:$member['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_2' title='{$this->lang->words['m_rate_2']}'><if test="rated2:|:$member['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_3' title='{$this->lang->words['m_rate_3']}'><if test="rated3:|:$member['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_4' title='{$this->lang->words['m_rate_4']}'><if test="rated4:|:$member['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a><a href='#' id='user_rate_5' title='{$this->lang->words['m_rate_5']}'><if test="rated5:|:$member['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if></a> <span id='rating_text' class='desc'></span>
 								<script type='text/javascript'>
-									$('char_remain_wrap').show();
-									ipb.vars['max_comment_length'] = 400;
+									rating = new ipb.rating( 'user_rate_', { 
+														url: '{parse url="app=members&module=ajax&section=rate&member_id={$member['member_id']}" base="public"}&md5check=' + ipb.vars['secure_hash'],
+														cur_rating: <if test="hasrating:|:isset($member['pp_rating_real'])">{$member['pp_rating_real']}<else />0</if>,
+														rated: null,
+														allow_rate: ( {$this->memberData['member_id']} != 0 ) ? 1 : 0,
+														show_rate_text: false
+													  } );
 								</script>
-							</div> 
-						</fieldset>
-					</form>
-					<br />
-				</if>
-				<if test="comments_html:|:$comments">
-					$comments
-				<else />
-					<p>
-						<em>{$member['members_display_name']} {$this->lang->words['no_profile_comments']}</em>
-					</p>
-				</if>
-			</div>
-		</if>
-	</div>
+							</if>
+						</span>
+					</if>
+					<ul class='ipsList_inline' id='user_utility_links'>
+						<if test="noFriendYourself:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+							<li id='friend_toggle' class='ipsButton_secondary'>
+								<if test="isFriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
+									<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'><img src='{$this->settings['img_url']}/user_delete.png' alt='{$this->lang->words['remove_friend']}' />&nbsp;&nbsp; {$this->lang->words['remove_as_friend']}</a>
+								<else />
+									<a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'><img src='{$this->settings['img_url']}/user_add.png' alt='{$this->lang->words['add_friend']}' />&nbsp;&nbsp; {$this->lang->words['add_me_friend']}</a>
+								</if>
+							</li>
+						</if>
+						<if test="pmlink:|:($member['member_id'] != $this->memberData['member_id']) AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) AND $member['members_disable_pm'] == 0">
+							<li class='pm_button' id='pm_xxx_{$member['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}' class='ipsButton_secondary'>{parse replacement="send_msg"}&nbsp;&nbsp; {$this->lang->words['send_message']}</a></li>
+						</if>
+						<li>
+							<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' class='ipsButton_secondary'>{parse replacement="find_topics_link"}&nbsp;&nbsp;  {$this->lang->words['gbl_find_my_content']}</a>
+						</li>
+					</ul>
+				</div>
+				<div id='profile_panes_wrap' class='clearfix'>
+					
+					<div id='pane_core:info' class='ipsLayout ipsLayout_withright ipsLayout_largeright clearfix' <if test="$default_tab != 'core:info'">style='display: none'</if>>						
+						<div class='ipsLayout_content'>
+							<if test="$member['pp_about_me']">
+								<div class='general_box clearfix'>
+									<h3>{$this->lang->words['pp_tab_aboutme']}</h3>
+									<div class='ipsPad'>
+										
+											{$member['pp_about_me']}
+										
+									</div>
+								</div>
+								<hr/>
+							</if>
+							<div class='general_box clearfix'>
+								<h3>{$this->lang->words['community_stats']}</h3>
+								<br />								
+								<ul class='ipsList_data clearfix'>									
+									<li class='clear clearfix'>
+										<span class='row_title'>{$this->lang->words['m_group']}</span>
+										<span class='row_data'>{$member['g_title']}</span>
+									</li>
+									<li class='clear clearfix'>
+										<span class='row_title'>{$this->lang->words['m_posts']}</span>
+										<span class='row_data'>{parse format_number="$member['posts']"} ({$member['_posts_day']} {$this->lang->words['posts_per_day']})</span>
+									</li>
+									<if test="favoriteForum:|:!$this->settings['disable_profile_stats'] AND $member['favorite_id']">
+										<li class='clear clearfix'>
+											<span class='row_title'>{$this->lang->words['m_active_in']}</span>
+											<span class='row_data'>
+												<a href='{parse url="showforum={$member['favorite_id']}" seotitle="{$this->registry->class_forums->forum_by_id[ $member['favorite_id'] ]['name_seo']}" template="showforum" base="public"}'>{$this->registry->class_forums->forum_by_id[ $member['favorite_id'] ]['name']}</a> ({$member['_fav_posts']} {$this->lang->words['fav_posts']})
+											</span>
+										</li>
+									</if>
+									<li class='clear clearfix'>
+										<span class='row_title'>{$this->lang->words['m_profile_views']}</span>
+										<span class='row_data'>{parse format_number="$member['members_profile_views']"}</span>
+									</li>
+									<if test="member_title:|:$member['title'] != ''">
+										<li class='clear clearfix'>
+											<span class='row_title'>{$this->lang->words['m_member_title']}</span>
+											<span class='row_data'>{$member['title']}</span>
+										</li>
+									</if>
+									<li class='clear clearfix'>
+										<span class='row_title'>{$this->lang->words['m_age_prefix']}</span>
+										<if test="member_age:|:$member['_age'] > 0">
+											<span class='row_data'>{$member['_age']} {$this->lang->words['m_years_old']}</span>
+										<else />
+											<span class='row_data desc lighter'>{$this->lang->words['m_age_unknown']}</span>
+										</if>
+									</li>
+									<li class='clear clearfix'>
+										<span class='row_title'>{$this->lang->words['m_birthday_prefix']}</span>
+										<if test="member_birthday:|:$member['bday_day']">
+											<span class='row_data'>{$member['_bday_month']} {$member['bday_day']}<if test="member_bday_year:|:$member['bday_year']">, {$member['bday_year']}</if></span>
+										<else />
+											<span class='row_data desc lighter'>{$this->lang->words['m_bday_unknown']}</span>
+										</if>
+									</li>
+									<if test="pcfields:|:$member['custom_fields']['profile_info'] != """>
+										<foreach loop="pcfieldsLoop:$member['custom_fields']['profile_info'] as $key => $value">
+											<li class='clear clearfix'>
+												{$value}
+											</li>
+										</foreach>
+									</if>
+								</ul>
+								<br />
+							</div>
+							
+							<if test="pcfieldsOther:|:$member['custom_fields']">
+								<foreach loop="pcfieldsOtherLoop:$member['custom_fields'] as $group => $mdata">
+									<if test="pcfieldsOtherLoopCheck:|:$group != 'profile_info' AND $group != 'contact'">
+										<if test="pcfieldsOtherLoopCheck2:|:is_array( $member['custom_fields'][ $group ] ) AND count( $member['custom_fields'][ $group ] )">
+											<div class='general_box clearfix' id='custom_fields_{$group}'>
+												<h3 class='bar'>{$member['custom_field_groups'][ $group ]}</h3>
+												<br />
+												<ul class='ipsList_data clearfix'>
+													<foreach loop="pcfieldsOtherLoopCheckInner:$member['custom_fields'][ $group ] as $key => $value">
+														<li class='clear clearfix'>
+															{$value}
+														</li>
+													</foreach>
+												</ul>
+												<br />
+											</div>
+										</if>
+									</if>
+								</foreach>
+							</if>
+							
+							<if test="hasContactFields:|:$this->memberData['g_access_cp'] == 1 || is_array( $member['custom_fields']['contact'])">
+								<div class='general_box clearfix'>
+									<h3>{$this->lang->words['contact_info']}</h3>
+									<br />
+								
+									<ul class='ipsList_data clearfix'>
+										<if test="isadmin:|:$this->memberData['g_access_cp'] == 1">
+											<li class='clear clearfix'>
+												<span class='row_title'>{$this->lang->words['m_email']}</span>
+												<span class='row_data'>
+													<a href='mailto:{$member['email']}'>{$member['email']}</a>
+												</span>
+											</li>
+										</if>
+										<if test="member_contact_fields:|:is_array( $member['custom_fields']['contact'])">
+											<foreach loop="cfields:$member['custom_fields']['contact'] as $field">
+												<li class='clear clearfix'>
+													{$field}
+												</li>
+											</foreach>
+										</if>
+									</ul>
+								</div>
+							</if>
+						</div>
+						
+						<div class='ipsLayout_right'>
+							<if test="ourReputation:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
+								<if test="RepPositive:|:$member['pp_reputation_points'] > 0">
+									<div class='reputation positive' data-tooltip="{parse expression="sprintf( $this->lang->words['rep_description'], $member['members_display_name'], $member['pp_reputation_points'])"}">
+								</if>
+								<if test="RepNegative:|:$member['pp_reputation_points'] < 0">
+									<div class='reputation negative' data-tooltip="{parse expression="sprintf( $this->lang->words['rep_description'], $member['members_display_name'], $member['pp_reputation_points'])"}">
+								</if>
+								<if test="RepZero:|:$member['pp_reputation_points'] == 0">
+									<div class='reputation zero' data-tooltip="{parse expression="sprintf( $this->lang->words['rep_description'], $member['members_display_name'], $member['pp_reputation_points'])"}">
+								</if>
+										<span class='number'>{$member['pp_reputation_points']}</span>
+										<if test="RepText:|:$member['author_reputation'] && $member['author_reputation']['text']">
+											<span class='title'>{$member['author_reputation']['text']}</span>
+										</if>
+										<if test="RepImage:|:$member['author_reputation'] && $member['author_reputation']['image']">
+											<span class='image'><img src='{$member['author_reputation']['image']}' alt='{$this->lang->words['m_reputation']}' /></span>
+										</if>
+									</div>
+								
+								<br />
+							</if>
+							
+							<if test="checkModTools:|:($member['spamStatus'] !== NULL && $member['member_id'] != $this->memberData['member_id']) || ($this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']) || (($member['member_id'] != $this->memberData['member_id'] AND $this->memberData['g_is_supmod'] ) AND $member['customization']['type'])">
+								<div class='general_box clearfix'>
+									<h3>{$this->lang->words['user_tools']}</h3>
+									<ul class='ipsPad'>	
+										<if test="authorspammer:|:$member['spamStatus'] !== NULL && $member['member_id'] != $this->memberData['member_id']">
+											<if test="authorspammerinner:|:$member['spamStatus'] === TRUE">
+												<li><a href='#' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, false)">{parse replacement="spammer_on"} {$this->lang->words['spm_on']}</a></li>
+											<else />
+												<li><a href='{$this->settings['base_url']}app=core&amp;module=modcp&amp;section=editmember&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"} {$this->lang->words['spm_off']}</a></li>
+											</if>
+										</if>
+										<if test="dnameHistory:|:$this->memberData['g_mem_info'] && $this->settings['auth_allow_dnames']">
+											<li id='dname_history'><a href='{parse url="app=members&amp;module=profile&amp;section=dname&amp;id={$member['member_id']}" base="public"}' title='{$this->lang->words['view_dname_history']}'>{parse replacement="display_name"} {$this->lang->words['display_name_history']}</a></li>
+										</if>
+								
+										<if test="supModCustomizationDisable:|:($member['member_id'] != $this->memberData['member_id'] AND $this->memberData['g_is_supmod'] ) AND $member['customization']['type']">
+											<li><strong><a href='{parse url="showuser={$member['member_id']}&amp;secure_key={$this->member->form_hash}&amp;removeCustomization=1" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}'><img src='{$this->settings['img_url']}/delete.png' alt='-' /> {$this->lang->words['cust_remove']}</a></strong></li>
+											<li><strong><a href='{parse url="showuser={$member['member_id']}&amp;secure_key={$this->member->form_hash}&amp;removeCustomization=1&amp;disableCustomization=1" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}'><img src='{$this->settings['img_url']}/delete.png' alt='-' /> {$this->lang->words['cust_disable']}</a></strong></li>
+										</if>
+									</ul>
+								</div>
+							</if>
+							
+							<if test="$member['pp_setting_count_friends']">
+								<div class='general_box clearfix' id='friends_overview'>
+									<h3>{$this->lang->words['m_title_friends']}</h3>
+									<div class='ipsPad'>
+										<if test="hasFriends:|:count($friends) AND is_array($friends)">
+											<foreach loop="friendsLoop:$friends as $friend">
+												<a href='{parse url="showuser={$friend['member_id']}" base="public" template="showuser" seotitle="{$friend['members_seo_name']}"}' class='ipsUserPhotoLink'>
+													<img src='{$friend['pp_mini_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' data-tooltip='{$friend['members_display_name']}' />
+												</a>
+											</foreach>
+										<else />
+											<p class='desc'>
+												{$member['members_display_name']} {$this->lang->words['no_friends_yet']}
+											</p>
+										</if>
+									</div>
+								</div>
+							</if>
+							<br /><br />
+							
+							<if test="latest_visitors:|:$member['pp_setting_count_visitors']">
+								<div class='general_box clearfix'>
+									<h3>{$this->lang->words['latest_visitors']}</h3>
+									<if test="has_visitors:|:is_array( $visitors ) && count( $visitors )">
+										<ul class='ipsList_withminiphoto ipsPad'>
+											<foreach loop="latest_visitors_loop:$visitors as $friend">
+											<li class='clearfix'>
+												<if test="visitorismember:|:$friend['member_id']">
+													<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$friend['pp_mini_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini' /></a>
+												<else />
+													<img src='{$friend['pp_mini_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_mini left' />
+												</if>
+												<div class='list_content'>
+													<if test="visitorismember3:|:$friend['member_id']"><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'></if>{$friend['members_display_name_short']}<if test="visitorismember4:|:$friend['member_id']"></a></if>
+													<br />
+													<span class='desc lighter'>{$friend['_visited_date']}</span>
+												</div>
+											</li>				
+											</foreach>
+										</ul>
+									<else />
+										<p class='ipsPad desc'>{$this->lang->words['no_latest_visitors']}</p>
+									</if>
+								</div>
+							</if>
+						</div>					
+					</div>
+					
+					<if test="$default_tab != 'core:info'">
+					<div id='pane_{$default_tab}'>
+						{$default_tab_content}
+					</div>
+					</if>
+				</div>				
+				
+			</div>			
+		</div>
+		
 	</div>
 </div>
+<if test="thisIsNotUs:|:($this->memberData['member_id'] && $member['member_id'] != $this->memberData['member_id'])">
+	<br />
+	<ul class='topic_buttons'>
+		<li class='non_button clearfix'><a href='{parse url="app=core&amp;module=reports&amp;section=reports&amp;rcom=profiles&amp;member_id={$member['member_id']}" base="public"}'>{$this->lang->words['report_member']}</a></li>
+	</ul>
+</if>
+<script type='text/javascript'>
+	$("profile_content").setStyle( { minHeight: $('profile_tabs').measure('margin-box-height') + 138 + "px" } );
+</script>
+
+<!-- ******************************************************************************************* -->
 {parse template="include_highlighter" group="global" params=""}]]></template_content>
       <template_name>profileModern</template_name>
-      <template_data><![CDATA[$tabs=array(), $member=array(), $comments="", $friends=array(), $visitors=array(), $default_tab='status', $default_tab_content='']]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data><![CDATA[$tabs=array(), $member=array(), $visitors=array(), $default_tab='status', $default_tab_content='', $friends=array(), $status=array()]]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2168,65 +2271,11 @@ body {
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<div class='vcard userpopup'>
 	<h3><a href="{parse url="showuser={$member['member_id']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}" class="fn nickname url">{$member['members_display_name']}</a></h3>
-	<div>
-		<if test="cardStatus:|:$member['_status']['status_content']">
-			<p class='message user_status'>{parse replacement="user_status"}&nbsp; <strong>{$member['members_display_name']}</strong> {$member['_status']['status_content']}</p>
-		</if>
-		<div class='info'>
-			<img class='photo' src="{$member['pp_thumb_photo']}" alt="{$this->lang->words['get_photo']}" width='{$member['pp_thumb_width']}' height='{$member['pp_thumb_height']}' alt='photo' />
-			<dl>
-				<dt>{$this->lang->words['m_group']}</dt>
-				<dd>{$member['g_title']}</dd>
-				<dt>{$this->lang->words['m_posts']}</dt>
-				<dd title='{$member['_posts_day']} {$this->lang->words['posts_per_day']}'>{parse format_number="$member['posts']"}</dd>
-				<dt>{$this->lang->words['m_member_since']}</dt>
-				<dd>{parse date="$member['joined']" format="joined"}</dd>
-				<dt>{$this->lang->words['m_last_active']}</dt>
-				<dd><if test="cardOnline:|:$member['_online']">{parse replacement="user_online"}<else />{parse replacement="user_offline"}</if> {$member['_last_active']}</dd>
-				<dt>{$this->lang->words['m_currently']}</dt>
-				<dd><if test="cardWhere:|:$member['_online']">
-						{$member['online_extra']}
-					<else />
-						{$this->lang->words['online_offline']}
-					</if>
-				</dd>
-				<if test="isadmin:|:$this->memberData['g_access_cp'] == 1">
-					<dt>{$this->lang->words['m_email']}</dt>
-					<dd><a href='mailto:{$member['email']}'>{$member['email']}</a></dd>
-				</if>
-			</dl>
-		</div>
-		
-		<ul class='user_controls clear'>
-			<if test="authorspammer:|:$member['spamStatus'] !== NULL && $member['member_id'] != $this->memberData['member_id']">
-				<if test="authorspammerinner:|:$member['spamStatus'] === TRUE">
-					<li><a href='#' title='{$this->lang->words['spm_on']}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, false)">{parse replacement="spammer_on"}</a></li>
-				<else />
-					<li><a title='{$this->lang->words['spm_off']}' href='{$this->settings['base_url']}&amp;app=forums&amp;module=moderate&amp;section=moderate&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"}</a></li>
-				</if>
-			</if>
-			<if test="cardFriend:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-				<if test="cardIsFriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
-					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
-				<else />
-					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
-				</if>
-			</if>
-			<if test="cardSendPm:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-				<li class='pm_button' id='pm_xxx_{$member['member_id']}'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}'>{parse replacement="send_msg"}</a></li>
-			</if>
-			
-			<li><a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}'>{parse replacement="find_topics_link"}</a></li>		
-			
-			<if test="cardBlog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' )">
-				<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
-			</if>
-			<if test="cardGallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
-				<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
-			</if>
-		</ul>
-		
-		
+	<div class='side left ipsPad'>
+		<a href="{parse url="showuser={$member['member_id']}" seotitle="{$member['members_seo_name']}" template="showuser" base="public"}" class="ipsUserPhotoLink">
+			<img src="{$member['pp_thumb_photo']}" alt="{$this->lang->words['get_photo']}" class='ipsUserPhoto ipsUserPhoto_large' />
+		</a>
+		<br />
 		<if test="cardRep:|:$this->settings['reputation_enabled'] && $this->settings['reputation_show_profile']">
 			<if test="cardRepPos:|:$member['pp_reputation_points'] > 0">
 				<div class='reputation positive'>
@@ -2237,14 +2286,67 @@ body {
 			<if test="cardRepZero:|:$member['pp_reputation_points'] == 0">
 				<div class='reputation zero'>
 			</if>
-					<span class='number'>{$this->lang->words['m_reputation']} {$member['pp_reputation_points']}</span>
+					<span class='number'>{$member['pp_reputation_points']}</span>
 				</div>
 		</if>
+		<a href='{parse url="app=core&amp;module=search&amp;do=user_activity&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['gbl_find_my_content']}' class='ipsButton_secondary ipsType_smaller'>{$this->lang->words['gbl_find_my_content']}</a>
+		<if test="cardSendPm:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] AND $this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' ) AND $member['members_disable_pm'] == 0">
+			<a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$member['member_id']}" base="public"}' title='{$this->lang->words['pm_this_member']}' id='pm_xxx_{$member['member_id']}' class='pm_button ipsButton_secondary ipsType_smaller'>{$this->lang->words['pm_this_member']}</a>
+		</if>
+	</div>
+	<div class='ipsPad'>
+		<if test="cardStatus:|:$member['_status']['status_content']">
+			<p class='message user_status'>{$member['_status']['status_content']}</p>
+		</if>
+		<div class='info'>			
+			<dl>
+				<dt>{$this->lang->words['m_group']}</dt>
+				<dd>{$member['_group_formatted']}</dd>
+				<dt>{$this->lang->words['m_posts']}</dt>
+				<dd title='{$member['_posts_day']} {$this->lang->words['posts_per_day']}'>{parse format_number="$member['posts']"}</dd>
+				<dt>{$this->lang->words['m_member_since']}</dt>
+				<dd>{parse date="$member['joined']" format="joined"}</dd>
+				<dt>{$this->lang->words['m_last_active']}</dt>
+				<dd><if test="cardOnline:|:$member['_online']"><span class='ipsBadge ipsBadge_green'>{$this->lang->words['online_online']}</span><else /><span class='ipsBadge ipsBadge_grey'>{$this->lang->words['online_offline']}</span></if> {$member['_last_active']}</dd>
+				<if test="cardWhere:|:$member['_online']">
+					<dt>{$this->lang->words['m_currently']}</dt>
+					<dd>
+						{$member['online_extra']}
+					</dd>
+				</if>
+				<if test="isadmin:|:$this->memberData['g_access_cp'] == 1">
+					<dt>{$this->lang->words['m_email']}</dt>
+					<dd><a href='mailto:{$member['email']}'>{$member['email']}</a></dd>
+				</if>
+			</dl>
+		</div>
+		<ul class='user_controls clear'>
+			<if test="authorspammer:|:$member['spamStatus'] !== NULL && $member['member_id'] != $this->memberData['member_id']">
+				<if test="authorspammerinner:|:$member['spamStatus'] === TRUE">
+					<li><a href='#' title='{$this->lang->words['spm_on']}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, false)">{parse replacement="spammer_on"}</a></li>
+				<else />
+					<li><a title='{$this->lang->words['spm_off']}' href='{$this->settings['base_url']}app=core&amp;module=modcp&amp;section=editmember&amp;do=setAsSpammer&amp;member_id={$member['member_id']}&amp;auth_key={$this->member->form_hash}' onclick="return ipb.global.toggleFlagSpammer({$member['member_id']}, true)">{parse replacement="spammer_off"}</a></li>
+				</if>
+			</if>
+			<if test="cardFriend:|:$this->memberData['member_id'] AND $this->memberData['member_id'] != $member['member_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+				<if test="cardIsFriend:|:IPSMember::checkFriendStatus( $member['member_id'] )">
+					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['remove_friend']}'>{parse replacement="remove_friend"}</a></li>
+				<else />
+					<li><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['add_friend']}'>{parse replacement="add_friend"}</a></li>								
+				</if>
+			</if>			
+			<if test="cardBlog:|:$member['has_blog'] AND IPSLib::appIsInstalled( 'blog' ) && $member['has_blog'] != 'recache'">
+				<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$member['member_id']}" base="public"}' title='{$this->lang->words['view_blog']}'>{parse replacement="blog_link"}</a></li>
+			</if>
+			<if test="cardGallery:|:$member['has_gallery'] AND IPSLib::appIsInstalled( 'gallery' )">
+				<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$member['member_id']}" base="public"}' title='{$this->lang->words['view_gallery']}'>{parse replacement="gallery_link"}</a></li>
+			</if>
+		</ul>
 	</div>
 </div>]]></template_content>
       <template_name>showCard</template_name>
       <template_data>$member, $download=0</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2252,92 +2354,31 @@ body {
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<if test="hasComments:|:is_array($comments) and count($comments)">
-	<div id='comment_innerwrap' class='comment_wrap clearfix'>
-		<div class='topic_controls<if test="!$this->memberData['member_id']"> no-form</if>'>
-			{$links}
+      <template_content><![CDATA[<if test="!$no_wrapper">
+	<ul class='ipsList_withtinyphoto clear'>
+</if>
+<foreach loop="innerLoop:$replies as $reply">
+	<li id='statusReply-{$reply['reply_id']}' class='ipsPad row2'>
+		<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$reply['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$reply['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_tiny' /></a>	
+		<div class="status_mini_content list_content">
+			<h5>
+				<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' style='font-weight:bold'>{$reply['members_display_name']}</a>
+			</h5>
+			{$reply['reply_content']}
+			<br />
+			<span class='desc lighter'>{$reply['reply_date_formatted']}</span>
+			<span class='desc mod_links'>
+				<if test="canDelete:|:$reply['_canDelete']"> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteReply&amp;status_id={$reply['reply_status_id']}&amp;reply_id={$reply['reply_id']}&amp;k={$this->member->form_hash}" id="statusReplyDelete-{$reply['reply_status_id']}-{$reply['reply_id']}" class="__sDR __dr{$reply['reply_status_id']}-{$reply['reply_id']}">{$this->lang->words['status_delete_link']}</a></if>
+			</span>
 		</div>
-		<ol id='comment_list' class='clear'>
-		{parse striping="comments" classes="row1,off"}
-		<foreach loop="comments:$comments as $comment">
-			<if test="commentCheckId:|:$new_id == 0 || $comment['comment_id'] == $new_id">
-				<li id='comment_id_{$comment['comment_id']}'>
-					<div class='comment clearfix {parse striping="comments"} <if test="commentApproved:|:!$comment['comment_approved']"> moderated</if>'>
-						<img src='{$comment['pp_thumb_photo']}' width='{$comment['pp_thumb_width']}' height='{$comment['pp_thumb_height']}' class='photo' alt='{$this->lang->words['photo']}' />
-						<h4>
-							<a href="{parse url="showuser={$comment['member_id']}" template="showuser" seotitle="{$comment['members_seo_name']}" base="public"}">{$comment['members_display_name']}</a>{parse template="user_popup" group="global" params="$comment['member_id'],$comment['members_seo_name']"}
-						</h4>
-						<span class='posted_date desc'>
-							{$comment['_comment_date']}
-						</span>
-						<div id='comment_{$comment['comment_id']}' class='comment_content'>
-							{$comment['comment_content']}
-						</div>
-						<if test="commentWeAreOwner:|:$this->memberData['member_id'] == $member['member_id'] OR $this->memberData['g_is_supmod']">
-							<ul class='comment_options'>
-								<li>
-									<a href='{parse url="app=members&amp;module=profile&amp;section=comments&amp;do=delete&amp;comment_id={$comment['comment_id']}&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['delete_this_comment']}' class='delete_comment'>{$this->lang->words['delete_comment_text']}</a>
-								</li>
-								<if test="commentApprovLink:|:! $comment['comment_approved']">
-									<li>
-										<a href='{parse url="app=members&amp;module=profile&amp;section=comments&amp;do=approve&amp;comment_id={$comment['comment_id']}&amp;member_id={$member['member_id']}&amp;secure_key={$this->member->form_hash}" base="public"}' title='{$this->lang->words['approve_this_comment']}'>{$this->lang->words['m_approve']}</a>
-									</li>
-								</if>									
-							</ul>
-						</if>
-					</div>
-				</li>
-			</if>
-		</foreach>
-		</ol>
-		<div class='topic_controls'>
-			{$links}
-		</div>
-	</div>
-	<if test="$new_id != 0">
-		<div class='topic_controls'>
-			{$links}
-		</div>
-	</if>
+	</li>
+</foreach>
+<if test="!$no_wrapper">
+	</ul>
 </if>]]></template_content>
-      <template_name>showComments</template_name>
-      <template_data><![CDATA[$member, $comments=array(), $new_id=0, $return_msg='', $links='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<div id="photowrap">
-	<div id="phototitle">{$member['members_display_name']}</div>
-	<div id="photoimg"><img src="{$member['pp_main_photo']}" alt="{$this->lang->words['get_photo']}" width='{$member['pp_main_width']}' height='{$member['pp_main_height']}' /></div>
-</div>]]></template_content>
-      <template_name>showPhoto</template_name>
-      <template_data>$member</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<foreach loop="innerLoop:$replies as $reply">
-	<div id='statusReply-{$reply['reply_id']}' class='status_mini_wrap row2'>
-		<div class="status_mini_photo">
-			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$reply['pp_mini_photo']}' width='{$reply['pp_mini_width']}' height='{$reply['pp_mini_height']}' alt="{$reply['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-		</div>
-		<div class="status_mini_content">
-			<a href='{parse url="showuser={$reply['member_id']}" seotitle="{$reply['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' style='font-weight:bold'>{$reply['members_display_name']}</a>{parse template="user_popup" group="global" params="$reply['member_id'],$reply['members_seo_name']"} <span class='desc'>{$reply['reply_date_formatted']}<if test="canDelete:|:$reply['_canDelete']"> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteReply&amp;status_id={$reply['reply_status_id']}&amp;reply_id={$reply['reply_id']}&amp;k={$this->member->form_hash}" id="statusReplyDelete-{$reply['reply_status_id']}-{$reply['reply_id']}" class="__sDR __dr{$reply['reply_status_id']}-{$reply['reply_id']}">{$this->lang->words['status_delete_link']}</a></if></span>
-			<h5>{$reply['reply_content']}</h5>
-		</div>
-	</div>
-</foreach>]]></template_content>
       <template_name>statusReplies</template_name>
-      <template_data>$replies=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data>$replies=array(), $no_wrapper=false</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2346,8 +2387,8 @@ body {
     <template>
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[<script type="text/javascript">
-ipb.status.maxReplies = {parse expression="intval($this->settings['su_max_replies'])"};
-ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
+//ipb.status.maxReplies = {parse expression="intval($this->settings['su_max_replies'])"};
+//ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
 </script>
 <foreach loop="outerLoop:$updates as $id => $status">
 	<if test="$this->memberData['member_id'] AND $latestOnly AND $status['member_id'] == $this->memberData['member_id']">
@@ -2355,70 +2396,61 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
 		ipb.status.myLatest = {$status['status_id']};
 	</script>
 	</if>
-	<div class='status_main_wrap' id='statusWrap-{$status['status_id']}'>
-		<div class="status_main_photo">
-			<if test="$smallSpace">
-				<a href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$status['pp_mini_photo']}' width='{$status['pp_mini_width']}' height='{$status['pp_mini_height']}' alt="{$status['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-			<else />
-				<a href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$status['pp_thumb_photo']}' width='{$status['pp_thumb_width']}' height='{$status['pp_thumb_height']}' alt="{$status['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-			</if>
-		</div>
-		<div class="status_main_content">
+	<div class='ipsBox_container ipsPad' id='statusWrap-{$status['status_id']}'>
+		<a href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'>
+			<img src='{$status['pp_small_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$status['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_medium' />
+		</a>	
+		<div class="ipsBox_withphoto status_content">
 			<div id="statusContent-{$status['status_id']}">
-				<h4><a href='{parse url="showuser={$status['member_id']}" seotitle="{$status['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'>{$status['members_display_name']}</a>{parse template="user_popup" group="global" params="$status['member_id'],$status['members_seo_name']"} {$status['status_content']}</h4>
-				<p class='desc'>
-					<img src="{$this->settings['img_url']}/<if test="isLockedImgAdmin:|:$status['_isLocked'] == 2">lock_small_orange.png"<else />lock_small_gold.gif"</if> id='statusLockImg-{$status['status_id']}'<if test="isLockedImg:|:!$status['_isLocked']"> style='display:none'</if> alt="{$this->lang->words['status__locked']}" />
+				<h4>
+					{parse template="userHoverCard" group="global" params="$status"}
+					<if test="forSomeoneElse:|:$status['status_member_id'] != $status['status_author_id']">
+						&rarr;
+						{parse template="users_photoCard" group="global" params="$status['owner']"}
+					</if>
+				</h4>
+				<div class='status_status'>
+					{$status['status_content']}
+				</div>
+				<span class='desc lighter blend_links'>
+					<img src="{$this->settings['img_url']}/icon_lock.png" id='statusLockImg-{$status['status_id']}' alt="{$this->lang->words['status__locked']}" <if test="noLocked:|:!$status['status_is_locked']">style='display: none'</if> />
 					<if test="cImg:|:! $smallSpace AND $status['_creatorImg']"><img src="{$status['_creatorImg']}" alt='' /></if>
-					{$status['status_date_formatted_short']}<if test="creatorText:|:$smallSpace AND $status['_creatorText'] AND $status['status_creator'] AND $status['status_creator'] != 'ipb'"> {$this->lang->words['su_via']} {$status['_creatorText']}</if>
-					<if test="canDelete:|:$status['_canDelete']"> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusDelete-{$status['status_id']}" class="__sD __d{$status['status_id']}">{$this->lang->words['status_delete_link']}</a></if>
-					<span id='statusUnlock-{$status['status_id']}' <if test="isLocked:|:$status['_isLocked'] AND $status['_canUnlock']">style='display:inline'<else />style='display:none'</if>> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=unlockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusUnlockLink-{$status['status_id']}" class="__sU __u{$status['status_id']}">{$this->lang->words['status_unlock_link']}</a></span>
-					<span id='statusLock-{$status['status_id']}' <if test="canLock:|:$status['_canLock'] AND ! $status['_isLocked']">style='display:inline'<else />style='display:none'</if>> &middot; <a href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=lockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusLockLink-{$status['status_id']}" class="__sL __l{$status['status_id']}">{$this->lang->words['status_lock_link']}</a></span>
-				</p>
-				<if test="$smallSpace">
-					<p class='desc' id='statusToggle-{$status['status_id']}'>
-						<if test="$status['_userCanReply']">
-							<if test="$status['status_replies']">
-								<a href="#" class="__sT __t{$status['status_id']}">{parse expression="sprintf( $this->lang->words['view_comments_and_add'], $status['status_replies'])"}</a>
-							<else />
-								<a href="#" class="__sT __t{$status['status_id']}">{$this->lang->words['add_comments_only']}</a>
-							</if>
-						<else />
-							<if test="$status['status_replies']">
-								<a href="#" class="__sT __t{$status['status_id']}">{parse expression="sprintf( $this->lang->words['view_comments_only'], $status['status_replies'])"}</a>
-							</if>
-						</if>
-					</p>
-					<p class='desc' id='statusToggleOff-{$status['status_id']}' style='display:none'>
-						<a href="#" class="__sTO __to{$status['status_id']}">{$this->lang->words['view_comments_collapse']}</a>
-					</p>
-				</if>
+					<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=single&amp;status_id={$status['status_id']}" seotitle="true" template="members_status_single" base="public"}'>{$status['status_date_formatted_short']}</a><if test="creatorText:|:$smallSpace AND $status['_creatorText'] AND $status['status_creator'] AND $status['status_creator'] != 'ipb'"> {$this->lang->words['su_via']} {$status['_creatorText']}</if>
+				</span>
+				<span class='mod_links'>
+					<if test="canDelete:|:$status['_canDelete']"> &middot; <a rel="nofollow" href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=deleteStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusDelete-{$status['status_id']}" class="__sD __d{$status['status_id']}">{$this->lang->words['status_delete_link']}</a></if>
+					<span id='statusUnlock-{$status['status_id']}' <if test="isLocked:|:$status['_isLocked'] AND $status['_canUnlock']">style='display:inline'<else />style='display:none'</if>> &middot; <a rel="nofollow"  href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=unlockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusUnlockLink-{$status['status_id']}" class="__sU __u{$status['status_id']}">{$this->lang->words['status_unlock_link']}</a></span>
+					<span id='statusLock-{$status['status_id']}' <if test="canLock:|:$status['_canLock'] AND ! $status['_isLocked']">style='display:inline'<else />style='display:none'</if>> &middot; <a rel="nofollow"  href="{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=lockStatus&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}" id="statusLockLink-{$status['status_id']}" class="__sL __l{$status['status_id']}">{$this->lang->words['status_lock_link']}</a></span>
+				</span>
 			</div>
-			<div id="statusFeedback-{$status['status_id']}" class='status_feedback' style='display:<if test="$smallSpace">none<else />inline</if>'>
+			<div id="statusFeedback-{$status['status_id']}" class='status_feedback'>
 				<if test="$status['status_replies'] AND count( $status['replies'] )">
 					<if test="hasMore:|:$status['status_replies'] > 3">
 						<div class='status_mini_wrap row2 altrow' id='statusMoreWrap-{$status['status_id']}'>
 							<img src="{$this->settings['img_url']}/comments.png" alt="" /> &nbsp;<a href="#" id="statusMore-{$status['status_id']}" class='__showAll __x{$status['status_id']}'>{parse expression="sprintf( $this->lang->words['status_show_all_x'], $status['status_replies'] )"}</a>
 						</div>
 					</if>
-					<div id='statusReplies-{$status['status_id']}'>
-						{parse template="statusReplies" group="profile" params="$status['replies']"}
-					</div>
+					<ul id='statusReplies-{$status['status_id']}' class='ipsList_withtinyphoto clear'>
+						{parse template="statusReplies" group="profile" params="$status['replies'], 1"}
+					</ul>
 				</if>
 				<div id='statusReplyBlank-{$status['status_id']}'></div>
 				<div id='statusReply-{$status['status_id']}'>
 				<if test="$status['_userCanReply']">
-					<div class='status_mini_wrap reply row2'>
-						<form id='statusReplyForm-{$status['status_id']}' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=reply&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
-							<div class="status_mini_photo">
-								<a href='{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}'><img src='{$this->memberData['pp_mini_photo']}' width='{$this->memberData['pp_mini_width']}' height='{$this->memberData['pp_mini_height']}' alt="{$this->memberData['members_display_name']}{$this->lang->words['users_photo']}" class='photo' /></a>	
-							</div>
-							<div class="status_mini_content">
-								<textarea class='status_textarea' rows='3' cols='50' name='comment-{$status['status_id']}' id='statusText-{$status['status_id']}'></textarea>
-								<div class="status_submit"><input type='submit' class='__submit input_submit' id='statusSubmit-{$status['status_id']}' value='{$this->lang->words['status__dfcomment']}' /></div>
-							</div>
-						</form>
-						<a href='#' class='__showform' id='statusReplyFormShow-{$status['status_id']}' style='display: none'>{$this->lang->words['status__addcomment']}</a>
-					</div>
+					<ul class='ipsList_withtinyphoto reply row2 ipsPad'>
+						<li>
+							<form id='statusReplyForm-{$status['status_id']}' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=reply&amp;status_id={$status['status_id']}&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
+								<a href='{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink left'><img src='{$this->memberData['pp_mini_photo']}' alt="{parse expression="sprintf($this->lang->words['users_photo'],$this->memberData['members_display_name'])"}" class='ipsUserPhoto ipsUserPhoto_tiny' /></a>
+								<div class='list_content'>
+									<div class="status_mini_content">
+										<textarea class='status_textarea input_text' rows='3' cols='50' name='comment-{$status['status_id']}' id='statusText-{$status['status_id']}'></textarea>
+										<div class="status_submit"><input type='submit' class='__submit input_submit' id='statusSubmit-{$status['status_id']}' value='{$this->lang->words['status__dfcomment']}' /></div>
+									</div>									
+								</div>
+							</form>
+							<a href='#' class='__showform' id='statusReplyFormShow-{$status['status_id']}' style='display: none'>{$this->lang->words['status__addcomment']}</a>
+						</li>
+					</ul>
 					<script type='text/javascript'>
 						if( $('statusReplyForm-{$status['status_id']}') )
 						{
@@ -2441,7 +2473,7 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
 </foreach>]]></template_content>
       <template_name>statusUpdates</template_name>
       <template_data>$updates=array(), $smallSpace=0, $latestOnly=0</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2451,62 +2483,27 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
       <template_group>skin_profile</template_group>
       <template_content><![CDATA[{parse js_module="status"}
 {parse striping="recent_status" classes="row1,row2 altrow"}
-<h2>{$this->lang->words['status_updates__overview']}</h2>
+<h1 class='ipsType_pagetitle'>{$this->lang->words['status_updates__overview']}</h1>
 <br />
-<div id='status_recent_actions' class='right general_box clearfix'>
-	<h3><img src='{$this->settings['img_url']}/user_comment.png' alt='' /> {$this->lang->words['status__recent_actions']}</h3>
-	<if test="count( $actions )">
-		<ul class='hfeed block_list'>
-		<foreach loop="actions:$actions as $id => $row">
-			<li class='hentry {parse striping="recent_status"}'>
-				<div class='status_action_left'><img src="{$row['pp_mini_photo']}" width="{$row['pp_mini_width']}" height="{$row['pp_mini_height']}" alt="" /></div>
-				<div class='status_action_right'>
-					<if test="$row['action_key'] == 'new'">
-					{parse expression="sprintf(
-						$this->lang->words['status__newstring'],
-						"{parse url="showuser={$row['member_id']}" seotitle="{$row['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['member_id'],$row['members_seo_name']"}",
-						"{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all&amp;status_id={$row['action_status_id']}" seotitle="true" template="members_status_all" base="public"}"
-					)"}
-					<else />
-					{parse expression="sprintf(
-						$this->lang->words['status__repliedstring'],
-						"{parse url="showuser={$row['member_id']}" seotitle="{$row['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['member_id'],$row['members_seo_name']"}",
-						"{parse url="showuser={$row['owner']['member_id']}" seotitle="{$row['owner']['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['owner']['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['owner']['member_id'],$row['owner']['members_seo_name']"}",
-						"{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all&amp;status_id={$row['action_status_id']}" seotitle="true" template="members_status_all" base="public"}"
-					)"}
-					</if>
-					<br /><span class='desc'>{$row['action_date_formatted_short']}</span>
-				</div>
-			</li>
-		</foreach>
-	    </ul>
-	<else />
-		<p>{$this->lang->words['status_actions_none']}</p>
-	</if>
-</div>
-<div id='status_standalone_page' class='left row2 altrow'>
-	<ol class='tab_bar no_title '>
-		<li id='status_all' class='tab_toggle <if test="tabactive:|:! $this->request['status_id'] AND ! $this->request['member_id'] AND ! $this->request['type'] OR $this->request['type'] == 'all'">active</if>'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['status__all_updates']}</a></li>
-		<if test="$this->memberData['member_id'] AND $this->settings['friends_enabled']">
-			<li id='status_all' class='tab_toggle <if test="tabactive2:|:$this->request['type'] == 'friends'">active</if>'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=friends" seotitle="true" template="members_status_friends" base="public"}'>{$this->lang->words['status__myfriends']}</a></li>
-		</if>
-		<if test="$this->request['member_id']">
-			<li id='status_by_id' class='tab_toggle active'>{$this->lang->words['status__membersupdats']}</li>
-		</if>
-		<if test="$this->request['status_id']">
-			<li id='status_by_sid' class='tab_toggle active'>{$this->lang->words['status__singleupdate']}</li>
-		</if>
-	</ol>
+<div id='status_standalone_page'>
+	<div class='maintitle ipsFilterbar'>
+		<ul class='ipsList_inline'>
+			<li id='status_all' class='<if test="tabactive:|:! $this->request['status_id'] AND ! $this->request['member_id'] AND ! $this->request['type'] OR $this->request['type'] == 'all'">active</if>'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['status__all_updates']}</a></li>
+			<if test="$this->memberData['member_id'] AND $this->settings['friends_enabled']">
+				<li id='status_all' class='tab_toggle <if test="tabactive2:|:$this->request['type'] == 'friends'">active</if>'><a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;type=friends" seotitle="true" template="members_status_friends" base="public"}'>{$this->lang->words['status__myfriends']}</a></li>
+			</if>
+			<if test="$this->request['member_id']">
+				<li id='status_by_id' class='active'><a href='#'>{$this->lang->words['status__membersupdats']}</a></li>
+			</if>
+			<if test="$this->request['status_id']">
+				<li id='status_by_sid' class='active'><a href='#'>{$this->lang->words['status__singleupdate']}</a></li>
+			</if>
+		</ul>
+	</div>
 	<if test="canCreate:|:$this->memberData['member_id'] AND $this->registry->getClass('memberStatus')->canCreate( $this->memberData )">
 		<div class='status_update row2'>
 			<form id='statusForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=new&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
-			<input type='text' id='statusUpdate' name='content' style='width:85%'> <input type='submit' class='input_submit alt' id='statusSubmit' value='{$this->lang->words['_rarr']}' />
+			<input type='text' id='statusUpdate_page' name='content' style='width:60%' class='input_text'> <input type='submit' class='ipsButton' id='statusSubmit_page' value='{$this->lang->words['gbl_post']}' />
 			<if test="update:|:(IPSLib::twitter_enabled() OR IPSLib::fbc_enabled() ) AND ( $this->memberData['fb_uid'] OR $this->memberData['twitter_id'] )">
 				<p class='desc' style='padding-top:5px;'>{$this->lang->words['st_update']}
 					<if test="updateTwitter:|:IPSLib::twitter_enabled() AND ( $this->memberData['twitter_id'] )"><input type='checkbox' id='su_Twitter' value='1' name='su_Twitter' /> <img src="{$this->settings['public_dir']}style_status/twitter.png" style='vertical-align:top' alt='' /></if>
@@ -2516,17 +2513,20 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
 			</form>
 		</div>
 	</if>
-	<div id="status_wrapper">
+	<div id="status_wrapper" class='ipsBox'>
 		<if test="hasUpdates:|:count( $updates )">
 			{parse template="statusUpdates" group="profile" params="$updates"}
 		<else />
 			<p class='no-status'>{$this->lang->words['status_updates_none']}</p>
 		</if>
 	</div>
+	<div class='topic_controls clearfix'>
+		{$pages}
+	</div>
 </div>]]></template_content>
       <template_name>statusUpdatesPage</template_name>
-      <template_data>$updates=array(), $actions</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data><![CDATA[$updates=array(), $pages='']]></template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2534,21 +2534,34 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<h3 class='bar'>{$this->lang->words['pp_tab_aboutme']}</h3>
-<div class='general_box'>
-	<if test="tababoutMe:|:$member['pp_about_me'] OR $member['signature']">
-		{$member['pp_about_me']}
-		
-		<if test="tabsignature:|:$member['signature']">
-				{$member['signature']}
-		</if>
-	<else />
-		{$this->lang->words['err_no_aboutme_to_show']}
+      <template_content><![CDATA[<div class='general_box'>
+	<if test="friends:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends'] AND $member['pp_setting_count_friends']">
+		<div class='friend_list clear' id='friend_list'>
+			<h3 class='bar'>{$this->lang->words['m_title_friends']}</h3>
+			<if test="friends_loop:|:is_array($friends) and count($friends)">
+				<ul class='clearfix'>
+				<foreach loop="friends:$friends as $friend">
+					<li>
+						<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='{$this->lang->words['view_profile']}' class='ipsUserPhotoLink'>
+							<img src='{$friend['pp_small_photo']}' alt='{$this->lang->words['photo']}' class='ipsUserPhoto ipsUserPhoto_medium' />
+						</a><br />
+						<span class='name'>
+							{parse expression="IPSMember::makeProfileLink($friend['members_display_name_short'], $friend['member_id'], $friend['members_seo_name'])"}
+						</span>
+					</li>
+				</foreach>
+				</ul>				
+			<else />
+				<p>
+					<em>{$member['members_display_name']} {$this->lang->words['no_friends_yet']}</em>
+				</p>
+			</if>
+		</div>
 	</if>
 </div>]]></template_content>
-      <template_name>tabAboutMe</template_name>
-      <template_data>$member=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_name>tabFriends</template_name>
+      <template_data>$friends=array(), $member=array()</template_data>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2556,13 +2569,10 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<h3 class='bar'>{$this->lang->words['tab_message_h']}</h3>
-<div class='general_box'>
-	{$this->lang->words[ $langkey ]}
-</div>]]></template_content>
+      <template_content><![CDATA[<div class='no_messages'>{$this->lang->words[ $langkey ]}</div>]]></template_content>
       <template_name>tabNoContent</template_name>
       <template_data>$langkey</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2570,15 +2580,15 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<h3 class='bar'>{$this->lang->words['posts_made']}</h3>
-<div class='general_box alt'>
-	<ol>
-		$content
-	</ol>
+      <template_content><![CDATA[<h3 class='maintitle'>{$this->lang->words['posts_made']}</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		{$content}
+	</div>
 </div>]]></template_content>
       <template_name>tabPosts</template_name>
       <template_data>$content</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2586,22 +2596,29 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<li style='list-style:none'>
-	<if test="singleColumnTitle:|:$title">
-		<if test="singleColumnUrl:|:$url">
-			<h4><a href="$url" title="{$this->lang->words['view_topic']}">$title</a></h4>
-		<else />
-			<h4>$title</h4>
+      <template_content><![CDATA[<div class='post_block no_sidebar'>
+	<div class='post_wrap'>
+		<if test="singleColumnTitle:|:$title">
+			<if test="singleColumnUrl:|:$url">
+				<h3 class='row2'><a href="$url" title="{$this->lang->words['view_topic']}">{parse expression="IPSText::truncate( $title, 90 )"}</a></h3>
+			<else />
+				<h3 class='row2'>{parse expression="IPSText::truncate( $title, 90 )"}</h3>
+			</if>
 		</if>
-	</if>
-	<p class='posted_info'><if test="date:|:$row['_raw_date']">{parse date="$row['_raw_date']" format="long"}<else />{$this->lang->words['posted']} {$row['_date_array']['mday']} {$row['_date_array']['smonth']} {$row['_date_array']['year']}</if></p>
-	<div class='post_body'>
-		{$row['post']}
+		<div class='post_body'>
+			<p class='posted_info'>
+				<if test="date:|:$row['_raw_date']">{parse date="$row['_raw_date']" format="long"}<else />{$this->lang->words['posted']} {$row['_date_array']['mday']} {$row['_date_array']['smonth']} {$row['_date_array']['year']}</if>
+			</p>
+			<div class='post'>
+				{$row['post']}
+			</div>
+		</div>
 	</div>
-</li>]]></template_content>
+	<br />
+</div>]]></template_content>
       <template_name>tabSingleColumn</template_name>
       <template_data><![CDATA[$row=array(), $read_more_link='', $url='', $title='']]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2609,91 +2626,48 @@ ipb.status.smallSpace = {parse expression="intval($smallSpace)"};
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[{parse js_module="status"}
-{parse striping="recent_status" classes="row1,row2"}
-<div class='status_profile_page row2 altrow'>
-	<if test="canCreate:|:$this->memberData['member_id'] AND ( $this->memberData['member_id'] == $member['member_id'] ) AND $this->registry->getClass('memberStatus')->canCreate( $member )">
-		<div class='status_update'>
-			<form id='statusForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=new&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}' method='post'>
-			<input type='text' name='content' id='statusUpdate' /> <input type='submit' class='input_submit alt' id='statusSubmit' value='{$this->lang->words['_rarr']}' />
-			<if test="update:|:(IPSLib::twitter_enabled() OR IPSLib::fbc_enabled() ) AND ( $this->memberData['fb_uid'] OR $this->memberData['twitter_id'] )">
-				<p class='desc' style='padding-top:5px;'>{$this->lang->words['st_update']}
-					<if test="updateTwitter:|:IPSLib::twitter_enabled() AND ( $this->memberData['twitter_id'] )"><input type='checkbox' id='su_Twitter' value='1' name='su_Twitter' /> <img src="{$this->settings['public_dir']}style_status/twitter.png" style='vertical-align:top' alt='' /></if>
-					<if test="updateFacebook:|:IPSLib::fbc_enabled() AND ( $this->memberData['fb_uid'] )">&nbsp;<input type='checkbox' id='su_Facebook' value='1' name='su_Facebook' /> <img src="{$this->settings['public_dir']}style_status/facebook.png" style='vertical-align:top' alt='' /></if>
-				</p>
-			</if>
-			</form>
-		</div>
-	</if>
+      <template_content><![CDATA[{parse striping="recent_status" classes="row1,row2"}
+<h2 class='maintitle'>{$this->lang->words['pp_tab_statusupdates']}</h2>
+<if test="canCreate:|:$this->memberData['member_id'] AND ( $this->memberData['member_id'] == $member['member_id'] ) AND $this->registry->getClass('memberStatus')->canCreate( $member )">
+	<div class='status_update'>
+		<form id='statusForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=new&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}&amp;forMemberId={$member['member_id']}' method='post'>
+		<input type='text' name='content' id='statusUpdate_page' class='input_text' /> <input type='submit' class='ipsButton' id='statusSubmit_page' value='{$this->lang->words['gbl_post']}' />
+		<if test="update:|:(IPSLib::twitter_enabled() OR IPSLib::fbc_enabled() ) AND ( $this->memberData['fb_uid'] OR $this->memberData['twitter_id'] )">
+			<p class='desc' style='padding-top:5px;'>{$this->lang->words['st_update']}
+				<if test="updateTwitter:|:IPSLib::twitter_enabled() AND ( $this->memberData['twitter_id'] )"><input type='checkbox' id='su_Twitter' value='1' name='su_Twitter' /> <img src="{$this->settings['public_dir']}style_status/twitter.png" style='vertical-align:top' alt='' /></if>
+				<if test="updateFacebook:|:IPSLib::fbc_enabled() AND ( $this->memberData['fb_uid'] )">&nbsp;<input type='checkbox' id='su_Facebook' value='1' name='su_Facebook' /> <img src="{$this->settings['public_dir']}style_status/facebook.png" style='vertical-align:top' alt='' /></if>
+			</p>
+		</if>
+		</form>
+	</div>
+</if>
+<if test="leave_comment:|:$this->memberData['member_id'] && $this->memberData['member_id'] != $member['member_id'] && $member['pp_setting_count_comments']">
+	<div class='status_update'>
+		<form id='commentForm' action='{$this->settings['base_url']}app=members&amp;module=profile&amp;section=status&amp;do=new&amp;k={$this->member->form_hash}&amp;id={$this->memberData['member_id']}&amp;forMemberId={$member['member_id']}' method='post'>
+				<input type='hidden' name='member_id' value='{$member['member_id']}' />
+				<input type='hidden' name='auth_key' value='{$this->member->form_hash}' />
+				<div id='post_comment'>
+					<input type='text' class='input_text' cols='50' rows='3' id='statusUpdate_page' name='content' data-for-member-id="{$member['member_id']}" />
+					<input type='submit' class='ipsButton' value='{$this->lang->words['comment_submit_post']}' data-for-member-id="{$member['member_id']}" id='statusSubmit_page' />
+				</div> 
+		</form>
+	</div>
+</if>
+<div class='ipsBox clearfix'>
 	<div id="status_wrapper">
 		<if test="hasUpdates:|:count( $updates )">
 			{parse template="statusUpdates" group="profile" params="$updates"}
-			<br />
-			<div class='right'>
-				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;member_id={$member['member_id']}" seotitle="true" template="members_status_all" base="public"}'>{$this->lang->words['status__viewall']}</a>
+			<div style='text-align: center'>
+				<a href='{parse url="app=members&amp;module=profile&amp;section=status&amp;member_id={$member['member_id']}" seotitle="true" template="members_status_all" base="public"}' class='ipsButton_secondary'>{$this->lang->words['status__viewall']}</a>
 			</div>
 		<else />
-			<p class='no-status'>{$this->lang->words['status_updates_none']}</p>
+			<p class='ipsBox_container ipsPad'>{$this->lang->words['status_updates_none']}</p>
 		</if>
 	</div>
-</div>
-<div class='status_profile_actions'>
-	<if test="count( $actions )">
-		<foreach loop="actions:$actions as $id => $row">
-			<div class='{parse striping="recent_status"} clear'>
-				<div class='status_action_left'><img src="{$row['pp_mini_photo']}" width="{$row['pp_mini_width']}" height="{$row['pp_mini_height']}" alt="" /></div>
-				<div class='status_action_right'>
-					<if test="$row['action_key'] == 'new'">
-					{parse expression="sprintf(
-						$this->lang->words['status__newstring'],
-						"{parse url="showuser={$row['member_id']}" seotitle="{$row['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['member_id'],$row['members_seo_name']"}",
-						"{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all&amp;status_id={$row['action_status_id']}" seotitle="true" template="members_status_all" base="public"}"
-					)"}
-					<else />
-					{parse expression="sprintf(
-						$this->lang->words['status__repliedstring'],
-						"{parse url="showuser={$row['member_id']}" seotitle="{$row['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['member_id'],$row['members_seo_name']"}",
-						"{parse url="showuser={$row['owner']['member_id']}" seotitle="{$row['owner']['members_seo_name']}" template="showuser" base="public"}",
-						"{$row['owner']['members_display_name']}",
-						"{parse template="user_popup" group="global" params="$row['owner']['member_id'],$row['owner']['members_seo_name']"}",
-						"{parse url="app=members&amp;module=profile&amp;section=status&amp;type=all&amp;status_id={$row['action_status_id']}" seotitle="true" template="members_status_all" base="public"}"
-					)"}
-					</if>
-				<br /><span class='desc'>{$row['action_date_formatted_short']}</span>
-				</div>
-			</div>
-		</foreach>
-	<else />
-		<p class='no-status'>{$this->lang->words['status_actions_none']}</p>
-	</if>
-</div>
-<script type='text/javascript'>
-document.observe("dom:loaded", function(){
-	function _resizeBlocks()
-	{
-		var status  = $$('.status_profile_page')[0];
-		var actions = $$('.status_profile_actions')[0];
-		var s_h     = status.getHeight();
-		var a_h		= actions.getHeight();
-		
-		if ( a_h && s_h && a_h > s_h )
-		{
-			actions.setStyle( { height: s_h + 'px', overflow: 'auto' } );
-		}
-	
-		setTimeout( _resizeBlocks, 1000 );
-	}
-	
-	_resizeBlocks();
-});
-</script>]]></template_content>
+</div>]]></template_content>
       <template_name>tabStatusUpdates</template_name>
       <template_data>$updates=array(), $actions, $member=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2701,15 +2675,15 @@ document.observe("dom:loaded", function(){
     </template>
     <template>
       <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<h3 class='bar'>{$this->lang->words['topics_started']}</h3>
-<div class='general_box alt'>
-	<ol>
-		$content
-	</ol>
+      <template_content><![CDATA[<h3 class='maintitle'>{$this->lang->words['topics_started']}</h3>
+<div class='ipsBox'>
+	<div class='ipsBox_container'>
+		{$content}
+	</div>
 </div>]]></template_content>
       <template_name>tabTopics</template_name>
       <template_data>$content</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864228</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2719,7 +2693,9 @@ document.observe("dom:loaded", function(){
   <templategroup group="skin_ucp">
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<div class='row1'>	
+      <template_content><![CDATA[<h3 class='ipsType_subtitle'>{$this->lang->words['m_attach']}</h3>
+<br />
+<div class='row1'>	
 	<if test="hasAttachLimit:|:$info['has_limit'] == 1">
 		<div id='space_allowance' class='general_box'>
 			<p><strong>{$info['attach_space_used']}</strong></p>
@@ -2729,10 +2705,12 @@ document.observe("dom:loaded", function(){
 			<p class='desc'>{$info['attach_space_count']}</p>
 		</div>
 	</if>
-	<div class='topic_controls'>
-		$pages
-	</div>
-	<br />
+	<if test="hasPagesTop:|:$pages">
+		<div class='topic_controls'>
+			{$pages}
+		</div>
+		<br class='clear' />
+	</if>
 	<!-- ATTACHMENTS TABLE -->
 	<form action="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=updateAttachments&amp;do=saveIt" base="public"}" id="checkBoxForm" method="post">
 	<table class='ipb_table' summary="{$this->lang->words['ucp_user_attach']}">
@@ -2742,7 +2720,6 @@ document.observe("dom:loaded", function(){
 				<th scope='col' style='width: 7%'>{$this->lang->words['attach_hsize']}</th>
 				<th scope='col' style='width: 27%'>{$this->lang->words['attach_topic']}</th>
 				<th scope='col' class='short' style='width: 3%'><input class='input_check' id="checkAllAttachments" type="checkbox" value="{$this->lang->words['check_all']}" /></th>
-				<!-- SKINNOTE: Convert to new JS -->
 			</tr>
 			<if test="hasAttachments:|:count($attachments)">
 				{parse striping="attach" classes="row1,row2"}
@@ -2786,27 +2763,18 @@ document.observe("dom:loaded", function(){
 		</if>
 	</form>
 </div>
+<if test="hasPagesBottom:|:$pages">
+	<div class='topic_controls'>
+		{$pages}
+	</div>
+	<br class='clear' />
+</if>
 <script type='text/javascript'>
 	ipb.global.registerCheckAll( 'checkAllAttachments', 'checkall' );
 </script>]]></template_content>
       <template_name>coreAttachments</template_name>
       <template_data><![CDATA[$info="",$pages="",$attachments]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
-	<h3>{$this->lang->words['m_notes']}</h3>
-	<p class='message unspecified'>{$this->lang->words['note_pad_empty']}</p>
-	<textarea style='width:100%; margin: 10px auto;' rows='30' name='Post' id='ucp_notes'>{$content}</textarea>
-</fieldset>]]></template_content>
-      <template_name>coreNotesForm</template_name>
-      <template_data><![CDATA[$content='']]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2818,21 +2786,27 @@ document.observe("dom:loaded", function(){
 	<p class='message'>{$okmessage}</p>
 </if>
 <fieldset class='row1'>
-	<h3>{$this->lang->words['dname_title']}</h3>
+	<h3 class='ipsType_subtitle'>{$this->lang->words['dname_title']}</h3>
+	<p class='ipsType_pagedesc'>{$form['_lang_string']}</p>
 	<br />
 	<if test="$form['_noPerm']">
 		<p class='message error'>{$form['_noPerm']}</p>
 	<else />
-		<p class='message unspecific'>{$form['_lang_string']}</p>
-		<ul>
-			<li class='field'>
-				<label for='displayName'>{$this->lang->words['dname_choose']}</label><input class='input_text' type="text" maxlength='{$this->settings['max_user_name_length']}' name="displayName" id="displayName" value="{$this->request['displayName']}" size='30' /> <br />
-				<span class='desc'>{$this->lang->words['dname_choose2']}</span>
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField'>
+				<label for='displayName' class='ipsField_title'>{$this->lang->words['dname_choose']}</label>
+				<p class='ipsField_content'>
+					<input class='input_text' type="text" maxlength='{$this->settings['max_user_name_length']}' name="displayName" id="displayName" value="{$this->request['displayName']}" size='30' /><br />
+					<span class='desc lighter'>{$this->lang->words['dname_choose2']}</span>
+				</p>
 			</li>
 			<if test="dnameFbUser:|:!$isFB">
-			<li class='field'>
-				<label for='displayPassword'>{$this->lang->words['dname_password']}</label><input class='input_text' type="password" name="displayPassword" id="displayPassword" value="" size='30' /> <br />
-				<span class='desc'>{$this->lang->words['dname_password2']}</span>
+			<li class='ipsField'>
+				<label for='displayPassword' class='ipsField_title'>{$this->lang->words['dname_password']}</label>
+				<p class='ipsField_content'>
+					<input class='input_text' type="password" name="displayPassword" id="displayPassword" value="" size='30' /> <br />
+					<span class='desc lighter'>{$this->lang->words['dname_password2']}</span>
+				</p>
 			</li>
 			</if>
 		</ul>
@@ -2840,7 +2814,7 @@ document.observe("dom:loaded", function(){
 </fieldset>]]></template_content>
       <template_name>displayNameForm</template_name>
       <template_data><![CDATA[$form=array(),$error="",$okmessage="", $isFB=false]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2855,41 +2829,87 @@ var msg = "$_message";
 	}
 </script>
 <fieldset class='row1'>
-	<h3>{$this->lang->words['change_email_title']}</h3>
-	<br />
+<h3 class='ipsType_subtitle'>{$this->lang->words['m_email_pass_change']}</h3>
+<if test="hideMessageIfAdmin:|:!$this->memberData['g_access_cp']"><p class='ipsType_pagedesc'>{$this->lang->words['m_email_pass_change_desc']}</p></if>
+</fieldset>
+<if test="emailIsAdmin:|:$this->memberData['g_access_cp']">
 	<p class='message unspecific'>
-		<if test="emailIsAdmin:|:$this->memberData['g_access_cp']">
-			{$this->lang->words['admin_emailpassword']}
-		<else />
-			{$txt}
-		</if>
+		{$this->lang->words['admin_emailpassword']}
 	</p>
-	<if test="emailIsNotAdmin:|:!$this->memberData['g_access_cp']">
-		<ul>
-			<li class='field'>
-				<label for='in_email_1'>{$this->lang->words['ce_new_email']}</label>
-				<input type="text" name="in_email_1" id='in_email_1' class='input_text' value="" />
+</if>
+<if test="emailIsNotAdmin:|:!$this->memberData['g_access_cp']">
+	<fieldset class='row1'>
+		<h3 class='ipsType_subtitle'>{$this->lang->words['change_email_title']}</h3>
+		<p class='ipsType_pagedesc'>
+			{$txt}
+		</p>
+		<br />
+		<ul class='ipsForm ipsForm_horizontal'>
+			<li class='ipsField clearfix'>
+				<span class='ipsField_title'>{$this->lang->words['ce_current']}</span>
+				<div class='ipsField_content'>
+					<strong style='line-height: 1.8'>{$this->memberData['email']}</strong>
+				</div>
 			</li>
-			<li class='field'>
-				<label for='in_email_2'>{$this->lang->words['ce_new_email2']}</label>
-				<input type="text" name="in_email_2" id='in_email_2' class='input_text' value="" />
+			<li class='ipsField clearfix'>
+				<label for='in_email_1' class='ipsField_title'>{$this->lang->words['ce_new_email']}</label>
+				<p class='ipsField_content'>
+					<input type="text" size='30' name="in_email_1" id='in_email_1' class='input_text' value="" />
+				</p>
+			</li>
+			<li class='ipsField clearfix'>
+				<label for='in_email_2' class='ipsField_title'>{$this->lang->words['ce_new_email2']}</label>
+				<p class='ipsField_content'>
+					<input type="text" size='30' name="in_email_2" id='in_email_2' class='input_text' value="" />
+				</p>
 			</li>
 			<if test="passFbUser:|:!$isFB">
-			<li class='field'>
-				<label for='password'>{$this->lang->words['ec_passy']}</label>
-				<input type="password" id='password' class='input_text' name="password" value="" />
+			<li class='ipsField clearfix'>
+				<label for='password' class='ipsField_title'>{$this->lang->words['ec_passy']}</label>
+				<p class='ipsField_content'>
+					<input type="password" size='30' id='password' class='input_text' name="password" value="" />
+				</p>
 			</li>
 			</if>
 		</ul>
-	</if>
-</fieldset>
-<if test="emailCaptcha:|:$captchaHTML != '' AND !$this->memberData['g_access_cp']">
-	<br />
-	{$captchaHTML}
+	</fieldset>
+	<fieldset class='row1'>
+		<h3 class='ipsType_subtitle'>{$this->lang->words['account_pass_title']}</h3>
+		<p class='ipsType_pagedesc'>
+			<if test="removeUser:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
+				{$this->lang->words['remote_pass_set']}
+			<else />
+				{$this->lang->words['pass_change_text']}
+			</if>
+		</p>
+		<br />
+		<ul class='ipsForm ipsForm_horizontal'>
+			<if test="removeUser2:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">
+			<li class='ipsField'>
+				<label for='current_pass' class='ipsField_title'>{$this->lang->words['account_pass_old']}</label>
+				<p class='ipsField_content'>
+					<input type="password" name="current_pass" value="" id='current_pass' class='input_text' size='30' />
+				</p>
+			</li>
+			</if>
+			<li class='ipsField'>
+				<label for='new_pass_1' class='ipsField_title'><if test="removeUser3:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">{$this->lang->words['account_pass_new']}<else />{$this->lang->words['enter_pass_remote1']}</if></label>
+				<p class='ipsField_content'>
+					<input type="password" name="new_pass_1" value="" id='new_pass_1' class='input_text' size='30' />
+				</p>
+			</li>
+			<li class='ipsField'>
+				<label for='new_pass_2' class='ipsField_title'><if test="removeUser4:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">{$this->lang->words['account_pass_new2']}<else />{$this->lang->words['enter_pass_remote2']}</if></label>
+				<p class='ipsField_content'>
+					<input type="password" name="new_pass_2" value="" id='new_pass_2' class='input_text' size='30' />
+				</p>
+			</li>
+		</ul>
+	</fieldset>
 </if>]]></template_content>
-      <template_name>emailChangeForm</template_name>
-      <template_data>$txt, $_message, $captchaHTML, $isFB=false</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_name>emailPasswordChangeForm</template_name>
+      <template_data>$txt, $_message, $isFB=false</template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2902,7 +2922,7 @@ var msg = "$_message";
 </select>]]></template_content>
       <template_name>field_dropdown</template_name>
       <template_data><![CDATA[$name="",$options=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2910,14 +2930,20 @@ var msg = "$_message";
     </template>
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<li class='field'>
-	<label for='field_{$id}'>{$title}</label>
-	{$content}
-	<if test="cfieldDesc:|:$desc"><span class='desc'>{$desc}</span></if>
+      <template_content><![CDATA[<li class='custom'>
+	<label for='field_{$id}' class='ipsSettings_fieldtitle'>{$title}</label>
+	<if test="stristr($content, 'radio') || stristr($content, 'checkbox')">
+		<p class='wrap'>{$content}</p>
+		<if test="cfieldDesc:|:$desc"><span class='desc'>{$desc}</span></if>
+	<else />
+		{$content}
+		<if test="cfieldDesc:|:$desc"><br /><span class='desc'>{$desc}</span></if>
+	</if>
+	
 </li>]]></template_content>
       <template_name>field_entry</template_name>
       <template_data><![CDATA[$title="",$desc="",$content="",$id=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2928,7 +2954,7 @@ var msg = "$_message";
       <template_content><![CDATA[<textarea cols="80" rows="5" wrap="soft" name="$name" class='input_text'>{$value}</textarea>]]></template_content>
       <template_name>field_textarea</template_name>
       <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -2939,413 +2965,7 @@ var msg = "$_message";
       <template_content><![CDATA[<input type="text" size="50" name="{$name}" value='{$value}' class='input_text' />]]></template_content>
       <template_name>field_textinput</template_name>
       <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['settings_display']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewSignatures' id='view_sigs' value='1' class='input_check'<if test="viewSigs:|:$this->memberData['view_sigs']"> checked="checked"</if>/> <label for='view_sigs'>{$this->lang->words['settings_viewsig']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewImages' id='view_img' value='1' class='input_check'<if test="ViewImgs:|:$this->memberData['view_img']"> checked="checked"</if>/> <label for='view_img'>{$this->lang->words['settings_viewimg']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' name='viewAvatars' id='view_avatar' value='1' class='input_check'<if test="viewAvs:|:$this->memberData['view_avs']"> checked="checked"</if>/> <label for='view_avatar'>{$this->lang->words['settings_viewava']}</label>
-		</li>
-		<li class='field'>
-			<label for='post_per_page' />{$this->lang->words['pp_number_posts']}</label>
-			<select name="postpage" class='input_select' id='posts_per_page'>
-				<option value='-1'>{$this->lang->words['pp_use_default']}</option>
-				<foreach loop="viewposts_options:$data['viewPostsForm'] as $r">
-					<option value='{$r[0]}'<if test="pppSelected:|:$r[0] == $data['postsPerPage']"> selected='selected'</if>>{$r[1]}</option>
-				</foreach>
-			</select>
-		</li>
-		<li class='field'>
-			<label for='topics_per_page' />{$this->lang->words['pp_number_topics']}</label>
-			<select name="topicpage" class='input_select' id='topics_per_page'>
-				<option value='-1'>{$this->lang->words['pp_use_default']}</option>
-				<foreach loop="viewtopics_options:$data['viewTopicsForm'] as $r">
-					<option value='{$r[0]}'<if test="tppSelected:|:$r[0] == $data['topicsPerPage']"> selected='selected'</if>>{$r[1]}</option>
-				</foreach>			
-			</select>
-		</li>
-		<li class='field'>
-			<label for='topic_display_mode'>{$this->lang->words['ucp_topic_display_mode']}</label> 
-			<select name="topic_display_mode" id='topic_display_mode' class='input_select'>
-				<option value="linear"<if test="linearView:|:IPSCookie::get('topicmode') == 'linear' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'linear')"> selected</if>>{$this->lang->words['ucp_standard']}</option>
-				<option value="linearplus"<if test="linearPlusView:|:IPSCookie::get('topicmode') == 'linearplus' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'linearplus')"> selected</if>>{$this->lang->words['ucp_linearplus']}</option>
-				<option value="threaded"<if test="threadedView:|:IPSCookie::get('topicmode') == 'threaded' OR (!IPSCookie::get('topicmode') AND $this->settings['topicmode_default'] == 'threaded')"> selected</if>>{$this->lang->words['ucp_outline']}</option>				
-			</select>
-			<span class='desc'>
-				<strong>{$this->lang->words['ucp_standard']}:</strong> {$this->lang->words['ucp_standard_explain']}<br />
-				<strong>{$this->lang->words['ucp_linearplus']}:</strong> {$this->lang->words['ucp_linearplus_explain']}<br />
-				<strong>{$this->lang->words['ucp_outline']}:</strong> {$this->lang->words['ucp_outline_explain']}
-			</span>
-		</li>		
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>forumPrefsForm</template_name>
-      <template_data>$data</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<php>
-	$_count = 0;
-</php>
-<div class='clear'>
-<foreach loop="images:$images as $image">
-	<php>
-		$id = ucfirst( preg_replace( "#^(.*)\.(.+?)$#", "$1", $image ) );
-	</php>
-	<if test="avatarsTabulation:|:$_count % 5 == 0">
-		</div>
-		<div class='clear'>
-	</if>
-	<div class='avatar_gallery'>
-		<img src='{$this->settings['public_dir']}style_avatars/<if test="avatarSubdir:|:$dir != '0'">{$dir}/</if>{$image}' alt='{$this->lang->words['avatar']}' /><br />
-		<input type='radio' value='{$image}' name='avatar_image' id='{$dir}_{$id}' /> <label for='{$dir}_{$id}'>{$id}</label>
-	</div>
-	<if test="avatarCountPlusPlus:|:$_count++"></if>
-</foreach>
-</div>]]></template_content>
-      <template_name>forumsInlineAvatarImages</template_name>
-      <template_data>$images=array(), $dir</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<php>$this->hasOpenID = false;</php>
-<foreach loop="loginmethods:$this->cache->getCache('login_methods') as $method">
-	<if test="hasOpenid:|:$method['login_folder_name'] == 'openid'">
-		<if test="setHasOpenid:|:$this->hasOpenID = true"></if>
-	</if>
-</foreach>
-<if test="weDoHaveOpenid:|:$this->hasOpenID">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['identity_url_h3']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='identity_url'>{$this->lang->words['identity_url']}</label><input class='input_text' size='30' type="text" name="identity_url" id="identity_url" value="{$this->memberData['identity_url']}" /> <br />
-				<span class='desc'>{$this->lang->words['identity_url_desc']}</span>
-			</li>
-		</ul>
-	</fieldset>
-</if>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['settings_time']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='timezone'>{$this->lang->words['ucp_timzeone']}</label>
-			<select name='timeZone' id='timezone' class='input_select'>
-			<foreach loop="timezones:$times as $off => $words">
-				<option value='{$off}' <if test="isOurTimezone:|:$off == $this->memberData['time_offset']"> selected="selected"</if>>{$words}</option>
-			</foreach>
-			</select>
-			<span class='desc'>{$this->lang->words['settings_time_txt2']} {parse date="" format="LONG" relative="false"}</span>
-		</li>
-		<if test="$this->settings['time_dst_auto_correction']">
-			<li class='field checkbox'>
-				<if test="dstError:|:$this->request['dsterror'] == 1">
-					{$this->lang->words['dst_error']}
-				</if>
-				<input type='checkbox' class='input_check' id='dst' name="dstCheck" onclick='toggle_dst()' value="1"<if test="doAutoDst:|:$this->memberData['members_auto_dst']"> checked="checked"</if>/> <label for='dst'>{$this->lang->words['dst_correction_title']}</label><br />
-				<span class='desc'>{$this->lang->words['dst_auto2']}</span>
-			</li>
-			<li class='field checkbox' id='dst-manual'>
-				<input type='checkbox' class='input_check' id='dstManual' name="dstOption" value="1"<if test="doManualDst:|:$this->memberData['dst_in_use']"> checked="checked"</if>/> <label for='dstManual'>{$this->lang->words['ucp_dst_now']}</label><br />
-				<span class='desc'>{$this->lang->words['ucp_dst_effect']}</span>
-			</li>
-		</if>
-	</ul>
-</fieldset>
-<fieldset class='row2 '>
-	<h3>{$this->lang->words['ucp_title_posting']}</h3>
-	<ul>
-		<if test="allowRte:|:$this->settings['posting_allow_rte'] == 1">
-			<li class='field checkbox'>
-				<if test="!$this->memberData['_canUseRTE']">
-					<div class='message error usercp'>{$this->lang->words['your_browser_norte']}</div>
-				</if>
-				<input type='checkbox' class='input_check' id='editor_type' name='editorChoice' value='1' <if test="useRte:|:$this->memberData['members_editor_choice'] == 'rte'"> checked="checked"</if>/> <label for='editor_type'>{$this->lang->words['enable_rte']}</label>
-				<br /><span class='desc'>{$this->lang->words['rte_text']}</span>
-			</li>
-		</if>
-		
-		<if test="allowFlash:|:$this->settings['uploadFormType']">
-			<!-- Fancy uploader is available, so show user option... -->
-			<li class='field checkbox'>
-				<input type='checkbox' class='input_check' id='member_uploader' name='member_uploader' value='1' <if test="useFlash:|:$this->memberData['member_uploader'] == 'flash'"> checked="checked"</if>/> <label for='member_uploader'>{$this->lang->words['enable_flash']}</label><br />
-				<span class='desc'>{$this->lang->words['flash_text']}</span>
-			</li>
-		</if>
-	</ul>
-</fieldset>
-
-<fieldset class='row1 '>
-	<h3>{$this->lang->words['ucp_title_search']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='timezone'>{$this->lang->words['ucp_vnc_type']}</label>
-			<select name='bw_vnc_type' id='bw_vnc_type' class='input_select'>
-				<option value='0' <if test="!$this->memberData['bw_vnc_type']">selected='selected'</if>>{$this->lang->words['ucp_vnc_type_0']}</option>
-				<option value='1' <if test="$this->memberData['bw_vnc_type']">selected='selected'</if>>{$this->lang->words['ucp_vnc_type_1']}</option>
-			</select>
-		</li>
-	</ul>
-</fieldset>
-<script type="text/javascript">
-//<!#^#|CDATA|
-function toggle_dst()
-{
-	if ( $( 'dst' ) )
-	{
-		if ( $( 'dst' ).checked )
-		{
-			$( 'dst-manual' ).style.display = 'none';
-		}
-		else
-		{
-			$( 'dst-manual' ).style.display = 'block';
-		}
-	}
-}
-toggle_dst();
-//|#^#]>
-</script>]]></template_content>
-      <template_name>generalSettingsForm</template_name>
-      <template_data>$times</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<p class='message unspecific'>{$msg}</p>]]></template_content>
-      <template_name>inlineModIPMessage</template_name>
-      <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<if test="haslikeserror:|:$error">
-<p class='message error'>
-	{$error}
-</p>
-<else />
-	<if test="hasconfirm:|:$this->request['confirm']">
-	<p class='message'>
-		{$this->lang->words['likes_rem_suc']}
-	</p>
-	</if>
-</if>
-<br />
-<div class='row1' id='likesList'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=moderateLikes&amp;do=moderate" base="public"}" id="checkBoxForm" method="post">
-	<input type="hidden" name="secure_key" value="{$this->member->form_hash}" />
-	<if test="hasLikes:|:is_array( $likes ) AND count( $likes )">
-		<h3 class='maintitle'>{$this->lang->words['arch_likes_head']}</h3>
-		<table class='ipb_table' summary="{$this->lang->words['likes_table_head']}">
-			<tr class='header'>
-				<th scope='col' width="5%">&nbsp;</th>
-				<th scope='col' width="50%">{$this->lang->words['th_like_title']}</th>
-				<th scope='col' width="5%">{$this->lang->words['th_like_anon']}</th>
-				<th scope='col' align="center"  width="5%">{$this->lang->words['th_like_notification']}</th>
-				<th scope='col' width="20%">{$this->lang->words['th_like_on']}</th>
-				<th scope='col' align="center" width="5%" class='short'><input id="checkAllLikes" type="checkbox" value="{$this->lang->words['check_all']}" /></th>
-			</tr>
-			{parse striping="likes" classes="row1,row2"}
-			<foreach loop="categories:$likes as $like">
-				<tr class='{parse striping="likes"}'>
-					<td class="altrow short"><img src='{$this->settings['img_url']}/likes/{$like['like_app']}.png' alt='' /></td>
-					<td>
-						<a href='{$like['like.url']}' title='{$this->lang->words['view_liked_content']}'>{$like['like.title']}</a>
-						<if test="hasParent:|:$like['like.parentTitle']">
-							<div class='desc' style='margin-top: 4px'>{$like['like.type']} {$this->lang->words['like_parent_from']} {$like['like.parentType']} <a href='{$like['like.parentUrl']}'>{$like['like.parentTitle']}</a></div>
-						</if>
-					</td>
-					<td class=""><if test="likeAnon:|:$like['like_is_anon']"><img src='{$this->settings['img_url']}/likes_flag.png' alt='{$this->lang->words['like_is_anon']}' title='{$this->lang->words['like_is_anon']}' /></if></td>
-					<td class="" style="text-align: center"><if test="likeAnon:|:$like['like_notify_do']"><img src='{$this->settings['img_url']}/likes_flag.png' alt='{$this->lang->words['like_notify_yes']}' title='{$this->lang->words['like_notify_yes']}' /> <span class='desc'>{$this->lang->words['like_notify_freq_' . $like['like_notify_freq'] ]}</span></if></td>
-					<td class="desc">{parse date="$like['like_added']" format="short"}</td>
-					<td class="short altrow"><input class='input_check checkall' type="checkbox" name="likes[]" value="{$like['like_app']}-{$like['like_area']}-{$like['like_rel_id']}" /></td>
-				</tr>
-			</foreach>
-		</table>
-		<script type='text/javascript'>
-			ipb.global.registerCheckAll('checkAllLikes', 'checkall');
-		</script>
-	<else />
-		<p class='no_messages'>{$this->lang->words['likes_none']}</p>
-	</if>
-	<if test="hasLikeForMod:|:count($likes)">
-		<div class='moderation_bar rounded with_action'>
-			<select name='modaction' class='input_select'>
-				<option value=''>{$this->lang->words['like_mod__chose']}</option>
-				<option value='delete'>{$this->lang->words['like_mod__delete']}</option>
-				<option value='change-donotify'>{$this->lang->words['like_mod__change_donotify']}</option>
-				<option value='change-donotnotify'>{$this->lang->words['like_mod__change_nonotify']}</option>
-				<option value='change-immediate'>{$this->lang->words['like_mod__change_immediate']}</option>
-				<option value='change-offline'>{$this->lang->words['like_mod__change_offline']}</option>
-				<!-- Skinnote: Need to add daily/weekly options in once we start supporting them -->
-				<option value='change-anon'>{$this->lang->words['like_mod__change_anon']}</option>
-				<option value='change-noanon'>{$this->lang->words['like_mod__change_noanon']}</option>
-			</select>
-				
-			<input type="submit" class="input_submit alt" value="{$this->lang->words['update_selected']}" />
-		</div>
-		<br />
-		<div class='topic_controls'>
-			{$pages}
-		</div>
-	</if>
-</form>
-</div>]]></template_content>
-      <template_name>likesList</template_name>
-      <template_data><![CDATA[$likes, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<script type="text/javascript">
-var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_avatars/';
-</script>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['av_settings']}</h3>
-	<p class='message unspecific'>
-		<if test="avatarUrl:|:$this->settings['avatar_url']">
-			{parse expression="sprintf( $this->lang->words['av_text_url'], $this->settings['maxWidth'], $this->settings['maxHeight'] )"}
-			<br />
-		</if>
-		<if test="avatarUploaded:|:$data['member']['g_avatar_upload']">
-			{parse expression="sprintf( $this->lang->words['av_text_upload'], $this->settings['avup_size_max'] )"}
-		</if>
-		<br />{$this->lang->words['av_allowed_files']}
-	</p>
-</fieldset>
-<if test="avatarGallery:|:$data['member']['avatar_location'] != "" and $data['member']['avatar_location'] != 'noavatar'">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['av_current']}</h3>
-		<div align='center'>
-			<p>{$data['current_avatar_image']}<br />{$data['current_avatar_type']} {$data['current_avatar_dims']}</p>
-			<p><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=removeavatar&amp;do=remove&amp;secure_key={$this->member->form_hash}" base="public"}'>{$this->lang->words['ucp_remove_avatar']}</a></p>
-		</div>
-	</fieldset>
-</if>
-<if test="hasAvatarUrl:|:$this->settings['avatar_url'] OR $data['member']['g_avatar_upload']">
-	<fieldset class='row1'>
-		<h3>{$this->lang->words['avatar_url_title']}</h3>
-		<if test="hasAvatarNotGallery:|:$data['member']['g_avatar_upload'] || $this->settings['avatar_url'] || $this->settings['allow_gravatars']">
-			<ul>
-				<if test="avatarWasUploaded:|:$data['member']['g_avatar_upload']">
-					<li class='field'>
-						<label for='upload_avatar'>{$this->lang->words['av_upload']}</label>
-						<input type="file" size="30" name="upload_avatar" id="upload_avatar" />
-					</li>
-				</if>
-				<if test="avatarWasLinked:|:$this->settings['avatar_url']">
-					<li class='field'>
-						<label for='avatar_url'>{$this->lang->words['av_url']}</label>
-						<input type="text" size="40" maxlength="255" name="avatar_url" id="avatar_url" value="{$data['current_url_avatar']}" />
-					</li>
-				</if>
-				<if test="allowGravatars:|:$this->settings['allow_gravatars']">
-					<li class='field'>
-						<label for='gravatar_email'> <strong><em>-{$this->lang->words['or']}-</em></strong> {$this->lang->words['ucp_gravatar_enter_email']}</label>
-						<input type="text" size="40" maxlength="255" name="gravatar_email" id="gravatar_email" value="<if test="hasGravatar:|:$data['current_avatar_type'] == 'Gravatar'">{$data['member']['avatar_location']}</if>" />
-					</li>
-				</if>
-			</ul>
-		</if>
-		<if test="noResizeAvatar:|:! $this->settings['disable_ipbsize']">
-			<p><strong>{$this->lang->words['av_autosize']}</strong><br />({$this->lang->words['av_as_desc']})</p>
-		<else />
-			<ul>
-				<li class='field'>
-					{$this->lang->words['width']}
-					<input type="text" size="3" name="man_width" />
-				</li>
-				<li class='field'>
-					{$this->lang->words['height']}
-					<input type="text" size="3" name="man_height" />
-				</li>
-			</ul>
-		</if>
-	</fieldset>
-</if>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['avatar_pre_title']}</h3>
-	<ul>
-		<li>
-			<label for="avatarCategory">{$this->lang->words['av_go_gal']}: </label>
-			<select name='avatar_gallery' id='avatarCategory' class='input_select'>
-				<option value='none' selected="selected">&lt; {$this->lang->words['ucp_select_category']} &gt;</option>
-				<foreach loop="avatars:$data['avatar_categories'] as $id => $name">
-					<option value="{$name[0]}">{$name[1]}</option>
-				</foreach>
-			</select>
-			<div style='display:none;' id='avatarImageContainer'></div>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>memberAvatarForm</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
-<if test="$preview_about_me">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['cp_current_aboutme']}</h3>
-		<div class='signature'>
-			{$preview_about_me}
-		</div>
-	</fieldset>
-</if>
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['cp_edit_aboutme']}</h3>
-	<div>
-		{$editor_html}
-	</div>
-</fieldset>
-<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
-{parse template="include_lightbox" group="global" params=""}
-</if>
-{parse template="include_highlighter" group="global" params="1"}]]></template_content>
-      <template_name>membersAboutMeForm</template_name>
-      <template_data><![CDATA[$preview_about_me="",$editor_html=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3362,31 +2982,32 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 	</div>
 <else />
 	<if test="! $fbUserData['id']">
-	<div id='fbUserBox'>
-		{$this->lang->words['fb_config']}
-		<br />
-		<br />
-		<a href="{$this->settings['_original_base_url']}/interface/facebook/index.php"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a>
-	</div>
+		<div id='fbUserBox'>
+			<p class='message'>{$this->lang->words['fb_config']}</p>
+			<br />
+			<br />
+			<a href="{$this->settings['_original_base_url']}/interface/facebook/index.php"><img src="{$this->settings['img_url']}/facebook_login.png" alt="" /></a>
+		</div>
 	<else />
 		<div>
-			<fieldset class='row2'>
-				<div style='float:left; margin-right:4px;margin-bottom:3px'>
+			<fieldset class='ipsPad_half row2'>
+				<div class='left ipsUserPhoto' style='margin-right:4px;'>
 					<img src="{$fbUserData['pic_square']}" alt="" />
 				</div>
+				<div class='desc'>
 				{$this->lang->words['fb_logged_in_as']} <strong>{$fbUserData['name']}</strong>
 				<if test="fbShowStatus:|:is_array($fbUserData['status']) AND $fbUserData['status']['message']">
-					<br /><br /><p class='desc'>{$fbUserData['status']['message']}</p>
+					<br /><br />{$fbUserData['status']['message']}
 				</if>
+				</div>
 			</fieldset>
+			<br />
 			<fieldset class='row1'>
-				<h3>{$this->lang->words['fb_sync_options']}</h3>
+				<h3 class='ipsType_subtitle'>{$this->lang->words['fb_sync_options']}</h3>
 				<ul>
 					<li class='field checkbox'>
-						<input class='input_check' type='checkbox' value='1' name='fbc_s_pic' value='1' <if test="fbSyncPic:|:$this->memberData['fbc_s_pic'] > 0">checked='checked'</if> id='fbc_s_pic' /><label for='fbc_s_pic'>{$this->lang->words['fb_sync_photo']}</label>
-					</li>
-					<li class='field checkbox'>
-						<input class='input_check' type='checkbox' value='1' name='fbc_s_avatar' value='1' <if test="fbSyncAvatar:|:$this->memberData['fbc_s_avatar'] > 0">checked='checked'</if> id='fbc_s_avatar' /><label for='fbc_s_avatar'>{$this->lang->words['fb_sync_avatar']}<if test="$this->memberData['twitter_id']"><br /><span class='desc' style='margin-left:-5px'>{$this->lang->words['facebook_av_warning']}</span></if></label>
+						<input class='input_check' type='checkbox' value='1' name='fbc_s_pic' value='1' <if test="fbSyncPic:|:$this->memberData['fbc_s_pic'] > 0">checked='checked'</if> id='fbc_s_pic' /><label for='fbc_s_pic'>{$this->lang->words['fb_sync_photo']}</label><br />
+						<span class='desc lighter'>{$this->lang->words['fb_sync_photo_info']}</span>
 					</li>
 					<if test="canUpdateStatus:|:$this->memberData['can_updated_status']">
 					<li class='field checkbox'>
@@ -3398,9 +3019,6 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 						<input class='input_check' type='checkbox' value='1' name='fbc_si_status' value='1' <if test="fbSyncStatus:|:$this->memberData['fbc_si_status'] > 0">checked='checked'</if> id='fbc_si_status' /><label for='fbc_si_status'>{$this->lang->words['fb_sync_status_in']}</label>
 					</li>
 					</if>
-					<li class='field checkbox'>
-						<input class='input_check' type='checkbox' value='1' name='fbc_s_aboutme' value='1' <if test="fbSyncAboutMe:|:$this->memberData['fbc_s_aboutme'] > 0">checked='checked'</if> id='fbc_s_aboutme' /><label for='fbc_s_aboutme'>{$this->lang->words['fb_sync_aboutme']}</label>
-					</li>
 				</ul>
 				<p class='desc'>
 					{$this->lang->words['fb_last_syncd']}
@@ -3410,10 +3028,12 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 						{$this->lang->words['fb_never']}
 					</if>
 				</p>
+				<br />
 				<p><input type='submit' class='input_submit alt' id='fbc_sync' value='{$this->lang->words['fb_sync_now']}' /></p>
 			</fieldset>
+			<br />
 			<fieldset class='row1'>
-				<h3>{$this->lang->words['fbp_title']}</h3>
+				<h3 class='ipsType_subtitle'>{$this->lang->words['fbp_title']}</h3>
 				<ul>
 					<li class='field checkbox'>
 						<img src="{$this->settings['img_url']}/<if test="pImgOA:|:$perms['offline_access']">accept.png<else />cross.png</if>" style='vertical-align:top' alt='' />&nbsp;{$this->lang->words['fbp_offline_access']}
@@ -3446,7 +3066,7 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 					</div>
 					<br />
 				</if>
-				<h3>{$this->lang->words['fb_disassociate']}</h3>
+				<h3 class='ipsType_subtitle'>{$this->lang->words['fb_disassociate']}</h3>
 				<p class='desc'>{$this->lang->words['fb_disassociate_desc']}</p>
 				<if test="fbDefaultEmail:|:strstr( $this->memberData['email'], '@proxymail.facebook.com' )">
 					<div class='message'>
@@ -3456,21 +3076,22 @@ var public_avatar_url	= '{$this->settings['_original_base_url']}/public/style_av
 					</div>
 					<br />
 				</if>
+				<br />
 				<p><input type='button' class='input_submit alt' id='fbc_remove' value='{$this->lang->words['fb_disassociate_now']}' /></p>
+				<br />
 			</fieldset>
 		</div>
+		<script type="text/javascript">
+		$('fbc_remove').observe( 'click', usercp_remove );
+		function usercp_remove(){
+			window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=core&area=facebookRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
+		}
+		</script>
 	</if>
-</if>
-<script type="text/javascript">
-$('fbc_remove').observe( 'click', usercp_remove );
-function usercp_remove()
-{
-	window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=members&area=facebookRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
-}
-</script>]]></template_content>
+</if>]]></template_content>
       <template_name>membersFacebookConnect</template_name>
       <template_data>$fbuid, $fbUserData, $linkedMemberData, $perms</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3484,66 +3105,109 @@ function usercp_remove()
 	ipb.templates['autocomplete_item'] = new Template("<li id='#{id}'><img src='#{img}' alt='' width='#{img_w}' height='#{img_h}' />&nbsp;&nbsp;#{itemvalue}</li>");
 //|#^#]>
 </script>
-<fieldset class='row1'>
-	<h3 class='maintitle'>{$this->lang->words['mi5_title']}</h3>
+	<!--<h2 class='ipsType_subtitle'>{$this->lang->words['ucp_global_prefs']}</h2>-->
+	<div class='ipsPad'>
+		<input type='checkbox' name='donot_view_sigs' id='donot_view_sigs' value='1' <if test="canSee:|: ! $this->memberData['view_sigs']">checked='checked'</if> />
+		<label class='desc' for='donot_view_sigs'>{$this->lang->words['ucp_global_prefs_desc']}</label>
+	</div>
+	<br />
+	<h2 class='ipsType_subtitle'>{$this->lang->words['mi5_title']}</h2>
+	<br />
 	<table class='ipb_table' summary="{$this->lang->words['ucp_ignored_users']}">
 		<tr class='header'>
 			<th scope='col' width="30%">{$this->lang->words['mi5_name']}</th>
 			<th scope='col' width="30%">{$this->lang->words['mi5_group']}</th>
-			<th scope='col' width="10%">{$this->lang->words['mi5_posts']}</th>
-			<th scope='col' width="10%">{$this->lang->words['ucp_ignore_posts']}</th>
-			<th scope='col' width="10%">{$this->lang->words['ucp_ignore_msgs']}</th>
-			<th scope='col' width="10%">&nbsp;</th>
+			<th scope='col' class='short'>{$this->lang->words['ucp_ignore_posts']}</th>
+			<th scope='col' class='short'>{$this->lang->words['ucp_ignore_sigs']}</th>
+			<th scope='col' class='short'>{$this->lang->words['ucp_ignore_msgs']}</th>
+			<if test="hasChat:|:IPSLib::appIsInstalled('ipchat')"><th scope='col' class='short'>{$this->lang->words['ucp_ignore_chats']}</th></if>
+			<th scope='col' class='short'>&nbsp;</th>
 		</tr>
 		{parse striping="members" classes="row1,row2"}
-		<foreach loop="members:$members as $member">
-			<tr class='{parse striping="members"}'>
-				<td>
-					<img src='{$member['pp_thumb_photo']}' width='{$member['pp_thumb_width']}' height='{$member['pp_thumb_height']}' border='0' />
-					<strong><a href="{parse url="showuser={$member['member_id']}" base="public" seotitle="{$member['members_seo_name']}" template="showuser"}">{$member['members_display_name']}</a></strong>
-					<p>{$this->lang->words['m_joined']} {parse date="$member['joined']" format="joined"}</p>
-				</td>
-				<td>{$member['g_title']}</td>
-				<td>{$member['posts']}</td>
-				<td>
-					<if test="ignoreMemberTopics:|:$member['ignoreData']['ignore_topics'] == 1">
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=topics" base="public"}" title="{$this->lang->words['click_toggle']}">{$this->lang->words['yes']}</a>
-					<else />
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=topics" base="public"}" title="{$this->lang->words['click_toggle']}">{$this->lang->words['no']}</a>
+		<if test="count( $members )">
+			<foreach loop="members:$members as $member">
+				<tr class='{parse striping="members"}'>
+					<td>
+						<img src='{$member['pp_small_photo']}' class='ipsUserPhoto ipsUserPhoto_mini left' style='margin-right: 5px' />
+						<strong>{parse template="userHoverCard" group="global" params="$member"}</strong><br />
+						<span class='desc lighter'>{$this->lang->words['m_joined']} {parse date="$member['joined']" format="joined"}</span>
+					</td>
+					<td>{$member['g_title']}</td>
+					<td class='short'>
+						<if test="ignoreMemberTopics:|:$member['ignoreData']['ignore_topics'] == 1">
+							<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=topics" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:red'>{$this->lang->words['ucp_hide_disallow']}</span></a>
+						<else />
+							<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=topics" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:green'>{$this->lang->words['ucp_hide_allow']}</span></a>
+						</if>
+					</td>
+					<td class='short'>
+						<if test="ignoreGlobal:|:! $this->memberData['view_sigs']">
+							<span class='desc'>{$this->lang->words['ucp_ignore_sigs_glb']}</span>
+						<else />
+							<if test="ignoreMemberSigs:|:$member['ignoreData']['ignore_signatures'] == 1">
+								<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=signatures" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:red'>{$this->lang->words['ucp_hide_disallow']}</span></a>
+							<else />
+								<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=signatures" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:green'>{$this->lang->words['ucp_hide_allow']}</span></a>
+							</if>
+						</if>
+					</td>
+					<td class='short'>
+						<if test="ignoreMemberPms:|:$member['ignoreData']['ignore_messages'] == 1">
+							<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=messages" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:red'>{$this->lang->words['ucp_hide_disallow_msg']}</span></a>
+						<else />
+							<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=messages" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:green'>{$this->lang->words['ucp_hide_allow_msg']}</span></a>
+						</if>
+					</td>
+					<if test="hasChatRow:|:IPSLib::appIsInstalled('ipchat')">
+						<td class='short'>
+							<if test="ignoreUserchats:|:$member['ignoreData']['ignore_chats'] == 1">
+								<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=chats" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:red'>{$this->lang->words['ucp_hide_disallow_msg']}</span></a>
+							<else />
+								<a class='ipsButton_secondary' href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=chats" base="public"}" title="{$this->lang->words['click_toggle']}"><span style='color:green'>{$this->lang->words['ucp_hide_allow_msg']}</span></a>
+							</if>
+						</td>
 					</if>
-				</td>
-				<td>
-					<if test="ignoreMemberPms:|:$member['ignoreData']['ignore_messages'] == 1">
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=messages" base="public"}" title="{$this->lang->words['click_toggle']}">{$this->lang->words['yes']}</a>
-					<else />
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=toggleIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}&amp;field=messages" base="public"}" title="{$this->lang->words['click_toggle']}">{$this->lang->words['no']}</a>
-					</if>
-				</td>
-				<td><a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=removeIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}" base="public"}">{$this->lang->words['mi5_remove']}</a></td>
+					<td class='short'><a href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=removeIgnoredUser&amp;do=saveIt&amp;id={$member['member_id']}" base="public"}" class='ipsButton_secondary' class='delete_ignored'>{$this->lang->words['mi5_remove']}</a></td>
+				</tr>
+			</foreach>
+		<else />
+			<tr>
+				<td colspan='<if test="hasChatNone:|:IPSLib::appIsInstalled('ipchat')">7<else />6</if>' class='no_messages desc'>{$this->lang->words['no_ignored_users']}</td>
 			</tr>
-		</foreach>
+		</if>
 	</table>
-</fieldset>
-<fieldset class="row2">
-	<h3>{$this->lang->words['mi5_addem']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='newbox_1'>{$this->lang->words['ucp_members_name']}</label>
-			<input type="text" size='40' name="newbox_1" id="newbox_1" value='{$this->request['newbox_1']}' />
-			<ul>
-				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='ignore_messages' value='1' />
-					{$this->lang->words['ucp_ignore_pc']}
-				</li>
-				<li class='field checkbox'>
-					<input type='checkbox' class='input_check' name='ignore_topics' value='1' checked='checked' />
-					{$this->lang->words['ucp_ignore_posts']}
-				</li>
-			</ul>
-		</li>
-	</ul>
-</fieldset>
+	
+	<br />
+	<div class='row2 ipsPad'>
+		<h3 class='ipsType_subtitle' style='margin-bottom: 15px'>{$this->lang->words['mi5_addem']}</h3>
+		<input type="text" class='input_text' size='40' name="newbox_1" id="newbox_1" value="{$this->request['newbox_1']}" />
+		 &nbsp;&nbsp;<strong>{$this->lang->words['ucp_add_prefix']}</strong>&nbsp;
+		<input type='checkbox' class='input_check' name='ignore_topics' id='ignore_topics' value='1' />
+		<label class='desc' for='ignore_topics'>{$this->lang->words['ucp_ignore_posts']}</label>
+		&nbsp;&nbsp;
+		<input type='checkbox' class='input_check' name='ignore_signatures' id='ignore_signatures' value='1' />
+		<label class='desc' for='ignore_signatures'>{$this->lang->words['ucp_ignore_sigs']}</label>
+		&nbsp;&nbsp;
+		<input type='checkbox' class='input_check' name='ignore_messages' id='ignore_messages' value='1' />
+		<label class='desc' for='ignore_messages'>{$this->lang->words['ucp_ignore_pc']}</label>
+		<if test="hasChatRow:|:IPSLib::appIsInstalled('ipchat')">
+			&nbsp;&nbsp;
+			<input type='checkbox' class='input_check' name='ignore_chats' id='ignore_chats' value='1' />
+			<label class='desc' for='ignore_chats'>{$this->lang->words['ucp_ignore_chats']}</label>
+		</if>
+	</div>
+	
 <script type="text/javascript">
+	$('newbox_1').defaultize( "{$this->lang->words['ucp_members_name']}" );
+	
+	ipb.delegate.register('.delete_ignored', confirmIgnoredDelete);
+	
+	var confirmIgnoredDelete = function(e, elem){
+		if( !confirm("{$this->lang->words['ignore_del_areusure']}") ){
+			Event.stop(e);
+		}
+	};
+	
 	document.observe("dom:loaded", function(){
 		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=findnames&do=get-member-names&secure_key=' + ipb.vars['secure_hash'] + '&name=';
 		new ipb.Autocomplete( $('newbox_1'), { multibox: false, url: url, templates: { wrap: ipb.templates['autocomplete_wrap'], item: ipb.templates['autocomplete_item'] } } );
@@ -3551,202 +3215,7 @@ function usercp_remove()
 </script>]]></template_content>
       <template_name>membersIgnoredUsersForm</template_name>
       <template_data>$members</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form id="userCPForm" action="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_member&amp;do=custom" base="public"}" method="post">
-<input type="hidden" name="securekey" value="{$this->member->form_hash}" />
-<fieldset class="row1">
-	<h3>{$this->lang->words['cp_edit_user']}</h3>
-	<if test="inlineFindUserError:|:$inlineMsg">
-		<p class='message unspecific'>
-			<strong>{$this->lang->words['ipm_title']}</strong>
-			<br />
-			$inlineMsg
-		</p>
-	</if>
-	<ul>
-		<li class="field">
-			<label for='name'>{$this->lang->words['cp_find_user']}</label>
-			<input type="text" class='input_text' size="40" name="name" id='name' value="{$this->request['name']}" />
-			<input type="submit" class='input_submit' value="{$this->lang->words['cp_find_submit']}" />
-		</li>
-	</ul>
-</fieldset>
-</form>]]></template_content>
-      <template_name>membersModFindUser</template_name>
-      <template_data><![CDATA[$inlineMsg=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form id="userCPForm" action="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=mod_ipaddress&amp;do=custom" base="public"}" method="post">
-<input type="hidden" name="securekey" value="{$this->member->form_hash}" />
-<fieldset class="row1">
-	<h3>{$this->lang->words['menu_ipsearch']}</h3>
-	<if test="modIpIe:|:$inlineMsg">
-		{$inlineMsg}
-	</if>
-	<br />
-	
-	<p class='message unspecific'>
-		{$this->lang->words['ip_desc_text']}
-	</p>
-	<ul>
-		<li class='field'>
-			{$this->lang->words['ip_enter']}
-			<input type="text" size="20" maxlength="24" class='input_text' name="ip" value="{$ip}" />
-			<select name="iptool" class='input_select'>
-				<option value="resolve">{$this->lang->words['ip_resolve']}</option>
-				<option value="posts">{$this->lang->words['ip_posts']}</option>
-				<option value="members">{$this->lang->words['ip_members']}</option>
-			</select>
-			<input type="submit" class='input_submit' value="{$this->lang->words['ip_submit']}" />
-		</li>
-	</ul>
-	<p class='desc'>
-		{$this->lang->words['ip_warn_text']}
-	</p>
-</fieldset>
-</form>]]></template_content>
-      <template_name>membersModIPForm</template_name>
-      <template_data><![CDATA[$ip="", $inlineMsg='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<div class='topic_controls'>
-	{$pages}
-</div>
-<br />
-<table class='ipb_table'>
-	<tr class='header'>
-		<th style='width: 20%'>{$this->lang->words['ipm_name']}</th>
-		<th style='width: 20%'>{$this->lang->words['ipm_ip']}</th>
-		<th style='width: 10%' class='short'>{$this->lang->words['ipm_posts']}</th>
-		<th style='width: 15%' class='short'>{$this->lang->words['ipm_reg']}</th>
-		<th style='width: 15%'>{$this->lang->words['ipm_group']}</th>
-		<th style='width: 20%'>{$this->lang->words['ipm_options']}</th>
-	</tr>
-	<if test="modIPMembers:|:is_array( $members ) AND count( $members )">
-		{parse striping="members" classes="row1,row2"}
-		<foreach loop="ipMembers:$members as $id => $row">
-			<tr class='{parse striping="members"}'>
-				<td><a href="{parse url="showuser={$row['member_id']}" base="public" template="showuser" seotitle="{$row['members_seo_name']}"}">{$row['members_display_name']}</a></td>
-				<td class='altrow'>{$row['ip_address']}</td>
-				<td class='short'>{$row['posts']}</td>
-				<td class="altrow short">{$row['joined']}</td>
-				<td>{$row['groupname']}</td>
-				<td class="altrow short">
-					<a href="{parse url="app=forums&amp;module=moderate&amp;section=moderate&amp;do=editmember&amp;mid={$row['member_id']}&amp;auth_key={$this->member->form_hash}" base="public"}" title="Edit this Member">{$this->lang->words['ipm_edit']}</a>
-				</td>
-			</tr>
-		</foreach>
-	</if>
-</table>
-<br />
-<div class='topic_controls'>
-	{$pages}
-</div>]]></template_content>
-      <template_name>membersModIPFormMembers</template_name>
-      <template_data><![CDATA[$pages="",$members]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<p class='message'>
-	{$this->lang->words['ipp_found']} {$count}
-</p>
-<br />
-<div class='topic_controls'>
-	{$pageLinks}
-</div>
-<br />
-<if test="modFindMemberPosts:|:count($results)">
-	{parse striping="posts" classes="row1,row2"}
-	<foreach loop="ipPosts:$results as $result">
-		<div class='post_block ucp no_sidebar {parse striping="posts"}'>
-			<h3 class=''><a href='{parse url="showtopic={$result['topic_id']}&amp;findpost={$result['pid']}" template="showtopic" seotitle="{$result['seo_title']}" base="public"}' title='View post'>{$result['members_display_name']} | {parse date="$result['post_date']" format="long"}</a></h3>
-			<div class='post_body'>
-				<div class='post'>{$result['post']}</div>
-			</div>
-		</div>
-		<hr />
-	</foreach>
-</if>
-<br />
-<div class='topic_controls'>
-	{$pageLinks}
-</div>]]></template_content>
-      <template_name>membersModIPFormPosts</template_name>
-      <template_data><![CDATA[$count=0, $pageLinks='', $results]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
-	<h3>{$this->lang->words['pph_title']}</h3>
-	<p class='message unspecific'>
-		{$this->lang->words['pph_desc']}
-		<br />{$this->lang->words['pph_max']}
-	</p>
-</fieldset>
-<if test="hasPhoto:|:$this->memberData['_has_photo']">
-	<fieldset class='row2'>
-		<h3>{$this->lang->words['pph_current']}</h3>
-		<div align='center'>
-			<p>{$cur_photo}<br />{$show_size}</p>
-			<p><a href='{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=removephoto&amp;do=remove&amp;secure_key={$this->member->form_hash}" base="public"}'>{$this->lang->words['ucp_remove_photo']}</a></p>			
-		</div>		
-	</fieldset>
-</if>
-<fieldset class='row1'>
-	<h3>{$this->lang->words['pph_change']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='upload_photo'>{$this->lang->words['pph_upload']}</label>
-			<input type="file" name="upload_photo" id='upload_photo' value="" size="40" />
-			<if test="noResizePhoto:|:! $this->settings['disable_ipbsize']">
-				<p><strong>{$this->lang->words['pph_autosize']}</strong><br />({$this->lang->words['pph_as_desc']})</p>
-			<else />
-				<ul>
-					<li class='field'>
-						{$this->lang->words['width']}
-						<input type="text" size="3" name="man_width" />
-					</li>
-					<li class='field'>
-						{$this->lang->words['height']}
-						<input type="text" size="3" name="man_height" />
-					</li>
-				</ul>
-			</if>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>membersPhotoForm</template_name>
-      <template_data><![CDATA[$cur_photo="",$show_size=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -3755,236 +3224,328 @@ function usercp_remove()
     <template>
       <template_group>skin_ucp</template_group>
       <template_content><![CDATA[<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/colorpicker/jscolor.js'></script>
-<style type="text/css">
-.desc {
-	padding-top:4px;
-	padding-bottom: 4px;
-}
-</style>
-<fieldset class='row1'>
-	<if test="$input['_preview']">
-		<h3>{$this->lang->words['ucp_cust_bg_preview']}</h3>
-		<div style="padding:25px;text-align:center; margin-left: auto; margin-right:auto">
-			<div style='width:98%; height: 150px; background-image:url("{$input['_preview']}");<if test="!$options['bg_tile']">background-repeat:no-repeat</if>'>&nbsp;</div>
-			<div class='left' style='margin-top:10px'>
-				<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=customize&amp;do=save&amp;secure_hash={$this->member->form_hash}&amp;kill_img=1" base="public"}" class="input_submit alt">{$this->lang->words['ucp_cust_remove_imgs']}</a>
-			</div>
-		</div>
-		<br clear='both'>
-	</if>
-	<h3>{$this->lang->words['ucp_cust_bg']}</h3>
-	<p class='message unspecific'>
-		{$this->lang->words['ucp_customize_msg']}
-		<br /><a href='{parse url="showuser={$this->memberData['member_id']}" seotitle="{$this->memberData['members_seo_name']}" template="showuser" base="public"}'>{$this->lang->words['pp_view_profile']}</a>
-	</p>
-	<ul>
-	<if test="$this->memberData['gbw_allow_url_bgimage'] OR $this->memberData['gbw_allow_upload_bgimage']">
-		<if test="$this->memberData['gbw_allow_url_bgimage']">
-			<li class='field' style='padding-bottom:5px'>
-				<label for='bg_img'>{$this->lang->words['ucp_cust_bg_image']}: {$this->lang->words['ucp_cust_bg_image_img']}<p class='desc'>{$this->lang->words['ucp_cust_bg_image_img_d']}</p></label>
-				<input type="text" name="bg_url" id='bg_url' class='input_text' size='70' value="{$input['bg_url']}" />
-			</li>
-		</if>
-		<if test="$this->memberData['gbw_allow_upload_bgimage']">
-			<li class='field' style='padding-bottom:5px'>
-				<label for='bg_img'>
-					<if test="inner:|:$this->memberData['gbw_allow_url_bgimage']">
-						<strong><em>-{$this->lang->words['or']}-</em></strong>
-					</if>
-					{$this->lang->words['ucp_cust_bg_image_upl']}<p class='desc'>{parse expression="sprintf($this->lang->words['ucp_cust_bg_image_upl_d'], intval($this->memberData['g_max_bgimg_upload']) ? intval($this->memberData['g_max_bgimg_upload']) : $this->lang->words['pf__unlimited'] )"}</p>
-				</label>
-				<input type="file" name="bg_upload" id='bg_upload' value="" size="70" />
-			</li>
-		</if>
-		<li class='field' style='padding-bottom:5px'>
-			<label for='bg_tile'><input type="checkbox" name="bg_tile" id='bg_tile' class='input_check' value="1" <if test="$input['bg_tile']">checked='checked'</if>/> {$this->lang->words['ucp_cust_bg_tile']}<p class='desc'>{$this->lang->words['ucp_cust_bg_tile_d']}</p></label>
-		</li>
-	</if>
-	<li class='field'>
-		<label for='bg_color'>{$this->lang->words['ucp_cust_bg_color']} </label><p class="desc">{$this->lang->words['ucp_cust_bg_color_d']}</p>
-		<input type="text" name="bg_color" id='bg_color' class='color {required:false}' value="{$input['bg_color']}" />
-	</li> 
-	</ul>
-	<br />
-	<h3>{$this->lang->words['ucp_cust_remove_t']}</h3>
-	<ul>
-		<li class='field' style='padding-bottom:5px'>
-			<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=customize&amp;do=save&amp;secure_hash={$this->member->form_hash}&amp;bg_nix=1" base="public"}" class="input_submit">{$this->lang->words['ucp_cust_remove']}</a>
-		</li>
-	</ul>
-</fieldset>]]></template_content>
-      <template_name>membersProfileCustomize</template_name>
-      <template_data>$options, $input, $errors</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['ucp_comments']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input class='input_check' type='checkbox' value='1' name='pp_setting_count_comments' value='1' <if test="showComments:|:$this->memberData['pp_setting_count_comments'] > 0">checked='checked'</if> id='comments_enable' /><label for='comments_enable'>{$this->lang->words['ucp_enable_comments']}</label>
-		</li>
-		<li class='field'>
-			<label for='comments_moderate'>{$this->lang->words['ucp_comment_approval']}</label>
-			<select name='pp_setting_moderate_comments' id='comments_moderate' class='input_select'>
-				<option value='0'<if test="noModComments:|:! $this->memberData['pp_setting_moderate_comments']"> selected="selected"</if>>{$this->lang->words['op_dd_disabled']}</option>
-				<option value='1'<if test="yesModComments:|:$this->memberData['pp_setting_moderate_comments']"> selected="selected"</if>>{$this->lang->words['op_dd_enabled']}</option>
-			</select>
-			<br />
-			<span class='desc'>{$this->lang->words['m_choose_cmod_type']}</span>
-		</li>
-	</ul>
-</fieldset>
-<if test="friendsEnabled:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['ucp_friends']}</h3>
-		<ul>
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='pp_setting_count_friends' value='1' <if test="showFriends:|:$this->memberData['pp_setting_count_friends'] > 0">checked='checked'</if> id='friends_enable' /><label for='friends_enable'>{$this->lang->words['ucp_show_friends_profile']}</label>
-			</li>
-			<li class='field'>
-				<label for='friend_moderate'>{$this->lang->words['ucp_friend_approve']}</label>
-				<select name='pp_setting_moderate_friends' id='friend_moderate' class='input_select'>
-					<option value='0'<if test="noModFriends:|:! $this->memberData['pp_setting_moderate_friends']"> selected="selected"</if>>{$this->lang->words['op_dd_disabled']}</option>
-					<option value='1'<if test="yesModFriends:|:$this->memberData['pp_setting_moderate_friends']"> selected="selected"</if>>{$this->lang->words['op_dd_enabled']}</option>
-				</select>
-				<br />
-				<span class='desc'>{$this->lang->words['m_choose_fmod_type']}</span>
-			</li>
-		</ul>
-	</fieldset>
-</if>
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['profile_information']}</h3>
-	<ul>
-		<li class='field'>
-			<label for='pp_latest_visitors'>{$this->lang->words['ucp_show_x_latest']}</label>
-			<select name='pp_setting_count_visitors' id='pp_latest_visitors' class='input_select'>
-				<option value='0'<if test="noVisitors:|:!$this->memberData['pp_setting_count_visitors']"> selected</if>>0</option>
-				<option value='3'<if test="3Visitors:|:$this->memberData['pp_setting_count_visitors'] == 3"> selected</if>>3</option>
-				<option value='5'<if test="5Visitors:|:$this->memberData['pp_setting_count_visitors'] == 5"> selected</if>>5</option>
-				<option value='10'<if test="10Visitors:|:$this->memberData['pp_setting_count_visitors'] == 10"> selected</if>>10</option>
-			</select>
-		</li>
-		<if test="changeMemberTitle:|:($this->settings['post_titlechange']) && ($this->memberData['posts'] > $this->settings['post_titlechange'])">
-			<li class='field'>
-				<label for='member_title'>{$this->lang->words['member_title']}</label>
-				<input type='text' class='input_text' size='30' id='member_title' name='member_title' value='{$this->memberData['title']}' />
-				<br />
-				<span class='desc'>{$this->lang->words['member_title_desc']}</span>
-			</li>
-		</if>
-		<if test="birthdayFields:|:$day AND $mon AND $year">
-			<li class='field'>
-				<label for='birthday'>{$this->lang->words['ucp_birthday_select']}</label>
-				<select name="month">&nbsp;
-					<foreach loop="months:$mon as $m">
-						<option value='{$m[0]}'<if test="monthSelected:|:$m[0] == $this->memberData['bday_month']"> selected="selected"</if>>{$m[1]}</option>
-					</foreach>
-				</select>			
-				<select name="day">&nbsp;
-					<foreach loop="days:$day as $d">
-						<option value='{$d[0]}'<if test="daySelected:|:$d[0] == $this->memberData['bday_day']"> selected="selected"</if>>{$d[1]}</option>
-					</foreach>
-				</select> 
-				<select name="year">&nbsp;
-					<foreach loop="years:$year as $y">
-						<option value='{$y[0]}'<if test="yearSelected:|:$y[0] == $this->memberData['bday_year']"> selected="selected"</if>>{$y[1]}</option>
-					</foreach>
-				</select> <br />
-				<span class='desc'>{$this->lang->words['ucp_birthday_optional']}</span>
-			</li>
-		</if>
-	</ul>
-</fieldset>
-
-<if test="requiredCfields:|:$required_output">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['ucp_required_info']}</h3>
-		<ul>
-			{$required_output}
-		</ul>
-	</fieldset>
-</if>
-<if test="optionalCfields:|:$optional_output">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['ucp_other_info']}</h3>
-		<ul>
-			{$optional_output}
-		</ul>
-	</fieldset>
-</if>]]></template_content>
-      <template_name>membersProfileForm</template_name>
-      <template_data><![CDATA[$required_output='',$optional_output='',$day='',$mon='',$year='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<input type='hidden' name='key' value='{$key}' />
-<input type='hidden' name='removeattachid' value='0' />
-{parse striping="usercp" classes="row1,row2"}
-<if test="$preview_sig">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['cp_current_sig']}</h3>
-		<div class='signature'>
-			{$preview_sig}
+<h3 class='ipsType_subtitle ipsSettings_pagetitle'>{$this->lang->words['ucp_cust_bg']}</h3>
+<p class='ipsType_pagedesc'>{$this->lang->words['ucp_customize_msg']}</p>
+<br />
+<if test="$input['_preview']">
+	<fieldset class='ipsSettings_section'>
+		<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_cust_bg_preview']}</h3>
+		<div>
+			<div style='width:98%; height: 100px; background-image:url("{$input['_preview']}");<if test="!$options['bg_tile']">background-repeat:no-repeat</if>'>&nbsp;</div>
 		</div>
 	</fieldset>
 </if>
-<fieldset class='{parse striping="usercp"}'>
-	<h3>{$this->lang->words['cp_edit_sig']}</h3>
+<fieldset class='ipsSettings_section'>
+	<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_cust_remove_t']}</h3>
 	<div>
-		{$editor_html}
+		<a href="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=customize&amp;do=save&amp;secure_hash={$this->member->form_hash}&amp;bg_nix=1" base="public"}" class="ipsButton_secondary">{$this->lang->words['ucp_cust_remove']}</a>
 	</div>
 </fieldset>
-<if test="hasSignatureLimits:|:$this->memberData['g_signature_limits']">
-	<fieldset class='{parse striping="usercp"}'>
-		<h3>{$this->lang->words['sig_restrictions']}</h3>
-		<br />
-		<div class='desc'>
-			{$this->lang->words['sig_restrictions_contain']}
-			<ul class='bullets'>
-				<if test="$sig_restrictions[1] !== ''">
-					<li>{parse expression="sprintf( $this->lang->words['sig_max_imagesr'], $sig_restrictions[1] )"}</li>
-				<else />
-					<li>{$this->lang->words['sig_max_imagesr_nl']}</li>
+<if test="$this->memberData['gbw_allow_url_bgimage'] OR $this->memberData['gbw_allow_upload_bgimage']">
+	<fieldset class='ipsSettings_section'>
+		<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_cust_bg_title']}</h3>
+		<div>
+			<ul>
+				<if test="$this->memberData['gbw_allow_url_bgimage']">
+					<li>
+						<label for='bg_img' class='ipsSettings_fieldtitle'>{$this->lang->words['ucp_cust_bg_image']}</label>
+						<input type="text" name="bg_url" id='bg_url' class='input_text' size='50' value="{$input['bg_url']}" /><br />
+						<p class='desc lighter'>{$this->lang->words['ucp_cust_bg_image_img_d']}</p>
+					</li>
 				</if>
-				<if test="$sig_restrictions[2] !== '' || $sig_restrictions[3] !== ''">
-					<li>{parse expression="sprintf( $this->lang->words['sig_max_imgsize'], $sig_restrictions[2], $sig_restrictions[3] )"}</li>
-				<else />
-					<li>{$this->lang->words['sig_max_imgsize_nl']}</li>
-				</if>
-				<if test="$sig_restrictions[4] !== ''">
-					<li>{parse expression="sprintf( $this->lang->words['sig_max_urls'], $sig_restrictions[4] )"}</li>
-				<else />
-					<li>{$this->lang->words['sig_max_urls_nl']}</li>
-				</if>
-				<if test="$sig_restrictions[5] !== ''">
-					<li>{parse expression="sprintf( $this->lang->words['sig_max_lines'], $sig_restrictions[5] )"}</li>
-				<else />
-					<li>{$this->lang->words['sig_max_lines_nl']}</li>
+				<if test="$this->memberData['gbw_allow_upload_bgimage']">
+					<li>
+						<label for='bg_img' class='ipsSettings_fieldtitle'>{$this->lang->words['ucp_cust_bg_image_upl']}</label>
+						<input type="file" name="bg_upload" id='bg_upload' value="" size="70" /><br />
+						<p class='desc lighter'>{parse expression="sprintf($this->lang->words['ucp_cust_bg_image_upl_d'], intval($this->memberData['g_max_bgimg_upload']) ? intval($this->memberData['g_max_bgimg_upload']) : $this->lang->words['pf__unlimited'] )"}</p>
+					</li>
 				</if>
 			</ul>
 		</div>
 	</fieldset>
-</if>
+	<fieldset class='ipsSettings_section'>
+		<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['background_options']}</h3>
+		<div>
+			<ul>
+				<if test="$this->memberData['gbw_allow_url_bgimage'] OR $this->memberData['gbw_allow_upload_bgimage']">
+					<li>
+						<input type="checkbox" name="bg_tile" id='bg_tile' class='input_check' value="1" <if test="$input['bg_tile']">checked='checked'</if>/> &nbsp;<label for='bg_tile'>{$this->lang->words['ucp_cust_bg_tile']}</label>
+					</li>
+				</if>
+				<li>
+					<label for='bg_color' class='ipsSettings_fieldtitle'>{$this->lang->words['ucp_cust_bg_color']} </label>
+					#<input type="text" name="bg_color" id='bg_color' class='input_text color' size='10' value="{$input['bg_color']}" />
+					<p class="desc lighter">{$this->lang->words['ucp_cust_bg_color_d']}</p>
+				</li>
+			</ul>
+		</div>
+	</fieldset>
+</if>]]></template_content>
+      <template_name>membersProfileCustomize</template_name>
+      <template_data>$options, $input, $errors</template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_ucp</template_group>
+      <template_content><![CDATA[<php>$this->hasOpenID = false;</php>
+<foreach loop="loginmethods:$this->cache->getCache('login_methods') as $method">
+	<if test="hasOpenid:|:$method['login_folder_name'] == 'openid'">
+		<if test="setHasOpenid:|:$this->hasOpenID = true"></if>
+	</if>
+</foreach>
+<h2 class='ipsType_subtitle ipsSettings_pagetitle'>{$this->lang->words['general_account_settings']}</h2>
+<div class='ipsSettings'>
+	<if test="weDoHaveOpenid:|:$this->hasOpenID">
+		<fieldset class='ipsSettings_section'>
+			<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['identity_url_h3']}</h3>
+			<div>
+				<ul>
+					<li>
+						<label for='identity_url' class='ipsSettings_fieldtitle'>{$this->lang->words['identity_url']}</label><input class='input_text' size='30' type="text" name="identity_url" id="identity_url" value="{$this->memberData['identity_url']}" /> <br />
+						<span class='desc lighter'>{$this->lang->words['identity_url_desc']}</span>
+					</li>
+				</ul>
+			</div>
+		</fieldset>
+	</if>
+	<if test="canUploadPhoto:|:IPSMember::canUploadPhoto( $this->memberData )">
+		<fieldset class='ipsSettings_section'>
+			<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_photo_title']}</h3>
+			<div>
+				<a data-clicklaunch="launchPhotoEditor" href="{parse url="app=members&amp;module=profile&amp;section=photo" base="public"}" class='ipsButton_secondary'>{$this->lang->words['ucp_photo_change']}</a>
+			</div>
+		</fieldset>
+	</if>
+	
+	<fieldset class='ipsSettings_section'>
+		<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['settings_time']}</h3>
+		<div>
+			<ul class='ipsForm ipsForm_horizontal'>
+				<li class='ipsField'>
+					<label for='timezone'>{$this->lang->words['ucp_timzeone']}</label>
+					<select name='timeZone' id='timezone' class='input_select'>
+					<foreach loop="timezones:$times as $off => $words">
+						<option value='{$off}' <if test="isOurTimezone:|:$off == $this->memberData['time_offset']"> selected="selected"</if>>{$words}</option>
+					</foreach>
+					</select><br />
+					<span class='desc lighter'>{$this->lang->words['settings_time_txt2']} {parse date="" format="LONG" relative="false"}</span>
+				</li>
+				<if test="$this->settings['time_dst_auto_correction']">
+					<li>
+						<if test="dstError:|:$this->request['dsterror'] == 1">
+							{$this->lang->words['dst_error']}
+						</if>
+						<input type='checkbox' class='input_check' id='dst' name="dstCheck" onclick='toggle_dst()' value="1"<if test="doAutoDst:|:$this->memberData['members_auto_dst']"> checked="checked"</if>/> &nbsp;<label for='dst'>{$this->lang->words['dst_correction_title']}</label>
+					</li>
+					<li id='dst-manual'>
+						<input type='checkbox' class='input_check' id='dstManual' name="dstOption" value="1"<if test="doManualDst:|:$this->memberData['dst_in_use']"> checked="checked"</if>/> &nbsp;<label for='dstManual'>{$this->lang->words['ucp_dst_now']}</label>
+					</li>
+				<else />
+					<li>
+						<input type='checkbox' class='input_check' id='dstManual' name="dstOption" value="1"<if test="doManualDst:|:$this->memberData['dst_in_use']"> checked="checked"</if>/> &nbsp;<label for='dstManual'>{$this->lang->words['ucp_dst_now']}</label><br />
+						<span class='desc lighter'>{$this->lang->words['ucp_dst_effect']}</span>
+					</li>
+				</if>
+			</ul>
+		</div>
+	</fieldset>
+
+	<fieldset class='ipsSettings_section'>
+		<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_comments']}</h3>
+		<div>
+			<ul>
+				<li>
+					<input class='input_check' type='checkbox' value='1' name='pp_setting_count_comments' value='1' <if test="showComments:|:$this->memberData['pp_setting_count_comments'] > 0">checked='checked'</if> id='comments_enable' /> &nbsp;<label for='comments_enable'>{$this->lang->words['ucp_enable_comments']}</label>
+				</li>
+				<!-- proposing removal -->
+				<li id='approve_comments'>
+					<input class='input_check' type='checkbox' value='1'  name='pp_setting_moderate_comments' id='pp_setting_moderate_comments' <if test="yesModComments:|:$this->memberData['pp_setting_moderate_comments']">checked="checked"</if> /> &nbsp;<label for='pp_setting_moderate_comments'>{$this->lang->words['op_dd_enabled']}</label>
+				</li>
+				<li>
+					<input class='input_check' type='checkbox' value='1' name='pp_setting_count_visitors' value='1' <if test="showLastVisitors:|:$this->memberData['pp_setting_count_visitors'] > 0">checked='checked'</if> id='pp_latest_visitors' /> &nbsp;<label for='pp_latest_visitors'>{$this->lang->words['ucp_show_x_latest']}</label>
+				</li>
+			</ul>
+		</div>
+	</fieldset>
+	<if test="friendsEnabled:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
+		<fieldset class='ipsSettings_section'>
+			<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['ucp_friends']}</h3>
+			<div>
+				<ul>
+					<li>
+						<input class='input_check' type='checkbox' value='1' name='pp_setting_count_friends' value='1' <if test="showFriends:|:$this->memberData['pp_setting_count_friends'] > 0">checked='checked'</if> id='friends_enable' /> &nbsp;<label for='friends_enable'>{$this->lang->words['ucp_show_friends_profile']}</label>
+					</li>
+					<li>
+						<input class='input_check' type='checkbox' value='1' name='pp_setting_moderate_friends' id='pp_setting_moderate_friends' <if test="yesModFriends:|:$this->memberData['pp_setting_moderate_friends']">checked="checked"</if> /> &nbsp;<label for='pp_setting_moderate_friends'>{$this->lang->words['ucp_friend_approve']}</label>
+					</li>
+				</ul>
+			</div>
+		</fieldset>
+	</if>
+	<if test="showProfileInfo:|:($day && $mon && $year) || ($this->settings['post_titlechange'] && ($this->memberData['posts'] >= $this->settings['post_titlechange']))">
+		<fieldset class='ipsSettings_section'>
+			<h3 class='ipsSettings_sectiontitle'>{$this->lang->words['profile_information']}</h3>
+			<div>
+				<ul>
+					<li><a href='#' class='ipsButton_secondary' id='edit_aboutme'>{$this->lang->words['edit_my_about_me']}</a></li>
+				</ul>
+				<if test="changeMemberTitle:|:$this->settings['post_titlechange'] && ($this->memberData['posts'] >= $this->settings['post_titlechange'])">
+					<br />
+					<ul>
+						<li>
+							<label for='member_title' class='ipsSettings_fieldtitle'>{$this->lang->words['member_title']}</label>
+							<input type='text' class='input_text' size='40' id='member_title' name='member_title' value='{$this->memberData['title']}' />
+							<br />
+							<span class='desc'>{$this->lang->words['member_title_desc']}</span>
+						</li>
+					</ul>
+				</if>
+				<if test="birthdayFields:|:$day AND $mon AND $year">
+					<br />
+					<ul>
+						<li>
+							<label for='birthday' class='ipsSettings_fieldtitle'>{$this->lang->words['ucp_birthday_select']}</label>
+							<select name="month">&nbsp;
+								<foreach loop="months:$mon as $m">
+									<option value='{$m[0]}'<if test="monthSelected:|:$m[0] == $this->memberData['bday_month']"> selected="selected"</if>>{$m[1]}</option>
+								</foreach>
+							</select>			
+							<select name="day">&nbsp;
+								<foreach loop="days:$day as $d">
+									<option value='{$d[0]}'<if test="daySelected:|:$d[0] == $this->memberData['bday_day']"> selected="selected"</if>>{$d[1]}</option>
+								</foreach>
+							</select> 
+							<select name="year">&nbsp;
+								<foreach loop="years:$year as $y">
+									<option value='{$y[0]}'<if test="yearSelected:|:$y[0] == $this->memberData['bday_year']"> selected="selected"</if>>{$y[1]}</option>
+								</foreach>
+							</select> <br />
+							<span class='desc'>{$this->lang->words['ucp_birthday_optional']}</span>
+						</li>
+					</ul>
+				</if>
+			</div>
+		</fieldset>
+	</if>
+	
+	<if test="count( $custom_fields )">
+		<foreach loop="$custom_fields as $cgroup => $cfields">
+			<if test="count( $cfields )">
+				<fieldset class='ipsSettings_section'>
+					<h3 class='ipsSettings_sectiontitle'>{$group_titles[ $cgroup ]}</h3>
+					<div>
+						<ul>
+							<foreach loop="$cfields as $fid => $cfield">
+								{$cfield['field']}
+							</foreach>
+						</ul>
+					</div>
+				</fieldset>
+			</if>
+		</foreach>
+	</if>
+	
+	<div id='aboutme_editor' style='display: none'>
+		<h3>{$this->lang->words['cp_edit_aboutme']}</h3>
+		<div>
+			{$amEditor}
+		</div>
+		<div class='ipsForm_submit' style='margin-top: 0;'>
+			<a href='#' id='close_aboutme_editor' class='ipsButton'>{$this->lang->words['finish_aboutme_edit']}</a>
+		</div>
+	</div>
+	<if test="requiredCfields:|:$required_output">
+		<fieldset class='{parse striping="usercp"}'>
+			<h3>{$this->lang->words['ucp_required_info']}</h3>
+			<ul>
+				{$required_output}
+			</ul>
+		</fieldset>
+	</if>
+	<if test="optionalCfields:|:$optional_output">
+		<fieldset class='{parse striping="usercp"}'>
+			<h3>{$this->lang->words['ucp_other_info']}</h3>
+			<ul>
+				{$optional_output}
+			</ul>
+		</fieldset>
+	</if>
+</div>
+<script type="text/javascript">
+//<!#^#|CDATA|
+function toggle_dst()
+{
+	if ( $( 'dst' ) )
+	{
+		if ( $( 'dst' ).checked ){
+			$( 'dst-manual' ).style.display = 'none';
+		} else {
+			$( 'dst-manual' ).style.display = 'block';
+		}
+	}
+}
+toggle_dst();
+//|#^#]>
+</script>]]></template_content>
+      <template_name>membersProfileForm</template_name>
+      <template_data><![CDATA[$custom_fields='',$group_titles='',$day='',$mon='',$year='', $amEditor='', $times=array()]]></template_data>
+      <template_updated>1318864229</template_updated>
+      <template_removable>0</template_removable>
+      <template_user_added>0</template_user_added>
+      <template_user_edited>0</template_user_edited>
+      <template_master_key>root</template_master_key>
+    </template>
+    <template>
+      <template_group>skin_ucp</template_group>
+      <template_content><![CDATA[<h3 class='ipsType_subtitle'>{$this->lang->words['cp_current_sig']}</h3>
+<div class='row1'>{$signature}</div>
+<br />
+<input type='hidden' name='removeattachid' value='0' />
+{parse striping="usercp" classes="row1,row2"}
+<fieldset class='{parse striping="usercp"}'>
+	<h3 class='ipsType_subtitle'>{$this->lang->words['cp_edit_sig']}</h3>
+	<if test="hasSignatureLimits:|:$this->memberData['g_signature_limits']">
+		<div class='ipsType_pagedesc'>
+			{$this->lang->words['sig_restrictions_contain']}<br />
+			<ul class='ipsList_inline' style='display: inline'>
+				<if test="$sig_restrictions[1] !== ''">
+					<li>&bull; {parse expression="sprintf( $this->lang->words['sig_max_imagesr'], $sig_restrictions[1] )"}</li>
+				<else />
+					<li>&bull; {$this->lang->words['sig_max_imagesr_nl']}</li>
+				</if>
+				<if test="$sig_restrictions[2] !== '' || $sig_restrictions[3] !== ''">
+					<li>&bull; {parse expression="sprintf( $this->lang->words['sig_max_imgsize'], $sig_restrictions[2], $sig_restrictions[3] )"}</li>
+				<else />
+					<li>&bull; {$this->lang->words['sig_max_imgsize_nl']}</li>
+				</if>
+				<if test="$sig_restrictions[4] !== ''">
+					<li>&bull; {parse expression="sprintf( $this->lang->words['sig_max_urls'], $sig_restrictions[4] )"}</li>
+				<else />
+					<li>&bull; {$this->lang->words['sig_max_urls_nl']}</li>
+				</if>
+				<if test="$sig_restrictions[5] !== ''">
+					<li>&bull; {parse expression="sprintf( $this->lang->words['sig_max_lines'], $sig_restrictions[5] )"}</li>
+				<else />
+					<li>&bull; {$this->lang->words['sig_max_lines_nl']}</li>
+				</if>
+			</ul>
+		</div><br />
+	</if>
+	<div>
+		{$editor_html}
+	</div>
+</fieldset>
 <if test="disablelightbox:|:!$this->settings['disable_lightbox']">
 {parse template="include_lightbox" group="global" params=""}
 </if>
 {parse template="include_highlighter" group="global" params="1"}]]></template_content>
       <template_name>membersSignatureForm</template_name>
-      <template_data><![CDATA[$preview_sig="",$editor_html="",$sig_restrictions=array()]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_data><![CDATA[$editor_html="",$sig_restrictions=array(),$signature='']]></template_data>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4001,7 +3562,7 @@ function usercp_remove()
 </fieldset>]]></template_content>
       <template_name>membersSignatureFormError</template_name>
       <template_data>$form</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4009,11 +3570,10 @@ function usercp_remove()
     </template>
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[{parse js_module="twitter"}
-{parse striping="usercp" classes="row1,row2"}
+      <template_content><![CDATA[{parse striping="usercp" classes="row1,row2"}
 <if test="! $isConnected">
 <div>
-	{$this->lang->words['twitter_config']}
+	<p class='message'>{$this->lang->words['twitter_config']}</p>
 	<br />
 	<br />
 	<a href="{$this->settings['_original_base_url']}/interface/twitter/index.php"><img src="{$this->settings['img_url']}/twitter_connect.png" alt="" /></a>
@@ -4021,76 +3581,118 @@ function usercp_remove()
 </div>
 <else />
 <div>
-	<fieldset class='row2'>
-		<if test="tcHasPic:|:$twitterUser['profile_image_url']">
-		<div style='float:left; margin-right:4px;margin-bottom:3px'>
-			<img src="{$twitterUser['profile_image_url']}" alt='' />
-		</div>
+	<div class='ipsPad row2 clearfix'>
+		<if test="tcHasPic:|:$twitterUser['profile_image_url']">	
+			<img src="{$twitterUser['profile_image_url']}" alt='' class='left ipsUserPhoto ipsUserPhoto_medium' />
+			<div class='ipsBox_withphoto'>
 		</if>
-		{$this->lang->words['tc_logged_in_as']} <strong>{$twitterUser['screen_name']}</strong> ({$twitterUser['name']})
+		<h2 class='ipsType_subtitle'>
+			{$this->lang->words['tc_logged_in_as']} <strong>{$twitterUser['screen_name']}</strong> ({$twitterUser['name']})
+		</h2>
 		<if test="tcShowStatus:|:is_array($twitterUser['status']) AND $twitterUser['status']['text']">
-			<br /><br /><p class='desc'>{$twitterUser['status']['text']}</p>
+			<p class='desc'>{$twitterUser['status']['text']}</p>
 		</if>
-	</fieldset>
-	<fieldset class='row1'>
-		<h3>{$this->lang->words['tc_sync_options']}</h3>
-		<p class='desc'>{$this->lang->words['tc_sync_options_desc']}</p>
-		<ul>
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='tc_s_pic' value='1' <if test="tcSyncPic:|:$this->memberData['tc_s_pic'] > 0">checked='checked'</if> id='tc_s_pic' /><label for='tc_s_pic'>{$this->lang->words['tc_sync_photo']}</label>
-			</li>
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='tc_s_avatar' value='1' <if test="tcSyncAvatar:|:$this->memberData['tc_s_avatar'] > 0">checked='checked'</if> id='tc_s_avatar' /><label for='tc_s_avatar'>{$this->lang->words['tc_sync_avatar']}<if test="$this->memberData['fb_uid']"><br /><span class='desc' style='margin-left:-5px'>{$this->lang->words['twitter_av_warning']}</span></if></label>
-			</li>
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='tc_s_status' value='1' <if test="tcSyncStatus:|:$this->memberData['tc_s_status'] > 0">checked='checked'</if> id='tc_s_status' /><label for='tc_s_status'>{$this->lang->words['tc_sync_status_out']}</label>
-			</li>
-			<if test="statusImportGroup:|: ! $this->memberData['gbw_no_status_import']">
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='tc_si_status' value='1' <if test="tcSyncIStatus:|:$this->memberData['tc_si_status'] > 0">checked='checked'</if> id='tc_si_status' /><label for='tc_si_status'>{$this->lang->words['tc_sync_status_in']}</label>
-			</li>
-			</if>
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' value='1' name='tc_s_aboutme' value='1' <if test="tcSyncAboutMe:|:$this->memberData['tc_s_aboutme'] > 0">checked='checked'</if> id='tc_s_aboutme' /><label for='tc_s_aboutme'>{$this->lang->words['tc_sync_aboutme']}</label>
-			</li>
-			<if test="canBG:|:$this->memberData['gbw_allow_customization'] AND ! $this->memberData['bw_disable_customization']">
-				<li class='field checkbox'>
-					<input class='input_check' type='checkbox' value='1' name='tc_s_bgimg' value='1' <if test="tcSyncBgImg:|:$this->memberData['tc_s_bgimg'] > 0">checked='checked'</if> id='tc_s_bgimg' /><label for='tc_s_bgimg'>{$this->lang->words['tc_sync_bgimg']}</label>
-				</li>
-			</if>
-		</ul>
-		<p class='desc'>
+		<if test="tcHasPic:|:$twitterUser['profile_image_url']">
+			</div>
+		</if>
+	</div>
+	
+	<br />
+	<div class='right row2 ipsPad clearfix' style='width: 250px'>
+		<span class='ipsType_smaller'>
 			{$this->lang->words['tc_last_syncd']}
 			<if test="tcLastSync:|:$this->memberData['tc_lastsync']">
 				{parse date="$this->memberData['tc_lastsync']" format="long"}
 			<else />
 				{$this->lang->words['fb_never']}
 			</if>
-		</p>
-		<p><input type='submit' class='input_submit alt' id='tc_sync' value='{$this->lang->words['fb_sync_now']}' /></p>
-	</fieldset>
-	<fieldset class='row1'>
-		<if test="twitterPassword:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
-			<div class='message'>
-				<strong>{$this->lang->words['remote_no_password']}</strong>
-				<p>{$this->lang->words['remote_no_password_1']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=password" base="public"}'>{$this->lang->words['remote_no_password_2']}</a>
-				</p>
+		</span>
+		<br /><br />
+		<input type='submit' class='ipsButton_secondary' id='tc_sync' value='{$this->lang->words['fb_sync_now']}' />
+		<br /><br />
+		<input type='button' class='ipsButton_secondary' id='tc_remove_start' value='{$this->lang->words['tc_disassociate']}' />
+		
+		<div id='tc_remove_popup' style='display: none'>
+			<h3>{$this->lang->words['tc_disassociate']}</h3>
+			<div class='ipsPad'>
+				<p>{$this->lang->words['twitter_revoke']}</p>
+				<p class='desc'>{$this->lang->words['tc_disassociate_desc']}</p>
+				<br />
+				<input type='button' class='ipsButton' id='tc_remove' value='{$this->lang->words['tc_disassociate_now']}' />
 			</div>
-			<br />
-		</if>
-		<h3>{$this->lang->words['tc_disassociate']}</h3>
-		<p>{$this->lang->words['twitter_revoke']}</p>
-		<p class='desc'>{$this->lang->words['tc_disassociate_desc']}</p>
-		<p><input type='button' class='input_submit alt' id='tc_remove' value='{$this->lang->words['tc_disassociate_now']}' /></p>
-	</fieldset>
+		</div>
+	</div>
+	<div>
+		<h2 class='ipsType_subtitle'>{$this->lang->words['tc_sync_options']}</h2>
+		<p class='desc'>{$this->lang->words['tc_sync_options_desc']}</p>
+		<ul class='ipsForm ipsForm_vertical ipsPad'>
+			<li class='ipsField ipsField_checkbox'>
+				<input class='input_check' type='checkbox' value='1' name='tc_s_pic' value='1' <if test="tcSyncPic:|:$this->memberData['tc_s_pic'] > 0">checked='checked'</if> id='tc_s_pic' />
+				<p class='ipsField_content'>
+					<label for='tc_s_pic'>{$this->lang->words['tc_sync_photo']}</label><br />
+					<span class='desc lighter'>{$this->lang->words['tc_sync_photo_info']}</span>
+				</p>
+			</li>
+			<li class='ipsField ipsField_checkbox'>
+				<input class='input_check' type='checkbox' value='1' name='tc_s_status' value='1' <if test="tcSyncStatus:|:$this->memberData['tc_s_status'] > 0">checked='checked'</if> id='tc_s_status' />
+				<p class='ipsField_content'>
+					<label for='tc_s_status'>{$this->lang->words['tc_sync_status_out']}</label>
+				</p>
+			</li>
+			<if test="statusImportGroup:|: ! $this->memberData['gbw_no_status_import']">
+			<li class='ipsField ipsField_checkbox'>
+				<input class='input_check' type='checkbox' value='1' name='tc_si_status' value='1' <if test="tcSyncIStatus:|:$this->memberData['tc_si_status'] > 0">checked='checked'</if> id='tc_si_status' />
+				<p class='ipsField_content'>
+					<label for='tc_si_status'>{$this->lang->words['tc_sync_status_in']}</label>
+				</p>
+			</li>
+			</if>
+			<li class='ipsField ipsField_checkbox'>
+				<input class='input_check' type='checkbox' value='1' name='tc_s_aboutme' value='1' <if test="tcSyncAboutMe:|:$this->memberData['tc_s_aboutme'] > 0">checked='checked'</if> id='tc_s_aboutme' />
+				<p class='ipsField_content'>
+					<label for='tc_s_aboutme'>{$this->lang->words['tc_sync_aboutme']}</label>
+				</p>
+			</li>
+			<if test="canBG:|:$this->memberData['gbw_allow_customization'] AND ! $this->memberData['bw_disable_customization']">
+				<li class='ipsField ipsField_checkbox'>
+					<input class='input_check' type='checkbox' value='1' name='tc_s_bgimg' value='1' <if test="tcSyncBgImg:|:$this->memberData['tc_s_bgimg'] > 0">checked='checked'</if> id='tc_s_bgimg' />
+					<p class='ipsField_content'>
+						<label for='tc_s_bgimg'>{$this->lang->words['tc_sync_bgimg']}</label>
+					</p>
+				</li>
+			</if>
+		</ul>
+	</div>
+	
+	<if test="twitterPassword:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
+		<div class='message'>
+			<strong>{$this->lang->words['remote_no_password']}</strong>
+			<p>{$this->lang->words['remote_no_password_1']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=password" base="public"}'>{$this->lang->words['remote_no_password_2']}</a>
+			</p>
+		</div>
+		<br />
+	</if>
+	
 </div>
-</if>
 <script type="text/javascript">
-ipb.twitter.initUserCP();
-</script>]]></template_content>
+	$('tc_remove').observe( 'click', usercp_remove );
+	function usercp_remove(){
+		window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=core&area=twitterRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
+	}
+	
+	$('tc_remove_start').on('click', function(e){
+		new ipb.Popup( 'sign_in_popup', {	type: 'pane',
+											initial: $('tc_remove_popup').show(),
+											hideAtStart: false,
+											hideClose: false,
+											modal: true,
+											w: '600px' } );
+	});
+</script>
+</if>]]></template_content>
       <template_name>membersTwitterConnect</template_name>
       <template_data>$isConnected, $twitterUser=array()</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4098,201 +3700,21 @@ ipb.twitter.initUserCP();
     </template>
     <template>
       <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modSaveAnnouncement&amp;do=saveIt&amp;announce_id={$announce['announce_id']}&amp;type={$type}" base="public"}" method="post" name="REPLIER" id='postingform' onsubmit='return ValidateForm()'>
+      <template_content><![CDATA[<h3 class='ipsType_subtitle'>{$this->lang->words['board_prefs']}</h3>
 <fieldset class='row1'>
-	<h3>{$button}</h3>
-	<if test="announceMessage:|:$msg != """>
-		<br /><p class='message unspecific'>{$msg}</p>
-	</if>
-	<ul>
-		<li class='field'>
-			<label for='announce_title'>{$this->lang->words['announce_form_title']}</label>
-			<input class='input_text' type="text" size="30" name="announce_title" id='announce_title' value="{$announce['announce_title']}" tabindex="1" />
-		</li>
-		<li class='field'>
-			<label for='announce_start'>{$this->lang->words['announce_form_start']}</label>
-			<span class="desc">{$this->lang->words['announce_form_startdesc']}</span>
-			<input type="text" size="10" name="announce_start" id='announce_start' value="{$announce['announce_start']}" tabindex="2" />
-		</li>
-		<li class='field'>
-			<label for='announce_end'>{$this->lang->words['announce_form_end']}</label>
-			<span class="desc">{$this->lang->words['announce_form_enddesc']}</span>
-			<input type="text" size="10" name="announce_end" id='announce_end' value="{$announce['announce_end']}" tabindex="2" />
-		</li>
-		<li class='field'>
-			<label for='announce_forum'>{$this->lang->words['announce_form_forums']}</label>
-			<span class="desc">{$this->lang->words['announce_form_forums2']}</span>
-			<select class="input_select" multiple="multiple" size="10" id='announce_forum' name="announce_forum[]" tabindex="4">{$forum_html}</select>
-		</li>
-		<li class='field'>
-			{$editor_html}
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['announce_form_options']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_active" id='announce_active' value="1" {$announce['announce_active_checked']} />
-			<label for='announce_active'>{$this->lang->words['announce_form_enable']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_html_enabled" id='announce_html_enabled' value="1" {$announce['html_checkbox']} />
-			<label for='announce_html_enabled'>{$this->lang->words['announce_use_html']}</label>
-		</li>
-		<li class='field checkbox'>
-			<input type="checkbox" class="checkbox" name="announce_nlbr_enabled" id='announce_nlbr_enabled' value="1" {$announce['nlbr_checkbox']} />
-			<label for='announce_nlbr_enabled'>{$this->lang->words['announce_use_nlbr']}</label>
-		</li>
-	</ul>
-</fieldset>
-<fieldset class='submit'>
-	<input type="submit" value="{$button}" class="input_submit alt" tabindex="7" /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=mod_announcements" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
-</fieldset>
-</form>]]></template_content>
-      <template_name>modAnnounceForm</template_name>
-      <template_data><![CDATA[$announce="",$button="",$forum_html="",$type="",$editor_html="",$msg=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modUpdateAnnouncements&amp;do=saveIt" base="public"}" id="mutliact" method="post">
-<fieldset class='row1'>
-	<h3 class='maintitle'>{$this->lang->words['announce_current']}</h3>
-	<table class='ipb_table' summary="{$this->lang->words['ucp_announcements']}">
-		<tr class='header'>
-			<th scope='col' style="width: 40%">{$this->lang->words['announce_title']}</th>
-			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_starts']}</th>
-			<th scope='col' class='short' style="width: 10%">{$this->lang->words['announce_end']}</th>
-			<th scope='col' style="width: 25%">{$this->lang->words['announce_forums']}</th>
-			<th scope='col' style="width: 15%">&nbsp;</th>
-		</tr>
-		<if test="hasAnnouncements:|:is_array( $announcements ) AND count( $announcements )">
-			{parse striping="announcements" classes="row1,row2"}
-			<foreach loop="announcements:$announcements as $announce">
-				<tr class="{parse striping="announcements"}">
-					<td>
-						<strong><a href="{parse url="showannouncement={$announce['announce_id']}&amp;f=0" base="public" template="showannouncement" seotitle="{$announce['announce_seo_title']}"}">{$announce['announce_title']}</a></strong> {$announce['announce_inactive']}<div class="desc">{$this->lang->words['announce_by']} {$announce['members_display_name']}</div>
-					</td>
-					<td class="short">
-						<if test="announceStart:|:$announce['announce_start']">
-							{parse date="$announce['announce_start']" format="DATE" relative="false"}
-						<else />
-							--
-						</if>
-					</td>
-					<td class="short">
-						<if test="announceEnd:|:$announce['announce_end']">
-							{parse date="$announce['announce_end']" format="DATE" relative="false"}
-						<else />
-							--
-						</if>
-					</td>
-					<td>
-						<div class="forumdesc">
-							<if test="announceForum:|:$announce['announce_forum'] == '*'">
-								{$this->lang->words['announce_page_allforums']}
-							<else />
-								<if test="announceHasForums:|:is_array( $announce['_forums'] ) and count( $announce['_forums'] )">
-									<if test="announceMostForums:|:count( $announce['_forums'] ) > 5">
-										{parse expression="count( $announce['_forums'] )"} {$this->lang->words['announce_page_numforums']}
-									<else />
-										<ul>
-										<foreach loop="announce_forums:$announce['_forums'] as $forum">
-											<li><a href="{parse url="showforum={$forum[0]}" base="public"}">{$forum[1]}</a></li>
-										</foreach>
-										</ul>
-									</if>
-								</if>
-							</if>
-						</div>
-					</td>
-					<td class="short">
-						<a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modEditAnnouncement&amp;do=edit&amp;announce_id={$announce['announce_id']}" base="public"}">{$this->lang->words['announce_edit']}</a>
-						&middot; <a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modDeleteAnnouncement&amp;do=edit&amp;announce_id={$announce['announce_id']}" base="public"}" id="del_{$announce['announce_id']}">{$this->lang->words['announce_delete']}</a>
-						<script type='text/javascript'>
-							$('del_{$announce['announce_id']}').observe('click', ipb.ucp.deleteAnnouncement.bindAsEventListener( this, {$announce['announce_id']} ) );
-						</script>
-					</td>
-				</tr>
-			</foreach>
-		<else />
-			<tr>
-				<td align="center" colspan="5">{$this->lang->words['announce_none']}</td>
-			</tr>
-		</if>
-	</table>
-</fieldset>
-<fieldset class='submit'>
-	<a href="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=modAddAnnouncement&amp;do=add" base="public"}" class='input_submit'>{$this->lang->words['announce_add']}</a>
-</fieldset>
-</form>]]></template_content>
-      <template_name>modAnnouncements</template_name>
-      <template_data>$announcements</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
 	<h3>{$this->lang->words['privacy_settings']}</h3>
 	<ul>
-		<li class='field checkbox'>
-			<input class='input_check' type="checkbox" name="hide_email" id="hide_email" value="1"<if test="hidingEmail:|:$this->memberData['hide_email']"> checked="checked"</if>/> <label for='hide_email'>{$this->lang->words['hide_email']}</label><br />
-			<span class='desc'>{$this->lang->words['hide_email_desc']}</span>
-		</li>
 		<li class='field checkbox'>
 			<input type='checkbox' class='input_check' id='admin_updates' name='admin_send' value='1'<if test="allowAdminMails:|:$this->memberData['allow_admin_mails']"> checked="checked"</if>/> <label for='admin_updates'>{$this->lang->words['admin_send']}</label><br />
-			<span class='desc'>{$this->lang->words['admin_send_desc']} {$time}</span>
+			<span class='desc lighter'>{$this->lang->words['admin_send_desc']} {$time}</span>
 		</li>
-		<if test="hasPm:|:$this->memberData['members_disable_pm'] != 2">
-		<li class='field checkbox'>
-			<input type='checkbox' name='disableMessenger' class='input_check' id='disable_msg' value='1'<if test="disablePm:|:$this->memberData['members_disable_pm']"> checked="checked"</if>/> <label for='disable_msg'>{$this->lang->words['ucp_op_pm']}</label><br />
-			<span class='desc'>{$this->lang->words['ucp_op_pm_desc']}</span>
-		</li>
-		</if>
-	</ul>
-</fieldset>
-<fieldset class='row2'>
-	<h3>{$this->lang->words['board_prefs']}</h3>
-	<ul>
-		<li class='field checkbox'>
-			<input type='checkbox' class='input_check' id='show_notification_popup' name='show_notification_popup' value='1' <if test="$this->memberData['_cache']['show_notification_popup']">checked='checked'</if> /> <label for='show_notification_popup' />{$this->lang->words['show_notification_popup']}</label><br />
-			<span class='desc'>{$this->lang->words['show_notification_popup_desc']}</span>
-		</li>
-		<li class='field checkbox'>
-			<input type='checkbox' class='input_check' id='send_full_msg' name='send_full_msg' value='1' {$emailData['email_full']} /> <label for='send_full_msg' />{$this->lang->words['send_full_msg']}</label><br />
-			<span class='desc'>{$this->lang->words['send_full_msg_desc']}</span>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_check' type="checkbox" id='auto_track' name="auto_track" value="1" {$emailData['auto_track']} /> <label for='auto_track' />{$this->lang->words['auto_track']}</label>
-			<ul>
-				<li class='field'>
-					<label for='track_choice'>{$this->lang->words['auto_track_type']}</label>
-					<select name="trackchoice" id='track_choice' class='input_select'>
-						<option value="none" {$emailData['trackOption']['none']}>{$this->lang->words['subs_none_title']}</option>
-						<option value="immediate" {$emailData['trackOption']['immediate']}>{$this->lang->words['subs_immediate']}</option>
-						<option value="delayed" {$emailData['trackOption']['delayed']}>{$this->lang->words['subs_delayed']}</option>
-						<option value="daily" {$emailData['trackOption']['daily']}>{$this->lang->words['subs_daily']}</option>
-						<option value="weekly" {$emailData['trackOption']['weekly']}>{$this->lang->words['subs_weekly']}</option>
-					</select>
-				</li>
-			</ul>
-		</li>	
 	</ul>
 </fieldset>
 <fieldset class='row1'>
-	<div class='message unspecific'>{$this->lang->words['notifications_info_acp']}</div>
+	<span class='desc'><strong>{$this->lang->words['notifications_info_acp']}</strong></span>
 	<php>
 		$this->notifyGroups = array(
-			'topics_posts' => array( 'new_topic', 'new_reply', 'post_quoted' ),
+			'topics_posts' => array( 'followed_topics', 'followed_forums', 'followed_topics_digest', 'followed_forums_digest', 'post_quoted', 'new_likes' ),
 			'status_updates' => array( 'reply_your_status', 'reply_any_status', 'friend_status_update' ),
 			'profiles_friends' => array( 'profile_comment', 'profile_comment_pending', 'friend_request', 'friend_request_pending', 'friend_request_approve' ),
 			'private_msgs' => array( 'new_private_message', 'reply_private_message', 'invite_private_message' )
@@ -4300,53 +3722,72 @@ ipb.twitter.initUserCP();
 		
 		$this->_config = $config;
 		
-		$this->_colCount = IPSLib::canReceiveMobileNotifications() ? 5 : 4;
+		$this->_colCount = IPSMember::canReceiveMobileNotifications() ? 4 : 3;
+		
+		$this->_lastApp	= '';
 	</php>
 	<table class='ipb_table notification_table'>
 		<tr>
 			<th>&nbsp;</th>
-			<th style='width: 15%' class='short'>{$this->lang->words['notify_type_email']}</th>
-			<if test="!$this->memberData['members_disable_pm']">
-				<th style='width: 15%' class='short'>{$this->lang->words['notify_type_pm']}</th>
-			</if>
-			<th style='width: 15%' class='short'>{$this->lang->words['notify_type_inline']}</th>
-			<if test="IPSLib::canReceiveMobileNotifications()">
-			<th style='width: 15%' class='short'>{$this->lang->words['notify_type_mobile']}</th>
+			<th style='width: 15%' class='short'><span class='notify_icon inline'>&nbsp;</span> {$this->lang->words['notify_type_inline']}</th>
+			<th style='width: 15%' class='short'><span class='notify_icon email'>&nbsp;</span> {$this->lang->words['notify_type_email']}</th>
+			<if test="IPSMember::canReceiveMobileNotifications()">
+			<th style='width: 15%' class='short'><span class='notify_icon mobile'>&nbsp;</span> {$this->lang->words['notify_type_mobile']}</th>
 			</if>
 		</tr>
 		<foreach loop="notifyGroupsList:$this->notifyGroups as $groupKey => $group">
 			<tr class='row2'>
-				<td colspan='{$this->_colCount}'><h3>{$this->lang->words[ 'notifytitle_' . $groupKey ]}</h3></td>
+				<td colspan='{$this->_colCount}'>
+					<h3>{$this->lang->words[ 'notifytitle_' . $groupKey ]}</h3>
+					<if test="isPrivateMsg:|:$groupKey == 'private_msgs'">
+						<p class='ipsPad_half checkbox ipsType_smaller desc '>
+							<input type='checkbox' class='input_check' id='show_notification_popup' name='show_notification_popup' value='1' <if test="$this->memberData['_cache']['show_notification_popup']">checked='checked'</if> /> <label for='show_notification_popup' />{$this->lang->words['show_notification_popup']}</label><br />
+						</p>
+					</if>
+					<if test="isTopicsOrPosts:|:$groupKey == 'topics_posts'">
+						<p class='ipsPad_half checkbox ipsType_smaller desc '>
+							<input class='input_check' type="checkbox" id='auto_track' name="auto_track" value="1" {$emailData['auto_track']} /> <label for='auto_track' />{$this->lang->words['auto_track']}</label>
+							<select name="trackchoice" id='track_choice' class='input_select'>
+								<option value="none" {$emailData['trackOption']['none']}>{$this->lang->words['like_notify_freq_none']}</option>
+								<option value="immediate" {$emailData['trackOption']['immediate']}>{$this->lang->words['like_notify_freq_immediate']}</option>
+								<option value="offline" {$emailData['trackOption']['offline']}>{$this->lang->words['like_notify_freq_offline']}</option>
+								<option value="daily" {$emailData['trackOption']['daily']}>{$this->lang->words['like_notify_freq_daily']}</option>
+								<option value="weekly" {$emailData['trackOption']['weekly']}>{$this->lang->words['like_notify_freq_weekly']}</option>
+							</select>
+							<if test="badConfig:|:$emailData['auto_track'] AND $emailData['trackOption']['none']">
+								<br />{$this->lang->words['auto_but_no_email']}
+							</if>
+						</p>
+					</if>
+				</td>
 			</tr>
 			<foreach loop="groupKeys:$group as $key">
 				<if test="keyExists:|:$this->_config[ $key ]">
 					<tr>
 						<td class='notify_title desc'>{$this->lang->words['notify__' . $key]}</td>
 						<td class='short'>
+							<span class='notify_icon inline' title='{$this->lang->words['notify_type_inline']}'>&nbsp;</span>
+							<if test="$groupKey == 'private_msgs'">
+								<input type='checkbox' class='input_check' name='' checked='checked' disabled='disabled' /> <span class='ipsBadge ipsBadge_lightgrey ipsType_smaller' data-tooltip='{$this->lang->words['nots_pm_whatthef']}'>{$this->lang->words['nots_pm_list']}</span>
+							<else />
+								<if test="isset( $this->_config[$key]['options']['inline'] ) && $groupKey != 'private_msgs'">
+									<input type='checkbox' class='input_check' id='inline_{$key}' name="config_{$key}[]" value="inline"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('inline',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
+								<else />
+									<input type='checkbox' class='input_check' name='' disabled='disabled' />
+								</if>
+							</if>
+						</td>
+						<td class='short'>
+							<span class='notify_icon email' title='{$this->lang->words['notify_type_email']}'>&nbsp;</span>
 							<if test="isset( $this->_config[$key]['options']['email'] )">
 								<input type='checkbox' class='input_check' id='email_{$key}' name="config_{$key}[]" value="email"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('email',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
 							<else />
 								<input type='checkbox' class='input_check' name='' disabled='disabled' />
 							</if>
 						</td>
-						<if test="!$this->memberData['members_disable_pm']">
-							<td class='short'>
-								<if test="isset( $this->_config[$key]['options']['pm'] )">
-									<input type='checkbox' class='input_check' id='pm_{$key}' name="config_{$key}[]" value="pm"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('pm',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
-								<else />
-									<input type='checkbox' class='input_check' name='' disabled='disabled' />
-								</if>
-							</td>
-						</if>
-						<td class='short'>
-							<if test="isset( $this->_config[$key]['options']['inline'] )">
-								<input type='checkbox' class='input_check' id='inline_{$key}' name="config_{$key}[]" value="inline"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('inline',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
-							<else />
-								<input type='checkbox' class='input_check' name='' disabled='disabled' />
-							</if>
-						</td>
-						<if test="IPSLib::canReceiveMobileNotifications()">
+						<if test="IPSMember::canReceiveMobileNotifications()">
 						<td class='short'>
+							<span class='notify_icon mobile' title='{$this->lang->words['notify_type_mobile']}'>&nbsp;</span>
 							<if test="isset( $this->_config[$key]['options']['mobile'] )">
 								<input type='checkbox' class='input_check' id='mobile_{$key}' name="config_{$key}[]" value="mobile"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('mobile',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
 							<else />
@@ -4359,38 +3800,37 @@ ipb.twitter.initUserCP();
 				</if>
 			</foreach>							
 		</foreach>
-		<tr class='row2'>
-			<td colspan='{$this->_colCount}'><h3>{$this->lang->words['notifytitle_other']}</h3></td>
-		</tr>
 		<foreach loop="notifyOther:$this->_config as $key => $_config">
 			<if test="keyNotDone:|:!isset( $_config['_done'] ) && $_config['_done'] != 1">
+				<if test="newNotApp:|:$this->_lastApp != $_config['app']">
+					<tr class='row2'>
+						<td colspan='{$this->_colCount}'>
+							<h3><if test="isCoreNot:|:$_config['app'] == 'core'">{$this->lang->words['notifytitle_other']}<else />{IPSLib::getAppTitle( $_config['app'] )}</if></h3>
+						</td>
+					</tr>
+					<if test="updateLastApp:|:$this->_lastApp = $_config['app']"></if>
+				</if>
 				<tr>
 					<td class='notify_title desc'>{$this->lang->words['notify__' . $_config['key'] ]}</h3></td>
 					<td class='short'>
-						<if test="isset( $_config['options']['email'] )">
-							<input type='checkbox' class='input_check' id='email_{$key}' name="config_{$key}[]" value="email"<if test="hasconfignotify:|:is_array($_config['defaults']) AND in_array('email',$_config['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$_config['disabled']"> disabled="disabled"</if> />
-						<else />
-							<input type='checkbox' class='input_check' name='' disabled='disabled' />
-						</if>
-					</td>
-					<if test="!$this->memberData['members_disable_pm']">
-						<td class='short'>
-							<if test="isset( $_config['options']['pm'] )">
-								<input type='checkbox' class='input_check' id='pm_{$key}' name="config_{$key}[]" value="pm"<if test="hasconfignotify:|:is_array($_config['defaults']) AND in_array('pm',$_config['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$_config['disabled']"> disabled="disabled"</if> />
-							<else />
-								<input type='checkbox' class='input_check' name='' disabled='disabled' />
-							</if>
-						</td>
-					</if>
-					<td class='short'>
+						<span class='notify_icon inline' title='{$this->lang->words['notify_type_inline']}'>&nbsp;</span>
 						<if test="isset( $_config['options']['inline'] )">
 							<input type='checkbox' class='input_check' id='inline_{$key}' name="config_{$key}[]" value="inline"<if test="hasconfignotify:|:is_array($_config['defaults']) AND in_array('inline',$_config['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$_config['disabled']"> disabled="disabled"</if> />
 						<else />
 							<input type='checkbox' class='input_check' name='' disabled='disabled' />
 						</if>
 					</td>
-					<if test="IPSLib::canReceiveMobileNotifications()">
 					<td class='short'>
+						<span class='notify_icon email' title='{$this->lang->words['notify_type_email']}'>&nbsp;</span>
+						<if test="isset( $_config['options']['email'] )">
+							<input type='checkbox' class='input_check' id='email_{$key}' name="config_{$key}[]" value="email"<if test="hasconfignotify:|:is_array($_config['defaults']) AND in_array('email',$_config['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$_config['disabled']"> disabled="disabled"</if> />
+						<else />
+							<input type='checkbox' class='input_check' name='' disabled='disabled' />
+						</if>
+					</td>
+					<if test="IPSMember::canReceiveMobileNotifications()">
+					<td class='short'>
+						<span class='notify_icon mobile' title='{$this->lang->words['notify_type_mobile']}'>&nbsp;</span>
 						<if test="isset( $_config['options']['mobile'] )">
 							<input type='checkbox' class='input_check' id='mobile_{$key}' name="config_{$key}[]" value="mobile"<if test="hasconfignotify:|:is_array($this->_config[$key]['defaults']) AND in_array('mobile',$this->_config[$key]['defaults'])"> checked="checked"</if> <if test="hasconfigdisable:|:$this->_config[$key]['disabled']"> disabled="disabled"</if> />
 						<else />
@@ -4405,7 +3845,7 @@ ipb.twitter.initUserCP();
 </fieldset>]]></template_content>
       <template_name>notificationsForm</template_name>
       <template_data>$config, $emailData</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4424,34 +3864,43 @@ ipb.twitter.initUserCP();
 	</p>
 	</if>
 </if>
-<br />
-<div class='row1' id='notificationlog'>
+<div id='notificationlog'>
 	<form action="{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=removeNotifications&amp;do=remove" base="public"}" id="checkBoxForm" method="post">
 	<input type="hidden" name="secure_key" value="{$this->member->form_hash}" />
 	<if test="hasNotifications:|:is_array( $notifications ) AND count( $notifications )">
-		<h3 class='maintitle'>{$this->lang->words['arch_notifications_head']}</h3>
+		<div class='right ipsPad'>
+			<input id="checkAllNotifications" type="checkbox" value="{$this->lang->words['check_all']}" />
+		</div>
+		<h2 class='ipsType_subtitle'>{$this->lang->words['arch_notifications_head']}</h2>
+		<br />
 		<table class='ipb_table' summary="{$this->lang->words['notifications_table_head']}">
-			<tr class='header'>
+			<tr class='header hide'>
 				<th scope='col' width="5%">&nbsp;</th>
-				<th scope='col' width="60%">{$this->lang->words['th_notification']}</th>
-				<th scope='col' width="30%">{$this->lang->words['th_sent']}</th>
-				<th scope='col' align="center" width="5%" class='short'><input id="checkAllNotifications" type="checkbox" value="{$this->lang->words['check_all']}" /></th>
+				<th scope='col' width="70%">{$this->lang->words['th_notification']}</th>
+				<th scope='col' width="25%">{$this->lang->words['th_sent']}</th>
+				<th scope='col' align="center" width="5%" class='short'>&nbsp;</th>
 			</tr>
-			{parse striping="notify" classes="row1,row2"}
+			{parse striping="notify" classes="row2,row1"}
 			<foreach loop="categories:$notifications as $notification">
-				<tr class='{parse striping="notify"}'>
-					<td class="altrow short"><if test="hasReadNotify:|:$notification['notify_read']">{parse replacement="t_read"}<else />{parse replacement="t_unread"}</if></td>
+				<tr class='{parse striping="notify"} <if test="hasReadNotify:|:!$notification['notify_read']">unread</if>'>
+					<td class="col_n_icon altrow short"><if test="hasReadNotify:|:$notification['notify_read']">{parse replacement="t_read"}<else />{parse replacement="t_unread"}</if></td>
+					<td class='col_n_photo short'>
+						<if test="$notification['member']['member_id']">
+							<a href='{parse url="showuser={$notification['member']['member_id']}" template="showuser" seotitle="{$notification['member']['members_seo_name']}" base="public"}' class='ipsUserPhotoLink'>
+								<img src='{$notification['member']['pp_thumb_photo']}' class='ipsUserPhoto ipsUserPhoto_mini' />
+							</a>
+						<else />
+							{IPSMember::buildNoPhoto(0, 'mini' )}
+						</if>
+					</td>
 					<td>
-						<a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notification['notify_id']}" base="public"}' title='{$this->lang->words['view_notification_logentry']}'><img src='{$this->settings['img_url']}/magnifier.png' alt='{$this->lang->words['view_notification_logentry']}' title='{$this->lang->words['view_notification_logentry']}' /></a>
-						<if test="hasurl:|:$notification['notify_url']"><a href='{$notification['notify_url']}' title='{$this->lang->words['view_notification_logcontent']}'><img src='{$this->settings['img_url']}/notifications/{$notification['notify_icon']}.png' alt='{$this->lang->words['view_notification_logcontent']}' title='{$this->lang->words['view_notification_logcontent']}' /></a></if>
-						<if test="hasReadNotify:|:!$notification['notify_read']"><strong></if>
-						<if test="strpos( $notification['notify_title'], '<a href' ) === false"><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notification['notify_id']}" base="public"}'></if>
+						<h4><if test="strpos( $notification['notify_title'], '<a href' ) === false"><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notification['notify_id']}" base="public"}'></if>
 						{$notification['notify_title']}
 						<if test="strpos( $notification['notify_title'], '<a href' ) === false"></a></if>
-						<if test="hasReadNotify:|:!$notification['notify_read']"></strong></if>
+						</h4>
 					</td>
-					<td class="">{parse date="$notification['notify_sent']" format="long"}</td>
-					<td class="short altrow"><input class='input_check checkall' type="checkbox" name="notifications[]" value="{$notification['notify_id']}" /></td>
+					<td class="col_n_date desc"><a href='{parse url="app=core&amp;module=usercp&amp;tab=core&amp;area=viewNotification&amp;do=view&amp;view={$notification['notify_id']}" base="public"}' title='{$this->lang->words['view_notification_logentry']}'>{$this->lang->words['th_sent']} {parse date="$notification['notify_sent']" format="long"}</a></td>
+					<td class="short col_n_mod"><input class='input_check checkall' type="checkbox" name="notifications[]" value="{$notification['notify_id']}" /></td>
 				</tr>
 			</foreach>
 		</table>
@@ -4462,9 +3911,10 @@ ipb.twitter.initUserCP();
 		<p class='no_messages'>{$this->lang->words['notifications_none']}</p>
 	</if>
 	<if test="hasNotifyForMod:|:count($notifications)">
+		<br />
+		<a href='{parse url="app=core&amp;module=usercp&amp;area=markNotification&amp;do=mark&amp;mark=all" base="public"}' id='ack_pm_notification' class='input_submit left'>{$this->lang->words['notificationlog_mar']}</a>
 		<div class='moderation_bar rounded with_action'>
 			<input type="submit" class="input_submit alt" value="{$this->lang->words['ndel_selected']}" />
-			<div class="left" style='padding-top:4px'><a href='{parse url="app=core&amp;module=usercp&amp;area=markNotification&amp;do=mark&amp;mark=all" base="public"}' id='ack_pm_notification' class='input_submit'>{$this->lang->words['notificationlog_mar']}</a></div>
 		</div>
 		<br />
 		<div class='topic_controls'>
@@ -4475,64 +3925,7 @@ ipb.twitter.initUserCP();
 </div>]]></template_content>
       <template_name>notificationsLog</template_name>
       <template_data><![CDATA[$notifications, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<fieldset class='row1'>
-	<h3>{$this->lang->words['account_pass_title']}</h3>
-	<br />
-	<p class='message unspecific'>
-		<if test="changePasswordAdmin:|:$this->memberData['g_access_cp']">
-			{$this->lang->words['admin_emailpassword']}
-		<else />
-			<if test="removeUser:|:! $this->memberData['bw_local_password_set'] AND $this->memberData['members_created_remote']">
-				{$this->lang->words['remote_pass_set']}
-			<else />
-				{$this->lang->words['pass_change_text']}
-			</if>
-		</if>
-	</p>
-	
-	<if test="changePasswordNotAdmin:|:!$this->memberData['g_access_cp']">
-		<ul>
-			<if test="removeUser2:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">
-			<li class='field'>
-				<label for='current_pass'>{$this->lang->words['account_pass_old']}</label>
-				<input type="password" name="current_pass" value="" id='current_pass' class='input_text' />
-			</li>
-			</if>
-			<li class='field'>
-				<label for='new_pass_1'><if test="removeUser3:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">{$this->lang->words['account_pass_new']}<else />{$this->lang->words['enter_pass_remote1']}</if></label>
-				<input type="password" name="new_pass_1" value="" id='new_pass_1' class='input_text' />
-			</li>
-			<li class='field'>
-				<label for='new_pass_2'><if test="removeUser4:|:$this->memberData['bw_local_password_set'] OR ! $this->memberData['members_created_remote']">{$this->lang->words['account_pass_new2']}<else />{$this->lang->words['enter_pass_remote2']}</if></label>
-				<input type="password" name="new_pass_2" value="" id='new_pass_2' class='input_text' />
-			</li>
-		</ul>
-	</if>
-</fieldset>]]></template_content>
-      <template_name>passwordChangeForm</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<a href="{parse url="act=attach&amp;type={$data['type']}&amp;id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}" target="_blank"><img src="{$this->settings['mime_img']}/{$data['mime_image']}" alt="{$this->lang->words['attached_file']}" /></a>
-&nbsp;<a href="{parse url="act=attach&amp;type={$data['type']}&amp;id={$data['attach_id']}" base="public"}" title="{$this->lang->words['attach_dl']}" target="_blank">{$data['attach_file']}</a> ( {$data['file_size']} )
-<span class="desc">{$this->lang->words['attach_hits']}: {$data['attach_hits']}</span><br />]]></template_content>
-      <template_name>Show_attachments</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4566,19 +3959,7 @@ ipb.twitter.initUserCP();
 </fieldset>]]></template_content>
       <template_name>showNotification</template_name>
       <template_data>$notification</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<div class="formsubtitle">{$title}</div>
-	<p>$msg</p>]]></template_content>
-      <template_name>ucp_message</template_name>
-      <template_data><![CDATA[$title="",$msg=""]]></template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
@@ -4587,6 +3968,9 @@ ipb.twitter.initUserCP();
     <template>
       <template_group>skin_ucp</template_group>
       <template_content><![CDATA[{parse js_module="ucp"}
+<php>
+$hasMoreTabs = (is_array($tabs[ $current_tab ]['_menu']) && count($tabs[ $current_tab ]['_menu']) > 1) ? true : false;
+</php>
 <if test="usercp_form:|:$hide_form == 0">
 	<if test="has_max_upload:|:$maxUpload">
 		<form method='post' enctype="multipart/form-data" action='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' id='userCPForm'>
@@ -4600,46 +3984,59 @@ ipb.twitter.initUserCP();
 		<input type='hidden' name='secure_hash' value='{$this->member->form_hash}' />
 		<input type='hidden' name='s' value='{$this->request['s']}' />
 	</fieldset>
-<h2>{$this->lang->words['ucp_title']}</h2>
-<ul class='tab_bar no_title'>
-	<foreach loop="tabs:$tabs as $tab_app => $tab">
-		<if test="active_tab:|:$tab_app == $current_tab">
-			<li class='active'>{$tab['_name']}</li>
-		<else />
-			<li><a href="{parse url="module=usercp&amp;tab={$tab_app}" base="publicWithApp"}" title="{$this->lang->words['settings_for_ucp']} {$tab['_name']}">{$tab['_name']}</a></li>
-		</if>
-	</foreach>
-</ul>
-<div class='tab_body usercp_body'>
-	<ul id='usercp_menu'>
-		<if test="tabsMenus:|:is_array( $tabs[ $current_tab ]['_menu'] ) AND count( $tabs[ $current_tab ]['_menu'] )">
-			<foreach loop="items:$tabs[ $current_tab ]['_menu'] as $idx => $item">
-				<if test="tabsMenus_active:|:$item['area'] == $current_area OR $item['active']">
-					<li class='active'>{$item['title']}</li>
+<h1 class='ipsType_pagetitle'>{$this->lang->words['ucp_title']}</h1>
+<br />
+<if test="count($tabs) > 1">
+	<div class='maintitle ipsFilterbar clearfix'>
+		<ul class='ipsList_inline'>
+			<foreach loop="tabs:$tabs as $tab_app => $tab">
+				<if test="active_tab:|:$tab_app == $current_tab">
+					<li class='active'><a href="{parse url="module=usercp&amp;tab={$tab_app}" base="publicWithApp"}" title="<if test="isSettings:|:$tab_app=='core'">{$this->lang->words['settings_for_coretab']}<else />{parse expression="sprintf( $this->lang->words['settings_for_ucp'], $tab['_name'] )"}</if>">{$tab['_name']}</a></li>
 				<else />
-					<li><a href="{parse url="module=usercp&amp;tab={$current_tab}&amp;{$item['url']}" base="publicWithApp"}">{$item['title']}</a></li>
+					<li><a href="{parse url="module=usercp&amp;tab={$tab_app}" base="publicWithApp"}" title="<if test="isSettingsInactive:|:$tab_app=='core'">{$this->lang->words['settings_for_coretab']}<else />{parse expression="sprintf( $this->lang->words['settings_for_ucp'], $tab['_name'] )"}</if>">{$tab['_name']}</a></li>
 				</if>
 			</foreach>
+		</ul>
+	</div>
+</if>
+<div class='ipsBox'>
+	<div class='ipsLayout<if test="hasMoreThanOneTabClass:|:$hasMoreTabs"> ipsLayout_withleft ipsLayout_smallleft ipsVerticalTabbed</if> clearfix usercp_body'>
+		<if test="hasMoreThanOneTabSidebar:|:$hasMoreTabs">
+			<div class='ipsVerticalTabbed_tabs ipsLayout_left' id='usercp_tabs'>
+				<ul>
+					<foreach loop="items:$tabs[ $current_tab ]['_menu'] as $idx => $item">
+						<if test="tabsMenus_active:|:$item['area'] == $current_area OR $item['active']">
+							<li class='active'><a href="{parse url="module=usercp&amp;tab={$current_tab}&amp;{$item['url']}" base="publicWithApp"}">{$item['title']}</a></li>
+						<else />
+							<li><a href="{parse url="module=usercp&amp;tab={$current_tab}&amp;{$item['url']}" base="publicWithApp"}">{$item['title']}</a></li>
+						</if>
+					</foreach>
+				</ul>
+			</div>
 		</if>
-	</ul>
-	<div id='usercp_content'>
-		<if test="has_errors:|:is_array( $errors ) AND count( $errors )">
-			<p class='message error'>
-				<foreach loop="errors:$errors as $error">
-					{$error}<br />
-				</foreach>
-			</p>
-		</if>
-		<if test="didSave:|:$this->request['saved'] == 1">
-			<p class='message'>{$this->lang->words['ucp__settings_saved']}</p>
-		</if>
-		{$html}
+		<div class='<if test="hasMoreThanOneTabClassContent:|:$hasMoreTabs">ipsVerticalTabbed_content </if>ipsLayout_content ipsBox_container' id='usercp_content'>
+			<div class='ipsPad'>
+				<if test="has_errors:|:is_array( $errors ) AND count( $errors )">
+					<p class='message error'>
+						<foreach loop="errors:$errors as $error">
+							{$error}<br />
+						</foreach>
+					</p>
+					<br />
+				</if>
+				<if test="didSave:|:$this->request['saved'] == 1">
+					<p class='message'>{$this->lang->words['ucp__settings_saved']}</p>
+					<br />
+				</if>
+				{$html}
 		
-		<if test="submit_button:|:$hide_form == 0">
-		<fieldset class='submit'>
-			<input type='submit' class='input_submit' name='submit' value='{$this->lang->words['ucp__save_changes']}' /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
-		</fieldset>
-		</if>
+				<if test="submit_button:|:$hide_form == 0">
+				<fieldset class='submit'>
+					<input type='submit' class='input_submit' name='submitForm' value='{$this->lang->words['ucp__save_changes']}' /> {$this->lang->words['or']} <a href='{parse url="app=core&amp;module=usercp&amp;tab={$current_tab}&amp;area={$current_area}" base="public"}' title='{$this->lang->words['cancel_edit']}' class='cancel'>{$this->lang->words['cancel']}</a>
+				</fieldset>
+				</if>
+			</div>
+		</div>
 	</div>
 </div>
 <if test="end_form:|:$hide_form == 0">
@@ -4647,302 +4044,7 @@ ipb.twitter.initUserCP();
 </if>]]></template_content>
       <template_name>userCPTemplate</template_name>
       <template_data>$current_tab, $html, $tabs, $current_area, $errors=array(), $hide_form=0, $maxUpload=0</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=watch&amp;watch=$method&amp;do=saveWatch" base="public"}" method="post" name="REPLIER">
-<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-<input type="hidden" name="tid" value="{$topic['tid']}" />
-<input type="hidden" name="fid" value="{$forum['id']}" />
-<input type="hidden" name="st" value="{$this->request['st']}" />
-<fieldset class='row1'>
-	<if test="watchTid:|:$topic['tid'] != ''">
-		<h3>{$this->lang->words['subs_c_title']} {$this->lang->words['subs_for']} <a href='{parse url="showtopic={$topic['tid']}&amp;st={$this->request['st']}" template='showtopic' seotitle='{$topic['title_seo']}' base="public"}' title='{$this->lang->words['topic_title']}'>{$topic['title']}</a></h3>
-		<br />
-		<p class='message unspecific'>{$this->lang->words['subs_exp_text']}</p>
-	<else />
-		<h3>{$this->lang->words['subs_c_title']} {$this->lang->words['subs_for']} <a href='{parse url="showforum={$forum['id']}" base="public" template="showforum" seotitle="{$forum['name_seo']}"}'>{$forum['name']}</a></h3>
-		<br />
-		<p class='message unspecific'>{$this->lang->words['subsf_exp_text']}</p>
-	</if>
-	
-	<ul>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_none' name="emailtype" value="none" />
-			<if test="watchEmailNone:|:$topic['tid'] != ''">
-				<label for='email_none'><strong>{$this->lang->words['subs_none_title']}</strong></label>
-				<span class='desc'>{$this->lang->words['subs_none_desc']}</span>
-			<else />
-				<label for='email_none'><strong>{$this->lang->words['subsf_none_title']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_none_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_delayed' name="emailtype" value="delayed" checked="checked" />
-			<if test="watchEmailDelay:|:$topic['tid'] != ''">
-				<label for='email_delayed'><strong>{$this->lang->words['subs_delayed']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_delayed_desc']}</span>
-			<else />
-				<label for='email_delayed'><strong>{$this->lang->words['subsf_delayed']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_delayed_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_immediate' name="emailtype" value="immediate" />
-			<if test="watchEmailImmediate:|:$topic['tid'] != ''">
-				<label for='email_immediate'><strong>{$this->lang->words['subs_immediate']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_immediate_desc']}</span>
-			<else />
-				<label for='email_immediate'><strong>{$this->lang->words['subsf_immediate']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_immediate_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_daily' name="emailtype" value="daily" />
-			<if test="watchEmailDaily:|:$topic['tid'] != ''">
-				<label for='email_daily'><strong>{$this->lang->words['subs_daily']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_daily_desc']}</span>
-			<else />
-				<label for='email_daily'><strong>{$this->lang->words['subsf_daily']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_daily_desc']}</span>
-			</if>
-		</li>
-		<li class='field checkbox'>
-			<input class='input_radio' type="radio" id='email_weekly' name="emailtype" value="weekly" />
-			<if test="watchEmailWeekly:|:$topic['tid'] != ''">
-				<label for='email_weekly'><strong>{$this->lang->words['subs_weekly']}</strong></label>
-				<span class="desc">{$this->lang->words['subs_weekly_desc']}</span>
-			<else />
-				<label for='email_weekly'><strong>{$this->lang->words['subsf_weekly']}</strong></label>
-				<span class="desc">{$this->lang->words['subsf_weekly_desc']}</span>
-			</if>
-		</li>
-	</ul>
-</fieldset>
-
-<fieldset class='submit'>
-	<input type="submit" value="{$this->lang->words['subs_submit']}" class="input_submit" /> {$this->lang->words['or']}
-	<if test="cancelGoToTopic:|:$topic['tid'] != ''">
-		<a href='{parse url="showtopic={$topic['tid']}" template="showtopic" seotitle="{$topic['title_seo']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	<else />
-		<a href='{parse url="showforum={$forum['id']}" template="showforum" seotitle="{$forum['name_seo']}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</if>
-</fieldset>
-</form>]]></template_content>
-      <template_name>watchChoices</template_name>
-      <template_data><![CDATA[$forum="",$topic="",$method=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<br />
-<div class='row1'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchForums&amp;do=saveIt" base="public"}" id="checkBoxForm" method="post">
-	<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-	<if test="hasWatchedForums:|:is_array( $forumArray ) AND count( $forumArray )">
-		<foreach loop="categories:$forumArray as $parentID => $catData">
-			<h3 class='maintitle'>{$catData['_data']['name']}</h3>
-			<table class='ipb_table' summary="{$this->lang->words['ucp_watched_forums']}">
-				<tr class='header'>
-					<th scope='col' width="5%">&nbsp;</th>
-					<th scope='col' width="50%">{$this->lang->words['ft_forum']}</th>
-					<th scope='col' align="center" width="5%">{$this->lang->words['ft_topics']}</th>
-					<th scope='col' align="center" width="5%">{$this->lang->words['ft_posts']}</th>
-					<th scope='col' align="center" width="35%">{$this->lang->words['ft_last_post']}</th>
-					<th scope='col' align="center" width="5%" class='short'><input id="checkAllForums_{$parentID}" type="checkbox" value="{$this->lang->words['check_all']}" /><!-- SKINNOTE: add check all functionality back --></th>
-				</tr>
-				{parse striping="forums" classes="row1,row2"}
-				<foreach loop="forums:$catData['_forums'] as $forumID => $data">
-					<tr class='{parse striping="forums"}'>
-						<td class="altrow short">{parse replacement="{$data['folder_icon']}"}</td>
-						<td>
-							<strong><a href="{parse url="showforum={$data['id']}" base="public" seotitle="{$data['name_seo']}" template="showforum"}">{$data['name']}</a></strong><br />
-							<span class="desc">
-								{$data['description']}
-								<br />
-								{$this->lang->words['subs_c_type']}: {$this->lang->words[ $data['_type'] ]}
-								<if test="forumNewTopics:|:$data['_newTopics']">
-									<strong><a href="{parse url="showforum={$data['id']}&amp;show=sinceLastVisit" base="public" seotitle="{$data['name_seo']}" template="showforum"}">{$data['_newTopics']} {$this->lang->words['ucp_reply_since']}</a></strong>
-								</if>
-							</span>
-						</td>
-						<td class="short altrow">{$data['topics']}</td>
-						<td class="short altrow">{$data['posts']}</td>
-						<td>
-							{parse date="$data['last_post']" format="long"}<br />{$this->lang->words['in']}
-							<if test="forumPassword:|:$data['password']">
-								{$this->lang->words['f_none']}
-							<else />
-								<a href='{parse url="showtopic={$data['last_id']}&amp;view=getlastpost" base="public" seotitle="{$data['seo_last_title']}" template="showtopic"}'>{$data['last_title']}</a>
-							</if>
-							<br />{$this->lang->words['by']}
-							<if test="forumLastPoster:|:isset($data['last_poster_name'])">
-								<if test="forumLastPosterId:|:$data['last_poster_id']">
-									<a href='{parse url="showuser={$data['last_poster_id']}" base="public" seotitle="{$data['seo_last_name']}" template="showuser"}'>{$data['last_poster_name']}</a> {parse template="user_popup" group="global" params="$data['last_poster_id']"}
-								<else />
-									{$data['last_poster_name']}
-								</if>
-							<else />
-								{$this->lang->words['f_none']}
-							</if>
-						</td>
-						<td class="short altrow"><input class='input_check checkall_{$parentID}' type="checkbox" name="forumIDs[{$data['id']}]" value="1" /></td>
-					</tr>
-				</foreach>
-			</table>
-			<script type='text/javascript'>
-				ipb.global.registerCheckAll('checkAllForums_{$parentID}', 'checkall_{$parentID}');
-			</script>
-			<br />
-		</foreach>
-	<else />
-		<p class='no_messages'>{$this->lang->words['forum_subs_none']}</p>
-	</if>
-	<if test="mmWatchedForums:|:count($forumArray)">
-		<div class='moderation_bar rounded with_action'>
-			<select name="trackchoice">
-				<option value="unsubscribe">{$this->lang->words['subs_delete']}</option>
-				<option value="none">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_none_title']}</option>
-				<option value="immediate">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_immediate']}</option>
-				<option value="delayed">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_delayed']}</option>
-				<option value="daily">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_daily']}</option>
-				<option value="weekly">{$this->lang->words['subs_c_change']} {$this->lang->words['subsf_weekly']}</option>
-			</select>&nbsp;&nbsp;
-			<input type="submit" class="input_submit alt" value="{$this->lang->words['with_selected']}" />
-		</div>
-	</if>
-</form>
-</div>]]></template_content>
-      <template_name>watchedForums</template_name>
-      <template_data>$forumArray</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<php>$_b=false;</php>
-<fieldset class='row1'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=updateWatchTopics&amp;do=saveIt" base="public"}" id="checkBoxForm" method="post">
-		<if test="watchedTopicsForums:|:is_array( $mainForumArray ) AND count( $mainForumArray )">
-			<foreach loop="watched_forums:$mainForumArray as $id => $data">
-				<h3 class='maintitle'>{$data['forum_name']}</h3>
-				<table class='ipb_table'>
-				<tr class='header'>
-					<th scope='col' style='width: 5%'>&nbsp;</th>
-					<th scope='col' style='width: 50%'>{$this->lang->words['subs_topic']}</th>
-					<th scope='col' style='width: 5%' class='short'>{$this->lang->words['subs_replies']}</th>
-					<th scope='col' style='width: 5%' class='short'>{$this->lang->words['subs_view']}</th>
-					<th scope='col' style='width: 30%; text-align:left' class='short'>{$this->lang->words['subs_last_post']}</th>
-					<th scope='col' style='width: 5%' class='short'>
-						<if test="!$_b">
-							<!--{parse expression="trim( $_b = true )"}-->
-							<input class='checkbox' id="checkAllTopics" type="checkbox" value="{$this->lang->words['check_all']}" />
-						</if>
-					</th>
-				</tr>
-				<if test="watchedTopicsTopics:|:is_array( $mainForumArray[ $id ]['_topics'] )">
-					{parse striping="topics" classes="row1,row2"}
-					<foreach loop="watched_topics:$mainForumArray[ $id ]['_topics'] as $topicID => $topicData">
-						<tr class='{parse striping="topics"}'>
-							<td class="row1 short">{parse replacement="{$topicData['folder_img']}"}</td>
-							<td class="row1">
-								<a href="{parse url="showtopic={$topicData['tid']}" base="public" seotitle="{$topicData['title_seo']}" template="showtopic"}">{$topicData['title']}</a><br />
-				  				<span class="desc">
-									{$topicData['description']}
-									<if test="watchedTopicsDescription:|:$topicData['description']">
-										<br />
-									</if>
-									{$this->lang->words['subs_start']} {parse date="$topicData['track_started']" format="long"}
-				  					<br />
-				  					{$this->lang->words['subs_c_type']}: {$this->lang->words[ $topicData['_type'] ]}
-				  				</span>
-				  			</td>
-				  			<td class="row1 short desc">{$topicData['posts']}</td>
-				  			<td class="row1 short desc">{$topicData['views']}</td>
-				  			<td class="altrow">
-				  				<ul class='last_post'>
-									<li>
-										<a href='{parse url="showtopic={$topicData['topic_id']}&amp;view=getlastpost" seotitle="{$topicData['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse replacement="f_lastpost"}</a> <a href='{parse url="showtopic={$topicData['topic_id']}&amp;view=getlastpost" seotitle="{$topicData['title_seo']}" template="showtopic" base="public"}' title='{$this->lang->words['goto_last_post']}'>{parse date="$topicData['_last_post']" format="SHORT"}</a>
-									</li>
-									<li>{$this->lang->words['subs_by']} {$topicData['last_poster']}{parse template="user_popup" group="global" params="$topicData['last_poster_id'], $topicData['seo_last_name']"}</li>
-								</ul>
-				  			</td>
-				  			<td class="row1 short"><input class='input_check checkall' type="checkbox" name="topicIDs[{$topicData['topic_id']}]" value="1" /></td>
-				  		</tr>
-					</foreach>
-				</if>
-				</table>
-				<br />
-			</foreach>
-		<else />
-			<h3 class='maintitle'>{$this->lang->words['subs_header']}</h3>
-			<div class="row2 short" style="padding:8px">{$this->lang->words['subs_none']}</div>
-		</if>
-<if test="watchedTopicsMm:|:count($mainForumArray)">
-	<div class='moderation_bar with_action rounded'>
-		<select name="trackchoice">
-			<option value="unsubscribe">{$this->lang->words['subs_delete']}</option>
-			<option value="none">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_none_title']}</option>
-			<option value="immediate">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_immediate']}</option>
-			<option value="delayed">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_delayed']}</option>
-			<option value="daily">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_daily']}</option>
-			<option value="weekly">{$this->lang->words['subs_c_change']} {$this->lang->words['subs_weekly']}</option>
-		</select>&nbsp;&nbsp;
-		<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-		<input type="submit" class="input_submit alt" value="{$this->lang->words['with_selected']}" />
-	</div>
-</if>
-</form>
-<p style='text-align: right; padding: 5px;'>
-	<if test="watchedTopicsAutoprune:|:$this->settings['subs_autoprune'] > 0">
-		{parse expression="sprintf( $this->lang->words['auto_prune'], $this->settings['subs_autoprune'] )"}
-	<else />
-		{$this->lang->words['no_auto_prune']}
-	</if>
-</p>
-<div class='filter_bar rounded'>
-	<form action="{parse url="app=core&amp;module=usercp&amp;tab=forums&amp;area=topicsubs" base="public"}" method="post">
-		<fieldset>
-			
-			{$this->lang->words['show_topics_from']}
-			<select name="datecut">
-			<option value='1'>{$this->lang->words['subs_today']}</option>
-			<foreach loop="watched_days:array( 1,7,14,21,30,60,90,365 ) as $day">
-				<if test="daySelected:|:$day == $dateCut">
-					<option value='$day' selected="selected">{parse expression="sprintf( $this->lang->words['subs_day'], $day )"}</option>
-				<else />
-					<option value='$day'>{parse expression="sprintf( $this->lang->words['subs_day'], $day )"}</option>
-				</if>
-			</foreach>
-			<if test="allSelected:|:$dateCut == 1000">
-				<option value='1000' selected='selected'>{$this->lang->words['subs_all']}</option>
-			<else />
-				<option value='1000'>{$this->lang->words['subs_all']}</option>
-			</if>
-			</select>
-			<input type="submit" class='input_submit alt' value="{$this->lang->words['jmp_go']}" />
-		</fieldset>
- 	</form>
-</div>
-</fieldset>
-<script type='text/javascript'>
-	ipb.global.registerCheckAll( 'checkAllTopics', 'checkall' );
-</script>]]></template_content>
-      <template_name>watchedTopics</template_name>
-      <template_data>$mainForumArray, $dateCut</template_data>
-      <template_updated>1288018125</template_updated>
+      <template_updated>1318864229</template_updated>
       <template_removable>0</template_removable>
       <template_user_added>0</template_user_added>
       <template_user_edited>0</template_user_edited>
diff --git a/upload/admin/applications/members/xml/members_settings.xml b/upload/admin/applications/members/xml/members_settings.xml
index ec717047..743d5cac 100644
--- a/upload/admin/applications/members/xml/members_settings.xml
+++ b/upload/admin/applications/members/xml/members_settings.xml
@@ -10,47 +10,10 @@
       <conf_title_app>members</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
-    <setting>
-      <conf_title>Разрешить ВВ-коды?</conf_title>
-      <conf_description><![CDATA[ВВ-код – �пециальный формат вида [tag][/tag], и�пользуемый дл� форматировани� тек�та и �оздани� других �ффектов � контентом.<br />
-Е�ли функци� включена, то пользователи могут и�пользовать BB-коды в личных �ообщени�х (<b>далее ЛС</b>).]]></conf_description>
-      <conf_group>21</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>msg_allow_code</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>personalmessagesetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить HTML?</conf_title>
-      <conf_description>Е�ли функци� включена, то пользователи могут и�пользовать HTML код в личных �ообщени�х. Рекомендуем не включать данную функцию из �оображений безопа�но�ти.</conf_description>
-      <conf_group>21</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>msg_allow_html</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>personalmessagesetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Мак�имальное количе�тво ЛС на одной �транице при про�мотре �пи�ка �ообщений</conf_title>
       <conf_description>По умолчанию - 50.</conf_description>
-      <conf_group>21</conf_group>
+      <conf_group>25</conf_group>
       <conf_type>input</conf_type>
       <conf_key>show_max_msg_list</conf_key>
       <conf_default>50</conf_default>
@@ -59,7 +22,6 @@
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>personalmessagesetup</conf_title_keyword>
@@ -68,7 +30,7 @@
     <setting>
       <conf_title>�е игнорируемые группы:</conf_title>
       <conf_description>Пользователи не �могут блокировать получение личных �ообщений от пользователей выбранных групп. Можно выбрать не�колько.</conf_description>
-      <conf_group>21</conf_group>
+      <conf_group>25</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>unblockable_pm_groups</conf_key>
       <conf_default/>
@@ -93,7 +55,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>personalmessagesetup</conf_title_keyword>
@@ -102,7 +63,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить лимит личного �щика дл� групп:</conf_title>
       <conf_description>Пользователи выбранных групп �могут отправл�ть личные �ообщени� другим пользовател�м, даже е�ли их личный �щик переполнен.</conf_description>
-      <conf_group>21</conf_group>
+      <conf_group>25</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>override_inbox_full</conf_key>
       <conf_default/>
@@ -127,7 +88,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>personalmessagesetup</conf_title_keyword>
@@ -145,7 +105,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Включить �и�тему предупреждений?</conf_title>
       <conf_description/>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_on</conf_key>
       <conf_default>1</conf_default>
@@ -154,7 +114,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>Си�тема предупреждений</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -163,7 +122,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Минимальный уровень предупреждений</conf_title>
       <conf_description><![CDATA[Допу�тимы отрицательные чи�ла. Е�ли и�пользуют�� отрицательные чи�ла, мы не рекомендуем и�пользовать графиче�кое и процентное отображение.<br />При реги�трации уровень предупреждений пользовател� в�егда нулевой.]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>input</conf_type>
       <conf_key>warn_min</conf_key>
       <conf_default>0</conf_default>
@@ -172,7 +131,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -181,7 +139,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Мак�имальный уровень предупреждений</conf_title>
       <conf_description/>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>input</conf_type>
       <conf_key>warn_max</conf_key>
       <conf_default>10</conf_default>
@@ -190,7 +148,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -199,7 +156,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Разрешить предупреждать пользовател�, е�ли у него уже мак�имальный/минимальный уровень предупреждений?</conf_title>
       <conf_description/>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_past_max</conf_key>
       <conf_default>0</conf_default>
@@ -208,7 +165,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -217,7 +173,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Защищенные группы</conf_title>
       <conf_description><![CDATA[Группы, пользователи которых не могут быть предупреждены.<br />Вы можете и�пользовать выбрать более одной (и�пользу� клавишу Ctrl).]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>warn_protected</conf_key>
       <conf_default/>
@@ -242,7 +198,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -251,7 +206,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Разрешить пользователю видеть �вои предупреждени�?</conf_title>
       <conf_description>Е�ли включено, то пользователи �могут видеть �вой текущий уровень предупреждений и их причины.</conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_show_own</conf_key>
       <conf_default>0</conf_default>
@@ -260,26 +215,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>warnsetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Тип отображени� предупреждений?</conf_title>
-      <conf_description/>
-      <conf_group>22</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>warn_show_rating</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra><![CDATA[0=Графиче�кий блок и процентное �оотношение
-1=Рейтинг — < минимальный | текущий | мак�имальный > уровень]]></conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -288,7 +223,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Модераторы могут блокировать пользователей?</conf_title>
       <conf_description><![CDATA[Отно�ит�� к модераторам, имеющим право пользовать�� �и�темой предупреждений.<br />�дмини�траторы в�егда могут блокировать через панель предупреждений.]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_mod_ban</conf_key>
       <conf_default>1</conf_default>
@@ -297,7 +232,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>8</conf_position>
       <conf_start_group>Права модераторов форума</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -306,7 +240,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Модераторы могут включать проверку в�ех публикуемых пользователем �ообщений?</conf_title>
       <conf_description><![CDATA[Отно�ит�� к модераторам, имеющим право пользовать�� �и�темой предупреждений.<br />�дмини�траторы в�егда могут включать данную проверку через панель предупреждений.]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_mod_modq</conf_key>
       <conf_default>1</conf_default>
@@ -315,7 +249,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -324,7 +257,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Модераторы могут отключать пользователю возможно�ть публикации?</conf_title>
       <conf_description><![CDATA[Отно�ит�� к модераторам, имеющим право пользовать�� �и�темой предупреждений.<br />�дмини�траторы в�егда могут отключать публикацию через панель предупреждений.]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_mod_post</conf_key>
       <conf_default>1</conf_default>
@@ -333,7 +266,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>10</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -342,7 +274,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Количе�тво предупреждений одному пользователю от одного модератора за день</conf_title>
       <conf_description/>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>input</conf_type>
       <conf_key>warn_mod_day</conf_key>
       <conf_default>3</conf_default>
@@ -351,7 +283,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>11</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -360,7 +291,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Супермодераторы могут блокировать пользователей?</conf_title>
       <conf_description>�дмини�траторы по умолчанию могут блокировать через панель предупреждений.</conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_gmod_ban</conf_key>
       <conf_default>1</conf_default>
@@ -369,7 +300,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>12</conf_position>
       <conf_start_group>Права �упермодераторов</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -378,7 +308,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Супермодераторы могут включать проверку в�ех публикуемых пользователем �ообщений?</conf_title>
       <conf_description>Могут ли �упермодераторы включать проверку в�ех публикуемых пользователем �ообщений перед публикацией в форум через панель предупреждений?</conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_gmod_modq</conf_key>
       <conf_default>1</conf_default>
@@ -387,7 +317,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>13</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -396,7 +325,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Супермодераторы могут отключать пользователю возможно�ть публикации ?</conf_title>
       <conf_description>По умолчанию админи�траторы могут отключать пользователю возможно�ть публикации через панель предупреждений.</conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>warn_gmod_post</conf_key>
       <conf_default>1</conf_default>
@@ -405,7 +334,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>14</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -414,7 +342,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Количе�тво предупреждений одному пользователю от одного �упермодератора за день</conf_title>
       <conf_description/>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>input</conf_type>
       <conf_key>warn_gmod_day</conf_key>
       <conf_default>3</conf_default>
@@ -423,7 +351,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>15</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -432,7 +359,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Группы, имеющие до�туп к �и�теме жалоб?</conf_title>
       <conf_description><![CDATA[Укажите, какие группы имеют до�туп к �и�теме жалоб. <!--PERM_LINK-->]]></conf_description>
-      <conf_group>22</conf_group>
+      <conf_group>26</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>report_mod_group_access</conf_key>
       <conf_default>4</conf_default>
@@ -458,43 +385,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>16</conf_position>
       <conf_start_group>Си�тема жалоб</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>warnsetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить уведомление на e-mail?</conf_title>
-      <conf_description>Включить отправку уведомлений модераторам на e-mail.</conf_description>
-      <conf_group>22</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>report_nemail_enabled</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>warnsetup</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Включить уведомлени� в ЛС</conf_title>
-      <conf_description>Включает отправку уведомлений модераторам личным �ообщением.</conf_description>
-      <conf_group>22</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>report_pm_enabled</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>18</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>warnsetup</conf_title_keyword>
@@ -512,7 +402,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Включить �и�тему репутаций?</conf_title>
       <conf_description/>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>reputation_enabled</conf_key>
       <conf_default>1</conf_default>
@@ -521,7 +411,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>741</conf_position>
       <conf_start_group>О�новные на�тройки</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -530,7 +419,7 @@ if ( $show == 1 )
     <setting>
       <conf_title>Отключить репутацию группам:</conf_title>
       <conf_description>Пользователи, выбранных групп, не �могут получать оценки репутации.</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>reputation_protected_groups</conf_key>
       <conf_default/>
@@ -555,7 +444,6 @@ if ( $show == 1 )
       <conf_protected>1</conf_protected>
       <conf_position>742</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -564,18 +452,18 @@ if ( $show == 1 )
     <setting>
       <conf_title>Тип репутации</conf_title>
       <conf_description>Тип позвол�ет вам выбрать режим работы �и�темы репутации. Вы можете на�троить репутацию так чтобы пользователи могли вы�тавл�ть только положительные оценки, или только отрицательные.</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>dropdown</conf_type>
       <conf_key>reputation_point_types</conf_key>
-      <conf_default>both</conf_default>
-      <conf_extra>positive=только положительное изменение репутации&#13;
+      <conf_default>like</conf_default>
+      <conf_extra><![CDATA[positive=только положительное изменение репутации&#13;
 negative=только отрицательное изменение репутации&#13;
-both=любое изменение репутации</conf_extra>
+both=любое изменение репутации
+like=только положительное � отображением кому понравило�ь (like-тип)]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>743</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -584,7 +472,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Выдел�ть публикации, имеющий более X баллов</conf_title>
       <conf_description>Введите чи�ло баллов, которое требует�� иметь публикации, чтобы она выдел�ла�ь/под�вечивала�ь на �транице.</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>input</conf_type>
       <conf_key>reputation_highlight</conf_key>
       <conf_default>50</conf_default>
@@ -593,7 +481,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>744</conf_position>
       <conf_start_group>�а�тройки отображени�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -602,7 +489,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Отображать репутацию пользователей?</conf_title>
       <conf_description>Включение данной опции позволит выводить репутацию пользовател� в его профиле.</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>reputation_show_profile</conf_key>
       <conf_default>1</conf_default>
@@ -611,7 +498,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>745</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -620,7 +506,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Отображать количе�тво баллов публикаций</conf_title>
       <conf_description>Включение данной опции позволит выводить количе�тво баллов, около каждого оцененного материала.</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>reputation_show_content</conf_key>
       <conf_default>1</conf_default>
@@ -629,7 +515,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>746</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -638,7 +523,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Разрешить пользовател�м оценивать �вои публикации?</conf_title>
       <conf_description>Включение данной опции позволит авторам вы�тавл�ть оценку �воим публикаци�м (�ообщени�, запи�и и прочее).</conf_description>
-      <conf_group>23</conf_group>
+      <conf_group>27</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>reputation_can_self_vote</conf_key>
       <conf_default>1</conf_default>
@@ -647,7 +532,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>747</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>reputation</conf_title_keyword>
@@ -665,8 +549,8 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Символы, допу�тимые в именах пользователей</conf_title>
       <conf_description><![CDATA[Е�ли опци� включена, Invision Board при реги�трации будет запрещать и�пользование в именах пользователей �имволов, от�ут�твующих в �пи�ке.<br /><br />
-Чтобы разрешить и�пользование только цифр и букв, и�пользуйте комбинацию: <b>a-zA-Z0-9</b>]]></conf_description>
-      <conf_group>24</conf_group>
+Чтобы разрешить и�пользование только цифр и букв, и�пользуйте комбинацию: <b>a-zA-Z0-9а-��-Я</b>]]></conf_description>
+      <conf_group>28</conf_group>
       <conf_type>input</conf_type>
       <conf_key>username_characters</conf_key>
       <conf_default/>
@@ -675,7 +559,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>1</conf_position>
       <conf_start_group>�а�тройки имен пользователей</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -684,7 +567,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Отображаемое �ообщение об ошибке</conf_title>
       <conf_description><![CDATA[Е�ли вы указали �пи�ок �имволов в именах пользователей, и пользователь при реги�трации пытает�� и�пользовать запрещенные �имволу, данное �ообщение об ошибке будет отображено.<br /><b>Совет:</b> Вы можете и�пользовать {chars}, чтобы отобразить разрешенные �имволы.]]></conf_description>
-      <conf_group>24</conf_group>
+      <conf_group>28</conf_group>
       <conf_type>input</conf_type>
       <conf_key>username_errormsg</conf_key>
       <conf_default>Им� может �одержать только �ледующие �имволы: {chars}</conf_default>
@@ -693,7 +576,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -702,16 +584,15 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Запретить переводы �трок в именах?</conf_title>
       <conf_description>Запрет переводов �трок и html тегов в именах пользовател� и отображаемых именах.</conf_description>
-      <conf_group>24</conf_group>
+      <conf_group>28</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>usernames_nobr</conf_key>
-      <conf_default>1</conf_default>
+      <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -720,16 +601,15 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Разрешить «Отображаемое им�»</conf_title>
       <conf_description>Е�ли опци� включена, пользователи могут вве�ти «Отображаемое им�», отличное от «Имени пользовател�» (дл� авторизации). Данна� функци� �ЕОБХОДИМ� дл� внешних методов аутентификации.</conf_description>
-      <conf_group>24</conf_group>
+      <conf_group>28</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>auth_allow_dnames</conf_key>
-      <conf_default>0</conf_default>
+      <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>4</conf_position>
       <conf_start_group>�а�тройки отображаемых имен</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -738,7 +618,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Мак�имальна� длина отображаемого имени</conf_title>
       <conf_description>Мак�имальное количе�тво �имволов, допу�тимое в отображаемом имени.</conf_description>
-      <conf_group>24</conf_group>
+      <conf_group>28</conf_group>
       <conf_type>input</conf_type>
       <conf_key>max_user_name_length</conf_key>
       <conf_default>26</conf_default>
@@ -747,7 +627,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -756,7 +635,7 @@ both=любое изменение репутации</conf_extra>
     <setting>
       <conf_title>Запретить «Отображаемые имена», �овпадающие � �уще�твующими «Именами пользователей»</conf_title>
       <conf_description>Е�ли опци� включена, пользователи не могут выбирать «Отображаемое им�», �овпадающее � другим «Отображаемым именем» ИЛИ другим «Именем пользовател�». Е�ли опци� отключена, пользователи не cмогут выбирать только «Отображаемое им�», �овпадающее � другим «Отображаемым именем».</conf_description>
-      <conf_group>24</conf_group>
+      <conf_group>28</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>auth_dnames_nologinname</conf_key>
       <conf_default>1</conf_default>
@@ -765,7 +644,6 @@ both=любое изменение репутации</conf_extra>
       <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>displaynamesettings</conf_title_keyword>
@@ -780,166 +658,154 @@ both=любое изменение репутации</conf_extra>
       <conf_title_app>members</conf_title_app>
       <conf_title_noshow>0</conf_title_noshow>
     </setting>
-    <setting>
-      <conf_title>Разрешить пользовател�м выбирать �тиль?</conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>allow_skins</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group>Глобальные на�тройки профил� пользовател�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
     <setting>
       <conf_title>Количе�тво �ообщений, необходимых набрать пользователю, чтобы получить возможно�ть измен�ть �вое звание?</conf_title>
       <conf_description>Введите 0, чтобы запретить пользовател�м когда-либо измен�ть �вое звание.</conf_description>
-      <conf_group>25</conf_group>
+      <conf_group>29</conf_group>
       <conf_type>input</conf_type>
       <conf_key>post_titlechange</conf_key>
       <conf_default>500</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
+      <conf_position>1</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Отключить префик�/�уффик� к именам</conf_title>
-      <conf_description>Данна� на�тройка позвол�ет глобально отменить добавление префик�ов и �уффик�ов к именам пользователей.</conf_description>
-      <conf_group>25</conf_group>
+      <conf_title><![CDATA[Включить функцию &quot;дружбы&quot; между пользовател�ми]]></conf_title>
+      <conf_description/>
+      <conf_group>29</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>ipb_disable_group_psformat</conf_key>
-      <conf_default>0</conf_default>
+      <conf_key>friends_enabled</conf_key>
+      <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Мак�имальна� длина подпи�и пользовател� (в байтах)</conf_title>
+      <conf_title>Позволить пользовател�м оценивать друг друга?</conf_title>
       <conf_description/>
-      <conf_group>25</conf_group>
+      <conf_group>29</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>pp_allow_member_rate</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>3</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Врем� жизни запро�ов на во��тановление парол�</conf_title>
+      <conf_description>Сколько дней �читать запро� на во��тановление парол� дей�твительным</conf_description>
+      <conf_group>29</conf_group>
       <conf_type>input</conf_type>
-      <conf_key>max_sig_length</conf_key>
-      <conf_default>10000</conf_default>
+      <conf_key>lost_pw_prune</conf_key>
+      <conf_default>60</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Мак�имальна� ширина фотографии пользовател� на �транице темы</conf_title>
+      <conf_description>Е�ли 0 или пу�тое значение, то будет и�пользовано изображение � размерами 100x100.</conf_description>
+      <conf_group>29</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>member_topic_avatar_max</conf_key>
+      <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
       <conf_position>5</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Разрешить HTML в подпи�и?</conf_title>
-      <conf_description>Разрешение данной функции �Е рекомендует��, е�ли вы не полно�тью довер�ете пользовател�м, которым разрешено добавл�ть подпи�ь.</conf_description>
-      <conf_group>25</conf_group>
+      <conf_title>Разрешить анимированные GIF в мини-каритинках профил�?</conf_title>
+      <conf_description>При включении анимаци� будет работать дл� мини-картинок профилей на главной �транице форума и �пи�ке тем. Картинки на �транице профил� анимируют�� в�егда.</conf_description>
+      <conf_group>29</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>sig_allow_html</conf_key>
+      <conf_key>member_photo_gif_animate</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Разрешить пользовател�м загружать фотографии через указание URL</conf_title>
+      <conf_description>Е�ли пользователь имеет право загружать фотографию и включена �та опци�, то он �может указать URL фотографии дл� загрузки ее на форум.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>mem_photo_url</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Разрешить и�пользовать граватары?</conf_title>
+      <conf_description><![CDATA[<a href='http://en.gravatar.com/' target='_blank'>Перейдите по ��ылке, чтобы узнать, что такое граватар</a>.]]></conf_description>
+      <conf_group>29</conf_group>
+      <conf_type>yes_no</conf_type>
+      <conf_key>allow_gravatars</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Разрешенные ра�ширени� файлов дл� фотографий</conf_title>
+      <conf_description>Раздел�йте допу�тимые ра�ширени� файлов зап�тыми (gif,png,jpeg) и т.д.</conf_description>
+      <conf_group>29</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>photo_ext</conf_key>
+      <conf_default>gif,jpg,jpeg,png</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
       <conf_position>6</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить BB-коды в подпи�и?</conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>sig_allow_ibc</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Тип редактора по умолчанию дл� пользователей</conf_title>
-      <conf_description><![CDATA[Обычный редактор отображает теги BB-кодов при напи�ании �ообщений. Визуальный редактор отображает уже отформатированный тек�т (как в Word'е).]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>dropdown</conf_type>
-      <conf_key>ips_default_editor</conf_key>
-      <conf_default>std</conf_default>
-      <conf_extra>std=Стандартный&#13;
-rte=Визуальный</conf_extra>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Количе�тво �ообщений на �траницу темы, выбираемых пользователем</conf_title>
-      <conf_description><![CDATA[И�пользуйте зап�тую дл� разделени� значений.<br />�апример: 5,15,20,25,30<br />
-Вариант 'И�пользовать значение форума по умолчанию' будет добавлен автоматиче�ки]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>postpage_contents</conf_key>
-      <conf_default>5,10,15,20,25,50</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>8</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Количе�тво тем на �траницу форума, выбираемых пользователем</conf_title>
-      <conf_description><![CDATA[И�пользуйте зап�тую дл� разделени� значений.<br />�апример: 5,15,20,25,30<br />
-Вариант 'И�пользовать значение форума по умолчанию' будет добавлен автоматиче�ки.]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>topicpage_contents</conf_key>
-      <conf_default>5,10,15,20,25,50</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
@@ -948,16 +814,15 @@ rte=Визуальный</conf_extra>
     <setting>
       <conf_title><![CDATA[�втоматиче�ки удал�ть подпи�ку на тему, е�ли в ней нет ответов более [x] дней]]></conf_title>
       <conf_description>Чтобы запретить автоматиче�кое удаление, о�тавьте �то поле пу�тым или введите 0</conf_description>
-      <conf_group>25</conf_group>
+      <conf_group>29</conf_group>
       <conf_type>input</conf_type>
       <conf_key>subs_autoprune</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>10</conf_position>
+      <conf_position>8</conf_position>
       <conf_start_group>Подпи�ки на тему и форум</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
@@ -966,7 +831,7 @@ rte=Визуальный</conf_extra>
     <setting>
       <conf_title>�втоматиче�ки подпи�ывать на каждый форум</conf_title>
       <conf_description><![CDATA[Укажите группы, пользователи в которых будут автоматиче�ки получать уведомлени� обо в�ех новых темах (а не ответах) во в�ех до�тупных им форумах. Это означает, что пользователи, выбранные в первоначальную группу, будут получать �лектронные �ообщени� каждый раз, когда �оздает�� нова� тема, а их нет на форуме.<br /><b>Примечание:</b> Электронные пи�ьма будут отправлены только тем, кто выбрал опцию 'Получать пи�ьма от админи�траторов'.]]></conf_description>
-      <conf_group>25</conf_group>
+      <conf_group>29</conf_group>
       <conf_type>multi</conf_type>
       <conf_key>autoforum_sub_groups</conf_key>
       <conf_default/>
@@ -989,189 +854,30 @@ if ( $show == 1 )
     $key='autoforum_sub_groups[]';
 }]]></conf_evalphp>
       <conf_protected>1</conf_protected>
-      <conf_position>11</conf_position>
+      <conf_position>9</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Разрешить и�пользовать аватары?</conf_title>
+      <conf_title>�а�тройки подпи�ки дл� новых пользователей</conf_title>
       <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>avatars_on</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
+      <conf_group>29</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>auto_track_method</conf_key>
+      <conf_default/>
+      <conf_extra><![CDATA[0=�е подпи�ывать�� автоматиче�ки&#13;
+none=Подпи�ывать�� без уведомлений&#13;
+immediate=Подпи�ывать�� � неотложными уведомлени�ми&#13;=Delayed email notifications
+offline=Подпи�ывать�� � отложенными уведомлени�ми&#13;
+daily=Подпи�ывать�� � ежедневным дайже�том&#13;
+weekly=Подпи�ывать�� � еженедельным дайже�том]]></conf_extra>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>12</conf_position>
-      <conf_start_group>�ватары и фотографии</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешенные ра�ширени� файлов дл� аватаров</conf_title>
-      <conf_description>Раздел�йте допу�тимые ра�ширени� файлов зап�тыми (gif,png,jpeg) и т.д.</conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>avatar_ext</conf_key>
-      <conf_default>gif,jpg,jpeg,png</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>13</conf_position>
+      <conf_position>10</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить пользовател�м и�пользовать удаленные URL адре�а аватаров?</conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>avatar_url</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>14</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Врем� жизни запро�ов на во��тановление парол�</conf_title>
-      <conf_description>Сколько дней �читать запро� на во��тановление парол� дей�твительным</conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>lost_pw_prune</conf_key>
-      <conf_default>7</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Мак�имальный размер загружаемого файла аватара (Кб)</conf_title>
-      <conf_description>В килобайтах</conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>avup_size_max</conf_key>
-      <conf_default>50</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешить и�пользовать граватары?</conf_title>
-      <conf_description><![CDATA[<a href='http://en.gravatar.com/' target='_blank'>Перейдите по ��ылке, чтобы узнать, что такое граватар</a>.]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>allow_gravatars</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>15</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Мак�имальные размеры аватара</conf_title>
-      <conf_description><![CDATA[(ШИРИ��<b>x</b>ВЫСОТ�), где x — буква англий�кого алфавита]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>avatar_dims</conf_key>
-      <conf_default>90x90</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>16</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Размеры по умолчанию дл� галереи аватаров</conf_title>
-      <conf_description><![CDATA[(ШИРИ��<b>x</b>ВЫСОТ�), где x — буква англий�кого алфавита]]></conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>avatar_def</conf_key>
-      <conf_default>80x80</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разрешенные ра�ширени� файлов дл� фотографий</conf_title>
-      <conf_description>Раздел�йте допу�тимые ра�ширени� файлов зап�тыми (gif,png,jpeg) и т.д.</conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>photo_ext</conf_key>
-      <conf_default>gif,jpg,jpeg,png</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>19</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Отключить автоматиче�кое изменение размеров больших фотографий/аватаров?</conf_title>
-      <conf_description>Пользователю необходимо будет измен�ть размеры изображени� вручную.</conf_description>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>disable_ipbsize</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>20</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
@@ -1180,145 +886,378 @@ if ( $show == 1 )
     <setting>
       <conf_title>Разрешить го�т�м видеть подпи�и?</conf_title>
       <conf_description/>
-      <conf_group>25</conf_group>
+      <conf_group>29</conf_group>
       <conf_type>yes_no</conf_type>
       <conf_key>guests_sig</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>21</conf_position>
+      <conf_position>11</conf_position>
       <conf_start_group>�а�тройки дл� го�тей</conf_start_group>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
       <conf_title_keyword>userprofiles</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Разрешить го�т�м видеть публикуемые в �ообщени�х изображени�?</conf_title>
+      <conf_is_title>1</conf_is_title>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_title_title>Серви� мониторинга �пама</conf_title_title>
+      <conf_title_desc>�а�тройки дл� анти�пам �ерви�а от IBR</conf_title_desc>
+      <conf_title_tab>Members</conf_title_tab>
+      <conf_title_app>members</conf_title_app>
+      <conf_title_noshow>0</conf_title_noshow>
+    </setting>
+    <setting>
+      <conf_title>Включить работу � �ерви�ом?</conf_title>
       <conf_description/>
-      <conf_group>25</conf_group>
+      <conf_group>30</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>guests_img</conf_key>
+      <conf_key>spam_service_enabled</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>22</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_position>1</conf_position>
+      <conf_start_group>Базовые на�тройки</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Разрешить го�т�м видеть аватары пользователей?</conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
+      <conf_title>Ключ дл� работы � �ерви�ом</conf_title>
+      <conf_description>Получить ключ вы можете в клиент-центре.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>spam_service_api_key</conf_key>
+      <conf_default/>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>2</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Сообщать �ерви�у о пометке пользовател� �памером?</conf_title>
+      <conf_description>Включение данной опции позволит отправл�ть информацию о пометке пользовател� как �памера на �ерви� анти�пама.</conf_description>
+      <conf_group>30</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>guests_ava</conf_key>
+      <conf_key>spam_service_send_to_ips</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>23</conf_position>
+      <conf_position>2</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title>Позволить пользовател�м оценивать друг друга?</conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>pp_allow_member_rate</conf_key>
-      <conf_default>1</conf_default>
+      <conf_title>Лимит времени �оединени� � �ерви�ом</conf_title>
+      <conf_description>В течение указанного времени (в �екундах) форум будет ждать ответа от �ерви�а при �оединении � ним.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>spam_service_timeout</conf_key>
+      <conf_default>15</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>33</conf_position>
+      <conf_position>3</conf_position>
       <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Разрешить HTML в поле &quot;Обо мне&quot;?]]></conf_title>
-      <conf_description>В цел�х безопа�но�ти не рекомендует�� включать �ту опцию.</conf_description>
-      <conf_group>25</conf_group>
+      <conf_title>Дей�твие в �лучае и�течени� лимита времени на �оединение � �ерви�ом</conf_title>
+      <conf_description/>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_timeout</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>4</conf_position>
+      <conf_start_group>Взаимодей�твие � �ерви�ом</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Дей�твие дл� код-ответа 0</conf_title>
+      <conf_description>Код-ответа 0 означает, что �ерви� не �мог правильно обработать запро� по каким-то техниче�ким причинам.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_0</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>5</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Дей�твие дл� код-ответа 1</conf_title>
+      <conf_description>Код-ответа 1 вы�ылает�� �ерви�ом в �лучае, е�ли реги�трирующий�� пользователь не может быть �памером.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_1</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>6</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Дей�твие дл� код-ответа 2</conf_title>
+      <conf_description>Код-ответа 2 вы�ылает�� �ерви�ом в �лучае, е�ли реги�трирующий�� пользователь может-быть веро�тным �памером</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_2</conf_key>
+      <conf_default>1</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>7</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Дей�твие дл� код-ответа 3</conf_title>
+      <conf_description>Код-ответа 3 вы�ылает�� �ерви�ом в �лучае, е�ли реги�трирующий�� пользователь может быть �памером</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_3</conf_key>
+      <conf_default>2</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>8</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Дей�твие дл� код-ответа 4</conf_title>
+      <conf_description>Код-ответа 4 вы�ылает�� �ерви�ом в �лучае, е�ли реги�трирующий�� пользователь �памер</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spam_service_action_4</conf_key>
+      <conf_default>3</conf_default>
+      <conf_extra><![CDATA[1=Продолжить реги�трацию&#13;
+2=Пометить пользовател� как нуждающего�� в проверке админи�тратором&#13;
+3=Зареги�трировать пользовател� и �разу забанить]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>9</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Уведомл�ть при по�влении нового �памера?</conf_title>
+      <conf_description>Включение опции позвол�ет уведомл�ть админи�трацию, е�ли какой-либо пользователь был отмечен как �памер.</conf_description>
+      <conf_group>30</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>aboutme_html</conf_key>
+      <conf_key>spm_notify</conf_key>
       <conf_default>0</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>85</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_position>10</conf_position>
+      <conf_start_group>�втоматиче�ка� работа �о �памерам</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Разрешить BB-Коды в поле &quot;Обо мне&quot;?]]></conf_title>
+      <conf_title>При отметке пользовател� �памером производить дей�тви�</conf_title>
       <conf_description/>
-      <conf_group>25</conf_group>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>spm_option</conf_key>
+      <conf_default>disable</conf_default>
+      <conf_extra><![CDATA[none=Бездей�твовать&#13;
+disable=Отключить возможно�ть отправки �ообщений/личных �ообщений&#13;
+unapprove=Отключить возможно�ть отправки �ообщений/личных �ообщений и �крыть �ообщени�&#13;
+ban=Скрыть �ообщени�, очи�тить профиль и заблокировать запи�ь]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>11</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Скрывать �ообщени� за X дней при отметке пользовател� �памером</conf_title>
+      <conf_description>В значении опции необходимо указать количе�тво дней, за которые �ообщени� от пользовател�, помеченного как �памер, будут �крыты. �апример, е�ли указать 3 дн�, то при отметке пользовател� �памером, в�е его �ообщени� за предыдущие 3 дн� будут �крыты. 
+      Вы можете вве�ти значение 0, тогда в�е �ообщени� пользовател� будут �крыты.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>spm_post_days</conf_key>
+      <conf_default>3</conf_default>
+      <conf_extra/>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>12</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Механизм генерации Captcha</conf_title>
+      <conf_description>Можно выбрать и�пользование �тороннего �ерви�а reCAPTHCHA или же и�пользовать GD библиотеку.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>bot_antispam_type</conf_key>
+      <conf_default>recaptcha</conf_default>
+      <conf_extra><![CDATA[none=�ет&#13;
+recaptcha=reCAPTCHA&#13;
+default=С и�пользованием GD]]></conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>13</conf_position>
+      <conf_start_group>CAPTCHA</conf_start_group>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords/>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Включить Captcha при отправке �ообщений го�т�ми?</conf_title>
+      <conf_description>При включенной опции, го�т�м необходимо будет пройти CAPTCHA те�т, при попытке добавлени� темы или �ообщени�.</conf_description>
+      <conf_group>30</conf_group>
       <conf_type>yes_no</conf_type>
-      <conf_key>aboutme_bbcode</conf_key>
+      <conf_key>guest_captcha</conf_key>
       <conf_default>1</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>87</conf_position>
+      <conf_position>14</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Разрешить �майлики в поле &quot;Обо мне&quot;?]]></conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>aboutme_emoticons</conf_key>
-      <conf_default>1</conf_default>
+      <conf_title>Публичный ключ (Public Key)</conf_title>
+      <conf_description><![CDATA[<a href='http://www.recaptcha.net'>Получить ключ</a>]]></conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>recaptcha_public_key</conf_key>
+      <conf_default>6LcpWAMAAAAAAA4klDtDNuDH6LsGgBX5mBoJ3naK</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>88</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
+      <conf_position>15</conf_position>
+      <conf_start_group>�а�тройки reCAPTCHA</conf_start_group>
       <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_keywords>recaptcha, captcha</conf_keywords>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
     <setting>
-      <conf_title><![CDATA[Включить функцию &quot;дружбы&quot; между пользовател�ми]]></conf_title>
-      <conf_description/>
-      <conf_group>25</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>friends_enabled</conf_key>
-      <conf_default>1</conf_default>
+      <conf_title>Приватный ключ (Private Key)</conf_title>
+      <conf_description><![CDATA[<a href='http://www.recaptcha.net'>Получить ключ</a>]]></conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>input</conf_type>
+      <conf_key>recaptcha_private_key</conf_key>
+      <conf_default>6LcpWAMAAAAAAETX5jHd9NlPtIHJA4G-ra3X2RQB</conf_default>
       <conf_extra/>
       <conf_evalphp/>
       <conf_protected>1</conf_protected>
-      <conf_position>752</conf_position>
+      <conf_position>16</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords>recaptcha, captcha</conf_keywords>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Язык интерфей�а</conf_title>
+      <conf_description/>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>recaptcha_language</conf_key>
+      <conf_default>ru</conf_default>
+      <conf_extra>en=English&#13;
+nl=Dutch&#13;
+fr=French&#13;
+de=German&#13;
+pt=Portuguese&#13;
+ru=Ру��кий&#13;
+es=Spanish&#13;
+tr=Turkish</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>17</conf_position>
+      <conf_start_group/>
+      <conf_add_cache>1</conf_add_cache>
+      <conf_keywords>recaptcha</conf_keywords>
+      <conf_title_keyword>spamservice</conf_title_keyword>
+      <conf_is_title>0</conf_is_title>
+    </setting>
+    <setting>
+      <conf_title>Оформление</conf_title>
+      <conf_description>Вы можете выбрать одну из �тандартных тем, котора� будет и�пользовать�� дл� оформлени� формы вывода reCAPTCHA.</conf_description>
+      <conf_group>30</conf_group>
+      <conf_type>dropdown</conf_type>
+      <conf_key>recaptcha_theme</conf_key>
+      <conf_default>clean</conf_default>
+      <conf_extra>clean=Clean&#13;
+red=Red&#13;
+white=White&#13;
+blackglass=Blackglass</conf_extra>
+      <conf_evalphp/>
+      <conf_protected>1</conf_protected>
+      <conf_position>18</conf_position>
       <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
       <conf_add_cache>1</conf_add_cache>
       <conf_keywords/>
-      <conf_title_keyword>userprofiles</conf_title_keyword>
+      <conf_title_keyword>spamservice</conf_title_keyword>
       <conf_is_title>0</conf_is_title>
     </setting>
   </settinggroup>
diff --git a/upload/admin/applications/members/xml/members_xmlskin_templates.xml b/upload/admin/applications/members/xml/members_xmlskin_templates.xml
deleted file mode 100644
index a45adc4c..00000000
--- a/upload/admin/applications/members/xml/members_xmlskin_templates.xml
+++ /dev/null
@@ -1,1855 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="members" templategroups="a:5:{s:14:&quot;skin_messaging&quot;;s:5:&quot;exact&quot;;s:10:&quot;skin_mlist&quot;;s:5:&quot;exact&quot;;s:11:&quot;skin_online&quot;;s:5:&quot;exact&quot;;s:12:&quot;skin_profile&quot;;s:5:&quot;exact&quot;;s:8:&quot;skin_ucp&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_messaging">
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[{parse js_module="messenger"}
-<script type='text/javascript'>
-//<!#^#|CDATA|
-	ipb.templates['invite_more'] = new Template("<form method='post' action='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=addParticipants" base="public"}'>" +
-									"<input type='hidden' name='authKey' value='{$this->member->form_hash}' />" +
-									"<input type='hidden' name='topicID' value='{$this->request['topicID']}' />" +
-									"<input type='hidden' name='st' value='{$this->request['st']}' />" +
-									"<fieldset class='row1'><h3>Invite More Participants</h3>" + 
-									"<ul><li class='field'><label for='invite_more_autocomplete'>Enter member names:</label>" + 
-									"<input type='text' class='input_text' name='inviteNames' id='invite_more_autocomplete' size='50' />" + 
-									"<span class='desc'>#{name_text}, separated with commas</span>" + 
-									"</li></ul></fieldset><fieldset class='submit'><input type='submit' class='input_submit' value='Add' /> " + 
-									"or <a href='#' class='cancel' title='Cancel'>Cancel</a></fieldset></form>");
-//|#^#]>
-</script>
-<h2>Messenger</h2>
-<div id='messenger_utilities'>
-	<!-- Show topic participants -->
-	<if test="is_array( $topicParticipants ) and count( $topicParticipants )">
-		<div class='general_box alt' id='participants'>
-			<h3 class='bar'>Participants</h3>
-			{parse striping="participants" classes="row1,row2"}
-			<ul id='participants_list'>
-				<foreach loop="$topicParticipants as $memberID => $memberData">
-					<li class='{parse striping="participants"}'>
-						<a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='View Profile' ><img src='{$memberData['pp_thumb_photo']}' width='{$memberData['pp_thumb_width']}' height='{$memberData['pp_thumb_height']}' alt='Photo' class='photo' /></a>
-						<if test="$memberData['map_ignore_notification']">
-							{parse replacement="msg_notify_off"}
-						<else />
-							{parse replacement="msg_notify_on"}
-						</if>
-						<if test="$memberData['map_user_active']">
-							<if test="$memberData['map_is_starter']">
-								<span class='name starter'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='View Profile'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-							<else />
-								<span class='name'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='View Profile'>{$memberData['members_display_name_short']}</a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-							</if>
-							<br />
-							<span class='desc'>
-								<if test="$memberData['_topicDeleted']">
-									<em>Unavailable: Topic Deleted</em>
-								<else />
-									Last Read:
-									<if test="$memberData['map_read_time']">
-										{parse date="$memberData['map_read_time']" format="short"}
-									<else />
-										<em>Not yet read</em>
-									</if>
-								</if>							
-							</span>
-							<if test="! $memberData['map_is_starter'] AND $memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod']) AND ( $memberData['map_user_id'] != $this->memberData['member_id'] ) AND !$memberData['_topicDeleted']">
-								<br /><a href="{parse url="module=messaging&amp;section=view&amp;do=blockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='Block this user' class='cancel'>Block</a>
-							</if>
-						<else />
-							<if test="$memberData['map_user_banned']">
-								<span class='name blocked'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='View Profile'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-								<br />
-								<span class='desc'>User is blocked &amp; can't participate</span>
-								<br />
-								<if test="$memberData['_canBeBlocked'] AND ($topicParticipants[ $this->memberData['member_id'] ]['map_is_starter'] OR $this->memberData['g_is_supmod'])">
-									<a href="{parse url="module=messaging&amp;section=view&amp;do=unblockParticipant&amp;topicID={$this->request['topicID']}&amp;memberID={$memberData['map_user_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}" title='Unblock this user' class='cancel'>Unblock</a>
-								</if>
-							<else />
-								<span class='name left_convo'><a href='{parse url="showuser={$memberData['member_id']}" seotitle="{$memberData['members_seo_name']}" template="showuser" base="public"}' title='View Profile'><strong>{$memberData['members_display_name_short']}</strong></a></span>{parse template="user_popup" group="global" params="$memberData['member_id'], $memberData['members_seo_name']"}
-								<br />
-								<span class='desc'>
-									<if test="$memberData['_topicDeleted']">
-									<em>Unavailable: Topic Deleted</em>
-									<else />
-										<if test="$memberData['map_is_system']">
-											Is unable to participate
-										<else />
-											Has left the conversation
-										</if>
-									</if>
-								</span>
-							</if>
-						</if>
-					</li>
-				</foreach>					
-			</ul>
-			<ul class='post_controls'>
-				<li>
-					<a href='{parse url="module=messaging&amp;section=view&amp;do=toggleNotifications&amp;topicID={$this->request['topicID']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}' title='Toggle notification status for this conversation'>
-					<if test="$topicParticipants[ $this->memberData['member_id'] ]['map_ignore_notification']">
-						{parse replacement="msg_notify_on"} Turn Notifications <strong>ON</strong>
-					<else />
-						{parse replacement="msg_notify_on"} Turn Notifications <strong>OFF</strong>
-					</if>
-					</a>
-				</li>
-			</ul>
-		</div>
-		<if test="$this->memberData['g_max_mass_pm'] && count( $topicParticipants ) < $this->memberData['g_max_mass_pm']">
-			<div id='invite_more' class='general_box alt'>
-				<h3>Invite Participants</h3>
-				<if test="$this->memberData['g_max_mass_pm'] == 0">
-					<p class='desc'>You may invite an <strong>unlimited</strong> number of members</p>
-					<script type='text/javascript'>
-						ipb.messenger.invitesLeft = parseInt( 0 );
-						ipb.messenger.nameText = ipb.lang['enter_unlimited_names'];
-					</script>
-				<else />
-					<p class='desc'>You may invite up to <strong>{parse expression="( $this->memberData['g_max_mass_pm'] - count( $topicParticipants ) )"}</strong> more members</p>
-					<script type='text/javascript'>
-						ipb.messenger.invitesLeft = parseInt( {parse expression="( $this->memberData['g_max_mass_pm'] - count( $topicParticipants ) )"} );
-						ipb.messenger.nameText = ipb.lang['enter_x_names'].gsub(/\[x\]/, ipb.messenger.invitesLeft);
-					</script>
-				</if>
-				<ul class='post_controls'>
-					<li id='add_participants'><a href='#' title='Add Participants'>{parse replacement="add_participants"}&nbsp; Add</a></li>
-				</ul>						
-			</div>
-		</if>
-	</if>
-	<div id='folder_list' class='general_box alt'>
-		<h3>Folders</h3>
-		<ol id='folders'>
-			<if test="count($dirData)">
-				<foreach loop="dirs:$dirData as $id => $data">
-					<if test="$data['protected']">
-						<li class='folder protected' id='f_{$id}'>{parse replacement="folder_{$id}"}
-					<else />
-						<li class='folder' id='f_{$id}'>{parse replacement="folder_generic"}
-					</if>
-					<a href="{parse url="module=messaging&amp;section=view&amp;do=showFolder&amp;folderID={$id}" base="publicWithApp"}" title="Go to folder" rel="folder_name">{$data['real']}</a>
-					<span class='total'>
-						<if test="$id == 'all'">
-							{parse expression="intval($this->memberData['msg_count_total'])"}
-						<else />
-							{parse expression="intval($data['count'])"}
-						</if>
-					</span>
-					<if test=" ! $data['protected']">
-						<span class='edit_folders' style='display: none'><a href='#' id='delete_{$id}' class='f_delete'>Delete</a> | <a href='#' id='empty_{$id}' class='f_empty'>Empty</a></span></li>
-					<else />
-						<span class='edit_folders' style='display: none'><a href='#' id='empty_{$id}' class='f_empty'>Empty</a></span></li>
-					</if>
-				</foreach>
-			</if>
-		</ol>
-		<ul class='post_controls'>
-			<!-- SKINNOTE: We need a static way to add/edit folders -->
-			<li id='add_folder'><a href='#' title='Add Folder'>{parse replacement="add_folder"} Add</a></li>
-			<li id='edit_folders'><a href='#' title='Edit Folders'>{parse replacement="edit_folder"} Edit</a></li>
-		</ul>
-		<script type='text/javascript'>
-		//<!#^#|CDATA|
-			ipb.messenger.folderTemplate = "<li class='folder' id='f_[id]'>{parse replacement="folder_generic"} <a href='{parse url="module=messaging&amp;section=view&amp;do=showFolder&amp;folderID=[id]" base="publicWithApp"}' title='Go to folder'>[name]</a> <span class='total'>[total]</span><span class='edit_folders' style='display: none'><a href='#' id='delete_[id]' class='f_delete'>Delete</a> | <a href='#' id='empty_[id]' class='f_empty'>Empty</a></span></li>";
-		//|#^#]>
-		</script>
-	</div>
-	<if test="$this->memberData['g_max_messages'] > 0">
-		<div id='space_allowance' class='general_box'>
-			<h3>Storage</h3>
-			<p>Your messenger storage</p>
-			<p class='progress_bar' title='Your messenger folders are {$totalData['full_percent']}% full' <if test="$totalData['full_percent'] > 80">class='limit'</if>>
-				<span style='width: {$totalData['full_percent']}%'>{$totalData['full_percent']}%</span>
-			</p>
-			<p>
-				<span class='desc'>{$totalData['full_percent']}% of your quota ({$this->memberData['g_max_messages']} messages)</span>
-			</p>
-		</div>
-	</if>
-	<div id='message_search' class='general_box'>
-		<h3>Search Messages</h3>
-		<form action='{$this->settings['base_url']}app=members&amp;module=messaging&amp;section=search' method='post'>
-			<fieldset>
-				<input type='text' name='searchFor' class='input_text' size='15' style='width: 60%' /> <input type='submit' class='input_submit' value='Go' />
-			</fieldset>
-		</form>
-	</div>
-</div>
-<div id='messenger_content'>
-	<if test="$inlineError">
-	<div class='message error'>
-		<h4>{$inlineError}</h4>
-	</div>
-	<br />
-	</if>
-	$html
-</div>
-<!-- end -->]]></template_content>
-      <template_name>messengerTemplate</template_name>
-      <template_data><![CDATA[$html, $jumpmenu, $dirData, $totalData=array(), $topicParticipants=array(), $inlineError='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<form id='pm_to_member_{$toMemberData['member_id']}'>
-	<input type='hidden' name='toMemberID' value='{$toMemberData['member_id']}' />
-	
-	<fieldset class='row1'>
-		<h3>Sending a PM to {$toMemberData['members_display_name']}</h3>
-		<div id='pm_error_{$toMemberData['member_id']}'>
-			<br />
-			<p class='message error'></p></div>
-			<script type='text/javascript'>
-				$('pm_error_{$toMemberData['member_id']}').hide();
-			</script>
-		<ul>
-			<li class='field'>
-				<label for='pm_subject_{$toMemberData['member_id']}'>Subject</label>
-				<input type='text' class='input_text' id='pm_subject_{$toMemberData['member_id']}' name='msg_title' size='50' tabindex='1' />
-			</li>
-			<li class='field'>
-				<label for='pm_textarea_{$toMemberData['member_id']}'>Message</label>
-				<textarea class='input_text' name='Post' tabindex='2' id='pm_textarea_{$toMemberData['member_id']}' cols='70' rows='8'></textarea>
-			</li>
-		</ul>
-	</fieldset>
-	<fieldset class='submit'>
-		<input type='submit' class='input_submit' name='send_msg' value='Send' /> or <a href='#' class='cancel' title='Cancel sending' id='pm_cancel_{$toMemberData['member_id']}'>Cancel</a>
-	</fieldset>
-</form>]]></template_content>
-      <template_name>PMQuickForm</template_name>
-      <template_data>$toMemberData</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<div id='message_compose' class='post_form'>
-	<form id='msgForm' style='display:block' action="{parse url="module=messaging&amp;section=send&amp;do=send" base="publicWithApp"}" method="post" name="REPLIER">
-	<input type='hidden' name='topicID' value="{$displayData['topicID']}" />
-	<input type='hidden' name="postKey" value="{$displayData['postKey']}" />
-	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />	
-	
-<if test="$displayData['preview']">
-	<h2>{$this->lang->words['pm_preview']}</h2>
-	<div class='post_wrap' id='post_preview'>
-		<div class='row2' style='padding:8px'>
-			<div class='post entry-content'>{$displayData['preview']}</div>
-		</div>
-	</div>
-	<br />
-</if>
-<h2>Compose New Message</h2>
-<if test="$displayData['errors']">
-<div class='message error'>
-	<h4>{$this->lang->words['err_errors']}</h4>
-	<p>{$displayData['errors']}</p>
-	<p>{$this->lang->words['pme_none_sent']}</p>
-</div>
-</if>
-<ul class='topic_options'></ul>
-<fieldset>
-	<h3 class='bar'>Recipients</h3>
-	<ul>
-		<li class='field'>
-			<label for='entered_name'>{$this->lang->words['to_whom']}</label>
-			<input type="text" class='input_text' id='entered_name' name="entered_name" size="30" value="{$displayData['name']}" tabindex="1" />
-		</li>
-		<if test="intval($this->memberData['g_max_mass_pm'])">
-			<li class='field'>
-				<label for='more_members'>Other Recipients</label>
-				<input type='text' size="50" class='input_text' name='inviteUsers' value='{$displayData['inviteUsers']}' id='more_members' tabindex='2' />
-				<span class='desc'>You may add up to <strong>{$this->memberData['g_max_mass_pm']}</strong> other recipients</span>
-			</li>
-			<li class='field'>
-				<label for='send_type'>Send to others as</label>
-				<select name='sendType' id='send_type'>
-					<option value='invite'>Invitation</option>
-					<option value='copy'>Copy</option>
-				</select>
-				<span class='desc'>
-					<strong>Invitation</strong> allows all invited members to participate in a single conversation<br />
-					<strong>Copy</strong> will send a separate conversation to each member
-				</span>
-			</li>				
-		</if>
-	</ul>
-</fieldset>
-<fieldset>
-	<h3 class='bar'>Message</h3>
-	<ul>
-		<li class='field'>
-			<label for='message_subject'>Message Subject</label>
-			<input type="text" name="msg_title" id='message_subject' class='input_text' size="40" tabindex="3" maxlength="40" value="{$displayData['title']}" />
-		</li>
-		<li>
-			{$displayData['editor']}
-		</li>
-	</ul>
-</fieldset>
-<if test="$displayData['uploadData']['canUpload']">
-<fieldset class='attachments'>
-	{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], 0"}
-</fieldset>
-</if>
-<fieldset class='submit'>
-	<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" tabindex="3" accesskey="s" />
-	<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="4" name="preview" />
-	<input class='input_submit alt' type="submit" value="{$this->lang->words['pms_send_later']}" tabindex="5" name="save" />
-	{$this->lang->words['or']} <a href='{parse url="app=members&amp;module=messaging" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-</fieldset>
-</form>
-</div>
-{parse template="include_highlighter" group="global" params=""}
-<br />]]></template_content>
-      <template_name>sendNewPersonalTopicForm</template_name>
-      <template_data>$displayData</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<div id='message_compose' class='post_form'>
-	<if test="$displayData['type'] == 'reply'">
-		<form id='msgForm' style='display:block' action="{parse url="module=messaging&amp;section=send&amp;do=sendReply" base="publicWithApp"}" method="post" name="REPLIER">
-	<else />
-		<form id='msgForm' style='display:block' action="{parse url="module=messaging&amp;section=send&amp;do=sendEdit" base="publicWithApp"}" method="post" name="REPLIER">
-	</if>
-		<input type="hidden" name="msgID" value="{$displayData['msgID']}" />
-	<input type='hidden' name='topicID' value="{$displayData['topicID']}" />
-	<input type='hidden' name="postKey" value="{$displayData['postKey']}" />
-	<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-	{$data['upload']}	
-<if test="$displayData['preview']">
-	<h2>{$this->lang->words['pm_preview']}</h2>
-	<div class='post_wrap' id='post_preview'>
-		<div class='row2' style='padding:8px'>
-			<div class='post entry-content'>{$displayData['preview']}</div>
-		</div>
-	</div>
-	<br />
-</if>
-<h2>
-	<if test="$displayData['type'] == 'reply'">
-		Compose Reply
-	<else />
-		Editing Message
-	</if>
-</h2>
-<if test="$displayData['errors']">
-	<h4>{$this->lang->words['err_errors']}</h4>
-	<p>
-		{$displayData['errors']}
-		<br />
-		<br />
-		{$this->lang->words['pme_none_sent']}
-	</p>
-</if>
-<ul class='topic_options'></ul>
-<fieldset>
-	<h3 class='bar'>Message</h3>
-	<ul>
-		<li>
-			{$displayData['editor']}
-		</li>
-	</ul>
-</fieldset>
-<if test="$displayData['uploadData']['canUpload']">
-<fieldset class='attachments'>
-	{parse template="uploadForm" group="post" params="$displayData['postKey'], 'msg', $displayData['uploadData']['attach_stats'], $displayData['msgID'], 0"}
-</fieldset>
-</if>
-<fieldset id='pm_options'>
-	<!-- nothing here now... so you can remove that 'pm_options' class, if there is one -->
-</fieldset>
-<fieldset class='submit'>
-	<if test="$displayData['type'] == 'reply'">
-		<input class='input_submit' type="submit" value="{$this->lang->words['submit_send']}" tabindex="10" accesskey="s" />
-		<input class='input_submit alt' type="submit" value="{$this->lang->words['pm_pre_button']}" tabindex="11" name="previewReply" />
-		or <a href='{parse url="app=members&amp;module=messaging&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='Cancel composing' class='cancel'>Cancel</a>
-	<else />
-		<input class='input_submit' type="submit" value="Save Message" tabindex="10" accesskey="s" />
-		or <a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$displayData['topicID']}" base="public"}' title='Cancel composing' class='cancel'>Cancel</a>
-	</if>
-	
-</fieldset>
-</form>
-</div>
-<br />]]></template_content>
-      <template_name>sendReplyForm</template_name>
-      <template_data>$displayData</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<div id='conversation'>
-	
-<div class='topic_controls'>
-	{$topic['_pages']}
-	<ul class='topic_buttons'>
-		<if test="1 == 1">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='Go to compose screen'>{parse replacement="compose_icon"} Compose New</a></li>
-		</if>
-		<if test="$topic['_canReply']">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} Add Reply</a></li>
-		<else />
-			<li class='disabled'><span>You cannot reply</span></li>
-		</if>
-		<!-- SKINNOTE: Can probably do with some kind of 'are you sure' dialogue here.. -->
-		<li><a onclick='ipb.messenger.deletePM(this)' id='pm_delete_t_{$topic['mt_id']}' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{parse replacement="delete_msg_icon"} Delete</a></li>
-	</ul>
-</div>
-<br />
-<h2>{$topic['mt_title']}</h2>
-<ul class='topic_options'></ul>
-<foreach loop="$replies as $msg_id => $msg">
-	<a id='msg{$msg['msg_id']}'></a>
-	<div class='post_block first hentry <if test="$post['post']['queued']==1">moderated</if> <if test="reputation:|:$this->settings['reputation_enabled']">with_rep</if>' id='post_id_{$msg['msg_id']}'>
-		<div class='post_wrap'>
-			<if test="$members[ $msg['msg_author_id'] ]['member_id']">
-				<h3>
-			<else />
-				<h3 class='guest'>
-			</if>
-					<if test="$members[ $msg['msg_author_id'] ]['member_id']">
-						<if test="$members[ $msg['msg_author_id'] ]['_online']">
-							{parse replacement="user_online"}
-						<else />
-							{parse replacement="user_offline"}
-						</if> &nbsp;
-							<a class="url fn" href='{parse url="showuser={$members[ $msg['msg_author_id'] ]['member_id']}" base="public" template="showuser" seotitle="{$members[ $msg['msg_author_id'] ]['members_seo_name']}"}'>{$members[ $msg['msg_author_id'] ]['members_display_name']}</a>{parse template="user_popup" group="global" params="$members[ $msg['msg_author_id'] ]['member_id'], $members[ $msg['msg_author_id'] ]['members_seo_name']"}
-					<else />
-						{$members[ $msg['msg_author_id'] ]['members_display_name']}
-					</if>
-					<if test="$msg['_ip_address'] != ''">
-						<span class='ip'>({$this->lang->words['ip']}:
-						<if test="$members[ $msg['msg_author_id'] ]['g_access_cp']">
-							<em>{$this->lang->words['ip_private']}</em>
-						<else />
-							<a href="{parse url="app=core&amp;module=usercp&amp;tab=members&amp;area=modIpaddress&amp;do=custom&amp;ip={$msg['ip_address']}" base="public"}" title='Find information about this IP'>{$msg['ip_address']}</a>
-						</if>
-						)</span>
-					</if>
-				</h3>
-			<p class='posted_info'>Sent {parse date="$msg['msg_date']" format="long"}</p>
-			<div class='author_info'>
-				{parse template="userInfoPane" group="global" params="$members[ $msg['msg_author_id'] ], $msg_id, array()"}
-			</div>
-			<div class='post_body'>
-				<div class='post entry-content'>
-					{$msg['msg_post']}
-					{$msg['attachmentHtml']}
-				</div>
-				<if test="$this->memberData['view_sigs'] AND $members[ $msg['msg_author_id'] ]['signature']">
-					{parse template="signature_separator" group="global" params="$members[ $msg['msg_author_id'] ]['signature']"}
-				</if>
-			</div>
-			<ul class='post_controls'>
-				<if test="($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-					<li class='report'>
-						<a href='{parse url="app=core&amp;module=reports&amp;rcom=messages&amp;topicID={$this->request['topicID']}&amp;st={$this->request['st']}&amp;msg={$msg['msg_id']}" base="public"}'>{parse replacement="report_post_icon"} Report</a>
-					</li>
-				</if>
-				<if test="$topic['_canReply']">
-					<li>
-						<a href="{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}" title="{$this->lang->words['tt_reply_to_post']}">{parse replacement="reply_post_icon"} Reply</a>
-					</li>
-				</if>
-				<if test="$msg['_canEdit'] === TRUE">
-					<li class='post_edit' id='edit_post_{$msg['msg_id']}'>
-						<a href='{parse url="module=messaging&amp;section=send&amp;do=editMessage&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}" base="publicWithApp"}' title='Edit this post'>{parse replacement="edit_post_icon"} Edit</a>
-					</li>
-				</if>
-				<if test="$msg['_canDelete'] === TRUE">
-					<li class='post_del' id='del_post_{$msg['msg_id']}'>
-						<a href='{parse url="module=messaging&amp;section=send&amp;do=deleteReply&amp;topicID={$topic['mt_id']}&amp;msgID={$msg['msg_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}' title='Delete this post' class='delete_post'>{parse replacement="delete_post_icon"} Delete</a>
-					</li>
-				</if>
-			</ul>
-		</div>		
-	</div>
-</foreach>
-<div class='topic_controls'>
-	{$topic['_pages']}
-	<ul class='topic_buttons'>
-		<if test="1 == 1">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='Go to compose screen'>{parse replacement="compose_icon"} Compose New</a></li>
-		</if>
-		<if test="$topic['_canReply']">
-			<li><a href='{parse url="module=messaging&amp;section=send&amp;do=replyForm&amp;topicID={$topic['mt_id']}" base="publicWithApp"}'>{parse replacement="reply_icon"} Add Reply</a></li>
-		<else />
-			<li class='disabled'><span>You cannot reply</span></li>
-		</if>
-		<!-- SKINNOTE: Can probably do with some kind of 'are you sure' dialogue here.. -->
-		<li><a onclick='ipb.messenger.deletePM(this)' id='pm_delete_b_{$topic['mt_id']}' href='{parse url="module=messaging&amp;section=view&amp;do=deleteConversation&amp;topicID={$topic['mt_id']}&amp;authKey={$this->member->form_hash}" base="publicWithApp"}'>{parse replacement="delete_msg_icon"} Delete</a></li>
-	</ul>
-</div>
-<br />
-<if test="$topic['_canReply']">
-	{parse js_module="editor"}
-	<script type='text/javascript'>
-		//<!#^#|CDATA|
-		{parse template="editorJS" group="editors" params=""}
-		//|#^#]>
-	</script>
-	
-	<br />
-	<div id='fast_reply'>
-		<h3>Fast Reply</h3>
-		<ul class='topic_options'></ul>
-		<div class='general_box alt'>
-			<form action='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=sendReply&amp;topicID={$topic['mt_id']}" base="public"}' method='post'>
-				{parse template="editorShell" group="editors" params="'fast-reply', 'msgContent', '', 1"}
-				<fieldset class='submit'>
-					<input type="hidden" name="authKey" value="{$this->member->form_hash}" />
-					<input type="hidden" name="fast_reply_used" value="1" />
-					<input type="hidden" name="enableemo" value="yes" />
-					<input type="hidden" name="enablesig" value="yes" />
-					<input type='submit' name="submit" class='input_submit' value='Post' />&nbsp;&nbsp;<input type='submit' name="previewReply" class='input_submit alt' value='Use Full Editor' />
-				</fieldset>
-			</form>
-		</div>
-	</div>
-	<script type="text/javascript">
-	//<!#^#|CDATA|
-		if( $('fast-reply_textarea') ){
-			$('fast-reply_textarea').setStyle('height: 70px');
-		}
-		
-		ipb.editor_values.set( 'emoticons', \$H({ {parse expression="IPSLib::fetchEmoticonsAsJson()"} }) );
-		ipb.vars['emoticon_url'] = "{$this->settings['emoticons_url']}";
-		//ipb.editors[ '{$editor_id}' ] = new ipb.editor( '{$editor_id}', parseInt($rte_mode), parseInt($rte_mode) == 1 ? 0 : 1, 'Hello this is an initial value' );
-		ipb.editors[ 'fast-reply' ] = new ipb.editor( 'fast-reply', USE_RTE );
-		in_use = 0;
-		<if test="$rte_mode != 1">
-			obj = ipb.editors['fast-reply'].editor_document;
-		<else />
-			obj = $( ipb.editors['fast-reply'].items['text_obj'] );
-		</if>
-		Event.observe( obj, 'click', function(){
-			if( in_use != 1 ){
-				$( ipb.editors['fast-reply'] ).resize_to( 250 );
-				in_use = 1;
-			}
-		}, true);
-	//|#^#]>
-	</script>	
-</if>
-</div>
-{parse template="include_highlighter" group="global" params=""}]]></template_content>
-      <template_name>showConversation</template_name>
-      <template_data><![CDATA[$topic, $replies, $members, $jump=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>showConversationForArchive</template_name>
-      <template_data>$topic, $replies, $members</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<script type='text/javascript'>
-	ipb.messenger.curFolder = '{$currentFolderID}';
-</script>
-<div class='topic_controls'>
-{$pages}
-<if test="$currentFolderID != 'drafts'">
-	{parse variable="folder_all" default=""}
-	{parse variable="folder_all" oncondition="$this->request['folderFilter'] == 'all' OR ! $this->request['folderFilter']" value="selected='selected'"}
-	{parse variable="folder_in" default=""}
-	{parse variable="folder_in" oncondition="$this->request['folderFilter'] == 'in'" value="selected='selected'"}
-	{parse variable="folder_sent" default=""}
-	{parse variable="folder_sent" oncondition="$this->request['folderFilter'] == 'sent'" value="selected='selected'"}
-</if>
-<ul class='topic_buttons'>
-	<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='Go to compose screen'>{parse replacement="compose_icon"} Compose New</a></li>
-</ul>
-</div>
-<div id='message_list'>
-	<form action="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=multiFile&amp;cFolderID={$currentFolderID}" base="public"}" id='msgFolderForm' method="post">
-	<input type="hidden" name="sort" value="{$this->request['sort']}" />
-	<input type="hidden" name="st" value="{$this->request['st']}" />
-	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-		<table class='ipb_table' id='message_table'>
-			<caption>{$dirname}</caption>
-			<tr class='header'>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_m_subject'>Topic</th>
-				<th scope='col' class='col_m_from'>Starter</th>
-				<th scope='col' class='col_m_to'><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showFolder&amp;folderID={$currentFolderID}&amp;sort=nameTo&amp;st={$this->request['st']}" base="public"}">To</a></th>
-				<th scope='col' class='col_m_replies'>Replies</th>
-				<th scope='col' class='col_m_date'>Last Message</th>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_mod short'><input type='checkbox' class='input_check' id='msg_checkall' value='1' /></th>
-			</tr>
-			<if test="count( $messages )">
-				{parse striping="msg_stripe" classes="row1,row2"}
-				<foreach loop="messages:$messages as $id => $msg">
-					<tr id='{$msg['mt_id']}' class='{parse striping="msg_stripe"}'>
-						<td class='altrow short'>
-							<if test="$msg['mt_is_deleted'] OR $msg['map_user_banned']">
-								{parse replacement="msg_deleted"}
-							<else />
-								<if test="$msg['map_has_unread'] == 1">
-									{parse replacement="msg_icon_new"}
-								<else />
-									{parse replacement="msg_icon"}
-								</if>
-							</if>
-						</td>
-						<td>
-							<if test="$msg['mt_hasattach']">
-								{parse replacement="t_attach"}
-							</if>
-							<span class='m_title'>
-								<if test="$msg['map_has_unread'] == 1">
-								<a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID=__firstUnread__" base="public"}' title='Go to first unread post'>{parse replacement="f_newpost"}</a>
-									<strong>
-								</if>
-								<if test="$currentFolderID == 'drafts'">
-									<a href="{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								<else />
-									<a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								</if>
-								<if test="$msg['map_has_unread'] == 1">
-									</strong>
-								</if>
-								<if test="is_array( $msg['pages'] ) AND count( $msg['pages'] )">
-									<ul class='mini_pagination'>
-									<foreach loop="$msg['pages'] as $page">
-											<if test="$page['last']">
-												<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='Go to page {$page['page']}'>{$page['page']} {$this->lang->words['_rarr']}</a></li>
-											<else />
-												<li><a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}&amp;st={$page['st']}" base="public"}" title='Go to page {$page['page']}'>{$page['page']}</a></li>
-											</if>
-									</foreach>
-									</ul>
-								</if>
-								<if test="in_array( $currentFolderID, array( 'new' ) )">
-									<p>Folder: {$msg['_folderName']}</p>
-								</if>
-							</span>
-						</td>
-						<td class='altrow short'>
-							<if test="$msg['_starterMemberData']['members_display_name']">
-								<a href='{parse url="showuser={$msg['_starterMemberData']['member_id']}" base="public" seotitle="{$msg['_starterMemberData']['members_seo_name']}" template="showuser"}'>{$msg['_starterMemberData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_starterMemberData']['member_id'], $msg['_starterMemberData']['members_seo_name']"}
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-						</td>
-						<td class='short'>
-							<if test="$msg['_toMemberData']['members_display_name']">
-								<a href='{parse url="showuser={$msg['_toMemberData']['member_id']}" base="public" seotitle="{$msg['_toMemberData']['members_seo_name']}" template="showuser"}'>{$msg['_toMemberData']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_toMemberData']['member_id'], $msg['_toMemberData']['members_seo_name']"}
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-							<if test="$msg['_otherInviteeCount'] > 0">
-								<if test="$msg['_otherInviteeCount'] > 1">
-									<p title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>(and {$msg['_otherInviteeCount']} others)</p>
-								<else />
-									<p title='{parse expression="implode( ', ', $msg['_invitedMemberNames'] )"}'>(and {$msg['_otherInviteeCount']} other)</p>
-								</if>
-							</if>
-						</td>
-						<td  class='altrow short'>
-							<span class='desc'><if test="$msg['map_user_banned']">-<else />{parse expression="intval( $msg['mt_replies'] )"}</if></span>
-						</td>
-						<td>
-							<ul class='last_post'>
-								<if test="$msg['map_user_banned']">
-									<li><em>Information Not Available</em></li>
-								<else />
-									<li><a href='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=findMessage&amp;topicID={$msg['mt_id']}&amp;msgID={$msg['mt_last_msg_id']}" base="public"}' title='Go to last post'>{parse replacement="f_lastpost"}</a> {parse date="$msg['mt_last_post_time']" format="long"}</li>
-									<li>By: <a href="{parse url="showuser={$msg['_lastMsgAuthor']['member_id']}" base="public" seotitle="{$msg['_lastMsgAuthor']['members_seo_name']}" template="showuser"}">{$msg['_lastMsgAuthor']['members_display_name']}</a>{parse template="user_popup" group="global" params="$msg['_lastMsgAuthor']['member_id'], $msg['_lastMsgAuthor']['members_seo_name']"}</li>
-								</if>
-							</ul>
-						</td>
-						<td class='altrow short'>
-							<if test="$msg['map_ignore_notification']">
-								{parse replacement="msg_notify_off"}
-							<else />
-								{parse replacement="msg_notify_on"}
-							</if>
-						</td>
-						<td class='short'>
-							<input type='checkbox' class='input_check msg_check' name='msgid[{$msg['mt_id']}]' id='msg_check_{$msg['mt_id']}' />
-						</td>
-					</tr>
-				</foreach>
-			<else />
-				<tr>
-					<td colspan='8' class='no_messages row1'>
-						There are no messages to view in this folder
-					</td>
-				</tr>
-			</if>
-		</table>
-		<div id='messenger_mod' class='moderation_bar'>
-			<select id='pm_multifile' name='pm_multifile' class='input_select'>
-				<optgroup label="With Selected...">
-					<option value="delete">Delete</option>
-					<if test="$currentFolderID != 'drafts'">
-						<option value="markread">Mark Read</option>
-						<option value="markunread">Mark Unread</option>
-						<option value="notifyon">Turn On Notifications</option>
-						<option value="notifyoff">Turn Off Notifications</option>
-					</if>
-				</optgroup>
-				<if test="$jumpFolderHTML AND $currentFolderID != 'drafts' AND $currentFolderID != 'new'">
-					<optgroup label="Or Move To...">
-						{$jumpFolderHTML}
-					</optgroup>
-				</if>
-			</select>
-			<input type="button" class='input_submit alt' onclick='ipb.messenger.goMultiFile(this)' value="Go" />
-		</div>
-	</form>
-	<div id='messenger_filter'>
-		<form method='post' action='{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showFolder&amp;folderID={$currentFolderID}" base="public"}'>
-			<label for='conversation_filter'>Show: </label>
-			<select id='conversation_filter' name='folderFilter' class='input_select'>
-				<option value='' {parse variable="folder_all"}>All Conversations</option>
-				<option value='in' {parse variable="folder_in"}>Conversations Others Started</option>
-				<option value='sent' {parse variable="folder_sent"}>Conversations I Started</option>
-			</select>
-			<input type='submit' class='input_submit alt' value='Update' />
-		</form>
-	</div>
-</div>
-<br />
-<div class='topic_controls'>
-{$pages}
-<ul class='topic_buttons'>
-	<li><a href='{parse url="module=messaging&amp;section=send&amp;do=form" base="publicWithApp"}' title='Go to compose screen'>{parse replacement="compose_icon"} Compose New</a></li>
-</ul>
-</div>]]></template_content>
-      <template_name>showFolder</template_name>
-      <template_data>$messages, $dirname, $pages, $currentFolderID, $jumpFolderHTML</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_messaging</template_group>
-      <template_content><![CDATA[<script type='text/javascript'>
-//<!#^#|CDATA|
-	ipb.messenger.curFolder = 'in';
-//|#^#]>
-</script>
-<h2>Your Search Results</h2>
-<if test="$error">
-	<p class='message error'>
-		{$error}
-	</p>
-	<br />
-</if>
-<div class='topic_controls'>
-{$pages}
-</div>
-<br />	
-<div id='message_list'>
-		<table class='ipb_table' id='message_table'>
-			<caption>{$dirname}</caption>
-			<tr class='header'>
-				<th scope='col' class='col_m_status'>&nbsp;</th>
-				<th scope='col' class='col_m_subject'>Subject</th>
-				<th scope='col' class='col_m_replies'>Replies</th>
-				<th scope='col' class='col_m_sender'>Recipient</th>
-				<th scope='col' class='col_m_date'>Date</th>
-			</tr>
-		
-			<if test="count( $messages )">
-				{parse striping="msg_stripe" classes="row1,row2"}
-				<foreach loop="messages:$messages as $id => $msg">
-					<tr id='{$msg['mt_id']}' class='{parse striping="msg_stripe"}'>
-						<td class='altrow short'>
-							<if test="$msg['map_has_unread'] != 1">
-								{parse replacement="msg_read"}
-							<else />
-								{parse replacement="msg_unread"}
-							</if>
-							<if test="$msg['mt_is_deleted']">
-								{parse replacement="msg_deleted"}
-							</if>
-						</td>
-						<td>
-							<if test="$msg['mt_hasattach']">
-								{parse replacement="t_attach"}
-							</if>
-							<span class='m_title'>
-								<if test="$msg['map_has_unread'] == 1">
-									<strong>
-								</if>
-								<a href="{parse url="app=members&amp;module=messaging&amp;section=view&amp;do=showConversation&amp;topicID={$msg['mt_id']}" base="public"}">{$msg['mt_title']}</a>
-								<if test="$msg['map_has_unread'] == 1">
-									</strong>
-								</if>
-								<p>Label: {$msg['_folderName']}</p>
-							</span>
-						</td>
-						<td>
-							<span class='desc'>{parse expression="intval( $msg['mt_replies'] )"}</span>
-						</td>
-						<td class='altrow'>
-							<if test="$msg['_toMemberData']['member_id']">
-								<a href='{parse url="showuser={$msg['_toMemberData']['member_id']}" base="public"}'>{$msg['_toMemberData']['members_display_name']}</a>
-								<if test="$msg['mt_invited_count']">
-									<if test="$msg['mt_invited_count'] > 1">
-										<p>(and {$msg['mt_invited_count']} others)</p>
-									<else />
-										<p>(and {$msg['mt_invited_count']} other)</p>
-									</if>
-								</if>
-								<!-- SKINNOTE: Add block user back in -->
-							<else />
-								<span class='desc'>{$this->lang->words['deleted_user']}</span>
-							</if>
-						</td>
-						<td>
-							{parse date="$msg['mt_last_post_time']" format="long"}
-						</td>
-					</tr>
-				</foreach>
-			<else />
-				<tr>
-					<td colspan='5' class='no_messages row1'>
-						There are no messages to view
-					</td>
-				</tr>
-			</if>
-		</table>
-	</form>
-</div>]]></template_content>
-      <template_name>showSearchResults</template_name>
-      <template_data>$messages, $pages, $error</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_mlist">
-    <template>
-      <template_group>skin_mlist</template_group>
-      <template_content><![CDATA[<users>
-<if test="is_array( $members ) and count( $members )">
-	<foreach loop="$members as $member">
-		<user>
-			<id>{$member['id']}</id>
-			<name>{$member['members_display_name']}</name>
-			<url>{parse url="showuser={$member['id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}</url>
-			<joined>{$member['joined']}</joined>
-			<group>{IPSLib::makeNameFormatted( $member['group'], $member['member_group_id'] )}</group>
-			<posts>{parse format_number="$member['posts']"}</posts>
-			<reputation>{$member['pp_reputation_points']}</reputation>
-			<rating>{$member['pp_rating_real']}</rating>
-		</user>
-	</foreach>
-</if>
-	{$pages}
-	</users>]]></template_content>
-      <template_name>member_list_show</template_name>
-      <template_data><![CDATA[$members, $pages="", $dropdowns=array(), $defaults=array(), $custom_fields=null, $url='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_online">
-    <template>
-      <template_group>skin_online</template_group>
-      <template_content><![CDATA[<onlinelist>
-<if test="count($rows)">
-	<foreach loop="online:$rows as $session">
-	<online>
-		<location>
-		<if test="!$session['where_line']">
-			<where>{$this->lang->words['board_index']}</where>
-		<else />
-			<if test="$session['where_link'] AND !$session['where_line_more']"><url>{parse url="{$session['where_link']}" base="public"}</url></if>
-			<where>{$session['where_line']}</where>
-				<if test="$session['where_line_more']">
-					<if test="$session['where_link']"><url>{parse url="{$session['where_link']}" base="public"}</url></if>
-			<where>{$session['where_line_more']}</where>
-				</if>
-			</if>
-		</location>
-		<date>{$session['running_time']}</date>
-		<if test="$session['member_name']">	
-		<if test="$session['member_id']">
-		<user>
-			<id>{$session['member_id']}</id>
-			<name><!#^#|CDATA|{$session['member_name']}|#^#]></name>
-			<url><!#^#|CDATA|{parse url="showuser={$session['member_id']}" base="public"}|#^#]></url>		
-		</user>		
-		<else />
-		<user>
-			<id>0</id>
-			<name><!#^#|CDATA|{$session['member_name']}|#^#]></name>
-			<url></url>		
-		</user>			
-		</if>
-		<else />
-		<user>
-			<id>0</id>
-			<name>Guest</name>
-			<url></url>		
-		</user>
-		</if>
-	</online>
-	</foreach>
-</if>
-</onlinelist>
-{$links}]]></template_content>
-      <template_name>showOnlineList</template_name>
-      <template_data><![CDATA[$rows, $links="", $defaults=array(), $our_mgroups=array()]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_profile">
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<gender>
-	<title>{$f->raw_data['pf_title']}</title>	
-<if test="$f->value">
-	<if test="$f->value == 'm'">
-	<icon>{$this->settings['img_url']}/profile/male.png</icon>
-	<value>Male</value>
-	</if>
-	
-	<if test="$f->value == 'f'">
-	<icon>{$this->settings['img_url']}/profile/female.png</icon>
-	<value>Female</value>	
-	</if>
-	
-	<if test="$f->value =='u'">
-	<icon>{$this->settings['img_url']}/profile/mystery.png</icon>
-	<value>Not Telling</value>	
-	</if>
-<else />
-	<icon></icon>
-	<value>{$this->lang->words['m_no_gender']}</value>	
-</if>
-</gender>]]></template_content>
-      <template_name>customField__gender</template_name>
-      <template_data>$f</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>customField__generic</template_name>
-      <template_data>$f</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<contact>
-	<title>{$f->raw_data['pf_title']}</title>
-	<icon>{$this->settings['public_dir']}/{$f->raw_data['pf_icon']}</icon>
-	<value>
-<if test="is_array( $f->parsed )">
-	<foreach loop="$f->parsed as $value">
-		{$value}
-	</foreach>
-<else />
-		{$f->parsed}
-</if>
-	</value>
-</contact>]]></template_content>
-      <template_name>customFieldGroup__contact</template_name>
-      <template_data>$f</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<displaynames>
-	<current>{$member_name}</current>
-<if test="is_array($records) AND count($records)">
-	<history>
-    <foreach loop="records:$records as $row">
-    	<entry>
-    		<from>{$row['dname_previous']}<from>
-		 	<to>{$row['dname_current']}</to>
-		 	<date>{$row['dname_date']}</date>
-		</entry>
-	</foreach>
-	</history>
-</if>
-</displaynames>]]></template_content>
-      <template_name>dnameWrapper</template_name>
-      <template_data><![CDATA[$member_name="",$records=array()]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>friendsIframe</template_name>
-      <template_data>$member, $friends, $showWrapper=false</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[{parse js_module="friends"}
-<h2>{$this->lang->words['m_friends_list']}</h2>
-<if test="$pages">
-	<div class='topic_controls'>
-		$pages
-	</div>
-</if>
-<ul class='tab_bar no_title'>
-	<if test="$this->request['tab'] == 'list' || !$this->request['tab']">
-		<li class='active'><strong>{$this->lang->words['m_friends_list']}</strong></li>
-		<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=pending" base="public"}' title='{$this->lang->words['m_friends_pending']}'>{$this->lang->words['m_friends_pending']}</a></li>
-	</if>
-	<if test="$this->request['tab'] == 'pending'">
-		<li><a href='{parse url="app=members&amp;section=friends&amp;module=profile&amp;do=list&amp;tab=list" base="public"}' title='{$this->lang->words['m_friends_list']}'>{$this->lang->words['m_friends_list']}</a></li>
-		<li class='active'><strong>{$this->lang->words['m_friends_pending']}</strong></li>
-	</if>
-</ul>
-<if test="is_array($friends) and count($friends) && $this->settings['friends_enabled']">
-	{parse striping="memberStripe" classes="row1,row2"}
-	<ul class='members'>
-	<foreach loop="friends:$friends as $friend">
-		<if test="$this->request['tab'] == 'pending'">
-			<li id='member_id_{$friend['member_id']}' class='general_box member_entry {parse striping="memberStripe"}'>
-				<h3 class='bar'><a href='{parse url="showuser={$friend['friends_member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='View profile'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='View profile'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}'s photo" class='photo' /></a>	
-			
-				<dl class='info'>
-					<dt class='clear'>Joined:</dt>
-					<dd>{$friend['joined']}</dd>
-					<dt class='clear'>Group:</dt>
-					<dd>{$friend['_group_formatted']}</dd>
-					<dt class='clear'>Posts:</dt>
-					<dd>{parse format_number="$friend['posts']"}</dd>
-					<dt class='clear'>Last Active:</dt>
-					<dd>{$friend['last_activity']}</dd>
-				</dl>
-				
-				<ul class='user_controls'>
-					<li class='positive'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=approve&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='Approve'>{parse replacement="approve"} Approve Request</a></li>
-					<li class='negative'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=moderate&amp;pp_option=delete&amp;pp_friend_id[{$friend['member_id']}]=1&amp;md5check={$this->member->form_hash}" base="public"}' title='Deny'>{parse replacement="deny"} Deny Request</a></li>
-				</ul>
-				<if test="$this->settings['pp_allow_member_rate']">
-					<p class='rating'> 
-						<if test="$friend['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
-					</p>
-				</if>
-				
-				<if test="$this->settings['reputation_enabled']">
-					<if test="$friend['pp_reputation_points'] > 0">
-						<p class='reputation positive'>
-					</if>
-					<if test="$friend['pp_reputation_points'] < 0">
-						<p class='reputation negative'>
-					</if>
-					<if test="$friend['pp_reputation_points'] == 0">
-						<p class='reputation zero'>
-					</if>
-							<span class='number'>Reputation: {$friend['pp_reputation_points']}</span>
-						</p>
-				</if>						
-			</li>
-		<else />
-			<li id='member_id_{$friend['friends_friend_id']}' class='general_box member_entry {parse striping="memberStripe"}'>
-				<h3 class='bar'><a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='View profile'>{$friend['members_display_name']}</a>{parse template="user_popup" group="global" params="$friend['member_id']"}</h3>
-				<a href='{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}' title='View profile'><img src='{$friend['pp_thumb_photo']}' width='{$friend['pp_thumb_width']}' height='{$friend['pp_thumb_height']}' alt="{$friend['members_display_name']}'s photo" class='photo' /></a>	
-			
-				<dl class='info'>
-					<dt class='clear'>Joined:</dt>
-					<dd>{$friend['joined']}</dd>
-					<dt class='clear'>Group:</dt>
-					<dd>{$friend['_group_formatted']}</dd>
-					<dt class='clear'>Posts:</dt>
-					<dd>{parse format_number="$friend['posts']"}</dd>
-					<dt class='clear'>Last Active:</dt>
-					<dd>{$friend['last_activity']}</dd>
-				</dl>
-				
-				<ul class='user_controls'>
-					<if test="$this->memberData['member_id'] AND $this->memberData['member_id'] != $friend['friends_friend_id'] && $this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends']">
-						<if test="IPSMember::checkFriendStatus( $friend['friends_friend_id'] )">
-							<li class='mini_friend_toggle is_friend' id='friend_profile_{$friend['friends_friend_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=remove&amp;member_id={$friend['friends_friend_id']}" base="public"}' title='Remove Friend'>{parse replacement="remove_friend"}</a></li>
-						<else />
-							<li class='mini_friend_toggle is_not_friend' id='friend_profile_{$friend['friends_friend_id']}'><a href='{parse url="app=members&amp;module=profile&amp;section=friends&amp;do=add&amp;member_id={$friend['friends_friend_id']}" base="public"}' title='Add as friend'>{parse replacement="add_friend"}</a></li>								
-						</if>
-					</if>
-					<if test="$this->memberData['g_use_pm'] AND $this->memberData['members_disable_pm'] == 0 AND IPSLib::moduleIsEnabled( 'messaging', 'members' )">
-						<li class='pm_button'><a href='{parse url="app=members&amp;module=messaging&amp;section=send&amp;do=form&amp;fromMemberID={$friend['friends_member_id']}" base="public"}' title='PM this member' id='pm_xxx_{$friend['friends_friend_id']}'>{parse replacement="send_msg"}</a></li>
-					</if>
-					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}&amp;view_by_title=1&amp;search_filter_app[forums]=1" base="public"}'>{parse replacement="find_posts_link"} Find Topics</a></li>
-					<li><a href='{parse url="app=core&amp;module=search&amp;do=user_posts&amp;mid={$friend['friends_friend_id']}<if test="! in_array( $this->settings['search_method'], array( 'traditional', 'sphinx' ) )">&amp;search_filter_app[forums]=1</if>" base="public"}'>{parse replacement="find_posts_link"} Find Posts</a></li>
-					<if test="$friend['has_blog']">
-						<li><a href='{parse url="app=blog&amp;module=display&amp;section=blog&amp;mid={$friend['friends_friend_id']}" base="public"}' title='{$this->lang->txt['view_blog']}'>{parse replacement="blog_link"}</a></li>
-					</if>
-					<if test="$friend['has_gallery']">
-						<li><a href='{parse url="app=gallery&amp;module=user&amp;section=user&amp;user={$friend['friends_friend_id']}" base="public"}' title='VIew gallery'>{parse replacement="gallery_link"}</a></li>
-					</if>
-				</ul>
-				<if test="$this->settings['pp_allow_member_rate']">
-					<p class='rating'> 
-						<if test="$friend['pp_rating_real'] >= 1">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 2">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 3">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 4">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if><if test="$friend['pp_rating_real'] >= 5">{parse replacement="rate_on"}<else />{parse replacement="rate_off"}</if>
-					</p>
-				</if>
-				
-				<if test="$this->settings['reputation_enabled']">
-					<if test="$friend['pp_reputation_points'] > 0">
-						<p class='reputation positive'>
-					</if>
-					<if test="$friend['pp_reputation_points'] < 0">
-						<p class='reputation negative'>
-					</if>
-					<if test="$friend['pp_reputation_points'] == 0">
-						<p class='reputation zero'>
-					</if>
-							<span class='number'>Reputation: {$friend['pp_reputation_points']}</span>
-						</p>
-				</if>						
-			</li>
-		</if>
-		
-	</foreach>
-	</ul>
-<else />
-	<p class='no_messages'>
-		<if test="$this->request['tab'] == 'pending'">
-			No friends awaiting approval
-		<else />
-			No friends to display
-		</if>
-	</p>
-</if>
-<if test="$pages">
-	<div class='topic_controls'>
-		$pages
-	</div>
-</if>]]></template_content>
-      <template_name>friendsList</template_name>
-      <template_data>$friends, $pages</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<profile>
-		<id>{$member['member_id']}</id>
-		<name>{$member['members_display_name']}</name>
-		<rating>{$member['pp_rating_real']}</rating>
-		<photo>{$member['pp_main_photo']}</photo>
-		<reputation>{$member['pp_reputation_points']}</reputation>
-		<group>{$member['g_title']}</group>
-		<posts>{parse format_number="$member['posts']"}</posts>
-		<postsperday>{$member['_posts_day']}</postsperday>
-		<joined>{$member['joined']}</joined>
-		<views>{parse format_number="$member['members_profile_views']"}</views>
-		<lastactive>{$member['_last_active']}></lastactive>
-		<location><if test="$member['_online']">{$member['online_extra']}<else />{$this->lang->words['online_offline']}</if></location>
-		<title>{$member['title']}</title>
-		<age><if test="$member['_age'] > 0">{$member['_age']}<else />{$this->lang->words['m_age_unknown']}</if></age>
-		<birthday><if test="$member['bday_day']">{$member['_bday_month']}<if test="$member['bday_year']">, {$member['bday_year']}</if><else />{$this->lang->words['m_bday_unknown']}</if></birthday>
-		<gender>{$member['custom_fields']['profile_info']['gender']}</gender>
-		<contactinformation>
-<if test="is_array( $member['custom_fields']['contact'])">
-	<foreach loop="$member['custom_fields']['contact'] as $field">
-			{$field}
-	</foreach>
-</if>
-		</contactinformation>
-		
-<if test="latest_visitors:|:$member['pp_setting_count_visitors']">
-		<latestvisitors>
-	<if test="is_array( $visitors ) && count( $visitors )">
-		<foreach loop="latest_visitors:$visitors as $friend">
-			<user>
-				<id>{$friend['member_id']}</id>
-				<name>{$friend['members_display_name_short']}</name>
-				<url>{parse url="showuser={$friend['member_id']}" seotitle="{$friend['members_seo_name']}" template="showuser" base="public"}</url>
-				<photo>{$friend['pp_mini_photo']}</photo>
-				<visited>{$friend['_visited_date']}</visited>
-			</user>
-		</foreach>
-	</if>
-		</latestvisitors>
-</if>
-<if test="friends:|:$this->settings['friends_enabled'] AND $this->memberData['g_can_add_friends'] AND $member['pp_setting_count_friends']">
-		<friends>
-	<if test="is_array($friends) and count($friends)">
-		<foreach loop="friends:$friends as $friend">
-			<user>
-				<id>{$friend['member_id']}</id>
-				<name>{$friend['members_display_name_short']}</name>
-				<url>{parse url="showuser={$friend['member_id']}" base="public"}</url>
-				<photo>{$friend['pp_thumb_photo']}</photo>
-			</user>
-		</foreach>
-	</if>
-		</friends>
-</if>
-	
-<if test="comments:|:$member['pp_setting_count_comments'] > 0">
-		<comments>
-			$comments
-		</comments>
-</if>
-	</profile>]]></template_content>
-      <template_name>profileModern</template_name>
-      <template_data><![CDATA[$tabs=array(), $member=array(), $comments="", $friends=array(), $visitors=array(), $default_tab='posts', $default_tab_content='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>showCard</template_name>
-      <template_data>$member, $download=0</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<if test="is_array($comments) and count($comments)">
-	<foreach loop="comments:$comments as $comment">
-			<comment>
-				<id>{$comment['comment_id']}</id>
-				<text>{$comment['comment_content']}</text>
-				<date>{$comment['_comment_date']}</date>
-				<user>
-					<id>{$comment['member_id']}</id>
-					<name>{$comment['members_display_name_short']}</name>
-					<url>{parse url="showuser={$comment['member_id']}" base="public" template="showuser" seotitle="{$comment['members_seo_name']}"}</url>
-					<photo>{$comment['pp_thumb_photo']}</photo>
-				</user>
-			</comment>
-	</foreach>
-	{$links}
-</if>]]></template_content>
-      <template_name>showComments</template_name>
-      <template_data><![CDATA[$member, $comments=array(), $new_id=0, $return_msg='', $links='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>showIframeComments</template_name>
-      <template_data>$member, $comments, $pages</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>showPhoto</template_name>
-      <template_data>$member</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>statusReplies</template_name>
-      <template_data>$replies=array()</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>statusUpdates</template_name>
-      <template_data>$updates=array(), $smallSpace=0, $latestOnly=0</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>statusUpdatesPage</template_name>
-      <template_data>$updates=array(), $actions</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<aboutme>{$member['pp_about_me']}</aboutme>]]></template_content>
-      <template_name>tabAboutMe</template_name>
-      <template_data>$member=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>tabNoContent</template_name>
-      <template_data>$langkey</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<posts>
-$content
-</posts>]]></template_content>
-      <template_name>tabPosts</template_name>
-      <template_data>$content</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content/>
-      <template_name>tabSingleColumn</template_name>
-      <template_data><![CDATA[$row=array(), $read_more_link='', $url='', $title='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>tabStatusUpdates</template_name>
-      <template_data>$updates=array(), $actions, $member=array()</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_profile</template_group>
-      <template_content>$content</template_content>
-      <template_name>tabTopics</template_name>
-      <template_data>$content</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-  <templategroup group="skin_ucp">
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>coreAttachments</template_name>
-      <template_data><![CDATA[$info="",$pages="",$attachments]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>coreNotesForm</template_name>
-      <template_data><![CDATA[$editor_html=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>displayNameForm</template_name>
-      <template_data><![CDATA[$form=array(),$error="",$okmessage=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>emailChangeForm</template_name>
-      <template_data>$txt, $_message, $captchaHTML</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>field_dropdown</template_name>
-      <template_data><![CDATA[$name="",$options=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>field_entry</template_name>
-      <template_data><![CDATA[$title="",$desc="",$content="",$id=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>field_textarea</template_name>
-      <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>field_textinput</template_name>
-      <template_data><![CDATA[$name="",$value=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>forumPrefsForm</template_name>
-      <template_data>$emailData, $data</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>forumsInlineAvatarImages</template_name>
-      <template_data>$images=array(), $dir</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>generalSettingsForm</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>inlineModIPMessage</template_name>
-      <template_data><![CDATA[$msg='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>likesList</template_name>
-      <template_data><![CDATA[$likes, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>memberAvatarForm</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersAboutMeForm</template_name>
-      <template_data><![CDATA[$preview_about_me="",$editor_html=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersFacebookConnect</template_name>
-      <template_data>$fbuid, $fbUserData, $linkedMemberData</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersIgnoredUsersForm</template_name>
-      <template_data>$members</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersModFindUser</template_name>
-      <template_data><![CDATA[$inlineMsg=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersModIPForm</template_name>
-      <template_data><![CDATA[$ip="", $inlineMsg='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersModIPFormMembers</template_name>
-      <template_data><![CDATA[$pages="",$members]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersModIPFormPosts</template_name>
-      <template_data><![CDATA[$count=0, $pageLinks='', $results]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersPhotoForm</template_name>
-      <template_data><![CDATA[$cur_photo="",$show_size="",$p_max=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>membersProfileCustomize</template_name>
-      <template_data>$options, $input, $errors</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersProfileForm</template_name>
-      <template_data><![CDATA[$personal_statement='',$required_output='',$optional_output='',$day='',$mon='',$year='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>membersSignatureForm</template_name>
-      <template_data><![CDATA[$preview_sig="",$editor_html=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>membersSignatureFormError</template_name>
-      <template_data>$form</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>membersTwitterConnect</template_name>
-      <template_data>$isConnected, $twitterUser=array()</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>modAnnounceForm</template_name>
-      <template_data><![CDATA[$announce="",$button="",$forum_html="",$type="",$editor_html="",$msg=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>modAnnouncements</template_name>
-      <template_data>$announcements</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>notificationsForm</template_name>
-      <template_data>$config, $emailData</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>notificationsLog</template_name>
-      <template_data><![CDATA[$notifications, $error='', $pages='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>passwordChangeForm</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>Show_attachments</template_name>
-      <template_data><![CDATA[$data=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content><![CDATA[<!--no data in this master skin-->]]></template_content>
-      <template_name>showNotification</template_name>
-      <template_data>$notification</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>ucp_message</template_name>
-      <template_data><![CDATA[$title="",$msg=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>userCPTemplate</template_name>
-      <template_data>$current_tab, $html, $tabs, $current_area, $errors=array(), $hide_form=0, $maxUpload=0</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>watchChoices</template_name>
-      <template_data><![CDATA[$forum="",$topic="",$method=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>watchedForums</template_name>
-      <template_data>$forumArray</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_ucp</template_group>
-      <template_content/>
-      <template_name>watchedTopics</template_name>
-      <template_data>$mainForumArray, $dateCut</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications/members/xml/public_members_language_pack.xml b/upload/admin/applications/members/xml/public_members_language_pack.xml
index 0bf93ad1..92c9ab89 100644
--- a/upload/admin/applications/members/xml/public_members_language_pack.xml
+++ b/upload/admin/applications/members/xml/public_members_language_pack.xml
@@ -4,472 +4,16 @@
     <lang>
       <word_app>members</word_app>
       <word_pack>public_list</word_pack>
-      <word_key>mlist_view_start_title</word_key>
-      <word_default>View members starting with</word_default>
-      <word_custom>Про�мотреть пользователей � именами начинающими�� �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>member_has_x_rep_like</word_key>
+      <word_default>%s has %s likes</word_default>
+      <word_custom>%s имеет %s лайков</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_list</word_pack>
-      <word_key>mlist_view_all_txt</word_key>
-      <word_default>ALL</word_default>
-      <word_custom>ВСЕ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>mlist_view_all_title</word_key>
-      <word_default>View all members</word_default>
-      <word_custom>Про�мотреть в�ех пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>mlist_adv_filt_opt</word_key>
-      <word_default>Advanced Filter Options</word_default>
-      <word_custom>Фильтры пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>mlist_adv_filt</word_key>
-      <word_default>Use advanced filters</word_default>
-      <word_custom>Дополнительные фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>mlist_header</word_key>
-      <word_default>Member List</word_default>
-      <word_custom>Спи�ок пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>page_title</word_key>
-      <word_default>Member List</word_default>
-      <word_custom>Спи�ок пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_by_joined</word_key>
-      <word_default>Join Date</word_default>
-      <word_custom>по дате реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_submit</word_key>
-      <word_default>Apply Filters</word_default>
-      <word_custom>Применить фильтры</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>ascending_order</word_key>
-      <word_default>Ascending Order</word_default>
-      <word_custom>пор�дке возра�тани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>descending_order</word_key>
-      <word_default>Descending Order</word_default>
-      <word_custom>пор�дке убывани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>member_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>member_name</word_key>
-      <word_default>Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sorting_text_results</word_key>
-      <word_default>results per page</word_default>
-      <word_custom>результатов на �траницу</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sorting_text_in</word_key>
-      <word_default>in</word_default>
-      <word_custom>в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sorting_text_with</word_key>
-      <word_default>with</word_default>
-      <word_custom>по</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sorting_text_by</word_key>
-      <word_default>by</word_default>
-      <word_custom>, �ортировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>member_joined</word_key>
-      <word_default>Joined</word_default>
-      <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_by_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>по имени пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>no_results</word_key>
-      <word_default>No Results</word_default>
-      <word_custom>�ет �овпадений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>member_group</word_key>
-      <word_default>Group</word_default>
-      <word_custom>Группа</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_after</word_key>
-      <word_default>after</word_default>
-      <word_custom>по�ле</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_contains</word_key>
-      <word_default>contains</word_default>
-      <word_custom>�одержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_before</word_key>
-      <word_default>before</word_default>
-      <word_custom>до</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_begins</word_key>
-      <word_default>begins with</word_default>
-      <word_custom>начинает�� �</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_lessthan</word_key>
-      <word_default>less than</word_default>
-      <word_custom>меньше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_dateformat</word_key>
-      <word_default>(MM-DD-YYYY)</word_default>
-      <word_custom>(ДД-ММ-ГГГГ)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_morethan</word_key>
-      <word_default>more than</word_default>
-      <word_custom>больше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_name</word_key>
-      <word_default>Member name</word_default>
-      <word_custom>По имени пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_signature</word_key>
-      <word_default>Signature contains</word_default>
-      <word_custom>Подпи�ь �одержит</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_lastvisit</word_key>
-      <word_default>Last visit is</word_default>
-      <word_custom>Врем� по�леднего по�ещени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>photo_only</word_key>
-      <word_default>Must have a photo</word_default>
-      <word_custom>Загрузил фотографию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_lastpost</word_key>
-      <word_default>Last post is</word_default>
-      <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_posts</word_key>
-      <word_default>Post count is</word_default>
-      <word_custom>Количе�тво �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>s_joined</word_key>
-      <word_default>Join date is</word_default>
-      <word_custom>Дата реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>m_views</word_key>
-      <word_default>Views</word_default>
-      <word_custom>Про�мотров</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>m_rating_morethan</word_key>
-      <word_default>Rating is higher than</word_default>
-      <word_custom>Рейтинг выше чем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>m_stars</word_key>
-      <word_default>stars</word_default>
-      <word_custom>баллов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>m_rating</word_key>
-      <word_default>Rating</word_default>
-      <word_custom>Рейтинг</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_by</word_key>
-      <word_default>Sort by: </word_default>
-      <word_custom>Сортировать: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30011</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>m_dd_views</word_key>
-      <word_default>Profile Views</word_default>
-      <word_custom>по количе�тву про�мотров профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>members_start_with</word_key>
-      <word_default>View members starting with </word_default>
-      <word_custom>Про�мотреть пользователей � именами начинающими�� � </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>reputation</word_key>
-      <word_default>Reputation</word_default>
-      <word_custom>Репутаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sorty_by_jdate</word_key>
-      <word_default>Sort by Joined Date</word_default>
-      <word_custom>Сортировать по дате реги�трации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>pcount</word_key>
-      <word_default>Post Count</word_default>
-      <word_custom>По количе�тву �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_by_posts</word_key>
-      <word_default>Total Posts</word_default>
-      <word_custom>по количе�тву �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_list</word_pack>
-      <word_key>sort_by_mname</word_key>
-      <word_default>Sort by Member Name</word_default>
-      <word_custom>Сортировать по имени пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_has_x_rep</word_key>
+      <word_default>%s has %s reputation points</word_default>
+      <word_custom>%s имеет %s баллов репутации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -477,1669 +21,433 @@
       <word_key>show_all</word_key>
       <word_default>Show All</word_default>
       <word_custom>Показать в�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pm_pre_button</word_key>
-      <word_default>Preview Message</word_default>
-      <word_custom>Предварительный про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>edit_member</word_key>
+      <word_default>Edit Member</word_default>
+      <word_custom>Редактировать</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>to_whom</word_key>
-      <word_default><![CDATA[Recipient's Name]]></word_default>
-      <word_custom>Им� получател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_by_posts</word_key>
+      <word_default>Sort by Total Posts</word_default>
+      <word_custom>по количе�тву �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>sent_text</word_key>
-      <word_default><![CDATA[Your message '<#MESSAGE_TITLE#>' has been sent. The recipient(s) will be informed that they have a new message.]]></word_default>
-      <word_custom><![CDATA[Ваше �ообщение � заголовком '<#MESSAGE_TITLE#>' у�пешно отправлено. Пользователь будет уведомлен о новом личном �ообщении от ва�.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_by_mname</word_key>
+      <word_default>Sort by Member Name</word_default>
+      <word_custom>Сортировать по имени пользовател�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pm_preview</word_key>
-      <word_default>Preview</word_default>
-      <word_custom>Предварительный про�мотр</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>sorty_by_jdate</word_key>
+      <word_default>Sort by Joined Date</word_default>
+      <word_custom>Сортировать по дате реги�трации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pms_send_later</word_key>
-      <word_default>Save (Send later)</word_default>
-      <word_custom>Черновик (отправить позже)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>pcount</word_key>
+      <word_default>Post Count</word_default>
+      <word_custom>По количе�тву �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pmpc_unlimited</word_key>
-      <word_default>an unlimited amount of</word_default>
-      <word_custom>количе�тво �ообщений неограниченно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>reputation</word_key>
+      <word_default>Reputation</word_default>
+      <word_custom>Репутаци�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pme_none_sent</word_key>
-      <word_default>This personal message has not been sent</word_default>
-      <word_custom>Личное �ообщение не отправлено.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>m_dd_views</word_key>
+      <word_default>Profile Views</word_default>
+      <word_custom>по количе�тву про�мотров профил�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pmpc_info_string</word_key>
-      <word_default>You have %s messages out of %s maximum storable messages</word_default>
-      <word_custom>Личных �ообщений у ва�: %s, из мак�имально возможных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>members_start_with</word_key>
+      <word_default>View members starting with </word_default>
+      <word_custom>Про�мотреть пользователей � именами начинающими�� � </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pmpc_full_string</word_key>
-      <word_default>Your messenger folders are %s percent full</word_default>
-      <word_custom>Папки личных �ообщений заполнены на %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>m_rating</word_key>
+      <word_default>Rating</word_default>
+      <word_custom>Рейтинг</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_errors</word_key>
-      <word_default>The following errors were found</word_default>
-      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>m_rating_morethan</word_key>
+      <word_default>Rating is higher than</word_default>
+      <word_custom>Рейтинг выше чем</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_no_msg</word_key>
-      <word_default>You must enter a message larger than 3 characters.</word_default>
-      <word_custom>Тек�т личного �ообщени� должен быть более 3 �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>s_posts</word_key>
+      <word_default>Post count is</word_default>
+      <word_custom>Количе�тво �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_no_chosen_member</word_key>
-      <word_default>You must either choose a member from your address book or enter their name in the appropriate field fully.</word_default>
-      <word_custom>�еобходимо вручную вве�ти полное им� пользовател�, либо выбрать его из вашего �пи�ка контактов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>m_views</word_key>
+      <word_default>Views</word_default>
+      <word_custom>Про�мотров</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>mess_new</word_key>
-      <word_default>Compose New Message</word_default>
-      <word_custom>�овое личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>m_stars</word_key>
+      <word_default>stars</word_default>
+      <word_custom>баллов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>deleted_user</word_key>
-      <word_default>Deleted Member</word_default>
-      <word_custom>Пользователь удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>photo_only</word_key>
+      <word_default>Must have a photo</word_default>
+      <word_custom>Загрузил фотографию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>m_messenger</word_key>
-      <word_default>Messenger</word_default>
-      <word_custom>Почтовый �щик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>s_joined</word_key>
+      <word_default>Join date is</word_default>
+      <word_custom>Дата реги�трации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_no_title</word_key>
-      <word_default>You must enter a message title longer than 2 characters.</word_default>
-      <word_custom>Заголовок �ообщени� должен быть более 2 �имволов.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pro_recips</word_key>
-      <word_default>Recipients</word_default>
-      <word_custom>Получатели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>messenger__nav</word_key>
-      <word_default>Messenger</word_default>
-      <word_custom>Почтовый �щик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pro_message</word_key>
-      <word_default>Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>search_results_pt</word_key>
-      <word_default> : Search Results</word_default>
-      <word_custom> : Результаты пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>search_convo_no_results</word_key>
-      <word_default>Sorry, no conversations were found that match your search criteria</word_default>
-      <word_custom>�е найдено �ообщений, �оответ�твующих критерию пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>search_convo_no_keywords</word_key>
-      <word_default>You did not enter any words to search for</word_default>
-      <word_custom>Вы не ввели ни одного �лова дл� пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>t_welcome</word_key>
-      <word_default>Your Messenger</word_default>
-      <word_custom>Добро пожаловать в ваш почтовый �щик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NO_ONE_TO_INVITE</word_key>
-      <word_default>There is no one to invite either because you entered an incorrect name or they are currently participating</word_default>
-      <word_custom>�евозможно кого-либо пригла�ить, либо потому что вы ввели неверные имена пользователей или �ти пользователи уже приглашены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_FLOOD_STOP</word_key>
-      <word_default>You cannot start another PM topic until #DATE#</word_default>
-      <word_custom>Вы не можете напи�ать личное �ообщение до #DATE# </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_CANT_INVITE_RECIPIENT_EXIST</word_key>
-      <word_default>One or more recipients are already participating in this conversation</word_default>
-      <word_custom>Один или более получателей уже приглашены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_CANT_INVITE_RECIPIENT</word_key>
-      <word_default>You cannot invite the main recipient</word_default>
-      <word_custom>Вы не можете пригла�ить получател� �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_CANT_INVITE_SELF</word_key>
-      <word_default>You cannot invite yourself to this conversation</word_default>
-      <word_custom>Вы не можете пригла�ить �амого �еб�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_CANT_SEND_TO_SELF</word_key>
-      <word_default>You cannot send a conversation to yourself</word_default>
-      <word_custom>Вы не можете отправить приглашение �амому �ебе</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_UNKNOWN</word_key>
-      <word_default>An untrapped error occurred: </word_default>
-      <word_custom>Обнаружена необработанна� ошибка: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_CANNOT_SAVE_TO_SENT_FOLDER</word_key>
-      <word_default>You do not have any space left to store this message in your sent folder</word_default>
-      <word_custom>У ва� нет �вободного ме�та дл� �охранени� �того �ообщени� в папке � отправленными �ообщени�ми</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_INVITE_USERS_BLOCKED</word_key>
-      <word_default>The following CC users have chosen to not receive messages from you: #NAMES#</word_default>
-      <word_custom>Следующие пользователи не хот�т получать новые �ообщени� от ва�: #NAMES#</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_FROM_USER_BLOCKED</word_key>
-      <word_default>The member #TONAME# has chosen to not receive any new messages from you</word_default>
-      <word_custom>Пользователь #TONAME# не хочет получать новые �ообщени� от ва�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_TO_USER_CANNOT_USE_PM</word_key>
-      <word_default>The member #TONAME# can not use the messaging system</word_default>
-      <word_custom>Пользователь #TONAME# не может и�пользовать личные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_TO_USER_FULL</word_key>
-      <word_default>The member #TONAME# cannot receive any new messages</word_default>
-      <word_custom>Пользователь #TONAME# больше не может получать новые �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_FROM_USER_DOES_NOT_EXIST</word_key>
-      <word_default>The member #FROMNAME# does not exist</word_default>
-      <word_custom>Пользователь #FROMNAME# не �уще�твует. </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NOT_ALL_INVITE_USERS_CAN_PM</word_key>
-      <word_default>The following users cannot use the messaging system: #NAMES#</word_default>
-      <word_custom>Следующие пользователи не могут и�пользовать личные �ообщени�: #NAMES# </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_TO_USER_DOES_NOT_EXIST</word_key>
-      <word_default>The member #TONAME# does not exist</word_default>
-      <word_custom>Пользователь #TONAME# не �уще�твует. Проверьте введенное им� и повторите попытку.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NOT_ALL_INVITE_USERS_EXIST</word_key>
-      <word_default>The following users do not exist: #NAMES#</word_default>
-      <word_custom>Пользователи: #NAMES# не �уще�твуют</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NO_IDS_TO_DELETE</word_key>
-      <word_default>You did not select any messages to remove</word_default>
-      <word_custom>Вы не выбрали ни одного �ообщени� дл� удалени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NO_IDS_TO_MOVE</word_key>
-      <word_default>You did not select any messages to move</word_default>
-      <word_custom>Вы не выбрали ни одного �ообщени� дл� перено�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NO_SUCH_FOLDER</word_key>
-      <word_default>The folder you are attempting to move into does not exist</word_default>
-      <word_custom>Вы пытаете�ь перене�ти �ообщени� в не�уще�твующую директорию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_NO_IDS_SELECTED</word_key>
-      <word_default>You did not select any messages to perform this action on</word_default>
-      <word_custom>Вы не выбрали ни одного �ообщени� дл� о�уще�твлени� �того дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_unspecifed</word_key>
-      <word_default>An unspecified error occurred</word_default>
-      <word_custom>�еизве�тна� ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>err_auth</word_key>
-      <word_default>Authorization Error</word_default>
-      <word_custom>Ошибка авторизации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>sendMsgTitle</word_key>
-      <word_default>Composing Message</word_default>
-      <word_custom>�овое личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>search_term_short</word_key>
-      <word_default><![CDATA[One or all of your search keywords were below %s characters or you searched for words which are not allowed, such as 'html', 'img', etc, please increase the length of these search keywords or choose different keywords.]]></word_default>
-      <word_custom><![CDATA[Одно или не�колько, введенных вами, ключевых �лов дл� пои�ка меньше %s �имволов, или же вы ввели в каче�тве ключевого �лова недопу�тимые к пои�ку �лова, такие как 'html', 'img', и т.д. Верните�ь назад и измените ключевые �лова дл� пои�ка.]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>maxperday_hit</word_key>
-      <word_default>You have sent the maximum number of private messages per day that the administrator allows.</word_default>
-      <word_custom>Вы отправили мак�имально разрешенное за день админи�тратором количе�тво личных �ообщений.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>message_subject_send</word_key>
-      <word_default>Message Subject</word_default>
-      <word_custom>Тема �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>copy__desc</word_key>
-      <word_default>will send a separate conversation to each member</word_default>
-      <word_custom>будет ото�лана в�ем о�тальным получател�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>invite__desc</word_key>
-      <word_default>allows all invited members to participate in a single conversation</word_default>
-      <word_custom>позвол�ет в�ем приглашенным пользовател�м поуча�твовать в перепи�ке</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>send__invite</word_key>
-      <word_default>Invitation</word_default>
-      <word_custom>Приглашение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>send__copy</word_key>
-      <word_default>Copy</word_default>
-      <word_custom>Копи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>send_to_as</word_key>
-      <word_default>Send to others as</word_default>
-      <word_custom>О�тальным получател�м будет отправлено(а)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>youmay_add_to</word_key>
-      <word_default>You may add up to</word_default>
-      <word_custom>Вы можете добавить до</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>youmay_suffix</word_key>
-      <word_default>other recipients</word_default>
-      <word_custom>получателей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>other_recipients</word_key>
-      <word_default>Other Recipients</word_default>
-      <word_custom>О�тальные получатели</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>editing_message</word_key>
-      <word_default>Editing Message</word_default>
-      <word_custom>Редактирование �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>compose_reply</word_key>
-      <word_default>Compose Reply</word_default>
-      <word_custom>Ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_use_full_reply</word_key>
-      <word_default>Use Full Editor</word_default>
-      <word_custom>Ра�ширенна� форма</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_fast_reply</word_key>
-      <word_default>Fast Reply</word_default>
-      <word_custom>Бы�трый ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_post_button</word_key>
-      <word_default>Post</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>delete_this_post</word_key>
-      <word_default>Delete this post</word_default>
-      <word_custom>Удалить �то �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>edit_this_post</word_key>
-      <word_default>Edit this post</word_default>
-      <word_custom>Изменить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_reply</word_key>
-      <word_default>Reply</word_default>
-      <word_custom>Ответ</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_sent</word_key>
-      <word_default>Sent</word_default>
-      <word_custom>Отправлено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_report</word_key>
-      <word_default>Report</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>find_info_about_ip</word_key>
-      <word_default>Find information about this IP</word_default>
-      <word_custom>Информаци� об IP</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>you_cannot_reply</word_key>
-      <word_default>You cannot reply</word_default>
-      <word_custom>Вы не можете ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>filters__update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>add_reply</word_key>
-      <word_default>Add Reply</word_default>
-      <word_custom>Ответить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>filters__i</word_key>
-      <word_default>Conversations I Started</word_default>
-      <word_custom>И�ход�щие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>filter__others</word_key>
-      <word_default>Conversations Others Started</word_default>
-      <word_custom>Вход�щие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>filter__show</word_key>
-      <word_default>Show:</word_default>
-      <word_custom>Показывать:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>filter__all</word_key>
-      <word_default>All Conversations</word_default>
-      <word_custom>В�е �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>move_to_opt</word_key>
-      <word_default>Or Move To...</word_default>
-      <word_custom>Или переме�тить в</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>option__turnoff</word_key>
-      <word_default>Turn Off Notifications</word_default>
-      <word_custom>Отключить уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>option__turnon</word_key>
-      <word_default>Turn On Notifications</word_default>
-      <word_custom>Включить уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>option__markread</word_key>
-      <word_default>Mark Read</word_default>
-      <word_custom>Пометить как прочтенное</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>option__markunread</word_key>
-      <word_default>Mark Unread</word_default>
-      <word_custom>Сн�ть отметку о прочтении</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>option__delete</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>with_selected_opt</word_key>
-      <word_default>With Selected...</word_default>
-      <word_custom>С отмеченными</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_by</word_key>
-      <word_default>By:</word_default>
-      <word_custom>�втор:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>folder_no_messages_row</word_key>
-      <word_default>There are no messages to view in this folder</word_default>
-      <word_custom>�ет �ообщений дл� про�мотра</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>goto_last_post</word_key>
-      <word_default>Go to last post</word_default>
-      <word_custom>К по�леднему �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>info_not_available</word_key>
-      <word_default>Information Not Available</word_default>
-      <word_custom>Информаци� не до�тупна</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>goto_page</word_key>
-      <word_default>Go to page</word_default>
-      <word_custom>К �транице</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>compose_new</word_key>
-      <word_default>Compose New</word_default>
-      <word_custom>�апи�ать личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>first_unread_reply</word_key>
-      <word_default>Go to first unread post</word_default>
-      <word_custom>К первому непрочитанному �ообщению</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>go_to_compose</word_key>
-      <word_default>Go to compose screen</word_default>
-      <word_custom>�апи�ать личное �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_other</word_key>
-      <word_default>other</word_default>
-      <word_custom>еще</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>no_messages_row</word_key>
-      <word_default>There are no messages to view</word_default>
-      <word_custom>�ет �ообщений дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>label_pc</word_key>
-      <word_default>Label:</word_default>
-      <word_custom>Метка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_and</word_key>
-      <word_default>and</word_default>
-      <word_custom>и</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pc_others</word_key>
-      <word_default>others</word_default>
-      <word_custom>другие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>col_to</word_key>
-      <word_default>To</word_default>
-      <word_custom>�дре�ат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>col_last_message</word_key>
-      <word_default>Last Message</word_default>
+      <word_pack>public_list</word_pack>
+      <word_key>s_lastpost</word_key>
+      <word_default>Last post is</word_default>
       <word_custom>По�леднее �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>col_starter</word_key>
-      <word_default>Starter</word_default>
-      <word_custom>�втор</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>s_lastvisit</word_key>
+      <word_default>Last visit is</word_default>
+      <word_custom>Врем� по�леднего по�ещени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>col_topic</word_key>
-      <word_default>Topic</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_list</word_pack>
+      <word_key>s_signature</word_key>
+      <word_default>Signature contains</word_default>
+      <word_custom>Подпи�ь �одержит</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>col_date</word_key>
-      <word_default>Date</word_default>
+      <word_pack>public_list</word_pack>
+      <word_key>s_name</word_key>
+      <word_default>Member name</word_default>
+      <word_custom>По имени пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_lessthan</word_key>
+      <word_default>less than</word_default>
+      <word_custom>меньше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_dateformat</word_key>
+      <word_default>(MM-DD-YYYY)</word_default>
+      <word_custom>(ДД-ММ-ГГГГ)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_begins</word_key>
+      <word_default>begins with</word_default>
+      <word_custom>начинает�� �</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_morethan</word_key>
+      <word_default>more than</word_default>
+      <word_custom>больше чем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_contains</word_key>
+      <word_default>contains</word_default>
+      <word_custom>�одержит</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_before</word_key>
+      <word_default>before</word_default>
+      <word_custom>до</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>s_after</word_key>
+      <word_default>after</word_default>
+      <word_custom>по�ле</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>member_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>no_results</word_key>
+      <word_default>No Results</word_default>
+      <word_custom>�ет �овпадений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>member_joined</word_key>
+      <word_default>Joined</word_default>
       <word_custom>Дата</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_by_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>по имени пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sorting_text_with</word_key>
+      <word_default>with</word_default>
+      <word_custom>по</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sorting_text_in</word_key>
+      <word_default>in</word_default>
+      <word_custom>в</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sorting_text_by</word_key>
+      <word_default>by</word_default>
+      <word_custom>, �ортировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_submit</word_key>
+      <word_default>Apply Filters</word_default>
+      <word_custom>Применить фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>ascending_order</word_key>
+      <word_default>Ascending Order</word_default>
+      <word_custom>пор�дке возра�тани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>descending_order</word_key>
+      <word_default>Descending Order</word_default>
+      <word_custom>пор�дке убывани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>member_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>member_name</word_key>
+      <word_default>Name</word_default>
+      <word_custom>Им�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sorting_text_results</word_key>
+      <word_default>results per page</word_default>
+      <word_custom>результатов на �траницу</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>page_title</word_key>
+      <word_default>Member List</word_default>
+      <word_custom>Спи�ок пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_by_joined</word_key>
+      <word_default>Join Date</word_default>
+      <word_custom>по дате реги�трации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_header</word_key>
+      <word_default>Member List</word_default>
+      <word_custom>Спи�ок пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_adv_filt</word_key>
+      <word_default>More Search Options</word_default>
+      <word_custom>Дополнительные фильтры</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_adv_filt_opt</word_key>
+      <word_default>Advanced Filter Options</word_default>
+      <word_custom>Фильтры пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_view_all_txt</word_key>
+      <word_default>ALL</word_default>
+      <word_custom>ВСЕ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_view_start_title</word_key>
+      <word_default>View members starting with</word_default>
+      <word_custom>Про�мотреть пользователей � именами начинающими�� �</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>mlist_view_all_title</word_key>
+      <word_default>View all members</word_default>
+      <word_custom>Про�мотреть в�ех пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_list</word_pack>
+      <word_key>sort_by</word_key>
+      <word_default>Sort by: </word_default>
+      <word_custom>Сортировать: </word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>col_recipient</word_key>
-      <word_default>Recipient</word_default>
-      <word_custom>�дре�ат</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>msg_deleted</word_key>
+      <word_default>Deleted</word_default>
+      <word_custom>Удалено</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>col_replies</word_key>
-      <word_default>Replies</word_default>
-      <word_custom>Ответов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>msg_view_conversation</word_key>
+      <word_default>View this conversation</word_default>
+      <word_custom>Перейти к перепи�ке</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>col_subject</word_key>
-      <word_default>Subject</word_default>
-      <word_custom>Тема</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>msg_all_alone_title</word_key>
+      <word_default>You cannot reply</word_default>
+      <word_custom>Вы не можете напи�ать �ообщение</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>your_search_results</word_key>
-      <word_default>Your Search Results</word_default>
-      <word_custom>Результаты пои�ка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>msg_no_notify</word_key>
+      <word_default>No notifications</word_default>
+      <word_custom>�ет уведомлений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>search_messages</word_key>
-      <word_default>Search Messages</word_default>
-      <word_custom>Пои�к �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>msg_all_alone_desc</word_key>
+      <word_default>All other recipients have left this conversation</word_default>
+      <word_custom>В�е уча�тники перепи�ки уже вышли из нее</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>of_your_quota</word_key>
-      <word_default>of your quota</word_default>
-      <word_custom>от лимита</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>msg_startedby</word_key>
+      <word_default>Started by</word_default>
+      <word_custom>�втор</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>messages</word_key>
-      <word_default>messages</word_default>
-      <word_custom>�ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>msg_sentto</word_key>
+      <word_default>sent to</word_default>
+      <word_custom>отправлено</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>your_messenger_storage</word_key>
-      <word_default>Your messenger storage</word_default>
-      <word_custom>Папки личных �ообщений заполнены на:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>your_pm_is_disabled</word_key>
+      <word_default>Your personal messenger has been disabled. You are unable to send or receive personal messages.</word_default>
+      <word_custom>Вы отключили �и�тему личных �ообщений. Вы не можете ни получать, ни отправл�ть личные �ообщени�.</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>folders_edit</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>disable_messenger</word_key>
+      <word_default>Disable Messenger</word_default>
+      <word_custom>Отключить �и�тему личных �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>storage</word_key>
-      <word_default>Storage</word_default>
-      <word_custom>Со�то�ние</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
+      <word_key>msg_xreplies</word_key>
+      <word_default>%s replies</word_default>
+      <word_custom>%s ответов</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>edit_folders</word_key>
-      <word_default>Edit Folders</word_default>
-      <word_custom>Изменить папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pm_disabled_title</word_key>
+      <word_default>Personal Messenger Disabled</word_default>
+      <word_custom>Си�тема личных �ообщений отключена</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>folder_add</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>go_board_index</word_key>
+      <word_default>Community Home</word_default>
+      <word_custom>�а главную �ообще�тва</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>add_folder</word_key>
-      <word_default>Add Folder</word_default>
-      <word_custom>Добавить папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>empty_folder_title</word_key>
-      <word_default>Empty this folder</word_default>
-      <word_custom>Очи�тить папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>delete_folder_title</word_key>
-      <word_default>Delete this folder</word_default>
-      <word_custom>Удалить папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>go_to_folder</word_key>
-      <word_default>Go to folder</word_default>
-      <word_custom>Перейти в папку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>add_participants</word_key>
-      <word_default>Add Participants</word_default>
-      <word_custom>Добавить уча�тников</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>folders</word_key>
-      <word_default>Folders</word_default>
-      <word_custom>Папки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>more_members</word_key>
-      <word_default>more members</word_default>
-      <word_custom>пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>may_invite_upto</word_key>
-      <word_default>You may invite up to</word_default>
-      <word_custom>Вы можете пригла�ить до</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>can_invite_unlimited</word_key>
-      <word_default><![CDATA[You may invite an <strong>unlimited</strong> number of members]]></word_default>
-      <word_custom><![CDATA[Вы можете пригла�ить <strong>неограниченное</strong> чи�ло пользователей]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>invite_part</word_key>
-      <word_default>Invite Participants</word_default>
-      <word_custom>Пригла�ить уча�тников</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>turn_noti_off</word_key>
-      <word_default><![CDATA[Turn Notifications <strong>OFF</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Выключить</strong> уведомлени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>turn_noti_on</word_key>
-      <word_default><![CDATA[Turn Notifications <strong>ON</strong>]]></word_default>
-      <word_custom><![CDATA[<strong>Включить</strong> уведомлени�]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>has_left_convo</word_key>
-      <word_default>Has left the conversation</word_default>
-      <word_custom>Вышел из перепи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>toggle_noti_title</word_key>
-      <word_default>Toggle notification status for this conversation</word_default>
-      <word_custom>Переключить �тату� уведомлени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>is_unable_part</word_key>
-      <word_default>Is unable to participate</word_default>
-      <word_custom>�е может принимать уча�тие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>unblock</word_key>
-      <word_default>Unblock</word_default>
-      <word_custom>Разблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>user_is_blocked</word_key>
-      <word_default><![CDATA[User is blocked &amp; can't participate]]></word_default>
-      <word_custom>Пользователь заблокирован и не может быть уча�тником</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>unblock_this_user</word_key>
-      <word_default>Unblock this user</word_default>
-      <word_custom>Разблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>block</word_key>
-      <word_default>Block</word_default>
-      <word_custom>Заблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>block_this_user</word_key>
-      <word_default>Block this user</word_default>
-      <word_custom>Заблокировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>not_yet_read</word_key>
-      <word_default>Not yet read</word_default>
-      <word_custom>Еще не прочтено</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>last_read</word_key>
-      <word_default>Last Read:</word_default>
-      <word_custom>Прочтено:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>topic_deleted</word_key>
-      <word_default>Unavailable: Topic Deleted</word_default>
-      <word_custom>�едо�тупно: тема удалена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>participants</word_key>
-      <word_default>Participants</word_default>
-      <word_custom>Уча�тники</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>separated_with_commas</word_key>
-      <word_default>, separated with commas</word_default>
-      <word_custom>, разделенных зап�той</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>part_add</word_key>
-      <word_default>Add</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>enter_member_names</word_key>
-      <word_default>Enter member names:</word_default>
-      <word_custom>Имена пользователей:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>invite_more_part</word_key>
-      <word_default>Invite More Participants</word_default>
-      <word_custom>Пригла�ить еще пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>pm_flood_stop</word_key>
-      <word_default>You cannot start another PM topic until %s</word_default>
-      <word_custom>Вы не можете отправить новое �ообщение до %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msgFolder_drafts</word_key>
-      <word_default>Drafts</word_default>
-      <word_custom>Черновики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msgFolder_myconvo</word_key>
-      <word_default>My Conversations</word_default>
-      <word_custom>Мои перепи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msgFolder_new</word_key>
-      <word_default>New</word_default>
-      <word_custom>�овые</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>folder_prefix</word_key>
-      <word_default>Folder:</word_default>
-      <word_custom>Папка:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>edit_msg_title</word_key>
-      <word_default>Editing Message</word_default>
-      <word_custom>Редактирование �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__notifyon</word_key>
-      <word_default>Notifications On</word_default>
-      <word_custom>Уведомлени� включены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__notifyoff</word_key>
-      <word_default>Notifications Off</word_default>
-      <word_custom>Уведомлени� выключены</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__deletedmsg</word_key>
-      <word_default>Deleted Message</word_default>
-      <word_custom>Удаленные �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__nonewmsg</word_key>
-      <word_default>No new messages</word_default>
-      <word_custom>�ет новых �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__newmsg</word_key>
-      <word_default>New Messages</word_default>
-      <word_custom>�овые �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__folder</word_key>
-      <word_default>Folder</word_default>
-      <word_custom>Папка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__compose</word_key>
-      <word_default>Compose</word_default>
-      <word_custom>�апи�ать новое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__trash</word_key>
-      <word_default>Trash</word_default>
-      <word_custom>Корзина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__new</word_key>
-      <word_default>New</word_default>
-      <word_custom>�овое</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>macro__myconvo</word_key>
-      <word_default>My Conversations</word_default>
-      <word_custom>Мои перепи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>save_message_button</word_key>
-      <word_default>Save Message</word_default>
-      <word_custom>Сохранить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>saved_as_a_draft</word_key>
-      <word_default>Your message has been saved as a draft</word_default>
-      <word_custom>Ваше �ообщение �охранено в черновики</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msg_email_go</word_key>
-      <word_default>Send Now</word_default>
-      <word_custom>Отправить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msg_email_convo</word_key>
-      <word_default>Archive Conversation</word_default>
-      <word_custom>�рхивирование перепи�ки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>msg_email_convo_text</word_key>
-      <word_default>Send a copy of this conversation to %s</word_default>
-      <word_custom>Отправить копию перепи�ки %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>ajax_no_permission</word_key>
-      <word_default>You do not have permission to view that conversation</word_default>
-      <word_custom>Вы не можете про�матривать �ту личную перепи�ку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>ajax_no_topic_id</word_key>
-      <word_default>Could not locate a conversation with that ID</word_default>
-      <word_custom>�е удало�ь найти перепи�ку � таким ID</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>email_participants</word_key>
-      <word_default>Participants:</word_default>
-      <word_custom>Уча�тники:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pm_disabled_reactivate</word_key>
+      <word_default>Click here to re-activate your messenger</word_default>
+      <word_custom>�ажмите зде�ь чтобы активировать �и�тему личных �ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2147,9 +455,1168 @@
       <word_key>email_has_been_sent</word_key>
       <word_default>The email has been sent to %s</word_default>
       <word_custom>Пи�ьмо отправлено %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>ajax_no_permission</word_key>
+      <word_default>You do not have permission to view that conversation</word_default>
+      <word_custom>Вы не можете про�матривать �ту личную перепи�ку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>email_participants</word_key>
+      <word_default>Participants:</word_default>
+      <word_custom>Уча�тники:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>folder_prefix</word_key>
+      <word_default>Folder:</word_default>
+      <word_custom>Папка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msgFolder_new</word_key>
+      <word_default>New</word_default>
+      <word_custom>�овые</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msgFolder_myconvo</word_key>
+      <word_default>My Conversations</word_default>
+      <word_custom>Мои перепи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>ajax_no_topic_id</word_key>
+      <word_default>Could not locate a conversation with that ID</word_default>
+      <word_custom>�е удало�ь найти перепи�ку � таким ID</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msg_email_convo</word_key>
+      <word_default>Archive Conversation</word_default>
+      <word_custom>�рхивирование перепи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__newmsg</word_key>
+      <word_default>New Messages</word_default>
+      <word_custom>�овые �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__deletedmsg</word_key>
+      <word_default>Deleted Message</word_default>
+      <word_custom>Удаленные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__notifyoff</word_key>
+      <word_default>Notifications Off</word_default>
+      <word_custom>Уведомлени� выключены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__notifyon</word_key>
+      <word_default>Notifications On</word_default>
+      <word_custom>Уведомлени� включены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>edit_msg_title</word_key>
+      <word_default>Editing Message</word_default>
+      <word_custom>Редактирование �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__trash</word_key>
+      <word_default>Trash</word_default>
+      <word_custom>Корзина</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__compose</word_key>
+      <word_default>Compose</word_default>
+      <word_custom>�апи�ать новое</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__folder</word_key>
+      <word_default>Folder</word_default>
+      <word_custom>Папка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__nonewmsg</word_key>
+      <word_default>No new messages</word_default>
+      <word_custom>�ет новых �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__myconvo</word_key>
+      <word_default>My Conversations</word_default>
+      <word_custom>Мои перепи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>macro__new</word_key>
+      <word_default>New</word_default>
+      <word_custom>�овое</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>save_message_button</word_key>
+      <word_default>Save Message</word_default>
+      <word_custom>Сохранить �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>saved_as_a_draft</word_key>
+      <word_default>Your message has been saved as a draft</word_default>
+      <word_custom>Ваше �ообщение �охранено в черновики</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msg_email_convo_text</word_key>
+      <word_default>Send a copy of this conversation to %s</word_default>
+      <word_custom>Отправить копию перепи�ки %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msg_email_go</word_key>
+      <word_default>Send Now</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pm_flood_stop</word_key>
+      <word_default>You cannot start another PM topic until %s</word_default>
+      <word_custom>Вы не можете отправить новое �ообщение до %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>invite_more_part</word_key>
+      <word_default>Invite More Participants</word_default>
+      <word_custom>Пригла�ить еще пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>msgFolder_drafts</word_key>
+      <word_default>Drafts</word_default>
+      <word_custom>Черновики</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>separated_with_commas</word_key>
+      <word_default>, separated with commas</word_default>
+      <word_custom>, разделенных зап�той</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>topic_deleted</word_key>
+      <word_default>Unavailable: Topic Deleted</word_default>
+      <word_custom>�едо�тупно: тема удалена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>participants</word_key>
+      <word_default>Participants</word_default>
+      <word_custom>Уча�тники</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>enter_member_names</word_key>
+      <word_default>Enter member names:</word_default>
+      <word_custom>Имена пользователей:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>part_add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>block_this_user</word_key>
+      <word_default>Block this user</word_default>
+      <word_custom>Заблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>not_yet_read</word_key>
+      <word_default>Not yet read</word_default>
+      <word_custom>Еще не прочтено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>last_read</word_key>
+      <word_default>Read:</word_default>
+      <word_custom>Прочтено:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>block</word_key>
+      <word_default>Block</word_default>
+      <word_custom>Заблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>user_is_blocked</word_key>
+      <word_default><![CDATA[User is blocked &amp; can't participate]]></word_default>
+      <word_custom>Пользователь заблокирован и не может быть уча�тником</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>unblock_this_user</word_key>
+      <word_default>Unblock this user</word_default>
+      <word_custom>Разблокировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>has_left_convo</word_key>
+      <word_default>Has left the conversation</word_default>
+      <word_custom>Вышел из перепи�ки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>is_unable_part</word_key>
+      <word_default>Is unable to participate</word_default>
+      <word_custom>�е может принимать уча�тие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>unblock</word_key>
+      <word_default>Unblock</word_default>
+      <word_custom>Разблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>toggle_noti_title</word_key>
+      <word_default>Toggle notification status for this conversation</word_default>
+      <word_custom>Переключить �тату� уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>turn_noti_on</word_key>
+      <word_default><![CDATA[Turn Notifications <strong>ON</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Включить</strong> уведомлени�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>turn_noti_off</word_key>
+      <word_default><![CDATA[Turn Notifications <strong>OFF</strong>]]></word_default>
+      <word_custom><![CDATA[<strong>Выключить</strong> уведомлени�]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>can_invite_unlimited</word_key>
+      <word_default><![CDATA[You may invite an <strong>unlimited</strong> number of members]]></word_default>
+      <word_custom><![CDATA[Вы можете пригла�ить <strong>неограниченное</strong> чи�ло пользователей]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>invite_part</word_key>
+      <word_default>Invite Participants</word_default>
+      <word_custom>Пригла�ить уча�тников</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>may_invite_upto</word_key>
+      <word_default>You may invite up to</word_default>
+      <word_custom>Вы можете пригла�ить до</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>more_members</word_key>
+      <word_default>more members</word_default>
+      <word_custom>пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>folders</word_key>
+      <word_default>Folders</word_default>
+      <word_custom>Папки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>add_participants</word_key>
+      <word_default>Add Participants</word_default>
+      <word_custom>Добавить уча�тников</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>go_to_folder</word_key>
+      <word_default>Go to folder</word_default>
+      <word_custom>Перейти в папку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>delete_folder_title</word_key>
+      <word_default>Delete this folder</word_default>
+      <word_custom>Удалить папку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>add_folder</word_key>
+      <word_default>Add Folder</word_default>
+      <word_custom>Добавить папку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>empty_folder_title</word_key>
+      <word_default>Empty this folder</word_default>
+      <word_custom>Очи�тить папку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>folder_add</word_key>
+      <word_default>Add</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>folders_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>edit_folders</word_key>
+      <word_default>Edit Folders</word_default>
+      <word_custom>Изменить папку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>storage</word_key>
+      <word_default>Storage</word_default>
+      <word_custom>Со�то�ние</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_date</word_key>
+      <word_default>Date</word_default>
+      <word_custom>Дата</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>your_messenger_storage</word_key>
+      <word_default>Your messenger storage</word_default>
+      <word_custom>Папки личных �ообщений заполнены на:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_recipient</word_key>
+      <word_default>Recipient</word_default>
+      <word_custom>�дре�ат</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_replies</word_key>
+      <word_default>Replies</word_default>
+      <word_custom>Ответов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_subject</word_key>
+      <word_default>Subject</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>your_search_results</word_key>
+      <word_default>Your Search Results</word_default>
+      <word_custom>Результаты пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>search_messages</word_key>
+      <word_default>Search Messages</word_default>
+      <word_custom>Пои�к �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>messages</word_key>
+      <word_default>messages</word_default>
+      <word_custom>�ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_topic</word_key>
+      <word_default>Topic</word_default>
+      <word_custom>Тема</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>of_your_quota</word_key>
+      <word_default>of your quota</word_default>
+      <word_custom>от лимита</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_starter</word_key>
+      <word_default>Starter</word_default>
+      <word_custom>�втор</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_to</word_key>
+      <word_default>To</word_default>
+      <word_custom>�дре�ат</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>label_pc</word_key>
+      <word_default>Folder:</word_default>
+      <word_custom>Метка:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>col_last_message</word_key>
+      <word_default>Last Message</word_default>
+      <word_custom>По�леднее �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_and</word_key>
+      <word_default>and</word_default>
+      <word_custom>и</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>go_to_compose</word_key>
+      <word_default>Go to compose screen</word_default>
+      <word_custom>�апи�ать личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>compose_new</word_key>
+      <word_default>Compose New</word_default>
+      <word_custom>�апи�ать личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_others</word_key>
+      <word_default>others</word_default>
+      <word_custom>другие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>no_messages_row</word_key>
+      <word_default>There are no messages to view</word_default>
+      <word_custom>�ет �ообщений дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>goto_last_post</word_key>
+      <word_default>Go to last post</word_default>
+      <word_custom>К по�леднему �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>info_not_available</word_key>
+      <word_default>Information Not Available</word_default>
+      <word_custom>Информаци� не до�тупна</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_other</word_key>
+      <word_default>other</word_default>
+      <word_custom>еще</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_by</word_key>
+      <word_default>By</word_default>
+      <word_custom>�втор:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>option__markunread</word_key>
+      <word_default>Mark Unread</word_default>
+      <word_custom>Сн�ть отметку о прочтении</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>option__markread</word_key>
+      <word_default>Mark Read</word_default>
+      <word_custom>Пометить как прочтенное</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>option__delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>with_selected_opt</word_key>
+      <word_default>With Selected...</word_default>
+      <word_custom>С отмеченными</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>folder_no_messages_row</word_key>
+      <word_default>There are no messages to view in this folder</word_default>
+      <word_custom>�ет �ообщений дл� про�мотра</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>option__turnon</word_key>
+      <word_default>Turn On Notifications</word_default>
+      <word_custom>Включить уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>option__turnoff</word_key>
+      <word_default>Turn Off Notifications</word_default>
+      <word_custom>Отключить уведомлени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>goto_page</word_key>
+      <word_default>Go to page</word_default>
+      <word_custom>К �транице</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>first_unread_reply</word_key>
+      <word_default>Go to first unread post</word_default>
+      <word_custom>К первому непрочитанному �ообщению</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>move_to_opt</word_key>
+      <word_default>Or Move To...</word_default>
+      <word_custom>Или переме�тить в</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>filter__show</word_key>
+      <word_default>Show:</word_default>
+      <word_custom>Показывать:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>filter__others</word_key>
+      <word_default>Conversations Others Started</word_default>
+      <word_custom>Вход�щие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>filter__all</word_key>
+      <word_default>All Conversations</word_default>
+      <word_custom>В�е �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>you_cannot_reply</word_key>
+      <word_default>You cannot reply</word_default>
+      <word_custom>Вы не можете ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>add_reply</word_key>
+      <word_default>Add Reply</word_default>
+      <word_custom>Ответить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>filters__update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>filters__i</word_key>
+      <word_default>Conversations I Started</word_default>
+      <word_custom>И�ход�щие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_sent</word_key>
+      <word_default>Sent</word_default>
+      <word_custom>Отправлено</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>find_info_about_ip</word_key>
+      <word_default>Find information about this IP</word_default>
+      <word_custom>Информаци� об IP</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_report</word_key>
+      <word_default>Report</word_default>
+      <word_custom>Жалоба</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_reply</word_key>
+      <word_default>Reply</word_default>
+      <word_custom>Ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>edit_this_post</word_key>
+      <word_default>Edit this post</word_default>
+      <word_custom>Изменить �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_edit</word_key>
+      <word_default>Edit</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_delete</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>delete_this_post</word_key>
+      <word_default>Delete this post</word_default>
+      <word_custom>Удалить �то �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_fast_reply</word_key>
+      <word_default>Fast Reply</word_default>
+      <word_custom>Бы�трый ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_post_button</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Отправить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>compose_reply</word_key>
+      <word_default>Compose Reply</word_default>
+      <word_custom>Ответ</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pc_use_full_reply</word_key>
+      <word_default>Use Full Editor</word_default>
+      <word_custom>Ра�ширенна� форма</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>other_recipients</word_key>
+      <word_default>Other Recipients</word_default>
+      <word_custom>О�тальные получатели</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>editing_message</word_key>
+      <word_default>Editing Message</word_default>
+      <word_custom>Редактирование �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>youmay_suffix</word_key>
+      <word_default>other recipients</word_default>
+      <word_custom>получателей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>send__invite</word_key>
+      <word_default>Invitation</word_default>
+      <word_custom>Приглашение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>send_to_as</word_key>
+      <word_default>Send to others as</word_default>
+      <word_custom>О�тальным получател�м будет отправлено(а)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>youmay_add_to</word_key>
+      <word_default>You may add up to</word_default>
+      <word_custom>Вы можете добавить до</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NO_SUCH_FOLDER</word_key>
+      <word_default>The folder you are attempting to move into does not exist</word_default>
+      <word_custom>Вы пытаете�ь перене�ти �ообщени� в не�уще�твующую директорию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NO_IDS_SELECTED</word_key>
+      <word_default>You did not select any messages to perform this action on</word_default>
+      <word_custom>Вы не выбрали ни одного �ообщени� дл� о�уще�твлени� �того дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_unspecifed</word_key>
+      <word_default>An unspecified error occurred</word_default>
+      <word_custom>�еизве�тна� ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_auth</word_key>
+      <word_default>Authorization Error</word_default>
+      <word_custom>Ошибка авторизации</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>sendMsgTitle</word_key>
+      <word_default>Composing Message</word_default>
+      <word_custom>�овое личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>search_term_short</word_key>
+      <word_default><![CDATA[One or all of your search keywords were below %s characters or you searched for words which are not allowed, such as 'html', 'img', etc, please increase the length of these search keywords or choose different keywords.]]></word_default>
+      <word_custom><![CDATA[Одно или не�колько, введенных вами, ключевых �лов дл� пои�ка меньше %s �имволов, или же вы ввели в каче�тве ключевого �лова недопу�тимые к пои�ку �лова, такие как 'html', 'img', и т.д. Верните�ь назад и измените ключевые �лова дл� пои�ка.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>message_subject_send</word_key>
+      <word_default>Message Subject</word_default>
+      <word_custom>Тема �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>maxperday_hit</word_key>
+      <word_default>You have sent the maximum number of private messages per day that the administrator allows.</word_default>
+      <word_custom>Вы отправили мак�имально разрешенное за день админи�тратором количе�тво личных �ообщений.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>copy__desc</word_key>
+      <word_default>will send a separate conversation to each member</word_default>
+      <word_custom>будет ото�лана в�ем о�тальным получател�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>send__copy</word_key>
+      <word_default>Copy</word_default>
+      <word_custom>Копи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>invite__desc</word_key>
+      <word_default>allows all invited members to participate in a single conversation</word_default>
+      <word_custom>позвол�ет в�ем приглашенным пользовател�м поуча�твовать в перепи�ке</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NO_ONE_TO_INVITE</word_key>
+      <word_default>There is no one to invite either because you entered an incorrect name or they are currently participating</word_default>
+      <word_custom>�евозможно кого-либо пригла�ить, либо потому что вы ввели неверные имена пользователей или �ти пользователи уже приглашены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_FLOOD_STOP</word_key>
+      <word_default>You cannot start another PM topic until #DATE#</word_default>
+      <word_custom>Вы не можете напи�ать личное �ообщение до #DATE# </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_CANT_INVITE_RECIPIENT</word_key>
+      <word_default>You cannot invite the main recipient</word_default>
+      <word_custom>Вы не можете пригла�ить получател� �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_CANT_INVITE_RECIPIENT_EXIST</word_key>
+      <word_default>One or more recipients are already participating in this conversation</word_default>
+      <word_custom>Один или более получателей уже приглашены</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_CANT_INVITE_SELF</word_key>
+      <word_default>You cannot invite yourself to this conversation</word_default>
+      <word_custom>Вы не можете пригла�ить �амого �еб�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_CANT_SEND_TO_SELF</word_key>
+      <word_default>You cannot send a conversation to yourself</word_default>
+      <word_custom>Вы не можете отправить приглашение �амому �ебе</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_INVITE_USERS_BLOCKED</word_key>
+      <word_default>The following CC users have chosen to not receive messages from you: #NAMES#</word_default>
+      <word_custom>Следующие пользователи не хот�т получать новые �ообщени� от ва�: #NAMES#</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_UNKNOWN</word_key>
+      <word_default>An untrapped error occurred: </word_default>
+      <word_custom>Обнаружена необработанна� ошибка: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>messenger__nav</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Почтовый �щик</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>t_welcome</word_key>
+      <word_default>Your Messenger</word_default>
+      <word_custom>Добро пожаловать в ваш почтовый �щик</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>search_results_pt</word_key>
+      <word_default> : Search Results</word_default>
+      <word_custom> : Результаты пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>search_convo_no_results</word_key>
+      <word_default>Sorry, no conversations were found that match your search criteria</word_default>
+      <word_custom>�е найдено �ообщений, �оответ�твующих критерию пои�ка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pro_message</word_key>
+      <word_default>Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_no_title</word_key>
+      <word_default>You must enter a message title longer than 2 characters.</word_default>
+      <word_custom>Заголовок �ообщени� должен быть более 2 �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>deleted_user</word_key>
+      <word_default>Deleted Member</word_default>
+      <word_custom>Пользователь удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>m_messenger</word_key>
+      <word_default>Messenger</word_default>
+      <word_custom>Почтовый �щик</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pro_recips</word_key>
+      <word_default>Recipients</word_default>
+      <word_custom>Получатели</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_FROM_USER_BLOCKED</word_key>
+      <word_default>The member #TONAME# has chosen to not receive any new messages from you</word_default>
+      <word_custom>Пользователь #TONAME# не хочет получать новые �ообщени� от ва�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_CANNOT_SAVE_TO_SENT_FOLDER</word_key>
+      <word_default>You do not have any space left to store this message in your sent folder</word_default>
+      <word_custom>У ва� нет �вободного ме�та дл� �охранени� �того �ообщени� в папке � отправленными �ообщени�ми</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_FROM_USER_DOES_NOT_EXIST</word_key>
+      <word_default>The member #FROMNAME# does not exist</word_default>
+      <word_custom>Пользователь #FROMNAME# не �уще�твует. </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_TO_USER_CANNOT_USE_PM</word_key>
+      <word_default>The member #TONAME# can not use the messaging system</word_default>
+      <word_custom>Пользователь #TONAME# не может и�пользовать личные �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_TO_USER_FULL</word_key>
+      <word_default>The member #TONAME# cannot receive any new messages</word_default>
+      <word_custom>Пользователь #TONAME# больше не может получать новые �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_TO_USER_DOES_NOT_EXIST</word_key>
+      <word_default>The member #TONAME# does not exist</word_default>
+      <word_custom>Пользователь #TONAME# не �уще�твует. Проверьте введенное им� и повторите попытку.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NOT_ALL_INVITE_USERS_EXIST</word_key>
+      <word_default>The following users do not exist: #NAMES#</word_default>
+      <word_custom>Пользователи: #NAMES# не �уще�твуют</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NOT_ALL_INVITE_USERS_CAN_PM</word_key>
+      <word_default>The following users cannot use the messaging system: #NAMES#</word_default>
+      <word_custom>Следующие пользователи не могут и�пользовать личные �ообщени�: #NAMES# </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_MAX_USER_PM_LIMIT_HIT</word_key>
+      <word_default>You have attempted to invite more users to this conversation than you are allowed to (your limit is #LIMIT#)</word_default>
+      <word_custom>Вы пытаете�ь пригла�ить в перепи�ку большое количе�тво уча�тников (разрешено не более #LIMIT#)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>mess_new</word_key>
+      <word_default>Compose New Message</word_default>
+      <word_custom>�овое личное �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NO_IDS_TO_MOVE</word_key>
+      <word_default>You did not select any messages to move</word_default>
+      <word_custom>Вы не выбрали ни одного �ообщени� дл� перено�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_NO_IDS_TO_DELETE</word_key>
+      <word_default>You did not select any messages to remove</word_default>
+      <word_custom>Вы не выбрали ни одного �ообщени� дл� удалени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_no_chosen_member</word_key>
+      <word_default>You must either choose a member from your address book or enter their name in the appropriate field fully.</word_default>
+      <word_custom>�еобходимо вручную вве�ти полное им� пользовател�, либо выбрать его из вашего �пи�ка контактов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_errors</word_key>
+      <word_default>The following errors were found</word_default>
+      <word_custom>Обнаружены �ледующие ошибки:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>err_no_msg</word_key>
+      <word_default>You must enter a message larger than 3 characters.</word_default>
+      <word_custom>Тек�т личного �ообщени� должен быть более 3 �имволов.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pmpc_full_string</word_key>
+      <word_default>Your messenger folders are %s percent full</word_default>
+      <word_custom>Папки личных �ообщений заполнены на %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pmpc_info_string</word_key>
+      <word_default>You have %s messages out of %s maximum storable messages</word_default>
+      <word_custom>Личных �ообщений у ва�: %s, из мак�имально возможных</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pmpc_unlimited</word_key>
+      <word_default>an unlimited amount of</word_default>
+      <word_custom>количе�тво �ообщений неограниченно</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pme_none_sent</word_key>
+      <word_default>This personal message has not been sent</word_default>
+      <word_custom>Личное �ообщение не отправлено.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pms_send_later</word_key>
+      <word_default>Save (Send later)</word_default>
+      <word_custom>Черновик (отправить позже)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pm_preview</word_key>
+      <word_default>Preview</word_default>
+      <word_custom>Предварительный про�мотр</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>sent_text</word_key>
+      <word_default><![CDATA[Your message '<#MESSAGE_TITLE#>' has been sent. The recipient(s) will be informed that they have a new message.]]></word_default>
+      <word_custom><![CDATA[Ваше �ообщение � заголовком '<#MESSAGE_TITLE#>' у�пешно отправлено. Пользователь будет уведомлен о новом личном �ообщении от ва�.]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>to_whom</word_key>
+      <word_default><![CDATA[Recipient's Name]]></word_default>
+      <word_custom>Им� получател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_messaging</word_pack>
+      <word_key>pm_pre_button</word_key>
+      <word_default>Preview Message</word_default>
+      <word_custom>Предварительный про�мотр</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2157,19 +1624,6 @@
       <word_key>submit_send</word_key>
       <word_default>Send Message</word_default>
       <word_custom>Отправить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_messaging</word_pack>
-      <word_key>c_msg_full</word_key>
-      <word_default><![CDATA[<br /><b>WARNING: YOUR FOLDERS ARE FULL<b><br />You MUST delete some saved messages in your inbox or folders before you can receive any more personal messages]]></word_default>
-      <word_custom><![CDATA[<br /><b>В�ИМ��ИЕ: П�ПКИ ЛИЧ�ЫХ СООБЩЕ�ИЙ ПЕРЕПОЛ�Е�Ы</b><br />Дл� возможно�ти получени� новых личных пи�ем вы ДОЛЖ�Ы удалить некоторые �охраненные �ообщени� из папок]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2177,19 +1631,13 @@
       <word_key>blocked</word_key>
       <word_default>Blocked</word_default>
       <word_custom>Заблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_messaging</word_pack>
-      <word_key>full</word_key>
-      <word_default>full</word_default>
-      <word_custom> полный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30011</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>search_convo_no_keywords</word_key>
+      <word_default>You did not enter any words to search for</word_default>
+      <word_custom>Вы не ввели ни одного �лова дл� пои�ка</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2197,379 +1645,20 @@
       <word_key>deleted_member</word_key>
       <word_default>Deleted Member</word_default>
       <word_custom>Пользователь удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_profile</word_key>
-      <word_default>Viewing Profile:</word_default>
-      <word_custom>Про�матривает профиль:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_messaging</word_pack>
+      <word_key>full</word_key>
+      <word_default>full</word_default>
+      <word_custom> полный</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_invite</word_key>
-      <word_default>Inviting a friend to the board</word_default>
-      <word_custom>Приглашает друга на форум</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_mail</word_key>
-      <word_default>Contacting member via email</word_default>
-      <word_custom>Пишет пользователю e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_msg</word_key>
-      <word_default>Using Personal Messenger</word_default>
-      <word_custom>И�пользует почтовый �щик</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_usercp</word_key>
-      <word_default>Using User CP</word_default>
-      <word_custom>Про�матривает или измен�ет профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_forward</word_key>
-      <word_default>Emailing a topic</word_default>
-      <word_custom>Отправл�ет ��ылку на тему по e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_print</word_key>
-      <word_default>Printing a topic</word_default>
-      <word_custom>Про�матривает вер�ию дл� печати</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_search</word_key>
-      <word_default>Searching...</word_default>
-      <word_custom>Ищет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_help</word_key>
-      <word_default>Viewing the Help Files</word_default>
-      <word_custom>Про�матривает разделы помощи</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_members</word_key>
-      <word_default>Viewing the Members List</word_default>
-      <word_custom>Про�матривает �пи�ок пользователей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_online</word_key>
-      <word_default>Viewing Online List</word_default>
-      <word_custom><![CDATA[Про�матривает �пи�ок <b>Кто в онлайне</b>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_postrep</word_key>
-      <word_default>Posting in topic:</word_default>
-      <word_custom>Отвечает в тему:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_reg</word_key>
-      <word_default>Registering...</word_default>
-      <word_custom>Реги�трирует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_postnew</word_key>
-      <word_default>Posting in forum:</word_default>
-      <word_custom>Отвечает в форуме:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_login</word_key>
-      <word_default>Logging in...</word_default>
-      <word_custom>�вторизует��</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_sr</word_key>
-      <word_default>Viewing Forum Rules:</word_default>
-      <word_custom>Читает правила форума:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_st</word_key>
-      <word_default>Viewing Topic:</word_default>
-      <word_custom>Читает тему:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_sf</word_key>
-      <word_default>Viewing Forum:</word_default>
-      <word_custom>Про�матривает форум:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_portal</word_key>
-      <word_default>Viewing the portal</word_default>
-      <word_custom>Смотрит портал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_boardrules</word_key>
-      <word_default>Viewing Board Guidelines</word_default>
-      <word_custom>Читает правила</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>WHERE_calendar</word_key>
-      <word_default>Viewing the Calendar</word_default>
-      <word_custom>Про�матривает календарь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>not_online</word_key>
-      <word_default>Not online</word_default>
-      <word_custom>�е в �ети</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30011</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>board_index</word_key>
-      <word_default>Viewing Board Index</word_default>
-      <word_custom>Про�матривает главную �траницу форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>no_options_available</word_key>
-      <word_default>No options available</word_default>
-      <word_custom>�ет дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>users_online</word_key>
-      <word_default>Users online</word_default>
-      <word_custom>Кто в онлайне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>where</word_key>
-      <word_default>Location</word_default>
-      <word_custom>По�леднее дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>page_title</word_key>
-      <word_default>Online Users</word_default>
-      <word_custom>Кто в онлайне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>time</word_key>
-      <word_default>Time</word_default>
-      <word_custom>Врем�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>member_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Им� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_go</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_show_mem_all</word_key>
-      <word_default>Show All Users</word_default>
-      <word_custom>Показать в�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_show_mem_reg</word_key>
-      <word_default>Show Registered Only</word_default>
-      <word_custom>Показать только зареги�трированных</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_show_mem_guest</word_key>
-      <word_default>Show Guests Only</word_default>
-      <word_custom>Показать только го�тей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_sort_order_desc</word_key>
-      <word_default>Descending</word_default>
-      <word_custom>В пор�дке убывани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_sort_order_asc</word_key>
-      <word_default>Ascending</word_default>
-      <word_custom>В пор�дке возра�тани�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_sort_key_name</word_key>
-      <word_default>Member Name</word_default>
-      <word_custom>Именам</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_online</word_pack>
-      <word_key>s_sort_key_click</word_key>
-      <word_default>Last Click</word_default>
-      <word_custom>По�ледним дей�тви�м</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_pack>public_messaging</word_pack>
+      <word_key>c_msg_full</word_key>
+      <word_default><![CDATA[<br /><b>WARNING: YOUR FOLDERS ARE FULL<b><br />You MUST delete some saved messages in your inbox or folders before you can receive any more personal messages]]></word_default>
+      <word_custom><![CDATA[<br /><b>В�ИМ��ИЕ: П�ПКИ ЛИЧ�ЫХ СООБЩЕ�ИЙ ПЕРЕПОЛ�Е�Ы</b><br />Дл� возможно�ти получени� новых личных пи�ем вы ДОЛЖ�Ы удалить некоторые �охраненные �ообщени� из папок]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2577,9 +1666,265 @@
       <word_key>s_by</word_key>
       <word_default>Sort by: </word_default>
       <word_custom>Сортировать по: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_sort_key_click</word_key>
+      <word_default>Last Click</word_default>
+      <word_custom>По�ледним дей�тви�м</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_sort_key_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Именам</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_sort_order_asc</word_key>
+      <word_default>Ascending</word_default>
+      <word_custom>В пор�дке возра�тани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_sort_order_desc</word_key>
+      <word_default>Descending</word_default>
+      <word_custom>В пор�дке убывани�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_show_mem_guest</word_key>
+      <word_default>Show Guests Only</word_default>
+      <word_custom>Показать только го�тей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_show_mem_reg</word_key>
+      <word_default>Show Registered Only</word_default>
+      <word_custom>Показать только зареги�трированных</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_show_mem_all</word_key>
+      <word_default>Show All Users</word_default>
+      <word_custom>Показать в�ех</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>s_go</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>member_name</word_key>
+      <word_default>Member Name</word_default>
+      <word_custom>Им� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>time</word_key>
+      <word_default>Time</word_default>
+      <word_custom>Врем�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>online_page_title</word_key>
+      <word_default>Online Users</word_default>
+      <word_custom>Пользователи в онлайн</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>where</word_key>
+      <word_default>Location</word_default>
+      <word_custom>По�леднее дей�твие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>no_options_available</word_key>
+      <word_default>No options available</word_default>
+      <word_custom>�ет дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>users_online</word_key>
+      <word_default>Users online</word_default>
+      <word_custom>Кто в онлайне</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>board_index</word_key>
+      <word_default>Viewing Community Index</word_default>
+      <word_custom>Про�матривает главную �траницу форума</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_calendar</word_key>
+      <word_default>Viewing the Calendar</word_default>
+      <word_custom>Про�матривает календарь</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_boardrules</word_key>
+      <word_default>Viewing Community Guidelines</word_default>
+      <word_custom>Читает правила</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>not_online</word_key>
+      <word_default>Not online</word_default>
+      <word_custom>�е в �ети</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_portal</word_key>
+      <word_default>Viewing the portal</word_default>
+      <word_custom>Смотрит портал</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_sf</word_key>
+      <word_default>Viewing Forum:</word_default>
+      <word_custom>Про�матривает форум:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_sr</word_key>
+      <word_default>Viewing Forum Rules:</word_default>
+      <word_custom>Читает правила форума:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_st</word_key>
+      <word_default>Viewing Topic:</word_default>
+      <word_custom>Читает тему:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_reg</word_key>
+      <word_default>Registering...</word_default>
+      <word_custom>Реги�трирует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_login</word_key>
+      <word_default>Logging in...</word_default>
+      <word_custom>�вторизует��</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_postrep</word_key>
+      <word_default>Posting in topic:</word_default>
+      <word_custom>Отвечает в тему:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_postnew</word_key>
+      <word_default>Posting in forum:</word_default>
+      <word_custom>Отвечает в форуме:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_online</word_key>
+      <word_default>Viewing Online List</word_default>
+      <word_custom><![CDATA[Про�матривает �пи�ок <b>Кто в онлайне</b>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_members</word_key>
+      <word_default>Viewing the Members List</word_default>
+      <word_custom>Про�матривает �пи�ок пользователей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_search</word_key>
+      <word_default>Searching...</word_default>
+      <word_custom>Ищет</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_help</word_key>
+      <word_default>Viewing the Help Files</word_default>
+      <word_custom>Про�матривает разделы помощи</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_forward</word_key>
+      <word_default>Emailing a topic</word_default>
+      <word_custom>Отправл�ет ��ылку на тему по e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_print</word_key>
+      <word_default>Printing a topic</word_default>
+      <word_custom>Про�матривает вер�ию дл� печати</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_usercp</word_key>
+      <word_default>Using User CP</word_default>
+      <word_custom>Про�матривает или измен�ет профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_msg</word_key>
+      <word_default>Using Personal Messenger</word_default>
+      <word_custom>И�пользует почтовый �щик</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_mail</word_key>
+      <word_default>Contacting member via email</word_default>
+      <word_custom>Пишет пользователю e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_invite</word_key>
+      <word_default>Inviting a friend to the community</word_default>
+      <word_custom>Приглашает друга на форум</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_online</word_pack>
+      <word_key>WHERE_profile</word_key>
+      <word_default>Viewing Profile:</word_default>
+      <word_custom>Про�матривает профиль:</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2587,9 +1932,6 @@
       <word_key>WHERE_stats</word_key>
       <word_default>Viewing Stats</word_default>
       <word_custom>Про�матривает �тати�тику форума</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -2597,1539 +1939,258 @@
       <word_key>WHERE_reports</word_key>
       <word_default>Viewing Reports</word_default>
       <word_custom>Про�матривает жалобы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>no_info</word_key>
-      <word_default><![CDATA[<i>No Information</i>]]></word_default>
-      <word_custom>�ет информации</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>comments_disabled_profile</word_key>
+      <word_default>The member has disabled commenting on their profile.</word_default>
+      <word_custom>Пользователь отключил комментарии в �воем профиле</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>online_offline</word_key>
-      <word_default>Offline</word_default>
-      <word_custom>Offline</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ps_comments</word_key>
+      <word_default>comments</word_default>
+      <word_custom>комментариев</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>photo_title</word_key>
-      <word_default>Photo</word_default>
-      <word_custom>Фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>adjust_crop_lnk</word_key>
+      <word_default>Adjust Crop</word_default>
+      <word_custom>Обрезать</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>supmod_edit_member</word_key>
-      <word_default>Edit Member</word_default>
-      <word_custom>Редактировать пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>ps_updated</word_key>
+      <word_default>Updated</word_default>
+      <word_custom>Обновлено</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>dname_date</word_key>
-      <word_default>Change Date</word_default>
-      <word_custom>Дата изменена</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>comment_diff</word_key>
+      <word_default>You did not provide a new comment</word_default>
+      <word_custom>Вы не напи�али �ам комментарий</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>dname_name_to</word_key>
-      <word_default>To</word_default>
-      <word_custom>�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>member_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>dname_name_from</word_key>
-      <word_default>From</word_default>
-      <word_custom>С</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>friend_added_ok</word_key>
+      <word_default>The member has been added to your friends list</word_default>
+      <word_custom>Пользователь добавлен в �пи�ок ваших друзей</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>dname_title</word_key>
-      <word_default><![CDATA[Member's Display Name History]]></word_default>
-      <word_custom>И�тори� изменени� имен пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pp_invalid_file_extension</word_key>
+      <word_default>Incorrect image format</word_default>
+      <word_custom>�едопу�тимый формат изображени�</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>dname_window_title</word_key>
-      <word_default>Display Name History For:</word_default>
-      <word_custom>И�тори� изменени� имен дл�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pp_generic_error</word_key>
+      <word_default>Failed to set a new photo</word_default>
+      <word_custom>�е удало�ь у�тановить новую фотографию</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>view_dname_history</word_key>
-      <word_default>View display name history</word_default>
-      <word_custom>Про�мотреть и�торию изменени� имен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_title</word_key>
+      <word_default>Photo Editor</word_default>
+      <word_custom>Редактор фото</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>get_photo</word_key>
-      <word_default>Personal Photo</word_default>
-      <word_custom>Фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_cancel</word_key>
+      <word_default>Cancel</word_default>
+      <word_custom>Отменить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>display_name_history</word_key>
-      <word_default>Display name history</word_default>
-      <word_custom>И�тори� изменени� имен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_use_custom_photo</word_key>
+      <word_default>Use a custom photo</word_default>
+      <word_custom>Из файла</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_confirm</word_key>
-      <word_default>Please confirm that you wish to proceed</word_default>
-      <word_custom>Пожалуй�та, подтвердите �то дей�твие</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_ok</word_key>
+      <word_default>Ok</word_default>
+      <word_custom>Ок</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_profile_title</word_key>
-      <word_default><![CDATA['s Profile]]></word_default>
-      <word_custom> Профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_use_facebook</word_key>
+      <word_default>Use Facebook Photo</word_default>
+      <word_custom>Фото из Facebook</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_no_comments</word_key>
-      <word_default>Other users have left no comments for</word_default>
-      <word_custom>Другие пользователи не о�тавили комментарии дл�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_use_twitter</word_key>
+      <word_default>Use Twitter Photo</word_default>
+      <word_custom>Фото из Twitter</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_go_button</word_key>
-      <word_default> Go </word_default>
-      <word_custom>Пу�к</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_use_gravatar</word_key>
+      <word_default>Use Gravatar</word_default>
+      <word_custom>Gravatar</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_comment_delete</word_key>
-      <word_default>Delete Selected Comments</word_default>
-      <word_custom>Удалить выбранные комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_done_button</word_key>
+      <word_default>Done</word_default>
+      <word_custom>Готово</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_comment_app</word_key>
-      <word_default>Approve Selected Comments</word_default>
-      <word_custom>Утвердить выбранные комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_remove_button</word_key>
+      <word_default>Remove Photo</word_default>
+      <word_custom>Удалить</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_comment_unapp</word_key>
-      <word_default>Un-approve Selected Comments</word_default>
-      <word_custom>Сн�ть утверждени� выбранных комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_formats</word_key>
+      <word_default>Formats: JPEG, PNG, GIF</word_default>
+      <word_custom>Формат: JPEG, PNG, GIF</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_approve</word_key>
-      <word_default>Approve</word_default>
-      <word_custom>Утвердить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_upload_desc</word_key>
+      <word_default><![CDATA[Once uploaded, you can <a href='javascript:void(0);' class='cropperStart'>adjust the cropped image</a>]]></word_default>
+      <word_custom><![CDATA[По�ле загрузки фотографии, вы �можете <a href='javascript:void(0);' class='cropperStart'>обрезать ее</a>]]></word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_friends_list</word_key>
-      <word_default>My Friends</word_default>
-      <word_custom>Мои друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_twitter_desc</word_key>
+      <word_default>If you choose this option, your photo will automatically synchronize with your Twitter photo</word_default>
+      <word_custom>Ваша фотографи� будет �инхронизировать�� � фотографией из Twitter</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_friends_pending</word_key>
-      <word_default>Friends Pending Approval</word_default>
-      <word_custom>Друзь� в ожидании утверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_what_is_gravatar</word_key>
+      <word_default>Gravatar allows remotely hosted photos, click for more information.</word_default>
+      <word_custom>Что такое Gravatar?</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_age_unknown</word_key>
-      <word_default>Age Unknown</word_default>
-      <word_custom>�еизве�тен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_enter_gravatar_email</word_key>
+      <word_default>Enter your linked Gravatar email address</word_default>
+      <word_custom>Введите �в�занный � Gravatar email</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_years_old</word_key>
-      <word_default>years old</word_default>
-      <word_custom>лет</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_upload_rec</word_key>
+      <word_default>Recommend an image 200px or larger</word_default>
+      <word_custom>Желательно изображение больше 200px</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_birthday_prefix</word_key>
-      <word_default>Birthday:</word_default>
-      <word_custom>День рождени�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pe_facebook_desc</word_key>
+      <word_default>If you choose this option, your photo will automatically synchronize with your Facebook photo</word_default>
+      <word_custom>Ваша фотографи� будет �инхронизировать�� � фотографией из Facebook</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_bday_unknown</word_key>
-      <word_default>Birthday Unknown</word_default>
-      <word_custom>�еизве�тен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pp_photo_edited</word_key>
+      <word_default>The photo has been updated</word_default>
+      <word_custom>Фотографи� обновлена</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_age_prefix</word_key>
-      <word_default>Age:</word_default>
-      <word_custom>Возра�т:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rep_description</word_key>
+      <word_default>%s has %s reputation points</word_default>
+      <word_custom>%s имеет %s баллов репутации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_title_comments</word_key>
-      <word_default>Comments</word_default>
-      <word_custom>Комментарии</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>user_tools</word_key>
+      <word_default>User Tools</word_default>
+      <word_custom>Ин�трументы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_member_since</word_key>
-      <word_default>Joined:</word_default>
-      <word_custom>Реги�траци�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>rep_description_like</word_key>
+      <word_default>%s has %s likes</word_default>
+      <word_custom>%s имеет %s лайков</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_title_friends</word_key>
+      <word_key>community_stats</word_key>
+      <word_default>Community Stats</word_default>
+      <word_custom>Стати�тика</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>change_photo_link</word_key>
+      <word_default>Change</word_default>
+      <word_custom>Изменить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>leave_message</word_key>
+      <word_default>Leave a message...</word_default>
+      <word_custom>Сообщение...</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>change_photo_desc</word_key>
+      <word_default>Update your current photo</word_default>
+      <word_custom>Обновить фотографию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_info</word_key>
+      <word_default>Overview</word_default>
+      <word_custom>Обзор</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_friends</word_key>
       <word_default>Friends</word_default>
       <word_custom>Друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
       <word_pack>public_profile</word_pack>
-      <word_key>m_profile_views</word_key>
-      <word_default>Profile Views:</word_default>
-      <word_custom>Про�мотров:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_last_active</word_key>
-      <word_default>Last Active:</word_default>
-      <word_custom>�ктивно�ть:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_group</word_key>
-      <word_default>Group:</word_default>
-      <word_custom>Группа:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_posts</word_key>
-      <word_default>Active Posts:</word_default>
-      <word_custom>Сообщений: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>err_no_posts_to_show</word_key>
-      <word_default>There are no posts to display</word_default>
-      <word_custom>�ет �ообщений дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_in_topic</word_key>
-      <word_default>In Topic: </word_default>
-      <word_custom>В теме: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_read_topic</word_key>
-      <word_default>Read Topic</word_default>
-      <word_custom>Читать тему</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_gallery</word_key>
-      <word_default>Gallery</word_default>
-      <word_custom>Галере�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_blog</word_key>
-      <word_default>Blog</word_default>
-      <word_custom>Блог</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_topics</word_key>
-      <word_default>Topics</word_default>
-      <word_custom>Темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_posts</word_key>
-      <word_default>Posts</word_default>
-      <word_custom>Сообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>page_title_pp</word_key>
-      <word_default>Viewing Profile</word_default>
-      <word_custom>Про�мотр профил�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_aboutme</word_key>
-      <word_default>About Me</word_default>
-      <word_custom>Обо мне</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>err_no_aboutme_to_show</word_key>
-      <word_default><![CDATA[This user has not configured their 'About Me' page and has not added a signature to their account yet.]]></word_default>
-      <word_custom>Пользователь не пожелал �ообщить какую-либо информацию о �ебе.</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>ajax_bad_html</word_key>
-      <word_default>There was an error attempting to retrieve the HTML to display</word_default>
-      <word_custom>Ошибка при попытке получить HTML дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>ajax_no_warn</word_key>
-      <word_default>Member warning is not currently enabled</word_default>
-      <word_custom>Предупреждение временно невозможно</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>ajax_no_member</word_key>
-      <word_default>We could not find the member you were attempting to view</word_default>
-      <word_custom>�евозможно найти пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_was_changed</word_key>
-      <word_default>You have updated your status</word_default>
-      <word_custom>Стату� обновлен</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>ajax_no_meminfo</word_key>
-      <word_default><![CDATA[You do not have access to view a user's profile]]></word_default>
-      <word_custom>У ва� недо�таточно прав дл� про�мотра профил� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_field_error__blacklist</word_key>
-      <word_default>A URL you supplied is not allowed</word_default>
-      <word_custom>Введенный URL запрещен в �и�теме</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_field_error__too_small</word_key>
-      <word_default>The data you entered is not long enough</word_default>
-      <word_custom>Введенные данные меньше минимально допу�тимого значени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_field_error__invalid</word_key>
-      <word_default>The data you entered is not in the correct format</word_default>
-      <word_custom>�еверный формат даты</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_field_error__empty</word_key>
-      <word_default>Cannot be left blank</word_default>
-      <word_custom>�ельз� о�тавл�ть пу�тым</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>profile_field_error__too_big</word_key>
-      <word_default>The data you entered exceeds the maximum allowed</word_default>
-      <word_custom>Введенные данные превышают мак�имально допу�тимое значение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>comment_was_approved</word_key>
-      <word_default>The comment has been approved</word_default>
-      <word_custom>Комментарий утвержден</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>comment_was_deleted</word_key>
-      <word_default>The comment has been deleted</word_default>
-      <word_custom>Комментарий удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>nofriendid</word_key>
-      <word_default>We could not find the member whose friends you requested to view</word_default>
-      <word_custom>�е возможно найти пользовател�, друзей которого вы хотите про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>dname_no_history</word_key>
-      <word_default>No history to display</word_default>
-      <word_custom>�ет и�тории дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_profile_comments</word_key>
-      <word_default>has no profile comments yet. Why not say hello?</word_default>
-      <word_custom>не имеет еще комментариев. Почему бы не напи�ать «Привет»?</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>chars_remaining</word_key>
-      <word_default>Characters remaining:</word_default>
-      <word_custom>О�тало�ь �имволов:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>your_photo</word_key>
-      <word_default>Your photo</word_default>
-      <word_custom>Ваша фотографи�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>friends_view_all</word_key>
-      <word_default>View all</word_default>
-      <word_custom>Про�мотреть в�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>showing_50_rand_friends</word_key>
-      <word_default>Showing 50 random friends of</word_default>
-      <word_custom>Показать 50 �лучайных друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_email</word_key>
-      <word_default>E-mail:</word_default>
-      <word_custom>E-mail:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>click_to_email</word_key>
-      <word_default>Click here to e-mail me</word_default>
-      <word_custom>Отправить пи�ьмо на e-mail</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>contact_info</word_key>
-      <word_default>Contact Information</word_default>
-      <word_custom>Контактна� информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>my_info</word_key>
-      <word_default>My Information</word_default>
-      <word_custom>Информаци�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_member_title</word_key>
-      <word_default>Member Title:</word_default>
-      <word_custom>Стату�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>view</word_key>
-      <word_default>View</word_default>
-      <word_custom>Про�мотреть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>save</word_key>
-      <word_default>Save</word_default>
-      <word_custom>Сохранить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>update</word_key>
-      <word_default>Update</word_default>
-      <word_custom>Обновить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>update_to</word_key>
-      <word_default>Update to:</word_default>
-      <word_custom>Обновить:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>not_set_status</word_key>
-      <word_default>has not set their status</word_default>
-      <word_custom>не у�тановил(а) �вой �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_latest_visitors</word_key>
-      <word_default>No latest visitors to show</word_default>
-      <word_custom>�ет по�ледних по�етителей дл� отображени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_currently</word_key>
-      <word_default>Currently:</word_default>
-      <word_custom>Сейча�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>latest_visitors</word_key>
-      <word_default>Latest Visitors</word_default>
-      <word_custom>По�ледние по�етители</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_active_in</word_key>
-      <word_default>Most Active In:</word_default>
-      <word_custom>�ктивен в:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>ignore</word_key>
-      <word_default>Ignore user</word_default>
-      <word_custom>Игнорировать �ообщени� пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>send_message</word_key>
-      <word_default>Send me a message</word_default>
-      <word_custom>Отправить �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>unignore</word_key>
-      <word_default>Unignore user</word_default>
-      <word_custom>Отменить игнорирование �ообщений пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>add_me_friend</word_key>
-      <word_default>Add me as a friend</word_default>
-      <word_custom>Добавить в друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rate_5</word_key>
-      <word_default>Rate user 5 stars</word_default>
-      <word_custom>По�тавить 5 звездочек</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rate_4</word_key>
-      <word_default>Rate user 4 stars</word_default>
-      <word_custom>По�тавить 4 звездочки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rate_3</word_key>
-      <word_default>Rate user 3 stars</word_default>
-      <word_custom>По�тавить 3 звездочки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rate_2</word_key>
-      <word_default>Rate user 2 stars</word_default>
-      <word_custom>По�тавить 2 звездочки</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rate_1</word_key>
-      <word_default>Rate user 1 star</word_default>
-      <word_custom>По�тавить 1 звездочку</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_rating</word_key>
-      <word_default>User Rating:</word_default>
-      <word_custom>Рейтинг:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>report_member</word_key>
-      <word_default>Report Member</word_default>
-      <word_custom>Пожаловать�� на пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>remove_as_friend</word_key>
-      <word_default>Remove me as a friend</word_default>
-      <word_custom>Удалить из друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>topics_started</word_key>
-      <word_default><![CDATA[Topics I've Started]]></word_default>
-      <word_custom>Мои темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_friends_yet</word_key>
-      <word_default><![CDATA[hasn't added any friends yet.]]></word_default>
-      <word_custom>еще не добавил друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>posts_made</word_key>
-      <word_default><![CDATA[Posts I've Made]]></word_default>
-      <word_custom>Мои �ообщени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>approve_this_comment</word_key>
-      <word_default>Approve this comment</word_default>
-      <word_custom>Подтвердить комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>posted</word_key>
-      <word_default>Posted</word_default>
-      <word_custom>�апи�ал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>delete_comment_text</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_friends_to_display</word_key>
-      <word_default>No friends to display</word_default>
-      <word_custom>У пользовател� пока нет друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>delete_this_comment</word_key>
-      <word_default>Delete this comment</word_default>
-      <word_custom>Удалить комментарий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_friends_awaiting_approval</word_key>
-      <word_default>No friends awaiting approval</word_default>
-      <word_custom>�ет друзей, ожидающих подтверждени�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>deny_request</word_key>
-      <word_default>Deny Request</word_default>
-      <word_custom>Запрещенный запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>m_reputation</word_key>
-      <word_default>Reputation:</word_default>
-      <word_custom>Репутаци�:</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>approve_request</word_key>
-      <word_default>Approve Request</word_default>
-      <word_custom>Подтвердить запро�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>spm_on</word_key>
-      <word_default>Flagged As Spammer</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>spm_off</word_key>
-      <word_default>Flag As Spammer</word_default>
-      <word_custom>Спамер</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>tab_message_h</word_key>
-      <word_default>Message</word_default>
-      <word_custom>Сообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>comment_submit_post</word_key>
-      <word_default>Post</word_default>
-      <word_custom>Добавить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_comment_added_mod</word_key>
-      <word_default>Your comment will have to be approved before it becomes visible</word_default>
-      <word_custom>Ваш комментарий должен быть одобрен, прежде чем он �танет виден в�ем</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30011</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>pp_tab_statusupdates</word_key>
-      <word_default>Recent Status Updates</word_default>
-      <word_custom>Изменени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>err_no_status_to_show</word_key>
-      <word_default>No recent status updates to show</word_default>
-      <word_custom>�ет изменений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_reply_done</word_key>
-      <word_default>You have replied to a status</word_default>
-      <word_custom>Вы прокомментировали �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_unlocked</word_key>
-      <word_default>Status Unlocked</word_default>
-      <word_custom>Стату� разблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_locked</word_key>
-      <word_default>Status Locked</word_default>
-      <word_custom>Стату� заблокирован</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_show_all_x</word_key>
-      <word_default>Show all %s comments</word_default>
-      <word_custom>Показать в�е %s комментариев</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_deleted</word_key>
-      <word_default>Status Deleted</word_default>
-      <word_custom>Стату� удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_unlock_link</word_key>
-      <word_default>Unlock</word_default>
-      <word_custom>Разблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_delete_link</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_lock_link</word_key>
-      <word_default>Lock</word_default>
-      <word_custom>Заблокировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_reply_deleted</word_key>
-      <word_default>Reply Deleted</word_default>
-      <word_custom>Комментарий удален</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_actions_none</word_key>
-      <word_default>There are no actions to display</word_default>
-      <word_custom>�ет дей�твий</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_updates_title</word_key>
-      <word_default>Status Updates</word_default>
-      <word_custom>Изменени� �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_updates_none</word_key>
-      <word_default>There are no status updates to display</word_default>
-      <word_custom>�ет изменений �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_no_reply</word_key>
-      <word_default>You cannot reply to this status</word_default>
-      <word_custom>Вы не можете ответить на �тот �тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_off</word_key>
-      <word_default>An error occurred with this status</word_default>
-      <word_custom>Произошла ошибка</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_too_many_replies</word_key>
-      <word_default>This status update has reached the maximum number of replies allowed</word_default>
-      <word_custom>До�тигнуто мак�имальное количе�тво комментариев �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>add_comments_only</word_key>
-      <word_default>Add comment</word_default>
-      <word_custom>Комментировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>view_comments_only</word_key>
-      <word_default>Show comments (%s)</word_default>
-      <word_custom>Показать комментарии (%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>view_comments_collapse</word_key>
-      <word_default>Hide Comments</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>view_comments_and_add</word_key>
-      <word_default>Add / Show comments (%s)</word_default>
-      <word_custom>Добавить / Показать комментарии (%s)</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>email_title_blurb_other</word_key>
-      <word_default><![CDATA[New reply to %s's status]]></word_default>
-      <word_custom>�овый комментарий к обновлению �тату�а у %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>email_title_blurb_yours</word_key>
-      <word_default>New reply to your status</word_default>
-      <word_custom>�овый комментарий к обновлению вашего �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>email_blurb_other</word_key>
-      <word_default><![CDATA[has made a reply to %s's status]]></word_default>
-      <word_custom> прокомментировал обновление �тату�а %s</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>email_blurb_theirs</word_key>
-      <word_default>has made a reply to their status</word_default>
-      <word_custom> прокомментировал обновление их �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>email_blurb_yours</word_key>
-      <word_default>has made a reply to your status</word_default>
-      <word_custom> прокомментировал обновление вашего �тату�а</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>st_update</word_key>
-      <word_default>Update:</word_default>
-      <word_custom>Обновление: </word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>cust_disable</word_key>
-      <word_default>Remove And Disable Customizations</word_default>
-      <word_custom>Отключить пер�онализацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>cust_remove</word_key>
-      <word_default>Remove Customizations</word_default>
-      <word_custom>Удалить пер�онализацию</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>js_gender_mystery</word_key>
-      <word_default>Not Telling</word_default>
-      <word_custom>�е указал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>js_gender_female</word_key>
-      <word_default>Female</word_default>
-      <word_custom>Женщина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>js_gender_male</word_key>
-      <word_default>Male</word_default>
-      <word_custom>Мужчина</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__viewall</word_key>
-      <word_default><![CDATA[View All Updates&rarr;]]></word_default>
-      <word_custom><![CDATA[В�е изменени�&rarr;]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__addcomment</word_key>
-      <word_default>Add A Comment...</word_default>
-      <word_custom>Комментировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__dfcomment</word_key>
-      <word_default>Comment</word_default>
-      <word_custom>Комментировать</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__locked</word_key>
-      <word_default>Locked Status</word_default>
-      <word_custom>Заблокированный</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__singleupdate</word_key>
-      <word_default>Single Update</word_default>
-      <word_custom>Пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__membersupdats</word_key>
-      <word_default><![CDATA[Member's Updates]]></word_default>
-      <word_custom>Пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__myfriends</word_key>
-      <word_default><![CDATA[My Friends' Updates]]></word_default>
-      <word_custom>Друзей</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__all_updates</word_key>
-      <word_default>All Updates</word_default>
-      <word_custom>В�ех</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__newstring</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a>%s posted a new <a href='%s'>status</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a>%s опубликовал новый <a href='%s'>�тату�</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__repliedstring</word_key>
-      <word_default><![CDATA[<a href='%s'>%s</a>%s replied to <a href='%s'>%s</a>'s%s <a href='%s'>status</a>]]></word_default>
-      <word_custom><![CDATA[<a href='%s'>%s</a>%s прокомментировал  <a href='%s'>%s</a>%s <a href='%s'>�тату�</a>]]></word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__status</word_key>
-      <word_default>status</word_default>
-      <word_custom>�тату�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__repliedto</word_key>
-      <word_default>replied to</word_default>
-      <word_custom> прокомментировал</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status__recent_actions</word_key>
-      <word_default>Recent Actions</word_default>
-      <word_custom>По�ледние дей�тви�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>status_updates__overview</word_key>
-      <word_default>Community Status Updates</word_default>
-      <word_custom>Обновление �тату�ов</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>no_status_sent</word_key>
-      <word_default>You did not submit a status message</word_default>
-      <word_custom>Вы не ввели �ообщение</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+      <word_key>pp_tab_idm</word_key>
+      <word_default>Files</word_default>
+      <word_custom>Файлы</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4137,9 +2198,1091 @@
       <word_key>allfriendstab</word_key>
       <word_default>All Friends</word_default>
       <word_custom>В�е друзь�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_updates__overview</word_key>
+      <word_default>Community Status Updates</word_default>
+      <word_custom>Обновление �тату�ов</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__recent_actions</word_key>
+      <word_default>Recent Actions</word_default>
+      <word_custom>По�ледние дей�тви�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__repliedto</word_key>
+      <word_default>replied to</word_default>
+      <word_custom> прокомментировал</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_status_sent</word_key>
+      <word_default>You did not submit a status message</word_default>
+      <word_custom>Вы не ввели �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__status</word_key>
+      <word_default>status</word_default>
+      <word_custom>�тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__repliedstring</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a>%s replied to <a href='%s'>%s</a>'s%s <a href='%s'>status</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a>%s прокомментировал  <a href='%s'>%s</a>%s <a href='%s'>�тату�</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__singleupdate</word_key>
+      <word_default>Single Update</word_default>
+      <word_custom>Пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__membersupdats</word_key>
+      <word_default><![CDATA[Member's Profile Feed]]></word_default>
+      <word_custom>Пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__locked</word_key>
+      <word_default>Locked Status</word_default>
+      <word_custom>Заблокированный</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__addcomment</word_key>
+      <word_default>Add A Comment...</word_default>
+      <word_custom>Комментировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__dfcomment</word_key>
+      <word_default>Comment</word_default>
+      <word_custom>Комментировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__myfriends</word_key>
+      <word_default><![CDATA[Friends' Updates]]></word_default>
+      <word_custom>Друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__all_updates</word_key>
+      <word_default>All Updates</word_default>
+      <word_custom>В�ех</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__newstring</word_key>
+      <word_default><![CDATA[<a href='%s'>%s</a>%s posted a new <a href='%s'>status</a>]]></word_default>
+      <word_custom><![CDATA[<a href='%s'>%s</a>%s опубликовал новый <a href='%s'>�тату�</a>]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status__viewall</word_key>
+      <word_default><![CDATA[View All Updates&rarr;]]></word_default>
+      <word_custom><![CDATA[В�е изменени�&rarr;]]></word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>js_gender_male</word_key>
+      <word_default>Male</word_default>
+      <word_custom>Мужчина</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>js_gender_female</word_key>
+      <word_default>Female</word_default>
+      <word_custom>Женщина</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>cust_remove</word_key>
+      <word_default>Remove Customizations</word_default>
+      <word_custom>Удалить пер�онализацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>cust_disable</word_key>
+      <word_default>Remove And Disable Customizations</word_default>
+      <word_custom>Отключить пер�онализацию</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>js_gender_mystery</word_key>
+      <word_default>Not Telling</word_default>
+      <word_custom>�е указал</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>email_blurb_theirs</word_key>
+      <word_default>has made a reply to their status</word_default>
+      <word_custom> прокомментировал обновление их �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>email_blurb_yours</word_key>
+      <word_default>has made a reply to your status</word_default>
+      <word_custom> прокомментировал обновление вашего �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>st_update</word_key>
+      <word_default>Update:</word_default>
+      <word_custom>Обновление: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>email_blurb_other</word_key>
+      <word_default><![CDATA[has made a reply to %s's status]]></word_default>
+      <word_custom> прокомментировал обновление �тату�а %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>email_title_blurb_other</word_key>
+      <word_default><![CDATA[New reply to %s's status]]></word_default>
+      <word_custom>�овый комментарий к обновлению �тату�а у %s</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>email_title_blurb_yours</word_key>
+      <word_default>New reply to your status</word_default>
+      <word_custom>�овый комментарий к обновлению вашего �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>view_comments_collapse</word_key>
+      <word_default>Hide Comments</word_default>
+      <word_custom>Скрыть</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>add_comments_only</word_key>
+      <word_default>Add comment</word_default>
+      <word_custom>Комментировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>view_comments_only</word_key>
+      <word_default>Show comments (%s)</word_default>
+      <word_custom>Показать комментарии (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_too_many_replies</word_key>
+      <word_default>This status update has reached the maximum number of replies allowed</word_default>
+      <word_custom>До�тигнуто мак�имальное количе�тво комментариев �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_off</word_key>
+      <word_default>An error occurred with this status</word_default>
+      <word_custom>Произошла ошибка</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_no_reply</word_key>
+      <word_default>You cannot reply to this status</word_default>
+      <word_custom>Вы не можете ответить на �тот �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_updates_none</word_key>
+      <word_default>There are no status updates to display</word_default>
+      <word_custom>�ет изменений �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_updates_title</word_key>
+      <word_default>Status Updates</word_default>
+      <word_custom>Изменени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_reply_deleted</word_key>
+      <word_default>Reply Deleted</word_default>
+      <word_custom>Комментарий удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>view_comments_and_add</word_key>
+      <word_default>Add / Show comments (%s)</word_default>
+      <word_custom>Добавить / Показать комментарии (%s)</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_actions_none</word_key>
+      <word_default>There are no actions to display</word_default>
+      <word_custom>�ет дей�твий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_lock_link</word_key>
+      <word_default>Lock</word_default>
+      <word_custom>Заблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_unlock_link</word_key>
+      <word_default>Unlock</word_default>
+      <word_custom>Разблокировать</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_delete_link</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_deleted</word_key>
+      <word_default>Status Deleted</word_default>
+      <word_custom>Стату� удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_unlocked</word_key>
+      <word_default>Status Unlocked</word_default>
+      <word_custom>Стату� разблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_locked</word_key>
+      <word_default>Status Locked</word_default>
+      <word_custom>Стату� заблокирован</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_show_all_x</word_key>
+      <word_default>Show all %s comments</word_default>
+      <word_custom>Показать в�е %s комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_reply_done</word_key>
+      <word_default>You have replied to a status</word_default>
+      <word_custom>Вы прокомментировали �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_no_status_to_show</word_key>
+      <word_default>No recent status updates to show</word_default>
+      <word_custom>�ет изменений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_statusupdates</word_key>
+      <word_default>Profile Feed</word_default>
+      <word_custom>Изменени� �тату�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_comment_added_mod</word_key>
+      <word_default>Your comment will have to be approved before it becomes visible</word_default>
+      <word_custom>Ваш комментарий должен быть одобрен, прежде чем он �танет виден в�ем</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>comment_submit_post</word_key>
+      <word_default>Post</word_default>
+      <word_custom>Добавить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>tab_message_h</word_key>
+      <word_default>Message</word_default>
+      <word_custom>Сообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>spm_on</word_key>
+      <word_default>Flagged As Spammer</word_default>
+      <word_custom>Спамер</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>spm_off</word_key>
+      <word_default>Flag As Spammer</word_default>
+      <word_custom>Спамер</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>approve_request</word_key>
+      <word_default>Approve Request</word_default>
+      <word_custom>Подтвердить запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_friends_awaiting_approval</word_key>
+      <word_default>No friends awaiting approval</word_default>
+      <word_custom>�ет друзей, ожидающих подтверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_friends_to_display</word_key>
+      <word_default>No friends to display</word_default>
+      <word_custom>У пользовател� пока нет друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_reputation</word_key>
+      <word_default>Reputation:</word_default>
+      <word_custom>Репутаци�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>deny_request</word_key>
+      <word_default>Deny Request</word_default>
+      <word_custom>Запрещенный запро�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>delete_this_comment</word_key>
+      <word_default>Delete this comment</word_default>
+      <word_custom>Удалить комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>approve_this_comment</word_key>
+      <word_default>Approve this comment</word_default>
+      <word_custom>Подтвердить комментарий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>delete_comment_text</word_key>
+      <word_default>Delete</word_default>
+      <word_custom>Удалить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>posted</word_key>
+      <word_default>Posted</word_default>
+      <word_custom>�апи�ал</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>posts_made</word_key>
+      <word_default><![CDATA[Posts I've Made]]></word_default>
+      <word_custom>Мои �ообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>topics_started</word_key>
+      <word_default><![CDATA[Topics I've Started]]></word_default>
+      <word_custom>Мои темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_friends_yet</word_key>
+      <word_default><![CDATA[hasn't added any friends yet.]]></word_default>
+      <word_custom>еще не добавил друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>remove_as_friend</word_key>
+      <word_default>Remove me as a friend</word_default>
+      <word_custom>Удалить из друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>report_member</word_key>
+      <word_default>Report This Member</word_default>
+      <word_custom>Пожаловать�� на пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rating</word_key>
+      <word_default>User Rating:</word_default>
+      <word_custom>Рейтинг:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rate_1</word_key>
+      <word_default>Rate user 1 star</word_default>
+      <word_custom>По�тавить 1 звездочку</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rate_2</word_key>
+      <word_default>Rate user 2 stars</word_default>
+      <word_custom>По�тавить 2 звездочки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rate_3</word_key>
+      <word_default>Rate user 3 stars</word_default>
+      <word_custom>По�тавить 3 звездочки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rate_5</word_key>
+      <word_default>Rate user 5 stars</word_default>
+      <word_custom>По�тавить 5 звездочек</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>add_me_friend</word_key>
+      <word_default>Add me as a friend</word_default>
+      <word_custom>Добавить в друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>send_message</word_key>
+      <word_default>Send me a message</word_default>
+      <word_custom>Отправить �ообщение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>unignore</word_key>
+      <word_default>Unignore user</word_default>
+      <word_custom>Отменить игнорирование �ообщений пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_rate_4</word_key>
+      <word_default>Rate user 4 stars</word_default>
+      <word_custom>По�тавить 4 звездочки</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>ignore</word_key>
+      <word_default>Ignore user</word_default>
+      <word_custom>Игнорировать �ообщени� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_active_in</word_key>
+      <word_default>Most Active In</word_default>
+      <word_custom>�ктивен в:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_currently</word_key>
+      <word_default>Currently</word_default>
+      <word_custom>Сейча�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_latest_visitors</word_key>
+      <word_default>No latest visitors to show</word_default>
+      <word_custom>�ет по�ледних по�етителей дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>latest_visitors</word_key>
+      <word_default>Latest Visitors</word_default>
+      <word_custom>По�ледние по�етители</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>view</word_key>
+      <word_default>View</word_default>
+      <word_custom>Про�мотреть</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>update_to</word_key>
+      <word_default>Update to:</word_default>
+      <word_custom>Обновить:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>not_set_status</word_key>
+      <word_default>has not set their status</word_default>
+      <word_custom>не у�тановил(а) �вой �тату�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>save</word_key>
+      <word_default>Save</word_default>
+      <word_custom>Сохранить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>update</word_key>
+      <word_default>Update</word_default>
+      <word_custom>Обновить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_member_title</word_key>
+      <word_default>Member Title</word_default>
+      <word_custom>Стату�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>my_info</word_key>
+      <word_default>My Information</word_default>
+      <word_custom>Информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>click_to_email</word_key>
+      <word_default>Click here to e-mail me</word_default>
+      <word_custom>Отправить пи�ьмо на e-mail</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>contact_info</word_key>
+      <word_default>Contact Information</word_default>
+      <word_custom>Контактна� информаци�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_email</word_key>
+      <word_default>E-mail</word_default>
+      <word_custom>E-mail:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>showing_50_rand_friends</word_key>
+      <word_default>Showing %s random friends of</word_default>
+      <word_custom>Показать 50 �лучайных друзей</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_profile_comments</word_key>
+      <word_default>has no profile comments yet. Why not say hello?</word_default>
+      <word_custom>не имеет еще комментариев. Почему бы не напи�ать «Привет»?</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>chars_remaining</word_key>
+      <word_default>Characters remaining:</word_default>
+      <word_custom>О�тало�ь �имволов:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>your_photo</word_key>
+      <word_default>Your photo</word_default>
+      <word_custom>Ваша фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>friends_view_all</word_key>
+      <word_default><![CDATA[See all &rarr;]]></word_default>
+      <word_custom>Про�мотреть в�ех</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>nofriendid</word_key>
+      <word_default>We could not find the member whose friends you requested to view</word_default>
+      <word_custom>�е возможно найти пользовател�, друзей которого вы хотите про�мотреть</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_no_history</word_key>
+      <word_default>No history to display</word_default>
+      <word_custom>�ет и�тории дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_field_error__empty</word_key>
+      <word_default>Cannot be left blank</word_default>
+      <word_custom>�ельз� о�тавл�ть пу�тым</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>comment_was_approved</word_key>
+      <word_default>The comment has been approved</word_default>
+      <word_custom>Комментарий утвержден</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>comment_was_deleted</word_key>
+      <word_default>The comment has been deleted</word_default>
+      <word_custom>Комментарий удален</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_field_error__too_big</word_key>
+      <word_default>The data you entered exceeds the maximum allowed</word_default>
+      <word_custom>Введенные данные превышают мак�имально допу�тимое значение</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_field_error__too_small</word_key>
+      <word_default>The data you entered is not long enough</word_default>
+      <word_custom>Введенные данные меньше минимально допу�тимого значени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_field_error__invalid</word_key>
+      <word_default>The data you entered is not in the correct format</word_default>
+      <word_custom>�еверный формат даты</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_field_error__blacklist</word_key>
+      <word_default>A URL you supplied is not allowed</word_default>
+      <word_custom>Введенный URL запрещен в �и�теме</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>status_was_changed</word_key>
+      <word_default>You have updated your status</word_default>
+      <word_custom>Стату� обновлен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>ajax_no_member</word_key>
+      <word_default>We could not find the member you were attempting to view</word_default>
+      <word_custom>�евозможно найти пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>ajax_no_meminfo</word_key>
+      <word_default><![CDATA[You do not have access to view a user's profile]]></word_default>
+      <word_custom>У ва� недо�таточно прав дл� про�мотра профил� пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>ajax_no_warn</word_key>
+      <word_default>Member warning is not currently enabled</word_default>
+      <word_custom>Предупреждение временно невозможно</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>ajax_bad_html</word_key>
+      <word_default>There was an error attempting to retrieve the HTML to display</word_default>
+      <word_custom>Ошибка при попытке получить HTML дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_aboutme</word_key>
+      <word_default>About Me</word_default>
+      <word_custom>Обо мне</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_no_aboutme_to_show</word_key>
+      <word_default><![CDATA[%s hasn't written anything about themself yet]]></word_default>
+      <word_custom>Пользователь не пожелал �ообщить какую-либо информацию о �ебе.</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>page_title_pp</word_key>
+      <word_default>Viewing Profile</word_default>
+      <word_custom>Про�мотр профил�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_posts</word_key>
+      <word_default>Posts</word_default>
+      <word_custom>Сообщени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_gallery</word_key>
+      <word_default>Gallery</word_default>
+      <word_custom>Галере�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_blog</word_key>
+      <word_default>Blog</word_default>
+      <word_custom>Блог</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pp_tab_topics</word_key>
+      <word_default>Topics</word_default>
+      <word_custom>Темы</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_read_topic</word_key>
+      <word_default>Read Topic</word_default>
+      <word_custom>Читать тему</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_no_posts_to_show</word_key>
+      <word_default>There are no posts to display</word_default>
+      <word_custom>�ет �ообщений дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>profile_in_topic</word_key>
+      <word_default>In Topic: </word_default>
+      <word_custom>В теме: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_no_topics_to_show</word_key>
+      <word_default>There are no topics to display</word_default>
+      <word_custom>�ет тем дл� отображени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_posts</word_key>
+      <word_default>Active Posts</word_default>
+      <word_custom>Сообщений: </word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_group</word_key>
+      <word_default>Group</word_default>
+      <word_custom>Группа:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_last_active</word_key>
+      <word_default>Last Active</word_default>
+      <word_custom>�ктивно�ть:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_profile_views</word_key>
+      <word_default>Profile Views</word_default>
+      <word_custom>Про�мотров:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_member_since</word_key>
+      <word_default>Member Since</word_default>
+      <word_custom>Реги�траци�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_title_comments</word_key>
+      <word_default>Comments</word_default>
+      <word_custom>Комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_title_friends</word_key>
+      <word_default>Friends</word_default>
+      <word_custom>Друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_bday_unknown</word_key>
+      <word_default>Birthday Unknown</word_default>
+      <word_custom>�еизве�тен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_age_prefix</word_key>
+      <word_default>Age</word_default>
+      <word_custom>Возра�т:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_age_unknown</word_key>
+      <word_default>Age Unknown</word_default>
+      <word_custom>�еизве�тен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_birthday_prefix</word_key>
+      <word_default>Birthday</word_default>
+      <word_custom>День рождени�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_years_old</word_key>
+      <word_default>years old</word_default>
+      <word_custom>лет</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_friends_pending</word_key>
+      <word_default>Friends Pending Approval</word_default>
+      <word_custom>Друзь� в ожидании утверждени�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_friends_list</word_key>
+      <word_default>My Friends</word_default>
+      <word_custom>Мои друзь�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_approve</word_key>
+      <word_default>Approve</word_default>
+      <word_custom>Утвердить</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_comment_unapp</word_key>
+      <word_default>Un-approve Selected Comments</word_default>
+      <word_custom>Сн�ть утверждени� выбранных комментариев</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_comment_app</word_key>
+      <word_default>Approve Selected Comments</word_default>
+      <word_custom>Утвердить выбранные комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_comment_delete</word_key>
+      <word_default>Delete Selected Comments</word_default>
+      <word_custom>Удалить выбранные комментарии</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_go_button</word_key>
+      <word_default> Go </word_default>
+      <word_custom>Пу�к</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_no_comments</word_key>
+      <word_default>Other users have left no comments for</word_default>
+      <word_custom>Другие пользователи не о�тавили комментарии дл�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_confirm</word_key>
+      <word_default>Please confirm that you wish to proceed</word_default>
+      <word_custom>Пожалуй�та, подтвердите �то дей�твие</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>m_profile_title</word_key>
+      <word_default><![CDATA['s Profile]]></word_default>
+      <word_custom> Профиль</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>view_dname_history</word_key>
+      <word_default>View display name history</word_default>
+      <word_custom>Про�мотреть и�торию изменени� имен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>display_name_history</word_key>
+      <word_default>Display name history</word_default>
+      <word_custom>И�тори� изменени� имен</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_title</word_key>
+      <word_default><![CDATA[Member's Display Name History]]></word_default>
+      <word_custom>И�тори� изменени� имен пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>get_photo</word_key>
+      <word_default>Personal Photo</word_default>
+      <word_custom>Фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_window_title</word_key>
+      <word_default>Display Name History For:</word_default>
+      <word_custom>И�тори� изменени� имен дл�:</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_name_from</word_key>
+      <word_default>From</word_default>
+      <word_custom>С</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_date</word_key>
+      <word_default>Change Date</word_default>
+      <word_custom>Дата изменена</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>dname_name_to</word_key>
+      <word_default>To</word_default>
+      <word_custom>�а</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>supmod_edit_member</word_key>
+      <word_default>Edit Member</word_default>
+      <word_custom>Редактировать пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>online_offline</word_key>
+      <word_default>Offline</word_default>
+      <word_custom>Offline</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>online_online</word_key>
+      <word_default>Online</word_default>
+      <word_custom>Online</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>photo_title</word_key>
+      <word_default>Photo</word_default>
+      <word_custom>Фотографи�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>no_info</word_key>
+      <word_default><![CDATA[<i>No Information</i>]]></word_default>
+      <word_custom>�ет информации</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4147,49 +3290,6 @@
       <word_key>private</word_key>
       <word_default><![CDATA[<i>Private</i>]]></word_default>
       <word_custom>Скрыто</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>posts_per_day</word_key>
-      <word_default>per day</word_default>
-      <word_custom>в день</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>total_percent</word_key>
-      <word_default>of total forum posts</word_default>
-      <word_custom>от общего объема �ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>fav_posts</word_key>
-      <word_default>posts</word_default>
-      <word_custom>�ообщений</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>members</word_app>
-      <word_pack>public_profile</word_pack>
-      <word_key>fav_percent</word_key>
-      <word_default><![CDATA[of this member&#39;s active posts]]></word_default>
-      <word_custom>от в�ех �ообщений �того пользовател�</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4197,9 +3297,6 @@
       <word_key>edit_my_sig</word_key>
       <word_default>Edit my Signature</word_default>
       <word_custom>Редактировать подпи�ь</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4207,9 +3304,34 @@
       <word_key>edit_profile</word_key>
       <word_default>Edit my Profile</word_default>
       <word_custom>Редактировать профиль</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>30005</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>fav_percent</word_key>
+      <word_default><![CDATA[of this member&#39;s active posts]]></word_default>
+      <word_custom>от в�ех �ообщений �того пользовател�</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>fav_posts</word_key>
+      <word_default>posts</word_default>
+      <word_custom>�ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>total_percent</word_key>
+      <word_default>of total forum posts</word_default>
+      <word_custom>от общего объема �ообщений</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>posts_per_day</word_key>
+      <word_default>per day</word_default>
+      <word_custom>в день</word_custom>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4217,9 +3339,6 @@
       <word_key>user_controls</word_key>
       <word_default>User Controls</word_default>
       <word_custom>Управление</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31006</word_custom_version>
-      <word_js>0</word_js>
     </lang>
     <lang>
       <word_app>members</word_app>
@@ -4227,9 +3346,48 @@
       <word_key>view_topic</word_key>
       <word_default>View Topic</word_default>
       <word_custom>Про�мотр темы</word_custom>
-      <word_default_version>31006</word_default_version>
-      <word_custom_version>31001</word_custom_version>
-      <word_js>0</word_js>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_not_save_urlphoto</word_key>
+      <word_default>Could not save the URL image specified</word_default>
+      <word_custom>�е удало�ь загрузить изображение по URL</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_not_contact_server</word_key>
+      <word_default>The server could not be contacted</word_default>
+      <word_custom>�е удало�ь �оединит�� � �ервером</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_not_allowed_url_photo</word_key>
+      <word_default>You are not permitted to use URLs as photos</word_default>
+      <word_custom>Вам не разрешено и�пользовать URL дл� фотографий</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_not_photo_url</word_key>
+      <word_default>That is not a valid image type</word_default>
+      <word_custom>Указанное изображение не �вл�ет�� допу�тимым</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>err_not_correct_url_format</word_key>
+      <word_default><![CDATA[The entered URL doesn't appear to be valid]]></word_default>
+      <word_custom>Введенный URL не выгл�дит правильным</word_custom>
+    </lang>
+    <lang>
+      <word_app>members</word_app>
+      <word_pack>public_profile</word_pack>
+      <word_key>pe_import_from_url</word_key>
+      <word_default>Or import a photo from a URL</word_default>
+      <word_custom>Или загрузите фотографию указав ее URL</word_custom>
     </lang>
   </languagegroup>
 </languageexport>
diff --git a/upload/admin/applications/members/xml/versions.xml b/upload/admin/applications/members/xml/versions.xml
index 7dd60e33..8d5c6974 100644
--- a/upload/admin/applications/members/xml/versions.xml
+++ b/upload/admin/applications/members/xml/versions.xml
@@ -260,4 +260,32 @@
 		<human>3.1.4</human>
 		<long>31007</long>
 	</version>
+	<version>
+		<human>3.2.0 Beta 1</human>
+		<long>32000</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 2</human>
+		<long>32001</long>
+	</version>
+	<version>
+		<human>3.2.0 Beta 3</human>
+		<long>32002</long>
+	</version>
+	<version>
+		<human>3.2.0</human>
+		<long>32003</long>
+	</version>
+	<version>
+		<human>3.2.1</human>
+		<long>32004</long>
+	</version>
+	<version>
+		<human>3.2.2</human>
+		<long>32005</long>
+	</version>
+	<version>
+		<human>3.2.3</human>
+		<long>32006</long>
+	</version>
 </versions>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/index.html b/upload/admin/applications_addon/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications_addon/index.html
+++ b/upload/admin/applications_addon/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/coreExtensions.php b/upload/admin/applications_addon/ips/calendar/extensions/coreExtensions.php
deleted file mode 100644
index 952e6043..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/coreExtensions.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar core extensions
- * Last Updated: $LastChangedDate: 2010-09-08 22:56:21 -0400 (Wed, 08 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 6843 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class calendarPermMappingCalendar
-{
-	/**
-	 * Mapping of keys to columns
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $mapping = array(
-								'view'     => 'perm_view',
-								'start'    => 'perm_2',
-								'nomod'    => 'perm_3',
-							);
-
-	/**
-	 * Mapping of keys to names
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $perm_names = array(
-								'view'     => 'Show Calendar',
-								'start'    => 'Create Events',
-								'nomod'    => 'Bypass Moderation',
-							);
-
-	/**
-	 * Mapping of keys to background colors for the form
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $perm_colors = array(
-								'view'     => '#fff0f2',
-								'start'    => '#effff6',
-								'nomod'    => '#edfaff',
-							);
-
-	/**
-	 * Method to pull the key/column mapping
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	public function getMapping()
-	{
-		return $this->mapping;
-	}
-
-	/**
-	 * Method to pull the key/name mapping
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	public function getPermNames()
-	{
-		return $this->perm_names;
-	}
-
-	/**
-	 * Method to pull the key/color mapping
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	public function getPermColors()
-	{
-		return $this->perm_colors;
-	}
-}
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Library: Handle public session data
- * Last Updated: $Date: 2010-09-08 22:56:21 -0400 (Wed, 08 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		12th March 2002
- * @version		$Revision: 6843 $
- *
- */
-
-class publicSessions__calendar
-{
-	/**
-	* Return session variables for this application
-	*
-	* current_appcomponent, current_module and current_section are automatically
-	* stored. This function allows you to add specific variables in.
-	*
-	* @access	public
-	* @author	Matt Mecham
-	* @return   array
-	* @todo 	[Future] Store which event or calendar a user is viewing?
-	*/
-	public function getSessionVariables()
-	{
-		return array();
-	}
-
-	/**
-	* Parse/format the online list data for the records
-	*
-	* @access	public
-	* @author	Brandon Farber
-	* @param	array 			Online list rows to check against
-	* @return   array 			Online list rows parsed
-	*/
-	public function parseOnlineEntries( $rows )
-	{
-		if( !is_array($rows) OR !count($rows) )
-		{
-			return $rows;
-		}
-
-		$final = array();
-		
-		//-----------------------------------------
-		// Extract the topic/forum data
-		//-----------------------------------------
-		
-		foreach( $rows as $row )
-		{
-			if( $row['current_appcomponent'] == 'calendar' )
-			{
-				$row['where_line']	   = ipsRegistry::getClass( 'class_localization' )->words['WHERE_calendar'];
-				$row['where_link']	   = 'app=calendar&amp;module=calendar&amp;section=calendars';
-				$row['_whereLinkSeo']  = ipsRegistry::getClass('output')->formatUrl( ipsRegistry::getClass('output')->buildUrl( 'app=calendar', 'public' ), 'calendar', 'app=calendar' );
-			}
-			
-			$final[ $row['id'] ] = $row;
-		}
-
-		return $final;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/coreVariables.php b/upload/admin/applications_addon/ips/calendar/extensions/coreVariables.php
deleted file mode 100644
index afb87aed..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/coreVariables.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Core variables for calendar
- * Last Updated: $Date: 2010-09-24 21:21:39 -0400 (Fri, 24 Sep 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6915 $ 
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$_LOAD = array();
-
-
-$_LOAD['calendars']  = 1;
-
-$CACHE['calendars'] = array( 
-								'array'            => 1,
-								'allow_unload'     => 0,
-							    'default_load'     => 1,
-							    'recache_file'     => IPSLib::getAppDir( 'calendar' ) . '/modules_admin/calendar/calendars.php',
-								'recache_class'    => 'admin_calendar_calendar_calendars',
-							    'recache_function' => 'calendarsRebuildCache' 
-							);
-
-$CACHE['birthdays'] = array( 
-								'array'            => 1,
-								'allow_unload'     => 0,
-							    'default_load'     => 1,
-							    'recache_file'     => IPSLib::getAppDir( 'calendar' ) . '/modules_admin/calendar/calendars.php',
-								'recache_class'    => 'admin_calendar_calendar_calendars',
-							    'recache_function' => 'calendarRebuildCache' 
-							);
-
-$CACHE['calendar'] = array( 
-								'array'            => 1,
-								'allow_unload'     => 0,
-							    'default_load'     => 1,
-							    'recache_file'     => IPSLib::getAppDir( 'calendar' ) . '/modules_admin/calendar/calendars.php',
-								'recache_class'    => 'admin_calendar_calendar_calendars',
-							    'recache_function' => 'calendarRebuildCache' 
-							);
-
-$CACHE['rss_calendar'] = array(
-						'array'				=> 1,
-						'allow_unload'		=> 0,
-						'default_load'		=> 1,
-						'skip_rebuild_when_upgrading' => 1,
-						'recache_file'		=> IPSLib::getAppDir( 'calendar' ) . '/modules_admin/calendar/calendars.php',
-						'recache_class'		=> 'admin_calendar_calendar_calendars',
-						'recache_function'	=> 'calendarRSSCache' 
-						);
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/dataHookLocations.php b/upload/admin/applications_addon/ips/calendar/extensions/dataHookLocations.php
deleted file mode 100644
index 73c7cd60..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/dataHookLocations.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Define data hook locations (Calendar)
- * Last Updated: $Date: 2010-10-12 13:04:59 -0400 (Tue, 12 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6964 $
- */
-
-$dataHookLocations = array(
-
-	/* POSTING DATA LOCATIONS */
-	array( 'calendarAddEvent', 'Add Calendar Event' ),
-	array( 'calendarEditEvent', 'Edit Calendar Event' ),
-	
-);
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/editorSections.php b/upload/admin/applications_addon/ips/calendar/extensions/editorSections.php
deleted file mode 100644
index 4db41ee2..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/editorSections.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * BBCode Management : Determines if bbcode can be used in this section
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/*
- * An array of key => value pairs
- * When going to parse, the key should be passed to the editor
- *  to determine which bbcodes should be parsed in the section
- *
- */
-$BBCODE	= array(
-				'calendar'		=> ipsRegistry::getClass('class_localization')->words['ctype__calendar'],
-				);
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/furlTemplates.php b/upload/admin/applications_addon/ips/calendar/extensions/furlTemplates.php
deleted file mode 100644
index 882c2971..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/furlTemplates.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Sets up SEO templates
- * Last Updated: $Date: 2010-04-13 07:32:04 -0400 (Tue, 13 Apr 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Forums
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6099 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$_SEOTEMPLATES = array(
-						'cal_week'		  => array( 
-											'app'			=> 'calendar',
-											'allowRedirect' => 1,
-											'out'			=> array( '#app=calendar(?:&|&amp;)module=calendar(?:&|&amp;)cal_id=(\d+?)(?:&|&amp;)do=showweek(?:&|&amp;)week=(\d+?)(?:&|$)#i', 'calendar/\\1/week-\\2' ),
-											'in'			=> array( 
-																		'regex'		=> "#/calendar/(\d+?)/week-(\d+?)(/|$)#i",
-																		'matches'	=> array( array( 'app'     , 'calendar' ),
-																		 					  array( 'module'  , 'calendar' ),
-																		  					  array( 'do'      , 'showweek' ),
-																							  array( 'cal_id'  , '$1' ),
-																							  array( 'week', '$2' ) )
-																	)  ),
-												
-						'event'			   => array( 
-											'app'			=> 'calendar',
-											'allowRedirect' => 1,
-											'out'			=> array( '#app=calendar(?:&|&amp;)module=calendar(?:&|&amp;)cal_id=(\d+?)(?:&|&amp;)do=showevent(?:&|&amp;)event_id=(\d+?)(?:&|$)#i', 'calendar/\\1/event-\\2' ),
-											'in'			=> array( 
-																		'regex'		=> "#/calendar/(\d+?)/event-(\d+?)(/|$)#i",
-																		'matches'	=> array( array( 'app'     , 'calendar' ),
-																		 					  array( 'module'  , 'calendar' ),
-																		  					  array( 'do'      , 'showevent' ),
-																							  array( 'cal_id'  , '$1' ),
-																							  array( 'event_id', '$2' ) )
-																	)  ),
-						
-						'cal_day'			   => array( 
-											'app'			=> 'calendar',
-											'allowRedirect' => 1,
-											'out'			=> array( '#app=calendar(?:&|&amp;)module=calendar(?:&|&amp;)cal_id=(.+?)(?:&|&amp;)do=showday(?:&|&amp;)y=(.+?)&amp;m=(.+?)&amp;d=(.+?)(?:&|$)#i', 'calendar/\\1/day-\\2-\\3-\\4' ),
-											'in'			=> array( 
-																		'regex'		=> "#/calendar/(\d+?)/day-(\d+?)-(\d+?)-(\d+?)(/|$)#i",
-																		'matches'	=> array( array( 'app'     , 'calendar' ),
-																		 					  array( 'module'  , 'calendar' ),
-																		  					  array( 'do'      , 'showday' ),
-																							  array( 'cal_id'  , '$1' ),
-																							  array( 'y'       , '$2' ),
-																							  array( 'm'       , '$3' ),
-																							  array( 'd'       , '$4' ) )
-																	)  ),
-						
-						'app=calendar'		=> array( 
-											'app'			=> 'calendar',
-											'allowRedirect' => 1,
-											'out'			=> array( '#app=calendar$#i', 'calendar/' ),
-											'in'			=> array( 
-																		'regex'		=> "#/calendar(/|$|\?)#i",
-																		'matches'	=> array( array( 'app', 'calendar' ) )
-																	) 
-														),
-					);
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/index.html b/upload/admin/applications_addon/ips/calendar/extensions/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/memberSync.php b/upload/admin/applications_addon/ips/calendar/extensions/memberSync.php
deleted file mode 100644
index db484a5f..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/memberSync.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar core extensions
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
- * Member Synchronization extensions
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage  Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $ 
- **/
-
-class calendarMemberSync
-{
-	/**
-	 * Registry reference
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $registry;
-	
-	/**
-	 * CONSTRUCTOR
-	 *
-	 * @access	public
-	 * @return	void
-	 **/
-	public function __construct()
-	{
-		$this->registry = ipsRegistry::instance();
-	}
-
-	/**
-	 * This method is called after a member account has been removed
-	 *
-	 * @access	public
-	 * @param	string	$ids	SQL IN() clause
-	 * @return	void
-	 **/
-	public function onDelete( $mids )
-	{
-		if( $this->registry->DB()->checkForTable( 'cal_events' ) )
-		{
-			$this->registry->DB()->update( 'cal_events', array( 'event_member_id' => 0 ), 'event_member_id' . $mids );
-		}
-	}
-	
-	/**
-	 * This method is called after a member's account has been merged into another member's account
-	 *
-	 * @access	public
-	 * @param	array	$member		Member account being kept
-	 * @param	array	$member2	Member account being removed
-	 * @return	void
-	 **/
-	public function onMerge( $member, $member2 )
-	{
-		IPSDebug::addLogMessage( "Markers init done:", 'merge', $member );
-		
-		if( $this->registry->DB()->checkForTable( 'cal_events' ) )
-		{
-			$this->registry->DB()->update( 'cal_events', array( 'event_member_id' => intval($member['member_id']) ), "event_member_id=" . $member2['member_id'] );
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar-cfg.php b/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar-cfg.php
deleted file mode 100644
index 199daa66..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar-cfg.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: calendar
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* This file must be named {file_name_minus_php}-cfg.php
-*
-* Please see each variable for more information
-* $PORTAL_CONFIG is OK for each file, do not change
-* this array name.
-*/
-
-$PORTAL_CONFIG = array();
-
-/**
-* Main plug in title
-*
-*/
-$PORTAL_CONFIG['pc_title'] = 'Календарь';
-
-/**
-* Plug in mini description
-*
-*/
-$PORTAL_CONFIG['pc_desc']  = "Блок мини-календар� на текущий ме��ц";
-
-/**
-* Keyword for settings. This is the keyword
-* entered into ibf_conf_settings_titles -> conf_title_keyword
-* Can be left blank.
-* PLEASE stick to the naming convention when entering a setting
-* keyword: portal_{file_name_minus_php} This will prevent
-* other keyword clashes. Likewise, when creating settings, choose
-* NOT to cache them (they will be loaded at run time) and always
-* prefix with {file_name_minus_php}_setting_key - for example
-* If you had a setting called "export_forums" then please name it
-* "recent_topics_export_forums". This will be available in
-* $this->settings['recent_topics_export_forums'] in the
-* main module.
-*/
-$PORTAL_CONFIG['pc_settings_keyword'] = "";
-
-/**
-* Exportable tags key must be in the naming format of:
-* {file_name_minus_php}-tag. The value *MUST* be the function
-* which it corresponds to. For example:
-* 'recent_topics_last_x' => 'recent_topics_last_x'
-* The portal will look for function 'recent_topics_last_x' in
-* module "sources/portal_plugins/recent_topics.php" when it parses
-* the tag <!--::recent_topics_last_x::-->
-*
-* @param array[ TAG ] = array( FUNCTION NAME, DESCRIPTION );
-*/
-$PORTAL_CONFIG['pc_exportable_tags']['calendar_show_current_month'] = array( 'calendar_show_current_month', 'Показать мини-календарь на текущий ме��ц' );
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar.php b/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar.php
deleted file mode 100644
index e2ade7bb..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/calendar.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: calendar
- * Last Updated: $Date: 2010-10-22 06:13:38 -0400 (Fri, 22 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7016 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class ppi_calendar extends public_portal_portal_portal 
-{
-	/**
-	 * Initialize module
-	 *
-	 * @return	void
-	 */
-	public function init()
- 	{
- 	}
- 	
-	/**
-	 * Show the current calendar month on the portal
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function calendar_show_current_month()
-	{
-		//-----------------------------------------
-		// Grab calendar class
-		//-----------------------------------------
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'calendar' ) . '/modules_public/calendar/calendars.php', 'public_calendar_calendar_calendars' );
-		$calendar    = new $classToLoad();
-		$calendar->makeRegistryShortcuts( $this->registry );
-		$calendar->initCalendar(true);
-
-		if( ! is_array( $calendar->calendar ) OR ! count( $calendar->calendar ) OR ! $calendar->can_read )
-		{
-			return'';
-		}
-
- 		//-----------------------------------------
- 		// What now?
- 		//-----------------------------------------
- 		
- 		$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() + ipsRegistry::getClass( 'class_localization')->getTimeOffset() ) );
-		
-		$now_date = array(
-						  'year'    => $a[0],
-						  'mon'     => $a[1],
-						  'mday'    => $a[2],
-						  'hours'   => $a[3],
-						  'minutes' => $a[4],
-						  'seconds' => $a[5]
-						);
-							   
- 		$content = $calendar->getMiniCalendar( $now_date['mon'], $now_date['year'] );
- 		
- 		return $this->registry->getClass('output')->getTemplate('portal')->calendarWrap( $content );
-  	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/index.html b/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/portalPlugins/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/calendar.php b/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/calendar.php
deleted file mode 100644
index 8f2ec548..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/calendar.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Report Center :: Calendar plugin
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @author		Based on original "Report Center" by Luke Scott
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class calendar_plugin
-{
-	/**#@+
-	 * Registry objects
-	 *
-	 * @access	protected
-	 * @var		object
-	 */	
-	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
-	protected $lang;
-	protected $member;
-	protected $cache;
-	/**#@-*/
-	
-	/**
-	 * Holds extra data for the plugin
-	 *
-	 * @access	private
-	 * @var		array			Data specific to the plugin
-	 */
-	public $_extra;
-	
-	/**
-	 * Constructor
-	 *
-	 * @access	public
-	 * @param	object		Registry object
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry )
-	{
-		//-----------------------------------------
-		// Make object
-		//-----------------------------------------
-		
-		$this->registry = $registry;
-		$this->DB	    = $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		$this->lang		= $this->registry->class_localization;
-	}
-	
-	/**
-	 * Display the form for extra data in the ACP
-	 *
-	 * @access	public
-	 * @param	array 		Plugin data
-	 * @param	object		HTML object
-	 * @return	string		HTML to add to the form
-	 */
-	public function displayAdminForm( $plugin_data, &$html )
-	{
-		$return = '';
-
-		return $return;
-	}
-	
-	/**
-	 * Process the plugin's form fields for saving
-	 *
-	 * @access	public
-	 * @param	array 		Plugin data for save
-	 * @return	string		Error message
-	 */
-	public function processAdminForm( &$save_data_array )
-	{
-		return '';
-	}
-	
-	/**
-	 * Update timestamp for report
-	 *
-	 * @access	public
-	 * @param	array 		New reports
-	 * @param 	array 		New members cache
-	 * @return	boolean
-	 */
-	public function updateReportsTimestamp( $new_reports, &$new_members_cache )
-	{
-		return true;
-	}
-	
-	/**
-	 * Get report permissions (only supermods can moderate calendar)
-	 *
-	 * @access	public
-	 * @param	string 		Type of perms to check
-	 * @param 	array 		Permissions data
-	 * @param 	array 		group ids
-	 * @param 	string		Special permissions
-	 * @return	boolean
-	 */
-	public function getReportPermissions( $check, $com_dat, $group_ids, &$to_return )
-	{
-		if( $this->_extra['report_bypass'] == 0 || $this->memberData['g_is_supmod'] == 1 )
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-	
-	/**
-	 * Show the report form for this module
-	 *
-	 * @access	public
-	 * @param 	array 		Application data
-	 * @return	string		HTML form information
-	 */
-	public function reportForm( $com_dat )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_calendar' ), 'calendar' );
-
-		$eventid = intval($this->request['event_id']);
-		
-		if( ! $eventid )
-		{
-			$this->registry->output->showError( 'reports_no_event', 10177 );
-		}
-
-		/**
-		 * Load event
-		 */
-		$event = $this->DB->buildAndFetch( array(
-												'select'	=> 'e.*',
-												'from'		=> array( 'cal_events' => 'e' ),
-												'where'		=> 'e.event_id=' . $eventid,
-												'add_join'	=> array(
-																	array(
-																		'select'	=> 'c.*',
-																		'from'		=> array( 'cal_calendars' => 'c' ),
-																		'where'		=> 'c.cal_id=e.event_calendar_id',
-																		'type'		=> 'left',
-																		)
-																	)
-										)		);
-
-		/* Loop through the cache and build calendar jump */
-		if ( count( $this->caches['calendars'] ) AND is_array( $this->caches['calendars'] ) )
-		{
-			foreach( $this->caches['calendars'] as $cal_id => $cal )
-			{
-				if( $cal_id == $event['event_calendar_id'] )
-				{
-					/* Got a perm */
-					if( ! $this->registry->permissions->check( 'view', $cal ) )
-					{
-						$this->registry->output->showError( 'reports_no_event', 10178 );
-					}
-				}
-			}
-		}
-		
-		$ex_form_data = array(
-								'event_id'	=> $eventid,
-								'ctyp'		=> 'calendar',
-								'title'		=> $event['event_title']
-							);
-		
-		$this->registry->output->setTitle( $this->lang->words['report_cal_page'] );
-		$this->registry->output->addNavigation( $this->lang->words['t_welcome'], "app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" );
-		$this->registry->output->addNavigation( $this->lang->words['report_cal_page'], '' );
-		
-		$this->lang->words['report_basic_title']		= $this->lang->words['report_cal_title'];
-		$this->lang->words['report_basic_url_title']	= $this->lang->words['report_cal_title'];
-		$this->lang->words['report_basic_enter']		= $this->lang->words['report_cal_msg'];
-		
-		$url = $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}";
-		
-		return $this->registry->getClass('reportLibrary')->showReportForm( $event['event_title'], $url, $ex_form_data );
-	}
-
-	/**
-	 * Get section and link
-	 *
-	 * @access	public
-	 * @param 	array 		Report data
-	 * @return	array 		Section/link
-	 */
-	public function giveSectionLinkTitle( $report_row )
-	{
-		ipsRegistry::_loadAppCoreVariables( 'calendar' );
-		$calendarCache	= $this->cache->getCache('calendars');
-		
-		return array(
-					'title'	=> $calendarCache[ $report_row['exdat1'] ]['cal_title'],
-					'url'	=> "/index.php?app=calendar&amp;module=calendar&amp;cal_id={$report_row['exdat1']}",
-					);
-	}
-	
-	/**
-	 * Process a report and save the data appropriate
-	 *
-	 * @access	public
-	 * @param 	array 		Report data
-	 * @return	array 		Data from saving the report
-	 */
-	public function processReport( $com_dat )
-	{
-		$eventid = intval($this->request['event_id']);
-		
-		if( ! $eventid )
-		{
-			$this->registry->output->showError( 'reports_no_event', 10179 );
-		}
-
-		/**
-		 * Load event
-		 */
-		$event = $this->DB->buildAndFetch( array(
-												'select'	=> 'e.*',
-												'from'		=> array( 'cal_events' => 'e' ),
-												'where'		=> 'e.event_id=' . $eventid,
-												'add_join'	=> array(
-																	array(
-																		'select'	=> 'c.*',
-																		'from'		=> array( 'cal_calendars' => 'c' ),
-																		'where'		=> 'c.cal_id=e.event_calendar_id',
-																		'type'		=> 'left',
-																		)
-																	)
-										)		);
-
-		/* Loop through the cache and build calendar jump */
-		if ( count( $this->caches['calendars'] ) AND is_array( $this->caches['calendars'] ) )
-		{
-			foreach( $this->caches['calendars'] as $cal_id => $cal )
-			{
-				if( $cal_id == $event['event_calendar_id'] )
-				{
-					/* Got a perm */
-					if( ! $this->registry->permissions->check( 'view', $cal ) )
-					{
-						$this->registry->output->showError( 'reports_no_event', 10180 );
-					}
-				}
-			}
-		}
-		
-		$url = "app=calendar&module=calendar&cal_id={$event['event_calendar_id']}&do=showevent&event_id={$event['event_id']}";
-
-		$return_data	= array();
-		$a_url			= str_replace("&", "&amp;", $url);
-		$uid			= md5(  'cal_' . $eventid . '_' . $com_dat['com_id'] );
-		$status			= array();
-		
-		$this->DB->build( array( 'select' 	=> 'status, is_new, is_complete', 
-										 'from'		=> 'rc_status', 
-										 'where'	=> "is_new=1 OR is_complete=1",
-								) 		);
-		$this->DB->execute();
-
-		while( $row = $this->DB->fetch() )
-		{
-			if( $row['is_new'] == 1 )
-			{
-				$status['new'] = $row['status'];
-			}
-			elseif( $row['is_complete'] == 1 )
-			{
-				$status['complete'] = $row['status'];
-			}
-		}
-		
-		$this->DB->build( array( 'select' => 'id', 'from' => 'rc_reports_index', 'where' => "uid='{$uid}'" ) );
-		$this->DB->execute();
-		
-		if( $this->DB->getTotalRows() == 0 )
-		{	
-			$built_report_main = array(
-										'uid'			=> $uid,
-										'title'			=> $this->request['title'],
-										'status'		=> $status['new'],
-										'url'			=> '/index.php?' . $a_url,
-										'rc_class'		=> $com_dat['com_id'],
-										'updated_by'	=> $this->memberData['member_id'],
-										'date_updated'	=> time(),
-										'date_created'	=> time(),
-										'exdat1'		=> $event['event_calendar_id'],
-										'exdat2'		=> $event['event_id'],
-										'exdat3'		=> 0
-									);
-
-			$this->DB->insert( 'rc_reports_index', $built_report_main );
-			$rid = $this->DB->getInsertId();
-		}
-		else
-		{
-			$the_report	= $this->DB->fetch();
-			$rid		= $the_report['id'];
-			$this->DB->update( 'rc_reports_index', array( 'date_updated' => time(), 'status' => $status['new'] ), "id='{$rid}'" );
-		}
-		
-		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parse_html			= 0;
-		IPSText::getTextClass('bbcode')->parse_emoticons	= 1;
-		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section	= 'reports';
-		
-		$build_report = array(
-							'rid'			=> $rid,
-							'report'		=> IPSText::getTextClass('bbcode')->preDbParse( $this->request['message'] ),
-							'report_by'		=> $this->memberData['member_id'],
-							'date_reported'	=> time(),
-							);
-		
-		$this->DB->insert( 'rc_reports', $build_report );
-		
-		$reports = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as total', 'from' => 'rc_reports', 'where' => "rid='{$rid}'" ) );
-		
-		$this->DB->update( 'rc_reports_index', array( 'num_reports' => $reports['total'] ), "id='{$rid}'" );
-		
-		$return_data = array( 
-							'REDIRECT_URL'	=> $a_url,
-							'REPORT_INDEX'	=> $rid,
-							'SAVED_URL'		=> '/index.php?' . $url,
-							'REPORT'		=> $build_report['report']
-							);
-		
-		return $return_data;
-	}
-	
-	/**
-	 * Where to send user after report is submitted
-	 *
-	 * @access	public
-	 * @param 	array 		Report data
-	 * @return	void
-	 */
-	public function reportRedirect( $report_data )
-	{
-		$this->registry->output->redirectScreen( $this->lang->words['report_sending'],  $this->settings['base_url'] . $report_data['REDIRECT_URL'], true );
-	}
-	
-	/**
-	 * Retrieve list of users to send notifications to
-	 *
-	 * @access	public
-	 * @param 	string 		Group ids
-	 * @param 	array 		Report data
-	 * @return	array 		Array of users to PM/Email
-	 */
-	public function getNotificationList( $group_ids, $report_data )
-	{
-		$notify = array();
-		
-		$this->DB->build( array(
-									'select'	=> 'noti.*',
-									'from'		=> array( 'rc_modpref' => 'noti' ),
-									'where'		=> 'mem.member_group_id IN(' . $group_ids . ')',
-									'add_join'	=> array(
-														array(
-															'select'	=> 'mem.member_id, mem.members_display_name as name, mem.language, mem.members_disable_pm, mem.email, mem.member_group_id',
-															'from'		=> array( 'members' => 'mem' ),
-															'where'		=> 'mem.member_id=noti.mem_id',
-															)
-														)
-							)		);
-		$this->DB->execute();
-
-		if( $this->DB->getTotalRows() > 0 )
-		{
-			while( $row = $this->DB->fetch() )
-			{
-				$notify[] = $row;
-			}	
-		}
-		
-		return $notify;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/index.html b/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/reportPlugins/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/rssOutput.php b/upload/admin/applications_addon/ips/calendar/extensions/rssOutput.php
deleted file mode 100644
index a61f7a0d..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/rssOutput.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * RSS output plugin :: calendar
- * Last Updated: $Date: 2010-10-20 13:11:07 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		6/24/2008
- * @version		$Revision: 7005 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class rss_output_calendar
-{
-	/**
-	 * Expiration date
-	 * 
-	 * @var		integer			Expiration timestamp
-	 */
-	private $expires			= 0;
-	
-	/**
-	 * Grab the RSS links
-	 * 
-	 * @return	string		RSS document
-	 */
-	public function getRssLinks()
-	{
-		$return	= array();
-
-		$_calendarCache	= ipsRegistry::cache()->getCache('calendars');
-		
-		if( is_array($_calendarCache) AND count($_calendarCache) )
-		{
-			foreach( $_calendarCache as $r )
-			{
-				/* Got a perm */
-				if( ! ipsRegistry::getClass( 'permissions' )->check( 'view', $r ) || !$r['cal_rss_export'] )
-				{
-					continue;
-				}
-				
-				$return[] = array( 'title' => $r['cal_title'], 'url' => ipsRegistry::getClass('output')->formatUrl( ipsRegistry::$settings['board_url'] . "/index.php?app=core&amp;module=global&amp;section=rss&amp;type=calendar&amp;id=" . $r['cal_id'], '%%' . $r['cal_title'] . '%%', 'section=rss2' ) );
-			}
-		}
-
-		return $return;
-	}
-	
-	/**
-	 * Grab the RSS document content and return it
-	 * 
-	 * @return	string		RSS document
-	 */
-	public function returnRSSDocument()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$cal_id			= intval( ipsRegistry::$request['id'] );
-		$rss_data		= array();
-		$to_print		= '';
-		$this->expires	= time();
-		
-		//-----------------------------------------
-		// Get RSS export
-		//-----------------------------------------
-		
-		$rss_data = ipsRegistry::DB()->buildAndFetch( array( 'select'	=> '*',
-															'from'		=> 'cal_calendars',
-															'where'		=> 'cal_id=' . $cal_id ) );
-		
-		//-----------------------------------------
-		// Got one?
-		//-----------------------------------------
-
-		if ( $rss_data['cal_id'] AND $rss_data['cal_rss_export'] )
-		{
-			//-----------------------------------------
-			// Correct expires time
-			//-----------------------------------------
-			
-			$this->expires = $this->expires + ($rss_data['cal_rss_update'] * 60);
-			
-			//-----------------------------------------
-			// Need to recache?
-			//-----------------------------------------
-			
-			$time_check = time() - ( $rss_data['cal_rss_update'] * 60 );
-			
-			if ( ( ! $rss_data['cal_rss_cache'] ) OR $time_check > $rss_data['cal_rss_update_last'] )
-			{
-				//-----------------------------------------
-				// Yes
-				//-----------------------------------------
-				
-				define( 'IN_ACP', 1 );
-				
-				$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'calendar' ) . '/modules_admin/calendar/calendars.php', 'admin_calendar_calendar_calendars' );
-				$rss_export  = new $classToLoad();
-				$rss_export->makeRegistryShortcuts( ipsRegistry::instance() );
-				
-				
-				return $rss_export->calendarRSSCache( $rss_data['cal_id'], 0 );
-			}
-			else
-			{
-				//-----------------------------------------
-				// No
-				//-----------------------------------------
-				
-				return $rss_data['cal_rss_cache'];
-			}
-		}
-	}
-	
-	/**
-	 * Grab the RSS document expiration timestamp
-	 * 
-	 * @return	integer		Expiration timestamp
-	 */
-	public function grabExpiryDate()
-	{
-		return $this->expires ? $this->expires : time();
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/config.php b/upload/admin/applications_addon/ips/calendar/extensions/search/config.php
deleted file mode 100644
index 8581b2da..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/config.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Config file
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/* Can search with this app */
-$CONFIG['can_search']	      = 1;
-
-/* Can view new content with this app */
-$CONFIG['can_viewNewContent'] = 1;
-
-/* Can fetch active content with this app */
-$CONFIG['can_activeContent']  = 1;
-
-/* Can fetch user generated content */
-$CONFIG['can_userContent'] = 1;
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/engines/index.html b/upload/admin/applications_addon/ips/calendar/extensions/search/engines/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/engines/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/engines/sql.php b/upload/admin/applications_addon/ips/calendar/extensions/search/engines/sql.php
deleted file mode 100644
index acf0ccdb..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/engines/sql.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Basic Calendar Search
- * Last Updated: $Date: 2010-02-23 12:38:11 +0000 (Tue, 23 Feb 2010) $
- * </pre>
- *
- * @author 		$Author: matt $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5861 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class search_engine_calendar extends search_engine
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct( ipsRegistry $registry )
-	{		
-		parent::__construct( $registry );
-	}
-	
-	/**
-	 * Perform a search.
-	 * Returns an array of a total count (total number of matches)
-	 * and an array of IDs ( 0 => 1203, 1 => 928, 2 => 2938 ).. matching the required number based on pagination. The ids returned would be based on the filters and type of search
-	 *
-	 * So if we had 1000 replies, and we are on page 2 of 25 per page, we'd return 25 items offset by 25
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function search()
-	{
-		/* INIT */ 
-		$count       		= 0;
-		$results     		= array();
-		$sort_by     		= IPSSearchRegistry::get('in.search_sort_by');
-		$sort_order         = IPSSearchRegistry::get('in.search_sort_order');
-		$search_term        = IPSSearchRegistry::get('in.clean_search_term');
-		$content_title_only = IPSSearchRegistry::get('opt.searchTitleOnly');
-		$post_search_only   = IPSSearchRegistry::get('opt.onlySearchPosts');
-		$order_dir 			= ( $sort_order == 'asc' ) ? 'asc' : 'desc';
-		$sortKey			= '';
-		$sortType			= '';
-		$rows               = array();
-		
-		if ( IPSSearchRegistry::get('opt.noPostPreview') OR IPSSearchRegistry::get('display.onlyTitles') )
-		{
-			$group_by = 'c.event_id';
-		}
-		
-		/* Sorting */
-		switch( $sort_by )
-		{
-			default:
-			case 'date':
-				$sortKey  = 'c.event_unix_from';
-				$sortType = 'numerical';
-			break;
-			case 'title':
-				$sortKey  = 'c.event_title';
-				$sortType = 'string';
-			break;
-		}
-		
-		/* Query the count */	
-		$count = $this->DB->buildAndFetch(
-											array( 
-													'select'   => 'COUNT(*) as total_results',
-													'from'	   => array( 'cal_events' => 'c' ),
- 													'where'	   => $this->_buildWhereStatement( $search_term, $content_title_only ),
- 													'group'    => $group_by,
-													'add_join' => array(
-																		array(
-																				'from'   => array( 'permission_index' => 'i' ),
-																				'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																				'type'   => 'left',
-																			),
-																		array(
-																				'from'   => array( 'profile_friends' => 'friend' ),
-																				'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																				'type'   => 'left',
-																			),
-																		)													
-										)  );
-		
-		/* Do the search */
-		$this->DB->build( array( 
-								'select'   => "c.*",
-								'from'	   => array( 'cal_events' => 'c' ),
- 								'where'	   => $this->_buildWhereStatement( $search_term, $content_title_only ),
-								'group'    => $group_by,
-								'order'    => $sortKey . ' ' . $sort_order,
-								'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
-								'add_join' => array(
-													array(
-															'select' => 'i.*',
-															'from'   => array( 'permission_index' => 'i' ),
-															'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-															'type'   => 'left',
-														),
-													array(
-															'select' => 'mem.members_display_name, mem.member_group_id, mem.mgroup_others',
-															'from'   => array( 'members' => 'mem' ),
-															'where'  => "mem.member_id=c.event_member_id",
-															'type'   => 'left',
-														),
-													array(
-															'from'   => array( 'profile_friends' => 'friend' ),
-															'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-															'type'   => 'left',
-														),
-													)													
-									)		);
-		$this->DB->execute();
-		
-		/* Sort */
-		while( $r = $this->DB->fetch() )
-		{
-			$rows[] = $r;
-		}
-	
-		/* Return it */
-		return array( 'count' => $count['total_results'], 'resultSet' => $rows );
-	}
-	
-		/**
-	 * Perform the viewNewContent search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewNewContent()
-	{	
-		/* Loop through the forums and build a list of forums we're allowed access to */
-		$start		= IPSSearchRegistry::get('in.start');
-		$perPage	= IPSSearchRegistry::get('opt.search_per_page');
-		
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
-		IPSSearchRegistry::set('opt.searchTitleOnly' , true );
-		IPSSearchRegistry::set('display.onlyTitles'  , true );
-		IPSSearchRegistry::set('opt.noPostPreview'   , true );
-		
-		/* Time */
-		$oldStamp = intval( $this->memberData['last_visit'] ) ? intval( $this->memberData['last_visit'] ) : time();
-		
-		/* Start Where */
-		$where		= array();
-		$where[]	= $this->_buildWhereStatement( '' );
-
-		/* Based on oldest timestamp */
-		$where[] = "c.event_unix_from > " . $oldStamp;
-
-		$where = implode( " AND ", $where );
-
-		/* Fetch the count */
-		$count = $this->DB->buildAndFetch(
-											array( 
-													'select'	=> 'COUNT(*) as total_results',
-													'from'		=> array( 'cal_events' => 'c' ),
-													'where'		=> $where,
-													'add_join'	=> array(
-																		array(
-																				'from'   => array( 'permission_index' => 'i' ),
-																				'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																				'type'   => 'left',
-																			),
-																		array(
-																				'from'   => array( 'profile_friends' => 'friend' ),
-																				'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																				'type'   => 'left',
-																			),
-																		)													
-										)  );
-		
-		/* Fetch the data */
-		$events = array();
-		
-		if( $count['total_results'] )
-		{
-			$this->DB->build( array( 
-										'select'	=> "c.*",
-										'from'		=> array( 'cal_events' => 'c' ),
-										'where'		=> $where,
-										'order'		=> 'c.event_unix_from DESC',
-										'limit'		=> array( $start, $perPage ),
-										'add_join'	=> array(
-															array(
-																	'select' => 'i.*',
-																	'from'   => array( 'permission_index' => 'i' ),
-																	'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'select' => 'mem.members_display_name, mem.member_group_id, mem.mgroup_others',
-																	'from'   => array( 'members' => 'mem' ),
-																	'where'  => "mem.member_id=c.event_member_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'from'   => array( 'profile_friends' => 'friend' ),
-																	'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																	'type'   => 'left',
-																),
-															)													
-							)		);
-			$o = $this->DB->execute();
-			
-			while( $row = $this->DB->fetch( $o ) )
-			{
-				$events[] = $row;
-			}
-		}
-
-		/* Return it */
-		return array( 'count' => $count['total_results'], 'resultSet' => $events );
-	}
-	
-		/**
-	 * Perform the search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewActiveContent()
-	{
-		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
-		
-		/* Loop through the forums and build a list of forums we're allowed access to */
-		$where		= array();
-		$start		= IPSSearchRegistry::get('in.start');
-		$perPage    = IPSSearchRegistry::get('opt.search_per_page');
-		$imgIds	    = array();
-
-		/* Start Where */
-		$where		= array();
-		$where[]	= $this->_buildWhereStatement( '' );
-	
-		/* Generate last post times */
-		$where[] = "c.event_unix_from > " . intval( time() - $seconds );
-		
-		$where = implode( " AND ", $where );
-
-
-		/* Fetch the count */
-		$count = $this->DB->buildAndFetch(
-											array( 
-													'select'	=> 'COUNT(*) as total_results',
-													'from'		=> array( 'cal_events' => 'c' ),
-													'where'		=> $where,
-													'add_join'	=> array(
-																		array(
-																				'from'   => array( 'permission_index' => 'i' ),
-																				'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																				'type'   => 'left',
-																			),
-																		array(
-																				'from'   => array( 'profile_friends' => 'friend' ),
-																				'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																				'type'   => 'left',
-																			),
-																		)
-										)  );
-		
-		/* Fetch count */
-		$events = array();
-		
-		if( $count['total_results'] )
-		{
-			$this->DB->build( array( 
-										'select'	=> "c.*",
-										'from'		=> array( 'cal_events' => 'c' ),
-										'where'		=> $where,
-										'order'		=> 'c.event_unix_from DESC',
-										'limit'		=> array( $start, $perPage ),
-										'add_join'	=> array(
-															array(
-																	'select' => 'i.*',
-																	'from'   => array( 'permission_index' => 'i' ),
-																	'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'select' => 'mem.members_display_name, mem.member_group_id, mem.mgroup_others',
-																	'from'   => array( 'members' => 'mem' ),
-																	'where'  => "mem.member_id=c.event_member_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'from'   => array( 'profile_friends' => 'friend' ),
-																	'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																	'type'   => 'left',
-																),
-															)
-							)		);
-			$o = $this->DB->execute();
-
-			while( $row = $this->DB->fetch( $o ) )
-			{
-				$events[] = $row;
-			}
-		}
-		
-		/* Return it */
-		return array( 'count' => $count['total_results'], 'resultSet' => $events );
-	}
-	
-	/**
-	 * Perform the viewUserContent search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewUserContent( $member )
-	{
-		/* Init */
-		$start		= IPSSearchRegistry::get('in.start');
-		$perPage	= IPSSearchRegistry::get('opt.search_per_page');
-		IPSSearchRegistry::set( 'in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set( 'in.search_sort_order', 'desc' );
-		IPSSearchRegistry::set( 'gallery.searchInKey', 'images' );
-		
-		/* Ensure we limit by date */
-		$this->settings['search_ucontent_days'] = ( $this->settings['search_ucontent_days'] ) ? $this->settings['search_ucontent_days'] : 365;
-		
-		/* Start Where */
-		$where	= array();
-		$where[]	= $this->_buildWhereStatement( '' );
-		
-		/* Search by author */
-		$where[] = "c.event_member_id=" . intval( $member['member_id'] );
-	
-		if ( $this->settings['search_ucontent_days'] )
-		{
-			$where[] = "c.event_unix_from > " . ( time() - ( 86400 * intval( $this->settings['search_ucontent_days'] ) ) );
-		}
-		
-		$where = implode( " AND ", $where );
-		
-		/* Fetch the count */
-		$count = $this->DB->buildAndFetch(
-											array( 
-													'select'	=> 'COUNT(*) as count',
-													'from'		=> array( 'cal_events' => 'c' ),
-													'where'		=> $where,
-													'add_join'	=> array(
-																		array(
-																				'from'   => array( 'permission_index' => 'i' ),
-																				'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																				'type'   => 'left',
-																			),
-																		array(
-																				'from'   => array( 'profile_friends' => 'friend' ),
-																				'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																				'type'   => 'left',
-																			),
-																		)
-										)  );
-
-		/* Fetch the data */
-		$events = array();
-		
-		if ( $count['count'] )
-		{
-			$this->DB->build( array( 
-										'select'	=> "c.*",
-										'from'		=> array( 'cal_events' => 'c' ),
-										'where'		=> $where,
-										'order'		=> 'c.event_unix_from DESC',
-										'limit'		=> array( $start, $perPage ),
-										'add_join'	=> array(
-															array(
-																	'select' => 'i.*',
-																	'from'   => array( 'permission_index' => 'i' ),
-																	'where'  => "i.perm_type='calendar' AND i.perm_type_id=c.event_calendar_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'select' => 'mem.members_display_name, mem.member_group_id, mem.mgroup_others',
-																	'from'   => array( 'members' => 'mem' ),
-																	'where'  => "mem.member_id=c.event_member_id",
-																	'type'   => 'left',
-																),
-															array(
-																	'from'   => array( 'profile_friends' => 'friend' ),
-																	'where'  => 'friend.friends_member_id=c.event_member_id AND friend.friends_friend_id=' . $this->memberData['member_id'],
-																	'type'   => 'left',
-																),
-															)
-							)		);
-			$this->DB->execute();
-
-			while( $row = $this->DB->fetch() )
-			{
-				$events[] = $row;
-			}
-		}
-
-		/* Return it */
-		return array( 'count' => $count['count'], 'resultSet' => $events );
-	}
-		
-	/**
-	 * Builds the where portion of a search string
-	 *
-	 * @access	private
-	 * @param	string	$search_term		The string to use in the search
-	 * @param	bool	$content_title_only	Search only title records
-	 * @return	string
-	 **/
-	private function _buildWhereStatement( $search_term, $content_title_only=false )
-	{		
-		/* INI */
-		$where_clause = array();
-				
-		if( $search_term )
-		{
-			if( $content_title_only )
-			{
-				$where_clause[] = "c.event_title LIKE '%{$search_term}%'";
-			}
-			else
-			{
-				$where_clause[] = "(c.event_title LIKE '%{$search_term}%' OR c.event_content LIKE '%{$search_term}%')";
-			}
-		}
-		
-		/* Exclude some items */
-		if( !$this->memberData['g_is_supmod'] )
-		{
-			/* Approved */
-			$where_clause[] = 'c.event_approved=1';
-			
-			/* Owner only */
-			$where_clause[] = '(i.owner_only=0 OR c.event_member_id=' . $this->memberData['member_id'] . ')';
-			
-			/* Friend only */
-			$where_clause[] = '(i.friend_only=0 OR friend.friends_id ' . $this->DB->buildIsNull( false ) . ')';
-			
-			/* Authorized users only */
-			$where_clause[] = '(i.authorized_users ' . $this->DB->buildIsNull() . " OR i.authorized_users='' OR c.event_member_id=" . $this->memberData['member_id'] . " OR i.authorized_users LIKE '%," . $this->memberData['member_id'] . ",%')";
-		}
-		
-		/* Date Restrict */
-		if( $this->search_begin_timestamp && $this->search_end_timestamp )
-		{
-			$where_clause[] = $this->DB->buildBetween( "c.event_unix_from", $this->search_begin_timestamp, $this->search_end_timestamp );
-		}
-		else
-		{
-			if( $this->search_begin_timestamp )
-			{
-				$where_clause[] = "c.event_unix_from > {$this->search_begin_timestamp}";
-			}
-			
-			if( $this->search_end_timestamp )
-			{
-				$where_clause[] = "c.event_unix_from < {$this->search_end_timestamp}";
-			}
-		}
-		
-		/* Add in AND where conditions */
-		if( isset( $this->whereConditions['AND'] ) && count( $this->whereConditions['AND'] ) )
-		{
-			$where_clause = array_merge( $where_clause, $this->whereConditions['AND'] );
-		}
-		
-		/* ADD in OR where conditions */
-		if( isset( $this->whereConditions['OR'] ) && count( $this->whereConditions['OR'] ) )
-		{
-			$where_clause[] = '( ' . implode( ' OR ', $this->whereConditions['OR'] ) . ' )';
-		}
-
-		/* Permissions */
-		$where_clause[] = $this->DB->buildRegexp( "i.perm_view", $this->member->perm_id_array );
-		
-		/* Event permissions */
-		$where_clause[] = "((c.event_private=1 AND c.event_member_id=" . $this->memberData['member_id'] . ") OR (c.event_private=0 AND " . $this->DB->buildRegexp( "c.event_perms", $this->member->perm_id_array ) . "))";
-			
-		/* Build and return the string */
-		return implode( " AND ", $where_clause );
-	}
-	
-	/**
-	 * Remap standard columns (Apps can override )
-	 *
-	 * @access	public
-	 * @param	string	$column		sql table column for this condition
-	 * @return	string				column
-	 * @return	void
-	 */
-	public function remapColumn( $column )
-	{
-		$column = $column == 'member_id' ? 'c.event_member_id' : $column;
-
-		return $column;
-	}
-		
-	/**
-	 * Returns an array used in the searchplugin's setCondition method
-	 *
-	 * @access	public
-	 * @param	array 	$data	Array of forums to view
-	 * @return	array 	Array with column, operator, and value keys, for use in the setCondition call
-	 **/
-	public function buildFilterSQL( $data )
-	{
-		/* INIT */
-		$return = array();
-		
-		/* Set up some defaults */
-		IPSSearchRegistry::set( 'opt.noPostPreview'  , false );
-		IPSSearchRegistry::set( 'opt.onlySearchPosts', false );
-		
-		return array();
-	}
-
-	/**
-	 * Can handle boolean searching
-	 *
-	 * @access	public
-	 * @return	boolean
-	 */
-	public function isBoolean()
-	{
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/form.php b/upload/admin/applications_addon/ips/calendar/extensions/search/form.php
deleted file mode 100644
index 139a20db..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/form.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Returns HTML for the form (optional class, not required)
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class search_form_calendar
-{
-	/**
-	 * Construct
-	 *
-	 */
-	public function __construct()
-	{
-		/* Make object */
-		$this->registry   =  ipsRegistry::instance();
-		$this->DB         =  $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang       =  $this->registry->getClass('class_localization');
-		$this->member     =  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache      =  $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-	}
-	
-	/**
-	 * Return sort drop down
-	 * 
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	public function fetchSortDropDown()
-	{
-		$array = array( 'date'  => $this->lang->words['s_search_type_0'],
-					    'title' => $this->lang->words['forum_sort_title'] );
-		
-		return $array;
-	}
-}
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/format.php b/upload/admin/applications_addon/ips/calendar/extensions/search/format.php
deleted file mode 100644
index 0599fc75..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/format.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Formats calendar search results
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class search_format_calendar extends search_format
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct( ipsRegistry $registry )
-	{
-		parent::__construct( $registry );
-	}
-	
-	/**
-	 * Parse search results
-	 *
-	 * @access	private
-	 * @param	array 	$r				Search result
-	 * @return	array 	$html			Blocks of HTML
-	 */
-	public function parseAndFetchHtmlBlocks( $rows )
-	{
-		return parent::parseAndFetchHtmlBlocks( $rows );
-	}
-	
-	/**
-	 * Formats the forum search result for display
-	 *
-	 * @access	public
-	 * @param	array   $search_row		Array of data
-	 * @return	mixed	Formatted content, ready for display, or array containing a $sub section flag, and content
-	 **/
-	public function formatContent( $data )
-	{
-		$data['misc'] = unserialize( $data['misc'] );
-
-		/* Format as a ranged event */
-		if( $data['misc'] )
-		{
-			return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->calEventRangedSearchResult( $data, IPSSearchRegistry::get('display.onlyTitles') ), 0 );
-		}
-		/* Format as a single day event */
-		else
-		{
-			return array( ipsRegistry::getClass( 'output' )->getTemplate( 'search' )->calEventSearchResult( $data, IPSSearchRegistry::get('display.onlyTitles') ), 0 );
-		}
-	}
-
-	/**
-	 * Formats / grabs extra data for results
-	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function processResults( $ids )
-	{
-		$rows = array();
-		
-		foreach( $ids as $i => $d )
-		{
-			$rows[ $i ] = $this->genericizeResults( $d );
-		}
-		
-		return $rows;	
-	}
-	
-	/**
-	 * Reassigns fields in a generic way for results output
-	 *
-	 * @param  array  $r
-	 * @return array
-	 **/
-	public function genericizeResults( $r )
-	{
-		$r['app']                 = 'calendar';
-		$r['content']             = $r['event_content'];
-		$r['content_title']       = $r['event_title'];
-		$r['updated']             = $r['event_unix_from'];
-		$r['type_2']              = 'event';
-		$r['type_id_2']           = $r['event_id'];
-		$r['misc']                = $r['event_unix_to'];
-		$r['member_id']			  = $r['event_member_id'];
-		
-		return $r;
-	}
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/search/index.html b/upload/admin/applications_addon/ips/calendar/extensions/search/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/search/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/extensions/sphinxTemplate.php b/upload/admin/applications_addon/ips/calendar/extensions/sphinxTemplate.php
deleted file mode 100644
index 5197a612..00000000
--- a/upload/admin/applications_addon/ips/calendar/extensions/sphinxTemplate.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Sphinx template file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- * @since		3.0.0
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$appSphinxTemplate	= <<<EOF
-
-############################# --- CALENDAR --- ##############################
-
-source calendar_search_main : ipb_source_config
-{
-	# Set our forum PID counter
-	sql_query_pre	= REPLACE INTO <!--SPHINX_DB_PREFIX-->cache_store VALUES( 'sphinx_calendar_counter', (SELECT max(event_id) FROM <!--SPHINX_DB_PREFIX-->cal_events), '', 0, UNIX_TIMESTAMP() )
-	
-	# Query posts for the main source
-	sql_query		= SELECT e.*, e.event_id as search_id, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view, \
-							 CASE WHEN pi.authorized_users IS NULL THEN 0 ELSE pi.authorized_users END AS authorized_users, \
-							 CASE WHEN pi.friend_only=0 THEN 0 ELSE e.event_member_id END AS friend_only, \
-							 CASE WHEN pi.owner_only=0 THEN 0 ELSE e.event_member_id END AS owner_only \
-					  FROM <!--SPHINX_DB_PREFIX-->cal_events e \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=e.event_calendar_id AND pi.perm_type='calendar' ) \
-					  WHERE e.event_id <= ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_calendar_counter' )
-	
-	# Fields	
-	sql_attr_uint			= search_id
-	sql_attr_uint			= friend_only
-	sql_attr_uint			= owner_only
-	sql_attr_timestamp		= event_unix_from
-	sql_attr_multi			= uint perm_view from field
-	sql_attr_multi			= uint authorized_users from field
-	sql_attr_uint			= event_member_id
-	
-	sql_ranged_throttle	= 0
-}
-
-source calendar_search_delta : calendar_search_main
-{
-	# Override the base sql_query_pre
-	sql_query_pre	= 
-	
-	# Query posts for the main source
-	sql_query		= SELECT e.*, e.event_id as search_id, \
-							 REPLACE( pi.perm_view, '*', 0 ) as perm_view, \
-							 CASE WHEN pi.authorized_users IS NULL THEN 0 ELSE pi.authorized_users END AS authorized_users, \
-							 CASE WHEN pi.friend_only=0 THEN 0 ELSE e.event_member_id END AS friend_only, \
-							 CASE WHEN pi.owner_only=0 THEN 0 ELSE e.event_member_id END AS owner_only \
-					  FROM <!--SPHINX_DB_PREFIX-->cal_events e \
-					  LEFT JOIN <!--SPHINX_DB_PREFIX-->permission_index pi ON ( pi.perm_type_id=e.event_calendar_id AND pi.perm_type='calendar' ) \
-					  WHERE e.event_id > ( SELECT cs_value FROM <!--SPHINX_DB_PREFIX-->cache_store WHERE cs_key='sphinx_calendar_counter' )
-}
-
-index calendar_search_main
-{
-	source			= calendar_search_main
-	path			= <!--SPHINX_BASE_PATH-->/calendar_search_main
-	
-	docinfo			= extern
-	mlock			= 0
-	morphology		= none
-	min_word_len	= 2
-	charset_type	= sbcs
-	html_strip		= 0	
-}
-
-index calendar_search_delta : calendar_search_main
-{
-   source			= calendar_search_delta
-   path				= <!--SPHINX_BASE_PATH-->/calendar_search_delta
-}
-
-
-
-EOF;
diff --git a/upload/admin/applications_addon/ips/calendar/index.html b/upload/admin/applications_addon/ips/calendar/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/calendars.php b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/calendars.php
deleted file mode 100644
index 0867ebaa..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/calendars.php
+++ /dev/null
@@ -1,838 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar Management
- * Last Updated: $LastChangedDate: 2010-10-24 20:11:34 -0400 (Sun, 24 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7024 $
- */
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class admin_calendar_calendar_calendars extends ipsCommand 
-{
-	/**
-	 * Skin file
-	 *
-	 * @var		object
-	 */
-	public $html;
-	
-	/**
-	 * Main execution method
-	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		/* Load Skin and Lang */
-		$this->html               = $this->registry->output->loadTemplate( 'cp_skin_calendar' );
-		$this->html->form_code    = 'module=calendar&amp;section=calendars';
-		$this->html->form_code_js = 'module=calendar&section=calendars';
-		
-		$this->lang->loadLanguageFile( array( 'admin_calendar' ) );
-		
-		switch( $this->request['do'] )
-		{
-			case 'calendar_delete':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_delete' );
-				$this->calendarDelete();
-			break;
-			
-			case 'calendar_add':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarForm( 'new' );
-			break;
-			
-			case 'calendar_add_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarSave( 'new' );
-			break;
-			
-			case 'calendar_edit':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarForm( 'edit' );
-			break;
-			
-			case 'calendar_edit_do':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarSave( 'edit' );
-			break;
-			
-			case 'calendar_move':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarMove();
-			break;
-			
-			case 'calendar_rebuildcache':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarRebuildCache( 1 );
-			break;
-			
-			case 'calendar_rss_cache':
-				$this->registry->getClass('class_permissions')->checkPermissionAutoMsg( 'calendar_manage' );
-				$this->calendarRSSCache( intval( $this->request['cal_id'] ), 1 );
-			break;
-			
-			case 'calendars_list':				
-			default:
-				$this->calendarsList();
-			break;
-		}
-		
-		/* Output */
-		$this->registry->output->html_main .= $this->registry->output->global_template->global_frame_wrapper();
-		$this->registry->output->sendOutput();			
-	}
-	
-	/**
-	 * Update the calendar position
-	 *
-	 * @return	void
-	 */
-	public function calendarMove()
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
-		$ajax		 = new $classToLoad();
-		
-		//-----------------------------------------
-		// Checks...
-		//-----------------------------------------
-
-		if( $this->registry->adminFunctions->checkSecurityKey( $this->request['md5check'], true ) === false )
-		{
-			$ajax->returnString( $this->lang->words['postform_badmd5'] );
-			exit();
-		}
- 		
- 		//-----------------------------------------
- 		// Save new position
- 		//-----------------------------------------
-
- 		$position	= 1;
- 		
- 		if( is_array($this->request['calendars']) AND count($this->request['calendars']) )
- 		{
- 			foreach( $this->request['calendars'] as $this_id )
- 			{
- 				$this->DB->update( 'cal_calendars', array( 'cal_position' => $position ), 'cal_id=' . $this_id );
- 				
- 				$position++;
- 			}
- 		}
- 		
- 		$this->calendarsRebuildCache();
-
- 		$ajax->returnString( 'OK' );
- 		exit();
-	}	
-	
-	/**
-	 * Delete a calendar
-	 *
-	 * @return	void
-	 */
-	public function calendarDelete()
-	{
-		/* INIT */
-		$cal_id = intval( $this->request['cal_id'] );
-		
-		if ( ! $cal_id )
-		{
-			$this->registry->output->global_message = $this->lang->words['c_noid'];
-			$this->components_list();
-			return;
-		}
-		
-		/* Delete Calendar Events */
-		$this->DB->delete( 'cal_events', 'event_calendar_id= ' .$cal_id );
-		
-		/* Delete Calendar */
-		$this->DB->delete( 'cal_calendars', 'cal_id=' . $cal_id );
-		$this->DB->delete( 'permission_index', "app='calendar' AND perm_type='calendar' AND perm_type_id=" . $cal_id );
-		
-		/* Recache and bounce */
-		/* Rebuild Caches and Bounce */
-		$this->calendarsRebuildCache();
-		$this->calendarRebuildCache( 0 );
-		$this->calendarRSSCache( 0, 0 );
-		
-		$this->registry->output->global_message = $this->lang->words['c_removed'];
-		$this->calendarsList();
-	}		
-	
-	/**
-	 * Handles the calednar new/edit form
-	 *
-	 * @param	string	$type	Either new or edit	 
-	 * @return	void
-	 */
-	public function calendarSave( $type='new' )
-	{
-		/* INIT */
-		$cal_id              = intval( $this->request['cal_id'] );
-		$cal_title           = trim( IPSText::stripslashes( IPSText::htmlspecialchars( $_POST['cal_title'] ) ) );
-		$cal_moderate        = intval( $this->request['cal_moderate'] );
-		$cal_event_limit     = intval( $this->request['cal_event_limit'] );
-		$cal_bday_limit      = intval( $this->request['cal_bday_limit'] );
-		$cal_rss_export      = intval( $this->request['cal_rss_export'] );
-		$cal_rss_export_days = intval( $this->request['cal_rss_export_days'] );
-		$cal_rss_export_max  = intval( $this->request['cal_rss_export_max'] );
-		$cal_rss_update      = intval( $this->request['cal_rss_update'] );
-		
-		/* Error Checks */
-		if ( $type == 'edit' )
-		{
-			if ( ! $cal_id OR ! $cal_title )
-			{
-				$this->registry->output->global_message = $this->lang->words['c_noid'];
-				$this->calendarsList();
-				return;
-			}
-		}
-		else
-		{
-			if ( ! $cal_title )
-			{
-				$this->registry->output->global_message = $this->lang->words['c_completeform'];
-				$this->calendarForm( $type );
-				return;
-			}
-		}
-
-		/* DB Array */
-		$array = array( 'cal_title'           => $cal_title,
-						'cal_moderate'        => $cal_moderate,
-						'cal_event_limit'     => $cal_event_limit,
-						'cal_bday_limit'      => $cal_bday_limit,
-						'cal_rss_export'      => $cal_rss_export,
-						'cal_rss_export_days' => $cal_rss_export_days,
-						'cal_rss_export_max'  => $cal_rss_export_max,
-						'cal_rss_update'      => $cal_rss_update,
-					 );
-		 
-		/* Create Calendar */
-		if ( $type == 'new' )
-		{
-			$this->DB->insert( 'cal_calendars', $array );
-			$cal_id = $this->DB->getInsertId();			
-			$this->registry->output->global_message = $this->lang->words['c_added'];
-		}
-		/* Modify Calendar */
-		else
-		{
-			$this->DB->update( 'cal_calendars', $array, 'cal_id='.$cal_id );
-			$this->registry->output->global_message = $this->lang->words['c_edited'];
-		}
-
-		/* Permissions */
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_public_permissions.php', 'classPublicPermissions' );
-		$permissions = new $classToLoad( ipsRegistry::instance() );
-		$permissions->savePermMatrix( $this->request['perms'], $cal_id, 'calendar' );		
-		
-		/* Rebuild Caches and Bounce */
-		$this->calendarsRebuildCache();
-		$this->calendarRebuildCache( 0 );
-		$this->calendarRSSCache( $cal_id, 0 );
-		$this->cache->rebuildCache( 'rss_output_cache' );
-		
-		$this->calendarsList();
-	}	
-	
-	/**
-	 * Add/Edit Calendar Form
-	 *
-	 * @param	string	$type	Either new or edit
-	 * @return	void
-	 */
-	public function calendarForm( $type='new' )
-	{
-		//-----------------------------------------
-		// Init Vars
-		//-----------------------------------------
-		
-		$cal_id             	= $this->request['cal_id'] ? intval( $this->request['cal_id'] ) : 0;
-		$form               	= array();
-		
-		/* New Calendar */
-		if ( $type == 'new' )
-		{
-			/* Form Bits */
-			$formcode = 'calendar_add_do';
-			$title    = $this->lang->words['c_addcal'];
-			$button   = $this->lang->words['c_addcal'];
-			
-			/* Data */
-			$calendar = array(
-								'cal_title'			=> '',
-								'cal_moderate'		=> '',
-								'cal_event_limit'	=> '',
-								'cal_bday_limit'	=> '',
-								'cal_rss_export'	=> '',
-								'cal_rss_update'	=> '',
-								'cal_rss_export_days' => '',
-								'cal_rss_export_max' => '',
-								'cal_id'			=> 0 
-							);
-		}
-		/* Edit Calendar */
-		else
-		{
-			/* Data */
-			$calendar = $this->DB->buildAndFetch( array( 
-														'select'   => 'c.*', 
-														'from'     => array( 'cal_calendars' => 'c' ), 
-														'where'    => 'c.cal_id=' . $cal_id,
-														'add_join' => array(
-																			array(
-																					'select' => 'p.*',
-																					'from'   => array( 'permission_index' => 'p' ),
-																					'where'  => "p.perm_type='calendar' AND perm_type_id=c.cal_id",
-																					'type'   => 'left',
-																				)
-															)
-												)	 );
-
-			if ( ! $calendar['cal_id'] )
-			{
-				$this->registry->output->global_message = $this->lang->words['c_noid'];
-				$this->calendarsList();
-				return;
-			}
-			
-			/* Form Bits */
-			$formcode = 'calendar_edit_do';
-			$title    = $this->lang->words['c_editbutton'].$calendar['cal_title'];
-			$button   = $this->lang->words['c_savebutton'];
-		}
-		
-		/* Permissions */
-		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_public_permissions.php', 'classPublicPermissions' );
-	   	$permissions         = new $classToLoad( ipsRegistry::instance() );
-   		$form['perm_matrix'] = $permissions->adminPermMatrix( 'calendar', $calendar );		
-		
-		/* Form Elements */
-		$form['cal_title']           = $this->registry->output->formInput(        'cal_title'           ,( isset( $_POST['cal_title'] ) AND $_POST['cal_title'] ) ? $_POST['cal_title'] : $calendar['cal_title'] );
-		$form['cal_moderate']        = $this->registry->output->formYesNo(       'cal_moderate'        , ( isset( $this->request['cal_moderate'] ) 		AND $this->request['cal_moderate'] )         ? $this->request['cal_moderate']         : $calendar['cal_moderate'] );
-		$form['cal_event_limit']     = $this->registry->output->formSimpleInput( 'cal_event_limit'     , ( isset( $this->request['cal_event_limit'] ) 	AND $this->request['cal_event_limit'] )      ? $this->request['cal_event_limit']      : $calendar['cal_event_limit'], 5 );
-		$form['cal_bday_limit']      = $this->registry->output->formSimpleInput( 'cal_bday_limit'      , ( isset( $this->request['cal_bday_limit'] ) 		AND $this->request['cal_bday_limit'] )       ? $this->request['cal_bday_limit']       : $calendar['cal_bday_limit'], 5 );
-		$form['cal_rss_export']      = $this->registry->output->formYesNo(       'cal_rss_export'      , ( isset( $this->request['cal_rss_export'] ) 		AND $this->request['cal_rss_export'] )       ? $this->request['cal_rss_export']       : $calendar['cal_rss_export'] );
-		$form['cal_rss_update']      = $this->registry->output->formSimpleInput( 'cal_rss_update'      , ( isset( $this->request['cal_rss_update'] ) 		AND $this->request['cal_rss_update'] )       ? $this->request['cal_rss_update']       : $calendar['cal_rss_update'], 5 );
-		$form['cal_rss_export_days'] = $this->registry->output->formSimpleInput( 'cal_rss_export_days' , ( isset( $this->request['cal_rss_export_days'] )	AND $this->request['cal_rss_export_days'] )  ? $this->request['cal_rss_export_days']  : $calendar['cal_rss_export_days'], 5 );
-		$form['cal_rss_export_max']  = $this->registry->output->formSimpleInput( 'cal_rss_export_max'  , ( isset( $this->request['cal_rss_export_max'] ) 	AND $this->request['cal_rss_export_max'] )   ? $this->request['cal_rss_export_max']   : $calendar['cal_rss_export_max'], 5 );
-		
-		/* Output */
-		$this->registry->output->html .= $this->html->calendarForm( $form, $title, $formcode, $button, $calendar );	
-	}	
-	
-	/**
-	 * List Calendars
-	 *
-	 * @return	void
-	 */
-	public function calendarsList()
-	{
-		/* INIT */
-		$rows        = array();
-		
-		/* Query calendars */		
-		$this->DB->build( array( 'select' => '*', 'from' => 'cal_calendars', 'order' => 'cal_position ASC' ) );
-		$this->DB->execute();
-
-		/* Loop through the calendars */
-		while( $r = $this->DB->fetch() )
-		{
-			$rows[] = $r;				
-		}
-		
-		/* Output */
-		$this->registry->output->html           .= $this->html->calendarOverviewScreen( $rows );		
-	}	
-	
-	/**
-	 * Rebuild the RSS Cache
-	 *
-	 * @param	mixed	$calendar_id	Specify which calendar to rebuild, all is default
-	 * @param	bool	$return			If set to 0, the cache will be output to the browser
-	 * @return	mixed	void, or the RSS document
-	 */
-	public function calendarRSSCache( $calendar_id='all', $return=0 )
-	{
-		/* Hack to make sure it's installed */
-		if( !$this->DB->checkForTable('cal_calendars') )
-		{
-			return;
-		}
-
-		/* INIT */
-		$seenids   = array();
-		$calevents = "";
-		
-		/* Calendar Class */
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'calendar' ) . '/modules_public/calendar/calendars.php', 'public_calendar_calendar_calendars' );
-		$calendar    = new $classToLoad();
-		$calendar->makeRegistryShortcuts( $this->registry );
-
-		/* RSS Class */
-		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
-		$class_rss   = new $classToLoad();
-		
-		$class_rss->use_sockets = $this->use_sockets;
-		$class_rss->doc_type    = IPS_DOC_CHAR_SET;
-
-		/* Reset the cache */
-		$cache = array();
-
-		/* Get the calendars */
-		$this->DB->build( array( 'select'   => 'c.*', 
-								 'from'     => array( 'cal_calendars' => 'c' ), 
-								 'where'    => 'c.cal_rss_export_days > 0 AND c.cal_rss_export_max > 0 AND c.cal_rss_export=1',
-								 'add_join' => array( array( 'select' => 'p.*',
-															 'from'   => array( 'permission_index' => 'p' ),
-															 'where'  => "p.perm_type='calendar' AND perm_type_id=c.cal_id",
-															 'type'   => 'left' ) )	
-						 )		);
-		$outer = $this->DB->execute();
-		
-		/* Loop through the calendars */
-		while( $row = $this->DB->fetch( $outer ) )
-		{
-			$row['cal_rss_export_max']	= $row['cal_rss_export_max'] ? $row['cal_rss_export_max'] : 10;
-			
-			//print_r($row);exit;
-			/* Add Calendar to cache */
-			if ( $row['cal_rss_export'] )
-			{
-				$cache[] = array( 'url' => $this->settings['board_url'].'/index.php?app=core&amp;module=global&amp;section=rss&amp;type=calendar&amp;id='.$row['cal_id'], 'title' => $row['cal_title'] );
-			}
-			
-			/* Are we including events from this calendar? */
-			if( $calendar_id == $row['cal_id'] OR $calendar_id == 'all' )
-			{
-				/* Create the RSS Channel */
-				$channel_id = $class_rss->createNewChannel( array( 'title'       => $row['cal_title'],
-																	 'link'        => $this->settings['board_url'].'/index.php?app=calendar&amp;module=calendar&amp;cal_id='.$row['cal_id'],
-																	 'pubDate'     => $class_rss->formatDate( time() ),
-																	 'ttl'         => $row['cal_rss_update'] * 60,
-																	 'description' => $row['cal_title']
-															)      );
-				
-				/* Check guest permissions */
-				if( $row['perm_view'] == '*' OR preg_match( "/(^|,)".$this->settings['guest_group']."(,|$)/", $row['perm_view'] ) )
-				{
-					$pass = 1;
-				}
-
-				if ( ! $pass )
-				{
-					continue;
-				}
-				
-				/* Sort out the dates */
-				$row['cal_rss_export_days'] = intval ($row['cal_rss_export_days'] ) + 1;
-				
-				list( $month, $day, $year ) = explode( ',', gmdate('n,j,Y', time()) );
-				
-				$timenow   = gmmktime( 0,0,0, $month, 1, $year );
-				$timethen  = time() + ( $row['cal_rss_export_days'] * 86400 ) + 86400;
-				$nowtime   = time() - 86400;
-				$items     = 0;
-				
-				/* Get Events */
-				$calendar->calendarGetEventsSQL( 0, 0, array( 'timenow' => $timenow, 'timethen' => $timethen, 'cal_id' => $row['cal_id'] ), 0 );
-				
-				/* Check the events */
-				for( $i = 0 ; $i <= $row['cal_rss_export_days'] ; $i++ )
-				{
-					/* Get the month, day, and year */
-					list( $month, $day, $year ) = explode( ',', gmdate('n,j,Y', $nowtime) );
-					
-					/* Get the events for this day */
-					$eventcache = $calendar->calendarGetDayEvents( $month, $day, $year );
-					
-					/* Loop through the events */
-					foreach( $eventcache as $event )
-					{ 
-						if ( ! in_array( $event['event_id'], $seenids ) )
-						{
-							/* Reached the max? */
-							if ( $row['cal_rss_export_max'] <= $items )
-							{
-								break;
-							}
-							
-							/* Get the event info */
-							if ( $calendar->getInfoEvents( $event, $month, $day, $year, 0 ) )
-							{
-								/* Approved */
-								if ( ! $event['event_approved'] )
-								{
-									continue;
-								}
-								
-								/* Check Private */
-								if ( $event['event_private'] )
-								{
-									continue;
-								}
-								
-								/* Check Permis */
-								if ( $event['event_perms'] != '*' AND ! preg_match( "/(^|,)".$this->settings['guest_group']."(,|$)/", $event['event_perms'] ) )
-								{
-									continue;
-								}
-								
-								/* Set the timezone to the board default */
-								//$event['event_unix_from'] = $event['event_unix_from'] + ( $this->settings['time_offset'] * 3600 );
-								//$event['event_unix_to'] = $event['event_unix_to'] + ( $this->settings['time_offset'] * 3600 );
-								
-								/* Get Dates */
-								list( $m , $d , $y  ) = explode( ",", gmdate('n,j,Y', $event['event_unix_from']  ) );
-								list( $m1, $d1, $y1 ) = explode( ",", gmdate('n,j,Y', $event['event_unix_to']   ) );
-								
-								$event['_from_month'] = $m;
-								$event['_from_day']   = $d;
-								$event['_from_year']  = $y;
-								$event['_to_month']   = $m1;
-								$event['_to_day']     = $d1;
-								$event['_to_year']    = $y1;
-
-								//-----------------------------------------
-								// Coming from RSS rebuild?
-								//-----------------------------------------
-								
-								if( !$this->html )
-								{
-									/* Load Skin and Lang */
-									$this->html               = $this->registry->output->getTemplate( 'calendar' );
-									
-									$this->lang->loadLanguageFile( array( 'admin_calendar' ) );
-								}
-								
-								//-----------------------------------------
-								// Parse bbcode
-								//-----------------------------------------
-								
-								IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
-								IPSText::getTextClass( 'bbcode' )->parse_smilies			= intval( $event['event_smilies'] );
-								IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-								IPSText::getTextClass( 'bbcode' )->parsing_section			= 'calendar';
-								IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $event['member_group_id'];
-								IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $event['mgroup_others'];
-						
-								$event['event_content'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $event['event_content'] );
-
-								if ( $event['recurring'] )
-								{
-									$event['event_content'] = $this->html->calendar_rss_recurring( $event );
-								}
-								else if ( $event['single'] )
-								{
-									$event['event_content'] = $this->html->calendar_rss_single( $event );
-								}
-								else
-								{
-									$event['event_content'] = $this->html->calendar_rss_range( $event );
-								}
-								
-								/* Add the item to our channel */
-								$class_rss->addItemToChannel( $channel_id, array( 'title'		=> $event['event_title'],
-																				 'link'			=> $this->settings['board_url'].'/index.php?app=calendar&amp;module=calendar&amp;do=showevent&amp;cal_id='.$row['cal_id'].'&amp;event_id='.$event['event_id'],
-																				 'description'	=> $event['event_content'],
-																				 'pubDate'		=> $class_rss->formatDate( $event['event_unix_from'] ),
-																				 'guid'			=> $event['event_id']
-														  )                    );
-											
-										}
-							
-							/* Increment */
-							$seenids[ $event['event_id'] ] = $event['event_id'];
-							$items++;
-						}
-					}
-					
-					$nowtime += 86400;
-				}
-
-				/* Create the RSS Document */
-				$class_rss->createRssDocument();
-			
-				/* Update the cache */
-				$this->DB->update( 'cal_calendars', array( 'cal_rss_update_last' => time(), 'cal_rss_cache' => $class_rss->rss_document ), 'cal_id='.$row['cal_id'] );
-			}
-		}
-		
-		/* Update Cache */
-		$this->cache->setCache( 'rss_calendar', $cache, array( 'donow' => 1, 'array' => 1 ) );
-		
-		/* Return */
-		if ( $return )
-		{
-			$this->registry->output->global_message = $this->lang->words['c_rssrecached'];
-			$this->calendarsList();
-			return;
-		}
-		/* Print */
-		else
-		{
-			return $class_rss->rss_document;
-		}
-	}
-	
-	/**
-	 * Rebuild Calendar Cache
-	 *
-	 * @param	bool		Whether to return or not
-	 * @return	void
-	 */
-	public function calendarRebuildCache( $return=0 )
-	{
-		/* Hack to make sure it's installed */
-		if( !$this->DB->checkForTable('cal_calendars') )
-		{
-			return;
-		}
-
-		/* INIT */
-		$this->settings['calendar_limit'] = intval( $this->settings['calendar_limit'] ) < 2 ? 1 : intval( $this->settings['calendar_limit'] );
-
-		//--------------------------------------------
-		// Grab an extra day for the TZ diff
-		//--------------------------------------------
-		
-		$this->settings['calendar_limit']++;
-		
-		list( $month, $day, $year ) = explode( ',', gmdate('n,j,Y', time() ) );
-				
-		$timenow   = gmmktime( 0,0,0, $month, 1, $year );
-		$timethen  = time() + (intval($this->settings['calendar_limit']) * 86400);
-		$seenids   = array();
-		$nowtime   = time() - 86400;
-		$birthdays = array();
-		$calevents = array();
-		$calendars = array();
-		
-		$a           = explode( ',', gmdate( 'Y,n,j,G,i,s', time() ) );
-		$day         = $a[2];
-		$month       = $a[1];
-		$year        = $a[0];
-		$daysinmonth = date( 't', time() );
-		
-		//-----------------------------------------
-		// Get 24hr before and 24hr after to make
-		// sure we don't break any timezones
-		//-----------------------------------------
-		
-		$last_day   = $day - 1;
-		$last_month = $month;
-		$last_year  = $year;
-		$next_day   = $day + 1;
-		$next_month = $month;
-		$next_year  = $year;
-		
-		//-----------------------------------------
-		// Calculate dates..
-		//-----------------------------------------
-		
-		if ( $last_day == 0 )
-		{
-			$last_month -= 1;
-			$last_day   = gmdate( 't', time() );
-		}
-		
-		if ( $last_month == 0 )
-		{
-			$last_month = 12;
-			$last_year  -= 1;
-		}
-		
-		if ( $next_day > gmdate( 't', time() ) )
-		{
-			$next_month += 1;
-			$next_day   = 1;
-		}
-		
-		if ( $next_month == 13 )
-		{
-			$next_month = 1;
-			$next_year += 1;
-		}
-		
-		//--------------------------------------------
-		// Get classes
-		//--------------------------------------------
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'calendar' ) . '/modules_public/calendar/calendars.php', 'public_calendar_calendar_calendars' );
-		$calendar    = new $classToLoad();
-		$calendar->makeRegistryShortcuts( $this->registry );
-				
-		//--------------------------------------------
-		// Get stuff
-		//--------------------------------------------
-		
-		$this->DB->build( array( 
-										'select'   => 'c.*', 
-										'from'     => array( 'cal_calendars' => 'c' ), 
-										'order'    => 'c.cal_position ASC',
-										'add_join' => array(
-															array(
-																	'select' => 'p.*',
-																	'from'   => array( 'permission_index' => 'p' ),
-																	'where'  => "p.perm_type='calendar' AND perm_type_id=c.cal_id",
-																	'type'   => 'left',
-																)
-															)
-								)	 );		
-		$this->DB->execute();
-		
-		while( $row = $this->DB->fetch() )
-		{
-			$row['_perm_read'] = $row['perm_view'];
-			
-			$calendars[ $row['cal_id'] ] = $row;
-		}
-		
-		$calendar->calendarGetEventsSQL( 0, 0, array('timenow' => $timenow, 'timethen' => $timethen ) );
-
-		//--------------------------------------------
-		// OK.. Go through days and check events
-		//--------------------------------------------
-		
-		for( $i = 0 ; $i <= $this->settings['calendar_limit'] ; $i++ )
-		{
-			list( $_month, $tday, $year ) = explode( ',', gmdate('n,j,Y', $nowtime) );
-			
-			$eventcache = $calendar->calendarGetDayEvents( $_month, $tday, $year );
-			
-			foreach( $eventcache as $event )
-			{
-				if ( ! in_array( $event['event_id'], $seenids ) )
-				{ 
-					if ( $calendar->getInfoEvents( $event, $_month, $tday, $year, 0 ) )
-					{
-						if ( ! $event['event_approved'] )
-						{
-							continue;
-						}
-						
-						unset( $event['event_content'], $event['event_smilies'] );
-						
-						$event['_perm_read']             = $calendars[ $event['event_calendar_id'] ]['perm_view'];
-						$calevents[ $event['event_id'] ] = $event;
-					}
-					
-					$seenids[ $event['event_id'] ] = $event['event_id'];
-				}
-			}
-			
-			$nowtime += 86400;
-		}
- 
-		//-----------------------------------------
-		// Grab birthdays
-		//-----------------------------------------
-		
-		$append_string = "";
-		
-        if( ! date("L") )
-        {
-	        if( $month == "2" AND ( $day == "28" OR $day == "27" ) )
-	        {
-		        $append_string = " or( bday_month=2 AND bday_day=29 )";
-	        }
-		}
-
-		$this->DB->build( array( 
-								'select' => 'member_id, members_seo_name, members_display_name, member_group_id, bday_day, bday_month, bday_year',
-								'from'   => 'members',
-								'where'  => "( bday_day=$last_day AND bday_month=$last_month )
-											 or ( bday_day=$day AND bday_month=$month )
-											 or ( bday_day=$next_day AND bday_month=$next_month ) {$append_string}"
-							)	);
-							 
-		$this->DB->execute();
-		
-		$birthdays = array();
-		
-		while( $r = $this->DB->fetch() )
-		{
-			$birthdays[ $r['member_id'] ] = $r;
-		}
-		
-		//--------------------------------------------
-		// Update calendar array
-		//--------------------------------------------
-
-		$this->cache->setCache( 'calendar' , $calevents, array( 'array' => 1 ) );
-		$this->cache->setCache( 'birthdays', $birthdays, array( 'array' => 1 ) );
-
-		if ( $return )
-		{
-			$this->registry->output->global_message = $this->lang->words['c_recached'];
-			$this->calendarsList();
-		}
-	}
-	
-	/**
-	 * Builds a cache of the current calendars
-	 *
-	 * @return	bool	Returns true
-	 */
-	public function calendarsRebuildCache()
-	{
-		/* Hack to make sure it's installed */
-		if( !$this->DB->checkForTable('cal_calendars') )
-		{
-			return;
-		}
-
-		/* INI */
-		$cache = array();
-			
-		/* Query Calenar with permissions */
-		$this->DB->build( array( 
-										'select'   => 'c.*', 
-										'from'     => array( 'cal_calendars' => 'c' ), 
-										'order'    => 'c.cal_position ASC',
-										'add_join' => array(
-															array(
-																	'select' => 'p.*',
-																	'from'   => array( 'permission_index' => 'p' ),
-																	'where'  => "p.perm_type='calendar' AND perm_type_id=c.cal_id",
-																	'type'   => 'left',
-																)
-															)
-								)	 );		
-		$this->DB->execute();
-		
-		/* Add to cache */
-		while( $r = $this->DB->fetch() )
-		{
-			$cache[ $r['cal_id'] ] = $r;
-		}
-		
-		/* Save */
-		$this->cache->setCache( 'calendars', $cache, array( 'donow' => 1, 'array' => 1 ) );
-		
-		return TRUE;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/defaultSection.php b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/defaultSection.php
deleted file mode 100644
index 29cfa037..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/defaultSection.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar default section
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $ 
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'calendars';
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/index.html b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/index.html b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/menu.xml b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/menu.xml
deleted file mode 100644
index 3ba430e1..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/menu.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu>
-	<tabitems>
-		<item>
-			<title>Календарь</title>
-			<subitems>
-				<subitem>
-					<subitemtitle>Управление календарем</subitemtitle>
-					<subsection>calendars</subsection>
-					<subitemurl>do=overview</subitemurl>
-					<subitemrolekey></subitemrolekey>
-					<subisredirect>0</subisredirect>
-				</subitem>
-			</subitems>
-		</item>
-	</tabitems>
-</menu>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/permissions.xml b/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/permissions.xml
deleted file mode 100644
index a3658788..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/calendar/xml/permissions.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<permissions>
-	<group>
-		<grouptitle>Управление календарем</grouptitle>
-		<items>
-			<item>
-				<key>calendar_manage</key>
-				<string>Может добавл�ть/измен�ть календари?</string>
-			</item>
-			<item>
-				<key>calendar_delete</key>
-				<string>Может удал�ть календари?</string>
-			</item>
-		</items>
-	</group>
-</permissions>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_admin/index.html b/upload/admin/applications_addon/ips/calendar/modules_admin/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_admin/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/calendars.php b/upload/admin/applications_addon/ips/calendar/modules_public/calendar/calendars.php
deleted file mode 100644
index 63e2ed35..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/calendars.php
+++ /dev/null
@@ -1,2903 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar View
- * Last Updated: $Date: 2010-11-12 17:23:13 -0500 (Fri, 12 Nov 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7175 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_calendar_calendar_calendars extends ipsCommand
-{
-	/**
-	 * Temporary HTML output
-	 *
-	 * @var		string
-	 */
-	protected $output				= "";
-
-	/**
-	 * Page title
-	 *
-	 * @var		string
-	 */
-	protected $page_title			= "";
-
-	/**
-	 * Chosen month
-	 *
-	 * @var		int
-	 */
-	protected $chosen_month		= 0;
-
-	/**
-	 * Chosen year
-	 *
-	 * @var		int
-	 */
-	protected $chosen_year		= 0;
-
-	/**
-	 * Current date
-	 *
-	 * @var		array
-	 */
-	protected $now_date			= array();
-
-	/**
-	 * Now date parts
-	 *
-	 * @var		array
-	 */
-	protected $now				= array( 'mday' => '', 'mon' => '', 'year' => '' );
-
-	/**
-	 * Timestamp for our date
-	 *
-	 * @var		int
-	 */
-	protected $our_datestamp		= 0;
-
-	/**
-	 * Array of date parts for first date
-	 *
-	 * @var		array
-	 */
-	protected $first_day_array	= array();
-
-	/**
-	 * Words for the month (for translation)
-	 *
-	 * @var		array
-	 * @todo 	[Future] Deprecate this, and use the locale date functionality instead
-	 */
-	public $month_words			= array();
-
-	/**
-	 * Words for the days.  Gets setup special for calendars starting on Monday
-	 *
-	 * @var		array
-	 */
-	public $day_words			= array();
-
-	/**
-	 * Cache of results from a monthly query
-	 *
-	 * @var		array
-	 */
-	protected $query_month_cache	= array();
-
-	/**
-	 * Cache of results from a birthday query
-	 *
-	 * @var		array
-	 */
-	protected $query_bday_cache	= array();
-
-	/**
-	 * Cache of event results
-	 *
-	 * @var		array
-	 */
-	protected $event_cache		= array();
-
-	/**
-	 * Cache of events we've already displayed, to prevent duplication for recurring/ranged events.
-	 *
-	 * @var		array
-	 */
-	protected $shown_events		= array();
-
-	/**
-	 * Calendar ID
-	 *
-	 * @var		int
-	 */
-	public $calendar_id			= 1;
-
-	/**
-	 * Calendar data
-	 *
-	 * @var		array
-	 */
-	public $calendar			= array();
-
-	/**
-	 * Calendar jump select list
-	 *
-	 * @var		string
-	 */
-	protected $calendar_jump		= "";
-
-	/**
-	 * Parsed member data
-	 *
-	 * @var		array
-	 */
-	protected $parsed_members		= array();
-
-	/**
-	 * Can we read the events
-	 *
-	 * @var		bool
-	 */
-	public $can_read			= false;
-
-	/**
-	 * Can we post the events
-	 *
-	 * @var		bool
-	 */
-	protected $can_post			= false;
-
-	/**
-	 * Can we avoid a mod queue
-	 *
-	 * @var		bool
-	 */
-	protected $can_avoid_queue	= false;
-
-	/**
-	 * Can we moderate events
-	 *
-	 * @var		bool
-	 */
-	protected $can_moderate		= false;
-
-	/**
-	 * Class entry point
-	 *
-	 * @param	object		Registry reference
-	 * @return	void		[Outputs to screen/redirects]
-	 */
-	public function doExecute( ipsRegistry $registry )
-	{
-		/**
-		 * Init
-		 */
-		$this->initCalendar();
-
-		switch( $this->request['do'] )
-		{
-			case 'newevent':
-				$this->calendarEventForm( 'add' );
-			break;
-
-			case 'addnewevent':
-				$this->calendarEventSave( 'add' );
-			break;
-
-			case 'edit':
-				$this->calendarEventForm( 'edit' );
-			break;
-
-			case 'doedit':
-				$this->calendarEventSave( 'edit' );
-			break;
-
-			case 'calendarEventApprove':
-				$this->calendarEventApprove();
-			break;
-
-			case 'showday':
-				$this->calendarShowDay();
-			break;
-
-			case 'showevent':
-				$this->calendarShowEvent();
-			break;
-
-			case 'birthdays':
-				$this->calendarShowBirthdays();
-			break;
-
-			case 'showweek':
-				$this->calendarShowWeek();
-			break;
-
-			case 'delete':
-				$this->calendarEventDelete();
-			break;
-
-			case 'find':
-				$this->calendarFindDate();
-			break;
-
-			default:
-				$this->calendarShowMonth();
-			break;
-		}
-
-		/* Page Title */
-		if( $this->page_title == "" )
-		{
-			$this->page_title =  $this->lang->words['page_title'] . ' - ' . $this->settings['board_name'];
-		}
-
-		$this->registry->output->setTitle( $this->page_title );
-
-		/* Navigation */
-		if( ! is_array( $this->registry->output->_navigation ) )
-		{
-			$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-			$this->registry->output->addNavigation( $this->calendar['cal_title']    , "app=calendar&amp;module=calendar&amp;cal_id={$this->calendar_id}" );
-		}
-
-		/* Output */
-		$this->registry->output->addContent( $this->output );
-		$this->registry->output->sendOutput();
-	}
-	
-	/**
-	 * Initialize calendar
-	 *
-	 * @return	void
-	 */
-	public function initCalendar( $byPassPermError=false )
-	{
-		/* Make sure the calednar is installed and enabled */
-		if( ! IPSLib::appIsInstalled( 'calendar' ) )
-		{
-			$this->registry->output->showError( 'no_permission', 1076, null, null, 404 );
-		}
-		
-		/* Load language  */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_calendar' ), 'calendar' );
-
-		/* Max Birthdays */
-		$this->settings['bday_show_cal_max'] = 5;
-
-		/* Get all calendar details */
-		if( ! count( $this->caches['calendars'] ) )
-		{
-			$this->DB->build( array(
-									'select'   => 'c.*',
-									'from'     => array( 'cal_calendars' => 'c' ),
-									'add_join' => array(
-														array(
-																'select' => 'p.*',
-																'from'   => array( 'permission_index' => 'p' ),
-																'where'  => "p.perm_type='calendar' AND perm_type_id=c.cal_id",
-																'type'   => 'left',
-															)
-														)
-						) 	);
-			$this->DB->execute();
-
-			$_cal_cache = array();
-			while( $cal = $this->DB->fetch() )
-			{
-				$_cal_cache[ $cal['cal_id'] ] = $cal;
-			}
-
-			$this->cache->setCache( 'calendars', $_cal_cache, array( 'array' => 1 ) );
-		}
-		
-		/* Get calendar details */
-		if( ( isset($this->request['cal_id']) AND $this->request['cal_id'] ) OR ( isset($this->request['calendar_id']) AND $this->request['calendar_id'] ) )
-		{
-			$this->calendar_id = intval( $this->request['cal_id'] ) ? intval( $this->request['cal_id'] ) : intval( $this->request['calendar_id'] );
-		}
-		else
-		{
-			$cal_ids = array_keys( $this->caches['calendars'] );
-			$this->calendar_id = $cal_ids[0];
-		}
-
-		/* Sneaky cheaty */
-		$this->request['_cal_id'] = $this->calendar_id;
-
-		/* Loop through the cache and build calendar jump */
-		if ( count( $this->caches['calendars'] ) AND is_array( $this->caches['calendars'] ) )
-		{
-			foreach( $this->caches['calendars'] as $cal_id => $cal )
-			{
-				$selected = "";
-
-				/* Got a perm */
-				if( ! $this->registry->permissions->check( 'view', $cal ) )
-				{
-					continue;
-				}
-
-				if ( $cal['cal_id'] == $this->calendar_id )
-				{
-					$this->calendar = $cal;
-					//$selected       = " selected='selected'";
-				}
-
-				$this->calendar_cache[ $cal['cal_id'] ] = $cal;
-
-				$this->calendar_jump .= "<option value='{$cal['cal_id']}'{$selected}>{$cal['cal_title']}</option>\n";
-			}
-		}
-
-		if( ! $this->calendar )
-		{
-			if( count( $this->calendar_cache ) )
-			{
-				$tmp_resort = $this->calendar_cache;
-				ksort($tmp_resort);
-				reset($tmp_resort);
-				$default_calid = key( $tmp_resort );
-				$this->calendar_id = $default_calid;
-				$this->calendar = $tmp_resort[ $default_calid ];
-				unset( $tmp_resort );
-			}
-		}
-
-		/* Setup calendar permissions */
-		$this->calendarBuildPermissions();
-
-		if ( ! $this->can_read && ! $byPassPermError )
-		{
-			$this->registry->output->showError( 'cal_no_perm', 1040, null, null, 403 );
-		}
-
-		/* There is something whacky with getdate and GMT
-		   This handrolled method seems to take into account
-		   DST where getdate refuses. */
-		$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() + $this->registry->class_localization->getTimeOffset() ) );
-
-		$this->now_date = array(
-								 'year'    => $a[0],
-								 'mon'     => $a[1],
-								 'mday'    => $a[2],
-								 'hours'   => $a[3],
-								 'minutes' => $a[4],
-								 'seconds' => $a[5]
-							   );
-
-		if( isset($this->request['year']) AND $this->request['year'] )
-		{
-			$this->request['y'] = $this->request['year'];
-		}
-
-		/* Set the chosen month and year */
-		$this->chosen_month = ( ! isset($this->request['m']) OR ! $this->request['m'] OR ! intval( $this->request['m'] ) ) ? $this->now_date['mon']  : intval( $this->request['m'] );
-		$this->chosen_year  = ( ! isset($this->request['y']) OR ! $this->request['y'] OR ! intval( $this->request['y'] ) ) ? $this->now_date['year'] : intval( $this->request['y'] );
-
-		/* Make sure the date is in range. */
-		if( ! checkdate( $this->chosen_month, 1 , $this->chosen_year ) )
-		{
-			$this->chosen_month = $this->now_date['mon'];
-			$this->chosen_year  = $this->now_date['year'];
-		}
-
-		/* Get the timestamp for our chosen date */
-		$this->our_datestamp   = mktime( 0,0,1, $this->chosen_month, 1, $this->chosen_year);
-		$this->first_day_array = IPSTime::date_getgmdate($this->our_datestamp);
-
-		/* Finally, build up the lang arrays */
-		$this->month_words = array( $this->lang->words['M_1'] , $this->lang->words['M_2'] , $this->lang->words['M_3'] ,
-									$this->lang->words['M_4'] , $this->lang->words['M_5'] , $this->lang->words['M_6'] ,
-									$this->lang->words['M_7'] , $this->lang->words['M_8'] , $this->lang->words['M_9'] ,
-									$this->lang->words['M_10'], $this->lang->words['M_11'], $this->lang->words['M_12'] );
-
-		if( ! $this->settings['ipb_calendar_mon'] )
-		{
-			$this->day_words   = array( $this->lang->words['D_0'], $this->lang->words['D_1'], $this->lang->words['D_2'],
-										$this->lang->words['D_3'], $this->lang->words['D_4'], $this->lang->words['D_5'],
-										$this->lang->words['D_6'] );
-		}
-		else
-		{
-			$this->day_words   = array( $this->lang->words['D_1'], $this->lang->words['D_2'], $this->lang->words['D_3'],
-										$this->lang->words['D_4'], $this->lang->words['D_5'], $this->lang->words['D_6'],
-										$this->lang->words['D_0'] );
-		}
-	}
-
-	/**
-	 * Deletes an event from the calendar
-	 *
-	 * @return	void
-	 */
-	public function calendarEventDelete()
-	{
-		/* INIT */
-		$cal_id    = intval( $this->request['cal_id'] );
-		$event_id  = intval( $this->request['event_id'] );
-		$md5check  = trim( $this->request['md5check'] );
-
-		/* Get Permissions */
-		$this->calendarBuildPermissions( $cal_id );
-
-		/* Check */
-		$this->DB->build( array( 'select' => '*', 'from' => 'cal_events', 'where' => "event_id=$event_id AND event_calendar_id=$cal_id" ) );
-		$this->DB->execute();
-		$memcheck = $this->DB->fetch();
-
-		if ( ! $cal_id OR ! $event_id )
-		{
-			$this->registry->output->showError( 'calendar_bad_delete', 1041, null, null, 404 );
-		}
-
-		if ( ! $this->can_moderate )
-		{
-			if( !$this->memberData['member_id'] OR $this->memberData['member_id'] <> $memcheck['event_member_id'] )
-			{
-				$this->registry->output->showError( 'calendar_delete_no_perm', 1042, null, null, 403 );
-			}
-		}
-
-		/* Check MD5 */
-		if ( $md5check != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'calendar_bad_key', 2040, null, null, 403 );
-		}
-
-		/* Delete */
-		$this->DB->delete( 'cal_events', "event_id=$event_id AND event_calendar_id=$cal_id" );
-
-		/* Recache */
-		$this->calendarCallRecache();
-
-		/* Boing... */
-		$this->registry->output->redirectScreen( $this->lang->words['cal_event_delete'] , $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$cal_id}" );
-	}
-
-	/**
-	 * Approves an event
-	 *
-	 * @return	void
-	 */
-	public function calendarEventApprove()
-	{
-		/* INIT */
-		$cal_id    = intval( $this->request['cal_id'] );
-		$event_id  = intval( $this->request['event_id'] );
-		$approve   = intval( $this->request['approve'] );
-		$modfilter = trim( $this->request['modfilter'] );
-		$quicktime = trim( $this->request['qt'] );
-		$md5check  = trim( $this->request['md5check'] );
-
-		list( $month, $day, $year ) = explode( "-", $quicktime );
-
-		/* Get Permissions */
-		$this->calendarBuildPermissions( $cal_id );
-
-		/* Check */
-		if ( ! $this->can_moderate )
-		{
-			$this->registry->output->showError( 'calendar_bad_approve', 1043, null, null, 403 );
-		}
-
-		/* Check MD5 */
-		if ( $md5check != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'calendar_bad_key', 2041, null, null, 403 );
-		}
-
-		/* Check Dates */
-		if ( ! $day OR ! $month OR ! $year )
-		{
-			$this->registry->output->showError( 'calendar_dmy_missing', 1044 );
-		}
-
-		/* Get Event */
-		$event = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'cal_events', 'where' => "event_calendar_id={$cal_id} and event_id={$event_id}" ) );
-
-		if( ! $event['event_id'] )
-		{
-			$this->registry->output->showError( 'calendar_event_not_found', 1045, null, null, 404 );
-		}
-
-		/* Update Event... */
-		$this->DB->update( 'cal_events', array( 'event_approved' => $event['event_approved'] ? 0 : 1 ), 'event_id='.$event_id );
-
-		/* Recache... */
-		$this->calendarCallRecache();
-
-		/* Boink */
-		$this->registry->output->silentRedirect( $this->settings['base_url']."app=calendar&module=calendar&cal_id={$cal_id}&modfilter={$modfilter}&do=showday&y={$year}&m={$month}&d={$day}");
-	}
-
-	/**
-	 * Build calendar permissions
-	 *
-	 * @param	int		Calendar ID
-	 * @return	void
-	 */
-	public function calendarBuildPermissions( $cal_id=0 )
-	{
-		$this->can_read        = 0;
-		$this->can_post        = 0;
-		$this->can_avoid_queue = 0;
-		$this->can_moderate    = 0;
-
-		//-----------------------------------------
-		// Got an idea?
-		//-----------------------------------------
-
-		if ( ! $cal_id )
-		{
-			$cal_id = $this->calendar_id;
-		}
-
-		$calendar = $this->calendar_cache[ $cal_id ];
-
-		//-----------------------------------------
-		// Read
-		//-----------------------------------------
-
-		if( $this->registry->permissions->check( 'view', $calendar ) )
-		{
-			$this->can_read = 1;
-		}
-
-		//-----------------------------------------
-		// Post
-		//-----------------------------------------
-
-		if( $this->registry->permissions->check( 'start', $calendar ) )
-		{
-			$this->can_post = 1;
-		}
-
-		//-----------------------------------------
-		// Mod Queue
-		//-----------------------------------------
-
-		if( $this->registry->permissions->check( 'nomod', $calendar ) )
-		{
-			$this->can_avoid_queue = 1;
-		}
-
-		//-----------------------------------------
-		// Moderate
-		//-----------------------------------------
-
-		if ( $this->memberData['g_is_supmod'] )
-		{
-			$this->can_moderate = 1;
-		}
-
-	}
-
-	/**
-	 * Find a date
-	 *
-	 * @return	void
-	 */
-	public function calendarFindDate()
-	{
-		if( $this->request['what'] )
-		{
-			if( $this->request['what'] == 'thismonth' )
-			{
-				$this->registry->output->silentRedirect( $this->settings['base_url']."app=calendar&amp;module=calendar&amp;cal_id={$this->calendar_id}&amp;m={$this->now_date['mon']}&amp;y={$this->now_date['year']}" );
-			}
-			else
-			{
-				$time = time() + $this->registry->class_localization->getTimeOffset();
-
-				$this->registry->output->silentRedirect( $this->settings['base_url']."app=calendar&amp;module=calendar&amp;cal_id={$this->calendar_id}&amp;do=showweek&amp;week={$time}" );
-			}
-		}
-		else
-		{
-			$this->calendarShowMonth();
-		}
-	}
-
-	/**
-	 * Shows the events for a week
-	 *
-	 * @return	void
-	 */
-	public function calendarShowWeek()
-	{
-		/* INIt */
-		$in_week = intval( $this->request['week'] );
-
-		/* Get start of the week */
-		$startweek = IPSTime::date_getgmdate( $in_week );
-
-		if( ! $this->settings['ipb_calendar_mon'] )
-		{
-			/* Not Sunday? Go back */
-			$startweek['wday'] = intval( $startweek['wday'] );
-
-			if( $startweek['wday'] > 0 )
-			{
-				while( $startweek['wday'] != 0 AND $startweek['wday'] != 7 )
-				{
-					$startweek['wday']--;
-					$in_week -= 86400;
-				}
-
-				$startweek = IPSTime::date_getgmdate( $in_week );
-			}
-		}
-		else
-		{
-			//-----------------------------------------
-			// Not Monday, rewind...
-			// date_getgmdate will set weekday start to 1
-			// PHP 5.1 allows for 'N' which will fix
-			// this, but we support earlier versions..
-			//-----------------------------------------
-			if( $startweek['wday'] != 1 )
-			{
-				$startweek['wday'] = $startweek['wday'] == 0 ? 7 : $startweek['wday'];
-
-				while( $startweek['wday'] != 1 )
-				{
-					$startweek['wday']--;
-					$in_week -= 86400;
-				}
-
-				$startweek = IPSTime::date_getgmdate( $in_week );
-			}
-		}
-
-		/* Get end of week */
-		$endweek       = IPSTime::date_getgmdate( $in_week + 604800 );
-		$our_datestamp = gmmktime( 0,0,0, $startweek['mon'], $startweek['mday'], $startweek['year']);
-		$our_timestamp = $in_week;
-		$seen_days     = array(); // Holds yday
-		$seen_ids      = array();
-
-		/* Figure out the next/previous links */
-		$prev_month = $this->calendarGetPreviousMonth( $this->chosen_month, $this->chosen_year );
-		$next_month = $this->calendarGetNextMonth( $this->chosen_month, $this->chosen_year );
-
-		$prev_week = IPSTime::date_getgmdate( $in_week - 604800 );
-		$next_week = IPSTime::date_getgmdate( $in_week + 604800 );
-
-		$this->output .= $this->registry->output->getTemplate('calendar')->cal_week_content( $this->calendar_cache, $startweek['mday'], $this->month_words[$startweek['mon'] - 1], $startweek['year'], $prev_week, $next_week, $this->calendar_id );
-
-		$last_month_id = -1;
-
-		/* Get the events */
-		$this->calendarGetEventsSQL( $startweek['mon'], $startweek['year'] );
-
-		/* Print each effing day :D */
-		$cal_output = "";
-
-		for( $i = 0 ; $i <= 6 ; $i++ )
-		{
-			$year   = gmdate( 'Y', $our_datestamp );
-			$month  = gmdate( 'n', $our_datestamp );
-			$day    = gmdate( 'j', $our_datestamp );
-			$today  = IPSTime::date_getgmdate( $our_datestamp );
-		
-			$this_day_events = "";
-
-			if ( $last_month_id != $today['mon'] )
-			{
-				$last_month_id = $today['mon'];
-
-				$cal_output .= $this->registry->output->getTemplate('calendar')->cal_week_monthbar( $this->month_words[$today['mon'] - 1], $today['year'] );
-
-				/* Get the birthdays from the database */
-				if ( $this->settings['show_bday_calendar'] )
-				{
-					$birthdays = array();
-
-					$this->calendarGetBirthdaySQL( $today['mon'] );
-
-					$birthdays = $this->query_bday_cache[ intval( $today['mon'] ) ];
-				}
-
-				/* Get the events */
-				$this->calendarGetEventsSQL( $month, $year );
-			}
-
-			$events       = $this->calendarGetDayEvents( $month, $day, $year );
-			$queued_event = 0;
-
-			if ( is_array( $events ) AND count( $events ) )
-			{
-				foreach( $events as $event )
-				{
-					if ( !isset($this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ]) OR !$this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] )
-					{
-						/* Recurring */
-						if ( $event['recurring'] )
-						{
-							$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_events_wrap_recurring( $event );
-						}
-						else if ( $event['single'] )
-						{
-							$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_events_wrap( $event );
-						}
-						else
-						{
-							$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_events_wrap_range( $event );
-						}
-
-						$this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] = 1;
-					}
-
-					/* Queued Events */
-					if ( ! $event['event_approved'] AND $this->can_moderate )
-					{
-						$queued_event = 1;
-					}
-				}
-			}
-
-			/* Birthdays */
-			if( $this->calendar['cal_bday_limit'] )
-			{
-				if( isset( $birthdays[ $today['mday'] ] ) and count( $birthdays[ $today['mday'] ] ) > 0 )
-				{
-					$no_bdays = count( $birthdays[ $today['mday'] ] );
-
-					if ( $this->calendar['cal_bday_limit'] and $no_bdays <= $this->calendar['cal_bday_limit'] )
-					{
-						foreach( $birthdays[ $today['mday'] ] as $user )
-						{
-							$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_week_events_wrap(
-																															"code=birthdays&amp;y=".$today['year']."&amp;m=".$today['mon']."&amp;d=".$today['mday'],
-																															$user['members_display_name'].$this->lang->words['bd_birthday']
-																														  );
-						}
-
-					}
-					else
-					{
-						$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_week_events_wrap(
-																													   "code=birthdays&amp;y=".$today['year']."&amp;m=".$today['mon']."&amp;d=".$today['mday'],
-																													   sprintf( $this->lang->words['entry_birthdays'], count($birthdays[ $today['mday'] ]) )
-																													 );
-					}
-				}
-			}
-
-			if( $this_day_events == "" )
-			{
-				$this_day_events = '&nbsp;';
-			}
-
-			if( $this->settings['ipb_calendar_mon'] )
-			{
-				// Reset if Monday is first day
-				$today['wday'] = ( $today['wday'] == 0 ) ? 6 : $today['wday'] - 1;
-			}
-			else
-			{
-				$today['wday'] = ( $today['wday'] == 7 ) ? 0 : $today['wday'];
-			}
-
-			$cal_output .= $this->registry->output->getTemplate('calendar')->cal_week_dayentry( $this->day_words[ $today['wday'] ], $today['mday'], $this->month_words[$today['mon'] - 1], $today['mon'], $today['year'], $this_day_events, $queued_event );
-
-			$our_datestamp += 86400;
-
-			unset( $this_day_events );
-		}
-
-		/* Switch the HTML tags */
-		$this->output = str_replace( "<!--IBF.DAYS_CONTENT-->"  , $cal_output, $this->output );
-		$this->output = str_replace( "<!--IBF.MONTH_BOX-->"     , $this->calendarGetMonthDropDown(), $this->output );
-		$this->output = str_replace( "<!--IBF.YEAR_BOX-->"      , $this->calendarGetYearDropDown() , $this->output );
-
-		/* Get prev / this / next calendars */
-		$this->output = str_replace( "<!--PREV.MONTH-->", $this->getMiniCalendar( $prev_month['month_id'], $prev_month['year_id'] ), $this->output );
-		$this->output = str_replace( "<!--THIS.MONTH-->", $this->getMiniCalendar( $this->chosen_month    , $this->chosen_year     ), $this->output );
-		$this->output = str_replace( "<!--NEXT.MONTH-->", $this->getMiniCalendar( $next_month['month_id'], $next_month['year_id'] ), $this->output );
-
-		/* Navigation */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $this->month_words[$this->chosen_month - 1]." ".$this->chosen_year, '' );
-
-	}
-
-	/**
-	 * Displays the specified month
-	 *
-	 * @return	void
-	 */
-	public function calendarShowMonth()
-	{
-		/* Figure out the next / previous links */
-		$prev_month = $this->calendarGetPreviousMonth( $this->chosen_month, $this->chosen_year );
-		$next_month = $this->calendarGetNextMonth( $this->chosen_month, $this->chosen_year );
-
-		$this->output .= $this->registry->output->getTemplate('calendar')->calendarMainContent(
-																								$this->calendar_cache,
-																								$this->month_words[$this->chosen_month - 1],
-																								$this->chosen_year,
-																								$prev_month,
-																								$next_month,
-																								$this->calendar_jump,
-																								$this->calendar_id,
-																								$this->day_words
-																								);
-
-		/* Print the days table top row */
-		$day_output = "";
-		$cal_output = "";
-
-		foreach( $this->day_words as $day )
-		{
-			$day_output .= $this->registry->output->getTemplate('calendar')->cal_day_bit( $day );
-		}
-
-		$cal_output = $this->getMonthEvents($this->chosen_month, $this->chosen_year);
-
-		/* Switch the HTML Tags */
-		$this->output = str_replace( "<!--IBF.DAYS_TITLE_ROW-->", $day_output, $this->output );
-		$this->output = str_replace( "<!--IBF.DAYS_CONTENT-->"  , $cal_output, $this->output );
-
-		$this->output = str_replace( "<!--IBF.MONTH_BOX-->"     , $this->calendarGetMonthDropDown(), $this->output );
-		$this->output = str_replace( "<!--IBF.YEAR_BOX-->"      , $this->calendarGetYearDropDown() , $this->output );
-
-		/* Get prev / this / next calendars */
-		$this->output = str_replace( "<!--PREV.MONTH-->", $this->getMiniCalendar( $prev_month['month_id'], $prev_month['year_id'] ), $this->output );
-		//$this->output = str_replace( "<!--THIS.MONTH-->", $this->getMiniCalendar( $this->chosen_month    , $this->chosen_year     ), $this->output );
-		$this->output = str_replace( "<!--NEXT.MONTH-->", $this->getMiniCalendar( $next_month['month_id'], $next_month['year_id'] ), $this->output );
-
-		/* Navigation */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $this->month_words[$this->chosen_month - 1] ." " . $this->chosen_year, '' );
-		
-		$this->page_title	= $this->month_words[$this->chosen_month - 1] . ' - ' . $this->settings['board_name'];
-	}
-
-	/**
-	 * Build the ID for the current day
-	 *
-	 * @param	int		$year	The year
-	 * @param	int		$month	The month
-	 * @param	int		$day	The day
-	 * @return 	string
-	 */
-	protected function _buildDayID( $year, $month, $day )
-	{
-		return 'day-' . $year . '_' . $month . '_' . $day;
-	}
-
-	/**
-	 * Form for creating/modifying calendar events
-	 *
-	 * @param	string  $type  Either add or edit
-	 * @return	void
-	 */
-	public function calendarEventForm( $type='add' )
-	{
-		/* Extra languages */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_usercp' ), 'core' );
-		$this->registry->class_localization->loadLanguageFile( array( 'public_post' )  , 'forums' );
-
-		/* INIT */
-		$event_id      = $this->request['event_id'] ? intval( $this->request['event_id'] ) : 0;
-		$calendar_id   = $this->request['calendar_id'] ? intval( $this->request['calendar_id'] ) : $this->calendar_id;
-		$form_type     = $this->request['formtype'];
-		$recur_menu    = "";
-		$calendar_jump = "";
-		$divhide	   = "none";
-
-		/* Check */
-		if ( ! $this->memberData['member_id'] )
-		{
-			$this->registry->output->showError( 'calendar_no_guests', 1046, null, null, 403 );
-		}
-
-		/* Got permission to post to this calendar? */
-		$this->calendarBuildPermissions( $calendar_id );
-
-		if ( ! $this->can_post )
-		{
-			$this->registry->output->showError( 'calendar_no_post_perm', 1047, null, null, 403 );
-		}
-
-		/* Edit calendar option */
-		foreach( $this->calendar_cache as $data )
-		{
-			if( $this->registry->permissions->check( 'start', $data ) && ( $this->registry->permissions->check( 'view', $data ) ) )
-			{
-				$selected       = $calendar_id == $data['cal_id'] ? ' selected="selected" ' : '';
-				$calendar_jump .= "<option value='{$data['cal_id']}'{$selected}>{$data['cal_title']}</option>\n";
-			}
-		}
-
-		/* WHICHISIT */
-		if ( $type == 'add' )
-		{
-			$tmp = $this->request['nd'] ? explode( "-", $this->request['nd'] ) : array();
-
-			$nd = isset($tmp[2]) ? intval( $tmp[2] ) : 0;
-			$nm = isset($tmp[1]) ? intval( $tmp[1] ) : 0;
-			$ny = isset($tmp[0]) ? intval( $tmp[0] ) : 0;
-
-			$public  = "";
-			$private = "";
-			$event   = array( 'event_smilies' => 1, 'event_content' => '' );
-
-			$fd = $nd = $nd ? $nd : $this->now['mday'];
-			$fm = $nm = $nm ? $nm : $this->now['mon'];
-			$fy = $ny = $ny ? $ny : $this->now['year'];
-
-			$tz_offset  = ( ($this->memberData['time_offset'] AND $this->memberData['time_offset'] != "" ) OR $this->memberData['time_offset'] === '0' OR $this->memberData['time_offset'] === 0 ) ? $this->memberData['time_offset'] : $this->settings['time_offset'];
-
-			$recur_menu = "<option value='1'>{$this->lang->words['fv_days']}</option><option value='2'>{$this->lang->words['fv_months']}</option><option value='3'>{$this->lang->words['fv_years']}</option>";
-			$code       = 'addnewevent';
-			$button     = $this->lang->words['calendar_submit'];
-
-			$event['event_timeset'] = "";
-		}
-		else
-		{
-			if ( ! $event_id )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 1048, null, null, 404 );
-			}
-
-			/* Get the evnet */
-			$this->DB->build( array( 'select' => '*', 'from' => 'cal_events', 'where' => "event_id={$event_id}" ) );
-			$this->DB->execute();
-
-			if ( ! $event = $this->DB->fetch() )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 1049, null, null, 404 );
-			}
-
-			//-----------------------------------------
-			// Do we have permission to see the event?
-			//-----------------------------------------
-
-			if ( $event['event_perms'] != '*' )
-			{
-				$this_member_mgroups[] = $this->memberData['member_group_id'];
-
-				if( $this->memberData['mgroup_others'] )
-				{
-					$this_member_mgroups = array_merge( $this_member_mgroups, explode( ",", IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
-				}
-
-				$check = 0;
-
-				foreach( $this_member_mgroups as $this_member_mgroup )
-				{
-					if ( preg_match( "/(^|,)".$this_member_mgroup."(,|$)/", $event['event_perms'] ) )
-					{
-						$check = 1;
-					}
-				}
-
-				if( $check == 0 )
-				{
-					$this->registry->output->showError( 'calendar_event_not_found', 10411, null, null, 404 );
-				}
-			}
-
-			/* Do we have permission to edit this event? */
-			if ( $this->memberData['member_id'] == $event['event_member_id'] )
-			{
-				$can_edit = 1;
-			}
-			else if ( $this->memberData['g_is_supmod'] == 1 )
-			{
-				$can_edit = 1;
-			}
-			else
-			{
-				$can_edit = 0;
-			}
-
-			if ( $can_edit != 1 )
-			{
-				$this->registry->output->showError( 'calendar_no_edit_perm', 10410, null, null, 403 );
-			}
-
-			$tz_offset = $event['event_tz'];
-
-			//-----------------------------------------
-			// Date stuff
-			//-----------------------------------------
-
-			$convert_hours = 0;
-
-			if( $event['event_timeset'] )
-			{
-				$divhide       = "";
-				$hour_min      = explode( ":", $event['event_timeset'] );
-			//	$convert_hours = ( $hour_min[0] * 3600 ) + ( $hour_min[1] * 60 ); /* Bug #20521 */
-
-				/* This code adds a 0 to the end if it only has 1 (e.g. changes 13:0 to 13:00) - purely cosmetic */
-
-				if( strlen( substr( $event['event_timeset'], strpos( $event['event_timeset'], ':' ) + 1 ) ) == 1 )
-				{
-					$event['event_timeset'] = (string) $event['event_timeset'] . '0';
-				}
-			}
-
-			if( $tz_offset && $event['event_timeset'] AND !$event['event_all_day'] )
-			{
-				$convert_hours = $tz_offset * 3600 + $convert_hours;
-			}
-
-			$_unix_from = explode( '-', gmdate( 'n-j-Y', $event['event_unix_from'] - $convert_hours ) );
-
-			if( $convert_hours && $event['event_unix_to'] )
-			{
-				$event['event_unix_to'] -= $convert_hours;
-			}
-			$_unix_to   = explode('-', gmdate('n-j-Y', $event['event_unix_to']  ));
-
-			$nd = $_unix_from[1];
-			$nm = $_unix_from[0];
-			$ny = $_unix_from[2];
-
-			$fd = $_unix_to[1];
-			$fm = $_unix_to[0];
-			$fy = $_unix_to[2];
-
-			/* Form Stuff */
-			if ( $event['event_recurring'] )
-			{
-				$form_type = 'recur';
-			}
-			else if ( ! $event['event_recurring'] AND $event['event_unix_to'] )
-			{
-				$form_type = 'range';
-			}
-			else
-			{
-				$form_type = 'single';
-			}
-
-			/* Private */
-			if ( $event['event_private'] == 1 )
-			{
-				$private = ' selected';
-			}
-			else
-			{
-				$public = ' selected';
-			}
-
-			/* Recur Stuff */
-			$recur_menu .= $event['event_recurring'] == '1' ? "<option value='1' selected='selected'>{$this->lang->words['fv_days']}</option>"
-															: "<option value='1'>{$this->lang->words['fv_days']}</option>";
-
-			$recur_menu .= $event['event_recurring'] == '2' ? "<option value='2' selected='selected'>{$this->lang->words['fv_months']}</option>"
-															: "<option value='2'>{$this->lang->words['fv_months']}</option>";
-
-			$recur_menu .= $event['event_recurring'] == '3' ? "<option value='3' selected='selected'>" . $this->lang->words['fv_years'] . "</option>"
-															: "<option value='3'>{$this->lang->words['fv_years']}</option>";
-			$code   = 'doedit';
-			$button = $this->lang->words['calendar_edit_submit'];
-		}
-
-		/* Do TZ form */
- 		$time_select = "<select name='event_tz' class='forminput'>";
-
- 		/* Loop through the langauge time offsets and names to build our HTML jump box. */
- 		foreach( $this->lang->words as $off => $words )
- 		{
- 			if ( preg_match("/^time_(-?[\d\.]+)$/", $off, $match))
- 			{
-				$time_select .= $match[1] == $tz_offset ? "<option value='{$match[1]}' selected='selected'>{$words}</option>\n"
-												        : "<option value='{$match[1]}'>{$words}</option>\n";
- 			}
- 		}
-
- 		$time_select .= "</select>";
-
-		/* Start off nav */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $this->lang->words['post_new_event'], '' );
-
-		/* Setup Form Type */
-		$event_dates = array();
-
-		if ( $form_type == 'single' )
-		{
-			$event_dates = array(
-									'nd' => $this->calendarGetDayDropDown( $nd ),
-									'nm' => $this->calendarGetMonthDropDown( $nm ),
-									'ny' => $this->calendarGetYearDropDown( $ny ),
-								);
-		}
-		else if ( $form_type == 'range' )
-		{
-			$event_dates = array(
-									'nd' => $this->calendarGetDayDropDown( $nd ),
-									'nm' => $this->calendarGetMonthDropDown( $nm ),
-									'ny' => $this->calendarGetYearDropDown( $ny ),
-									'fd' => $this->calendarGetDayDropDown( $fd ),
-									'fm' => $this->calendarGetMonthDropDown( $fm ),
-									'fy' => $this->calendarGetYearDropDown( $fy ),
-								);
-		}
-		else
-		{
-			$event_dates = array(
-									'nd' => $this->calendarGetDayDropDown( $nd ),
-									'nm' => $this->calendarGetMonthDropDown( $nm ),
-									'ny' => $this->calendarGetYearDropDown( $ny ),
-									'fd' => $this->calendarGetDayDropDown( $fd ),
-									'fm' => $this->calendarGetMonthDropDown( $fm ),
-									'fy' => $this->calendarGetYearDropDown( $fy ),
-									'recur_unit' => $recur_menu,
-								);
-		}
-
-		/* Event Type */
-		$event_type = array(
-								'pub_select'  => $public,
-								'priv_select' => $private,
-								'timezone'    => $time_select,
-								'dropdown'    => $calendar_jump, //$this->calendar_jump,		By using $this->calendar_jump, the selected='selected' wasn't set.
-								'timestuff'   => array(
-														'formtype'  => $form_type,
-														'timestart' => $event['event_timeset'],
-														'divhide'   => $divhide,
-														'checked'   => $divhide == '' ? "checked='checked'" : '' ),
-								'smilies'	  => $event['event_smilies']
-							);
-
-		/* Build the admin group box dataq */
-		if( $this->memberData['g_access_cp'] )
-		{
-			/* INI */
-			$group_choices = "";
-
-			foreach( $this->caches['group_cache'] as $r )
-			{
-				$selected = "";
-
-				if ( isset($event['event_perms']) AND preg_match( "/(^|,)".$r['g_id']."(,|$)/", $event['event_perms'] ) )
-				{
-					$selected = ' selected';
-				}
-
-				$group_choices .= "<option value='".$r['g_id']."'".$selected.">".$r['g_title']."</option>\n";
-			}
-		}
-
-		/* Using RTE? Convert BBCode to HTML */
-		if ( $event['event_content'] )
-		{
-			IPSText::getTextClass( 'bbcode' )->parse_html		= 0;
-			IPSText::getTextClass( 'bbcode' )->parse_smilies	= intval( $event['event_smilies'] );
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'calendar';
-
-			if( IPSText::getTextClass( 'editor' )->method == 'rte' )
-			{
-				$event['event_content'] = IPSText::getTextClass( 'bbcode' )->convertForRTE( $event['event_content'] );
-			}
-			else
-			{
-				$event['event_content'] = IPSText::getTextClass( 'bbcode' )->preEditParse( $event['event_content'] );
-			}
-		}
-
-		/* Output */
-		$this->output .= $this->registry->output->getTemplate( 'calendar' )->calendarEventForm(
-																								$code,
-																								$this->calendar_id,
-																								$form_type,
-																								$event_id,
-																								$event['event_title'],
-																								$this->lang->words['post_new_event'],
-																								$event_dates,
-																								$event_type,
-																								$group_choices,
-																								$button,
-																								IPSText::getTextClass( 'editor' )->showEditor( $event['event_content'], 'Post' )
-																							);
-	}
-
-	/**
-	 * Saves the add/edit calendar event form
-	 *
-	 * @param	string	$type	Either add or edit
-	 * @return	void
-	 */
-	public function calendarEventSave( $type='add' )
-	{
-		/* INIT */
-    	$read_perms   = '*';
-		$end_day      = "";
-		$end_month    = "";
-		$end_year     = "";
-		$end_date     = "";
-		$event_ranged = 0;
-		$event_repeat = 0;
-		$can_edit     = 0;
-
-		$form_type         = $this->request['formtype'];
-		$event_id          = intval( $this->request['event_id'] );
-    	$calendar_id       = intval( $this->request['calendar_id'] );
-    	$allow_emoticons   = $this->request['enableemo'] == 'yes'     ? 1 : 0;
-		$private_event     = $this->request['e_type']    == 'private' ? 1 : 0;
-		$event_title       = IPSText::getTextClass( 'bbcode' )->stripBadWords( trim( $this->request['event_title'] ) );
-		$day               = intval( $this->request['e_day'] );
-		$month             = intval( $this->request['e_month'] );
-		$year              = intval( $this->request['e_year'] );
-		$end_day           = intval( $this->request['end_day'] );
-		$end_month         = intval( $this->request['end_month'] );
-		$end_year          = intval( $this->request['end_year'] );
-		$recur_unit        = intval( $this->request['recur_unit'] );
-		$event_tz          = floatval( $this->request['event_tz'] );
-		$offset            = 0;
-		$event_all_day	   = 0;
-		$event_calendar_id = intval( $this->request['event_calendar_id'] );
-		$set_time		   = intval( $this->request['set_times'] );
-		$hour_min		   = array();
-
-		if( $set_time )
-		{
-			$hour_min	   = strstr( $this->request['event_timestart'], ":" ) ? explode( ":", $this->request['event_timestart'] ) : 0;
-
-			if( intval( $hour_min[0] ) < 0 || intval( $hour_min[0] ) > 23 )
-			{
-				$hour_min[0] = 0;
-			}
-
-			if( intval( $hour_min[1] ) < 0 || intval( $hour_min[1] ) > 59 )
-			{
-				$hour_min[1] = 0;
-			}
-
-			if( $hour_min[0] || $hour_min[1] )
-			{
-				$offset	= $event_tz * 3600;
-			}
-			else
-			{
-				$hour_min 	= array();
-				$offset		= 0;
-			}
-		}
-		else
-		{
-			$event_all_day	= 1;
-		}
-
-		$this->settings['max_post_length'] = $this->settings['max_post_length'] ? $this->settings['max_post_length'] : 2140000;
-		
-		/* Check Permissions */
-		if ( $this->request['auth_key'] != $this->member->form_hash )
-		{
-			$this->registry->output->showError( 'no_permission', 10410, null, null, 403 );
-		}
-
-		/* Check Permissions */
-		if ( ! $this->memberData['member_id'] )
-		{
-			$this->registry->output->showError( 'calendar_no_guests', 10412, null, null, 403 );
-		}
-
-		$this->calendarBuildPermissions( $event_calendar_id );
-
-		if ( ! $this->can_post )
-		{
-			$this->registry->output->showError( 'calendar_no_post_perm', 10413, null, null, 403 );
-		}
-
-		/* WHATDOWEDO? */
-		if ( $type == 'edit' )
-		{
-			/* Check ID */
-			if ( ! $event_id )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 10414, null, null, 404 );
-			}
-
-			/* Get the event */
-			$this->DB->build( array( 'select' => '*', 'from' => 'cal_events', 'where' => "event_id={$event_id}" ) );
-			$this->DB->execute();
-
-			if ( ! $event = $this->DB->fetch() )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 10415, null, null, 404 );
-			}
-
-			/* Do we have permission to edit this event */
-			if ( $this->memberData['member_id'] == $event['event_member_id'] )
-			{
-				$can_edit = 1;
-			}
-			else if ( $this->memberData['g_is_supmod'] == 1 )
-			{
-				$can_edit = 1;
-			}
-
-			if ( $can_edit != 1 )
-			{
-				$this->registry->output->showError( 'calendar_no_edit_perm', 10416, null, null, 403 );
-			}
-		}
-
-		/* Do we have a valid post? */
-		if ( strlen( trim( IPSText::removeControlCharacters( IPSText::br2nl( $_POST['Post'] ) ) ) ) < 1 )
-		{
-			$this->registry->output->showError( 'calendar_post_too_short', 10417 );
-		}
-
-		/* Check the post length */
-		if( IPSText::mbstrlen( $_POST['Post'] ) > ( $this->settings['max_post_length'] * 1024 ) )
-		{
-			$this->registry->output->showError( 'calendar_post_too_long', 10418 );
-		}
-
-		/* Fix up the event title */
-		if( ( IPSText::mbstrlen( $event_title ) < 2 ) or ( ! $event_title ) )
-		{
-			$this->registry->output->showError( 'calendar_no_title', 10419 );
-		}
-
-		if( IPSText::mbstrlen( $event_title ) > 64 )
-		{
-			$this->registry->output->showError( 'calendar_title_too_long', 10420 );
-		}
-
-		/* Are we an admin, and have we set w/groups can see */
-		if( $this->memberData['g_access_cp'] )
-		{
-			if( is_array( $_POST['e_groups'] ) )
-			{
-				foreach( $this->cache->getCache('group_cache') as $gid => $groupCache )
-				{
-					if( $groupCache['g_access_cp'] )
-					{
-						$_POST['e_groups'][] = $gid;
-					}
-				}
-
-				$read_perms = implode( ",", $_POST['e_groups'] );
-			}
-
-			if( $read_perms == "" )
-			{
-				$read_perms = '*';
-			}
-		}
-
-		/* Check dates: Range */
-		if( $form_type == 'range' )
-		{
-			if( $end_year < $year )
-			{
-				$this->registry->output->showError( 'calendar_range_wrong', 10421 );
-			}
-
-			if( $end_year == $year )
-			{
-				if( $end_month < $month )
-				{
-					$this->registry->output->showError( 'calendar_range_wrong', 10422 );
-				}
-
-				if( $end_month == $month AND $end_day <= $day )
-				{
-					$this->registry->output->showError( 'calendar_range_wrong', 10423 );
-				}
-			}
-
-			$_final_unix_from = gmmktime( 0 , 0, 0  , $month    , $day    , $year     ) + $offset;// # Midday
-			$_final_unix_to   = gmmktime( 23, 59, 59, $end_month, $end_day, $end_year ) + $offset;// # End of the day
-
-			$event_ranged = 1;
-			$set_time 	  = 0;
-			$hour_min 	  = array();
-		}
-
-		/* Check dates: Recu */
-		elseif( $form_type == 'recur' )
-		{
-			if( $this->request['recur_unit'] )
-			{
-				$event_repeat = 1;
-			}
-
-			if( $end_year < $year )
-			{
-				$this->registry->output->showError( 'calendar_range_wrong', 10424 );
-			}
-
-			if( $end_year == $year )
-			{
-				if( $end_month < $month )
-				{
-					$this->registry->output->showError( 'calendar_range_wrong', 10425 );
-				}
-
-				if( $end_month == $month AND $end_day <= $day )
-				{
-					$this->registry->output->showError( 'calendar_range_wrong', 10426 );
-				}
-			}
-
-			$hour = 0;
-			$min  = 0;
-			if( $set_time )
-			{
-				if( is_array( $hour_min ) )
-				{
-					$hour = $hour_min[0];
-					$min  = $hour_min[1];
-				}
-			}
-
-			$_final_unix_from = gmmktime( $hour, $min, 0, $month    , $day    , $year     ) + $offset;
-			$_final_unix_to   = gmmktime( $hour, $min, 0, $end_month, $end_day, $end_year ) + $offset;# End of the day
-			$event_recur      = 1;
-		}
-
-		/* Check dates: Single */
-		else
-		{
-			$hour = 0;
-			$min  = 0;
-			if( $set_time )
-			{
-				if( is_array( $hour_min ) )
-				{
-					$hour = $hour_min[0];
-					$min  = $hour_min[1];
-				}
-			}
-
-			$_final_unix_from = gmmktime( $hour, $min, 0, $month, $day, $year  ) - $offset;
-			$_final_unix_to   = 0;
-		}
-
-		/* Do we have a sensible date? */
-		if( ! checkdate( $month, $day , $year ) )
-        {
-			$this->registry->output->showError( 'calendar_invalid_date', 10427 );
-		}
-
-		/* Post process the editor, now we have safe HTML and bbcode */
-		IPSText::getTextClass( 'bbcode' )->parse_html		= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies	= intval($allow_emoticons);
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'calendar';
-
- 		$this->request['Post'] = IPSText::getTextClass( 'editor' )->processRawPost( 'Post' );
- 		$this->request['Post'] = IPSText::getTextClass( 'bbcode' )->preDbParse( $this->request['Post'] );
-
- 		/* Event approved? */
- 		$event_approved = $this->can_avoid_queue ? 1 : ( $this->calendar_cache[ $event_calendar_id ]['cal_moderate'] ? 0 : 1 );
-
- 		if( $private_event == 1 )
- 		{
-	 		$event_approved = 1;
- 		}
-
- 		/* Create new event */
- 		if ( $type == 'add' )
- 		{
- 			$_eventData = array( 'event_calendar_id' => $event_calendar_id,
-								 'event_member_id'   => $this->memberData['member_id'],
-								 'event_content'     => $this->request['Post'],
-								 'event_title'       => $event_title,
-								 'event_smilies'     => $allow_emoticons,
-								 'event_perms'       => $read_perms,
-								 'event_private'     => $private_event,
-								 'event_approved'    => $event_approved,
-								 'event_unixstamp'   => time(),
-								 'event_recurring'   => $recur_unit,
-								 'event_tz'          => $event_tz,
-								 'event_timeset'	 => count( $hour_min ) > 0 ? intval( $hour_min[0] ).":".intval( $hour_min[1] ) : 0,
-								 'event_unix_from'   => $_final_unix_from,
-								 'event_unix_to'     => $_final_unix_to,
-								 'event_all_day'	 => $event_all_day
- 								);
- 			
- 			/* Data Hook Location */
-			IPSLib::doDataHooks( $_eventData, 'calendarAddEvent' );
- 			
-			/* Add it to the DB */
-			$this->DB->insert( 'cal_events', $_eventData );
-
-			/* Recache */
-			$this->calendarCallRecache();
-
-			/* Bounce */
-			if ( $event_approved )
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['new_event_redirect'], $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$event_calendar_id}" );
-			}
-			else
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['new_event_mod'], $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$event_calendar_id}" );
-			}
-		}
-		/* Edit Event */
-		else
-		{
- 			$_eventData = array( 'event_calendar_id' => $event_calendar_id,
-								 'event_content'     => $this->request['Post'],
-								 'event_title'       => $event_title,
-								 'event_smilies'     => $allow_emoticons,
-								 'event_perms'       => $read_perms,
-								 'event_private'     => $private_event,
-								 'event_approved'    => $event_approved,
-								 'event_unixstamp'   => time(),
-								 'event_recurring'   => $recur_unit,
-								 'event_tz'          => $event_tz,
-								 'event_timeset'	 => count( $hour_min ) > 0 ? intval( $hour_min[0] ).":".intval( $hour_min[1] ) : 0,
-								 'event_unix_from'   => $_final_unix_from,
-								 'event_unix_to'     => $_final_unix_to,
-								 'event_all_day'	 => $event_all_day
- 								);
- 			
- 			/* Data Hook Location */
-			IPSLib::doDataHooks( $_eventData, 'calendarEditEvent' );
-			
-			/* Update the database recored */
-			$this->DB->update( 'cal_events', $_eventData, 'event_id='.$event_id );
-
-			/* Recache */
-			$this->calendarCallRecache();
-
-			/* Bounce */
-			if ( $event_approved )
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['edit_event_redirect'] , $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$event_calendar_id}&amp;do=showevent&amp;event_id=$event_id" );
-			}
-			else
-			{
-				$this->registry->output->redirectScreen( $this->lang->words['new_event_mod'] , $this->settings['base_url'] . "app=calendar&amp;module=calendar&amp;cal_id={$event_calendar_id}" );
-			}
-		}
-	}
-
-	/**
-	 * Display the events for a calendar date
-	 *
-	 * @return	void
-	 */
-	public function calendarShowDay()
-    {
-        $day         = intval( $this->request['d'] );
-		$month       = intval( $this->request['m'] );
-		$year        = intval( $this->request['y'] );
-		$seen_ids    = array();
-		$timenow     = gmmktime( 0,0,0, $month, $day, $year);
-		$day_array   = IPSTime::date_getgmdate( $timenow );
-		$printed     = 0;
-		$events_html = '';
-
-		/* Do we have a sensible date */
-		if ( ! checkdate( $month, $day , $year ) )
-		{
-			$this->registry->output->showError( 'calendar_invalid_date_view', 10428 );
-		}
-
-		/* Get the events */
-		$this->calendarGetEventsSQL($month, $year);
-
-		$events = $this->calendarGetDayEvents( $month, $day, $year );
-
-		/* Loop through the events */
-		if ( is_array( $events ) AND count( $events ) )
-		{
-			foreach( $events as $event )
-			{
-				if ( ! isset( $this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] ) OR ! $this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] )
-				{
-					/* Is it a private event? */
-					if ( $event['event_private'] == 1 and $this->memberData['member_id'] != $event['event_member_id'] )
-					{
-						continue;
-					}
-
-					/* Do we have permission to see the event */
-					if( $event['event_perms'] != '*' )
-					{
-						$this_member_mgroups[] = $this->memberData['member_group_id'];
-
-						if( $this->memberData['mgroup_others'] )
-						{
-							$this_member_mgroups = array_merge( $this_member_mgroups, explode( ",", IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
-						}
-
-						$check = 0;
-
-						foreach( $this_member_mgroups as $this_member_mgroup )
-						{
-							if ( preg_match( "/(^|,)".$this_member_mgroup."(,|$)/", $event['event_perms'] ) )
-							{
-								$check = 1;
-							}
-						}
-
-						if( $check == 0 )
-						{
-							continue;
-						}
-					}
-
-					if( !isset( $seen_ids[ $event['eventid'] ] ) OR ! $seen_ids[ $event['eventid'] ] )
-					{
-						$events_html.= $this->calendarMakeEventHTML( $event );
-
-						$printed++;
-						$seen_ids[ $event['event_id'] ] = 1;
-					}
-				}
-			}
-		}
-
-		/* Do we have any printed events? */
-		if( $printed > 0 )
-		{
-			$switch = 1;
-		}
-		else
-		{
-			// Error if no birthdays
-			$switch = 0;
-		}
-
-		if( $this->calendar['cal_bday_limit'] )
-		{
-			$this->output .= $this->calendarMakeBirthdayHTML($month, $day, $switch);
-		}
-
-		/* Navigation */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $this->month_words[$this->chosen_month - 1] ." " . $this->chosen_year, '' );
-		
-		$this->page_title	= $this->month_words[$this->chosen_month - 1] . ' ' . $day . ' - ' . $this->settings['board_name'];
-
-		/* Output */
-		$this->output .= $this->registry->output->getTemplate( 'calendar' )->calendarEventsList( $events_html );
-    }
-
-	/**
-	 * Show a single event based on eventid
-	 *
-	 * @return	void
-	 */
-	public function calendarShowEvent()
-	{
-		/* INIT */
-        $event_id = intval($this->request['event_id']);
-
-		/* Check */
-		if( ! $event_id )
-		{
-			$this->registry->output->showError( 'calendar_event_not_found', 10429, null, null, 404 );
-		}
-
-		/* Get it from the DB */
-		$this->DB->build( array( 'select' => '*', 'from' => 'cal_events', 'where' => "event_id={$event_id}" ) );
-		$this->DB->execute();
-
-		if ( ! $event = $this->DB->fetch() )
-		{
-			$this->registry->output->showError( 'calendar_event_not_found', 10430, null, null, 404 );
-		}
-
-		/* Is it a private event */
-		if ( $event['event_private'] == 1 and $this->memberData['member_id'] != $event['event_member_id'] )
-		{
-			$this->registry->output->showError( 'calendar_event_not_found', 10431, null, null, 403 );
-		}
-		
-		/* approved? */
-		if( ! $this->memberData['g_is_supmod'] )
-		{
-			/* Approved */
-			if ( ! $event['event_approved'] )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 10432.1, null, null, 404 );
-			}
-		}
-		
-		/* Do we have permission to see the event? */
-		if( $event['event_perms'] != '*' )
-		{
-			$this_member_mgroups[] = $this->memberData['member_group_id'];
-
-			if( $this->memberData['mgroup_others'] )
-			{
-				$this_member_mgroups = array_merge( $this_member_mgroups, explode( ",", IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
-			}
-
-			$check = 0;
-
-			foreach( $this_member_mgroups as $this_member_mgroup )
-			{
-				if ( preg_match( "/(^|,)".$this_member_mgroup."(,|$)/", $event['event_perms'] ) )
-				{
-					$check = 1;
-				}
-			}
-
-			if( $check == 0 )
-			{
-				$this->registry->output->showError( 'calendar_event_not_found', 10432, null, null, 404 );
-			}
-		}
-
-		//-----------------------------------------
-		// Highlight...
-		//-----------------------------------------
-
-		if ( $this->request['hl'] )
-		{
-			$event['event_content'] = IPSText::searchHighlight( $event['event_content'], $this->request['hl'] );
-			$event['event_title'] = IPSText::searchHighlight( $event['event_title'], $this->request['hl'] );
-		}
-		
-		/**
-		 * Handle time zones
-		 */
-		$set_offset = 0;
-
-		if( $event['event_timeset'] AND !$event['event_all_day'] AND !$event['event_recurring'] )
-		{
-			$set_offset = $this->settings['time_offset'] * 3600;
-		}
-
-		$event['event_unix_from']	= $event['event_unix_from'] + $set_offset;
-		$event['event_unix_to']		= $event['event_unix_to'] ? $event['event_unix_to'] + $set_offset : 0;
-
-		/* Output */
-		$this->output .= $this->registry->output->getTemplate( 'calendar' )->calendarEventsList( $this->calendarMakeEventHTML( $event ) );
-
-		/* Navigation */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $event['event_title'], '' );
-
-		$this->page_title	= $event['event_title'] . ' - ' . $this->settings['board_name'];
-    }
-
-    /**
-     * Builds the html for an event
-     *
-     * @param	array	Array of event data
-     * @return	string	Parsed event HTML
-     */
-    public function calendarMakeEventHTML( $event )
-	{
-		/* INIT */
-		$approve_button = "";
-
-		/* What kind of event is it */
-		$event_type = $this->lang->words['public_event'];
-
-		if( $event['event_private'] == 1 )
-		{
-			$event_type = $this->lang->words['private_event'];
-		}
-		else if( $event['event_perms'] != '*' )
-		{
-			$event_type = $this->lang->words['restricted_event'];
-		}
-
-		/* Do we have an edit button? */
-		$edit_button = "";
-
-		/* Are we a super dooper moderator? */
-		if( $this->memberData['g_is_supmod'] == 1 )
-		{
-			$edit_button = $this->registry->output->getTemplate('calendar')->cal_edit_del_button( $event['event_id'], $event['event_calendar_id'] );
-		}
-
-		/* Are we the OP of this event? */
-        else if( $this->memberData['member_id'] == $event['event_member_id'] )
-        {
-        	$edit_button = $this->registry->output->getTemplate('calendar')->cal_edit_del_button( $event['event_id'], $event['event_calendar_id'] );
-        }
-
-		/* Get the member details and stuff */
-        if( $this->parsed_members[ $event['event_member_id'] ] )
-        {
-	        $member = $this->parsed_members[ $event['event_member_id'] ];
-        }
-        else
-        {
-			$member = IPSMember::load( $event['event_member_id'], 'all' );
-
-			$member = IPSMember::buildDisplayData( $member, 0 );
-
-			$this->parsed_members[ $member['member_id'] ] = $member;
-		}
-
-		/* Date */
-		// Offset is already applied in the generic getCalendarEventsSql() method
-		//$set_offset = 0;
-
-		//if( $event['event_timeset'] AND !$event['event_all_day'] )
-		//{
-		//	$set_offset = ( $this->memberData['member_id'] ? $this->memberData['time_offset'] : $this->settings['time_offset'] ) * 3600;
-		//}
-
-		/**
-		 * Since set_offset takes into account the member timezone, we need to reverse the submitted time zone
-		 */
-		//$event['event_unix_from']	= $event['event_unix_from'] - ($event['event_tz'] * 3600);
-		//$event['event_unix_to']		= $event['event_unix_to'] ? $event['event_unix_to'] - ($event['event_tz'] * 3600) : 0;
-
-		$event['event_unix_from']	= $event['_unix_from'] ? $event['_unix_from'] : $event['event_unix_from'];
-		$event['event_unix_to']		= $event['_unix_to'] ? $event['_unix_to'] : $event['event_unix_to'];
-		
-		$tmp  = explode( ',', gmdate( 'n,j,Y,G,i', $event['event_unix_from'] ) );
-
-		$event['mday']			= $tmp[1];
-		$event['month']			= $tmp[0];
-		$event['year']			= $tmp[2];
-		$event['month_text']	= $this->month_words[ $tmp[0] - 1 ];
-		$event['_start_date']	= gmstrftime( $this->settings['clock_joined'], $event['event_unix_from'] );
-
-		$this->request['d'] = $event['mday'];
-		$this->request['m'] = $event['month'];
-		$this->request['y'] = $event['year'];
-
-		$type = $this->lang->words['se_normal'];
-		$de   = "";
-
-		if( $event['event_recurring'] == 0 AND $event['event_unix_to'] )
-		{
-			$type = $this->lang->words['se_range'];
-			$de   = $this->lang->words['se_ends'] . ' ' . gmstrftime( $this->settings['clock_joined'], $event['event_unix_to'] );
-		}
-		else if ( $event['event_recurring'] )
-		{
-			$type = $this->lang->words['se_recur'];
-			$de   = $this->lang->words['se_ends'] . ' ' . gmstrftime( $this->settings['clock_joined'], $event['event_unix_to'] );
-		}
-
-		$event['time'] = '';
-		if( $type == $this->lang->words['se_normal'] )
-		{
-			//if( $tmp[3] > 0 )
-			if( !$event['event_all_day'] )
-			{
-				$event['time'] = " {$tmp[3]}:{$tmp[4]}";
-			}
-		}
-
-		/* Moderate */
-		$event['_quicktime'] = intval( $event['month'] ).'-'.intval( $event['mday'] ).'-'.intval( $event['year']);
-
-		if( $this->can_moderate )
-		{
-			if( ! $event['event_approved'] )
-			{
-				$event['_event_css_1'] = 'row2shaded';
-				$event['_event_css_2'] = 'row4shaded';
-				$approve_button = $this->registry->output->getTemplate('calendar')->cal_approve_button($event['event_id'], $event['event_calendar_id'], $event);
-			}
-			else
-			{
-				$event['_event_css_1'] = 'row1';
-				$event['_event_css_2'] = 'row2';
-				$approve_button = $this->registry->output->getTemplate('calendar')->cal_unapprove_button($event['event_id'], $event['event_calendar_id'], $event);
-			}
-		}
-		else
-		{
-			$event['_event_css_1'] = 'row1';
-			$event['_event_css_2'] = 'row2';
-		}
-
-		/* parse bbcode */
-		IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_smilies			= intval( $event['event_smilies'] );
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= 'calendar';
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $event['member_group_id'];
-		IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $event['mgroup_others'];
-
-		$event['event_content'] = IPSText::getTextClass( 'bbcode' )->preDisplayParse( $event['event_content'] );
-
-		/* Return Event HTML */
-		return $this->registry->output->getTemplate('calendar')->cal_show_event($event, $member, $event_type, $edit_button, $approve_button, $type, $de );
-	}
-
-	/**
-	 * Builds the html for a mini calendar
-	 *
-	 * @param	int		$month	Numeric value of month to build
-	 * @param	int		$year	Year to build
-	 * @return	string	Mini-cal HTML
-	 */
-    public function getMiniCalendar( $month, $year )
-    {
-        //-----------------------------------------
-        // Print the main calendar body
-        //-----------------------------------------
-
-        $cal_output = $this->getMonthEvents( $month, $year, 1 );
-
-        return $this->registry->output->getTemplate('calendar')->mini_cal_mini_wrap( $this->month_words[ $month - 1 ], $month, $year, $cal_output, $this->day_words );
-    }
-
-	/**
-	 * Gets birthdays and stores them in the query_bday_cache
-	 *
-	 * @param	integer	$month	Month
-	 * @return	void
-	 */
-	public function calendarGetBirthdaySQL($month)
-	{
-		if( ! isset( $this->query_bday_cache[ $month ] ) OR !is_array( $this->query_bday_cache[ $month ] ) )
-		{
-			// We are just going to query next and previous month
-			// so let's do it in one query and cache it...
-
-			$prev_month = $this->calendarGetPreviousMonth( $month, date("Y") );
-			$next_month = $this->calendarGetNextMonth( $month, date("Y") );
-
-			$this->query_bday_cache[ $month ] 					= array();
-			$this->query_bday_cache[ $next_month['month_id'] ] 	= array();
-			$this->query_bday_cache[ $prev_month['month_id'] ] 	= array();
-
-			$this->DB->build( array( 'select' => 'bday_day, bday_month, member_id, members_display_name', 'from' => 'members', 'where' => 'bday_month IN('.$prev_month['month_id'].','.$month.','.$next_month['month_id'].')' ) );
-			$this->DB->execute();
-
-			while ($r = $this->DB->fetch())
-			{
-				$this->query_bday_cache[ $r['bday_month'] ][ $r['bday_day'] ][] = $r;
-			}
-		}
-    }
-
-	/**
-	 * Generates the sql to query events
-	 *
-	 * @param	integer	$month		Month to get events from
-	 * @param	integer	$year		Year to get events from
-	 * @param	array	$get_cached	Get from cache
-	 * @return	void
-	 */
-	public function calendarGetEventsSQL( $month=0, $year=0, $get_cached=array() )
-	{
-		/* INIT */
-		if( ! count( $get_cached ) )
-		{
-			/*
-				Mini-cal is going to call next month and
-				previous month anyways....let's just pull
-				it all in one query and cache it
-			*/
-			$next_month = $this->calendarGetNextMonth( $month, $year );
-			$prev_month = $this->calendarGetPreviousMonth( $month, $year );
-			$numberdays = date( 't', mktime( 0, 0, 0, $next_month['month_id'], 1, $next_month['year_id'] ) );
-			$timenow    = gmmktime( 0, 0, 1   , $prev_month['month_id'], 1, $prev_month['year_id'] ) - ( 12 * 3600 );
-			$timethen   = gmmktime( 23, 59, 59, $next_month['month_id'], $numberdays, $next_month['year_id'] ) + ( 12 * 3600 );
-			$getcached  = 0;
-		}
-		else
-		{
-			$next_month = array( 'month_id' => 0 );
-			$prev_month = array( 'month_id' => 0 );
-			$timenow    = $get_cached['timenow'];
-			$timethen   = $get_cached['timethen'];
-			list( $month, $day, $year ) = explode( ',', gmdate('n,j,Y', $get_cached['timenow']) );
-			$getcached  = 1;
-		}
-
-		/* Get the events */
-		if( !isset($this->event_cache[ $month ]) OR ! is_array( $this->event_cache[ $month ] ) )
-		{
-			/* Get for cache */
-			if ( $getcached )
-			{
-				$extra = ( isset( $get_cached['cal_id'] ) AND $get_cached['cal_id'] ) ? "event_calendar_id=" . intval( $get_cached['cal_id'] ) . " AND " : '';
-
-				$this->DB->build( array(
-											'select'        => '*',
-											'from'          => 'cal_events',
-											'where'         => "{$extra} event_approved=1
-															AND ( (event_unix_to >= {$timenow} AND event_unix_from <= {$timethen} )
-															OR ( event_unix_to=0 AND event_unix_from >= {$timenow} AND event_unix_from <= {$timethen} )
-															OR ( event_recurring=3 AND " . $this->DB->buildFromUnixtime( 'event_unix_from', '%c' ) . "={$month} AND event_unix_to <= {$timethen} ) )"
-								) 		);
-				$this->DB->execute();
-			}
-			else
-			{
-				/* Get for display */
-				$extra = $this->can_moderate ? "event_approved IN (0,1)" : "event_approved=1";
-
-				$this->DB->build( array(
-											'select'        => '*',
-											'from'          => 'cal_events',
-											'where'         => "event_calendar_id = {$this->calendar_id} AND {$extra}
-															AND ( (event_unix_to >= {$timenow} AND event_unix_from <= {$timethen} )
-															OR ( event_unix_to=0 AND event_unix_from >= {$timenow} AND event_unix_from <= {$timethen} )
-															OR ( event_recurring=3 AND " . $this->DB->buildFromUnixtime( 'event_unix_from', '%c' ) . "={$month} AND event_unix_to <= {$timethen} ) )"
-								) 		);
-				$this->DB->execute();
-			}
-
-			while( $r = $this->DB->fetch() )
-			{
-				/* Private Event */
-				if( $r['event_private'] == 1 AND ! $getcached )
-				{
-					if( ! $this->memberData['member_id'] )
-					{
-						continue;
-					}
-
-					if( $this->memberData['member_id'] != $r['event_member_id'] )
-					{
-						continue;
-					}
-				}
-
-				/* Got Permission? */
-				if( $r['event_perms'] != '*' AND ! $getcached )
-				{
-					$this_member_mgroups[] = $this->memberData['member_group_id'];
-
-					if( $this->memberData['mgroup_others'] )
-					{
-						$this_member_mgroups = array_merge( $this_member_mgroups, explode( ",", IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
-					}
-
-					$check = 0;
-
-					foreach( $this_member_mgroups as $this_member_mgroup )
-					{
-						if( preg_match( "/(^|,)".$this_member_mgroup."(,|$)/", $r['event_perms'] ) )
-						{
-							$check = 1;
-						}
-					}
-
-					if( $check == 0 )
-					{
-						continue;
-					}
-				}
-
-				/* Times */
-				$set_offset = 0;
-
-				if( $r['event_timeset'] AND ! $r['event_all_day'] )
-				{
-					// Bug Fix #21275
-					//$set_offset = ( $this->memberData['member_id'] ? $this->memberData['time_offset'] : $this->settings['time_offset'] ) * 3600;
-					$set_offset = $this->settings['time_offset'] * 3600;
-				}
-
-				$r['_unix_from'] = $r['event_unix_from']    ? $r['event_unix_from'] + $set_offset  : 0;
-				$r['_unix_to']   = $r['event_unix_to'] > 0  ? $r['event_unix_to']   + $set_offset  : 0;
-
-				/* Recurring Events */
-				if( $r['event_recurring'] > 0 )
-				{
-					$r['_unix_from'] = $r['_unix_from'] - $set_offset;
-					$r['_unix_to']   = $r['_unix_to']   - $set_offset;
-				
-					$r['recurring'] = 1;
-
-					/* Get recurring months */
-					$r_month = 0;
-					$r_stamp = $r['event_unix_from'];
-					$r_month = gmdate('n', $r['_unix_from']);
-					$r_year  = gmdate('Y', $r['_unix_from']);
-
-					if( $r_month == $month && ( $r_year == $year OR $r['event_recurring'] == 3 ) && $getcached == 0 )
-					{
-						$this->event_cache[ $r_month ]['recurring'][] = $r;
-					}
-
-					while( $r_stamp < $r['_unix_to'] )
-					{
-						/* Stop Duplicates! */
-						$shouldpass = 1;
-						if( isset( $this->event_cache[ $r_month ]['recurring'] ) AND count( $this->event_cache[ $r_month ]['recurring'] ) )
-						{
-							foreach( $this->event_cache[ $r_month ]['recurring'] as $eventarray )
-							{
-								if( $eventarray['event_id'] == $r['event_id'] )
-								{
-									$shouldpass = 0;
-								}
-							}
-						}
-
-						if( ( ( $r_month != $month AND $r_month != $next_month['month_id'] AND $r_month != $prev_month['month_id'] ) OR $r_year != $year ) AND $getcached == 0 )
-						{
-							$shouldpass = 0;
-						}
-
-						if( $shouldpass == 1 )
-						{
-							$this->event_cache[ $r_month ]['recurring'][] = $r;
-						}
-
-						if( $r['event_recurring'] == 1 )
-						{
-							$r_stamp += 604800;
-						}
-						elseif( $r['event_recurring'] == 2 )
-						{
-							$r_stamp += 86400 * 30;
-						}
-						else
-						{
-							// No need to check year, as month would then match anyways
-							$r_stamp += 31536000;
-						}
-
-						if( $r_month != gmdate('n', $r_stamp) )
-						{
-							$r_month = gmdate('n', $r_stamp);
-						}
-
-						if( $r_year != gmdate('Y', $r_stamp) )
-						{
-							$r_year  = gmdate('Y', $r_stamp);
-						}
-					}
-				}
-
-				//-----------------------------------------
-				// Ranged event?
-				// OK, this is getting silly.....
-				// _checkdate -> gmmtime( 0,0,0 $_checkdate..
-				// was showing a day earlier than allowed
-				//-----------------------------------------
-
-				else if( $r['event_recurring'] == 0 AND $r['_unix_to'] )
-				{
-					$_gotit         = array();
-					$_begin         = gmdate( "z", $r['_unix_from'] );
-					$_checkdate		= gmdate( "z", $r['_unix_to'] );
-					$_checkts		= $r['_unix_from'];
-					$_cur_mo		= $month; // Store to retrieve later if necessary
-					$_tmp           = '';
-					$r['ranged']    = 1;
-
-					/* Lapse over a year? */
-					if( $_checkdate < $_begin )
-					{
-						$tmp_difference = 365 + $_checkdate - $_begin;
-
-						if( $tmp_difference > 0 )
-						{
-							$_checkdate = $_begin + $tmp_difference;
-						}
-
-						unset( $tmp_difference );
-					}
-
-					while( $_begin <= $_checkdate  )
-					{
-						// Did we lapse over the month?
-						// How about the year?  If so,
-						// let's go ahead and reset ourselves
-
-						$realday = gmdate( "j", $_checkts );
-						$month   = gmdate( "n", $_checkts );
-
-						if( ! isset($_gotit[ $month ]) )
-						{
-							$_gotit[ $month ] = array();
-						}
-						if( ! in_array( $realday, $_gotit[ $month ] ) )
-						{
-							$this->event_cache[ $month ]['ranged'][ $realday ][] = $r;
-
-							$_count =  count( $this->event_cache[ $month ]['ranged'][ $realday ] ) - 1;
-							$_tmp   =  $this->event_cache[ $month ]['ranged'][ $realday ][ $_count ];
-							$_gotit[ $month ][] = $realday;
-						}
-						else
-						{
-							if( $r['_unix_to'] != $r['event_unix_from'] )
-							{
-								$this->event_cache[ $month ]['ranged'][ $realday ][] = $_tmp;
-							}
-						}
-						$_begin   += 1;
-						$_checkts += 86400;
-					}
-					$month = $_cur_mo;
-				}
-				/* Single Event */
-				else
-				{
-					$r['single'] = 1;
-
-					/* Make sure correct month is used for cached queries */
-					list( $_month, $_day, $_year ) = explode( ',', gmdate('n,j,Y', $r['_unix_from']  ) );
-
-					$this->event_cache[ $_month ]['single'][ $_day ][] = $r;
-				}
-			}
-		}
-    }
-
-	/**
-	 * Gets the days events
-	 *
-	 * @param	string	$month	Month
-	 * @param	string	$day	Day
-	 * @param	string	$year	Year
-	 * @return	array 	Get events for selected day
-	 */
-	public function calendarGetDayEvents( $month="", $day="", $year="" )
-	{
-		/* INIT */
-		$return = array();
-
-		/* Ranged */
-		if( isset( $this->event_cache[ $month ]['ranged'][ $day ] ) AND is_array( $this->event_cache[ $month ]['ranged'][ $day ] ) and count( $this->event_cache[ $month ]['ranged'][ $day ] ) )
-		{
-			foreach( $this->event_cache[ $month ]['ranged'][ $day ] as $idx => $data )
-			{
-				$return[] = $this->event_cache[ $month ]['ranged'][ $day ][ $idx ];
-			}
-		}
-
-		/* Recurring */
-		if( isset( $this->event_cache[ $month ]['recurring'] ) AND is_array( $this->event_cache[ $month ]['recurring'] ) and count( $this->event_cache[ $month ]['recurring'] ) )
-		{
-			foreach( $this->event_cache[ $month ]['recurring'] as $idx => $data )
-			{
-				if ( $this->getInfoEvents( $data, $month, $day, $year ) )
-				{
-					$return[] = $this->event_cache[ $month ]['recurring'][ $idx ];
-				}
-			}
-		}
-
-		/* Single Day */
-		if( isset( $this->event_cache[ $month ]['single'][ $day ] ) AND is_array( $this->event_cache[ $month ]['single'][ $day ] ) and count( $this->event_cache[ $month ]['single'][ $day ] ) )
-		{
-			foreach( $this->event_cache[ $month ]['single'][ $day ] as $idx => $data )
-			{
-				$return[] = $this->event_cache[ $month ]['single'][ $day ][ $idx ];
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Get event info
-	 *
-	 * @param	array	$event	Event data
-	 * @param	int		$month	Month
-	 * @param	int		$day	Day
-	 * @param	int		$year	Year
-	 * @param	bool	$adj	Adjust or not
-	 * @return	bool
-	 */
-	public function getInfoEvents( $event, $month, $day, $year, $adj=1 )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$_start  = gmmktime(0 , 0 , 0 , $month, $day, $year);
-		$_lunch  = gmmktime(12, 0 , 0 , $month, $day, $year);
-		$_end    = gmmktime(23, 59, 59, $month, $day, $year) + 1;
-		$_month  = gmmktime(0 , 0 , 0 , $month, 1   , $year);
-		$_offset = 0; // - Set at time of save: $event['event_tz'] * 3600;
-
-		//-----------------------------------------
-		// Already seen it?
-		//-----------------------------------------
-
-		if ( $event['event_id'] AND isset($this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ]) AND $this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] )
-		{
-			return FALSE;
-		}
-
-		//-----------------------------------------
-		// Check we're in range
-		//-----------------------------------------
-
-		if ( isset($event['single']) AND $event['single'] )
-		{
-			if ( $month.','.$day.','.$year == gmdate('n,j,Y', $event['_unix_from']) )
-			{
-				$this->shown_events[ $month.'-'.$day.'-'.$year ][ $event['event_id'] ] = 1;
-				return TRUE;
-			}
-		}
-
-		if ( ($event['_unix_to']) < $_start OR ($event['_unix_from'] ) > $_end )
-		{
-			return FALSE;
-		}
-
-		//-----------------------------------------
-		// Check recurring
-		//-----------------------------------------
-
-		if ( $event['event_recurring'] )
-		{
-			if ( $adj AND gmdate('w', $event['_unix_from']) != gmdate('w', $event['event_unix_from']) )
-			{
-				if ( $event['_unix_from'] > $event['event_unix_from'])
-				{
-					$_lunch -= 86400;
-				}
-				else
-				{
-					$_lunch += 86400;
-				}
-			}
-
-			//-----------------------------------------
-			// Weekly
-			//-----------------------------------------
-
-			if ( $event['event_recurring'] == 1 )
-			{
-				if ( gmdate('w', $event['event_unix_from']) != gmdate('w', $_lunch ) )
-				{
-					return FALSE;
-				}
-				else
-				{
-					return TRUE;
-				}
-			}
-
-			//-----------------------------------------
-			// Monthly
-			//-----------------------------------------
-
-			else if ( $event['event_recurring'] == 2 )
-			{
-				if ( gmdate('j', $event['event_unix_from']) == gmdate('j', $_lunch ) )
-				{
-					return TRUE;
-				}
-				else
-				{
-					return FALSE;
-				}
-			}
-
-			//-----------------------------------------
-			// Yearly
-			//-----------------------------------------
-
-			else if ( $event['event_recurring'] == 3 )
-			{
-				if ( (gmdate('j', $event['event_unix_from']) == gmdate('j', $_lunch )) AND (gmdate('n', $event['event_unix_from']) == gmdate('n', $_lunch )) )
-				{
-					return TRUE;
-				}
-				else
-				{
-					return FALSE;
-				}
-			}
-		}
-
-		return TRUE;
-	}
-
-	/**
-	 * Builds the html for the monthly events
-	 *
-	 * @param	int		$month		Numeric value of the month to get events from
-	 * @param	int		$year		Year to get events from
-	 * @param	bool	$minical	Set to 1 if this is for the minicalendar
-	 * @return	string	Calendar HTML output
-	 */
-    public function getMonthEvents( $month, $year, $minical=0 )
-	{
-		//-----------------------------------------
-		// Reset shown events
-		//-----------------------------------------
-
-		$this->shown_events = array();
-
-		//-----------------------------------------
-		// Work out timestamps
-		//-----------------------------------------
-
-		$our_datestamp   = gmmktime( 0,0,0, $month, 1, $year);
-		$first_day_array = IPSTime::date_getgmdate( $our_datestamp );
-
-		if( $this->settings['ipb_calendar_mon'] )
-		{
-		    $first_day_array['wday'] = $first_day_array['wday'] == 0 ? 7 : $first_day_array['wday'];
-		}
-
-		//-----------------------------------------
-		// Get the birthdays from the database
-		//-----------------------------------------
-
-		if ( $this->settings['show_bday_calendar'] )
-		{
-			$birthdays = array();
-
-			$this->calendarGetBirthdaySQL( $month );
-
-			$birthdays = $this->query_bday_cache[ $month ];
-		}
-
-		//-----------------------------------------
-		// Get the events
-		//-----------------------------------------
-
-		$this->calendarGetEventsSQL( $month, $year );
-
-		//-----------------------------------------
-		// Get events
-		//-----------------------------------------
-
-		$seen_days     = array();
-		$seen_ids      = array();
-		$cal_output    = "";
-		$calendar_data = array();
-
-		for( $c = 0 ; $c < 42; $c++ )
-		{
-			//-----------------------------------------
-			// Work out timestamps
-			//-----------------------------------------
-
-			$_year      = gmdate('Y', $our_datestamp);
-			$_month     = gmdate('n', $our_datestamp);
-			$_day       = gmdate('j', $our_datestamp);
-			$day_array  = IPSTime::date_getgmdate( $our_datestamp );
-
-			$check_against = $c;
-
-			if( $this->settings['ipb_calendar_mon'] )
-			{
-		    	$check_against = $c+1;
-			}
-
-			if( ( ( $c ) % 7 ) == 0 )
-			{
-				//-----------------------------------------
-				// Kill the loop if we are no longer on our month
-				//-----------------------------------------
-
-				if( $day_array['mon'] != $month )
-				{
-					break;
-				}
-
-				if( $minical )
-				{
-					$cal_output .= $this->registry->output->getTemplate('calendar')->mini_cal_new_row( $our_datestamp );
-				}
-				else
-				{
-					$cal_output .= $this->registry->output->getTemplate('calendar')->cal_new_row( $our_datestamp );
-				}
-			}
-
-			//-----------------------------------------
-			// Run out of legal days for this month?
-			// Or have we yet to get to the first day?
-			//-----------------------------------------
-
-			if ( ($check_against < $first_day_array['wday']) or ($day_array['mon'] != $month) )
-			{
-				$cal_output .= $minical ? $this->registry->output->getTemplate('calendar')->mini_cal_blank_cell()
-										: $this->registry->output->getTemplate('calendar')->cal_blank_cell();
-			}
-			else
-			{
-				if ( isset($seen_days[ $day_array['yday'] ]) AND $seen_days[ $day_array['yday'] ] == 1 )
-				{
-					continue;
-				}
-
-				$seen_days[ $day_array['yday'] ] = 1;
-				$tmp_cevents     = array();
-				$this_day_events = "";
-				$cal_date        = $day_array['mday'];
-				$queued_event    = 0;
-				$cal_date_queued = "";
-
-				//-----------------------------------------
-				// Get events
-				//-----------------------------------------
-
-				$events = $this->calendarGetDayEvents( $_month, $_day, $_year );
-
-				if ( is_array( $events ) AND count( $events ) )
-				{
-					foreach( $events as $event )
-					{
-						if ( !isset($this->shown_events[ $_month.'-'.$_day.'-'.$_year ][ $event['event_id'] ]) OR !$this->shown_events[ $_month.'-'.$_day.'-'.$_year ][ $event['event_id'] ] )
-						{
-							//-----------------------------------------
-							// Recurring
-							//-----------------------------------------
-
-							if ( isset($event['recurring']) )
-							{
-								$tmp_cevents[ $event['event_id'] ] = $this->registry->output->getTemplate('calendar')->cal_events_wrap_recurring( $event );
-							}
-							else if ( isset($event['single']) )
-							{
-								$tmp_cevents[ $event['event_id'] ] = $this->registry->output->getTemplate('calendar')->cal_events_wrap( $event );
-							}
-							else
-							{
-								$tmp_cevents[ $event['event_id'] ] = $this->registry->output->getTemplate('calendar')->cal_events_wrap_range( $event );
-							}
-
-							$this->shown_events[ $_month.'-'.$_day.'-'.$_year ][ $event['event_id'] ] = 1;
-
-							//-----------------------------------------
-							// Queued events?
-							//-----------------------------------------
-
-							if ( ! $event['event_approved'] AND $this->can_moderate )
-							{
-								$queued_event = 1;
-							}
-						}
-					}
-
-					//-----------------------------------------
-					// How many events?
-					//-----------------------------------------
-
-					if ( count($tmp_cevents) >= $this->calendar['cal_event_limit'] )
-					{
-						$this_day_events = $this->registry->output->getTemplate('calendar')->cal_events_wrap_manual(
-																												  		"cal_id={$this->calendar_id}&amp;do=showday&amp;y=".$day_array['year']."&amp;m=".$day_array['mon']."&amp;d=".$day_array['mday'],
-																												  		sprintf( $this->lang->words['show_n_events'], intval(count($tmp_cevents)) ) );
-					}
-					else if ( count( $tmp_cevents ) )
-					{
-						$this_day_events = implode( "\n", $tmp_cevents );
-					}
-
-					$tmp_cevents[] = array();
-        		}
-
-				//-----------------------------------------
-				// Birthdays
-				//-----------------------------------------
-
-				if ( $this->calendar['cal_bday_limit'] )
-				{
-					if ( isset($birthdays[ $day_array['mday'] ]) and count( $birthdays[ $day_array['mday'] ] ) > 0 )
-					{
-						$no_bdays = count($birthdays[ $day_array['mday'] ]);
-
-						if ( $no_bdays )
-						{
-							if ( $this->calendar['cal_bday_limit'] and $no_bdays <= $this->calendar['cal_bday_limit'] )
-							{
-								foreach( $birthdays[ $day_array['mday'] ] as $user )
-								{
-									$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_events_wrap_manual(
-																												"cal_id={$this->calendar_id}&amp;do=birthdays&amp;y=".$day_array['year']."&amp;m=".$day_array['mon']."&amp;d=".$day_array['mday'],
-																												$user['members_display_name'].$this->lang->words['bd_birthday'] );
-								}
-
-							}
-							else
-							{
-								$this_day_events .= $this->registry->output->getTemplate('calendar')->cal_events_wrap_manual(
-																															 "cal_id={$this->calendar_id}&amp;do=birthdays&amp;y=".$day_array['year']."&amp;m=".$day_array['mon']."&amp;d=".$day_array['mday'],
-																															 sprintf( $this->lang->words['entry_birthdays'], $no_bdays ) );
-							}
-						}
-					}
-        		}
-
-        		//-----------------------------------------
-        		// Show it
-        		//-----------------------------------------
-
-        		if ($this_day_events != "")
-        		{
-        			$cal_date        = "<a href='" . $this->registry->getClass('output')->buildSEOUrl( "app=calendar&amp;module=calendar&amp;cal_id={$this->calendar_id}&amp;do=showday&amp;y=".$year."&amp;m=".$month."&amp;d=".$day_array['mday'], 'public', 'false', 'cal_day' ) ."'>{$day_array['mday']}</a>";
-
-					$cal_date_queued = "" . $this->settings['base_url'] . "app=calendar&amp;cal_id={$this->calendar_id}&amp;modfilter=queued&amp;do=showday&amp;y=".$year."&amp;m=".$month."&amp;d=".$day_array['mday'];
-
-        			$this_day_events = $this->registry->output->getTemplate('calendar')->cal_events_start() . $this_day_events . $this->registry->output->getTemplate('calendar')->cal_events_end();
-        		}
-
-        		if ( ($day_array['mday'] == $this->now_date['mday']) and ($this->now_date['mon'] == $day_array['mon']) and ($this->now_date['year'] == $day_array['year']))
-        		{
-        			$cal_output .= $minical ? $this->registry->output->getTemplate('calendar')->mini_cal_date_cell_today($cal_date, $this_day_events) : $this->registry->output->getTemplate('calendar')->cal_date_cell_today($cal_date, $this_day_events, $cal_date_queued, $queued_event, $this->_buildDayID( $this->chosen_year, $this->chosen_month, $_day ) );
-        		}
-        		else
-        		{
-        			$cal_output .= $minical ? $this->registry->output->getTemplate('calendar')->mini_cal_date_cell($cal_date, $this_day_events) : $this->registry->output->getTemplate('calendar')->cal_date_cell($cal_date, $this_day_events, $cal_date_queued, $queued_event, $this->_buildDayID( $this->chosen_year, $this->chosen_month, $_day ) );
-        		}
-
-        		unset($this_day_events);
-
-        		$our_datestamp += 86400;
-        	}
-        }
-
-    	return $cal_output;
-    }
-
-	/**
-	 * Displays birthdays for the specified date
-	 *
-	 * @return	void
-	 */
-	public function calendarShowBirthdays()
-	{
-		/* INIT */
-		$day   = intval( $this->request['d'] );
-		$month = intval( $this->request['m'] );
-		$year  = intval( $this->request['y'] );
-
-		/* Do we have a sensible date */
-		if( ! checkdate( $month, $day , $year ) )
-        {
-			$this->registry->output->showError( 'calendar_invalid_date_view', 10433 );
-		}
-
-		/* Output */
-        $this->output .= $this->registry->output->getTemplate('calendar')->calendarEventsList( $this->calendarMakeBirthdayHTML( $month, $day ) );
-
-        /* Navigation */
-		$this->registry->output->addNavigation( $this->lang->words['page_title'], 'app=calendar', 'calendar', 'app=calendar' );
-		$this->registry->output->addNavigation( $this->calendar['cal_title']    , 'app=calendar&amp;module=calendar&amp;cal_id=' . $this->calendar_id );
-		$this->registry->output->addNavigation( $this->lang->words['cal_birthdays'] ." " . $day ." " . $this->month_words[$this->chosen_month - 1] . " " . $this->chosen_year, '' );
-    }
-
-	/**
-	 * Make Birthday HTML (return HTML for bdays)
-	 *
-	 * @param	integer	$month	Month
-	 * @param	integer	$day	Day
-	 * @param	bool	$switch Don't show an error page if no birthdays, just return
-	 * @return	string	HTML output
-	 */
-	public function calendarMakeBirthdayHTML($month, $day, $switch=0)
-	{
-		/* Check birthday setting */
-		if( ! $this->settings['show_bday_calendar'] )
-		{
-			return;
-		}
-
-		/* Is it a leap yar? */
-		if( ! date( "L" ) )
-		{
-			if( $month == "2" AND $day == "28" )
-			{
-				$where_string = "bday_month=".$month." AND (bday_day={$day} OR bday_day=29)";
-			}
-			else
-			{
-				$where_string = 'bday_month='.$month . " AND bday_day={$day}";
-			}
-		}
-		else
-		{
-			$where_string = 'bday_month='.$month . " AND bday_day={$day}";
-		}
-
-		/* Get the birthdays from the database */
-		$birthdays = array();
-		$output    = "";
-
-		$this->DB->build( array( 'select' => 'bday_day, bday_month, bday_year, member_id, members_display_name, members_seo_name', 'from' => 'members', 'where' => $where_string ) );
-		$this->DB->execute();
-
-		if( ! $this->DB->getTotalRows() )
-		{
-			if( $switch == 1 )
-			{
-				return;
-			}
-			else
-			{
-				$this->registry->output->showError( 'calendar_no_birthdays', 10434 );
-			}
-		}
-		else
-		{
-			/* Loop through the birthdays */
-			$rows = array();
-
-			while( $r = $this->DB->fetch() )
-			{
-				$age = $r['bday_year'] ? $this->chosen_year - $r['bday_year'] : 0;
-				$rows[] = array( 'uid' => $r['member_id'], 'seoname' => $r['members_seo_name'], 'uname' => $r['members_display_name'], 'age' => $age );
-			}
-		}
-
-		return $this->registry->output->getTemplate( 'calendar' )->calendarBirthdayList( $rows );
-	}
-
-	/**
-	 * Builds a month dropdown
-	 *
-	 * @param	integer	$month	Month to select by default
-	 * @return	string	Dropdown HTML
-	 */
-	protected function calendarGetMonthDropDown( $month=0 )
-	{
-		$return = "";
-
-		if( $month == "" )
-		{
-			$month = $this->chosen_month;
-		}
-
-		for( $x = 1 ; $x <= 12 ; $x++ )
-		{
-			$return .= "\t<option value='$x'";
-			$return .= ($x == $month) ? " selected='selected'" : "";
-			$return .= ">".$this->month_words[$x-1]."</option>\n";
-		}
-
-		return $return;
-	}
-
-
-	/**
-	 * Builds a year dropdown
-	 *
-	 * @param	integer	$year	Year to select by default
-	 * @return	string	HTML dropdown
-	 */
-	protected function calendarGetYearDropDown( $year=0 )
-	{
-		$return = "";
-
-		$this->settings['start_year'] = ( $this->settings['start_year'] ) ? $this->settings['start_year'] : 2001;
-		$this->settings['year_limit'] = ( $this->settings['year_limit'] ) ? $this->settings['year_limit'] : 5;
-
-		if( $year == "" )
-		{
-			$year = $this->chosen_year;
-		}
-
-		if( ($this->now_date['year'] + $this->settings['year_limit']) < $year )
-		{
-			$difference = $year - ($this->now_date['year'] + $this->settings['year_limit']);
-
-			if( $difference < 50 )
-			{
-				$this->settings[ 'year_limit'] =  $this->settings['year_limit'] + $difference ;
-			}
-		}
-
-		for( $x = $this->settings['start_year'], $xy = $this->now_date['year'] + $this->settings['year_limit'] ; $x <= $xy ; $x++ )
-		{
-			$return .= "\t<option value='$x'";
-			$return .= ($x == $year) ? " selected='selected'" : "";
-			$return .= ">".$x."</option>\n";
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Builds a day dropdown
-	 *
-	 * @param	integer	$day	day to select by default
-	 * @return	string	HTML dropdown
-	 */
-	protected function calendarGetDayDropDown( $day=0 )
-	{
-		if( $day == "" )
-		{
-			$day = $this->now_date['mday'];
-		}
-
-		$return = "";
-
-		for( $x = 1 ; $x <= 31 ; $x++ )
-		{
-			$return .= "\t<option value='$x'";
-			$return .= ($x == $day) ? " selected='selected'" : "";
-			$return .= ">".$x."</option>\n";
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Figures out what the next month on the calendar is
-	 *
-	 * @param	integer	$month	Current Month
-	 * @param	integer	$year	Current Year
-	 * @return	array 	Month data
-	 */
-	protected function calendarGetNextMonth( $month, $year )
-	{
-		$next_month = array();
-
-		$next_month['year_id']    = $year;
-
-		$next_month['month_name'] = $this->month_words[$month];
-		$next_month['month_id']   = $month + 1;
-
-		if ($next_month['month_id'] > 12 )
-		{
-			$next_month['month_name'] = $this->month_words[0];
-			$next_month['month_id']   = 1;
-			$next_month['year_id']    = $year + 1;
-		}
-
-		return $next_month;
-	}
-
-    /**
-     * Recaches calendars
-     *
-     * @return	void
-     */
-	protected function calendarCallRecache()
-    {
-    	$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' , 'admin_calendar_calendar_calendars' );
-    	$calendars   = new $classToLoad();
-		$calendars->makeRegistryShortcuts( $this->registry );
-		$calendars->calendarRebuildCache( 0 );
-    }
-
-	/**
-	 * Figures out what the previous month on the calendar is
-	 *
-	 * @param	integer	$month	Current Month
-	 * @param	integer	$year	Current Year
-	 * @return	array 	Month data
-	 */
-	protected function calendarGetPreviousMonth($month, $year)
-	{
-		$prev_month               = array();
-		$prev_month['year_id']    = $year;
-		$prev_month['month_id']   = $month - 1;
-		$prev_month['month_name'] = $this->month_words[$month - 2];
-
-		if( $this->chosen_month == 1 )
-		{
-			$prev_month['month_name'] = $this->month_words[11];
-			$prev_month['month_id']   = 12;
-			$prev_month['year_id']    = $year - 1;
-
-		}
-
-		return $prev_month;
-    }
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/defaultSection.php b/upload/admin/applications_addon/ips/calendar/modules_public/calendar/defaultSection.php
deleted file mode 100644
index 362d3f41..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/defaultSection.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Default calendar section
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $ 
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'calendars';
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/index.html b/upload/admin/applications_addon/ips/calendar/modules_public/calendar/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_public/calendar/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/modules_public/index.html b/upload/admin/applications_addon/ips/calendar/modules_public/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/modules_public/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/index.html b/upload/admin/applications_addon/ips/calendar/setup/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/index.html b/upload/admin/applications_addon/ips/calendar/setup/versions/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/install/index.html b/upload/admin/applications_addon/ips/calendar/setup/versions/install/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/install/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_inserts.php b/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_inserts.php
deleted file mode 100644
index d3b22c9d..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_inserts.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-# CALENDARS
-$INSERT[] ="INSERT INTO cal_calendars (cal_id, cal_title, cal_moderate, cal_position, cal_event_limit, cal_bday_limit, cal_rss_export, cal_rss_export_days, cal_rss_export_max, cal_rss_update, cal_rss_update_last, cal_rss_cache, cal_permissions) VALUES (1, 'О�новной календарь', 1, 0, 2, 1, 1, 14, 20, 1440, UNIX_TIMESTAMP(), '', 'a:3:{s:9:\"perm_read\";s:1:\"*\";s:9:\"perm_post\";s:3:\"4,3\";s:10:\"perm_nomod\";s:0:\"\";}');";
-$INSERT[] ="INSERT INTO permission_index VALUES(NULL, 'calendar', 'calendar', 1, ',4,2,3,6,', ',4,3,6,', ',4,6,', '', '', '', '', 0, 0, NULL)";
-
-$INSERT[] = "INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин календар�', 'Плагин отправки жалоб на �обыти� календар�', 'Invision Power Services, Inc', '', 'v1.0', 'calendar', ',1,2,3,4,6,', ',4,6,', 'N;', 1, 'calendar');";
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_tables.php b/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_tables.php
deleted file mode 100644
index d669cc2a..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_tables.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
-* Installation Schematic File
-* Generated on Thu, 19 Feb 2009 08:15:47 +0000 GMT
-*/
-$TABLE[] = "CREATE TABLE cal_calendars (
-  cal_id int(10) unsigned NOT NULL auto_increment,
-  cal_title varchar(255) NOT NULL default '0',
-  cal_moderate tinyint(1) NOT NULL default '0',
-  cal_position int(3) NOT NULL default '0',
-  cal_event_limit int(2) unsigned NOT NULL default '0',
-  cal_bday_limit int(2) unsigned NOT NULL default '0',
-  cal_rss_export tinyint(1) NOT NULL default '0',
-  cal_rss_export_days int(3) unsigned NOT NULL default '0',
-  cal_rss_export_max tinyint(1) NOT NULL default '0',
-  cal_rss_update int(3) unsigned NOT NULL default '0',
-  cal_rss_update_last int(10) unsigned NOT NULL default '0',
-  cal_rss_cache mediumtext,
-  cal_permissions mediumtext,
-  PRIMARY KEY  (cal_id),
-  KEY cal_rss_export (cal_rss_export)
-);";
-$TABLE[] = "CREATE TABLE cal_events (
-  event_id int(10) unsigned NOT NULL auto_increment,
-  event_calendar_id int(10) unsigned NOT NULL default '0',
-  event_member_id mediumint(8) unsigned NOT NULL default '0',
-  event_content mediumtext,
-  event_title varchar(255) NOT NULL default '',
-  event_smilies tinyint(1) NOT NULL default '0',
-  event_perms text,
-  event_private tinyint(1) NOT NULL default '0',
-  event_approved tinyint(1) NOT NULL default '0',
-  event_unixstamp int(10) unsigned NOT NULL default '0',
-  event_recurring int(2) unsigned NOT NULL default '0',
-  event_tz VARCHAR(4) NOT NULL default '0',
-  event_timeset varchar(6) NOT NULL default '0',
-  event_unix_from int(10) unsigned NOT NULL default '0',
-  event_unix_to int(10) unsigned NOT NULL default '0',
-  event_all_day tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (event_id),
-  KEY daterange ( event_approved , event_unix_from , event_unix_to ),
-  KEY approved (event_calendar_id,event_approved)
-);";
-?>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_uninstall.php b/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_uninstall.php
deleted file mode 100644
index 1e734f3d..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/calendar_mysql_uninstall.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$QUERY[]	= "DELETE FROM rc_classes WHERE my_class='calendar';";
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/index.html b/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/setup/versions/install/sql/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/skin_cp/cp_skin_calendar.php b/upload/admin/applications_addon/ips/calendar/skin_cp/cp_skin_calendar.php
deleted file mode 100644
index 0cd22803..00000000
--- a/upload/admin/applications_addon/ips/calendar/skin_cp/cp_skin_calendar.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Calendar skin file
- * Last Updated: $Date: 2010-11-15 11:39:10 -0500 (Mon, 15 Nov 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 7185 $
- */
- 
-class cp_skin_calendar extends output
-{
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Form to add/edit a calendar
- *
- * @access	public
- * @param	array 		Form elements
- * @param	string		Form title
- * @param	string		Action code
- * @param	string		Button text
- * @param	array 		Calendar data
- * @return	string		HTML
- */
-public function calendarForm($form, $title, $formcode, $button, $calendar) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['c_title']}</h2>
-</div>
-
-
-<form id='adminform' action='{$this->settings['base_url']}&amp;{$this->form_code}&amp;do=$formcode&amp;cal_id={$calendar['cal_id']}' method='post'>
-	<input type='hidden' name='_admin_auth_key' value='{$this->registry->getClass('adminFunctions')->_admin_auth_key}' />
-	
-	<div class='acp-box'>
-		<h3>$title</h3>
-		
-		<ul class='acp-form alternate_rows'>
-			<li>
-				<label>{$this->lang->words['c_block_title']}</label>
-				{$form['cal_title']}
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_mod']}<span class='desctext'>{$this->lang->words['c_block_mod_info']}</span></label>
-				{$form['cal_moderate']}
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_limit']}<span class='desctext'>{$this->lang->words['c_block_limit_info']}</span></label>
-				{$form['cal_event_limit']}
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_bday']}<span class='desctext'>{$this->lang->words['c_block_bday_info']}</span></label>
-				{$form['cal_bday_limit']}
-			</li>
-			
-			<li><label class='head'>{$this->lang->words['c_block_rss']}</label></li>
-     
-			<li>
-				<label>{$this->lang->words['c_block_enable']}<span class='desctext'>{$this->lang->words['c_block_enabled_info']}</span></label>
-				<td width='60%' class='tablerow2'>{$form['cal_rss_export']}</td>
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_forthcoming']}</label>
-				{$form['cal_rss_export_days']}
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_max']}<span class='desctext'>{$this->lang->words['c_block_max_info']}</span></label>
-				{$form['cal_rss_export_max']}
-			</li>
-			<li>
-				<label>{$this->lang->words['c_block_freq']}<span class='desctext'>{$this->lang->words['c_block_freq_info']}</span></label>
-				{$form['cal_rss_update']}
-			</li>
- 		</ul>
- 		
- 		{$form['perm_matrix']}
- 		
- 		<div class='acp-actionbar'>
- 			<div class='centeraction'>
- 				<input type='submit' class='button primary' value='$button' />
- 			</div>
- 		</div>
-	</div>
-</form>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Calendar overview screen
- *
- * @access	public
- * @param	array 		Calendars
- * @return	string		HTML
- */
-public function calendarOverviewScreen( $rows ) {
-
-$IPBHTML = "";
-
-//--starthtml--//
-$IPBHTML .= <<<HTML
-<div class='section_title'>
-	<h2>{$this->lang->words['c_title']}</h2>
-	<!-- ACPNOTE: Rikki - need these two icons -->
-	<ul class='context_menu'>
-		<li>
-			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=calendar_add' title='{$this->lang->words['c_addcal']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/add.png' alt='' />
-				{$this->lang->words['c_addcal']}
-			</a>
-		</li>
-		<li>
-			<a href='{$this->settings['base_url']}{$this->form_code}&amp;do=calendar_rebuildcache' title='{$this->lang->words['c_recachecal']}'>
-				<img src='{$this->settings['skin_acp_url']}/_newimages/icons/arrow_refresh.png' alt='' />
-				{$this->lang->words['c_recachecal']}
-			</a>
-		</li>
-	</ul>
-</div>
-
-<div class='acp-box'>
-	<h3>{$this->lang->words['c_calendars']}</h3>
-
-		<ul id='sortable_handle' class='alternate_rows'>
-HTML;
-
-foreach( $rows as $r )
-{
-$IPBHTML .= <<<HTML
-			<li id='calendar_{$r['cal_id']}'>
-				<table style='width: 100%'>
-					<tr>
-						<td style='width: 3%'>
-							<div class='draghandle'><img src='{$this->settings['skin_acp_url']}/_newimages/drag_icon.png' alt='' /></div>
-						</td>
-						<td style='width: 93%'>
-							<strong>{$r['cal_title']}</strong><br />
-						</td>
-						<td style='width: 4%'>
-							<img id="menu{$r['cal_id']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['c_options']}' class='ipbmenu' />
-							<ul class='acp-menu' id='menu{$r['cal_id']}_menucontent'>
-								<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=calendar_edit&amp;cal_id={$r['cal_id']}'>{$this->lang->words['c_editcal']}</a></li>
-								<li class='icon refresh'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=calendar_rss_cache&amp;cal_id={$r['cal_id']}'>{$this->lang->words['c_rebuildcal']}</a></li>
-								<li class='icon delete'><a href='#' onclick='return acp.confirmDelete("{$this->settings['base_url']}{$this->form_code}&amp;do=calendar_delete&amp;cal_id={$r['cal_id']}");'>{$this->lang->words['c_deletecal']}</a></li>
-							</ul>
-						</td>
-					</tr>
-				</table>
-			</li>
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-		</ul>
-
-</div>
-<script type='text/javascript'>
-
-window.onload = function() {
-	Sortable.create( 'sortable_handle', { revert: true, format: 'calendar_([0-9]+)', onUpdate: dropItLikeItsHot, handle: 'draghandle' } );
-};
-
-dropItLikeItsHot = function( draggableObject, mouseObject )
-{
-	var options = {
-					method : 'post',
-					parameters : Sortable.serialize( 'sortable_handle', { tag: 'li', name: 'calendars' } )
-				};
- 
-	new Ajax.Request( "{$this->settings['base_url']}&{$this->form_code_js}&do=calendar_move&md5check={$this->registry->adminFunctions->getSecurityKey()}".replace( /&amp;/g, '&' ), options );
-
-	return false;
-};
-</script>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * RSS recurring event
- *
- * @access	public
- * @param	array 		Event data
- * @return	string		HTML
- */
-public function calendar_rss_recurring( $event ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_recurring']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * RSS ranged event
- *
- * @access	public
- * @param	array 		Event data
- * @return	string		HTML
- */
-public function calendar_rss_range( $event ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_ranged']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * RSS single day event
- *
- * @access	public
- * @param	array 		Event data
- * @return	string		HTML
- */
-public function calendar_rss_single( $event ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<HTML
-<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_singleday']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}</p>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-}
diff --git a/upload/admin/applications_addon/ips/calendar/skin_cp/index.html b/upload/admin/applications_addon/ips/calendar/skin_cp/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/skin_cp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/tasks/calendarevents.php b/upload/admin/applications_addon/ips/calendar/tasks/calendarevents.php
deleted file mode 100644
index 40c738eb..00000000
--- a/upload/admin/applications_addon/ips/calendar/tasks/calendarevents.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Task: Gathers birthday and calendar events for a few days and caches them
- * Last Updated: $LastChangedDate: 2010-10-20 13:11:07 -0400 (Wed, 20 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Calendar
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 7005 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class task_item
-{
-	/**
-	 * Parent task manager class
-	 *
-	 * @var		object
-	 */
-	protected $class;
-
-	/**
-	 * This task data
-	 *
-	 * @var		array
-	 */
-	protected $task			= array();
-
-	/**
-	 * Prevent logging
-	 *
-	 * @var		boolean
-	 */
-	protected $restrict_log	= false;
-	
-	/**#@+
-	 * Registry Object Shortcuts
-	 *
-	 * @var		object
-	 */
-	protected $registry;
-	protected $DB;
-	protected $settings;
-	protected $request;
-	protected $lang;
-	protected $member;
-	protected $memberData;
-	protected $cache;
-	protected $caches;
-	/**#@-*/
-	
-	/**
-	 * Constructor
-	 *
-	 * @param 	object		ipsRegistry reference
-	 * @param 	object		Parent task class
-	 * @param	array 		This task data
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry, $class, $task )
-	{
-		/* Make registry objects */
-		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-
-		$this->class	= $class;
-		$this->task		= $task;
-	}
-	
-	/**
-	 * Run this task
-	 *
-	 * @return	void
-	 */
-	public function runTask()
-	{
-		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
-
-		//-----------------------------------------
-		// Load and recache info
-		//-----------------------------------------
-		
-		define( 'IN_ACP', 1 );
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' , 'admin_calendar_calendar_calendars' );
-		$calendars   = new $classToLoad();
-		$calendars->makeRegistryShortcuts( $this->registry );
-		$calendars->calendarRebuildCache( 0 );
-		
-		//-----------------------------------------
-		// Log to log table - modify but dont delete
-		//-----------------------------------------
-		
-		if ( ! $this->restrict_log )
-		{
-			$this->class->appendTaskLog( $this->task, $this->lang->words['task_calendars'] );
-		}
-		
-		//-----------------------------------------
-		// Unlock Task: DO NOT MODIFY!
-		//-----------------------------------------
-		
-		$this->class->unlockTask( $this->task );
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/tasks/index.html b/upload/admin/applications_addon/ips/calendar/tasks/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/tasks/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/xml/admin_calendar_language_pack.xml b/upload/admin/applications_addon/ips/calendar/xml/admin_calendar_language_pack.xml
deleted file mode 100644
index e858380e..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/admin_calendar_language_pack.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<languageexport>
-  <languagegroup>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_noid</word_key>
-      <word_default>No ID was passed. Please try again.</word_default>
-      <word_custom>ID не найден. Попробуйте �нова.</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_removed</word_key>
-      <word_default>Calendar Removed</word_default>
-      <word_custom>Календарь удален</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_completeform</word_key>
-      <word_default>You must complete the entire form.</word_default>
-      <word_custom>Вы не указали название календар�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_added</word_key>
-      <word_default>New Calendar Added</word_default>
-      <word_custom>Календарь добавлен</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_edited</word_key>
-      <word_default>Calendar Edited</word_default>
-      <word_custom>Календарь изменен</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_editbutton</word_key>
-      <word_default>Edit Calendar </word_default>
-      <word_custom>Изменение календар� </word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_mod</word_key>
-      <word_default><![CDATA[<strong>Calendar: Enable Moderation</strong>]]></word_default>
-      <word_custom>Включить модерацию</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_title</word_key>
-      <word_default><![CDATA[<strong>Calendar: Title</strong>]]></word_default>
-      <word_custom>�азвание календар�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_recached</word_key>
-      <word_default>Calendar Events Recached</word_default>
-      <word_custom>Кеш �обытий календар� у�пешно обновлен&#13;
-</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_rssrecached</word_key>
-      <word_default>Calendar Events RSS Recached</word_default>
-      <word_custom>Кеш RSS календар� у�пешно обновлен&#13;
-</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_title</word_key>
-      <word_default>Calendar Manager</word_default>
-      <word_custom>Управление календарем</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_savebutton</word_key>
-      <word_default>Save Changes</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_limit</word_key>
-      <word_default><![CDATA[<strong>Calendar: Event Limit</strong>]]></word_default>
-      <word_custom>Лимит �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_limit_info</word_key>
-      <word_default><![CDATA[This is the number of events listed per day before they are replaced by a single link to the day's events]]></word_default>
-      <word_custom>Чи�ло показываемых �обытий за день, е�ли �обытий будет больше, то будет отображать�� ��ылка на в�е �обыти� дн�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_bday</word_key>
-      <word_default><![CDATA[<strong>Calendar: Birthday Limit</strong>]]></word_default>
-      <word_custom>Лимит именинников</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_bday_info</word_key>
-      <word_default><![CDATA[This is the number of birthdays listed per day before they are replaced by a single link<br />Enter 0 to not show birthdays at all]]></word_default>
-      <word_custom>Чи�ло показываемых именинников за день, е�ли их будет больше, то будет отображать�� ��ылка на в�ех именинников&#13;
-Введите 0, чтобы не показывать именинников вообще</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_rss</word_key>
-      <word_default><![CDATA[<strong>RSS Options</strong>]]></word_default>
-      <word_custom>RSS Опции</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_max</word_key>
-      <word_default><![CDATA[<strong>RSS: Export Maximum Events</strong>]]></word_default>
-      <word_custom>Количе�тво �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_enable</word_key>
-      <word_default><![CDATA[<strong>RSS: Enable</strong>]]></word_default>
-      <word_custom>Включить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_enable_info</word_key>
-      <word_default><![CDATA[If enabled, all <em>n</em> forthcoming events (based on GMT time) that have guest read permission will be exported]]></word_default>
-      <word_custom><![CDATA[Е�ли включено, то в�е <em>n</em> будущих �обытий (GMT врем�), которые имеют ма�ку до�тупа дл� чтени� го�т�ми будут �к�портированы в RSS]]></word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_forthcoming</word_key>
-      <word_default><![CDATA[<strong>RSS: Forthcoming Days</strong>]]></word_default>
-      <word_custom>За �колько дней до �обыти� выводить его?</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>perm_calendar_nomod</word_key>
-      <word_default>Bypass Moderation</word_default>
-      <word_custom>Публикаци� без проверки</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>perm_calendar_start</word_key>
-      <word_default>Create Events</word_default>
-      <word_custom>Создание �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_max_info</word_key>
-      <word_default>The maximum number of events exported</word_default>
-      <word_custom>Мак�имальное количе�тво �к�портируемых �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_freq</word_key>
-      <word_default><![CDATA[<strong>RSS: Update Frequency</strong>]]></word_default>
-      <word_custom>Ча�тота обновлени�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_freq_info</word_key>
-      <word_default>The number of minutes between RSS cache rebuilding</word_default>
-      <word_custom>Количе�тво минут между обновлением кеша RSS</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_options</word_key>
-      <word_default>Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_calendars</word_key>
-      <word_default>Calendars</word_default>
-      <word_custom>Календари</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_rebuildcal</word_key>
-      <word_default>Rebuild Calendar RSS Export...</word_default>
-      <word_custom>Обновление RSS кеша</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_editcal</word_key>
-      <word_default>Edit Calendar...</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_deletecal</word_key>
-      <word_default>Delete Calendar...</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_addcal</word_key>
-      <word_default>Add New Calendar</word_default>
-      <word_custom>Добавить календарь</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_recachecal</word_key>
-      <word_default>Recache Calendar Events</word_default>
-      <word_custom>Обновление кеша �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_block_mod_info</word_key>
-      <word_default><![CDATA[If enabled, all groups which are not included in the 'Avoid Moderation Queue' will have their events entered into the moderation queue for approval.]]></word_default>
-      <word_custom>Е�ли включено, �обыти� от в�ех групп пользователей будут попадать на проверку модераторами перед публикацией.</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_recurring</word_key>
-      <word_default>Recurrent Event</word_default>
-      <word_custom>Повтор�ющее�� �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_fromcolon</word_key>
-      <word_default>From:</word_default>
-      <word_custom>От: </word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_ranged</word_key>
-      <word_default>Ranged Event</word_default>
-      <word_custom>Многодневное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_tocolon</word_key>
-      <word_default>To:</word_default>
-      <word_custom>Кому: </word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>c_singleday</word_key>
-      <word_default>Single Day Event On:</word_default>
-      <word_custom>Однодневное �обытие:</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>admin_calendar</word_pack>
-      <word_key>perm_calendar_view</word_key>
-      <word_default>Show Calendar</word_default>
-      <word_custom>Про�мотр календар�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-  </languagegroup>
-</languageexport>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_help.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_help.xml
deleted file mode 100644
index 0a94b6cc..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_help.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<export>
-  <help>
-    <row>
-      <title>Календарь</title>
-      <text><![CDATA[Данный форум имеет �об�твенную в�троенную функцию календар� (добавление в него пользовател�ми �обытий), до�туп к которой можно получить при помощи ��ылки "Календарь", ра�положенной в верхней ча�ти форума. <br />
-<br />
-<strong>�авигаци� календар�</strong><br />
-<br />
-<em>Бы�трый переход</em><br />
-В верхней ча�ти �траниц в меню е�ть ��ылка на календарь, по которой можно бы�тро попа�ть в него. С помощью выпадающего меню, ра�положенного в левой колонке, можно легко про�мотреть нужные �обыти� за конкретный период.<br />
-<br />
-Там также е�ть другие ��ылки дл� бы�трого перехода к текущей дате.<br />
-<br />
-<em>Мини-календари</em><br />
-Чуть ниже блока бы�трого перехода наход�т�� мини-календари �о ��ылками на �обыти� конкретных дней предыдущего и будущего ме��цев. Е�ли вы про�матриваете конкретную неделю, вы также будете видеть мини-календарь, на котором текущий день будет отмечен.<br />
-<br />
-Вы также можете кликнуть на кнопку <img src='{style_image_url}/next.png' /> дл� про�мотра �обытий по дн�м выбранной недели.<br />
-<br />
-<em>О�новной календарь</em><br />
-В центральной ча�ти �траницы находит�� выбранный календарь. Текуща� дата выдел�ет��.<br />
-<br />
-Событи� и дни рождени� указывают�� внутри квадратных блоков. Дл� про�мотра более подробной информации нужно кликнуть на информацию в блоках. Е�ли на один день запи�ано очень много �обытий, то вме�то кучи ��ылок, будет одна ��ылка на про�мотр в�ех �обытий за �тот день.<br />
-<br />
-Вы можете передвигать�� по ме��цам � помощью кнопок "� Предыдущий ме��ц" и "→ Следующий ме��ц".<br />
-<br />
-<br />
-<strong>Добавление новых �обытий</strong><br />
-Дл� добавлени� новых �обытий выберите одну из трех кнопок (� разными типами �обытий) в верхней ча�ти календар�:<br />
-<ul><li><img src='{style_image_url}/cal_recurring.png' />Повтор�ющие�� �обыти� - однодневные �обыти�, которые периодиче�ки повтор�ют�� в календаре: еженедельно, ежеме��чно, ежегодно.</li><li><img src='{style_image_url}/cal_ranged.png' />Многодневное �обытие - �обытие, дл�щее�� не�колько дней. Чтобы добавить такое �обытие, кроме даты начала, как и в предыдущем �лучае, нужно еще выбрать дату окончани� �обыти�. Также �уще�твует опци�, позвол�юща� выделить �обытие в календаре, ее полезно и�пользовать, когда в календаре за раз отображает�� не�колько длительных �обытий..</li><li><img src='{style_image_url}/cal_single.png' />Однодневное, единоразовое �обытие - его можно добавить при помощи первой опции, про�то указав дату отображени� �обыти�.</li></ul><br />
-Соответ�твенно, необходимо будет задать заголовок �обытию. Также у некоторых типов �обытий нужно будет задать необходимые даты.<br />
-Также вы �можете выбирать тип �оздаваемого �обыти� - публичные �обыти� видны о�тальным пользовател�м, пер�ональные видны только вам.]]></text>
-      <description>Информаци� по календарю на форуме.</description>
-      <position>11</position>
-      <app>calendar</app>
-    </row>
-  </help>
-</export>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_mobile_templates.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_mobile_templates.xml
deleted file mode 100644
index 999c8372..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_mobile_templates.xml
+++ /dev/null
@@ -1,731 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="calendar" templategroups="a:1:{s:13:&quot;skin_calendar&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_calendar">
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_approve'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=1&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id=$id" base="public"}" title='{$this->lang->words['approve_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['approve_event']}</a></li>]]></template_content>
-      <template_name>cal_approve_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="blank"><!-- no content --></td>]]></template_content>
-      <template_name>cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="datecellqueued:|:$queued != 0">
-<td id='{$js_id}' class="moderated">
-	<strong>{$month_day}</strong><a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}'>
-	<strong>{$month_day}</strong>
-</if>
-	{$events}
-</td>]]></template_content>
-      <template_name>cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="todayqueued:|:$queued != 0">
-<td id='{$js_id}' class="today moderated">
- 	<strong>{$month_day}: {$this->lang->words['today_title']}</strong> <a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}' class="today">
-	<strong>{$month_day}: {$this->lang->words['today_title']}</strong>
-</if>
-	{$events}
-</td>]]></template_content>
-      <template_name>cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td id='{$id}'><strong>{$day}</strong></td>]]></template_content>
-      <template_name>cal_day_bit</template_name>
-      <template_data><![CDATA[$day="", $id='']]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_del'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=delete&amp;md5check={$this->member->form_hash}&amp;event_id={$id}&amp;cal_id={$cal_id}" base="public"}' title='{$this->lang->words['calendar_delete_title']}'>{parse replacement="delete_post_icon"} {$this->lang->words['calendar_delete_button']}</a></li>
-<li class='post_edit'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=edit&amp;cal_id={$cal_id}&amp;event_id={$id}" base="public"}' title='{$this->lang->words['calendar_edit_title']}'>{parse replacement="edit_post_icon"} {$this->lang->words['calendar_edit_button']}</a></li>]]></template_content>
-      <template_name>cal_edit_del_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</ul>]]></template_content>
-      <template_name>cal_events_end</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<ul>]]></template_content>
-      <template_name>cal_events_start</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" seotitle="false" template="event" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<if test="strpos( $url, "do=showevent" ) !== false">
-	<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;{$url}" template="event" seotitle="false" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a></li>
-<else />
-	<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;{$url}" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a></li>
-</if>]]></template_content>
-      <template_name>cal_events_wrap_manual</template_name>
-      <template_data><![CDATA[$url="",$text=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" template="event" seotitle="false" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap_range</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" base="public"}" title="{$this->lang->words['tbt_recur']}">{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap_recurring</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-<!-- NEW ROW-->
-<php>
-	$this->row_class = ( $this->row_class == 'row1' ) ? 'row2' : 'row1';
-</php>
-<tr class='{$this->row_class}'>
-	<th class='view_week header' scope='row'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week={$week}" seotitle="false" template="cal_week" base="public"}" title="{$this->lang->words['view_this_week']}"><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
-{parse template="include_lightbox" group="global" params=""}
-</if>
-{parse template="include_highlighter" group="global" params="1"}
-<h2 class='maintitle'>{$this->lang->words['event_prefix']} {$event['event_title']}</h2>
-<div class='generic_bar'></div>
-<div class='post_block <if test="eventnotapproved:|:$event['event_approved']==0">moderated</if>' id='event_id_{$event['event_id']}'>
-	<div class='post_wrap'>
-		<if test="eventmember:|:$member['member_id']">
-			<h3>
-		<else />
-			<h3 class='guest'>
-		</if>
-				<if test="onlineoffline:|:$member['member_id']">
-					<if test="online:|:$member['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-							<span class="author vcard"><a class="url fn" href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a>{parse template="user_popup" group="global" params="$member['member_id'],$member['members_seo_name']"}</span>
-				<else />
-					{$member['members_display_name']}
-				</if>
-			</h3>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="$member, $event['event_id'], array()"}
-		</div>
-		<div class='post_body'>
-			<p class='posted_info'>
-				<strong class='event'>{$this->lang->words['event_date']} {$event['_start_date']} {$date_ends} {$event['time']} ({$type})</strong>
-			</p>
-			<div class='post entry-content'>
-				{$event['event_content']}
-			</div>
-		</div>
-		<ul class='post_controls'>
-			<if test="reportpost:|:($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-				<li class='report'><a href='{parse url="app=core&amp;module=reports&amp;rcom=calendar&amp;event_id={$event['event_id']}" base="public"}' title='{$this->lang->words['report_event']}'>{parse replacement="report_post_icon"} {$this->lang->words['report']}</a></li>
-			</if>
-			<!-- SKINNOTE: Add report link back in -->
-			{$approve_button} {$edit_button}
-		</ul>
-	</div>			
-</div>]]></template_content>
-      <template_name>cal_show_event</template_name>
-      <template_data><![CDATA[$event="",$member="",$event_type="",$edit_button="",$approve_button="",$type="",$date_ends=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_unapprove'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=0&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id={$id}" base="public"}" title='{$this->lang->words['unapprove_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['unapprove_event']}</a></li>]]></template_content>
-      <template_name>cal_unapprove_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='calendar_list' class='left general_box'>
-	<if test="calendarsforweek:|:is_array( $calendars ) && count( $calendars )">
-	<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-	<ol>
-		<foreach loop="weekcalendars:$calendars as $cid => $cal">
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}&amp;do=showweek&amp;week={$this->request['week']}" seotitle="false" template="cal_week" base="public"}' title="{$this->lang->words['view_this_calendar']}" class='rounded'>{$cal['cal_title']}</a></li>
-		</foreach>
-	</ol>
-	</if>
-	<strong>{$this->lang->words['jump_to']}</strong><br />
-	<form action="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}" base="public"}" method="post">
-		<fieldset>
-			<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-			<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-			<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-			<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-			<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-		</fieldset>
-	</form>
-</div>
-<div id='current_calendar' class='right calendar_wrap'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$prev['0']}" seotitle="false" template="cal_week" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['week_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$next['0']}" seotitle="false" template="cal_week" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['week_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	<h2 class='maintitle'>{$this->lang->words['week_beginning']} {$date} {$month} {$year}</h2>
-	<ol id='week_view' class='clear'>
-		<!--IBF.DAYS_CONTENT-->
-	</ol>
-</div>
-<div id='mini_calendars' class='left calendar_wrap'>
-	<!--PREV.MONTH-->
-	<br />
-	<!--THIS.MONTH-->	
-	<br />
-	<!--NEXT.MONTH-->
-</div>]]></template_content>
-      <template_name>cal_week_content</template_name>
-      <template_data><![CDATA[$calendars, $date="",$month="",$year="",$prev="",$next="", $cal_id=1]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<php>
-	$this->week_view = ( $this->week_view == 'row1' ) ? 'row2' : 'row1';
-</php>
- 
-<li id='day-{$year}_{$mid}_{$date}' class='day {$this->week_view} <if test="weekdayentryqueued:|:$queued != 0">{$this->lang->words['moderated']}</if>'>
-	<h3 class='bar'>{$wday}</h3>
-	<div>
-		<span class='date altrow'>{$date}</span>
-		<ul>
-			{$events}
-		</ul>
-	</div>
-</li>]]></template_content>
-      <template_name>cal_week_dayentry</template_name>
-      <template_data><![CDATA[$wday="",$date="",$month="",$mid="",$year="",$events="",$queued=0]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;$link" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a>
-</li>]]></template_content>
-      <template_name>cal_week_events_wrap</template_name>
-      <template_data><![CDATA[$link="",$text=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='month_bar header'>
-	{$month} {$year}
-</li>]]></template_content>
-      <template_name>cal_week_monthbar</template_name>
-      <template_data><![CDATA[$month="",$year=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_ranged']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_range</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_recurring']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_recurring</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_singleday']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}</p>]]></template_content>
-      <template_name>calendar_rss_single</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['cal_birthdays']}</h2>
-<div class='general_box'>
-{parse striping="bday" classes="row1,row2"}
-	<ul>
-		<foreach loop="birthdays:$rows as $r">
-			<li class='{parse striping="bday"}'><a href="{parse url="showuser={$r['uid']}" template="showuser" seotitle="{$r['seoname']}" base="public"}">{$r['uname']}</a> <if test="age:|:$r['age']">(<strong>{$r['age']}</strong>)</if></li>
-		</foreach>
-	</ul>
-</div>]]></template_content>
-      <template_name>calendarBirthdayList</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<script type='text/javascript'>
-	ipb.calendar.inSection = 'form';
-</script>
-<div class='post_form'>
-<form id='postingform' action="{parse url="app=calendar&module=calendar&amp;do={$code}&amp;cal_id={$calendar_id}&amp;formtype={$formtype}&amp;event_id={$event_id}" base="public"}" method="post">
-	<input type="hidden" name="removeattachid" value="" />
-	
-	<h2 class='maintitle'>{$form_title}</h2>
-	<div class='generic_bar'></div>
-	
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['event_details']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_title'>{$this->lang->words['calendar_title']}</label>
-				<input type='text' id='event_title' class='input_text' name='event_title' value="{$event_title}" size='50' maxlength='50' />
-			</li>
-			
-			<if test="single:|:$formtype == 'single'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<!-- SKINNOTE: Update this to use the calendar picker? -->
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			</if>
-			
-			<if test="range:|:$formtype == 'range'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='end_day'>{$this->lang->words['fv_range_ends']}</label>
-				<select class='input_select' name="end_day" id='end_day'>{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="recur:|:$formtype == 'recur'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='recur_unit'>{$this->lang->words['fv_recur']}</label>
-				{$this->lang->words['fv_recur_every']} 
-				<select class='input_select' name="recur_unit" id='recur_unit'>{$event_date['recur_unit']}</select>
-				
-				{$this->lang->words['fv_until']}
-				<select class='input_select' name="end_day">{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="settimes:|:$event_type['timestuff']['formtype'] != 'range'">
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' id='set_times' name='set_times' {$event_type['timestuff']['checked']} value='1' /> 
-				<label for='set_times'>{$this->lang->words['form_set_times']}</label>
-			</li>
-			<li class='field time_setting'>
-				<label for='timezone'>{$this->lang->words['form_tz']}</label>
-				{$event_type['timezone']}
-			</li>
-			<li class='field time_setting'>
-				<label for='tz_start'>{$this->lang->words['form_timestart']}</label>
-				<input class='input_text' type='text' size='8' id='tz_start' name='event_timestart' value='{$event_type['timestuff']['timestart']}' />
-			</li>
-			</if>
-		</ul>
-		<h3 class='bar'>{$this->lang->words['event_options']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_calendar_id'>{$this->lang->words['form_whichcal']}</label>
-				<select name='event_calendar_id' id='event_calendar_id'>{$event_type['dropdown']}</select>
-			</li>
-			<li class='field'>
-				<label for='e_type'>{$this->lang->words['calendar_event_type']}</label>
-				<select name="e_type" id='e_type'>
-					<option value="public"{$event_type['pub_select']}>{$this->lang->words['calendar_type_public']}</option>
-					<option value="private"{$event_type['priv_select']}>{$this->lang->words['calendar_type_private']}</option>
-				</select>
-			</li>
-			<if test="acpaccess:|:$this->memberData['g_access_cp']">
-			<li class='field type_setting'>
-				<label for='e_groups'>{$this->lang->words['calendar_group_filter']}</label>
-				<select name="e_groups[]" id='e_groups' size="5" multiple='multiple'>{$groups}</select>
-			</li>
-			<li class='field checkbox type_setting'>
-				<input type='checkbox' id='all_groups' value='1' class='input_check' />
-				<label for='all_groups'>{$this->lang->words['all_groups']}</label>
-			</if>
-		</ul>
-		<script type='text/javascript'>
-			<if test="hidetime:|:$event_type['timestuff']['divhide'] == 'none'">
-			$$('.time_setting').invoke('hide');
-			</if>
-			
-			<if test="adminoptions:|:$this->memberData['g_access_cp']">
-			ipb.calendar.hideAdminOptions();
-			</if>
-		</script>
-		<h3 class='bar'>{$this->lang->words['event']}</h3>
-		<ul>
-			<li>{$editor}</li>
-			<li class='field checkbox'>
-				<input type="checkbox" name="enableemo" class="input_check" value="yes" <if test="hassmilies:|:$event_type['smilies'] == 1">checked='checked'</if> />
-				<label for='enableemo'>{$this->lang->words['enable_emo']}</label>
-			</li>
-		</ul>
-	</fieldset>
-	<fieldset class='submit'>
-		<input class='input_submit' type="submit" value="{$button}" tabindex="4" /> {$this->lang->words['or']} <a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$calendar_id}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</fieldset>
-</form>
-</div>]]></template_content>
-      <template_name>calendarEventForm</template_name>
-      <template_data><![CDATA[$code="", $calendar_id="", $formtype="", $event_id='', $event_title='', $form_title='', $event_date='', $event_type='', $groups, $button, $editor]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<script type="text/javascript">
-//<!#^#|CDATA|
-	function calendar_event_delete(id, cal_id)
-	{
-		if (confirm('{$this->lang->words['js_del_1']}'))
-		{
-			 window.location.href = "{$this->settings['base_url']}app=calendar&amp;module=calendar&amp;do=delete&md5check={$this->member->form_hash}&event_id=" + id + "&cal_id=" + cal_id;
-		 }
-		 else {
-			alert ('{$this->lang->words['js_del_2']}');
-		} 
-	}
-//|#^#]>
-</script>
-<!--SKINNOTE: I commented this out because we need to show event titles, and this seemed "prettiest", but feel free to change -->
-<!--<h2>{$this->lang->words['cal_title_events']}</h2>
-<div class='generic_bar'></div>-->
-{$events}]]></template_content>
-      <template_name>calendarEventsList</template_name>
-      <template_data>$events</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='calendar_list' class='left general_box'>
-	<if test="gotcalendars:|:is_array( $calendars ) && count( $calendars )">
-	<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-	<ol>
-		<foreach loop="calendars:$calendars as $cid => $cal">
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}&amp;m={$this->request['m']}&amp;y={$this->request['y']}" base="public"}' title="{$this->lang->words['view_this_calendar']}" class='rounded'>{$cal['cal_title']}</a></li>
-		</foreach>
-	</ol>
-	</if>
-	<strong>{$this->lang->words['jump_to']}</strong><br />
-	<form action="{parse url="app=calendar&amp;module=calendar" base="public"}" method="post">
-		<fieldset>
-			<input type='hidden' name='cal_id' value='{$this->request['cal_id']}' />
-			<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-			<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-			<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-			<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-			<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-		</fieldset>
-	</form>
-</div>
-<div id='current_calendar' class='right calendar_wrap'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$prev['month_id']}&amp;y={$prev['year_id']}" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['month_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$next['month_id']}&amp;y={$next['year_id']}" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['month_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	
-	<table id='calendar_table' class='ipb_table' summary="{$this->lang->words['calendar_for']} {$month} {$year}">
-		<caption class='maintitle'>{$month} {$year}</caption>
-		<tr class='header'>
-				<th class='head_week' scope='col'>&nbsp;</th>
-			<foreach loop="days:$day_words as $day">
-				<th scope='col'>{$day}</th>
-			</foreach>
-			<!--IBF.DAYS_CONTENT-->
-		</tr>
-	</table>
-	
-	<ul class='pagination'>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thismonth" base="public"}">{$this->lang->words['aa_cur_month']}</a></li>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thisweek" base="public"}">{$this->lang->words['aa_view_week']}</a></li>
-	</ul>
-</div>
-<div id='mini_calendars' class='left calendar_wrap'>
-	<!--PREV.MONTH-->
-	<br />
-	<!--NEXT.MONTH-->
-</div>		
-<br />]]></template_content>
-      <template_name>calendarMainContent</template_name>
-      <template_data><![CDATA[$calendars, $month="",$year="",$prev="",$next="",$cal_jump="",$cal_id="",$day_words=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class='blank'><!-- no content --></td>]]></template_content>
-      <template_name>mini_cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td>
-	{$month_day}
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="today">
-	<strong>{$month_day}</strong>
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!-- <a href="{parse url="app=calendar&module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;m={$mid}&amp;y=$year" base="public"}"> -->
-<php>
-	$this->mini_cal = 'row2';
-</php>	
-<h3 class='maintitle'>{$month} {$year}</h3>
-<table class='mini_cal'>
-	<tr class='header'>
-		<th class='head_week'>&nbsp;</th>
-		<foreach loop="minidays:$day_words as $day">
-			<th>{parse expression="IPSText::mbsubstr( $day, 0, 1 )"}</th>
-		</foreach>
-		{$events}
-	</tr>
-</table>]]></template_content>
-      <template_name>mini_cal_mini_wrap</template_name>
-      <template_data><![CDATA[$month="",$mid="",$year="",$events="",$day_words=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-	<!-- NEW ROW-->
-	<php>
-		$this->mini_cal = ( $this->mini_cal == 'row1' ) ? 'row2' : 'row1';
-		$this->request['_cal_id'] = ( $this->request['_cal_id'] ) ? $this->request['_cal_id'] : 1;
-	</php>
-<tr class='{$this->mini_cal}'>
-	<th class='view_week header'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week={$week}" seotitle="false" template="cal_week" base="public"}" title='{$this->lang->words['view_this_week']}' ><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>mini_cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_modules.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_modules.xml
deleted file mode 100644
index d8498317..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_modules.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<moduleexport>
-  <modulegroup>
-    <module>
-      <sys_module_title>Календарь</sys_module_title>
-      <sys_module_application>calendar</sys_module_application>
-      <sys_module_key>calendar</sys_module_key>
-      <sys_module_description/>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>0</sys_module_position>
-      <sys_module_admin>0</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Управление календарем</sys_module_title>
-      <sys_module_application>calendar</sys_module_application>
-      <sys_module_key>calendar</sys_module_key>
-      <sys_module_description/>
-      <sys_module_version>1.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>0</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-  </modulegroup>
-</moduleexport>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_root_css.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_root_css.xml
deleted file mode 100644
index 4cd52196..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_root_css.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<css>
-  <cssfile>
-    <css_set_id>0</css_set_id>
-    <css_updated>1288018123</css_updated>
-    <css_group>ipb_calendar</css_group>
-    <css_content>/************************************************************************/
-/* IP.Board 3 CSS - By Rikki Tissier - (c)2008 Invision Power Services	*/
-/************************************************************************/
-/* ipb_calendar.css - Calendar specific styles							*/
-/************************************************************************/
-
-div#calendar_list {
-	width: 92%;
-	padding: 10px;
-	margin: 8px 0 15px 0;
-}
-
-	div#calendar_list ol {
-		margin-top: 10px;
-		margin-bottom: 15px;
-	}
-	
-	#calendar_list li {
-		margin: 2px 0;
-		text-align: left;
-	}
-	
-		#calendar_list li a {
-			background: #d5dde5;
-			text-decoration: none;
-			padding: 5px 7px;
-			display: block;
-		}
-
-div#current_calendar {
-	width: 77%;
-	margin-top: -20px;
-}
-	
-/*	div#current_calendar .maintitle {
-		margin-right: -2px !important;
-	}*/
-	
-	div#current_calendar table {
-		border-collapse: collapse;
-		border-top: 0;
-		margin-bottom: 10px;
-		clear: both;		
-	}
-	
-	div#current_calendar table td {
-		font-size: 0.9em;
-		vertical-align: top;
-		border: 1px solid #d8d8d8;
-		padding: 5px;
-		height: 85px;
-		width: 14%;
-	}
-	
-		div#current_calendar table td.selected {
-			background-color: #e1e7ee;
-		}
-		
-		div#current_calendar table td ul {
-			margin: 5px;
-		}
-		
-#current_calendar table th,
-#mini_calendars table th {
-	border: 1px solid #b6c7db; /* Fixes Firefoxs overlapping pixel thing with collapsed borders */
-}
-		
-.calendar_wrap table td.blank {
-	background-color: #e7e7e7;
-}
-
-#ipboard_body .calendar_wrap table td.today {
-	border: 2px solid #6f8f52;
-	color: #6f8f52;
-	background-color: #f1f6ec;
-}
-
-.calendar_wrap table td strong {
-	font-size: 0.9em;
-	font-weight: bold;
-}
-	
-#ipboard_body table th.head_week {
-	width: 2% !important;
-}
-
-#ipboard_body table th.view_week {
-	background-color: #b6c7db;
-	text-align: center;
-	border: 1px solid #b6c7db;
-}
-
-/* Week view */
-	div#current_calendar ol#week_view li.day {
-		margin-bottom: 2px;
-	}
-	
-	div#current_calendar ol#week_view li.day div {
-		padding: 4px 10px 4px 75px;
-		min-height: 60px;
-		position: relative;
-	}
-	
-	div#current_calendar ol#week_view li.day .date {
-		color: #1d3652;
-		font-size: 1.2em;
-		text-align: center;
-		padding-top: 10px;
-		top: 0px;
-		bottom: 0px;
-		left: 0px;
-		width: 65px;
-		display: block;
-		position: absolute;
-	}
-	
-div#mini_calendars {
-	margin: 20px 0 15px 0;
-	width: 20%;
-}
-
-div#mini_calendars table,
-.mini_cal {
-	border-top: 0;
-}
-
-.mini-cal-wrap {
-	width: 100%;
-}
-
-	div#mini_calendars th.view_week {
-		padding: 6px 2px;
-	}
-
-div#mini_calendars th, div#mini_calendars td,
-.mini_cal th, .mini_cal td {
-	font-size: 0.85em;
-	text-align: center;
-	padding: 6px;
-}
-
-	div#mini_calendars td,
-	.mini_cal td {
-		border: 1px solid #f1f4f7;
-		padding: 6px 0;
-	}
-
-.cal_color {
-	margin-right: 8px;
-	padding: 0 7px;
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-}
-
-.cal {	
-	background-color: #d5dde5;
-	color: #fff;
-	font-size: 0.8em;
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	padding: 2px 5px;
-	margin-bottom: 3px;
-}
-
-	#ipboard_body .cal a {
-		text-decoration: underline;
-	}
-	
-	.today .cal {
-		background-color: #6f8f52;
-	}
-	
-	.today .cal a {
-		color: #fff;
-	}
-	
-.cal_1 {
-	background-color: #971a48;
-}
-.cal_2 {
-	background-color: #3fa711;
-}
-.cal_3 {
-	background-color: #cd8b24;
-}</css_content>
-    <css_position>1</css_position>
-    <css_app>calendar</css_app>
-    <css_app_hide>1</css_app_hide>
-    <css_attributes><![CDATA[title="Main" media="screen"]]></css_attributes>
-    <css_removed>0</css_removed>
-    <css_modules/>
-    <css_user_added>0</css_user_added>
-    <css_user_edited>0</css_user_edited>
-    <css_master_key>root</css_master_key>
-  </cssfile>
-</css>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_root_templates.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_root_templates.xml
deleted file mode 100644
index b0c04b77..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_root_templates.xml
+++ /dev/null
@@ -1,737 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="calendar" templategroups="a:1:{s:13:&quot;skin_calendar&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_calendar">
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_approve'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=1&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id={$id}" base="public"}" title='{$this->lang->words['approve_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['approve_event']}</a></li>]]></template_content>
-      <template_name>cal_approve_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="blank"><!-- no content --></td>]]></template_content>
-      <template_name>cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="datecellqueued:|:$queued != 0">
-<td id='{$js_id}' class="moderated">
-	<strong>{$month_day}</strong><a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}'>
-	<strong>{$month_day}</strong>
-</if>
-	{$events}
-</td>]]></template_content>
-      <template_name>cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="todayqueued:|:$queued != 0">
-<td id='{$js_id}' class="today moderated">
- 	<strong>{$month_day}: {$this->lang->words['today_title']}</strong> <a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}' class="today">
-	<strong>{$month_day}: {$this->lang->words['today_title']}</strong>
-</if>
-	{$events}
-</td>]]></template_content>
-      <template_name>cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td id='{$id}'><strong>{$day}</strong></td>]]></template_content>
-      <template_name>cal_day_bit</template_name>
-      <template_data><![CDATA[$day="", $id='']]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_del'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=delete&amp;md5check={$this->member->form_hash}&amp;event_id={$id}&amp;cal_id={$cal_id}" base="public"}' title='{$this->lang->words['calendar_delete_title']}'>{parse replacement="delete_post_icon"} {$this->lang->words['calendar_delete_button']}</a></li>
-<li class='post_edit'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=edit&amp;cal_id={$cal_id}&amp;event_id={$id}" base="public"}' title='{$this->lang->words['calendar_edit_title']}'>{parse replacement="edit_post_icon"} {$this->lang->words['calendar_edit_button']}</a></li>]]></template_content>
-      <template_name>cal_edit_del_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</ul>]]></template_content>
-      <template_name>cal_events_end</template_name>
-      <template_data/>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<ul>]]></template_content>
-      <template_name>cal_events_start</template_name>
-      <template_data/>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" seotitle="false" template="event" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<if test="strpos( $url, "do=showevent" ) !== false">
-	<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;{$url}" template="event" seotitle="false" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a></li>
-<else />
-	<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;{$url}" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a></li>
-</if>]]></template_content>
-      <template_name>cal_events_wrap_manual</template_name>
-      <template_data><![CDATA[$url="",$text=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" template="event" seotitle="false" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap_range</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" base="public" template="event" seotitle="false"}" title="{$this->lang->words['tbt_recur']}">{$event['event_title']}</a>
-</li>]]></template_content>
-      <template_name>cal_events_wrap_recurring</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-<!-- NEW ROW-->
-<php>
-	$this->row_class = ( $this->row_class == 'row1' ) ? 'row2' : 'row1';
-</php>
-<tr class='{$this->row_class}'>
-	<th class='view_week header' scope='row'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week={$week}" seotitle="false" template="cal_week" base="public"}" title="{$this->lang->words['view_this_week']}"><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
-{parse template="include_lightbox" group="global" params=""}
-</if>
-{parse template="include_highlighter" group="global" params="1"}
-<h2 class='maintitle'>{$this->lang->words['event_prefix']} {$event['event_title']}</h2>
-<div class='generic_bar'></div>
-<div class='post_block <if test="eventnotapproved:|:$event['event_approved']==0">moderated</if>' id='event_id_{$event['event_id']}'>
-	<div class='post_wrap'>
-		<if test="eventmember:|:$member['member_id']">
-			<h3>
-		<else />
-			<h3 class='guest'>
-		</if>
-				<if test="onlineoffline:|:$member['member_id']">
-					<if test="online:|:$member['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-							<span class="author vcard"><a class="url fn" href='{parse url="showuser={$member['member_id']}" template="showuser" seotitle="{$member['members_seo_name']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a>{parse template="user_popup" group="global" params="$member['member_id'],$member['members_seo_name']"}</span>
-				<else />
-					{$member['members_display_name']}
-				</if>
-			</h3>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="$member, $event['event_id'], array()"}
-		</div>
-		<div class='post_body'>
-			<p class='posted_info'>
-				<strong class='event'>{$this->lang->words['event_date']} {$event['_start_date']} {$date_ends} {$event['time']} ({$type})</strong>
-			</p>
-			<div class='post entry-content'>
-				{$event['event_content']}
-			</div>
-		</div>
-		<ul class='post_controls'>
-			<if test="reportpost:|:($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-				<li class='report'><a href='{parse url="app=core&amp;module=reports&amp;rcom=calendar&amp;event_id={$event['event_id']}" base="public"}' title='{$this->lang->words['report_event']}'>{parse replacement="report_post_icon"} {$this->lang->words['report']}</a></li>
-			</if>
-			<!-- SKINNOTE: Add report link back in -->
-			{$approve_button} {$edit_button}
-		</ul>
-	</div>			
-</div>]]></template_content>
-      <template_name>cal_show_event</template_name>
-      <template_data><![CDATA[$event="",$member="",$event_type="",$edit_button="",$approve_button="",$type="",$date_ends=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_unapprove'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=0&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id={$id}" base="public"}" title='{$this->lang->words['unapprove_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['unapprove_event']}</a></li>]]></template_content>
-      <template_name>cal_unapprove_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='current_calendar' class='right calendar_wrap'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$prev['0']}" seotitle="false" template="cal_week" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['week_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$next['0']}" seotitle="false" template="cal_week" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['week_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	<h2 class='maintitle'>{$this->lang->words['week_beginning']} {$date} {$month} {$year}</h2>
-	<ol id='week_view' class='clear'>
-		<!--IBF.DAYS_CONTENT-->
-	</ol>
-</div>
-<div id='mini_calendars' class='left calendar_wrap'>
-	<div id='calendar_list' class='left general_box'>
-		<if test="calendarsforweek:|:is_array( $calendars ) && count( $calendars )">
-		<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-		<ol>
-			<foreach loop="weekcalendars:$calendars as $cid => $cal">
-				<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}&amp;do=showweek&amp;week={$this->request['week']}" seotitle="false" template="cal_week" base="public"}' title="{$this->lang->words['view_this_calendar']}" class='rounded'>{$cal['cal_title']}</a></li>
-			</foreach>
-		</ol>
-		</if>
-		<strong>{$this->lang->words['jump_to']}</strong><br />
-		<form action="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}" base="public"}" method="post">
-			<fieldset>
-				<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-				<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-				<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-				<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-				<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-			</fieldset>
-		</form>
-	</div>
-	<br style='clear:both;' />
-	<!--PREV.MONTH-->
-	<br />
-	<!--THIS.MONTH-->	
-	<br />
-	<!--NEXT.MONTH-->
-</div>]]></template_content>
-      <template_name>cal_week_content</template_name>
-      <template_data><![CDATA[$calendars, $date="",$month="",$year="",$prev="",$next="", $cal_id=1]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<php>
-	$this->week_view = ( $this->week_view == 'row1' ) ? 'row2' : 'row1';
-</php>
- 
-<li id='day-{$year}_{$mid}_{$date}' class='day {$this->week_view} <if test="weekdayentryqueued:|:$queued != 0">{$this->lang->words['moderated']}</if>'>
-	<h3 class='bar'>{$wday}</h3>
-	<div>
-		<span class='date altrow'>{$date}</span>
-		<ul>
-			{$events}
-		</ul>
-	</div>
-</li>]]></template_content>
-      <template_name>cal_week_dayentry</template_name>
-      <template_data><![CDATA[$wday="",$date="",$month="",$mid="",$year="",$events="",$queued=0]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'>
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;$link" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a>
-</li>]]></template_content>
-      <template_name>cal_week_events_wrap</template_name>
-      <template_data><![CDATA[$link="",$text=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='month_bar header'>
-	{$month} {$year}
-</li>]]></template_content>
-      <template_name>cal_week_monthbar</template_name>
-      <template_data><![CDATA[$month="",$year=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_ranged']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_range</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_recurring']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_recurring</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_singleday']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}</p>]]></template_content>
-      <template_name>calendar_rss_single</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<h2>{$this->lang->words['cal_birthdays']}</h2>
-<div class='general_box'>
-{parse striping="bday" classes="row1,row2"}
-	<ul>
-		<foreach loop="birthdays:$rows as $r">
-			<li class='{parse striping="bday"}'><a href="{parse url="showuser={$r['uid']}" template="showuser" seotitle="{$r['seoname']}" base="public"}">{$r['uname']}</a> <if test="age:|:$r['age']">(<strong>{$r['age']}</strong>)</if></li>
-		</foreach>
-	</ul>
-</div>]]></template_content>
-      <template_name>calendarBirthdayList</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<script type='text/javascript'>
-	ipb.calendar.inSection = 'form';
-</script>
-<div class='post_form'>
-<form id='postingform' action="{parse url="app=calendar&module=calendar&amp;do={$code}&amp;cal_id={$calendar_id}&amp;formtype={$formtype}&amp;event_id={$event_id}" base="public"}" method="post">
-	<input type="hidden" name="removeattachid" value="" />
-	<input type="hidden" name="auth_key" value="{$this->member->form_hash}" />
-	
-	<h2 class='maintitle'>{$form_title}</h2>
-	<div class='generic_bar'></div>
-	
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['event_details']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_title'>{$this->lang->words['calendar_title']}</label>
-				<input type='text' id='event_title' class='input_text' name='event_title' value="{$event_title}" size='50' maxlength='50' />
-			</li>
-			
-			<if test="single:|:$formtype == 'single'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<!-- SKINNOTE: Update this to use the calendar picker? -->
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			</if>
-			
-			<if test="range:|:$formtype == 'range'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='end_day'>{$this->lang->words['fv_range_ends']}</label>
-				<select class='input_select' name="end_day" id='end_day'>{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="recur:|:$formtype == 'recur'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='recur_unit'>{$this->lang->words['fv_recur']}</label>
-				{$this->lang->words['fv_recur_every']} 
-				<select class='input_select' name="recur_unit" id='recur_unit'>{$event_date['recur_unit']}</select>
-				
-				{$this->lang->words['fv_until']}
-				<select class='input_select' name="end_day">{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="settimes:|:$event_type['timestuff']['formtype'] != 'range'">
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' id='set_times' name='set_times' {$event_type['timestuff']['checked']} value='1' /> 
-				<label for='set_times'>{$this->lang->words['form_set_times']}</label>
-			</li>
-			<li class='field time_setting'>
-				<label for='timezone'>{$this->lang->words['form_tz']}</label>
-				{$event_type['timezone']}
-			</li>
-			<li class='field time_setting'>
-				<label for='tz_start'>{$this->lang->words['form_timestart']}</label>
-				<input class='input_text' type='text' size='8' id='tz_start' name='event_timestart' value='{$event_type['timestuff']['timestart']}' />
-			</li>
-			</if>
-		</ul>
-		<h3 class='bar'>{$this->lang->words['event_options']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_calendar_id'>{$this->lang->words['form_whichcal']}</label>
-				<select name='event_calendar_id' id='event_calendar_id'>{$event_type['dropdown']}</select>
-			</li>
-			<li class='field'>
-				<label for='e_type'>{$this->lang->words['calendar_event_type']}</label>
-				<select name="e_type" id='e_type'>
-					<option value="public"{$event_type['pub_select']}>{$this->lang->words['calendar_type_public']}</option>
-					<option value="private"{$event_type['priv_select']}>{$this->lang->words['calendar_type_private']}</option>
-				</select>
-			</li>
-			<if test="acpaccess:|:$this->memberData['g_access_cp']">
-			<li class='field type_setting'>
-				<label for='e_groups'>{$this->lang->words['calendar_group_filter']}</label>
-				<select name="e_groups[]" id='e_groups' size="5" multiple='multiple'>{$groups}</select>
-			</li>
-			<li class='field checkbox type_setting'>
-				<input type='checkbox' id='all_groups' value='1' class='input_check' />
-				<label for='all_groups'>{$this->lang->words['all_groups']}</label>
-			</if>
-		</ul>
-		<script type='text/javascript'>
-			<if test="hidetime:|:$event_type['timestuff']['divhide'] == 'none'">
-			$$('.time_setting').invoke('hide');
-			</if>
-			
-			<if test="adminoptions:|:$this->memberData['g_access_cp']">
-			ipb.calendar.hideAdminOptions();
-			</if>
-		</script>
-		<h3 class='bar'>{$this->lang->words['event']}</h3>
-		<ul>
-			<li>{$editor}</li>
-			<li class='field checkbox'>
-				<input type="checkbox" name="enableemo" class="input_check" value="yes" <if test="hassmilies:|:$event_type['smilies'] == 1">checked='checked'</if> />
-				<label for='enableemo'>{$this->lang->words['enable_emo']}</label>
-			</li>
-		</ul>
-	</fieldset>
-	<fieldset class='submit'>
-		<input class='input_submit' type="submit" value="{$button}" tabindex="4" /> {$this->lang->words['or']} <a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$calendar_id}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</fieldset>
-</form>
-</div>]]></template_content>
-      <template_name>calendarEventForm</template_name>
-      <template_data><![CDATA[$code="", $calendar_id="", $formtype="", $event_id='', $event_title='', $form_title='', $event_date='', $event_type='', $groups, $button, $editor]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<script type="text/javascript">
-//<!#^#|CDATA|
-	function calendar_event_delete(id, cal_id)
-	{
-		if (confirm('{$this->lang->words['js_del_1']}'))
-		{
-			 window.location.href = "{$this->settings['base_url']}app=calendar&amp;module=calendar&amp;do=delete&md5check={$this->member->form_hash}&event_id=" + id + "&cal_id=" + cal_id;
-		 }
-		 else {
-			alert ('{$this->lang->words['js_del_2']}');
-		} 
-	}
-//|#^#]>
-</script>
-<!--SKINNOTE: I commented this out because we need to show event titles, and this seemed "prettiest", but feel free to change -->
-<!--<h2>{$this->lang->words['cal_title_events']}</h2>
-<div class='generic_bar'></div>-->
-{$events}]]></template_content>
-      <template_name>calendarEventsList</template_name>
-      <template_data>$events</template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='current_calendar' class='right calendar_wrap'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$prev['month_id']}&amp;y={$prev['year_id']}" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['month_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$next['month_id']}&amp;y={$next['year_id']}" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['month_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	
-	<table id='calendar_table' class='ipb_table' summary="{$this->lang->words['calendar_for']} {$month} {$year}">
-		<caption class='maintitle'>{$month} {$year}</caption>
-		<tr class='header'>
-				<th class='head_week' scope='col'>&nbsp;</th>
-			<foreach loop="days:$day_words as $day">
-				<th scope='col'>{$day}</th>
-			</foreach>
-			<!--IBF.DAYS_CONTENT-->
-		</tr>
-	</table>
-	
-	<ul class='pagination'>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thismonth" base="public"}">{$this->lang->words['aa_cur_month']}</a></li>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thisweek" base="public"}">{$this->lang->words['aa_view_week']}</a></li>
-	</ul>
-</div>
-<div id='mini_calendars' class='left calendar_wrap'>
-	<div id='calendar_list' class='general_box'>
-		<if test="gotcalendars:|:is_array( $calendars ) && count( $calendars )">
-		<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-		<ol>
-			<foreach loop="calendars:$calendars as $cid => $cal">
-				<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}&amp;m={$this->request['m']}&amp;y={$this->request['y']}" base="public"}' title="{$this->lang->words['view_this_calendar']}" class='rounded'>{$cal['cal_title']}</a></li>
-			</foreach>
-		</ol>
-		</if>
-		<strong>{$this->lang->words['jump_to']}</strong><br />
-		<form action="{parse url="app=calendar&amp;module=calendar" base="public"}" method="post">
-			<fieldset>
-				<input type='hidden' name='cal_id' value='{$this->request['cal_id']}' />
-				<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-				<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-				<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-				<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-				<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-			</fieldset>
-		</form>
-	</div>
-	
-	<!--PREV.MONTH-->
-	<br />
-	<!--NEXT.MONTH-->
-</div>		
-<br />]]></template_content>
-      <template_name>calendarMainContent</template_name>
-      <template_data><![CDATA[$calendars, $month="",$year="",$prev="",$next="",$cal_jump="",$cal_id="",$day_words=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class='blank'><!-- no content --></td>]]></template_content>
-      <template_name>mini_cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td>
-	{$month_day}
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="today">
-	<strong>{$month_day}</strong>
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!-- <a href="{parse url="app=calendar&module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;m={$mid}&amp;y=$year" base="public"}"> -->
-<php>
-	$this->mini_cal = 'row2';
-</php>
-<div class='mini-cal-wrap'>
-	<h3 class='maintitle'>{$month} {$year}</h3>
-	<table class='mini_cal'>
-		<tr class='header'>
-			<th class='head_week'>&nbsp;</th>
-			<foreach loop="minidays:$day_words as $day">
-				<th>{parse expression="IPSText::mbsubstr( $day, 0, 1 )"}</th>
-			</foreach>
-	
-			{$events}
-		</tr>
-	</table>
-</div>]]></template_content>
-      <template_name>mini_cal_mini_wrap</template_name>
-      <template_data><![CDATA[$month="",$mid="",$year="",$events="",$day_words=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-	<!-- NEW ROW-->
-	<php>
-		$this->mini_cal = ( $this->mini_cal == 'row1' ) ? 'row2' : 'row1';
-		$this->request['_cal_id'] = ( $this->request['_cal_id'] ) ? $this->request['_cal_id'] : 1;
-	</php>
-<tr class='{$this->mini_cal}'>
-	<th class='view_week header'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week={$week}" seotitle="false" template="cal_week" base="public"}" title='{$this->lang->words['view_this_week']}' ><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>mini_cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018124</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_settings.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_settings.xml
deleted file mode 100644
index ec2e76ab..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_settings.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<settingexport>
-  <settinggroup>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_title_title>Календарь и дни рождени�</conf_title_title>
-      <conf_title_desc>�а�тройка опций календар� и отображение на форуме именинников</conf_title_desc>
-      <conf_title_tab>IPS Apps</conf_title_tab>
-      <conf_title_app>calendar</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Показывать именинников на главной �транице календар�?</conf_title>
-      <conf_description>Е�ли опци� включена, календарь будет показывать количе�тво именинников в данный день.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>show_bday_calendar</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>1</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Показывать �егодн�шние дни рождени� на главной �транице форума?</conf_title>
-      <conf_description>Е�ли опци� включена, на главной �транице форума будут отображены в�е дни рождени� на �егодн�шний день.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>show_birthdays</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group>Сегодн�шние именинники</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>�втоматиче�ки �крывать блок при от�ут�твии именинников?</conf_title>
-      <conf_description><![CDATA[Е�ли опци� включена и дней рождени� в текущий день нет, то блок "Сегодн�шние именинники" будет �крыт на главной �транице форума.]]></conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>autohide_bday</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Показывать пред�то�щие календарные �обыти�?</conf_title>
-      <conf_description>Пред�то�щие �обыти� в календаре будут отображать�� на главной �транице форума. Повтор�ющие�� �обыти� или длительные �обыти� не отображают��.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>show_calendar</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group>Пред�то�щие �обыти� календар�</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>�втоматиче�ки �крывать блок �обытий, е�ли их нет?</conf_title>
-      <conf_description>Блок пред�то�щих календарных �обытий будет �крыт на главной �транице форума, е�ли пред�то�щих �обытий нет.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>autohide_calendar</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>5</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Показывать пред�то�щие �обыти� на �ледующие [x] дней]]></conf_title>
-      <conf_description>Показывает �обыти�, которые произойдут в течение указанного количе�тва дней по�ле текущего дн�.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>calendar_limit</conf_key>
-      <conf_default>5</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>6</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[�ачальный год в выпадающем меню &quot;Год&quot; календар�]]></conf_title>
-      <conf_description>Отно�ит�� к про�мотру календар�/добавлению �обытий.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>start_year</conf_key>
-      <conf_default>2008</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>7</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Конечный год в выпадающем меню &quot;Год&quot; календар�]]></conf_title>
-      <conf_description><![CDATA[Отно�ит�� к про�мотру календар�/добавлению �обытий.<br />�апример: е�ли в данный момент начальный год выбран 2008, и е�ли вы введете в �ту опцию 5, то можно выбрать любой год календар� на 5 лет вперед � 2008 до 2013 года.]]></conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>year_limit</conf_key>
-      <conf_default>5</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>8</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>�ачать календарь � понедельника?</conf_title>
-      <conf_description>В некоторых �транах недел� начинает�� � во�кре�ень�, тогда �ту опцию можно выключить. В противном �лучае про�то о�тавьте ее включенной.</conf_description>
-      <conf_group>28</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>ipb_calendar_mon</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>calendar</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-  </settinggroup>
-</settingexport>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_tasks.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_tasks.xml
deleted file mode 100644
index b021d7bf..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_tasks.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<export>
-  <group>
-    <row>
-      <task_id>4</task_id>
-      <task_title>Кеширование дней рождени� и �обытий</task_title>
-      <task_file>calendarevents.php</task_file>
-      <task_next_run>1246348010</task_next_run>
-      <task_week_day>-1</task_week_day>
-      <task_month_day>-1</task_month_day>
-      <task_hour>12</task_hour>
-      <task_minute>-1</task_minute>
-      <task_cronkey>90eda65c70d48ffcbb91ac6a693bb001</task_cronkey>
-      <task_log>1</task_log>
-      <task_description><![CDATA[Кеширование �обытий в календаре и дней рождени�]]></task_description>
-      <task_enabled>1</task_enabled>
-      <task_key>calendarevents</task_key>
-      <task_safemode>1</task_safemode>
-      <task_locked>0</task_locked>
-      <task_application>calendar</task_application>
-    </row>
-  </group>
-</export>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/calendar_xmlskin_templates.xml b/upload/admin/applications_addon/ips/calendar/xml/calendar_xmlskin_templates.xml
deleted file mode 100644
index d3a8897f..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/calendar_xmlskin_templates.xml
+++ /dev/null
@@ -1,729 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="calendar" templategroups="a:1:{s:13:&quot;skin_calendar&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_calendar">
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_approve'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=1&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id=$id" base="public"}" title='{$this->lang->words['approve_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['approve_event']}</a></li>]]></template_content>
-      <template_name>cal_approve_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="blank"><!-- no content --></td>]]></template_content>
-      <template_name>cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="$queued != 0">
-<td id='{$js_id}' class="moderated">
-	<strong>$month_day</strong><a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}'>
-	<strong>$month_day</strong>
-</if>
-	$events
-</td>]]></template_content>
-      <template_name>cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!--Day-->
-<if test="$queued != 0">
-<td id='{$js_id}' class="today moderated">
- 	<strong>$month_day: {$this->lang->words['today_title']}</strong> <a href="{$cal_date_queued}">{parse replacement="t_queued"}</a>
-<else />
-<td id='{$js_id}' class="today">
-	<strong>$month_day: {$this->lang->words['today_title']}</strong>
-</if>
-	$events
-</td>]]></template_content>
-      <template_name>cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events="",$cal_date_queued="",$queued=0, $js_id]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td id='{$id}'><strong>$day</strong></td>]]></template_content>
-      <template_name>cal_day_bit</template_name>
-      <template_data><![CDATA[$day="", $id='']]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_del'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=delete&amp;md5check={$this->member->form_hash}&amp;event_id=$id&amp;cal_id={$cal_id}" base="public"}' title='{$this->lang->words['calendar_delete_title']}'>{parse replacement="delete_post_icon"} {$this->lang->words['calendar_delete_button']}</a></li>
-<li class='post_edit'><a href='{parse url="app=calendar&amp;module=calendar&amp;do=edit&amp;cal_id={$cal_id}&amp;event_id=$id" base="public"}' title='{$this->lang->words['calendar_edit_title']}'>{parse replacement="edit_post_icon"} {$this->lang->words['calendar_edit_button']}</a></li>]]></template_content>
-      <template_name>cal_edit_del_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</ul>]]></template_content>
-      <template_name>cal_events_end</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<ul>]]></template_content>
-      <template_name>cal_events_start</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a></li>]]></template_content>
-      <template_name>cal_events_wrap</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='cal'><a href="{parse url="app=calendar&amp;module=calendar&amp;{$url}" base="public"}" title='{$this->lang->words['view_event']}'>{$text}</a></li>]]></template_content>
-      <template_name>cal_events_wrap_manual</template_name>
-      <template_data><![CDATA[$url="",$text=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<div class="calranged">
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" base="public"}" title='{$this->lang->words['view_event']}'>{$event['event_title']}</a>
-</div>]]></template_content>
-      <template_name>cal_events_wrap_range</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<div class="calitem">
-	<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$event['event_calendar_id']}&amp;do=showevent&amp;event_id={$event['event_id']}" base="public"}" title="{$this->lang->words['tbt_recur']}">{$event['event_title']}</a>
-</div>]]></template_content>
-      <template_name>cal_events_wrap_recurring</template_name>
-      <template_data><![CDATA[$event=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-<!-- NEW ROW-->
-<php>
-	$this->row_class = ( $this->row_class == 'row1' ) ? 'row2' : 'row1';
-</php>
-<tr class='{$this->row_class}'>
-	<th class='view_week' scope='row'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week=$week" base="public"}" title="{$this->lang->words['view_this_week']}"><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<h2>Event: {$event['event_title']}</h2>
-<ul class='topic_options'></ul>
-<div class='post_block <if test="$event['event_approved']==0">moderated</if> id='event_id_{$event['event_id']}'>
-	<div class='post_wrap'>
-		<if test="$member['member_id']">
-			<h3>
-		<else />
-			<h3 class='guest'>
-		</if>
-				<if test="$member['member_id']">
-					<if test="$member['_online']">
-						{parse replacement="user_online"}
-					<else />
-						{parse replacement="user_offline"}
-					</if> &nbsp;
-							<address class="author vcard"><a class="url fn" href='{parse url="showuser={$member['member_id']}" base="public"}' title='{$this->lang->words['view_profile']}'>{$member['members_display_name']}</a>{parse template="user_popup" group="global" params="$member['member_id']"}</address>
-				<else />
-					{$member['members_display_name']}
-				</if>
-			</h3>
-		<p class='posted_info'>
-			<strong class='event'>{$this->lang->words['event_date']} {$event['_start_date']} $date_ends</b> {$event['time']} ($type)</strong>
-		</p>
-		<div class='author_info'>
-			{parse template="userInfoPane" group="global" params="$member, $event['event_id'], array()"}
-		</div>
-		<div class='post_body'>
-			<div class='post entry-content'>
-				{$event['event_content']}
-			</div>
-		</div>
-		<ul class='post_controls'>
-			<if test="($this->settings['disable_reportpost'] != 1) and ( $this->memberData['member_id'] )">
-				<li class='report'><a href='{parse url="app=core&amp;module=reports&amp;rcom=calendar&amp;event_id={$event['event_id']}" base="public"}' title='{$this->lang->words['report_event']}'>{parse replacement="report_post_icon"} {$this->lang->words['report']}</a></li>
-			</if>
-			<!-- SKINNOTE: Add report link back in -->
-			{$approve_button} {$edit_button}
-		</ul>
-	</div>			
-</div>]]></template_content>
-      <template_name>cal_show_event</template_name>
-      <template_data><![CDATA[$event="",$member="",$event_type="",$edit_button="",$approve_button="",$type="",$date_ends=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='post_unapprove'><a href="{parse url="app=calendar&amp;module=calendar&amp;do=calendarEventApprove&amp;modfilter={$this->request['modfilter']}&amp;qt={$event['_quicktime']}&amp;approve=0&amp;md5check={$this->member->form_hash}&amp;cal_id={$cal_id}&amp;event_id=$id" base="public"}" title='{$this->lang->words['unapprove_event']}'>{parse replacement="edit_post_icon"} {$this->lang->words['unapprove_event']}</a></li>]]></template_content>
-      <template_name>cal_unapprove_button</template_name>
-      <template_data><![CDATA[$id="",$cal_id="",$event=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='calendar_list' class='general_box'>
-	<if test="is_array( $calendars ) && count( $calendars )">
-	<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-	<ol>
-		<foreach loop="$calendars as $cid => $cal">
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}&amp;do=showweek&amp;week={$this->request['week']}" base="public"}' title="{$this->lang->words['view_this_calendar']}">{$cal['cal_title']}</a></li>
-		</foreach>
-	</ol>
-	</if>
-	<p>
-		<form action="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}" base="public"}" method="post">
-			<strong>{$this->lang->words['jump_to']}</strong><br />
-			<fieldset>
-				<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-				<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-				<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-				<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-				<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-			</fieldset>
-		</form>
-	</p>
-</div>
-<div id='current_calendar'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$prev['0']}" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['week_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=showweek&amp;week={$next['0']}" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['week_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	<h2>{$this->lang->words['week_beginning']} $date $month $year</h2>
-	<ol id='week_view'>
-		<!--IBF.DAYS_CONTENT-->
-	</ol>
-</div>
-<div id='mini_calendars'>
-	<!--PREV.MONTH-->
-	<br />
-	<!--THIS.MONTH-->	
-	<br />
-	<!--NEXT.MONTH-->
-</div>]]></template_content>
-      <template_name>cal_week_content</template_name>
-      <template_data><![CDATA[$calendars, $date="",$month="",$year="",$prev="",$next="", $cal_id=1]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<php>
-	$this->week_view = ( $this->week_view == 'row1' ) ? 'row2' : 'row1';
-</php>
- 
-<li id='day-{$year}_{$mid}_{$date}' class='day {$this->week_view} <if test="$queued != 0">{$this->lang->words['moderated']}</if>'>
-	<h3 class='bar'>$wday</h3>
-	<div>
-		<span class='date altrow'>$date</span>
-		{$events}
-	</div>
-</li>]]></template_content>
-      <template_name>cal_week_dayentry</template_name>
-      <template_data><![CDATA[$wday="",$date="",$month="",$mid="",$year="",$events="",$queued=0]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<div class="divpad">
-	<b><a href="{parse url="app=calendar&amp;module=calendar&amp;$link" base="public"}">$text</a></b>
-</div>]]></template_content>
-      <template_name>cal_week_events_wrap</template_name>
-      <template_data><![CDATA[$link="",$text=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<div style="background-color: $bg; color: $ft; padding: 3px; border: 1px outset $bg; width: 50%;">
-	<a href='{parse url="app=calendar&amp;module=calendar&amp;$link" base="public"}' style="color: $ft;">$text</a>
-</div>]]></template_content>
-      <template_name>cal_week_events_wrap_range</template_name>
-      <template_data><![CDATA[$link="",$text="",$ft="",$bg=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<li class='month_bar'>
-	$month $year
-</li>]]></template_content>
-      <template_name>cal_week_monthbar</template_name>
-      <template_data><![CDATA[$month="",$year=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_ranged']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_range</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_recurring']}
-<br />{$this->lang->words['c_fromcolon']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}
-<br />{$this->lang->words['c_tocolon']} {$event['_to_month']}/{$event['_to_day']}/{$event['_to_year']}</p>]]></template_content>
-      <template_name>calendar_rss_recurring</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<p>{$event['event_content']}</p>
-<br />
-<p>{$this->lang->words['c_singleday']} {$event['_from_month']}/{$event['_from_day']}/{$event['_from_year']}</p>]]></template_content>
-      <template_name>calendar_rss_single</template_name>
-      <template_data>$event</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<div class="formsubtitle">{$this->lang->words['cal_birthdays']}</div>
-<div class="tablepad">
-	<ul>
-	<foreach loop="birthdays:$rows as $r">
-		<li><a href="{parse url="showuser={$r['uid']}" base="public"}">{$r['uname']}</a> ({$r['age']})</li>
-	</foreach>
-	</ul>
-</div>]]></template_content>
-      <template_name>calendarBirthdayList</template_name>
-      <template_data>$rows</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<script type='text/javascript'>
-	ipb.calendar.inSection = 'form';
-</script>
-<div class='post_form'>
-<form id='postingform' action="{parse url="app=calendar&module=calendar&amp;do={$code}&amp;cal_id={$calendar_id}&amp;formtype={$formtype}&amp;event_id={$event_id}" base="public"}" method="post" name="REPLIER">
-	<input type="hidden" name="removeattachid" value="" />
-	
-	<h2>{$form_title}</h2>
-	<ul class='topic_options'></ul>
-	
-	<fieldset>
-		<h3 class='bar'>{$this->lang->words['event_details']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_title'>{$this->lang->words['calendar_title']}</label>
-				<input type='text' id='event_title' class='input_text' name='event_title' value="{$event_title}" size='50' maxlength='50' />
-			</li>
-			
-			<if test="$formtype == 'single'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<!-- SKINNOTE: Update this to use the calendar picker? -->
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			</if>
-			
-			<if test="$formtype == 'range'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='end_day'>{$this->lang->words['fv_range_ends']}</label>
-				<select class='input_select' name="end_day" id='end_day'>{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="$formtype == 'recur'">
-			<li class='field'>
-				<label for='e_day'>{$this->lang->words['fv_single']}</label>
-				<select class='input_select' name="e_day" id='e_day'>{$event_date['nd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_month">{$event_date['nm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="e_year">{$event_date['ny']}</select>
-			</li>
-			<li class='field'>
-				<label for='recur_unit'>{$this->lang->words['fv_recur']}</label>
-				{$this->lang->words['fv_recur_every']} 
-				<select class='input_select' name="recur_unit" id='recur_unit'>{$event_date['recur_unit']}</select>
-				
-				{$this->lang->words['fv_until']}
-				<select class='input_select' name="end_day">{$event_date['fd']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_month">{$event_date['fm']}</select>&nbsp;&nbsp;
-				<select class='input_select' name="end_year">{$event_date['fy']}</select>
-			</li>
-			</if>
-			
-			<if test="$event_type['timestuff']['formtype'] != 'range'">
-			<li class='field checkbox'>
-				<input class='input_check' type='checkbox' id='set_times' name='set_times' {$event_type['timestuff']['checked']} value='1' /> 
-				<label for='set_times'>{$this->lang->words['form_set_times']}</label>
-			</li>
-			<li class='field time_setting'>
-				<label for='timezone'>{$this->lang->words['form_tz']}</label>
-				{$event_type['timezone']}
-			</li>
-			<li class='field time_setting'>
-				<label for='tz_start'>{$this->lang->words['form_timestart']}</label>
-				<input class='input_text' type='text' size='8' id='tz_start' name='event_timestart' value='{$event_type['timestuff']['timestart']}' />
-			</li>
-			</if>
-		</ul>
-		<h3 class='bar'>{$this->lang->words['event_options']}</h3>
-		<ul>
-			<li class='field'>
-				<label for='event_calendar_id'>{$this->lang->words['form_whichcal']}</label>
-				<select name='event_calendar_id' id='event_calendar_id'>{$event_type['dropdown']}</select>
-			</li>
-			<li class='field'>
-				<label for='e_type'>{$this->lang->words['calendar_event_type']}</label>
-				<select name="e_type" id='e_type'>
-					<option value="public"{$event_type['pub_select']}>{$this->lang->words['calendar_type_public']}</option>
-					<option value="private"{$event_type['priv_select']}>{$this->lang->words['calendar_type_private']}</option>
-				</select>
-			</li>
-			<if test="$this->memberData['g_access_cp']">
-			<li class='field type_setting'>
-				<label for='e_groups'>{$this->lang->words['calendar_group_filter']}</label>
-				<select name="e_groups[]" id='e_groups' size="5" multiple='multiple'>{$groups}</select>
-			</li>
-			<li class='field checkbox type_setting'>
-				<input type='checkbox' id='all_groups' value='1' class='input_check' />
-				<label for='all_groups'>{$this->lang->words['all_groups']}</label>
-			</if>
-		</ul>
-		<script type='text/javascript'>
-			<if test="$event_type['timestuff']['divhide'] == 'none'">
-			$$('.time_setting').invoke('hide');
-			</if>
-			
-			<if test="$this->memberData['g_access_cp']">
-			ipb.calendar.hideAdminOptions();
-			</if>
-		</script>
-		<h3 class='bar'>{$this->lang->words['event']}</h3>
-		<ul>
-			<li>{$editor}</li>
-			<li class='field checkbox'>
-				<input type="checkbox" name="enableemo" class="input_check" value="yes" {$formData['checkBoxes']['emo']} />
-				<label for='enableemo'>{$this->lang->words['enable_emo']}</label>
-			</li>
-		</ul>
-	</fieldset>
-	<fieldset class='submit'>
-		<input class='input_submit' type="submit" value="{$button}" tabindex="4" /> {$this->lang->words['or']} <a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$calendar_id}" base="public"}' title='{$this->lang->words['cancel']}' class='cancel'>{$this->lang->words['cancel']}</a>
-	</fieldset>
-</form>
-</div>]]></template_content>
-      <template_name>calendarEventForm</template_name>
-      <template_data><![CDATA[$code="", $calendar_id="", $formtype="", $event_id='', $event_title='', $form_title='', $event_date='', $event_type='', $groups, $button, $editor]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<script type="text/javascript">
-	function calendar_event_delete(id, cal_id)
-	{
-		if (confirm('{$this->lang->words['js_del_1']}'))
-		{
-			 window.location.href = "{$this->settings['base_url']}app=calendar&amp;module=calendar&amp;do=delete&md5check={$this->member->form_hash}&event_id=" + id + "&cal_id=" + cal_id;
-		 }
-		 else {
-			alert ('{$this->lang->words['js_del_2']}');
-		} 
-	}
-</script>
-<!--SKINNOTE: I commented this out because we need to show event titles, and this seemed "prettiest", but feel free to change -->
-<!--<h2>{$this->lang->words['cal_title_events']}</h2>
-<ul class='topic_options'></ul>-->
-{$events}]]></template_content>
-      <template_name>calendarEventsList</template_name>
-      <template_data>$events</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[{parse js_module="calendar"}
-<h2>{$this->lang->words['calendars']}</h2>
-<div id='calendar_list' class='general_box'>
-	<if test="is_array( $calendars ) && count( $calendars )">
-	<p><strong>{$this->lang->words['select_calendar']}</strong></p>
-	<ol>
-		<foreach loop="$calendars as $cid => $cal">
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cid}" base="public"}' title="{$this->lang->words['view_this_calendar']}">{$cal['cal_title']}</a></li>
-		</foreach>
-	</ol>
-	</if>
-		<form action="{parse url="app=calendar&amp;module=calendar" base="public"}" method="post">
-			<strong>{$this->lang->words['jump_to']}</strong><br />
-			<fieldset>
-				<label for='m' class='hide'>{$this->lang->words['fv_months']}:</label>
-				<select name="m" class='input_select'><!--IBF.MONTH_BOX--></select>&nbsp;
-				<label for='year' class='hide'>{$this->lang->words['fv_years']}:</label>
-				<select name="year" class='input_select'><!--IBF.YEAR_BOX--></select>&nbsp;
-				<input type='submit' class='input_submit' value='{$this->lang->words['jmp_go']}' />
-			</fieldset>
-		</form>
-</div>
-<div id='current_calendar'>
-	<div class='topic_controls'>
-		<ul class='pagination'>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$prev['month_id']}&amp;y={$prev['year_id']}" base="public"}" title="{$prev['month_name']} {$prev['year_id']}">{$this->lang->words['_larr']} {$this->lang->words['month_previous']}</a></li>
-			<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;m={$next['month_id']}&amp;y={$next['year_id']}" base="public"}" title="{$next['month_name']} {$next['year_id']}">{$this->lang->words['month_next']} {$this->lang->words['_rarr']}</a></li>
-		</ul>
-		<ul class='topic_buttons'>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=single" base="public"}' title='{$this->lang->words['se_normal']}'>{parse replacement="cal_single"} {$this->lang->words['event_add_single']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=range" base="public"}' title='{$this->lang->words['se_range']}'>{parse replacement="cal_ranged"} {$this->lang->words['event_add_ranged']}</a></li>
-			<li><a href='{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=newevent&amp;formtype=recur" base="public"}' title='{$this->lang->words['se_recur']}'>{parse replacement="cal_recurring"} {$this->lang->words['event_add_recurring']}</a></li>
-		</ul>
-	</div>
-	<br />
-	
-	<table id='calendar_table' class='ipb_table' summary="{$this->lang->words['calendar_for']} $month $year">
-		<caption>$month $year</caption>
-		<tr class='header'>
-				<th class='head_week' scope='col'>&nbsp;</th>
-			<foreach loop="days:$day_words as $day">
-				<th scope='col'>{$day}</th>
-			</foreach>
-			<!--IBF.DAYS_CONTENT-->
-		</tr>
-	</table>
-	
-	<ul class='pagination'>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thismonth" base="public"}">{$this->lang->words['aa_cur_month']}</a></li>
-		<li><a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$cal_id}&amp;do=find&amp;what=thisweek" base="public"}">{$this->lang->words['aa_view_week']}</a></li>
-	</ul>
-</div>
-<div id='mini_calendars'>
-	<!--PREV.MONTH-->
-	<br />
-	<!--NEXT.MONTH-->
-</div>		
-<br />]]></template_content>
-      <template_name>calendarMainContent</template_name>
-      <template_data><![CDATA[$calendars, $month="",$year="",$prev="",$next="",$cal_jump="",$cal_id="",$day_words=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class='blank'><!-- no content --></td>]]></template_content>
-      <template_name>mini_cal_blank_cell</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td>
-	$month_day
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<td class="today">
-	<strong>$month_day</strong>
-</td>]]></template_content>
-      <template_name>mini_cal_date_cell_today</template_name>
-      <template_data><![CDATA[$month_day="",$events=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[<!-- <a href="{parse url="app=calendar&module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;m={$mid}&amp;y=$year" base="public"}"> -->
-<php>
-	$this->mini_cal = 'row2';
-</php>	
-<h3>{$month} {$year}</h3>
-<table class='mini_cal'>
-	<tr class='header'>
-		<th class='head_week'>&nbsp;</th>
-	<foreach loop="days:$day_words as $day">
-		<th>{parse expression="IPSText::mbsubstr( $day, 0, 1 )"}</th>
-	</foreach>
-	</tr>
-	{$events}
-</table>]]></template_content>
-      <template_name>mini_cal_mini_wrap</template_name>
-      <template_data><![CDATA[$month="",$mid="",$year="",$events="",$day_words=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_calendar</template_group>
-      <template_content><![CDATA[</tr>
-	<!-- NEW ROW-->
-	<php>
-		$this->mini_cal = ( $this->mini_cal == 'row1' ) ? 'row2' : 'row1';
-	</php>
-<tr class='{$this->mini_cal}'>
-	<th class='view_week'>
-		<a href="{parse url="app=calendar&amp;module=calendar&amp;cal_id={$this->request['_cal_id']}&amp;do=showweek&amp;week=$week" base="public"}" title='{$this->lang->words['view_this_week']}' ><img src="{$this->settings['img_url']}/next.png" alt='' /></a>
-	</th>]]></template_content>
-      <template_name>mini_cal_new_row</template_name>
-      <template_data><![CDATA[$week=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/hooks.xml b/upload/admin/applications_addon/ips/calendar/xml/hooks.xml
deleted file mode 100644
index b4bff379..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/hooks.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hooks>
-	<hook>
-		<file>board_index_calendar.xml</file>
-		<enabled>0</enabled>
-	</hook>
-</hooks>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/xml/hooks/board_index_calendar.xml b/upload/admin/applications_addon/ips/calendar/xml/hooks/board_index_calendar.xml
deleted file mode 100644
index a8b65429..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/hooks/board_index_calendar.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<hookexport>
-  <hookdata>
-    <config>
-      <hook_name>Календарь</hook_name>
-      <hook_desc>Выводит на главной �транице мини-календарь</hook_desc>
-      <hook_author>Invision Power Services, Inc.</hook_author>
-      <hook_email/>
-      <hook_website/>
-      <hook_update_check/>
-      <hook_requirements><![CDATA[a:4:{s:20:"hook_ipb_version_min";i:3;s:20:"hook_ipb_version_max";i:0;s:20:"hook_php_version_min";s:0:"";s:20:"hook_php_version_max";s:0:"";}]]></hook_requirements>
-      <hook_version_human>1.0.0</hook_version_human>
-      <hook_version_long/>
-      <hook_extra_data><![CDATA[a:1:{s:7:"display";N;}]]></hook_extra_data>
-      <hook_key>calendar</hook_key>
-    </config>
-  </hookdata>
-  <hookfiles>
-    <file>
-      <hook_file_real>boardIndexCalendar.php</hook_file_real>
-      <hook_type>templateHooks</hook_type>
-      <hook_classname>boardIndexCalendar</hook_classname>
-      <hook_data><![CDATA[a:6:{s:15:"classToOverload";N;s:9:"skinGroup";s:11:"skin_boards";s:12:"skinFunction";s:18:"boardIndexTemplate";s:4:"type";s:7:"foreach";s:2:"id";s:11:"side_blocks";s:8:"position";s:9:"outer.pre";}]]></hook_data>
-      <hooks_source><![CDATA[<?php
-
-class boardIndexCalendar
-{
-	public $registry;
-	
-	public function __construct()
-	{
-        /* Make registry objects */
-		$this->registry		=  ipsRegistry::instance();
-		$this->DB			=  $this->registry->DB();
-		$this->settings		=& $this->registry->fetchSettings();
-		$this->lang			=  $this->registry->getClass('class_localization');
-	}
-	
-	public function getOutput()
-	{
-		/* Load language  */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_calendar' ) );
-		
-		/* Load calendar library */		
-		require_once( IPSLib::getAppDir( 'calendar' ) .'/modules_public/calendar/calendars.php' );
-		$cal = new public_calendar_calendar_calendars( $this->registry );
-		$cal->makeRegistryShortcuts( $this->registry );
-		$cal->initCalendar();	
-		
-		/* Return calendar */
-		return "<div id='mini_calendars' class='calendar_wrap'>". $cal->getMiniCalendar( date('n'), date('Y') ) . '</div><br />';
-	}
-}]]></hooks_source>
-    </file>
-  </hookfiles>
-  <hookextras_settings/>
-  <hookextras_language/>
-  <hookextras_modules/>
-  <hookextras_help/>
-  <hookextras_templates/>
-  <hookextras_tasks/>
-  <hookextras_database_create/>
-  <hookextras_database_alter/>
-  <hookextras_database_update/>
-  <hookextras_database_insert/>
-</hookexport>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/hooks/index.html b/upload/admin/applications_addon/ips/calendar/xml/hooks/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/hooks/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/xml/index.html b/upload/admin/applications_addon/ips/calendar/xml/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/xml/information.xml b/upload/admin/applications_addon/ips/calendar/xml/information.xml
deleted file mode 100644
index 27fd722b..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/information.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<information>
-	<data>
-		<name>Календарь</name>
-		<public_name>Календарь</public_name>
-		<author>Invision Power Services, Inc.</author>
-		<description></description>
-		<ipskey>fa038db69fa627d8e8e034d65f554d1f</ipskey>
-		<templategroups>
-			<template match="exact">skin_calendar</template>
-		</templategroups>
-	</data>
-</information>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/calendar/xml/public_calendar_language_pack.xml b/upload/admin/applications_addon/ips/calendar/xml/public_calendar_language_pack.xml
deleted file mode 100644
index 288fa60c..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/public_calendar_language_pack.xml
+++ /dev/null
@@ -1,726 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<languageexport>
-  <languagegroup>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_delete_title</word_key>
-      <word_default>Delete Event</word_default>
-      <word_custom>Удалить �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_prefix</word_key>
-      <word_default>Event:</word_default>
-      <word_custom>Событие:</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>approve_event</word_key>
-      <word_default>Approve Event</word_default>
-      <word_custom>Опубликовать</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>today_title</word_key>
-      <word_default>TODAY</word_default>
-      <word_custom>СЕГОД�Я</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_delete_button</word_key>
-      <word_default>Delete</word_default>
-      <word_custom>Удалить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_edit_title</word_key>
-      <word_default>Edit Event</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendars</word_key>
-      <word_default>Calendars</word_default>
-      <word_custom>Календари</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>select_calendar</word_key>
-      <word_default>Select a calendar to view</word_default>
-      <word_custom>Выберите календарь</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>view_event</word_key>
-      <word_default>View event</word_default>
-      <word_custom>Про�мотр �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_edit_button</word_key>
-      <word_default>Edit</word_default>
-      <word_custom>Изменить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>view_this_calendar</word_key>
-      <word_default>View this calendar</word_default>
-      <word_custom>Про�мотр</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>jump_to</word_key>
-      <word_default>Jump to</word_default>
-      <word_custom>Перейти к</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>month_previous</word_key>
-      <word_default>Previous Month</word_default>
-      <word_custom>Предыдущий ме��ц</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>month_next</word_key>
-      <word_default>Next Month</word_default>
-      <word_custom>Следующий ме��ц</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>week_previous</word_key>
-      <word_default>Previous Week</word_default>
-      <word_custom>Предыдуща� недел�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>week_next</word_key>
-      <word_default>Next Week</word_default>
-      <word_custom>Следующа� недел�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_add_single</word_key>
-      <word_default>Add Single Event</word_default>
-      <word_custom>Однодневное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_add_ranged</word_key>
-      <word_default>Add Ranged Event</word_default>
-      <word_custom>Многодневное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_add_recurring</word_key>
-      <word_default>Add Recurring Event</word_default>
-      <word_custom>Повтор�ющее�� �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_for</word_key>
-      <word_default>Calendar for</word_default>
-      <word_custom>Календарь дл�  </word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>report_event</word_key>
-      <word_default>Report event</word_default>
-      <word_custom>Жалоба</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>view_this_week</word_key>
-      <word_default>View this week</word_default>
-      <word_custom>Про�мотреть неделю</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>unapprove_event</word_key>
-      <word_default>Unapprove Event</word_default>
-      <word_custom>Скрыть</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>week_beginning</word_key>
-      <word_default>Week beginning</word_default>
-      <word_custom>�ачало недели:</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_details</word_key>
-      <word_default>Event Details</word_default>
-      <word_custom>Детали</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_options</word_key>
-      <word_default>Event Options</word_default>
-      <word_custom>Опции</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>form_set_times</word_key>
-      <word_default><![CDATA[If this is not an all-day event, do you wish to specify a 'start' time?]]></word_default>
-      <word_custom>Е�ли �то �обытие не дей�твует ве�ь день, вы можете указать начальное врем�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event</word_key>
-      <word_default>Event</word_default>
-      <word_custom>Событие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>form_timestart</word_key>
-      <word_default>Start Time (HH:MM)</word_default>
-      <word_custom>�ачальное врем� (ЧЧ:ММ)</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>show_n_events</word_key>
-      <word_default>(%s) Events</word_default>
-      <word_custom>(%s) �обытий</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>form_whichcal</word_key>
-      <word_default>Add to Calendar</word_default>
-      <word_custom>Добавить в</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>form_tz</word_key>
-      <word_default>Event Time Zone</word_default>
-      <word_custom>Временна� зона �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>all_groups</word_key>
-      <word_default>All Groups</word_default>
-      <word_custom>В�е группы</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_group_filter</word_key>
-      <word_default><![CDATA[Can be viewed by<br /><em>(Admin option)</em>]]></word_default>
-      <word_custom>Опци� админи�траторов&#13;
-(до�тупна только дл� публичных �обытий)</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_title</word_key>
-      <word_default>Event Title</word_default>
-      <word_custom>Заголовок �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>new_event_mod</word_key>
-      <word_default><![CDATA[Your event has been posted to the moderation queue and will require approval before it's shown]]></word_default>
-      <word_custom>Опубликованное вами �обытие добавлено в �пи�ок на проверку модератором, только по�ле его одобрени� оно будет опубликовано</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>cal_event_delete</word_key>
-      <word_default>Calendar event removed</word_default>
-      <word_custom>Календарное �обытие было удалено</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_type_public</word_key>
-      <word_default>Public Event (Viewable by all)</word_default>
-      <word_custom>Публичное �обытие (видно в�ем)</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_type_private</word_key>
-      <word_default>Personal Event (Viewable by you only)</word_default>
-      <word_custom>Приватное �обытие (видно только вам)</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_event_type</word_key>
-      <word_default>Type of Event</word_default>
-      <word_custom>Тип �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_submit</word_key>
-      <word_default>Add Calendar Event</word_default>
-      <word_custom>Добавить �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>calendar_edit_submit</word_key>
-      <word_default>Edit Event</word_default>
-      <word_custom>Изменить �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>entry_birthdays</word_key>
-      <word_default>(%s) Birthdays</word_default>
-      <word_custom>Именинников: %s</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>post_new_event</word_key>
-      <word_default>Manage Calendar Event</word_default>
-      <word_custom>Управление �обыти�ми календар�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>bd_birthday</word_key>
-      <word_default><![CDATA['s Birthday]]></word_default>
-      <word_custom>день рождени�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>aa_cur_month</word_key>
-      <word_default>View Current Month</word_default>
-      <word_custom>Текущий ме��ц</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>aa_view_week</word_key>
-      <word_default>View Current Week</word_default>
-      <word_custom>Текуща� недел�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_single</word_key>
-      <word_default>Event On/Starts</word_default>
-      <word_custom>Дата �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_range_ends</word_key>
-      <word_default>Ends</word_default>
-      <word_custom>Завершить</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_recur</word_key>
-      <word_default>Recurring Event</word_default>
-      <word_custom>Повтор�ющее�� �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_recur_every</word_key>
-      <word_default>Every</word_default>
-      <word_custom> </word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_months</word_key>
-      <word_default>Month</word_default>
-      <word_custom>Ежеме��чно</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_days</word_key>
-      <word_default>Week</word_default>
-      <word_custom>Еженедельно</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_years</word_key>
-      <word_default>Year</word_default>
-      <word_custom>Ежегодно</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>fv_until</word_key>
-      <word_default>Until</word_default>
-      <word_custom>до</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>tbt_recur</word_key>
-      <word_default>Recurring Event</word_default>
-      <word_custom>Повтор�ющее�� �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>se_recur</word_key>
-      <word_default>Recurring Event</word_default>
-      <word_custom>Повтор�ющее�� �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>se_range</word_key>
-      <word_default>Ranged Event</word_default>
-      <word_custom>Многодневное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>se_normal</word_key>
-      <word_default>Single Day Event</word_default>
-      <word_custom>Событие на один день</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>js_del_2</word_key>
-      <word_default>Action cancelled</word_default>
-      <word_custom>Дей�твие отменено</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>se_ends</word_key>
-      <word_default>ends</word_default>
-      <word_custom>до</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>js_del_1</word_key>
-      <word_default>Are you sure you want to delete this event?</word_default>
-      <word_custom>Вы точно хотите удалить �то �обытие?</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>page_title</word_key>
-      <word_default>Calendar</word_default>
-      <word_custom>Календарь</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>cal_birthdays</word_key>
-      <word_default>Birthdays</word_default>
-      <word_custom>Дни рождени�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>cal_title_events</word_key>
-      <word_default>Calendar Events</word_default>
-      <word_custom>Календарные �обыти�</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>new_event_redirect</word_key>
-      <word_default>Your calendar event has been posted</word_default>
-      <word_custom>Ваше календарное �обытие у�пешно добавлено</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>private_event</word_key>
-      <word_default>Private Event</word_default>
-      <word_custom>Приватное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>public_event</word_key>
-      <word_default>Public Event</word_default>
-      <word_custom>Публичное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>restricted_event</word_key>
-      <word_default>Restricted Event</word_default>
-      <word_custom>Ограниченное �обытие</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>edit_event_redirect</word_key>
-      <word_default>the calendar event has been edited</word_default>
-      <word_custom>календарное �обытие отредактировано</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>event_date</word_key>
-      <word_default>Event Date:</word_default>
-      <word_custom>Дата �обыти�:</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>calendar</word_app>
-      <word_pack>public_calendar</word_pack>
-      <word_key>moderated</word_key>
-      <word_default>moderated</word_default>
-      <word_custom>отмодерирован</word_custom>
-      <word_default_version>30007</word_default_version>
-      <word_custom_version/>
-      <word_js>0</word_js>
-    </lang>
-  </languagegroup>
-</languageexport>
diff --git a/upload/admin/applications_addon/ips/calendar/xml/versions.xml b/upload/admin/applications_addon/ips/calendar/xml/versions.xml
deleted file mode 100644
index 9b46ee91..00000000
--- a/upload/admin/applications_addon/ips/calendar/xml/versions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<versions>
-	<version>
-		<human>3.1.4</human>
-		<long>31007</long>
-	</version>
-</versions>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/index.html b/upload/admin/applications_addon/ips/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications_addon/ips/index.html
+++ b/upload/admin/applications_addon/ips/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/extensions/coreExtensions.php b/upload/admin/applications_addon/ips/portal/extensions/coreExtensions.php
deleted file mode 100644
index aa6f64e4..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/coreExtensions.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Library: Handle public session data
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		12th March 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class publicSessions__portal
-{
-	/**
-	 * Return session variables for this application
-	 *
-	 * current_appcomponent, current_module and current_section are automatically
-	 * stored. This function allows you to add specific variables in.
-	 *
-	 * @access	public
-	 * @author	Matt Mecham
-	 * @return	array
-	 */
-	public function getSessionVariables()
-	{
-		return array();
-	}
-	
-	
-	/**
-	 * Parse/format the online list data for the records
-	 *
-	 * @access	public
-	 * @author	Brandon Farber
-	 * @param	array 			Online list rows to check against
-	 * @return	array 			Online list rows parsed
-	 */
-	public function parseOnlineEntries( $rows )
-	{
-		if( !is_array($rows) OR !count($rows) )
-		{
-			return $rows;
-		}
-
-		$final = array();
-		
-		//-----------------------------------------
-		// Extract the topic/forum data
-		//-----------------------------------------
-		
-		foreach( $rows as $row )
-		{
-			if( $row['current_appcomponent'] == 'portal' )
-			{
-				$row['where_line']		= ipsRegistry::getClass( 'class_localization' )->words['WHERE_portal'];
-			}
-			
-			$final[ $row['id'] ] = $row;
-		}
-
-		return $final;
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/extensions/coreVariables.php b/upload/admin/applications_addon/ips/portal/extensions/coreVariables.php
deleted file mode 100644
index d16d304f..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/coreVariables.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Core variables for portal
- * Last Updated: $LastChangedDate: 2010-10-05 21:26:08 -0400 (Tue, 05 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		27th January 2004
- * @version		$Rev: 6945 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Array for holding reset information
-*
-* Populate the $_RESET array and ipsRegistry will do the rest
-*/
-
-$_RESET = array();
-
-###### Redirect requests... ######
-
-if( ! $_REQUEST['module'] AND $_REQUEST['app'] == 'portal' )
-{
-	$_RESET['module'] = 'portal';
-}
-
-
-$_LOAD = array();
-
-
-$_LOAD['portal']			= 1;
-$_LOAD['emoticons']			= 1;
-$_LOAD['bbcode']			= 1;
-$_LOAD['badwords']			= 1;
-$_LOAD['calendars']			= 1;
-$_LOAD['ranks']				= 1;
-$_LOAD['reputation_levels']	= 1;
-$_LOAD['attachtypes']		= 1;
-
-$CACHE['portal'] = array( 
-								'array'            => 1,
-								'allow_unload'     => 0,
-							    'default_load'     => 1,
-							    'recache_file'     => IPSLib::getAppDir( 'portal' ) . '/modules_admin/portal/portal.php',
-								'recache_class'    => 'admin_portal_portal_portal',
-							    'recache_function' => 'portalRebuildCache' 
-							);
diff --git a/upload/admin/applications_addon/ips/portal/extensions/index.html b/upload/admin/applications_addon/ips/portal/extensions/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/index.html b/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal-cfg.php b/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal-cfg.php
deleted file mode 100644
index 86e1de9f..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal-cfg.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: portal
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 5713 $
- *
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* This file must be named {file_name_minus_php}-cfg.php
-*
-* Please see each variable for more information
-* $PORTAL_CONFIG is OK for each file, do not change
-* this array name.
-*/
-
-$PORTAL_CONFIG = array();
-
-/**
-* Main plug in title
-*
-*/
-$PORTAL_CONFIG['pc_title'] = 'Плагин портала';
-
-/**
-* Plug in mini description
-*
-*/
-$PORTAL_CONFIG['pc_desc']  = "Блок навигации и друже�твенных �айтов";
-
-/**
-* Keyword for settings. This is the keyword
-* entered into ibf_conf_settings_titles -> conf_title_keyword
-* Can be left blank.
-* PLEASE stick to the naming convention when entering a setting
-* keyword: portal_{file_name_minus_php} This will prevent
-* other keyword clashes. Likewise, when creating settings, choose
-* NOT to cache them (they will be loaded at run time) and always
-* prefix with {file_name_minus_php}_setting_key - for example
-* If you had a setting called "export_forums" then please name it
-* "recent_topics_export_forums". This will be available in
-* $this->settings['recent_topics_export_forums'] in the
-* main module.
-*/
-$PORTAL_CONFIG['pc_settings_keyword'] = "ipbportal";
-
-/**
-* Exportable tags key must be in the naming format of:
-* {file_name_minus_php}-tag. The value *MUST* be the function
-* which it corresponds to. For example:
-* 'recent_topics_last_x' => 'recent_topics_last_x'
-* The portal will look for function 'recent_topics_last_x' in
-* module "sources/portal_plugins/recent_topics.php" when it parses
-* the tag <!--::recent_topics_last_x::-->
-*
-* @param array[ TAG ] = array( FUNCTION NAME, DESCRIPTION );
-*/
-$PORTAL_CONFIG['pc_exportable_tags']['portal_sitenav'] = array( 'portal_sitenav', 'Выве�ти блок навигации' );
-$PORTAL_CONFIG['pc_exportable_tags']['portal_affiliates'] = array( 'portal_affiliates', 'Выве�ти блок друже�твенных �айтов' );
diff --git a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal.php b/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal.php
deleted file mode 100644
index 8f307868..00000000
--- a/upload/admin/applications_addon/ips/portal/extensions/portalPlugins/portal.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal plugin: portal
- * Last Updated: $Date: 2010-10-22 06:13:38 -0400 (Fri, 22 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 7016 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-class ppi_portal extends public_portal_portal_portal 
-{
-	/**
-	 * Initialize module
-	 *
-	 * @return	void
-	 */
-	public function init()
- 	{
- 	}
- 	
-	/**
-	 * Show the site navgiational block
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function portal_sitenav()
-	{
- 		if ( ! $this->settings['csite_nav_show'] )
- 		{
- 			return;
- 		}
- 		
- 		$links		= array();
- 		$raw_nav	= $this->settings['csite_nav_contents'];
- 		
- 		foreach( explode( "\n", $raw_nav ) as $l )
- 		{
- 			$l = str_replace( "&#039;", "'", $l );
- 			$l = str_replace( "&quot;", '"', $l );
- 			$l = str_replace( '{board_url}', $this->settings['base_url'], $l );
- 			
- 			preg_match( "#^(.+?)\[(.+?)\]$#is", trim($l), $matches );
- 			
- 			$matches[1] = trim($matches[1]);
- 			$matches[2] = trim($matches[2]);
- 			
- 			if ( $matches[1] and $matches[2] )
- 			{
-	 			$matches[1] = str_replace( '&', '&amp;', str_replace( '&amp;', '&', $matches[1] ) );
-	 			
-	 			$links[] = $matches;
- 			}
- 		}
- 		
- 		if( !count($links) )
- 		{
- 			return;
- 		}
-
- 		return $this->registry->getClass('output')->getTemplate('portal')->siteNavigation( $links );
-  	}
-  	
-	/**
-	 * Show the affiliates block
-	 *
-	 * @return	string		HTML content to replace tag with
-	 */
-	public function portal_affiliates()
-	{
- 		if ( ! $this->settings['csite_fav_show'] )
- 		{
- 			return;
- 		}
- 		
-		$this->settings['csite_fav_contents'] = str_replace( "&#039;", "'", $this->settings['csite_fav_contents'] );
-		$this->settings['csite_fav_contents'] = str_replace( "&quot;", '"', $this->settings['csite_fav_contents'] );
-		$this->settings['csite_fav_contents'] = str_replace( '{board_url}', $this->settings['base_url'], $this->settings['csite_fav_contents'] );
- 		
- 		return $this->registry->getClass('output')->getTemplate('portal')->affiliates();
- 	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/index.html b/upload/admin/applications_addon/ips/portal/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/index.html b/upload/admin/applications_addon/ips/portal/modules_admin/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/defaultSection.php b/upload/admin/applications_addon/ips/portal/modules_admin/portal/defaultSection.php
deleted file mode 100644
index 04f23782..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/defaultSection.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal default section
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $ 
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'portal';
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/index.html b/upload/admin/applications_addon/ips/portal/modules_admin/portal/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/portal.php b/upload/admin/applications_addon/ips/portal/modules_admin/portal/portal.php
deleted file mode 100644
index ba34bb14..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/portal.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * IP.Portal
- * Last Updated: $Date: 2010-10-21 14:02:34 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		1st April 2004
- * @version		$Revision: 7011 $
- */
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly.";
-	exit();
-}
-
-class admin_portal_portal_portal extends ipsCommand
-{
-	/**
-	 * Portal objects
-	 *
-	 * @var		array
-	 */
-	private $portal_objects		= array();
-	
-	/**
-	 * Skin object
-	 *
-	 * @var		object			Skin templates
-	 */
-	private $html;
-	
-	/**
-	 * Shortcut for url
-	 *
-	 * @var		string			URL shortcut
-	 */
-	private $form_code;
-	
-	/**
-	 * Shortcut for url (javascript)
-	 *
-	 * @var		string			JS URL shortcut
-	 */
-	private $form_code_js;
-	
-	/**
-	 * Main class entry point
-	 *
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		//-----------------------------------------
-		// Load HTML
-		//-----------------------------------------
-		
-		$this->html = $this->registry->output->loadTemplate( 'cp_skin_portal' );
-		
-		//-----------------------------------------
-		// Set up stuff
-		//-----------------------------------------
-		
-		$this->form_code	= $this->html->form_code	= 'module=portal&amp;section=portal';
-		$this->form_code_js	= $this->html->form_code_js	= 'module=portal&section=portal';
-		
-		//-----------------------------------------
-		// Load Language
-		//-----------------------------------------
-		
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'admin_portal' ) );
-		
-		//-------------------------------
-		// Get portal objects
-		//-------------------------------
-		
-		$this->_getPortalObjects();
-
-		//-----------------------------------------
-		// What to do?
-		//-----------------------------------------
-		
-		switch($this->request['do'])
-		{
-			case 'portal_settings':
-				$this->_portalSettings();
-			break;
-				
-			case 'portal_viewtags':
-				$this->_portalViewTags();
-			break;
-			
-			case 'manage':
-			default:
-				$this->_portalList();
-			break;
-		}
-		
-		//-----------------------------------------
-		// Pass to CP output hander
-		//-----------------------------------------
-		
-		$this->registry->getClass('output')->html_main .= $this->registry->getClass('output')->global_template->global_frame_wrapper();
-		$this->registry->getClass('output')->sendOutput();
-	}
-	
-	/**
-	 * Rebuild portal cache
-	 *
-	 * @return	void
-	 */
-	public function portalRebuildCache()
-	{
-		$cache = array();
-			
-		if ( ! is_array( $this->portal_objects ) or ! count( $this->portal_objects ) )
-		{
-			$this->_getPortalObjects();
-		}
-		
-		$cache = $this->portal_objects;
-		
-		$this->cache->setCache( 'portal', $cache, array( 'array' => 1 ) );
-	}
-	
-	/**
-	 * View portal tags (settings)
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _portalViewTags()
-	{
-		//-------------------------------
-		// INIT
-		//-------------------------------
-		
-		$pc_key		= IPSText::alphanumericalClean( $this->request['pc_key'] );
-		
-		foreach( $this->portal_objects as $key => $data )
-		{
-			if( $key == $pc_key )
-			{
-				$file = $data['_cfg_location'];
-			}
-		}
-
-		//-------------------------------
-		// Check
-		//-------------------------------
-		
-		if ( ! $pc_key OR ! file_exists( $file ) )
-		{
-			$this->registry->output->global_message = $this->lang->words['error_no_key'];
-			$this->_portalList();
-			return;
-		}
-		
-		//-------------------------------
-		// Grab config file
-		//-------------------------------
-		$PORTAL_CONFIG = array();
-		require( $file );
-
-		$this->registry->output->html .= $this->html->portal_pop_overview( $PORTAL_CONFIG['pc_title'], $PORTAL_CONFIG['pc_exportable_tags'] );
-		
-		//-------------------------------
-		// Print
-		//-------------------------------
-		
-		$this->registry->output->printPopupWindow();
-	}
-	
-	/**
-	 * Show settings for the portal
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _portalSettings()
-	{
-		//-------------------------------
-		// INIT
-		//-------------------------------
-
-		$pc_key	= IPSText::alphanumericalClean( $this->request['pc_key'] );
-
-		foreach( $this->portal_objects as $key => $data )
-		{
-			if( $key == $pc_key )
-			{
-				$file = $data['_cfg_location'];
-			}
-		}
-
-		//-------------------------------
-		// Check
-		//-------------------------------
-		
-		if ( ! $pc_key OR ! file_exists( $file ) )
-		{
-
-			$this->registry->output->global_message = $this->lang->words['error_no_key'];
-			$this->_portalList();
-			return;
-		}
-		
-		//-------------------------------
-		// Grab config file
-		//-------------------------------
-		$PORTAL_CONFIG = array();
-		require ( $file );
-
-		if ( ! $PORTAL_CONFIG['pc_settings_keyword'] )
-		{
-			$this->registry->output->global_message = $this->lang->words['error_no_settings'];
-			$this->_portalList();
-			return;
-		}
-		
-		//-------------------------------
-		// Grab, init and load settings
-		//-------------------------------
-		
-		$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'core' ).'/modules_admin/tools/settings.php', 'admin_core_tools_settings' );
-		$settings    = new $classToLoad();
-		$settings->makeRegistryShortcuts( $this->registry );
-		
-		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_tools' ), 'core' );
-		
-		$settings->html			= $this->registry->output->loadTemplate( 'cp_skin_tools', 'core' );		
-		$settings->form_code	= $settings->html->form_code    = 'module=tools&amp;section=settings';
-		$settings->form_code_js	= $settings->html->form_code_js = 'module=tools&section=settings';
-
-		$this->request['conf_title_keyword']	= $PORTAL_CONFIG['pc_settings_keyword'];
-		$settings->return_after_save			= $this->settings['base_url'] . $this->form_code . '&do=portal_settings&pc_key='.$pc_key;
-		$settings->base_nav_url					= $this->settings['base_url'] . $this->form_code . '&do=portal_settings&pc_key='.$pc_key;
-		$settings->_viewSettings();
-	}
-	
-	/**
-	 * List the portal objects
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _portalList()
-	{
-		$this->registry->output->html .= $this->html->portal_overview( $this->portal_objects );
-		
-		//-------------------------------
-		// Update cache
-		//-------------------------------
-			
-		$this->portalRebuildCache();
-	}
-	
-	/**
-	 * Get the portal objects from disk
-	 *
-	 * @return	void		[Outputs to screen]
-	 */
-	private function _getPortalObjects()
-	{
-		//-------------------------------
-		// Loop over each application
-		//-------------------------------
-		
-		foreach( ipsRegistry::$applications as $_app_dir => $app_data )
-		{
-			//-------------------------------
-			// Get the path to the plugins
-			//-------------------------------
-			
-			$path = IPSLib::getAppDir( $_app_dir ) . '/extensions/portalPlugins';
-
-			//-------------------------------
-			// Does it exist?
-			//-------------------------------
-			
-			if( !is_dir($path) OR !file_exists($path) )
-			{
-				continue;
-			}
-
-			//-------------------------------
-			// Open the dir and grab configs
-			//-------------------------------
-			
-			try
-			{
-				foreach( new DirectoryIterator($path) as $file )
-				{
-					if( $file->isDot() OR $file->isDir() )
-					{
-						continue;
-					}
-            	
-					//-------------------------------
-					// This is a file...
-					//-------------------------------
-				
-					if( $file->isFile() )
-					{
-						preg_match( "#^(.*)-cfg\.php$#", $file->getFilename(), $matches );
-						
-						//-------------------------------
-						// And it's a conf file, yahhh!
-						//-------------------------------
-            	
-						if ( $matches[0] AND $matches[1] )
-						{
-							$PORTAL_CONFIG = array();
-							
-							require_once( $file->getPathname() );
-							
-							if ( is_array( $PORTAL_CONFIG ) AND count( $PORTAL_CONFIG ) )
-							{
-								$PORTAL_CONFIG['pc_key']				= $matches[1];
-								$PORTAL_CONFIG['_cfg_location']			= str_replace( '\\', '/', $file->getPathname() );
-								$PORTAL_CONFIG['_file_location']		= str_replace( '\\', '/', str_replace( '-cfg', '', $file->getPathname() ) );
-								$PORTAL_CONFIG['_app_dir']				= $_app_dir;
-								$this->portal_objects[ $matches[1] ]	= $PORTAL_CONFIG;
-							}
-						}
-					}
-				}
-			} catch ( Exception $e ) {}
-		}
-		
-		if ( ! count($this->portal_objects) )
-		{
-			$this->registry->output->global_message = $this->lang->words['error_no_dir'];
-			return;
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/index.html b/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/permissions.xml b/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/permissions.xml
deleted file mode 100644
index 2b62659b..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_admin/portal/xml/permissions.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<permissions>
-	<group>
-	</group>
-</permissions>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_public/index.html b/upload/admin/applications_addon/ips/portal/modules_public/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_public/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_public/portal/defaultSection.php b/upload/admin/applications_addon/ips/portal/modules_public/portal/defaultSection.php
deleted file mode 100644
index 04f23782..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_public/portal/defaultSection.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal default section
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $ 
- **/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-/**
-* Very simply returns the default section if one is not
-* passed in the URL
-*/
-
-$DEFAULT_SECTION = 'portal';
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_public/portal/index.html b/upload/admin/applications_addon/ips/portal/modules_public/portal/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_public/portal/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/modules_public/portal/portal.php b/upload/admin/applications_addon/ips/portal/modules_public/portal/portal.php
deleted file mode 100644
index 344b99e6..00000000
--- a/upload/admin/applications_addon/ips/portal/modules_public/portal/portal.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * IP.Portal
- * Last Updated: $Date: 2010-10-21 14:02:34 -0400 (Thu, 21 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: ips_terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		1st April 2004
- * @version		$Revision: 7011 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class public_portal_portal_portal extends ipsCommand
-{
-	/**
-	 * Array of portal objects
-	 *
-	 * @access	protected
-	 * @var 	array 				Registered portal objects
-	 */
-	protected $portal_object		= array();
-
-	/**
-	 * Array of replacement tags
-	 *
-	 * @access	protected
-	 * @var 	array 				Replacement tags
-	 */
-	protected $replace_tags			= array();
-	
-	/**
-	 * Array of tags to module...
-	 *
-	 * @access	protected
-	 * @var 	array 				Tags => Modules mapping
-	 */
-	protected $remap_tags_module 	= array();
-	
-	/**
-	 * Array of tags to function...
-	 *
-	 * @access	protected
-	 * @var 	array 				Tags => Function mapping
-	 */
-	protected $remap_tags_function	= array();
-	
-	/**
-	 * Array of module objects
-	 *
-	 * @access	protected
-	 * @var 	array 				Module objects
-	 */
-	protected $module_objects		= array();
-	
-	/**
-	 * Basic template, replaced as needed
-	 *
-	 * @access	protected
-	 * @var 	string 				Basic skin template to replace
-	 */
-	protected $template				= array();
-
-	/**
-	 * Main class entry point
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void		[Outputs to screen]
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$conf_groups		= array();
-		$found_tags			= array();
-		$found_modules		= array();
-		
-		//-----------------------------------------
-		// Make sure the portal is installed an enabled
-		//-----------------------------------------
-		
-		if( ! IPSLib::appIsInstalled( 'portal' ) )
-		{
-			$this->registry->output->showError( 'no_permission', 1076, null, null, 404 );
-		}
-		
-		//-----------------------------------------
-		// Get settings...
-		//-----------------------------------------
-		
-		foreach( $this->cache->getCache('portal') as $portal_data )
-		{
-			if( ! IPSLib::appIsInstalled( $portal_data['_app_dir'] ) )
-			{
-				continue;
-			}
-			
-			if ( $portal_data['pc_settings_keyword'] )
-			{
-				$conf_groups[]	= "'" . $portal_data['pc_settings_keyword'] . "'";
-			}
-			
-			//-----------------------------------------
-			// Remap tags
-			//-----------------------------------------
-			
-			if ( is_array( $portal_data['pc_exportable_tags'] ) AND count( $portal_data['pc_exportable_tags'] ) )
-			{
-				foreach( $portal_data['pc_exportable_tags'] as $tag => $tag_data )
-				{
-					$this->remap_tags_function[ $tag ]	= $tag_data[0];
-					$this->remap_tags_module[ $tag ]	= $portal_data['pc_key'];
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Now really get them...
-		//-----------------------------------------
-		
-		$_where	= (is_array($conf_groups) AND count($conf_groups)) ? 't.conf_title_keyword IN(' . implode( ",", $conf_groups ) . ") OR " : '';
-		
-		$this->DB->build( array( 	'select'	=> 'c.conf_key, c.conf_value, c.conf_default',
-										'from'		=> array( 'core_sys_conf_settings' => 'c' ),
-										'where'		=> $_where . "c.conf_key LIKE 'csite%'",
-										'add_join'	=> array( 
-															array(
-																'select'	=> 't.conf_title_id, t.conf_title_keyword',
-								  								'from'		=> array( 'core_sys_settings_titles' => 't' ),
-								  								'where'		=> 'c.conf_group=t.conf_title_id',
-								  								'type'		=> "left"
-								  								)
-								  							),
-								)		);
-		$this->DB->execute();
-		
-		//-----------------------------------------
-		// Set 'em up
-		//-----------------------------------------
-		
-		while( $r = $this->DB->fetch() )
-		{
-			$this->settings[ $r['conf_key']] =  $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'] ;
-		}
-
-		//-----------------------------------------
-		// Get global skin and language files
-		//-----------------------------------------
-		
-		ipsRegistry::getClass( 'class_localization')->loadLanguageFile( array( 'public_portal' ) );
-
-		//-----------------------------------------
-		// Assign skeletal template ma-doo-bob
-		//-----------------------------------------
-		
-		$this->template = $this->registry->getClass('output')->getTemplate('portal')->skeletonTemplate();
-		
-		//-----------------------------------------
-		// Grab all special tags
-		//-----------------------------------------
-		
-		preg_match_all( "#<!--\:\:(.+?)\:\:-->#", $this->template, $match );
-		
-		//-----------------------------------------
-		// Assign functions
-		//-----------------------------------------
-		
-		for ( $i=0, $m=count($match[0]); $i < $m; $i++ )
-		{
-			$tag = $match[1][$i];
-			
-			if ( $this->remap_tags_module[ $tag ] )
-			{
-				$found_tags[ $tag ] = 1;
-				
-				if ( $this->remap_tags_module[ $tag ])
-				{
-					$found_modules[ $this->remap_tags_module[ $tag ] ] = 1;
-				}
-			}
-		}
-			
-		//-----------------------------------------
-		// Require modules...
-		//-----------------------------------------
-		
-		if ( is_array( $found_modules ) AND count( $found_modules ) )
-		{
-			foreach( $found_modules as $mod_name => $pointless )
-			{
-				if ( ! is_object( $this->module_objects[ $mod_name ] ) )
-				{
-					if ( file_exists( $this->caches['portal'][ $mod_name ]['_file_location'] ) )
-					{
-						$constructor = IPSLib::loadLibrary( $this->caches['portal'][ $mod_name ]['_file_location'], 'ppi_' . $mod_name, $this->caches['portal'][ $mod_name ]['_app_dir'] );
-						$this->module_objects[ $mod_name ] = new $constructor();
-						$this->module_objects[ $mod_name ]->makeRegistryShortcuts( $this->registry );
-						$this->module_objects[ $mod_name ]->init();
-					}
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Get the tag replacements...
-		//-----------------------------------------
-		
-		if ( is_array( $found_tags ) AND count( $found_tags ) )
-		{
-			foreach( $found_tags as $tag_name => $even_more_pointless )
-			{
-				$mod_obj	= $this->remap_tags_module[ $tag_name ];
-				$fun_obj	= $this->remap_tags_function[ $tag_name ];
-				
-				if ( method_exists( $this->module_objects[ $mod_obj ], $fun_obj ) )
-				{
-					$this->replace_tags[ $tag_name ] = $this->module_objects[ $mod_obj ]->$fun_obj();
-					continue;
-				}
-			}
-		}
-		
-		$this->_do_output();
- 	}
- 	
- 	/**
- 	 * Internal do output method.  Extend class and overwrite method if you need to modify this functionality.
- 	 *
- 	 * @access	protected
- 	 * @return	void
- 	 */
- 	protected function _do_output()
- 	{
- 		//-----------------------------------------
-		// SITE REPLACEMENTS
-		//-----------------------------------------
-		
-		foreach( $this->replace_tags as $sbk => $sbv )
-		{
-			$this->template = str_replace( "<!--::" . $sbk . "::-->", $sbv, $this->template );
-		}
- 		
- 		//-----------------------------------------
- 		// Pass to print...
- 		//-----------------------------------------
- 		
- 		$this->registry->output->addContent( $this->template );
- 		$this->registry->output->setTitle( $this->settings['csite_title'] );
- 		$this->registry->output->addNavigation( $this->settings['csite_title'], 'app=portal' );
- 		
- 		$this->registry->output->sendOutput();
-
-		exit();
- 	}
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/skin_cp/cp_skin_portal.php b/upload/admin/applications_addon/ips/portal/skin_cp/cp_skin_portal.php
deleted file mode 100644
index c211d705..00000000
--- a/upload/admin/applications_addon/ips/portal/skin_cp/cp_skin_portal.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Portal skin file
- * Last Updated: $Date: 2010-05-19 21:06:53 -0400 (Wed, 19 May 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Portal
- * @link		http://www.invisionpower.com
- * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6326 $
- */
- 
-class cp_skin_portal extends output 
-{
-
-/**
- * Prevent our main destructor being called by this class
- *
- * @access	public
- * @return	void
- */
-public function __destruct()
-{
-}
-
-/**
- * Portal tag details
- *
- * @access	public
- * @param	string		Page title
- * @param	array 		Available tags
- * @return	string		HTML
- */
-public function portal_pop_overview( $title, $tags ) {
-
-$IPBHTML = "";
-//--starthtml--//
-$IPBHTML .= <<<EOF
-<div class='acp-box'>
-	<h3>{$this->lang->words['portal_pop_tags']} {$title}</h3>
-	<table class='alternate_rows' width='100%'>
-		<tr>
-			<th width='30%'>{$this->lang->words['portal_pop_name']}</th>
-			<th width='70%'>{$this->lang->words['portal_pop_desc']}</th>
-		</tr>
-EOF;
-
-if ( is_array( $tags ) AND count( $tags ) )
-{
-	foreach( $tags as $tag => $tag_data )
-	{
-		$IPBHTML .= <<<EOF
-		<tr>
-			<td>&lt;!--::<strong>{$tag}</strong>::--&gt;</td>
-			<td><div class='desctext'>{$tag_data[1]}</td>
-		</tr>
-EOF;
-	}
-}
-		
-$IPBHTML .= <<<EOF
-	</table>
-</div>
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-/**
- * Portal overview
- *
- * @access	public
- * @param	array 		Available portal objects
- * @return	string		HTML
- */
-public function portal_overview( $objects ) {
-
-$IPBHTML = "";
-//--starthtml--//
-$IPBHTML .= <<<EOF
-<div class='section_title'>
-	<h2>{$this->lang->words['main_title']}</h2>
-</div>
-
-<div class='acp-box'>
-	<h3>{$this->lang->words['portal_main_title']}</h3>
-	
-	<table class='alternate_rows' width='100%'>
-		<tr>
-			<th width='1%'>&nbsp;</th>
-			<th width='94%'>{$this->lang->words['portal_main_key']}</th>
-			<th width='5%'>&nbsp;</th>
-		</tr>
-EOF;
-
-if ( is_array( $objects ) AND count( $objects ) )
-{
-	foreach( $objects as $key => $data )
-	{
-		$IPBHTML .= <<<EOF
-		<tr>
-			<td><img src='{$this->settings['skin_acp_url']}/images/menu.png' alt='{$this->lang->words['a_options']}' /></td>
-			<td><strong>{$data['pc_title']}</strong><div class='desctext'>{$data['pc_desc']}</td>
-			<td>
-				<img id="menu{$data['pc_key']}" src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt='{$this->lang->words['a_options']}' class='ipbmenu' />
-				<ul class='acp-menu' id='menu{$data['pc_key']}_menucontent'>
-EOF;
-//startif
-if ( $data['pc_settings_keyword'] )
-{
-$IPBHTML .= <<<EOF
-					<li class='icon edit'><a href='{$this->settings['base_url']}{$this->form_code}&amp;do=portal_settings&amp;pc_key={$data['pc_key']}'>{$this->lang->words['portal_row_menu_settings']}</a></li>
-EOF;
-}//endif
-$IPBHTML .= <<<EOF
-					<li class='icon export'><a href='#' onclick="return acp.openWindow('{$this->settings['base_url']}&{$this->form_code}&amp;do=portal_viewtags&amp;pc_key={$data['pc_key']}', '{$data['pc_key']}', 400,200)">{$this->lang->words['portal_row_menu_view_tags']}</a></li>
-				</ul>
-			</td>
-		</tr>
-EOF;
-	}
-}
-		
-$IPBHTML .= <<<EOF
-	</table>
-</div>
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
-
-}
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/skin_cp/index.html b/upload/admin/applications_addon/ips/portal/skin_cp/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/skin_cp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/xml/admin_portal_language_pack.xml b/upload/admin/applications_addon/ips/portal/xml/admin_portal_language_pack.xml
deleted file mode 100644
index 011ae883..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/admin_portal_language_pack.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<languageexport>
-  <languagegroup>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_row_menu_settings</word_key>
-      <word_default>Edit Settings...</word_default>
-      <word_custom>�а�тройки</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_row_menu_view_tags</word_key>
-      <word_default>View Exportable Tags...</word_default>
-      <word_custom>Теги</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_pop_desc</word_key>
-      <word_default>Tag Description</word_default>
-      <word_custom>Опи�ание тега</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_pop_name</word_key>
-      <word_default>Tag Name</word_default>
-      <word_custom>Им�</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_pop_tags</word_key>
-      <word_default>Exportable Tags:</word_default>
-      <word_custom>Теги</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_main_key</word_key>
-      <word_default>Plug-in Title</word_default>
-      <word_custom>�азвание плагина</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>portal_main_title</word_key>
-      <word_default>Registered Portal Plug-ins</word_default>
-      <word_custom>Зареги�трированные плагины</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>error_no_key</word_key>
-      <word_default>There is no matching plug-in for the key used to find it.</word_default>
-      <word_custom>�е удало�ь найти плагин � такими данными</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>error_no_settings</word_key>
-      <word_default>There are no settings for this plug-in</word_default>
-      <word_custom>У �того плагина нет на�троек</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>error_no_dir</word_key>
-      <word_default><![CDATA[The directory 'sources/portal_plugins' does not exist. Create it and try again.]]></word_default>
-      <word_custom><![CDATA[Директории 'sources/portal_plugins' не �уще�твует. Попробуйте ее �оздать и повторить дей�твие �нова.]]></word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>admin_portal</word_pack>
-      <word_key>main_title</word_key>
-      <word_default>Manage Portal Plug-ins</word_default>
-      <word_custom>Управление плагинами портала</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-  </languagegroup>
-</languageexport>
diff --git a/upload/admin/applications_addon/ips/portal/xml/index.html b/upload/admin/applications_addon/ips/portal/xml/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/xml/information.xml b/upload/admin/applications_addon/ips/portal/xml/information.xml
deleted file mode 100644
index e5082422..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/information.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<information>
-	<data>
-		<name>Портал</name>
-		<public_name>Портал</public_name>
-		<author>Invision Power Services, Inc.</author>
-		<description></description>
-		<disabledatinstall>1</disabledatinstall>
-		<ipskey>9fef8fc6c7dfc4716f0cfd698b48e3c9</ipskey>
-		<templategroups>
-			<template match="exact">skin_portal</template>
-		</templategroups>
-	</data>
-</information>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/ips/portal/xml/portal_mobile_templates.xml b/upload/admin/applications_addon/ips/portal/xml/portal_mobile_templates.xml
deleted file mode 100644
index 33c89bb8..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/portal_mobile_templates.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="portal" templategroups="a:1:{s:11:&quot;skin_portal&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_portal">
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['aff_title']}</h3>
-	<div>
-		{$this->settings['csite_fav_contents']}
-	</div>
-</div>
-<br />]]></template_content>
-      <template_name>affiliates</template_name>
-      <template_data><![CDATA[$links=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='master_list'>
-	<h2 class='title'>{$this->lang->words['recent_topics']}</h2>
-	<foreach loop="articles:$articles as $post">
-		<div class='topic_reply' id='entry{$post['pid']}'>
-			<h2 class='secondary'>
-				<img src='{$post['pp_thumb_photo']}' alt="{$post['members_display_name']}{$this->lang->words['users_photo']}" width='{$post['pp_thumb_width']}' height='{$post['pp_thumb_height']}' class='photo' />
-				<a style="text-decoration:none" href='{parse url="showtopic={$post['tid']}" base="public" seotitle="{$post['title_seo']}" template="showtopic"}'>{$post['title']}</a>
-				<span class='subtext'>
-					<if test="postMember:|:$post['member_id']">
-						<a href='{parse url="showuser={$post['member_id']}" base="public" template="showuser" seotitle="{$post['members_seo_name']}"}'>{$post['members_display_name']}</a>:
-					<else />
-						{$post['members_display_name']}:
-					</if>
-					{parse date="$post['post_date']" format="long"}
-				</span>
-			</h2>
-			<div id="post-{$post['pid']}" class='row post line_spacing'>
-				{$post['post']}
-			</div>
-		</div>
-	</foreach>]]></template_content>
-      <template_name>articles</template_name>
-      <template_data>$articles</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[{$content}
-<br />]]></template_content>
-      <template_name>calendarWrap</template_name>
-      <template_data><![CDATA[$content=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['discuss_title']}</h3>
-	<ul class='hfeed'>
-		{parse striping="recent_topics" classes="row1,row2 altrow"}
-		<foreach loop="posts:$posts as $result">
-			<li class='hentry {parse striping="recent_topics"}'><a href='{parse url="showtopic={$result['tid']}" base="public" template="showtopic" seotitle="{$result['title_seo']}"}' rel='bookmark' title='{$this->lang->words['view_topic']}'>{$result['title_display']}</a> {$this->lang->words['portal_by']} <address class="author vcard"><if test="ismember:|:$result['member_id']"><a class="url fn" href="{parse url="showuser={$result['member_id']}" base="public" template="showuser" seotitle="{$result['members_seo_name']}"}" title='{$this->lang->words['view_profile']}'>{$result['members_display_name']}</a>{parse template="user_popup" group="global" params="$result['member_id']"}<else />{$result['members_display_name']}</if></address> <span class='date'>(<abbr class="published" title="{parse expression="date( 'c', $result['post_date'] )"}">{$result['date']}</abbr>)</span>
-			<br />{$this->lang->words['recent_read']}: {parse format_number="$result['views']"} &nbsp; {$this->lang->words['recent_comments']}: {parse format_number="$result['posts']"}</li>
-		</foreach>
-	</ul>
-</div>
-<br />]]></template_content>
-      <template_name>latestPosts</template_name>
-      <template_data>$posts=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box clearfix' id='portal_active_users'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> <a href="{parse url="app=members&amp;module=online&amp;section=online" base="public"}">{$this->lang->words['online_title']}</a></h3>
-	<div>
-		<!--<span>{parse expression="sprintf( $this->lang->words['online_breakdown'], intval($active['TOTAL']) )"}</span>-->
-		<span class='desc'>{parse expression="sprintf( $this->lang->words['online_split'], intval($active['MEMBERS']), intval($active['visitors']), intval($active['ANON']) )"}</span>
-		<br /><br />
-		<p>
-			<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $active['NAMES'] )"}</span>					
-		</p>
-	</div>
-</div>
-<br />]]></template_content>
-      <template_name>onlineUsers</template_name>
-      <template_data>$active</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> <a href='{parse url="showtopic={$tid}" base="public"}'>{$this->lang->words['poll_title']}</a></h3>
-	{$content}
-</div>
-<br />]]></template_content>
-      <template_name>pollWrapper</template_name>
-      <template_data><![CDATA[$content="",$tid=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['links_title']}</h3>
-	<ul>
-		<foreach loop="links:$links as $link">
-			<li>&bull; <a href="{$link[1]}">{$link[2]}</a></li>		
-		</foreach>
-	</ul>
-</div>
-<br />]]></template_content>
-      <template_name>siteNavigation</template_name>
-      <template_data>$links=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<if test="$this->settings['_mobile_hide_nav'] = 1"></if>
-<div class='controls'>
-		<div class='buttons'>
-			<a class="button" href='{parse url="act=idx" base="public" seotitle="-" template="act=idx"}'>{$this->lang->words['but_forums']}</a>
-		</div>
-</div>
-<div id='portal_articles' class='left'>
-	<!--MAIN-->
-	 <!--::recent_topics_last_x::-->
-	 <!--END MAIN-->
-</div>
-<div id='index_stats' class='portal left'>
-	<!-- LEFT -->
-	 <!--END LEFT-->
-</div>
-{parse template="include_highlighter" group="global" params="1"}
-<script type='text/javascript'>
-	// Resize images
-	$$('.post', '.poll').each( function(elem){
-		ipb.global.findImgs( $( elem ) );
-	});
-</script>]]></template_content>
-      <template_name>skeletonTemplate</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>mobile</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/portal/xml/portal_modules.xml b/upload/admin/applications_addon/ips/portal/xml/portal_modules.xml
deleted file mode 100644
index ba1e7c86..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/portal_modules.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<moduleexport>
-  <modulegroup>
-    <module>
-      <sys_module_title>Портал</sys_module_title>
-      <sys_module_application>portal</sys_module_application>
-      <sys_module_key>portal</sys_module_key>
-      <sys_module_description>Главный модуль портала</sys_module_description>
-      <sys_module_version>3.0.0</sys_module_version>
-      <sys_module_parent>0</sys_module_parent>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>0</sys_module_position>
-      <sys_module_admin>0</sys_module_admin>
-    </module>
-    <module>
-      <sys_module_title>Управление порталом</sys_module_title>
-      <sys_module_application>portal</sys_module_application>
-      <sys_module_key>portal</sys_module_key>
-      <sys_module_description>Модуль управлени� порталом</sys_module_description>
-      <sys_module_version>1.0</sys_module_version>
-      <sys_module_parent/>
-      <sys_module_protected>1</sys_module_protected>
-      <sys_module_visible>1</sys_module_visible>
-      <sys_module_tables/>
-      <sys_module_hooks/>
-      <sys_module_position>0</sys_module_position>
-      <sys_module_admin>1</sys_module_admin>
-    </module>
-  </modulegroup>
-</moduleexport>
diff --git a/upload/admin/applications_addon/ips/portal/xml/portal_root_templates.xml b/upload/admin/applications_addon/ips/portal/xml/portal_root_templates.xml
deleted file mode 100644
index 9a1dd9cd..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/portal_root_templates.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="portal" templategroups="a:1:{s:11:&quot;skin_portal&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_portal">
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['aff_title']}</h3>
-	<div class='inner_portal_box'>
-		{$this->settings['csite_fav_contents']}
-	</div>
-</div>
-<br />]]></template_content>
-      <template_name>affiliates</template_name>
-      <template_data><![CDATA[$links=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<foreach loop="articles:$articles as $entry">
-	<h2 class='maintitle'><a style="text-decoration:none" href='{parse url="showtopic={$entry['tid']}" base="public" seotitle="{$entry['title_seo']}" template="showtopic"}'>{$entry['title']}</a></h2>
-	<div class='generic_bar'></div>
-	<div class='post_block first hentry no_sidebar' id='announce_id_{$announce['announce_id']}'>
-		<div class='post_wrap'>
-			<if test="authorIsMember:|:$entry['member_id']">
-				<h3>
-			<else />
-				<h3 class='guest'>
-			</if>
-					<if test="authorMemberLink:|:$entry['member_id']">
-						<if test="authorIsOnline:|:$entry['_online']">
-							{parse replacement="user_online"}
-						<else />
-							{parse replacement="user_offline"}
-						</if> &nbsp;
-								<address class="author vcard"><a class="url fn" href='{parse url="showuser={$entry['member_id']}" template="showuser" seotitle="{$entry['members_seo_name']}" base="public"}'>{$entry['members_display_name']}</a>{parse template="user_popup" group="global" params="$entry['member_id']"}</address>
-					<else />
-						{$entry['members_display_name']}
-					</if>
-					 - {$entry['date']} - {parse format_number="$entry['posts']"} {$this->lang->words['comments_suffix']}
-				</h3>
-			<div class='post_body'>
-				<div class='post entry-content'>
-					{$entry['post']}
-					<!--IBF.ATTACHMENT_{$entry['pid']}-->
-				</div>
-			</div>
-			<div class='moderation_bar'>
-				<if test="entryHasPosts:|:$entry['posts']">
-					{$this->lang->words['read']} {parse format_number="$entry['views']"} {$this->lang->words['times_last']} <a href='{parse url="showtopic={$entry['tid']}&amp;view=getlastpost" base="public" seotitle="{$entry['title_seo']}" template="showtopic"}'>{$this->lang->words['article_comment']}</a> {$this->lang->words['portal_by']} <if test="entryLastPoster:|:$entry['last_poster_id']"><a href='{parse url="showuser={$entry['last_poster_id']}" template="showuser" seotitle="{$entry['seo_last_name']}" base="public"}'>{$entry['last_poster_name']}</a><else />{$entry['last_poster_name']}</if>
-				<else />
-					{$this->lang->words['read']} {parse format_number="$entry['views']"} {$this->lang->words['times_make']} <a href='{parse url="showtopic={$entry['tid']}&amp;view=getlastpost" base="public" seotitle="{$entry['title_seo']}" template="showtopic"}'>{$this->lang->words['article_comment']}</a>
-				</if>
-				{$bottom_string}
-				&nbsp;&nbsp;<a href='{parse url="app=forums&amp;module=forums&amp;section=printtopic&amp;client=printer&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}" base="public"}'>{parse replacement="print_icon"}</a>&nbsp;&nbsp;
-				<a href='{parse url="app=forums&amp;module=extras&amp;section=forward&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}" base="public"}'>{parse replacement="email_icon"}</a>
-			</div>
-		</div>			
-	</div>
-	<br />
-</foreach>]]></template_content>
-      <template_name>articles</template_name>
-      <template_data>$articles</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[{$content}
-<br />]]></template_content>
-      <template_name>calendarWrap</template_name>
-      <template_data><![CDATA[$content=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['discuss_title']}</h3>
-	<ul class='hfeed block_list'>
-		{parse striping="recent_topics" classes="row1,row2 altrow"}
-		<foreach loop="posts:$posts as $result">
-			<li class='hentry {parse striping="recent_topics"}'><a href='{parse url="showtopic={$result['tid']}" base="public" template="showtopic" seotitle="{$result['title_seo']}"}' rel='bookmark' title='{$this->lang->words['view_topic']}'>{$result['title']}</a> {$this->lang->words['portal_by']} <address class="author vcard"><if test="ismember:|:$result['member_id']"><a class="url fn" href="{parse url="showuser={$result['member_id']}" base="public" template="showuser" seotitle="{$result['members_seo_name']}"}" title='{$this->lang->words['view_profile']}'>{$result['members_display_name']}</a>{parse template="user_popup" group="global" params="$result['member_id']"}<else />{$result['members_display_name']}</if></address> <span class='date'><abbr class="published" title="{parse expression="date( 'c', $result['start_date'] )"}">({parse date="$result['start_date']" format="short"})</abbr></span>
-			<br />{$this->lang->words['recent_read']}: {parse format_number="$result['views']"} &nbsp; {$this->lang->words['recent_comments']}: {parse format_number="$result['posts']"}</li>
-		</foreach>
-	</ul>
-</div>
-<br />]]></template_content>
-      <template_name>latestPosts</template_name>
-      <template_data>$posts=array()</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box clearfix' id='portal_active_users'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> <a href="{parse url="app=members&amp;module=online&amp;section=online" base="public"}">{$this->lang->words['online_title']}</a></h3>
-	<div class='inner_portal_box'>
-		<!--<span>{parse expression="sprintf( $this->lang->words['online_breakdown'], intval($active['TOTAL']) )"}</span>-->
-		<span class='desc'>{parse expression="sprintf( $this->lang->words['online_split'], intval($active['MEMBERS']), intval($active['visitors']), intval($active['ANON']) )"}</span>
-		<br /><br />
-		<p>
-			<span class='name'>{parse expression="implode( ",</span> <span class='name'>", $active['NAMES'] )"}</span>					
-		</p>
-	</div>
-</div>
-<br />]]></template_content>
-      <template_name>onlineUsers</template_name>
-      <template_data>$active</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[{parse js_module="topic"}
-<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> <a href='{parse url="showtopic={$tid}" base="public"}'>{$this->lang->words['poll_title']}</a></h3>
-	{$content}
-</div>
-<br />]]></template_content>
-      <template_name>pollWrapper</template_name>
-      <template_data><![CDATA[$content="",$tid=""]]></template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<div class='general_box'>
-	<h3><img src='{$this->settings['img_url']}/comment_new.png' alt='' /> {$this->lang->words['links_title']}</h3>
-	<div class='inner_portal_box'>
-		<ul>
-			<foreach loop="links:$links as $link">
-				<li>&bull; <a href="{$link[1]}">{$link[2]}</a></li>		
-			</foreach>
-		</ul>
-	</div>
-</div>
-<br />]]></template_content>
-      <template_name>siteNavigation</template_name>
-      <template_data>$links=array()</template_data>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content><![CDATA[<!--
-	SKINNOTE: Remember boxes are also in skin_gallery_portal, skin_blog_portal and skin_downloads_external
-	-The striping doesn't add the proper padding like the board index does
-	-Poll is kinda ugly
-	-Print and Email should be icons.  Note that I also used "moderation_bar" class for that row, which isn't necessarily
-		semantic, but displays fine - your call on whether to change it
--->
-<if test="disablelightbox:|:!$this->settings['disable_lightbox']">
-{parse template="include_lightbox" group="global" params=""}
-</if>
-<div id='portal_articles' class='left'>
-	<!--MAIN-->
-	 <!--::recent_topics_last_x::-->
-	 <!--END MAIN-->
-</div>
-<div id='index_stats' class='portal left'>
-	<!-- LEFT -->
-	 <!--::portal_sitenav::-->
-	 <!--::online_users_show::-->
-	 <!--::blogs_show_last_updated_x::-->
-	 <!--::recent_downloads_last_x::-->
-	 <!--::gallery_show_random_image::-->
-	 <!--::calendar_show_current_month::-->
-	 <!--::poll_show_poll::-->
-	 <!--::recent_topics_discussions_last_x::-->
-	 <!--::portal_affiliates::-->
-	 <!--END LEFT-->
-</div>
-{parse template="include_highlighter" group="global" params="1"}
-<script type='text/javascript'>
-	// Resize images
-	$$('.post', '.poll').each( function(elem){
-		ipb.global.findImgs( $( elem ) );
-	});
-</script>]]></template_content>
-      <template_name>skeletonTemplate</template_name>
-      <template_data/>
-      <template_updated>1288018125</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>root</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/portal/xml/portal_settings.xml b/upload/admin/applications_addon/ips/portal/xml/portal_settings.xml
deleted file mode 100644
index afa48064..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/portal_settings.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<settingexport>
-  <settinggroup>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_title_title>Портал IP.Board</conf_title_title>
-      <conf_title_desc>Данные функции позвол�ют управл�ть портальной �траницей и ее на�тройками.</conf_title_desc>
-      <conf_title_tab>IPS Apps</conf_title_tab>
-      <conf_title_app>portal</conf_title_app>
-      <conf_title_noshow>0</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>�азвание �траницы портала</conf_title>
-      <conf_description>То, что будет запи�ано между �лементами title на �транице портала.</conf_description>
-      <conf_group>31</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>csite_title</conf_key>
-      <conf_default>Портал</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>2</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Формат даты дл� тем</conf_title>
-      <conf_description><![CDATA[<a href='http://www.php.net/strftime'>�налогично функции strftime PHP.]]></conf_description>
-      <conf_group>31</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>csite_article_date</conf_key>
-      <conf_default>%d.%m.%y %H:%M</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Показывать меню навигации по �айту?</conf_title>
-      <conf_description/>
-      <conf_group>31</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>csite_nav_show</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>18</conf_position>
-      <conf_start_group>Стандартные блоки портала</conf_start_group>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>С�ылки меню навигации по �айту</conf_title>
-      <conf_description><![CDATA[По одной в каждой �троке в �ледующем формате<br>http://www.apple.com [Веб�айт Apple]<br><br>{board_url} будет преобразовано в адре� вашего форума]]></conf_description>
-      <conf_group>31</conf_group>
-      <conf_type>textarea</conf_type>
-      <conf_key>csite_nav_contents</conf_key>
-      <conf_default><![CDATA[{board_url} [Форумы]
-{board_url}act=Search&CODE=getactive [�ктивные темы]
-{board_url}act=Stats [Лучшие �егодн�]
-{board_url}act=Stats&CODE=leaders [�дмини�траци� форума]]]></conf_default>
-      <conf_extra/>
-      <conf_evalphp><![CDATA[if ( $show == 1)
-{
-    $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\\\\\\\\\\\\\\\1", $value );
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>19</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Показывать блок &quot;Партнеры / Предпочитаемые �айты&quot;?]]></conf_title>
-      <conf_description/>
-      <conf_group>31</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>csite_fav_show</conf_key>
-      <conf_default>0</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>20</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title><![CDATA[Содержимое блока &quot;Партнеры / Предпочитаемые �айты&quot;]]></conf_title>
-      <conf_description>Поддерживает�� HTML</conf_description>
-      <conf_group>31</conf_group>
-      <conf_type>textarea</conf_type>
-      <conf_key>csite_fav_contents</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp><![CDATA[if ( $show == 1)
-{
- $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\\\\\\\1", $value );
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>21</conf_position>
-      <conf_start_group/>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>ipbportal</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>portal_poll</conf_title_keyword>
-      <conf_title_title>Портал: опро�</conf_title_title>
-      <conf_title_desc/>
-      <conf_title_tab>IPS Apps</conf_title_tab>
-      <conf_title_app>portal</conf_title_app>
-      <conf_title_noshow>1</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>Введите URL к теме � опро�ом</conf_title>
-      <conf_description>�е заполн�йте, чтобы не отображать блок � опро�ом.</conf_description>
-      <conf_group>32</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>poll_poll_url</conf_key>
-      <conf_default/>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>17</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>portal_poll</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_is_title>1</conf_is_title>
-      <conf_title_keyword>portal_recent_topics</conf_title_keyword>
-      <conf_title_title>Портал: по�ледние темы</conf_title_title>
-      <conf_title_desc><![CDATA[�а�тройка модул� портала "По�ледние темы".]]></conf_title_desc>
-      <conf_title_tab>IPS Apps</conf_title_tab>
-      <conf_title_app>portal</conf_title_app>
-      <conf_title_noshow>1</conf_title_noshow>
-    </setting>
-    <setting>
-      <conf_title>�е закрепл�ть важные темы</conf_title>
-      <conf_description>При включении �той опции темы, закрепленные на форуме, на портале будут выводить��, как обычные, а не находить�� по�то�нно наверху.</conf_description>
-      <conf_group>33</conf_group>
-      <conf_type>yes_no</conf_type>
-      <conf_key>portal_exclude_pinned</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>1</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>portal_recent_topics</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Разделы, из которых будет производить�� �к�порт �татей</conf_title>
-      <conf_description>Можно выбрать не�колько, и�пользу� клавишу Сtrl.</conf_description>
-      <conf_group>33</conf_group>
-      <conf_type>multi</conf_type>
-      <conf_key>recent_topics_article_forum</conf_key>
-      <conf_default/>
-      <conf_extra>#show_forums#</conf_extra>
-      <conf_evalphp><![CDATA[if ( $save == 1)
-{
-	if ( is_array($_POST['recent_topics_article_forum']) )
-	{
-		$_POST['recent_topics_article_forum'] = implode(",",$_POST['recent_topics_article_forum']);
-	}
-	else
-	{
-		$_POST['recent_topics_article_forum'] = "";
-	}
-	
-	$key = 'recent_topics_article_forum';
-}
-if ( $show == 1 )
-{
-$key = 'recent_topics_article_forum[]';
-}]]></conf_evalphp>
-      <conf_protected>1</conf_protected>
-      <conf_position>3</conf_position>
-      <conf_start_group/>
-      <conf_end_group>0</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>portal_recent_topics</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Количе�тво отображаемых тем</conf_title>
-      <conf_description><![CDATA[Количе�тво тем, которые будут отображать�� дл� тега портала "recent_topics_last_x".]]></conf_description>
-      <conf_group>33</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>recent_topics_article_max</conf_key>
-      <conf_default>15</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>4</conf_position>
-      <conf_start_group><![CDATA[По�ледние [Х] тем]]></conf_start_group>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>portal_recent_topics</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-    <setting>
-      <conf_title>Количе�тво отображаемых об�уждений</conf_title>
-      <conf_description><![CDATA[Введите количе�тво заголовков тем, которые будет отображать�� дл� тега портала "recent_discussions_last_x"]]></conf_description>
-      <conf_group>33</conf_group>
-      <conf_type>input</conf_type>
-      <conf_key>recent_topics_discuss_number</conf_key>
-      <conf_default>1</conf_default>
-      <conf_extra/>
-      <conf_evalphp/>
-      <conf_protected>1</conf_protected>
-      <conf_position>9</conf_position>
-      <conf_start_group><![CDATA[По�ледние [Х] об�уждений]]></conf_start_group>
-      <conf_end_group>1</conf_end_group>
-      <conf_add_cache>0</conf_add_cache>
-      <conf_keywords/>
-      <conf_title_keyword>portal_recent_topics</conf_title_keyword>
-      <conf_is_title>0</conf_is_title>
-    </setting>
-  </settinggroup>
-</settingexport>
diff --git a/upload/admin/applications_addon/ips/portal/xml/portal_xmlskin_templates.xml b/upload/admin/applications_addon/ips/portal/xml/portal_xmlskin_templates.xml
deleted file mode 100644
index c095253e..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/portal_xmlskin_templates.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates application="portal" templategroups="a:1:{s:11:&quot;skin_portal&quot;;s:5:&quot;exact&quot;;}">
-  <templategroup group="skin_portal">
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>affiliates</template_name>
-      <template_data><![CDATA[$links=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>articles</template_name>
-      <template_data>$articles</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>calendarWrap</template_name>
-      <template_data><![CDATA[$content=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>latestPosts</template_name>
-      <template_data>$posts=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>onlineUsers</template_name>
-      <template_data>$active</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>pollWrapper</template_name>
-      <template_data><![CDATA[$content="",$tid=""]]></template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>siteNavigation</template_name>
-      <template_data>$links=array()</template_data>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-    <template>
-      <template_group>skin_portal</template_group>
-      <template_content/>
-      <template_name>skeletonTemplate</template_name>
-      <template_data/>
-      <template_updated>1288018126</template_updated>
-      <template_removable>0</template_removable>
-      <template_user_added>0</template_user_added>
-      <template_user_edited>0</template_user_edited>
-      <template_master_key>xmlskin</template_master_key>
-    </template>
-  </templategroup>
-</templates>
diff --git a/upload/admin/applications_addon/ips/portal/xml/public_portal_language_pack.xml b/upload/admin/applications_addon/ips/portal/xml/public_portal_language_pack.xml
deleted file mode 100644
index 8b7a305f..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/public_portal_language_pack.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<languageexport>
-  <languagegroup>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>email</word_key>
-      <word_default>Email</word_default>
-      <word_custom>E-mail</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>print</word_key>
-      <word_default>Print</word_default>
-      <word_custom>Печать</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>times_last</word_key>
-      <word_default>times - last </word_default>
-      <word_custom> раз - по�ледний</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>times_make</word_key>
-      <word_default>times - make a </word_default>
-      <word_custom> раз - разме�тить </word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>portal_by</word_key>
-      <word_default>by</word_default>
-      <word_custom>автор</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>read</word_key>
-      <word_default>Read</word_default>
-      <word_custom>Дальше</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>comments_suffix</word_key>
-      <word_default>comments</word_default>
-      <word_custom>комментариев</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>recent_comments</word_key>
-      <word_default>Comments</word_default>
-      <word_custom>Комментарии</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>aff_title</word_key>
-      <word_default>Recommended Sites</word_default>
-      <word_custom>Рекомендованные �айты</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>article_comment</word_key>
-      <word_default>comment</word_default>
-      <word_custom>комментарий</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>discuss_title</word_key>
-      <word_default>Latest Discussions</word_default>
-      <word_custom>По�ледние темы</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>poll_title</word_key>
-      <word_default>Website Poll</word_default>
-      <word_custom>Опро�</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>recent_topics</word_key>
-      <word_default>Featured Topics</word_default>
-      <word_custom>Об�уждаемое</word_custom>
-      <word_default_version>31005</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>recent_read</word_key>
-      <word_default>Read</word_default>
-      <word_custom>Дальше</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>online_breakdown</word_key>
-      <word_default><![CDATA[There are <strong>%s</strong> online users browsing:]]></word_default>
-      <word_custom><![CDATA[В�его <strong>%s</strong> пользователей в онлайн: ]]></word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>online_split</word_key>
-      <word_default>%s members, %s visitors and %s anonymous users</word_default>
-      <word_custom>%s пользователей и %s го�тей</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>online_title</word_key>
-      <word_default>Online Users</word_default>
-      <word_custom>Он-лайн</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>links_title</word_key>
-      <word_default>Site Navigation</word_default>
-      <word_custom>�авигаци�</word_custom>
-      <word_default_version>30008</word_default_version>
-      <word_custom_version>30008</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>but_forums</word_key>
-      <word_default>Forums</word_default>
-      <word_custom>Форумы</word_custom>
-      <word_default_version>31005</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-    <lang>
-      <word_app>portal</word_app>
-      <word_pack>public_portal</word_pack>
-      <word_key>but_active</word_key>
-      <word_default>Active Topics</word_default>
-      <word_custom>�ктивные темы</word_custom>
-      <word_default_version>31005</word_default_version>
-      <word_custom_version>31005</word_custom_version>
-      <word_js>0</word_js>
-    </lang>
-  </languagegroup>
-</languageexport>
diff --git a/upload/admin/applications_addon/ips/portal/xml/versions.xml b/upload/admin/applications_addon/ips/portal/xml/versions.xml
deleted file mode 100644
index 9b46ee91..00000000
--- a/upload/admin/applications_addon/ips/portal/xml/versions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<versions>
-	<version>
-		<human>3.1.4</human>
-		<long>31007</long>
-	</version>
-</versions>
\ No newline at end of file
diff --git a/upload/admin/applications_addon/other/index.html b/upload/admin/applications_addon/other/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/applications_addon/other/index.html
+++ b/upload/admin/applications_addon/other/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/extensions/coreVariables.php b/upload/admin/extensions/coreVariables.php
index ef5708db..3063e7ed 100644
--- a/upload/admin/extensions/coreVariables.php
+++ b/upload/admin/extensions/coreVariables.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Core variables file: defines caches, resets, etc.
- * Last Updated: $Date: 2010-10-18 20:34:07 -0400 (Mon, 18 Oct 2010) $
+ * Last Updated: $Date: 2011-09-08 18:01:45 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6992 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9470 $
  * @since		3.0.0
  *
  */
@@ -143,8 +143,8 @@ class coreVariables
 		$CACHE['settings']        = array( 'array'            => 1,
 									       'allow_unload'     => 0,
 									       'default_load'     => 1,
-									       'recache_file'     => IPSLib::getAppDir( 'core' ) . '/modules_admin/tools/settings.php',
-										   'recache_class'    => 'admin_core_tools_settings',
+									       'recache_file'     => IPSLib::getAppDir( 'core' ) . '/modules_admin/settings/settings.php',
+										   'recache_class'    => 'admin_core_settings_settings',
 									       'recache_function' => 'settingsRebuildCache' );		
 							       
 		$CACHE['lang_data']       = array( 'array'            => 1,
@@ -213,8 +213,8 @@ class coreVariables
 										'array'            => 1,
 									    'allow_unload'     => 0,
 									    'default_load'     => 1,
-									    'recache_file'     => IPSLib::getAppDir( 'members' ) . '/modules_admin/members/customfields.php',
-										'recache_class'    => 'admin_members_members_customfields',
+									    'recache_file'     => IPSLib::getAppDir( 'members' ) . '/modules_admin/cfields/customfields.php',
+										'recache_class'    => 'admin_members_cfields_customfields',
 									    'recache_function' => 'rebuildCache' 
 									    );
 							    
@@ -275,6 +275,25 @@ class coreVariables
 								'recache_function'	=> 'rebuildNotificationsCache' 
 								);
 
+		$CACHE['report_plugins'] = array(
+								'array'				=> 1,
+								'allow_unload'		=> 0,
+								'default_load'		=> 0,
+								'skip_rebuild_when_upgrading' => 0,
+								'recache_file'		=> IPSLib::getAppDir( 'core' ) . '/sources/classes/reportLibrary.php',
+								'recache_class'		=> 'reportLibrary',
+								'recache_function'	=> 'rebuildReportCache' 
+								);
+
+		$CACHE['report_cache'] = array(
+								'array'				=> 1,
+								'allow_unload'		=> 0,
+								'default_load'		=> 0,
+								'skip_rebuild_when_upgrading' => 1,
+								'recache_file'		=> IPSLib::getAppDir( 'core' ) . '/sources/classes/reportLibrary.php',
+								'recache_class'		=> 'reportLibrary',
+								'recache_function'	=> 'updateCacheTime' 
+								);
 
 		if ( IN_DEV )
 		{
@@ -289,6 +308,7 @@ class coreVariables
 		}
 
 		$_LOAD['report_cache']		= 1;
+		$_LOAD['report_plugins']	= 1;
 		$_LOAD['rss_output_cache']	= 1;
 		
 		return array( 'caches'    => $CACHE,
@@ -325,7 +345,7 @@ class coreVariables
 			$_RESET['section'] = 'share';
 		}
 		
-		if( isset( $_REQUEST['showannouncement'] ) && $_REQUEST['showannouncement'] )
+		if( !empty( $_REQUEST['showannouncement'] ) )
 		{
 			$_RESET['app']         = 'forums';
 			$_RESET['module']      = 'forums';
@@ -344,7 +364,7 @@ class coreVariables
 		}
 		
 		# FORUM
-		if( isset( $_REQUEST['showforum'] ) && $_REQUEST['showforum'] )
+		if( !empty( $_REQUEST['showforum'] ) )
 		{
 			$_RESET['app']     = 'forums';
 			$_RESET['module']  = 'forums';
@@ -353,18 +373,23 @@ class coreVariables
 		}
 
 		# TOPIC
-		if( ( isset( $_REQUEST['showtopic'] ) && $_REQUEST['showtopic'] ) OR ( isset($_REQUEST['act']) AND $_REQUEST['act'] == 'ST' ) )
+		if( !empty( $_REQUEST['showtopic'] ) OR ( isset($_REQUEST['act']) AND $_REQUEST['act'] == 'ST' ) )
 		{
 			$_RESET['app']     = 'forums';
 			$_RESET['module']  = 'forums';
 			$_RESET['section'] = 'topics';
+
 			if ( !$_REQUEST['t'] )
 			{
 				$_RESET['t']       = $_REQUEST['showtopic'];
 			}
+			else if( $_REQUEST['t'] AND !$_REQUEST['showtopic'] )
+			{
+				$_RESET['showtopic']	= $_REQUEST['t'];
+			}
 		}
 
-		if( ( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'findpost' ) || isset( $_REQUEST['findpost'] ) && $_REQUEST['findpost'] )
+		if( ( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'findpost' ) || !empty( $_REQUEST['findpost'] ) )
 		{
 			$_RESET['pid']     = ( $_REQUEST['pid'] ) ? $_REQUEST['pid'] : $_REQUEST['findpost'];
 			$_RESET['app']     = 'forums';
@@ -373,7 +398,7 @@ class coreVariables
 		}
 
 		# PROFILE
-		if( isset( $_REQUEST['showuser'] ) && $_REQUEST['showuser'] )
+		if( isset( $_REQUEST['showuser'] ) )
 		{
 			$_RESET['app']		= 'members';
 			$_RESET['module']	= 'profile';
@@ -462,13 +487,6 @@ class coreVariables
 			$_RESET['app'] = $_GET['autocom'] ? $_GET['autocom'] : $_GET['automodule'];
 		}
 		
-		if( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'Print' )
-		{
-			$_RESET['app']     = 'forums';
-			$_RESET['module']  = 'forums';
-			$_RESET['section'] = 'printtopic';
-		}
-		
 		# Calendar
 		if( isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'calendar' )
 		{
@@ -536,8 +554,9 @@ class coreVariables
 	 */
 	public function fetchBitwise()
 	{
-		$_BITWISE = array( 'facebook' => array( 'fbc_s_pic', 'fbc_s_avatar', 'fbc_s_status', 'fbc_s_aboutme', 'fbc_si_status' ), // facebook == profile_portal.fb_bwoptions
-						   'twitter'  => array( 'tc_s_pic', 'tc_s_avatar', 'tc_s_status', 'tc_s_aboutme', 'tc_s_bgimg', 'tc_si_status' ), // twitter = profile_portal.tc_bwoptions
+		$_BITWISE = array( 'facebook' => array( 'fbc_s_pic', 'fbc_s_status', 'fbc_s_aboutme', 'fbc_si_status' ), // facebook == profile_portal.fb_bwoptions
+						   'twitter'  => array( 'tc_s_pic', 'tc_s_status', 'tc_s_aboutme', 'tc_s_bgimg', 'tc_si_status' ), // twitter = profile_portal.tc_bwoptions
+						   'vkontakte' => array( 'vc_s_pic', 'vc_s_status' ), //vkontakte
 						   'members'  => array( 'bw_is_spammer',
 						 						'bw_from_sfs',
 						  						'bw_vnc_type',						 # 1 based on topic marking table, 0 based on last_visit
@@ -547,6 +566,9 @@ class coreVariables
 												'bw_status_email_all',			 	 # 1 is 'send me an email when anyone replies to any status update I replied to', 0 is OMG DO NOT DO THAT
 												'bw_disable_customization',			 # 1 yeah, 0 nah boi
 												'bw_local_password_set',			 # 1 means "user was created by remote, but has local password set", 0 means not, or not local user
+												'bw_disable_tagging',				 # 1 means no tagging for this dude
+												'bw_disable_prefixes',				 # 1 means no prefixes
+												'bw_using_skin_gen',				 # 1 means yes. 0 means.. well, I think you can figure that out
 											  ),
 												
 						   'groups'   => array( 
@@ -571,6 +593,8 @@ class coreVariables
 											    'gbw_allow_upload_bgimage'		, #^^
 											    'gbw_view_reps'					, # 1 allows them to view who gave rep to a post, 0 is can't
 											    'gbw_no_status_import'			, # 1 prevents members in group from importing statuses from services.
+											    'gbw_disable_tagging'			, # 1 means no tagging for this group
+											    'gbw_disable_prefixes'			, # 1 means cannot prefixes
 											  )
 						);
 											
diff --git a/upload/admin/extensions/index.html b/upload/admin/extensions/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/extensions/index.html
+++ b/upload/admin/extensions/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/extensions/sphinxTemplate.php b/upload/admin/extensions/sphinxTemplate.php
index cfde1971..03e7298c 100644
--- a/upload/admin/extensions/sphinxTemplate.php
+++ b/upload/admin/extensions/sphinxTemplate.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sphinx template file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-08-30 16:47:25 -0400 (Tue, 30 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9433 $
  * @since		3.0.0
  *
  */
@@ -30,7 +30,7 @@ $sphinxTemplate	= <<<EOF
 ## data source definition
 #############################################################################
 
-source ipb_source_config
+source <!--SPHINX_CONF_PREFIX-->ipb_source_config
 {
 	#setup
 	type					= mysql
@@ -58,7 +58,7 @@ indexer
 
 searchd
 {
-	address				= 127.0.0.1
+	listen				= 127.0.0.1
 	port				= <!--SPHINX_PORT-->
 	log					= <!--SPHINX_BASE_PATH-->/log/searchd.log
 	query_log			= <!--SPHINX_BASE_PATH-->/log/query.log
diff --git a/upload/admin/extensions/userAgents.php b/upload/admin/extensions/userAgents.php
index 3a26f6b4..3978b3a4 100644
--- a/upload/admin/extensions/userAgents.php
+++ b/upload/admin/extensions/userAgents.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * User agent (browser and spider) mappings
- * Last Updated: $Date: 2010-10-07 18:12:54 -0400 (Thu, 07 Oct 2010) $
+ * Last Updated: $Date: 2011-09-14 20:13:56 -0400 (Wed, 14 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6954 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9491 $
  * @since		3.0.0
  *
  */
@@ -29,6 +29,16 @@ if ( ! defined( 'IN_IPB' ) )
 // http://en.wikipedia.org/wiki/List_of_user_agents_for_mobile_phones
 //-----------------------------------------
 
+$BROWSERS['transformer'] = array(
+							  'b_title' => "Transformer Tablet",
+							  'b_regex' => array( ";\s+?Transformer\s+?" => "0" )
+							);
+
+$BROWSERS['android'] = array(
+							  'b_title' => "Android",
+							  'b_regex' => array( ";\s+?android\s+?([A-Za-z0-9.]{1,10})" => "1" )
+							);
+							
 $BROWSERS['blackberry'] = array(
 							  'b_title' => "Blackberry",
 							  'b_regex' => array( "blackberry(\d+?)/([0-9.]{1,10})" => "2" )
@@ -43,7 +53,12 @@ $BROWSERS['ipodtouch'] = array(
 							  'b_title' => "iPod Touch",
 							  'b_regex' => array( "ipod;" => "0" )
 							);
-							
+
+$BROWSERS['iPad'] = array(
+							  'b_title' => "iPad",
+							  'b_regex' => array( "iPad;" => "0" )
+							);
+														
 $BROWSERS['sonyericsson'] = array(
 							  'b_title' => "Sony Ericsson",
 							  'b_regex' => array( "^SonyEricsson[A-Za-z0-9]" => "0" )
@@ -70,8 +85,8 @@ $BROWSERS['siemens'] = array(
 							);
 							
 $BROWSERS['htc'] = array(
-							  'b_title' => "Nexus(Google)/Android/HTC",
-							  'b_regex' => array( "(android |htc-|htc_)([A-Za-z0-9.]{1,10})" => "2" )
+							  'b_title' => "Nexus(Google)/HTC",
+							  'b_regex' => array( "(htc-|htc_)([A-Za-z0-9.]{1,10})" => "2" )
 							);
 							
 $BROWSERS['lg'] = array(
@@ -85,8 +100,8 @@ $BROWSERS['palm'] = array(
 							);
 
 $BROWSERS['operamini'] = array(
-							  'b_title' => "Opera Mini",
-							  'b_regex' => array( "opera mini[ /]([0-9.]{1,10})" => "1" )
+							  'b_title' => "Opera Mobile/Mini",
+							  'b_regex' => array( "opera (mobi|mini)" => "0" )
 							);
 							
 //-----------------------------------------
diff --git a/upload/admin/index.php b/upload/admin/index.php
index fec1baac..415f651a 100644
--- a/upload/admin/index.php
+++ b/upload/admin/index.php
@@ -3,25 +3,25 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin control panel gateway index.php file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
 define( 'IPB_THIS_SCRIPT', 'admin' );
-require_once( '../initdata.php' );
+require_once( '../initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 ipsController::run();
 
diff --git a/upload/admin/install/index.php b/upload/admin/install/index.php
index 967a0292..55123efb 100644
--- a/upload/admin/install/index.php
+++ b/upload/admin/install/index.php
@@ -3,39 +3,39 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installation Gateway
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8042 $
  */
 
 define( 'IPB_THIS_SCRIPT', 'admin' );
 define( 'IPS_IS_UPGRADER', FALSE );
 define( 'IPS_IS_INSTALLER', TRUE );
 
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
 $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 
 /**
 * Are we overwriting an existing IP.Board 2 installation?
 */
-if ( file_exists( DOC_IPS_ROOT_PATH . 'sources/ipsclass.php' ) )
+if ( is_file( DOC_IPS_ROOT_PATH . 'sources/ipsclass.php' ) )
 {
 	@header( "Location: http://" . $_SERVER["SERVER_NAME"] . str_replace( "/install/", "/upgrade/", $_SERVER["PHP_SELF"] ) );
 	exit();
 }
 
-require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsRegistry_setup.php' );
-require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsController_setup.php' );
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsRegistry_setup.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsController_setup.php' );/*noLibHook*/
 
 ipsController::run();
 
diff --git a/upload/admin/js/3rd_party/index.html b/upload/admin/js/3rd_party/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/js/3rd_party/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/js/3rd_party/jquery-ui.min.js b/upload/admin/js/3rd_party/jquery-ui.min.js
new file mode 100644
index 00000000..7f9a3726
--- /dev/null
+++ b/upload/admin/js/3rd_party/jquery-ui.min.js
@@ -0,0 +1,271 @@
+/*!
+ * jQuery UI 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.7",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
+d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
+b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(true===c.data(b.target,a.widgetName+".preventClickEvent")){c.removeData(b.target,a.widgetName+".preventClickEvent");b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
+a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);
+return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&c.data(a.target,this.widgetName+".preventClickEvent",
+true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+parseInt(c.curCSS(this,"marginRight",true))||0,w=m+q+parseInt(c.curCSS(this,"marginBottom",true))||0,i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=m/2;
+i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
+this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
+d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
+this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if(!this.element[0]||!this.element[0].parentNode)return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,
+b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
+a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
+0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
+(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
+"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?
+0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==
+Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
+f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;
+if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/
+b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-
+this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=
+this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.7"});
+d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=
+0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=
+c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,
+true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=
+0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=
+a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},
+stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=
+document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-
+c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-
+(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable",
+"snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=
+c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",
+{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,
+left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,
+a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,
+b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.7"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight};e=="mousedown"&&c[f]._activate.call(c[f],b)}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
+d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
+if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
+d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
+this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
+this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
+b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
+f={width:c.size.width-(f?0:c.sizeDiff.width),height:c.size.height-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",
+b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=
+a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,
+k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),
+c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=
+this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+
+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,
+arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,
+{version:"1.8.7"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,
+function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=
+(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=
+false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-
+a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",
+b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top",
+"Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,
+f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=
+a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+
+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&
+e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",
+height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=
+d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.7"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,
+arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=
+c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,
+{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();
+if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",
+a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");
+if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+
+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+
+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+
+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,
+c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==
+document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp();this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",
+null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):
+d(this.domPosition.parent).prepend(this.currentItem);return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||
+"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+
+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?
+2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},
+_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=
+this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=
+this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");
+if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=
+0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=
+this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},
+update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=
+null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));
+this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,
+null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||
+d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a==
+"string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition==
+"absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==
+"relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},
+_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-
+this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),
+10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?
+this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=
+this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+
+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?
+g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
+e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==
+f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",
+f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",
+g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=
+0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});
+d.extend(d.ui.sortable,{version:"1.8.7"})})(jQuery);
+;
\ No newline at end of file
diff --git a/upload/admin/js/3rd_party/jquery.min.js b/upload/admin/js/3rd_party/jquery.min.js
new file mode 100644
index 00000000..f78f96a1
--- /dev/null
+++ b/upload/admin/js/3rd_party/jquery.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Mar 31 15:28:23 2011 -0400
+ */
+(function(a,b){function ci(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cf(a){if(!b_[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";b_[a]=c}return b_[a]}function ce(a,b){var c={};d.each(cd.concat.apply([],cd.slice(0,b)),function(){c[this]=a});return c}function b$(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bZ(){try{return new a.XMLHttpRequest}catch(b){}}function bY(){d(a).unload(function(){for(var a in bW)bW[a](0,1)})}function bS(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bR(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bQ(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bs.test(a)?e(a,f):bQ(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bQ(a+"["+f+"]",b[f],c,e)}function bP(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bJ,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bP(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bP(a,c,d,e,"*",g));return l}function bO(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bD),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bq(a,b,c){var e=b==="width"?bk:bl,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function bc(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function bb(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function ba(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function _(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function $(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Q(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(L.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function P(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function H(a,b){return(a&&a!=="*"?a+".":"")+b.replace(t,"`").replace(u,"&")}function G(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,p=[],q=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(r,"")===a.type?q.push(g.selector):t.splice(i--,1);f=d(a.target).closest(q,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){f=p[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function E(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function y(){return!0}function x(){return!1}function i(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function h(a,c,e){if(e===b&&a.nodeType===1){e=a.getAttribute("data-"+c);if(typeof e==="string"){try{e=e==="true"?!0:e==="false"?!1:e==="null"?null:d.isNaN(e)?g.test(e)?d.parseJSON(e):e:parseFloat(e)}catch(f){}d.data(a,c,e)}else e=b}return e}var c=a.document,d=function(){function G(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(G,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x,y,z=Object.prototype.toString,A=Object.prototype.hasOwnProperty,B=Array.prototype.push,C=Array.prototype.slice,D=String.prototype.trim,E=Array.prototype.indexOf,F={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.2",length:0,size:function(){return this.length},toArray:function(){return C.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?B.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),x.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(C.apply(this,arguments),"slice",C.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:B,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;x.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=d._Deferred();if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",y,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",y),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&G()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):F[z.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!A.call(a,"constructor")&&!A.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||A.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:D?function(a){return a==null?"":D.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?B.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){F["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),E&&(d.inArray=function(a,b){return E.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?y=function(){c.removeEventListener("DOMContentLoaded",y,!1),d.ready()}:c.attachEvent&&(y=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",y),d.ready())});return d}(),e="then done fail isResolved isRejected promise".split(" "),f=[].slice;d.extend({_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(d,f)}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),f;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(f)return f;f=a={}}var c=e.length;while(c--)a[e[c]]=b[e[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?f.call(arguments,0):c,--g||h.resolveWith(h,f.call(b,0))}}var b=arguments,c=0,e=b.length,g=e,h=e<=1&&a&&d.isFunction(a.promise)?a:d.Deferred();if(e>1){for(;c<e;c++)b[c]&&d.isFunction(b[c].promise)?b[c].promise().then(i(c),h.reject):--g;g||h.resolveWith(h,b)}else h!==a&&h.resolveWith(h,e?[a]:[]);return h.promise()}}),function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0,reliableMarginRight:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e)}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(a.style.width="1px",a.style.marginRight="0",d.support.reliableMarginRight=(parseInt(c.defaultView.getComputedStyle(a,null).marginRight,10)||0)===0),b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function");return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}}();var g=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!i(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,g=b.nodeType,h=g?d.cache:b,j=g?b[d.expando]:d.expando;if(!h[j])return;if(c){var k=e?h[j][f]:h[j];if(k){delete k[c];if(!i(k))return}}if(e){delete h[j][f];if(!i(h[j]))return}var l=h[j][f];d.support.deleteExpando||h!=a?delete h[j]:h[j]=null,l?(h[j]={},g||(h[j].toJSON=d.noop),h[j][f]=l):g&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var f=this[0].attributes,g;for(var i=0,j=f.length;i<j;i++)g=f[i].name,g.indexOf("data-")===0&&(g=g.substr(5),h(this[0],g,e[g]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=h(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var j=/[\n\t\r]/g,k=/\s+/,l=/\r/g,m=/^(?:href|src|style)$/,n=/^(?:button|input)$/i,o=/^(?:button|input|object|select|textarea)$/i,p=/^a(?:rea)?$/i,q=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(k);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(k);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(j," ");for(var i=0,l=c.length;i<l;i++)h=h.replace(" "+c[i]+" "," ");g.className=d.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),i=b,j=a.split(k);while(f=j[g++])i=e?i:!h.hasClass(f),h[i?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(j," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var j=i?f:0,k=i?f+1:h.length;j<k;j++){var m=h[j];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(q.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(l,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&q.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=m.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&n.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var k=a.getAttributeNode("tabIndex");return k&&k.specified?k.value:o.test(a.nodeName)||p.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var l=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return l===null?b:l}h&&(a[c]=e);return a[c]}});var r=/\.(.*)$/,s=/^(?:textarea|input|select)$/i,t=/\./g,u=/ /g,v=/[^\w\s.|`]/g,w=function(a){return a.replace(v,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=x;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(a){return typeof d!=="undefined"&&d.event.triggered!==a.type?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=x);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),w).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(r,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=a.type,l[m]())}catch(p){}k&&(l["on"+m]=k),d.event.triggered=b}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,H(a.origType,a.selector),d.extend({},a,{handler:G,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,H(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?y:x):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=y;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=y;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=y,this.stopPropagation()},isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x};var z=function(a){var b=a.relatedTarget;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},A=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?A:z,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?A:z)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&E("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&E("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var B,C=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},D=function D(a){var c=a.target,e,f;if(s.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=C(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:D,beforedeactivate:D,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&D.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&D.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",C(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in B)d.event.add(this,c+".specialChange",B[c]);return s.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return s.test(this.nodeName)}},B=d.event.special.change.filters,B.focus=B.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function f(a){var c=d.event.fix(a);c.type=b,c.originalEvent={},d.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var e=0;d.event.special[b]={setup:function(){e++===0&&c.addEventListener(a,f,!0)},teardown:function(){--e===0&&c.removeEventListener(a,f,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var F={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=r.exec(h),k="",j&&(k=j[0],h=h.replace(r,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(F[h]+k),h=h+k):h=(F[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)d.event.add(n[p],"live."+H(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+H(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return"text"===c&&(b===c||b===null)},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var I=/Until$/,J=/^(?:parents|prevUntil|prevAll)/,K=/,/,L=/^.[^:#\[\.,]*$/,M=Array.prototype.slice,N=d.expr.match.POS,O={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(Q(this,a,!1),"not",a)},filter:function(a){return this.pushStack(Q(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=N.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(P(c[0])||P(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=M.call(arguments);I.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!O[a]?d.unique(f):f,(this.length>1||K.test(e))&&J.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var R=/ jQuery\d+="(?:\d+|null)"/g,S=/^\s+/,T=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,U=/<([\w:]+)/,V=/<tbody/i,W=/<|&#?\w+;/,X=/<(?:script|object|embed|option|style)/i,Y=/checked\s*(?:[^=]|=\s*.checked.)/i,Z={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};Z.optgroup=Z.option,Z.tbody=Z.tfoot=Z.colgroup=Z.caption=Z.thead,Z.th=Z.td,d.support.htmlSerialize||(Z._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(R,""):null;if(typeof a!=="string"||X.test(a)||!d.support.leadingWhitespace&&S.test(a)||Z[(U.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(T,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.length?this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&Y.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?$(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,bc)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!X.test(a[0])&&(d.support.checkClone||!Y.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){ba(a,e),f=bb(a),g=bb(e);for(h=0;f[h];++h)ba(f[h],g[h])}if(b){_(a,e);if(c){f=bb(a),g=bb(e);for(h=0;f[h];++h)_(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||W.test(i)){if(typeof i==="string"){i=i.replace(T,"<$1></$2>");var j=(U.exec(i)||["",""])[1].toLowerCase(),k=Z[j]||Z._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=V.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&S.test(i)&&m.insertBefore(b.createTextNode(S.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bd=/alpha\([^)]*\)/i,be=/opacity=([^)]*)/,bf=/-([a-z])/ig,bg=/([A-Z]|^ms)/g,bh=/^-?\d+(?:px)?$/i,bi=/^-?\d/,bj={position:"absolute",visibility:"hidden",display:"block"},bk=["Left","Right"],bl=["Top","Bottom"],bm,bn,bo,bp=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bm(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bm)return bm(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bf,bp)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bq(a,b,e):d.swap(a,bj,function(){f=bq(a,b,e)});if(f<=0){f=bm(a,b,b),f==="0px"&&bo&&(f=bo(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bh.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return be.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bd.test(f)?f.replace(bd,e):c.filter+" "+e}}),d(function(){d.support.reliableMarginRight||(d.cssHooks.marginRight={get:function(a,b){var c;d.swap(a,{display:"inline-block"},function(){b?c=bm(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bn=function(a,c,e){var f,g,h;e=e.replace(bg,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bo=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bh.test(d)&&bi.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bm=bn||bo,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var br=/%20/g,bs=/\[\]$/,bt=/\r?\n/g,bu=/#.*$/,bv=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bw=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bx=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,by=/^(?:GET|HEAD)$/,bz=/^\/\//,bA=/\?/,bB=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bC=/^(?:select|textarea)/i,bD=/\s+/,bE=/([?&])_=[^&]*/,bF=/(^|\-)([a-z])/g,bG=function(a,b,c){return b+c.toUpperCase()},bH=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bI=d.fn.load,bJ={},bK={},bL,bM;try{bL=c.location.href}catch(bN){bL=c.createElement("a"),bL.href="",bL=bL.href}bM=bH.exec(bL.toLowerCase())||[],d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bI)return bI.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bB,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bC.test(this.nodeName)||bw.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(bt,"\r\n")}}):{name:b.name,value:c.replace(bt,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bL,isLocal:bx.test(bM[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bO(bJ),ajaxTransport:bO(bK),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bR(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bS(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bF,bG)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bv.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bu,"").replace(bz,bM[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bD),e.crossDomain==null&&(q=bH.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bM[1]||q[2]!=bM[2]||(q[3]||(q[1]==="http:"?80:443))!=(bM[3]||(bM[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bP(bJ,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!by.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(bA.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bE,"$1_="+w);e.url=x+(x===e.url?(bA.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bP(bK,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bQ(g,a[g],c,f);return e.join("&").replace(br,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bT=d.now(),bU=/(\=)\?(&|$)|\?\?/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bT++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bU.test(b.url)||f&&bU.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bU,l),b.url===j&&(f&&(k=k.replace(bU,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bV=d.now(),bW,bX;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bZ()||b$()}:bZ,bX=d.ajaxSettings.xhr(),d.support.ajax=!!bX,d.support.cors=bX&&"withCredentials"in bX,bX=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),!a.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bW[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bW||(bW={},bY()),h=bV++,g.onreadystatechange=bW[h]=c):c()},abort:function(){c&&c(0,1)}}}});var b_={},ca=/^(?:toggle|show|hide)$/,cb=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cc,cd=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(ce("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cf(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ce("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(ce("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cf(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(ca.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=cb.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:ce("show",1),slideUp:ce("hide",1),slideToggle:ce("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!cc&&(cc=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(cc),cc=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var cg=/^t(?:able|d|h)$/i,ch=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=ci(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!cg.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=(e==="absolute"||e==="fixed")&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=ch.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!ch.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=ci(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=ci(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/upload/admin/js/acp.jquery.js b/upload/admin/js/acp.jquery.js
new file mode 100644
index 00000000..a7e909d1
--- /dev/null
+++ b/upload/admin/js/acp.jquery.js
@@ -0,0 +1,705 @@
+var ips = (function($){
+	
+	function init(){
+		// Hide menus
+		$(".acp-menu").hide();
+		
+		// Set up modal
+		$("#modal").css( { height: ( $(window).height() - parseInt( $("#header").height() ) ) } );
+		$(window).resize( function(e){
+			$("#modal").css( { height: ( $(window).height() - parseInt( $("#header").height() ) ) } );
+		});
+	}
+	
+	return {
+		init: init
+	};
+})(jQuery);
+
+jQ(document).ready(function() {
+ 	ips.init();
+	jQ("#app_menu").ipsMultiMenu();
+	sidebar.init();
+	livesearch.init();
+});
+
+
+// ************************************ //
+// Extend jQuery with custom methods	//
+// ************************************ //	
+jQ.undefined = function( obj ){
+	return typeof obj === "undefined";
+};
+
+// ************************************ //
+// Basic IPS plugins					//
+// ************************************ //
+var livesearch = {}, sidebar = {};
+
+(function($){
+	
+	sidebar = function($){
+		// Properties
+		
+		// Private Methods
+		var init = function(){
+			$("#toggle_sidebar").click( function(e){
+				e.preventDefault();
+				
+				if( $("#page_body").hasClass("open_menu") )
+				{
+					$("#toggle_sidebar").fadeOut();
+					$("#section_navigation").fadeOut('slow', function(){
+						$("#main_content").animate( { marginLeft: 0 }, function(){
+							$("#page_body").removeClass("open_menu").addClass("close_menu");
+							$("#toggle_sidebar").fadeIn();
+							$( window ).trigger('resize'); // Some of our components use window size, so fire this now
+							ipb.Cookie.set("acp_sidebar", "closed", 1);
+						});
+					});
+				}
+				else
+				{
+					$("#toggle_sidebar").fadeOut();
+					$("#main_content").animate( { marginLeft: 195 }, function(){
+						$("#section_navigation").hide().fadeIn( 'slow', function(){
+							$("#page_body").removeClass("close_menu").addClass("open_menu");
+							$("#toggle_sidebar").slideDown();
+							$( window ).trigger('resize'); // Some of our components use window size, so fire this now
+							ipb.Cookie.set("acp_sidebar", "open", 1);
+						} );
+					} );					
+				}
+				
+				return false;
+			} );
+		};
+		
+		// Public methods
+		return {
+			init: init
+		}
+	}($);
+	
+	livesearch = function($){
+		// Options object
+		var options = {
+			showDelay: 400,
+			hideDelay: 800,
+			minChars: 3,
+			lastPress: 0
+		};
+		
+		// Properties
+		var	$elem = {}, $results = {}, $modal = {},
+			defaultText = '',
+			lastValue = '',
+			timeouts = {},
+			documentClickHandler = false,
+			cache = {},
+			self = this;
+					
+		// Templates
+		var	templates = {
+			wrap: "<ul>[items]</ul>",
+			item: "<li><a href='[url]'><strong>[name]</strong></a></li>",
+			none: "<p class='ls_none'>" + ipb.lang['livesearchnoresults'] + "</p>",
+			locations: {
+				members: "<li><a href='[url]'><img src='[img]' class='photo left' /> <strong>[name]</strong></a><br /><span class='desctext'>[extra]</span></li>",
+				forums: "<li><a href='[url]'><strong>[name]</strong></a><br /><span class='desctext'>[extra]</span></li>",
+				nexus: "<li><img src='[img]' style='height: 16px; width: 16px; border: 0px' /> <a href='[url]'><strong>[name]</strong></a></li>"
+			}
+		};
+		
+		// Private methods
+		var init = function(){
+			$elem = $("#acpSearchKeyword");
+			$results = $("#live_search_results");
+			$modal = $("#modal");
+			
+			defaultText = $elem.val();
+			
+			$elem.focus( handleFocus ).blur( handleBlur ).attr("autocomplete", "off");
+			
+			$elem.bind( 'keydown', function() { options.lastPress = new Date().getTime(); } );
+			
+			// Attach live event to sections that are NOT disabled and NOT active; make Overview active
+			if ( ipb.vars['app_url'].substring( ipb.vars['app_url'].length - 10, ipb.vars['app_url'].length - 5 ) == 'nexus' )
+			{
+				$("#ls_sections li:not(.disabled):not(.active)", $results).live('click', switchResultsTab).siblings("#ls_nexus").addClass('active');
+				$("#ls_results > div", $results).hide().siblings("#ls_nexus_panel").show();
+				$(".count", $results).hide();
+			}
+			else
+			{		
+				$("#ls_sections li:not(.disabled):not(.active)", $results).live('click', switchResultsTab).siblings("#ls_overview").addClass('active');
+				$("#ls_results > div", $results).hide().siblings("#ls_overview_panel").show();
+				$(".count", $results).hide();
+			}
+		},
+		
+		runSearch = function(){
+			// Keep it going
+			timeouts['show'] = setTimeout( runSearch, options.showDelay );
+			
+			var curVal  = $elem.val();
+			var timeNow = new Date().getTime();
+			
+			if ( options.lastPress && timeNow && ( ( timeNow - options.lastPress ) < 800 ) )
+			{
+				return;
+			}
+			
+			if( curVal.length < options.minChars ){
+				hideResultsPanel();
+				documentClick(false);
+				return;
+			}
+			
+			showResultsPanel(); 		// Display the modal and results panel
+			documentClick(true); 		// Set the document click event
+			if( curVal == lastValue ){	return; } // If it's the same as last time, skip
+			fetchResults( curVal ); 	// Grab the results and process
+			lastValue = curVal; 		// Update last value to be current value
+		},
+		
+		fetchResults = function( curVal ){
+			
+			Debug.write( '--' + curVal );
+			
+			if( cache[ curVal ] ){
+				Debug.write("Loading from cache");
+				parseResults( cache[ curVal ] );
+			}
+			else
+			{
+				$('#acp_loading').show();
+				
+				$.ajax( {
+					url: ipb.vars['app_url'].replace( /&amp;/g, '&' ) + "app=core&module=ajax&section=livesearch&do=search&secure_key=" + ipb.vars['md5_hash'],
+					type: 'POST',
+					data: { 
+						'search_term': curVal
+					},
+					success: function(data){
+						if( data['error'] )
+						{
+							alert( data['error'] );
+							if( data["__session__expired__log__out__"] ){
+								window.location.reload();
+							}
+						}
+						else
+						{
+							cache[ curVal ] = data;
+							parseResults( data );
+						}
+						$('#acp_loading').hide();
+					},
+					error: function(){
+						alert( ipb.lang['session_timed_out'] );
+						window.location.reload();
+					}
+				});	
+			}
+		},
+		
+		parseResults = function( data ){
+			
+			if( $.undefined( data ) ){
+				//Debug.error( "Invalid JSON" );
+				return;
+			}
+			
+			// Disable all sections to start with
+			$("#ls_sections li").not("#ls_marketplace").addClass("disabled").find(".count").hide();
+			
+			// If there are per-group settings, add to settings tab
+			if( !$.undefined( data['groupLangs'] ) && data['groupLangs'] )
+			{
+				var _langs	= new Array();
+				_langs['name']	= ipb.lang['group_settings_match'];
+				_langs['url']	= ipb.vars['base_url'] + 'app=members&module=groups';
+				
+				data['settings'].unshift( _langs );
+			}
+			
+			var total = 0;
+			
+			$.each( data, function( location, results ){
+				if( $.isArray( results ) && results.size() )
+				{
+					var size = results.size();
+					var html = '';
+										
+					// Any special template to use?
+					_template = ( !$.undefined( templates.locations[ location ] ) ) ? templates.locations[ location ] : templates.item;
+					
+					// Update results panel
+					$.each( results, function( k, v ){
+						html += _template.replace("[name]", v['name']).replace("[url]", v['url']).replace("[img]", v['img']).replace("[extra]", v['extra']);
+						total++;
+					});
+				
+					// Build wrapper
+					html = templates.wrap.replace("[items]", html);
+					$("#ls_" + location + "_panel").html( html );
+					
+					// Make members a double-column
+					if( location == 'members' ){
+						$("#ls_" + location + "_panel").find("li:even").addClass("even").end().find("li:odd").addClass("odd");
+					}
+					
+					// Update section list count
+					$("#ls_" + location ).removeClass("disabled").find(".count").html( size ).fadeIn('fast');
+				}
+				else {
+					$("#ls_" + location + "_panel").html(''); //templates.none
+				}
+			});
+			
+			if( total ){
+				$("#ls_no_results").hide();
+			} else {
+				$("#ls_no_results").show();
+			}
+		},
+		
+		switchResultsTab = function( e ){
+			// Switch highlighted tab
+			$(e.target).addClass("active").siblings("li").not(e.target).removeClass("active");
+			$("#ls_results > div", $results)
+				.not( "#" + e.target.id + "_panel" ).fadeOut()
+				.siblings( "#" + e.target.id + "_panel" ).fadeIn();
+		},
+		
+		handleDocumentClick = function(e){
+			if( $(e.target).closest("#live_search_results, #header").size() == 0 )
+			{
+				clearTimeout( timeouts['show'] );
+				documentClick( false );
+				hideResultsPanel();
+			}
+		},
+		
+		documentClick = function( type ){
+			if( type == true ){
+				// If the user clicks elsewhere in the document, cancel search
+				if( !documentClickHandler ){
+					$("body").bind( "click.livesearch", handleDocumentClick );
+					documentClickHandler = true;
+				}
+			} else {
+				if( documentClickHandler ){
+					$("body").unbind( "click.livesearch" );
+					documentClickHandler = false;
+				}
+			}
+		},
+		
+		showResultsPanel = function(){
+			$modal.not(":visible").fadeIn('fast');
+			$results.not(":visible").fadeIn('slow');
+		},
+		hideResultsPanel = function(){
+			$modal.fadeOut('slow');
+			$results.fadeOut('fast');
+		},
+		
+		handleFocus = function(e){
+			Debug.write("focus!");
+			if( $elem.hasClass("inactive") ){
+				$elem.val('').removeClass('inactive');
+			}
+			
+			clearTimeout( timeouts['show'] );
+			timeouts['show'] = setTimeout( runSearch, options.showDelay );
+		},
+		
+		handleBlur = function(e){
+			if( $elem.val() == '' ){
+				clearTimeout( timeouts['show'] );
+				$elem.val( defaultText ).addClass('inactive');
+			}
+		};
+		
+		// Public methods
+		return {
+			init: init
+		}
+	}(jQuery);
+	
+	/****************************************/
+	/* Wizard bar (step by step)			*/
+	/****************************************/
+	$.fn.ipsWizard = function(options) {
+		var $$ = $(this);
+		var defaults = {
+			nextSelector: "#next",
+			prevSelector: "#prev",
+			wrapSelector: "#ipsSteps_wrapper",
+			finishSelector: "#finish",
+			allowJumping: false,
+			allowGoBack: false
+		},
+		options = $.extend( defaults, options );
+		
+		var setJumps = function( elem ){
+			$$.find("li").removeClass("clickable");
+			
+			if( options['allowJumping'] ){
+				$$.find("li").not(".steps_disabled, .steps_active").addClass("clickable");
+			}
+						
+			if( options['allowGoBack'] ){
+				$$.find("li.steps_active").prevAll().not(".steps_disabled").addClass("clickable");
+			}
+			
+			// Show/hide Next/Prev/Finish
+			if( $$.find("li:last").hasClass("steps_active") ){
+				$( options['nextSelector'] ).hide();
+				$( options['prevSelector'] + "," + options['finishSelector'] ).show();
+			} else if( $$.find("li:first").hasClass("steps_active") ) {
+				$( options['nextSelector'] ).show();
+				$( options['finishSelector'] + "," + options['prevSelector'] ).hide();
+			} else {
+				$( options['nextSelector'] + "," + options['prevSelector'] ).show()
+				$( options['finishSelector'] ).hide();
+			}
+		},
+		nextItem = function(e){
+			// Find active item and get next item
+			var next = $$.find("li.steps_active").nextAll(":not(.steps_disabled)")[0];
+			if( $.undefined( next ) ){ return; }
+			showItem( next.id );
+		},
+		prevItem = function(e){
+			var prev = $$.find("li.steps_active").prevAll(":not(.steps_disabled)")[0];
+			if( $.undefined( prev ) ){ return; }
+			showItem( prev.id );
+		},
+		clickStep = function(e){
+			showItem( $(e.target).closest('li')[0].id );
+		},
+		backToTop = function(e){
+			$('html,body').animate( {'scrollTop': ( $(options['wrapSelector']).offset().top - 80 ) } );
+		},
+		focusFirst = function(activeID){
+			try {
+				$('#'+activeID+'_content :input:first').focus();
+			} catch(err){ Debug.write( err ); }
+		},
+		showItem = function( id ){
+			if( id === false ){ return false; }
+			// Find active
+			var activeID = $$.find("li.steps_active:first")[0].id;
+			if( activeID == id ){ return; }
+			
+			var oldH = $('#'+activeID+'_content').height();
+			var newH = $('#'+id+'_content').height();
+			
+			// Set up some CSS
+			$( options['wrapSelector'] ).height( oldH );
+			
+			$('#'+activeID+'_content').addClass("step_content_animating");
+			$('#'+id+'_content').addClass("step_content_animating");
+			
+			// Switch item
+			$( "#" + activeID + '_content' ).fadeOut('slow', function(){
+				$( options['wrapSelector'] ).animate( { height: newH }, 'fast', function(){
+					$( "#" + id + '_content' ).fadeIn('slow', function(){
+						$( options['wrapSelector'] ).css("height", "auto");
+						$('#'+activeID+'_content').removeClass("step_content_animating");
+						$('#'+id+'_content').removeClass("step_content_animating");
+					});
+				});
+			});
+			
+			// Update step bar
+			$("#"+id).siblings()
+				.removeClass("steps_active")
+				.removeClass("steps_done")
+				.end()
+				.addClass("steps_active")
+				.prevAll(":not(.steps_active")
+				.addClass("steps_done");
+			
+			backToTop();
+			focusFirst( activeID );
+			setJumps();
+		};
+		
+		return this.each(function(){
+			if( $.undefined( options['currentStep'] ) ){ }
+			
+			if( !options['allowJumping'] && !options['allowGoBack'] ){
+				$( options['prevSelector'] ).remove();
+			}
+			
+			// Set initial clickable status
+			setJumps();
+			
+			// Set event handler
+			$(".clickable", this).live('click', clickStep);
+			$( options['nextSelector'] ).click( nextItem );
+			$( options['prevSelector'] ).click( prevItem );	
+		});
+	};
+	
+	/****************************************/
+	/* Multi-level drop down menu			*/
+	/****************************************/
+    $.fn.ipsMultiMenu = function(options) {
+		var defaults = {
+			speed: 'fast'
+		}, 
+		options = $.extend( defaults, options),
+		arrow = $("<span class='menu_arrow'>&raquo;</span>"),
+		timeouts = {};
+		
+		var mOver = function(e){
+			if( $(this).data('timeout') ){
+				clearTimeout( this.data('timeout') );
+				$(this).data('timeout', false);
+			}
+			
+			var w = ($(this).outerWidth() - 5),
+				children = $(this).children('ul:first'),
+				docSize = $(window).width();
+			
+			if( !$(this).parent("ul").hasClass('root') ){
+				
+				children.css('left', w).css('top', -20);
+						
+				// jQuery can't get offset from hidden elements, so show, measure, then hide.
+				children.show();
+				var childW = children.outerWidth();
+				var realLeft = children.offset().left + childW + 5;
+				children.hide();
+				
+				if( realLeft >= docSize ){
+					children.css('left', 5 - childW );
+				}
+			}
+			
+			// Check if it's too far off the screen
+			//children.fadeIn( options.speed );
+			$(this).children('ul:first').show();
+			//var _this = this;
+			//setTimeout( function(){ $(_this).children('ul:first').show() }, 150 );
+		},
+		mOut = function(e){
+			//$(this).children('ul:first').fadeOut( options.speed );
+			var _this = this;
+			var timeout = setTimeout( function(){ $(_this).children('ul:first').hide() }, 250 );
+			this.data('timeout', timeout);
+		};
+		
+        return this.each(function(){
+			// Hide all UL
+			$(this).addClass('root');
+			$("ul", this).hide();
+            $("li:has(ul)", this).hover(mOver, mOut).not('.root > li').addClass('has_sub').children("a,span").append(arrow.clone());
+        });
+    };
+	
+	/****************************************/
+	/* Sortable								*/
+	/* Piggybacks on jQuery ui sortable, 	*/
+	/* but sets up some IPS defaults for it	*/
+	/****************************************/
+	$.fn.ipsSortable = function(type, options) {
+		var defaults = {
+			'table': {
+				handle: 'td .draghandle',
+				items: 'tr.isDraggable',
+				opacity: 0.6,
+				axis: 'y',
+				revert: true,
+				forceHelperSize: true,
+				helper: 'clone',
+				sendType: 'get',
+				pluralize: true
+			},
+			'multidimensional': {
+				handle: '.draghandle',
+				items: 'div.isDraggable',
+				opacity: 0.6,
+				axis: 'y',
+				revert: true,
+				forceHelperSize: true,
+				helper: 'clone',
+				sendType: 'get',
+				pluralize: true
+			},
+			'list': {
+				// todo
+			},
+			'custom': {  } //todo
+		};
+			
+		return this.each(function(){
+			var x = ( $.undefined( defaults[type] ) ) ? defaults['custom'] : defaults[type];
+			var o = $.extend( x, options );
+			
+			// If there's no function defined already, and a URL is specified, set up
+			// an ajax call
+			if( $.undefined( o['update'] ) && !$.undefined( o['url'] ) )
+			{ 
+				o['update'] = function( e, ui )
+				{
+					if ( ! Object.isUndefined( o['callBackUrlProcess'] ) )
+					{
+						o['url'] = o['callBackUrlProcess']( o['url'] );
+					}
+				
+					var serial = $(this).sortable("serialize", ( o['serializeOptions'] || {} ) );
+					
+					$.ajax( {
+						url: o['url'].replace( /&amp;/g, '&' ),
+						type: o['sendType'],
+						data: serial,
+						processData: false,
+						success: function(data){
+							if( data['error'] )
+							{
+								alert( data['error'] );
+								if( data["__session__expired__log__out__"] ){
+									window.location.reload();
+								}
+							}
+							else
+							{
+								Debug.write("Sortable update successfully posted");
+							}
+						},
+						error: function(){
+							alert( ipb.lang['session_timed_out'] );
+							window.location.reload();
+						}
+					});
+				}
+			}
+			
+			$( this ).sortable( o );
+		});
+		
+	};
+	
+	/****************************************/
+	/* Tab bar								*/
+	/****************************************/
+	$.fn.ipsTabBar = function(options) {
+		var defaults = {
+				tabWrap: "#tabContent",
+				scrollStep: 130
+		 	},
+			options = $.extend( defaults, options ),
+			getTabID = function(tab){
+				return tab.replace("tab_", "");
+			},
+			switchTab = function(e){
+				var $container = $(this).parent("ul");
+				var curID = getTabID( $container.find("li.active")[0].id );
+				var newID = getTabID( this.id );
+				
+				if( $(this).hasClass("active") ){
+					return;
+				}
+				
+				// Switch highlighted tab
+				$(this).addClass("active")
+					.siblings("li")
+					.not(this)
+					.removeClass("active");
+
+				// Animate tab content
+				$("#tab_" + curID + "_content").fadeOut();
+				$( options['tabWrap'] ).animate();
+				$("#tab_" + newID + "_content").fadeIn();
+			},
+			scrollTabs = function(e){
+				var tar = $(e.target);
+				var ul = tar.siblings("ul");
+				
+				// For both scrollers, check the maximum distance we can scroll
+				// before we get to the end of the bar. Use that distance if it's
+				// less than options.scrollStep.
+				if( $(tar).hasClass('tab_right') )
+				{
+					var l = parseInt( $(ul).css('left') ) || 0;
+					var w = $(ul).width();
+					var wrap = $(ul).parent(".ipsTabBar").width();
+					var diff = ( l + w ) - wrap;
+					var move = ( diff > options.scrollStep ) ? options.scrollStep : diff;
+									
+					$( ul ).animate({ left: "-=" + move}, function(){
+						checkTabToggle( tar.parent(".ipsTabBar") );
+					});
+				}
+				else if( $(tar).hasClass('tab_left') )
+				{
+					var l = parseInt( $(ul).css('left') ) || 0;
+					var move = ( (l*-1) > options.scrollStep ) ? options.scrollStep : (l*-1);
+					
+					$( ul ).animate({ left: "+=" + move}, function(){
+						checkTabToggle( tar.parent(".ipsTabBar") );
+					});
+				}
+			},
+			checkTabToggle = function( $this ){
+				var	ul = $("ul", $this),
+					w = ul.outerWidth(),
+					left = parseInt( ul.css('left') ) || 0,
+					pos = parseInt( $($this).css('left') ) || 0,
+					wrap = $($this).width();
+				
+				if( ( left + w ) > wrap ){
+					$($this).addClass("with_right").find(".tab_right").fadeIn('fast');
+				} else {
+					$($this).removeClass("with_right").find(".tab_right").fadeOut('fast');
+				}
+				
+				if( left < 0 ){
+					$($this).addClass("with_left").find(".tab_left").fadeIn('fast');
+				} else {
+					$($this).removeClass("with_left").find(".tab_left").fadeOut('fast');
+				}
+			};
+			
+		return this.each(function(){
+			
+			// Hide the scrollers & set event
+			$(".tab_left,.tab_right", this).hide().mousedown( scrollTabs );
+			
+			var tabSetup = function( tab, id ){
+				$(tab).addClass('active');
+				$( options['tabWrap'] + " > div").not("#tab_" + id + "_content").hide(); // Hide all except active
+				//$( options['tabWrap'] ).height( $("#tab_" + id + "_content").innerHeight() ); // Set tab wrap height to active pane height
+			}
+			
+			// Which default tab?
+			if( $.undefined( options['defaultTab'] ) ){
+				tabSetup( $("li:first", this), getTabID( $("li:first", this).attr('id') ) );
+			} else {
+				tabSetup( "#" + options['defaultTab'], getTabID( options['defaultTab'] ) );
+			}
+			
+			// Event for tab switching
+			$('li', this).click( switchTab );
+			
+			var $this = this;
+			
+			// Initial check for showing toggles
+			checkTabToggle( $this );
+						
+			// Check on window resize too
+			$(window).resize( function(){
+				checkTabToggle( $this );
+			});
+			
+		});
+
+	};
+	
+}(jQuery));
diff --git a/upload/admin/js/acp.jquery.members.js b/upload/admin/js/acp.jquery.members.js
new file mode 100644
index 00000000..62d171cc
--- /dev/null
+++ b/upload/admin/js/acp.jquery.members.js
@@ -0,0 +1,656 @@
+// ************************************ //
+// Member List							//
+// ************************************ //
+var memberlist = {};
+
+(function($){
+	
+	memberlist = function($){
+		//-------------------------------------
+		// PROPERTIES
+		var currentOptions = {
+			st: 0,
+			type: 'all',
+			string: '',
+			order_by: 'joined',
+			order_direction: 'desc'
+		},
+		coreOptions = ['st', 'type', 'string', 'order_by', 'order_direction'],
+		request_url = '',
+		table = null,
+		isAdvSearching = false,
+		searchTimeout = null,
+		lastVal = '',
+		resultsCache = {};
+		
+		//-------------------------------------
+		// PUBLIC METHODS	
+		var init = function( url, defaultType ){
+			request_url	= url;
+			table		= $("#member_list");
+			defaultType	= defaultType ? defaultType : 'all';
+		
+			// Set up events
+			$("#member_types a").click( toggleType ); 								// Toggle bar
+			$("#member_search").focus( focusSearch ).blur( blurSearch );			// Search box
+			$(".sortable", table).click( sortTable );								// Column headers
+			$(".member_action", table).live('click', doAction );					// Row action
+			$(".mass_action", table).live('click', doMassAction );					// Mass action
+			$("#mfooter_spam .spam_action").live('click', doSpamAction);			// Spam action
+			$(".check_all", table).live('click', checkAll );						// "Check All"
+			$("#member_results input:checkbox").live("click", checkOne);			// Check one
+			$(".pagination a").live('click', hijackPagination ); 					// Hijack navigation
+			$("#advanced_member_search").click( showAdvancedSearch );				// Advanced search
+			$("#memberListForm").submit( function(e){ e.preventDefault(); } );		// Stop form submission
+			
+			prepareAdvancedSearch();
+			preparePruneAndMove();
+			
+			if( window.location.hash ){
+				parseHash();
+			} else {
+				//loadDefaults();
+			}
+			
+			// Default type
+			if( defaultType )
+			{
+				currentOptions['type']	= defaultType;
+				
+				$("#member_types li").removeClass("active");
+				$('li[data-type|="' + defaultType + '"]').addClass("active");
+
+				if( $("#mheader_" + defaultType + ":hidden").size() )
+				{
+					$(".member_column_titles").hide();
+					$(".sortable", table).removeClass("active");
+					$("#mheader_" + defaultType )
+						.show()
+						.find('th[data-key="' + currentOptions['order_by'] + '"]')
+							.addClass("active")
+							.addClass( currentOptions['order_direction'] );
+					
+				}
+
+				if( !$("#mfooter_" + defaultType + ":visible").size() )
+				{
+					$("tfoot tr", table).hide();
+					$("#mfooter_" + defaultType ).show();
+				}
+			}
+			
+			$("#members_loading").ajaxStart( function(){
+				$(this).fadeIn('fast');
+			}).ajaxStop( function(){
+				$(this).fadeOut('fast');
+			});
+		},
+		getOption = function(option){
+			return currentOptions[ option ];
+		},
+		setOption = function( option, value ){
+			currentOptions[ option ] = value;
+		};
+		
+		//-------------------------------------
+		// PRIVATE METHODS
+		// Toggles the type (member, validating, spammer etc.)
+		var toggleType = function(e)
+		{
+			e.preventDefault();
+			// Ignore if already active
+			if( $( e.target ).closest(".ipsActionButton.active").size() ){
+				return;
+			}
+			// Make active
+			$("#member_types li").removeClass("active");
+			var key = $( e.target ).closest("li").addClass("active").data('type');
+			
+			// Send request
+			fetchResults( { type: key } );
+		},
+		
+		// Handler for sorting the table by column
+		sortTable = function(e)
+		{
+			e.preventDefault();
+			var td = $( e.target ).closest('.sortable');
+			
+			if( td.hasClass('active') ){
+				if( td.hasClass('desc') ){
+					td.removeClass('desc').addClass('asc');
+					fetchResults( { order_direction: 'asc' } );
+				} else {
+					td.removeClass('asc').addClass('desc');
+					fetchResults( { order_direction: 'desc' } );
+				}
+				return;
+			}
+			
+			$(".sortable", table).removeClass("active");
+			var key = td.addClass("active").addClass("desc").data('key');
+			
+			// Send request
+			fetchResults( { order_by: key, order_direction: 'desc' } );
+		},
+		
+		// Perform an action on a member
+		doAction = function(e)
+		{
+			e.preventDefault();
+			
+			// Get the type and action
+			var _do = currentOptions['type'];
+			var _action = $( e.target ).data("action");
+			if( $.undefined( _do ) || !_do || $.undefined( _action ) || !_action ){
+				Debug.write( "No type, or no action."); return;
+			}
+			
+			if( _action == 'delete' ){
+				if( !confirm( ipb.lang['confirm_delete_single_mem'] ) ){
+					return false;
+				}
+			}
+			
+			// Get the relevant member ID
+			var mid = $( e.target ).closest("tr").data("mid");
+			if( $.undefined( mid ) || !mid ){
+				Debug.write( "No member ID found."); return;
+			}
+			
+			if( _do == 'all' ){
+				var url = request_url + "&do=do_" + _action + "&type=" + _do + "&mid_" + mid + "=1";
+			} else {
+				var url = request_url + "&do=do_" + _do + "&type=" + _action + "&mid_" + mid + "=1";
+			}
+			
+			// Send the request
+			$.ajax( {
+				url: url.replace(/&amp;/g, '&'),
+				type: 'get',
+				success: function(data){
+					if( data['ok'] ){
+						if( _action == 'resend' )
+						{
+							alert( data['msg'] );
+						}
+						else
+						{
+							$( e.target ).closest(".member_controls")
+								.addClass("success")
+								.closest("tr")
+									.fadeOut('slow', function(){
+										$( this ).remove();
+										checkForEmptyTable();
+									});
+						}				
+					}
+					else if( data['error'] ) {
+						alert( data['error'] );
+					}
+					else {
+						alert( ipb.lang['generic_ajax_error'] );
+					}						
+				}
+			});			
+		},
+		
+		doMassAction = function(e)
+		{
+			e.preventDefault();
+			
+			// Get the type and action
+			var _do = currentOptions['type'];
+			var _action = $( e.target ).data("action");
+			if( $.undefined( _do ) || !_do || $.undefined( _action ) || !_action ){
+				Debug.write( "No type, or no action."); return;
+			}
+			
+			if( _action == 'delete' ){
+				if( !confirm( ipb.lang['confirm_delete_multiple_mem'] ) ){
+					return false;
+				}
+			}
+			
+			// Get all MIDs
+			var mids = $("#member_results input:checked").map( function(){
+				return "mid_" + $(this).closest("tr").data("mid") + "=1";
+			}).get();
+			
+			if( mids == "" ){ return; }
+			mids = mids.join("&");
+			
+			var url = request_url + "&do=do_" + _do + "&type=" + _action + "&" + mids;
+			
+			//Debug.write( url );
+			$.ajax( {
+				url: url.replace(/&amp;/g, '&'),
+				type: 'get',
+				success: function(data){
+					if( data['ok'] ){
+						$("#member_results input:checked").parents(".member_controls")
+							.addClass("success")
+							.closest("tr")
+								.fadeOut('slow', function(){
+									$( this ).remove();
+									checkForEmptyTable();
+								});						
+					}
+					else if( data['error'] ) {
+						alert( data['error'] );
+					}
+					else {
+						alert( ipb.lang['generic_ajax_error'] );
+					}
+				}
+			});
+		},
+		
+		doSpamAction = function(e)
+		{
+			e.preventDefault();
+			var action = $( e.target ).data("action");
+			
+			if( action == 'unspam' )
+			{
+				$("#s_initial").hide();
+				$("#s_unspam_confirm").show();
+				$("#s_unspam_yes, #s_unspam_no").click( function(e){
+					doMassAction(e);
+					$( this ).unbind();
+					$("#s_unspam_confirm").hide();
+					$("#s_initial").show();
+				});
+			}
+			else if( action == 'ban' )
+			{
+				$("#s_initial").hide();
+				$("#s_ban_confirm").show();
+				$("#s_ban_yes, #s_ban_no").click( function(e){
+					doMassAction(e);
+					$( this ).unbind();
+					$("#s_ban_confirm").hide();
+					$("#s_initial").show();
+				});
+			}
+			else
+			{
+				doMassAction(e);
+			}
+		},
+		
+		// Checks whether the table is empty after performing
+		// member row actions
+		checkForEmptyTable = function()
+		{
+			if( $("#member_results tr").size() == 0 )
+			{
+				$(".check_all").attr("checked", false);
+				$("tfoot tr:visible", table).addClass("disabled");
+				fetchResults( {}, true ); // force cache update
+			}
+		},
+		
+		// Handler for checking all checkboxes in the table
+		checkAll = function(e)
+		{
+			$("#member_results input:checkbox").attr("checked", e.target.checked );
+			
+			// Enable the mass-action bar if necessary
+			if( e.target.checked && $("#member_results tr").size() ){
+				$("tfoot tr:visible").removeClass("disabled");
+			}
+			else {
+				$("tfoot tr:visible").addClass("disabled");
+			}
+		},
+		
+		// Handler when a checkbox is clicked. Removes 'check all' check if necessary.
+		checkOne = function(e)
+		{
+			if( !e.target.checked ){
+				$(".check_all").attr("checked", false);
+			}
+			
+			
+			if( !$("#member_results input:not(:checked)").size() ){
+				$(".check_all").attr("checked", true);
+			} else {
+				$(".check_all").attr("checked", false);
+			}
+			
+			// Enable the mass-action bar if necessary
+			if( $("#member_results tr").size() && $("#member_results input:checked").size() ){
+				$("tfoot tr:visible").removeClass("disabled");
+			}
+			else {
+				$("tfoot tr:visible").addClass("disabled");
+			}
+		},
+		
+		// Handler for pagination links
+		hijackPagination = function(e)
+		{
+			e.preventDefault();
+			
+			// Find the st value
+			try {
+				var st = e.target.href.match(/\&st=([0-9]+)/)[1];
+			} catch(err) {
+				Debug.write( "No st value found" );
+				return;
+			}
+			
+			fetchResults( { st: st } );
+		},
+		
+		// if there's a url hash, parse it and load results
+		parseHash = function()
+		{
+			var hash = window.location.hash;
+			var params = $H( getHashParams( hash ) );
+			var options = {};
+			
+			if( !params.size() ){
+				return;
+			}
+			
+			params.each( function(h){
+				options[ h.key ] = h.value;
+			});
+			
+			if( !options['do_results'] ){
+				return;
+			}
+			
+			var o = Object.toQueryString( currentOptions );
+			currentOptions = $.extend( currentOptions, options );
+
+			// do stuff
+			$.ajax( {
+				url: ( request_url + "&" + o ).replace(/&amp;/g, '&'),
+				type: 'post',
+				data: options,
+				success: function(data){
+					if( data['error'] )
+					{
+						alert( data['error'] );
+						if( data["__session__expired__log__out__"] ){
+							window.location.reload();
+						}
+					}
+					else
+					{
+						$("#member_types").hide();
+						$("#m_search_info").show().find("span").html( data['count'] );
+						isAdvSearching = true;
+						buildResults( data );
+						Debug.write("Done");
+					}
+				}
+			});	
+		},
+		
+		getHashParams = function( hash )
+		{
+		    var hashParams = {};
+		    var e,
+		        a = /\+/g,  // Regex for replacing addition symbol with a space
+		        r = /([^&;=]+)=?([^&;]*)/g,
+		        d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
+		        q = window.location.hash.substring(1);
+
+		    while (e = r.exec(q))
+		       hashParams[d(e[1])] = d(e[2]);
+
+		    return hashParams;
+		},
+		
+		// Fetches results from the server or cache using our params object
+		fetchResults = function( options, force )
+		{
+			var newOpts = {};
+			$.each( coreOptions, function( i, v ){
+				newOpts[ v ] = currentOptions[ v ];
+			});
+			currentOptions = newOpts;
+			
+			var o = $.extend( {}, currentOptions, options );
+			var hash = Object.toQueryString( o );
+			
+			//o['__update']	= 1;
+			
+			// Wipe cache?
+			if( force ){
+				resultsCache = {};
+			}
+			
+			if( resultsCache[ hash ] )
+			{
+				currentOptions = o;
+				buildResults( resultsCache[hash] );
+			}
+			else
+			{			
+				// do stuff
+				$.ajax( {
+					url: request_url.replace(/&amp;/g, '&'),
+					type: 'get',
+					data: o,
+					success: function(data){
+						if( data['error'] )
+						{
+							alert( data['error'] );
+							if( data["__session__expired__log__out__"] ){
+								window.location.reload();
+							}
+						}
+						else
+						{
+							currentOptions = o;
+							buildResults( data );
+							resultsCache[ hash ] = data;
+							Debug.write("Done");
+						}
+					}
+				});
+			}
+			
+			// Set anchor for back button functionality
+			window.location.hash = hash; /*.replace(/&/g, '/').replace(/\/amp;/g, '&amp;');*/
+		},
+		buildResults = function( results ){
+			
+			// Show headers
+			if( $("#mheader_" + currentOptions['type'] + ":hidden").size() )
+			{
+				$(".member_column_titles").hide();
+				$(".sortable", table).removeClass("active");
+				$("#mheader_" + currentOptions['type'] )
+					.show()
+					.find('th[data-key="' + currentOptions['order_by'] + '"]')
+						.addClass("active")
+						.addClass( currentOptions['order_direction'] );
+				
+			}
+			// Show footers
+			if( !$("#mfooter_" + currentOptions['type'] + ":visible").size() )
+			{
+				$("tfoot tr", table).hide();
+				$("#mfooter_" + currentOptions['type'] ).show();
+			}
+			
+			// Build results and pagination	
+			$("tbody#member_results", table).html( results['members'] );
+			$(".pagination").replaceWith( results['pages'] );
+			
+			// Check prune/move
+			checkPruneAndMove( currentOptions['type'] );
+		},
+		focusSearch = function(e){
+			clearTimeout( searchTimeout );
+			searchTimeout = setTimeout( runSearch, 300 );
+		},
+		blurSearch = function(e){
+			clearTimeout( searchTimeout );
+		},
+		runSearch = function(){
+			searchTimeout = setTimeout( runSearch, 300 );
+			var curVal = $("#member_search").val();
+			
+			if( curVal == lastVal || curVal.length < 3 ){
+				return;
+			}
+			
+			fetchResults( { string: curVal, st: 0 } );
+			lastVal = curVal;
+		},
+		
+		//-------------------------------------------
+		// MASS PRUNE/MOVE
+		//-------------------------------------------
+		
+		preparePruneAndMove = function(){
+			$("#memberList__prune").click( {doType: 'prune'}, doPruneMove );
+			$("#memberList__move").click( {doType: 'move'}, doPruneMove );
+		},
+			
+		doPruneMove = function(e){
+			e.preventDefault();
+			
+			if( $("#memberList__" + e.data.doType).hasClass("disabled") ){
+				return;
+			}
+			
+			var type = ( e.data.doType == 'prune' ) ? 'delete' : 'move';
+			
+			var o = currentOptions;
+			delete o['type'];
+			delete o['st'];
+			delete o['order_by'];
+			delete o['order_direction'];
+			var hash = Object.toQueryString( o );
+			
+			window.location = $("#memberPruneMoveForm").attr('action') + '&' + hash + '&f_search_type=' + type;
+		},
+		checkPruneAndMove = function( type ){
+			if( type != 'all' ){
+				disablePruneMove();
+				return;
+			} 
+			
+			// Only enable if we're doing some kind of filtering
+			if( currentOptions['string'] || isAdvSearching ){
+				enablePruneMove();
+			} else {
+				disablePruneMove();
+			}
+		},		
+		disablePruneMove = function(){
+			$("#memberList__prune, #memberList__move").addClass("disabled");
+		},
+		enablePruneMove = function(){
+			$("#memberList__prune, #memberList__move").removeClass("disabled");
+		},
+		
+		//-------------------------------------------
+		// ADVANCED SEARCH
+		//-------------------------------------------
+		
+		prepareAdvancedSearch = function(e){
+			if( !$("#modal").size() ){
+				$("body").append( $("<div />", { id: "modal" } ).hide() );
+			}			
+			$("#modal").css( { height: $(document).height() } );
+			// Submit event
+			$("#do_advanced_search").click( doAdvancedSearch );
+			$("#m_search_cancel").click( cancelAdvancedSearch );
+			$("#close_adv_search, #modal").click( hideAdvancedSearch );
+			
+			// Resize event
+			$(window).resize( function(){
+				$("#modal:visible").css( { height: $(document).height() } );
+			});
+		},
+		showAdvancedSearch = function(e){
+			if(e){ e.preventDefault(); }
+			$("#modal").fadeIn();
+			$("#m_search_pane").fadeIn();
+		},
+		hideAdvancedSearch = function(e){
+			if(e){ e.preventDefault(); }
+			$("#m_search_pane").fadeOut();
+			$("#modal").fadeOut();
+		},
+		cancelAdvancedSearch = function(e){
+			if(e){ e.preventDefault(); }
+			// Remove advanced search fields
+			var newOpts = {};
+			$.each( coreOptions, function( i, v ){
+				newOpts[ v ] = currentOptions[ v ];
+			});
+			currentOptions = newOpts;
+			
+			currentOptions['reset_filters']	= 1;
+			
+			$("#m_search_info").hide();
+			$('.information-box').hide();
+			$("#member_types").show();
+			isAdvSearching = false;
+			fetchResults( currentOptions );			
+		},
+		doAdvancedSearch = function(e){
+			e.preventDefault();
+			// Get form values
+			var vals = {};			
+			$.map( $("#m_search_form").serializeArray(), function( k, i ){
+				vals[ k['name'] ] = k['value'];
+			});
+			
+			vals['st']			= 0;
+			vals['__update']	= 1;
+			
+			// Remove quick search values
+			$("#member_search").val('');
+			currentOptions['string'] = '';
+			
+			var o = Object.toQueryString( currentOptions );
+			currentOptions = $.extend( currentOptions, vals );
+			
+			// do stuff
+			$.ajax( {
+				url: ( request_url + "&" + o ).replace(/&amp;/g, '&'),
+				type: 'post',
+				data: vals,
+				success: function(data){
+					if( data['error'] )
+					{
+						alert( data['error'] );
+						if( data["__session__expired__log__out__"] ){
+							window.location.reload();
+						}
+					}
+					else
+					{
+						$("#member_types").hide();
+						$("#m_search_info").show().find("span").html( data['count'] );
+						isAdvSearching = true;
+						buildResults( data );
+						Debug.write("Done");
+					}
+				}
+			});
+			
+			hideAdvancedSearch();
+		};
+		
+		//-------------------------------------
+		// Make public methods public
+		return {
+			init: init,
+			getOption: getOption,
+			setOption: setOption
+		};		
+	}($);
+	
+}(jQuery));
\ No newline at end of file
diff --git a/upload/admin/js/acp.js b/upload/admin/js/acp.js
index 2cbb74d1..a09d7ca5 100644
--- a/upload/admin/js/acp.js
+++ b/upload/admin/js/acp.js
@@ -1,4 +1,4 @@
-
+
 var IPBACP = Class.create({
 	
 	autocompleteWrap: new Template("<ul id='#{id}' class='ipbmenu_content' style='width: 250px;'></ul>"),
@@ -29,7 +29,13 @@ var IPBACP = Class.create({
 			  onSuccess: function(t){
 				if( t.responseText == 'logout' )
 				{
-					alert( "Се��и� и�текла. �ажмите OK дл� перехода к форме входа." );
+					alert( ipb.lang['session_timed_out'] );
+					window.location.href = ipb.vars['base_url'];
+				}
+				
+				if( t.responseJSON && t.responseJSON['__session__expired__log__out__'] )
+				{
+					alert( ipb.lang['session_timed_out'] );
 					window.location.href = ipb.vars['base_url'];
 				}
 			  }
@@ -42,7 +48,21 @@ var IPBACP = Class.create({
 			$$('.ajaxWithDialogueTrigger').each( function( elem ) {
 				elem.identify();
 				elem.observe( 'click', acp.ajaxWithResultClickThrough );
-			})
+			});
+			
+			/* License expired notification close */
+			if( $('license-close') )
+			{
+				$('license-close').observe( 'click', function( elem ) {
+					var cookieExpire	= new Date();
+					cookieExpire.setDate( cookieExpire.getDate()+30 );
+					
+					ipb.Cookie.set( 'ignore-license-notice', 1, cookieExpire.toUTCString() );
+					var effect = new Effect.Fade( $('license_notice_expired'), { duration: 0.3, afterFinish: function(){
+						$$('body')[0].removeClassName('expired_license');
+					} } );
+				} );
+			}
 			
 		}.bind(this));
 	},
@@ -94,7 +114,7 @@ var IPBACP = Class.create({
 								 {
 									if ( ! t.responseJSON )
 									{
-										acp.errorDialogue( 'Oops, something has gone wrong. Sadly I am unable to tell you what. :(' );
+										acp.errorDialogue( 'К �ожалению, возникла проблема при обработке запро�а :(' );
 									}
 									if ( t.responseJSON['error'] )
 									{
@@ -115,7 +135,7 @@ var IPBACP = Class.create({
 	 */
 	errorDialogue: function( text )
 	{
-		content = "<h3>Error</h3><div class='ajax-inline-error' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
+		content = "<h3>Ошибка</h3><div class='ajax-inline-error' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
 		
 		new ipb.Popup( 'generic__errorDialogue', {  type: 'pane',
 													initial: content,
@@ -134,7 +154,7 @@ var IPBACP = Class.create({
 	 */
 	okDialogue: function( text )
 	{
-		content = "<h3>Message</h3><div class='ajax-inline-message' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
+		content = "<h3>Сообщение</h3><div class='ajax-inline-message' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
 		
 		new ipb.Popup( 'generic__okDialogue', {  type: 'pane',
 												 initial: content,
diff --git a/upload/admin/js/acp.livesearch.js b/upload/admin/js/acp.livesearch.js
deleted file mode 100644
index 8d9889ec..00000000
--- a/upload/admin/js/acp.livesearch.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.global.js - Global functionality			*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-ACPLiveSearch = {
-	searchTimer: [],
-	searchLastQuery: '',
-	hasCleared: false,
-	ohJustFreakingStop: false,
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		Debug.write("Initializing acp.livesearch.js");
-		
-		document.observe("dom:loaded", function(){
-			ACPLiveSearch.initEvents();
-		});
-	},
-	initEvents: function()
-	{
-		if( !$('acpSearchKeyword') )
-		{
-			return false;
-		}
-
-		/*$$('.__user').each( function(elem){
-			ipb.namePops[ elem.identify() ] = [];
-			
-			elem.observe("mouseover", ACPLiveSearch.timer_showUserPopup);
-			elem.observe("mouseout", ACPLiveSearch.timer_hideUserPopup);
-		});*/
-		
-		$('acpSearchKeyword').observe("focus", ACPLiveSearch.timer_liveSearch );
-		$('acpSearchKeyword').observe("blur", ACPLiveSearch.timer_hideLiveSearch );
-		$('acpSearchKeyword').writeAttribute({autocomplete: "off"}); /* Turn off autocomplete */
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Timer for live searching
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	timer_liveSearch: function(e)
-	{
-		if( !ACPLiveSearch.hasCleared )
-		{
-			$('acpSearchKeyword').value	= '';
-			ACPLiveSearch.hasCleared	= true;
-		}
-
-		ACPLiveSearch.searchTimer['show'] = setTimeout( ACPLiveSearch.liveSearch, 400 );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * TImer for hiding live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	timer_hideLiveSearch: function(e)
-	{
-		ACPLiveSearch.searchTimer['hide'] = setTimeout( ACPLiveSearch.hideLiveSearch, 800 );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Actually hides live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	hideLiveSearch: function(e)
-	{
-		new Effect.Fade( $('live_search_popup'), { duration: 0.4, afterFinish: function(){
-			$('ajax_result').update('');
-		 } } );
-		
-		ACPLiveSearch.searchLastQuery = '';
-		clearTimeout( ACPLiveSearch.searchTimer['show'] );
-		clearTimeout( ACPLiveSearch.searchTimer['hide'] );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Live search routine
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	liveSearch: function(e)
-	{
-		// Keep loopy going
-		ACPLiveSearch.timer_liveSearch();
-		
-		var val = $F('acpSearchKeyword').strip();
-		
-		// If too few chars, dont do anything
-		if( val.length < 3 || ACPLiveSearch.ohJustFreakingStop === true  ){ return; }
-		
-		// Is the popup available?
-		if( !$('live_search_popup') )
-		{
-			Debug.write("Creating popup");
-			ACPLiveSearch.buildSearchPopup();
-		}
-		else if( !$('live_search_popup').visible() )
-		{
-			new Effect.Appear( $('live_search_popup'), {duration: 0.4} );
-		}
-		
-		// Is the text the same as last time?
-		if( $F('acpSearchKeyword') == ACPLiveSearch.searchLastQuery ){ return; } /* continue looping */
-
-		//Get hits
-		new Ajax.Request( 
-			ipb.vars['base_url'].replace( /&amp;/g, '&' ) + "app=core&module=ajax&section=livesearch&do=search&secure_key=" + ipb.vars['md5_hash'] + "&search_term=" + val ,
-			{
-				method: 'get',
-				onSuccess: function(t){
- 		
-					/* Logged out? */
-					if ( t.responseText.match( "__session__expired__log__out__" ) )
-					{
-						clearTimeout( ACPLiveSearch.searchTimer['show'] );
-						clearTimeout( ACPLiveSearch.searchTimer['hide'] );
-						
-						$('acpSearchKeyword').stopObserving("focus");
-						$('acpSearchKeyword').stopObserving("blur");
-						
-						$('live_search_popup').hide();
-						
-						/* Argh!!! */
-						ACPLiveSearch.ohJustFreakingStop = true;
-						
-						alert( ipb.lang['session_timed_out'] );
-						
-						return false;
-					}
-					
-					if ( ! t.responseText )
-					{
-						ACPLiveSearch.searchLastQuery = val;
-						ACPLiveSearch.hideLiveSearch();
-						return false;
-					}
-					else
-					{
-						$('ajax_result').update( t.responseText );
-					}
-				},
-				//onException: function( f,e ){ alert( "Exception: " + e ) },
-				onFailure: function( t ){ alert( "Failure: " + t.responseText ); }
-			}
-		);
-				
-		/* Make sure we set this value so we don't run unnecessary ajax requests */
-		ACPLiveSearch.searchLastQuery = $F('acpSearchKeyword');
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Builds the popup for live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	buildSearchPopup: function(e)
-	{
-		pos = $('acpSearchKeyword').cumulativeOffset();
-		finalPos = { 
-			top: pos.top + $('acpSearchKeyword').getHeight(),
-			left: ( pos.left + 45 )
-		};
-		
-		popup =	new Element('div', { id: 'live_search_popup' } ).hide().setStyle('top: ' + finalPos.top + 'px; left: ' + finalPos.left + 'px');
-		$('ipboard_body').insert({ bottom: popup });
-				
-				
-		//Get form
-		new Ajax.Request( ipb.vars['base_url'].replace( /&amp;/g, '&' ) + "app=core&module=ajax&section=livesearch&do=template&secure_key=" + ipb.vars['md5_hash'],
-		{
-			method: 'get',
-			onSuccess: function(t){
-				if ( ! t.responseText.match( "__session__expired__log__out__" ) )
-				{
-					popup.update( t.responseText );
-				}
-				//ACPLiveSearch.liveSearch();
-			}
-		});		
-		
-		new Effect.Appear( $('live_search_popup'), {duration: 0.3} );
-	}
-};
-ACPLiveSearch.init();
\ No newline at end of file
diff --git a/upload/admin/js/acp.members.js b/upload/admin/js/acp.members.js
index 6aeddd28..9b83dc40 100644
--- a/upload/admin/js/acp.members.js
+++ b/upload/admin/js/acp.members.js
@@ -50,82 +50,6 @@ _temp.prototype.members = {
 		(evt) ? el.dispatchEvent(evt) : (el.click && el.click());
 	},
 	
-	changeAvatar: function( e, url )
-	{
-		Event.stop(e);
-		
-		if ( $('m_avatar_popup') )
-		{
-			$('m_avatar_popup').remove();
-		}
-		
-		acp.members.hideActionMenu();
-		
-		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
-		url = url.replace( /&amp;/g, '&' );
-		
-		var afterInit = function( popup )
-		{
-			if( $('avatar_gallery') )
-			{
-				$('avatar_gallery').observe('change', acp.members.updateAvatarGallery);
-			}
-		};
-		
-		acp.members.popups['avatar'] = new ipb.Popup('m_avatar', { type: 'pane', modal: false, hideAtStart: false, w: '600px', ajaxURL: url }, { 'afterInit': afterInit } );
-	},
-	
-	updateAvatarGallery: function( e )
-	{
-		Event.stop(e);
-		
-		var selected_cat = $F('avatar_gallery');
-		var url = ipb.vars['base_url'] + "app=forums&amp;module=ajax&amp;section=member_editform&amp;do=get_avatar_images&amp;cat=" + selected_cat + '&secure_key=' + ipb.vars['md5_hash'];
-		
-		new Ajax.Request( url.replace(/&amp;/g, '&'),
-						{
-							method: 'get',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( Object.isUndefined( t.responseJSON ) )
-								{
-									$('avatarGalleryContainer').update( t.responseText ).show();
-									return;
-								}
-								
-								if( t.responseJSON['error'] )
-								{
-									alert("Проблема � получением галереи: " + t.responseJSON['error']);
-									return;
-								}
-								
-								if( t.responseJSON['html'] )
-								{
-									$('avatarGalleryContainer').update( t.responseJSON['html'] ).show();
-								}
-							}
-						});
-	},
-	
-	updateAvatarPreview: function()
-	{
-		var cat = $F('avatar_gallery');
-		var img = $F('avatar_image');
-		
-		var img_url			= ipb.vars['public_avatar_url'] + cat + '/' + img;
-		
-		if( !$('avatarPreview') )
-		{
-			var newimg = new Element( 'img', { 'id': 'avatarPreview', src: img_url });
-			$('avatarContainer').insert( newimg );
-		}
-		else
-		{
-			$('avatarPreview').src = img_url;
-		}
-	},
-	
 	newPhoto: function( e, url )
 	{
 		Event.stop(e);
@@ -147,46 +71,7 @@ _temp.prototype.members = {
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&amp;/g, '&' );
 		
-		acp.members.popups['photo'] = new ipb.Popup('m_ban', { type: 'pane', modal: false, hideAtStart: false, w: '600px', h: '600px', ajaxURL: url } );		
-	},
-	
-	removeAvatar: function( e, member_id )
-	{
-		Event.stop(e);
-		
-		Debug.write("Calling once...");
-		var url = ipb.vars['base_url'] + "app=forums&amp;module=ajax&amp;section=member_editform&amp;do=remove_avatar&amp;member_id=" + member_id + '&secure_key=' + ipb.vars['md5_hash'];
-		
-		new Ajax.Request( url.replace( /&amp;/g, '&' ),
-						{
-							method: 'get',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( Object.isUndefined( t.responseJSON ) )
-								{
-									Debug.write( t.responseText );
-									alert("Ошибка: " + t.responseText );
-									return;
-								}
-								
-								if( t.responseJSON['error'] )
-								{
-									Debug.write( t.responseJSON['error'] );
-									alert("Ошибка при удалении аватара: " + t.responseJSON['error']);
-									return;
-								}
-								else
-								{
-									try {
-										$('MF__avatar').remove();
-										$('MF__avatar_link').remove();
-									} catch(err) {
-										Debug.write( err );
-									}
-								}								
-							}
-						});
+		acp.members.popups['photo'] = new ipb.Popup('m_ban', { type: 'pane', modal: false, hideAtStart: false, w: '600px', h: 500, ajaxURL: url } );		
 	},
 	
 	removePhoto: function( e, member_id )
@@ -205,14 +90,14 @@ _temp.prototype.members = {
 								if( Object.isUndefined( t.responseJSON ) )
 								{
 									Debug.write( t.responseText );
-									alert("Ошибка: " + t.responseText );
+									alert( ipb.lang['templates_servererror'] + t.responseText );
 									return;
 								}
 								
 								if( t.responseJSON['error'] )
 								{
 									Debug.write( t.responseJSON['error'] );
-									alert("Ошибка при удалении аватара: " + t.responseJSON['error']);
+									alert( ipb.lang['templates_servererror'] + t.responseJSON['error']);
 									return;
 								}
 								else
@@ -222,6 +107,7 @@ _temp.prototype.members = {
 										$('MF__pp_photo').setStyle( { width: t.responseJSON['pp_main_width'] + 'px' } );
 										$('MF__pp_photo').setStyle( { height: t.responseJSON['pp_main_height'] + 'px' } );
 										$('MF__pp_photo_container').setStyle( { width: t.responseJSON['pp_main_width'] + 'px' } );
+										$('MF__removephoto').remove();
 									} catch(err) {
 										Debug.write( err );
 									}
@@ -239,118 +125,7 @@ _temp.prototype.members = {
 		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
 		url = url.replace( /&amp;/g, '&' );
 		
-		var afterInit = function( popup ){
-							$( id + '_save' ).observe('click', acp.members.saveField.bindAsEventListener( this, id ) );
-							//Debug.write("This is the callback");
-						}.bind(this);
-						
-		var afterHide = function( popup ){
-							$( popup.getObj() ).remove();
-							acp.members.popups[ id ] = null;
-						}.bind(this);
-						
-		acp.members.popups[ id ] = new ipb.Popup('m_' + id, { type: 'pane', modal: false, hideAtStart: false, w: '500px', ajaxURL: url }, { 'afterInit': afterInit, 'afterHide': afterHide } );
-	},
-	
-	saveField: function( e, id )
-	{
-		// Allow "inline form" with normal form submission
-		// See member password inline form
-		if( acp.members.fields[ id ]['bypass'] )
-		{
-			return true;
-		}
-		
-		Event.stop(e);
-		
-		//firebug.d.console.cmd.dir( acp.members.fields );
-		
-		var url = acp.members.fields[ id ]['url'];
-		
-		if( !url ){ alert("�е удало�ь �охранить; от�ут�твует url"); return; }
-		
-		url = ipb.vars['base_url'] + url + '&secure_key=' + ipb.vars['md5_hash'];
-		url = url.replace( /&amp;/g, '&' );
-		
-		//-----------------
-		
-		var fields = acp.members.fields[ id ]['fields'];
-		var _params = {};
-		
-		if ( fields.length )
-		{
-			for( var i = 0 ; i <= fields.length ; i++ )
-			{
-				if( $( fields[i] ) )
-				{
-					try 
-					{
-						if ( $( fields[i] ).type == 'select-multiple' )
-						{
-							_params[ fields[i] + '[]' ] = $F( fields[i] );
-						}
-						else
-						{
-							_params[ fields[i] ] = $F( fields[i] ).encodeParam();
-						}
-					}
-					catch( e )
-					{
-						
-						try
-						{
-							_params[ fields[i] ] = $F( fields[i] + '_yes' );
-						}
-						catch( e ){}
-					}
-				}
-				else if( $( fields[i] + '_yes' ) )
-				{
-					try
-					{
-						_params[ fields[i] ] = $F( fields[i] + '_yes' );
-					}
-					catch( e ){}
-				}
-			}
-		}
-		
-		// Send request
-		new Ajax.Request( 	url, {
-							method: 'post',
-							parameters: _params,
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( Object.isUndefined( t.responseJSON ) )
-								{
-									alert("Ошибка: " + t.responseJSON);
-									return;
-								}
-								
-								if( !t.responseJSON['success'] )
-								{
-									alert("Ошибка: " + t.responseJSON['error'] );
-									return;
-								}
-								else
-								{
-									if( acp.members.fields[ id ]['callback'] )
-									{
-										acp.members.fields[ id ]['callback']( t, t.responseJSON );
-									}
-									
-									acp.members.popups[ id ].hide();
-										
-								}
-								
-								Debug.write("Success");
-							},
-							onException: function(t){ alert("Ошибка: " + t.responseText); },
-							onFailure: function(t){ alert("Ошибка: " + t.responseText ); }
-						} );
-								
-								
+		acp.members.popups[ id ] = new ipb.Popup('m_' + id, { type: 'pane', modal: false, hideAtStart: false, w: '700px', ajaxURL: url } );
 	},
 	
 	hideActionMenu: function()
diff --git a/upload/admin/js/acp.menu.js b/upload/admin/js/acp.menu.js
index 8673ec98..ba6bfb04 100644
--- a/upload/admin/js/acp.menu.js
+++ b/upload/admin/js/acp.menu.js
@@ -173,8 +173,8 @@ _menu.prototype.Menu = Class.create({
 		Debug.write( "manual ofset: " + this.options.offsetX + " x " + this.options.offsetY );
 
 		// Ok, if it's a relative parent, do one thing, else be normal
-		_a      = _getOffsetParent( _source );
-		_b      = _getOffsetParent( this.target );
+		_a      = $(_source).getOffsetParent();
+		_b      = $(this.target).getOffsetParent();
 
 		if( _a != _b )
 		{
diff --git a/upload/admin/js/acp.permissions.js b/upload/admin/js/acp.permissions.js
index ee8e748d..fdae41ea 100644
--- a/upload/admin/js/acp.permissions.js
+++ b/upload/admin/js/acp.permissions.js
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // IPS JS: Permissions
 // (c) 2008 Invision Power Services, Inc.
-// http://www.invisionpower.com
+// http://hatynka.in
 // Brandon Farber - 16th December
 //------------------------------------------------------------------------------
 
diff --git a/upload/admin/js/acp.permissions2.js b/upload/admin/js/acp.permissions2.js
index faf1b9e3..fd5824d0 100644
--- a/upload/admin/js/acp.permissions2.js
+++ b/upload/admin/js/acp.permissions2.js
@@ -67,10 +67,10 @@ _temp.prototype.permissions = Class.create({
 		// Get ID
 		var parts = elem.id.match(/(.*)_select_row_([0|1])_(.*)/);
 		if( !parts ){ return; }
+
+		if( !$( this.options.app + this.options.typekey + '_row_' + parts[3]) ){ return; }
 		
-		if( !$( this.options.app + '_row_' + parts[3]) ){ return; }
-		
-		$( this.options.app + '_row_' + parts[3]).select('input[type=checkbox]').each( function(check){
+		$( this.options.app + this.options.typekey + '_row_' + parts[3]).select('input[type=checkbox]').each( function(check){
 			if( parts[2] == 1 ){
 				check.checked = true;
 			} else {
@@ -135,12 +135,16 @@ _temp.prototype.permissions = Class.create({
 	},
 	
 	submitForm: function(e)
-	{
-		if( typeof(noShowAlert) != undefined && noShowAlert )
-		{
-			return true;
-		}
-
+	{		
+		try {
+			if( !Object.isUndefined( noShowAlert ) )
+			{
+				if( noShowAlert ){
+					return true;
+				}
+			}
+		} catch(err) { }
+		
 		// Get all inputs
 		var test = $( this.options.form ).select('input[type=checkbox]').any( function( elem ){ return elem.checked; } );
 		
diff --git a/upload/admin/js/acp.skinsets.js b/upload/admin/js/acp.skinsets.js
new file mode 100644
index 00000000..1cd38643
--- /dev/null
+++ b/upload/admin/js/acp.skinsets.js
@@ -0,0 +1,76 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* acp.replacements.js - Replacements functions	*/
+/* (c) IPS, Inc 2008							*/
+/* -------------------------------------------- */
+/* Author: Rikki Tissier						*/
+/************************************************/
+
+ACPSkinSets = {
+	
+	/* ------------------------------ */
+	/**
+	 * Setup
+	*/
+	init: function()
+	{
+		document.observe("dom:loaded", function(){
+		
+			$('ipsNewSkin').on('click', this.showAddDialogue.bindAsEventListener(this) );
+			
+			ipb.delegate.register(".ipsCancelEditor", ACPSkinSets.showCancelDialogue );
+			
+		}.bind(this) );
+	},
+	
+	/**
+	 * Show cancel dialogue
+	 */
+	showCancelDialogue: function( e, elem )
+	{
+		Event.stop(e);
+		
+		new ipb.Popup( 'cancel_editor', {  type: 'pane',
+										   initial: cancelEditorDialogue.evaluate( { 'url': elem.readAttribute('href') } ),
+										   stem: false,
+										   modal: true,
+										   hideAtStart: false,
+										   hideClose: false,
+										   defer: false,
+										   w: 400 } );
+	},
+	
+	/**
+	 * Fetch and show the pop-up dialogue
+	 */
+	showAddDialogue: function(e)
+	{
+		Event.stop(e);
+		
+		var url 	=  ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=skinsets&amp;do=showAddDialogue&amp;secure_key=" + ipb.vars['md5_hash'];
+		
+		// Send
+		new Ajax.Request( url.replace(/&amp;/g, '&'),
+						{
+							method: 'get',
+							onSuccess: function(t)
+							{
+								if ( t.responseText )
+								{
+									/* Load */
+									new ipb.Popup( 'nooSkin', {  type: 'pane',
+																 initial: t.responseText,
+																 modal: true,
+																 stem: true,
+																 hideAtStart: false,
+																 hideClose: false,
+																 defer: false,
+																 w: 400 } );
+								}
+							}
+						});
+	},	
+};
+
+ACPSkinSets.init();
\ No newline at end of file
diff --git a/upload/admin/js/acp.styles.js b/upload/admin/js/acp.styles.js
deleted file mode 100644
index 84f7c010..00000000
--- a/upload/admin/js/acp.styles.js
+++ /dev/null
@@ -1,85 +0,0 @@
-//------------------------------------------------------------------------------
-// IPS JS: Sytlistic effects
-// (c) 2008 Invision Power Services, Inc.
-// http://www.invisionpower.com
-// Dan Cryer - 8th September 08
-//------------------------------------------------------------------------------
-
-document.observe("dom:loaded",function() 
-{
-	doStriping();	
-	resizeContent.defer();
-});
-
-function doStriping( )
-{
-	var TBL_ALT_ON  = 'acp-row-on';
-	var TBL_ALT_OFF = 'acp-row-off';
-	var TBL_ALT_RED = 'acp-row-red';
-	var TBL_ALT_AMB = 'acp-row-amber';
-	
-	var ROW_ON_OFF  = true;
-	
-	$$('#main_content table.alternate_rows > tr, #main_content table.alternate_rows tbody > tr, .alternate_rows > li, .alternate_rows_force').each(function(tblRow) 
-	{
-		$(tblRow).removeClassName(TBL_ALT_ON);
-		$(tblRow).removeClassName(TBL_ALT_OFF);
-
-		if(ROW_ON_OFF)
-		{
-			 ROW_ON_OFF = false;
-			 $(tblRow).addClassName(TBL_ALT_ON);
-		}
-		else
-		{
-			 ROW_ON_OFF = true;
-			 $(tblRow).addClassName(TBL_ALT_OFF);
-		}
-		
-		if ( $(tblRow).hasClassName('_red') )
-		{
-			$(tblRow).removeClassName(TBL_ALT_AMB);
-			$(tblRow).removeClassName(TBL_ALT_ON);
-			$(tblRow).removeClassName(TBL_ALT_OFF);
-			
-			$(tblRow).addClassName(TBL_ALT_RED);
-		}
-		else if ( $(tblRow).hasClassName('_amber') )
-		{
-			$(tblRow).removeClassName(TBL_ALT_RED);
-			$(tblRow).removeClassName(TBL_ALT_ON);
-			$(tblRow).removeClassName(TBL_ALT_OFF);
-			
-			$(tblRow).addClassName(TBL_ALT_AMB);
-		}
-		
-		if ( $(tblRow).hasClassName('_off') )
-		{
-			$(tblRow).removeClassName(TBL_ALT_RED);
-			$(tblRow).removeClassName(TBL_ALT_ON);
-			
-			$(tblRow).addClassName(TBL_ALT_OFF);
-		}
-	});	
-}
-
-function resizeContent()
-{
-	if( $('section_navigation') && $('main_content') )
-	{
-		var navSize = $('section_navigation').getHeight();
-		var contentSize = $('main_content').getHeight();
-		
-		if( navSize > contentSize )
-		{
-			var height = navSize + 50;
-			$('main_content').setStyle('min-height: ' + height + 'px;');
-			
-			
-			if( $('copyright') )
-			{
-				$('copyright').setStyle('bottom: 0px;');
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/js/acp.tabbed_basic_editor.js b/upload/admin/js/acp.tabbed_basic_editor.js
index 2bf58b47..0d4940ba 100644
--- a/upload/admin/js/acp.tabbed_basic_editor.js
+++ b/upload/admin/js/acp.tabbed_basic_editor.js
@@ -277,12 +277,18 @@ _tt.prototype.tabbedEditor = {
 	{
 		Event.stop( event );
 		
+		Debug.write("SHOWING POPUP");
+		
 		/* Create pop-up elements */
 		var _id      = '__p_' + id;
 		var _data    = acp.tabbedEditor.openTabs.get( id );
 		var _t       = acp.tabbedEditor.templates['textArea'].evaluate( { 'id': _id } );
-		var content  = acp.tabbedEditor.getContent( id );
+		
+		// Have to replace <> otherwise script tags are executed and removed
+		// @link http://community.invisionpower.com/tracker/issue-32621-template-editor-maximise-button-deletes-script-tags
+		var content  = acp.tabbedEditor.getContent( id ).replace( /</g, '&lt;' ).replace( />/g, '&gt;' ); 
 		var title    = _data.title;
+
 		var _initial = '<div class="acp-box"><h3>' + title + '</h3>' + _t.replace( '{content}', content ) + "</div>";
 		var _dims    = document.viewport.getDimensions();
 		
@@ -344,7 +350,7 @@ _tt.prototype.tabbedEditor = {
 		/* Create wrapper */
 		try
 		{
-			Debug.write("htmlincoming: " + acp.tabbedEditor._HtmlIncoming( content ) );
+			//Debug.write("htmlincoming: " + acp.tabbedEditor._HtmlIncoming( content ) );
 			$( 'tbe_wrap' ).innerHTML += _t.replace( '{content}', acp.tabbedEditor._HtmlIncoming( content ) );
 		}
 		catch( e )
@@ -434,10 +440,16 @@ _tt.prototype.tabbedEditor = {
 		$( 'tbe_editor_textarea_' + id ).observe('keydown', acp.tabbedEditor._keyDownCheck.bindAsEventListener( this, id ) );
 		
 		/* Got a scroll pos? */
-		if ( acp.tabbedEditor.sPos[ id ] )
+		if ( !Object.isUndefined( acp.tabbedEditor.sPos[ id ] ) )
 		{
 			$( 'tbe_editor_textarea_' + id ).scrollTop = acp.tabbedEditor.sPos[ id ];
 		}
+		else
+		{
+			setTimeout( function(){
+				$( 'tbe_editor_textarea_' + id ).scrollTop = 0;
+			}, 50 );
+		}
 		
 		/* Set listener */
 		acp.tabbedEditor._setObserver( id );
@@ -563,6 +575,15 @@ _tt.prototype.tabbedEditor = {
 		
 		acp.tabbedEditor.poId = id;
 		acp.tabbedEditor._po  = setTimeout( acp.tabbedEditor._timeOut, 400 );
+		
+		/*if ( !Object.isUndefined( acp.tabbedEditor.sPos[ id ] ) )
+		{
+			$( 'tbe_editor_textarea_' + id ).scrollTop = acp.tabbedEditor.sPos[ id ];
+		} else {
+				setTimeout( function(){
+					$( 'tbe_editor_textarea_' + id ).scrollTop = 0;
+				}, 50 );
+		}*/
 	},
 	
 	/**
diff --git a/upload/admin/js/acp.tabs.js b/upload/admin/js/acp.tabs.js
index 00da4b38..8939342f 100644
--- a/upload/admin/js/acp.tabs.js
+++ b/upload/admin/js/acp.tabs.js
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // IPS JS: Tab handler
 // (c) 2008 Invision Power Services, Inc.
-// http://www.invisionpower.com
+// http://hatynka.in
 // Dan Cryer - 8th September 08
 //------------------------------------------------------------------------------
 
diff --git a/upload/admin/js/acp.templates.js b/upload/admin/js/acp.templates.js
index 2f926bd7..15fafcff 100644
--- a/upload/admin/js/acp.templates.js
+++ b/upload/admin/js/acp.templates.js
@@ -163,8 +163,8 @@ _temp.prototype.template_editor = {
 								$('add_css_name').value = '';
 								acp.template_editor.popups['add_css'].hide();
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 	},
@@ -301,8 +301,8 @@ _temp.prototype.template_editor = {
 								acp.template_editor.popups['add_bit'].hide();
 																
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 							
 						});
@@ -441,8 +441,8 @@ _temp.prototype.template_editor = {
 									
 									acp.template_editor.enableToolbar('css', current['id'].replace( 'css_file_', '' ) );
 								},
-								onFailure: function(t){ alert("There was an error executing this command"); Debug.error(t.responseText); return; },
-								onException: function(f,e){ alert("There was an exception executing this command"); Debug.error(e); return; },
+								onFailure: function(t){ alert("Возникла ошибка при выполнении команды"); Debug.error(t.responseText); return; },
+								onException: function(f,e){ alert("Возникла и�ключительна� �итуаци� при выполнении команды"); Debug.error(e); return; },
 								onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 							});
 		}
@@ -560,8 +560,8 @@ _temp.prototype.template_editor = {
 								//Debug.dir( cssfile );
 								acp.template_editor.openCSSfile( cssid, cssfile );
 							},
-							onFailure: function(t){ alert("There was an error executing this command"); Debug.error(t.responseText); return; },
-							onException: function(f,e){ alert("There was an exception executing this command"); Debug.error(e); return; },
+                            onFailure: function(t){ alert("Возникла ошибка при выполнении команды"); Debug.error(t.responseText); return; },
+                            onException: function(f,e){ alert("Возникла и�ключительна� �итуаци� при выполнении команды"); Debug.error(e); return; },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 								
@@ -643,8 +643,8 @@ _temp.prototype.template_editor = {
 									acp.template_editor.enableToolbar('template', current['id'].replace( 'template_', '' ) );
 								}				
 							},
-							onFailure: function(t){ alert("There was an error executing this command"); Debug.error(t.responseText); return; },
-							onException: function(f,e){ alert("There was an exception executing this command"); Debug.error(e); return; },
+                            onFailure: function(t){ alert("Возникла ошибка при выполнении команды"); Debug.error(t.responseText); return; },
+                            onException: function(f,e){ alert("Возникла и�ключительна� �итуаци� при выполнении команды"); Debug.error(e); return; },
 							onComplete: function(t){ $('group_' + group).removeClassName('loading'); }
 						});
 	},
@@ -745,7 +745,7 @@ _temp.prototype.template_editor = {
 					state = 'inherit';
 				}
 			}
-			else if ( json['templates'][i]['template_user_edited'] == 1 && json['templates'][i]['template_user_added'] == 0 )
+			else if ( json['templates'][i]['template_user_edited'] == 1 ) /*&& json['templates'][i]['template_user_added'] == 0*/ /* Bug 25788 */
 			{
 				/* This is a modified row */
 				state  = 'modified';
@@ -857,8 +857,8 @@ _temp.prototype.template_editor = {
 									}
 								}
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 	},
@@ -970,8 +970,8 @@ _temp.prototype.template_editor = {
 									//Debug.dir( t.responseJSON );
 								}
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 	},
@@ -1017,8 +1017,8 @@ _temp.prototype.template_editor = {
 								//Debug.dir( template );
 								acp.template_editor.openTemplateBit( templateid, template );
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						  } );
 	},
@@ -1331,8 +1331,8 @@ _temp.prototype.template_editor = {
 								acp.template_editor._buildCSS( true );
 								
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 	},
@@ -1450,8 +1450,8 @@ _temp.prototype.template_editor = {
 								acp.template_editor.popups.get('variables_' + fileid).hide();
 								
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});
 		
@@ -1563,8 +1563,8 @@ _temp.prototype.template_editor = {
 									acp.template_editor._buildCSS( true );
 								}
 							},
-							onException: function( f,e ){ alert( "Exception: " + e ); },
-							onFailure: function( t ){ alert( "Failure: " + t.responseText ); },
+							onException: function( f,e ){ alert( "И�ключение: " + e ); },
+							onFailure: function( t ){ alert( "Ошибка: " + t.responseText ); },
 							onComplete: function(t){ acp.template_editor.setLoadingMsg(''); }
 						});		
 	},
@@ -1681,7 +1681,7 @@ _temp.prototype.template_editor = {
 		
 		var _dims = document.viewport.getDimensions();
 			
-		popup = new ipb.Popup( 'comparison', { type: 'pane', modal: true, w: ( _dims.width - 50 ) + 'px', h: ( _dims.height - 50 ) + 'px', ajaxURL: url, hideAtStart: false, close: 'a[rel="close"]' }, { 'afterAjax': _callback } );
+		popup = new ipb.Popup( 'comparison', { type: 'pane', modal: true, w: ( _dims.width - 50 ) + 'px', h: ( _dims.height - 50 ), ajaxURL: url, hideAtStart: false, close: 'a[rel="close"]' }, { 'afterAjax': _callback } );
 		return false;
 	},
 	
diff --git a/upload/admin/js/acp.uagents.js b/upload/admin/js/acp.uagents.js
index b903cc8c..10d78997 100644
--- a/upload/admin/js/acp.uagents.js
+++ b/upload/admin/js/acp.uagents.js
@@ -36,15 +36,6 @@ _uagents.prototype.uagents = {
 							onSuccess: function(t)
 							{
 								Debug.write( t.responseText );
-								doStriping();
-							},
-							onException: function(t)
-							{
-								doStriping();
-							},
-							onFailure: function(t)
-							{
-								doStriping();
 							}
 						});
 	},
@@ -83,7 +74,6 @@ _uagents.prototype.uagents = {
 								acp.uagents.json = t.responseJSON;
 								
 								$('uagent_' + id).remove();
-								doStriping();
 							}
 						});
 	},
@@ -203,12 +193,12 @@ _uagents.prototype.uagents = {
 								}
 								
 								acp.uagents.json = t.responseJSON;
-								
+
 								if( id == 'new' )
 								{
 									var newparams = {
 										'id': 		t.responseJSON['returnid'],
-										'name': 	params['uagent_name'],
+										'name': 	unescape(params['uagent_name']),
 										'type': 	params['uagent_type']
 									};
 									
@@ -223,33 +213,36 @@ _uagents.prototype.uagents = {
 									$('uagent_regex_new').value = '';
 									$('uagent_capture_new').value = '';
 									$('uagent_position_new').value = 0;
-									
-									doStriping();
-									
+
 									/* Update ID */
 									id = newparams['id'];
 								}
 								else
 								{
+									$('agent_' + id + '_edit').stopObserving();
+									$('agent_' + id + '_delete').stopObserving();
+
 									/* Update contents so that the name and image are updated in place */
 									var newparams = {
 										'id': 		id,
 										'name': 	unescape(params['uagent_name']),
 										'type': 	params['uagent_type']
 									};
-									
+
 									// Need to add it to the list
 									var html = ipb.templates['agent_row'].evaluate( newparams );
-									
+
 									$('uagent_' + id ).update( html.replace( /^<li([^>]+?)>(.*)<\/li>/, "$2" ) );
-									
+
 									acp.uagents.popups[ id ].hide();
 								}
-								
+
 								/* Reset listeners */
 								$('agent_' + id + '_edit').observe('click', acp.uagents.editAgent.bindAsEventListener( this, id ) );
 								$('agent_' + id + '_delete').observe('click', acp.uagents.deleteAgent.bindAsEventListener( this, id ) );
-								
+
+								ipb.global.showInlineNotification( ipb.lang['useragent_saved'], { showClose: true } );
+
 								/* Reset sortable */
 								Sortable.create( 'sortable_handle', { tag: 'li', only: 'isDraggable', revert: true, format: 'uagent_([0-9]+)', handle: 'draghandle', onUpdate: acp.uagents.updateAgents } );
 							}
diff --git a/upload/admin/js/acp.upgrade.js b/upload/admin/js/acp.upgrade.js
index e5a6d9ac..4068ea7e 100644
--- a/upload/admin/js/acp.upgrade.js
+++ b/upload/admin/js/acp.upgrade.js
@@ -332,7 +332,7 @@ function ipsUpgrade()
 		
 		if ( ! t.responseText.match( /^(\s+?)?\{/ ) )
 		{
-			alert( "Error:\n" + t.responseText );
+			alert( "Ошибка:\n" + t.responseText );
 			return;
 		}
 		
diff --git a/upload/admin/js/index.html b/upload/admin/js/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/js/index.html
+++ b/upload/admin/js/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/index.html b/upload/admin/setup/applications/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/applications/index.html
+++ b/upload/admin/setup/applications/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/install/index.html b/upload/admin/setup/applications/install/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/applications/install/index.html
+++ b/upload/admin/setup/applications/install/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/install/sections/address.php b/upload/admin/setup/applications/install/sections/address.php
index e4454a49..3ac83db4 100644
--- a/upload/admin/setup/applications/install/sections/address.php
+++ b/upload/admin/setup/applications/install/sections/address.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-06-16 11:21:04 -0400 (Wed, 16 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6541 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_address extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/setup/applications/install/sections/admin.php b/upload/admin/setup/applications/install/sections/admin.php
index 5aaecc2e..5ae03300 100644
--- a/upload/admin/setup/applications/install/sections/admin.php
+++ b/upload/admin/setup/applications/install/sections/admin.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: ADMIN file
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_admin extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/setup/applications/install/sections/apps.php b/upload/admin/setup/applications/install/sections/apps.php
index 6cc51a0d..f567ff4f 100644
--- a/upload/admin/setup/applications/install/sections/apps.php
+++ b/upload/admin/setup/applications/install/sections/apps.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-04-09 21:23:51 -0400 (Fri, 09 Apr 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6094 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_apps extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -101,7 +101,7 @@ class install_apps extends ipsCommand
 						// Get it!
 						//-----------------------------------------
 					
-						if ( ! file_exists( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
+						if ( ! is_file( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
 						{
 							continue;		
 						}
diff --git a/upload/admin/setup/applications/install/sections/db.php b/upload/admin/setup/applications/install/sections/db.php
index 0ce17286..a2fd887c 100644
--- a/upload/admin/setup/applications/install/sections/db.php
+++ b/upload/admin/setup/applications/install/sections/db.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-05-03 19:34:02 -0400 (Mon, 03 May 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-16 15:32:18 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6205 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9503 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_db extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -43,11 +43,28 @@ class install_db extends ipsCommand
 			}
 			else 
 			{
+				//-----------------------------------------
+				// Quick basic check for extensions
+				//-----------------------------------------
+				
+				if( strtolower(IPSSetUp::getSavedData('sql_driver')) == 'mysql' )
+				{
+					if( !function_exists('mysqli_connect') AND !function_exists('mysql_connect') )
+					{
+						$this->registry->output->setTitle( "Databases: Error" );
+						$this->registry->output->setNextAction( 'db&do=check' );
+						$this->registry->output->addWarning( "You do not have the mysql or mysqli PHP extension installed.  You must install one of these PHP extensions before you can continue." );
+						$this->registry->output->addContent( $this->fetchContent() );
+						$this->registry->output->sendOutput();
+						return;
+					}
+				}
+
 				//-----------------------------------------
 				// Load DB driver..
 				//-----------------------------------------
 				
-				require_once( IPS_KERNEL_PATH . 'classDb' . ucwords( IPSSetUp::getSavedData('sql_driver') ) . '.php' );
+				require_once( IPS_KERNEL_PATH . 'classDb' . ucwords( IPSSetUp::getSavedData('sql_driver') ) . '.php' );/*noLibHook*/
 				
 				$classname = "db_driver_".IPSSetUp::getSavedData('sql_driver');
 	
@@ -63,9 +80,9 @@ class install_db extends ipsCommand
 				// Any "extra" configs required for this driver?
 				//--------------------------------------------------
 	
-				if ( file_exists( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
+				if ( is_file( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
 				{
-					require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );
+					require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );/*noLibHook*/
 	
 					$extra_install =  new install_extra( $this->registry );
 	
@@ -251,9 +268,9 @@ class install_db extends ipsCommand
 		$content = ( $check === FALSE ) ? $this->registry->output->template()->page_db() : $this->registry->output->template()->page_dbOverride();
 		
 		/* Driver extras? */
-		if ( file_exists( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
+		if ( is_file( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );
+			require_once( IPS_ROOT_PATH . 'setup/sql/'.IPSSetUp::getSavedData('sql_driver').'_install.php' );/*noLibHook*/
 			$extra_install = new install_extra( $this->registry );
 
 			$content = str_replace( '<!--{EXTRA.SQL}-->', $extra_install->install_form_extra(), $content );
diff --git a/upload/admin/setup/applications/install/sections/done.php b/upload/admin/setup/applications/install/sections/done.php
index ed8ed344..1d834ff6 100644
--- a/upload/admin/setup/applications/install/sections/done.php
+++ b/upload/admin/setup/applications/install/sections/done.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_done extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/setup/applications/install/sections/eula.php b/upload/admin/setup/applications/install/sections/eula.php
index e5bc6f76..a0b9c4ec 100644
--- a/upload/admin/setup/applications/install/sections/eula.php
+++ b/upload/admin/setup/applications/install/sections/eula.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_eula extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
diff --git a/upload/admin/setup/applications/install/sections/index.html b/upload/admin/setup/applications/install/sections/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/applications/install/sections/index.html
+++ b/upload/admin/setup/applications/install/sections/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/install/sections/index.php b/upload/admin/setup/applications/install/sections/index.php
index 9f382fba..fe8f6c4f 100644
--- a/upload/admin/setup/applications/install/sections/index.php
+++ b/upload/admin/setup/applications/install/sections/index.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: Index file
- * Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6881 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ class install_index extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -36,7 +36,7 @@ class install_index extends ipsCommand
 		
 		/* Test Extensions */
 		$INSTALLDATA = array();
-		include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );
+		include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );/*noLibHook*/
 		
 		if ( is_array( $INSTALLDATA ) && count( $INSTALLDATA ) )
 		{
@@ -69,7 +69,7 @@ class install_index extends ipsCommand
 		}
 		
 		/* Check for conf_global.dist.php */
-		if ( file_exists( DOC_IPS_ROOT_PATH . 'conf_global.dist.php') AND ! file_exists( DOC_IPS_ROOT_PATH.'conf_global.php') )
+		if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.dist.php') AND ! is_file( DOC_IPS_ROOT_PATH.'conf_global.php') )
 		{
 			if ( ! @rename( DOC_IPS_ROOT_PATH.'conf_global.dist.php', DOC_IPS_ROOT_PATH.'conf_global.php' ) )
 			{
@@ -85,7 +85,7 @@ class install_index extends ipsCommand
 			$filesOK = FALSE;
 		
 			/* Fetch core writeable files */
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPSSetUp::charSet );
 		
 			try
@@ -104,7 +104,7 @@ class install_index extends ipsCommand
 						{
 							if ( $data['dir'] )
 							{
-								if ( ! @mkdir( $_path, 0777, TRUE ) )
+								if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
 								{
 									$this->registry->output->addError( 'Директори� "' . $data['path'] . '" не �уще�твует, �оздайте ее' );
 								}
@@ -117,7 +117,7 @@ class install_index extends ipsCommand
 					
 						if ( ! is_writeable( $_path ) )
 						{
-							if ( ! @chmod( $_path, 0777 ) )
+							if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
 							{
 								if ( is_dir( $_path ) )
 								{
@@ -156,4 +156,4 @@ class install_index extends ipsCommand
 		$this->registry->output->addContent( $this->registry->output->template()->page_requirements( $filesOK, $extensionsOK, $extensionData ) );
 		$this->registry->output->sendOutput();
 	}
-}
+}
\ No newline at end of file
diff --git a/upload/admin/setup/applications/install/sections/install.php b/upload/admin/setup/applications/install/sections/install.php
index 3923f33f..798c2536 100644
--- a/upload/admin/setup/applications/install/sections/install.php
+++ b/upload/admin/setup/applications/install/sections/install.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-10-25 11:09:26 -0400 (Mon, 25 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-26 16:02:02 -0400 (Mon, 26 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7035 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9551 $
  *
  */
 
@@ -52,7 +52,7 @@ class install_install extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -178,7 +178,7 @@ class install_install extends ipsCommand
 			// Check that it wrote
 			//-----------------------------------
 
-			if ( ! file_exists( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' ) )
+			if ( ! is_file( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' ) )
 			{
 				$this->registry->output->setTitle( "У�тановка: Ошибка" );
 				$this->registry->output->setNextAction( 'install&do=sql' );
@@ -191,9 +191,9 @@ class install_install extends ipsCommand
 			}
 			else
 			{
-				unset($INFO);
+				$INFO = array();
 
-				require( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' );
+				require( IPSSetUp::getSavedData('install_dir') . '/conf_global.php' );/*noLibHook*/
 
 				if( ! $INFO['sql_driver'] )
 				{
@@ -231,10 +231,10 @@ class install_install extends ipsCommand
 			// Tables
 			//-----------------------------------------
 
-			if ( file_exists( $_FILE . '_tables.php' ) )
+			if ( is_file( $_FILE . '_tables.php' ) )
 			{
 				$TABLE = array();
-				include( $_FILE . '_tables.php' );
+				include( $_FILE . '_tables.php' );/*noLibHook*/
 
 				if ( is_array( $TABLE ) and count( $TABLE ) )
 				{
@@ -273,10 +273,10 @@ class install_install extends ipsCommand
 
 			if ( $this->DB->checkFulltextSupport() )
 			{
-				if ( file_exists( $_FILE . '_fulltext.php' ) )
+				if ( is_file( $_FILE . '_fulltext.php' ) )
 				{
 					$INDEX = array();
-					include( $_FILE . '_fulltext.php' );
+					include( $_FILE . '_fulltext.php' );/*noLibHook*/
 
 					$output[] = $next['title'] . ": Создание индек�ов";
 
@@ -317,10 +317,10 @@ class install_install extends ipsCommand
 			// INSERTS
 			//-----------------------------------------
 
-			if ( file_exists( $_FILE . '_inserts.php' ) )
+			if ( is_file( $_FILE . '_inserts.php' ) )
 			{
 				$INSERT = array();
-				include( $_FILE . '_inserts.php' );
+				include( $_FILE . '_inserts.php' );/*noLibHook*/
 
 				if ( is_array($INSERT) && count($INSERT) )
 				{
@@ -363,7 +363,7 @@ class install_install extends ipsCommand
 			if ( $next['key'] == 'core' )
 			{
 
-				$output[] = "Inserting groups information...";
+				$output[] = "Добавление информации о группах...";
 				$xml    = new classXML( IPSSetUp::charSet );
 	
 				if ( $extra_install AND method_exists( $extra_install, 'before_inserts_run' ) )
@@ -393,7 +393,7 @@ class install_install extends ipsCommand
 
 			$output = ( is_array( $output ) AND count( $output ) ) ? $output : array( 0 => $next['title'] . ": �аполнение таблиц завершено" );
 
-			$this->_finishStep( $output, "Install: SQL", 'install&do=sql&previous=' . $next['key'] );
+			$this->_finishStep( $output, "У�тановка: SQL", 'install&do=sql&previous=' . $next['key'] );
 		}
 		else
 		{
@@ -443,7 +443,7 @@ class install_install extends ipsCommand
 			$path = IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install';
 			$id   = ( $id < 1 ) ? 1 : $id;
 
-			if ( file_exists( $path . '/sql/' .$next['key'] . '_' . strtolower( IPSSetUp::getSavedData('sql_driver') )  . '_sql_' . $id .'.php' ) )
+			if ( is_file( $path . '/sql/' .$next['key'] . '_' . strtolower( IPSSetUp::getSavedData('sql_driver') )  . '_sql_' . $id .'.php' ) )
 			{
 				/* Set up DB driver */
 				$extra_install = $this->_setUpDBDriver( FALSE );
@@ -548,9 +548,9 @@ class install_install extends ipsCommand
 			$long_version = '10000';
 			$_versions    = array();
 
-			if ( file_exists( $_PATH . 'versions.xml' ) )
+			if ( is_file( $_PATH . 'versions.xml' ) )
 			{
-				require_once( IPS_KERNEL_PATH . 'classXML.php' );
+				require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 				$xml    = new classXML( IPSSetUp::charSet );
 
 				$xml->load( $_PATH . 'versions.xml' );
@@ -569,7 +569,7 @@ class install_install extends ipsCommand
 				$long_version  = $_this_version['long'];
 			}
 
-			if ( file_exists( $_PATH . 'information.xml' ) )
+			if ( is_file( $_PATH . 'information.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -590,22 +590,25 @@ class install_install extends ipsCommand
 				// Insert...
 				//-----------------------------------------
 
-				$this->DB->insert( 'core_applications', array(   'app_title'        => $appData['name'],
-																 'app_public_title' => ( $appData['public_name'] ) ? $appData['public_name'] : '',	// Allow blank in case it's an admin-only app
-																 'app_description'  => $appData['description'],
-																 'app_author'       => $appData['author'],
-																 'app_hide_tab'		=> intval($appData['hide_tab']),
-																 'app_version'      => $version,
-																 'app_long_version' => $long_version,
-																 'app_directory'    => $next['key'],
-																 'app_added'        => time(),
-																 'app_position'     => $num,
-																 'app_protected'    => $_protected,
-																 'app_location'     => IPSLib::extractAppLocationKey( $next['key'] ),
-																 'app_enabled'      => ( $appData['disabledatinstall'] ) ? 0 : 1 ) );
+				$this->DB->insert( 'core_applications', array(  'app_title'			=> $appData['name'],
+																'app_public_title'	=> ( $appData['public_name'] ) ? $appData['public_name'] : '',	// Allow blank in case it's an admin-only app
+																'app_description'	=> $appData['description'],
+																'app_author'		=> $appData['author'],
+																'app_hide_tab'		=> intval($appData['hide_tab']),
+																'app_version'		=> $version,
+																'app_long_version'	=> $long_version,
+																'app_directory'		=> $next['key'],
+																'app_added'			=> time(),
+																'app_position'		=> $num,
+																'app_protected'		=> $_protected,
+																'app_location'		=> IPSLib::extractAppLocationKey( $next['key'] ),
+																'app_enabled'		=> $appData['disabledatinstall'] ? 0 : 1,
+																'app_website'		=> $appData['website'],
+																'app_update_check'	=> $appData['update_check'],
+																'app_global_caches'	=> $appData['global_caches'],
+															   ) );
 																
-				$this->DB->insert( 'upgrade_history', array( 
-															'upgrade_version_id'	=> $long_version,
+				$this->DB->insert( 'upgrade_history', array('upgrade_version_id'	=> $long_version,
 															'upgrade_version_human'	=> $version,
 															'upgrade_date'			=> 0,
 															'upgrade_mid'			=> 0,
@@ -644,7 +647,7 @@ class install_install extends ipsCommand
 	/**
 	 * Install Modules
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function install_modules()
 	{
@@ -751,7 +754,7 @@ class install_install extends ipsCommand
 			$_PATH         = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 			$knownSettings = array();
 			
-			if ( file_exists( $_PATH . $next['key'] . '_settings.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_settings.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -766,8 +769,8 @@ class install_install extends ipsCommand
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php' );
-				$settings =  new admin_core_tools_settings();
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php' );/*noLibHook*/
+				$settings =  new admin_core_settings_settings();
 				$settings->makeRegistryShortcuts( $this->registry );
 
 				$this->request['app_dir'] = $next['key'];
@@ -787,9 +790,9 @@ class install_install extends ipsCommand
 				}
 				
 				/* Fetch known settings  */
-				if ( file_exists( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
+				if ( is_file( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
 				{
-					require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );
+					require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );/*noLibHook*/
 				}
 				
 				$this->request['app_dir'] = $next['key'];
@@ -857,7 +860,7 @@ class install_install extends ipsCommand
 
 			$output[] = "Добавление шаблонов �тилей";
 
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPSSetUp::charSet );
 
 			//-----------------------------------------
@@ -870,7 +873,7 @@ class install_install extends ipsCommand
 			}
 
 			/* Skin Set Data */
-			$xml->load( IPS_PUBLIC_PATH . 'resources/skins/setsData.xml' );
+			$xml->load( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
 
 			foreach( $xml->fetchElements( 'set' ) as $xmlelement )
 			{
@@ -893,9 +896,9 @@ class install_install extends ipsCommand
 		}
 
 		/* Load skin classes */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 
 		$skinFunctions = new skinImportExport( $this->registry );
 
@@ -929,7 +932,7 @@ class install_install extends ipsCommand
 
 				$output[] = $next['title'] . ": Добавлены шаблоны {$skinData['set_name']}";
 
-				if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
+				if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
 				{
 					//-----------------------------------------
 					// Adjust the table?
@@ -958,7 +961,7 @@ class install_install extends ipsCommand
 					}
 				}
 
-				if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
+				if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
 				{
 					//-----------------------------------------
 					// Adjust the table?
@@ -1005,7 +1008,7 @@ class install_install extends ipsCommand
 			foreach( $skinSets as $skinKey => $skinData )
 			{
 				/* Replacements */
-				$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
+				$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
 			}
 
 			$skinFunctions->rebuildSkinSetsCache();
@@ -1048,7 +1051,7 @@ class install_install extends ipsCommand
 			$output[] = $next['title'] . ": Добавление задач";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_tasks.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_tasks.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1063,7 +1066,7 @@ class install_install extends ipsCommand
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );/*noLibHook*/
 				$tasks = new admin_core_system_taskmanager();
 				$tasks->makeRegistryShortcuts( $this->registry );
 
@@ -1132,7 +1135,7 @@ class install_install extends ipsCommand
 			// Get the language stuff
 			//-----------------------------------------
 
-			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
+			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
 			$lang            =  new admin_core_languages_manage_languages();
 			$lang->makeRegistryShortcuts( $this->registry );
 
@@ -1224,7 +1227,7 @@ class install_install extends ipsCommand
 			// Get the language stuff
 			//-----------------------------------------
 
-			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
+			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
 			$lang            =  new admin_core_languages_manage_languages();
 			$lang->makeRegistryShortcuts( $this->registry );
 
@@ -1312,7 +1315,7 @@ class install_install extends ipsCommand
 			$output[] = $next['title'] . ": Добавление BB-кодов";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_bbcode.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_bbcode.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1327,11 +1330,16 @@ class install_install extends ipsCommand
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );/*noLibHook*/
 				$bbcode = new admin_core_posts_bbcode();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
-				$bbcode->bbcodeImportDo( file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' ) );
+				$_contents	= file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' );
+				
+				if( $_contents )
+				{
+					$bbcode->bbcodeImportDo( $_contents );
+				}
 
 				//-----------------------------------------
 				// Adjust the table?
@@ -1346,7 +1354,7 @@ class install_install extends ipsCommand
 			$output[] = $next['title'] . ": Добавление медиа тегов";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_mediatag.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_mediatag.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1361,7 +1369,7 @@ class install_install extends ipsCommand
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );/*noLibHook*/
 				$bbcode = new admin_core_posts_media();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
@@ -1417,7 +1425,7 @@ class install_install extends ipsCommand
 		/* Set up DB driver */
 		$extra_install = $this->_setUpDBDriver( FALSE );
 
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 
 		//-----------------------------------------
@@ -1429,7 +1437,7 @@ class install_install extends ipsCommand
 			$output[] = $next['title'] . ": Добавление разделов помощи";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 			
-			if ( file_exists( $_PATH . $next['key'] . '_help.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_help.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1444,7 +1452,7 @@ class install_install extends ipsCommand
 				// Do it..
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );/*noLibHook*/
 				$help = new admin_core_tools_help();
 				$help->makeRegistryShortcuts( $this->registry );
 
@@ -1511,7 +1519,7 @@ class install_install extends ipsCommand
 			$output[] = $next['title'] . ": Добавление модификаций";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . 'hooks.xml' ) )
+			if ( is_file( $_PATH . 'hooks.xml' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1526,7 +1534,7 @@ class install_install extends ipsCommand
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );/*noLibHook*/
 				$hooks = new admin_core_applications_hooks();
 				$hooks->makeRegistryShortcuts( $this->registry );
 
@@ -1552,7 +1560,7 @@ class install_install extends ipsCommand
 		}
 		else
 		{
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 
 			//-----------------------------------------
 			// ****** LOG IN MODULES
@@ -1607,7 +1615,7 @@ class install_install extends ipsCommand
 				 $q = $extra_install->before_inserts_run( 'useragents' );
 			}
 
-			require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
+			require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );/*noLibHook*/
 			$userAgentFunctions = new userAgentFunctions( $this->registry );
 
 			$userAgentFunctions->rebuildMasterUserAgents();
@@ -1652,7 +1660,7 @@ class install_install extends ipsCommand
 
 			if( IPSLib::appIsInstalled('calendar') )
 			{
-				require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );
+				require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );/*noLibHook*/
 				$cal = new admin_calendar_calendar_calendars();
 				$cal->makeRegistryShortcuts( $this->registry );
 
@@ -1714,7 +1722,7 @@ class install_install extends ipsCommand
 			//-----------------------------------------
 
 			# Grab cache master file
-			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
+			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
 
 			/* Add handle */
 			$_tmp = new coreVariables();
@@ -1755,6 +1763,41 @@ class install_install extends ipsCommand
 
 			ipsRegistry::cache()->setCache( 'systemvars', $cache, array( 'array' => 1 ) );
 
+			//-------------------------------------------------------------
+			// License Key
+			//-------------------------------------------------------------
+
+			if( ipsRegistry::$settings['ipb_reg_number'] )
+			{
+				$output[] = "Обновление информации о ключе лицензии...";
+				
+				require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
+				$this->classFileManagement = new classFileManagement();
+		
+				/* Query the api */
+				$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?lk=" . ipsRegistry::$settings['ipb_reg_number'] . "&url=" . ipsRegistry::$settings['board_url'] . "&flush=1" );
+	
+				/* Get License Data */
+				$licenseData = json_decode( $response, true );
+				
+				/* Copyright Removal? */
+				if ( $licenseData['cr'] )
+				{
+					IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
+				}
+				elseif ( $this->settings['ips_cp_purchase'] )
+				{
+					IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
+				}
+	
+				/* Save to cache */
+				$licenseData['_cached_date']	= time();
+				$licenseData['key']['_expires']	= $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
+				$licenseData['key']['expires']	= $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
+				
+				ipsRegistry::cache()->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
+			}
+
 			//-------------------------------------------------------------
 			// Stats
 			//-------------------------------------------------------------
@@ -1787,9 +1830,9 @@ class install_install extends ipsCommand
 			//-----------------------------------------
 			
 			/* Load skin classes */
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 
 			$skinFunctions = new skinImportExport( $this->registry );
 
@@ -1847,10 +1890,11 @@ class install_install extends ipsCommand
 			
 			$output[] = "Кеш �тил� обновлен";
 			
-			/* Rebuild FURL cache */
+			/* Rebuild FURL & GLOBAL caches */
 			try
 			{
 				IPSLib::cacheFurlTemplates();
+				IPSLib::cacheGlobalCaches();
 			}
 			catch( Exception $error )
 			{
@@ -1865,7 +1909,7 @@ class install_install extends ipsCommand
 		{
 			$_PATH    = IPSLib::getAppDir( $next['key'] ) . '/extensions/';
 
-			if ( file_exists( $_PATH . 'coreVariables.php' ) )
+			if ( is_file( $_PATH . 'coreVariables.php' ) )
 			{
 				//-----------------------------------------
 				// Adjust the table?
@@ -1877,7 +1921,7 @@ class install_install extends ipsCommand
 				}
 
 				# Grab cache master file
-				require_once( $_PATH . 'coreVariables.php' );
+				require_once( $_PATH . 'coreVariables.php' );/*noLibHook*/
 
 				if ( is_array( $CACHE ) )
 				{
@@ -1924,7 +1968,7 @@ class install_install extends ipsCommand
 	 *
 	 * @access	private
 	 * @param	bool		Whether the DB driver returns with an error or not
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function _setUpDBDriver( $returnDie=TRUE )
 	{
@@ -1934,9 +1978,9 @@ class install_install extends ipsCommand
 		// Any "extra" configs required for this driver?
 		//--------------------------------------------------
 
-		if ( file_exists( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' ) )
+		if ( is_file( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' );
+			require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( IPSSetUp::getSavedData('sql_driver') ) . '_install.php' );/*noLibHook*/
 
 			$extra_install = new install_extra( $this->registry );
 		}
@@ -1966,7 +2010,7 @@ class install_install extends ipsCommand
 	 * @param	string	output
 	 * @param	string	title
 	 * @param	string	next step
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function _finishStep( $output, $title, $nextStep )
 	{
diff --git a/upload/admin/setup/applications/install/sections/license.php b/upload/admin/setup/applications/install/sections/license.php
index f0365b12..78fa15a7 100644
--- a/upload/admin/setup/applications/install/sections/license.php
+++ b/upload/admin/setup/applications/install/sections/license.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: License Key
- * Last Updated: $LastChangedDate: 2010-06-16 11:21:04 -0400 (Wed, 16 Jun 2010) $
+ * Last Updated: $LastChangedDate: 2011-08-30 20:24:16 -0400 (Tue, 30 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6541 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9434 $
  *
  */
 
@@ -24,20 +24,24 @@ class install_license extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
-
+		$lcheck = '';
+		if ( $this->request['do'] == 'check' )
+		{
 			$lcheck = $this->check();
 			if ( $lcheck === TRUE )
 			{
 				$this->registry->autoLoadNextAction( 'db' );
 				return;
 			}
+		}
 	
 		$this->registry->output->setTitle( "Ключ лицензии" );
 		$this->registry->output->setNextAction( "license&do=check" );
+		$this->registry->output->addContent( $this->registry->output->template()->page_license( $lcheck ) );
 		$this->registry->output->sendOutput();
 	}
 	
@@ -49,6 +53,22 @@ class install_license extends ipsCommand
 	 */
 	private function check()
 	{
-		return true;
+		$this->request['lkey'] = trim( $this->request['lkey'] );
+		
+		// License key is optional
+		if( ! $this->request['lkey'] )
+		{
+			return true;
+		}
+		
+		$url = IPSSetup::getSavedData( 'install_url' );
+		
+		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
+		$query = new classFileManagement();
+		$query->use_sockets = 1;
+		$response = $query->getFileContents( "http://myipb.in/license.php?api=activateKey&lk={$this->request['lkey']}&domain=".urlencode($url) );
+		$response = json_decode( $response, true );
+		IPSSetup::setSavedData( 'lkey', $this->request['lkey'] );
+		return TRUE;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/setup/applications/upgrade/index.html b/upload/admin/setup/applications/upgrade/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/applications/upgrade/index.html
+++ b/upload/admin/setup/applications/upgrade/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/upgrade/sections/apps.php b/upload/admin/setup/applications/upgrade/sections/apps.php
index 55d819e5..765842d0 100644
--- a/upload/admin/setup/applications/upgrade/sections/apps.php
+++ b/upload/admin/setup/applications/upgrade/sections/apps.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: EULA file
- * Last Updated: $LastChangedDate: 2010-10-19 11:43:08 -0400 (Tue, 19 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-24 22:52:26 -0400 (Tue, 24 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6996 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8886 $
  *
  */
 
@@ -24,7 +24,7 @@ class upgrade_apps extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -95,10 +95,10 @@ class upgrade_apps extends ipsCommand
 					{
 						foreach( $data as $num )
 						{
-							if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
+							if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
 							{
-								$_class = 'version_class_' . $num;
-								require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
+								$_class = 'version_class_' . $app . '_' . $num;
+								require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
 								
 								$_tmp = new $_class( $this->registry );
 								
@@ -138,7 +138,7 @@ class upgrade_apps extends ipsCommand
 			/* Check Directory */
 			if ( ! is_array( $_POST['apps'] ) OR ! count( $_POST['apps'] ) )
 			{
-				$this->registry->output->addError( '�еобходмо выбрать приложени� дл� обновлени�.' );
+				$this->registry->output->addWarning( '�еобходмо выбрать приложени� дл� обновлени�.' );
 			}
 			else 
 			{
@@ -148,8 +148,7 @@ class upgrade_apps extends ipsCommand
 					$_POST['apps']['forums']        = 1;
 					$_POST['apps']['members']       = 1;
 					$_POST['apps']['calendar']      = 1;
-					$_POST['apps']['portal']        = 1;
-					//$_POST['apps']['subscriptions'] = 1;
+					$_POST['apps']['chat']          = 1;
 				}
 				else
 				{
@@ -189,10 +188,10 @@ class upgrade_apps extends ipsCommand
 				{
 					foreach( $appClasses as $app => $data )
 					{
-						if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' ) )
+						if ( is_file( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' ) )
 						{
 							$_class = $app . '_upgradeCheck';
-							require_once( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' );
+							require_once( IPSLib::getAppDir( $app ) . '/setup/upgradeCheck.php' );/*noLibHook*/
 							$requirements_class = new $_class();
 							
 							if ( method_exists( $requirements_class, 'checkForProblems' ) )
@@ -208,10 +207,10 @@ class upgrade_apps extends ipsCommand
 					
 						foreach( $data as $num )
 						{
-							if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
+							if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
 							{
-								$_class = 'version_class_' . $num;
-								require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
+								$_class = 'version_class_' . $app . '_' . $num;
+								require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
 								
 								$_tmp = new $_class( $this->registry );
 								
@@ -269,7 +268,7 @@ class upgrade_apps extends ipsCommand
 						// Get it!
 						//-----------------------------------------
 					
-						if ( ! file_exists( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
+						if ( ! is_file( IPS_ROOT_PATH . $_pBit . '/' . $file . '/xml/information.xml' ) )
 						{
 							continue;		
 						}
@@ -337,12 +336,14 @@ class upgrade_apps extends ipsCommand
 		{
 			foreach( $appClasses as $app => $data )
 			{
+				$notices[ $app ]	= array();
+
 				foreach( $data as $num )
 				{
-					if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
+					if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
 					{
-						$_class = 'version_class_' . $num;
-						require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
+						$_class = 'version_class_' . $app . '_' . $num;
+						require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
 						
 						$_tmp = new $_class( $this->registry );
 						
@@ -352,7 +353,7 @@ class upgrade_apps extends ipsCommand
 							
 							if ( $_t )
 							{
-								$notices[ $app ] = $_t;
+								$notices[ $app ] = array_merge( $_t, $notices[ $app ] );
 							}
 						}
 					}
@@ -364,8 +365,7 @@ class upgrade_apps extends ipsCommand
 		if ( IPSSetUp::is300plus() !== TRUE )
 		{
 			unset( $apps['ips']['calendar'] );
-			unset( $apps['ips']['portal'] );
-			unset( $apps['other']['subscriptions'] );
+			unset( $apps['ips']['chat'] );
 		}
 
 		/* Page Output */
diff --git a/upload/admin/setup/applications/upgrade/sections/convert.php b/upload/admin/setup/applications/upgrade/sections/convert.php
index 500a37c9..b6140398 100644
--- a/upload/admin/setup/applications/upgrade/sections/convert.php
+++ b/upload/admin/setup/applications/upgrade/sections/convert.php
@@ -5,10 +5,9 @@
  * Upgrader: Database Convertion
  *
  * @author 		Tony
- * @copyright	(c) 2009 IBResource.ru
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		Invision Power Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  *
  */
 
diff --git a/upload/admin/setup/applications/upgrade/sections/done.php b/upload/admin/setup/applications/upgrade/sections/done.php
index d64e48d3..c24b35e9 100644
--- a/upload/admin/setup/applications/upgrade/sections/done.php
+++ b/upload/admin/setup/applications/upgrade/sections/done.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: DONE file
- * Last Updated: $LastChangedDate: 2010-04-09 21:23:51 -0400 (Fri, 09 Apr 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-24 15:40:20 -0400 (Tue, 24 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6094 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8884 $
  *
  */
 
@@ -24,7 +24,7 @@ class upgrade_done extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -59,10 +59,10 @@ class upgrade_done extends ipsCommand
 				{
 					foreach( $data as $num )
 					{
-						if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
+						if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
 						{
-							$_class = 'version_class_' . $num;
-							require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
+							$_class = 'version_class_' . $app . '_' . $num;
+							require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
 							
 							$_tmp = new $_class( $this->registry );
 							
diff --git a/upload/admin/setup/applications/upgrade/sections/index.html b/upload/admin/setup/applications/upgrade/sections/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/applications/upgrade/sections/index.html
+++ b/upload/admin/setup/applications/upgrade/sections/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/applications/upgrade/sections/index.php b/upload/admin/setup/applications/upgrade/sections/index.php
index 4c2db64e..c7570970 100644
--- a/upload/admin/setup/applications/upgrade/sections/index.php
+++ b/upload/admin/setup/applications/upgrade/sections/index.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Upgrader: Index file - Shows log in page
- * Last Updated: $LastChangedDate: 2010-07-07 11:51:43 -0400 (Wed, 07 Jul 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6613 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -23,7 +23,7 @@ class upgrade_index extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
diff --git a/upload/admin/setup/applications/upgrade/sections/license.php b/upload/admin/setup/applications/upgrade/sections/license.php
index 64e1dc98..9e1ca583 100644
--- a/upload/admin/setup/applications/upgrade/sections/license.php
+++ b/upload/admin/setup/applications/upgrade/sections/license.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: License Key
- * Last Updated: $LastChangedDate: 2010-08-03 04:16:45 -0400 (Tue, 03 Aug 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-26 15:04:51 -0400 (Thu, 26 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6720 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8903 $
  *
  */
 
@@ -24,7 +24,7 @@ class upgrade_license extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -35,15 +35,28 @@ class upgrade_license extends ipsCommand
 			return;
 		}
 
+		if ( $this->request['do'] == 'check' )
+		{
 			$lcheck = $this->check();
 			if ( $lcheck === TRUE )
 			{
 				$this->registry->autoLoadNextAction( 'upgrade' );
 				return;
 			}
+		}
+		else
+		{
+			$lcheck = $this->check( TRUE );
+			if ( $lcheck === TRUE )
+			{
+				$this->registry->autoLoadNextAction( 'upgrade' );
+				return;
+			}
+		}
 	
 		$this->registry->output->setTitle( "Ключ лицензии" );
 		$this->registry->output->setNextAction( "license&do=check" );
+		$this->registry->output->addContent( $this->registry->output->template()->page_license( $lcheck ) );
 		$this->registry->output->sendOutput();
 	}
 	
@@ -53,8 +66,23 @@ class upgrade_license extends ipsCommand
 	 * @access	public
 	 * @return	bool
 	 */
-	private function check()
+	private function check( $init=FALSE )
 	{
-		return true;
+		$this->request['lkey'] = ( $init ) ? ipsRegistry::$settings['ipb_reg_number'] : trim( $this->request['lkey'] );
+
+		if ( !$this->request['lkey'] and !$init )
+		{
+			return true;
+		}
+							
+		$url = ipsRegistry::$settings['board_url'] ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
+		
+		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
+		$query = new classFileManagement();
+		$query->use_sockets = 1;
+		$response = $query->getFileContents( "http://myipb.in/license.php?api=activateKey&lk={$this->request['lkey']}&domain=".urlencode($url) );
+		$response = json_decode( $response, true );
+		IPSLib::updateSettings( array( 'ipb_reg_number' => $this->request['lkey'] ) );
+		return TRUE;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/setup/applications/upgrade/sections/overview.php b/upload/admin/setup/applications/upgrade/sections/overview.php
index e23ef78a..db1bdded 100644
--- a/upload/admin/setup/applications/upgrade/sections/overview.php
+++ b/upload/admin/setup/applications/upgrade/sections/overview.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Upgrader: Index file - Shows log in page
- * Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6881 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -23,7 +23,7 @@ class upgrade_overview extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry ) 
 	{
@@ -42,7 +42,7 @@ class upgrade_overview extends ipsCommand
 		
 		/* Test Extensions */
 		$INSTALLDATA = array();
-		include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );
+		include( IPS_ROOT_PATH . 'setup/xml/requiredextensions.php' );/*noLibHook*/
 		
 		if ( is_array( $INSTALLDATA ) && count( $INSTALLDATA ) )
 		{
@@ -80,7 +80,7 @@ class upgrade_overview extends ipsCommand
 			$filesOK = FALSE;
 		
 			/* Fetch core writeable files */
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPSSetUp::charSet );
 		
 			try
@@ -99,7 +99,7 @@ class upgrade_overview extends ipsCommand
 						{
 							if ( $data['dir'] )
 							{
-								if ( ! @mkdir( $_path, 0777, TRUE ) )
+								if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
 								{
 									$this->registry->output->addError( 'Директори� не �уще�твует: "' . $data['path'] . '". Пожалуй�та, �оздайте ее' );
 								}
@@ -122,7 +122,7 @@ class upgrade_overview extends ipsCommand
 								continue;
 							}
 						
-							if ( ! @chmod( $_path, 0777 ) )
+							if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
 							{
 								if ( is_dir( $_path ) )
 								{
diff --git a/upload/admin/setup/applications/upgrade/sections/upgrade.php b/upload/admin/setup/applications/upgrade/sections/upgrade.php
index 3598ead2..f5a24acd 100644
--- a/upload/admin/setup/applications/upgrade/sections/upgrade.php
+++ b/upload/admin/setup/applications/upgrade/sections/upgrade.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer: Upgrader core file
- * Last Updated: $LastChangedDate: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-27 21:33:45 -0400 (Tue, 27 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6881 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9556 $
  *
  */
 
@@ -83,7 +83,7 @@ class upgrade_upgrade extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function doExecute( ipsRegistry $registry )
 	{
@@ -262,9 +262,9 @@ class upgrade_upgrade extends ipsCommand
 		$file = IPSLib::getAppDir( $this->_currentApp ) . '/setup/versions/upg_' . $this->_uipLong . '/' . $this->_dbDriver . '_updates.php';
 
 		/* Get file */
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
-			require( $file );
+			require( $file );/*noLibHook*/
 
 			if ( is_array( $SQL ) AND count( $SQL ) > 0 )
 			{
@@ -284,7 +284,7 @@ class upgrade_upgrade extends ipsCommand
 					{
 						if ( preg_match( "/^create table(.+?)/i", $q ) )
 						{
-							$q = preg_replace( "/^(.+?)\);$/is", "\\1) TYPE={$this->settings['mysql_tbl_type']};", $q );
+							$q = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $q );
 						}
 					}
 
@@ -386,11 +386,11 @@ class upgrade_upgrade extends ipsCommand
 		$fileLegacy = IPSLib::getAppDir( $this->_currentApp ) . '/setup/versions/upg_' . $this->_uipLong . '/version_upgrade_' . $this->_dbDriver . '.php';
 
 		/* Got any file? */
-		if ( file_exists( $fileNewer ) )
+		if ( is_file( $fileNewer ) )
 		{
 			$file = $fileNewer;
 		}
-		else if ( file_exists( $fileLegacy ) )
+		else if ( is_file( $fileLegacy ) )
 		{
 			$file = $fileLegacy;
 		}
@@ -398,7 +398,7 @@ class upgrade_upgrade extends ipsCommand
 		/* Do we have a file? */
 		if ( $file )
 		{
-			require_once( $file );
+			require_once( $file );/*noLibHook*/
 			$upgrade = new version_upgrade();
 			$result  = $upgrade->doExecute( $this->registry );
 
@@ -454,7 +454,9 @@ class upgrade_upgrade extends ipsCommand
 					$_in = ( $this->_currentApp == 'core' ) ? "'core', 'forums', 'members'" : "'" . $this->_currentApp . "'";
 
 					$this->DB->update( 'core_applications', array( 'app_long_version' => $this->_uipLong,
-																   'app_version'	  => $this->_uipHuman ), 'app_directory IN (' . $_in . ')' );
+																   'app_version'	  => $this->_uipHuman,
+																   'app_website'	  => $this->_appData['website'],
+																   'app_update_check' => $this->_appData['update_check'] ), 'app_directory IN (' . $_in . ')' );
 				}
 				else
 				{
@@ -507,7 +509,9 @@ class upgrade_upgrade extends ipsCommand
 					$_in = ( $this->_currentApp == 'core' ) ? "'core', 'forums', 'members'" : "'" . $this->_currentApp . "'";
 
 					$this->DB->update( 'core_applications', array( 'app_long_version' => $this->_uipLong,
-																   'app_version'	  => $this->_uipHuman ), 'app_directory IN (' . $_in . ')' );
+																   'app_version'	  => $this->_uipHuman,
+																   'app_website'	  => $this->_appData['website'],
+																   'app_update_check' => $this->_appData['update_check'] ), 'app_directory IN (' . $_in . ')' );
 				}
 				else
 				{
@@ -612,9 +616,9 @@ class upgrade_upgrade extends ipsCommand
 			$output[] = $next['title'] . ": Обновление модулей";
 			$_PATH    = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_modules.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_modules.xml' ) )
 			{
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/applications.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/applications.php' );/*noLibHook*/
 				$apps            =  new admin_core_applications_applications();
 				$apps->makeRegistryShortcuts( $this->registry );
 
@@ -668,14 +672,14 @@ class upgrade_upgrade extends ipsCommand
 			$output[] = $next['title'] . ": Обновление на�троек";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_settings.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_settings.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/settings.php' );
-				$settings =  new admin_core_tools_settings();
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/settings/settings.php' );/*noLibHook*/
+				$settings =  new admin_core_settings_settings();
 				$settings->makeRegistryShortcuts( $this->registry );
 
 				$this->request['app_dir'] = $next['key'];
@@ -696,9 +700,9 @@ class upgrade_upgrade extends ipsCommand
 
 				/* Fetch known settings  */
 				$knownSettings = array();
-				if ( file_exists( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
+				if ( is_file( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' ) )
 				{
-					require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );
+					require( IPSLib::getAppDir( $next['key'] ) . '/setup/versions/install/knownSettings.php' );/*noLibHook*/
 				}
 
 				$settings->importAllSettings( 1, 1, $knownSettings );
@@ -737,9 +741,9 @@ class upgrade_upgrade extends ipsCommand
 
 		$previous = $_REQUEST['previous'];
 		
-		if ( file_exists( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' ) )
+		if ( is_file( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' ) )
 		{
-			require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' );
+			require_once( IPS_ROOT_PATH .'setup/sql/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . '_install.php' );/*noLibHook*/
 
 			$extra_install = new install_extra( $this->registry );
 		}
@@ -762,7 +766,7 @@ class upgrade_upgrade extends ipsCommand
 
 			$output[] = "Добавление шаблонов";
 
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPSSetUp::charSet );
 
 			//-----------------------------------------
@@ -775,7 +779,7 @@ class upgrade_upgrade extends ipsCommand
 			}
 
 			/* Skin Set Data */
-			$xml->load( IPS_PUBLIC_PATH . 'resources/skins/setsData.xml' );
+			$xml->load( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
 
 			foreach( $xml->fetchElements( 'set' ) as $xmlelement )
 			{
@@ -795,9 +799,9 @@ class upgrade_upgrade extends ipsCommand
 		}
 
 		/* Load skin classes */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 
 		$skinFunctions = new skinImportExport( $this->registry );
 
@@ -831,7 +835,7 @@ class upgrade_upgrade extends ipsCommand
 
 				$output[] = $next['title'] . ": Обновление шаблонов {$skinData['set_name']}";
 
-				if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
+				if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_templates.xml' ) )
 				{
 					//-----------------------------------------
 					// Install
@@ -842,7 +846,7 @@ class upgrade_upgrade extends ipsCommand
 					$output[] = $next['title'] . ": " . intval( $return['insertCount'] ) . " шаблонов добавлено";
 				}
 
-				if ( file_exists( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
+				if ( is_file( $_PATH . $next['key'] . '_' . $skinKey . '_css.xml' ) )
 				{
 					//-----------------------------------------
 					// Install
@@ -871,12 +875,14 @@ class upgrade_upgrade extends ipsCommand
 			foreach( $skinSets as $skinKey => $skinData )
 			{
 				/* Replacements */
-				if ( file_exists( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ) )
+				if ( is_file( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ) )
 				{
-					$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_PUBLIC_PATH . 'resources/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
+					$skinFunctions->importReplacementsXMLArchive( file_get_contents( IPS_ROOT_PATH . 'setup/xml/skins/replacements_' . $skinKey . '.xml' ), $skinKey );
 				}
 			}
-
+			
+			$skinFunctions->rebuildMobileSkinUserAgentsFromSetDataXml();
+			
 			$skinFunctions->rebuildSkinSetsCache();
 
 			$output[] = "В�е шаблоны обновлены";
@@ -914,13 +920,13 @@ class upgrade_upgrade extends ipsCommand
 			$output[] = $next['title'] . ": Обновление задач";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_tasks.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_tasks.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/system/taskmanager.php' );/*noLibHook*/
 				$tasks = new admin_core_system_taskmanager();
 				$tasks->makeRegistryShortcuts( $this->registry );
 
@@ -977,7 +983,7 @@ class upgrade_upgrade extends ipsCommand
 			// Get the language stuff
 			//-----------------------------------------
 
-			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
+			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
 			$lang            =  new admin_core_languages_manage_languages();
 			$lang->makeRegistryShortcuts( $this->registry );
 
@@ -1054,7 +1060,7 @@ class upgrade_upgrade extends ipsCommand
 			// Get the language stuff
 			//-----------------------------------------
 
-			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );
+			require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/languages/manage_languages.php' );/*noLibHook*/
 			$lang            =  new admin_core_languages_manage_languages();
 			$lang->makeRegistryShortcuts( $this->registry );
 
@@ -1076,7 +1082,7 @@ class upgrade_upgrade extends ipsCommand
 						//-----------------------------------------
             	
 						$this->request['file_location'] = $_PATH . $f->getFileName();
-						$lang->imprtFromXML( true, true, true, $next['key'], false, 1 );
+						$lang->imprtFromXML( true, true, true, $next['key'], true, 1 );
 					}
 				}
 			} catch ( Exception $e ) {}
@@ -1127,29 +1133,34 @@ class upgrade_upgrade extends ipsCommand
 			$output[] = $next['title'] . ": Обновление BB-кодов";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_bbcode.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_bbcode.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/bbcode.php' );/*noLibHook*/
 				$bbcode = new admin_core_posts_bbcode();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
-				$bbcode->bbcodeImportDo( file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' ) );
+				$_contents	= file_get_contents( $_PATH . $next['key'] . '_bbcode.xml' );
+				
+				if( $_contents )
+				{
+					$bbcode->bbcodeImportDo( $_contents );
+				}
 			}
 
 			$output[] = $next['title'] . ": Обновление медиа тегов";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . $next['key'] . '_mediatag.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_mediatag.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/posts/media.php' );/*noLibHook*/
 				$bbcode = new admin_core_posts_media();
 				$bbcode->makeRegistryShortcuts( $this->registry );
 
@@ -1193,7 +1204,7 @@ class upgrade_upgrade extends ipsCommand
 
 		$next = IPSSetUp::fetchNextApplication( $previous, '{app}_help.xml', $this->settings['gb_char_set'] );
 
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 
 		//-----------------------------------------
@@ -1202,15 +1213,17 @@ class upgrade_upgrade extends ipsCommand
 		
 		if ( $next['key'] )
 		{
-			$output[] = $next['title'] . ": Обновление разделов помощи";
+			$_PATH    = IPSLib::getAppDir( $next['key'] ) . '/xml/';
+			
+			$output[] = $next['title'] . ": Upgrading Public Help...";
 
-			if ( file_exists( $_PATH . $next['key'] . '_help.xml' ) )
+			if ( is_file( $_PATH . $next['key'] . '_help.xml' ) )
 			{
 				//-----------------------------------------
 				// Do it..
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/tools/help.php' );/*noLibHook*/
 				$help = new admin_core_tools_help();
 				$help->makeRegistryShortcuts( $this->registry );
 
@@ -1267,13 +1280,13 @@ class upgrade_upgrade extends ipsCommand
 			$output[] = $next['title'] . ": Обновление модификаций";
 			$_PATH        = IPSLib::getAppDir( $next['key'] ) .  '/xml/';
 
-			if ( file_exists( $_PATH . 'hooks.xml' ) )
+			if ( is_file( $_PATH . 'hooks.xml' ) )
 			{
 				//-----------------------------------------
 				// Continue
 				//-----------------------------------------
 
-				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );
+				require_once( IPS_ROOT_PATH . 'applications/core/modules_admin/applications/hooks.php' );/*noLibHook*/
 				$hooks = new admin_core_applications_hooks();
 				$hooks->makeRegistryShortcuts( $this->registry );
 
@@ -1290,32 +1303,17 @@ class upgrade_upgrade extends ipsCommand
 		}
 		else
 		{
-		
 		//-----------------------------------------
 		// ****** USER AGENTS
 		//-----------------------------------------
 
 		$output[] = "Добавление user-agent`ов по-умолчанию";
 
-		require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
+			require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );/*noLibHook*/
 		$userAgentFunctions = new userAgentFunctions( $this->registry );
 
 		$userAgentFunctions->rebuildMasterUserAgents();
 
-		//-----------------------------------------
-		// Build Calendar RSS
-		//-----------------------------------------
-
-		if( IPSLib::appIsInstalled('calendar') )
-		{
-			require_once( IPSLib::getAppDir('calendar') . '/modules_admin/calendar/calendars.php' );
-			$cal = new admin_calendar_calendar_calendars();
-			$cal->makeRegistryShortcuts( $this->registry );
-
-			$output[] = "Обновление RSS календар�";
-			$cal->calendarRSSCache();
-		}
-
 		//-----------------------------------------
 		// Next...
 		//-----------------------------------------
@@ -1353,11 +1351,11 @@ class upgrade_upgrade extends ipsCommand
 		{
 			$_PATH    = IPSLib::getAppDir( $next['key'] ) . '/extensions/';
 
-			if ( file_exists( $_PATH . 'coreVariables.php' ) )
+			if ( is_file( $_PATH . 'coreVariables.php' ) )
 			{
 				# Grab cache master file
 				$CACHE = array();
-				require_once( $_PATH . 'coreVariables.php' );
+				require_once( $_PATH . 'coreVariables.php' );/*noLibHook*/
 
 				if ( is_array( $CACHE ) && count( $CACHE ) )
 				{
@@ -1396,7 +1394,7 @@ class upgrade_upgrade extends ipsCommand
 			//-----------------------------------------
 
 			# Grab cache master file
-			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
+			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
 
 			/* Add handle */
 			$_tmp = new coreVariables();
@@ -1427,12 +1425,49 @@ class upgrade_upgrade extends ipsCommand
 			//-------------------------------------------------------------
 
 			$output[] = "Обновление кеша �и�темных переменных";
-
-			$cache = array( 'mail_queue'    => 0,
-							'task_next_run' => time() + 3600 );
+			
+			$cache = ipsRegistry::cache()->getCache( 'systemvars' );
+			
+			$cache['task_next_run'] = time() + 3600;
+			$cache['mail_queue'] = 0;
 
 			ipsRegistry::cache()->setCache( 'systemvars', $cache, array( 'array' => 1 ) );
 
+			//-------------------------------------------------------------
+			// License Key
+			//-------------------------------------------------------------
+
+			if( ipsRegistry::$settings['ipb_reg_number'] )
+			{
+				$output[] = "Обновление данных о лицензии...";
+				
+				require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
+				$this->classFileManagement = new classFileManagement();
+		
+				/* Query the api */
+				$response = $this->classFileManagement->getFileContents( "http://myipb.in/license.php?lk=" . ipsRegistry::$settings['ipb_reg_number'] . "&url=" . ipsRegistry::$settings['board_url'] . "&flush=1" );
+							
+				/* Get License Data */
+				$licenseData = json_decode( $response, true );
+				
+				/* Copyright Removal? */
+				if ( $licenseData['cr'] )
+				{
+					IPSLib::updateSettings( array( 'ipb_copy_number' => $licenseData['cr'], 'ips_cp_purchase' => 1 ) );
+				}
+				elseif ( $this->settings['ips_cp_purchase'] )
+				{
+					IPSLib::updateSettings( array( 'ips_cp_purchase' => 0 ) );
+				}
+	
+				/* Save to cache */
+				$licenseData['_cached_date']	= time();
+				$licenseData['key']['_expires']	= $licenseData['key']['_expires'] ? $licenseData['key']['_expires'] : 9999999999;
+				$licenseData['key']['expires']	= $licenseData['key']['expires'] ? $licenseData['key']['expires'] : 9999999999;
+				
+				ipsRegistry::cache()->setCache( 'licenseData', $licenseData, array( 'array' => 1 ) );
+			}
+			
 			$output[] = "Ве�ь кеш обновлен";
 			
 			$this->_finishStep( $output, "Обновление: Кеш", 'upgrade&do=templatecache' );
@@ -1468,9 +1503,9 @@ class upgrade_upgrade extends ipsCommand
 		//-----------------------------------------
 		
 		/* Load skin classes */
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinImportExport.php' );/*noLibHook*/
 
 		$skinFunctions = new skinImportExport( $this->registry );
 
@@ -1519,10 +1554,11 @@ class upgrade_upgrade extends ipsCommand
 
 			$skinFunctions->rebuildSkinSetsCache();
 			
-			/* Rebuild FURL cache */
+			/* Rebuild FURL & GLOBAL caches */
 			try
 			{
 				IPSLib::cacheFurlTemplates();
+				IPSLib::cacheGlobalCaches();
 			}
 			catch( Exception $error )
 			{
@@ -1551,7 +1587,7 @@ class upgrade_upgrade extends ipsCommand
 	 * @param	string	output
 	 * @param	string	title
 	 * @param	string	next step
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function _finishStep( $output, $title, $nextStep )
 	{
diff --git a/upload/admin/setup/cli/install.php b/upload/admin/setup/cli/install.php
new file mode 100644
index 00000000..218b2c93
--- /dev/null
+++ b/upload/admin/setup/cli/install.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Installer CLI Script
+ * Last Updated: $LastChangedDate: 2011-09-22 09:37:11 -0400 (Thu, 22 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mark $
+ * @copyright	© 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 9537 $
+ *
+ */
+
+/**
+ * USAGE:
+ * php install.php [APPS] [DIRECTORY] [URL] [LICENSE_KEY] [MYSQL_HOST] [MYSQL_DATABASE] [MYSQL_USER] [MYSQL_PASS] [ACP_USER] [ACP_PASS] [ACP_EMAIL]
+ */
+
+//-----------------------------------------
+// Checks
+//-----------------------------------------
+
+if ( !isset( $_SERVER['argv'] ) )
+{
+	exit;
+}
+
+if ( file_exists( "../../../cache/installer_lock.php" ) )
+{
+	exit;
+}
+
+//-----------------------------------------
+// Init
+//-----------------------------------------
+
+error_reporting( ~E_NOTICE );
+
+date_default_timezone_set( 'UTC' );
+
+function my_getenv( $k ) { return $_SERVER[ $k ]; }
+
+define( 'IPS_ROOT_PATH', "../../" );
+define( 'DOC_IPS_ROOT_PATH', "../../../" );
+define( 'IPS_KERNEL_PATH', "../../../ips_kernel/" );
+define( 'IPB_VERSION', 0 );
+define( 'IPB_LONG_VERSION', 0 );
+define( 'IPS_IS_UPGRADER', FALSE );
+define( 'IN_IPB', TRUE );
+define( 'IN_ACP', TRUE );
+define( 'PUBLIC_DIRECTORY', 'public' );
+
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsRegistry_setup.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsController_setup.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'setup/sources/classes/output/output.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'setup/cli/output.php' );/*noLibHook*/
+
+$steps = array(
+	1 => 'sql',
+	'sql_steps',
+	'applications',
+	'modules',
+	'settings',
+	'templates',
+	'tasks',
+	'languages',
+	'clientlanguages',
+	'bbcode',
+	'acphelp',
+	'other',
+	'caches'
+	);
+ipsRegistry::init();
+$registry = ipsRegistry::instance();
+
+//-----------------------------------------
+// Set Configuration
+//-----------------------------------------
+
+IPSSetUp::setSavedData('install_apps', $_SERVER['argv'][1] );
+IPSSetUp::setSavedData('install_dir', $_SERVER['argv'][2] );
+IPSSetUp::setSavedData('install_url', $_SERVER['argv'][3] );
+IPSSetUp::setSavedData('lkey', $_SERVER['argv'][4] );
+IPSSetUp::setSavedData('sql_driver', 'mysql' );
+IPSSetUp::setSavedData('db_host', $_SERVER['argv'][5] );
+IPSSetUp::setSavedData('db_name', $_SERVER['argv'][6] );
+IPSSetUp::setSavedData('db_user', $_SERVER['argv'][7] );
+IPSSetUp::setSavedData('db_pass', $_SERVER['argv'][8] );
+IPSSetUp::setSavedData('db_pre' ,'' );
+IPSSetUp::setSavedData('admin_user', $_SERVER['argv'][9] );
+IPSSetUp::setSavedData('admin_pass', $_SERVER['argv'][10] );
+IPSSetUp::setSavedData('admin_email', $_SERVER['argv'][11] );
+
+/* Write it */
+IPSInstall::writeConfiguration();
+
+//-----------------------------------------
+// Install
+//-----------------------------------------
+
+require_once( IPS_ROOT_PATH . 'setup/applications/install/sections/install.php' );/*noLibHook*/
+$controller = new install_install();
+$output = new CLIOutput( $steps, $controller );
+$registry->setClass( 'output', $output );
+$controller->makeRegistryShortcuts( $registry );
+$output->setNextAction( 'do=sql' );
+$output->sendOutput();
+
+//-----------------------------------------
+// Finished
+//-----------------------------------------
+
+file_get_contents( "http://myipb.in/license.php?a=activate&key={$_SERVER['argv'][4]}&url={$_SERVER['argv'][3]}&mod=install" );
+
+file_put_contents( "../../../cache/installer_lock.php", "AUTOINSTALLED" );
+
+echo "OK";
+exit;
\ No newline at end of file
diff --git a/upload/admin/setup/cli/output.php b/upload/admin/setup/cli/output.php
new file mode 100644
index 00000000..ee987d03
--- /dev/null
+++ b/upload/admin/setup/cli/output.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Setup CLI Script Overrider
+ * Last Updated: $LastChangedDate: 2011-09-22 09:37:11 -0400 (Thu, 22 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mark $
+ * @copyright	© 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 9537 $
+ *
+ */
+
+class CLIOutput extends output
+{
+	public $currentStep = 1;
+
+	public function __construct( $steps, $controller )
+	{
+		$this->steps = $steps;
+		$this->controller = $controller;
+		
+		parent::__construct( ipsRegistry::instance(), FALSE );
+	}
+	
+	public function setNextAction( $next )
+	{
+		$next = str_replace( '&amp;', '&', $next );
+		if ( substr( $next, 0, 8 ) == 'install&' )
+		{
+			$next = substr( $next, 8 );
+		}
+
+		$this->next = $next;
+	}
+	
+	 public function sendOutput( $saveData=TRUE )
+	{
+		if ( $this->next != 'done' )
+		{
+			parse_str( $this->next, $vars );
+			$_REQUEST = $vars;
+			$this->controller->request = $vars;
+			$this->controller->doExecute( ipsRegistry::instance() );
+		}
+	}
+
+	public function template()
+	{
+		return new CLIOutputTemplate();
+	}
+}
+
+class CLIOutputTemplate
+{
+	public function __call( $name, $arguments )
+	{
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/setup/index.html b/upload/admin/setup/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/index.html
+++ b/upload/admin/setup/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/public/images/index.html b/upload/admin/setup/public/images/index.html
index 0752b7cc..bdf4e02e 100644
--- a/upload/admin/setup/public/images/index.html
+++ b/upload/admin/setup/public/images/index.html
@@ -6,6 +6,6 @@
 You have reached this Page in error, please use
 your back button to return to Invision Board.
 <hr>
-<a href="http://www.invisionboard.com/">Invision Power Board</a>
+<a href="http://www.invisionpower.com">Invision Power Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/public/index.html b/upload/admin/setup/public/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/public/index.html
+++ b/upload/admin/setup/public/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/public/install.css b/upload/admin/setup/public/install.css
index 97c2dae3..ff41e4a8 100644
--- a/upload/admin/setup/public/install.css
+++ b/upload/admin/setup/public/install.css
@@ -208,12 +208,12 @@ TABLE {
 
 .package {
 	clear:both;
-    height: 417px;
+    height: 577px;
 }
 
 .content_wrap {
     width: 70%;
-    height: 320px;
+    height: 480px;
     float: right;
     margin: 6px 6px 4px 0px;
     padding: 10px;
diff --git a/upload/admin/setup/sources/base/index.html b/upload/admin/setup/sources/base/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/base/index.html
+++ b/upload/admin/setup/sources/base/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sources/base/install.php b/upload/admin/setup/sources/base/install.php
index db1bc667..22549332 100644
--- a/upload/admin/setup/sources/base/install.php
+++ b/upload/admin/setup/sources/base/install.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Static SETUP Classes for IP.Board 3
  *
  * These classes are not required as objects. 
- * Last Updated: $Date: 2010-05-05 09:11:48 -0400 (Wed, 05 May 2010) $
+ * Last Updated: $Date: 2011-07-11 18:25:07 -0400 (Mon, 11 Jul 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6221 $
+ * @version		$Revision: 9199 $
  *
  */
 
@@ -31,7 +31,7 @@ class IPSInstall
 	 * Create admin account
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function createAdminAccount()
 	{
@@ -58,8 +58,6 @@ class IPSInstall
 						 'last_activity'			=> time(),
 						 'ip_address'				=> my_getenv('REMOTE_ADDR'),
 						 'view_sigs'				=> 1,
-						 'view_img'					=> 1,
-						 'view_avs'					=> 1,
 						 'restrict_post'			=> 0,
 						 'msg_show_notification'	=> 1,
 						 'msg_count_total'			=> 0,
@@ -67,9 +65,9 @@ class IPSInstall
 						 'coppa_user'				=> 0,
 						 'language'					=> IPSLib::getDefaultLanguage(),
 						 'members_auto_dst'			=> 1,
-						 'members_editor_choice'	=> ipsRegistry::$settings['ips_default_editor'] ? ipsRegistry::$settings['ips_default_editor'] : 'std',
+						 'members_editor_choice'	=> 'rte',
+						 'member_uploader'			=> 'flash',
 						 'allow_admin_mails'		=> 0,
-						 'hide_email'				=> 1,
 						 'members_pass_hash'		=> $passhash,
 						 'members_pass_salt'		=> $salt,
 						 'has_blog'					=> '',
@@ -84,7 +82,7 @@ class IPSInstall
 					   );
 	
 		/* Insert: MEMBERS */
-		ipsRegistry::DB()->force_data_type = array( 'name' => 'string', 'members_display_name' => 'string', 'members_l_username' => 'string', 'members_l_display_name' => 'string' );
+		ipsRegistry::DB()->setDataType( array( 'name', 'members_display_name', 'members_l_username', 'members_l_display_name' ), 'string' );
 
 		ipsRegistry::DB()->insert( 'members', $member );
 
@@ -92,7 +90,6 @@ class IPSInstall
 		$member['member_id'] = $member_id;
 
 		/* Insert into the custom profile fields DB */
-		ipsRegistry::DB()->force_data_type = array();
 		ipsRegistry::DB()->insert( 'pfields_content', array( 'member_id' => $member_id ) );
 		
 		/* Insert into pp */
@@ -101,7 +98,8 @@ class IPSInstall
 														'pp_setting_count_friends'	=> 1, 
 														'signature'					=> '',
 														'pconversation_filters'		=> '',
-														'pp_setting_count_comments'	=> 1 ) );
+														'pp_setting_count_comments'	=> 1,
+														'pp_setting_count_visitors' => 1 ) );
 	}
 	
 	/**
diff --git a/upload/admin/setup/sources/base/ipsController_setup.php b/upload/admin/setup/sources/base/ipsController_setup.php
index 2ddb5ccc..d67e6cf3 100644
--- a/upload/admin/setup/sources/base/ipsController_setup.php
+++ b/upload/admin/setup/sources/base/ipsController_setup.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ipsController for setup
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-09-22 09:37:11 -0400 (Thu, 22 Sep 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6881 $
+ * @version		$Revision: 9537 $
  *
  */
 
@@ -50,7 +50,7 @@ class ipsController
 	 * Make us a singleton please
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function __construct() { }
 
@@ -58,7 +58,7 @@ class ipsController
 	 * Public facing function to run the controller
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function run()
 	{
@@ -71,7 +71,7 @@ class ipsController
 	 * Initialize ipsRegistry and this class
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function init()
 	{
@@ -83,7 +83,7 @@ class ipsController
 	 * Handle the incoming request using the command resolver
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function handleRequest()
 	{
@@ -131,7 +131,7 @@ class ipsController_CommandResolver
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -158,7 +158,7 @@ class ipsController_CommandResolver
 		/* Got a section? */
 		if ( ! $section )
 		{
-			if ( file_exists( $filepath . 'index.php' ) )
+			if ( is_file( $filepath . 'index.php' ) )
 			{
 				$section = 'index';
 			}
@@ -166,14 +166,14 @@ class ipsController_CommandResolver
 
 		$classname = IPS_APP_COMPONENT . '_' . $section;
 
-		if ( file_exists( $filepath . 'manualResolver.php' ) )
+		if ( is_file( $filepath . 'manualResolver.php' ) )
 		{
-			require_once( $filepath . 'manualResolver.php' );
+			require_once( $filepath . 'manualResolver.php' );/*noLibHook*/
 			$classname = IPS_APP_COMPONENT . '_' . $module . '_manualResolver';
 		}
-		else if ( file_exists( $filepath . $section . '.php' ) )
+		else if ( is_file( $filepath . $section . '.php' ) )
 		{
-			require_once( $filepath . $section . '.php' );
+			require_once( $filepath . $section . '.php' );/*noLibHook*/
 		}
 
 		if ( class_exists( $classname ) )
@@ -207,17 +207,19 @@ abstract class ipsCommand
 	protected $registry;
 	protected $DB;
 	protected $settings;
-	protected $request;
+	public $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 
 	/**
 	 * Constructor override
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	final public function __construct()
 	{
@@ -228,7 +230,7 @@ abstract class ipsCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function makeRegistryShortcuts( ipsRegistry $registry )
 	{
@@ -248,7 +250,7 @@ abstract class ipsCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function execute( ipsRegistry $registry )
 	{
@@ -261,7 +263,7 @@ abstract class ipsCommand
 	 *
 	 * @access	protected
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected abstract function doExecute( ipsRegistry $registry );
 }
@@ -274,7 +276,7 @@ class ipsCommand_default extends ipsCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function doExecute( ipsRegistry $registry )
 	{
@@ -285,7 +287,7 @@ class ipsCommand_default extends ipsCommand
 		// Uh oh, this is a big one.. (no forums app)
 		//-----------------------------------------
 
-		if ( ! file_exists( $filepath ) )
+		if ( ! is_file( $filepath ) )
 		{
 			print "�е найден файл команд " . ipsRegistry::$current_module;
 			exit();
diff --git a/upload/admin/setup/sources/base/ipsRegistry_setup.php b/upload/admin/setup/sources/base/ipsRegistry_setup.php
index cad18663..63af0079 100644
--- a/upload/admin/setup/sources/base/ipsRegistry_setup.php
+++ b/upload/admin/setup/sources/base/ipsRegistry_setup.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Registry class for setup
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-08-26 11:38:16 -0400 (Fri, 26 Aug 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6881 $
+ * @version		$Revision: 9420 $
  *
  */
 
@@ -171,7 +171,7 @@ class ipsRegistry
 	 * Custom destructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function __myDestruct()
 	{
@@ -188,7 +188,7 @@ class ipsRegistry
 	 * Initiate the registry
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public static function init()
 	{
@@ -198,15 +198,19 @@ class ipsRegistry
 		}
 
 		self::$initiated = TRUE;
+		
+		/* Log current upgrade step */
+		self::logUpgradeStep();
 
 		/* Load static classes */
-		require IPS_ROOT_PATH . "sources/base/core.php";
-		require IPS_ROOT_PATH . "setup/sources/base/setup.php";
+		require( IPS_ROOT_PATH . "sources/base/core.php" );/*noLibHook*/
+		require( IPS_ROOT_PATH . "sources/base/ipsMember.php" );/*noLibHook*/
+		require( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
 
 		/* Load conf global and set up DB */
 		if ( IPS_IS_UPGRADER )
 		{
-			if ( ! file_exists( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
+			if ( ! is_file( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
 			{
 				print "Файл " . DOC_IPS_ROOT_PATH . "conf_global.php не найден!";
 				exit();
@@ -236,7 +240,7 @@ class ipsRegistry
 				define( 'IPS_CACHE_PATH', DOC_IPS_ROOT_PATH );
 			}
 
-			require IPS_ROOT_PATH . "setup/sources/base/install.php";
+			require IPS_ROOT_PATH . "setup/sources/base/install.php";/*noLibHook*/
 		}
 
 		/* Input set up... */
@@ -299,7 +303,7 @@ class ipsRegistry
 				$file = '1xx.php';
 			}
 
-			require_once( IPS_ROOT_PATH . 'setup/sources/legacy/' . $file );
+			require_once( IPS_ROOT_PATH . 'setup/sources/legacy/' . $file );/*noLibHook*/
 			self::instance()->setClass( 'legacy', new upgradeLegacy( self::instance() ) );
 		}
 
@@ -310,7 +314,7 @@ class ipsRegistry
 		IPSSetUp::thawSavedData();
 
 		/* Gather other classes */
-		require_once( IPS_ROOT_PATH . 'setup/sources/classes/output/output.php' );
+		require_once( IPS_ROOT_PATH . 'setup/sources/classes/output/output.php' );/*noLibHook*/
 
 		self::instance()->setClass( 'output', new output( self::instance(), TRUE ) );
 
@@ -339,7 +343,7 @@ class ipsRegistry
 		else
 		{
 			# Installer locked?
-			if ( file_exists( DOC_IPS_ROOT_PATH . 'cache/installer_lock.php' ) )
+			if ( is_file( DOC_IPS_ROOT_PATH . 'cache/installer_lock.php' ) )
 			{
 				self::getClass('output')->setTitle( "У�тановка: Ошибка" );
 				self::getClass('output')->setNextAction( '' );
@@ -349,20 +353,33 @@ class ipsRegistry
 			}
 		}
 	}
+	
+	/**
+	 * Log the step we are in the upgrade routine
+	 */
+ 	static public function logUpgradeStep()
+ 	{
+ 		$_log	= date('r') . "\n";
+ 		$_log	.= $_SERVER['REQUEST_URI'] . "\n";
+ 		
+ 		$_filename	= "UPGRADE_LOG_" . date('d_m_Y') . '.cgi';
+ 		
+ 		file_put_contents( DOC_IPS_ROOT_PATH . 'cache/' . $_filename, $_log, FILE_APPEND );
+ 	}
 
 	/**
 	 * Load conf_global
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function loadConfGlobal()
 	{
 		/* Load config file */
-		if ( file_exists( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
+		if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
 		{
 			$INFO = array();
-			require DOC_IPS_ROOT_PATH . "conf_global.php";
+			require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 
 			if ( is_array( $INFO ) && count( $INFO ) )
 			{
@@ -378,7 +395,7 @@ class ipsRegistry
 	 * Set database handle
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setDBHandle()
 	{
@@ -391,7 +408,7 @@ class ipsRegistry
 	 *
 	 * @access	public
 	 * @param	string		Section key
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function autoLoadNextAction( $section )
 	{
@@ -400,7 +417,7 @@ class ipsRegistry
 
 		$_class = IPS_APP_COMPONENT . '_' . $section;
 
-		require_once( IPS_ROOT_PATH . 'setup/applications/' . IPS_APP_COMPONENT . '/sections/' . $section . '.php' );
+		require_once( IPS_ROOT_PATH . 'setup/applications/' . IPS_APP_COMPONENT . '/sections/' . $section . '.php' );/*noLibHook*/
 		$action = new $_class();
 		$action->makeRegistryShortcuts( self::instance() );
 		$action->doExecute( self::instance() );
@@ -416,7 +433,7 @@ class ipsRegistry
 	static public function readGlobalConfig()
 	{
 		/* Fetch core writeable files */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 
 		try
@@ -480,18 +497,50 @@ class ipsRegistry
 		return isset( self::$_config[ $key ] ) ? self::$_config[ $key ] : FALSE;
 	}
 
+	/**
+	 * Grab the app class file
+	 *
+	 * @param	string		$app	Application to check for app class
+	 * @return	mixed		Null if invalid or no app passed, otherwise app class object
+	 */
+	public static function getAppClass( $app='' )
+	{
+		if( !$app OR !is_string($app) )
+		{
+			return null;
+		}
+
+		# Load app class
+		if ( ! isset( self::$app_class[ $app ] ) )
+		{
+			self::$app_class[ $app ] = null;
+
+			$_file = IPSLib::getAppDir( $app ) . '/app_class_' . $app . '.php';
+			$_name = 'app_class_' . $app;
+
+			if ( is_file( $_file ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $_file, $_name, $app );
+				
+				self::$app_class[ $app ] = new $classToLoad( self::instance() );
+			}
+		}
+		
+		return self::$app_class[ $app ];
+	}
+
 	/**
 	 * Loads application's core variables (if required)
 	 *
 	 * @access	public
 	 * @param	string		App key (dir.. that's directory, not duuhr)
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function _loadCoreVariables()
 	{
 		if ( ! is_object( self::$_masterCoreVariables['__CLASS__'] ) )
 		{
-			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
+			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
 
 			/* Add handle */
 			self::$_masterCoreVariables['__CLASS__'] = new coreVariables();
@@ -542,15 +591,15 @@ class ipsRegistry
 	 *
 	 * @access	private
 	 * @param	string		App key (dir.. that's directory, not duuhr)
-	 * @return	void
+	 * @return	@e void
 	 */
 	static private function _loadAppCoreVariables( $appDir )
 	{
 		if ( ! isset( self::$_coreVariables[ $appDir ] ) )
 		{
-			if( file_exists( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' ) )
+			if( is_file( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' ) )
 			{
-				require( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' );
+				require( IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php' );/*noLibHook*/
 
 				/* Add caches */
 				self::$_coreVariables[ $appDir ]['cache']     = is_array( $CACHE ) ? $CACHE : array();
@@ -589,7 +638,7 @@ class ipsRegistry
 	 * @access	public
 	 * @param	string		Key
 	 * @param	object		Value
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setClass( $key='', $value='' )
 	{
@@ -632,24 +681,24 @@ class ipsRegistry
 					throw new Exception( "$key не �вл�ет�� объектом" );
 				break;
 				case 'class_captcha':
-					require_once( IPS_KERNEL_PATH . 'classCaptcha.php' );
+					require_once( IPS_KERNEL_PATH . 'classCaptcha.php' );/*noLibHook*/
 					self::$classes['class_captcha'] = new classCaptcha( self::instance() );
 				break;
 				case 'templateEngine':
-					require_once( IPS_KERNEL_PATH . 'classTemplateEngine.php' );
+					require_once( IPS_KERNEL_PATH . 'classTemplateEngine.php' );/*noLibHook*/
 					self::$classes['templateEngine'] = new classTemplate( IPS_ROOT_PATH . 'sources/template_plugins' );
 				break;
 				case 'class_localization':
-					require_once( IPS_ROOT_PATH    . 'sources/classes/class_localization.php' );
+					require_once( IPS_ROOT_PATH    . 'sources/classes/class_localization.php' );/*noLibHook*/
 					self::$classes['class_localization'] = new class_localization( self::instance() );
 				break;
 				case 'permissions':
-					require_once( IPS_ROOT_PATH    . 'sources/classes/class_public_permissions.php' );
+					require_once( IPS_ROOT_PATH    . 'sources/classes/class_public_permissions.php' );/*noLibHook*/
 					self::$classes['permissions'] = new classPublicPermissions( self::instance() );
 				break;
 				/* Yes I know this is forums app and not global, but it's still called so much this is a good idea */
 				case 'class_forums':
-					require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );
+					require_once( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php" );/*noLibHook*/
 					self::$classes['class_forums'] = new class_forums( self::instance() );
 					self::$classes['class_forums']->strip_invisible	= true;
 					self::$classes['class_forums']->forumsInit();
@@ -846,7 +895,7 @@ class ipsRegistry
 	 * Check to see if we are initialized
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function checkForInit()
 	{
@@ -861,7 +910,7 @@ class ipsRegistry
 	/**
 	 * Set up request redirect stuff
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 * @access	protected
 	 */
@@ -879,7 +928,7 @@ class ipsRegistry
 	/**
 	 * Set up settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 * @access	protected
 	 */
@@ -957,7 +1006,7 @@ class ipsRegistry
 	/**
 	 * Check caches
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 * @access	protected
 	 */
@@ -1000,13 +1049,49 @@ class ipsRegistry
 				}
 			}
 		}
+
+		$app_cache = self::$handles['caches']->getCache('app_cache');
+		
+		//-----------------------------------------
+		// Build app data and APP specific load requests
+		//-----------------------------------------
+
+		if( is_array($app_cache) AND count($app_cache) )
+		{
+			foreach( $app_cache as $_app_dir => $_app_data )
+			{
+				if ( !IPS_IS_TASK AND ( IPS_AREA == 'public' && ! $_app_data['app_public_title'] ) )
+				{
+					continue;
+				}
+	
+				$_app_data['app_public_title'] = ( $_app_data['app_public_title'] ) ? $_app_data['app_public_title'] : $_app_data['app_title'];
+				self::$applications[ $_app_dir ] = $_app_data;
+			}
+		}
+		
+		/* Sort by position */
+		uasort( self::$applications, 'ipsRegistry::_appPositionSort' );
+	}
+
+	/**
+	 * Sort by position
+	 *
+	 * @return	integer
+	 */
+	protected static function _appPositionSort( $a, $b )
+	{
+		$a['app_position'] = ( isset( $a['app_position'] ) ) ? $a['app_position'] : 0;
+		$b['app_position'] = ( isset( $b['app_position'] ) ) ? $b['app_position'] : 0;
+		
+		return ( $a['app_position'] > $b['app_position'] ) ? +1 : -1;
 	}
 }
 
 /**
  * ips_base_Registry
  *
- **/
+ */
 abstract class ips_base_Registry
 {
 	/**
@@ -1014,7 +1099,7 @@ abstract class ips_base_Registry
 	 *
 	 * @access	protected
 	 * @var		array
-	 **/
+	 */
 	protected $data_store = array();
 
 	/**
@@ -1025,7 +1110,7 @@ abstract class ips_base_Registry
 	 * @access	public
 	 * @param	mixed $key
 	 * @return	mixed
-	 **/
+	 */
 	protected function get( $key )
 	{
 		if( isset( $this->data_store[ $key ] ) )
@@ -1047,7 +1132,7 @@ abstract class ips_base_Registry
 	 * @param	mixed $key
 	 * @param	mixed $val
 	 * @return	mixed
-	 **/
+	 */
 	protected function set( $key, $val )
 	{
 		$this->data_store[ $key ] = $val;
@@ -1187,7 +1272,7 @@ class ips_DBRegistry extends ips_base_Registry
 	 * @access	public
 	 * @param	object	$db_driver	DB instance
 	 * @param	string	$key		Key of the db connection to check
-	 * @return	void
+	 * @return	@e void
 	 */
 
 	static function setDB( $db_driver, $key='' )
@@ -1200,7 +1285,7 @@ class ips_DBRegistry extends ips_base_Registry
 		/* Fix up settings */
 		if ( ! class_exists( 'dbMain' ) )
 		{
-			require_once ( IPS_KERNEL_PATH . 'classDb' . ucwords($db_driver) . ".php" );
+			require_once ( IPS_KERNEL_PATH . 'classDb' . ucwords($db_driver) . ".php" );/*noLibHook*/
 		}
 
 		$classname = "db_driver_" . $db_driver;
@@ -1290,7 +1375,7 @@ class ips_DBRegistry extends ips_base_Registry
 
 		IPSDebug::addMessage( "* Checking for query cache file: " . $file );
 
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
 			self::getDB( $key )->loadCacheFile( $file, $class, TRUE );
 			return TRUE;
@@ -1409,7 +1494,7 @@ class ips_CacheRegistry extends ips_base_Registry
 	 * Initialize class
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function init()
 	{
@@ -1423,8 +1508,8 @@ class ips_CacheRegistry extends ips_base_Registry
 
 				if( function_exists('eaccelerator_get') AND ipsRegistry::$settings['use_eaccelerator'] == 1 )
 				{
-					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-					require IPS_KERNEL_PATH.'classCacheEaccelerator.php';
+					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';/*noLibHook*/
+					require IPS_KERNEL_PATH.'classCacheEaccelerator.php';/*noLibHook*/
 					self::$cacheLib = new classCacheEaccelerator( ipsRegistry::$settings['board_url'] );
 				}
 
@@ -1434,8 +1519,8 @@ class ips_CacheRegistry extends ips_base_Registry
 
 				else if( function_exists('memcache_connect') AND ipsRegistry::$settings['use_memcache'] == 1 )
 				{
-					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-					require IPS_KERNEL_PATH.'classCacheMemcache.php';
+					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';/*noLibHook*/
+					require IPS_KERNEL_PATH.'classCacheMemcache.php';/*noLibHook*/
 					self::$cacheLib = new classCacheMemcache( ipsRegistry::$settings['board_url'], ipsRegistry::$settings );
 				}
 
@@ -1445,8 +1530,8 @@ class ips_CacheRegistry extends ips_base_Registry
 
 				else if( function_exists('xcache_get') AND ipsRegistry::$settings['use_xcache'] == 1 )
 				{
-					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-					require IPS_KERNEL_PATH.'classCacheXcache.php';
+					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';/*noLibHook*/
+					require IPS_KERNEL_PATH.'classCacheXcache.php';/*noLibHook*/
 					self::$cacheLib = new classCacheXcache( ipsRegistry::$settings['board_url'] );
 				}
 
@@ -1456,8 +1541,8 @@ class ips_CacheRegistry extends ips_base_Registry
 
 				else if( function_exists('apc_fetch') AND ipsRegistry::$settings['use_apc'] == 1 )
 				{
-					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-					require IPS_KERNEL_PATH.'classCacheApc.php';
+					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';/*noLibHook*/
+					require IPS_KERNEL_PATH.'classCacheApc.php';/*noLibHook*/
 					self::$cacheLib = new classCacheApc( ipsRegistry::$settings['board_url'] );
 				}
 
@@ -1467,8 +1552,8 @@ class ips_CacheRegistry extends ips_base_Registry
 
 				else if( ipsRegistry::$settings['use_diskcache'] == 1 )
 				{
-					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-					require IPS_KERNEL_PATH.'classCacheDiskcache.php';
+					require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';/*noLibHook*/
+					require IPS_KERNEL_PATH.'classCacheDiskcache.php';/*noLibHook*/
 					self::$cacheLib = new classCacheDiskcache( ipsRegistry::$settings['board_url'] );
 				}
 
@@ -1617,7 +1702,7 @@ class ips_CacheRegistry extends ips_base_Registry
 				}
 				else
 				{
-					if ( strstr( $temp_cache[$key], "a:" ) )
+					if ( is_string($temp_cache[$key]) AND strstr( $temp_cache[$key], "a:" ) !== false )
 					{
 						self::instance()->data_store[ $key ] = unserialize( $temp_cache[$key] );
 					}
@@ -1700,7 +1785,7 @@ class ips_CacheRegistry extends ips_base_Registry
 	 * @access	protected
 	 * @param	string	Cache Key
 	 * @param	mixed	Cache value (typically an array)
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function cacheSet( $key, $val )
 	{
@@ -1738,7 +1823,7 @@ class ips_CacheRegistry extends ips_base_Registry
 				}
 			}
 
-			ipsRegistry::DB()->no_escape_fields['cs_key'] = 1;
+			ipsRegistry::DB()->preventAddSlashes( array( 'cs_key' => 1 ) );
 
 			if ( $this->save_options['donow'] )
 			{
@@ -1803,16 +1888,22 @@ class ips_CacheRegistry extends ips_base_Registry
 	{
 		if ( ! in_array( $key, array_keys( self::instance()->data_store ) ) )
 		{
+			if ( IPS_IS_UPGRADER )
+			{
+				self::_loadCaches( array( $key ) );
+			}
+
 			$cache = self::instance()->data_store[ $key ];
 		}
 		else
 		{
-			$cache = self::instance()->get( $key );
+			$cache = self::instance()->data_store[ $key ];
 		}
 
 		return $cache;
 	}
 
+
 	/**
 	 * Fetch all the caches as a reference
 	 *
@@ -1830,7 +1921,7 @@ class ips_CacheRegistry extends ips_base_Registry
 	 * @access	public
 	 * @param	string	Cache key
 	 * @param	mixed	Cache value
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function updateCacheWithoutSaving( $key, $value )
 	{
@@ -1877,86 +1968,81 @@ class ips_CacheRegistry extends ips_base_Registry
 	 * @access	public
 	 * @param	string	Cache key
 	 * @param	string	Application
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function rebuildCache( $key, $app='' )
 	{
-		$app = IPSText::alphanumericalClean( $app );
-
+		/* INIT */
+		$app		= IPSText::alphanumericalClean( $app );
+		$_caches	= array();
+    
 		if( $app )
 		{
 			if ( $app == 'global' )
 			{
-				$CACHE = ipsRegistry::_fetchCoreVariables( 'cache' );
+				$_caches = ipsRegistry::_fetchCoreVariables( 'cache' );
 			}
 			else
 			{
-				$CACHE = ipsRegistry::_fetchAppCoreVariables( $app, 'cache' );
-			}
-
-			if ( $CACHE[ $key ] )
-			{
-				$file_to_check = $CACHE[ $key ]['recache_file'];
-
-				if ( $file_to_check AND is_file($file_to_check) AND file_exists( $file_to_check ) )
+				/* isset there is needed to prevent issues on applications installation */
+				if( isset( ipsRegistry::$applications[$app] ) && !IPSLib::appIsInstalled($app) )
 				{
-					$_class = $CACHE[ $key ]['recache_class'];
-					$_func  = $CACHE[ $key ]['recache_function'];
-
-					require_once( $file_to_check );
-
-					if( class_exists( $_class ) )
-					{
-						$recache =  new $_class( ipsRegistry::instance() );
-
-						if( method_exists( $recache, 'makeRegistryShortcuts' ) )
-						{
-							$recache->makeRegistryShortcuts( ipsRegistry::instance() );
-						}
-
-						$recache->$_func();
-					}
+					return;
 				}
+
+				$_caches = ipsRegistry::_fetchAppCoreVariables( $app, 'cache' );
 			}
 		}
 		else
 		{
-			try
+			/* Get all caches from all apps */
+			$_caches = ipsRegistry::_fetchCoreVariables( 'cache' );
+			
+			foreach( ipsRegistry::$applications as $appDir => $appData )
 			{
-				foreach( new DirectoryIterator( IPS_ROOT_PATH . 'applications' ) as $application )
+				$CACHE = ipsRegistry::_fetchAppCoreVariables( $appDir, 'cache' );
+				
+				if ( is_array( $CACHE ) )
 				{
-					if( $application->isDir() AND !$application->isDot() )
-					{
-						$CACHE = ipsRegistry::_fetchAppCoreVariables( IPS_APP_COMPONENT, 'cache' );
-            	
-						if ( is_array( $CACHE ) )
-						{
-							if ( $CACHE[ $key ] )
-							{
-								$file_to_check = $CACHE[ $key ]['recache_file'];
-            	
-								if ( $file_to_check AND file_exists( $file_to_check ) )
-								{
-									$_class = $CACHE[ $key ]['recache_class'];
-									$_func  = $CACHE[ $key ]['recache_function'];
-            	
-									require_once( $file_to_check );
-									$recache           =  new $_class( ipsRegistry::instance() );
-            	
-									if( method_exists( $recache, 'makeRegistryShortcuts' ) )
-									{
-										$recache->makeRegistryShortcuts( ipsRegistry::instance() );
-									}
-            	
-									$recache->$_func();
-								}
-            	
-								break;
-							}
-						}
-					}
+					$_caches = array_merge( $_caches, $CACHE );
 				}
-			} catch ( Exception $e ) {}
+			}
+		}
+		
+		/* Rebuild the cache, if found */
+		if( isset( $_caches[ $key ] ) )
+		{
+			$file_to_check = $_caches[ $key ]['recache_file'];
+
+			if ( $file_to_check AND is_file( $file_to_check ) )
+			{
+				$_func  = $_caches[ $key ]['recache_function'];
+				
+				/* Hackish way to check for action overloader */
+				if ( strpos( $file_to_check, '/modules_' ) !== FALSE )
+				{
+					$_class = IPSLib::loadActionOverloader( $file_to_check, $_caches[ $key ]['recache_class'] );
+				}
+				elseif ( $app )
+				{
+					$_class = IPSLib::loadLibrary( $file_to_check, $_caches[ $key ]['recache_class'], ($app == 'global') ? 'core' : $app );
+				}
+								
+				/* Fallback */
+				if ( !$_class )
+				{
+					$_class = $_caches[ $key ]['recache_class'];
+				}
+								
+				$recache = new $_class( ipsRegistry::instance() );
+
+				if( method_exists( $recache, 'makeRegistryShortcuts' ) )
+				{
+					$recache->makeRegistryShortcuts( ipsRegistry::instance() );
+				}
+
+				$recache->$_func();
+			}
 		}
 	}
 }
@@ -2171,7 +2257,7 @@ class ips_MemberRegistry extends ips_base_Registry
 	 * Destructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __myDestruct()
 	{
@@ -2181,7 +2267,7 @@ class ips_MemberRegistry extends ips_base_Registry
 	 * Our singleton INIT function
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected static function init()
 	{
@@ -2195,12 +2281,7 @@ class ips_MemberRegistry extends ips_base_Registry
 			{
 				foreach( array_reverse( explode( ',', my_getenv('HTTP_X_FORWARDED_FOR') ) ) as $x_f )
 				{
-					$x_f = trim($x_f);
-
-					if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $x_f ) )
-					{
-						$addrs[] = $x_f;
-					}
+					$addrs[] = trim($x_f);
 				}
 
 				$addrs[] = my_getenv('HTTP_CLIENT_IP');
@@ -2216,16 +2297,24 @@ class ips_MemberRegistry extends ips_base_Registry
 
 			foreach ( $addrs as $ip )
 			{
-				if ( $ip )
+				//-----------------------------------------
+				// IP v4
+				//-----------------------------------------
+				
+				if ( IPSLib::validateIPv4( $ip ) )
 				{
-					preg_match( "/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", $ip, $match );
-
-					self::instance()->ip_address = $match[1].'.'.$match[2].'.'.$match[3].'.'.$match[4];
-
-					if ( self::instance()->ip_address AND self::instance()->ip_address != '...' )
-					{
-						break;
-					}
+					self::instance()->ip_address	= $ip;
+					break;
+				}
+				
+				//-----------------------------------------
+				// IP v6
+				//-----------------------------------------
+				
+				else if ( IPSLib::validateIPv6( $ip ) )
+				{
+					self::instance()->ip_address = $ip;
+					break;
 				}
 			}
 
@@ -2233,7 +2322,7 @@ class ips_MemberRegistry extends ips_base_Registry
 			// Make sure we take a valid IP address
 			//-----------------------------------------
 
-			if ( ( ! self::instance()->ip_address OR self::instance()->ip_address == '...' ) AND ! isset( $_SERVER['SHELL'] ) AND $_SERVER['SESSIONNAME'] != 'Console' )
+			if ( !self::instance()->ip_address AND ! isset( $_SERVER['SHELL'] ) AND $_SERVER['SESSIONNAME'] != 'Console' )
 			{
 				print "�евозможно определить ваш IPv4 адре�";
 				exit();
@@ -2241,7 +2330,7 @@ class ips_MemberRegistry extends ips_base_Registry
 
 			if ( IPS_IS_UPGRADER )
 			{
-				require_once( IPS_ROOT_PATH . "setup/sources/classes/session/sessions.php" );
+				require_once( IPS_ROOT_PATH . "setup/sources/classes/session/sessions.php" );/*noLibHook*/
 
 				self::$session_class = new sessions();
 			}
@@ -2281,7 +2370,7 @@ class ips_MemberRegistry extends ips_base_Registry
 	 * @access	public
 	 * @param	string	Key
 	 * @param	mixed	Value
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setProperty( $key, $value )
 	{
@@ -2300,11 +2389,10 @@ class ips_MemberRegistry extends ips_base_Registry
 	}
 
 	/**
-	 * Set the current member
+	 * Set current member to the member ID specified
 	 *
-	 * @access	public
-	 * @param	int		Member ID
-	 * @return	void
+	 * @param	integer	Member ID
+	 * @return	@e void
 	 */
 	static public function setMember( $member_id )
 	{
@@ -2322,8 +2410,10 @@ class ips_MemberRegistry extends ips_base_Registry
 		if ( $member_id )
 		{
 			self::instance()->data_store = IPSMember::load( $member_id, 'extendedProfile,customFields,groups,itemMarkingStorage' );
+		}
 
-			if ( self::instance()->data_store['member_id'] )
+		/* Got a member ID? */
+		if ( !empty($member_id) && self::instance()->data_store['member_id'] )
 			{
 				self::setUpMember();
 
@@ -2334,22 +2424,11 @@ class ips_MemberRegistry extends ips_base_Registry
 			{
 				self::instance()->data_store = IPSMember::setUpGuest();
 
-				self::instance()->perm_id       = ( isset(self::instance()->data_store['org_perm_id']) AND self::instance()->data_store['org_perm_id'] ) ? self::instance()->data_store['org_perm_id'] : self::instance()->data_store['g_perm_id'];
-				self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
-
-				# Form hash
-				self::instance()->form_hash = md5("�той �трочки зде�ь нет");
-			}
-		}
-		else
-		{
-			self::instance()->data_store = IPSMember::setUpGuest();
-
-			self::instance()->perm_id       = ( isset(self::instance()->data_store['org_perm_id']) AND self::instance()->data_store['org_perm_id'] ) ? self::instance()->data_store['org_perm_id'] : self::instance()->data_store['g_perm_id'];
-			self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
+			self::instance()->perm_id       = !empty(self::instance()->data_store['org_perm_id']) ? self::instance()->data_store['org_perm_id'] : self::instance()->data_store['g_perm_id'];
+			self::instance()->perm_id_array = explode( ',', self::instance()->perm_id );
 
 			# Form hash
-			self::instance()->form_hash = md5("�той �трочки зде�ь нет");
+			self::instance()->form_hash = md5("this is only here to prevent it breaking on guests");
 		}
 
 		//-----------------------------------------
@@ -2469,7 +2548,7 @@ class ips_MemberRegistry extends ips_base_Registry
 	 * Set up a member
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setUpMember()
     {
@@ -2494,4 +2573,4 @@ class ips_MemberRegistry extends ips_base_Registry
 		self::instance()->perm_id       = ( isset(self::instance()->data_store['org_perm_id']) AND self::instance()->data_store['org_perm_id'] ) ? self::instance()->data_store['org_perm_id'] : self::instance()->data_store['g_perm_id'];
         self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
     }
-}
+}
\ No newline at end of file
diff --git a/upload/admin/setup/sources/base/setup.php b/upload/admin/setup/sources/base/setup.php
index 50f28cb7..ea2fccf2 100644
--- a/upload/admin/setup/sources/base/setup.php
+++ b/upload/admin/setup/sources/base/setup.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Static SETUP Classes for IP.Board 3
  *
  * These classes are not required as objects.
- * Last Updated: $Date: 2010-11-15 11:39:10 -0500 (Mon, 15 Nov 2010) $
+ * Last Updated: $Date: 2011-10-12 12:19:44 -0400 (Wed, 12 Oct 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 7185 $
+ * @version		$Revision: 9605 $
  *
  */
 
@@ -41,14 +41,7 @@ class IPSSetUp
 	 * @var	string
 	 */
 	const minDb_mysql		= '4.1.0';
-
-	/**
-	 * Min MSSQL Version
-	 *
-	 * @var	string
-	 */
-	const minDb_mssql		= '10.0.0';
-
+	
 	/**
 	 * Min PHP Version
 	 *
@@ -62,15 +55,7 @@ class IPSSetUp
 	 * @var	string
 	 */
 	const prefDb_mysql		= '5.0.0';
-
-	/**
-	 * Min MSSQL Version
-	 *
-	 * @var	string
-	 */
-	const prefDb_mssql		= '10.0.0';
-
-
+	
 	/**
 	 * Doc Char Set
 	 *
@@ -130,13 +115,51 @@ class IPSSetUp
 	 */
 	static public function is200plus()
 	{
+		//-----------------------------------------
+		// Check for cached value first
+		//-----------------------------------------
+		
+		if( defined('MAX_UPGRADE_VERSION_ID') )
+		{
+			if( MAX_UPGRADE_VERSION_ID < 20000 )
+			{
+				return FALSE;
+			}
+			else
+			{
+				return TRUE;
+			}
+		}
+
 		if ( ipsRegistry::DB()->checkForField( 'upgrade_id', 'upgrade_history' ) )
 		{
 			/* Now, this table is created in the first step between 1.3 and 2.0, so check for contents */
 			$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(upgrade_version_id) as max',
 			 												 'from'   => 'upgrade_history' ) );
 
-			if ( $test['max'] < 20000 )
+			if( $test['max'] )
+			{
+				$key	= $test['max'];
+			}
+			else
+			{
+				if ( self::is130plus() === TRUE )
+				{
+					$key = '10003';
+				}
+				else if ( self::is120plus() === TRUE )
+				{
+					$key = '10002';
+				}
+				else
+				{
+					$key = '10001';
+				}
+			}
+
+			define( 'MAX_UPGRADE_VERSION_ID', $key );
+
+			if ( $key < 20000 )
 			{
 				return FALSE;
 			}
@@ -300,10 +323,10 @@ class IPSSetUp
 				{
 					foreach( $data as $num )
 					{
-						if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
+						if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' ) )
 						{
-							$_class = 'version_class_' . $num;
-							require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );
+							$_class = 'version_class_' . $app . '_' . $num;
+							require_once( IPSLib::getAppDir( $app ) . '/setup/versions/upg_' . $num . '/version_class.php' );/*noLibHook*/
 						
 							$_tmp = new $_class( ipsRegistry::instance() );
 						
@@ -458,7 +481,7 @@ class IPSSetUp
 		/* Try and write the file */
 		if ( $sqlData AND @file_put_contents( $fileName, str_replace( "\n\n", "\n", $sqlData ) ) )
 		{
-			@chmod( $fileName, 0777 );
+			@chmod( $fileName, IPS_FILE_PERMISSION );
 			return $fileName;
 		}
 		else
@@ -498,6 +521,7 @@ class IPSSetUp
 	 * @access	public
 	 * @param	string		SQL Query
 	 * @param	string		SQL Prefix
+	 * @todo	We're not using MSSQL anymore, we should remove those preg_replace at some point or do we leave them if someone else writes MSSQL drivers?
 	 */
 	static public function addPrefixToQuery( $query, $prefix )
 	{
@@ -506,7 +530,9 @@ class IPSSetUp
 			/* Remove default ibf_ from < 3.0.0 files */
 			if ( strstr( $query, 'ibf' ) )
 			{
-				$query = preg_replace("/\sibf_(\S+?)([\s\.,]|$)/", " \\1\\2", $query);
+				// This strips the prefix (if it's ibf_) even when we manually add it.  I checked and none of the previous upgrade routines have 'ibf_' hardcoded in them
+				// so we need to not strip it automatically here otherwise anyone with ibf_ prefix will have issues.
+				//$query = preg_replace("/\sibf_(\S+?)([\s\.,]|$)/", " \\1\\2", $query);
 			}
 
 			$query = preg_replace( "#^CREATE TABLE(?:\s+?)?(\S+)#is"        , "CREATE TABLE "  . $prefix."\\1 ", $query );
@@ -515,6 +541,7 @@ class IPSSetUp
 			$query = preg_replace( "#^TRUNCATE TABLE(?:\s+?)?(\S+)(\s+?)?#i", "TRUNCATE TABLE ". $prefix."\\1 ", $query );
 			$query = preg_replace( "#^DELETE FROM(?:\s+?)?(\S+)(\s+?)?#i"   , "DELETE FROM "   . $prefix."\\1 ", $query );
 			$query = preg_replace( "#^INSERT INTO(?:\s+?)?(\S+)\s+?#i"      , "INSERT INTO "   . $prefix."\\1 ", $query );
+			//$query = preg_replace( "#^INSERT IGNORE INTO(?:\s+?)?(\S+)\s+?#i", "INSERT IGNORE INTO "   . $prefix."\\1 ", $query );
 			$query = preg_replace( "#^UPDATE(?:\s+?)?(\S+)\s+?#i"           , "UPDATE "        . $prefix."\\1 ", $query );
 			$query = preg_replace( "#^REPLACE INTO(?:\s+?)?(\S+)\s+?#i"     , "REPLACE INTO "  . $prefix."\\1 ", $query );
 			$query = preg_replace( "#^ALTER TABLE(?:\s+?)?(\S+)\s+?#i"      , "ALTER TABLE "   . $prefix."\\1 ", $query );
@@ -607,7 +634,7 @@ class IPSSetUp
 	
 							if ( $tmp > $from AND $tmp <= $to )
 							{
-								if ( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/' . $file . '/version_class.php' ) )
+								if ( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/' . $file . '/version_class.php' ) )
 								{
 									$classes[] = $tmp;
 								}
@@ -653,6 +680,7 @@ class IPSSetUp
 		$DBVersions  = self::fetchDbAppVersions( $app );
 		$tmp         = $DBVersions;
 		$key         = array_pop( $tmp );
+		$coreApps	= array( 'calendar', 'core' );
 
 		if ( ! $key OR ! count( $DBVersions ) )
 		{
@@ -664,13 +692,19 @@ class IPSSetUp
 
 				$key = intval( $_version['app_long_version'] );
 			}
-			else
+			else if( in_array( $app, $coreApps ) )
 			{
-				if ( ipsRegistry::DB()->checkForField( 'upgrade_id', 'upgrade_history' ) )
+				if( defined('MAX_UPGRADE_VERSION_ID') )
+				{
+					$key = MAX_UPGRADE_VERSION_ID;
+				}
+				else if ( ipsRegistry::DB()->checkForField( 'upgrade_id', 'upgrade_history' ) )
 				{
 					/* Now, this table is created in the first step between 1.3 and 2.0, so check for contents */
 					$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(upgrade_version_id) as max', 'from' => 'upgrade_history' ) );
 
+					define( 'MAX_UPGRADE_VERSION_ID', $test['max'] );
+					
 					$key = ( $test['max'] ) ? $test['max'] : '10003';
 				}
 				else if ( self::is130plus() === TRUE )
@@ -686,69 +720,72 @@ class IPSSetUp
 					$key = '10001';
 				}
 			}
-
-			/* Blog Version Check */
-			if( $app == 'blog' )
+			
+			if ( !$key )
 			{
-				if ( ipsRegistry::DB()->checkForField( 'blog_upgrade_id', 'blog_upgrade_history' ) )
+				/* Blog Version Check */
+				if( $app == 'blog' )
 				{
-					$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(blog_version_id) as max', 'from' => 'blog_upgrade_history' ) );
-					$key  = ( $test['max'] ) ? $test['max'] : $key;
+					if ( ipsRegistry::DB()->checkForField( 'blog_upgrade_id', 'blog_upgrade_history' ) )
+					{
+						$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(blog_version_id) as max', 'from' => 'blog_upgrade_history' ) );
+						$key  = ( $test['max'] ) ? $test['max'] : $key;
+					}
+					else
+					{
+						$key = 0;
+					}
 				}
-				else
+				/* Gallery Version Check */
+				else if( $app == 'gallery' )
 				{
-					$key = 0;
+					if ( ipsRegistry::DB()->checkForField( 'gallery_upgrade_id', 'gallery_upgrade_history' ) )
+					{
+						$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(gallery_version_id) as max', 'from' => 'gallery_upgrade_history' ) );
+						$key  = ( $test['max'] ) ? $test['max'] : $key;
+					}
+					else
+					{
+						$key = 0;
+					}
 				}
-			}
-			/* Gallery Version Check */
-			else if( $app == 'gallery' )
-			{
-				if ( ipsRegistry::DB()->checkForField( 'gallery_upgrade_id', 'gallery_upgrade_history' ) )
+				else if( $app == 'downloads' )
 				{
-					$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(gallery_version_id) as max', 'from' => 'gallery_upgrade_history' ) );
-					$key  = ( $test['max'] ) ? $test['max'] : $key;
+					if ( ipsRegistry::DB()->checkForField( 'idm_upgrade_id', 'idm_upgrade_history' ) )
+					{
+						$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(idm_version_id) as max', 'from' => 'idm_upgrade_history' ) );
+						$key  = ( $test['max'] ) ? $test['max'] : $key;
+					}
+					else
+					{
+						$key = 0;
+					}
 				}
-				else
+				else if( $app == 'ipchat' )
 				{
-					$key = 0;
+					if ( ipsRegistry::DB()->checkForTable( 'chat_log_archive' ) )
+					{
+						$_a	= array_keys( $XMLVersions );
+						$a	= array_shift( $_a );
+						$key  = ( $a ) ? $a : '11005';
+					}
+					else
+					{
+						$key = 0;
+					}
 				}
-			}
-			else if( $app == 'downloads' )
-			{
-				if ( ipsRegistry::DB()->checkForField( 'idm_upgrade_id', 'idm_upgrade_history' ) )
+				else if( $app == 'ccs' )
 				{
-					$test = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(idm_version_id) as max', 'from' => 'idm_upgrade_history' ) );
-					$key  = ( $test['max'] ) ? $test['max'] : $key;
-				}
-				else
-				{
-					$key = 0;
-				}
-			}
-			else if( $app == 'ipchat' )
-			{
-				if ( ipsRegistry::DB()->checkForTable( 'chat_log_archive' ) )
-				{
-					$_a	= array_keys( $XMLVersions );
-					$a	= array_shift( $_a );
-					$key  = ( $a ) ? $a : '11005';
-				}
-				else
-				{
-					$key = 0;
-				}
-			}
-			else if( $app == 'ccs' )
-			{
-				if ( ipsRegistry::DB()->checkForTable( 'ccs_pages' ) )
-				{
-					$_a	= array_keys( $XMLVersions );
-					$a	= array_shift( $_a );
-					$key  = ( $a ) ? $a : '20006';
-				}
-				else
-				{
-					$key = 0;
+					if ( ipsRegistry::DB()->checkForTable( 'ccs_pages' ) )
+					{
+						$_a	= array_keys( $XMLVersions );
+						$a	= array_shift( $_a );
+						$key  = ( $a ) ? $a : '20006';
+					}
+					else
+					{
+						$key = 0;
+					}
 				}
 			}
 		}
@@ -911,12 +948,12 @@ class IPSSetUp
 		$versions = array();
 
 		/* Fetch core writeable files */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 
 		try
 		{
-			if( !file_exists( IPSLib::getAppDir( $app ) . '/xml/versions.xml' ) )
+			if( !is_file( IPSLib::getAppDir( $app ) . '/xml/versions.xml' ) )
 			{
 				return false;
 			}
@@ -991,7 +1028,7 @@ class IPSSetUp
 			{
 				$_xmlFileSearch = str_replace( '{app}', $_app, $xmlFileSearch );
 
-				if ( ! file_exists( IPSLib::getAppDir( $_app ) . '/xml/' . $_xmlFileSearch ) )
+				if ( ! is_file( IPSLib::getAppDir( $_app ) . '/xml/' . $_xmlFileSearch ) )
 				{
 					continue;
 				}
@@ -1039,9 +1076,9 @@ class IPSSetUp
 		/**
 		 * Custom error checker routine...
 		 */
-		if( file_exists( IPSLib::getAppDir( $app ) . '/setup/versions/install/installCheck.php' ) )
+		if( is_file( IPSLib::getAppDir( $app ) . '/setup/versions/install/installCheck.php' ) )
 		{
-			require_once( IPSLib::getAppDir( $app ) . '/setup/versions/install/installCheck.php' );
+			require_once( IPSLib::getAppDir( $app ) . '/setup/versions/install/installCheck.php' );/*noLibHook*/
 			$checkerClass	= $app . '_installCheck';
 			
 			if( class_exists($checkerClass) )
@@ -1052,13 +1089,13 @@ class IPSSetUp
 		}
 
 		/* Got a file? */
-		if ( ! file_exists( $file ) )
+		if ( ! is_file( $file ) )
 		{
 			return $info;
 		}
 
 		/* Fetch app writeable files */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPSSetUp::charSet );
 
 		try
@@ -1077,7 +1114,7 @@ class IPSSetUp
 					{
 						if ( $data['dir'] )
 						{
-							if ( ! @mkdir( $_path, 0777, TRUE ) )
+							if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION, TRUE ) )
 							{
 								$info['notexist'][] = $_path;
 							}
@@ -1089,7 +1126,7 @@ class IPSSetUp
 					}
 					else if ( ! is_writeable( $_path ) )
 					{
-						if ( ! @chmod( $_path, 0777 ) )
+						if ( ! @chmod( $_path, is_dir( $_path ) ? IPS_FOLDER_PERMISSION : IPS_FILE_PERMISSION ) )
 						{
 							$info['notwrite'][] = $_path;
 						}
@@ -1120,21 +1157,22 @@ class IPSSetUp
 		$info = array();
 
 		/* Fetch core writeable files */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( $charset ? $charset : IPSSetUp::charSet );
 
 		try
 		{
-			if( file_exists( IPSLib::getAppDir( $app ) . '/xml/information.xml' ) )
+			if( is_file( IPSLib::getAppDir( $app ) . '/xml/information.xml' ) )
 			{
 				$xml->load( IPSLib::getAppDir( $app ) . '/xml/information.xml' );
             	
 				/* Fetch general information */
 				foreach( $xml->fetchElements( 'data' ) as $xmlelement )
 				{
-					$data = $xml->fetchElementsFromRecord( $xmlelement );
-            	
-					$info['name']				= $data['name'];
+					//TERANOTE: remove this code below after making sure it doesn't cause issues the new way
+					/*$data = $xml->fetchElementsFromRecord( $xmlelement );
+            		
+            		$info['name']				= $data['name'];
 					$info['title']				= $data['name'];
 					$info['author']				= $data['author'];
 					$info['description']		= $data['description'];
@@ -1142,7 +1180,15 @@ class IPSSetUp
 					$info['disabledatinstall']	= ( $data['disabledatinstall'] ) ? 1 : 0;
 					$info['key']				= $app;
 					$info['ipskey']				= $data['ipskey'];
-					$info['hide_tab']			= $data['hide_tab'];
+					$info['hide_tab']			= $data['hide_tab'];*/
+					
+					$info = $xml->fetchElementsFromRecord( $xmlelement );
+					
+					/* Sort some things */
+					$info['title']				= $info['name'];
+					$info['disabledatinstall']	= intval($info['disabledatinstall']);
+					$info['hide_tab']			= intval($info['hide_tab']);
+					$info['key']				= $app;
 				}
             	
 				/* Fetch template information */
@@ -1181,7 +1227,7 @@ class IPSSetUp
 		// No modules?
 		//-----------------------------------------
 		
-		if( !file_exists( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_modules.xml' ) )
+		if( !is_file( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_modules.xml' ) )
 		{
 			return array();
 		}
@@ -1191,7 +1237,7 @@ class IPSSetUp
 
 		try
 		{
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( $charset ? $charset : IPSSetUp::charSet );
 
 			$xml->load( IPSLib::getAppDir( $app ) . '/xml/' . $app . '_modules.xml' );
@@ -1251,7 +1297,7 @@ class IPSSetUp
 	 * @access	public
 	 * @param	string		Key
 	 * @param	string		Value
-	 * @return	void
+	 * @return	@e void
 	 */
 	static function setSavedData( $key, $value )
 	{
@@ -1293,7 +1339,7 @@ class IPSSetUp
 	 *
 	 * @access	public
 	 * @param	string		Raw data for thawing
-	 * @return	void
+	 * @return	@e void
 	 */
 	static function thawSavedData( $data='' )
 	{
@@ -1329,9 +1375,9 @@ class IPSSetUp
 		}
 		else
 		{
-			if ( file_exists( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
+			if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
 			{
-				require( DOC_IPS_ROOT_PATH . 'conf_global.php' );
+				require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 				return trim( $VAR );
 			}
 		}
@@ -1344,7 +1390,7 @@ class IPSSetUp
 	 *
 	 * @access	private
 	 * @param	string		Encoded data to write
-	 * @return	void
+	 * @return	@e void
 	 */
 	private static function _writeFreezerCache( $data )
 	{
@@ -1354,7 +1400,7 @@ class IPSSetUp
 		}
 		else
 		{
-			if ( file_exists( DOC_IPS_ROOT_PATH . 'conf_global.php' ) AND is_writeable( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
+			if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.php' ) AND is_writeable( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
 			{
 				$_data = file_get_contents( DOC_IPS_ROOT_PATH . 'conf_global.php' );
 
diff --git a/upload/admin/setup/sources/classes/index.html b/upload/admin/setup/sources/classes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/classes/index.html
+++ b/upload/admin/setup/sources/classes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sources/classes/output/index.html b/upload/admin/setup/sources/classes/output/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/classes/output/index.html
+++ b/upload/admin/setup/sources/classes/output/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sources/classes/output/output.php b/upload/admin/setup/sources/classes/output/output.php
index 3698aec4..7b87fdad 100644
--- a/upload/admin/setup/sources/classes/output/output.php
+++ b/upload/admin/setup/sources/classes/output/output.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Installer output methods
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-07-22 12:01:28 -0400 (Fri, 22 Jul 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6881 $
+ * @version		$Revision: 9305 $
  *
  */
 
@@ -186,7 +186,7 @@ class output
 	 * @access	public
 	 * @param	object	ipsRegistry reference
 	 * @param	bool	Whether to init
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $init=FALSE )
 	{
@@ -203,14 +203,14 @@ class output
 		if ( $init === TRUE )
 		{
 			/* Load 'template' */
-			require_once( IPS_ROOT_PATH . 'setup/templates/skin_setup.php' );
+			require_once( IPS_ROOT_PATH . 'setup/templates/skin_setup.php' );/*noLibHook*/
 			$this->template = new skin_setup( $registry );
 
 			/* Images URL */
-			$this->imageUrl = '../setup/public/images';
+			$this->imageUrl = '../setup/' . PUBLIC_DIRECTORY . '/images';
 
 			/* Fetch sequence data */
-			require_once( IPS_KERNEL_PATH . 'classXML.php' );
+			require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 			$xml    = new classXML( IPSSetUp::charSet );
 			$file   = ( IPS_IS_UPGRADER ) ? IPS_ROOT_PATH . 'setup/xml/upgrade_sequence.xml' : IPS_ROOT_PATH . 'setup/xml/sequence.xml';
 
@@ -240,7 +240,7 @@ class output
 
 			/* Set up URLs */
 			$this->settings['base_url']       = ( $this->settings['base_url'] ) ? $this->settings['base_url'] : IPSSetUp::getSavedData('install_url');
-			$this->settings['img_url_no_dir'] = $this->settings['base_url'] . '/public/style_images/';
+			$this->settings['img_url_no_dir'] = $this->settings['base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/';
 
 			/* Set Current Page */
 			$this->currentPage = ( $this->request['section'] ) ? $this->request['section'] : 'index';
@@ -303,13 +303,36 @@ class output
 			}
 		}
 	}
-
+	
+	/**
+	 * Keeps upgrader happy
+	 */
+	public function buildSEOUrl( $url, $type, $title, $template )
+	{
+	
+	}
+	
+	public function isLargeTouchDevice()
+	{
+		return false;
+	}
+	
+	public function isSmallTouchDevice()
+	{
+		return false;
+	}
+	
+	public function getReplacement()
+	{
+		
+	}
+	
 	/**
 	 * Add an message string
 	 *
 	 * @access	public
 	 * @param	string	Message
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addMessage( $string )
 	{
@@ -321,7 +344,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	string	Error
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addError( $string )
 	{
@@ -333,7 +356,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	string	Warning
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addWarning( $string )
 	{
@@ -368,7 +391,7 @@ class output
 	 * @access	public
 	 * @param	string		content to add
 	 * @param	boolean		Prepend isntead of append
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addContent( $content, $prepend=false )
 	{
@@ -388,7 +411,7 @@ class output
 	 * @access	public
 	 * @param	string		Current Human version
 	 * @param	string		App key
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setVersionAndApp( $version, $app )
 	{
@@ -402,7 +425,7 @@ class output
 	 * @access	public
 	 * @param	mixed		Current step
 	 * @param	int			Total steps
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setInstallStep( $current, $total )
 	{
@@ -414,7 +437,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	boolean		TRUE = hide button, FALSE = show button
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setHideButton( $hide=FALSE )
 	{
@@ -426,7 +449,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	string		action URL
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setNextAction( $url )
 	{
@@ -438,7 +461,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	string	Page title
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setTitle( $title )
 	{
@@ -453,7 +476,7 @@ class output
 	 * @param	string	Nav URL
 	 * @param	string	SEO title
 	 * @param	string	SEO template
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addNavigation( $title, $url, $seoTitle='', $seoTemplate='' )
 	{
@@ -465,7 +488,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	bool	Error yes/no
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setError( $boolean )
 	{
@@ -490,7 +513,6 @@ class output
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 * @todo 	[Future] Remove the legacy remapping in 3.1.  We will assume posts have been rebuilt by then.
 	 */
 	public function replaceMacros( $text )
 	{
@@ -504,19 +526,13 @@ class output
 		$text = str_replace( "{style_image_url}"	, $this->settings['img_url']  , $text );
 		$text = str_replace( "{style_images_url}"	, $this->settings['img_url']  , $text );
 
-		//-----------------------------------------
-		// Fix legacy emoticon/avatar/images links
-		//-----------------------------------------
-
-		$text = preg_replace( "#img\s+?src=([\"'])(?:{$this->settings['board_url']}[^\"']+?)?(?<!public%2F)style_(images|avatars|emoticons)([^\"']+?)[\"'](.+?)?".">#is", "img src=\\1".$this->settings['public_dir']."style_\\2\\3\\1\\4>", $text );
-
 		//-----------------------------------------
 		// Fix up IPB image url
 		//-----------------------------------------
 		
 		if ( $this->settings['ipb_img_url'] )
 		{
-			$text = preg_replace( "#img\s+?src=[\"']public/style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$this->settings['ipb_img_url']."public/style_\\1\\2\"\\3>", $text );
+			$text = preg_replace( "#img\s+?src=[\"']" . PUBLIC_DIRECTORY . "/style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"" . $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . "/style_\\1\\2\"\\3>", $text );
 		}
 
 		
@@ -528,7 +544,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	boolean		TRUE - freeze data, FALSE, do not.
-	 * @return	void	Nothin'
+	 * @return	@e void	Nothin'
 	 */
     public function sendOutput( $saveData=TRUE )
     {
@@ -596,45 +612,50 @@ class output
 	 * @param	string		SEO Title
 	 * @return	string		HTML to browser and exits
 	 */
-    public function redirectScreen( $text="", $url="", $seoTitle="" )
+    public function redirectScreen( $text="", $url="", $seoTitle="", $seoTemplate='' )
     {
-		//-----------------------------------------
-        // INIT
-        //-----------------------------------------
-
-		$this->_sendOutputSetUp( 'redirect' );
-
-		//-----------------------------------------
-		// Forcing silent redirects?
-		//-----------------------------------------
-
-		if ( $this->settings['ipb_remove_redirect_pages'] == 1 )
+    	/* Use new inline notifications */
+    	if ( ! defined('IPS_FORCE_HTML_REDIRECT') OR ! IPS_FORCE_HTML_REDIRECT )
     	{
-    		$this->silentRedirect( $url );
+    		$_SESSION['ips_InlineMessage'] = $text;
+    		$this->silentRedirect($url, $seoTitle, false, $seoTemplate );
     	}
-
-		//-----------------------------------------
-		// Gather output
-		//-----------------------------------------
-
-        $output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle ) );
-
-        //-----------------------------------------
-        // Check for SQL Debug
-        //-----------------------------------------
-
-        $this->_checkSQLDebug();
-
-		//-----------------------------------------
-		// Print it...
-		//-----------------------------------------
-
-		$this->outputFormatClass->printHeader();
-
-		print $output;
-
-		$this->outputFormatClass->finishUp();
-
+    	else
+    	{
+			//-----------------------------------------
+	        // INIT
+	        //-----------------------------------------
+	
+			$this->_sendOutputSetUp( 'redirect' );
+	
+			//-----------------------------------------
+			// Gather output
+			//-----------------------------------------
+	
+	        $output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle, 'seoTemplate' => $seoTemplate ) );
+			
+			$output = $this->templateHooks( $output );
+			
+	        //-----------------------------------------
+	        // Check for SQL Debug
+	        //-----------------------------------------
+	
+	        $this->_checkSQLDebug();
+	
+			//-----------------------------------------
+			// Print it...
+			//-----------------------------------------
+	
+			$this->outputFormatClass->printHeader();
+			
+			/* Remove unused hook comments */
+			$output = preg_replace( '#<!--hook\.([^\>]+?)-->#', '', $output );
+	
+			print $output;
+	
+			$this->outputFormatClass->finishUp();
+		}
+		
         exit;
     }
 
@@ -657,7 +678,7 @@ class output
 	 * @access	public
 	 * @param	string		Type of data to add: css, js, raw, rss, rsd, etc
 	 * @param	string		Data to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addToDocumentHead( $type, $data )
 	{
@@ -675,10 +696,10 @@ class output
 	{
 		$remapData = array();
 
-		if ( file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
+		if ( is_file( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
 		{
 			$REMAP = array();
-			require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );
+			require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );/*noLibHook*/
 
 			if ( is_array( $REMAP ) && count( $REMAP ) )
 			{
@@ -689,12 +710,9 @@ class output
 					{
 						if ( preg_match( "#^[a-zA-Z]#", $id ) )
 						{
-							if ( is_array( $REMAP['masterKeys'] ) )
+							if ( is_array( $REMAP['masterKeys'] ) AND in_array( $id, $REMAP['masterKeys'] ) )
 							{
-								if ( in_array( $id, $REMAP['masterKeys'] ) )
-								{
-									$_skin = array( 'set_id' => $id );
-								}
+								$_skin = array( 'set_id' => $id );
 							}
 							else
 							{
@@ -715,12 +733,9 @@ class output
 				/* IN DEV default */
 				if ( preg_match( "#^[a-zA-Z]#", $REMAP['inDevDefault'] ) )
 				{
-					if ( is_array( $REMAP['masterKeys'] ) )
+					if ( is_array( $REMAP['masterKeys'] ) AND in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
 					{
-						if ( in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
-						{
-							$_skin = array( 'set_id' => $REMAP['inDevDefault'] );
-						}
+						$_skin	= array( 'set_id' => $REMAP['inDevDefault'] );
 					}
 					else
 					{
@@ -737,18 +752,18 @@ class output
 				
 				/* Master keys */
 				$remapData['masterKeys'] = $REMAP['masterKeys'];
-				
+
+				/* Images */
+				$remapData['images'] = $REMAP['images'];
+
 				/* IN DEV export */
 				foreach( $REMAP['export'] as $id => $key )
 				{
 					if ( preg_match( "#^[a-zA-Z]#", $key ) )
 					{
-						if ( is_array( $REMAP['masterKeys'] ) )
+						if ( is_array( $REMAP['masterKeys'] ) AND in_array( $key, $REMAP['masterKeys'] ) )
 						{
-							if ( in_array( $key, $REMAP['masterKeys'] ) )
-							{
-								$_skin = array( 'set_id' => $key );
-							}
+							$_skin = array( 'set_id' => $key );
 						}
 						else
 						{
@@ -767,12 +782,12 @@ class output
 		}
 		else
 		{
-			$remapData = array( 'templates'    => array( 0 => 'master_skin' ),
-								'css'	       => array( 0 => 'master_css' ),
-								'inDevDefault' => 0 );
+			$remapData = array( 'templates'		=> array( 'root' => 'master_skin' ),
+								'css'			=> array( 'root' => 'master_css' ),
+								'inDevDefault'	=> 'root'
+							);
 		}
 
-
 		return $remapData;
 	}
 
@@ -808,5 +823,13 @@ class output
 		return array();
 	}
 
-
+	/**
+	 * Dummy method to prevent error in recache routines
+	 * 
+	 * @return	void
+	 */
+ 	public function getTemplate( $file )
+ 	{
+ 		return null;
+ 	}
 }
\ No newline at end of file
diff --git a/upload/admin/setup/sources/classes/session/index.html b/upload/admin/setup/sources/classes/session/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/classes/session/index.html
+++ b/upload/admin/setup/sources/classes/session/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sources/classes/session/sessions.php b/upload/admin/setup/sources/classes/session/sessions.php
index 0ba682e0..4bd56c18 100644
--- a/upload/admin/setup/sources/classes/session/sessions.php
+++ b/upload/admin/setup/sources/classes/session/sessions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Setup sessions class
- * Last Updated: $Date: 2010-07-14 05:39:08 -0400 (Wed, 14 Jul 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6647 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -75,7 +75,7 @@ class sessions extends ips_MemberRegistry
 	 * Authorize
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
     public function __construct()
     {
diff --git a/upload/admin/setup/sources/index.html b/upload/admin/setup/sources/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/index.html
+++ b/upload/admin/setup/sources/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sources/legacy/1xx.php b/upload/admin/setup/sources/legacy/1xx.php
index 3edcefcb..b76dbb80 100644
--- a/upload/admin/setup/sources/legacy/1xx.php
+++ b/upload/admin/setup/sources/legacy/1xx.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Version Specific Upgrade Functions
- * Last Updated: $Date: 2010-10-01 20:18:21 -0400 (Fri, 01 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6937 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,7 +31,7 @@ class upgradeLegacy
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
     public function __construct( ipsRegistry $registry )
     {
@@ -44,7 +44,7 @@ class upgradeLegacy
 		$this->caches     =& $this->registry->cache()->fetchCaches();
 		
 		//* Make sure tables exist that won't in pre 3.0 versions */
-		if ( file_exists( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
+		if ( is_file( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
 		{
 			/* Init vars */
 			$UPGRADE_HISTORY_TABLE		= '';
@@ -53,7 +53,7 @@ class upgradeLegacy
 			$UPGRADE_CSS_PREVIOUS		= '';
 			$UPGRADE_TEMPLATE_PREVIOUS	= '';
 			
-			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );
+			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );/*noLibHook*/
 			
 			$prefix = $this->registry->dbFunctions()->getPrefix();
 			
diff --git a/upload/admin/setup/sources/legacy/2xx.php b/upload/admin/setup/sources/legacy/2xx.php
index 826dd969..8c38754e 100644
--- a/upload/admin/setup/sources/legacy/2xx.php
+++ b/upload/admin/setup/sources/legacy/2xx.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Version Specific Upgrade Functions
- * Last Updated: $Date: 2010-10-01 20:18:21 -0400 (Fri, 01 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6937 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,7 +31,7 @@ class upgradeLegacy
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
     public function __construct( ipsRegistry $registry )
     {
@@ -44,7 +44,7 @@ class upgradeLegacy
 		$this->caches     =& $this->registry->cache()->fetchCaches();
 
 		/* Make sure tables exist that won't in pre 3.0 versions */
-		if ( file_exists( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
+		if ( is_file( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
 		{
 			/* Init vars */
 			$UPGRADE_TABLE_FIELD		= '';
@@ -52,7 +52,7 @@ class upgradeLegacy
 			$UPGRADE_CSS_PREVIOUS		= '';
 			$UPGRADE_TEMPLATE_PREVIOUS	= '';
 			
-			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );
+			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );/*noLibHook*/
 
 			$prefix = $this->registry->dbFunctions()->getPrefix();
 
diff --git a/upload/admin/setup/sources/legacy/3xx.php b/upload/admin/setup/sources/legacy/3xx.php
index 8e676ec2..95f23938 100644
--- a/upload/admin/setup/sources/legacy/3xx.php
+++ b/upload/admin/setup/sources/legacy/3xx.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Version Specific Upgrade Functions
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6881 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -31,7 +31,7 @@ class upgradeLegacy
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
     public function __construct( ipsRegistry $registry )
     {
@@ -44,7 +44,7 @@ class upgradeLegacy
 		$this->caches     =& $this->registry->cache()->fetchCaches();
 		
 		/* Make sure tables exist that won't in pre 3.0 versions */
-		if ( file_exists( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
+		if ( is_file( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' ) )
 		{
 			/* Init vars */
 			$UPGRADE_TABLE_FIELD		= '';
@@ -52,7 +52,7 @@ class upgradeLegacy
 			$UPGRADE_CSS_PREVIOUS		= '';
 			$UPGRADE_TEMPLATE_PREVIOUS	= '';
 			
-			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );
+			require( IPS_ROOT_PATH . 'setup/sql/ipb3_' . strtolower( ipsRegistry::$settings['sql_driver'] ) . '.php' );/*noLibHook*/
 			
 			$prefix = $this->registry->dbFunctions()->getPrefix();
 			
@@ -154,7 +154,7 @@ class upgradeLegacy
 	 */
 	public function authenticateLogIn( $username, $password )
 	{
-		require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
+		require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );/*noLibHook*/
     	$han_login 				  = new han_login( $this->registry );
     	$han_login->is_admin_auth = 1;
     	$han_login->init();
@@ -209,7 +209,7 @@ class upgradeLegacy
 	 */
 	public function fetchLogInForm()
 	{
-		require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
+		require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );/*noLibHook*/
     	$han_login 				  = new han_login( $this->registry );
     	$han_login->is_admin_auth = 1;
     	$han_login->init();
diff --git a/upload/admin/setup/sources/legacy/index.html b/upload/admin/setup/sources/legacy/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/sources/legacy/index.html
+++ b/upload/admin/setup/sources/legacy/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sql/index.html b/upload/admin/setup/sql/index.html
index 0752b7cc..bdf4e02e 100644
--- a/upload/admin/setup/sql/index.html
+++ b/upload/admin/setup/sql/index.html
@@ -6,6 +6,6 @@
 You have reached this Page in error, please use
 your back button to return to Invision Board.
 <hr>
-<a href="http://www.invisionboard.com/">Invision Power Board</a>
+<a href="http://www.invisionpower.com">Invision Power Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/sql/ipb3_mysql.php b/upload/admin/setup/sql/ipb3_mysql.php
index e1920df5..689b1625 100644
--- a/upload/admin/setup/sql/ipb3_mysql.php
+++ b/upload/admin/setup/sql/ipb3_mysql.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * SQL for upgrader
- * Last Updated: $Date: 2010-04-14 07:25:45 -0400 (Wed, 14 Apr 2010) $
+ * Last Updated: $Date: 2010-12-17 08:03:58 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6108 $
+ * @version		$Revision: 7446 $
  *
  */
 
diff --git a/upload/admin/setup/sql/mysql_install.php b/upload/admin/setup/sql/mysql_install.php
index 1593aebc..445d162e 100644
--- a/upload/admin/setup/sql/mysql_install.php
+++ b/upload/admin/setup/sql/mysql_install.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * SQL installation methods
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -49,7 +49,7 @@ class install_extra
 	 *
 	 * @access	public
 	 * @param	object	Registry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -65,7 +65,7 @@ class install_extra
 	 *
 	 * @access	public
 	 * @param	object	Registry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setDbPrefix( $prefix='' )
 	{
@@ -95,7 +95,7 @@ class install_extra
 	 *
 	 * @access	public
 	 * @param	string	Type of inserts to run
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function before_inserts_run( $type )
 	{
@@ -129,7 +129,7 @@ class install_extra
 	 *
 	 * @access	public
 	 * @param	string	Type of inserts to run
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function after_inserts_run( $type )
 	{
@@ -172,7 +172,7 @@ class install_extra
 	
 		if ( $this->prefix )
 		{
-			$query = preg_replace( "#^CREATE TABLE(?:\s+?)?(\S+?)#s", "CREATE TABLE " . $this->prefix."\\1", $query );
+			$query = preg_replace( "#^(CREATE TABLE\s+(?:IF NOT EXISTS\s+)?)(\S+?)#s", "\\1 " . $this->prefix."\\2", $query );
 			$query = preg_replace( "#^INSERT INTO(?:\s+?)?(\S+?)#s" , "INSERT INTO "  . $this->prefix."\\1" , $query );
 			$query = preg_replace( "#^REPLACE INTO(?:\s+?)?(\S+?)#s", "REPLACE INTO " . $this->prefix."\\1", $query );
 			$query = preg_replace( "#^ALTER TABLE(?:\s+?)?(\S+?)#s" , "ALTER TABLE "  . $this->prefix."\\1" , $query );
@@ -202,7 +202,7 @@ class install_extra
 		
 		if ( $this->prefix )
 		{
-			$query = preg_replace( "#^CREATE TABLE(?:\s+?)?(\S+?)#s", "CREATE TABLE " . $this->prefix."\\1", $query );
+			$query = preg_replace( "#^(CREATE TABLE\s+(?:IF NOT EXISTS\s+)?)(\S+?)#s", "\\1 " . $this->prefix."\\2", $query );
 			$query = preg_replace( "#^INSERT INTO(?:\s+?)?(\S+?)#s" , "INSERT INTO "  . $this->prefix."\\1" , $query );
 			$query = preg_replace( "#^REPLACE INTO(?:\s+?)?(\S+?)#s", "REPLACE INTO " . $this->prefix."\\1", $query );
 			$query = preg_replace( "#^ALTER TABLE(?:\s+?)?(\S+?)#s" , "ALTER TABLE "  . $this->prefix."\\1" , $query );
@@ -230,7 +230,7 @@ class install_extra
 		
 		if ( $this->prefix )
 		{
-			$query = preg_replace( "#^CREATE TABLE(?:\s+?)?(\S+?)#s", "CREATE TABLE " . $this->prefix."\\1", $query );
+			$query = preg_replace( "#^(CREATE TABLE\s+(?:IF NOT EXISTS\s+)?)(\S+?)#s", "\\1 " . $this->prefix."\\2", $query );
 			$query = preg_replace( "#^INSERT INTO(?:\s+?)?(\S+?)#s" , "INSERT INTO "  . $this->prefix."\\1" , $query );
 			$query = preg_replace( "#^REPLACE INTO(?:\s+?)?(\S+?)#s", "REPLACE INTO " . $this->prefix."\\1", $query );
 			$query = preg_replace( "#^ALTER TABLE(?:\s+?)?(\S+?)#s" , "ALTER TABLE "  . $this->prefix."\\1" , $query );
@@ -262,7 +262,7 @@ class install_extra
 	 * Save additional info from install form
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function install_form_process()
 	{
diff --git a/upload/admin/setup/templates/index.html b/upload/admin/setup/templates/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/templates/index.html
+++ b/upload/admin/setup/templates/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/templates/skin_setup.php b/upload/admin/setup/templates/skin_setup.php
index 9e80b7c2..9f54dbc9 100644
--- a/upload/admin/setup/templates/skin_setup.php
+++ b/upload/admin/setup/templates/skin_setup.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Setup skin file
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-09-27 21:33:45 -0400 (Tue, 27 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 6854 $
+ * @version		$Revision: 9556 $
  */
  
 class skin_setup extends output
@@ -28,7 +28,7 @@ class skin_setup extends output
  * Prevent our main destructor being called by this class
  *
  * @access	public
- * @return	void
+ * @return	@e void
  */
 public function __destruct()
 {
@@ -83,13 +83,49 @@ EOF;
 $IPBHTML .= <<<EOF
     <h3>Полезные ��ылки</h3>
     <ul id='links'>
-        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://bestcms.ws'>BESTCMS.WS - Форум вебма�теров!</a></li>
+        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://myipb.in/docs-ipb'>Документаци�</a></li>
+        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://hatynka.in'>Форум Hatynka.in</a></li>
     </ul>
 EOF;
 
 return $IPBHTML;
 }
 
+/**
+ * Show the page to manually run log query, with option to prune and run instead
+ *
+ * @access	public
+ * @return	string		HTML
+ */
+public function upgrade_manual_queries_logs( $queries, $id=1, $TABLE='' ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<h3>Пожалуй�та выполните �ледующие запро�ы прежде чем продолжить</h3>
+<div class='message unspecified'>
+	Вы можете <a href='index.php?app=upgrade&amp;section=upgrade&amp;s={$this->request['s']}&amp;do=appclass&amp;workact=logs{$id}&amp;pruneAndRun=1'>нажать зде�ь</a> чтобы очи�тить таблицу-журнал '{$TABLE}' и ма�тер �ам вне�ет изменени� в �труктуру
+	<br />
+	<b>ИЛИ</b> 
+	<br />
+	Запу�тите �ледующие запро�ы �ами:
+	<textarea style="width:100%; height: 300px">
+EOF;
+
+if ( $queries )
+{
+	$IPBHTML .= "\n" . $queries;
+}
+
+$IPBHTML .= <<<EOF
+	</textarea>
+</div>
+EOF;
+
+return $IPBHTML;
+}
+
 /**
  * Show the install start page
  *
@@ -199,8 +235,8 @@ EOF;
 			}
 			
 			$IPBHTML .= <<<EOF
-				<strong style='font-weight:bold; font-size:14px'>{$data['app']['name']} {$data['long']}</strong>
-				{$data['out']}
+				<strong style='font-weight:bold; font-size:15px'>{$data['app']['name']} {$data['long']}</strong>
+				{$data['out']}<br />
 EOF;
 		}
 	}
@@ -316,13 +352,13 @@ EOF;
 // for them so it's irrelevant
 //-----------------------------------------
 
-$img = file_exists( IPSLib::getAppDir( $key ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_url'] . '/' . CP_DIRECTORY . '/applications_addon/' . $type . '/' . $key . '/skin_cp/appIcon.png' : "../skin_cp/_newimages/applications/{$key}.png";
+$img = is_file( IPSLib::getAppDir( $key ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_url'] . '/' . CP_DIRECTORY . '/applications_addon/' . $type . '/' . $key . '/skin_cp/appIcon.png' : "../skin_cp/images/applications/{$key}.png";
 
 $IPBHTML .=  <<<EOF
 					<table style='width: 100%; border: 0px; padding:0px' cellspacing='0'>
 					<tr>
 						<td width='7%' valign='top' style='padding:4px'>
-							<input type='checkbox' name='apps[{$key}]' value='1' $_checked style="$_style" />
+							<input type='checkbox' name='apps[{$key}]' value='1' {$_checked} style="{$_style}" />
 						</td>
 						<td width='1%' valign='top' style='padding:4px'>
 							<img src='{$img}' />
@@ -336,7 +372,7 @@ $IPBHTML .=  <<<EOF
                 	</tr>
 					</table>
 EOF;
-				if ( isset( $notices[ $key ] ) )
+				if ( count( $notices[ $key ] ) )
 				{
 					$IPBHTML .= "<div class='warning'><ul>";
 					foreach ( $notices[ $key ] as $n )
@@ -627,7 +663,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 	<div class='message error'>
-		$msg
+		{$msg}
 	</div>
 EOF;
 
@@ -679,12 +715,13 @@ $IPBHTML .= <<<EOF
 	<br />
 
     <span class='done_text'>У�тановка завершена!</span><Br /><Br />
-    Поздравл�ем, <a href='../../index.php'>{$_productName}</a> Nulled by BESTCMS.WS у�тановлен и готов к и�пользованию! �иже приведено
+    Поздравл�ем, <a href='../../index.php'>{$_productName}</a> у�тановлен и готов к и�пользованию! �иже приведено
     не�колько полезных ��ылок.<br /><br /><br />
-    $extra
+    {$extra}
     <h3>Полезные ��ылки</h3>
     <ul id='links'>
-        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://bestcms.ws'>BESTCMS.WS - Форум вебма�теров!</a></li>
+        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://myipb.in/docs-ipb'>Документаци�</a></li>
+        <li><img src='{$this->registry->output->imageUrl}/link.gif' align='absmiddle' /> <a href='http://hatynka.in'>Форум Hatynka.in</a></li>
     </ul>
 EOF;
 
@@ -846,10 +883,10 @@ $IPBHTML = "";
 //--starthtml--//
 
 /* 'lil hack here */
-if ( file_exists( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
+if ( is_file( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
 {
 	$INFO = array();
-	require DOC_IPS_ROOT_PATH . "conf_global.php";
+	require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 
 	if ( is_array( $INFO ) && count($INFO) )
 	{
@@ -937,7 +974,7 @@ $IPBHTML .= <<<EOF
 			<tr>
                     <td width='30%' class='title'>SQL драйвер:</td>
                     <td width='70%' class='content'>
-                    	<select name='sql_driver' class='sql_form'>$_drivers</select>
+                    	<select name='sql_driver' class='sql_form'>{$_drivers}</select>
                     </td>
                 </tr>
             </table>
@@ -981,7 +1018,7 @@ $IPBHTML .= <<<EOF
 
 
 	<div class='eula'>
-	    $_eula        		 	                
+	    {$_eula}
     </div>
     <input type='checkbox' name='eula' id='eula'> <strong><label for='eula'>Я �огла�ен � Пользователь�ким Соглашением</label></strong>
 
@@ -996,6 +1033,43 @@ return $IPBHTML;
  * @access	public
  * @return	string		HTML
  */
+public function page_license( $error ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+if ( $error )
+{
+$IPBHTML .= <<<EOF
+	 <div class='message error'>{$error}</div>
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+	
+	<br />
+	<fieldset>
+     <legend>Ключ лицензии</legend>
+		<table style='width: 100%; border: 0px; padding:0px' cellspacing='0'>
+	      <tr>
+	          <td class='title'><b>Ключ</b></td>
+	          <td width='70%' class='content'><input type='text' class='sql_form' name='lkey' value='{$this->request['lkey']}'></td>
+	      </tr>
+	      <tr>
+	          <td colspan='2'><span style='color: gray'>Ввод ключа лицензии <span style='font-weight:bold'>не об�зателен</span> дл� продолжени� у�тановки. Вы можете вве�ти его позже.</span></td>
+	      </tr>
+	  	</table>
+	 </fieldset>
+	 <br />
+		
+	<div class='message unspecific note'>
+		Ключ - �то люба� комбинаци� �имволов.
+	</div>
+
+EOF;
+
+return $IPBHTML;
+}
 
 /**
  * Show the address info page
@@ -1083,13 +1157,13 @@ EOF;
 // for them so it's irrelevant
 //-----------------------------------------
 
-$img = file_exists( IPSLib::getAppDir( $key ) . '/skin_cp/appIcon.png' ) ? '../applications_addon/' . $type . '/' . $key . '/skin_cp/appIcon.png' : "../skin_cp/_newimages/applications/{$key}.png";
+$img = is_file( IPSLib::getAppDir( $key ) . '/skin_cp/appIcon.png' ) ? '../applications_addon/' . $type . '/' . $key . '/skin_cp/appIcon.png' : "../skin_cp/images/applications/{$key}.png";
 
 $IPBHTML .=  <<<EOF
 					<table style='width: 100%; border: 0px; padding:0px' cellspacing='0'>
 					<tr>
        		 	        <td width='5%' class='title'>
-							<input type='checkbox' name='apps[{$key}]' value='1' $_checked style="$_style" />
+							<input type='checkbox' name='apps[{$key}]' value='1' {$_checked} style="{$_style}" />
 						</td>
 						<td width='1%' valign='top' style='padding:4px'>
 							<img src='{$img}' />
@@ -1149,6 +1223,24 @@ $IPBHTML .= <<<EOF
     <div>
         Добро пожаловать в �и�тему у�тановки. Ма�тер у�тановки проведет ва� через ве�ь проце�� {$text}.
     </div>
+EOF;
+
+if( $text == 'upgrade' )
+{
+	$IPBHTML .= <<<EOF
+	<div class='message unspecific note'>
+		If you are not comfortable performing the upgrade yourself, please stop now and submit a technical support ticket so that our technicians can perform the upgrade for you.
+		<br /><br />
+		You should be certain that you have a complete database backup before proceeding.  By continuing, you are certifying that you have saved a database backup.
+	</div>
+	<br />
+EOF;
+}
+	
+$IPBHTML .= <<<EOF
+    <div class='message unspecific note'>
+    	Е�ли вам нужна помощь по работе � ма�тером у�тановки, то обратите�ь к <b>документации</b>.
+    </div>
 </div>
 <br />
 <div class='message unspecified'>
@@ -1316,11 +1408,12 @@ $IPBHTML .= <<<EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 	<head>
-		<title>У�тановщик IPS: $title</title>
+		<title>У�тановщик IPS: {$title}</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<style type='text/css' media='all'>
 			@import url('{$_cssPath}/install.css');
-		</style>	
+		</style>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />	
 	</head>
 	<body>
 		<p>&nbsp;</p>
@@ -1340,7 +1433,7 @@ EOF;
 if ( ! IPS_IS_UPGRADER )
 {
 	$IPBHTML .= <<<EOF
-
+					<p><a href='http://myipb.in/installation-guide' target='_blank'><b>Руковод�тво по у�тановке</b></a> &gt;</p>
 EOF;
 }
 
@@ -1397,7 +1490,7 @@ EOF;
 
 		foreach( $messages as $msg )
 		{
-			$IPBHTML .= "<p>$msg</p>\n";	
+			$IPBHTML .= "<p>{$msg}</p>\n";	
 		}
 		
  		$IPBHTML.= <<<EOF
@@ -1414,12 +1507,12 @@ EOF;
 
 		foreach( $errors as $msg )
 		{
-			$IPBHTML .= "<p>Ошибка: $msg</p>\n";
+			$IPBHTML .= "<p>Ошибка: {$msg}</p>\n";
 		}
 		
 		foreach( $warnings as $msg )
 		{
-			$IPBHTML .= "<p>Предупреждение: $msg</p>\n";
+			$IPBHTML .= "<p>Предупреждение: {$msg}</p>\n";
 		}
 		
 		
@@ -1526,7 +1619,7 @@ $errors = $this->registry->output->fetchWarnings();
 $HTML = <<<EOF
 <script type='text/javascript'>
 //<![CDATA[
-setTimeout("form_redirect()",2000);
+setTimeout("form_redirect()",100);
 
 function form_redirect()
 {
@@ -1597,21 +1690,9 @@ $IPBHTML = <<<EOF
         
         <b>Во�пользовать�� ин�трукци�ми по перекодированию базы данных через SSH</b>  
     </div>
-    
-    <div class='message unspecific'>      
-			<a href='http://wiki.iblink.ru/sources/db/mysqlcharsetconversion'>Ознакомить�� � ин�трукци�ми по перекодированию базы форума</a>
-    </div>
-
-    <div>
-        <br />
-        <b>Заказать у�лугу по конвертации базы форума в нашем <a href="http://external.iblink.ru/clientarea">клиент-центре</a>.
-		</b>
-		<br /><br />
-		По�ле того как ваша база будет в правильной кодировке, повторно запу�тите �крипт обновлени�.
-    </div>
 </div>
 EOF;
 return $IPBHTML;
 }
 
-}
+}
\ No newline at end of file
diff --git a/upload/admin/setup/xml/attachments.xml b/upload/admin/setup/xml/attachments.xml
index de9c6060..5bbe07b2 100644
--- a/upload/admin/setup/xml/attachments.xml
+++ b/upload/admin/setup/xml/attachments.xml
@@ -5,7 +5,6 @@
 			<atype_extension>aiff</atype_extension>
 			<atype_mimetype>audio/x-aiff</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/quicktime.gif</atype_img>
 		</attachtype>
 
@@ -13,7 +12,6 @@
 			<atype_extension>bmp</atype_extension>
 			<atype_mimetype>image/x-MS-bmp</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -21,7 +19,6 @@
 			<atype_extension>css</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/script.gif</atype_img>
 		</attachtype>
 
@@ -29,7 +26,6 @@
 			<atype_extension>doc</atype_extension>
 			<atype_mimetype>application/msword</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/doc.gif</atype_img>
 		</attachtype>
 
@@ -37,7 +33,6 @@
 			<atype_extension>gif</atype_extension>
 			<atype_mimetype>image/gif</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>1</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -45,7 +40,6 @@
 			<atype_extension>gz</atype_extension>
 			<atype_mimetype>application/x-gzip</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/zip.gif</atype_img>
 		</attachtype>
 
@@ -53,7 +47,6 @@
 			<atype_extension>hqx</atype_extension>
 			<atype_mimetype>application/mac-binhex40</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/stuffit.gif</atype_img>
 		</attachtype>
 
@@ -61,7 +54,6 @@
 			<atype_extension>htm</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/html.gif</atype_img>
 		</attachtype>
 
@@ -69,7 +61,6 @@
 			<atype_extension>html</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/html.gif</atype_img>
 		</attachtype>
 
@@ -77,7 +68,6 @@
 			<atype_extension>ico</atype_extension>
 			<atype_mimetype>image/ico</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -85,7 +75,6 @@
 			<atype_extension>jpeg</atype_extension>
 			<atype_mimetype>image/jpeg</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>1</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -93,7 +82,6 @@
 			<atype_extension>jpg</atype_extension>
 			<atype_mimetype>image/jpeg</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>1</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -101,7 +89,6 @@
 			<atype_extension>mov</atype_extension>
 			<atype_mimetype>video/quicktime</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/quicktime.gif</atype_img>
 		</attachtype>
 
@@ -109,7 +96,6 @@
 			<atype_extension>mp3</atype_extension>
 			<atype_mimetype>audio/x-mpeg</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/music.gif</atype_img>
 		</attachtype>
 
@@ -117,7 +103,6 @@
 			<atype_extension>mpg</atype_extension>
 			<atype_mimetype>video/mpeg</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/quicktime.gif</atype_img>
 		</attachtype>
 
@@ -125,7 +110,6 @@
 			<atype_extension>pdf</atype_extension>
 			<atype_mimetype>application/pdf</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/pdf.gif</atype_img>
 		</attachtype>
 
@@ -133,7 +117,6 @@
 			<atype_extension>php</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/php.gif</atype_img>
 		</attachtype>
 
@@ -141,7 +124,6 @@
 			<atype_extension>png</atype_extension>
 			<atype_mimetype>image/png</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>1</atype_photo>
 			<atype_img>style_extra/mime_types/gif.gif</atype_img>
 		</attachtype>
 
@@ -149,7 +131,6 @@
 			<atype_extension>ppt</atype_extension>
 			<atype_mimetype>application/powerpoint</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/ppt.gif</atype_img>
 		</attachtype>
 
@@ -157,7 +138,6 @@
 			<atype_extension>ps</atype_extension>
 			<atype_mimetype>application/postscript</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/eps.gif</atype_img>
 		</attachtype>
 
@@ -165,7 +145,6 @@
 			<atype_extension>ram</atype_extension>
 			<atype_mimetype>audio/x-pn-realaudio</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/real_audio.gif</atype_img>
 		</attachtype>
 
@@ -173,7 +152,6 @@
 			<atype_extension>rtf</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/rtf.gif</atype_img>
 		</attachtype>
 
@@ -181,7 +159,6 @@
 			<atype_extension>swf</atype_extension>
 			<atype_mimetype>application/x-shockwave-flash</atype_mimetype>
 			<atype_post>0</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/quicktime.gif</atype_img>
 		</attachtype>
 
@@ -189,7 +166,6 @@
 			<atype_extension>tar</atype_extension>
 			<atype_mimetype>application/x-tar</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/zip.gif</atype_img>
 		</attachtype>
 
@@ -197,7 +173,6 @@
 			<atype_extension>tiff</atype_extension>
 			<atype_mimetype>image/tiff</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/quicktime.gif</atype_img>
 		</attachtype>
 
@@ -205,7 +180,6 @@
 			<atype_extension>txt</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/txt.gif</atype_img>
 		</attachtype>
 
@@ -213,7 +187,6 @@
 			<atype_extension>viv</atype_extension>
 			<atype_mimetype>video/vivo</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/win_player.gif</atype_img>
 		</attachtype>
 
@@ -221,7 +194,6 @@
 			<atype_extension>wav</atype_extension>
 			<atype_mimetype>audio/x-wav</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/music.gif</atype_img>
 		</attachtype>
 
@@ -229,7 +201,6 @@
 			<atype_extension>wmv</atype_extension>
 			<atype_mimetype>video/x-ms-wmv</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/win_player.gif</atype_img>
 		</attachtype>
 
@@ -237,7 +208,6 @@
 			<atype_extension>xml</atype_extension>
 			<atype_mimetype>unknown/unknown</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/script.gif</atype_img>
 		</attachtype>
 
@@ -245,7 +215,6 @@
 			<atype_extension>zip</atype_extension>
 			<atype_mimetype>application/zip</atype_mimetype>
 			<atype_post>1</atype_post>
-			<atype_photo>0</atype_photo>
 			<atype_img>style_extra/mime_types/zip.gif</atype_img>
 		</attachtype>
 	</attachtypesgroup>
diff --git a/upload/admin/setup/xml/config.xml b/upload/admin/setup/xml/config.xml
index 654beaf0..5148be02 100644
--- a/upload/admin/setup/xml/config.xml
+++ b/upload/admin/setup/xml/config.xml
@@ -2,15 +2,15 @@
 <installdata>
 	<package>
 		<name>Invision Power Board</name>
-		<version>3.1</version>
-		<versionlong>31000</versionlong>
+		<version>3.2</version>
+		<versionlong>32000</versionlong>
 		<build>1134742970</build>
 		<license>Invision Power Services, Inc.
 Invision Power Board Software
 End User License Agreement (Version 3.x)
 
 LICENSE
-Invision Power Services (IPS) grants you a non-exclusive license to use the Software on one installation to be accessable by one URL (web address) subject to the provisions in all sections of this Agreement.
+Invision Power Services (IPS) grants you a non-exclusive license to use the Software on one installation to be accessible by one URL (web address) subject to the provisions in all sections of this Agreement.
 
 TERM
 Invision Power Board is offered under unique licensing. License terms are defined at the time of purchase and may or may not include technical support. License terms expire after a six month initial term. At the end of this term, the current installed copy of the software may continue to be used under the terms of this Agreement. Unless renewed under the terms of the license purchased at the end of six months, IPS will not provide technical support or upgrades to the software.
@@ -58,6 +58,6 @@ GOVERNING LAW
 This Agreement shall be governed by the Laws of the Commonwealth of Virginia and the Laws of the United States of America. Any action in regard to this Agreement or arising out of its terms and conditions shall be instituted and litigated in the Circuit Court of Bedford County. Each of the parties consents to jurisdiction in such Court and agrees that service of process as provided by the states and rules of civil procedures of the Commonwealth of Virginia shall be sufficient.
 
 MANUFACTURER
-Invision Power Services, Inc., PO Box 2365, Forest, VA 24551. For questions, write to the above address, email info@invisionpower.com, or call +1 804-200-5695.</license>
+Invision Power Services, Inc., PO Box 2365, Forest, VA 24551. For questions, write to the above address or call +1 804-200-5695.</license>
 	</package>
 </installdata>
\ No newline at end of file
diff --git a/upload/admin/setup/xml/groups.xml b/upload/admin/setup/xml/groups.xml
index 35a010a6..d8c911cc 100644
--- a/upload/admin/setup/xml/groups.xml
+++ b/upload/admin/setup/xml/groups.xml
@@ -7,7 +7,6 @@
 			<g_mem_info>1</g_mem_info>
 			<g_other_topics>1</g_other_topics>
 			<g_use_search>1</g_use_search>
-			<g_email_friend>0</g_email_friend>
 			<g_edit_profile>0</g_edit_profile>
 			<g_post_new_topics>0</g_post_new_topics>
 			<g_reply_own_topics>0</g_reply_own_topics>
@@ -28,7 +27,6 @@
 			<g_avoid_flood>0</g_avoid_flood>
 			<g_icon></g_icon>
 			<g_attach_max>0</g_attach_max>
-			<g_avatar_upload>0</g_avatar_upload>
 			<prefix></prefix>
 			<suffix></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -42,7 +40,6 @@
 			<g_photo_max_vars>50:150:150</g_photo_max_vars>
 			<g_dohtml>0</g_dohtml>
 			<g_edit_topic>0</g_edit_topic>
-			<g_email_limit>10:15</g_email_limit>
 			<g_bypass_badwords>0</g_bypass_badwords>
 			<g_can_msg_attach>0</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
@@ -73,7 +70,6 @@
 			<g_mem_info>1</g_mem_info>
 			<g_other_topics>1</g_other_topics>
 			<g_use_search>1</g_use_search>
-			<g_email_friend>0</g_email_friend>
 			<g_edit_profile>0</g_edit_profile>
 			<g_post_new_topics>1</g_post_new_topics>
 			<g_reply_own_topics>1</g_reply_own_topics>
@@ -94,7 +90,6 @@
 			<g_avoid_flood>0</g_avoid_flood>
 			<g_icon></g_icon>
 			<g_attach_max>-1</g_attach_max>
-			<g_avatar_upload>0</g_avatar_upload>
 			<prefix></prefix>
 			<suffix></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -108,7 +103,6 @@
 			<g_photo_max_vars>50:150:150</g_photo_max_vars>
 			<g_dohtml>0</g_dohtml>
 			<g_edit_topic>0</g_edit_topic>
-			<g_email_limit>10:15</g_email_limit>
 			<g_bypass_badwords>0</g_bypass_badwords>
 			<g_can_msg_attach>0</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
@@ -138,7 +132,6 @@
 			<g_mem_info>1</g_mem_info>
 			<g_other_topics>1</g_other_topics>
 			<g_use_search>1</g_use_search>
-			<g_email_friend>1</g_email_friend>
 			<g_edit_profile>1</g_edit_profile>
 			<g_post_new_topics>1</g_post_new_topics>
 			<g_reply_own_topics>1</g_reply_own_topics>
@@ -159,7 +152,6 @@
 			<g_avoid_flood>0</g_avoid_flood>
 			<g_icon></g_icon>
 			<g_attach_max>500</g_attach_max>
-			<g_avatar_upload>1</g_avatar_upload>
 			<prefix></prefix>
 			<suffix></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -173,7 +165,6 @@
 			<g_photo_max_vars>50:150:150</g_photo_max_vars>
 			<g_dohtml>0</g_dohtml>
 			<g_edit_topic>1</g_edit_topic>
-			<g_email_limit>10:15</g_email_limit>
 			<g_bypass_badwords>0</g_bypass_badwords>
 			<g_can_msg_attach>0</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
@@ -203,7 +194,6 @@
 			<g_mem_info>1</g_mem_info>
 			<g_other_topics>1</g_other_topics>
 			<g_use_search>1</g_use_search>
-			<g_email_friend>1</g_email_friend>
 			<g_edit_profile>1</g_edit_profile>
 			<g_post_new_topics>1</g_post_new_topics>
 			<g_reply_own_topics>1</g_reply_own_topics>
@@ -224,7 +214,6 @@
 			<g_avoid_flood>1</g_avoid_flood>
 			<g_icon>public/style_extra/team_icons/admin.png</g_icon>
 			<g_attach_max>0</g_attach_max>
-			<g_avatar_upload>1</g_avatar_upload>
 			<prefix><![CDATA[<span style='color:red;'>]]></prefix>
 			<suffix><![CDATA[</span>]]></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -238,7 +227,6 @@
 			<g_photo_max_vars>500:170:240</g_photo_max_vars>
 			<g_dohtml>1</g_dohtml>
 			<g_edit_topic>1</g_edit_topic>
-			<g_email_limit>10000:0</g_email_limit>
 			<g_bypass_badwords>1</g_bypass_badwords>
 			<g_can_msg_attach>1</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
@@ -268,7 +256,6 @@
 			<g_mem_info>0</g_mem_info>
 			<g_other_topics>0</g_other_topics>
 			<g_use_search>0</g_use_search>
-			<g_email_friend>0</g_email_friend>
 			<g_edit_profile>0</g_edit_profile>
 			<g_post_new_topics>0</g_post_new_topics>
 			<g_reply_own_topics>0</g_reply_own_topics>
@@ -289,7 +276,6 @@
 			<g_avoid_flood>0</g_avoid_flood>
 			<g_icon></g_icon>
 			<g_attach_max>0</g_attach_max>
-			<g_avatar_upload>0</g_avatar_upload>
 			<prefix></prefix>
 			<suffix></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -303,7 +289,6 @@
 			<g_photo_max_vars>50:150:150</g_photo_max_vars>
 			<g_dohtml>0</g_dohtml>
 			<g_edit_topic>0</g_edit_topic>
-			<g_email_limit>10:15</g_email_limit>
 			<g_bypass_badwords>0</g_bypass_badwords>
 			<g_can_msg_attach>0</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
@@ -333,7 +318,6 @@
 			<g_mem_info>1</g_mem_info>
 			<g_other_topics>1</g_other_topics>
 			<g_use_search>1</g_use_search>
-			<g_email_friend>1</g_email_friend>
 			<g_edit_profile>1</g_edit_profile>
 			<g_post_new_topics>1</g_post_new_topics>
 			<g_reply_own_topics>1</g_reply_own_topics>
@@ -354,7 +338,6 @@
 			<g_avoid_flood>0</g_avoid_flood>
 			<g_icon>public/style_extra/team_icons/staff.png</g_icon>
 			<g_attach_max>500</g_attach_max>
-			<g_avatar_upload>1</g_avatar_upload>
 			<prefix></prefix>
 			<suffix></suffix>
 			<g_max_messages>50</g_max_messages>
@@ -368,7 +351,6 @@
 			<g_photo_max_vars>50:150:150</g_photo_max_vars>
 			<g_dohtml>0</g_dohtml>
 			<g_edit_topic>1</g_edit_topic>
-			<g_email_limit>10:15</g_email_limit>
 			<g_bypass_badwords>0</g_bypass_badwords>
 			<g_can_msg_attach>0</g_can_msg_attach>
 			<g_attach_per_post>0</g_attach_per_post>
diff --git a/upload/admin/setup/xml/index.html b/upload/admin/setup/xml/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/setup/xml/index.html
+++ b/upload/admin/setup/xml/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/setup/xml/requiredextensions.php b/upload/admin/setup/xml/requiredextensions.php
index e5bad340..4e6ee0e0 100644
--- a/upload/admin/setup/xml/requiredextensions.php
+++ b/upload/admin/setup/xml/requiredextensions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Some required extensions to check for
- * Last Updated: $Date: 2010-07-20 12:57:40 -0400 (Tue, 20 Jul 2010) $
+ * Last Updated: $Date: 2010-12-17 08:03:58 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st December 2008
- * @version		$Revision: 6682 $
+ * @version		$Revision: 7446 $
  *
  */
  
diff --git a/upload/admin/setup/xml/sequence.xml b/upload/admin/setup/xml/sequence.xml
index a78ea2c8..63a848c9 100644
--- a/upload/admin/setup/xml/sequence.xml
+++ b/upload/admin/setup/xml/sequence.xml
@@ -20,6 +20,11 @@
 		<menu>�дре�а</menu>
 		<position>3</position>
 	</action>
+	<action>
+		<file>license</file>
+		<menu>Лицензи�</menu>
+		<position>4</position>
+	</action>
 	<action>
 		<file>db</file>
 		<menu>Данные БД</menu>
diff --git a/upload/admin/setup/xml/skins/index.html b/upload/admin/setup/xml/skins/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/setup/xml/skins/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/setup/xml/skins/replacements_mobile.xml b/upload/admin/setup/xml/skins/replacements_mobile.xml
new file mode 100644
index 00000000..7eec01e1
--- /dev/null
+++ b/upload/admin/setup/xml/skins/replacements_mobile.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<replacements>
+  <replacement>
+    <replacement_key>f_read</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_read.png' alt='{lang:macro__readf}' title='{lang:macro__readf}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_redirect</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_redirect.png' alt='{lang:macro__redirect}' title='{lang:macro__redirect}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_unread.png' alt='{lang:macro__unreadf}' title='{lang:macro__markread}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>msg_deleted</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/cross.png' title='{lang:macro__deletedmsg}' alt='*' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>msg_icon</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/pm_nonew.png' title='{lang:macro__nonewmsg}' alt='*' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>msg_icon_new</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/pm_new.png' title='{lang:macro__newmsg}' alt='*' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>openid_small</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/openid.gif' alt='{lang:macro__openidicon}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>snapback</replacement_key>
+    <replacement_content><![CDATA[&nbsp;]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_announcement</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_announcement.png' alt='{lang:announce_row}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_closed</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_locked.png' alt='{lang:pm_locked}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_moved</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_moved.png' alt='{lang:pm_moved}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_read_dot</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_read_dot.png' alt='{lang:you_posted_here}' title='{lang:you_posted_here}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:pm_open_new}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_unread_dot</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread_dot.png' alt='{lang:you_posted_here}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>mobile</replacement_master_key>
+  </replacement>
+</replacements>
diff --git a/upload/admin/setup/xml/skins/replacements_root.xml b/upload/admin/setup/xml/skins/replacements_root.xml
new file mode 100644
index 00000000..0f788b9a
--- /dev/null
+++ b/upload/admin/setup/xml/skins/replacements_root.xml
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<replacements>
+  <replacement>
+    <replacement_key>add_folder</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder_add.png' alt='{lang:add_folder}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>add_friend</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/user_add.png' alt='{lang:add_friend}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>add_poll_choice</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/add.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>add_poll_question</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/add.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_add_entry</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/book_add.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_banish</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_delete.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_blocks</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_add.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_blog</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_category</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='-' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_comments</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/comments.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_comments_new</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/comments_new.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_editor</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_editor.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_group</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_group.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_header</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_header.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_link</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/book_open.png' alt='{lang:view_blog}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_locked</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/lock.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_option</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/option.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_owner</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_owner.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_privateclub</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_privateclub.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_rss_import</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/rss-import.png' alt='' title='{lang:entry_imported_from_rss}' data-tooltip='{lang:entry_imported_from_rss}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>blog_theme</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/blog/palette.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>close_poll_form</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/accept.png' alt='x' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>compose_icon</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/note_add.png' alt='{lang:macro__compose}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>display_name</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/display_name.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>dropdown</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/dropdown.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>edit_folder</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder_edit.png' alt='{lang:edit_folders}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>find_icon</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/magnifier.png' alt='{lang:macro__compose}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>find_topics_link</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/page_topic_magnify.png' alt='{lang:find_topics}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_delete</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='{lang:delete_folder_title}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_drafts</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_empty</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bin.png' alt='{lang:empty_folder_title}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_finished</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_generic</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_myconvo</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/email_go.png' alt='{lang:macro__myconvo}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>folder_new</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder_page.png' alt='{lang:macro__new}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_cat_read</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_read.png' alt='{lang:macro__readcat}' title='{lang:macro__readcat}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_cat_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_unread.png' alt='{lang:macro__unreadcat}' title='{lang:macro__markread}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_nav_sep</replacement_key>
+    <replacement_content>{lang:_rarr}</replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_newpost</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/new_post.png' alt='' title='{lang:first_unread_post}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_pass_read</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_read.png' alt='{lang:macro__readpw}' title='{lang:macro__readpw}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_pass_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_unread.png' alt='{lang:macro__unreadpw}' title='{lang:macro__markread}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_read</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_read.png' alt='{lang:macro__readf}' title='{lang:macro__readf}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_redirect</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_redirect.png' alt='{lang:macro__redirect}' title='{lang:macro__redirect}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>f_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/f_unread.png' alt='{lang:macro__unreadf}' title='{lang:macro__markread}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>galery_album_edit</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/folder_edit.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>gallery_album_delete</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='-' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>gallery_image</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/image_add.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>gallery_link</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/picture.png' alt='{lang:view_gallery}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>gallery_slideshow</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/pictures.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>generic_cog</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/cog.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lim_facebook</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/facebook.png' alt='{lang:lim_facebook}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lim_openid</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/openid.png' alt='{lang:lim_openid}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lim_twitter</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/twitter.png' alt='{lang:lim_twitter}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lim_windows</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/windows.png' alt='{lang:lim_windows}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lim_vkontakte</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/vkontakte.png' alt='{lang:lim_vkontakte}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>live_large</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/live.gif' alt='{lang:macro__liveicon}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>live_small</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/live.gif' alt='{lang:macro__liveicon}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>lock_icon</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/lock.png' alt='{lang:pm_locked}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>logo_img</replacement_key>
+    <replacement_content>{style_image_url}/logo.png</replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>mini_rate_off</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star_off.png' alt='-' class='mini_rate' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>mini_rate_on</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star.png' alt='*' class='mini_rate' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>openid_large</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/openid_logo.png' alt='{lang:macro__openidlogo}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>openid_small</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/openid.gif' alt='{lang:macro__openidicon}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>pip_pip</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_black.png' alt='{lang:macro__pip}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>popular_post</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/star_big.png' alt='*' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>post_attach_link</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/attachicon.gif'	alt='{lang:macro__attachment}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>rate_off</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/star_off.png' alt='-' class='rate_img' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>rate_on</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/star.png' alt='*' class='rate_img' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>remove_friend</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/user_delete.png' alt='{lang:remove_friend}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>remove_poll_choice</replacement_key>
+    <replacement_content><![CDATA[<span class='cancel' title='{lang:remove_choice}'>&times;</span>]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>remove_poll_question</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/cross.png' alt='-' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>report_green_alert</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/reports/post_alert_3.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>report_red_alert</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/reports/post_alert_1.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>rep_down</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/rep_down.png' alt='-' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>rep_up</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/rep_up.png' alt='+' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>send_msg</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/email_open.png' alt='{lang:pm_this_member}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>signin_icon</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/key.png' alt='{lang:macro__signin}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>snapback</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/snapback.png' alt='{lang:macro__view_post}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>sort_down</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_arrow_down.png' alt='V' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>sort_up</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_arrow_up.png' alt='^' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>spammer_off</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/spammer_off.png' alt='{lang:spm_off}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>spammer_on</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/spammer_on.png' alt='{lang:spm_on}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>topic_popup</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/topicpreview.png' alt='' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_announcement</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_announcement.png' alt='{lang:announce_row}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_closed</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_locked.png' alt='{lang:pm_locked}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_moved</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_moved.png' alt='{lang:pm_moved}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_read_dot</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_read_dot.png' alt='{lang:you_posted_here}' title='{lang:you_posted_here}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_unread</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:pm_open_new}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>t_unread_dot</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread_dot.png' alt='{lang:you_posted_here}' /><br />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+  <replacement>
+    <replacement_key>your_vote</replacement_key>
+    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star_rated.png' alt='{lang:macro__voted}' />]]></replacement_content>
+    <replacement_set_id>0</replacement_set_id>
+    <replacement_master_key>root</replacement_master_key>
+  </replacement>
+</replacements>
diff --git a/upload/admin/setup/xml/skins/setsData.xml b/upload/admin/setup/xml/skins/setsData.xml
new file mode 100644
index 00000000..54369f35
--- /dev/null
+++ b/upload/admin/setup/xml/skins/setsData.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinsets>
+  <set>
+    <set_id>1</set_id>
+    <set_name>IP.Board</set_name>
+    <set_key>default</set_key>
+    <set_parent_id>0</set_parent_id>
+    <set_parent_array>a:0:{}</set_parent_array>
+    <set_child_array>a:0:{}</set_child_array>
+    <set_permissions>*</set_permissions>
+    <set_is_default>1</set_is_default>
+    <set_author_name>Invision Power Services, Inc</set_author_name>
+    <set_author_url>http://www.invisionpower.com</set_author_url>
+    <set_image_dir>master</set_image_dir>
+    <set_emo_dir>default</set_emo_dir>
+    <set_css_inline>1</set_css_inline>
+    <set_css_groups><![CDATA[a:26:{s:5:"1.254";a:2:{s:9:"css_group";s:15:"calendar_select";s:12:"css_position";s:1:"1";}s:5:"1.270";a:2:{s:9:"css_group";s:6:"ipblog";s:12:"css_position";s:1:"1";}s:5:"2.271";a:2:{s:9:"css_group";s:12:"ipblog.print";s:12:"css_position";s:1:"2";}s:5:"1.255";a:2:{s:9:"css_group";s:12:"ipb_calendar";s:12:"css_position";s:1:"1";}s:5:"1.256";a:2:{s:9:"css_group";s:12:"ipb_ckeditor";s:12:"css_position";s:1:"1";}s:5:"1.257";a:2:{s:9:"css_group";s:10:"ipb_common";s:12:"css_position";s:1:"1";}s:5:"1.258";a:2:{s:9:"css_group";s:10:"ipb_editor";s:12:"css_position";s:1:"1";}s:5:"0.259";a:2:{s:9:"css_group";s:8:"ipb_help";s:12:"css_position";s:1:"0";}s:5:"0.260";a:2:{s:9:"css_group";s:6:"ipb_ie";s:12:"css_position";s:1:"0";}s:5:"1.261";a:2:{s:9:"css_group";s:18:"ipb_login_register";s:12:"css_position";s:1:"1";}s:5:"1.262";a:2:{s:9:"css_group";s:13:"ipb_messenger";s:12:"css_position";s:1:"1";}s:5:"1.263";a:2:{s:9:"css_group";s:9:"ipb_mlist";s:12:"css_position";s:1:"1";}s:5:"1.264";a:2:{s:9:"css_group";s:16:"ipb_photo_editor";s:12:"css_position";s:1:"1";}s:5:"1.265";a:2:{s:9:"css_group";s:9:"ipb_print";s:12:"css_position";s:1:"1";}s:5:"1.266";a:2:{s:9:"css_group";s:11:"ipb_profile";s:12:"css_position";s:1:"1";}s:5:"2.267";a:2:{s:9:"css_group";s:10:"ipb_search";s:12:"css_position";s:1:"2";}s:5:"1.268";a:2:{s:9:"css_group";s:10:"ipb_styles";s:12:"css_position";s:1:"1";}s:5:"1.269";a:2:{s:9:"css_group";s:7:"ipb_ucp";s:12:"css_position";s:1:"1";}s:5:"1.272";a:2:{s:9:"css_group";s:6:"ipchat";s:12:"css_position";s:1:"1";}s:5:"1.273";a:2:{s:9:"css_group";s:9:"ipcontent";s:12:"css_position";s:1:"1";}s:5:"2.274";a:2:{s:9:"css_group";s:15:"ipcontent_print";s:12:"css_position";s:1:"2";}s:5:"1.275";a:2:{s:9:"css_group";s:11:"ipdownloads";s:12:"css_position";s:1:"1";}s:5:"1.276";a:2:{s:9:"css_group";s:9:"ipgallery";s:12:"css_position";s:1:"1";}s:5:"1.277";a:2:{s:9:"css_group";s:18:"ipgallery_lightbox";s:12:"css_position";s:1:"1";}s:5:"1.278";a:2:{s:9:"css_group";s:19:"ipgallery_slideshow";s:12:"css_position";s:1:"1";}s:5:"1.279";a:2:{s:9:"css_group";s:7:"ipnexus";s:12:"css_position";s:1:"1";}}]]></set_css_groups>
+    <set_added>1318601693</set_added>
+    <set_updated>1318601693</set_updated>
+    <set_output_format>html</set_output_format>
+    <set_locked_uagent/>
+    <set_hide_from_list>0</set_hide_from_list>
+    <set_master_key>root</set_master_key>
+  </set>
+  <set>
+    <set_id>2</set_id>
+    <set_name>IP.Board Mobile</set_name>
+    <set_key>mobile</set_key>
+    <set_parent_id>0</set_parent_id>
+    <set_parent_array>a:0:{}</set_parent_array>
+    <set_child_array>a:0:{}</set_child_array>
+    <set_permissions>*</set_permissions>
+    <set_is_default>1</set_is_default>
+    <set_author_name>Invision Power Services, Inc</set_author_name>
+    <set_author_url>http://www.invisionpower.com</set_author_url>
+    <set_image_dir>mobile</set_image_dir>
+    <set_emo_dir>default</set_emo_dir>
+    <set_css_inline>1</set_css_inline>
+    <set_css_groups><![CDATA[a:9:{s:5:"1.280";a:2:{s:9:"css_group";s:15:"calendar_select";s:12:"css_position";s:1:"1";}s:5:"1.286";a:2:{s:9:"css_group";s:6:"ipblog";s:12:"css_position";s:1:"1";}s:5:"1.281";a:2:{s:9:"css_group";s:10:"ipb_editor";s:12:"css_position";s:1:"1";}s:5:"0.282";a:2:{s:9:"css_group";s:6:"ipb_ie";s:12:"css_position";s:1:"0";}s:5:"1.283";a:2:{s:9:"css_group";s:9:"ipb_print";s:12:"css_position";s:1:"1";}s:5:"0.284";a:2:{s:9:"css_group";s:7:"ipb_rtl";s:12:"css_position";s:1:"0";}s:5:"1.285";a:2:{s:9:"css_group";s:10:"ipb_styles";s:12:"css_position";s:1:"1";}s:5:"1.287";a:2:{s:9:"css_group";s:11:"ipdownloads";s:12:"css_position";s:1:"1";}s:5:"1.288";a:2:{s:9:"css_group";s:9:"ipgallery";s:12:"css_position";s:1:"1";}}]]></set_css_groups>
+    <set_added>1318601693</set_added>
+    <set_updated>1318601693</set_updated>
+    <set_output_format>html</set_output_format>
+    <set_locked_uagent><![CDATA[a:2:{s:6:"groups";a:0:{}s:7:"uagents";a:10:{s:10:"blackberry";s:0:"";s:6:"iphone";s:0:"";s:9:"ipodtouch";s:0:"";s:12:"sonyericsson";s:0:"";s:5:"nokia";s:0:"";s:8:"motorola";s:0:"";s:7:"samsung";s:0:"";s:3:"htc";s:0:"";s:2:"lg";s:0:"";s:4:"palm";s:0:"";}}]]></set_locked_uagent>
+    <set_hide_from_list>0</set_hide_from_list>
+    <set_master_key>mobile</set_master_key>
+  </set>
+</skinsets>
diff --git a/upload/admin/setup/xml/upgrade_sequence.xml b/upload/admin/setup/xml/upgrade_sequence.xml
index c3447ca7..b7397520 100644
--- a/upload/admin/setup/xml/upgrade_sequence.xml
+++ b/upload/admin/setup/xml/upgrade_sequence.xml
@@ -20,6 +20,11 @@
 		<menu>Приложени�</menu>
 		<position>4</position>
 	</action>
+	<action>
+		<file>license</file>
+		<menu>Лицензи�</menu>
+		<position>5</position>
+	</action>
 	<action>
 		<file>upgrade</file>
 		<menu>Обновление</menu>
diff --git a/upload/admin/skin_cp/_newimages/acp_bar.png b/upload/admin/skin_cp/_newimages/acp_bar.png
deleted file mode 100644
index 717b6314..00000000
Binary files a/upload/admin/skin_cp/_newimages/acp_bar.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/acp_login.png b/upload/admin/skin_cp/_newimages/acp_login.png
deleted file mode 100644
index c62bece0..00000000
Binary files a/upload/admin/skin_cp/_newimages/acp_login.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/applications/index.html b/upload/admin/skin_cp/_newimages/applications/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/applications/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/applications/portal.png b/upload/admin/skin_cp/_newimages/applications/portal.png
deleted file mode 100644
index b4aaad9a..00000000
Binary files a/upload/admin/skin_cp/_newimages/applications/portal.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/applications/subscriptions.png b/upload/admin/skin_cp/_newimages/applications/subscriptions.png
deleted file mode 100644
index 0ca9074d..00000000
Binary files a/upload/admin/skin_cp/_newimages/applications/subscriptions.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/branding_bg.png b/upload/admin/skin_cp/_newimages/branding_bg.png
deleted file mode 100644
index 2607515f..00000000
Binary files a/upload/admin/skin_cp/_newimages/branding_bg.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/breadcrumb.png b/upload/admin/skin_cp/_newimages/breadcrumb.png
deleted file mode 100644
index 07bcc9b2..00000000
Binary files a/upload/admin/skin_cp/_newimages/breadcrumb.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/ccs/index.html b/upload/admin/skin_cp/_newimages/ccs/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/ccs/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/drag_icon.png b/upload/admin/skin_cp/_newimages/drag_icon.png
deleted file mode 100644
index 7f6e2cb8..00000000
Binary files a/upload/admin/skin_cp/_newimages/drag_icon.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/gradient_bg.png b/upload/admin/skin_cp/_newimages/gradient_bg.png
deleted file mode 100644
index 0449268a..00000000
Binary files a/upload/admin/skin_cp/_newimages/gradient_bg.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons/index.html b/upload/admin/skin_cp/_newimages/icons/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/icons/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/icons/mclose.png b/upload/admin/skin_cp/_newimages/icons/mclose.png
deleted file mode 100644
index 24ea4135..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons/mclose.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons/mfullscreen.png b/upload/admin/skin_cp/_newimages/icons/mfullscreen.png
deleted file mode 100644
index a873f083..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons/mfullscreen.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/acphelp.png b/upload/admin/skin_cp/_newimages/icons_livesearch/acphelp.png
deleted file mode 100644
index 0a5b1987..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/acphelp.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/forums.png b/upload/admin/skin_cp/_newimages/icons_livesearch/forums.png
deleted file mode 100644
index 39433cf7..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/forums.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/groupLangs.png b/upload/admin/skin_cp/_newimages/icons_livesearch/groupLangs.png
deleted file mode 100644
index 7fb4e1f1..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/groupLangs.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/groups.png b/upload/admin/skin_cp/_newimages/icons_livesearch/groups.png
deleted file mode 100644
index 7fb4e1f1..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/groups.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/index.html b/upload/admin/skin_cp/_newimages/icons_livesearch/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/icons_livesearch/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/location.png b/upload/admin/skin_cp/_newimages/icons_livesearch/location.png
deleted file mode 100644
index 09221764..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/location.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/members.png b/upload/admin/skin_cp/_newimages/icons_livesearch/members.png
deleted file mode 100644
index 79f35ccb..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/members.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/icons_livesearch/settings.png b/upload/admin/skin_cp/_newimages/icons_livesearch/settings.png
deleted file mode 100644
index 96d30c58..00000000
Binary files a/upload/admin/skin_cp/_newimages/icons_livesearch/settings.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/index.html b/upload/admin/skin_cp/_newimages/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/logo.png b/upload/admin/skin_cp/_newimages/logo.png
deleted file mode 100644
index 0172ee64..00000000
Binary files a/upload/admin/skin_cp/_newimages/logo.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_left.png b/upload/admin/skin_cp/_newimages/main_button_left.png
deleted file mode 100644
index 96649975..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_left.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_left_active.png b/upload/admin/skin_cp/_newimages/main_button_left_active.png
deleted file mode 100644
index c7ce219d..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_left_active.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_left_off.png b/upload/admin/skin_cp/_newimages/main_button_left_off.png
deleted file mode 100644
index 34eab4b7..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_left_off.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_right.png b/upload/admin/skin_cp/_newimages/main_button_right.png
deleted file mode 100644
index 21afb14a..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_right.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_right_active.png b/upload/admin/skin_cp/_newimages/main_button_right_active.png
deleted file mode 100644
index 59b82221..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_right_active.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/main_button_right_off.png b/upload/admin/skin_cp/_newimages/main_button_right_off.png
deleted file mode 100644
index f38449bc..00000000
Binary files a/upload/admin/skin_cp/_newimages/main_button_right_off.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/members/index.html b/upload/admin/skin_cp/_newimages/members/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/members/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/members/vkontakte.png b/upload/admin/skin_cp/_newimages/members/vkontakte.png
deleted file mode 100644
index 00f9537e..00000000
Binary files a/upload/admin/skin_cp/_newimages/members/vkontakte.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/menu_chevron.png b/upload/admin/skin_cp/_newimages/menu_chevron.png
deleted file mode 100644
index e97a3904..00000000
Binary files a/upload/admin/skin_cp/_newimages/menu_chevron.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/menu_icon_sprite.png b/upload/admin/skin_cp/_newimages/menu_icon_sprite.png
deleted file mode 100644
index 33e9293d..00000000
Binary files a/upload/admin/skin_cp/_newimages/menu_icon_sprite.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/menu_open.png b/upload/admin/skin_cp/_newimages/menu_open.png
deleted file mode 100644
index 4a77cff7..00000000
Binary files a/upload/admin/skin_cp/_newimages/menu_open.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/menu_sprite.png b/upload/admin/skin_cp/_newimages/menu_sprite.png
deleted file mode 100644
index 6f6397b5..00000000
Binary files a/upload/admin/skin_cp/_newimages/menu_sprite.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/output_html.png b/upload/admin/skin_cp/_newimages/output_html.png
deleted file mode 100644
index 3178bbba..00000000
Binary files a/upload/admin/skin_cp/_newimages/output_html.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/output_off_html.png b/upload/admin/skin_cp/_newimages/output_off_html.png
deleted file mode 100644
index e719e7b8..00000000
Binary files a/upload/admin/skin_cp/_newimages/output_off_html.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/output_off_xml.png b/upload/admin/skin_cp/_newimages/output_off_xml.png
deleted file mode 100644
index c2102858..00000000
Binary files a/upload/admin/skin_cp/_newimages/output_off_xml.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/output_xml.png b/upload/admin/skin_cp/_newimages/output_xml.png
deleted file mode 100644
index ab274941..00000000
Binary files a/upload/admin/skin_cp/_newimages/output_xml.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/page_bg.png b/upload/admin/skin_cp/_newimages/page_bg.png
deleted file mode 100644
index a8819400..00000000
Binary files a/upload/admin/skin_cp/_newimages/page_bg.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/remote_avatar.png b/upload/admin/skin_cp/_newimages/remote_avatar.png
deleted file mode 100644
index 25d8b73b..00000000
Binary files a/upload/admin/skin_cp/_newimages/remote_avatar.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_active_off.png b/upload/admin/skin_cp/_newimages/report_active_off.png
deleted file mode 100644
index d2806bf7..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_active_off.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_active_on.png b/upload/admin/skin_cp/_newimages/report_active_on.png
deleted file mode 100644
index 276ac270..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_active_on.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_complete_off.png b/upload/admin/skin_cp/_newimages/report_complete_off.png
deleted file mode 100644
index 23ed04a7..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_complete_off.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_complete_on.png b/upload/admin/skin_cp/_newimages/report_complete_on.png
deleted file mode 100644
index b307477f..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_complete_on.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_new_off.png b/upload/admin/skin_cp/_newimages/report_new_off.png
deleted file mode 100644
index f58a22b8..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_new_off.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/report_new_on.png b/upload/admin/skin_cp/_newimages/report_new_on.png
deleted file mode 100644
index abe1ec35..00000000
Binary files a/upload/admin/skin_cp/_newimages/report_new_on.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/right_arrow.png b/upload/admin/skin_cp/_newimages/right_arrow.png
deleted file mode 100644
index b1cab765..00000000
Binary files a/upload/admin/skin_cp/_newimages/right_arrow.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/right_arrow_inactive.png b/upload/admin/skin_cp/_newimages/right_arrow_inactive.png
deleted file mode 100644
index bcb42e81..00000000
Binary files a/upload/admin/skin_cp/_newimages/right_arrow_inactive.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/rte_arrow.png b/upload/admin/skin_cp/_newimages/rte_arrow.png
deleted file mode 100644
index 0726ae83..00000000
Binary files a/upload/admin/skin_cp/_newimages/rte_arrow.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/sort_asc.png b/upload/admin/skin_cp/_newimages/sort_asc.png
deleted file mode 100644
index e27e0e95..00000000
Binary files a/upload/admin/skin_cp/_newimages/sort_asc.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/sort_desc.png b/upload/admin/skin_cp/_newimages/sort_desc.png
deleted file mode 100644
index bd538873..00000000
Binary files a/upload/admin/skin_cp/_newimages/sort_desc.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/sub_bar.png b/upload/admin/skin_cp/_newimages/sub_bar.png
deleted file mode 100644
index d53dfd8d..00000000
Binary files a/upload/admin/skin_cp/_newimages/sub_bar.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/templates/index.html b/upload/admin/skin_cp/_newimages/templates/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/_newimages/templates/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/toolbox.png b/upload/admin/skin_cp/_newimages/toolbox.png
deleted file mode 100644
index 12358c8f..00000000
Binary files a/upload/admin/skin_cp/_newimages/toolbox.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_delete_left.png b/upload/admin/skin_cp/_newimages/topic_button_delete_left.png
deleted file mode 100644
index 94808bdb..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_delete_left.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_delete_right.png b/upload/admin/skin_cp/_newimages/topic_button_delete_right.png
deleted file mode 100644
index c29d8094..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_delete_right.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_left.png b/upload/admin/skin_cp/_newimages/topic_button_left.png
deleted file mode 100644
index c08dc0b1..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_left.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_left_closed.png b/upload/admin/skin_cp/_newimages/topic_button_left_closed.png
deleted file mode 100644
index 44ca3191..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_left_closed.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_left_disabled.png b/upload/admin/skin_cp/_newimages/topic_button_left_disabled.png
deleted file mode 100644
index d474ab68..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_left_disabled.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_right.png b/upload/admin/skin_cp/_newimages/topic_button_right.png
deleted file mode 100644
index b9ea75c6..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_right.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_right_closed.png b/upload/admin/skin_cp/_newimages/topic_button_right_closed.png
deleted file mode 100644
index 1f585503..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_right_closed.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/topic_button_right_disabled.png b/upload/admin/skin_cp/_newimages/topic_button_right_disabled.png
deleted file mode 100644
index cda925d6..00000000
Binary files a/upload/admin/skin_cp/_newimages/topic_button_right_disabled.png and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/useropts_arrow.png b/upload/admin/skin_cp/_newimages/useropts_arrow.png
deleted file mode 100644
index 92758d09..00000000
Binary files a/upload/admin/skin_cp/_newimages/useropts_arrow.png and /dev/null differ
diff --git a/upload/admin/skin_cp/acp.css b/upload/admin/skin_cp/acp.css
index 1795670d..3226e742 100644
--- a/upload/admin/skin_cp/acp.css
+++ b/upload/admin/skin_cp/acp.css
@@ -14,13 +14,15 @@
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
 table {	border-collapse:collapse; border-spacing:0; }
 fieldset,img { border:0; }
-address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; }
+address,caption,cite,code,dfn,th,var { font-style:normal; font-weight:normal; }
 ol,ul { list-style:none; }
 caption,th { text-align:left; }
 h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
 q:before,q:after { content:''; }
 abbr,acronym { border:0; }
 hr { display: none; }
+img { vertical-align: middle }
+
 /*-----------------------------------------------*/
 /* Basic styles                                  */
 /*-----------------------------------------------*/
@@ -43,1343 +45,740 @@ hr { display: none; }
 	z-index: 10000;
 }
 
-#acpLogInBoxWrap {
-	margin-left: auto;
-	margin-right:auto;
-	margin-top:100px;
-	width: 500px;
-	border: 1px solid #d3dae0;
-	background-color: #ffffff;
-}
-
-#tmp_nav {
-	position: absolute;
-	top: 55px;
-	padding: 5px;
-	right: 10px;
-	color: #fff;
-	display: none;
-}
-	#tmp_nav a {
-		color: #fff;
-	}
-
-body#ipboard_body {
-	background: #e4eaf1;
-	min-width: 1000px;
+html {
+	height: 100%;
 }
 
 body {
-	font-family: arial, verdana, tahoma, sans-serif;
-	font-size: 13px;
-	color: #1c2837;
-	padding: 0px 0px 0px 0px;
+	background: #fff;
+	font: normal 13px 'Helvetica Neue', helvetica, arial, sans-serif;
+	position: relative;
+	color: #4c4c4c;
+	height: 100%;
 }
 
-h1, h2, h3, h4, h5, h6 {
-	font-weight: bold;
-}
-
-h2 {
-	font-size: 1.6em;
-	font-weight: normal;
-}
-
-h3 {
-	font-size: 1.1em;
-	color: #1d3652;
-}
-
-	h3 img {
-		margin-top: -2px;
+	input, select, textarea {
+		font: normal 13px 'Helvetica Neue', helvetica, arial, sans-serif;
 	}
 
-table {
-	width: 100%;
-}
-
-td {
-	padding: 3px;
-}
-
-img {
-	vertical-align: middle;
-}
-
-strong {
-	font-weight: bold;
-}
-em {
-	font-style: italic;
-}
-
-em strong {
-	font-weight: bold;
-	font-style: italic;
-}
-
-fieldset {
-	border: 1px solid #CCCCCC;
-	padding: 4px;
-}
-
-/*
-Enabling this will remove text from various places in the ACP.
-
-legend {
-	display: none;
-}
-*/
 a {
-	color: #192b40;
-	/*text-decoration: none;
-	border-bottom: 1px solid #9eb4cd;*/
+	text-decoration: none;
+	color: #3287c9;
 }
 
-a:hover {
-	color: #657b97;
-	text-decoration: underline !important;
+	a:hover {
+		color: #8f0758;
+	}
+
+.desctext {
+	color: #969a9d;
+	font-size: 90%;
+}
+	
+.left { float: left; }
+.right { float: right; }
+.clear { clear: both; }
+.clickable { cursor: pointer; }
+.clearfix, .context_menu { zoom: 1 } /* IE7 hack */
+.clearfix:after, .context_menu:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.center {
+	text-align: center;
+}
+.pad {
+	padding: 10px;
+}
+.larger_text {
+	font-size: 110%;
 }
 
-a.cancel {
-	color: #ad2930;
-	font-size: 0.9em;
-	font-weight: bold;
+.ipsList { }
+
+	.ipsList_inline, .ipsList_inline > li {
+		display: inline;
+	}
+
+#modal {
+	width: 100%;
+	height: 100%;
+	background: url( images/trans_bg.png );
+	position: absolute;
+	top: 50px; bottom: 0;
+	left: 0; right: 0;
+	z-index: 16000;
 }
 
-/* Hide H1, Jump to content link */
-h1, #content_jump {
-	text-indent: -9999px;
-	height: 0px;
-	width: 0px;
+.modal {
+    background-color: #3e3e3e;
 }
 
-/*-----------------------------------------------*/
-/* Branding/Header styles                        */
-/*-----------------------------------------------*/
+/****************************************************/
+/* GLOBAL INTERFACE									*/
+/****************************************************/
 
 #header {
-	position: relative;
-	border-bottom: 15px solid #e4eaf1;
-}
-
-#branding {
-	background: #1d3652 url(_newimages/branding_bg.png) repeat-x top;
-	height: 81px;
-}
-
-/* Admin bar */
-#admin_bar {
-	background: #2e2e2e url(_newimages/acp_bar.png) repeat-x top;
-	color: #d2d2d2;
-	padding: 7px;
-	font-size: 0.8em;
-	height: 14px;
-}
-
-	#admin_bar ul,
-	#admin_bar li {
-		display: inline;
-	}
-	
-		#admin_bar li {
-			padding: 0 3px 0 5px;
-			color: #767676;
-		}
-	
-	#admin_bar p {
-		float: right;
-	}
-	
-	#admin_bar #logged_in {
-		display: block;
-		float: right;
-	}
-	
-	#admin_bar a {
-		color: #fff;
-	}
-
-#copyright {
-	background-color: #192b40;
-	padding: 6px;
-	text-align: center;
+	background: url( images/header_bg.png ) repeat-x;
+	padding: 0 15px;
+	color: #d4d4d4;
+	text-shadow: 0px 1px 1px rgba(0,0,0,0.6);
 	font-size: 11px;
-	color: #fff;
-	margin: 0px;
-	/*position: absolute;
-	right: 0px;
-	bottom: 0px;*/
-	margin-left: 195px;
+	z-index: 16500;
 }
 
-	#copyright a {
-		color: #e4eaf1;
-		text-decoration: none;
-	}
-	
-#debug {
-	font-size: 0.8em;
-	border: 2px dotted #e4ecf2;
-	margin-top: 15px;
-}
-	
-#navigation {
-	height: 31px;
-	background: transparent url(_newimages/sub_bar.png) repeat-x;
-	border-bottom: 5px solid #528f6c;
-}
-	
-	#navigation form {
-		float: right;
-		margin-right: 10px;
-		margin-top: 5px;
-		color: #e4eaf1;
-		font-size: 11px;	
-	}
-	
-		#navigation form input {
-			border: 1px solid #000;
-			padding: 2px;
-		}
-	
-	#navigation ul#section_buttons {
-		display: inline;
-		margin-top: -5px;
+	#header .logged_in {
+		margin-left: 20px;
+		display: inline-block;
 	}
 		
-		#navigation ul#section_buttons li {
-			float: left;
-			margin: 0px 0px 10px 10px;
+		#header #user_links {
+			margin-left: 15px;
+		}
+		
+		#header #user_links a {
+			display: inline-block;
+			padding: 4px 10px;
+			-moz-border-radius: 10px;
+			-webkit-border-radius: 10px;
+			border-radius: 10px;
+			background: #262626; /* old browsers */
+			background: -moz-linear-gradient(top, #262626 0%, #333333 100%); /* firefox */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#262626), color-stop(100%,#333333)); /* webkit */
+			text-shadow: none;
+			color: #d4d4d4;
+			margin-right: 5px;
+		}
+		
+			#header #user_links a:hover {
+				background: #565656;
+				color: #fff;
+			}
+
+#search {
+	height: 52px;
+	line-height: 52px;
+}
+
+	#search #acpSearchKeyword { /*#search #search_field {*/
+		border: 0;
+		-moz-border-radius: 2px;
+		-webkit-border-radius: 2px;
+		border-radius: 2px;
+		padding: 6px 28px 6px 6px;
+		font-size: 13px;
+		min-width: 220px;
+		margin-left: 5px;
+		-moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.4) inset;
+		-webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.4) inset;
+		box-shadow: 1px 1px 2px rgba(0,0,0,0.4) inset;		
+	}
+
+		#search #acpSearchKeyword.inactive { /*#search #search_field.inactive {*/
+			color: #c1c1c1;
+		}
+		
+#acp_loading {
+	position: absolute;
+	right: 6px;
+	top: 18px;
+}		
+
+#app_bar {
+	background: url( images/app_bar_bg.png ) repeat-x;
+	min-height: 51px;
+	padding: 12px 15px 3px;
+}
+
+	#app_bar > ul > li {
+		float: left;
+		font-size: 16px;
+		font-weight: 300;
+		color: #fff;
+		margin-right: 15px;
+		text-shadow: 0px 1px 1px rgba(0,0,0,0.6);
+	}
+
+		#app_bar > ul > li > a {
+			color: #fff;
+			height: 40px;
+			padding: 0 10px;
+			line-height: 40px;
+			display: block;
+		}
+
+			#app_bar > ul > li > a:hover {
+				background: #3f6fa2;
+				color: #fff;
+				-moz-border-radius: 2px;
+			}
+
+	#app_bar > ul > li.active {
+		background: transparent url( images/app_tab_left.png ) no-repeat top left;
+	}
+
+		#app_bar > ul > li.active > a {
+			color: #fff;
+			margin-left: 8px;
+			padding-right: 17px;
+			background: transparent url( images/app_tab_right.png ) no-repeat top right;
+		}
+
+	#edit_tabs {
+		line-height: 40px; /* 52px height - 12px padding on parent */
+		color: #6390bf;
+		font-size: 11px;
+	}
+
+		#edit_tabs:hover {
+			color: #fff;
+		}
+		
+/* App menu */
+.app_menu ul {
+	position: absolute;
+	z-index: 20000;
+	text-shadow: none;
+	font: normal 13px 'Helvetica Neue', helvetica, arial, sans-serif;
+	color: #000;
+	min-width: 200px;
+	-moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.4);
+	-webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.4);
+	box-shadow: 0px 5px 10px rgba(0,0,0,0.4);
+	margin-top: -2px;
+	border: 1px solid #ac156d;
+	border-top: 4px solid #ac156d;
+}
+
+	.app_menu ul li > a,
+	.app_menu ul li > span {
+		color: #811052;
+		display: block;
+		padding: 8px;
+		position: relative;
+		outline: 0;
+	}
+
+	.app_menu ul li {
+		background: #f7eff5;
+		position: relative;
+		cursor: default;
+		white-space: nowrap;
+	}
+
+	.app_menu ul li:hover {
+		background: #ce1b7b url( images/app_menu_highlight.png ) repeat-x top;
+		color: #fff;
+	}
+	
+		.app_menu ul li:active {
+			
+		}
+
+		.app_menu ul li:hover > a,
+		.app_menu ul li:hover > span {
+			color: #fff;
+		}
+		
+		.app_menu ul li:hover > a:active, .app_menu ul li:hover > span:active {
+			background: #ce1b7b url( images/app_menu_highlight.png ) repeat-x bottom;
+		}
+
+		.app_menu ul li.has_sub .menu_arrow {
+			position: absolute;
+			right: 5px;
+			top: 10px;
+			background: url( images/menu_has_sub.png ) no-repeat bottom;
+			width: 9px;
+			height: 10px;
+			text-indent: -2000em;
+		}
+
+			.app_menu li.has_sub:hover > a .menu_arrow,
+			.app_menu li.has_sub:hover > span .menu_arrow {
+				background-position: top;
+			}
+
+		.app_menu ul ul li {
 			padding: 0;
 		}
-
-			#navigation ul#section_buttons li a {
-				display: block;
-				padding: 7px 15px 13px 7px;
-				margin-right: -7px;
-				color: #acbbcc;
-				font-size: 1em;
-				text-decoration: none !important;
-				outline: 0;
-			}
-
-			#navigation ul#section_buttons li img {
-				margin-right: 6px;
-			}
-			
-		#navigation ul#section_buttons li.active {
-			background: transparent url(_newimages/main_button_left.png) no-repeat;
-			position: relative;
-			top: -5px;
-		}
-
-			#navigation ul#section_buttons li.active a {
-				background: transparent url(_newimages/main_button_right.png) no-repeat top right;
-				color: #fff;
-				font-weight: bold;
-				padding-top: 10px;
-				margin-left: 6px;
-			}
-			
-		#navigation ul#section_buttons li.showing {
-			background: transparent url(_newimages/main_button_left_active.png) no-repeat;
-		}
-		
-			#navigation ul#section_buttons li.showing a {
-				background: transparent url(_newimages/main_button_right_active.png) no-repeat top right;
-				color: #181d23;
-			}
-			
-#app_menu_menucontent {
-	background: #fafbfc;
-	border: 1px solid #203b57;
-	padding: 5px;
-	min-width: 250px;
-	position: absolute;
-	z-index: 20000 !important;
-	cursor: pointer;
-}
-
-	#app_menu_menucontent a {
-		display: block;
-		padding: 4px 7px;
-		clear: both;
-		overflow: hidden;
-		text-decoration: none;
-		width: 236px;
-	}
-		#app_menu_menucontent a:hover {
-			background: #ecf1f5;
-			text-decoration: none !important;
-		}
 	
-		#app_menu_menucontent a img {
-			float: left;
-			margin: 3px 12px 0px 3px;
-		}
-		
-		#app_menu_menucontent a strong {
-			display: block;
-			float: left;
-		}
-		
-		#app_menu_menucontent a span {
-			display: block;
-			float: left;
-			clear: both;
-			margin-left: 32px;
-			margin-top: -3px;
-			font-size: 10px;
-			color: #666;
-			width: 90%;
-		}
-			
-#secondary_navigation {
-	background: transparent url(_newimages/sub_bar.png) repeat-x;
-	height: 31px;
+#breadcrumb {
+	font-size: 11px;
+	color: #9b9b9b;
+	padding: 0px;
+	margin-bottom: 25px;
 }
 	
-	#secondary_navigation h2 {
-		float: left;
-		padding: 7px 0 0 10px;
-		font-size: 1.2em;
-		color: #fff;
-		margin: 0;
+	#breadcrumb a {
+		color: #9b9b9b;
 	}
 	
-	#secondary_navigation li {
-		float: left;
-		margin: 9px 0 0 10px;
-		font-size: 0.85em;
-		color: #d0e0eb;
+	#breadcrumb li {
+		display: inline;
 	}
-	
-		#secondary_navigation li a {
-			color: #d0e0eb;
-			text-decoration: none;
-		}
-	
-	#secondary_navigation ol {
-		margin-left: 246px;
+
+	#breadcrumb .nav_sep {
+		display: inline-block;
+		margin: 0 6px;
+	}
+
+#page_body {
+	margin: 0;
+	width: 100%;
+	position: relative;
+}
+
+	#page_body.open_menu #section_navigation {
+		display: block;		
+	}
+
+	#page_body.open_menu #main_content {
+		margin-left: 195px;
 	}
 	
 #section_navigation {
+	width: 195px;
 	position: absolute;
 	left: 0px;
-	margin-top: 10px;
-	border-top: 1px solid #d5e0e8;
-	width: 195px;
+	top: 0px;
+	background: #f4fbff;
+	border-right: 1px solid #cceffc;
+	border-bottom: 1px solid #cceffc;
+	-moz-box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+	-webkit-box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+	box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+	padding: 25px 0 0 0px;
 }
-
-	#section_navigation a {
-		text-decoration: none;
-	}
-	
-	#section_navigation ul {
-		color: #242e38;
-	}
 	
 	#section_navigation > ul > li {
-		border-bottom: 1px solid #d5e0e8;
-		font-size: 1em;
+		padding: 5px 0 10px 10px;
+		line-height: 1.5;
+		font-size: 14px;
 		font-weight: bold;
-		padding: 8px 10px;
-	}
-	
-		#section_navigation > ul > li.has_sub {
-			background-repeat: no-repeat;
-			background-position: 100% 8px;
-		}
-	
-		#section_navigation > ul > li.active {
-			background: #fff;
-			border-bottom: 3px solid #d6dde2;
-		}
-	
-	#section_navigation ul ul {
-		font-size: 0.85em;
-		font-weight: normal;
-		padding: 5px 0 0 10px;
-	}
-	
-		#section_navigation ul ul li {
-			padding: 2px;
-		}
-		
-		#section_navigation ul ul li.active {
-			font-weight: bold;
-		}
-		
-	#section_navigation ul ul ul {
-		font-size: 0.9em;
-		font-weight: normal;
-		padding-bottom: 6px;
+		color: #383838;
 	}
 
-#breadcrumb {
-	overflow: hidden;
-	font-size: 10px;
-	color: #9b9b9b;
-	margin: -5px 0 10px -5px;
-	padding-left: 16px;
-	background: url(_newimages/breadcrumb.png) no-repeat 2px;
-}
-	
-	#breadcrumb li {
-		float: left;
-	}
-	
-	#breadcrumb li a {
-		color: #9b9b9b;
-		text-decoration: none;
-	}
-	
+		#section_navigation a {
+			color: #383838;
+		}
 
-	
-#page_body {
-	background: #fff url(_newimages/page_bg.png) repeat-y;
+		#section_navigation ul ul {
+			margin: 5px 0 0 10px;
+			font-size: 11px;
+			font-weight: normal;
+		}
+
+	#section_navigation li.active {
+		background: #fff;
+		position: relative;
+		border: 1px solid #cceffc;
+		padding: 4px 0 9px 10px;
+		border-right: 0;
+		border-left: 0;
+		-moz-box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+		-webkit-box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+		box-shadow: -2px 3px 4px rgba(175,212,241,0.15) inset;
+		-moz-border-radius-topleft: 3px;
+		-moz-border-radius-bottomleft: 3px;
+		border-top-left-radius: 3px;
+		border-bottom-left-radius: 3px;
+	}
+
+		#section_navigation li.active ul {
+			display: block;
+		}
+
+#toggle_sidebar {
+	display: block;
+	position: absolute;
+	z-index: 9999;
+	text-indent: -2000em;
+	top: 0;
+	left: 0;
+	outline: 0;
 }
+
+	.open_menu #toggle_sidebar {
+		width: 195px;
+		height: 13px;
+		background: #e5f2f9 url( images/sidebar_toggle_close.png ) no-repeat top left;
+	}
+
+		.open_menu #toggle_sidebar:hover {
+			background: #cceffc url( images/sidebar_toggle_close.png ) no-repeat bottom left;
+		}
+		
+	.close_menu #toggle_sidebar {
+		bottom: 0;
+		width: 8px;
+		background: #e5f2f9 url( images/sidebar_toggle_open.png ) no-repeat top left;
+	}
+	
+		.close_menu #toggle_sidebar:hover {
+			width: 15px;
+			background: #cceffc url( images/sidebar_toggle_open.png ) no-repeat top right;
+		}
 	
 #main_content {
-	margin-left: 195px;
-	border-top: 1px solid #d3dae0;
-	/*border-bottom: 1px solid #d3dae0;*/
-	/*position: relative;*/
-}
-
-	#main_content #content_wrap {
-		padding: 15px 20px;
-		/*margin-bottom: 60px;*/
-	}
-
-.popupwindow #main_content {
-	margin: 0 !important;
-}
-
-#toolbox { /* Formerly known as Context Menu. RIP. */
-	min-height: 30px;
-	background: #f5f5f5;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	color: #535f6d;
-	margin-bottom: 15px;
-	margin-left: -5px;
-}
-
-	#toolbox ul li {
-		float: left;
-		padding: 8px 10px 0 10px;
-		font-size: 0.9em;
-	}
-	
-#live_search_popup {
-	position: absolute;
-	background: transparent url('../../public/style_images/master/trans_bg.png');
-	margin-top: 15px; /* Height of the stem, below, minus a few */
-	margin-left: -370px; /* width of this box */
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-
-	#live_search_popup #search_stem {
-		position: absolute;
-		right: 15px;
-		top: -20px;
-		width: 23px;
-		height: 20px;
-		background: transparent url(../../public/style_images/master/search_stem.png) no-repeat;
-	}
-	
-	#live_search_popup #search_inner {
-		background: #fff;
-		color: #000;
-		border: 1px solid #6b8cad;
-		margin: 6px;
-		width: 350px;
-		max-height: 400px;
-		overflow: auto;
-		border-radius: 4px;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-	}
-	
-	#live_search_popup h3 {
-		border: 0;
-		background: #d5dde5;
-		padding: 3px;
-	}
-	
-	#ajax_result {
-		font-size: 0.85em;
-	}
-		
-		#ajax_result ul > li {
-			font-weight: bold;
-			padding: 10px 6px;
-		}
-		
-			#ajax_result ul > li span.section {
-				width: 90px;
-				text-align: right;
-				display: block;
-			}
-		
-		#ajax_result ul > li ol {
-			margin-left: 100px;
-			border-left: 1px solid #dedede;
-			padding-left: 10px;
-			margin-top: -15px;
-			font-weight: normal;
-			line-height: 150%;
-		}
-		
-		#ajax_result ul li ol li {
-			margin-bottom: 0;
-			padding: 0;
-			font-weight: normal;
-			width: auto;
-		}
-
-/**
- *	Keith's CSS!
- *
- *	Starting with Global styles, then breakdowns by individual areas.
-**/
-
-
-.tip{
-	padding:0px 4px;
-	font-weight:bold;
-	background-color:#eef3e9;
-	color:#82a562;
-	border:1px solid #82a562;
-	cursor:help;
-}
-
-.desctext{
-	color:#666;
-	font-size: 90%;
-}
-
-.border_bottom{
-	border-bottom:1px dotted #d5dde5;
-}
-
-.more{
-	padding:8px 5px 5px 5px;
-	text-align:right;
-}
-
-.more a{
-	display:block;
-	margin:1px;
-	padding:3px;
-	text-decoration:none;
-}
-
-.more a:hover{
-	margin:0px;
-	background-color:#f4f4f4;
-	text-decoration:none !important;
-	border:1px dotted #d5dde5;
-}
-
-.draghandle {
-	cursor: move;
-	padding: 4px;
-	margin-right: 5px;
-	float: left;
-}
-
-.section_title {
-	border-bottom: 3px solid #e2e2e2;
-	padding-bottom: 8px;
-	position: relative;
-	min-height: 25px;
-	margin: 0 -6px 20px -6px;
-}
-	
-	.section_title h2 {
-		position: relative;
-		top: 4px;
-	}
-	
-	.section_title .context_menu {
-		float: right;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-	}
-	
-.section_info {
-	border: 1px solid #e2e2e2;
-	background: #f3f3f3;
-	padding: 6px;
-	margin: -10px -6px 20px -6px;
-}
-
-#main_content .menucatwrap, #main_content h2
-{
-	font-size: 1.6em;
-	font-weight: normal;
-}
-
-#main_content .tableborder, #main_content .acp-container
-{
-	border: 0;
-	border-bottom: 3px solid #D5DDE5;
-}
-
-/*#main_content .acp-container .nofoot
-{
-	border-bottom: 0;
-}*/
-
-#main_content h3.bar, #main_content .tableborder h3, #main_content .acp-container h3, #main_content .tableheaderalt, #main_content .tableheader
-{
-	background: #1d3652 url(../../public/style_images/master/gradient_bg.png) repeat-x 50%;
-}
-
-#main_content .tablefooter
-{
-	background: #E5ECF3;
-	padding: 5px;
-	text-align: right;
-}
-
-#main_content .tablesubheader
-{
-	background:#B1C2D4 url(../../public/style_images/master/gradient_bg.png) repeat-x scroll 50% 50%;
-	font-size: 13px;
-}
-
-#main_content .tablesubsubheader {
-	background: #d9e4ef !important;
-	padding: 5px;
-}
-
-.ajax-inline-message,
-#main_content .acp-message
-{
-	border: 1px solid #b0ce94;
-	background-color: #f1f6ec;
-	background-image: url(../../public/style_images/master/information.png);
-	background-repeat: no-repeat;
-	background-position: right;
-	color: #3e4934;
-	padding: 5px;
-	margin-bottom: 5px;
-}
-
-.ajax-inline-error
-#main_content .acp-error
-{
-	background-color: #f3dddd;
-	background-image: url(_newimages/icons/exclamation.png);
-	background-repeat: no-repeat;
-	background-position: right;
-	border: 1px solid #deb7b7;
-	color: #281b1b;
-	font-size: 1.1em;
-	padding: 5px;
-	margin-bottom: 5px;
-}
-
-.ajax-inline-message,
-.ajax-inline-error {
-	background-image: none;
-	border: none;
-	margin-bottom: 0;
-	padding: 10px;
-}
-
-#main_content .acp-row-on td, #main_content .acp-row-on,
-#main_content .acp-div-on
-{
-	background: #FAFBFC;
-}
-
-#main_content .acp-row-off td, #main_content .acp-row-off,
-#main_content .acp-div-off
-{
-	background: #F1F4F7;
-}
-
-#main_content .acp-row-red
-{
-	background: #f2e4e7;
-}
-
-#main_content .acp-row-amber
-{
-	background: #F9F7E0;
-}
-
-#main_content .menulinkwrap
-{
-/*	display: block;
-	clear: both;
-	float: left;*/
-	padding: 5px;
-	background: #ECF1F5 url(../../public/style_images/master/gradient_bg.png) repeat-x 70%;
-	color: #1D3652;
-	border: 1px solid #D5DDE5;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	cursor: pointer;
-	margin: 5px 5px 5px 0;
-}
-
-/*-----------------------------------------------*/
-/* Tab bar				    	                 */
-/*-----------------------------------------------*/
-
-#main_content .tab_bar {
-	background-color: #e4ebf2;
-	padding: 7px 15px 25px 15px;
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	-moz-border-radius-topleft: 6px;
-	-moz-border-radius-topright: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-webkit-border-top-right-radius: 6px;
-	font-size: 0.9em;
-	color: #4a6784;
-	white-space:nowrap;
-}
-
-#main_content .tab_bar.no_title {
-	background-image: url('../../public/style_images/master/th_bg.png');
-	background-repeat: repeat-x;
-	background-position: bottom;
-	padding: 7px 15px 56px 15px;
-}
-
-#main_content .tab_bar.no_title.mini {
-	padding: 7px 15px 25px 15px;
-	background-image: none;
-	border-bottom: 8px solid #243f5c;
-	background-color: transparent;
-}
-
-#main_content .tab_bar li {
-	float: left;
-	padding: 2px 10px;
-	cursor: pointer;
-}
-
-#main_content .tab_bar li a {
-	color: #4a6784;
-	text-decoration: none;
-}
-
-#main_content .tab_bar li.active, #main_content .tab_bar li.tabon {
-	background-color: #243f5c;
-	color: #fff;
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
-	-moz-border-radius-topleft: 4px;
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-	margin: -2px 10px 0 10px;
-	padding: 7px 10px;
-	font-weight: bold;
-	font-size: 1.1em;
-}
-
-#main_content .tab_bar li.active a, #main_content .tab_bar li.tabon a {
-	color: #fff;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-#main_content .tab_body {
-	clear: both;
-	background-color: #f6f8fa;
 	padding: 15px;
+	min-height: 300px;
 }
 
-/*
-* Global menu options
-*/
-.acp-menu
-{
-	border: 1px solid #1d3652;
-	background: #FAFBFC;
-	width: auto;
-	white-space: nowrap;
-	z-index: 150;
+#footer {
+	margin: 20px 15px 0;
+	padding: 10px 15px;
+	font-size: 11px;
+	text-align: center;
+	color: #9a9a9a;
 }
 
-.acp-menu li
-{
-	border-bottom: 1px solid #E5ECF3;
-	width: auto;
-	padding: 3px;
-	text-align: left;
-}
-
-	/* Pointer for image menus */
-	.ipbmenu
-	{
-		cursor: pointer;
+	#footer a {
+		color: #9a9a9a;
+	}
+	#footer a:hover {
+		color: #8f0758;
 	}
 
-	.acp-menu li.icon
-	{
-		background-repeat: no-repeat;
-		background-position: 4px;
-		padding-left: 25px;
+/****************************************************/
+/* LIVE SEARCH										*/
+/****************************************************/
+#search {
+	position: relative;
+}
+
+#live_search_results {
+	background: #fff;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-box-shadow: -3px 5px 8px rgba(0,0,0,0.15);
+	-webkit-box-shadow: -3px 5px 8px rgba(0,0,0,0.15);
+	box-shadow: -3px 5px 8px rgba(0,0,0,0.15);
+	position: absolute;
+	right: 10px;
+	width: 800px;
+	z-index: 25000;
+}
+
+#ls_sections, #ls_results {
+	height: 300px;
+	float: left;
+}
+
+	#ls_sections {
+		width: 159px;
+		background: #ededed;
+		border-right: 1px solid #d9d9d9;
+		-moz-border-radius-bottomleft: 4px;
+		border-bottom-left-radius: 4px;
+		position: relative;
+	}
+		#ls_sections li {
+			padding: 7px 12px 7px 7px;
+			font-size: 12px;
+			font-weight: bold;
+			position: relative;
+			cursor: pointer;
+			border-top: 1px solid #ededed;
+			border-bottom: 1px solid #ededed;
+		}
+			
+			#ls_sections li:hover {
+				background: #e6e5e5;
+			}
+			
+			#ls_sections li.active {
+				background: #fff;
+				right: -1px;
+				border-top: 1px solid #d9d9d9;
+				border-bottom: 1px solid #d9d9d9;
+				cursor: default;
+			}
+				#ls_sections li:first-child.active {
+					border-top: 1px solid #fff;
+				}
+				#ls_sections li.active .count {
+					background: #eaeaea;
+				}
+			
+			#ls_sections li.disabled {
+				color: #cbcbcb;
+				cursor: default;
+			}
+				#ls_sections li.disabled:hover {
+					background-color: transparent;
+				}
+				
+			#ls_sections li#ls_marketplace {
+				position: absolute;
+				bottom: 0; right: -1px; left: 0;
+				color: #ab156d;
+				text-align: center;
+			}
+			
+		#ls_sections .count {
+			position: absolute;
+			right: 8px;
+			top: 7px;
+			font-size: 9px;
+			padding: 1px 5px;
+			background: #dbdbdb;
+			-moz-border-radius: 2px;
+			border-radius: 2px;
+		}
+		
+	#ls_results {
+		width: 640px;
+		position: relative;
 	}
 	
- 	.acp-menu li.add
-	{
-		background-image: url( _newimages/icons/add.png );
-	}
-	 .acp-menu li.edit
-	{
-		background-image: url( _newimages/icons/pencil.png );
-	}
-	 .acp-menu li.view
-	{
-		background-image: url( _newimages/icons/view.png );
-	}
-	 .acp-menu li.delete
-	{
-		background-image: url( _newimages/icons/delete.png );
-	}
-	 .acp-menu li.info
-	{
-		background-image: url( _newimages/icons/page_white_magnify.png );
-	}
-	 .acp-menu li.manage
-	{
-		background-image: url( _newimages/icons/cog.png );
-	}
-	 .acp-menu li.new
-	{
-		background-image: url( _newimages/icons/folder_add.png );
-	}
-	 .acp-menu li.password
-	{
-		background-image: url( _newimages/icons/key.png );
-	}
-	 .acp-menu li.export
-	{
-		background-image: url( _newimages/icons/export.png );
-	}
-	 .acp-menu li.refresh
-	{
-		background-image: url( _newimages/icons/arrow_refresh.png );
-	}
-	 .acp-menu li.printer
-	{
-		background-image: url( _newimages/icons/printer.png );
-	}
-	 .acp-menu li.find
-	{
-		background-image: url( _newimages/icons/user_find.png );
-	}
-	 .acp-menu li.assign
-	{
-		background-image: url( _newimages/icons/user_assign.png );
-	}
-	 .acp-menu li.user
-	{
-		background-image: url( _newimages/icons/user.png );
-	}
-	 .acp-menu li.package
-	{
-		background-image: url( _newimages/icons/package.png );
-	}
-	
- .acp-menu a,  .acp-menu a:hover
-{
-	text-decoration: none;
-	/* Fix styling applied by tables/tableheaders */
+		#ls_results > div {
+			position: absolute;
+			top: 30px;
+			right: 10px;
+			bottom: 30px;
+			left: 10px;
+			overflow: auto;
+		}
+		
+		#ls_results ul {
+			line-height: 1.7;
+			margin: 0px 0 0 20px;
+		}
+			
+			#ls_results li.even,
+			#ls_results li.odd {
+				float: left;
+				width: 48%;
+				padding: 5px 0;
+				line-height: 1.2;
+			}
+				
+		#ls_marketplace_panel .pad {
+			font-size: 17px;
+			text-align: center;
+			line-height: 1.5;
+			margin-top: 30px;
+		}
+		
+		#ls_forums_panel li {
+			line-height: 1.2;
+			padding: 5px 0;
+		}
+		
+		#ls_results img {
+			width: 30px;
+			height: 30px;
+			margin-right: 5px;
+			border: 1px solid #d8d8d8;
+		}
+		
+		#ls_results .desctext {
+			font-size: 11px;
+		}
+		
+#ls_no_results {
+	font-size: 16px;
+	color: #9e9e9e;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 47%;
+	text-align: center;
+}
+
+#ls_stem {
+	position: absolute;
+	top: -18px;
+	right: 180px;
+}
+
+.livesearch-groups {
+	font-style: italic;
 	color: #000;
 }
 
- .acp-menu b,  .acp-menu strong
-{
-	/* Fix styling applied by tables/tableheaders */
-	font-weight: normal;
+/****************************************************/
+/* GENERAL PAGE STYLES								*/
+/****************************************************/
+.section_title h2 {
+	font-size: 26px;
+	font-weight: 300;
+	margin-bottom: 15px;
+	padding-bottom: 5px;
 }
 
-/* Quick Start! */
-.quick_start td {
-	padding: 0;
+.section_info {
+	margin-top: -15px;
+	margin-bottom: 25px;
+	color: #7f7f7f;
+	line-height: 1.5;
+	font: 13px/1.3 "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
-.quick_start .buttons {
-	background-color: #D0DAEF;
-	float: left;
-	width: 50%;
-}
-.quick_start .quick_search {
-	border-bottom: 1px solid #E0E7E9;
-	background-color: #E9EFF3;
-	width: 50%;
+table.double_pad td {
+	padding: 15px;
 }
 
-.quick_start a {
-	display:block;
-	margin:2px;
-	padding:3px;
-	text-decoration:none !important;
-	font-weight:bold;
+/****************************************************/
+/* BLOCK STYLES										*/
+/****************************************************/
+.acp-box, .ipsBlock { 
+	-moz-box-shadow: 0 0px 14px rgba(138,138,138,0.2);
+	-webkit-box-shadow: 0 0px 14px rgba(138,138,138,0.2);
+	box-shadow: 0 0px 14px rgba(138,138,138,0.2);
+	border: 1px solid #d7e6f0;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
 }
-
-.quick_start label {
-	font-weight: bold;
-	float: left;
-	margin: 6px 0px 0px 6px;
-}
-
-.quick_start form {
-	float:right;
-	margin-right: 6px;
-}
-
-/*#admin_notes {
-	text-align: center;
-	padding: 6px;
-	background-color: #E9EFF3;
-}
-
-#board_overview
-{
-	float: left;
-	background-color: #EEF3F8;
-	width: 100%;
-}
-#board_overview dl {
-	margin-left:10px;
-}
-
-#board_overview dt, #board_overview dd {
-	font-size: 0.85em;
-	padding: 4px;
-	width: 45%;
-}
-
-#board_overview dt {
-	float: left;
-}
-
-#board_overview dd {
-	float: right;
-	font-weight: bold;
-	border-left: 1px solid #E0E7E9;
-}
-
-#board_overview h3 {
-	margin: 6px 0 8px;
-	font-weight: bold;
-	font-size: 1em;
-	float: left;
-}
-
-#board_overview dt, #board_overview h3 {
-	clear: both;
-}*/
-
-
-/****************************************************************************************************************
-
-NEW STYLES:
-
-****************************************************************************************************************/
-
-#main_content .acp-box
-{
-    border: 0;
-    border-bottom: 5px solid #D5DDE5;
-}
-
-#main_content .acp-box.with_bg
-{
-	background: #E5ECF3;
-}
-
-#main_content .acp-box h3
-{
-    background: #1d3652 url('../../public/style_images/master/gradient_bg.png') repeat-x 50%;
-    color: #fff;
-    font-size: 1.1em;
-    padding: 7px;
-}
-
-#main_content .acp-box p
-{
-	background: #F1F4F7;
-	padding: 5px;
-}
-
-#main_content .acp-box table
-{
-    border: 0;
-}
-
-#main_content .acp-box table th
-{
-    background: #B1C2D4 url(../../public/style_images/master/gradient_bg.png) repeat-x;
-    font-weight: bold;
-    padding: 5px;
-}
-
-#main_content .acp-box table td
-{
-    padding: 5px;
-}
-
-#main_content .acp-box table.double_pad td
-{
-    padding: 10px;
-}
-
-#main_content .acp-box table.triple_pad td
-{
-    padding: 15px;
-}
-
-#main_content .acp-box table.double_pad th
-{
-    padding: 5px 10px;
-}
- 
-#main_content .acp-box table.triple_pad th
-{
-	padding: 5px 15px;
-}
-
-#main_content .acp-box table.top_align td
-{
-	text-align: top;
-}
-
-#main_content .acp-box th.sub.double_pad
-{
-    padding: 10px;
-}
-
-#main_content .acp-box h3 .right{
-    float: right;
-	margin-top: -19px;
-}
-
-#main_content .acp-box .box {
-	width: 200px;
-	padding: 3px;
-    color: #1D3652;	
-    background: #ECF1F5 url(../../public/style_images/master/gradient_bg.png) repeat-x 70%;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-}
-
-.modal-overflow {
-	max-height: 500px;
-	display: block;
-	overflow: auto;
-}
-
-.acp-actionbar
-{
-    padding: 5px;
-    background: #E5ECF3 !important;
-    text-align: center;
-	height: 26px;
-	/*position: relative;*/
-}
-
-/*.acp-actionbar .rightaction
-{
-    float: right;
-	position: absolute;
-	right: 5px;
-	top: 3px;
-}*/
-
-/*.acp-actionbar .leftaction
-{
-    float: left;
-	position: absolute;
-	left: 5px;
-	bottom: 8px;
-}*/
-
-.dropdown-button {
-	background: #ECF1F5 url(../../public/style_images/master/gradient_bg.png) repeat-x 70%;
-    color: #1D3652;
-    padding: 5px;
-    border: 1px solid #D5DDE5;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    cursor: pointer;
-}
-
-.button, .realbutton
-{
-    /*background: #ECF1F5 url(../../public/style_images/master/gradient_bg.png) repeat-x 70%;
-    color: #1D3652;
-    padding: 5px;
-    border: 1px solid #D5DDE5;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    cursor: pointer;*/
-	background: #657b97 url(../../public/style_images/master/gradient_bg.png) repeat-x 70%;;
-	color: #fff;
-	padding: 3px;
-	border: 1px solid #3e546f;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    cursor: pointer;
-	text-decoration: none;
-}
-
-.button.nohand,
-.realbutton.nohand
-{
-	cursor: text;
-}
-
-.button:hover, .realbutton:hover {
-	color: #fff;
-	text-decoration: none !important;
-}
-
-.realbutton.redbutton {
-	background-color: #a31d1d;
-	border-color: #661515;
-}
-
-#main_content .button .primary
-{
-    background-color: white;
-    border-color: #B1C2D4;
-}
-
-#main_content .button .primary:hover
-{
-    border-color: #1d3652;
-}
-
-#main_content .button .match_textbox
-{
-    padding-top: 1px;
-    padding-bottom: 1px;
-}
-
-/*-----------------------------------------------*/
-/* Pagination	    			                 */
-/*-----------------------------------------------*/
 	
-span.pagination.no_pages {
-	font-size: 0.9em;
-	color: #acacac;
-	padding: 10px;
-	float: left;
-	display: block;
-	height: 15px;
-}
-
-ul.pagination {
-	height: 18px;
-	float: left;
-	margin-bottom: 10px;
-}
-
-	ul.pagination.top {
-		/*border-bottom: 1px solid #e1e1e1;*/
-		margin-bottom: 15px;
-		padding: 0 0 5px 0;
-	}
-
-	ul.pagination.bottom {
-		margin-top: 15px;
-		/*border-top: 1px solid #e1e1e1;*/
-		padding: 5px 0 0 0;
-	}
-
-ul.pagination a {
-	text-decoration: none;
-}
-
-ul.pagination li {
-	float: left;
-	font-size: 0.9em;
-	padding: 1px 4px;
-	margin: 0 2px 0 2px;
-	border: 1px solid #cfcfcf;
-	background: #fff;
-}
-
-	ul.pagination li.total {
-		background: none;
-		border: 0;
-		margin-left: 0px;
-	}
-
-	ul.pagination li.active {
-		font-size: 1em;
-		color: #528f6c;
-		font-weight: bold;
-		border: 0;
-		background-color: transparent;
-	}
-
-ul.topic_jump {
-	margin: 0 auto 15px auto;
-	float: right;
-	border-top: 1px solid #e4e4e4;
-	font-size: 0.8em;
-	padding-top: 4px;
-	clear: both;
-}
-
-ul.topic_jump li {
-	float: left;
-	padding: 1px 7px;
-	font-weight: bold;
-}
-	ul.topic_jump li a {
-		text-decoration: none;
-	}
-
-	ul.topic_jump li.previous a,
-	ul.topic_jump li.next a {
-		font-weight: normal;
-	}
-
-	ul.topic_jump li.previous {
-		border-right: 1px solid #8f8f8f;
-	}
-
-	ul.topic_jump li.next {
-		border-left: 1px solid #8f8f8f;
+	.acp-box.alt, .ipsBlock.alt {
+		border-color: #e8dbe3;
 	}
 	
-ul.mini_pagination {
-	display: inline;
-	font-size: 0.75em;
-	margin-left: 7px;
-}
-
-	ul.mini_pagination li {
-		display: inline;
-		padding: 1px 3px;
-		border: 1px solid #d3d3d3;
-		margin-right: -1px;
+	.acp-box h3, .ipsBlock_title {
+		background: #23456b url( images/acpBlockTitle.png ) repeat-x;
+		color: #fff;
+		font-size: 16px;
+		font-weight: 300;
+		padding: 0 10px;
+		height: 36px;
+		line-height: 36px;
+		text-shadow: 0px 1px 2px rgba(0,0,0,0.5);
+		border-bottom: 1px solid #2d3e52;
+		-moz-border-radius-topleft: 5px;
+		-moz-border-radius-topright: 5px;
+		border-top-left-radius: 5px;
+		border-top-right-radius: 5px;
 	}
 	
-	
-ul.options_menu {
-		float: right;
-		display: block;
-		margin-top: -20px;
-		padding: 2px;
-		z-index: 1000;
-		background-color: #e4ebf2;/*#e4ebf2;*/
-		border-radius: 3px;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-	}
-
-		ul.options_menu li {
-			float: left;
-		}
-
-		ul.options_menu li a {
-			display: block;
-			float: left;
-			padding: 0 3px;
+		pre .acp-box h3 {
+			font-family: 'Helvetica Neue',helvetica,arial,sans-serif !important;
 		}
 		
-/*-----------------------------------------------*/
-/* Members 		    			                 */
-/*-----------------------------------------------*/
+		.acp-box.alt h3, .ipsBlock_title.alt {
+			background: #ab166e url( images/acpBlockTitle_alt.png ) repeat-x;
+			border-bottom: 1px solid #851256;
+		}
+		
+		.acp-box h3 .loading {
+			font-size: 12px;
+		}
+		
+	.ipsBlock_titlelink {
+		float: right;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+		padding: 5px 8px;
+		display: inline-block;
+		color: #fff;
+		text-shadow: none;
+		font-size: 12px;
+		background: #19395d;
+		line-height: 1;
+		margin-top: 9px;
+		-moz-box-shadow: 2px 2px 4px rgba(0,0,0,0.2) inset;
+		-webkit-box-shadow: 2px 2px 4px rgba(0,0,0,0.2) inset;
+		box-shadow: 2px 2px 4px rgba(0,0,0,0.2) inset;
+	}
+	
+		.ipsBlock_titlelink:hover {
+			background: #ab156d;
+			color: #fff;
+		}	
 
-.member_form span.member_detail
-{
-	display: inline-block;
-	padding: 5px;
-	min-width: 210px;
-}
-
-.member_form input, .member_form select
-{
-}
-
-.change_icon
-{
-	width: 16px;
-	height: 16px;
-	background: url('images/pencil_go.png');
-	text-indent: -5000px;
-	display: inline-block;
-	outline: 0
-}
-
-.acp-sidebar
-{
-}
-
-.acp-sidebar .sidebar_box
-{
-	border: 1px solid #b3c2d2;
-	width: 80%;
-	margin: 10px auto;
-	background: #fff;
-	padding: 5px;
-}
-
-.big_red_button
-{
-	border: 1px solid #804040;
-	background: #BF3030 url(../../public/style_images/master/gradient_bg.png) repeat-x scroll 50% 50%;
-	color: #fff;
-	display: block;
+/****************************************************/
+/* FORM ELEMENT STYLES								*/
+/****************************************************/
+.textinput, .multitext, .input_text {
 	padding: 4px;
-	margin: 10px 0 0 0;
-	text-decoration: none;
+	border-width: 1px;
+	border-style: solid;
+	border-top-color: #848484;
+	border-left-color: #c1c1c1;
+	border-right-color: #c1c1c1;
+	border-bottom-color: #e1e1e1;
+	background: #fff;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	width: 350px;
 }
 
-	.big_red_button:hover {
-		color: #fff !important;
+	.textinput:focus, .multitext:focus, .input_text:focus {
+		border-top-color: #4e4e4e;
+		border-left-color: #7c7c7c;
+		border-right-color: #7c7c7c;
+		border-bottom-color: #a3a3a3;
+		-moz-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+		-webkit-box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+		box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+	}
+	
+	.textinput.no_width, .input_text {
+		width: auto;
+	}
+	
+input.inactive, select.inactive {
+	color: #c4c4c4;
+}
+
+select {
+	padding: 1px;
+}
+
+.acp-actionbar {
+	background: #f5f5f5;
+	border-top: 1px solid #d7d7d7;
+	padding: 10px;
+	text-align: center;
+}
+
+	.rightaction {
+		text-align: right;
 	}
 
-.photo_options
-{
-	display: inline-block;
-	background: #369;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	float: right;
-	position: relative; 
-	top: -19px;
-	left: 5px;
-	padding: 4px 0 4px 4px;
+.button, .realbutton{
+	padding: 5px 19px;
+	border: 0;
+	background: #363636;
+	color: #fff !important;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	cursor: pointer;
 }
 
-.photo_options li
-{
-	display: inline-block;
-	margin-right: 3px;
-	position: relative;
-	top: 1px;
-}
+	.button.redbutton, .realbutton.redbutton {
+		background-color: #a31d1d;
+		border-color: #661515;
+	}
 
-span.yesno_yes, span.yesno_no
-{
+.mini_button, .mini_button.secondary {
+	display: inline-block;
+	padding: 3px 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	background: #ab156d;
+	color: #fff;
+	font-size: 12px;
+	margin-left: 10px;
+}
+	.mini_button:hover, .mini_button.secondary:hover {
+		background: #ce3c92;
+		color: #fff;
+	}
+	
+	.mini_button.secondary, .mini_button.secondary:hover {
+		background: #b3b3b3;
+	}
+
+span.yesno_yes, span.yesno_no {
 	display: inline-block;
 	padding: 3px;
 	min-width: 50px;
@@ -1387,275 +786,1450 @@ span.yesno_yes, span.yesno_no
 	text-align: center;
 }
 
-span.yesno_yes input, span.yesno_no input
-{
+span.yesno_yes input, span.yesno_no input {
 	margin-right: 10px;
 }
 
-span.yesno_yes
-{
+span.yesno_yes { 
 	background: #e3f6e5;
 	border: 1px solid #b4e3b9;
 	border-right: 0;
 	border-top-left-radius: 6px;
 	border-bottom-left-radius: 6px;
-	-moz-border-radius-top-left: 6px;
-	-moz-border-radius-bottom-left: 6px;
-	-webkit-border-top-left-radius: 6px;
-	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	-moz-border-radius-bottomleft: 6px;
 }
 
-span.yesno_no
-{
+span.yesno_no {
 	background: #f6e3e3;
 	border: 1px solid #e3b4b4;
 	border-left: 0;
 	border-top-right-radius: 6px;
 	border-bottom-right-radius: 6px;
-	-moz-border-radius-top-right: 6px;
-	-moz-border-radius-bottom-right: 6px;
-	-webkit-border-top-right-radius: 6px;
-	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	-moz-border-radius-bottomright: 6px;
 }
 
-.member_name
-{
+.ipsCancel {
+	color: #aa072e;
 	font-weight: bold;
 }
 
-/*-----------------------------------------------*/
-/* Forms 		    			                 */
-/*-----------------------------------------------*/
-.acp-form ul {
-	list-style-type: none;
-	list-style-image: none;
-	list-style-position: outside;
-}
+#ipboard_body .ips_editor { margin: 0 !important; }
 
-	.acp-form.sep_rows li {
-		border-bottom: 1px solid #eee;
-		padding-bottom: 10px;
-		margin-bottom: 10px;
-	}
-	
-.acp-form li {
-	display: block;
-	padding-bottom: 1em;
-	overflow: hidden;
-	padding: 5px;
-}
-
-
-.acp-form label {
-	float: left;
-	width: 50%; 
-	font-weight: bold;
-	padding-right: 5px;
-	padding-left: 10px;
-}
-
-.acp-form label.head, .acp-form li.head {
-	display: block;
-	padding-bottom: 1em;
-	overflow: hidden;
-	padding: 5px;
+/****************************************************/
+/* BASE TABLE STYLES								*/
+/****************************************************/
+.ipsTable, .form_table {
 	width: 100%;
-	background:#B1C2D4 url(../../public/style_images/master/gradient_bg.png) repeat-x scroll 50% 50%;
 }
 
-.acp-form span.desctext {  
-	display: block;
-	color: #666666;  
-	font-size: 0.9em;  
-	font-family: arial,verdana,tahoma,sans-serif;
-	font-style: normal;
-	font-weight: normal;
+.ipsTable.no_background td {
+	background: transparent;
 }
 
-.acp-form input, textarea, select {
-	width: auto;
-	vertical-align: middle;
+.ipsTable th, .form_table th {
+	background: #d6e4f1;
+	color: #246594;
+	text-shadow: 1px 1px 0 #d4e1ef;
+	padding: 10px;
+	font-size: 12px;
+	font-weight: bold;
 }
 
-.acp-form span.yesno_yes, .acp-form span.yesno_no
-{
-	display: inline-block;
-	padding: 3px;
-	min-width: 60px;
-	max-width: 60px;
-	text-align: center;
-}
+	.acp-box.alt .ipsTable th {
+		background: #F7E4ED;
+		color: #96235D;
+		text-shadow: 1px 1px 0 #EDD3E0;
+	}
 
-.acp-form span.yesno_yes input, .acp-form span.yesno_no input
-{
-	margin-right: 12px;
-}
+	.ipsTable th.subhead,
+	.ipsTable td.subhead,
+	.form_table th.subhead,
+	.form_table td.subhead
+	{
+		background: #eaf1f7;
+	}
 
-span.yesno_yes label,
-span.yesno_no label {
-	float: none !important;
-	font-weight: normal !important;
-	clear: none !important;
-	width: auto !important;
-	padding: 0 !important;
-}
-
-.form_table td {
+.ipsTable td, .form_table td {
 	padding: 10px;
 }
 
-	.form_table td label {
-		font-weight: bold;
-		width: 90% !important;
+table .field_title {
+	width: 25%;
+	max-width: 280px;
+	min-width: 230px;
+	vertical-align: top;
+	text-align: right;
+}
+
+.field_title .title, .form_table td label {
+	font-size: 14px;
+	font-weight: bold;
+	display: block;
+	text-align: right;
+}
+
+.field_highlight {
+	color: #d27f29;
+	text-transform: uppercase;
+	font-size: 10px;
+}
+
+.required {
+	color: #b53300;
+	font-weight: bold;
+	font-size: 13px;
+	margin-left: 3px;
+}
+
+._red
+{
+	background: #f2e4e7;
+}
+
+._amber
+{
+	background: #F9F7E0 !important;
+}
+
+.ipsTable tr:nth-child(odd) td,
+.ipsTable tbody:nth-child(odd) td,
+table.alternate_rows tr:nth-child(odd) td,
+ul.alternate_rows  li:nth-child(odd) .ipsTable tr td,
+ul.alternate_rows  li:nth-child(odd),
+.row2 { /* Special case for settings */
+	background: #f5f8fa;
+}
+
+.ipsTable tr:nth-child(even) td,
+.ipsTable tbody:nth-child(even) td,
+table.alternate_rows tr:nth-child(even) td,
+ul.alternate_rows  li:nth-child(even) .ipsTable tr td,
+ul.alternate_rows  li:nth-child(even),
+.row1 { /* Special case for settings */
+	background: #fff;
+}
+
+	.acp-box.alt .ipsTable tr:nth-child(odd) td,
+	.acp-box.alt .alternate_rows tr:nth-child(odd) td,
+	.acp-box.alt ul.alternate_rows  li:nth-child(odd) .ipsTable tr td,
+	.acp-box.alt .row2 { /* Special case for settings */
+		background: #faf6f8;
 	}
 
-/* --------------- */
-/* Inline form styles */
+.ipsTable .col_buttons { vertical-align: top; }
 
-#inlineFormWrap
-{
-	position: absolute;
-	background-color: #5f5f5f;
-	color: #000;
-	width: 350px;
-	border:1px solid #FFF;
-	z-index: 150;
+.ipsTable .col_drag {
+	padding-left: 5px;
+	padding-right: 5px;
+	text-align: left;
+	max-width: 15px !important;
+	width: 15px !important;
+	min-width: 15px !important;
 }
 
-#inlineFormInnerWrap
-{
-	
+.col_buttons {
+	min-width: 90px;
 }
 
-#inlineFormInnerClose
-{
-	margin: 9px 10px 0px 0px;
-	width: 13px;
-	height: 13px;
-	float: right;
-	/*background-image: url('images/close_dark_round.gif');*/
-	background-repeat: no-repeat;
+.no_messages {
+	padding: 20px !important;
+}
+
+.no_pad {
+	padding: 0 !important;
+}
+
+tr.ipsControlRow {
+	width: 100%;
+}
+
+/* sortable */
+.ipsTable .sortable:hover {
+	background: #c4d7e9;
 	cursor: pointer;
 }
 
-#inlineFormInnerTitle
-{
-	padding: 2px;
-}
+	.ipsTable .sortable p {
+		position: relative;
+	}
 
-#inlineFormInnerContent
-{
-	background-color: #edf0f4;
-	border: 1px solid #4d5b6b;
+		.ipsTable .sortable span {
+			position: absolute;
+			right: 0;
+			top: 2px;
+			width: 13px;
+			height: 13px;
+			background-image: url( images/sortable_arrows.png );
+			background-repeat: no-repeat;
+		}
+		
+	.ipsTable .sortable.active {
+		background: #7ba3c9;
+		background: -moz-linear-gradient(top, #769ec3 0%, #c0d4e7 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#769ec3), color-stop(100%,#c0d4e7)); /* webkit */
+		color: #0b5794;
+		-moz-box-shadow: 0px 2px 3px rgba(0,0,0,0.2) inset;
+		-webkit-box-shadow: 0px 2px 3px rgba(0,0,0,0.2) inset;
+		box-shadow: 0px 2px 3px rgba(0,0,0,0.2) inset;
+	}
+	
+	.ipsTable .sortable span { opacity: 0.1; }
+	.ipsTable .sortable:hover span { opacity: 0.5; }
+	.ipsTable .sortable.active span { opacity: 1; }
+	
+	.ipsTable .sortable.active.desc span {
+		background-position: left bottom;
+	}
+	.ipsTable .sortable.desc span {
+		background-position: left top;
+	}
+	.ipsTable .sortable.active.asc span {
+		background-position: right bottom;
+	}
+	.ipsTable .sortable.asc span {
+		background-position: right top;
+	}
+
+/****************************************************/
+/* DRAG STYLES										*/
+/****************************************************/
+.draghandle {
+	text-indent: -2000em;
+	display: inline-block;
+	width: 6px;
+	height: 16px;
+	background: url( images/ipsDragHandle.png ) no-repeat;
+	opacity: 0.5;
+	cursor: move;
+}
+	
+	.draghandle img { display: none; } /* Hide legacy dragger */
+
+	.ipsDragParent tr:hover .draghandle {
+		opacity: 1;
+	}
+	
+/****************************************************/
+/* ACTION BAR (CONTEXT MENU) STYLES					*/
+/****************************************************/
+.ipsActionBar, .context_menu {
+	background: #eaeef4;
 	padding: 5px;
+	margin: -15px 0 15px 0;
+	border-top: 1px solid #ccd4e5;
+	border-top: 0;
 }
-
-#inlineFormInnerTitle h4 {
-	background-color: #3d3d3d;
-	font-size: 16px;
-	color: #fff;
-	padding: 6px;
-	font-weight: normal;
-}
-
-#inlineFormLoading
-{
-	text-align: center;
-	font-size:18px;
-	font-weight: bold;
-	background-color: #FFFFFF;
-	border: 1px solid #4d5b6b;
-	padding:20px;
-	z-index:1000;
-}
-
-#inlineErrorBox
-{
-	border: 1px solid #000;
-	background-color: #FFCCCC;
-	font-size:14px;
-	text-align: center;
-	padding-top:20px;
-	z-index: 999;
-}
-
-	#inlineErrorBox strong
-	{
-		font-size:30px;
+	
+	.ipsActionBar > ul > li, .context_menu > li, .ipsToggleBar > ul > li {
+		float: left;
 	}
 	
-	#inlineErrorBox img
-	{
-		vertical-align: -12px;
+	.ipsActionBar .non_button {
+		padding: 6px 0;
+		display: inline-block;
 	}
 	
-#inlineErrorText
-{
-	overflow: auto;
-	height: 90px;
-	padding:8px;
-}
+	.ipsActionButton a, .context_menu li a {
+		padding: 0 10px;
+		margin-right: 5px;
+		display: inline-block;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+		background: #FFFFFF; /* old browsers */
+		background: -moz-linear-gradient(top, #FFFFFF 0%, #F6F9FA 3%, #E4EEF3 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(3%,#F6F9FA), color-stop(100%,#E4EEF3)); /* webkit */
+		font-size: 12px;
+		border: 1px solid #afd4f1;
+		color: #0b5794;
+		text-shadow: 1px 1px 0 #f4f7fa;
+		height: 26px;
+		line-height: 26px;
+		outline: none;
+	}
+		
+		.ipsActionButton:hover a, .context_menu li:hover a {
+			-moz-box-shadow: 0px 0px 2px rgba(0,174,239,0.4);
+			-webkit-box-shadow: 0px 0px 2px rgba(0,174,239,0.4);
+			box-shadow: 0px 0px 2px rgba(0,174,239,0.4);
+			border-color: #73a2c3;
+		}
+		
+			.ipsActionButton:active a, .context_menu li:active a {
+				background: #E4EEF3; /* old browsers */
+				background: -moz-linear-gradient(top, #E4EEF3 0%, #F4F8FA 100%); /* firefox */
+				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E4EEF3), color-stop(100%,#F4F8FA)); /* webkit */
+			}
+		
+		.ipsActionButton.active a, .context_menu li.active a {
+			background: #CE3C92; /* old browsers */
+			background: -moz-linear-gradient(top, #CE3C92 0%, #AB156D 100%); /* firefox */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
+			color: #fff;
+			text-shadow: -1px -1px 0 #97115f;
+			border-color: #9d1263;
+		}
+		
+		.ipsActionButton.disabled a, .context_menu li.disabled a {
+			color: #99a8b4;
+			opacity: 0.7;
+		}
+		
+			.ipsActionButton.disabled img { opacity: 0.6; }
+			
+			.ipsActionButton.disabled:hover a, .context_menu li.disabled:hover a {
+				-moz-box-shadow: none;
+				box-shadow: none;
+				border-color: #afd4f1;
+				cursor: default;
+			}
+			
+		.ipsActionButton a, .context_menu li a {
+			color: #0b5794;
+		}
+		
+		.ipsActionButton img, .context_menu li img {
+			margin: -2px 5px 0 0;
+		}
 
-.inlineFormEntry
-{
-	background-color: #e7eaf0;
-	margin-bottom: 2px;
-}
+/* In dev button styles */
+	.ipsActionBar > ul > li.inDev {
+		float: right;
+		display: none;
+	}
 
-.inlineFormLabel
-{
-	padding: 4px;
-	font-size: 14px;
-	font-weight: bold;
-}
+/* Secondary actions lit up */
+    .ipsActionButton.closed a, .context_menu li.closed a {
+		background: #AB156D; /* old browsers */
+		background: -moz-linear-gradient(top, #FFFFFF 0%, #CE3C92 3%, #AB156D 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(3%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
+		border: 1px solid #8c1159;
+		text-shadow: -1px -1px 0 #8f115b;
+		color: #fff;
+    }
+       
+		.ipsActionButton.closed:hover a,.context_menu li.closed:hover a {
+			-moz-box-shadow: 0px 0px 2px rgba(143,17,91,0.4);
+			-webkit-box-shadow: 0px 0px 2px rgba(143,17,91,0.4);
+			box-shadow: 0px 0px 2px rgba(143,17,91,0.4);
+			border-color: #8f115b;
+		}
+		
+			.ipsActionButton.closed:active a,.context_menu li.closed:active a {
+				background: #E4EEF3; /* old browsers */
+				background: -moz-linear-gradient(top, #CE3C92 0%, #AB156D 100%); /* firefox */
+				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
+			}
 
-.inlineFormLabel p
-{
-	color: gray;
-	font-weight:normal;
+/* Separate styles for toggle buttons */
+.ipsToggleBar .ipsActionButton a {
+	margin-right: 0;
+}
+ 
+.ipsToggleBar .ipsActionButton a {
+	border-right-width: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
 	font-size: 11px;
 }
 
-.inlineFormInput
-{
-	padding: 4px;
+.ipsToggleBar .ipsActionButton:first-child a {
+	-moz-border-radius-topleft: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+}
+.ipsToggleBar .ipsActionButton:last-child a {
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-top-right-radius: 3px;
+	border-bottom-right-radius: 3px;
+	border-right-width: 1px;
 }
 
-.inlineFormSubmit
-{
-	background-color: #4b5b6e;
+.ipsToggleBar .ipsActionButton:hover + li a {
+	border-left-color: #73a2c3;
+}
+
+.ipsToggleBar .ipsActionButton.active a {
+	border-width: 1px;
+}
+
+/****************************************************/
+/* TAB STYLES										*/
+/****************************************************/
+.ipsTabBar {
+	max-width: 100%;
+	height: 30px;
+	padding: 10px 10px 0 20px;
+	background: #849cb7;
+	overflow: hidden !important;
+	position: relative;
+}
+
+	.ipsTabBar ul {
+		height: 30px;
+		width: 100%;
+		display: inline;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.ipsTabBar li {
+		display: inline-block;
+		padding: 7px 10px;
+		font-size: 13px;
+		background: #40638B; /* old browsers */
+		background: -moz-linear-gradient(top, #40638B 0%, #40638B 68%, #2C5789 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#40638B), color-stop(68%,#40638B), color-stop(100%,#2C5789)); /* webkit */
+		color: #d7eaf8;
+		cursor: pointer;
+		white-space: nowrap;
+		-moz-border-radius-topleft: 3px;
+		-moz-border-radius-topright: 3px;
+		border-top-left-radius: 3px;
+		border-top-right-radius: 3px;
+	}
+	
+		.ipsTabBar li a { color: #d7eaf8; }
+		.ipsTabBar li.active a { color: #000; }
+		
+		.ipsTabBar li.active {
+			background: #fff;
+			color: #000;
+			-moz-box-shadow: 0px 0px 8px rgba(0,0,0,0.1);
+			-webkit-box-shadow: 0px 0px 8px rgba(0,0,0,0.1);
+			box-shadow: 0px 0px 8px rgba(0,0,0,0.1);
+			cursor: default;
+			font-weight: bold;
+		}
+		
+.ipsTabBar_content {
+	position: relative;
+}
+
+	.ipsTabBar_content > div {
+		position: relative;
+		top: 00px;
+		right: 00px;
+		left: 00px;
+	}
+
+.tab_left, .tab_right {
+	position: absolute;
+	background: #173451;
+	color: #fff;
+	width: 16px;
+	height: 36px;
+	top: 4px;
+	line-height: 36px;
 	text-align: center;
-	padding: 6px;
-	color: #30353c;
-	border-bottom: 1px solid #d9dee8;
-	height: 22px;
+	z-index: 10000;
+	cursor: pointer;
+}
+.tab_left {	
+	left: 0px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-moz-box-shadow: 3px 0 5px #365b81;
+	-webkit-box-shadow: 3px 0 5px #365b81;
+	box-shadow: 3px 0 5px #365b81;
+}
+.tab_right { 
+	right: 0px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-moz-box-shadow: -3px 0 5px #365b81;
+	-webkit-box-shadow: -3px 0 5px #365b81;
+	box-shadow: -3px 0 5px #365b81;
 }
 
-/* Autocomplete */
-.ipbmenu_content {
-	background-color: #eef3f8;
-	border: 1px solid #d5dde5;
-	min-width: 85px;
-	padding: 5px;
-	font-size: 0.9em;
-	z-index: 150;
-	margin-left: 0px;
+/****************************************************/
+/* WIZARD STEPS										*/
+/****************************************************/
+.ipsSteps_wrap {
+	background: #e9eff5;
+	padding: 10px;
+}
+
+.ipsSteps_wrapper {
+	position: relative;
+	overflow: hidden;
+}
+	.step_content_animating {
+		position: absolute;
+		top: 0; left: 0; right: 0;
+	}
+
+.ipsSteps {
+	margin-bottom: 10px;
+	background: #dee7f1;
+	border: 1px solid #fff;
+}	
+	.ipsSteps ul li {
+		float: left;
+		padding: 10px 33px 11px 11px;
+		color: #323232;
+		background-image: url( images/wizard_step_large.png );
+		background-repeat: no-repeat;
+		background-position: bottom right;
+		position: relative;
+	}
+	
+	.ipsSteps .steps_active {
+		background-position: top right;
+		color: #fff;
+	}
+	
+	.ipsSteps .steps_done {
+		color: #aeaeae;
+	}
+	
+	.ipsSteps .steps_disabled {
+		color: #aeaeae;
+		font-style: italic;
+		opacity: 0.6;
+	}
+	
+	.steps_title {
+		display: block;
+		font-size: 14px;
+	}
+	
+	.steps_desc {
+		font-size: 11px;
+	}
+	
+	.steps_arrow { display: none; }
+	
+	.steps_active .steps_arrow {
+		display: block;
+		position: absolute;
+		left: -23px;
+		top: 0;
+		width: 23px;
+		height: 54px;
+		background: url( images/wizard_step_extra.png ) no-repeat;
+	}
+	
+	.ipsSteps ul li:first-child {
+		padding-left: 18px;
+	}
+	
+	.ipsSteps ul li:first-child .steps_arrow {
+		display: none !important;
+	}
+	
+	.ipsSteps .clickable:hover {
+		cursor: pointer;
+		color: #386f9b;
+	}
+	
+/****************************************************/
+/* CONTROL STRIP BUTTONS							*/
+/****************************************************/
+
+.ipsControlStrip {
+	float: right;
+	opacity: 0.4;
 }
 	
-	.ipbmenu_content li {
-		border-bottom: 1px solid #d5dde5;
-		padding: 5px;
+	.ipsControlRow:hover .ipsControlStrip {
+		opacity: 1;
 	}
 	
-	.ipbmenu_content li:last-child {
-		border-bottom: 0;
-		padding-bottom: 0px;
+	.ipsControlStrip a {
+		outline: 0;
+	}
+
+.ipsControlStrip li:first-child, .ipsControlStrip li:first-child a {
+	-moz-border-radius-topleft: 4px;		border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;		border-bottom-left-radius: 4px;
+}
+.ipsControlStrip li:last-child, .ipsControlStrip li:last-child a {
+	-moz-border-radius-topright: 4px;		border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;	border-bottom-right-radius: 4px;
+}
+
+.ipsControlStrip li {
+	display: block;
+	float: left;
+	background: #E4EEF3; /* old browsers */
+	background: -moz-linear-gradient(top, #FFFFFF 0%, #F4F8FA 1%, #E4EEF3 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(1%,#F4F8FA), color-stop(100%,#E4EEF3)); /* webkit */
+	text-indent: -2000em;
+	border: 1px solid #b1d1ea;
+	border-right: 0;
+	line-height: 16px;
+}
+	
+	.ipsControlStrip li:last-child {
+		border-right: 1px solid #b1d1ea;
+	}
+
+	.ipsControlStrip a {
+		display: block;
+		width: 16px;
+		padding: 1px 5px;
+		border: 1px solid #fff;
+		margin: 0;
+		background-image: url( images/menu_icon_sprite.png );
+		background-repeat: no-repeat;
 	}
 	
-	.ipbmenu_content li:first-child {
-		padding-top: 0px;
+		.ipsControlStrip li.i_text a {
+			background: transparent;
+			text-indent: 0;
+			white-space: nowrap;
+			width: auto;
+			color: #2d3e52;
+			font-size: 11px;
+		}
+	
+	.ipsControlStrip li:hover {
+		border-color: #136db5;
 	}
 	
+		.ipsControlStrip li:hover + li {
+			border-left-color: #136db5;
+		}
+	
+.ipsControlStrip_more a {
+	padding: 1px 0px;
+	height: 16px;
+	background: url( images/ipsControlStrip_arrow.png ) no-repeat 5px 8px;
+}
+
+/****************************************************/
+/* MENUS											*/
+/****************************************************/
+
+.acp-menu {
+	border: 1px solid #aabbcb;
+	background: #FAFBFC;
+	width: auto;
+	white-space: nowrap;
+	z-index: 150;
+	position: absolute;
+	-moz-box-shadow: 0px 3px 8px rgba(0,0,0,0.3);
+	-webkit-box-shadow: 0px 3px 8px rgba(0,0,0,0.3);
+	box-shadow: 0px 3px 8px rgba(0,0,0,0.3);
+}
+
+	.acp-menu li {
+		border-bottom: 1px solid #E5ECF3;
+		width: auto;
+		padding: 5px 10px;
+		text-align: left;
+		font-size: 12px;
+	}
+	
+.acp-menu li.icon {
+	background-repeat: no-repeat;
+	background-position: 8px;
+	padding-left: 35px;
+}
+
+.acp-menu li.add { 		background-image: url( images/icons/add.png ); 					}
+.acp-menu li.edit { 	background-image: url( images/icons/pencil.png ); 				}
+.acp-menu li.view {	 	background-image: url( images/icons/view.png ); 				}
+.acp-menu li.delete {	background-image: url( images/icons/delete.png );				}
+.acp-menu li.info { 	background-image: url( images/icons/page_white_magnify.png ); 	}
+.acp-menu li.manage {	background-image: url( images/icons/cog.png ); 					}
+.acp-menu li.new { 		background-image: url( images/icons/folder_add.png ); 			}
+.acp-menu li.password {	background-image: url( images/icons/key.png ); 					}
+.acp-menu li.export {	background-image: url( images/icons/export.png ); 				}
+.acp-menu li.refresh {	background-image: url( images/icons/arrow_refresh.png ); 		}
+.acp-menu li.printer {	background-image: url( images/icons/printer.png ); 				}
+.acp-menu li.find { 	background-image: url( images/icons/user_find.png ); 			}
+.acp-menu li.assign {	background-image: url( images/icons/user_assign.png ); 			}
+.acp-menu li.user { 	background-image: url( images/icons/user.png ); 				}
+.acp-menu li.package {	background-image: url( images/icons/package.png ); 				}
+.acp-menu li.cancel {	background-image: url( images/icons/cross.png ); 				}
+
+.multi_menu li {
+	position: relative;
+}
+
+/****************************************************/
+/* POPUP STYLES									*/
+/****************************************************/
+
+.popupWrapper {
+	background-color: rgba(0,0,0,0.58);
+	color: #fff;
+	-webkit-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
+	-moz-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.58);
+	box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.58 );
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	z-index: 16000;
+}
+
+	.popupInner {
+		background: #f1f4f7;
+		color: #000;
+		border-radius: 4px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+		margin: 8px;
+		width: 500px;
+		overflow: hidden;
+	}
+	
+		.popupInner.black_mode {
+			background: #000;
+			border: 3px solid #b3bbc3; 
+			color: #eee;
+			border: 3px solid #555;
+		}
+		
+		.popupInner.warning_mode {
+			border: 3px solid #7D1B1B; 
+		}
+	
+		.popupInner h3 {
+			background-color: #dae4ed;
+			border: 0;
+			padding-left: 10px;
+		}
+		
+			.popupInner.black_mode h3 {
+				background-color: #545C66;
+				color: #ddd;
+			}
+			
+			.popupInner.warning_mode h3 {
+				background-color: #7D1B1B;
+				padding-top: 6px;
+				padding-bottom: 6px;
+				color: #fff;
+			}
+			
+			.popupInner.warning_mode input.input_submit {
+				background-color: #7D1B1B;
+			}
+			
+.popupClose {
+	position: absolute;
+	right: 16px;
+	top: 16px;
+}
+
+.popupClose.light_close_button {
+	background: transparent url(../../public/style_images/master/close_popup_light.png) no-repeat top left;
+	opacity: 0.8;
+	width: 13px;
+	height: 13px;
+}
+
+.popupClose.light_close_button img {
+	display: none;
+}
+
+.popup_footer {
+	position: absolute;
+	bottom: 0px;
+	right: 0px;
+	padding: 15px;
+}
+
+.popup_body {
+	padding: 10px;
+}
+
+.stem {
+	width: 31px;
+	height: 16px;
+	position: absolute;
+}
+
+	.stem.topleft { background-image: url(images/stems/topleft.png);	}
+	.stem.topright { background-image: url(images/stems/topright.png); }
+	.stem.bottomleft { background-image: url(images/stems/bottomleft.png); }
+	.stem.bottomright { background-image: url(images/stems/bottomright.png);	}
+	
+/****************************************************/
+/* ICON SPRITES										*/
+/****************************************************/
+
+.i_new_folder a { 							background-position: 0 0; 			}
+	.ipsControlRow:hover .i_new_folder a { 	background-position: 0 -18px; 		}
+.i_delete a { 								background-position: -25px 0;		}
+	.ipsControlRow:hover .i_delete a { 		background-position: -25px -18px;	}
+	.ipsControlRow:hover .i_delete.disabled a { 		background-position: -25px 0; cursor: default;	}
+.i_edit a { 								background-position: -51px 0;		}
+	.ipsControlRow:hover .i_edit a {		background-position: -51px -18px;	}
+.i_page_add a { 							background-position: -77px 0;		}
+	.ipsControlRow:hover .i_page_add a { 	background-position: -77px -18px;	}
+.i_add a { 									background-position: -103px 0;		}
+	.ipsControlRow:hover .i_add a { 		background-position: -103px -18px;	}
+.i_refresh a { 								background-position: -129px 0;		}
+	.ipsControlRow:hover .i_refresh a { 	background-position: -129px -18px;	}
+.i_lock a { 								background-position: -155px 0;		}
+	.ipsControlRow:hover .i_lock a { 		background-position: -155px -18px;	}
+.i_accept a {								background-position: -181px 0; 		}
+	.ipsControlRow:hover .i_accept a { 		background-position: -181px -18px;	}
+.i_stock a { 								background-position: -207px 0;		}
+	.ipsControlRow:hover .i_stock a { 		background-position: -207px -18px;	}
+.i_cog a { 									background-position: -233px 0;		}
+	.ipsControlRow:hover .i_cog a { 		background-position: -233px -18px;	}
+.i_unlock a {								background-position: -259px 0;		}
+	.ipsControlRow:hover .i_unlock a { 		background-position: -259px -18px;	}
+.i_export a {								background-position: -285px 0;		}
+	.ipsControlRow:hover .i_export a { 		background-position: -285px -18px;	}
+.i_revert a {								background-position: -311px 0;		}
+	.ipsControlRow:hover .i_revert a { 		background-position: -311px -18px;	}
+.i_view a { 								background-position: -337px 0;		}
+	.ipsControlRow:hover .i_view a { 		background-position: -337px -18px;	}
+.i_disable a { 								background-position: -363px 0;		}
+	.ipsControlRow:hover .i_disable a { 	background-position: -363px -18px;	}
+
+/****************************************************/
+/* PAGINATION										*/
+/****************************************************/
+.pagination {
+	margin-bottom: 5px;
+	padding-left: 10px;
+}
+
+	.pagination li {
+		background: #eaeaea;
+		color: #5a5a5a;
+		font-size: 11px;
+		font-weight: bold;
+		text-transform: uppercase;
+		display: inline-block;
+		padding: 2px 6px;
+	}
+	
+	.pagination li a {
+		color: #5a5a5a;
+	}
+	
+	.pagination li.active {
+		background: #ab156d;
+		color: #fff;
+	}
+	
+	.pagination li.total {
+		background: none;
+	}
+	
+	.pagination.no_pages {
+		font-size: 11px;
+		font-weight: bold;
+		color: #ababab;
+		text-transform: uppercase;
+		display: block;
+		padding: 2px 10px;
+		margin-bottom: 5px;
+	}
+	
+	.pagination li.pagejump {
+		cursor: pointer;
+	}
+	
+/****************************************************/
+/* BADGES											*/
+/****************************************************/
+.ipsBadge {
+	font-size: 10px;
+	text-transform: uppercase;
+	display: inline-block;
+	padding: 1px 5px;
+	color: #fff;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+}
+
+	.ipsBadge_green { background: #7ba60d; }
+	.ipsBadge_purple { background: #af286d; }
+	.ipsBadge_grey { background: #5b5b5b; }
+	.ipsBadge_lightgrey { background: #b3b3b3; }
+	.ipsBadge_orange { background: #ED7710; }
+	.ipsBadge_red {	background: #bf1d00; }
+
+	.badge_purple {
+		background: #AB156D; /* old browsers */
+		background: -moz-linear-gradient(top, #CE3C92 0%, #AB156D 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
+		border: 1px solid #8c1159;
+		text-shadow: -1px -1px 0 #8f115b;
+	}
+
+	.badge_green {
+		background: #6CAA00; /* old browsers */
+		background: -moz-linear-gradient(top, #8FC400 0%, #6CAA00 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8FC400), color-stop(100%,#6CAA00)); /* webkit */
+		border: 1px solid #689e07;
+		text-shadow: -1px -1px 0 #689e07;
+	}
+
+	.badge_red {
+		background: #CF0404; /* old browsers */
+		background: -moz-linear-gradient(top, #FF3019 0%, #CF0404 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FF3019), color-stop(100%,#CF0404)); /* webkit */
+		border: 1px solid #b00303;
+		text-shadow: -1px -1px 0 #b00303;
+	}
+
+	.badge_grey {
+		background: #E5E5E5; /* old browsers */
+		background: -moz-linear-gradient(top, #FFFFFF 0%, #E5E5E5 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#E5E5E5)); /* webkit */
+		border: 1px solid #c8c8c8;
+		color: #4b4b4b;
+		text-shadow: 1px 1px 0px #fff;
+	}
+	
+	.ipsBadge:hover {
+		color: #fff !important;
+	}
+	
+	.ipsBadge.badge_grey:hover {
+		color: #4b4b4b !important;
+	}
+
+/****************************************************/
+/* EXPANDABLE TABLES								*/
+/****************************************************/
+	
+	.ipsExpandable .item {
+		padding: 10px;
+		border-bottom: 1px solid #e2e8ee;
+		background: #fafbfc;
+	}
+		
+		.ipsExpandable .item_info {
+			display: inline-block;
+			margin-left: 10px;
+			max-width: 700px;
+		}
+		
+		.ipsExpandable .draghandle {
+			position: relative;
+			top: 4px;
+			vertical-align: top;
+		}
+		
+		.ipsExpandable .item input[type=checkbox] {
+			margin-top: 4px;
+			margin-left: 5px;
+		}
+	
+	.ipsExpandable .root_item  {
+		background: #e0e7ed;
+		line-height: 22px;
+	}
+	
+		.ipsExpandable .root_item img {
+			position: relative;
+			top: -3px;
+		}
+	
+	.ipsExpandable .item_wrap {
+		margin-left: 24px;
+		border-left: 1px solid #ecf1f5;
+	}
+	
+		.ipsExpandable .item_wrap .item {
+			border-bottom: 1px solid #ecf1f5;
+		}
+
+/****************************************************/
+/* MESSAGES											*/
+/****************************************************/
+.warning, .information-box {
+	padding: 10px 10px 10px 30px;
+}
+
+.warning {
+	background: #f7e5e8 url( images/icons/exclamation.png ) no-repeat 9px 10px;
+	border: 1px solid #f0c1cb;
+	color: #92394d;
+}
+
+	.warning h4 {
+		color: #802200;
+		font-weight: bold;
+	}
+	
+.information-box {
+	background: #f0f6e2 url( images/icons/information.png ) no-repeat 9px 10px;
+	border: 1px solid #d7e9a8;
+	color: #5d8005;
+}
+
+	.information-box h4 {
+		color: #6c6141;
+	}
+
+
+/****************************************************/
+/* TREE TABLE LAYOUT								*/
+/****************************************************/
+.ipsTreeTable { 
+
+}
+
+.ipsTreeTable img, .ipsTreeTable input[type=checkbox] {
+	vertical-align: top;
+}
+
+.ipsTreeTable .row {
+	padding: 10px 7px 10px 28px;
+	position: relative;
+	border-bottom: 1px solid #e8edf2;
+}
+
+	.ipsTreeTable .row.root {
+		background: #B1C2D4;
+		font-weight: bold;
+		color: #294563;
+		font-size: 14px;
+		padding-left: 7px;
+	}
+	
+	.ipsTreeTable .parent { background: #eff3f6 url( images/folder_closed.png ) no-repeat 10px 12px; }
+		.ipsTreeTable .parent.open { background: #dae2e9 url( images/folder_open.png ) no-repeat 10px 12px;	}
+	.ipsTreeTable .child:hover { background-color: #f5f7f9; }
+	.ipsTreeTable .parent:hover { background-color: #e1e7ed; }
+	
+	.parent.isDraggable, .parent.open.isDraggable {
+		background-position: 20px 12px;
+		padding: 10px 7px 10px 36px;
+	}
+		.parent.isDraggable .draghandle {
+			position: absolute;
+			left: 4px;
+		}
+		.child.isDraggable .draghandle {
+			position: absolute;
+			left: 4px;
+		}
+		
+	.ipsTreeTable .row .infotext {
+		position: absolute;
+		right: 100px;
+		top: 11px;
+		visibility: hidden;
+	}
+	
+		.ipsTreeTable .row:hover .infotext,
+		#filter_results .infotext {
+			visibility: visible;
+		}
+		
+	.ipsTreeTable .row .check {
+		position: absolute;
+		left: 50px;
+		top: 13px;
+	}
+	
+	.ipsTreeTable .row .ipsControlStrip {
+		position: relative;
+		top: -2px;
+	}
+	
+	.ipsTreeTable .icon {
+		margin-right: 15px;
+		float: left;
+	}
+	
+	.ipsTreeTable .parent_wrap {
+		padding-left: 0px;
+		margin-left: 18px;
+		border-left: 1px solid #f0f0f0;
+		position: relative;
+	}
+	
+	.ipsTreeTable .filter_row {
+		padding: 10px;
+		position: relative;
+	}
+
+		.ipsTreeTable .filter_row .infotext {
+			margin-left: 40px;
+			font-size: 11px;
+			color: #8e8e8e;
+		}
+		
+		.ipsTreeTable .filter_row .draghandle,
+		#filter_results .draghandle {
+			display: none;
+		}
+
+	.filter_row.no_results {
+		text-align: center;
+		font-style: italic;
+		color: #8e8e8e;
+	}
+	
+.ipsInlineTreeSearch {
+	float: right;
+	position: relative;
+}
+
+	.ipsInlineTreeSearch input[type=text] {
+		background: #fff url( images/search_box_icon.png ) no-repeat 2px 3px;
+		border: 1px inset #142a42;
+		padding: 4px 22px 4px 22px;
+		color: #c7c7c7;
+		font-size: 12px;
+		font-size: 11px;
+		font-weight: normal;
+		margin-top: 8px;
+	}
+		
+		.ipsInlineTreeSearch.active input[type=text] {
+			color: #000;
+		}
+		
+		.ipsInlineTreeSearch.active #cancel_filter {
+			display: inline;
+		}
+	
+		.ipsInlineTreeSearch #cancel_filter {
+			position: absolute;
+			right: 3px;
+			top: 12px;
+			display: none;
+		}
+		
+/****************************************************/
+/* INDIVIDUAL PAGE STYLES							*/
+/****************************************************/
+
+/* Server statistics */
+#dash_server_stats {
+	padding: 10px;
+	background: #ecedf0;
+	margin: -15px 0 15px 0;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+
+	#dash_server_stats li {
+		margin: 0 15px 0 5px;
+	}
+
+	#dash_server_stats h3 {
+		display: inline;
+		font-weight: bold;
+		margin-right: 10px;
+	}
+	
+#dashboard_online a {
+	color: #969a9d;
+	text-decoration: underline;
+}
+
+.dashboard_note {
+	margin-bottom: 5px;
+}
+	.note_content {
+		position: relative;
+	}
+
+#notes_wrap {
+	padding: 5px;
+	background: #fffdf3;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #e6d2bf;
+	-moz-box-shadow: 0px 0px 4px rgba(237,204,169,0.8) inset; 		/* moz */
+	-webkit-box-shadow: 0px 0px 4px rgba(237,204,169,0.8) inset; 	/* webkit */
+	box-shadow: 0px 0px 4px rgba(237,204,169,0.8) inset; 			/* css3 */
+}
+
+.dashboard_notes {
+	width: 100%;
+	border: 0;
+	height: 70px;
+	background: transparent;
+	color: #a65c11;
+	line-height: 1.4;
+}
+
+
+#member_search_bar, .ipsSortBar {
+	background: #849cb7;
+	border-bottom: 1px solid #6984a1;
+	font: normal 13px 'Helvetica Neue', helvetica, arial, sans-serif;
+	padding: 5px 12px 5px 5px;
+}
+
+	#member_search_bar .realbutton {
+		padding: 4px 8px;
+	}
+	
+	#member_search {
+		background: #fff url( images/search_box_icon.png ) no-repeat 3px;
+		-moz-box-shadow: 0px 1px 2px rgba(0,0,0,0.4) inset;
+		-webkit-box-shadow: 0px 1px 2px rgba(0,0,0,0.4) inset;
+		box-shadow: 0px 1px 2px rgba(0,0,0,0.4) inset;
+		-moz-border-radius: 0px;
+		border-radius: 0px;
+		border: 1px solid #6984a1;
+		padding: 6px 6px 6px 24px; 
+	}
+	
+#advanced_member_search {
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	text-indent: -2000em;
+	background: transparent url( images/advanced_search.png ) no-repeat left 0px;
+	outline: 0;
+}
+
+#m_search_pane {
+	width: 850px;
+	position: absolute;
+	left: 50%;
+	top: 10px;
+	margin-left: -425px;
+	background: #fff;
+	-moz-box-shadow: 0px 0px 15px rgba( 0,0,0,0.4 );
+	-webkit-box-shadow: 0px 0px 15px rgba( 0,0,0,0.4 );
+	box-shadow: 0px 0px 15px rgba( 0,0,0,0.4 );
+	z-index: 17000;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+	#m_search_pane .acp-box {
+		border: 0;
+	}
+	
+	#m_search_pane_inner {
+		height: 400px;
+		overflow: auto;
+	}
+	
+	.adv_search_main {
+		text-align: center; 
+		background: #d4e4f1 !important;
+	}
+
+#m_search_info {
+	padding: 5px 0 0 5px;
+	color: #063554;
+	font-weight: bold;
+}
+
+.member_controls {
+	white-space: nowrap;
+	min-height: 18px;
+	text-align: right;
+}
+
+.member_controls .ipsBadge {
+	opacity: 0.2;
+}
+
+	.member_row:hover .member_controls .ipsBadge {
+		opacity: 1;
+	}
+	
+	.member_controls.success {
+		background: url( images/done_tick.png ) no-repeat right;
+	}
+	
+		.member_controls.success .ipsBadge,
+		.member_controls.success input {
+			display: none;
+		}
+
+#member_list tfoot td {
+	background: #ecf2f6 url( images/mod_action.png ) no-repeat right !important;
+	padding-right: 35px;
+}
+
+	#member_list tfoot td strong {
+		font-size: 11px;
+		color: #486379;
+		margin-right: 10px;
+	}
+	
+	#member_list tfoot tr.disabled .ipsBadge,
+	#member_list tfoot tr.disabled strong {
+		opacity: 0.1;
+		cursor: default;
+	}
+	
+	#member_list tfoot .ipsBadge {
+		font-weight: bold;
+	}
+	
+	#member_list tfoot td .realbutton {
+		font-size: 11px !important;
+		padding: 4px 10px !important;
+	}
+	
+.hookupdate
+{
+	font-weight: bold;
+	color: #ff9933;
+}
+
+/* Permission */
+
+.permission_table {
+	border-collapse: separate !important;
+}
+
+.permission_table td.section, div.section {
+	font-size: 12px;
+	padding: 6px;
+	border: 0;
+	background-color: #D6E4F1;
+	border-bottom: 1px solid #bfcad3 !important;
+	border-top: 1px solid #ced8e0;
+	color: #246594;
+}
+
+	div.section {
+		font-size: 15px;
+	}
+
+	.permission_table .perm {
+		font-size: 11px;
+		text-align: center;
+		padding: 10px !important;
+		border-left: 3px solid #fff;
+	}
+	
+/* Login screen */
+
+body.login_screen {
+	background: #386e9a;
+	background: -moz-linear-gradient(top, #4a85b5 0%, #205889 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4a85b5), color-stop(100%,#205889)); /* webkit */
+	height: auto !important;
+}
+
+#login {
+	width: 450px;
+	height: 220px;
+	background: #fff;
+	margin: 10% auto 0 auto;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.3);
+	-webkit-box-shadow: 0px 0px 12px rgba(0,0,0,0.3);
+	box-shadow: 0px 0px 12px rgba(0,0,0,0.3);
+	position: relative;
+	padding: 10px;
+}
+	#login.with_message {
+		height: 250px;
+	}
+	
+	#login_logo {
+		position: absolute;
+		top: -45px;
+		left: 0;
+	}
+	
+	#login_submit {
+		background: #e7edf2;
+		border-top: 1px solid #d0dce6;
+		padding: 20px 10px;
+		text-align: center;
+		position: absolute;
+		bottom: 0px;
+		left: 0;
+		right: 0;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+		border-radius: 0 0 4px 4px;
+	}
+		
+	#login_controls {
+		margin: 0 auto;
+		position: absolute;
+		width: 100%;
+		bottom: 100px;
+		font-size: 16px;
+	}
+	
+		#login_controls label {
+			display: block;
+			width: 33%;
+			color: #667078;
+			float: left;
+			clear: both;
+			margin-bottom: 12px;
+			text-align: right;
+			padding-right: 15px;
+		}
+		
+		#login_controls input {
+			margin-bottom: 12px;
+			font-size: 14px;
+			width: 45%;
+		}
+		
+	#login_error {
+		position: absolute;
+		top: 15px;
+		left: 10px; right: 10px;
+		font-size: 13px;
+		font-weight: bold;
+		background: #f2ccd4;
+		border: 1px solid #e599aa;
+		padding: 10px;
+		color: #80001c;
+	}
+	
+#redirect {
+	width: 389px;
+	min-height: 80px;
+	margin: 15% auto 0 auto;
+	position: relative;
+	background: #e7edf2;
+	color: #667078;
+	padding: 15px;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+	#redirect h2 {
+		font-size: 22px;
+		display: block !important;
+	}
+	
+	#redirect p {
+		font-size: 16px;
+	}
+	
+	#redirect a {
+		color: #657b97;
+		display: block;
+		margin-top: 15px;
+	}
+
+/* Forums */
+
+#forum_type_chooser td {
+	padding: 0 0 10px 0;
+	vertical-align: top;
+}
+
+fieldset.subforums {
+	margin-top: 10px;
+}
+
+.subforums legend {
+	display: none;
+}
+
 /* Template editor */
 
 #left_pane {
@@ -1665,20 +2239,20 @@ span.yesno_no label {
 .parts_list {
 	max-height: 470px;
 	overflow: auto;
-	background: #f1f4f7;
+	background: #F5F8FA;
 	cursor: pointer;
-	border-right: 2px solid #d5dde5;
+	border: 2px solid #FFF;
 	position: relative;
 }
 
 	.parts_list li {
 		padding: 5px 7px;
-		border-bottom: 1px solid #d5dde5;
+		border-bottom: 2px solid #FFF;
 		font-weight: bold;
 	}
 	
 		.parts_list li.loading {
-			background-image: url(_newimages/loading.gif);
+			background-image: url(images/loading.gif);
 			background-position: 98% 5px;
 			background-repeat: no-repeat;
 		}
@@ -1706,10 +2280,11 @@ span.yesno_no label {
 }
 
 #template_toolbar {
-	background: #e5ecf3;
-	padding: 3px 3px 3px 0;
-	height: 25px;
-	border-bottom: 2px solid #d5dde5;
+	background: #849CB7;
+	padding: 5px 5px 2px 0;
+	height: 30px;
+	border-bottom: 1px solid #6984A1;
+	font: 13px 'Helvetica Neue',helvetica,arial,sans-serif;
 }
 
 	#template_toolbar li {
@@ -1736,7 +2311,7 @@ span.yesno_no label {
 	}
 		
 		#template_toolbar li#t_status.loading {
-			background-image: url(_newimages/loading.gif);
+			background-image: url(images/loading_white.gif);
 			background-position: 0px 6px;
 			background-repeat: no-repeat;
 		}
@@ -1756,33 +2331,45 @@ span.yesno_no label {
 	
 	#template_toolbar #editor_buttons {
 		position: relative;
-		bottom: -7px;
-	}
-	
-	#template_toolbar #editor_buttons li {
-		border: 0;
-		background: #d5dde5;
+		bottom: 0;
 		cursor: pointer;
 	}
 	
+	#template_toolbar #editor_buttons li {
+		padding: 0 10px;
+		margin-right: 5px;
+		display: inline-block;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+		background: #FFFFFF; /* old browsers */
+		background: -moz-linear-gradient(top, #FFFFFF 0%, #F6F9FA 3%, #E4EEF3 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(3%,#F6F9FA), color-stop(100%,#E4EEF3)); /* webkit */
+		font-size: 12px;
+		border: 1px solid #afd4f1;
+		color: #0b5794;
+		text-shadow: 1px 1px 0 #f4f7fa;
+		height: 26px;
+		line-height: 26px;
+		outline: none;
+	}
+	
 	#template_toolbar #editor_buttons li.active {
-		background: #1d3652;
+		background: #CE3C92; /* old browsers */
+		background: -moz-linear-gradient(top, #CE3C92 0%, #AB156D 100%); /* firefox */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
 		color: #fff;
-		border-bottom-right-radius: 0;
-		border-bottom-left-radius: 0;
-		-moz-border-radius-bottomleft: 0;
-		-moz-border-radius-bottomright: 0;
-		-webkit-border-bottom-left-radius: 0;
-		-webkit-border-bottom-right-radius: 0;
+		text-shadow: -1px -1px 0 #97115f;
+		border-color: #9d1263;
 	}
 	
 	.template_menu {
 		padding: 0;
 		font-size: 11px;
+		font-weight: bold;
 		height: 30px;
 		overflow: hidden;
-		background: #1d3652;
-		color: #fff;
+		background: #D6E4F1;
+		color: #246594;
 	}
 	
 		.template_menu ul {
@@ -1792,7 +2379,7 @@ span.yesno_no label {
 			.template_menu ul li {
 				float: left;				
 				padding: 8px 8px;
-				color: #e4eaf1;
+				color: #246594;
 				cursor: pointer;
 			}
 			
@@ -1801,17 +2388,21 @@ span.yesno_no label {
 	min-height: 500px;
 	background: #f1f4f7;
 }
-			
+
+#template_list {
+	color: #3287C9;
+}
+
 #template_footer {
-	background: #e5ecf3;
+	background: #FFF;
 	padding: 8px 6px 6px 6px;
 	clear: both;
-	border-top: 2px solid #d5dde5;
+	border-top: 2px solid #6984A1;
 	font-size: 11px;
 }
 
 #template_editor {
-	background: #d5dde5;
+	background: #D6E4F1;
 }
 
 	.replacement_save {
@@ -1820,143 +2411,246 @@ span.yesno_no label {
 		padding: 5px 0;
 		margin: 0 auto;
 	}
-	
-/* LANGUAGES */
 
-.language_editor textarea {
-	width: 95%;
-	height: 80%;
-	border: 1px solid #9f9f9f;
-	font-family: verdana, arial, tahoma, sans-serif;
-	font-size: 12px;
-}
+	/* --------------- */
+	/* Inline form styles */
 
-	.language_editor textarea.default_lang {
-		background: #f6f6f6;
-	}
-	
-	.language_editor textarea.new_lang {
-		background: #fff;
-	}
-
-.stem {
-	width: 31px;
-	height: 16px;
-	position: absolute;
-}
-
-	.stem.topleft {
-		background-image: url(../../public/style_images/master/stems/topleft.png);
-	}
-	.stem.topright {
-		background-image: url(../../public/style_images/master/stems/topright.png);
-	}
-	.stem.bottomleft {
-		background-image: url(../../public/style_images/master/stems/bottomleft.png);
-	}
-	.stem.bottomright {
-		background-image: url(../../public/style_images/master/stems/bottomright.png);
-	}
-	
-.popupWrapper {
-	background-color: rgba(0,0,0,0.58);/*url(../../style_images/master/trans_bg.png);*/
-	color: #fff;
-	-webkit-box-shadow: rgba(0, 0, 0, 0.58) 0px 12px 25px;
-	-moz-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.58);
-	box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.58 );
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-
-	.popupInner {
-		background: #f1f4f7;
+	#inlineFormWrap
+	{
+		position: absolute;
+		background-color: #5f5f5f;
 		color: #000;
-		border: 3px solid #d5dde5;
-		border-radius: 4px;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		margin: 8px;
-		width: 500px;
+		width: 350px;
+		border:1px solid #FFF;
+		z-index: 150;
+	}
+
+	#inlineFormInnerWrap
+	{
+
+	}
+
+	#inlineFormInnerClose
+	{
+		margin: 9px 10px 0px 0px;
+		width: 13px;
+		height: 13px;
+		float: right;
+		background-repeat: no-repeat;
+		cursor: pointer;
+	}
+
+	#inlineFormInnerTitle
+	{
+		padding: 2px;
+	}
+
+	#inlineFormInnerContent
+	{
+		background-color: #F5F8FA;
+		padding: 5px;
+	}
+
+	#inlineFormLoading
+	{
+		text-align: center;
+		font-size:18px;
+		font-weight: bold;
+		background-color: #FFFFFF;
+		border: 1px solid #4d5b6b;
+		padding:20px;
+		z-index:1000;
+	}
+
+	#inlineErrorBox
+	{
+		border: 1px solid #000;
+		background-color: #FFCCCC;
+		font-size:14px;
+		text-align: center;
+		padding-top:20px;
+		z-index: 999;
+	}
+
+		#inlineErrorBox strong
+		{
+			font-size:30px;
+		}
+
+		#inlineErrorBox img
+		{
+			vertical-align: -12px;
+		}
+
+	#inlineErrorText
+	{
 		overflow: auto;
+		height: 90px;
+		padding:8px;
+	}
+
+	.inlineFormEntry
+	{
+		background-color: #e7eaf0;
+		margin-bottom: 2px;
+	}
+
+	.inlineFormLabel
+	{
+		padding: 4px;
+		font-size: 14px;
+		font-weight: bold;
+	}
+
+	.inlineFormLabel p
+	{
+		color: gray;
+		font-weight:normal;
+		font-size: 11px;
+	}
+
+	.inlineFormInput
+	{
+		padding: 4px;
+	}
+
+	.inlineFormSubmit
+	{
+		background-color: #4b5b6e;
+		text-align: center;
+		padding: 6px;
+		color: #30353c;
+		border-bottom: 1px solid #d9dee8;
+		height: 22px;
 	}
 	
-		.popupInner.black_mode {
-			background: #000;
-			border: 3px solid #b3bbc3; 
-			color: #eee;
-			border: 3px solid #555;
-		}
-		
-		.popupInner.warning_mode {
-			border: 3px solid #7D1B1B; 
-		}
+
+	.bullets ul,
+	.bullets ol,
+	ul.bullets,
+	ol.bullets {
+		list-style: disc;
+		margin-left: 30px;
+		line-height: 150%;
+		list-style-image: none;
+	}
 	
-		.popupInner h3 {
-			background-color: #dae4ed;
-			font-size: 1em;
-			padding-top: 3px;
-			border: 0;
-			padding-left: 24px;
-			height: 22px;
+	/* Autocomplete */
+	.ipbmenu_content {
+		background-color: #F7EFF5;
+		border: 1px solid #AC156D;
+		min-width: 85px;
+		padding: 5px;
+		font-size: 0.9em;
+		z-index: 150;
+		margin-left: 0px;
+	}
+
+		.ipbmenu_content li {
+			border-bottom: 1px solid #AC156D;
+			padding: 5px;
 		}
-		
-			.popupInner.black_mode h3 {
-				background-color: #545C66;
-				color: #ddd;
-			}
-			
-			.popupInner.warning_mode h3 {
-				background-color: #7D1B1B;
-				padding-top: 6px;
-				padding-bottom: 6px;
-				color: #fff;
-			}
-			
-			.popupInner.warning_mode input.input_submit {
-				background-color: #7D1B1B;
-			}
-			
-.popupClose {
-	position: absolute;
-	left: 12px;
-	top: 12px;
+
+		.ipbmenu_content li:last-child {
+			border-bottom: 0;
+			padding-bottom: 0px;
+		}
+
+		.ipbmenu_content li:first-child {
+			padding-top: 0px;
+		}
+
+/* License Nagging CSS */
+#license_notice_force {
+	min-height: 120px;
+	top: 0px;
+	background: #cc0000; /* Old browsers */
+	background: -moz-linear-gradient(top, #cc0000 0%, #a50500 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cc0000), color-stop(100%,#a50500)); /* Chrome,Safari4+ */
+	color: #f6edef;
+	/*position: fixed;*/
+	z-index: 15050;
+	text-shadow: 0 -1px 0 #80001c;
+	line-height: 1.4;
+	border-bottom: 1px solid #80001c;
+	-webkit-box-shadow: 4px 0 10px rgba(0,0,0,0.3);
+	padding: 0 10px;
 }
 
-.popupClose.light_close_button {
-	background: transparent url(../../public/style_images/master/close_popup_light.png) no-repeat top left;
-	opacity: 0.8;
-	width: 13px;
-	height: 13px;
-	top: 18px;
-	left: 16px;
+	#license_notice_force h4 {
+		font-size: 20px;
+		padding: 10px 10px 0;
+		color: #fff;
+	}
+
+	#license_notice_force p {
+		padding: 10px;
+		font-size: 14px;
+	}
+	
+	#license_notice_force a {
+		display: inline-block;
+		background: #80001c;
+		-moz-border-radius: 10px;
+		border-radius: 10px;
+		padding: 2px 10px;
+		color: #fff;
+	}
+
+#license_notice_expired {
+	min-height: 70px;
+	top: 0px;
+	background: #f7f7f7; /* Old browsers */
+	background: -moz-linear-gradient(top, #f7f7f7 0%, #e5e5e5 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f7f7f7), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
+	/*position: fixed;*/
+	color: #575757;
+	text-shadow: 0px 1px 0px rgba(255,255,255,0.5);
+	padding: 10px 15px;
+	line-height: 1.4;
+	z-index: 15050;
+	border-bottom: 1px solid #acacac;
+	-webkit-box-shadow: 4px 0 10px rgba(0,0,0,0.3);
 }
 
-.popupClose.light_close_button img {
-	display: none;
-}	
-.popup_footer {
-	position: absolute;
-	bottom: 0px;
-	right: 0px;
-	padding: 15px;
-}
+	#license_notice_expired h4 { font-size: 18px; }
+	#license_notice_expired div.right {
+		position: absolute;
+		top: 10px; right: 10px;
+	}
+	
+		#license_notice_expired div.right a {
+			background: #575757;
+			color: #fff;
+			display: inline-block;
+			padding: 2px 10px;
+			-webkit-border-radius: 10px;
+			-moz-border-radius: 10px;
+			border-radius: 10px;
+			font-size: 11px;
+		}
 
-.popup_body {
-	padding: 10px;
-}
+	#license_notice_expired p {
+		padding-top: 5px;
+		font-size: 12px;
+	}
+
+/*#ipboard_body.force_license { margin-top: 120px !important; }
+#ipboard_body.expired_license { margin-top: 90px !important; }*/
+
+/* Merge Center */
 
 del, .diffred {
-	background-color: #D7BBC8;
+	background-color: #FF6666;
 	color: black;
 	font-weight: normal;
-	text-decoration: none;
+	text-decoration: line-through;
 }
 
 ins, .diffgreen {
-	background-color: #BBD0C8;
+	background-color: #5EFB6E;
 	color: black;
-	font-weight: normal;
+	font-weight: bold;
 	text-decoration: none;
 }
 
@@ -1998,526 +2692,126 @@ ins, .diffgreen {
 	right: 0px;
 }
 
-.topic_controls {
-	min-height: 30px;
+/* User agents group form */
+.uAgentsGHover
+{
+	background-color: #D3DAE4;
+	background-image: url( images/acpMenuMore.png );
+	background-repeat: no-repeat;
+	background-position: center right;
+	cursor: pointer;
+	padding:8px;
 }
 
-#main_content table.real-table {
-	margin-left: 1px;
-	margin-right: 1px;
+.uAgentsGRow
+{
+	padding:8px;
+	border-bottom:1px solid #ddd;
 }
 
-#main_content table.real-table td, #main_content table.real-table th {
-	border: 1px solid black;
+.uAgentsGRHover
+{
+	background-color: #D3DAE4;
+	cursor: pointer;
+	padding:8px;
 }
 
-/* CONTEXT MENU BUTTONS */
-
-.context_menu li {
-	float: right;
-	margin: 0px 10px 10px 0px;
-	background: transparent url(_newimages/topic_button_left.png) no-repeat;
-	padding: 0;
-}
-	
-	.context_menu li a,
-	.context_menu li span {
-		display: block;
-		margin-right: 0px;
-		margin-left: 6px;
-		font-size: 0.9em;
-		text-decoration: none !important;
-		color: #fff;
-		outline: 0;
-	}
-	
-	.context_menu li span {
-		padding: 5px 12px 6px 3px;
-	}
-	
-	.context_menu li a {
-		background: transparent url(_newimages/topic_button_right.png) no-repeat top right;
-		padding: 5px 12px 4px 3px;
-	}
-	
-		.context_menu li a img,
-		.context_menu li span img {
-			margin: -1px 5px 1px 0;
-		}
-	
-	.context_menu li.disabled {
-		background: transparent url(_newimages/topic_button_left_disabled.png) no-repeat;
-	}
-	
-		.context_menu li.disabled span {
-			background: transparent url(_newimages/topic_button_right_disabled.png) no-repeat top right;
-			color: #8f8e8e;
-		}
-		
-	.context_menu li.closed {
-		background: transparent url(_newimages/topic_button_delete_left.png) no-repeat;
-	}
-		
-		.context_menu li.closed span,
-		.context_menu li.closed a {
-			background: transparent url(_newimages/topic_button_delete_right.png) no-repeat top right;
-		}
-		
-#forum_wrapper .tableheaderalt {
-	padding: 3px;
+.uAgentsGRRow
+{
+	padding:8px;
+	border-bottom:1px solid #ddd;
 }
 
-	#forum_wrapper .forum_row {
-		border-bottom: 1px solid #e4ebf2;
-	}
-	
-	#forum_wrapper .forum_row td,
-	#forum_wrapper td.forum_row {
-		background: #eef3f8;
-		padding: 8px;
-	}
-	
-		#forum_wrapper .forum_row.subforum td,
-		#forum_wrapper td.forum_row.subforum {
-			background: #f6f8fa;
-		}
-		
-		#forum_wrapper .forum_row.subforum td strong {
-			font-weight: normal;
-		}
-		
-	#forum_wrapper .forum_row td .forum_desc {
-		font-size: 11px;
-		color: #666;
-	}
-	
-.member_search {
-	background: #ECF1F5;
-}
-	
-	.member_search ul {
-		width: 95%;
-	}
-	
-	.member_search li {
-		padding: 7px;
-		border-bottom: 1px solid #d5dde5;
-	}
-	
-	.member_search label {
-		width: 40%;
-		display: block;
-		float: left;
-	}
-	
-	.simple {
-		padding: 8px;
-	}
-	
-	.member_search .simple {
-	}
-	
-/* DASHBOARD */
+/* Member Area */
 
-#dashboard .acp-box h3 {
-	font-size: 12px;
-	padding: 5px;
-}
-	#quick_start table {
-		background: #ECF1F5;
-		border: 1px solid #d5dde5;
-		border-bottom-width: 3px;
-		font-size: 12px;
-		font-weight: bold;
-	}
-	
-	#quick_start td {
-		width: 33%;
-		padding: 6px;
-	}
-	
-	#quick_start a,
-	#quick_start a:hover {
-		text-decoration: none !important;
-	}
-	
-	#quick_start td img {
-		margin-right: 6px;
-	}
-
-#search_and_stats,
-#notes_and_news,
-#blog_and_bulletin,
-#admin_boxes {
-	overflow: hidden;
-	height: 1%;
+.photo_options {
+    background: #40638B;
+    display: inline-block;
+    float: right;
+    left: 5px;
+    padding: 3px;
+    position: relative;
+    top: -19px;
 }
 
-#quick_search,
-#stats_overview,
-#ips_news,
-#ips_supportbox,
-#ips_blog,
-#ips_update_security,
-#ips_update_update,
-#ips_update_normal,
-#admin_notes,
-#active_admins,
-#admin_logins {
-	width: 49%;
+	.photo_options li {
+		display: inline;
+	}
+
+.acp-sidebar {
 	float: left;
-	line-height: 140%;
+	width: 30%;
 }
 
-#ips_supportbox,
-#ips_blog,
-#admin_logins,
-#active_admins {
-	margin-top:8px;
-}
-
-#ips_update_security,
-#ips_update_update,
-#ips_update_normal {
-	margin-bottom:8px;
-}
-
-	#quick_search td,
-	#stats_overview td {
-		padding: 5px;
+	.acp-sidebar .sidebar_box {
+	    background: #FFFFFF;
+	    border: 1px solid #B3C2D2;
+	    margin: 10px auto;
+	    padding: 5px;
+	    width: 80%;
 	}
 	
-	#stats_overview .sub {
-		padding-left: 10px;
+	.acp-sidebar .sidebar_box ul {
+		width: 100%;
 	}
 	
-	#stats_overview .desctext {
-		font-size: 11px;
-	}
-	
-	#quick_search,
-	#admin_notes,
-	#ips_blog,
-	#active_admins {
-		margin-right: 2%;
-	}
-
-#notes_and_news {
-	clear: both;
-	margin-top: 10px;
-}
-
-	#notes_and_news .notes {
-		text-align: center;
-	}
-
-.dashboard_notes{
-	width:98%;
-	margin:0 auto;
-	padding:3px;
-	background-color:#fdffdd;
-	color:#6c6850;
-	border:1px solid #e8d779;
-	font-family:arial, verdana, tahoma, sans-serif;
-	font-size:0.9em;
-	border-radius: 4px;
-	-moz-border-radius:4px;
-	-webkit-border-radius:4px;
-}
-
-/* REPORTS */
-.hierarchy tr.parent td {
-	background: #eef3f8;
-	border-bottom: 1px solid #e4ebf2;
-}
-
-	.hierarchy tr.child td {
-		background: #f8fafb;
-		border-bottom: 1px solid #e4ebf2;
-	}
-
-/* WARNINGS */
-
-.warning,
-.information-box,
-.help-box {
-	padding: 10px 10px 10px 30px;
-}
-
-	.warning h4,
-	.information-box h4,
-	.help-box h4 {
-		padding: 4px;
-		margin: -6px -6px 6px -23px;
-		font-size: 14px;
-		font-weight: bold;
-	}
-	
-		.warning h4 img,
-		.information-box h4 img,
-		.help-box h4 img {
-			margin-top: -2px;
-			float: left;
+		.acp-sidebar .sidebar_box ul li {
+			width: 100%;
+			margin-top: 4px;
+			margin-bottom: 8px;
 		}
+		
+			.acp-sidebar .sidebar_box ul li strong {
+				width: 80px;
+				display: inline-block;
+			}
 
-.warning {
-	background: #fbe6f2 !important;
-	border: 1px solid #e68f8f;
+#MF__pp_photo_container {
+	border: 1px solid #369;
+	background: #FFF;
+	padding: 5px;
+	margin: 10px auto;
 }
 
-	.warning h4 {
-		color: #7a2929;
-	}
-	
-.information-box {
-	background: #f9f7e0;
-	border: 1px solid #eadca0;
+.change_icon {
+    background-image: url( images/icons/pencil.png );
+    display: inline-block;
+    height: 16px;
+    outline: 0 none;
+    text-indent: -5000px;
+    width: 16px;
+    float: right;
 }
 
-	.information-box h4 {
-		color: #6c6141;
-	}
-
-#help_link,
-#help_nw {
-	display: block;
-	margin-top: -8px;
-	margin-right: 0px;
-	float: right;
-	color: #528f6c;
-	font-size: 11px;
+/* New notification panel */
+#ipsGlobalNotification {
+	position: fixed;
+	left: 50%;
+	margin-left: -250px;
+	top: 80px;
+	text-align: center;
 	font-weight: bold;
-	text-decoration: none;
-	padding: 3px 7px 4px;
-	background: #e9f4ee;
-	border: 1px solid #99c8ad;
-	position: absolute;
-	right: 12px;
-	outline: 0;
 }
 
-	#help_link:hover {
-		text-decoration: none !important;
-		color: #657b97;
+	#ipsGlobalNotification .popupWrapper {
+		padding: 3px;
+		position: relative;
+		z-index: 20000;
 	}
 	
-	#help_link.showing {
-		right: 46px;
-	}
-	
-	#help_link.showing,
-	#help_nw.showing {
-		border-bottom: 0;
-	}
-	
-#main_help {
-	margin-right: -12px;
-	margin-top: -3px;
-	padding: 4px;
-}
-
-.help-box {
-	background: #e9f4ee;
-	overflow: auto;
-	margin-right: -10px;
-	padding-left: 10px;
-	border: 1px solid #99c8ad;
-	margin-top: -1px;
-}
-
-	.help-box h4 {
-		color: #416e6e;
+	#ipsGlobalNotification .ipsPad {
+		padding: 9px;
+		font-size: 18px;
 	}
 
-#acp-help-contents {
-	padding: 6px;
-	max-height: 150px;
-	overflow: auto;
-	border: 1px solid #f0f8f4;
-	background: #fcfefd;
-	line-height: 150%;
-	font-size: 0.9em;
+#ipsGlobalNotification_close {
+	font-size: 12px;
+	font-weight: normal;
+	cursor: pointer;
+	float: right;
+	margin-top: -2px;
 }
 
-#acp-help-contents li {
-	margin-left: 20px;
-}
-
-#acp-help-contents ul li {
-	list-style-type: disc;
-}
-
-#acp-help-contents ol li {
-	list-style-type: decimal;
-}
-
-#acp-help-contents .acp-help-note {
-	background-color: #fffbda;
-	padding: 8px 20px;
-	color: #54553f;
-}
-
-#acp-help-contents .acp-help-example {
-	background-color: #d9eff3;
-	padding: 8px 20px;
-	color: #3f5255;
-}
-
-#acp-help-contents .acp-help-warning {
-	background-color: #f5d3d3;
-	padding: 8px 20px;
-	color: #594949;
-}
-
-/*.warning-box,
-.information-box,
-.help-box
-{
-	color: #000;
-	border: 1px solid #000;
-	background-color: #FCF8C7;
-	padding: 6px;
-	text-align:left;
-}
-
-.warning-box img,
-.information-box img,
-.help-box img
-{
-	float:left;
-	margin-top: 10px;
-	margin-right: 5px;
-	vertical-align:middle;
-	border: 0px;
-}
-
-.warning-box h2,
-.warning-box p,
-.information-box h2,
-.information-box p,
-.help-box h2,
-.help-box p
-{
-	padding: 0px;
-	margin:  0px;
-	margin-left: 60px;
-}
-
-.warning-box h2,
-.information-box h2,
-.help-box h2
-{
-	padding-bottom: 4px;
-	font-size: 14px;
-	border-bottom: 1px solid #000;
-}
-
-.warning-box
-{
-	background-color: #f7e2e2;
-	border: 1px solid #af6d6d;
-	color: #642f2f;
-}
-
-.warning-box ul
-{
-	margin-left: 30px;
-}
-
-.help-box
-{
-	background-color: #D5EEB6;
-}*/
-
-/* LOGIN */
-
-#login {
-	width: 389px;
-	height: 274px;
-	background: transparent url(_newimages/acp_login.png) no-repeat;
-	margin: 15% auto 0 auto;
-	position: relative;
-}
-
-	#login_submit {
-		margin: 0 auto;
-		position: absolute;
-		bottom: 10px;
-		text-align: center;
-		width: 100%;
-	}
-	
-		#login_submit input {
-			font-size: 14px;
-			font-weight: bold;
-			padding: 3px 9px;
-		}
-		
-	#login_controls {
-		margin: 0 auto;
-		position: absolute;
-		width: 100%;
-		top: 130px;
-		font-size: 16px;
-	}
-	
-		#login_controls label {
-			display: block;
-			width: 35%;
-			color: #fff;
-			float: left;
-			clear: both;
-			margin-bottom: 12px;
-			text-align: right;
-			padding-right: 15px;
-		}
-		
-		#login_controls input {
-			margin-bottom: 12px;
-			font-size: 14px;
-			width: 45%;
-		}
-		
-	#login_error {
-		position: absolute;
-		top: 75px;
-		width: 90%;
-		left: 4%;
-		font-size: 13px;
-		background: #942323;
-		border: 1px solid #7c2323;
-		padding: 4px;
-		color: #fff;
-	}
-	
-#redirect {
-	width: 389px;
-	min-height: 80px;
-	margin: 15% auto 0 auto;
-	position: relative;
-	background: #1d3652;
-	color: #fff;
-	padding: 15px;
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-}
-
-	#redirect h2 {
-		font-size: 22px;
-		display: block !important;
-	}
-	
-	#redirect p {
-		font-size: 16px;
-	}
-	
-	#redirect a {
-		color: #657b97;
-		display: block;
-		margin-top: 15px;
-	}
-	
 .redirector {
 	background-color: #f6f8fa;
 	border: 1px solid #d5dde5;
@@ -2540,227 +2834,48 @@ ins, .diffgreen {
 		background-color: #f1f6ec;
 	}
 	
-.no_items {
-	padding: 25px 30px;
-	color: #1c2837;
-	background-color: #f6f8fa;
-}
-
-.clear {
-	clear: both;
-}
-
-.right-border {
-	border-right: 1px solid #1d3652;
-}
-
-.bullets ul,
-.bullets ol,
-ul.bullets,
-ol.bullets {
-	list-style: disc;
-	margin-left: 30px;
-	line-height: 150%;
-	list-style-image: none;
+.select_col, .select_row {
+	width: 25px;
 }
 
 
-.hookupdate
-{
-	font-weight: bold;
-	color: #ff9933;
+/****************************************************/
+/* CKEditor											*/
+/****************************************************/
+
+.as_content {
+	background: #fff;
+	font-size: 1.0em;
+	border: 1px solid black;
+	padding: 6px;
+	margin: 8px;
+	overflow: auto;
+	max-height: 400px;
+}
+.as_buttons {
+	text-align: right;
+	padding: 4px 0px;
+}
+.as_message {
+	display: inline-block;
+}
+#ips_switchEditor {
+	clear: top;
+	text-align: left;
+	margin-left: 10px;
+}
+.ips_EditorTextArea {
+	margin: 0 10px;
+	width: 95%;
+	height: 250px;
+	padding: 6px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
 }
 
-/* Permission */
-
-.permission_table {
-	border-collapse: separate !important;
-}
-
-.permission_table td.section {
-	font-size: 12px;
-	padding: 4px;
-	border: 0;
-	background-color: #dae4ed;
-	border-bottom: 2px solid #bfcad3 !important;
-	border-top: 1px solid #ced8e0;
-}
-
-	.permission_table .perm {
-		font-size: 11px;
-		text-align: center;
-		padding: 10px !important;
-		border-left: 3px solid #fff;
-	}
-	
-/* User agents */
-
-#uagents_groups .uagent_list {
-	background: #f9fbfc;
-	border: 1px solid #b5c5d6;
-	height:400px;
-	overflow:auto;
-}
-
-	.uagent_list .uAgentsGRow,
-	.uagent_list .uAgentsGRRow
-	{
-		padding: 8px;
-		border-bottom:1px solid #ddd;
-	}
-	
-	.uagent_list .uAgentsGHover,
-	.uagent_list .uAgentsGRHover
-	{
-		background-color: #F1F4F7;
-		cursor: pointer;
-		padding:8px;
-	}
-	
-/* NEW MENU SYSTEM */
-
-/* Our menu sprite */
-.adv_controls .controls li.left, .adv_controls .controls li.center, .adv_controls .controls li.right {
-	background-image: url( _newimages/menu_sprite.png );
-}
-
-/* Controls in a table */
-.adv_controls td > .controls {
-	position: static;
-	float: right;
-	white-space: nowrap;
-}
-
-/* Controls in a div */
-.adv_controls .controls {
-	position: absolute;
-	right: 15px;
-	top: 8px;
-	opacity: 0.7;
-	white-space: nowrap;
-	min-width: 75px;
-}
-	
-table.adv_controls tr:hover .controls,
-.adv_controls .list_row:hover .controls,
-.adv_controls .tablesubheader:hover .controls,
-.adv_controls td:hover .controls {
-	opacity: 1;
-}
-
-.adv_controls .controls li {
-	float: left;
-	height: 21px;
-	text-indent: -3000em;
-	z-index: 10000;
-}
-
-	.adv_controls .controls li.left {
-		width: 26px;
-		background-position: 0 0;
-	}
-	
-		.adv_controls .controls li.left:hover {
-			background-position: 0 -21px;
-			z-index: 14000;
-		}
-		
-		.adv_controls .controls li.left:hover + li.center {
-			width: 24px;
-			margin-left: 0;
-			background-position: -27px 0;
-		}
-		
-			.adv_controls .controls li.left:hover + li.center a,
-			.adv_controls .controls li.left:hover + li.right a {
-				left: 4px;
-			}
-		
-		.adv_controls .controls.no_extra li.left:hover + li.right {
-			background-position: -97px 0;
-		}
-		
-	.adv_controls .controls.single li.left {
-		background-position: -122px 0;
-	}
-	
-		.adv_controls .controls.single li.left:hover {
-			background-position: -122px -21px;
-		}
-		
-	.adv_controls .controls li.center {
-		width: 25px;
-		margin-left: -1px;
-		background-position: -26px 0;
-	}
-	
-		.adv_controls .controls li.center:hover {
-			background-position: -26px -21px;
-		}
-		
-		.adv_controls .controls li.center:hover + li.right,
-		.adv_controls .controls li.left:hover + li.right {
-			width: 19px;
-			margin-left: 0px;
-			background-position: -52px 0;
-		}
-		
-		.adv_controls .controls.no_extra li.center:hover + li.right,
-		.adv_controls .controls.no_extra li.left:hover + li.right {
-			width: 25px;
-			margin-left: 0px;
-		}
-	
-	.adv_controls .controls li.right {
-		width: 20px;
-		margin-left: -1px;
-		background-position: -51px 0;
-	}
-	
-		.adv_controls .controls li.right:hover {
-			background-position: -51px -21px;
-			z-index: 14000;
-		}
-		
-		.adv_controls .controls.no_extra li.right {
-			width: 26px;
-			margin-left: -1px;
-			background-position: -96px 0;
-		}
-		
-			.adv_controls .controls.no_extra li.right:hover {
-				background-position: -96px -21px;
-			}
-		
-	.adv_controls .controls li a {
-		display: block;
-		width: 16px;
-		height: 16px;
-		position: relative;
-		top: 3px;
-		left: 5px;
-		background-image: url( _newimages/menu_icon_sprite.png );
-		background-repeat: no-repeat;
-	}
-		
-.adv_controls .controls li a.new_folder { 						background-position: 0 0;			}
-.adv_controls .control_row:hover .controls li a.new_folder {	background-position: 0 -16px;		}
-.adv_controls .controls li a.delete { 							background-position: -15px 0;		}
-.adv_controls .control_row:hover .controls li a.delete { 		background-position: -15px -16px;	}
-.adv_controls .controls li a.edit { 							background-position: -31px 0;		}
-.adv_controls .control_row:hover .controls li a.edit { 			background-position: -31px -16px;	}			
-.adv_controls .controls li a.page_add { 						background-position: -47px 0;		}
-.adv_controls .control_row:hover .controls li a.page_add { 		background-position: -47px -16px;	}
-.adv_controls .controls li a.add { 								background-position: -63px 0;		}
-.adv_controls .control_row:hover .controls li a.add { 			background-position: -63px -16px;	}
-.adv_controls .controls li a.refresh { 							background-position: -79px 0;		}
-.adv_controls .control_row:hover .controls li a.refresh { 		background-position: -79px -16px; 	}
-.adv_controls .controls li a.lock { 							background-position: -95px 0;		}
-.adv_controls .control_row:hover .controls li a.lock { 			background-position: -95px -16px;	}
-.adv_controls .controls li a.accept { 							background-position: -111px 0;		}
-.adv_controls .control_row:hover .controls li a.accept { 			background-position: -111px -16px;	}
-
-	
-#main_content .acp-box ._cfields td p {
-	background-color: inherit !important;
+.ips_EditorTextArea.minimized {
+	height: 80px;
+	-moz-border-radius: 0px;
+	-webkit-border-radius: 0px;
+	margin:0 auto;
 }
\ No newline at end of file
diff --git a/upload/admin/skin_cp/acp_content.css b/upload/admin/skin_cp/acp_content.css
deleted file mode 100644
index 22489ef5..00000000
--- a/upload/admin/skin_cp/acp_content.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******
-TEMP STYLES - WE SHOULD AIM TO ELIMINATE USE OF THESE BEFORE RELEASE,
-BUT THEY ARE KEPT HERE SO THE ACP REMAINS USABLE IN THE MEANTIME
-********/
-
-.tableborder {
-	border: 1px solid #777777;
-}
-
-.tablerow1 {
-	background: #F1F4F7;
-}
-
-.tablerow2 {
-	background: #FAFBFC;
-}
-
-.tablerow2.double_pad,
-.tablerow1.double_pad
-{
-	padding: 10px;
-}
-
-.tabon,
-.taboff
-{
-	float:left;
-	background:#EEEEEE;
-	padding:6px;
-	margin-right:1px;
-}
-
-.tableheader,
-.tableheaderalt,
-.tableheaderalt_tabs
-{
-	font-size:12px;
-	vertical-align:middle;
-	font-weight:bold;
-	color:#FFF;
-	padding:5px;
-	/*background-image: url(images/folder_css_images/table_title_gradient.gif);
-	background-repeat: repeat-x;*/
-	background-color:#3b424c;
-}
-
-.tableheader a:link, 
-.tableheader a:visited, 
-.tableheader a:active,
-.tableheaderalt a:link, 
-.tableheaderalt a:visited, 
-.tableheaderalt a:active
-{
-	text-decoration:none;
-	color: #FFF;
-}
-
-.tablefooter,
-.tablesubheader
-{
-	background-color:#8d9cb1;
-	font-size:11px;
-	color: #3b424c;
-	font-weight:bold;
-	padding:8px;
-}
\ No newline at end of file
diff --git a/upload/admin/skin_cp/acp_editor.css b/upload/admin/skin_cp/acp_editor.css
index 32245d9a..7e68795c 100644
--- a/upload/admin/skin_cp/acp_editor.css
+++ b/upload/admin/skin_cp/acp_editor.css
@@ -146,7 +146,7 @@ DO NOT REMOVE OR ALTER THIS PLEASE. IT IS REMOVED AUTOMATICALLY BY THE IMPORT RO
 	margin-top: 1px;
 	padding: 4px 15px 2px 7px;
 	background-color: #fff;
-	background-image: url(_newimages/rte_arrow.png);
+	background-image: url(images/dropdown.png);
 	background-repeat: no-repeat;
 	background-position: right center;
 }
diff --git a/upload/admin/skin_cp/acp_templates.css b/upload/admin/skin_cp/acp_templates.css
index 24c067cc..81f18604 100644
--- a/upload/admin/skin_cp/acp_templates.css
+++ b/upload/admin/skin_cp/acp_templates.css
@@ -27,7 +27,7 @@
 	float: left;
 	width: 12px;
 	height: 12px;
-	background-image: url(_newimages/icons/mclose.png);
+	background-image: url(images/icons/mclose.png);
 	background-position: 0px 4px;
 	background-repeat: no-repeat;
 }
@@ -39,7 +39,7 @@
 	float: left;
 	width: 12px;
 	height: 12px;
-	background-image: url(_newimages/icons/mfullscreen.png);
+	background-image: url(images/icons/mfullscreen.png);
 	background-position: 0px 4px;
 	background-repeat: no-repeat;
 }
@@ -53,7 +53,7 @@
 
 #tbe_tabstrip
 {
-	
+	margin-top: 2px;
 }
 
 #tbe_tabstrip li,
@@ -61,30 +61,25 @@
 {
 	cursor: pointer;
 	float: left;
-	background: #ecf1f5;
+	background: #FFFFFF; /* old browsers */
+	background: -moz-linear-gradient(top, #FFFFFF 0%, #F6F9FA 3%, #E4EEF3 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(3%,#F6F9FA), color-stop(100%,#E4EEF3)); /* webkit */
+	font-size: 12px;
+	border: 1px solid #afd4f1;
+	color: #0b5794;
+	text-shadow: 1px 1px 0 #f4f7fa;
 	padding: 4px 9px;
-	border-radius: 3px 3px 0px 0px;
-	-moz-border-radius: 3px 3px 0px 0px;
-	-webkit-border-top-left-radius: 3px;
-	-webkit-border-top-right-radius: 3px;
 	font-size: 0.9em;
-	margin: 0 2px 0 0;
+	margin: 0;
 	position: relative;
 }
 
 #tbe_tabstrip li.tbe_item_lit
 {
-	background: #1d3652;
+	background: #CE3C92; /* old browsers */
+	background: -moz-linear-gradient(top, #CE3C92 0%, #AB156D 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#CE3C92), color-stop(100%,#AB156D)); /* webkit */
 	color: #fff;
-}
-
-.textarea-handle
-{
-	height: 8px;
-	display: block;
-	width: 99%;
-	background: #C5C5C5;
-	background-image: url('_newimages/grab-handle.gif');
-	background-repeat: no-repeat;
-	background-position: 50% 50%;
+	text-shadow: -1px -1px 0 #97115f;
+	border-color: #9d1263;
 }
\ No newline at end of file
diff --git a/upload/admin/skin_cp/blank.html b/upload/admin/skin_cp/blank.html
deleted file mode 100644
index 6c03a5c5..00000000
--- a/upload/admin/skin_cp/blank.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-</head>
-<body></body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/calendar.html b/upload/admin/skin_cp/calendar.html
deleted file mode 100644
index 25da121d..00000000
--- a/upload/admin/skin_cp/calendar.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!--
-Title: Tigra Calendar
-URL: http://www.softcomplex.com/products/tigra_calendar/
-Version: 3.2
-Date: 10/14/2002 (mm/dd/yyyy)
-Note: Permission given to use this script in ANY kind of applications if
-   header lines are left unchanged.
-Note: Script consists of two files: calendar?.js and calendar.html
--->
-<html>
-<head>
-<title>Select Date, Please.</title>
-<style>
-	td {font-family: Tahoma, Verdana, sans-serif; font-size: 12px;}
-</style>
-<script language="JavaScript">
-
-// months as they appear in the calendar's title
-var ARR_MONTHS = ["January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"];
-// week day titles as they appear on the calendar
-var ARR_WEEKDAYS = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
-// day week starts from (normally 0-Su or 1-Mo)
-var NUM_WEEKSTART = 1;
-// path to the directory where calendar images are stored. trailing slash req.
-var STR_ICONPATH = 'images/folder_calendar_images/';
-
-var re_url = new RegExp('datetime=(\\-?\\d+)');
-var dt_current = (re_url.exec(String(window.location))
-	? new Date(new Number(RegExp.$1)) : new Date());
-var re_id = new RegExp('id=(\\d+)');
-var num_id = (re_id.exec(String(window.location))
-	? new Number(RegExp.$1) : 0);
-var obj_caller = (window.opener ? window.opener.calendars[num_id] : null);
-
-if (obj_caller && obj_caller.year_scroll) {
-	// get same date in the previous year
-	var dt_prev_year = new Date(dt_current);
-	dt_prev_year.setFullYear(dt_prev_year.getFullYear() - 1);
-	if (dt_prev_year.getDate() != dt_current.getDate())
-		dt_prev_year.setDate(0);
-	
-	// get same date in the next year
-	var dt_next_year = new Date(dt_current);
-	dt_next_year.setFullYear(dt_next_year.getFullYear() + 1);
-	if (dt_next_year.getDate() != dt_current.getDate())
-		dt_next_year.setDate(0);
-}
-
-// get same date in the previous month
-var dt_prev_month = new Date(dt_current);
-dt_prev_month.setMonth(dt_prev_month.getMonth() - 1);
-if (dt_prev_month.getDate() != dt_current.getDate())
-	dt_prev_month.setDate(0);
-
-// get same date in the next month
-var dt_next_month = new Date(dt_current);
-dt_next_month.setMonth(dt_next_month.getMonth() + 1);
-if (dt_next_month.getDate() != dt_current.getDate())
-	dt_next_month.setDate(0);
-
-// get first day to display in the grid for current month
-var dt_firstday = new Date(dt_current);
-dt_firstday.setDate(1);
-dt_firstday.setDate(1 - (7 + dt_firstday.getDay() - NUM_WEEKSTART) % 7);
-
-// function passing selected date to calling window
-function set_datetime(n_datetime, b_close) {
-	if (!obj_caller) return;
-
-	var dt_datetime = obj_caller.prs_time(
-		(document.cal ? document.cal.time.value : ''),
-		new Date(n_datetime)
-	);
-
-	if (!dt_datetime) return;
-	if (b_close) {
-		window.close();
-		obj_caller.target.value = (document.cal
-			? obj_caller.gen_tsmp(dt_datetime)
-			: obj_caller.gen_date(dt_datetime)
-		);
-	}
-	else obj_caller.popup(dt_datetime.valueOf(), true);
-}
-
-</script>
-</head>
-<body bgcolor="#FFFFFF" marginheight="5" marginwidth="5" topmargin="5" leftmargin="5" rightmargin="5">
-<table class="clsOTable" cellspacing="0" border="0" width="100%">
-<tr><td bgcolor="#4682B4">
-<table cellspacing="1" cellpadding="3" border="0" width="100%">
-<tr><td colspan="7"><table cellspacing="0" cellpadding="0" border="0" width="100%">
-<tr>
-<script language="JavaScript">
-document.write(
-'<td>'+(obj_caller&&obj_caller.year_scroll?'<a href="javascript:set_datetime('+dt_prev_year.valueOf()+')"><img src="'+STR_ICONPATH+'prev_year.gif" width="16" height="16" border="0" alt="previous year"></a>&nbsp;':'')+'<a href="javascript:set_datetime('+dt_prev_month.valueOf()+')"><img src="'+STR_ICONPATH+'prev.gif" width="16" height="16" border="0" alt="previous month"></a></td>'+
-'<td align="center" width="100%"><font color="#ffffff">'+ARR_MONTHS[dt_current.getMonth()]+' '+dt_current.getFullYear() + '</font></td>'+
-'<td><a href="javascript:set_datetime('+dt_next_month.valueOf()+')"><img src="'+STR_ICONPATH+'next.gif" width="16" height="16" border="0" alt="next month"></a>'+(obj_caller && obj_caller.year_scroll?'&nbsp;<a href="javascript:set_datetime('+dt_next_year.valueOf()+')"><img src="'+STR_ICONPATH+'next_year.gif" width="16" height="16" border="0" alt="next year"></a>':'')+'</td>'
-);
-</script>
-</tr>
-</table></td></tr>
-<tr>
-<script language="JavaScript">
-
-// print weekdays titles
-for (var n=0; n<7; n++)
-	document.write('<td bgcolor="#87cefa" align="center"><font color="#ffffff">'+ARR_WEEKDAYS[(NUM_WEEKSTART+n)%7]+'</font></td>');
-document.write('</tr>');
-
-// print calendar table
-var dt_current_day = new Date(dt_firstday);
-while (dt_current_day.getMonth() == dt_current.getMonth() ||
-	dt_current_day.getMonth() == dt_firstday.getMonth()) {
-	// print row heder
-	document.write('<tr>');
-	for (var n_current_wday=0; n_current_wday<7; n_current_wday++) {
-		if (dt_current_day.getDate() == dt_current.getDate() &&
-			dt_current_day.getMonth() == dt_current.getMonth())
-			// print current date
-			document.write('<td bgcolor="#ffb6c1" align="center" width="14%">');
-		else if (dt_current_day.getDay() == 0 || dt_current_day.getDay() == 6)
-			// weekend days
-			document.write('<td bgcolor="#dbeaf5" align="center" width="14%">');
-		else
-			// print working days of current month
-			document.write('<td bgcolor="#ffffff" align="center" width="14%">');
-
-		document.write('<a href="javascript:set_datetime('+dt_current_day.valueOf() +', true);">');
-
-		if (dt_current_day.getMonth() == this.dt_current.getMonth())
-			// print days of current month
-			document.write('<font color="#000000">');
-		else 
-			// print days of other months
-			document.write('<font color="#606060">');
-			
-		document.write(dt_current_day.getDate()+'</font></a></td>');
-		dt_current_day.setDate(dt_current_day.getDate()+1);
-	}
-	// print row footer
-	document.write('</tr>');
-}
-if (obj_caller && obj_caller.time_comp)
-	document.write('<form onsubmit="javascript:set_datetime('+dt_current.valueOf()+', true)" name="cal"><tr><td colspan="7" bgcolor="#87CEFA"><font color="White" face="tahoma, verdana" size="2">Time: <input type="text" name="time" value="'+obj_caller.gen_time(this.dt_current)+'" size="8" maxlength="8"></font></td></tr></form>');
-</script>
-</table></tr></td>
-</table>
-</body>
-</html>
-
diff --git a/upload/admin/skin_cp/cp_skin_global.php b/upload/admin/skin_cp/cp_skin_global.php
index 33612f39..6f76e5c1 100644
--- a/upload/admin/skin_cp/cp_skin_global.php
+++ b/upload/admin/skin_cp/cp_skin_global.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin CP global skin templates
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-09-23 06:44:58 -0400 (Fri, 23 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6925 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9541 $
  * @since		3.0.0
  *
  */
@@ -25,49 +25,123 @@ class cp_skin_global extends output
  * Prevent our main destructor being called by this class
  *
  * @access	public
- * @return	void
+ * @return	@e void
  */
 public function __destruct()
 {
 }
 
 /**
- * Done screen
+ * Redirector page
  *
- * @access	public
- * @param	string 		Page title
- * @param	string		Link text
- * @param	string		Link url
- * @param	string		URL to redirect to
- * @return	string		HTML
+ * @param	string	$url	URL to send to
+ * @param	string	$text	Text to display
+ * @return	@e string
  */
-public function doneScreenView( $title, $link_text="", $link_url="", $redirect="" ) {
+public function temporaryRedirect( $url, $text, $time=2 )
+{
+
+$time = intval( $time ) * 1000;
+
 $IPBHTML = "";
 //--starthtml--//
 
-$IPBHTML .= <<<HTML
-<div class='tableborder'>
-	<div class='tableheaderalt'>{$title}</div>
+$url	= str_replace( '&amp;', '&', $url );
 
-	<table width='100%' align='center'>
-		<tr>
-			<td class='tablesubheader' width='100%' align='center'>&nbsp;</td>
-			<td class='tablesubheader' align='center'>&nbsp;</td>
-		</tr>
-		<tr>
-			<td align='center' class='tablerow1' colspan='2' ><a href='{$this->settings['base_url']}&amp;{$link_url}'>{$link_text}</a></td>
-		</tr>
-		<tr>
-			<td align='center' class='tablerow1' colspan='2' ><a href='{$this->settings['_base_url']}'>{$this->lang->words['gl_gotohome']}</a></td>
-		</tr>
-	</table>
-</div>
-HTML;
+$IPBHTML .= <<<EOF
+<div class='information-box'>{$text}</div>
+<script type='text/javascript'>
+jQ(document).ready(function() {
+	setTimeout( "window.location = '{$url}';", {$time} );
+});
+</script>
+EOF;
 
 //--endhtml--//
 return $IPBHTML;
 }
 
+//===========================================================================
+// <ips:ips_editor:desc::trigger:>
+//===========================================================================
+function editor($formField='post', $content='', $options=array(), $autoSaveData=array() ) {
+$IPBHTML = "";
+//--starthtml--//
+
+$options['type'] = ( $options['type'] ) ? $options['type'] : "''";
+$options['minimize']       = intval( $options['minimize'] );
+$options['smilies']        = json_encode( $options['smilies'] );
+
+$bbcode = IPSLib::fetchBbcodeAsJson();
+
+if ( ! $this->_editorJsLoaded )
+{
+	$this->_editorJsLoaded = true;
+	
+	if ( defined("CK_LOAD_SOURCE") AND CK_LOAD_SOURCE )
+	{
+		$IPBHTML .= <<<EOF
+		<script type="text/javascript" src="{$this->settings['public_dir']}js/3rd_party/ckeditor/ckeditor_source.js"></script>
+EOF;
+	}
+	else
+	{
+		$IPBHTML .= <<<EOF
+		<script type="text/javascript" src="{$this->settings['public_dir']}js/3rd_party/ckeditor/ckeditor.js"></script>
+EOF;
+	}
+	
+	$IPBHTML .= <<<EOF
+<script type="text/javascript" src='{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/ipb.lang.js' charset='{$this->settings['gb_char_set']}'></script>
+<script type="text/javascript" src="{$this->settings['public_dir']}js/ips.textEditor.js"></script>
+<script type="text/javascript">
+	/* Dynamic items */
+	CKEDITOR.config.IPS_BBCODE          = {$bbcode};
+	CKEDITOR.config.IPS_BBCODE_IMG_URL  = "{$this->settings['public_dir']}style_extra/bbcode_icons";
+	CKEDITOR.config.IPS_BBCODE_BUTTONS  = [];
+	
+	/* Has to go before config load */
+	var IPS_smiley_path			= "{$this->settings['emoticons_url']}/";
+	var IPS_smiles       		= {$options['smilies']};
+	var IPS_remove_plugins      = [];
+	
+	/* Has to go after */
+EOF;
+
+	if( $options['noSmilies'] )
+	{
+		$IPBHTML .= <<<EOF
+	IPS_remove_plugins.push( 'smiley' );
+EOF;
+	}
+	
+	$IPBHTML .= <<<EOF
+	
+	/* Load our configuration */
+	CKEDITOR.config.customConfig  = '{$this->settings['public_dir']}js/3rd_party/ckeditor/ips_config.js';
+</script>
+<style type="text/css">
+@import url("{$this->settings['css_base_url']}style_css/{$this->registry->output->skin['_csscacheid']}/ipb_ckeditor.css");
+</style>
+EOF;
+}
+
+$IPBHTML .= <<<EOF
+<textarea id="{$options['editorName']}" name="{$formField}" class='ips_EditorTextArea'>{$content}</textarea>
+<a id="ips_switchEditor" style="display:none" href="javascript:void()">Switch to Rich Text Editor</a>
+<script type="text/javascript">
+	ipb.textEditor.initialize('{$options['editorName']}', { type: '{$options['type']}',
+															minimize: {$options['minimize']},
+															bypassCKEditor: {$options['bypassCKEditor']},
+															isRte: {$options['isRte']},
+															ips_AutoSaveKey: '',
+											                ips_AutoSaveData: {} } );
+</script>
+EOF;
+//--endhtml--//
+return $IPBHTML;
+}
+
 /**
  * Editor template for ACP
  *
@@ -154,16 +228,6 @@ EOF;
 				<li class='right'>
 					<span id='{$editor_id}_cmd_redo' class='rte_control rte_button' title='{$this->lang->words['js_tt_redo']}'><img src='{$this->settings['img_url']}/rte_icons/redo.png' alt='{$this->lang->words['js_tt_redo']}' /></span>
 				</li>
-EOF;
-			if( $this->settings['posting_allow_rte'] == 1 )
-			{
-$IPBHTML .= <<<EOF
-				<li class='right'>
-					<!--<span id='{$editor_id}_cmd_switcheditor' class='rte_control rte_button' title='{$this->lang->words['js_tt_switcheditor']}'><img src='{$this->settings['img_url']}/rte_icons/switch.png' alt='{$this->lang->words['js_tt_switcheditor']}' /></span>-->
-				</li>
-EOF;
-			}
-$IPBHTML .= <<<EOF
 			</ul>
 			<ul id='{$editor_id}_toolbar_2' class='toolbar' style='display: none'>
 				<li>
@@ -303,7 +367,7 @@ $IPBHTML = "";
 //--starthtml--//
 
 $_path		= IPS_PUBLIC_SCRIPT;
-$_useRte	= ($this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE']) === TRUE ? 1 : 0;
+$_useRte	= $this->memberData['members_editor_choice'] == 'rte' ? 1 : 0;
 $boardurl = ($this->registry->output->isHTTPS) ? $this->settings['board_url_https'] : $this->settings['board_url'];
 
 $IPBHTML .= <<<EOF
@@ -327,7 +391,7 @@ EOF;
 /** CSS ----------------------------------------- */
 if ( $this->settings['use_minify'] )
 {
-	$_basics  = CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_content.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
+	$_basics  = CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
 	$_others  = '';
 
 	if ( is_array( $cssFiles['import'] ) AND count( $cssFiles['import'] ) )
@@ -345,7 +409,6 @@ else
 	$IPBHTML .= <<<HTML
 	<style type='text/css' media='all'>
 		@import url( "{$this->settings['skin_acp_url']}/acp.css" );
-		@import url( "{$this->settings['skin_acp_url']}/acp_content.css" );
 		@import url( "{$this->settings['skin_acp_url']}/acp_editor.css" );
 	</style>
 HTML;
@@ -369,6 +432,17 @@ $IPBHTML .= <<<HTML
 	<![endif]-->
 HTML;
 
+if( IN_DEV )
+{
+	$IPBHTML .= <<<HTML
+		<style type='text/css' media='all'>
+			.ipsActionBar > ul > li.inDev {
+				display: inline;
+			}
+		</style>
+HTML;
+}
+
 if( is_array($cssFiles['inline']) AND count($cssFiles['inline']) )
 {
 	$IPBHTML .= <<<EOF
@@ -388,14 +462,14 @@ EOF;
 /** JS ----------------------------------------- */
 if ( $this->settings['use_minify'] )
 {
-	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'livesearch', 'styles', 'tabs' ) ) . '.js';
+	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'tabs' ) ) . '.js';
 
 	$IPBHTML .= <<<HTML
 
 	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
 HTML;
 
-	$IPBHTML .= "\n\t<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=public/js/ipb.js" . $_others;
+	$IPBHTML .= "\n\t<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=" . PUBLIC_DIRECTORY . "/js/ipb.js" . $_others;
 
 	if ( $this->settings['extraJsModules'] )
 	{
@@ -417,7 +491,7 @@ HTML;
 
 			$_seenModules[] = $_jsModule;
 
-			$_loadModules	.= ",public/js/ips." . $_jsModule . ".js";
+			$_loadModules	.= "," . PUBLIC_DIRECTORY . "/js/ips." . $_jsModule . ".js";
 		}
 
 		$IPBHTML .= $_loadModules . "'></script>\n";
@@ -435,14 +509,12 @@ else
 		<script type="text/javascript" src='{$this->settings['public_dir']}js/ipb.js?load={$this->settings['extraJsModules']}'></script>
 		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.menu.js'></script>
 		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.livesearch.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.styles.js'></script>
 		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.tabs.js'></script>
 HTML;
 }
 
 $IPBHTML .= <<<EOF
-	<script type='text/javascript' language='javascript'>
+	<script type='text/javascript'>
 	//<![CDATA[
 		ipb.vars['st']	= "{$this->request['st']}";
 		ipb.vars['base_url']	= "{$this->settings['_base_url']}";
@@ -450,6 +522,7 @@ $IPBHTML .= <<<EOF
 		ipb.vars['app_url']		= "{$this->settings['base_url']}";
 		ipb.vars['image_url'] 	= "{$this->settings['skin_app_url']}/images/";
 		ipb.vars['md5_hash']	= "{$this->member->form_hash}";
+		ipb.vars['is_touch']    = false;
 		/* ---- cookies ----- */
 		ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
 		ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
@@ -460,7 +533,7 @@ $IPBHTML .= <<<EOF
 	//]]>
 	</script>
 	<!--<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>-->
-	<script type='text/javascript' language='javascript'>
+	<script type='text/javascript'>
 		Loader.boot();
 		acp = new IPBACP;
 	</script>
@@ -488,234 +561,43 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * Page wrapper without the "fluff" - minimal wrapper
- *
- * @access	public
- * @param	string 		Document character set
- * @param	array 		CSS Files
- * @return	string		HTML
- */
-public function global_main_wrapper_no_furniture($IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET, $cssFiles=array() ) {
-
-$_useRte	= ($this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE']) === TRUE ? 1 : 0;
-$boardurl = ($this->registry->output->isHTTPS) ? $this->settings['board_url_https'] : $this->settings['board_url'];
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset={$IPS_DOC_CHAR_SET}" />
-	<meta http-equiv="Pragma" content="no-cache" />
-	<meta http-equiv="Cache-Control" content="no-cache" />
-	<meta http-equiv="Expires" content="Fri, 01 January 1999 01:00:00 GMT" />
-	<link rel="shortcut icon" href='{$boardurl}/favicon.ico' />
-
-	<title><%TITLE%></title>
-	<script type='text/javascript'>
-		jsDebug = 1;
-		USE_RTE = {$_useRte};
-		isRTL	= false;
-	</script>
-EOF;
-
-/** CSS ----------------------------------------- */
-if ( $this->settings['use_minify'] )
-{
-	$_basics  = CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_content.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
-	$_others  = '';
-	
-	if ( is_array( $cssFiles['import'] ) AND count( $cssFiles['import'] ) )
-	{
-		foreach( $cssFiles['import'] as $data )
-		{
-			$_others .= ',' . preg_replace( "#^(.*)/(" . CP_DIRECTORY . "/.*)$#", "$2", $data['content'] );
-		}
-	}
-	
-	$IPBHTML .= "\n\t<link rel=\"stylesheet\" type=\"text/css\" media='screen' href=\"{$this->settings['public_dir']}min/index.php?f={$_basics}{$_others}\">\n";
-}
-else
-{
-	$IPBHTML .= <<<HTML
-	<style type='text/css' media='all'>
-		@import url( "{$this->settings['skin_acp_url']}/acp.css" );
-		@import url( "{$this->settings['skin_acp_url']}/acp_content.css" );
-		@import url( "{$this->settings['skin_acp_url']}/acp_editor.css" );
-	</style>
-HTML;
-
-	if( is_array($cssFiles['import']) AND count($cssFiles['import']) )
-	{
-		foreach( $cssFiles['import'] as $data )
-		{
-			$IPBHTML .= <<<EOF
-			<link rel="stylesheet" type="text/css" {$data['attributes']} href="{$data['content']}" />
-EOF;
-		}
-	}
-}
-
-$IPBHTML .= <<<HTML
-	<!--[if IE]>
-		<style type='text/css' media='all'>
-			@import url( "{$this->settings['skin_acp_url']}/acp_ie_tweaks.css" );
-		</style>
-	<![endif]-->
-HTML;
-
-if( is_array($cssFiles['inline']) AND count($cssFiles['inline']) )
-{
-	$IPBHTML .= <<<EOF
-		<style type='text/css' media="all">
-EOF;
-
-	foreach( $cssFiles['inline'] as $data )
-	{
-		$IPBHTML .= $data['content'];
-	}
-
-	$IPBHTML .= <<<EOF
-		</style>
-EOF;
-}
-
-/** JS ----------------------------------------- */
-if ( $this->settings['use_minify'] )
-{
-	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'livesearch', 'styles', 'tabs' ) ) . '.js';
-	
-	$IPBHTML .= <<<HTML
-	
-	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
-HTML;
-
-	$IPBHTML .= "\n\t<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=public/js/ipb.js" . $_others;
-	
-	if ( $this->settings['extraJsModules'] )
-	{
-		$_modules		= explode( ',', $this->settings['extraJsModules'] );
-		$_loadModules	= '';
-		$_seenModules	= array();
-		
-		foreach( $_modules as $_jsModule )
-		{
-			if( !$_jsModule )
-			{
-				continue;
-			}
-			
-			if( in_array( $_jsModule, $_seenModules ) )
-			{
-				continue;
-			}
-			
-			$_seenModules[] = $_jsModule;
-			
-			$_loadModules	.= ",public/js/ips." . $_jsModule . ".js";
-		}
-		
-		$IPBHTML .= $_loadModules . "'></script>\n";
-	}
-	else
-	{
-		$IPBHTML .= "'></script>\n";
-	}
-}
-else
-{
-	$IPBHTML .= <<<HTML
-		<script type="text/javascript" src="{$this->settings['public_dir']}js/3rd_party/prototype.js"></script>
-		<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/scriptaculous/scriptaculous-cache.js'></script>
-		<script type="text/javascript" src='{$this->settings['public_dir']}js/ipb.js?load={$this->settings['extraJsModules']}'></script>
-		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.menu.js'></script>
-		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.livesearch.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.styles.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.tabs.js'></script>
-HTML;
-}
-
-$IPBHTML .= <<<HTML
-	<script type='text/javascript' language='javascript'>
-	//<![CDATA[
-		ipb.vars['st']	= "{$this->request['st']}";
-		ipb.vars['base_url']	= "{$this->settings['_base_url']}";
-		ipb.vars['front_url']	= "{$this->settings['board_url']}/index.php?";
-		ipb.vars['app_url']		= "{$this->settings['base_url']}";
-		ipb.vars['image_url'] 	= "{$this->settings['skin_app_url']}/images/";
-		ipb.vars['md5_hash']	= "{$this->member->form_hash}";
-		/* ---- cookies ----- */
-		ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
-		ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
-		ipb.vars['cookie_path']			= '{$this->settings['cookie_path']}';
-		ipb.templates['close_popup']	= "<img src='{$this->settings['img_url']}/close_popup.png' alt='x' />";
-		ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['gl_pagejump']}</h3><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='Go' class='input_submit add_folder' id='#{id}_submit' /></div>");
-		ipb.templates['ajax_loading'] 	= "<div id='ajax_loading'>{$this->lang->words['gl_loading']}</div>";
-	//]]>
-	</script>
-	<!--<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>-->
-	<script type='text/javascript' language='javascript'>
-		Loader.boot();
-		acp = new IPBACP;
-	</script>
-	<script type="text/javascript" src="{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/acp.lang.js" charset="{$IPS_DOC_CHAR_SET}"></script>
-</head>
-<body id='ipboard_body'>
-<div id='loading-layer' style='display:none'>
-	<div id='loading-layer-shadow'>
-	   <div id='loading-layer-inner' >
-		   <img src='{$this->settings['skin_acp_url']}/images/loading_anim.gif' style='vertical-align:middle' />
-		   <span style='font-weight:bold' id='loading-layer-text'>{$this->lang->words['ajax_please_wait']}</span>
-	   </div>
-	</div>
-</div>
-<%CONTENT%>
-</body>
-</html>
-HTML;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * Primary page wrapper - used for all full pages
  *
  * @access	public
  * @param	string 		Document character set
  * @param	array 		CSS Files
+ * @param	string		Global submenu HTML (@see global_menu_sub_navigation)
+ * @param	array 		Order of tabs
  * @return	string		HTML
  */
-public function global_main_wrapper($IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET, $cssFiles=array() ) {
+public function global_main_wrapper($IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET, $cssFiles=array(), $gbl_sub_menu='', $tabOrder=array() ) {
 
 $IPBHTML = "";
 //--starthtml--//
 
 //$_encoded = base64_encode( $this->settings['query_string_safe'] );
-$_url = str_replace( '&amp;'   , '&', $this->settings['query_string_safe'] );
-$_url = preg_replace( '#&{1,}#', ';', $_url );
-$_url = preg_replace( '#={1,}#', ':', $_url );
-$_url = ltrim( $_url, ';' );
+$_url	= str_replace( '&amp;'   , '&', $this->settings['query_string_safe'] );
+$_url	= preg_replace( '#&{1,}#', ';', $_url );
+$_url	= preg_replace( '#={1,}#', ':', $_url );
+$_url	= ltrim( $_url, ';' );
 
-$_path = IPS_PUBLIC_SCRIPT;
-$year  = date('Y');
-ipsRegistry::$request[ 'st'] =  ( ipsRegistry::$request['st']  ? ipsRegistry::$request['st'] : 0 );
+$_path	= IPS_PUBLIC_SCRIPT;
+$year	= date('Y');
 
 /* Open Tab */
-$__tabs = ( is_array( $this->member->acp_tab_data ) and count( $this->member->acp_tab_data ) )
+$__tabs	= ( is_array( $this->member->acp_tab_data ) and count( $this->member->acp_tab_data ) )
 		? "'" . implode( "','", array_keys( $this->member->acp_tab_data ) ) . "'"
 		: '';
 
 $_apptitle	= ipsRegistry::$applications[ ipsRegistry::$current_application ]['app_title'];
-$_useRte	= ($this->memberData['members_editor_choice'] == 'rte' && $this->memberData['_canUseRTE']) === TRUE ? 1 : 0;
+$_useRte	= $this->memberData['members_editor_choice'] == 'rte' ? 1 : 0;
 
-$defaultFakeApp    = '';
-$defaultFakeModule = '';
+$defaultFakeApp		= '';
+$defaultFakeModule	= '';
+
+$curApp				= array();
 
-$curApp         = array();
 switch( ipsRegistry::$current_application )
 {
 	case 'forums':
@@ -732,7 +614,7 @@ switch( ipsRegistry::$current_application )
 		break;
 }
 
-$fakeApps = $this->registry->output->fetchFakeApps();
+$fakeApps	= $this->registry->output->fetchFakeApps();
 
 foreach( $fakeApps as $fa => $data )
 {
@@ -753,6 +635,25 @@ foreach( $fakeApps as $fa => $data )
 	}
 }
 
+if( !$this->settings['ipb_reg_number'] )
+{
+	$this->lang->words['license_missing_info']	= sprintf( $this->lang->words['license_missing_info'], $this->settings['base_url'] . 'app=core&amp;module=tools&amp;section=licensekey' );
+	$extra_class = 'force_license';
+	$license_html = <<<HTML
+HTML;
+}
+else
+{
+	$licenseData	= $this->cache->getCache( 'licenseData' );
+	
+	if( ( !$licenseData OR !$licenseData['key']['_expires'] OR $licenseData['key']['_expires'] < IPS_UNIX_TIME_NOW and $licenseData['key']['_expires'] != -1 ) AND !IPSCookie::get( 'ignore-license-notice' ) )
+	{
+		$extra_class = 'expired_license';
+		$license_html = <<<HTML
+HTML;
+	}
+}
+
 $boardurl = ($this->registry->output->isHTTPS) ? $this->settings['board_url_https'] : $this->settings['board_url'];
 
 $IPBHTML .= <<<HTML
@@ -777,7 +678,7 @@ HTML;
 /** CSS ----------------------------------------- */
 if ( $this->settings['use_minify'] )
 {
-	$_basics  = CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_content.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
+	$_basics  = CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
 	$_others  = '';
 	
 	if ( is_array( $cssFiles['import'] ) AND count( $cssFiles['import'] ) )
@@ -795,7 +696,6 @@ else
 	$IPBHTML .= <<<HTML
 	<style type='text/css' media='all'>
 		@import url( "{$this->settings['skin_acp_url']}/acp.css" );
-		@import url( "{$this->settings['skin_acp_url']}/acp_content.css" );
 		@import url( "{$this->settings['skin_acp_url']}/acp_editor.css" );
 	</style>
 HTML;
@@ -819,6 +719,17 @@ $IPBHTML .= <<<HTML
 	<![endif]-->
 HTML;
 
+if( IN_DEV )
+{
+	$IPBHTML .= <<<HTML
+		<style type='text/css' media='all'>
+			.ipsActionBar > ul > li.inDev {
+				display: inline;
+			}
+		</style>
+HTML;
+}
+
 if( is_array($cssFiles['inline']) AND count($cssFiles['inline']) )
 {
 	$IPBHTML .= <<<EOF
@@ -838,14 +749,25 @@ EOF;
 /** JS ----------------------------------------- */
 if ( $this->settings['use_minify'] )
 {
-	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'livesearch', 'styles', 'tabs' ) ) . '.js';
+	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'tabs' ) ) . '.js';
 	
-	$IPBHTML .= <<<HTML
+	if ( $this->settings['remote_load_js'] )
+	{
+		$IPBHTML .= <<<HTML
+		<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/prototype/1.7/prototype.js'></script>
+		<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/scriptaculous/1.8/scriptaculous.js?load=effects,dragdrop,builder'></script>
+HTML;
+
+	}
+	else
+	{
+			$IPBHTML .= <<<HTML
 	
 	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
 HTML;
+	}
 
-	$IPBHTML .= "\n\t<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=public/js/ipb.js" . $_others;
+	$IPBHTML .= "\n\t<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f=" . PUBLIC_DIRECTORY . "/js/ipb.js" . $_others;
 	
 	if ( $this->settings['extraJsModules'] )
 	{
@@ -867,7 +789,7 @@ HTML;
 			
 			$_seenModules[] = $_jsModule;
 			
-			$_loadModules	.= ",public/js/ips." . $_jsModule . ".js";
+			$_loadModules	.= "," . PUBLIC_DIRECTORY . "/js/ips." . $_jsModule . ".js";
 		}
 		
 		$IPBHTML .= $_loadModules . "'></script>\n";
@@ -885,14 +807,35 @@ else
 		<script type="text/javascript" src='{$this->settings['public_dir']}js/ipb.js?load={$this->settings['extraJsModules']}'></script>
 		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.menu.js'></script>
 		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.livesearch.js'></script>
-		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.styles.js'></script>
 		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.tabs.js'></script>
 HTML;
 }
 
+/* SIDEBAR */
+if( $this->settings['hide_sidebar'] || IPSCookie::get("acp_sidebar") == 'closed' )
+{
+	if( $this->settings['hide_sidebar'] )
+	{
+		//$sidebar['toggle_class'] = "style='display: none'";
+	}
+	$sidebar['content_class'] = "close_menu";
+	$sidebar['menu_style'] = "style='display: none'";
+}
+else
+{
+	$sidebar['content_class'] = "open_menu";
+	$sidebar['menu_style'] = "";
+}
+
 $IPBHTML .= <<<HTML
-	<script type='text/javascript' language='javascript'>
+	<script type="text/javascript" src="{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/acp.lang.js" charset="{$IPS_DOC_CHAR_SET}"></script>
+	<script type='text/javascript' src='{$this->settings['js_main_url']}3rd_party/jquery.min.js'></script>
+	<script type='text/javascript' src='{$this->settings['js_main_url']}3rd_party/jquery-ui.min.js'></script>
+	<script type='text/javascript'>
+		var jQ = jQuery.noConflict();
+	</script>
+	<script type='text/javascript' src='{$this->settings['js_main_url']}acp.jquery.js'></script>
+	<script type='text/javascript'>
 	//<![CDATA[
 		ipb.vars['st']	= "{$this->request['st']}";
 		ipb.vars['base_url']	= "{$this->settings['_base_url']}";
@@ -900,6 +843,7 @@ $IPBHTML .= <<<HTML
 		ipb.vars['app_url']		= "{$this->settings['base_url']}";
 		ipb.vars['image_url'] 	= "{$this->settings['skin_app_url']}/images/";
 		ipb.vars['md5_hash']	= "{$this->member->form_hash}";
+		ipb.vars['is_touch']    = false;
 		/* ---- cookies ----- */
 		ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
 		ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
@@ -907,17 +851,19 @@ $IPBHTML .= <<<HTML
 		ipb.templates['close_popup']	= "<img src='{$this->settings['img_url']}/close_popup.png' alt='x' />";
 		ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['gl_pagejump']}</h3><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='Go' class='realbutton' id='#{id}_submit' /></div>");
 		ipb.templates['ajax_loading'] 	= "<div id='ajax_loading'>{$this->lang->words['gl_loading']}</div>";
+		ipb.templates['global_notify'] 	= new Template("<div class='popupWrapper'><div class='popupInner'><div class='ipsPad'>#{message} #{close}</div></div></div>");
+		ipb.templates['global_notify_close']	= "<span id='ipsGlobalNotification_close' class='realbutton'>{$this->lang->words['gbl_ok']}</span>";
 	//]]>
 	</script>
-	<!--<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>-->
-	<script type='text/javascript' language='javascript'>
+	<script type='text/javascript'>
 		Loader.boot();
 		acp = new IPBACP;
 	</script>
-	<script type="text/javascript" src="{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/acp.lang.js" charset="{$IPS_DOC_CHAR_SET}"></script>
 </head>
-<body id='ipboard_body'>
+<body id='ipboard_body' class='{$extra_class} clearfix'>
 <!-- Inline Form Box -->
+<div id='modal' style='display: none'></div>
+{$license_html}
 <div id='inlineFormWrap' style='display: none;'>
 	<div id='inlineFormInnerWrap'>
 		<div id='inlineFormInnerClose' onclick="Effect.Fade( 'inlineFormWrap', { duration: .5 } );"></div>
@@ -931,59 +877,86 @@ $IPBHTML .= <<<HTML
 		<div id='inlineFormLoading'>
 			{$this->lang->words['gl_pleasewait']}...
 			<br /><br />
-			<img src='{$this->settings['skin_acp_url']}/_newimages/loading_big.gif' alt='loading' id='search_loading' />
+			<img src='{$this->settings['skin_acp_url']}/images/loading_big.gif' alt='loading' id='search_loading' />
 		</div>
 	</div>
 </div>
 <!-- / Inline Form Box -->
-	<p id='admin_bar'>
-		<span id='logged_in'>{$this->lang->words['gl_loggedinas']} <strong>{$this->memberData['members_display_name']}</strong> (<a href='{$this->settings['_base_url']}&amp;module=login&amp;do=login-out'>{$this->lang->words['gbl_log_out']}</a>)</span>
-		<a href='../'>&lt; {$this->lang->words['gbl_view_site']}</a>
-	</p>
 	<div id='header'>
-		<div id='branding'>
-			<a href='{$this->settings['_base_url']}' title='{$this->lang->words['home']}'><img src='{$this->settings['skin_acp_url']}/_newimages/logo.png' alt='{$this->lang->words['gl_logo']}' /></a>
+		<div id='search' class='right'>
+			<img src='{$this->settings['skin_acp_url']}/images/search_icon_white.png' alt='' /> <input type='text' value='{$this->lang->words['gl_livesearch']}' id='acpSearchKeyword' class='inactive' /><img src='{$this->settings['skin_acp_url']}/images/loading.gif' id='acp_loading' style='display: none' />
 		</div>
-		<h1>{$this->lang->words['gl_ipbadminarea']}</h1>
-		<div id='navigation'>
-			<ul id='section_buttons'>
-				<li class='{$curApp['core']}'><a href='{$this->settings['_base_url']}app=core'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/core.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_system']}</a></li>
-				<li class='{$curApp['forums']}'><a href='{$this->settings['_base_url']}app=forums'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/forums.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_forums']}</a></li>
-				<li class='{$curApp['members']}'><a href='{$this->settings['_base_url']}app=members'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/members.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_members']}</a></li>
-				<li class='{$curApp['lookfeel']}'><a href='{$this->settings['_base_url']}app={$defaultFakeApp}&amp;module={$defaultFakeModule}'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/palette.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_lookandfeel']}</a></li>
-				<li class='{$curApp['support']}'><a href='{$this->settings['_base_url']}app=core&amp;module=diagnostics'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/help.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_support']}</a></li>
-				<li class='{$curApp['other']}'><a href='#' id='app_menu' class='ipbmenu'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/brick.png' alt='{$this->lang->words['gl_icon']}' /> {$this->lang->words['gl_myapps']}</a></li>
-			</ul>
-			<form action='#' method='get' onsubmit='return false;'>
-				{$this->lang->words['gl_livesearch']}: <input type='text' name='acpSearchKeyword' id='acpSearchKeyword' value='' />
-			</form>
-		</div>
-		<div id='app_menu_menucontent' style='display: none'>
-			<ul>
-HTML;
-		$IPBHTML .= $this->global_app_menu_html();
-		$IPBHTML .= <<<HTML
+		<a href='{$this->settings['_base_url']}' title='{$this->lang->words['home']}'>
+			<img src='{$this->settings['skin_acp_url']}/images/logo.png' alt='Logo' />
+		</a>
+		<div class='logged_in'>
+			{$this->lang->words['gl_loggedinas']} {$this->memberData['members_display_name']}
+			<ul id='user_links' class='ipsList_inline'>
+				<li>
+					<a href='../' target='_blank'>{$this->lang->words['gbl_view_site']}</a>
+				</li>
+				<li>
+					<a href='{$this->settings['_base_url']}app=core&amp;module=mycp&amp;section=dashboard'>{$this->lang->words['gbl_dashboard']}</a>
+				</li>
+				<li>
+					<a href='{$this->settings['_base_url']}&amp;module=login&amp;do=login-out'>{$this->lang->words['gbl_log_out']}</a>
+				</li>
 			</ul>
 		</div>
 	</div>
-	
-	<div id='page_body'>
-		<div id='section_navigation'>
+	<div id='live_search_results' style='display: none'>
+		<div id='ls_sections'>
+			<ul>
+				<li id='ls_settings'>{$this->lang->words['livesearch_settings']}<span class='count'></span></li>
+				<li id='ls_members'>{$this->lang->words['livesearch_members']}<span class='count'></span></li>
+				<li id='ls_groups'>{$this->lang->words['livesearch_groups']}<span class='count'></span></li>
+				<li id='ls_forums'>{$this->lang->words['livesearch_forums']}<span class='count'></span></li>
+				<li id='ls_location'>{$this->lang->words['livesearch_pages']}<span class='count'></span></li>
+HTML;
+				if( IPSLib::appIsInstalled('nexus') ){
+					$IPBHTML .= "<li id='ls_nexus'>{$this->lang->words['livesearch_nexus']}<span class='count'></span></li>";
+				}
+				
+$IPBHTML .= <<<HTML
+			</ul>
+		</div>
+		<div id='ls_results'>
+			<span id='ls_no_results' style='display: none'>There were no results for your search</span>
+			<div id='ls_settings_panel'></div>
+			<div id='ls_members_panel'></div>
+			<div id='ls_groups_panel'></div>
+			<div id='ls_forums_panel'></div>
+			<div id='ls_location_panel'></div>
+HTML;
+			if( IPSLib::appIsInstalled('nexus') ){
+				$IPBHTML .= "<div id='ls_nexus_panel'></div>";
+			}
+			
+$IPBHTML .= <<<HTML
+		</div>
+		<img src='{$this->settings['skin_acp_url']}/images/live_search_stem.png' id='ls_stem' />
+	</div>
+	<div id='app_bar'>
+		<!--<a class='right' id='edit_tabs' href='#' title="Set up the app bar just the way you want">Edit Tabs</a>-->
+HTML;
+		$IPBHTML .= $this->global_app_menu_html( $gbl_sub_menu, $tabOrder );
+		
+$IPBHTML .= <<<HTML
+	</div>
+
+	<div id='page_body' class='{$sidebar['content_class']} clearfix'>
+		<a href='#' id='toggle_sidebar' title='Close the sidebar' {$sidebar['toggle_class']}>&larr;</a>
+		<div id='section_navigation' {$sidebar['menu_style']}>			
 			<%SIDEBAR_EXTRA%>
 			<%MENU%>
 		</div>
-		<div id='main_content'>
-			<div id='content_wrap'>
-				<%NAV%>
-				
-				<%CONTENT%>
-			</div>
-			<br style='clear: both' />
+		<div id='main_content' class='clearfix'>
+			<%NAV%>				
+			<%CONTENT%>
 		</div>
-		
 	</div>
-	<div id='copyright'>
-		IPBoard 3 &copy; {$year} IPS, Inc. &nbsp;&nbsp;|&nbsp;&nbsp; {$this->lang->words['gl_getsupport']} &nbsp;&nbsp;|&nbsp;&nbsp; {$this->lang->words['gl_resources']}
+	<div id='footer' class='clear'>
+		<a href='http://www.invisionpower.com'>IP.Board 3</a> &copy; {$year} IPS, Inc. &nbsp;&nbsp;|&nbsp;&nbsp; <a href='http://hatynka.in' title='Nulled by Hatynka.in'>Nulled by Hatynka.in</a>
 HTML;
 
 if ( IN_DEV )
@@ -992,7 +965,7 @@ $count = count( $this->DB->obj['cached_queries'] );
 $files = count( get_included_files() );
 
 $IPBHTML .= <<<HTML
-	&nbsp;&nbsp;|&nbsp;&nbsp; <a href='#' onclick="$('acpQueries').show()">$count запро�ов и $files include файлов</a>
+	&nbsp;&nbsp;|&nbsp;&nbsp; <a href='#' onclick="$('acpQueries').show(); return false;">{$count} Queries and {$files} Included Files</a>
 	
 HTML;
 }
@@ -1008,25 +981,6 @@ HTML;
 return $IPBHTML;
 }
 
-/**
- * HTML to show when there is no context menu
- *
- * @access	public
- * @return	string		HTML
- */
-public function no_context_menu(){
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * Global page primary template - fits in content area
  *
@@ -1055,62 +1009,279 @@ EOF;
 return $IPBHTML;
 }
 
+/**
+ * Generate sub navigation menu for global use (all apps)
+ *
+ * @access	public
+ * @param	array 		Menu data
+ * @param	array 		Application and module titles data
+ * @return	string		array
+ */
+public function global_menu_sub_navigation( $menu ) {
+
+$seen = array();
+$fakeApps = $this->registry->output->fetchFakeApps();
+
+foreach( $menu['menu'] as $app => $modules )
+{
+	$this_menu = "<ul id='menu_{$app}' style='display: none'>\r\n";
+
+	foreach( $modules as $key => $items )
+	{
+		$this_menu .= "\t<li>\r\n";
+
+		if( count( $items['items'] ) == 1 )
+		{
+			$real_app	= $items['items'][0]['app_dir'];
+			
+			if ( !ipsRegistry::getClass('class_permissions')->checkForSectionAccess( $real_app, $items['items'][0]['module'], $items['items'][0]['section'] ) )
+			{
+				continue;
+			}
+			
+			$_url		= ( $items['items'][0]['url'] ) ? "&amp;{$items['items'][0]['url']}" : "";
+			
+			$this_menu .= "\t\t<a href='{$this->settings['_base_url']}app={$real_app}&amp;module={$items['items'][0]['module']}&amp;section={$items['items'][0]['section']}{$_url}'>{$items['items'][0]['title']}</a>\r\n";
+		}
+		else
+		{
+			$haveItems = FALSE;
+			$_this_menu = "";
+		
+			if( $menu['titles'][ $app ][ $key ] )
+			{
+				$_this_menu .= "\t\t<span>" . $menu['titles'][ $app ][ $key ]['title'] . "</span>\r\n";
+			}
+			else
+			{
+				$_this_menu .= "\t\t<span>" . $key . "</span>\r\n";
+			}
+			
+			$_this_menu .= "\t\t<ul>\r\n";
+			foreach( $items['items'] as $i => $info )
+			{
+				$real_app	= $info['app_dir'];
+				
+				if ( !ipsRegistry::getClass('class_permissions')->checkForSectionAccess( $real_app, $info['module'], $info['section'] ) )
+				{
+					continue;
+				}
+				if( is_array( $seen[ $app ][ $info['module'] ] ) && in_array( $info['pos'], $seen[ $app ][ $info['module'] ] ) ){
+					// Decided to show these because we need to retain access to the options for 3rd party apps
+					//continue; // don't show sub-sub items
+				}
+				
+				$haveItems = TRUE;
+				$_this_menu .= "\t\t\t<li>\r\n";
+				$_this_menu .= "\t\t\t\t<a href='{$this->settings['_base_url']}app={$real_app}&amp;module={$info['module']}&amp;section={$info['section']}&amp;{$info['url']}'>{$info['title']}</a>\r\n";
+				$_this_menu .= "\t\t\t</li>\r\n";
+				
+				$seen[ $app ][ $info['module'] ][] = $info['pos'];
+			}
+			$_this_menu .= "\t\t</ul>\r\n";
+			
+			if ( $haveItems )
+			{
+				$this_menu .= $_this_menu;
+			}
+		}
+		
+		$this_menu .= "\t</li>\r\n";
+	}	
+	
+	$this_menu .= "</ul>\r\n";
+	
+	$return[ $app ] = $this_menu;
+}
+
+//print_r( $seen );
+//print_r($menu);exit;
+//print_r($titles);exit;
+
+//--endhtml--//
+return $return;
+}
+
 /**
  * Generate the application menu HTML
  *
  * @access	public
+ * @param	string		Raw menu data
+ * @param	array 		Tab order
  * @return	string		HTML
  */
-public function global_app_menu_html() {
+public function global_app_menu_html( $raw_menu, $tabOrder ) {
+
+$fakeAppAccess = array();
 
 $IPBHTML = "";
 //--starthtml--//
 
+$menus = $this->global_menu_sub_navigation( $raw_menu );
+
+$curApp        	 	= array();
+$defaultFakeApp		= array();
+$defaultFakeModule	= array();
+
+switch( ipsRegistry::$current_application )
+{
+	case 'forums':
+		$curApp['forums'] = 'active';
+		break;
+	case 'core':
+		$curApp['core']	= 'active';
+		break;
+	case 'members':
+		$curApp['members'] = 'active';
+		break;
+	default:
+		$curApp['other'] = 'active';
+		break;
+}
+
+//print_r( $menus );
+$fakeApps = $this->registry->output->fetchFakeApps();
+
+foreach( $fakeApps as $fa => $data )
+{
+	$fakeAppAccess[ $fa ] = FALSE;
+	foreach( $data as $appData )
+	{
+		if ( !$fakeAppAccess[ $fa ] and ipsRegistry::getClass('class_permissions')->checkForModuleAccess( $appData['app'], $appData['module'] ) )
+		{
+			$fakeAppAccess[ $fa ] = TRUE;
+		}
+	
+		if ( ! $defaultFakeApp[ $fa ] )
+		{
+			$defaultFakeApp[ $fa ]    = $appData['app'];
+			$defaultFakeModule[ $fa ] = $appData['module'];
+		}
+		
+		if ( $appData['app'] == ipsRegistry::$current_application && $appData['module'] == ipsRegistry::$current_module )
+		{
+			$curApp = array();
+			$curApp[ $fa ] = 'active';
+		}
+	}
+}
+
+$IPBHTML .= <<<HTML
+<ul id='app_menu' class='app_menu'>
+HTML;
+
 $applications	= ipsRegistry::$applications;
 $count			= 0;
 $this->registry->getClass('class_permissions')->return = 1;
+$other_menu = "";
 
+/* Loop */
 foreach( $applications as $app_dir => $app_data )
 {
-	$class = '';
 	$tag = '';
 
-	if ( $app_data['app_location'] == 'root' || $this->registry->getClass('class_permissions')->checkForAppAccess( $app_data['app_directory'] ) !== TRUE || ! $applications[ $app_dir ]['app_enabled'] )
+	if ( in_array( $app_data['app_directory'], array( 'core', 'forums', 'members' ) ) || $this->registry->getClass('class_permissions')->checkForAppAccess( $app_data['app_directory'] ) !== TRUE || ! $applications[ $app_dir ]['app_enabled'] )
 	{
 		continue;
 	}
 
 	if( $app_data['app_location'] == 'ips' )
 	{
-		$class = 'ips_app';
-		$tag = $this->lang->words['gl_ipsapp'];
+		$tag = "<span class='ipsBadge badge_purple'>{$this->lang->words['gl_ipsapp']}</span>&nbsp;&nbsp;";
 	}
-	
-	$img = file_exists( IPSLib::getAppDir( $app_data['app_directory'] ) . '/skin_cp/appIcon.png' ) ? $this->settings['base_acp_url'] . '/' . IPSLib::getAppFolder( $app_data['app_directory'] ) . '/' . $app_data['app_directory'] . '/skin_cp/appIcon.png' : "{$this->settings['skin_acp_url']}/_newimages/applications/{$app_dir}.png";
-	
-	$IPBHTML .= <<<EOF
 
-	<li id='app_{$app_dir}' class='{$class}'>
-		<a href='{$this->settings['_base_url']}app={$app_data['app_directory']}'><img src='$img' alt='{$app_dir}' />
-		<strong>{$app_data['app_title']}</strong>
-		<span class='tagline'>{$tag}</span>
+	$other_menu .= <<<EOF
+	<li id='app_{$app_dir}'>
+		<a href='{$this->settings['_base_url']}app={$app_data['app_directory']}'>
+			{$tag}
+			{$app_data['app_title']}
 		</a>
+		{$menus[ $app_dir ]}
 	</li>
 EOF;
 	$count++;
 }
 
-if( !$count )
-{
-	$IPBHTML .= <<<EOF
+//-----------------------------------------
+// Draw tabs based on order preference
+//-----------------------------------------
 
-	<li id='app_manageapps' class='ips_app'>
-		<a href='{$this->settings['_base_url']}app=core&amp;module=applications&amp;section=applications&amp;do=applications_overview'><img src='{$this->settings['skin_acp_url']}/_newimages/applications/core.png' alt='core' />
-		<strong>{$this->lang->words['gl_manageapps']}</strong></a>
+foreach( $tabOrder as $tabkey )
+{
+	if( $tabkey == 'other' AND !$count )
+	{
+		continue;
+	}
+	
+	$permCheck = TRUE;
+	switch( $tabkey )
+	{
+		case 'core':
+			$title	= $this->lang->words['gl_system'];
+			$link	= "{$this->settings['_base_url']}app=core";
+			$permCheck = ipsRegistry::getClass('class_permissions')->checkForAppAccess( 'core' );
+		break;
+		
+		case 'forums':
+			$title	= $this->lang->words['gl_forums'];
+			$link	= "{$this->settings['_base_url']}app=forums";
+			$permCheck = ipsRegistry::getClass('class_permissions')->checkForAppAccess( 'forums' );
+		break;
+		
+		case 'members':
+			$title	= $this->lang->words['gl_members'];
+			$link	= "{$this->settings['_base_url']}app=members";
+			$permCheck = ipsRegistry::getClass('class_permissions')->checkForAppAccess( 'members' );
+		break;
+		
+		case 'lookfeel':
+			$title	= $this->lang->words['gl_lookandfeel'];
+			$link	= "{$this->settings['_base_url']}app={$defaultFakeApp['lookfeel']}&amp;module={$defaultFakeModule['lookfeel']}";
+			$permCheck = $fakeAppAccess['lookfeel'];
+		break;
+		
+		case 'support':
+			$title	= $this->lang->words['gl_support'];
+			$link	= "{$this->settings['_base_url']}app=core&amp;module=diagnostics";
+			$permCheck = $fakeAppAccess['support'];
+		break;
+		
+		case 'reports':
+			$title	= $this->lang->words['gl_reportsmenu'];
+			$link	= "{$this->settings['_base_url']}app={$defaultFakeApp['reports']}&amp;module={$defaultFakeModule['reports']}";
+			$permCheck = $fakeAppAccess['reports'];
+		break;
+	}
+
+	if ( !$permCheck )
+	{
+		continue;
+	}
+
+	if( $tabkey == 'other' )
+	{
+	$IPBHTML .= <<<HTML
+		<li class='{$curApp['other']}'>
+			<a href='{$this->settings['_base_url']}app=core&amp;module=applications&amp;section=applications&amp;do=applications_overview'>{$this->lang->words['other_applications']}</a>
+			<ul id='menu__other' style='display: none'>
+				{$other_menu}
+			</ul>
+		</li>	
+HTML;
+	}
+	else
+	{
+	$IPBHTML .= <<<HTML
+	<li class='{$curApp[$tabkey]}'>
+		<a href='{$link}'>{$title}</a>
+		{$menus[$tabkey]}
 	</li>
-EOF;
+HTML;
+	}
 }
 
+$IPBHTML .= "</ul>";
+
 //--endhtml--//
 return $IPBHTML;
 }
@@ -1177,10 +1348,69 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <br /><br />
-<div align='center' style='margin-left:auto;margin-right:auto'>
-<div class='tableborder' style='vertical-align:bottom;text-align:left;width:75%;color:#555'>
- <div class='tableheader'><b>{$this->lang->words['gbl_queries']}</b></div>
- <div class='tablerow2' style='overflow:auto'>$queries</div>
+<div align='center' style='margin-left:auto;margin-right:0'>
+<div class='acp-box' style='text-align:left;'>
+ <h3>{$this->lang->words['gbl_queries']}</h3>
+ <div style='overflow:auto'>{$queries}</div>
+</div>
+</div>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Shows the debug included files output at the bottom of the page
+ *
+ * @param	int			Number of files
+ * @param	string 		Files to show
+ * @return	string		HTML
+ */
+public function global_if_output($count=0,$files="") {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<br /><br />
+<div align='center' style='margin-left:auto;margin-right:0'>
+<div class='acp-box' style='text-align:left;'>
+ <h3>{$count}{$this->lang->words['gbl_inc_files']}</h3>
+ <div style='padding: 4px;'>{$files}</div>
+</div>
+</div>
+EOF;
+
+//--endhtml--//
+return $IPBHTML;
+}
+
+/**
+ * Shows the debug memory output at the bottom of the page
+ *
+ * @access	public
+ * @param	string 		Memory to show
+ * @param	string		Total memory used
+ * @param	string		Peak memory used
+ * @return	string		HTML
+ */
+public function global_memory_output($memory="", $total=0, $peak=0 ) {
+
+$IPBHTML = "";
+//--starthtml--//
+
+$IPBHTML .= <<<EOF
+<br /><br />
+<div align='center' style='margin-left:auto;margin-right:0'>
+<div class='acp-box' style='text-align:left;'>
+	<h3>{$this->lang->words['gbl_memory']}</h3>
+	<table class='ipsTable'>
+		{$memory}
+	</table>
+	<div class='acp-actionbar' style='text-align: left;'>
+		<strong>{$this->lang->words['ttlmemoryused']} {$total} ({$this->lang->words['peakmemoryused']} {$peak})</strong>
+	</div>
 </div>
 </div>
 EOF;
@@ -1204,19 +1434,132 @@ public function log_in_form( $query_string="", $message="", $replace_form=false,
 $IPBHTML = "";
 //--starthtml--//
 
-$IPBHTML .= <<<EOF
-<script type='text/javascript'>
-if ( top != self )
+$IPS_DOC_CHAR_SET	= IPS_DOC_CHAR_SET;
+$publicDirectory	= PUBLIC_DIRECTORY;
+
+$IPBHTML .= <<<HTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset={$IPS_DOC_CHAR_SET}" />
+	<meta http-equiv="Pragma" content="no-cache" />
+	<meta http-equiv="Cache-Control" content="no-cache" />
+	<meta http-equiv="Expires" content="Fri, 01 January 1999 01:00:00 GMT" />
+	<link rel="shortcut icon" href='{$boardurl}/favicon.ico' />
+
+	<title><%TITLE%></title>
+	<script type='text/javascript'>
+		jsDebug = 1;
+		USE_RTE = 0;
+		isRTL	= false;
+		
+		if ( top != self )
+		{
+			top.location.href = window.location.href;
+		}
+	</script>
+HTML;
+
+
+/** CSS ----------------------------------------- */
+if ( $this->settings['use_minify'] )
 {
-	top.location.href = window.location.href;
+	$_basics	= CP_DIRECTORY . '/skin_cp/acp.css,' . CP_DIRECTORY . '/skin_cp/acp_editor.css';
+
+	$IPBHTML	.= "\n\t<link rel=\"stylesheet\" type=\"text/css\" media='screen' href=\"{$this->settings['public_dir']}min/index.php?f={$_basics}\">\n";
+}
+else
+{
+	$IPBHTML .= <<<HTML
+	<style type='text/css' media='all'>
+		@import url( "{$this->settings['skin_acp_url']}/acp.css" );
+		@import url( "{$this->settings['skin_acp_url']}/acp_editor.css" );
+	</style>
+HTML;
 }
 
-Event.observe( window, 'load', function(e){
-	$('username').focus();
-});
+$IPBHTML .= <<<HTML
+	<!--[if IE]>
+		<style type='text/css' media='all'>
+			@import url( "{$this->settings['skin_acp_url']}/acp_ie_tweaks.css" );
+		</style>
+	<![endif]-->
+HTML;
 
-</script>
-EOF;
+if( IN_DEV )
+{
+	$IPBHTML .= <<<HTML
+		<style type='text/css' media='all'>
+			.ipsActionBar > ul > li.inDev {
+				display: inline;
+			}
+		</style>
+HTML;
+}
+
+/** JS ----------------------------------------- */
+if ( $this->settings['use_minify'] )
+{
+	$_others = ',' . CP_DIRECTORY . '/js/acp.js,' . CP_DIRECTORY . '/js/acp.' . implode('.js,' . CP_DIRECTORY . '/js/acp.', array( 'menu', 'tabs' ) ) . '.js';
+	
+	$IPBHTML .= <<<HTML
+	
+	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?g=js'></script>
+	<script type='text/javascript' src='{$this->settings['public_dir']}min/index.php?f={$publicDirectory}/js/ipb.js{$_others}'></script>
+HTML;
+}
+else
+{
+	$IPBHTML .= <<<HTML
+		<script type="text/javascript" src="{$this->settings['public_dir']}js/3rd_party/prototype.js"></script>
+		<script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/scriptaculous/scriptaculous-cache.js'></script>
+		<script type="text/javascript" src='{$this->settings['public_dir']}js/ipb.js?load={$this->settings['extraJsModules']}'></script>
+		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.menu.js'></script>
+		<script type='text/javascript' src='{$this->settings['js_main_url']}acp.js'></script>
+		<script type="text/javascript" src='{$this->settings['js_main_url']}acp.tabs.js'></script>
+HTML;
+}
+
+$IPBHTML .= <<<HTML
+	<script type='text/javascript'>
+	//<![CDATA[
+		ipb.vars['st']	= "{$this->request['st']}";
+		ipb.vars['base_url']	= "{$this->settings['_base_url']}";
+		ipb.vars['front_url']	= "{$this->settings['board_url']}/index.php?";
+		ipb.vars['app_url']		= "{$this->settings['base_url']}";
+		ipb.vars['image_url'] 	= "{$this->settings['skin_app_url']}/images/";
+		ipb.vars['md5_hash']	= "{$this->member->form_hash}";
+		/* ---- cookies ----- */
+		ipb.vars['cookie_id'] 			= '{$this->settings['cookie_id']}';
+		ipb.vars['cookie_domain'] 		= '{$this->settings['cookie_domain']}';
+		ipb.vars['cookie_path']			= '{$this->settings['cookie_path']}';
+		ipb.templates['close_popup']	= "<img src='{$this->settings['img_url']}/close_popup.png' alt='x' />";
+		ipb.templates['page_jump']		= new Template("<div id='#{id}_wrap' class='ipbmenu_content'><h3 class='bar'>{$this->lang->words['gl_pagejump']}</h3><input type='text' class='input_text' id='#{id}_input' size='8' /> <input type='submit' value='Go' class='input_submit add_folder' id='#{id}_submit' /></div>");
+		ipb.templates['ajax_loading'] 	= "<div id='ajax_loading'>{$this->lang->words['gl_loading']}</div>";
+	//]]>
+	</script>
+	<script type='text/javascript'>
+		Loader.boot();
+		acp = new IPBACP;
+
+		Event.observe( window, 'load', function(e){
+			$('username').focus();
+		});
+	</script>
+	<script type="text/javascript" src="{$this->settings['cache_dir']}lang_cache/{$this->lang->lang_id}/acp.lang.js" charset="{$IPS_DOC_CHAR_SET}"></script>
+</head>
+<body id='ipboard_body' class='login_screen'>
+<div id='loading-layer' style='display:none'>
+	<div id='loading-layer-shadow'>
+	   <div id='loading-layer-inner' >
+		   <img src='{$this->settings['skin_acp_url']}/images/loading_anim.gif' style='vertical-align:middle' />
+		   <span style='font-weight:bold' id='loading-layer-text'>{$this->lang->words['ajax_please_wait']}</span>
+	   </div>
+	</div>
+</div>
+HTML;
+
+$extraClass = ( $message ) ? 'with_message' : '';
 
 if( $replace_form )
 {
@@ -1224,26 +1567,28 @@ if( $replace_form )
 }
 else
 {
-	$IPBHTML .= <<<EOF
+	$IPBHTML .= <<<HTML
 <form action='{$this->settings['_base_url']}app=core&amp;module=login&amp;do=login-complete' method='post'>
-<input type='hidden' name='qstring' id='qstring' value='$query_string' />
-<div id='login'>
-EOF;
+<input type='hidden' name='qstring' id='qstring' value='{$query_string}' />
+<div id='login' class='{$extraClass}'>
+	<img src='{$this->settings['skin_acp_url']}/images/login_logo.png' id='login_logo' />
+HTML;
+
 if ( $message )
 {
-	$IPBHTML .= <<<EOF
-		<div id='login_error'>$message</div>
-EOF;
+	$IPBHTML .= <<<HTML
+		<div id='login_error'>{$message}</div>
+HTML;
 }
 
-$IPBHTML .= <<<EOF
+$IPBHTML .= <<<HTML
 	<div id='login_controls'>
 		<label for='username'>{$this->lang->words['gl_signinname']}</label>
-		<input type='text' size='20' id='username' name='username' value=''>
+		<input type='text' size='20' id='username' name='username' value='' class='textinput'>
 		
 		<label for='password'>{$this->lang->words['gl_password']}</label>
-		<input type='password' size='20' id='password' name='password' value=''>
-EOF;
+		<input type='password' size='20' id='password' name='password' value='' class='textinput'>
+HTML;
 
 		if( count($additional_data) > 0 )
 		{
@@ -1253,20 +1598,25 @@ EOF;
 			}
 		}
 		
-$IPBHTML .= <<<EOF
+$IPBHTML .= <<<HTML
 	</div>
 	<div id='login_submit'>
 		<input type='submit' class='button' value="{$this->lang->words['gl_signin']}" />
 	</div>
 </div>
 </form>
-EOF;
+HTML;
 
-$IPBHTML .= <<<EOF
+$IPBHTML .= <<<HTML
 		</div>
-</div>
-</form>
-EOF;
+	</div>
+	</form>
+	<script type='text/javascript'>
+		$('username').focus();
+	</script>
+</body>
+</html>
+HTML;
 }
 
 //--endhtml--//
@@ -1296,8 +1646,6 @@ $IPBHTML .= <<<EOF
 <script type='text/javascript' src='{$this->settings['public_dir']}js/3rd_party/scriptaculous/scriptaculous-cache.js'></script>
 <script type="text/javascript" src='{$this->settings['public_dir']}js/ipb.js?load={$this->settings['extraJsModules']}'></script>
 <script type='text/javascript' src='{$this->settings['js_main_url']}acp.js'></script>
-<script type="text/javascript" src='{$this->settings['js_main_url']}acp.livesearch.js'></script>
-<script type="text/javascript" src='{$this->settings['js_main_url']}acp.styles.js'></script>
 <script type="text/javascript" src='{$this->settings['js_main_url']}acp.tabs.js'></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -1321,10 +1669,9 @@ acp = new IPBACP;
 
 <style type='text/css' media='all'>
 	@import url( "{$this->settings['skin_acp_url']}/acp.css" );
-	@import url( "{$this->settings['skin_acp_url']}/acp_content.css" );
 </style>
 
-<meta http-equiv='refresh' content='{$time}; url=$url' />
+<meta http-equiv='refresh' content='{$time}; url={$url}' />
 
 <div class='information-box'>
 	<h4>{$this->lang->words['gbl_page_redirecting']}</h4>
@@ -1377,7 +1724,7 @@ return $IPBHTML;
  * @param	string 		Text to show
  * @return	string		HTML
  */
-public function global_redirect_done($text='Дей�твие закончено') {
+public function global_redirect_done($text='This function has now finished executing') {
 
 $IPBHTML = "";
 //--starthtml--//
@@ -1385,7 +1732,6 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <style type='text/css' media='all'>
 	@import url( "{$this->settings['skin_acp_url']}/acp.css" );
-	@import url( "{$this->settings['skin_acp_url']}/acp_content.css" );
 </style>
 
 <div class='redirector complete'>
@@ -1398,37 +1744,6 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * General redirect page with message
- *
- * @access	public
- * @param	string 		URL to send to
- * @param	integer		Number of seconds to wait before redirecting
- * @param	string		Text to display
- * @return	string		HTML
- */
-public function global_redirect($url, $time=2, $text="") {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$IPBHTML .= <<<EOF
-<meta http-equiv='refresh' content='{$time}; url=$url' />
-<div id='redirect'>
-	<h2>{$this->lang->words['redirect_page_text']}</h2>
-	<p>
-		{$text}
-	</p>
-	
-	<a href='$url'>{$this->lang->words['refresh_dont_wait']}</a>
-</div>
-
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * General redirect page with message
  *
@@ -1463,7 +1778,7 @@ return $IPBHTML;
 }
 
 /**
- * Generate sub navigation menu
+ * Generate sub navigation menu for sidebar
  *
  * @access	public
  * @param	array 		Menu data
@@ -1503,7 +1818,7 @@ $main_html[] = <<<EOF
 <!-- MENU FOR {$data['title']}-->
 <div class='menuouterwrap'>
   <div class='menucatwrapBlock'>{$data['title']}</div>
-  $links
+  {$links}
 </div>
 <!-- / MENU FOR {$data['title']}-->
 EOF;
@@ -1527,7 +1842,7 @@ return $IPBHTML;
 }
 
 /**
- * Menu category wrapper for "categories"
+ * Menu category wrapper for sidebar "categories"
  *
  * @access	public
  * @param	array 		Links to show
@@ -1543,10 +1858,12 @@ $titles  = 0;
 
 //--starthtml--//
 
-	$IPBHTML .= "<ul>\n";
-
 	foreach( $links as $app => $module )
 	{
+		$IPBHTML	.= "<ul>\n";
+		$_CHILD		= '';
+		$_MENU		= '';
+		
 		foreach( $module as $data )
 		{
 			$class = '';
@@ -1560,6 +1877,7 @@ $titles  = 0;
 			{
 				foreach( $menu[ $app ] as $id => $__data )
 				{
+					//print_r($__data);exit;
 					preg_match( '/^(\d+?)_(.*)$/', $id, $result );
 
 					if ( $result[2] != $data['module'] )
@@ -1593,7 +1911,7 @@ $titles  = 0;
 							$_MENU .=  <<<EOF
 								<!-- MENU FOR {$data['title']}-->
 								<li class='{$class}'>
-									<a href='{$this->settings['base_url']}module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}{$_url}'>{$__data['items'][0]['title']}</a>
+									<a href='{$this->settings['_base_url']}app={$app}&amp;module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}{$_url}'>{$__data['items'][0]['title']}</a>
 								</li>
 EOF;
 
@@ -1606,7 +1924,7 @@ EOF;
 					{
 	$_CHILD .= <<<EOF
 					<li>
-						<a href='{$this->settings['base_url']}module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}&amp;{$__data['items'][0]['url']}'>{$__data['title']}</a>
+						<a href='{$this->settings['_base_url']}app={$app}&amp;module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}&amp;{$__data['items'][0]['url']}'>{$__data['title']}</a>
 						<ul>
 
 EOF;
@@ -1627,7 +1945,7 @@ EOF;
 							}
 
 	$_CHILD .= <<<EOF
-							<li class='{$_class}'><a href="{$this->settings['base_url']}module={$_data['module']}&amp;section={$_data['section']}{$_url}">{$_data['title']}</a></li>
+							<li class='{$_class}'><a href="{$this->settings['_base_url']}app={$app}&amp;module={$_data['module']}&amp;section={$_data['section']}{$_url}">{$_data['title']}</a></li>
 EOF;
 						}
 
@@ -1642,7 +1960,7 @@ EOF;
 						$_url = ( $__data['items'][0]['url'] ) ? "&amp;{$__data['items'][0]['url']}" : "";
 	$_CHILD .= <<<EOF
 					<li>
-						<a href="{$this->settings['base_url']}module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}{$_url}">{$__data['title']}</a>
+						<a href="{$this->settings['_base_url']}app={$app}&amp;module={$__data['items'][0]['module']}&amp;section={$__data['items'][0]['section']}{$_url}">{$__data['title']}</a>
 					</li>
 
 EOF;
@@ -1692,7 +2010,7 @@ $IPBHTML = "";
 
 $IPBHTML .= <<<EOF
 <ol id='breadcrumb'>
-	$content
+	{$content}
 </ol>
 EOF;
 
@@ -1710,9 +2028,20 @@ public function global_message() {
 $IPBHTML = "";
 //--starthtml--//
 
+if( !$this->registry->getClass('output')->persistent_message )
+{
+$IPBHTML .= <<<EOF
+<script type='text/javascript'>
+	document.observe("dom:loaded", function(){
+		ipb.global.showInlineNotification( "{$this->registry->getClass('output')->global_message}", { showClose: false } );
+	});
+</script>
+EOF;
+}
+else
+{
 $IPBHTML .= <<<EOF
 <div class='information-box'>
- <h4><img src='{$this->settings['skin_acp_url']}/_newimages/icons/information.png' alt='' />&nbsp; {$this->lang->words['ipb_message']}</h4>
 EOF;
  	$IPBHTML .= $this->registry->getClass('output')->global_message;
 
@@ -1720,6 +2049,7 @@ $IPBHTML .= <<<EOF
 </div>
 <br />
 EOF;
+}
 
 //--endhtml--//
 return $IPBHTML;
@@ -1748,45 +2078,6 @@ EOF;
 return $IPBHTML;
 }
 
-/**
- * Show the ACP tutorial mode help box
- *
- * @access	public
- * @param	string 		Page key to call
- * @return	string		HTML
- */
-public function help_box( $key='' ) {
-
-$IPBHTML = "";
-//--starthtml--//
-
-$domain		= parse_url( $this->settings['base_url'], PHP_URL_HOST );
-$version	= '3.1.4';
-
-$IPBHTML .= <<<EOF
-<div class='help-box' id='main_help' style='display: none'>
-	<div id='acp-help-contents' style='display:block;'>Загрузка...</div>
-</div>
-<script type='text/javascript'>
-
-	var acpHelp = {};
-	
-	acpHelp['pageKey'] = '{$key}';
-	acpHelp['domain'] = '{}';
-	acpHelp['version'] = '{$version}';
-	
-	acpHelp['close_help'] = "<img src='{$this->settings['skin_acp_url']}/_newimages/icons/cross.png' alt='{$this->lang->words['icon']}' /> {$this->lang->words['close_help']}";
-	acpHelp['open_help'] = "<img src='{$this->settings['skin_acp_url']}/_newimages/icons/help.png' alt='{$this->lang->words['icon']}' /> {$this->lang->words['get_help']}";
-	
-	acpHelp['popup_template'] = new Template("<h3>#{title}</h3><div style='padding: 10px'>#{content}</div>");
-</script>
-<br />
-EOF;
-
-//--endhtml--//
-return $IPBHTML;
-}
-
 /**
  * Pagination wrapper
  *
@@ -1803,14 +2094,13 @@ if( $work['pages'] > 1 )
 {
 $IPBHTML .= <<<EOF
 	<ul class='pagination'>
-		<li class='total'>({$work['pages']} {$this->lang->words['tpl_pages']})</li>
 EOF;
 
 	if( !$data['noDropdown'] )
 	{
 		$IPBHTML .= <<<EOF
 		<li class='pagejump pj{$data['uniqid']}'>
-			<img src='{$this->settings['skin_acp_url']}/_newimages/dropdown.png' alt='+' />
+			<img src='{$this->settings['skin_acp_url']}/images/dropdown.png' alt='+' />
 			<script type='text/javascript'>
 				ipb.global.registerPageJump( '{$data['uniqid']}', { url: "{$data['baseUrl']}", stKey: '{$data['startValueKey']}', perPage: {$data['itemsPerPage']}, totalPages: {$work['pages']} } );
 			</script>
@@ -1829,7 +2119,7 @@ if( $work['current_page'] > 1 )
 {
 	$stkey = intval( $data['currentStartValue'] - $data['itemsPerPage'] );
 $IPBHTML .= <<<EOF
-	<li class='prev'><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$stkey}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['_larr']}</a></li>
+	<li class='prev'><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$stkey}" title="{$this->lang->words['tpl_prev']}" rel='prev'>{$this->lang->words['pg_prev']}</a></li>
 EOF;
 }
 
@@ -1846,7 +2136,7 @@ EOF;
 		else
 		{
 		$IPBHTML .= <<<EOF
-			<li><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$_real}" title="$_page">{$_page}</a></li>
+			<li><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$_real}" title="{$_page}">{$_page}</a></li>
 EOF;
 		}
 	}
@@ -1856,11 +2146,11 @@ if( $work['current_page'] < $work['pages'] )
 {
 	$stkey = intval( $data['currentStartValue'] + $data['itemsPerPage'] );
 $IPBHTML .= <<<EOF
-	<li class='next'><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$stkey}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['_rarr']}</a></li>
+	<li class='next'><a href="{$data['baseUrl']}&amp;{$data['startValueKey']}={$stkey}" title="{$this->lang->words['tpl_next']}" rel='next'>{$this->lang->words['pg_next']}</a></li>
 EOF;
 }
 
-if( isset( $work['_showEndDots'] ) && $work['_showEndDots'] )
+if( !empty( $work['_showEndDots'] ) )
 {
 	$stkey = intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] );
 $IPBHTML .= <<<EOF
@@ -1868,8 +2158,10 @@ $IPBHTML .= <<<EOF
 EOF;
 }
 
+$_tplpages	= sprintf( $this->lang->words['tpl_pages_acp'], $work['current_page'], $work['pages'] );
 
 $IPBHTML .= <<<EOF
+		<li class='total'>({$_tplpages})</li>
 	</ul>
 EOF;
 }
@@ -1896,7 +2188,7 @@ return $IPBHTML;
  */
 public function system_error( $msg, $code=0, $title='', $IPS_DOC_CHAR_SET=IPS_DOC_CHAR_SET )
 {
-$title = ( isset( $title ) && $title ) ? $title : $this->lang->words['gbl_system_error'];
+$title = !empty( $title ) ? $title : $this->lang->words['gbl_system_error'];
 
 if( $code )
 {
@@ -1923,84 +2215,6 @@ EOF;
 return $HTML;
 }
 
-/**
- * User interface content tabs
- *
- * @access	public
- * @param	array 		Tabs
- * @param	array 		Content blocks to show
- * @param	string		Default tab
- * @return	string		HTML
- */
-public function ui_content_tabs( $tabs, $contents, $default_tab='' )
-{
-$HTML = <<<EOF
-
-<!-- Tab Buttons -->
-<a name='#tabpane'></a>
-<table width='100%' align='center'>
-	<tr>
-		<td>
-<script type="text/javascript">
-//<![CDATA[
-document.observe("dom:loaded",function() 
-{
-ipbAcpTabStrips.register('tabstrip');
-});
- //]]>
-</script>
-<ul id='tabstrip' class='tab_bar no_title'>
-EOF;
-
-foreach( $tabs as $t )
-{
-$HTML .= <<<EOF
-			<li id='tabtab-{$t['id']}' class='{$t['class']}' {$t['js']}>
-				{$t['text']}
-			</li>
-EOF;
-
-}
-
-$HTML .= <<<EOF
-		</td>
-	</tr>
-</table>
-<!-- End Tab Buttons -->
-
-<!-- Begin Tab Content Pane -->
-<table width='100%' align='center'>
-	<tr>
-		<td>
-			<div id='tab_contents'>
-EOF;
-
-foreach( $contents as $c )
-{
-$HTML .= <<<EOF
-				<!-- Begin Tab Pane {$c['id']} -->
-				<div id='tabpane-{$c['id']}' class='tabpane-system'>
-					{$c['content']}
-				</div>
-				<!-- End Tab Pane {$c['id']} -->
-EOF;
-}
-
-$HTML .= <<<EOF
-
-			</div>
-		</td>
-	</tr>
-</table>
-<!-- End Tab Content Pane -->
-
-
-EOF;
-
-return $HTML;
-
-}
-
 /**
  * HTML for quick help popup boxes
  *
@@ -2017,7 +2231,7 @@ $IPBHTML = "";
 $IPBHTML .= <<<EOF
 <div class='acp-box'>
  <h3>{$title}</h3>
-	<div class='acp-row-on'>{$body}</div>
+	<div style='padding: 4px; line-height: 1.5'>{$body}</div>
 </div>
 EOF;
 
diff --git a/upload/admin/skin_cp/images/acpBlockTitle.png b/upload/admin/skin_cp/images/acpBlockTitle.png
new file mode 100644
index 00000000..f05f2a7b
Binary files /dev/null and b/upload/admin/skin_cp/images/acpBlockTitle.png differ
diff --git a/upload/admin/skin_cp/images/acpBlockTitle_alt.png b/upload/admin/skin_cp/images/acpBlockTitle_alt.png
new file mode 100644
index 00000000..c102991f
Binary files /dev/null and b/upload/admin/skin_cp/images/acpBlockTitle_alt.png differ
diff --git a/upload/admin/skin_cp/images/advanced_search.png b/upload/admin/skin_cp/images/advanced_search.png
new file mode 100644
index 00000000..c4c16d86
Binary files /dev/null and b/upload/admin/skin_cp/images/advanced_search.png differ
diff --git a/upload/admin/skin_cp/images/app_bar_bg.png b/upload/admin/skin_cp/images/app_bar_bg.png
new file mode 100644
index 00000000..2b23b63e
Binary files /dev/null and b/upload/admin/skin_cp/images/app_bar_bg.png differ
diff --git a/upload/admin/skin_cp/images/app_menu_highlight.png b/upload/admin/skin_cp/images/app_menu_highlight.png
new file mode 100644
index 00000000..6232b329
Binary files /dev/null and b/upload/admin/skin_cp/images/app_menu_highlight.png differ
diff --git a/upload/admin/skin_cp/images/app_tab_left.png b/upload/admin/skin_cp/images/app_tab_left.png
new file mode 100644
index 00000000..8726af77
Binary files /dev/null and b/upload/admin/skin_cp/images/app_tab_left.png differ
diff --git a/upload/admin/skin_cp/images/app_tab_right.png b/upload/admin/skin_cp/images/app_tab_right.png
new file mode 100644
index 00000000..5dfebc66
Binary files /dev/null and b/upload/admin/skin_cp/images/app_tab_right.png differ
diff --git a/upload/admin/skin_cp/_newimages/applications/brick.png b/upload/admin/skin_cp/images/applications/brick.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/brick.png
rename to upload/admin/skin_cp/images/applications/brick.png
diff --git a/upload/admin/skin_cp/_newimages/applications/calendar.png b/upload/admin/skin_cp/images/applications/calendar.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/calendar.png
rename to upload/admin/skin_cp/images/applications/calendar.png
diff --git a/upload/admin/skin_cp/_newimages/applications/chat.png b/upload/admin/skin_cp/images/applications/chat.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/chat.png
rename to upload/admin/skin_cp/images/applications/chat.png
diff --git a/upload/admin/skin_cp/_newimages/applications/core.png b/upload/admin/skin_cp/images/applications/core.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/core.png
rename to upload/admin/skin_cp/images/applications/core.png
diff --git a/upload/admin/skin_cp/_newimages/applications/forums.png b/upload/admin/skin_cp/images/applications/forums.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/forums.png
rename to upload/admin/skin_cp/images/applications/forums.png
diff --git a/upload/admin/skin_cp/_newimages/applications/help.png b/upload/admin/skin_cp/images/applications/help.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/help.png
rename to upload/admin/skin_cp/images/applications/help.png
diff --git a/upload/admin/skin_cp/images/applications/index.html b/upload/admin/skin_cp/images/applications/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/applications/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/applications/members.png b/upload/admin/skin_cp/images/applications/members.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/members.png
rename to upload/admin/skin_cp/images/applications/members.png
diff --git a/upload/admin/skin_cp/_newimages/applications/palette.png b/upload/admin/skin_cp/images/applications/palette.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/palette.png
rename to upload/admin/skin_cp/images/applications/palette.png
diff --git a/upload/admin/skin_cp/images/ccs/_wizard/index.html b/upload/admin/skin_cp/images/ccs/_wizard/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/skin_cp/images/ccs/_wizard/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/wizard_step_bg.png b/upload/admin/skin_cp/images/ccs/_wizard/wizard_step_bg.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/wizard_step_bg.png
rename to upload/admin/skin_cp/images/ccs/_wizard/wizard_step_bg.png
diff --git a/upload/admin/skin_cp/_newimages/wizard_step_extra.png b/upload/admin/skin_cp/images/ccs/_wizard/wizard_step_extra.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/wizard_step_extra.png
rename to upload/admin/skin_cp/images/ccs/_wizard/wizard_step_extra.png
diff --git a/upload/admin/skin_cp/_newimages/wizard_steps.png b/upload/admin/skin_cp/images/ccs/_wizard/wizard_steps.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/wizard_steps.png
rename to upload/admin/skin_cp/images/ccs/_wizard/wizard_steps.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/children.gif b/upload/admin/skin_cp/images/ccs/children.gif
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/children.gif
rename to upload/admin/skin_cp/images/ccs/children.gif
diff --git a/upload/admin/skin_cp/_newimages/ccs/code.png b/upload/admin/skin_cp/images/ccs/code.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/code.png
rename to upload/admin/skin_cp/images/ccs/code.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/css.png b/upload/admin/skin_cp/images/ccs/css.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/css.png
rename to upload/admin/skin_cp/images/ccs/css.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/file.png b/upload/admin/skin_cp/images/ccs/file.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/file.png
rename to upload/admin/skin_cp/images/ccs/file.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/filterbar_bg.png b/upload/admin/skin_cp/images/ccs/filterbar_bg.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/filterbar_bg.png
rename to upload/admin/skin_cp/images/ccs/filterbar_bg.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/folder.png b/upload/admin/skin_cp/images/ccs/folder.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/folder.png
rename to upload/admin/skin_cp/images/ccs/folder.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/folder_closed.png b/upload/admin/skin_cp/images/ccs/folder_closed.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/folder_closed.png
rename to upload/admin/skin_cp/images/ccs/folder_closed.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/folder_open.png b/upload/admin/skin_cp/images/ccs/folder_open.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/folder_open.png
rename to upload/admin/skin_cp/images/ccs/folder_open.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/image.png b/upload/admin/skin_cp/images/ccs/image.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/image.png
rename to upload/admin/skin_cp/images/ccs/image.png
diff --git a/upload/admin/skin_cp/images/ccs/index.html b/upload/admin/skin_cp/images/ccs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/ccs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/ccs/js.png b/upload/admin/skin_cp/images/ccs/js.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/js.png
rename to upload/admin/skin_cp/images/ccs/js.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_center_off.png b/upload/admin/skin_cp/images/ccs/menu_center_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_center_off.png
rename to upload/admin/skin_cp/images/ccs/menu_center_off.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_center_on.png b/upload/admin/skin_cp/images/ccs/menu_center_on.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_center_on.png
rename to upload/admin/skin_cp/images/ccs/menu_center_on.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_left_off.png b/upload/admin/skin_cp/images/ccs/menu_left_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_left_off.png
rename to upload/admin/skin_cp/images/ccs/menu_left_off.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_left_on.png b/upload/admin/skin_cp/images/ccs/menu_left_on.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_left_on.png
rename to upload/admin/skin_cp/images/ccs/menu_left_on.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_right_off.png b/upload/admin/skin_cp/images/ccs/menu_right_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_right_off.png
rename to upload/admin/skin_cp/images/ccs/menu_right_off.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_right_off_nomenu.png b/upload/admin/skin_cp/images/ccs/menu_right_off_nomenu.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_right_off_nomenu.png
rename to upload/admin/skin_cp/images/ccs/menu_right_off_nomenu.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_right_on.png b/upload/admin/skin_cp/images/ccs/menu_right_on.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_right_on.png
rename to upload/admin/skin_cp/images/ccs/menu_right_on.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/menu_right_on_nomenu.png b/upload/admin/skin_cp/images/ccs/menu_right_on_nomenu.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/menu_right_on_nomenu.png
rename to upload/admin/skin_cp/images/ccs/menu_right_on_nomenu.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/movie.png b/upload/admin/skin_cp/images/ccs/movie.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/movie.png
rename to upload/admin/skin_cp/images/ccs/movie.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/music.png b/upload/admin/skin_cp/images/ccs/music.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/music.png
rename to upload/admin/skin_cp/images/ccs/music.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/page.png b/upload/admin/skin_cp/images/ccs/page.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/page.png
rename to upload/admin/skin_cp/images/ccs/page.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/page_go.png b/upload/admin/skin_cp/images/ccs/page_go.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/page_go.png
rename to upload/admin/skin_cp/images/ccs/page_go.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/pdf.png b/upload/admin/skin_cp/images/ccs/pdf.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/pdf.png
rename to upload/admin/skin_cp/images/ccs/pdf.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/sort_asc_off.png b/upload/admin/skin_cp/images/ccs/sort_asc_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/sort_asc_off.png
rename to upload/admin/skin_cp/images/ccs/sort_asc_off.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/sort_asc_on.png b/upload/admin/skin_cp/images/ccs/sort_asc_on.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/sort_asc_on.png
rename to upload/admin/skin_cp/images/ccs/sort_asc_on.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/sort_desc_off.png b/upload/admin/skin_cp/images/ccs/sort_desc_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/sort_desc_off.png
rename to upload/admin/skin_cp/images/ccs/sort_desc_off.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/sort_desc_on.png b/upload/admin/skin_cp/images/ccs/sort_desc_on.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/sort_desc_on.png
rename to upload/admin/skin_cp/images/ccs/sort_desc_on.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/wizard.png b/upload/admin/skin_cp/images/ccs/wizard.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/wizard.png
rename to upload/admin/skin_cp/images/ccs/wizard.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/wizard_small.png b/upload/admin/skin_cp/images/ccs/wizard_small.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/wizard_small.png
rename to upload/admin/skin_cp/images/ccs/wizard_small.png
diff --git a/upload/admin/skin_cp/_newimages/ccs/zip.png b/upload/admin/skin_cp/images/ccs/zip.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/ccs/zip.png
rename to upload/admin/skin_cp/images/ccs/zip.png
diff --git a/upload/admin/skin_cp/images/done_tick.png b/upload/admin/skin_cp/images/done_tick.png
new file mode 100644
index 00000000..8f06168a
Binary files /dev/null and b/upload/admin/skin_cp/images/done_tick.png differ
diff --git a/upload/admin/skin_cp/_newimages/dropdown.png b/upload/admin/skin_cp/images/dropdown.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/dropdown.png
rename to upload/admin/skin_cp/images/dropdown.png
diff --git a/upload/admin/skin_cp/images/emoticon_folder.gif b/upload/admin/skin_cp/images/emoticon_folder.gif
deleted file mode 100644
index 16f2f598..00000000
Binary files a/upload/admin/skin_cp/images/emoticon_folder.gif and /dev/null differ
diff --git a/upload/admin/skin_cp/images/emoticon_folder.png b/upload/admin/skin_cp/images/emoticon_folder.png
new file mode 100644
index 00000000..f021c3e1
Binary files /dev/null and b/upload/admin/skin_cp/images/emoticon_folder.png differ
diff --git a/upload/admin/skin_cp/images/folder.gif b/upload/admin/skin_cp/images/folder.gif
deleted file mode 100644
index 1a781462..00000000
Binary files a/upload/admin/skin_cp/images/folder.gif and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/folder_closed.png b/upload/admin/skin_cp/images/folder_closed.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/folder_closed.png
rename to upload/admin/skin_cp/images/folder_closed.png
diff --git a/upload/admin/skin_cp/images/folder_components/applications/index.html b/upload/admin/skin_cp/images/folder_components/applications/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/applications/index.html
+++ b/upload/admin/skin_cp/images/folder_components/applications/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/cache/index.html b/upload/admin/skin_cp/images/folder_components/cache/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/cache/index.html
+++ b/upload/admin/skin_cp/images/folder_components/cache/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/index.html b/upload/admin/skin_cp/images/folder_components/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/index.html
+++ b/upload/admin/skin_cp/images/folder_components/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/index/index.html b/upload/admin/skin_cp/images/folder_components/index/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/index/index.html
+++ b/upload/admin/skin_cp/images/folder_components/index/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/security/index.html b/upload/admin/skin_cp/images/folder_components/security/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/security/index.html
+++ b/upload/admin/skin_cp/images/folder_components/security/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/skinremap/index.html b/upload/admin/skin_cp/images/folder_components/skinremap/index.html
index 0752b7cc..bdf4e02e 100644
--- a/upload/admin/skin_cp/images/folder_components/skinremap/index.html
+++ b/upload/admin/skin_cp/images/folder_components/skinremap/index.html
@@ -6,6 +6,6 @@
 You have reached this Page in error, please use
 your back button to return to Invision Board.
 <hr>
-<a href="http://www.invisionboard.com/">Invision Power Board</a>
+<a href="http://www.invisionpower.com">Invision Power Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/tasks/index.html b/upload/admin/skin_cp/images/folder_components/tasks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/tasks/index.html
+++ b/upload/admin/skin_cp/images/folder_components/tasks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/templates/diff/index.html b/upload/admin/skin_cp/images/folder_components/templates/diff/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/templates/diff/index.html
+++ b/upload/admin/skin_cp/images/folder_components/templates/diff/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/templates/index.html b/upload/admin/skin_cp/images/folder_components/templates/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/templates/index.html
+++ b/upload/admin/skin_cp/images/folder_components/templates/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/templates/output_html.png b/upload/admin/skin_cp/images/folder_components/templates/output_html.png
new file mode 100644
index 00000000..2bd90dde
Binary files /dev/null and b/upload/admin/skin_cp/images/folder_components/templates/output_html.png differ
diff --git a/upload/admin/skin_cp/images/folder_components/templates/output_off_html.png b/upload/admin/skin_cp/images/folder_components/templates/output_off_html.png
new file mode 100644
index 00000000..2395e0fb
Binary files /dev/null and b/upload/admin/skin_cp/images/folder_components/templates/output_off_html.png differ
diff --git a/upload/admin/skin_cp/images/folder_components/templates/output_off_xml.png b/upload/admin/skin_cp/images/folder_components/templates/output_off_xml.png
new file mode 100644
index 00000000..defdcd1f
Binary files /dev/null and b/upload/admin/skin_cp/images/folder_components/templates/output_off_xml.png differ
diff --git a/upload/admin/skin_cp/images/folder_components/templates/output_xml.png b/upload/admin/skin_cp/images/folder_components/templates/output_xml.png
new file mode 100644
index 00000000..d1887e31
Binary files /dev/null and b/upload/admin/skin_cp/images/folder_components/templates/output_xml.png differ
diff --git a/upload/admin/skin_cp/_newimages/skinset_canthide.png b/upload/admin/skin_cp/images/folder_components/templates/skinset_canthide.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/skinset_canthide.png
rename to upload/admin/skin_cp/images/folder_components/templates/skinset_canthide.png
diff --git a/upload/admin/skin_cp/_newimages/skinset_hidden.png b/upload/admin/skin_cp/images/folder_components/templates/skinset_hidden.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/skinset_hidden.png
rename to upload/admin/skin_cp/images/folder_components/templates/skinset_hidden.png
diff --git a/upload/admin/skin_cp/_newimages/skinset_visible.png b/upload/admin/skin_cp/images/folder_components/templates/skinset_visible.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/skinset_visible.png
rename to upload/admin/skin_cp/images/folder_components/templates/skinset_visible.png
diff --git a/upload/admin/skin_cp/_newimages/templates/default.png b/upload/admin/skin_cp/images/folder_components/templates/templates/default.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/templates/default.png
rename to upload/admin/skin_cp/images/folder_components/templates/templates/default.png
diff --git a/upload/admin/skin_cp/images/folder_components/templates/templates/index.html b/upload/admin/skin_cp/images/folder_components/templates/templates/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/folder_components/templates/templates/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/templates/inherit.png b/upload/admin/skin_cp/images/folder_components/templates/templates/inherit.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/templates/inherit.png
rename to upload/admin/skin_cp/images/folder_components/templates/templates/inherit.png
diff --git a/upload/admin/skin_cp/_newimages/templates/modified.png b/upload/admin/skin_cp/images/folder_components/templates/templates/modified.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/templates/modified.png
rename to upload/admin/skin_cp/images/folder_components/templates/templates/modified.png
diff --git a/upload/admin/skin_cp/_newimages/templates/new.png b/upload/admin/skin_cp/images/folder_components/templates/templates/new.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/templates/new.png
rename to upload/admin/skin_cp/images/folder_components/templates/templates/new.png
diff --git a/upload/admin/skin_cp/_newimages/templates/root.png b/upload/admin/skin_cp/images/folder_components/templates/templates/root.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/templates/root.png
rename to upload/admin/skin_cp/images/folder_components/templates/templates/root.png
diff --git a/upload/admin/skin_cp/images/folder_components/uagents/index.html b/upload/admin/skin_cp/images/folder_components/uagents/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/folder_components/uagents/index.html
+++ b/upload/admin/skin_cp/images/folder_components/uagents/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/folder_components/xmlrpc/index.html b/upload/admin/skin_cp/images/folder_components/xmlrpc/index.html
index 0752b7cc..bdf4e02e 100644
--- a/upload/admin/skin_cp/images/folder_components/xmlrpc/index.html
+++ b/upload/admin/skin_cp/images/folder_components/xmlrpc/index.html
@@ -6,6 +6,6 @@
 You have reached this Page in error, please use
 your back button to return to Invision Board.
 <hr>
-<a href="http://www.invisionboard.com/">Invision Power Board</a>
+<a href="http://www.invisionpower.com">Invision Power Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/folder_open.png b/upload/admin/skin_cp/images/folder_open.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/folder_open.png
rename to upload/admin/skin_cp/images/folder_open.png
diff --git a/upload/admin/skin_cp/images/header_bg.png b/upload/admin/skin_cp/images/header_bg.png
new file mode 100644
index 00000000..ada6c19a
Binary files /dev/null and b/upload/admin/skin_cp/images/header_bg.png differ
diff --git a/upload/admin/skin_cp/images/home_button.png b/upload/admin/skin_cp/images/home_button.png
new file mode 100644
index 00000000..5960fbb7
Binary files /dev/null and b/upload/admin/skin_cp/images/home_button.png differ
diff --git a/upload/admin/skin_cp/images/icon_can_write.gif b/upload/admin/skin_cp/images/icon_can_write.gif
deleted file mode 100644
index 08ab7e75..00000000
Binary files a/upload/admin/skin_cp/images/icon_can_write.gif and /dev/null differ
diff --git a/upload/admin/skin_cp/images/icon_cannot_write.gif b/upload/admin/skin_cp/images/icon_cannot_write.gif
deleted file mode 100644
index 7f77bace..00000000
Binary files a/upload/admin/skin_cp/images/icon_cannot_write.gif and /dev/null differ
diff --git a/upload/admin/skin_cp/_newimages/applications/blog.png b/upload/admin/skin_cp/images/icon_components/blog.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/blog.png
rename to upload/admin/skin_cp/images/icon_components/blog.png
diff --git a/upload/admin/skin_cp/images/icon_components/blog/blog.png b/upload/admin/skin_cp/images/icon_components/blog/blog.png
deleted file mode 100644
index 75397fb1..00000000
Binary files a/upload/admin/skin_cp/images/icon_components/blog/blog.png and /dev/null differ
diff --git a/upload/admin/skin_cp/images/icon_components/blog/index.html b/upload/admin/skin_cp/images/icon_components/blog/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/images/icon_components/blog/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/applications/ccs.png b/upload/admin/skin_cp/images/icon_components/ccs.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/ccs.png
rename to upload/admin/skin_cp/images/icon_components/ccs.png
diff --git a/upload/admin/skin_cp/images/icon_components/ccs/index.html b/upload/admin/skin_cp/images/icon_components/ccs/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/images/icon_components/ccs/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/applications/downloads.png b/upload/admin/skin_cp/images/icon_components/downloads.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/downloads.png
rename to upload/admin/skin_cp/images/icon_components/downloads.png
diff --git a/upload/admin/skin_cp/images/icon_components/downloads/downloads.png b/upload/admin/skin_cp/images/icon_components/downloads/downloads.png
deleted file mode 100644
index 8635bddb..00000000
Binary files a/upload/admin/skin_cp/images/icon_components/downloads/downloads.png and /dev/null differ
diff --git a/upload/admin/skin_cp/images/icon_components/downloads/index.html b/upload/admin/skin_cp/images/icon_components/downloads/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/images/icon_components/downloads/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/applications/gallery.png b/upload/admin/skin_cp/images/icon_components/gallery.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/applications/gallery.png
rename to upload/admin/skin_cp/images/icon_components/gallery.png
diff --git a/upload/admin/skin_cp/images/icon_components/gallery/gallery.png b/upload/admin/skin_cp/images/icon_components/gallery/gallery.png
deleted file mode 100644
index 8bcf2b0a..00000000
Binary files a/upload/admin/skin_cp/images/icon_components/gallery/gallery.png and /dev/null differ
diff --git a/upload/admin/skin_cp/images/icon_components/gallery/index.html b/upload/admin/skin_cp/images/icon_components/gallery/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/images/icon_components/gallery/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/icon_components/generic_trees/index.html b/upload/admin/skin_cp/images/icon_components/generic_trees/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/icon_components/generic_trees/index.html
+++ b/upload/admin/skin_cp/images/icon_components/generic_trees/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/icon_components/index.html b/upload/admin/skin_cp/images/icon_components/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/icon_components/index.html
+++ b/upload/admin/skin_cp/images/icon_components/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/icon_components/nexus.png b/upload/admin/skin_cp/images/icon_components/nexus.png
new file mode 100644
index 00000000..59af1638
Binary files /dev/null and b/upload/admin/skin_cp/images/icon_components/nexus.png differ
diff --git a/upload/admin/skin_cp/images/icon_components/nexus/index.html b/upload/admin/skin_cp/images/icon_components/nexus/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/skin_cp/images/icon_components/nexus/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/icons/accept.png b/upload/admin/skin_cp/images/icons/accept.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/accept.png
rename to upload/admin/skin_cp/images/icons/accept.png
diff --git a/upload/admin/skin_cp/_newimages/icons/add.png b/upload/admin/skin_cp/images/icons/add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/add.png
rename to upload/admin/skin_cp/images/icons/add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/application_add.png b/upload/admin/skin_cp/images/icons/application_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/application_add.png
rename to upload/admin/skin_cp/images/icons/application_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/application_double.png b/upload/admin/skin_cp/images/icons/application_double.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/application_double.png
rename to upload/admin/skin_cp/images/icons/application_double.png
diff --git a/upload/admin/skin_cp/_newimages/icons/arrow_refresh.png b/upload/admin/skin_cp/images/icons/arrow_refresh.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/arrow_refresh.png
rename to upload/admin/skin_cp/images/icons/arrow_refresh.png
diff --git a/upload/admin/skin_cp/_newimages/icons/arrow_rotate_anticlockwise.png b/upload/admin/skin_cp/images/icons/arrow_rotate_anticlockwise.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/arrow_rotate_anticlockwise.png
rename to upload/admin/skin_cp/images/icons/arrow_rotate_anticlockwise.png
diff --git a/upload/admin/skin_cp/_newimages/icons/arrow_switch.png b/upload/admin/skin_cp/images/icons/arrow_switch.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/arrow_switch.png
rename to upload/admin/skin_cp/images/icons/arrow_switch.png
diff --git a/upload/admin/skin_cp/_newimages/icons/attach_add.png b/upload/admin/skin_cp/images/icons/attach_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/attach_add.png
rename to upload/admin/skin_cp/images/icons/attach_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/book_next.png b/upload/admin/skin_cp/images/icons/book_next.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/book_next.png
rename to upload/admin/skin_cp/images/icons/book_next.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_add.png b/upload/admin/skin_cp/images/icons/bullet_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_add.png
rename to upload/admin/skin_cp/images/icons/bullet_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_black.png b/upload/admin/skin_cp/images/icons/bullet_black.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_black.png
rename to upload/admin/skin_cp/images/icons/bullet_black.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_delete.png b/upload/admin/skin_cp/images/icons/bullet_delete.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_delete.png
rename to upload/admin/skin_cp/images/icons/bullet_delete.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_error.png b/upload/admin/skin_cp/images/icons/bullet_error.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_error.png
rename to upload/admin/skin_cp/images/icons/bullet_error.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_green.png b/upload/admin/skin_cp/images/icons/bullet_green.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_green.png
rename to upload/admin/skin_cp/images/icons/bullet_green.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_red.png b/upload/admin/skin_cp/images/icons/bullet_red.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_red.png
rename to upload/admin/skin_cp/images/icons/bullet_red.png
diff --git a/upload/admin/skin_cp/_newimages/icons/bullet_white.png b/upload/admin/skin_cp/images/icons/bullet_white.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/bullet_white.png
rename to upload/admin/skin_cp/images/icons/bullet_white.png
diff --git a/upload/admin/skin_cp/_newimages/icons/cog.png b/upload/admin/skin_cp/images/icons/cog.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/cog.png
rename to upload/admin/skin_cp/images/icons/cog.png
diff --git a/upload/admin/skin_cp/_newimages/icons/cog_add.png b/upload/admin/skin_cp/images/icons/cog_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/cog_add.png
rename to upload/admin/skin_cp/images/icons/cog_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/cog_edit.png b/upload/admin/skin_cp/images/icons/cog_edit.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/cog_edit.png
rename to upload/admin/skin_cp/images/icons/cog_edit.png
diff --git a/upload/admin/skin_cp/_newimages/icons/comments.png b/upload/admin/skin_cp/images/icons/comments.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/comments.png
rename to upload/admin/skin_cp/images/icons/comments.png
diff --git a/upload/admin/skin_cp/_newimages/icons/cross.png b/upload/admin/skin_cp/images/icons/cross.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/cross.png
rename to upload/admin/skin_cp/images/icons/cross.png
diff --git a/upload/admin/skin_cp/images/icons/css.png b/upload/admin/skin_cp/images/icons/css.png
new file mode 100644
index 00000000..23f31018
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/css.png differ
diff --git a/upload/admin/skin_cp/images/icons/database.png b/upload/admin/skin_cp/images/icons/database.png
new file mode 100644
index 00000000..3d09261a
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/database.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/database_refresh.png b/upload/admin/skin_cp/images/icons/database_refresh.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/database_refresh.png
rename to upload/admin/skin_cp/images/icons/database_refresh.png
diff --git a/upload/admin/skin_cp/images/icons/date.png b/upload/admin/skin_cp/images/icons/date.png
new file mode 100644
index 00000000..783c8335
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/date.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/delete.png b/upload/admin/skin_cp/images/icons/delete.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/delete.png
rename to upload/admin/skin_cp/images/icons/delete.png
diff --git a/upload/admin/skin_cp/_newimages/icons/delete_off.png b/upload/admin/skin_cp/images/icons/delete_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/delete_off.png
rename to upload/admin/skin_cp/images/icons/delete_off.png
diff --git a/upload/admin/skin_cp/_newimages/icons/disk.png b/upload/admin/skin_cp/images/icons/disk.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/disk.png
rename to upload/admin/skin_cp/images/icons/disk.png
diff --git a/upload/admin/skin_cp/_newimages/icons/email.png b/upload/admin/skin_cp/images/icons/email.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/email.png
rename to upload/admin/skin_cp/images/icons/email.png
diff --git a/upload/admin/skin_cp/_newimages/icons/email_add.png b/upload/admin/skin_cp/images/icons/email_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/email_add.png
rename to upload/admin/skin_cp/images/icons/email_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/emoticon_grin.png b/upload/admin/skin_cp/images/icons/emoticon_grin.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/emoticon_grin.png
rename to upload/admin/skin_cp/images/icons/emoticon_grin.png
diff --git a/upload/admin/skin_cp/_newimages/icons/exclamation.png b/upload/admin/skin_cp/images/icons/exclamation.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/exclamation.png
rename to upload/admin/skin_cp/images/icons/exclamation.png
diff --git a/upload/admin/skin_cp/_newimages/icons/exclamation_go.png b/upload/admin/skin_cp/images/icons/exclamation_go.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/exclamation_go.png
rename to upload/admin/skin_cp/images/icons/exclamation_go.png
diff --git a/upload/admin/skin_cp/_newimages/icons/export.png b/upload/admin/skin_cp/images/icons/export.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/export.png
rename to upload/admin/skin_cp/images/icons/export.png
diff --git a/upload/admin/skin_cp/_newimages/icons/feed.png b/upload/admin/skin_cp/images/icons/feed.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/feed.png
rename to upload/admin/skin_cp/images/icons/feed.png
diff --git a/upload/admin/skin_cp/images/icons/file.png b/upload/admin/skin_cp/images/icons/file.png
new file mode 100644
index 00000000..8b8b1ca0
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/file.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/flag_red.png b/upload/admin/skin_cp/images/icons/flag_red.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/flag_red.png
rename to upload/admin/skin_cp/images/icons/flag_red.png
diff --git a/upload/admin/skin_cp/_newimages/icons/folder.png b/upload/admin/skin_cp/images/icons/folder.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/folder.png
rename to upload/admin/skin_cp/images/icons/folder.png
diff --git a/upload/admin/skin_cp/_newimages/icons/folder_add.png b/upload/admin/skin_cp/images/icons/folder_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/folder_add.png
rename to upload/admin/skin_cp/images/icons/folder_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/folder_add_off.png b/upload/admin/skin_cp/images/icons/folder_add_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/folder_add_off.png
rename to upload/admin/skin_cp/images/icons/folder_add_off.png
diff --git a/upload/admin/skin_cp/_newimages/icons/folder_palette.png b/upload/admin/skin_cp/images/icons/folder_palette.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/folder_palette.png
rename to upload/admin/skin_cp/images/icons/folder_palette.png
diff --git a/upload/admin/skin_cp/_newimages/icons/group.png b/upload/admin/skin_cp/images/icons/group.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/group.png
rename to upload/admin/skin_cp/images/icons/group.png
diff --git a/upload/admin/skin_cp/_newimages/icons/help.png b/upload/admin/skin_cp/images/icons/help.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/help.png
rename to upload/admin/skin_cp/images/icons/help.png
diff --git a/upload/admin/skin_cp/_newimages/icons/help_add.png b/upload/admin/skin_cp/images/icons/help_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/help_add.png
rename to upload/admin/skin_cp/images/icons/help_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/import.png b/upload/admin/skin_cp/images/icons/import.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/import.png
rename to upload/admin/skin_cp/images/icons/import.png
diff --git a/upload/admin/skin_cp/images/icons/index.html b/upload/admin/skin_cp/images/icons/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/icons/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/icons/information.png b/upload/admin/skin_cp/images/icons/information.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/information.png
rename to upload/admin/skin_cp/images/icons/information.png
diff --git a/upload/admin/skin_cp/_newimages/icons/ipsnews_item.gif b/upload/admin/skin_cp/images/icons/ipsnews_item.gif
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/ipsnews_item.gif
rename to upload/admin/skin_cp/images/icons/ipsnews_item.gif
diff --git a/upload/admin/skin_cp/images/icons/js.png b/upload/admin/skin_cp/images/icons/js.png
new file mode 100644
index 00000000..0d7a4c63
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/js.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/key.png b/upload/admin/skin_cp/images/icons/key.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/key.png
rename to upload/admin/skin_cp/images/icons/key.png
diff --git a/upload/admin/skin_cp/_newimages/icons/layout_content.png b/upload/admin/skin_cp/images/icons/layout_content.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/layout_content.png
rename to upload/admin/skin_cp/images/icons/layout_content.png
diff --git a/upload/admin/skin_cp/_newimages/icons/lightning_add.png b/upload/admin/skin_cp/images/icons/lightning_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/lightning_add.png
rename to upload/admin/skin_cp/images/icons/lightning_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/lock.png b/upload/admin/skin_cp/images/icons/lock.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/lock.png
rename to upload/admin/skin_cp/images/icons/lock.png
diff --git a/upload/admin/skin_cp/images/icons/mclose.png b/upload/admin/skin_cp/images/icons/mclose.png
new file mode 100644
index 00000000..76656c42
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/mclose.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/mclosefs.png b/upload/admin/skin_cp/images/icons/mclosefs.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/mclosefs.png
rename to upload/admin/skin_cp/images/icons/mclosefs.png
diff --git a/upload/admin/skin_cp/images/icons/medal.png b/upload/admin/skin_cp/images/icons/medal.png
new file mode 100644
index 00000000..2a991a14
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/medal.png differ
diff --git a/upload/admin/skin_cp/images/icons/mfullscreen.png b/upload/admin/skin_cp/images/icons/mfullscreen.png
new file mode 100644
index 00000000..f1051393
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/mfullscreen.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/package.png b/upload/admin/skin_cp/images/icons/package.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/package.png
rename to upload/admin/skin_cp/images/icons/package.png
diff --git a/upload/admin/skin_cp/images/icons/page.png b/upload/admin/skin_cp/images/icons/page.png
new file mode 100644
index 00000000..55d1072e
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/page.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/page_add.png b/upload/admin/skin_cp/images/icons/page_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/page_add.png
rename to upload/admin/skin_cp/images/icons/page_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/page_add_off.png b/upload/admin/skin_cp/images/icons/page_add_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/page_add_off.png
rename to upload/admin/skin_cp/images/icons/page_add_off.png
diff --git a/upload/admin/skin_cp/images/icons/page_go.png b/upload/admin/skin_cp/images/icons/page_go.png
new file mode 100644
index 00000000..bc4faa70
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/page_go.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/page_red.png b/upload/admin/skin_cp/images/icons/page_red.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/page_red.png
rename to upload/admin/skin_cp/images/icons/page_red.png
diff --git a/upload/admin/skin_cp/_newimages/icons/page_white_code.png b/upload/admin/skin_cp/images/icons/page_white_code.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/page_white_code.png
rename to upload/admin/skin_cp/images/icons/page_white_code.png
diff --git a/upload/admin/skin_cp/_newimages/icons/page_white_magnify.png b/upload/admin/skin_cp/images/icons/page_white_magnify.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/page_white_magnify.png
rename to upload/admin/skin_cp/images/icons/page_white_magnify.png
diff --git a/upload/admin/skin_cp/_newimages/icons/palette.png b/upload/admin/skin_cp/images/icons/palette.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/palette.png
rename to upload/admin/skin_cp/images/icons/palette.png
diff --git a/upload/admin/skin_cp/_newimages/icons/palette_edit.png b/upload/admin/skin_cp/images/icons/palette_edit.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/palette_edit.png
rename to upload/admin/skin_cp/images/icons/palette_edit.png
diff --git a/upload/admin/skin_cp/_newimages/icons/pencil.png b/upload/admin/skin_cp/images/icons/pencil.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/pencil.png
rename to upload/admin/skin_cp/images/icons/pencil.png
diff --git a/upload/admin/skin_cp/_newimages/icons/pencil_off.png b/upload/admin/skin_cp/images/icons/pencil_off.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/pencil_off.png
rename to upload/admin/skin_cp/images/icons/pencil_off.png
diff --git a/upload/admin/skin_cp/_newimages/icons/plugin.png b/upload/admin/skin_cp/images/icons/plugin.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/plugin.png
rename to upload/admin/skin_cp/images/icons/plugin.png
diff --git a/upload/admin/skin_cp/_newimages/icons/plugin_add.png b/upload/admin/skin_cp/images/icons/plugin_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/plugin_add.png
rename to upload/admin/skin_cp/images/icons/plugin_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/printer.png b/upload/admin/skin_cp/images/icons/printer.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/printer.png
rename to upload/admin/skin_cp/images/icons/printer.png
diff --git a/upload/admin/skin_cp/_newimages/icons/rep_given.png b/upload/admin/skin_cp/images/icons/rep_given.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/rep_given.png
rename to upload/admin/skin_cp/images/icons/rep_given.png
diff --git a/upload/admin/skin_cp/_newimages/icons/rep_received.png b/upload/admin/skin_cp/images/icons/rep_received.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/rep_received.png
rename to upload/admin/skin_cp/images/icons/rep_received.png
diff --git a/upload/admin/skin_cp/_newimages/icons/script_palette.png b/upload/admin/skin_cp/images/icons/script_palette.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/script_palette.png
rename to upload/admin/skin_cp/images/icons/script_palette.png
diff --git a/upload/admin/skin_cp/_newimages/icons/shape_move_front.png b/upload/admin/skin_cp/images/icons/shape_move_front.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/shape_move_front.png
rename to upload/admin/skin_cp/images/icons/shape_move_front.png
diff --git a/upload/admin/skin_cp/_newimages/icons/shape_ungroup.png b/upload/admin/skin_cp/images/icons/shape_ungroup.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/shape_ungroup.png
rename to upload/admin/skin_cp/images/icons/shape_ungroup.png
diff --git a/upload/admin/skin_cp/_newimages/icons/style_add.png b/upload/admin/skin_cp/images/icons/style_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/style_add.png
rename to upload/admin/skin_cp/images/icons/style_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/style_go.png b/upload/admin/skin_cp/images/icons/style_go.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/style_go.png
rename to upload/admin/skin_cp/images/icons/style_go.png
diff --git a/upload/admin/skin_cp/_newimages/icons/table.png b/upload/admin/skin_cp/images/icons/table.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/table.png
rename to upload/admin/skin_cp/images/icons/table.png
diff --git a/upload/admin/skin_cp/_newimages/icons/table_add.png b/upload/admin/skin_cp/images/icons/table_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/table_add.png
rename to upload/admin/skin_cp/images/icons/table_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/template.png b/upload/admin/skin_cp/images/icons/template.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/template.png
rename to upload/admin/skin_cp/images/icons/template.png
diff --git a/upload/admin/skin_cp/_newimages/icons/text.png b/upload/admin/skin_cp/images/icons/text.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/text.png
rename to upload/admin/skin_cp/images/icons/text.png
diff --git a/upload/admin/skin_cp/_newimages/icons/text_rich_colored.png b/upload/admin/skin_cp/images/icons/text_rich_colored.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/text_rich_colored.png
rename to upload/admin/skin_cp/images/icons/text_rich_colored.png
diff --git a/upload/admin/skin_cp/_newimages/icons/tick.png b/upload/admin/skin_cp/images/icons/tick.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/tick.png
rename to upload/admin/skin_cp/images/icons/tick.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user.png b/upload/admin/skin_cp/images/icons/user.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user.png
rename to upload/admin/skin_cp/images/icons/user.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_add.png b/upload/admin/skin_cp/images/icons/user_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_add.png
rename to upload/admin/skin_cp/images/icons/user_add.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_assign.png b/upload/admin/skin_cp/images/icons/user_assign.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_assign.png
rename to upload/admin/skin_cp/images/icons/user_assign.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_delete.png b/upload/admin/skin_cp/images/icons/user_delete.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_delete.png
rename to upload/admin/skin_cp/images/icons/user_delete.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_edit.png b/upload/admin/skin_cp/images/icons/user_edit.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_edit.png
rename to upload/admin/skin_cp/images/icons/user_edit.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_find.png b/upload/admin/skin_cp/images/icons/user_find.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_find.png
rename to upload/admin/skin_cp/images/icons/user_find.png
diff --git a/upload/admin/skin_cp/_newimages/icons/user_warn.png b/upload/admin/skin_cp/images/icons/user_warn.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/user_warn.png
rename to upload/admin/skin_cp/images/icons/user_warn.png
diff --git a/upload/admin/skin_cp/_newimages/icons/view.png b/upload/admin/skin_cp/images/icons/view.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/view.png
rename to upload/admin/skin_cp/images/icons/view.png
diff --git a/upload/admin/skin_cp/_newimages/icons/viewmore.png b/upload/admin/skin_cp/images/icons/viewmore.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/viewmore.png
rename to upload/admin/skin_cp/images/icons/viewmore.png
diff --git a/upload/admin/skin_cp/_newimages/icons/warning.png b/upload/admin/skin_cp/images/icons/warning.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/warning.png
rename to upload/admin/skin_cp/images/icons/warning.png
diff --git a/upload/admin/skin_cp/images/icons/world.png b/upload/admin/skin_cp/images/icons/world.png
new file mode 100644
index 00000000..68f21d30
Binary files /dev/null and b/upload/admin/skin_cp/images/icons/world.png differ
diff --git a/upload/admin/skin_cp/_newimages/icons/world_add.png b/upload/admin/skin_cp/images/icons/world_add.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/icons/world_add.png
rename to upload/admin/skin_cp/images/icons/world_add.png
diff --git a/upload/admin/skin_cp/images/index.html b/upload/admin/skin_cp/images/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/index.html
+++ b/upload/admin/skin_cp/images/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/ipsControlStrip_arrow.png b/upload/admin/skin_cp/images/ipsControlStrip_arrow.png
new file mode 100644
index 00000000..dc8b0046
Binary files /dev/null and b/upload/admin/skin_cp/images/ipsControlStrip_arrow.png differ
diff --git a/upload/admin/skin_cp/images/ipsDragHandle.png b/upload/admin/skin_cp/images/ipsDragHandle.png
new file mode 100644
index 00000000..912811b8
Binary files /dev/null and b/upload/admin/skin_cp/images/ipsDragHandle.png differ
diff --git a/upload/admin/skin_cp/images/live_search_stem.png b/upload/admin/skin_cp/images/live_search_stem.png
new file mode 100644
index 00000000..b2ce1a6a
Binary files /dev/null and b/upload/admin/skin_cp/images/live_search_stem.png differ
diff --git a/upload/admin/skin_cp/_newimages/loading.gif b/upload/admin/skin_cp/images/loading.gif
similarity index 96%
rename from upload/admin/skin_cp/_newimages/loading.gif
rename to upload/admin/skin_cp/images/loading.gif
index 0f763c60..5b33f7e5 100644
Binary files a/upload/admin/skin_cp/_newimages/loading.gif and b/upload/admin/skin_cp/images/loading.gif differ
diff --git a/upload/admin/skin_cp/_newimages/loading_big.gif b/upload/admin/skin_cp/images/loading_big.gif
similarity index 100%
rename from upload/admin/skin_cp/_newimages/loading_big.gif
rename to upload/admin/skin_cp/images/loading_big.gif
diff --git a/upload/admin/skin_cp/images/loading_white.gif b/upload/admin/skin_cp/images/loading_white.gif
new file mode 100644
index 00000000..efb9ee38
Binary files /dev/null and b/upload/admin/skin_cp/images/loading_white.gif differ
diff --git a/upload/admin/skin_cp/images/login_logo.png b/upload/admin/skin_cp/images/login_logo.png
new file mode 100644
index 00000000..9938bfcc
Binary files /dev/null and b/upload/admin/skin_cp/images/login_logo.png differ
diff --git a/upload/admin/skin_cp/images/logo.png b/upload/admin/skin_cp/images/logo.png
new file mode 100644
index 00000000..17e47ce1
Binary files /dev/null and b/upload/admin/skin_cp/images/logo.png differ
diff --git a/upload/admin/skin_cp/_newimages/members/facebook.png b/upload/admin/skin_cp/images/members/facebook.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/facebook.png
rename to upload/admin/skin_cp/images/members/facebook.png
diff --git a/upload/admin/skin_cp/images/members/index.html b/upload/admin/skin_cp/images/members/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/members/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/members/internet.png b/upload/admin/skin_cp/images/members/internet.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/internet.png
rename to upload/admin/skin_cp/images/members/internet.png
diff --git a/upload/admin/skin_cp/_newimages/members/normal.png b/upload/admin/skin_cp/images/members/normal.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/normal.png
rename to upload/admin/skin_cp/images/members/normal.png
diff --git a/upload/admin/skin_cp/_newimages/members/normal_alert.png b/upload/admin/skin_cp/images/members/normal_alert.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/normal_alert.png
rename to upload/admin/skin_cp/images/members/normal_alert.png
diff --git a/upload/admin/skin_cp/_newimages/members/normal_lock.png b/upload/admin/skin_cp/images/members/normal_lock.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/normal_lock.png
rename to upload/admin/skin_cp/images/members/normal_lock.png
diff --git a/upload/admin/skin_cp/_newimages/members/normal_spam.png b/upload/admin/skin_cp/images/members/normal_spam.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/normal_spam.png
rename to upload/admin/skin_cp/images/members/normal_spam.png
diff --git a/upload/admin/skin_cp/_newimages/members/normal_tick.png b/upload/admin/skin_cp/images/members/normal_tick.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/normal_tick.png
rename to upload/admin/skin_cp/images/members/normal_tick.png
diff --git a/upload/admin/skin_cp/_newimages/members/twitter.png b/upload/admin/skin_cp/images/members/twitter.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/members/twitter.png
rename to upload/admin/skin_cp/images/members/twitter.png
diff --git a/upload/admin/skin_cp/images/menu_has_sub.png b/upload/admin/skin_cp/images/menu_has_sub.png
new file mode 100644
index 00000000..ecea7c18
Binary files /dev/null and b/upload/admin/skin_cp/images/menu_has_sub.png differ
diff --git a/upload/admin/skin_cp/images/menu_icon_sprite.png b/upload/admin/skin_cp/images/menu_icon_sprite.png
new file mode 100644
index 00000000..563a21ae
Binary files /dev/null and b/upload/admin/skin_cp/images/menu_icon_sprite.png differ
diff --git a/upload/admin/skin_cp/images/mod_action.png b/upload/admin/skin_cp/images/mod_action.png
new file mode 100644
index 00000000..805508bf
Binary files /dev/null and b/upload/admin/skin_cp/images/mod_action.png differ
diff --git a/upload/admin/skin_cp/images/options_menu/index.html b/upload/admin/skin_cp/images/options_menu/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/options_menu/index.html
+++ b/upload/admin/skin_cp/images/options_menu/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/palette.png b/upload/admin/skin_cp/images/palette.png
new file mode 100644
index 00000000..df7ccc11
Binary files /dev/null and b/upload/admin/skin_cp/images/palette.png differ
diff --git a/upload/admin/skin_cp/images/remote_avatar.png b/upload/admin/skin_cp/images/remote_avatar.png
new file mode 100644
index 00000000..6337f0a4
Binary files /dev/null and b/upload/admin/skin_cp/images/remote_avatar.png differ
diff --git a/upload/admin/skin_cp/images/report_active_off.png b/upload/admin/skin_cp/images/report_active_off.png
new file mode 100644
index 00000000..13b1846a
Binary files /dev/null and b/upload/admin/skin_cp/images/report_active_off.png differ
diff --git a/upload/admin/skin_cp/images/report_active_on.png b/upload/admin/skin_cp/images/report_active_on.png
new file mode 100644
index 00000000..f51449e1
Binary files /dev/null and b/upload/admin/skin_cp/images/report_active_on.png differ
diff --git a/upload/admin/skin_cp/images/report_complete_off.png b/upload/admin/skin_cp/images/report_complete_off.png
new file mode 100644
index 00000000..d032e980
Binary files /dev/null and b/upload/admin/skin_cp/images/report_complete_off.png differ
diff --git a/upload/admin/skin_cp/images/report_complete_on.png b/upload/admin/skin_cp/images/report_complete_on.png
new file mode 100644
index 00000000..1626c9e0
Binary files /dev/null and b/upload/admin/skin_cp/images/report_complete_on.png differ
diff --git a/upload/admin/skin_cp/images/report_new_off.png b/upload/admin/skin_cp/images/report_new_off.png
new file mode 100644
index 00000000..46e8882c
Binary files /dev/null and b/upload/admin/skin_cp/images/report_new_off.png differ
diff --git a/upload/admin/skin_cp/images/report_new_on.png b/upload/admin/skin_cp/images/report_new_on.png
new file mode 100644
index 00000000..79a75784
Binary files /dev/null and b/upload/admin/skin_cp/images/report_new_on.png differ
diff --git a/upload/admin/skin_cp/images/reports/index.html b/upload/admin/skin_cp/images/reports/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/images/reports/index.html
+++ b/upload/admin/skin_cp/images/reports/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/_newimages/search_icon.png b/upload/admin/skin_cp/images/search_box_icon.png
similarity index 100%
rename from upload/admin/skin_cp/_newimages/search_icon.png
rename to upload/admin/skin_cp/images/search_box_icon.png
diff --git a/upload/admin/skin_cp/images/search_icon.png b/upload/admin/skin_cp/images/search_icon.png
new file mode 100644
index 00000000..274caaf5
Binary files /dev/null and b/upload/admin/skin_cp/images/search_icon.png differ
diff --git a/upload/admin/skin_cp/images/search_icon_white.png b/upload/admin/skin_cp/images/search_icon_white.png
new file mode 100644
index 00000000..b5dce796
Binary files /dev/null and b/upload/admin/skin_cp/images/search_icon_white.png differ
diff --git a/upload/admin/skin_cp/images/sidebar_toggle_close.png b/upload/admin/skin_cp/images/sidebar_toggle_close.png
new file mode 100644
index 00000000..39cab653
Binary files /dev/null and b/upload/admin/skin_cp/images/sidebar_toggle_close.png differ
diff --git a/upload/admin/skin_cp/images/sidebar_toggle_open.png b/upload/admin/skin_cp/images/sidebar_toggle_open.png
new file mode 100644
index 00000000..9ea5dc49
Binary files /dev/null and b/upload/admin/skin_cp/images/sidebar_toggle_open.png differ
diff --git a/upload/admin/skin_cp/images/skins/manual.png b/upload/admin/skin_cp/images/skins/manual.png
new file mode 100644
index 00000000..21cf2613
Binary files /dev/null and b/upload/admin/skin_cp/images/skins/manual.png differ
diff --git a/upload/admin/skin_cp/images/skins/visual.png b/upload/admin/skin_cp/images/skins/visual.png
new file mode 100644
index 00000000..4006d80e
Binary files /dev/null and b/upload/admin/skin_cp/images/skins/visual.png differ
diff --git a/upload/admin/skin_cp/images/sortable_arrows.png b/upload/admin/skin_cp/images/sortable_arrows.png
new file mode 100644
index 00000000..8b2d4a89
Binary files /dev/null and b/upload/admin/skin_cp/images/sortable_arrows.png differ
diff --git a/upload/admin/skin_cp/images/stems/bottomleft.png b/upload/admin/skin_cp/images/stems/bottomleft.png
new file mode 100644
index 00000000..e60f803a
Binary files /dev/null and b/upload/admin/skin_cp/images/stems/bottomleft.png differ
diff --git a/upload/admin/skin_cp/images/stems/bottomright.png b/upload/admin/skin_cp/images/stems/bottomright.png
new file mode 100644
index 00000000..c69ec119
Binary files /dev/null and b/upload/admin/skin_cp/images/stems/bottomright.png differ
diff --git a/upload/admin/skin_cp/images/stems/index.html b/upload/admin/skin_cp/images/stems/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/skin_cp/images/stems/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/skin_cp/images/stems/topleft.png b/upload/admin/skin_cp/images/stems/topleft.png
new file mode 100644
index 00000000..130f1b73
Binary files /dev/null and b/upload/admin/skin_cp/images/stems/topleft.png differ
diff --git a/upload/admin/skin_cp/images/stems/topright.png b/upload/admin/skin_cp/images/stems/topright.png
new file mode 100644
index 00000000..b10daa6c
Binary files /dev/null and b/upload/admin/skin_cp/images/stems/topright.png differ
diff --git a/upload/admin/skin_cp/images/text_field_bg.png b/upload/admin/skin_cp/images/text_field_bg.png
new file mode 100644
index 00000000..aea25c01
Binary files /dev/null and b/upload/admin/skin_cp/images/text_field_bg.png differ
diff --git a/upload/admin/skin_cp/images/trans_bg.png b/upload/admin/skin_cp/images/trans_bg.png
new file mode 100644
index 00000000..86e92492
Binary files /dev/null and b/upload/admin/skin_cp/images/trans_bg.png differ
diff --git a/upload/admin/skin_cp/images/unwritable.png b/upload/admin/skin_cp/images/unwritable.png
new file mode 100644
index 00000000..2a157702
Binary files /dev/null and b/upload/admin/skin_cp/images/unwritable.png differ
diff --git a/upload/admin/skin_cp/images/useropts_arrow.png b/upload/admin/skin_cp/images/useropts_arrow.png
new file mode 100644
index 00000000..0c3f35e7
Binary files /dev/null and b/upload/admin/skin_cp/images/useropts_arrow.png differ
diff --git a/upload/admin/skin_cp/images/wizard_step_extra.png b/upload/admin/skin_cp/images/wizard_step_extra.png
new file mode 100644
index 00000000..5a33ca0e
Binary files /dev/null and b/upload/admin/skin_cp/images/wizard_step_extra.png differ
diff --git a/upload/admin/skin_cp/images/wizard_step_large.png b/upload/admin/skin_cp/images/wizard_step_large.png
new file mode 100644
index 00000000..9695443b
Binary files /dev/null and b/upload/admin/skin_cp/images/wizard_step_large.png differ
diff --git a/upload/admin/skin_cp/images/writable.png b/upload/admin/skin_cp/images/writable.png
new file mode 100644
index 00000000..b232863b
Binary files /dev/null and b/upload/admin/skin_cp/images/writable.png differ
diff --git a/upload/admin/skin_cp/index.html b/upload/admin/skin_cp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/skin_cp/index.html
+++ b/upload/admin/skin_cp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/base/core.php b/upload/admin/sources/base/core.php
index 9b5e42a4..fb6ea586 100644
--- a/upload/admin/sources/base/core.php
+++ b/upload/admin/sources/base/core.php
@@ -2,67 +2,41 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Static Classes for IP.Board 3
  *
  * These classes are not required as objects. We have grouped
  * together several singletons to prevent multiple file loads
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-10-06 23:44:10 -0400 (Thu, 06 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th March 2002
- * @version		$Revision: 7195 $
+ * @version		$Revision: 9587 $
  *
  * @author	Matt
  */
- 
- 
-/**
- * This class for legacy reasons only - should be removed in 3.2
- * Just stops skins breaking.
- */
-class IPSSearchIndex
-{
-	/**
-	 * Loads the correct search plugin based on search settings
-	 *
-	 * @param   string  [$force_index]  Optional, force a particular index
-	 * @return	object
-	 */
-	static public function getSearchPlugin( $force_index='' )
-	{
-		return false;
-	}
 
-	/**
-	 * Determines if the application can be searched
-	 *
-	 * @param	string	$app	Application key
-	 * @return	bool
-	 */
-	static public function appIsSearchable( $app )
-	{
-		/* INI */
-		return IPSLib::appIsInstalled( $app );
-	}
-
-	/**
-	 * Returns the search display plugin for the specified app
-	 *
-	 * @param	string	$app	Application Key
-	 * @return	object
-	 */
-	static public function getSearchDisplayPlugin( $app )
-	{
-		return false;
-	}
-}
 
+/* Non setting settings defaults.
+ * Do not edit here, edit them in your conf_global.php */
+$_ipsPowerSettings = array( 'status_sidebar_show_x'			=> 5,
+							'ipb_disable_group_psformat'	=> 0,
+							'tags_max_truncated_len'		=> 35,
+							'max_bbcodes_per_post'			=> 500,
+							'topic_marking_keep_days'		=> 31,
+							'postpage_contents'				=> '5,10,15,20,25,30,35,40',
+							'topicpage_contents'			=> '5,10,15,20,25,30,35,40',
+							'member_photo_crop'				=> 100,
+							'posting_allow_rte'				=> 1, # Will look to redirect old editor methods to new and will remove this (legacy compatibility)
+							'like_notifications_limit'		=> 1000,
+							'actidx_override'				=> 0,
+							'signature_line_length'			=> 200,
+							);
 
 class IPSAdCodeDefault
 {
@@ -228,16 +202,15 @@ class IPSContentCache
 	 *
 	 * @var		array
 	 */
-	private static $_tables = array( 'post' => 'content_cache_posts',
+	protected static $_tables = array( 'post' => 'content_cache_posts',
 							  		 'sig'  => 'content_cache_sigs' );
-							
-						
+
 	/**
 	 * Keep track of what settings are linked to which key
 	 *
 	 * @var		array
 	 */
-	private static $_settings = array( 'post' => 'cc_posts',
+	protected static $_settings = array( 'post' => 'cc_posts',
 							    	   'sig'  => 'cc_sigs' );
 							
 	/**
@@ -249,7 +222,7 @@ class IPSContentCache
 	{
 		return ( ipsRegistry::$settings['cc_on'] AND ( ipsRegistry::$settings['cc_posts'] OR ipsRegistry::$settings['cc_sigs'] ) ) ? TRUE : FALSE;
 	}
-	
+
 	/**
 	 * Check to see whether we have a valid type
 	 *
@@ -258,7 +231,7 @@ class IPSContentCache
 	 */
 	static public function isValidType( $type )
 	{
-		return ( in_array( $type, array_keys( self::$_tables ) ) ) ? TRUE : FALSE;
+		return isset( self::$_tables[ $type ] ) ? TRUE : FALSE;
 	}
 	
 	/**
@@ -284,58 +257,7 @@ class IPSContentCache
 	{
 		return ipsRegistry::$settings[ self::$_settings[ $type ] ];
 	}
-	
-	/**
-	 * Monitor: See how many items are served from the cache versus ... not
-	 *
-	 * You need to add 'cc_monitor' => 1 into conf_global.php to enable this
-	 *
-	 * @param	array 		Array of data like array( 'post' => array( 'cached' => x, 'raw' => x )
-	 * @return	void
-	 */
-	static public function updateMonitor( $array )
-	{
-		/* Check.. */
-		if ( ! ipsRegistry::$settings['cc_monitor'] )
-		{
-			return FALSE;
-		}
-		
-		/* Enabled?? */
-		if ( ! self::isEnabled() )
-		{
-			return FALSE;
-		}
-		
-		/* Search engine? */
-		if ( ipsRegistry::member()->is_not_human === TRUE )
-		{
-			return FALSE;
-		}
-		
-		$savedData = ipsRegistry::cache()->getCache( 'ccMonitor' );
-		
-		/* Ensure its valid */
-		if ( ! is_array( $savedData ) OR ! count( $savedData ) )
-		{
-			$savedData = array( 'post' => array( 'cached' => 0, 'raw' => 0 ),
-							 	'sig'  => array( 'cached' => 0, 'raw' => 0 ) );
 
-		}
-		
-		foreach( $array as $type => $data )
-		{
-			if ( self::isValidType( $type ) )
-			{
-				$savedData[ $type ]['cached'] += intval( $data['cached'] );
-				$savedData[ $type ]['raw']    += intval( $data['raw'] );
-			}
-		}
-		
-		/* Write back */
-		ipsRegistry::cache()->setCache( 'ccMonitor', $savedData, array( 'array' => 1, 'donow' => 1 ) );
-	}
-	
 	/**
 	 * Add data to the cache
 	 *
@@ -396,7 +318,7 @@ class IPSContentCache
 		
 		if ( $content )
 		{
-			ipsRegistry::DB()->force_data_type = array( 'cache_content' => 'string' );
+			ipsRegistry::DB()->setDataType( 'cache_content', 'string' );
 												
 			ipsRegistry::DB()->replace( self::fetchTableName( $type ), array( 'cache_content_id' => $id,
 																			  'cache_content'    => $content,
@@ -707,10 +629,10 @@ class IPSBWOptions
 	{
 		/* INIT */
 		$int = 0;
-		
+
 		/* Generate bitwise array */
 		$bitArray = self::_getBitWiseArray( $type, $app );
-		
+
 		if ( ! $bitArray OR ! count( $bitArray ) )
 		{
 			return 0;
@@ -736,11 +658,11 @@ class IPSBWOptions
 	 * @param	string		Array key to return
 	 * @return	array
 	 */
-	static private function _getBitWiseArray( $type, $app )
+	static protected function _getBitWiseArray( $type, $app )
 	{
 		$bitArray   = array();
 		$allOptions = ipsRegistry::fetchBitWiseOptions( $app );
-		
+
 		if ( is_array( $allOptions ) )
 		{
 			if ( isset( $allOptions[ $type ] ) AND is_array( $allOptions[ $type ] ) )
@@ -773,63 +695,63 @@ class IPSTime
     *
     * @var		integer
     */
-	private static $timestamp	= IPS_UNIX_TIME_NOW;
+	protected static $timestamp	= IPS_UNIX_TIME_NOW;
 
    /**
     * Number of seconds in a minute
     *
     * @var		integer
     */
-	private static $minute		= 60;
+	protected static $minute		= 60;
 
    /**
     * Number of seconds in a hour
     *
     * @var		integer
     */
-	private static $hour		= 3600;
+	protected static $hour		= 3600;
 
    /**
     * Number of seconds in a day
     *
     * @var		integer
     */
-	private static $day			= 86400;
+	protected static $day			= 86400;
 
    /**
     * Number of seconds in a week
     *
     * @var		integer
     */
-	private static $week		= 604800;
+	protected static $week		= 604800;
 
    /**
     * Number of seconds in a year
     *
     * @var		integer
     */
-	private static $year		= 220752000;
+	protected static $year		= 220752000;
 
    /**
     * Months with 31 days
     *
     * @var		array
     */
-	private static $months_31 = array( 01, 03, 05, 07, 08, 10, 12 );
+	protected static $months_31 = array( 01, 03, 05, 07, 08, 10, 12 );
 	
    /**
     * Months with 30 days
     *
     * @var		array
     */
-	private static $months_30 = array( 04, 06, 09, 11 );
+	protected static $months_30 = array( 04, 06, 09, 11 );
 
 	/**
 	 * time_class::dmy_format()
 	 * Generates a time stamp for the day/month/year
 	 *
 	 * @param	integer	[$ts]	Timestamp to format, self::$timestamp used if none specified
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function dmy_format( $ts=0 )
 	{
@@ -849,7 +771,7 @@ class IPSTime
 	 * Returns how long ago the specified time stamp was
 	 *
 	 * @param	integer	$ts	Timestamp to format
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function time_ago( $ts )
 	{
@@ -883,7 +805,7 @@ class IPSTime
 	 * Set the timestamp
 	 *
 	 * @param	int		New timestamp
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setTimestamp( $time )
 	{
@@ -905,7 +827,7 @@ class IPSTime
 	 * Adds the specified number of minutes to the timestamp
 	 *
 	 * @param	integer	[$num]	Number of minutes to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_minutes( $num=1 )
 	{
@@ -917,11 +839,11 @@ class IPSTime
 	 * Adds the specified number of hours to the timestamp
 	 *
 	 * @param	integer	[$num]	Number of hours to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_hours( $num=1 )
 	{
-		self::$timestamp += self::$hours * $num;
+		self::$timestamp += self::$hour * $num;
 	}
 
 	/**
@@ -929,7 +851,7 @@ class IPSTime
 	 * Adds the specified number of days to the timestamp
 	 *
 	 * @param	integer	[$num]	Number of days to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_days( $num=1 )
 	{
@@ -941,7 +863,7 @@ class IPSTime
 	 * Adds the specified number of weeks to the timestamp
 	 *
 	 * @param	integer	[$num]	Number of weeks to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_weeks( $num=1 )
 	{
@@ -952,7 +874,7 @@ class IPSTime
 	 * time_class::add_month()
 	 * Adds a single month to the current timestamp, takes into account leap years
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_month()
 	{
@@ -966,7 +888,7 @@ class IPSTime
 	 * Adds the specified number of months to the timestamp
 	 *
 	 * @param	integer	$num	Number of months to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_months( $num=1 )
 	{
@@ -981,7 +903,7 @@ class IPSTime
 	 * Adds the specified number of years to the timestamp
 	 *
 	 * @param	integer	$num	Number of years to add, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function add_years( $num=1 )
 	{
@@ -997,7 +919,7 @@ class IPSTime
 	 * Removes the specified number of days to the timestamp
 	 *
 	 * @param	integer	[$num]	Number of days to remove, 1 by default
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function remove_days( $num=1 )
 	{
@@ -1178,26 +1100,26 @@ class IPSLib
 	 *
 	 * @param	array
 	 */
-	static private $_furlTemplates = array();
+	static protected $_furlTemplates = array();
 	
 	/**
 	 * Search configs
 	 *
 	 * @param	array
 	 */
-	static private $_searchConfigs = array();
+	static protected $_searchConfigs = array();
 	
 	/**
 	 * Log in methods
 	 *
 	 * @param	array
 	 */
-	static private $_lims 		   = array();
+	static protected $_lims 		   = array();
 	
 	/**
 	 * Returns the class name to be instantiated, the class file will already be included 
 	 *
-	 * @param	string 	$filePath		File location of the class
+	 * @param	string 	$filePath		File location of the class (leave an empty string if you've already loaded the main file)
 	 * @param	string	$className		Name of the class
 	 * @param	string	$app			Application (defaults to 'core')
 	 * @return	string	Class Name
@@ -1205,7 +1127,10 @@ class IPSLib
 	static public function loadLibrary( $filePath, $className, $app='core' )
 	{
 		/* Get the class */
-		require_once( $filePath );
+		if ( $filePath != '' )
+		{
+			require_once( $filePath );/*noLibHook*/
+		}
 		
 		/* Check for hooks */
 		$hooksCache	= ipsRegistry::cache()->getCache('hooks');
@@ -1214,11 +1139,10 @@ class IPSLib
 		{
 			foreach( $hooksCache['libraryHooks'][ $app ][ $className ] as $classOverloader )
 			{
-				/* Hooks: Do we have a hook that extends this class? */
-				if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] ) )
+				/* Hooks: Do we have the hook file? */
+				if( is_file( IPS_HOOKS_PATH . $classOverloader['filename'] ) )
 				{
-					/* Hooks: Do we have the hook file? */
-					require_once( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] );
+					require_once( IPS_HOOKS_PATH . $classOverloader['filename'] );/*noLibHook*/
 	            
 					if( class_exists( $classOverloader['className'] ) )
 					{
@@ -1243,7 +1167,7 @@ class IPSLib
 	static public function loadActionOverloader( $filePath, $className )
 	{
 		/* Get the class */
-		require_once( $filePath );
+		require_once( $filePath );/*noLibHook*/
 		
 		/* Hooks: Are we overloading this class? */
 		$hooksCache	= ipsRegistry::cache()->getCache('hooks');
@@ -1252,10 +1176,10 @@ class IPSLib
 		{
 			foreach( $hooksCache['commandHooks'][ $className ] as $classOverloader )
 			{
-				if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] ) )
+				/* Hooks: Do we have the hook file? */
+				if( is_file( IPS_HOOKS_PATH . $classOverloader['filename'] ) )
 				{
-					/* Hooks: Do we have the hook file? */
-					require_once( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] );
+					require_once( IPS_HOOKS_PATH . $classOverloader['filename'] );/*noLibHook*/
 	            
 					if( class_exists( $classOverloader['className'] ) )
 					{
@@ -1275,7 +1199,7 @@ class IPSLib
 	 *
 	 * @param	array 	$dataArray		Data to be passed into the hooks
 	 * @param	string	$hookLocation	Location the data was sent from
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function doDataHooks( &$dataArray, $hookLocation )
 	{
@@ -1287,10 +1211,10 @@ class IPSLib
 			foreach( $hooksCache['dataHooks'][ $hookLocation ] as $r )
 			{
 				/* Check for hook file */
-				if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $r['filename'] ) )
+				if( is_file( IPS_HOOKS_PATH . $r['filename'] ) )
 				{
 					/* Check for hook class */
-					require_once( DOC_IPS_ROOT_PATH . 'hooks/' . $r['filename'] );
+					require_once( IPS_HOOKS_PATH . $r['filename'] );/*noLibHook*/
 					
 					if( class_exists( $r['className'] ) )
 					{
@@ -1321,13 +1245,13 @@ class IPSLib
 		/* Loop all apps and get back our locations! */
 		foreach( ipsRegistry::$applications as $app_dir => $application )
 		{
-			$dataHookLocations	= array();
+			$dataHookLocations = array();
 
-			if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/dataHookLocations.php' ) )
+			if( is_file( IPSLib::getAppDir( $app_dir ) . '/extensions/dataHookLocations.php' ) )
 			{
-				require_once( IPSLib::getAppDir( $app_dir ) . '/extensions/dataHookLocations.php' );
+				require_once( IPSLib::getAppDir( $app_dir ) . '/extensions/dataHookLocations.php' );/*noLibHook*/
 				
-				if ( count($dataHookLocations) )
+				if ( is_array($dataHookLocations) && count($dataHookLocations) )
 				{
 					$_locations = array_merge( $_locations, $dataHookLocations );
 				}
@@ -1401,7 +1325,7 @@ class IPSLib
 	 * Central setlocale method so we can adjust as needed
 	 *
 	 * @param	string		Locale to set
-	 * @return	void
+	 * @return	@e void
 	 * @link	http://community.invisionpower.com/tracker/issue-16386-language-locale-gives-error/
 	 * @link	http://community.invisionpower.com/tracker/issue-18424-change-lang-locale/
 	 */
@@ -1433,7 +1357,7 @@ class IPSLib
 	 */
 	static public function fbc_enabled()
 	{
-		return ( ipsRegistry::$settings['fbc_enable'] AND ipsRegistry::$settings['fbc_api_id'] AND ipsRegistry::$settings['fbc_secret'] ) ? TRUE : FALSE;
+		return ( ipsRegistry::$settings['fbc_enable'] AND ipsRegistry::$settings['fbc_appid'] AND ipsRegistry::$settings['fbc_secret'] ) ? TRUE : FALSE;
 	}
 	
 	/**
@@ -1484,32 +1408,39 @@ class IPSLib
 	}
 	
 	/**
-	 * Unpack group bitwise options
+	 * Loop through the input request and create an array of ids based on a string prefix
 	 *
-	 * @param	array
-	 * @param	bool		Do not warn on overwrite
-	 * @return  array
+	 * @param	string		Prefix
+	 * @return	array
 	 */
-	static public function unpackGroup( $group, $silence=false )
+	static public function fetchInputAsArray( $prefix='' )
 	{
-		/* Unpack bitwise fields */
-		$_tmp = IPSBWOptions::thaw( $group['g_bitoptions'], 'groups', 'global' );
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
 
-		if ( count( $_tmp ) )
+		$ids = array();
+
+		if( !$prefix )
 		{
-			foreach( $_tmp as $k => $v )
-			{
-				/* Trigger notice if we have DB field */
-				if ( $silence === false AND isset( $group[ $k ] ) )
-				{
-					trigger_error( "Thawing bitwise options for GROUPS: Bitwise field '$k' has overwritten DB field '$k'", E_USER_WARNING );
-				}
-
-				$group[ $k ] = $v;
-			}
+			return $ids;
 		}
 		
-		return $group;
+		//-----------------------------------------
+		// GET from checkboxes
+		//-----------------------------------------
+
+		foreach ( ipsRegistry::$request as $k => $v )
+		{
+			if ( $v && preg_match( "/^" . $prefix . '(\d+)$/', $k, $match ) )
+			{
+				$ids[] = $match[1];
+			}
+		}
+
+		$ids = self::cleanIntArray( $ids );
+		
+		return $ids;
 	}
 	
 	/**
@@ -1525,7 +1456,7 @@ class IPSLib
 	{
 		if ( ! defined( IPB_VERSION ) OR ! defined( IPB_LONG_VERSION ) )
 		{
-			require_once( IPS_ROOT_PATH . 'setup/sources/base/setup.php' );
+			require_once( IPS_ROOT_PATH . 'setup/sources/base/setup.php' );/*noLibHook*/
 			
 			$XMLVersions = IPSSetUp::fetchXmlAppVersions( $app );
 			$tmp         = $XMLVersions;
@@ -1554,15 +1485,15 @@ class IPSLib
 	{
 		$fields = array();
 		
-		foreach( array( 'gallery', 'blog', 'downloads', 'ccs', 'ipchat', 'nexus', 'subscriptions' ) as $app )
+		foreach( array( 'calendar', 'gallery', 'blog', 'downloads', 'ccs', 'ipchat', 'nexus', 'ipseo' ) as $app )
 		{
 			$_file = IPSLib::getAppDir( $app ) . '/setup/versions/install/sql/' . $app . '_mysql_tables.php';
 			
-			if ( file_exists( $_file ) )
+			if ( is_file( $_file ) )
 			{
 				$TABLE = array();
 				
-				require( $_file );
+				require( $_file );/*noLibHook*/
 				
 				foreach( $TABLE as $t )
 				{
@@ -1659,6 +1590,118 @@ class IPSLib
 		return $_default;
 	}
 	
+	/**
+	 * Build a global caches array from the database
+	 *
+	 * @return  @e array Array of global caches
+	 */
+	static public function buildGlobalCachesArray()
+	{
+		/* INIT */
+		$globalCaches = array();
+		
+		/* Get apps with global caches */
+		ipsRegistry::DB()->build( array( 'select' => 'app_global_caches',
+										 'from'   => 'core_applications',
+										 'where'  => "app_enabled=1 AND app_global_caches != '' AND app_global_caches " . ipsRegistry::DB()->buildIsNull( false )
+								 )		);
+		ipsRegistry::DB()->execute();
+		
+		while( $gc = ipsRegistry::DB()->fetch() )
+		{
+			$caches = explode( ',', $gc['app_global_caches'] );
+			
+			foreach( $caches as $key )
+			{
+				if ( $key )
+				{
+					$globalCaches[] = $key;
+				}
+			}
+		}
+		
+		/* Get hooks with global caches */
+		ipsRegistry::DB()->build( array( 'select' => 'hook_global_caches',
+										 'from'   => 'core_hooks',
+										 'where'  => "hook_enabled=1 AND hook_global_caches != '' AND hook_global_caches " . ipsRegistry::DB()->buildIsNull( false )
+								 )		);
+		ipsRegistry::DB()->execute();
+		
+		while( $gc = ipsRegistry::DB()->fetch() )
+		{
+			$caches = explode( ',', $gc['hook_global_caches'] );
+			
+			foreach( $caches as $key )
+			{
+				if ( $key )
+				{
+					$globalCaches[] = $key;
+				}
+			}
+		}
+		
+		/* Let's have only unique values and return */
+		$globalCaches = array_unique( $globalCaches );
+		
+		return $globalCaches;
+	}
+	
+	/**
+	 * Cache global caches
+	 *
+	 * @return	@e boolean
+	 * 
+	 * @exceptions
+	 * CANNOT_WRITE			Cannot write to cache file
+	 * NO_DATA_TO_WRITE		No data to write
+	 */
+	static public function cacheGlobalCaches()
+	{
+		/* Init vars */
+		$data			= '';
+		$globalCaches	= self::buildGlobalCachesArray();
+		
+		/* Got any caches? */
+		if ( count( $globalCaches ) )
+		{
+			$_date = gmdate( 'r', time() );
+			$_var  = var_export( $globalCaches, TRUE );
+			$data  = <<<EOF
+<?php
+/**
+ * Global Caches cache. Do not attempt to modify this file.
+ * Please modify the relevant setting for each application or hook
+ *
+ * Written: {$_date}
+ *
+ * Why? Because Tera says so this time :P
+ */
+
+\$GLOBAL_CACHES = {$_var};
+
+EOF;
+		}
+		
+		/* Got data to write? */
+		if ( $data )
+		{
+			if ( @file_put_contents( DOC_IPS_ROOT_PATH . 'cache/globalCaches.php', $data ) )
+			{
+				return TRUE;
+			}
+			else
+			{
+				throw new Exception( 'CANNOT_WRITE' );
+			}
+		}
+		else
+		{
+			/* No data? Delete any current file as well */
+			@unlink( DOC_IPS_ROOT_PATH . 'cache/globalCaches.php' );
+			throw new Exception( 'NO_DATA_TO_WRITE' );
+		}
+	}
+	
 	/**
 	 * Build furl templates from FURL extensions
 	 *
@@ -1702,7 +1745,7 @@ class IPSLib
 						if ( substr( $_name, 0, 1 ) != '.' )
 						{
 							/* Check if this app is enabled before including the templates.. */
-							$_check = $_apps[ $_name ];
+							$_check = isset($_apps[ $_name ]) ? $_apps[ $_name ] : array( 'app_public_title' => '', 'app_enabled' => 0 );
 
 							if ( $_check['app_public_title'] && $_check['app_enabled'] )
 							{
@@ -1737,11 +1780,11 @@ class IPSLib
 		/* Loop over the applications and build */
 		foreach( $apps as $path => $app_dir )
 		{
-			if ( file_exists( IPS_ROOT_PATH . $path . '/extensions/' . $furl_templates_filename ) )
+			if ( is_file( IPS_ROOT_PATH . $path . '/extensions/' . $furl_templates_filename ) )
 			{
 				$_SEOTEMPLATES = array();
 				
-				require( IPS_ROOT_PATH . $path . '/extensions/' . $furl_templates_filename );
+				require( IPS_ROOT_PATH . $path . '/extensions/' . $furl_templates_filename );/*noLibHook*/
 				
 				if ( is_array( $_SEOTEMPLATES ) && count( $_SEOTEMPLATES ) )
 				{
@@ -1805,105 +1848,6 @@ EOF;
 		return TRUE;
 	}
 	
-	/**
-	 * Rebuild the Sphinx conf
-	 *
-	 * @return	string		Null, or the new sphinx config
-	 */
-	static public function rebuildSphinxConfig()
-	{
-		//-----------------------------------------
-		// Init some sphinx vars
-		//-----------------------------------------
-
-		$sphinxTemplate	= '';
-		$sphinxCompiled	= '';
-		
-		//-----------------------------------------
-		// Got the template file?
-		//-----------------------------------------
-		
-		if( !file_exists( IPS_ROOT_PATH . '/extensions/sphinxTemplate.php' ) )
-		{
-			return null;
-		}
-
-		require_once( IPS_ROOT_PATH . '/extensions/sphinxTemplate.php' );
-		
-		//-----------------------------------------
-		// Does the template exist?
-		//-----------------------------------------
-		
-		if( !$sphinxTemplate )
-		{
-			return null;
-		}
-		
-		//-----------------------------------------
-		// Replace out the SQL details
-		//-----------------------------------------
-		
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONF_HOST-->"	, ipsRegistry::$settings['sql_host']	, $sphinxTemplate );
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONF_USER-->"	, ipsRegistry::$settings['sql_user']	, $sphinxTemplate );
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONF_PASS-->"	, ipsRegistry::$settings['sql_pass']	, $sphinxTemplate );
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONF_DATABASE-->", ipsRegistry::$settings['sql_database'], $sphinxTemplate );
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONF_PORT-->"	, ipsRegistry::$settings['sql_port'] ? ipsRegistry::$settings['sql_port'] : 3306, $sphinxTemplate );
-		
-		//-----------------------------------------
-		// Loop over the applications and build
-		//-----------------------------------------
-		
-		foreach( ipsRegistry::$applications as $app_dir => $application )
-		{
-			$appSphinxTemplate	= '';
-
-			if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' ) )
-			{
-				require_once( IPSLib::getAppDir( $app_dir ) . '/extensions/sphinxTemplate.php' );
-				
-				$sphinxCompiled .= $appSphinxTemplate;
-			}
-		}
-		
-		//-----------------------------------------
-		// Replace DB prefix
-		//-----------------------------------------
-		
-		$sphinxCompiled	= str_replace( "<!--SPHINX_DB_PREFIX-->"	, ipsRegistry::$settings['sql_tbl_prefix'], $sphinxCompiled );
-
-		//-----------------------------------------
-		// And replace out the content with the compilation
-		//-----------------------------------------
-		
-		$sphinxTemplate	= str_replace( "<!--SPHINX_CONTENT-->", $sphinxCompiled, $sphinxTemplate );
-		
-		//-----------------------------------------
-		// Replace out the /var/sphinx/ path
-		//-----------------------------------------
-		
-		$sphinxTemplate	= str_replace( "<!--SPHINX_BASE_PATH-->", rtrim( ipsRegistry::$settings['sphinx_base_path'], '/' ), $sphinxTemplate );
-		
-		$sphinxTemplate = str_replace( "<!--SPHINX_PORT-->", ipsRegistry::$settings['search_sphinx_port'], $sphinxTemplate );
-		
-		//-----------------------------------------
-		// Wildcard support on?
-		//-----------------------------------------
-		
-		if ( ipsRegistry::$settings['sphinx_wildcard'] )
-		{
-			$sphinxTemplate = str_replace( '#infix_fields' , 'infix_fields', $sphinxTemplate );
-			$sphinxTemplate = str_replace( '#min_infix_len', 'min_infix_len', $sphinxTemplate );
-			$sphinxTemplate = str_replace( '#enable_star'  , 'enable_star', $sphinxTemplate );
-		}
-		
-		//-----------------------------------------
-		// Return the new content
-		//-----------------------------------------
-		
-		return $sphinxTemplate;
-		
-	}
-	
 	/**
 	 * Recursively cleans keys and values and
 	 * inserts them into the input array
@@ -2019,80 +1963,6 @@ EOF;
 		}
 	}
 	
-	/**
-	 * Determines if member is viewing images
-	 * If not, unparses smilies
-	 *
-	 * @param 	string			Raw input text to parse
-	 * @return	string			Parsed text ready to be stored in database
-	 */
-	public static function memberViewImages( $text )
-	{
-		//-----------------------------------------
-		// Parse
-		//-----------------------------------------
-		
-		if ( ! ipsRegistry::member()->getProperty('view_img') )
-		{
-			//-----------------------------------------
-			// Second regex needed for content caching
-			//-----------------------------------------
-			
-			$text	= self::unconvertSmilies( $text );
-			$text	= preg_replace( '/<img src=[\'\"](.+?)[\"\'](?:[^>]+?)class=[\'\"]bbc_img[\"\'](?:[^\/>]+?)\/>/', "\\1", $text );
-			
-			return $text;
-		}
-		else
-		{
-			return $text;
-		}
-	}
-
-	/**
-	 * Unconvert smilies
-	 *
-	 * @param	string		Raw text
-	 * @return	string		Converted text
-	 */
-	public static function unconvertSmilies( $txt )
-	{
-		//-----------------------------------------
-		// Unconvert smilies
-		//-----------------------------------------
-
-		$txt = str_replace( "<#EMO_DIR#>", "&lt;#EMO_DIR&gt;", $txt );
-
-		preg_match_all( "#(<img(?:[^>]+?)class=['\"]bbc_emoticon[\"'](?:[^>]+?)alt=['\"](.+?)[\"'](?:[^>]+?)?>)#is", $txt, $matches );
-
-		if( is_array($matches[1]) AND count($matches[1]) )
-		{
-			foreach( $matches[1] as $index => $value )
-			{				
-				if ( count( ipsRegistry::cache()->getCache('emoticons') ) > 0 )
-				{
-					foreach( ipsRegistry::cache()->getCache('emoticons') as $row )
-					{
-						$_emoCode = str_replace( '<', '&lt;', str_replace( '>', '&gt;', $row['typed'] ) );
-						
-						if( $matches[2][ $index ] == $_emoCode )
-						{
-							/* We need to make sure emoticons are wrapped in spaces so they are parsed properly */
-							//$txt = str_replace( $value, ' ' . $_emoCode . ' ', $txt );
-							/* We are no longer matching opening/closing "space" so no need to add it */
-							$txt = str_replace( $value, $_emoCode, $txt );
-							continue 2;
-						}
-					}
-				}
-			}
-		}
-
-		$txt = str_replace( "&lt;#EMO_DIR&gt;", "<#EMO_DIR#>", $txt );
-		
-		return $txt;
-	}
-	
 	/**
 	 * Fetch emoticons as JSON for editors, etc
 	 *
@@ -2156,22 +2026,24 @@ EOF;
 	 *
 	 * @return	string		JSON
 	 */
-	static public function fetchBbcodeAsJson()
+	static public function fetchBbcodeAsJson( $filter=array() )
 	{
 		$bbcodes			= array();
-		$protectedBbcodes	= array(
-									'right', 'left', 'center', 'b', 'i', 'u', 'url', 'img', 'quote', 'indent',
-									'list', 'strike', 'sub', 'sup', 'email', 'background', 'color', 'size', 'font', 'media'
+		$currentBbcodes		= ipsRegistry::cache()->getCache('bbcode');
+		$protectedBbcodes	= array('right', 'left', 'center', 'b', 'i', 'u', 'url', 'img', 'quote', 'indent', 'snapback',
+									'list', 'strike', 'sub', 'sup', 'email', 'background', 'color', 'size', 'font'
 									);
-
-		foreach( ipsRegistry::cache()->getCache('bbcode') as $bbcode )
+		
+		/* Remove protected bbcodes */
+		foreach( $protectedBbcodes as $_key )
 		{
-			if( in_array( $bbcode['bbcode_tag'], $protectedBbcodes ) )
-			{
-				continue;
-			}
-
-			if( $bbcode['bbcode_groups'] != 'all' )
+			unset( $currentBbcodes[ $_key ] );
+		}
+		 
+		/* Get all others */
+		foreach( $currentBbcodes as $bbcode )
+		{
+			if ( $bbcode['bbcode_groups'] != 'all' )
 			{
 				$pass		= false;
 				$groups		= array_diff( explode( ',', $bbcode['bbcode_groups'] ), array('') );
@@ -2187,7 +2059,15 @@ EOF;
 					}
 				}
 				
-				if( !$pass )
+				if ( ! $pass )
+				{
+					continue;
+				}
+			}
+			
+			if ( ! empty( $filter['skip'] ) && is_array( $filter['skip'] ) )
+			{ 
+				if ( in_array( $bbcode['bbcode_tag'], $filter['skip'] ) )
 				{
 					continue;
 				}
@@ -2211,31 +2091,6 @@ EOF;
 		
 		return IPSText::simpleJsonEncode($bbcodes);
 	}
-	
-	/**
-	 * Create profile link 
-	 *
-	 * @param	string		User's display name
-	 * @param	integer		User's DB ID
-	 * @param	string		SEO display name
-	 * @param	string		Classname
-	 * @return	string		Parsed a href link
-	 * @since	2.0
-	 */
-	static public function makeProfileLink($name, $id="", $_seoName="", $className='')
-	{
-		$_seoName = ( $_seoName ) ? $_seoName : IPSText::makeSeoTitle( $name );
-		$_class   = ( $className ) ? ' class="' . $className . '" ' : '';
-		
-		if ($id > 0)
-		{
-			return "<a hovercard-ref=\"member\" hovercard-id=\"{$id}\" class=\"_hovertrigger\" href='" . ipsRegistry::getClass('output')->buildSEOUrl( 'showuser=' . $id, 'public', $_seoName, 'showuser' ) . "'" . $_class .">{$name}</a>";
-		}
-		else
-		{
-			return $name;
-		}
-	}
 
 	/**
 	 * Runs the specified member sync module, takes a variable number of arguments.
@@ -2243,7 +2098,7 @@ EOF;
 	 * @param	string	$module		The module to run, ex: onCreateAccount, onRegisterForm, etc
 	 * @param	mixed	...			Remaining params should match the module being called. ex: array of member data for onCreateAccount,
      *								or an id and email for onEmailChange
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function runMemberSync( $module )
 	{
@@ -2264,19 +2119,19 @@ EOF;
 				$_file  = self::getAppDir( $app['app_directory'] ) . '/extensions/memberSync.php';
 				
 				/* Check for the file */
-				if( file_exists( $_file ) )
+				if ( is_file( $_file ) )
 				{
 					/* Get the file */
 					$_class = self::loadLibrary( $_file, $app['app_directory'] . 'MemberSync', $app['app_directory'] );
 					
 					/* Check for the class */
-					if( class_exists( $_class ) )
+					if ( class_exists( $_class ) )
 					{
 						/* Create an object */
 						$_obj = new $_class();
 
 						/* Check for the module */
-						if( method_exists( $_obj, $module ) )
+						if ( method_exists( $_obj, $module ) )
 						{
 							/* Call it */
 							call_user_func_array( array( $_obj, $module ), $params );
@@ -2398,77 +2253,14 @@ EOF;
 		
 		return $_b;
 	}
-	
-	/**
-	 * Merges two arrays using a custom call back function (like array_merge using usort)
-	 * <code>
-	 * $a = array( 'red'    => 100,
-	 *			  'green'  => 200,
-	 *			  'blue'   => 300,
-	 *			  'orange' => 600 );
-	 *
-	 * $b = array( 'red'   => 101,
-	 * 			  'green' => 199,
-	 *			  'blue'  => 305,
-	 *			  'black' => 100 );
-	 *
-	 * Merge both arrays, finding the highest value in each
-	 * print_r( array_umerge( $a, $b, create_function( '$a,$b', 'return $a < $b;' ) ) );
-	 * Produces:
-	 * Array
-	 * (
-	 *	[red]    => 101
-	 *	[green]	 => 200
-	 *	[blue]   => 305
-	 *	[orange] => 600
-	 *	[black]  => 100
-	 * )
-	 * </code>
-	 *
-	 * @param	array 		Array to merge
-	 * @param	array 		Array to merge
-	 * @param	string		Callback function
-	 * @return	array 		Merged array
-	 * @deprecated			This will likely be removed in a future version
-	 */
-	static public function arrayUmerge( $array1, $array2, $callback )
-	{
-		$return = array();
 
-		if ( ! is_array( $array1 ) AND ! is_array( $array2 ) )
-		{
-			return FALSE;
-		}
-
-		foreach( $array1 as $_k1 => $_v1 )
-		{
-			$return[ $_k1 ] = $_v1;
-
-			/* Key exists in second array - so compare */
-			if ( isset( $array2[$_k1] ) )
-			{
-				if ( call_user_func( $callback, $_v1, $array2[$_k1] ) )
-				{
-					$return[ $_k1 ] = $array2[$_k1];
-				}
-			}
-		}
-
-		/* Now check for keys in the second array that aren't in the first */
-		foreach( $array2 as $_k2 => $_v2 )
-		{
-			if ( ! isset( $array1[ $_k2 ] ) )
-			{
-				$return[ $_k2 ] = $_v2;
-			}
-		}
-
-		return $return;
-	}
-	
 	/**
 	 * Merges arrays like array_merge_recursive but replaces indentical keys
 	 *
+	 * @param	array 		Array to merge
+	 * @param	array 		Array to merge
+	 * @param	array 		...
+	 * @return	array 		Merged array
 	 */
 	static public function arrayMergeRecursive()
 	{
@@ -2563,24 +2355,6 @@ EOF;
 		return false;
 	}
 	
-	/**
-	 * Check to see if any applications support 'like' system
-	 *
-	 * @return	bool		True if there are any applications that support the 'like' system, otherwise false
-	 */
-	static public function haveAppsWithLike()
-	{
-		foreach( ipsRegistry::$applications as $_app => $data )
-		{
-			if( $data['_supports_likes'] )
-			{
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
 	/**
 	 * Get the application title.  Uses lang file keys if present.
 	 *
@@ -2629,8 +2403,7 @@ EOF;
 			$location = ipsRegistry::$applications[ $app ]['app_location'];
 		}
 
-		$pathBit       = IPS_ROOT_PATH . 'applications';
-		$modulesFolder = ( IPS_AREA != 'admin' ) ? 'modules_public' : 'modules_admin';
+		$pathBit = IPS_ROOT_PATH . 'applications';
 
 		switch ( $location )
 		{
@@ -2648,6 +2421,8 @@ EOF;
 
 		if ( $module )
 		{
+			$modulesFolder = ( IPS_AREA != 'admin' ) ? 'modules_public' : 'modules_admin';
+			
 			return $pathBit . "/" . $modulesFolder . "/" . $module;
 		}
 		else
@@ -2743,37 +2518,56 @@ EOF;
 			case 'user':
 				$_ck = 'can_userContent';
 			break;
+			case 'vncwithfollowfilter':
+				$_ck = 'can_vnc_filter_by_followed';
+			break;
+			case 'vncwithunreadcontent':
+				$_ck = 'can_vnc_unread_content';
+			break;
 		}
-			
+
 		/* got anything? */
 		if ( ! is_array( self::$_searchConfigs ) OR ! count( self::$_searchConfigs ) )
 		{
+			$_needRebuild	= false;
+
 			foreach( ipsRegistry::$applications as $_app => $data )
 			{
 				/* use the cache if we can */
 				if ( ! IN_DEV AND isset( ipsRegistry::$applications[$_app]['search'] ) AND is_array( ipsRegistry::$applications[$_app]['search'] ) AND count( ipsRegistry::$applications[$_app]['search'] ) )
 				{
-					self::$_searchConfigs[ $_app ] = ipsRegistry::$applications[$_app]['search'];
+					if( IPSLib::appIsInstalled( $_app ) )
+					{
+						self::$_searchConfigs[ $_app ] = ipsRegistry::$applications[$_app]['search'];
+					}
 				}
 				else
 				{
 					$_file = IPSLib::getAppDir( $_app ) . '/extensions/search/config.php';
 					
-					if ( IPSLib::appIsInstalled( $_app ) AND file_exists( $_file ) )
+					if ( IPSLib::appIsInstalled( $_app ) AND is_file( $_file ) )
 					{
 						$CONFIG = array();
-						require( $_file );
+						require( $_file );/*noLibHook*/
 						
 						if ( is_array( $CONFIG ) AND count( $CONFIG ) )
 						{
 							self::$_searchConfigs[ $_app ] = $CONFIG;
 						
 							unset( $CONFIG );
+							
+							$_needRebuild	= true;
 						}
 					}
 				}
 			}
 		}
+		
+		/* Do we need to rebuild application cache because we checked for search configs manually? */
+		if( $_needRebuild )
+		{
+			ipsRegistry::cache()->rebuildCache( 'app_cache', 'global' );
+		}
 			
 		/* return */
 		if ( isset( self::$_searchConfigs[ $app ] ) AND is_array( self::$_searchConfigs[ $app ] ) AND count( self::$_searchConfigs[ $app ] ) )
@@ -2809,6 +2603,108 @@ EOF;
 
     	return FALSE;
     }
+
+	/**
+	 * Verify an app supports an extension
+	 *
+	 * @param	string	Application
+	 * @param	array	Array of extensions to check
+	 * @return  bool
+	 */
+	static public function appSupportsExtension( $app, $extensions=array() )
+	{
+		if( !$app )
+		{
+			return false;
+		}
+		
+		if( !count($extensions) )
+		{
+			return true;
+		}
+		
+		$application	= ipsRegistry::$applications[ $app ];
+		
+		if( $application['app_directory'] )
+		{
+			$c = 0;
+			
+			foreach( $extensions as $e )
+			{
+				if ( ! empty( $application['extensions'][ $e ] ) )
+				{
+					$c++;
+				}
+			}
+			
+			if ( $c == count( $extensions ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+    
+    /**
+     * Get all enabled applications
+     * 
+     * @param	array	Array of extensions an application must have to be returned
+     * @return  Array
+     */
+    static public function getEnabledApplications( $extensions=array() )
+    {
+    	$apps 		= array();
+    	$extensions = is_string( $extensions ) ? array( $extensions ) : ( is_array( $extensions ) ? $extensions : array() );
+    	
+		static $cache	= array();
+		$_key			= md5( implode( ',', $extensions ) );
+		
+		if( $cache[ $_key ] )
+		{
+			return $cache[ $_key ];
+		}
+    	
+    	if ( ! is_array( ipsRegistry::$applications ) OR ! count( ipsRegistry::$applications ) )
+    	{
+    		return array();
+    	}
+    	
+    	foreach( ipsRegistry::$applications as $appDir => $appData )
+    	{
+    		if ( self::appIsInstalled( $appDir, true ) )
+    		{
+    			if ( count($extensions) )
+    			{
+    				if ( is_array( $appData['extensions'] ) )
+    				{
+    					$c = 0;
+    					
+    					foreach( $extensions as $e )
+    					{
+    						if ( ! empty( $appData['extensions'][ $e ] ) )
+    						{
+    							$c++;
+    						}
+    					}
+    					
+    					if ( $c == count( $extensions ) )
+    					{
+    						$apps[ $appDir ] = $appData;
+    					}
+    				}
+    			}
+    			else
+    			{
+    				$apps[ $appDir ] = $appData;
+    			}
+    		}
+    	}
+    	
+    	$cache[ $_key ]	= $apps;
+    	
+    	return $cache[ $_key ];
+    }
     
     /**
      * Check to see if the givem module is currently installed and enabled
@@ -2829,7 +2725,8 @@ EOF;
     		}
     	}
     	
-    	return FALSE;
+    	// Undefined, retun true
+    	return TRUE;
     }
 
 	/**
@@ -2970,7 +2867,7 @@ EOF;
 	 * of loading an interface
 	 *
 	 * @param	string		File name
-	 * @return	void
+	 * @return	@e void
 	 * @since	3.0.0
 	 */
 	static public function loadInterface( $filename )
@@ -2979,39 +2876,7 @@ EOF;
 		// Very simple, currently.
 		//-----------------------------------------
 
-		include_once( IPS_ROOT_PATH . 'sources/interfaces/' . $filename );
-	}
-
-	/**
-	 * Create a random 15 character password
-	 *
-	 * @return	string	Password
-	 * @since	2.0
-	 */
-	public static function makePassword()
-	{
-		$pass = "";
-
-		// Want it random you say, eh?
-		// (enter evil laugh)
-
-		$unique_id 	= uniqid( mt_rand(), TRUE );
-		$prefix		= IPSMember::generatePasswordSalt();
-		$unique_id .= md5( $prefix );
-
-		usleep( mt_rand(15000,1000000) );
-		// Hmm, wonder how long we slept for
-
-		$new_uniqueid = uniqid( mt_rand(), TRUE );
-
-		$final_rand = md5( $unique_id . $new_uniqueid );
-
-		for ($i = 0; $i < 15; $i++)
-		{
-			$pass .= $final_rand{ mt_rand(0, 31) };
-		}
-
-		return $pass;
+		require_once( IPS_ROOT_PATH . 'sources/interfaces/' . $filename );/*noLibHook*/
 	}
 	
 	/**
@@ -3084,7 +2949,6 @@ EOF;
 	 * @param	array	Current dimensions + max dimensions
 	 * @return	array	New image dimensions
 	 * @since	2.0
-	 * @todo	[Future] We may want to consider moving this to kernel classImage.php.  Method exists there, protected, already.
 	 */
 	public static function scaleImage($arg)
 	{
@@ -3111,57 +2975,6 @@ EOF;
 
 		return $ret;
 	}
-
-	/**
-	 * Format name based on group suffix/prefix
-	 *
-	 * @param	string		User's display name
-	 * @param	integer		User's group ID
-	 * @param	string  	Optional prefix override (uses group setting if not provided)
-	 * @param	string  	Optional suffix override (uses group setting if not provided)
-	 * @return	string		Formatted name
-	 * @since	2.2
-	 */
-	public static function makeNameFormatted($name='', $group_id="", $prefix="", $suffix="")
-	{
-		if ( ipsRegistry::$settings['ipb_disable_group_psformat'] )
-		{
-			return $name;
-		}
-
-		if ( ! $group_id )
-		{
-			$group_id = 0;
-		}
-
-		$groupCache = ipsRegistry::cache()->getCache('group_cache');
-
-		if ( ! $prefix )
-		{
-			if( $groupCache[ $group_id ]['prefix'] )
-			{
-				$prefix = $groupCache[ $group_id ]['prefix'];
-			}
-		}
-
-		if( ! $suffix )
-		{
-			if( $groupCache[ $group_id ]['suffix'] )
-			{
-				$suffix = $groupCache[ $group_id ]['suffix'];
-			}
-		}
-		
-		if ( ! $name )
-		{
-			if( $groupCache[ $group_id ]['g_title'] )
-			{
-				$name = $groupCache[ $group_id ]['g_title'];
-			}
-		}
-
-		return $prefix.$name.$suffix;
-	}
 	
 	/**
 	 * Retrieve all IP addresses a user (or multiple users) have used
@@ -3180,17 +2993,16 @@ EOF;
 		$tables			= array(
 							'admin_logs'			=> array( 'member_id', 'ip_address', 'ctime' ),
 							'dnames_change'			=> array( 'dname_member_id', 'dname_ip_address', 'dname_date' ),
-							'email_logs'			=> array( 'from_member_id', 'from_ip_address', 'email_date' ),
 							'members'				=> array( 'member_id', 'ip_address', 'joined' ),
 							'message_posts'			=> array( 'msg_author_id', 'msg_ip_address', 'msg_date' ),
 							'moderator_logs'		=> array( 'member_id', 'ip_address', 'ctime' ),
-							'posts'					=> array( 'author_id', 'ip_address', 'post_date' ),
-							'profile_comments'		=> array( 'comment_by_member_id', 'comment_ip_address', 'comment_date' ),
+							'posts'					=> array( 'author_id', 'ip_address', 'post_date', array( 'pid' ) ),
+							'member_status_updates'	=> array( 'status_author_id', 'status_author_ip', 'status_date' ),
 							'profile_ratings'		=> array( 'rating_by_member_id', 'rating_ip_address', '' ),
 							//'sessions'				=> array( 'member_id', 'ip_address', 'running_time' ),
 							'topic_ratings'			=> array( 'rating_member_id', 'rating_ip_address', '' ),
 							'validating'			=> array( 'member_id', 'ip_address', 'entry_date' ),
-							'voters'				=> array( 'member_id', 'ip_address', 'vote_date' ),
+							'voters'				=> array( 'member_id', 'ip_address', 'vote_date', array( 'tid' ) ),
 							'error_logs'			=> array( 'log_member', 'log_ip_address', 'log_date' ),
 							);
 
@@ -3201,7 +3013,7 @@ EOF;
 		
 		foreach( ipsRegistry::$applications as $app_dir => $data )
 		{
-			if( file_exists( IPSLib::getAppDir( $app_dir ) . "/extensions/coreExtensions.php") )
+			if( is_file( IPSLib::getAppDir( $app_dir ) . "/extensions/coreExtensions.php") )
 			{
 				$classX = IPSLib::loadLibrary( IPSLib::getAppDir( $app_dir ) . "/extensions/coreExtensions.php", $app_dir . '_findIpAddress', $app_dir );
 				
@@ -3243,9 +3055,14 @@ EOF;
 				{
 					if( $fields[2] )
 					{
-						$extra = ',' . $fields[2] . ' as date';
+						$extra	= ', ' . $fields[2] . ' as date';
 					}
-				
+					
+					if( $fields[3] AND is_array($fields[3]) )
+					{
+						$extra	.= ', ' . implode( ', ', $fields[3] );
+					}
+
 					ipsRegistry::DB()->build( array(
 													'select'	=> $fields[1] . $extra . ', member_id', 
 													'from'		=> $tablename, 
@@ -3259,7 +3076,12 @@ EOF;
 				{
 					if( $fields[2] )
 					{
-						$extra = ', c.' . $fields[2] . ' as date';
+						$extra	= ', c.' . $fields[2] . ' as date';
+					}
+					
+					if( $fields[3] AND is_array($fields[3]) )
+					{
+						$extra	.= ', c.' . implode( ', c.', $fields[3] );
 					}
 					
 					$extra .= ', c.' . $fields[1] . ' as ip_address, c.' . $fields[0];
@@ -3343,6 +3165,12 @@ EOF;
 			return '';
 		}
 		
+		/* Disable for bots */
+		if( ipsRegistry::member()->is_not_human )
+		{
+			return '';
+		}
+		
 		$canon  = ipsRegistry::getClass('output')->fetchRootDocUrl();
 		$url    = ( $url ) ? $url : ipsRegistry::$settings['this_url'];
 		$canon  = IPSText::base64_encode_urlSafe( ( $canon ) ? $canon : $url );
@@ -3373,39 +3201,6 @@ EOF;
 		return ipsRegistry::getClass('output')->getTemplate( $group )->$bit( $cache, $title, $canon, $cssClass );
 	}
 	
-	/**
-	 * Checks to see if the logged in user can recieve mobile notifications
-	 *
-	 * @param	array 		$memberData		Optional, logged in user will be used if this is not passed in
-	 * @return	BOOL
-	 */
-	static public function canReceiveMobileNotifications( $memberData=array() )
-	{
-		/* INIT */
-		$memberData = ( is_array( $memberData ) && count( $memberData ) ) ? $memberData : ipsRegistry::member()->fetchMemberData();
-
-		/* Check to see if notifications are enabled */
-		if( ! ipsRegistry::$settings['iphone_notifications_enabled'] )
-		{
-			return false;
-		}
-		
-		/* Check to see if the user has permission to get notifications */
-		if( ipsRegistry::$settings['iphone_notifications_groups'] )
-		{
-			if( ipsMember::isInGroup( $memberData, explode( ',', ipsRegistry::$settings['iphone_notifications_groups'] ) ) )
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
 	/**
 	 * Quick function to see if a string is serialized
 	 * End up using something similar throughout the code
@@ -3427,6 +3222,92 @@ EOF;
     	
     	return false; 
 	}
+	
+	/**
+	 * Check for an IPv4 address
+	 * 
+	 * @param	string	IP address
+	 * @return	boolean
+	 */
+	static public function validateIPv4( $IP ) 
+	{
+		preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $IP, $match );
+		
+	    return ( $match[0] ) ? true : false; 
+	} 
+	
+	/**
+	 * Check an IPv6 address
+	 *
+	 * @link	http://crisp.tweakblogs.net/blog/3049/ipv6-validation-more-caveats.html
+	 * @param	string	IP address
+	 * @return	boolean
+	 */
+	static public function validateIPv6( $IP ) 
+	{ 
+		if ( strlen($IP) < 3 )
+	    {
+	        return $IP == '::';
+	    }
+	
+	    if ( strpos( $IP, '.' ) ) 
+	    { 
+	        $lastcolon = strrpos($IP, ':');
+	         
+	        if ( ! ( $lastcolon && self::validateIPv4( substr( $IP, $lastcolon + 1) ) ) )
+	        {
+	            return false; 
+			}
+			
+	        $IP = substr( $IP, 0, $lastcolon ) . ':0:0'; 
+	    } 
+	
+	    if ( strpos( $IP, '::' ) === false ) 
+	    { 
+	        return preg_match('/\A(?:[a-f0-9]{1,4}:){7}[a-f0-9]{1,4}\z/i', $IP); 
+	    } 
+	
+	    $colonCount = substr_count($IP, ':');
+	    
+	    if ( $colonCount < 8 ) 
+	    { 
+	        return preg_match('/\A(?::|(?:[a-f0-9]{1,4}:)+):(?:(?:[a-f0-9]{1,4}:)*[a-f0-9]{1,4})?\z/i', $IP); 
+	    } 
+	
+	    // special case with ending or starting double colon 
+	    if ( $colonCount == 8 ) 
+	    { 
+	        return preg_match('/\A(?:::)?(?:[a-f0-9]{1,4}:){6}[a-f0-9]{1,4}(?:::)?\z/i', $IP); 
+	    } 
+	
+	    return false; 
+	}
+	
+	/**
+	 * Has an active license or not
+	 * @param	boolean	Allow perpetual license to count.
+	 * @return boolean
+	 */
+	static public function hasActiveLicense( $allowPerpetual=true )
+	{
+		//return true;
+		$licenseData = ipsRegistry::cache()->getCache( 'licenseData' );
+
+		if ( ( ! $licenseData OR ! $licenseData['key']['_expires'] OR $licenseData['key']['_expires'] < IPS_UNIX_TIME_NOW OR $licenseData['key']['_expires'] == 9999999999 ) )
+		{
+			return false;
+		}
+		
+		if ( $allowPerpetual !== true )
+		{
+			if ( stristr( $licenseData['name'], 'perpetual' ) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
 }
 
 /**
@@ -3448,12 +3329,12 @@ class IPSDebug
 	 *
 	 * @var		array 		Messages
 	 */
-	static private $_messages = array();
+	static protected $_messages = array();
 
 	/**
 	 * Turn off constructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function __construct() {}
 
@@ -3462,13 +3343,13 @@ class IPSDebug
 	 *
 	 * @var		integer		Start time
 	 */
-	static private $_starttime;
+	static protected $_starttime;
 
 	/**
 	 * Add message
 	 *
 	 * @param	string
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function addMessage( $message )
 	{
@@ -3480,36 +3361,40 @@ class IPSDebug
 	 *
 	 * @param	string	$method		Method to call
 	 * @param	string	$vars		Parameters to pass
-	 * @return	void
+	 * @return	@e void
 	 * @link	http://www.firephp.org/HQ/
 	 */
 	static public function fireBug( $method, $parameters=array() )
 	{
-		if( IN_DEV )
+		if ( IN_DEV )
 		{
-			if( !class_exists( 'FB' ) )
+			try
 			{
-				require_once( IPS_KERNEL_PATH . '/FirePHPCore/fb.php' );
-			}
-			
-			if( $method == 'registerExceptionHandler' )
-			{
-				$firephp = FirePHP::getInstance(true);
-				$firephp->registerExceptionHandler();
-			}
-			
-			if( $method == 'registerErrorHandler' )
-			{
-				$firephp = FirePHP::getInstance(true);
-				$firephp->registerErrorHandler();
-			}
-
-			if( method_exists( 'FB', $method ) )
-			{
-				$function	= 'FB::' . $method;
-
-				call_user_func_array( $function, $parameters );
+				if( !class_exists( 'FB' ) )
+				{
+					require_once( IPS_KERNEL_PATH . '/FirePHPCore/fb.php' );/*noLibHook*/
+				}
+				
+				if( $method == 'registerExceptionHandler' )
+				{
+					$firephp = FirePHP::getInstance(true);
+					$firephp->registerExceptionHandler();
+				}
+				
+				if( $method == 'registerErrorHandler' )
+				{
+					$firephp = FirePHP::getInstance(true);
+					$firephp->registerErrorHandler();
+				}
+	
+				if( method_exists( 'FB', $method ) )
+				{
+					$function	= 'FB::' . $method;
+	
+					call_user_func_array( $function, $parameters );
+				}
 			}
+			catch( Exception $e ) { }
 		}
 	}
 	
@@ -3576,7 +3461,7 @@ class IPSDebug
 	 * @param	string	Error string
 	 * @param	string	Error file
 	 * @param	string	Error line number
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function errorHandler( $errno, $errstr, $errfile, $errline )
 	{
@@ -3628,7 +3513,7 @@ class IPSDebug
 			{
 				foreach( explode( ',', IPS_ERROR_CAPTURE ) as $class )
 				{
-					if ( preg_match( "#/" . preg_quote( $class, '#' ) . "\.#", $errfile ) )
+					if ( preg_match( '#/' . preg_quote( $class, '#' ) . '\.#', $errfile ) )
 					{
 						self::addLogMessage( $message, "phpNotices", false, true );
 						break;
@@ -3647,7 +3532,7 @@ class IPSDebug
 	 * @param	mixed	False, or an array of vars to include in log
 	 * @param	bool	Force log even if IPS_LOG_ALL is off - handy for on-the-fly debugging
 	 * @param	bool	Unlink file before writing
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function addLogMessage( $message, $file='debugLog', $array=FALSE, $force=FALSE, $unlink=FALSE )
 	{
@@ -3686,7 +3571,7 @@ class IPSDebug
 	 *
 	 * @param	string		Complete PHP error string
 	 * @param	string		Text evaluated by PHP
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function showTemplateError( $errorText, $evalCode )
 	{
@@ -3711,7 +3596,7 @@ class IPSDebug
 		/* Anything we can deal with? */
 		if ( strstr( $errorText, "eval()'d code" ) )
 		{
-			preg_match( "#eval\(\)'d code</b> on line <b>(\d+?)</b>#", $errorText, $matches );
+			preg_match( '#eval\(\)\'d code</b> on line <b>(\d+?)</b>#', $errorText, $matches );
 
 			if ( $matches[1] )
 			{
@@ -3789,7 +3674,7 @@ class IPSDebug
 	/**
 	 * Start a timer
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function startTimer()
     {
@@ -3906,7 +3791,7 @@ class IPSDebug
 		        |	Can also be obtained from COM, but it's extremely slow...
 		        ---------------------------------------------------------------*/
 	        	
-	        	$serverstats = @shell_exec("typeperf \"Processor(_Total)\% Processor Time\" -sc 1");
+	        	$serverstats = @shell_exec('typeperf \"Processor(_Total)\% Processor Time\" -sc 1');
 	        	
 	        	if( $serverstats )
 	        	{
@@ -3920,7 +3805,7 @@ class IPSDebug
         	{
 				if ( $serverstats = @exec("uptime") )
 				{
-					preg_match( "/(?:averages)?\: ([0-9\.]+)(,|)[\s]+([0-9\.]+)(,|)[\s]+([0-9\.]+)/", $serverstats, $load );
+					preg_match( '/(?:averages)?\: ([0-9\.]+)(,|)[\s]+([0-9\.]+)(,|)[\s]+([0-9\.]+)/', $serverstats, $load );
 
 					$load_limit = $load[1];
 				}
@@ -3958,7 +3843,7 @@ class IPSCookie
 	 *
 	 * @var		array
 	 */
-	static private $_cookiesSet = array();
+	static protected $_cookiesSet = array();
 
     /**
 	 * Set a cookie.
@@ -3969,7 +3854,7 @@ class IPSCookie
 	 * @param	string		Cookie value
 	 * @param	integer		Is sticky flag
 	 * @param	integer		Number of days to expire cookie in
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.0
 	 */
     static public function set( $name, $value="", $sticky=1, $expires_x_days=0 )
@@ -3978,7 +3863,7 @@ class IPSCookie
 		// Check
 		//-----------------------------------------
 
-        if ( isset( ipsRegistry::$settings['no_print_header'] ) AND ipsRegistry::$settings['no_print_header'] )
+        if ( !empty( ipsRegistry::$settings['no_print_header'] ) )
         {
         	return;
         }
@@ -4094,7 +3979,7 @@ class IPSText
 	 *
 	 * @var		object
 	 */
-	static private $classConvertCharset;
+	static protected $classConvertCharset;
 
 	/**
 	 * Default document character set
@@ -4115,15 +4000,70 @@ class IPSText
 	 *
 	 * @var		array
 	 */
-	static private $_internalClasses = array();
+	static protected $_internalClasses = array();
 
 	/**
 	 * Ensure no one can create this as an object
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function __construct() {}
 
+	/**
+	 * Cleans/gets a file extension
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	static public function getFileExtension( $string )
+	{
+		return ( strstr( $string, '.' ) ) ? strtolower( str_replace( ".", "", substr( $string, strrpos( $string, '.' ) ) ) ) : strtolower( $string );
+	}
+
+	/**
+	 * Unconvert smilies
+	 *
+	 * @param	string		Raw text
+	 * @return	string		Converted text
+	 */
+	public static function unconvertSmilies( $txt )
+	{
+		//-----------------------------------------
+		// Unconvert smilies
+		//-----------------------------------------
+
+		$txt = str_replace( "<#EMO_DIR#>", "&lt;#EMO_DIR&gt;", $txt );
+
+		preg_match_all( "#(<img(?:[^>]+?)class=['\"]bbc_emoticon[\"'](?:[^>]+?)alt=['\"](.+?)[\"'](?:[^>]+?)?>)#is", $txt, $matches );
+
+		if( is_array($matches[1]) AND count($matches[1]) )
+		{
+			foreach( $matches[1] as $index => $value )
+			{				
+				if ( count( ipsRegistry::cache()->getCache('emoticons') ) > 0 )
+				{
+					foreach( ipsRegistry::cache()->getCache('emoticons') as $row )
+					{
+						$_emoCode = str_replace( '<', '&lt;', str_replace( '>', '&gt;', $row['typed'] ) );
+						
+						if( $matches[2][ $index ] == $_emoCode )
+						{
+							/* We need to make sure emoticons are wrapped in spaces so they are parsed properly */
+							//$txt = str_replace( $value, ' ' . $_emoCode . ' ', $txt );
+							/* We are no longer matching opening/closing "space" so no need to add it */
+							$txt = str_replace( $value, $_emoCode, $txt );
+							continue 2;
+						}
+					}
+				}
+			}
+		}
+
+		$txt = str_replace( "&lt;#EMO_DIR&gt;", "<#EMO_DIR#>", $txt );
+		
+		return $txt;
+	}
+	
 	/**
 	 * Simple JSON encode for when its not possible to convert data
 	 * into UTF-8 (for example polls that display the contents, etc)
@@ -4135,7 +4075,7 @@ class IPSText
 	static public function simpleJsonEncode( $array )
 	{
 		$final = array();
-		
+
 		if ( is_array( $array ) )
 		{
 			foreach( $array as $k => $v )
@@ -4210,14 +4150,14 @@ class IPSText
 	 *
 	 * Mostly used to ensure that data designed for UTF-8 XML files is actually stored as UTF-8 from
 	 * 'flat' files that may not be saved as UTF-8.
-	 * Most likely this will have to be expanded to include different char sets eventually.
+	 * Most likely this will have to be expanded to support different char sets eventually.
 	 *
 	 * @param	string		Data in
 	 * @return	string		Data out
 	 */
 	static public function encodeForXml( $string )
 	{
-		if ( strtolower( IPS_DOC_CHAR_SET ) == 'utf-8' )
+		if ( strtolower( IPS_DOC_CHAR_SET ) != 'utf-8' )
 		{
 			$string = utf8_encode( $string );
 		}
@@ -4237,24 +4177,6 @@ class IPSText
 		
  		return str_replace( array('Январь','Февраль','Март','�прель','Май','Июнь,','Июль','�вгу�т','Сент�брь','Окт�брь','�о�брь','Декабрь'), array('January','February','March','April','May','June','July','August','September','October','November','December'), $text );
 	}
-	
-	/**
-	 * SEO Clean up
-	 *
-	 * @param	string		Raw SEO title or text
-	 * @return	string		Cleaned up SEO title
-	 * @deprecated			Will most likely be removed in a future version
-	 */
-	static public function seoClean( $text )
-	{
-		$text = str_replace( " ", "-", $text );
-		/* Ensure we don't have /_/ anywhere in the URL */
-		$text = str_replace( "_", "-", $text );
-
-		$text = utf8_encode( $text );
-
-		return $text;
-	}
 
 	static public function transliterate( $text )
 	{
@@ -4595,7 +4517,7 @@ class IPSText
 	}
 	
 	/**
-	 * Converts UFT-8 into HTML entities (&#1xxx;) for correct display in browsers
+	 * Converts UTF-8 into HTML entities (&#1xxx;) for correct display in browsers
 	 *
 	 * @param	 string 		UTF8 Encoded string
 	 * @return	 string 		..converted into HTML entities (similar to what a browser does with POST)
@@ -4618,6 +4540,39 @@ class IPSText
     	return $string; 
 	}
 	
+	/**
+	 * Decodes long named HTML entities in a string &eacute; without affecting other HTML entities (&lt; etc) etc
+	 * @param string 	Raw string
+	 * @param string	Converted string
+	 */
+	public static function decodeNamedHtmlEntities( $string )
+	{
+		preg_match_all( '#&([^;\s]+?);#', $string, $matches );
+		$entities = array();
+		$notList  = array( 'amp' );
+		
+		foreach( $matches[0] as $word )
+		{
+			if ( preg_match( '#^&([a-zA-Z]{3,8});$#', $word, $match ) )
+			{
+				if ( ! in_array( $match[1], $notList ) )
+				{
+					$entities[] = $word;
+				}
+			}
+		}
+		
+		$translated = @explode( ' ', @html_entity_decode( @implode( ' ', $entities ), ENT_NOQUOTES, IPS_DOC_CHAR_SET ) );
+
+		if ( is_array( $translated ) AND count( $translated ) AND count( $translated ) == count( $entities ) )
+		{
+			return str_ireplace( $entities, $translated, $string );
+		}
+		
+		return $string;
+	}
+	
+	
 	/**
 	 * Returns an MD5 hash of content which has whitespace stripped.
 	 * This is used in some classes to determine if content has changed without
@@ -4628,7 +4583,7 @@ class IPSText
 	 */
 	public static function contentToMd5( $t )
 	{
-		return md5( trim( preg_replace( "#[\s\t\n\r]#", "", $t ) ) );
+		return md5( trim( preg_replace( '#[\s\t\n\r]#', "", $t ) ) );
 	}
 
 	/**
@@ -4801,8 +4756,8 @@ class IPSText
 
     	$key = htmlspecialchars( urldecode($key) );
     	$key = str_replace( ".."           , ""  , $key );
-    	$key = preg_replace( "/\_\_(.+?)\_\_/"  , ""  , $key );
-    	$key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
+    	$key = preg_replace( '/\_\_(.+?)\_\_/'  , ""  , $key );
+    	$key = preg_replace( '/^([\w\.\-\_]+)$/', "$1", $key );
 
     	return $key;
     }
@@ -4847,7 +4802,7 @@ class IPSText
 			// Try and fix up HTML entities with missing ;
 			//-----------------------------------------
 
-			$val = preg_replace( "/&#(\d+?)([^\d;])/i", "&#\\1;\\2", $val );
+			$val = preg_replace( '/&#(\d+?)([^\d;])/i', "&#\\1;\\2", $val );
 		}
 		
 		//-----------------------------------------
@@ -4908,11 +4863,11 @@ class IPSText
 			return FALSE;
 		}
 
-    	if ( preg_match( "#[\;\#\n\r\*\'\"<>&\%\!\(\)\{\}\[\]\?\\/\s]#", $email ) )
+    	if ( preg_match( '#[\;\#\n\r\*\'\"<>&\%\!\(\)\{\}\[\]\?\\/\s]#', $email ) )
 		{
 			return FALSE;
 		}
-    	else if ( preg_match( "/^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,4}|[0-9]{1,4})(\]?)$/", $email) )
+    	else if ( preg_match( '/^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,4}|[0-9]{1,4})(\]?)$/', $email) )
     	{
     		return TRUE;
     	}
@@ -5019,7 +4974,7 @@ class IPSText
 		{
 			if ( preg_match("/,(and|or),/i", $keywords) )
 			{
-				while ( preg_match("/\s+(and|or)\s+/i", $keywords, $match) )
+				while ( preg_match('/\s+(and|or)\s+/i', $keywords, $match) )
 				{
 					$word_array = explode( " ".$match[1]." ",	$keywords );
 					$keywords   = str_replace( $match[0], '',	$keywords );
@@ -5036,8 +4991,8 @@ class IPSText
 
 			if ( ! $loosematch )
 			{
-				$beginmatch = "(^|\s|\>|;|\])";
-				$endmatch   = "(\s|,|\.|!|<br|&|$)";
+				$beginmatch = '(^|\s|\>|;|\])';
+				$endmatch   = '(\s|,|\.|!|<br|&|$)';
 			}
 
 			if ( is_array($word_array) )
@@ -5112,7 +5067,7 @@ class IPSText
 			return FALSE;
 		}
 
-		if ( ! preg_match( "#^(http|https|news|ftp)://(?:[^<>\"]+|[a-z0-9/\._\- !&\#;,%\+\?:=]+)$#iU", $url ) )
+		if ( ! preg_match( '#^(http|https|news|ftp)://(?:[^<>\"]+|[a-z0-9/\._\- !&\#;,%\+\?:=]+)$#iU', $url ) )
 		{
 			return FALSE;
 		}
@@ -5120,6 +5075,49 @@ class IPSText
 		return TRUE;
 	}
 	
+	/**
+	 * Here we can do some generic checking for XSS
+	 * This should not be considered fool proof, though can provide
+	 * a centralized point for maintenance and checking
+	 * @param string $txt
+	 * @return string
+	 */
+	static public function xssMakeJavascriptSafe( $txt )
+	{
+		$txt = preg_replace( "/(j)avascript/i" , "\\1&#097;v&#097;script", $txt );
+		//$txt = str_ireplace( "alert"      , "&#097;lert"          , $txt );
+		//$txt = preg_replace( "/(b)(e)(h)(a)(v)(i)(o)(r)/is"   , "\\1\\2\\3<b></b>\\4\\5\\6\\7\\8"    	  , $txt );
+		$txt = preg_replace( '/(e)((\/\*.*?\*\/)*)x((\/\*.*?\*\/)*)p((\/\*.*?\*\/)*)r((\/\*.*?\*\/)*)e((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)i((\/\*.*?\*\/)*)o((\/\*.*?\*\/)*)n/is' , "\\1xp<b></b>ressi&#111;n"     , $txt );
+		$txt = preg_replace( '/(e)((\\\|&#092;)*)x((\\\|&#092;)*)p((\\\|&#092;)*)r((\\\|&#092;)*)e((\\\|&#092;)*)s((\\\|&#092;)*)s((\\\|&#092;)*)i((\\\|&#092;)*)o((\\\|&#092;)*)n/is' 	  , "\\1xp<b></b>ressi&#111;n"     	  , $txt );
+		$txt = preg_replace( '/m((\\\|&#092;)*)o((\\\|&#092;)*)z((\\\|&#092;)*)\-((\\\|&#092;)*)b((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)d((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)g/is' 	  , "moz-<b></b>b&#105;nding"     	  , $txt );
+		$txt = str_ireplace( "about:"     , "&#097;bout:"         , $txt );
+		$txt = str_ireplace( "<body"      , "&lt;body"            , $txt );
+		$txt = str_ireplace( "<html"      , "&lt;html"            , $txt );
+		$txt = str_ireplace( "document." , "&#100;ocument."      , $txt );
+		$txt = str_ireplace( "window."   , "wind&#111;w."      , $txt );
+		
+		$event_handlers	= array( 'mouseover', 'mouseout', 'mouseup', 'mousemove', 'mousedown', 'mouseenter', 'mouseleave', 'mousewheel',
+								 'contextmenu', 'click', 'dblclick', 'load', 'unload', 'submit', 'blur', 'focus', 'resize', 'scroll',
+								 'change', 'reset', 'select', 'selectionchange', 'selectstart', 'start', 'stop', 'keydown', 'keyup',
+								 'keypress', 'abort', 'error', 'dragdrop', 'move', 'moveend', 'movestart', 'activate', 'afterprint',
+								 'afterupdate', 'beforeactivate', 'beforecopy', 'beforecut', 'beforedeactivate', 'beforeeditfocus',
+								 'beforepaste', 'beforeprint', 'beforeunload', 'begin', 'bounce', 'cellchange', 'controlselect',
+								 'copy', 'cut', 'paste', 'dataavailable', 'datasetchanged', 'datasetcomplete', 'deactivate', 'drag',
+								 'dragend', 'dragleave', 'dragenter', 'dragover', 'drop', 'end', 'errorupdate', 'filterchange', 'finish',
+								 'focusin', 'focusout', 'help', 'layoutcomplete', 'losecapture', 'mediacomplete', 'mediaerror', 'outofsync',
+								 'pause', 'propertychange', 'progress', 'readystatechange', 'repeat', 'resizeend', 'resizestart', 'resume',
+								 'reverse', 'rowsenter', 'rowexit', 'rowdelete', 'rowinserted', 'seek', 'syncrestored', 'timeerror',
+								 'trackchange', 'urlflip',
+								);
+		
+		foreach( $event_handlers as $handler )
+		{
+			$txt = str_ireplace( 'on' . $handler, '&#111;n' . $handler, $txt );
+		}
+		
+		return $txt;
+	}
+	
 	/**
 	 * Strip URLs from stuff
 	 *
@@ -5129,10 +5127,10 @@ class IPSText
 	static public function stripUrls( $txt )
 	{
 		/* Start off by attempting to strip <a href=""></a> */
-		$txt = preg_replace( "#<a(?:[^\"']+?)href\s{0,}=\s{0,}(\"|'|&quot;|&\#34;|&\#39;|&\#034;|&\#039;)([^<]+?)</a>#i", "", $txt );
+		$txt = preg_replace( '#<a(?:[^\"\']+?)href\s{0,}=\s{0,}(\"|\'|&quot;|&\#34;|&\#39;|&\#034;|&\#039;)([^<]+?)</a>#i', "", $txt );
 		
 		/* Now grab any non linked items */
-		$txt = preg_replace( "#(http|https|news|ftp)://(?:[^<>\[\"\s]+|[a-z0-9/\._\-!&\#;,%\+\?:=]+)#i", "", $txt );
+		$txt = preg_replace( '#(http|https|news|ftp)://(?:[^<>\[\"\s]+|[a-z0-9/\._\-!&\#;,%\+\?:=]+)#i', "", $txt );
 		
 		return $txt;
 	}
@@ -5182,7 +5180,7 @@ class IPSText
 	 * @param	integer		Character code
 	 * @return	string		Character
 	 */
-	static private function _convertToUtf8( $int=0 )
+	static protected function _convertToUtf8( $int=0 )
 	{
 		$return = '';
 
@@ -5226,11 +5224,26 @@ class IPSText
 	 * @param	array		Hex character code
 	 * @return	string		Character
 	 */
-	static private function _convertHexToUtf8( $matches )
+	static protected function _convertHexToUtf8( $matches )
 	{
 		return self::_convertToUtf8( hexdec( $matches[1] ) );
 	}
 	
+	/**
+	 * Callback function for array_walk_recursive to convert each entry
+	 *
+	 * @param	mixed		Value
+	 * @param	string		Array key
+	 * @return	void
+	 */
+	static public function arrayWalkCallbackConvert( &$value, $key )
+	{
+		if( is_string($value) )
+		{
+			$value = IPSText::convertCharsets( $value, IPS_DOC_CHAR_SET, "UTF-8" );
+		}
+	}
+
 	/**
 	 * Convert a string between charsets
 	 *
@@ -5243,6 +5256,8 @@ class IPSText
 	 */
 	static public function convertCharsets( $text, $original_cset, $destination_cset="UTF-8" )
 	{
+		define( 'CONVERT_JSU_TO_ENTITY', true );
+		
 		$original_cset    = strtolower($original_cset);
 		$destination_cset = strtolower( $destination_cset );
 		$t                = $text;
@@ -5258,7 +5273,7 @@ class IPSText
 		
 		if ( ! is_object( self::$classConvertCharset ) )
 		{
-			require_once( IPS_KERNEL_PATH.'/classConvertCharset.php' );
+			require_once( IPS_KERNEL_PATH.'/classConvertCharset.php' );/*noLibHook*/
 			self::$classConvertCharset = new classConvertCharset();
 			
 			if ( ipsRegistry::$settings['charset_conv_method'] == 'mb' AND function_exists( 'mb_convert_encoding' ) )
@@ -5281,6 +5296,22 @@ class IPSText
 
 		$text = self::$classConvertCharset->convertEncoding( $text, $original_cset, $destination_cset );
 		
+		/* Experimental - convert \u#### to html entity */
+		if( $destination_cset != 'utf-8' AND $text AND CONVERT_JSU_TO_ENTITY )
+		{
+			preg_match_all( '#\\\u([0-9]{4})#ims', $text, $matches );
+			
+			if( is_array($matches) AND count($matches) )
+			{
+				foreach( $matches[1] as $k => $v )
+				{
+					$v	= "&#" . hexdec( ltrim( $v, '0' ) )  . ";";
+					
+					$text	= str_replace( $matches[0][$k], $v, $text );
+				}
+			}
+		}
+		
 		return $text ? $text : $t;
 	}
 
@@ -5304,7 +5335,7 @@ class IPSText
 
 		if ( $string_length > $limit)
 		{
-			$text = self::mbsubstr( $text, 0, $limit - 3 ) . '...';
+			$text = trim( self::mbsubstr( $text, 0, $limit - 3 ) ). '...';
 		}
 		else
 		{
@@ -5478,7 +5509,7 @@ class IPSText
 			$additional_tags = preg_quote( $additional_tags, "/" );
 		}
 
-		return preg_replace( "/[^a-zA-Z0-9\-\_" . $additional_tags . "]/", "" , $text );
+		return preg_replace( '/[^a-zA-Z0-9\-\_' . $additional_tags . "]/", "" , $text );
     }
 
 	/**
@@ -5580,7 +5611,7 @@ class IPSText
     		$t = stripslashes($t);
     	}
     	
-    	$t = preg_replace( "/\\\(?!&amp;#|\?#)/", "&#092;", $t );
+    	$t = preg_replace( '/\\\(?!&amp;#|\?#)/', "&#092;", $t );
 
     	return $t;
     }
@@ -5590,11 +5621,10 @@ class IPSText
 	 *
 	 * @param	string		Incoming text
 	 * @return	string		Text with any attach tags removed
-	 * @todo 	[Future] Move this to bbcode library?
 	 */
 	static public function stripAttachTag( $text )
 	{
-		return preg_replace( "#\[attachment=(\d+?)\:(?:[^\]]+?)\]#is", '', $text );
+		return preg_replace( '#\[attachment=(\d+?)\:(?:[^\]]+?)\]#is', '', $text );
 	}
 
 	/**
@@ -5613,7 +5643,7 @@ class IPSText
 			$t = stripslashes($t);
 		}
 
-		$t = preg_replace( "/\\\(?!&amp;#|\?#)/", "&#092;", $t );
+		$t = preg_replace( '/\\\(?!&amp;#|\?#)/', "&#092;", $t );
 
 		//---------------------------------------
 		// Make sure macros aren't converted
@@ -5624,20 +5654,6 @@ class IPSText
 		return $t;
 	}
 
-	/**
-	 * Converts slashes into HTML entities
-	 *
-	 * @param	string		Input String
-	 * @return	string		Parsed string
-	 * @since	2.0
-	 * @deprecated
-	 * @see		IPSText::stripslashes
-	 */
-	static public function makeSlashesSafe($t)
-	{
-		return IPSText::stripslashes( $t );
-	}
-
 	/**
 	 * htmlspecialchars including entities
 	 *
@@ -5673,6 +5689,7 @@ class IPSText
 		$t = str_replace( "&#039;", "'", $t );
 		$t = str_replace( "&#39;" , "'", $t );
 		$t = str_replace( "&#33;" , "!", $t );
+		$t = str_replace( "&#34;" , '"', $t );
 		$t = str_replace( "&#036;", '$', $t );
 		
 		return $t;
@@ -5741,7 +5758,7 @@ class IPSText
 	{
 		//print nl2br(htmlspecialchars($t)).'<br>--------------------------------<br>';
 		$t	= str_replace( array( "\r", "\n" ), '', $t );
-		$t	= str_replace( array( "<br />", "<br>" ), "\n", $t );
+		$t	= str_ireplace( array( "<br />", "<br>" ), "\n", $t );
 		//$t = preg_replace( "#(?:\n|\r)?<br />(?:\n|\r)?#", "\n", $t );
 		//$t = preg_replace( "#(?:\n|\r)?<br>(?:\n|\r)?#"  , "\n", $t );
 		//print nl2br(htmlspecialchars($t)).'<br>--------------------------------<br>';
@@ -5810,3565 +5827,3 @@ class IPSText
 		return base64_decode( strtr( $data, '-_,', '+/=' ) );
 	}
 }
-
-/**
-* IPSMember
-*
-* This deals with member data and some member functions
-*/
-class IPSMember
-{
-	/**
-	 * Custom fields class
-	 *
-	 * @var		object
-	 */
-	static private $custom_fields_class;
-
-	/**
-	 * Member cache
-	 *
-	 * @var		array
-	 */
-	static private $memberCache = array();
-
-	/**
-	 * Ignore cache
-	 *
-	 * @var		boolean
-	 */
-	static private $ignoreCache = FALSE;
-
-	/**
-	 * Debug data
-	 *
-	 * @var		array
-	 */
-	static public $debugData = array();
-
-	/**
-	 * memberFunctions object reference
-	 *
-	 * @var		object
-	 */
-	static private $_memberFunctions;
-
-	/**
-	 * Parsed signatures to save resources
-	 *
-	 * @var		array
-	 */
-	static private $_parsedSignatures	= array();
-	
-	/**
-	 * Parsed custom fields to save resources
-	 *
-	 * @var		array
-	 */
-	static private $_parsedCustomFields	= array();
-	
-	/**
-	 * Parsed custom fields to save resources
-	 *
-	 * @var		array
-	 */
-	static private $_parsedCustomGroups	= array();
-
-	/**
-	 * Ban filters cache
-	 *
-	 * @var		array
-	 */
-	static public $_banFiltersCache = NULL;
-
-	/**
-	 * Member data array
-	 *
-	 * @var		array
-	 */
-	static public $data = array( 'member_id'            => 0,
-								 'name'                 => "",
-								 'members_display_name' => "",
-								 'member_group_id'      => 0,
-								 'member_forum_markers' => array() );
-
-	/**
-	 * Remapped table array used in load and save
-	 *
-	 * @var		array
-	 */
-	static private $remap = array( 'core'               => 'members',
-							       'extendedProfile'    => 'profile_portal',
-							       'customFields'       => 'pfields_content',
-							       'itemMarkingStorage' => 'core_item_markers_storage' );
-
-	
-	/**
-	 * Create new member
-	 * Very basic functionality at this point.
-	 *
-	 * @param	array 	Fields to save in the following format: array( 'members'      => array( 'email'     => 'test@test.com',
-	 *																				         'joined'   => time() ),
-	 *															   'extendedProfile' => array( 'signature' => 'My signature' ) );
-	 *					Tables: members, pfields_content, profile_portal.
-	 *					You can also use the aliases: 'core [members]', 'extendedProfile [profile_portal]', and 'customFields [pfields_content]'
-	 * @param	bool	Flag to attempt to auto create a name if the desired is taken
-	 * @param	bool	Bypass custom field saving (if using the sso session integration this is required as member object isn't ready yet)
-	 * @param	bool	Whether or not to recache the stats so as to update the board's last member data
-	 * @return	array 	Final member Data including member_id
-	 *
-	 * EXCEPTION CODES
-	 * CUSTOM_FIELDS_EMPTY    - Custom fields were not populated
-	 * CUSTOM_FIELDS_INVALID  - Custom fields were invalid
-	 * CUSTOM_FIELDS_TOOBIG   - Custom fields too big
-	 */
-	static public function create( $tables=array(), $autoCreateName=FALSE, $bypassCfields=FALSE, $doStatsRecache=TRUE )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$finalTables	= array();
-		$password		= '';
-		$plainPassword	= '';
-		$bitWiseFields  = ipsRegistry::fetchBitWiseOptions( 'global' );
-		
-		//-----------------------------------------
-		// Remap tables if required
-		//-----------------------------------------
-		
-		foreach( $tables as $table => $data )
-		{
-			$_name = ( isset( self::$remap[ $table ] ) ) ? self::$remap[ $table ] : $table;
-			
-			if ( $_name == 'members' )
-			{
-				/* Magic password field */
-				$password		= ( isset( $data['password'] ) ) ? trim( $data['password'] ) : IPSLib::makePassword();
-				$plainPassword	= $password;
-				$md_5_password	= md5( $password );
-				
-				unset( $data['password'] );
-			}
-			
-			$finalTables[ $_name ] = $data;
-		}
-		
-		//-----------------------------------------
-		// Custom profile field stuff
-		//-----------------------------------------
-
-		if( !$bypassCfields )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-	    	$fields = new $classToLoad();
-	    	
-	    	if ( is_array( $finalTables['pfields_content'] ) AND count( $finalTables['pfields_content'] ) )
-			{
-				$fields->member_data = $finalTables['pfields_content'];
-			}
-			
-			$_cfieldMode	= 'normal';
-			
-	    	$fields->initData( 'edit' );
-	    	$fields->parseToSave( $finalTables['pfields_content'], 'register' );
-
-			/* Check */
-			if( count( $fields->error_fields['empty'] ) )
-			{
-				//throw new Exception( 'CUSTOM_FIELDS_EMPTY' );
-			}
-			
-			if( count( $fields->error_fields['invalid'] ) )
-			{
-				//throw new Exception( 'CUSTOM_FIELDS_INVALID' );
-			}
-			
-			if( count( $fields->error_fields['toobig'] ) )
-			{
-				//throw new Exception( 'CUSTOM_FIELDS_TOOBIG' );
-			}
-		}
-
-    	//-----------------------------------------
-    	// Make sure the account doesn't exist
-    	//-----------------------------------------
-    	
-    	if( $finalTables['members']['email'] )
-    	{
-    		$existing	= IPSMember::load( $finalTables['members']['email'], 'all' );
-    		
-    		if( $existing['member_id'] )
-    		{
-    			$existing['full']		= true;
-    			$existing['timenow']	= time();
-    			
-    			return $existing;
-    		}
-    	}
-    	
-		//-----------------------------------------
-		// Fix up usernames and display names
-		//-----------------------------------------
-		
-		/* Ensure we have a display name */
-		if( $autoCreateName AND $finalTables['members']['members_display_name'] !== FALSE )
-		{
-			$finalTables['members']['members_display_name'] = ( $finalTables['members']['members_display_name'] ) ? $finalTables['members']['members_display_name'] : $finalTables['members']['name'];
-		}
-		
-		//-----------------------------------------
-		// Remove some basic HTML tags
-		//-----------------------------------------
-		
-		if( $finalTables['members']['members_display_name'] )
-		{
-			$finalTables['members']['members_display_name'] = str_replace( array( '<', '>', '"' ), '', $finalTables['members']['members_display_name'] );
-		}
-		
-		if( $finalTables['members']['name'] )
-		{
-			$finalTables['members']['name'] 				= str_replace( array( '<', '>', '"' ), '', $finalTables['members']['name'] );
-		}
-		
-		//-----------------------------------------
-		// Make sure the names are unique
-		//-----------------------------------------
-		
-		/* Can specify display name of FALSE to force no entry to force partial member */
-		if( $finalTables['members']['members_display_name'] !== FALSE )
-		{
-			try
-			{
-				if( IPSMember::getFunction()->checkNameExists( $finalTables['members']['members_display_name'], array(), 'members_display_name', true ) === true )
-				{
-					if ( $autoCreateName === TRUE )
-					{
-						/* Now, make sure we have a unique display name */
-						$max = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(member_id) as max',
-														 				'from'   => 'members',
-														 				'where'  => "members_l_display_name LIKE '" . ipsRegistry::DB()->addSlashes( mb_strtolower( $finalTables['members']['members_display_name'] ) ) . "%'" ) );
-
-
-						if ( $max['max'] )
-						{
-							$_num = $max['max'] + 1;
-							$finalTables['members']['members_display_name'] = $finalTables['members']['members_display_name'] . '_' . $_num;
-						}
-					}
-					else
-					{
-						$finalTables['members']['members_display_name']		= '';
-					}
-				}
-			}
-			catch( Exception $e )
-			{}
-		}
-		
-		if( $finalTables['members']['name'] )
-		{
-			try
-			{
-				if( IPSMember::getFunction()->checkNameExists( $finalTables['members']['name'], array(), 'name', true ) === true )
-				{
-					if ( $autoCreateName === TRUE )
-					{
-						/* Now, make sure we have a unique username */
-						$max = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(member_id) as max',
-														 				'from'   => 'members',
-														 				'where'  => "members_l_username LIKE '" . ipsRegistry::DB()->addSlashes( mb_strtolower( $finalTables['members']['name'] ) ) . "%'" ) );
-
-
-						if ( $max['max'] )
-						{
-							$_num = $max['max'] + 1;
-							$finalTables['members']['name'] = $finalTables['members']['name'] . '_' . $_num;
-						}
-					}
-					else
-					{
-						$finalTables['members']['name'] = '';
-					}
-				}
-			}
-			catch( Exception $e )
-			{}
-		}
-
-		//-----------------------------------------
-		// Clean up characters
-		//-----------------------------------------
-		
-		if( $finalTables['members']['name'] )
-		{
-			$userName		= IPSMember::getFunction()->cleanAndCheckName( $finalTables['members']['name'], array(), 'name' );
-			
-			if( $userName['errors'] )
-			{
-				$finalTables['members']['name']	= $finalTables['members']['email'];
-			}
-			else
-			{
-				$finalTables['members']['name']	= $userName['username'];
-			}
-		}
-		
-		if( $finalTables['members']['members_display_name'] )
-		{
-			$displayName	= IPSMember::getFunction()->cleanAndCheckName( $finalTables['members']['members_display_name'] );
-			
-			if( $displayName['errors'] )
-			{
-				$finalTables['members']['members_display_name']	= '';
-			}
-			else
-			{
-				$finalTables['members']['members_display_name']	= $displayName['members_display_name'];
-			}
-		}
-			
-		//-----------------------------------------
-		// Populate member table(s)
-		//-----------------------------------------
-
-		$finalTables['members']['members_l_username']		= isset($finalTables['members']['name']) ? mb_strtolower($finalTables['members']['name']) : '';
-		$finalTables['members']['joined']					= $finalTables['members']['joined'] ? $finalTables['members']['joined'] : time();
-		$finalTables['members']['email']					= $finalTables['members']['email'] ? $finalTables['members']['email'] : $finalTables['members']['name'] . '@' . $finalTables['members']['joined'];
-		$finalTables['members']['member_group_id']			= $finalTables['members']['member_group_id'] ? $finalTables['members']['member_group_id'] : ipsRegistry::$settings['member_group'];
-		$finalTables['members']['ip_address']				= $finalTables['members']['ip_address'] ? $finalTables['members']['ip_address'] : ipsRegistry::member()->ip_address;
-		$finalTables['members']['members_created_remote']	= intval( $finalTables['members']['members_created_remote'] );
-		$finalTables['members']['member_login_key']			= IPSMember::generateAutoLoginKey();
-		$finalTables['members']['member_login_key_expire']	= ( ipsRegistry::$settings['login_key_expire'] ) ? ( time() + ( intval( ipsRegistry::$settings['login_key_expire'] ) * 86400 ) ) : 0;
-		$finalTables['members']['view_sigs']				= 1;
-		$finalTables['members']['view_img']					= 1;
-		$finalTables['members']['view_avs']					= 1;
-		$finalTables['members']['bday_day']					= intval( $finalTables['members']['bday_day'] );
-		$finalTables['members']['bday_month']				= intval( $finalTables['members']['bday_month'] );
-		$finalTables['members']['bday_year']				= intval( $finalTables['members']['bday_year'] );
-		$finalTables['members']['restrict_post']			= intval( $finalTables['members']['restrict_post'] );
-		$finalTables['members']['msg_count_total']			= 0;
-		$finalTables['members']['msg_count_new']			= 0;
-		$finalTables['members']['msg_show_notification']	= 1;
-		$finalTables['members']['coppa_user']				= 0;
-		$finalTables['members']['auto_track']				= intval( $finalTables['members']['auto_track'] );
-		$finalTables['members']['last_visit']				= $finalTables['members']['last_visit'] ? $finalTables['members']['last_visit'] : time();
-		$finalTables['members']['last_activity']			= $finalTables['members']['last_activity'] ? $finalTables['members']['last_activity'] : time();
-		$finalTables['members']['language']					= IPSLib::getDefaultLanguage();
-		$finalTables['members']['members_editor_choice']	= ipsRegistry::$settings['ips_default_editor'];
-		$finalTables['members']['members_pass_salt']		= IPSMember::generatePasswordSalt(5);
-		$finalTables['members']['members_pass_hash']		= IPSMember::generateCompiledPasshash( $finalTables['members']['members_pass_salt'], $md_5_password );
-		$finalTables['members']['members_display_name']		= isset($finalTables['members']['members_display_name']) ? $finalTables['members']['members_display_name'] : '';
-		$finalTables['members']['members_l_display_name']	= isset($finalTables['members']['members_display_name']) ? mb_strtolower($finalTables['members']['members_display_name']) : '';
-		$finalTables['members']['fb_uid']	 	            = isset($finalTables['members']['fb_uid']) ? $finalTables['members']['fb_uid'] : 0;
-		$finalTables['members']['fb_emailhash']	            = isset($finalTables['members']['fb_emailhash']) ? strtolower($finalTables['members']['fb_emailhash']) : '';
-		$finalTables['members']['members_seo_name']         = IPSText::makeSeoTitle( $finalTables['members']['members_display_name'] );
-		$finalTables['members']['bw_is_spammer']            = intval( $finalTables['members']['bw_is_spammer'] );
-		
-		//-----------------------------------------
-		// Insert: MEMBERS
-		//-----------------------------------------
-		
-		ipsRegistry::DB()->force_data_type = array( 'name'						=> 'string',
-													'members_l_username'		=> 'string',
-												    'members_display_name'		=> 'string',
-												    'members_l_display_name'	=> 'string',
-												    'members_seo_name'			=> 'string',
-												    'email'						=> 'string' );
-													
-		/* Bitwise options */
-		if ( is_array( $bitWiseFields['members'] ) )
-		{
-			$_freeze = array();
-			
-			foreach( $bitWiseFields['members'] as $field )
-			{
-				if ( isset( $finalTables['members'][ $field ] ) )
-				{
-					/* Add to freezeable array */
-					$_freeze[ $field ] = $finalTables['members'][ $field ];
-					
-					/* Remove it from the fields to save to DB */
-					unset( $finalTables['members'][ $field ] );
-				}
-			}
-			
-			if ( count( $_freeze ) )
-			{
-				$finalTables['members']['members_bitoptions'] = IPSBWOptions::freeze( $_freeze, 'members', 'global' );
-			}
-		}
-			
-		ipsRegistry::DB()->insert( 'members', $finalTables['members'] );
-	
-		//-----------------------------------------
-		// Get the member id
-		//-----------------------------------------
-		
-		$finalTables['members']['member_id'] = ipsRegistry::DB()->getInsertId();
-
-		//-----------------------------------------
-		// Insert: PROFILE PORTAL
-		//-----------------------------------------
-
-		$finalTables['profile_portal']['pp_member_id']              = $finalTables['members']['member_id'];
-		$finalTables['profile_portal']['pp_setting_count_friends']  = 1;
-		$finalTables['profile_portal']['pp_setting_count_comments'] = 1;
-		$finalTables['profile_portal']['pp_customization']			= serialize( array() );
-		
-		foreach( array( 'pp_last_visitors', 'pp_about_me', 'notes', 'signature', 'fb_photo', 'fb_photo_thumb', 'pconversation_filters',
-					    'avatar_location', 'avatar_type', 'avatar_size' ) as $f )
-		{
-			$finalTables['profile_portal'][ $f ] = ( $finalTables['profile_portal'][ $f ] ) ? $finalTables['profile_portal'][ $f ] : '';
-		}
-		
-		ipsRegistry::DB()->insert( 'profile_portal', $finalTables['profile_portal'] );
-		
-		//-----------------------------------------
-		// Insert into the custom profile fields DB
-		//-----------------------------------------
-		
-		if( !$bypassCfields )
-		{
-			/* Check the website url field */
-			$website_field = $fields->getFieldIDByKey( 'website' );
-			
-			if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
-			{
-				if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
-				{
-					$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
-				}
-			}
-		
-			$fields->out_fields['member_id'] = $finalTables['members']['member_id'];
-			
-			ipsRegistry::DB()->delete( 'pfields_content', 'member_id=' . $finalTables['members']['member_id'] );
-			ipsRegistry::DB()->insert( 'pfields_content', $fields->out_fields );
-		}
-		else
-		{
-			ipsRegistry::DB()->delete( 'pfields_content', 'member_id=' . $finalTables['members']['member_id'] );
-			ipsRegistry::DB()->insert( 'pfields_content', array( 'member_id' => $finalTables['members']['member_id'] ) );
-		}
-
-		//-----------------------------------------
-		// Insert into partial ID table
-		//-----------------------------------------
-		
-		$full_account 	= false;
-		
-		if( $finalTables['members']['members_display_name'] AND $finalTables['members']['name'] AND $finalTables['members']['email'] AND $finalTables['members']['email'] != $finalTables['members']['name'] . '@' . $finalTables['members']['joined'] )
-		{
-			$full_account	= true;
-		}
-		
-		if ( ! $full_account )
-		{
-			ipsRegistry::DB()->insert( 'members_partial', array( 'partial_member_id' => $finalTables['members']['member_id'],
-														 		 'partial_date'      => $finalTables['members']['joined'],
-														 		 'partial_email_ok'  => ( $finalTables['members']['email'] == $finalTables['members']['name'] . '@' . $finalTables['members']['joined'] ) ? 0 : 1,
-								) 						);
-		}
-		
-		/* Add plain password and run sync */
-		$finalTables['members']['plainPassword'] = $plainPassword;
-		
-		IPSLib::runMemberSync( 'onCreateAccount', $finalTables['members'] );
-		
-		/* Remove plain password */
-		unset( $finalTables['members']['plainPassword'] );
-		
-		//-----------------------------------------
-		// Recache our stats (Ticket 627608)
-		//-----------------------------------------
-		
-		if ( $doStatsRecache == TRUE )
-		{
-			ipsRegistry::cache()->rebuildCache( 'stats', 'global' );
-		}
-															
-		return array_merge( $finalTables['members'], $finalTables['profile_portal'], !$bypassCfields ? $fields->out_fields : array(), array( 'timenow' => $finalTables['members']['joined'], 'full' => $full_account ) );
-	}
-
-	/**
-	 * Save member
-	 *
-	 * @param 	int		Member key: Either Array, ID or email address. If it's an array, it must be in the format:
-	 *					 array( 'core' => array( 'field' => 'member_id', 'value' => 1 ) ) - useful for passing custom fields through
-	 * @param 	array 	Fields to save in the following format: array( 'members'      => array( 'email'     => 'test@test.com',
-	 *																				         'joined'   => time() ),
-	 *															   'extendedProfile' => array( 'signature' => 'My signature' ) );
-	 *					Tables: members, pfields_content, profile_portal.
-	 *					You can also use the aliases: 'core [members]', 'extendedProfile [profile_portal]', and 'customFields [pfields_content]'
-	 * @return	boolean	True if the save was successful
-	 *
-	 * Exception Error Codes:
-	 * NO_DATA 		  : No data to save
-	 * NO_VALID_KEY    : No valid key to save
-	 * NO_AUTO_LOAD    : Could not autoload the member as she does not exist
-	 * INCORRECT_TABLE : Table one is attempting to save to does not exist
-	 * NO_MEMBER_GROUP_ID: Member group ID is in the array but blank
-	 */
-	static public function save( $member_key, $save=array() )
-	{
-		$member_id      = 0;
-		$member_email   = '';
-		$member_field   = '';
-		$_updated       = 0;
-		$bitWiseFields  = ipsRegistry::fetchBitWiseOptions( 'global' );
-		$member_k_array = array( 'members' => array(), 'pfields_content' => array(),  'profile_portal' => array() );
-		$_tables        = array_keys( $save );
-		$_MEMBERKEY     = 'member_id';
-		$_MEMBERVALUE   = $member_key;
-		
-		//-----------------------------------------
-		// Test...
-		//-----------------------------------------
-
-		if ( ! is_array( $save ) OR ! count( $save ) )
-		{
-			throw new Exception( 'NO_DATA' );
-		}
-
-		//-----------------------------------------
-		// ID or email?
-		//-----------------------------------------
-
-		if ( ! is_array( $member_key ) )
-		{
-			if ( strstr( $member_key, '@' ) )
-			{
-				$_MEMBERKEY    = 'email';
-				
-				$member_k_array['members'] = array( 'field' => 'email',
-				 									'value' => "'" . ipsRegistry::instance()->DB()->addSlashes( mb_strtolower( $member_key ) ) . "'" );
-
-				//-----------------------------------------
-				// Check to see if we've got more than the core
-				// table to save on.
-				//-----------------------------------------
-
-				$_got_more_than_core = FALSE;
-
-				foreach( $_tables as $table )
-				{
-					if ( isset( self::$remap[ $table ] ) )
-					{
-						$table = self::$remap[ $table ];
-					}
-
-					if ( $table != 'members' )
-					{
-						$_got_more_than_core = TRUE;
-						break;
-					}
-				}
-
-				if ( $_got_more_than_core === TRUE )
-				{
-					/* Get the ID */
-					$_memberTmp = self::load( $member_key, 'core' );
-				
-					if ( $_memberTmp['member_id'] )
-					{
-						$member_k_array['pfields_content'] = array( 'field' => 'member_id'   , 'value' => $_memberTmp['member_id'] );
-						$member_k_array['profile_portal']  = array( 'field' => 'pp_member_id', 'value' => $_memberTmp['member_id'] );
-					}
-					else
-					{
-						throw new Exception( "NO_AUTO_LOAD" );
-					}
-				}
-			}
-			else
-			{
-				$member_k_array['members']         = array( 'field' => 'member_id'    , 'value' => intval( $member_key ) );
-				$member_k_array['pfields_content'] = array( 'field' => 'member_id'    , 'value' => intval( $member_key ) );
-				$member_k_array['profile_portal']  = array( 'field' => 'pp_member_id' , 'value' => intval( $member_key ) );
-
-				self::_updateCache( $member_key, $save );
-			}
-		}
-		else
-		{
-			$_member_k_array = $member_k_array;
-
-			foreach( $member_key as $table => $data )
-			{
-				if ( isset( self::$remap[ $table ] ) )
-				{
-					$table = self::$remap[ $table ];
-				}
-
-				if ( ! in_array( $table, array_keys( $_member_k_array ) ) )
-				{
-					throw new Exception( 'INCORRECT_TABLE' );
-				}
-
-				$member_k_array[ $table ] = $data;
-			}
-		}
-
-		//-----------------------------------------
-		// Test...
-		//-----------------------------------------
-
-		if ( ! is_array( $member_k_array ) OR ! count( $member_k_array ) )
-		{
-			throw new Exception( 'NO_DATA' );
-		}
-
-		//-----------------------------------------
-		// Now save...
-		//-----------------------------------------
-
-		foreach( $save as $table => $data )
-		{
-			if ( isset( self::$remap[ $table ] ) )
-			{
-				$table = self::$remap[ $table ];
-			}
-
-			if ( $table == 'profile_portal' )
-			{
-				$data[ $member_k_array[ $table ]['field'] ] = $member_k_array[ $table ]['value'];
-
-				//-----------------------------------------
-				// Does row exist?
-				//-----------------------------------------
-
-				$check = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'pp_member_id', 'from' => 'profile_portal', 'where' => 'pp_member_id=' . $data['pp_member_id'] ) );
-
-				if( !$check['pp_member_id'] )
-				{
-					ipsRegistry::DB()->insert( $table, $data );
-				}
-				else
-				{
-					ipsRegistry::DB()->update( $table, $data, 'pp_member_id=' . $data['pp_member_id'] );
-				}
-			}
-			else if ( $table == 'pfields_content' )
-			{
-				$data[ $member_k_array[ $table ]['field'] ] = $member_k_array[ $table ]['value'];
-
-				//-----------------------------------------
-				// Does row exist?
-				//-----------------------------------------
-
-				$check = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id=' . $data['member_id'] ) );
-				
-				foreach( $data as $_k => $_v )
-				{
-					ipsRegistry::DB()->force_data_type[ $_k ] = 'string';
-				}
-
-				if( !$check['member_id'] )
-				{
-					ipsRegistry::DB()->insert( $table, $data );
-				}
-				else
-				{
-					ipsRegistry::DB()->update( $table, $data, 'member_id=' . $data['member_id'] );
-				}
-			}
-			else
-			{
-				if ( $table == 'members' )
-				{
-					/* Make sure we have a value for member_group_id if passed */
-					if ( isset( $data['member_group_id'] ) AND ! $data['member_group_id'] )
-					{
-						throw new Exception( "NO_MEMBER_GROUP_ID" );
-					}
-					
-					/* Some stuff that can end up  here */
-					unset( $data['_canBeIgnored'] );
-					
-					/* Bitwise options */
-					if ( is_array( $bitWiseFields['members'] ) )
-					{
-						$_freeze = array();
-						
-						foreach( $bitWiseFields['members'] as $field )
-						{
-							if ( isset( $data[ $field ] ) )
-							{
-								/* Add to freezeable array */
-								$_freeze[ $field ] = $data[ $field ];
-								
-								/* Remove it from the fields to save to DB */
-								unset( $data[ $field ] );
-							}
-						}
-						
-						if ( count( $_freeze ) )
-						{
-							$data['members_bitoptions'] = IPSBWOptions::freeze( $_freeze, 'members', 'global' );
-						}
-					}
-					
-					ipsRegistry::DB()->force_data_type = array(
-																'name'						=> 'string',
-																'title'						=> 'string',
-																'members_l_username'		=> 'string',
-																'members_display_name'		=> 'string',
-																'members_l_display_name'	=> 'string',
-																'members_seo_name'			=> 'string',
-																'msg_count_total'			=> 'int',
-																'msg_count_new'				=> 'int',
-																'members_bitoptions'		=> 'int',
-															);
-				}
-
-				ipsRegistry::DB()->update( $table, $data, $member_k_array[ $table ]['field'] . '=' . $member_k_array[ $table ]['value'] );
-			}
-
-			$_updated += ipsRegistry::instance()->DB()->getAffectedRows();
-		}
-
-		//-----------------------------------------
-		// If member login key is updated during
-		// session creation, this causes fatal error
-		//-----------------------------------------
-		
-		if( is_object( ipsRegistry::member() ) )
-		{
-			$save[ $_MEMBERKEY ] = $_MEMBERVALUE;
-			IPSLib::runMemberSync( 'onProfileUpdate', $save );
-		}
-
-		return ( $_updated > 0 ) ? TRUE : FALSE;
-	}
-
-	/**
-	 * Load member
-	 *
-	 * @param 	string	Member key: Either ID or email address OR array of IDs when $key_type is either ID or not set OR a list of $key_type strings (email address, name, etc)
-	 * @param 	string	Extra tables to load(all, none or comma delisted tables) Tables: members, pfields_content, profile_portal, groups, sessions, core_item_markers_storage.
-	 *					You can also use the aliases: 'extendedProfile', 'customFields' and 'itemMarkingStorage'
-	 * @param	string  Key type. Leave it blank to auto-detect or specify "id", "email", "username", "displayname".
-	 * @return	array   Array containing member data
-	 * <code>
-	 * # Single member
-	 * $member = IPSMember::load( 1, 'extendedProfile,groups' );
-	 * $member = IPSMember::load( 'matt@email.com', 'all' );
-	 * $member = IPSMember::load( 'MattM', 'all', 'displayname' ); // Can also use 'username', 'email' or 'id'
-	 * # Multiple members
-	 * $members = IPSMember::load( array( 1, 2, 10 ), 'all' );
-	 * $members = IPSMember::load( array( 'MattM, 'JoeD', 'DaveP' ), 'all', 'displayname' );
-	 * </code>
-	 */
-	static public function load( $member_key, $extra_tables='all', $key_type='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$member_value    = 0;
-		$members         = array();
-		$multiple_ids    = array();
-		$member_field    = '';
-		$joins           = array();
-		$tables          = array( 'pfields_content' => 0, 'profile_portal' => 0, 'core_item_markers_storage' => 0, 'groups' => 0, 'sessions' => 0 );
-		$remap           = array( 'extendedProfile'    => 'profile_portal',
-							      'customFields'       => 'pfields_content',
-							      'itemMarkingStorage' => 'core_item_markers_storage' );
-
-		//-----------------------------------------
-		// ID or email?
-		//-----------------------------------------
-
-		if ( ! $key_type )
-		{
-			if ( is_array( $member_key ) )
-			{
-				$multiple_ids = array_map( 'intval', $member_key ); // Bug #20908
-				$member_field = 'member_id';
-			}
-			else
-			{
-				if ( strstr( $member_key, '@' ) )
-				{
-					$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
-					$member_field = 'email';
-				}
-				else
-				{
-					$member_value = intval( $member_key );
-					$member_field = 'member_id';
-				}
-			}
-		}
-		else
-		{
-			switch( $key_type )
-			{
-				default:
-				case 'id':
-					if ( is_array( $member_key ) )
-					{
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = intval( $member_key );
-					}
-					$member_field = 'member_id';
-				break;
-				case 'fb_uid':
-					if ( is_array( $member_key ) )
-					{
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = is_numeric( $member_key ) ? $member_key : 0;
-					}
-					$member_field = 'fb_uid';
-					
-					if ( $member_value == 0 )
-					{
-						return array();
-					}
-				break;
-				case 'twitter_id':
-					if ( is_array( $member_key ) )
-					{
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = is_numeric( $member_key ) ? $member_key : 0;
-					}
-					$member_field = 'twitter_id';
-					
-					if ( $member_value == 0 )
-					{
-						return array();
-					}
-				break;
-				case 'vk_uid':
-    				if ( is_array( $member_key ) )
-    				{
-    					$multiple_ids = $member_key;
-    				}
-    				else
-    				{
-    					$member_value = is_numeric( $member_key ) ? $member_key : 0;
-    				}
-    				$member_field = 'vk_uid';
-				
-    				if ( $member_value == 0 )
-    				{
-    					return array();
-    				}
-				break;
-				case 'email':
-					if ( is_array( $member_key ) )
-					{
-						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( mb_strtolower( $v ) ) . "\'";' ) );
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
-					}
-					$member_field = 'email';
-				break;
-				case 'username':
-					if ( is_array( $member_key ) )
-					{
-						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( mb_strtolower( $v ) ) . "\'";' ) );
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
-					}
-					$member_field = 'members_l_username';
-				break;
-				case 'displayname':
-					if ( is_array( $member_key ) )
-					{
-						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( mb_strtolower( $v ) ) . "\'";' ) );
-						$multiple_ids = $member_key;
-					}
-					else
-					{
-						$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
-					}
-					$member_field = 'members_l_display_name';
-				break;
-			}
-		}
-		
-		//-----------------------------------------
-		// Protected against member_id=0
-		//-----------------------------------------
-		
-		if( !count($multiple_ids) OR !is_array($multiple_ids) )
-		{
-			if( $member_field == 'member_id' AND !$member_value )
-			{
-				return array();
-			}
-		}
-
-		//-----------------------------------------
-		// Sort out joins...
-		//-----------------------------------------
-
-		if ( $extra_tables == 'all' )
-		{
-			foreach( $tables as $_table => $_val )
-			{
-				/* Let's not load sessions unless specifically requested */
-				if ( $_table == 'sessions' )
-				{
-					continue;
-				}
-				
-				/* Same deal with item marking */
-				if ( $_table == 'core_item_markers_storage' )
-				{
-					continue;
-				}
-
-				$tables[ $_table ] = 1;
-			}
-		}
-		else if ( $extra_tables )
-		{
-			$_tables = explode( ",", $extra_tables );
-
-			foreach( $_tables as $_t )
-			{
-				$_t = trim( $_t );
-				
-				if ( isset( $tables[ $_t ] ) )
-				{
-					$tables[ $_t ] = 1;
-				}
-				else if ( isset( self::$remap[ $_t ] ) )
-				{
-					if ( strstr( $tables[ self::$remap[ $_t ] ], ',' ) )
-					{
-						$__tables = explode( ',', $tables[ self::$remap[ $_t ] ] );
-
-						foreach( $__tables as $__t )
-						{
-							$tables[ $__t ] = 1;
-						}
-					}
-					else
-					{
-						$tables[ self::$remap[ $_t ] ] = 1;
-					}
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Grab used tables
-		//-----------------------------------------
-
-		$_usedTables = array();
-
-		foreach( $tables as $_name => $_use )
-		{
-			if ( $_use )
-			{
-				$_usedTables[] = $_name;
-			}
-		}
-
-		//-----------------------------------------
-		// Check the cache first...
-		//-----------------------------------------
-		
-		if ( $member_field == 'member_id' AND $member_value )
-		{
-			$member = self::_fetchFromCache( $member_value, $_usedTables );
-
-			if ( $member !== FALSE )
-			{
-				return $member;
-			}
-		}
-		else if( count($multiple_ids) AND is_array($multiple_ids) )
-		{
-			$_totalUsers	= count($multiple_ids);
-			$_gotFromCache	= 0;
-			$_fromCache		= array();
-			
-			foreach( $multiple_ids as $_memberValue )
-			{
-				$member = self::_fetchFromCache( $_memberValue, $_usedTables );
-				
-				if ( $member !== FALSE )
-				{
-					$_fromCache[ $member['member_id'] ]	= $member;
-					$_gotFromCache++;
-				}
-			}
-
-			//-----------------------------------------
-			// Did we find all the members in cache?
-			//-----------------------------------------
-			
-			if( $_gotFromCache == $_totalUsers )
-			{
-				return $_fromCache;
-			}
-		}
-
-		self::$ignoreCache = FALSE;
-
-		//-----------------------------------------
-		// Fix up joins...
-		//-----------------------------------------
-
-		if ( $tables['pfields_content'] )
-		{
-			$joins[] = array( 'select' => 'p.*',
-						  	  'from'   => array( 'pfields_content' => 'p' ),
-						  	  'where'  => 'p.member_id=m.member_id',
-						  	  'type'   => 'left' );
-		}
-
-		if ( $tables['profile_portal'] )
-		{
-			$joins[] = array( 'select' => 'pp.*',
-						  	  'from'   => array( 'profile_portal' => 'pp' ),
-							  'where'  => 'pp.pp_member_id=m.member_id',
-							  'type'   => 'left' );
-		}
-
-		if ( $tables['groups'] )
-		{
-			$joins[] = array( 'select' => 'g.*',
-			 				  'from'   => array( 'groups' => 'g' ),
-							  'where'  => 'g.g_id=m.member_group_id',
-						      'type'   => 'left' );
-		}
-
-		if ( $tables['sessions'] )
-		{
-			$joins[] = array( 'select' => 's.*',
-			 				  'from'   => array( 'sessions' => 's' ),
-							  'where'  => 's.member_id=m.member_id',
-						      'type'   => 'left' );
-		}
-		
-		if ( $tables['core_item_markers_storage'] )
-		{
-			$joins[] = array( 'select' => 'im.*',
-			 				  'from'   => array( 'core_item_markers_storage' => 'im' ),
-							  'where'  => 'im.item_member_id=m.member_id',
-						      'type'   => 'left' );
-		}
-		
-		if ( IPSContentCache::isEnabled() )
-		{
-			if ( IPSContentCache::fetchSettingValue( 'sig' ) )
-			{
-				$joins[] = IPSContentCache::join( 'sig' , 'm.member_id', 'ccb', 'left', 'ccb.cache_content' );
-			}
-		}
-
-		//-----------------------------------------
-		// Do eeet
-		//-----------------------------------------
-
-		if ( count( $joins ) )
-		{
-			ipsRegistry::DB()->build( array( 'select'   => 'm.*, m.member_id as my_member_id',
-											 'from'     => array( 'members' => 'm' ),
-											 'where'    => ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ?  'm.'. $member_field . ' IN (' . implode( ',', $multiple_ids ) . ')' : 'm.'. $member_field . '=' . $member_value,
-											 'add_join' => $joins ) );
-		}
-		else
-		{
-			ipsRegistry::DB()->build( array( 'select'   => '*',
-											 'from'     => 'members',
-											 'where'    => ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ?  $member_field . ' IN (' . implode( ',', $multiple_ids ) . ')' : $member_field . '=' . $member_value ) );
-		}
-
-		//-----------------------------------------
-		// Execute
-		//-----------------------------------------
-
-		ipsRegistry::DB()->execute();
-
-		while( $mem = ipsRegistry::DB()->fetch() )
-		{
-			if ( isset( $mem['my_member_id'] ) )
-			{
-				$mem['member_id'] = $mem['my_member_id'];
-			}
-			
-			$mem['full']		= true;
-			
-			if( !$mem['email'] OR !$mem['members_display_name'] OR $mem['email'] == $mem['name'] . '@' . $mem['joined'] )
-			{
-				$mem['full']	= false;
-				$mem['timenow']	= $mem['joined'];
-			}
-
-			/* Clean secondary groups */
-			$mem['mgroup_others'] = ($mem['mgroup_others'] != '') ? IPSText::cleanPermString($mem['mgroup_others']) : '';
-
-			//-----------------------------------------
-			// Be sure we properly apply secondary permissions
-			//-----------------------------------------
-
-			if ( $tables['groups'] AND is_object( ipsRegistry::member() ) )
-			{
-				$mem = ipsRegistry::member()->setUpSecondaryGroups( $mem );
-				
-				/* Unpack groups */
-				$mem = IPSLib::unpackGroup( $mem, TRUE );
-			}
-
-			//-----------------------------------------
-			// Unblockable
-			//-----------------------------------------
-
-			$mem['_canBeIgnored'] = self::isIgnorable( $mem['member_group_id'], $mem['mgroup_others'] );
-			
-			/* Bitwise Options */
-			$mem = self::buildBitWiseOptions( $mem );
-			
-			/* Add to array */
-			$members[ $mem['member_id'] ] = $mem;
-
-			//-----------------------------------------
-			// Add to cache
-			//-----------------------------------------
-
-			self::_addToCache( $mem, $_usedTables );
-		}
-
-		//-----------------------------------------
-		// Return just a single if we only sent one id
-		//-----------------------------------------
-
-		return ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ? $members : array_shift( $members );
-	}
-
-	/**
-	 * Delete member(s)
-	 *
-	 * @param 	mixed		[Integer] member ID or [Array] array of member ids
-	 * @param	boolean		Check if request is from an admin
-	 * @return	boolean		Action completed successfully
-	 */
-	static public function remove( $id, $check_admin=true )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$tmp_mids 	= array();
-		$emails		= array();
-
-		//-----------------------------------------
-		// Sort out thingie
-		//-----------------------------------------
-
-		if ( is_array( $id ) )
-		{
-			$id = IPSLib::cleanIntArray( $id );
-
-			$mids = ' IN (' . implode( ",", $id ) . ')';
-		}
-		else
-		{
-			$mids = ' = ' . intval($id);
-		}
-
-		//-----------------------------------------
-		// Get accounts and check IDS
-		//-----------------------------------------
-
-		ipsRegistry::DB()->build( array(
-										'select'	=> 'm.member_id, m.name, m.member_group_id, m.email', 
-										'from'		=> array( 'members' => 'm' ),
-										'where'		=> 'm.member_id' . $mids,
-										'add_join'	=> array(
-															array(
-																'select'	=> 'g.g_access_cp',
-																'from'		=> array( 'groups' => 'g' ),
-																'where'		=> 'g.g_id=m.member_group_id',
-																'type'		=> 'left',
-																)
-															)
-								)		);
-		ipsRegistry::DB()->execute();
-
-		while ( $r = ipsRegistry::DB()->fetch() )
-		{
-			//-----------------------------------------
-			// Non root admin attempting to edit root admin?
-			//-----------------------------------------
-
-			if( $check_admin )
-			{
-				if ( !ipsRegistry::member()->getProperty('g_access_cp') )
-				{
-					if ( $r['g_access_cp'] )
-					{
-						continue;
-					}
-				}
-			}
-
-			$tmp_mids[]	= $r['member_id'];
-			$emails[]	= $r['email'];
-
-			self::_removeFromCache( $r['member_id'] );
-		}
-
-		if ( ! count( $tmp_mids ) )
-		{
-			return false;
-		}
-
-		$mids = ' IN (' . implode( ",", $tmp_mids ) . ')';
-
-		//-----------------------------------------
-		// Get avatars / photo
-		//-----------------------------------------
-
-		$delete_files = array();
-
-		ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'profile_portal', 'where' => 'pp_member_id' . $mids ) );
-		ipsRegistry::DB()->execute();
-
-		while( $r = ipsRegistry::DB()->fetch() )
-		{
-			if ( $r['pp_main_photo']  )
-			{
-				$delete_files[] = $r['pp_main_photo'];
-			}
-
-			if ( $r['pp_thumb_photo']  )
-			{
-				$delete_files[] = $r['pp_thumb_photo'];
-			}
-			
-			if ( $r['avatar_type'] == 'upload' and $r['avatar_location'] )
-			{
-				$delete_files[] = $r['avatar_location'];
-			}
-			
-			$_customizations	= unserialize($r['pp_customization']);
-			
-			if( $_customizations['type'] == 'upload' AND $_customizations['bg_url'] )
-			{
-				$delete_files[]	= $_customizations['bg_url'];
-			}
-		}
-
-		//-----------------------------------------
-		// Take care of forum stuff
-		//-----------------------------------------
-
-		ipsRegistry::DB()->update( 'posts'					, array( 'author_id'  => 0 ), "author_id" . $mids );
-		ipsRegistry::DB()->update( 'topics'					, array( 'starter_id' => 0 ), "starter_id" . $mids );
-		ipsRegistry::DB()->update( 'announcements'			, array( 'announce_member_id' => 0 ), "announce_member_id" . $mids );
-		ipsRegistry::DB()->update( 'attachments'			, array( 'attach_member_id' => 0 ), "attach_member_id" . $mids );
-		ipsRegistry::DB()->update( 'polls'					, array( 'starter_id' => 0 ), "starter_id" . $mids );
-		//ipsRegistry::DB()->update( 'topic_ratings'			, array( 'rating_member_id' => 0 ), "rating_member_id" . $mids );
-		ipsRegistry::DB()->update( 'voters'					, array( 'member_id' => 0 ), "member_id" . $mids );
-		ipsRegistry::DB()->update( 'forums'					, array( 'last_poster_name' => '' ), "last_poster_id" . $mids );
-		ipsRegistry::DB()->update( 'forums'					, array( 'seo_last_name' => '' ), "last_poster_id" . $mids );
-		ipsRegistry::DB()->update( 'forums'					, array( 'last_poster_id' => 0 ), "last_poster_id" . $mids );
-		ipsRegistry::DB()->delete( 'core_share_links_log'	, "log_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'core_soft_delete_log'	, "sdl_obj_member_id" . $mids );
-		ipsRegistry::DB()->update( 'rss_import'				, array( 'rss_import_mid' => 0 ), "rss_import_mid" . $mids );
-		ipsRegistry::DB()->update( 'tags_index'				, array( 'member_id' => 0 ), "member_id" . $mids );
-		
-		//-----------------------------------------
-		// Likes - also invalidates likes cache
-		// @todo - Matt - Move this into like class
-		//-----------------------------------------
-		
-		$_likes	= array();
-		
-		ipsRegistry::DB()->build( array( 'select' => 'like_lookup_id', 'from' => 'core_like', 'where' => "like_member_id" . $mids ) );
-		ipsRegistry::DB()->execute();
-		
-		while( $r = ipsRegistry::DB()->fetch() )
-		{
-			$_likes[]	= $r['like_lookup_id'];
-		}
-
-		if( count($_likes) )
-		{
-			ipsRegistry::DB()->delete( 'core_like'				, "like_member_id" . $mids );
-			ipsRegistry::DB()->delete( 'core_like_cache'		, "like_cache_id IN('" . implode( "','", array_map( 'addslashes', $_likes ) ) . "')" );
-		}
-
-		//-----------------------------------------
-		// Clean up profile stuff
-		//-----------------------------------------
-
-		ipsRegistry::DB()->update( 'profile_comments'		, array( 'comment_by_member_id' => 0 ), "comment_by_member_id" . $mids );
-		ipsRegistry::DB()->update( 'profile_ratings'		, array( 'rating_by_member_id' => 0 ), "rating_by_member_id" . $mids );
-
-		ipsRegistry::DB()->delete( 'profile_comments'		, "comment_for_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'profile_ratings'		, "rating_for_member_id" . $mids );
-
-		ipsRegistry::DB()->delete( 'profile_portal'			, "pp_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'profile_portal_views'	, "views_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'profile_friends'		, "friends_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'profile_friends'		, "friends_friend_id" . $mids );
-		ipsRegistry::DB()->delete( 'profile_friends_flood'	, "friends_member_id" . $mids . " OR friends_friend_id" . $mids );
-
-		ipsRegistry::DB()->delete( 'dnames_change'			, "dname_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'mobile_notifications'	, "member_id" . $mids );
-
-		//-----------------------------------------
-		// Delete member...
-		//-----------------------------------------
-
-		ipsRegistry::DB()->delete( 'pfields_content'		, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'members_partial'		, "partial_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'moderators'				, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'sessions'				, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'search_sessions'		, "session_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'upgrade_sessions'		, "session_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'warn_logs'				, "wlog_mid" . $mids );
-		ipsRegistry::DB()->update( 'warn_logs'				, array( 'wlog_addedby' => 0 ), "wlog_addedby" . $mids );
-		ipsRegistry::DB()->delete( 'member_status_actions'	, "action_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'member_status_actions'	, "action_status_owner" . $mids );
-		ipsRegistry::DB()->delete( 'member_status_replies'	, "reply_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'member_status_updates'	, "status_member_id" . $mids );
-
-		//-----------------------------------------
-		// Update admin stuff and logs
-		//-----------------------------------------
-
-		ipsRegistry::DB()->delete( 'admin_permission_rows'	, "row_id_type='member' AND row_id" . $mids );
-		ipsRegistry::DB()->delete( 'core_sys_cp_sessions' 	, 'session_member_id' . $mids );
-		ipsRegistry::DB()->delete( 'core_sys_login' 		, 'sys_login_id' . $mids );
-		ipsRegistry::DB()->update( 'upgrade_history'		, array( 'upgrade_mid' => 0 ), "upgrade_mid" . $mids );
-		ipsRegistry::DB()->update( 'admin_logs'				, array( 'member_id' => 0 ), "member_id" . $mids );
-		ipsRegistry::DB()->update( 'email_logs'				, array( 'from_member_id' => 0 ), "from_member_id" . $mids );
-		ipsRegistry::DB()->update( 'email_logs'				, array( 'to_member_id' => 0 ), "to_member_id" . $mids );
-		ipsRegistry::DB()->update( 'error_logs'				, array( 'log_member' => 0 ), "log_member" . $mids );
-		ipsRegistry::DB()->update( 'moderator_logs'			, array( 'member_id' => 0, 'member_name' => '' ), "member_id" . $mids );
-
-		//-----------------------------------------
-		// Fix up member messages...
-		//-----------------------------------------
-		
-		ipsRegistry::DB()->delete( 'message_topic_user_map'	, 'map_user_id' . $mids );
-		ipsRegistry::DB()->update( 'message_posts'			, array( 'msg_author_id' => 0 ), 'msg_author_id' . $mids );
-		ipsRegistry::DB()->update( 'message_topics'			, array( 'mt_starter_id' => 0 ), 'mt_starter_id' . $mids );
-		
-		ipsRegistry::DB()->delete( 'ignored_users'			, "ignore_owner_id" . $mids . " or ignore_ignore_id" . $mids );
-		ipsRegistry::DB()->delete( 'inline_notifications'	, "notify_to_id" . $mids );
-		ipsRegistry::DB()->update( 'inline_notifications'	, array( 'notify_from_id' => 0 ), 'notify_from_id' . $mids );
-
-		//-----------------------------------------
-		// Delete subs, views, markers, etc.
-		//-----------------------------------------
-
-		ipsRegistry::DB()->delete( 'tracker'				, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'forum_tracker'			, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'core_item_markers'		, "item_member_id" . $mids );
-		ipsRegistry::DB()->delete( 'core_item_markers_storage', "item_member_id" . $mids );
-		ipsRegistry::DB()->update( 'rc_comments'			, array( 'comment_by' => 0 ), "comment_by" . $mids );
-		ipsRegistry::DB()->delete( 'rc_modpref'				, "mem_id" . $mids );
-		ipsRegistry::DB()->update( 'rc_reports'				, array( 'report_by' => 0 ), "report_by" . $mids );
-		ipsRegistry::DB()->update( 'rc_reports_index'		, array( 'updated_by' => 0 ), "updated_by" . $mids );
-		ipsRegistry::DB()->delete( 'rc_reports_index'		, "seotemplate='showuser' AND exdat1" . $mids );
-		ipsRegistry::DB()->delete( 'reputation_cache'		, "type='member' AND type_id" . $mids );
-		ipsRegistry::DB()->delete( 'reputation_index'		, "member_id" . $mids );
-
-		//-----------------------------------------
-		// Delete from validating..
-		//-----------------------------------------
-
-		ipsRegistry::DB()->delete( 'validating'				, "member_id" . $mids );
-		ipsRegistry::DB()->delete( 'members'				, "member_id" . $mids );
-		
-		/* Delete from profile cache */
-		if ( count( $tmp_mids ) )
-		{
-			require_once( IPSLib::getAppDir('members') . '/sources/friends.php' );
-			$friends = new profileFriendsLib( ipsRegistry::instance() );
-			
-			foreach( $tmp_mids as $_mid )
-			{
-				$friends->recacheFriends( array( 'member_id' => $_mid ) );
-			}
-		}
-		
-		//-----------------------------------------
-		// Delete avatars / photos
-		//-----------------------------------------
-
-		if ( count($delete_files) )
-		{
-			foreach( $delete_files as $file )
-			{
-				@unlink( ipsRegistry::$settings['upload_dir'] . "/" . $file );
-			}
-		}
-
-		//-----------------------------------------
-		// Member Sync
-		//-----------------------------------------
-
-		IPSLib::runMemberSync( 'onDelete', $mids );
-		
-		/* Remove from cache */
-		IPSContentCache::drop( 'sig', $tmp_mids );
-		
-		//-----------------------------------------
-		// Get current stats...
-		//-----------------------------------------
-
-		ipsRegistry::cache()->rebuildCache( 'stats', 'global' );
-		ipsRegistry::cache()->rebuildCache( 'moderators', 'global' );
-		ipsRegistry::cache()->rebuildCache( 'birthdays', 'calendar' );
-		ipsRegistry::cache()->rebuildCache( 'announcements', 'forums' );
-	}
-
-	/**
-	 * Set up moderator, populate moderator functions
-	 *
-	 * @param	array 		Array of member data
-	 * @return	array 		Array of member data populated with moderator details
-	 */
-	static public function setUpModerator( $member )
-	{
-		$other_mgroups = array();
-		
-		if ( $member['member_group_id'] != ipsRegistry::$settings['guest_group'] )
-		{
-			//-----------------------------------------
-			// Sprinkle on some moderator stuff...
-			//-----------------------------------------
-
-			if ( $member['g_is_supmod'] == 1 )
-			{
-				$member['is_mod'] = 1;
-			}
-			else if ( is_array(ipsRegistry::cache()->getCache('moderators')) AND count(ipsRegistry::cache()->getCache('moderators')) )
-			{
-				$other_mgroups = array();
-
-				if ( IPSText::cleanPermString( $member['mgroup_others'] ) )
-				{
-					$other_mgroups = explode( ",", IPSText::cleanPermString( $member['mgroup_others'] ) );
-				}
-			}
-			
-			if( is_array(ipsRegistry::cache()->getCache('moderators')) AND count(ipsRegistry::cache()->getCache('moderators')) )
-			{
-				$_mod_forums = isset( $member['forumsModeratorData'] ) && is_array( $member['forumsModeratorData'] ) ? $member['forumsModeratorData'] : array();
-				
-				foreach( ipsRegistry::cache()->getCache('moderators') as $r )
-				{
-					$modForumIds = explode( ',', IPSText::cleanPermString( $r['forum_id'] ) );
-					
-					if ( $r['member_id'] == $member['member_id'] )
-					{
-						foreach( $modForumIds as $modForumId )
-						{
-							$_mod_forums[ $modForumId ] = $r;
-						}
-
-						$member['is_mod'] = 1;
-					}
-					else if( $r['group_id'] == $member['member_group_id'] )
-					{
-						// Individual mods override group mod settings
-						// If array is set, don't override it
-
-						foreach( $modForumIds as $modForumId )
-						{
-							if( !is_array($_mod_forums[ $modForumId ]) OR !count($_mod_forums[ $modForumId ]) )
-							{
-								$_mod_forums[ $modForumId ] = $r;
-							}
-						}
-
-						$member['is_mod'] = 1;
-					}
-					else if( count( $other_mgroups ) AND in_array( $r['group_id'], $other_mgroups ) )
-					{
-						// Individual mods override group mod settings
-						// If array is set, don't override it
-	
-						if( !is_array($_mod_forums[ $r['forum_id'] ]) OR !count($_mod_forums[ $r['forum_id'] ]) )
-						{
-							$_mod_forums[ $r['forum_id'] ] = $r;
-						}
-	
-						$member['is_mod'] = 1;
-					}						
-				}
-				
-				$member['forumsModeratorData'] = $_mod_forums;
-			}
-		}
-
-		return $member;
-	}
-	
-	/**
-	 * Fetches SEO name, updating the table if required
-	 *
-	 * @param	array		Member data
-	 * @return	string		SEO Name
-	 */
-	static public function fetchSeoName( $memberData )
-	{
-		if ( ! is_array( $memberData ) OR ! $memberData['member_id'] )
-		{
-			return;
-		}
-		
-		if ( isset( $memberData['members_seo_name'] ) and ( $memberData['members_seo_name'] ) )
-		{
-			return $memberData['members_seo_name'];
-		}
-		else if ( isset( $memberData['members_display_name'] ) and ( $memberData['members_display_name'] ) )
-		{
-			$_seoName = IPSText::makeSeoTitle( $memberData['members_display_name'] );
-
-			ipsRegistry::DB()->update( 'members', array( 'members_seo_name' => $_seoName ), 'member_id=' . $memberData['member_id'] );
-			
-			return $_seoName;
-		}
-		else
-		{
-			return '-';
-		}
-	}
-	
-	/**
-	 * Fetches Ignore user data
-	 *
-	 * @param	array		Member data
-	 * @return	array		Array of ignored users
-	 */
-	static public function fetchIgnoredUsers( $memberData )
-	{
-		/* INIT */
-		$ignore_users = array();
-		
-		if ( $memberData['member_id'] )
-		{
-			/* < 3.0.0 used comma delisted string. 3.0.0+ uses serialized array */
-			if ( strstr( $memberData['ignored_users'], 'a:' ) )
-			{
-				$data = unserialize( $memberData['ignored_users'] );
-				
-				return ( is_array( $data ) ) ? $data : array();
-			}
-			else
-			{
-				if ( $memberData['ignored_users'] )
-				{
-					$_data = explode( ",", $memberData['ignored_users'] );
-				
-					foreach( $_data as $id )
-					{
-						if ( $id )
-						{
-							$ignore_users[ $id ] = array( 'ignore_ignore_id' => $id,
-														  'ignore_messages'  => 0,
-														  'ignore_topics'    => 1 );
-						}
-					}
-				}
-				
-				/* Now fetch them from the DB */
-				ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => "ignore_owner_id=" . $memberData['member_id'] ) );
-				ipsRegistry::DB()->execute();
-
-				while( $r = ipsRegistry::DB()->fetch() )
-				{
-					$ignore_users[ $r['ignore_ignore_id'] ] = array( 'ignore_ignore_id' => $r['ignore_ignore_id'],
-												  					 'ignore_messages'  => $r['ignore_messages'],
-																	 'ignore_topics'    => $r['ignore_topics'] );
-				}
-				
-				/* Update.... */
-				self::save( $memberData['member_id'], array( 'core' => array( 'ignored_users' => serialize( $ignore_users ) ) ) );
-			}
-		}
-		
-		return $ignore_users;
-	}
-	
-	/**
-	 * Updates member.ignored_users
-	 *
-	 * @param	mixed		Member ID or Member data
-	 * @return	array		Array of ignored users
-	 */
-	static public function rebuildIgnoredUsersCache( $member )
-	{
-		/* INIT */
-		$ignore_users = array();
-		
-		$memberData = ( ! is_array( $member ) ) ? self::load( $member, 'all' ) : $member;
-		
-		/* Continue */
-		if ( $memberData['member_id'] )
-		{
-			/* Fetch from DB */
-			ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => "ignore_owner_id=" . $memberData['member_id'] ) );
-			ipsRegistry::DB()->execute();
-
-			while( $r = ipsRegistry::DB()->fetch() )
-			{
-				$ignore_users[ $r['ignore_ignore_id'] ] = array( 'ignore_ignore_id' => $r['ignore_ignore_id'],
-											  					 'ignore_messages'  => $r['ignore_messages'],
-																 'ignore_topics'    => $r['ignore_topics'] );
-			}
-		
-			/* Update.... */
-			self::save( $memberData['member_id'], array( 'core' => array( 'ignored_users' => serialize( $ignore_users ) ) ) );
-		}
-	}
-
-	/**
-	 * Retrieve the member's location
-	 *
-	 * @author	Brandon Farber
-	 * @param	array 		Member information (including session info!)
-	 * @return	array 		Member info with session info parsed
-	 * @since	IPB 3.0
-	 */
-	static public function getLocation( $member )
-	{
-		$member['online_extra'] = "";
-
-		//-----------------------------------------
-		// Grab 'where' info
-		//-----------------------------------------
-
-		if( $member['current_appcomponent'] AND IPSLib::appIsInstalled( $member['current_appcomponent'] ) )
-		{
-			$member['current_appcomponent'] = IPSText::alphanumericalClean($member['current_appcomponent']);
-			
-			$filename = IPSLib::getAppDir(  $member['current_appcomponent'] ) . '/extensions/coreExtensions.php';
-
-			if ( file_exists( $filename ) )
-			{
-				$toload = IPSLib::loadLibrary( $filename, 'publicSessions__' . $member['current_appcomponent'], $member['current_appcomponent'] );
-				
-				if( class_exists( $toload ) )
-				{
-					$loader           = new $toload;
-	
-					if( method_exists( $loader, 'parseOnlineEntries' ) )
-					{
-						$tmp = $loader->parseOnlineEntries( array( $member['id'] => $member ) );
-	
-						// Yes, this is really id - it's session id, not member id
-						if( isset( $tmp[ $member['id'] ] ) && is_array( $tmp[ $member['id'] ] ) && count( $tmp[ $member['id'] ] ) )
-						{
-							if ( isset( $tmp[ $member['id'] ]['_whereLinkSeo']) )
-							{
-								$member['online_extra'] = "{$tmp[ $member['id'] ]['where_line']} <a href='" . $tmp[ $member['id'] ]['_whereLinkSeo'] . "' title='" . $tmp[ $member['id'] ]['where_line'] . ' ' . $tmp[ $member['id'] ]['where_line_more'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line_more'], 35 ) . "</a>";
-							}
-							/* @link	http://community.invisionpower.com/tracker/issue-20598-where-link-not-taken-into-account-on-profile-page-if-no-where-line-more-specified/ */
-							else if ( isset($tmp[ $member['id'] ]['where_link']) AND $tmp[ $member['id'] ]['where_line_more'] )
-							{
-								$member['online_extra'] = "{$tmp[ $member['id'] ]['where_line']} <a href='" . ipsRegistry::$settings['base_url'] . "{$tmp[ $member['id'] ]['where_link']}' title='" . $tmp[ $member['id'] ]['where_line'] . ' ' . $tmp[ $member['id'] ]['where_line_more'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line_more'], 35 ) . "</a>";
-							}
-							else if ( isset($tmp[ $member['id'] ]['where_link']) )
-							{
-								$member['online_extra'] = "<a href='" . ipsRegistry::$settings['base_url'] . "{$tmp[ $member['id'] ]['where_link']}' title='" . $tmp[ $member['id'] ]['where_line'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line'], 35 ) . "</a>";
-							}
-							else
-							{
-								$member['online_extra'] = $tmp[ $member['id'] ]['where_line'];
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if ( ! $member['online_extra'] )
-		{
-			$member['online_extra'] = $member['id'] ? ipsRegistry::getClass('class_localization')->words['board_index'] 
-													: ipsRegistry::getClass('class_localization')->words['not_online'];
-		}
-
-		return $member;
-	}
-
-	/**
-	 * Determine if two members are friends
-	 *
-	 * @author	Brandon Farber
-	 * @param	integer		Member ID to check for
-	 * @param	integer 	Member ID to check against (defaults to current member id)
-	 * @return	boolean		Whether they are friends or not
-	 * @since	IPB 3.0
-	 */
-	static public function checkFriendStatus( $memberId, $checkAgainst=0 )
-	{
-		/**
-		 * If no member id, obviously not friends
-		 */
-		if( !$memberId )
-		{
-			return false;
-		}
-
-		/**
-		 * Get member data
-		 */
-		$memberData	= array();
-
-		if( !$checkAgainst )
-		{
-			$memberData	= ipsRegistry::instance()->member()->getProperty('_cache');
-		}
-		else
-		{
-			$member		= self::load( $checkAgainst, 'extendedProfile' );
-			$memberData	= $member['_cache'];
-		}
-
-		/**
-		 * Do we have a friends cache array?
-		 */
-		if( !$memberData['friends'] OR !is_array($memberData['friends']) OR !count($memberData['friends']) )
-		{
-			return false;
-		}
-
-		/**
-		 * If there is, then check it..
-		 */
-		return in_array( $memberId, array_keys( $memberData['friends'] ) );
-	}
-	
-	/**
-	 * Determine if a member is ignoring another member
-	 *
-	 * @author	Brandon Farber
-	 * @param	integer		Member ID to check for
-	 * @param	integer 	Member ID to check against (defaults to current member id)
-	 * @param	string		Type of ignoring to check [messages|topics].  Omit to check any type.
-	 * @return	boolean		Whether the member id to check for is being ignored by the member id to check against
-	 * @since	IPB 3.0
-	 */
-	static public function checkIgnoredStatus( $memberId, $checkAgainst=0, $type=false )
-	{
-		/**
-		 * If no member id, obviously not ignored
-		 */
-		if( !$memberId )
-		{
-			return false;
-		}
-
-		/**
-		 * Get member data
-		 */
-		$memberData	= array();
-
-		if( !$checkAgainst )
-		{
-			/**
-			 * Ignored users loaded at runtime and stored in an array...loop
-			 */
-			foreach( ipsRegistry::instance()->member()->ignored_users as $ignoredUser )
-			{
-				/**
-				 * We found the user?
-				 */
-				if( $ignoredUser['ignore_ignore_id'] )
-				{
-					/**
-					 * If not specifying a type, then just return
-					 */
-					if( !$type )
-					{
-						return true;
-					}
-					/**
-					 * Otherwise verify we are ignoring that type
-					 */
-					else if( $ignoredUser[ 'ignore_' . $type ] )
-					{
-						return true;
-					}
-				}
-			}
-		}
-		else
-		{
-			/**
-			 * See if checkAgainst is ignoring memberId
-			 */
-			$checkAgainst	= intval($checkAgainst);
-			$ignoredUser	= ipsRegistry::instance()->member()->DB()->buildAndFetch( array( 'select' => '*', 'from' => 'ignored_users', 'where' => 'ignore_owner_id=' . $checkAgainst . ' AND ignore_ignore_id=' . $memberId ) );
-			
-			/**
-			 * No?
-			 */
-			if( !$ignoredUser['ignore_id'] )
-			{
-				return false;
-			}
-			/**
-			 * He is?
-			 */
-			else
-			{
-				/**
-				 * If not specifying a type, then just return
-				 */
-				if( !$type )
-				{
-					return true;
-				}
-				/**
-				 * Otherwise verify we are ignoring that type
-				 */
-				else if( $ignoredUser[ 'ignore_' . $type ] )
-				{
-					return true;
-				}
-			}
-		}
-
-		/**
-		 * If we're here (which we shouldn't be) just return false
-		 */
-		return false;
-	}
-
-	/**
-	 * Retrieve all IP addresses a user (or multiple users) have used
-	 *
-	 * @param 	mixed		[Integer] member ID or [Array] array of member ids
-	 * @param	string		Defaults to 'All', otherwise specify which tables to check (comma separated)
-	 * @return	array		Multi-dimensional array of found IP addresses in which sections
-	 */
-	static public function findIPAddresses( $id, $tables_to_check='all' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$ip_addresses 	= array();
-		$tables			= array(
-							'admin_logs'			=> array( 'member_id', 'ip_address', 'ctime' ),
-							'dnames_change'			=> array( 'dname_member_id', 'dname_ip_address', 'dname_date' ),
-							'email_logs'			=> array( 'from_member_id', 'from_ip_address', 'email_date' ),
-							'members'				=> array( 'member_id', 'ip_address', 'joined' ),
-							'message_posts'			=> array( 'msg_author_id', 'msg_ip_address', 'msg_date' ),
-							'moderator_logs'		=> array( 'member_id', 'ip_address', 'ctime' ),
-							'posts'					=> array( 'author_id', 'ip_address', 'post_date' ),
-							'profile_comments'		=> array( 'comment_by_member_id', 'comment_ip_address', 'comment_date' ),
-							'profile_ratings'		=> array( 'rating_by_member_id', 'rating_ip_address', '' ),
-							'sessions'				=> array( 'member_id', 'ip_address', 'running_time' ),
-							'topic_ratings'			=> array( 'rating_member_id', 'rating_ip_address', '' ),
-							'validating'			=> array( 'member_id', 'ip_address', 'entry_date' ),
-							'voters'				=> array( 'member_id', 'ip_address', 'vote_date' ),
-							'error_logs'			=> array( 'log_member', 'log_ip_address', 'log_date' ),
-							);
-
-		//-----------------------------------------
-		// Check apps
-		// @see http://forums.invisionpower.com/tracker/issue-16966-members-download-manag/
-		//-----------------------------------------
-		
-		foreach( ipsRegistry::$applications as $appDir => $data )
-		{
-			if( file_exists( IPSLib::getAppDir( $appDir ) . "/extensions/coreExtensions.php") )
-			{
-				$classX = IPSLib::loadLibrary( IPSLib::getAppDir( $appDir ) . "/extensions/coreExtensions.php", $appDir . '_findIpAddress', $appDir );
-				
-				if( class_exists( $classX . '_findIpAddress' ) )
-				{
-					$ipLookup	= new $classX( ipsRegistry::instance() );
-					
-					if( method_exists( $ipLookup, 'getTables' ) )
-					{
-						$tables = array_merge( $tables, $ipLookup->getTables() );
-					}
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Sort out thingie
-		//-----------------------------------------
-
-		if ( is_array( $id ) )
-		{
-			$id = IPSLib::cleanIntArray( $id );
-
-			$mids = ' IN (' . implode( ",", $id ) . ')';
-		}
-		else
-		{
-			$mids = ' = ' . intval($id);
-		}
-
-		//-----------------------------------------
-		// Got tables?
-		//-----------------------------------------
-
-		$_tables = explode( ',', $tables_to_check );
-
-		if( !is_array($_tables) OR !count($_tables) )
-		{
-			return array();
-		}
-
-		//-----------------------------------------
-		// Loop through them and grab the IPs
-		//-----------------------------------------
-
-		foreach( $tables as $tablename => $fields )
-		{
-			if( $tables_to_check == 'all' OR in_array( $tablename, $_tables ) )
-			{
-				$extra = '';
-
-				if( $fields[2] )
-				{
-					$extra = ', ' . $fields[2] . ' as date';
-				}
-
-				ipsRegistry::DB()->build( array( 'select' => $fields[1] . $extra, 'from' => $tablename, 'where' => $fields[0] . $mids ) );
-				ipsRegistry::DB()->execute();
-
-				while( $r = ipsRegistry::DB()->fetch() )
-				{
-					if( $r[ $fields[1] ] )
-					{
-						$r['date']	= $r['date'] > $ip_addresses[ $r[ $fields[1] ] ][1] ? $r['date'] : ( $ip_addresses[ $r[ $fields[1] ] ][1] ? $ip_addresses[ $r[ $fields[1] ] ][1] : 0 );
-
-						$ip_addresses[ $r[ $fields[1] ] ]	= array( intval($ip_addresses[ $r[ $fields[1] ] ][0]) + 1, $r['date'] );
-					}
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Here are your IPs kind sir.  kthxbai
-		//-----------------------------------------
-
-		return $ip_addresses;
-	}
-
-	/**
-	 * Get / set member's ban info
-	 *
-	 * @param	array	Ban info (unit, timespan, date_end, date_start)
-	 * @return	mixed
-	 * @since	2.0
-	 */
-	static public function processBanEntry( $bline )
-	{
-		if ( is_array( $bline ) )
-		{
-			// Set ( 'timespan' 'unit' )
-
-			$factor = $bline['unit'] == 'd' ? 86400 : 3600;
-
-			$date_end = time() + ( $bline['timespan'] * $factor );
-
-			return time() . ':' . $date_end . ':' . $bline['timespan'] . ':' . $bline['unit'];
-		}
-		else
-		{
-			$arr = array();
-
-			list( $arr['date_start'], $arr['date_end'], $arr['timespan'], $arr['unit'] ) = explode( ":", $bline );
-
-			return $arr;
-		}
-	}
-
-	/**
-	 * Unpacks a member's cache.
-	 * Left as a function for any other processing
-	 *
-	 * @param	string	Serialized cache array
-	 * @return	array	Unpacked array
-	 */
-	static public function unpackMemberCache( $cache_serialized_array="" )
-	{
-		return unserialize( $cache_serialized_array );
-	}
-
-	/**
-	 * Packs up member's cache
-	 *
-	 * Takes an existing array and updates member's DB row
-	 * This will overwrite any existing entries by the same
-	 * key and create new entries for non-existing rows
-	 *
-	 * @param	integer		Member ID
-	 * @param	array		New array
-	 * @param	array		Current Array (optional)
-	 * @return	boolean
-	 */
-	static public function packMemberCache( $member_id, $new_cache_array, $current_cache_array='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$member_id = intval( $member_id );
-
-		//-----------------------------------------
-		// Got a member ID?
-		//-----------------------------------------
-
-		if ( ! $member_id )
-		{
-			return FALSE;
-		}
-
-		//-----------------------------------------
-		// Got anything to update?
-		//-----------------------------------------
-
-		if ( ! is_array( $new_cache_array ) )
-		{
-			return FALSE;
-		}
-
-		//-----------------------------------------
-		// Got a current cache?
-		//-----------------------------------------
-
-		if ( ! is_array( $current_cache_array ) )
-		{
-			$member = ipsRegistry::DB()->buildAndFetch( array( 'select' => "members_cache", 'from' => 'members', 'where' => 'member_id='.$member_id ) );
-
-			$member['members_cache'] = $member['members_cache'] ? $member['members_cache'] : array();
-
-			$current_cache_array = @unserialize( $member['members_cache'] );
-		}
-
-		//-----------------------------------------
-		// Overwrite...
-		//-----------------------------------------
-
-		foreach( $new_cache_array as $k => $v )
-		{
-			$current_cache_array[ $k ] = $v;
-		}
-
-		//-----------------------------------------
-		// Update...
-		//-----------------------------------------
-
-		ipsRegistry::DB()->update( 'members', array( 'members_cache' => serialize( $current_cache_array ) ), 'member_id='.$member_id );
-
-		//-----------------------------------------
-		// Set member array right...
-		//-----------------------------------------
-		
-		if ( self::$data['member_id'] == $member_id )
-		{
-			self::$data['_cache']			= $current_cache_array;
-			self::$data['members_cache']	= serialize( $current_cache_array );
-		}
-	}
-
-	/**
-	 * Check forum permissions
-	 *
-	 * @param	string		Permission type
-	 * @param	int			Forum ID to check against
-	 * @return	boolean
-	 * @since	2.0
-	 */
-	static public function checkPermissions( $perm="", $forumID=0 )
-	{
-		/* Bit of a hack here, ugly */
-		if ( ipsRegistry::isClassLoaded('class_forums') !== TRUE )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums' );
-			ipsRegistry::setClass( 'class_forums', new $classToLoad( ipsRegistry::instance() ) );
-
-			ipsRegistry::getClass('class_forums')->strip_invisible = 1;
-			ipsRegistry::getClass('class_forums')->forumsInit();
-		}
-
-		return ipsRegistry::getClass( 'permissions' )->check( $perm, ipsRegistry::getClass('class_forums')->forum_by_id[ $forumID ] );
-	}
-
-	/**
-	 * Check forum permissions
-	 *
-	 * @param	string	Comma delim. of group IDs (2,4,5,6)
-	 * @return	string  Comma delim of PERM MASK ids
-	 * @since	2.1.1
-	 * @deprecated		Will be removed in a future version
-	 */
-	static public function createPermsFromGroup( $in_group_ids )
-    {
-    	$out   = "";
-    	$cache = ipsRegistry::cache()->getCache('group_cache');
-
-    	if ( $in_group_ids == '*' )
-    	{
-    		foreach( $cache as $data )
-			{
-				if ( ! $data['g_id'] )
-				{
-					continue;
-				}
-
-				//-----------------------------------------
-				// Got a perm mask?
-				//-----------------------------------------
-
-				if ( $data['g_perm_id'] )
-				{
-					$out .= ',' . $data['g_perm_id'];
-				}
-			}
-    	}
-    	else if ( $in_group_ids )
-		{
-			$groups_id = explode( ',', $in_group_ids );
-
-			if ( count( $groups_id ) )
-			{
-				foreach( $groups_id as $pid )
-				{
-					if ( ! $cache[ $pid ]['g_id'] )
-					{
-						continue;
-					}
-
-					//-----------------------------------------
-					// Got a perm mask?
-					//-----------------------------------------
-
-					if ( $cache[ $pid ]['g_perm_id'] )
-					{
-						$out .= ',' . $cache[ $pid ]['g_perm_id'];
-					}
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Tidy perms_id
-		//-----------------------------------------
-
-		$out = IPSText::cleanPermString( $out );
-
-		return $out;
-	}
-
-	/**
-	 * Set up defaults for a guest user
-	 *
-	 * @param	string	Guest name
-	 * @return	array 	Guest record
-	 * @since	2.0
-	 */
-    static public function setUpGuest( $name="" )
-    {
-		$cache = ipsRegistry::cache()->getCache('group_cache');
-		$name  = $name ? $name : ( ipsRegistry::isClassLoaded( 'class_localization' ) ? ipsRegistry::getClass('class_localization')->words['global_guestname'] : 'Guest' );
-
-    	$array = array(   'name'          		 	=> $name,
-    				   	  'members_display_name' 	=> $name,
-	    				  '_members_display_name' 	=> $name,
-						  'members_seo_name'		=> IPSText::makeSeoTitle( $name ),
-	    				  'member_id'      		 	=> 0,
-	    				  'password'      		 	=> '',
-	    				  'email'         		 	=> '',
-	    				  'title'         		 	=> '',
-	    				  'posts'					=> 0,
-	    				  'member_group_id'		 	=> ipsRegistry::$settings['guest_group'],
-	    				  'view_sigs'     		 	=> ipsRegistry::$settings['guests_sig'],
-	    				  'view_img'      		 	=> ipsRegistry::$settings['guests_img'],
-	    				  'view_avs'     		 	=> ipsRegistry::$settings['guests_ava'],
-	    				  'member_forum_markers' 	=> array(),
-	    				  'avatar'				 	=> '',
-	    				  'member_posts'		 	=> '',
-	    				  'g_title'		 			=> $cache[ ipsRegistry::$settings['guest_group'] ]['g_title'],
-	    				  'member_rank_img'	 	 	=> '',
-	    				  'member_joined'		 	=> '',
-	    				  'member_number'		 	=> '',
-	    				  'members_auto_dst'	 	=> 0,
-	    				  'has_blog'			 	=> 0,
-	    				  'has_gallery'			 	=> 0,
-	    				  'is_mod'				 	=> 0,
-	    				  'last_visit'			 	=> time(),
-	    				  'login_anonymous'		 	=> '',
-	    				  'mgroup_others'		 	=> '',
-	    				  'org_perm_id'			 	=> '',
-	    				  '_cache'				 	=> array( 'qr_open' => 0 ),
-	    				  'auto_track'			 	=> 0,
-	    				  'ignored_users'		 	=> NULL,
-	    				  'members_editor_choice' 	=> 'std',
-						  '_cache'                	=> array( 'friends' => array() ),
-						  '_group_formatted'		=> IPSLib::makeNameFormatted( $cache[ ipsRegistry::$settings['guest_group'] ]['g_title'], ipsRegistry::$settings['guest_group'] ),
-	    				);
-	    
-	    /* Add in the group image, if we have one */
-		$member['member_rank_img']		= '';
-		$member['member_rank_img_i']	= '';
-
-		if ( $cache[ $array['member_group_id'] ]['g_icon'] )
-		{
-			$_img = $cache[ $array['member_group_id'] ]['g_icon'];
-			
-			if ( substr( $_img, 0, 4 ) != 'http' )
-			{
-				$_img = ipsRegistry::$settings['_original_base_url'] . '/' . ltrim( $_img, '/' );
-			}
-			
-			$array['member_rank_img_i']	= 'img';
-			$array['member_rank_img']		= $_img;
-		}
-
-		return is_array( $cache[ ipsRegistry::$settings['guest_group'] ] ) ? array_merge( $array, $cache[ ipsRegistry::$settings['guest_group'] ] ) : $array;
-    }
-
-	/**
-	 * Parse a member's profile photo
-	 *
-	 * @param	mixed	Either array of member data, or member ID to self load
-	 * @return	array 	Member's photo details
-	 */
-    static public function buildProfilePhoto( $member )
-    {
-		//-----------------------------------------
-		// Load the member?
-		//-----------------------------------------
-
-		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) AND $member > 0 )
-		{
-			$member = self::load( $member, 'extendedProfile' );
-		}
-		else if ( $member == 0 )
-		{
-			$member = array();
-		}
-		
-		//-----------------------------------------
-		// Facebook?
-		//-----------------------------------------
-		
-		if ( ! empty( $member['fb_photo'] ) AND ipsRegistry::member()->getProperty('g_mem_info') )
-		{
-			$member['_has_photo']     = 1;
-			
-			/* Main... */
-			$member['pp_main_photo']  = $member['fb_photo'];
-			$member['pp_main_width']  = '*';
-			$member['pp_main_height'] = '*';
-			
-			/* Thumb */
-			$member['pp_thumb_photo']  = $member['fb_photo_thumb'];
-			$member['pp_thumb_width']  = 50;
-			$member['pp_thumb_height'] = 50;
-			
-			/* Mini */
-			$member['pp_mini_photo']  = $member['fb_photo_thumb'];
-			$member['pp_mini_width']  = 25;
-			$member['pp_mini_height'] = 25;
-		}
-		else if ( ! empty( $member['tc_photo'] )  AND ipsRegistry::member()->getProperty('g_mem_info') )
-		{
-			$member['_has_photo']     = 1;
-			
-			/* Main... */
-			$member['pp_main_photo']  = $member['tc_photo'];
-			$member['pp_main_width']  = '*';
-			$member['pp_main_height'] = '*';
-			
-			/* Thumb */
-			$member['pp_thumb_photo']  = $member['tc_photo'];
-			$member['pp_thumb_width']  = 50;
-			$member['pp_thumb_height'] = 50;
-			
-			/* Mini */
-			$member['pp_mini_photo']  = $member['tc_photo'];
-			$member['pp_mini_width']  = 25;
-			$member['pp_mini_height'] = 25;
-		}
-		else
-		{
-			//-----------------------------------------
-			// Main photo
-			//-----------------------------------------
-
-			if ( empty( $member['pp_main_photo'] ) OR ! ipsRegistry::member()->getProperty('g_mem_info') )
-			{
-				$member['pp_main_photo']  = ipsRegistry::$settings['img_url'] . '/profile/default_large.png';
-				$member['pp_main_width']  = 150;
-				$member['pp_main_height'] = 150;
-				$member['_has_photo']     = 0;
-			}
-			else
-			{
-				$member['pp_main_photo'] = ipsRegistry::$settings['upload_url'] . '/' . $member['pp_main_photo'];
-				$member['_has_photo']    = 1;
-			}
-
-			//-----------------------------------------
-			// Thumbie
-			//-----------------------------------------
-
-			if ( empty( $member['pp_thumb_photo'] ) OR $member['pp_thumb_photo'] == 'profile/' )
-			{
-				if( $member['_has_photo'] )
-				{
-					$member['pp_thumb_photo']  = $member['pp_main_photo'];
-				}
-				else
-				{
-					$member['pp_thumb_photo']  = ipsRegistry::$settings['img_url'] . '/profile/default_thumb.png';
-				}
-
-				$member['pp_thumb_width']  = 50;
-				$member['pp_thumb_height'] = 50;
-			}
-			else
-			{
-				if( $member['_has_photo'] )
-				{
-					$member['pp_thumb_photo'] = ipsRegistry::$settings['upload_url'] . '/' . $member['pp_thumb_photo'];
-				}
-				else
-				{
-					$member['pp_thumb_photo']  = ipsRegistry::$settings['img_url'] . '/profile/default_thumb.png';
-				}
-			}
-			
-			//-----------------------------------------
-			// Try not to distort the image
-			//-----------------------------------------
-			
-			if ( !ipsRegistry::member()->getProperty('g_mem_info') )
-			{
-				$member['pp_thumb_width']  = 50;
-				$member['pp_thumb_height'] = 50;
-			}
-
-			//-----------------------------------------
-			// Mini
-			//-----------------------------------------
-
-			$_data = IPSLib::scaleImage( array( 'max_height' => 25, 'max_width' => 25, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
-
-			$member['pp_mini_photo']  = $member['pp_thumb_photo'];
-			$member['pp_mini_width']  = $_data['img_width'];
-			$member['pp_mini_height'] = $_data['img_height'];
-		}
-		
-		return $member;
-    }
-
-	/**
-	 * Parse a member for display
-	 *
-	 * @param	mixed	Either array of member data, or member ID to self load
-	 * @param	array 	Array of flags to parse: 'signature', 'customFields', 'avatar', 'warn'
-	 * @return	array 	Parsed member data
-	 */
-	static public function buildDisplayData( $member, $_parseFlags=array() )
-	{
-		$_NOW   = IPSDebug::getMemoryDebugFlag();
-		
-		//-----------------------------------------
-		// Figure out parse flags
-		//-----------------------------------------
-
-		$parseFlags = array( 'signature'		=> isset( $_parseFlags['signature'] )    ? $_parseFlags['signature']    : 0,
-							 'customFields'		=> isset( $_parseFlags['customFields'] ) ? $_parseFlags['customFields'] : 0,
-							 'reputation'		=> isset( $_parseFlags['reputation'] )   ? $_parseFlags['reputation']   : 1,
-							 'avatar'			=> isset( $_parseFlags['avatar'] )       ? $_parseFlags['avatar']       : 1,
-							 'warn'				=> isset( $_parseFlags['warn'] )         ? $_parseFlags['warn']         : 1,
-							 'cfSkinGroup'		=> isset( $_parseFlags['cfSkinGroup'] )  ? $_parseFlags['cfSkinGroup']  : '',
-							 'cfGetGroupData'	=> isset( $_parseFlags['cfGetGroupData'] )  ? $_parseFlags['cfGetGroupData']  : '',
-							 'cfLocation'		=> isset( $_parseFlags['cfLocation'] )  ? $_parseFlags['cfLocation']  : '',
-							 'checkFormat'		=> isset( $_parseFlags['checkFormat'] )  ? $_parseFlags['checkFormat']  : 0,
-							 'spamStatus'		=> isset( $_parseFlags['spamStatus'] )   ? $_parseFlags['spamStatus']  : 0 );
-
-		if ( isset( $_parseFlags['__all__'] ) )
-		{
-			foreach( $parseFlags as $k => $v )
-			{
-				if( in_array( $k, array( 'cfSkinGroup', 'cfGetGroupData' ) ) )
-				{
-					continue;
-				}
-				
-				$parseFlags[ $k ] = 1;
-			}
-
-			$parseFlags['spamStatus']  = ( isset( $parseFlags['spamStatus'] )  AND ( $parseFlags['spamStatus'] ) ) ? 1 : 0;
-		}
-
-		//-----------------------------------------
-		// Load the member?
-		//-----------------------------------------
-
-		if ( ! is_array( $member ) AND ( $member == intval( $member ) AND $member > 0 ) )
-		{
-			$member = self::load( $member, 'all' );
-		}
-		
-		//-----------------------------------------
-		// Caching
-		//-----------------------------------------
-		
-		static $buildMembers	= array();
-		
-		$_key	= $member['member_id'];
-		$_arr   = serialize( $member );
-		
-		foreach( $parseFlags as $_flag => $_value )
-		{
-			$_key .= $_flag . $_value;
-		}
-		
-		$_key	= md5($_key.$_arr);
-		
-		if( array_key_exists( $_key, $buildMembers ) )
-		{
-			IPSDebug::setMemoryDebugFlag( "IPSMember::buildDisplayData: ".$member['member_id']. " - CACHED", $_NOW );
-			
-			return $buildMembers[ $_key ];
-		}
-
-		//-----------------------------------------
-		// Basics
-		//-----------------------------------------
-		
-		if ( ! $member['member_group_id'] )
-		{
-			$member['member_group_id'] = ipsRegistry::$settings['guest_group'];
-		}
-		
-		/* Unpack bitwise if required */
-		if ( ! isset( $member['bw_is_spammer'] ) )
-		{
-			$member = self::buildBitWiseOptions( $member );
-		}
-
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$rank_cache                = ipsRegistry::cache()->getCache( 'ranks' );
-		$group_cache			   = ipsRegistry::cache()->getCache( 'group_cache' );
-		$group_name                = IPSLib::makeNameFormatted( $group_cache[ $member['member_group_id'] ]['g_title'], $member['member_group_id'] );
-		$pips                      = 0;
-		$topic_id				   = intval( isset( ipsRegistry::$request[ 't' ] ) ? ipsRegistry::$request[ 't' ] : 0 );
-		$forum_id				   = intval( isset( ipsRegistry::$request[ 'f' ] ) ? ipsRegistry::$request[ 'f' ] : 0 );
-		
-		//-----------------------------------------
-		// SEO Name
-		//-----------------------------------------
-	
-		$member['members_seo_name'] = self::fetchSeoName( $member );
-
-		//-----------------------------------------
-		// Avatar
-		//-----------------------------------------
-
-		if ( $parseFlags['avatar'] )
-		{
-			$member['avatar'] = self::buildAvatar( $member );
-		}
-
-		$member['_group_formatted'] = $group_name;
-
-		//-----------------------------------------
-		// Ranks
-		//-----------------------------------------
-
-		if ( is_array( $rank_cache ) AND count( $rank_cache ) )
-		{
-			foreach( $rank_cache as $k => $v)
-			{
-				if ($member['posts'] >= $v['POSTS'])
-				{
-					if( ! isset( $member['title'] ) || $member['title'] === '' || is_null($member['title']) )
-					{
-						$member['title'] = $v['TITLE'];
-					}
-
-					$pips = $v['PIPS'];
-					break;
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Group image
-		//-----------------------------------------
-
-		$member['member_rank_img']		= '';
-		$member['member_rank_img_i']	= '';
-
-		if ( $group_cache[ $member['member_group_id'] ]['g_icon'] )
-		{
-			$_img = $group_cache[ $member['member_group_id'] ]['g_icon'];
-			
-			if ( substr( $_img, 0, 4 ) != 'http' )
-			{
-				$_img = ipsRegistry::$settings['_original_base_url'] . '/' . ltrim( $_img, '/' );
-			}
-			
-			$member['member_rank_img_i']	= 'img';
-			$member['member_rank_img']		= $_img;
-		}
-		else if ( $pips )
-		{
-			if ( is_numeric( $pips ) )
-			{
-				for ($i = 1; $i <= $pips; ++$i)
-				{
-					$member['member_rank_img_i']	= 'pips';
-					$member['member_rank_img']		.= ipsRegistry::getClass('output')->getReplacement('pip_pip');
-				}
-			}
-			else
-			{
-				$member['member_rank_img_i']	= 'img';
-				$member['member_rank_img']		= ipsRegistry::$settings['public_dir'] . 'style_extra/team_icons/' . $pips;
-			}
-		}
-
-		//-----------------------------------------
-		// Moderator data
-		//-----------------------------------------
-		
-		if( ( $parseFlags['spamStatus'] OR $parseFlags['warn'] ) AND $member['member_id'] )
-		{
-			/* Possible forums class isn't init at this point */
-			if ( ! ipsRegistry::isClassLoaded('class_forums' ) )
-			{
-				try
-				{
-					$viewingMember = IPSMember::setUpModerator( ipsRegistry::member()->fetchMemberData() );
-					
-					ipsRegistry::member()->setProperty('forumsModeratorData', $viewingMember['forumsModeratorData'] );
-				}
-				catch( Exception $error )
-				{
-					IPS_exception_error( $error );
-				}
-			}
-			
-			$moderator					= ipsRegistry::member()->getProperty('forumsModeratorData');
-		}
-		
-		$forum_id					= isset(ipsRegistry::$request['f']) ? intval( ipsRegistry::$request['f'] ) : 0;
-
-		//-----------------------------------------
-		// Spammer status
-		//-----------------------------------------
-
-		if ( $parseFlags['spamStatus'] AND $member['member_id'] AND ipsRegistry::member()->getProperty('member_id') )
-		{
-			/* Defaults */
-			$member['spamStatus']		= NULL;
-			$member['spamImage']		= NULL;
-			
-			if ( isset( $moderator[ $forum_id ]['bw_flag_spammers'] ) AND ( $moderator[ $forum_id ]['bw_flag_spammers'] ) OR ipsRegistry::member()->getProperty('g_is_supmod') == 1 )
-			{
-				if ( !ipsRegistry::$settings['warn_on'] OR ( ! strstr( ','.ipsRegistry::$settings['warn_protected'].',', ','.$member['member_group_id'].',' ) ) )
-				{
-					if ( $member['bw_is_spammer'] )
-					{
-						$member['spamStatus'] = TRUE;
-					}
-					else
-					{
-						$member['spamStatus'] = FALSE;
-					}
-				}
-			}
-		}
-				
-		//-----------------------------------------
-		// Warny porny?
-		//-----------------------------------------
-
-		if ( $parseFlags['warn'] AND $member['member_id'] )
-		{
-			$member['warn_percent']		= NULL;
-			$member['can_edit_warn']	= false;
-
-			$member['warn_img']			= NULL;
-			
-			if ( ipsRegistry::$settings['warn_on'] and ( ! strstr( ','.ipsRegistry::$settings['warn_protected'].',', ','.$member['member_group_id'].',' ) ) )
-			{	
-				/* Warnings */
-				if ( ( isset($moderator[ $forum_id ]['allow_warn'])
-					AND $moderator[ $forum_id ]['allow_warn'] )
-					OR ( ipsRegistry::member()->getProperty('g_is_supmod') == 1 )
-					OR ( ipsRegistry::$settings['warn_show_own'] and ( ipsRegistry::member()->getProperty('member_id') == $member['member_id'] ) )
-				   )
-				{
-					// Work out which image to show.
-					if ( $member['warn_level'] <= ipsRegistry::$settings['warn_min'] )
-					{
-						$member['warn_img']		= '{parse replacement="warn_0"}';
-						$member['warn_percent']	= 0;
-					}
-					else if ( $member['warn_level'] >= ipsRegistry::$settings['warn_max'] )
-					{
-						$member['warn_img']		= '{parse replacement="warn_5"}';
-						$member['warn_percent']	= 100;
-					}
-					else
-					{
-						$member['warn_percent']	= $member['warn_level'] ? sprintf( "%.0f", ( ($member['warn_level'] / ipsRegistry::$settings['warn_max']) * 100) ) : 0;
-
-						if ( $member['warn_percent'] > 100 )
-						{
-							$member['warn_percent']	= 100;
-						}
-
-						if ( $member['warn_percent'] >= 81 )
-						{
-							$member['warn_img']	= '{parse replacement="warn_5"}';
-						}
-						else if ( $member['warn_percent'] >= 61 )
-						{
-							$member['warn_img']	= '{parse replacement="warn_4"}';
-						}
-						else if ( $member['warn_percent'] >= 41 )
-						{
-							$member['warn_img']	= '{parse replacement="warn_3"}';
-						}
-						else if ( $member['warn_percent'] >= 21 )
-						{
-							$member['warn_img']	= '{parse replacement="warn_2"}';
-						}
-						else if ( $member['warn_percent'] >= 1 )
-						{
-							$member['warn_img']	= '{parse replacement="warn_1"}';
-						}
-						else
-						{
-							$member['warn_img']	= '{parse replacement="warn_0"}';
-						}
-					}
-
-					if ( $member['warn_percent'] < 1 )
-					{
-						$member['warn_percent']	= 0;
-					}
-
-					/* Bug 14770 - Change so you can't warn yourself */
-					if ( (( isset($moderator[ $forum_id ]['allow_warn']) AND $moderator[ $forum_id ]['allow_warn'] ) or ipsRegistry::member()->getProperty('g_is_supmod') == 1) AND $member['member_id'] != ipsRegistry::member()->getProperty('member_id') )
-					{
-						$member['can_edit_warn']	= true;
-					}
-				}
-			}
-		}
-		
-		//-----------------------------------------
-		// Profile fields stuff
-		//-----------------------------------------
-
-		$member['custom_fields'] = "";
-
-		if( $parseFlags['customFields'] == 1 AND $member['member_id'] )
-		{
-			if ( isset( self::$_parsedCustomFields[ $member['member_id'] ] ) )
-			{
-				$member['custom_fields'] = self::$_parsedCustomFields[ $member['member_id'] ];
-				
-				if ( $parseFlags['cfGetGroupData'] AND isset( self::$_parsedCustomGroups[ $member['member_id'] ] ) AND is_array( self::$_parsedCustomGroups[ $member['member_id'] ] ) )
-				{
-					$member['custom_field_groups'] = self::$_parsedCustomGroups[ $member['member_id'] ];
-				}
-				else if( $parseFlags['cfGetGroupData'] )
-				{
-					$member['custom_field_groups']						= self::$custom_fields_class->fetchGroupTitles();
-					self::$_parsedCustomGroups[ $member['member_id'] ]	= $member['custom_field_groups'];
-				}
-			}
-			else
-			{
-				if ( !is_object( self::$custom_fields_class ) )
-				{
-					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
-					self::$custom_fields_class	= new $classToLoad();
-				}
-	
-				if ( self::$custom_fields_class )
-				{
-					self::$custom_fields_class->member_data	= $member;
-					self::$custom_fields_class->skinGroup	= $parseFlags['cfSkinGroup'];
-					self::$custom_fields_class->initData();
-					self::$custom_fields_class->parseToView( $parseFlags['checkFormat'], $parseFlags['cfLocation'] );
-
-					$member['custom_fields']							= self::$custom_fields_class->out_fields;
-					self::$_parsedCustomFields[ $member['member_id'] ]	= $member['custom_fields'];
-					
-					if ( $parseFlags['cfGetGroupData'] )
-					{
-						$member['custom_field_groups']						= self::$custom_fields_class->fetchGroupTitles();
-						self::$_parsedCustomGroups[ $member['member_id'] ]	= $member['custom_field_groups'];
-					}
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Profile photo
-		//-----------------------------------------
-
-		$member = self::buildProfilePhoto( $member );
-
-		//-----------------------------------------
-		// Signature bbcode
-		//-----------------------------------------
-
-		if ( isset( $member['signature'] ) AND $member['signature'] AND $parseFlags['signature'] )
-		{
-			if( isset(self::$_parsedSignatures[ $member['member_id'] ]) )
-			{
-				$member['signature'] = self::$_parsedSignatures[ $member['member_id'] ];
-			}
-			else
-			{
-				if ( $member['cache_content'] )
-				{
-					$member['signature'] = '<!--cached-' . gmdate( 'r', $member['cache_updated'] ) . '-->' . $member['cache_content'];
-				}
-				else
-				{
-					IPSText::getTextClass('bbcode')->parse_bbcode				= ipsRegistry::$settings['sig_allow_ibc'];
-					IPSText::getTextClass('bbcode')->parse_smilies				= 0;
-					IPSText::getTextClass('bbcode')->parse_html					= ipsRegistry::$settings['sig_allow_html'];
-					IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
-					IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
-					IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
-					IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];				
-					
-					/* Work around */
-					$_tmp = ipsRegistry::member()->getProperty( 'view_img' );
-					ipsRegistry::member()->setProperty( 'view_img', 1 );
-
-					$member['signature']	= IPSText::getTextClass('bbcode')->preDisplayParse( $member['signature'] );
-					
-					ipsRegistry::member()->setProperty( 'view_img', $_tmp );
-				
-					IPSContentCache::update( $member['member_id'], 'sig', $member['signature'] );
-				}
-
-				self::$_parsedSignatures[ $member['member_id'] ] = $member['signature'];
-			}
-		}
-
-		//-----------------------------------------
-		// If current session, reset last_activity
-		//-----------------------------------------
-		
-		if( ! empty( $member['running_time'] ) )
-		{
-			$member['last_activity'] = $member['running_time'] > $member['last_activity'] ? $member['running_time'] : $member['last_activity'];
-		}
-
-		//-----------------------------------------
-		// Online?
-		//-----------------------------------------
-
-		$time_limit 	   = time() - ipsRegistry::$settings['au_cutoff'] * 60;
-		$member['_online'] = 0;
-
-		list( $be_anon, $loggedin )	= explode( '&', isset($member['login_anonymous']) ? $member['login_anonymous'] : '0&0' );
-
-		if( ipsRegistry::$settings['disable_anonymous'] )
-		{
-			$be_anon  = 0;
-		}
-
-		$bypass_anon				= 0;
-
-		if ( ipsRegistry::member()->getProperty('g_access_cp') AND !ipsRegistry::$settings['disable_admin_anon'] )
-		{
-			$bypass_anon	= 1;
-		}
-
-		if ( ( $member['last_visit'] > $time_limit OR $member['last_activity'] > $time_limit ) AND ( $be_anon != 1 OR $bypass_anon == 1 ) AND $loggedin == 1 )
-		{
-			$member['_online'] = 1;
-		}
-
-		//-----------------------------------------
-		// Last Active
-		//-----------------------------------------
-
-		$member['_last_active'] = ipsRegistry::getClass('class_localization')->getDate( $member['last_activity'], 'SHORT' );
-
-		if( $be_anon == 1 )
-		{
-			// Member last logged in anonymous
-
-			if( !ipsRegistry::member()->getProperty('g_access_cp') OR ipsRegistry::$settings['disable_admin_anon'] )
-			{
-				$member['_last_active'] = ipsRegistry::getClass('class_localization')->words['private'];
-			}
-		}
-
-		//-----------------------------------------
-		// Rating
-		//-----------------------------------------
-
-		$member['_pp_rating_real'] = intval( $member['pp_rating_real'] );
-
-		//-----------------------------------------
-		// Long display names
-		//-----------------------------------------
-
-		$member['members_display_name_short'] = IPSText::truncate( $member['members_display_name'], 16 );
-
-		//-----------------------------------------
-		// Reputation
-		//-----------------------------------------
-
-		$member['pp_reputation_points'] = $member['pp_reputation_points'] ? $member['pp_reputation_points'] : 0;
-		
-		if( $parseFlags['reputation'] AND $member['member_id'] )
-		{
-			if( ! ipsRegistry::isClassLoaded( 'repCache' ) )
-			{
-				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
-				ipsRegistry::setClass( 'repCache', new $classToLoad() );
-			}
-
-			$member['author_reputation']    = ipsRegistry::getClass( 'repCache' )->getReputation( $member['pp_reputation_points'] );
-		}
-
-		//-----------------------------------------
-		// Other stuff not worthy of individual comments
-		//-----------------------------------------
-
-		$member['members_profile_views']	= isset($member['members_profile_views']) ? $member['members_profile_views'] : 0;
-		
-		/* BG customization */
-		if ( $member['pp_customization'] AND ( isset($member['gbw_allow_customization']) AND $member['gbw_allow_customization'] ) AND ! $member['bw_disable_customization'] )
-		{ 
-			$member['customization'] = unserialize( $member['pp_customization'] );
-			
-			if ( is_array( $member['customization'] ) )
-			{
-				/* Figure out BG URL */
-				if ( $member['customization']['type'] == 'url' AND $member['customization']['bg_url'] AND $member['gbw_allow_url_bgimage'] )
-				{
-					$member['customization']['_bgUrl'] = $member['customization']['bg_url'];
-				}
-				else if ( $member['customization']['type'] == 'upload' AND $member['customization']['bg_url'] AND $member['gbw_allow_upload_bgimage'] )
-				{
-					$member['customization']['_bgUrl'] = ipsRegistry::$settings['upload_url'] . '/' . $member['customization']['bg_url'];
-				}
-				else if ( $member['customization']['bg_color'] )
-				{
-					$member['customization']['type'] = 'bgColor';
-				}
-			}
-		}
-		
-		IPSDebug::setMemoryDebugFlag( "IPSMember::buildDisplayData: ".$member['member_id']. " - Completed", $_NOW );
-		
-		$buildMembers[ $_key ]	= $member;
-		
-		return $member;
-	}
-	
-	/**
-	 * Build member's bitwise field
-	 *
-	 * @param	mixed		Either an array of member data or a member ID
-	 * @return	array
-	 */
-	static public function buildBitWiseOptions( $member )
-	{
-		//-----------------------------------------
-		// Load the member?
-		//-----------------------------------------
-
-		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) )
-		{
-			$member = self::load( $member, 'core,extendedProfile' );
-		}
-	
-		/* Unpack bitwise fields */
-		$_tmp = IPSBWOptions::thaw( isset($member['members_bitoptions']) ? $member['members_bitoptions'] : 0, 'members', 'global' );
-
-		if ( count( $_tmp ) )
-		{
-			foreach( $_tmp as $k => $v )
-			{
-				/* Trigger notice if we have DB field */
-				if ( isset( $member[ $k ] ) )
-				{
-					trigger_error( "Thawing bitwise options for MEMBERS: Bitwise field '$k' has overwritten DB field '$k'", E_USER_WARNING );
-				}
-
-				$member[ $k ] = $v;
-			}
-		}
-		
-		return $member;
-	}
-	
-	/**
-	 * Returns user's avatar
-	 *
-	 * @param	mixed		Either an array of member data or a member ID
-	 * @param	bool		Whether to avoid caching
-	 * @param	bool		Whether to show avatar even if view_avs is off for member
-	 * @return	string		HTML
-	 * @since	2.0
-	 */
-    static public function buildAvatar( $member, $no_cache=0, $overRide=0 )
-    {
-    	//-----------------------------------------
-    	// No avatar?
-    	//-----------------------------------------
-		
-		if ( ! $overRide AND ipsRegistry::member()->getProperty('view_avs') == 0 )
-		{
-			return "";
-		}
-		
-		if( ! ipsRegistry::$settings['avatars_on'] )
-		{
-			return "";
-		}
-
-		//-----------------------------------------
-		// Load the member?
-		//-----------------------------------------
-
-		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) )
-		{
-			$member = self::load( $member, 'core,extendedProfile' );
-		}
-
-    	//-----------------------------------------
-    	// Defaults...
-    	//-----------------------------------------
-
-    	$davatar_dims	= explode( "x", strtolower(ipsRegistry::$settings['avatar_dims']) );
-		$default_a_dims	= explode( "x", strtolower(ipsRegistry::$settings['avatar_def']) );
-    	$this_dims		= explode( "x", strtolower($member['avatar_size']) );
-
-		if (!isset($this_dims[0])) $this_dims[0] = $davatar_dims[0];
-		if (!isset($this_dims[1])) $this_dims[1] = $davatar_dims[1];
-		if (!$this_dims[0]) $this_dims[0] = $davatar_dims[0];
-		if (!$this_dims[1]) $this_dims[1] = $davatar_dims[1];
-		
-		/* Gravatar defaults to 80px, so only set size if max dims are lower than 80 to prevent upscaling */
-		
-		$lowestSize		= $davatar_dims[0] < $davatar_dims[1] ? $davatar_dims[0] : $davatar_dims[1];
-
-		if( $lowestSize >= 80 )
-		{
-			$lowestSize	= '';
-		}
-
-		//-----------------------------------------
-		// Legacy: noavatar
-		//-----------------------------------------
-		
-		if( $member['avatar_location'] == 'noavatar' )
-		{
-			$member['avatar_location'] = '';
-		}
-		
-    	//-----------------------------------------
-    	// LEGACY: Determine type
-    	//-----------------------------------------
-
-		if ( ! $member['avatar_type'] )
-		{
-			if ( preg_match( '/^http:\/\//', $member['avatar_location'] ) )
-			{
-				$member['avatar_type'] = 'url';
-			}
-			else if ( strstr( $member['avatar_location'], "upload:" ) or ( strstr( $member['avatar_location'], 'av-' ) ) )
-			{
-				$member['avatar_type']   = 'upload';
-				$member['avatar_location'] = str_replace( 'upload:', '', $member['avatar_location'] );
-			}
-			else
-			{
-				$member['avatar_type'] = 'local';
-			}
-	 	}
-
-		//-----------------------------------------
-		// No cache?
-		//-----------------------------------------
-
-		if ( $no_cache && $member['avatar_type'] != 'gravatar' )
-		{
-			$member['avatar_location'] .= '?_time=' . time();
-		}
-
-		//-----------------------------------------
-		// URL avatar?
-		//-----------------------------------------
-
-		if ( $member['avatar_type'] == 'url' )
-		{
-			//-----------------------------------------
-			// Hide if in ACP for security (CSRF/XSS)
-			//-----------------------------------------
-			
-			if( IN_ACP )
-			{
-				return "<img src='" . ipsRegistry::$settings['skin_acp_url'] . "/_newimages/remote_avatar.png' alt='' />
-						<br /><a id='MF__avatar_link' href='" . ipsRegistry::$settings['base_url'] . "app=members&amp;module=members&amp;section=members&amp;do=remoteAvatarRedirect&amp;member_id=" . $member['member_id'] . "'>" . ipsRegistry::getClass('class_localization')->words['m_remoteavatar_link'] . "</a>";
-			}
-
-			if ( substr( $member['avatar_location'], -4 ) == ".swf" )
-			{
-				if( ipsRegistry::$settings['disable_flash'] )
-				{
-					return '';
-				}
-
-				return "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" width='{$this_dims[0]}' height='{$this_dims[1]}'>
-						<param name='movie' value='{$member['avatar_location']}'><param name='play' value='true'>
-						<param name='loop' value='true'><param name='quality' value='high'>
-						<param name='wmode' value='transparent'>
-						<embed src='{$member['avatar_location']}' width='{$this_dims[0]}' height='{$this_dims[1]}' play='true' loop='true' quality='high' wmode='transparent'></embed>
-						</object>";
-			}
-			else
-			{
-				return "<img src='{$member['avatar_location']}' width='{$this_dims[0]}' height='{$this_dims[1]}' alt='' />";
-			}
-		}
-		
-		/* Gravatar */
-		else if( $member['avatar_type'] == 'gravatar' && ipsRegistry::$settings['allow_gravatars'] )
-		{
-			$av_hash = md5( $member['avatar_location'] );
-			$s       = $lowestSize ? "s={$lowestSize}" : '';
-
-			return "<img src='http://www.gravatar.com/avatar/{$av_hash}?{$s}' alt='' />";
-		}
-		
-		/* Facebook or twitter */
-		else if( $member['avatar_type'] == 'facebook' OR $member['avatar_type'] == 'twitter' OR $member['avatar_type'] == 'vk' )
-		{
-			return "<img src='{$member['avatar_location']}' alt='' />";
-		}		
-
-		//-----------------------------------------
-		// Not a URL? Is it an uploaded avatar?
-		//-----------------------------------------
-
-		else if ( (ipsRegistry::$settings['avup_size_max'] > 1) and ( $member['avatar_type'] == 'upload' ) )
-		{
-			$member['avatar_location'] = str_replace( 'upload:', '', $member['avatar_location'] );
-
-			if ( substr( $member['avatar_location'], -4 ) == ".swf" )
-			{
-				if( ipsRegistry::$settings['disable_flash'] )
-				{
-					return '';
-				}
-
-				return "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" width='{$this_dims[0]}' height='{$this_dims[1]}'>
-						<param name='movie' value='" . ipsRegistry::$settings['upload_url'] . "/{$member['avatar_location']}'><param name='play' value='true'>
-						<param name='loop' value='true'><param name='quality' value='high'>
-						<param name='wmode' value='transparent'>
-					    <embed src='" . ipsRegistry::$settings['upload_url'] . "/{$member['avatar_location']}' width='{$this_dims[0]}' height='{$this_dims[1]}' play='true' loop='true' quality='high' wmode='transparent'></embed>
-						</object>";
-			}
-			else
-			{
-				$url = ipsRegistry::$settings['upload_url'] . "/{$member['avatar_location']}";
-
-				return "<img src='{$url}' width='{$this_dims[0]}' height='{$this_dims[1]}' alt='' />";
-			}
-		}
-
-		//-----------------------------------------
-		// No, it's not a URL or an upload, must
-		// be a normal avatar then
-		//-----------------------------------------
-
-		else if ($member['avatar_location'] != "")
-		{
-			//-----------------------------------------
-			// Do we have an avatar still ?
-		   	//-----------------------------------------
-
-		   	$url = ipsRegistry::$settings['avatars_url'] . "/{$member['avatar_location']}";
-
-			return "<img src='{$url}' alt='' />";
-		}
-		else if( ipsRegistry::$settings['allow_gravatars'] )
-		{
-			/* Try a gravatar, if all else fails */
-			$av_hash  = md5( $member['email'] );
-			$s        = $lowestSize ? "&amp;s={$lowestSize}" : '';
-			$blank_av = urlencode(ipsRegistry::$settings['avatars_url'] . '/blank_avatar.gif' ); 
-
-			return "<img src='http://www.gravatar.com/avatar/{$av_hash}?d={$blank_av}{$s}' alt='' />";
-		}
-    }
-
-	/**
-	 * Checks for a DB row that matches $email
-	 *
-	 * @param	string 		Email address
-	 * @return	boolean		Record exists
-	 */
-	static public function checkByEmail( $email )
-	{
-		$test = self::load( $email, '' );
-
-		if ( $test['member_id'] )
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Updates member's DB row password
-	 *
-	 * @param	string		Key: either member_id or email
-	 * @param	string		MD5-once hash of new password
-	 * @return	boolean		Update successful
-	 */
-	static public function updatePassword( $member_key, $new_md5_pass )
-	{
-		if ( ! $member_key or ! $new_md5_pass )
-		{
-			return false;
-		}
-
-		/* Load member */
-		$member = self::load( $member_key );
-
-		$new_pass = md5( md5( $member['members_pass_salt'] ) . $new_md5_pass );
-
-		self::save( $member_key, array( 'core' => array( 'members_pass_hash' => $new_pass ) ) );
-
-		return true;
-	}
-
-	/**
-	 * Check supplied password with database
-	 *
-	 * @param	string		Key: either member_id or email
-	 * @param	string		MD5 of entered password
-	 * @return	boolean		Password is correct
-	 */
-	static public function authenticateMember( $member_key, $md5_once_password )
-	{
-		/* Load member */
-		$member = self::load( $member_key );
-
-		if ( ! $member['member_id'] )
-		{
-			return FALSE;
-		}
-
-		if ( $member['members_pass_hash'] == self::generateCompiledPasshash( $member['members_pass_salt'], $md5_once_password ) )
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Generates a compiled passhash.
-	 * Returns a new MD5 hash of the supplied salt and MD5 hash of the password
-	 *
-	 * @param	string		User's salt (5 random chars)
-	 * @param	string		User's MD5 hash of their password
-	 * @return	string		MD5 hash of compiled salted password
-	 */
-	static public function generateCompiledPasshash( $salt, $md5_once_password )
-	{
-		return md5( md5( $salt ) . $md5_once_password );
-	}
-
-	/**
-	 * Generates a password salt.
-	 * Returns n length string of any char except backslash
-	 *
-	 * @param	integer		Length of desired salt, 5 by default
-	 * @return	string		n character random string
-	 */
-	static public function generatePasswordSalt($len=5)
-	{
-		$salt = '';
-
-		for ( $i = 0; $i < $len; $i++ )
-		{
-			$num   = mt_rand(33, 126);
-
-			if ( $num == '92' )
-			{
-				$num = 93;
-			}
-
-			$salt .= chr( $num );
-		}
-
-		return $salt;
-	}
-
-	/**
-	 * Generates a log in key
-	 *
-	 * @param	integer		Length of desired random chars to MD5
-	 * @return	string		MD5 hash of random characters
-	 */
-	static public function generateAutoLoginKey( $len=60 )
-	{
-		$pass = self::generatePasswordSalt( $len );
-
-		return md5($pass);
-	}
-
-	/**
-	 * Check to see if a member is in a group or not
-	 *
-	 * @param	mixed		Either INT (member_id) OR Array of member data [MUST at least include member_group_id and mgroup_others]
-	 * @param	mixed		Either INT (group ID) or array of group IDs
-	 * @param	boolean		TRUE (default, check secondary groups also), FALSE (check primary only)
-	 * @return	boolean		TRUE (is in group) - FALSE (not in group)
-	 */
-	static public function isInGroup( $member, $group, $checkSecondary=true )
-	{
-		$memberData = ( is_array( $member ) ) ? $member : self::load( $member, 'core' );
-		$group      = ( is_array( $group ) )  ? $group  : array( $group );
-		$others		= explode( ',', $memberData['mgroup_others'] );
-		
-		if ( ! $memberData['member_group_id'] OR ! count( $group ) )
-		{
-			return FALSE;
-		}
-		
-		/* Loop */
-		foreach( $group as $gid )
-		{
-			if ( $gid == $memberData['member_group_id'] )
-			{
-				return true;
-			}
-			
-			if ( $checkSecondary AND is_array( $others ) AND count( $others ) )
-			{
-				if ( in_array( $gid, $others ) )
-				{
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Check to see if a member is banned (or not)
-	 *
-	 * @param	string		Type of ban check (ip/ipAddress, name, email)
-	 * @param	string		String to check
-	 * @return	boolean		TRUE (banned) - FALSE (not banned)
-	 */
-	static public function isBanned( $type, $string )
-	{
-		/* Try and be helpful */
-		switch ( strtolower( $type ) )
-		{
-			case 'ip':
-				$type = 'ipAddress';
-			break;
-			case 'emailaddress':
-				$type = 'email';
-			break;
-			case 'username':
-			case 'displayname':
-				$type = 'name';
-			break;
-		}
-
-		if ( $type == 'ipAddress' )
-		{
-			$banCache = ipsRegistry::cache()->getCache('banfilters');
-		}
-		else
-		{
-			if ( ! is_array( self::$_banFiltersCache ) )
-			{
-				self::$_banFiltersCache = array();
-
-				/* Load Ban Filters */
-				ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'banfilters' ) );
-				ipsRegistry::DB()->execute();
-
-				while( $r = ipsRegistry::DB()->fetch() )
-				{
-					self::$_banFiltersCache[ $r['ban_type'] ][] = $r['ban_content'];
-				}
-			}
-
-			$banCache = self::$_banFiltersCache[ $type ];
-		}
-
-		if ( is_array( $banCache ) and count( $banCache ) )
-		{
-			foreach( $banCache as $entry )
-			{
-				$ip = str_replace( '\*', '.*', preg_quote( trim($entry), "/") );
-
-				if ( $ip AND preg_match( "/^$ip$/", $string ) )
-				{
-					return TRUE;
-				}
-			}
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 * Check to see if a member is ignorable or not
-	 *
-	 * @param	int			Member's primary group ID
-	 * @param	string		Comma delisted list of 'other' member groups
-	 * @param	string		Type: 'post' or 'pm'
-	 * @return	boolean		True (member is ignorable) or False (member can not be ignored)
-	 */
-	static public function isIgnorable( $member_group_id, $mgroup_others, $type='post' )
-	{
-		if( ! isset( ipsRegistry::$settings['_unblockableArray'] ) OR ! is_array( ipsRegistry::$settings['_unblockableArray'] ) )
-		{
-			ipsRegistry::$settings['_unblockableArray'] = ipsRegistry::$settings['cannot_ignore_groups'] ? explode( ",", IPSText::cleanPermString( ipsRegistry::$settings['cannot_ignore_groups'] ) ) : array();
-		}
-
-		$myGroups    = array( $member_group_id );
-
- 		if ( $mgroup_others )
- 		{
-	 		$myGroups = array_merge( $myGroups, explode( ",", IPSText::cleanPermString( $mgroup_others ) ) );
- 		}
- 		
- 		/* Check PMs first */
- 		if ( $type == 'pm' )
- 		{
- 			$unblockable = explode( ",", ipsRegistry::$settings['unblockable_pm_groups'] );
- 			
- 			/* Override with groups */
-			if ( is_array( $unblockable ) AND count( $unblockable ) )
-			{
-				if ( in_array( $member_group_id, $unblockable ) )
-				{
-					return FALSE;
-				}
-			}
- 		}
- 		
- 		foreach( $myGroups as $member_group )
- 		{
-	 		if ( in_array( $member_group, ipsRegistry::$settings['_unblockableArray'] ) )
-	 		{
-		 		return FALSE;
-	 		}
-	 	}
-
-		return TRUE;
-	}
-
-	/**
-	 * Easy peasy way to grab a function from member/memberFunctions.php
-	 * without having to bother setting it up each time.
-	 *
-	 * @return	object		memberFunctions object
-	 * @author	MattMecham
-	 */
-	static public function getFunction()
-	{
-		if ( ! is_object( self::$_memberFunctions ) )
-		{
-			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/memberFunctions.php', 'memberFunctions' );
-			self::$_memberFunctions = new $classToLoad( ipsRegistry::instance() );
-		}
-
-		return self::$_memberFunctions;
-	}
-
-	/**
-	 * Set the cache to ignore
-	 * Works for one LOAD only! It's reset again for the next load
-	 *
-	 * @return	void
-	 */
-	static public function ignoreCache()
-	{
-		self::$ignoreCache = TRUE;
-	}
-
-	/**
-	 * Adds a member to the cache
-	 *
-	 * @param	array 		Member Data
-	 * @param	array 		Tables queried
-	 * @return	void
-	 */
-	static private function _addToCache( $memberData, $tables )
-	{
-		if ( ! $memberData['member_id'] OR ! is_array( $tables ) )
-		{
-			return FALSE;
-		}
-
-		$_tables = self::__buildTableHash( $tables );
-
-		self::$memberCache[ $memberData['member_id'] ][ $_tables ] = $memberData;
-//print round( memory_get_usage() / 1048576 * 100 ) / 100 . ' mb';
-		self::$debugData[] = "ADDED: Member ID: " . $memberData['member_id'] . " with tables " . implode( ",", $tables ). ' key ('.$_tables.')';
-	}
-
-	/**
-	 * Removes a member from the cache
-	 *
-	 * @param	int 		Member ID
-	 * @return	void
-	 */
-	static private function _removeFromCache( $memberID )
-	{
-		if ( is_array( self::$memberCache[ $memberID ] ) )
-		{
-			unset( self::$memberCache[ $memberID ] );
-
-			self::$debugData[] = "REMOVED: Member ID: " . $memberID;
-		}
-	}
-
-	/**
-	 * Removes a member from the cache
-	 *
-	 * @param	int 		Member ID to look for
-	 * @param	array 		Tables required
-	 * @return	mixed		Array of data if a match is found, or FALSE if not.
-	 */
-	static private function _fetchFromCache( $memberID, $tables )
-	{
-		if ( self::$ignoreCache === TRUE )
-		{
-			return FALSE;
-		}
-
-		if ( ! $memberID OR ! is_array( $tables ) )
-		{
-			return FALSE;
-		}
-
-		$_tables = self::__buildTableHash( $tables );
-
-		if ( isset( self::$memberCache[ $memberID ][ $_tables ] ) && is_array( self::$memberCache[ $memberID ][ $_tables ] ) )
-		{
-			self::$debugData[] = "FETCHED: Member ID: " . $memberID. ' key ('.$_tables.')';
-
-			return self::$memberCache[ $memberID ][ $_tables ];
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-
-	/**
-	 * Updates a member from the cache
-	 *
-	 * @param	int 		Member ID to update
-	 * @param	array 		Array of data to update(eg: array( 'core' => 'member_login_key' => 'xxxxx' ) )
-	 * @return	mixed		Array of data if a match is found, or FALSE if not.
-	 */
-	static private function _updateCache( $memberID, $data )
-	{
-		if ( ! $memberID OR ! is_array( $data ) )
-		{
-			return FALSE;
-		}
-
-		if ( is_array( self::$memberCache[ $memberID ] ) )
-		{
-			foreach(  self::$memberCache[ $memberID ] as $tableData => $memberData )
-			{
-				foreach( $data as $table => $newData )
-				{
-					foreach( $newData as $k => $v )
-					{
-						self::$memberCache[ $memberID ][ $tableData ][ $k ] = $v;
-					}
-				}
-			}
-
-			self::$debugData[] = "Updated: Member ID: " . $memberID;
-
-			return TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-
-	/**
-	 * Build table key.
-	 * Takes an array of tables and returns an MD5 comparison hash
-	 *
-	 * @param	array 		Array of tables
-	 * @return	string		MD5 hash
-	 */
-	static private function __buildTableHash( $tables )
-	{
-		sort( $tables );
-		return md5( implode( ',', $tables ) );
-	}
-
-	/**
-	 * Sends a query to the IPS Spam Service
-	 *
-	 * @param	string		$email		Email address to check/report
-	 * @param	string		[$ip]		IP Address to check report, ipsRegistry::member()->ip_address will be used if the address is not specified
-	 * @param	string		[$type]		Either register or markspam, register is default
-	 * @return	string
-	 */
-
-}
diff --git a/upload/admin/sources/base/index.html b/upload/admin/sources/base/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/base/index.html
+++ b/upload/admin/sources/base/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/base/ipsController.php b/upload/admin/sources/base/ipsController.php
index e05a5488..9fe9374b 100644
--- a/upload/admin/sources/base/ipsController.php
+++ b/upload/admin/sources/base/ipsController.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Primary controller
- * Last Updated: $LastChangedDate: 2010-10-22 16:22:45 -0400 (Fri, 22 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-09-16 07:16:26 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 7019 $
+ * @version		$Rev: 9496 $
  */
 
 /**
@@ -31,10 +31,10 @@ class ipsController
 	/**
 	 * Registry reference
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $registry;
+	protected $registry;
 	
 	/**
 	 * Command
@@ -48,7 +48,7 @@ class ipsController
 	 * Constructor
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function __construct() { }
 
@@ -56,7 +56,7 @@ class ipsController
 	 * Public facing function to run the controller
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function run()
 	{
@@ -69,7 +69,7 @@ class ipsController
 	 * Initialize ipsRegistry and this class
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function init()
 	{
@@ -81,7 +81,7 @@ class ipsController
 	 * Handle the incoming request using the command resolver
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function handleRequest()
 	{
@@ -94,10 +94,18 @@ class ipsController
 		catch( Exception $e )
 		{
 			$msg = $e->getMessage();
-			
+
 			/* An error occured, so throw a 404 */
 			try
 			{
+				/* The following patch prevents links such as /admin/index.php?adsess=123&app=anyrandomnamehere&module=login&do=login-complete from loading 
+					an ACP error screen complete with wrapper, which may expose the applications that are installed to an end user.
+					This issue was reported by Christopher Truncer via the IPS ticket system. */
+				if( IN_ACP AND !$this->registry->member()->getProperty('member_id') )
+				{
+					$this->registry->getClass('output')->silentRedirect( ipsRegistry::$settings['base_url'] );
+				}
+
 				$this->registry->getClass('output')->showError( 'incorrect_furl', 404, null, null, 404 );
 			}
 			catch( Exception $e )
@@ -126,21 +134,20 @@ class ipsController_CommandResolver
 	/**#@+
 	 * Internal strings to remember
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private static $base_cmd;
-	private static $ajax_cmd;
-	private static $default_cmd;
-	private static $modules_dir  = 'modules_public';
-	private static $class_dir    = 'public';
+	protected static $base_cmd;
+	protected static $default_cmd;
+	protected static $modules_dir  = 'modules_public';
+	protected static $class_dir    = 'public';
 	/**#@-*/
 	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -173,29 +180,36 @@ class ipsController_CommandResolver
 		{
 			throw new Exception( "The specified application has been disabled" );
 		}
+		if ( !IN_ACP and !IPSLib::moduleIsEnabled( $module, IPS_APP_COMPONENT ) and $module != 'ajax' )
+		{
+			throw new Exception( "The specified module has been disabled" );
+		}
 				
 		/* Got a section? */
 		if ( ! $section )
 		{
-			if ( file_exists( $filepath . 'defaultSection.php' ) )
+			if ( is_file( $filepath . 'defaultSection.php' ) )
 			{
 				$DEFAULT_SECTION = '';
-				require( $filepath . 'defaultSection.php' );
+				include( $filepath . 'defaultSection.php' );/*noLibHook*/
 
 				if ( $DEFAULT_SECTION )
 				{
 					$section = $DEFAULT_SECTION;
+					
+					ipsRegistry::$current_section	= $section;
 				}
 			}
 		}
 
 		$_classname = self::$class_dir . '_' .  IPS_APP_COMPONENT . '_' . $module . '_';
 		
+		/* Rarely used, let's leave file_exists which is faster for non-existent files */
 		if ( file_exists( $filepath . 'manualResolver.php' ) )
 		{
 			$classname = IPSLib::loadActionOverloader( $filepath . 'manualResolver.php'	, $_classname . 'manualResolver' );
 		}
-		else if ( file_exists( $filepath . $section . '.php' ) )
+		else if ( is_file( $filepath . $section . '.php' ) )
 		{
 			$classname = IPSLib::loadActionOverloader( $filepath . $section . '.php'	, $_classname . $section );
 		}
@@ -245,7 +259,7 @@ abstract class ipsCommand
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	final public function __construct()
 	{
@@ -256,7 +270,7 @@ abstract class ipsCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function makeRegistryShortcuts( ipsRegistry $registry )
 	{
@@ -270,6 +284,8 @@ abstract class ipsCommand
 		$this->memberData =& $this->registry->member()->fetchMemberData();
 		$this->cache      =  $this->registry->cache();
 		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		$this->memberData = IPSMember::setUpModerator( $this->memberData );
 	}
 
 	/**
@@ -277,10 +293,11 @@ abstract class ipsCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function execute( ipsRegistry $registry )
 	{
+		//$registry->getClass('class_permissions')
 		$this->makeRegistryShortcuts( $registry );
 		$this->doExecute( $registry );
 	}
@@ -290,14 +307,14 @@ abstract class ipsCommand
 	 *
 	 * @access	protected
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected abstract function doExecute( ipsRegistry $registry );
 }
 
 /**
  * Abstract class for handling ajax requests
- **/
+ */
 
 
 abstract class ipsAjaxCommand
@@ -314,7 +331,9 @@ abstract class ipsAjaxCommand
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	protected $ajax;
 	/**#@-*/
 	
@@ -322,12 +341,12 @@ abstract class ipsAjaxCommand
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	final public function __construct()
 	{
 	}
-
+	
 	/**
 	 * Magic function to catch all the ajax methods
 	 *
@@ -335,20 +354,11 @@ abstract class ipsAjaxCommand
 	 * @param	string  $func       Function name being called
 	 * @param	array   $arguments  Array of parameters
 	 * @return	mixed
-	 **/
+	 */
 	public function __call( $func, $arguments )
 	{
 		if( method_exists( $this->ajax, $func ) )
 		{
-			foreach( $arguments as $k => $v )
-			{
-				if( is_string( $v ) )
-				{
-					/* Remove unused hook comments */
-			//		$arguments[$k] = preg_replace( "#<!--hook\.([^\>]+?)-->#", '', $arguments[$k] );
-				}
-			}
-			
 			return call_user_func_array( array( $this->ajax, $func ), $arguments );
 		}
 	}
@@ -358,8 +368,8 @@ abstract class ipsAjaxCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function makeRegistryShortcuts( ipsRegistry $registry )
 	{
 		/* Make registry objects */
@@ -373,6 +383,8 @@ abstract class ipsAjaxCommand
 		$this->cache      =  $this->registry->cache();
 		$this->caches     =& $this->registry->cache()->fetchCaches();
 		
+		$this->memberData = IPSMember::setUpModerator( $this->memberData );
+		
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
 		$this->ajax  = new $classToLoad();
 		
@@ -385,10 +397,10 @@ abstract class ipsAjaxCommand
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function execute( ipsRegistry $registry )
-	{
+	{ 
 		/* Setup Shortcuts First */
 		$this->makeRegistryShortcuts( $registry );
 		
@@ -411,7 +423,7 @@ abstract class ipsAjaxCommand
 	 *
 	 * @access	protected
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected abstract function doExecute( ipsRegistry $registry );
 }
@@ -424,7 +436,7 @@ class ipsCommand_default extends ipsCommand
 	 *
 	 * @access	protected
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function doExecute( ipsRegistry $registry )
 	{
@@ -452,7 +464,7 @@ class ipsCommand_default extends ipsCommand
 		// Uh oh, this is a big one.. (no forums app)
 		//-----------------------------------------
 
-		if ( ! file_exists( $filepath ) )
+		if ( ! is_file( $filepath ) )
 		{
 			$this->registry->getClass('output')->showError( array( 'command_file_missing', $filepath ), 401100, null, null, 404 );
 		}
diff --git a/upload/admin/sources/base/ipsMember.php b/upload/admin/sources/base/ipsMember.php
new file mode 100644
index 00000000..b4490cb8
--- /dev/null
+++ b/upload/admin/sources/base/ipsMember.php
@@ -0,0 +1,3852 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Static Member Class for IP.Board 3
+ *
+ * Last Updated: $Date: 2011-10-11 21:18:16 -0400 (Tue, 11 Oct 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		12th March 2002
+ * @version		$Revision: 9599 $
+ *
+ * @author	Matt
+ */
+ 
+/**
+ * Some constants
+ */
+define( 'IPS_MEMBER_PHOTO_NO_CACHE', true );
+
+/**
+* IPSMember
+*
+* This deals with member data and some member functions
+*/
+class IPSMember
+{
+	/**
+	 * Custom fields class
+	 *
+	 * @var		object
+	 */
+	static protected $custom_fields_class;
+
+	/**
+	 * Member cache
+	 *
+	 * @var		array
+	 */
+	static protected $memberCache = array();
+
+	/**
+	 * Ignore cache
+	 *
+	 * @var		boolean
+	 */
+	static protected $ignoreCache = FALSE;
+
+	/**
+	 * Debug data
+	 *
+	 * @var		array
+	 */
+	static public $debugData = array();
+
+	/**
+	 * memberFunctions object reference
+	 *
+	 * @var		object
+	 */
+	static protected $_memberFunctions;
+
+	/**
+	 * Parsed signatures to save resources
+	 *
+	 * @var		array
+	 */
+	static protected $_parsedSignatures	= array();
+	
+	/**
+	 * Parsed custom fields to save resources
+	 *
+	 * @var		array
+	 */
+	static protected $_parsedCustomFields	= array();
+	
+	/**
+	 * Parsed custom fields to save resources
+	 *
+	 * @var		array
+	 */
+	static protected $_parsedCustomGroups	= array();
+
+	/**
+	 * Ban filters cache
+	 *
+	 * @var		array
+	 */
+	static public $_banFiltersCache = NULL;
+
+	/**
+	 * Member data array
+	 *
+	 * @var		array
+	 */
+	static public $data = array( 'member_id'            => 0,
+								 'name'                 => "",
+								 'members_display_name' => "",
+								 'member_group_id'      => 0,
+								 'member_forum_markers' => array() );
+
+	/**
+	 * Remapped table array used in load and save
+	 *
+	 * @var		array
+	 */
+	static protected $remap = array( 'core'               => 'members',
+							       'extendedProfile'    => 'profile_portal',
+							       'customFields'       => 'pfields_content',
+							       'itemMarkingStorage' => 'core_item_markers_storage' );
+
+	/**
+	 * Create profile link 
+	 *
+	 * @param	string		User's display name
+	 * @param	integer		User's DB ID
+	 * @param	string		SEO display name
+	 * @param	string		Classname
+	 * @return	string		Parsed a href link
+	 * @since	2.0
+	 */
+	static public function makeProfileLink($name, $id="", $_seoName="", $className='')
+	{
+		/* Cache so we don't have to rebuild on each call */
+		static $cache	= array();
+		$_key			= md5($id.$name.$_seoName.$className);
+		
+		if( $cache[ $_key ] )
+		{
+			return $cache[ $_key ];
+		}
+		
+		if ( $id > 0 )
+		{
+			$_seoName = ( $_seoName ) ? $_seoName : IPSText::makeSeoTitle( $name );
+			
+			$cache[ $_key ]	= "<a hovercard-ref=\"member\" hovercard-id=\"{$id}\" class=\"_hovertrigger url fn {$className}\" href='" . ipsRegistry::getClass('output')->buildSEOUrl( 'showuser=' . $id, 'public', $_seoName, 'showuser' ) . "'>{$name}</a>";
+		}
+		else
+		{
+			$cache[ $_key ]	= $name;
+		}
+		
+		return $cache[ $_key ];
+	}
+
+	/**
+	 * Unpack group bitwise options
+	 *
+	 * @param	array
+	 * @param	bool		Do not warn on overwrite
+	 * @return  array
+	 */
+	static public function unpackGroup( $group, $silence=false )
+	{
+		/* Cache to prevent having to thaw each call, which could be hundreds on a given page */
+		static $cache	= array();
+		
+		if( $cache[ $group['g_id'] ] )
+		{
+			return array_merge( $group, $cache[ $group['g_id'] ] );
+		}
+
+		/* Unpack bitwise fields */
+		$_tmp	= IPSBWOptions::thaw( $group['g_bitoptions'], 'groups', 'global' );
+
+		if ( count( $_tmp ) )
+		{
+			foreach( $_tmp as $k => $v )
+			{
+				/* Trigger notice if we have DB field */
+				if ( $silence === false AND isset( $group[ $k ] ) )
+				{
+					trigger_error( "Thawing bitwise options for GROUPS: Bitwise field '$k' has overwritten DB field '$k'", E_USER_WARNING );
+				}
+
+				$cache[ $group['g_id'] ][ $k ] = $v;
+			}
+		}
+		
+		/* Unpack photo limits */
+		list( $p_max, $p_width, $p_height ) = explode( ":", $group['g_photo_max_vars'] );
+		
+		$cache[ $group['g_id'] ]['photoMaxKb']     = intval( $p_max );
+		$cache[ $group['g_id'] ]['photoMaxWidth']  = intval( $p_width );
+		$cache[ $group['g_id'] ]['photoMaxHeight'] = intval( $p_height );
+
+		return array_merge( $group, $cache[ $group['g_id'] ] );
+	}
+
+	/**
+	 * Create a random 15 character password
+	 *
+	 * @return	string	Password
+	 * @since	2.0
+	 */
+	public static function makePassword()
+	{
+		$pass = "";
+
+		// Want it random you say, eh?
+		// (enter evil laugh)
+
+		$unique_id 	= uniqid( mt_rand(), TRUE );
+		$prefix		= IPSMember::generatePasswordSalt();
+		$unique_id .= md5( $prefix );
+
+		usleep( mt_rand(15000,1000000) );
+		// Hmm, wonder how long we slept for
+
+		$new_uniqueid = uniqid( mt_rand(), TRUE );
+
+		$final_rand = md5( $unique_id . $new_uniqueid );
+
+		for ($i = 0; $i < 15; $i++)
+		{
+			$pass .= $final_rand{ mt_rand(0, 31) };
+		}
+
+		return $pass;
+	}
+	
+	/**
+	 * Checks to see if the logged in user can recieve mobile notifications
+	 *
+	 * @param	array 		$memberData		Optional, logged in user will be used if this is not passed in
+	 * @return	BOOL
+	 */
+	static public function canReceiveMobileNotifications( $memberData=array() )
+	{
+		/* INIT */
+		$memberData = ( is_array( $memberData ) && count( $memberData ) ) ? $memberData : ipsRegistry::member()->fetchMemberData();
+
+		/* Check to see if notifications are enabled */
+		if( ! ipsRegistry::$settings['iphone_notifications_enabled'] )
+		{
+			return false;
+		}
+		
+		/* Check to see if the user has permission to get notifications */
+		if( ipsRegistry::$settings['iphone_notifications_groups'] )
+		{
+			if( IPSMember::isInGroup( $memberData, explode( ',', ipsRegistry::$settings['iphone_notifications_groups'] ) ) )
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Format name based on group suffix/prefix
+	 *
+	 * @param	string		User's display name
+	 * @param	integer		User's group ID
+	 * @param	string  	Optional prefix override (uses group setting if not provided)
+	 * @param	string  	Optional suffix override (uses group setting if not provided)
+	 * @return	string		Formatted name
+	 * @since	2.2
+	 */
+	public static function makeNameFormatted($name='', $group_id="", $prefix="", $suffix="")
+	{
+		if ( ipsRegistry::$settings['ipb_disable_group_psformat'] )
+		{
+			return $name;
+		}
+
+		if ( ! $group_id )
+		{
+			$group_id = 0;
+		}
+
+		$groupCache = ipsRegistry::cache()->getCache('group_cache');
+
+		if ( ! $prefix )
+		{
+			if( $groupCache[ $group_id ]['prefix'] )
+			{
+				$prefix = $groupCache[ $group_id ]['prefix'];
+			}
+		}
+
+		if( ! $suffix )
+		{
+			if( $groupCache[ $group_id ]['suffix'] )
+			{
+				$suffix = $groupCache[ $group_id ]['suffix'];
+			}
+		}
+		
+		if ( ! $name )
+		{
+			if( $groupCache[ $group_id ]['g_title'] )
+			{
+				$name = $groupCache[ $group_id ]['g_title'];
+			}
+		}
+
+		return $prefix.$name.$suffix;
+	}
+
+	/**
+	 * Create new member
+	 * Very basic functionality at this point.
+	 *
+	 * @param	array 	Fields to save in the following format: array( 'members'      => array( 'email'     => 'test@test.com',
+	 *																				         'joined'   => time() ),
+	 *															   'extendedProfile' => array( 'signature' => 'My signature' ) );
+	 *					Tables: members, pfields_content, profile_portal.
+	 *					You can also use the aliases: 'core [members]', 'extendedProfile [profile_portal]', and 'customFields [pfields_content]'
+	 * @param	bool	Flag to attempt to auto create a name if the desired is taken
+	 * @param	bool	Bypass custom field saving (if using the sso session integration this is required as member object isn't ready yet)
+	 * @param	bool	Whether or not to recache the stats so as to update the board's last member data
+	 * @return	array 	Final member Data including member_id
+	 *
+	 * EXCEPTION CODES
+	 * CUSTOM_FIELDS_EMPTY    - Custom fields were not populated
+	 * CUSTOM_FIELDS_INVALID  - Custom fields were invalid
+	 * CUSTOM_FIELDS_TOOBIG   - Custom fields too big
+	 */
+	static public function create( $tables=array(), $autoCreateName=FALSE, $bypassCfields=FALSE, $doStatsRecache=TRUE )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$finalTables	= array();
+		$password		= '';
+		$plainPassword	= '';
+		$bitWiseFields  = ipsRegistry::fetchBitWiseOptions( 'global' );
+		$md_5_password	= '';
+		
+		//-----------------------------------------
+		// Remap tables if required
+		//-----------------------------------------
+		
+		foreach( $tables as $table => $data )
+		{
+			$_name = ( isset( self::$remap[ $table ] ) ) ? self::$remap[ $table ] : $table;
+			
+			if ( $_name == 'members' )
+			{
+				/* Magic password field */
+				$password		= ( isset( $data['password'] ) ) ? trim( $data['password'] ) : self::makePassword();
+				$plainPassword	= $password;
+				$md_5_password	= md5( $password );
+				
+				unset( $data['password'] );
+			}
+			
+			$finalTables[ $_name ] = $data;
+		}
+		
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+
+		if( !$bypassCfields )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+	    	$fields = new $classToLoad();
+	    	
+	    	if ( is_array( $finalTables['pfields_content'] ) AND count( $finalTables['pfields_content'] ) )
+			{
+				$fields->member_data = $finalTables['pfields_content'];
+			}
+			
+			$fields->initData( 'edit' );
+	    	$fields->parseToSave( $finalTables['pfields_content'], 'register' );
+
+			/* Check */
+			if( count( $fields->error_fields['empty'] ) )
+			{
+				//throw new Exception( 'CUSTOM_FIELDS_EMPTY' );
+			}
+			
+			if( count( $fields->error_fields['invalid'] ) )
+			{
+				//throw new Exception( 'CUSTOM_FIELDS_INVALID' );
+			}
+			
+			if( count( $fields->error_fields['toobig'] ) )
+			{
+				//throw new Exception( 'CUSTOM_FIELDS_TOOBIG' );
+			}
+		}
+
+    	//-----------------------------------------
+    	// Make sure the account doesn't exist
+    	//-----------------------------------------
+    	
+    	if( $finalTables['members']['email'] )
+    	{
+    		$existing	= IPSMember::load( $finalTables['members']['email'], 'all' );
+    		
+    		if( $existing['member_id'] )
+    		{
+    			$existing['full']		= true;
+    			$existing['timenow']	= time();
+    			
+    			return $existing;
+    		}
+    	}
+    	
+		//-----------------------------------------
+		// Fix up usernames and display names
+		//-----------------------------------------
+		
+		/* Ensure we have a display name */
+		if( $autoCreateName AND $finalTables['members']['members_display_name'] !== FALSE )
+		{
+			$finalTables['members']['members_display_name'] = ( $finalTables['members']['members_display_name'] ) ? $finalTables['members']['members_display_name'] : $finalTables['members']['name'];
+		}
+		
+		//-----------------------------------------
+		// Remove some basic HTML tags
+		//-----------------------------------------
+		
+		if( $finalTables['members']['members_display_name'] )
+		{
+			$finalTables['members']['members_display_name'] = str_replace( array( '<', '>', '"' ), '', $finalTables['members']['members_display_name'] );
+		}
+		
+		if( $finalTables['members']['name'] )
+		{
+			$finalTables['members']['name'] 				= str_replace( array( '<', '>', '"' ), '', $finalTables['members']['name'] );
+		}
+		
+		//-----------------------------------------
+		// Make sure the names are unique
+		//-----------------------------------------
+		
+		/* Can specify display name of FALSE to force no entry to force partial member */
+		if( $finalTables['members']['members_display_name'] !== FALSE )
+		{
+			try
+			{
+				if( IPSMember::getFunction()->checkNameExists( $finalTables['members']['members_display_name'], array(), 'members_display_name', true ) === true )
+				{
+					if ( $autoCreateName === TRUE )
+					{
+						/* Now, make sure we have a unique display name */
+						$max = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(member_id) as max',
+														 				'from'   => 'members',
+														 				'where'  => "members_l_display_name LIKE '" . ipsRegistry::DB()->addSlashes( mb_strtolower( $finalTables['members']['members_display_name'] ) ) . "%'" ) );
+
+
+						if ( $max['max'] )
+						{
+							$_num = $max['max'] + 1;
+							$finalTables['members']['members_display_name'] = $finalTables['members']['members_display_name'] . '_' . $_num;
+						}
+					}
+					else
+					{
+						$finalTables['members']['members_display_name']		= '';
+					}
+				}
+			}
+			catch( Exception $e )
+			{}
+		}
+		
+		if( $finalTables['members']['name'] )
+		{
+			try
+			{
+				if( IPSMember::getFunction()->checkNameExists( $finalTables['members']['name'], array(), 'name', true ) === true )
+				{
+					if ( $autoCreateName === TRUE )
+					{
+						/* Now, make sure we have a unique username */
+						$max = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'MAX(member_id) as max',
+														 				'from'   => 'members',
+														 				'where'  => "members_l_username LIKE '" . ipsRegistry::DB()->addSlashes( mb_strtolower( $finalTables['members']['name'] ) ) . "%'" ) );
+
+
+						if ( $max['max'] )
+						{
+							$_num = $max['max'] + 1;
+							$finalTables['members']['name'] = $finalTables['members']['name'] . '_' . $_num;
+						}
+					}
+					else
+					{
+						$finalTables['members']['name'] = '';
+					}
+				}
+			}
+			catch( Exception $e )
+			{}
+		}
+
+		//-----------------------------------------
+		// Clean up characters
+		//-----------------------------------------
+		
+		if( $finalTables['members']['name'] )
+		{
+			$userName		= IPSMember::getFunction()->cleanAndCheckName( $finalTables['members']['name'], array(), 'name' );
+			
+			if( $userName['errors'] )
+			{
+				$finalTables['members']['name']	= $finalTables['members']['email'];
+			}
+			else
+			{
+				$finalTables['members']['name']	= $userName['username'];
+			}
+		}
+		
+		if( $finalTables['members']['members_display_name'] )
+		{
+			$displayName	= IPSMember::getFunction()->cleanAndCheckName( $finalTables['members']['members_display_name'] );
+			
+			if( $displayName['errors'] )
+			{
+				$finalTables['members']['members_display_name']	= '';
+			}
+			else
+			{
+				$finalTables['members']['members_display_name']	= $displayName['members_display_name'];
+			}
+		}
+			
+		//-----------------------------------------
+		// Populate member table(s)
+		//-----------------------------------------
+
+		$finalTables['members']['members_l_username']		= isset($finalTables['members']['name']) ? mb_strtolower($finalTables['members']['name']) : '';
+		$finalTables['members']['joined']					= $finalTables['members']['joined'] ? $finalTables['members']['joined'] : time();
+		$finalTables['members']['email']					= $finalTables['members']['email'] ? $finalTables['members']['email'] : $finalTables['members']['name'] . '@' . $finalTables['members']['joined'];
+		$finalTables['members']['member_group_id']			= $finalTables['members']['member_group_id'] ? $finalTables['members']['member_group_id'] : ipsRegistry::$settings['member_group'];
+		$finalTables['members']['ip_address']				= $finalTables['members']['ip_address'] ? $finalTables['members']['ip_address'] : ipsRegistry::member()->ip_address;
+		$finalTables['members']['members_created_remote']	= intval( $finalTables['members']['members_created_remote'] );
+		$finalTables['members']['member_login_key']			= IPSMember::generateAutoLoginKey();
+		$finalTables['members']['member_login_key_expire']	= ( ipsRegistry::$settings['login_key_expire'] ) ? ( time() + ( intval( ipsRegistry::$settings['login_key_expire'] ) * 86400 ) ) : 0;
+		$finalTables['members']['view_sigs']				= 1;
+		$finalTables['members']['bday_day']					= intval( $finalTables['members']['bday_day'] );
+		$finalTables['members']['bday_month']				= intval( $finalTables['members']['bday_month'] );
+		$finalTables['members']['bday_year']				= intval( $finalTables['members']['bday_year'] );
+		$finalTables['members']['restrict_post']			= intval( $finalTables['members']['restrict_post'] );
+		$finalTables['members']['auto_track']				= $finalTables['members']['auto_track'] ? $finalTables['members']['auto_track'] : ipsRegistry::$settings['auto_track_method'];
+		$finalTables['members']['msg_count_total']			= 0;
+		$finalTables['members']['msg_count_new']			= 0;
+		$finalTables['members']['msg_show_notification']	= 1;
+		$finalTables['members']['coppa_user']				= 0;
+		$finalTables['members']['auto_track']				= substr( $finalTables['members']['auto_track'], 0, 50 );
+		$finalTables['members']['last_visit']				= $finalTables['members']['last_visit'] ? $finalTables['members']['last_visit'] : time();
+		$finalTables['members']['last_activity']			= $finalTables['members']['last_activity'] ? $finalTables['members']['last_activity'] : time();
+		$finalTables['members']['language']					= IPSLib::getDefaultLanguage();
+		$finalTables['members']['members_editor_choice']	= ipsRegistry::$settings['posting_allow_rte'] ? 'rte' : 'std';
+		$finalTables['members']['member_uploader']			= ipsRegistry::$settings['uploadFormType'] ? 'flash' : 'default';
+		$finalTables['members']['members_pass_salt']		= IPSMember::generatePasswordSalt(5);
+		$finalTables['members']['members_pass_hash']		= IPSMember::generateCompiledPasshash( $finalTables['members']['members_pass_salt'], $md_5_password );
+		$finalTables['members']['members_display_name']		= isset($finalTables['members']['members_display_name']) ? $finalTables['members']['members_display_name'] : '';
+		$finalTables['members']['members_l_display_name']	= isset($finalTables['members']['members_display_name']) ? mb_strtolower($finalTables['members']['members_display_name']) : '';
+		$finalTables['members']['fb_uid']	 	            = isset($finalTables['members']['fb_uid']) ? $finalTables['members']['fb_uid'] : 0;
+		$finalTables['members']['fb_emailhash']	            = isset($finalTables['members']['fb_emailhash']) ? strtolower($finalTables['members']['fb_emailhash']) : '';
+		$finalTables['members']['members_seo_name']         = IPSText::makeSeoTitle( $finalTables['members']['members_display_name'] );
+		$finalTables['members']['bw_is_spammer']            = intval( $finalTables['members']['bw_is_spammer'] );
+		
+		//-----------------------------------------
+		// Insert: MEMBERS
+		//-----------------------------------------
+		
+		ipsRegistry::DB()->setDataType( array( 'name', 'members_l_username', 'members_display_name', 'members_l_display_name', 'members_seo_name', 'email' ), 'string' );
+
+		/* Bitwise options */
+		if ( is_array( $bitWiseFields['members'] ) )
+		{
+			$_freeze = array();
+			
+			foreach( $bitWiseFields['members'] as $field )
+			{
+				if ( isset( $finalTables['members'][ $field ] ) )
+				{
+					/* Add to freezeable array */
+					$_freeze[ $field ] = $finalTables['members'][ $field ];
+					
+					/* Remove it from the fields to save to DB */
+					unset( $finalTables['members'][ $field ] );
+				}
+			}
+			
+			if ( count( $_freeze ) )
+			{
+				$finalTables['members']['members_bitoptions'] = IPSBWOptions::freeze( $_freeze, 'members', 'global' );
+			}
+		}
+			
+		ipsRegistry::DB()->insert( 'members', $finalTables['members'] );
+	
+		//-----------------------------------------
+		// Get the member id
+		//-----------------------------------------
+		
+		$finalTables['members']['member_id'] = ipsRegistry::DB()->getInsertId();
+
+		//-----------------------------------------
+		// Insert: PROFILE PORTAL
+		//-----------------------------------------
+
+		$finalTables['profile_portal']['pp_member_id']              = $finalTables['members']['member_id'];
+		$finalTables['profile_portal']['pp_setting_count_friends']  = 1;
+		$finalTables['profile_portal']['pp_setting_count_comments'] = 1;
+		$finalTables['profile_portal']['pp_setting_count_visitors'] = 1;
+		$finalTables['profile_portal']['pp_customization']			= serialize( array() );
+		
+		foreach( array( 'pp_last_visitors', 'pp_about_me', 'signature', 'fb_photo', 'fb_photo_thumb', 'pconversation_filters' ) as $f )
+		{
+			$finalTables['profile_portal'][ $f ] = ( $finalTables['profile_portal'][ $f ] ) ? $finalTables['profile_portal'][ $f ] : '';
+		}
+		
+		ipsRegistry::DB()->insert( 'profile_portal', $finalTables['profile_portal'] );
+		
+		//-----------------------------------------
+		// Insert into the custom profile fields DB
+		//-----------------------------------------
+		
+		if( !$bypassCfields )
+		{
+			/* Check the website url field */
+			$website_field = $fields->getFieldIDByKey( 'website' );
+			
+			if( $website_field && $fields->out_fields[ 'field_' . $website_field ] )
+			{
+				if( ! stristr( $fields->out_fields[ 'field_' . $website_field ], 'http://' ) )
+				{
+					$fields->out_fields[ 'field_' . $website_field ] = 'http://' . $fields->out_fields[ 'field_' . $website_field ];
+				}
+			}
+		
+			$fields->out_fields['member_id'] = $finalTables['members']['member_id'];
+			
+			ipsRegistry::DB()->delete( 'pfields_content', 'member_id=' . $finalTables['members']['member_id'] );
+			ipsRegistry::DB()->insert( 'pfields_content', $fields->out_fields );
+		}
+		else
+		{
+			ipsRegistry::DB()->delete( 'pfields_content', 'member_id=' . $finalTables['members']['member_id'] );
+			ipsRegistry::DB()->insert( 'pfields_content', array( 'member_id' => $finalTables['members']['member_id'] ) );
+		}
+
+		//-----------------------------------------
+		// Insert into partial ID table
+		//-----------------------------------------
+		
+		$full_account 	= false;
+		
+		if( $finalTables['members']['members_display_name'] AND $finalTables['members']['name'] AND $finalTables['members']['email'] AND $finalTables['members']['email'] != $finalTables['members']['name'] . '@' . $finalTables['members']['joined'] )
+		{
+			$full_account	= true;
+		}
+		
+		if ( ! $full_account )
+		{
+			ipsRegistry::DB()->insert( 'members_partial', array( 'partial_member_id' => $finalTables['members']['member_id'],
+														 		 'partial_date'      => $finalTables['members']['joined'],
+														 		 'partial_email_ok'  => ( $finalTables['members']['email'] == $finalTables['members']['name'] . '@' . $finalTables['members']['joined'] ) ? 0 : 1,
+								) 						);
+		}
+		
+		/* Add plain password and run sync */
+		$finalTables['members']['plainPassword'] = $plainPassword;
+		
+		IPSLib::runMemberSync( 'onCreateAccount', $finalTables['members'] );
+		
+		/* Remove plain password */
+		unset( $finalTables['members']['plainPassword'] );
+		
+		//-----------------------------------------
+		// Recache our stats (Ticket 627608)
+		//-----------------------------------------
+		
+		if ( $doStatsRecache == TRUE )
+		{
+			ipsRegistry::cache()->rebuildCache( 'stats', 'global' );
+		}
+															
+		return array_merge( $finalTables['members'], $finalTables['profile_portal'], !$bypassCfields ? $fields->out_fields : array(), array( 'timenow' => $finalTables['members']['joined'], 'full' => $full_account ) );
+	}
+
+	/**
+	 * Save member
+	 *
+	 * @param 	int		Member key: Either Array, ID or email address. If it's an array, it must be in the format:
+	 *					 array( 'core' => array( 'field' => 'member_id', 'value' => 1 ) ) - useful for passing custom fields through
+	 * @param 	array 	Fields to save in the following format: array( 'members'      => array( 'email'     => 'test@test.com',
+	 *																				         'joined'   => time() ),
+	 *															   'extendedProfile' => array( 'signature' => 'My signature' ) );
+	 *					Tables: members, pfields_content, profile_portal.
+	 *					You can also use the aliases: 'core [members]', 'extendedProfile [profile_portal]', and 'customFields [pfields_content]'
+	 * @return	boolean	True if the save was successful
+	 *
+	 * Exception Error Codes:
+	 * NO_DATA 		  : No data to save
+	 * NO_VALID_KEY    : No valid key to save
+	 * NO_AUTO_LOAD    : Could not autoload the member as she does not exist
+	 * INCORRECT_TABLE : Table one is attempting to save to does not exist
+	 * NO_MEMBER_GROUP_ID: Member group ID is in the array but blank
+	 */
+	static public function save( $member_key, $save=array() )
+	{
+		$member_id      = 0;
+		$member_email   = '';
+		$member_field   = '';
+		$_updated       = 0;
+		$bitWiseFields  = ipsRegistry::fetchBitWiseOptions( 'global' );
+		$member_k_array = array( 'members' => array(), 'pfields_content' => array(),  'profile_portal' => array() );
+		$_tables        = array_keys( $save );
+		$_MEMBERKEY     = 'member_id';
+		$_MEMBERVALUE   = $member_key;
+		
+		//-----------------------------------------
+		// Test...
+		//-----------------------------------------
+
+		if ( ! is_array( $save ) OR ! count( $save ) )
+		{
+			throw new Exception( 'NO_DATA' );
+		}
+
+		//-----------------------------------------
+		// ID or email?
+		//-----------------------------------------
+
+		if ( ! is_array( $member_key ) )
+		{
+			if ( strstr( $member_key, '@' ) )
+			{
+				$_MEMBERKEY    = 'email';
+				
+				$member_k_array['members'] = array( 'field' => 'email',
+				 									'value' => "'" . ipsRegistry::instance()->DB()->addSlashes( strtolower( $member_key ) ) . "'" );
+
+				//-----------------------------------------
+				// Check to see if we've got more than the core
+				// table to save on.
+				//-----------------------------------------
+
+				$_got_more_than_core = FALSE;
+
+				foreach( $_tables as $table )
+				{
+					if ( isset( self::$remap[ $table ] ) )
+					{
+						$table = self::$remap[ $table ];
+					}
+
+					if ( $table != 'members' )
+					{
+						$_got_more_than_core = TRUE;
+						break;
+					}
+				}
+
+				if ( $_got_more_than_core === TRUE )
+				{
+					/* Get the ID */
+					$_memberTmp = self::load( $member_key, 'core' );
+				
+					if ( $_memberTmp['member_id'] )
+					{
+						$member_k_array['pfields_content'] = array( 'field' => 'member_id'   , 'value' => $_memberTmp['member_id'] );
+						$member_k_array['profile_portal']  = array( 'field' => 'pp_member_id', 'value' => $_memberTmp['member_id'] );
+					}
+					else
+					{
+						throw new Exception( "NO_AUTO_LOAD" );
+					}
+				}
+			}
+			else
+			{
+				$member_k_array['members']         = array( 'field' => 'member_id'    , 'value' => intval( $member_key ) );
+				$member_k_array['pfields_content'] = array( 'field' => 'member_id'    , 'value' => intval( $member_key ) );
+				$member_k_array['profile_portal']  = array( 'field' => 'pp_member_id' , 'value' => intval( $member_key ) );
+
+				self::_updateCache( $member_key, $save );
+			}
+		}
+		else
+		{
+			$_member_k_array = $member_k_array;
+
+			foreach( $member_key as $table => $data )
+			{
+				if ( isset( self::$remap[ $table ] ) )
+				{
+					$table = self::$remap[ $table ];
+				}
+
+				if ( ! in_array( $table, array_keys( $_member_k_array ) ) )
+				{
+					throw new Exception( 'INCORRECT_TABLE' );
+				}
+
+				$member_k_array[ $table ] = $data;
+			}
+		}
+
+		//-----------------------------------------
+		// Test...
+		//-----------------------------------------
+
+		if ( ! is_array( $member_k_array ) OR ! count( $member_k_array ) )
+		{
+			throw new Exception( 'NO_DATA' );
+		}
+
+		//-----------------------------------------
+		// Now save...
+		//-----------------------------------------
+
+		foreach( $save as $table => $data )
+		{
+			if ( isset( self::$remap[ $table ] ) )
+			{
+				$table = self::$remap[ $table ];
+			}
+
+			if ( $table == 'profile_portal' )
+			{
+				$data[ $member_k_array[ $table ]['field'] ] = $member_k_array[ $table ]['value'];
+
+				//-----------------------------------------
+				// Does row exist?
+				//-----------------------------------------
+
+				$check = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'pp_member_id', 'from' => 'profile_portal', 'where' => 'pp_member_id=' . $data['pp_member_id'] ) );
+
+				if( !$check['pp_member_id'] )
+				{
+					ipsRegistry::DB()->insert( $table, $data );
+				}
+				else
+				{
+					ipsRegistry::DB()->update( $table, $data, 'pp_member_id=' . $data['pp_member_id'] );
+				}
+			}
+			else if ( $table == 'pfields_content' )
+			{
+				$data[ $member_k_array[ $table ]['field'] ] = $member_k_array[ $table ]['value'];
+
+				//-----------------------------------------
+				// Does row exist?
+				//-----------------------------------------
+
+				$check = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id=' . $data['member_id'] ) );
+				
+				ipsRegistry::DB()->setDataType( array_keys( $data ), 'string' );
+
+				if( !$check['member_id'] )
+				{
+					ipsRegistry::DB()->insert( $table, $data );
+				}
+				else
+				{
+					ipsRegistry::DB()->update( $table, $data, 'member_id=' . $data['member_id'] );
+				}
+			}
+			else
+			{
+				if ( $table == 'members' )
+				{
+					/* Make sure we have a value for member_group_id if passed */
+					if ( isset( $data['member_group_id'] ) AND ! $data['member_group_id'] )
+					{
+						throw new Exception( "NO_MEMBER_GROUP_ID" );
+					}
+					
+					/* Some stuff that can end up  here */
+					unset( $data['_canBeIgnored'] );
+					
+					/* Bitwise options */
+					if ( is_array( $bitWiseFields['members'] ) )
+					{
+						$_freeze = array();
+						
+						foreach( $bitWiseFields['members'] as $field )
+						{
+							if ( isset( $data[ $field ] ) )
+							{
+								/* Add to freezeable array */
+								$_freeze[ $field ] = $data[ $field ];
+								
+								/* Remove it from the fields to save to DB */
+								unset( $data[ $field ] );
+							}
+						}
+						
+						if ( count( $_freeze ) )
+						{
+							$data['members_bitoptions'] = IPSBWOptions::freeze( $_freeze, 'members', 'global' );
+						}
+					}
+					
+					if( isset($data['members_display_name']) AND $data['members_display_name'] )
+					{
+						$data['members_l_display_name']	= mb_strtolower($data['members_display_name']);
+						$data['members_seo_name']		= IPSText::makeSeoTitle( $data['members_display_name'] );
+					}
+					
+					if( isset($data['name']) AND $data['name'] )
+					{
+						$data['members_l_username']		= mb_strtolower($data['name']);
+					}
+					
+					ipsRegistry::DB()->setDataType( array( 'name', 'title', 'members_l_username', 'members_display_name', 'members_l_display_name', 'members_seo_name' ), 'string' );
+					ipsRegistry::DB()->setDataType( array( 'msg_count_total', 'msg_count_new', 'members_bitoptions' ), 'int' );
+				}
+
+				ipsRegistry::DB()->update( $table, $data, $member_k_array[ $table ]['field'] . '=' . $member_k_array[ $table ]['value'] );
+			}
+
+			$_updated += ipsRegistry::instance()->DB()->getAffectedRows();
+		}
+
+		//-----------------------------------------
+		// If member login key is updated during
+		// session creation, this causes fatal error
+		//-----------------------------------------
+		
+		if( is_object( ipsRegistry::member() ) )
+		{
+			$save[ $_MEMBERKEY ] = $_MEMBERVALUE;
+			IPSLib::runMemberSync( 'onProfileUpdate', $save );
+		}
+
+		return ( $_updated > 0 ) ? TRUE : FALSE;
+	}
+
+	/**
+	 * Load member
+	 *
+	 * @param 	string	Member key: Either ID or email address OR array of IDs when $key_type is either ID or not set OR a list of $key_type strings (email address, name, etc)
+	 * @param 	string	Extra tables to load(all, none or comma delisted tables) Tables: members, pfields_content, profile_portal, groups, sessions, core_item_markers_storage.
+	 *					You can also use the aliases: 'extendedProfile', 'customFields' and 'itemMarkingStorage'
+	 * @param	string  Key type. Leave it blank to auto-detect or specify "id", "email", "username", "displayname".
+	 * @return	array   Array containing member data
+	 * <code>
+	 * # Single member
+	 * $member = IPSMember::load( 1, 'extendedProfile,groups' );
+	 * $member = IPSMember::load( 'matt@email.com', 'all' );
+	 * $member = IPSMember::load( 'MattM', 'all', 'displayname' ); // Can also use 'username', 'email' or 'id'
+	 * # Multiple members
+	 * $members = IPSMember::load( array( 1, 2, 10 ), 'all' );
+	 * $members = IPSMember::load( array( 'MattM, 'JoeD', 'DaveP' ), 'all', 'displayname' );
+	 * </code>
+	 */
+	static public function load( $member_key, $extra_tables='all', $key_type='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$member_value    = 0;
+		$members         = array();
+		$multiple_ids    = array();
+		$member_field    = '';
+		$joins           = array();
+		$tables          = array( 'pfields_content' => 0, 'profile_portal' => 0, 'core_item_markers_storage' => 0, 'groups' => 0, 'sessions' => 0 );
+		$remap           = array( 'extendedProfile'    => 'profile_portal',
+							      'customFields'       => 'pfields_content',
+							      'itemMarkingStorage' => 'core_item_markers_storage' );
+
+		//-----------------------------------------
+		// ID or email?
+		//-----------------------------------------
+
+		if ( ! $key_type )
+		{
+			if ( is_array( $member_key ) )
+			{
+				$multiple_ids = array_map( 'intval', $member_key ); // Bug #20908
+				$member_field = 'member_id';
+			}
+			else
+			{
+				if ( strstr( $member_key, '@' ) )
+				{
+					$member_value = "'" . ipsRegistry::DB()->addSlashes( strtolower( $member_key ) ) . "'";
+					$member_field = 'email';
+				}
+				else
+				{
+					$member_value = intval( $member_key );
+					$member_field = 'member_id';
+				}
+			}
+		}
+		else
+		{
+			switch( $key_type )
+			{
+				default:
+				case 'id':
+					if ( is_array( $member_key ) )
+					{
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = intval( $member_key );
+					}
+					$member_field = 'member_id';
+				break;
+				case 'fb_uid':
+					if ( is_array( $member_key ) )
+					{
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = is_numeric( $member_key ) ? $member_key : 0;
+					}
+					$member_field = 'fb_uid';
+					
+					if ( $member_value == 0 )
+					{
+						return array();
+					}
+				break;
+				case 'twitter_id':
+					if ( is_array( $member_key ) )
+					{
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = is_numeric( $member_key ) ? $member_key : 0;
+					}
+					$member_field = 'twitter_id';
+					
+					if ( $member_value == 0 )
+					{
+						return array();
+					}
+				break;
+				case 'vk_uid':
+					if ( is_array( $member_key ) )
+					{
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = is_numeric( $member_key ) ? $member_key : 0;
+					}
+					$member_field = 'vk_uid';
+					
+					if ( $member_value == 0 )
+					{
+						return array();
+					}
+				break;
+				case 'email':
+					if ( is_array( $member_key ) )
+					{
+						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( strtolower( $v ) ) . "\'";' ) );
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = "'" . ipsRegistry::DB()->addSlashes( strtolower( $member_key ) ) . "'";
+					}
+					$member_field = 'email';
+				break;
+				case 'username':
+					if ( is_array( $member_key ) )
+					{
+						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( mb_strtolower( $v ) ) . "\'";' ) );
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
+					}
+					$member_field = 'members_l_username';
+				break;
+				case 'displayname':
+					if ( is_array( $member_key ) )
+					{
+						array_walk( $member_key, create_function( '&$v,$k', '$v="\'".ipsRegistry::DB()->addSlashes( mb_strtolower( $v ) ) . "\'";' ) );
+						$multiple_ids = $member_key;
+					}
+					else
+					{
+						$member_value = "'" . ipsRegistry::DB()->addSlashes( mb_strtolower( $member_key ) ) . "'";
+					}
+					$member_field = 'members_l_display_name';
+				break;
+			}
+		}
+		
+		//-----------------------------------------
+		// Protected against member_id=0
+		//-----------------------------------------
+		
+		if( !count($multiple_ids) OR !is_array($multiple_ids) )
+		{
+			if( $member_field == 'member_id' AND !$member_value )
+			{
+				return array();
+			}
+		}
+
+		//-----------------------------------------
+		// Sort out joins...
+		//-----------------------------------------
+
+		if ( $extra_tables == 'all' )
+		{
+			foreach( $tables as $_table => $_val )
+			{
+				/* Let's not load sessions unless specifically requested */
+				if ( $_table == 'sessions' )
+				{
+					continue;
+				}
+				
+				/* Same deal with item marking */
+				if ( $_table == 'core_item_markers_storage' )
+				{
+					continue;
+				}
+
+				$tables[ $_table ] = 1;
+			}
+		}
+		else if ( $extra_tables )
+		{
+			$_tables = explode( ",", $extra_tables );
+
+			foreach( $_tables as $_t )
+			{
+				$_t = trim( $_t );
+				
+				if ( isset( $tables[ $_t ] ) )
+				{
+					$tables[ $_t ] = 1;
+				}
+				else if ( isset( self::$remap[ $_t ] ) )
+				{
+					if ( strstr( $tables[ self::$remap[ $_t ] ], ',' ) )
+					{
+						$__tables = explode( ',', $tables[ self::$remap[ $_t ] ] );
+
+						foreach( $__tables as $__t )
+						{
+							$tables[ $__t ] = 1;
+						}
+					}
+					else
+					{
+						$tables[ self::$remap[ $_t ] ] = 1;
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Grab used tables
+		//-----------------------------------------
+
+		$_usedTables = array();
+
+		foreach( $tables as $_name => $_use )
+		{
+			if ( $_use )
+			{
+				$_usedTables[] = $_name;
+			}
+		}
+
+		//-----------------------------------------
+		// Check the cache first...
+		//-----------------------------------------
+		
+		if ( $member_field == 'member_id' AND $member_value )
+		{
+			$member = self::_fetchFromCache( $member_value, $_usedTables );
+
+			if ( $member !== FALSE )
+			{
+				return $member;
+			}
+		}
+		else if( count($multiple_ids) AND is_array($multiple_ids) )
+		{
+			$_totalUsers	= count($multiple_ids);
+			$_gotFromCache	= 0;
+			$_fromCache		= array();
+			
+			foreach( $multiple_ids as $_memberValue )
+			{
+				$member = self::_fetchFromCache( $_memberValue, $_usedTables );
+				
+				if ( $member !== FALSE )
+				{
+					$_fromCache[ $member['member_id'] ]	= $member;
+					$_gotFromCache++;
+				}
+			}
+
+			//-----------------------------------------
+			// Did we find all the members in cache?
+			//-----------------------------------------
+			
+			if( $_gotFromCache == $_totalUsers )
+			{
+				return $_fromCache;
+			}
+		}
+
+		self::$ignoreCache = FALSE;
+
+		//-----------------------------------------
+		// Fix up joins...
+		//-----------------------------------------
+
+		if ( $tables['pfields_content'] )
+		{
+			$joins[] = array( 'select' => 'p.*',
+						  	  'from'   => array( 'pfields_content' => 'p' ),
+						  	  'where'  => 'p.member_id=m.member_id',
+						  	  'type'   => 'left' );
+		}
+
+		if ( $tables['profile_portal'] )
+		{
+			$joins[] = array( 'select' => 'pp.*',
+						  	  'from'   => array( 'profile_portal' => 'pp' ),
+							  'where'  => 'pp.pp_member_id=m.member_id',
+							  'type'   => 'left' );
+		}
+
+		if ( $tables['groups'] )
+		{
+			$joins[] = array( 'select' => 'g.*',
+			 				  'from'   => array( 'groups' => 'g' ),
+							  'where'  => 'g.g_id=m.member_group_id',
+						      'type'   => 'left' );
+		}
+
+		if ( $tables['sessions'] )
+		{
+			$joins[] = array( 'select' => 's.*',
+			 				  'from'   => array( 'sessions' => 's' ),
+							  'where'  => 's.member_id=m.member_id',
+						      'type'   => 'left' );
+		}
+		
+		if ( $tables['core_item_markers_storage'] )
+		{
+			$joins[] = array( 'select' => 'im.*',
+			 				  'from'   => array( 'core_item_markers_storage' => 'im' ),
+							  'where'  => 'im.item_member_id=m.member_id',
+						      'type'   => 'left' );
+		}
+		
+		if ( IPSContentCache::isEnabled() )
+		{
+			if ( IPSContentCache::fetchSettingValue( 'sig' ) )
+			{
+				$joins[] = IPSContentCache::join( 'sig' , 'm.member_id', 'ccb', 'left', 'ccb.cache_content' );
+			}
+		}
+
+		//-----------------------------------------
+		// Do eeet
+		//-----------------------------------------
+
+		if ( count( $joins ) )
+		{
+			ipsRegistry::DB()->build( array( 'select'   => 'm.*, m.member_id as my_member_id',
+											 'from'     => array( 'members' => 'm' ),
+											 'where'    => ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ?  'm.'. $member_field . ' IN (' . implode( ',', $multiple_ids ) . ')' : 'm.'. $member_field . '=' . $member_value,
+											 'add_join' => $joins ) );
+		}
+		else
+		{
+			ipsRegistry::DB()->build( array( 'select'   => '*',
+											 'from'     => 'members',
+											 'where'    => ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ?  $member_field . ' IN (' . implode( ',', $multiple_ids ) . ')' : $member_field . '=' . $member_value ) );
+		}
+
+		//-----------------------------------------
+		// Execute
+		//-----------------------------------------
+
+		ipsRegistry::DB()->execute();
+
+		while( $mem = ipsRegistry::DB()->fetch() )
+		{
+			if ( isset( $mem['my_member_id'] ) )
+			{
+				$mem['member_id'] = $mem['my_member_id'];
+			}
+			
+			$mem['full']		= true;
+			
+			if( !$mem['email'] OR !$mem['members_display_name'] OR $mem['email'] == $mem['name'] . '@' . $mem['joined'] )
+			{
+				$mem['full']	= false;
+				$mem['timenow']	= $mem['joined'];
+			}
+
+			/* Clean secondary groups */
+			$mem['mgroup_others'] = ($mem['mgroup_others'] != '') ? IPSText::cleanPermString($mem['mgroup_others']) : '';
+
+			//-----------------------------------------
+			// Be sure we properly apply secondary permissions
+			//-----------------------------------------
+
+			if ( $tables['groups'] AND is_object( ipsRegistry::member() ) )
+			{
+				$mem = ipsRegistry::member()->setUpSecondaryGroups( $mem );
+				
+				/* Unpack groups */
+				$mem = IPSMember::unpackGroup( $mem, TRUE );
+			}
+
+			//-----------------------------------------
+			// Unblockable
+			//-----------------------------------------
+
+			$mem['_canBeIgnored'] = self::isIgnorable( $mem['member_group_id'], $mem['mgroup_others'] );
+			
+			/* Bitwise Options */
+			$mem = self::buildBitWiseOptions( $mem );
+			
+			/* Twitter is disabled them remove twitter tokens and such */
+		 	if ( $mem['twitter_id'] && ! IPSLib::twitter_enabled() )
+		 	{
+		 		$mem['twitter_token']  = '';
+		 		$mem['twitter_secret'] = '';
+		 		$mem['twitter_id']     = '';
+		 	}
+	 	
+			/* Add to array */
+			$members[ $mem['member_id'] ] = $mem;
+
+			//-----------------------------------------
+			// Add to cache
+			//-----------------------------------------
+
+			self::_addToCache( $mem, $_usedTables );
+		}
+
+		//-----------------------------------------
+		// Return just a single if we only sent one id
+		//-----------------------------------------
+
+		return ( is_array( $multiple_ids ) AND count( $multiple_ids ) ) ? $members : array_shift( $members );
+	}
+
+	/**
+	 * Delete member(s)
+	 *
+	 * @param 	mixed		[Integer] member ID or [Array] array of member ids
+	 * @param	boolean		Check if request is from an admin
+	 * @return	boolean		Action completed successfully
+	 */
+	static public function remove( $id, $check_admin=true )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$tmp_mids 	= array();
+		$emails		= array();
+
+		//-----------------------------------------
+		// Sort out thingie
+		//-----------------------------------------
+
+		if ( is_array( $id ) )
+		{
+			$id = IPSLib::cleanIntArray( $id );
+
+			$mids = ' IN (' . implode( ",", $id ) . ')';
+		}
+		else
+		{
+			$mids = ' = ' . intval($id);
+		}
+
+		//-----------------------------------------
+		// Get accounts and check IDS
+		//-----------------------------------------
+
+		ipsRegistry::DB()->build( array(
+										'select'	=> 'm.member_id, m.name, m.member_group_id, m.email', 
+										'from'		=> array( 'members' => 'm' ),
+										'where'		=> 'm.member_id' . $mids,
+										'add_join'	=> array(
+															array(
+																'select'	=> 'g.g_access_cp',
+																'from'		=> array( 'groups' => 'g' ),
+																'where'		=> 'g.g_id=m.member_group_id',
+																'type'		=> 'left',
+																)
+															)
+								)		);
+		ipsRegistry::DB()->execute();
+
+		while ( $r = ipsRegistry::DB()->fetch() )
+		{
+			//-----------------------------------------
+			// Non root admin attempting to edit root admin?
+			//-----------------------------------------
+
+			if( $check_admin )
+			{
+				if ( !ipsRegistry::member()->getProperty('g_access_cp') )
+				{
+					if ( $r['g_access_cp'] )
+					{
+						continue;
+					}
+				}
+			}
+
+			$tmp_mids[]	= $r['member_id'];
+			$emails[]	= $r['email'];
+
+			self::_removeFromCache( $r['member_id'] );
+		}
+
+		if ( ! count( $tmp_mids ) )
+		{
+			return false;
+		}
+
+		$mids = ' IN (' . implode( ",", $tmp_mids ) . ')';
+
+		//-----------------------------------------
+		// Get photo
+		//-----------------------------------------
+
+		$delete_files = array();
+
+		ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'profile_portal', 'where' => 'pp_member_id' . $mids ) );
+		ipsRegistry::DB()->execute();
+
+		while( $r = ipsRegistry::DB()->fetch() )
+		{
+			if ( $r['pp_main_photo']  )
+			{
+				$delete_files[] = $r['pp_main_photo'];
+			}
+
+			if ( $r['pp_thumb_photo']  )
+			{
+				$delete_files[] = $r['pp_thumb_photo'];
+			}
+
+			$_customizations	= unserialize($r['pp_customization']);
+			
+			if( $_customizations['type'] == 'upload' AND $_customizations['bg_url'] )
+			{
+				$delete_files[]	= $_customizations['bg_url'];
+			}
+		}
+
+		//-----------------------------------------
+		// Take care of forum stuff
+		//-----------------------------------------
+
+		ipsRegistry::DB()->update( 'posts'					, array( 'author_id'  => 0 ), "author_id" . $mids );
+		ipsRegistry::DB()->update( 'topics'					, array( 'starter_id' => 0 ), "starter_id" . $mids );
+		ipsRegistry::DB()->update( 'announcements'			, array( 'announce_member_id' => 0 ), "announce_member_id" . $mids );
+		ipsRegistry::DB()->update( 'attachments'			, array( 'attach_member_id' => 0 ), "attach_member_id" . $mids );
+		ipsRegistry::DB()->update( 'polls'					, array( 'starter_id' => 0 ), "starter_id" . $mids );
+		//ipsRegistry::DB()->update( 'topic_ratings'			, array( 'rating_member_id' => 0 ), "rating_member_id" . $mids );
+		ipsRegistry::DB()->update( 'voters'					, array( 'member_id' => 0 ), "member_id" . $mids );
+		ipsRegistry::DB()->update( 'forums'					, array( 'last_poster_name' => '' ), "last_poster_id" . $mids );
+		ipsRegistry::DB()->update( 'forums'					, array( 'seo_last_name' => '' ), "last_poster_id" . $mids );
+		ipsRegistry::DB()->update( 'forums'					, array( 'last_poster_id' => 0 ), "last_poster_id" . $mids );
+		ipsRegistry::DB()->delete( 'core_share_links_log'	, "log_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'core_soft_delete_log'	, "sdl_obj_member_id" . $mids );
+		ipsRegistry::DB()->update( 'rss_import'				, array( 'rss_import_mid' => 0 ), "rss_import_mid" . $mids );
+		ipsRegistry::DB()->update( 'tags_index'				, array( 'member_id' => 0 ), "member_id" . $mids );
+		
+		//-----------------------------------------
+		// Likes - also invalidates likes cache
+		// @todo - Move this into like class - problem is like object expects to know what plugin to use in bootstrap method, but we want to remove for all plugins...
+		//-----------------------------------------
+		
+		$_likes	= array();
+		
+		ipsRegistry::DB()->build( array( 'select' => 'like_lookup_id', 'from' => 'core_like', 'where' => "like_member_id" . $mids ) );
+		ipsRegistry::DB()->execute();
+		
+		while( $r = ipsRegistry::DB()->fetch() )
+		{
+			$_likes[]	= $r['like_lookup_id'];
+		}
+
+		if( count($_likes) )
+		{
+			ipsRegistry::DB()->delete( 'core_like'				, "like_member_id" . $mids );
+			ipsRegistry::DB()->delete( 'core_like_cache'		, "like_cache_id IN('" . implode( "','", array_map( 'addslashes', $_likes ) ) . "')" );
+		}
+
+		//-----------------------------------------
+		// Clean up profile stuff
+		//-----------------------------------------
+
+		ipsRegistry::DB()->update( 'profile_ratings'		, array( 'rating_by_member_id' => 0 ), "rating_by_member_id" . $mids );
+
+		ipsRegistry::DB()->delete( 'profile_ratings'		, "rating_for_member_id" . $mids );
+
+		ipsRegistry::DB()->delete( 'profile_portal'			, "pp_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'profile_portal_views'	, "views_member_id" . $mids );
+		
+		$_friendMemberIds	= array();
+		
+		ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'profile_friends', 'where' => "friends_member_id" . $mids . " OR friends_friend_id" . $mids ) );
+		ipsRegistry::DB()->execute();
+		
+		while( $r = ipsRegistry::DB()->fetch() )
+		{
+			if( !in_array( $r['friends_friend_id'], $tmp_mids ) )
+			{
+				$_friendMemberIds[ $r['friends_friend_id'] ]	= $r['friends_friend_id'];
+			}
+
+			if( !in_array( $r['friends_member_id'], $tmp_mids ) )
+			{
+				$_friendMemberIds[ $r['friends_member_id'] ]	= $r['friends_member_id'];
+			}
+		}
+		
+		ipsRegistry::DB()->delete( 'profile_friends'		, "friends_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'profile_friends'		, "friends_friend_id" . $mids );
+		ipsRegistry::DB()->delete( 'profile_friends_flood'	, "friends_member_id" . $mids . " OR friends_friend_id" . $mids );
+
+		ipsRegistry::DB()->delete( 'dnames_change'			, "dname_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'mobile_notifications'	, "member_id" . $mids );
+
+		//-----------------------------------------
+		// Delete member...
+		//-----------------------------------------
+
+		ipsRegistry::DB()->delete( 'pfields_content'		, "member_id" . $mids );
+		ipsRegistry::DB()->delete( 'members_partial'		, "partial_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'moderators'				, "member_id" . $mids );
+		ipsRegistry::DB()->delete( 'sessions'				, "member_id" . $mids );
+		ipsRegistry::DB()->delete( 'search_sessions'		, "session_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'upgrade_sessions'		, "session_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'warn_logs'				, "wlog_mid" . $mids );
+		ipsRegistry::DB()->update( 'warn_logs'				, array( 'wlog_addedby' => 0 ), "wlog_addedby" . $mids );
+		ipsRegistry::DB()->delete( 'member_status_actions'	, "action_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'member_status_actions'	, "action_status_owner" . $mids );
+		ipsRegistry::DB()->delete( 'member_status_replies'	, "reply_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'member_status_updates'	, "status_member_id" . $mids );
+
+		//-----------------------------------------
+		// Update admin stuff and logs
+		//-----------------------------------------
+
+		ipsRegistry::DB()->delete( 'admin_permission_rows'	, "row_id_type='member' AND row_id" . $mids );
+		ipsRegistry::DB()->delete( 'core_sys_cp_sessions' 	, 'session_member_id' . $mids );
+		ipsRegistry::DB()->delete( 'core_sys_login' 		, 'sys_login_id' . $mids );
+		ipsRegistry::DB()->update( 'upgrade_history'		, array( 'upgrade_mid' => 0 ), "upgrade_mid" . $mids );
+		ipsRegistry::DB()->update( 'admin_logs'				, array( 'member_id' => 0 ), "member_id" . $mids );
+		ipsRegistry::DB()->update( 'error_logs'				, array( 'log_member' => 0 ), "log_member" . $mids );
+		ipsRegistry::DB()->update( 'moderator_logs'			, array( 'member_id' => 0, 'member_name' => '' ), "member_id" . $mids );
+
+		//-----------------------------------------
+		// Delete PMs
+		//-----------------------------------------
+		
+		$messageIds		= array();
+		
+		ipsRegistry::DB()->build( array( 'select' => 'map_topic_id, map_user_id', 'from' => 'message_topic_user_map', 'where' => 'map_user_id' . $mids ) );
+		ipsRegistry::DB()->execute();
+		
+		while( $r = ipsRegistry::DB()->fetch() )
+		{
+			$messageIds[ $r['map_user_id'] ][]	= $r['map_topic_id'];
+		}
+
+		if( count($messageIds) )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
+			$messenger		= new $classToLoad( ipsRegistry::instance() );
+			
+			foreach( $messageIds as $user => $topics )
+			{
+				$messenger->deleteTopics( $user, $topics );
+			}
+		}
+
+		//-----------------------------------------
+		// Fallback cleanup
+		//-----------------------------------------
+		
+		ipsRegistry::DB()->delete( 'message_topic_user_map'	, 'map_user_id' . $mids );
+		ipsRegistry::DB()->update( 'message_posts'			, array( 'msg_author_id' => 0 ), 'msg_author_id' . $mids );
+		ipsRegistry::DB()->update( 'message_topics'			, array( 'mt_starter_id' => 0 ), 'mt_starter_id' . $mids );
+		ipsRegistry::DB()->update( 'message_topics'			, array( 'mt_to_member_id' => 0 ), 'mt_to_member_id' . $mids );
+
+		//-----------------------------------------
+		// Delete subs, views, markers, etc.
+		//-----------------------------------------
+
+		ipsRegistry::DB()->delete( 'ignored_users'			, "ignore_owner_id" . $mids . " or ignore_ignore_id" . $mids );
+		ipsRegistry::DB()->delete( 'inline_notifications'	, "notify_to_id" . $mids );
+		ipsRegistry::DB()->update( 'inline_notifications'	, array( 'notify_from_id' => 0 ), 'notify_from_id' . $mids );
+		ipsRegistry::DB()->delete( 'core_item_markers'		, "item_member_id" . $mids );
+		ipsRegistry::DB()->delete( 'core_item_markers_storage', "item_member_id" . $mids );
+		ipsRegistry::DB()->update( 'rc_comments'			, array( 'comment_by' => 0 ), "comment_by" . $mids );
+		ipsRegistry::DB()->delete( 'rc_modpref'				, "mem_id" . $mids );
+		ipsRegistry::DB()->update( 'rc_reports'				, array( 'report_by' => 0 ), "report_by" . $mids );
+		ipsRegistry::DB()->update( 'rc_reports_index'		, array( 'updated_by' => 0 ), "updated_by" . $mids );
+		ipsRegistry::DB()->delete( 'rc_reports_index'		, "seotemplate='showuser' AND exdat1" . $mids );
+		ipsRegistry::DB()->delete( 'reputation_cache'		, "type='member' AND type_id" . $mids );
+		ipsRegistry::DB()->delete( 'reputation_index'		, "member_id" . $mids );
+		
+		$cache	= ipsRegistry::cache()->getCache('report_cache');
+		$cache['last_updated']	= time();
+		
+		ipsRegistry::cache()->setCache( 'report_cache', $cache, array( 'array' => 1 ) );
+
+		//-----------------------------------------
+		// Delete from validating..
+		//-----------------------------------------
+
+		ipsRegistry::DB()->delete( 'validating'				, "member_id" . $mids );
+		ipsRegistry::DB()->delete( 'members'				, "member_id" . $mids );
+		
+		/* Delete from profile cache */
+		if ( count( $_friendMemberIds ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('members') . '/sources/friends.php', 'profileFriendsLib', 'members' );
+			$friends     = new $classToLoad( ipsRegistry::instance() );
+			
+			foreach( $_friendMemberIds as $_mid )
+			{
+				$friends->recacheFriends( array( 'member_id' => $_mid ) );
+			}
+		}
+		
+		//-----------------------------------------
+		// Delete photos
+		//-----------------------------------------
+
+		if ( count($delete_files) )
+		{
+			foreach( $delete_files as $file )
+			{
+				@unlink( ipsRegistry::$settings['upload_dir'] . "/" . $file );
+			}
+		}
+
+		//-----------------------------------------
+		// Member Sync
+		//-----------------------------------------
+
+		IPSLib::runMemberSync( 'onDelete', $mids );
+		
+		/* Remove from cache */
+		IPSContentCache::drop( 'sig', $tmp_mids );
+		
+		//-----------------------------------------
+		// Get current stats...
+		//-----------------------------------------
+
+		ipsRegistry::cache()->rebuildCache( 'stats', 'global' );
+		ipsRegistry::cache()->rebuildCache( 'moderators', 'forums' );
+		ipsRegistry::cache()->rebuildCache( 'birthdays', 'calendar' );
+		ipsRegistry::cache()->rebuildCache( 'announcements', 'forums' );
+	}
+
+	/**
+	 * Set up moderator, populate moderator functions
+	 *
+	 * @param	array 		Array of member data
+	 * @return	array 		Array of member data populated with moderator details
+	 */
+	static public function setUpModerator( $member )
+	{
+		static $cache	= array();
+		
+		if( $cache[ $member['member_id'] ] )
+		{
+			return array_merge( $member, $cache[ $member['member_id'] ] );
+		}
+
+		$other_mgroups	= array();
+		$return			= array();
+		
+		if ( $member['member_group_id'] != ipsRegistry::$settings['guest_group'] )
+		{
+			//-----------------------------------------
+			// Sprinkle on some moderator stuff...
+			//-----------------------------------------
+
+			if ( $member['g_is_supmod'] == 1 )
+			{
+				$return['is_mod'] = 1;
+			}
+			else if ( is_array(ipsRegistry::cache()->getCache('moderators')) AND count(ipsRegistry::cache()->getCache('moderators')) )
+			{
+				$other_mgroups = array();
+
+				if ( IPSText::cleanPermString( $member['mgroup_others'] ) )
+				{
+					$other_mgroups = explode( ",", IPSText::cleanPermString( $member['mgroup_others'] ) );
+				}
+			}
+			
+			if( is_array(ipsRegistry::cache()->getCache('moderators')) AND count(ipsRegistry::cache()->getCache('moderators')) )
+			{
+				$_mod_forums = isset( $member['forumsModeratorData'] ) && is_array( $member['forumsModeratorData'] ) ? $member['forumsModeratorData'] : array();
+				
+				foreach( ipsRegistry::cache()->getCache('moderators') as $r )
+				{
+					$modForumIds = explode( ',', IPSText::cleanPermString( $r['forum_id'] ) );
+					
+					if ( $r['member_id'] AND $r['member_id'] == $member['member_id'] )
+					{
+						foreach( $modForumIds as $modForumId )
+						{
+							$_mod_forums[ $modForumId ] = $r;
+						}
+
+						$return['is_mod'] = 1;
+					}
+					else if( $r['group_id'] AND $r['group_id'] == $member['member_group_id'] )
+					{
+						// Individual mods override group mod settings
+						// If array is set, don't override it
+
+						foreach( $modForumIds as $modForumId )
+						{
+							if( !is_array($_mod_forums[ $modForumId ]) OR !count($_mod_forums[ $modForumId ]) )
+							{
+								$_mod_forums[ $modForumId ] = $r;
+							}
+						}
+
+						$return['is_mod'] = 1;
+					}
+					else if( $r['group_id'] AND count( $other_mgroups ) AND in_array( $r['group_id'], $other_mgroups ) )
+					{
+						// Individual mods override group mod settings
+						// If array is set, don't override it
+	
+						foreach( $modForumIds as $modForumId )
+						{
+							if( !is_array($_mod_forums[ $modForumId ]) OR !count($_mod_forums[ $modForumId ]) )
+							{
+								$_mod_forums[ $modForumId ] = $r;
+							}
+						}
+	
+						$return['is_mod'] = 1;
+					}						
+				}
+				
+				$return['forumsModeratorData'] = $_mod_forums;
+			}
+		}
+
+		$cache[ $member['member_id'] ]	= $return;
+		return array_merge( $member, $cache[ $member['member_id'] ] );
+	}
+	
+	/**
+	 * Fetches SEO name, updating the table if required
+	 *
+	 * @param	array		Member data
+	 * @return	string		SEO Name
+	 */
+	static public function fetchSeoName( $memberData )
+	{
+		if ( ! is_array( $memberData ) OR ! $memberData['member_id'] )
+		{
+			return;
+		}
+		
+		if ( !empty( $memberData['members_seo_name'] ) )
+		{
+			return $memberData['members_seo_name'];
+		}
+		else if ( !empty( $memberData['members_display_name'] ) )
+		{
+			$_seoName = IPSText::makeSeoTitle( $memberData['members_display_name'] );
+
+			ipsRegistry::DB()->update( 'members', array( 'members_seo_name' => $_seoName ), 'member_id=' . $memberData['member_id'] );
+			
+			return $_seoName;
+		}
+		else
+		{
+			return '-';
+		}
+	}
+	
+	/**
+	 * Fetches Ignore user data
+	 *
+	 * @param	array		Member data
+	 * @return	array		Array of ignored users
+	 */
+	static public function fetchIgnoredUsers( $memberData )
+	{
+		/* INIT */
+		$ignore_users = array();
+		
+		if ( $memberData['member_id'] )
+		{
+			/* < 3.0.0 used comma delisted string. 3.0.0+ uses serialized array */
+			if ( strstr( $memberData['ignored_users'], 'a:' ) )
+			{
+				$data = unserialize( $memberData['ignored_users'] );
+				
+				return ( is_array( $data ) ) ? $data : array();
+			}
+			else
+			{
+				if ( $memberData['ignored_users'] )
+				{
+					$_data = explode( ",", $memberData['ignored_users'] );
+				
+					foreach( $_data as $id )
+					{
+						if ( $id )
+						{
+							$ignore_users[ $id ] = array( 'ignore_ignore_id'  => $id,
+														  'ignore_messages'   => 0,
+														  'ignore_signatures' => 0,
+														  'ignore_topics'     => 1 );
+						}
+					}
+				}
+				
+				/* Now fetch them from the DB */
+				ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => "ignore_owner_id=" . $memberData['member_id'] ) );
+				ipsRegistry::DB()->execute();
+
+				while( $r = ipsRegistry::DB()->fetch() )
+				{
+					$ignore_users[ $r['ignore_ignore_id'] ] = array( 'ignore_ignore_id'  => $r['ignore_ignore_id'],
+												  					 'ignore_messages'   => $r['ignore_messages'],
+																	 'ignore_signatures' => $r['ignore_signatures'],
+																	 'ignore_topics'     => $r['ignore_topics'] );
+				}
+				
+				/* Update.... */
+				self::save( $memberData['member_id'], array( 'core' => array( 'ignored_users' => serialize( $ignore_users ) ) ) );
+			}
+		}
+		
+		return $ignore_users;
+	}
+	
+	/**
+	 * Updates member.ignored_users
+	 *
+	 * @param	mixed		Member ID or Member data
+	 * @return	array		Array of ignored users
+	 */
+	static public function rebuildIgnoredUsersCache( $member )
+	{
+		/* INIT */
+		$ignore_users = array();
+		
+		$memberData = ( ! is_array( $member ) ) ? self::load( $member, 'all' ) : $member;
+		
+		/* Continue */
+		if ( $memberData['member_id'] )
+		{
+			/* Fetch from DB */
+			ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'ignored_users', 'where' => "ignore_owner_id=" . $memberData['member_id'] ) );
+			ipsRegistry::DB()->execute();
+
+			while( $r = ipsRegistry::DB()->fetch() )
+			{
+				$ignore_users[ $r['ignore_ignore_id'] ] = array( 'ignore_ignore_id'  => $r['ignore_ignore_id'],
+											  					 'ignore_messages'   => $r['ignore_messages'],
+																 'ignore_signatures' => $r['ignore_signatures'],
+																 'ignore_topics'     => $r['ignore_topics'],
+																 'ignore_chats'		 => $r['ignore_chats'] );
+			}
+		
+			/* Update.... */
+			self::save( $memberData['member_id'], array( 'core' => array( 'ignored_users' => serialize( $ignore_users ) ) ) );
+		}
+	}
+
+	/**
+	 * Retrieve the member's location
+	 *
+	 * @author	Brandon Farber
+	 * @param	array 		Member information (including session info!)
+	 * @return	array 		Member info with session info parsed
+	 * @since	IPB 3.0
+	 */
+	static public function getLocation( $member )
+	{
+		$member['online_extra'] = "";
+
+		//-----------------------------------------
+		// Grab 'where' info
+		//-----------------------------------------
+
+		if( !$member['in_error'] AND $member['current_appcomponent'] AND IPSLib::appIsInstalled( $member['current_appcomponent'] ) )
+		{
+			$member['current_appcomponent'] = IPSText::alphanumericalClean($member['current_appcomponent']);
+			
+			$filename = IPSLib::getAppDir(  $member['current_appcomponent'] ) . '/extensions/coreExtensions.php';
+
+			if ( is_file( $filename ) )
+			{
+				$toload = IPSLib::loadLibrary( $filename, 'publicSessions__' . $member['current_appcomponent'], $member['current_appcomponent'] );
+				
+				if( class_exists( $toload ) )
+				{
+					$loader           = new $toload;
+	
+					if( method_exists( $loader, 'parseOnlineEntries' ) )
+					{
+						$tmp = $loader->parseOnlineEntries( array( $member['id'] => $member ) );
+	
+						// Yes, this is really id - it's session id, not member id
+						if( isset( $tmp[ $member['id'] ] ) && is_array( $tmp[ $member['id'] ] ) && count( $tmp[ $member['id'] ] ) )
+						{
+							if ( isset( $tmp[ $member['id'] ]['_whereLinkSeo']) )
+							{
+								$member['online_extra'] = "{$tmp[ $member['id'] ]['where_line']} <a href='" . $tmp[ $member['id'] ]['_whereLinkSeo'] . "' title='" . $tmp[ $member['id'] ]['where_line'] . ' ' . $tmp[ $member['id'] ]['where_line_more'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line_more'], 35 ) . "</a>";
+							}
+							/* @link	http://community.invisionpower.com/tracker/issue-20598-where-link-not-taken-into-account-on-profile-page-if-no-where-line-more-specified/ */
+							else if ( isset($tmp[ $member['id'] ]['where_link']) AND $tmp[ $member['id'] ]['where_line_more'] )
+							{
+								$member['online_extra'] = "{$tmp[ $member['id'] ]['where_line']} <a href='" . ipsRegistry::$settings['base_url'] . "{$tmp[ $member['id'] ]['where_link']}' title='" . $tmp[ $member['id'] ]['where_line'] . ' ' . $tmp[ $member['id'] ]['where_line_more'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line_more'], 35 ) . "</a>";
+							}
+							else if ( isset($tmp[ $member['id'] ]['where_link']) )
+							{
+								$member['online_extra'] = "<a href='" . ipsRegistry::$settings['base_url'] . "{$tmp[ $member['id'] ]['where_link']}' title='" . $tmp[ $member['id'] ]['where_line'] . "'>" . IPSText::truncate( $tmp[ $member['id'] ]['where_line'], 35 ) . "</a>";
+							}
+							else
+							{
+								$member['online_extra'] = $tmp[ $member['id'] ]['where_line'];
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if ( ! $member['online_extra'] )
+		{
+			$member['online_extra'] = $member['id'] ? ipsRegistry::getClass('class_localization')->words['board_index'] 
+													: ipsRegistry::getClass('class_localization')->words['not_online'];
+		}
+
+		return $member;
+	}
+
+	/**
+	 * Determine if two members are friends
+	 *
+	 * @author	Brandon Farber
+	 * @param	integer		Member ID to check for
+	 * @param	integer 	Member ID to check against (defaults to current member id)
+	 * @param	bool		Only return true if the friend is approved
+	 * @return	boolean		Whether they are friends or not
+	 * @since	IPB 3.0
+	 */
+	static public function checkFriendStatus( $memberId, $checkAgainst=0, $onlyVerified=false )
+	{
+		/**
+		 * If no member id, obviously not friends
+		 */
+		if( !$memberId )
+		{
+			return false;
+		}
+
+		/**
+		 * Get member data
+		 */
+		$memberData	= array();
+
+		if( !$checkAgainst )
+		{
+			$memberData	= ipsRegistry::instance()->member()->getProperty('_cache');
+		}
+		else
+		{
+			$member		= self::load( $checkAgainst, 'extendedProfile' );
+			$memberData	= self::unpackMemberCache( $member['members_cache'] );
+		}
+
+		/**
+		 * Do we have a friends cache array?
+		 */
+		if( !$memberData['friends'] OR !is_array($memberData['friends']) OR !count($memberData['friends']) )
+		{
+			return false;
+		}
+
+		/**
+		 * If there is, then check it..
+		 */
+		if( $onlyVerified )
+		{
+			if( isset($memberData['friends'][ $memberId ]) AND $memberData['friends'][ $memberId ] )
+			{
+				return true;
+			}
+			
+			return false;
+		}
+		else
+		{
+			return isset($memberData['friends'][ $memberId ]) ? true : false;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Determine if a member is ignoring another member
+	 *
+	 * @author	Brandon Farber
+	 * @param	integer		Member ID to check for
+	 * @param	integer 	Member ID to check against (defaults to current member id)
+	 * @param	string		Type of ignoring to check [messages|topics].  Omit to check any type.
+	 * @return	boolean		Whether the member id to check for is being ignored by the member id to check against
+	 * @since	IPB 3.0
+	 */
+	static public function checkIgnoredStatus( $memberId, $checkAgainst=0, $type=false )
+	{
+		/**
+		 * If no member id, obviously not ignored
+		 */
+		if( !$memberId )
+		{
+			return false;
+		}
+
+		/**
+		 * Get member data
+		 */
+		$memberData	= array();
+
+		if( !$checkAgainst )
+		{
+			/**
+			 * Ignored users loaded at runtime and stored in an array...loop
+			 */
+			foreach( ipsRegistry::instance()->member()->ignored_users as $ignoredUser )
+			{
+				/**
+				 * We found the user?
+				 */
+				if( $ignoredUser['ignore_ignore_id'] )
+				{
+					/**
+					 * If not specifying a type, then just return
+					 */
+					if( !$type )
+					{
+						return true;
+					}
+					/**
+					 * Otherwise verify we are ignoring that type
+					 */
+					else if( $ignoredUser[ 'ignore_' . $type ] )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		else
+		{
+			/**
+			 * See if checkAgainst is ignoring memberId
+			 */
+			$checkAgainst	= intval($checkAgainst);
+			$ignoredUser	= ipsRegistry::instance()->member()->DB()->buildAndFetch( array( 'select' => '*', 'from' => 'ignored_users', 'where' => 'ignore_owner_id=' . $checkAgainst . ' AND ignore_ignore_id=' . $memberId ) );
+			
+			/**
+			 * No?
+			 */
+			if( !$ignoredUser['ignore_id'] )
+			{
+				return false;
+			}
+			/**
+			 * He is?
+			 */
+			else
+			{
+				/**
+				 * If not specifying a type, then just return
+				 */
+				if( !$type )
+				{
+					return true;
+				}
+				/**
+				 * Otherwise verify we are ignoring that type
+				 */
+				else if( $ignoredUser[ 'ignore_' . $type ] )
+				{
+					return true;
+				}
+			}
+		}
+
+		/**
+		 * If we're here (which we shouldn't be) just return false
+		 */
+		return false;
+	}
+
+	/**
+	 * Retrieve all IP addresses a user (or multiple users) have used
+	 *
+	 * @param 	mixed		[Integer] member ID or [Array] array of member ids
+	 * @param	string		Defaults to 'All', otherwise specify which tables to check (comma separated)
+	 * @return	array		Multi-dimensional array of found IP addresses in which sections
+	 */
+	static public function findIPAddresses( $id, $tables_to_check='all' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$ip_addresses 	= array();
+		$tables			= array(
+							'admin_logs'			=> array( 'member_id', 'ip_address', 'ctime' ),
+							'dnames_change'			=> array( 'dname_member_id', 'dname_ip_address', 'dname_date' ),
+							'members'				=> array( 'member_id', 'ip_address', 'joined' ),
+							'message_posts'			=> array( 'msg_author_id', 'msg_ip_address', 'msg_date' ),
+							'moderator_logs'		=> array( 'member_id', 'ip_address', 'ctime' ),
+							'posts'					=> array( 'author_id', 'ip_address', 'post_date' ),
+							'member_status_updates'	=> array( 'status_author_id', 'status_author_ip', 'status_date' ),
+							'profile_ratings'		=> array( 'rating_by_member_id', 'rating_ip_address', '' ),
+							'sessions'				=> array( 'member_id', 'ip_address', 'running_time' ),
+							'topic_ratings'			=> array( 'rating_member_id', 'rating_ip_address', '' ),
+							'validating'			=> array( 'member_id', 'ip_address', 'entry_date' ),
+							'voters'				=> array( 'member_id', 'ip_address', 'vote_date' ),
+							'error_logs'			=> array( 'log_member', 'log_ip_address', 'log_date' ),
+							);
+
+		//-----------------------------------------
+		// Check apps
+		// @see http://forums.invisionpower.com/tracker/issue-16966-members-download-manag/
+		//-----------------------------------------
+		
+		foreach( ipsRegistry::$applications as $appDir => $data )
+		{
+			if( is_file( IPSLib::getAppDir( $appDir ) . "/extensions/coreExtensions.php") )
+			{
+				$classX = IPSLib::loadLibrary( IPSLib::getAppDir( $appDir ) . "/extensions/coreExtensions.php", $appDir . '_findIpAddress', $appDir );
+				
+				if( class_exists( $classX . '_findIpAddress' ) )
+				{
+					$ipLookup	= new $classX( ipsRegistry::instance() );
+					
+					if( method_exists( $ipLookup, 'getTables' ) )
+					{
+						$tables = array_merge( $tables, $ipLookup->getTables() );
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Sort out thingie
+		//-----------------------------------------
+
+		if ( is_array( $id ) )
+		{
+			$id = IPSLib::cleanIntArray( $id );
+
+			$mids = ' IN (' . implode( ",", $id ) . ')';
+		}
+		else
+		{
+			$mids = ' = ' . intval($id);
+		}
+
+		//-----------------------------------------
+		// Got tables?
+		//-----------------------------------------
+
+		$_tables = explode( ',', $tables_to_check );
+
+		if( !is_array($_tables) OR !count($_tables) )
+		{
+			return array();
+		}
+
+		//-----------------------------------------
+		// Loop through them and grab the IPs
+		//-----------------------------------------
+
+		foreach( $tables as $tablename => $fields )
+		{
+			if( $tables_to_check == 'all' OR in_array( $tablename, $_tables ) )
+			{
+				$extra = '';
+
+				if( $fields[2] )
+				{
+					$extra = ', ' . $fields[2] . ' as date';
+				}
+
+				ipsRegistry::DB()->build( array( 'select' => $fields[1] . $extra, 'from' => $tablename, 'where' => $fields[0] . $mids ) );
+				ipsRegistry::DB()->execute();
+
+				while( $r = ipsRegistry::DB()->fetch() )
+				{
+					if( $r[ $fields[1] ] )
+					{
+						$r['date']	= $r['date'] > $ip_addresses[ $r[ $fields[1] ] ][1] ? $r['date'] : ( $ip_addresses[ $r[ $fields[1] ] ][1] ? $ip_addresses[ $r[ $fields[1] ] ][1] : 0 );
+
+						$ip_addresses[ $r[ $fields[1] ] ]	= array( intval($ip_addresses[ $r[ $fields[1] ] ][0]) + 1, $r['date'] );
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Here are your IPs kind sir.  kthxbai
+		//-----------------------------------------
+
+		return $ip_addresses;
+	}
+
+	/**
+	 * Get / set member's ban info
+	 *
+	 * @param	array	Ban info (unit, timespan, date_end, date_start)
+	 * @return	mixed
+	 * @since	2.0
+	 */
+	static public function processBanEntry( $bline )
+	{
+		if ( is_array( $bline ) )
+		{
+			// Set ( 'timespan' 'unit' )
+
+			$factor = $bline['unit'] == 'd' ? 86400 : 3600;
+
+			$date_end = time() + ( $bline['timespan'] * $factor );
+
+			return time() . ':' . $date_end . ':' . $bline['timespan'] . ':' . $bline['unit'];
+		}
+		else
+		{
+			$arr = array();
+
+			list( $arr['date_start'], $arr['date_end'], $arr['timespan'], $arr['unit'] ) = explode( ":", $bline );
+
+			return $arr;
+		}
+	}
+
+	/**
+	 * Unpacks a member's cache.
+	 * Left as a function for any other processing
+	 *
+	 * @deprecated Will be removed in 3.3
+	 * @param	string	Serialized cache array
+	 * @return	array	Unpacked array
+	 */
+	static public function unpackMemberCache( $cache_serialized_array="" )
+	{
+		return unserialize( $cache_serialized_array );
+	}
+	
+	/**
+	 * Fetch an item from a member's cache
+	 * @param MIXED (int or memberData ) $member
+	 * @param MIXED (string or array of keys) $key
+	 */
+	static public function getFromMemberCache( $member, $key )
+	{
+		$return = array();
+		
+		if ( is_integer( $member ) )
+		{
+			$member = self::load( $member, 'core' );
+		}
+		
+		if ( IPSLib::isSerialized( $member['members_cache'] ) )
+		{
+			$cache = unserialize( $member['members_cache'] );
+			
+			$keys = ( is_array( $key ) ) ? $key : array( $key );
+			
+			foreach( $keys as $k )
+			{
+				$return[ $k ] = isset( $cache[ $k ] ) ? $cache[ $k ] : null;
+			}
+			
+			return ( is_array( $key ) ) ? $return : $return[ $key ];
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	/**
+	 * Sets items to the cache
+	 * @param MIXED (int or memberData ) $member
+	 * @param array $store
+	 */
+	static public function setToMemberCache( $member, $store )
+	{
+		$cache = array();
+		
+		if ( is_integer( $member ) or ( ! empty( $member['member_id'] ) && ! isset( $member['members_cache'] ) ) )
+		{
+			$member = self::load( $member, 'core' );
+		}
+		
+		/* Check */
+		if ( empty( $member['member_id'] ) or ! is_array( $store ) )
+		{
+			return false;
+		}
+		
+		/* fetch current cache */
+		if ( IPSLib::isSerialized( $member['members_cache'] ) )
+		{
+			$cache = unserialize( $member['members_cache'] );
+		}
+		
+		/* loop and update */
+		foreach( $store as $k => $v )
+		{	
+			$cache[ $k ] = $v;
+		}
+		
+		/* Save */
+		ipsRegistry::DB()->update( 'members', array( 'members_cache' => serialize( $cache ) ), 'member_id='.$member['member_id'] );
+
+		/* Update local cache */
+		if ( self::$data['member_id'] == $member['member_id'] )
+		{
+			self::$data['_cache']		 = $cache;
+			self::$data['members_cache'] = serialize( $cache );
+		}
+	}
+
+	
+	/**
+	 * Packs up member's cache
+	 *
+	 * Takes an existing array and updates member's DB row
+	 * This will overwrite any existing entries by the same
+	 * key and create new entries for non-existing rows
+	 *
+	 * @deprecated Will be removed in 3.3
+	 * @param	integer		Member ID
+	 * @param	array		New array
+	 * @param	array		Current Array (optional)
+	 * @return	boolean
+	 */
+	static public function packMemberCache( $member_id, $new_cache_array, $current_cache_array='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$member_id = intval( $member_id );
+
+		//-----------------------------------------
+		// Got a member ID?
+		//-----------------------------------------
+
+		if ( ! $member_id )
+		{
+			return FALSE;
+		}
+
+		//-----------------------------------------
+		// Got anything to update?
+		//-----------------------------------------
+
+		if ( ! is_array( $new_cache_array ) )
+		{
+			return FALSE;
+		}
+
+		//-----------------------------------------
+		// Got a current cache?
+		//-----------------------------------------
+
+		if ( ! is_array( $current_cache_array ) )
+		{
+			$member = ipsRegistry::DB()->buildAndFetch( array( 'select' => "members_cache", 'from' => 'members', 'where' => 'member_id='.$member_id ) );
+
+			$member['members_cache'] = $member['members_cache'] ? $member['members_cache'] : array();
+
+			$current_cache_array = @unserialize( $member['members_cache'] );
+		}
+
+		//-----------------------------------------
+		// Overwrite...
+		//-----------------------------------------
+
+		foreach( $new_cache_array as $k => $v )
+		{
+			$current_cache_array[ $k ] = $v;
+		}
+
+		//-----------------------------------------
+		// Update...
+		//-----------------------------------------
+
+		ipsRegistry::DB()->update( 'members', array( 'members_cache' => serialize( $current_cache_array ) ), 'member_id='.$member_id );
+
+		//-----------------------------------------
+		// Set member array right...
+		//-----------------------------------------
+		
+		if ( self::$data['member_id'] == $member_id )
+		{
+			self::$data['_cache']			= $current_cache_array;
+			self::$data['members_cache']	= serialize( $current_cache_array );
+		}
+	}
+
+	/**
+	 * Check forum permissions
+	 *
+	 * @param	string		Permission type
+	 * @param	int			Forum ID to check against
+	 * @return	boolean
+	 * @since	2.0
+	 */
+	static public function checkPermissions( $perm="", $forumID=0 )
+	{
+		/* Bit of a hack here, ugly */
+		if ( ipsRegistry::isClassLoaded('class_forums') !== TRUE )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums' );
+			ipsRegistry::setClass( 'class_forums', new $classToLoad( ipsRegistry::instance() ) );
+
+			ipsRegistry::getClass('class_forums')->strip_invisible = 1;
+			ipsRegistry::getClass('class_forums')->forumsInit();
+		}
+
+		return ipsRegistry::getClass( 'permissions' )->check( $perm, ipsRegistry::getClass('class_forums')->forum_by_id[ $forumID ] );
+	}
+
+	/**
+	 * Set up defaults for a guest user
+	 *
+	 * @param	string	Guest name
+	 * @return	array 	Guest record
+	 * @since	2.0
+	 */
+    static public function setUpGuest( $name="" )
+    {
+		$cache = ipsRegistry::cache()->getCache('group_cache');
+		$name  = $name ? $name : ( ipsRegistry::isClassLoaded( 'class_localization' ) ? ipsRegistry::getClass('class_localization')->words['global_guestname'] : 'Guest' );
+
+    	$array = array(   'name'          		 	=> $name,
+    				   	  'members_display_name' 	=> $name,
+	    				  '_members_display_name' 	=> $name,
+						  'members_seo_name'		=> IPSText::makeSeoTitle( $name ),
+	    				  'member_id'      		 	=> 0,
+	    				  'password'      		 	=> '',
+	    				  'email'         		 	=> '',
+	    				  'title'         		 	=> '',
+	    				  'posts'					=> 0,
+	    				  'member_group_id'		 	=> ipsRegistry::$settings['guest_group'],
+	    				  'view_sigs'     		 	=> ipsRegistry::$settings['guests_sig'],
+	    				  'member_forum_markers' 	=> array(),
+	    				  'member_posts'		 	=> '',
+	    				  'g_dohtml'				=> 0,
+	    				  'g_title'		 			=> $cache[ ipsRegistry::$settings['guest_group'] ]['g_title'],
+	    				  'member_rank_img'	 	 	=> '',
+	    				  'member_joined'		 	=> '',
+	    				  'member_number'		 	=> '',
+	    				  'members_auto_dst'	 	=> 0,
+	    				  'has_blog'			 	=> 0,
+	    				  'has_gallery'			 	=> 0,
+	    				  'is_mod'				 	=> 0,
+	    				  'last_visit'			 	=> time(),
+	    				  'login_anonymous'		 	=> '',
+	    				  'mgroup_others'		 	=> '',
+	    				  'org_perm_id'			 	=> '',
+	    				  'auto_track'			 	=> 0,
+	    				  'ignored_users'		 	=> NULL,
+	    				  'members_editor_choice' 	=> 'std',
+						  '_cache'                	=> array( 'friends' => array() ),
+						  '_group_formatted'		=> self::makeNameFormatted( $cache[ ipsRegistry::$settings['guest_group'] ]['g_title'], ipsRegistry::$settings['guest_group'] ),
+	    				);
+	    
+	    /* Add in the group image, if we have one */
+		$member['member_rank_img']		= '';
+		$member['member_rank_img_i']	= '';
+
+		if ( $cache[ $array['member_group_id'] ]['g_icon'] )
+		{
+			$_img = $cache[ $array['member_group_id'] ]['g_icon'];
+			
+			if ( substr( $_img, 0, 4 ) != 'http' AND strpos( $_img, '{style_images_url}' ) === false )
+			{
+				$_img = ipsRegistry::$settings['_original_base_url'] . '/' . ltrim( $_img, '/' );
+			}
+			
+			$array['member_rank_img_i']	= 'img';
+			$array['member_rank_img']	= $_img;
+		}
+		
+		return is_array( $cache[ ipsRegistry::$settings['guest_group'] ] ) ? array_merge( $array, $cache[ ipsRegistry::$settings['guest_group'] ] ) : $array;
+    }
+
+	/**
+	 * Parse a member's profile photo
+	 *
+	 * @param	mixed	Either array of member data, or member ID to self load
+	 * @param	string	Size to return tag (thumb/full/mini/small) if no size, just returns array of parsed data
+	 * @param	bool	Add random string so no cache is used
+	 * @return	array 	Member's photo details
+	 */
+    static public function buildProfilePhoto( $member, $size=null, $noCache=false )
+    {
+		//-----------------------------------------
+		// Load the member?
+		//-----------------------------------------
+
+		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) AND $member > 0 )
+		{
+			$member = self::load( $member, 'extendedProfile' );
+		}
+		else if ( $member == 0 )
+		{
+			$member = array();
+		}
+		
+		/* No photo? Per this bug report, we're going to force showing profile photos, rather than hide them if you can't view profiles
+			@link http://community.invisionpower.com/tracker/issue-30986-board-index-unregistered-guests-can-not-view-avatars-option-removed-from-acp */
+		if ( empty( $member['pp_main_photo'] ) /*OR ! ipsRegistry::member()->getProperty('g_mem_info')*/ )
+		{
+			return self::buildNoPhoto( $member, $size, $noCache );
+		}
+		
+		/* @link http://community.invisionpower.com/tracker/issue-32991-profile-photo-conversion */
+		$member['pp_main_photo']	= str_replace( 'upload:', '', $member['pp_main_photo'] );
+		$member['pp_thumb_photo']	= str_replace( 'upload:', '', $member['pp_thumb_photo'] );
+		
+		/* Main photo */
+		$member['pp_main_photo'] = ( ! ( strstr( $member['pp_main_photo'], 'http://' ) || strstr( $member['pp_main_photo'], 'https://' ) ) ) ? ipsRegistry::$settings['upload_url'] . '/' . $member['pp_main_photo'] : $member['pp_main_photo'];
+		$member['_has_photo']    = 1;
+		
+		/* Thumb */
+		$member['pp_thumb_photo']  = ( ! ( strstr( $member['pp_thumb_photo'], 'http://' ) || strstr( $member['pp_thumb_photo'], 'https://' ) ) ) ? ipsRegistry::$settings['upload_url'] . '/' . $member['pp_thumb_photo'] : $member['pp_thumb_photo'];
+		
+		/* Small */
+		$_data = IPSLib::scaleImage( array( 'max_height' => 50, 'max_width' => 50, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+
+		$member['pp_small_photo']  = $member['pp_thumb_photo'];
+		$member['pp_small_width']  = $_data['img_width'];
+		$member['pp_small_height'] = $_data['img_height'];
+		
+		/* Mini */
+		$_data = IPSLib::scaleImage( array( 'max_height' => 25, 'max_width' => 25, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+
+		$member['pp_mini_photo']  = $member['pp_thumb_photo'];
+		$member['pp_mini_width']  = $_data['img_width'];
+		$member['pp_mini_height'] = $_data['img_height'];
+		
+		if ( $size === null )
+		{
+			return $member;
+		}
+		else
+		{
+			return self::buildPhotoTag( $member, $size, $noCache );
+		}
+    }
+	
+	/**
+	 * Returns a 'no photo' tag or data
+	 *
+	 * @param	array	Member Data
+	 * @param	string	Optional: Full / thumb / mini / small - will return complete tag
+	 * @param	bool	Add random string so no cache is used
+	 * @param	bool	If true, ipsUserPhoto class will not be added
+	 * @return	string
+	 */
+	static public function buildNoPhoto( $member, $size=null, $noCache=false, $noBorder=false )
+	{
+		/* Load member */
+		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) AND $member > 0 )
+		{
+			$member = self::load( $member, 'extendedProfile' );
+		}
+		else if ( $member == 0 )
+		{
+			$member = array();
+		}
+		
+		/* Main photo */
+		$member['pp_main_photo']  = ipsRegistry::$settings['img_url'] . '/profile/default_large.png';
+		$member['pp_main_width']  = 125;
+		$member['pp_main_height'] = 125;
+		$member['_has_photo']     = 0;
+		
+
+		/* Thumb */
+		$member['pp_thumb_photo']  = ipsRegistry::$settings['img_url'] . '/profile/default_large.png';
+		$member['pp_thumb_width']  = 100;
+		$member['pp_thumb_height'] = 100;
+		
+		/* Small */
+		$_data = IPSLib::scaleImage( array( 'max_height' => 50, 'max_width' => 50, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+
+		$member['pp_small_photo']  = $member['pp_thumb_photo'];
+		$member['pp_small_width']  = $_data['img_width'];
+		$member['pp_small_height'] = $_data['img_height'];
+		
+		/* Mini */
+		$_data = IPSLib::scaleImage( array( 'max_height' => 25, 'max_width' => 25, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+
+		$member['pp_mini_photo']  = $member['pp_thumb_photo'];
+		$member['pp_mini_width']  = $_data['img_width'];
+		$member['pp_mini_height'] = $_data['img_height'];
+		
+		if ( $size === null )
+		{
+			return $member;
+		}
+		else
+		{
+			return self::buildPhotoTag( $member, $size, $noCache, $noBorder );
+		}
+	}
+	
+	/**
+	 * Tagify a member's profile photo from data
+	 *
+	 * @param	array	Processed member data that has photo info
+	 * @param	string	Size (full/thumb/mini/small)
+	 * @param	bool	Add random string so no cache is used
+	 * @param	bool	If true, ipsUserPhoto class will not be added
+	 * @return	string
+	 */
+	static public function buildPhotoTag( $member, $size='thumb', $noCache=false, $noBorder=false )
+	{
+		$rnd = ( $noCache === true ) ? "?_r=" . md5( uniqid() ) : '';
+		$cls = '';
+		
+		switch( $size )
+		{
+			default:
+			case 'thumb':
+				$src = $member['pp_thumb_photo'];
+				$w   = $member['pp_thumb_width'];
+				$h   = $member['pp_thumb_height'];
+			break;
+			case 'main':
+			case 'full':
+				$src = $member['pp_main_photo'];
+				$w   = $member['pp_main_width'];
+				$h   = $member['pp_main_height'];
+			break;
+			case 'small':
+				$_data = IPSLib::scaleImage( array( 'max_height' => 50, 'max_width' => 50, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+				$src   = $member['pp_thumb_photo'];
+				$w     = $_data['img_width'];
+				$h     = $_data['img_height'];
+				$cls   = 'ipsUserPhoto_medium';
+			break;
+			case 'mini':
+				$_data = IPSLib::scaleImage( array( 'max_height' => 25, 'max_width' => 25, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+				$src   = $member['pp_thumb_photo'];
+				$w     = $_data['img_width'];
+				$h     = $_data['img_height'];
+				$cls   = 'ipsUserPhoto_mini';
+			break;
+			case 'inset':
+				$_data = IPSLib::scaleImage( array( 'max_height' => 25, 'max_width' => 25, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+				$src   = $member['pp_thumb_photo'];
+				$w     = $_data['img_width'];
+				$h     = $_data['img_height'];
+				$cls   = 'ipsUserPhoto_inset';
+			break;
+			case 'icon':
+				$_data = IPSLib::scaleImage( array( 'max_height' => 16, 'max_width' => 16, 'cur_width' => $member['pp_thumb_width'], 'cur_height' => $member['pp_thumb_height'] ) );
+				$src   = $member['pp_thumb_photo'];
+				$w     = $_data['img_width'];
+				$h     = $_data['img_height'];
+				$cls   = 'ipsUserPhoto_icon';
+			break;
+		}
+		
+		$classes = $noBorder ? '' : "ipsUserPhoto {$cls}";
+		
+		return "<img src='" . $src . $rnd . "' class='" . $classes . "' />";
+	}
+	
+	/**
+	 * Parse a member for display
+	 *
+	 * @param	mixed	Either array of member data, or member ID to self load
+	 * @param	array 	Array of flags to parse: 'signature', 'customFields', 'warn'
+	 * @return	array 	Parsed member data
+	 */
+	static public function buildDisplayData( $member, $_parseFlags=array() )
+	{
+		$_NOW   = IPSDebug::getMemoryDebugFlag();
+		
+		/* test to see if member_title has been passed */
+		if ( isset( $member['member_title'] ) )
+		{
+			$member['title'] = $member['member_title'];
+		}
+		
+		//-----------------------------------------
+		// Figure out parse flags
+		//-----------------------------------------
+
+		$parseFlags = array( 'signature'		=> isset( $_parseFlags['signature'] )    ? $_parseFlags['signature']    : 0,
+							 'customFields'		=> isset( $_parseFlags['customFields'] ) ? $_parseFlags['customFields'] : 0,
+							 'reputation'		=> isset( $_parseFlags['reputation'] )   ? $_parseFlags['reputation']   : 1,
+							 'warn'				=> isset( $_parseFlags['warn'] )         ? $_parseFlags['warn']         : 1,
+							 'cfSkinGroup'		=> isset( $_parseFlags['cfSkinGroup'] )  ? $_parseFlags['cfSkinGroup']  : '',
+							 'cfGetGroupData'	=> isset( $_parseFlags['cfGetGroupData'] )  ? $_parseFlags['cfGetGroupData']  : '',
+							 'cfLocation'		=> isset( $_parseFlags['cfLocation'] )  ? $_parseFlags['cfLocation']  : '',
+							 'checkFormat'		=> isset( $_parseFlags['checkFormat'] )  ? $_parseFlags['checkFormat']  : 0,
+							 'photoTagSize'		=> isset( $_parseFlags['photoTagSize'] ) ? $_parseFlags['photoTagSize'] : false,
+							 'spamStatus'		=> isset( $_parseFlags['spamStatus'] )   ? $_parseFlags['spamStatus']  : 0 );
+
+		if ( isset( $_parseFlags['__all__'] ) )
+		{
+			foreach( $parseFlags as $k => $v )
+			{
+				if( in_array( $k, array( 'cfSkinGroup', 'cfGetGroupData', 'photoTagSize' ) ) )
+				{
+					continue;
+				}
+				
+				$parseFlags[ $k ] = 1;
+			}
+
+			$parseFlags['spamStatus']  = !empty( $parseFlags['spamStatus'] ) ? 1 : 0;
+		}
+
+		//-----------------------------------------
+		// Load the member?
+		//-----------------------------------------
+
+		if ( ! is_array( $member ) AND ( $member == intval( $member ) AND $member > 0 ) )
+		{
+			$member = self::load( $member, 'all' );
+		}
+		
+		//-----------------------------------------
+		// Caching
+		//-----------------------------------------
+		
+		static $buildMembers	= array();
+		
+		$_key	= $member['member_id'];
+		$_arr   = serialize( $member );
+		
+		foreach( $parseFlags as $_flag => $_value )
+		{
+			$_key .= $_flag . $_value;
+		}
+		
+		$_key	= md5($_key.$_arr);
+		
+		if( isset( $buildMembers[ $_key ] ) )
+		{
+			IPSDebug::setMemoryDebugFlag( "IPSMember::buildDisplayData: ".$member['member_id']. " - CACHED", $_NOW );
+			
+			return $buildMembers[ $_key ];
+		}
+
+		//-----------------------------------------
+		// Basics
+		//-----------------------------------------
+		
+		if ( ! $member['member_group_id'] )
+		{
+			$member['member_group_id'] = ipsRegistry::$settings['guest_group'];
+		}
+		
+		/* Unpack bitwise if required */
+		if ( ! isset( $member['bw_is_spammer'] ) )
+		{
+			$member = self::buildBitWiseOptions( $member );
+		}
+
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$rank_cache                = ipsRegistry::cache()->getCache( 'ranks' );
+		$group_cache			   = ipsRegistry::cache()->getCache( 'group_cache' );
+		$group_name                = self::makeNameFormatted( $group_cache[ $member['member_group_id'] ]['g_title'], $member['member_group_id'] );
+		$pips                      = 0;
+		$topic_id				   = intval( isset( ipsRegistry::$request[ 't' ] ) ? ipsRegistry::$request[ 't' ] : 0 );
+		$forum_id				   = intval( isset( ipsRegistry::$request[ 'f' ] ) ? ipsRegistry::$request[ 'f' ] : 0 );
+		
+		//-----------------------------------------
+		// SEO Name
+		//-----------------------------------------
+	
+		$member['members_seo_name'] = self::fetchSeoName( $member );
+		$member['_group_formatted'] = $group_name;
+
+		//-----------------------------------------
+		// Ranks
+		//-----------------------------------------
+
+		if ( is_array( $rank_cache ) AND count( $rank_cache ) )
+		{
+			foreach( $rank_cache as $k => $v)
+			{
+				if ( $member['posts'] >= $v['POSTS'] )
+				{
+					if ( empty( $member['title'] ) )
+					{
+						$member['title'] = $v['TITLE'];
+					}
+
+					$pips = $v['PIPS'];
+					break;
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Group image
+		//-----------------------------------------
+
+		$member['member_rank_img']		= '';
+		$member['member_rank_img_i']	= '';
+
+		if ( $group_cache[ $member['member_group_id'] ]['g_icon'] )
+		{
+			$_img = $group_cache[ $member['member_group_id'] ]['g_icon'];
+			
+			if ( substr( $_img, 0, 4 ) != 'http' AND strpos( $_img, '{style_images_url}' ) === false )
+			{
+				$_img = ipsRegistry::$settings['_original_base_url'] . '/' . ltrim( $_img, '/' );
+			}
+			
+			$member['member_rank_img_i']	= 'img';
+			$member['member_rank_img']		= $_img;
+		}
+		else if ( $pips AND $member['member_id'] )	/* Added member ID check per @link	http://community.invisionpower.com/tracker/issue-31761-guest-in-messanger-have-pips/ */
+		{
+			if ( is_numeric( $pips ) )
+			{
+				for ($i = 1; $i <= $pips; ++$i)
+				{
+					$member['member_rank_img_i']	= 'pips';
+					$member['member_rank_img']		= $member['member_rank_img'] . ipsRegistry::getClass('output')->getReplacement('pip_pip');
+				}
+			}
+			else
+			{
+				$member['member_rank_img_i']	= 'img';
+				$member['member_rank_img']		= ipsRegistry::$settings['public_dir'] . 'style_extra/team_icons/' . $pips;
+			}
+		}
+
+		//-----------------------------------------
+		// Moderator data
+		//-----------------------------------------
+		
+		if( ( $parseFlags['spamStatus'] OR $parseFlags['warn'] ) AND $member['member_id'] )
+		{
+			/* Possible forums class isn't init at this point */
+			if ( ! ipsRegistry::isClassLoaded('class_forums' ) )
+			{
+				try
+				{
+					$viewingMember = IPSMember::setUpModerator( ipsRegistry::member()->fetchMemberData() );
+					
+					ipsRegistry::member()->setProperty('forumsModeratorData', $viewingMember['forumsModeratorData'] );
+				}
+				catch( Exception $error )
+				{
+					IPS_exception_error( $error );
+				}
+			}
+			
+			$moderator					= ipsRegistry::member()->getProperty('forumsModeratorData');
+		}
+		
+		$forum_id					= isset(ipsRegistry::$request['f']) ? intval( ipsRegistry::$request['f'] ) : 0;
+
+		//-----------------------------------------
+		// Spammer status
+		//-----------------------------------------
+
+		if ( $parseFlags['spamStatus'] AND $member['member_id'] AND ipsRegistry::member()->getProperty('member_id') )
+		{
+			/* Defaults */
+			$member['spamStatus']		= NULL;
+			$member['spamImage']		= NULL;
+			
+			if ( !empty( $moderator[ $forum_id ]['bw_flag_spammers'] ) OR ipsRegistry::member()->getProperty('g_is_supmod') )
+			{
+				if ( !ipsRegistry::$settings['warn_on'] OR ( ! strstr( ','.ipsRegistry::$settings['warn_protected'].',', ','.$member['member_group_id'].',' ) ) )
+				{
+					if ( $member['bw_is_spammer'] )
+					{
+						$member['spamStatus'] = TRUE;
+					}
+					else
+					{
+						$member['spamStatus'] = FALSE;
+					}
+				}
+			}
+		}
+				
+		//-----------------------------------------
+		// Warny porny?
+		//-----------------------------------------
+
+		if ( $parseFlags['warn'] AND $member['member_id'] )
+		{
+			$member['warn_percent']		= NULL;
+			$member['can_edit_warn']	= false;
+
+			$member['warn_img']			= NULL;
+			
+			if ( ipsRegistry::$settings['warn_on'] and ( ! strstr( ','.ipsRegistry::$settings['warn_protected'].',', ','.$member['member_group_id'].',' ) ) )
+			{	
+				/* Warnings */
+				if ( !empty($moderator[ $forum_id ]['allow_warn']) OR ipsRegistry::member()->getProperty('g_is_supmod')
+					OR ( ipsRegistry::$settings['warn_show_own'] and ( ipsRegistry::member()->getProperty('member_id') == $member['member_id'] ) )
+				   )
+				{
+					// Work out which image to show.
+					if ( $member['warn_level'] <= ipsRegistry::$settings['warn_min'] )
+					{
+						$member['warn_img']		= '{parse replacement="warn_0"}';
+						$member['warn_percent']	= 0;
+					}
+					else if ( $member['warn_level'] >= ipsRegistry::$settings['warn_max'] )
+					{
+						$member['warn_img']		= '{parse replacement="warn_5"}';
+						$member['warn_percent']	= 100;
+					}
+					else
+					{
+						$member['warn_percent']	= $member['warn_level'] ? sprintf( "%.0f", ( ($member['warn_level'] / ipsRegistry::$settings['warn_max']) * 100) ) : 0;
+
+						if ( $member['warn_percent'] > 100 )
+						{
+							$member['warn_percent']	= 100;
+						}
+
+						if ( $member['warn_percent'] >= 81 )
+						{
+							$member['warn_img']	= '{parse replacement="warn_5"}';
+						}
+						else if ( $member['warn_percent'] >= 61 )
+						{
+							$member['warn_img']	= '{parse replacement="warn_4"}';
+						}
+						else if ( $member['warn_percent'] >= 41 )
+						{
+							$member['warn_img']	= '{parse replacement="warn_3"}';
+						}
+						else if ( $member['warn_percent'] >= 21 )
+						{
+							$member['warn_img']	= '{parse replacement="warn_2"}';
+						}
+						else if ( $member['warn_percent'] >= 1 )
+						{
+							$member['warn_img']	= '{parse replacement="warn_1"}';
+						}
+						else
+						{
+							$member['warn_img']	= '{parse replacement="warn_0"}';
+						}
+					}
+
+					if ( $member['warn_percent'] < 1 )
+					{
+						$member['warn_percent']	= 0;
+					}
+
+					/* Bug 14770 - Change so you can't warn yourself */
+					if ( ( !empty($moderator[ $forum_id ]['allow_warn']) or ipsRegistry::member()->getProperty('g_is_supmod') ) AND $member['member_id'] != ipsRegistry::member()->getProperty('member_id') )
+					{
+						$member['can_edit_warn']	= true;
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Profile fields stuff
+		//-----------------------------------------
+
+		$member['custom_fields'] = "";
+
+		if( $parseFlags['customFields'] == 1 AND $member['member_id'] )
+		{
+			if ( isset( self::$_parsedCustomFields[ $member['member_id'] ] ) )
+			{
+				$member['custom_fields'] = self::$_parsedCustomFields[ $member['member_id'] ];
+				
+				if ( $parseFlags['cfGetGroupData'] AND isset( self::$_parsedCustomGroups[ $member['member_id'] ] ) AND is_array( self::$_parsedCustomGroups[ $member['member_id'] ] ) )
+				{
+					$member['custom_field_groups'] = self::$_parsedCustomGroups[ $member['member_id'] ];
+				}
+				else if( $parseFlags['cfGetGroupData'] )
+				{
+					$member['custom_field_groups']						= self::$custom_fields_class->fetchGroupTitles();
+					self::$_parsedCustomGroups[ $member['member_id'] ]	= $member['custom_field_groups'];
+				}
+			}
+			else
+			{
+				if ( !is_object( self::$custom_fields_class ) )
+				{
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/customfields/profileFields.php', 'customProfileFields' );
+					self::$custom_fields_class	= new $classToLoad();
+				}
+	
+				if ( self::$custom_fields_class )
+				{
+					self::$custom_fields_class->member_data	= $member;
+					self::$custom_fields_class->skinGroup	= $parseFlags['cfSkinGroup'];
+					self::$custom_fields_class->initData();
+					self::$custom_fields_class->parseToView( $parseFlags['checkFormat'], $parseFlags['cfLocation'] );
+
+					$member['custom_fields']							= self::$custom_fields_class->out_fields;
+					self::$_parsedCustomFields[ $member['member_id'] ]	= $member['custom_fields'];
+					
+					if ( $parseFlags['cfGetGroupData'] )
+					{
+						$member['custom_field_groups']						= self::$custom_fields_class->fetchGroupTitles();
+						self::$_parsedCustomGroups[ $member['member_id'] ]	= $member['custom_field_groups'];
+					}
+				}
+			}
+		}
+
+		//-----------------------------------------
+		// Profile photo
+		//-----------------------------------------
+
+		$member = self::buildProfilePhoto( $member );
+
+		if ( ! empty( $parseFlags['photoTagSize'] ) )
+		{
+			$parseFlags['photoTagSize'] = ( is_array( $parseFlags['photoTagSize'] ) ) ? $parseFlags['photoTagSize'] : array( $parseFlags['photoTagSize'] );
+			
+			foreach( $parseFlags['photoTagSize'] as $size )
+			{
+				$member['photoTag' . ucfirst( $size ) ] = self::buildPhotoTag( $member, $size );
+			}
+		}
+			
+		//-----------------------------------------
+		// Signature bbcode
+		//-----------------------------------------
+
+		if ( !empty( $member['signature'] ) AND $parseFlags['signature'] )
+		{
+			if( isset(self::$_parsedSignatures[ $member['member_id'] ]) )
+			{
+				$member['signature'] = self::$_parsedSignatures[ $member['member_id'] ];
+			}
+			else
+			{
+				if ( $member['cache_content'] )
+				{
+					$member['signature'] = '<!--cached-' . gmdate( 'r', $member['cache_updated'] ) . '-->' . $member['cache_content'];
+				}
+				else
+				{
+					IPSText::getTextClass('bbcode')->parse_bbcode				= 1;
+					IPSText::getTextClass('bbcode')->parse_smilies				= 0;
+					IPSText::getTextClass('bbcode')->parse_html					= $group_cache[ $member['member_group_id'] ]['g_dohtml'];
+					IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
+					IPSText::getTextClass('bbcode')->parsing_section			= 'signatures';
+					IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $member['member_group_id'];
+					IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $member['mgroup_others'];				
+
+					$member['signature']	= IPSText::getTextClass('bbcode')->preDisplayParse( $member['signature'] );
+
+					IPSContentCache::update( $member['member_id'], 'sig', $member['signature'] );
+				}
+
+				self::$_parsedSignatures[ $member['member_id'] ] = $member['signature'];
+			}
+		}
+
+		//-----------------------------------------
+		// If current session, reset last_activity
+		//-----------------------------------------
+		
+		if( ! empty( $member['running_time'] ) )
+		{
+			$member['last_activity'] = $member['running_time'] > $member['last_activity'] ? $member['running_time'] : $member['last_activity'];
+		}
+
+		//-----------------------------------------
+		// Online?
+		//-----------------------------------------
+
+		$time_limit 	   = time() - ipsRegistry::$settings['au_cutoff'] * 60;
+		$member['_online'] = 0;
+
+		list( $be_anon, $loggedin )	= explode( '&', isset($member['login_anonymous']) ? $member['login_anonymous'] : '0&0' );
+
+		if( ipsRegistry::$settings['disable_anonymous'] )
+		{
+			$be_anon  = 0;
+		}
+
+		$bypass_anon				= 0;
+
+		if ( ipsRegistry::member()->getProperty('g_access_cp') )
+		{
+			$bypass_anon	= 1;
+		}
+
+		if ( ( $member['last_visit'] > $time_limit OR $member['last_activity'] > $time_limit ) AND ( $be_anon != 1 OR $bypass_anon == 1 ) AND $loggedin == 1 )
+		{
+			$member['_online'] = 1;
+		}
+
+		//-----------------------------------------
+		// Last Active
+		//-----------------------------------------
+
+		$member['_last_active'] = ipsRegistry::getClass('class_localization')->getDate( $member['last_activity'], 'SHORT' );
+
+		if( $be_anon == 1 )
+		{
+			// Member last logged in anonymous
+
+			if( !ipsRegistry::member()->getProperty('g_access_cp') )
+			{
+				$member['_last_active'] = ipsRegistry::getClass('class_localization')->words['private'];
+			}
+		}
+
+		//-----------------------------------------
+		// Rating
+		//-----------------------------------------
+
+		$member['_pp_rating_real'] = intval( $member['pp_rating_real'] );
+
+		//-----------------------------------------
+		// Long display names
+		//-----------------------------------------
+
+		$member['members_display_name_short'] = IPSText::truncate( $member['members_display_name'], 16 );
+
+		//-----------------------------------------
+		// Reputation
+		//-----------------------------------------
+
+		$member['pp_reputation_points'] = $member['pp_reputation_points'] ? $member['pp_reputation_points'] : 0;
+		
+		if( $parseFlags['reputation'] AND $member['member_id'] )
+		{
+			if( ! ipsRegistry::isClassLoaded( 'repCache' ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
+				ipsRegistry::setClass( 'repCache', new $classToLoad() );
+			}
+
+			$member['author_reputation']    = ipsRegistry::getClass( 'repCache' )->getReputation( $member['pp_reputation_points'] );
+		}
+
+		//-----------------------------------------
+		// Other stuff not worthy of individual comments
+		//-----------------------------------------
+
+		$member['members_profile_views']	= isset($member['members_profile_views']) ? $member['members_profile_views'] : 0;
+		
+		/* BG customization */
+		if ( $member['pp_customization'] AND !empty($member['gbw_allow_customization']) AND ! $member['bw_disable_customization'] )
+		{ 
+			$member['customization'] = unserialize( $member['pp_customization'] );
+			
+			if ( is_array( $member['customization'] ) )
+			{
+				/* Figure out BG URL */
+				if ( $member['customization']['type'] == 'url' AND $member['customization']['bg_url'] AND $member['gbw_allow_url_bgimage'] )
+				{
+					$member['customization']['_bgUrl'] = $member['customization']['bg_url'];
+				}
+				else if ( $member['customization']['type'] == 'upload' AND $member['customization']['bg_url'] AND $member['gbw_allow_upload_bgimage'] )
+				{
+					$member['customization']['_bgUrl'] = ipsRegistry::$settings['upload_url'] . '/' . $member['customization']['bg_url'];
+				}
+				else if ( $member['customization']['bg_color'] )
+				{
+					$member['customization']['type'] = 'bgColor';
+				}
+			}
+		}
+				
+		/* Title is ambigious */
+		$member['member_title'] = $member['title'];
+			
+		IPSDebug::setMemoryDebugFlag( "IPSMember::buildDisplayData: ".$member['member_id']. " - Completed", $_NOW );
+		
+		$buildMembers[ $_key ]	= $member;
+		
+		return $member;
+	}
+	
+	/**
+	 * Build member's bitwise field
+	 *
+	 * @param	mixed		Either an array of member data or a member ID
+	 * @return	array
+	 */
+	static public function buildBitWiseOptions( $member )
+	{
+		//-----------------------------------------
+		// Load the member?
+		//-----------------------------------------
+
+		if ( ! is_array( $member ) AND ( $member == intval( $member ) ) )
+		{
+			$member = self::load( $member, 'core,extendedProfile' );
+		}
+	
+		/* Unpack bitwise fields */
+		$_tmp = IPSBWOptions::thaw( isset($member['members_bitoptions']) ? $member['members_bitoptions'] : 0, 'members', 'global' );
+
+		if ( count( $_tmp ) )
+		{
+			foreach( $_tmp as $k => $v )
+			{
+				/* Trigger notice if we have DB field */
+				if ( isset( $member[ $k ] ) )
+				{
+					trigger_error( "Thawing bitwise options for MEMBERS: Bitwise field '$k' has overwritten DB field '$k'", E_USER_WARNING );
+				}
+
+				$member[ $k ] = $v;
+			}
+		}
+		
+		return $member;
+	}
+	
+	/**
+	 * Returns user's avatar [DEPRICATED]
+	 * @todo    Remove in 3.3 this is depricated
+	 *
+	 * @param	mixed		Either an array of member data or a member ID
+	 * @param	bool		Whether to avoid caching
+	 * @param	bool		Whether to show avatar even if view_avs is off for member
+	 * @return	string		HTML
+	 * @since	2.0
+	 * 
+	 * @deprecated
+	 */
+    static public function buildAvatar( $member, $no_cache=0, $overRide=0 )
+    {
+    	return self::buildProfilePhoto( $member, 'thumb' );
+    }
+
+	/**
+	 * Checks for a DB row that matches $email
+	 *
+	 * @param	string 		Email address
+	 * @return	boolean		Record exists
+	 */
+	static public function checkByEmail( $email )
+	{
+		$test = self::load( $email, '' );
+
+		if ( $test['member_id'] )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Updates member's DB row password
+	 *
+	 * @param	string		Key: either member_id or email
+	 * @param	string		MD5-once hash of new password
+	 * @return	boolean		Update successful
+	 */
+	static public function updatePassword( $member_key, $new_md5_pass )
+	{
+		if ( ! $member_key or ! $new_md5_pass )
+		{
+			return false;
+		}
+
+		/* Load member */
+		$member = self::load( $member_key );
+
+		$new_pass = md5( md5( $member['members_pass_salt'] ) . $new_md5_pass );
+
+		self::save( $member_key, array( 'core' => array( 'members_pass_hash' => $new_pass ) ) );
+
+		return true;
+	}
+
+	/**
+	 * Check supplied password with database
+	 *
+	 * @param	string		Key: either member_id or email
+	 * @param	string		MD5 of entered password
+	 * @return	boolean		Password is correct
+	 */
+	static public function authenticateMember( $member_key, $md5_once_password )
+	{
+		/* Load member */
+		$member = self::load( $member_key );
+
+		if ( ! $member['member_id'] )
+		{
+			return FALSE;
+		}
+
+		if ( $member['members_pass_hash'] == self::generateCompiledPasshash( $member['members_pass_salt'], $md5_once_password ) )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Generates a compiled passhash.
+	 * Returns a new MD5 hash of the supplied salt and MD5 hash of the password
+	 *
+	 * @param	string		User's salt (5 random chars)
+	 * @param	string		User's MD5 hash of their password
+	 * @return	string		MD5 hash of compiled salted password
+	 */
+	static public function generateCompiledPasshash( $salt, $md5_once_password )
+	{
+		return md5( md5( $salt ) . $md5_once_password );
+	}
+
+	/**
+	 * Generates a password salt.
+	 * Returns n length string of any char except backslash
+	 *
+	 * @param	integer		Length of desired salt, 5 by default
+	 * @return	string		n character random string
+	 */
+	static public function generatePasswordSalt($len=5)
+	{
+		$salt = '';
+
+		for ( $i = 0; $i < $len; $i++ )
+		{
+			$num   = mt_rand(33, 126);
+
+			if ( $num == '92' )
+			{
+				$num = 93;
+			}
+
+			$salt .= chr( $num );
+		}
+
+		return $salt;
+	}
+
+	/**
+	 * Generates a log in key
+	 *
+	 * @param	integer		Length of desired random chars to MD5
+	 * @return	string		MD5 hash of random characters
+	 */
+	static public function generateAutoLoginKey( $len=60 )
+	{
+		$pass = self::generatePasswordSalt( $len );
+
+		return md5($pass);
+	}
+
+	/**
+	 * Check to see if a member is in a group or not
+	 *
+	 * @param	mixed		Either INT (member_id) OR Array of member data [MUST at least include member_group_id and mgroup_others]
+	 * @param	mixed		Either INT (group ID) or array of group IDs
+	 * @param	boolean		TRUE (default, check secondary groups also), FALSE (check primary only)
+	 * @return	boolean		TRUE (is in group) - FALSE (not in group)
+	 */
+	static public function isInGroup( $member, $group, $checkSecondary=true )
+	{
+		$memberData = ( is_array( $member ) ) ? $member : self::load( $member, 'core' );
+		$group      = ( is_array( $group ) )  ? $group  : array( $group );
+		$others		= explode( ',', $memberData['mgroup_others'] );
+		
+		if ( ! $memberData['member_group_id'] OR ! count( $group ) )
+		{
+			return FALSE;
+		}
+		
+		/* Loop */
+		foreach( $group as $gid )
+		{
+			if ( $gid == $memberData['member_group_id'] )
+			{
+				return true;
+			}
+			
+			if ( $checkSecondary AND is_array( $others ) AND count( $others ) )
+			{
+				if ( $gid AND in_array( $gid, $others ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Check to see if user has other groups
+	 *
+	 * @param	mixed		Either INT (member_id) OR Array of member data [MUST at least include member_group_id and mgroup_others]
+	 * @param	mixed		Either INT (group ID) or array of group IDs
+	 * @return	boolean		TRUE (has other groups) - FALSE (no other groups)
+	 */
+	static public function hasOtherGroups( $member, $group )
+	{
+		$memberData = ( is_array( $member ) ) ? $member : self::load( $member, 'core' );
+		$group      = ( is_array( $group ) )  ? $group  : array( $group );
+		$others		= explode( ',', $memberData['mgroup_others'] );
+		$mygroups	= is_array($others) ? array_merge( $others, array( $memberData['member_group_id'] ) ) : array( $memberData['member_group_id'] );
+
+		if ( ! $memberData['member_group_id'] OR ! count( $group ) )
+		{
+			return FALSE;
+		}
+		
+		/* Loop */
+		foreach( $mygroups as $gid )
+		{
+			if ( !in_array( $gid, $group ) )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	/**
+	 * Check to see if a member is banned (or not)
+	 *
+	 * @param	string		Type of ban check (ip/ipAddress, name, email)
+	 * @param	string		String to check
+	 * @return	boolean		TRUE (banned) - FALSE (not banned)
+	 */
+	static public function isBanned( $type, $string )
+	{
+		/* Try and be helpful */
+		switch ( strtolower( $type ) )
+		{
+			case 'ip':
+				$type = 'ipAddress';
+			break;
+			case 'emailaddress':
+				$type = 'email';
+			break;
+			case 'username':
+			case 'displayname':
+				$type = 'name';
+			break;
+		}
+
+		if ( $type == 'ipAddress' )
+		{
+			$banCache = ipsRegistry::cache()->getCache('banfilters');
+		}
+		else
+		{
+			if ( ! is_array( self::$_banFiltersCache ) )
+			{
+				self::$_banFiltersCache = array();
+
+				/* Load Ban Filters */
+				ipsRegistry::DB()->build( array( 'select' => '*', 'from' => 'banfilters' ) );
+				ipsRegistry::DB()->execute();
+
+				while( $r = ipsRegistry::DB()->fetch() )
+				{
+					self::$_banFiltersCache[ $r['ban_type'] ][] = $r['ban_content'];
+				}
+			}
+
+			$banCache = self::$_banFiltersCache[ $type ];
+		}
+
+		if ( is_array( $banCache ) and count( $banCache ) )
+		{
+			foreach( $banCache as $entry )
+			{
+				$ip = str_replace( '\*', '.*', preg_quote( trim($entry), "/") );
+
+				if ( $ip AND preg_match( "/^$ip$/", $string ) )
+				{
+					return TRUE;
+				}
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Check to see if a member is ignorable or not
+	 *
+	 * @param	int			Member's primary group ID
+	 * @param	string		Comma delisted list of 'other' member groups
+	 * @param	string		Type: 'post' or 'pm'
+	 * @return	boolean		True (member is ignorable) or False (member can not be ignored)
+	 */
+	static public function isIgnorable( $member_group_id, $mgroup_others, $type='post' )
+	{
+		if( ! isset( ipsRegistry::$settings['_unblockableArray'] ) OR ! is_array( ipsRegistry::$settings['_unblockableArray'] ) )
+		{
+			ipsRegistry::$settings['_unblockableArray'] = ipsRegistry::$settings['cannot_ignore_groups'] ? explode( ",", IPSText::cleanPermString( ipsRegistry::$settings['cannot_ignore_groups'] ) ) : array();
+		}
+
+		$myGroups    = array( $member_group_id );
+
+ 		if ( $mgroup_others )
+ 		{
+	 		$myGroups = array_merge( $myGroups, explode( ",", IPSText::cleanPermString( $mgroup_others ) ) );
+ 		}
+ 		
+ 		/* Check PMs first */
+ 		if ( $type == 'pm' )
+ 		{
+ 			$unblockable = explode( ",", ipsRegistry::$settings['unblockable_pm_groups'] );
+ 			
+ 			/* Override with groups */
+			if ( is_array( $unblockable ) AND count( $unblockable ) )
+			{
+				if ( in_array( $member_group_id, $unblockable ) )
+				{
+					return FALSE;
+				}
+			}
+ 		}
+ 		
+ 		foreach( $myGroups as $member_group )
+ 		{
+	 		if ( in_array( $member_group, ipsRegistry::$settings['_unblockableArray'] ) )
+	 		{
+		 		return FALSE;
+	 		}
+	 	}
+
+		return TRUE;
+	}
+
+	/**
+	 * Easy peasy way to grab a function from member/memberFunctions.php
+	 * without having to bother setting it up each time.
+	 *
+	 * @return	object		memberFunctions object
+	 * @author	MattMecham
+	 */
+	static public function getFunction()
+	{
+		if ( ! is_object( self::$_memberFunctions ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/memberFunctions.php', 'memberFunctions' );
+			self::$_memberFunctions = new $classToLoad( ipsRegistry::instance() );
+		}
+
+		return self::$_memberFunctions;
+	}
+
+	/**
+	 * Set the cache to ignore
+	 * Works for one LOAD only! It's reset again for the next load
+	 *
+	 * @return	@e void
+	 */
+	static public function ignoreCache()
+	{
+		self::$ignoreCache = TRUE;
+	}
+	
+	/**
+	 * Can upload a photo
+	 * @param array $memberData
+	 * @return boolean
+	 */
+	static public function canUploadPhoto( $memberData )
+	{
+		return ( ( $memberData['g_edit_profile'] && $memberData['photoMaxKb'] && $memberData['photoMaxWidth'] && $memberData['photoMaxHeight'] ) || IN_ACP ) ? true : false;
+	}
+	
+	/**
+	 * Kludgy function to prevent long strings of HTML logic
+	 *
+	 * @param	array	Array of data (has_given_rep, etc)
+	 * @param	array	Member Data
+	 * @return	boolean
+	 */
+	static public function canRepUp( $data, $memberData=array() )
+	{
+		return ( ( ipsRegistry::$settings['reputation_point_types'] == 'like' AND empty( $data['has_given_rep'] ) ) OR in_array( ipsRegistry::$settings['reputation_point_types'], array( 'positive', 'both' ) ) && empty( $data['has_given_rep'] ) ) ? true : false;
+	}
+	
+	/**
+	 * Kludgy function to prevent long strings of HTML logic
+	 *
+	 * @param	array	Array of data (has_given_rep, etc)
+	 * @param	array	Member Data
+	 * @return	boolean
+	 */
+	static public function canRepDown( $data, $memberData=array() )
+	{
+		return ( $data['has_given_rep'] == 1 AND ipsRegistry::$settings['reputation_point_types'] == 'like' ) OR ( empty( $data['has_given_rep'] ) AND in_array( ipsRegistry::$settings['reputation_point_types'], array( 'negative', 'both' ) ) ) ? true : false;
+	}
+	
+	/**
+	 * Can give rep to an item
+	 *
+	 * @param	array	Array of data (has_given_rep, etc)
+	 * @param	array	Member data
+	 */
+	static public function canGiveRep( $data, $memberData )
+	{
+		return ( $data['has_given_rep'] == 1 AND ipsRegistry::$settings['reputation_point_types'] == 'like' ) OR ( $data['has_given_rep'] != 1 ) AND ( $memberData['member_id'] != 0 ) && ( ipsRegistry::$settings['reputation_can_self_vote'] OR ( $memberData['member_id'] != ipsRegistry::member()->getProperty('member_id') ) ) ? true : false;
+	}
+	
+	/**
+	 * Adds a member to the cache
+	 *
+	 * @param	array 		Member Data
+	 * @param	array 		Tables queried
+	 * @return	@e void
+	 */
+	static protected function _addToCache( $memberData, $tables )
+	{
+		if ( ! $memberData['member_id'] OR ! is_array( $tables ) )
+		{
+			return FALSE;
+		}
+
+		$_tables = self::__buildTableHash( $tables );
+
+		self::$memberCache[ $memberData['member_id'] ][ $_tables ] = $memberData;
+
+		self::$debugData[] = "ADDED: Member ID: " . $memberData['member_id'] . " with tables " . implode( ",", $tables ). ' key ('.$_tables.')';
+	}
+
+	/**
+	 * Removes a member from the cache
+	 *
+	 * @param	int 		Member ID
+	 * @return	@e void
+	 */
+	static protected function _removeFromCache( $memberID )
+	{
+		if ( is_array( self::$memberCache[ $memberID ] ) )
+		{
+			unset( self::$memberCache[ $memberID ] );
+
+			self::$debugData[] = "REMOVED: Member ID: " . $memberID;
+		}
+	}
+
+	/**
+	 * Removes a member from the cache
+	 *
+	 * @param	int 		Member ID to look for
+	 * @param	array 		Tables required
+	 * @return	mixed		Array of data if a match is found, or FALSE if not.
+	 */
+	static protected function _fetchFromCache( $memberID, $tables )
+	{
+		if ( self::$ignoreCache === TRUE )
+		{
+			return FALSE;
+		}
+
+		if ( ! $memberID OR ! is_array( $tables ) )
+		{
+			return FALSE;
+		}
+
+		$_tables = self::__buildTableHash( $tables );
+
+		if ( isset( self::$memberCache[ $memberID ][ $_tables ] ) && is_array( self::$memberCache[ $memberID ][ $_tables ] ) )
+		{
+			self::$debugData[] = "FETCHED: Member ID: " . $memberID. ' key ('.$_tables.')';
+
+			return self::$memberCache[ $memberID ][ $_tables ];
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Updates a member from the cache
+	 *
+	 * @param	int 		Member ID to update
+	 * @param	array 		Array of data to update(eg: array( 'core' => 'member_login_key' => 'xxxxx' ) )
+	 * @return	mixed		Array of data if a match is found, or FALSE if not.
+	 */
+	static protected function _updateCache( $memberID, $data )
+	{
+		if ( ! $memberID OR ! is_array( $data ) )
+		{
+			return FALSE;
+		}
+
+		if ( is_array( self::$memberCache[ $memberID ] ) )
+		{
+			foreach(  self::$memberCache[ $memberID ] as $tableData => $memberData )
+			{
+				foreach( $data as $table => $newData )
+				{
+					foreach( $newData as $k => $v )
+					{
+						self::$memberCache[ $memberID ][ $tableData ][ $k ] = $v;
+					}
+				}
+			}
+
+			self::$debugData[] = "Updated: Member ID: " . $memberID;
+
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Build table key.
+	 * Takes an array of tables and returns an MD5 comparison hash
+	 *
+	 * @param	array 		Array of tables
+	 * @return	string		MD5 hash
+	 */
+	static protected function __buildTableHash( $tables )
+	{
+		sort( $tables );
+		return md5( implode( ',', $tables ) );
+	}
+
+	/**
+	 * Sends a query to the IPS Spam Service
+	 *
+	 * @param	string		$email		Email address to check/report
+	 * @param	string		[$ip]		IP Address to check report, ipsRegistry::member()->ip_address will be used if the address is not specified
+	 * @param	string		[$type]		Either register or markspam, register is default
+	 * @return	string
+	 */
+	static public function querySpamService( $email, $ip='', $type='register', $test=0 )
+	{
+		/* Get the response */
+		$key		= ipsRegistry::$settings['spam_service_api_key'];
+		
+		if( !$key )
+		{
+			return 0;
+		}
+
+		$domain 	= ipsRegistry::$settings['board_url'];
+		$ip			= ( $ip AND ip2long( $ip ) ) ? $ip : ipsRegistry::member()->ip_address;
+		$response	= false;
+		$testConn	= $test ? '&debug_mode=1' : '';
+		
+		/* Get the file managemnet class */
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$query = new $classToLoad();
+		$query->timeout = ipsRegistry::$settings['spam_service_timeout'];
+		
+		/* Query the service */
+		$response = $query->getFileContents( "http://api.ib.am/antispam.php?key={$key}&domain={$domain}&type={$type}&email={$email}&ip={$ip}{$testConn}" );
+
+		if( ! $response )
+		{
+			return 'timeout';
+		}
+		
+		$response		= explode( "\n", $response );
+		$responseCode	= $response[0];
+		$responseMsg	= $response[1];
+		
+		if( $test )
+		{
+			return $responseMsg;
+		}
+
+		/* Log Request */
+		if( $type == 'register' )
+		{
+			ipsRegistry::DB()->insert( 'spam_service_log', array(
+																	'log_date'		=> time(),
+																	'log_code'		=> $responseCode,
+																	'log_msg'		=> $responseMsg,
+																	'email_address'	=> $email,
+																	'ip_address'	=> $ip
+																)
+									);
+		}
+
+		return intval( $responseCode );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/base/ipsRegistry.php b/upload/admin/sources/base/ipsRegistry.php
index 2752b754..2e18ee8b 100644
--- a/upload/admin/sources/base/ipsRegistry.php
+++ b/upload/admin/sources/base/ipsRegistry.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ipsRegistry:: Registry file controlls handling of objects needed throughout IPB
- * Last Updated: $Date: 2010-11-17 09:28:24 -0500 (Wed, 17 Nov 2010) $
+ * Last Updated: $Date: 2011-10-13 11:17:19 -0400 (Thu, 13 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 7207 $
+ * @version		$Rev: 9610 $
  */
  
 /**
@@ -40,29 +40,29 @@ class ipsRegistry
 	 *
 	 * @var		array
 	 */
-	private static $_seoTemplates = array();
+	protected static $_seoTemplates = array();
 
 	/**
 	 * Incoming URI - used in SEO / fURL stuffs
 	 *
 	 * @var		string
 	 */
-	private static $_uri = '';
+	protected static $_uri = '';
 	
 	/**
 	 * Flag to note incorrect FURL (no furl template match)
 	 *
 	 * @var		string
 	 */
-	private static $_noFurlMatch = false;
+	protected static $_noFurlMatch = false;
 
 	/**#@+
 	 * Holds data for app / coreVariables
 	 *
 	 * @var		array
 	 */
-	private static $_coreVariables			= array();
-	private static $_masterCoreVariables	= array();
+	protected static $_coreVariables			= array();
+	protected static $_masterCoreVariables	= array();
 	/**#@-*/
 
 	/**
@@ -70,14 +70,14 @@ class ipsRegistry
 	 *
 	 * @var		array
 	 */
-	private static $handles					= array();
+	protected static $handles					= array();
 
 	/**
 	 * Handles for other classes
 	 *
 	 * @var		array
 	 */
-	private static $classes					= array();
+	protected static $classes					= array();
 
 	/**
 	 * Word array
@@ -191,6 +191,11 @@ class ipsRegistry
 
 		return self::$instance;
 	}
+	
+	/**
+	 * Enable app search
+	 */
+	static public $appSearch = FALSE;
 
 	/**
 	 * Ok, we need a guaranteed way to perform some clean up
@@ -204,7 +209,7 @@ class ipsRegistry
 	 * So, we use a register_shutdown_function instead which is always called before any
 	 * __destruct() destructors.  Happy days again. We hope
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function __myDestruct()
 	{
@@ -226,7 +231,7 @@ class ipsRegistry
 	/**
 	 * Process the mail queue
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function processMailQueue()
 	{
@@ -254,7 +259,7 @@ class ipsRegistry
 		$sent_ids = array();
 
 		if ( $mailQueueCount > 0 )
-		{
+		{ 
 			/* Test lock */
 			$test = self::DB()->buildAndFetch( array( 'select' => 'cs_value, cs_updated',
 													  'from'   => 'cache_store',
@@ -305,19 +310,28 @@ class ipsRegistry
 				{
 					if ( $mail['mail_to'] and $mail['mail_subject'] and $mail['mail_content'] )
 					{
-						IPSText::getTextClass('email')->to		= $mail['mail_to'];
-						IPSText::getTextClass('email')->from	= $mail['mail_from'] ? $mail['mail_from'] : self::$settings['email_out'];
-						IPSText::getTextClass('email')->subject	= $mail['mail_subject'];
-						IPSText::getTextClass('email')->message	= $mail['mail_content'];
-
+						/* Clear out previous data */
+						IPSText::getTextClass('email')->clearContent();
+						
+						/* Specifically a HTML email */
 						if ( $mail['mail_html_on'] )
 						{
-							IPSText::getTextClass('email')->html_email	= 1;
+							IPSText::getTextClass('email')->setHtmlEmail( true );
+							IPSText::getTextClass('email')->setHtmlTemplate( $mail['mail_content'] );
 						}
 						else
 						{
-							IPSText::getTextClass('email')->html_email	= 0;
+							/* We want to parse the plain text emails */
+							IPSText::getTextClass('email')->setPlainTextTemplate( $mail['mail_content'] );
 						}
+						
+						/* Build plain/HTML versions */
+						IPSText::getTextClass('email')->buildMessage( array() );
+		
+						IPSText::getTextClass('email')->to		= $mail['mail_to'];
+						IPSText::getTextClass('email')->cc		= empty($mail['mail_cc']) ? array() : explode( ',', $mail['mail_cc'] );
+						IPSText::getTextClass('email')->from	= $mail['mail_from'] ? $mail['mail_from'] : self::$settings['email_out'];
+						IPSText::getTextClass('email')->subject	= $mail['mail_subject'];
 
 						IPSText::getTextClass('email')->sendMail();
 
@@ -362,7 +376,8 @@ class ipsRegistry
 	 */
 	static public function init()
 	{
-		$INFO = array();
+		$INFO 			   = array();
+		$_ipsPowerSettings = array();
 		
 		if ( self::$initiated === TRUE )
 		{
@@ -372,7 +387,8 @@ class ipsRegistry
 		self::$initiated = TRUE;
 	
 		/* Load static classes */
-		require IPS_ROOT_PATH . "sources/base/core.php";
+		require( IPS_ROOT_PATH . "sources/base/core.php" );/*noLibHook*/
+		require( IPS_ROOT_PATH . "sources/base/ipsMember.php" );/*noLibHook*/
 		
 		/* Debugging notices? */
 		if ( defined( 'IPS_ERROR_CAPTURE' ) AND IPS_ERROR_CAPTURE !== FALSE )
@@ -385,19 +401,28 @@ class ipsRegistry
 		self::_loadCoreVariables();
 
 		/* Load config file */
-		if ( file_exists( DOC_IPS_ROOT_PATH . "conf_global.php" ) )
+		if ( is_file( DOC_IPS_ROOT_PATH . 'conf_global.php' ) )
 		{
-			require DOC_IPS_ROOT_PATH . "conf_global.php";
+			require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 
 			if ( is_array( $INFO ) )
 			{
 				foreach( $INFO as $key => $val )
 				{
-					ipsRegistry::$settings[ $key ]	= $val;
+					ipsRegistry::$settings[ $key ]	= str_replace( '&#092;', '\\', $val );
 				}
 			}
 		}
 
+		/* Load secret sauce */
+		if ( is_array( $_ipsPowerSettings) )
+		{
+			ipsRegistry::$settings = array_merge( $_ipsPowerSettings, ipsRegistry::$settings );
+		}
+		
+		/* Just in case they copy a space in the license... @link http://community.invisionpower.com/tracker/issue-33048-strip-whitespace-from-license-key */
+		ipsRegistry::$settings['ipb_reg_number'] = trim(ipsRegistry::$settings['ipb_reg_number']);
+		
 		/* Make sure we're installed */
 		if ( empty( $INFO['sql_database'] ) )
 		{
@@ -417,7 +442,12 @@ class ipsRegistry
 			}
 			else
 			{
-				@header("Location: http://".$host.rtrim(dirname($self), '/\\')."/admin/install/index.php" );
+				if( !defined('CP_DIRECTORY') )
+				{
+					define( 'CP_DIRECTORY', 'admin' );
+				}
+
+				@header("Location: http://".$host.rtrim(dirname($self), '/\\')."/".CP_DIRECTORY."/install/index.php" );
 			}
 		}
 
@@ -438,10 +468,28 @@ class ipsRegistry
 		{
 			define( 'ALLOW_FURLS', ( ipsRegistry::$settings['use_friendly_urls'] ) ? TRUE : FALSE );
 		}
+		
+		if ( ! defined( 'IPS_IS_MOBILE_APP' ) )
+		{
+			define( 'IPS_IS_MOBILE_APP', false );
+		}
+		
+		/**
+		 * File and folder permissions
+		 */
+	 	if( !defined('IPS_FILE_PERMISSION') )
+	 	{
+			define( 'IPS_FILE_PERMISSION', 0777 );
+		}
 
+	 	if( !defined('IPS_FOLDER_PERMISSION') )
+	 	{
+			define( 'IPS_FOLDER_PERMISSION', 0777 );
+		}
+		
 		/* Set it again incase a gateway turned it off */
 		ipsRegistry::$settings['use_friendly_urls'] = ALLOW_FURLS;
-
+		
 		/* Start timer */
 		IPSDebug::startTimer();
 
@@ -518,7 +566,15 @@ class ipsRegistry
 		self::$handles['caches']   = ips_CacheRegistry::instance();
 
 		/* Make sure all is well before we proceed */
-		self::instance()->setUpSettings();
+		try
+		{
+			self::instance()->setUpSettings();
+		}
+		catch( Exception $e )
+		{
+			print file_get_contents( DOC_IPS_ROOT_PATH . 'cache/skin_cache/settingsEmpty.html' );
+			exit;
+		}
 		
 		/* Bah, now let's go over any input cleaning routines that have settings *sighs* */
 		self::$request = IPSLib::postParseIncomingRecursively( self::$request );
@@ -544,11 +600,11 @@ class ipsRegistry
 		self::instance()->setClass( 'permissions'       , new $classToLoad( self::instance() ) );
 
 		/* Must be called before output initiated */
-		self::_getAppClass();
+		self::getAppClass( IPS_APP_COMPONENT );
 		
 		if ( IPS_AREA == 'admin' )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/output/publicOutput.php' );
+			require_once( IPS_ROOT_PATH . 'sources/classes/output/publicOutput.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/output/adminOutput.php', 'adminOutput' );
 			self::instance()->setClass( 'output'           , new $classToLoad( self::instance() ) );
 			
@@ -565,6 +621,9 @@ class ipsRegistry
 			
 			register_shutdown_function( array( 'ipsRegistry', '__myDestruct' ) );
 		}
+		
+		/* Post member processing */
+		self::$handles['member']->postOutput();
 
 		/* Add SEO templates to the output system */
 		self::instance()->getClass('output')->seoTemplates = self::$_seoTemplates;
@@ -586,10 +645,11 @@ class ipsRegistry
 			if( in_array( $groupId, $member_group_ids ) )
 			{
 				$memberData['showReportCenter']	= true;
+				break;
 			}
 		}
 
-		if( $memberData['showReportCenter'] OR ( isset($memberData['g_is_supmod']) AND $memberData['g_is_supmod'] ) )
+		if( $memberData['showReportCenter'] OR !empty($memberData['g_is_supmod']) )
 		{
 			$memberData['access_report_center']	= true;
 
@@ -702,12 +762,24 @@ class ipsRegistry
 					}
 				}
 			}
-
+			
+			/* Specific Ajax Check */
+			if ( IPS_IS_AJAX )
+			{
+				if ( self::$handles['member']->getProperty('g_view_board') != 1 || ( ipsRegistry::$settings['board_offline'] && ! self::$handles['member']->getProperty('g_access_offline') ) )
+				{
+					@header( "Content-type: application/json;charset=" . IPS_DOC_CHAR_SET );
+					print json_encode( array( 'error' => 'no_permission', '__board_offline__' => 1 ) );
+					exit();
+				}
+			}
+			
+			/* Other public check */
 			if ( IPB_THIS_SCRIPT == 'public' and
 				IPS_ENFORCE_ACCESS				   === FALSE AND (
 				ipsRegistry::$request['section']   != 'login'  and
 				ipsRegistry::$request['section']   != 'lostpass'  and
-				ipsRegistry::$request['module']    != 'ajax' and
+				IPS_IS_AJAX === FALSE and
 				ipsRegistry::$request['section']   != 'rss' and
 				ipsRegistry::$request['section']   != 'attach' and
 				ipsRegistry::$request['module']    != 'task'   and
@@ -756,7 +828,7 @@ class ipsRegistry
 				//  Is log in enforced?
 				//--------------------------------
 
-				if ( ! ( defined( 'IPS_IS_SHELL' ) && IPS_IS_SHELL === TRUE ) && ( ( ! self::$handles['member']->getProperty('member_id') ) and (ipsRegistry::$settings['force_login'] == 1) && ipsRegistry::$request['section'] != 'register' ) )
+				if ( ! ( defined( 'IPS_IS_SHELL' ) && IPS_IS_SHELL === TRUE ) && ( ( ! IPS_IS_MOBILE_APP ) && ( ! self::$handles['member']->getProperty('member_id') ) and (ipsRegistry::$settings['force_login'] == 1) && ipsRegistry::$request['section'] != 'register' ) )
 				{
 					if( ipsRegistry::$settings['logins_over_https'] AND ( !$_SERVER['HTTPS'] OR $_SERVER['HTTPS'] != 'on' ) )
 					{
@@ -781,7 +853,10 @@ class ipsRegistry
 					ipsRegistry::$request['core']   	= 'login';
 					ipsRegistry::$request['referer']	= ipsRegistry::$request['referer'] ? ipsRegistry::$request['referer'] : ( strtolower($_SERVER['HTTPS']) == 'on' ? "https://" : "http://" ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 
-					ipsRegistry::getClass('output')->addToDocumentHead( 'importcss', ipsRegistry::$settings['public_dir'] . 'style_css/' . ipsRegistry::getClass('output')->skin['_csscacheid'] . '/ipb_login_register.css' );
+					if( is_file( DOC_IPS_ROOT_PATH . '/' . PUBLIC_DIRECTORY . '/style_css/' . ipsRegistry::getClass('output')->skin['_csscacheid'] . '/ipb_login_register.css' ) )
+					{
+						ipsRegistry::getClass('output')->addToDocumentHead( 'importcss', ipsRegistry::$settings['css_base_url'] . 'style_css/' . ipsRegistry::getClass('output')->skin['_csscacheid'] . '/ipb_login_register.css' );
+					}
 					
 					$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'core' ) . "/modules_public/global/login.php", 'public_core_global_login' );
 					$runme       = new $classToLoad( self::instance() );
@@ -800,20 +875,20 @@ class ipsRegistry
 				self::getClass('output')->showError( 'incorrect_furl', 404, null, null, 404 );
 			}
 		}
-
+ 
 		IPSDebug::setMemoryDebugFlag( "Registry initialized" );
 	}
 
 	/**
 	 * Loads application's core variables (if required)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function _loadCoreVariables()
 	{
 		if ( ! ( isset( self::$_masterCoreVariables['__CLASS__'] ) AND is_object( self::$_masterCoreVariables['__CLASS__'] ) ) )
 		{
-			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );
+			require_once( IPS_ROOT_PATH . 'extensions/coreVariables.php' );/*noLibHook*/
 
 			/* Add handle */
 			self::$_masterCoreVariables['__CLASS__'] = new coreVariables();
@@ -862,17 +937,19 @@ class ipsRegistry
 	 * Loads application's core variables (if required)
 	 *
 	 * @param	string		App key (dir.. that's directory, not duuhr)
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function _loadAppCoreVariables( $appDir )
 	{
+		$CACHE = $_LOAD = $_RESET = $_BITWISE = array();
+		
 		if ( ! isset( self::$_coreVariables[ $appDir ] ) )
 		{
 			$file = IPSLib::getAppDir( $appDir ) . '/extensions/coreVariables.php';
 			
-			if( file_exists( $file ) )
+			if( is_file( $file ) )
 			{
-				require( $file );
+				require( $file );/*noLibHook*/
 
 				/* Add caches */
 				self::$_coreVariables[ $appDir ]['cache']     = ( isset($CACHE) AND is_array( $CACHE ) ) ? $CACHE : array();
@@ -959,12 +1036,12 @@ class ipsRegistry
 	{		
 		/* Do some magic here to retreive common classes without
 		   having to initialize them first */
-		if ( ! isset( self::$classes[ $key ] ) || ! is_object( self::$classes[ $key ] ) )
+		if ( ! isset( self::$classes[ $key ] ) )
 		{
 			switch( $key )
 			{
 				default:
-					throw new Exception( "$key is not an object" );
+					throw new Exception( "$key не �вл�ет�� объектом" );
 				break;
 				case 'class_captcha':
 					$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classCaptcha.php', 'classCaptcha' );
@@ -974,24 +1051,37 @@ class ipsRegistry
 					$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classTemplateEngine.php', 'classTemplate' );
 					self::$classes['templateEngine'] = new $classToLoad( IPS_ROOT_PATH . 'sources/template_plugins' );
 				break;
+				case 'cacheSimple':
+					$classToLoad = IPSLib::loadLibrary(IPS_ROOT_PATH . 'sources/classes/cache/simple.php', 'classes_cache_simple' );
+					self::$classes['cacheSimple'] = new $classToLoad();
+				break;
 				case 'class_localization':
 					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_localization.php', 'class_localization' );
 					self::$classes['class_localization'] = new $classToLoad( self::instance() );
 				break;
+				case 'memberStatus':
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
+					self::$classes['memberStatus'] = new $classToLoad( self::instance() );
+				break;
 				case 'IPSAdCode':
 					/* Ads */
-					$classToLoad = 'IPSAdCodeDefault';
-					
 					if ( IPSLib::appIsInstalled( 'nexus' ) )
 					{
 						$systemvars = self::cache()->getCache('systemvars');
-						if ( $systemvars['nexus_ads'] ) // Avoids loading the nexus_ads cache on every page load unless needed
+
+						if ( isset($systemvars['nexus_ads']) AND $systemvars['nexus_ads'] ) // Avoids loading the nexus_ads cache on every page load unless needed
 						{
-							$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'nexus' ).'/sources/ads.php', 'IPSAdCodeNexus', 'nexus' );
+							require_once( IPSLib::getAppDir( 'nexus' ).'/sources/ads.php' );/*noLibHook*/
+							$classToLoad = 'IPSAdCodeNexus';
+						}
+						else
+						{
+							self::$settings['ad_code_global_enabled'] = FALSE;
 						}
 					}
-					else if ( ipsRegistry::$settings['ad_code_global_enabled'] )
-					{ 
+					
+					if ( !isset( $classToLoad ) )
+					{
 						$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . "sources/classes/ads.php", 'IPSAdCode' );
 					}
 										
@@ -1007,16 +1097,8 @@ class ipsRegistry
 				break;
 				
 				case 'classItemMarking':
-					if ( defined( 'IPS_TOPICMARKERS_DEBUG' ) AND IPS_TOPICMARKERS_DEBUG === TRUE )
-					{
-						require_once( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking_debug.php' );
-						self::$classes['classItemMarking'] = new classItemMarking_debug( self::instance() );
-					}
-					else
-					{
-						$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php', 'classItemMarking' );
-						self::$classes['classItemMarking'] = new $classToLoad( self::instance() );
-					}
+					$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/itemmarking/classItemMarking.php', 'classItemMarking' );
+					self::$classes['classItemMarking'] = new $classToLoad( self::instance() );
 				break;
 				
 			}
@@ -1073,7 +1155,7 @@ class ipsRegistry
 	 */
 	static public function isClassLoaded( $key )
 	{
-		return ( isset( self::$classes[ $key ] ) && is_object( self::$classes[ $key ] ) ) ? TRUE : FALSE;
+		return ( isset( self::$classes[ $key ] ) ) ? TRUE : FALSE;
 	}
 
 	/**
@@ -1191,7 +1273,7 @@ class ipsRegistry
 	/**
 	 * Check to see if we've initialized
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static protected function checkForInit()
 	{
@@ -1204,39 +1286,48 @@ class ipsRegistry
 	/**
 	 * Grab the app class file
 	 *
-	 * @return	void
-	 * @author	MattMecham
+	 * @param	string		$app	Application to check for app class
+	 * @return	mixed		Null if invalid or no app passed, otherwise app class object
 	 */
-	private static function _getAppClass()
+	public static function getAppClass( $app='' )
 	{
-		# Load app class
-		if ( ! isset( self::$app_class[ IPS_APP_COMPONENT ] ) )
+		if( !$app OR !is_string($app) )
 		{
-			$_file = IPSLib::getAppDir(  IPS_APP_COMPONENT ) . '/app_class_' . IPS_APP_COMPONENT . '.php';
-			$_name = 'app_class_' . IPS_APP_COMPONENT;
+			return null;
+		}
 
-			if ( file_exists( $_file ) )
+		# Load app class
+		if ( ! isset( self::$app_class[ $app ] ) )
+		{
+			self::$app_class[ $app ] = null;
+
+			$_file = IPSLib::getAppDir( $app ) . '/app_class_' . $app . '.php';
+			$_name = 'app_class_' . $app;
+
+			if ( is_file( $_file ) )
 			{
-				$classToLoad = IPSLib::loadLibrary( $_file, $_name );
+				$classToLoad = IPSLib::loadLibrary( $_file, $_name, $app );
 
-				self::$app_class[ IPS_APP_COMPONENT ] = new $classToLoad( self::instance() );
+				self::$app_class[ $app ] = new $classToLoad( self::instance() );
 			}
 		}
+		
+		return self::$app_class[ $app ];
 	}
 	
 	/**
 	 * Fix the $_SERVER['REQUEST_URI'] variable
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private static function _fixRequestUri()
+	protected static function _fixRequestUri()
 	{
 		/* IIS rewrite */
-		if( isset($_SERVER['HTTP_X_ORIGINAL_URL']) AND $_SERVER['HTTP_X_ORIGINAL_URL'] )		// IIS 7 with Microsoft Rewrite module
+		if( !empty($_SERVER['HTTP_X_ORIGINAL_URL']) )		// IIS 7 with Microsoft Rewrite module
 		{
 			$_SERVER['REQUEST_URI']	= $_SERVER['HTTP_X_ORIGINAL_URL'];
 		}
-		else if( isset($_SERVER['HTTP_X_REWRITE_URL']) AND $_SERVER['HTTP_X_REWRITE_URL'] )	// IIS with ISAPI_Rewrite
+		else if( !empty($_SERVER['HTTP_X_REWRITE_URL']) )	// IIS with ISAPI_Rewrite
 		{
 			$_SERVER['REQUEST_URI']	= $_SERVER['HTTP_X_REWRITE_URL'];
 		}
@@ -1276,9 +1367,9 @@ class ipsRegistry
 	 * INIT furls
 	 * Performs set up and figures out any incoming links
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private static function _fUrlInit()
+	protected static function _fUrlInit()
 	{
 		/**
 		 * Fix request uri
@@ -1298,15 +1389,15 @@ class ipsRegistry
 		if ( ipsRegistry::$settings['use_friendly_urls'] )
 		{
 			/* Grab and store accessing URL */
-			self::$_uri = preg_replace( "/s=(&|$)/", '', str_replace( '/?', '/index.php?', $_SERVER['REQUEST_URI'] ) );
+			self::$_uri = preg_replace( "/s=(&|$)/", '', str_replace( '/?', '/' . IPS_PUBLIC_SCRIPT . '?', $_SERVER['REQUEST_URI'] ) );
 			
 			$_urlBits = array();
 			
 			/* Grab FURL data... */
-			if ( ! IN_DEV AND file_exists( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' ) )
+			if ( ! IN_DEV AND is_file( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' ) )
 			{
 				$templates = array();
-				require( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' );
+				include( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' );/*noLibHook*/
 				self::$_seoTemplates = $templates;
 			}
 			else
@@ -1328,15 +1419,15 @@ class ipsRegistry
 				$uri = $_SERVER['REQUEST_URI']  ? $_SERVER['REQUEST_URI']  : @getenv('REQUEST_URI');
 				
 				/* Bug 21295 - remove known URL from test URI */
-				$_t        = ( isset(ipsRegistry::$settings['board_url']) AND ipsRegistry::$settings['board_url'] ) ? @parse_url( ipsRegistry::$settings['board_url'] ) : @parse_url( ipsRegistry::$settings['base_url'] );
+				$_t        = !empty(ipsRegistry::$settings['board_url']) ? @parse_url( ipsRegistry::$settings['board_url'] ) : @parse_url( ipsRegistry::$settings['base_url'] );
 				$_toTest = ( $_t['path'] AND $_t['path'] != '/' ) ? preg_replace( "#^{$_t['path']}#", '', $uri ) : str_replace( $_t['scheme'] . '://' . $_t['host'], '', $uri );
 				$_404Check = $_toTest; //We want to retain any /index.php for this test later in this block of code
-				$_toTest   = str_ireplace( array( '//index.php?', '/index.php?', '/index.php' ), '', $_toTest );
+				$_toTest   = str_ireplace( array( '//' . IPS_PUBLIC_SCRIPT . '?', '/' . IPS_PUBLIC_SCRIPT . '?', '/' . IPS_PUBLIC_SCRIPT ), '', $_toTest );
 				$_gotMatch = false;
 
 				foreach( self::$_seoTemplates as $key => $data )
 				{
-					if ( ! isset( $data['in']['regex'] ) OR ! $data['in']['regex'] )
+					if ( empty( $data['in']['regex'] ) )
 					{
 						continue;
 					}
@@ -1370,32 +1461,31 @@ class ipsRegistry
 						}
 
 						if ( strpos( $_toTest, self::$_seoTemplates['__data__']['varBlock'] ) !== false )
-						{ 
-							$_parse = substr( $_toTest, strpos( $_toTest, self::$_seoTemplates['__data__']['varBlock'] ) + strlen( self::$_seoTemplates['__data__']['varBlock'] ) );
+						{
+							/* Changed how the input variables are parsed based on feedback in bug report 24907
+							   @link http://community.invisionpower.com/tracker/issue-24907-member-list-pagination-not-work-with-checkbox
+							   Input variables now preserve array depth properly as a result */
+							$_parse	= substr( $_toTest, strpos( $_toTest, self::$_seoTemplates['__data__']['varBlock'] ) + strlen( self::$_seoTemplates['__data__']['varBlock'] ) );
+							$_data	= explode( self::$_seoTemplates['__data__']['varSep'], $_parse );
+							$_query	= '';
 
-							$_data = explode( self::$_seoTemplates['__data__']['varSep'], $_parse );
-							$_c    = 0;
-
-							foreach( $_data as $_v )
+							for( $i = 0, $j = count($_data); $i < $j; $i++ )
 							{
-								if ( ! $_c )
-								{
-									$k = IPSText::parseCleanKey( $_v );
-									$v = '';
-									$_c++;
-								}
-								else
-								{
-									$v  = IPSText::parseCleanValue( $_v );
-									$_c = 0;
+								$_query	.= ( $i % 2 == 0 ? '&' : '=' ) . $_data[$i];
+							}
 
-									$_GET[ $k ]     = $v;
-									$_POST[ $k ]    = $v;
-									$_REQUEST[ $k ] = $v;
-									$_urlBits[ $k ] = $v;
+							$_data = array();
+							parse_str($_query, $_data);
+							$_data = IPSLib::parseIncomingRecursively($_data);
+							
+							foreach( $_data as $k => $v )
+							{
+								$_GET[ $k ]     = $v;
+								$_POST[ $k ]    = $v;
+								$_REQUEST[ $k ] = $v;
+								$_urlBits[ $k ] = $v;
 
-									ipsRegistry::$request[ $k ]	= $v;
-								}
+								ipsRegistry::$request[ $k ]	= $v;
 							}
 						}
 						
@@ -1403,18 +1493,33 @@ class ipsRegistry
 					}
 				}
 				
+				/* Check against the original request for 404 error */
+				$_404checkPass	= false;
+				
+				if( !strstr( $_404Check, '&' ) AND !strstr( $_404Check, '=' ) AND ( strstr( $_404Check, IPS_PUBLIC_SCRIPT . '?/' ) OR !strstr( $_404Check, '.php' ) ) )
+				{
+					$_404checkPass	= true;
+				}
+				
+				if( strstr( $_404Check, '/' . IPS_PUBLIC_SCRIPT ) )
+				{
+					if( preg_match( "#(.+?)/" . preg_quote( IPS_PUBLIC_SCRIPT ) . "#", $_404Check, $matches ) AND !is_file( DOC_IPS_ROOT_PATH . $_404Check ) )
+					{
+						$_404checkPass	= true;
+					}
+				}
+				/* Got a match? */
 				if (
 					! defined('CCS_GATEWAY_CALLED')
 					AND ! defined('IPS_ENFORCE_ACCESS')
 					AND ! defined('LOFIVERSION_CALLED')
+					AND IPS_IS_MOBILE_APP === false
 					AND IPS_DEFAULT_PUBLIC_APP == 'forums'
 					AND $_gotMatch === false
 					AND $_toTest
 					AND $_toTest != '/'
 					AND $_toTest != '/?'
-					AND ( strstr( $_404Check, 'index.php?/' ) OR ! strstr( $_404Check, '.php' ) )
-					AND ! strstr( $_404Check, '&' )
-					AND ! strstr( $_404Check, '=' )
+					AND $_404checkPass
 				  )
 				{
 					self::$_noFurlMatch = true;
@@ -1467,10 +1572,10 @@ class ipsRegistry
 							if ( $rvalue AND $more )
 							{
 								//$k	= IPSText::parseCleanKey( $_k );
-								$v	= IPSText::parseCleanValue( $_v );
+								//$v	= IPSText::parseCleanValue( $_v );
 
 								/* Reset key with correct value */
-								$_v = $rvalue;
+								$_v = IPSText::parseCleanValue( $rvalue );
 								
 								$_GET[ $k ]     = $_v;
 								$_REQUEST[ $k ] = $_v;
@@ -1517,9 +1622,9 @@ class ipsRegistry
 	 * Complete furls
 	 * Redirects if settings permit
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private static function _fUrlComplete()
+	protected static function _fUrlComplete()
 	{
 		/* INIT */
 		$_template = FALSE;
@@ -1530,28 +1635,28 @@ class ipsRegistry
 		}
 		
 		/* www.hostname.com vs hostname.com - need to ensure we are at the correct URL for AJAX purposes */
-		if( ipsRegistry::$request['request_method'] == 'get' )
+		if ( ! defined('CCS_GATEWAY_CALLED') && ipsRegistry::$request['request_method'] == 'get' )
 		{
 			$_requestedHost		= $_SERVER['HTTP_HOST'];
 			$_configuredHost	= parse_url( ipsRegistry::$settings['board_url'], PHP_URL_HOST );
 			$uri				= $_SERVER['REQUEST_URI']  ? $_SERVER['REQUEST_URI']  : @getenv('REQUEST_URI');
-			$_t					= ( isset(ipsRegistry::$settings['board_url']) AND ipsRegistry::$settings['board_url'] ) ? @parse_url( ipsRegistry::$settings['board_url'] ) : @parse_url( ipsRegistry::$settings['base_url'] );
+			$_t					= !empty(ipsRegistry::$settings['board_url']) ? @parse_url( ipsRegistry::$settings['board_url'] ) : @parse_url( ipsRegistry::$settings['base_url'] );
 			$_toTest			= ( $_t['path'] AND $_t['path'] != '/' ) ? preg_replace( "#^{$_t['path']}#", '', $uri ) : str_replace( $_t['scheme'] . '://' . $_t['host'], '', $uri );
 			
 			if( strpos( $_configuredHost, 'www.' ) === 0 AND strpos( $_requestedHost, 'www.' ) !== 0 )
 			{
-				ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['board_url'] . $_toTest );
+				ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['board_url'] . $_toTest, '', true );
 			}
 			else if( strpos( $_configuredHost, 'www.' ) !== 0 AND strpos( $_requestedHost, 'www.' ) === 0 )
 			{
-				ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['board_url'] . $_toTest );
+				ipsRegistry::getClass('output')->silentRedirect( ipsRegistry::$settings['board_url'] . $_toTest, '', true );
 			}
 		}
 		
 		if ( ipsRegistry::$settings['use_friendly_urls'] AND ipsRegistry::$settings['seo_r_on'] AND is_array( self::$_seoTemplates ) AND self::$_uri )
 		{ 
 			/* SEO Tweak - if default app is forums then don't bother with act=idx nonsense */
-			if ( IPS_DEFAULT_APP == 'forums' AND ipsRegistry::$request['request_method'] == 'get' )
+			if ( IPS_DEFAULT_APP == 'forums' AND ipsRegistry::$request['request_method'] == 'get' AND ! ipsRegistry::$settings['actidx_override'] )
 			{ 
 				if ( ! stristr( self::$_uri, 'interface/' ) AND preg_match( '#(/index$|act=idx(\?)?)$#i', self::$_uri ) )
 				{
@@ -1570,20 +1675,20 @@ class ipsRegistry
 					// but that isn't in the URL.  Changed 3.3.2010, see report 20900.
 					//-----------------------------------------
 					
-					if ( isset($data['out'][0]) AND $data['out'][0] AND preg_match( $data['out'][0], self::$_uri ) )
+					if ( !empty($data['out'][0]) AND preg_match( $data['out'][0], self::$_uri ) )
 					{
 						$_template = $key;
 						break;
 					}
 				}
-
+				
 				/* Goddit? */
 				if ( $_template !== FALSE )
 				{
 					if ( self::$_seoTemplates[ $_template ]['app'] AND self::$_seoTemplates[ $_template ]['allowRedirect'] )
 					{
 						/* Load information file */
-						if( file_exists( IPSLib::getAppDir( self::$_seoTemplates[ $_template ]['app'] ) . '/extensions/furlRedirect.php' ) )
+						if( is_file( IPSLib::getAppDir( self::$_seoTemplates[ $_template ]['app'] ) . '/extensions/furlRedirect.php' ) )
 						{
 							$_class = IPSLib::loadLibrary( IPSLib::getAppDir( self::$_seoTemplates[ $_template ]['app'] ) . '/extensions/furlRedirect.php', 'furlRedirect_' . self::$_seoTemplates[ $_template ]['app'], self::$_seoTemplates[ $_template ]['app'] );
 							$_furl  = new $_class( ipsRegistry::instance() );
@@ -1591,13 +1696,13 @@ class ipsRegistry
 							$_furl->setKeyByUri( self::$_uri );
 							$_seoTitle = $_furl->fetchSeoTitle();
 
-							if ( $_seoTitle )
+							if ( $_seoTitle && empty( ipsRegistry::$request['debug'] ) )
 							{
 								/* redirect... */
 								// Per recommendations, removing user option and forcing 301 redirect
-								$_send301 = true;	//( ipsRegistry::$settings['seo_r301'] ) ? TRUE : FALSE;
+								//$_send301 = ( ipsRegistry::$settings['seo_r301'] ) ? TRUE : FALSE;
 
-								ipsRegistry::getClass('output')->silentRedirect( self::$_uri, $_seoTitle, $_send301, $_template );
+								ipsRegistry::getClass('output')->silentRedirect( self::$_uri, $_seoTitle, true, $_template );
 							}
 						}
 					}
@@ -1610,7 +1715,7 @@ class ipsRegistry
 	 * Rebuild URL data from incoming sources.
 	 * Called after _fUrlInit
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected static function _manageIncomingURLs()
 	{
@@ -1635,9 +1740,8 @@ class ipsRegistry
 	/**
 	 * Set up request redirect stuff
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
-	 * @todo 	[Future] Allow admin to set the default app (we default to forums presently)
 	 */
 	protected static function _setUpAppData()
 	{
@@ -1688,7 +1792,7 @@ class ipsRegistry
 	/**
 	 * Set up application data, etc.
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 */
 	protected static function _finalizeAppData()
@@ -1697,9 +1801,11 @@ class ipsRegistry
 		// Run the app class post output func
 		//-----------------------------------------
 
-		if ( isset( self::$app_class[ IPS_APP_COMPONENT ] ) && is_object( self::$app_class[ IPS_APP_COMPONENT ] ) && method_exists( self::$app_class[ IPS_APP_COMPONENT ], 'afterOutputInit' ) )
+		$app_class	= self::getAppClass( IPS_APP_COMPONENT );
+
+		if ( $app_class AND method_exists( $app_class, 'afterOutputInit' ) )
 		{
-			self::$app_class[ IPS_APP_COMPONENT ]->afterOutputInit( self::instance() );
+			$app_class->afterOutputInit( self::instance() );
 		}
 
 		//-----------------------------------------
@@ -1871,7 +1977,7 @@ class ipsRegistry
 	/**
 	 * Set up settings
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 */
 	protected function setUpSettings()
@@ -1885,15 +1991,15 @@ class ipsRegistry
 
 		foreach( $settings_cache as $k => $v )
 		{
-			ipsRegistry::$settings[$k] = $v;
+			ipsRegistry::$settings[$k] = str_replace( '&#092;', '\\', $v );
 		}
 
 		//-----------------------------------------
 		// Back up base URL
 		//-----------------------------------------
 
-		ipsRegistry::$settings['base_url']           = ( isset(ipsRegistry::$settings['board_url']) AND ipsRegistry::$settings['board_url'] ) ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
-		ipsRegistry::$settings['board_url']          = ( isset(ipsRegistry::$settings['board_url']) AND ipsRegistry::$settings['board_url'] ) ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
+		ipsRegistry::$settings['base_url']           = !empty(ipsRegistry::$settings['board_url']) ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
+		ipsRegistry::$settings['board_url']          = !empty(ipsRegistry::$settings['board_url']) ? ipsRegistry::$settings['board_url'] : ipsRegistry::$settings['base_url'];
 		ipsRegistry::$settings['_original_base_url'] = ipsRegistry::$settings['base_url'];
 
 		$pathParts = array_reverse( explode( '/', str_replace('http://', '', ipsRegistry::$settings['base_url']) ) );
@@ -1911,7 +2017,7 @@ class ipsRegistry
 		// Make a safe query string (we build the query string in furlinit)
 		//-----------------------------------------
 
-		ipsRegistry::$settings['query_string_safe'] = str_replace( '&amp;amp;', '&amp;', IPSText::parseCleanValue( urldecode( ( isset(ipsRegistry::$settings['query_string_real']) AND ipsRegistry::$settings['query_string_real'] ) ? ipsRegistry::$settings['query_string_real'] : my_getenv('QUERY_STRING') ) ) );
+		ipsRegistry::$settings['query_string_safe'] = str_replace( '&amp;amp;', '&amp;', IPSText::parseCleanValue( urldecode( !empty(ipsRegistry::$settings['query_string_real']) ? ipsRegistry::$settings['query_string_real'] : my_getenv('QUERY_STRING') ) ) );
 		ipsRegistry::$settings['query_string_real'] = str_replace( '&amp;'    , '&'    , ipsRegistry::$settings['query_string_safe'] );
 
 		//-----------------------------------------
@@ -1920,6 +2026,8 @@ class ipsRegistry
 
 		ipsRegistry::$settings['query_string_formatted'] = str_replace( ipsRegistry::$settings['board_url'] . '/index.'.ipsRegistry::$settings['php_ext'].'?', '', ipsRegistry::$settings['query_string_safe'] );
 		ipsRegistry::$settings['query_string_formatted'] = preg_replace( "#s=([a-z0-9]){32}#", '', ipsRegistry::$settings['query_string_formatted'] );
+		ipsRegistry::$settings['query_string_formatted'] = preg_replace( "#settingNewSkin=\d+?($|&)#", '', ipsRegistry::$settings['query_string_formatted'] );
+		ipsRegistry::$settings['query_string_formatted'] = preg_replace( "#langid=\d+?($|&)#", '', ipsRegistry::$settings['query_string_formatted'] );
 
 		//-----------------------------------------
 		// Default settings
@@ -1938,6 +2046,20 @@ class ipsRegistry
 		if( ! defined( 'IPS_DOC_CHAR_SET' ) )
 		{
 			define( 'IPS_DOC_CHAR_SET', strtoupper( ipsRegistry::$settings['gb_char_set'] ) );
+			
+			if( function_exists('mb_internal_encoding') AND function_exists('mb_list_encodings') )
+			{
+				$valid_encodings	= array();
+				$valid_encodings	= mb_list_encodings();
+	
+				if ( count($valid_encodings) )
+				{
+					if ( in_array( strtoupper(IPS_DOC_CHAR_SET), $valid_encodings ) )
+					{
+						mb_internal_encoding( strtoupper(IPS_DOC_CHAR_SET) );
+					}
+				}
+			}
 		}
 		
 		# Define cache path 
@@ -1983,12 +2105,18 @@ class ipsRegistry
 				ipsRegistry::$settings['print_headers'] = 1;
 			}
 		}
+		
+		# URL shortener
+		if ( ! defined( 'IPS_URL_SHORTEN_SERVICE') )
+		{
+			define( 'IPS_URL_SHORTEN_SERVICE', 'topic' );
+		}
 	}
 
 	/**
 	 * Check caches
 	 *
-	 * @return	void
+	 * @return	@e void
 	 * @author	MattMecham
 	 */
 	protected function checkCaches()
@@ -2114,12 +2242,24 @@ class ipsRegistry
 			ipsRegistry::$version	= IPB_VERSION;
 		}
 		
-		if( !defined('IPB_LONG_VERSION') )
+		if ( ! defined('IPB_LONG_VERSION') )
 		{
 			define( 'IPB_LONG_VERSION', $version_numbers['long'] );
 			ipsRegistry::$acpversion	= IPB_LONG_VERSION;
 			ipsRegistry::$vn_full		= IPB_LONG_VERSION;
 		}
+		
+		//-----------------------------------------
+		// Any to rebuild?
+		//-----------------------------------------
+		
+		if( count($this->cache()->fetchRebuildList()) )
+		{
+			foreach( $this->cache()->fetchRebuildList() as $_toRebuild )
+			{
+				$this->cache()->rebuildCache( $_toRebuild );
+			}
+		}
 	}
 	
 	/**
@@ -2161,49 +2301,49 @@ class ips_DBRegistry
 	 *
 	 * @var		array
 	 */
-	private static $vars = array();
+	protected static $vars = array();
 
 	/**
 	 * DB Objects
 	 *
 	 * @var		array
 	 */
-	private static $dbObjects = array();
+	protected static $dbObjects = array();
 
 	/**
 	 * DB Prefixes
 	 *
 	 * @var		array
 	 */
-	private static $dbPrefixes = array( '__default__' => '' );
+	protected static $dbPrefixes = array( '__default__' => '' );
 
 	/**
 	 * DB Drivers
 	 *
 	 * @var		array
 	 */
-	private static $dbDrivers = array( '__default__' => '' );
+	protected static $dbDrivers = array( '__default__' => '' );
 
 	/**
 	 * DB key
 	 *
 	 * @var		string
 	 */
-	private static $defaultKey = '__default__';
+	protected static $defaultKey = '__default__';
 	
 	/**
 	 * Cache files tried to load
 	 *
 	 * @var		array
 	 */
-	private static $_queryFilesTriedToLoad = array();
+	protected static $_queryFilesTriedToLoad = array();
 	
 	/**
 	 * Cache file parsed names
 	 *
 	 * @var		array
 	 */
-	private static $_queryFilesNames = array();
+	protected static $_queryFilesNames = array();
 
 	/**
 	 * Loaded query files
@@ -2250,7 +2390,7 @@ class ips_DBRegistry
 				
 		IPSDebug::addMessage( "* Checking for query cache file: " . $file );
 		
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
 			self::getDB( $key )->loadCacheFile( $file, $class, TRUE );
 			return TRUE;
@@ -2353,7 +2493,7 @@ class ips_DBRegistry
 	 * @param	string	DB driver
 	 * @param	string	Key
 	 * @param	array   Array of settings( sql_database, sql_user, sql_pass, sql_host, sql_charset, sql_tbl_prefix ) and any other connection vars
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setDB( $db_driver, $key='', $settings=array() )
 	{
@@ -2363,7 +2503,7 @@ class ips_DBRegistry
 		$key              = ( $key ) ? $key : self::$defaultKey;
 		
 		/* Fix up settings */
-		foreach( array( 'sql_database', 'sql_user', 'sql_pass', 'sql_host', 'sql_charset', 'sql_tbl_prefix' ) as $_s )
+		foreach( array( 'sql_database', 'sql_user', 'sql_pass', 'sql_host', 'sql_port', 'sql_socket', 'sql_charset', 'sql_tbl_prefix' ) as $_s )
 		{
 			if ( ! isset( $settings[ $_s ] ) )
 			{
@@ -2374,38 +2514,42 @@ class ips_DBRegistry
 		/* Load main class core */
 		if ( ! class_exists( 'db_driver_' . $db_driver ) )
 		{
-			require_once ( IPS_KERNEL_PATH . 'classDb' . ucwords($db_driver) . ".php" );
+			require_once ( IPS_KERNEL_PATH . 'classDb' . ucwords($db_driver) . '.php' );/*noLibHook*/
 		}
 
 		$classname = "db_driver_" . $db_driver;
 		
 		/* INIT Object */
+						
 		self::$dbObjects[ $key ] = new $classname;
 
-		self::$dbObjects[ $key ]->obj['sql_database']         = $settings['sql_database'];
-		self::$dbObjects[ $key ]->obj['sql_user']		      = $settings['sql_user'];
-		self::$dbObjects[ $key ]->obj['sql_pass']             = $settings['sql_pass'];
-		self::$dbObjects[ $key ]->obj['sql_host']             = $settings['sql_host'];
-		self::$dbObjects[ $key ]->obj['sql_charset']          = $settings['sql_charset'];
-		self::$dbObjects[ $key ]->obj['sql_tbl_prefix']       = $settings['sql_tbl_prefix'] ? $settings['sql_tbl_prefix'] : '';
-		self::$dbObjects[ $key ]->obj['force_new_connection'] = ( $key != self::$defaultKey ) ? 1 : 0;
-		self::$dbObjects[ $key ]->obj['use_shutdown']         = IPS_USE_SHUTDOWN;
+		self::$dbObjects[ $key ]->obj['sql_database']			= $settings['sql_database'];
+		self::$dbObjects[ $key ]->obj['sql_user']				= $settings['sql_user'];
+		self::$dbObjects[ $key ]->obj['sql_port']				= $settings['sql_port'];
+		self::$dbObjects[ $key ]->obj['sql_socket']				= isset($settings['sql_socket']) ? $settings['sql_socket'] : null;
+		self::$dbObjects[ $key ]->obj['sql_pass']				= $settings['sql_pass'];
+		self::$dbObjects[ $key ]->obj['sql_host']				= $settings['sql_host'];
+		self::$dbObjects[ $key ]->obj['sql_charset']			= $settings['sql_charset'];
+		self::$dbObjects[ $key ]->obj['sql_tbl_prefix']			= $settings['sql_tbl_prefix'] ? $settings['sql_tbl_prefix'] : '';
+		self::$dbObjects[ $key ]->obj['force_new_connection']	= ( $key != self::$defaultKey ) ? 1 : 0;
+		self::$dbObjects[ $key ]->obj['persistent']				= isset($settings['persistent']) ? $settings['persistent'] : 0;
+		self::$dbObjects[ $key ]->obj['use_shutdown']			= IPS_USE_SHUTDOWN;
 		
 		# Error log
-		self::$dbObjects[ $key ]->obj['error_log']            = DOC_IPS_ROOT_PATH . 'cache/sql_error_log_'.date('m_d_y').'.cgi';
-		self::$dbObjects[ $key ]->obj['use_error_log']        = IN_DEV ? 0 : 1;
+		self::$dbObjects[ $key ]->obj['error_log']				= DOC_IPS_ROOT_PATH . 'cache/sql_error_log_'.date('m_d_y').'.cgi';
+		self::$dbObjects[ $key ]->obj['use_error_log']			= IN_DEV ? 0 : 1;
 		
 		# Debug log - Don't use this on a production board!
-		self::$dbObjects[ $key ]->obj['debug_log']            = DOC_IPS_ROOT_PATH . 'cache/sql_debug_log_'.date('m_d_y').'.cgi';
-		self::$dbObjects[ $key ]->obj['use_debug_log']        = IN_DEV ? 1 : 0;
+		self::$dbObjects[ $key ]->obj['debug_log']				= DOC_IPS_ROOT_PATH . 'cache/sql_debug_log_'.date('m_d_y').'.cgi';
+		self::$dbObjects[ $key ]->obj['use_debug_log']			= ( defined('IPS_SQL_DEBUG_LOG') AND IPS_SQL_DEBUG_LOG ) ? 1 : 0;
 		
 		# Bad log - Don't use this on a production board!
-		self::$dbObjects[ $key ]->obj['bad_log']             = DOC_IPS_ROOT_PATH . 'cache/sql_bad_log_'.date('m_d_y').'.cgi';
-		self::$dbObjects[ $key ]->obj['use_bad_log']         = ( defined( 'IPS_SQL_FIND_EVIL_MODE' ) AND IPS_SQL_FIND_EVIL_MODE ) ? TRUE : FALSE;
+		self::$dbObjects[ $key ]->obj['bad_log']				= DOC_IPS_ROOT_PATH . 'cache/sql_bad_log_'.date('m_d_y').'.cgi';
+		self::$dbObjects[ $key ]->obj['use_bad_log']			= ( defined( 'IPS_SQL_FIND_EVIL_MODE' ) AND IPS_SQL_FIND_EVIL_MODE ) ? TRUE : FALSE;
 		
 		# Slow log - Don't use this on a production board!
-		self::$dbObjects[ $key ]->obj['slow_log']             = DOC_IPS_ROOT_PATH . 'cache/sql_slow_log_'.date('m_d_y').'.cgi';
-		self::$dbObjects[ $key ]->obj['use_slow_log']         = ( defined( 'IPS_SQL_FIND_SLOW_MODE' ) AND IPS_SQL_FIND_SLOW_MODE ) ? (float) IPS_SQL_FIND_SLOW_MODE : FALSE;
+		self::$dbObjects[ $key ]->obj['slow_log']				= DOC_IPS_ROOT_PATH . 'cache/sql_slow_log_'.date('m_d_y').'.cgi';
+		self::$dbObjects[ $key ]->obj['use_slow_log']			= ( defined( 'IPS_SQL_FIND_SLOW_MODE' ) AND IPS_SQL_FIND_SLOW_MODE ) ? (float) IPS_SQL_FIND_SLOW_MODE : FALSE;
 
 		/* Required vars? */
 		if ( is_array( self::$dbObjects[ $key ]->connect_vars ) and count( self::$dbObjects[ $key ]->connect_vars ) )
@@ -2423,8 +2567,8 @@ class ips_DBRegistry
 		}
 
 		/* Update settings */
-		self::$dbPrefixes[ $key ] = self::$dbObjects[ $key ]->obj['sql_tbl_prefix'];
-		self::$dbDrivers[ $key ]  = $db_driver;
+		self::$dbPrefixes[ $key ]	= self::$dbObjects[ $key ]->obj['sql_tbl_prefix'];
+		self::$dbDrivers[ $key ]	= $db_driver;
 
 		/* Get a DB connection */
 		self::$dbObjects[ $key ]->connect();
@@ -2450,12 +2594,12 @@ class ips_CacheRegistry
 	 *
 	 * @var		array
 	 */
-	private $save_options  = array();
+	protected $save_options  = array();
 
 	/**
 	 * Static var for cache library
 	 */
-	private static $cacheLib;
+	protected static $cacheLib;
 
 	/**
 	 * Debug information
@@ -2469,14 +2613,21 @@ class ips_CacheRegistry
 	 *
 	 * @var		bool
 	 */
-	private static $initiated = FALSE;
+	protected static $initiated = FALSE;
 
 	/**
 	 * Generic data storage
 	 *
 	 * @var		array
 	 */
-	protected static $data_store = array();
+	protected static $data_store	= array();
+
+	/**
+	 * List of caches to rebuild
+	 *
+	 * @var		array
+	 */
+	protected static $rebuild_list	= array();
 
 	/**
 	 * Singleton init
@@ -2493,11 +2644,21 @@ class ips_CacheRegistry
 
 		return self::$instance;
 	}
+	
+	/**
+	 * Retrieve the list of caches to be rebuilt
+	 *
+	 * @return	@e array
+	 */
+	public function fetchRebuildList()
+	{
+		return self::$rebuild_list;
+	}
 
 	/**
 	 * Initiate class
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function init()
 	{
@@ -2509,8 +2670,8 @@ class ips_CacheRegistry
 
 			if( function_exists('eaccelerator_get') AND ipsRegistry::$settings['use_eaccelerator'] == 1 )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheEaccelerator.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheEaccelerator.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheEaccelerator( ipsRegistry::$settings['board_url'] );
 			}
 
@@ -2520,8 +2681,8 @@ class ips_CacheRegistry
 
 			else if( function_exists('memcache_connect') AND ipsRegistry::$settings['use_memcache'] == 1 )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheMemcache.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheMemcache.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheMemcache( ipsRegistry::$settings['board_url'], ipsRegistry::$settings );
 			}
 
@@ -2531,8 +2692,8 @@ class ips_CacheRegistry
 
 			else if( function_exists('xcache_get') AND ipsRegistry::$settings['use_xcache'] == 1 )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheXcache.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheXcache.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheXcache( ipsRegistry::$settings['board_url'] );
 			}
 
@@ -2542,8 +2703,8 @@ class ips_CacheRegistry
 
 			else if( function_exists('apc_fetch') AND ipsRegistry::$settings['use_apc'] == 1 )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheApc.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheApc.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheApc( ipsRegistry::$settings['board_url'] );
 			}
 			
@@ -2553,8 +2714,8 @@ class ips_CacheRegistry
 
 			else if( function_exists('wincache_ucache_get') AND ipsRegistry::$settings['use_wincache'] == 1 )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheWincache.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheWincache.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheWincache( ipsRegistry::$settings['board_url'] );
 			}
 
@@ -2562,10 +2723,10 @@ class ips_CacheRegistry
 			// Diskcache
 			//--------------------------------
 
-			else if( isset( ipsRegistry::$settings['use_diskcache'] ) AND ipsRegistry::$settings['use_diskcache'] == 1 )
+			else if( !empty( ipsRegistry::$settings['use_diskcache'] ) )
 			{
-				require IPS_KERNEL_PATH.'interfaces/interfaceCache.php';
-				require IPS_KERNEL_PATH.'classCacheDiskcache.php';
+				require( IPS_KERNEL_PATH.'interfaces/interfaceCache.php' );/*noLibHook*/
+				require( IPS_KERNEL_PATH.'classCacheDiskcache.php' );/*noLibHook*/
 				self::$cacheLib = new classCacheDiskcache( ipsRegistry::$settings['board_url'] );
 			}
 
@@ -2592,7 +2753,7 @@ class ips_CacheRegistry
 			{
 				foreach( $CACHE as $key => $data )
 				{
-					if ( isset($data['acp_only']) AND $data['acp_only'] AND IPS_AREA != 'admin' )
+					if ( !empty($data['acp_only']) AND IPS_AREA != 'admin' )
 					{
 						continue;
 					}
@@ -2627,7 +2788,7 @@ class ips_CacheRegistry
 				{
 					foreach( $CACHE as $key => $data )
 					{
-						if ( isset( $data['acp_only'] ) && $data['acp_only'] AND IPS_AREA != 'admin' )
+						if ( !empty( $data['acp_only'] ) AND IPS_AREA != 'admin' )
 						{
 							continue;
 						}
@@ -2649,7 +2810,29 @@ class ips_CacheRegistry
 					}
 				}
 			}
-
+			
+			//-----------------------------------------
+			// Get global caches list
+			//-----------------------------------------
+			
+			if ( is_file( DOC_IPS_ROOT_PATH . 'cache/globalCaches.php' ) )
+			{
+				$GLOBAL_CACHES = array();
+				include( DOC_IPS_ROOT_PATH . 'cache/globalCaches.php' );/*noLibHook*/
+				
+				if( is_array($GLOBAL_CACHES) AND count($GLOBAL_CACHES) )
+				{
+					foreach( $GLOBAL_CACHES as $key )
+					{
+						$_load[ $key ] = $key;
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Add caches to the load list 
+			//-----------------------------------------
+			
 			if( is_array($_load) AND count($_load) )
 			{
 				foreach( $_load as $key )
@@ -2663,7 +2846,6 @@ class ips_CacheRegistry
 			//-----------------------------------------
 
 			self::_loadCaches( $caches );
-
 		}
 
 		self::$initiated = TRUE;
@@ -2673,10 +2855,11 @@ class ips_CacheRegistry
 	 * Load cache(s)
 	 *
 	 * @param	array 	Array of caches to load: array( 'group_cache', 'forum_cache' )
+	 * @param	boolean	Set to FALSE to skip trying to load the caches from DB
 	 * @return	mixed	Loaded Cache
 	 * @author	MattMecham
 	 */
-	private static function _loadCaches( $caches=array() )
+	protected static function _loadCaches( $caches=array(), $loadFromDb=true )
 	{
 		if ( ! is_array( $caches ) OR ! count( $caches ) )
 		{
@@ -2699,7 +2882,7 @@ class ips_CacheRegistry
 			{
 				$temp_cache[$key] = self::$cacheLib->getFromCache( $key );
 
-				if ( ! $temp_cache[$key] )
+				if ( ! $temp_cache[$key] OR $temp_cache[$key] == 'rebuildCache' )
 				{
 					$new_cache_array[] = $key;
 				}
@@ -2713,7 +2896,7 @@ class ips_CacheRegistry
 						// Fallback fix if unserialize fails
 						//-----------------------------------------
 						
-						if( !is_array(self::$data_store[ $key ]) OR !count(self::$data_store[ $key ]) )
+						if( !is_array(self::$data_store[ $key ]) )
 						{
 							$new_cache_array[] = $key;
 							continue;
@@ -2737,7 +2920,9 @@ class ips_CacheRegistry
 			unset($new_cache_array, $temp_cache);
 		}
 
-		if( count($caches) )
+		$_rebuild	= array();
+
+		if( count($caches) && $loadFromDb )
 		{
 			//--------------------------------
 			// Get from DB...
@@ -2749,12 +2934,30 @@ class ips_CacheRegistry
 			while ( $r = ipsRegistry::DB()->fetch() )
 			{
 				$_seenKeys[ $r['cs_key'] ] = $r['cs_key'];
-	
+
+				//-----------------------------------------
+				// Forcing rebuild?
+				//-----------------------------------------
+				
+				if( $r['cs_rebuild'] )
+				{
+					self::$rebuild_list[]	= $r['cs_key'];
+					continue;
+				}
+				
+				//-----------------------------------------
+				// Debug?
+				//-----------------------------------------
+				
 				if ( IN_DEV )
 				{
 					self::instance()->debugInfo[ $r['cs_key'] ] = array( 'size' => IPSLib::strlenToBytes( strlen($r['cs_value']) ) );
 				}
 	
+				//-----------------------------------------
+				// Serialized array?
+				//-----------------------------------------
+				
 				if ( $r['cs_array'] OR substr( $r['cs_value'], 0, 2 ) == "a:" )
 				{
 					self::$data_store[ $r['cs_key'] ] = unserialize( $r['cs_value'] );
@@ -2769,6 +2972,10 @@ class ips_CacheRegistry
 					self::$data_store[ $r['cs_key'] ] = ( $r['cs_value'] ) ? $r['cs_value'] : NULL;
 				}
 	
+				//-----------------------------------------
+				// Push to alt cache store
+				//-----------------------------------------
+				
 				if ( is_object( self::$cacheLib ) )
 				{
 					if ( ! $r['cs_value'] )
@@ -2800,7 +3007,7 @@ class ips_CacheRegistry
 	 *
 	 * @param	string	Cache Key
 	 * @param	mixed	Cache value (typically an array)
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function cacheSet( $key, $val )
 	{
@@ -2815,9 +3022,9 @@ class ips_CacheRegistry
 
 		if ( $key )
 		{
-			if ( ! isset($val) OR ! $val )
+			if ( empty($val) )
 			{
-				if ( isset($this->save_options['array']) AND $this->save_options['array'] )
+				if ( !empty($this->save_options['array']) )
 				{
 					$value = serialize(self::$data_store[ $key ]);
 				}
@@ -2828,7 +3035,7 @@ class ips_CacheRegistry
 			}
 			else
 			{
-				if ( isset($this->save_options['array']) AND $this->save_options['array'] )
+				if ( !empty($this->save_options['array']) )
 				{
 					$value = serialize($val);
 				}
@@ -2838,15 +3045,15 @@ class ips_CacheRegistry
 				}
 			}
 
-			ipsRegistry::DB()->no_escape_fields['cs_key'] = 1;
+			ipsRegistry::DB()->preventAddSlashes( array( 'cs_key' => 1 ) );
 
 			if ( $this->save_options['donow'] )
 			{
-				ipsRegistry::DB()->replace( 'cache_store', array( 'cs_array' => intval($this->save_options['array']), 'cs_key' => $key, 'cs_value' => $value, 'cs_updated' => time() ), array( 'cs_key' ) );
+				ipsRegistry::DB()->replace( 'cache_store', array( 'cs_array' => intval($this->save_options['array']), 'cs_key' => $key, 'cs_value' => $value, 'cs_updated' => time(), 'cs_rebuild' => 0 ), array( 'cs_key' ) );
 			}
 			else
 			{
-				ipsRegistry::DB()->replace( 'cache_store', array( 'cs_array' => intval($this->save_options['array']), 'cs_key' => $key, 'cs_value' => $value, 'cs_updated' => time() ), array( 'cs_key' ), true );
+				ipsRegistry::DB()->replace( 'cache_store', array( 'cs_array' => intval($this->save_options['array']), 'cs_key' => $key, 'cs_value' => $value, 'cs_updated' => time(), 'cs_rebuild' => 0 ), array( 'cs_key' ), true );
 			}
 
 			if ( is_object( self::$cacheLib ) )
@@ -2919,15 +3126,16 @@ class ips_CacheRegistry
 	 * cache.
 	 *
 	 * @param	mixed	Cache key, or array of cache keys
+	 * @param	boolean	Set to FALSE to skip trying to load the caches from DB [if not loaded already] 
 	 * @return	mixed	Cache value if $keys is a string, else boolean (loaded successfully or not)
 	 */
-	static public function getCache( $keys )
+	static public function getCache( $keys, $loadFromDb=true )
 	{
 		if ( is_string( $keys ) )
 		{
 			if ( ! isset( self::$data_store[ $keys ] ) )
 			{
-				self::_loadCaches( array( $keys ) );
+				self::_loadCaches( array( $keys ), $loadFromDb );
 			}
 		
 			return self::$data_store[ $keys ];
@@ -2938,13 +3146,16 @@ class ips_CacheRegistry
 			
 			foreach( $keys as $key )
 			{
-				if ( ! in_array( $key, array_keys( self::$data_store ) ) )
+				if ( ! isset( self::$data_store[ $key ] ) )
 				{
 					$toLoad[] = $key;
 				}
 			}
 			
-			self::_loadCaches( $toLoad );
+			if ( count($toLoad) )
+			{
+				self::_loadCaches( $toLoad, $loadFromDb );
+			}
 			
 			return TRUE;
 		}
@@ -2967,7 +3178,7 @@ class ips_CacheRegistry
 	 *
 	 * @param	string	Cache key
 	 * @param	mixed	Value
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function updateCacheWithoutSaving( $key, $value )
 	{
@@ -2998,7 +3209,7 @@ class ips_CacheRegistry
 	 *
 	 * @param	string	Cache key
 	 * @param	string	Application
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function rebuildCache( $key, $app='' )
 	{
@@ -3049,7 +3260,7 @@ class ips_CacheRegistry
 		{
 			$file_to_check = $_caches[ $key ]['recache_file'];
 
-			if ( $file_to_check AND file_exists( $file_to_check ) )
+			if ( $file_to_check AND is_file( $file_to_check ) )
 			{
 				$_func  = $_caches[ $key ]['recache_function'];
 				
@@ -3113,6 +3324,15 @@ class ips_MemberRegistryDummy
 	{
 		return array();
 	}
+
+	/**
+	 * Post output class setup
+	 * 
+	 * @return	@e void
+	 */
+ 	public static function postOutput()
+ 	{
+	}
 }
 
 /**
@@ -3132,7 +3352,7 @@ class ips_MemberRegistry
 	 *
 	 * @var		array
 	 */
-	private $settings = array();
+	protected $settings = array();
 
 	/**
 	 * Member info
@@ -3226,14 +3446,14 @@ class ips_MemberRegistry
 	 *
 	 * @var		object
 	 */
-	private static $session_class;
+	protected static $session_class;
 
 	/**
 	 * Initiated
 	 *
 	 * @var		false
 	 */
-	private static $initiated    = FALSE;
+	protected static $initiated    = FALSE;
 	
 	/**
 	 * Data store
@@ -3249,6 +3469,12 @@ class ips_MemberRegistry
 	 */
 	public $isMobileApp	= false;
 	
+	/**
+	 * Is this Facebook?
+	 * @var 	bool
+	 */
+	public $iAmFacebook = false;
+	
 	/**
 	 * Initialization method
 	 *
@@ -3268,12 +3494,15 @@ class ips_MemberRegistry
 	/**
 	 * Destructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __myDestruct()
 	{
 		/* Item marking clean up */
-		ipsRegistry::getClass('classItemMarking')->__myDestruct();
+		if( ipsRegistry::isClassLoaded('classItemMarking') )
+		{
+			ipsRegistry::getClass('classItemMarking')->__myDestruct();
+		}
 
 		/* Session clean up */
 		self::sessionClass()->__myDestruct();
@@ -3282,7 +3511,7 @@ class ips_MemberRegistry
 	/**
 	 * Singleton init method
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected static function init()
 	{
@@ -3296,12 +3525,7 @@ class ips_MemberRegistry
 			{
 				foreach( array_reverse( explode( ',', my_getenv('HTTP_X_FORWARDED_FOR') ) ) as $x_f )
 				{
-					$x_f = trim($x_f);
-
-					if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $x_f ) )
-					{
-						$addrs[] = $x_f;
-					}
+					$addrs[] = trim($x_f);
 				}
 
 				$addrs[] = my_getenv('HTTP_CLIENT_IP');
@@ -3317,16 +3541,24 @@ class ips_MemberRegistry
 
 			foreach ( $addrs as $ip )
 			{
-				if ( $ip )
+				//-----------------------------------------
+				// IP v4
+				//-----------------------------------------
+				
+				if ( IPSLib::validateIPv4( $ip ) )
 				{
-					preg_match( '/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/', $ip, $match );
-
-					self::instance()->ip_address = $match[1].'.'.$match[2].'.'.$match[3].'.'.$match[4];
-
-					if ( self::instance()->ip_address AND self::instance()->ip_address != '...' )
-					{
-						break;
-					}
+					self::instance()->ip_address	= $ip;
+					break;
+				}
+				
+				//-----------------------------------------
+				// IP v6
+				//-----------------------------------------
+				
+				else if ( IPSLib::validateIPv6( $ip ) )
+				{
+					self::instance()->ip_address = $ip;
+					break;
 				}
 			}
 
@@ -3334,7 +3566,7 @@ class ips_MemberRegistry
 			// Make sure we take a valid IP address
 			//-----------------------------------------
 
-			if ( ( ! self::instance()->ip_address OR self::instance()->ip_address == '...' ) AND ! isset( $_SERVER['SHELL'] ) AND $_SERVER['SESSIONNAME'] != 'Console' )
+			if ( !self::instance()->ip_address AND ! isset( $_SERVER['SHELL'] ) AND $_SERVER['SESSIONNAME'] != 'Console' )
 			{
 				if ( ! defined('IPS_IS_SHELL') OR ! IPS_IS_SHELL )
 				{
@@ -3352,38 +3584,38 @@ class ips_MemberRegistry
 
 			if ( IPS_AREA == 'admin' )
 			{
-				require_once( IPS_ROOT_PATH . "sources/classes/session/adminSessions.php" );
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/session/adminSessions.php', 'adminSessions' );
 
 				/**
 				 * Support for extending the session class
 				 */
-				if( file_exists( IPS_ROOT_PATH . "sources/classes/session/ssoAdminSessions.php" ) )
+				if( is_file( IPS_ROOT_PATH . "sources/classes/session/ssoAdminSessions.php" ) )
 				{
-					require_once( IPS_ROOT_PATH . "sources/classes/session/ssoAdminSessions.php" );
+					$classToLoadA = IPSLib::loadLibrary( IPS_ROOT_PATH . "sources/classes/session/ssoAdminSessions.php", 'ssoAdminSessions' );
 
 					/**
 					 * Does the ssoAdminSessions class exist?
 					 */
-					if( class_exists( 'ssoAdminSessions' ) )
+					if( class_exists( $classToLoadA ) )
 					{
-						$parent = get_parent_class( 'ssoAdminSessions' );
+						$parent = get_parent_class( $classToLoadA );
 
 						/**
 						 * Is it a child of adminSessions
 						 */
-						if( $parent == 'adminSessions' )
+						if( $parent == $classToLoad )
 						{
-							self::$session_class = new ssoAdminSessions();
+							self::$session_class = new $classToLoadA();
 						}
 						else
 						{
-							self::$session_class = new adminSessions();
+							self::$session_class = new $classToLoad();
 						}
 					}
 				}
 				else
 				{
-					self::$session_class = new adminSessions();
+					self::$session_class = new $classToLoad();
 				}
 			}
 			else
@@ -3393,7 +3625,7 @@ class ips_MemberRegistry
 				/**
 				 * Support for extending the session class
 				 */
-				if( file_exists( IPS_ROOT_PATH . "sources/classes/session/ssoPublicSessions.php" ) )
+				if( is_file( IPS_ROOT_PATH . "sources/classes/session/ssoPublicSessions.php" ) )
 				{
 					$classToLoadA = IPSLib::loadLibrary( IPS_ROOT_PATH . "sources/classes/session/ssoPublicSessions.php", 'ssoPublicSessions' );
 
@@ -3440,43 +3672,22 @@ class ips_MemberRegistry
 			self::$data_store['userAgentVersion'] = isset(self::$session_class->session_data['uagent_version']) ? self::$session_class->session_data['uagent_version'] : '';
 			self::$data_store['userAgentBypass']  = ( $_cookie ) ? true : ( isset(self::$session_class->session_data['uagent_bypass']) ? self::$session_class->session_data['uagent_bypass'] : '' );
 			
-			//-----------------------------------------
-			// Can use RTE?
-			//-----------------------------------------
-
-			self::$data_store['_canUseRTE'] = FALSE;
-
-			if ( self::$data_store['userAgentKey'] == 'explorer' AND self::$data_store['userAgentVersion'] >= 6 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			else if ( self::$data_store['userAgentKey'] == 'opera' AND self::$data_store['userAgentVersion'] >= 9.00 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			else if ( self::$data_store['userAgentKey'] == 'firefox' AND self::$data_store['userAgentVersion'] >= 2 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			else if ( self::$data_store['userAgentKey'] == 'safari' AND self::$data_store['userAgentVersion'] >= 4 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			else if ( self::$data_store['userAgentKey'] == 'chrome' AND self::$data_store['userAgentVersion'] >= 2 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			else if ( self::$data_store['userAgentKey'] == 'mozilla' AND self::$data_store['userAgentVersion'] >= 4 )
-			{
-				self::$data_store['_canUseRTE'] = TRUE;
-			}
-			
-			if( !ipsRegistry::$settings['posting_allow_rte'] )
-			{
-				self::$data_store['_canUseRTE'] = FALSE;
-			}
+			self::$data_store['forumsModeratorData']	= array();		
    		}
 	}
+	
+	/**
+	 * Post output class setup
+	 * 
+	 * @return	@e void
+	 */
+ 	public static function postOutput()
+ 	{
+ 		if( !self::$data_store['member_id'] )
+ 		{
+ 			self::$data_store	= IPSMember::buildNoPhoto( self::$data_store );
+ 		}
+ 	}
 
 	/**
 	 * Sessions class interface
@@ -3525,22 +3736,21 @@ class ips_MemberRegistry
 	 * Sets up a search engine's data and permissions
 	 *
 	 * @param	array 		array of useragent information
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function setSearchEngine( $uAgent )
 	{
 		$cache = ipsRegistry::cache()->getCache('group_cache');
+		$group = $cache[ intval( ipsRegistry::$settings['guest_group'] ) ];
 		
 		/* Are we facebook? */
-		if ( $uAgent['uagent_key'] == 'facebook' AND ipsRegistry::$settings['fbc_bot_group'] )
+		if ( $uAgent['uagent_key'] == 'facebook' )
 		{
-			$group = $cache[ intval( ipsRegistry::$settings['fbc_bot_group'] ) ];
+			self::instance()->iAmFacebook = true;
+			
+			$group = ( ipsRegistry::$settings['fbc_bot_group'] ) ? $cache[ intval( ipsRegistry::$settings['fbc_bot_group'] ) ] : $group;
 		}
-		else
-		{
-			$group = $cache[ intval( ipsRegistry::$settings['spider_group'] ) ];
-		}
-		
+				
 		foreach ( $group as $k => $v )
 		{
 			self::$data_store[ $k ] = $v;
@@ -3551,10 +3761,9 @@ class ips_MemberRegistry
 		self::$data_store['_members_display_name']	= $uAgent['uagent_name'];
 		self::$data_store['name']					= $uAgent['uagent_name'];
 		self::$data_store['member_group_id']		= self::$data_store['g_id'];
-		self::$data_store['view_img']				= ipsRegistry::$settings['guests_img'];
+		self::$data_store['view_sigs']				= ipsRegistry::$settings['guests_sig'];
 		self::$data_store['restrict_post']			= 1;
 		self::$data_store['g_use_search']			= 0;
-		self::$data_store['g_email_friend']			= 0;
 		self::$data_store['g_edit_profile']			= 0;
 		self::$data_store['g_use_pm']				= 0;
 		self::$data_store['g_is_supmod']			= 0;
@@ -3583,7 +3792,7 @@ class ips_MemberRegistry
 		{
 			ipsRegistry::DB()->insert( 'spider_logs', array (
 																'bot'		   => $uAgent['uagent_key'],
-																'query_string' => htmlentities( strip_tags( str_replace( '\\', '',  str_replace( "'", "", my_getenv('QUERY_STRING')) ) ) ),
+																'request_addr' => htmlentities( strip_tags( str_replace( '\\', '',  str_replace( "'", "", my_getenv('REQUEST_URI')) ) ) ),
 																'ip_address'   => self::instance()->ip_address,
 																'entry_date'   => time(),
 													), true		);
@@ -3593,8 +3802,8 @@ class ips_MemberRegistry
 	/**
 	 * Set current member to the member ID specified
 	 *
-	 * @param	integer	Member ID
-	 * @return	void
+	 * @param	integer		Member ID
+	 * @return	@e void
 	 */
 	static public function setMember( $member_id )
 	{
@@ -3612,60 +3821,44 @@ class ips_MemberRegistry
 		if ( $member_id )
 		{
 			self::$data_store = IPSMember::load( $member_id, 'extendedProfile,customFields,groups,itemMarkingStorage' );
-
-			if ( self::$data_store['member_id'] )
-			{
-				self::setUpMember();
-
-				# Form hash
-				self::instance()->form_hash = md5( self::$data_store['email'].'&'.self::$data_store['member_login_key'].'&'.self::$data_store['joined'] );
-			}
-			else
-			{
-				self::$data_store = IPSMember::setUpGuest();
-
-				self::instance()->perm_id       = ( isset(self::$data_store['org_perm_id']) AND self::$data_store['org_perm_id'] ) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
-				self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
-
-				# Form hash
-				self::instance()->form_hash = md5("this is only here to prevent it breaking on guests");
-			}
-
-			/* Get the ignored users */
-			/* @todo [Future] Cache this into the column in the members table? */
-
-			if( IPS_AREA == 'public' )
-			{
-				/* Ok, Fetch ignored users */
-				self::instance()->ignored_users = IPSMember::fetchIgnoredUsers( self::$data_store );
-			}
+		}
+		
+		/* Got a member ID? */
+		if ( !empty($member_id) && self::$data_store['member_id'] )
+		{
+			self::setUpMember();
+			
+			self::instance()->language_id = self::$data_store['language'];
+			
+			# Form hash
+			self::instance()->form_hash = md5( self::$data_store['email'].'&'.self::$data_store['member_login_key'].'&'.self::$data_store['joined'] );
 		}
 		else
 		{
 			self::$data_store = IPSMember::setUpGuest();
 
-			self::instance()->perm_id       = ( isset(self::$data_store['org_perm_id']) AND self::$data_store['org_perm_id'] ) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
-			self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
-
+			self::instance()->perm_id       = !empty(self::$data_store['org_perm_id']) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
+			self::instance()->perm_id_array = explode( ',', self::instance()->perm_id );
+			
+			if( IPSCookie::get('language') )
+			{
+				self::instance()->language_id = IPSCookie::get('language');
+			}
+			
 			# Form hash
 			self::instance()->form_hash = md5("this is only here to prevent it breaking on guests");
-
-			//IPSCookie::set( "member_id" , "0", -1  );
-			//IPSCookie::set( "pass_hash" , "0", -1  );
 		}
 
-		if( self::$data_store['member_id'] )
+		/* Get the ignored users */
+		if( IPS_AREA == 'public' )
 		{
-			self::instance()->language_id	= self::$data_store['language'];
-		}
-		else if( IPSCookie::get('language') )
-		{
-			self::instance()->language_id	= IPSCookie::get('language');
+			/* Ok, Fetch ignored users */
+			self::instance()->ignored_users = IPSMember::fetchIgnoredUsers( self::$data_store );
 		}
 		
 		/* Are we a mobile person? */
-	 	self::instance()->isMobileApp = ( IPSCookie::get('mobileApp') ) ? true : false;
-
+	 	self::instance()->isMobileApp = ( IPSCookie::get('mobileApp') == 'true' ) ? true : false;
+	 	
 		//-----------------------------------------
 		// Set member data
 		//-----------------------------------------
@@ -3678,7 +3871,7 @@ class ips_MemberRegistry
 	 *
 	 * @return	string
 	 */
-	static private function _fetch_os()
+	static protected function _fetch_os()
 	{
 		$useragent = strtolower(my_getenv('HTTP_USER_AGENT'));
 
@@ -3698,8 +3891,8 @@ class ips_MemberRegistry
 	/**
 	 * Set up a member's secondary groups
 	 *
-	 * @param	array 	Member data
-	 * @return	array 	Member data with secondary group perms set properly
+	 * @param	array		$data		Member data
+	 * @return	@e array	Member data with secondary group perms set properly
 	 */
 	static public function setUpSecondaryGroups( $data )
     {
@@ -3709,20 +3902,49 @@ class ips_MemberRegistry
 			$groups_id		= explode( ',', $data['mgroup_others'] );
 			$exclude		= array( 'g_id', 'g_title', 'g_icon', 'prefix', 'suffix', 'g_promotion', 'g_photo_max_vars' );
 			$less_is_more	= array( 'g_search_flood' );
+			$neg1_is_best	= array();
 			$zero_is_best	= array( 'g_attach_max', 'g_attach_per_post', 'g_edit_cutoff', 'g_max_messages', 'g_pm_perday', 'g_pm_flood_mins', 'g_displayname_unit', 'g_sig_unit', 'g_mod_post_unit', 'g_ppd_limit', 'g_ppd_unit', 'gbw_no_status_update', 'g_max_bgimg_upload' );
 			$special		= array( 'g_signature_limits', 'g_dname_date', 'g_dname_changes' );
 
-			# Blog
-			$zero_is_best = array_merge( $zero_is_best, array( 'g_blog_attach_max', 'g_blog_attach_per_entry', 'g_blog_preventpublish', 'g_blog_maxblogs' ) );
-
-			# Gallery
-			$zero_is_best = array_merge( $zero_is_best, array( 'g_max_diskspace', 'g_max_upload', 'g_max_transfer', 'g_max_views', 'g_album_limit', 'g_img_album_limit', 'g_movie_size' ) );
+			//-----------------------------------------
+			// Merge in per-app group overrides
+			//-----------------------------------------
+			
+			foreach( IPSLib::getEnabledApplications() as $application )
+			{
+				if( !empty($application['extensions']['groupOptions']) )
+				{
+					if( !empty($application['extensions']['groupOptions']['neg1_is_best']) AND is_array($application['extensions']['groupOptions']['neg1_is_best']) )
+					{
+						$neg1_is_best	= array_merge( $neg1_is_best, $application['extensions']['groupOptions']['neg1_is_best'] );
+					}
+					
+					if( !empty($application['extensions']['groupOptions']['zero_is_best']) AND is_array($application['extensions']['groupOptions']['zero_is_best']) )
+					{
+						$zero_is_best	= array_merge( $zero_is_best, $application['extensions']['groupOptions']['zero_is_best'] );
+					}
+					
+					if( !empty($application['extensions']['groupOptions']['less_is_more']) AND is_array($application['extensions']['groupOptions']['less_is_more']) )
+					{
+						$less_is_more	= array_merge( $less_is_more, $application['extensions']['groupOptions']['less_is_more'] );
+					}
+					
+					if( !empty($application['extensions']['groupOptions']['exclude']) AND is_array($application['extensions']['groupOptions']['exclude']) )
+					{
+						$exclude		= array_merge( $exclude, $application['extensions']['groupOptions']['exclude'] );
+					}
+				}
+			}
 
+			//-----------------------------------------
+			// Merge permissions
+			//-----------------------------------------
+			
 			if ( count( $groups_id ) )
 			{
 				foreach( $groups_id as $pid )
 				{
-					if ( ! isset($cache[ $pid ]['g_id']) OR ! $cache[ $pid ]['g_id'] )
+					if ( empty($cache[ $pid ]['g_id']) )
 					{
 						continue;
 					}
@@ -3745,7 +3967,7 @@ class ips_MemberRegistry
 							}
 							else if ( in_array( $k, $zero_is_best ) )
 							{
-								if ( ! isset( $data[ $k ] ) OR $data[ $k ] == 0 )
+								if ( empty( $data[ $k ] ) )
 								{
 									continue;
 								}
@@ -3758,6 +3980,21 @@ class ips_MemberRegistry
 									$data[ $k ] = $v;
 								}
 							}
+							else if( in_array( $k, $neg1_is_best ) )
+							{
+								if ( $data[ $k ] == -1 )
+								{
+									continue;
+								}
+								else if( $v == -1 )
+								{
+									$data[ $k ] = -1;
+								}
+								else if ( $v > $data[ $k ] )
+								{
+									$data[ $k ] = $v;
+								}
+							}
 							else if ( in_array( $k, $less_is_more ) )
 							{
 								if ( $v < $data[ $k ] )
@@ -3773,7 +4010,7 @@ class ips_MemberRegistry
 										//-----------------------------------------
 										// No limits should win out
 										//-----------------------------------------
-										
+
 										if( !$data[ $k ] )
 										{
 											continue;
@@ -3791,7 +4028,7 @@ class ips_MemberRegistry
 											
 											foreach( $values as $index => $value )
 											{
-												if( !$_cur[ $index ] OR !$values[ $index ] )
+												if( $_cur[ $index ] === null OR $values[ $index ] === null OR $_cur[ $index ] === '' OR $values[ $index ] === '' )
 												{
 													$_new[ $index ]	= null;
 												}
@@ -3885,6 +4122,11 @@ class ips_MemberRegistry
 													$data['g_dname_date']	= $timeFrame;
 												}
 											}
+											else if( !$data['g_dname_date'] )
+											{
+												$data[ $k ]				= $changes;
+												$data['g_dname_date']	= $timeFrame;
+											}
 											else if( $data['g_dname_date'] AND $data[ $k ] )
 											{
 												$_oldCompare	= $data['g_dname_date'] / $data[ $k ];
@@ -3901,7 +4143,7 @@ class ips_MemberRegistry
 							}
 							else
 							{
-								if ( $v > $data[ $k ] )
+								if ( !isset($data[ $k ]) OR $v > $data[ $k ] )
 								{
 									$data[ $k ] = $v;
 								}
@@ -3939,7 +4181,7 @@ class ips_MemberRegistry
 	 * Update the member's session
 	 *
 	 * @param	array 		Array of data to update
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function updateMySession( $data )
 	{
@@ -3951,7 +4193,7 @@ class ips_MemberRegistry
 	 *
 	 * Now that everything has loaded, lets do the final set up
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	static public function finalizePublicMember()
 	{
@@ -3964,19 +4206,21 @@ class ips_MemberRegistry
 			self::$data_store['members_seo_name'] = IPSMember::fetchSeoName( self::$data_store );
 		}
 		
-		/* Can't use the RTE in lofi, plus it breaks editing */
-		if( ipsRegistry::getClass('output')->skin['set_key'] == 'lofi' )
+		/* Rebuild messenger count if triggered */
+		if( self::$data_store['msg_count_reset'] )
 		{
-			self::$data_store['_canUseRTE'] = FALSE;
+			/* Just instantiating the class will perform reset */
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
+			$messenger		= new $classToLoad( ipsRegistry::instance() );
 		}
 	}
 
 	/**
 	 * Set up a member
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	static private function setUpMember()
+	static protected function setUpMember()
     {
 		//-----------------------------------------
         // INIT
@@ -4001,6 +4245,19 @@ class ips_MemberRegistry
 		{
 			self::$data_store['_cache']['friends'] = array();
 		}
+		
+		//-----------------------------------------
+		// Unpack ignored users
+		//-----------------------------------------
+		
+		if ( isset(self::$data_store['ignored_users']) )
+		{
+			self::$data_store['_ignoredUsers'] = @unserialize( self::$data_store['ignored_users'] );
+		}
+		else
+		{
+			self::$data_store['_ignoredUsers'] = array();
+		}
 	
 		//-----------------------------------------
         // Set up main 'display' group
@@ -4016,8 +4273,11 @@ class ips_MemberRegistry
 		//-----------------------------------------
 
 		self::$data_store = self::instance()->setUpSecondaryGroups( self::$data_store );
-
-		self::instance()->perm_id       = ( isset(self::$data_store['org_perm_id']) AND self::$data_store['org_perm_id'] ) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
+		
+		/* Ensure we don't have a ,, string */
+		self::$data_store['org_perm_id'] = IPSText::cleanPermString( self::$data_store['org_perm_id'] );
+		
+		self::instance()->perm_id       = ! empty(self::$data_store['org_perm_id']) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
         self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
 
         //-----------------------------------------
@@ -4080,32 +4340,11 @@ class ips_MemberRegistry
 						
 						self::$data_store = self::instance()->setUpSecondaryGroups( self::$data_store );
 
-						self::instance()->perm_id       = ( isset(self::$data_store['org_perm_id']) AND self::$data_store['org_perm_id'] ) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
+						self::instance()->perm_id       = !empty(self::$data_store['org_perm_id']) ? self::$data_store['org_perm_id'] : self::$data_store['g_perm_id'];
 				        self::instance()->perm_id_array = explode( ",", self::instance()->perm_id );
 					}
 				}
 			}
 		}
-	
-		//-----------------------------------------
-		// Fix up some preferences
-		//-----------------------------------------
-
-		$ppu = 0;
-		$tpu = 0;
-
-		if ( isset( self::$data_store['view_prefs'] ) )
-		{
-			list($ppu,$tpu) = explode( "&", self::$data_store['view_prefs'] );
-		}
-
-		ipsRegistry::$settings[ 'display_max_topics'] =  ($tpu > 0 ? $tpu : ipsRegistry::$settings['display_max_topics'] );
-		ipsRegistry::$settings[ 'display_max_posts' ] =  ($ppu > 0 ? $ppu : ipsRegistry::$settings['display_max_posts'] );
-	
-		//-----------------------------------------
-		// Knock out some text fields we don't need in memory
-		//-----------------------------------------
-
-		unset( self::$data_store['notes'] );
-    }
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/ads.php b/upload/admin/sources/classes/ads.php
index 49d9ea74..aae30b97 100644
--- a/upload/admin/sources/classes/ads.php
+++ b/upload/admin/sources/classes/ads.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Advertisements
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		17th February 2010
- * @version		$Revision: 6017 $
+ * @version		$Revision: 8644 $
  */
 
 class IPSAdCode extends IPSAdCodeDefault
@@ -61,7 +61,7 @@ class IPSAdCode extends IPSAdCodeDefault
 	 *
 	 * @param	string		$position		header or footer
 	 * @param	string		$code			Key for code to be displayed at specified position
-	 * @return	void 
+	 * @return	@e void 
 	 */
 	public function setGlobalCode( $position, $code )
 	{
@@ -84,7 +84,7 @@ class IPSAdCode extends IPSAdCodeDefault
 	 *
 	 * @param	string		$position		header or footer
 	 * @param	string		$code			Code to be displayed at specified position
-	 * @return	void 
+	 * @return	@e void 
 	 */
 	public function getGobalCode( $position )
 	{
diff --git a/upload/admin/sources/classes/bbcode/core.php b/upload/admin/sources/classes/bbcode/core.php
index f0a99093..60c5a510 100644
--- a/upload/admin/sources/classes/bbcode/core.php
+++ b/upload/admin/sources/classes/bbcode/core.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode parsing core - common methods
- * Last Updated: $Date: 2010-10-12 18:11:21 -0400 (Tue, 12 Oct 2010) $
+ * Last Updated: $Date: 2011-10-11 07:49:07 -0400 (Tue, 11 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6965 $
+ * @version		$Revision: 9593 $
  *
  * Basic usage examples
  * <code>
@@ -86,15 +86,6 @@ class class_bbcode_core
 	 * @var		boolean
 	 */	
 	public $strip_quotes			= false;
-	
-	/**
-	 * Wordwrap cutoff
-	 * Attempts to cut strings as close as possible at these points
-	 *
-	 * @access	public
-	 * @var		integer
-	 */	
-	public $parse_wordwrap			= 0;
 
 	/**
 	 * Auto convert newlines to html line breaks
@@ -239,6 +230,7 @@ class class_bbcode_core
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -247,6 +239,7 @@ class class_bbcode_core
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * BBCodes we should parse.
@@ -260,18 +253,18 @@ class class_bbcode_core
 	/**
 	 * Plugin objects
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array 					Holds plugin objects
 	 */	
-	private $plugins					= array();
+	protected $plugins					= array();
 	
 	/**
 	 * Current position in the text document
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		integer
 	 */	
-	private $cur_pos					= 0;
+	protected $cur_pos					= 0;
 	
 	/**
 	 * Multi-dimensional array of bbcodes not being parsed inside
@@ -292,25 +285,28 @@ class class_bbcode_core
 	/**
 	 * Emoticon code
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */	
-	private $_emoCode					= '';
+	protected $_emoCode					= '';
 	
 	/**
 	 * Emoticon image
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */	
-	private $_emoImage					= '';
-		
+	protected $_emoImage					= '';
+	
+	protected $_mediaUrlConverted			= array();
+	protected $_sortedSmilies				= array();
+	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -325,8 +321,6 @@ class class_bbcode_core
 		$this->cache	= $this->registry->cache();
 		$this->caches   =& $this->registry->cache()->fetchCaches();
 		
-		//require_once( IPS_ROOT_PATH . 'sources/interfaces/interface_bbcode.php' );
-
 		$_NOW = IPSDebug::getMemoryDebugFlag();
 		
 		$this->initOurBbcodes();
@@ -334,9 +328,15 @@ class class_bbcode_core
 		IPSDebug::setMemoryDebugFlag( "BBCodes initialized", $_NOW );
 		
 		/* Check for emoticons */
-		if ( ! is_array( $this->caches['emoticons'] ) OR ! count( $this->caches['emoticons'] ) )
+		if ( !$this->cache->exists('emoticons') )
 		{
-			$this->cache->rebuildCache( 'emoticons', 'global' );
+			$emoticons = $this->cache->getCache('emoticons');
+			
+			/* Fallback on recache */
+			if ( !is_array($emoticons) OR !count($emoticons) )
+			{
+				$this->cache->rebuildCache( 'emoticons', 'global' );
+			}
 		}
 	}
 	
@@ -344,7 +344,7 @@ class class_bbcode_core
 	 * Initialize our bbcodes
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initOurBbcodes()
 	{
@@ -352,24 +352,18 @@ class class_bbcode_core
 
 		foreach( $this->cache->getCache('bbcode') as $bbcode )
 		{
-			/* Cheat a bit */
-			if ( $bbcode['bbcode_tag'] == 'code' OR $bbcode['bbcode_tag'] == 'acronym' OR $bbcode['bbcode_tag'] == 'img' )
-			{
-				$bbcode['bbcode_no_auto_url_parse'] = 1;
-			}
-			
 			//-----------------------------------------
 			// BBcode allowed in this section?
 			//-----------------------------------------
 
-			if( $bbcode['bbcode_sections'] != 'all' )
+			if( $bbcode['bbcode_sections'] != 'all' && $this->parsing_section != 'global' )
 			{
 				$pass		= false;
 				$sections	= explode( ',', $bbcode['bbcode_sections'] );
 				
 				foreach( $sections as $section )
 				{
-					if( $section == $this->parsing_section OR $this->parsing_section == 'global' )
+					if( $section == $this->parsing_section )
 					{
 						$pass = true;
 						break;
@@ -382,6 +376,12 @@ class class_bbcode_core
 				}
 			}
 			
+			/* Cheat a bit */
+			if ( in_array( $bbcode['bbcode_tag'], array( 'code', 'acronym', 'img' ) ) )
+			{
+				$bbcode['bbcode_no_auto_url_parse'] = 1;
+			}
+			
 			//-----------------------------------------
 			// Store into the array
 			//-----------------------------------------
@@ -389,12 +389,23 @@ class class_bbcode_core
 			$this->_bbcodes['display'][ $bbcode['bbcode_tag'] ]	= $bbcode;
 		}
 	}
+	
+	/**
+	 * Reset function to call to trigger "new post" for non-parsed content
+	 *
+	 * @access	public
+	 * @return	@e void
+	 */
+	public function resetPerPost()
+	{
+		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_images', 0 );
+	}
 
 	/**
 	 * Reset bbcode internal pointers
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _resetPointers()
 	{
@@ -436,6 +447,8 @@ class class_bbcode_core
 	/**
 	 * Check against XSS
 	 *
+	 * NOTE: When this function is updated, please also update classIncomingEmail::cleanMessage()
+	 *
 	 * @access	public
 	 * @param	string		Original string
 	 * @param	boolean		Fix script HTML tags
@@ -494,21 +507,15 @@ class class_bbcode_core
 					$test1 = IPSText::alphanumericalClean( $test, '#.+, ' );
 					if ( $test != $test1 )
 					{
-						$txt	= false;
+						$txt = false;
 					}
 				break;
 				
 				default:
-					$_regex	= null;
+					$_regex	  = null;
+					$_bbcodes = $this->cache->getCache('bbcode');
 					
-					foreach( $this->cache->getCache('bbcode') as $bbcode )
-					{
-						if( $bbcode['bbcode_tag'] == $tag )
-						{
-							$_regex	= $bbcode['bbcode_custom_regex'];
-							break;
-						}
-					}
+					$_regex	  = $_bbcodes[ $tag ]['bbcode_custom_regex'];
 					
 					if( $_regex )
 					{
@@ -544,43 +551,9 @@ class class_bbcode_core
 				$txt	= str_replace( array( '[', ']' ), array( '&#91;', '&#93;' ), $txt );
 			}
 		}
-
-		//-----------------------------------------
-		// Here we can do some generic checking for XSS
-		// This should not be considered fool proof, though can provide
-		//	a centralized point for maintenance and checking
-		//-----------------------------------------
 		
-		$txt = preg_replace( "/(j)avascript/i" , "\\1&#097;v&#097;script", $txt );
-		//$txt = str_ireplace( "alert"      , "&#097;lert"          , $txt );
-		//$txt = preg_replace( "/(b)(e)(h)(a)(v)(i)(o)(r)/is"   , "\\1\\2\\3<b></b>\\4\\5\\6\\7\\8"    	  , $txt );
-		$txt = preg_replace( '/(e)((\/\*.*?\*\/)*)x((\/\*.*?\*\/)*)p((\/\*.*?\*\/)*)r((\/\*.*?\*\/)*)e((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)i((\/\*.*?\*\/)*)o((\/\*.*?\*\/)*)n/is' , "\\1xp<b></b>ressi&#111;n"     , $txt );
-		$txt = preg_replace( '/(e)((\\\|&#092;)*)x((\\\|&#092;)*)p((\\\|&#092;)*)r((\\\|&#092;)*)e((\\\|&#092;)*)s((\\\|&#092;)*)s((\\\|&#092;)*)i((\\\|&#092;)*)o((\\\|&#092;)*)n/is' 	  , "\\1xp<b></b>ressi&#111;n"     	  , $txt );
-		$txt = preg_replace( '/m((\\\|&#092;)*)o((\\\|&#092;)*)z((\\\|&#092;)*)\-((\\\|&#092;)*)b((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)d((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)g/is' 	  , "moz-<b></b>b&#105;nding"     	  , $txt );
-		$txt = str_ireplace( "about:"     , "&#097;bout:"         , $txt );
-		$txt = str_ireplace( "<body"      , "&lt;body"            , $txt );
-		$txt = str_ireplace( "<html"      , "&lt;html"            , $txt );
-		$txt = str_ireplace( "document." , "&#100;ocument."      , $txt );
-		$txt = str_ireplace( "window."   , "wind&#111;w."      , $txt );
-		
-		$event_handlers	= array( 'mouseover', 'mouseout', 'mouseup', 'mousemove', 'mousedown', 'mouseenter', 'mouseleave', 'mousewheel',
-								 'contextmenu', 'click', 'dblclick', 'load', 'unload', 'submit', 'blur', 'focus', 'resize', 'scroll',
-								 'change', 'reset', 'select', 'selectionchange', 'selectstart', 'start', 'stop', 'keydown', 'keyup',
-								 'keypress', 'abort', 'error', 'dragdrop', 'move', 'moveend', 'movestart', 'activate', 'afterprint',
-								 'afterupdate', 'beforeactivate', 'beforecopy', 'beforecut', 'beforedeactivate', 'beforeeditfocus',
-								 'beforepaste', 'beforeprint', 'beforeunload', 'begin', 'bounce', 'cellchange', 'controlselect',
-								 'copy', 'cut', 'paste', 'dataavailable', 'datasetchanged', 'datasetcomplete', 'deactivate', 'drag',
-								 'dragend', 'dragleave', 'dragenter', 'dragover', 'drop', 'end', 'errorupdate', 'filterchange', 'finish',
-								 'focusin', 'focusout', 'help', 'layoutcomplete', 'losecapture', 'mediacomplete', 'mediaerror', 'outofsync',
-								 'pause', 'propertychange', 'progress', 'readystatechange', 'repeat', 'resizeend', 'resizestart', 'resume',
-								 'reverse', 'rowsenter', 'rowexit', 'rowdelete', 'rowinserted', 'seek', 'syncrestored', 'timeerror',
-								 'trackchange', 'urlflip',
-								);
-		
-		foreach( $event_handlers as $handler )
-		{
-			$txt = str_ireplace( 'on' . $handler, '&#111;n' . $handler, $txt );
-		}
+		/* Attempt to make JS safe */
+		$txt = IPSText::xssMakeJavascriptSafe( $txt );
 
 		return $txt;
 	}
@@ -599,11 +572,6 @@ class class_bbcode_core
 			return "";
 		}
 		
-		if ( $this->bypass_badwords == 1 )
-		{
-			return $text;
-		}
-		
 		$temp_text = $text;
 		
 		//-----------------------------------------
@@ -630,6 +598,16 @@ class class_bbcode_core
 			{
 				foreach( $this->cache->getCache('badwords') as $r )
 				{
+					if ( $this->bypass_badwords and !$r['ignore_bypass'] )
+					{
+						continue;
+					}
+					
+					if ( $this->parsing_section != 'topics' )
+					{
+						$r['swop'] = strip_tags( $r['swop'] );
+					}
+				
 					$replace	= $r['swop'] ? $r['swop'] : '######';
 					
 					if ( $r['m_exact'] )
@@ -728,166 +706,6 @@ class class_bbcode_core
 		return true;
 	}
 
-	/**
-	 * Custom word wrap : attempts to not break HTML tags (*ha!)
-	 *
-	 * @access	public
-	 * @param	string		Raw text
-	 * @return	string		Converted text
-	 */
-	public function applyWordwrap( $txt="", $chrs=0, $replace="\n" )
-	{
-		//-----------------------------------------
-		// Got chars and limit
-		//-----------------------------------------
-
-		if ( $txt == "" )
-		{
-			return $txt;
-		}
-		
-		if ( $chrs < 1 )
-		{
-			return $txt;
-		}
-
-		//-----------------------------------------
-		// Array of tags we won't apply breaking in
-		//-----------------------------------------
-				
-		$noBreak		= array( 'textarea' );
-		
-		//-----------------------------------------
-		// Characters we will break at
-		//-----------------------------------------
-		
-		$breakAt		= array( '?', '/', '.', ',', '!', '%', ';', '-', "'", '"', ':', '>' );
-		
-		//-----------------------------------------
-		// Characters that will reset the wordwrap
-		//-----------------------------------------
-		
-		$resetters		= array( ' ', "\n", "\t" );
-		
-		//-----------------------------------------
-		// Other init...
-		//-----------------------------------------
-		
-		$inTag			= false;
-		$totalLength	= strlen( $txt );
-		$curPos			= 0;
-		$charsSince		= 0;
-		$iterations		= 0;
-		//-----------------------------------------
-		// Loop over each char
-		//-----------------------------------------
-		
-		while( $curPos < $totalLength )
-		{
-			$curPos++;
-			
-			/**
-			 * @link	http://community.invisionpower.com/tracker/issue-23818-wordwrap-bug-with-amp%3Blt%3B/
-			 */
-			if( $curPos < 1 )
-			{
-				break;
-			}
-
-			//-----------------------------------------
-			// We within a tag?
-			//-----------------------------------------
-
-			if( isset( $txt{$curPos} ) && $txt{$curPos} == '<' )
-			{
-				$inTag	= true;
-				$charsSince++;
-				continue;
-			}
-			
-			//-----------------------------------------
-			// We out of a tag?
-			//-----------------------------------------
-			
-			if( isset( $txt{$curPos} ) && $txt{$curPos} == '>' )
-			{
-				$inTag	= false;
-			}
-			
-			//-----------------------------------------
-			// Within a tag...
-			//-----------------------------------------
-			
-			if( $inTag )
-			{
-				//-----------------------------------------
-				// This a tag we're skipping?
-				//-----------------------------------------
-
-				if( in_array( substr( $txt, $curPos, (strpos( $txt, ' ', $curPos ) - $curPos) ), $noBreak ) )
-				{
-					$curTag		= substr( $txt, $curPos, (strpos( $txt, ' ', $curPos ) - $curPos) );
-					$charsSince	= 0;
-					$curPos 	= stripos( $txt, '</' . $curTag . '>', $curPos );
-					
-					continue;
-				}
-				else if( in_array( substr( $txt, $curPos, (strpos( $txt, '>', $curPos ) - $curPos) ), $noBreak ) )
-				{
-					$curTag		= substr( $txt, $curPos, (strpos( $txt, '>', $curPos ) - $curPos) );
-					$charsSince	= 0;
-					$curPos 	= stripos( $txt, '</' . $curTag . '>', $curPos );
-
-					continue;
-				}
-				
-				//-----------------------------------------
-				// No, skip tag, but increment chars by 1
-				//-----------------------------------------
-				
-				else
-				{
-					$charsSince++;
-					$curPos 	= strpos( $txt, '>', $curPos ) - 1;
-					continue;
-				}
-			}
-			
-			//-----------------------------------------
-			// Reset the chars since if necessary
-			//-----------------------------------------
-
-			if( isset( $txt{$curPos} ) && in_array( $txt{$curPos}, $resetters ) )
-			{
-				$charsSince	= 0;
-				continue;
-			}
-
-			//-----------------------------------------
-			// Time to break?
-			//-----------------------------------------
-			
-			if( $charsSince >= $chrs )
-			{
-				if( in_array( $txt{$curPos}, $breakAt ) )
-				{
-					$txt		= substr_replace( $txt, $replace, $curPos + 1, 0 );
-					$curPos		= $curPos + 1 + strlen($replace);
-					$charsSince	= 0;
-					continue;
-				}
-			}
-			
-			//-----------------------------------------
-			// One more char since last break
-			//-----------------------------------------
-			
-			$charsSince++;
-		}
-
-		return $txt;
-	}
-
 	/**
 	 * Makes data for quote strings "safe"
 	 *
@@ -947,7 +765,7 @@ class class_bbcode_core
 		
 		static $iteration	= array();
 		
-		if( array_key_exists( $tag, $iteration ) AND $iteration[ $tag ] > $this->settings['max_bbcodes_per_post'] )
+		if( isset( $iteration[ $tag ] ) AND $iteration[ $tag ] > $this->settings['max_bbcodes_per_post'] )
 		{
 			return $txt;
 		}
@@ -1016,18 +834,15 @@ class class_bbcode_core
 		}
 	}
 	
-	
 	/**
 	 * Remove ALL tags
 	 *
 	 * @access	public
 	 * @param	string		Raw text
 	 * @param 	boolean		Whether or not to run through pre-edit-parse first
-	 * @param 	boolean		Check "strip from search" option
 	 * @return	string		Converted text
-	 * @todo 	[Future] Can this (and should this) be done without regex?
 	 */
-	public function stripAllTags( $txt, $pre_edit_parse=true, $only_search=true )
+	public function stripAllTags( $txt, $pre_edit_parse=true )
 	{
 		if( $pre_edit_parse )
 		{
@@ -1038,17 +853,10 @@ class class_bbcode_core
 		
 		foreach( $this->cache->getCache('bbcode') as $bbcode )
 		{
-			if( $only_search && isset( $bbcode['bbcode_strip_search'] ) && $bbcode['bbcode_strip_search'] )
-			{
-				$txt = $this->stripBbcode( $bbcode['bbcode_tag'], $txt );
-			}
-			else
-			{
 				//$txt = preg_replace( "#\[{$bbcode['bbcode_tag']}\](.+?)\[/{$bbcode['bbcode_tag']}\]#is", "\\1 ", $txt );
 				$txt = preg_replace( "#\[{$bbcode['bbcode_tag']}=([^\]]+?)\](.+?)\[/{$bbcode['bbcode_tag']}\]#ius", "\\2 ", $txt );
 				$txt = str_ireplace( "[{$bbcode['bbcode_tag']}]", '', $txt );
 				$txt = str_ireplace( "[/{$bbcode['bbcode_tag']}]", '', $txt );
-			}
 			
 			//-----------------------------------------
 			// Strip single bbcodes properly
@@ -1095,7 +903,14 @@ class class_bbcode_core
 		// IE handles RTE BR tags differently
 		//-----------------------------------------
 
-		$t = str_ireplace( "<BR>",	"<br />",	$t );
+		$t	= str_ireplace( "<BR>", "<br />", $t );
+
+		//-----------------------------------------
+		// Fix < and > entities
+		//-----------------------------------------
+
+		$t	= str_replace( '&#60;', '&lt;', $t );
+		$t	= str_replace( '&#62;', '&gt;', $t );
 		
 		//-----------------------------------------
 		// Get out codeboxes first...
@@ -1140,7 +955,7 @@ class class_bbcode_core
 		// Now we'll "fix" the replacement html...
 		//-----------------------------------------
 		
-		$_tags = array( 'url', 'left', 'right', 'center', 'indent', 'b', 'i', 'u', 'strike', 'sub', 'sup', 'url', 'img', 'background', 'color', 'size', 'font', 'list' );
+		$_tags = array( 'url', 'email', 'left', 'right', 'center', 'indent', 'b', 'i', 'u', 'strike', 'sub', 'sup', 'url', 'img', 'background', 'color', 'size', 'font', 'list', 'media' );
 		
 		foreach( $this->_bbcodes['display'] as $_tag => $_bbcode )
 		{
@@ -1154,35 +969,38 @@ class class_bbcode_core
 		// Parse bbcodes for RTE
 		//-----------------------------------------
 		
-		$this->_bbcodes['display']['left']['bbcode_replace']		= '<div align="left">{content}</div>';
-		$this->_bbcodes['display']['right']['bbcode_replace']		= '<div align="right">{content}</div>';
-		$this->_bbcodes['display']['center']['bbcode_replace']		= '<div align="center">{content}</div>';
-		$this->_bbcodes['display']['indent']['bbcode_replace']		= '<blockquote>{content}</blockquote>';
-		$this->_bbcodes['display']['b']['bbcode_replace']			= '<b>{content}</b>';
-		$this->_bbcodes['display']['i']['bbcode_replace']			= '<i>{content}</i>';
+		$this->_bbcodes['display']['left']['bbcode_replace']		= '<p style="text-align: left">{content}</p>';
+		$this->_bbcodes['display']['right']['bbcode_replace']		= '<p style="text-align: right">{content}</p>';
+		$this->_bbcodes['display']['center']['bbcode_replace']		= '<p style="text-align: center">{content}</p>';
+		$this->_bbcodes['display']['indent']['bbcode_replace']		= '<p style="margin-left: 40px">{content}</p>';
+		$this->_bbcodes['display']['b']['bbcode_replace']			= '<strong>{content}</strong>';
+		$this->_bbcodes['display']['i']['bbcode_replace']			= '<em>{content}</em>';
 		$this->_bbcodes['display']['u']['bbcode_replace']			= '<u>{content}</u>';
 		$this->_bbcodes['display']['strike']['bbcode_replace']		= '<strike>{content}</strike>';
 		$this->_bbcodes['display']['sub']['bbcode_replace']			= '<sub>{content}</sub>';
 		$this->_bbcodes['display']['sup']['bbcode_replace']			= '<sup>{content}</sup>';
+		$this->_bbcodes['display']['media']['bbcode_replace']		= '[media]{content}[/media]';
+		$this->_bbcodes['display']['media']['bbcode_php_plugin']	= '';
 		
-		//$this->_bbcodes['display']['url']['bbcode_replace']			= '<a href="{option}">{content}</a>';
-		//$this->_bbcodes['display']['url']['bbcode_php_plugin']		= '';
+		$this->_bbcodes['display']['email']['bbcode_replace']			= '<a href="mailto:{option}">{content}</a>';
+		$this->_bbcodes['display']['email']['bbcode_php_plugin']		= '';
 		
 		$this->_bbcodes['display']['img']['bbcode_replace']			= '<img src="{content}" />';
 		$this->_bbcodes['display']['img']['bbcode_php_plugin']		= '';
 		
-		$this->_bbcodes['display']['background']['bbcode_replace']	= '<font background="{option}">{content}</font>';
-		$this->_bbcodes['display']['size']['bbcode_replace']		= '<font size="{option}">{content}</font>';
-		$this->_bbcodes['display']['size']['bbcode_php_plugin']		= '';
-		$this->_bbcodes['display']['color']['bbcode_replace']		= '<font color="{option}">{content}</font>';
-		$this->_bbcodes['display']['font']['bbcode_replace']		= '<font face="{option}">{content}</font>';
+		$this->_bbcodes['display']['background']['bbcode_replace']	= '<span style="background-color: {option}">{content}</span>';
+		//$this->_bbcodes['display']['size']['bbcode_replace']		= '<span style="font-size: {option}">{content}</span>';
+		$this->_bbcodes['display']['size']['bbcode_php_plugin']		= 'defaults.php';
+		$this->_bbcodes['display']['color']['bbcode_replace']		= '<span style="color: {option}">{content}</span>'; 
+		$this->_bbcodes['display']['font']['bbcode_replace']		= '<span style="font-family: {option}">{content}</span>';
 
 		//-----------------------------------------
 		// and actually replace
 		//-----------------------------------------
 
 		$t = $this->preDisplayParse( $t );
-
+		
+		
 		//-----------------------------------------
 		// And then return teh code
 		//-----------------------------------------
@@ -1203,7 +1021,7 @@ class class_bbcode_core
 		
 		foreach( $_codeboxes as $_increment => $_replacement )
 		{
-			$_replacement	= $this->unconvertSmilies( $_replacement );
+			$_replacement	= IPSText::unconvertSmilies( $_replacement );
 			
 			$t = str_replace( "__CODEBOX_{$_increment}__", $_replacement, $t );
 		}
@@ -1212,9 +1030,9 @@ class class_bbcode_core
 		// Fix some special characters
 		//-----------------------------------------
 
-		$t = str_replace( '&#39;'  , "'", $t );
+		//$t = str_replace( '&#39;'  , "'", $t );
 		$t = str_replace( '&#33;'  , "!", $t );
-		$t = str_replace( '&#039;' , "'", $t );
+		//$t = str_replace( '&#039;' , "'", $t );
 		$t = str_replace( '&apos;' , "'", $t );
 
 		//-----------------------------------------
@@ -1230,26 +1048,10 @@ class class_bbcode_core
 		$this->initOurBbcodes();
 		
 		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_isForRte', false );
-		
+
 		return $t;
 	}
-	
-	/**
-	 * Unconvert smilies
-	 *
-	 * @access	public
-	 * @param	string		Raw text
-	 * @return	string		Converted text
-	 */
-	public function unconvertSmilies( $txt )
-	{
-		//-----------------------------------------
-		// Now in core.php
-		//-----------------------------------------
 
-		return IPSLib::unconvertSmilies( $txt );
-	}
-	
 	/**
 	 * Remove raw smilies
 	 *
@@ -1322,7 +1124,7 @@ class class_bbcode_core
 		//-----------------------------------------
 		// Reset
 		//-----------------------------------------
-		
+
 		$this->_resetPointers();
 		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_media', 0 );
 		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_images', 0 );
@@ -1369,16 +1171,6 @@ class class_bbcode_core
 		{
 			$txt	= $this->parseBbcode( $txt, 'db' );
 		}
-
-		//-----------------------------------------
-		// Unicode (on by default)?
-		// @see initdata.php IPS_ALLOW_UNICODE constant
-		//-----------------------------------------
-		
-		if ( $this->allow_unicode )
-		{
-			$txt = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $txt );
-		}
 		
 		/* Parse smililes before bbcode, and remove elemnts that will not be parsed on display. Bug Fix: #20964 */
 		// Parsing here causes nonparsed stuff to be double stored in the storeNonParsed array.  This causes problems
@@ -1389,14 +1181,18 @@ class class_bbcode_core
 		//-----------------------------------------
 		// Parse smilies
 		//-----------------------------------------
-
+		
+		/* Sort them in length order first */
+		$this->_sortSmilies();
+		
+		/* Now parse them! */
 		if ( $this->parse_smilies )
 		{
 			$codes_seen		= array();
         
-			if ( count( $this->cache->getCache('emoticons') ) > 0 )
+			if ( count( $this->_sortedSmilies ) > 0 )
 			{
-				foreach( $this->cache->getCache('emoticons') as $row )
+				foreach( $this->_sortedSmilies as $row )
 				{
 					if ( is_array($this->registry->output->skin) AND $this->registry->output->skin['set_emo_dir'] AND $row['emo_set'] != $this->registry->output->skin['set_emo_dir'] )
 					{
@@ -1411,12 +1207,12 @@ class class_bbcode_core
 					}
         
 					$codes_seen[] = $code;
-        
+      
 					//-----------------------------------------
 					// Now, check for the html safe versions
 					//-----------------------------------------	
         
-					$_emoCode			= str_replace( '<', '&lt;', str_replace( '>', '&gt;', $code ) );	
+					$_emoCode			= str_replace( '&#33;', '!', str_replace( '<', '&lt;', str_replace( '>', '&gt;', $code ) ) );	
 					$_emoImage			= $row['image'];
 					$emoPosition		= 0;
         
@@ -1484,15 +1280,46 @@ class class_bbcode_core
 			}
 		}
 		
+		/* Try to preserve entities... */
+		/* @link	http://community.invisionpower.com/tracker/issue-26778-code-tags-and-some-special-characters */
+		/* This is no longer required as HTML entities are better preserved elsewhere, this just confuses it further (Matt) */
+		//$txt = $this->_storeNonParsed( $txt, 'display' );
+
+		//-----------------------------------------
+		// Unicode (on by default)?
+		// @see initdata.php IPS_ALLOW_UNICODE constant
+		//-----------------------------------------
+		
+		if ( $this->allow_unicode )
+		{
+			$txt = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $txt );
+		}
+		
 		/* Put back non parsed code.  Bug Fix: #20964 */
 		if( is_array( $this->noParseStorage ) && count( $this->noParseStorage ) )
 		{
 			foreach( $this->noParseStorage as $r )
 			{
+				/* Preserve typed entities */
+				$r['replace']	= preg_replace("/&#([0-9]+);/s", "&amp;#\\1;", $r['replace'] );
+				
+				/* And now try to swap back entities WE replaced... */
+				/* Still a small issue: If you type in &#092; it will display as a \, but that's because we have no way to know if it was typed in or swapped out
+					by post input parsing routines */
+				$r['replace']	= str_replace( '&amp;#092;', '&#092;', $r['replace'] );
+				$r['replace']	= str_replace( '&amp;#036;', '&#036;', $r['replace'] );
+				$r['replace']	= str_replace( '&amp;#46;', '&#46;', $r['replace'] );
+				$r['replace']	= str_replace( '&amp;#33;', '&#33;', $r['replace'] );
+				$r['replace']	= str_replace( '&amp;#60;', '&#60;', $r['replace'] );
+				$r['replace']	= str_replace( '&amp;#62;', '&#62;', $r['replace'] );
+				//$r['replace']	= str_replace( '&amp;#39;', '&#39;', $r['replace'] );
+				
 				$txt = str_replace( $r['find'], $r['replace'], $txt );
 			}
 		}
 		
+		$this->noParseStorage	= array();
+		
 		//-----------------------------------------
 		// Badwords
 		//-----------------------------------------
@@ -1513,7 +1340,7 @@ class class_bbcode_core
 	{
 		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_media', 0 );
 		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_images', 0 );
-		
+
 		if ( $this->parse_html )
 		{
 			//-----------------------------------------
@@ -1526,8 +1353,12 @@ class class_bbcode_core
 			}
 			
 			$txt = $this->_parseHtml( $txt );
+			
+			/* We still don't want XSS thx */
+			$txt = $this->checkXss( $txt, true );
 		}
-
+		
+		
 		//-----------------------------------------
 		// Fix "{style_images_url}"
 		//-----------------------------------------
@@ -1543,19 +1374,21 @@ class class_bbcode_core
 		if ( $this->parse_bbcode  )
 		{
 			$txt = $this->parseBbcode( $txt, 'display' );
+			
+			//-----------------------------------------
+			// Fix images nested inside anchors
+			//-----------------------------------------
+			
+			$txt	= preg_replace( '#(\<a[^\>]+bbc_url[^\>]+\>)\s*?\<span rel=\'lightbox\'\>(.+?)\<\/span\>\s*?(\<\/a\>)#im', "\\1\\2\\3", $txt );
 		}
-
+		
 		IPSDebug::setMemoryDebugFlag( "PreDisplayParse - parsed BBCode", $_NOW );
 		
-		$_NOW = IPSDebug::getMemoryDebugFlag();
+		/* remove P effect */
+		$txt = str_replace( '</p><br />', '</p>', $txt );
+		$txt = str_replace( '</pre><br />', '</pre>', $txt );
+		$txt = str_replace( '</div><br />', '</div>', $txt );
 		
-		if ( $this->parse_wordwrap > 0 )
-		{
-			$txt = $this->applyWordwrap( $txt, $this->parse_wordwrap );
-		}
-		
-		IPSDebug::setMemoryDebugFlag( "PreDisplayParse - applied wordwrap", $_NOW );
-	
 		//-----------------------------------------
 		// Fix line breaks
 		//-----------------------------------------
@@ -1564,16 +1397,6 @@ class class_bbcode_core
 		{
 			$txt = str_replace( "~~~~~_____~~~~~", '<br />', $txt );
 		}
-				
-		//-----------------------------------------
-		// And fix old youtube embedded videos..
-		//-----------------------------------------
-		
-		/*if( stripos( $txt, "<object" ) AND stripos( $txt, "<embed" ) )
-		{
-			//$txt = preg_replace( "#<object(.+?)<embed(.+?)></embed></object>#i", "<embed\\2</embed>", $txt );
-			$txt = preg_replace( "#<object(.+?)<embed.+?></embed></object>#i", "<object\\1</object>", $txt );
-		}*/
 
 		return $txt;
 	}
@@ -1602,7 +1425,7 @@ class class_bbcode_core
 		// Unconvert smilies
 		//-----------------------------------------
 		
-		$txt = $this->unconvertSmilies( $txt );
+		$txt = IPSText::unconvertSmilies( $txt );
 
 		//-----------------------------------------
 		// Clean up nbsp
@@ -1626,38 +1449,7 @@ class class_bbcode_core
 		
 		$txt = str_replace( "{style_images_url}", "&#123;style_images_url&#125;", $txt );
 		
-		return trim( stripslashes( $txt ) );
-	}
-	
-
-	/**
-	 * Retrieve the proper emoticon image code
-	 *
-	 * @access	private
-	 * @param	string		Emoticon code we are replacing (i.e. :D)
-	 * @param	string		Emoticon image to display (i.e. 'biggrin.png')
-	 * @return	string		Converted text
-	 */
-	private function _retrieveSmiley( $_emoCode, $_emoImage )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		if ( ! $_emoCode or ! $_emoImage )
-		{
-			return '';
-		}
-
-		$this->emoticon_count++;
-		
-		$this->emoticon_alts[] = array( "#EMO_ALT_{$this->emoticon_count}#", $_emoCode );
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-		
-		return "<img src='" . $this->settings['emoticons_url'] . "/{$_emoImage}' class='bbc_emoticon' alt='#EMO_ALT_{$this->emoticon_count}#' />";
+		return trim( $txt );
 	}
 	
 	/**
@@ -1674,12 +1466,22 @@ class class_bbcode_core
 		//-----------------------------------------
 		// Pull out the non-replacable codes
 		//-----------------------------------------
-
+		
 		if( !is_string($_code) )
 		{
 			$txt = $this->_storeNonParsed( $txt, $cur_method );
 		}
 
+		//-----------------------------------------
+		// We want preDbParse method called for shared
+		// media for permission checking, so force it for now..
+		//-----------------------------------------
+		
+		if( $cur_method == 'db' )
+		{
+			$this->_bbcodes[ $cur_method ]['sharedmedia'] = $this->_bbcodes['display']['sharedmedia'];
+		}
+
 		//-----------------------------------------
 		// Regular replacing
 		//-----------------------------------------		
@@ -1700,7 +1502,7 @@ class class_bbcode_core
 					
 					if( $this->parsing_mgroup_others )
 					{
-						$mygroups	= array_diff( array_merge( $mygroups, explode( ',', IPSText::cleanPermString( $this->parsing_mgroup_others ) ) ), array('') );
+						$mygroups = array_diff( array_merge( $mygroups, explode( ',', IPSText::cleanPermString( $this->parsing_mgroup_others ) ) ), array('') );
 					}
 
 					foreach( $groups as $g_id )
@@ -1742,7 +1544,7 @@ class class_bbcode_core
 					{
 						foreach( $aliases as $alias )
 						{
-							$_tags[]	= trim($alias);
+							$_tags[] = trim($alias);
 						}
 					}
 				}
@@ -1765,7 +1567,8 @@ class class_bbcode_core
 						{
 							if( in_array( $_tag, $_code ) )
 							{
-								$good	= true;
+								$good = true;
+								break; // Got one, stop here
 							}
 						}
 						
@@ -1776,17 +1579,7 @@ class class_bbcode_core
 					}
 					else if( is_string($_code) )
 					{
-						$good	= false;
-						
-						foreach( $_tags as $_tag )
-						{
-							if( $_tag == $_code )
-							{
-								$good	= true;
-							}
-						}
-						
-						if( !$good )
+						if( !in_array( $_code, $_tags ) )
 						{
 							continue;
 						}
@@ -1831,11 +1624,9 @@ class class_bbcode_core
 					// First time we've called this plugin
 					//-----------------------------------------
 					
-					else if( file_exists( IPS_ROOT_PATH . 'sources/classes/bbcode/custom/' . $_bbcode['bbcode_php_plugin'] ) )
+					elseif ( is_file( IPS_ROOT_PATH . 'sources/classes/bbcode/custom/' . $_bbcode['bbcode_php_plugin'] ) )
 					{
-						require_once( IPS_ROOT_PATH . 'sources/classes/bbcode/custom/' . $_bbcode['bbcode_php_plugin'] );
-						
-						$_classname = 'bbcode_' . IPSText::alphanumericalClean( $_bbcode['bbcode_tag'] );
+						$_classname = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/bbcode/custom/' . $_bbcode['bbcode_php_plugin'], 'bbcode_' . IPSText::alphanumericalClean( $_bbcode['bbcode_tag'] ) );
 						
 						//-----------------------------------------
 						// Class we need exists
@@ -1931,9 +1722,7 @@ class class_bbcode_core
 						{
 							break;
 						}
-						
-						$_iteration++;
-						
+
 						$open_length = strlen($open_tag);
 
 						//-----------------------------------------
@@ -2008,6 +1797,8 @@ class class_bbcode_core
 							}
 						}
 						
+						$_iteration++;
+					
 						//-----------------------------------------
 						// Protect against XSS
 						//-----------------------------------------
@@ -2017,7 +1808,7 @@ class class_bbcode_core
 						$_option		= $this->checkXss($_option, false, $_tag);
 
 						/* Not parsing URls? */
-						if ( isset( $_bbcode['bbcode_no_auto_url_parse'] ) AND $_bbcode['bbcode_no_auto_url_parse'] )
+						if ( !empty( $_bbcode['bbcode_no_auto_url_parse'] ) )
 						{
 							$_option = preg_replace( "#(http|https|news|ftp)://#i", "\\1&#58;//", $_option );
 						}
@@ -2045,19 +1836,19 @@ class class_bbcode_core
 								{
 									$_content	= substr( $txt, ($this->cur_pos + $open_length + $_optionSlenstr + 1), (stripos( $txt, $close_tag, $this->cur_pos ) - ($this->cur_pos + $open_length + $_optionSlenstr + 1)) );
 									
-									if( $_bbcode['bbcode_useoption'] AND $_bbcode['bbcode_optional_option'] AND !$_option )
+									if( $_bbcode['bbcode_useoption'] AND $_bbcode['bbcode_optional_option'] AND ! $_option AND ! stristr( $_bbcode['bbcode_replace'], '{option}' ) )
 									{
 										$_option	= $_content;
 										$_option	= $this->checkXss($_option, false, $_tag);
 									}
 
 									/* Not parsing URls? */
-									if ( isset( $_bbcode['bbcode_no_auto_url_parse'] ) AND $_bbcode['bbcode_no_auto_url_parse'] )
+									if ( !empty( $_bbcode['bbcode_no_auto_url_parse'] ) )
 									{
 										$_content = preg_replace( "#(http|https|news|ftp)://#i", "\\1&#58;//", $_content );
 									}
 						
-									$txt		= substr_replace( $txt, $this->_bbcodeToHtml( $_bbcode, $_option /*? $_option : $_content*/, $_content ), $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );	
+									$txt		= substr_replace( $txt, $this->_bbcodeToHtml( $_bbcode, $_option, $_content ), $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );	
 								}
 								else
 								{
@@ -2111,7 +1902,7 @@ class class_bbcode_core
 		// Auto parse URLs (only if this is full sweep)
 		//-----------------------------------------
 
-		if( !$_code AND $cur_method == 'display' )
+		if ( ! $_code AND $cur_method == 'display' )
 		{
 			/* If we parse <a href='http://site.com'>http://site[color=red].com[/color]</a>, it breaks
 			 * @link http://community.invisionpower.com/tracker/issue-24318-colors-in-urls-as-names-breaks-them/ 
@@ -2119,8 +1910,37 @@ class class_bbcode_core
 			$_storedLinks	= array();
 			$_counter		= 0;
 			
-			while( preg_match( "/<a href='(.+?)'(.*?)>(.+?)<\/a>/is", $txt, $matches ) )
+			while( preg_match( '/<a href=\'(.+?)\'(.*?)>(.+?)<\/a>/is', $txt, $matches ) )
 			{
+				/* Is this a linked media URL? */
+				if ( $this->settings['bbcode_automatic_media'] and isset( $this->_bbcodes['display']['media'] ) and ( $this->_bbcodes['display']['media']['bbcode_sections'] == 'all' or in_array( $this->parsing_section, explode( ',', $this->_bbcodes['display']['media']['bbcode_sections'] ) ) ) )
+				{
+					$media = $this->cache->getCache( 'mediatag' );
+					
+					#href must match text (or has been shortened) and not a <a href="vid.com/4/">check this out!</a> style link
+					if ( $matches[1] == $matches[3] OR strstr( $matches[3], '...' ) )
+					{
+				       	if ( is_array( $media ) AND count( $media ) )
+						{
+							foreach( $media as $type => $r )
+							{
+								if ( preg_match( "#^" . $r['match'] . "$#is", $matches[1] ) )
+								{
+									$this->cache->updateCacheWithoutSaving( '_tmp_autoparse_media', 1 );
+									$_result	= $this->parseBbcode( '[media]' . $matches[1] . '[/media]', 'display', 'media' );
+									$this->cache->updateCacheWithoutSaving( '_tmp_autoparse_media', 0 );
+									
+									$txt = str_replace( $matches[0], $_result, $txt );
+									
+									$this->_mediaUrlConverted[] = $matches[1];
+									
+									continue;
+								}
+							}
+						}
+					}
+				}
+				
 				$_counter++;
 				$_storedLinks[ $_counter ]	= $matches[0];
 				
@@ -2136,6 +1956,7 @@ class class_bbcode_core
 			 */
 			//$opts = ( IPS_DOC_CHAR_SET == 'UTF-8' ) ? 'isu' : 'is';
 			$opts	= "is";
+			
 			$txt	= preg_replace_callback( '#(^|\s|\)|\(|\{|\}|>|\]|\[|href=\S)((http|https|news|ftp)://(?:[^<>\)\[\"\s]+|[a-zA-Z0-9/\._\-!&\#;,%\+\?:=]+))(</a>)?#' . $opts, array( $this, '_autoParseUrls' ), $txt );
 			
 			/* Now put back stored links */
@@ -2166,13 +1987,13 @@ class class_bbcode_core
 	/**
 	 * Does the actual bbcode replacement
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Current bbcode to parse
 	 * @param	string		[Optional] Option text
 	 * @param	string		[Optional for single tag bbcodes] Content text
 	 * @return	string		Converted text
 	 */
-	private function _bbcodeToHtml( $_bbcode, $option='', $content='' )
+	protected function _bbcodeToHtml( $_bbcode, $option='', $content='' )
 	{
 		//-----------------------------------------
 		// Strip the optional quote delimiters
@@ -2254,17 +2075,17 @@ class class_bbcode_core
 	/**
 	 * Parse escaped HTML for display
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Current text to parse
 	 * @return	string		Converted text
 	 */
-	private function _parseHtml( $txt="" )
+	protected function _parseHtml( $txt="" )
 	{
 		if ( $txt == "" )
 		{
 			return $txt;
 		}
-		
+
 		//-----------------------------------------
 		// <br>s are &lt;br&gt; at this point :)
 		//-----------------------------------------
@@ -2283,6 +2104,7 @@ class class_bbcode_core
 		$txt = str_replace( "&amp;"	, "&", $txt );
 		$txt = str_replace( "&gt;"	, ">", $txt );
 		$txt = str_replace( "&lt;"	, "<", $txt );
+		$txt = str_replace( "&#60;"	, "<", $txt );
 		$txt = str_replace( "&#62;"	, ">", $txt );
 		$txt = str_replace( "&quot;", '"', $txt );
 
@@ -2432,8 +2254,8 @@ class class_bbcode_core
 						
 						if( $_bbcode['bbcode_single_tag'] )
 						{
-							$_currentContent	= substr( $txt, $_curPosition, ($open_length + IPSText::mbstrlen($_option) + 1) );
-							$txt 				= substr_replace( $txt, $_thisTag, $_curPosition, ($open_length + IPSText::mbstrlen($_option) + 1) );
+							$_currentContent	= substr( $txt, $_curPosition, ($open_length + strlen($_option) + 1) );
+							$txt 				= substr_replace( $txt, $_thisTag, $_curPosition, ($open_length + strlen($_option) + 1) );
 						}
 						
 						//-----------------------------------------
@@ -2543,11 +2365,11 @@ class class_bbcode_core
 	/**
 	 * Callback to auto-parse urls
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Matches from the regular expression
 	 * @return	string		Converted text
 	 */
-	private function _autoParseUrls( $matches )
+	protected function _autoParseUrls( $matches )
 	{
 		$_extra		= '';
 
@@ -2579,28 +2401,36 @@ class class_bbcode_core
 			$_extra		= ',';
 		}
 		
+		if( substr( $matches[2], -15 ) == '~~~~~_____~~~~~' )
+		{
+			$matches[2]	= substr( $matches[2], 0, -15 );
+			$_extra		= '~~~~~_____~~~~~';
+		}
+		
 		/* Check for ! which is &#xx; at this point */
 		if( preg_match( '/&#\d+?;$/', $matches[2], $_m ) )
 		{
 			$matches[2]	= str_replace( $_m[0], '', $matches[2] );
 			$_extra		= $_m[0];
 		}
-				
+
 		/* Is this a media URL? */
 		if( $this->settings['bbcode_automatic_media'] and isset( $this->_bbcodes['display']['media'] ) and ( $this->_bbcodes['display']['media']['bbcode_sections'] == 'all' or in_array( $this->parsing_section, explode( ',', $this->_bbcodes['display']['media']['bbcode_sections'] ) ) ) )
 		{
 			$media		= $this->cache->getCache( 'mediatag' );
-	
-	       	if( is_array($media) AND count($media) )
+			
+			/* Already converted? */
+			if ( in_array( $matches[2], $this->_mediaUrlConverted ) )
+			{
+				return $matches[0];
+			}
+			
+	       	if ( is_array( $media ) AND count( $media ) )
 			{
 				foreach( $media as $type => $r )
 				{
-					if( preg_match( "#^" . $r['match'] . "$#is", $matches[2] ) )
+					if ( preg_match( "#^" . $r['match'] . "$#is", $matches[2] ) )
 					{
-						//-----------------------------------------
-						// Do it this way so we can capture disable_flash
-						//-----------------------------------------
-						
 						$this->cache->updateCacheWithoutSaving( '_tmp_autoparse_media', 1 );
 						$_result	= $this->parseBbcode( $matches[1] . '[media]' . $matches[2] . '[/media]' . $_extra, 'display', 'media' );
 						$this->cache->updateCacheWithoutSaving( '_tmp_autoparse_media', 0 );
@@ -2617,7 +2447,7 @@ class class_bbcode_core
 			// We're not allowed to use [url] here
 			return $matches[0];
 		}
-		
+
 		/* Ensure bbcode is stripped for the actual URL */
 		/* @link http://community.invisionpower.com/tracker/issue-22580-bbcode-breaks-link-add-bold-formatting-to-part-of-link/ */
 		if ( preg_match( '#\[\w#', $matches[2] ) )
@@ -2634,13 +2464,65 @@ class class_bbcode_core
 	}
 	
 	/**
-	 * Reset function to call to trigger "new post" for non-parsed content
+	 * Retrieve the proper emoticon image code
 	 *
-	 * @access	public
-	 * @return	void
+	 * @access	protected
+	 * @param	string		Emoticon code we are replacing (i.e. :D)
+	 * @param	string		Emoticon image to display (i.e. 'biggrin.png')
+	 * @return	string		Converted text
 	 */
-	public function resetPerPost()
+	protected function _retrieveSmiley( $_emoCode, $_emoImage )
 	{
-		$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_images', 0 );
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		if ( ! $_emoCode or ! $_emoImage )
+		{
+			return '';
+		}
+
+		$this->emoticon_count++;
+		
+		$this->emoticon_alts[] = array( "#EMO_ALT_{$this->emoticon_count}#", $_emoCode );
+		
+		//-----------------------------------------
+		// Return
+		//-----------------------------------------
+		
+		return "<img src='" . $this->settings['emoticons_url'] . "/{$_emoImage}' class='bbc_emoticon' alt='#EMO_ALT_{$this->emoticon_count}#' />";
+	}
+	
+	/**
+	 * Sort the smilies nicely in order of length.
+	 */
+	protected function _sortSmilies()
+	{
+		$emoticons = array();
+		
+		if ( ! count( $this->_sortedSmilies ) )
+		{
+			/* Sort them! */
+			$this->_sortedSmilies = $this->cache->getCache('emoticons');
+			
+			usort( $this->_sortedSmilies, array( $this, '_thisUsort' ) );
+		}	
+	}
+	
+	/**
+	 * Custom sort operation
+	 *
+	 * @param	string		A
+	 * @param	string		B
+	 * @return	integer
+	 */
+	protected static function _thisUsort($a, $b)
+	{
+		if ( strlen($a['typed']) == strlen($b['typed']) )
+		{
+			return 0;
+		}
+
+		return ( strlen($a['typed']) > strlen($b['typed']) ) ? -1 : 1;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/bbcode/custom/ccs.php b/upload/admin/sources/classes/bbcode/custom/ccs.php
new file mode 100644
index 00000000..51f258bd
--- /dev/null
+++ b/upload/admin/sources/classes/bbcode/custom/ccs.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * IP.Content custom bbcode
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$author$
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Content
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $ 
+ */
+
+if( !class_exists('bbcode_parent_class') )
+{
+	require_once( IPS_ROOT_PATH . 'sources/classes/bbcode/custom/defaults.php' );/*noLibHook*/
+}
+
+class bbcode_page extends bbcode_parent_class implements bbcodePlugin
+{
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		$this->currentBbcode	= 'page';
+		
+		parent::__construct( $registry );
+	}
+	
+	/**
+	 * Method that is run before the content is stored in the database
+	 * You are responsible for ensuring you mark the replaced text appropriately so that you
+	 *	are able to unparse it, if you wish to have bbcode parsed on save
+	 *
+	 * @access	public
+	 * @param	string		$txt	BBCode text from submission to be stored in database
+	 * @return	string				Formatted content, ready for display
+	 */
+	public function preDbParse( $txt )
+	{
+		return parent::preDbParse( $txt );
+	}
+	
+	/**
+	 * Method that is run before the content is displayed to the user
+	 * This is the safest method of parsing, as the original submitted text is left in tact.
+	 *	No markers are necessary if you use parse on display.
+	 *
+	 * @access	public
+	 * @param	string		$txt	BBCode/parsed text from database to be displayed
+	 * @return	string				Formatted content, ready for display
+	 */
+	public function preDisplayParse( $txt )
+	{
+		return parent::preDisplayParse( $txt );
+	}
+
+	/**
+	 * Do the actual replacement
+	 *
+	 * @access	protected
+	 * @param	string		$txt	Parsed text from database to be edited
+	 * @return	string				BBCode content, ready for editing
+	 */
+	protected function _replaceText( $txt )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$tag			= '[' . $this->currentBbcode . ']';
+		$_curPage		= $this->request['pg'] ? $this->request['pg'] : 1;
+		$_ttlPages		= 1;
+		$_ttlPages		+= substr_count( $txt, $tag );
+		$_requestUri	= rtrim( $_SERVER['REQUEST_URI'] ? $_SERVER['REQUEST_URI'] : @getenv('REQUEST_URI'), '/' );
+		$_reconstructed	= ( ( $_SERVER['HTTPS'] and $_SERVER['HTTPS'] != 'off' ) ? "https://" : "http://" ) . str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) . ( substr( $_requestUri, 0, 1 ) == '/' ? $_requestUri : '/' . $_requestUri );
+
+		//-----------------------------------------
+		// Get rid of existing pg= params
+		//-----------------------------------------
+		
+		$_reconstructed	= preg_replace( "/pg=(\d+)/", '', $_reconstructed );
+		
+		$_reconstructed	= rtrim($_reconstructed, '?&' );
+		
+		$_reconstructed	= str_replace( '&', '&amp;', $_reconstructed );
+		
+		//-----------------------------------------
+		// Add on the parameter separator
+		//-----------------------------------------
+		
+		if( $this->settings['url_type'] == 'query_string' )
+		{
+			if( substr_count( $_reconstructed, '?' ) > 1 )
+			{
+				$_reconstructed	.= '&amp;';
+			}
+			else
+			{
+				$_reconstructed	.= '?';
+			}
+		}
+		else
+		{
+			if( strpos( $_reconstructed, '?' ) !== false )
+			{
+				$_reconstructed	.= '&amp;';
+			}
+			else
+			{
+				$_reconstructed	.= '?';
+			}
+		}
+		
+		//-----------------------------------------
+		// If no pages, no need to have links
+		//-----------------------------------------
+		
+		if( $_ttlPages < 2 )
+		{
+			return $txt;
+		}
+		
+		//-----------------------------------------
+		// Do replacements
+		//-----------------------------------------
+
+		if( !$_curPage )
+		{
+			$txt	= substr( $txt, 0, strpos( $txt, $tag ) );
+		}
+		else
+		{
+			$bits	= explode( $tag, $txt );
+			
+			$txt	= $bits[ $_curPage - 1 ];
+		}
+		
+		//-----------------------------------------
+		// Clean up leading <br /> tags
+		//-----------------------------------------
+
+		$txt	= trim($txt);
+		
+		if( substr( $txt, 0, 15 ) == '~~~~~_____~~~~~' )
+		{
+			$txt	= substr( $txt, 15 );
+		}
+
+		//-----------------------------------------
+		// And start generating output
+		//-----------------------------------------
+		
+		$txt	.= $this->registry->output->getTemplate('ccs_global')->articlePages( $_ttlPages, $_curPage, $_reconstructed );
+
+		return $txt;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/bbcode/custom/defaults.php b/upload/admin/sources/classes/bbcode/custom/defaults.php
index e194aaad..fb4ee21f 100644
--- a/upload/admin/sources/classes/bbcode/custom/defaults.php
+++ b/upload/admin/sources/classes/bbcode/custom/defaults.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Custom bbcode plugin interfaces
- * Last Updated: $Date: 2010-11-10 07:37:19 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-09-23 09:03:29 -0400 (Fri, 23 Sep 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7127 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 9543 $ 
+ */
 
 interface bbcodePlugin
 {
@@ -53,19 +53,19 @@ interface bbcodePlugin
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode parser: default custom bbcodes: img, quote, list, size, member, media, url, snapback
- * Last Updated: $Date: 2010-11-10 07:37:19 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-09-23 09:03:29 -0400 (Fri, 23 Sep 2011) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7127 $ 
+ * @link		http://hatynka.in
+ * @version		$Rev: 9543 $ 
  *
- **/
+ */
 
 class bbcode_parent_class
 {
@@ -156,6 +156,7 @@ class bbcode_parent_class
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -164,6 +165,7 @@ class bbcode_parent_class
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Core bbcode class
@@ -187,31 +189,26 @@ class bbcode_parent_class
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
 		/* Make object */
-		$this->registry	= $registry;
-		$this->DB		= $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang		= $this->registry->getClass('class_localization');
-		$this->member	= $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache	= $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
+		$this->registry		= $registry;
+		$this->DB			= $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->lang			= $this->registry->getClass('class_localization');
+		$this->member		= $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		= $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
 		
-		$this->_parentBBcode	= $_parent;
+		$this->_parentBBcode = $_parent;
 		
-		foreach( $this->cache->getCache('bbcode') as $bbcode )
-		{
-			if( $bbcode['bbcode_tag'] == $this->currentBbcode )
-			{
-				$this->_bbcode = $bbcode;
-				break;
-			}
-		}
+		/* Retrieve bbcode data */
+		$bbcodeCache	= $this->cache->getCache('bbcode');
+		$this->_bbcode	= $bbcodeCache[ $this->currentBbcode ];
 	}
 	
 	/**
@@ -295,6 +292,144 @@ class bbcode_parent_class
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
+class bbcode_sharedmedia extends bbcode_parent_class implements bbcodePlugin
+{
+	/**
+	 * Store plugins we've instantiated
+	 *
+	 * @var		array
+	 */
+	protected $plugins		= array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param	object		Registry object
+	 * @param	object		Parent bbcode class
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry, $_parent=null )
+	{
+		$this->currentBbcode	= 'sharedmedia';
+
+		parent::__construct( $registry, $_parent );
+	}
+
+	/**
+	 * We use preDbParse to verify you have permission to share the items you are sharing
+	 *
+	 * @access	public
+	 * @param	string		$txt	BBCode text from submission to be stored in database
+	 * @return	string				Formatted content, ready for display
+	 */
+	public function preDbParse( $txt )
+	{
+		$_ignored	= preg_replace_callback( '#(\[sharedmedia=(.+?):(.+?):(.+?)\])#is' , array( $this, '_checkPostingPermissions' ), $txt );
+
+		return $txt;
+	}
+	
+	/**
+	 * We use this to check for permissions
+	 *
+	 * @param	array 		preg_replace_callback Matches
+	 * @return	@e string
+	 */
+	protected function _checkPostingPermissions( $matches )
+	{
+		$txt	= trim( $matches[1] );
+		$app	= trim( $matches[2] );
+		$plugin	= trim( $matches[3] );
+		
+		if( !$txt OR !$app OR !$plugin )
+		{
+			return '';
+		}
+		
+		if( !isset($this->plugins[ $app ][ $plugin ]) )
+		{
+			if( is_file( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php' ) )
+			{
+				$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php', 'plugin_' . $app . '_' . $plugin, $app );
+
+				$this->plugins[ $app ][ $plugin ]		= new $classToLoad( $this->registry );
+				
+			}
+		}
+		
+		if( isset($this->plugins[ $app ][ $plugin ]) )
+		{
+			if( $error = $this->plugins[ $app ][ $plugin ]->checkPostPermission( $matches[4] ) )
+			{
+				$this->error	= $error;
+			}
+		}
+
+		//-----------------------------------------
+		// Return the original output (we aren't replacing, just verifying permissions)
+		//-----------------------------------------
+		
+		return $txt;
+	}
+	
+	/**
+	 * Do the actual replacement
+	 *
+	 * @param	string		$txt	Parsed text from database to be edited
+	 * @return	@e string
+	 */
+	protected function _replaceText( $txt )
+	{
+		$txt	= preg_replace_callback( '#(\[sharedmedia=(.+?):(.+?):(.+?)\])#is' , array( $this, '_parseMedia' ), $txt );
+
+		return $txt;
+	}
+
+	/**
+	 * Callback for shared media preg_replace call
+	 *
+	 * @param	array 		preg_replace_callback Matches
+	 * @return	@e string
+	 */
+	protected function _parseMedia( $matches )
+	{
+		$txt	= trim( $matches[1] );
+		$app	= trim( $matches[2] );
+		$plugin	= trim( $matches[3] );
+		$_orig	= $txt;
+		
+		if( !$txt OR !$app OR !$plugin )
+		{
+			return '';
+		}
+		
+		if( !isset($this->plugins[ $app ][ $plugin ]) )
+		{
+			if( is_file( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php' ) )
+			{
+				$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/sharedmedia/plugin_' . $plugin . '.php', 'plugin_' . $app . '_' . $plugin, $app );
+
+				$this->plugins[ $app ][ $plugin ]		= new $classToLoad( $this->registry );
+				
+			}
+		}
+		
+		if( isset($this->plugins[ $app ][ $plugin ]) )
+		{
+			$txt			= $this->plugins[ $app ][ $plugin ]->getOutput( $matches[4] );
+		}
+
+		//-----------------------------------------
+		// Return the replaced output
+		//-----------------------------------------
+		
+		return $txt;
+	}
+}
+
+//----------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------
+
 class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 {
 	/**
@@ -303,7 +438,7 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -311,34 +446,6 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 		
 		parent::__construct( $registry, $_parent );
 	}
-	
-	/**
-	 * Method that is run before the content is stored in the database
-	 * You are responsible for ensuring you mark the replaced text appropriately so that you
-	 *	are able to unparse it, if you wish to have bbcode parsed on save
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode text from submission to be stored in database
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDbParse( $txt )
-	{
-		return parent::preDbParse( $txt );
-	}
-	
-	/**
-	 * Method that is run before the content is displayed to the user
-	 * This is the safest method of parsing, as the original submitted text is left in tact.
-	 *	No markers are necessary if you use parse on display.
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode/parsed text from database to be displayed
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDisplayParse( $txt )
-	{
-		return parent::preDisplayParse( $txt );
-	}
 
 	/**
 	 * Do the actual replacement
@@ -349,11 +456,6 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 	 */
 	protected function _replaceText( $txt )
 	{
-		if ( !$this->settings['allow_images'] )
-		{
-			return $txt;
-		}
-
 		$_tags = $this->_retrieveTags();
 
 		foreach( $_tags as $_tag )
@@ -365,17 +467,6 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 			$open_tag	= '[' . $_tag . ']';
 			$close_tag	= '[/' . $_tag . ']';
 			
-			//-----------------------------------------
-			// Member not viewing images?
-			//-----------------------------------------
-			
-			if( !$this->memberData[ 'view_img' ] )
-			{
-				$txt = str_replace( $open_tag, '', $txt );
-				$txt = str_replace( $close_tag, '', $txt );
-				continue;
-			}
-			
 			//-----------------------------------------
 			// Infinite loop catcher
 			//-----------------------------------------
@@ -461,28 +552,28 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 				}
 			}
 		}
-
+		
 		return $txt;
 	}
 	
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		$content	Image URL to link to
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $content )
+	protected function _buildOutput( $content )
 	{
 		$content	= trim($content);
 		
 		//-----------------------------------------
 		// Too many images?
 		//-----------------------------------------
-
+		
 		$existing	= $this->cache->getCache('_tmp_bbcode_images');
 		$existing	= intval($existing) + 1;
-
+		
 		if ( $this->settings['max_images'] AND $this->caches['_tmp_section'] != 'signatures' )
 		{
 			if ($existing > $this->settings['max_images'])
@@ -509,32 +600,13 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 			
 			foreach( $_tags as $tag )
 			{
-				if( stripos( $content, '[' . $tag ) !== false )
+				if ( stripos( $content, '[' . $tag ) !== false )
 				{
 					return $content;
 				}
 			}
 		}
 		
-		//-----------------------------------------
-		// Dynamic image?
-		// We removed this setting - no longer used
-		//-----------------------------------------
-		
-		/*if( !$this->settings['allow_dynamic_img'] )
-		{
-			$dynamic		= array( '?', '&' );
-			
-			foreach( $dynamic as $indicator )
-			{
-				if( strpos( $content, $indicator ) !== false )
-				{
-					$this->error = 'no_dynamic';
-					return $content;
-				}
-			}
-		}*/
-		
 		//-----------------------------------------
 		// Allowed type?
 		//-----------------------------------------
@@ -611,7 +683,7 @@ class bbcode_img extends bbcode_parent_class implements bbcodePlugin
 			}
 		}
 			
-		return "<img src='{$content}' alt='{$this->lang->words['bbcode_img_alt']}' class='bbc_img' />";
+		return "<span rel='lightbox'><img src='" . IPSText::xssMakeJavascriptSafe( $content ) . "' alt='{$this->lang->words['bbcode_img_alt']}' class='bbc_img' /></span>";
 	}
 }
 
@@ -637,7 +709,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -646,34 +718,6 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		parent::__construct( $registry, $_parent );
 	}
 	
-	/**
-	 * Method that is run before the content is stored in the database
-	 * You are responsible for ensuring you mark the replaced text appropriately so that you
-	 *	are able to unparse it, if you wish to have bbcode parsed on save
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode text from submission to be stored in database
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDbParse( $txt )
-	{
-		return parent::preDbParse( $txt );
-	}
-	
-	/**
-	 * Method that is run before the content is displayed to the user
-	 * This is the safest method of parsing, as the original submitted text is left in tact.
-	 *	No markers are necessary if you use parse on display.
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode/parsed text from database to be displayed
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDisplayParse( $txt )
-	{
-		return parent::preDisplayParse( $txt );
-	}
-	
 	/**
 	 * Do the actual replacement
 	 *
@@ -683,19 +727,29 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 	 */
 	protected function _replaceText( $txt )
 	{
+		/* Clean up some dickery */
+		$txt = preg_replace( '#\[quote([^\]]+?)?\]\](\s+?)?\[/url\](\s+?)?\[/quote\]#si', '', $txt );
+		
+		$orig	= $txt;
 		$txt	= preg_replace_callback( '#(\[quote([^\]]+?)?\].*\[/quote\])#is' , array( $this, '_parseQuote' ), $txt );
 
+		if( stripos( $txt, '[quote' ) !== false OR stripos( $txt, '[/quote]' ) !== false )
+		{
+			$this->error = 'quote_mismatch';
+			return $orig;
+		}
+
 		return $txt;
 	}
 	
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array 		$options	[Optional] Quote options
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $options=array() )
+	protected function _buildOutput( $options=array() )
 	{
 		//-----------------------------------------
 		// Build output and return it
@@ -746,9 +800,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		}
 		
 		$output .= "</p>";
-		$output .= '<div class="blockquote"';
-
-		$output .= '>';
+		$output .= '<div class="blockquote">';
 		$output .= "<div class='quote'>";
 		
 		if ( substr_count( $output, '<p' ) != substr_count( $output, '</p' ) )
@@ -770,8 +822,8 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 	{
 		$txt	= trim( $matches[1] );
 		$_orig	= $txt;
-		
-		if( !$txt )
+
+		if ( ! $txt )
 		{
 			return '';
 		}
@@ -797,21 +849,23 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Fix char 173
 		//-----------------------------------------
 		
-		$txt	= str_replace( chr(173).']', '&#93;', $txt );
+		// This breaks Chinese and probably other MB languages
+		// http://community.invisionpower.com/tracker/issue-26289-multibyte-issue-with-quotes
+		//$txt	= str_replace( chr(173).']', '&#93;', $txt );
 	
 		//-----------------------------------------
 		// Trim the quote content
 		//-----------------------------------------
 		
-		$txt	= preg_replace_callback( "#\[quote([^\]]+?)?\](.+?)\[/quote\]#si", array( $this, '_trimQuote' ), $txt );
+		$txt	= preg_replace_callback( '#\[quote([^\]]+?)?\](.+?)\[/quote\]#si', array( $this, '_trimQuote' ), $txt );
 		
 		//-----------------------------------------
 		// Clean usernames with brackets and quotes
 		//-----------------------------------------
-		
-		$txt	= preg_replace_callback( "#(name=(?:&\#39;|&quot;|'|\"))(.+?)(&\#39;|&quot;|'|\")#si", array( $this, '_makeQuoteSafe' ), $txt );
-		$txt	= preg_replace_callback( "#name=(&\#39;|&quot;|'|\")(.+?)(\\1)(?:\s?(post|date|timestamp)=)?#si", array( $this, '_makeNameSafe' ), $txt );
-		
+
+		$txt	= preg_replace_callback( '#(name=(?:&\#39;|&quot;|\'|\"))(.+?)(&\#39;|&quot;|\'|\")#si', array( $this, '_makeQuoteSafe' ), $txt );
+		$txt	= preg_replace_callback( '#name=(&\#39;|&quot;|\'|\")(.+?)\]#si', array( $this, '_makeNameSafe' ), $txt );
+
 		//-----------------------------------------
 		// Replace out end tag
 		//-----------------------------------------
@@ -822,13 +876,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Replace the quote tag
 		//-----------------------------------------
 
-		$txt	= preg_replace_callback( "#\[quote([^\]]+?)?\]#i", array( $this, '_replaceQuoteTag' ), $txt );
-		
-		if ( substr_count( $txt, '<div' ) != substr_count( $txt, '</div' ) )
-		{
-			$this->error = 'quote_mismatch';
-			return $_orig;
-		}
+		$txt	= preg_replace_callback( '#\[quote([^\]]+?)?\]#i', array( $this, '_replaceQuoteTag' ), $txt );
 		
 		//-----------------------------------------
 		// Newlines
@@ -853,7 +901,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 
 		foreach( $_outerMatches[1] as $_outerMatch )
 		{
-			preg_match_all( "#\[attachment=(.+?):(.+?)\]#", $_outerMatch, $_matches );
+			preg_match_all( '#\[attachment=(.+?):(.+?)\]#', $_outerMatch, $_matches );
 
 		if( is_array( $_matches[1] ) && count( $_matches[1] ) )
 		{
@@ -868,7 +916,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// If open and close tags match, we're good.
 		// Otherwise, return an error.
 		//-----------------------------------------
-		
+
 		if ( ( $this->quote_open == $this->quote_closed ) and ( $this->quote_error == 0 ) )
 		{
 			return $txt;
@@ -944,19 +992,41 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 	 * @access	protected
 	 * @param	array 		preg_replace_callback Matches
 	 * @return	string		Output
+	 * @note	This looks complicated (and is somewhat) but it's done this way to try to quote correctly users with ' in their names
+	 * @link 	http://community.invisionpower.com/tracker/issue-18588-bbcode-mistake-when-quoting-users-with-a-in-their-name
 	 */
 	protected function _makeNameSafe( $matches )
 	{
 		$quote	= $matches[1];
 		$name	= $matches[2];
-		$next	= $matches[4];
+		$next	= '';
+
+		if( strpos( $name, 'post=' ) !== false )
+		{
+			$next	= substr( $name, strpos( $name, 'post=' ) );
+			$name	= substr( $name, 0, strpos( $name, 'post=' ) -1 );
+		}
+
+		if( strpos( $name, 'date=' ) !== false )
+		{
+			$next	= $next . ' ' . substr( $name, strpos( $name, 'date=' ) );
+			$name	= substr( $name, 0, strpos( $name, 'date=' ) -1 );
+		}
+
+		if( strpos( $name, 'timestamp=' ) !== false )
+		{
+			$next	= $next . ' ' . substr( $name, strpos( $name, 'timestamp=' ) );
+			$name	= substr( $name, 0, strpos( $name, 'timestamp=' ) -1 );
+		}
+		
+		$name	= substr( $name, 0, -(strlen($quote)) );
 
 		# Squeeze past the parser...
-		$name  = str_replace( '&#39;', "&#0039;", $name );
+		$name  = str_replace( array( '&#39;', "'" ), "&#0039;", $name );
 		
-		$_last	= $next ? ' ' . $next . '=' : '';
+		$_last	= $next ? ' ' . $next : '';
 		
-		return 'name=' . $quote . IPSText::getTextClass('bbcode')->xssHtmlClean( IPSText::getTextClass('bbcode')->stripAllTags( IPSText::stripUrls( $name ) ) ) . $quote . $_last; 
+		return 'name=' . $quote . IPSText::getTextClass('bbcode')->xssHtmlClean( IPSText::getTextClass('bbcode')->stripAllTags( IPSText::stripUrls( $name ) ) ) . $quote . $_last . ']'; 
 	}
 
 	/**
@@ -988,7 +1058,7 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Post?
 		//-----------------------------------------
 		
-		preg_match( "#post=([\"']|&quot;|&\#039;|&\#39;)?(\d+)(\\1)?#", $extra, $match );
+		preg_match( '#post=([\"\']|&quot;|&\#039;|&\#39;)?(\d+)(\\1)?#', $extra, $match );
 		
 		if ( isset($match[2]) AND intval( $match[2] ) )
 		{
@@ -999,9 +1069,9 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Name?
 		//-----------------------------------------
 		
-		preg_match( "#name=([\"']|&quot;|&\#039;|&\#39;)(.*?)(\\1)\s?(date|post)?#is", $extra, $match );
+		preg_match( '#name=([\"\']|&quot;|&\#039;|&\#39;)(.*?)(\\1)\s?(date|post)?#is', $extra, $match );
 
-		if ( isset($match[2]) AND $match[2] )
+		if ( !empty($match[2]) )
 		{
 			$name = $match[2] ? $this->_makeQuoteSafe( array( 2 => $match[2] ) ) : '-';
 		}
@@ -1010,9 +1080,9 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Date?
 		//-----------------------------------------
 		
-		preg_match( "#date=([\"']|&quot;|&\#039;|&\#39;)(.*?)(\\1)#", $extra, $match );
+		preg_match( '#date=([\"\']|&quot;|&\#039;|&\#39;)(.*?)(\\1)#', $extra, $match );
 		
-		if ( isset($match[2]) AND $match[2] )
+		if ( !empty($match[2]) )
 		{
 			$date = $this->_makeQuoteSafe( array( 2 => $match[2] ) );
 		}
@@ -1021,9 +1091,9 @@ class bbcode_quote extends bbcode_parent_class implements bbcodePlugin
 		// Timestamp?
 		//-----------------------------------------
 		
-		preg_match( "#timestamp=([\"']|&quot;|&\#039;|&\#39;)(.*?)(\\1)#", $extra, $match );
+		preg_match( '#timestamp=([\"\']|&quot;|&\#039;|&\#39;)(.*?)(\\1)#', $extra, $match );
 		
-		if ( isset($match[2]) AND $match[2] )
+		if ( !empty($match[2]) )
 		{
 			$timestamp	= intval( $match[2] );
 		}
@@ -1043,7 +1113,7 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -1065,6 +1135,8 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 	{
 		$_tags = $this->_retrieveTags();
 
+		$txt = preg_replace( '#\[/list\](\s+?)?<br />#is', "[/list]", $txt );
+		
 		foreach( $_tags as $_tag )
 		{
 			while( preg_match( "#\n?\[{$_tag}(.*?)\](.+?)\[/{$_tag}\]\n?#is" , $txt, $matches ) )
@@ -1084,11 +1156,11 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		$matches	Array of regex matches
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $matches=array() )
+	protected function _buildOutput( $matches=array() )
 	{
 		//-----------------------------------------
 		// Make sure we have at least one list item
@@ -1124,7 +1196,7 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 			$txt	= $matches[3];
 			$lnl	= $matches[4];
 		}
-
+		
 		if ( !$txt )
 		{
 			return;
@@ -1140,7 +1212,7 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 
 		$return	= '';
 
-		if ( !$type )
+		if ( ! $type )
 		{
 			$return	= $fnl . "<ul class='bbc'>" . $this->_listItem($txt) . "</ul>" . $lnl;
 		}
@@ -1178,7 +1250,7 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 		}
 		
 		/* Need to remove any extra closing <li> tags. bug #20327 */
-		$return = preg_replace( "/<ul class='(.+?)'>~~~~~_____~~~~~<\/li>/", "<ul class='\\1'>~~~~~_____~~~~~", $return );
+		$return = preg_replace( '/<ul class=\'(.+?)\'>~~~~~_____~~~~~<\/li>/', "<ul class='\\1'>~~~~~_____~~~~~", $return );
 
 		return $return;
 	}
@@ -1186,13 +1258,13 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build a list item
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		$txt	Text
 	 * @return	string		List item
 	 */
-	private function _listItem( $txt )
+	protected function _listItem( $txt )
 	{
-		$txt = preg_replace( "#\[\*\]#"		, "</li><li>"	, trim($txt) );
+		$txt = preg_replace( '#\[\*\]#'		, "</li><li>"	, trim($txt) );
 		$txt = preg_replace( "#^</?li>#"	, ""			, $txt );
 		
 		return str_replace( "\n</li>", "</li>", nl2br($txt) . "</li>" );
@@ -1202,6 +1274,154 @@ class bbcode_list extends bbcode_parent_class implements bbcodePlugin
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
+class bbcode_indent extends bbcode_parent_class implements bbcodePlugin
+{
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	object		Registry object
+	 * @param	object		Parent bbcode class
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry, $_parent=null )
+	{
+		$this->currentBbcode	= 'indent';
+		
+		parent::__construct( $registry, $_parent );
+	}
+
+	/**
+	 * Do the actual replacement
+	 *
+	 * @access	protected
+	 * @param	string		$txt	Parsed text from database to be edited
+	 * @return	string				BBCode content, ready for editing
+	 */
+	protected function _replaceText( $txt )
+	{
+		$_tags = $this->_retrieveTags();
+
+		foreach( $_tags as $_tag )
+		{
+			//-----------------------------------------
+			// Infinite loop catcher
+			//-----------------------------------------
+			
+			$_iteration	= 0;
+			
+			//-----------------------------------------
+			// Start building open tag
+			//-----------------------------------------
+			
+			$open_tag = '[' . $_tag . '=';
+	
+			//-----------------------------------------
+			// Doz I can haz opin tag? Loopy loo
+			//-----------------------------------------
+			
+			while( ( $this->cur_pos = stripos( $txt, $open_tag, $this->cur_pos ) ) !== false )
+			{
+				//-----------------------------------------
+				// Stop infinite loops
+				//-----------------------------------------
+				
+				if( $_iteration > $this->settings['max_bbcodes_per_post'] )
+				{
+					break;
+				}
+				
+				$_iteration++;
+
+				//-----------------------------------------
+				// Grab the new position to jump to
+				//-----------------------------------------
+				
+				$new_pos = strpos( $txt, ']', $this->cur_pos ) ? strpos( $txt, ']', $this->cur_pos ) : $this->cur_pos + 1;
+
+				//-----------------------------------------
+				// Extract the option (like surgery)
+				//-----------------------------------------
+	
+				$_content	= '';
+				$_option	= substr( $txt, $this->cur_pos + strlen($open_tag), (strpos( $txt, ']', $this->cur_pos ) - ($this->cur_pos + strlen($open_tag))) );
+	
+				$close_tag	= '[/' . $_tag . ']';
+				
+				//-----------------------------------------
+				// Protect against XSS
+				//-----------------------------------------
+				
+				$_option = intval($_option);
+				$_option = ( $_option ) ? $_option : 1;
+			
+				//-----------------------------------------
+				// No closing tag
+				//-----------------------------------------
+				
+				if ( $_option !== false AND stripos( $txt, $close_tag, $new_pos ) !== false )
+				{
+					$_content	= substr( $txt, ($this->cur_pos + strlen($open_tag) + strlen($_option) + 1), (stripos( $txt, $close_tag, $this->cur_pos ) - ($this->cur_pos + strlen($open_tag) + strlen($_option) + 1)) );
+		
+					//-----------------------------------------
+					// If this is a single tag, that's it
+					//-----------------------------------------
+
+					if( preg_match( '/\S/', $_content ) ) /* Make sure we don't miss this, if there's only a 0 for the content. Bug #21610 */
+					{
+						$txt = substr_replace( $txt, $this->_buildOutput( $_option, $_content ), $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
+					}
+					else
+					{
+						$txt = substr_replace( $txt, '', $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
+					}
+				}
+				
+				//-----------------------------------------
+				// And reset current position to end of open tag
+				//-----------------------------------------
+
+				$this->cur_pos = stripos( $txt, $open_tag ) ? stripos( $txt, $open_tag ) : $this->cur_pos + 1; //$new_pos;
+
+				if( $this->cur_pos > strlen($txt) )
+				{
+					//-----------------------------------------
+					// Need to reset for next "tag"
+					//-----------------------------------------
+					
+					$this->cur_pos	= 0;
+					break;
+				}
+			}
+		}
+
+		return $txt;
+	}
+	
+	/**
+	 * Build the actual output to show
+	 *
+	 * @access	protected
+	 * @param	integer		$option		Font size
+	 * @param	string		$content	Text
+	 * @return	string					Content to replace bbcode with
+	 */
+	protected function _buildOutput( $option, $content )
+	{
+		//-----------------------------------------
+		// Strip the optional quote delimiters
+		//-----------------------------------------
+
+		$option			= intval( $option );
+		$size 			= $option * 40;
+		$content        = trim( $content );
+		
+		return "<p class='bbc_indent' style='margin-left: " . $size . "px;'>{$content}</p>";
+	}
+}
+//----------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------
+
 class bbcode_size extends bbcode_parent_class implements bbcodePlugin
 {
 	/**
@@ -1210,13 +1430,14 @@ class bbcode_size extends bbcode_parent_class implements bbcodePlugin
 	 * @access	protected
 	 * @var		array
 	 */	
-	protected $font_sizes			= array( 1 => '9',
-											 2 => '13',
-											 3 => '15',
-											 4 => '17',
-											 5 => '21',
-											 6 => '26',
-											 7 => '36' );
+	protected $font_sizes     = array( 1 => 8,
+									   2 => 10,
+									   3 => 12,
+									   4 => 14,
+									   5 => 18,
+									   6 => 24,
+									   7 => 36,
+									   8 => 48 );
 
 	/**
 	 * Constructor
@@ -1224,7 +1445,7 @@ class bbcode_size extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -1351,12 +1572,12 @@ class bbcode_size extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$option		Font size
 	 * @param	string		$content	Text
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $option, $content )
+	protected function _buildOutput( $option, $content )
 	{
 		//-----------------------------------------
 		// Strip the optional quote delimiters
@@ -1365,8 +1586,10 @@ class bbcode_size extends bbcode_parent_class implements bbcodePlugin
 		$option			= trim( $option, '"' . "'" );
 		$option			= str_replace( '&quot;', '', $option );
 		$option			= str_replace( '&#39;', '', $option );
-
-		return "<span style='font-size: " . $this->font_sizes[ $option ] . "px;'>{$content}</span>";
+		
+		$size 			= $this->font_sizes[ $option ];
+		
+		return "<span style='font-size: " . $size . "px;'>{$content}</span>";
 	}
 }
 
@@ -1381,7 +1604,7 @@ class bbcode_snapback extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -1482,11 +1705,11 @@ class bbcode_snapback extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		$content	Snapback ID
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $content )
+	protected function _buildOutput( $content )
 	{
 		//-----------------------------------------
 		// Prevent XSS in URL
@@ -1514,7 +1737,7 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -1596,9 +1819,9 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 					$_option	= substr( $_option, 6 );
 				}
 				
-				if( substr( $_option, 0, -1 ) == "'" OR substr( $_option, 0, -1 ) == '"' )
+				if( substr( $_option, -1 ) == "'" OR substr( $_option, -1 ) == '"' )
 				{
-					$_option	= substr( $_option, -1 );
+					$_option	= substr( $_option, 0, -1 );
 				}
 				
 				if( substr( $_option, -5, 5 ) == "&#39;" )
@@ -1611,7 +1834,7 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 					$_option	= substr( $_option, 0, -6 );
 				}
 
-				$existing	= $this->cache->getCache('_tmp_bbcode_members');
+				$existing	= $this->cache->getCache( '_tmp_bbcode_members', false );
 				$existing	= is_array($existing) ? $existing : array();
 	
 				if( isset($existing[ $_option ]) )
@@ -1621,12 +1844,12 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 				else
 				{
 					$member = IPSMember::load( $_option, 'core', 'displayname' );
-	
+
+					$existing[ $_option ]	= array( 'member_id' => $member['member_id'], 'members_display_name' => $member['members_display_name'], 'members_seo_name' => $member['members_seo_name'] );
+					$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_members', $existing );
+
 					if( $member['members_display_name'] )
-					{
-						$existing[ $_option ]	= array( 'member_id' => $member['member_id'], 'members_display_name' => $member['members_display_name'], 'members_seo_name' => $member['members_seo_name'] );
-						$this->cache->updateCacheWithoutSaving( '_tmp_bbcode_members', $existing );
-						
+					{	
 						$_content = $this->_buildOutput( $existing[ $_option ] );
 					}
 				}
@@ -1637,11 +1860,11 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 				
 				if( $_content )
 				{
-					$txt = substr_replace( $txt, $_content, $this->cur_pos, (strlen($open_tag) + $_length + 1) );
+					$txt	= substr_replace( $txt, $_content, $this->cur_pos, (strlen($open_tag) + $_length + 1) );
 				}
 				else
 				{
-					$txt		= substr_replace( $txt, '', $this->cur_pos, (strlen($open_tag) + $_length + 1) );
+					$txt	= substr_replace( $txt, '', $this->cur_pos, (strlen($open_tag) + $_length + 1) );
 				}
 				
 				//-----------------------------------------
@@ -1668,13 +1891,13 @@ class bbcode_member extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		$member	Member id and display name
 	 * @return	string				Content to replace bbcode with
 	 */
-	private function _buildOutput( $member )
+	protected function _buildOutput( $member )
 	{
-		return "<a href='" . $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . "' class='bbc_member __user __id{$member['member_id']}' title='{$this->lang->words['bbc_member_bbcode']}'>{$member['members_display_name']}</a>";
+		return "<a href='" . $this->registry->output->buildSEOUrl( 'showuser=' . $member['member_id'], 'public', $member['members_seo_name'], 'showuser' ) . "' class='bbc_member _hovertrigger url fn' hovercard-ref='member' hovercard-id='{$member['member_id']}' title='{$this->lang->words['bbc_member_bbcode']}'>{$member['members_display_name']}</a>";
 	}
 }
 
@@ -1689,7 +1912,7 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -1697,34 +1920,6 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 		
 		parent::__construct( $registry, $_parent );
 	}
-	
-	/**
-	 * Method that is run before the content is stored in the database
-	 * You are responsible for ensuring you mark the replaced text appropriately so that you
-	 *	are able to unparse it, if you wish to have bbcode parsed on save
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode text from submission to be stored in database
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDbParse( $txt )
-	{
-		return parent::preDbParse( $txt );
-	}
-	
-	/**
-	 * Method that is run before the content is displayed to the user
-	 * This is the safest method of parsing, as the original submitted text is left in tact.
-	 *	No markers are necessary if you use parse on display.
-	 *
-	 * @access	public
-	 * @param	string		$txt	BBCode/parsed text from database to be displayed
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function preDisplayParse( $txt )
-	{
-		return parent::preDisplayParse( $txt );
-	}
 
 	/**
 	 * Do the actual replacement
@@ -1848,9 +2043,9 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 				
 				$_content	= substr( $txt, ($this->cur_pos + $open_length + strlen($_option) + 1), (stripos( $txt, $close_tag, $this->cur_pos ) - ($this->cur_pos + $open_length + strlen($_option) + 1)) );
 				
-				if( strpos( $_content, "<a " ) !== false )
+				if ( strpos( $_content, "<a " ) !== false )
 				{
-					$_content = preg_replace( "/\<a href=['\"](.+?)[\"'].*\>(.+?)\<\/a\>/i", "\\1", $_content );
+					$_content = preg_replace( '/\<a href=[\'\"](.+?)[\"\'].*\>(.+?)\<\/a\>/i', "\\1", $_content );
 				}
 
 				/* Make sure we've not embedded [media] */
@@ -1859,26 +2054,17 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 					return $txt;
 				}
 				
-				if ( $this->settings['disable_flash'] && stristr( $txt, '.swf' ) )
-				{
-					/* More thorough check */
-					if ( preg_match( '#\.swf(?:&|%|$|<|\[)#', $txt ) )
-					{
-						return $txt;
-					}
-				}
-				
 				//-----------------------------------------
 				// If this is a single tag, that's it
 				//-----------------------------------------
 				
 				if( $_content )
 				{
-					$txt = substr_replace( $txt, $this->_buildOutput( $_content, $_option ? $_option : '' ), $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
+					$txt	= substr_replace( $txt, $this->_buildOutput( $_content, $_option ? $_option : '' ), $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
 				}
 				else
 				{
-					$txt		= substr_replace( $txt, '', $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
+					$txt	= substr_replace( $txt, '', $this->cur_pos, (stripos( $txt, $close_tag, $this->cur_pos ) + strlen($close_tag) - $this->cur_pos) );
 				}
 				
 				//-----------------------------------------
@@ -1905,12 +2091,12 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		$content	Image URL to link to
 	 * @param	string		$option		[Optional] Dimension options (width,height)
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $content, $option='' )
+	protected function _buildOutput( $content, $option='' )
 	{
 		//-----------------------------------------
 		// Too many media files?
@@ -1921,7 +2107,7 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 
 		if ( $this->settings['max_media_files'] )
 		{
-			if ($existing > $this->settings['max_media_files'])
+			if ( $existing > $this->settings['max_media_files'] )
 			{
 				$this->error = 'too_many_media';
 				return $content;
@@ -1934,34 +2120,11 @@ class bbcode_media extends bbcode_parent_class implements bbcodePlugin
 		// XSS check
 		//-----------------------------------------
 		
-		if( !IPSText::xssCheckUrl( $content ) )
+		if ( ! IPSText::xssCheckUrl( $content ) )
 		{
 			return $content;
 		}
 
-		//-----------------------------------------
-		// Flash disallowed?
-		//-----------------------------------------
-		
-		if ( $this->settings['disable_flash'] )
-		{
-			$path	= @parse_url( html_entity_decode( $content ), PHP_URL_PATH );
-			$pieces	= explode( '.', $path );
-			$ext	= array_pop( $pieces );
-			$ext	= mb_strtolower( $ext );
-
-			if( $ext == 'swf' )
-			{
-				if( $this->cache->getCache('_tmp_autoparse_media') )
-				{
-					return $this->_parentBBcode->parseBbcode( '[url]' . $content . '[/url]', 'display', 'url' );
-				}
-
-				$this->error = 'flash_not_allowed';
-				return $content;
-			}
-		}
-		
 		//-----------------------------------------
 		// Loop through media tags and extract
 		//-----------------------------------------
@@ -2034,7 +2197,7 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 	 * @access	public
 	 * @param	object		Registry object
 	 * @param	object		Parent bbcode class
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $_parent=null )
 	{
@@ -2277,12 +2440,12 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 	/**
 	 * Build the actual output to show
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		$content	Display text
 	 * @param	string		$option		URL to link to
 	 * @return	string					Content to replace bbcode with
 	 */
-	private function _buildOutput( $content, $option )
+	protected function _buildOutput( $content, $option )
 	{
 		// This is problematic if url contains a ' or "
 		// $option = str_replace( array( '"', "'", '&#39;', '&quot;' ), '', $option );
@@ -2335,7 +2498,7 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 		}
 		
 		/* Check for mangled or embedded URLs */
-		if ( stristr( $option, '[url' )  OR stristr( $option, '[/url' ) OR stristr( $content, '[url' )  OR stristr( $content, '[/url' ) )
+		if ( stristr( $option, '[quote' )  OR stristr( $option, '[url' )  OR stristr( $option, '[/url' ) OR stristr( $content, '[url' )  OR stristr( $content, '[/url' ) )
 		{
 			return $content;
 		}
@@ -2390,7 +2553,7 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 						}
 
 						$my_url = preg_quote( $my_url, '/' );
-						$my_url = str_replace( "\*", "(.*?)", $my_url );
+						$my_url = str_replace( '\*', "(.*?)", $my_url );
 
 						if ( $list_type == "blacklist" )
 						{
@@ -2422,7 +2585,7 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 		// Let's remove any nested links..
 		//-----------------------------------------
 
-		$content = preg_replace( "/<a href='(.+?)'(.*?)>(.+?)<\/a>/is", "\\3", $content );
+		$content = preg_replace( '/<a href=\'(.+?)\'(.*?)>(.+?)<\/a>/is', "\\3", $content );
 
 		//-----------------------------------------
 		// Need to "truncate" the "content" to ~35
@@ -2442,24 +2605,28 @@ class bbcode_url extends bbcode_parent_class implements bbcodePlugin
 		$rel	= '';
 		$_title = '';
 		
-		if( $this->settings['posts_add_nofollow'] )
+		/* Fetch actual host for better matching */
+		$data = parse_url( $option );
+		
+		if ( $this->settings['posts_add_nofollow'] )
 		{
-			if ( ! stristr( $option, $_SERVER['HTTP_HOST'] ) )
+			if ( ! stristr( $data['host'], $_SERVER['HTTP_HOST'] ) )
 			{
 				$rels[]	= "nofollow";
 			}
 		}
 		
-		if( $this->settings['links_external'] )
-		{
-			if ( ! stristr( $option, $_SERVER['HTTP_HOST'] ) )
-			{
+		if ( $this->settings['links_external'] )
+		{ 
+			if ( ! stristr( $data['host'], $_SERVER['HTTP_HOST'] ) )
+			{ 
+				/* Look a little closer */
 				$rels[]	= "external";
 				$_title = $this->lang->words['bbc_external_link'];
 			}
 		}
 	
-		if( count($rels) )
+		if ( count($rels) )
 		{
 			$rel = " rel='" . implode( ' ', $rels ) . "'";
 		}
diff --git a/upload/admin/sources/classes/bbcode/custom/index.html b/upload/admin/sources/classes/bbcode/custom/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/bbcode/custom/index.html
+++ b/upload/admin/sources/classes/bbcode/custom/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/bbcode/index.html b/upload/admin/sources/classes/bbcode/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/bbcode/index.html
+++ b/upload/admin/sources/classes/bbcode/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/bbcode/legacy.php b/upload/admin/sources/classes/bbcode/legacy.php
index 4e58f849..9ef09070 100644
--- a/upload/admin/sources/classes/bbcode/legacy.php
+++ b/upload/admin/sources/classes/bbcode/legacy.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode parsing core - legacy routine
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -30,7 +30,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -102,7 +102,7 @@ class class_bbcode_legacy extends class_bbcode_core
 		$txt = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $txt );
 		
 		# New (3.0)
-		$txt = $this->unconvertSmilies( $txt );
+		$txt = IPSText::unconvertSmilies( $txt );
 		
 		//-----------------------------------------
 		// Clean up nbsp
@@ -312,12 +312,12 @@ class class_bbcode_legacy extends class_bbcode_core
 	/**
 	 * Parse new quotes
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Quote data
 	 * @param	string	Raw text
 	 * @return	string	Converted text
 	 */
-	private function _parse_new_quote( $matches=array() )
+	protected function _parse_new_quote( $matches=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -365,7 +365,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	Raw text
 	 * @return	string	Converted text
 	 */
-	private function unconvert_size( $matches=array() )
+	protected function unconvert_size( $matches=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -393,7 +393,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	Raw text
 	 * @return	string	Converted text
 	 */
-	private function unconvert_flash($matches=array())
+	protected function unconvert_flash($matches=array())
 	{
 		$f_arr = explode( "+", $matches[1] );
 		
@@ -406,7 +406,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	Raw text
 	 * @return	string	Converted text
 	 */
-	private function unconvert_sql($matches=array())
+	protected function unconvert_sql($matches=array())
 	{
 		$sql = stripslashes($matches[2]);
 		
@@ -423,7 +423,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	Raw text
 	 * @return	string	Converted text
 	 */
-	private function unconvert_htm($matches=array())
+	protected function unconvert_htm($matches=array())
 	{
 		$html = stripslashes($matches[2]);
 		
@@ -440,7 +440,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	Converted text
 	 * @return	string	Raw text
 	 */
-	private function post_db_unparse_bbcode($t="")
+	protected function post_db_unparse_bbcode($t="")
 	{
 		//-----------------------------------------
 		// INIT
@@ -547,7 +547,7 @@ class class_bbcode_legacy extends class_bbcode_core
 	 * @param	string	HTML to search in
 	 * @return	string	Parsed HTML;
 	 */
-	private function parse_simple_tag_recursively( $tag_name, $convert_name, $bbcode, $text )
+	protected function parse_simple_tag_recursively( $tag_name, $convert_name, $bbcode, $text )
 	{
 		//----------------------------------------
 		// INIT
diff --git a/upload/admin/sources/classes/cache/index.html b/upload/admin/sources/classes/cache/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/cache/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/cache/simple.php b/upload/admin/sources/classes/cache/simple.php
new file mode 100644
index 00000000..9ed07cb8
--- /dev/null
+++ b/upload/admin/sources/classes/cache/simple.php
@@ -0,0 +1,288 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Simple caching class
+ * Last Updated: $Date: 2011-06-22 11:54:21 -0400 (Wed, 22 Jun 2011) $
+ * </pre>
+ *
+ * Original Author: Matt Mecham
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 9077 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly.";
+	exit();
+}
+
+
+class classes_cache_simple
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @access	protected
+	 * @var		object
+	 */
+	public $registry;
+	public $DB;
+	public $settings;
+	public $request;
+	public $lang;
+	public $member;
+	public $memberData	= array( 'member_id' => 0 );
+	/**#@-*/
+	
+	protected $app          = '';
+	protected $me           = array();
+	protected $meCache      = array();
+	protected $cacheForMins = array();
+	
+	
+	/**
+	 * Constructer
+	 *
+	 * @access	public
+	 * @param	object 		ipsRegistry $registry
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();	
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Set the default */
+		$this->setApp( IPS_APP_COMPONENT );
+		
+		/* Set ME */
+		$this->setMe( $this->memberData );
+		
+		/* Set default cache for mins */
+		$this->setCacheForMins( 5 );
+	}	
+
+	/**
+	 * @return the $app
+	 */
+	public function getApp()
+	{
+		return $this->app;
+	}
+
+	/**
+	 * @param field_type $app
+	 */
+	public function setApp( $app )
+	{
+		$this->app = $app;
+	}
+
+	/**
+	 * @return the $me
+	 */
+	public function getMe()
+	{
+		return $this->me;
+	}
+
+	/**
+	 * @param array $me
+	 */
+	public function setMe( array $me )
+	{
+		$this->me = $me;
+	}
+
+	/**
+	 * @return the $meCache
+	 */
+	public function getMeCache( $id )
+	{
+		return ( ! empty( $this->meCache[ $id ] ) ) ? $this->meCache[ $id ] : null;
+	}
+
+	/**
+	 * @param string $meCache
+	 */
+	public function setMeCache( $meCache )
+	{
+		$me = $this->getMe();
+		$this->meCache[ $me['member_id'] ] = $meCache;
+	}
+	
+	/**
+	 * @return the $cacheForMins
+	 */
+	public function getCacheForMins()
+	{
+		return $this->cacheForMins;
+	}
+
+	/**
+	 * @param field_type $cacheForMins
+	 */
+	public function setCacheForMins( $cacheForMins )
+	{
+		$this->cacheForMins = intval( $cacheForMins );
+	}
+	
+	/**
+	 * Return a cached item
+	 * @param string $key
+	 */
+	public function get( $key )
+	{
+		$data = $this->DB->buildAndFetch( array( 'select' => '*',
+												 'from'   => 'cache_simple',
+												 'where'  => 'cache_id=\'' . $this->DB->addSlashes( $this->_makeId( $key ) ) . '\' AND cache_perm_key=\'' . $this->DB->addSlashes( $this->_makePermKey() ) . '\'' ) );
+		
+		if ( ! empty( $data['cache_id'] ) )
+		{
+			if ( ! $this->_isStale( $data ) )
+			{
+				/* Do we need to unserialize this? */
+				$data['cache_data'] = ( IPSLib::isSerialized( $data['cache_data'] ) ) ? unserialize( $data['cache_data'] ) : $data['cache_data'];
+				
+				return array( 'data' => $data['cache_data'],
+							  'time' => $data['cache_time'] );
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Set a cached item
+	 * @param string $key
+	 * @param mixed  $data If array, it will be serialized
+	 */
+	public function set( $key, $data )
+	{
+		$this->DB->replace( 'cache_simple', array( 'cache_id' 		=> $this->_makeId( $key ),
+												   'cache_perm_key' => $this->_makePermKey(),
+												   'cache_time'		=> IPS_UNIX_TIME_NOW,
+												   'cache_data'		=> is_array( $data ) ? serialize( $data ) : $data ), array( 'cache_id' ) );
+		
+		return true;
+	}
+	
+	/**
+	 * Tests to see if a cached item is stale
+	 * @param array $data
+	 * @return boolean
+	 */
+	private function _isStale( array $data )
+	{
+		if ( empty( $data['cache_time'] ) )
+		{
+			return true;
+		}	
+		else if ( ( IPS_UNIX_TIME_NOW - $data['cache_time'] ) > ( $this->getCacheForMins() * 60 ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Make an ID key for the DeeBee
+	 * @param string $key
+	 */
+	private function _makeId( $key )
+	{
+		return md5( $this->getApp() . '-' . $key );
+	}
+	
+	/**
+	 * Make a perm key for the DeeBee
+	 * @param string $key
+	 */
+	private function _makePermKey()
+	{
+		$me     = $this->getMe();
+		$cached = $this->getMeCache( $me['member_id'] );
+		$key    = ( $cached !== null ) ? $cached : $this->_makePermOrdered( $me );
+		
+		if ( $cached === null && $key )
+		{
+			$this->setMeCache( $key );
+		}
+		
+		return md5( $key );
+	}
+	
+	/**
+	 * Fetch all relevant Perm IDs and make them ordered
+	 * @param array $member
+	 */
+	private function _makePermOrdered( $member )
+	{
+		$perms = array();
+		
+		if ( ! empty( $member['org_perm_id'] ) )
+		{
+			$perms = explode( ',', IPSText::cleanPermString( $member['org_perm_id'] ) );
+		}
+		
+		if ( ! count( $perms ) )
+		{
+			$groups = array( $member['member_group_id'] );
+			
+			if ( ! empty( $member['mgroup_others'] ) )
+			{
+				$others = explode( ',', IPSText::cleanPermString( $member['mgroup_others'] ) );
+				
+				if ( is_array( $others ) )
+				{
+					$groups = array_merge( $groups, $others );
+				}
+			}
+			
+			foreach( $groups as $gid )
+			{
+				$_perms = IPSText::cleanPermString( $this->caches['group_cache'][ $gid ]['g_perm_id'] );
+				
+				if ( ! empty( $_perms ) )
+				{
+					$__perms = explode( ',', $_perms );
+					
+					if ( is_array( $__perms ) )
+					{
+						$perms = array_merge( $perms, $__perms );
+					}
+				}
+			}
+			
+		}
+		
+		if ( is_array( $perms ) AND count( $perms ) )
+		{
+			sort( $perms, SORT_NUMERIC );
+			$perms = array_unique( $perms );
+		
+			return implode( ',', $perms );
+		}
+		else
+		{
+			return '';
+		}
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/class_admin_functions.php b/upload/admin/sources/classes/class_admin_functions.php
index acd1a5ac..af039bc4 100644
--- a/upload/admin/sources/classes/class_admin_functions.php
+++ b/upload/admin/sources/classes/class_admin_functions.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Control Panel Functions
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 6882 $
+ * @version		$Rev: 9487 $
  *
  */
 class adminFunctions
@@ -30,6 +30,9 @@ class adminFunctions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**#@+
@@ -47,7 +50,7 @@ class adminFunctions
 	 *
 	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -64,16 +67,15 @@ class adminFunctions
 		
 		$this->registry->output->global_template = $this->registry->output->loadRootTemplate('cp_skin_global');
 
-		$this->lang->loadLanguageFile( array( 'admin_global' ) );
-		
 		//------------------------------------------
 		// Message in a bottle?
 		//------------------------------------------
 
-		if( isset($this->request['messageinabottleacp']) AND $this->request['messageinabottleacp'] )
+		if( !empty($this->request['messageinabottleacp']) )
 		{
-			$this->request['messageinabottleacp'] = IPSText::getTextClass('bbcode')->xssHtmlClean( IPSText::UNhtmlspecialchars( urldecode( $this->request['messageinabottleacp'] ) ) );
-			$this->registry->output->global_message = $this->request['messageinabottleacp'];
+			$this->request['messageinabottleacp']		= IPSText::getTextClass('bbcode')->xssHtmlClean( IPSText::UNhtmlspecialchars( urldecode( $this->request['messageinabottleacp'] ) ) );
+			$this->registry->output->global_message		= $this->request['messageinabottleacp'];
+			$this->registry->output->persistent_message	= intval($this->request['messagepersistent']);
 		}
 	}
 	
@@ -147,15 +149,14 @@ class adminFunctions
 		
 		$id = ( $id ) ? $id : $this->memberData['member_id'];
 		
-		$_test = $this->DB->buildAndFetch( array( 
-														'select' => 'sys_login_id, sys_cookie',
-														'from'   => 'core_sys_login',
-														'where'  => 'sys_login_id=' . intval( $id ) 
-												)	);
+		$_test = $this->DB->buildAndFetch( array( 'select' => 'sys_login_id, sys_cookie',
+												  'from'   => 'core_sys_login',
+												  'where'  => 'sys_login_id=' . intval( $id ) 
+										  )		 );
 		
 		$cookie         = ( $_test['sys_cookie'] ) ? unserialize( $_test['sys_cookie'] ) : array();
 		$cookie[ $key ] = $data;
-										
+
 		if ( $_test['sys_login_id'] )
 		{
 			$this->DB->update( 'core_sys_login', array( 'sys_cookie' => serialize( $cookie ) ), 'sys_login_id=' . intval( $id ) );
@@ -174,13 +175,20 @@ class adminFunctions
  	 * @access	public
  	 * @return	string		MD5 secure hash
  	 * @see		getSecurityKey()
- 	 **/	
+ 	 */	
 	public function generateSecureHash()
 	{
 		/* Generate Secure Hash */
-		$ip_octets	= explode( ".", $this->member->ip_address );
-        $key		= md5( ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . "(&)" . $ip_octets[0] . '(&)' . $ip_octets[1] . '(&)' . ( isset($this->memberData['member_login_key']) ? $this->memberData['member_login_key'] : 0 ) );
-
+		if ( IPB_ACP_IP_MATCH )
+		{
+			$ip_octets	= explode( ".", $this->member->ip_address );
+	        $key		= md5( ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . "(&)" . $ip_octets[0] . '(&)' . $ip_octets[1] . '(&)' . ( isset($this->memberData['member_login_key']) ? $this->memberData['member_login_key'] : 0 ) );
+		}
+		else
+		{
+			$key		= md5( ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . '(&)' . ( isset($this->memberData['member_login_key']) ? $this->memberData['member_login_key'] : 0 ) );
+		}
+		
 		return $key;
 	}
 	
@@ -191,10 +199,17 @@ class adminFunctions
  	 * @return	string		MD5 secure hash
  	 * @see		checkSecurityKey()
  	 * @see		getSecurityKey()
- 	 **/	
+ 	 */	
 	public function getSecurityKey()
 	{
-		return md5( ( isset($this->memberData['email']) ? $this->memberData['email'] : 0 ) . '^' . ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . '^' . $this->member->ip_address . md5( $this->settings['sql_pass'] ) );
+		if ( IPB_ACP_IP_MATCH )
+		{
+			return md5( ( isset($this->memberData['email']) ? $this->memberData['email'] : 0 ) . '^' . ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . '^' . $this->member->ip_address . md5( $this->settings['sql_pass'] ) );
+		}
+		else
+		{
+			return md5( ( isset($this->memberData['email']) ? $this->memberData['email'] : 0 ) . '^' . ( isset($this->memberData['joined']) ? $this->memberData['joined'] : 0 ) . '^' . md5( $this->settings['sql_pass'] ) );
+		}
 	}
 
 	/**
@@ -235,17 +250,15 @@ class adminFunctions
 	 */
 	public function saveAdminLog( $action="" )
 	{
-		$this->DB->insert( 'admin_logs', array(
-													'appcomponent' => $this->request['app'],
-													'module'       => $this->request['module'],
-													'section'      => $this->request['section'],
-													'do'           => $this->request['do'],
-													'member_id'    => $this->memberData['member_id'],
-													'ctime'        => time(),
-													'note'         => $action,
-													'ip_address'   => $this->member->ip_address,
-												)
-							);
+		$this->DB->insert( 'admin_logs', array( 'appcomponent' => $this->request['app'],
+												'module'       => $this->request['module'],
+												'section'      => $this->request['section'],
+												'do'           => $this->request['do'],
+												'member_id'    => $this->memberData['member_id'],
+												'ctime'        => time(),
+												'note'         => $action,
+												'ip_address'   => $this->member->ip_address,
+						  )						);
 		
 		return true;
 	}
@@ -257,6 +270,8 @@ class adminFunctions
 	 * @access	public
 	 * @param	string		File location
 	 * @return	string		XML contents
+	 * @note	This function is not restricted to XML.  It will return the contents of the uploaded file regardless of file type.
+	 * @todo 	[Future] We should rename this function to something more generic.  It is not restricted to 'xml' so the name is misleading.
 	 */
 	public function importXml( $location='' )
 	{
@@ -285,7 +300,7 @@ class adminFunctions
 		}
 
 		/* Now load it... $location could have been set by the upload check...*/
-		if ( file_exists( $location ) )
+		if ( is_file( $location ) )
 		{
 			if ( substr( $location, -3 ) == '.gz' )
 			{
@@ -299,153 +314,18 @@ class adminFunctions
 					@gzclose( $FH );
 				}
 			}
-			else if ( substr( $location, -4 ) == '.xml' )
+			else //if ( substr( $location, -4 ) == '.xml' )
 			{
 				$content = file_get_contents( $location );
 			}
 		}
 
 		/* Unlink the tmp file if it exists */
-		if ( file_exists( $UPLOAD_DIR . "/" . $FILE_NAME ) )
+		if ( is_file( $UPLOAD_DIR . "/" . $FILE_NAME ) )
 		{
 			@unlink( $UPLOAD_DIR . "/" . $FILE_NAME );
 		}
 		
 		return $content;
 	}
-	
-	/**
-	 * Copy a directory
-	 *
-	 * @access	public
-	 * @param	string		From path
-	 * @param	string		To path
-	 * @param	integer		Octal permissions value
-	 * @return	boolean
-	 * @see		classFileManagement::copyDirectory()
-	 * @deprecated	With the presence of the kernel class, we should deprecate the usage of this method
-	 */
-	public function copyDirectory($from_path, $to_path, $mode = 0777)
-	{
-		$this->errors = "";
-		
-		//-----------------------------------------
-		// Strip off trailing slashes...
-		//-----------------------------------------
-		
-		$from_path = rtrim( $from_path, '/' );
-		$to_path   = rtrim( $to_path, '/' );
-	
-		if ( ! is_dir($from_path) )
-		{
-			$this->errors = "Could not locate directory '$from_path'";
-			return FALSE;
-		}
-	
-		if ( ! is_dir($to_path) )
-		{
-			if ( ! @mkdir($to_path, $mode) )
-			{
-				$this->errors = "Could not create directory '$to_path' please check the CHMOD permissions and re-try";
-				return FALSE;
-			}
-			else
-			{
-				@chmod($to_path, $mode);
-			}
-		}
-		
-		if (is_dir($from_path))
-		{
-			$handle = opendir($from_path);
-			
-			while (($file = readdir($handle)) !== false)
-			{
-				if (($file != ".") && ($file != ".."))
-				{
-					if ( is_dir( $from_path."/".$file ) )
-					{
-						$this->copyDirectory($from_path."/".$file, $to_path."/".$file);
-					}
-					
-					if ( is_file( $from_path."/".$file ) )
-					{
-						copy($from_path."/".$file, $to_path."/".$file);
-						@chmod($to_path."/".$file, 0777);
-					} 
-				}
-			}
-			closedir($handle); 
-		}
-		
-		if ($this->errors == "")
-		{
-			return TRUE;
-		}
-	}
-	
-	/**
-	 * Remove a directory (and all of its contents)
-	 *
-	 * @access	public
-	 * @param	string		Directory or filename
-	 * @return	boolean
-	 * @see		classFileManagement::removeDirectory()
-	 * @deprecated	With the presence of the kernel class, we should deprecate the usage of this method
-	 */
-	public function removeDirectory($file)
-	{
-		$errors = 0;
-		
-		//-----------------------------------------
-		// Remove trailing slashes..
-		//-----------------------------------------
-		
-		$file = rtrim( $file, '/' );
-		
-		if ( file_exists($file) )
-		{
-			//-----------------------------------------
-			// Attempt CHMOD
-			//-----------------------------------------
-			
-			@chmod($file, 0777);
-			
-			if ( is_dir($file) )
-			{
-				$handle = opendir($file);
-				
-				while (($filename = readdir($handle)) !== false)
-				{
-					if (($filename != ".") && ($filename != ".."))
-					{
-						$this->removeDirectory($file."/".$filename);
-					}
-				}
-				
-				closedir($handle);
-				
-				if ( ! @rmdir($file) )
-				{
-					$errors++;
-				}
-			}
-			else
-			{
-				if ( ! @unlink($file) )
-				{
-					$errors++;
-				}
-			}
-		}
-		
-		if ($errors == 0)
-		{
-			return TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/class_localization.php b/upload/admin/sources/classes/class_localization.php
index 72db0b35..6c49f212 100644
--- a/upload/admin/sources/classes/class_localization.php
+++ b/upload/admin/sources/classes/class_localization.php
@@ -2,19 +2,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Localization Class.
  *
  * Used for handling language text, money formatting, etc.
- * Last Updated: $Date: 2010-10-06 06:09:32 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-07-19 19:39:43 -0400 (Tue, 19 Jul 2011) $
  * </pre>
  * 
- * @author		Joshua Williams <josh@invisionpower.com>
- * @version		$Rev: 6946 $
+ * @author		Joshua Williams
+ * @version		$Rev: 9291 $
  * @since		1.0
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @link		http://www.invisionpower.com
+ * @license		This is NULLED!
+ * @link		http://hatynka.in
  * @package		IP.Board
  */ 
 
@@ -42,11 +42,15 @@ class class_localization
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
    /**
@@ -84,10 +88,10 @@ class class_localization
    /**
     * Offset has been set
     *
-    * @access	private
+    * @access	protected
     * @var		boolean
     */	
-	private $offset_set;
+	protected $offset_set;
 	
    /**
     * Determines if lang entries are loaded from the db or the filesystem
@@ -100,17 +104,17 @@ class class_localization
 	/**
 	 * Force UK/English language
 	 *
-	 * @access private
+	 * @access protected
 	 * @var	   boolean
 	 */
-	private $_forceEnglish = false;
+	protected $_forceEnglish = false;
 	
 	/**
 	 * Constructor
 	 * 
 	 * @access	public
 	 * @param	string	[$lang]		Language file to load, english by default
-	 * @return	void
+	 * @return	@e void
 	 */		
 	public function __construct( ipsRegistry $registry )
 	{
@@ -209,7 +213,7 @@ class class_localization
 		// Did we choose a language?
 		//--------------------------------
 
-		if ( isset( $this->request['setlanguage'] ) AND $this->request['setlanguage'] AND $this->request['langid'] )
+		if ( !empty( $this->request['setlanguage'] ) AND $this->request['langid'] )
 		{
 			/* Forcing english? */
 			if ( $this->request['langid'] == '__english__' )
@@ -366,7 +370,7 @@ class class_localization
 		$actual = array($this->local_data['decimal_point'], $this->local_data['thousands_sep']);
 		
 		// format number with placeholders
-		$formatted = number_format($number, $places, $placeholders[0], $placeholders[1]);
+		$formatted = number_format((float)$number, $places, $placeholders[0], $placeholders[1]);
 		
 		// replace by localized characters				  
 		if( strpos( strtolower( PHP_OS ), 'win' ) === 0 )
@@ -385,7 +389,7 @@ class class_localization
 	 * @param	string	[$format]		Type of formatting to use: short or long
 	 * @param	bool	[$relative]		Determines if date will be displayed in relative format
 	 * @return	string
-	 **/	
+	 */	
 	public function formatTime( $ts=0, $format='short', $relative=1 )
 	{
 		return $this->getDate( $ts, strtoupper( $format ), $relative ? 0 : 1 );
@@ -667,7 +671,7 @@ class class_localization
 			$r += ($this->settings['time_adjust'] * 60);
 		}
 		
-		if ( isset($this->memberData['dst_in_use']) AND $this->memberData['dst_in_use'] )
+		if ( !empty($this->memberData['dst_in_use']) )
 		{
 			$r += 3600;
 		}
@@ -708,7 +712,7 @@ class class_localization
 	 * @param	string	[$app]			Specify application to use
 	 * @param	string	[$lang]			Language pack to use
 	 * @param	boolean	[$forceReload]	Force a language pack to load regardless if it has already
-	 * @return	void
+	 * @return	@e void
 	 */	 
 	public function loadLanguageFile( $load=array(), $app='', $lang='', $forceReload=false )
 	{	
@@ -733,9 +737,9 @@ class class_localization
 		}
 		
 		/* Has the global language file been loaded? */
-		if ( ! in_array( $app . '_' . $global, $this->loaded_lang_files ) AND ( $app == 'core' AND ! in_array( $_global, $load ) ) )
+		if ( ! in_array( $global, $this->loaded_lang_files ) AND ( $app == 'core' AND ! in_array( $_global, $load ) ) )
 		{
-			$load[] = $global;
+			$load[] = $_global;
 		}
 		
 		/* Load the language file */
@@ -809,9 +813,9 @@ class class_localization
 					
 					if ( ! in_array( $_test, $this->loaded_lang_files ) OR $forceReload === TRUE )
 					{
-						if ( file_exists( $_file ) )
+						if ( is_file( $_file ) )
 						{
-							require( $_file );
+							include( $_file );/*noLibHook*/
 				
 							foreach( $lang as $k => $v )
 							{
@@ -837,7 +841,7 @@ class class_localization
 			}
 		}
 		
-		if( isset( $tempLangId ) AND $tempLangId )
+		if( !empty( $tempLangId ) )
 		{
 			$this->lang_id	= $tempLangId;
 		}
diff --git a/upload/admin/sources/classes/class_permissions.php b/upload/admin/sources/classes/class_permissions.php
index 6aab6af5..b46641eb 100644
--- a/upload/admin/sources/classes/class_permissions.php
+++ b/upload/admin/sources/classes/class_permissions.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * ACP Restrictions
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		1st march 2002
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -33,6 +33,9 @@ class class_permissions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -75,7 +78,7 @@ class class_permissions
 	 * @access	public
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		[Optional] Member permissions array to use (otherwise loads the current member's from the db)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $permissions=array() )
 	{
@@ -94,38 +97,44 @@ class class_permissions
 		}
 		else
 		{
-			// Mainly for login..
+			//-----------------------------------------
+			// Don't do this on login
+			//-----------------------------------------
+			
 			if( !$this->memberData['member_id'] )
 			{
 				return false;
 			}
 			
-			// Support member + group
-
-			$member_restrictions	= $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'admin_permission_rows', 'where' => "row_id_type='member' AND row_id=" . $this->memberData['member_id'] ) );
+			//-----------------------------------------
+			// Get restrictions
+			//-----------------------------------------
 			
-			if( is_array($member_restrictions) AND count($member_restrictions) )
+			$groups[]	= $this->memberData['member_group_id'];
+			
+			if( $this->memberData['mgroup_others'] )
 			{
-				$this->restrictions_row = unserialize($member_restrictions['row_perm_cache']);
-				$this->restricted		= true;
+				$groups	= array_merge( $groups, explode( ',', IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
 			}
-			else
+			
+			$this->DB->build( array( 'select' => '*', 'from' => 'admin_permission_rows', 'where' => "(row_id_type='member' AND row_id=" . $this->memberData['member_id'] . ") OR (row_id_type='group' AND row_id IN(" . implode( ',', $groups ) . "))" ) );
+			$this->DB->execute();
+			
+			while( $r = $this->DB->fetch() )
 			{
-				$groups[]	= $this->memberData['member_group_id'];
+				//-----------------------------------------
+				// Member restrictions should override group restrictions
+				//-----------------------------------------
 				
-				if( $this->memberData['mgroup_others'] )
+				if( $r['row_id_type'] == 'member' )
 				{
-					$groups	= array_merge( $groups, explode( ',', IPSText::cleanPermString( $this->memberData['mgroup_others'] ) ) );
-				}
-				
-				$this->DB->build( array( 'select' => '*', 'from' => 'admin_permission_rows', 'where' => "row_id_type='group' AND row_id IN(" . implode( ',', $groups ) . ")" ) );
-				$this->DB->execute();
-				
-				while( $r = $this->DB->fetch() )
-				{
-					$this->restrictions_row = array_merge( $this->restrictions_row, unserialize($r['row_perm_cache']) );
+					$this->restrictions_row = unserialize($r['row_perm_cache']);
 					$this->restricted		= true;
+					break;
 				}
+
+				$this->restrictions_row = array_merge( $this->restrictions_row, unserialize($r['row_perm_cache']) );
+				$this->restricted		= true;
 			}
 		}
 		
@@ -147,7 +156,7 @@ class class_permissions
 			{
 				$this->restrictions_row['applications'][]	= $coreId;
 			}
-				
+
 			if( ! in_array( $this->mycpModule, $this->restrictions_row['modules'] ) )
 			{
 				$this->restrictions_row['modules'][]	= $this->mycpModule;
@@ -294,16 +303,105 @@ class class_permissions
 			}
 		}
 	}
+	
+	/**
+	 * Check Section Access
+	 *
+	 * Checks the permission for the member
+	 *
+	 * @access	public
+	 * @param	string 		[ Application Key ]
+	 * @param	string 		[ Module Key ]
+	 * @param	string 		[ Section Key ]
+	 * @return	mixed		Boolean has access or not, or outputs HTML error message
+	 */
+	public function checkForSectionAccess( $app='', $module='', $section='' )
+	{
+		//-----------------------------------------
+		// IN DEV check?
+		//-----------------------------------------
+		
+		if ( $this->in_dev and IN_DEV )
+		{
+			return TRUE;
+		}
+
+		$auto_access = array( 'ajax', 'api', 'search', 'palette', 'login' );
+		
+		if ( in_array( $module, $auto_access ) )
+		{
+			return TRUE;
+		}
+		
+		//-----------------------------------------
+		// Module access?
+		//-----------------------------------------
+		
+		if ( !$this->checkForModuleAccess( $app, $module ) )
+		{
+			return FALSE;
+		}
+				
+		//-----------------------------------------
+		// Can we access?
+		//-----------------------------------------
+		
+		$menu = ipsRegistry::cache()->getCache('app_menu_cache');
+		
+		foreach( $menu[ $app ] as $k => $items )
+		{
+			if ( preg_match( '/(\d)_' . $module . '/', $k ) )
+			{
+				foreach( $items['items'] as $i )
+				{
+					if ( $i['section'] == $section )
+					{
+						if ( $i['rolekey'] )
+						{
+							$return = $this->checkPermission( $i['rolekey'], $app, $module );
+							break 2;
+						}
+						else
+						{
+							$return = TRUE;
+							break 2;
+						}
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// I can haz teh permishuns?
+		//-----------------------------------------
+		
+		if ( $this->return )
+		{
+			return $return;
+		}
+		else
+		{
+			if ( $return === FALSE )
+			{
+				ipsRegistry::getClass('output')->showError( 'no_permission', 1004 );
+			}
+			else
+			{
+				return $return;
+			}
+		}
+		
+	}
 
 	/**
 	 * Grab the module id from the modules array
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string 		[ Application Key ]
 	 * @param	string 		[ Module Key ]
 	 * @return	integer		Module id
 	 */
-	private function _getModuleId( $app='', $module='' )
+	protected function _getModuleId( $app='', $module='' )
 	{
 		$app		= ( $app ) ? $app : ipsRegistry::$current_application;
 		$app_id		= ipsRegistry::$applications[ $app ]['app_id'];
@@ -338,7 +436,7 @@ class class_permissions
 	 * @return	mixed		True if has permission or outputs HTML error message if not
 	 */
 	public function checkPermissionAutoMsg( $key, $app='', $module='' )
-	{
+	{		
 		$tmp			= $this->return;
 		$this->return	= false;
 		
diff --git a/upload/admin/sources/classes/class_public_permissions.php b/upload/admin/sources/classes/class_public_permissions.php
index de187eda..c52badb1 100644
--- a/upload/admin/sources/classes/class_public_permissions.php
+++ b/upload/admin/sources/classes/class_public_permissions.php
@@ -2,16 +2,16 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Manages public permissions
- * Last Updated: $Date: 2010-11-16 06:40:55 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-05-20 04:06:50 -0400 (Fri, 20 May 2011) $
  * </pre>
  *
  * @author 		Joshua Williams
  * @package		IP.Board
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @link		http://www.invisionpower.com
+ * @license		This is NULLED!
+ * @link		http://hatynka.in
  * @since		Wednesday 14th May 2008 14:00
  */
 
@@ -33,21 +33,70 @@ class classPublicPermissions
 	 *
 	 * @var		array
 	 */
-	private $mappings = array();
+	protected $mappings = array();
+	
+	/**
+	 * Ability to set a different member for permission checks, etc
+	 * @var array
+	 */
+	protected $_memberData     = array();
 	
 	/**
 	 * Constructer
 	 *
 	 * @param	object	ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
 		/* Make object */
-		$this->registry = $registry;
-		$this->lang     = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
+		$this->registry   = $registry;
+		$this->lang       = $this->registry->getClass('class_localization');
+		$this->member     = $this->registry->member();
 		$this->memberData =& $this->registry->member()->fetchMemberData();
+		
+		/* Set default memberData */
+		$this->setMemberData( $this->memberData );
+	}
+	
+	/**
+	 * @return the $_memberData
+	 */
+	public function getMemberData( $k='' )
+	{
+		return ( ! empty( $k ) ) ? $this->_memberData[ $k ] : $this->_memberData;
+	}
+
+	/**
+	 * @param	string	key
+	 * @param	string	value
+	 */
+	public function setMemberData( $k, $v='' )
+	{
+		if ( is_integer( $k ) )
+		{
+			$this->_memberData = IPSMember::load( $k, 'all' );
+		}
+		else if ( is_array( $k ) )
+		{
+			$this->_memberData = $k;
+		}
+		else if ( ! empty( $k ) )
+		{
+			$this->_memberData[ $k ] = $v;
+		}
+		
+		/* Set perm ids and that */
+		if ( $this->memberData['member_id'] == $this->_memberData['member_id'] )
+		{
+			$this->_memberData['_perm_id_array'] = $this->member->perm_id_array;
+		}
+		else
+		{
+			/* Force to guest for now */
+			$permId = ( ! empty( $this->_memberData['org_perm_id'] ) ) ? $this->_memberData['org_perm_id'] : $this->_memberData['g_perm_id'];
+			$this->_memberData['_perm_id_array'] = array_unique( explode( ",", $permId ) );
+		}	
 	}
 	
 	/**
@@ -136,13 +185,13 @@ class classPublicPermissions
 	 * @param	array 	$otherMasks	Masks to check (defaults to current viewer)
 	 * @return  bool
 	 */	
-	private function _help_check( $perm, $row, $otherMasks=array() )
+	protected function _help_check( $perm, $row, $otherMasks=array() )
 	{
 		/* Permission column */
 		$perm_column = '';
 		
 		/* Masks to check */
-		$masks	= count($otherMasks) ? $otherMasks : $this->member->perm_id_array;
+		$masks	= count($otherMasks) ? $otherMasks : $this->_memberData['_perm_id_array'];
 		
 		if( $perm == 'view' )
 		{
@@ -275,13 +324,14 @@ class classPublicPermissions
 	/**
 	 * Builds a permission selection matrix
 	 *
-	 * @param	string	$type			The permission type to build
-	 * @param	array	$default		Current permissions
-	 * @param	string	[$app]			App that the type belongs too, default is the current app
-	 * @param	string	[$only_perm]	Only show this permission
-	 * @return	string
+	 * @param	string		$type			The permission type to build
+	 * @param	array		$default		Current permissions
+	 * @param	string		$app			App that the type belongs too, default is the current app
+	 * @param	string		$only_perm		Only show this permission
+	 * @param	boolean		$addOutsideBox	Add or not the outside acp-box
+	 * @return	@e string	HTML
 	 */
-	public function adminPermMatrix( $type, $default, $app='', $only_perm='' )
+	public function adminPermMatrix( $type, $default, $app='', $only_perm='', $addOutsideBox=true )
 	{
 		/* INI */
 		$app          = ( $app ) ? $app : ipsRegistry::$current_application;
@@ -295,10 +345,10 @@ class classPublicPermissions
 		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'admin_permissions' ), 'members' );
 		
 		/* Get Mappings */
-		require_once( IPSLib::getAppDir(  $app ) . '/extensions/coreExtensions.php' );
-		$mapping    = new $map_class();
-		$perm_names = $mapping->getPermNames();
-		$perm_map   = $mapping->getMapping();
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php', $map_class, $app );
+		$mapping     = new $classToLoad();
+		$perm_names  = $mapping->getPermNames();
+		$perm_map    = $mapping->getMapping();
 		
 		/* Language... */
 		$this->lang->loadLanguageFile( array( 'admin_' . $app ), $app );
@@ -359,7 +409,7 @@ class classPublicPermissions
 		}
 		
 		/* Return the matrix */
-		return $html->permissionMatrix( $perm_names, $perm_matrix, $perm_checked, $mapping->getPermColors() );
+		return $html->permissionMatrix( $perm_names, $perm_matrix, $perm_checked, $mapping->getPermColors(), $type, $addOutsideBox );
 	}
 
 	/**
@@ -368,7 +418,7 @@ class classPublicPermissions
 	 * @param	array 	Input perm matrix
 	 * @param	int		Set ID
 	 * @param	array 	Applications originally on the form
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveItemPermMatrix( $perm_matrix, $set_id, $applications=array() )
 	{
@@ -383,11 +433,11 @@ class classPublicPermissions
 				$_perm_row = array();
 				
 				/* We need the mappings for this application */
-				require_once( IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php' );
+				$map_class     = $app . 'PermMapping' . $type;
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php', $map_class, $app );
 				
 				/* Create the mapping object */
-				$map_class     = $app . 'PermMapping' . $type;
-				$mapping       = new $map_class();
+				$mapping       = new $classToLoad();
 				$mapping_array = $mapping->getMapping();				
 
 				/* Loop through each perm in this app */		
@@ -516,11 +566,11 @@ class classPublicPermissions
 		$perm_save_row = array();
 		
 		/* Get Mappings */
-		require_once( IPSLib::getAppDir(  $app ) . '/extensions/coreExtensions.php' );
-		$mapping = new $map_class();
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php', $map_class, $app );
+		$mapping     = new $classToLoad();
 		$mapping_array = $mapping->getMapping();
 		$customTable   = ( method_exists( $mapping, 'getCustomTable' ) ) ? $mapping->getCustomTable() : false;
-		
+
 		/* Loop through mapping and build save array */
 		foreach( $mapping_array as $k => $col )
 		{
@@ -528,22 +578,22 @@ class classPublicPermissions
 			$perm_save_row[$col] = '';
 			
 			/* Check the matrix for this perm */			
-			if( $perm_matrix[$k] )
+			if( $perm_matrix[$type . $k] )
 			{
 				/* Global? */
-				if( isset( $perm_matrix[$k]['*'] ) && $perm_matrix[$k]['*'] == '1' )
+				if( !empty( $perm_matrix[$type . $k]['*'] ) )
 				{
 					$perm_save_row[$col] = '*';
 				}
 				else
 				{
 					/* Do we have permissions? */
-					if( is_array( $perm_matrix[$k] ) && count( $perm_matrix[$k] ) )
+					if( is_array( $perm_matrix[$type . $k] ) && count( $perm_matrix[$type . $k] ) )
 					{
 						/* Loop through the permissions */
 						$perm_save_row[$col] = ',';
 						
-						foreach( $perm_matrix[$k] as $mask => $v )
+						foreach( $perm_matrix[$type . $k] as $mask => $v )
 						{
 							if( $v == 1 )
 							{
@@ -554,7 +604,7 @@ class classPublicPermissions
 				}
 			}
 		}
-		
+
 		if ( ! $customTable )
 		{
 			/* Ensure all text fields have a default value */
@@ -589,34 +639,34 @@ class classPublicPermissions
 	 * @param   array   $row   Permission row from permission_index
 	 * @return  bool
 	 */	
-	private function load_mapping( $row )
+	protected function load_mapping( $row )
 	{
-		if( !$row['app'] )
+		if( !isset($row['app']) OR !$row['app'] )
 		{
 			return false;
 		}
 
 		/* Mapping Class */
-		$mapping_class = $row['app'] . 'PermMapping' . ucfirst( $row['perm_type'] );
+		$classToLoad = $row['app'] . 'PermMapping' . ucfirst( $row['perm_type'] );
 		
 		/* Check for the class */
-		if( ! class_exists( $mapping_class ) )
+		if( ! class_exists( $classToLoad ) )
 		{
 			/* Check for the file */
-			if( file_exists( IPSLib::getAppDir( $row['app'] ) . '/extensions/coreExtensions.php' ) )
+			if( is_file( IPSLib::getAppDir( $row['app'] ) . '/extensions/coreExtensions.php' ) )
 			{
-				require_once IPSLib::getAppDir( $row['app'] ) . '/extensions/coreExtensions.php';
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $row['app'] ) . '/extensions/coreExtensions.php', $classToLoad, $row['app'] );
 			}
 			else
 			{
 				return false;
 			}
 		}
-		
+
 		/* Load the mapping */
-		if( class_exists( $mapping_class ) )
+		if( class_exists( $classToLoad ) )
 		{
-			$mapping = new $mapping_class();
+			$mapping = new $classToLoad();
 			$this->mappings[$row['app']][$row['perm_type']] = $mapping->getMapping();
 		}
 		
diff --git a/upload/admin/sources/classes/class_reputation_cache.php b/upload/admin/sources/classes/class_reputation_cache.php
index b494034c..c53e7a04 100644
--- a/upload/admin/sources/classes/class_reputation_cache.php
+++ b/upload/admin/sources/classes/class_reputation_cache.php
@@ -2,16 +2,16 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Facilitates reputation plugins
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-10-06 23:44:10 -0400 (Thu, 06 Oct 2011) $
  * </pre>
  *
- * @author		Joshua Williams <josh@invisionpower.com>
+ * @author		Joshua Williams
  * @package		IP.Board
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @link		http://www.invisionpower.com
+ * @license		This is NULLED!
+ * @link		http://hatynka.in
  * @since		Wednesday 14th May 2008 14:00
  */
 
@@ -37,11 +37,34 @@ class classReputationCache
 	 * CONSTRUCTOR
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
+		/* Make object */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
 		$this->rep_system_on = ipsRegistry::$settings['reputation_enabled'];
+		
+		/* re-assign some language strings */
+		if ( $this->settings['reputation_point_types'] == 'like' )
+		{
+			foreach( array( 'rep_description', 'member_has_x_rep' ) as $lang )
+			{
+				if ( ! empty( $this->lang->words[ $lang ] ) && ! empty( $this->lang->words[ $lang . '_like' ] ) )
+				{
+					$this->lang->words[ $lang ] = $this->lang->words[ $lang . '_like' ];
+				}
+			}
+		}
 	}
 	
 	/**
@@ -65,12 +88,36 @@ class classReputationCache
 		$app = ( $app ) ? $app : ipsRegistry::$current_application;
 		
 		/* Return the join array */
-		return array(
-						'select' => 'rep_cache.rep_points',
-						'from'   => array( 'reputation_cache' => 'rep_cache' ),
-						'where'  => "rep_cache.app='{$app}' AND rep_cache.type='{$type}' AND rep_cache.type_id={$type_id}",
-						'type'   => 'left',
-					);
+		return array( 'select' => 'rep_cache.rep_points, rep_cache.rep_like_cache',
+					  'from'   => array( 'reputation_cache' => 'rep_cache' ),
+					  'where'  => "rep_cache.app='{$app}' AND rep_cache.type='{$type}' AND rep_cache.type_id={$type_id}",
+					  'type'   => 'left' );
+	}
+	
+	/**
+	 * Has this member rated this item?
+	 * @param 	array $data (app, id, type, memberId )
+	 * @return	boolean
+	 */
+	public function getCurrentMemberRating( $data )
+	{
+		return $this->DB->buildAndFetch( array( 'select' => '*, rep_rating as has_given_rep', 
+										 		'from'   => 'reputation_index', 
+										 	    'where'  => "app='" . $data['app'] . "' AND type='" . $data['type'] . "' AND type_id=" . intval( $data['id'] ) . " AND member_id=" . intval( $data['memberId'] ) ) );	
+	}
+	
+	/**
+	 * Has this member rated this item?
+	 * @param 	array $data (app, id, type, memberId )
+	 * @return	int
+	 */
+	public function getCurrentRating( $data )
+	{
+		$rating = $this->DB->buildAndFetch( array( 'select' => 'rep_points', 
+										 		   'from'   => 'reputation_cache', 
+										 	       'where'  => "app='" . $data['app'] . "' AND type='" . $data['type'] . "' AND type_id=" . intval( $data['id'] ) ) );
+		
+		return intval( $rating['rep_points'] );
 	}
 	
 	/**
@@ -100,7 +147,7 @@ class classReputationCache
 						'where'  => "rep_index.app='{$app}' AND 
 						             rep_index.type='{$type}' AND 
 						             rep_index.type_id={$type_id} AND 
-						             rep_index.member_id=" . ipsRegistry::member()->getProperty( 'member_id' ),
+						             rep_index.member_id=" . $this->memberData['member_id'],
 						'type'   => 'left',
 					);
 	}
@@ -115,16 +162,17 @@ class classReputationCache
 	 * @param	string		$message	Message associated with this rating
 	 * @param	integer		$member_id	Id of the owner of the content being rated
 	 * @param	string		[$app]		App for this content, by default the current application
+	 * @todo 	[Future] Move forum notifications to an onRep memberSync callback
 	 * @return	bool
 	 */
 	public function addRate( $type, $type_id, $rating, $message='', $member_id=0, $app='' )
 	{
-		ipsRegistry::instance()->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
+		$this->registry->getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
 		
 		/* Online? */
-		if( ! $this->rep_system_on )
+		if ( ! $this->rep_system_on )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_offline'];
+			$this->error_message = $this->lang->words['reputation_offline'];
 			return false;
 		}
 		
@@ -132,28 +180,31 @@ class classReputationCache
 		$app       = ( $app ) ? $app : ipsRegistry::$current_application;
 		$rating    = intval( $rating );
 		
-		if( ! ipsRegistry::member()->getProperty( 'member_id' ) )
+		if ( ! $this->memberData['member_id'] )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_guest'];
+			$this->error_message = $this->lang->words['reputation_guest'];
 			return false;
 		}
 		
-		if( $rating != -1 && $rating != 1 )
+		if ( $rating != -1 && $rating != 1 )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_invalid'];
+			$this->error_message = $this->lang->words['reputation_invalid'];
 			return false;
 		}
 		
+		/* Check for existing rating */
+		$currentRating = $this->getCurrentMemberRating( array( 'app' => $app, 'type' => $type, 'id' => $type_id, 'memberId' => $this->memberData['member_id'] ) );
+		
 		/* Check the point types */
-		if( $rating == -1 && ipsRegistry::$settings['reputation_point_types'] == 'positive' )
+		if ( $rating == -1 && IPSMember::canRepDown( $currentRating, $this->memberData ) === false )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_invalid'];
+			$this->error_message = $this->lang->words['reputation_invalid'];
 			return false;
 		}
 		
-		if( $rating == 1 && ipsRegistry::$settings['reputation_point_types'] == 'negative' )
+		if ( $rating == 1 && IPSMember::canRepUp( $currentRating, $this->memberData ) === false )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_invalid'];
+			$this->error_message = $this->lang->words['reputation_invalid'];
 			return false;
 		}
 		
@@ -163,147 +214,209 @@ class classReputationCache
 		/* Check Max Positive Votes */
 		if( $rating == 1 )
 		{
-			if( intval( ipsRegistry::member()->getProperty( 'g_rep_max_positive' ) ) === 0 )
+			if ( intval( $this->memberData['g_rep_max_positive'] ) === 0 )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_quota_pos'];
+				$this->error_message = $this->lang->words['reputation_quota_pos'];
 				return false;				
 			}
 			
-			$total = ipsRegistry::DB()->buildAndFetch( array( 
-																'select' => 'count(*) as votes', 
-																'from'   => 'reputation_index', 
-																'where'  => 'member_id=' . ipsRegistry::member()->getProperty( 'member_id' ) . ' AND rep_rating=1 AND rep_date > ' . $day_cutoff
-															)	);
+			$total = $this->DB->buildAndFetch( array( 'select' => 'count(*) as votes', 
+													  'from'   => 'reputation_index', 
+													  'where'  => 'member_id=' . $this->memberData['member_id'] . ' AND rep_rating=1 AND rep_date > ' . $day_cutoff )	);
 					
-			if( $total['votes'] >= ipsRegistry::member()->getProperty( 'g_rep_max_positive' ) )
+			if ( $total['votes'] >= $this->memberData['g_rep_max_positive'] )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_quota_pos'];
+				$this->error_message = $this->lang->words['reputation_quota_pos'];
 				return false;				
 			}
 		}
 		
-		/* Check Max Negative Votes */
-		if( $rating == -1 )
+		/* Check Max Negative Votes if not like mode */
+		if ( $rating == -1 AND ! $this->isLikeMode() )
 		{
-			if( intval( ipsRegistry::member()->getProperty( 'g_rep_max_negative' ) ) === 0 )
+			if ( intval( $this->memberData['g_rep_max_negative'] ) === 0 )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_quota_neg'];
+				$this->error_message = $this->lang->words['reputation_quota_neg'];
 				return false;				
 			}
 			
-			$total = ipsRegistry::DB()->buildAndFetch( array( 
-																'select' => 'count(*) as votes', 
-																'from'   => 'reputation_index', 
-																'where'  => 'member_id=' . ipsRegistry::member()->getProperty( 'member_id' ) . ' AND rep_rating=-1 AND rep_date > ' . $day_cutoff
-														)	);
+			$total = $this->DB->buildAndFetch( array( 'select' => 'count(*) as votes', 
+													  'from'   => 'reputation_index', 
+													  'where'  => 'member_id=' . $this->memberData['member_id'] . ' AND rep_rating=-1 AND rep_date > ' . $day_cutoff )	);
 													
-			if( $total['votes'] >= ipsRegistry::member()->getProperty( 'g_rep_max_negative' ) )
+			if( $total['votes'] >= $this->memberData['g_rep_max_negative'] )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_quota_neg'];
+				$this->error_message = $this->lang->words['reputation_quota_neg'];
 				return false;				
 			}
 		}		
 		
-		/* If no member id was passted in, we have to query it using the config file */
+		/* If no member id was passed in, we have to query it using the config file */
 		if( ! $member_id )
 		{
 			/* Reputation Config */
-			if( file_exists( IPSLib::getAppDir( $app ) . '/extensions/reputation.php' ) )
+			if( is_file( IPSLib::getAppDir( $app ) . '/extensions/reputation.php' ) )
 			{
 				$rep_author_config = array();
-				require( IPSLib::getAppDir( $app ) . '/extensions/reputation.php' );
+				require( IPSLib::getAppDir( $app ) . '/extensions/reputation.php' );/*maybeLibHook*/
 			}
 			else
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_config'];
+				$this->error_message = $this->lang->words['reputation_config'];
 				return false;
 			}
 			
 			if( ! $rep_author_config[$type]['column'] || ! $rep_author_config[$type]['table'] )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_config'];
+				$this->error_message = $this->lang->words['reputation_config'];
 				return false;
 			}
 			
 			/* Query the content author */
-			$content_author = ipsRegistry::DB()->buildAndFetch( array(
-																		'select' => "{$rep_author_config[$type]['column']} as id",
-																		'from'   => $rep_author_config[$type]['table'],
-																		'where'  => "{$type}={$type_id}"
-															)	);
+			$content_author = $this->DB->buildAndFetch( array( 'select' => "{$rep_author_config[$type]['column']} as id",
+															   'from'   => $rep_author_config[$type]['table'],
+															   'where'  => "{$type}={$type_id}" )	);
 			
 			$member_id = $content_author['id'];
 		}
 		
-		if( ! ipsRegistry::$settings['reputation_can_self_vote'] && $member_id == ipsRegistry::member()->getProperty( 'member_id' ) )
+		if( ! ipsRegistry::$settings['reputation_can_self_vote'] && $member_id == $this->memberData['member_id'] )
 		{
-			$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_yourown'];
+			$this->error_message = $this->lang->words['reputation_yourown'];
 			return false;
 		}
 		
 		/* Query the member group */
 		if( ipsRegistry::$settings['reputation_protected_groups'] )
 		{
-			$member_group = ipsRegistry::DB()->buildAndFetch( array( 'select' => 'member_group_id', 'from' => 'members', 'where' => "member_id={$member_id}" ) );
+			$member_group = $this->DB->buildAndFetch( array( 'select' => 'member_group_id', 'from' => 'members', 'where' => "member_id={$member_id}" ) );
 			
 			if( in_array( $member_group['member_group_id'], explode( ',', ipsRegistry::$settings['reputation_protected_groups'] ) ) )
 			{
-				$this->error_message = ipsRegistry::instance()->getClass( 'class_localization' )->words['reputation_protected'];
+				$this->error_message = $this->lang->words['reputation_protected'];
 				return false;			
 			}
 		}
 		
 		/* Build the insert array */
-		$db_insert = array(
-							'member_id'  => ipsRegistry::member()->getProperty( 'member_id' ),
+		$db_insert = array( 'member_id'  => $this->memberData['member_id'],
 							'app'        => $app,
 							'type'       => $type,
 							'type_id'    => $type_id,
 							'rep_date'   => time(),
 							'rep_msg'    => $message,
-							'rep_rating' => $rating,
-						);								
+							'rep_rating' => $rating );								
 		
-		/* Check for existing rating */
-		$current_rating = ipsRegistry::DB()->buildAndFetch( array( 
-																			'select' => '*', 
-																			'from'   => 'reputation_index', 
-																			'where'  => "app='{$app}' AND type='{$type}' AND type_id={$type_id} AND member_id=".ipsRegistry::member()->getProperty( 'member_id' ),
-																	) 	);
-
 		/* Insert */
-		if( $current_rating )
+		if ( $currentRating )
 		{
-			//ipsRegistry::DB()->update( 'reputation_index', $db_insert, "app='{$app}' AND type='{$type}' AND type_id={$type_id} AND member_id=".ipsRegistry::member()->getProperty( 'member_id' ) );
-			return true;
+			if ( $rating == -1 && $this->isLikeMode() )
+			{
+				$this->DB->delete( 'reputation_index', "app='{$app}' AND type='{$type}' AND type_id={$type_id} AND member_id=".$this->memberData['member_id'] );
+			}
 		}
 		else
 		{
-			ipsRegistry::DB()->insert( 'reputation_index', $db_insert );
+			$this->DB->insert( 'reputation_index', $db_insert );
 		}
 		
-		/* Update type cache */
-		$this->_updateTypeCache( $app, $type, $type_id, $rating, $current_rating );
+		/* Update cache */
+		$this->updateCache( $app, $type, $type_id );
 
 		/* Get authors current rep */
-		$author_points = ipsRegistry::DB()->buildAndFetch( array( 
-																		'select' => 'pp_reputation_points', 
-																		'from'   => 'profile_portal',
-																		'where'  => "pp_member_id={$member_id}" 
-																)	 );
+		$author_points = $this->DB->buildAndFetch( array( 'select' => 'pp_reputation_points', 
+														  'from'   => 'profile_portal',
+														  'where'  => "pp_member_id={$member_id}" )	 );
 		
 		/* Figure out new rep */
-		if( $current_rating['rep_rating'] == -1 )
+		if( $currentRating['rep_rating'] == -1 )
 		{
 			$author_points['pp_reputation_points'] += 1;
 		}
-		else if( $current_rating['rep_rating'] == 1 )
+		else if ( $currentRating['rep_rating'] == 1 )
 		{
 			$author_points['pp_reputation_points'] -= 1;
 		}
-		$author_points['pp_reputation_points'] += $rating;
+		
+		/* now add on new rating if we're not like mode-ing */
+		if ( ( ! $this->isLikeMode() ) || ( empty( $currentRating['rep_rating'] ) && $this->isLikeMode() ) )
+		{
+			$author_points['pp_reputation_points'] += $rating;
+		}
 
-		ipsRegistry::DB()->update( 'profile_portal', array( 'pp_reputation_points' => $author_points['pp_reputation_points'] ), "pp_member_id={$member_id}" );
+		$this->DB->update( 'profile_portal', array( 'pp_reputation_points' => $author_points['pp_reputation_points'] ), "pp_member_id={$member_id}" );
+		
+		/* Notification */
+		if ( $rating == 1 && $this->isLikeMode() && $app == 'forums' && $type == 'pid' )
+		{
+			/* Check for class_forums */
+			if ( ! $this->registry->isClassLoaded( 'class_forums' ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/forums/class_forums.php", 'class_forums', 'forums' );
+				$this->registry->setClass( 'class_forums', new $classToLoad( $this->registry ) );
+				$this->registry->strip_invisible = 0;
+				$this->registry->class_forums->forumsInit();
+			}
+		
+			$classToLoad   = IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+			$notifyLibrary = new $classToLoad( $this->registry );
+			
+			if ( ! $this->registry->isClassLoaded('topics') )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . "/sources/classes/topics.php", 'app_forums_classes_topics', 'forums' );
+				$this->registry->setClass( 'topics', new $classToLoad( $this->registry ) );
+			}
+			
+			$post        = $this->registry->getClass('topics')->getPostById( $type_id );
+			
+			/* Set topic data */
+			$this->registry->getClass('topics')->setTopicData( $post );
+			
+			/* Quick check */
+			if ( ! $post['author_id'] OR $post['author_id'] == $this->memberData['member_id'] )
+			{
+				return true;
+			}
+			
+			$_toMember	 = IPSMember::load( $post['author_id'] );
+			
+			/* Set language */
+			$_toMember['language'] = $_toMember['language'] == "" ? IPSLib::getDefaultLanguage() : $_toMember['language'];
+			
+			/* Quick permission check */
+			if ( $this->registry->getClass('topics')->canView() !== true )
+			{
+				return true;
+			}
+			
+			$url = $this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}", "publicNoSession", $post['title_seo'], 'showtopic' );
+			
+			IPSText::getTextClass('email')->getTemplate( "new_likes", $_toMember['language'] );
+		
+			IPSText::getTextClass('email')->buildMessage( array('MEMBER_NAME'	=> $this->memberData['members_display_name'],
+																'SHORT_POST'	=> IPSText::truncate( IPSText::getTextClass( 'bbcode' )->stripAllTags( $post['post'] ), 300 ),
+																'URL'		    => $url ) );
+	
+			IPSText::getTextClass('email')->subject	= sprintf(  IPSText::getTextClass('email')->subject, 
+																$this->registry->output->buildSEOUrl( 'showuser=' . $this->memberData['member_id'], 'publicNoSession', $this->memberData['members_seo_name'], 'showuser' ), 
+																$this->memberData['members_display_name'],
+																$url,
+																$this->registry->output->buildSEOUrl( "showtopic={$post['topic_id']}", "publicNoSession", $post['title_seo'], 'showtopic' ),
+																IPSText::truncate( $post['topic_title'], 30 ) );
+	
+			$notifyLibrary->setMember( $_toMember );
+			$notifyLibrary->setFrom( $this->memberData );
+			$notifyLibrary->setNotificationKey( 'new_likes' );
+			$notifyLibrary->setNotificationUrl( $url );
+			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+			$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+			
+			try
+			{
+				$notifyLibrary->sendNotification();
+			}
+			catch( Exception $e ){}
+		}
 		
 		return true;		
 	}
@@ -363,6 +476,286 @@ class classReputationCache
 		return array( 'text' => $r['level_title'], 'image' => $r['level_image'] ? ipsRegistry::$settings['public_dir'] . 'style_extra/reputation_icons/' . $r['level_image'] : '' );
 	}
 	
+	/**
+	 * Get 'like' formatted for this item
+	 * 
+	 * @param	array	Data array 	( id, type, app )
+	 */
+	public function getLikeFormatted( $item )
+	{
+		$data   = array( 'names' => array(), 'count' => 0, 'formatted' => '', 'iLike' => false );
+		$max	= 0;
+		
+		/* Like system enabled? */
+		if ( $this->settings['reputation_point_types'] != 'like' )
+		{
+			return $data;
+		}
+		
+		$cache  = $this->getLikeData( $item );
+		
+		/* We had the total count set from cache.get */
+		if ( isset($cache['count']) AND $cache['count'] )
+		{
+			/* fetch data */
+			if ( $this->memberData['member_id'] AND in_array( $this->memberData['member_id'], $cache['memberIds'] ) )
+			{
+				/* Now mix up the data */
+				$data['names'][] = array( 'name' => $this->lang->words['post_like_moi'], 'seo' => $this->memberData['members_seo_name'], 'id' => $this->memberData['member_id'] );
+				
+				/* Flag as me */
+				$data['iLike'] = true;
+			}
+			
+			if ( is_array( $cache['memberNames'] ) )
+			{
+				$i   = 1;
+				$max = 3;
+				
+				foreach( $cache['memberNames'] as $mid => $mdata )
+				{
+					$_last = ( $i == count( $cache['memberNames'] ) || $i == $max ) ? 1 : 0;
+					
+					/* Is this you? */
+					if ( $mid == $this->memberData['member_id'] )
+					{
+						continue;
+					}
+					
+					/* Push it on */
+					$data['names'][] = array( 'name' => $mdata['n'], 'seo' => $mdata['s'], 'id' => $mid, 'last' => $_last );
+					
+					$i++;
+					
+					if ( $i > $max )
+					{
+						/* Done thanks */
+						break;
+					}
+				}
+			}
+		}
+		
+		/* Finish off */
+		$data['totalCount']  = isset($cache['count']) ? $cache['count'] : 0;
+		$data['othersCount'] = isset($cache['count']) ? ( ( $cache['count'] > $max ) ? $cache['count'] - $max : 0 ) : 0;
+		$data['formatted']   = $this->formatLikeNameString( $data, $item );
+		
+		return $data;
+	}
+	
+	/**
+	 * Gets 'like' data for this item
+	 * 
+	 * @param	array	( id, type, app )
+	 * @return	array
+	 * 
+	 */
+	public function getLikeData( $data )
+	{
+		$store   = array( 'cache_data' => array() );
+		$expired = false;
+		
+		if ( IPSLib::isSerialized( $data['rep_like_cache'] ) )
+		{ 
+			$store = unserialize( $data['rep_like_cache'] );
+			
+			if ( empty( $store['cache_expire'] ) OR time() >= $store['cache_expire'] )
+			{
+				$expired = true;
+				$store   = array();
+			}
+		}
+		
+		if ( ! isset( $data['rep_like_cache'] ) OR $expired === true )
+		{
+			$store = $this->getLikeRawData( $data );
+
+			$this->DB->replace( 'reputation_cache', array( 'app'	        => $data['app'],
+														   'type'           => $data['type'],
+														   'type_id'        => $data['id'],
+														   'rep_like_cache' => serialize( $store ) ), array( 'app', 'type', 'type_id' ) );
+		}
+		
+		return $store['cache_data'];
+	}
+	
+	/**
+	 * Get the like data from the DB (no cache)
+	 * 
+	 * @param	array		$data		Like data ( id, type, app )
+	 * @return	@e array	Cache data
+	 */
+	public function getLikeRawData( $data )
+	{
+		/* Get data */
+		$store = array( 'cache_data' => array(), 'cache_expire' => time() + 86400 );
+
+		$this->DB->build( array( 'select'	=> 'r.member_id, r.rep_rating',
+								 'from'		=> array( 'reputation_index' => 'r' ),
+								 'where'	=> "r.app='" . $data['app'] . "' AND r.type='" . $data['type'] . "' AND r.type_id='" . $data['id'] . "'",
+								 //'order'	=> 'r.rep_date',
+								 'add_join' => array( array( 'select' => 'm.members_display_name, m.members_seo_name',
+															 'from'   => array( 'members' => 'm' ),
+															 'where'  => 'm.member_id=r.member_id',
+															 'type'   => 'left' ) ) ) );
+				
+		$q = $this->DB->execute();
+		
+		while ( $row = $this->DB->fetch( $q ) )
+		{
+			if ( $row['rep_rating'] == 1 )
+			{
+				$data['count']++;
+				
+				if ( $data['count'] <= 5 )
+				{
+					$data['memberNames'][ $row['member_id'] ] = array( 'n' => $row['members_display_name'], 's' => $row['members_seo_name'] );
+				}
+				
+				if ( $data['count'] <= 500 )
+				{
+					$data['memberIds'][] = $row['member_id'];
+				}
+			}
+		}
+
+		/* Fetch and store */
+		if ( $data['count'] > 0 )
+		{
+			$store = array( 'cache_data'   => $data,
+						    'cache_expire' => time() + 86400 );
+		}
+		
+		return $store;
+	}
+	
+	/**
+	 * Formats the Bob, Bill, Joe and 2038 Others Hate You
+	 * 
+	 * @param	array	$data
+	 * @param	array	$item	Data (id, type, app)
+	 * @return	string
+	 */
+	public function formatLikeNameString( array $data, array $item )
+	{
+		$langString  = '';
+		$seeMoreLink = '#';
+	
+		if ( ! is_array( $data['names'] ) OR ! count( $data['names'] ) )
+		{
+			return false;
+		}
+		/* Format up the names */
+		$i      = 0;
+		$_names = array();
+		
+		foreach( $data['names'] as $name )
+		{
+			if ( $this->memberData['member_id'] AND ( $this->memberData['member_id'] == $name['id'] ) )
+			{
+				$_names[$i] = $name['name'];
+			}
+			else
+			{
+				$_names[$i] = IPSMember::makeProfileLink($name['name'], $name['id'], $name['seo'] );
+			}
+			
+			$i++;
+		}
+
+		/* More than one? */
+		if ( $data['totalCount'] > 1 )
+		{
+			/* Joe and Matt love you */
+			if ( $data['totalCount'] == 2 )
+			{
+				$_n = $_names[0] . ' ' . $this->lang->words['post_like_and'] . ' ' . $_names[1];
+				
+				$langString = sprintf( $this->lang->words['post_like_formatted_many'], $_n );
+			}
+			/* Joe, Matt and Mike love you more */
+			else if ( $data['totalCount'] == 3 )
+			{
+				$_n = $_names[0] . ', ' . $_names[1] . ' ' . $this->lang->words['fave_and'] . ' ' . $_names[2];
+				
+				$langString = sprintf( $this->lang->words['post_like_formatted_many'], $_n );
+			}
+			/* Joe, Matt, Mike and 1 more love you */
+			else if ( $data['totalCount'] == 4 )
+			{
+				$_n = $_names[0] . ', ' . $_names[1] . ', ' . $_names[2];
+				
+				$langString = sprintf( $this->lang->words['post_like_formatted_one_more'], $_n, $seeMoreLink, $item['id'], $item['type'], $item['app'] );
+			}
+			/* Joe, Matt, Mike and 5 more are indifferent to your redonkulous comments */
+			else
+			{
+				$_n = $_names[0] . ', ' . $_names[1] . ', ' . $_names[2];
+				
+				$langString = sprintf( $this->lang->words['post_like_formatted_more'], $_n, $seeMoreLink, $item['id'], $item['type'], $item['app'], $data['othersCount'] );
+			}
+		}
+		else
+		{
+			/* Just the one and it might be you! */	
+			if ( $data['names'][0]['id'] == $this->memberData['member_id'] )
+			{
+				$langString = $this->lang->words['post_like_formatted_me'];
+			}
+			else
+			{
+				$langString = sprintf( $this->lang->words['post_like_formatted_one'], $_names[0] );
+			}
+		}
+
+		return $langString;
+	}
+	
+	/**
+	 * Get data based on a relationship ID
+	 *
+	 * @param	array 	$data (id, type, app)
+	 * @return	mixed	Array of like data OR null
+	 */
+	public function getDataByRelationshipId( $data )
+	{
+		/* Init */
+		$mids	 = array();
+		$members = array();
+		$rows    = array();
+		$where   = ( ! empty( $data['rating'] ) ) ? " AND rep_rating=" . $data['rating'] : '';
+		
+		/* Fetch data */	
+		$this->DB->build( array( 'select' => '*',
+					   			 'from'   => 'reputation_index',
+								 'where'  => 'app=\'' . $data['app'] . "' AND type='" . $data['type'] . "' AND type_id=" . intval( $data['id'] ) . $where,
+								 'order'  => 'rep_date DESC',
+								 'limit'  => array( 0, 250 ) ) );
+		
+		$o = $this->DB->execute();
+		
+		while( $row = $this->DB->fetch( $o ) )
+		{
+			$return[ $row['member_id'] ] = $row;
+			$mids[ $row['member_id'] ]   = intval( $row['member_id'] );
+		}
+		
+		/* Just the one? */
+		if ( count( $mids ) )
+		{
+			$members = IPSMember::load( $mids, 'all' );
+		
+			foreach( $members as $i => $d )
+			{
+				$_m = IPSMember::buildProfilePhoto( $d );
+				$return[ $i ] = array_merge( (array) $_m, (array) $return[ $i ] );
+			}
+		}
+		
+		return ( is_array( $return ) ) ? $return : null;
+	}
+	
 	/**
 	 * Handles updating and creating new caches
 	 *
@@ -370,38 +763,31 @@ class classReputationCache
 	 * @param	string	$app		App for this content
 	 * @param	string	$type		Type of content, ex; Post
 	 * @param	integer	$type_id	ID of the type, ex: pid
-	 * @param	integer	$rating		Either 1 or -1
-	 * @param	array 	$old_record	If this is a revote, then this array contains the previous vote
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _updateTypeCache( $app, $type, $type_id, $rating, $old_record )
+	public function updateCache( $app, $type, $type_id )
 	{		
 		/* Update type cache */
-		$type_cache = ipsRegistry::DB()->buildAndFetch( array( 
-																	'select' => '*', 
-																	'from'   => 'reputation_cache', 
-																	'where'  => "app='{$app}' AND type='$type' AND type_id='$type_id'",
-															)	);
+		$data = $this->DB->buildAndFetch( array( 'select' => 'SUM(rep_rating) as sum, COUNT(*) as count', 
+												 'from'   => 'reputation_index', 
+												 'where'  => "app='{$app}' AND type='$type' AND type_id='$type_id'" )	);
 													
+		/* Fetch LIKE data */
+		$store = $this->getLikeRawData( array( 'id' => $type_id, 'type' => $type, 'app' => $app ) );
+		
 		/* Update cache */
-		if( $type_cache )
-		{
-			/* Previous rating? */
-			if( $old_record['rep_rating'] == -1 )
-			{
-				$type_cache['rep_points'] += 1;
-			}
-			else if( $old_record['rep_rating'] == 1 )
-			{
-				$type_cache['rep_points'] -= 1;
-			}
-			
-			ipsRegistry::DB()->update( 'reputation_cache', array( 'rep_points' => $type_cache['rep_points'] + $rating ), "app='{$app}' AND type='$type' AND type_id='$type_id'" );
-		}
-		/* Insert Cache */
-		else
-		{
-			ipsRegistry::DB()->insert( 'reputation_cache', array( 'app' => $app, 'type' => $type, 'type_id' => $type_id, 'rep_points' => $rating ) );
-		}		
+		$this->DB->replace( 'reputation_cache', array( 'app'	        => $app,
+													   'type'           => $type,
+													   'type_id'        => $type_id,
+													   'rep_points'		=> intval($data['sum']),
+													   'rep_like_cache' => serialize( $store ) ), array( 'app', 'type', 'type_id' ) );
+	}
+	
+	/**
+	 * Is this in like mode?
+	 */
+	public function isLikeMode()
+	{
+		return ( $this->settings['reputation_point_types'] == 'like' ) ? true : false;
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/class_taskmanager.php b/upload/admin/sources/classes/class_taskmanager.php
index 008844a7..869d4aca 100644
--- a/upload/admin/sources/classes/class_taskmanager.php
+++ b/upload/admin/sources/classes/class_taskmanager.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Task Manager Library
- * Last Updated: $Date: 2010-08-30 19:21:56 -0400 (Mon, 30 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6810 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -63,7 +63,7 @@ class class_taskmanager
 	 *
 	 * @access	public
 	 * @param	object 		ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -93,8 +93,7 @@ class class_taskmanager
 	/**
 	 * Run a task
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runTask()
 	{
@@ -132,7 +131,7 @@ class class_taskmanager
 			/* Check to make sure the app is enabled and exists */
 			$this_task = $this->_checkAppEnabled( $this_task );
 		}
-		else
+		else if ( $this->type == 'cron' )
 		{
 			//-----------------------------------------
 			// Cron.. load from cron key
@@ -142,10 +141,17 @@ class class_taskmanager
 															'from'   => 'task_manager',
 															'where'  => "task_cronkey='".$this->cron_key."'",
 												   )      );
-		
+
+			//-----------------------------------------
+			// Verify application is enabled
+			//-----------------------------------------
+			
+			if ( ! $this_task['task_application'] OR ! ipsRegistry::$applications[ $this_task['task_application'] ]['app_enabled'] )
+			{
+				return;
+			}
 		}
-		
-											   
+
 		if ( $this_task['task_id'] )
 		{
 			//-----------------------------------------
@@ -181,10 +187,10 @@ class class_taskmanager
 			
 			$this->saveNextRunStamp();
 			
-			if ( file_exists( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'] ) )
+			if ( is_file( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'] ) )
 			{
-				require_once( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'] );
-				$myobj = new task_item( $this->registry, $this, $this_task );
+				$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $this_task['task_application'] ) . '/tasks/' . $this_task['task_file'], 'task_item', $this_task['task_application'] );
+				$myobj = new $classToLoad( $this->registry, $this, $this_task );
 				$myobj->runTask();
 				
 				//-----------------------------------------
@@ -219,7 +225,7 @@ class class_taskmanager
 	{
 		if( is_array($task) AND count($task) )
 		{
-			if ( !isset($task['task_id']) OR !$task['task_id'] )
+			if ( empty($task['task_id']) )
 			{
 				return false;
 			}
@@ -244,7 +250,7 @@ class class_taskmanager
 	 * Update the task's next run timestamp
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveNextRunStamp()
 	{
@@ -477,7 +483,7 @@ class class_taskmanager
 	 * @access	public
 	 * @param	array 		Task data
 	 * @param 	string		Description to add to the log file
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function appendTaskLog( $task, $desc )
 	{
@@ -490,7 +496,7 @@ class class_taskmanager
 					   'log_date'  => time(),
 					   'log_ip'    => my_getenv('REMOTE_ADDR'),
 					   'log_desc'  => $desc
-					 );
+					  );
 					 
 		$this->DB->insert( 'task_logs', $save );
 	}
@@ -499,7 +505,7 @@ class class_taskmanager
 	 * Add a month to the next run timestamp
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _addMonth()
 	{
@@ -519,7 +525,7 @@ class class_taskmanager
 	 *
 	 * @access	protected
 	 * @param	integer		Number of days to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _addDay($days=1)
 	{
@@ -539,7 +545,7 @@ class class_taskmanager
 	 *
 	 * @access	protected
 	 * @param	integer		Number of hours to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _addHour($hour=1)
 	{
@@ -559,7 +565,7 @@ class class_taskmanager
 	 *
 	 * @access	protected
 	 * @param	integer		Number of minutes to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _addMinute($mins=1)
 	{
@@ -580,19 +586,16 @@ class class_taskmanager
 	 * @param		array	Task Data
 	 * @return		array	Task Data
 	 */
-	private function _checkAppEnabled( $task )
+	protected function _checkAppEnabled( $task )
 	{
 		if ( ! $task['task_application'] OR ! ipsRegistry::$applications[ $task['task_application'] ]['app_enabled'] )
 		{
 			/* Best update them all */
 			$_apps = array();
 			
-			foreach( ipsRegistry::$applications as $appDir => $appData )
+			foreach( IPSLib::getEnabledApplications() as $appDir => $appData )
 			{
-				if ( $appData['app_enabled'] )
-				{
-					$_apps[] = "'" . $appDir . "'";
-				}
+				$_apps[] = "'" . $appDir . "'";
 			}
 			
 			$this->DB->update( 'task_manager', array( 'task_enabled' => 0 ), 'task_application NOT IN (' . implode( ',', $_apps ) . ')' );
@@ -608,5 +611,4 @@ class class_taskmanager
 		
 		return $task;	
 	}
-}
-
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/comments/bootstrap.php b/upload/admin/sources/classes/comments/bootstrap.php
index cb920be0..985e1abf 100644
--- a/upload/admin/sources/classes/comments/bootstrap.php
+++ b/upload/admin/sources/classes/comments/bootstrap.php
@@ -4,10 +4,10 @@
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6651 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9602 $
  *
  */
 
@@ -30,17 +30,17 @@ class classes_comments_bootstrap
 		{
 			list( $app, $key ) = explode( '-', $app );
 		}
-		
+				
 		$_file = IPSLib::getAppDir( $app ) . '/extensions/comments/' . $key . '.php';
 		$_class = 'comments_' . $app . '_' . $key;
 		
-		if ( file_exists( $_file ) )
+		if ( is_file( $_file ) )
 		{
-			require_once( $_file );
-
-			if ( class_exists( $_class ) )
+			$classToLoad = IPSLib::loadLibrary( $_file, $_class, $app );
+			
+			if ( class_exists( $classToLoad ) )
 			{
-				self::$_app = new $_class();
+				self::$_app = new $classToLoad();
 				self::$_app->init();
 			}
 			else
@@ -55,7 +55,7 @@ class classes_comments_bootstrap
 		
 		/* Load up language file */
 		$registry = ipsRegistry::instance();
-		$registry->getClass('class_localization')->loadLanguageFile( array( 'public_comments' ), 'core' );
+		$registry->getClass('class_localization')->loadLanguageFile( array( 'public_comments', 'public_editors' ), 'core' );
 		
 		return self::$_app;
 	}
@@ -74,7 +74,9 @@ abstract class classes_comments_renderer
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/	
 	
 	protected $_cache = array();
@@ -91,17 +93,35 @@ abstract class classes_comments_renderer
 	 * @param	array
 	 */
 	protected $_settings;
-	
+
 	/**
-	 * Constructor
+	 * CONSTRUCTOR
 	 *
-	 * @param	ipsRegistry	$registry
-	 * @param	string		App key to use will use current app if none specified
-	 * @return	void
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make registry objects */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	}
+
+	/**
+	 * Init method
+	 *
+	 * @return	@e void
 	 */
 	public function init()
 	{
 		$this->lang->loadLanguageFile( array( 'public_topic' ), 'forums' );
+
 		/* Init some data */
 		$this->_settings = $this->settings();
 		$this->qpids = IPSCookie::get( 'comment_pids' );
@@ -110,6 +130,24 @@ abstract class classes_comments_renderer
 		IPSCookie::set('commentmodpids', '', 0);
 	}
 	
+	/**
+	 * Get report center library
+	 *
+	 * @return	@e object
+	 */
+	public function getReportLibrary()
+	{
+		static $reports		= null;
+		
+		if( !$reports )
+		{
+			$classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir('core') . '/sources/classes/reportLibrary.php', 'reportLibrary', 'core' );
+			$reports		= new $classToLoad( $this->registry );
+		}
+		
+		return $reports;
+	}
+	
 	/**
 	 * Fetch setting
 	 *
@@ -151,6 +189,7 @@ abstract class classes_comments_renderer
 		$_remap   = $this->remapKeys();
 		$parent   = $this->remapFromLocal( $parent, 'parent' );
 		$preReply = '';
+		
 		$data     = array( 'counts' => array( 'commentTotal'  => 0,
 											  'thisPageCount' => 0,
 							   				  'perPage'	      => $filters['limit'],
@@ -158,11 +197,13 @@ abstract class classes_comments_renderer
 		/* Fetch raw data */
 		$comments = $this->fetch( $parent, $filters );
 		
+		list( $app, $_where ) = explode( '-', $this->whoAmI() );
+		
 		if ( $comments === false )
 		{
 			return false;
 		}
-		 
+				 
 		/* Can comment */
 		$parent['_canComment'] = ( $this->can( 'add', array( 'comment_parent_id' => $parent['parent_id'] ) ) === true ) ? true : false;
 			
@@ -185,6 +226,7 @@ abstract class classes_comments_renderer
 												 						  'itemsPerPage'		=> $filters['limit'],
 												 						  'currentStartValue'	=> $filters['offset'],
 												 						  'baseUrl'				=> sprintf( $this->fetchSetting('urls-showParent', $parent), $parent['parent_id'] ),
+												 						  'anchor'				=> 'commentsStart',
 												 						  'base'				=> 'public',
 												 						  'seoTitle'			=> $parent['parent_seo_title'],
 												 						  'seoTemplate'			=> $this->seoTemplate() ) );
@@ -192,20 +234,36 @@ abstract class classes_comments_renderer
 		}
 		
 		
-		$data['settings']    = $this->settings();
-		$data['canModerate'] = ( $parent['_canModerate'] ) ? true : false;
-		$data['fromApp']     = $this->whoAmI();
-		$data['_app']        = preg_replace( '#^(.+?)(?:-.*|$)#', '\\1', $this->whoAmI() );
+		$data['settings']		= $this->settings();
+		$data['canModerate']	= ( $parent['_canModerate'] ) ? true : false;
+		$data['fromApp']		= $this->whoAmI();
+		$data['thisApp']		= $app;
+		$data['repType']		= $_remap['comment_id'];
+		$data['enableRep']		= $this->reputationEnabled();
+		$data['autoSaveKey']	= 'comment-' . $this->table() . '-' . $parent['parent_id'];
+		
+		$data['captcha']		= $this->getCaptcha();
 		
 		/* Got a reply? */
-		if ( isset( $this->request['_rcid'] ) AND $this->request['_rcid'] )
+		if ( !empty( $this->request['_rcid'] ) )
 		{
 			$preReply = $this->fetchReply( $parent['parent_id'], $this->request['_rcid'], $this->memberData );
 		}
-		
+
 		return $this->registry->output->getTemplate( $this->skin() )->commentsList( $comments, $data, $pages, $parent, $preReply );
 	}
 	
+	/**
+	 * Returns recaptcha data if we are a guest
+	 */
+ 	public function getCaptcha()
+ 	{
+ 		if( !$this->memberData['member_id'] AND $this->settings['guest_captcha'] )
+ 		{
+ 			return $this->registry->getClass('class_captcha')->getTemplate();
+ 		}
+ 	}
+	
 	/**
 	 * Fetch a total count of comments we can see
 	 *
@@ -257,6 +315,8 @@ abstract class classes_comments_renderer
 		$parent   = $this->remapFromLocal( $parent, 'parent' );
 		$_remap   = $this->remapKeys();
 		
+		list( $app, $_where ) = explode( '-', $this->whoAmI() );
+		
 		/* Fetch raw data */
 		$comments = $this->fetch( $parent, $filters );
 		$comment  = array_pop( $comments );
@@ -267,11 +327,13 @@ abstract class classes_comments_renderer
 		}
 			
 		/* Can moderate? */
-		$parent['_canModerate'] = $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) );
+		$parent['_canModerate'] = $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) ) === true ? true: false;
 		
-		$data['settings'] = $this->settings();
-		$data['fromApp']  = $this->whoAmI();
-		$data['_app']     = preg_replace( '#^(.+?)(?:-.*|$)#', '\\1', $this->whoAmI() );
+		$data['settings']	= $this->settings();
+		$data['fromApp']	= $this->whoAmI();
+		$data['thisApp']	= $app;
+		$data['repType']	= $_remap['comment_id'];
+		$data['enableRep']	= $this->reputationEnabled();
 		
 		return $this->registry->output->getTemplate( $this->skin() )->comment( $comment, $parent, $data );
 	}
@@ -285,7 +347,7 @@ abstract class classes_comments_renderer
 	{
 		$_remap = $this->remapKeys();
 		
-		if ( ! array_key_exists( $commentId, $this->_cache ) )
+		if ( ! isset( $this->_cache[ $commentId ] ) )
 		{
 			$comment = $this->DB->buildAndFetch( array( 'select' => '*',
 									 		 			'from'  => $this->table(),
@@ -314,41 +376,41 @@ abstract class classes_comments_renderer
 		}
 		
 		/* Set filters */
-		$filters  = $this->_setFilters( $filters );
-		$parent   = $this->remapFromLocal( $parent, 'parent' );
-		$comments = array();
-		$q        = array();
-		$_remap = $this->remapKeys();
-		
+		$filters              = $this->_setFilters( $filters );
+		$parent               = $this->remapFromLocal( $parent, 'parent' );
+		$comments             = array();
+		$q                    = array();
+		$_remap               = $this->remapKeys();
+		list( $app, $_where ) = explode( '-', $this->whoAmI() );
+
 		/* unpack cache */
 		$this->_unpackRepCache();
 		
 		/* Joins */
-		$_post_joins = array( array( 'type'		=> 'left',
-									 'select'	=> 'm.*',
+		$_post_joins = array( array( 'select'	=> 'm.*',
 									 'where'	=> 'm.member_id=c.' . $_remap['comment_author_id'],
-									 'from'		=> array( 'members' => 'm' ) ),
-							  array( 'type'		=> 'left',
-									 'select'	=> 'pc.*',
+									 'from'		=> array( 'members' => 'm' ),
+									 'type'		=> 'left', ),
+							  array( 'select'	=> 'pc.*',
 									 'where'	=> 'pc.member_id=m.member_id',
-									 'from'		=> array( 'pfields_content' => 'pc' ) ),
-							  array( 'type'		=> 'left',
-									 'select'	=> 'pp.*',
+									 'from'		=> array( 'pfields_content' => 'pc' ),
+									 'type'		=> 'left', ),
+							  array( 'select'	=> 'pp.*',
 									 'where'	=> 'pp.pp_member_id=m.member_id',
-									 'from'		=> array( 'profile_portal' => 'pp' ) ) );
-							
-	
+									 'from'		=> array( 'profile_portal' => 'pp' ),
+									 'type'		=> 'left', ),
+							 );
 		
 		/* Reputation system enabled? */
 		if ( $this->settings['reputation_enabled'] )
 		{
 			/* Add the join to figure out if the user has already rated the post */
-			$_post_joins[] = $this->registry->repCache->getUserHasRatedJoin( $_remap['comment_id'], 'c.' . $_remap['comment_id'], $this->whoAmI() );
+			$_post_joins[] = $this->registry->repCache->getUserHasRatedJoin( $_remap['comment_id'], 'c.' . $_remap['comment_id'], $app );
 			
 			/* Add the join to figure out the total ratings for each post */
 			if( $this->settings['reputation_show_content'] )
 			{
-				$_post_joins[] = $this->registry->repCache->getTotalRatingJoin( $_remap['comment_id'], 'c.' . $_remap['comment_id'], $this->whoAmI() );
+				$_post_joins[] = $this->registry->repCache->getTotalRatingJoin( $_remap['comment_id'], 'c.' . $_remap['comment_id'], $app );
 			}
 		}
 		
@@ -356,9 +418,9 @@ abstract class classes_comments_renderer
 		$q[] = "c." . $_remap['comment_parent_id'] . "=" . $parent['parent_id'];
 		
 		/* Can moderate? */
-		if ( ! $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) ) )
+		if ( $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) ) !== true )
 		{
-			$q[] = $_remap['comment_approved'] . '=1';
+			$q[] = 'c.' . $_remap['comment_approved'] . '=1';
 		}
 		
 		/* Fetching a single comment? */
@@ -366,37 +428,39 @@ abstract class classes_comments_renderer
 		{
 			if ( is_numeric( $filters['comment_id'] ) )
 			{
-				$q[] = $_remap['comment_id'] . '=' . intval( $filters['comment_id'] );
+				$q[] = 'c.' . $_remap['comment_id'] . '=' . intval( $filters['comment_id'] );
 			}
 			else if ( is_array( $filters['comment_id'] ) )
 			{
-				$q[] = $_remap['comment_id'] . ' IN(' . implode( ",", IPSLib::cleanIntArray( $filters['comment_id'] ) ) . ')';
+				$q[] = 'c.' . $_remap['comment_id'] . ' IN(' . implode( ",", IPSLib::cleanIntArray( $filters['comment_id'] ) ) . ')';
 			}
 		}
-		
+				
 		/* Set up parser */
-		IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_wordwrap			= $this->settings['post_wordwrap'];
-		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
-		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
-		IPSText::getTextClass( 'bbcode' )->parsing_section			= $this->whoAmI() . '_comment';
-			
+		IPSText::getTextClass('bbcode')->parse_html			= 0;
+		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
+		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+		IPSText::getTextClass('bbcode')->parsing_section	= $this->bbcodeSection();
+
 		/* Fetch the data */
 		$this->DB->build( array( 'select'	=> 'c.*',
 								 'from'		=> array( $this->table() => 'c' ),
 								 'where'	=> implode( ' AND ', $q ),
-								 'order'    => $_remap[ $filters['sortKey'] ] . ' ' . $_remap[ $filters['sortOrder'] ],
+								 'order'    => $_remap[ $filters['sortKey'] ] . ' ' . $filters['sortOrder'],
 								 'limit'    => array( $filters['offset'], $filters['limit'] ),
 								 'add_join'	=> $_post_joins ) );
-						
+		
 		$oq = $this->DB->execute();
 		
 		/* Go get 'em bawss */
 		while( $row = $this->DB->fetch( $oq ) )
 		{
+			/* Reset member ID */
+			$row['member_id'] = $row[ $_remap['comment_author_id'] ];
+			
 			/* Set up parser */
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup		 = $row['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others = $row['mgroup_others'];
+			IPSText::getTextClass('bbcode')->parsing_mgroup		 	= $row['member_group_id'];
+			IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $row['mgroup_others'];
 
 			/* Remap */
 			$row = $this->remapFromLocal( $row );
@@ -444,10 +508,13 @@ abstract class classes_comments_renderer
 			}
 			
 			/* Edit button */
-			$row['_canEdit'] = $this->can('edit', $row);
+			$row['_canEdit'] = ( $this->can('edit', $row) === true ) ? 1 : 0;
 			
-			/* Edit button */
-			$row['_canDelete'] = $this->can('delete', $row);
+			/* Delete button */
+			$row['_canDelete'] = ( $this->can('delete', $row) === true ) ? 1 : 0;
+			
+			/* Reply button */
+			$row['_canReply'] = ( $this->can('add', $row) === true ) ? 1 : 0;
 			
 			/* Report link */
 			if ( $this->fetchSetting('urls-report', $parent) )
@@ -467,13 +534,20 @@ abstract class classes_comments_renderer
 			}
 			
 			/* Ensure parity */
-			$row['member_id'] = $row['comment_author_id'];
+			$row['member_id']				= $row['comment_author_id'];
+			$row['members_display_name']	= $row['members_display_name'] ? $row['members_display_name'] : $this->lang->words['global_guestname'];
+			
+			/* Reputation */
+			if ( $this->settings['reputation_enabled'] )
+			{
+				$row['like']	= $this->registry->repCache->getLikeFormatted( array( 'app' => $app, 'type' => $_remap['comment_id'], 'id' => $row['comment_id'], 'rep_like_cache' => $row['rep_like_cache'] ) );
+			}
 			
 			/* Done */
 			$comments[ $row['comment_id'] ] = array( 'author' => IPSMember::buildDisplayData( $row ), 'comment' => $row );
 		}
 
-		return ( is_array( $comments ) ) ? $comments : array();
+		return is_array($comments) ? $comments : array();
 	}
 	
 	/**
@@ -572,6 +646,16 @@ abstract class classes_comments_renderer
 		/* Load member */
 		$memberData = IPSMember::load( ( ( $memberId === null ) ? $this->memberData['member_id'] : $memberId ), 'all' );
 		
+		if( !$memberData['member_id'] )
+		{
+			if( !$this->request['comment_name'] )
+			{
+				throw new Exception( 'NO_NAME' );
+			}
+
+			$memberData['members_display_name']	= $this->request['comment_name'];
+		}
+		
 		/* Permission test */
 		$can = $this->can('add', array( 'comment_parent_id' => $parentId ) );
 		
@@ -581,12 +665,16 @@ abstract class classes_comments_renderer
 		}
 		
 		/* Format comment */
-		IPSText::getTextClass( 'bbcode' )->parsing_section = $this->whoAmI() . '_comment';
-		$comment = IPSText::getTextClass( 'editor' )->processRawPost( $post );
+		IPSText::getTextClass( 'bbcode' )->parsing_section = $this->bbcodeSection();
+
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor = new $classToLoad();
+		
+		$comment = $editor->process( $post );
 		$comment = IPSText::getTextClass( 'bbcode' )->preDbParse( $comment );
 						 
 		/* Build insert data */
-		$array  = array( 'comment_author_id'   => $memberData['member_id'],
+		$array  = array( 'comment_author_id'   => intval( $memberData['member_id'] ),
 						 'comment_author_name' => $memberData['members_display_name'],
 						 'comment_ip_address'  => $this->member->ip_address,
 						 'comment_date'        => time(),
@@ -605,12 +693,18 @@ abstract class classes_comments_renderer
 		$insert['comment_id'] = $this->DB->getInsertId();
 		
 		/* Post save */
-		$this->postSave( 'add', $insert );
+		$this->postSave( 'add', $insert, $insert['comment_id'], $parentId );
+		
+		/* remove saved content */
+		if ( $this->memberData['member_id'] )
+		{
+			$editor->removeAutoSavedContent( array( 'member_id' => $this->memberData['member_id'], 'autoSaveKey' => 'comment-' . $this->table() . '-' . $parentId ) );
+		}
 		
 		/* Send notifications */
 		$this->sendNotifications( $this->remapFromLocal( $insert ), $comment );
 		
-		return $insert['comment_id'];
+		return $insert;
 	}
 	
 	/**
@@ -632,22 +726,29 @@ abstract class classes_comments_renderer
 			/* Fetch meta data */
 			$parent	= $this->remapFromLocal( $this->fetchParent( $array['comment_parent_id'] ), 'parent' );
 			
-			$_url = $this->fetchSetting( 'urls-showParent');
+			$_url = $this->fetchSetting( 'urls-showParent', $parent );
 			$url  = $this->registry->output->buildSEOUrl( sprintf( $_url, $parent['parent_id'] ), 'public', $parent['parent_seo_title'], $this->seoTemplate() );
 			
 			/* Fetch like class */
-			require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );
-			$_like = classes_like::bootstrap( $_app, $_area );
-			
-			$_like->sendNotifications( $parent['parent_id'], array( 'immediate', 'offline' ), array( 'notification_key'		=> 'new_comment',
-																								     'notification_url'		=> $url,
-																								     'email_template'		=> 'comment_notifications',
-																								     'email_subject'		=> sprintf( $this->lang->words['comment_notice_subject'], $url, $parent['parent_title'] ),
-																								     'build_message_array'	=> array( 'NAME'  		=> '-member:members_display_name-',
-																																      'AUTHOR'		=> $this->memberData['members_display_name'],
-																																      'TITLE' 		=> $parent['parent_title'],
-																																      'URL'			=> $url,
-																																      'COMMENT'		=> $comment ) ) );
+			try
+			{
+				require_once( IPS_ROOT_PATH . 'sources/classes/like/composite.php' );/*noLibHook*/
+				$_like = classes_like::bootstrap( $_app, $_area );
+				
+				$_like->sendNotifications( $parent['parent_id'], array( 'immediate', 'offline' ), array( 'notification_key'		=> 'new_comment',
+																									     'notification_url'		=> $url,
+																									     'email_template'		=> 'comment_notifications',
+																									     'email_subject'		=> sprintf( $this->lang->words['comment_notice_subject'], $url, $parent['parent_title'] ),
+																									     'build_message_array'	=> array( 'NAME'  		=> '-member:members_display_name-',
+																																	      'AUTHOR'		=> $this->memberData['members_display_name'],
+																																	      'TITLE' 		=> $parent['parent_title'],
+																																	      'URL'			=> $url,
+																																	      'COMMENT'		=> $comment ) ) );
+			}
+			catch( Exception $e )
+			{
+				/* No like class for this comment class */
+			}
 		}
 	}
 	
@@ -694,16 +795,19 @@ abstract class classes_comments_renderer
 		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
 		IPSText::getTextClass('bbcode')->parse_smilies		= 1;
 		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-		IPSText::getTextClass('bbcode')->parsing_section    = $this->whoAmI . '_comment';
+		IPSText::getTextClass('bbcode')->parsing_section    = $this->bbcodeSection();
 		
-		$comment = IPSText::getTextClass( 'editor' )->processRawPost( $post );
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor = new $classToLoad();
+		
+		$comment = $editor->process( $post );
 		$comment = IPSText::getTextClass( 'bbcode' )->preDbParse( $comment );
 							 
 		/* Update array */
 		$array  = array( 'comment_edit_date' => time(),
 						 'comment_text'		 => $comment );
 		/* Pre save */
-		$update = $this->preSave( 'edit', $array );
+		$update = $this->preSave( 'edit', $array, $commentId, $parentId );
 		
 		/* Insert and fetch DB */
 		$save = $this->remapToLocal( $update );
@@ -712,9 +816,23 @@ abstract class classes_comments_renderer
 		$this->DB->update( $this->table(), $save, $_remap['comment_id'] . '=' . intval( $commentId ) );
 		
 		/* Post save */
-		$this->postSave( 'edit', $update );
+		$this->postSave( 'edit', $update, $commentId, $parentId );
 		
+		/* remove saved content */
+		if ( $this->memberData['member_id'] )
+		{
+			$editor->removeAutoSavedContent( array( 'member_id' => $this->memberData['member_id'], 'autoSaveKey' => 'comment-' . $this->table() . '-c' . $commentId ) );
+		}
+
 		/* Format and return */
+		IPSText::getTextClass('bbcode')->parse_html				= 0;
+		IPSText::getTextClass('bbcode')->parse_nl2br			= 1;
+		IPSText::getTextClass('bbcode')->parse_smilies			= 1;
+		IPSText::getTextClass('bbcode')->parse_bbcode			= 1;
+		IPSText::getTextClass('bbcode')->parsing_section    	= $this->bbcodeSection();
+		IPSText::getTextClass('bbcode')->parsing_mgroup		 	= $this->memberData['member_group_id'];
+		IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $this->memberData['mgroup_others'];
+		
 		return IPSText::getTextClass('bbcode')->preDisplayParse( $comment );
 	}
 	
@@ -925,7 +1043,7 @@ abstract class classes_comments_renderer
 		}
 		
 		/* Check */
-		if ( ! $memberData['member_id'] OR ! $parentId OR ! $commentId )
+		if ( ! $parentId OR ! $commentId )
 		{
 			throw new Exception('MISSING_DATA');
 		}
@@ -948,28 +1066,25 @@ abstract class classes_comments_renderer
 			throw new Exception( $can );
 		}
 
-		/* Process post ready for use */
-		if ( IPSText::getTextClass('editor')->method == 'rte' )
-		{
-			IPSText::getTextClass('bbcode')->parse_wordwrap	= 0;
-			IPSText::getTextClass('bbcode')->parse_html		= 0;
+		IPSText::getTextClass( 'bbcode' )->parse_html				= 0;
+		IPSText::getTextClass( 'bbcode' )->parse_nl2br				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 1;
+		IPSText::getTextClass( 'bbcode' )->parse_smilies			= 1;
+		IPSText::getTextClass( 'bbcode' )->parsing_section			= $this->bbcodeSection();
 
-			$comment['comment']['comment_text'] = IPSText::getTextClass('bbcode')->convertForRTE( $comment['comment']['_db_comment'] );
-		}
-		else
+		$comment['comment']['comment_text'] = IPSText::getTextClass('bbcode')->preEditParse( $comment['comment']['_db_comment'] );
+		
+		if ( $this->settings['strip_quotes'] )
 		{
-			IPSText::getTextClass('bbcode')->parse_html			= 0;
-			IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies		= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-			IPSText::getTextClass('bbcode')->parsing_section	= 'gallery_comment';
-
-			$comment['comment']['comment_text'] = IPSText::getTextClass('bbcode')->preEditParse( $comment['comment']['_db_comment'] );
+			$comment['comment']['comment_text'] = IPSText::getTextClass( 'bbcode' )->stripQuotes( $comment['comment']['comment_text'] );
 		}
 		
-		$reply = "[quote name='" . IPSText::getTextClass( 'bbcode' )->makeQuoteSafe( $comment['author']['members_display_name'] ) . "' timestamp='" . $comment['comment']['comment_date'] . "']<br />{$comment['comment']['comment_text']}<br />[/quote]<br /><br /><br />";
+		$reply = "[quote name='" . IPSText::getTextClass('bbcode')->makeQuoteSafe( $comment['author']['members_display_name'] ) . "' timestamp='" . $comment['comment']['comment_date'] . "']<br />{$comment['comment']['comment_text']}<br />[/quote]<br /><br />";
 		
-		if ( IPSText::getTextClass('editor')->method != 'rte' )
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor = new $classToLoad();
+		
+		if ( !$editor->getRteEnabled() )
 		{
 			$reply = IPSText::br2nl( $reply );
 		}
@@ -1023,43 +1138,29 @@ abstract class classes_comments_renderer
 			throw new Exception( $can );
 		}
 
-		/* Process post ready for use */
-		if ( IPSText::getTextClass('editor')->method == 'rte' )
-		{
-			IPSText::getTextClass('bbcode')->parse_wordwrap	= 0;
-			IPSText::getTextClass('bbcode')->parse_html		= 0;
+		IPSText::getTextClass('bbcode')->parse_html			= 0;
+		IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
+		IPSText::getTextClass('bbcode')->parse_smilies		= 1;
+		IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
+		IPSText::getTextClass('bbcode')->parsing_section    = $this->bbcodeSection();
 
-			$comment['comment']['comment_text'] = IPSText::getTextClass('bbcode')->convertForRTE( $comment['comment']['_db_comment'] );
-		}
-		else
-		{
-			IPSText::getTextClass('bbcode')->parse_html			= 0;
-			IPSText::getTextClass('bbcode')->parse_nl2br		= 1;
-			IPSText::getTextClass('bbcode')->parse_smilies		= 1;
-			IPSText::getTextClass('bbcode')->parse_bbcode		= 1;
-			IPSText::getTextClass('bbcode')->parsing_section	= 'gallery_comment';
-
-			$comment['comment']['comment_text'] = IPSText::getTextClass('bbcode')->preEditParse( $comment['comment']['_db_comment'] );
-		}
-		
-		/* Load langs */
-		$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_editors' ), 'core' );
-		
 		/* Ayjacks? */
 		if ( $type == 'ajax' )
 		{
 			/* Throw, fetch and wag tail */
-			return $this->registry->getClass('output')->getTemplate('editors')->ajaxEditBox( $comment['comment']['comment_text'], $commentId, array(), array( 'showEditOptions' => false, 'checkBoxes' => false, 'skipFullButton' => true ) );
+			return $this->registry->getClass('output')->getTemplate('editors')->ajaxEditBox( $comment['comment']['_db_comment'], $commentId, array(), array( 'showEditOptions' => false, 'checkBoxes' => false, 'skipFullButton' => true, 'autoSaveKey' => 'comment-' . $this->table() . '-c' . $commentId ) );
 		}
 		else
 		{
-			/* Need a bit more dudes */
-			$editor = IPSText::getTextClass('editor')->showEditor( $comment['comment']['comment_text'], 'Post' );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+			$editor = new $classToLoad();
 			
+			$_editor = $editor->show( 'Post', array( 'type' => 'mini', 'autoSaveKey' => 'comment-' . $this->table() . '-c' . $commentId ), $comment['comment']['_db_comment'] );
+
 			$settings = array( 'fromApp' => $this->whoAmI(),
-							   '_app'    => preg_replace( '#^(.+?)(?:-.*|$)#', '\\1', $this->whoAmI() ) );
+							   'thisApp' => preg_replace( '#^(.+?)(?:-.*|$)#', '\\1', $this->whoAmI() ) );
 		
-			return $this->registry->getClass('output')->getTemplate( $this->skin() )->form( $comment, $parent, $editor, $settings, array(), 'saveEdit' );
+			return $this->registry->getClass('output')->getTemplate( $this->skin() )->form( $comment, $parent, $_editor, $settings, array(), 'saveEdit' );
 		}
 	}
 	
@@ -1090,12 +1191,21 @@ abstract class classes_comments_renderer
 	/**
 	 * Redirects to the latest comment
 	 *
-	 * @return	void		[Redirects]
+	 * @param	int			Comment ID
+	 * @param	int			Parent ID
+	 * @param	bool		Did we just add a comment that requires approval?
+	 * @return	@e void		[Redirects]
 	 */
-	public function redirectToComment( $commentId, $parentId )
+	public function redirectToComment( $commentId, $parentId, $showApprovalMessage=false )
 	{
 		/* Init */
 		$parentId = intval( $parentId );
+		
+		if( !$parentId )
+		{
+			$this->registry->output->showError( 'nocomment_found', 110102.111 );
+		}
+		
 		$parent   = $this->fetchParent( $parentId );
 		$_remap   = $this->remapKeys();
 		
@@ -1103,7 +1213,7 @@ abstract class classes_comments_renderer
 		$parent = $this->remapFromLocal( $parent, 'parent' );
 		
 		/* fetch */
-		$q = ( $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) ) ) ? '' : ' AND ' . $_remap['comment_approved'] . '=1';
+		$q = ( $this->can( 'moderate', array( 'comment_parent_id' => $parent['parent_id'] ) ) === true ) ? '' : ' AND ' . $_remap['comment_approved'] . '=1';
 		
 		/* Fetch comment */
 		if ( $commentId == 'last' )
@@ -1122,8 +1232,11 @@ abstract class classes_comments_renderer
 														 'limit'  => array( 0, 1 ) ) );
 		}
 		
-		/* remap */
-		$comment = $this->remapFromLocal( $comment );
+		/* got a comment? */
+		if ( ! is_array( $comment ) )
+		{
+			$this->registry->output->silentRedirect( $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) );
+		}
 		
 		/* Permission test */
 		$can = $this->can('view', array( 'comment_id' => $comment['comment_id'], 'comment_parent_id' => $parentId ) );
@@ -1136,7 +1249,7 @@ abstract class classes_comments_renderer
 		/* Fetch total */
 		$total	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total',
 												   'from'   => $this->table(),
-												   'where'  => $_remap['comment_parent_id'] . '=' . $parentId . $q . ' AND ' . $_remap['comment_id'] . '<=' . $comment['comment_id'] ) );
+												   'where'  => $_remap['comment_parent_id'] . '=' . $parentId . $q . ' AND ' . $_remap['comment_id'] . '<=' . intval( $comment[ $_remap['comment_id'] ] ) ) );
 												   
 		if ( $total['total'] > $this->perPage() )
 		{
@@ -1152,11 +1265,25 @@ abstract class classes_comments_renderer
 			
 			$st = ($pages - 1) * $this->perPage(); 
 			
-			$this->registry->output->silentRedirect( $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "&st=" . $st . '#comment_' . $comment['comment_id'], $parent['parent_seo_title'], false, $this->seoTemplate() );
+			if( $showApprovalMessage )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['comment_approval_required'], $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "&st=" . $st . '#comment_' . $comment[ $_remap['comment_id'] ], $parent['parent_seo_title'], $this->seoTemplate() );
+			}
+			else
+			{
+				$this->registry->output->silentRedirect( $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "&st=" . $st . '#comment_' . $comment[ $_remap['comment_id'] ], $parent['parent_seo_title'], false, $this->seoTemplate() );
+			}
 		}
 		else
 		{
-			$this->registry->output->silentRedirect( $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "#comment_" . $comment['comment_id'], $parent['parent_seo_title'], false, $this->seoTemplate() );
+			if( $showApprovalMessage )
+			{
+				$this->registry->output->redirectScreen( $this->lang->words['comment_approval_required'], $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "&st=0#comment_" . $comment[ $_remap['comment_id'] ], $parent['parent_seo_title'], false, $this->seoTemplate() );
+			}
+			else
+			{
+				$this->registry->output->silentRedirect( $this->settings['base_url'] . sprintf( $this->fetchSetting('urls-showParent', $parent), $parentId ) . "&st=0#comment_" . $comment[ $_remap['comment_id'] ], $parent['parent_seo_title'], false, $this->seoTemplate() );
+			}
 		}
 	}
 	
@@ -1165,8 +1292,8 @@ abstract class classes_comments_renderer
 	 * Accepts a standard array of data
 	 *
 	 * @param	array 	Array of GENERIC formatted data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function remapToLocal( array $array, $type='comment' )
 	{
 		/* Return */
@@ -1176,7 +1303,7 @@ abstract class classes_comments_renderer
 		/* Please; continue */
 		foreach( $array as $k => $v )
 		{
-			if ( array_key_exists( $k, $_remap ) )
+			if ( isset( $_remap[ $k ] ) )
 			{
 				$return[ $_remap[ $k ] ] = $v;
 			}
@@ -1194,8 +1321,8 @@ abstract class classes_comments_renderer
 	 * Accepts a standard array of data
 	 *
 	 * @param	array 	Array of LOCAL data
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function remapFromLocal( array $array, $type='comment' )
 	{
 		/* Return */
@@ -1205,7 +1332,7 @@ abstract class classes_comments_renderer
 		/* Please; continue */
 		foreach( $array as $k => $v )
 		{
-			if ( array_key_exists( $k, $_remap ) )
+			if ( isset( $_remap[ $k ] ) )
 			{
 				$return[ $_remap[ $k ] ] = $v;
 			}
@@ -1227,6 +1354,26 @@ abstract class classes_comments_renderer
 	{
 		return '';
 	}
+
+	/**
+	 * Section parsing for BBCode routines
+	 *
+	 * @return	string
+	 */
+	public function bbcodeSection()
+	{
+		return 'global_comments';
+	}
+
+	/**
+	 * Enable reputation?
+	 *
+	 * @return	string
+	 */
+	public function reputationEnabled()
+	{
+		return true;
+	}
 	
 	/**
 	 * Number of items per page
@@ -1327,7 +1474,7 @@ abstract class classes_comments_renderer
 	 * @param	string	Type of check (add/edit/delete/editall/deleteall/approve all)
 	 * @param	array 	Array of GENERIC data
 	 * @return	true or string to be used in exception
-	 **/
+	 */
 	public function can( $type, array $array )
 	{
 		/* Default, so return least permissive */
@@ -1336,16 +1483,16 @@ abstract class classes_comments_renderer
 	/**
 	 * Unpack the repuation cache, yo.
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _unpackRepCache()
 	{
 		if ( $this->settings['reputation_enabled'] )
 		{
 			/* Load the class */
-			require_once( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php' );
-			$this->registry->setClass( 'repCache', new classReputationCache() );
-		
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/class_reputation_cache.php', 'classReputationCache' );
+			$this->registry->setClass( 'repCache', new $classToLoad() );
+			
 			/* Update the filter? */
 			if( isset( $this->request['rep_filter'] ) && $this->request['rep_filter'] == 'update' )
 			{
@@ -1385,7 +1532,6 @@ abstract class classes_comments_renderer
 		/* Do some set up */
 		switch( $filters['sortKey'] )
 		{
-			default:
 			case 'post_date':
 			case 'date':
 			case 'time':
@@ -1395,6 +1541,13 @@ abstract class classes_comments_renderer
 			case 'author_id':
 				$filters['sortKey']  = 'comment_author_id';
 			break;
+			
+			default:
+				if ( !$filters['sortKey'] )
+				{
+					$filters['sortKey'] = 'comment_date';
+				}
+			break;
 		}
 		
 		switch( $filters['sortOrder'] )
@@ -1416,7 +1569,7 @@ abstract class classes_comments_renderer
 		$filters['offset']     = intval( $filters['offset'] );
 		$filters['limit']      = intval( $filters['limit'] );
 		$filters['unixCutOff'] = intval( $filters['unixCutOff'] );
-		
+				
 		/* Make sure we have a limit */
 		if ( ! $filters['limit'] )
 		{
diff --git a/upload/admin/sources/classes/comments/index.html b/upload/admin/sources/classes/comments/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/comments/index.html
+++ b/upload/admin/sources/classes/comments/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/customfields/index.html b/upload/admin/sources/classes/customfields/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/customfields/index.html
+++ b/upload/admin/sources/classes/customfields/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/customfields/profileFields.php b/upload/admin/sources/classes/customfields/profileFields.php
index ab57b48a..fc2a7f50 100644
--- a/upload/admin/sources/classes/customfields/profileFields.php
+++ b/upload/admin/sources/classes/customfields/profileFields.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.0
  * Custom Profile Fields
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
+ * Last Updated: $Date: 2011-09-01 11:30:42 -0400 (Thu, 01 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6917 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9440 $
  *
  */
  
@@ -158,10 +158,16 @@ class customProfileFields
 	 */
 	protected $_addedFields = array();
 	
+	/* Ability to pull fields from groups */
+	protected $fromGroups = array();
+	
+	/* Ability to exlude fields from groups */
+	protected $notGroups = array();
+	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -172,7 +178,27 @@ class customProfileFields
 		/* User Setup */
 		$this->member_id  = ipsRegistry::member()->getProperty( 'member_id' );
 		$this->admin      = intval( ipsRegistry::member()->getProperty( 'g_access_cp' ) );
-		$this->supmod     = intval( ipsRegistry::member()->getProperty( 'g_is_supmod' ) );		
+		$this->supmod     = intval( ipsRegistry::member()->getProperty( 'g_is_supmod' ) );
+	}
+	
+	/**
+	 * Set only to show from x groups
+	 *
+	 * @param	mixed	string or array
+	 */
+	public function setFromGroups( $in )
+	{
+		$this->fromGroups = ( is_array( $in ) ) ? $in : array( $in );
+	}
+	
+	/**
+	 * Set only to show from x groups
+	 *
+	 * @param	mixed	string or array
+	 */
+	public function setNotGroups( $in )
+	{
+		$this->notGroups = ( is_array( $in ) ) ? $in : array( $in );
 	}
 	
 	/**
@@ -180,7 +206,7 @@ class customProfileFields
 	 *
 	 * @param	string	$type	Set to view for displaying the field normally or edit for displaying in a form
 	 * @param	bool	$mlist	Whether this is the memberlist or not
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function initData( $type='view', $mlist=0 )
 	{	
@@ -230,11 +256,40 @@ class customProfileFields
 					
 					if( $mlist )
 					{
-						$this->in_fields[ $id ] = ( isset(ipsRegistry::$request[ 'field_' . $id ]) AND ipsRegistry::$request[ 'field_' . $id ] ) ? ipsRegistry::$request[ 'field_' . $id ] : '';
+						$this->in_fields[ $id ] = '';
+						
+						if( !empty(ipsRegistry::$request[ 'field_' . $id ]) )
+						{
+							if( is_string(ipsRegistry::$request[ 'field_' . $id ]) )
+							{
+								$this->in_fields[ $id ] = urldecode(ipsRegistry::$request[ 'field_' . $id ]);
+							}
+							else if( is_array(ipsRegistry::$request[ 'field_' . $id ]) )
+							{
+								foreach( ipsRegistry::$request[ 'field_' . $id ] as $k => $v )
+								{
+									$this->in_fields[ $id ][ $k ] = urldecode($v);
+								}
+							}
+						}
 					}
 					else
 					{
-						$this->in_fields[ $id ] = isset( $this->member_data['field_'.$id] ) ? $this->member_data['field_' . $id] : ( isset(ipsRegistry::$request[ 'field_' . $id ]) ? ipsRegistry::$request[ 'field_' . $id ] : '' );
+						$_val	= '';
+
+						if( is_string(ipsRegistry::$request[ 'field_' . $id ]) )
+						{
+							$_val	= urldecode(ipsRegistry::$request[ 'field_' . $id ]);
+						}
+						else if( is_array(ipsRegistry::$request[ 'field_' . $id ]) )
+						{
+							foreach( ipsRegistry::$request[ 'field_' . $id ] as $k => $v )
+							{
+								$_val[ $k ] = urldecode($v);
+							}
+						}
+							
+						$this->in_fields[ $id ] = isset( $this->member_data['field_'.$id] ) ? $this->member_data['field_' . $id] : $_val;
 					}					
 				}						
 			}
@@ -271,9 +326,12 @@ class customProfileFields
 
 		/* Kernel profile field class */
 		$_NOW = IPSDebug::getMemoryDebugFlag();
-		require_once( IPS_KERNEL_PATH . 'classCustomFields.php' );
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classCustomFields.php', 'classCustomFields' );
+		
 		IPSDebug::setMemoryDebugFlag( "Get CustomFields Kernel Class", $_NOW );
-		$this->cfields_obj = new classCustomFields( $this->cache_data, $type );
+		
+		$this->cfields_obj = new $classToLoad( $this->cache_data, $type );
 		$this->cfields     = $this->cfields_obj->cfields;
 
 		$this->init = 1;
@@ -283,7 +341,7 @@ class customProfileFields
 	 * Parses fields for saving into the database, results are stored in $this->out_fields
 	 *
 	 * @param	array	$field_data	Array that contains the fields to parse, usually $this->request
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseToSave( $field_data, $mode='normal' )
 	{
@@ -350,7 +408,7 @@ class customProfileFields
 				/* Make sure error message texts are loaded */
 				ipsRegistry::getClass( 'class_localization' )->loadLanguageFile( array( 'public_profile' ), 'members' );
 			 
-				if( array_key_exists( 'field_' . $id, $this->error_messages ) )
+				if( isset( $this->error_messages[ 'field_' . $id ] ) )
 				{
 					$this->error_messages['field_' . $id] .= ', ' . ipsRegistry::getClass( 'class_localization' )->words['profile_field_error__blacklist'];
 				}
@@ -369,7 +427,7 @@ class customProfileFields
 	 *
 	 * @param	bool	$check_topic_format		Whether to apply topic formatting
 	 * @param	string	$location				Location being called from
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseToView( $check_topic_format=0, $location='profile' )
 	{
@@ -377,11 +435,11 @@ class customProfileFields
 		foreach( $this->cfields as $id => $field )
 		{
 			/* Can we view this field? */
-			if( ! $this->_checkFieldAuth( $field ) )
+			if ( ! $this->_checkFieldAuth( $field ) )
 			{
 				continue;		
 			}
-
+			
 			/* Topic Format */
 			if( $check_topic_format )
 			{
@@ -474,7 +532,7 @@ class customProfileFields
 	 * Parses fields for editing, results are stored in $this->out_fields
 	 *
 	 * @param	string	[$mode]	register or normal, normal is default
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseToEdit( $mode='normal' )
 	{
@@ -515,10 +573,32 @@ class customProfileFields
 			}
 		}
 		
+		/* Whitelist */
+		if ( count( $this->fromGroups ) )
+		{
+			if ( in_array( $field->raw_data['pf_group_key'], $this->fromGroups ) )
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		/* Blacklist */
+		if ( count( $this->notGroups ) )
+		{
+			if ( in_array( $field->raw_data['pf_group_key'], $this->notGroups ) )
+			{
+				return false;
+			}
+		}
+		
 		/* Member Edit? */
 		if( $this->type == 'edit' && ! $field->raw_data['pf_member_edit'] )
 		{
-			if ( $mode != 'register' AND ! $this->admin AND !$this->supmod )
+			if ( $mode != 'register' AND $mode != 'mlist' AND ! $this->admin AND !$this->supmod )
 			{
 				return false;
 			}
diff --git a/upload/admin/sources/classes/editor/class_editor.php b/upload/admin/sources/classes/editor/class_editor.php
index ce283225..05a5d6a7 100644
--- a/upload/admin/sources/classes/editor/class_editor.php
+++ b/upload/admin/sources/classes/editor/class_editor.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Editor Library: Core Class
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  * EXAMPLE USAGE
  * <code>
@@ -125,6 +125,7 @@ class class_editor
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -133,6 +134,7 @@ class class_editor
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Main font sizes
@@ -153,7 +155,7 @@ class class_editor
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -173,7 +175,7 @@ class class_editor
 	 * Main init: Prep font sizes
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function editorInit( )
 	{
diff --git a/upload/admin/sources/classes/editor/class_editor_rte.php b/upload/admin/sources/classes/editor/class_editor_rte.php
index 052565c9..94f60879 100644
--- a/upload/admin/sources/classes/editor/class_editor_rte.php
+++ b/upload/admin/sources/classes/editor/class_editor_rte.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Editor Library: RTE (WYSIWYG) Class
- * Last Updated: $Date: 2010-11-15 11:39:10 -0500 (Mon, 15 Nov 2010) $
+ * Last Updated: $Date: 2011-04-19 12:42:57 -0400 (Tue, 19 Apr 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 7185 $
+ * @version		$Revision: 8391 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -80,16 +80,7 @@ class class_editor_module extends class_editor
 	 * @var		array
 	 */
 	public $end_tags				= array();
-	
-	/**
-	 * Dunno, forgotten
-	 *
-	 * @access	private
-	 * @var		boolean
-	 * @deprecated	Seems this isn't called/checked anymore
-	 */
-	private $_called			= false;
-	
+
 	/**
 	 * Process the content before showing it in the form
 	 *
@@ -216,11 +207,11 @@ class class_editor_module extends class_editor
 	/**
 	 * Clean up content inside the code tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Matches from preg_replace_callback
 	 * @return	string		Text ready for editor
 	 */
-	private function _cleanCodeTag( $matches )
+	protected function _cleanCodeTag( $matches )
 	{
 		//-----------------------------------------
 		// INIT
@@ -397,17 +388,6 @@ class class_editor_module extends class_editor
 		$t = preg_replace( "#class='[\"'](\S+?)['\"]'#i", "class='\\1'", $t );
 		$t = preg_replace( "#([a-zA-Z0-9])<img src=[\"'](.+?)[\"'] class=[\"'](.+?)[\"'] alt=[\"'](.+?)[\"'] />#i", "\\1 <img src='\\2' class='\\3' alt='\\4' />", $t );
 
-		//-----------------------------------------
-		// WYSI-Weirdness #5: Fix up smilies
-		//-----------------------------------------
-		
-		$current = $this->memberData[ 'view_img' ];
-		$this->member->setProperty( 'view_img', 0 );
-
-		$t = IPSText::getTextClass( 'bbcode' )->memberViewImages( $t );
-
-		$this->member->setProperty( 'view_img', $current );
-
 		//-----------------------------------------
 		// WYSI-Weirdness #6: Image tags
 		//-----------------------------------------
@@ -564,14 +544,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse List tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseListTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseListTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		$list_type = trim( preg_replace( '#"?list-style-type:\s+?([\d\w\_\-]+);?"?#si', '\\1', $this->_getValueOfOption( 'style', $opening_tag ) ) );
 		
@@ -613,14 +593,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse List Element tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseListElement( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseListElement( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		return '[*]' . rtrim( $between_text );
 	}
@@ -628,14 +608,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse paragraph tags
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseParagraphTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseParagraphTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		//-----------------------------------------
 		// Reset local start tags
@@ -686,14 +666,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse Span tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseSpanTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseSpanTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		$start_tags = "";
 		$end_tags   = "";
@@ -710,14 +690,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse DIV tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseDivTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseDivTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		//-----------------------------------------
 		// Reset local start tags
@@ -788,13 +768,13 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse style attributes (color, font, size, b, i..etc)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Opening tag
 	 * @param	string	Start tags
 	 * @param	string	End tags
 	 * @return	string	Converted text
 	 */
-	private function _parseStyles( $opening_tag, &$start_tags, &$end_tags )
+	protected function _parseStyles( $opening_tag, &$start_tags, &$end_tags )
 	{
 		$style_list = array(
 							array('tag' => 'color' , 'rx' => '(?<![\w\-])color:\s*([^;]+);?'	, 'match' => 1),
@@ -858,14 +838,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse FONT tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseFontTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseFontTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		$font_tags  = array( 'font' => 'face', 'size' => 'size', 'color' => 'color' );
 		$start_tags = "";
@@ -907,14 +887,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Simple tags
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseSimpleTag( $tag, $between_text, $opening_tag, $parse_tag )
+	protected function _parseSimpleTag( $tag, $between_text, $opening_tag, $parse_tag )
 	{
 		if ( ! $parse_tag )
 		{
@@ -927,14 +907,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Parse A HREF tag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Opening tag complete
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _parseAnchorTag( $tag, $between_text, $opening_tag, $parse_tag='' )
+	protected function _parseAnchorTag( $tag, $between_text, $opening_tag, $parse_tag='' )
 	{
 		$mytag = 'url';
 		$href  = $this->_getValueOfOption( 'href', $opening_tag );
@@ -955,14 +935,14 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Recursively parse tags
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Tag
 	 * @param	string	Text between opening and closing tag
 	 * @param	string	Callback Function
 	 * @param	string	Parse tag
 	 * @return	string	Converted text
 	 */
-	private function _recurseAndParse( $tag, $text, $function, $parse_tag='' )
+	protected function _recurseAndParse( $tag, $text, $function, $parse_tag='' )
 	{
 		//-----------------------------------------
 		// INIT
@@ -1159,12 +1139,12 @@ class class_editor_module extends class_editor
 	/**
 	 * RTE: Extract option HTML
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Option
 	 * @param	string	Text
 	 * @return	string	Converted text
 	 */
-	private function _getValueOfOption( $option, $text )
+	protected function _getValueOfOption( $option, $text )
 	{
 		if( $option == 'face' )
 		{
@@ -1224,11 +1204,11 @@ class class_editor_module extends class_editor
 	/**
 	 * unhtml url: Removes < and >
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array 		Matches from preg_replace_callback
 	 * @return	string		Converted text
 	 */
-	private function _unhtmlUrl( $matches=array() )
+	protected function _unhtmlUrl( $matches=array() )
 	{
 		$url  = stripslashes( $matches[3] );
 		$type = stripslashes( $matches[1] ? $matches[1] : 'a href' );
@@ -1243,12 +1223,12 @@ class class_editor_module extends class_editor
 	/**
 	 * Converts color:rgb(x,x,x) to color:#xxxxxx
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	rgb contents: x,x,x
 	 * @param	string	regex end
 	 * @return	string	Converted text
 	 */
-	private function _rgbToHex($matches)
+	protected function _rgbToHex($matches)
 	{
 		$t  = $matches[1];
 		$t2 = $matches[2];
diff --git a/upload/admin/sources/classes/editor/class_editor_std.php b/upload/admin/sources/classes/editor/class_editor_std.php
index dd9df5db..67586b3a 100644
--- a/upload/admin/sources/classes/editor/class_editor_std.php
+++ b/upload/admin/sources/classes/editor/class_editor_std.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Editor Library: Standard Class
- * Last Updated: $Date: 2010-05-25 10:50:21 -0400 (Tue, 25 May 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6387 $
+ * @version		$Revision: 7445 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
diff --git a/upload/admin/sources/classes/editor/composite.php b/upload/admin/sources/classes/editor/composite.php
new file mode 100644
index 00000000..e6a40774
--- /dev/null
+++ b/upload/admin/sources/classes/editor/composite.php
@@ -0,0 +1,2322 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Editor Library: RTE (WYSIWYG) Class
+ * Last Updated: $Date: 2011-10-11 07:49:07 -0400 (Tue, 11 Oct 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		9th March 2005 11:03
+ * @version		$Revision: 9593 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+/**
+ * It's surprisingly difficult to keep posts consistent through various processes.
+ * I'll keep some notes here for future me or future developers woring on this.
+ * 
+ * The text that is passed off in "process" must have HTML entities made safe, any
+ * non char set characters converted into their numeric equivalent &#xxx; make
+ * every effort to not auto-parse typed in entities. That is, if someone types in &#39; it
+ * should NOT convert that to ' when they hit submit.
+ * Test input: < > ' " & ¦ $ \ ! &amp; &#39; &quot; &lt; &gt; &para;
+ * Should be processed as: &lt; &gt; &#39; &quot; &amp; ¦ $ &#92; ! &amp;amp; &amp;#39; &amp;quot; &amp;lt; &amp;gt; &amp;para;
+ * This is *the* golden rule. Use this to test any fixes. It must work in the following modes:
+ * RTE > STD Switch
+ * STD > RTE Switch
+ * RTE > Preview
+ * STD > Preview
+ * RTE > Edit
+ * STD > Edit
+ * RTE > Edit > More options
+ * STD > Edit > More options
+ * RTE > Quote from post
+ * STD > Quote from post
+ * 
+ * Please test all these modes when you have finished modifying this class
+ */
+/**
+ * 
+ * IP.Board PHP work to display an editor
+ * @author Matt
+ *
+ * Example:
+ * $editor = new classes_editor_composite();
+ * $editor->setAllowBbcode( true );
+ * $editor->setAllowHtml( false );
+ * $editor->setContent( '[b]Hello, I am some text from the database[/b]' );
+ * $html = $editor->show('post_content');
+ */
+class classes_editor_composite
+{
+	/**
+	 * Use P for line breaks (std CKEditor mode)
+	 */
+	const IPS_P_MODE = true;
+	/**
+	 * Parsing array
+	 *
+	 * @access	public
+	 * @var		array
+	 */
+	public $delimiters			= array( "'", '"' );
+	
+	/**
+	 * Parsing array
+	 *
+	 * @access	public
+	 * @var		array
+	 */
+	public $non_delimiters		= array( "=", ' ' );
+	
+	/**
+	 * Start tags
+	 *
+	 * @access	public
+	 * @var		array
+	 */
+	public $start_tags			= array();
+	
+	/**
+	 * End tags
+	 *
+	 * @access	public
+	 * @var		array
+	 */
+	public $end_tags			= array();
+	
+	/**#@+
+	* Internal setting objects
+	*
+	* @var		boolean
+	*/	
+	protected $allowHtml		= false;
+	protected $allowBbcode		= true;
+	protected $content			= null;
+	protected $rteEnabled		= false;
+	protected $allowSmilies		= true;
+	protected $_edCount			= 1;
+	/**#@+
+	* Registry objects
+	*
+	* @var		object
+	*/	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	protected $_isSwitchingFrom = null;
+	/**
+	 * Main font sizes
+	 *
+	 * @access	protected
+	 * @var		array
+	 */
+	protected $font_sizes     = array( 1 => 8,
+									   2 => 10,
+									   3 => 12,
+									   4 => 14,
+									   5 => 18,
+									   6 => 24,
+									   7 => 36,
+									   8 => 48 );
+
+	
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make object */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB	      =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang	      =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache	  =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		define( 'IPS_EDITOR_NO_SANITIZE', true );
+		define( 'IPS_MAKE_AMP_SAFE'     , true );
+		define( 'IPS_QUICK_EDIT_TO_FULL', ( $this->request['_from'] == 'quickedit' ) ? true : false );
+		
+		/* Auto set the RTE */
+		$this->setRteEnabled( $this->_canWeRte() );
+		
+		/* Set up default options */
+		$this->setAllowBbcode( true );
+		$this->setAllowSmilies( true );
+		$this->setAllowHtml( false );
+		
+		foreach( $this->font_sizes as $bbcode => $real )
+		{
+			$this->rev_font_sizes[ $real ] = $bbcode;
+		}
+	}	
+	
+	/**
+	 * @return the $allowSmilies
+	 */
+	public function getAllowSmilies()
+	{
+		return $this->allowSmilies;
+	}
+
+	/**
+	 * @return the $allowHtml
+	 */
+	public function getAllowHtml()
+	{
+		return $this->allowHtml;
+	}
+
+	/**
+	 * @return the $allowBbcode
+	 */
+	public function getAllowBbcode()
+	{
+		return $this->allowBbcode;
+	}
+
+	/**
+	 * @return the $content
+	 */
+	public function getContent()
+	{
+		return $this->content;
+	}
+	
+	/**
+	 * @return the $rteEnabled
+	 */
+	public function getRteEnabled()
+	{
+		return $this->rteEnabled;
+	}
+	
+	/**
+	 * @param boolean $allowHtml
+	 */
+	public function setAllowHtml( $allowHtml )
+	{
+		$this->allowHtml = $allowHtml ? true : false;
+	}
+
+	/**
+	 * @param boolean $allowBbcode
+	 */
+	public function setAllowBbcode( $allowBbcode )
+	{
+		$this->allowBbcode = $allowBbcode ? true : false;
+	}
+
+	/**
+	 * @param string $content
+	 * @param string BBCode parsing section
+	 */
+	public function setContent( $content, $section='topics' )
+	{
+		$this->content = $this->convertContent( $content, 'auto', $section );
+	}
+	
+	/**
+	 * Takes raw content and makes it good for RTE or STD editor
+	 * 
+	 * @param string $content
+	 * @param string auto = detect, rte = CKEditor, std = textarea
+	 * @param string BBCode parsing section
+	 */
+	public function convertContent( $content, $rteMethod='auto', $section='topics' )
+	{
+		/* start */
+		$isRte = true;
+		
+		/* Return if empty */
+		if ( ! $content )
+		{
+			return $content;
+		}
+		
+		/* Fix method */
+		switch ( $rteMethod )
+		{
+			case 'auto':
+				$isRte = ( ( $this->contentIsRte( $content ) || $this->getRteEnabled() ) && ! $this->_isInSourceMode() ) ? true : false;		
+			break;
+			case 'rte':
+				$isRte = true;
+			break;
+			case 'std':
+				$isRte = false;
+			break;
+		}
+		
+		/* RTE needs a code tidy whereas STD needs BBCode */
+		if ( $isRte )
+		{
+			IPSText::getTextClass('bbcode')->parse_html = 0;
+			
+			if ( $this->getAllowHtml() )
+			{
+				if ( ! IPSText::getTextClass('bbcode')->parse_nl2br )
+				{
+					$content = str_replace( '<br />', "", $content );
+					$content = str_replace( '<br>'	, "", $content );
+				}
+			}
+			
+			$content = $this->_rtePreShow( IPSText::getTextClass('bbcode')->convertForRTE( $content ), true );
+		}
+		else
+		{
+			IPSText::getTextClass('bbcode')->parse_html			= $this->getAllowHtml();
+			IPSText::getTextClass('bbcode')->parse_nl2br		= 0;
+			IPSText::getTextClass('bbcode')->parse_smilies		= $this->getAllowSmilies();
+			IPSText::getTextClass('bbcode')->parse_bbcode		= $this->getAllowBbcode();
+			IPSText::getTextClass('bbcode')->parsing_section	= $section;
+
+			if ( $this->getAllowHtml() )
+			{
+				if ( ! IPSText::getTextClass('bbcode')->parse_nl2br )
+				{
+					$content = str_replace( '<br />', "", $content );
+					$content = str_replace( '<br>'	, "", $content );
+				}
+			}
+			
+			if ( IPS_QUICK_EDIT_TO_FULL )
+			{
+				$content = str_replace( '&', '&amp;', $content );
+			}
+
+			$content = $this->_stdPreShow( IPSText::getTextClass('bbcode')->preEditParse( $content ) );
+			
+			/* This is designed only for new STD forms with content and NOT when switching modes */
+			if ( ! IPS_IS_AJAX )
+			{
+				$content = str_replace( '&', '&amp;', $content );
+			}
+			else
+			{
+				$content = str_replace( '&quot;', '"', $content );
+			}
+		}
+		
+		$content = $this->_allowNonUtf8CharsWhenNotUsingUtf8Doc( $content );
+		
+		return $content;
+	}
+
+	/**
+	 * @param boolean $rteEnabled
+	 */
+	public function setRteEnabled( $rteEnabled )
+	{
+		$this->rteEnabled = $rteEnabled ? true : false;
+	}
+	
+	/**
+	 * @param boolean $allowSmilies
+	 */
+	public function setAllowSmilies( $allowSmilies )
+	{
+		$this->allowSmilies = $allowSmilies ? true : false;
+	}
+
+	/**
+	 * Determines whether or not we can use the RTE
+	 * @return	boolean
+	 */
+	protected function _canWeRte()
+	{
+		$return = FALSE;
+
+		if ( $this->memberData['userAgentKey'] == 'explorer' AND $this->memberData['userAgentVersion'] >= 7 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'opera' AND $this->memberData['userAgentVersion'] >= 9.00 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'firefox' AND $this->memberData['userAgentVersion'] >= 3 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'safari' AND $this->memberData['userAgentVersion'] >= 4 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'chrome' AND $this->memberData['userAgentVersion'] >= 2 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'camino' AND $this->memberData['userAgentVersion'] >= 2 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'mozilla' AND $this->memberData['userAgentVersion'] >= 4 )
+		{
+			$return = TRUE;
+		}
+		else if ( $this->memberData['userAgentKey'] == 'aol' AND $this->memberData['userAgentVersion'] >= 9 )
+		{
+			$return = TRUE;
+		}
+		
+		/* No iDevice */
+		if ( $this->registry->output->isLargeTouchDevice() || $this->registry->output->isSmallTouchDevice() )
+		{
+			$return = FALSE;
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Have we specifically set our CKEditor to saucy mode?
+	 * @return boolean
+	 */
+	protected function _isInSourceMode()
+	{
+		/* Sent inline */
+		if ( isset( $_REQUEST['isRte'] ) )
+		{
+			return ( $_REQUEST['isRte'] == 0 ) ? true : false;
+		}
+		
+		/* Check the mode */
+		if ( IPSCookie::get('rteStatus') == 'std' )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Shows the editor
+	 * print $editor->show( 'message', 'reply-topic-1244' );
+	 * @param	string	Field
+	 * @param	array   Options: Auto save key, a unique key for the page. If supplied, editor will auto-save at regular intervals. Works for logged in members only
+	 * @param	string	Optional content
+	 */
+	public function show( $fieldName, $options=array(), $content='' )
+	{
+		$_autoSaveKeyOrig		     = ( ! empty( $options['autoSaveKey'] ) ) ? $options['autoSaveKey'] : '';
+		$options['editorName']       = ( ! empty( $options['editorName'] ) ) ? $options['editorName'] : $this->_fetchEditorName();
+		$options['autoSaveKey']      = ( $_autoSaveKeyOrig && $this->memberData['member_id'] ) ? $this->_generateAutoSaveKey( $_autoSaveKeyOrig ) : '';
+		$options['type']             = ( ! empty( $options['type'] ) && $options['type'] == 'mini' ) ? 'mini' : 'full';
+		$options['minimize']	     = intval( $options['minimize'] );
+		$options['height']	     	 = intval( $options['height'] );
+		$options['isTypingCallBack'] = ( ! empty( $options['isTypingCallBack'] ) ) ? $options['isTypingCallBack'] : '';
+		$options['noSmilies']		 = ( ! empty( $options['noSmilies'] ) ) ? true : false;
+		$options['delayInit']		 = ( ! empty( $options['delayInit'] ) ) ? 1 : 0;
+		$options['smilies']          = $this->fetchEmoticons( 20 );
+		$options['bypassCKEditor']   = $this->getRteEnabled() ? 0 : 1;
+		$options['isRte']			 = $this->_isInSourceMode() ? 0 : 1;
+		$html         = '';
+
+		/* inline content */
+		if ( $content )
+		{
+			$this->setContent( str_replace( '\\\'', '\'', $content ) );
+		}
+		
+		/* Store last editor ID in case calling scripts need it */
+		$this->settings['_lastEditorId']	= $options['editorName'];
+
+		if ( IN_ACP )
+  		{
+  			$html = $this->registry->getClass('output')->global_template->editor( $fieldName, $this->getContent(), $options, $this->getAutoSavedContent( $_autoSaveKeyOrig ) );
+		}
+		else
+		{
+			$html = $this->registry->getClass('output')->getTemplate('editors')->editor( $fieldName, $this->getContent(), $options, $this->getAutoSavedContent( $_autoSaveKeyOrig ) );
+		}
+		
+		return $html;
+	}
+	
+	/**
+	 * Process contents of RTE into BBCode ready for storing
+	 * @param  string	$content
+	 * @return string	$content
+	 */
+	public function process( $content )
+	{
+		//header("Content-type: text/plain");
+		return ( ( $this->contentIsRte( $content ) || $this->getRteEnabled() ) && ! $this->_isInSourceMode() ) ? $this->_rteProcess( $content ) : $this->_stdProcess( $content, false );
+		//exit();
+	}
+	
+	/**
+	 * Fetches the saved content
+	 * @param string $autoSaveKey
+	 * @return array
+	 */
+	public function getAutoSavedContent( $autoSaveKey )
+	{
+		$autoSaveKey = $this->_generateAutoSaveKey( $autoSaveKey );
+		$return      = array();
+		/* fetch from the dee bee */
+		$raw = $this->DB->buildAndFetch( array( 'select' => '*',
+												'from'   => 'core_editor_autosave',
+												'where'  => 'eas_key=\'' . $autoSaveKey . '\'' ) );
+		
+		/* Make sure no tomfoolery is occuring */
+		if ( $raw['eas_key'] && ( $this->memberData['member_id'] == $raw['eas_member_id'] ) )
+		{
+			$return['key']         = $raw['eas_key'];
+			$return['updated']     = $raw['eas_updated'];
+			$return['raw']         = $raw['eas_content'];
+			$return['restore_rte'] = $this->switchContent( $return['raw'], false );
+			$return['restore_std'] = $this->switchContent( $return['raw'], true );
+			$return['updatedDate'] = $this->registry->getClass('class_localization')->getDate( $return['updated'], 'LONG' );
+			
+			/* Now figure out previewable content */
+			$return['parsed']  = IPSText::getTextClass('bbcode')->preDisplayParse( IPSText::getTextClass('bbcode')->preDbParse( $this->_rteProcess( $raw['eas_content'] ) ) );
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Remove auto saved content
+	 * @param array $where options member_id = x , app = x, time = x 
+	 */
+	public function removeAutoSavedContent( $where=array() )
+	{
+		$_sql = array();
+		
+		if ( ! count( $where ) )
+		{
+			$_sql[] = 'eas_app=\'' . IPS_APP_COMPONENT . '\'';
+		}
+		
+		if ( ! empty( $where['app'] ) )
+		{
+			$_sql[] = 'eas_app=\'' . $this->DB->addSlashes( $where['app'] ) . '\'';
+		}
+		
+		if ( ! empty( $where['member_id'] ) )
+		{
+			$_sql[] = 'eas_member_id=' . intval( $where['member_id'] );
+		}
+		
+		if ( ! empty( $where['autoSaveKey'] ) )
+		{
+			if ( strlen( $where['autoSaveKey'] ) != 32 )
+			{
+				$where['autoSaveKey'] = $this->_generateAutoSaveKey( $where['autoSaveKey'] );
+			}
+			
+			$_sql[] = 'eas_key=\'' . trim( $where['autoSaveKey'] ) . '\'';
+		}
+		
+		if ( ! empty( $where['time'] ) )
+		{
+			$_sql[] = 'eas_updated < ' . intval( $where['time'] );
+		}
+		
+		$this->DB->delete( 'core_editor_autosave', implode( ' AND ', $_sql ) );
+	}
+	
+	/**
+	 * Sniff out RTE content
+	 * @param string $content
+	 * @return boolean
+	 */
+	public function contentIsRte( $content )
+	{
+		$content = trim( $content );
+		
+		if ( substr( $content, 0, 3 ) == '<p>' && substr( $content, -4 ) == '</p>' )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Auto save via ajax
+	 * @param string $content
+	 * @param string $autoSaveKey
+	 */
+	public function autoSave( $content, $autoSaveKey )
+	{
+		/* Convert the data so it is safe to store and preview */
+		$content = IPSText::getTextClass('bbcode')->preEditParse( $this->_rteProcess( $content, IPS_EDITOR_NO_SANITIZE ) );
+		
+		/* Pretty much just dump it in the DB */
+		$this->DB->replace( 'core_editor_autosave', array( 'eas_key'       => $autoSaveKey,
+														   'eas_member_id' => $this->memberData['member_id'],
+														   'eas_app'	   => IPS_APP_COMPONENT,
+														   'eas_section'   => $this->request['module'] . '.' . $this->request['section'],
+														   'eas_updated'   => time(),
+														   'eas_content'   => $content ), array( 'eas_key' ) );
+		
+		return true;
+	}
+	
+	/**
+	 * Switch content from one mode t'other
+	 * 
+	 * @param	string	Content
+	 * @param	int		Is RTE?
+	 */
+	public function switchContent( $content, $isRte )
+	{
+		IPSText::getTextClass('bbcode')->parse_html			= false;
+		IPSText::getTextClass('bbcode')->parse_nl2br		= 0;
+		IPSText::getTextClass('bbcode')->parse_smilies		= true;
+		IPSText::getTextClass('bbcode')->parse_bbcode		= true;
+		IPSText::getTextClass('bbcode')->parsing_section	= 'topics';
+		
+		/* Default state for ACP */
+		if ( IN_ACP )
+		{
+			IPSText::getTextClass('bbcode')->parse_html = true;
+		}
+		
+		if ( $isRte )
+		{
+			$this->_isSwitchingFrom = 'std';
+			/* Assume RTE text has been sent in and we want BBCode */
+			$content = str_replace( '\\', '&#92;', $content ); # Makes manually entered < safe
+			$content = $this->_rteProcess( $content, IPS_EDITOR_NO_SANITIZE );
+			$content = IPSText::getTextClass('bbcode')->preEditParse( $content );
+			$content = $this->_stdPreShow( $content );
+			$content = str_replace( '&#92;', '\\', $content );
+		}
+		else
+		{
+			$this->_isSwitchingFrom = 'rte';
+			/* Assume BBCode has been sent in and we want RTE */
+			//$content = str_replace( '<', '&lt;', $content ); # Makes manually entered < safe
+			//$content = str_replace( '>', '&gt;', $content ); # Makes manually entered > safe
+			$content = $this->_rtePreShow( IPSText::getTextClass('bbcode')->convertForRTE( $this->_stdProcess( $content, IPS_EDITOR_NO_SANITIZE ) ), false, true );
+		}
+		
+		$this->_isSwitchingFrom = null;
+		
+		return $content;
+	}
+	
+	/**
+	 * Processes text ready for non RTE
+	 *
+	 * @access	public
+	 * @param	string		Raw text
+	 * @return	string		Text ready for editor
+	 */
+	public function _stdPreShow( $t )
+	{
+		$t = str_replace( array( "\r\n", "\r" ), "\n", $t );
+		
+		IPSDebug::fireBug( 'info', array( 'Start (std): ' . nl2br($t) ) );
+
+		$t = IPSText::decodeNamedHtmlEntities( $t );
+		
+		$t = str_replace( '&#33;', '!', $t );
+		$t = str_replace( '&#34;', '"', $t );
+		$t = str_replace( '&quot;', '"', $t );
+		$t = str_replace( '&#60;', '<', $t );
+		$t = str_replace( '&#62;', '>', $t );
+		$t = str_replace( '&lt;', '<', $t );
+		$t = str_replace( '&gt;', '>', $t );
+		$t = str_replace( '&#39;', "'", $t );
+		$t = str_replace( '&#036;', "$", $t );
+		$t = str_replace( '&#36;', "$", $t );
+		$t = str_replace( '&#92;', '\\', $t );
+		$t = str_replace( '&#092;', '\\', $t );
+		$t = str_replace( '&#160;', ' ', $t );
+		
+		/* We replace \ to 092 so convert it back */
+		$t = str_replace( '&amp;#092;', '\\', $t );
+		
+		if ( ! IPS_IS_AJAX )
+		{
+			$t = str_replace( '&amp;', '&', $t );
+		}
+		
+		$t = str_replace( '</textarea', '&lt;textarea', $t );	
+		
+		$t = $this->_allowNonUtf8CharsWhenNotUsingUtf8Doc( $t );
+		
+		IPSDebug::fireBug( 'info', array( 'End (std): ' . nl2br($t) ) );
+
+		return $t;
+	}
+	
+	/**
+	 * Processes text for RTE
+	 *
+	 * @access	public
+	 * @param	string		Raw text
+	 * @param	bool		Double encode entities (not needed for switching, only for full editor)
+	 * @param	bool		Ajax request
+	 * @return	string		Text ready for editor
+	 */
+	public function _rtePreShow( $t, $encodeEntities=false )
+	{ 
+		IPSDebug::fireBug( 'info', array( 'Start (rte): ' . nl2br($t) ) );
+		
+		/* Trim and remove comments */
+		$t = preg_replace( '#\<\!\-\-(.+?)\-\-\>#is', "", $t );
+		$t = rtrim($t);
+		
+		/* Convert single/double quotes */
+		if ( strtolower(IPS_DOC_CHAR_SET) != 'utf-8' )
+		{
+			$t = str_replace(chr(145), chr(39), $t);
+			$t = str_replace(chr(146), chr(39), $t);
+			$t = str_replace(chr(147), chr(34), $t);
+			$t = str_replace(chr(148), chr(34), $t);
+		}
+
+		$t = str_replace( "\t", "{'tab'}", $t );
+
+		/* Remove CR/LF */
+		$t = str_replace(chr(10), "", $t);
+		$t = str_replace(chr(13), "", $t);
+
+		/* Fix some entities to display correctly */
+		$t	= str_replace( array( '<br />', '<br>' ), '__~~--__', $t );
+		
+		if ( $encodeEntities )
+		{
+			$t	= str_replace( '&#60;', '-<-', $t );
+			$t	= str_replace( '&#62;', '->-', $t );
+		}
+		else
+		{
+			$t	= str_replace( array( '&#60;', '&lt;' ), '-<-', $t );
+			$t	= str_replace( array( '&#62;', '&gt;' ), '->-', $t );
+		}
+
+		$t	= str_replace( '&#10;', '<br />', $t );
+		
+		/* AJAX content is inserted into editor via insertText which does not parse entities as they would normally display */
+		if( ! IPS_IS_AJAX )
+		{
+			$t	= str_replace( '&', '&amp;', $t );
+		}
+			
+		$t	= str_replace( '-<-', '&lt;', $t );
+		$t	= str_replace( '->-', '&gt;', $t );
+		$t	= str_replace( '__~~--__', '<br />', $t );
+
+		/* Clean up quote tags (remove many <br />s */
+		$t = preg_replace( '#(\[quote([^\]]+?)\])(<br />){1,}#is', "\\1<br />", $t );
+		
+		/* Replace tabs */	
+		$t = str_replace( "{'tab'}", "&nbsp;&nbsp;&nbsp;&nbsp;", $t );
+		
+		/* Clean up the rest of the tags */
+		//$t = str_replace( array( '&lt;br&gt;', '&lt;br /&gt;' ), '<br />', IPSText::htmlspecialchars( $t ) );
+		//$t = str_replace( array( '&lt;br&gt;', '&lt;br /&gt;' ), '<br />', $t );
+		$t = str_replace( "&lt;#IMG_DIR#&gt;", "<#IMG_DIR#>", $t );
+		$t = str_replace( "&lt;#EMO_DIR#&gt;", "<#EMO_DIR#>", $t );
+		
+		/* Convert multiple spaces */
+		$t = str_replace( "  ", "&nbsp;&nbsp;", $t );
+		
+		/* Fix up lists */
+		$t = str_replace( '<br /></li>', '</li>', $t );
+		
+		/* make it look a bit pretty */
+		$t = str_replace( '<br />', "<br />\n", $t );
+		
+		/* CK needs this - legacy data only, new stuff uses proper tags */
+		if ( stristr( $t, '<b>' ) )
+		{
+			$t = str_replace( '<b>' , '<strong>', $t );
+			$t = str_replace( '</b>', '</strong>', $t );
+		}
+		
+		if ( stristr( $t, '<i>' ) )
+		{
+			$t = str_replace( '<i>' , '<em>', $t );
+			$t = str_replace( '</i>', '</em>', $t );
+		}
+		
+		/* Wrap in P tags */
+		if ( self::IPS_P_MODE )
+		{
+			if ( $t AND ( ! preg_match( '#^<(p)#', $t ) ) )
+			{
+				$t = $this->_convertBrToWrappedP( $t );
+				
+				$t = preg_replace( '#<p>(\s+?)?<ul#is', '<ul', $t );
+				$t = preg_replace( '#</ul>(\s+?)?</p>#is', '</ul>', $t );
+			}
+		}
+		
+		/* If the last item is an image, this causes issues in IE8 */
+		if ( $this->memberData['userAgentKey'] == 'explorer' )
+		{
+			$test = str_replace( "<#EMO_DIR#>", '', $t );
+			
+			if ( preg_match( '#(<img(?:[^>]+?)/>)</p>$#', $test ) )
+			{
+				$t = preg_replace( '#</p>$#', '<span>&nbsp;</span></p>', $t );
+			}
+		}
+		
+		IPSDebug::fireBug( 'info', array( 'End (rte): ' . $t ) );
+
+		return $t;
+	}
+	
+	/**
+	 * Convert <br /> tagged data to <p>
+	 * @link http://www.php.net/manual/en/function.nl2br.php#97643
+	 * @author James bandit.co dot nz
+	 * @param string $string
+	 */
+	protected function _convertBrToWrappedP( $string )
+	{
+		return '<p>' . $string . '</p>';
+
+		/*return  '<p>' 
+            	. preg_replace('#(<br\s*?/?>\s*?){2,}#', '</p>'."\n".'<p>', $string ) 
+            	. '</p>'; */
+    } 
+	
+	/**
+	 * Take content from STD and make safe
+	 * @param string $content
+	 * @return string
+	 */
+	protected function _stdProcess( $content, $NO_SANITIZE=false )
+	{
+		$content = str_replace( array( "\r\n", "\r" ), "\n", $content );
+		
+		$content = preg_replace( '#^([ ]+?)\n#m', "\n", $content );
+		
+		return trim( $this->_clean( $content, $NO_SANITIZE, false ) );
+	}
+	
+	/**
+	 * Process the content before passing off to the bbcode library
+	 *
+	 * @access	public
+	 * @param	string		Form field name OR Raw text
+	 * @param	boolean		Does not run _clean() to santize HTML. Used when 'switching' editors via ajax
+	 * @return	string		Text ready for editor
+	 */
+	protected function _rteProcess( $content, $NO_SANITIZE=false )
+	{
+		//-----------------------------------------
+		// Save some processing if no content
+		//-----------------------------------------
+		
+		if ( ! $content )
+		{
+			return $content;
+		}
+		
+		$ot	= $content;
+		
+		$content = str_replace( array( "\r\n", "\n" ), "\n", $content );
+		
+		/* Using P mode? CKEditor will send data like so
+		 * <p>test</p>
+		 * <p>More data</p>
+		 * <p><br /></p>
+		 */
+		if ( self::IPS_P_MODE )
+		{
+			/* Tidy up first */
+			$content = str_replace( '<div' , '<p' , $content );
+			$content = str_replace( '</div>', '</p>', $content );
+			$content = preg_replace( '#<p>(\s+?)?<ul#is', '<ul', $content );
+			$content = preg_replace( '#(\r\n|\r|\n)<p#is', '<p', $content );
+			//$content = preg_replace( '#(\r\n|\r|\n)<p([^>]+?)?'.'>&nbsp;</p>#is', "<br />", $content );
+			$content = preg_replace( '#</ul>(\s+?)?(<br([^>]+?)?>|</p>)#is', '</ul>', $content );
+		}
+		
+		/* Before we content/strip newlines, lets make code safe */
+		$content = $this->_recurseAndParse( 'pre', $content, "_parsePreTag" );
+	
+		//-----------------------------------------
+		// Fix up tabs/spaces
+		//-----------------------------------------
+
+		$content = str_replace( '&nbsp;&nbsp;&nbsp;&nbsp;', "{'tab'}", $content );
+		$content = str_replace( '&nbsp;', ' ', $content );
+		
+		/* looks to be non RTE content that has ended up there */
+		if ( ! strstr( $content, '<br' ) && ! strstr( $content, '<p' ) && strstr( $content, "\n" ) )
+		{
+			$content = str_replace( "\n", "<br />", $content );
+		}
+		else
+		{
+			$content = str_replace( "\n", "", $content );
+		}
+		
+		//-----------------------------------------
+		// Clean up already encoded HTML
+		//-----------------------------------------
+		
+		$content = str_replace( '&quot;', '"', $content );
+		$content = str_replace( '&apos;', "'", $content );
+		
+		//-----------------------------------------
+		// Fix up incorrectly nested urls / BBcode
+		//-----------------------------------------
+		
+		// @link	http://community.invisionpower.com/tracker/issue-24704-pasting-content-in-rte-with-image-first/
+		// Revert the fix for now as it causes more issues than the original one
+		$content = preg_replace( '#<a\s+?href=[\'"]([^>]+?)\[(.+?)[\'"](.+?)'.'>(.+?)\[\\2</a>#is', '<a href="\\1"\\3>\\4</a>[\\2', $content );
+		//$content = preg_replace( '#<a\s+?href=[\'"]([^>\'"]+?)[\'"](.*?)>(.+?)\[([^<]+?)</a>#is', '<a href="\\1">\\3</a>[\\4', $content );
+
+		//-----------------------------------------
+		// Make URLs safe (prevent tag stripping)
+		//-----------------------------------------
+
+		$content = preg_replace_callback( '#<(a href|img src)=([\'"])([^>]+?)(\\2)#is', array( $this, '_unhtmlUrl' ), $content );
+
+		//-----------------------------------------
+		// WYSI-Weirdness #1: BR tags to \n
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<br([^>]+?)>#', "<br />", $content );
+		$content = str_ireplace( array( "<br>", "<br />" ), "\n", $content );
+		
+		$content = trim( $content );
+		
+		//-----------------------------------------
+		// Before we can use strip_tags, we should
+		// clean out any javascript and CSS
+		//-----------------------------------------
+		
+		$content	= preg_replace( '/\<script(.*?)\>(.*?)\<\/script\>/', '', $content );
+		$content	= preg_replace( '/\<style(.*?)\>(.*?)\<\/style\>/', '', $content );
+		
+		//-----------------------------------------
+		// Remove tags we're not bothering with
+		// with PHPs wonderful strip tags func
+		//-----------------------------------------
+		
+		if ( ! $this->getAllowHtml() )
+		{
+			$content = strip_tags( $content, '<h1><h2><h3><h4><h5><h6><font><span><div><br><p><img><a><li><ol><ul><b><strong><em><i><u><s><strike><del><blockquote><sub><sup><pre>' );
+		}
+
+		//-----------------------------------------
+		// WYSI-Weirdness #2: named anchors
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<a\s+?name=.+?'.'>(.+?)</a>#is', "\\1", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #2.1: Empty a hrefs
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<a\s+?href([^>]+)></a>#is'         , ""   , $content );
+		$content = preg_replace( '#<a\s+?href=([\'\"])>\\1(.+?)</a>#is', "\\1", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #2.2: Double linked links
+		//-----------------------------------------
+		
+		$content = preg_replace( '#href=[\"\']\w+://(%27|\'|\"|&quot;)(.+?)\\1[\"\']#is', "href=\"\\2\"", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #3: Headline tags
+		//-----------------------------------------
+		
+		$content = preg_replace( "#<(h[0-9])(?:[^>]+?)?>(.+?)</\\1>#is", "\n[b]\\2[/b]\n", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #4: Font tags
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<font (color|size|face)=\"([a-zA-Z0-9\s\#\-]*?)\">(\s*)</font>#is', " ", $content );
+
+		//-----------------------------------------
+		// WYSI-Weirdness #5a: Fix up smilies: IE RTE
+		// @see Ticket 623146
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<img class=(\S+?) alt=(\S+?) src=[\"\'](.+?)[\"\']>#i', "<img src='\\3' class='\\1' alt='\\2' />", $content );
+		$content = preg_replace( '#alt=\'[\"\'](\S+?)[\'\"]\'#i', "alt='\\1'", $content );
+		$content = preg_replace( '#class=\'[\"\'](\S+?)[\'\"]\'#i', "class='\\1'", $content );
+		$content = preg_replace( '#([a-zA-Z0-9])<img src=[\"\'](.+?)[\"\'] class=[\"\'](.+?)[\"\'] alt=[\"\'](.+?)[\"\'] />#i', "\\1 <img src='\\2' class='\\3' alt='\\4' />", $content );
+		
+		/* Remove <img src="data:"> */
+		$content = preg_replace( '#<img\s+?(alt=""\s+?)?src="data:([^"]+?)"\s+?/>#', '', $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #6: Image tags
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<img alt=[\"\'][\"\'] height=[\"\']\d+?[\"\'] width=[\"\']\d+?[\"\']\s+?/>#', "", $content );
+		$content = preg_replace( '#<img.+?src=[\"\'](.+?)[\"\']([^>]+?)?'.'>#is', "[img]\\1[/img]", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #7: Linked URL tags
+		//-----------------------------------------
+		
+		$content = preg_replace( '#\[url=(\"|\'|&quot;)<a\s+?href=[\"\'](.*)/??[\'\"]\\2/??</a>#is', "[url=\\1\\2", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #8: Make relative images full links
+		//-----------------------------------------
+		
+		$content = preg_replace( '#\[img\](/)?public/style_(emoticons|images)#i', '[img]' . $this->settings['board_url'] . '/public/style_' . '\\2', $content );
+	
+		//-----------------------------------------
+		// Clean up whitespace between lis
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<li>\s+?(\S)#', '<li>\\1', $content );
+		$content = preg_replace( '#</li>\s+?(\S)#', '</li>\\1', $content );
+		$content = preg_replace( '#<br />(\s+?)?</li>#si', '</li>', $content );
+		
+		//-----------------------------------------
+		// Now, recursively parse the other tags
+		// to make sure we get the nested ones
+		//-----------------------------------------
+		
+		$content = $this->_recurseAndParse( 'b'			, $content, "_parseSimpleTag", 'b' );
+		$content = $this->_recurseAndParse( 'u'			, $content, "_parseSimpleTag", 'u' );
+		$content = $this->_recurseAndParse( 'strong'	, $content, "_parseSimpleTag", 'b' );
+		$content = $this->_recurseAndParse( 'i'			, $content, "_parseSimpleTag", 'i' );
+		$content = $this->_recurseAndParse( 'em'		, $content, "_parseSimpleTag", 'i' );
+		$content = $this->_recurseAndParse( 'strike'	, $content, "_parseSimpleTag", 's' );
+		$content = $this->_recurseAndParse( 'del'		, $content, "_parseSimpleTag", 's' );
+		$content = $this->_recurseAndParse( 's'			, $content, "_parseSimpleTag", 's' );
+		$content = $this->_recurseAndParse( 'blockquote', $content, "_parseSimpleTag", 'indent' );
+		$content = $this->_recurseAndParse( 'sup' 		, $content, "_parseSimpleTag", 'sup' );
+		$content = $this->_recurseAndParse( 'sub'		, $content, "_parseSimpleTag", 'sub' );
+
+		//-----------------------------------------
+		// More complex tags
+		//-----------------------------------------
+
+		$content = $this->_recurseAndParse( 'a'          , $content, "_parseAnchorTag" );
+		$content = $this->_recurseAndParse( 'font'       , $content, "_parseFontTag" );
+		$content = $this->_recurseAndParse( 'div'        , $content, "_parseDivTag" );
+		$content = $this->_recurseAndParse( 'p'          , $content, "_parseParagraphTag" );
+		$content = $this->_recurseAndParse( 'span'       , $content, "_parseSpanTag" );
+	
+		/* Possibility of preceeding \n because of P tag */
+		$content = trim( $content );
+
+		//-----------------------------------------
+		// Lists
+		//-----------------------------------------
+		
+		$content = $this->_recurseAndParse( 'ol'         , $content, "_parseListTag" );
+		$content = $this->_recurseAndParse( 'ul'         , $content, "_parseListTag" );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #9: Fix up para tags
+		//-----------------------------------------
+		
+		//$content = str_ireplace( array( "<p>", "<p />" ), "\n\n", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #10: Random junk
+		//-----------------------------------------
+		
+		$content = str_ireplace( array( "<a>", "</a>", "</li>" ), "", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #11: Fix up list stuff
+		//-----------------------------------------
+		
+		$content = preg_replace( '#<li>(.*)((?=<li>)|</li>)#is', '\\1', $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #11.1: Safari badness
+		//-----------------------------------------
+		
+		$content	= str_replace( "</div>", "", $content );
+		
+		/* Sometimes, unclosed P tags remain if text is copied and pasted directly */
+		$content	= preg_replace( '#<(p|div|ul|li)([^\>]+?)\>#is', '', $content );
+	
+		//-----------------------------------------
+		// WYSI-Weirdness #12: Convert rest to HTML
+		//-----------------------------------------
+		
+		$content = str_replace(  '&lt;' , '<', $content );
+		$content = str_replace(  '&gt;' , '>', $content );
+
+		//-----------------------------------------
+		// WYSI-Weirdness #13: Remove useless tags
+		//-----------------------------------------
+		
+		/* Remove embedded stuffs */
+		$content = preg_replace( '#\[(center|right|left)\]\[\1\]#i', '[\1]', $content );
+		$content = preg_replace( '#\[/(center|right|left)\]\[/\1\]#i', '[/\1]', $content );
+		
+		while( preg_match( '#\[(url|img|b|u|i|s|email|list|indent|right|left|center)\](\s+?)?\[/\1\]#is', $content ) )
+		{
+			$content = preg_replace( '#\[(url|img|b|u|i|s|email|list|indent|right|left|center)\](\s+?)?\[/\1\]#is', "", $content );
+		}
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #14: Opera crap
+		//-----------------------------------------
+		
+		$content = preg_replace( '#\[(font|size|color)\]=[\"\']([^\"\']+?)[\"\']\]\[/\\1\]#is', "", $content );
+		
+		//-----------------------------------------
+		// WYSI-Weirdness #14.1: Safari crap
+		//-----------------------------------------
+		
+		$content = preg_replace( '#\[(font|size|color)=&quot;([^\"\']+?)&quot;\]\[/\\1\]#is', "", $content );
+
+		//-----------------------------------------
+		// WYSI-Weirdness #15: No domain in FF?
+		//-----------------------------------------	
+		
+		$content = preg_replace( '#(http|https):\/\/index.php(.*?)#is', $this->settings['board_url'].'/index.php\\2', $content );	
+		$content = preg_replace( '#\[url=[\'\"]index.php(.*?)[\"\']#is', "[url=\"".$this->settings['board_url'].'/index.php\\1"', $content );	
+		
+		//-----------------------------------------
+		// Replace tabs
+		//-----------------------------------------
+		
+		$content = str_replace( "{'tab'}", "\t", $content );
+	
+		//-----------------------------------------
+		// Now call the santize routine to make
+		// html and nasties safe. VITAL!!
+		//-----------------------------------------
+		
+		$content = $this->_clean( trim( $content ), $NO_SANITIZE, true );
+
+		/* Ensure [xxx=&quot; is fixed */
+		$content = preg_replace( '#\[(\w+?)=&quot;(.+?)&quot;\]#', "[\\1=\"\\2\"]", $content );
+		
+		/* Relative paths */
+		$content = preg_replace( '#\[img\](../../|&\#46;&\#46;/&\#46;&\#46;/)public/#', '[img]' . $this->settings['board_url'] . '/public/', $content );
+				
+		/* Finally ensure emoticons are converted to normal tags */
+		if ( count( $this->cache->getCache('emoticons') ) > 0 )
+		{
+			$emoDir = $this->_fetchSmilieDir();
+			
+			foreach( $this->cache->getCache('emoticons') as $row )
+			{
+				if ( $row['emo_set'] != $emoDir )
+				{
+					continue;
+				}
+				
+				$content = preg_replace( '#(\s)?\[img\]' . preg_quote( $this->settings['public_cdn_url'] . 'style_emoticons/' . $this->registry->output->skin['set_emo_dir'] . '/' . $row['image'], '#' ) . '\[/img\]#',
+										 ' ' . $row['typed'], $content ); 
+				
+			}
+		}
+		
+		//-----------------------------------------
+		// Debug?
+		//-----------------------------------------
+		
+		if ( $this->debug )
+		{
+			print "<pre><hr>";
+			print nl2br(htmlspecialchars($ot));
+			print "<hr>";
+			print nl2br($content);
+			print "<hr>";
+			exit();
+		}
+		
+		//-----------------------------------------
+		// Done
+		//-----------------------------------------
+		
+		return $content;
+	}
+
+	/**
+	 * RTE: Parse List tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseListTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		$list_type = trim( preg_replace( '#"?list-style-type:\s+?([\d\w\_\-]+);?"?#si', '\\1', $this->_getValueOfOption( 'style', $opening_tag ) ) );
+		
+		//-----------------------------------------
+		// Set up a default...
+		//-----------------------------------------
+		
+		if ( ! $list_type and $tag == 'ol' )
+		{
+			$list_type = 'decimal';
+		}
+		
+		//-----------------------------------------
+		// Tricky regex to clean all list items
+		//-----------------------------------------
+		
+		$between_text = preg_replace( '#<li([^\>]+?)\>#is', '<li>', $between_text );
+		$between_text = preg_replace( '#<li>\s+?</li>#is', '', $between_text );
+		$between_text = preg_replace('#<li>((.(?!</li))*)(?=</?ul|</?ol|\[list|<li|\[/list)#siU', '<li>\\1</li>', $between_text);
+
+		$between_text = trim( $this->_recurseAndParse( 'li', $between_text, "_parseListElement" ) );
+		
+		$allowed_types = array( 'upper-alpha' => 'A',
+								'upper-roman' => 'I',
+								'lower-alpha' => 'a',
+								'lower-roman' => 'i',
+								'decimal'     => '1' );
+		
+		if ( ! $allowed_types[ $list_type ] )
+		{
+			$open_tag = "[list]\n";
+		}
+		else
+		{
+			$open_tag = '[list=' . $allowed_types[ $list_type ] . "]\n";
+		}
+		
+		return $open_tag . $this->_recurseAndParse( $tag, $between_text, '_parseListTag' ) . "\n[/list]";
+	}
+
+	/**
+	 * RTE: Parse List Element tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseListElement( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		/* Check for quote tags */
+		$openQuote  = substr_count( strtolower( $between_text ), '[quote' );
+		$closeQuote = substr_count( strtolower( $between_text ), '[/quote]' );
+		
+		if ( $openQuote != $closeQuote )
+		{
+			$between_text = str_replace( array( '[quote', '[/quote]' ), array( '&#91;quote', '&#91;/quote&#93;' ), $between_text );
+		}
+		
+		return '[*]' . rtrim( $between_text ) . "\n";
+	}
+	
+	/**
+	 * RTE: Parse paragraph tags
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseParagraphTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		/* Got any text to wrap? beware empty() because we might have 0 */
+		if ( $between_text == '' )
+		{
+			return;
+		}
+		
+		//-----------------------------------------
+		// Reset local start tags
+		//-----------------------------------------
+		
+		$start_tags = "";
+		$end_tags   = "";
+		//print $opening_tag . "\n" . $tag . "\n'" . $between_text. "'\n----\n";
+		
+		//-----------------------------------------
+		// Check for inline style moz may have added and append start_tags
+		//-----------------------------------------
+		
+		$this->_parseStyles( $opening_tag, $start_tags, $end_tags );
+		
+		//-----------------------------------------
+		// Now parse align and style (if any)
+		//-----------------------------------------
+		
+		$align      = $this->_getValueOfOption( 'align', $opening_tag );
+		$style      = $this->_getValueOfOption( 'style', $opening_tag );
+		$textAlign  = $this->_extractCssValue( $style, 'text-align' );
+		$marginLeft = intval( $this->_extractCssValue( $style, 'margin-left' ) );
+		
+		if ( $align == 'center' OR $textAlign == 'center' )
+		{
+			$start_tags = "\n" . $start_tags;
+			
+			if ( ! stristr( $start_tags, '[center]' ) )
+			{
+				$start_tags .= '[center]';
+				$end_tags   .= '[/center]';
+			}
+		}
+		else if ( $align == 'left' OR $textAlign == 'left' )
+		{
+			$start_tags = "\n" . $start_tags;
+			
+			if ( ! stristr( $start_tags, '[left]' ) )
+			{
+				$start_tags .= '[left]';
+				$end_tags   .= '[/left]';
+			}
+		}
+		else if ( $align == 'right' OR $textAlign == 'right' )
+		{
+			$start_tags = "\n" . $start_tags;
+			
+			if ( ! stristr( $start_tags, '[right]' ) )
+			{
+				$start_tags .= '[right]';
+				$end_tags   .= '[/right]';
+			}
+		}
+		else if ( $marginLeft )
+		{
+			$level = ( $marginLeft > 40 ) ? $marginLeft / 40 : 1;
+			
+			if ( trim( $between_text ) )
+			{
+				$start_tags = "\n" . $start_tags;
+				
+				$start_tags .= '[indent=' . $level . ']';
+				$end_tags   .= '[/indent]';
+			}
+		}
+		else
+		{
+			# No align? Make paragraph
+			$start_tags .= "\n";
+		}
+		
+		/* Was there just a blank space in there? */
+		if ( preg_match( '#^[ ]+$#', $between_text ) )
+		{
+			return "\n";
+		}
+		
+		return $start_tags . $this->_recurseAndParse( 'p', $between_text, '_parseParagraphTag' ) . $end_tags;
+	}
+	
+	/**
+	 * RTE: Parse pre tags
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parsePreTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		/* Got any text to wrap? beware empty() because we might have 0 */
+		if ( $between_text == '' )
+		{
+			return;
+		}
+		
+		if ( ! stristr( $between_text, '<br' ) && stristr( $between_text, "\n" ) )
+		{
+			$between_text = str_replace( "\n", "<br />", $between_text );
+		}
+		
+		return $this->_recurseAndParse( 'pre', $between_text, '_parsePreTag' );
+	}	
+	
+	/**
+	 * RTE: Parse Span tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseSpanTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		$start_tags = "";
+		$end_tags   = "";
+		
+		//-----------------------------------------
+		// Check for inline style moz may have added
+		//-----------------------------------------
+
+		$this->_parseStyles( $opening_tag, $start_tags, $end_tags );
+		
+		return $start_tags . $this->_recurseAndParse( 'span', $between_text, '_parseSpanTag' ) . $end_tags;
+	}
+	
+	/**
+	 * RTE: Parse Fieldset tag used to contain code
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseFieldsetTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		//-----------------------------------------
+		// Reset local start tags
+		//-----------------------------------------
+		
+		$start_tags = "";
+		$end_tags   = "";
+		
+		//-----------------------------------------
+		// #DEBUG
+		//-----------------------------------------
+		
+		if ( $this->debug == 2 )
+		{
+			print "<b><span style='color:red'>DIV FIRED</b></span><br />Start tags: {$this->start_tags}<br />End tags: {$this->end_tags}<br />Between text:<br />".htmlspecialchars($between_text)."<hr />";
+		}
+		
+		//-----------------------------------------
+		// Check for inline style moz may have added
+		//-----------------------------------------
+		
+		$this->_parseStyles( $opening_tag, $start_tags, $end_tags );
+		
+		//-----------------------------------------
+		// Now parse align (if any)
+		//-----------------------------------------
+		
+		$class = $this->_getValueOfOption( 'class', $opening_tag );
+		
+		if ( $class == 'ipbCode' )
+		{
+			$start_tags .= '[code]';
+			$end_tags   .= '[/code]';
+		}
+
+		//-----------------------------------------
+		// Get recursive text
+		//-----------------------------------------
+		
+		$final = $this->_recurseAndParse( 'fieldset', trim( $between_text ), '_parseFieldsetTag' );
+		
+		//-----------------------------------------
+		// #DEBUG
+		//-----------------------------------------
+		
+		if ( $this->debug == 2 )
+		{
+			print "\n<hr><b style='color:green'>FINISHED</b><br/ >".$start_tags . trim( $final ) . $end_tags."<hr>";
+		}
+		
+		//-----------------------------------------
+		// Now return
+		//-----------------------------------------
+		
+		return $start_tags . $final . $end_tags;
+	}
+	
+	/**
+	 * RTE: Parse DIV tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseDivTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		//-----------------------------------------
+		// Reset local start tags
+		//-----------------------------------------
+		
+		$start_tags = "";
+		$end_tags   = "";
+		$allowEndNl = true;
+		
+		//-----------------------------------------
+		// #DEBUG
+		//-----------------------------------------
+		
+		if ( $this->debug == 2 )
+		{
+			print "<b><span style='color:red'>DIV FIRED</b></span><br />Start tags: {$this->start_tags}<br />End tags: {$this->end_tags}<br />Between text:<br />".htmlspecialchars($between_text)."<hr />";
+		}
+		
+		//-----------------------------------------
+		// Check for inline style moz may have added
+		//-----------------------------------------
+		
+		$this->_parseStyles( $opening_tag, $start_tags, $end_tags );
+		
+		//-----------------------------------------
+		// Now parse align (if any)
+		//-----------------------------------------
+		
+		$align = $this->_getValueOfOption( 'align', $opening_tag );
+		
+		if ( $align == 'center' )
+		{
+			$start_tags .= '[center]';
+			$end_tags   .= '[/center]';
+			$allowEndNl  = false;
+		}
+		else if ( $align == 'left' )
+		{
+			$start_tags .= '[left]';
+			$end_tags   .= '[/left]';
+			$allowEndNl  = false;
+		}
+		else if ( $align == 'right' )
+		{
+			$start_tags .= '[right]';
+			$end_tags   .= '[/right]';
+			$allowEndNl  = false;
+		}
+		else
+		{
+			# No align? Make paragraph
+			$start_tags .= "\n";
+		}
+
+		//-----------------------------------------
+		// Get recursive text
+		//-----------------------------------------
+		
+		$final = $this->_recurseAndParse( 'div', $between_text, '_parseDivTag' );
+		
+		//-----------------------------------------
+		// #DEBUG
+		//-----------------------------------------
+		
+		if ( $this->debug == 2 )
+		{
+			print "\n<hr><b style='color:green'>FINISHED</b><br/ >".$start_tags . $final . $end_tags."<hr>";
+		}
+		
+		//-----------------------------------------
+		// Now return
+		//-----------------------------------------
+		
+		return $start_tags . $final . $end_tags;
+	}
+	
+	/**
+	 * RTE: Parse style attributes (color, font, size, b, i..etc)
+	 *
+	 * @access	protected
+	 * @param	string	Opening tag
+	 * @param	string	Start tags
+	 * @param	string	End tags
+	 * @return	string	Converted text
+	 */
+	protected function _parseStyles( $opening_tag, &$start_tags, &$end_tags )
+	{
+		$style_list = array(
+							array('tag' => 'color' , 'rx' => '(?<![\w\-])color:\s*([^;]+);?'	, 'match' => 1),
+							array('tag' => 'font'  , 'rx' => 'font-family:\s*([^;]+);?'		, 'match' => 1),
+							array('tag' => 'size'  , 'rx' => 'font-size:\s*(.+);?'			, 'match' => 1),
+							array('tag' => 'b'     , 'rx' => 'font-weight:\s*(bold);?'),
+							array('tag' => 'i'     , 'rx' => 'font-style:\s*(italic);?'),
+							array('tag' => 'u'     , 'rx' => 'text-decoration:\s*(underline);?'),
+							array('tag' => 'left'  , 'rx' => 'text-align:\s*(left);?'),
+							array('tag' => 'center', 'rx' => 'text-align:\s*(center);?'),
+							array('tag' => 'right' , 'rx' => 'text-align:\s*(right);?'),
+						  );
+		
+		//-----------------------------------------
+		// get style option
+		//-----------------------------------------
+		
+		$style = $this->_getValueOfOption( 'style', $opening_tag );
+		$class = $this->_getValueOfOption( 'class', $opening_tag );
+
+		//-----------------------------------------
+		// Convert RGB to hex
+		//-----------------------------------------
+
+		$style = preg_replace_callback( '#(?<![\w\-])color:\s+?rgb\((\d+,\s+?\d+,\s+?\d+)\)(;?)#i', array( &$this, '_rgbToHex' ), $style );
+		
+		//-----------------------------------------
+		// Pick through possible styles
+		//-----------------------------------------
+		
+		foreach( $style_list as $data )
+		{
+			if ( preg_match( '#' . $data['rx'] . '#i', $style, $match ) )
+			{
+				if ( $data['match'] )
+				{
+					if ( $data['tag'] != 'size' )
+					{
+						if( $data['tag'] != 'font' OR $match[ $data['match'] ] != 'Verdana, arial, sans-serif' )
+						{
+							$start_tags .= "[{$data['tag']}={$match[$data['match']]}]";
+						}
+					}
+					else
+					{
+						$start_tags .= "[{$data['tag']}=" . $this->convertRealsizeToBbsize($match[$data['match']]) ."]";
+					}
+				}
+				else
+				{
+					$start_tags .= "[{$data['tag']}]";
+				}
+				
+				if ( $start_tags && $data['tag'] != 'font' OR $match[ $data['match'] ] != 'Verdana, arial, sans-serif' )
+				{
+					$end_tags = "[/{$data['tag']}]" . $end_tags;
+				}
+			}
+		}
+		
+		if( $class == 'bbc_underline' )
+		{
+			$start_tags	= '[u]';
+			$end_tags	= '[/u]';
+		}
+	}
+
+	/**
+	 * RTE: Parse FONT tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseFontTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		$font_tags  = array( 'font' => 'face', 'size' => 'size', 'color' => 'color' );
+		$start_tags = "";
+		$end_tags   = "";
+		
+		//-----------------------------------------
+		// Check for attributes
+		//-----------------------------------------
+		
+		foreach( $font_tags as $bbcode => $string )
+		{
+			$option = $this->_getValueOfOption( $string, $opening_tag );
+			
+			if ( $option )
+			{
+				$start_tags .= "[{$bbcode}=\"{$option}\"]";
+				$end_tags    = "[/{$bbcode}]" . $end_tags;
+				
+				if ( $this->debug == 2 )
+				{
+					print "<br />Got bbcode=$bbcode / opening_tag=$opening_tag";
+					print "<br />- Adding [$bbcode=\"$option\"] [/$bbcode]";
+					print "<br />-- start tags now: {$start_tags}";
+					print "<br />-- end tags now: {$end_tags}";
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Now check for inline style moz may have
+		// added
+		//-----------------------------------------
+		
+		$this->_parseStyles( $opening_tag, $start_tags, $end_tags );
+		
+		return $start_tags . $this->_recurseAndParse( 'font', $between_text, '_parseFontTag' ) . $end_tags;
+	}
+
+	/**
+	 * RTE: Simple tags
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseSimpleTag( $tag, $between_text, $opening_tag, $parse_tag )
+	{
+		if ( ! $parse_tag )
+		{
+			$parse_tag = $tag;
+		}
+		
+		return "[{$parse_tag}]" . $this->_recurseAndParse( $tag, $between_text, '_parseSimpleTag', $parse_tag ) . "[/{$parse_tag}]";
+	}
+
+	/**
+	 * RTE: Parse A HREF tag
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Opening tag complete
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _parseAnchorTag( $tag, $between_text, $opening_tag, $parse_tag='' )
+	{
+		$mytag = 'url';
+		$href  = $this->_getValueOfOption( 'href', $opening_tag );
+		$class = $this->_getValueOfOption( 'class', $opening_tag );
+		
+		$href  = str_replace( '<', '&lt;', $href );
+		$href  = str_replace( '>', '&gt;', $href );
+		$href  = str_replace( ' ', '%20' , $href );
+		
+		if ( preg_match( '#^mailto\:#is', $href ) )
+		{
+			$mytag = 'email';
+			$href  = str_replace( "mailto:", "", $href );
+		}
+		
+		return "[{$mytag}=\"{$href}\"]" . $this->_recurseAndParse( $tag, $between_text, '_parseAnchorTag', $parse_tag ) . "[/{$mytag}]";
+	}
+
+	/**
+	 * RTE: Recursively parse tags
+	 *
+	 * @access	protected
+	 * @param	string	Tag
+	 * @param	string	Text between opening and closing tag
+	 * @param	string	Callback Function
+	 * @param	string	Parse tag
+	 * @return	string	Converted text
+	 */
+	protected function _recurseAndParse( $tag, $text, $function, $parse_tag='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$tag              = strtolower($tag);
+		$open_tag         = "<" . $tag;
+		$open_tag_len     = strlen($open_tag);
+		$close_tag        = "</" . $tag . ">";
+		$close_tag_len    = strlen($close_tag);
+		$start_search_pos = 0;
+		$tag_begin_loc    = 1;
+		
+		//-----------------------------------------
+		// Start the loop
+		//-----------------------------------------
+
+		while ( $tag_begin_loc !== FALSE )
+		{
+			$lowtext       = strtolower($text);
+			$tag_begin_loc = @strpos( $lowtext, $open_tag, $start_search_pos );
+			$lentext       = strlen($text);
+			$quoted        = '';
+			$got           = FALSE;
+			$tag_end_loc   = FALSE;
+			
+			//-----------------------------------------
+			// No opening tag? Break
+			//-----------------------------------------
+		
+			if ( $tag_begin_loc === FALSE )
+			{
+				break;
+			}
+			
+			//-----------------------------------------
+			// Pick through text looking for delims
+			//-----------------------------------------
+			
+			for ( $end_opt = $tag_begin_loc; $end_opt <= $lentext; $end_opt++ )
+			{
+				$chr = $text{$end_opt};
+				
+				//-----------------------------------------
+				// We're now in a quote
+				//-----------------------------------------
+				
+				if ( ( in_array( $chr, $this->delimiters ) ) AND $quoted == '' )
+				{
+					$quoted = $chr;
+				}
+				
+				//-----------------------------------------
+				// We're not in a quote any more
+				//-----------------------------------------
+				
+				else if ( ( in_array( $chr, $this->delimiters ) ) AND $quoted == $chr )
+				{
+					$quoted = '';
+				}
+				
+				//-----------------------------------------
+				// Found the closing bracket of the open tag
+				//-----------------------------------------
+				
+				else if ( $chr == '>' AND ! $quoted )
+				{
+					$got = TRUE;
+					break;
+				}
+				
+				else if ( ( in_array( $chr, $this->non_delimiters ) ) AND ! $tag_end_loc )
+				{
+					$tag_end_loc = $end_opt;
+				}
+			}
+			
+			//-----------------------------------------
+			// Not got the complete tag?
+			//-----------------------------------------
+			
+			if ( ! $got )
+			{
+				break;
+			}
+			
+			//-----------------------------------------
+			// Not got a tag end location?
+			//-----------------------------------------
+			
+			if ( ! $tag_end_loc )
+			{
+				$tag_end_loc = $end_opt;
+			}
+			
+			//-----------------------------------------
+			// Extract tag options...
+			//-----------------------------------------
+			
+			$tag_opts        = substr( $text   , $tag_begin_loc + $open_tag_len, $end_opt - ($tag_begin_loc + $open_tag_len) );
+			$actual_tag_name = substr( $lowtext, $tag_begin_loc + 1            , ( $tag_end_loc - $tag_begin_loc ) - 1 );
+			
+			//-----------------------------------------
+			// Check against actual tag name...
+			//-----------------------------------------
+			
+			if ( $actual_tag_name != $tag )
+			{
+				$start_search_pos = $end_opt;
+				continue;
+			}
+	
+			//-----------------------------------------
+			// Now find the end tag location
+			//-----------------------------------------
+			
+			$tag_end_loc = strpos( $lowtext, $close_tag, $end_opt );
+			
+			//-----------------------------------------
+			// Not got one? Break!
+			//-----------------------------------------
+			
+			if ( $tag_end_loc === FALSE )
+			{
+				break;
+			}
+	
+			//-----------------------------------------
+			// Check for nested tags
+			//-----------------------------------------
+			
+			$nest_open_pos = strpos($lowtext, $open_tag, $end_opt);
+			
+			while ( $nest_open_pos !== FALSE AND $tag_end_loc !== FALSE )
+			{
+				//-----------------------------------------
+				// It's not actually nested
+				//-----------------------------------------
+				
+				if ( $nest_open_pos > $tag_end_loc )
+				{
+					break;
+				}
+				
+				if ( $this->debug == 2)
+				{
+					print "\n\n<hr>( ".htmlspecialchars($open_tag)." ) NEST FOUND</hr>\n\n";
+				}
+				
+				$tag_end_loc   = strpos($lowtext, $close_tag, $tag_end_loc   + $close_tag_len);
+				$nest_open_pos = strpos($lowtext, $open_tag , $nest_open_pos + $open_tag_len );
+			}
+			
+			//-----------------------------------------
+			// Make sure we have an end location
+			//-----------------------------------------
+			
+			if ( $tag_end_loc === FALSE )
+			{
+				$start_search_pos = $end_opt;
+				continue;
+			}
+	
+			$this_text_begin  = $end_opt + 1;
+			$between_text     = substr($text, $this_text_begin, $tag_end_loc - $this_text_begin);
+			$offset           = $tag_end_loc + $close_tag_len - $tag_begin_loc;
+			
+			//-----------------------------------------
+			// Pass to function
+			//-----------------------------------------
+			
+			$final_text       = $this->$function($tag, $between_text, $tag_opts, $parse_tag);
+			
+			//-----------------------------------------
+			// #DEBUG
+			//-----------------------------------------
+			
+			if ( $this->debug == 2)
+			{
+				print "<hr><b>REPLACED {$function}($tag, ..., $tag_opts):</b><br />".htmlspecialchars(substr($text, $tag_begin_loc, $offset))."<br /><b>WITH:</b><br />".htmlspecialchars($final_text)."<hr>NEXT ITERATION";
+			}
+				
+			//-----------------------------------------
+			// Swap text
+			//-----------------------------------------
+			
+			$text             = substr_replace($text, $final_text, $tag_begin_loc, $offset);
+			$start_search_pos = $tag_begin_loc + strlen($final_text);
+		} 
+	
+		return $text;
+	}
+
+	/**
+	 * RTE: Extract option HTML
+	 *
+	 * @access	protected
+	 * @param	string	Option
+	 * @param	string	Text
+	 * @return	string	Converted text
+	 */
+	protected function _getValueOfOption( $option, $text )
+	{
+		if( $option == 'face' )
+		{
+			// Bad font face, bad
+			preg_match( "#{$option}(\s+?)?\=(\s+?)?[\"']?(.+?)([\"']|$|color|size|>)#is", $text, $matches );
+		}
+		else
+		{
+			// @link http://community.invisionpower.com/tracker/issue-29336-colours-do-not-work-in-signatures
+			// ckeditor should have a more universal formatting so let's go with the one regex now
+			//if( $option == 'style' AND ( $this->memberData['userAgentKey'] == 'safari' OR $this->memberData['userAgentKey'] == 'chrome' ) )
+			//{
+				preg_match( "#{$option}(\s*?)?\=(\s*?)?[\"']?(.+?)([\"']|$|>)#is", $text, $matches );
+			//}
+			//else
+			//{
+			//	preg_match( "#{$option}(\s*?)?\=(\s*?)?[\"']?(.+?)([\"']|$|\s|>)#is", $text, $matches );
+			//}
+		}
+
+		if( $option == 'style' )
+		{
+			switch( $matches[3] )
+			{
+				case 'font-size: x-small;':
+					$matches[3]	= 'font-size: 8;';
+				break;
+				
+				case 'font-size: small;':
+					$matches[3]	= 'font-size: 10;';
+				break;
+				
+				case 'font-size: medium;':
+					$matches[3]	= 'font-size: 12;';
+				break;
+				
+				case 'font-size: large;':
+					$matches[3]	= 'font-size: 14;';
+				break;
+				
+				case 'font-size: x-large;':
+					$matches[3]	= 'font-size: 18;';
+				break;
+				
+				case 'font-size: xx-large;':
+					$matches[3]	= 'font-size: 24;';
+				break;
+				
+				case 'font-size: xxx-large;':
+				case 'font-size: -webkit-xxx-large;':
+					$matches[3]	= 'font-size: 36;';
+				break;
+			}
+		}
+
+		return isset($matches[3]) ? trim( $matches[3] ) : '';
+	}
+
+	/**
+	 * unhtml url: Removes < and >
+	 *
+	 * @access	protected
+	 * @param	array 		Matches from preg_replace_callback
+	 * @return	string		Converted text
+	 */
+	protected function _unhtmlUrl( $matches=array() )
+	{
+		$url  = stripslashes( $matches[3] );
+		$type = stripslashes( $matches[1] ? $matches[1] : 'a href' );
+		
+		$url  = str_replace( '<', '&lt;', $url );
+		$url  = str_replace( '>', '&gt;', $url );
+		$url  = str_replace( ' ', '%20' , $url );
+		
+		return '<' . $type . '="' . $url . '"';
+	}
+	
+	/**
+	 * Fetches the value of an inline style
+	 * @param string $style
+	 * @param string $lookFor
+	 * @return string|boolean
+	 */
+	protected function _extractCssValue( $style, $lookFor )
+	{
+		if ( strstr( $style, 'style=') )
+		{
+			$style = $this->_getValueOfOption( 'style', $style );
+		}
+		
+		if ( strstr( $style, $lookFor ) )
+		{
+			if ( preg_match( '#' . preg_quote( $lookFor, '#') . ':(?:\s+?)?(.+?)(;|$|\n)#', $style, $matches ) )
+			{
+				return trim( $matches[1] );
+			}
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Converts color:rgb(x,x,x) to color:#xxxxxx
+	 *
+	 * @access	protected
+	 * @param	string	rgb contents: x,x,x
+	 * @param	string	regex end
+	 * @return	string	Converted text
+	 */
+	protected function _rgbToHex($matches)
+	{
+		$t  = $matches[1];
+		$t2 = $matches[2];
+		
+		$tmp = array_map( "trim", explode( ",", $t ) );
+		return 'color: ' . sprintf( "#%02X%02X%02X" . $t2, intval($tmp[0]), intval($tmp[1]), intval($tmp[2]) );
+	}
+	
+	/**
+	 * Generates unique editor ID
+	 */
+	protected function _fetchEditorName()
+	{
+		return 'editor_' . uniqid();
+	}
+	
+	/**
+	 * Returns current emoticon directory...
+	 * @return string
+	 */
+	protected function _fetchSmilieDir()
+	{
+  		if ( IN_ACP )
+  		{
+			$image_set = $this->DB->buildAndFetch( array( 'select' => 'set_image_dir, set_emo_dir', 'from' => 'skin_collections', 'where' => 'set_is_default=1' ) );
+
+			return $image_set['set_image_dir'];
+  		}
+  		else
+  		{
+			return ipsRegistry::getClass('output')->skin['set_emo_dir'];
+  		}
+	}
+	
+	/**
+	 * Generates a full autosave key
+	 * @param string $autoSaveKey
+	 * @return string
+	 */
+	protected function _generateAutoSaveKey( $autoSaveKey )
+	{
+		return md5( IPS_APP_COMPONENT . '-' . trim( $autoSaveKey ) . '-' . intval( $this->memberData['member_id'] ) );
+	}
+	
+	/**
+	 * Clean up and make the text for the DB
+	 *
+	 * @access	protected
+	 * @param	string		Raw text
+	 * @return	string		Converted text
+	 */
+	protected function _clean( $t, $NO_SANITIZE=false, $isFromRte=false )
+    {
+    	if ( $t == "" )
+    	{
+    		return "";
+    	}
+		
+		if ( IPS_DOC_CHAR_SET == 'UTF-8' || $this->_isSwitchingFrom == 'std' )
+		{
+    		$t = IPSText::decodeNamedHtmlEntities( $t );
+		}
+		
+    	if ( $isFromRte === false )
+    	{
+	    	$t = preg_replace( '#&(?!\#[0-9]+;)#', '&amp;', $t );
+	    	
+	    	$t = preg_replace("/&#([0-9]+);/s", "&amp;#\\1;", $t );
+    	}
+    	
+    	$t = str_replace( ">", "&gt;", $t );
+	    $t = str_replace( "<", "&lt;", $t );
+	    	
+    	/* We replace \ to 092 so convert it back */
+		$t = str_replace( '&amp;#092;', '\\', $t );
+		
+    	/* Make it safe */
+    	if ( $NO_SANITIZE !== true )
+    	{   			
+	    	$t = str_replace( "<!--"		, "&#60;&#33;--"  , $t );
+	    	$t = str_replace( "-->"			, "--&#62;"       , $t );
+	    	$t = str_ireplace( "<script"	, "&#60;script"   , $t );
+	    	$t = str_replace( '"'			, "&quot;"        , $t );
+	    	$t = str_replace( '$'			, "&#036;"        , $t );
+	    	$t = str_replace( "\r"			, ""              , $t );
+	    	$t = str_replace( "!"			, "&#33;"         , $t );
+	    	$t = str_replace( "'"			, "&#39;"         , $t );
+    	}    	
+    		
+    	$t = str_replace( "&#34;", '&quot;', $t );
+    	$t = str_replace( "&#38;", '&amp;', $t );
+    	$t = str_replace( "&#160;", ' ', $t );
+
+    	$t = str_replace( "\n", "<br />", $t );
+    	
+    	$t = $this->_allowNonUtf8CharsWhenNotUsingUtf8Doc( $t );
+    	
+    	return $t;
+    }
+    
+	/**
+	 * Get BBCode font size from real PX size
+	 *
+	 * @access	public
+	 * @param	integer		PX Size
+	 * @return	integer		BBCode size
+	 */
+	public function convertRealsizeToBbsize( $real )
+	{
+		$real = intval( $real );
+		
+		//-----------------------------------------
+		// If we have a true mapping, use it
+		//-----------------------------------------
+		
+		if ( $this->rev_font_sizes[ $real ] )
+		{
+			return $this->rev_font_sizes[ $real ];
+		}
+		else
+		{
+			//-----------------------------------------
+			// Otherwise find the next closest size down
+			//-----------------------------------------
+			
+			foreach( $this->rev_font_sizes as $font => $bbcode )
+			{
+				if( $real < $font )
+				{
+					return ( ( $bbcode - 1 ) > 1 ) ? ( $bbcode - 1 ) : 1;
+				}
+			}
+			
+			return 2;
+		}
+	}
+	
+	/**
+	 * Fetch emoticons as JSON for editors, etc
+	 *
+	 * @param	mixed		Number of emoticons to fetch (false to fetch all, or an int limit)
+	 * @return	string		JSON
+	 */
+	public function fetchEmoticons( $fetchFirstX=false )
+	{
+		$emoDir    = $this->_fetchSmilieDir();
+		$emoString = '';
+		$smilie_id = 0;
+		$total     = 0;
+		
+		foreach( ipsRegistry::cache()->getCache('emoticons') as $elmo )
+		{
+			if ( $elmo['emo_set'] != $emoDir )
+			{
+				continue;
+			}
+			
+			$total++;
+			
+			if ( $fetchFirstX !== false && ( $smilie_id + 1 > $fetchFirstX ) )
+			{
+				continue;
+			}
+
+			//-----------------------------------------
+			// Make single quotes as URL's with html entites in them
+			// are parsed by the browser, so ' causes JS error :o
+			//-----------------------------------------
+			
+			if ( strstr( $elmo['typed'], "&#39;" ) )
+			{
+				$in_delim  = '"';
+			}
+			else
+			{
+				$in_delim  = "'";
+			}
+			
+			$emoArray[ $smilie_id ] = array( 'src'  => $elmo['image'],
+											 'text' => addslashes($elmo['typed']) );
+			
+			
+			$smilie_id++;
+		}
+		
+		return array( 'total' => $total, 'count' => $smilie_id, 'emoticons' => $emoArray );
+	}
+
+	/**
+	 * Makes code stuff safe
+	 * @param array $matches
+	 * @return string
+	 */
+	protected function _rteMakeCodeSafeWhileParsing( $matches )
+	{
+		/* Code can come in PRE tags so there will be \n but no <br> */
+		if ( ! stristr( $matches[0], '<br' ) && stristr( $matches[0], "\n" ) )
+		{
+			return str_replace( "\n", "<code-new-line>", str_replace( array( '<br>', '<br />' ), '', $matches[0] ) );
+		}
+		
+		return $matches[0];
+	}
+	
+	/**
+	 * The crazy crap we have to deal with. User enters squiggly char, it gets turned into &#128; or &Aacute; but there is
+	 * no matching character in the doc set so we have to try and decode manually
+
+	 * @param string Raw string
+	 * @return string	Converted string
+	 */
+	protected function _allowNonUtf8CharsWhenNotUsingUtf8Doc( $string )
+	{
+		/* If we're not using UTF-8, lets try and handle encoded data. */
+		if ( IPS_DOC_CHAR_SET != 'UTF-8' )
+		{
+			/* First, convert any left over &acute; style chars */
+			preg_match_all( '/&amp;([a-zA-Z]{5,8});/', $string, $matches );
+			
+			foreach( $matches[1] as $word )
+			{
+				$converted = str_replace( '&', '&amp;', $this->_convertEntity( array( 1 => $word ) ) );
+				
+				if ( $converted  )
+				{
+					$string = str_replace( '&amp;' . $word . ';', $converted, $string );
+				}
+			}
+			
+			preg_match_all( '/&amp;#([0-9]{3,6});/', $string, $matches );
+			
+			foreach( $matches[1] as $word )
+			{
+				if ( $word > 127 )
+				{
+					$string = str_replace( '&amp;#' . $word . ';', '&#' . $word . ';', $string );
+				}
+			}
+		}
+		
+		return $string;
+	}
+	
+	/**
+	 * Function to convert named entities to numeric entities
+	 *
+	 * @param	array 	$matches	Results from preg_match call
+	 * @return	string
+	 * @link	http://www.lazycat.org/php-convert-entities.php
+	 */
+	protected function _convertEntity( $matches )
+	{
+	  static $table = array(/*'quot' => '&#34;','amp' => '&#38;','lt' => '&#60;','gt' => '&#62;',*/'OElig' => '&#338;','oelig' => '&#339;','Scaron' => '&#352;','scaron' => '&#353;','Yuml' => '&#376;',
+							'circ' => '&#710;','tilde' => '&#732;','ensp' => '&#8194;','emsp' => '&#8195;','thinsp' => '&#8201;','zwnj' => '&#8204;','zwj' => '&#8205;','lrm' => '&#8206;','rlm' => '&#8207;',
+							'ndash' => '&#8211;','mdash' => '&#8212;','lsquo' => '&#8216;','rsquo' => '&#8217;','sbquo' => '&#8218;','ldquo' => '&#8220;','rdquo' => '&#8221;','bdquo' => '&#8222;','dagger' => '&#8224;',
+							'Dagger' => '&#8225;','permil' => '&#8240;','lsaquo' => '&#8249;','rsaquo' => '&#8250;','euro' => '&#8364;','fnof' => '&#402;','Alpha' => '&#913;','Beta' => '&#914;','Gamma' => '&#915;',
+							'Delta' => '&#916;','Epsilon' => '&#917;','Zeta' => '&#918;','Eta' => '&#919;','Theta' => '&#920;','Iota' => '&#921;','Kappa' => '&#922;','Lambda' => '&#923;','Mu' => '&#924;','Nu' => '&#925;',
+							'Xi' => '&#926;','Omicron' => '&#927;','Pi' => '&#928;','Rho' => '&#929;','Sigma' => '&#931;','Tau' => '&#932;','Upsilon' => '&#933;','Phi' => '&#934;','Chi' => '&#935;','Psi' => '&#936;',
+							'Omega' => '&#937;','alpha' => '&#945;','beta' => '&#946;','gamma' => '&#947;','delta' => '&#948;','epsilon' => '&#949;','zeta' => '&#950;','eta' => '&#951;','theta' => '&#952;','iota' => '&#953;',
+							'kappa' => '&#954;','lambda' => '&#955;','mu' => '&#956;','nu' => '&#957;','xi' => '&#958;','omicron' => '&#959;','pi' => '&#960;','rho' => '&#961;','sigmaf' => '&#962;','sigma' => '&#963;',
+							'tau' => '&#964;','upsilon' => '&#965;','phi' => '&#966;','chi' => '&#967;','psi' => '&#968;','omega' => '&#969;','thetasym' => '&#977;','upsih' => '&#978;','piv' => '&#982;','bull' => '&#8226;',
+							'hellip' => '&#8230;','prime' => '&#8242;','Prime' => '&#8243;','oline' => '&#8254;','frasl' => '&#8260;','weierp' => '&#8472;','image' => '&#8465;','real' => '&#8476;','trade' => '&#8482;',
+							'alefsym' => '&#8501;','larr' => '&#8592;','uarr' => '&#8593;','rarr' => '&#8594;','darr' => '&#8595;','harr' => '&#8596;','crarr' => '&#8629;','lArr' => '&#8656;','uArr' => '&#8657;',
+							'rArr' => '&#8658;','dArr' => '&#8659;','hArr' => '&#8660;','forall' => '&#8704;','part' => '&#8706;','exist' => '&#8707;','empty' => '&#8709;','nabla' => '&#8711;','isin' => '&#8712;',
+							'notin' => '&#8713;','ni' => '&#8715;','prod' => '&#8719;','sum' => '&#8721;','minus' => '&#8722;','lowast' => '&#8727;','radic' => '&#8730;','prop' => '&#8733;','infin' => '&#8734;',
+							'ang' => '&#8736;','and' => '&#8743;','or' => '&#8744;','cap' => '&#8745;','cup' => '&#8746;','int' => '&#8747;','there4' => '&#8756;','sim' => '&#8764;','cong' => '&#8773;','asymp' => '&#8776;',
+							'ne' => '&#8800;','equiv' => '&#8801;','le' => '&#8804;','ge' => '&#8805;','sub' => '&#8834;','sup' => '&#8835;','nsub' => '&#8836;','sube' => '&#8838;','supe' => '&#8839;','oplus' => '&#8853;',
+							'otimes' => '&#8855;','perp' => '&#8869;','sdot' => '&#8901;','lceil' => '&#8968;','rceil' => '&#8969;','lfloor' => '&#8970;','rfloor' => '&#8971;','lang' => '&#9001;','rang' => '&#9002;',
+							'loz' => '&#9674;','spades' => '&#9824;','clubs' => '&#9827;','hearts' => '&#9829;','diams' => '&#9830;','nbsp' => ' ','iexcl' => '&#161;','cent' => '&#162;','pound' => '&#163;',
+							'curren' => '&#164;','yen' => '&#165;','brvbar' => '&#166;','sect' => '&#167;','uml' => '&#168;','copy' => '&#169;','ordf' => '&#170;','laquo' => '&#171;','not' => '&#172;','shy' => '&#173;',
+							'reg' => '&#174;','macr' => '&#175;','deg' => '&#176;','plusmn' => '&#177;','sup2' => '&#178;','sup3' => '&#179;','acute' => '&#180;','micro' => '&#181;','para' => '&#182;','middot' => '&#183;',
+							'cedil' => '&#184;','sup1' => '&#185;','ordm' => '&#186;','raquo' => '&#187;','frac14' => '&#188;','frac12' => '&#189;','frac34' => '&#190;','iquest' => '&#191;','Agrave' => '&#192;',
+							'Aacute' => '&#193;','Acirc' => '&#194;','Atilde' => '&#195;','Auml' => '&#196;','Aring' => '&#197;','AElig' => '&#198;','Ccedil' => '&#199;','Egrave' => '&#200;','Eacute' => '&#201;',
+							'Ecirc' => '&#202;','Euml' => '&#203;','Igrave' => '&#204;','Iacute' => '&#205;','Icirc' => '&#206;','Iuml' => '&#207;','ETH' => '&#208;','Ntilde' => '&#209;','Ograve' => '&#210;',
+							'Oacute' => '&#211;','Ocirc' => '&#212;','Otilde' => '&#213;','Ouml' => '&#214;','times' => '&#215;','Oslash' => '&#216;','Ugrave' => '&#217;','Uacute' => '&#218;','Ucirc' => '&#219;',
+							'Uuml' => '&#220;','Yacute' => '&#221;','THORN' => '&#222;','szlig' => '&#223;','agrave' => '&#224;','aacute' => '&#225;','acirc' => '&#226;','atilde' => '&#227;','auml' => '&#228;',
+							'aring' => '&#229;','aelig' => '&#230;','ccedil' => '&#231;','egrave' => '&#232;','eacute' => '&#233;','ecirc' => '&#234;','euml' => '&#235;','igrave' => '&#236;','iacute' => '&#237;',
+							'icirc' => '&#238;','iuml' => '&#239;','eth' => '&#240;','ntilde' => '&#241;','ograve' => '&#242;','oacute' => '&#243;','ocirc' => '&#244;','otilde' => '&#245;','ouml' => '&#246;',
+							'divide' => '&#247;','oslash' => '&#248;','ugrave' => '&#249;','uacute' => '&#250;','ucirc' => '&#251;','uuml' => '&#252;','yacute' => '&#253;','thorn' => '&#254;','yuml' => '&#255;' );
+
+		return isset( $table[ $matches[1] ] ) ? $table[ $matches[1] ] : '&' . $matches[1] . ';';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/editor/index.html b/upload/admin/sources/classes/editor/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/editor/index.html
+++ b/upload/admin/sources/classes/editor/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/facebook/connect.php b/upload/admin/sources/classes/facebook/connect.php
index 58eff360..457c982b 100644
--- a/upload/admin/sources/classes/facebook/connect.php
+++ b/upload/admin/sources/classes/facebook/connect.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter Connect Library
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-09-21 05:45:37 -0400 (Wed, 21 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7195 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9521 $
  *
  */
 
@@ -25,8 +25,10 @@ class facebook_connect
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -37,58 +39,58 @@ class facebook_connect
 	/**
 	 * Facebook wrapper
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_api;
+	protected $_api;
 	
 	/**
 	 * Facebook OAUTH wrapper
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_oauth;
+	protected $_oauth;
 	
 	/**
 	 * IPBs log in handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_login;
+	protected $_login;
 	
 	/**
 	 * User connected
 	 * 
-	 * @access	private
+	 * @access	protected
 	 * @var		boolean
 	 */
-	private $_connected = false;
+	protected $_connected = false;
 	
 	/**
 	 * User: Token
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_userToken;
+	protected $_userToken;
 	
 	/**
 	 * User: ID
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_userId;
+	protected $_userId;
 	
 	/**
 	 * User: Data
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_userData = array();
+	protected $_userData = array();
 	
 	/**
 	 * Required permissions
@@ -106,7 +108,7 @@ class facebook_connect
 	 * @param	int			User ID
 	 * @param	boolean		Force an exception to be thrown rather than output error (used in IPSMember::buildDisplayPhoto)
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry, $token='', $userId=0, $forceThrowException=false )
 	{
@@ -148,7 +150,7 @@ class facebook_connect
 			{
 				if ( $forceThrowException === false )
 				{ 
-				$this->registry->output->showError( $this->lang->words['gbl_fb_no_app_id'], 911 );
+					$this->registry->output->showError( $this->lang->words['gbl_fb_no_app_id'], 1090001 );
 			}
 			else
 			{
@@ -184,11 +186,11 @@ class facebook_connect
 		}
 		
 		/* Load oAuth */
-		require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );
+		require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );/*noLibHook*/
 		$this->_oauth = new FacebookOAuth( FACEBOOK_APP_ID, FACEBOOK_APP_SECRET, FACEBOOK_CALLBACK, $this->extendedPerms );
 		
 		/* Load API */
-		require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );
+		require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );/*noLibHook*/
 		$this->_api = new Facebook( array( 'appId' => FACEBOOK_APP_ID, 'secret' => FACEBOOK_APP_SECRET, 'cookie' => true ) );
 		
 		if ( $this->_userToken AND $this->_userId  )
@@ -320,7 +322,6 @@ class facebook_connect
         	}
         	catch( Exception $e ){}
         									    
-        	
         	if ( count( $updates[0] ) )
         	{
         		foreach( $updates[0] as $k => $v )
@@ -433,10 +434,10 @@ class facebook_connect
 			$content = IPSText::mbsubstr( $content, 0, 474 ) . '...';
 			
 			/* Generate short URL */
-			require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );
- 			$shorten = new urlShorten();
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/url/shorten.php', 'urlShorten' );
+			$shorten  = new $classToLoad();
  			
- 			$data      = $shorten->shorten( $url, 'bitly' );
+ 			$data     = $shorten->shorten( $url, IPS_URL_SHORTEN_SERVICE );
  			
  			$content .= ' ' . $data['url'];
 		}
@@ -476,6 +477,12 @@ class facebook_connect
 			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'fb_token'  => $key ) ) );
 		}
 		
+		/* Is mobile? */
+		if ( $this->member->isMobileApp || ! empty( $_REQUEST['mobile'] ) )
+		{
+			$this->_oauth->setFormFactor( 'touch' );
+		}
+		
 		/* Update callback url */
 		$this->_oauth->setCallBackUrl( FACEBOOK_CALLBACK . $_urlExtra );
 		
@@ -495,11 +502,11 @@ class facebook_connect
 		if ( $_REQUEST['code'] )
 		{
 			/* Load oAuth */
-			require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );
+			require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );/*noLibHook*/
 			$this->_oauth = new FacebookOAuth( FACEBOOK_APP_ID, FACEBOOK_APP_SECRET, FACEBOOK_CALLBACK, $this->extendedPerms );
 			
 			/* Load API */
-			require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );
+			require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );/*noLibHook*/
 			$this->_api = new Facebook( array( 'appId' => FACEBOOK_APP_ID, 'secret' => FACEBOOK_APP_SECRET, 'cookie' => true ) );
 			
 			/* Ensure URL is correct */
@@ -517,7 +524,7 @@ class facebook_connect
 			
 			/* Update callback url */
 			$this->_oauth->setCallBackUrl( FACEBOOK_CALLBACK . $_urlExtra );
-
+			
 			/* Generate oAuth token */
 			$rToken = $this->_oauth->getAccessToken( $_REQUEST['code'] );
 			
@@ -541,14 +548,14 @@ class facebook_connect
 				{
 					$_member = IPSMember::load( $_userData['email'], 'all', 'email' );
 					
-					/* We have an existing account, so trash email forcing user to sign up with new */
+					/* We do have an existing account, so trash email forcing user to sign up with new */
 					if ( $_member['member_id'] )
 					{
-						unset( $_member );
-						unset( $_userData['email'] );
+						/* Update row */
+						IPSMember::save( $_member['member_id'], array( 'core' => array( 'fb_uid' => $_userData['id'], 'fb_token' => $rToken ) ) );
 					}
 				}
-				
+								
 				if ( $_member['member_id'] )
 				{
 					$memberData = $_member;
@@ -559,19 +566,28 @@ class facebook_connect
 					/* Here, so log us in!! */
 					$data = $this->_login()->loginWithoutCheckingCredentials( $memberData['member_id'], TRUE );
 					
-					$this->registry->getClass('output')->silentRedirect( $data[1] ? $data[1] : $this->settings['base_url'] );
+					$this->registry->getClass('output')->silentRedirect( $this->settings['_original_base_url'], '', true, 'act=idx' );
 				}
 				else
 				{
 					/* No? Create a new member */
-					foreach( array( 'fbc_s_pic', 'fbc_s_avatar', 'fbc_s_status', 'fbc_s_aboutme' ) as $field )
+					foreach( array( 'fbc_s_pic', 'fbc_s_status', 'fbc_s_aboutme' ) as $field )
 					{
 						$toSave[ $field ] = 1;
 					}
 
 					$fb_bwoptions = IPSBWOptions::freeze( $toSave, 'facebook' );
-					$safeFBName   = str_replace( ' ', '', IPSText::convertCharsets( $_userData['name'], 'utf-8', IPS_DOC_CHAR_SET ) );
-					$displayName  = ( ! $this->settings['auth_allow_dnames'] ) ? $safeFBName : FALSE;
+					$safeFBName   = ( IPS_DOC_CHAR_SET != 'UTF-8' ) ? IPSText::utf8ToEntities( $_userData['name'] ) : $_userData['name'];
+					$displayName  = $safeFBName;
+					
+					/* Make sure usernames are safe */
+					if ( $this->settings['username_characters'] )
+					{
+						$check_against = preg_quote( $this->settings['username_characters'], "/" );
+						$check_against = str_replace( '\-', '-', $check_against );
+						
+						$safeFBName = preg_replace( '/[^' . $check_against . ']+/i', '', $safeFBName );
+					}
 					
 					/* If we're not allowing display names, then use may not hit partial form, so.. */
 					if ( ! $this->settings['auth_allow_dnames'] AND $displayName AND $_userData['email'] AND $_userData['id'] )
@@ -582,6 +598,12 @@ class facebook_connect
 							$this->registry->output->showError( 'no_remote_reg', 1090002 );
 						}
 					}
+					
+					/* Check ban filters? */
+					if ( IPSMember::isBanned( 'email', $_userData['email'] ) or IPSMember::isBanned( 'name', $displayName ) )
+					{
+						$this->registry->output->showError( 'you_are_banned', 1090003 );
+					}
 		
 					/* From reg, so create new account properly */
 					$toSave = array( 'core' 		 => array(  'name' 				     => $safeFBName,
@@ -591,21 +613,21 @@ class facebook_connect
 															    'email'                  => $_userData['email'],
 															    'fb_uid'                 => $_userData['id'],
 															    'time_offset'            => $_userData['timezone'],
+																'members_auto_dst'		 => 1,
 															    'fb_token'               => $rToken ),
 									'extendedProfile' => array( 'pp_about_me'            => IPSText::getTextClass( 'bbcode' )->stripBadWords( IPSText::convertCharsets( $_userData['about'], 'utf-8', IPS_DOC_CHAR_SET ) ),
-																'fb_photo'        		 => $_userData['pic_big'],
-																'fb_photo_thumb'  		 => $_userData['pic_square'],
-																'fb_bwoptions'    		 => $fb_bwoptions,
-																'avatar_location' 		 => $_userData['pic_square'],
-																'avatar_type'     		 => 'facebook' ) );
+																'fb_bwoptions'    		 => $fb_bwoptions ) );
 	
 					
-					$memberData = IPSMember::create( $toSave, TRUE, FALSE, FALSE );
+					$memberData = IPSMember::create( $toSave, TRUE, FALSE, TRUE );
 					
 					if ( ! $memberData['member_id'] )
 					{
 						throw new Exception( 'CREATION_FAIL' );
 					}
+								
+					/* Sync up photo */
+					$this->syncMember( $memberData['member_id'] );
 					
 					$pmember = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'members_partial', 'where' => "partial_member_id=" . $memberData['member_id'] ) );
 
@@ -620,7 +642,26 @@ class facebook_connect
 						{
 							/* Here, so log us in!! */
 							$data = $this->_login()->loginWithoutCheckingCredentials( $memberData['member_id'], TRUE );
-					
+							
+							IPSLib::runMemberSync( 'onCompleteAccount', $memberData );
+							
+							if ( $this->settings['new_reg_notify'] )
+							{
+								$this->registry->class_localization->loadLanguageFile( array( 'public_register' ), 'core' );
+								
+								IPSText::getTextClass('email')->setPlainTextTemplate( IPSText::getTextClass('email')->getTemplate("admin_newuser") );
+							
+								IPSText::getTextClass('email')->buildMessage( array( 'DATE'			=> $this->registry->getClass('class_localization')->getDate( time(), 'LONG', 1 ),
+																					 'LOG_IN_NAME'  => $safeFBName,
+																					 'EMAIL'		=> $_userData['email'],
+																					 'IP'			=> $this->member->ip_address,
+																					 'DISPLAY_NAME'	=> $displayName ) );
+															
+								IPSText::getTextClass('email')->subject = sprintf( $this->lang->words['new_registration_email'], $this->settings['board_name'] );
+								IPSText::getTextClass('email')->to      = $this->settings['email_in'];
+								IPSText::getTextClass('email')->sendMail();
+							}
+		
 							$this->registry->getClass('output')->silentRedirect( $data[1] ? $data[1] : $this->settings['base_url'] );
 						}
 						else
@@ -653,11 +694,11 @@ class facebook_connect
 			if ( $member['fb_token'] == $_REQUEST['key'] )
 			{
 				/* Load oAuth */
-				require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );
+				require_once( IPS_KERNEL_PATH . 'facebook/facebookoauth.php' );/*noLibHook*/
 				$this->_oauth = new FacebookOAuth( FACEBOOK_APP_ID, FACEBOOK_APP_SECRET, FACEBOOK_CALLBACK, $this->extendedPerms );
 				
 				/* Load API */
-				require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );
+				require_once( IPS_KERNEL_PATH . 'facebook/facebook.php' );/*noLibHook*/
 				$this->_api = new Facebook( array( 'appId' => FACEBOOK_APP_ID, 'secret' => FACEBOOK_APP_SECRET, 'cookie' => true ) );
 				
 				/* Ensure URL is correct */
@@ -695,7 +736,7 @@ class facebook_connect
 		}
 		
 		/* Redirect back to settings page */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&tab=members&area=facebook' );
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&tab=core&area=facebook' );
 	}
 
 	/**
@@ -774,22 +815,16 @@ class facebook_connect
 			{
 				$user = $this->fetchUserData();
 				
-				/* Update.. */
-				$exProfile['fb_photo']       = ( $bwOptions['fbc_s_pic'] ) ? $user['pic_big']    : '';
-				$exProfile['fb_photo_thumb'] = ( $bwOptions['fbc_s_pic'] ) ? $user['pic_square'] : '';
-			
-				if ( $bwOptions['fbc_s_avatar'] )
+				/* Load library */
+				if ( $bwOptions['fbc_s_pic'] )
 				{
-					$exProfile['avatar_location'] = $user['pic_square'];
-					$exProfile['avatar_type']     = 'facebook';
-				}
-			
-				if ( $bwOptions['fbc_s_aboutme'] )
-				{
-					$exProfile['pp_about_me'] = IPSText::getTextClass( 'bbcode' )->stripBadWords( IPSText::convertCharsets( $user['about'], 'utf-8', IPS_DOC_CHAR_SET ) );
-				}
-				
-				if ( $bwOptions['fbc_si_status'] AND ( isset( $memberData['gbw_no_status_import'] ) AND ! $memberData['gbw_no_status_import'] ) )
+					$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+					$photo = new $classToLoad( $this->registry );
+					
+					$photo->save( $memberData, 'facebook' );
+				}			
+
+				if ( $bwOptions['fbc_si_status'] AND ( isset( $memberData['gbw_no_status_import'] ) AND ! $memberData['gbw_no_status_import'] ) AND !$memberData['bw_no_status_update'] )
 				{
 					/* Fetch timeline */
 					//$memberData['tc_last_sid_import'] = ( $memberData['tc_last_sid_import'] < 1 ) ? 100 : $memberData['tc_last_sid_import'];
@@ -802,6 +837,9 @@ class facebook_connect
 						
 						if ( is_array( $update ) AND isset( $update['message'] ) )
 						{
+							/* @link	http://community.invisionpower.com/tracker/issue-27746-video-in-facebook-status */
+							$update['message']	= strip_tags( $update['message'] );
+						
 							/* Load status class */
 							if ( ! $this->registry->isClassLoaded( 'memberStatus' ) )
 							{
@@ -811,6 +849,7 @@ class facebook_connect
 							
 							/* Set Author */
 							$this->registry->getClass('memberStatus')->setAuthor( $memberData );
+							$this->registry->getClass('memberStatus')->setStatusOwner( $memberData );
 							
 							/* Convert if need be */
 							if ( IPS_DOC_CHAR_SET != 'UTF-8' )
@@ -902,12 +941,11 @@ class facebook_connect
 	{
 		if ( ! is_object( $this->_login ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
-	    	$this->_login =  new han_login( $this->registry );
+			$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$this->_login = new $classToLoad( $this->registry );
 	    	$this->_login->init();
 		}
 		
 		return $this->_login;
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/facebook/index.html b/upload/admin/sources/classes/facebook/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/facebook/index.html
+++ b/upload/admin/sources/classes/facebook/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/index.html b/upload/admin/sources/classes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/index.html
+++ b/upload/admin/sources/classes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/itemmarking/classItemMarking.php b/upload/admin/sources/classes/itemmarking/classItemMarking.php
index 509529a1..3f44ce89 100644
--- a/upload/admin/sources/classes/itemmarking/classItemMarking.php
+++ b/upload/admin/sources/classes/itemmarking/classItemMarking.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Item Marking
  * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
- * Last Updated: $Date: 2010-10-06 06:09:32 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-06-07 15:07:17 -0400 (Tue, 07 Jun 2011) $
  * </pre>
  *
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6946 $
+ * @version		$Revision: 8994 $
  *
  * @todo 	[Future] Perhaps find more ways to reduce the size of items_read
  * @todo 	[Future] Maybe add an IN_DEV tool to warn when markers have been cancelled out / size drastically reduced
@@ -145,21 +145,21 @@ class classItemMarking
 	/**
 	 * Can compress cookies
 	 */
-	private $_canCompressCookies = false;
+	protected $_canCompressCookies = false;
 	
 	/**
 	 * Disable all marking for guests
 	 */
-	private $_noGuestMarking     = false;
+	protected $_noGuestMarking     = false;
 	
-	private $_setSaveCookie      = false;
+	protected $_setSaveCookie      = false;
 	
 	/**
 	 * Method constructor
 	 *
 	 * @access	public
 	 * @param	object		Registry Object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -234,33 +234,30 @@ class classItemMarking
 				}
 			}
 		}
-	
+
 		/* Fetch cookies */
-		foreach( ipsRegistry::$applications as $_app => $data )
+		foreach( IPSLib::getEnabledApplications() as $_app => $data )
 		{
-			if ( isset( $data['app_enabled'] ) AND $data['app_enabled'] )
-			{
-				$_value  = $this->_inflateCookie( IPSCookie::get( 'itemMarking_' . $_app ) );
-				$_value2 = $this->_inflateCookie( IPSCookie::get( 'itemMarking_' . $_app . '_items' ) );
-				
-				$this->_cookie[ 'itemMarking_' . $_app ]           = ( is_array( $_value ) )  ? $_value  : array();
-				$this->_cookie[ 'itemMarking_' . $_app . '_items'] = ( is_array( $_value2 ) ) ? $_value2 : array();
-				
-				/* Clean up  */
-				if ( $this->_cookie[ 'itemMarking_' . $_app . '_items'] )
-				{
-					$_items = ( is_array( $this->_cookie[ 'itemMarking_' . $_app . '_items'] ) ) ? $this->_cookie[ 'itemMarking_' . $_app . '_items'] : unserialize( $this->_cookie[ 'itemMarking_' . $_app . '_items'] );
-				
-					$this->_cookieCounter = 0;
-					arsort( $_items, SORT_NUMERIC );
+			$_value  = $this->_inflateCookie( IPSCookie::get( 'itemMarking_' . $_app ) );
+			$_value2 = $this->_inflateCookie( IPSCookie::get( 'itemMarking_' . $_app . '_items' ) );
 			
-					$_newData = array_filter( $_items, array( $this, 'arrayFilterCookieItems' ) );
-					
-					$this->_cookie[ 'itemMarking_' . $_app . '_items'] = $_newData;
-					
-					IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . '_items' . ' - ' . serialize( $_newData ) );
-					IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . ' - ' . serialize( $_value ) );
-				}
+			$this->_cookie[ 'itemMarking_' . $_app ]           = ( is_array( $_value ) )  ? $_value  : array();
+			$this->_cookie[ 'itemMarking_' . $_app . '_items'] = ( is_array( $_value2 ) ) ? $_value2 : array();
+			
+			/* Clean up  */
+			if ( $this->_cookie[ 'itemMarking_' . $_app . '_items'] )
+			{
+				$_items = ( is_array( $this->_cookie[ 'itemMarking_' . $_app . '_items'] ) ) ? $this->_cookie[ 'itemMarking_' . $_app . '_items'] : unserialize( $this->_cookie[ 'itemMarking_' . $_app . '_items'] );
+			
+				$this->_cookieCounter = 0;
+				arsort( $_items, SORT_NUMERIC );
+		
+				$_newData = array_filter( $_items, array( $this, 'arrayFilterCookieItems' ) );
+				
+				$this->_cookie[ 'itemMarking_' . $_app . '_items'] = $_newData;
+				
+				IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . '_items' . ' - ' . serialize( $_newData ) );
+				IPSDebug::addMessage( 'Cookie loaded: itemMarking_' . $_app . ' - ' . serialize( $_value ) );
 			}
 		}
 
@@ -270,11 +267,11 @@ class classItemMarking
 	/**
 	* Compressed the cookie
 	*
-	* @access	private
+	* @access	protected
 	* @param	mixed		Data (array or string)
 	* @return	string		compressed data
 	*/
-	private function _compressCookie( $data )
+	protected function _compressCookie( $data )
 	{
 		if ( $this->_canCompressCookies )
 		{
@@ -292,11 +289,11 @@ class classItemMarking
 	/**
 	* Inflate the cookie
 	*
-	* @access	private
+	* @access	protected
 	* @param	mixed		Compressed string
 	* @return	string		Uncompressed data
 	*/
-	private function _inflateCookie( $data )
+	protected function _inflateCookie( $data )
 	{
 		/* already inflated? */
 		if ( ! $data OR is_array( $data ) )
@@ -321,7 +318,7 @@ class classItemMarking
 	 * Disable instant save
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function disableInstantSave()
 	{
@@ -332,7 +329,7 @@ class classItemMarking
 	 * Enable instant save (Default mode anyway)
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function enableInstantSave()
 	{
@@ -343,7 +340,7 @@ class classItemMarking
 	 * Fetch status
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function fetchInstantSaveStatus()
 	{
@@ -356,7 +353,7 @@ class classItemMarking
 	 * @access	protected
 	 * @param	string 		Key
 	 * @param	array
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _updateCookieData( $key, $array )
 	{
@@ -409,7 +406,7 @@ class classItemMarking
 	 * Set the flag to save cookies in mydestruct
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _setSaveCookie()
 	{
@@ -421,7 +418,7 @@ class classItemMarking
 	 *
 	 * @access	protected
 	 * @param	string		Key name (leave blank to save out all cookies)
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _saveCookie( $key='' )
 	{
@@ -524,20 +521,27 @@ class classItemMarking
 	 *
 	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34, 'itemID' => 99 ) );</code>
 	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34 ) );</code>
-	 *
+	 * If you pass in a timestamp, it will set that as the read date so a topic, for example
+	 * won't appear read until you're on the last page
+	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34, 'itemID' => 99, 'markDate' => 123456790 ) );</code>
+	 * 
+	 * If you pass a "containerLastActivityDate" timestamp it will compare the markDate against it and not run the fetchUnreadCount query
+	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34, 'itemID' => 99, 'markDate' => 123456790, 'containerLastActivityDate' => 1234567890 ) );</code>
 	 * @access	public
 	 * @param	array
 	 * @param 	string	[App]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function markRead( $data, $app='' )
 	{
-		$app         = ( $app ) ? $app : IPS_APP_COMPONENT;
-		$origData    = $data;
-		$data        = $this->_fetchModule( $app )->convertData( $data );
-		$cookie      = $this->_fetchCookieData( 'itemMarking_' . $app );
-		$cookieItems = $this->_fetchCookieData( 'itemMarking_' . $app . '_items');
-		$mainKey     = $this->_findMainRowByKey( $data, $app );
+		$app         			   = ( $app ) ? $app : IPS_APP_COMPONENT;
+		$origData   			   = $data;
+		$data        			   = $this->_fetchModule( $app )->convertData( $data );
+		$cookie      			   = $this->_fetchCookieData( 'itemMarking_' . $app );
+		$cookieItems 			   = $this->_fetchCookieData( 'itemMarking_' . $app . '_items');
+		$mainKey     			   = $this->_findMainRowByKey( $data, $app );
+		$markDate    			   = ( ! empty( $data['markDate'] ) ) ? intval( $data['markDate'] ) : time();
+		$containerLastActivityDate = ( ! empty( $data['containerLastActivityDate'] ) ) ? intval( $data['containerLastActivityDate'] ) : false;
 		
 		/* Search engine? */
 		if ( $this->member->is_not_human === TRUE )
@@ -559,7 +563,7 @@ class classItemMarking
 		if ( $data['itemID'] )
 		{
 			/* Cookie */
-			$cookieItems[ $data['itemID'] ] = time();
+			$cookieItems[ $data['itemID'] ] = $markDate;
 			$this->_updateCookieData( 'itemMarking_' . $app . '_items', $cookieItems );
 			
 			$_cookieGreset = isset( $cookie['greset'][ $this->_makeKey( $data, TRUE ) ] ) ? intval( $cookie['greset'][ $this->_makeKey( $data, TRUE ) ] ) : 0;
@@ -569,7 +573,7 @@ class classItemMarking
 			if ( $this->settings['topic_marking_enable'] )
 			{
 				/* DB */
-				$this->_itemMarkers[ $app ][ $mainKey ]['item_read_array'][ $data['itemID'] ] = time();
+				$this->_itemMarkers[ $app ][ $mainKey ]['item_read_array'][ $data['itemID'] ] = $markDate;
 				
 				/* Check the cookie again.. */
 				if ( $_cookieGreset AND $_cookieGreset > $this->_itemMarkers[ $app ][ $mainKey ]['item_global_reset'] )
@@ -586,13 +590,17 @@ class classItemMarking
 					}
 				}
 			}
-				
+			
 			/* Check last reset time */
-			$_lastReset = IPSLib::fetchHighestNumber( array( $_cookieGreset, isset( $cookie['global']) ? $cookie['global'] : 0, intval( $this->_itemMarkers[ $app ][ $mainKey ]['item_global_reset'] ) ) );
+			$_lastReset = IPSLib::fetchHighestNumber( array( $_cookieGreset, isset( $cookie['global']) ? $cookie['global'] : 0, intval( $this->_itemMarkers[ $app ][ $mainKey ]['item_global_reset'] ), intval( $this->memberData['_cache']['gb_mark__'. $app ] ) ) );
+			$_doQuery   = ( $this->settings['topic_marking_enable'] OR ( ! $this->settings['topic_marking_enable'] AND ! $this->settings['topic_marking_noquery'] ) );
 			
 			/* Fetch unread items */
-			if ( $this->settings['topic_marking_enable'] OR ( ! $this->settings['topic_marking_enable'] AND ! $this->settings['topic_marking_noquery'] ) )
+			if ( $_doQuery === true )
 			{
+				$_oldest	  = IPS_UNIX_TIME_NOW - ( $this->settings['topic_marking_keep_days'] * 86400 );
+				$_lastReset   = ( $_lastReset >= $_oldest ) ? $_lastReset : $_oldest;
+				
 				$_unreadCount = $this->_fetchModule( $app )->fetchUnreadCount( $origData, $_readItems, $_lastReset );
 			
 				if ( $_unreadCount['count'] > 0 )
@@ -653,7 +661,7 @@ class classItemMarking
 	 *
 	 * @access	public
 	 * @param	string	[App Optional. If ommited, all apps are marked as read]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function markAppAsRead( $app='' )
 	{
@@ -713,12 +721,12 @@ class classItemMarking
 			{
 				/* Only process is the app actually does topic marking */
 				$f = IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php';
-			
-				if ( file_exists( $f ) )
+				
+				if ( is_file( $f ) )
 				{
-					require_once( $f );
+					$classToLoad = IPSLib::loadLibrary( $f, 'itemMarking__'.$app, $app );
 					
-					if ( ! @class_exists( 'itemMarking__' . $app ) )
+					if ( !class_exists( $classToLoad ) )
 					{
 						continue;
 					}
@@ -779,7 +787,7 @@ class classItemMarking
 		{
 			$times[] = intval( $this->_findLatestItemReset( $data, $app ) );
 		}
-
+		
 		return IPSLib::fetchHighestNumber( $times );
 	}
 	
@@ -801,7 +809,7 @@ class classItemMarking
 
 		$times = array();
 		
-		if( isset( $data['item_app_key_1'] ) )
+		if ( isset( $data['item_app_key_1'] ) )
 		{
 			$mainKey  = $this->_findMainRowByKey( $data, $app );
 			
@@ -916,7 +924,7 @@ class classItemMarking
 	 *
 	 * @access	public
 	 * @return	int		Number of rows saved
-	 * @deprecated 3.1.0
+	 * @deprecated 3.1.0	Is this really deprecated?  It's still being called external to this class by sessions and markasread functions
 	 */
 	public function writeMyMarkersToDB()
 	{
@@ -1141,15 +1149,14 @@ class classItemMarking
 		else
 		{
 			$_file = IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php';
-			$_class = 'itemMarking__' . $app;
-		
-			if ( file_exists( $_file ) )
+			
+			if ( is_file( $_file ) )
 			{
-				require_once( $_file );
-
-				if( class_exists( $_class ) )
+				$classToLoad = IPSLib::loadLibrary( $_file, 'itemMarking__'.$app, $app );
+				
+				if( class_exists( $classToLoad ) )
 				{
-					$this->_moduleApps[ $app ] = new $_class( $this->registry );
+					$this->_moduleApps[ $app ] = new $classToLoad( $this->registry );
 					
 					return $this->_moduleApps[ $app ];
 				}
@@ -1176,7 +1183,7 @@ class classItemMarking
 	protected function _makeKey( $data, $isCookie=FALSE )
 	{
 		/* Not interested in this for the main row */
-		unset( $data['itemID'], $data['itemLastUpdate'] );
+		unset( $data['itemID'], $data['itemLastUpdate'], $data['containerLastActivityDate'], $data['markDate'] );
 		
 		return ( $isCookie === TRUE ) ? $data['item_app_key_1'] : md5( serialize( $data ) );
 	}
@@ -1255,7 +1262,7 @@ class classItemMarking
 	 *
 	 * @access	protected
 	 * @param	array		Array of Member IDs
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _save( $memberIDs )
 	{
@@ -1302,16 +1309,19 @@ class classItemMarking
 											  'item_global_reset' => intval( $data['item_global_reset'] ),
 											  'item_last_update'  => intval( $data['item_last_update'] ),
 											  'item_is_deleted'   => 0 );
-			
+								
+								/* Ensure $data is valid */
+								foreach( $data as $k => $v )
+								{
+									if ( ! strstr( $k, 'item_' ) )
+									{
+										unset( $data[ $k ] );
+									}
+								}
+								
 								/* Overwrite $data with the values in $row */
 								$new_array = array_merge( $data, $row );
 								
-								/* Somehow "member_id" column ends up in here... */
-								if ( isset( $new_array['member_id'] ) )
-								{
-									unset( $new_array['member_id'] );
-								}
-								
 								/* Weed out useless rows */
 								if ( ! $new_array['item_global_reset'] AND ! $new_array['item_unread_count'] AND ( ! $new_array['item_read_array'] OR $new_array['item_read_array'] == 'a:0:{}' ) )
 								{
@@ -1337,7 +1347,7 @@ class classItemMarking
 	 * classes are culled
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __myDestruct()
 	{
diff --git a/upload/admin/sources/classes/itemmarking/classItemMarking_debug.php b/upload/admin/sources/classes/itemmarking/classItemMarking_debug.php
deleted file mode 100644
index a0f9e782..00000000
--- a/upload/admin/sources/classes/itemmarking/classItemMarking_debug.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Item Marking
- * Owner: Matt "Oh Lord, why did I get assigned this?" Mecham
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
- *
- * @todo 	[Future] Perhaps find more ways to reduce the size of items_read
- * @todo 	[Future] Maybe add an IN_DEV tool to warn when markers have been cancelled out / size drastically reduced
- */
-
-require_once( dirname(__FILE__) . '/classItemMarking.php' );
-	
-class classItemMarking_debug extends classItemMarking
-{
-	/**
-	 * Tracing this user?
-	 * @var	bool
-	 */
-	private $TRACE = false;
-	
-	/**
-	 * Marking session key
-	 * @var string
-	 */
-	private $SESSION_KEY = '';
-	
-	/**
-	 * Marking URL
-	 * @var string
-	 */
-	private $URL = '';
-	
-	/**
-	 * Method constructor
-	 *
-	 * @access	public
-	 * @param	object		Registry Object
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry )
-	{
-		parent::__construct( $registry );
-		
-		/* Are we tracing this user? */
-		list( $_groups, $_ids ) = explode( '&', trim( IPS_TOPICMARKERS_TRACE ) );
-			
-		/* Groups */
-		list( $_t, $groups ) = explode( '=', trim( $_groups ) );
-		list( $_t, $ids )    = explode( '=', trim( $_ids ) );
-	
-		if ( $groups )
-		{
-			foreach( explode( ',', $groups ) as $gid )
-			{
-				if ( $this->memberData['member_group_id'] == $gid )
-				{
-					$this->TRACE = TRUE;
-					break;
-				}
-			}
-		}
-		
-		if ( $ids AND ! $this->TRACE )
-		{
-			foreach( explode( ',', $ids ) as $id )
-			{
-				if ( $this->memberData['member_id'] == trim( $id ) )
-				{
-					$this->TRACE = TRUE;
-					break;
-				}
-			}
-		}
-		
-		/* Create session key */
-		$this->SESSION_KEY = md5( uniqid( microtime() . 'tms', true ) );
-		
-		/* Create URL */
-		$this->URL = my_getenv('HTTP_HOST') . my_getenv('REQUEST_URI');
-		
-		
-		/* Got a table? */
-		//$this->DB->dropTable( 'core_topicmarker_debug' );
-		if ( ! $this->DB->checkForTable( 'core_topicmarker_debug' ) )
-		{
-			$prefix = $this->registry->dbFunctions()->getPrefix();
-			
-			$this->DB->query( "CREATE TABLE " . $prefix . "core_topicmarker_debug (
-								marker_member_id	INT(10) NOT NULL default 0,
-								marker_session_key	VARCHAR(32) NOT NULL default '',
-								marker_message		VARCHAR(255) NOT NULL default '',
-								marker_data_freezer	MEDIUMTEXT,
-								marker_data_storage	MEDIUMTEXT,
-								marker_data_memory  MEDIUMTEXT,
-								marker_timestamp	INT(10) NOT NULL default 0,
-								marker_microtime	VARCHAR(200) NOT NULL default '0',
-								marker_url			TEXT,
-								marker_data_1		TEXT,
-								marker_data_2		TEXT,
-								marker_data_3		TEXT,
-								marker_data_4		TEXT,
-								marker_data_5		TEXT,
-								KEY marker_member_id (marker_member_id),
-								KEY marker_microtime (marker_microtime),
-								KEY marker_session_key (marker_session_key),
-								KEY marker_timestamp (marker_timestamp ) )" );
-		}
-		
-		/* Kick start the session off */
-		$this->_addEntry( 'Marker session INIT done' );
-	}
-	
-	/**
-	 * Check the read status of an item
-	 *
-	 * Forum example (forumID is mapped to :item_app_key_1). itemID is the topic ID
-	 *
-	 * <code>$read = $itemMarking->isRead( array( 'forumID' => 2, 'itemID' => 99, 'itemLastUpdate' => 1989098989 ) );</code>
-	 *
-	 * @access	public
-	 * @param	array 		Array of data
-	 * @param	string		Optional app
-	 * @return	boolean     TRUE is read / FALSE is unread
-	 */
-	public function isRead( $data, $app='' )
-	{
-		return parent::isRead( $data, $app );
-	}
-	
-	/**
-	 * Mark as read
-	 *
-	 * Forum example (forumID is mapped to :item_app_key_1). itemID is the topic ID
-	 *
-	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34, 'itemID' => 99 ) );</code>
-	 * <code>$itemMarking->markAsRead( array( 'forumID' => 34 ) );</code>
-	 *
-	 * @access	public
-	 * @param	array
-	 * @param 	string	[App]
-	 * @return	void
-	 */
-	public function markRead( $data, $app='' )
-	{
-		/* Add Debug entry */
-		$this->_addEntry( 'Marked item as read ', array( 'marker_data_1' => $app, 'marker_data_2' => $data ) );
-		
-		parent::markRead( $data, $app );
-	}
-	
-	/**
-	 * Marks everything within an app as read
-	 *
-	 * @access	public
-	 * @param	string	App
-	 * @return	void
-	 */
-	public function markAppAsRead( $app )
-	{
-		parent::markAppAsRead( $app );
-		
-		/* Add Debug entry */
-		$this->_addEntry( 'Marked APP as read: ' . $app, array( 'marker_data_1' => $app ) );
-	}
-	
-	/**
-	 * Fetch the last time an item was marked
-	 * checks app reset... then the different key resets.. then an individual key
-	 *
-	 * In this example: itemID is within 'item_read_array'.
-	 * $lastReset = $this->fetchTimeLastMarked( array( 'forumID' => 2, 'itemID' => '99' ) );
-	 *
-	 * @access	public
-	 * @param	array 		Data
-	 * @param	string		Optional app
-	 * @return	int 		Timestamp item was last marked or 0 if unread
-	 */
-	public function fetchTimeLastMarked( $data, $app='' )
-	{
-		return parent::fetchTimeLastMarked( $data, $app );
-	}
-	
-	/**
-	 * Fetch the unread count
-	 *
-	 * In this example we are retrieving the number of unread items for a forum id 2
-	 * $unreadCount = $this->fetchUnreadCount( array( 'forumID' => 2 ) );
-	 *
-	 * @access	public
-	 * @param	array 		Data
-	 * @param	string		App
-	 * @return	int 		Number of unread items left
-	 */
-	public function fetchUnreadCount( $data, $app='' )
-	{
-		$num = parent::fetchUnreadCount( $data, $app );
-		
-		/* Add Debug entry */
-		$this->_addEntry( 'fetchUnreadCount - ' . $num, array( 'marker_data_1' => $app, 'marker_data_2' => $data ) );
-		
-		return $num;
-	}
-	
-	/**
-	 * Fetch read IDs since last global reset
-	 * Returns IDs read based on incoming data
-	 *
-	 * <code>$readIDs = $itemMarking->fetchReadIds( array( 'forumID' => 2 ) );</code>
-	 * @access		public
-	 * @param		array 		Array of data
-	 * @param		strng		[App]
-	 * @return		array 		Array of read item IDs
-	 */
-	public function fetchReadIds( $data, $app='' )
-	{
-		parent::fetchReadIds( $data, $app );
-	}
-	
-	/**
-	 * Save my markers to DB
-	 *
-	 * Saves the current values in $this->_itemMarkers back to the DB
-	 *
-	 * @access	public
-	 * @return	int		Number of rows saved
-	 */
-	public function writeMyMarkersToDB()
-	{
-		parent::writeMyMarkersToDB();
-	}
-	
-	/**
-	 * Manual clean up
-	 * Currently run via a task and in the __myDestruct method, but can be run from anywhere
-	 *
-	 * @access	public
-	 * @param	int 		Number of items to limit
-	 * @param	int			Number of hours (ago) to check
-	 * @param	boolean		Check for active sessions first
-	 * @return	int			Number of items cleaned
-	 */
-	public function manualCleanUp( $limit=0, $hours=6, $checkSessions=TRUE )
-	{
-		$num = parent::manualCleanUp( $limit, $hours, $checkSessions );
-		
-		if ( $num !== FALSE )
-		{
-			$this->_addEntry( 'manualCleanUp called. Cleaned: ' . $num );
-		}
-	}
-	
-	/**
-	 * Update topic markers
-	 *
-	 * @access	protected
-	 * @param	array		Array of Member IDs
-	 * @return	void
-	 */
-	protected function _save( $memberIDs )
-	{
-		parent::_save( $memberIDs );
-	}
-	
-	/**
-	 * Update markers storage table
-	 *
-	 * @access	protected
-	 * @return	bool
-	 */
-	protected function _saveStorage()
-	{
-		$result = parent::_saveStorage();
-		
-		if ( $result )
-		{
-			$this->_addEntry( 'Storage table updated' );
-		}
-	}
-	
-	/**
-	 * Manual destructor called by ips_MemberRegistry::__myDestruct()
-	 * Gives us a chance to do anything we need to do before other
-	 * classes are culled
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function __myDestruct()
-	{
-		/* Add Debug entry */
-		$this->_addEntry( 'Destructor Run' );
-		
-		parent::__myDestruct();
-	}
-	
-	/**
-	 * Add entry
-	 *
-	 * @access	private
-	 * @param	string		Message
-	 * @param	array 		Array of data
-	 * @return	bool
-	 */
-	private function _addEntry( $message, $data=array() )
-	{
-		if ( $this->TRACE AND $this->memberData['member_id'] AND ! IPS_IS_TASK)
-		{
-			/* Clean up data */
-			foreach( array( 1,2,3,4,5 ) as $n )
-			{
-				if ( isset( $data['marker_data_' . $n ] ) )
-				{
-					if ( is_array( $data['marker_data_' . $n ] ) )
-					{
-						$data['marker_data_' . $n ] = serialize( $data['marker_data_' . $n ] );
-					}
-				}
-			}
-			
-			/* Add it.. */
-			$this->DB->insert( 'core_topicmarker_debug', array( 'marker_member_id'    => $this->memberData['member_id'],
-																'marker_session_key'  => $this->SESSION_KEY,
-																'marker_message'	  => $message,
-																'marker_data_freezer' => serialize( ( isset( $data['marker_data_freezer'] ) ) ? $data['marker_data_freezer'] : $this->_fetchFromFreezer() ),
-																'marker_data_storage' => serialize( ( isset( $data['marker_data_storage'] ) ) ? $data['marker_data_storage'] : $this->_fetchFromCache()   ),
-																'marker_data_memory'  => serialize( ( isset( $data['marker_data_memory'] ) )  ? $data['marker_data_memory']  : $this->_fetchFromMemory()  ),
-																'marker_timestamp'    => time(),
-																'marker_microtime'    => microtime(),
-																'marker_url'		  => $this->URL,
-																'marker_data_1'		  => isset( $data['marker_data_1'] ),
-																'marker_data_2'		  => isset( $data['marker_data_2'] ),
-																'marker_data_3'		  => isset( $data['marker_data_3'] ),
-																'marker_data_4'		  => isset( $data['marker_data_4'] ),
-																'marker_data_5'		  => isset( $data['marker_data_5'] ) ) );
-			return TRUE;
-		}
-	}
-	
-	/**
-	 * Fetch freezer markers 
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	private function _fetchFromFreezer()
-	{
-		$items = array();
-		
-		if ( $this->memberData['member_id'] )
-		{
-			$this->DB->build( array( 'select' => '*',
-									 'from'   => 'core_item_markers',
-									 'where'  => 'item_member_id=' . $this->memberData['member_id'] ) );
-
-			$itemMarking = $this->DB->execute();
-
-			while( $row = $this->DB->fetch( $itemMarking ) )
-			{
-				$items[ $row['item_app'] ][ $row['item_key'] ] = $row;
-			}
-		}
-		
-		return $items;
-	}
-	
-	/**
-	 * Fetch "hot" cache markers 
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	private function _fetchFromCache()
-	{
-		$items = array();
-		
-		if ( $this->memberData['member_id'] )
-		{
-			$items = $this->DB->buildAndFetch( array( 'select' => '*',
-									 				  'from'   => 'core_item_markers_storage',
-													  'where'  => 'item_member_id=' . $this->memberData['member_id'] ) );
-
-			$items = unserialize( $items['item_markers'] );
-		}
-		
-		return $items;
-	}
-	
-	/**
-	 * Fetch in memory cache markers 
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	private function _fetchFromMemory()
-	{
-		return ( is_array( $this->_itemMarkers ) ) ? $this->_itemMarkers : array();
-	}
-	
-
-}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/itemmarking/index.html b/upload/admin/sources/classes/itemmarking/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/itemmarking/index.html
+++ b/upload/admin/sources/classes/itemmarking/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/like/composite.php b/upload/admin/sources/classes/like/composite.php
index d6089c2e..1a4da7b0 100644
--- a/upload/admin/sources/classes/like/composite.php
+++ b/upload/admin/sources/classes/like/composite.php
@@ -1,29 +1,27 @@
 <?php
 /**
- * Class to manage like
- *
- * @author 		Matt Mecham
- * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6651 $
- */
-
-/* Factory, composite and cache classes all in one file to save requires
+ * @file		composite.php 	Provides classes to manage the like system
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		11th October 2010
+ * $LastChangedDate: 2011-10-05 21:08:45 -0400 (Wed, 05 Oct 2011) $
+ * @version		v3.2.3
+ * $Revision: 9586 $
  * 
- * To use API-like methods:
- * $like = new classes_like( 'gallery', 'images' );
+ * <b>Example Usage:</b>
+ * @code
+ * $app  = 'gallery';
+ * $area = 'images';
+ * $like = classes_like::bootstrap( $app, $area );
  * print $like->isLiked( $relId );
 
  * $html	= $like->render( 'summary', $relId );
  * print $html;
  * 
- * Matt, Joe, Bob and 5 others like this
- * 
- * 
- * This loads the app specific composite class (which inherits from the abstract class classes_like_composite
- * The composite class calls upon the registry and cache classes to manage data
+ * RESULT: Matt, Joe, Bob and 5 others like this
+ * @endcode
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -33,44 +31,45 @@ if ( ! defined( 'IN_IPB' ) )
 }
 
 /**
- * Quick registry class for common methods
  *
- * @author matt
+ * @class		classes_like_registry
+ * @brief		Quick registry class for common methods
+ * @author		Matt
  */
 class classes_like_registry
 {
 	/**
 	 * App key
 	 *
-	 * @var string
+	 * @var		$app
 	 */
-	static private $app			= null;
+	static protected $app	= null;
 	
 	/**
 	 * Area key
 	 *
-	 * @var string
+	 * @var		$area
 	 */
-	static private $area		= null;
+	static protected $area	= null;
 	
 	/**
 	 * Total count
 	 *
-	 * @var string
+	 * @var		$count
 	 */
-	static private $count		= null;
+	static protected $count	= null;
 	
 	/**
 	 * Cached bootstrap loaders
 	 *
-	 * @var	array
+	 * @var		$bootstraps
 	 */
-	static private $bootstraps	= array();
+	static protected $bootstraps = array();
 	
 	/**
-	 * Get app key
+	 * Get application key
 	 * 
-	 * @return	string
+	 * @return	@e string
 	 */
 	static public function getApp()
 	{
@@ -78,10 +77,10 @@ class classes_like_registry
 	}
 	
 	/**
-	 * Set app key
+	 * Set application key
 	 * 
-	 * @param	string
-	 * @return	void
+	 * @param	string		$app		Application key
+	 * @return	@e void
 	 */
 	static public function setApp( $app )
 	{
@@ -91,7 +90,7 @@ class classes_like_registry
 	/**
 	 * Get area key
 	 * 
-	 * @return string
+	 * @return	@e string
 	 */
 	static public function getArea()
 	{
@@ -101,8 +100,8 @@ class classes_like_registry
 	/**
 	 * Set area key
 	 * 
-	 * @param	string
-	 * @return	void
+	 * @param	string		$area		Area key
+	 * @return	@e void
 	 */
 	static public function setArea( $area )
 	{
@@ -112,7 +111,7 @@ class classes_like_registry
 	/**
 	 * Get total count (saves on queries)
 	 * 
-	 * @return	string
+	 * @return	@e integer
 	 */
 	static public function getTotalCount()
 	{
@@ -122,8 +121,8 @@ class classes_like_registry
 	/**
 	  * Set total count (saves on queries)
 	 * 
-	 * @param	string
-	 * @return	void
+	 * @param	integer		$count		Likes count
+	 * @return	@e void
 	 */
 	static public function setTotalCount( $count )
 	{
@@ -131,17 +130,17 @@ class classes_like_registry
 	}
 	
 	/**
-	 * Pack key. Either for cache table, or full table
+	 * Build key, either for cache table or full table
 	 *
-	 * @param	int			relationship ID
-	 * @param	int			member ID
-	 * @return	binary		binary key
+	 * @param	integer		$relId		Relationship ID
+	 * @param	integer		$memberId	Member ID
+	 * @return	@e binary	Binary key
 	 */
 	static public function getKey( $relId, $memberId=null )
 	{
 		/* Check */
-		if ( empty( $relId ) )
-		{
+		if ( empty( $relId ) AND empty( $memberId ) )
+		{		
 			trigger_error( "Relationship ID missing in " . __CLASS__ . '::' . __FUNCTION__, E_USER_WARNING );
 		}
 		
@@ -152,30 +151,38 @@ class classes_like_registry
 		}
 		else if ( ! empty( $memberId ) )
 		{
-			/* For member speciifc relative item */
-			return md5( self::$app . ';' . self::$area . ';' . $relId . ';' . $memberId );
+			if ( $relId === null )
+			{
+				/* For member speciifc relative item */
+				return md5( self::$app . ';' . self::$area . ';' . $memberId );
+			}
+			else
+			{
+				/* For member speciifc relative item */
+				return md5( self::$app . ';' . self::$area . ';' . $relId . ';' . $memberId );
+			}
 		}
 		else
 		{
 			trigger_error( "Member ID missing in " . __CLASS__ . '::' . __FUNCTION__, E_USER_WARNING );
 		}
 	}
-	
-
 }
 
+
 /**
- * Simple static class for fetching meta data
- * @author matt
  *
+ * @class		classes_like_meta
+ * @brief		Simple static class for fetching meta data
+ * @author		Matt
  */
 class classes_like_meta
 {
 	/**
 	 * Retrieve the content title
 	 *
-	 * @param	array 		Like data
-	 * @return	string		Title of content liked
+	 * @param	array		$like		Like data
+	 * @return	@e string	Title of content liked
 	 */
 	static public function getTitleFromId( $like )
 	{
@@ -192,8 +199,8 @@ class classes_like_meta
 	/**
 	 * Retrieve the content URL
 	 *
-	 * @param	array 		Like data
-	 * @return	string		URL of content liked
+	 * @param	array		$like		Like data
+	 * @return	@e string	URL of content liked
 	 */
 	static public function getUrlFromId( $like )
 	{
@@ -209,8 +216,9 @@ class classes_like_meta
 	
 	/**
 	 * Fetch all meta data from various like rows
-	 * @param array $likes
-	 * @return array
+	 * 
+	 * @param	array		$likes		Like rows
+	 * @return	@e array
 	 */
 	static public function get( array $likes )
 	{
@@ -270,26 +278,28 @@ class classes_like_meta
 	}
 }
 
+
 /**
- * Factory class, loads composite and child class
  *
- * @author matt
+ * @class		classes_like
+ * @brief		Factory class, loads composite and child class
+ * @author		Matt
  */
 class classes_like
 {
 	/**
-	 * App object
+	 * Applications objects
 	 *
-	 * @var array
+	 * @var $apps
 	 */
-	static private $apps;
+	static protected $apps;
 	
 	/**
-	 * Construct
+	 * Bootstrap function to load the required file/class and setup the initial variables
 	 *
-	 * @param	string		Application
-	 * @param	string		Area
-	 * @return	string
+	 * @param	string		$app		Application key
+	 * @param	string		$area		Area
+	 * @return	@e object	Like object for the loaded key (app.area)
 	 */
 	static public function bootstrap( $app=null, $area=null )
 	{
@@ -310,23 +320,27 @@ class classes_like
 		}
 		
 		/* Otherwise create object and cache */
-		if ( file_exists( $_file ) )
+		if ( ! is_file( $_file ) )
 		{
-			require_once( $_file );
-
-			if ( class_exists( $_class ) )
-			{
-				classes_like_registry::setApp( $app );
-				classes_like_registry::setArea( $area );
-				
-				self::$apps[ $_key ] = new $_class();
-				self::$apps[ $_key ]->init();			
-			}
-			else
+			$_file = IPSLib::getAppDir( $app ) . '/extensions/like/default.php';
+			$_class = 'like_' . $app . '_composite';
+			
+			if ( ! is_file( $_file ) )
 			{
 				throw new Exception( "No like class available for $app - $area" );
 			}
 		}
+				
+		$classToLoad = IPSLib::loadLibrary( $_file, $_class, $app );
+		
+		if ( class_exists( $classToLoad ) )
+		{
+			classes_like_registry::setApp( $app );
+			classes_like_registry::setArea( $area );
+			
+			self::$apps[ $_key ] = new $classToLoad();
+			self::$apps[ $_key ]->init();
+		}
 		else
 		{
 			throw new Exception( "No like class available for $app - $area" );
@@ -336,17 +350,27 @@ class classes_like
 	}
 }
 
+
 /**
- * Composite class. Holds main functionality.
- * 
- * @author matt
+ *
+ * @class		classes_like_composite
+ * @brief		Composite class, holds main functionality
+ * @author		Matt
  */
 abstract class classes_like_composite
 {
-	/**#@+
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
 	 */
 	protected $registry;
 	protected $DB;
@@ -356,41 +380,33 @@ abstract class classes_like_composite
 	protected $member;
 	protected $memberData;
 	protected $cache;
-	protected $caches;
-	/**#@-*/	
+	protected $caches;	
 	
 	/**
 	 * Cache object
 	 *
-	 * @var	object
+	 * @var		$likeCache
 	 */
 	protected $likeCache = null;
 	
 	/**
-	 * App key
+	 * Application key
 	 *
-	 * @var	object
+	 * @var		$_app
 	 */
 	protected $_app;
 	
 	/**
-	 * App key
+	 * Area key
 	 *
-	 * @var	object
+	 * @var		$_area
 	 */
 	protected $_area;
 	
 	/**
-	 * Local settings object
+	 * Init all. Yes, it is.
 	 *
-	 * @var	array
-	 */
-	protected $_settings;
-	
-	/**
-	 * Init. Yes, it is.
-	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function init()
 	{
@@ -405,20 +421,53 @@ abstract class classes_like_composite
 		/* Fetch cache class */
 		$this->likeCache = classes_like_cache::getInstance();
 		
-		/* Set a default cache expiration of an hour */
-		$this->likeCache->setExpiration( 3600 );
+		/* Set a default cache expiration of 24 hours */
+		$this->likeCache->setExpiration( 86400 );
+	}
+	
+	/**
+	 * Toggle visibility
+	 * 
+	 * @param	mixed		$relId		Relationship ID or array ids
+	 * @param	boolean		$visible	Visible (true) or not (false)
+	 * @return	@e boolean
+	 */
+	public function toggleVisibility( $relId, $visible=true )
+	{
+		if ( empty( $relId ) )
+		{
+			trigger_error( "Data missing in " . __CLASS__ . '::' . __FUNCTION__, E_USER_WARNING  );
+		}
+		
+		/* Update any rows pointing to this rel id to be visible/invisible */
+		if( is_array($relId) )
+		{
+			if( count($relId) )
+			{
+				$this->DB->update( 'core_like', array( 'like_visible' => $visible ? 1 : 0 ), "like_app='{$this->_app}' AND like_area='{$this->_area}' AND like_rel_id IN (" . implode( ',', $relId ) . ')' );
+			}
+		}
+		else
+		{
+			$this->DB->update( 'core_like', array( 'like_visible' => $visible ? 1 : 0 ), "like_app='{$this->_app}' AND like_area='{$this->_area}' AND like_rel_id=" . $relId );
+		}
+
+		/* Flag cache as stale */
+		$this->likeCache->isNowStale( $relId );
+		
+		return true;
 	}
 	
 	/**
 	 * Add a like
 	 * 
-	 * @param	int		Relationship ID
-	 * @param	int		Member ID of user being added
-	 * @param	array	Notification options
-	 * @param	int		Anon flag
-	 * @return	boolean
+	 * @param	integer		$relId			Relationship ID
+	 * @param	integer		$memberID		Member ID of user being added
+	 * @param	array		$notifyOpts		Notification options
+	 * @param	integer		$isAnon			Anonymous flag
+	 * @return	@e boolean
 	 */
-	public function add( $relId, $memberId, array $notifyOpts, $isAnon=false )
+	public function add( $relId, $memberId, array $notifyOpts, $isAnon=0 )
 	{
 		if ( empty( $relId ) OR empty( $memberId ) )
 		{
@@ -432,21 +481,34 @@ abstract class classes_like_composite
 			return false;
 		}
 		
+		$memberData = IPSMember::load( $memberId );
+		
+		/* Build */
+		$save = array(  'like_id'          => classes_like_registry::getKey( $relId, $memberId ),
+					    'like_lookup_id'   => classes_like_registry::getKey( $relId ),
+						'like_lookup_area' => classes_like_registry::getKey( null, $memberId ),
+						'like_app'         => $this->_app,
+						'like_area'        => $this->_area,
+						'like_rel_id'      => $relId,
+					 	'like_member_id'   => $memberId,
+						'like_added'       => IPS_UNIX_TIME_NOW,
+						'like_is_anon'	   => intval($isAnon),
+						'like_notify_do'   => $notifyOpts['like_notify_do'],
+						'like_notify_meta' => $notifyOpts['like_notify_meta'],
+						'like_notify_freq' => ( $notifyOpts['like_notify_do'] ) ? $notifyOpts['like_notify_freq'] : '',
+						'like_visible'	   => 1,
+						'like_notify_sent' => 0 );
+		
+		/* Do we have permission ? */
+		if ( ! $this->notificationCanSend( array_merge( $save, $memberData ) ) )
+		{
+			return false;
+		}
+		
 		$notifyOpts = $this->_cleanNotifyOptions($notifyOpts);
 		
 		/* Save to deebee */
-		$this->DB->insert( 'core_like', array(  'like_id'          => classes_like_registry::getKey( $relId, $memberId ),
-											    'like_lookup_id'   => classes_like_registry::getKey( $relId ),
-												'like_app'         => $this->_app,
-												'like_area'        => $this->_area,
-												'like_rel_id'      => $relId,
-											 	'like_member_id'   => $memberId,
-												'like_added'       => time(),
-												'like_is_anon'	   => $isAnon,
-												'like_notify_do'   => $notifyOpts['like_notify_do'],
-												'like_notify_meta' => $notifyOpts['like_notify_meta'],
-												'like_notify_freq' => ( $notifyOpts['like_notify_do'] ) ? $notifyOpts['like_notify_freq'] : '',
-												'like_notify_sent' => 0 ) );
+		$this->DB->insert( 'core_like', $save );
 		
 		/* Flag cache as stale */
 		$this->likeCache->isNowStale( $relId );
@@ -454,13 +516,24 @@ abstract class classes_like_composite
 		return true;
 	}
 	
+	/**
+	 * Function to let plugins determine if a notification should not be sent.  Return false to send notification, or true to skip sending it.
+	 * 
+	 * @param	array	Notification data
+	 * @return	@e bool
+	 */
+ 	public function excludeNotification( $row )
+ 	{
+ 		return false;
+ 	}
+	
 	/**
 	 * Send notifications to anyone subscribed to item
 	 *
-	 * @param	int		Relationship ID
-	 * @param	array	Types of notifications to send (Possible: immediate, offline, daily, weekly)
-	 * @param	array 	Notification options (Keys: notification_key, notification_url, email_template, email_subject, build_message_array, from (optional))
-	 * @return	boolean
+	 * @param	integer		$relId				Relationship ID
+	 * @param	array		$type				Types of notifications to send (Possible: immediate, offline, daily, weekly)
+	 * @param	array		$notificationOpts	Notification options [Keys: notification_key, notification_url, email_template, email_subject, build_message_array, from (optional)]
+	 * @return	@e boolean
 	 * @see		allowedFrequencies()
 	 */
 	public function sendNotifications( $relId, $type, $notificationOpts=array() )
@@ -471,60 +544,61 @@ abstract class classes_like_composite
 		}
 		
 		$type	= is_array($type) ? $type : array( $type );
-
-		//-----------------------------------------
-		// Get users who have liked this item
-		//-----------------------------------------
 		
-		$data = $this->getDataByRelationshipId( $relId );
+		/* Use session expiration, unless it is longer than 1 hour, then limit to 1 hour */
+		$_limit	= $this->settings['session_expiration'];
 		
-		//-----------------------------------------
-		// If no users, just return
-		//-----------------------------------------
-
+		if( $_limit > 3600 )
+		{
+			$_limit	= 3600;
+		}
+		
+		$expire = IPS_UNIX_TIME_NOW - $_limit;
+		
+		/* Fetch data by relID */
+		$data = $this->getDataByRelationshipId( $relId, false );
+		
+		/* Remove ourselves from notifications... */
+		if ( $this->memberData['member_id'] && isset($data[ $this->memberData['member_id'] ]) && $notificationOpts['includeOwner'] !== true )
+		{
+			unset($data[ $this->memberData['member_id'] ]);
+		}
+		
+		/* If no users, forget it */
 		if ( is_null($data) )
 		{
 			return false;
 		}
-
-		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-		$notifyLibrary		= new $classToLoad( $this->registry );
 		
-		//-----------------------------------------
-		// Loop over members and send notifications
-		//-----------------------------------------
-
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary	= new $classToLoad( $this->registry );
+		
 		foreach( $data as $row )
 		{
-			//-----------------------------------------
-			// Make sure this user is subscribed with this type
-			//-----------------------------------------
-			
-			if( !$row['like_notify_freq'] OR !in_array( $row['like_notify_freq'], $type ) )
+			if ( ! $row['like_notify_freq'] OR ! in_array( $row['like_notify_freq'], $type ) )
 			{
 				continue;
 			}
 			
-			//-----------------------------------------
-			// If "offline" type, make sure user is offline
-			//-----------------------------------------
-			
-			if( $row['like_notify_freq'] == 'offline' AND $row['last_activity'] > ( time() - $this->settings['session_expiration'] ) )
+			/* make sure user is offline */
+			if ( $row['like_notify_freq'] == 'offline' AND $row['last_activity'] > $expire )
 			{
 				continue;
 			}
-
-			//-----------------------------------------
-			// Start building notification
-			//-----------------------------------------
 			
-			IPSText::getTextClass('email')->getTemplate( $notificationOpts['email_template'], $row['language'] );
-
-			//-----------------------------------------
-			// Dynamically replace per-user data in message array
-			//-----------------------------------------
+			/* Custom content type exclusion rules (e.g. in forums only send one notification per visit for offline types) */
+			if( $this->excludeNotification( $row ) )
+			{
+				continue;
+			}
 			
-			$buildMessage	= array();
+			/* Can we actually send this one? */
+			if ( $this->notificationCanSend( $row ) === false )
+			{
+				continue;
+			}
+				
+			$buildMessage = array();
 			
 			if ( is_array( $notificationOpts['build_message_array'] ) and count( $notificationOpts['build_message_array'] ) )
 			{
@@ -535,42 +609,166 @@ abstract class classes_like_composite
 						$v = str_replace( $_matches[0], $row[$_matches[1]], $v );
 					}
 					
-					$buildMessage[$k] = $v;
+					$buildMessage[ $k ] = $v;
 				}
 			}
-
+			
+			/* Add in unsubscribe link */
+			$key = $row['like_app'] . ';' . $row['like_area'] . ';' . $row['like_rel_id'] . ';' . $row['like_member_id'] . ';' . $row['member_id'] . ';' . $row['email'];
+			$buildMessage['UNSUBCRIBE_URL'] = $this->registry->output->buildSEOUrl( 'app=core&amp;module=global&amp;section=like&amp;do=unsubscribe&amp;key=' . IPSText::base64_encode_urlSafe( $key ), 'public', 'unsubscribe', 'likeunsubscribe' );
+						
+			IPSText::getTextClass('email')->setPlainTextTemplate( IPSText::getTextClass('email')->getTemplate( $notificationOpts['email_template'], $row['language'] ) );
 			IPSText::getTextClass('email')->buildMessage( $buildMessage );
-
+			
 			$notifyLibrary->setMember( $row );
 			$notifyLibrary->setFrom( $notificationOpts['from'] ? $notificationOpts['from'] : $this->memberData );
 			$notifyLibrary->setNotificationKey( $notificationOpts['notification_key'] );
 			$notifyLibrary->setNotificationUrl( $notificationOpts['notification_url'] );
-			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+			$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->getPlainTextContent() );
 			$notifyLibrary->setNotificationTitle( $notificationOpts['email_subject'] );
 			try
 			{
 				$notifyLibrary->sendNotification();
 			}
-			catch( Exception $e ){}
+			catch( Exception $e ){ }
 			
 			//-----------------------------------------
 			// Update sent timestamp
 			//-----------------------------------------
 			
-			$this->DB->update( 'core_like', array( 'like_notify_sent' => time() ), 'like_id=\'' . classes_like_registry::getKey( $row['like_rel_id'], $row['like_member_id'] ) . '\'' );
+			$this->DB->update( 'core_like', array( 'like_notify_sent' => IPS_UNIX_TIME_NOW ), "like_id='" . classes_like_registry::getKey( $row['like_rel_id'], $row['like_member_id'] ) . "'" );
 		}
 		
 		return true;
 	}
 	
+	/**
+	 * Send digest notifications to anyone subscribed to item
+	 *
+	 * @param	string		$type		Types of notifications to send (Possible: daily, weekly)
+	 * @return	@e boolean
+	 * @see		allowedFrequencies()
+	 */
+	public function sendDigestNotifications( $type )
+	{
+		/* Fetch data */
+		$blackhole = mktime( 0, 0 );
+		$time      = ( $type == 'daily' ) ? $blackhole - ( 86400 ) : $blackhole - ( 86400 * 7 );
+		$data      = $this->getDataByAreaAndLastSentOlderThanDate( $time, array( 'daily', 'weekly' ) );
+		
+		if ( ! count( $data ) )
+		{
+			return false;
+		}
+	
+		$classToLoad   = IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary = new $classToLoad( $this->registry );
+		
+		/* Array structure will be $data[ $memberId ][ $likeId ] = array(); */
+		foreach( $data as $memberId => $_rows )
+		{
+			foreach( $_rows as $row )
+			{
+				if ( ! $row['like_notify_freq'] OR ! in_array( $row['like_notify_freq'], array( 'daily', 'weekly' ) ) )
+				{
+					continue;
+				}
+				
+				/* Make sure we don't send huge digests if this is their first email since subscribing */
+				$row['like_notify_sent']	= $row['like_notify_sent'] ? $row['like_notify_sent'] : $row['like_added'];
+				
+				if( $row['like_notify_sent'] < ( time() - 604800 ) )
+				{
+					$row['like_notify_sent']	= time() - 604800;
+				}
+				
+				/* Want to fetch the data from the plug in files? */
+				$notificationOpts = $this->buildNotificationData( $row, $type );
+					
+				if ( ! is_array( $notificationOpts ) OR ! count( $notificationOpts ) )
+				{
+					continue;
+				}
+				
+				$buildMessage	= array();
+				
+				if ( is_array( $notificationOpts['build_message_array'] ) and count( $notificationOpts['build_message_array'] ) )
+				{
+					foreach( $notificationOpts['build_message_array'] as $k => $v )
+					{
+						if ( preg_match( '/\-member:(.+?)\-/', $v, $_matches ) )
+						{
+							$v = str_replace( $_matches[0], $row[$_matches[1]], $v );
+						}
+						
+						$buildMessage[$k] = $v;
+					}
+				}
+				
+				IPSText::getTextClass('email')->getTemplate( $notificationOpts['email_template'], $row['language'] );
+				IPSText::getTextClass('email')->buildMessage( $buildMessage );
+	
+				$notifyLibrary->setMember( $row );
+				$notifyLibrary->setFrom( $notificationOpts['from'] ? $notificationOpts['from'] : $this->memberData );
+				$notifyLibrary->setNotificationKey( $notificationOpts['notification_key'] );
+				$notifyLibrary->setNotificationUrl( $notificationOpts['notification_url'] );
+				$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+				$notifyLibrary->setNotificationTitle( $notificationOpts['email_subject'] );
+				try
+				{
+					$notifyLibrary->sendNotification();
+				}
+				catch( Exception $e ){ }
+				
+				/* Update sent timestamp */
+				$this->DB->update( 'core_like', array( 'like_notify_sent' => IPS_UNIX_TIME_NOW ), 'like_id=\'' . classes_like_registry::getKey( $row['like_rel_id'], $row['like_member_id'] ) . '\'' );
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Removes all likes based on member ID
+	 * 
+	 * @param	integer		$memberId		Member ID
+	 * @return	@e boolean
+	 */
+	public function removeByMemberId( $memberId )
+	{
+		if ( empty( $memberId ) )
+		{
+			trigger_error( "Data missing in " . __CLASS__ . '::' . __FUNCTION__, E_USER_WARNING  );
+		}
+		
+		$where = "like_app='{$this->_app}' AND like_area='{$this->_area}' AND like_member_id=" . intval($memberId);
+		
+		/* Get rel ids */
+		$relIds	= array();
+		
+		$this->DB->build( array( 'select' => 'like_rel_id', 'from' => 'core_like', 'where' => $where ) );
+		$this->DB->execute();
+		
+		while( $r = $this->DB->fetch() )
+		{
+			$relIds[]	= $r['like_rel_id'];
+		}
+
+		/* Delete likes */
+		$this->DB->delete( 'core_like', $where );
+									
+		/* Flag cache as stale */
+		$this->likeCache->isNowStale( $relIds );
+		
+		return true;
+	}
+	
 	/**
 	 * Removes a like
 	 * 
-	 * @param	int		Relationship ID
-	 * @param	int		Optional - If supplied, it'll remove that member rel. or it will remove all
-	 * @param	array	Notification options
-	 * @param	int		Anon flag
-	 * @return	boolean
+	 * @param	mixed		$relId		Relationship IDs (int|array)
+	 * @param	integer		$memberId	Optional - If supplied, it'll remove that member rel. or it will remove all
+	 * @return	@e boolean
 	 */
 	public function remove( $relId, $memberId=null )
 	{
@@ -579,10 +777,38 @@ abstract class classes_like_composite
 			trigger_error( "Data missing in " . __CLASS__ . '::' . __FUNCTION__, E_USER_WARNING  );
 		}
 		
+		$where = '';
+		
+		if ( is_numeric($relId) )
+		{
+			$where = "='" . classes_like_registry::getKey( $relId, $memberId ) . "'";
+		}
+		elseif ( is_array($relId) )
+		{
+			$relId = IPSLib::cleanIntArray($relId);
+			$keys  = array();
+			
+			if ( count($relId) )
+			{
+				foreach( $relId as $id )
+				{
+					$keys[] = "'" . classes_like_registry::getKey( $id, $memberId ) . "'";
+				}
+				
+				$where = " IN (" . implode( ",", $keys ) . ")";
+			}
+		}
+		
+		/* Nowhere to be found? */
+		if ( $where == '' )
+		{
+			return false;
+		}
+		
+		/* Still here? Delete then! */
 		if ( $memberId === null )
 		{
-			/* Save to deebee */
-			$this->DB->delete( 'core_like', 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\'' );
+			$this->DB->delete( 'core_like', "like_lookup_id " . $where );
 		}
 		else
 		{
@@ -592,9 +818,8 @@ abstract class classes_like_composite
 				/* if any one cares to check, then we're all good */
 				return false;
 			}
-					
-			/* Save to deebee */
-			$this->DB->delete( 'core_like', 'like_id=\'' . classes_like_registry::getKey( $relId, $memberId ) . '\'' );
+			
+			$this->DB->delete( 'core_like', "like_id " . $where );
 		}
 												
 		/* Flag cache as stale */
@@ -603,37 +828,63 @@ abstract class classes_like_composite
 		return true;
 	}
 	
+	/**
+	 * Return number of people who 'like' the item
+	 * 
+	 * @param	integer		$relId		Relationship ID
+	 * @return	@e integer
+	 */
+	public function getCount( $relId )
+	{
+		$cache = $this->likeCache->get( $relId );
+
+		return $cache['count'];
+	}
+	
 	/**
 	 * Render a view
 	 * 
-	 * @param	string	$view
-	 * @param	int		$relId
-	 * @param	array	Options
-	 * @param	int		$memberId
-	 * @return	string
+	 * @param	string		$view		Type of View
+	 * @param	integer		$relId		Relationship ID
+	 * @param	array		$opts		Options
+	 * @param	integer		$memberId	Member ID
+	 * @return	@e string	Formatted HTML
 	 */
-	public function render( $view, $relId, $opts=array(), $memberId = null )
+	public function render( $view, $relId, $opts=array(), $memberId=null )
 	{
 		/* In the future we could abstract this out to its own class 
 		 *  At this time we only have a few views so it would be overkill */
 		if ( $view == 'summary' )
 		{
-			$data   = array( 'names' => array(), 'count' => 0, 'formatted' => '', 'iFave' => false );
-			$cache  = $this->likeCache->get( $relId );
+			$data   = array( 'names' => array(), 'count' => 0, 'formatted' => '', 'iLike' => false, 'iLikeAnon' => false );
+			$cache  = $this->likeCache->get( $relId, $memberId );
+			$max	= 0;
 			
-			/* We had the total count set from cache.get */
-			if ( classes_like_registry::getTotalCount() )
+			/* Fetch data for us? */
+			if ( $this->memberData['member_id'] )
 			{
-				/* fetch data */
-				if ( $this->memberData['member_id'] AND $this->isLiked($relId, $this->memberData['member_id'] ) )
+				/* We can't use isLiked or it runs twice the query and adding a cache to the function doesn't work either */
+				$_me = $this->getDataByMemberIdAndRelationshipId( $relId, $this->memberData['member_id'] );
+				
+				if ( is_array($_me) && count($_me) && $_me['like_id'] )
 				{
 					/* Now mix up the data */
 					$data['names'][] = array( 'name' => $this->lang->words['fave_moi'], 'seo' => $this->memberData['members_seo_name'], 'id' => $this->memberData['member_id'] );
 					
 					/* Flag as me */
-					$data['iFave'] = true;
+					$data['iLike'] = true;
+					
+					/* Anonymous? Let the template know */
+					if ( $_me['like_is_anon'] )
+					{
+						$data['iLikeAnon'] = true;
+					}
 				}
-				
+			}
+			
+			/* We had the total count set from cache.get - doesn't count anonymous members thought! */
+			if ( classes_like_registry::getTotalCount() )
+			{
 				if ( is_array( $cache['members'] ) )
 				{
 					$i   = 1;
@@ -664,51 +915,98 @@ abstract class classes_like_composite
 			}
 			
 			/* Finish off */
-			$data['totalCount']  = $cache['count'];
+			$data['totalCount']  = $cache['count'] + $cache['count_anon'];
+			$data['anonCount']   = $cache['count_anon'];
 			$data['othersCount'] = ( $cache['count'] > $max ) ? $cache['count'] - $max : 0;
 			$data['app']		 = $this->_app;
 			$data['area']		 = $this->_area;
 			$data['formatted']   = $this->_formatNameString( $data );
+			$data['vernacular']	 = $this->getVernacular();
 			
 			if ( IPS_IS_AJAX )
 			{
-				return $this->registry->output->getTemplate( $this->skin() )->likeSummaryContents( $data, $relId, $opts );
+				$_template	= $this->templatePrefix() . 'likeSummaryContents';
+				
+				/* Got an override template? */
+				if ( method_exists( $this->registry->output->getTemplate( $this->skin() ), $_template ) )
+				{
+					return $this->registry->output->getTemplate( $this->skin() )->$_template( $data, $relId, $opts );
+				}
+				else
+				{
+					/* Fallback on default template */
+					return $this->registry->output->getTemplate('global_other')->likeSummaryContents( $data, $relId, $opts );
+				}
 			}
 			else
 			{
-				return $this->registry->output->getTemplate( $this->skin() )->likeSummary( $data, $relId, $opts );
+				$_template	= $this->templatePrefix() . 'likeSummary';
+								
+				/* Got an override template? */
+				if ( method_exists( $this->registry->output->getTemplate( $this->skin() ), $_template ) )
+				{
+					return $this->registry->output->getTemplate( $this->skin() )->$_template( $data, $relId, $opts );
+				}
+				else
+				{
+					/* Fallback on default template */
+					return $this->registry->output->getTemplate('global_other')->likeSummary( $data, $relId, $opts );
+				}
 			}
 		}
 		else if ( $view == 'more' )
 		{
-			/* Fetch members who have wanted to favorite this item */
-			$data = $this->getDataByRelationshipId( $relId );
-					
-			return $this->registry->output->getTemplate( $this->skin() )->likeMoreDialogue( $data, $relId );
+			/* We need some counts here because we need them! */
+			$cache				 = $this->likeCache->get( $relId, $memberId );
+			$cache['totalCount'] = $cache['count'] + $cache['count_anon'];
+			$cache['anonCount']	 = $cache['count_anon'];
+			
+			/* Fetch members who have wanted to like this item */
+			$data		= $this->getDataByRelationshipId( $relId );
+			$_template	= $this->templatePrefix() . 'likeMoreDialogue';
+			
+			/* Sort out some numbers if we're following anonymously */
+			if ( $this->memberData['member_id'] && isset($data[ $this->memberData['member_id'] ]) && $data[ $this->memberData['member_id'] ]['like_is_anon'] )
+			{
+				$cache['count_anon']--;
+				$cache['anonCount']--;
+			}
+			
+			/* Got an override template? */
+			if ( method_exists( $this->registry->output->getTemplate( $this->skin() ), $_template ) )
+			{
+				return $this->registry->output->getTemplate( $this->skin() )->$_template( $data, $relId, $cache );
+			}
+			else
+			{
+				/* Fallback on default template */
+				return $this->registry->output->getTemplate('global_other')->likeMoreDialogue( $data, $relId, $cache );
+			}
 		}
 	}
-	
-	
+
 	/**
 	 * Fetch form data for set dialogue
 	 * 
-	 * @param	int		relationship id
-	 * @return	array
+	 * @param	integer		$relId		Relationship ID
+	 * @return	@e array
 	 */
 	public function getDataForSetDialogue( $relid )
 	{
 		$return = array( 'frequencies' => $this->allowedFrequencies(),
-						 'notifyType'  => $this->getNotifyType() );
+						 'notifyType'  => $this->getNotifyType(),
+						 'vernacular'  => $this->getVernacular()
+						);
 		
 		return $return;
 	}
 	
 	/**
-	 * Has this user made this item a fave already dudes?
+	 * Has this user made this item a like already dudes?
 	 * 
-	 * @param	int		Relationship ID
-	 * @param	int		Member ID
-	 * @return	boolean
+	 * @param	mixed		$relId		Relationship IDs (int|array)
+	 * @param	integer		$memberId	Member ID
+	 * @return	@e boolean
 	 */
 	public function isLiked( $relId, $memberId )
 	{
@@ -719,17 +1017,18 @@ abstract class classes_like_composite
 	/**
 	 * Get data based on a relationship ID and a member ID
 	 *
-	 * @param	mixed 	int $relId or array $relId (many)
-	 * @param	int 	$memberId
-	 * @return	array	Favorite data OR null
+	 * @param	mixed		$relId		Relationship IDs (int|array)
+	 * @param	integer		$memberId	Member ID
+	 * @return	@e mixed	Array of likes data OR null
 	 */
 	public function getDataByMemberIdAndRelationshipId( $relId, $memberId )
 	{
-		$where = '';
+		$where	= '';
+		$data	= null;
 		
 		if ( is_numeric( $relId ) )
 		{
-			$where = 'like_id=\'' . classes_like_registry::getKey( $relId, $memberId ) . '\'';
+			$where = "like_id='" . classes_like_registry::getKey( $relId, $memberId ) . "'";
 		}
 		else if ( is_array( $relId ) )
 		{
@@ -750,6 +1049,8 @@ abstract class classes_like_composite
 			
 		}
 		
+		$where .= ' AND like_visible=1';
+		
 		$this->DB->build( array( 'select' => '*',
 					   			 'from'   => 'core_like',
 								 'where'  => $where ) );
@@ -762,32 +1063,61 @@ abstract class classes_like_composite
 		}
 		
 		/* Just the one? */
-		if ( is_numeric( $relId ) and count( $data ) )
+		if ( is_numeric($relId) && count($data) )
 		{
-			$data = array_shift( $data );
+			$data = array_shift($data);
 		}
 		
+		return is_array($data) ? $data : null;
+	}
+	
+	/**
+	 * Get data based on a member ID
+	 *
+	 * @param	integer		$memberId		Member ID
+	 * @param	integer		$limit			Max results
+	 * @return	@e mixed 	Array of likes data OR null
+	 */
+	public function getDataByMemberIdAndArea( $memberId, $limit=500 )
+	{
+		$data = null;
+		
+		$this->DB->build( array( 'select' => '*',
+					   			 'from'   => 'core_like',
+								 'where'  => 'like_lookup_area=\'' . classes_like_registry::getKey( null, $memberId ) . '\' AND like_visible=1',
+								 'order'  => 'like_added DESC',
+								 'limit'  => array( 0, $limit ) ) );
+		
+		$o = $this->DB->execute();
+		
+		while( $row = $this->DB->fetch( $o ) )
+		{
+			$data[ $row['like_rel_id'] ] = $row;
+		}	
+		
 		return ( is_array( $data ) ) ? $data : null;
 	}
 	
-	
 	/**
 	 * Get data based on a relationship ID
 	 *
-	 * @param	int 	$relId
-	 * @return	mixed	Array of like data OR null
+	 * @param	integer		$relId		Relationship ID
+	 * @param	boolean		$skipAnon	Skip anonymous rows flag
+	 * @return	@e mixed	Array of likes data OR null
 	 */
-	public function getDataByRelationshipId( $relId )
+	public function getDataByRelationshipId( $relId, $skipAnon=true )
 	{
 		/* Init */
 		$mids	 = array();
 		$members = array();
 		$rows    = array();
+		$_isAnon = $skipAnon ? 'AND like_is_anon=0' : '';
+		$_whereB = $this->memberData['member_id'] ? " OR like_id='" . classes_like_registry::getKey( $relId, $this->memberData['member_id'] ) . "'" : '';
 		
 		/* Fetch data */	
 		$this->DB->build( array( 'select' => '*',
 					   			 'from'   => 'core_like',
-								 'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon=0',
+								 'where'  => "((like_lookup_id='" . classes_like_registry::getKey( $relId ) . "' {$_isAnon}) {$_whereB}) AND like_visible=1",
 								 'order'  => 'like_added DESC',
 								 'limit'  => array( 0, 250 ) ) );
 		
@@ -811,16 +1141,89 @@ abstract class classes_like_composite
 			}
 		}
 		
-		return ( is_array( $data ) ) ? $data : null;
+		return is_array($data) ? $data : null;
+	}
+	
+	/**
+	 * Get data based on an area and last sent greater than date [unix timestampe]
+	 *
+	 * @param	integer		$date			Unix timestamp
+	 * @param	array		$types			Array of notification types (optional)
+	 * @param	array		$parseMembers	Parse extra data for each member and build display photo (false is default)
+	 * @return	@e mixed	Array of likes data OR null
+	 * @see		allowedFrequencies()	 
+	 */
+	public function getDataByAreaAndLastSentOlderThanDate( $date, $types=array(), $parseMembers=false )
+	{
+		/* Init */
+		$mids	 = array();
+		$members = array();
+		$rows    = array();
+		$joins   = array();
+		$where   = ( is_array( $types ) ) ? ' AND l.like_notify_freq IN (\'' . implode( "','", $types ) . '\')' : '';
+		
+		/* figure out joins */
+		$joins[] = array( 'select' => 'm.*',
+						  'from'   => array( 'members' => 'm' ),
+						  'where'  => 'm.member_id=l.like_member_id',
+					      'type'   => 'left' );
+		
+		$moreJoins = $this->getDataJoins();
+		
+		if ( is_array( $moreJoins ) AND count( $moreJoins ) )
+		{
+			foreach( $moreJoins as $join )
+			{
+				$joins[] = $join;
+			}
+		}
+
+		/* Fetch data */	
+		$this->DB->build( array( 'select'   => 'l.*',
+					   			 'from'     => array( 'core_like' => 'l' ),
+								 'where'    => 'l.like_notify_do=1 AND l.like_app=\'' . classes_like_registry::getApp() . '\' AND l.like_area=\'' . classes_like_registry::getArea() . '\' AND l.like_visible=1 AND l.like_notify_sent < ' . intval( $date ) . $where,
+								 'order'    => 'l.like_notify_sent ASC',
+								 'limit'    => array( 0, ipsRegistry::$settings['like_notifications_limit'] ),
+								 'add_join' => $joins ) );
+		
+		$o = $this->DB->execute();
+		
+		while( $row = $this->DB->fetch( $o ) )
+		{
+			$row['like_member_id']			= intval($row['like_member_id']);
+			$mids[ $row['like_member_id'] ]	= $row['like_member_id'];
+			
+			/* @link http://community.invisionpower.com/tracker/issue-32204-dailyweekly-notifications */
+			$data[ $row['like_member_id'] ][ $row['like_id'] ]	= $row;
+			
+		}
+		
+		/* Just the one? */
+		if ( $parseMembers && count($mids) )
+		{
+			$members = IPSMember::load( $mids, 'all' );
+		
+			foreach( $members as $i => $d )
+			{
+				$_m = IPSMember::buildProfilePhoto( $d );
+				
+				foreach( $data[ $i ] as $likeId => $likeData )
+				{
+					$data[ $i ][ $likeId ] = array_merge( (array) $_m, (array) $data[ $i ][ $likeId ] );
+				}
+			}
+		}
+		
+		return is_array($data) ? $data : null;
 	}
 	
 	/**
 	 * Clean the notification options to make sure they're all nice and fluffy
 	 * 
-	 * @param 	array $notifyOpts
-	 * @return 	array
+	 * @param	array		$notifyOpts		Notification options
+	 * @return	@e array	Cleaned notification options array
 	 */
-	private function _cleanNotifyOptions( array $notifyOpts )
+	protected function _cleanNotifyOptions( array $notifyOpts )
 	{
 		if ( isset( $notifyOpts['like_notify_do'] ) )
 		{
@@ -852,7 +1255,7 @@ abstract class classes_like_composite
 	 * Return an array of acceptable frequencies
 	 * Possible: immediate, offline, daily, weekly
 	 * 
-	 * @return	array
+	 * @return	@e array
 	 */
 	public function allowedFrequencies()
 	{
@@ -860,30 +1263,86 @@ abstract class classes_like_composite
 	}
 	
 	/**
-	 * return type of notification available for this item
+	 * Return types of notification available for this item
 	 * 
-	 * @return	array  	key, human readable
+	 * @return	@e array	array( key, human readable )
 	 */
 	public function getNotifyType()
 	{
-		return array( 'comments', 'comments' );
+		return array( 'comments', ipsRegistry::getClass('class_localization')->words['gbl_comments_like'] );
 	}
 	
 	/**
 	 * Fetch the template group
 	 * 
-	 * @return	string
+	 * @return	@e string
 	 */
 	public function skin()
 	{
 		return 'global_other';
 	}
+
+	/**
+	 * Fetch the template prefix.  This allows you to have two follow implementations in
+	 * one skin file (i.e. skin_calendars -> eventLikeMoreDialog() and skin_calendars -> calendarLikeMoreDialog())
+	 * 
+	 * @return	@e string
+	 */
+	public function templatePrefix()
+	{
+		return '';
+	}
+	
+	/**
+	 * Gets the vernacular (like or follow)
+	 *
+	 * @return	@e string
+	 */
+	public function getVernacular()
+	{
+		return 'like';
+	}
+	
+	/**
+	 * Builds the notification data via the app class
+	 * 
+	 * @param	array		$data		like_ DB data and like owner member data
+	 * @param	string		$type		Types of notifications to send
+	 * @return	@e array	array( notification_key, notification_url, email_template, email_subject, build_message_array )
+	 * @see		allowedFrequencies()
+	 */
+	public function buildNotificationData( $data, $type )
+	{
+		return array();
+	}
+	
+	/**
+	 * Check notifications that are to be sent to make sure they're valid and that
+	 * 
+	 * @param	array		$metaData		like_ DB data and like owner member data
+	 * @return	@e boolean
+	 */
+	public function notificationCanSend( $metaData )
+	{
+		return true;
+	}
+	
+	/**
+	 * Fetches joins for fetching data
+	 * 
+	 * @param	string		$field		DB field name (defaults to 'l.like_rel_id')
+	 * @return	@e array
+	 */
+	public function getDataJoins( $field='l.like_rel_id' )
+	{
+		return array();
+	}
 	
 	/**
 	 * Return the title based on the passed id
 	 * 
-	 * @param	int		Relationship ID
-	 * @return	string	Title
+	 * @param	mixed		$relId		Relationship ID or array of IDs
+	 * @return	@e mixed	Title or array of titles
 	 */
 	public function getTitleFromId( $relId )
 	{
@@ -909,8 +1368,8 @@ abstract class classes_like_composite
 	/**
 	 * Return the URL based on the passed id
 	 * 
-	 * @param	int		Relationship ID
-	 * @return	string	URL
+	 * @param	mixed		$relId		Relationship ID or array of IDs
+	 * @return	@e mixed	URL or array of URLs
 	 */
 	public function getUrlFromId( $relId )
 	{
@@ -936,10 +1395,10 @@ abstract class classes_like_composite
 	/**
 	 * Formats the Bob, Bill, Joe and 2038 Others Hate You
 	 * 
-	 * @param	array	$data
-	 * @return	string
+	 * @param	array		$data		Likes data
+	 * @return	@e string	Formatted names
 	 */
-	private function _formatNameString( array $data )
+	protected function _formatNameString( array $data )
 	{
 		$langString  = '';
 		$seeMoreLink = 'app=core&amp;module=global&amp;section=like&amp;do=more';
@@ -954,13 +1413,13 @@ abstract class classes_like_composite
 		
 		foreach( $data['names'] as $name )
 		{
-			if ( $this->memberData['member_id'] AND ( $this->memberData['member_id'] == $name['id'] ) )
+			if ( $this->memberData['member_id'] AND $this->memberData['member_id'] == $name['id'] )
 			{
 				$_names[$i] = $name['name'];
 			}
 			else
 			{
-				$_names[$i] = IPSLib::makeProfileLink($name['name'], $name['id'], $name['seo'] );
+				$_names[$i] = IPSMember::makeProfileLink($name['name'], $name['id'], $name['seo'] );
 			}
 			
 			$i++;
@@ -1015,18 +1474,26 @@ abstract class classes_like_composite
 	}
 }
 
-
 /**
- * Favorites cache class
- * 
- * @author matt
+ *
+ * @class		classes_like_cache
+ * @brief		Favorites cache class
+ * @author		Matt
  */
 class classes_like_cache
 {
-	/**#@+
+	/**
 	 * Registry Object Shortcuts
 	 *
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
 	 */
 	protected $registry;
 	protected $DB;
@@ -1034,41 +1501,42 @@ class classes_like_cache
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
-	/**#@-*/	
+	protected $caches;	
 	
 	/**
-	 * Cache expiration
+	 * Cache expiration time in seconds
 	 *
-	 * @var int
+	 * @var		$_expire
 	 */
 	protected $_expire = 0;
 	
 	/**
-	 * App key
+	 * Application key
 	 *
-	 * @var	object
+	 * @var		$_app
 	 */
 	protected $_app;
 	
 	/**
-	 * App key
+	 * Area key
 	 *
-	 * @var	object
+	 * @var		$_area
 	 */
 	protected $_area;
 	
 	/**
 	 * Instance of an object
 	 *
-	 * @var object
+	 * @var		$instance
 	 */
 	private static $instance = null;
 	
 	/**
 	 * Singleton
 	 *
-	 * @return	object
+	 * @return	@e object
 	 */
 	public static function getInstance()
 	{
@@ -1081,9 +1549,9 @@ class classes_like_cache
 	}
 	
 	/**
-	 * Our desctructor. Just kidding.
-	 * 
-	 * @return void
+	 * Constructor
+	 *
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -1110,8 +1578,8 @@ class classes_like_cache
 	/**
 	 * Set the cache expiration
 	 *
-	 * @param	int		$seconds
-	 * @return	void
+	 * @param	integer		$seconds		Time in seconds
+	 * @return	@e void
 	 */
 	public function setExpiration( $seconds )
 	{
@@ -1121,12 +1589,14 @@ class classes_like_cache
 	/**
 	 * Fetch an item from the cache
 	 * 
-	 * @param	int		$relId
-	 * @param	int		$memberId
-	 * @return	array
+	 * @param	integer		$relId		Relationship ID
+	 * @param	integer		$memberId 	Member ID
+	 * @return	@e array
 	 */
-	public function get( $relId, $memberId = null )
+	public function get( $relId, $memberId=null )
 	{
+		$cache = array();
+		
 		/* Possible future expansion */
 		if ( $memberId === null )
 		{
@@ -1134,32 +1604,35 @@ class classes_like_cache
 													  'from'   => 'core_like_cache',
 													  'where'  => 'like_cache_id=\'' .  classes_like_registry::getKey( $relId ) . '\'' ) );
 			
-			if ( ! is_array( $cache ) OR ( $cache['like_cache_expire'] <= time() ) )
+			if ( !is_array($cache) OR $cache['like_cache_expire'] <= IPS_UNIX_TIME_NOW )
 			{
 				/* We don't have a valid cache, so create one and return the data */
 				$cache = $this->create( $relId, $memberId );
 			}
 			
-			$tmp = unserialize( $cache['like_cache_data'] );
-			$cache['members'] = $tmp['members'];
-			$cache['count']   = intval( $tmp['count'] );
+			$tmp = unserialize($cache['like_cache_data']);
+			$cache['members']	= $tmp['members'];
+			$cache['count']		= intval($tmp['count']);
+			$cache['count_anon']= intval($tmp['count_anon']);
 			
 			/* Set total count for use elsewhere */
 			classes_like_registry::setTotalCount( $cache['count'] );
-			
-			return $cache;
 		}
+		
+		return $cache;
 	}
 	
 	/**
-	 * Creates/updates the relationship ID's cache.
+	 * Creates/updates the relationship ID's cache
 	 * 
-	 * @param	int		$relId
-	 * @param	int		$memberId
-	 * @return	array	Array of data stored
+	 * @param	integer		$relId		Relationship ID
+	 * @param	integer		$memberId 	Member ID
+	 * @return	@e array	Array of stored data
 	 */
-	public function create( $relId, $memberId = null )
+	public function create( $relId, $memberId=null )
 	{
+		/* Init vars */
+		$store   = array();
 		$items   = array();
 		$members = array();
 		$mids	 = array();
@@ -1168,17 +1641,24 @@ class classes_like_cache
 		/* Possible future expansion */
 		if ( $memberId === null )
 		{
-			/* Count all first */
+			/* Count all public first */
 			$cou = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as nt',
 									 				'from'   => 'core_like',
-									 				'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon=0' ) );
+									 				'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon=0 AND like_visible=1' ) );
 			
 			$data['count'] = intval( $cou['nt'] );
 			
+			/* Count all anonymous second */
+			$ano = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as nt',
+									 				'from'   => 'core_like',
+									 				'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon!=0 AND like_visible=1' ) );
+			
+			$data['count_anon'] = intval( $ano['nt'] );
+			
 			/* Fetch all items for this app:key:$relId */
 			$this->DB->build( array( 'select' => '*',
 									 'from'   => 'core_like',
-									 'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon=0',
+									 'where'  => 'like_lookup_id=\'' . classes_like_registry::getKey( $relId ) . '\' AND like_is_anon=0 AND like_visible=1',
 									 'order'  => 'like_added DESC',
 									 'limit'  => array( 0, 5 )  ) );
 			
@@ -1205,31 +1685,57 @@ class classes_like_cache
 						    'like_cache_area'   => $this->_area,
 						    'like_cache_rel_id' => $relId,
 						    'like_cache_data'   => serialize( $data ),
-						    'like_cache_expire' => time() + $this->_expire );
+						    'like_cache_expire' => IPS_UNIX_TIME_NOW + $this->_expire );
 			
 			/* Update the cache */
 			$this->DB->replace( 'core_like_cache', $store, array( 'like_cache_id' ) );
-						
-			return $store;
-		}		
+		}
+		else
+		{
+			/* We know there's a previous cache row, so delete it */
+			$this->DB->delete( 'core_like_cache', 'like_cache_id=\'' . classes_like_registry::getKey( $relId ) . '\'' );
+		}
 		
-		/* We know there's a previous cache row, so delete it */
-		$this->DB->delete( 'core_like_cache', 'like_cache_id=\'' . classes_like_registry::getKey( $relId ) . '\'' );
+		return $store;
 	}
 	
 	/**
-	 * Deletes a cache.
+	 * Deletes a cache
 	 * 
-	 * @param	int 	$relId
-	 * @param	int		$memberId
-	 * @return	void
+	 * @param	mixed		$relId		Relationship ID or array of IDs
+	 * @param	integer		$memberId 	Member ID
+	 * @return	@e void
 	 */
-	public function delete( $relId, $memberId = null )
+	public function delete( $relId, $memberId=null )
 	{
 		/* Possible future expansion */
 		if ( $memberId === null )
 		{
-			$this->DB->delete( 'core_like_cache', 'like_cache_id=\'' . classes_like_registry::getKey( $relId ) . '\'' );
+			$where = '';
+			
+			if ( is_numeric($relId) )
+			{
+				$where = "='" . classes_like_registry::getKey( $relId ) . "'";
+			}
+			elseif ( is_array($relId) )
+			{
+				$relId = IPSLib::cleanIntArray($relId);
+				$keys  = array();
+				
+				foreach( $relId as $id )
+				{
+					$keys[] = "'" . classes_like_registry::getKey( $id ) . "'";
+				}
+				
+				if ( ! count($keys) )
+				{
+					return null;
+				}
+				
+				$where = " IN (" . implode( ",", $keys ) . ")";
+			}
+			
+			$this->DB->delete( 'core_like_cache', 'like_cache_id ' . $where );
 		}
 	}
 	
@@ -1237,9 +1743,9 @@ class classes_like_cache
 	 * Flags a cache as stale. We choose to delete, but the cache class should make the call
 	 * not the application
 	 * 
-	 * @param	int		$relId
-	 * @param	int		$memberId
-	 * @return	void
+	 * @param	mixed		$relId		Relationship ID or array of IDs
+	 * @param	integer		$memberId 	Member ID
+	 * @return	@e void
 	 */
 	public function isNowStale( $relId, $memberId = null )
 	{
diff --git a/upload/admin/sources/classes/like/index.html b/upload/admin/sources/classes/like/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/like/index.html
+++ b/upload/admin/sources/classes/like/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/mapping/bootstrap.php b/upload/admin/sources/classes/mapping/bootstrap.php
index b3938d74..7e0a5d3f 100644
--- a/upload/admin/sources/classes/mapping/bootstrap.php
+++ b/upload/admin/sources/classes/mapping/bootstrap.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Generic Mapping Class
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
+ * Last Updated: $Date: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
  *
  * @example
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6725 $
+ * @version		$Revision: 8021 $
  */
 
 /**
@@ -31,7 +31,7 @@ class classes_mapping
 	 * App object
 	 * @var object
 	 */
-	static private $_app;
+	static protected $_app;
 	
 	/**
 	 * Construct
@@ -45,15 +45,14 @@ class classes_mapping
 		
 		/* Pointless comment! */
 		$_file  = IPS_ROOT_PATH . 'sources/classes/mapping/engines/' . $engine . '.php';
-		$_class = 'classes_mapping_' . $engine;
 		
-		if ( file_exists( $_file ) )
+		if ( is_file( $_file ) )
 		{
-			require_once( $_file );
-
-			if ( class_exists( $_class ) )
-			{	
-				self::$_app = new $_class();		
+			$classToLoad = IPSLib::loadLibrary( $_file, 'classes_mapping_' . $engine );
+			
+			if ( class_exists( $classToLoad ) )
+			{
+				self::$_app = new $classToLoad();
 			}
 			else
 			{
@@ -217,7 +216,7 @@ abstract class classes_mapping_composite
 		$file_0 = md5( $lat . ',' . $lon . ',' . $size ) . '_0.png';
 		$file_1 = md5( $lat . ',' . $lon . ',' . $size ) . '_1.png';
 		
-		if ( file_exists( $this->_getCachePath() . '/' . $file_0 ) && file_exists( $this->_getCachePath() . '/' . $file_1 ) )
+		if ( is_file( $this->_getCachePath() . '/' . $file_0 ) && is_file( $this->_getCachePath() . '/' . $file_1 ) )
 		{
 			return array( $this->_getCacheUrl() . '/' . $file_0, $this->_getCacheUrl() . '/' . $file_1 );
 		}
@@ -237,8 +236,8 @@ abstract class classes_mapping_composite
 	{
 		if ( ! is_dir( $this->settings['upload_dir'] . '/maps' ) )
 		{
-			@mkdir( $this->settings['upload_dir'] . '/maps', 0777 );
-			@chmod( $this->settings['upload_dir'] . '/maps', 0777 );
+			@mkdir( $this->settings['upload_dir'] . '/maps', IPS_FOLDER_PERMISSION );
+			@chmod( $this->settings['upload_dir'] . '/maps', IPS_FOLDER_PERMISSION );
 		}
 		
 		$filename = md5( $lat . ',' . $lon . ',' . $size ) . '_' . $key;
@@ -302,19 +301,17 @@ abstract class classes_mapping_composite
 	 * Returns cache path
 	 * @return string
 	 */
-	private function _getCachePath()
+	protected function _getCachePath()
 	{
 		return ( is_dir( $this->settings['upload_dir'] . '/maps' )  ) ? $this->settings['upload_dir'] . '/maps' : $this->settings['upload_dir'];
 	}
 	
-/**
+	/**
 	 * Returns cache path
 	 * @return string
 	 */
-	private function _getCacheUrl()
+	protected function _getCacheUrl()
 	{
 		return ( is_dir( $this->settings['upload_dir'] . '/maps' )  ) ? $this->settings['upload_url'] . '/maps' : $this->settings['upload_url'];
 	}
-
-
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/mapping/engines/bing.php b/upload/admin/sources/classes/mapping/engines/bing.php
index bf67b0fa..fdcbfb65 100644
--- a/upload/admin/sources/classes/mapping/engines/bing.php
+++ b/upload/admin/sources/classes/mapping/engines/bing.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bing mapping class
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  *
  * @example
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6725 $
+ * @version		$Revision: 8644 $
  */
 
 class classes_mapping_bing extends classes_mapping_composite
@@ -68,6 +68,7 @@ class classes_mapping_bing extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -76,11 +77,12 @@ class classes_mapping_bing extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Method constructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -93,8 +95,6 @@ class classes_mapping_bing extends classes_mapping_composite
 		$this->memberData =& $this->registry->member()->fetchMemberData();
 		$this->cache	  =  $this->registry->cache();
 		$this->caches     =& $this->registry->cache()->fetchCaches();
-		
-		define( 'BING_API_KEY', 'AvxfFpDbujzwr7Taq2i0enES55OfCrRviwA17gJAGXkhLwAZKV4eNUdglFMQzlz6' );
 	}
 	
 	/**
@@ -103,7 +103,7 @@ class classes_mapping_bing extends classes_mapping_composite
 	 */
 	public function fetchApiKey()
 	{
-		return BING_API_KEY;
+		return defined( 'BING_API_KEY' ) ? BING_API_KEY : false;
 	}
 	
 	//$result = $file->getFileContents( "http://where.yahooapis.com/geocode?appid=" . $this->getYahooAppId() . "&location=" . $lat . "," . $lon . "&flags=J&gflags=R&locale=" . YAHOO_LOCALE );
@@ -125,8 +125,8 @@ class classes_mapping_bing extends classes_mapping_composite
 		}
 		
 		/* Lets do it. */
-		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
-		$file = new classFileManagement();
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$file = new $classToLoad();
 		
 		/* fetch */
 		$json = $file->getFileContents( "http://dev.virtualearth.net/REST/v1/Locations/" . $lat . "," . $lon . "?&key=" . BING_API_KEY );
@@ -235,7 +235,7 @@ class classes_mapping_bing extends classes_mapping_composite
 	 * @param array $return
 	 * @return string
 	 */
-	private function _getShort( $return )
+	protected function _getShort( $return )
 	{
 		if ( $return['locality'] != $return['district2'] )
 		{
diff --git a/upload/admin/sources/classes/mapping/engines/google.php b/upload/admin/sources/classes/mapping/engines/google.php
index c4c082ed..b89c5e7a 100644
--- a/upload/admin/sources/classes/mapping/engines/google.php
+++ b/upload/admin/sources/classes/mapping/engines/google.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bing mapping class
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  *
  * @example
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6725 $
+ * @version		$Revision: 8644 $
  */
 
 class classes_mapping_google extends classes_mapping_composite
@@ -68,6 +68,7 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -76,11 +77,12 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Method constructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -121,8 +123,8 @@ class classes_mapping_google extends classes_mapping_composite
 		}
 		
 		/* Lets do it. */
-		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
-		$file = new classFileManagement();
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$file = new $classToLoad();
 		
 		/* fetch */
 		$json = $file->getFileContents( "http://maps.googleapis.com/maps/api/geocode/json?latlng=" . $lat . ',' . $lon . '&sensor=false' );
@@ -225,7 +227,7 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @param array $return
 	 * @return string
 	 */
-	private function _getShort( $return )
+	protected function _getShort( $return )
 	{
 		if ( $return['locality'] != $return['district2'] )
 		{
diff --git a/upload/admin/sources/classes/mapping/engines/index.html b/upload/admin/sources/classes/mapping/engines/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/mapping/engines/index.html
+++ b/upload/admin/sources/classes/mapping/engines/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/mapping/index.html b/upload/admin/sources/classes/mapping/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/mapping/index.html
+++ b/upload/admin/sources/classes/mapping/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/member/index.html b/upload/admin/sources/classes/member/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/member/index.html
+++ b/upload/admin/sources/classes/member/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/member/memberFunctions.php b/upload/admin/sources/classes/member/memberFunctions.php
index 8f11df8d..4d916751 100644
--- a/upload/admin/sources/classes/member/memberFunctions.php
+++ b/upload/admin/sources/classes/member/memberFunctions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Extended Member Functions. Disparate functions that are not required
  * on every page view.
- * Last Updated: $Date: 2010-08-05 19:11:01 -0400 (Thu, 05 Aug 2010) $
+ * Last Updated: $Date: 2011-07-04 10:54:22 -0400 (Mon, 04 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $ (Original: MattMecham)
+ * @author 		$Author: ips_terabyte $ (Original: MattMecham)
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6731 $
+ * @version		$Revision: 9145 $
  *
  */
 
@@ -50,7 +50,7 @@ class memberFunctions
 	 *
 	 * @access	public
 	 * @param	object		Main Registry  Object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -74,11 +74,12 @@ class memberFunctions
 	 * Updates member's DB row name or members_display_name
 	 *
 	 * @todo 	[Future] Separate out forum specific stuff (moderators, etc) and move into hooks 
-	 * @access	public
+	 * 
 	 * @param	string		Member id
 	 * @param	string		New name
 	 * @param	string		Field to update (name or display name)
 	 * @return	mixed		True if update successful, otherwise exception or false
+	 * 
 	 * Error Codes:
 	 * NO_USER				Could not load the user
 	 * NO_PERMISSION		This user cannot change their display name at all
@@ -115,8 +116,7 @@ class memberFunctions
 			{
 				if ( $field == 'members_display_name' )
 				{
-		    		$this->DB->force_data_type = array( 'dname_previous'	=> 'string',
-			    										'dname_current'		=> 'string' );
+					$this->DB->setDataType( array( 'dname_previous', 'dname_current' ), 'string' );
 
 			    	$this->DB->insert( 'dnames_change', array( 'dname_member_id'		=> $member_id,
 			    												  'dname_date'		=> time(),
@@ -130,16 +130,16 @@ class memberFunctions
 
 					IPSMember::save( $member['member_id'], array( 'core' => array( 'members_display_name' => $name, 'members_l_display_name' => mb_strtolower( $name ), 'members_seo_name' => $_seoName ) ) );
 
-					$this->DB->force_data_type = array( 'last_poster_name' => 'string', 'seo_last_name' => 'string' );
+					$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name' ), 'string' );
 					$this->DB->update( 'forums', array( 'last_poster_name' => $name, 'seo_last_name' => $_seoName ), "last_poster_id=" . $member['member_id'] );
 
-					$this->DB->force_data_type = array( 'member_name' => 'string', 'seo_name' => 'string' );
+					$this->DB->setDataType( array( 'member_name', 'seo_name' ), 'string' );
 					$this->DB->update( 'sessions', array( 'member_name' => $name, 'seo_name' => $_seoName ), "member_id=" . $member['member_id'] );
 
-					$this->DB->force_data_type = array( 'starter_name' => 'string', 'seo_first_name' => 'string' );
+					$this->DB->setDataType( array( 'starter_name', 'seo_first_name' ), 'string' );
 					$this->DB->update( 'topics', array( 'starter_name' => $name, 'seo_first_name' => $_seoName ), "starter_id=" . $member['member_id'] );
 
-					$this->DB->force_data_type = array( 'last_poster_name' => 'string', 'seo_last_name' => 'string' );
+					$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name' ), 'string' );
 					$this->DB->update( 'topics', array( 'last_poster_name' => $name, 'seo_last_name' => $_seoName ), "last_poster_id=" . $member['member_id'] );
 				}
 				else
@@ -151,7 +151,7 @@ class memberFunctions
 
 					IPSMember::save( $member['member_id'], array( 'core' => array( 'name' => $name, 'members_l_username' => mb_strtolower( $name ) ) ) );
 
-					$this->DB->force_data_type = array( 'member_name' => 'string' );
+					$this->DB->setDataType( 'member_name', 'string' );
 					$this->DB->update( 'moderators', array( 'member_name' => $name ), "member_id=" . $member['member_id'] );
 
 					if ( ! $this->settings['auth_allow_dnames'] )
@@ -162,16 +162,16 @@ class memberFunctions
 
 						IPSMember::save( $member['member_id'], array( 'core' => array( 'members_display_name' => $name, 'members_l_display_name' => mb_strtolower( $name ), 'members_seo_name' => $_seoName ) ) );
 
-						$this->DB->force_data_type = array( 'last_poster_name' => 'string', 'seo_last_name' => 'string' );
+						$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name' ), 'string' );
 						$this->DB->update( 'forums', array( 'last_poster_name' => $name, 'seo_last_name' => $_seoName ), "last_poster_id=" . $member['member_id'] );
 
-						$this->DB->force_data_type = array( 'member_name' => 'string', 'seo_name' => 'string' );
+						$this->DB->setDataType( array( 'member_name', 'seo_name' ), 'string' );
 						$this->DB->update( 'sessions', array( 'member_name' => $name, 'seo_name' => $_seoName ), "member_id=" . $member['member_id'] );
 
-						$this->DB->force_data_type = array( 'starter_name' => 'string', 'seo_first_name' => 'string' );
+						$this->DB->setDataType( array( 'starter_name', 'seo_first_name' ), 'string' );
 						$this->DB->update( 'topics', array( 'starter_name' => $name, 'seo_first_name' => $_seoName ), "starter_id=" . $member['member_id'] );
 
-						$this->DB->force_data_type = array( 'last_poster_name' => 'string', 'seo_last_name' => 'string' );
+						$this->DB->setDataType( array( 'last_poster_name', 'seo_last_name' ), 'string' );
 						$this->DB->update( 'topics', array( 'last_poster_name' => $name, 'seo_last_name' => $_seoName ), "last_poster_id=" . $member['member_id'] );
 					}
 				}
@@ -213,7 +213,7 @@ class memberFunctions
 	 * @param	array	$member			[ Optional Member Array ]
 	 * @param	string  $field			name or members_display_name
 	 * @return	array   Returns an array with 2 keys: 'username' OR 'members_display_name' => the cleaned username, 'errors' => Any errors found
-	 **/
+	 */
 	public function cleanAndCheckName( $name, $member=array(), $field='members_display_name' )
 	{
 		//-----------------------------------------
@@ -553,7 +553,7 @@ class memberFunctions
 			//$name	= str_replace( '|', '&#124;' , $name );
 			
 			/* Remove multiple spaces */
-			$name	= preg_replace( "/\s{2,}/", " ", $name );
+			$name	= preg_replace( '/\s{2,}/', " ", $name );
 		}
 		
 		//-----------------------------------------
@@ -622,10 +622,11 @@ class memberFunctions
 		
 		if( ipsRegistry::$settings['username_characters'] )
 		{
+			$_name = html_entity_decode( $name ); // Fix for bug #30287
 			$check_against = preg_quote( ipsRegistry::$settings['username_characters'], "/" );
 			$check_against = str_replace( '\-', '-', $check_against ); // Fix for bug #20998
 			
-			if( !preg_match( "/^[" . $check_against . "]+$/iu", $name ) )
+			if( !preg_match( "/^[" . $check_against . "]+$/iu", $_name ) )
 			{
 				return array( 'name' => $original, 'errors' => array( str_replace( '{chars}', ipsRegistry::$settings['username_characters'], ipsRegistry::$settings['username_errormsg'] ) ) );
 			}
@@ -670,381 +671,7 @@ class memberFunctions
 		return $unicode_name;
 	}
 
-	/**
-	 * Upload personal photo function
-	 * Assumes all security checks have been performed by this point
-	 *
-	 * @access	public
-	 * @param	integer		[Optional] member id instead of current member
-	 * @return 	array  		[ error (error message), status (status message [ok/fail] ) ]
-	 */
-	public function uploadPhoto( $member_id = 0 )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$return		      = array( 'error'            => '',
-								   'status'           => '',
-								   'final_location'   => '',
-								   'final_width'      => '',
-								   'final_height'     => '',
-								   't_final_location' => '',
-								   't_final_width'    => '',
-								   't_final_height'   => ''  );
-		$delete_photo     = intval( $_POST['delete_photo'] );
-		$member_id        = $member_id ? intval($member_id) : intval( $this->memberData['member_id'] );
-		$real_name        = '';
-		$upload_dir       = '';
-		$final_location   = '';
-		$final_width      = '';
-		$final_height     = '';
-		$t_final_location = '';
-		$t_final_width    = '';
-		$t_final_height   = '';
-		$t_real_name      = '';
-		$t_height		  = 50;
-		$t_width          = 50;
-		
-		if( !$member_id )
-		{
-			return array( 'status' => 'cannot_find_member' );
-		}
-				
-		list($p_max, $p_width, $p_height) = explode( ":", $this->memberData[ 'g_photo_max_vars' ] );
-		
-		$this->settings[ 'disable_ipbsize'] =  0 ;
-		
-		//-----------------------------------------
-		// Sort out upload dir
-		//-----------------------------------------
-
-		/* Fix for bug 5075 */
-		$this->settings['upload_dir'] = str_replace( '&#46;', '.', $this->settings['upload_dir'] );		
-
-		$upload_path  = $this->settings['upload_dir'];
-		
-		# Preserve original path
-		$_upload_path = $this->settings['upload_dir'];
-		
-		//-----------------------------------------
-		// Already a dir?
-		//-----------------------------------------
-		
-		if ( ! file_exists( $upload_path . "/profile" ) )
-		{
-			if ( @mkdir( $upload_path . "/profile", 0777 ) )
-			{
-				@file_put_contents( $upload_path . '/profile/index.html', '' );
-				@chmod( $upload_path . "/profile", 0777 );
-				
-				# Set path and dir correct
-				$upload_path .= "/profile";
-				$upload_dir   = "profile/";
-			}
-			else
-			{
-				# Set path and dir correct
-				$upload_dir   = "";
-			}
-		}
-		else
-		{
-			# Set path and dir correct
-			$upload_path .= "/profile";
-			$upload_dir   = "profile/";
-		}
-		
-		//-----------------------------------------
-		// Deleting the photo?
-		//-----------------------------------------
-		
-		if ( $delete_photo )
-		{
-			$memberData	= IPSMember::load( $member_id );
-			$bwOptions	= IPSBWOptions::thaw( $memberData['fb_bwoptions'], 'facebook' );
-			$bwOptions['fbc_s_pic']	= 0;
-		
-			$this->removeUploadedPhotos( $member_id, $upload_path );
-			
-			IPSMember::save( $member_id, array( 'extendedProfile' => array( 'pp_main_photo'		=> '',
-													  				   	 	'pp_main_width'		=> 0,
-																		   	'pp_main_height'	=> 0,
-																			'pp_thumb_photo'	=> '',
-																			'pp_thumb_width'	=> 0,
-																			'pp_thumb_height'	=> 0,
-																			'fb_photo'			=> '',
-																			'fb_photo_thumb'	=> '',
-																			'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' )
-																		 ) ) );
-			$return['status'] = 'deleted';
-			return $return;
-		}
-		
-		//-----------------------------------------
-		// Lets check for an uploaded photo..
-		//-----------------------------------------
-
-		if ( $_FILES['upload_photo']['name'] != "" and ($_FILES['upload_photo']['name'] != "none" ) )
-		{
-			//-----------------------------------------
-			// Are we allowed to upload this photo?
-			//-----------------------------------------
-			
-			if ( $p_max < 0 )
-			{
-				$return['status'] = 'fail';
-				$return['error']  = 'no_photo_upload_permission';
-			}
-			
-			//-----------------------------------------
-			// Remove any uploaded photos...
-			//-----------------------------------------
-			
-			$this->removeUploadedPhotos( $member_id, $upload_path );
-			
-			$real_name = 'photo-'.$member_id;
-			
-			//-----------------------------------------
-			// Load the library
-			//-----------------------------------------
-			
-			require_once( IPS_KERNEL_PATH.'classUpload.php' );
-			$upload    = new classUpload();
-
-			//-----------------------------------------
-			// Set up the variables
-			//-----------------------------------------
-
-			$upload->out_file_name     = 'photo-'.$member_id;
-			$upload->out_file_dir      = $upload_path;
-			$upload->max_file_size     = $p_max * 1024;
-			$upload->upload_form_field = 'upload_photo';
-			
-			//-----------------------------------------
-			// Populate allowed extensions
-			//-----------------------------------------
-
-			if ( is_array( $this->cache->getCache('attachtypes') ) and count( $this->cache->getCache('attachtypes') ) )
-			{
-				foreach( $this->cache->getCache('attachtypes') as $data )
-				{
-					if ( $data['atype_photo'] )
-					{
-						if( $data['atype_extension'] == 'swf' AND $this->settings['disable_flash'] )
-						{
-							continue;
-						}
-
-						$upload->allowed_file_ext[] = $data['atype_extension'];
-					}
-				}
-			}
-			
-			//-----------------------------------------
-			// Upload...
-			//-----------------------------------------
-			
-			$upload->process();
-			
-			//-----------------------------------------
-			// Error?
-			//-----------------------------------------
-			
-			if ( $upload->error_no )
-			{
-				switch( $upload->error_no )
-				{
-					case 1:
-						// No upload
-						$return['status'] = 'fail';
-						$return['error']  = 'upload_failed';
-					break;
-					case 2:
-						// Invalid file ext
-						$return['status'] = 'fail';
-						$return['error']  = 'invalid_file_extension';
-					break;
-					case 3:
-						// Too big...
-						$return['status'] = 'fail';
-						$return['error']  = 'upload_to_big';
-					break;
-					case 4:
-						// Cannot move uploaded file
-						$return['status'] = 'fail';
-						$return['error']  = 'upload_failed';
-					break;
-					case 5:
-						// Possible XSS attack (image isn't an image)
-						$return['status'] = 'fail';
-						$return['error']  = 'upload_failed';
-					break;
-				}
-				
-				return $return;
-			}
-						
-			//-----------------------------------------
-			// Still here?
-			//-----------------------------------------
-			
-			$real_name   = $upload->parsed_file_name;
-			$t_real_name = $upload->parsed_file_name;
-
-			//-----------------------------------------
-			// Check image size...
-			//-----------------------------------------
-			
-			if ( ! $this->settings['disable_ipbsize'] )
-			{
-				$imageDimensions = getimagesize( $upload_path . '/' . $real_name );
-				
-				//-----------------------------------------
-				// Main photo
-				//-----------------------------------------
-
-				if( $imageDimensions[0] > $p_width OR $imageDimensions[1] > $p_height )
-				{
-					require_once( IPS_KERNEL_PATH."classImage.php" ); 
-					require_once( IPS_KERNEL_PATH."classImageGd.php" );
-					$image = new classImageGd();
-					
-					$image->init( array( 
-										'image_path'	  => $upload_path, 
-										'image_file'	  => $real_name, 
-								)	);
-                    
-					$return = $image->resizeImage( $p_width, $p_height );
-					$image->writeImage( $upload_path . '/' . 'photo-'.$member_id . '.' . $upload->file_extension );
-                    
-					$t_real_name = $return['thumb_location'] ? $return['thumb_location'] : $real_name;
-                    
-					$im['img_width']  = $return['newWidth'] ? $return['newWidth'] : $image->cur_dimensions['width'];
-					$im['img_height'] = $return['newHeight'] ? $return['newHeight'] : $image->cur_dimensions['height'];
-
-				}
-				else
-				{
-					$im['img_width']  = $imageDimensions[0];
-					$im['img_height'] = $imageDimensions[1];
-						
-				}
-
-				//-----------------------------------------
-				// MINI photo
-				//-----------------------------------------
-
-				if( $imageDimensions[0] > $t_width OR $imageDimensions[1] > $t_height )
-				{
-
-					require_once( IPS_KERNEL_PATH . "classImage.php" ); 
-					require_once( IPS_KERNEL_PATH . "classImageGd.php" );
-                    
-					$image = new classImageGd();
-					
-					$image->init( array( 
-										'image_path'	  => $upload_path, 
-										'image_file'	  => $t_real_name, 
-								)	);
-                    
-					$return = $image->resizeImage( $t_width, $t_height );
-					$image->writeImage( $upload_path . '/' . 'photo-thumb-'.$member_id . '.' . $upload->file_extension );
-                    
-					$t_im['img_width']	  = $return['newWidth'];
-					$t_im['img_height']	  = $return['newHeight'];
-					$t_im['img_location'] = count($return) ? 'photo-thumb-'.$member_id . '.' . $upload->file_extension : $real_name;
-				} 
-				else 
-				{
-					$_data = IPSLib::scaleImage( array( 
-														'max_height' => $t_height,
-														'max_width'  => $t_width,
-														'cur_width'  => $im['img_width'],
-														'cur_height' => $im['img_height'] 
-												)	);
-					
-					$t_im['img_width']		= $_data['img_width'];
-					$t_im['img_height']		= $_data['img_height'];
-					$t_im['img_location']	= $real_name;
-				}
-			}
-			else
-			{
-				//-----------------------------------------
-				// Main photo
-				//-----------------------------------------
-				
-				$w = intval($this->request['man_width'])  ? intval($this->request['man_width'])  : $p_width;
-				$h = intval($this->request['man_height']) ? intval($this->request['man_height']) : $p_height;
-				$im['img_width']  = $w > $p_width  ? $p_width  : $w;
-				$im['img_height'] = $h > $p_height ? $p_height : $h;
-				
-				//-----------------------------------------
-				// Mini photo
-				//-----------------------------------------
-				
-				$_data = IPSLib::scaleImage( array( 'max_height' => $t_height,
-															  'max_width'  => $t_width,
-															  'cur_width'  => $im['img_width'],
-															  'cur_height' => $im['img_height'] ) );
-				
-				$t_im['img_width']  	= $_data['img_width'];
-				$t_im['img_height']		= $_data['img_height'];
-				$t_im['img_location']	= $real_name;
-			}
-			
-			//-----------------------------------------
-			// Check the file size (after compression)
-			//-----------------------------------------
-			
-			if ( filesize( $upload_path . "/" . $real_name ) > ( $p_max * 1024 ) )
-			{
-				@unlink( $upload_path . "/" . $real_name );
-				
-				// Too big...
-				$return['status'] = 'fail';
-				$return['error']  = 'upload_to_big';
-				return $return;
-			}
-			
-			//-----------------------------------------
-			// Main photo
-			//-----------------------------------------
-			
-			$final_location = $upload_dir . $real_name;
-			$final_width    = $im['img_width'];
-			$final_height   = $im['img_height'];
-			
-			//-----------------------------------------
-			// Mini photo
-			//-----------------------------------------
-			
-			$t_final_location = $upload_dir . $t_im['img_location'];
-			$t_final_width    = $t_im['img_width'];
-			$t_final_height   = $t_im['img_height'];
-		}
-		else
-		{
-			$return['status'] = 'ok';
-			return $return;
-		}
-		
-		//-----------------------------------------
-		// Return...
-		//-----------------------------------------
-		
-		$return['final_location']   = $final_location;
-		$return['final_width']      = $final_width;
-		$return['final_height']     = $final_height;
-		
-		$return['t_final_location'] = $t_final_location;
-		$return['t_final_width']    = $t_final_width;
-		$return['t_final_height']   = $t_final_height;
-		
-		$return['status'] = 'ok';
-		return $return;
-	}
+	
 	
 	/**
 	 * Upload background image
@@ -1093,10 +720,10 @@ class memberFunctions
 		
 		if ( ! file_exists( $upload_path . "/bgimages" ) )
 		{
-			if ( @mkdir( $upload_path . "/bgimages", 0777 ) )
+			if ( @mkdir( $upload_path . "/bgimages", IPS_FOLDER_PERMISSION ) )
 			{
 				@file_put_contents( $upload_path . '/bgimages/index.html', '' );
-				@chmod( $upload_path . "/bgimages", 0777 );
+				@chmod( $upload_path . "/bgimages", IPS_FOLDER_PERMISSION );
 				
 				# Set path and dir correct
 				$upload_path .= "/bgimages";
@@ -1143,7 +770,7 @@ class memberFunctions
 			// Load the library
 			//-----------------------------------------
 			
-			require_once( IPS_KERNEL_PATH.'classUpload.php' );
+			require_once( IPS_KERNEL_PATH.'classUpload.php' );/*noLibHook*/
 			$upload    = new classUpload();
 
 			//-----------------------------------------
@@ -1159,21 +786,7 @@ class memberFunctions
 			// Populate allowed extensions
 			//-----------------------------------------
 
-			if ( is_array( $this->cache->getCache('attachtypes') ) and count( $this->cache->getCache('attachtypes') ) )
-			{
-				foreach( $this->cache->getCache('attachtypes') as $data )
-				{
-					if ( $data['atype_photo'] )
-					{
-						if( $data['atype_extension'] == 'swf' AND $this->settings['disable_flash'] )
-						{
-							continue;
-						}
-
-						$upload->allowed_file_ext[] = $data['atype_extension'];
-					}
-				}
-			}
+			$upload->allowed_file_ext  = array( 'gif', 'png', 'jpg', 'jpeg' );
 			
 			//-----------------------------------------
 			// Upload...
@@ -1263,61 +876,6 @@ class memberFunctions
 		return $return;
 	}
 	
-	/**
-	 * Remove member uploaded photos
-	 *
-	 * @access	public
-	 * @param	integer		Member ID
-	 * @param	string		[Optional] Directory to check
-	 * @return 	array  		[ error (error message), status (status message [ok/fail] ) ]
-	 */
-	public function removeUploadedPhotos( $id, $upload_path='' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$upload_path = $upload_path ? $upload_path : $this->settings['upload_dir'];
-
-		//-----------------------------------------
-		// Already a dir?
-		//-----------------------------------------
-		
-		if ( ! file_exists( $upload_path . "/profile" ) )
-		{
-			if ( @mkdir( $upload_path . "/profile", 0777 ) )
-			{
-				@file_put_contents( $upload_path . '/index.html', '' );
-				@chmod( $upload_path . "/profile", 0777 );
-				
-				# Set path and dir correct
-				$upload_path .= "/profile";
-			}
-		}
-		else
-		{
-			# Set path and dir correct
-			$upload_path .= "/profile";
-			
-			//-----------------------------------------
-			// Only try to delete if we didn't just create dir
-			//-----------------------------------------
-			
-			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-			{
-				if ( @file_exists( $upload_path."/photo-".$id.".".$ext ) )
-				{
-					@unlink( $upload_path."/photo-".$id.".".$ext );
-				}
-				
-				if ( @file_exists( $upload_path."/photo-thumb-".$id.".".$ext ) )
-				{
-					@unlink( $upload_path."/photo-thumb-".$id.".".$ext );
-				}
-			}
-		}
-	}
-	
 	/**
 	 * Remove member uploaded background images
 	 *
@@ -1340,10 +898,10 @@ class memberFunctions
 		
 		if ( ! file_exists( $upload_path . "/bgimages" ) )
 		{
-			if ( @mkdir( $upload_path . "/bgimages", 0777 ) )
+			if ( @mkdir( $upload_path . "/bgimages", IPS_FOLDER_PERMISSION ) )
 			{
 				@file_put_contents( $upload_path . '/index.html', '' );
-				@chmod( $upload_path . "/bgimages", 0777 );
+				@chmod( $upload_path . "/bgimages", IPS_FOLDER_PERMISSION );
 				
 				# Set path and dir correct
 				$upload_path .= "/bgimages";
@@ -1361,7 +919,7 @@ class memberFunctions
 			
 			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
 			{
-				if ( @file_exists( $upload_path."/bgimg-".$id.".".$ext ) )
+				if ( @is_file( $upload_path."/bgimg-".$id.".".$ext ) )
 				{
 					@unlink( $upload_path."/bgimg-".$id.".".$ext );
 				}
@@ -1369,483 +927,4 @@ class memberFunctions
 		}
 	}
 	
-	/**
-	 * Remove member's avatar
-	 *
-	 * @access	public
-	 * @param	int			Member's ID
-	 * @return	mixed		Exception or true
-	 * <code>
-	 * Exception Codes:
-	 * NO_MEMBER_ID:					A valid member ID was not passed.
-	 * NO_PERMISSION:				You do not have permission to change the avatar
-	 * </code>
-	 */
-	public function removeAvatar( $member_id )
-	{
-		//-----------------------------------------
-		// Get member
-		//-----------------------------------------
-		
-		$member = IPSMember::load( $member_id, 'extendedProfile, groups' );
-																	
-		if ( ! $member['member_id'] )
-		{
-			throw new Exception( "NO_MEMBER_ID" );
-		}
-
-		//-----------------------------------------
-		// Allowed to upload pics for administrators?
-		//-----------------------------------------
-		
-		if ( IPS_AREA != 'public' )
-		{
-			if ( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_photo_admin', 'members', 'members' ) )
-			{
-				throw new Exception( "NO_PERMISSION" );
-			}
-		}
-		
-		//-----------------------------------------
-		// Actaully remove it..
-		//-----------------------------------------
-
-		if ( $member['avatar_type'] == 'upload' )
-		{
-			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-			{
-				if ( @file_exists( $this->settings['upload_dir'] . "/av-" . $member_id . "." . $ext ) )
-				{
-					@unlink( $this->settings['upload_dir'] . "/av-" . $member_id . "." . $ext );
-				}
-			}
-		}
-		
-		IPSMember::save( $member_id, array( 'extendedProfile' => array( 'avatar_type' => '', 'avatar_location' => '', 'avatar_size' => '' ) ) );
-		
-		if ( IPS_AREA != 'public' )
-		{
-			$this->registry->getClass('adminFunctions')->saveAdminLog("Member's avatar removed ( member_id: {$member_id} )");
-		}
-		
-		return TRUE;
-	}
-	/**
-	 * Saves the member's avatar
-	 *
-	 * @param		INT			Member's ID to save
-	 * @param		string		Upload field name [Default is "upload_avatar"]
-	 * @param		string		Avatar URL Field [Default is "avatar_url"]
-	 * @param		string		Gallery Avatar Directory Field [Default is "avatar_gallery"]
-	 * @param		string		Gallery Avatar Image Field [Default is "avatar_image"]
-	 * @author		Brandon Farber, Stolen By Matt 'Haxor' Mecham
-	 * <code>
-	 * Excepton Codes:
-	 * NO_MEMBER_ID:				A valid member ID was not passed.
-	 * NO_PERMISSION:				You do not have permission to change the avatar
-	 * UPLOAD_NO_IMAGE:				Nothing to upload
-	 * UPLOAD_INVALID_FILE_EXT:		Incorrect file extension (not an image)
-	 * UPLOAD_TOO_LARGE:			Upload is larger than allowed
-	 * UPLOAD_CANT_BE_MOVED:		Upload cannot be moved into the uploads directory
-	 * UPLOAD_NOT_IMAGE:			Upload is not an image, despite what the file extension says!
-	 * NO_AVATAR_TO_SAVE:			Nothing to save!
-	 * </code>
-	 */
-	public function saveNewAvatar( $member_id, $uploadFieldName='upload_avatar', $urlFieldName='avatar_url', $galleryFieldName='avatar_gallery', $avatarGalleryImage='avatar_image', $gravatarFieldName='gravatar_email' )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$avatar						= array();
-		list($p_width, $p_height)	= explode( "x", strtolower( $this->settings['avatar_dims'] ) );
-
-		if ( ! $member_id )
-		{
-			throw new Exception( "NO_MEMBER_ID" );
-		}
-
-		$member = IPSMember::load( $member_id, 'extendedProfile,groups' );
-
-		if ( ! $member['member_id'] )
-		{
-			throw new Exception( "NO_MEMBER_ID" );
-		}
-
-		//-----------------------------------------
-		// Allowed to upload pics for administrators?
-		//-----------------------------------------
-		
-		if ( IPS_AREA != 'public' )
-		{
-			if ( $member['g_access_cp'] AND !$this->registry->getClass('class_permissions')->checkPermission( 'member_photo_admin', 'members', 'members' ) )
-			{
-				throw new Exception( "NO_PERMISSION" );
-			}
-		}
-
-		//-----------------------------------------
-		// Upload?
-		//-----------------------------------------
-
-		if( $_FILES[$uploadFieldName]['name'] != "" AND $_FILES[$uploadFieldName]['name'] != "none" )
-		{
-			$this->settings[ 'upload_dir'] =  str_replace( '&#46;', '.', $this->settings['upload_dir']  );
-
-			$real_name = 'av-' . $member_id;
-
-			require_once( IPS_KERNEL_PATH.'classUpload.php' );
-			$upload = new classUpload();
-
-			$upload->out_file_name     = $real_name;
-			$upload->out_file_dir      = $this->settings['upload_dir'];
-			$upload->max_file_size     = $this->settings['avup_size_max'] * 1024;
-			$upload->upload_form_field = $uploadFieldName;
-
-			//-----------------------------------------
-			// Populate allowed extensions
-			//-----------------------------------------
-
-			if ( is_array( $this->cache->getCache('attachtypes') ) and count( $this->cache->getCache('attachtypes') ) )
-			{
-				foreach( $this->cache->getCache('attachtypes') as $data )
-				{
-					if ( $data['atype_photo'] )
-					{
-						if( $data['atype_extension'] == 'swf' AND $this->settings['disable_flash'] )
-						{
-							continue;
-						}
-
-						$upload->allowed_file_ext[] = $data['atype_extension'];
-					}
-				}
-			}
-
-			//-----------------------------------------
-			// Upload...
-			//-----------------------------------------
-
-			$upload->process();
-
-			//-----------------------------------------
-			// Error?
-			//-----------------------------------------
-
-			if ( $upload->error_no )
-			{
-				switch( $upload->error_no )
-				{
-					case 1:
-						// No upload
-						throw new Exception("UPLOAD_NO_IMAGE");
-					break;
-					case 2:
-						// Invalid file ext
-						throw new Exception("UPLOAD_INVALID_FILE_EXT");
-					break;
-					case 3:
-						// Too big...
-						throw new Exception("UPLOAD_TOO_LARGE");
-					break;
-					case 4:
-						// Cannot move uploaded file
-						throw new Exception("UPLOAD_CANT_BE_MOVED");
-					break;
-					case 5:
-						// Possible XSS attack (image isn't an image)
-						throw new Exception("UPLOAD_NOT_IMAGE");
-					break;
-				}
-			}
-
-			$real_name	= $upload->parsed_file_name;
-			$im			= array();
-
-			if ( ! $this->settings['disable_ipbsize'] and $upload->file_extension != '.swf' )
-			{
-				$imageDimensions = getimagesize( $this->settings['upload_dir'] . '/' . $real_name );
-				
-				if( $imageDimensions[0] > $p_width OR $imageDimensions[1] > $p_height )
-				{
-					require_once( IPS_KERNEL_PATH."classImage.php" ); 
-					require_once( IPS_KERNEL_PATH."classImageGd.php" );
-					$image = new classImageGd();
-	
-					$image->init( array( 
-					                         'image_path'     => $this->settings['upload_dir'], 
-					                         'image_file'     => $real_name, 
-					               )          );
-	
-					$return = $image->resizeImage( $p_width, $p_height );
-					$image->writeImage( $this->settings['upload_dir'] . '/' . $real_name );
-	
-					$im['img_width']  = $return['newWidth'] ? $return['newWidth'] : $image->cur_dimensions['width'];
-					$im['img_height'] = $return['newHeight'] ? $return['newHeight'] : $image->cur_dimensions['height'];
-				}
-				else
-				{
-					$im['img_width']  = $imageDimensions[0];
-					$im['img_height'] = $imageDimensions[1];
-				}
-			}
-			else
-			{	
-				$w 					= intval($this->request['man_width'])  ? intval($this->request['man_width'])  : $p_width;
-				$h 					= intval($this->request['man_height']) ? intval($this->request['man_height']) : $p_height;
-				$im['img_width']	= $w > $p_width  ? $p_width  : $w;
-				$im['img_height']	= $h > $p_height ? $p_height : $h;
-			}
-
-			//-----------------------------------------
-			// Set the "real" avatar..
-			//-----------------------------------------
-
-			$avatar['avatar_location']		= $real_name;
-			$avatar['avatar_size']			= $im['img_width'].'x'.$im['img_height'];
-			$avatar['avatar_type']			= 'upload';
-		}
-
-		//-----------------------------------------
-		// URL?
-		//-----------------------------------------
-
-		else if( $this->request[ $urlFieldName ] AND IPSText::xssCheckUrl( $this->request[ $urlFieldName ] ) === true )
-		{
-			$ext 		= explode ( ",", $this->settings['avatar_ext'] );
-			$checked 	= 0;
-			$av_ext 	= preg_replace( "/^.*\.(\S+)$/", "\\1", $this->request[$urlFieldName] );
-
-			foreach( $ext as $v  )
-			{
-				if( strtolower( $v ) == strtolower( $av_ext ) )
-				{
-					if( $v == 'swf' AND $this->settings['disable_flash'] )
-					{
-						throw new Exception("INVALID_FILE_EXT");
-					}
-					
-					$checked = 1;
-					break;
-				}
-			}
-			
-			if( $checked != 1 )
-			{
-				throw new Exception("INVALID_FILE_EXT");
-			}
-			
-			if ( ! $this->settings['disable_ipbsize'] )
-			{
-				if ( ! $img_size = @getimagesize( $this->request[$urlFieldName] ) )
-				{
-					$img_size[0] = $p_width;
-					$img_size[1] = $p_height;
-				}
-
-				$im = IPSLib::scaleImage( array(
-												'max_width'  => $p_width,
-												'max_height' => $p_height,
-												'cur_width'  => $img_size[0],
-												'cur_height' => $img_size[1]
-										)		);
-			}
-			else
-			{	
-				$w					= intval($this->request['man_width'])  ? intval($this->request['man_width'])  : $p_width;
-				$h					= intval($this->request['man_height']) ? intval($this->request['man_height']) : $p_height;
-				$im['img_width']	= $w > $p_width  ? $p_width  : $w;
-				$im['img_height']	= $h > $p_height ? $p_height : $h;
-			}
-
-			$avatar['avatar_location']		= trim( $this->request[ $urlFieldName ] );
-			$avatar['avatar_size']			= $im['img_width'].'x'.$im['img_height'];
-			$avatar['avatar_type']			= 'url';
-		}
-
-		//-----------------------------------------
-		// Local image?
-		//-----------------------------------------
-
-		else if( isset($this->request[ $galleryFieldName ]) AND $this->request[ $avatarGalleryImage ] )
-		{
-			$directory	= '';
-
-			if( $this->request[$galleryFieldName] )
-			{
-				$directory						= preg_replace( "/[^\s\w_-]/", "", urldecode( $this->request[$galleryFieldName] ) );
-				
-				if( $directory )
-				{
-					$directory .= '/';
-				}
-			}
-			
-			// BUG #20822
-			if( function_exists( 'mb_ereg_replace' ) )
-			{
-				$filename						= mb_ereg_replace( "/[^\s\w\._\-\[\]\(\)]/", "", urldecode( $this->request[$avatarGalleryImage] ) );
-			}
-			else
-			{
-				$filename						= preg_replace( "/[^\s\w\._\-\[\]\(\)]/", "", urldecode( $this->request[$avatarGalleryImage] ) );
-			}
-
-			if( file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_avatars/' . $directory . $filename ) )
-			{
-				$avatar['avatar_location']		= $directory . $filename;
-				$avatar['avatar_size']			= '';
-				$avatar['avatar_type']			= 'local';
-			}
-		}
-		
-		else if( $this->request[ $gravatarFieldName ] && $this->request[ $gravatarFieldName ] && $this->settings['allow_gravatars'] )
-		{
-			$avatar['avatar_location']          = strtolower($this->request[ $gravatarFieldName ]);
-			$avatar['avatar_type']              = 'gravatar';
-		}
-
-		//-----------------------------------------
-		// No avatar image?
-		//-----------------------------------------
-
-		if ( ! count($avatar) )
-		{
-			throw new Exception("NO_AVATAR_TO_SAVE");
-		}
-
-		//-----------------------------------------
-		// Remove old uploaded avatars if needed
-		//-----------------------------------------
-
-		else if( $avatar['avatar_type'] != 'upload' )
-		{
-			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-			{
-				if ( @file_exists( $this->settings['upload_dir'] . "/av-" . $member_id . "." . $ext ) )
-				{
-					@unlink( $this->settings['upload_dir'] . "/av-" . $member_id . "." . $ext );
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// Store and redirect
-		//-----------------------------------------
-
-		IPSMember::save( $member_id, array( 'extendedProfile' => $avatar ) );
-
-		return TRUE;
-	}
-	
-	/**
-	 * Grab all images within a particular avatar gallery directory
-	 *
-	 * @access	public
-	 * @param	string		Selected category name
-	 * @return	array 		Array of image names
-	 */
-	public function getHostedAvatarsFromCategory( $catName )
-	{
-		$catName = IPSText::alphanumericalClean( $catName, ' ' ); // Commented out because alphanumericalClean removes spaces
-		$images	 = array();
-		$path    = '';
-		
-		if ( ! $catName )
-		{
-			$path = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_avatars';
-		}
-		else if ( $catName == 'none' )
-		{
-			return '';
-		}
-		else
-		{
-			$path = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_avatars/' . $catName;
-		}
-
-		if ( ! is_dir( $path ) )
-		{
-			return FALSE;
-		}
-		try
-		{
-			foreach( new DirectoryIterator( $path ) as $file )
-			{
-				if ( ! $file->isDot() AND $file->isFile() AND strpos( $file->getFilename(), '.' ) !== 0 )
-				{
-					$_name = $file->getFilename();
-					
-					$image_properties = @getimagesize( $path . '/' . $_name );
-					
-					if( is_array($image_properties) AND count($image_properties) AND isset($image_properties[2]) )
-					{
-						$images[] = $_name;
-					}
-				}
-			}
-		} catch ( Exception $e ) {}
-		
-		natcasesort($images);
-		
- 		//usort( $images, array( $this, '_sortAvatars' ) );
- 		reset( $images );
-
-		return $images;
-	}
-	
-	/**
-	 * Grab all hosted avatar gallery directories
-	 *
-	 * @access	public
-	 * @author	Brandon Farber, Matt Mecham
-	 * @return	array 	Array of hosted avatar cats
-	 */
-	public function getHostedAvatarCategories()
-	{
-		$av_categories = array();
-		
-		if( is_dir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_avatars' ) )
-		{
-			try
-			{
-				foreach( new DirectoryIterator( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_avatars' ) as $file )
-				{
-					if ( ! $file->isDot() AND $file->isDir() )
-					{
-						$_name = $file->getFileName();
-						
-						if ( substr( $_name, 0, 1 ) != '.' )
-						{
-							$av_categories[] = array( $_name, str_replace( "_", " ", $_name ) );
-						}
-					}
-				}
-			} catch ( Exception $e ) {}
-			
-			usort( $av_categories, array( $this, '_sortAvatars' ) );
-			reset( $av_categories );
-		}
-
-		return $av_categories;
-	}
-	
-	/**
-	 * usort method for avatar categories
-	 *
-	 * @access	private
-	 * @param	string		A string to compare
-	 * @param	string		B string to compare
-	 * @return	void		Sort order algorithm
-	 */
-	private function _sortAvatars( $a, $b )
- 	{
- 		$aa = mb_strtolower($a[1]);
- 		$bb = mb_strtolower($b[1]);
- 		
- 		if ( $aa == $bb ) return 0;
- 		
- 		return ( $aa > $bb ) ? 1 : -1;
- 	}
-	
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/member/notifications.php b/upload/admin/sources/classes/member/notifications.php
index c1edb44f..7d36a468 100644
--- a/upload/admin/sources/classes/member/notifications.php
+++ b/upload/admin/sources/classes/member/notifications.php
@@ -3,20 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Notification library
- * Last Updated: $Date: 2010-10-08 10:15:14 -0400 (Fri, 08 Oct 2010) $
+ * Last Updated: $Date: 2011-09-29 10:45:02 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: mark $ (Original: bfarber)
+ * @author 		$Author: mmecham $ (Original: bfarber)
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thursday Jan 7, 2010
- * @version		$Revision: 6956 $
+ * @version		$Revision: 9565 $
  *
- * @todo 		Need to push Downloads, Blog and Gallery into new system
  */
 
 /**
@@ -50,6 +49,14 @@ class notifications
 	 */
 	protected $_member				= array();
 	
+	/**
+	 * Multiple Recipients
+	 *
+	 * @access	protected
+	 * @var		array
+	 */
+	protected $_recipients			= array();
+	
 	/**
 	 * From member data (usually $this->memberData)
 	 *
@@ -80,7 +87,8 @@ class notifications
 	 * @access	protected
 	 * @var		string
 	 */
-	protected $_notificationText	= '';
+	protected $_notificationText_forDisplay	= '';
+	protected $_notificationText_forEmails	= '';
 
 	/**
 	 * Notification title
@@ -97,13 +105,25 @@ class notifications
 	 * @var		string
 	 */
 	protected $_notificationUrl		= '';
+	
+	/**
+	 * Send EMails as HTML
+	 *
+	 * @var		bool
+	 */
+	protected $_mail_html_on		= FALSE;
 
+	protected $_metaData			= array();
+	protected $_appClass			= array();
+	protected $_showInlinePopUp     = array();
+	protected $_blockedFromInline   = array();
+	
 	/**
 	 * CONSTRUCTOR
 	 *
 	 * @param  blog_show $class
 	 * @return void
-	 **/
+	 */
 	public function __construct( ipsRegistry $registry )
 	{
 		/* Make registry objects */
@@ -122,28 +142,50 @@ class notifications
 		//-----------------------------------------
 		
 		$this->_from		= $this->memberData;
+		
+		/* We only really force the inline pop-up for PMs currently
+		 * loosely hardcoded this so it can change at some point
+		 */
+		$this->_showInlinePopUp = array( 'new_private_message', 'reply_private_message' );
+		
+		/* We don't want any PM notifications to show on the inline list
+		 * so we can loosely hardcode this too
+		 */
+		$this->_blockedFromInline = array( 'new_private_message', 'reply_private_message', 'invite_private_message' );
 	}
 	
 	/**
-	 * Get HTML for board index hook
-	 *
-	 * @access	public
-	 * @return	string
+	 * @return the $_blockedFromInline
 	 */
-	public function getBoardIndexHook()
+	public function getBlockedFromInline()
 	{
-		$_notifications	= $this->fetchUnreadNotifications(10, 'notify_sent', 'DESC');
-		
-		//-----------------------------------------
-		// If none are unread, no HTML
-		//-----------------------------------------
-		
-		if( !count($_notifications) )
+		return ( is_array( $this->_blockedFromInline ) ) ? $this->_blockedFromInline : false;
+	}
+	
+	/**
+	 * @return the $_meta_data
+	 */
+	public function getMetaData()
+	{
+		return ( is_array( $this->_metaData ) && ! empty( $this->_metaData['meta_app'] ) ) ? $this->_metaData : false;
+	}
+
+	/**
+	 * @param array $_meta_data
+	 */
+	public function setMetaData( array $_metaData )
+	{
+		if ( empty( $_metaData['meta_app'] ) )
 		{
-			return '';
+			$_metaData['meta_app'] = IPS_APP_COMPONENT;
 		}
 		
-		return $this->registry->output->getTemplate('boards')->hookUnreadNotifications( $_notifications );
+		if ( empty( $_metaData['meta_area'] ) )
+		{
+			$_metaData['meta_area'] = $this->_notificationKey;
+		}
+		
+		$this->_metaData = $_metaData;
 	}
 
 	/**
@@ -151,30 +193,42 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	mixed		Member id (int) or member data (array)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setMember( $member )
 	{
-		if( is_int($member) )
+		if( is_numeric($member) )
 		{
-			$member	= IPSMember::load( $member );
+			$member	= IPSMember::load( intval($member) );
 		}
 		
 		$this->_member	= $member;
 	}
 	
+	/**
+	 * Set Multiple Recipients
+	 * Use to CC the notification Email rather than send to each individually
+	 *
+	 * @param	array		Recipients. Each element should be an array of member data or an Email address - NOT a member id
+	 * @return	@e void
+	 */
+	public function setMultipleRecipients( $recipients )
+	{
+		$this->_recipients = $recipients;
+	}
+	
 	/**
 	 * Set member message should come 'from'
 	 *
 	 * @access	public
 	 * @param	mixed		Member id (int) or member data (array)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setFrom( $member )
 	{
-		if( is_int($member) )
+		if( is_numeric($member) )
 		{
-			$member	= IPSMember::load( $member );
+			$member	= IPSMember::load( intval($member) );
 		}
 		
 		$this->_from	= $member;
@@ -185,7 +239,7 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	string		Notification type key
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setNotificationKey( $key )
 	{
@@ -197,7 +251,7 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	string		Notification URL
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setNotificationUrl( $url )
 	{
@@ -209,11 +263,26 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	string		Text
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setNotificationText( $text )
 	{
-		$this->_notificationText	= $text;
+		$this->_notificationText_forDisplay	= $text;
+		$this->_notificationText_forEmails	= $text;
+	}
+	
+	/**
+	 * Set notification text
+	 *
+	 * @access	public
+	 * @param	string		Text for display
+	 * @param	string		Text for Emails
+	 * @return	@e void
+	 */
+	public function setMultipleNotificationTexts( $forDisplay, $forEmails )
+	{
+		$this->_notificationText_forDisplay	= $forDisplay;
+		$this->_notificationText_forEmails	= $forEmails;
 	}
 	
 	/**
@@ -221,13 +290,25 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	string		Title
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setNotificationTitle( $title )
 	{
 		$this->_notificationTitle	= $title;
 	}
 	
+	/**
+	 * Set HTML Email Support
+	 *
+	 * @access	public
+	 * @param	bool		If true, Emails will be sent with HTML support
+	 * @return	@e void
+	 */
+	public function setHtmlEmails( $html_on )
+	{
+		$this->_mail_html_on		= $html_on;
+	}
+	
 	/**
 	 * Get all notification types
 	 *
@@ -263,45 +344,60 @@ class notifications
 		// Get for each application
 		//-----------------------------------------
 		
-		foreach( ipsRegistry::$applications as $app_dir => $application )
+		foreach( IPSLib::getEnabledApplications() as $app_dir => $application )
 		{
-			if( IPSLib::appIsInstalled( $app_dir) )
+			$newLocation = IPSLib::getAppDir( $app_dir ) . '/extensions/notifications/config.php';
+			$oldLocation = IPSLib::getAppDir( $app_dir ) . '/extensions/notifications.php';
+			
+			if ( ! is_file( $newLocation ) )
 			{
-				if( file_exists( IPSLib::getAppDir( $app_dir ) . '/extensions/notifications.php' ) )
+				$newLocation = $oldLocation;
+			}
+			
+			if ( is_file( $newLocation ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $newLocation, $app_dir . '_notifications', $app_dir );
+				
+				if ( class_exists( $classToLoad ) )
 				{
-					require_once( IPSLib::getAppDir( $app_dir ) . '/extensions/notifications.php' );
-					
-					$className = $app_dir . '_notifications';
-					
-					if ( class_exists( $className ) )
+					$class = new $classToLoad();
+					$class->memberData = ipsRegistry::member()->fetchMemberData();
+						
+					$_NOTIFY	= $class->getConfiguration();
+
+					if ( $checkCallbacks )
 					{
-						$class = new $className();
-						$class->memberData = ipsRegistry::member()->fetchMemberData();
-							
-						$_NOTIFY = $class->getConfiguration();
-							
-						if ( $checkCallbacks )
+						foreach( $_NOTIFY as $n )
 						{
-							foreach ( $_NOTIFY as $n )
+							$n['app']	= $app_dir;
+
+							if ( $n['show_callback'] and method_exists( $class, $n['key'] ) )
 							{
-								if ( $n['show_callback'] and method_exists( $class, $n['key'] ) )
-								{
-									if ( $class->$n['key']() )
-									{
-										$this->_notificationData[] = $n;
-									}
-								}
-								else
+								if ( $class->$n['key']() )
 								{
 									$this->_notificationData[] = $n;
 								}
 							}
+							else
+							{
+								$this->_notificationData[] = $n;
+							}
 						}
-						else
+					}
+					else
+					{
+						$_NEW		= array();
+						
+						foreach( $_NOTIFY as $notify )
 						{
-							$this->_notificationData    = ( is_array( $this->_notificationData ) ) ? $this->_notificationData : array();
-							$this->_notificationData	= array_merge( $this->_notificationData, $_NOTIFY );
+							$notify['app']	= $app_dir;
+							$_NEW[]			= $notify;
 						}
+						
+						$_NOTIFY	= $_NEW;
+						
+						$this->_notificationData    = ( is_array( $this->_notificationData ) ) ? $this->_notificationData : array();
+						$this->_notificationData	= array_merge( $this->_notificationData, $_NOTIFY );
 					}
 				}
 			}
@@ -313,22 +409,24 @@ class notifications
 	/**
 	 * Format the notification data as if it were configured
 	 *
-	 * @access	public
+	 * @param	bool	Retain current config?
 	 * @return	array
 	 */
-	public function formatNotificationData()
+	public function formatNotificationData( $retain=false )
 	{
 		$_data		= $this->getNotificationData();
+		$_defaults	= $this->cache->getCache('notifications');
 		$_return	= array();
 
 		foreach( $_data as $data )
 		{
 			$_return[ $data['key'] ]						= array();
-			$_return[ $data['key'] ]['selected']			= $data['default'];
-			$_return[ $data['key'] ]['disabled']			= $data['disabled'];
-			$_return[ $data['key'] ]['disable_override']	= 0;
+			$_return[ $data['key'] ]['selected']			= $retain ? ( isset($_defaults[ $data['key'] ]['selected']) ? $_defaults[ $data['key'] ]['selected'] : $data['default'] ) : $data['default'];
+			$_return[ $data['key'] ]['disabled']			= $retain ? ( isset($_defaults[ $data['key'] ]['disabled']) ? $_defaults[ $data['key'] ]['disabled'] : $data['disabled'] ) : $data['disabled'];
+			$_return[ $data['key'] ]['disable_override']	= $retain ? ( isset($_defaults[ $data['key'] ]['disable_override']) ? $_defaults[ $data['key'] ]['disable_override'] : 0 ) : 0;
+			$_return[ $data['key'] ]['app']					= $data['app'];
 		}
-		
+
 		return $_return;
 	}
 	
@@ -348,7 +446,7 @@ class notifications
 	 *
 	 * @access	public
 	 * @param	array 	Notification configuration
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveNotificationConfig( $config )
 	{
@@ -358,26 +456,27 @@ class notifications
 	/**
 	 * Rebuild notifications cache
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildNotificationsCache()
 	{
-		$this->saveNotificationConfig( $this->formatNotificationData() );
+		$this->saveNotificationConfig( $this->formatNotificationData( true ) );
 	}
 	
 	/**
 	 * Get the member's notification configuration
 	 *
 	 * @access	public
+	 * @param	array		Member data
 	 * @return	array
 	 * @link	http://community.invisionpower.com/tracker/issue-23529-notification-defaults-dont-apply/
 	 * @link	http://community.invisionpower.com/tracker/issue-23663-notification-issues/
 	 */
-	public function getMemberNotificationConfig()
+	public function getMemberNotificationConfig( $member )
 	{
-		$_cache	= IPSMember::unpackMemberCache( $this->_member['members_cache'] );
+		$_cache	= !empty($member['members_cache']) ? IPSMember::unpackMemberCache( $member['members_cache'] ) : array();
 		
-		if( $_cache['notifications'] )
+		if( !empty($_cache['notifications']) )
 		{
 			$savedTypes		= array_keys( $_cache['notifications'] );
 			$_default		= $this->getDefaultNotificationConfig();
@@ -440,70 +539,141 @@ class notifications
 	 */
 	public function sendNotification()
 	{
-		if( !$this->_member['member_id'] )
-		{
-			throw new Exception( 'NO_MEMBER_ID' );
-		}
-		
-		if( !$this->_notificationKey )
-		{
-			throw new Exception( 'NO_NOTIFY_KEY' );
-		}
-		
-		$_config	= $this->getMemberNotificationConfig();
-
-		if( !$_config[ $this->_notificationKey ] )
-		{
-			throw new Exception( 'BAD_NOTIFY_KEY' );
-		}
-
+		$recipients = array();
+	
 		//-----------------------------------------
-		// Send appropriate notifications.
-		// We can have more than one notification method for each
-		//	notification type.
+		// Who are we sending this to?
 		//-----------------------------------------
-
-		if( is_array($_config[ $this->_notificationKey ]) AND count($_config[ $this->_notificationKey ]) )
+		
+		if ( !empty( $this->_recipients ) )
 		{
-			foreach( $_config[ $this->_notificationKey ]['selected'] as $_type )
+			$recipients = $this->_recipients;
+		}
+		else
+		{
+			$recipients = array( $this->_member );
+		}
+				
+		//-----------------------------------------
+		// Loop recipients
+		//-----------------------------------------
+		
+		$emailTo = array();
+		
+		foreach ( $recipients as $r )
+		{
+			//-----------------------------------------
+			// If this is a member, send the notification
+			// like normal
+			//-----------------------------------------
+			
+			if ( is_array( $r ) )
 			{
-				switch( $_type )
+				if( $r['member_banned'] )
 				{
-					case 'pm':
-						$this->_sendPMNotification();
-					break;
+					throw new Exception( 'MEMBER_BANNED' );
+				}
+				
+				if( ! $r['member_id'] )
+				{
+					throw new Exception( 'NO_MEMBER_ID' );
+				}
+				
+				if( ! $this->_notificationKey )
+				{
+					throw new Exception( 'NO_NOTIFY_KEY' );
+				}
+				
+				$_config	= $this->getMemberNotificationConfig( $r );
+				
+				/* update msg show notification for inline pop-up */
+				if ( in_array( $this->_notificationKey, $this->_showInlinePopUp ) )
+				{
+					IPSMember::save( $r['member_id'], array( 'core' => array( 'msg_show_notification' => 1 ) ) );
 					
-					case 'email':
-						$this->_sendEmailNotification();
-					break;
+					/* If inline is disabled, we need to store as hidden anyway */
+					$data = $this->formatNotificationData();
 					
-					case 'inline':
-						$this->_sendInlineNotification();
-					break;
-					
-					case 'mobile':
-						$this->_sendMobileNotification();
-					break;
+					if ( in_array( 'inline', $data[ $this->_notificationKey ]['disabled'] ) )
+					{
+						$this->_sendInlineNotification( $r, true );
+					}
+				}
+				else if ( ! $_config[ $this->_notificationKey ] )
+				{ 
+					throw new Exception( 'BAD_NOTIFY_KEY' );
+				}
+				
+				//-----------------------------------------
+				// Send appropriate notifications.
+				// We can have more than one notification method for each
+				//	notification type.
+				//-----------------------------------------
+						
+				if ( is_array($_config[ $this->_notificationKey ]) AND count($_config[ $this->_notificationKey ]) )
+				{
+					foreach( $_config[ $this->_notificationKey ]['selected'] as $_type )
+					{
+						switch( $_type )
+						{
+							case 'pm':
+								//$this->_sendPMNotification( $r );
+							break;
+							
+							case 'email':
+								$emailTo[] = $r['email'];
+							break;
+							
+							case 'inline':
+								$this->_sendInlineNotification( $r );
+							break;
+							
+							case 'mobile':
+								$this->_sendMobileNotification( $r );
+							break;
+						}
+					}
 				}
 			}
+			
+			//-----------------------------------------
+			// If it's just an Email, add it to the
+			// list of Emails to send to
+			//-----------------------------------------
+			
+			else
+			{
+				$emailTo[] = $r;
+			}
 		}
+	
+		//-----------------------------------------
+		// Now send the Emails
+		//-----------------------------------------
+				
+		if ( !empty( $emailTo ) )
+		{
+			$this->_sendEmailNotification( $emailTo );
+		}
+		
 	}
 	
 	/**
 	 * Send a notification via mobile device
 	 *
 	 * @access	protected
+	 * @param	array		Member data
 	 * @return	mixed		True, or can output an error
 	 */
-	protected function _sendMobileNotification()
+	protected function _sendMobileNotification( $member )
 	{
 		/* Just save the notification, a task will handle it later */
-		if( IPSLib::canReceiveMobileNotifications( $this->_member ) && $this->_member['ips_mobile_token'] )
+		if( IPSMember::canReceiveMobileNotifications( $member ) && $member['ips_mobile_token'] )
 		{
 			$this->DB->insert( 'mobile_notifications', array(
 																'notify_title'	=> strip_tags( $this->_notificationTitle ),
 																'notify_date'	=> time(),
-																'member_id'		=> $this->_member['member_id']
+																'member_id'		=> $member['member_id']
 															)
 							);
 		}
@@ -511,14 +681,17 @@ class notifications
 	
 	/**
 	 * Send a notification via private conversation
+	 * @depricated 
 	 *
 	 * @access	protected
+	 * @param	array		Member data
 	 * @return	mixed		True, or can output an error
 	 */
-	protected function _sendPMNotification()
+	protected function _sendPMNotification( $member )
 	{
+		return false;
 		/* Have they disabled their messenger? */
-		if ( $this->_member['members_disable_pm'] )
+		if ( $member['members_disable_pm'] or !IPSLib::moduleIsEnabled( 'messaging', 'members' ) )
 		{
 			return;
 		}
@@ -529,17 +702,12 @@ class notifications
 			$_classToLoad	= IPSLib::loadLibrary( IPSLib::getAppDir( 'members' ) . '/sources/classes/messaging/messengerFunctions.php', 'messengerFunctions', 'members' );
 			
 			$_messenger		= new $_classToLoad( $this->registry );
-		 	$_messenger->sendNewPersonalTopic( intval( $this->_member['member_id'] ), 
+		 	$_messenger->sendNewPersonalTopic( intval( $member['member_id'] ), 
 											intval( $this->_from['member_id'] ), 
 											array(), 
 											strip_tags($this->_notificationTitle), 
-											IPSText::getTextClass('editor')->method == 'rte' ? nl2br( $this->_notificationText ) : $this->_notificationText,
-											array( 'origMsgID'			=> 0,
-													'fromMsgID'			=> 0,
-													'postKey'			=> md5(microtime()),
-													'trackMsg'			=> 0,
-													'addToSentFolder'	=> 0,
-													'hideCCUser'		=> 0,
+											IPSText::getTextClass('editor')->method == 'rte' ? nl2br( $this->_notificationText_forDisplay ) : $this->_notificationText_forDisplay,
+											array(
 													'forcePm'			=> 1,
 													'isSystem'          => true
 												)
@@ -548,7 +716,7 @@ class notifications
 		catch( Exception $error )
 		{
 			$msg		= $error->getMessage();
-			
+						
 			if( $msg != 'CANT_SEND_TO_SELF' )
 			{
 				if ( strstr( $msg, 'BBCODE_' ) )
@@ -561,7 +729,7 @@ class notifications
 				{
 					$this->lang->words[ 'err_' . $msg ] = $this->lang->words[ 'err_' . $msg ];
 					$this->lang->words[ 'err_' . $msg ] = str_replace( '#NAMES#'	, implode( ",", $_messenger->exceptionData )	, $this->lang->words[ 'err_' . $msg ] );
-					$this->lang->words[ 'err_' . $msg ] = str_replace( '#TONAME#'	, $this->_member['members_display_name']		, $this->lang->words[ 'err_' . $msg ] );
+					$this->lang->words[ 'err_' . $msg ] = str_replace( '#TONAME#'	, $member['members_display_name']		, $this->lang->words[ 'err_' . $msg ] );
 					$this->lang->words[ 'err_' . $msg ] = str_replace( '#FROMNAME#'	, $this->_from['members_display_name']			, $this->lang->words[ 'err_' . $msg ] );
 					
 					$this->registry->output->showError( 'err_' . $msg, 10150 );
@@ -582,26 +750,30 @@ class notifications
 	 * Send a notification via email
 	 *
 	 * @access	protected
+	 * @param	array		Email Addresses
 	 * @return	bool
 	 */
-	protected function _sendEmailNotification()
+	protected function _sendEmailNotification( $recipients )
 	{
-		IPSText::getTextClass( 'email' )->message	= $this->_notificationText;
-		IPSText::getTextClass( 'email' )->subject	= strip_tags( $this->_notificationTitle );
-		IPSText::getTextClass( 'email' )->to		= $this->_member['email'];
-		IPSText::getTextClass( 'email' )->from		= $this->settings['email_out'];
+		/* Recipients */
+		$to = $recipients[0];
+		$cc = array();
 		
-		//-----------------------------------------
-		// Send immediately
-		//-----------------------------------------
+		unset( $recipients[0] );
+
+		if ( ! empty( $recipients ) )
+		{
+			$cc = $recipients;
+		}
 		
-		//IPSText::getTextClass( 'email' )->sendMail();
-		
-		//-----------------------------------------
-		// Send delayed
-		//-----------------------------------------
-		
-		$this->DB->insert( 'mail_queue', array( 'mail_to' => IPSText::getTextClass( 'email' )->to, 'mail_from' => IPSText::getTextClass( 'email' )->from, 'mail_date' => time(), 'mail_subject' => IPSText::getTextClass('email')->subject, 'mail_content' => IPSText::getTextClass('email')->message ) );
+		/* Add to mail queue */
+		$this->DB->insert( 'mail_queue', array( 'mail_to'      => $to,
+												'mail_cc'      => ( count($cc) ? implode( ',', $cc ) : '' ),
+												'mail_from'    => $this->settings['email_out'],
+												'mail_date'    => time(),
+												'mail_html_on' => intval( $this->_mail_html_on ),
+												'mail_subject' => strip_tags( $this->_notificationTitle ),
+												'mail_content' => $this->_notificationText_forEmails ) );
 
 		$cache					= $this->cache->getCache('systemvars');
 		$cache['mail_queue']	+= 1;
@@ -614,39 +786,63 @@ class notifications
 	 * Send an inline notification
 	 *
 	 * @access	protected
+	 * @param	array		Member data
 	 * @return	bool
 	 */
-	protected function _sendInlineNotification()
+	protected function _sendInlineNotification( $member, $hidden=false )
 	{
+		$blockedFromInline = $this->getBlockedFromInline();
+		
 		//-----------------------------------------
 		// First, make sure member doesn't have too many
 		//-----------------------------------------
 		
-		$this->_truncateInlineNotifications();
+		$this->_truncateInlineNotifications( $member );
+		
+		/* Blocked? */
+		if ( $hidden === false )
+		{
+			 if ( in_array( $this->_notificationKey, $blockedFromInline ) )
+			 {
+			 	$hidden = true;
+			 }
+		}
 		
 		//-----------------------------------------
 		// Insert new notification
 		//-----------------------------------------
 		
-		$_insert	= array(
-							'notify_to_id'		=> $this->_member['member_id'],
-							'notify_from_id'	=> intval($this->_from['member_id']),
-							'notify_sent'		=> time(),
-							'notify_read'		=> 0,
-							'notify_title'		=> $this->_notificationTitle,
-							'notify_text'		=> $this->_notificationText,
-							'notify_type_key'	=> $this->_notificationKey,
-							'notify_url'		=> $this->_notificationUrl,
-							);
+		$_insert	= array( 'notify_to_id'		=> $member['member_id'],
+							 'notify_from_id'	=> intval($this->_from['member_id']),
+							 'notify_sent'		=> IPS_UNIX_TIME_NOW,
+							 'notify_read'		=> ( $hidden === true ) ? 2 : 0,
+							 'notify_title'		=> $this->_notificationTitle,
+							 'notify_text'		=> $this->_notificationText_forDisplay,
+							 'notify_type_key'	=> $this->_notificationKey,
+							 'notify_url'		=> $this->_notificationUrl );
 
+		/* Meta? */
+		$meta = $this->getMetaData();
+		
+		if ( $meta !== false )
+		{
+			$_insert['notify_meta_app']  = $meta['meta_app'];
+			$_insert['notify_meta_area'] = $meta['meta_area'];
+			$_insert['notify_meta_id']   = $meta['meta_id'];
+			$_insert['notify_meta_key']  = $this->_getMetaKey( $meta );
+		}
+		
 		$this->DB->insert( 'inline_notifications', $_insert );
 		
 		//-----------------------------------------
 		// Update member record
 		//-----------------------------------------
 		
-		$this->DB->update( 'members', 'notification_cnt=notification_cnt+1, msg_show_notification=1', 'member_id=' . $this->_member['member_id'], true, true );
-
+		if ( ! $hidden )
+		{
+			$this->DB->update( 'members', 'notification_cnt=notification_cnt+1', 'member_id=' . $member['member_id'], true, true );
+		}
+		
 		return true;
 	}
 	
@@ -654,19 +850,20 @@ class notifications
 	 * Clear out old notifications if there's a limit to how many member can have
 	 *
 	 * @access	public
-	 * @return	void
+	 * @param	array		Member data
+	 * @return	@e void
 	 */
-	public function _truncateInlineNotifications()
+	public function _truncateInlineNotifications( $member )
 	{
 		//-----------------------------------------
 		// Determine member's limit first
 		//-----------------------------------------
 		
-		$groups	= array( $this->_member['member_group_id'] );
+		$groups	= array( $member['member_group_id'] );
 		
-		if( $this->_member['mgroup_others'] )
+		if( $member['mgroup_others'] )
 		{
-			$_others	= IPSText::cleanPermString( $this->_member['mgroup_others'] );
+			$_others	= IPSText::cleanPermString( $member['mgroup_others'] );
 			$groups		= ( is_array( $groups ) AND is_array( $_others ) ) ? array_merge( $_others, $groups ) : array();
 		}
 		
@@ -701,7 +898,7 @@ class notifications
 			// Get current count
 			//-----------------------------------------
 			
-			$_count	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as total', 'from' => 'inline_notifications', 'where' => 'notify_to_id=' . $this->_member['member_id'] ) );
+			$_count	= $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as total', 'from' => 'inline_notifications', 'where' => 'notify_to_id=' . $member['member_id'] ) );
 			
 			//-----------------------------------------
 			// At limit?
@@ -713,12 +910,27 @@ class notifications
 			if( $_count['total'] >= $_limit )
 			{
 				$_toDelete	= ( $_count['total'] + 1 ) - $_limit;
+				$ids        = array();
 				
-				//-----------------------------------------
-				// Yes, delete method supports order by and limit
-				//-----------------------------------------
+				/* Fetch Ids */
+				$this->DB->build( array( 'select' => 'notify_id',
+										 'from'   => 'inline_notifications',
+										 'where'  => 'notify_to_id=' . $member['member_id'],
+										 'order'  => 'notify_sent ASC',
+										 'limit'  => array( 0, $_toDelete ) ) );
 				
-				$this->DB->delete( 'inline_notifications', 'notify_to_id=' . $this->_member['member_id'], 'notify_sent ASC', array( $_toDelete ) );
+				$this->DB->execute();
+				
+				while( $row = $this->DB->fetch() )
+				{
+					$ids[] = $row['notify_id'];
+				}
+				
+				/* Delete */
+				if ( count( $ids ) )
+				{
+					$this->DB->delete( 'inline_notifications', 'notify_id IN(' . implode( ',', $ids ) . ')' );
+				}
 			}
 		}
 
@@ -729,13 +941,15 @@ class notifications
 	 * Rebuild a member's unread notification count
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function rebuildUnreadCount()
+	public function rebuildUnreadCount( $memberId=null )
 	{
-		$count	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'inline_notifications', 'where' => 'notify_to_id=' . $this->_member['member_id'] . ' AND notify_read=0' ) );
+		$memberId = ( $memberId === null ) ? $this->_member['member_id'] : intval( $memberId );
 		
-		$this->DB->update( 'members', array( 'notification_cnt' => $count['total'] ), 'member_id=' . $this->_member['member_id'] );
+		$count	= $this->DB->buildAndFetch( array( 'select' => 'count(*) as total', 'from' => 'inline_notifications', 'where' => 'notify_to_id=' . $memberId . ' AND notify_read=0' ) );
+		
+		$this->DB->update( 'members', array( 'notification_cnt' => $count['total'] ), 'member_id=' . $memberId );
 	}
 	
 	/**
@@ -749,7 +963,7 @@ class notifications
 	 * @param	bool		Run text through preDisplayParse
 	 * @return 	array 		Unread notifications
 	 */
-	public function fetchUnreadNotifications( $limit=0, $sortKey='notify_sent', $sortOrder='desc', $unread=true, $parseText=false )
+	public function fetchUnreadNotifications( $limit=0, $sortKey='notify_sent', $sortOrder='desc', $unread=1, $parseText=false, $keyNames=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -757,6 +971,15 @@ class notifications
 		
 		$return   = array();
 		$limit    = ( $limit ) ? array( 0, intval( $limit ) ) : array( 0, 500 );
+		$members  = array();
+		$mids     = array();
+		$where    = "";
+		$unread   = ( is_array( $unread ) ) ? $unread : array( $unread );
+		
+		if ( count( $keyNames ) )
+		{
+			$where = " AND notify_type_key IN ('" . implode( "','", $keyNames ) . "')";
+		}
 		
 		//-----------------------------------------
 		// Fetch unread notifications
@@ -764,17 +987,16 @@ class notifications
 		
 		$this->DB->build( array( 'select'   => '*',
 								 'from'     => 'inline_notifications',
-								 'where'    => 'notify_to_id=' . $this->_member['member_id'] . ( $unread ? ' AND notify_read=0' : '' ),
+								 'where'    => 'notify_to_id=' . $this->_member['member_id'] . ' AND notify_read IN (' . implode( ',', $unread ) . ')' . $where,
 								 'order'    => $sortKey . ' ' . $sortOrder,
 								 'limit'    => $limit ) );
-								 
 		$outer	= $this->DB->execute();
 		
 		while( $row = $this->DB->fetch($outer) )
 		{
 			/* As the email template parser makes an attempt to reparse 'safe' HTML, we need to make it safe here */
 			$row['notify_text'] = IPSText::htmlspecialchars( $row['notify_text'] );
-			
+	
 	 		IPSText::getTextClass('bbcode')->parse_smilies				= 1;
 	 		IPSText::getTextClass('bbcode')->parse_nl2br				= 1;
 	 		IPSText::getTextClass('bbcode')->parse_html					= 0;
@@ -787,8 +1009,11 @@ class notifications
  			}
 	 		
 	 		$row['notify_icon']	= $this->getNotificationIcon( $row['notify_type_key'] );
- 			 			 			
+ 			
 			$return[ $row['notify_sent'] . '.' . $row['notify_id'] ] = $row;
+			
+			/* Store member id */
+			$mids[ $row['notify_from_id'] ] = $row['notify_from_id'];
 		}
 		
 		/* Got anything? */
@@ -796,16 +1021,108 @@ class notifications
 		{
 			return array();
 		}
+		
+		if ( count( $mids ) )
+		{
+			$members = IPSMember::load( array_keys( $mids ), 'all' );
+			
+			if ( count( $members ) )
+			{
+				foreach( $return as $key => $data )
+				{ 
+					if ( in_array( $data['notify_from_id'], array_keys( $members ) ) )
+					{
+						$return[ $key ]['member'] = IPSMember::buildProfilePhoto( $members[ $data['notify_from_id'] ] );
+					}
+				}
+			}
+		}
 
-		/* Reverse sort it (latest first) */
-		// Removed (bfarber) - this negates the ability to custom sort the returned notifications by passing in 2nd/3rd function
-		// params, so I'm commenting out for now
-		//krsort( $return );
+		/* 3.1 didn't store notify_from_id so we need to catch that */
+		foreach( $return as $key => $data )
+		{
+			if( !$data['member']['member_id'] )
+			{
+				$return[ $key ]['member'] = IPSMember::buildProfilePhoto( 0 );
+			}
+		}
 		
 		/* Return 'em */
 		return $return;
 	}
 	
+	/**
+	 * Fetch latest notifications
+	 *
+	 * @access	public
+	 * @param	int			Number if items to limit
+	 */
+	public function fetchLatestNotifications( $limit=10, $keyNames=array(), $getHidden=false )
+	{
+		$unread = ( $getHidden ) ? array(0,1,2) : array(0,1);
+		
+		return $this->fetchUnreadNotifications( $limit, 'notify_sent', 'desc', $unread, false, $keyNames );
+	}
+	
+	/**
+	 * Get me the latest notification and FAST or whatever...
+	 */
+	public function getLatestNotificationForInlinePopUp()
+	{
+		$latest = $this->fetchLatestNotifications( 1, $this->_showInlinePopUp, true );
+		$detail = array();
+		
+		if ( ! is_array( $latest ) OR !count( $latest ) )
+		{
+			return false;
+		}
+		
+		$latest = array_shift( $latest );
+		
+		if( !is_array($latest) )
+		{
+			$latest	= array();
+		}
+		
+		/* Alright can we get a better version of the text? */
+		if ( ! empty( $latest['notify_meta_app'] ) && ! empty( $latest['notify_meta_area'] ) && ! empty( $latest['notify_meta_id'] ) )
+		{
+			$detail = $this->getLinkedDataByMetaData( $this->_cleanMeta( $latest ) );
+		}
+		
+		/* Do it the old fashioned way */
+		if ( empty( $detail['content'] ) )
+		{
+			$detail = array( 'authorId' => $latest['notify_from_id'],
+							 'content'	=> $latest['notify_text'],
+							 'date'		=> $latest['notify_sent'],
+							 'title'	=> $latest['notify_title'],
+							 'type'		=> $this->lang->words['gbl_notify_item'] );
+		}
+		
+		/* Parse date */
+		$detail['date_parsed'] = $this->lang->getDate( $detail['date'], 'short' );
+		
+		/* Format the content */
+		$detail['content'] = nl2br( IPSText::getTextClass( 'bbcode' )->stripAllTags( $detail['content'] ) );
+		
+		/* Format the author */
+		$author  = IPSMember::buildDisplayData( IPSMember::load( $detail['authorId'], 'all' ), array( '__all__' => 1 ) );
+		
+		/* Flatten for JSON template eval */
+		foreach( $author as $k => $v )
+		{
+			$detail['member_' . $k ] = $v;
+		}
+		
+		$detail['member_PhotoTag'] = IPSMember::buildPhotoTag( $author, 'mini' );
+		
+		/* Slap on the URL */
+		$detail['url']    = $latest['notify_url'];
+		
+		return array_merge( $latest, $detail );
+	}
+	
 	/**
 	 * Get notification icon
 	 *
@@ -844,4 +1161,220 @@ class notifications
 		
 		return '';
 	}
+	
+	public function getLinkedDataByMetaData( $metaData=array() )
+	{
+		$data     = false;
+		$metaData = ( count( $metaData ) ) ? $metaData : $this->getMetaData();
+		
+		if ( $this->_hasAppClass( $metaData ) )
+		{
+			$data = $this->_getAppClass( $metaData )->getLinkedDataByMetaData( $metaData );
+		}
+		
+		return $data;
+	}
+	
+	/**
+	 * Mark a user's notifications as read
+	 * @param int $memberId
+	 */
+	public function markNotificationsAsReadByMemberId( $memberId )
+	{
+		$this->DB->update( 'inline_notifications', array( 'notify_read' => 1 ), 'notify_to_id=' . intval( $memberId ) . ' AND notify_read=0' );
+		
+		$this->rebuildUnreadCount( $memberId );
+	}
+	
+	/**
+	 * Mark notifications as read by meta data (used by external methods)
+	 * @param unknown_type $metaData
+	 */
+	public function markNotificationsAsReadByMetaData( $metaData=array(), $memberData=null )
+	{
+		$app        = trim( $metaData['meta_app'] );
+		$area       = trim( $metaData['meta_area'] );
+		$ids        = ( ! is_array( $metaData['meta_id'] ) ) ? array( $metaData['meta_id'] ) : $metaData['meta_id'];
+		$memberData = ( $memberData === null ) ? $this->_member : $memberData;
+		
+		$keys = array();
+		
+		if ( $app && $area && count( $ids ) )
+		{
+			foreach( $ids as $id )
+			{
+				$keys[] = $this->DB->addSlashes( $this->_getMetaKey( array( 'meta_app' => $app, 'meta_area' => $area, 'meta_id' => $id ) ) );
+			}
+			
+			if ( count( $keys ) )
+			{
+				$this->DB->update( 'inline_notifications', array( 'notify_read' => 1 ), 'notify_meta_key IN(\'' . implode( "','", $keys ) . '\') AND notify_read=0' );
+			}
+			
+			if ( $memberData['notification_cnt'] )
+			{
+				$this->setMember( $memberData );
+				$this->rebuildUnreadCount();
+			}
+		}
+	}
+	
+	/**
+	 * Delete notifications as read by meta data (used by external methods)
+	 * @param unknown_type $metaData
+	 */
+	public function deleteNotificationsAsReadByMetaData( $metaData=array(), $memberData=null )
+	{
+		$app        	 = trim( $metaData['meta_app'] );
+		$area       	 = trim( $metaData['meta_area'] );
+		$ids        	 = ( ! is_array( $metaData['meta_id'] ) ) ? array( $metaData['meta_id'] ) : $metaData['meta_id'];
+		$notify_type_key = ( ! empty( $metaData['notify_type_key'] ) ) ? $metaData['notify_type_key'] : false;
+		$memberData 	 = ( $memberData === null ) ? $this->_member : $memberData;
+		
+		$keys = array();
+		
+		if ( $app && $area && count( $ids ) )
+		{
+			foreach( $ids as $id )
+			{
+				$keys[] = $this->DB->addSlashes( $this->_getMetaKey( array( 'meta_app' => $app, 'meta_area' => $area, 'meta_id' => $id ) ) );
+			}
+			
+			if ( count( $keys ) )
+			{
+				if ( $notify_type_key !== false )
+				{
+					$notify_type_key = ( is_array( $notify_type_key ) ) ? ' AND notify_type_key=\'' . implode( "'", $notify_type_key ) . '\')' : ' AND notify_type_key=\'' . $notify_type_key . '\'';
+				}
+				
+				$this->DB->update( 'inline_notifications', array( 'notify_read' => 2 ), 'notify_meta_key IN(\'' . implode( "','", $keys ) . '\')' . $notify_type_key );
+			}
+			
+			if ( $memberData['notification_cnt'] )
+			{
+				$this->setMember( $memberData );
+				$this->rebuildUnreadCount();
+			}
+		}
+	}
+	
+	/**
+	 * Do we have an application class?
+	 * @return boolean
+	 */
+	private function _hasAppClass( $metaData=array() )
+	{
+		$metaData = ( count( $metaData ) ) ? $metaData : $this->getMetaData();
+		
+		if ( is_object( $this->_appClass ) )
+		{
+			return true;
+		}
+		
+		$app      = $metaData['meta_app'];
+		$area     = $metaData['meta_area'];
+		$file     = IPSLib::getAppDir( $app ) . '/extensions/notifications/' . $area . '.php';
+		$key      = $metaData['meta_app'] . ';' . $metaData['meta_area'];
+		
+		if ( IPSLib::appIsInstalled( $app ) )
+		{
+			if ( is_file( $file ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $file, $app . '_class_notifications', $app );
+				
+				if ( class_exists( $classToLoad ) )
+				{
+					$this->_appClass[ $key ] = new $classToLoad();
+					
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Fetch the app specific class
+	 */
+	private function _getAppClass( $metaData )
+	{
+		$metaData = ( count( $metaData ) ) ? $metaData : $this->getMetaData();
+		$key      = $metaData['meta_app'] . ';' . $metaData['meta_area'];
+		
+		if ( is_object( $this->_appClass[ $key ] ) )
+		{
+			return $this->_appClass[ $key ];
+		}
+		
+		$metaData = $this->getMetaData();
+		$app      = $metaData['meta_app'];
+		$area     = $metaData['meta_area'];
+		$file     = IPSLib::getAppDir( $app ) . '/extensions/notifications/' . $area . '.php';
+		
+		if ( IPSLib::appIsInstalled( $app) )
+		{
+			if ( is_file( $file ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $file, $app . '_class_notifications', $app );
+				
+				if ( class_exists( $classToLoad ) )
+				{
+					$this->_appClass[ $key ] = new $classToLoad();
+					
+					return $this->_appClass[ $key ];
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Generates a meta key ...
+	 * @param array $array
+	 * @return string
+	 */
+	private function _getMetaKey( array $array )
+	{
+		return md5( $array['meta_app'] . ';' . $array['meta_area'] . ';' . $array['meta_id'] );
+	}
+	
+	/**
+	 * Clean meta stuffs
+	 * Ensures that DB naming conventions aren't used
+	 * @param	Array	Dirty meta
+	 * @return	Array	Clean is betta haha!
+	 */
+	private function _cleanMeta( $meta )
+	{
+		$clean = array( 'notify_meta_app', 'notify_meta_area', 'notify_meta_id' );
+		
+		if ( is_numeric( $meta ) )
+		{
+			$meta = array( 'meta_id' => $meta );
+		}
+		
+		if ( is_array( $meta ) )
+		{
+			foreach( $meta as $k => $v )
+			{
+				if ( in_array( $k, $clean ) )
+				{
+					unset( $meta[ $k ] );
+					$meta[ str_replace( 'notify_', '', $k ) ] = $v;
+				}
+			}
+		}
+		
+		if ( empty( $meta['meta_app'] ) )
+		{
+			$meta['meta_app'] = IPS_APP_COMPONENT;
+		}
+		
+		if ( empty( $meta['meta_area'] ) )
+		{
+			$meta['meta_area'] = $this->_notificationKey;
+		}
+		
+		return $meta;
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/member/photo.php b/upload/admin/sources/classes/member/photo.php
new file mode 100644
index 00000000..1daf9556
--- /dev/null
+++ b/upload/admin/sources/classes/member/photo.php
@@ -0,0 +1,1170 @@
+<?php
+/**
+ * <pre>
+ * Photo routines
+ * Last Updated: $Date: 2011-09-08 18:01:45 -0400 (Thu, 08 Sep 2011) $
+ * </pre>
+ *
+ * @author		$author$
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @author		MattMecham
+ * @link		http://hatynka.in
+ * @version		$Rev: 9470 $ 
+ */
+
+class classes_member_photo
+{
+	/**
+	 * Registry Object Shortcuts
+	 * 
+	 * @var	object
+	 */
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	
+	/**
+	 * CONSTRUCTOR
+	 *
+	 * @param	object	Registry
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make registry objects */
+		$this->registry		=  $registry;
+		$this->DB			=  $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->lang			=  $this->registry->getClass('class_localization');
+		$this->member		=  $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		=  $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Save photo
+	 * @param	array	member
+	 * @param	string	Phototype
+	 */
+	public function save( $member, $photoType, $gravatar='', $url='' )
+	{
+		/* Fetch member data */
+		$member = IPSMember::buildDisplayData( IPSMember::load( $member['member_id'], 'all' ) );
+		
+		$photo       = array();
+		$bwOptions	 = IPSBWOptions::thaw( $member['fb_bwoptions'], 'facebook' );
+		$tcbwOptions = IPSBWOptions::thaw( $member['tc_bwoptions'], 'twitter' );
+		$vkbwOptions = IPSBWOptions::thaw( $member['vk_bwoptions'], 'vkontakte' );
+		
+		/* Perm checks */
+		if ( ! $member['g_edit_profile'] )
+		{
+			throw new Exception( 'PROFILE_DISABLED' );
+		}
+		
+		/* Whadda-we-doing? */
+		switch( $photoType )
+		{
+			case 'url':
+				$photo = $this->importPhoto( $url, $member['member_id'] );
+				$photo['pp_photo_type'] = 'custom';
+				$tcbwOptions['tc_s_pic'] = 0;
+				$bwOptions['fbc_s_pic']	 = 0;
+			break;
+			case 'custom':
+				$photo = $this->uploadPhoto( $member['member_id'] );
+				$photo['pp_photo_type'] = 'custom';
+				$tcbwOptions['tc_s_pic'] = 0;
+				$bwOptions['fbc_s_pic']	 = 0;
+			break;
+			case 'gravatar':
+				$photo = $this->setGravatar( $gravatar );
+				
+				if ( $photo['final_location'] )
+				{
+					$tcbwOptions['tc_s_pic'] = 0;
+					$bwOptions['fbc_s_pic']	 = 0;
+					$photo['pp_photo_type'] = 'gravatar';
+					$photo['pp_gravatar']	= $gravatar;
+				}
+			break;
+			case 'twitter':
+				$photo = $this->setTwitterPicture( $member );
+				
+				if ( $photo['final_location'] )
+				{
+					$tcbwOptions['tc_s_pic'] = 1;
+					$bwOptions['fbc_s_pic']	 = 0;
+					$vkbwOptions['vc_s_pic'] = 0;
+					$photo['pp_photo_type'] = 'twitter';
+				}
+			break;
+			case 'facebook':
+				$photo = $this->setFacebookPicture( $member );
+				
+				if ( $photo['final_location'] )
+				{
+					$tcbwOptions['tc_s_pic'] = 0;
+					$bwOptions['fbc_s_pic']	 = 1;
+					$vkbwOptions['vc_s_pic'] = 0;
+					$photo['pp_photo_type']  = 'facebook';
+				}
+			break;
+			case 'vkontakte':
+				$photo = $this->setVkontaktePicture( $member );
+				
+				if ( $photo['final_location'] )
+				{
+					$tcbwOptions['tc_s_pic'] = 0;
+					$bwOptions['fbc_s_pic']	 = 0;
+					$vkbwOptions['vc_s_pic'] = 1;
+					$photo['pp_photo_type']  = 'vkontakte';
+				}
+			break;
+		}
+
+		if ( $photo['status'] == 'fail' )
+		{
+			throw new Exception( $photo['error'] );
+		}
+			
+		$save = array( 'pp_main_photo'		=> $photo['final_location'],
+  				   	   'pp_main_width'		=> intval($photo['final_width']),
+					   'pp_main_height'		=> intval($photo['final_height']),
+					   'pp_thumb_photo'		=> $photo['t_final_location'],
+					   'pp_thumb_width'		=> intval($photo['t_final_width']),
+					   'pp_thumb_height'	=> intval($photo['t_final_height']),
+					   'pp_photo_type'		=> $photo['pp_photo_type'],
+					   'pp_gravatar'		=> $photo['pp_gravatar'],
+					   'fb_photo'			=> '',
+					   'fb_photo_thumb'		=> '',
+					   'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' ),
+					   'tc_photo'			=> '',
+					   'tc_bwoptions'		=> IPSBWOptions::freeze( $tcbwOptions, 'twitter' ) );
+			
+		IPSMember::save( $member['member_id'], array( 'extendedProfile' => $save  ) );
+		
+		return $save;
+	}
+	
+	/**
+	 * Import URL
+	 * Fetches a URL and stores it to disk
+	 */
+	public function importPhoto( $url, $member_id = 0 )
+	{
+		/* Init */
+		$return		      = array( 'error'            => '',
+								   'status'           => '' );
+		$member_id        = $member_id ? intval($member_id) : intval( $this->memberData['member_id'] );
+		$memberData		  = IPSMember::load( $member_id );
+		$p_max    		  = ( IN_ACP ) ? 10000 : $memberData['photoMaxKb'];
+		$tmp_name         = $member_id . time() . rand(0,100) . '.ipb';
+		$fileExtension    = IPSText::getFileExtension( $url );
+		
+		/* Check */
+		if ( ! $member_id )
+		{
+			return array( 'status' => 'cannot_find_member' );
+		}
+					
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		/* Do we have permission to import? */
+		if ( ! $this->settings['mem_photo_url'] )
+		{
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_save_urlphoto';
+			
+			return $return;
+		}
+		
+		/* Check for valid URL */
+		if ( ! stristr( $url, 'http://' ) && ! stristr( $url, 'https://' ) )
+		{
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_correct_url_format';
+			
+			return $return;
+		}
+		
+		/* Fetch img class */
+		require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+		$image = ips_kernel_image::bootstrap( 'gd' );
+		
+		/* Get the file managemnet class */
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$query = new $classToLoad();
+		$query->timeout = 15;
+		
+		/* Query the service */
+		$response = $query->getFileContents( $url );
+
+		if ( ! $response )
+		{
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_contact_server';
+			
+			return $return;
+		}
+		
+		/* write to disk */
+		if ( ! file_put_contents( $upload_path . '/' . $tmp_name, $response ) )
+		{
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_save_urlphoto';
+			
+			return $return;
+		}
+		
+		/* Perform some checks */
+		if ( $image->hasXssInfile( $upload_path . '/' . $tmp_name ) )
+		{
+			@unlink( $upload_path . '/' . $tmp_name );
+			
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_save_urlphoto';
+			
+			return $return;
+		}
+		
+		/* Extract data */
+		$data = $image->extractImageData( $upload_path . '/' . $tmp_name );
+		
+		/* If it's false, then unlink file 'cos it ain't an image */
+		if ( $data === false )
+		{
+			@unlink( $upload_path . '/' . $tmp_name );
+			
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_save_urlphoto';
+			
+			return $return;
+		}
+		
+		/* Check file size */
+		$size = filesize( $upload_path . '/' . $tmp_name );
+		
+		if ( $size > ( $p_max * 1024 ) )
+		{
+			@unlink( $upload_path . '/' . $tmp_name );
+			
+			$return['status'] = 'fail';
+			$return['error']  = 'upload_to_big';
+			
+			return $return;
+		}
+		
+		/* Is a photo we accept? */
+		if ( ! in_array( $data['fileType'], array( 'png', 'gif', 'jpg' ) ) )
+		{
+			@unlink( $upload_path . '/' . $tmp_name );
+			
+			$return['status'] = 'fail';
+			$return['error']  = 'invalid_file_extension';
+			
+			return $return;
+		}
+		
+		/* Remove any current photos */
+		$this->removeUploadedPhotos( $member_id, $upload_path );
+		
+		/* Ok so rename it 'cos we're good */
+		if ( ! @rename( $upload_path . '/' . $tmp_name, $upload_path . '/' . 'photo-'.$member_id . '.' . $data['fileType'] ) )
+		{
+			@unlink( $upload_path . '/' . $tmp_name );
+			
+			$return['status'] = 'fail';
+			$return['error']  = 'err_not_save_urlphoto';
+			
+			return $return;
+		}
+		else
+		{
+			@chmod( $upload_path . '/' . 'photo-'.$member_id, 0777 );
+			
+			/* Now build sized copies */
+			return $this->buildSizedPhotos( 'photo-'.$member_id . '.' . $data['fileType'], $member_id );
+		}
+	}
+	
+	/**
+	 * Upload personal photo function
+	 * Assumes all security checks have been performed by this point
+	 *
+	 * @access	public
+	 * @param	integer		[Optional] member id instead of current member
+	 * @return 	array  		[ error (error message), status (status message [ok/fail] ) ]
+	 */
+	public function uploadPhoto( $member_id = 0 )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$return		      = array( 'error'            => '',
+								   'status'           => '',
+								   'final_location'   => '',
+								   'final_width'      => '',
+								   'final_height'     => '',
+								   't_final_location' => '',
+								   't_final_width'    => '',
+								   't_final_height'   => ''  );
+		$member_id        = $member_id ? intval($member_id) : intval( $this->memberData['member_id'] );
+		$memberData		  = IPSMember::load( $member_id );
+		$real_name        = '';
+		$upload_dir       = '';
+		$t_real_name      = '';
+		$p_max    		  = $memberData['photoMaxKb'];
+		
+		if ( IN_ACP )
+		{
+			$p_max = 10000;
+		}
+		
+		if ( ! $member_id )
+		{
+			return array( 'status' => 'cannot_find_member' );
+		}
+					
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		/* Check for an upload */
+		if ( $_FILES['upload_photo']['name'] != "" and ($_FILES['upload_photo']['name'] != "none" ) )
+		{
+			if ( ! IPSMember::canUploadPhoto( $memberData ) )
+			{
+				$return['status'] = 'fail';
+				$return['error']  = 'no_photo_upload_permission';
+				
+				return $return;
+			}
+			
+			/* Remove any current photos */
+			$this->removeUploadedPhotos( $member_id, $upload_path );
+			
+			$real_name = 'photo-'.$member_id;
+			
+			/* Fetch library */
+			require_once( IPS_KERNEL_PATH.'classUpload.php' );/*noLibHook*/
+			$upload    = new classUpload();
+
+			/* Bit of set up */
+			$upload->out_file_name     = 'photo-'.$member_id;
+			$upload->out_file_dir      = $upload_path;
+			$upload->max_file_size     = $p_max * 1024;
+			$upload->upload_form_field = 'upload_photo';
+			
+			/* Set up our allowed types */
+			$upload->allowed_file_ext  = array( 'gif', 'png', 'jpg', 'jpeg' );
+			
+			/* Upload */
+			$upload->process();
+			
+			/* Oops, what happened? */
+			if ( $upload->error_no )
+			{
+				switch( $upload->error_no )
+				{
+					case 1:
+						// No upload
+						$return['status'] = 'fail';
+						$return['error']  = 'upload_failed';
+					break;
+					case 2:
+						// Invalid file ext
+						$return['status'] = 'fail';
+						$return['error']  = 'invalid_file_extension';
+					break;
+					case 3:
+						// Too big...
+						$return['status'] = 'fail';
+						$return['error']  = 'upload_to_big';
+					break;
+					case 4:
+						// Cannot move uploaded file
+						$return['status'] = 'fail';
+						$return['error']  = 'upload_failed';
+					break;
+					case 5:
+						// Possible XSS attack (image isn't an image)
+						$return['status'] = 'fail';
+						$return['error']  = 'upload_failed';
+					break;
+				}
+				
+				return $return;
+			}
+						
+			/* We got this far.. */
+			$real_name   = $upload->parsed_file_name;
+			$t_real_name = $upload->parsed_file_name;
+			
+			/* Now build sized copies */
+			$return = $this->buildSizedPhotos( $upload->parsed_file_name, $member_id );
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Remove a photo for a member
+	 * @param int $member_id
+	 * @return string
+	 */
+	public function remove( $member_id )
+	{
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		$memberData				 = IPSMember::load( $member_id );
+		$bwOptions				 = IPSBWOptions::thaw( $memberData['fb_bwoptions'], 'facebook' );
+		$tcbwOptions			 = IPSBWOptions::thaw( $memberData['tc_bwoptions'], 'twitter' );
+		$bwOptions['fbc_s_pic']	 = 0;
+		$tcbwOptions['tc_s_pic'] = 0;
+	
+		$this->removeUploadedPhotos( $member_id, $upload_path );
+		
+		IPSMember::save( $member_id, array( 'extendedProfile' => array( 'pp_main_photo'		=> '',
+												  				   	 	'pp_main_width'		=> 0,
+																	   	'pp_main_height'	=> 0,
+																		'pp_thumb_photo'	=> '',
+																		'pp_thumb_width'	=> 0,
+																		'pp_thumb_height'	=> 0,
+																		'pp_photo_type'		=> 'none',
+																		'pp_gravatar'		=> '',
+																		'fb_photo'			=> '',
+																		'fb_photo_thumb'	=> '',
+																		'fb_bwoptions'		=> IPSBWOptions::freeze( $bwOptions, 'facebook' ),
+																		'tc_photo'			=> '',
+																		'tc_bwoptions'		=> IPSBWOptions::freeze( $tcbwOptions, 'twitter' ),
+																	 ) ) );
+		return true;
+	}
+	
+	/**
+	 * Fetch a user's twitter picture
+	 * 
+	 * @param mixed $member	INT OR ARRAY
+	 */
+	public function setTwitterPicture( $member )
+	{
+		/* Fetch member details */
+		if ( is_integer( $member ) )
+		{
+			$member = IPSMember::load( $member, 'all' );
+		}
+		else if ( isset( $member['member_id'] ) && ! isset( $member['pp_photo_type'] ) )
+		{
+			$member = IPSMember::load( $member['member_id'], 'all' );
+		}
+		
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		/* Twitter enabled? */
+		if ( IPSLib::twitter_enabled() && $member['twitter_token'] && $member['twitter_secret'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+			$twitter	 = new $classToLoad( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
+			
+			$userData    = $twitter->fetchUserData();
+			
+			if ( $userData['profile_image_url'] )
+			{
+				$large = str_replace( '_normal.', '.', $userData['profile_image_url'] );
+				$ext   = IPSText::getFileExtension( $userData['profile_image_url'] );
+				$file  = 'photo-' . $member['member_id'] . '.' . $ext;
+				$mokay = false;
+				
+				$content = @file_get_contents( $large );
+				
+				/* Try http wrappers first. Would be rude not to */
+				if ( $content )
+				{
+					if ( @file_put_contents( $upload_path . '/' . $file, $content ) )
+					{
+						$mokay = true;
+						return $this->buildSizedPhotos( $file, $member['member_id'] );
+					}
+				}
+				
+				/* Back up */
+				if ( $mokay === false )
+				{
+					return array( 'final_location'    => $this->registry->output->isHTTPS ? str_replace( "http://", "https://", $userData['profile_image_url'] ) : $userData['profile_image_url'],
+								  'final_width'       => 50,
+								  'final_height'      => 50,
+								  't_final_location'  => $this->registry->output->isHTTPS ? str_replace( "http://", "https://", $userData['profile_image_url'] ) : $userData['profile_image_url'],
+								  't_final_width'     => 50,
+								  't_final_height'    => 50 );
+				}
+			}
+		}
+		else
+		{
+			return array();
+		}
+	}
+	
+	/**
+	 * Fetch a user's facebook picture
+	 * 
+	 * @param mixed $member	INT OR ARRAY
+	 */
+	public function setFacebookPicture( $member )
+	{
+		/* Fetch member details */
+		if ( is_integer( $member ) )
+		{
+			$member = IPSMember::load( $member, 'all' );
+		}
+		else if ( isset( $member['member_id'] ) && ! isset( $member['pp_photo_type'] ) )
+		{
+			$member = IPSMember::load( $member['member_id'], 'all' );
+		}
+		
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+	
+		/* Twitter enabled? */
+		if (  IPSLib::fbc_enabled() && $member['fb_uid'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$facebook    = new $classToLoad( $this->registry );
+			
+			$facebook->resetApi( $member['fb_token'], $member['fb_uid'] );
+			
+			$userData = $facebook->fetchUserData();
+			
+			if ( $userData['pic_big'] || $userData['pic'] )
+			{
+				$large = $userData['pic_big'];
+				$ext   = IPSText::getFileExtension( $userData['pic_big'] );
+				$file  = 'photo-' . $member['member_id'] . '.' . $ext;
+				$mokay = false;
+				
+				/* Try http wrappers first. Would be rude not to */
+				$content = @file_get_contents( $large );
+				
+				if ( $content )
+				{
+					if ( @file_put_contents( $upload_path . '/' . $file, $content ) )
+					{
+						$mokay  = true;
+						return $this->buildSizedPhotos( $file, $member['member_id'] );	
+					}
+				}
+				
+				/* Back up */
+				if ( $mokay === false )
+				{
+					return array( 'final_location'    => $this->registry->output->isHTTPS ? str_replace( "http://", "https://", $userData['pic'] ) : $userData['pic'],
+								  'final_width'       => 50,
+								  'final_height'      => 50,
+								  't_final_location'  => $this->registry->output->isHTTPS ? str_replace( "http://", "https://", $userData['pic'] ) : $userData['pic'],
+								  't_final_width'     => 50,
+								  't_final_height'    => 50 );
+				}
+			}
+		}
+		else
+		{
+			return array();
+		}
+	}
+	
+	/**
+	 * Fetch a user's vkontakte picture
+	 * 
+	 * @param mixed $member	INT OR ARRAY
+	 */
+	public function setVkontaktePicture( $member )
+	{
+		/* Fetch member details */
+		if ( is_integer( $member ) )
+		{
+			$member = IPSMember::load( $member, 'all' );
+		}
+		else if ( isset( $member['member_id'] ) && ! isset( $member['pp_photo_type'] ) )
+		{
+			$member = IPSMember::load( $member['member_id'], 'all' );
+		}
+		
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		/* Vkontakte enabled? */
+		if ( IPSLib::vkontakte_enabled() && $member['vk_token'] && $member['vk_uid'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+			$vkontakte	 = new $classToLoad( $this->registry, $member['vk_token'], $member['vk_uid'] );
+			
+			$userData    = $vkontakte->fetchUserData();
+
+			if ( $userData['photo'] )
+			{
+				$img   = $userData['photo'];
+				$ext   = IPSText::getFileExtension( $img );
+				$file  = 'photo-' . $member['member_id'] . '.' . $ext;
+				$mokay = false;
+				
+				$content = @file_get_contents( $img );
+				
+				/* Try http wrappers first. Would be rude not to */
+				if ( $content )
+				{
+					if ( file_put_contents( $upload_path . '/' . $file, $content ) )
+					{
+						$mokay = true;
+						return $this->buildSizedPhotos( $file, $member['member_id'] );
+					}
+				}
+				
+				/* Back up */
+				if ( $mokay === false )
+				{
+					return array( 'final_location'    => $userData['profile_image_url'],
+								  'final_width'       => 50,
+								  'final_height'      => 50,
+								  't_final_location'  => $userData['profile_image_url'],
+								  't_final_width'     => 50,
+								  't_final_height'    => 50 );
+				}
+			}
+		}
+		else
+		{
+			return array();
+		}
+	}
+	
+	/**
+	 * Set gravatar as photie
+	 * 
+	 * @param string Gravatar email address
+	 */
+	public function setGravatar( $gravatar )
+	{
+		$md5Gravatar = md5( $gravatar );
+		
+		$_url	= "http://www.gravatar.com";
+		
+		if( $this->registry->output->isHTTPS )
+		{
+			$_url	= "https://secure.gravatar.com";
+		}
+
+		return array( 'final_location'    => $_url . "/avatar/" .$md5Gravatar . "?s=100",
+					  'final_width'       => 100,
+					  'final_height'      => 100,
+					  't_final_location'  => $_url . "/avatar/" .$md5Gravatar . "?s=100",
+					  't_final_width'     => 100,
+					  't_final_height'    => 100 );	
+	}
+	
+	/**
+	 * Crop photo - takes the normal full size image crops the bad boy
+	 * 
+	 * @param	INT		Member ID
+	 * @param	Array	Array of dims (x1, x2, y1, y2)
+	 */
+	public function cropPhoto( $memberId, $dims )
+	{
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		$return      = array( 'status' => 'fail' );
+		$save		 = array();
+		$x1			 = intval( $dims['x1'] );
+		$x2			 = intval( $dims['x2'] );
+		$y1			 = intval( $dims['y1'] );
+		$y2			 = intval( $dims['y2'] );
+		$pWidth		 = $this->settings['member_photo_crop'];
+		$pHeight     = $this->settings['member_photo_crop'];
+		 
+		/* Check */
+		if ( ! $memberId )
+		{
+			return $return;
+		}
+		
+		/* Fetch all current data */
+		$memberData = IPSMember::load( $memberId, 'all' );
+		
+		/* Got a PP image? */
+		if ( ! $memberData['pp_main_photo'] )
+		{
+			return $return;
+		}
+		
+		/* Figure out image name */
+		$path = pathinfo( $memberData['pp_main_photo'] );
+		$ext  = IPSText::getFileExtension( $memberData['pp_main_photo'] );
+		
+		if ( ! $path['filename'] )
+		{
+			return $return;	
+		}
+		
+		/* Get kernel library */
+		require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+		$img = ips_kernel_image::bootstrap( 'gd' );
+		
+		/* Location */
+		$photoThumbLoc  = $upload_path . '/photo-thumb-' . $memberData['member_id'] . '.' . $ext;
+		
+		/* set up image processor */
+		$settings  = array( 'image_path'	=> $upload_path, 
+						    'image_file'	=> $path['filename'] . '.' . $ext,
+						    'jpg_quality'	=> 100,
+						    'png_quality'	=> 9 );
+		
+		/* Prep first pass */
+		if ( $img->init( $settings ) )
+		{
+			/* Crop */
+			$width  = $x2 - $x1;
+			$height = $y2 - $y1;
+			
+			$return = $img->crop( $x1, $y1, $width, $height );
+			
+			if ( file_exists( $photoThumbLoc ) )
+			{
+				@unlink( $photoThumbLoc );
+			}
+			
+			if ( $img->writeImage( $photoThumbLoc ) )
+			{
+				$save = $return;
+			}
+		}
+		
+		/* Crop too large? */
+		if ( ! empty( $save['newWidth'] ) && ( $save['newWidth'] > $pWidth OR $save['newHeight'] > $pHeight ) )
+		{
+			/* Get kernel library */
+			$img = ips_kernel_image::bootstrap( 'gd' );
+		
+			/* set up image processor */
+			$settings  = array( 'image_path'	=> $upload_path, 
+							    'image_file'	=> 'photo-thumb-' . $memberData['member_id'] . '.' . $ext,
+							    'jpg_quality'	=> 100,
+							    'png_quality'	=> 9 );
+		
+			if ( $img->init( $settings ) )
+			{
+				$return = $img->resizeImage( $pWidth, $pHeight );
+				
+				if ( $img->writeImage( $photoThumbLoc ) )
+				{
+					$save = $return;
+				}
+				
+				unset( $img );
+			}
+		}
+		
+		/* Return some more */
+		$return = array_merge( $save, $return );
+		$return['status']   = 'ok';
+		$return['thumb']    = $this->settings['upload_url'] . '/' . $upload_dir . 'photo-thumb-' . $memberData['member_id'] . '.' . $ext;
+	
+		return $return;
+	}
+	
+	/**
+	 * Get photo type - mostly here to help legacy / upgrades
+	 * @param	mixed	INT or Array
+	 */
+	public function getPhotoType( $member )
+	{		
+		if ( is_integer( $member ) )
+		{
+			$member = IPSMember::load( $member, 'all' );
+		}
+		else if ( isset( $member['member_id'] ) && ! isset( $member['pp_photo_type'] ) )
+		{
+			$member = IPSMember::load( $member['member_id'], 'all' );
+		}
+		
+		if ( ! empty( $member['pp_photo_type'] ) )
+		{
+			return $member['pp_photo_type'];
+		}
+		else
+		{
+			$bwOptions	 = IPSBWOptions::thaw( $member['fb_bwoptions'], 'facebook' );
+			$tcbwOptions = IPSBWOptions::thaw( $member['tc_bwoptions'], 'twitter' );
+			$vkbwOptions = IPSBWOptions::thaw( $member['vk_bwoptions'], 'vkontakte' );
+			
+			if ( ! empty( $member['pp_main_photo'] ) AND ( strpos( $member['pp_main_photo'], 'http://' ) === false OR strpos( $member['pp_main_photo'], $this->settings['original_base_url'] ) ) )
+			{
+				return 'custom';
+			}
+			
+			if ( $bwOptions['fbc_s_pic'] )
+			{
+				return 'facebook';
+			}
+			
+			if ( $tcbwOptions['tc_s_pic'] )
+			{
+				return 'twitter';
+			}
+			
+			if ( $vkbwOptions['vc_s_pic'] )
+			{
+				return 'vkontakte';
+			}
+						
+			if ( $member['pp_gravatar'] )
+			{
+				return 'gravatar';
+			}
+			
+			return 'none';
+		}
+	}
+	
+	/**
+	 * Remove member uploaded photos
+	 *
+	 * @access	public
+	 * @param	integer		Member ID
+	 * @param	string		[Optional] Directory to check
+	 * @return 	array  		[ error (error message), status (status message [ok/fail] ) ]
+	 */
+	public function removeUploadedPhotos( $id, $upload_path='' )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$upload_path = $upload_path ? $upload_path : $this->settings['upload_dir'];
+		
+		foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
+		{
+			if ( @is_file( $upload_path."/photo-".$id.".".$ext ) )
+			{
+				@unlink( $upload_path."/photo-".$id.".".$ext );
+			}
+			
+			if ( @is_file( $upload_path."/photo-thumb-".$id.".".$ext ) )
+			{
+				@unlink( $upload_path."/photo-thumb-".$id.".".$ext );
+			}
+		}
+	}
+	
+	/**
+	 * Takes a photo and builds it nicely.
+	 * @param string $fileLocation
+	 * @param int $memberId
+	 * @param bool	$skipDir	Don't add profile directory
+	 */
+	public function buildSizedPhotos( $fileLocation, $memberId, $skipDir=false )
+	{
+		$memberData		  = IPSMember::load( $memberId );
+		$t_height		  = $this->settings['member_photo_crop'] ? $this->settings['member_photo_crop'] : 100;
+		$t_width          = $this->settings['member_photo_crop'] ? $this->settings['member_photo_crop'] : 100;
+		$p_max    		  = $memberData['photoMaxKb'];
+		$p_width  		  = $memberData['photoMaxWidth'];
+		$p_height 		  = $memberData['photoMaxHeight'];
+		$ext              = IPSText::getFileExtension( $fileLocation );
+		$needResize       = false;
+		
+		if ( ! $memberId )
+		{
+			return array( 'status' => 'cannot_find_member' );
+		}
+		
+		if ( IN_ACP )
+		{
+			$memberData['photoMaxKb']     = $this->memberData['photoMaxKb'];
+			$memberData['photoMaxWidth']  = $this->memberData['photoMaxWidth'];
+			$memberData['photoMaxHeight'] = $this->memberData['photoMaxHeight'];
+		}
+				
+		/* Fix up upload directory */
+		$paths       = $this->_getProfileUploadPaths( $skipDir );
+		$storagePath = $this->_getProfileUploadPaths();
+		$upload_path = $paths['path'];
+		$upload_dir  = $paths['dir'];
+		
+		/* Does image even exist?  If not, just return (can't rebuild a file that doesn't exist). */
+		if( !file_exists( $upload_path . '/' . $fileLocation ) )
+		{
+			return array(
+							'final_location'	=> '',
+							'final_width'		=> 0,
+							'final_height'		=> 0,
+							't_final_location'	=> '',
+							't_file_name'		=> '',
+							't_final_width'		=> 0,
+							't_final_height'	=> 0,
+							'status'			=> 'missing_image',
+							);
+		}
+		
+		/* Get kernel library */
+		require_once( IPS_KERNEL_PATH . 'classImage.php' );/*noLibHook*/
+				
+		/* Fetch image dims */
+		$imageDimensions = @getimagesize( $upload_path . '/' . $fileLocation );
+		
+		/* Do we need to resize? */
+		if ( ( $imageDimensions[0] > $t_width OR $imageDimensions[1] > $t_height ) )
+		{
+			$needResize = true;
+		}
+		else if ( $ext == 'gif' && ! $this->settings['member_photo_gif_animate'] )
+		{
+			/* Resize even if smaller to prevent animation */
+			$needResize = true;
+		}
+		
+		/* Overide if we have a GIF and want to keep it animating */
+		if ( $ext == 'gif' && $this->settings['member_photo_gif_animate'] )
+		{
+			$needResize = false;
+		}
+		
+		/** SQUARE THUMBS **/
+		if ( $needResize )
+		{
+			$image = ips_kernel_image::bootstrap( 'gd' );
+			
+			$image->init( array( 'image_path'	  => $upload_path, 
+								 'image_file'	  => $fileLocation ) );
+			
+			/* If we're uploading a GIF then resize to stop animations */
+			if ( $ext == 'gif' && ! $this->settings['member_photo_gif_animate'] )
+			{
+				$image->force_resize = true;
+			}
+			
+			$return = $image->croppedResize( $t_width, $t_height );
+			
+			$image->writeImage( $storagePath['path'] . '/' . 'photo-thumb-'.$memberId . '.' . $ext );
+            
+			$t_im['img_width']	  = $return['newWidth'];
+			$t_im['img_height']	  = $return['newHeight'];
+			$t_im['img_location'] = count($return) ? $storagePath['dir'] . 'photo-thumb-'.$memberId . '.' . $ext : $upload_dir . $fileLocation;
+		} 
+		else 
+		{
+			$_data = IPSLib::scaleImage( array(  'max_height' => $t_height,
+												 'max_width'  => $t_width,
+												 'cur_width'  => $imageDimensions[0],
+												 'cur_height' => $imageDimensions[1] ) );
+
+			$t_im['img_width']		= $_data['img_width'];
+			$t_im['img_height']		= $_data['img_height'];
+			$t_im['img_location']	= $upload_dir . $fileLocation;
+		}
+		
+		/** MAIN PHOTO **/
+		if ( $imageDimensions[0] > $p_width OR $imageDimensions[1] > $p_height )
+		{
+			$image = ips_kernel_image::bootstrap( 'gd' );
+			
+			$image->init( array( 'image_path'	  => $upload_path, 
+								 'image_file'	  => $fileLocation ) );
+            
+			$return = $image->resizeImage( $p_width, $p_height );
+			$image->writeImage( $storagePath['path'] . '/' . 'photo-'.$memberId . '.' . $ext );
+            
+			$t_real_name = $return['thumb_location'] ? $return['thumb_location'] : $fileLocation;
+            
+			$im['img_width']  = $return['newWidth']  ? $return['newWidth']   : $image->cur_dimensions['width'];
+			$im['img_height'] = $return['newHeight'] ? $return['newHeight'] : $image->cur_dimensions['height'];
+			
+			$return['final_location'] = $storagePath['dir'] . $fileLocation;
+		}
+		else
+		{
+			$im['img_width']  = $imageDimensions[0];
+			$im['img_height'] = $imageDimensions[1];
+			
+			$return['final_location'] = $upload_dir . $fileLocation;
+		}
+	
+		/* Main photo */
+		// If we don't rebuild, the image is in the original location - which may not be in the /profile folder */
+		//$return['final_location'] = $storagePath['dir'] . $fileLocation;
+		$return['final_width']    = $im['img_width'];
+		$return['final_height']   = $im['img_height'];
+		
+		/* Thumb */
+		/* If we don't need to resize, it's same as the main image (which may get moved during IT'S resize) */
+		$return['t_final_location'] = $needResize ? $t_im['img_location'] : $return['final_location'];
+		$return['t_file_name']		= $t_im['img_location'];
+		$return['t_final_width']    = $t_im['img_width'];
+		$return['t_final_height']   = $t_im['img_height'];
+
+		$return['status'] = 'ok';
+		return $return;
+	}
+	
+	/**
+	 * Fetch upload path and dir
+	 * 
+	 * @param	bool	Skip profile/ directory
+	 */
+	protected function _getProfileUploadPaths( $skipDir=false )
+	{
+		/* Fix for bug 5075 */
+		$this->settings['upload_dir'] = str_replace( '&#46;', '.', $this->settings['upload_dir'] );		
+
+		$upload_path  = $this->settings['upload_dir'];
+		
+		if ( ! $skipDir )
+		{
+			/* Create a dir if need be */
+			if ( ! file_exists( $upload_path . "/profile" ) )
+			{
+				if ( @mkdir( $upload_path . "/profile", IPS_FOLDER_PERMISSION ) )
+				{
+					@file_put_contents( $upload_path . '/profile/index.html', '' );
+					@chmod( $upload_path . "/profile", IPS_FOLDER_PERMISSION );
+					
+					# Set path and dir correct
+					$upload_path .= "/profile";
+					$upload_dir   = "profile/";
+				}
+				else
+				{
+					# Set path and dir correct
+					$upload_dir   = "";
+				}
+			}
+			else
+			{
+				# Set path and dir correct
+				$upload_path .= "/profile";
+				$upload_dir   = "profile/";
+			}
+		}
+		
+		return array( 'path' => $upload_path, 'dir' => $upload_dir );
+	}
+	
+	/**
+	 * Returns the editor for viewing ...
+	 * @param unknown_type $member
+	 */
+	public function getEditorHtml( array $member )
+	{
+		/* Fetch member data */
+		$member = IPSMember::buildDisplayData( IPSMember::load( $member['member_id'], 'all' ) );
+		
+		$p_w       = "";
+		$p_h       = "";
+		$cur_photo = "";
+		$rand      = urlencode( microtime() );
+		$data      = array( 'currentPhoto' => array( 'tag' => '' ),
+							'custom'       => array( 'tag' => '' ),
+							'gravatar'     => array( 'tag' => '' ),
+							'twitter'      => array( 'tag' => '' ) );
+				
+		/* Photo type */		
+		$data['type'] = $member['pp_photo_type'] = $this->getPhotoType( $member );
+		
+		/* Got gravatar? */
+		$member['pp_gravatar'] = ( $member['pp_gravatar'] ) ? $member['pp_gravatar'] : $member['email'];
+		
+		/* Quick permission check */
+		if ( ! IPSMember::canUploadPhoto( $member ) )
+ 		{
+ 			return false;
+ 		}
+ 		
+ 		/* Set the current photo */
+ 		$data['currentPhoto']['tag'] = IPSMember::buildProfilePhoto( $member, 'full', IPS_MEMBER_PHOTO_NO_CACHE );
+ 		
+ 		/* Set up custom */
+ 		$data['custom']['tag']  = ( $member['pp_photo_type'] != 'custom' ) ? IPSMember::buildNoPhoto( $member, 'thumb', false, true ) : "<img src='".$member['pp_thumb_photo'].'?__rand='. $rand . "' width='". $member['pp_thumb_width'] ."' height='". $member['pp_thumb_height'] ."' />";
+ 		
+ 		/* Set up Gravatar */
+		$data['gravatar']['tag'] = "<img src='http://www.gravatar.com/avatar/" . md5( $member['pp_gravatar'] ) . "?s=100' alt='' />";
+ 		
+		/* Twitter linked? */
+		if ( IPSLib::twitter_enabled() && $member['twitter_token'] && $member['twitter_secret'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+			$twitter	 = new $classToLoad( $this->registry, $member['twitter_token'], $member['twitter_secret'] );
+			
+			$userData    = $twitter->fetchUserData();
+			
+			if ( $userData['profile_image_url'] )
+			{
+				$data['twitter']['tag'] = "<img src='" . str_replace( '_normal.', '.', $userData['profile_image_url'] ) . "' />";
+			}
+		}
+		
+		/* Facebook linked? */
+		if ( IPSLib::fbc_enabled() && $member['fb_uid'] )
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+			$facebook    = new $classToLoad( $this->registry );
+			
+			/* Now get the linked user */
+			$linkedMemberData = IPSMember::load( intval($member['fb_uid']), 'all', 'fb_uid' );
+			
+			$userData = $facebook->fetchUserData();
+			
+			if ( $userData['pic_big'] )
+			{
+				$data['facebook']['tag'] = "<img src='" . $userData['pic_big'] . "' />";
+			}
+			else if ( $userData['pic'] )
+			{
+				$data['facebook']['tag'] = "<img src='" . $userData['pic'] . "' />";
+			}
+		}
+		
+		/* Got another upload domain? */
+		if ( $this->settings['upload_domain'] )
+		{
+			if( $member->session_type == 'cookie' )
+			{
+				//$this->settings[ 'base_url'] =  $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?' ;
+			}
+			else
+			{
+				//$this->settings[ 'base_url'] =  $this->settings['upload_domain'] . '/index.' . $this->settings['php_ext'].'?s='.$this->member->session_id .'&amp;' ;
+			}
+		}
+ 		
+		$this->uploadFormMax = 5000*1024;
+		
+ 		return $this->registry->getClass('output')->getTemplate('profile')->photoEditor( $data, $member );
+		
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/member/status.php b/upload/admin/sources/classes/member/status.php
index 52f8c1fa..193975c0 100644
--- a/upload/admin/sources/classes/member/status.php
+++ b/upload/admin/sources/classes/member/status.php
@@ -3,16 +3,16 @@
  * <pre>
  * Status Updates Class
  * Holds various functions
- * Last Updated: $Date: 2010-11-16 11:26:43 -0500 (Tue, 16 Nov 2010) $
+ * Last Updated: $Date: 2011-10-05 15:30:51 -0400 (Wed, 05 Oct 2011) $
  * </pre>
  *
  * @author		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @author		MattMecham
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7195 $ 
+ * @link		http://hatynka.in
+ * @version		$Rev: 9582 $ 
  *
  * Example: Create new status update
  * <code>
@@ -58,20 +58,23 @@
 class memberStatus
 {
 	/**
-	* Registry Object Shortcuts
-	*/
+	 * Registry Object Shortcuts
+	 * 
+	 * @var	object
+	 */
 	protected $registry;
 	protected $DB;
 	protected $settings;
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Status set via status Id entry
 	 *
-	 * @access	protected
 	 * @var		array
 	 */
 	protected $_statusData			= array();
@@ -79,7 +82,6 @@ class memberStatus
 	/**
 	 * Owner data of status set via status Id entry
 	 *
-	 * @access	protected
 	 * @var		array
 	 */
 	protected $_statusOwner			= array();
@@ -88,18 +90,18 @@ class memberStatus
 	 * Bypass all permission checks
 	 *
 	 * Use with care, this will allow the class to be used within an API
-	 * @access	protected
+	 * 
 	 * @var		boolean
 	 */
 	protected $_bypassPermChecks = false;
 	
+	protected $_statusCount      = 0;
 	/**
 	 * Allowed items to be saved in the get/set array
 	 *
-	 * @access	protected
 	 * @var		array
 	 */
-	protected $_internalData		= array( 'IsImport' => 0, 'Creator' => 'ipb', 'ExternalUpdates' => array() );
+	protected $_internalData		= array( 'IsApproved' => 1, 'IsImport' => 0, 'Creator' => 'ipb', 'ExternalUpdates' => array() );
 	protected $_allowedInternalData	= array( 'Author',
 										   'Friend',
 										   'StatusData',
@@ -109,15 +111,15 @@ class memberStatus
 										   'ReplyData',
 										   'ReplyOwner',
 										   'ExternalUpdates',
+										   'IsApproved',
 										   'Content' );
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	object	Registry
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct( ipsRegistry $registry )
 	{
 		/* Make registry objects */
@@ -140,12 +142,20 @@ class memberStatus
 		$this->settings['tc_parse_names'] = 1;
 	}
 	
+	/**
+	 * Gets the count stored by 'fetch'
+	 * @return number
+	 */
+	public function getStatusCount()
+	{
+		return intval( $this->_statusCount );
+	}
+	
 	/**
 	 * Set the bypass permission flag
 	 *
-	 * @access	public
 	 * @param	boolean
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setBypassPermissionCheck( $bool=false )
 	{
@@ -155,7 +165,6 @@ class memberStatus
 	/**
 	 * Master check to see if statuses are enabled globally
      *
-     * @access	public
      * @return	boolean
      */
     public function isEnabled()
@@ -164,12 +173,11 @@ class memberStatus
     }
     
     /**
-	* Is status locked?
-	*
-	* @access	public
-	* @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Is status locked?
+	 *
+	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function isLocked( $status=null )
 	{
 		$status  = ( $status === null ) ? $this->_internalData['StatusData'] : ( ( is_array( $status ) ) ? $status : $this->_loadStatus( $status ) );
@@ -186,7 +194,6 @@ class memberStatus
      * Fetch status actions
      * Default filters are last 10 status actions from everyone sorted in desc date order.
      * 'not_theirs' pulls all actions that are not on their own statuses
-     * @access	public
      * @param	mixed	[Array of member data OR member ID INT for member updating their status - will use ->getAuthor() if null]	
      * @param	array	Array of sort/filter data ( member_id [int], status_id [int], offset [int], limit [int], unix_cutoff [int], sort_dir [asc,desc], sort_field [string], 'not_theirs' [0,1] )
      */
@@ -254,7 +261,7 @@ class memberStatus
 			$row['action_date_formatted_short'] = $this->registry->getClass('class_localization')->getDate( $row['action_date'], 'SHORT' );
 			
 			/* Format member */
-			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0, 'avatar' => 0 ) );
+			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0 ) );
 			
 			/* Status owner */
 			if ( $row['status_member_id'] )
@@ -274,7 +281,7 @@ class memberStatus
 			{
 				if ( $row['status_member_id'] )
 				{
-					$actions[ $id ]['owner'] = IPSMember::buildDisplayData( $members[ $row['status_member_id'] ], array( 'reputation' => 0, 'warn' => 0, 'avatar' => 0 ) );
+					$actions[ $id ]['owner'] = IPSMember::buildDisplayData( $members[ $row['status_member_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
 				}
 			}
 		}
@@ -287,13 +294,16 @@ class memberStatus
      * Fetch status updates
      * Default filters are last 10 status updates from everyone sorted in desc date order.
      * The 'latest_only' flag will grab the last 10 member's updates. Otherwise it'll just grab the last 10 updates which could be from 1 or more people
-     * The 'member_id' field will only fetch status updates made by member_id (int)
+     * The 'member_id' field will only fetch status updates made by member_id (int) UNLESS type set
+     * The 'owner_id' field will fetch status updates made by author_id (INT)
      * The 'status_id' field will only fetch status updates made by status_id (int)
      * The 'friends_only' flag will only fetch status updates from authors friends
-     *
-     * @access	public
+     * The 'type' flag can contain 'all', 'mine', 'theirs' - default is 'mine'.
+     * The 'isApproved' flag can contain true, false or null (true, approved only, false, unapproved only, null both)
+     * getCount - returns a count of all matches without the limit
+     * 
      * @param	mixed	[Array of member data OR member ID INT for member updating their status - will use ->getAuthor() if null]	
-     * @param	array	Array of sort/filter data ( member_id [int], latest_only [0,1], offset [int], limit [int], unix_cutoff [int], sort_dir [asc,desc], sort_field [string] )
+     * @param	array	Array of sort/filter data ( member_id [int], latest_only [0,1], offset [int], limit [int], unix_cutoff [int], sort_dir [asc,desc], sort_field [string], type [string] )
      */
     public function fetch( $author=null, $filters=array() )
     {
@@ -302,10 +312,29 @@ class memberStatus
     	$statuses = array();
     	$mids     = array();
     	$friends  = array();
+    	$authors  = array();
+    	
+    	/* Set up some filters */
+    	$filters['type'] = ( empty( $filters['type'] ) ) ? 'mine' : $filters['type'];
     	
     	if ( isset( $filters['member_id'] ) )
     	{
     		$where[] = "s.status_member_id=" . intval( $filters['member_id'] );
+    		
+    		if ( $filters['type'] == 'mine' )
+    		{
+    			$where[] = "s.status_author_id=" . intval( $filters['member_id'] );
+    		}
+    	}
+    	
+   		if ( isset( $filters['relatedTo'] ) )
+    	{
+    		$where[] = "s.status_member_id=" . intval( $filters['relatedTo'] ) . ' OR s.status_author_id=' . intval( $filters['relatedTo'] );   		
+    	}
+    	
+    	if ( isset( $filters['ownerOnly'] ) )
+    	{
+    		$where[] = "s.status_author_id=s.status_member_id";
     	}
     	
     	if ( isset( $filters['status_id'] ) )
@@ -323,13 +352,24 @@ class memberStatus
     		$where[] = "s.status_is_latest =" . intval( $filters['status_is_latest'] );
     	}
     	
-    	if ( isset( $filters['friends_only'] ) AND $filters['friends_only'] )
+    	if ( isset( $filters['isApproved'] ) && $filters['isApproved'] !== null )
+    	{
+    		if ( $filters['isApproved'] === true )
+    		{
+    			$where[] = "s.status_approved=1";
+    		}
+    		else if ( $filters['isApproved'] === false )
+    		{
+    			$where[] = "s.status_approved=0";
+    		}
+    	}
+    	
+    	if ( !empty( $filters['friends_only'] ) )
     	{
     		/* Hard limit to 300 friends */
     		$this->DB->build( array( 'select' => 'friends_friend_id',
     								 'from'   => 'profile_friends',
     								 'where'  => 'friends_member_id=' . $author['member_id'],
-    								 //'order'  => 'friends_added DESC',
     								 'limit'  => array( 0, 300 ) ) );
     		$this->DB->execute();
     		
@@ -350,7 +390,24 @@ class memberStatus
     	$sort_field = ( isset( $filters['sort_field'] ) ) ? $filters['sort_field'] : 'status_date';
     	$offset     = ( isset( $filters['offset'] ) ) ? intval( $filters['offset'] ) : 0;
     	$limit      = ( isset( $filters['limit'] ) ) ? intval( $filters['limit'] ) : 10;
-    	$member_id  = ( isset( $filters['member_id'] ) AND $filters['member_id'] ) ? $filters['member_id'] : 0;
+    	$member_id  = !empty( $filters['member_id'] ) ? $filters['member_id'] : 0;
+    	
+    	if ( ! empty( $filters['getCount'] ) )
+    	{
+    		$count = $this->DB->buildAndFetch( array( 'select'   => 'count(*) as cnt',
+												      'from'	 => array( 'member_status_updates' => 's' ),
+												      'where'    => ( count( $where ) ) ? implode( ' AND ', $where ) : '',
+												      'add_join' => array(array(
+																				  'from'	 => array( 'members' => 'm' ),
+																				  'where'    => 'm.member_id=s.status_author_id',
+																				  'type'	 => 'left' ),
+																		  array( 
+																				  'from'	 => array( 'profile_portal' => 'pp' ),
+																				  'where'    => 'pp.pp_member_id=m.member_id',
+																				  'type'	 => 'left' ) ) ) );
+																		  
+			$this->_statusCount = intval( $count['cnt'] );
+    	}
     	
     	/* Grab them */
     	$this->DB->build( array( 'select'   => 's.*',
@@ -360,7 +417,7 @@ class memberStatus
 							     'limit'    => array( $offset, $limit ),
 							     'add_join' => array(array(  'select'	=> 'm.*',
 															 'from'	    => array( 'members' => 'm' ),
-															 'where'    => 'm.member_id=s.status_member_id',
+															 'where'    => 'm.member_id=s.status_author_id',
 															 'type'	    => 'left' ),
 													 array(  'select'   => 'pp.*',
 															 'from'	    => array( 'profile_portal' => 'pp' ),
@@ -382,8 +439,14 @@ class memberStatus
 			$row['_creatorImg']					= $this->creatorImage( $row );
 			$row['_creatorText']				= $this->creatorText( $row );
 			
+			/* For someone else? */
+			if ( $row['status_member_id'] != $row['status_author_id'] )
+			{
+				$authorIds[ $row['status_id'] ] = $row['status_member_id'];
+				$mids[$row['status_member_id']] = $row['status_member_id'];
+			}
 			/* Format member */
-			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0, 'avatar' => 0 ) );
+			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0 ) );
 			
 			/* Replies */
 			if ( $row['status_replies'] AND strstr( $row['status_last_ids'], 'a:' ) )
@@ -419,6 +482,11 @@ class memberStatus
 			
 			foreach( $statuses as $id => $row )
 			{
+				if ( $row['status_member_id'] != $row['status_author_id'] )
+				{
+					$statuses[ $id ]['owner'] = IPSMember::buildDisplayData( $members[ $row['status_member_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
+				}
+				
 				if ( is_array( $row['replies'] ) )
 				{
 					foreach( $row['replies'] as $rid => $r )
@@ -427,7 +495,7 @@ class memberStatus
 						{
 							if ( ! isset( $members[ $r['reply_member_id'] ]['_done'] ) )
 							{
-								$members[ $r['reply_member_id'] ] = IPSMember::buildDisplayData( $members[ $r['reply_member_id'] ], array( 'reputation' => 0, 'warn' => 0, 'avatar' => 0 ) );
+								$members[ $r['reply_member_id'] ] = IPSMember::buildDisplayData( $members[ $r['reply_member_id'] ], array( 'reputation' => 0, 'warn' => 0 ) );
 								$members[ $r['reply_member_id'] ]['_done'] = 1;
 							}
 							
@@ -446,7 +514,6 @@ class memberStatus
      * Fetch all replies to a status
      * Default filters are sorted on reply_date ASC
      *
-     * @access	public
      * @param	mixed	[Array of member data OR member ID INT for member updating their status - will use ->getAuthor() if null]	
      * @param	array	Array of sort/filter data ( member_id [int], latest_only [0,1], offset [int], limit [int], unix_cutoff [int], sort_dir [asc,desc], sort_field [string] )
      */
@@ -485,7 +552,7 @@ class memberStatus
 			$row['_canDelete']			 = $this->canDeleteReply( $this->getAuthor(), $row, $status );
 			
 			/* Format member */
-			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0, 'avatar' => 0 ) );
+			$row = IPSMember::buildDisplayData( $row, array( 'reputation' => 0, 'warn' => 0 ) );
 			
 			$replies[ $row['reply_id'] ] = $row;
 		}
@@ -497,23 +564,25 @@ class memberStatus
     /**
      * Create a status update for a member
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
+     * @param   array   [Array of member data for owner of status update. If null and StatusOwner empty, getAuthor will be used]
      * @return	array	Status information
      */
-    public function create( $author=null )
+    public function create( $author=null, $owner=null )
     {
     	$author = ( $author === null ) ? $this->getAuthor() : $author;
+    	$_owner = $this->getStatusOwner();
+    	$owner  = ( $owner  === null ) ? ( ! empty( $_owner['member_id'] ) ? $_owner : $author ) : $owner;
     	
-    	if ( $this->canCreate( $author ) )
-    	{ 
+    	if ( $this->canCreate( $author, $owner ) )
+    	{
     		if ( $this->getContent() )
     		{
     			$content = $this->_cleanContent( $this->getContent() );
     			$hash    = IPSText::contentToMd5( $content );
     			
     			/* Check for this status update already created */
-    			$test = $this->fetchByHash( $author['member_id'], $hash );
+    			$test = $this->fetchByHash( $owner['member_id'], $hash );
     			
     			if ( $test['status_id'] )
     			{
@@ -521,11 +590,14 @@ class memberStatus
     				return FALSE;
     			}
     			
-    			$data = array( 'status_member_id' => $author['member_id'],
+    			$data = array( 'status_member_id' => $owner['member_id'],
+    						   'status_author_id' => $author['member_id'],
 							   'status_date'	  => time(),
 							   'status_content'   => $this->_parseContent( $content, $this->_internalData['Creator'] ),
 							   'status_hash'      => $hash,
 							   'status_replies'	  => 0,
+    						   'status_author_ip' => $this->member->ip_address,
+    						   'status_approved'  => $this->getIsApproved(),
 							   'status_imported'  => intval( $this->_internalData['IsImport'] ),
 							   'status_creator'   => trim( addslashes( $this->_internalData['Creator'] ) ),
 							   'status_last_ids'  => '' );
@@ -535,80 +607,88 @@ class memberStatus
     			$status_id = $this->DB->getInsertId();
     			
     			$data['status_id']	= $status_id;
-    			  
-    			$this->_recordAction( 'new', $author, $data );
-    			
-    			$this->rebuildOwnerLatest( $author );
-    			
-    			/* Fire off external updates */
-    			$eU = $this->getExternalUpdates();
-    			
-    			if ( ! $this->_internalData['IsImport'] AND is_array( $eU ) )
+    			 
+    			if ( $owner['member_id'] != $author['member_id'] )
     			{
-    				$this->_triggerExternalUpdates( $eU, $status_id, $author, $content );
+    				$this->_sendCommentNotification( $author, $owner, $data );
     			}
-    			
-    			//-----------------------------------------
-    			// Notify owner's friends as configured
-    			//-----------------------------------------
-    			
-    			$friends	= array();
-    			
-    			if ( $this->settings['friends_enabled'] )
+    			else
     			{
-	    			$this->DB->build( array( 'select' => 'friends_member_id', 'from' => 'profile_friends', 'where' => 'friends_friend_id=' . $author['member_id'] ) );
-	    			$this->DB->execute();
+	    			$this->_recordAction( 'new', $author, $data );
 	    			
-	    			while( $_friend = $this->DB->fetch() )
+	    			$this->rebuildOwnerLatest( $owner );
+	    			
+	    			/* Fire off external updates */
+	    			$eU = $this->getExternalUpdates();
+	    			
+	    			if ( ! $this->_internalData['IsImport'] AND is_array( $eU ) )
 	    			{
-	    				$friends[ $_friend['friends_member_id'] ]	= $_friend['friends_member_id'];
+	    				$this->_triggerExternalUpdates( $eU, $status_id, $owner, $content );
 	    			}
-				}
-				
-				if( count($friends) )
-				{
-					//-----------------------------------------
-					// Notifications library
-					//-----------------------------------------
-					
-					$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
-					$notifyLibrary		= new $classToLoad( $this->registry );
-						
-	    			$friends	= IPSMember::load( $friends );
 	    			
-	    			foreach( $friends as $friend )
-	    			{	
-						$friend['language'] = $friend['language'] == "" ? IPSLib::getDefaultLanguage() : $friend['language'];
-						
-			    		$ndata = array( 'NAME'		=> $friend['members_display_name'],
-			    					   'OWNER'		=> $author['members_display_name'],
-									   'STATUS'		=> $data['status_content'],
-									   'URL'		=> $this->settings['base_url'] . 'app=core&amp;module=usercp&amp;tab=core&amp;area=notifications' );
-																			
-						IPSText::getTextClass('email')->getTemplate( 'new_status', $friend['language'] );
-						
-						IPSText::getTextClass('email')->buildMessage( $ndata );
-						
-						IPSText::getTextClass('email')->subject	= sprintf( 
-																			IPSText::getTextClass('email')->subject, 
-																			$this->registry->output->buildSEOUrl( 'showuser=' . $author['member_id'], 'public', $author['members_seo_name'], 'showuser' ), 
-																			$this->settings['base_url'] . 'app=members&module=profile&section=status&do=list&status_id=' . $status_id
-																		);
-		
-						$notifyLibrary->setMember( $friend );
-						$notifyLibrary->setFrom( $author );
-						$notifyLibrary->setNotificationKey( 'friend_status_update' );
-						$notifyLibrary->setNotificationUrl( $this->settings['base_url'] . 'app=members&module=profile&section=status&do=list&status_id=' . $status_id );
-						$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
-						$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
-						
-						try
-						{
-							$notifyLibrary->sendNotification();
-						}
-						catch( Exception $e ){}
+	    			//-----------------------------------------
+	    			// Notify owner's friends as configured
+	    			//-----------------------------------------
+	    			
+	    			$friends	= array();
+	    			
+	    			if ( $this->settings['friends_enabled'] AND $author['member_id'] == $owner['member_id'] )
+	    			{
+		    			$this->DB->build( array( 'select' => 'friends_member_id', 'from' => 'profile_friends', 'where' => 'friends_friend_id=' . $owner['member_id'] ) );
+		    			$this->DB->execute();
+		    			
+		    			while( $_friend = $this->DB->fetch() )
+		    			{
+		    				$friends[ $_friend['friends_member_id'] ]	= $_friend['friends_member_id'];
+		    			}
 					}
-				}
+					
+					if( count($friends) )
+					{
+						//-----------------------------------------
+						// Notifications library
+						//-----------------------------------------
+						
+						$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+						$notifyLibrary		= new $classToLoad( $this->registry );
+							
+		    			$friends	= IPSMember::load( $friends );
+		    			
+		    			foreach( $friends as $friend )
+		    			{	
+							$friend['language'] = $friend['language'] == "" ? IPSLib::getDefaultLanguage() : $friend['language'];
+							
+				    		$ndata = array( 'NAME'		=> $friend['members_display_name'],
+				    					   'OWNER'		=> $owner['members_display_name'],
+										   'STATUS'		=> $data['status_content'],
+										   'URL'		=> $this->settings['base_url'] . 'app=core&amp;module=usercp&amp;tab=core&amp;area=notifications' );
+																				
+							IPSText::getTextClass('email')->getTemplate( 'new_status', $friend['language'] );
+							
+							IPSText::getTextClass('email')->buildMessage( $ndata );
+							
+							IPSText::getTextClass('email')->subject	= sprintf( 
+																				IPSText::getTextClass('email')->subject, 
+																				$this->registry->output->buildSEOUrl( 'showuser=' . $owner['member_id'], 'publicNoSession', $owner['members_seo_name'], 'showuser' ),
+																				$owner['members_display_name'],
+																				$this->registry->output->buildSEOUrl( 'app=members&module=profile&section=status&do=list&status_id=' . $status_id, 'publicNoSession' )
+																			);
+			
+							$notifyLibrary->setMember( $friend );
+							$notifyLibrary->setFrom( $author );
+							$notifyLibrary->setNotificationKey( 'friend_status_update' );
+							$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'app=members&module=profile&section=status&do=list&status_id=' . $status_id, 'publicNoSession' ) );
+							$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+							$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+							
+							try
+							{
+								$notifyLibrary->sendNotification();
+							}
+							catch( Exception $e ){}
+						}
+					}
+	    		}
     		}
     		
     		return $data;
@@ -620,7 +700,6 @@ class memberStatus
     /**
      * Create a status update for a member
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
      * @return	array	Reply information
@@ -659,13 +738,12 @@ class memberStatus
     
     /**
      * Triggers external postings Twitter, etc
-     * @todo At some point it could be expanded into a mini framework with plugins 
      *
-     * @access	protected
      * @param	array		Update to...
      * @param	int			Status ID just posted
      * @param	array		[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	string  	[Content to update]
+     * @todo [Future]		At some point it could be expanded into a mini framework with plugins 
      */
     protected function _triggerExternalUpdates( $updates, $status_id=0, $author=null, $content=null )
     {
@@ -685,8 +763,8 @@ class memberStatus
     		{
     			$url     = $this->settings['base_url'] . 'app=members&module=profile&section=status&do=list&status_id=' . $status_id;
     			
-    			require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-				$twitter = new twitter_connect( $this->registry, $author['twitter_token'], $author['twitter_secret'] );
+    			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+    			$twitter = new $classToLoad( $this->registry, $author['twitter_token'], $author['twitter_secret'] );
 				
 				$twitter->updateStatusWithUrl( $content, $url, FALSE );
     		}
@@ -699,8 +777,8 @@ class memberStatus
     		{ 
     			$url     = $this->settings['base_url'] . 'app=members&module=profile&section=status&do=list&status_id=' . $status_id;
     			
-    			require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-    			$facebook = new facebook_connect( $this->registry );
+    			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+    			$facebook = new $classToLoad( $this->registry );
 				$facebook->updateStatusWithUrl( $content, $url, FALSE );
     		}
     	}
@@ -712,7 +790,6 @@ class memberStatus
      * Emails users of new status replies
      * Emails owner (if selected) and anyone else who replied (if selected)
      *
-     * @access	protected
      * @param	array		Author array
      * @param	array		Status array
      * @param	array		Reply array
@@ -891,10 +968,51 @@ class memberStatus
     	return FALSE;
     }
     
+	/**
+     * Send comment notification
+     *
+     * Emails users of new status replies
+     * Emails owner (if selected) and anyone else who replied (if selected)
+     *
+     * @param	array		Author array
+     * @param	array		Status array
+     * @param	array		Reply array
+     * @return	boolean
+     */
+    protected function _sendCommentNotification( $author, $owner, $status )
+    {
+ 		$classToLoad		= IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/member/notifications.php', 'notifications' );
+		$notifyLibrary		= new $classToLoad( $this->registry );
+
+		IPSText::getTextClass('email')->getTemplate( "new_comment_added", $owner['language'] );
+	
+		IPSText::getTextClass( 'email' )->buildMessage( array(  'MEMBERS_DISPLAY_NAME'	=> $owner['members_display_name'],
+																'COMMENT_NAME'			=> $author['members_display_name'],
+																'LINK'					=> $this->settings['board_url'] . '/index.' . $this->settings['php_ext'] . '?showuser=' . $owner['member_id'] )	 );
+
+		IPSText::getTextClass('email')->subject	= sprintf(  IPSText::getTextClass('email')->subject, 
+															$this->registry->output->buildSEOUrl( 'showuser=' . $owner['member_id']  . '&amp;tab=status', 'public', $owner['members_seo_name'], 'showuser' ),
+															$this->registry->output->buildSEOUrl( 'showuser=' . $author['member_id'], 'public', $author['members_seo_name'], 'showuser' ), 
+															$this->memberData['members_display_name'] );
+
+		$notifyLibrary->setMember( $owner );
+		$notifyLibrary->setFrom( $author );
+		$notifyLibrary->setNotificationKey( 'profile_comment' );
+		$notifyLibrary->setNotificationUrl( $this->registry->output->buildSEOUrl( 'showuser=' . $owner['member_id']  . '&amp;tab=status', 'public', $owner['members_seo_name'], 'showuser' ) );
+		$notifyLibrary->setNotificationText( IPSText::getTextClass('email')->message );
+		$notifyLibrary->setNotificationTitle( IPSText::getTextClass('email')->subject );
+		try
+		{
+			$notifyLibrary->sendNotification();
+		}
+		catch( Exception $e ){}
+    	
+    	return FALSE;
+    }
+    
     /**
      * Lock status
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
      * @return	boolean
@@ -927,7 +1045,6 @@ class memberStatus
     /**
      * Unlock status
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
      * @return	boolean
@@ -957,7 +1074,6 @@ class memberStatus
     /**
      * Delete all user's status'
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @return	boolean
      */
@@ -999,7 +1115,6 @@ class memberStatus
      /**
      * Delete all user's replies
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @return	boolean
      */
@@ -1068,7 +1183,6 @@ class memberStatus
     /**
      * Delete status
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
      * @return	boolean
@@ -1104,7 +1218,6 @@ class memberStatus
     /**
      * Delete reply
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
 	 * @param	array	[Array of status reply information OR reply ID OR uses $this->_internalData['ReplyData'] if none]
@@ -1142,7 +1255,6 @@ class memberStatus
     /**
      * Rebuild status data
      *
-     * @access	public
      * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
      * @return	boolean
      */
@@ -1187,7 +1299,6 @@ class memberStatus
     /**
      * Rebuilds status data such as last status update, etc.
      *
-     * @access	public
      * @param	array	[Array of member data for member updating their status - will use ->getAuthor() if null]
      * @return	boolean
      */
@@ -1235,7 +1346,6 @@ class memberStatus
     /**
      * Fetch the status update by hash
      *
-     * @access	public
      * @param	int		Member ID
      */
     public function fetchByHash( $memberId, $hash )
@@ -1264,7 +1374,6 @@ class memberStatus
     /**
      * Fetch the member's latest status update
      *
-     * @access	public
      * @param	int		Member ID
      */
     public function fetchMemberLatest( $memberId )
@@ -1274,7 +1383,7 @@ class memberStatus
     	
     	$this->DB->build( array( 'select'   => 's.*',
 							     'from'	    => array( 'member_status_updates' => 's' ),
-							     'where'    => 's.status_member_id=' . intval( $memberId ),
+							     'where'    => 's.status_member_id=' . intval( $memberId ) . ' AND s.status_author_id=' . intval( $memberId ),
 							     'order'    => 's.status_date DESC',
 							     'limit'    => array( 0, 1 ),
 							     'add_join' => array(array(  'select'	=> 'm.*',
@@ -1312,7 +1421,6 @@ class memberStatus
     /**
      * Fetch creator image
      *
-     * @access	public
      * @return	string (img URL)
      */
     public function creatorImage( $status )
@@ -1326,7 +1434,7 @@ class memberStatus
     	$creator = IPSText::alphanumericalClean( $status['status_creator'] );
     	
     	/* Image exists? */
-    	if ( ! file_exists( IPS_PUBLIC_PATH . 'style_status/' . $creator . '.png' ) )
+    	if ( ! is_file( IPS_PUBLIC_PATH . 'style_status/' . $creator . '.png' ) )
     	{
     		$creator = 'ipb';
     	}
@@ -1337,7 +1445,6 @@ class memberStatus
     /**
      * Fetch creator text
      *
-     * @access	public
      * @return	string
      */
     public function creatorText( $status )
@@ -1357,15 +1464,20 @@ class memberStatus
     }
     
 	/**
-	* Perm Check: Can post a status update
-	*
-	* @access	public
-	* @return	bool
-	*/
-	public function canCreate( $author=null )
+	 * Perm Check: Can post a status update
+	 *
+	 * @return	bool
+	 */
+	public function canCreate( $author=null, $owner=null )
 	{
 		$author = ( $author === null ) ? $this->getAuthor() : $author;
 		
+		if ( $owner !== null AND $author['member_id'] != $owner['member_id'] )
+		{
+			/* Not a new status by user */
+			return $this->canComment( $author, $owner );
+		}
+		
 		if ( ! $author['member_id'] )
 		{
 			return FALSE;
@@ -1385,14 +1497,64 @@ class memberStatus
 	}
 	
 	/**
-	* Perm Check: Can post a status update
-	*
-	* @access	public
-	* @param	array	[Array of author data, uses getAuthor if none]
-	* @param	array	[Array of status owner information uses $this->_internalData['StatusOwner'] if none]
-	* @param	array	[Array of status data information uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Perm Check: Can post a comment
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status owner information uses $this->_internalData['StatusOwner'] if none]
+	 * @return	bool
+	 */
+	public function canComment( $author=null, $owner=null, $status=null )
+	{
+		$author = ( $author === null ) ? $this->getAuthor() : $author;
+		$owner  = ( $owner === null )  ? $this->_internalData['StatusOwner'] : $owner;
+		
+		/* Are we allowed to comment? */
+		if ( ! $author['g_reply_other_topics'] )
+		{
+			return false;
+		}
+		
+		if ( $author['restrict_post'] )
+		{
+			if ( $author['restrict_post'] == 1 )
+			{
+				return false;
+			}
+			
+			$post_arr = IPSMember::processBanEntry( $author['restrict_post'] );
+			
+			if ( time() >= $post_arr['date_end'] )
+			{
+				/* Update this member's profile */
+				IPSMember::save( $author['member_id'], array( 'core' => array( 'restrict_post' => 0 ) ) );
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		$_you_are_being_ignored = explode( ",", $owner['ignored_users'] );
+		
+		if ( is_array( $_you_are_being_ignored ) and count( $_you_are_being_ignored ) )
+		{
+			if ( in_array( $author['member_id'], $_you_are_being_ignored ) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Perm Check: Can post a status update
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status owner information uses $this->_internalData['StatusOwner'] if none]
+	 * @param	array	[Array of status data information uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function canReply( $author=null, $owner=null, $status=null )
 	{
 		$author = ( $author === null ) ? $this->getAuthor() : $author;
@@ -1443,13 +1605,12 @@ class memberStatus
 	}
 	
 	/**
-	* Perm Check: Can delete a status update
-	*
-	* @access	public
-	* @param	array	[Array of author data, uses getAuthor if none]
-	* @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Perm Check: Can delete a status update
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function canDeleteStatus( $author=null, $status=null )
 	{
 		$author  = ( $author === null ) ? $this->getAuthor() : $author;
@@ -1465,6 +1626,12 @@ class memberStatus
 			return FALSE;
 		}
 		
+		/* is left by someone else */
+		if ( ( $status['status_member_id'] != $status['status_author_id'] ) && $status['status_author_id'] == $author['member_id'] )
+		{
+			return true;
+		}
+		
 		if ( ! $author['g_is_supmod'] )
 		{
 			if ( $author['gbw_no_status_update'] OR $author['bw_no_status_update'] )
@@ -1482,14 +1649,13 @@ class memberStatus
 	}
 	
 	/**
-	* Perm Check: Can delete a reply
-	*
-	* @access	public
-	* @param	array	[Array of author data, uses getAuthor if none]
-	* @param	array	[Array of status reply information OR reply ID OR uses $this->_internalData['ReplyData'] if none]
-	* @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Perm Check: Can delete a reply
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status reply information OR reply ID OR uses $this->_internalData['ReplyData'] if none]
+	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function canDeleteReply( $author=null, $reply=null, $status=null )
 	{
 		$author  = ( $author === null ) ? $this->getAuthor() : $author;
@@ -1530,14 +1696,13 @@ class memberStatus
 	}
 	
 	/**
-	* Perm Check: Can lock a status
-	* status_is_locked: 1 means user lock, so owner can unlock, 2 means admin lock, so cannot unlock.
-	*
-	* @access	public
-	* @param	array	[Array of author data, uses getAuthor if none]
-	* @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Perm Check: Can lock a status
+	 * status_is_locked: 1 means user lock, so owner can unlock, 2 means admin lock, so cannot unlock.
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function canLockStatus( $author=null, $status=null )
 	{
 		$author  = ( $author === null ) ? $this->getAuthor() : $author;
@@ -1562,19 +1727,28 @@ class memberStatus
 			
 			return FALSE;
 		}
+		else
+		{
+			return true;
+		}
+		
+		/* is left by someone else */
+		if ( ( $status['status_member_id'] != $status['status_author_id'] ) && $status['status_member_id'] != $author['member_id'] )
+		{
+			return false;
+		}
 		
 		return TRUE;
 	}
 	
 	/**
-	* Perm Check: Can lock a status
-	* status_is_locked: 1 means user lock, so owner can unlock, 2 means admin lock, so cannot unlock.
-	*
-	* @access	public
-	* @param	array	[Array of author data, uses getAuthor if none]
-	* @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
-	* @return	bool
-	*/
+	 * Perm Check: Can lock a status
+	 * status_is_locked: 1 means user lock, so owner can unlock, 2 means admin lock, so cannot unlock.
+	 *
+	 * @param	array	[Array of author data, uses getAuthor if none]
+	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
+	 * @return	bool
+	 */
 	public function canUnlockStatus( $author=null, $status=null )
 	{
 		$author  = ( $author === null ) ? $this->getAuthor() : $author;
@@ -1606,7 +1780,6 @@ class memberStatus
 	/**
 	 * Record a custom action
 	 *
-	 * @access	public
 	 * @param	string	Type (new or reply)
 	 * @param	array   text, url, app
 	 * @param	array	[Array of author data, uses getAuthor if none]
@@ -1630,7 +1803,6 @@ class memberStatus
 	/**
 	 * Record an action
 	 *
-	 * @access	protected
 	 * @param	string	Type (new or reply)
 	 * @param	array	[Array of author data, uses getAuthor if none]
 	 * @param	array	[Array of status information OR status ID OR uses $this->_internalData['StatusData'] if none]
@@ -1657,7 +1829,6 @@ class memberStatus
 	/**
 	 * Load a status from the DB
 	 *
-	 * @access protected
 	 * @param	int			Status ID
 	 * @return	array		Array OR FALSE
 	 */
@@ -1706,7 +1877,6 @@ class memberStatus
 	/**
 	 * Load a reply from the DB
 	 *
-	 * @access protected
 	 * @param	int			Status ID
 	 * @return	array		Array OR FALSE
 	 */
@@ -1755,7 +1925,6 @@ class memberStatus
 	/**
 	 * Clean up content suitable for posting
 	 *
-	 * @access protected
 	 * @param	string		In
 	 * @return	string		Out
 	 */
@@ -1777,7 +1946,7 @@ class memberStatus
 		/* Auto parse tags */
 		if ( $this->settings['su_parse_url'] )
 		{
-			$content = preg_replace_callback( "#(^|\s|\(|>|\](?<!\[url\]))((?:http|https|news|ftp)://\w+[^\),\s\<\[]+)#is", array( $this, '_autoParseUrls' ), $content );
+			$content = preg_replace_callback( '#(^|\s|\(|>|\](?<!\[url\]))((?:http|https|news|ftp)://\w+[^\),\s\<\[]+)#is', array( $this, '_autoParseUrls' ), $content );
 		}
 		
 		/* Twittah? */
@@ -1800,7 +1969,6 @@ class memberStatus
 	/**
 	 * Callback to auto-parse @names
 	 * 
-	 * @access	protected
 	 * @param	array		Matches from the regular expression
 	 * @return	string		Converted text
 	 */
@@ -1812,7 +1980,6 @@ class memberStatus
 	/**
 	 * Callback to auto-parse #tags
 	 * 
-	 * @access	protected
 	 * @param	array		Matches from the regular expression
 	 * @return	string		Converted text
 	 */
@@ -1824,7 +1991,7 @@ class memberStatus
 	/**
 	 * Callback to auto-parse urls
 	 * I totally stole this from Brandon's code but do NOT tell him.
-	 * @access	protected
+	 * 
 	 * @param	array		Matches from the regular expression
 	 * @return	string		Converted text
 	 */
@@ -1861,7 +2028,6 @@ class memberStatus
 	/**
      * Check for mod posts or restricted posts or ignored
      *
-     * @access	protected
      * @param	array	[Array of author data, uses getAuthor if none]
 	 * @param	array	[Array of status owner information uses $this->_internalData['StatusOwner'] if none]
      * @return	bool
@@ -1932,7 +2098,6 @@ class memberStatus
 	/**
 	 * Various getters and setters
 	 *
-	 * @access	public
 	 * @param	string
 	 * @param	mixed		void, or an array of arguments
 	 * @return	mixed		Data
diff --git a/upload/admin/sources/classes/navigation/build.php b/upload/admin/sources/classes/navigation/build.php
new file mode 100644
index 00000000..c69669ce
--- /dev/null
+++ b/upload/admin/sources/classes/navigation/build.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Navigation Builder
+ * Owner: Matt Mecham
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		Matt Mecham
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		17th March 2011
+ * @version		$Revision: 8644 $
+ */
+
+	 
+class classes_navigation_build
+{
+	/**
+	 * Registry object
+	 *
+	 * @access	protected
+	 * @var		object
+	 */	
+	protected $registry;
+	
+	/**
+	 * Database object
+	 *
+	 * @access	protected
+	 * @var		object
+	 */	
+	protected $DB;
+	protected $app;
+	protected $extension;
+	
+	/**
+	 * Method constructor
+	 *
+	 * @access	public
+	 * @param	string		Application
+	 * @return	@e void
+	 * 
+	 */
+	public function __construct( $app='core' )
+	{
+		/* Make object */
+		$this->registry   = ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Set local data */
+		$this->setApp( $app );
+		
+		/* Load application file */
+		$this->_loadExtension();
+	}
+	
+	/**
+	 * @return the $extension
+	 */
+	public function getExtension()
+	{
+		return $this->extension;
+	}
+
+	/**
+	 * @param field_type $extension
+	 */
+	public function setExtension( $extension )
+	{
+		$this->extension = $extension;
+	}
+
+	/**
+	 * @return the $app
+	 */
+	public function getApp()
+	{
+		return $this->app;
+	}
+
+	/**
+	 * @param field_type $app
+	 */
+	public function setApp( $app )
+	{
+		$this->app = $app;
+	}
+	
+	/**
+	 * Loads the navigationd data ...
+	 */
+	public function loadApplicationTabs()
+	{
+		/* ipsRegistry::$applications only contains apps with a public title #15785 */
+		$appCache = ipsRegistry::cache()->getCache('app_cache');
+		$tabs     = array();
+		
+		/* Loop through applications */
+		foreach( $appCache as $app_dir => $app )
+		{
+			/* Only if app enabled... */
+			if ( $app['app_enabled'] )
+			{
+				/* Setup */
+				$_file  = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/navigation/generate.php';
+				$_class	= 'navigation_' . $app['app_directory'];
+				
+				/* Current app? */
+				if ( $app['app_directory'] == $this->getApp() )
+				{
+					$tabs[ $app['app_directory'] ] = $this->getExtension()->getTabName();
+					continue;
+				}
+				
+				/* Check for the file */
+				if ( is_file( $_file ) )
+				{
+					/* Get the file */
+					$__class = IPSLib::loadLibrary( $_file, $_class, $app['app_directory'] );
+					
+					/* Check for the class */
+					if ( class_exists( $__class ) )
+					{
+						/* Create an object */
+						$_obj = new $__class();
+						
+						/* Check for the module */
+						$tabs[ $app['app_directory'] ] = $_obj->getTabName();
+					}
+				}
+			}
+		}
+		
+		return $tabs;
+	}
+	
+	/**
+	 * Loads the navigationd data ...
+	 */
+	public function loadNavigationData()
+	{
+		return $this->getExtension()->getNavigationData();
+	}
+	
+	/**
+	 * Loads the current extension
+	 */
+	protected function _loadExtension()
+	{
+		/* Pointless comment! */
+		$_file	= IPSLib::getAppDir( $this->getApp() ) . '/extensions/navigation/generate.php';
+		$_class	= 'navigation_' . $this->getApp();
+		
+		/* Otherwise create object and cache */
+		if ( is_file( $_file ) )
+		{
+			$classToLoad = IPSLib::loadLibrary( $_file, $_class, $this->getApp() );
+			
+			if ( class_exists( $classToLoad ) )
+			{
+				$this->setExtension( new $classToLoad() );
+			}
+			else
+			{
+				$this->setApp('core');
+				$this->_loadExtension();
+			}
+		}
+		else
+		{
+			$this->setApp('core');
+			$this->_loadExtension();
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/navigation/index.html b/upload/admin/sources/classes/navigation/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/navigation/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/nodes/classNodes.php b/upload/admin/sources/classes/nodes/classNodes.php
index d1f2a038..775ad559 100644
--- a/upload/admin/sources/classes/nodes/classNodes.php
+++ b/upload/admin/sources/classes/nodes/classNodes.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Very lightweight simple, basic node class
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
+ * Last Updated: $Date: 2011-07-14 06:24:58 -0400 (Thu, 14 Jul 2011) $
  *
  * @example
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6725 $
+ * @version		$Revision: 9234 $
  */
 
 class classNodes
@@ -68,6 +68,7 @@ class classNodes
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -76,6 +77,7 @@ class classNodes
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Item Cache
@@ -222,7 +224,7 @@ class classNodes
 	 *						  'sqlNodeLeft'        (the SQL table field for node left)
 	 *					      'sqlNodeRight'       (the SQL table field for node right)
 	 *						  'sqlWhere'		   (Any additional 'where' information *Optional) ]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -349,11 +351,19 @@ class classNodes
     			$gotCache = array();
     		}
     	}
+    	else
+    	{
+    		if ( isset( $this->_nodeCache[ $nodeId ] ) )
+    		{
+    			return $this->_nodeCache[ $nodeId ];
+    		}
+    	}
     	
+    	/* Still here? */
     	if ( is_numeric( $nodeId ) OR ! count( $gotCache ) )
     	{
     		if ( is_array( $this->_sqlJoins ) and count( $this->_sqlJoins ) )
-			{
+			{ 
 				$this->DB->build( array( 'select'   => $this->_sqlTblPrefix . '.' . $this->_sqlSelect,
 										 'from'     => array( $this->_sqlTable => $this->_sqlTblPrefix  ),
 									 	 'where'    => $this->_sqlTblPrefix . '.' . $this->_sqlPrimaryID . $fetch,
@@ -370,7 +380,8 @@ class classNodes
 			
 			while( $row = $this->DB->fetch( $o ) )
 			{
-				$return[ $nodeId ] = $this->_nodeCache[ $nodeId ] = $row;
+				$return[ $row[ $this->_sqlPrimaryID ] ]           = $row;
+				$this->_nodeCache[ $row[ $this->_sqlPrimaryID ] ] = $row;
 			}
     	}
     	
@@ -481,7 +492,7 @@ class classNodes
     	$where = ( $where ) ? $where : $this->_sqlWhere;
     	
     	/* Fetch data */
-    	if ( is_array( $this->_sqlJoins ) and count( $this->_sqlJoins ) )
+    	if ( is_array( $this->_sqlJoins ) and count( $this->_sqlJoins ) OR ! empty( $this->_sqlTblPrefix ) )
 		{
 			$_order = $this->getOrder();
 			$order  = ( ! empty( $_order ) ) ? $_order : $this->_sqlTblPrefix . '.' . $this->_sqlNodeLeft;
@@ -489,8 +500,8 @@ class classNodes
 			$this->DB->build( array( 'select'   => $this->_sqlTblPrefix . '.' . $this->_sqlSelect,
 									 'from'     => array( $this->_sqlTable => $this->_sqlTblPrefix  ),
 									 'where'    => $where,
-								 	 'order'    => $order,
 									 'limit'    => $this->getLimit(),
+								 	 'order'    => $order,
 									 'add_join' => $this->_sqlJoins  ) );
 		}
 		else
@@ -636,6 +647,7 @@ class classNodes
 								 'from'     => array( $this->_sqlTable => $a  ),
 								 'where'    => $where,
 								 'order'    => $a . '.' . $this->_sqlNodeLeft,
+								 'limit'    => $this->getLimit(),
 								 'add_join' => $_joins  ) );
 		
         
@@ -771,7 +783,7 @@ class classNodes
     {
     	$nInfo = $this->fetchNodeInfo( $parentId );
     	
-    	if ( ! isset( $nInfo[0] ) )
+    	if ( ! isset( $nInfo[0] ) OR empty( $parentId ) )
     	{
     		 /* Add without parents? */
     		 if ( empty( $parentId ) )
@@ -872,7 +884,7 @@ class classNodes
             
             $whr = $this->_sqlNodeLeft . ' BETWEEN ' . ( $leftIdP + 1 ) . ' AND ' . ( $rightIdP - 1 );
         }
-        else if ( $newParentId > 0 && $leftIdP < $leftId )
+        else if ( $leftIdP < $leftId )
         {
             $set = $this->_sqlNodeLevel . ' = CASE WHEN ' . $this->_sqlNodeLeft . ' BETWEEN ' . $leftId . ' AND ' . $rightId . ' THEN ' . $this->_sqlNodeLevel . sprintf( '%+d', - ( $level - 1 ) + $levelP ) . ' ELSE ' . $this->_sqlNodeLevel . ' END, '
 	             . $this->_sqlNodeLeft . ' = CASE WHEN ' . $this->_sqlNodeLeft . ' BETWEEN ' . $rightIdP . ' AND ' . ( $leftId - 1 ) . ' THEN ' . $this->_sqlNodeLeft . '+' . ( $rightId - $leftId + 1 ) . ' '
@@ -1166,7 +1178,7 @@ class nodeFunctions
 		/* Init */
 		$nested = array();
         $depths = array();
-
+		
         foreach( $array as $key => $data )
         {
             if ( $data[ $nDepthField ] == 0 )
diff --git a/upload/admin/sources/classes/nodes/index.html b/upload/admin/sources/classes/nodes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/nodes/index.html
+++ b/upload/admin/sources/classes/nodes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/adminOutput.php b/upload/admin/sources/classes/output/adminOutput.php
index ce4c7971..4a858b28 100644
--- a/upload/admin/sources/classes/output/adminOutput.php
+++ b/upload/admin/sources/classes/output/adminOutput.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin Output Library
- * Last Updated: $LastChangedDate: 2010-10-11 20:21:22 -0400 (Mon, 11 Oct 2010) $
+ * Last Updated: $LastChangedDate: 2011-10-04 08:19:01 -0400 (Tue, 04 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6962 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9578 $
  *
  */
 
@@ -22,15 +22,13 @@ class adminOutput extends output
 	/**
 	 * Output started
 	 *
-	 * @access	private
 	 * @var		boolean
 	 */
-	private $_IS_PRINTED;
+	protected $_IS_PRINTED;
 
 	/**
 	 * Global ACP template
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $global_template = '';
@@ -38,7 +36,6 @@ class adminOutput extends output
 	/**#@+
 	 * HTML variables
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $html = '';
@@ -50,7 +47,6 @@ class adminOutput extends output
 	/**#@+
 	 * Navigation array entries
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $extra_nav = array();
@@ -61,7 +57,6 @@ class adminOutput extends output
 	/**
 	 * Do not build nav, we will do manually
 	 *
-	 * @access	public
 	 * @var		bool
 	 */
 	public $ignoreCoreNav	= false;
@@ -69,7 +64,6 @@ class adminOutput extends output
 	/**
 	 * Page titles
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $extra_title = array();
@@ -77,59 +71,32 @@ class adminOutput extends output
 	/**#@+
 	 * Global messages
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $global_message;
+	public $persistent_message	= 0;
 	public $global_error;
 	/**#@-*/
-
-	/**
-	 * Tab buttons
-	 *
-	 * @access	public
-	 * @var		array
-	 */
-	public $tab_buttons     = array();
-
-	/**
-	 * Tabs
-	 *
-	 * @access	public
-	 * @var		array
-	 */
-	public $tab_tabs        = array();
-
-	/**
-	 * Javascript action to execute on tab click
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $tab_js_action   = '';
-
-	/**
-	 * Default tab
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $default_tab     = '';
 	
 	/**
 	 * Any extra HTML to stick in the sidebar
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $sidebar_extra     = '';
+	
+	/**
+	 * Valid tab keys
+	 *
+	 * @var		array
+	 */
+	protected $tabKeys	= array( 'core', 'forums', 'members', 'lookfeel', 'support', 'reports', 'other' );
 
 	/**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -170,24 +137,35 @@ class adminOutput extends output
 
 		$this->settings['extraJsModules']	= '';
 	}
+	
+	/**
+	 * Set a global message to be used
+	 *
+	 * @param	string	$message	Message to show
+	 * @param	int		$persistent	Whether to show message inline (1) or not (0)
+	 * @return	@e void
+	 */
+	public function setMessage( $message, $persistent=0 )
+	{
+		$this->global_message		= $message;
+		$this->persistent_message	= intval($persistent);
+	}
 
 	/**
 	 * Load a root (non-application) template
 	 *
-	 * @access	public
 	 * @param	string		Template name
 	 * @return	object
 	 */
 	public function loadRootTemplate( $template )
 	{
-		require_once( IPS_ROOT_PATH . "skin_cp/" . $template . ".php" );
-		return new $template( ipsRegistry::instance() );
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'skin_cp/' . $template . '.php', $template );
+		return new $classToLoad( ipsRegistry::instance() );
 	}
 
 	/**
 	 * Load a template file
 	 *
-	 * @access	public
 	 * @param	string		Template name
 	 * @param	string		Application [defaults to current application]
 	 * @return	object
@@ -197,15 +175,15 @@ class adminOutput extends output
 		$app = $app ? $app : IPS_APP_COMPONENT;
 
 		/* Skin file exists? */
-		if ( file_exists( IPSLib::getAppDir(  $app ) . "/skin_cp/".$template.".php" ) )
+		if ( is_file( IPSLib::getAppDir( $app ) . "/skin_cp/".$template.".php" ) )
 		{
 			$_pre_load = IPSDebug::getMemoryDebugFlag();
+			
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/skin_cp/'.$template.'.php', $template, $app );
+			
+			IPSDebug::setMemoryDebugFlag( "CORE: Template Loaded ({$classToLoad})", $_pre_load );
 
-			require_once( IPSLib::getAppDir(  $app ) . "/skin_cp/".$template.".php" );
-
-			IPSDebug::setMemoryDebugFlag( "CORE: Template Loaded ($template)", $_pre_load );
-
-			return new $template( $this->registry );
+			return new $classToLoad( $this->registry );
 		}
 		else
 		{
@@ -216,12 +194,11 @@ class adminOutput extends output
 	/**
 	 * Show a download dialog box
 	 *
-	 * @access	public
 	 * @param	string		Data for the download
 	 * @param	string		Filename
 	 * @param	string		Mime-type to send to browser
 	 * @param	boolean		Compress the download
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showDownload( $data, $name, $type="unknown/unknown", $compress=true )
 	{
@@ -262,8 +239,7 @@ class adminOutput extends output
 	/**
 	 * Print a popup window - wraps HTML page in minimalized output
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function printPopupWindow()
 	{
@@ -295,33 +271,17 @@ class adminOutput extends output
 	/**
 	 * Redirect user to another page
 	 *
-	 * @access	public
 	 * @param	string		Page to redirect to
 	 * @param	string		Text to show during redirect
 	 * @param	integer		Number of seconds between page loads
 	 * @param	boolean		Allow a populated $this->registry to stop the redirect with the option to continue
-	 * @return	void
+	 * @param	boolean		Force full redirect
+	 * @return	@e void
+	 * @deprecated	Now just redirects to silentRedirectWithMessage
 	 */
-	public function redirect($url, $text, $time=2, $allowErrorToHalt=FALSE)
+	public function redirect( $url, $text, $time=2, $allowErrorToHalt=FALSE, $forcePage=FALSE )
 	{
-		/* Check for an error message */
-		if ( $allowErrorToHalt !== FALSE AND $this->registry->output->global_error )
-		{
-			$this->html_title = $this->lang->words['redirect_halt_title'];
-	
-			$this->html      = $this->global_template->global_redirect_halt( $url );
-			$this->html_main = $this->registry->getClass('output')->global_template->global_frame_wrapper();
-	
-			$this->sendOutput();
-			exit();
-		}
-		
-		$this->_sendOutputSetUp( 'redirect' );
-
-		//------------------------------------------
-		// Got board URL in url?
-		//------------------------------------------
-
+		/* Fix board URL if missing */
 		if( !$url )
 		{
 			$url	= $this->settings['_base_url'];
@@ -329,44 +289,41 @@ class adminOutput extends output
 
 		if ( strpos( $url, $this->settings['_original_base_url'] ) === false )
 		{
-			$url = $this->settings['_original_base_url'].'&'.$url;
+			$url	= $this->settings['_original_base_url'] . '&' . $url;
 		}
-
-		if ( $this->global_message )
+		
+		/* If message is particularly long, use older-style redirect screen */
+		if( strlen($text) > 512 OR $forcePage )
 		{
-			$url .= '&messageinabottleacp='.urlencode( $this->global_message );
+			$this->html			= $this->global_template->temporaryRedirect( $url, $text, $time );
+			$this->html_main	.= $this->global_template->global_frame_wrapper();
+			$this->sendOutput();
+			return;
 		}
 
-		$this->global_message   = "";
-		$this->html_title = $this->lang->words['redirect_page_text'];
-
-		$html = $this->global_template->global_redirect( $url, $time, $text );
-
-		$this->html = str_replace( '<%CONTENT%>'   , $html                      , $this->global_template->global_main_wrapper_no_furniture(IPS_DOC_CHAR_SET, $this->_css ) );
-		$this->html = str_replace( '<%TITLE%>'     , $this->html_title, $this->html );
-		$this->html = str_replace( '<%PAGE_NAV%>'  , $this->html_title, $this->html );
-
-		@header("Content-type: text/html");
-		print $this->html;
-		exit();
+		/* Otherwise use new inline message and fast redirect */
+		$this->global_message	= $text;
+		$this->silentRedirectWithMessage( $url, $allowErrorToHalt );
 	}
 
 	/**
 	 * Redirect user to another page with no intermediary screen
 	 *
-	 * @access	public
 	 * @param	string		Url to send the user to
 	 * @param	boolean		Allow a populated $this->registry to stop the redirect with the option to continue
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function silentRedirectWithMessage($url, $allowErrorToHalt=false)
 	{
 		/* Check for an error message */
 		if ( $allowErrorToHalt !== FALSE AND $this->registry->output->global_error )
 		{
-			$this->html_title = $this->lang->words['redirect_halt_title'];
-
-			$this->html_main = $this->global_template->global_redirect_halt( $url );
+			$this->html_title	= $this->lang->words['redirect_halt_title'];
+			$this->html_main	= $this->global_template->global_redirect_halt( $url );
+			
+			// This was in redirect() previously, and is different from this method, so I copied it here for reference
+			//$this->html		= $this->global_template->global_redirect_halt( $url );
+			//$this->html_main	= $this->global_template->global_frame_wrapper();
 	
 			$this->sendOutput();
 			exit();
@@ -377,7 +334,7 @@ class adminOutput extends output
 
 		if ( $this->global_message )
 		{
-			$extra = '&messageinabottleacp='.urlencode( $this->global_message );
+			$extra = '&messageinabottleacp='.urlencode( str_replace( array( "\r", "\n" ), ' ', $this->global_message ) ) . '&messagepersistent=' . intval($this->persistent_message);
 		}
 
 		$url = str_replace( "&amp;", "&", $url ) . $extra;
@@ -389,13 +346,12 @@ class adminOutput extends output
 	/**
 	 * Initialize a multi-redirect.  Creates an iframe that continuously adds the last status to the content of the iframe.
 	 *
-	 * @access	public
 	 * @param	string		Url to initialize
 	 * @param	string		Text to initialize with
 	 * @param	boolean		Add to the text
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function multipleRedirectInit( $url, $text='', $addtotext=true )
+	public function multipleRedirectInit( $url )
 	{
 		$this->_sendOutputSetUp( 'redirect' );
 
@@ -408,24 +364,27 @@ class adminOutput extends output
 	/**
 	 * Hit a multi-redirect.  Uses AJAX or redirect page appropriately
 	 *
-	 * @access	public
 	 * @param	string		Url to initialize
 	 * @param	string		Text to initialize with
 	 * @param	boolean		Add to the text
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function multipleRedirectHit( $url, $text='', $addtotext=true )
+	public function multipleRedirectHit( $url, $text='', $time=1 )
 	{
-		print $this->global_template->global_redirect_hit( $url, $text );
+		if ( !is_numeric( $time ) or $time <= 0 )
+		{
+			$time = 1;
+		}
+	
+		print $this->global_template->global_redirect_hit( $url, $text, $time );
 		exit();
 	}
 
 	/**
 	 * Finish a multi-redirect session
 	 *
-	 * @access	public
 	 * @param	string		Text to display
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function multipleRedirectFinish($text='Готово!')
 	{
@@ -436,20 +395,17 @@ class adminOutput extends output
 	/**
 	 * Display an error page
 	 *
-	 * @access	public
 	 * @param	string		Text to display
 	 * @param	integer		Error code
 	 * @param	boolean		Log error message
 	 * @param   string		Extra log data
 	 * @param	integer		Header code to send (ignored for ACP)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showError( $message, $code=0, $logError=FALSE, $logExtra='', $header=500 )
 	{
 		$this->_sendOutputSetUp( 'error' );
 
-		$this->lang->loadLanguageFile( array( 'admin_global' ), 'core' );
-		
 		$message	= $message ? $message : 'no_permission';
 		$message	= ( isset($this->lang->words[ $message ]) ) ? $this->lang->words[ $message ] : $message;
 		
@@ -483,7 +439,14 @@ class adminOutput extends output
 
 		if( $logError )
 		{
-			$this->logErrorMessage( $message, $code );
+			$_logMessage	= $message;
+			
+			if( $logExtra )
+			{
+				$_logMessage	.= ' (' . $logExtra . ')';
+			}
+			
+			$this->logErrorMessage( $_logMessage, $code );
 		}
 
 		//-----------------------------------------
@@ -504,8 +467,7 @@ class adminOutput extends output
 	/**
 	 * Output the HTML to the browser
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function sendOutput()
 	{
@@ -551,12 +513,11 @@ class adminOutput extends output
 		if( !$this->cm_output )
 		{
 			$_file  = IPSLib::getAppDir( IPS_APP_COMPONENT ) . '/skin_cp/cp_skin_' . $clean_module . '_context_menu.php';
-			$_class = 'cp_skin_' . $clean_module . '_context_menu';
-
-			if ( file_exists( $_file ) )
+			
+			if ( is_file( $_file ) )
 			{
-				require $_file;
-
+				$_class = IPSLib::loadLibrary( $_file, 'cp_skin_' . $clean_module . '_context_menu', IPS_APP_COMPONENT );
+				
 				$context_menu     = new $_class( $this->registry );
 
 				$cm_function_full = ipsRegistry::$request['do'] ? 'context_menu__' . $clean_module.'__'.ipsRegistry::$request['section'].'__'.ipsRegistry::$request['do'] : 'context_menu__' . $clean_module.'__'.ipsRegistry::$request['section'];
@@ -575,21 +536,22 @@ class adminOutput extends output
 				{
 					$this->cm_output = $context_menu->__wrap( $context_menu->$cm_module() );
 				}
-				else
-				{
-					if( ipsRegistry::$request['section'] != 'dashboard' && ipsRegistry::$request['do'] != 'index' )
-					{
-						$this->cm_output = $this->global_template->no_context_menu();
-					}
-				}
-			}
-			else
-			{
-				$this->cm_output = $this->global_template->no_context_menu();
 			}
 		}
+		
+		//-----------------------------------------
+		// Get tab order
+		//-----------------------------------------
+		
+		$_tabOrder	= ipsRegistry::getClass('adminFunctions')->staffGetCookie( 'tabOrder' );
+		
+		if( !count($_tabOrder) OR !is_array($_tabOrder) )
+		{
+			$_tabOrder	= $this->tabKeys;
+		}
 
-		$html = str_replace( '<%CONTENT%>', $this->html_main, $this->global_template->global_main_wrapper(IPS_DOC_CHAR_SET, $this->_css ) );
+		$gbl_sub_menu	= $this->_buildGlobalSubMenu();
+		$html			= str_replace( '<%CONTENT%>', $this->html_main, $this->global_template->global_main_wrapper( IPS_DOC_CHAR_SET, $this->_css, $gbl_sub_menu, $_tabOrder ) );
 
 		//------------------------------------------------
 		// Message in a bottle?
@@ -760,17 +722,54 @@ class adminOutput extends output
 			{
 				$__files = get_included_files();
 
-				$query_html .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>(".count($__files).") подключенных файлов</div><div class='row1' style='padding:6px'>\n";
+				$files		= '';
 
 				foreach( $__files as $__f )
 				{
-					$query_html .= "<strong>{$__f}</strong><br />";
+					$files .= "<strong>{$__f}</strong><br />";
 				}
 
-				$query_html .= '</div></div>';
+				$query_html .= $this->global_template->global_if_output( count($__files), $files );
 			}
 		}
 
+		//-----------------------------------------
+		// Memory usage
+		//-----------------------------------------
+
+		if ( IPS_MEMORY_DEBUG_MODE AND defined( 'IPS_MEMORY_START' ) AND IN_DEV )
+		{
+			if ( is_array( IPSDebug::$memory_debug ) )
+			{
+				$memory	= '';
+				$_c		= 0;
+
+				foreach( IPSDebug::$memory_debug as $usage )
+				{
+					$_c++;
+
+					if ( $usage[1] > 500 * 1024 )
+					{
+						$_col = "color:#D00000";
+					}
+					else if ( $usage[1] < 10 * 1024 )
+					{
+						$_col = "color:darkgreen";
+					}
+					else if ( $usage[1] < 100 * 1024 )
+					{
+						$_col = "color:darkorange";
+					}
+
+					$memory .= "<tr><td width='60%' style='{$_col}' align='left'>{$usage[0]}</td><td style='{$_col}' align='left'><strong>" . IPSLib::sizeFormat( $usage[1] ) . "</strong></td></tr>";
+				}
+			}
+
+			$_used		= memory_get_usage() - IPS_MEMORY_START;
+			$peak_used	= memory_get_peak_usage() - IPS_MEMORY_START;
+			
+			$query_html .= $this->global_template->global_memory_output( $memory, IPSLib::sizeFormat( $_used ), IPSLib::sizeFormat( $peak_used ) );
+		}
 
 		$html = str_replace( "<%QUERIES%>"            , $query_html                , $html );
 
@@ -818,51 +817,6 @@ class adminOutput extends output
 
     	print $html;
 
-		//-----------------------------------------
-		// Memory usage
-		//-----------------------------------------
-
-		if ( IPS_MEMORY_DEBUG_MODE AND defined( 'IPS_MEMORY_START' ) AND IN_DEV )
-		{
-			if ( is_array( IPSDebug::$memory_debug ) )
-			{
-				$memory .= "<br />\n<div align='center' style='margin-left:auto;margin-right:auto'><div class='tableborder' style='width:75%'>\n<div class='tableheaderalt'>MEMORY USAGE</div><div class='tablerow1' style='padding:6px'>\n";
-				$memory .= "<table width='100%'>\n";
-				$_c      = 0;
-
-				foreach( IPSDebug::$memory_debug as $usage )
-				{
-					$_col = ( $_c % 2 ) ? '#eee' : '#ddd';
-					$_c++;
-
-					if ( $usage[1] > 500 * 1024 )
-					{
-						$_col .= ";color:#D00000";
-					}
-					else if ( $usage[1] < 10 * 1024 )
-					{
-						$_col .= ";color:darkgreen";
-					}
-					else if ( $usage[1] < 100 * 1024 )
-					{
-						$_col .= ";color:darkorange";
-					}
-
-					$memory .= "<tr><td width='60%' style='background-color:{$_col}' align='left'>{$usage[0]}</td><td style='background-color:{$_col}' align='left'><strong>".IPSLib::sizeFormat( $usage[1] )."</strong></td></tr>";
-				}
-
-				$memory .= "</table></div></div></div>";
-			}
-
-			$end       = memory_get_usage();
-			$peak_end  = memory_get_peak_usage();
-			$_used     = $end - IPS_MEMORY_START;
-			$peak_used = $peak_end - IPS_MEMORY_START;
-
-			print $memory;
-			print "Total Memory Used: " . IPSLib::sizeFormat( $_used ) . " (Peak:" . IPSLib::sizeFormat( $peak_used ).")";
-		}
-
 		$this->_IS_PRINTED = 1;
 
     	exit();
@@ -872,11 +826,10 @@ class adminOutput extends output
 	 * Global set up stuff
 	 * Sorts the JS module array, calls initiate on the output engine, etc
 	 *
-	 * @access	private
 	 * @param	string		Type of output (normal/popup/redirect/error)
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _sendOutputSetUp( $type )
+	protected function _sendOutputSetUp( $type )
 	{
 		//----------------------------------------
 		// Sort JS Modules
@@ -895,10 +848,9 @@ class adminOutput extends output
 	/**
 	 * Build the primary menu
 	 *
-	 * @access	private
 	 * @return	string		Menu HTML
 	 */
-	private function _buildMenu()
+	protected function _buildMenu()
 	{
 		//-----------------------------------------
 		// INIT
@@ -933,52 +885,78 @@ class adminOutput extends output
 			}
 		}
 
+		//-----------------------------------------
+		// Apps we're going to look through
+		//-----------------------------------------
+		
+		$_appsToCheck	= array();
+		
+		if( $inFakeApp )
+		{
+			foreach( $fakeApps[ $fakeApp ] as $_fdata )
+			{
+				$_appsToCheck[ $_fdata['app'] ]	= $_fdata['app'];
+			}
+		}
+		else
+		{
+			$_appsToCheck[ ipsRegistry::$current_application ]	= ipsRegistry::$current_application;
+		}
+
 		//-----------------------------------------
 		// Loop through all menus...
 		//-----------------------------------------
 
-		if ( is_array( ipsRegistry::$modules [ ipsRegistry::$current_application ] ) )
+		foreach( $_appsToCheck as $_checkApp )
 		{
-			foreach( ipsRegistry::$modules [ ipsRegistry::$current_application ] as $data )
+			if ( is_array( ipsRegistry::$modules[ $_checkApp ] ) )
 			{
-				# Skip non-ACP module
-				if ( ! $data['sys_module_admin'] )
+				foreach( ipsRegistry::$modules[ $_checkApp ] as $data )
 				{
-					continue;
-				}
-
-				$skip = TRUE;
-
-				/* Fake app content? If so.. remove.. */
-				foreach( $fakeApps as $_app => $_fdata )
-				{
-					foreach( $_fdata as $__fdata )
+					# Skip non-ACP module
+					if ( ! $data['sys_module_admin'] )
 					{
-						/* If the fake app matches the menu we're gonna show... */
-						if ( $__fdata['app'] == $data['sys_module_application'] AND $__fdata['module'] == $data['sys_module_key'] )
+						continue;
+					}
+	
+					$skip = TRUE;
+	
+					/* Fake app content? If so.. remove.. */
+					foreach( $fakeApps as $_app => $_fdata )
+					{
+						if( $fakeApp AND $_app != $fakeApp )
 						{
-							$skip = ( $inFakeApp === TRUE AND $_app == $fakeApp ) ? FALSE : TRUE;
-							break 2;
+							continue;
 						}
-						else
+
+						foreach( $_fdata as $__fdata )
 						{
-							/* If we're in a fake app, skip non fake apps */
-							$skip = ( $inFakeApp !== TRUE ) ? FALSE : TRUE;
+							/* If the fake app matches the menu we're gonna show... */
+							if ( $__fdata['app'] == $data['sys_module_application'] AND $__fdata['module'] == $data['sys_module_key'] )
+							{
+								$skip = ( $inFakeApp === TRUE AND in_array( $__fdata['app'], $_appsToCheck ) ) ? FALSE : TRUE;
+								break 2;
+							}
+							else
+							{
+								/* If we're in a fake app, skip non fake apps */
+								$skip = ( $inFakeApp !== TRUE ) ? FALSE : TRUE;
+							}
 						}
 					}
+
+					if ( $skip === TRUE )
+					{
+						continue;
+					}
+	
+					$_tab_title = $data['sys_module_title'];
+					$_tab_key   = $data['sys_module_key'];
+	
+					$tabs[ $_checkApp ]['items'][ $_tab_key ]	= array( 'tab_title'	=> $_tab_title,
+																		 'tab_key'		=> $_tab_key );
+					$tabs[ $_checkApp ]['data']					= $data;
 				}
-
-				if ( $skip === TRUE )
-				{
-					continue;
-				}
-
-				$_tab_title = $data['sys_module_title'];
-				$_tab_key   = $data['sys_module_key'];
-
-				$tabs[ $app ]['items'][ $_tab_key ] = array( 'tab_title' => $_tab_title,
-															 'tab_key'   => $_tab_key );
-				$tabs[ $app ]['data'] = $data;
 			}
 		}
 
@@ -986,7 +964,7 @@ class adminOutput extends output
 		// Build main menu
 		//-----------------------------------------
 
-		foreach( $tabs as $dir_name => $data )
+		foreach( $tabs as $dir_name => $_data )
 		{
 			$_main_key   = isset( ipsRegistry::$applications[ $tabs[ $dir_name ]['data']['sys_module_application'] ]['app_directory'] ) ? ipsRegistry::$applications[ $tabs[ $dir_name ]['data']['sys_module_application'] ]['app_directory'] : '';
 
@@ -1003,7 +981,7 @@ class adminOutput extends output
 			// Only show this menu block, now.
 			//-----------------------------------------
 
-			if ( $_main_key != ipsRegistry::$current_application )
+			if ( !in_array( $_main_key, $_appsToCheck ) )
 			{
 				continue;
 			}
@@ -1012,7 +990,7 @@ class adminOutput extends output
 			// Loop through...
 			//-----------------------------------------
 
-			foreach( $tabs[ $dir_name ]['items'] as $key => $data )
+			foreach( $_data['items'] as $key => $data )
 			{
 				$title = $data['tab_title'];
 				$url   = $this->settings['_base_url'] . 'app=' . $_main_key . '&amp;module=' . $data['tab_key'];
@@ -1050,58 +1028,11 @@ class adminOutput extends output
 				$link_array[ $_main_key ][ $data['tab_key'] ] = array( 'url'    => $url,
 																	   'title'  => $title,
 																	   'module' => $data['tab_key'] );
-
-				//-----------------------------------------
-				// Haf ve got ze kiddivinkies?
-				//-----------------------------------------
-
-				if ( isset( $children[ $dir_name ][ $key ] ) && is_array( $children[ $dir_name ][ $key ] ) )
-				{
-					foreach( $children[ $dir_name ][ $key ] as $__data )
-					{
-						//-----------------------------------------
-						// Set up
-						//-----------------------------------------
-
-						$_title = $__data['tab_title'];
-						$_url   = $this->settings['_base_url'] . 'app=' . $_main_key . '&amp;module=' . $__data['tab_key'];
-
-						//-----------------------------------------
-						// Got access for this module?
-						//-----------------------------------------
-
-						ipsRegistry::getClass('class_permissions')->return = 1;
-
-						if ( ipsRegistry::getClass('class_permissions')->checkForModuleAccess( $_main_key, $__data['tab_key'] ) !== TRUE )
-						{
-							continue;
-						}
-
-						//-----------------------------------------
-						// Set navigation
-						//-----------------------------------------
-
-						if ( !$this->ignoreCoreNav AND $_main_key == ipsRegistry::$current_application AND $clean_module == $__data['tab_key'] )
-						{
-							$this->core_nav[] = array( $this->settings['base_url'] . 'module=' . ipsRegistry::$current_module, $_title );
-
-						}
-
-						//-----------------------------------------
-						// Add it!
-						//-----------------------------------------
-
-						$link_array[ $_main_key ][ $__data['tab_key'] ] = array( 'url'    => $_url,
-																			     'title'  => $_title,
-																			     'module' => $__data['tab_key'] );
-					}
-				}
-
 			}
-
-			$html .= $this->global_template->menu_cat_wrap( $link_array, $clean_module, $this->menu );
 		}
 
+		$html .= $this->global_template->menu_cat_wrap( $link_array, $clean_module, $this->menu );
+
 		//-----------------------------------------
 		// OK... return
 		//-----------------------------------------
@@ -1112,10 +1043,9 @@ class adminOutput extends output
 	/**
 	 * Build the secondary menu
 	 *
-	 * @access	private
 	 * @return	string		Menu HTML
 	 */
-	private function _buildSubMenu()
+	protected function _buildSubMenu()
 	{
 		//-----------------------------------------
 		// INIT
@@ -1125,7 +1055,7 @@ class adminOutput extends output
 		$this->menu    = array();
 		$_nav_main_done = 0;
 
-		/* Fetch fke apps */
+		/* Fetch fake apps */
 		$fakeApps  = $this->registry->output->fetchFakeApps();
 		$inFakeApp = FALSE;
 		$fakeApp   = '';
@@ -1146,6 +1076,25 @@ class adminOutput extends output
 				}
 			}
 		}
+		
+		//-----------------------------------------
+		// Apps we're going to look through
+		//-----------------------------------------
+		
+		$_appsToCheck	= array();
+		
+		if( $inFakeApp )
+		{
+			foreach( $fakeApps[ $fakeApp ] as $_fdata )
+			{
+				$_appsToCheck[ $_fdata['app'] ]	= $_fdata['app'];
+			}
+		}
+		else
+		{
+			$_appsToCheck[ ipsRegistry::$current_application ]	= ipsRegistry::$current_application;
+		}
+
 		//-----------------------------------------
 		// Got a cache?
 		//-----------------------------------------
@@ -1164,7 +1113,7 @@ class adminOutput extends output
 		// Get child XML tabs
 		//-----------------------------------------
 
-		if ( ipsRegistry::$current_application AND $clean_module )
+		if ( count($_appsToCheck) AND $clean_module )
 		{
 			//-----------------------------------------
 			// Do stuff
@@ -1178,10 +1127,13 @@ class adminOutput extends output
 				}
 
 				/* Not in this app? */
-				if ( $app_dir != ipsRegistry::$current_application )
+				if ( !in_array( $app_dir, $_appsToCheck ) )
 				{
 					continue;
 				}
+				
+				/* Load menu language file, if present */
+				$this->lang->loadLanguageFile( array( 'admin_menulang' ), $app_dir );
 
 				foreach( $data as $_current_module => $module_data )
 				{
@@ -1226,6 +1178,12 @@ class adminOutput extends output
 
 					foreach( $module_data['items'] as $id => $item )
 					{
+						//-----------------------------------------
+						// Title
+						//-----------------------------------------
+						
+						$item['title']	= ( $item['langkey'] AND $this->lang->words[ 'menu__' . $item['langkey'] ] ) ? $this->lang->words[ 'menu__' . $item['langkey'] ] : $item['title'];
+						
 						//-----------------------------------------
 						// Permission mask?
 						//-----------------------------------------
@@ -1235,7 +1193,7 @@ class adminOutput extends output
 							ipsRegistry::getClass('class_permissions')->return = 1;
 
 							if ( ipsRegistry::getClass('class_permissions')->checkPermission( $item['rolekey'], $app_dir, $_current_module ) !== TRUE )
-							{//print '<pre>';print $app_dir . ' '. $_current_module.'<br>';print_r($module_data);print_r($item);
+							{
 								continue;
 							}
 						}
@@ -1338,45 +1296,176 @@ class adminOutput extends output
 				}
 			}
 		}
-		//print_r($this->core_nav);
-		//print_r($this->menu);
+
 		if ( isset( $this->menu ) && count( $this->menu ) )
 		{
 			return $this->global_template->menu_sub_navigation( $this->menu );
 		}
 	}
-
+	
 	/**
-	 * Action complete screen.  Shows a message with links to continue
+	 * Build the secondary menu globally
 	 *
-	 * @access	public
-	 * @param	string		Title
-	 * @param	string		Link text
-	 * @param	string		Link URL
-	 * @param	integer		Seconds to redirect after [no redirect if ommitted/set to 0; default 0]
-	 * @return	void
+	 * @return	string		Menu HTML
 	 */
-	public function doneScreen( $title, $link_text="", $link_url="", $redirect=0 )
+	protected function _buildGlobalSubMenu()
 	{
-		$redirect	= intval($redirect);
-		
-		if ( $redirect )
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+
+		$_subMenu	= array();
+		$_titleMenu	= array();
+		$fakeApps	= $this->fetchFakeApps();
+
+		//-----------------------------------------
+		// Got a cache?
+		//-----------------------------------------
+
+		if ( IN_DEV )
 		{
-			$this->redirect( $this->settings[ 'base_url' ].'&'.$link_url, "<strong>{$title}</strong><br />{$this->lang->words['redirecting_to']} ".$link_text, $redirect );
+			ipsRegistry::cache()->updateCacheWithoutSaving( 'app_menu_cache', array() );
 		}
 
-		$this->html_main.= $this->global_template->doneScreenView( $title, $link_text, $link_url );
+		if ( ! is_array( ipsRegistry::cache()->getCache('app_menu_cache') ) OR ! count( ipsRegistry::cache()->getCache('app_menu_cache') ) )
+		{
+			$this->cache->rebuildCache( 'app_menu_cache', 'global' );
+		}
+		
+		//-----------------------------------------
+		// Get child XML tabs
+		//-----------------------------------------
 
-		$this->sendOutput();
+		if ( ipsRegistry::$current_application )
+		{
+			//-----------------------------------------
+			// Do stuff
+			//-----------------------------------------
+
+			foreach( ipsRegistry::cache()->getCache('app_menu_cache') as $app_dir => $data )
+			{
+				if ( ! ipsRegistry::$applications[ $app_dir ]['app_enabled'] )
+				{
+					continue;
+				}
+				
+				$this->lang->loadLanguageFile( array( 'admin_menulang' ), $app_dir );
+				
+				foreach( $data as $_current_module => $module_data )
+				{
+					$_thisApp			= $app_dir;
+					$__current_module	= $_current_module;
+					$_current_module	= preg_replace( '/^\d+?_(.*)$/', "\\1", $_current_module );
+					
+					//-----------------------------------------
+					// Sort out fake apps
+					//-----------------------------------------
+					
+					foreach( $fakeApps as $_newApp => $_appData )
+					{
+						foreach( $_appData as $__appData )
+						{
+							if( $_thisApp == $__appData['app'] AND $_current_module == $__appData['module'] )
+							{
+								$_thisApp	= $_newApp;
+								break;
+							}
+						}
+					}
+					
+					foreach( $module_data['items'] as $id => $item )
+					{
+						//-----------------------------------------
+						// Title
+						//-----------------------------------------
+												
+						$item['title']	= ( $item['langkey'] AND $this->lang->words[ 'menu__' . $item['langkey'] ] ) ? $this->lang->words[ 'menu__' . $item['langkey'] ] : $item['title'];
+
+						//-----------------------------------------
+						// Permission mask?
+						//-----------------------------------------
+
+						if ( $item['rolekey'] )
+						{
+							ipsRegistry::getClass('class_permissions')->return = 1;
+
+							if ( ipsRegistry::getClass('class_permissions')->checkPermission( $item['rolekey'], $app_dir, $_current_module ) !== TRUE )
+							{
+								continue;
+							}
+						}
+
+						//-----------------------------------------
+						// Continue...
+						//-----------------------------------------
+
+						if ( $item['title'] AND $item['section'] )
+						{
+							$_subMenu[ $_thisApp ][ $_current_module ]['items'][]	= array( 'title'		=> $item['title'],
+																							      'module'		=> $_current_module,
+																	   						  	  'section'		=> $item['section'],
+																							   	  'url'			=> $item['url'],
+																       							  'redirect'	=> $item['redirect'],
+																       							  'app_dir'		=> $app_dir,
+																 								  'pos'			=> preg_replace( '/^(\d+)?_.*$/', "\\1", $__current_module )
+																							);
+							
+							$_subMenu[ $_thisApp ][ $_current_module ]['title']		= ( count($_subMenu[ $_thisApp ][ $_current_module ]['items']) > 1 ) ? $module_data['title'] : $item['title'];
+						}
+					}
+				}
+				
+				//-----------------------------------------
+				// Build titles array
+				//-----------------------------------------
+				
+				if( is_array(ipsRegistry::$modules[ $app_dir ]) AND count(ipsRegistry::$modules[ $app_dir ]) )
+				{
+					foreach( ipsRegistry::$modules[ $app_dir ] as $data )
+					{
+						if ( ! $data['sys_module_admin'] )
+						{
+							continue;
+						}
+						
+						$_thisApp			= $app_dir;
+
+						//-----------------------------------------
+						// Sort out fake apps
+						//-----------------------------------------
+						
+						foreach( $fakeApps as $_newApp => $_appData )
+						{
+							foreach( $_appData as $__appData )
+							{
+								if( $_thisApp == $__appData['app'] AND $data['sys_module_key'] == $__appData['module'] )
+								{
+									$_thisApp	= $_newApp;
+								}
+							}
+						}
+					
+						$_titleMenu[ $_thisApp ][ $data['sys_module_key'] ] = array(	'url'		=> $this->settings['_base_url'] . 'app=' . $app_dir . '&amp;module=' . $data['sys_module_key'],
+																						'title'		=> $data['sys_module_title'],
+																						'module'	=> $data['sys_module_key'] );
+					}
+				}
+			}
+		}
+
+		return array('menu' => $_subMenu, 'titles' => $_titleMenu);
+		/*if ( isset( $_subMenu ) && count( $_subMenu ) )
+		{
+			return $this->global_template->global_menu_sub_navigation( $_subMenu, $_titleMenu );
+		}*/
 	}
 
 	/**
 	 * Show a page inside an iframe
 	 *
-	 * @access	public
 	 * @param	string		URL
 	 * @param	string		Optional HTML to show inside the iframe
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function showInsideIframe($url="", $html="")
 	{
@@ -1396,7 +1485,6 @@ class adminOutput extends output
 	/**
 	 * Generate a drop down list of groups
 	 *
-	 * @access 	public
 	 * @param	string		Form field name
 	 * @param	mixed 		Selected ID(s)
 	 * @param	boolean 	Multiselect (TRUE is yes)
@@ -1435,7 +1523,6 @@ class adminOutput extends output
 	/**
 	 * Generate a drop down list of skins
 	 *
-	 * @access 	public
 	 * @param	array 		Skin array
 	 * @param	int			Parent id
 	 * @param	int			Iteration
@@ -1470,7 +1557,7 @@ class adminOutput extends output
 
 			if ( is_array( $data['_childTree'] ) AND count( $data['_childTree'] ) )
 			{
-				$skin_array 	= $this->generateSkinDropdown( $skin_array, $id, $iteration + 1 );
+				$skin_array = $this->generateSkinDropdown( $skin_array, $id, $iteration + 1 );
 			}
 		}
 
@@ -1480,7 +1567,6 @@ class adminOutput extends output
 	/**
 	 * Create a form text input field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	string		Field ID
 	 * @param	string		Javascript code to add to field
@@ -1489,23 +1575,22 @@ class adminOutput extends output
 	 */
 	public function formUpload( $name="FILE_UPLOAD", $id='', $js="", $css="" )
 	{
-		if ($js != "")
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
 
-		if( $css )
+		if ( $css )
 		{
 			$css = ' ' . $css;
 		}
 
-		return "<input class='textinput{$css}' type='file' {$js} size='30' name='{$name}'>";
+		return "<input class='textinput{$css}' type='file'{$js} size='30' name='{$name}' id='{$id}'>";
 	}
 
 	/**
 	 * Create a form text input field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	string		Field current value
 	 * @param	string		Field ID [defaults to value for $name]
@@ -1517,30 +1602,30 @@ class adminOutput extends output
 	 */
 	public function formInput( $name, $value="", $id="", $size="30", $type='text', $js="", $css="", $maxLength='' )
 	{
-		if ($js != "")
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
 
-		if( $css )
+		if ( $css )
 		{
 			$css = ' ' . $css;
 		}
 		
 		if ( $maxLength )
 		{
-			$maxLength = ' maxlength=' . intval( $maxLength );
+			$maxLength = " maxlength='" . intval( $maxLength ) . "'";
 		}
 
-		$id = $id ? $id : $name;
+		$id   = $id ? $id : $name;
+		$size = $size ? $size : 30;
 
-		return "<input type='{$type}' name='{$name}' id='{$id}' value='{$value}' size='{$size}' {$js} class='textinput{$css}'{$maxLength} />";
+		return "<input type='{$type}' name='{$name}' id='{$id}' value='{$value}' size='{$size}'{$js} class='input_text{$css}'{$maxLength} />";
 	}
 
 	/**
 	 * Create a simpl(er) form text input field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	string		Field current value
 	 * @param	integer		Field size [defaults to 5]
@@ -1555,7 +1640,6 @@ class adminOutput extends output
 	/**
 	 * Create a form textarea field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	string		Field current value
 	 * @param	integer		Number of columns [defaults to 40]
@@ -1575,18 +1659,20 @@ class adminOutput extends output
 			$css = ' ' . $css;
 		}
 
-		if ($js != "")
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
+		
+		$cols = $cols ? $cols : 40;
+		$rows = $rows ? $rows : 5;
 
-		return "<textarea name='{$name}' cols='{$cols}' rows='{$rows}' wrap='{$wrap}' id='{$id}' {$js} class='multitext{$css}'>{$value}</textarea>";
+		return "<textarea name='{$name}' cols='{$cols}' rows='{$rows}' wrap='{$wrap}' id='{$id}'{$js} class='multitext{$css}'>{$value}</textarea>";
 	}
 
 	/**
 	 * Create a form dropdown/select list
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	array		Options.  Multidimensional array in format of array( array( 'value', 'display' ), array( 'value', 'display', 'optgroup_key' ) )
 	 * @param	string		Default value
@@ -1598,19 +1684,19 @@ class adminOutput extends output
 	 */
 	public function formDropdown( $name, $list=array(), $default_val="", $id="", $js="", $css="", $optgroups=array() )
 	{
-		if ($js != "")
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
 
-		if ($css != "")
+		if ( $css )
 		{
 			$css = ' ' . $css;
 		}
 
 		$id = $id ? $id : $name;
 
-		$html = "<select name='{$name}'" . $js . " id='{$id}' class='dropdown{$css}'>\n";
+		$html = "<select name='{$name}'{$js} id='{$id}' class='dropdown{$css}'>\n";
 
 		//-----------------------------------------
 		// Support for optgroups
@@ -1717,7 +1803,6 @@ class adminOutput extends output
 	/**
 	 * Create a multiselect form field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	array		Options.  Multidimensional array in format of array( array( 'value', 'display' ), array( 'value', 'display' ) )
 	 * @param	array		Default values
@@ -1729,30 +1814,34 @@ class adminOutput extends output
 	 */
 	public function formMultiDropdown( $name, $list=array(), $default=array(), $size=5, $id="", $js="", $css='' )
 	{
-		if ( $js != "" )
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
 
 		$id = $id ? $id : $name;
 
-		if ( $css != "" )
+		if ( $css )
 		{
 			$css = ' ' . $css;
 		}
-
-		$html = "<select name='{$name}" . "'" . $js . " id='{$id}' class='dropdown{$css}' multiple='multiple' size='{$size}'>\n";
+		
+		$size = $size ? $size : 5;
+		
+		$html = "<select name='{$name}'{$js} id='{$id}' class='dropdown{$css}' multiple='multiple' size='{$size}'>\n";
+		
+		if ( !is_array($default) )
+		{
+			$default = array();
+		}
 		
 		foreach ($list as $v)
 		{
 			$selected = "";
 			
-			if ( count($default) > 0 )
-			{			
-				if ( in_array( $v[0], $default ) )
-				{
-					$selected = ' selected="selected"';
-				}
+			if ( count($default) && in_array( $v[0], $default ) )
+			{
+				$selected = ' selected="selected"';
 			}
 
 			$html .= "<option value='" . $v[0] . "'" . $selected . ">" . $v[1] . "</option>\n";
@@ -1766,7 +1855,6 @@ class adminOutput extends output
 	/**
 	 * Create yes/no radio buttons
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	string		Default values
 	 * @param	string		HTML id attribute (appended with "_yes" and "_no" on the respective fields) [defaults to $name]
@@ -1776,8 +1864,10 @@ class adminOutput extends output
 	 */
 	public function formYesNo( $name, $default_val="", $id='', $js=array(), $css='' )
 	{
-		$y_js = "";
-		$n_js = "";
+		$y_js   = '';
+		$n_js   = '';
+		$id_yes = '';
+		$id_no  = '';
 
 		if ( $js['yes'] != "" )
 		{
@@ -1793,30 +1883,28 @@ class adminOutput extends output
 
 		if ( $id )
 		{
-			$id_yes = ' id="' . $id . '_yes" ';
-			$id_no  = ' id="' . $id . '_no" ';
+			$id_yes = " id='{$id}_yes'";
+			$id_no  = " id='{$id}_no'";
 		}
 
-		$yes = "<span class='yesno_yes {$css}'><input type='radio' name='{$name}' value='1' {$y_js} {$id_yes} /><label for='{$id}_yes'>{$this->lang->words['yesno_yes']}</label></span>";
-		$no  = "<span class='yesno_no {$css}'><input type='radio' name='{$name}' value='0' {$n_js} {$id_no} /><label for='{$id}_no'>{$this->lang->words['yesno_no']}</label></span>";
+		$yes = "<span class='yesno_yes {$css}'><input type='radio' name='{$name}' value='1' {$y_js}{$id_yes} /><label for='{$id}_yes'>{$this->lang->words['yesno_yes']}</label></span>";
+		$no  = "<span class='yesno_no {$css}'><input type='radio' name='{$name}' value='0' {$n_js}{$id_no} /><label for='{$id}_no'>{$this->lang->words['yesno_no']}</label></span>";
 
 		if ( $default_val == 1 )
 		{
-			$yes = "<span class='yesno_yes {$css}'><input type='radio' {$id_yes} name='{$name}' value='1' {$y_js} checked='checked' /><label for='{$id}_yes'>{$this->lang->words['yesno_yes']}</label></span>";
+			$yes = "<span class='yesno_yes {$css}'><input type='radio'{$id_yes} name='{$name}' value='1' {$y_js} checked='checked' /><label for='{$id}_yes'>{$this->lang->words['yesno_yes']}</label></span>";
 		}
 		else
 		{
-			$no  = "<span class='yesno_no {$css}'><input type='radio' {$id_no} name='{$name}' value='0' checked='checked' {$n_js} /><label for='{$id}_no'>{$this->lang->words['yesno_no']}</label></span>";
+			$no  = "<span class='yesno_no {$css}'><input type='radio'{$id_no} name='{$name}' value='0' checked='checked' {$n_js} /><label for='{$id}_no'>{$this->lang->words['yesno_no']}</label></span>";
 		}
-
-
+		
 		return $yes . $no;
 	}
 
 	/**
 	 * Create a checkbox form field
 	 *
-	 * @access	public
 	 * @param	string		Field name
 	 * @param	boolean		Field checked or not
 	 * @param	string 		Field value
@@ -1834,162 +1922,24 @@ class adminOutput extends output
 			$css = "class='{$css}' ";
 		}
 
-		if ( $js != "" )
+		if ( $js )
 		{
-			$js = ' ' . $js . ' ';
+			$js = ' ' . $js;
 		}
 
 		if ( $checked == 1 )
 		{
-			return "<input type='checkbox' name='{$name}' value='{$val}' {$css} {$js} id='{$id}' checked='checked' />";
+			return "<input type='checkbox' name='{$name}' value='{$val}' {$css}{$js} id='{$id}' checked='checked' />";
 		}
 		else
 		{
-			return "<input type='checkbox' name='{$name}' value='{$val}' {$css} {$js} id='{$id}' />";
+			return "<input type='checkbox' name='{$name}' value='{$val}' {$css}{$js} id='{$id}' />";
 		}
 	}
 
-	/**
- 	 * Creates a new menu.  Array should be in the format: ( link, title, [image], [delete] )
- 	 * The image param is optional.
-	 *
-	 * @access	public
-	 * @param	array 		Array of menu data
-	 * @return	string		Javascript menu contents
-	 */
-	public function buildJavascriptMenu( $menu_array )
-	{
-		/* Increase the menu count */
-		$this->menu_count++;
-
-		/* Open Image */
-		$open_image = "<img class='ipbmenu' id='menu{$this->menu_count}' src='{$this->settings['skin_acp_url']}/_newimages/menu_open.png' alt=''>\n<ul style='position: absolute; display: none; z-index: 9999;' class='acp-menu' id='menu{$this->menu_count}_menucontent'>\n";
-
-		/* Build the entries */
-		foreach( $menu_array as $menu_item )
-		{
-			/* Image and Link */
-
-			$img = $menu_item[2] ? $menu_item[2] : 'manage';
-			$menu_item[1] = str_replace( '"', '\"', $menu_item[1] );
-
-			/* Delete Link */
-			if( isset( $menu_item[3] ) && $menu_item[3] )
-			{
-				$links[] = "<li style='z-index: 10000;' class='icon {$img}'><a style='z-index: 10000;' href='#' onclick='return acp.confirmDelete(\"{$menu_item[0]}\");'>{$menu_item[1]}</a></li>";
-			}
-			else if( ! $menu_item[0] )
-			{
-				$links[] = "<li style='z-index: 10000;' class='icon {$img}'><i>{$menu_item[1]}</i></li>";
-			}
-			/* Normal Link */
-			else
-			{
-				$links[] = "<li style='z-index: 10000;' class='icon {$img}'><a style='z-index: 10000;' href='{$menu_item[0]}'>{$menu_item[1]}</a></li>";
-			}
-		}
-
-		/* Create the JS Code */
-
-		$links = implode( "\n", $links );
-		$this->menu_content[$this->menu_count] = $open_image . $links . "</ul>\n";
-
-		return $this->menu_content[$this->menu_count];
-	}
-
-	/**
- 	 * Adds the button and content to the tab list for this object
-	 *
-	 * @access	public
-	 * @param	string	$button
-	 * @param	string	$content
-	 * @param	string	[$js_action]
-	 * @return	void
-	 */
-	public function addTab( $button, $content, $js_action='', $default_tab=0 )
-	{
-		$this->tab_buttons[]   = $button;
-		$this->tab_tabs[]      = $content;
-		$this->tab_js_action[] = $js_action;
-
-		if( $default_tab )
-		{
-			$this->default_tab = count( $this->tab_tabs ) - 1;
-		}
-	}
-
-	/**
- 	 * Builds the html for the tabbed area
-	 *
-	 * @access	public
-	 * @return	string		Tab HTML
-	 * @see		admin_core_system_manage_languages
-	 */
-	public function buildTabs()
-	{
-		/* Buttons */
-		$i = 0;
-		$tabs = array();
-		foreach( $this->tab_buttons as $i => $button )
-		{
-			/* Tab Button */
-			$js    = ( $this->tab_js_action[$i] ) ? 'onmousedown="'.$this->tab_js_action[$i].'"' : '';
-			$class = ( $i == 0 ) ? 'mini_tab_on' : 'mini_tab_off';
-			$tabs[] = array( 'id' => $i, 'class' => $class, 'text' => $button, 'js' => $js );
-		}
-
-		/* Tab Contents */
-		$i = 0;
-		$content = array();
-		foreach( $this->tab_tabs as $tab )
-		{
-			/* Create the pane */
-			$content[] = array( 'id' => $i, 'content' => $tab );
-			$i++;
-		}
-
-		$default_tab = ( $this->default_tab ) ? $this->default_tab : '';
-
-		/* End of tab pane */
-		$tabs = $this->global_template->ui_content_tabs( $tabs, $content, $default_tab );
-
-		return $tabs;
-	}
-
-	/**
- 	 * Creates an option list for select tags
-	 *
-	 * @access	public
-	 * @param	array	$options		Array of values/text for dropdown
-	 * @param	mixed	[$selected]		Selected value or array of selected values
-	 * @return	string
-	 */
-	public function compileSelectOptions( $options, $selected='' )
-	{
-		if( ! is_array( $selected ) )
-		{
-			$selected = array( $selected );
-		}
-
-		$html = '';
-		if( is_array( $options ) )
-		{
-			foreach( $options as $option )
-			{
-				$sel = ( in_array( $option[0], $selected ) && ( $option[0] ) ) ? ' selected="selected"' : '';
-				$val = ( $option[0] == 'disabled'  ) ? 'disabled="disabled"' : "value='{$option[0]}'";
-
-				$html .= "<option {$val}{$sel}>{$option[1]}</option>";
-			}
-		}
-
-		return $html;
-	}
-
     /**
 	 * Build up page span links
 	 *
-	 * @access	public
 	 * @param	array	Page data
 	 * @return	string	Parsed page links HTML
 	 * @since	2.0
@@ -2060,47 +2010,37 @@ class adminOutput extends output
 		return $this->global_template->paginationTemplate( $work, $data );
 	}
 
-    /**
-	 * Build a javascript help link
-	 *
-	 * @access	public
-	 * @param	string		Help ID
-	 * @param	string		Link text
-	 * @return	string		Help Link
-	 * @since	2.0
-	 * @see		admin_core_system_quickhelp
-	 */
-	public function javascriptHelpLink( $help="", $text='' )
-	{
-		$text	= $text ? $text : $this->lang->words['acp_quick_help'];
-		
-		return "( <a href='#' onclick=\"window.open('" . str_replace( '&amp;', '&', $this->settings['_base_url'] ) . "&app=core&module=help&section=quickhelp&id={$help}','Help','width=250,height=400,resizable=yes,scrollbars=yes'); return false;\">{$text}</a> )";
-	}
-
     /**
 	 * Retrieve list of "fake apps" to generate tabs for them in ACP
 	 *
-	 * @access	public
 	 * @return	array
 	 * @since	3.0
 	 */
 	public function fetchFakeApps()
 	{
 		return array(
-						'lookfeel' => array( array( 'app'    => 'core',
-													'module' => 'templates' ),
-									  		 array( 'app'    => 'core',
-									 				'module' => 'posts' ),
-									         array( 'app'    => 'core',
-									 			    'module' => 'languages' ) ),
-						'support'  => array( array( 'app'    => 'core',
-												    'module' => 'diagnostics' ),
-											 array( 'app'    => 'core',
-												    'module' => 'sql' ),
-											 array( 'app'    => 'core',
-											        'module' => 'help' ),
-											 
-										)
+						'lookfeel'	=> array(
+											array(	'app'		=> 'core',
+													'module'	=> 'templates' ),
+											array(	'app'		=> 'core',
+													'module'	=> 'posts' ),
+											array(	'app'		=> 'core',
+													'module'	=> 'languages' )
+											),
+						'support'	=> array(
+											array(	'app'		=> 'core',
+													'module'	=> 'diagnostics' ),
+											array(	'app'		=> 'core',
+													'module'	=> 'sql' ),
+											array(	'app'		=> 'core',
+													'module'	=> 'help' )
+											),
+						'reports'	=> array(
+											array(	'app'		=> 'forums',
+													'module'	=> 'statistics' ),
+											array(	'app'		=> 'core',
+													'module'	=> 'logs' ),
+											),
 			);
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/formats/coreOutput.php b/upload/admin/sources/classes/output/formats/coreOutput.php
index 8e5eb1d8..de231348 100644
--- a/upload/admin/sources/classes/output/formats/coreOutput.php
+++ b/upload/admin/sources/classes/output/formats/coreOutput.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ouput format: HTML
  * (Matt Mecham)
- * Last Updated: $Date: 2010-10-28 12:07:41 -0400 (Thu, 28 Oct 2010) $
+ * Last Updated: $Date: 2011-10-06 23:44:10 -0400 (Thu, 06 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 7063 $
+ * @version		$Revision: 9587 $
  *
  */
 
@@ -25,7 +25,7 @@ interface interface_output
 	 * Prints any header information for this output module
 	 *
 	 * @access	public
-	 * @return	void		Prints header() information
+	 * @return	@e void		Prints header() information
 	 */
 	public function printHeader();
 	
@@ -156,7 +156,7 @@ class coreOutput
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( output $output )
 	{
@@ -174,7 +174,7 @@ class coreOutput
 		$this->skin		  =  $output->skin;
 		
 		/* Check for forceDownload */
-		if ( isset( $_GET['forceDownload'] ) AND $_GET['forceDownload'] AND ( $_GET['_k'] == $this->member->form_hash ) )
+		if ( !empty( $_GET['forceDownload'] ) AND ( $_GET['_k'] == $this->member->form_hash ) )
 		{
 			$this->_forceDownload = true;
 		}
@@ -253,7 +253,7 @@ class coreOutput
 	 * @param	string		URL bit (showtopic=x)
 	 * @param	string		SEO Title (my-test-topic)
 	 * @param	string		SEO Template (showtopic)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addCanonicalTag( $urlBit, $seoTitle, $seoTemplate )
 	{
@@ -263,7 +263,7 @@ class coreOutput
 			$url = $this->registry->getClass('output')->buildSEOUrl( $urlBit, 'publicNoSession', $seoTitle, $seoTemplate );
 
 			/* Strip off /index$ */
-			if ( substr( $url, -6 ) == '/index' )
+			if ( substr( $url, -6 ) == '/index' AND IPS_DEFAULT_PUBLIC_APP == 'forums' )
 			{
 				$url = substr_replace( $url, '', -5 );
 			}
@@ -273,7 +273,7 @@ class coreOutput
 			
 			if ( $url )
 			{ 
-				$this->registry->getClass('output')->addToDocumentHead( 'raw' , '<link rel="canonical" href="' . $url . '" />' );
+				$this->registry->getClass('output')->addToDocumentHead( 'raw' , '<link id="ipsCanonical" rel="canonical" href="' . $url . '" />' );
 			}
 		}
 	}
@@ -298,8 +298,9 @@ class coreOutput
 	 * @param	string		tag content
 	 * @param	boolean		Encode content
 	 * @param	int			Length to trim to (default 500)
-	 * @return	void
+	 * @return	@e void
 	 * @link	http://community.invisionpower.com/tracker/issue-22826-case-sensitivity-in-meta-tags/
+	 * @link	http://community.invisionpower.com/tracker/issue-32572-bbcode-included-in-meta-description
 	 */
 	public function addMetaTag( $tag, $content, $encode='', $trimLen=500 )
 	{
@@ -312,15 +313,24 @@ class coreOutput
 			case 'description':
 				/* Clear out 'Quote' if it's present in the bbcode parsed content */
 				$content	= preg_replace( '/\<p class=\'citation\'\>.+?\<\/p\>/ims', '', $content );
+				$content    = strip_tags( IPSText::stripAttachTag( $content ) );
+				
+				# Hebrew chars screw up Facebook sharer
+				if ( $this->member->iAmFacebook )
+				{
+					$content = $this->encodeMetaTagContent( $content );
+				}
 				
 				# There is no max value, but we trim so we don't bloat the output.
 				# It's not just search engines that use this, also link sharing services
 				# pick up the meta description.
-				$content = IPSText::truncate( strip_tags($content), $trimLen );
+				$content = IPSText::truncate( $content, $trimLen );
 			break;
 			case 'keywords':
 				if ( $encode === TRUE )
 				{
+					$content	= IPSText::stripAttachTag( $content );
+					
 					//Bug #15323 breaks accented characters, etc
 					//$content = strtolower( preg_replace( "/[^0-9a-zA-Z ]/", "", preg_replace( "/&([^;]+?);/", "", $content ) ) );
 					$content = str_replace( array( '.', ',', '!', ':', ';', "'", "'", '@', '%', '*', '(', ')' ), '', preg_replace( "/&([^;]+?);/", "", $content ) );
@@ -353,7 +363,25 @@ class coreOutput
 			break;
 		}
 				
-		$this->_metaTags[ $tag ] = ( $encode === TRUE ) ? preg_replace( '/&amp;#(\d+?);/', "&#\\1;", htmlspecialchars( $content ) ) : $content;
+		$this->_metaTags[ $tag ] = ( $encode === TRUE ) ? $this->encodeMetaTagContent( preg_replace( '/&amp;#(\d+?);/', "&#\\1;", htmlspecialchars( $content ) ) ) : $content;
+	}
+	
+	/**
+	 * Encodes meta tag content so its safe for readers, etc
+	 * @param string $content
+	 * @return string
+	 */
+	public function encodeMetaTagContent( $content )
+	{
+		$content = IPSText::htmlspecialchars( $content );
+		
+		# Hebrew chars screw up Facebook sharer
+		if ( IPS_DOC_CHAR_SET == 'UTF-8' && IPSText::isUTF8( $content ) )
+		{
+			$content = IPSText::utf8ToEntities( $content );
+		}
+		
+		return $content;
 	}
 	
 	/**
@@ -443,13 +471,17 @@ class coreOutput
 				continue;
 			}
 			
-			$show = TRUE;
-			if ( $tab['app'] == 'core' OR $tab['app'] == 'forums' OR $tab['app'] == 'members' )
+			/* Sort if we can view that tab */
+			$show = FALSE;
+			
+			if ( !in_array( $tab['app'], array( 'core', 'forums', 'members' ) ) AND ( !count($tab['groups']) OR IPSMember::hasOtherGroups( $this->memberData, $tab['groups'] ) ) )
 			{
-				$show = FALSE;
+				$show = TRUE;
 			}
 			
+			/* Mark tab as active? */
 			$active = FALSE;
+			
 			if ( ipsRegistry::$current_application == $tab['app'] )
 			{
 				if ( $tab['module'] )
@@ -465,7 +497,9 @@ class coreOutput
 				}
 			}
 			
+			/* Sort out link */
 			$link = "app={$tab['app']}";
+			
 			if ( $tab['module'] )
 			{
 				$link = "app={$tab['app']}&amp;module={$tab['module']}";
@@ -479,6 +513,7 @@ class coreOutput
 							 'app_link'	  => $link );
 											
 		}
+		
 		return $tabs;
 	}
 	
@@ -502,7 +537,7 @@ class coreOutput
 	 * @access	public
 	 * @param	string		inline or import
 	 * @param	string		Data to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addCSS( $type, $data )
 	{
diff --git a/upload/admin/sources/classes/output/formats/html/conf.php b/upload/admin/sources/classes/output/formats/html/conf.php
index ba099ad4..69b9f069 100644
--- a/upload/admin/sources/classes/output/formats/html/conf.php
+++ b/upload/admin/sources/classes/output/formats/html/conf.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ouput format: HTML
  * (Matt Mecham)
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7445 $
  *
  */
 $config = array();
diff --git a/upload/admin/sources/classes/output/formats/html/htmlOutput.php b/upload/admin/sources/classes/output/formats/html/htmlOutput.php
index b3917f71..fd0cfded 100644
--- a/upload/admin/sources/classes/output/formats/html/htmlOutput.php
+++ b/upload/admin/sources/classes/output/formats/html/htmlOutput.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Ouput format: HTML
  * (Matt Mecham)
- * Last Updated: $Date: 2010-10-13 09:23:30 -0400 (Wed, 13 Oct 2010) $
+ * Last Updated: $Date: 2011-10-05 15:30:51 -0400 (Wed, 05 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6966 $
+ * @version		$Revision: 9582 $
  *
  */
 
@@ -45,12 +45,19 @@ class htmlOutput extends coreOutput implements interface_output
 	 */
 	protected $_css = array( 'import' => array(), 'inline' => array() );
 	
+	/**
+	 * Use a minimal wrapper instead of globalTemplate
+	 * 
+	 * @var		bool
+	 */
+ 	protected $useMinimalWrapper	= false;
+
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		Output object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( output $output )
 	{
@@ -58,7 +65,7 @@ class htmlOutput extends coreOutput implements interface_output
 		parent::__construct( $output );
 		
 		/* Print only seems only relevant to html method, so... */
-		if ( isset( $_GET['forcePrint'] ) AND $_GET['forcePrint'] AND ( $_GET['_k'] == $this->member->form_hash ) )
+		if ( !empty( $_GET['forcePrint'] ) AND ( $_GET['_k'] == $this->member->form_hash ) )
 		{
 			$this->_printOnly = true;
 		}
@@ -68,7 +75,7 @@ class htmlOutput extends coreOutput implements interface_output
 	 * Prints any header information for this output module
 	 *
 	 * @access	public
-	 * @return	void		Prints header() information
+	 * @return	@e void		Prints header() information
 	 */
 	public function printHeader()
 	{
@@ -98,17 +105,17 @@ class htmlOutput extends coreOutput implements interface_output
 			print $buffer;
 		}
 		
-		if ( $this->settings['print_headers'] )
-    	{
-			if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
-			{
-				header("HTTP/1.0 " . $this->_headerCode . ' ' . $this->_headerStatus );
-			}
-			else
-			{
-				header("HTTP/1.1 " . $this->_headerCode . ' ' . $this->_headerStatus );
-			}
+		if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
+		{
+			header("HTTP/1.0 " . $this->_headerCode . ' ' . $this->_headerStatus );
+		}
+		else
+		{
+			header("HTTP/1.1 " . $this->_headerCode . ' ' . $this->_headerStatus );
+		}
 			
+		if ( $this->settings['print_headers'] )
+    	{	
 			/* Forcing a download? */
 			if ( $this->_forceDownload )
 			{
@@ -229,6 +236,8 @@ class htmlOutput extends coreOutput implements interface_output
 	 */
 	public function displayBoardOffline( $message )
 	{
+		$this->useMinimalWrapper	= true;
+
 		return $this->registry->getClass('output')->getTemplate('global_other')->displayBoardOffline( $message );
 	}
 	
@@ -250,8 +259,9 @@ class htmlOutput extends coreOutput implements interface_output
 		// INIT
 		//-----------------------------------------
 
-		$system_vars_cache = $this->caches['systemvars'];
-		$pmData			   = FALSE;
+		$system_vars_cache  = $this->caches['systemvars'];
+		$pmData			    = FALSE;
+		$notificationLatest = array();
 		
 		//-----------------------------------------
 		// NORMAL
@@ -263,13 +273,11 @@ class htmlOutput extends coreOutput implements interface_output
 			// Do we have a notification show?
 			//-----------------------------------------
 
-			$notifications	= null;
-
 			if ( ! empty( $this->memberData['msg_show_notification'] ) AND $this->memberData['_cache']['show_notification_popup'] )
-			{
-				if ( !$this->settings['board_offline'] OR $this->memberData['g_access_offline'] )
+			{ 
+				if ( ! $this->settings['board_offline'] OR $this->memberData['g_access_offline'] )
 				{
-					if( strpos( ipsRegistry::$settings['query_string_real'], 'area=notificationlog' ) === false )
+					if ( strpos( ipsRegistry::$settings['query_string_real'], 'module=messaging' ) === false )
 					{
 						IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'msg_show_notification' => 0 ) ) );
 						
@@ -278,11 +286,12 @@ class htmlOutput extends coreOutput implements interface_output
 						$notifyLibrary		= new $classToLoad( $this->registry );
 						$notifyLibrary->setMember( $this->memberData );
 	
-						$_data = $notifyLibrary->fetchUnreadNotifications( 1, 'notify_sent', 'DESC', true, true );
-					
-						if ( count( $_data ) )
+						$tmp = $notifyLibrary->getLatestNotificationForInlinePopUp();
+						$weNeed             = array( 'notify_title', 'member_member_id', 'member_PhotoTag', 'member_members_display_name', 'date_parsed', 'title', 'url', 'type', 'content' );
+						
+						foreach( $weNeed as $k )
 						{
-							$notifications = array_shift( $_data );
+							$notificationLatest[ $k ] = IPSText::utf8ToEntities( $tmp[ $k ] );
 						}
 					}
 				}
@@ -307,35 +316,66 @@ class htmlOutput extends coreOutput implements interface_output
 
 			$task	= '';
 			$system_vars_cache['task_next_run'] = isset( $system_vars_cache['task_next_run'] ) ? $system_vars_cache['task_next_run'] : 0;
-
+						
 	        if ( time() >= $system_vars_cache['task_next_run'] OR ( defined('FORCE_TASK_KEY') ) )
 	        {
 				$_url = ( ! $this->registry->getClass('output')->isHTTPS ) ? $this->settings['base_url'] : $this->settings['base_url_https'];
 	        	$task = "<div><img src='" . $_url . "app=core&amp;module=task' alt='' style='border: 0px;height:1px;width:1px;' /></div>";
 	        }
-			
+	     
 			//-----------------------------------------
 			// Grab output
 			//-----------------------------------------
+			
+	        /* Inline msg */
+	        $inlineMsg = $this->member->sessionClass()->getInlineMessage();
 
-			$finalOutput = $this->output->getTemplate('global')->globalTemplate( $output, $documentHeadItems, $this->_css, $jsLoaderItems, $this->_metaTags,
-																								   array( 'title'			=> $title,
-																										  'applications'	=> $this->core_fetchApplicationData(),
-																										  'page'			=> $this->_current_page_title  ),
-																								   array( 'navigation'		=> $navigation,
-																								          'notifications'	=> $notifications,
-																								 		  'adHeaderCode'	=> ! empty( $extraData['adHeaderCode'] ) ? $extraData['adHeaderCode'] : '',
-																										  'adFooterCode'	=> ! empty( $extraData['adFooterCode'] ) ? $extraData['adFooterCode'] : '' ),
-																								   array( 'time'			=> $this->registry->getClass('class_localization')->getDate( time(), 'SHORT', 1 ),
-																										  'lang_chooser'	=> $this->html_buildLanguageDropDown(),
-																										  'skin_chooser'	=> $this->html_fetchSetsDropDown(),
-																										  'copyright'		=> $this->html_fetchCopyright() ),
-																								   array( 'ex_time'			=> ( isset($this->request['faster']) AND $this->request['faster'] == 'yes' ) ? $this->_getFasterText() : sprintf( "%.4f", IPSDebug::endTimer() ),
-																								          'gzip_status'		=> ( $this->settings['disable_gzip'] == 1 ) ? $this->lang->words['gzip_off'] : $this->lang->words['gzip_on'],
-																								          'server_load'		=> ipsRegistry::$server_load,
-																								          'queries'			=> $this->DB->getQueryCount(),
-																								          'task'			=> $task )
-																								);
+	        if ( $this->useMinimalWrapper )
+	        {
+				$finalOutput = $this->output->getTemplate('global_other')->globalTemplateMinimal( $output, $documentHeadItems, $this->_css, $jsLoaderItems, $this->_metaTags,
+																									   array( 'title'			=> $title,
+																											  'applications'	=> $this->core_fetchApplicationData(),
+																											  'page'			=> $this->_current_page_title,
+																									   		  'notifications'	=> ( $notificationLatest ) ? json_encode( $notificationLatest ) : '',
+																									   		  'inlineMsg'		=> $inlineMsg  ),
+																									   array( 'navigation'		=> $navigation,
+																									 		  'adHeaderCode'	=> ! empty( $extraData['adHeaderCode'] ) ? $extraData['adHeaderCode'] : '',
+																											  'adFooterCode'	=> ! empty( $extraData['adFooterCode'] ) ? $extraData['adFooterCode'] : '' ),
+																									   array( 'time'			=> $this->registry->getClass('class_localization')->getDate( time(), 'SHORT', 1 ),
+																									   		  'mark_read_apps'  => IPSLib::getEnabledApplications('itemMarking'),
+																											  'lang_chooser'	=> $this->html_buildLanguageDropDown(),
+																											  'skin_chooser'	=> $this->html_fetchSetsDropDown(),
+																											  'copyright'		=> $this->html_fetchCopyright() ),
+																									   array( 'ex_time'			=> ( isset($this->request['faster']) AND $this->request['faster'] == 'yes' ) ? $this->_getFasterText() : sprintf( "%.4f", IPSDebug::endTimer() ),
+																									          'gzip_status'		=> ( $this->settings['disable_gzip'] == 1 ) ? $this->lang->words['gzip_off'] : $this->lang->words['gzip_on'],
+																									          'server_load'		=> ipsRegistry::$server_load,
+																									          'queries'			=> $this->DB->getQueryCount(),
+																									          'task'			=> $task )
+																									);
+        	}
+        	else
+        	{
+				$finalOutput = $this->output->getTemplate('global')->globalTemplate( $output, $documentHeadItems, $this->_css, $jsLoaderItems, $this->_metaTags,
+																									   array( 'title'			=> $title,
+																											  'applications'	=> $this->core_fetchApplicationData(),
+																											  'page'			=> $this->_current_page_title,
+																									   		  'notifications'	=> ( $notificationLatest ) ? json_encode( $notificationLatest ) : '',
+																									   		  'inlineMsg'		=> $inlineMsg  ),
+																									   array( 'navigation'		=> $navigation,
+																									 		  'adHeaderCode'	=> ! empty( $extraData['adHeaderCode'] ) ? $extraData['adHeaderCode'] : '',
+																											  'adFooterCode'	=> ! empty( $extraData['adFooterCode'] ) ? $extraData['adFooterCode'] : '' ),
+																									   array( 'time'			=> $this->registry->getClass('class_localization')->getDate( time(), 'SHORT', 1 ),
+																									   		  'mark_read_apps'  => IPSLib::getEnabledApplications('itemMarking'),
+																											  'lang_chooser'	=> $this->html_buildLanguageDropDown(),
+																											  'skin_chooser'	=> $this->html_fetchSetsDropDown(),
+																											  'copyright'		=> $this->html_fetchCopyright() ),
+																									   array( 'ex_time'			=> ( isset($this->request['faster']) AND $this->request['faster'] == 'yes' ) ? $this->_getFasterText() : sprintf( "%.4f", IPSDebug::endTimer() ),
+																									          'gzip_status'		=> ( $this->settings['disable_gzip'] == 1 ) ? $this->lang->words['gzip_off'] : $this->lang->words['gzip_on'],
+																									          'server_load'		=> ipsRegistry::$server_load,
+																									          'queries'			=> $this->DB->getQueryCount(),
+																									          'task'			=> $task )
+																									);
+			}
 		}
 		
 		//-----------------------------------------
@@ -377,8 +417,8 @@ class htmlOutput extends coreOutput implements interface_output
 		//-----------------------------------------
 		// Return
 		//-----------------------------------------
-		//print IPSLib::sizeFormat( IPSLib::strlenToBytes( strlen( $finalOutput ) ) );
-		return $this->parseIPSTags( $finalOutput );
+		
+		return $finalOutput;
 	}
 	
 	/**
@@ -389,57 +429,13 @@ class htmlOutput extends coreOutput implements interface_output
 	 */
 	public function finishUp()
 	{
-		//-----------------------------------------
-		// Memory usage
-		//-----------------------------------------
-
-		if ( IPS_MEMORY_DEBUG_MODE AND defined( 'IPS_MEMORY_START' ) AND $this->memberData['g_access_cp'] )
-		{
-			if ( is_array( IPSDebug::$memory_debug ) )
-			{
-				$memory .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>MEMORY USAGE</div><div class='row1' style='padding:6px'>\n";
-				$memory .= "<table cellpadding='4' cellspacing='0' border='0' width='100%'>\n";
-				$_c      = 0;
-				
-				foreach( IPSDebug::$memory_debug as $usage )
-				{
-					$_col = ( $_c % 2 ) ? '#eee' : '#ddd';
-					$_c++;
-					
-					if ( $usage[1] > 500 * 1024 )
-					{
-						$_col .= ";color:#D00000";
-					}
-					else if ( $usage[1] < 10 * 1024 )
-					{
-						$_col .= ";color:darkgreen";
-					}
-					else if ( $usage[1] < 100 * 1024 )
-					{
-						$_col .= ";color:darkorange";
-					}
-					
-					$memory .= "<tr><td width='60%' style='background-color:{$_col}' align='left'>{$usage[0]}</td><td style='background-color:{$_col}' align='left'><strong>".IPSLib::sizeFormat( $usage[1] )."</strong></td></tr>";
-				}
-				
-				$memory .= "</table></div></div>";
-			}
-			
-			$end       = memory_get_usage();
-			$peak_end  = function_exists('memory_get_peak_usage') ? memory_get_peak_usage() : memory_get_usage();
-			$_used     = $end - IPS_MEMORY_START;
-			$peak_used = $peak_end - IPS_MEMORY_START;
-			
-			print $memory;
-			print "Total Memory Used: " . IPSLib::sizeFormat( $_used ) . " (Peak:" . IPSLib::sizeFormat( $peak_used ).")";
-		}
 	}
 	
 	/**
 	 * Adds more items into the document header like CSS / RSS, etc
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addHeadItems()
 	{
@@ -460,9 +456,13 @@ class htmlOutput extends coreOutput implements interface_output
 					}
 					else
 					{
-						$this->registry->getClass('output')->skin['_css'][ $data['css_group'] ]['attributes'] = 'media="screen"';
+						$this->registry->getClass('output')->skin['_css'][ $data['css_group'] ]['attributes'] = 'media="screen,print"';
 					}
 				}
+				else if ( $data['css_group'] == 'ipb_print' )
+				{
+					continue;
+				}
 			
 				$this->registry->getClass('output')->skin['_css'][ $data['css_group'] ]['content'] = str_replace( 'http://', 'https://', $this->registry->getClass('output')->skin['_css'][ $data['css_group'] ]['content'] );
 			}
@@ -485,9 +485,13 @@ class htmlOutput extends coreOutput implements interface_output
 				}
 				else
 				{
-					$this->registry->getClass('output')->skin['_css'][ $name ]['attributes'] = 'media="screen"';
+					$this->registry->getClass('output')->skin['_css'][ $name ]['attributes'] = 'media="screen,print"';
 				}
 			}
+			else if ( $data['css_group'] == 'ipb_print' )
+			{
+				continue;
+			}
 			
 			/* Did we skip it? */
 			if ( ! isset( $this->registry->getClass('output')->skin['_css'][ $name ] ) )
@@ -501,13 +505,11 @@ class htmlOutput extends coreOutput implements interface_output
 				continue;
 			}
 
-			if ( $this->registry->getClass('output')->skin['set_css_inline'] AND @file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/'. $this->registry->getClass('output')->skin['_csscacheid'] .'/'. $name . '.css' ) )
+			if ( ! SAFE_MODE_ON && $this->registry->getClass('output')->skin['set_css_inline'] AND @is_file( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/'. $this->registry->getClass('output')->skin['_csscacheid'] .'/'. $name . '.css' ) )
 	        {
-				$_cssFile = $this->settings['public_dir'] . 'style_css/' . $this->registry->getClass('output')->skin['_csscacheid'] .'/'. $name . '.css';
-	        	$this->_css['import'][$_cssFile] = array( 
-															'attributes' => $this->registry->getClass('output')->skin['_css'][ $name ]['attributes'],
-															'content'    => $_cssFile 
-														);
+				$_cssFile = $this->settings['css_base_url'] . 'style_css/' . $this->registry->getClass('output')->skin['_csscacheid'] .'/'. $name . '.css';
+	        	$this->_css['import'][$_cssFile] = array( 'attributes' => $this->registry->getClass('output')->skin['_css'][ $name ]['attributes'],
+														  'content'    => $_cssFile );
 	        }
 	        else
 	        {
@@ -520,39 +522,18 @@ class htmlOutput extends coreOutput implements interface_output
 		// RSS
 		//-----------------------------------------
 
-		$cacheUsed		= false;
 		$rssOutputCache	= $this->cache->getCache('rss_output_cache');
 
 		if( is_array( $rssOutputCache ) AND count( $rssOutputCache ) )
 		{
-			$expires	= array_shift( $rssOutputCache );
+			foreach( $rssOutputCache as $rssEntry )
+			{
+				$data	= explode( ':|:', $rssEntry );
 			
-			if( time() < $expires )
-			{
-				foreach( $rssOutputCache as $rssEntry )
+				if( $data[1] )
 				{
-					$data	= explode( ':|:', $rssEntry );
-				
 					$this->output->addToDocumentHead( 'rss', array( 'title'	=> $data[0], 'url' => $data[1] ) );
 				}
-				
-				$cacheUsed	= true;
-			}
-			else
-			{
-				$this->cache->rebuildCache( 'rss_output_cache' );
-				
-				$rssOutputCache	= $this->cache->getCache('rss_output_cache');
-				
-				if( is_array( $rssOutputCache ) AND count( $rssOutputCache ) )
-				{
-					foreach( $rssOutputCache as $rssEntry )
-					{
-						$data	= explode( ':|:', $rssEntry );
-					
-						$this->output->addToDocumentHead( 'rss', array( 'title'	=> $data[0], 'url' => $data[1] ) );
-					}
-				}
 			}
 		}
 
@@ -587,7 +568,10 @@ class htmlOutput extends coreOutput implements interface_output
 		
 		# Ensure &amp;s are taken care of
 		$url = str_replace( "&amp;", "&", $url );
-
+		
+		# Dirty hack @todo look at real reason for this - happens when URL is already SEO and passed via buildSEOUrl above
+		$url = str_replace( "?//", "?/", $url );
+		
 		# 301?
 		if ( $send301 === TRUE )
 		{
@@ -630,7 +614,6 @@ class htmlOutput extends coreOutput implements interface_output
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 * @todo 	[Future] Remove the legacy remapping in 3.1.  We will assume posts have been rebuilt by then.
 	 */
 	public function parseIPSTags( $text )
 	{
@@ -644,19 +627,13 @@ class htmlOutput extends coreOutput implements interface_output
 		$text = str_replace( "{style_image_url}"	, $this->settings['img_url']  , $text );
 		$text = str_replace( "{style_images_url}"	, $this->settings['img_url']  , $text );
 
-		//-----------------------------------------
-		// Fix legacy emoticon/avatar/images links
-		//-----------------------------------------
-
-		$text = preg_replace( "#img\s+?src=([\"'])(?:{$this->settings['board_url']}[^\"']+?)?(?<!public%2F)style_(images|avatars|emoticons)([^\"']+?)[\"'](.+?)?".">#is", "img src=\\1".$this->settings['public_dir']."style_\\2\\3\\1\\4>", $text );
-
 		//-----------------------------------------
 		// Fix up IPB image url
 		//-----------------------------------------
 		
 		if ( $this->settings['ipb_img_url'] )
 		{
-			$text = preg_replace( '#img\s+?src=["\']public/style_(images|avatars|emoticons)(.+?)["\'](.+?)?' . '>#is', "img src=\"".$this->settings['ipb_img_url']."public/style_\\1\\2\"\\3>", $text );
+			$text = preg_replace( '#img\s+?src=["\']' . PUBLIC_DIRECTORY . '/style_(images|avatars|emoticons)(.+?)["\'](.+?)?' . '>#is', "img src=\"".$this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . "/style_\\1\\2\"\\3>", $text );
 		}
 		
 		//-----------------------------------------
@@ -674,10 +651,10 @@ class htmlOutput extends coreOutput implements interface_output
 	/**
 	 * Fetch copyright notice
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	string		Copyright HTML
 	 */
-	private function html_fetchCopyright()
+	protected function html_fetchCopyright()
 	{
 		//-----------------------------------------
 		// REMOVAL OF THIS WITHOUT PURCHASING COPYRIGHT REMOVAL WILL VIOLATE THE LICENCE YOU AGREED
@@ -692,11 +669,11 @@ class htmlOutput extends coreOutput implements interface_output
         	/**
         	 * @link	http://community.invisionpower.com/tracker/issue-23750-licensed-to-wont-work-if-copyright-removal-purchased/
         	 */
-        	if ( $this->settings['ipb_reg_show'] and $this->settings['ipb_reg_name'] )
+        	if ( $this->settings['ipb_reg_name'] )
         	{
         		$copyright = "<!-- Copyright Information -->
         				  <p id='copyright'>" .
-        				  $this->lang->words['licensed_to'] . $this->settings['ipb_reg_name'] .
+        				  $this->lang->words['licensed_to'] . ' ' . $this->settings['ipb_reg_name'] .
         				  "</p>\n\t\t<!-- / Copyright -->";
         	}
         	else
@@ -708,13 +685,11 @@ class htmlOutput extends coreOutput implements interface_output
         {
         	$copyright = "<!-- Copyright Information -->
         				  <p id='copyright'>
-        				  	Си�тема дл� �ообще�тв IP.Board{$version}
-							<div style='display: none;'><a href='http://prowebber.ru' title='PROWEBBER.RU - в�ё дл� вебма�тера!'>PROWEBBER.RU - в�ё дл� вебма�тера!</a></div>
-        				  ";
+        				  	<a href='http://hatynka.in/' title='Nulled by Hatynka.in'>Си�тема дл� �ообще�тв IP.Board{$version}</a>";
         				  
-        	if ( $this->settings['ipb_reg_show'] and $this->settings['ipb_reg_name'] )
+        	if ( $this->settings['ipb_reg_name'] )
         	{
-        		$copyright .= "<br />" . $this->lang->words['licensed_to'] . $this->settings['ipb_reg_name'];
+        		$copyright .= "<br />" . $this->lang->words['licensed_to'] . ' ' . $this->settings['ipb_reg_name'];
         	}
         	
         	
@@ -727,7 +702,7 @@ class htmlOutput extends coreOutput implements interface_output
 	/**
 	 * Returns debug data
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	string		Debug HTML
 	 */
 	public function html_showDebugInfo()
@@ -915,14 +890,57 @@ class htmlOutput extends coreOutput implements interface_output
         	$stats .= "</div>\n</div>";
         }
 
+		//-----------------------------------------
+		// Memory usage
+		//-----------------------------------------
+
+		if ( IPS_MEMORY_DEBUG_MODE AND defined( 'IPS_MEMORY_START' ) AND $this->memberData['g_access_cp'] )
+		{
+			if ( is_array( IPSDebug::$memory_debug ) )
+			{
+				$memory .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>MEMORY USAGE</div><div class='row1' style='padding:6px'>\n";
+				$memory .= "<table cellpadding='4' cellspacing='0' border='0' width='100%'>\n";
+				$_c      = 0;
+				
+				foreach( IPSDebug::$memory_debug as $usage )
+				{
+					$_col = ( $_c % 2 ) ? '#eee' : '#ddd';
+					$_c++;
+					
+					if ( $usage[1] > 500 * 1024 )
+					{
+						$_col .= ";color:#D00000";
+					}
+					else if ( $usage[1] < 10 * 1024 )
+					{
+						$_col .= ";color:darkgreen";
+					}
+					else if ( $usage[1] < 100 * 1024 )
+					{
+						$_col .= ";color:darkorange";
+					}
+					
+					$memory .= "<tr><td width='60%' style='background-color:{$_col}' align='left'>{$usage[0]}</td><td style='background-color:{$_col}' align='left'><strong>".IPSLib::sizeFormat( $usage[1] )."</strong></td></tr>";
+				}
+				
+				$memory .= "</table></div></div>";
+			}
+			
+			$end       = memory_get_usage();
+			$peak_end  = function_exists('memory_get_peak_usage') ? memory_get_peak_usage() : memory_get_usage();
+			$_used     = $end - IPS_MEMORY_START;
+			$peak_used = $peak_end - IPS_MEMORY_START;
+			
+			$stats	.= $memory;
+			$stats	.= "Total Memory Used: " . IPSLib::sizeFormat( $_used ) . " (Peak:" . IPSLib::sizeFormat( $peak_used ).")";
+		}
+
         if ( $stats )
         {
 			$stats = "
-					  <div align='center' id='debug_wrapper'>
-					   <div class='row2' style='padding:8px;vertical-align:middle'><a href='#' onclick=\"$('debug').toggle(); return false;\">Скрыть</a></div>
-					   <br />
+					  <div align='center' style='width:92%; margin:120px auto 20px auto; overflow:auto;'>
 					   <div class='tableborder' align='left' id='debug'>
-						<div class='maintitle'>Отладочна� информаци�</div>
+						<div class='maintitle'>Debug Information (<a href='#' onclick=\"$('debug').toggle(); return false;\">Hide Debug Information</a>)</div>
 						 <div style='padding:5px;background:#8394B2;'>{$stats}</div>
 					   </div>
 					  </div>";
@@ -934,12 +952,12 @@ class htmlOutput extends coreOutput implements interface_output
 	/**
 	 * Fetch language drop down box
 	 *
-	 * @access	private
-	 * @return	string		Drop down list.
+	 * @access	protected
+	 * @return	array
 	 */
-	private function html_buildLanguageDropDown()
+	protected function html_buildLanguageDropDown()
     {
-    	$lang_list = "";
+    	$lang_list = array();
     	$cache     = $this->caches['lang_data'];
 
     	//-----------------------------------------
@@ -952,14 +970,18 @@ class htmlOutput extends coreOutput implements interface_output
 			{
 				if ( $this->member->language_id == $data['lang_id'] )
 				{
-					$selected = ' selected="selected"';
+					$lang_list['options'][]	= array( 'id' => $data['lang_id'], 'title' => $data['lang_title'], 'selected' => true );
+					$lang_list['default']	= $data['lang_title'];
+				}
+				else if( !$this->member->language_id AND $data['lang_default'] )
+				{
+					$lang_list['options'][]	= array( 'id' => $data['lang_id'], 'title' => $data['lang_title'], 'selected' => true );
+					$lang_list['default']	= $data['lang_title'];
 				}
 				else
 				{
-					$selected = "";
+					$lang_list['options'][]	= array( 'id' => $data['lang_id'], 'title' => $data['lang_title'], 'selected' => false );
 				}
-			
-				$lang_list .= "\n<option value='{$data['lang_id']}'{$selected}>{$data['lang_title']}</option>";
 			}
 		}
 	
@@ -971,18 +993,18 @@ class htmlOutput extends coreOutput implements interface_output
 	 *
 	 * Does what is says up there a bit
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	int			Parent id
 	 * @param	int			Iteration
-	 * @return	string		Drop down list. All nicely formatted.
+	 * @return	array
 	 */
-	private function html_fetchSetsDropDown( $parent=0, $iteration=0 )
+	protected function html_fetchSetsDropDown( $parent=0, $iteration=0 )
 	{
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
 		
-		$output       = "";
+		$output       = array();
 		$depthMarkers = "";
 		
 		if( $iteration )
@@ -1021,14 +1043,14 @@ class htmlOutput extends coreOutput implements interface_output
 				continue;
 			}
 			
-			$_selected = ( $this->skin['set_id'] == $data['set_id'] ) ? 'selected="selected"' : '';
+			$_selected = ( $this->skin['set_id'] == $data['set_id'] ) ? true : false;
 			
 			/* Ok to add... */
-			$output .= "\n<option id='skinSetDD_" . $data['set_id'] . "' " . $_selected . " value=\"". $data['set_id'] . "\">". $depthMarkers . $data['set_name'] . "</option>";
+			$output[]	= array( 'id' => $data['set_id'], 'depth' => $depthMarkers, 'title' => $data['set_name'], 'selected' => $_selected );
 			
 			if ( is_array( $data['_childTree'] ) AND count( $data['_childTree'] ) )
 			{
-				$output .= $this->html_fetchSetsDropDown( $data['set_id'], $iteration + 1 );
+				$output	= array_merge( $output, $this->html_fetchSetsDropDown( $data['set_id'], $iteration + 1 ) );
 			}
 		}
 
@@ -1038,10 +1060,10 @@ class htmlOutput extends coreOutput implements interface_output
 	/**
 	 * Get faster text
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	string
 	 */
-	private function _getFasterText()
+	protected function _getFasterText()
 	{
 		$texts	= array(
 						'Zooom',
diff --git a/upload/admin/sources/classes/output/formats/html/index.html b/upload/admin/sources/classes/output/formats/html/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/output/formats/html/index.html
+++ b/upload/admin/sources/classes/output/formats/html/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/formats/index.html b/upload/admin/sources/classes/output/formats/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/output/formats/index.html
+++ b/upload/admin/sources/classes/output/formats/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/formats/xml/conf.php b/upload/admin/sources/classes/output/formats/xml/conf.php
deleted file mode 100644
index dd562992..00000000
--- a/upload/admin/sources/classes/output/formats/xml/conf.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Ouput format: XML
- * (Matt Mecham)
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		9th March 2005 11:03
- * @version		$Revision: 5713 $
- *
- */
-
-$config = array();
-
-/* Identifies publicly as... */
-$config['identifies_as'] = 'XML';
-
-/* Gateway file? */
-$config['gateway_file']  = 'xml.php';
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/formats/xml/index.html b/upload/admin/sources/classes/output/formats/xml/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/admin/sources/classes/output/formats/xml/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/formats/xml/xmlOutput.php b/upload/admin/sources/classes/output/formats/xml/xmlOutput.php
deleted file mode 100644
index 0c27c885..00000000
--- a/upload/admin/sources/classes/output/formats/xml/xmlOutput.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Ouput format: HTML
- * (Matt Mecham)
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: terabyte $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		9th March 2005 11:03
- * @version		$Revision: 6881 $
- *
- */
-
-class xmlOutput extends coreOutput implements interface_output 
-{
-	/**
-	 * Main output class
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $output;
-	
-	/**
-	 * CSS array
-	 *
-	 * @access	protected
-	 * @var 	array
-	 */
-	protected $_css = array( 'import' => array(), 'inline' => array() );
-	
-	/**
-	 * Constructor
-	 *
-	 * @access	public
-	 * @param	object		Output object
-	 * @return	void
-	 */
-	public function __construct( output $output )
-	{
-		/* Make object */
-		parent::__construct( $output );
-	}
-	
-	/**
-	 * Prints any header information for this output module
-	 *
-	 * @access	public
-	 * @return	null		Prints header() information
-	 */
-	public function printHeader()
-	{
-		//-----------------------------------------
-		// Start GZIP compression
-        //-----------------------------------------
-        
-        if ( $this->settings['disable_gzip'] != 1 )
-        {
-	        $buffer = "";
-	        
-	        if ( count( ob_list_handlers() ) )
-	        {
-        		$buffer = ob_get_contents();
-        		ob_end_clean();
-    		}
-    		
-        	@ob_start('ob_gzhandler');
-        	print $buffer;
-        }
-
-		if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
-		{
-			header("HTTP/1.0 200 OK" );
-		}
-		else
-		{
-			header("HTTP/1.1 200 OK" );
-		}
-		
-		header( "Content-type: text/xml;charset=" . IPS_DOC_CHAR_SET );
-		
-		if ( $this->settings['nocache'] )
-		{
-			header("Cache-Control: no-cache, must-revalidate, max-age=0");
-			header("Expires: 0");
-			header("Pragma: no-cache");
-		}
-	}
-	
-	/**
-	 * Display error
-	 *
-	 * @access	public
-	 * @param	string		Error message
-	 * @param	integer		Error code
-	 * @return	mixed		You can print a custom message here, or return formatted data to be sent do registry->output->sendOutput
-	 */
-	public function displayError( $message, $code=0 )
-	{
-
-	}
-	
-	/**
-	 * Display board offline
-	 *
-	 * @access	public
-	 * @param	string		Message
-	 * @return	mixed		You can print a custom message here, or return formatted data to be sent do registry->output->sendOutput
-	 */
-	public function displayBoardOffline( $message )
-	{
-		
-	}
-	
-	/**
-	 * Fetches the output
-	 *
-	 * @access	public
-	 * @param	string		Output gathered
-	 * @param	string		Title of the document
-	 * @param	array 		Navigation gathered
-	 * @param	array 		Array of document head items
-	 * @param	array 		Array of JS loader items
-	 * @param	array 		Array of extra data
-	 * @return	string		Output to be printed to the client
-	 */
-	public function fetchOutput( $output, $title, $navigation, $documentHeadItems, $jsLoaderItems, $extraData=array() )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$system_vars_cache = $this->caches['systemvars'];
-		$showPMBox	  	   = '';
-
-		//-----------------------------------------
-		// NORMAL
-		//-----------------------------------------
-		
-		if ( $this->_outputType == 'normal' )
-		{
-			//-----------------------------------------
-			// Grab output
-			//-----------------------------------------
-
-			$finalOutput = $this->output->getTemplate('global')->globalTemplate( $output, $documentHeadItems, $this->_css, $jsLoaderItems,
-																								   array( 'title'        => $title,
-																										  'applications' => $this->core_fetchApplicationData(),
-																										  'page'		 => $this->_current_page_title  ),
-																								   array( 'navigation'   => $navigation ),
-																								   array( 'time'         => $this->registry->getClass( 'class_localization')->getDate( time(), 'SHORT', 1 ),
-																										  'lang_chooser' => $this->html_buildLanguageDropDown(),
-																										  'skin_chooser' => $this->html_fetchSetsDropDown(),
-																										  'stats'        => $this->html_showDebugInfo(),
-																										  'copyright'    => $this->html_fetchCopyright() ),
-																								   array( 'ex_time'      => sprintf( "%.4f", IPSDebug::endTimer() ),
-																								          'gzip_status'  => ( $this->settings['disable_gzip'] == 1 ) ? $this->lang->words['gzip_off'] : $this->lang->words['gzip_on'],
-																								          'server_load'  => ipsRegistry::$server_load,
-																								          'queries'      => $this->DB->getQueryCount() )
-																								);
-		}
-		
-		//-----------------------------------------
-		// Grab output
-		// REDIRECT
-		//-----------------------------------------
-		
-		else if ( $this->_outputType == 'redirect' )
-		{
-			# SEO?
-			if ( $extraData['seoTitle'] )
-			{
-				$extraData['url']  = $this->output->buildSEOUrl( $extraData['url'], 'none', $extraData['seoTitle'] );
-				$extraData['full'] = 1;
-			}
-			
-			$finalOutput = $this->output->getTemplate('global')->redirectTemplate( $documentHeadItems, $this->_css, $jsLoaderItems, $extraData['text'], $extraData['url'], $extraData['full'] );
-		}
-
-		//-----------------------------------------
-		// POP UP
-		//-----------------------------------------
-		
-		else if ( $this->_outputType == 'popup' )
-		{
-			$finalOutput = $this->output->getTemplate('global')->displayPopUpWindow( $documentHeadItems, $this->_css, $jsLoaderItems, $title, $output );
-		}
-		
-		//-----------------------------------------
-		// Return
-		//-----------------------------------------
-		
-		return $this->parseIPSTags( $finalOutput );
-	}
-	
-	/**
-	 * Finish / clean up after sending output
-	 *
-	 * @access	public
-	 * @return	null
-	 */
-	public function finishUp()
-	{
-	}
-	
-	/**
-	 * Adds more items into the document header like CSS / RSS, etc
-	 *
-	 * @access	public
-	 * @return   null
-	 */
-	public function addHeadItems()
-	{
-	}
-	
-	/**
-	 * Silent redirect (Redirects without a screen or other notification)
-	 *
-	 * @access	public
-	 * @param	string		URL
-	 * @param	string		[SEO Title]
-	 * @return	mixed
-	 */
-	public function silentRedirect( $url, $seoTitle='' )
-	{
-		# Ensure &amp;s are taken care of
-		$url = str_replace( "&amp;", "&", $url );
-		
-		# SEO?
-		if ( $seoTitle )
-		{
-			$url = $this->registry->getClass('output')->buildSEOUrl( $url, 'none', $seoTitle );
-		}
-		
-		if ( $this->settings['header_redirect'] == 'refresh' )
-		{
-			@header("Refresh: 0;url=".$url);
-		}
-		else if ( $this->settings['header_redirect'] == 'html' )
-		{
-			$url = str_replace( '&', '&amp;', str_replace( '&amp;', '&', $url ) );
-			echo("<html><head><meta http-equiv='refresh' content='0; url=$url'></head><body></body></html>");
-			exit();
-		}
-		else
-		{
-			@header( "Location: ".$url );
-		}
-		
-		exit();
-	}
-	
-	/**
-	 * Replace IPS tags
-	 * Converts over <#IMG_DIR#>, etc
-	 *
-	 * @access	public
-	 * @param	string	Unparsed text
-	 * @return	string	Parsed text
-	 */
-	public function parseIPSTags( $text )
-	{
-		$text = str_replace( "<#IMG_DIR#>"      , $this->skin['set_image_dir'], $text );
-		$text = str_replace( "<#EMO_DIR#>"      , $this->skin['set_emo_dir']  , $text );
-		$text = str_replace( "<% CHARSET %>"    , IPS_DOC_CHAR_SET            , $text );
-		$text = str_replace( "{style_image_url}", $this->settings['img_url']  , $text );
-		
-		if ( $this->settings['ipb_img_url'] )
-		{
-			$text = preg_replace( "#img\s+?src=[\"']style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$this->settings['ipb_img_url']."style_\\1\\2\"\\3>", $text );
-		}
-		
-		return $text;
-	}
-	
-	/**
-	 * Fetch copyright notice
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	private function html_fetchCopyright()
-	{
-		//-----------------------------------------
-		// REMOVAL OF THIS WITHOUT PURCHASING COPYRIGHT REMOVAL WILL VIOLATE THE LICENCE YOU AGREED
-		// TO WHEN DOWNLOADING THIS PRODUCT. THIS COULD MEAN REMOVAL OF YOUR BOARD AND EVEN
-		// CRIMINAL CHARGES
-		//-----------------------------------------
-        
-		$version = ( $this->settings['ipb_display_version'] AND $this->settings['ipb_display_version'] != 0 ) ? ipsRegistry::$version : '';
-		
-        if ($this->settings['ipb_copy_number'] && $this->settings['ips_cp_purchase'])
-        {
-        	$copyright = "";
-        }
-        else
-        {
-        	$copyright = "<!-- Copyright Information -->
-        				  <p id='copyright'>
-        				  	Форум IP.Board
-        				  	{$version} &copy; ".date("Y")." &nbsp;IPS, <abbr title='Incorporated'>Inc</abbr>.
-							<div style='display: none;'><a href='http://prowebber.ru' title='PROWEBBER.RU - в�ё дл� вебма�тера!'>PROWEBBER.RU - в�ё дл� вебма�тера!</a></div>
-        				  ";
-        				  
-        	if ( $this->settings['ipb_reg_show'] and $this->settings['ipb_reg_name'] )
-        	{
-        		$copyright .= "<div>Зареги�трирован на: ". $this->settings['ipb_reg_name']."</div>";
-        	}
-        	
-        	
-        	$copyright .= "</p>\n\t\t<!-- / Copyright -->";
-        }
-
-		return $copyright;
-	}
-	
-	/**
-	 * Returns debug data
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	public function html_showDebugInfo()
-    {
-    }
-
-	/**
-	 * Fetch language drop down box
-	 *
-	 * @access	private
-	 * @return   string
-	 */
-	private function html_buildLanguageDropDown()
-    {
-
-    }
-
-	/**
-	 * Fetch skin list
-	 *
-	 * Does what is says up there a bit
-	 *
-	 * @access	private
-	 * @return	HTML		Drop down list. All nicely formatted.
-	 */
-	private function html_fetchSetsDropDown()
-	{
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/index.html b/upload/admin/sources/classes/output/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/output/index.html
+++ b/upload/admin/sources/classes/output/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/output/publicOutput.php b/upload/admin/sources/classes/output/publicOutput.php
index e2995ffd..271e5f90 100644
--- a/upload/admin/sources/classes/output/publicOutput.php
+++ b/upload/admin/sources/classes/output/publicOutput.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Public output methods
- * Last Updated: $Date: 2010-10-28 12:07:41 -0400 (Thu, 28 Oct 2010) $
+ * Last Updated: $Date: 2011-10-05 21:08:45 -0400 (Wed, 05 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 7063 $
+ * @version		$Revision: 9586 $
  *
  */
 
@@ -226,6 +226,36 @@ class output
 	 */
 	protected $_isMobileSkin = false;
 	
+	/**
+	* FURL cache storage.
+	*
+	* @access	protected
+	* @var		boolean
+	*/
+	protected static $furlCache = array();
+	
+	/**
+	* If you're generating a lot of FURLs, the cache will eventually slow you down beyond 
+	*
+	* @access	protected
+	* @var		boolean
+	*/
+	protected static $furlCacheEnabled = true;
+	
+	/**
+	 * Interally cache the results of isLargeTouchDevice() and isSmallTouchDevice()
+	 * @var boolean
+	 */
+	protected $_isLargeTouchDevice = null;
+	protected $_isSmallTouchDevice = null;
+	
+	/**
+	 * Fetch skin generator session
+	 * @var boolean
+	 */
+	public $skinGenSession = false;
+	
+	
 	/**
 	 * Trap skin calls that could have incorrect names
 	 *
@@ -277,6 +307,12 @@ class output
 					return $this->outputFormatClass->$funcName( $args[0] );
 				}
 			break;
+			case 'encodeMetaTagContent':
+				if ( is_object( $this->outputFormatClass ) )
+				{
+					return $this->outputFormatClass->$funcName( $args[0] );
+				}
+			break;
 			case 'addCanonicalTag':
 				if ( is_object( $this->outputFormatClass ) )
 				{
@@ -293,6 +329,11 @@ class output
 				{
 					return $this->outputFormatClass->$funcName( $args[0] );
 				}
+			case 'parseIPSTags':
+				if ( is_object( $this->outputFormatClass ) )
+				{
+					return $this->outputFormatClass->$funcName( $args[0] );
+				}
 			break;
 		}
 		
@@ -300,7 +341,7 @@ class output
 		
 		if ( strstr( $className, 'skin_' ) )
 		{
-			preg_match( "#^skin_(.*)_(\d+?)$#", $className, $matches );
+			preg_match( '#^skin_(.*)_(\d+?)$#', $className, $matches );
 			$skinName = $matches[1];
 			$skinID   = $matches[2];
 			
@@ -334,13 +375,72 @@ class output
 		return ( $this->_isMobileSkin ) ? true : false;
 	}
 	
+	/**
+	 * Is this a large touch device? ...
+	 * Future expansion
+	 */
+	public function isLargeTouchDevice()
+	{
+		if ( $this->_isLargeTouchDevice === null )
+		{
+			$this->_isLargeTouchDevice = false;
+			
+			if ( $this->memberData['userAgentKey'] == 'transformer' )
+			{
+				$this->_isLargeTouchDevice = true;
+			}
+			else if ( $this->memberData['userAgentKey'] == 'iPad' )
+			{
+				$this->_isLargeTouchDevice = true;
+			}
+		}
+		
+		return $this->_isLargeTouchDevice;
+	}
+	
+	/**
+	 * Is this a small touch device? ...
+	 * Future expansion
+	 */
+	public function isSmallTouchDevice()
+	{
+		if ( $this->_isSmallTouchDevice === null )
+		{
+			$this->_isSmallTouchDevice = false;
+			
+			if ( $this->memberData['userAgentKey'] == 'iphone' )
+			{
+				$this->_isSmallTouchDevice = true;
+			}
+			else if ( $this->memberData['userAgentKey'] == 'ipodtouch' )
+			{
+				$this->_isSmallTouchDevice = true;
+			}
+			else if ( $this->memberData['userAgentKey'] == 'android' )
+			{
+				$this->_isSmallTouchDevice = true;
+			}
+		}
+		
+		return $this->_isSmallTouchDevice;
+	}
+	
+	/**
+	 * Is this a ___ touch device? ...
+	 * Future expansion
+	 */
+	public function isTouchDevice()
+	{
+		return ( $this->isLargeTouchDevice() || $this->isSmallTouchDevice() ) ? true : false;
+	}
+	
    	/**
 	 * Construct
 	 *
 	 * @access	public
 	 * @param	object		ipsRegistry reference
 	 * @param	bool		Whether to init or not
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $initialize=FALSE )
 	{
@@ -372,13 +472,18 @@ class output
 			$this->skin     = $this->allSkins[ $skinSetID ];
 			
 			/* Does it need a recache? */
-			if ( $this->skin['set_updated'] == -1 )
+			if ( $this->skin['set_updated'] == -2 )
 			{
 				/* Flag skins for recache */
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 				$skinCaching	= new skinCaching( $this->registry );
 				
+				/* Set it as caching */
+				$skinCaching->flagSetAsRecaching( $skinSetID );
+				
+				/* Just recache this one skin set */
+				$skinCaching->setIgnoreChildrenWhenRecaching( true );
 				$skinCaching->rebuildPHPTemplates( $skinSetID );
 				$skinCaching->rebuildCSS( $skinSetID );
 				
@@ -430,6 +535,11 @@ class output
 							{
 								continue;
 							}
+							/* @link http://community.invisionpower.com/tracker/issue-32175-disabled-app-css */
+							else if( $appDir and !IPSLib::appIsInstalled( $appDir ) )
+							{
+								continue;
+							}
 						}
 						
 						/* Tied to specific modules within the app? */
@@ -459,7 +569,7 @@ class output
 	    	{
 				$this->skin['_css'] = array();
 				
-				if ( file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
+				if ( is_file( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
 				{
 					$REMAP = $this->buildRemapData();
 					
@@ -489,8 +599,8 @@ class output
 				/* Sort out CSS */
 				if ( ! isset( $this->_skinFunctions ) || ! is_object( $this->_skinFunctions ) )
 				{
-					require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-					require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+					require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+					require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 
 					$this->_skinFunctions = new skinCaching( $this->registry );
 				}
@@ -500,7 +610,7 @@ class output
 				$ord = array();
 				
 				foreach( $css as $name => $data )
-				{
+				{				
 					/* Tied to app? */
 					if ( ( $data['css_app'] ) AND $data['css_app'] != IPS_APP_COMPONENT AND $data['css_app_hide'] )
 					{
@@ -531,12 +641,12 @@ class output
 				$this->skin['_cssGroupsArray'] = $ord;
 				$this->skin['_skincacheid']    = is_dir( IPS_CACHE_PATH . 'cache/skin_cache/' . $_dir ) ? $_setId : $this->skin['set_id'];
 				$this->skin['_csscacheid']     = $_cdir;
-				$this->skin['set_css_inline']  = ( $this->skin['set_css_inline'] AND is_dir( IPS_PUBLIC_PATH . 'style_css/' . $_cdir ) ) ? 1 : 0;
+				$this->skin['set_css_inline']  = ( is_dir( IPS_PUBLIC_PATH . 'style_css/' . $_cdir ) ) ? 1 : 0;
 				
-				if ( file_exists( IPS_CACHE_PATH . 'cache/skin_cache/' . $_dir . '/_replacements.inc' ) )
+				if ( is_file( IPS_CACHE_PATH . 'cache/skin_cache/' . $_dir . '/_replacements.inc' ) )
 				{
 					$replacements = array();
-					include_once( IPS_CACHE_PATH . 'cache/skin_cache/' . $_dir . '/_replacements.inc' );
+					include_once( IPS_CACHE_PATH . 'cache/skin_cache/' . $_dir . '/_replacements.inc' );/*noLibHook*/
 					
 					$this->skin['_replacements'] = $replacements;
 				}
@@ -565,10 +675,10 @@ class output
 				}
 			}
 		
-			require_once( IPS_ROOT_PATH . 'sources/classes/output/formats/coreOutput.php' );
-			require_once( IPS_ROOT_PATH . 'sources/classes/output/formats/' . $_outputFormat. '/' . $_outputClassName. '.php' );
-		
-			$this->outputFormatClass = new $_outputClassName( $this );
+			require_once( IPS_ROOT_PATH . 'sources/classes/output/formats/coreOutput.php' );/*noLibHook*/
+			$outputClassToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/output/formats/' . $_outputFormat. '/' . $_outputClassName. '.php', $_outputClassName );
+			
+			$this->outputFormatClass = new $outputClassToLoad( $this );
 			
 			/* Build URLs */
 			$this->_buildUrls();
@@ -601,7 +711,7 @@ class output
 	 * Build URLs
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildUrls()
 	{
@@ -634,25 +744,40 @@ class output
 
 		$this->settings['js_base']		    = $this->settings['_original_base_url'].'/index.'.$this->settings['php_ext'].'?s='.$this->member->session_id.'&';
 
-		$this->settings['img_url']		    = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . '/style_images/' . $this->skin['set_image_dir'] : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/' . $this->skin['set_image_dir'];
-		$this->settings['img_url_no_dir']	= $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . '/style_images/' : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/';
+		$this->settings['img_url']		    = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/' . $this->skin['set_image_dir'] : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/' . $this->skin['set_image_dir'];
+		$this->settings['img_url_no_dir']	= $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/' : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_images/';
+		$this->settings['public_cdn_url']	= rtrim( $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] : $this->settings['_original_base_url'], '/' ) . '/' . PUBLIC_DIRECTORY . '/';
+		$this->settings['css_base_url']	    = rtrim( $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] : $this->settings['_original_base_url'], '/' ) . '/' . PUBLIC_DIRECTORY . '/';
+		$this->settings['js_base_url']	    = rtrim( $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] : $this->settings['_original_base_url'], '/' ) . '/' . PUBLIC_DIRECTORY . '/';
 		
 		/* HTTPS fixes */
 		if( $this->isHTTPS )
 		{
-			$this->settings['board_url_https']	= str_replace( 'http://', 'https://', $this->settings['board_url'] );
-			$this->settings['base_url_https']	= str_replace( 'http://', 'https://', $this->settings['base_url'] );
-			$this->settings['public_dir']		= str_replace( 'http://', 'https://', $this->settings['public_dir'] );
-			$this->settings['cache_dir']		= str_replace( 'http://', 'https://', $this->settings['cache_dir'] );
-			$this->settings['img_url']			= str_replace( 'http://', 'https://', $this->settings['img_url'] );
-			$this->settings['img_url_no_dir']	= str_replace( 'http://', 'https://', $this->settings['img_url_no_dir'] );
-			$this->settings['upload_url']		= str_replace( 'http://', 'https://', $this->settings['upload_url'] );
-			$this->settings['fbc_xdlocation']	= str_replace( 'http://', 'https://', str_replace( 'xd_receiver.php', 'xd_receiver_ssl.php', $this->settings['fbc_xdlocation'] ) );
+			$this->enableHTTPS();
 		}
-		
-		$this->settings['avatars_url']    = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . '/style_avatars' : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_avatars';
-		$this->settings['emoticons_url']  = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY . '/style_emoticons/<#EMO_DIR#>' : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_emoticons/<#EMO_DIR#>';
-		$this->settings['mime_img']       = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . PUBLIC_DIRECTORY : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY;
+
+		$this->settings['emoticons_url']  = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . '/' . PUBLIC_DIRECTORY . '/style_emoticons/<#EMO_DIR#>' : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY . '/style_emoticons/<#EMO_DIR#>';
+		$this->settings['mime_img']       = $this->settings['ipb_img_url'] ? $this->settings['ipb_img_url'] . '/' . PUBLIC_DIRECTORY : $this->settings['_original_base_url'] . '/' . PUBLIC_DIRECTORY;
+	}
+	
+	/**
+	 * Enable HTTPS
+	 *
+	 * @return	@e void
+	 */
+	public function enableHTTPS()
+	{
+		$this->isHTTPS = TRUE;
+		$this->settings['board_url_https']	= str_replace( 'http://', 'https://', $this->settings['board_url'] );
+		$this->settings['base_url_https']	= str_replace( 'http://', 'https://', $this->settings['base_url'] );
+		$this->settings['public_dir']		= str_replace( 'http://', 'https://', $this->settings['public_dir'] );
+		$this->settings['cache_dir']		= str_replace( 'http://', 'https://', $this->settings['cache_dir'] );
+		$this->settings['img_url']			= str_replace( 'http://', 'https://', $this->settings['img_url'] );
+		$this->settings['css_base_url']		= str_replace( 'http://', 'https://', $this->settings['css_base_url'] );
+		$this->settings['js_base_url']		= str_replace( 'http://', 'https://', $this->settings['js_base_url'] );
+		$this->settings['img_url_no_dir']	= str_replace( 'http://', 'https://', $this->settings['img_url_no_dir'] );
+		$this->settings['upload_url']		= str_replace( 'http://', 'https://', $this->settings['upload_url'] );
+		$this->settings['fbc_xdlocation']	= str_replace( 'http://', 'https://', str_replace( 'xd_receiver.php', 'xd_receiver_ssl.php', $this->settings['fbc_xdlocation'] ) );
 	}
 	
 	/**
@@ -671,14 +796,25 @@ class output
 	 * Sets the isHTTPS class variable
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 * @todo 	[Future] Explore moving the https section definitions to app coreVariables.php
 	 */
 	private function _setHTTPS()
 	{
 		$this->isHTTPS = false;
 		
-		if( (ipsRegistry::$request['section'] == 'login' OR ipsRegistry::$request['section'] == 'lostpass' OR ipsRegistry::$request['section'] == 'register' or ipsRegistry::$request['module'] == 'usercp') AND $this->settings['logins_over_https'] )
+		if ( !defined( 'SSL_PORT' ) )
+		{
+			define( 'SSL_PORT', 443 );
+		}
+				
+		if ( $_SERVER['SERVER_PORT'] == SSL_PORT )
+		{
+			$this->isHTTPS = true;
+			return;
+		}
+		
+		if( $this->settings['logins_over_https'] && ( in_array( ipsRegistry::$request['section'], array( 'login', 'lostpass', 'register') ) || ipsRegistry::$request['module'] == 'usercp') )
 		{
 			/* Configure where we want HTTPS */
 			$sectionsForHttps	= array(
@@ -797,7 +933,7 @@ class output
 				$_skinSets[ $id ]['_cssGroupsArray']  = unserialize( $_skinSets[ $id ]['set_css_groups'] );
 				$_skinSets[ $id ]['_youCanUse']       = FALSE;
 				$_skinSets[ $id ]['_gatewayExclude']  = FALSE;
-			   
+			  
 				/* Can we see it? */
 				if ( $_skinSets[ $id ]['set_permissions'] == '*' )
 				{
@@ -843,7 +979,7 @@ class output
 				}
 			}
 		}
-	
+
 		return $_skinSets;
 	}
 	
@@ -869,12 +1005,38 @@ class output
 		//-----------------------------------------
 		
 		$useSkinID = FALSE;
-	
+		
+		/* Using the skin generator */
+		if ( $this->memberData['g_access_cp'] && $this->memberData['bw_using_skin_gen'] )
+		{
+			/* Flag skins for recache */
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+			require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinGenerator.php' );/*noLibHook*/
+			$skinGenerator	= new skinGenerator( $this->registry );
+			
+			$this->skinGenSession = $skinGenerator->getUserSession( $this->memberData['member_id'] );
+			
+			if ( $this->skinGenSession !== false )
+			{
+				/* Switch on live edit mode */
+				define( 'IPS_LIVE_EDIT', true );
+				
+				return $this->skinGenSession['sg_skin_set_id'];
+			}
+		}
+		
+		/* Turn this off if required */
+		if ( ! defined( 'IPS_LIVE_EDIT') )
+		{
+			define( 'IPS_LIVE_EDIT', false );
+		}
+		
 		//-----------------------------------------
 		// Mobile app?
 		//-----------------------------------------
 		
-		if ( $this->member->isMobileApp AND is_array( $this->allSkins ) )
+		if ( $this->member->isMobileApp AND is_array( $this->allSkins ) && empty( $this->request['settingNewSkin'] ) )
 		{
 			foreach( $this->allSkins as $id => $data )
 			{
@@ -894,43 +1056,61 @@ class output
 		// Unlocking a user-agent?
 		//-----------------------------------------
 		
-		if ( isset( $this->request['unlockUserAgent'] ) AND $this->request['unlockUserAgent'] )
+		if ( ! empty( $this->request['unlockUserAgent'] ) && empty( $this->request['setAsMobile'] ) )
 		{
 			$this->member->updateMySession( array( 'uagent_bypass' => 1 ) );
 			
 			/* Set cookie */
 			IPSCookie::set("uagent_bypass", 1, -1);
 		}
-		
-		//-----------------------------------------
-		// Changing a skin?
-		//-----------------------------------------
-		
-		if ( $this->settings['allow_skins'] )
+		else if ( ! empty( $this->request['setAsMobile'] ) && empty( $this->request['settingNewSkin'] ) )
 		{
-			if ( isset( $this->request['settingNewSkin'] ) AND $this->request['settingNewSkin'] AND ( $this->request['k'] == $this->member->form_hash ) )
+			$this->member->updateMySession( array( 'uagent_bypass' => 0 ) );
+			
+			/* Set cookie */
+			IPSCookie::set("uagent_bypass", 0, -1);
+			
+			/* Force a cookie to identify as a mobile app */
+			IPSCookie::set("mobileApp", 'true', -1);
+		
+			foreach( $this->allSkins as $id => $data )
 			{
-				$_id = intval( $this->request['settingNewSkin'] );
-				
-				/* Rudimentaty check */
-				if ( $this->allSkins[ $_id ]['_youCanUse'] AND $this->allSkins[ $_id ]['_gatewayExclude'] !== TRUE )
+				if ( $data['set_key'] == 'mobile' )
 				{
-					if ( $this->memberData['member_id'] )
-					{
-						/* Update... */
-						IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'skin' => $_id ) ) );
-					}
-					else
-					{
-						IPSCookie::set( 'guestSkinChoice', $_id );
-					}
-					
-					/* Update member row */
-					$this->memberData['skin'] = $_id;
+					$useSkinID = $data['set_id'];
 				}
 			}
 		}
 		
+		//-----------------------------------------
+		// Changing a skin?
+		//-----------------------------------------
+
+		if ( ! empty( $this->request['settingNewSkin'] ) AND ( $this->request['k'] == $this->member->form_hash ) )
+		{
+			$_id = intval( $this->request['settingNewSkin'] );
+			
+			/* Rudimentaty check */
+			if ( $this->allSkins[ $_id ]['_youCanUse'] AND $this->allSkins[ $_id ]['_gatewayExclude'] !== TRUE )
+			{
+				if ( $this->memberData['member_id'] )
+				{
+					/* Update... */
+					IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'skin' => $_id ) ) );
+				}
+				else
+				{
+					IPSCookie::set( 'guestSkinChoice', $_id );
+				}
+				
+				/* Make sure mobile skin is removed */
+				IPSCookie::set("mobileApp", 'false', -1);
+				
+				/* Update member row */
+				$this->memberData['skin'] = $_id;
+			}
+		}
+
 		//-----------------------------------------
 		// Ok, lets get a skin!
 		//-----------------------------------------
@@ -1176,15 +1356,14 @@ class output
 	{
 		$useSkinID = FALSE;
 		$file      = IPSLib::getAppDir( IPS_APP_COMPONENT ) . '/extensions/coreExtensions.php';
-		$class     = 'fetchSkin__' . IPS_APP_COMPONENT;
 		 
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
-			require_once( $file );
+			$classToLoad = IPSLib::loadLibrary( $file, 'fetchSkin__' . IPS_APP_COMPONENT, IPS_APP_COMPONENT );
 			
-			if ( class_exists( $class ) )
+			if ( class_exists( $classToLoad ) )
 			{
-				$_grabber  = new $class( $this->registry );
+				$_grabber  = new $classToLoad( $this->registry );
 				$_grabber->allSkins = $this->allSkins;
 				
 				$useSkinID = $_grabber->fetchSkin();
@@ -1266,7 +1445,8 @@ class output
 				continue;
 			}
 			
-			if ( $data['set_is_default'] )
+			/* Is default for our current gateway? */
+			if ( $data['set_is_default'] && $this->caches['outputformats'][ $data['set_output_format'] ]['gateway_file'] == IPS_PUBLIC_SCRIPT )
 			{
 				$useSkinID = $data['set_id'];
 				break;
@@ -1284,9 +1464,12 @@ class output
 					continue;
 				}
 				
-				/* Grab the first one */
-				$useSkinID = $data['set_id'];
-				break;
+				/* Grab the first HTML one */
+				if ( $data['set_output_format'] == 'html' )
+				{
+					$useSkinID = $data['set_id'];
+					break;
+				}
 			}
 		}
 		
@@ -1354,7 +1537,7 @@ class output
 	 * @access	public
 	 * @param	string	Template name
 	 * @param	integer	Template set ID
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loadTemplate( $name, $id='' )
 	{
@@ -1391,15 +1574,17 @@ class output
 		// Full name
 		//-----------------------------------------
 		
-		$full_name        = $name.'_'.intval($id);
-		$skin_global_name = 'skin_global_'.$id;
+		$full_name            = $name.'_'.intval($id);
+		$skin_global_name     = 'skin_global_'.$id;
+		$new_skin_global_name = '';
+		
 		$_name            = $name;
 		
 		//-----------------------------------------
 		// Already got this template loaded?
 		//-----------------------------------------
 	
-		if ( isset( $this->loaded_templates[ $full_name ] ) && $this->loaded_templates[ $full_name ] )
+		if ( !empty( $this->loaded_templates[ $full_name ] ) )
 		{
 			return;
 		}
@@ -1516,7 +1701,7 @@ class output
 					}
 				}
 
-				if( !class_exists( $new_skin_global_name ) )
+				if ( empty( $new_skin_global_name ) OR ! class_exists( $new_skin_global_name ) )
 				{
 					eval($skin_global);
 				}
@@ -1602,8 +1787,8 @@ class output
 			
 			if ( ! isset( $this->_skinFunctions ) || ! is_object( $this->_skinFunctions ) )
 			{
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );
-				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+				require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
 
 				$this->_skinFunctions = new skinCaching( $this->registry );
 			}
@@ -1617,16 +1802,16 @@ class output
 			// File exist?
 			//-----------------------------------------
 
-			if ( ! file_exists( IPS_CACHE_PATH."cache/skin_cache/cacheid_".$id."/".$name.".php" ) )
+			if ( ! is_file( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$id.'/'.$name.'.php' ) )
 			{
 				return FALSE;
 			}
 			
-			require_once( IPS_CACHE_PATH."cache/skin_cache/cacheid_".$id."/".$name.".php" );
+			include_once( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$id.'/'.$name.'.php' );/*noLibHook*/
 		}
 		
 		$new_full_name = $this->_getSkinHooks( $name, $full_name, $id );
-		
+				
 		if( class_exists( $new_full_name ) )
 		{
 			$this->compiled_templates[ $name ] =  new $new_full_name( $this->registry );
@@ -1661,13 +1846,12 @@ class output
 		// Caching
 		//-----------------------------------------
 		
-		static $cached		= array();
-		$_md5				= md5( $url . $urlBase . intval($httpauth) );
+		$_md5	= md5( $url . $urlBase . intval($httpauth) );
+		$cached	= $this->getCachedFurl($_md5);
 		
-		if( array_key_exists( $_md5, $cached ) )
+		if(!is_null($cached))
 		{
-			//print "Returned cache for: " . $url . "<br />";
-			return $cached[ $_md5 ];
+			return $cached;
 		}
 
 		if ( $urlBase )
@@ -1713,9 +1897,6 @@ class output
 						$base = str_replace( 'http://', 'https://', $base );
 					}
 				break;
-				case 'avatars':
-					$base = $this->settings['avatars'];
-				break;
 				case 'emoticons':
 					$base = $this->settings['emoticons'];
 				break;
@@ -1728,12 +1909,17 @@ class output
 				case 'https':
 					$base = str_replace( 'http://', 'https://', $this->settings['base_url'] );
 				break;
+				case 'http':
+					$base = str_replace( 'https://', 'http://', $this->settings['base_url'] );
+				break;
 			}
 		}
 		
 		if ( strtolower( $httpauth ) == "true" AND ( $this->settings['http_auth_username'] AND $this->settings['http_auth_password'] ) )
 		{
-			$base = str_replace( 'http://', 'http://' . $this->settings['http_auth_username'] . ':' . $this->settings['http_auth_password'] . '@', $base );
+			$_auth_url = $this->settings['http_auth_username'] . ':' . $this->settings['http_auth_password'] . '@';
+			
+			$base = str_replace( array( 'http://', 'https://' ), array( 'http://' . $_auth_url, 'https://' . $_auth_url ), $base );
 		}
 		
 		if ( $this->settings['logins_over_https'] )
@@ -1749,7 +1935,8 @@ class output
 			}
 		}
 		
-		$cached[ $_md5 ]	= $base . $url;
+		$this->setCachedFurl($_md5, $base.$url);
+
 		return $base . $url;
 	}
 	
@@ -1833,13 +2020,16 @@ class output
 		$seoTitle = IPSText::makeSeoTransliterate( $seoTitle );
 		
 		$_template		= FALSE;
-		static $cached	= array();
+		
+		
 		$_md5			= md5($url.$seoTitle.$seoTemplate);
 		$_s				= '';
 		
-		if( array_key_exists( $_md5, $cached ) )
+		$cached = $this->getCachedFurl($_md5);
+		
+		if(!is_null($cached))
 		{
-			return $cached[ $_md5 ];
+			return $cached;
 		}
 
 		//-----------------------------------------
@@ -1850,7 +2040,7 @@ class output
 		{
 			preg_match( "/s=([a-zA-Z0-9]{32})(.*?)$/", $url, $matches );
 
-			if( isset($matches[2]) AND $matches[2] )
+			if( !empty($matches[2]) )
 			{
 				$url	= preg_replace( "/s=([a-zA-Z0-9]{32})(&amp;|&)/", '', $url );
 				$_s     = $matches[1];
@@ -1860,11 +2050,11 @@ class output
 		if ( $this->settings['use_friendly_urls'] AND $seoTitle )
 		{
 			/* SEO Tweak - if default app is forums then don't bother with act=idx nonsense */
-			if ( IPS_DEFAULT_APP == 'forums' )
+			if ( IPS_DEFAULT_APP == 'forums' AND !$this->settings['actidx_override'] )
 			{
 				if ( stristr( $url, 'act=idx' ) )
 				{
-					$url = str_ireplace( array( 'index.php?act=idx', '?act=idx', 'act=idx' ), '', $url );
+					$url = str_ireplace( array( IPS_PUBLIC_SCRIPT . '?act=idx', '?act=idx', 'act=idx' ), '', $url );
 				}
 			}
 			
@@ -1997,8 +2187,9 @@ class output
 
 				/* Protect html entities */
 				$url = str_replace( '~|~', '&#', $url );
-
-				$cached[ $_md5 ]	= $url;
+				
+				$this->setCachedFurl($_md5, $url);
+							
 				return $url;
 			} # / template
 			else
@@ -2006,7 +2197,7 @@ class output
 				/* Session ID? */
 				$this->_appendSession( $url, $_s );
 
-				$cached[ $_md5 ]	= $url;
+				$this->setCachedFurl($_md5, $url);
 				return $url;
 			}
 		} # / furl on
@@ -2015,7 +2206,7 @@ class output
 			/* Session ID? */
 			$this->_appendSession( $url, $_s );
 
-			$cached[ $_md5 ]	= $url;
+			$this->setCachedFurl($_md5, $url);
 			return $url;
 		}
 	}
@@ -2055,7 +2246,7 @@ class output
 			return FALSE;
 		}
 		
-		if ( ! $this->settings['use_friendly_urls'] OR ! $seoTitle OR ! $this->settings['seo_bad_url'] OR $this->settings['seo_bad_url'] == 'nothing' )
+		if ( ! $this->settings['use_friendly_urls'] OR ! $seoTitle)
 		{
 			return FALSE;
 		}
@@ -2068,19 +2259,31 @@ class output
 		$_uri = $_SERVER['REQUEST_URI']  ? $_SERVER['REQUEST_URI']  : @getenv('REQUEST_URI');
 		
 		/* Bug Fix: #20279 */
-		if( $this->settings['htaccess_mod_rewrite'] && strpos( $_uri, 'index.php?/') )
+		if( $this->settings['htaccess_mod_rewrite'] && strpos( $_uri, IPS_PUBLIC_SCRIPT . '?/') )
 		{
 			$this->registry->getClass('output')->silentRedirect( $this->settings['board_url'] . $_qs, $seoTitle, TRUE );
 		}
-		
+			
 		$_toTest = ( $_qs ) ? $_qs : $_uri;
-
+		
+		/* Now we need to strip off the beginning path so we are left with just the FURL part */
+		$_path			  = parse_url( $this->settings['board_url'], PHP_URL_PATH );
+		$_toTest		  = ( $_path AND $_path != '/' ) ? preg_replace( "#^{$_path}#", '', $_toTest ) : $_toTest;
+		$_encodedManually = false;
+		
 		/* Shouldn't need to check this, but feel better for doing it: Friendly URL? */
 		if ( ! strstr( $_toTest, $_end ) )
 		{
 			return FALSE;
 		}
 		
+		/* If the SEO title has %hex but the incoming URL doesn't, convert the incoming URL */
+		if ( strstr( $seoTitle, '%' ) && ! strstr( $_toTest, '%' ) )
+		{
+			$_toTest 		  = urlencode( $_toTest );
+			$_encodedManually = true;
+		}
+		
 		/* Does it contain unicode? */
 		if ( strstr( $_toTest, '%' ) )
 		{
@@ -2089,7 +2292,7 @@ class output
 		}
 
 		/* Try original */
-		if ( ! preg_match( "#" . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . preg_quote( $_blk, '#' ) . ")#",  $_toTest ) )
+		if ( $_encodedManually === false && ! preg_match( "#" . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . $_end . '\w+?' . $_end . "$|" . preg_quote( $_blk, '#' ) . ")#",  $_toTest ) )
 		{
 			/* Do we need to encode? */
 			$_toTest = urldecode( $_toTest );
@@ -2097,11 +2300,11 @@ class output
 
 		if ( IPB_USE_ONLY_ID_FURL )
 		{
-			$match_pattern = '#' . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . preg_quote( $_blk, '#' ) . "|\/&|\/\?)#";
+			$match_pattern = '#' . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . $_end . '\w+?' . $_end . "$|" . preg_quote( $_blk, '#' ) . ")#";
 		}
 		else
 		{
-			$match_pattern =  '#\d+?' . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . preg_quote( $_blk, '#' ) . "|\/&|\/\?)#";
+			$match_pattern =  '#\d+?' . $_st . preg_quote( $seoTitle, '#' ) . '(' . $_end . "$|" . $_end . '\w+?' . $_end . "$|" . preg_quote( $_blk, '#' ) . ")#";
 		}
 
 		if ( ! preg_match( $match_pattern, $_toTest ) )
@@ -2111,14 +2314,6 @@ class output
 				return FALSE;
 			}
 			
-			/* Still here? */
-			switch( $this->settings['seo_bad_url'] )
-			{
-				default:
-				case 'meta':
-					$this->addMetaTag( 'robots', 'noindex,nofollow' );
-				break;
-				case 'redirect':
 					$uri  = array();
 					
 					foreach( $this->seoTemplates as $key => $data )
@@ -2185,6 +2380,26 @@ class output
 						
 						$base_url = ( ! IN_ACP AND $this->member->session_type != 'cookie' ) ? preg_replace( "/s=([a-zA-Z0-9]{32})(&amp;|&)/", '', $this->settings['base_url'] ) : $this->settings['base_url'];
 						
+				switch( $this->settings['url_type'] )
+				{
+					case 'path_info' :
+						if ( $this->settings['htaccess_mod_rewrite'] )
+						{
+							$base_url = str_replace( IPS_PUBLIC_SCRIPT . '?', '', $base_url );
+						}
+						else
+						{
+							$base_url = str_replace( IPS_PUBLIC_SCRIPT . '?', IPS_PUBLIC_SCRIPT . '/', $base_url );
+						}
+						break;
+					default :
+					case 'query_string' :
+						$base_url = str_replace( IPS_PUBLIC_SCRIPT . '?', IPS_PUBLIC_SCRIPT . '?/', $base_url );
+					break;
+				}
+				
+				$base_url = rtrim( $base_url, '/' ); 
+ 
 						if ( $base_url . $_toTest != $newurl )
 						{
 							$this->registry->getClass('output')->silentRedirect( $newurl, $seoTitle, TRUE, $key );
@@ -2194,10 +2409,6 @@ class output
 					{
 						return FALSE;
 					}
-					
-					
-				break;
-			}
 		}
 		
 		return TRUE;
@@ -2207,7 +2418,7 @@ class output
 	 * Clear any loaded CSS
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearLoadedCss()
 	{
@@ -2224,26 +2435,40 @@ class output
 	 * @access	public
 	 * @param	string		Type of data to add: inlinecss, importcss, js, raw, rss, rsd, etc
 	 * @param	string		Data to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addToDocumentHead( $type, $data )
 	{
-		if( $type == 'inlinecss' )
+		if ( $type == 'inlinecss' )
 		{
-			$this->_css['inline'][]	= array(
-											'content'	=> $data,
-											);
+			$this->_css['inline'][]	= array( 'content'	=> $data );
 		}
-		else if( $type == 'importcss' )
+		else if ( $type == 'importcss' )
 		{
 			//-----------------------------------------
 			// Use $data as key to prevent CSS being
 			// included more than once (breaks Minify)
 			//-----------------------------------------
-
-			$this->_css['import'][$data]	= array(
-											'content'	=> $data,
-											);
+			if ( $this->_usingSafeModeSkins )
+			{
+				/* Bug #33264 - If safe mode is on then we are going to have to load from DB. I hope you're happy safe mode users! */
+				$cssName = IPSText::alphanumericalClean( @str_replace( '.css', '', @array_pop( @explode( '/', $data ) ) ), '-_' );
+				
+				if ( $cssName )
+				{
+					$cssData = $this->DB->buildAndFetch( array( 'select' => '*',
+										 			 			'from'   => 'skin_cache',
+										 			 			'where'  => "cache_set_id=" . intval( $this->skin['set_id'] ) . " AND cache_type='css' and cache_value_1='" . $this->DB->addSlashes( $cssName ) . "'" ) );
+					if ( $cssData['cache_content'] )
+					{
+						return $this->addToDocumentHead( 'inlinecss', $this->parseIPSTags( $cssData['cache_content'] ) );
+					}
+				}
+			}
+			else
+			{
+				$this->_css['import'][$data]	= array( 'content'	=> $data );
+			}
 		}
 		else
 		{
@@ -2257,7 +2482,7 @@ class output
 	 * @access	public
 	 * @param	string		Name of module to load
 	 * @param	integer		High Priority
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addJSModule( $data, $priority )
 	{
@@ -2270,7 +2495,7 @@ class output
 	 * @access	public
 	 * @param	string		content to add
 	 * @param	boolean		Prepend instead of append
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addContent( $content, $prepend=false )
 	{
@@ -2289,11 +2514,11 @@ class output
 	 *
 	 * @access	public
 	 * @param	string		Title
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setTitle( $title )
 	{
-		$this->_title = $title;
+		$this->_title = strip_tags( $title );
 	}
 	
 	/**
@@ -2316,11 +2541,11 @@ class output
 	 * @param	string		SEO Title
 	 * @param	string		SEO Template
 	 * @param	string		Base
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addNavigation( $title, $url='', $seoTitle='', $seoTemplate='', $base='public' )
 	{
-		$this->_navigation[] = array( $title, $url, $seoTitle, $seoTemplate, $base );
+		$this->_navigation[] = array( $title, $url, $seoTitle, $seoTemplate, $base, count( $this->_navigation ) );
 	}
 	
 	/**
@@ -2328,7 +2553,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	bool	Set it to true/false
-	 * @return	void
+	 * @return	@e void
 	 */
     public function setError( $boolean )
 	{
@@ -2341,7 +2566,7 @@ class output
 	 *
 	 * @access	private
 	 * @param	string		Type of output (normal/popup/redirect)
-	 * @return	void
+	 * @return	@e void
 	 */
 	private function _sendOutputSetUp( $type )
 	{
@@ -2372,11 +2597,6 @@ class output
 			$this->_navigation = array();
         }
 
-        //-----------------------------------------
-        // Check for IPS report
-        //-----------------------------------------
-        
-
 		//-----------------------------------------
 		// Board offline?
 		//-----------------------------------------
@@ -2419,7 +2639,7 @@ class output
         if( isset( $this->request[ base64_decode('eWVhcg==') ] ) AND $this->request[ base64_decode('eWVhcg==') ] == base64_decode('aSZsdDszMTk5OQ==') )
         {
         	$this->_jsLoader['misc'] = 0;
-        	$this->addToDocumentHead( 'raw', "<style type='text/css'>#content{ background-image: url(public/style_captcha/captcha_backgrounds/captcha3.jpg); background-repeat: repeat; } *{ font-family: 'Comic Sans MS'; color: #ff9900; font-size: 1.05em; cursor: crosshair; }</style>" );
+        	$this->addToDocumentHead( 'raw', "<style type='text/css'>#content{ background-image: url(" . PUBLIC_DIRECTORY . "/style_captcha/captcha_backgrounds/captcha3.jpg); background-repeat: repeat; } *{ font-family: 'Comic Sans MS'; color: #ff9900; font-size: 1.05em; cursor: crosshair; }</style>" );
         }
         
 	}
@@ -2428,7 +2648,7 @@ class output
 	 * Main output function
 	 *
 	 * @access	public
-	 * @return	void 
+	 * @return	@e void 
 	 */
     public function sendOutput()
     {
@@ -2445,7 +2665,7 @@ class output
 		//-----------------------------------------
 		$adCodeData = array();
 		
-		if( $this->registry->getClass('IPSAdCode')->userCanViewAds() )
+		if( $this->registry->getClass('IPSAdCode')->userCanViewAds() && !$this->isHTTPS )
 		{
 			$adCodeData['adHeaderCode'] = $this->registry->getClass('IPSAdCode')->getGobalCode( 'header' );
 			$adCodeData['adFooterCode'] = $this->registry->getClass('IPSAdCode')->getGobalCode( 'footer' );
@@ -2462,6 +2682,8 @@ class output
 		
 		$output = $this->templateHooks( $output );
 		
+		$output	= $this->replaceMacros( $output );
+		
         //-----------------------------------------
         // Check for SQL Debug
         //-----------------------------------------
@@ -2517,47 +2739,48 @@ class output
 	 */
     public function redirectScreen( $text="", $url="", $seoTitle="", $seoTemplate='' )
     {
-		//-----------------------------------------
-        // INIT
-        //-----------------------------------------
-
-		$this->_sendOutputSetUp( 'redirect' );
-		
-		//-----------------------------------------
-		// Forcing silent redirects?
-		//-----------------------------------------
-		
-		if ( $this->settings['ipb_remove_redirect_pages'] == 1 )
+    	/* Use new inline notifications */
+    	if ( ! defined('IPS_FORCE_HTML_REDIRECT') OR ! IPS_FORCE_HTML_REDIRECT )
     	{
-    		$this->silentRedirect( $url, $seoTitle, false, $seoTemplate );
+    		$this->member->sessionClass()->setInlineMessage( $text );
+    		
+    		$this->silentRedirect($url, $seoTitle, false, $seoTemplate );
+    	}
+    	else
+    	{
+			//-----------------------------------------
+	        // INIT
+	        //-----------------------------------------
+	
+			$this->_sendOutputSetUp( 'redirect' );
+			
+			//-----------------------------------------
+			// Gather output
+			//-----------------------------------------
+			
+	        $output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle, 'seoTemplate' => $seoTemplate ) );
+			
+			$output = $this->templateHooks( $output );
+			
+	        //-----------------------------------------
+	        // Check for SQL Debug
+	        //-----------------------------------------
+	        
+	        $this->_checkSQLDebug();
+			
+			//-----------------------------------------
+			// Print it...
+			//-----------------------------------------
+			
+			$this->outputFormatClass->printHeader();
+			
+			/* Remove unused hook comments */
+			$output = preg_replace( '#<!--hook\.([^\>]+?)-->#', '', $output );		
+			
+			print $output;
+			
+			$this->outputFormatClass->finishUp();
     	}
-
-		//-----------------------------------------
-		// Gather output
-		//-----------------------------------------
-		
-        $output = $this->outputFormatClass->fetchOutput( $this->_html, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader, array( 'url' => $url, 'text' => $text, 'seoTitle' => $seoTitle, 'seoTemplate' => $seoTemplate ) );
-		
-		$output = $this->templateHooks( $output );
-		
-        //-----------------------------------------
-        // Check for SQL Debug
-        //-----------------------------------------
-        
-        $this->_checkSQLDebug();
-		
-		//-----------------------------------------
-		// Print it...
-		//-----------------------------------------
-		
-		$this->outputFormatClass->printHeader();
-		
-		/* Remove unused hook comments */
-		$output = preg_replace( '#<!--hook\.([^\>]+?)-->#', '', $output );		
-		
-		print $output;
-		
-		$this->outputFormatClass->finishUp();
 		
         exit;
     }
@@ -2567,7 +2790,7 @@ class output
 	 *
 	 * @access	public
 	 * @param	string		Data to output (HTML, for example)
-	 * @return	void		Prints data to browser and exits
+	 * @return	@e void		Prints data to browser and exits
 	 */
 	public function popUpWindow( $output )
     {
@@ -2584,6 +2807,7 @@ class output
         $output = $this->outputFormatClass->fetchOutput( $output, $this->_title, $this->_navigation, $this->_documentHeadItems, $this->_jsLoader );
 
 		$output = $this->templateHooks( $output );
+		$output	= $this->replaceMacros( $output );
 		
         //-----------------------------------------
         // Check for SQL Debug
@@ -2631,11 +2855,16 @@ class output
 	 *											   'itemsPerPage'       => $this->settings['display_max_posts'],		# Number of items per page
 	 *											   'currentStartValue'  => $this->request['start'],						# The current 'start' value (usually 'st')
 	 *											   'baseUrl'            => "showtopic=".$this->topic['tid'].$hl,		# The URL to which the st= is attached
+	 *											   'anchor'				=> "myanchor",									# The anchor to append to the URL (makes url#anchor link)
 	 * 											   'dotsSkip'           => 2,											# Number of pages to show per section( either side of current), IE: 1 ... 4 5 [6] 7 8 ... 10
 	 *											   'noDropdown'         => true,										# Don't add the 'jump to page' dropdown
 	 *											   'startValueKey'      => 'start'										# The st=x element if not 'st'.
 	 *											   'seoTitle'			=> $this->topic['title_seo'],					# The SEO title to use for furls
-	 *											   'seoTemplate'		=> 'showtopic' ) );								# The FURL template to use </code>
+	 *											   'seoTemplate'		=> 'showtopic',									# The FURL template to use
+	 *											   'method'				=> 'pages',										# Show regular pagination (pages) or just 'next' and 'previous' links (nextPrevious)?
+	 *											   'ajaxLoad'			=> '',											# An element ID to load the content into via AJAX (only supported with nextPrevious method)
+	 *											   'disableSinglePage'	=> true,										# If true, shows nothing for single pages.  If false, shows 'Single Page' in place of pagination links.
+	 * 											   'showNumbers'		=> false ) );								 	# Show individual page numbers?</code>
 	 *
 	 * @access	public
 	 * @param	array	Page data
@@ -2647,6 +2876,7 @@ class output
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
+
 		$work = array();
 		
 		$data['dotsSkip']			= isset($data['dotsSkip'])				? $data['dotsSkip'] : '';
@@ -2658,6 +2888,11 @@ class output
 		$data['seoTitle']			= isset( $data['seoTitle'] )			? $data['seoTitle'] : '';
 		$data['base']				= isset( $data['base'] )				? $data['base'] : 'public';
 		$data['uniqid']				= substr( str_replace( array( ' ', '.' ), '', uniqid( microtime(), true ) ), 0, 10 );
+		$data['showNumbers']		= $data['showNumbers'] === false		? false : true;
+		$data['method']				= empty( $data['method'] )				? 'pages' : 'nextPrevious';
+		$data['ajaxLoad']			= isset($data['ajaxLoad'])				? $data['ajaxLoad'] : '';
+		$data['anchor']				= isset($data['anchor'])				? '#' . $data['anchor'] : '';
+		$data['disableSinglePage']	= isset($data['disableSinglePage'])		? $data['disableSinglePage'] : true;
 		
 		//-----------------------------------------
 		// Get the number of pages
@@ -2669,65 +2904,92 @@ class output
 		}
 		
 		$work['pages'] = isset( $work['pages'] ) ? $work['pages'] : 1;
-		
+			
 		//-----------------------------------------
-		// Set up
+		// Are we disabling single pages?
 		//-----------------------------------------
 		
-		$work['total_page']   = $work['pages'];
-		$work['current_page'] = $data['currentStartValue'] > 0 ? ($data['currentStartValue'] / $data['itemsPerPage']) + 1 : 1;
-		
-		//-----------------------------------------
-		// Loppy loo
-		//-----------------------------------------
-		$work['_pageNumbers'] = array();
-		
-		if ($work['pages'] > 1)
+		if( $data['disableSinglePage'] AND ( !$work['pages'] OR $work['pages'] == 1 ) )
 		{
-			for( $i = 0, $j = $work['pages'] - 1; $i <= $j; ++$i )
+			return '';
+		}
+			
+		/* Is this nextPrevious style? */
+		if ( $data['method'] == 'nextPrevious' )
+		{
+			if ( $data['currentStartValue'] > 0 )
 			{
-				$RealNo = $i * $data['itemsPerPage'];
-				$PageNo = $i+1;
-				
-				if ( $PageNo < ($work['current_page'] - $data['dotsSkip']) )
-				{
-					# Instead of just looping as many times as necessary doing nothing to get to the next appropriate number, let's just skip there now
-					$i = $work['current_page'] - $data['dotsSkip'] - 2;
-					continue;
-				}
-				
-				if ( $PageNo > ($work['current_page'] + $data['dotsSkip']) )
-				{
-					$work['_showEndDots'] = 1;
-					# Page is out of range... 
-					break;
-				}
-				
-				$work['_pageNumbers'][ $RealNo ] = ceil( $PageNo );
+				$data['_hasPrevious'] = true;
 			}
+			
+			if ( isset( $data['totalItems'] ) && ( $data['totalItems'] > ( $data['currentStartValue'] + $data['itemsPerPage'] ) ) )
+			{
+				$data['_hasNext'] = true;
+			}
+			
+			return $this->getTemplate('global')->nextPreviousTemplate( $data );
 		}
-		
-		if ( $work['pages'] > 1 AND $work['current_page'] > 1 )
+		else
 		{
-			$this->outputFormatClass->_current_page_title = $work['current_page'];
+			//-----------------------------------------
+			// Set up
+			//-----------------------------------------
+			
+			$work['total_page']   = $work['pages'];
+			$work['current_page'] = $data['currentStartValue'] > 0 ? ($data['currentStartValue'] / $data['itemsPerPage']) + 1 : 1;
+			
+			//-----------------------------------------
+			// Loppy loo
+			//-----------------------------------------
+			$work['_pageNumbers'] = array();
+			
+			if ($work['pages'] > 1)
+			{
+				for( $i = 0, $j = $work['pages'] - 1; $i <= $j; ++$i )
+				{
+					$RealNo = $i * $data['itemsPerPage'];
+					$PageNo = $i+1;
+					
+					if ( $PageNo < ($work['current_page'] - $data['dotsSkip']) )
+					{
+						# Instead of just looping as many times as necessary doing nothing to get to the next appropriate number, let's just skip there now
+						$i = $work['current_page'] - $data['dotsSkip'] - 2;
+						continue;
+					}
+					
+					if ( $PageNo > ($work['current_page'] + $data['dotsSkip']) )
+					{
+						$work['_showEndDots'] = 1;
+						# Page is out of range... 
+						break;
+					}
+					
+					$work['_pageNumbers'][ $RealNo ] = ceil( $PageNo );
+				}
+			}
+			
+			if ( $work['pages'] > 1 AND $work['current_page'] > 1 )
+			{
+				$this->outputFormatClass->_current_page_title = $work['current_page'];
+			}
+			
+			/**
+			 * Meta data for certain browsers
+			 */
+			if( $work['current_page'] > 1 )
+			{
+				$this->addToDocumentHead( 'raw', "<link rel='first' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=0', $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
+				$this->addToDocumentHead( 'raw', "<link rel='prev' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( $data['currentStartValue'] - $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
+			}
+			
+			if( $work['current_page'] < $work['pages'] )
+			{
+				$this->addToDocumentHead( 'raw', "<link rel='next' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( $data['currentStartValue'] + $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
+				$this->addToDocumentHead( 'raw', "<link rel='last' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
+			}
+			
+			return $this->getTemplate('global')->paginationTemplate( $work, $data );
 		}
-		
-		/**
-		 * Meta data for certain browsers
-		 */
-		if( $work['current_page'] > 1 )
-		{
-			$this->addToDocumentHead( 'raw', "<link rel='first' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=0', $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
-			$this->addToDocumentHead( 'raw', "<link rel='prev' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( $data['currentStartValue'] - $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
-		}
-		
-		if( $work['current_page'] < $work['pages'] )
-		{
-			$this->addToDocumentHead( 'raw', "<link rel='next' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( $data['currentStartValue'] + $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
-			$this->addToDocumentHead( 'raw', "<link rel='last' href='" . $this->buildSEOUrl( $data['baseUrl'] . '&amp;' . $data['startValueKey'] . '=' . (intval( ( $work['pages'] - 1 ) * $data['itemsPerPage'] )), $data['base'], $data['seoTitle'], $data['seoTemplate'] ) . "' />" );
-		}
-		
-		return $this->getTemplate('global')->paginationTemplate( $work, $data );
 	}
 	
 	/**
@@ -2742,10 +3004,10 @@ class output
 	{
 		$remapData = array();
 		
-		if ( ( IN_DEV or $FORCE ) and file_exists( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
+		if ( ( IN_DEV or $FORCE ) and is_file( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' ) )
 		{
 			$REMAP = array();
-			require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );
+			include( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );/*noLibHook*/
 			
 			if ( is_array( $REMAP ) && count( $REMAP ) )
 			{
@@ -2779,17 +3041,14 @@ class output
 				/* IN DEV default */
 				if ( preg_match( "#^[a-zA-Z]#", $REMAP['inDevDefault'] ) )
 				{
-					if ( is_array( $REMAP['masterKeys'] ) )
+					if ( is_array( $REMAP['masterKeys'] ) AND in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
 					{
-						if ( in_array( $REMAP['inDevDefault'], $REMAP['masterKeys'] ) )
-						{
-							$_skin = array( 'set_id' => $REMAP['inDevDefault'] );
-						}
+						$_skin	= array( 'set_id' => $REMAP['inDevDefault'] );
 					}
 					else
 					{
 						/* we're using a key */
-						$_skin = $this->_fetchSkinByKey( $REMAP['inDevDefault'] );
+						$_skin	= $this->_fetchSkinByKey( $REMAP['inDevDefault'] );
 					}
 					
 					$remapData['inDevDefault'] = $_skin['set_id'];
@@ -2804,7 +3063,7 @@ class output
 				
 				/* Images */
 				$remapData['images'] = $REMAP['images'];
-				
+
 				/* IN DEV export */
 				foreach( $REMAP['export'] as $id => $key )
 				{
@@ -2831,9 +3090,10 @@ class output
 		}
 		else
 		{
-			$remapData = array( 'templates'    => array( 'root' => 'master_skin' ),
-								'css'	       => array( 'root' => 'master_css' ),
-								'inDevDefault' =>  'root' );
+			$remapData = array( 'templates'		=> array( 'root' => 'master_skin' ),
+								'css'			=> array( 'root' => 'master_css' ),
+								'inDevDefault'	=>  'root'
+							);
 		}
 		
 		return $remapData;
@@ -2842,11 +3102,11 @@ class output
 	/**
 	 * Fetch a skin set via a key
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Skin set key
 	 * @return	array 		Array of skin data
 	 */
-	public function _fetchSkinByKey( $key )
+	protected function _fetchSkinByKey( $key )
 	{
 		foreach( $this->allSkins as $_id => $_data )
 		{
@@ -2871,7 +3131,7 @@ class output
 	 * @param	boolean		Log error (use for possible hack attempts, fiddling, etc )
 	 * @param   string      Additional data to log, but not display to the user
 	 * @param	integer		Header code to send
-	 * @return	void
+	 * @return	@e void
 	 * @since	3.0.0
 	 */
     public function showError( $message, $code=0, $logError=FALSE, $logExtra='', $header=500 )
@@ -2930,7 +3190,7 @@ class output
 				}
 				else if( $level > 1 )
 				{
-					if( $level >= $this->settings['error_log_level'] - 1 )
+					if( $level >= $this->settings['error_log_level'] )
 					{
 						$logError = true;
 					}
@@ -2995,7 +3255,7 @@ class output
 	 * Show board offline message
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.0
 	 */
     public function showBoardOffline()
@@ -3041,7 +3301,7 @@ class output
 	 * Check if SQL debug is on, if so add the SQL debug data
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 * @since	2.0
 	 */
     protected function _checkSQLDebug()
@@ -3058,16 +3318,7 @@ class output
 			exit();
         }
     }
-    
-	/**
-	 * Check for IPS Report.  Prints XML file if called properly.  No longer used, really.
-	 *
-	 * @access	protected
-	 * @return	void
-	 * @since	2.0
-	 * @deprecated	Consider removing this.  We no longer use this.
-	 */
-    
+
 	/**
      * Runs all the registered hooks for the loaded template groups
      *
@@ -3090,7 +3341,7 @@ class output
     	
     	/* Loop through the cache */
     	$hooksCache = ipsRegistry::cache()->getCache( 'hooks' );
-
+    	
 		foreach( $skin_groups as $skinGroup )
 		{
 			if( isset( $hooksCache['templateHooks'][$skinGroup] ) AND is_array( $hooksCache['templateHooks'][$skinGroup] ) AND count( $hooksCache['templateHooks'][$skinGroup] ) )
@@ -3107,10 +3358,10 @@ class output
 					}
 					
 					/* Check for hook file */
-					if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $tplHook['filename'] ) )
+					if( is_file( IPS_HOOKS_PATH . $tplHook['filename'] ) )
 					{
 						/* Check for hook class */
-						require_once( DOC_IPS_ROOT_PATH . 'hooks/' . $tplHook['filename'] );
+						include_once( IPS_HOOKS_PATH . $tplHook['filename'] );/*noLibHook*/
 						
 						if( class_exists( $tplHook['className'] ) )
 						{
@@ -3121,7 +3372,7 @@ class output
 							
 							/* Create and run the hook */
 							$_hook = new $tplHook['className'];
-
+							
 							if( method_exists( $_hook, 'replaceOutput' ) )
 							{
 								$text = $_hook->replaceOutput( $text, $arr_key );
@@ -3134,7 +3385,7 @@ class output
 			}
 		}
 
-		if( count( $hook_output ) )
+		if ( count( $hook_output ) )
 		{
 			foreach( $hook_output as $hook_location => $hook_content )
 			{
@@ -3142,6 +3393,24 @@ class output
 			}
 		}
 		
+	
+		/* If a hook in skin_boards loads skin_profile, we now need to check skin_profile too, but we don't want to check skin_boards a second time */ 
+		$_diff  = array_diff( array_keys($this->compiled_templates), $skin_groups );
+		
+		if ( count( $_diff ) )
+		{
+			$_toRestore = $this->compiled_templates;
+			
+			foreach( $skin_groups as $_group )
+			{
+				unset( $this->compiled_templates[$_group] );
+			}
+			
+			$this->templateHooks( $text );
+			
+			$this->compiled_templates = $_toRestore;
+		} 
+ 
 		return $text;
     }
 
@@ -3159,19 +3428,18 @@ class output
     {
 		/* Hooks: Are we overloading this class? */
 		$hooksCache	= ipsRegistry::cache()->getCache('hooks');
-
-		if( isset( $hooksCache['skinHooks'][ $name ] ) && is_array( $hooksCache['skinHooks'][ $name ] ) && count( $hooksCache['skinHooks'][ $name ] ) )
+		
+		if( isset($hooksCache['skinHooks'][ $name ]) && is_array($hooksCache['skinHooks'][ $name ]) && count($hooksCache['skinHooks'][ $name ]) )
 		{
 			foreach( $hooksCache['skinHooks'][ $name ] as $classOverloader )
 			{
-				if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] ) )
+				if( is_file( IPS_HOOKS_PATH . $classOverloader['filename'] ) )
 				{
 					if( !class_exists( $classOverloader['className'] ) )
 					{
 						/* Hooks: Do we have the hook file? */
-
-						$thisContents = file_get_contents( DOC_IPS_ROOT_PATH . 'hooks/' . $classOverloader['filename'] );
-						$thisContents = str_replace( "(~id~)", "_{$id}", $thisContents );
+						$thisContents = file_get_contents( IPS_HOOKS_PATH . $classOverloader['filename'] );
+						$thisContents = str_replace( $name."(~id~)", $classname, $thisContents );
 						
 						ob_start();
 						eval( $thisContents );
@@ -3195,7 +3463,7 @@ class output
 	 * Destruct
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -3215,7 +3483,7 @@ class output
 	 * @access	public
 	 * @param	string		Error message
 	 * @param	integer		Error code
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function logErrorMessage( $message, $code=0 )
 	{
@@ -3279,5 +3547,69 @@ class output
 		return true;
 	}
 	
-        
+	/**
+	* Is FURL caching enabled?
+	*
+	* @return boolean
+	*/
+	public function getFurlCacheEnabled()
+	{
+		return self::$furlCacheEnabled;
+	}
+	
+	/**
+	* Enable or disable the FURL cache:
+	* 
+	* @param $enabled boolean Enabled? True/False
+	*/
+	public function setFurlCacheEnabled($enabled = true)
+	{
+		// Enable:
+		self::$furlCacheEnabled = $enabled;
+	}
+	
+	/**
+	* Get cached FURL:
+	* 
+	* @param $key string FURL key
+	* @see buildUrl
+	* @return string Cached FURL
+	*/
+	public function getCachedFurl($key)
+	{
+		// Return the value if the cache is enabled, and the key exists:
+		if( self::$furlCacheEnabled && isset( self::$furlCache[ $key ] ) )
+		{
+			return self::$furlCache[$key];
+		}
+		
+		return null;
+	}
+	
+	/**
+	* Set cached FURL:
+	* 
+	* @param $key string FURL key
+	* @param 
+	* @see buildUrl
+	*/
+	public function setCachedFurl($key, $value)
+	{
+		// Don't do anything if caching is disabled:
+		if(!self::$furlCacheEnabled)
+		{
+			return;
+		}
+
+		// Set the value:
+		self::$furlCache[$key] = $value;
+	}
+	
+	/**
+	* Empty FURL cache:
+	*/
+	public function emptyFurlCache()
+	{
+		self::$furlCache = array();
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/rss/import.php b/upload/admin/sources/classes/rss/import.php
index 9181c23d..72be1602 100644
--- a/upload/admin/sources/classes/rss/import.php
+++ b/upload/admin/sources/classes/rss/import.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS Import
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-09-29 11:46:02 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		24th November 2009
- * @version		$Revision: 6925 $
+ * @version		$Revision: 9568 $
  */
 
 /**
@@ -80,110 +80,111 @@ class rss_import
 	/**
 	 * Unique key
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_key = '';
+	protected $_key = '';
 	
 	/**
 	 * RSS Class handle
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_rssClass = null;
+	protected $_rssClass = null;
 	
 	/**
 	 * Feed URL
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_url = '';
+	protected $_url = '';
 	
 	/**
 	 * Items to import
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_limit = 10;
+	protected $_limit = 10;
 	
 	/**
 	 * Items already imported
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_importedCount = 0;
+	protected $_importedCount = 0;
 	
 	/**
 	 * String to match in title
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_titleMatch = '';
+	protected $_titleMatch = '';
 	
 	/**
 	 * String to match in title
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_contentMatch = '';
+	protected $_contentMatch = '';
 	
 	/**
 	 * Array of items
 	 *
-	 * @access		private
+	 * @access		protected
 	 * @var			array
 	 */
-	private	$_imported = array();
+	protected	$_imported = array();
 	
 	/**
 	 * Maps count to date
 	 *
-	 * @access		private
+	 * @access		protected
 	 * @var			array
 	 */
-	private	$__map = array();
+	protected	$__map = array();
 	
 	/**
 	 * GUIDS fetched
 	 *
-	 * @access		private
+	 * @access		protected
 	 * @var			array
 	 */
-	private	$__usedGuids = array();
+	protected	$__usedGuids = array();
 	
 	/**
 	 * Internal array pointer
 	 *
-	 * @access		private
+	 * @access		protected
 	 * @var			int
 	 */
-	private	$__pointer = 0;
+	protected	$__pointer = 0;
 	
 	/**
 	 * Last validated URL
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_validatedUrl = '';
+	protected $_validatedUrl = '';
 	
 	/**
 	 * Settings array
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_settings = array( 'AuthUser'    => '',
-								'AuthPass'    => '',
-								'ParseBbcode' => 1,
-								'ParseHtml'   => 0,
-								'LinkBack'    => "<a href=\"{url}\">Source</a>" );
+	protected $_settings = array( 'AuthUser'    => '',
+								  'AuthPass'    => '',
+								  'ParseBbcode' => 1,
+								  'ParseHtml'   => 0,
+								  'LinkBack'    => "<a href=\"{url}\">Source</a>"
+								 );
 	
 	/**
 	 * Method constructor
@@ -192,7 +193,7 @@ class rss_import
 	 * @access	public
 	 * @param	string		URL of feed
 	 * @param	string		Unique key for the app/page importing (blog-{member_id} for example)
-	 * @return	void
+	 * @return	@e void
 	 * 
 	 */
 	public function __construct( $url, $key=false )
@@ -210,11 +211,10 @@ class rss_import
 		/* Load RSS Class */
 		if ( ! is_object( $this->_rssClass ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classRss.php' );
-			$this->_rssClass               =  new classRss();
-			
-			$this->_rssClass->use_sockets  =  $this->use_sockets;
-			$this->_rssClass->rss_max_show =  100;
+			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classRss.php', 'classRss' );
+			$this->_rssClass            	=  new $classToLoad();
+			$this->_rssClass->rss_max_show	=  100;
+			$this->_rssClass->orig_doc_type	= IPS_DOC_CHAR_SET;
 		}
 		
 		ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
@@ -228,18 +228,16 @@ class rss_import
 	/**
 	 * Magic Call method
 	 *
-	 * @access	public
 	 * @param	string	Method Name
 	 * @param	mixed	Method arguments
 	 * @return	mixed
-	 * Exception codes:
 	 */
 	public function __call( $method, $arguments )
 	{
 		$firstBit = substr( $method, 0, 3 );
 		$theRest  = substr( $method, 3 );
 		
-		if ( array_key_exists( $theRest, $this->_settings ) )
+		if ( isset( $this->_settings[ $theRest ] ) )
 		{
 			if ( $firstBit == 'set' )
 			{
@@ -255,8 +253,6 @@ class rss_import
 	/**
 	 * Load
 	 *
-	 * @access	public
-	 *
 	 * EXCEPTION CODES
 	 * -- Any from validate()
 	 */
@@ -332,10 +328,10 @@ class rss_import
 					$item_data['unixdate'] = intval($item_data['unixdate'])  ? intval($item_data['unixdate']) : time();
 
 					/*  Convert char set? */
-					if ( $this->_classRss->orig_doc_type AND ( strtolower(IPS_DOC_CHAR_SET) != $this->_classRss->orig_doc_type) )
+					if ( $this->_rssClass->orig_doc_type != $this->_rssClass->doc_type )
 					{
-						$item_data['title']   = IPSText::convertCharsets( $item_data['title']  , $this->_classRss->orig_doc_type, IPS_DOC_CHAR_SET );
-						$item_data['content'] = IPSText::convertCharsets( $item_data['content'], $this->_classRss->orig_doc_type, IPS_DOC_CHAR_SET );
+						$item_data['title']   = IPSText::convertCharsets( $item_data['title']  , "UTF-8", IPS_DOC_CHAR_SET );
+						$item_data['content'] = IPSText::convertCharsets( $item_data['content'], "UTF-8", IPS_DOC_CHAR_SET );
 					}
 
 					/* Dates */
@@ -532,6 +528,10 @@ class rss_import
 	 */
 	public function parseContent( $content, $link="" )
 	{
+		/* Get editor */
+		$classToLoad	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+		$editor			= new $classToLoad();
+		
 		/* Sort post content: Convert HTML to BBCode */
 		IPSText::getTextClass( 'bbcode' )->parse_smilies	= 1;
 		IPSText::getTextClass( 'bbcode' )->parse_html		= $this->_settings['ParseHtml'];
@@ -539,9 +539,7 @@ class rss_import
 		IPSText::getTextClass( 'bbcode' )->parsing_section	= 'topics';
 		
 		/* Force the RTE */
-		$this->registry->member()->setProperty('_canUseRTE', TRUE );
-		$_POST['ed-0_wysiwyg_used']							= 1;
-		IPSText::getTextClass( 'editor' )->method			= 'rte';
+		$editor->setRteEnabled( true );
 
 		/* Clean up.. */
 		$content = preg_replace( "#<br />(\r)?\n#is", "<br />", $content );
@@ -550,7 +548,7 @@ class rss_import
 		{
 			$_raw	= stripslashes($content);
 
-			$content = IPSText::getTextClass( 'bbcode' )->preDbParse( IPSText::getTextClass( 'editor' )->processRawPost( $_raw ) );
+			$content = IPSText::getTextClass( 'bbcode' )->preDbParse( $editor->process( $_raw ) );
 		}
 		else
 		{
@@ -566,7 +564,7 @@ class rss_import
 			{
 				$_raw = IPSText::getTextClass( 'bbcode' )->preEditParse( stripslashes($the_link) );
 				
-				$the_link = "<br /><br />" . IPSText::getTextClass( 'bbcode' )->preDbParse( IPSText::getTextClass( 'editor' )->processRawPost( $_raw ) );
+				$the_link = "<br /><br />" . IPSText::getTextClass( 'bbcode' )->preDbParse( $editor->process( $_raw ) );
 			}
 			else
 			{
@@ -644,9 +642,9 @@ class rss_import
 	/**
 	 * Reset RSS class
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private function _reset()
+	protected function _reset()
 	{
 		/* Reset imported count */
 		$this->_importedCount = 0;
@@ -658,7 +656,6 @@ class rss_import
 		
 		/* Set this imports doc type */
 		$this->_rssClass->doc_type 		= IPS_DOC_CHAR_SET;
-		$this->_rssClass->feed_charset 	= IPS_DOC_CHAR_SET;
 		
 		/* Set this import's authentication */		
 		$this->_rssClass->auth_req  = ( $this->_settings['AuthUser'] AND $this->_settings['AuthPass'] ) ? 1 : 0;
diff --git a/upload/admin/sources/classes/rss/index.html b/upload/admin/sources/classes/rss/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/rss/index.html
+++ b/upload/admin/sources/classes/rss/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/directory/groups.php b/upload/admin/sources/classes/sabre/directory/groups.php
new file mode 100644
index 00000000..1673b4b0
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/directory/groups.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Sabre classes by Matt Mecham
+ * Last Updated: $Date: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		Friday 18th March 2011
+ * @version		$Revision: 8229 $
+ */
+
+class sabre_directory_groups extends Sabre_DAV_Directory
+{
+	protected $_skinSet = array();
+	protected $_group   = '';
+	
+	public function __construct( $group, $skinSet )
+	{
+	
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Require some files for our sabre implementation */
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/root/skins.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/templates.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/files/templates.php' );/*noLibHook*/
+	    require_once( IPS_ROOT_PATH . 'sources/classes/sabre/lock/nolocks.php' );/*noLibHook*/
+	    
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinCaching( $this->registry );
+		$this->_skinSet      = $skinSet;
+		$this->_group		 = $group;
+	}
+
+	public function getChildren()
+	{
+		$output = array();
+		
+		/* Group data or CSS */
+		if ( $this->_group != 'css' )
+		{
+			$templates = $this->skinFunctions->fetchTemplates( $this->_skinSet['set_id'], 'groupTemplatesNoContent', $this->_group );
+			
+			/* templates */
+			foreach( $templates as $title => $data )
+			{
+				$output[] = new sabre_file_templates( $this->_skinSet, $data, $title, $this->_group );
+			}
+		}
+		else
+		{
+			$css = $this->skinFunctions->fetchCSS( $this->_skinSet['set_id'] );
+			
+			/* templates */
+			foreach( $css as $title => $data )
+			{
+				$output[] = new sabre_file_templates( $this->_skinSet, $data, $title, 'css' );
+			}
+		}
+
+		return $output;
+	}
+
+	public function getChild( $title )
+	{
+		if ( ! $title || $title == '.' || strtolower( $title == '.ds_store' ) || $title == 'Thumbs.db' || $title == 'desktop.ini' )
+		{
+			return false;
+		}
+		
+		$title = preg_replace( '#^(.*)\.(css|html)$#', '\1', $title );
+		
+		/* Group data or CSS */
+		if ( $this->_group != 'css' )
+		{
+			/* Fetch template */
+			$_templates = $this->skinFunctions->fetchTemplates( $this->_skinSet['set_id'], 'groupTemplates', $this->_group );
+			$template   = $_templates[ strtolower( $title ) ];
+			
+			if ( $template )
+			{
+				return new sabre_file_templates( $this->_skinSet, $template, $title, $this->_group );
+			}
+			else
+			{
+				return new sabre_file_templates( $this->_skinSet, null, $title, $this->_group );
+			}
+		}
+		else
+		{
+			$css = $this->skinFunctions->fetchCSS( $this->_skinSet['set_id'] );
+			
+			return new sabre_file_templates( $this->_skinSet, $css[ strtolower($title) ], $title, 'css' );
+		}
+	}
+
+	public function getName()
+	{
+		if ( strstr( $this->_group, 'skin_' ) )
+		{
+			return preg_replace( '#^skin_(.*)$#', '\1', IPSText::alphanumericalClean( $this->_group ) );
+		}
+		else if ( $this->_group == 'css' )
+		{
+			return '0.css';
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/directory/index.html b/upload/admin/sources/classes/sabre/directory/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/directory/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/directory/templates.php b/upload/admin/sources/classes/sabre/directory/templates.php
new file mode 100644
index 00000000..29146a2d
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/directory/templates.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Sabre classes by Matt Mecham
+ * Last Updated: $Date: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		Friday 18th March 2011
+ * @version		$Revision: 8229 $
+ */
+
+class sabre_directory_templates extends Sabre_DAV_Directory
+{
+	protected $_skinSet = array();
+
+	public function __construct( $skinSet )
+	{
+	
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Require some files for our sabre implementation */
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/root/skins.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/groups.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/files/templates.php' );/*noLibHook*/
+	    require_once( IPS_ROOT_PATH . 'sources/classes/sabre/lock/nolocks.php' );/*noLibHook*/
+	    
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinCaching( $this->registry );
+		$this->_skinSet      = $skinSet;
+	}
+
+	public function getChildren()
+	{
+		$templates = $this->skinFunctions->fetchTemplates( $this->_skinSet['set_id'], 'groupNames');
+		
+		$output = array();
+		
+		/* Add in css */
+		$output[] = new sabre_directory_groups( 'css', $this->_skinSet );
+		
+		foreach( $templates as $group => $data )
+		{
+			$output[] = new sabre_directory_groups( $group, $this->_skinSet );
+		}
+
+		return $output;
+	}
+
+	public function getChild( $title )
+	{
+		if ( strstr( $title, '.css' ) )
+		{
+			return new sabre_directory_groups( 'css', $this->_skinSet );
+		}
+		else
+		{
+			return new sabre_directory_groups( 'skin_' . $title, $this->_skinSet );
+		}
+	}
+
+	public function getName()
+	{
+		return $this->_skinSet['set_id'] . '__' . IPSText::alphanumericalClean( $this->_skinSet['set_name'] );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/files/index.html b/upload/admin/sources/classes/sabre/files/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/files/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/files/templates.php b/upload/admin/sources/classes/sabre/files/templates.php
new file mode 100644
index 00000000..912614bb
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/files/templates.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Sabre classes by Matt Mecham
+ * Last Updated: $Date: 2011-07-25 15:07:16 -0400 (Mon, 25 Jul 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		Friday 18th March 2011
+ * @version		$Revision: 9313 $
+ */
+
+class sabre_file_templates extends Sabre_DAV_File
+{
+	protected $_skinSet  = array();
+	protected $_template = '';
+	protected $_title    = '';
+	protected $_group    = '';
+	protected $_content  = null;
+	
+	public function __construct( $skinSet, $template=null, $title=null, $group=null )
+	{
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Require some files for our sabre implementation */
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/root/skins.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/templates.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/groups.php' );/*noLibHook*/
+	    require_once( IPS_ROOT_PATH . 'sources/classes/sabre/lock/nolocks.php' );/*noLibHook*/
+	    
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinCaching( $this->registry );
+		
+		$this->_skinSet = $skinSet;
+		$this->_group   = $group;
+		
+		if ( $template )
+		{
+			$this->_template = $template;
+			$this->_title    = ( $this->_group == 'css' ) ? $template['css_group'] : $template['template_name'];
+		}
+		else
+		{
+			$this->_title = $title;
+		}
+	}
+
+	public function getName()
+	{ 
+		return $this->_title . '.' . ( $this->_group == 'css' ? 'css' : 'html' );
+	}
+
+	public function getLastModified()
+	{
+		return intval( $this->_group == 'css' ? $this->_template['css_updated'] : $this->_template['template_updated'] );
+	}
+
+	public function getETag()
+	{
+		$content = $this->_getTemplateContent();
+		
+		return ( $content === false ) ? 'new' : md5( $content );
+	}
+
+	public function get()
+	{
+		$content = $this->_getTemplateContent();
+		
+		return ( $content === false ) ? '' : $content;
+	}
+
+	public function getSize()
+	{
+		$content = $this->_getTemplateContent();
+		
+		return ( $content === false ) ? 0 : strlen( $content );
+	}
+
+	public function getContentType()
+	{
+		if ( $this->_group != 'css' )
+		{
+			return 'text/html';
+		}
+		else if ( $this->_group == 'css' )
+		{
+			return 'text/css';
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function put( $data )
+	{
+		$content = stream_get_contents( $data );
+			
+		if ( ! $this->_title || $this->_title == '.' || strtolower( $this->_title == '.ds_store' ) || $this->_title == 'Thumbs.db' || $this->_title == 'desktop.ini' )
+		{
+			return false;
+		}
+		
+		/* Do what now? */
+		return ( $this->_group == 'css' ) ? $this->_putCss( $content ) : $this->_putTemplate( $content );
+		
+	}
+
+	public function delete()
+	{
+		try
+		{
+			if ( $this->_template )
+			{
+				if ( $this->_group != 'css' )
+				{
+					$this->skinFunctions->revertTemplateBit( $this->_template['template_id'], $this->_skinSet['set_id'] );
+				}
+				else
+				{
+					$this->skinFunctions->revertCSS( $this->_template['css_id'], $this->_skinSet['set_id'] );
+				}
+			}
+		}
+		catch( Exception $err )
+		{
+			/* Catch error - it might have come from a tmp save file being renamed */
+			if ( $this->_group != 'css' )
+			{
+				$test = $this->DB->buildAndFetch( array( 'select' => '*',
+														 'from'	  => 'skin_templates',
+														 'where'  => 'template_set_id=' . $this->_skinSet['set_id'] . ' AND template_group=\'' . $this->DB->addSlashes( $this->_group ) . '\'',
+														 'order'  => 'template_id DESC',
+														 'limit'  => array( 0, 1 ) ) );
+				
+				if ( $test['template_added_to'] > 0 && $test['template_updated'] > time() - 240 && $test['template_removable'] && $test['template_added_to'] == $this->_skinSet['set_id'] )
+				{
+					return true;
+				}
+			}
+			
+			throw new Sabre_DAV_Exception_Forbidden( $err->getMessage() );
+		}
+	}
+
+	public function setName($title)
+	{
+		$title = preg_replace( '#^(.*)\.(css|html)$#', '\1', $title );
+		
+		try
+		{
+			if ( $this->_group != 'css' )
+			{
+				if ( $this->_template )
+				{
+					$this->skinFunctions->renameTemplateName( $this->_template['template_id'], $title );
+					
+					/* Got a master skin of the same name? Then it's a simple edit */
+					$test = $this->DB->buildAndFetch(  array( 'select' => '*',
+														 	  'from'   => 'skin_templates',
+														 	  'where'  => 'template_set_id=0 AND template_master_key=\'' . $this->_skinSet['set_master_key'] . '\' AND template_name=\'' . $this->DB->addSlashes( $this->_title ) . '\' AND template_group=\'' . $this->DB->addSlashes( $this->_group ) . '\'' ) );
+
+					if ( $test['template_name'] )
+					{
+						/* Reset added to */
+						$this->DB->update( 'skin_templates', array( 'template_added_to' => 0 ), 'template_id=' . $this->_template['template_id'] );
+					}
+				}
+			}
+			else
+			{
+				if ( $this->_template )
+				{
+					$this->skinFunctions->renameCssName( $this->_template['css_id'], $title );
+				}
+			}
+		}
+		catch( Exception $err )
+		{ 
+			throw new Sabre_DAV_Exception_Forbidden( $err->getMessage() );
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Put CSS
+	 * @param string $content
+	 * @throws Sabre_DAV_Exception_Forbidden
+	 * @return boolean
+	 */
+	protected function _putCss( $content )
+	{
+		/* Clear cache */
+		$this->_content = null;
+		
+		/* Save it! */
+		try
+		{
+			if ( ! empty( $this->_template['css_id'] ) && $this->_skinSet['set_id'] )
+			{
+				$this->skinFunctions->saveCSSFromEdit( $this->_template['css_id'], $this->_skinSet['set_id'], $content, $this->_title, $this->_template['css_position'], $this->_template['css_attributes'], $this->_template['css_app'], $this->_template['css_app_hide'], $this->_template['css_modules'] );
+			}
+			else
+			{
+				$this->skinFunctions->saveCSSFromAdd( $this->_skinSet['set_id'], $content, $this->_title, $this->_template['css_position'], $this->_template['css_attributes'], $this->_template['css_app'], $this->_template['css_app_hide'], $this->_template['css_modules'] );
+			}
+		}
+		catch( Exception $err )
+		{ 
+			throw new Sabre_DAV_Exception_Forbidden( $err->getMessage() );
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Put template ...
+	 * @param string $content
+	 * @throws Sabre_DAV_Exception_Forbidden
+	 * @return boolean
+	 */
+	protected function _putTemplate( $content )
+	{
+		/* Got a data tag? */
+		$params   = '';
+		$template = '';
+		
+		if ( stristr( $content, '<ips:template parameters="' ) )
+		{
+			preg_match( '#<ips:template parameters="(.+?)" />(\n)?#', $content, $match );
+			
+			if ( $match[1] )
+			{
+				$params = $match[1];
+				$template = str_replace( $match[0], '', $content );
+			}
+		}
+		else
+		{
+			$template = $content;
+		}
+		
+		/* Clear cache */
+		$this->_content = null;
+		
+		/* Save it! */
+		try
+		{
+			if ( ! empty( $this->_template['template_id'] ) && $this->_skinSet['set_id'] )
+			{
+				$this->skinFunctions->saveTemplateBitFromEdit( $this->_template['template_id'], $this->_skinSet['set_id'], $template, $params );
+			}
+			else
+			{
+				$newId = $this->skinFunctions->saveTemplateBitFromAdd( $this->_skinSet['set_id'], $template, $params, $this->_group, $this->_title );
+				
+				/* If webdav client adds, then renames… - in delete, if trying to delete master and set specific exists, allow without error but don't delete */
+				if ( $newId )
+				{
+					/* Got a master skin of the same name? Then it's a simple edit */
+					$test = $this->DB->buildAndFetch(  array( 'select' => '*',
+														 	  'from'   => 'skin_templates',
+														 	  'where'  => 'template_set_id=0 AND template_master_key=\'' . $this->_skinSet['set_master_key'] . '\' AND template_name=\'' . $this->DB->addSlashes( $this->_title ) . '\' AND template_group=\'' . $this->DB->addSlashes( $this->_group ) . '\'' ) );
+
+					if ( $test['template_name'] )
+					{
+						/* Update new */
+						$this->DB->update( 'skin_templates', array( 'template_set_id' => $this->_skinSet['set_id'], 'template_master_key' => '' ), 'template_id=' . $newId );
+						
+						$this->_template['template_set_id'] = $this->_skinSet['set_id'];
+						$this->_template['template_id']     = $newId;
+					}
+				}
+			}
+		}
+		catch( Exception $err )
+		{ 
+			throw new Sabre_DAV_Exception_Forbidden( $err->getMessage() );
+		}
+		
+		return true;
+	}
+	
+	protected function _getTemplateContent()
+	{
+		if ( ! $this->_template )
+		{
+			return false;
+		}
+
+		if ( $this->_content === null )
+		{
+			if ( $this->_group != 'css' )
+			{
+				$template = $this->skinFunctions->fetchTemplateBitForEdit( $this->_template['template_id'], $this->_skinSet['set_id'] );
+				$data     = $template['template_data'];
+				
+				if ( ! empty( $data ) )
+				{
+					$template['_template_content'] = '<ips:template parameters="' . IPSText::formToText( $data ) . '" />' . "\n" . $template['_template_content'];
+				}
+				
+				$this->_content = ( isset( $template['_template_content'] )  ) ? $template['_template_content'] : false;
+			}
+			else
+			{
+				$template = $this->skinFunctions->fetchCSSForEdit( $this->_template['css_id'], $this->_skinSet['set_id'] );
+				
+				$this->_content = ( isset( $template['css_content'] )  ) ? $template['css_content'] : false;
+			}
+		}
+		
+		return $this->_content;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/index.html b/upload/admin/sources/classes/sabre/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/lock/index.html b/upload/admin/sources/classes/sabre/lock/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/lock/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/lock/nolocks.php b/upload/admin/sources/classes/sabre/lock/nolocks.php
new file mode 100644
index 00000000..dce0f94e
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/lock/nolocks.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Sabre classes by Matt Mecham
+ * Last Updated: $Date: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		Friday 18th March 2011
+ * @version		$Revision: 8229 $
+ */
+ 
+class sabre_lock_nolocks extends Sabre_DAV_Locks_Backend_Abstract
+{
+	public function getLocks( $uri )
+	{
+		return array();
+	}
+
+	public function lock( $uri, Sabre_DAV_Locks_LockInfo $lockInfo )
+	{
+		return true;
+	}
+
+	public function unlock( $uri, Sabre_DAV_Locks_LockInfo $lockInfo )
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/root/index.html b/upload/admin/sources/classes/sabre/root/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/root/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/sabre/root/skins.php b/upload/admin/sources/classes/sabre/root/skins.php
new file mode 100644
index 00000000..279f7fd1
--- /dev/null
+++ b/upload/admin/sources/classes/sabre/root/skins.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Sabre classes by Matt Mecham
+ * Last Updated: $Date: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		Friday 18th March 2011
+ * @version		$Revision: 8229 $
+ */
+ 
+class sabre_root_skins extends Sabre_DAV_Directory
+{
+
+	public function __construct()
+	{
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+	 	/* Require some files for our sabre implementation */
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/root/skins.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/templates.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/files/templates.php' );/*noLibHook*/
+	    require_once( IPS_ROOT_PATH . 'sources/classes/sabre/lock/nolocks.php' );/*noLibHook*/
+	    
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinFunctions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/skins/skinCaching.php' );/*noLibHook*/
+		
+		$this->skinFunctions = new skinCaching( $this->registry );
+	}
+	
+	public function getChildren()
+	{
+		/* Show all skins */
+		$this->DB->build( array( 'select' => '*',
+							     'from'   => 'skin_collections',
+							     'order'  => 'set_id ASC' ) );
+							     
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$output[] = new sabre_directory_templates( $row );
+		}
+
+		return $output;
+	}
+
+
+	public function getChild( $directoryName )
+	{
+		/* Fetch ID */
+		$skinId = preg_replace( '#^([0-9]+?)__.*$#', '\1', $directoryName );
+
+		if ( is_numeric( $skinId ) )
+		{
+			$skinSet = $this->skinFunctions->fetchSkinData( intval( $skinId ) );
+			
+			return new sabre_directory_templates( $skinSet );
+		}
+	}
+
+	public function getName()
+	{
+		return 'PublicTemplates';
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/search/controller.php b/upload/admin/sources/classes/search/controller.php
index 91077096..fa4cb6a4 100644
--- a/upload/admin/sources/classes/search/controller.php
+++ b/upload/admin/sources/classes/search/controller.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Global Search
- * Last Updated: $Date: 2010-02-22 17:06:11 +0000 (Mon, 22 Feb 2010) $
+ * Last Updated: $Date: 2011-09-09 08:14:40 -0400 (Fri, 09 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5859 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9474 $
  */ 
 
 if ( ! defined( 'IN_IPB' ) )
@@ -32,7 +32,7 @@ class IPSSearchRegistry {
 	 * Registry vars
 	 * @var	array
 	 */
-	static private $_vars = array();
+	static protected $_vars = array();
 	 
 	/**
 	 * Set var
@@ -60,6 +60,36 @@ class IPSSearchRegistry {
 		
 		return null;
 	}
+	
+	/**
+	 * Get is title only
+	 *
+	 */
+	static public function searchTitleOnly()
+	{
+		if ( self::get('opt.searchType') == 'titles' )
+		{
+			return true;
+		}
+		
+		if ( self::get('opt.searchType') == 'both' )
+		{
+			return false;
+		}
+		
+		if ( self::get('opt.searchType') == 'content' )
+		{
+			return false;
+		}
+		
+		if ( self::get('opt.noPostPreview') )
+		{
+			return true;
+		}
+		
+		return false;
+	
+	}
 }
 
 /**
@@ -81,7 +111,9 @@ class IPSSearch
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -89,42 +121,42 @@ class IPSSearch
 	 * 
 	 * @var		object
 	 */
-	private $SEARCH;
+	protected $SEARCH;
 	
 	/**
 	 * Plug in for formatting results
 	 * 
 	 * @var		object
 	 */
-	private $FORMAT;
+	protected $FORMAT;
 	
 	/**
 	 * App
 	 * 
 	 * @var		string
 	 */
-	private $_app;
+	protected $_app;
 	
 	/**
 	 * Engine
 	 * 
 	 * @var		string
 	 */
-	private $_engine;
+	protected $_engine;
 	
 	/**
 	 * Result count
 	 *
 	 * @param	int
 	 */
-	private $_count;
+	protected $_count;
 	
 	/**
 	 * Result array
 	 *
 	 * @param	array
 	 */
-	private $_results;
+	protected $_results;
 	
 	static public $aso;
 	static public $ask;
@@ -134,7 +166,7 @@ class IPSSearch
 	 * Setup registry objects
 	 *
 	 * @param	object	ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $engine, $app )
 	{
@@ -156,14 +188,14 @@ class IPSSearch
 		$this->_app       = IPSText::alphanumericalClean( $app );
 		
 		/* Quick check */
-		if ( ! file_exists( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' ) )
+		if ( ! is_file( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' ) )
 		{
 			/* Try SQL */
 			if ( ! $this->_engine != 'sql' )
 			{
 				$this->_engine = 'sql';
 				
-				if ( ! file_exists( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' ) )
+				if ( ! is_file( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' ) )
 				{
 					throw new Exception( "NO_SUCH_ENGINE" );
 				}
@@ -184,43 +216,34 @@ class IPSSearch
 		IPSSearchRegistry::set( 'global.app'   , $this->_app );
 		
 		/* Load up the relevant engines */
-		$_className = 'search_' . $this->_engine;
-		
-		require_once( IPS_ROOT_PATH . 'sources/classes/search/format.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/search/format.php' );/*noLibHook*/
 		
 		/* Got an app specific file? Lets hope so */
-		if ( file_exists( IPSLib::getAppDir( $this->_app ) . '/extensions/search/format.php' ) )
-		{	
+		if ( is_file( IPSLib::getAppDir( $this->_app ) . '/extensions/search/format.php' ) )
+		{
 			/* We may not have sphinx specific stuff, so... */
-			if ( ! file_exists( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php' ) )
+			if ( ! is_file( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php' ) )
 			{
 				$this->_engine = 'sql';
 				
-				if ( ! file_exists( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php' ) )
+				if ( ! is_file( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php' ) )
 				{
 					throw new Exception( "NO_SUCH_APP_ENGINE" );
 				}
 			}
 			
-			require_once( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' );
-			require_once( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php' );
-			
-			/* SEARCH classname */
-			$_className = 'search_engine_' . $this->_app;
-			
-			$this->SEARCH = new $_className( $registry );
+			/* SEARCH file */
+			require_once( IPS_ROOT_PATH . 'sources/classes/search/engines/' . $this->_engine . '.php' );/*noLibHook*/
+			$classToLoad  = IPSLib::loadLibrary( IPSLib::getAppDir( $this->_app ) . '/extensions/search/engines/' . $this->_engine . '.php', 'search_engine_' . $this->_app, $this->_app );
+			$this->SEARCH = new $classToLoad( $registry );
 			
 			/* FORMAT file */
-			require_once( IPSLib::getAppDir( $this->_app ) . '/extensions/search/format.php' );
-			
-			/* FORMAT classname */
-			$_className = 'search_format_' . $this->_app;
-			
-			$this->FORMAT = new $_className( $registry );
+			$classToLoad  = IPSLib::loadLibrary( IPSLib::getAppDir( $this->_app ) . '/extensions/search/format.php', 'search_format_' . $this->_app, $this->_app );
+			$this->FORMAT = new $classToLoad( $registry );
 			
 			/* Grab config */
 			$CONFIG = array();
-			require( IPSLib::getAppDir( $this->_app ) . '/extensions/search/config.php' );
+			require( IPSLib::getAppDir( $this->_app ) . '/extensions/search/config.php' );/*noLibHook*/
 			
 			if ( is_array( $CONFIG ) && count( $CONFIG ) )
 			{
@@ -239,7 +262,7 @@ class IPSSearch
 		if ( IPSSearchRegistry::get( 'config.contentTypes' ) )
 		{
 			$c = IPSSearchRegistry::get( 'config.contentTypes' );
-			
+
 			if ( is_array( $c ) AND count( $c ) )
 			{
 				/* Set up default content type if supported */
@@ -281,6 +304,11 @@ class IPSSearch
 			case 'fetchSortDropDown':
 				return $this->SEARCH->fetchSortDropDown();
 			break;
+			
+			/* Primarily shortcuts for 'Content I follow' */
+			case 'fetchFollowedContentOutput':
+				return $this->FORMAT->parseFollowedContentOutput( $args[0], $args[1] );
+			break;
 		}
  	}
  	
@@ -297,14 +325,13 @@ class IPSSearch
 		/* results page? */
 		$filter = ( ! IPSSearchRegistry::get('view.search_form') AND IPSSearchRegistry::get( $app . '.searchInKey' )	) ? IPSSearchRegistry::get( $app . '.searchInKey' ) : '';
 		
-		if ( file_exists( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' ) )
+		if ( is_file( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' ) )
 		{
-			require_once( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' );
-			$_class = 'search_form_' . $app;
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/search/form.php', 'search_form_' . $app, $app );
 			
-			if ( class_exists( $_class ) )
+			if ( class_exists( $classToLoad ) )
 			{
-				$_obj = new $_class();				
+				$_obj = new $classToLoad();
 				$_dd  = $_obj->fetchSortDropDown();
 				
 				if ( $filter )
@@ -331,14 +358,13 @@ class IPSSearch
 	{
 		$app = ( $app ) ? $app : $this->_app;
 		
-		if ( file_exists( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' ) )
+		if ( is_file( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' ) )
 		{
-			require_once( IPSLib::getAppDir( $app ) . '/extensions/search/form.php' );
-			$_class = 'search_form_' . $app;
+			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app ) . '/extensions/search/form.php', 'search_form_' . $app, $app );
 			
-			if ( class_exists( $_class ) )
+			if ( class_exists( $classToLoad ) )
 			{
-				$_obj = new $_class();
+				$_obj = new $classToLoad();
 				
 				if ( method_exists( $_obj, 'fetchSortIn' ) )
 				{			
@@ -370,17 +396,16 @@ class IPSSearch
 				continue;
 			}
 			
-			if( IPSLib::appisSearchable( $app['app_directory'] ) )
+			if( IPSLib::appIsSearchable( $app['app_directory'] ) )
 			{
 				/* got custom filter? */
-				if ( file_exists( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/search/form.php' ) )
+				if ( is_file( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/search/form.php' ) )
 				{
-					require_once( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/search/form.php' );
-					$_class = 'search_form_' . $app['app_directory'];
-				
-					if ( class_exists( $_class ) and method_exists( $_class, 'getHtml' ) )
+					$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/search/form.php', 'search_form_' . $app['app_directory'], $app['app_directory'] );
+					
+					if ( class_exists( $classToLoad ) and method_exists( $classToLoad, 'getHtml' ) )
 					{
-						$_obj = new $_class();
+						$_obj = new $classToLoad();
 						
 						$filtersHtml[ $app['app_directory'] ] = $_obj->getHtml();
 					}
@@ -508,14 +533,53 @@ class IPSSearch
 	 */
 	public function viewNewContent()
 	{
-		IPSSearchRegistry::set('display.onlyTitles', true);
+		IPSSearchRegistry::set('opt.searchTitleOnly', true);
+		IPSSearchRegistry::set('in.period_in_seconds', false );
 		
-		/* Hard fix mobile app users to VNC based on unread content */
+		/* Hard fix mobile app users to VNC based on ACP default VNC method */
 		if ( $this->member->isMobileApp )
 		{
-			$this->memberData['bw_vnc_type'] = 1;
+			IPSSearchRegistry::set( 'in.period', $this->settings['default_vnc_method'] );
 		}
 		
+		/* Do we have a period? */
+		switch( IPSSearchRegistry::get('in.period') )
+		{
+			case 'today':
+			default:
+				$date	= 86400;		// 24 hours
+			break;
+			
+			case 'week':
+				$date	= 604800;		// 1 week
+			break;
+			
+			case 'weeks':
+				$date	= 1209600;		// 2 weeks
+			break;
+			
+			case 'month':
+				$date	= 2592000;		// 30 days
+			break;
+			
+			case 'months':
+				$date	= 15552000;		// 6 months
+			break;
+			
+			case 'year':
+				$date	= 31536000;		// 365 days
+			break;
+			case 'lastvisit':
+				$date   = time() - intval( $this->memberData['last_visit'] );
+			break;
+			case 'unread':
+				$date   = false;
+			break;
+		}
+
+		/* Set date up */
+		IPSSearchRegistry::set('in.period_in_seconds', $date );
+		
 		/* Run the search */
 		$results = $this->SEARCH->viewNewContent();
 		
@@ -558,74 +622,12 @@ class IPSSearch
 		}
 	}
 	
-	
-	/**
-	 * Perform the search
-	 *
-	 * @return	nothin'
-	 */
-	public function viewActiveContent()
-	{
-		/* Bit 'o set up */
-		IPSSearchRegistry::set('opt.searchTitleOnly', IPSSearchRegistry::get('in.view_by_title') );
-		IPSSearchRegistry::set('display.onlyTitles', true);
-		IPSSearchRegistry::set('opt.searchTitleOnly', true);
-		
-		/* Do we have a period? */
-		switch( IPSSearchRegistry::get('in.period') )
-		{
-			case 'today':
-			default:
-				$date	= 86400;		// 24 hours
-			break;
-			
-			case 'week':
-				$date	= 604800;		// 1 week
-			break;
-			
-			case 'weeks':
-				$date	= 1209600;		// 2 weeks
-			break;
-			
-			case 'month':
-				$date	= 2592000;		// 30 days
-			break;
-			
-			case 'months':
-				$date	= 15552000;		// 6 months
-			break;
-			
-			case 'year':
-				$date	= 31536000;		// 365 days
-			break;
-		}
-		
-		/* Set date up */
-		IPSSearchRegistry::set('in.period_in_seconds', $date );
-		
-		/* Run the search */
-		$results = $this->SEARCH->viewActiveContent();
-		
-		/* Set data */
-		$this->_count   = intval( $results['count'] );
-		$this->_results = $results['resultSet'];
-		
-		/* Now format results */
-		if ( count( $this->_results ) )
-		{
-			$this->_results = $this->FORMAT->processResults( $this->_results );
-			
-			/* Now generate HTML */
-			$this->_results = $this->FORMAT->parseAndFetchHtmlBlocks( $this->_results );
-		}
-	}
-	
 	/**
 	 * Flag a search session
 	 *
 	 * @return int			Process ID
 	 */
-	private function _startSession()
+	protected function _startSession()
 	{
 		/**
 		 * If we've already run a search and it's not clear, kill it now
@@ -655,7 +657,7 @@ class IPSSearch
 	 *
 	 * @return void
 	 */
-	private function _endSession( $processId )
+	protected function _endSession( $processId )
 	{
 		if ( $processId )
 		{
diff --git a/upload/admin/sources/classes/search/engines/index.html b/upload/admin/sources/classes/search/engines/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/search/engines/index.html
+++ b/upload/admin/sources/classes/search/engines/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/search/engines/sphinx.php b/upload/admin/sources/classes/search/engines/sphinx.php
index 58c83789..21b086bb 100644
--- a/upload/admin/sources/classes/search/engines/sphinx.php
+++ b/upload/admin/sources/classes/search/engines/sphinx.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Global Search
- * Last Updated: $Date: 2010-02-19 01:29:54 +0000 (Fri, 19 Feb 2010) $
+ * Last Updated: $Date: 2011-08-08 07:05:57 -0400 (Mon, 08 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5855 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9376 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -61,7 +61,7 @@ class search_engine
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -77,13 +77,13 @@ class search_engine
 		$this->caches     =& $this->registry->cache()->fetchCaches();
 		
 		/* Do we have the sphinxes? */
-		if( ! file_exists( 'sphinxapi.php' ) )
+		if( ! is_file( 'sphinxapi.php' ) )
 		{
 			$registry->output->showError( 'sphinx_api_missing', 10182 );
 		}
 
 		/* Load Sphinx */
-		require( 'sphinxapi.php' );
+		require( 'sphinxapi.php' );/*noLibHook*/
 		$this->sphinxClient = new SphinxClient();
 
 		$this->sphinxClient->SetServer( $this->settings['search_sphinx_server'], intval( $this->settings['search_sphinx_port'] ) );
@@ -117,13 +117,14 @@ class search_engine
 	 */
 	public function viewNewContent()
 	{
-		$app        = IPSSearchRegistry::get('in.search_app');
-		$lastActive = IPSLib::fetchHighestNumber( array( intval( $this->memberData['_cache']['gb_mark__' . $app] ), intval( $this->memberData['last_visit'] ) ) );
+		$app     = IPSSearchRegistry::get('in.search_app');
+		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
 		
 		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
 		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
 		
-		$this->setDateRange( $lastActive, time() );
+		/* Set time stamp */
+		$this->setDateRange( intval( time() - $seconds ), time() );
 		
 		/* Force title search only */
 		IPSSearchRegistry::set('opt.searchTitleOnly', true);
@@ -145,7 +146,6 @@ class search_engine
 		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
 		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
 		IPSSearchRegistry::set('opt.searchTitleOnly', IPSSearchRegistry::get('in.view_by_title') );
-		IPSSearchRegistry::set('display.onlyTitles' , IPSSearchRegistry::get('in.view_by_title') );
 		IPSSearchRegistry::set('opt.noPostPreview'  , IPSSearchRegistry::get('in.view_by_title') );
 		
 		/* Set the member_id */
@@ -162,23 +162,6 @@ class search_engine
 		return $this->search();
 	}
 	
-	/**
-	 * Perform the search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewActiveContent()
-	{
-		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
-		
-		/* Set time stamp */
-		$this->setDateRange( time() - $seconds, time() );
-		
-		return $this->search();
-	}
-	
 	/**
 	 * Can handle boolean searching
 	 *
@@ -209,10 +192,10 @@ class search_engine
 		$search_term  = IPSText::mbstrtolower( $search_term );
 		
 		/* Check for disallowed search terms */
-		while( preg_match_all( "/(?:^|\s+)(img|quote|code|html|javascript|a href|color|span|div|border|style)(?:\s+|$)/", $search_term, $removed_search_terms ) )
+		while( preg_match_all( '/(?:^|\s+)(img|quote|code|html|javascript|a href|color|span|div|border|style)(?:\s+|$)/', $search_term, $removed_search_terms ) )
 		{
 			$removedTerms[]	= $removed_search_terms[0][0];
-			$search_term	= preg_replace( "/(^|\s+)(?:img|quote|code|html|javascript|a href|color|span|div|border|style)(\s+|$)/", str_replace( "  ", " ", "$1$2" ), $search_term );
+			$search_term	= preg_replace( '/(^|\s+)(?:img|quote|code|html|javascript|a href|color|span|div|border|style)(\s+|$)/', str_replace( "  ", " ", "$1$2" ), $search_term );
 		}		
 		
 		/* Remove some formatting */
@@ -221,11 +204,11 @@ class search_engine
 		$search_term = str_replace( array( '\\', '/' ), '', $search_term );
 		
 		/* Sphinx chars are not allowed */
-		$search_term = str_replace( array( '.', ')', '(', '!', '@', '[', ']' ), '', $search_term );
+		$search_term = str_replace( array( '.', ')', '(', '!', '@', '[', ']', '-', '~', '^' ), '', $search_term );
 		
 		if ( $andor == 'or' )
 		{
-			$search_term = preg_replace( "/\s+(?!-|~)/", " | ", $search_term );
+			$search_term = preg_replace( '/\s+/', " | ", $search_term );
 		}
 		
 		return array( 'search_term' => $search_term, 'removed' => $removedTerms );
@@ -237,10 +220,12 @@ class search_engine
 	 * @access	public
 	 * @param	int		$begin	Start timestamp
 	 * @param	int		[$end]	End timestamp
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setDateRange( $begin, $end=0 )
 	{
+		$begin = ( $begin < 1000000000 ) ? 1000000000 : $begin;
+		
 		$this->search_begin_timestamp = $begin;
 		$this->search_end_timestamp   = $end;
 	}
@@ -251,7 +236,7 @@ class search_engine
 	 * @access	public
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
@@ -266,7 +251,7 @@ class search_engine
 	 * @param	string	$operator	Operation to perform for this condition, ex: =, <>, IN, NOT IN
 	 * @param	mixed	$value		Value to check with
 	 * @param	string	$comp		Comparison type
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setCondition( $column, $operator, $value, $comp='AND' )
 	{
@@ -316,7 +301,7 @@ class search_engine
 	 * @param	array	$conditions	Array of conditions, each element has 3 keys: column, operator, value, see the setCondition function for information on each
 	 * @param	string	$inner_comp	Comparison operator to use inside the chain
 	 * @param	string	$outer_comp	Comparison operator to use outside the chain
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setMultiConditions( $conditions, $inner_comp='OR', $outer_comp='AND' )
 	{	
@@ -328,7 +313,7 @@ class search_engine
 	 * Checks and logs any errors
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function logSphinxWarnings()
 	{	
diff --git a/upload/admin/sources/classes/search/engines/sql.php b/upload/admin/sources/classes/search/engines/sql.php
index d3c5f827..3ba44fbd 100644
--- a/upload/admin/sources/classes/search/engines/sql.php
+++ b/upload/admin/sources/classes/search/engines/sql.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Global Search
- * Last Updated: $Date: 2010-02-22 17:06:11 +0000 (Mon, 22 Feb 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5859 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */ 
 
 if ( ! defined( 'IN_IPB' ) )
@@ -53,7 +53,7 @@ class search_engine
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -95,13 +95,14 @@ class search_engine
 	 */
 	public function viewNewContent()
 	{
-		$app        = IPSSearchRegistry::get('in.search_app');
-		$lastActive = IPSLib::fetchHighestNumber( array( intval( $this->memberData['_cache']['gb_mark__' . $app] ), intval( $this->memberData['last_visit'] ) ) );
+		$app     = IPSSearchRegistry::get('in.search_app');
+		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
 		
 		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
 		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
 		
-		$this->setDateRange( $lastActive, time() );
+		/* Set time stamp */
+		$this->setDateRange( intval( time() - $seconds ), time() );
 		
 		/* Force title search only */
 		IPSSearchRegistry::set('opt.searchTitleOnly', true);
@@ -120,10 +121,9 @@ class search_engine
 	{
 		$app = IPSSearchRegistry::get('in.search_app');
 		
-		IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
-		IPSSearchRegistry::set('in.search_sort_order', 'desc' );
+		//IPSSearchRegistry::set('in.search_sort_by'   , 'date' );
+		//IPSSearchRegistry::set('in.search_sort_order', 'desc' );
 		IPSSearchRegistry::set('opt.searchTitleOnly', IPSSearchRegistry::get('in.view_by_title') );
-		IPSSearchRegistry::set('display.onlyTitles' , IPSSearchRegistry::get('in.view_by_title') );
 		IPSSearchRegistry::set('opt.noPostPreview'  , IPSSearchRegistry::get('in.view_by_title') );
 		
 		/* Set the member_id */
@@ -140,23 +140,6 @@ class search_engine
 		return $this->search();
 	}
 	
-	/**
-	 * Perform the search
-	 * Populates $this->_count and $this->_results
-	 *
-	 * @access	public
-	 * @return	nothin'
-	 */
-	public function viewActiveContent()
-	{
-		$seconds = IPSSearchRegistry::get('in.period_in_seconds');
-		
-		/* Set time stamp */
-		$this->setDateRange( time() - $seconds, time() );
-		
-		return $this->search();
-	}
-	
 	/**
 	 * Can handle boolean searching
 	 *
@@ -178,7 +161,7 @@ class search_engine
 	public function formatSearchTerm( $search_term )
 	{
 		$isBoolean      = $this->isBoolean();
-		$andor          = isset( $this->request['andor_type'] ) ? $this->request['andor_type'] : $this->settings['s_andor_type'];
+		$andor          = !empty( $this->request['andor_type'] ) ? $this->request['andor_type'] : $this->settings['s_andor_type'];
 		$removedTerms	= array();
 		
 		/* Fix up some sanitized HTML */
@@ -196,23 +179,23 @@ class search_engine
 		$search_term  = IPSText::mbstrtolower( $search_term );
 		
 		/* Check for disallowed search terms */
-		while( preg_match_all( "/(?:^|\s+)(img|quote|code|html|javascript|a href|color|span|div|border|style)(?:\s+|$)/", $search_term, $removed_search_terms ) )
+		while( preg_match_all( '/(?:^|\s+)(img|quote|code|html|javascript|a href|color|span|div|border|style)(?:\s+|$)/', $search_term, $removed_search_terms ) )
 		{
 			$removedTerms[]	= $removed_search_terms[0][0];
-			$search_term	= preg_replace( "/(^|\s+)(?:img|quote|code|html|javascript|a href|color|span|div|border|style)(\s+|$)/", str_replace( "  ", " ", "$1$2" ), $search_term );
+			$search_term	= preg_replace( '/(^|\s+)(?:img|quote|code|html|javascript|a href|color|span|div|border|style)(\s+|$)/', str_replace( "  ", " ", "$1$2" ), $search_term );
 		}		
 		
 		/* Remove some formatting */
 		//$search_term = str_replace( array( '|', '\\', '/' ), '', $search_term );
 		// | is an OR operator for sphinx - don't want to block globally
 		$search_term = str_replace( array( '\\', '/' ), '', $search_term );
-		
+
 		/* got some bullean to do? */
 		if ( $isBoolean AND strstr( $search_term, ' ' ) AND ! strstr( $search_term, '"' ) )
 		{
 			if ( $andor == 'and' )
 			{
-				$search_term = '+' . preg_replace( "/\s+(?!-|~)/", " +", $search_term );
+				$search_term = '+' . preg_replace( '/\s+(?!-|~)/', " +", $search_term );
 			}
 		}
 		
@@ -225,7 +208,7 @@ class search_engine
 	 * @access	public
 	 * @param	int		$begin	Start timestamp
 	 * @param	int		[$end]	End timestamp
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setDateRange( $begin, $end=0 )
 	{
@@ -241,7 +224,7 @@ class search_engine
 	 * @param	string	$operator	Operation to perform for this condition, ex: =, <>, IN, NOT IN
 	 * @param	mixed	$value		Value to check with
 	 * @param	string	$comp		Comparison type
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setCondition( $column, $operator, $value, $comp='AND' )
 	{
@@ -272,7 +255,7 @@ class search_engine
 	 * @access	public
 	 * @param	string	$column		sql table column for this condition
 	 * @return	string				column
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function remapColumn( $column )
 	{
@@ -286,7 +269,7 @@ class search_engine
 	 * @param	array	$conditions	Array of conditions, each element has 3 keys: column, operator, value, see the setCondition function for information on each
 	 * @param	string	$inner_comp	Comparison operator to use inside the chain
 	 * @param	string	$outer_comp	Comparison operator to use outside the chain
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setMultiConditions( $conditions, $inner_comp='OR', $outer_comp='AND' )
 	{	
diff --git a/upload/admin/sources/classes/search/format.php b/upload/admin/sources/classes/search/format.php
index 5ba515e3..ad8526da 100644
--- a/upload/admin/sources/classes/search/format.php
+++ b/upload/admin/sources/classes/search/format.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Global Search
- * Last Updated: $Date: 2010-02-22 17:06:11 +0000 (Mon, 22 Feb 2010) $
+ * Last Updated: $Date: 2011-07-08 15:07:09 -0400 (Fri, 08 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5859 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9189 $
  */ 
 
 if ( ! defined( 'IN_IPB' ) )
@@ -37,7 +37,7 @@ class search_format
 	 *
 	 * @access	public
 	 * @param	object	ipsRegistry $registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -54,6 +54,9 @@ class search_format
 		
 		/* Set up default wrapper */
 		$this->templates = array( 'group' => 'search', 'template' => 'searchResults' );
+		
+		// Need to setup this manually here, won't work in the template..
+		$this->registry->templateStriping['searchResults'] = array( FALSE, "row1", "row2" );
 	}
 	
 	/**
@@ -67,11 +70,24 @@ class search_format
 		return $this->templates;
 	}
 	
+	/**
+	 * Wrapper for processResults() when called from 'Content I follow' view
+	 *
+	 * @param	array 	$ids			Ids
+	 * @param	array	$followData		Retrieve the follow meta data
+	 * @return array
+	 */
+	public function processFollowedResults( $ids, $followData=array() )
+	{
+		/* Per app class handles this */
+		throw new Exception("NO_FORMAT_AVAILABLE");
+	}
+	
 	/**
 	 * Formats / grabs extra data for results
 	 * Takes an array of IDS (can be IDs from anything) and returns an array of expanded data.
 	 *
-	 * @access public
+	 * @param	array 	$ids			Ids
 	 * @return array
 	 */
 	public function processResults( $ids )
@@ -86,7 +102,7 @@ class search_format
 	 *
 	 * @param  array  $r
 	 * @return array
-	 **/
+	 */
 	public function genericizeResults( $r )
 	{
 		return $r;
@@ -102,36 +118,41 @@ class search_format
 	public function parseAndFetchHtmlBlocks( $rows )
 	{
 		/* Forum stuff */
-		$sub               = false;
-		$isVnc             = false;
-		$search_term	   = IPSSearchRegistry::get('in.clean_search_term');
-		$results		   = array();
+		$sub		 = false;
+		$isVnc		 = false;
+		$search_term = IPSSearchRegistry::get('in.clean_search_term');
+		$results	 = array();
 		
 		/* loop and process */
-		foreach( $rows as $id => $r )
+		if( is_array($rows) AND count($rows) )
 		{
-			/* If basic search, strip the content */
-			IPSText::getTextClass( 'bbcode' )->parse_wordwrap			= 0;
-			IPSText::getTextClass( 'bbcode' )->parse_bbcode				= 0;
-			IPSText::getTextClass( 'bbcode' )->strip_quotes				= 1;
-			IPSText::getTextClass( 'bbcode' )->parsing_section			= 'topics';
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup			= $r['member_group_id'];
-			IPSText::getTextClass( 'bbcode' )->parsing_mgroup_others	= $r['mgroup_others'];
-	
-			$r['content'] = strip_tags( IPSText::getTextClass( 'bbcode' )->stripAllTags( $r['content'] ) );
-			$r['content'] = str_replace( array( '&lt;br&gt;', '&lt;br /&gt;' ), '', $r['content'] );
-			$r['content'] = trim( str_replace( array( "\n\n\n", "\n\n" ), "\n", str_replace( "\r", '', $r['content'] ) ) );
-	
-			/* Highlight */
-			$r['content'] = IPSText::searchHighlight( $this->searchTruncate( $r['content'], $search_term ), $search_term );
+			foreach( $rows as $id => $r )
+			{
+				/* If basic search, strip the content - process only if we have content though */
+				if ( $r['content'] )
+				{
+					IPSText::getTextClass('bbcode')->parse_bbcode			= 0;
+					IPSText::getTextClass('bbcode')->strip_quotes			= 1;
+					IPSText::getTextClass('bbcode')->parsing_section		= 'topics';
+					IPSText::getTextClass('bbcode')->parsing_mgroup			= $r['member_group_id'];
+					IPSText::getTextClass('bbcode')->parsing_mgroup_others	= $r['mgroup_others'];
 			
-			/* Format title */
-			$r['content_title'] = IPSText::searchHighlight( $r['content_title'], $search_term );
+					$r['content'] = strip_tags( IPSText::getTextClass( 'bbcode' )->stripAllTags( $r['content'] ) );
+					$r['content'] = str_replace( array( '&lt;br&gt;', '&lt;br /&gt;' ), '', $r['content'] );
+					$r['content'] = trim( str_replace( array( "\n\n\n", "\n\n" ), "\n", str_replace( "\r", '', $r['content'] ) ) );
 			
-			/* Format content */
-			list( $html, $sub ) = $this->formatContent( $r );
-			
-			$results[ $id ] = array( 'html' => $html, 'app' => $r['app'], 'type' => $r['type'], 'sub' => $sub );
+					/* Highlight */
+					$r['content'] = IPSText::searchHighlight( $this->searchTruncate( $r['content'], $search_term ), $search_term );
+				}
+				
+				/* Format title */
+				$r['content_title'] = IPSText::searchHighlight( $r['content_title'], $search_term );
+				
+				/* Format content */
+				list( $html, $sub ) = $this->formatContent( $r );
+				
+				$results[ $id ] = array( 'html' => $html, 'app' => $r['app'], 'type' => $r['type'], 'sub' => $sub, '_followData' => !empty($r['_followData']) ? $r['_followData'] : array() );
+			}
 		}
 				
 		return $results;
@@ -143,10 +164,10 @@ class search_format
 	 * @access	public
 	 * @param	array   $search_row		Array of data
 	 * @return	mixed	Formatted content, ready for display, or array containing a $sub section flag, and content
-	 **/
+	 */
 	public function formatContent( $data )
 	{
-		return array( $this->registry->output->getTemplate( 'search' )->searchRowGenericFormat( $data ), 0 );
+		return array( $this->registry->output->getTemplate('search')->searchRowGenericFormat( $data ), 0 );
 	}
 	
 	/**
@@ -156,7 +177,7 @@ class search_format
 	 * @param	string	$haystack	Full search result
 	 * @param	string	$needle		The search term
 	 * @return	string
-	 **/
+	 */
 	public function searchTruncate( $haystack, $needle )
 	{
 		/* Base on words */
diff --git a/upload/admin/sources/classes/search/index.html b/upload/admin/sources/classes/search/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/search/index.html
+++ b/upload/admin/sources/classes/search/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/search/sphinxIndexPlugin.php b/upload/admin/sources/classes/search/sphinxIndexPlugin.php
deleted file mode 100644
index 5bec63c4..00000000
--- a/upload/admin/sources/classes/search/sphinxIndexPlugin.php
+++ /dev/null
@@ -1,511 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Global Search
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Core
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6917 $
- */
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class searchPluginSphinxIndex implements iSearchIndexPlugin
-{
-	/**
-	 * Database object
-	 *
-	 * @access	private
-	 * @var		object
-	 */
-	private $DB;
-
-	/**
-	 * Date range restriction start
-	 *
-	 * @access	private
-	 * @var		integer
-	 */
-	private $search_begin_timestamp = 0;
-
-	/**
-	 * Date range restriction end
-	 *
-	 * @access	private
-	 * @var		integer
-	 */
-	private $search_end_timestamp   = 0;
-
-	/**
-	 * Array of conditions for this search
-	 *
-	 * @access	private
-	 * @var		array
-	 */
-	private $whereConditions        = array();
-
-	/**
-	 * Apps to exclude
-	 *
-	 * @access	public
-	 * @var		array
-	 */
-	public $exclude_apps            = array();
-
-	/**
-	 * Sphinx client object
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $sphinxClient;
-
-	/**
-	 * Don't show post preview
-	 *
-	 * @access	public
-	 * @var		boolean
-	 */
-	public $noPostPreview		= false;
-
-	/**
-	 * Do not join posts table on
-	 *
-	 * @access	public
-	 * @var		boolean
-	 */
-	public $onlyTitles			= false;
-
-	/**
-	 * Search plugin for the application
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $appSearchPlugin;
-
-	/**
-	 * Setup registry objects
-	 *
-	 * @access	public
-	 * @param	object	ipsRegistry $registry
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry )
-	{
-		$this->DB			=  $registry->DB();
-		$this->member		=  $registry->member();
-		$this->memberData	=& $registry->member()->fetchMemberData();
-		$this->settings		=  $registry->settings();
-		$this->request		=  $registry->request();
-
-		/* Do we have the sphinxes? */
-		if( ! file_exists( 'sphinxapi.php' ) )
-		{
-			$registry->output->showError( 'sphinx_api_missing', 10182 );
-		}
-
-		/* Load Sphinx */
-		require( 'sphinxapi.php' );
-		$this->sphinxClient = new SphinxClient();
-
-		$this->sphinxClient->SetServer( $this->settings['search_sphinx_server'], intval( $this->settings['search_sphinx_port'] ) );
-		$this->sphinxClient->SetMatchMode( SPH_MATCH_EXTENDED );
-		$this->sphinxClient->SetLimits( 0, 1000 );
-
-		/* We're going to need the regular app index plugin also */
-		require_once( IPSLib::getAppDir( ipsRegistry::$request[ 'search_app' ] ) . '/extensions/searchPlugin.php' );
-		$searchApp = 'search' . ucfirst( $this->request['search_app'] ) . 'Plugin';
-		$this->appSearchPlugin = new $searchApp( $registry );
-	}
-
-	/**
-	 * Performs search and returns an array of results
-	 *
-	 * @access	public
-	 * @param	string	$search_term
-	 * @param	array	$limit_clause	The erray should be array( begin, end )
-	 * @param	string	$sort_by		Column to sort by
-	 * @param	string	$group_by		Column to group by
-	 * @param	bool	$content_title_only	Only search title records
-	 * @return	array
-	 */
-	public function getSearchResults( $search_term, $limit_clause, $sort_by, $group_by='', $content_title_only=false )
-	{
-		$search_term	= str_replace( '&quot;', '"', $search_term );
-		$search_term	= str_replace( '&amp;', '&', $search_term );
-		$search_term	= str_replace( '&#33;', '!', $search_term );
-		
-		/* Do the search */
-		$results = $this->_searchQuery( $search_term, $limit_clause, $sort_by, $group_by, false, $content_title_only );
-
-		/* Build result array */
-		$rows = array();
-
-		if( is_array( $results ) && count( $results ) )
-		{
-			$q = $this->appSearchPlugin->getResultsForSphinx( $results );
-
-			while( $r = $this->DB->fetch( $q ) )
-			{
-				$rows[] = $this->appSearchPlugin->formatFieldsForIndex( $r );
-			}
-		}
-
-		return $rows;
-	}
-
-	/**
-	 * Performs live search and returns an array of results
-	 * NOT AVAILABLE IN BASIC SEARCH
-	 *
-	 * @access	public
-	 * @param	string	$search_term
-	 * @return	array
-	 */
-	public function getLiveSearchResults( $search_term )
-	{
-		if( ipsRegistry::$settings['live_search_disable'] )
-		{
-			return array();
-		}
-	}
-
-	/**
-	 * Returns the total number of results the search will return
-	 *
-	 * @access	public
-	 * @param	string	$search_term		Search term
-	 * @param	string	$group_by			Column to group by
-	 * @param	bool	$content_title_only	Only search title records
-	 * @return	integer
-	 */
-	public function getSearchCount( $search_term, $group_by='', $content_title_only=false )
-	{
-		$search_term	= str_replace( '&quot;', '"', $search_term );
-		$search_term	= str_replace( '&amp;', '&', $search_term );
-		$search_term	= str_replace( '&#33;', '!', $search_term );
-		
-		/* Return the count */
-		return $this->_searchQuery( $search_term, array(), '', '', true, $content_title_only );
-	}
-
-	/**
-	 * Restrict the date range that the search is performed on
-	 *
-	 * @access	public
-	 * @param	int		$begin	Start timestamp
-	 * @param	int		[$end]	End timestamp
-	 * @return	void
-	 */
-	public function setDateRange( $begin, $end=0 )
-	{
-		$this->sphinxClient->SetFilterRange( $this->appSearchPlugin->getDateField(), $begin, $end );
-	}
-
-	/**
-	 * Set search conditions for "View unread content"
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function setUnreadConditions()
-	{
-		$this->setDateRange( intval( $this->memberData['last_visit'] ), time() );
-	}
-
-	/**
-	 * mySQL function for adding special search conditions
-	 *
-	 * @access	public
-	 * @param	string	$column		sql table column for this condition
-	 * @param	string	$operator	Operation to perform for this condition, ex: =, <>, IN, NOT IN
-	 * @param	mixed	$value		Value to check with
-	 * @param	string	$comp		Comparison type
-	 * @return	void
-	 */
-	public function setCondition( $column, $operator, $value, $comp='AND' )
-	{
-		/* This is restricted by the indexes searched */
-		if( $column == 'app' )
-		{
-			return;
-		}
-
-		$column = $this->appSearchPlugin->getConditionField( $column );
-
-		if( !$column )
-		{
-			return;
-		}
-
-		/* Build the condition based on operator */
-		switch( strtoupper( $operator ) )
-		{
-			case 'IN':		
-				$this->sphinxClient->setFilter( $column, explode( ',', $value ) );
-			break;
-			
-			case 'NOT IN':
-				$this->sphinxClient->setFilter( $column, explode( ',', $value ), TRUE );
-			break;
-			
-			case '=':
-				$this->sphinxClient->setFilter( $column, array( $value ) );
-			break;
-			
-			case '!=':
-			case '<>':
-				$this->sphinxClient->setFilter( $column, array( $value ), TRUE );
-			break;
-			
-			default:
-				echo "<b>�е �уще�твующий оператор: {$operator}</b><br />";
-			break;
-		}
-		
-	}
-	
-	/**
-	 * Allows you to specify multiple conditions that are chained together
-	 *
-	 * @access	public
-	 * @param	array	$conditions	Array of conditions, each element has 3 keys: column, operator, value, see the setCondition function for information on each
-	 * @param	string	$inner_comp	Comparison operator to use inside the chain
-	 * @param	string	$outer_comp	Comparison operator to use outside the chain
-	 * @return	void
-	 */
-	public function setMultiConditions( $conditions, $inner_comp='OR', $outer_comp='AND' )
-	{
-		//echo "<b>setMultiCondidion</b> should not be used in sphinx<br />";
-		return;
-	}
-
-	/**
-	 * Does search
-	 *
-	 * @access	private
-	 * @param	string	$search_term
-	 * @param	array	$limit_clause	The erray should be array( begin, end )
-	 * @param	string	$sort_by		Either relevance or date
-	 * @param	string	[$group_by]		Field to group on
-	 * @param	bool	[$count_only]	Set to true for a count(*) query
-	 * @param	bool	[$content_title_only]	Only search titles
-	 * @return	array
-	 **/
-	private function _searchQuery( $search_term, $limit_clause, $sort_by, $group_by='', $count_only=false, $content_title_only=false )
-	{
-		/* Do we only need to count results? */
-		if( ! $count_only )
-		{
-			if( $limit_clause[1] )
-			{
-				/* Limit Results */
-				$this->sphinxClient->SetLimits( intval($limit_clause[0]), intval($limit_clause[1]) );
-			}
-			else if( $limit_clause[0] )
-			{
-				$this->sphinxClient->SetLimits( 0, intval($limit_clause[0]) );
-			}
-
-			/* Sort By */
-			if( isset( $sort_by ) && in_array( $sort_by, array( 'date', 'relevance' ) ) )
-			{
-				if( $sort_by == 'date' )
-				{
-					if( $this->request['search_sort_order'] == 0 )
-					{
-						$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $this->appSearchPlugin->getDateField() /* Sigh */ );
-					}
-					else
-					{
-						$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $this->appSearchPlugin->getDateField() /* Sigh */ );
-					}
-				}
-				else
-				{
-					$this->sphinxClient->SetSortMode( SPH_SORT_RELEVANCE );
-				}
-			}
-			else
-			{
-				$this->sphinxClient->SetSortMode( SPH_SORT_RELEVANCE );
-			}
-		}
-
-		/* Exclude Apps */
-		if( count( $this->exclude_apps ) )
-		{
-			$app_id_exclude = array();
-			foreach( $this->exclude_apps as $app_dir )
-			{
-				$app_id_exclude[] = ipsRegistry::$applications[$app_dir]['app_id'];
-			}
-
-			$this->sphinxClient->SetFilter( 'app', $app_id_exclude, TRUE );
-		}
-
-		/* Permissions */
-		$perm_array = $this->member->perm_id_array;
-		$perm_array[] = 0;
-
-		/* Need to remove empty values... */
-		$final_perms	= array();
-
-		foreach( $perm_array as $perm_id )
-		{
-			if( is_numeric( $perm_id ) )
-			{
-				$final_perms[]	= intval($perm_id);
-			}
-		}
-
-		$this->sphinxClient->SetFilter( 'perm_view', $final_perms );
-
-		/* Exclude some items */
-		if( ! $this->memberData['g_is_supmod'] )
-		{
-			/* Owner only */
-			$this->sphinxClient->SetFilter( 'owner_only', array( 0, intval($this->memberData['member_id']) ) );
-
-			/* Friend only */
-			$this->DB->build( array(
-									'select' => 'friends_member_id',
-									'from'   => 'profile_friends',
-									'where'  => "friends_friend_id={$this->memberData['member_id']}"
-							)	);
-			$this->DB->execute();
-
-			$friends_ids = array( 0 );
-			while( $r = $this->DB->fetch() )
-			{
-				$friends_ids[] = intval($r['friends_member_id']);
-			}
-
-			$this->sphinxClient->SetFilter( 'friend_only', $friends_ids );
-
-			/* Authorized users only */
-			$this->sphinxClient->SetFilter( 'authorized_users', array( 0, intval($this->memberData['member_id']) ) );
-		}
-
-		//-----------------------------------------
-		// Allow app to modify query
-		//-----------------------------------------
-		
-		if( ! isset( $this->display_plugins[ $this->request['search_app'] ] ) || ! $this->display_plugins[ $this->request['search_app'] ] )
-		{
-			if( file_exists( IPSLib::getAppDir( $this->request['search_app'] ) . '/extensions/searchDisplay.php' ) )
-			{
-				require_once( IPSLib::getAppDir( $this->request['search_app'] ) . '/extensions/searchDisplay.php' );
-				$_class = strtolower($this->request['search_app']) . 'SearchDisplay';
-
-				$this->display_plugins[ $this->request['search_app'] ] = new $_class();
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		$this->appSearchPlugin->onlyTitles		= $this->onlyTitles;
-		$this->appSearchPlugin->noPostPreview	= $this->noPostPreview;
-
-		$this->display_plugins[ $this->request['search_app'] ]->search_plugin	= $this->appSearchPlugin;
-
-		if( method_exists( $this->display_plugins[ $this->request['search_app'] ], 'modifySearchQuery' ) )
-		{
-			/* Get the modified query */
-			$this->display_plugins[ $this->request['search_app'] ]->modifySearchQuery( $this->sphinxClient, $count_only );
-		}
-
-		$groupby	= $this->onlyTitles ? true : false;
-
-		/* Perform the search */
-		if( method_exists( $this->display_plugins[ $this->request['search_app'] ], 'runSearchQuery' ) )
-		{
-			$result = $this->display_plugins[ $this->request['search_app'] ]->runSearchQuery( $this->sphinxClient, $search_term, $groupby );
-		}
-		else
-		{
-			if( $groupby )
-			{
-				$this->sphinxClient->SetGroupBy( 'search_id', SPH_GROUPBY_ATTR, '@group DESC');
-			}
-
-			$result = $this->sphinxClient->Query( $search_term, $this->request['search_app'] . '_search_main,' . $this->request['search_app'] . '_search_delta' );
-		}
-
-		/* Return the total number of results */
-		if( $count_only )
-		{
-			return $result['total'];
-		}
-		/* Return the results */
-		else
-		{
-			$search_ids = array();
-
-			if( is_array( $result['matches'] ) && count( $result['matches'] ) )
-			{
-				foreach( $result['matches'] as $res )
-				{
-					$search_ids[] = $res['attrs']['search_id'];
-				}
-			}
-
-			return $search_ids;
-		}
-	}
-
-	/**
-	 * Reassigns fields in a way the index exepcts
-	 *
-	 * @param  array  $r
-	 * @return array
-	 **/
-	public function formatFieldsForIndex( $r )
-	{
-		// Blank
-	}
-
-	/**
-	 * This function grabs the actual results for display
-	 *
-	 * @param  array  $ids
-	 * @return query result
-	 **/
-	public function getResultsForSphinx( $ids )
-	{
-		// Blank
-	}
-
-	/**
-	 * Get whether or not we're showing as forum or not
-	 *
-	 * @param	public
-	 * @return	bool
-	 */
-	public function getShowAsForum()
-	{
-		if( method_exists( $this->appSearchPlugin, 'getShowAsForum' ) )
-		{
-			return $this->appSearchPlugin->getShowAsForum();
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/session/adminSessions.php b/upload/admin/sources/classes/session/adminSessions.php
index 4d5975c9..fcb9c059 100644
--- a/upload/admin/sources/classes/session/adminSessions.php
+++ b/upload/admin/sources/classes/session/adminSessions.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Admin session handler
- * Last Updated: $Date: 2010-09-16 10:57:26 -0400 (Thu, 16 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Who knows...
- * @version		$Revision: 6883 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,7 +29,7 @@ class adminSessions extends ips_MemberRegistry
 	/**
 	 * Variable for session validated
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
 	protected $session_data	= array();
@@ -37,40 +37,40 @@ class adminSessions extends ips_MemberRegistry
 	/**
 	 * Timeout variable
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		int
 	 */
-	private $_time_out_mins	= 120;
+	protected $_time_out_mins	= 120;
 	
 	/**
 	 * Admin session
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_adsess        = '';
+	protected $_adsess        = '';
 	
 	/**
 	 * Whether they are validated or not
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		bool
 	 */
-	private $_validated		= false;
+	protected $_validated		= false;
 	
 	/**
 	 * Message to display
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_message		= '';
+	protected $_message		= '';
 	
 	/**
 	 * Authorize
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
     {
@@ -266,7 +266,7 @@ class adminSessions extends ips_MemberRegistry
 				{
 					foreach( $groups_id as $pid )
 					{
-						if ( ! isset($cache[ $pid ]['g_id']) OR ! $cache[ $pid ]['g_id'] )
+						if ( empty($cache[ $pid ]['g_id']) )
 						{
 							continue;
 						}
@@ -355,7 +355,7 @@ class adminSessions extends ips_MemberRegistry
 	 */
 	public function getMessage()
 	{
-		return ( isset($this->registry->class_localization->words[ $this->_message ]) AND $this->registry->class_localization->words[ $this->_message ] ) ? $this->registry->class_localization->words[ $this->_message ] : $this->_message;
+		return !empty($this->registry->class_localization->words[ $this->_message ]) ? $this->registry->class_localization->words[ $this->_message ] : $this->_message;
 	}
 	
 	/**
@@ -382,8 +382,8 @@ class adminSessions extends ips_MemberRegistry
 
 		if ( ! $this->registry->isClassLoaded( 'userAgentFunctions' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
-			$this->registry->setClass( 'userAgentFunctions', new userAgentFunctions( $this->registry ) );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php', 'userAgentFunctions' );
+			$this->registry->setClass( 'userAgentFunctions', new $classToLoad( $this->registry ) );
 		}
 
 		$uAgent = $this->registry->getClass( 'userAgentFunctions' )->findUserAgentID( self::instance()->user_agent );
@@ -407,7 +407,7 @@ class adminSessions extends ips_MemberRegistry
 	 * @param	bool		Authenticated or not
 	 * @param	string		Message
 	 * @param	array 		Array of user agent data
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _response( $validated, $message, $userAgentData=array() )
 	{
diff --git a/upload/admin/sources/classes/session/api.php b/upload/admin/sources/classes/session/api.php
index 1f1c1ca0..ee231c70 100644
--- a/upload/admin/sources/classes/session/api.php
+++ b/upload/admin/sources/classes/session/api.php
@@ -1,44 +1,52 @@
 <?php
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Session API
- * Created by Matt Mecham
- * Last Updated: $Date: 2010-10-05 02:50:24 +0100 (Tue, 05 Oct 2010) $
- * </pre>
- *
- * @author 		Matt Meckum
- * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6942 $
- *
+ * @file		api.php 	Provides global methods to retrieve active users from the sessions table
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		Friday 12th November 2010 16:58
+ * $LastChangedDate: 2011-08-26 11:38:16 -0400 (Fri, 26 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9420 $
  */
 
+/**
+ *
+ * @class		session_api
+ * @brief		Provides global methods to retrieve active users from the sessions table
+ *
+ */
 class session_api
 {
-	/**#@+
-	* Registry Object Shortcuts
-	*
-	* @access	protected
-	* @var		object
-	*/
+	/**
+	 * Registry Object Shortcuts
+	 *
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$request
+	 * @var		$lang
+	 * @var		$member
+	 * @var		$memberData
+	 * @var		$cache
+	 * @var		$caches
+	 */
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
 	protected $cache;
 	protected $caches;
-	/**#@-*/
 	
 	/**
-	 * Construct.
-	 * @param	object		Registry object
-	 * @access	public
-	 * @return	void
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -56,13 +64,28 @@ class session_api
 	
 	/**
 	 * Returns a list (with buildProfilePhoto set) of users in an application
-	 * @param string $app
-	 * @param array  'fetch' (all, members, guests)
-	 * @return array ('stats' => array( 'members', 'guests', 'anon' ), 'rows' => array( ... ) )
+	 *
+	 * @param	string		$app		Application folder/key
+	 * @param	array		$options	Array of options to add/override checks for the query
+	 * @return	@e array Array of found sessions (members, guests, bots, anons)
+	 *
+	 * <b>Filters:</b>
+	 * - cutoff:		Specify a different cutoff time rather than using the default setting
+	 * - addJoins:		Add more joins for the query
+	 * - addWhere:		Add more checks for the 'where' part of the query (everything is joined with ' AND ')
+	 * - overrideWhere:	Specify manually the 'where' part of the query, the query must be already compiled
+	 * 
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $onlineUsers = $this->getUsersIn( 'forums', array( 'cutoff' => 90 ) );
+	 * $onlineUsers = $this->getUsersIn( 'forums', array( 'cutoff' => 90, 'addJoins' => array( ... ), 'addWhere' => array( ... ) ) );
+	 * $onlineUsers = $this->getUsersIn( 'forums', array( 'overrideWhere' => "s.current_appcomponent='forums' AND (s.running_time > TIME_A OR s.running_time < TIME_B)" ) );
+	 * @endcode
 	 */
 	public function getUsersIn( $app, $options=array() )
 	{
-		$return  = array( 'stats' => array( 'total'   => 0,
+		/* Init vars and check options */
+		$return = array(  'stats' => array( 'total'   => 0,
 											'members' => 0,
 										    'guests'  => 0,
 											'bots'	  => 0,
@@ -70,34 +93,63 @@ class session_api
 						  'rows'  => array( 'members' => array(),
 											'bots'    => array(),
 											'guests'  => array(),
-											'anon' 	  => array() ) );
+											'anon' 	  => array() ),
+						  'names' => array()
+						 );
 		
-		$limit	 = time() - ( $this->settings['au_cutoff'] * 60 );
-		$rows	 = array();
-		$NOWJIM  = time();
-		$cached  = array();
-		$where   = array( "s.current_appcomponent='" . $app . "'", "s.running_time > " . $limit );
+		$cutoff = empty($options['cutoff']) ? $this->settings['au_cutoff'] : $options['cutoff'];
+		$limit	= time() - ( $cutoff * 60 );
+		$rows	= array();
+		$NOWJIM = IPS_UNIX_TIME_NOW;
+		$cached = array();
 		
+		/* Sort joins */
+		$_joins = array( array( 'select' => 'm.*',
+								'from'   => array( 'members' => 'm' ),
+								'where'  => 'm.member_id=s.member_id',
+								'type'   => 'left' ) );
+		
+		if ( isset($options['addJoins']) && is_array($options['addJoins']) && count($options['addJoins']) )
+		{
+			$where = array_merge( $_joins, $options['addJoins'] );
+		}
+		
+		/* Sort where.. override? */
+		if ( !empty($options['overrideWhere']) && is_string($options['overrideWhere']) )
+		{
+			$where = $options['overrideWhere'];
+		}
+		else
+		{
+			/* Normal where */
+			$where = array( "s.current_appcomponent='" . $app . "'", "s.running_time > " . $limit );
+			
+			if ( isset($options['addWhere']) && is_array($options['addWhere']) && count($options['addWhere']) )
+			{
+				$where = array_merge( $where, $options['addWhere'] );
+			}
+			
+			$where = implode( ' AND ', $where );
+		}
+		
+		/* We're a member too? */
 		if ( $this->memberData['member_id'] )
 		{
-			$rows[ $NOWJIM . '.' . $this->memberData['member_id'] ] = array_merge( array( 'id'			 => $this->member->session_id,
+			$rows[ $NOWJIM . '.' . $this->memberData['member_id'] ] = array_merge( $this->memberData,
+																				   array( 'id'			 => $this->member->session_id,
 																						  'login_type'	 => substr($this->memberData['login_anonymous'],0, 1),
 																						  'running_time' => $NOWJIM,
-																						  'member_id'	 => $this->memberData['member_id'],
 																						  'member_name'	 => $this->memberData['members_display_name'],
 																						  'member_group' => $this->memberData['member_group_id'],
-																						  'seo_name'	 => $this->memberData['members_seo_name'] ), $this->memberData );
+																						  'seo_name'	 => $this->memberData['members_seo_name'] )
+																				   );
 		}
 		
 		/* Dee bee */
-		$this->DB->build( array( 'select'    => 's.*',
-								 'from'	     => array( 'sessions' => 's' ),
-								 'where'     => implode( ' AND ', $where ),
-								 'add_join'  =>  array( array( 'select' => 'm.*',
-															   'from'   => array( 'members' => 'm' ),
-															   'where'  => 'm.member_id=s.member_id',
-															   'type'   => 'left' ) ) ) );
-
+		$this->DB->build( array( 'select'   => 's.*, s.id as row_session_id',
+								 'from'	    => array( 'sessions' => 's' ),
+								 'where'    => $where,
+								 'add_join' => $_joins ) );
 		$this->DB->execute();
 
 		while( $session = $this->DB->fetch() )
@@ -106,16 +158,24 @@ class session_api
 			{
 				continue;
 			}
-
+			
+			$session['id'] = $session['row_session_id'];
+			
 			$rows[ $session['running_time'] . '.' . $session['id'] ] = $session;
 		}
+		
+		/* No rows? */
+		if ( ! count( $rows ) )
+		{
+			return $return;
+		}
 
 		krsort( $rows );
 		
 		/* Process them */
 		$filename = IPSLib::getAppDir( $app ) . '/extensions/coreExtensions.php';
 					
-		if ( file_exists( $filename ) )
+		if ( is_file( $filename ) )
 		{
 			$classToLoad = IPSLib::loadLibrary( $filename, 'publicSessions__' . $app, $app );
 			$loader      = new $classToLoad();
@@ -126,6 +186,7 @@ class session_api
 			}
 		}
 		
+		/* No rows? */
 		if ( ! count( $rows ) )
 		{
 			return $return;
@@ -143,9 +204,10 @@ class session_api
 
 				if ( ! $cached[ $result['member_name'] ] )
 				{
-					$result 					= IPSMember::buildProfilePhoto( 0 );
+					$result 					= IPSMember::buildProfilePhoto( $result );
 					$result['parsedMemberName'] = $result['member_name'];
-					$return['rows']['bots'][]   = $result;
+					$return['rows']['bots'][ $result['id'] ] = $result;
+					$return['names'][ $result['id'] ]		 = $result['parsedMemberName'];
 
 					$cached[ $result['member_name'] ] = 1;
 				}
@@ -157,7 +219,8 @@ class session_api
 			{
 				$result						= IPSMember::buildProfilePhoto( 0 );
 				$result['parsedMemberName'] = $this->lang->words['global_guestname'];
-				$return['rows']['guests'][] = $result;
+				$return['rows']['guests'][ $result['id'] ] = $result;
+				
 				$return['stats']['guests']++;
 			}
 			/* Member */
@@ -168,22 +231,25 @@ class session_api
 					$cached[ $result['member_id'] ] = 1;
 					
 					$result						= IPSMember::buildProfilePhoto( $result );
-					$result['parsedMemberName'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
+					$result['parsedMemberName'] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 
 					if ( $result['login_type'] )
 					{
-						if ( $this->memberData['g_access_cp'] and ( $this->settings['disable_admin_anon'] != 1 ) )
+						if ( $this->memberData['g_access_cp'] )
 						{
-							$result['parsedMemberName'] = IPSLib::makeProfileLink( $result['parsedMemberName'], $result['member_id'], $result['seo_name'] );
-							$return['rows']['anon'][]   = $result;
+							$result['parsedMemberName'] = IPSMember::makeProfileLink( $result['parsedMemberName'], $result['member_id'], $result['seo_name'] );
+							$return['rows']['anon'][ $result['id'] ] = $result;
+							$return['names'][ $result['id'] ]		 = $result['parsedMemberName'];
 						}
 						
 						$return['stats']['anon']++;
 					}
 					else
 					{
-						$result['parsedMemberName']  = IPSLib::makeProfileLink( $result['parsedMemberName'], $result['member_id'], $result['seo_name'] );
-						$return['rows']['members'][] = $result;
+						$result['parsedMemberName']  = IPSMember::makeProfileLink( $result['parsedMemberName'], $result['member_id'], $result['seo_name'] );
+						$return['rows']['members'][ $result['id'] ] = $result;
+						$return['names'][ $result['id'] ]			= $result['parsedMemberName'];
+						
 						$return['stats']['members']++;
 					}
 				}
@@ -194,6 +260,4 @@ class session_api
 	
 		return $return;
 	}
-	
-	
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/session/convergeSessions.php b/upload/admin/sources/classes/session/convergeSessions.php
index 9e465913..abe8e627 100644
--- a/upload/admin/sources/classes/session/convergeSessions.php
+++ b/upload/admin/sources/classes/session/convergeSessions.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class overrides parent publicSessions to prevent construct being called
  *	It doesn't do anything else...
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		22nd May 2008 11:15 AM
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -33,7 +33,7 @@ class convergeSessions extends publicSessions
 	 *
 	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */	
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/session/index.html b/upload/admin/sources/classes/session/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/session/index.html
+++ b/upload/admin/sources/classes/session/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/session/publicSessions.php b/upload/admin/sources/classes/session/publicSessions.php
index a7d0de3b..b72cf126 100644
--- a/upload/admin/sources/classes/session/publicSessions.php
+++ b/upload/admin/sources/classes/session/publicSessions.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Public session handler
- * Last Updated: $Date: 2010-10-06 06:09:32 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-10-11 09:22:35 -0400 (Tue, 11 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		26th January 2004
- * @version		$Revision: 6946 $
+ * @version		$Revision: 9594 $
  *
  */
 
@@ -37,10 +37,10 @@ class publicSessions extends ips_MemberRegistry
 	/**
 	 * User agent trimmed
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_userAgent;
+	protected $_userAgent;
 
 	/**
 	 * Session recorded flag
@@ -197,34 +197,34 @@ class publicSessions extends ips_MemberRegistry
 	/**
 	 * Sessions to be destroyed
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_sessionsToKill = array();
+	protected $_sessionsToKill = array();
 
 	/**
 	 * Sessions to be updated
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_sessionsToSave = array();
+	protected $_sessionsToSave = array();
 
 	/**
 	 * Session data of the session that didn't authorize
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_failedAuthorizationSessionData = array();
+	protected $_failedAuthorizationSessionData = array();
 	
 	/**
 	 * Delete sessions immediately?
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		boolean
 	 */
-	private $_deleteNow;
+	protected $_deleteNow;
 
 	/**
 	 * Session Query Override Keys
@@ -235,10 +235,10 @@ class publicSessions extends ips_MemberRegistry
 	 * You'd use:
 	 * ipsRegistry::member()->sessionClass()->addQueryKey( 'location_key_1', ipsRegistry::$request['f'] );
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_queryOverride = array();
+	protected $_queryOverride = array();
 	
 	/**
 	 * Constructor :: Authorizes the session
@@ -266,13 +266,13 @@ class publicSessions extends ips_MemberRegistry
 		 * This file can be used to easily integrate single-sign on in
 		 * situations where you need to check session data
 		 */
-		if( file_exists( IPS_ROOT_PATH . '/sources/classes/session/sso.php' ) )
+		if( is_file( IPS_ROOT_PATH . '/sources/classes/session/sso.php' ) )
 		{
-			require_once( IPS_ROOT_PATH . '/sources/classes/session/sso.php' );
-
-			if( class_exists( "ssoSessionExtension" ) )
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . '/sources/classes/session/sso.php', 'ssoSessionExtension' );
+			
+			if( class_exists( $classToLoad ) )
 			{
-				$this->sso	= new ssoSessionExtension( $this->registry );
+				$this->sso = new $classToLoad( $this->registry );
 			}
 		}
 
@@ -336,12 +336,12 @@ class publicSessions extends ips_MemberRegistry
 		$cookie['member_id']	= IPSCookie::get('member_id');
 		$cookie['pass_hash']	= IPSCookie::get('pass_hash');
 
-		if ( $cookie['session_id'] )
+		if ( $cookie['session_id'] && empty( $this->request['_nsc'] ) )
 		{
 			$this->getSession($cookie['session_id']);
 			$this->session_type = 'cookie';
 		}
-		elseif ( isset( $this->request['s'] ) AND $this->request['s'] )
+		elseif ( !empty( $this->request['s'] ) )
 		{
 			$this->getSession($this->request['s']);
 			$this->session_type = 'url';
@@ -363,7 +363,7 @@ class publicSessions extends ips_MemberRegistry
 			// a valid session.
 			//-----------------------------------------
 
-			if ( ($this->session_user_id != 0) and ( ! empty($this->session_user_id) ) )
+			if ( ! empty($this->session_user_id) )
 			{
 				//-----------------------------------------
 				// It's a member session, so load the member.
@@ -480,21 +480,6 @@ class publicSessions extends ips_MemberRegistry
 							{
 								$this->sso->checkSSOForMember( 'create' );
 							}
-
-							//-----------------------------------------
-							// Change the log in key to make each authentication
-							// use a unique token. This means that if a cookie is
-							// stolen, the hacker can only use the auth once.
-							//-----------------------------------------
-
-							if ( $this->settings['login_change_key'] )
-							{
-								self::$data_store['member_login_key'] = IPSMember::generateAutoLoginKey();
-
-								IPSMember::save( self::$data_store['member_id'], array( 'core' => array( 'member_login_key' => self::$data_store['member_login_key'], 'member_login_key_expire' => $_time ) ) );
-
-								IPSCookie::set( "pass_hash", self::$data_store['member_login_key'], $_sticky, $_days );
-							}
 						}
 						else
 						{
@@ -547,20 +532,13 @@ class publicSessions extends ips_MemberRegistry
 		{
 			if ( my_getenv('HTTP_X_MOZ') AND strstr( strtolower(my_getenv('HTTP_X_MOZ')), 'prefetch' ) AND self::$data_store['member_id'] )
 			{
-				if ( IPB_PHP_SAPI == 'cgi-fcgi' OR IPB_PHP_SAPI == 'cgi' )
+				if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
 				{
-					@header('Status: 403 Forbidden');
+					@header('HTTP/1.0 403 Forbidden');
 				}
 				else
 				{
-					if ( isset( $_SERVER['SERVER_PROTOCOL'] ) AND strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) )
-					{
-						@header('HTTP/1.0 403 Forbidden');
-					}
-					else
-					{
-						@header('HTTP/1.1 403 Forbidden');
-					}
+					@header('HTTP/1.1 403 Forbidden');
 				}
 				
 				@header("Cache-Control: no-cache, must-revalidate, max-age=0");
@@ -601,7 +579,7 @@ class publicSessions extends ips_MemberRegistry
 	 * @param	string		Key
 	 * @param	string		Value
 	 * @param	string		[Session ID, will default to current session if none found]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addQueryKey( $key, $value, $sessionID='' )
 	{
@@ -708,6 +686,18 @@ class publicSessions extends ips_MemberRegistry
 			//$this->session_id   = "";
 		}
 		
+		/* Did the user agent change? */
+		if ( ! empty( $uAgent['_browser'] ) )
+		{
+			$sessionData['browser'] = $uAgent['_browser'];
+			unset( $uAgent['_browser'] );
+			
+			foreach( $uAgent as $key => $value )
+			{
+				$this->session_data[ $key ] = $value;
+			}
+		}
+		
 		/* Set type */
 		self::$data_store['_sessionType'] = 'update';
 
@@ -767,8 +757,7 @@ class publicSessions extends ips_MemberRegistry
 		{
 			$this->session_id = substr( $uAgent['uagent_key'] . '=' . str_replace( '.', '', $this->_member->ip_address ) . '_session', 0, 60 );
 			$memberName       = $uAgent['uagent_name'];
-			$memberGroup      = $this->settings['spider_group'];
-			$loginType        = intval( $this->settings['spider_anon'] );
+			$memberGroup      = $this->settings['guest_group'];
 
 			IPSDebug::addMessage( "Updating SEARCH ENGINE session: " . $this->session_data['id'] );
 		}
@@ -777,13 +766,13 @@ class publicSessions extends ips_MemberRegistry
 			IPSDebug::addMessage( "Updating GUEST session: " . $this->session_data['id'] );
 		}
 
-		$this->DB->force_data_type = array( 'member_name' => 'string' );
+		$this->DB->setDataType( 'member_name', 'string' );
 
 		$sessionData	= array(
 								'member_name'			=> $memberName,
 								'member_id'				=> 0,
 								'member_group'			=> $memberGroup,
-								'login_type'			=> $loginType,
+								'login_type'			=> 0,
 								'running_time'			=> IPS_UNIX_TIME_NOW,
 								'in_error'				=> 0,
 								'current_appcomponent'	=> $this->current_appcomponent,
@@ -811,6 +800,18 @@ class publicSessions extends ips_MemberRegistry
 			$this->session_type = 'cookie';
 			//$this->session_id   = "";
 		}
+		
+		/* Did the user agent change? */
+		if ( ! empty( $uAgent['_browser'] ) )
+		{
+			$sessionData['browser'] = $uAgent['_browser'];
+			unset( $uAgent['_browser'] );
+			
+			foreach( $uAgent as $key => $value )
+			{
+				$this->session_data[ $key ] = $value;
+			}
+		}
 
 		/* Set type */
 		self::$data_store['_sessionType'] = 'update';
@@ -890,7 +891,7 @@ class publicSessions extends ips_MemberRegistry
 							'uagent_type'			=> $uAgent['uagent_type'],
 							'uagent_bypass'			=> intval( $uAgent['uagent_bypass'] ) );
 
-			$this->DB->force_data_type = array( 'member_name' => 'string' );
+			$this->DB->setDataType( 'member_name', 'string' );
 
 			$this->DB->insert( 'sessions', $data, true );
 
@@ -1016,8 +1017,7 @@ class publicSessions extends ips_MemberRegistry
 		{
 			$this->session_id = substr( $uAgent['uagent_key'] . '=' . str_replace( '.', '', $this->_member->ip_address ) . '_session', 0, 60 );
 			$memberName       = $uAgent['uagent_name'];
-			$memberGroup      = $this->settings['spider_group'];
-			$loginType        = intval( $this->settings['spider_anon'] );
+			$memberGroup      = $this->settings['guest_group'];
 
 			IPSDebug::addMessage( "Creating SEARCH ENGINE session: " . $this->session_id );
 
@@ -1046,7 +1046,7 @@ class publicSessions extends ips_MemberRegistry
 						'member_name'			=> $memberName,
 						'member_id'				=> 0,
 						'member_group'			=> $memberGroup,
-						'login_type'			=> $loginType,
+						'login_type'			=> 0,
 						'running_time'			=> IPS_UNIX_TIME_NOW,
 						'ip_address'			=> $this->_member->ip_address,
 						'browser'				=> substr( $this->_member->user_agent, 0, 200 ),
@@ -1065,7 +1065,7 @@ class publicSessions extends ips_MemberRegistry
 						'uagent_type'			=> $uAgent['uagent_type'],
 						'uagent_bypass'			=> intval( $uAgent['uagent_bypass'] ) );
 
-		$this->DB->force_data_type = array( 'member_name' => 'string' );
+		$this->DB->setDataType( 'member_name', 'string' );
 
 		$this->DB->insert( 'sessions', $data, true );
 
@@ -1193,11 +1193,11 @@ class publicSessions extends ips_MemberRegistry
 	 *
 	 * @access	protected
 	 * @param	string		Any extra WHERE stuff
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _destroySessions( $where='' )
 	{
-		$where .= ( $where ) ? ' OR ' : '';
+		$where = ( $where ) ? '(' . $where . ') OR ' : '';
 		$where .= 'running_time < ' . ( IPS_UNIX_TIME_NOW - $this->settings['session_expiration'] );
 
 		//-----------------------------------------
@@ -1297,11 +1297,11 @@ class publicSessions extends ips_MemberRegistry
 	/**
 	 * Kill This Session
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Session ID
 	 * @param	bool
 	 */
-	private function _killAuthorizeAttempt( $session_id, $session_data )
+	protected function _killAuthorizeAttempt( $session_id, $session_data )
 	{
 		$this->_failedAuthorizationSessionData = $session_data;
 		$this->session_dead_id	= $session_id;
@@ -1317,11 +1317,11 @@ class publicSessions extends ips_MemberRegistry
 	/**
 	 * Allow This Session
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Session ID
 	 * @param	bool
 	 */
-	private function _allowAuthorizeAttempt( $session_id, $session_data )
+	protected function _allowAuthorizeAttempt( $session_id, $session_data )
 	{
 		$this->session_data		= $session_data;
 		$this->session_id		= $this->session_data['id'];
@@ -1367,8 +1367,8 @@ class publicSessions extends ips_MemberRegistry
 
 			if ( ! $this->registry->isClassLoaded( 'userAgentFunctions' ) )
 			{
-				require_once( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php' );
-				$this->registry->setClass( 'userAgentFunctions', new userAgentFunctions( $this->registry ) );
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/useragents/userAgentFunctions.php', 'userAgentFunctions' );
+				$this->registry->setClass( 'userAgentFunctions', new $classToLoad( $this->registry ) );
 			}
 
 			$uAgent = $this->registry->getClass( 'userAgentFunctions' )->findUserAgentID( $this->_member->user_agent );
@@ -1385,6 +1385,9 @@ class publicSessions extends ips_MemberRegistry
 			{
 				$uAgent['uagent_bypass'] = 0;
 			}
+			
+			/* Update browser */
+			$uAgent['_browser'] = $this->_userAgent;
 		}
 		else
 		{
@@ -1408,29 +1411,21 @@ class publicSessions extends ips_MemberRegistry
 	 */
 	protected function _getLocationSettings()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
+		/* Init vars */
 		$return = array();
 
-		//-----------------------------------------
-		// MODULE?
-		//-----------------------------------------
-
+		/* Got an app? */
 		if ( IPS_APP_COMPONENT )
 		{
-			$filename = IPSLib::getAppDir(  IPS_APP_COMPONENT ) . '/extensions/coreExtensions.php';
-			$toload  = 'publicSessions__' . IPS_APP_COMPONENT;
-
-			if ( file_exists( $filename ) )
+			$filename = IPSLib::getAppDir( IPS_APP_COMPONENT ) . '/extensions/coreExtensions.php';
+			
+			if ( is_file( $filename ) )
 			{
-				require_once( $filename );
-
+				$toload = IPSLib::loadLibrary( $filename, 'publicSessions__' . IPS_APP_COMPONENT, IPS_APP_COMPONENT );
+				
 				if ( class_exists( $toload ) )
 				{
 					$loader = new $toload;
-
 					$return = $loader->getSessionVariables();
 				}
 			}
@@ -1438,7 +1433,7 @@ class publicSessions extends ips_MemberRegistry
 		
 		if( defined('NO_SESSION_UPDATE') AND NO_SESSION_UPDATE )
 		{
-			$this->do_update	= 0;
+			$this->do_update = 0;
 		}
 
 		return $return;
@@ -1454,7 +1449,49 @@ class publicSessions extends ips_MemberRegistry
 	{
 		return $this->_sessionsToKill;
 	}
+	
+	/**
+	 * Store an inline message
+	 * @param string $text
+	 */
+	public function setInlineMessage( $text )
+	{
+		$this->DB->insert( 'core_inline_messages', array( 'inline_msg_date'    => IPS_UNIX_TIME_NOW,
+														  'inline_msg_content' => $text ) );
+		
+		$inline_msg_id = $this->DB->getInsertId();
 
+		$this->addQueryKey( 'session_msg_id', $inline_msg_id );
+	}
+	
+	/**
+	 * Get an inline message
+	 * @return	string	The Message of course.
+	 */
+	public function getInlineMessage()
+	{
+		if ( ! empty( $this->session_data['session_msg_id'] ) )
+		{
+			if ( empty( $this->session_data['_inlineMsg'] ) )
+			{
+				$inlineMsg = $this->DB->buildAndFetch( array( 'select' => 'inline_msg_content',
+															  'from'   => 'core_inline_messages',
+															  'where'  => 'inline_msg_id=' . intval( $this->session_data['session_msg_id'] ) ) );
+				
+				if ( ! empty( $inlineMsg['inline_msg_content'] ) )
+				{
+					$this->session_data['_inlineMsg'] = $inlineMsg['inline_msg_content'];
+					
+					$this->addQueryKey( 'session_msg_id', 0 );
+					
+					return $this->session_data['_inlineMsg'];
+				}
+			}
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * Updates a session
 	 *
@@ -1462,7 +1499,7 @@ class publicSessions extends ips_MemberRegistry
 	 * @param	string		Session id
 	 * @param	int			Member ID
 	 * @param	array 		Array of information to update
-	 * @return	void		Updates session_data array and member data array
+	 * @return	@e void		Updates session_data array and member data array
 	 */
 	public function updateSession( $sessionID, $memberID, $data )
 	{
@@ -1535,7 +1572,7 @@ class publicSessions extends ips_MemberRegistry
 	 * classes are culled
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __myDestruct()
 	{
@@ -1551,7 +1588,7 @@ class publicSessions extends ips_MemberRegistry
 				{
 					if ( isset( $this->_queryOverride[ $sessionID ] ) AND is_array( $this->_queryOverride[ $sessionID ] ) AND count( $this->_queryOverride[ $sessionID ] ) )
 					{
-						foreach( $data as $field => $value )
+						foreach( $this->_queryOverride[ $sessionID ] as $field => $value )
 						{
 							if ( isset( $this->_queryOverride[ $sessionID ][ $field ] ) )
 							{
@@ -1560,7 +1597,7 @@ class publicSessions extends ips_MemberRegistry
 						}
 					}
 
-					$this->DB->force_data_type = array( 'member_name' => 'string' );
+					$this->DB->setDataType( 'member_name', 'string' );
 					$this->DB->update( 'sessions', $data, "id='" . $sessionID . "'", true );
 				}
 			}
diff --git a/upload/admin/sources/classes/session/sso.rename.php b/upload/admin/sources/classes/session/sso.rename.php
index c87e5eac..d53970b8 100644
--- a/upload/admin/sources/classes/session/sso.rename.php
+++ b/upload/admin/sources/classes/session/sso.rename.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Sample SSO Class
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		22nd Septmeber 2009
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7445 $
  *
  */
 
diff --git a/upload/admin/sources/classes/share/index.html b/upload/admin/sources/classes/share/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/share/index.html
+++ b/upload/admin/sources/classes/share/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/share/links.php b/upload/admin/sources/classes/share/links.php
index c130d85b..c47f5568 100644
--- a/upload/admin/sources/classes/share/links.php
+++ b/upload/admin/sources/classes/share/links.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Share links library.
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-10-07 22:31:51 -0400 (Fri, 07 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9588 $
  *
  */
 
@@ -25,8 +25,10 @@ class share_links
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -37,7 +39,7 @@ class share_links
 	/**
 	 * Plug in object
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
 	protected $_plugin;
@@ -48,7 +50,7 @@ class share_links
 	 * @access	public
 	 * @param	object		Registry
 	 * @param	string		Plug in key
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry, $plugin )
 	{
@@ -74,6 +76,9 @@ class share_links
 		{
 			return $e->getMessage();
 		}
+		
+		/* Verify moderator perms are set */
+		$this->memberData	= IPSMember::setUpModerator( $this->memberData );
 	}
 	
 	/**
@@ -105,14 +110,13 @@ class share_links
 				if ( $this->_plugin->requiresPermissionCheck( $data ) !== false )
 				{
 					$_file   = IPSLib::getAppDir( $data['data_app'] ) . '/extensions/coreExtensions.php';
-					$_class  = $data['data_app'] . 'ShareLinks';
 					$_result = false;
 					
 					/* Check for the file */
-					if ( file_exists( $_file ) )
+					if ( is_file( $_file ) )
 					{
 						/* Get the file */
-						require_once( $_file );
+						$_class = IPSLib::loadLibrary( $_file, $data['data_app'] . 'ShareLinks', $data['data_app'] );
 						
 						/* Check for the class */
 						if ( class_exists( $_class ) )
@@ -153,20 +157,18 @@ class share_links
 	/**
 	 * Init the plug in
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Plug in
 	 */
-	private function _initPlugin( $plugin='' )
+	protected function _initPlugin( $plugin='' )
 	{
-		$plugin = IPSText::alphanumericalClean( $plugin );
-		$parf   = IPS_ROOT_PATH . 'sources/classes/share/plugins/';
-		$clarse = 'sl_' . $plugin;
+		$_file = IPS_ROOT_PATH . 'sources/classes/share/plugins/' . IPSText::alphanumericalClean( $plugin ) . '.php';
 		
 		/* Goddit? */
-		if ( file_exists( $parf . $plugin . '.php' ) )
+		if ( is_file( $_file ) )
 		{
-			require_once( $parf . $plugin . '.php' );
-			$this->_plugin = new $clarse( $this->registry );
+			$classToLoad   = IPSLib::loadLibrary( $_file, 'sl_' . $plugin );
+			$this->_plugin = new $classToLoad( $this->registry );
 		}
 		else
 		{
@@ -262,8 +264,8 @@ class share_links
 														  'log_share_key'         => $this->_pluginKey,
 														  'log_data_app'	      => $urlParts['data_app'],
 														  'log_data_type'         => $urlParts['data_type'],
-														  'log_data_primary_id'   => $urlParts['data_primary_id'],
-														  'log_data_secondary_id' => $urlParts['data_secondary_id'] ) );
+														  'log_data_primary_id'   => intval($urlParts['data_primary_id']),
+														  'log_data_secondary_id' => intval($urlParts['data_secondary_id']) ) );
 														  
 		/* Rebuild caches */
 		$this->rebuildCaches();
@@ -334,11 +336,11 @@ class share_links
 	/**
 	 * Try and deconstruct the link via app specific processing
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Array or URL bits
 	 * @return	array		Array of request data or false
 	 */
-	private function _checkForApps( $url )
+	protected function _checkForApps( $url )
 	{
 		$app_cache = $this->cache->getCache('app_cache');
 		
@@ -350,14 +352,13 @@ class share_links
 			{
 				/* Setup */
 				$_file  = IPSLib::getAppDir( $app['app_directory'] ) . '/extensions/coreExtensions.php';
-				$_class = $app['app_directory'] . 'ShareLinks';
 					
 				/* Check for the file */
-				if( file_exists( $_file ) )
+				if( is_file( $_file ) )
 				{
 					/* Get the file */
-					require_once( $_file );
-
+					$_class = IPSLib::loadLibrary( $_file, $app['app_directory'] . 'ShareLinks', $app['app_directory'] );
+					
 					/* Check for the class */
 					if( class_exists( $_class ) )
 					{
@@ -386,20 +387,22 @@ class share_links
 	/**
 	 * Try and deconstruct the link if it's a FURRY FURL
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Incoming URL
 	 * @return	array		Array of request data or false
 	 */
-	private function _checkForFurl( $url )
+	protected function _checkForFurl( $url )
 	{
 		$_urlBits  = array();
 		$_toTest   = $url;
 		$templates = array();
 		
 		/* Grab FURL data... */
-		if ( ! IN_DEV AND file_exists( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' ) )
+		if ( ! IN_DEV AND is_file( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' ) )
 		{
-			require( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' );
+			$templates = array();
+			include( DOC_IPS_ROOT_PATH . 'cache/furlCache.php' );/*noLibHook*/
+			
 			$_seoTemplates = $templates;
 		}
 		else
@@ -411,16 +414,14 @@ class share_links
 			{
 				IPSLib::cacheFurlTemplates();
 			}
-			catch( Exception $e )
-			{
-			}
+			catch( Exception $e ) {}
 		}
 
 		if ( is_array( $_seoTemplates ) AND count( $_seoTemplates ) )
 		{ 
 			foreach( $_seoTemplates as $key => $data )
 			{
-				if ( ! isset( $data['in']['regex'] ) OR ! $data['in']['regex'] )
+				if ( empty( $data['in']['regex'] ) )
 				{
 					continue;
 				}
@@ -541,11 +542,11 @@ class share_links
 	/**
 	 * Explode a URL (foo=bar&baz=umm) into array( 'foo' => 'bar', .... )
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		URL
 	 * @return	array		Values
 	 */
-	private function _explodeUrl( $url )
+	protected function _explodeUrl( $url )
 	{
 		$url = str_replace( '&amp;', '&', $url );
 		$ret = array();
diff --git a/upload/admin/sources/classes/share/plugins/bobrdobr.php b/upload/admin/sources/classes/share/plugins/bobrdobr.php
index 2e72deb4..ea83940e 100644
--- a/upload/admin/sources/classes/share/plugins/bobrdobr.php
+++ b/upload/admin/sources/classes/share/plugins/bobrdobr.php
@@ -12,9 +12,9 @@
  *
  * @author 		$Author: matt $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @version		$Rev: 5746 $
  *
  */
diff --git a/upload/admin/sources/classes/share/plugins/buzz.php b/upload/admin/sources/classes/share/plugins/buzz.php
index 4862b0ca..99ad789a 100644
--- a/upload/admin/sources/classes/share/plugins/buzz.php
+++ b/upload/admin/sources/classes/share/plugins/buzz.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_buzz
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_buzz
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/delicious.php b/upload/admin/sources/classes/share/plugins/delicious.php
index 2bfce8e9..e5381abd 100644
--- a/upload/admin/sources/classes/share/plugins/delicious.php
+++ b/upload/admin/sources/classes/share/plugins/delicious.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_delicious
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_delicious
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/digg.php b/upload/admin/sources/classes/share/plugins/digg.php
index a340e294..01695343 100644
--- a/upload/admin/sources/classes/share/plugins/digg.php
+++ b/upload/admin/sources/classes/share/plugins/digg.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_digg
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_digg
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/download.php b/upload/admin/sources/classes/share/plugins/download.php
index d8bcc723..225d21ef 100644
--- a/upload/admin/sources/classes/share/plugins/download.php
+++ b/upload/admin/sources/classes/share/plugins/download.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_download
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_download
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/email.php b/upload/admin/sources/classes/share/plugins/email.php
index 1df20165..41a59a8d 100644
--- a/upload/admin/sources/classes/share/plugins/email.php
+++ b/upload/admin/sources/classes/share/plugins/email.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_email
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_email
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/facebook.php b/upload/admin/sources/classes/share/plugins/facebook.php
index 24926a7a..3d3271dc 100644
--- a/upload/admin/sources/classes/share/plugins/facebook.php
+++ b/upload/admin/sources/classes/share/plugins/facebook.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_facebook
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_facebook
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/googleplusone.php b/upload/admin/sources/classes/share/plugins/googleplusone.php
new file mode 100644
index 00000000..fb5f5f56
--- /dev/null
+++ b/upload/admin/sources/classes/share/plugins/googleplusone.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Twitter plug in for share links library.
+ * This is just the basic fallback twitter share, the front end has JS to do something more fancy
+ *
+ * Created by Matt Mecham
+ * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ *
+ */
+
+/* Class name must be in the format of:
+   sl_{key}
+   Where {key}, place with the value of: core_share_links.share_key
+ */
+class sl_googleplusone
+{
+	/**#@+
+	* Registry Object Shortcuts
+	*
+	* @access	protected
+	* @var		object
+	*/
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	/**
+	 * Construct.
+	 * @access	public
+	 * @param	object		Registry
+	 * @return	@e void
+	 */
+	public function __construct( $registry )
+	{
+		/* Make object */
+		$this->registry   =  $registry;
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Requires a permission check
+	 *
+	 * @access	public
+	 * @param	array		Data array
+	 * @return	boolean
+	 */
+	public function requiresPermissionCheck( $array )
+	{
+		return false;
+	}
+	
+	/**
+	 * Using a custom template bit?
+	 *
+	 * @return array	array( skinGroup, templateBitName )
+	 */
+	public function customOutput()
+	{
+		return array( 'global', 'googlePlusOneButton' ); 
+	}
+	
+	/**
+	 * Redirect to Google
+	 * Exciting, isn't it.
+	 *
+	 * @access	private
+	 * @param	string		Plug in
+	 */
+	public function share( $title, $url )
+	{
+		$title = IPSText::convertCharsets( $title, IPS_DOC_CHAR_SET, 'utf-8' );
+		$url   = "http://www.google.com/sharer.php?u=" . urlencode( $url );
+		
+		$this->registry->output->silentRedirect( $url );
+	}
+
+		
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/share/plugins/index.html b/upload/admin/sources/classes/share/plugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/share/plugins/index.html
+++ b/upload/admin/sources/classes/share/plugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/share/plugins/memori.php b/upload/admin/sources/classes/share/plugins/memori.php
index 75128326..048251b3 100644
--- a/upload/admin/sources/classes/share/plugins/memori.php
+++ b/upload/admin/sources/classes/share/plugins/memori.php
@@ -12,9 +12,9 @@
  *
  * @author 		$Author: matt $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @version		$Rev: 5746 $
  *
  */
diff --git a/upload/admin/sources/classes/share/plugins/print.php b/upload/admin/sources/classes/share/plugins/print.php
index 5e4ef665..797d4516 100644
--- a/upload/admin/sources/classes/share/plugins/print.php
+++ b/upload/admin/sources/classes/share/plugins/print.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_print
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_print
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/reddit.php b/upload/admin/sources/classes/share/plugins/reddit.php
index a4efd08f..40c7eec1 100644
--- a/upload/admin/sources/classes/share/plugins/reddit.php
+++ b/upload/admin/sources/classes/share/plugins/reddit.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_reddit
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_reddit
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/stumble.php b/upload/admin/sources/classes/share/plugins/stumble.php
index 1f54aa52..ab6cec23 100644
--- a/upload/admin/sources/classes/share/plugins/stumble.php
+++ b/upload/admin/sources/classes/share/plugins/stumble.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_stumble
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_stumble
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
diff --git a/upload/admin/sources/classes/share/plugins/twitter.php b/upload/admin/sources/classes/share/plugins/twitter.php
index c27bb68f..18e63260 100644
--- a/upload/admin/sources/classes/share/plugins/twitter.php
+++ b/upload/admin/sources/classes/share/plugins/twitter.php
@@ -2,20 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter plug in for share links library.
  * This is just the basic fallback twitter share, the front end has JS to do something more fancy
  *
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-01-25 13:21:25 +0000 (Mon, 25 Jan 2010) $
+ * Last Updated: $Date: 2011-05-23 14:26:17 -0400 (Mon, 23 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5746 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8868 $
  *
  */
 
@@ -31,8 +31,10 @@ class sl_twitter
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -44,7 +46,7 @@ class sl_twitter
 	 * Construct.
 	 * @access	public
 	 * @param	object		Registry
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry )
 	{
@@ -82,7 +84,7 @@ class sl_twitter
 	public function share( $title, $url )
 	{
 		$title = IPSText::convertCharsets( $title, IPS_DOC_CHAR_SET, 'utf-8' );
-		$url   = "http://twitter.com/home?status=" . urlencode( $title ) . '%20-%20' . urlencode( $url );
+		$url   = "http://twitter.com/intent/tweet?status=" . urlencode( $title ) . '%20-%20' . urlencode( $url );
 		
 		$this->registry->output->silentRedirect( $url );
 	}
diff --git a/upload/admin/sources/classes/share/plugins/vkontakte.php b/upload/admin/sources/classes/share/plugins/vkontakte.php
index 73bcccfa..ca5af99a 100644
--- a/upload/admin/sources/classes/share/plugins/vkontakte.php
+++ b/upload/admin/sources/classes/share/plugins/vkontakte.php
@@ -12,9 +12,9 @@
  *
  * @author 		$Author: matt $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @version		$Rev: 5746 $
  *
  */
diff --git a/upload/admin/sources/classes/skins/index.html b/upload/admin/sources/classes/skins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/skins/index.html
+++ b/upload/admin/sources/classes/skins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/skins/skinCaching.php b/upload/admin/sources/classes/skins/skinCaching.php
index d31de27b..ab1aa903 100644
--- a/upload/admin/sources/classes/skins/skinCaching.php
+++ b/upload/admin/sources/classes/skins/skinCaching.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin Caching Functions
- * Last Updated: $Date: 2010-10-14 06:42:56 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-09-16 15:32:18 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
  * Owner: Matt
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th July 2008
- * @version		$Revision: 6975 $
+ * @version		$Revision: 9503 $
  *
  */
 
@@ -30,7 +30,7 @@ if ( ! defined( 'IN_IPB' ) )
 */
 if ( ! class_exists( 'skinFunctions' ) )
 {
-	require_once( dirname( __FILE__ ) . '/skinFunctions.php' );
+	require_once( dirname( __FILE__ ) . '/skinFunctions.php' );/*noLibHook*/
 }
 
 class skinCaching extends skinFunctions
@@ -47,7 +47,9 @@ class skinCaching extends skinFunctions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 
 	/**
@@ -58,12 +60,30 @@ class skinCaching extends skinFunctions
 	 */	
 	protected $_cssNeedToRebuildArray = array();
 	
+	/**
+	 * Ignore children when recaching ...
+	 * @var boolean
+	 */
+	protected $_ignoreChildrenWhenRecaching = false;
+	
+	/**
+	 * Recache skin sets on shutdown
+	 * @var	bool
+	 */
+ 	protected $_recacheSkinsCache	= false;
+ 	
+ 	/**
+ 	 * Remember which skins we've already flagged for recache
+ 	 * @var	array
+ 	 */
+ 	protected $_flaggedForRecache	= array();
+	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -71,6 +91,24 @@ class skinCaching extends skinFunctions
 		parent::__construct( $registry );
 	}
 	
+	/**
+	 * Set ignore children when recaching
+	 * @param boolean $val
+	 */
+	public function setIgnoreChildrenWhenRecaching( $val )
+	{
+		$this->_ignoreChildrenWhenRecaching = ( ! empty( $val ) ) ? true : false;
+	}
+	
+	/**
+	 * Get ignore children when recaching
+	 * @return boolean
+	 */
+	public function getIgnoreChildrenWhenRecaching()
+	{
+		return $this->_ignoreChildrenWhenRecaching;
+	}
+	
 	/**
 	 * Rebuild Replacements cache
 	 *
@@ -121,6 +159,17 @@ class skinCaching extends skinFunctions
 				$_setID = $setID;
 			}
 			
+			/* If this is a child skin, just flag for recache */
+			if ( $_setID != $setID )
+			{
+				if ( $this->getIgnoreChildrenWhenRecaching() === false )
+				{
+					$this->flagSetForRecache( $_setID, true );
+				}
+				
+				continue;
+			}
+			
 			$__replacements = $this->fetchReplacements( $_setID );
 			$_replacements  = array();
 			
@@ -155,7 +204,7 @@ class skinCaching extends skinFunctions
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
-		
+	
 		$skinSetData = $this->fetchSkinData( $setID );
 		
 		$skinSetData['set_image_dir'] = ( $skinSetData['set_image_dir'] ) ? $skinSetData['set_image_dir'] : 'master';
@@ -182,6 +231,17 @@ class skinCaching extends skinFunctions
 	
 		foreach( $skinSetData['_childTree'] as $_setID )
 		{
+			/* If this is a child skin, just flag for recache */
+			if ( $_setID != $setID )
+			{
+				if ( $this->getIgnoreChildrenWhenRecaching() === false )
+				{
+					$this->flagSetForRecache( $_setID, true );
+				}
+				
+				continue;
+			}
+			
 			//-----------------------------------------
 			// Get template set titles
 			//-----------------------------------------
@@ -390,6 +450,11 @@ EOF;
 		
 		foreach( $phpKeep as $_setID => $data )
 		{
+			if ( ( $_setID != $setID ) && $this->getIgnoreChildrenWhenRecaching() === true )
+			{
+				continue;
+			}
+				
 			$_path = IPS_CACHE_PATH . 'cache/skin_cache/cacheid_' . $_setID;
 			
 			if ( is_dir( $_path ) )
@@ -512,6 +577,11 @@ EOF;
 		
 		foreach( $cssKeep as $_setID => $data )
 		{
+			if ( ( $_setID != $setID ) && $this->getIgnoreChildrenWhenRecaching() === true )
+			{
+				continue;
+			}
+			
 			$_path = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $_setID;
 			
 			if ( is_dir( $_path ) )
@@ -563,7 +633,7 @@ EOF;
 	 * @access	public
 	 * @param	int		[Optional Skin set id to rebuild. If no value given, all skin sets are rebuilt]
 	 * @param	boolean	Force rebuild regardless of if it requires it
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildCSS( $setID, $forceRebuild=FALSE )
 	{
@@ -590,7 +660,7 @@ EOF;
 	 */
 	public function rebuildCSSFlatFiles( $setID, $forceRebuild=FALSE )
 	{
-		$skinSetData 				= $this->fetchSkinData( $setID );
+		$skinSetData = $this->fetchSkinData( $setID );
 		
 		$this->_resetErrorHandle();
 		$this->_resetMessageHandle();
@@ -649,16 +719,26 @@ EOF;
 				continue;
 			}
 			
+			/* If this is a child skin, just flag for recache */
+			if ( $_setID != $setID )
+			{
+				if ( $this->getIgnoreChildrenWhenRecaching() === false )
+				{
+					$this->flagSetForRecache( $_setID, true );
+				}
+				
+				continue;
+			}
+			
 			IPSDebug::addLogMessage( "Attempting to write CSS " . $_setID . ", " . $_group . ".css", 'css' );
 			
 			$this->_writeCSSFile( $_setID, $_group, $_css );
 			
-			//-----------------------------------------
-			// Got any error messages?
-			//-----------------------------------------
-			
+			/* Any problems?  */
 			if ( $this->fetchErrorMessages() !== FALSE )
 			{
+				/* Flag as using inline */
+				$this->flagSetAsNonCachedCSS( $_setID );
 				return FALSE;
 			}
 			
@@ -717,6 +797,17 @@ EOF;
 			$_css			= $this->fetchCSS( $_setID );
 			$_skinSetData	= $this->fetchSkinData( $_setID );
 			
+			/* If this is a child skin, just flag for recache */
+			if ( $_setID != $setID )
+			{
+				if ( $this->getIgnoreChildrenWhenRecaching() === false )
+				{
+					$this->flagSetForRecache( $_setID, true );
+				}
+				
+				continue;
+			}
+			
 			foreach( $_css as $name => $css )
 			{
 				if ( ! in_array( $name, array_keys( $needToRebuild[ $_setID ] ) ) )
@@ -783,7 +874,7 @@ EOF;
 		//-----------------------------------------
 		// Update skin sets
 		//-----------------------------------------
-		
+	
 		if ( count( $cssSkinCollections ) )
 		{
 			foreach( $cssSkinCollections as $setID => $data )
@@ -800,6 +891,26 @@ EOF;
 		return TRUE;
 	}
 	
+	/**
+	 * Flag skin as not able to serve cached CSS
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
+	public function flagSetAsNonCachedCSS( $setId=null )
+	{
+		/* Update DB row */
+		if ( $setId !== null )
+		{
+			$this->DB->update( 'skin_collections', array( 'set_css_inline' => 1 ), 'set_id=' . intval( $setId ) );
+		}
+		
+		/* Build cache */
+		$this->rebuildSkinSetsCache();
+		
+		return TRUE;
+	}
+	
 	/**
 	 * Rebuild master replacements from cache/skin_cache/master_skin/_replacements.inc
 	 *
@@ -817,7 +928,7 @@ EOF;
 		// Master file exists?
 		//-----------------------------------------
 		
-		if ( ! file_exists( $dir . '/_replacements.inc' ) )
+		if ( ! is_file( $dir . '/_replacements.inc' ) )
 		{
 			return FALSE;
 		}
@@ -830,28 +941,47 @@ EOF;
 		{
 			$this->DB->delete( 'skin_replacements', "replacement_master_key='" . $setId . "'" );
 		}
+		else
+		{
+			$this->DB->delete( 'skin_replacements', "replacement_set_id='" . intval($setId) . "'" );
+		}
 		
 		//-----------------------------------------
 		// Grab file
 		//-----------------------------------------
 		
 		$replacements = array();
-		require( $dir . '/_replacements.inc' );
+		include( $dir . '/_replacements.inc' );/*noLibHook*/
 		
 		if ( !is_array($replacements) || !count($replacements) )
 		{
 			return FALSE;
 		}
 		
-		/* Insert... */
+		//-----------------------------------------
+		// Get proper set key/id
+		//-----------------------------------------
+		
+		$set_id		= ( is_numeric( $setId ) ) ? $setId : $this->fetchSetIdByKey( $setId );
+		$set_key	= '';
+		
+		if( $this->isMasterSet( $setId ) )
+		{
+			$set_key	= ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId;
+		}
+		
+		//-----------------------------------------
+		// Insert
+		//-----------------------------------------
+		
 		foreach( $replacements as $k => $v )
 		{
 			$messages[] = $this->lang->words['basicimportedpre'] . $k;
 			
 			$this->DB->insert( 'skin_replacements', array( 'replacement_key'        => $k,
 							   							   'replacement_content'    => $v,
-							   							   'replacement_master_key' => ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId,
-														   'replacement_set_id'     => 0,
+							   							   'replacement_master_key' => $set_key,
+														   'replacement_set_id'     => $set_id,
 														   'replacement_added_to'   => 0 ) );
 		}
 		
@@ -874,7 +1004,7 @@ EOF;
 	{
 		/* Set directory */
 		$setId		  = is_numeric( $setId ) ? intval( $setId ) : trim( $setId );
-		$cssDir   = DOC_IPS_ROOT_PATH . 'public/style_css/' . $this->remapData['css'][ $setId ];
+		$cssDir   = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/' . $this->remapData['css'][ $setId ];
 		$messages = array();
 		$css      = array();
 		
@@ -910,6 +1040,18 @@ EOF;
 			$css = $this->fetchCSS( $setId );
 		}
 		
+		//-----------------------------------------
+		// Set key and ID
+		//-----------------------------------------
+		
+		$set_id		= ( is_numeric( $setId ) ) ? $setId : $this->fetchSetIdByKey( $setId );
+		$set_key	= '';
+		
+		if( $this->isMasterSet( $setId ) )
+		{
+			$set_key	= ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId;
+		}
+		
 		//-----------------------------------------
 		// Recurse over the directory
 		//-----------------------------------------
@@ -923,36 +1065,36 @@ EOF;
 					
 					if ( substr( $_name, -4 ) == '.css' )
 					{
-						$cssName       = substr( $_name, 0, -4 );
-						$cssContent    = @file_get_contents( $cssDir . '/' . $_name );
-						$_css_added_to = 0;
-						$cssContent    = str_replace( array( "\r\n", "\r" ), "\n", $cssContent );
+						$cssName		= substr( $_name, 0, -4 );
+						$cssContent		= @file_get_contents( $cssDir . '/' . $_name );
+						$_css_added_to	= 0;
+						$cssContent		= str_replace( array( "\r\n", "\r" ), "\n", $cssContent );
 						
 						/* Encode */
-						$cssContent = IPSText::encodeForXml( $cssContent );
+						$cssContent		= IPSText::encodeForXml( $cssContent );
 					
-						$messages[] = $this->lang->words['basicimportedpre'] . $cssName;
+						$messages[]		= $this->lang->words['basicimportedpre'] . $cssName;
 							
-						$cssData    = $this->_CSS_fetchImportBlock( $cssContent );
-						$cssContent = $this->_CSS_fromFileToDB( $cssContent );
+						$cssData		= $this->_CSS_fetchImportBlock( $cssContent );
+						$cssContent		= $this->_CSS_fromFileToDB( $cssContent );
 						
 						/* 'Master' bit? */
 						if ( ! $css[ $cssName ] )
 						{
-							$_css_added_to = $setId;
+							$_css_added_to = $set_id;
 						}
 						
-						$this->DB->insert( 'skin_css', array( 'css_updated'    => time(),
-															  'css_set_id'     => ( is_numeric( $setId ) ) ? $setId : $this->fetchSetIdByKey( $setId ),
-															  'css_added_to'   => ( is_numeric( $_css_added_to ) ) ? $_css_added_to : $this->fetchSetIdByKey( $_css_added_to ),
-															  'css_app'        => $cssData['css_app'],
-															  'css_app_hide'   => intval( $cssData['css_app_hide'] ),
-															  'css_modules'	   => trim( $cssData['css_modules'] ),
-															  'css_position'   => intval( $cssData['css_position'] ),
-															  'css_attributes' => $cssData['css_attributes'],
-															  'css_master_key' => ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId,
-															  'css_group'      => $cssName,
-															  'css_content'    => $cssContent ) );
+						$this->DB->insert( 'skin_css', array( 'css_updated'		=> time(),
+															  'css_set_id'		=> $set_id,
+															  'css_added_to'	=> $_css_added_to,
+															  'css_app'			=> $cssData['css_app'],
+															  'css_app_hide'	=> intval( $cssData['css_app_hide'] ),
+															  'css_modules'		=> trim( $cssData['css_modules'] ),
+															  'css_position'	=> intval( $cssData['css_position'] ),
+															  'css_attributes'	=> $cssData['css_attributes'],
+															  'css_master_key'	=> $set_key,
+															  'css_group'		=> $cssName,
+															  'css_content'		=> $cssContent ) );
 					}
 				}
 			}
@@ -1029,6 +1171,18 @@ EOF;
 			$templates = $this->fetchTemplates( $setId, 'allTemplates' );
 		}
 		
+		//-----------------------------------------
+		// Set key and ID
+		//-----------------------------------------
+		
+		$set_id		= ( is_numeric( $setId ) ) ? $setId : $this->fetchSetIdByKey( $setId );
+		$set_key	= '';
+		
+		if( $this->isMasterSet( $setId ) )
+		{
+			$set_key	= ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId;
+		}
+		
 		/* Loop through the directory */
 		try
 		{
@@ -1058,10 +1212,10 @@ EOF;
 							continue;
 						}
 						
-						$farray    = explode( "\n", $fdata );
-						$functions = array();
-						$added	   = 0;
-						$updated   = 0;
+						$farray		= explode( "\n", $fdata );
+						$functions	= array();
+						$added		= 0;
+						$updated	= 0;
 						
 						foreach( $farray as $f )
 						{
@@ -1156,22 +1310,25 @@ EOF;
 							$content = IPSText::encodeForXml( $content );
 								
 							/* Build array */
-							$array = array( 'template_set_id'     => $setId,
+							$array = array( 'template_set_id'     => $set_id,
 											'template_group'      => $name,
 											'template_content'    => $content,
 											'template_name'       => $fname,
 											'template_data'       => trim($config[$fname]),
 											'template_updated'    => time(),
 											'template_removable'  => ( is_numeric( $setId ) AND $setId ) ? 1 : 0,
-											'template_master_key' => ( is_numeric( $setId ) ) ? $this->fetchSetKeyById( $setId ) : $setId,
-											'template_added_to'   => ( is_numeric( $setId ) ) ? intval( $setId ) : $this->fetchSetIdByKey( $setId ) );
+											'template_master_key' => $set_key,
+											'template_added_to'   => $set_id );
 							
-							if ( ! $setId OR ! $templates[ $name ][ strtolower( $fname ) ] )
+							if ( ! $setId )
 							{
 								$added++;
+
 								/* All new bits go to 'master' skin */
-								$array['template_set_id']   = 0;
-								$array['template_added_to'] = 0;
+								$array['template_set_id']		= 0;
+								$array['template_added_to']		= 0;
+								$array['template_master_key']	= 'root';
+
 								$this->DB->insert( 'skin_templates', $array );
 							}
 							else
@@ -1192,6 +1349,7 @@ EOF;
 				}
 			}
 		} catch ( Exception $e ) {}
+
 		/* Recache */
 		if ( is_numeric( $setId ) AND $setId )
 		{
@@ -1201,19 +1359,63 @@ EOF;
 			$this->cache->putWithCacheLib( 'Skin_Store_' . $setId, array(), 1 );
 		}
 		
+		if ( $set_key == 'mobile' )
+		{
+			$this->rebuildMobileSkinUserAgentsFromSetDataXml();
+		}
+		
 		/* Return */
 		$messages[] = $this->lang->words['cpltrebuildfromcaches'];
 		
 		return $messages;
 	}
 	
+	/**
+	 * Flag skin as needing recache
+	 *
+	 * @param	int		Set ID
+	 * @param	bool	Skip rebuild skin sets cache
+	 * @return	boolean
+	 */
+	public function flagSetForRecache( $setId=null, $skipRebuild=false )
+	{
+		/* If we're already flagged, just return
+			@link	http://community.invisionpower.com/tracker/issue-31472-skin-recaching-optimizations */
+		$_key	= md5( $setId . $skipRebuild );
+		
+		if( isset($this->_flaggedForRecache[ $_key ]) )
+		{
+			return true;
+		}
+		
+		$this->_flaggedForRecache[ $_key ]	= 1;
+		
+		/* Update DB row */
+		if ( $setId !== null )
+		{
+			$this->DB->update( 'skin_collections', array( 'set_updated' => -2 ), 'set_id=' . intval( $setId ) );
+		}
+		else
+		{
+			$this->DB->update( 'skin_collections', array( 'set_updated' => -2 ) );
+		}
+		
+		/* Build cache */
+		if( !$skipRebuild )
+		{
+			$this->rebuildSkinSetsCache();
+		}
+		
+		return TRUE;
+	}
+	
 	/**
 	 * Flag skin as needing recache
 	 *
 	 * @access	public
 	 * @return	boolean
 	 */
-	public function flagSetForRecache( $setId=null )
+	public function flagSetAsRecaching( $setId=null )
 	{
 		/* Update DB row */
 		if ( $setId !== null )
@@ -1231,14 +1433,33 @@ EOF;
 		return TRUE;
 	}
 	
+	
+	/**
+	 * We set a flag to rebuild the skin sets cache on shutdown.  We do it this way to ensure we only rebuild the cache once per page load.
+	 *
+	 * @link	http://community.invisionpower.com/tracker/issue-31472-skin-recaching-optimizations
+	 * @access	public
+	 * @return	boolean
+	 */
+	public function rebuildSkinSetsCache()
+	{
+		if( !$this->_recacheSkinsCache )
+		{
+			$this->_recacheSkinsCache	= true;
+			
+			register_shutdown_function( array( $this, '__rebuildSkinSetsCache' ) );
+		}
+	}
+	
 	/**
 	 * Rebuild skinsets cache in the cache_store table
 	 *
 	 * @access	public
 	 * @return	boolean
 	 */
-	public function rebuildSkinSetsCache()
+	public function __rebuildSkinSetsCache()
 	{
+		
 		//-----------------------------------------
 		// INIT
 		//-----------------------------------------
@@ -1325,7 +1546,7 @@ EOF;
 	{
 		/* Set directory */
 		$css	  = array();
-		$cssDir   = DOC_IPS_ROOT_PATH . 'public/style_css/' . $dir;
+		$cssDir   = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/' . $dir;
 		$messages = array();
 
 		if ( ! file_exists( $cssDir ) )
@@ -1409,7 +1630,7 @@ EOF;
 		
 		$setData = $this->fetchSkinData( $id );
 		
-		$path    = DOC_IPS_ROOT_PATH . 'public/style_css/' . $dir;
+		$path    = DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/' . $dir;
 		$msgs    = array();
 		
 		if ( ! isset( $setData['set_id'] ) )
@@ -1597,7 +1818,7 @@ EOF;
 				}
 				else
 				{
-				@chmod( $path . '/' . $_file, 0777 );
+					@chmod( $path . '/' . $_file, IPS_FILE_PERMISSION );
 					$msgs[] = $this->lang->words['basicwrittenpre'] . $path . '/' . $_file;
 				}
 			}
@@ -1613,11 +1834,11 @@ EOF;
 	/**
 	 * Creates CSS master block 
 	 * 
-	 * @access	private
+	 * @access	protected
 	 * @param	array  		Array  of CSS data from the DB
 	 * @return	string
 	 */
-	private function _masterWrite_createCssBlock( $data )
+	protected function _masterWrite_createCssBlock( $data )
 	{
 		$block = array();
 		
@@ -1663,11 +1884,11 @@ EOF;
 	/**
 	 * Wrap content for a master skin function
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Template bit data
 	 * @param	string		Content
 	 */
-	private function _masterWrite_format( $data )
+	protected function _masterWrite_format( $data )
 	{
 		$_open  = '<<<EOF';
 		$_close = 'EOF';
@@ -1693,11 +1914,11 @@ EOF;
 	/**
 	 * Wrap content for a master skin class
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Content
 	 * @param	string		Content
 	 */
-	private function _masterWrite_wrap( $content )
+	protected function _masterWrite_wrap( $content )
 	{
 		$_date  = gmdate( 'r' );
 		$return = <<<EOF
@@ -1721,7 +1942,7 @@ EOF;
 	 * @param	int			Skin set ID
 	 * @param	string		Group  Name
 	 * @param	string		CSS content
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _writeCSSFile( $setID, $css_group, $css_content )
 	{
@@ -1744,7 +1965,7 @@ EOF;
 
 				if ( ! is_dir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID ) )
 				{
-					if ( ! @ mkdir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID, 0777 ) )
+					if ( ! @ mkdir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID, IPS_FOLDER_PERMISSION ) )
 					{
 						$this->_addErrorMessage( sprintf( $this->lang->words['couldnotcreatecssdir'], $setID ) );
 						return $this->_errorMsgs;
@@ -1752,7 +1973,7 @@ EOF;
 					else
 					{
 						@file_put_contents( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID . '/index.html', '' );
-						@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID, 0777 );
+						@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID, IPS_FOLDER_PERMISSION );
 						$good_to_go = 1;
 					}
 				}
@@ -1763,7 +1984,7 @@ EOF;
 						$this->_addErrorMessage( sprintf( $this->lang->words['cssdirnotwritaaaable'], $setID ) );
 						$good_to_go = 0;
 					}
-					else if ( file_exists( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID.'/'.$css_group.'.css' ) )
+					else if ( is_file( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID.'/'.$css_group.'.css' ) )
 					{
 						if ( is_writable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID.'/'.$css_group.'.css' ) !== TRUE )
 						{
@@ -1803,7 +2024,7 @@ EOF;
 			{
 				fwrite( $FH, $css_content, strlen($css_content) );
 				fclose( $FH );
-				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID.'/'.$css_group.'.css', 0777 );
+				@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_'.$setID.'/'.$css_group.'.css', IPS_FILE_PERMISSION );
 
 				$this->_addMessage( $this->lang->words['basicwrittenpre']. "skin_cache/css_{$setID}/{$css_group}.css" );
 			}
@@ -1842,7 +2063,7 @@ EOF;
 				
 				if ( ! is_dir( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID ) )
 				{
-					if ( ! @ mkdir( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID, 0777 ) )
+					if ( ! @ mkdir( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID, IPS_FOLDER_PERMISSION ) )
 					{
 						$this->_addErrorMessage( sprintf( $this->lang->words['fatalnotemplatew'], $setID ) );
 						return;
@@ -1850,13 +2071,13 @@ EOF;
 					else
 					{
 						@file_put_contents( IPS_CACHE_PATH.'cache/skin_cache/cacheid_' . $setID . '/index.html', '' );
-						@chmod( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID, 0777 );
+						@chmod( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID, IPS_FOLDER_PERMISSION );
 						$good_to_go = 1;
 					}
 				}
 				else
 				{
-					if ( file_exists( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID.'/'.$groupName.'.php' ) )
+					if ( is_file( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID.'/'.$groupName.'.php' ) )
 					{
 						if ( IPSLib::isWritable( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID.'/'.$groupName.'.php' ) !== TRUE )
 						{
@@ -1890,7 +2111,7 @@ EOF;
 			{
 				fwrite( $FH, $content, strlen($content) );
 				fclose( $FH );
-				@chmod( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID.'/'.$groupName.'.php', 0777 );
+				@chmod( IPS_CACHE_PATH.'cache/skin_cache/cacheid_'.$setID.'/'.$groupName.'.php', IPS_FILE_PERMISSION );
 				
 				$this->_addMessage( $this->lang->words['basicwrittenpre'] . "skin_cache/cacheid_{$setID}/{$groupName}.php" );
 			}
@@ -2009,6 +2230,9 @@ EOF;
 			}
 		}
 		
+		/* remove phpdoc style comments */
+		$cssContent = preg_replace( '#/\*\*(\s+?)(.+?)\n(\s+?)?\*/#s', '', $cssContent );
+		
 		$cssContent = preg_replace( '#url\((\"|\')?.+?style_images/([\d\w]+?)/#i', "url(\\1{style_images_url}/", $cssContent );
 		$cssContent = preg_replace( '#url\((\"|\')?/style_images/([\d\w]+?)#i'  , "url(\\1{style_images_url}/", $cssContent );
 		
@@ -2066,13 +2290,13 @@ EOF;
 	/**
 	 * Determine which CSS files need rebuilding
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array 		Array of child skins (including current setID)
 	 * @param	int 		Set ID we're recaching
 	 * @param	boolean 	Force all css sets to recache
 	 * @return	array 		Array of items to rebuild
 	 */
-	private function _CSSNeedToRebuild( $childTree, $setID, $forceRebuild=FALSE )
+	protected function _CSSNeedToRebuild( $childTree, $setID, $forceRebuild=FALSE )
 	{
 		//-----------------------------------------
 		// Already been 'ere?
@@ -2088,9 +2312,28 @@ EOF;
 		$needToRebuild	= array();
 		
 		//-----------------------------------------
-		// Fetch cached CSS data
+		// Fetch cached CSS data - need to add parent tree and select parent css first
 		//-----------------------------------------
-
+		
+		/* Do we need a parent? */
+		$setData = $this->fetchSkinData( $setID );
+	
+		if ( count( $setData['_parentTree'] ) )
+		{
+			/* Allow parent data to be overwritten by child data */
+			$this->DB->build( array( 'select' => '*',
+								 	 'from'   => 'skin_cache',
+								 	 'where'  => "cache_type='css' AND cache_set_id IN (" . implode( ',', $setData['_parentTree'] ) . ')' ) );
+									
+			$this->DB->execute();
+			
+			while( $row = $this->DB->fetch() )
+			{
+				$row['cache_content'] = md5( $row['cache_content'] );
+				$cachedCSS[ $row['cache_set_id'] ][ $row['cache_value_1'] ] = $row;
+			}
+		}
+		
 		$this->DB->build( array( 'select' => '*',
 								 'from'   => 'skin_cache',
 								 'where'  => "cache_type='css' AND cache_set_id IN (" . implode( ',', $childTree ) . ')' ) );
@@ -2120,6 +2363,12 @@ EOF;
 			$thisCSS[ $row['css_set_id'] ][ $row['css_group'] ] = $row;
 		}
 		
+		/* Add in parent skins */
+		if ( count( $setData['_parentTree'] ) )
+		{
+			$childTree = array_merge( $childTree, $setData['_parentTree'] );
+		}
+		
 		//-----------------------------------------
 		// First off, any caches missing?
 		//-----------------------------------------
@@ -2198,10 +2447,34 @@ EOF;
 						/* This CSS inherits our skin set, so recache */
 						$needToRebuild[ $_setID ][ $group ] = 1;
 					}
+					
+					/* Now lets see if there are any parent CSS that need to be added */
+					if ( count( $setData['_parentTree'] ) )
+					{
+						foreach( $setData['_parentTree'] as $id )
+						{
+							if ( $cacheData['cache_key_3'] == 'setBy' && $cacheData['cache_value_3'] == $id )
+							{ 
+								/* Add to current set id */
+								$needToRebuild[ $setID ][ $group ] = 1;
+							}
+						}
+					}
 				}
 			}
 		}
 		
+		/* Finally, we don't want to recache parents so remove them */
+		if ( count( $setData['_parentTree'] ) )
+		{
+			foreach( $setData['_parentTree'] as $id )
+			{
+				if ( is_array( $needToRebuild[ $id ] ) )
+				{
+					unset( $needToRebuild[ $id ] );
+				}
+			}
+		}
 
 		$this->_cssNeedToRebuildArray[ $setID ] = $needToRebuild;
 		
diff --git a/upload/admin/sources/classes/skins/skinDifferences.php b/upload/admin/sources/classes/skins/skinDifferences.php
index 876c17c4..3def64a5 100644
--- a/upload/admin/sources/classes/skins/skinDifferences.php
+++ b/upload/admin/sources/classes/skins/skinDifferences.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin Functions
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Owner: Matt
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6854 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -39,7 +39,9 @@ class skinDifferences extends skinCaching
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -52,12 +54,12 @@ class skinDifferences extends skinCaching
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
 		/* Make diff class object */
-		require_once( IPS_KERNEL_PATH . 'classDifference.php' );
+		require_once( IPS_KERNEL_PATH . 'classDifference.php' );/*noLibHook*/
 		$this->classDifference         = new classDifference();
 		$this->classDifference->method = 'PHP';
 		
@@ -631,7 +633,7 @@ class skinDifferences extends skinCaching
 		$sessions = array();
 		
 		/* Fetch set up class */
-		require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );
+		require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
 		
 		/* Fetch version numbers */
 		$versions = IPSSetUp::fetchXmlAppVersions('core');
@@ -874,7 +876,7 @@ class skinDifferences extends skinCaching
 		if ( $session['merge_id']  AND $parse === true )
 		{
 			/* Fetch set up class */
-			require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );
+			require_once( IPS_ROOT_PATH . "setup/sources/base/setup.php" );/*noLibHook*/
 			
 			/* Fetch version numbers */
 			$versions = IPSSetUp::fetchXmlAppVersions('core');
diff --git a/upload/admin/sources/classes/skins/skinFunctions.php b/upload/admin/sources/classes/skins/skinFunctions.php
index 315ae661..4c0e23d9 100644
--- a/upload/admin/sources/classes/skins/skinFunctions.php
+++ b/upload/admin/sources/classes/skins/skinFunctions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin Functions
- * Last Updated: $Date: 2010-10-13 14:43:52 -0400 (Wed, 13 Oct 2010) $
+ * Last Updated: $Date: 2011-10-14 10:25:10 -0400 (Fri, 14 Oct 2011) $
  * </pre>
  *
  * Owner: Matt
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6972 $
+ * @version		$Revision: 9619 $
  *
  */
 
@@ -39,7 +39,9 @@ class skinFunctions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 
 	/**
@@ -54,26 +56,26 @@ class skinFunctions
 	 * Template count
 	 * Maintains an array: [skin_set_id][group_name][count]
 	 *
-	 * @access private
+	 * @access protected
 	 * @var    array
 	 */
-	private $_templateCount;
+	protected $_templateCount;
 
 	/**
 	 * Error handle
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_errorMsgs = array();
+	protected $_errorMsgs = array();
 
 	/**
 	 * Message handle
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_generalMsgs = array();
+	protected $_generalMsgs = array();
 	
 	/**
 	 * IN_DEV remap data
@@ -85,16 +87,16 @@ class skinFunctions
 	
 	/**
 	 * Set cache
-	 * @var private
+	 * @var protected
 	 */
-	private $_seenSet = array();
+	protected $_seenSet = array();
 	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -127,7 +129,7 @@ class skinFunctions
 		// Load tier class and init it
 		//-----------------------------------------
 
-		require_once( IPS_ROOT_PATH . 'sources/classes/tiers/recursiveTiers.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/tiers/recursiveTiers.php' );/*noLibHook*/
 
 		$this->recursiveTiers = new recursiveTiers( $registry, array(   'sqlPrimaryID'	=> 'set_id',
 																		'sqlParentID'	=> 'set_parent_id',
@@ -148,6 +150,32 @@ class skinFunctions
 		return $this->recursiveTiers;
 	}
 	
+	/**
+	 * Make this skin default
+	 * @param int $set_id
+	 */
+	public function makeDefault( $set_id )
+	{
+		$setData = $this->fetchSkinData( $set_id, true );
+		
+		/* Make all others non default */
+		$this->DB->update( 'skin_collections', array( 'set_is_default' => 0 ), 'set_id != ' . $set_id . ' AND set_output_format=\'' . $setData['set_output_format'] . '\'' );
+		
+		/* Attempt to see if we have any other skin called 'default' */
+		/* Not using this currently as it causes complications in other areas */
+		/*
+		$default = $this->DB->buildAndFetch( array( 'select' => 'set_id', 
+													'from'   => 'skin_collections',
+													'where'  => 'set_key=\'default\' AND set_output_format=\'' . $setData['set_output_format'] . '\'' ) );
+		if ( $set_id != $default['set_id'] )
+		{
+			$this->DB->update( 'skin_collections', array( 'set_key' => IPS_UNIX_TIME_NOW ), 'set_id = ' . $default['set_id'] );
+		}
+		*/
+		/* Make this default */
+		$this->DB->update( 'skin_collections', array( 'set_is_default' => 1/*, 'set_key' => 'default'*/ ), 'set_id = ' . $set_id . ' AND set_output_format=\'' . $setData['set_output_format'] . '\'' );
+	}
+	
 	/**
 	 * Fetch highest order
 	 *
@@ -194,7 +222,7 @@ class skinFunctions
 		else
 		{
 			$REMAP = array();
-			require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );
+			require( DOC_IPS_ROOT_PATH . 'cache/skin_cache/masterMap.php' );/*noLibHook*/
 			
 			if ( is_array($REMAP) && count($REMAP) )
 			{
@@ -207,13 +235,14 @@ class skinFunctions
 
 	/**
 	 * Returns a skin set ID based on a key
-	 * @param string $key
+	 * @param string 	$key
+	 * @param boolean	$ignoreMasterKeys
 	 */
-	public function fetchSetIdByKey( $key )
+	public function fetchSetIdByKey( $key, $ignoreMasterKeys=false )
 	{
 		$masterKeys = $this->fetchMasterKeys();
 		
-		if ( in_array( $key, $masterKeys ) )
+		if ( in_array( $key, $masterKeys ) && $ignoreMasterKeys === false )
 		{
 			/* Default master keys are always 0 */
 			return 0;
@@ -253,6 +282,19 @@ class skinFunctions
 		return ( $this->_seenSet[ 'i-' . $id ]['set_key'] ) ? $this->_seenSet[ 'i-' . $id ]['set_key'] : 0;
 	}
 	
+	/**
+	 * Determine if the skin set is a "master" set
+	 *
+	 * @param	mixed	$id		Skin set key or skin set id
+	 * @return	bool	True if this is a master set, otherwise false
+	 */
+	public function isMasterSet( $id )
+	{
+		$key	= is_numeric($id) ? $this->fetchSetKeyById( $id ) : $id;
+		
+		return in_array( $key, $this->remapData['masterKeys'] );
+	}
+	
 	/**
 	 * Search template bits
 	 *
@@ -418,7 +460,7 @@ class skinFunctions
 	 * Reset error handle
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _resetErrorHandle()
 	{
@@ -428,9 +470,9 @@ class skinFunctions
 	/**
 	 * Add an error message
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Error message to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _addErrorMessage( $error )
 	{
@@ -453,7 +495,7 @@ class skinFunctions
 	 * Reset error handle
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _resetMessageHandle()
 	{
@@ -465,7 +507,7 @@ class skinFunctions
 	 *
 	 * @access	protected
 	 * @param	string		Error message to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _addMessage( $error )
 	{
@@ -489,7 +531,7 @@ class skinFunctions
 	 *
 	 * @access	public
 	 * @param	string		Name of skin file
-	 * @return	void		Evals the skin to add the class in memory
+	 * @return	@e void		Evals the skin to add the class in memory
 	 */
 	public function loadMasterSkinTemplate( $name, $id )
 	{
@@ -502,7 +544,7 @@ class skinFunctions
 		
 		$_dir = $this->remapData['templates'][ $_id ];
 	
-		if( ! file_exists(IPS_CACHE_PATH."cache/skin_cache/" . $_dir . "/".$name.".php") )
+		if( ! is_file(IPS_CACHE_PATH."cache/skin_cache/" . $_dir . "/".$name.".php") )
 		{
 			return;
 		}
@@ -526,9 +568,9 @@ class skinFunctions
 			eval($toeval);
 			$result = ob_get_contents();
 		 	ob_end_clean();
-	
+
 			if ( strstr( $result, "Parse error" ) OR strstr( $result, 'Catchable fatal error:' ) OR $showme == $name )
-			{
+			{	
 				IPSDebug::showTemplateError( $result, $toeval );
 			}
 		}
@@ -573,13 +615,14 @@ class skinFunctions
 	 *
 	 * @access	public
 	 * @param	int		Skin set ID
+	 * @param	bool	Force, even if it is not removable
 	 * @return	boolean	(True OK to remove, false NOT OK to remove)
 	 */
-	public function removeSet( $setID )
+	public function removeSet( $setID, $force=false )
 	{
 		$skinSetData  = $this->fetchSkinData( $setID );
 
-		if ( $this->canRemoveSet( $setID ) !== TRUE )
+		if ( $force !== TRUE AND $this->canRemoveSet( $setID ) !== TRUE )
 		{
 			return FALSE;
 		}
@@ -612,10 +655,13 @@ class skinFunctions
 		$this->DB->delete( 'skin_url_mapping', 'map_skin_set_id=' . $setID );
 
 		/* Delete CSS Files */
-		$this->registry->adminFunctions->removeDirectory( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID );
+		$classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . '/classFileManagement.php', 'classFileManagement' );
+		$fileManagement	= new $classToLoad();
+
+		$fileManagement->removeDirectory( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_css/css_' . $setID );
 
 		/* Delete PHP Cache Files */
-		$this->registry->adminFunctions->removeDirectory( IPS_CACHE_PATH . 'cache/skin_cache/cacheid_' . $setID );
+		$fileManagement->removeDirectory( IPS_CACHE_PATH . 'cache/skin_cache/cacheid_' . $setID );
 		
 		/* Delete any diff/merge sessions */
 		$this->DB->build( array( 'select' => '*',
@@ -630,7 +676,23 @@ class skinFunctions
 			$this->DB->delete('skin_merge_session', 'merge_id=' . $row['merge_id'] );
 			$this->DB->delete('skin_merge_changes', 'change_session_id=' . $row['merge_id'] );
 		}
+
+		/* Generator stuff */
+		$this->DB->build( array( 'select' => '*',
+								 'from'   => 'skin_generator_sessions',
+								 'where'  => 'sg_skin_set_id=' . $setID ) );
 								 
+		$o = $this->DB->execute();
+		
+		while( $row = $this->DB->fetch( $o ) )
+		{
+			/* Delete 'em */
+			$this->DB->delete('skin_generator_sessions', 'sg_session_id=' . $row['sg_session_id'] );
+			
+			IPSMember::save( $row['sg_member_id'], array( 'core' => array( 'bw_using_skin_gen' => 0 ) ) );
+		}
+		
+		
 		/* Rebuild Tree Information */
 		$this->rebuildTreeInformation();
 
@@ -868,8 +930,8 @@ class skinFunctions
 		//-----------------------------------------
 
 		$replacement = $this->DB->buildAndFetch( array( 'select' => '*',
-													   		   'from'   => 'skin_replacements',
-													   		   'where'  => 'replacement_id=' . $replacementID ) );
+													    'from'   => 'skin_replacements',
+													   	'where'  => 'replacement_id=' . $replacementID ) );
 
 		if ( ! $replacement['replacement_id'] )
 		{
@@ -885,8 +947,8 @@ class skinFunctions
 			if ( $replacement['replacement_key'] != $replacement_key )
 			{
 				$replacementTest = $this->DB->buildAndFetch( array( 'select' => '*',
-															   			   'from'   => 'skin_replacements',
-																		   'where'  => 'replacement_set_id=' . $setID . ' AND replacement_key=\'' . $replacement_key . '\'' ) );
+															   		'from'   => 'skin_replacements',
+																	'where'  => 'replacement_set_id=' . $setID . ' AND replacement_key=\'' . $replacement_key . '\'' ) );
 
 				if ( $replacementTest['replacement_id'] )
 				{
@@ -1033,8 +1095,8 @@ class skinFunctions
 		//-----------------------------------------
 
 		$replacement = $this->DB->buildAndFetch( array( 'select' => '*',
-													   		   'from'   => 'skin_replacements',
-													   		   'where'  => 'replacement_id=' . $replacementID ) );
+													    'from'   => 'skin_replacements',
+													   	'where'  => 'replacement_id=' . $replacementID ) );
 
 		if ( ! $replacement['replacement_id'] )
 		{
@@ -1123,7 +1185,8 @@ class skinFunctions
 		}
 		else
 		{		
-			$skinSetData = $this->fetchSkinData( $setID );
+			$skinSetData				= $this->fetchSkinData( $setID );
+			$skinSetData['_isMaster']	= $skinSetData['_isMaster'] ? $skinSetData['_isMaster'] : 0;
 		}
 		
 		/* Did we get a skin set? */
@@ -1235,7 +1298,7 @@ class skinFunctions
 
 		$css['_actualSetID']      = $css['css_set_id'];
 		$css['_belongsSetID']     = $setID;
-		$css['_isMaster']		  = ( $css['css_master_key'] ) ? true : false;
+		$css['_isMaster']		  = ( $css['css_master_key'] ) ? 1 : 0;
 		//$css['_css_content']      = $css['css_content'];
 
 		//-----------------------------------------
@@ -1280,7 +1343,13 @@ class skinFunctions
 		$setID        = intval( $setID );
 		$css_group    = str_replace( '.css', '', IPSText::alphanumericalClean( $css_group ) );
 		$css_position = intval( $css_position );
-
+		
+		/* Make sure skingen is always on top */
+		if ( $css_group != 'ipb_skingen' )
+		{
+			$css_position = ( $css_position >= 999 ) ? 998 : $css_position;
+		}
+		
 		//-----------------------------------------
 		// Get skin data
 		//-----------------------------------------
@@ -1375,7 +1444,13 @@ class skinFunctions
 		$css_group    = str_replace( '.css', '', IPSText::alphanumericalClean( $css_group ) );
 		$css_position = intval( $css_position );
 		$_goClean     = 0;
-
+		
+		/* Make sure skingen is always on top */
+		if ( $css_group != 'ipb_skingen' )
+		{
+			$css_position = ( $css_position >= 999 ) ? 998 : $css_position;
+		}
+		
 		//-----------------------------------------
 		// Fetch template data
 		//-----------------------------------------
@@ -1579,7 +1654,7 @@ class skinFunctions
 
 		return $cssData;
 	}
-
+	
 	/**
 	 * Fetch Templates from the tree
 	 *
@@ -1623,7 +1698,8 @@ class skinFunctions
 		}
 		else
 		{		
-			$skinSetData = $this->fetchSkinData( $setID );
+			$skinSetData				= $this->fetchSkinData( $setID );
+			$skinSetData['_isMaster']	= $skinSetData['_isMaster'] ? $skinSetData['_isMaster'] : 0;
 		}
 		
 		/* Did we get a skin set? */
@@ -1848,7 +1924,7 @@ class skinFunctions
 		$template['_belongsSetID']     = $setID;
 		$template['_template_content'] = $template['template_content'];
 		$template['_template_data']    = $template['template_data'];
-		$template['_isMaster']		   = ( $template['template_master_key'] ) ? true : false;
+		$template['_isMaster']		   = ( $template['template_master_key'] ) ? 1 : 0;
 
 		//-----------------------------------------
 		// Update content for editing
@@ -2047,7 +2123,11 @@ class skinFunctions
 		//-----------------------------------------
 		// Same template set?
 		//-----------------------------------------
-
+		
+		/* @todo - 'root' is almost certainly what we want but we *should* write a method that traverses up the tree
+		 * from this set ID and looks for the master key of the root set. Especially important if we add any future
+		 * output engines.
+		 */
 		$this->DB->insert( 'skin_templates', array( 'template_set_id'      => 0,
 													'template_group'       => $template_group,
 													'template_content'     => $template_content,
@@ -2057,7 +2137,8 @@ class skinFunctions
 													'template_user_edited' => 1,
 													'template_user_added'  => 1,
 													'template_removable'   => 1,
-													'template_updated'     => time() ) );
+													'template_updated'     => time(),
+													'template_master_key'  => 'root' ) );
 
 		$template_id_new = $this->DB->getInsertId();
 
@@ -2169,6 +2250,12 @@ class skinFunctions
 			# Update count
 			$this->_templateCount[ $setID ][ $template['template_group'] ]['count']++;
 		}
+		
+		/* If this is a user-added template bit and we're editing it in the same skin, update master */
+		if ( $template['template_id'] && $template['template_user_added'] && $template['template_added_to'] == $setID )
+		{
+			$this->DB->update( 'skin_templates', array( 'template_content' => $template_content ), "template_set_id=0 AND template_group='" . $template['template_group'] . "' AND template_name='" . $template['template_name'] . "'" );
+		}
 
 		//-----------------------------------------
 		// Recache
@@ -2182,6 +2269,82 @@ class skinFunctions
 
 		return $template_id_new;
 	}
+	
+	/**
+	 * renames a template title
+	 * @param int $templateId
+	 * @param string $newName
+	 */
+	public function renameTemplateName( $templateId, $newName )
+	{
+		$template  = $this->fetchTemplateBitForEdit( $templateId, 0 );
+		$skinSet   = $this->fetchSkinData( $template['template_set_id'] );
+		$okToSave  = true;
+		$masterKey = 'root';
+		
+		$update   = array( 'template_name' => $newName );
+		
+		if ( ( $template['template_set_id'] == $template['template_added_to'] ) )
+		{
+			$masterTemplates = $this->fetchTemplates( $masterKey, 'allNoContent', $template['template_group'] );
+			
+			if ( isset( $masterTemplates[ $template['template_group'] ][ $newName ] ) )
+			{
+				/* Added by webdav, now attempting to rename */
+				$update['template_added_to']   = 0;
+				$update['template_master_key'] = $masterKey;
+			}
+		}
+		
+		if ( ! $template['template_id'] OR $template['_isMaster'] )
+		{
+			$okToSave = false;
+		}
+		
+		if ( $okToSave )
+		{
+			$this->DB->update( 'skin_templates', $update, 'template_name=\'' . $this->DB->addSlashes( $template['template_name'] ) . '\' AND template_group=\'' . $this->DB->addSlashes( $template['template_group'] ) . '\'' );
+		}
+		
+		/* rebuild */
+		$this->rebuildPHPTemplates( $template['template_set_id'], $template['template_group'] );
+	}
+	
+	/**
+	 * renames a css title
+	 * @param int $cssId
+	 * @param string $newName
+	 */
+	public function renameCssName( $cssId, $newName )
+	{
+		$template = $this->fetchCssForEdit( $cssId, 0 );
+		$okToSave = true;
+		$update   = array( 'css_group' => $newName );
+		
+		if ( ( $template['css_set_id'] == $template['css_added_to'] ) )
+		{
+			$masterCss = $this->fetchCSS( 'root', false );
+			
+			if ( isset( $masterCss[ $newName ] ) )
+			{
+				/* Added by webdav, now attempting to rename */
+				$update['css_added_to'] = 0;
+			}
+		}
+		
+		if ( ! $template['css_id'] OR $template['_isMaster'] )
+		{
+			$okToSave = false;
+		}
+		
+		if ( $okToSave )
+		{
+			$this->DB->update( 'skin_css', $update, 'css_group=\'' . $this->DB->addSlashes( $template['css_group'] ) . '\'' );
+		}
+		
+		/* rebuild */
+		$this->rebuildCSS( $template['css_set_id'] );
+	}	
 
 	/**
 	 * Fetch image directories from the file system
@@ -2304,7 +2467,7 @@ class skinFunctions
 	{
 		if ( @mkdir( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_images/' . $dir ) )
 		{
-			@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_images/' . $dir, 0777 );
+			@chmod( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_images/' . $dir, IPS_FOLDER_PERMISSION );
 			return TRUE;
 		}
 	}
@@ -2357,13 +2520,13 @@ class skinFunctions
 						continue;
 					}
 					
-					if( ! file_exists( $path . '/' . $_name . '/conf.php' ) )
+					if( ! is_file( $path . '/' . $_name . '/conf.php' ) )
 					{
 						continue;
 					}
 					
 					$config = array();
-					require( $path . '/' . $_name . '/conf.php' );
+					require( $path . '/' . $_name . '/conf.php' );/*noLibHook*/
 					
 					$formats[ $_name ] = $config;
 				}
@@ -2413,7 +2576,7 @@ class skinFunctions
 				foreach( $hooks as $tplHook )
 				{
 					/* Check for hook file */
-					if( file_exists( DOC_IPS_ROOT_PATH . 'hooks/' . $tplHook['filename'] ) )
+					if( is_file( IPS_HOOKS_PATH . $tplHook['filename'] ) )
 					{
 						$tplHook['_commentTag'] = $tplHook['type'] . '.' . $skinGroup . '.' . $tplHook['skinFunction'] . '.' . $tplHook['id'] . '.' . $tplHook['position'];
 						$myHooks[ $skinGroup ][] = $tplHook;
@@ -2550,19 +2713,19 @@ class skinFunctions
 		$setId  = intval( $setId );
 		
 		/* Templates */
-		if ( isset( $which['templates'] ) AND $which['templates'] )
+		if ( !empty( $which['templates'] ) )
 		{
 			$this->DB->delete( 'skin_templates', 'template_set_id=' . $setId );
 		}
 		
 		/* CSS */
-		if ( isset( $which['css'] ) AND $which['css'] )
+		if ( !empty( $which['css'] ) )
 		{
 			$this->DB->delete( 'skin_css', 'css_set_id=' . $setId );
 		}
 		
 		/* Replacements */
-		if ( isset( $which['replacements'] ) AND $which['replacements'] )
+		if ( !empty( $which['replacements'] ) )
 		{
 			$this->DB->delete( 'skin_replacements', 'replacement_set_id=' . $setId );
 		}
@@ -2675,13 +2838,13 @@ class skinFunctions
 		/* What to do? */
 		if ( $type == 'css' )
 		{
-			require_once( IPS_PUBLIC_PATH . 'min/lib/Minify/CSS/Compressor.php' );
+			require_once( IPS_PUBLIC_PATH . 'min/lib/Minify/CSS/Compressor.php' );/*noLibHook*/
 			
 			$text = Minify_CSS_Compressor::process( $text );
 		}
 		else if ( $type == 'html' )
 		{
-			require_once( IPS_PUBLIC_PATH . 'min/lib/Minify/HTML.php' );
+			require_once( IPS_PUBLIC_PATH . 'min/lib/Minify/HTML.php' );/*noLibHook*/
 			
 			$text = Minify_HTML::minify( $text, array( 'xhtml' => 1 ) );
 		}
@@ -2753,12 +2916,68 @@ class skinFunctions
 			$templates = $this->fetchTemplates( 0, 'groupTemplatesNoContent', $_group );
 			
 			/* Clean out any template bits no longer part of this group */
-			$this->DB->delete( 'skin_templates', "template_group='" . $_group . "' AND " . $this->DB->buildLower('template_name') . " NOT IN ('" . implode( "','", array_keys( $templates ) ) . "')" );
+			$this->DB->delete( 'skin_templates', "template_group='" . $_group . "' AND template_user_added=0 AND " . $this->DB->buildLower('template_name') . " NOT IN ('" . implode( "','", array_keys( $templates ) ) . "')" );
 
 			$affected += intval( $this->DB->getAffectedRows() );
 		}
 		
 		return array( 'cached' => intval( $cached ), 'templates' => intval( $affected ) );
 	}
+	
+	/**
+	 * Rebuilds the mobile user agents from the skin set data
+	 */
+	public function rebuildMobileSkinUserAgentsFromSetDataXml()
+	{
+		/* Init */
+		$mobileSkinSet = $this->fetchSkinData( $this->fetchSetIdByKey( 'mobile', true ), true );
+		$xmlData       = array();
+		
+		/* Grab xml */
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+		$xml    = new classXML( 'UTF-8' );
+		
+		/* Skin Set Data */
+		$xml->load( IPS_ROOT_PATH . 'setup/xml/skins/setsData.xml' );
 
+		foreach( $xml->fetchElements( 'set' ) as $xmlelement )
+		{
+			$data = $xml->fetchElementsFromRecord( $xmlelement );
+
+			if ( $data['set_key'] == 'mobile' )
+			{
+				$xmlData = $data;
+				break;
+			}
+		}
+		
+		/* Update */
+		if ( $xmlData['set_key'] && IPSLib::isSerialized( $xmlData['set_locked_uagent'] ) && IPSLib::isSerialized( $mobileSkinSet['set_locked_uagent'] ) )
+		{
+			$new = unserialize( $xmlData['set_locked_uagent'] );
+			$old = unserialize( $mobileSkinSet['set_locked_uagent'] );
+			
+			/* Merge them */
+			foreach( $new['groups'] as $group )
+			{
+				if ( ! in_array( $group, $old['groups'] ) )
+				{
+					$old['groups'][] = $group;
+				}
+			}
+			
+			foreach( $new['uagents'] as $agent => $version )
+			{
+				if ( ! in_array( $agent, $new['uagents'] ) )
+				{
+					$old['uagents'][ $agent ] = $version;
+				}
+			}
+		}	
+		
+		if ( is_array( $old ) && count( $old ) )
+		{
+			$this->DB->update( 'skin_collections', array( 'set_locked_uagent' => serialize( $old ) ), "set_key='mobile'" );
+		}
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/skins/skinGenerator.php b/upload/admin/sources/classes/skins/skinGenerator.php
new file mode 100644
index 00000000..dab963da
--- /dev/null
+++ b/upload/admin/sources/classes/skins/skinGenerator.php
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Skin Functions
+ * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * Owner: Matt
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		9th March 2005 11:03
+ * @version		$Revision: 8644 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class skinGenerator extends skinCaching
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @access	protected
+	 * @var		object
+	 */	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry )
+	{
+		/* Make object */
+		parent::__construct( $registry );
+	}
+	
+	/**
+	 * Return JSON payload URL
+	 * @return string Skin Generator URL
+	 */
+	public function getJsonUrl()
+	{
+		$inDev = ( IN_DEV ) ? 1 : 0;
+		
+		return 'http://myipb.in/skingen.json.php?v=' . IPB_LONG_VERSION . '&k=' . urlencode( $this->settings['ipb_reg_number'] ) . '&i=' . $inDev;
+	}
+	
+	/**
+	 * Delete a user's session
+	 * @param int $skinSetId
+	 */
+	public function convertToFull( $skinSetId )
+	{
+		/* Current session? */
+		$session = $this->getSessionBySkinId( $skinSetId );
+		
+		if ( $session['sg_member_id'] )
+		{
+			$this->deleteUserSession( $session['sg_member_id'] );
+		}
+		
+		/* Tweak skin */
+		$this->DB->update( 'skin_collections', array( 'set_by_skin_gen' => 0 ), 'set_id=' . $skinSetId );
+	}
+	
+	
+	/**
+	 * Check to make sure we're GTG ...
+	 */
+	public function healthCheck()
+	{
+		$warnings = array();
+		
+		/* Can write into images */
+		if ( ! is_writable( DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_images' ) )
+		{
+			$warnings[] = 'Cannot write to image directory';
+		}
+		
+		return ( count( $warnings ) ) ? $warnings : true;
+	}
+	
+	/**
+	 * Fetches the JSON from the remote server and writes it
+	 */
+	public function buildLocalJsonCache()
+	{
+		/* Now fetch JSON data from the server and write it */
+		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
+		$files = new classFileManagement();
+		
+		$json = $files->getFileContents( $this->getJsonUrl() );
+				
+		if ( $json )
+		{
+			$cacheFile = IPS_CACHE_PATH . 'cache/skinGenJsonCache.js';
+			
+			if ( file_exists( $cacheFile ) )
+			{
+				@unlink( $cacheFile );
+			}
+			
+			file_put_contents( $cacheFile, $json );
+			@chmod( $cacheFile, 0777 );
+		}
+		else
+		{
+			throw new Exception( "JSON_NOT_RETURNED");
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Saves the skin and that
+	 * @param	array	css, storedSettings, storedClasses
+	 * @param	int		Member Id
+	 */
+	public function save( array $data, $memberId )
+	{
+		$session = $this->getUserSession( $memberId );
+		
+		if ( empty( $session['sg_session_id'] ) )
+		{
+			throw new Exception( 'NO_SESSION_FOUND' );
+		}
+		
+		/* Update session */
+		$this->DB->update( 'skin_collections', array( 'set_skin_gen_data' => serialize( $data ) ), 'set_id=\'' . $session['sg_skin_set_id'] . '\''  );
+		
+		/* Write CSS_EXISTS extras css */
+		try
+		{
+			$this->saveCSSFromAdd( $session['sg_skin_set_id'], trim( $data['css'] ), 'ipb_skingen', 999, '', 'core' );
+		}
+		catch( Exception $e )
+		{
+			if ( $e->getMessage() == 'CSS_EXISTS' )
+			{
+				$css = $this->fetchCSS( $session['sg_skin_set_id'] );
+				$this->saveCSSFromEdit( $css['ipb_skingen']['css_id'], $session['sg_skin_set_id'], trim( $data['css'] ), 'ipb_skingen', 999, '', 'core' );
+			}
+		}
+		
+		/* Update replacements */
+		$replacements = $this->fetchReplacements( $session['sg_skin_set_id'] );
+		
+		/* Set transparent logo */
+		$this->saveReplacementFromEdit( $replacements['logo_img']['replacement_id'], $session['sg_skin_set_id'], '{style_image_url}/logo_transparent.png', 'logo_img' );
+		
+		/* Flag for rebuild */
+		$this->flagSetForRecache( $session['sg_skin_set_id'] );
+		
+		/* Delete session */
+		$this->deleteUserSession( $memberId );
+	}
+	
+	/**
+	 * Resets the member's skin
+	 * @param	int		Member Id
+	 */
+	public function resetMemberAndSwitchSkin( $memberId )
+	{
+		$session = $this->getUserSession( $memberId );
+		
+		if ( empty( $session['sg_session_id'] ) )
+		{
+			throw new Exception( 'NO_SESSION_FOUND' );
+		}
+		
+		IPSMember::save( $memberId, array( 'core' => array( 'bw_using_skin_gen' => 0, 'skin' => $session['sg_skin_set_id'] ) ) );
+	}
+	
+	/**
+	 * Set a user's session
+	 * @param int $memberId
+	 * @param array 
+	 */
+	public function setUserSession( $memberId, $data )
+	{
+		if ( ! empty( $memberId ) AND ! empty( $data['skin_set_id'] ) )
+		{
+			$sessionKey = md5( uniqid() );
+			
+			$this->deleteUserSession( $memberId );
+			
+			if ( empty( $data['set_skin_gen_data'] ) )
+			{
+				$skin = $this->fetchSkinData( $data['skin_set_id'] );
+				
+				$data['set_skin_gen_data'] = $skin['set_skin_gen_data'];
+			}
+			
+			$this->DB->insert( 'skin_generator_sessions', array( 'sg_session_id'  => $sessionKey,
+																 'sg_member_id'   => $memberId,
+																 'sg_skin_set_id' => $data['skin_set_id'],
+																 'sg_date_start'  => IPS_UNIX_TIME_NOW,
+																 'sg_data'		  => ( is_array( $data ) ) ? serialize( $data ) : $data  ) );
+			
+			/* Flag user */
+			IPSMember::save( $memberId, array( 'core' => array( 'bw_using_skin_gen' => 1 ) ) );
+			
+			return $sessionKey;
+		}
+		else
+		{		
+			return false;
+		}
+	}
+	
+	/**
+	 * Delete a user's session
+	 * @param int $memberId
+	 * @param null 
+	 */
+	public function deleteUserSession( $memberId )
+	{
+		$this->DB->delete( 'skin_generator_sessions', 'sg_member_id=' . intval( $memberId ) );
+		
+		/* Flag user */
+		IPSMember::save( $memberId, array( 'core' => array( 'bw_using_skin_gen' => 0 ) ) );
+	}
+	
+	/**
+	 * Get a user's session
+	 * @param int $memberId
+	 */
+	public function getUserSession( $memberId )
+	{
+		$session = $this->DB->buildAndFetch( array( 'select' => '*',
+													'from'   => 'skin_generator_sessions',
+													'where'  => 'sg_member_id=' . intval( $memberId ) ) );
+		
+		if ( ! empty( $session['sg_session_id'] ) )
+		{
+			if ( IPSLib::isSerialized( $session['sg_data'] ) )
+			{
+				$session['sg_data_array'] = unserialize( $session['sg_data'] );
+				
+				if ( IPSLib::isSerialized( $session['sg_data_array']['set_skin_gen_data'] ) )
+				{
+					$session['skin_gen_data'] = unserialize( $session['sg_data_array']['set_skin_gen_data'] );
+				}
+			}
+				
+			return $session;
+		}
+		else
+		{
+			/* Prevent this from loading again */
+			IPSMember::save( $memberId, array( 'core' => array( 'bw_using_skin_gen' => 0 ) ) );
+			
+			return false;
+		}
+	}
+	
+	/**
+	 * Get a user's session
+	 * @param int $skinSetId
+	 */
+	public function getSessionBySkinId( $skinSetId )
+	{
+		$session = $this->DB->buildAndFetch( array( 'select' => '*',
+													'from'   => 'skin_generator_sessions',
+													'where'  => 'sg_skin_set_id=' . intval( $skinSetId ) ) );
+		
+		if ( ! empty( $session['sg_session_id'] ) )
+		{
+			if ( IPSLib::isSerialized( $session['sg_data'] ) )
+			{
+				$session['sg_data_array'] = unserialize( $session['sg_data'] );
+				
+				if ( IPSLib::isSerialized( $session['sg_data_array']['set_skin_gen_data'] ) )
+				{
+					$session['skin_gen_data'] = unserialize( $session['sg_data_array']['set_skin_gen_data'] );
+				}
+			}
+				
+			return $session;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/skins/skinImportExport.php b/upload/admin/sources/classes/skins/skinImportExport.php
index d5b9d148..84b0fbb8 100644
--- a/upload/admin/sources/classes/skins/skinImportExport.php
+++ b/upload/admin/sources/classes/skins/skinImportExport.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin Functions
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Owner: Matt
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6854 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -39,7 +39,9 @@ class skinImportExport extends skinCaching
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -47,7 +49,7 @@ class skinImportExport extends skinCaching
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -164,7 +166,7 @@ class skinImportExport extends skinCaching
 		// Grab the XMLArchive class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 		$xmlArchive = new classXMLArchive();
 		
 		$xmlArchive->readXML( $content );
@@ -296,7 +298,7 @@ class skinImportExport extends skinCaching
 		// Grab the XMLArchive class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 		$xmlArchive = new classXMLArchive();
 		
 		$xmlArchive->readXML( $content );
@@ -409,14 +411,14 @@ class skinImportExport extends skinCaching
 						'set_author_url'		=> $info['set_author_url'],
 						'set_image_dir'			=> ( $imageDir ) ? $imageDir : $defaultSkin['set_image_dir'],
 						'set_emo_dir'			=> $defaultSkin['set_emo_dir'],
-						'set_css_inline'		=> 0,
+						'set_css_inline'		=> 1,
 						'set_output_format' 	=> $info['set_output_format'],
 						'set_css_groups'    	=> '',
 						'set_hide_from_list'	=> 1,	// Per Rikki :P
 						'set_order'				=> intval( $this->fetchHighestSetPosition() ) + 1,
 						'set_master_key'		=> ( isset( $info['set_master_key'] ) ) ? $info['set_master_key'] : 'root',
 						'set_updated'       	=> time() );
-		
+
 		if ( $setID )
 		{
 			//-----------------------------------------
@@ -669,7 +671,7 @@ class skinImportExport extends skinCaching
 		// XML
 		//-----------------------------------------
 
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPS_DOC_CHAR_SET );
 		$return = array();
 		
@@ -710,7 +712,7 @@ class skinImportExport extends skinCaching
 		// XML
 		//-----------------------------------------
 
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPS_DOC_CHAR_SET );
 		$return = array();
 		
@@ -751,7 +753,7 @@ class skinImportExport extends skinCaching
 		// XML
 		//-----------------------------------------
 
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml    = new classXML( IPS_DOC_CHAR_SET );
 		$return = array();
 		
@@ -787,7 +789,7 @@ class skinImportExport extends skinCaching
 		// XML
 		//-----------------------------------------
 
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -834,7 +836,7 @@ class skinImportExport extends skinCaching
 		// Create new XML archive...
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 		$xmlArchive = new classXMLArchive();
 		$xmlArchive->setStripPath( $this->fetchImageDirectoryPath( $imgDir ) );
 		$xmlArchive->add( $this->fetchImageDirectoryPath( $imgDir ) );
@@ -881,7 +883,7 @@ class skinImportExport extends skinCaching
 				continue;
 			}
 			
-			if ( isset( $data['app_enabled'] ) AND $data['app_enabled'] )
+			if ( !empty( $data['app_enabled'] ) )
 			{
 				$templates[ $appDir ]	= $this->generateTemplateXML( $appDir, $setID, $setOnly );
 				$csss[ $appDir ]		= $this->generateCSSXML( $appDir, $setID, $setOnly );
@@ -921,7 +923,7 @@ class skinImportExport extends skinCaching
 		// Create new XML archive...
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );
+		require_once( IPS_KERNEL_PATH . 'classXMLArchive.php' );/*noLibHook*/
 		$xmlArchive = new classXMLArchive();
 		
 		/* Add in version numbers */
@@ -955,7 +957,7 @@ class skinImportExport extends skinCaching
 	 * @access	public
 	 * @param	int		[Set ID - 0/root if omitted]
 	 * @param	bool	Include root bits in any XML export. Default is true
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function exportAllAppTemplates( $setID=0, $setOnly=TRUE )
 	{
@@ -1004,7 +1006,7 @@ class skinImportExport extends skinCaching
 	 *
 	 * @access	public
 	 * @param	int		[Set ID - 0/root if omitted]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function exportAllAppCSS( $setID=0 )
 	{
@@ -1055,7 +1057,7 @@ class skinImportExport extends skinCaching
 	 *
 	 * @todo  See Matt, this needs fixing! 
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function importAllAppTemplates()
 	{
@@ -1070,7 +1072,7 @@ class skinImportExport extends skinCaching
 		{
 			$file = IPSLib::getAppDir(  $app_dir ) . '/xml/' . $app_dir . '_templates.xml';
 			
-			if ( ! file_exists( $file ) )
+			if ( ! is_file( $file ) )
 			{
 				$this->_addMessage( $app_dir . $this->lang->words['importnothingtoimport'] );
 				continue;
@@ -1136,7 +1138,7 @@ class skinImportExport extends skinCaching
 		  						 'set_permissions'    => '*',
 		  						 'set_is_default'	  => 1,
 		  						 'set_author_name'	  => 'Invision Power Services, Inc',
-		  						 'set_author_url'	  => 'http://www.bestcms.ws',
+		  						 'set_author_url'	  => 'http://www.invisionpower.com',
 		  						 'set_image_dir'	  => 'master',
 		  						 'set_emo_dir'		  => 'default',
 		  						 'set_css_inline'	  => 1,
@@ -1173,7 +1175,7 @@ class skinImportExport extends skinCaching
 									  						 'set_permissions'    => '*',
 									  						 'set_is_default'	  => 1,
 									  						 'set_author_name'	  => 'Invision Power Services, Inc',
-									  						 'set_author_url'	  => 'http://www.bestcms.ws',
+									  						 'set_author_url'	  => 'http://www.invisionpower.com',
 									  						 'set_image_dir'	  => $remap[ $_id ]['set_image_dir'],
 									  						 'set_emo_dir'		  => 'default',
 									  						 'set_css_inline'	  => 1,
@@ -1215,7 +1217,7 @@ class skinImportExport extends skinCaching
 		// Grab the XML parser
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -1283,7 +1285,7 @@ class skinImportExport extends skinCaching
 		// Grab the XML parser
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -1374,7 +1376,7 @@ class skinImportExport extends skinCaching
 		// Grab the XML parser
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -1436,13 +1438,13 @@ class skinImportExport extends skinCaching
 		
 		$infoXML = IPSLib::getAppDir(  $app ) . '/xml/information.xml';
 		
-		if ( ! file_exists( $infoXML ) )
+		if ( ! is_file( $infoXML ) )
 		{
 			$this->_addErrorMessage( $this->lang->words['couldnotlocate'] . $infoXML );
 			return FALSE;
 		}
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -1607,7 +1609,7 @@ class skinImportExport extends skinCaching
 		// Grab the XML parser
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
@@ -1653,7 +1655,7 @@ class skinImportExport extends skinCaching
 		// File exists
 		//-----------------------------------------
 		
-		if ( ! file_exists( $fileXML ) )
+		if ( ! is_file( $fileXML ) )
 		{
 			return FALSE;
 		}
@@ -1728,7 +1730,7 @@ class skinImportExport extends skinCaching
 	 * @access	public
 	 * @param	string		App to export into
 	 * @param	int 		Set ID (0 / root by default )
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function exportCSSAppXML( $app_dir, $setID=0 )
 	{
@@ -1751,7 +1753,7 @@ class skinImportExport extends skinCaching
 		
 		if ( $xml )
 		{
-			if ( file_exists( $file ) AND ! IPSLib::isWritable( $file ) )
+			if ( is_file( $file ) AND ! IPSLib::isWritable( $file ) )
 			{
 				$this->_addErrorMessage( $file . $this->lang->words['css_isnotwritable'] );
 				return FALSE;
@@ -1770,7 +1772,7 @@ class skinImportExport extends skinCaching
 	 * @param	string		App to export into
 	 * @param	int			[Set ID (0/root if omitted)]
 	 * @param	bool		Include root bits in any XML export. Default is true
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function exportTemplateAppXML( $app_dir, $setID=0, $setOnly=TRUE )
 	{
@@ -1793,7 +1795,7 @@ class skinImportExport extends skinCaching
 			
 		if ( $xml )
 		{
-			if ( file_exists( $file ) AND ! IPSLib::isWritable( $file ) )
+			if ( is_file( $file ) AND ! IPSLib::isWritable( $file ) )
 			{
 				$this->_addErrorMessage( $file . $this->lang->words['css_isnotwritable'] );
 				return FALSE;
@@ -1828,7 +1830,7 @@ class skinImportExport extends skinCaching
 		$return			= array( 'updateCount' => 0, 'insertCount' => 0, 'updateBits' => array(), 'insertBits' => array() );
 		$masterKeys     = $this->fetchMasterKeys();
 		
-		if( ! file_exists($fileXML) )
+		if( ! is_file($fileXML) )
 		{
 			return $return;
 		}
@@ -1861,7 +1863,7 @@ class skinImportExport extends skinCaching
 		// XML
 		//-----------------------------------------
 
-		require_once( IPS_KERNEL_PATH.'classXML.php' );
+		require_once( IPS_KERNEL_PATH.'classXML.php' );/*noLibHook*/
 		$xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		//-----------------------------------------
diff --git a/upload/admin/sources/classes/tags/abstract.php b/upload/admin/sources/classes/tags/abstract.php
new file mode 100644
index 00000000..7bd0aa50
--- /dev/null
+++ b/upload/admin/sources/classes/tags/abstract.php
@@ -0,0 +1,1206 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Abstract class
+ * Matt Mecham
+ * Last Updated: $Date: 2011-10-04 16:35:02 -0400 (Tue, 04 Oct 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24 Feb 2011
+ * @version		$Revision: 9580 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+abstract class classes_tag_abstract
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @access	protected
+	 * @var		object
+	 */	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	protected $app  = '';
+	protected $area = '';
+	protected $errorMsg = '';
+	
+	/**
+	 * Init
+	 *
+	 * @return	@e void
+	 */
+	public function init()
+	{
+		
+	}
+
+	/**
+	 * @return the $errorMsg
+	 */
+	public function getErrorMsg()
+	{
+		return $this->errorMsg;
+	}
+
+	/**
+	 * @return the $errorMsg
+	 */
+	public function getFormattedError()
+	{
+		if( $this->errorMsg )
+		{
+			switch( $this->errorMsg )
+			{
+				case 'too_few_tags':
+					return sprintf( $this->lang->words['too_few_tags'], $this->_getMinTags() );
+				break;
+				
+				case 'too_many_tags':
+					return sprintf( $this->lang->words['too_many_tags'], $this->_getMaxTags() );
+				break;
+				
+				default:
+					return $this->lang->words[ $this->errorMsg ] ? $this->lang->words[ $this->errorMsg ] : $this->errorMsg;
+				break;
+			}
+		}
+		
+		return '';
+	}
+
+	/**
+	 * @param field_type $errorMsg
+	 */
+	public function setErrorMsg( $errorMsg )
+	{
+		$this->errorMsg = $errorMsg;
+	}
+
+	/**
+	 * @return the $app
+	 */
+	public function getApp()
+	{
+		return $this->app;
+	}
+
+	/**
+	 * @return the $area
+	 */
+	public function getArea()
+	{
+		return $this->area;
+	}
+
+	/**
+	 * @param field_type $app
+	 */
+	public function setApp( $app )
+	{
+		$this->app = $app;
+	}
+
+	/**
+	 * @param field_type $area
+	 */
+	public function setArea( $area )
+	{
+		$this->area = $area;
+	}
+		
+	/**
+	 * @return boolean
+	 */
+	public function isEnabled()
+	{
+		return $this->_isEnabled();
+	}
+	
+	/**
+	 * Check to make sure our tags are ok
+	 * @param	mixed	Array of tag text or string (tag, tag, tag)
+	 * @param  array $where array (contains any of these: meta_id, meta_visible, meta_parent_id, member_id, permission_string)
+	 * @param	string	mask to check (add / replace)
+	 * 
+	 */
+	public function checkAdd( $tags, $where, $mask='add' )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		/* Quick check */
+		if ( $this->can( $mask, $where ) !== true )
+		{
+			$this->setErrorMsg( 'no_permission' );
+			return false;
+		}
+		
+		/* Clean my tags please */
+		$tags = $this->_cleanTags( $tags );
+		
+		if ( $tags === false )
+		{
+			/* Error message is populated at this point */
+			return false;
+		}
+
+		return true;
+	}
+	
+	/**
+	 * Add tags to the dee bee
+	 * @param	mixed	Array of tag text or string (tag, tag, tag)
+	 * @param  array $where array (contains any of these: meta_id, meta_visible, meta_parent_id, member_id, permission_string)
+	 * @param	string	mask to check (add / replace)
+	 * 
+	 */
+	public function add( $tags, $where, $mask='add' )
+	{
+		$where       = $this->_cleanWhere( $where );
+		$memberId    = ( isset( $where['member_id'] ) ) ? intval( $where['member_id'] ) : $this->memberData['member_id'];
+		$trackPrefix = false;
+		$c           = 0;
+
+		/* Quick check */
+		if ( $this->can( $mask, $where ) !== true )
+		{
+			$this->setErrorMsg( 'no_permission' );
+			return false;
+		}
+		
+		/* Clean my tags please */
+		$tags = $this->_cleanTags( $tags );
+
+		if ( $tags === false )
+		{
+			/* Error message is populated at this point */
+			return false;
+		}
+		
+		/* Ok, we need some data please */
+		$where['meta_parent_id']    = isset( $where['meta_parent_id'] )    ? $where['meta_parent_id']    : $this->getParentId( $where );
+		$where['permission_string'] = isset( $where['permission_string'] ) ? $where['permission_string'] : $this->getPermissionData( $where );
+		$where['meta_visible']      = isset( $where['meta_visible'] )      ? $where['meta_visible']      : $this->getIsVisible( $where );
+		
+		/* Prefixes */
+		if ( ! empty( $_REQUEST[ $this->_getFieldId( $where ) . '_prefix' ] ) )
+		{
+			if ( $this->_prefixesEnabled( $where ) )
+			{
+				$trackPrefix = true;
+			}
+		}
+		
+		/* Update permission row */
+		$this->_setStoredPermissionData( array( 'meta_id'           => $where['meta_id'],
+												'meta_parent_id'	=> $where['meta_parent_id'],
+												'permission_string' => $where['permission_string'],
+												'meta_visible'		=> $where['meta_visible'] ) );
+		
+		/* Add tags */
+		foreach( $tags as $tag )
+		{
+			$this->DB->insert( 'core_tags', array( 'tag_aai_lookup'     => $this->_getKey( array( 'meta_id'        => $where['meta_id'] ) ),
+												   'tag_aap_lookup'     => $this->_getKey( array( 'meta_parent_id' => $where['meta_parent_id'] ) ),
+							   					   'tag_meta_app'       => $this->getApp(),
+												   'tag_meta_area'      => $this->getArea(),
+												   'tag_meta_id'        => intval( $where['meta_id'] ),
+												   'tag_meta_parent_id' => $where['meta_parent_id'],
+												   'tag_member_id'      => $memberId,
+												   'tag_added'			=> IPS_UNIX_TIME_NOW,
+												   'tag_prefix'			=> ( ! $c && $trackPrefix ) ? 1 : 0,
+												   'tag_text'			=> $tag ) );
+			$c++;
+		}
+		
+		/* Rebuild cache */
+		$this->_addCache( $where );
+	}
+	
+	/**
+	 * Add tags to the dee bee
+	 * @param	mixed	Array of tag text or string (tag, tag, tag)
+	 * @param  array $where array (contains any of these: meta_id, meta_visible, meta_parent_id, member_id, permission_string)
+	 * 
+	 */
+	public function replace( $tags, $where )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		/* Remove */
+		if ( ! empty( $where['meta_id'] ) )
+		{
+			$this->deleteByMetaId( $where['meta_id'] );
+		}
+		
+		return $this->add( $tags, $where, 'edit' );
+	}
+	
+	/**
+	 * Deletes tags dot dot dot, sorry, I mean...
+	 * 
+	 * @param	array		$metaIds	Array of meta ids to delete
+	 * @return	@e void
+	 */
+	public function deleteByMetaId( $metaIds )
+	{
+		if ( empty( $metaIds ) )
+		{
+			return false;
+		}
+		
+		/* Basic */
+		if ( ! is_array( $metaIds ) )
+		{
+			$metaIds = array( $metaIds );
+		}
+		
+		/* Fetch keys */
+		foreach( $metaIds as $id )
+		{
+			$keys[] = $this->_getKey( array( 'meta_id' => $id ) );
+		}
+		
+		/* Delete tags */
+		$this->DB->delete( 'core_tags', 'tag_aai_lookup IN (\'' . implode( "','", $keys ) . '\')' );
+		
+		/* Delete perms */
+		$this->DB->delete( 'core_tags_perms', 'tag_perm_aai_lookup IN (\'' . implode( "','", $keys ) . '\')' );
+		
+		/* Delete cache */
+		$this->DB->delete( 'core_tags_cache', 'tag_cache_key IN (\'' . implode( "','", $keys ) . '\')' );
+	}
+	
+	/**
+	 * Basic permission check
+	 * @param	string	$what (add/remove/edit/create) [ add = add new tags to items, create = create unique tags ]
+	 * @param	array	$where data
+	 */
+	public function can( $what, $where )
+	{
+		/* Admins are god */
+		if ( $this->memberData['g_is_supmod'] )
+		{
+			return true;
+		}
+		
+		/* Member disabled */
+		if ( $this->memberData['bw_disable_tagging'] )
+		{
+			return false;
+		}
+		
+		/* Group disabled */
+		if ( $this->memberData['gbw_disable_tagging'] )
+		{
+			return false;
+		}
+		
+		if ( $what == 'prefix' )
+		{
+			/* Member disabled */
+			if ( $this->memberData['bw_disable_prefixes'] )
+			{
+				return false;
+			}
+			
+			/* Group disabled */
+			if ( $this->memberData['gbw_disable_prefixes'] )
+			{
+				return false;
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Fetches tags from the debbie, I mean db. Avoiding the cache
+	 * @param int 		meta ID
+	 * @param string	Tag to match (foo matches foo, foobar, foobaz, etc)
+	 */
+	public function getRawTagsByMetaId( $metaId, $text='' )
+	{
+		$tags  = array();
+		$where = ( ! empty( $text ) ) ? ' AND tag_text LIKE \'' . $this->DB->addSlashes( $text ) . '%\'' : '';
+		
+		$this->DB->build( array( 'select' => '*',
+								 'from'   => 'core_tags',
+								 'where'  => 'tag_aai_lookup=\'' . $this->_getKey( array( 'meta_id' => $metaId ) ) . '\'' . $where,
+								 'order'  => 'tag_id' ) );
+		
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$tags[ $row['tag_id'] ] = $row;
+		}
+		
+		return $tags;
+	}
+	
+	/**
+	 * Fetches tags from the debbie, I mean db. Avoiding the cache
+	 * @param int meta ID
+	 * @param string	Tag to match (foo matches foo, foobar, foobaz, etc)
+	 */
+	public function getRawTagsByParentId( $parentId, $text='' )
+	{
+		$tags  = array();
+		$where = ( ! empty( $text ) ) ? ' AND tag_text LIKE \'' . $this->DB->addSlashes( $text ) . '%\'' : '';
+		
+		$this->DB->build( array( 'select' => '*',
+								 'from'   => 'core_tags',
+								 'where'  => 'tag_aap_lookup=\'' . $this->_getKey( array( 'meta_parent_id' => $parentId ) ) . '\'' . $where ) );
+		
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$tags[ $row['tag_id'] ] = $row;
+		}
+		
+		return $tags;
+	}
+	
+	/**
+	 * Get tags main interface
+	 * 
+	 * @param		array	$where
+	 * @return		array	Formatted data
+	 */
+	public function getTagsByMetaId( $where )
+	{
+		/* get from cache */
+		$tags = $this->_getCache( $where );
+
+		return $this->_formatCachedData( $tags );
+	}
+	
+	/**
+	 * Format tags for display
+	 * @param array $tagData array( 'tag', 'tag', 'tag' )
+	 * @return string
+	 */
+	public function formatTagsForDisplay( $tagData )
+	{
+		$array		= array();
+		$string		= array();
+		$truncated	= array();
+		$linked		= array();
+		$diff		= 0;
+		$text		= '';
+		$len		= 0;
+		
+		if ( ! is_array( $tagData ) )
+		{
+			return null;
+		}
+		
+		/* System enabled? */
+		if ( ! $this->_isEnabled() )
+		{
+			return null;
+		}
+		
+		foreach( $tagData as $t )
+		{
+			$array[]	= $this->registry->output->getTemplate( $this->skin() )->tagEntry( $t, false, $this->getApp() );
+			$string[]	= $t;
+			
+			$len += ( IPSText::mbstrlen( $t ) ) + 2;
+			
+			if ( $len <= $this->settings['tags_max_truncated_len'] )
+			{
+				$truncated[]	= $t;
+				$linked[]		= $this->registry->output->getTemplate( $this->skin() )->tagEntry( $t, true, $this->getApp() );
+			}
+			
+			if ( count( $array ) > count( $truncated ) )
+			{
+				$diff = count( $array ) - count( $truncated );
+				$text = ' ' . sprintf( $this->lang->words['tag_trunc_has_more'], $diff );
+			}
+		}
+		
+		return array( 'array'				=> $array,
+					  'parsed'				=> implode( ', ', $array ),
+					  'parsedWithoutComma'	=> implode( ' ' , $array ),
+					  'truncatedNoText'		=> implode( ', ', $truncated ),
+					  'truncated'			=> implode( ', ', $truncated ) . $text,
+					  'truncatedCount'		=> count( $truncated ),
+					  'truncatedWithLinks'	=> implode( ', ', $linked ),
+					  'totalCount'			=> count( $array ),
+					  'string'				=> implode( ', ', $string ) );
+	}
+	
+	/**
+	 * DEFAULT: returns nothing and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	int		Id of parent if one exists or 0
+	 */
+	public function getParentId( $where )
+	{
+		return 0;
+	}
+	
+	/**
+	 * DEFAULT: returns nothing and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	string	Comma delimiter or *
+	 */
+	public function getPermissionData( $where )
+	{
+		return '*';
+	}
+	
+	/**
+	 * DEFAULT: returns true and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	int		If meta item is visible (not unapproved, etc)
+	 */
+	public function getIsVisible( $where )
+	{
+		return 1;
+	}
+	
+	/**
+	 * Enter description here ...
+	 * @param array $array (meta_id_field => x.field_id );
+	 */
+	public function getCacheJoin( $array )
+	{
+		$p = ( empty( $array['tag_table_prefix'] ) ) ? 'xxx' : $array['tag_table_prefix'];
+		
+		return array( 'select' => $p.'.*',
+					  'from'   => array( 'core_tags_cache' => $p ),
+					  'type'   => 'left',
+					  'where'  => $p.'.tag_cache_key=' . $this->DB->buildMd5Statement( $this->DB->buildConcat( array( array( $this->getApp(), 'string' ),  array( ';', 'string'), array( $this->getArea(), 'string' ), array( ';',  'string' ), array( $array['meta_id_field'] ) ) ) ) );
+	}
+	
+	/**
+	 * Format joined data for display
+	 * 
+	 * @param		array	$tags
+	 * @return		array	Formatted data
+	 */
+	public function formatCacheJoinData( $tags )
+	{
+		return $this->_formatCachedData( $tags );
+	}
+	
+	/**
+	 * Moves tags from one meta ID to another (merging, etc) ...
+	 * @param array $oldMetaId array
+	 * @param int   $newMetaId
+	 */
+	public function moveTagsByMetaId( $oldMetaIds, $newMetaId )
+	{
+		$keys   = array();
+		$newKey = $this->_getKey( array( 'meta_id' => $newMetaId ) );
+		
+		/* Basic */
+		if ( ! is_array( $oldMetaIds ) )
+		{
+			$oldMetaIds = array( $oldMetaIds );
+		}
+		
+		/* Fetch keys */
+		foreach( $oldMetaIds as $id )
+		{
+			$keys[] = $this->_getKey( array( 'meta_id' => $id ) );
+			$this->_deleteStoredPermissionDataByMetaId( $id );
+			$this->_deleteCache( array( 'meta_id' => $id ) );
+		}
+		
+		/* Update tags */
+		$this->DB->update( 'core_tags', array( 'tag_meta_id'    => $newMetaId,
+											   'tag_aai_lookup' => $newKey ), 'tag_aai_lookup IN (\'' . implode( "','", $keys ) . '\')' );
+		
+		/* Update permissions */
+		$parent      = $this->getParentId( array( 'meta_id' => $newMetaId ) );
+		$permissions = $this->getPermissionData( array( 'meta_id' => $newMetaId ) );
+		$isVisible   = $this->getIsVisible( array( 'meta_id' => $newMetaId ) );
+		
+		/* Update permission row */
+		$this->_setStoredPermissionData( array( 'meta_id'           => $newMetaId,
+												'meta_parent_id'	=> $parent,
+												'permission_string' => $permissions,
+												'meta_visible'		=> $isVisible ) );
+		
+		/* Rebuild cache */
+		$this->_addCache( array( 'meta_id' => $newMetaId, 'meta_parent_id' => $parent ) );
+	}
+	
+	/**
+	 * Moves tags from one parent to another ...
+	 * @param array $where
+	 * @param int   $newParentId
+	 */
+	public function moveTagsByParentId( $oldParentId, $newParentId )
+	{
+		/* Update parent */
+		$permissions  = $this->getPermissionData( array( 'meta_parent_id' => $newParentId ) );
+		$parentKeyOld = $this->_getKey( array( 'meta_parent_id' => $oldParentId ) );
+		$parentKeyNew = $this->_getKey( array( 'meta_parent_id' => $newParentId ) );
+		
+		/* Update perms  */
+		$this->DB->update( 'core_tags_perms', array( 'tag_perm_aap_lookup' => $parentKeyNew, 'tag_perm_text' => $permissions ), 'tag_perm_aap_lookup=\'' . $parentKeyOld . '\'' );
+		
+		/* Update tags */
+		$this->DB->update( 'core_tags', array( 'tag_meta_parent_id' => $newParentId ), 'tag_meta_parent_id=' . intval( $oldParentId ) );
+	}
+	
+	/**
+	 * Moves tags to another parent, by meta id
+	 * @param array $oldMetaId array
+	 * @param int   $newParentId
+	 */
+	public function moveTagsToParentId( $oldMetaIds, $newParentId )
+	{
+		$keys   = array();
+		
+		/* Basic */
+		if ( ! is_array( $oldMetaIds ) )
+		{
+			$oldMetaIds = array( $oldMetaIds );
+		}
+		
+		/* Fetch keys */
+		foreach( $oldMetaIds as $id )
+		{
+			$keys[] = $this->_getKey( array( 'meta_id' => $id ) );
+			$this->_deleteCache( array( 'meta_id' => $id ) );
+		}
+		
+		/* Update tags */
+		$this->DB->update( 'core_tags', array( 'tag_meta_parent_id' => $newParentId ), 'tag_aai_lookup IN (\'' . implode( "','", $keys ) . '\')' );
+		
+		/* Update parent */
+		$permissions  = $this->getPermissionData( array( 'meta_parent_id' => $newParentId ) );
+		$parentKeyNew = $this->_getKey( array( 'meta_parent_id' => $newParentId ) );
+		
+		/* Update perms  */
+		$this->DB->update( 'core_tags_perms', array( 'tag_perm_aap_lookup' => $parentKeyNew, 'tag_perm_text' => $permissions ), 'tag_perm_aai_lookup IN (\'' . implode( "','", $keys ) . '\')' );
+
+		/* Update caches */
+		foreach( $oldMetaIds as $id )
+		{
+			$this->_addCache( array( 'meta_id' => $id, 'meta_parent_id' => $newParentId ) );
+		}
+	}
+	
+	/**
+	 * Updates all permissions by parent Id
+	 * @param int $parentId
+	 */
+	public function updatePermssionsByParentId( $parentId )
+	{
+		$parentKey    = $this->_getKey( array( 'meta_parent_id' => $parentId ) );
+		$permissions  = $this->getPermissionData( array( 'meta_parent_id' => $parentId ) );
+		
+		/* Update perms  */
+		$this->DB->update( 'core_tags_perms', array( 'tag_perm_text' => $permissions ), 'tag_perm_aap_lookup=\'' . $parentKey . '\'' );
+	}
+	
+	/**
+	 * Updates visibility by meta ID
+	 * @param array $metaIds
+	 * @param int	
+	 */
+	public function updateVisibilityByMetaId( $metaIds, $visible=1 )
+	{
+		$keys = array();
+		
+		/* Basic */
+		if ( ! is_array( $metaIds ) )
+		{
+			$metaIds = array( $metaIds );
+		}
+		
+		/* Fetch keys */
+		foreach( $metaIds as $id )
+		{
+			$keys[] = $this->_getKey( array( 'meta_id' => $id ) );
+		}
+		
+		/* Update perms  */
+		$this->DB->update( 'core_tags_perms', array( 'tag_perm_visible' => intval($visible) ), "tag_perm_aai_lookup IN ('" . implode( "','", $keys ) . "')" );
+	}
+	
+	/**
+	 * Render something
+	 * 
+	 * @param	string	view to show
+	 * @param	array	Where data to show
+	 */
+	public function render( $what, $where )
+	{
+		/* System enabled? */
+		if ( ! $this->_isEnabled() )
+		{
+			return '';
+		}
+		
+		$where   = $this->_cleanWhere( $where );
+		
+		$tags    = array( 'array' => array(), 'string' => '' );
+		$options = array( 'isOpenSystem'    => $this->_isOpenSystem(),
+						  'isEnabled'	    => $this->_isEnabled(),
+						  'minLen' 		    => $this->_getMinLen(),
+						  'maxLen'		    => $this->_getMaxLen(),
+						  'minTags'		    => $this->_getMinTags(),
+						  'maxTags'		    => $this->_getMaxTags(),
+						  'predefinedTags'  => $this->_getPreDefinedTags( $where ),
+						  'fieldId'			=> $this->_getFieldId( $where ),
+						  'prefixesEnabled' => $this->_prefixesEnabled( $where ),
+						  'meta_app'		=> $this->getApp(),
+						  'meta_area'		=> $this->getArea(),
+						  'meta_parent_id'	=> intval( $where['meta_parent_id'] ) );
+		switch( $what )
+		{
+			case 'entryBox':
+				/* set up some basic data */
+				if ( ! empty( $where['meta_id'] ) AND empty( $where['existing_tags'] ) )
+				{
+					/* fetch current tags if available */
+					$tags = $this->getTagsByMetaId( $where );
+				}
+				else if( ! empty( $where['existing_tags'] ) )
+				{
+					$tags	= array( 'tags'		 => $where['existing_tags'],
+									 'prefix'	 => '',
+									 'formatted' => $this->formatTagsForDisplay( $where['existing_tags'] ) );
+				}
+
+				return $this->registry->output->getTemplate( $this->skin() )->tagTextEntryBox( $tags, $options, $where );
+			break;
+		}
+	}
+	
+	/**
+	 * Search for tags
+	 * @param mixed $tags	Array or string
+	 * @param array $options	Array( 'meta_id' (array), 'meta_parent_id' (array), 'olderThan' (int), 'youngerThan' (int), 'limit' (int), 'sortKey' (string) 'sortOrder' (string) )
+	 */
+	public function search( $tags, $options )
+	{
+		/* Fetch search class */
+		require_once( IPS_ROOT_PATH . 'sources/classes/tags/search/bootstrap.php');/*noLibHook*/
+		$search = classes_tags_search_bootstrap::init( $this->getApp(), $this->getArea() );
+		
+		/* fix up tags */
+		$tags = $this->_cleanTags( $tags );
+		
+		if ( $tags === false )
+		{
+			/* Error message is populated at this point */
+			return false;
+		}
+		
+		$metaIds = $search->run( $tags, $options );
+		
+		return $metaIds;
+	}
+	
+	/**
+	 * DEFAULT: Should define this in your own class if you want it differenly displayed
+	 * @return	string	Template group
+	 */
+	protected function skin()
+	{
+		return 'global_other';
+	}
+	
+	/**
+	 * Formats cached data
+	 * @param 	array $tags
+	 * @return	array
+	 */
+	protected function _formatCachedData( $tags )
+	{
+		if ( ! is_array( $tags ) OR ! count( $tags ) OR empty( $tags['tag_cache_text'] ) )
+		{
+			return null;
+		}
+		
+		/* Unserialise */
+		if ( ! IPSLib::isSerialized( $tags['tag_cache_text'] ) )
+		{
+			return null;
+		}
+		
+		$tagData = unserialize( $tags['tag_cache_text'] );
+		
+		$tagData['formatted']           = array();
+		
+		if( is_array($tagData['tags']) AND count($tagData['tags']) )
+		{
+			$tagData['formatted']           = $this->formatTagsForDisplay( $tagData['tags'] );
+			$tagData['formatted']['prefix']	= false;
+		}
+		
+		if( ! empty( $tagData['prefix'] ) )
+		{
+			$tagData['formatted']['prefix'] = $this->registry->output->getTemplate( $this->skin() )->tagPrefix( $tagData['prefix'], $this->getApp() );
+		}
+		
+		return $tagData;
+	}
+	
+	/**
+	 *  Rebuild cache
+	 *  @param		array	$where
+	 *  @return		void
+	 */
+	protected function _addCache( $where )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		if ( empty( $where['meta_id'] ) )
+		{
+			trigger_error( "Meta ID missing", E_USER_ERROR );
+		}
+		
+		$key  = $this->_getKey( $where );
+		$tags = $this->getRawTagsByMetaId( $where['meta_id'] );
+		$text = array( 'tags' => array(), 'prefix' => '' );
+		
+		foreach( $tags as $id => $tag )
+		{
+			$text['tags'][] = $tag['tag_text'];
+			
+			if ( $tag['tag_prefix'] )
+			{
+				$text['prefix'] = $tag['tag_text'];
+			}
+		}
+		
+		$this->DB->replace( 'core_tags_cache', array( 'tag_cache_key' 	 => $key,
+													  'tag_cache_text'	 => serialize( $text ),
+													  'tag_cache_date'   => IPS_UNIX_TIME_NOW ), array( 'tag_cache_key' ) );
+	}
+	
+	/**
+	 *  Rebuild cache
+	 *  @param		array	$where
+	 *  @return		void
+	 */
+	protected function _deleteCache( $where )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		if ( empty( $where['meta_id'] ) )
+		{
+			trigger_error( "Meta ID missing", E_USER_ERROR );
+		}
+		
+		$key  = $this->_getKey( $where );
+		
+		$this->DB->delete( 'core_tags_cache', 'tag_cache_key=\'' . $key . '\'' );
+	}	
+	
+	/**
+	 *  Rebuild cache
+	 *  @param		array	$where
+	 *  @return		void
+	 */
+	protected function _getCache( $where )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		if ( empty( $where['meta_id'] ) )
+		{
+			trigger_error( "Meta ID missing", E_USER_ERROR );
+		}
+		
+		$key  = $this->_getKey( $where );
+		
+		return $this->DB->buildAndFetch( array( 'select' => '*',
+												'from'   => 'core_tags_cache',
+												'where'  => 'tag_cache_key=\'' . $key . '\'' ) );
+	}	
+	
+	/**
+	 * Sets a permission row
+	 * @param array $data
+	 */
+	protected function _setStoredPermissionData( $data )
+	{
+		$this->DB->replace( 'core_tags_perms', array( 'tag_perm_aai_lookup' => $this->_getKey( array( 'meta_id' => $data['meta_id'] ) ),
+													  'tag_perm_aap_lookup' => $this->_getKey( array( 'meta_parent_id' => $data['meta_parent_id'] ) ),
+													  'tag_perm_text'		=> trim( IPSText::cleanPermString( $data['permission_string'] ) ),
+													  'tag_perm_visible'    => intval( $data['meta_visible'] ) ), array( 'tag_perm_aai_lookup' ) );
+		
+	}
+																 
+	/**
+	 * Return a permission row for a TID
+	 * @param int $metaId
+	 * @return array
+	 */
+	protected function _getStoredPermissionDataByMetaId( $metaId )
+	{
+		$permRow = $this->DB->build( array( 'select'   => '*',
+								 			'from'     => 'core_tags_perms',
+							     			'where'    => 'tag_perm_aai_lookup=\'' . $this->_getKey( array( 'meta_id' => $metaId ) ) . '\'' ) );
+		return $permRow;
+	}
+	
+	/**
+	 * Delete a permission row for a TID
+	 * @param int $metaId
+	 * @return array
+	 */
+	protected function _deleteStoredPermissionDataByMetaId( $metaId )
+	{
+		$this->DB->delete( 'core_tags_perms', 'tag_perm_aai_lookup=\'' . $this->_getKey( array( 'meta_id' => $metaId ) ) . '\'' );
+	}
+	
+	/**
+	 * Get text field name (future expansion)
+	 * @param 	array	Where Data
+	 * @return 	Booyaleean
+	 */
+	protected function _getFieldId( $where )
+	{
+		return 'ipsTags';	
+	}
+	
+	/**
+	 * Get maximum tags allowed
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _getMaxTags()
+	{
+		return intval( $this->settings['tags_max'] );	
+	}
+	
+	/**
+	 * Get minimum tags allowed
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _getMinTags()
+	{
+		return intval( $this->settings['tags_min'] );	
+	}
+	
+	/**
+	 * Get maximum tag length allowed
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _getMaxLen()
+	{
+		return intval( $this->settings['tags_len_max'] );	
+	}
+	
+	/**
+	 * Get minimum tag length allowed
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _getMinLen()
+	{
+		return intval( $this->settings['tags_len_min'] );	
+	}
+	
+	/**
+	 * Must clean words before they are added
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _mustCleanWords()
+	{
+		return ( $this->settings['tags_clean'] ) ? true : false;	
+	}
+	
+	/**
+	 * Can set an item as a topic prefix
+	 * @param 	array	Where Data
+	 * @return 	Booyaleean
+	 */
+	protected function _prefixesEnabled( $where )
+	{
+		switch( $this->settings['tags_can_prefix'] )
+		{
+			case 0:
+				return false;
+			break;
+			case 1:
+				return ( $this->memberData['g_is_supmod'] ) ? true : false;
+			break;
+			case 2:
+				return $this->can( 'prefix', $where );
+			break;
+		}	
+	}
+	
+	/**
+	 * Is this an open system
+	 * Open is where anyone can create tags, closed is where they are pre-defined
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _isOpenSystem()
+	{
+		return ( $this->settings['tags_open_system'] ) ? true : false;	
+	}
+	
+	/**
+	 * Force all tags to lowercase?
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _forceLower()
+	{
+		return ( $this->settings['tags_force_lower'] ) ? true : false;	
+	}
+	
+	/**
+	 * Is tagging enabled?
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _isEnabled()
+	{
+		return ( $this->settings['tags_enabled'] ) ? true : false;	
+	}
+	
+	/**
+	 * Fetch a list of pre-defined tags
+	 * 
+	 * @param 	array	Where Data
+	 * @return	Array of pre-defined tags or null
+	 */
+	protected function _getPreDefinedTags( $where=array() )
+	{
+		if ( $this->settings['tags_predefined'] )
+		{
+			$this->settings['tags_predefined'] = str_replace( array( "<br>", "<br />", "\r", "," ), "\n", $this->settings['tags_predefined'] );
+			$array = explode( "\n", $this->settings['tags_predefined'] );
+			$final = array();
+			
+			foreach( $array as $a )
+			{
+				$final[] = trim( $a );
+			}
+			
+			return $final;
+		}
+		else
+		{
+			return null;
+		}
+	}
+	
+	/**
+	 * Strip/remove HTML ...
+	 * @param string $tag
+	 */
+	private function _stripHtml( $tag )
+	{
+		return str_replace( array( '&#62;', '&#60;', '&amp;', '&quot;', '&#39;', '<', '>', '"', "'" ), '', $tag );
+	}
+	
+	/**
+	 * Build a key
+	 */
+	private function _getKey( $where )
+	{
+		$where = $this->_cleanWhere( $where );
+		
+		if ( isset( $where['meta_id'] ) )
+		{
+			return md5( $this->getApp() . ';' . $this->getArea() . ';' . intval( $where['meta_id'] ) );
+		}
+		else if ( isset( $where['meta_parent_id'] ) )
+		{
+			return md5( $this->getApp() . ':' . $this->getArea() . ':' . intval( $where['meta_parent_id'] ) );
+		}
+	}
+	
+	/**
+	 * Cleans incoming tags
+	 * @param	String or Array		Comma delim string or array of tags
+	 * @return	Array				Array of cleaned tags
+	 */
+	private function _cleanTags( $tags )
+	{
+		/* Sort out tags */
+		if ( ! is_array( $tags ) )
+		{
+			if ( strstr( $tags, ',' ) )
+			{
+				$_tags = explode( ',', IPSText::cleanPermString( $tags ) );
+				$tags  = array();
+				
+				foreach( $_tags as $t )
+				{
+					if ( $t )
+					{
+						$tags[] = $this->_stripHtml( trim( ( $this->_forceLower() ? IPSText::mbstrtolower( $t ) : $t ) ) );
+					}
+				}
+			}
+			else
+			{
+				$tags = array( $this->_stripHtml( ( $this->_forceLower() ? IPSText::mbstrtolower( $tags ) : $tags ) ) );
+			}
+		}
+		
+		if ( ! count( $tags ) )
+		{
+			return array();
+		}
+		
+		/* Make sure they are all unique */
+		$tags = array_unique( $tags );
+		
+		/* Check for min/max string length */
+		if ( $this->_getMaxLen() OR $this->_getMinLen() )
+		{
+			$_tags = $tags;
+			$tags  = array();
+			
+			foreach( $_tags as $tag )
+			{
+				if ( $this->_getMaxLen() )
+				{
+					if ( IPSText::mbstrlen( $tag ) > $this->_getMaxLen() )
+					{
+						continue;
+					}
+				}
+				
+				if ( $this->_getMinLen() )
+				{
+					if ( IPSText::mbstrlen( $tag ) < $this->_getMinLen() )
+					{
+						continue;
+					}
+				}
+				
+				$tags[] = $tag;
+			}
+		}
+		
+		/* removes any bad words */
+		$badwords = $this->cache->getCache('badwords');
+
+		if ( $this->_mustCleanWords() AND ( is_array( $badwords ) && count( $badwords ) ) )
+		{
+			$_tags = $tags;
+			$tags  = array();
+			
+			foreach( $_tags as $tag )
+			{
+				$_bad	= false;
+				
+				foreach( $badwords as $badword )
+				{
+					if( strtolower($tag) == strtolower($badword['type']) )
+					{
+						$_bad	= true;
+						break;
+					}
+				}
+				
+				if( !$_bad )
+				{
+					$tags[] = $tag;
+				}
+			}
+		}
+		
+		/* Now, do we have a sufficient number of tags? */
+		if ( $this->_getMaxTags() && count( $tags ) > $this->_getMaxTags() )
+		{
+			$this->setErrorMsg('too_many_tags');
+			return false;
+		}
+		
+		/* Perhaps not enough? */
+		if ( $this->_getMinTags() && count( $tags ) < $this->_getMinTags() )
+		{
+			$this->setErrorMsg('too_few_tags');
+			return false;
+		}
+		
+		/* Generic catch all in case min/max tags aren't set up. */
+		if ( ! count( $tags ) )
+		{
+			$this->setErrorMsg('too_few_tags');
+			return false;
+		}
+		
+		/* Phew. */
+		return $tags;
+	}
+	
+	/**
+	 * Clean where stuffs
+	 * Ensures that DB naming conventions aren't used
+	 * @param	Array	Dirty where
+	 * @return	Array	Clean where
+	 */
+	private function _cleanWhere( $where )
+	{
+		$clean = array( 'tag_meta_app', 'tag_meta_area', 'tag_meta_id', 'tag_meta_parent_id', 'tag_member_id' );
+		
+		if ( is_numeric( $where ) )
+		{
+			$where = array( 'meta_id' => $where );
+		}
+		
+		if ( is_array( $where ) )
+		{
+			foreach( $where as $k => $v )
+			{
+				if ( in_array( $k, $clean ) )
+				{
+					unset( $where[ $k ] );
+					$where[ str_replace( 'tag_', '', $k ) ] = $v;
+				}
+			}
+		}
+		
+		if ( empty( $where['meta_app'] ) )
+		{
+			$where['meta_app'] = $this->getApp();
+		}
+		
+		if ( empty( $where['meta_area'] ) )
+		{
+			$where['meta_area'] = $this->getApp();
+		}
+		
+		return $where;
+	}
+	
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/bootstrap.php b/upload/admin/sources/classes/tags/bootstrap.php
new file mode 100644
index 00000000..dedb27a0
--- /dev/null
+++ b/upload/admin/sources/classes/tags/bootstrap.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Bootstrap
+ * Matt Mecham
+ * Last Updated: $Date: 2011-03-21 10:32:36 -0400 (Mon, 21 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24 Feb 2011
+ * @version		$Revision: 8134 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class classes_tags_bootstrap
+{
+	/**
+	 * App object
+	 *
+	 * @var array
+	 */
+	static protected $apps;
+	
+	/**
+	 * Construct
+	 *
+	 * @param	string		Application
+	 * @param	string		Area
+	 * @return	string
+	 */
+	public static function run( $app=null, $area=null )
+	{
+		if ( $app === null OR $area === null )
+		{
+			trigger_error( "App or area missing from classes_like", E_USER_WARNING );
+		}
+		
+		/* Pointless comment! */
+		$_file	= IPSLib::getAppDir( $app ) . '/extensions/tags/' . $area . '.php';
+		$_key	= ( $app && $area ) ? md5( $app . $area ) : 'default';
+		 
+		/* Get from cache if already cached */
+		if ( isset( self::$apps[ $_key ] ) )
+		{
+			return self::$apps[ $_key ];
+		}
+		
+		/* Get other classes */
+		require_once( IPS_ROOT_PATH . 'sources/classes/tags/abstract.php');/*noLibHook*/
+		
+		if ( $app && $area )
+		{
+			/* Otherwise create object and cache */
+			if ( is_file( $_file ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( $_file, 'tags_' . $app . '_' . $area, $app );
+				
+				if ( class_exists( $classToLoad ) )
+				{
+					self::$apps[ $_key ] = new $classToLoad();
+					self::$apps[ $_key ]->setApp( $app );
+					self::$apps[ $_key ]->setArea( $area );
+					self::$apps[ $_key ]->init();
+					
+				}
+				else
+				{
+					throw new Exception( "No tags class available for $app - $area" );
+				}
+			}
+			else
+			{
+				throw new Exception( "No tags class available for $app - $area" );
+			}
+		}
+		else
+		{
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/tags/extensions/default.php', 'tags_default' );
+			self::$apps[ $_key ] = new $classToLoad();
+			self::$apps[ $_key ]->setApp( $app );
+			self::$apps[ $_key ]->setArea( $area );
+			self::$apps[ $_key ]->init();
+		}
+		
+		return self::$apps[ $_key ];
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/cloud.php b/upload/admin/sources/classes/tags/cloud.php
new file mode 100644
index 00000000..9f9ea61b
--- /dev/null
+++ b/upload/admin/sources/classes/tags/cloud.php
@@ -0,0 +1,387 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Cloud class - is it bird? is it a cloud? No it's a.. nope, it's a cloud. Sorry for that.
+ * Matt Mecham
+ * Last Updated: $Date: 2011-08-08 04:56:34 -0400 (Mon, 08 Aug 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24 Feb 2011
+ * @version		$Revision: 9375 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class classes_tags_cloud
+{
+	/**#@+
+	 * Registry objects
+	 *
+	 * @access	protected
+	 * @var		object
+	 */	
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	protected $app  = '';
+	protected $area = '';
+	protected $errorMsg = '';
+	protected $relId    = 0;
+	protected $parentId = 0;
+	protected $skinGroup    = 'global_other';
+	protected $skinTemplate = 'tagCloud';
+	
+	/**
+	 * @return the $errorMsg
+	 */
+	public function getErrorMsg()
+	{
+		return $this->errorMsg;
+	}
+
+	/**
+	 * @param field_type $errorMsg
+	 */
+	public function setErrorMsg( $errorMsg )
+	{
+		$this->errorMsg = $errorMsg;
+	}
+
+	/**
+	 * @return the $app
+	 */
+	public function getApp()
+	{
+		return $this->app;
+	}
+
+	/**
+	 * @return the $area
+	 */
+	public function getArea()
+	{
+		return $this->area;
+	}
+
+	/**
+	 * @param field_type $app
+	 */
+	public function setApp( $app )
+	{
+		$this->app = $app;
+	}
+
+	/**
+	 * @param field_type $area
+	 */
+	public function setArea( $area )
+	{
+		$this->area = $area;
+	}
+	
+	
+	/**
+	 * @return the $relId
+	 */
+	public function getRelId()
+	{
+		return $this->relId;
+	}
+
+	/**
+	 * @param field_type $relId
+	 */
+	public function setRelId( $relId )
+	{
+		$this->relId = intval( $relId );
+	}
+
+	/**
+	 * @return the $parentId
+	 */
+	public function getParentId()
+	{
+		return $this->parentId;
+	}
+
+	/**
+	 * @param field_type $parentId
+	 */
+	public function setParentId( $parentId )
+	{
+		$this->parentId = intval( $parentId );
+	}
+
+	/**
+	 * @return the $skinGroup
+	 */
+	public function getSkinGroup()
+	{
+		return $this->skinGroup;
+	}
+
+	/**
+	 * @param field_type $skinGroup
+	 */
+	public function setSkinGroup( $skinGroup )
+	{
+		$this->skinGroup = $skinGroup;
+	}
+
+	/**
+	 * @return the $skinTemplate
+	 */
+	public function getSkinTemplate()
+	{
+		return $this->skinTemplate;
+	}
+
+	/**
+	 * @param field_type $skinTemplate
+	 */
+	public function setSkinTemplate( $skinTemplate )
+	{
+		$this->skinTemplate = $skinTemplate;
+	}
+
+	/**
+	 * Is tagging enabled?
+	 * 
+	 * @return 	Booyaleean
+	 */
+	protected function _isEnabled()
+	{
+		return ( $this->settings['tags_enabled'] ) ? true : false;	
+	}
+	
+	/**
+	 * Setup registry classes
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make registry objects */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Clean member perm array */
+		foreach( $this->member->perm_id_array as $k => $v )
+		{
+			if ( empty( $v ) )
+			{
+				unset( $this->member->perm_id_array[ $k ] );
+			}
+		}
+	}
+	
+	/**
+	 * Render the cloud
+	 * @param array $data returned from getCloudData
+	 */
+	public function render( array $data )
+	{
+		$group = $this->getSkinGroup();
+		$templ = $this->getSkinTemplate();
+	
+		/* Some basic formatt-ing */
+		foreach( $data['tags'] as $id => $val )
+		{
+			$data['tags'][ $id ]['className']  = $this->_weightToClassName( $val['weight'] );
+			$data['tags'][ $id ]['tagWithUrl'] = $this->registry->output->getTemplate('global_other')->tagEntry( $val['tag'], true );
+		}
+		
+		return $this->registry->output->getTemplate( $group )->$templ( $data );
+	}
+	
+	protected function _weightToClassName( $weight )
+	{
+		$className = 'ipsTagWeight_1';
+		
+		if ( $weight < 0.9 )
+		{
+			$className = 'ipsTagWeight_2';
+		}
+		
+		if ( $weight < 0.8 )
+		{
+			$className = 'ipsTagWeight_3';
+		}
+		
+		if ( $weight < 0.7 )
+		{
+			$className = 'ipsTagWeight_4';
+		}
+	
+		if ( $weight < 0.6 )
+		{
+			$className = 'ipsTagWeight_5';
+		}
+	
+		if ( $weight < 0.5 )
+		{
+			$className = 'ipsTagWeight_6';
+		}
+	
+		if ( $weight < 0.4 )
+		{
+			$className = 'ipsTagWeight_7';
+		}
+	
+		if ( $weight < 0.3 )
+		{
+			$className = 'ipsTagWeight_8';
+		}
+		
+		return $className;
+	}
+	
+	/**
+	 * getCloudData
+	 * 
+	 * Filters:
+	 * limit		Limit the number of tags returned
+	 * visible		The number of visible tags
+	 * noCache		Bypass any caching and always fetch fresh
+	 * 
+	 * @param	array	Filters (limit, visible)
+	 */
+	public function getCloudData( $filters=array() )
+	{
+		/* INIT */
+		$where = array();
+		$data  = array();
+		$raw   = array();
+		$nums  = array( 'min' => 0, 'max' => 0, 'count' => 0 );
+		$final = array( 'tags' => array(), 'nums' => array() );
+		
+		/* Clean up filters */
+		$filters['limit']   = intval( $filters['limit'] );
+		$filters['offset']  = intval( $filters['offset'] );
+		
+		$filters['visible'] = ( ! isset( $filters['visible'] ) ) ? 1 : intval( $filters['visible'] );
+		
+		if ( $this->getApp() && $this->getArea() && $this->getRelId() )
+		{
+			$where[] = "t.tag_aai_lookup='" . $this->_getKey( array( 'meta_id' => $this->getRelId() ) ) . "'";
+		}
+		else if ( $this->getApp() && $this->getArea() && $this->getParentId() )
+		{
+			$where[] = "t.tag_aap_lookup='" . $this->_getKey( array( 'meta_parent_id' => $this->getParentId() ) ) . "'";
+		}
+		
+		if ( $this->getApp() )
+		{
+			$where[] = "t.tag_meta_app='" . $this->DB->addSlashes( $this->getApp() ) . "'";
+		}
+		
+		if ( $this->getArea() )
+		{
+			$where[] = "t.tag_meta_area='" . $this->DB->addSlashes( $this->getArea() ) . "'";
+		}
+		
+		/* Test against cache class */
+		if ( empty( $filters['noCache'] ) )
+		{
+			$cacheKey = 'tagCloud-' . md5( implode( '&', $where ) );
+			$cached   = $this->registry->getClass('cacheSimple')->get( $cacheKey );
+			
+			if ( $cached !== null && is_array( $cached['data'] ) )
+			{
+				$cached['data']['cached'] = $cached['time'];
+				
+				return $cached['data'];
+			}
+		}
+		
+		/* Still here? Fetch from the database */
+		$this->DB->allow_sub_select = true;
+		$this->DB->loadCacheFile( IPSLib::getAppDir('core') . '/sql/' . ips_DBRegistry::getDriverType() . '_tag_queries.php', 'public_tag_sql_queries' );
+		$this->DB->buildFromCache( 'getCloudData', array( 'where' => $where, 'limit' => array( $filters['offset'], $filters['limit'] ) ), 'public_tag_sql_queries' );
+		$o = $this->DB->execute();
+		
+		while( $tag = $this->DB->fetch() )
+		{
+			$raw[ $tag['times'] . '.' . md5( $tag['tag_text'] ) ] = $tag;
+			
+			if ( empty( $nums['min'] ) OR $nums['min'] > $tag['times'] )
+			{
+				$nums['min'] = $tag['times'];
+			}
+			
+			if ( $nums['max'] < $tag['times'] )
+			{
+				$nums['max'] = $tag['times'];
+			}
+			
+			$nums['count'] += $tag['times'];
+		}
+		
+		/* Sort it */
+		krsort( $raw );
+		
+		/* Now give out some useful data */
+		foreach( $raw as $key => $data )
+		{
+			/* Work out a percentage */
+			$percent = sprintf( '%.2F', $data['times'] / $nums['max'] * 100 );
+			
+			$final['tags'][] = array( 'tag'     => $data['tag_text'],
+							  		  'count'   => $data['times'],
+							  	  	  'percent' => $percent,
+									  'weight'  => sprintf( '%.2F', $percent / 100 ) );
+		}
+		
+		$final['nums'] = $nums;
+		
+		/* Cache */
+		$this->registry->getClass('cacheSimple')->set( $cacheKey, $final );
+		
+		return $final;
+	}
+	
+	/**
+	 * Build a key
+	 */
+	private function _getKey( $where )
+	{		
+		if ( isset( $where['meta_id'] ) )
+		{
+			return md5( $this->getApp() . ';' . $this->getArea() . ';' . intval( $where['meta_id'] ) );
+		}
+		else if ( isset( $where['meta_parent_id'] ) )
+		{
+			return md5( $this->getApp() . ':' . $this->getArea() . ':' . intval( $where['meta_parent_id'] ) );
+		}
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/extensions/default.php b/upload/admin/sources/classes/tags/extensions/default.php
new file mode 100644
index 00000000..3fff3341
--- /dev/null
+++ b/upload/admin/sources/classes/tags/extensions/default.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Default extensions file
+ * Matt Mecham
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24 Feb 2011
+ * @version		$Revision: 8644 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class tags_default extends classes_tag_abstract
+{
+	/**
+	 * Constructor
+	 *
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Set up defaults */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB	      =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache	  =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Init
+	 *
+	 * @return	@e void
+	 */
+	public function init()
+	{
+		
+	}
+	
+	/**
+	 * DEFAULT: returns nothing and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	int		Id of parent if one exists or 0
+	 */
+	public function getParentId( $where )
+	{
+		return 0;
+	}
+	
+	/**
+	 * DEFAULT: returns nothing and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	string	Comma delimiter or *
+	 */
+	public function getPermissionData( $where )
+	{
+		return '*';
+	}
+	
+	/**
+	 * Basic permission check
+	 * @param	string	$what (add/remove/edit)
+	 * @param	array	$where data
+	 */
+	public function can( $what, $where )
+	{
+		return false;
+	}
+	
+	/**
+	 * DEFAULT: returns true and should be defined in your own class
+	 * @param 	array	Where Data
+	 * @return	int		If meta item is visible (not unapproved, etc)
+	 */
+	public function getIsVisible( $where )
+	{
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/extensions/index.html b/upload/admin/sources/classes/tags/extensions/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/sources/classes/tags/extensions/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/index.html b/upload/admin/sources/classes/tags/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/tags/index.html
+++ b/upload/admin/sources/classes/tags/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/search/bootstrap.php b/upload/admin/sources/classes/tags/search/bootstrap.php
new file mode 100644
index 00000000..f56b425a
--- /dev/null
+++ b/upload/admin/sources/classes/tags/search/bootstrap.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Tagging: Bootstrap
+ * Matt Mecham
+ * Last Updated: $Date: 2011-03-15 08:22:04 -0400 (Tue, 15 Mar 2011) $
+ * </pre>
+ *
+ * @author 		$Author: mmecham $
+ * @copyright	(c) 2001 - 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24 Feb 2011
+ * @version		$Revision: 8072 $
+ *
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class classes_tags_search_bootstrap
+{
+	/**
+	 * App object
+	 *
+	 * @var array
+	 */
+	static private $app;
+	
+	static private $area;
+	
+	/**
+	 * @return the $app
+	 */
+	public static function getApp()
+	{
+		return classes_tags_search_bootstrap::$app;
+	}
+
+	/**
+	 * @return the $area
+	 */
+	public static function getArea()
+	{
+		return classes_tags_search_bootstrap::$area;
+	}
+
+	/**
+	 * @param array $app
+	 */
+	public static function setApp( $app )
+	{
+		classes_tags_search_bootstrap::$app = $app;
+	}
+
+	/**
+	 * @param field_type $area
+	 */
+	public static function setArea( $area )
+	{
+		classes_tags_search_bootstrap::$area = $area;
+	}
+
+	/**
+	 * Construct
+	 *
+	 * @param	string		Application
+	 * @param	string		Area
+	 * @return	string
+	 */
+	public static function init( $app='', $area='' )
+	{
+		$_sen = ( ipsRegistry::$settings['search_method'] == 'traditional' ) ? 'sql' : ipsRegistry::$settings['search_method'];
+		
+		/* Set app and area if set */
+		if ( $app )
+		{
+			self::setApp( $app );
+		}
+		
+		if ( $area )
+		{
+			self::setArea( $area );
+		}
+		
+		/* Get other classes */
+		if ( $_sen == 'sql' )
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/search/sql.php');/*noLibHook*/
+			return new classes_tags_search_sql();
+		}
+		else
+		{
+			require_once( IPS_ROOT_PATH . 'sources/classes/tags/search/sphinx.php');/*noLibHook*/
+			return new classes_tags_search_sphinx();
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/search/index.html b/upload/admin/sources/classes/tags/search/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/sources/classes/tags/search/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/search/sphinx.php b/upload/admin/sources/classes/tags/search/sphinx.php
new file mode 100644
index 00000000..b3b94f9d
--- /dev/null
+++ b/upload/admin/sources/classes/tags/search/sphinx.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Global Search
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
+ */
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class classes_tags_search_sphinx
+{
+	
+	
+	/**
+	 * Sphinx client object
+	 *
+	 * @access	public
+	 * @var		object
+	 */
+	public $sphinxClient;
+	
+	/**
+	 * Setup registry objects
+	 *
+	 * @access	public
+	 * @param	object	ipsRegistry $registry
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make object */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		/* Do we have the sphinxes? */
+		if( ! is_file( 'sphinxapi.php' ) )
+		{
+			$registry->output->showError( 'sphinx_api_missing', 10182 );
+		}
+
+		/* Load Sphinx */
+		require( 'sphinxapi.php' );/*noLibHook*/
+		$this->sphinxClient = new SphinxClient();
+
+		$this->sphinxClient->SetServer( $this->settings['search_sphinx_server'], intval( $this->settings['search_sphinx_port'] ) );
+		$this->sphinxClient->SetMatchMode( SPH_MATCH_EXTENDED );
+		$this->sphinxClient->SetLimits( 0, 1000 );
+	}
+	
+/**
+	 * Perform the search
+	 * @param array $tags
+	 * @param array $options
+	 */
+	public function run( array $tags, array $options )
+	{
+		$order     = ( ! empty( $options['sortKey'] ) )   ? $options['sortKey']   : 'search_id';
+		$dir       = ( ! empty( $options['sortOrder'] ) ) ? $options['sortOrder'] : 'desc';
+		$return    = array();
+		$query 	   = '';
+		$searchIds = array();
+		
+		/* Format query */
+		if ( isset( $options['meta_parent_id'] ) )
+		{
+			$this->sphinxClient->SetFilter( 'tag_meta_parent_id', ( is_array( $options['meta_parent_id'] ) ? IPSLib::cleanIntArray( $options['meta_parent_id'] ) : $options['meta_parent_id'] ) );
+		}
+		
+		if ( isset( $options['meta_id'] ) )
+		{
+			$this->sphinxClient->SetFilter( 'tag_meta_id', ( is_array( $options['meta_id'] ) ? IPSLib::cleanIntArray( $options['meta_id'] ) : $options['meta_id'] ) );
+		}
+		
+		if ( isset( $options['meta_app'] ) )
+		{
+			$query .= ' @tag_meta_app "' . ( ( is_array( $options['meta_app'] ) ) ? implode( "|", $options['meta_app'] ) : $options['meta_app'] ) . '"';
+		}
+		
+		if ( isset( $options['meta_area'] ) )
+		{
+			$query .= ' @tag_meta_area "' . ( ( is_array( $options['meta_area'] ) ) ? implode( "|", $options['meta_area'] ) : $options['meta_area'] ) . '"';
+		}
+			
+		if ( isset( $tags ) )
+		{
+			if ( isset( $options['match'] ) AND $options['match'] == 'loose' )
+			{
+				$query .= ' @tag_text (' . ( ( is_array( $tags ) ) ? implode( "|", $tags ) : $tags ) . ')';
+			}
+			else
+			{
+				$query .= ' @tag_text "' . ( ( is_array( $tags ) ) ? implode( "|", $tags ) : $tags ) . '"';
+			}
+		}
+		
+		/* Sort */
+		if ( $dir == 'asc' )
+		{
+			$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_ASC, $order );
+		}
+		else
+		{
+			$this->sphinxClient->SetSortMode( SPH_SORT_ATTR_DESC, $order );
+		}
+		
+		/* Limit Results */
+		if ( ! empty( $options['limit'] ) || ! empty( $options['offset'] ) )
+		{
+			$this->sphinxClient->SetLimits( intval( $options['offset'] ), intval( $options['limit'] ) );
+		}
+		
+		/* run it */
+		$result = $this->sphinxClient->Query( $query, $this->settings['sphinx_prefix'] . 'core_tags_search_main,' . $this->settings['sphinx_prefix'] . 'core_tags_search_delta' );
+			
+		$this->logSphinxWarnings();
+		
+		/* Check matches and fetch data */
+		if ( is_array( $result['matches'] ) && count( $result['matches'] ) )
+		{
+			foreach( $result['matches'] as $res )
+			{
+				$searchIds[] = $res['attrs']['search_id'];
+			}
+		}
+		
+		/* Fetch */
+		$this->DB->build( array( 'select' => '*',
+								 'from'	  => 'core_tags',
+								 'where'  => 'tag_id IN(' . implode( ",", $searchIds ) . ')',
+								 'order'  => str_replace( 'search_id', 'tag_id', $order ) . ' ' . $dir ) );
+		$this->DB->exec();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$return[ $row['tag_id'] ] = $row;
+		}
+		
+		return $return;
+	}
+	
+	/**
+	 * Checks and logs any errors
+	 *
+	 * @access	public
+	 * @return	@e void
+	 */
+	public function logSphinxWarnings()
+	{	
+		$error   = $this->sphinxClient->GetLastError();
+		$warning = $this->sphinxClient->GetLastWarning();
+		
+		if ( $error )
+		{
+			IPSDebug::addLogMessage( "Sphinx Error: $error", 'sphinx_error_' . date('m_d_y'), $error, TRUE );
+		}
+		
+		if ( $warning )
+		{
+			IPSDebug::addLogMessage( "Sphinx Warning: $warning", 'sphinx_warning_' . date('m_d_y'), $warning, TRUE );
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tags/search/sql.php b/upload/admin/sources/classes/tags/search/sql.php
new file mode 100644
index 00000000..87121d79
--- /dev/null
+++ b/upload/admin/sources/classes/tags/search/sql.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Global Search
+ * Last Updated: $Date: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @subpackage	Core
+ * @link		http://hatynka.in
+ * @version		$Rev: 9505 $
+ */ 
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class classes_tags_search_sql
+{
+	
+	
+	/**
+	 * Setup registry objects
+	 *
+	 * @access	public
+	 * @return	@e void
+	 */
+	public function __construct()
+	{
+		/* Make object */
+		$this->registry   =  ipsRegistry::instance();
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Perform the search
+	 * @param array $tags
+	 * @param array $options
+	 */
+	public function run( array $tags, array $options )
+	{
+		$where  = array();
+		$order  = ( ! empty( $options['sortKey'] ) )   ? $options['sortKey']   : 'tg.tag_id';
+		$dir    = ( ! empty( $options['sortOrder'] ) ) ? $options['sortOrder'] : 'desc';
+		$return = array();
+		
+		/* Format query */
+		if ( isset( $options['meta_parent_id'] ) )
+		{
+			$where[] = ( is_array( $options['meta_parent_id'] ) ) ? 'tg.tag_meta_parent_id IN (' . implode( ',', IPSLib::cleanIntArray( $options['meta_parent_id'] ) ) . ')' : 'tg.tag_meta_parent_id=' . intval( $options['meta_parent_id'] );
+		}
+		
+		if ( isset( $options['meta_id'] ) && ( is_numeric( $options['meta_id'] ) || count( $options['meta_id'] ) ) )
+		{
+			$where[] = ( is_array( $options['meta_id'] ) && count( $options['meta_id'] ) ) ? 'tg.tag_meta_id IN (' . implode( ',', IPSLib::cleanIntArray( $options['meta_id'] ) ) . ')' : 'tg.tag_meta_id=' . intval( $options['meta_id'] );
+		}
+		
+		if ( isset( $options['meta_app'] ) )
+		{
+			$where[] = ( is_array( $options['meta_app'] ) && count( $options['meta_app'] ) ) ? 'tg.tag_meta_app IN (\'' . implode( "','", $options['meta_app'] ) . '\')' : 'tg.tag_meta_app=\'' . $options['meta_app'] . '\'';
+		}
+		
+		if ( isset( $options['meta_area'] ) )
+		{
+			$where[] = ( is_array( $options['meta_area'] ) && count( $options['meta_area'] ) ) ? 'tg.tag_meta_area IN (\'' . implode( "','", $options['meta_area'] ) . '\')' : 'tg.tag_meta_area=\'' . $options['meta_area'] . '\'';
+		}
+
+		if ( isset( $tags ) )
+		{
+			if ( isset( $options['match'] ) AND $options['match'] == 'loose' )
+			{
+				$_tags = ( is_array( $tags ) ) ? $tags : array( $tags );
+				$_t    = array();
+				
+				foreach( $_tags as $text )
+				{
+					$_t[] = ' tg.tag_text LIKE \'%' . $text . '%\'';
+				}
+				
+				if ( count( $_t ) )
+				{
+					$where[] = implode( " OR ", $_t );
+				}
+			}
+			else
+			{
+				$where[] = ( is_array( $tags ) ) ? 'tg.tag_text IN (\'' . implode( "','", $tags ) . '\')' : 'tg.tag_text=\'' . $tags . '\'';
+			}
+		}
+		
+		if ( is_array( $options['joins'] ) )
+		{
+			$db = array( 'select'   => 'tg.*',
+					     'from'	    => array( 'core_tags' =>  'tg' ),
+					     'where'    => implode( ' AND ', $where ),
+						 'add_join' => array( $options['joins'] ),
+					     'order'    => $order . ' ' . $dir );
+		}
+		else
+		{
+			$db = array( 'select' => 'tg.*',
+						 'from'	  => 'core_tags tg',
+						 'where'  => implode( ' AND ', $where ),
+						 'order'  => $order . ' ' . $dir );
+		}
+		
+		if ( ! empty( $options['limit'] ) || ! empty( $options['offset'] ) )
+		{
+			$db['limit'] = array( intval( $options['offset'] ), intval( $options['limit'] ) );
+		}
+		
+		/* Fetch */
+		$this->DB->build( $db );
+		$this->DB->execute();
+		
+		while( $row = $this->DB->fetch() )
+		{
+			$return[ $row['tag_id'] ] = $row;
+		}
+		
+		return $return;
+	}
+
+}
diff --git a/upload/admin/sources/classes/tags/tags.php b/upload/admin/sources/classes/tags/tags.php
index 3f9792c3..788c9e23 100644
--- a/upload/admin/sources/classes/tags/tags.php
+++ b/upload/admin/sources/classes/tags/tags.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Tagging Functions
- * Last Updated: $Date: 2010-09-29 20:23:38 -0400 (Wed, 29 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6925 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -23,7 +23,9 @@ if ( ! defined( 'IN_IPB' ) )
 	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
 	exit();
 }
-
+/**
+ * @depricated as of 3.2
+ */
 class tagFunctions
 {
 	/**#@+
@@ -38,7 +40,9 @@ class tagFunctions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -46,7 +50,7 @@ class tagFunctions
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -395,14 +399,15 @@ class tagFunctions
 			$size		= round( $r['times'], $items );
 			$size		= $size < 1 ? 1 : $size;
 			$size		= $size > 6 ? 6 : $size;
+			$url_tag    = urlencode($r['tag']);
 			
 			if( $seoTitle && $seoTemplate )
 			{
-				$_url = $this->registry->output->formatUrl( "{$url}{$r['tag']}", $seoTitle, $seoTemplate );
+				$_url = $this->registry->output->formatUrl( "{$url}{$url_tag}", $seoTitle, $seoTemplate );
 			}
 			else
 			{
-				$_url = "{$url}{$r['tag']}";
+				$_url = "{$url}{$url_tag}";
 			}
 			
 			$output[]	= "<li class='level{$size}'><a href='{$_url}' rel='tag'>{$r['tag']}</a></li>";
diff --git a/upload/admin/sources/classes/tiers/index.html b/upload/admin/sources/classes/tiers/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/tiers/index.html
+++ b/upload/admin/sources/classes/tiers/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/tiers/recursiveTiers.php b/upload/admin/sources/classes/tiers/recursiveTiers.php
index fbff9d18..b38a4865 100644
--- a/upload/admin/sources/classes/tiers/recursiveTiers.php
+++ b/upload/admin/sources/classes/tiers/recursiveTiers.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Recurse Tier Management
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6854 $
+ * @version		$Revision: 8644 $
  */
 
 class recursiveTiers
@@ -67,6 +67,7 @@ class recursiveTiers
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -75,6 +76,7 @@ class recursiveTiers
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Item Cache
@@ -179,7 +181,7 @@ class recursiveTiers
 	 *						  'sqlSelect'		(the SQL table select fields (* by default))
 	 *						  'sqlTable'		(the SQL table name)
 	 *						  'sqlWhere'		(Any additional 'where' information *Optional) ]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $settings )
 	{
@@ -213,7 +215,7 @@ class recursiveTiers
 	 * in caches array, so no need to query it.
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildSkinTiers()
 	{
@@ -244,10 +246,10 @@ class recursiveTiers
 	/**
 	 * Build the in-memory information tiers
 	 *
-	 * @access 	private
-	 * @return	void
+	 * @access 	protected
+	 * @return	@e void
 	 */
-	private function _buildTiers()
+	protected function _buildTiers()
 	{
 		if ( ! count( $this->_itemCache ) )
 		{
@@ -292,7 +294,7 @@ class recursiveTiers
 	 * Rebuild the in-memory information
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildTiers()
 	{
@@ -470,7 +472,7 @@ class recursiveTiers
 	/**
 	 * Return a HTML option list of directories: Internal version
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	int			Primary ID of entry to drill down from
 	 * @param	string		Currently built option list
 	 * @param	string 		Current depth guage
@@ -478,7 +480,7 @@ class recursiveTiers
 	 * @param	array 		Array of IDs to skip
 	 * @return	array
 	 */
-	private function _fetchDirectoriesDropDown($root_id, $jump_string="", $depth_guide="", $selected_id, $skip_id=array())
+	protected function _fetchDirectoriesDropDown($root_id, $jump_string="", $depth_guide="", $selected_id, $skip_id=array())
 	{
 		//-----------------------------------------
 		// Got an array?
@@ -612,7 +614,7 @@ class recursiveTiers
 	/**
 	 * Return a HTML option list of all items: Internal version
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	int			Primary ID of entry to drill down from
 	 * @param	string		Currently built option list
 	 * @param	string 		Current depth guage
@@ -620,7 +622,7 @@ class recursiveTiers
 	 * @param	array 		Array of IDs to skip
 	 * @return	string
 	 */
-	private function _fetchAllsItemDropDown($root_id, $jump_string="", $depth_guide="", $selected_id, $skip_id=array())
+	protected function _fetchAllsItemDropDown($root_id, $jump_string="", $depth_guide="", $selected_id, $skip_id=array())
 	{
 		if ( is_array( $this->_itemCache[ $root_id ] ) )
 		{
diff --git a/upload/admin/sources/classes/twitter/connect.php b/upload/admin/sources/classes/twitter/connect.php
index e73997ff..be4ebf9e 100644
--- a/upload/admin/sources/classes/twitter/connect.php
+++ b/upload/admin/sources/classes/twitter/connect.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Twitter Connect Library
  * Created by Matt Mecham
- * Last Updated: $Date: 2010-10-27 11:07:09 -0400 (Wed, 27 Oct 2010) $
+ * Last Updated: $Date: 2011-06-06 16:33:53 -0400 (Mon, 06 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7052 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8980 $
  *
  */
 
@@ -25,8 +25,10 @@ class twitter_connect
 	* @access	protected
 	* @var		object
 	*/
+	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
 	protected $memberData;
@@ -37,56 +39,56 @@ class twitter_connect
 	/**
 	 * Twitter OAUTH wrapper
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_api;
+	protected $_api;
 	
 	/**
 	 * IPBs log in handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $_login;
+	protected $_login;
 	
 	/**
 	 * User connected
 	 * 
-	 * @access	private
+	 * @access	protected
 	 * @var		boolean
 	 */
-	private $_connected = false;
+	protected $_connected = false;
 	
 	/**
 	 * User: Token
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_userToken;
+	protected $_userToken;
 	
 	/**
 	 * User: Secret
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_userSecret;
+	protected $_userSecret;
 	
 	/**
 	 * User: Data
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_userData = array();
+	protected $_userData = array();
 	
 	/**
 	 * Construct.
 	 * $this->memberData['twitter_token'] $this->memberData['twitter_secret']
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $registry, $token='', $secret='' )
 	{
@@ -104,10 +106,7 @@ class twitter_connect
 		define("CONSUMER_KEY"   , trim( ipsRegistry::$settings['tc_token'] ) );
 		define("CONSUMER_SECRET", trim( ipsRegistry::$settings['tc_secret'] ) );
 		define("OAUTH_CALLBACK" , $this->settings['_original_base_url'] . '/interface/twitter/index.php?m=' . $this->memberData['member_id'] );
-		
-		/* @todo : Remove this in 3.2 just a tmp fix for 3.1.3 */
-		$this->request['_reg'] = ( isset( $this->request['reg'] ) ) ? $this->request['reg'] : $this->request['_reg'];
-		
+
 		/* Auto do it man */
 		if ( ! $token AND $this->memberData['member_id'] AND $this->memberData['twitter_token'] )
 		{
@@ -125,7 +124,7 @@ class twitter_connect
 		}
 
 		/* Set include path.. */
-		@set_include_path( IPS_KERNEL_PATH . 'twitter/' . PATH_SEPARATOR . ini_get( 'include_path' ) );
+		@set_include_path( IPS_KERNEL_PATH . 'twitter/' . PATH_SEPARATOR . ini_get( 'include_path' ) );/*noLibHook*/
 		
 		/* Reset the API */
 		$this->resetApi( $token, $secret );
@@ -144,7 +143,7 @@ class twitter_connect
 		$this->_userSecret = trim( $secret );
 		
 		/* Load API */
-		require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );
+		require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );/*noLibHook*/
 		$this->_api = new TwitterOAuth( CONSUMER_KEY, CONSUMER_SECRET, $this->_userToken, $this->_userSecret );
 		
 		if ( $this->_userToken AND $this->_userSecret )
@@ -215,10 +214,10 @@ class twitter_connect
 			}
 			
 			/* Generate short URL */
-			require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );
- 			$shorten = new urlShorten();
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/url/shorten.php', 'urlShorten' );
+			$shorten = new $classToLoad();
  			
- 			$data      = $shorten->shorten( $url, 'bitly' );
+ 			$data      = $shorten->shorten( $url, IPS_URL_SHORTEN_SERVICE );
  			
  			return $this->updateStatus( $content . ' ' . $data['url'] );
 		}
@@ -237,22 +236,22 @@ class twitter_connect
 	 */
 	public function updateStatus( $text )
 	{
-		if ( $text AND $this->isConnected() )
+		if ( IPSLib::twitter_enabled() && $text AND $this->isConnected() )
 		{
 			$status = $this->_api->post( 'statuses/update', array( 'status' => IPSText::convertCharsets( $text, IPS_DOC_CHAR_SET, 'utf-8' ) ) );
 			$code   = $this->_api->http_code;
 			
 			/* 200 is OK, 403 is returned if API limit is hit */
-			if ( $code == 200 AND $status['id'] )
+			if ( $code == 200 AND $status['id_str'] )
 			{
 				/* Update member */
 				if ( $this->memberData['member_id'] )
 				{
 					/* Update member */
-					IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'tc_last_sid_import' => $status['id'] ) ) );
+					IPSMember::save( $this->memberData['member_id'], array( 'extendedProfile' => array( 'tc_last_sid_import' => $status['id_str'] ) ) );
 				}
 				
-				return $status['id'];
+				return $status['id_str'];
 			}
 			else
 			{
@@ -279,7 +278,7 @@ class twitter_connect
 		$key       = '';
 		
 		/* From registration/log in? */
-		if ( ! $this->memberData['member_id'] AND $this->request['_reg'] )
+		if ( ! $this->memberData['member_id'] AND $this->request['reg'] )
 		{
 			/* Create validating account for the member */
 			$key = md5( uniqid( microtime() ) );
@@ -333,6 +332,7 @@ class twitter_connect
 	 *
 	 * @access	public
 	 * @return	redirect
+	 * 
 	 */
 	public function finishLogin()
 	{
@@ -347,7 +347,6 @@ class twitter_connect
 															
 			if ( ! $connectData['t_key'] )
 			{
-				/* @todo something more useful here */
 				throw new Exception( "NO_KEY_FOUND" );
 			}
 			
@@ -363,7 +362,7 @@ class twitter_connect
 			if ( $member['twitter_token'] == $_REQUEST['oauth_token'] )
 			{
 				/* Reset api to ensure user is not logged in */
-				require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );
+				require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );/*noLibHook*/
 				$this->_api = new TwitterOAuth( CONSUMER_KEY, CONSUMER_SECRET, $member['twitter_token'], $member['twitter_secret'] );
 				
 				/* Generate oAuth token */
@@ -406,7 +405,7 @@ class twitter_connect
 						{
 							/* No? Create a new member */
 							/* Generate BW options */
-							foreach( array( 'tc_s_pic', 'tc_s_avatar', 'tc_s_status', 'tc_s_aboutme', 'tc_si_status' ) as $field )
+							foreach( array( 'tc_s_pic', 'tc_s_status', 'tc_s_aboutme', 'tc_si_status' ) as $field )
 							{
 								$_toSave[ $field ] = 1;
 							}
@@ -414,6 +413,15 @@ class twitter_connect
 							$tc_bwoptions = IPSBWOptions::freeze( $_toSave, 'twitter' );
 							$safeFBName   = str_replace( ' ', '', IPSText::convertCharsets( $_userData['screen_name'], 'utf-8', IPS_DOC_CHAR_SET ) );
 							$displayName  = ( ! $this->settings['auth_allow_dnames'] ) ? $safeFBName : FALSE;
+							
+							/* Make sure usernames are safe */
+							if ( $this->settings['username_characters'] )
+							{
+								$check_against = preg_quote( $this->settings['username_characters'], "/" );
+								$check_against = str_replace( '\-', '-', $check_against );
+								
+								$safeFBName = preg_replace( '/[^' . $check_against . ']+/i', '', $safeFBName );
+							}
 					
 							/* From reg, so create new account properly */
 							$toSave = array( 'core' 		 => array(  'name' 				     => $safeFBName,
@@ -425,18 +433,18 @@ class twitter_connect
 																	    'twitter_token'          => $rToken['oauth_token'],
 																	    'twitter_secret'		 => $rToken['oauth_token_secret'] ),
 											'extendedProfile' => array( 'pp_about_me'            => IPSText::getTextClass( 'bbcode' )->stripBadWords( IPSText::convertCharsets( $_userData['description'], 'utf-8', IPS_DOC_CHAR_SET ) ),
-																		'tc_photo'               => $_userData['profile_image_url'],
-																		'tc_bwoptions'           => $tc_bwoptions,
-																		'avatar_location'        => $_userData['profile_image_url'],
-																		'avatar_type'            => 'twitter' ) );
+																		'tc_bwoptions'           => $tc_bwoptions ) );
 			
-							$memberData = IPSMember::create( $toSave, TRUE, FALSE, FALSE );
+							$memberData = IPSMember::create( $toSave, TRUE, FALSE, TRUE );
 							
 							if ( ! $memberData['member_id'] )
 							{
 								throw new Exception( 'CREATION_FAIL' );
 							}
 							
+							/* Sync up photo */
+							$this->syncMember( $memberData['member_id'] );
+					
 							$pmember = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'members_partial', 'where' => "partial_member_id=" . $memberData['member_id'] ) );
 
 							if ( $pmember['partial_member_id'] )
@@ -470,7 +478,7 @@ class twitter_connect
 			if ( $member['twitter_token'] == $_REQUEST['oauth_token'] )
 			{
 				/* Reset api to ensure user is not logged in */
-				require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );
+				require_once( IPS_KERNEL_PATH . 'twitter/twitteroauth.php' );/*noLibHook*/
 				$this->_api = new TwitterOAuth( CONSUMER_KEY, CONSUMER_SECRET, $member['twitter_token'], $member['twitter_secret'] );
 				
 				/* Generate oAuth token */
@@ -489,7 +497,7 @@ class twitter_connect
 		}
 		
 		/* Redirect back to settings page */
-		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&tab=members&area=twitter' );
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&tab=core&area=twitter' );
 	}
 	
 		/**
@@ -574,21 +582,21 @@ class twitter_connect
 			{
 				$user = $this->fetchUserData();
 				
-				/* Update.. */
-				$exProfile['tc_photo'] = ( $bwOptions['tc_s_pic'] ) ? $user['profile_image_url'] : '';
-				
-				if ( $bwOptions['tc_s_avatar'] )
+				/* Load library */
+				if ( $bwOptions['tc_s_pic'] )
 				{
-					$exProfile['avatar_location'] = $user['profile_image_url'];
-					$exProfile['avatar_type']     = 'twitter';
+					$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+					$photo = new $classToLoad( $this->registry );
+					
+					$photo->save( $memberData, 'twitter' );
 				}
-			
+				
 				if ( $bwOptions['tc_s_aboutme'] )
 				{
 					$exProfile['pp_about_me'] = IPSText::getTextClass( 'bbcode' )->stripBadWords( IPSText::convertCharsets( $user['description'], 'utf-8', IPS_DOC_CHAR_SET ) );
 				}
 			
-				if ( $bwOptions['tc_si_status'] AND ( isset( $memberData['gbw_no_status_import'] ) AND ! $memberData['gbw_no_status_import'] ) )
+				if ( $bwOptions['tc_si_status'] AND ( isset( $memberData['gbw_no_status_import'] ) AND ! $memberData['gbw_no_status_import'] ) AND !$memberData['bw_no_status_update'] )
 				{
 					/* Fetch timeline */
 					$memberData['tc_last_sid_import'] = ( $memberData['tc_last_sid_import'] < 1 ) ? 100 : $memberData['tc_last_sid_import'];
@@ -610,6 +618,7 @@ class twitter_connect
 							
 							/* Set Author */
 							$this->registry->getClass('memberStatus')->setAuthor( $memberData );
+							$this->registry->getClass('memberStatus')->setStatusOwner( $memberData );
 							
 							/* Convert if need be */
 							if ( IPS_DOC_CHAR_SET != 'UTF-8' )
@@ -706,8 +715,8 @@ class twitter_connect
 	{
 		if ( ! is_object( $this->_login ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
-	    	$this->_login =  new han_login( $this->registry );
+			$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$this->_login =  new $classToLoad( $this->registry );
 	    	$this->_login->init();
 		}
 		
diff --git a/upload/admin/sources/classes/twitter/index.html b/upload/admin/sources/classes/twitter/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/twitter/index.html
+++ b/upload/admin/sources/classes/twitter/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/apis/bitly/api.php b/upload/admin/sources/classes/url/apis/bitly/api.php
index 03f62b70..11a0af3d 100644
--- a/upload/admin/sources/classes/url/apis/bitly/api.php
+++ b/upload/admin/sources/classes/url/apis/bitly/api.php
@@ -3,45 +3,44 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * URL shortener
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-01-22 10:10:04 -0500 (Fri, 22 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		24th November 2009
- * @version		$Revision: 5742 $
+ * @version		$Revision: 8644 $
  */
 
 	 
 /* Class name must match shortener directory name */
 class bitly extends urlShorten
 {
-	private $_config = array();
+	protected $_config = array();
 	
-	private $_cfm;
+	protected $_cfm;
 	
 	/**
 	 * Method constructor
 	 *
 	 * If you pass false as the key, it will not save out the imported GUIDs
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 * 
 	 */
 	public function __construct( $config=array() )
 	{
 		$this->_config = $config;
 		
-		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
-		$this->_cfm              = new classFileManagement();
-		$this->_cfm->use_sockets = 1;
-		$this->_cfm->timeout     = 30;
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$this->_cfm          = new $classToLoad();
+		$this->_cfm->timeout = 30;
 	}
 	
 	/**
diff --git a/upload/admin/sources/classes/url/apis/bitly/conf.php b/upload/admin/sources/classes/url/apis/bitly/conf.php
index 9fe6bd48..b5022210 100644
--- a/upload/admin/sources/classes/url/apis/bitly/conf.php
+++ b/upload/admin/sources/classes/url/apis/bitly/conf.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * URL shortener
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		24th November 2009
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7445 $
  */
 
 $config = array();
diff --git a/upload/admin/sources/classes/url/apis/bitly/index.html b/upload/admin/sources/classes/url/apis/bitly/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/url/apis/bitly/index.html
+++ b/upload/admin/sources/classes/url/apis/bitly/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/apis/index.html b/upload/admin/sources/classes/url/apis/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/url/apis/index.html
+++ b/upload/admin/sources/classes/url/apis/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/apis/topic/api.php b/upload/admin/sources/classes/url/apis/topic/api.php
new file mode 100644
index 00000000..033c5db7
--- /dev/null
+++ b/upload/admin/sources/classes/url/apis/topic/api.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * URL shortener
+ * Owner: Matt Mecham
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		Matt Mecham
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24th November 2009
+ * @version		$Revision: 8644 $
+ */
+
+	 
+/* Class name must match shortener directory name */
+class topic extends urlShorten
+{
+	protected $_config = array();
+	
+	protected $_cfm;
+	
+	/**
+	 * Method constructor
+	 *
+	 * If you pass false as the key, it will not save out the imported GUIDs
+	 *
+	 * @return	@e void
+	 * 
+	 */
+	public function __construct( $config=array() )
+	{
+		$this->_config = $config;
+		
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$this->_cfm          = new $classToLoad();
+		$this->_cfm->timeout = 30;
+	}
+	
+	/**
+	 * Shorten URL
+	 *
+	 * @param	string	URL to shorten
+	 * @return	array ( 'status' => [ok/failed], 'url' => [shortened url], 'method' => [api used], 'raw' => [any raw data] )
+	 */
+	public function apiShorten( $url )
+	{
+		/* Query the service */
+		$response = $this->_cfm->getFileContents( "http://topic.to/api.php?action=shorturl&url=" . urlencode( $url ) . "&format=json" );
+		
+		if ( ! $response )
+		{
+			return array( 'status' => 'failed' );
+		}
+		
+		$obj = json_decode( $response, TRUE );
+		
+		if ( $obj['statusCode'] != 200 )
+		{
+			return array( 'status' => 'failed' );
+		}
+		
+		return array( 'status' => 'ok',
+					  'url'    => $obj['shorturl'],
+					  'method' => 'topic',
+					  'raw'    => $obj['url'] );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/apis/topic/conf.php b/upload/admin/sources/classes/url/apis/topic/conf.php
new file mode 100644
index 00000000..d29d6db6
--- /dev/null
+++ b/upload/admin/sources/classes/url/apis/topic/conf.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * URL shortener
+ * Owner: Matt Mecham
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
+ * </pre>
+ *
+ * @author 		Matt Mecham
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		24th November 2009
+ * @version		$Revision: 7445 $
+ */
+
+$config = array();
+
+/* Login... */
+$config['login'] = '';
+
+/* API KEY - Not needed : */
+$config['apiKey']  = '';
+
diff --git a/upload/admin/sources/classes/url/apis/topic/index.html b/upload/admin/sources/classes/url/apis/topic/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/admin/sources/classes/url/apis/topic/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/index.html b/upload/admin/sources/classes/url/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/url/index.html
+++ b/upload/admin/sources/classes/url/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/url/shorten.php b/upload/admin/sources/classes/url/shorten.php
index b56207a8..06d8aa61 100644
--- a/upload/admin/sources/classes/url/shorten.php
+++ b/upload/admin/sources/classes/url/shorten.php
@@ -3,70 +3,66 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * URL Shortener
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		24th November 2009
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8042 $
  */
 
 /*
- Example: Shorten URL
- require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );
- $shorten = new urlShorten();
- $data    = $shorten->shorten( 'http://www.invisionpower.com', 'bitly' );
- 
- print $data['url'];
- 
- Example: List available shorteners
- require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );
- $shorten = new urlShorten();
- 
- print_r( $shorten->fetchAvailableApis() );
-*/
+# Example: Shorten URL
+# require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );/*noLibHook*/
+# $shorten = new urlShorten();
+# $data    = $shorten->shorten( 'http://www.invisionpower.com', 'bitly' );
+# 
+# print $data['url'];
+# 
+# Example: List available shorteners
+# require_once( IPS_ROOT_PATH . 'sources/classes/url/shorten.php' );/*noLibHook*/
+# $shorten = new urlShorten();
+# 
+# print_r( $shorten->fetchAvailableApis() );
+#
 
 class urlShorten
 {	
 	/**
 	 * Main API classes directory
 	 *
-	 * @access	public
-	 * @var		object
+	 * @var		$_mainDir
 	 */
-	private $_mainDir;
+	protected $_mainDir;
 	
 	/**
-	 * API class
+	 * API object
 	 *
-	 * @access	public
-	 * @var		object
+	 * @var		$_api
 	 */
-	private $_api;
+	protected $_api;
 	
 	/**
-	 * Additional error messages
+	 * Array of additional error messages
 	 *
-	 * @access	public
-	 * @var		array
+	 * @var		$errors
 	 */
 	public $errors = array();
 	
 	/**
 	 * Method constructor
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 *
-	 * EXCEPTION MESSAGES
-	 * NO_METHOD		API class could not be found
+	 * @throws Exception
+	 * 	@li NO_METHOD (API class could not be found)
 	 */
 	public function __construct()
 	{
@@ -76,15 +72,14 @@ class urlShorten
 	/**
 	 * Shorten URL
 	 *
-	 * @access	public
-	 * @param	string		URL to shorten
-	 * @param	string		Method key to use (If left blank, we'll just grab the first one)
-	 * @return	array
+	 * @param	string		$url		URL to shorten
+	 * @param	string		$apiKey		Method key to use (If left blank, we'll just grab the first one)
+	 * @return	@e array	Shortened url data
 	 *
-	 * EXCEPTION MESSAGES
-	 * NO_METHOD		API class could not be found
-	 * BAD_FORMAT		URL is not in the correct format
-	 * FAILED			URL shorten failed
+	 * @throws Exception
+	 * 	@li NO_METHOD (API class could not be found)
+	 * 	@li BAD_FORMAT (URL is not in the correct format)
+	 * 	@li FAILED (URL shorten failed)
 	 */
 	public function shorten( $url, $apiKey )
 	{
@@ -98,7 +93,7 @@ class urlShorten
 		{
 			$_thisDir = $this->_mainDir . '/' . $apiKey;
 			
-			if ( @file_exists( $_thisDir . '/api.php' ) )
+			if ( @is_file( $_thisDir . '/api.php' ) )
 			{
 				$this->_setMethod( $apiKey );
 			}
@@ -142,28 +137,26 @@ class urlShorten
 	 * Set method
 	 * Assumes that the folder and files exist
 	 *
-	 * @access	private
-	 * @param	string
+	 * @param	string		$apiKey		API key
+	 * @return	@e void
 	 */
-	private function _setMethod( $apiKey )
+	protected function _setMethod( $apiKey )
 	{
 		$config = array();
 		
-		if ( file_exists( $this->_mainDir . '/' . $apiKey . '/conf.php' ) )
+		if ( is_file( $this->_mainDir . '/' . $apiKey . '/conf.php' ) )
 		{
-			require( $this->_mainDir . '/' . $apiKey . '/conf.php' );
+			require( $this->_mainDir . '/' . $apiKey . '/conf.php' );/*noLibHook*/
 		}
 		
-		require_once( $this->_mainDir . '/' . $apiKey . '/api.php' );
-		
-		$this->_api = new $apiKey( $config );
+		$classToLoad = IPSLib::loadLibrary( $this->_mainDir . '/' . $apiKey . '/api.php', $apiKey );
+		$this->_api = new $classToLoad( $config );
 	}
 	
 	/**
 	 * Fetch all available APIs
 	 *
-	 * @access	public
-	 * @return	array
+	 * @return	@e array	Available APIs
 	 */
 	public function fetchAvailableApis()
 	{
@@ -187,7 +180,4 @@ class urlShorten
 		
 		return $apis;
 	}
-	
-	
-		
 }
\ No newline at end of file
diff --git a/upload/admin/sources/classes/useragents/index.html b/upload/admin/sources/classes/useragents/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/useragents/index.html
+++ b/upload/admin/sources/classes/useragents/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/useragents/userAgentFunctions.php b/upload/admin/sources/classes/useragents/userAgentFunctions.php
index 0aff964d..a5668333 100644
--- a/upload/admin/sources/classes/useragents/userAgentFunctions.php
+++ b/upload/admin/sources/classes/useragents/userAgentFunctions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Skin Functions
- * Last Updated: $Date: 2010-09-13 05:53:37 -0400 (Mon, 13 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * Owner: Matt
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6854 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -39,31 +39,33 @@ class userAgentFunctions
 	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 		
 	/**
 	 * Error handle
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_errorMsgs = array();
+	protected $_errorMsgs = array();
 	
 	/**
 	 * Message handle
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_generalMsgs = array();
+	protected $_generalMsgs = array();
 	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -83,7 +85,7 @@ class userAgentFunctions
 	 * Reset error handle
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _resetErrorHandle()
 	{
@@ -93,9 +95,9 @@ class userAgentFunctions
 	/**
 	 * Add an error message
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Error message to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _addErrorMessage( $error )
 	{
@@ -117,7 +119,7 @@ class userAgentFunctions
 	 * Reset error handle
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _resetMessageHandle()
 	{
@@ -129,7 +131,7 @@ class userAgentFunctions
 	 *
 	 * @access	protected
 	 * @param	string		Error message to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	final protected function _addMessage( $error )
 	{
@@ -168,7 +170,7 @@ class userAgentFunctions
 		//-----------------------------------------
 		$BROWSERS = array();
 		$ENGINES  = array();
-		require_once( IPS_ROOT_PATH . 'extensions/userAgents.php' );
+		require_once( IPS_ROOT_PATH . 'extensions/userAgents.php' );/*noLibHook*/
 		
 		//-----------------------------------------
 		// Build names
@@ -389,7 +391,7 @@ class userAgentFunctions
 	 * Recaches the user-agents where-ever it needs recaching!
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildUserAgentCaches()
 	{
@@ -428,7 +430,7 @@ class userAgentFunctions
 	 * Recaches the user-agents where-ever it needs recaching!
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildUserAgentGroupCaches()
 	{
@@ -468,7 +470,7 @@ class userAgentFunctions
 	 * NOT CURRENTLY USED
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function rebuildUserAgentSkinMap()
 	{
@@ -480,7 +482,7 @@ class userAgentFunctions
 	 *
 	 * @access	public
 	 * @param	int		UA Group ID
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function removeUserAgentGroup( $ugroup_id )
 	{
diff --git a/upload/admin/sources/classes/virusChecker/index.html b/upload/admin/sources/classes/virusChecker/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/virusChecker/index.html
+++ b/upload/admin/sources/classes/virusChecker/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/virusChecker/lib_known_names.php b/upload/admin/sources/classes/virusChecker/lib_known_names.php
index 1aa48bb5..b263425f 100644
--- a/upload/admin/sources/classes/virusChecker/lib_known_names.php
+++ b/upload/admin/sources/classes/virusChecker/lib_known_names.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Virus scanner: known blacklisted filenames
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 7445 $
  *
  */
 
diff --git a/upload/admin/sources/classes/virusChecker/lib_writeable_dirs.php b/upload/admin/sources/classes/virusChecker/lib_writeable_dirs.php
index cbe9101a..56aca224 100644
--- a/upload/admin/sources/classes/virusChecker/lib_writeable_dirs.php
+++ b/upload/admin/sources/classes/virusChecker/lib_writeable_dirs.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Virus scanner: writable directories
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-23 19:57:29 -0500 (Thu, 23 Dec 2010) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 7485 $
  *
  */
 
@@ -22,9 +22,8 @@ $WRITEABLE_DIRS = array(
 'cache',
 'cache/skin_cache',
 'cache/lang_cache',
-'public',
-'public/style_emoticons',
-'public/style_images',
-'public/style_css',
+PUBLIC_DIRECTORY . '/style_emoticons',
+PUBLIC_DIRECTORY . '/style_images',
+PUBLIC_DIRECTORY . '/style_css',
 'uploads'
 );
diff --git a/upload/admin/sources/classes/virusChecker/plugins/example.php b/upload/admin/sources/classes/virusChecker/plugins/example.php
index b2008a34..eb9461ef 100644
--- a/upload/admin/sources/classes/virusChecker/plugins/example.php
+++ b/upload/admin/sources/classes/virusChecker/plugins/example.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Virus scanner: Plugin example.
  * The plugin system can be used to extend the virus scanner functionality by checking for arbitrary 
  * things to score the virus rating against.  See the two links below for more ideas/suggestions.
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8644 $
  * 
  * @link 		http://forums.invisionpower.com/index.php?autocom=tracker&showissue=8452
  * @link		http://forums.invisionpower.com/index.php?autocom=tracker&showissue=8453
@@ -32,9 +32,12 @@ class virusScannerPlugin_example
 	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -42,7 +45,7 @@ class virusScannerPlugin_example
 	 * 
 	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
diff --git a/upload/admin/sources/classes/virusChecker/plugins/index.html b/upload/admin/sources/classes/virusChecker/plugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/classes/virusChecker/plugins/index.html
+++ b/upload/admin/sources/classes/virusChecker/plugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/classes/virusChecker/virusChecker.php b/upload/admin/sources/classes/virusChecker/virusChecker.php
index eb2636d8..c64dc455 100644
--- a/upload/admin/sources/classes/virusChecker/virusChecker.php
+++ b/upload/admin/sources/classes/virusChecker/virusChecker.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Virus scanner
- * Last Updated: $Date: 2010-09-15 17:14:23 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-07-06 16:54:25 -0400 (Wed, 06 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tue. 17th August 2004
- * @version		$Rev: 6881 $
+ * @version		$Rev: 9172 $
  * 
  */
 
@@ -66,9 +66,12 @@ class virusChecker
 	protected $registry;
 	protected $DB;
 	protected $settings;
+	protected $request;
 	protected $lang;
 	protected $member;
+	protected $memberData;
 	protected $cache;
+	protected $caches;
 	/**#@-*/
 	
 	/**
@@ -76,7 +79,7 @@ class virusChecker
 	 * 
 	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -104,7 +107,7 @@ class virusChecker
 		// Known names
 		//-----------------------------------------
 		$KNOWN_NAMES = array();
-		require( IPS_ROOT_PATH . 'sources/classes/virusChecker/lib_known_names.php' );
+		require( IPS_ROOT_PATH . 'sources/classes/virusChecker/lib_known_names.php' );/*noLibHook*/
 		
 		$this->known_names = $KNOWN_NAMES;
 	}
@@ -115,7 +118,7 @@ class virusChecker
 	 * $this->bad_files array
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function runScan()
 	{
@@ -131,7 +134,7 @@ class virusChecker
 		// Get libs
 		//-----------------------------------------
 		$WRITEABLE_DIRS = array();
-		require( IPS_ROOT_PATH . 'sources/classes/virusChecker/lib_writeable_dirs.php' );
+		require( IPS_ROOT_PATH . 'sources/classes/virusChecker/lib_writeable_dirs.php' );/*noLibHook*/
 		
 		//-----------------------------------------
 		// Sort out directory separator
@@ -295,13 +298,13 @@ class virusChecker
 		// Check emoticons
 		//-----------------------------------------
 		
-		$this->deepScan( $root_dir . $this->dir_split . 'public/style_emoticons', 'all' );
+		$this->deepScan( $root_dir . $this->dir_split . PUBLIC_DIRECTORY . '/style_emoticons', 'all' );
 		
 		//-----------------------------------------
 		// Check image directories
 		//-----------------------------------------
 		
-		$this->deepScan( $root_dir . $this->dir_split . 'public/style_images', '(php|cgi|pl|perl|php3|php4|php5|php6|phtml|shtml)' );
+		$this->deepScan( $root_dir . $this->dir_split . PUBLIC_DIRECTORY . '/style_images', '(php|cgi|pl|perl|php3|php4|php5|php6|phtml|shtml)' );
 		
 		//-----------------------------------------
 		// Check upload directories
@@ -324,12 +327,12 @@ class virusChecker
 	 * Modified in the 30 days + 1
 	 * In non PHP folder + 3
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string	Full file path and name
 	 * @param	array 	stat info
 	 * @return	int 	Score (0 - 10 )
 	 */
-	private function _scoreFile( $file_name, $stat=array() )
+	protected function _scoreFile( $file_name, $stat=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -410,7 +413,7 @@ class virusChecker
 		// Non PHP folder...
 		//-----------------------------------------
 		
-		if ( preg_match( "#(?:style_images|style_emoticons|uploads|style_avatars|default|1|skin_acp|html|skin)/#i", $file_name ) )
+		if ( preg_match( "#(?:style_images|style_emoticons|uploads|default|1|skin_acp|html|skin)/#i", $file_name ) )
 		{
 			$SCORE += 3;
 		}
@@ -431,12 +434,11 @@ class virusChecker
             	
 						if( strpos( $_name, '.php' ) )
 						{
-							include_once( $file->getPathname() );
+							$classToLoad = IPSLib::loadLibrary( $file->getPathname(), 'virusScannerPlugin_' . str_replace( '.php', '', $_name ) );
 							
-							if( class_exists( 'virusScannerPlugin_' . str_replace( '.php', '', $_name ) ) )
+							if( class_exists( $classToLoad ) )
 							{
-								$class 	= 'virusScannerPlugin_' . str_replace( '.php', '', $_name );
-								$plugin	= new $class( $this->registry );
+								$plugin	= new $classToLoad( $this->registry );
 								
 								if( method_exists( $plugin, 'run' ) )
 								{
diff --git a/upload/admin/sources/classes/vkontakte/connect.php b/upload/admin/sources/classes/vkontakte/connect.php
index f982cbfb..0e2ddc27 100644
--- a/upload/admin/sources/classes/vkontakte/connect.php
+++ b/upload/admin/sources/classes/vkontakte/connect.php
@@ -2,455 +2,646 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.0
+ * IP.Board v3.2.0
  * Vkontakte Connect Library
- * Created by Ivan Gavrikov
+ * Last Updated: $Date: 2011-06-06 16:33:53 -0400 (Mon, 06 Jun 2011) $
  * </pre>
  *
- * @author      $Author: giv $
- * @copyright   (c) 2010 IBResource, LTD.
- * @license     http://www.ibresource.ru/products/ipboard/
- * @package     IP.Board
- * @link        http://www.ibresource.ru
- * @version     $Rev: 6242 $
+ * @author 		$Author: bfarber $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 8980 $
  *
  */
 
-class Vkontakte_Request_Validator
-{
-    /**
-     * Vkontakte API key
-     *
-     * @var string
-     */
-    protected $_api_key = '';
-
-    /**
-     * Vkontakte API Secret
-     *
-     * @var string
-     */
-    protected $_secret  = '';
-
-    /**
-     * VK data
-     *
-     * @var array
-     */
-    private $_data = array();
-
-    /**
-     * Valid vk data names
-     *
-     * @var array
-     */
-    private $_valid_params = array(
-        'expire', 'mid', 'secret', 'sid', 'sig'
-    );
-
-    /**
-     * Request validity flag
-     *
-     * @var boolean
-     */
-    private $_valid = true;
-
-    /**
-     * undocumented function
-     *
-     * @param string $api_key
-     * @param string $secret
-     * @author GiV
-     */
-    public function __construct( $api_key, $secret )
-    {
-        $this->_api_key = $api_key;
-        $this->_secret  = $secret;
-
-        $this->_validate_params();
-    }
-
-    /**
-     * Get request validity status
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return $this->_valid;
-    }
-
-    /**
-     * Check vkontakte data parameters validity
-     * compare signature of recieved params and
-     * recieved signature
-     *
-     * @return void
-     */
-    private function _validate_params()
-    {
-        if( isset($_COOKIE[ 'vk_app_' . $this->_api_key ]) )
-        {
-            $params = explode( '&', $_COOKIE[ 'vk_app_' . $this->_api_key ]);
-            foreach( $params as &$param )
-            {
-                $param_data = explode( '=', $param );
-
-                if( count( $param_data) > 1 )
-                {
-                    if( in_array( $param_data[0], $this->_valid_params ) )
-                    {
-                        $this->_data[ $param_data[0] ] = $param_data[1];
-
-                        if ( 'sig' == $param_data[0] )
-                        {
-                            $param = '';
-                        }
-                    }
-                }
-            }
-
-            if( time() > $this->expire )
-            {
-                $this->_valid = false;
-            }
-
-            if( $this->sig != $this->_getSignature( $params ) )
-            {
-                $this->_valid = false;
-            }
-
-            return;
-        }
-
-        $this->_valid = false;
-
-        return;
-    }
-
-    /**
-     * Make signature for data array
-     *
-     * @param string $data Array
-     * @return string
-     */
-    private function _getSignature( $data )
-    {
-        return  md5( implode('', $data) . $this->_secret );
-    }
-
-    /**
-     * Magic method for setting data value
-     * from request
-     *
-     * @param string $key 
-     * @param string $value 
-     * @return mixed
-     */
-    public function __set( $key, $value )
-    {
-        $this->_data[ $key ] = $value;
-    }
-
-    /**
-     * Magic method for getting data value
-     * from request
-     *
-     * @param string $key 
-     * @return mixed
-     */
-    public function __get( $key )
-    {
-        if( isset( $this->_data[ $key ] ) && $this->_valid )
-        {
-            return $this->_data[ $key ];
-        }
-
-        return false;
-    }
-}
-
-/**
- * Class for working with vkontakte users
- *
- * @author      $Author: giv $
- * @copyright   (c) 2010 IBResource, LTD.
- * @license     http://www.ibresource.ru/products/ipboard/
- * @package     IP.Board
- * @link        http://www.ibresource.ru
- * @version     $Rev: 6242 $
- */
 class vkontakte_connect
 {
-    /**#@+
-    * Registry Object Shortcuts
-    *
-    * @access   protected
-    * @var      object
-    */
-    protected $DB;
-    protected $settings;
-    protected $lang;
-    protected $member;
-    protected $memberData;
-    protected $cache;
-    protected $caches;
-    /**#@-*/
+	/**#@+
+	* Registry Object Shortcuts
+	*
+	* @access	protected
+	* @var		object
+	*/
+	protected $registry;
+	protected $DB;
+	protected $settings;
+	protected $request;
+	protected $lang;
+	protected $member;
+	protected $memberData;
+	protected $cache;
+	protected $caches;
+	/**#@-*/
+	
+	/**
+	 * Twitter OAUTH wrapper
+	 *
+	 * @access	protected
+	 * @var		object
+	 */
+	protected $_api;
+	
+	/**
+	 * IPBs log in handler
+	 *
+	 * @access	protected
+	 * @var		object
+	 */
+	protected $_login;
+	
+	/**
+	 * User connected
+	 * 
+	 * @access	protected
+	 * @var		boolean
+	 */
+	protected $_connected = false;
+	
+	/**
+	 * User: Token
+	 *
+	 * @access	protected
+	 * @var		string
+	 */
+	protected $_userToken;
+	
+	/**
+	 * User: Secret
+	 *
+	 * @access	protected
+	 * @var		string
+	 */
+	protected $_userSecret;
+	
+	/**
+	 * User: Data
+	 *
+	 * @access	protected
+	 * @var		array
+	 */
+	protected $_userData = array();
+	
+	/**
+	 * Construct.
+	 * @access	public
+	 * @return	@e void
+	 */
+	public function __construct( $registry, $token='', $userId=0 )
+	{
+		/* Make object */
+		$this->registry   =  $registry;
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->lang       =  $this->registry->getClass('class_localization');
+		$this->member     =  $this->registry->member();
+		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+		
+		define("VKONTAKTE_APP_ID"   , trim( ipsRegistry::$settings['vk_api_id'] ) );
+		define("VKONTAKTE_APP_SECRET", trim( ipsRegistry::$settings['vk_secret'] ) );
+		define("VKONTAKTE_CALLBACK" , $this->settings['_original_base_url'] . '/interface/vkontakte/index.php?m=' . $this->memberData['member_id'] );
 
-    /**
-     * IPBs log in handler
-     *
-     * @access  private
-     * @var     object
-     */
-    private $_login;
+		/* Auto do it man */
+		if ( ! $token AND $this->memberData['member_id'] AND $this->memberData['vk_token'] )
+		{
+			$token  = $this->memberData['vk_token'];
+		}
+		
+		/* Auto do it man */
+		if ( ! $userId AND $this->memberData['member_id'] AND $this->memberData['vk_uid'] )
+		{
+			$userId  = $this->memberData['vk_uid'];
+		}
+		
+		
+		/* Test */
+		if ( ! VKONTAKTE_APP_ID OR ! VKONTAKTE_APP_SECRET )
+		{
+			throw new Exception( 'TWITTER_NOT_SET_UP' );
+		}
 
-    /**
-     * User: Token
-     *
-     * @access  private
-     * @var     string
-     */
-    private $_token;
-
-    /**
-     * User: Data
-     *
-     * @access  private
-     * @var     array
-     */
-    private $_userData = array();
-
-    /**
-     * Construct.
-     *
-     * @access  public
-     * @return  void
-     */
-    public function __construct( $registry, $token='' )
-    {
-        /* Make object */
-        $this->registry   =  $registry;
-        $this->_token     =  $token;
-        $this->DB         =  $this->registry->DB();
-        $this->settings   =& $this->registry->fetchSettings();
-        $this->request    =& $this->registry->fetchRequest();
-        $this->lang       =  $this->registry->getClass('class_localization');
-        $this->member     =  $this->registry->member();
-        $this->memberData =& $this->registry->member()->fetchMemberData();
-        $this->cache      =  $this->registry->cache();
-        $this->caches     =& $this->registry->cache()->fetchCaches();
-    }
-
-
-    /**
-     * Show the vkontakte connect page.
-     *
-     * @access  public
-     * @return  redirect
-     */
-    public function redirectToConnectPage()
-    {
-        $template = $this->registry->getClass('output')->getTemplate('vkontakte')->showLogInVkFrame( $this->member->form_hash );
-
-        print $template;
-    }
-
-    /**
-     * Completes the connection
-     *
-     * @access  public
-     * @return  redirect
-     */
-    public function finishLogin()
-    {
-        $vk = new Vkontakte_Request_Validator( $this->settings['vk_api_id'], $this->settings['vk_secret'] );
-
-        if ( $vk->mid )
+		/* Set include path.. */
+		@set_include_path( IPS_KERNEL_PATH . 'vkontakte/' . PATH_SEPARATOR . ini_get( 'include_path' ) );/*noLibHook*/
+		
+		/* Reset the API */
+		$this->resetApi( $token, $userId );
+	}
+	
+	/**
+	 * Resets API
+	 *
+	 * @access	public
+	 * @param	string		OAUTH user token
+	 * @param	string		OAUTH user secret
+	 */
+	public function resetApi( $token='', $userId='' )
+	{
+		$this->_userToken  = trim( $token );
+		$this->_userId = trim( $userId );
+		
+		/* Load API */
+		require_once( IPS_KERNEL_PATH . 'vkontakte/oauth2.php' );/*noLibHook*/
+		$this->_api = new vkClient( 
+		    array(
+                'base_uri'                  => $this->settings['_original_base_url'],
+                'client_id'                 => VKONTAKTE_APP_ID,
+                'client_secret'             => VKONTAKTE_APP_SECRET,
+                'cookie_support'            => true,
+                'scope'                     => 'wall',
+                'base_domain'               => $this->settings['cookie_domain'],
+                'services_uri'              => 'https://api.vkontakte.ru/method',
+                'access_token_uri'          => 'https://api.vkontakte.ru/oauth/access_token',
+                'authorize_uri'             => 'http://api.vkontakte.ru/oauth/authorize',
+                'authorize_callback_uri'    => VKONTAKTE_CALLBACK
+            )
+        );
+		
+        if ( $this->_userToken AND $this->_userId )
         {
-            /* Got a member linked already? */
-            $_member = IPSMember::load( $vk->mid, 'all', 'vk_uid' );
-
-            if ( $_member['member_id'] )
+            try
             {
-                /* Check for partial member id */
-                $pmember = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'members_partial', 'where' => "partial_member_id=" . $_member['member_id'] ) );
-
-                if ( $pmember['partial_member_id'] )
-                {
-                    $this->_token = $_REQUEST['key'];
-
-                    $this->DB->update( 'vkontakte_connect', array( 'v_key' => $pmember['partial_date']), "v_key='" . IPSText::md5Clean( $this->_token ) . "'" );
-                    $this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=global&section=register&do=complete_login&mid='. $_member['member_id'].'&key='.$pmember['partial_date'] );
-                }
-                else
-                {
-                    /* Here, so log us in!! */
-                    $this->_login()->loginWithoutCheckingCredentials( $_member['member_id'], TRUE );
-
-                    $this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] );
-                }
+    			$r = $this->_api->api( 'getProfiles', 'GET', array(
+    			    'access_token'=> $this->_userToken, 
+    			    'uids' => $this->_userId, 
+    			    'fields' => 'uid,first_name,last_name,nickname,photo,timezone' 
+    			) );
+			
+    			$_userData = array_pop( $r['response'] );
+            }
+            catch ( Exception $e ) {}
+            
+            if ( $_userData['uid'] )
+            {
+                $this->_userData  = $_userData;
+                $this->_connected = true;
             }
             else
             {
-                $this->_token = $_REQUEST['key'];
-                $this->fetchUserData();
-
-                if ( $vk->mid !== $this->_userData['id'] )
-                {
-                    throw new Exception( 'CREATION_FAIL' );
-                }
-
-                /* From reg, so create new account properly */
-                $toSave = array( 'core'          => array(  'name'                   => IPSText::convertCharsets( $this->_userData['name'], 'utf-8', IPS_DOC_CHAR_SET ),
-                                                            'members_display_name'   => '',
-                                                            'members_created_remote' => 1,
-                                                            'member_group_id'        => ( $this->settings['vk_mgid'] ) ? $this->settings['vk_mgid'] : $this->settings['member_group'],
-                                                            'email'                  => '',
-                                                            'vk_uid'                 => $this->_userData['id']),
-                                'extendedProfile' => array(
-                                                            'avatar_location'        => $this->_userData['photo'],
-                                                            'avatar_type'            => 'vk' ) );
-
-                $memberData = IPSMember::create( $toSave, TRUE, FALSE, FALSE );
-
-                if ( ! $memberData['member_id'] )
-                {
-                    throw new Exception( 'CREATION_FAIL' );
-                }
-
-                $pmember = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'members_partial', 'where' => "partial_member_id=" . $memberData['member_id'] ) );
-
-                if ( $pmember['partial_member_id'] )
-                {
-                    $this->DB->update( 'vkontakte_connect', array( 'v_key' => $pmember['partial_date']), "v_key='" . IPSText::md5Clean( $this->_token ) . "'" );
-
-                    $this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=global&section=register&do=complete_login&mid='. $memberData['member_id'].'&key='.$pmember['partial_date'] );
-                }
-                else
-                {
-                    throw new Exception( 'CREATION_FAIL' );
-                }
+                $this->_userData  = array();
+                $this->_connected = false;
             }
         }
-    }
-
-    /**
-     * Return user data
-     *
-     * @access  public
-     * @return  array
-     */
-    public function fetchUserData()
-    {
-        //echo $this->_token; exit;
-        $connectData = $this->DB->buildAndFetch( array( 'select' => '*',
-                                                        'from'   => 'vkontakte_connect',
-                                                        'where'  => "v_key='" . IPSText::md5Clean( $this->_token ) . "'" ) );
-
-        if ( !$connectData['v_key'] )
-        {
-            /* @todo something more useful here */
-            throw new Exception( "NO_KEY_FOUND" );
-        }
-
-        $this->_userData = array( 'name'  => $connectData['v_user'],
-                         'photo' => $connectData['v_data'],
-                         'id'  => $connectData['v_id']  );
-
-        return $this->_userData;
-    }
-
-    /**
-     * Finish a log-in connection
-     * WARNING: NO PERMISSION CHECKS ARE PERFORMED IN THIS FUNCTION.
-     *
-     * @access      public
-     * @param       int         Forum ID of original member (member to keep)
-     * @param       int         Forum ID of linking member  (member to remove)
-     * @return      boolean
-     */
-    public function finishNewConnection( $originalId, $newId )
-    {
-        $this->DB->delete( 'vkontakte_connect', "v_key='" . IPSText::md5Clean( $this->_token ) . "'" );
-
-        if ( $originalId AND $newId )
-        {
-             $original = IPSMember::load( $originalId, 'all' );
-             $new      = IPSMember::load( $newId, 'all' );
-
-             if ( $original['member_id'] AND $new['vk_uid'] )
-             {
-                 IPSMember::save( $original['member_id'], array( 'core' => array( 'vk_uid' => $new['vk_uid'] ) ) );
-
-                 return true;
-             }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if vk user linked to forum account
-     *
-     * @return boolean|array
-     */
-    public function isLinked()
-    {
-        $vk = new Vkontakte_Request_Validator( $this->settings['vk_api_id'], $this->settings['vk_secret'] );
-
-        if ( $vk->mid )
-        {
-            $_member = IPSMember::load( $vk->mid, 'all', 'vk_uid' );
-            return $_member['member_id'];
-        }
         else
         {
-            return false;
+			$this->_userData  = array();
+			$this->_connected = false;
         }
-    }
+	}
 
-    /**
-     * Make linking local account and current vk user
-     *
-     * @return boolean
-     */
-    public function linkTo( $mid )
-    {
-        $vk = new Vkontakte_Request_Validator( $this->settings['vk_api_id'], $this->settings['vk_secret'] );
+	/**
+	 * Return user data
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	public function fetchUserData()
+	{
+		return $this->_userData;
+	}
+	
+	/**
+	 * Return whether or not the user is connected
+	 *
+	 * @access	public
+	 * @return	boolean
+	 */
+	public function isConnected()
+	{
+		return ( $this->_connected == true ) ? true : false;
+	}
+	
+	/**
+	 * Post a status update to vk wall based on native content
+	 * Which may be longer and such and so on and so forth, etc
+	 *
+	 * @access	public
+	 * @param	string		Content
+	 * @param	string		URL to add
+	 * @param	bool		Always add the URL regardless of content length
+	 */
+	public function updateStatusWithUrl( $content, $url, $alwaysAdd=TRUE )
+	{
+		/* Ensure content is correctly de-html-ized */
+		$content = IPSText::UNhtmlspecialchars( $content );
+		
+		/* Is the text longer than 140 chars? */
+		if ( $alwaysAdd === TRUE or IPSText::mbstrlen( $content ) > 140 )
+		{
+			/* Leave 26 chars for URL shortener */
+			if ( IPSText::mbstrlen( $content ) > 117 )
+			{
+				$content = IPSText::mbsubstr( $content, 0, 114 ) . '...';
+			}
+			
+			/* Generate short URL */
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/url/shorten.php', 'urlShorten' );
+			$shorten = new $classToLoad();
+ 			
+ 			$data      = $shorten->shorten( $url, IPS_URL_SHORTEN_SERVICE );
+ 			
+ 			return $this->updateStatus( $content . ' ' . $data['url'] );
+		}
+		else
+		{
+			/* Just post it */
+			return $this->updateStatus( $content );
+		}
+	}
+	
+	/**
+	 * Post a status update to vkontakte
+	 *
+	 * @access	public
+	 * @return	mixed		status id (int) successful, FALSE, #ftl
+	 */
+	public function updateStatus( $text )
+	{
+		die('To be implemented');
+	}
+	
+	/**
+	 * Redirects a user to the oauth connect page.
+	 *
+	 * @access	public
+	 * @return	redirect
+	 */
+	public function redirectToConnectPage()
+	{
+		/* Reset api to ensure user is not logged in */
+		$this->resetApi();
+		
+		/* Append OAUTH URL */
+		$key =  md5( uniqid( microtime() ) );
+		$_urlExtra = '&key=' . $key;
 
-        if ( $vk->mid )
-        {
-            $isLinked = $this->isLinked();
+		/* From registration/log in? */
+		if ( ! $this->memberData['member_id'] AND $this->request['reg'] )
+		{
+			/* Append URL with correct member ID and other params */
+			$_urlExtra .= '&reg=1';
+		}
 
-            if( ! $isLinked OR $isLinked !== $mid )
-            {
-                if ( $isLinked ) IPSMember::remove( $isLinked );
-                IPSMember::save( $mid, array( 'core' => array( 'vk_uid' => intval($vk->mid) ) ) );
+		/* Update user's row */
+		if ( $this->memberData['member_id'] )
+		{
+			IPSMember::save( $this->memberData['member_id'], array( 'core' => array( 'vk_token'  => $key ) ) );
+		}
+		
+		$this->_api->setVariable( 'authorize_callback_uri', VKONTAKTE_CALLBACK . $_urlExtra );
+		
+		$this->registry->output->silentRedirect( $this->_api->getAuthorizeUrl() );  
+	}
+	
+	/**
+	 * Completes the connection
+	 *
+	 * @access	public
+	 * @return	redirect
+	 * 
+	 */
+	public function finishLogin()
+	{
+		/* From reg flag */
+		if ( $_REQUEST['code'] )
+		{
+    		/* Reset api to ensure user is not logged in */
+    		$this->resetApi();
+			
+			/* Ensure URL is correct */
+			$_urlExtra = '';
+			
+			if ( $_REQUEST['key'] )
+			{
+				$_urlExtra .= '&key=' . $_REQUEST['key'];
+			}
+			
+			if ( $_REQUEST['reg'] )
+			{
+				$_urlExtra .= '&reg=1';
+			}
+			
+			/* Update callback url */
+			$this->_api->setVariable( 'authorize_callback_uri', VKONTAKTE_CALLBACK . $_urlExtra );
 
-                return true;
-            }
-        }
+			/* Generate oAuth token */
+			$rToken = $this->_api->getAccessToken();
+			
+			if ( is_string( $rToken ) )
+			{
+				try
+				{
+				    $oAuthSession = $this->_api->getSession();
+					$r = $this->_api->api( 'getProfiles', 'GET', array('uids' => $oAuthSession['user_id'], 'fields' => 'uid,first_name,last_name,nickname,photo,timezone' ) );
+					
+					$_userData = array_pop( $r['response'] );
+				}
+				catch( Exception $e ){}
+				
+				/* A little gymnastics */
+				$this->_userData = $_userData;
+				
+				/* Got a member linked already? */
+				$_member = IPSMember::load( $_userData['uid'], 'all', 'vk_uid' );
+								
+				if ( $_member['member_id'] )
+				{
+					$memberData = $_member;
+					
+					/* Ensure user's row is up to date */
+					IPSMember::save( $memberData['member_id'], array( 'core' => array( 'vk_token' => $rToken ) ) );
+					    
+					/* Here, so log us in!! */
+					$data = $this->_login()->loginWithoutCheckingCredentials( $memberData['member_id'], TRUE );
+					
+					$this->registry->getClass('output')->silentRedirect( $data[1] ? $data[1] : $this->settings['base_url'] );
+				}
+				else
+				{
+                    /* No? Create a new member */
+                    foreach( array( 'vc_s_pic', 'vc_s_status' ) as $field )
+                    {
+                        $toSave[ $field ] = 1;
+                    }
+                    
+                    $vk_bwoptions = IPSBWOptions::freeze( $toSave, 'vkontakte' );
+					$safeName   = str_replace( ' ', '', IPSText::convertCharsets( $_userData['first_name'] .'_'. $_userData['last_name'], 'utf-8', IPS_DOC_CHAR_SET ) );
+					$displayName  = ( ! $this->settings['auth_allow_dnames'] ) ? $safeName : FALSE;
+					
+					/* Make sure usernames are safe */
+					if ( $this->settings['username_characters'] )
+					{
+						$check_against = preg_quote( $this->settings['username_characters'], "/" );
+						$check_against = str_replace( '\-', '-', $check_against );
+						
+						$safeName = preg_replace( '/[^' . $check_against . ']+/i', '', $safeName );
+					}
+					
+					/* If we're not allowing display names, then use may not hit partial form, so.. */
+					if ( ! $this->settings['auth_allow_dnames'] AND $displayName AND $_userData['email'] AND $_userData['uid'] )
+					{
+						/* Remote registrations disabled? */
+						if ( $this->settings['no_reg'] == 2 )
+						{
+							$this->registry->output->showError( 'no_remote_reg', 1090002 );
+						}
+					}
+		
+					/* From reg, so create new account properly */
+					$toSave = array( 'core' 		 => array(  'name' 				     => $safeName,
+													 		    'members_display_name'   => $displayName,
+													 		    'members_created_remote' => 1,
+													 		    'member_group_id'		 => ( $this->settings['fbc_mgid'] ) ? $this->settings['fbc_mgid'] : $this->settings['member_group'],
+                                                                // 'email'                  => $_userData['email'],
+															    'vk_uid'                 => $_userData['uid'],
+															    'time_offset'            => $_userData['timezone'],
+															    'vk_token'               => $rToken ),
+									'extendedProfile' => array( 'vk_bwoptions'    		 => $vk_bwoptions ) );
+	
+					
+					$memberData = IPSMember::create( $toSave, TRUE, FALSE, TRUE );
+					
+					if ( ! $memberData['member_id'] )
+					{
+						throw new Exception( 'CREATION_FAIL' );
+					}
+					
+					/* Sync up photo */
+                    $this->syncMember( $memberData['member_id'] );
+					
+					$pmember = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'members_partial', 'where' => "partial_member_id=" . $memberData['member_id'] ) );
 
-        return false;
+					if ( $pmember['partial_member_id'] )
+					{
+						$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=global&section=register&do=complete_login&mid='. $memberData['member_id'].'&key='.$pmember['partial_date'] );
+					}
+					else
+					{
+						/* Already got a display name */
+						if ( $displayName )
+						{
+							/* Here, so log us in!! */
+							$data = $this->_login()->loginWithoutCheckingCredentials( $memberData['member_id'], TRUE );
+							
+							IPSLib::runMemberSync( 'onCompleteAccount', $memberData );
+					
+							$this->registry->getClass('output')->silentRedirect( $data[1] ? $data[1] : $this->settings['base_url'] );
+						}
+						else
+						{
+							throw new Exception( 'CREATION_FAIL' );
+						}
+					}
+				}
+			}
+			else
+			{
+				throw new Exception( 'CREATION_FAIL' );
+			}
+		}
+	}
+	
+	/**
+	 * Completes the connection
+	 *
+	 * @access	public
+	 * @return	redirect
+	 */
+	public function finishConnection()
+	{
+		if ( $_REQUEST['m'] AND $_REQUEST['key'] )
+		{
+			/* Load user */
+			$member = IPSMember::load( intval( $_REQUEST['m'] ) );
+		
+			if ( $member['vk_token'] == $_REQUEST['key'] )
+			{
+        		/* Reset api to ensure user is not logged in */
+        		$this->resetApi();
 
-    }
+    			/* Ensure URL is correct */
+    			$_urlExtra = '';
 
-    /**
-     * Accessor for the log in functions
-     *
-     * @access  public
-     * @return  object
-     */
-    public function _login()
-    {
-        if ( ! is_object( $this->_login ) )
-        {
-            require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
-            $this->_login =  new han_login( $this->registry );
-            $this->_login->init();
-        }
+    			if ( $_REQUEST['key'] )
+    			{
+    				$_urlExtra .= '&key=' . $_REQUEST['key'];
+    			}
 
-        return $this->_login;
-    }
+    			if ( $_REQUEST['reg'] )
+    			{
+    				$_urlExtra .= '&reg=1';
+    			}
+
+    			/* Update callback url */
+    			$this->_api->setVariable( 'authorize_callback_uri', VKONTAKTE_CALLBACK . $_urlExtra );
+
+    			/* Generate oAuth token */
+    			$rToken = $this->_api->getAccessToken();
+
+				if ( is_string( $rToken ) )
+				{
+					try
+					{
+    				    $oAuthSession = $this->_api->getSession();
+    					$r = $this->_api->api( 'getProfiles', 'GET', array('uids' => $oAuthSession['user_id'], 'fields' => 'uid' ) );
+
+    					$_userData = array_pop( $r['response'] );
+					}
+					catch( Exception $e ){}
+
+					/* Ensure user's row is up to date */
+					IPSMember::save( $member['member_id'], array( 'core' => array( 'vk_uid'    => $_userData['uid'],
+																				   'vk_token'  => $rToken ) ) );
+				}
+			}
+		}
+		
+		/* Redirect back to settings page */
+		$this->registry->getClass('output')->silentRedirect( $this->settings['base_url'] . 'app=core&module=usercp&tab=core&area=vkontakte' );
+	}
+	
+		/**
+	 * Finish a log-in connection
+	 * WARNING: NO PERMISSION CHECKS ARE PERFORMED IN THIS FUNCTION.
+	 *
+	 * @access		public
+	 * @param		int			Forum ID of original member (member to keep)
+	 * @param		int			Forum ID of linking member  (member to remove)
+	 * @return		boolean
+	 */
+	public function finishNewConnection( $originalId, $newId )
+	{
+		if ( $originalId AND $newId )
+		{
+			$original = IPSMember::load( $originalId, 'all' );
+			$new      = IPSMember::load( $newId, 'all' );
+			
+			if ( $original['member_id'] AND $new['vk_uid'] AND $new['vk_token'] )
+			{
+				IPSMember::save( $original['member_id'], array( 'core' => array( 'vk_uid' => $new['vk_uid'], 'vk_token' => $new['vk_token'] ) ) );
+				
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Function to resync a member's Vkontakte data
+	 *
+	 * @access	public
+	 * @param	mixed		Member Data in an array form (result of IPSMember::load( $id, 'all' ) ) or a member ID
+	 * @return	array 		Updated member data	
+	 *
+	 * EXCEPTION CODES:
+	 * NO_MEMBER		Member ID does not exist
+	 * NOT_LINKED		Member ID or data specified is not linked to a FB profile
+	 */
+	public function syncMember( $memberData )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$exProfile = array();
+		
+		/* Do we need to load a member? */
+		if ( ! is_array( $memberData ) )
+		{
+			$memberData = IPSMember::load( intval( $memberData ), 'all' );
+		}
+		
+		/* Got a member? */
+		if ( ! $memberData['member_id'] )
+		{
+			throw new Exception( 'NO_MEMBER' );
+		}
+		
+		/* Linked account? */
+		if ( ! $memberData['vk_uid'] )
+		{
+			throw new Exception( 'NOT_LINKED' );
+		}
+		
+		/* Not completed sign up ( no display name ) */
+		if ( $memberData['member_group_id'] == $this->settings['auth_group'] )
+		{
+			return false;
+		}
+		
+		/* Thaw Options */
+		$bwOptions = IPSBWOptions::thaw( $memberData['vk_bwoptions'], 'vkontakte' );
+
+		/* Grab the data */
+		try
+		{
+			$this->resetApi( $memberData['vk_token'], $memberData['vk_uid'] );
+			
+			if ( $this->isConnected() )
+			{
+				$user = $this->fetchUserData();
+				
+				/* Load library */
+				if ( $bwOptions['vc_s_pic'] )
+				{
+					$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/photo.php', 'classes_member_photo' );
+					$photo = new $classToLoad( $this->registry );
+					
+					$photo->save( $memberData, 'vkontakte' );
+				}
+			}
+		}
+		catch( Exception $e )
+		{
+		}
+		
+		return $memberData;
+	}
+	
+	/**
+	 * Fetch a user's recent status updates (max 50)
+	 *
+	 * @access	public
+	 * @param	int		Twitter ID
+	 * @param	bool	Strip @replies (true default)
+	 * @param	int		Minimum ID to grab from
+	 * @return	array
+	 */
+	public function fetchUserWall( $userId=0, $minId=0 )
+	{
+		$userId = ( $userId ) ? $userId : $this->_userData['uid'];
+		$count  = 50;
+		$final  = array();
+		
+		$updates = $this->_api->api('wall.get', 'GET', array( 
+		    'access_token' => $this->_userToken,
+		    'owner_id' => $userId, 'count' => 50, 'offset' => $minId, 'filter' => 'owner' ) );
+		
+		print_r( $updates ); exit; 
+		
+		return $final;
+	}
+	
+	/**
+	 * Accessor for the log in functions
+	 *
+	 * @access	public
+	 * @return	object
+	 */
+	public function _login()
+	{
+		if ( ! is_object( $this->_login ) )
+		{
+			$classToLoad  = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+			$this->_login =  new $classToLoad( $this->registry );
+	    	$this->_login->init();
+		}
+		
+		return $this->_login;
+	}
+	
 }
\ No newline at end of file
diff --git a/upload/admin/sources/handlers/han_editor.php b/upload/admin/sources/handlers/han_editor.php
index 4c513559..def262ec 100644
--- a/upload/admin/sources/handlers/han_editor.php
+++ b/upload/admin/sources/handlers/han_editor.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Editor Library: Gateway
- * Last Updated: $Date: 2010-11-12 13:07:33 -0500 (Fri, 12 Nov 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 7174 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -37,23 +37,7 @@ class hanEditor
 	 * @var		string
 	 */
 	public $method			= '';
-	
-	/**
-	 * Editor width
-	 *
-	 * @var		string
-	 * @deprecated
-	 */
-	public $ed_width		= '650px';
-	
-	/**
-	 * Editor height
-	 *
-	 * @var		string
-	 * @deprecated
-	 */
-	public $ed_height		= '250px';
-	
+
 	/**
 	 * RTE enabled?
 	 *
@@ -115,8 +99,8 @@ class hanEditor
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry object
-	 * @return	void
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -136,7 +120,7 @@ class hanEditor
 	 * Init method
 	 *
 	 * @param	object		Registry object
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function init()
     {
@@ -156,12 +140,6 @@ class hanEditor
     		$this->method = $this->memberData['members_editor_choice'];
     	}
 
-    	//-----------------------------------------
-    	// Fix width
-    	//-----------------------------------------
-    	
-    	$this->ed_width = $this->settings['rte_width'] ? $this->settings['rte_width'] : $this->ed_width;
-    	
     	//-----------------------------------------
     	// Make sure we haven't had any messin'
     	//-----------------------------------------
@@ -194,19 +172,6 @@ class hanEditor
     	{
     		$this->method = 'std';
     	}
-    	
-    	//-----------------------------------------
-    	// Sneaky Opera or Safari
-    	//-----------------------------------------
-   
-    	if ( $this->method == 'rte' )
-    	{
-    		if ( $this->memberData['_canUseRTE'] !== TRUE )
-    		{
-    			$this->method = 'std';
-    			$this->force_editor_change = 1;
-    		}
-    	}
 
     	//-----------------------------------------
     	// Which class
@@ -231,7 +196,7 @@ class hanEditor
 		// Load classes
 		//-----------------------------------------
 	
-		require_once( IPS_ROOT_PATH . 'sources/classes/editor/class_editor.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/editor/class_editor.php' );/*noLibHook*/
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/' . $class, 'class_editor_module' );
 		
 		$this->class_editor						=  new $classToLoad( $this->registry );
@@ -261,14 +226,12 @@ class hanEditor
 
 			$this->image_dir = $image_set['set_image_dir'];
 			$this->emo_dir   = $image_set['set_emo_dir'];
-			
-			$this->settings['img_url'] =  $this->settings['board_url'] . "/public/style_images/{$this->image_dir}" ;
-			
+
 			//-----------------------------------------
 			// Remove side panel
 			//-----------------------------------------
 
-			$this->remove_emoticons  = 1;
+			$this->remove_emoticons  = true;
   		}
   		else
   		{
@@ -338,8 +301,8 @@ class hanEditor
   		{
   			$return_html = $this->registry->getClass('output')->global_template->ips_editor( $form_field, $text, $this->settings['img_url'].'/folder_editor_images/', $this->rte_on, $this->editor_id, $smilies );
   			
-			$return_html = preg_replace( '#([^/\.])js/#is', "\\1".$this->settings['board_url']."/public/js/"                 , $return_html );
-			$return_html = str_replace( "<#IMG_DIR#>"        , $this->settings['board_url']."/public/style_images/{$this->image_dir}", $return_html );
+			$return_html = preg_replace( '#([^/\.])js/#is', "\\1".$this->settings['board_url'] . '/' . PUBLIC_DIRECTORY . "/js/"                 , $return_html );
+			$return_html = str_replace( "<#IMG_DIR#>"        , $this->settings['board_url'] . '/' . PUBLIC_DIRECTORY . "/style_images/{$this->image_dir}", $return_html );
 		}
 		else
 		{
diff --git a/upload/admin/sources/handlers/han_email.php b/upload/admin/sources/handlers/han_email.php
index 73fc40b4..9e4a2af7 100644
--- a/upload/admin/sources/handlers/han_email.php
+++ b/upload/admin/sources/handlers/han_email.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * API: Core
- * Last Updated: $Date: 2010-11-12 13:07:33 -0500 (Fri, 12 Nov 2010) $
+ * Last Updated: $Date: 2011-10-03 11:31:57 -0400 (Mon, 03 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7174 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9573 $
  */
  
 if ( ! defined( 'IN_IPB' ) )
@@ -58,6 +58,13 @@ class hanEmail
 	 */
 	public $to;
 	
+	/**
+	 * Email cc's
+	 *
+	 * @var	array
+	 */
+	public $cc		= array();
+	
 	/**
 	 * Email bcc's
 	 *
@@ -79,21 +86,33 @@ class hanEmail
 	 */
 	public $message;
 	
+	/**
+	 * HTML Mode
+	 *
+	 * @var		bool
+	 */
+	public $html_email = FALSE;
+		
 	/**
 	 * Temp word swapping array
 	 *
 	 * @var		array
 	 */
-	private $_words;
+	protected $_words;
 	
 	/**
 	 * Headers to pass to email lib
 	 *
 	 * @var		array
 	 */
-	private $temp_headers		= array();
+	protected $temp_headers		= array();
 	
-	private $_attachments       = array();
+	protected $_attachments       = array();
+	protected $editor;
+	protected $plainTextTemplate  = '';
+	protected $htmlTemplate		  = '';
+	protected $htmlWrapper		  = '';
+	protected $_loadedHtmlTemplateClass = '';
 	
 	/**#@+
 	 * Registry Object Shortcuts
@@ -113,7 +132,7 @@ class hanEmail
 	 * Construct
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -125,42 +144,55 @@ class hanEmail
 		$this->lang     = $this->registry->getClass('class_localization');
 		$this->member   = $this->registry->member();
 		$this->memberData =& $this->registry->member()->fetchMemberData();
+		
+		/* Set up default handler */
+		$this->setHtmlEmail( $this->settings['email_use_html'] );
+	}
+	
+	/**
+	 * Sets whether or not this is a HTML email
+	 * @param boolean duh $boolean
+	 */
+	public function setHtmlEmail( $boolean=null )
+	{
+		$this->html_email = ( $boolean ) ? true : false;
+		
+		if ( is_object( $this->emailer ) )
+		{
+			$this->emailer->setHtmlEmail( $boolean );
+		}
 	}
 	
 	/**
 	 * Init method (setup stuff)
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
     public function init()
     {
 		$this->header   = $this->settings['email_header'] ? $this->settings['email_header'] : '';
 		$this->footer   = $this->settings['email_footer'] ? $this->settings['email_footer'] : '';
-
+		
 		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classEmail.php', 'classEmail' );
 
-		$this->emailer = new $classToLoad(
-										 array(
-										 		'debug'			=> $this->settings['fake_mail'] ? $this->settings['fake_mail'] : '0',
-										 		'debug_path'	=> DOC_IPS_ROOT_PATH . '_mail',
-										 		'smtp_host'		=> $this->settings['smtp_host'] ? $this->settings['smtp_host'] : 'localhost',
-										 		'smtp_port'		=> intval($this->settings['smtp_port']) ? intval($this->settings['smtp_port']) : 25,
-										 		'smtp_user'		=> $this->settings['smtp_user'],
-										 		'smtp_pass'		=> $this->settings['smtp_pass'],
-										 		'smtp_helo'		=> $this->settings['smtp_helo'],
-										 		'method'		=> $this->settings['mail_method'],
-										 		'wrap_brackets'	=> $this->settings['mail_wrap_brackets'],
-										 		'extra_opts'	=> $this->settings['php_mail_extra'],
-										 		'charset'		=> IPS_DOC_CHAR_SET,
-										 		'html'			=> intval($this->settings['html_email']),
-												)
-										 );
+		$this->emailer = new $classToLoad( array( 'debug'			=> $this->settings['fake_mail'] ? $this->settings['fake_mail'] : '0',
+										 		  'debug_path'		=> DOC_IPS_ROOT_PATH . '_mail',
+										 		  'smtp_host'		=> $this->settings['smtp_host'] ? $this->settings['smtp_host'] : 'localhost',
+										 		  'smtp_port'		=> intval($this->settings['smtp_port']) ? intval($this->settings['smtp_port']) : 25,
+										 		  'smtp_user'		=> $this->settings['smtp_user'],
+										 		  'smtp_pass'		=> $this->settings['smtp_pass'],
+										 		  'smtp_helo'		=> $this->settings['smtp_helo'],
+										 		  'method'			=> $this->settings['mail_method'],
+										 		  'wrap_brackets'	=> $this->settings['mail_wrap_brackets'],
+										 		  'extra_opts'		=> $this->settings['php_mail_extra'],
+										 		  'charset'			=> IPS_DOC_CHAR_SET,
+										 		  'html'			=> $this->html_email ) );
     }
     
     /**
      * Clear out any temporary headers
      *
-     * @return	void
+     * @return	@e void
      */
     public function clearHeaders()
     {
@@ -172,7 +204,7 @@ class hanEmail
      *
      * @param	string	Header key
      * @param	string	Header value
-     * @return	void
+     * @return	@e void
      */
     public function setHeader( $key, $value )
     {
@@ -185,11 +217,14 @@ class hanEmail
 	 * @return	boolean		Email sent successfully
 	 */
 	public function sendMail()
-	{
-		//$this->emailer->clearEmail();
-		//$this->emailer->clearError();
+	{	
 		$this->init();
 		
+		if( $this->emailer->error )
+		{
+			return $this->fatalError( $this->emailer->error_msg, $this->emailer->error_help );
+		}
+		
 		/* Add attachments if any */
 		if ( count( $this->_attachments ) )
 		{
@@ -204,6 +239,10 @@ class hanEmail
 		$this->emailer->setFrom( $this->from ? $this->from : $this->settings['email_out'], $this->settings['board_name'] );
 		$this->emailer->setTo( $this->to );
 		
+		foreach( $this->cc as $cc )
+		{
+			$this->emailer->addCC( $cc );
+		}
 		foreach( $this->bcc as $bcc )
 		{
 			$this->emailer->addBCC( $bcc );
@@ -224,9 +263,33 @@ class hanEmail
 		//-----------------------------------------
 		
 		$this->emailer->setSubject( $this->_cleanSubject($this->subject) );
-		$this->emailer->setBody( $this->message );
+		
+		/* If we're sending a HTML email, we need to manually send the plain text and HTML versions */
+		if ( $this->html_email )
+		{
+			/* Dynamically replace subject in template */
+			$this->htmlTemplate = str_ireplace( array('<#subject#>'), IPSText::utf8ToEntities( $this->_cleanSubject($this->subject) ), $this->htmlTemplate );
+			$this->emailer->setPlainTextContent( $this->plainTextTemplate );
+			$this->emailer->setHtmlContent( $this->htmlTemplate );
+		}
+		else if ( $this->message && ! $this->plainTextTemplate )
+		{
+			/* Older methods pass message directly */
+			$this->emailer->setBody( $this->message );
+		}
+		else
+		{
+			$this->emailer->setBody( $this->plainTextTemplate );
+		}
+		
 		$this->emailer->sendMail();
 		
+		/* Clear out stuffs */
+		$this->clearContent();
+		
+		// Unset HTML setting to remain backwards compatibility
+		//$this->html_email = FALSE;
+		
 		if( $this->emailer->error )
 		{
 			return $this->fatalError( $this->emailer->error_msg, $this->emailer->error_help );
@@ -234,7 +297,69 @@ class hanEmail
 		
 		return true;
 	}
+	
+	/**
+	 * Set the plain text template
+	 * @param string $string
+	 */
+	public function setPlainTextTemplate( $string )
+	{
+		/* Reset message too */
+		$this->message           = '';
 		
+		$this->plainTextTemplate = $string;
+	}
+	
+	/**
+	 * Set the HTML template
+	 * @param string $string
+	 */
+	public function setHtmlTemplate( $string )
+	{
+		/* Reset message too */
+		$this->message           = '';
+		
+		$this->htmlTemplate = $string;
+	}
+	
+	/**
+	 * Return plain text content
+	 * @return string
+	 */
+	public function getPlainTextContent()
+	{
+		return $this->plainTextTemplate;
+	}
+	
+	/**
+	 * Return HTML content
+	 * @return string
+	 */
+	public function getHtmlContent()
+	{
+		return $this->htmlTemplate;
+	}
+	
+	/**
+	 * Removes all current stored messages, templates, etc.
+	 */
+	public function clearContent()
+	{
+		$this->setHtmlTemplate('');
+		$this->setPlainTextTemplate('');
+		$this->message  = '';
+		$this->template = '';
+	}
+	
+	/**
+	 * Send custom html wrapper - HTML wrapper with <#content#> tag where content will be
+	 * @param string $string
+	 */
+	public function setHtmlWrapper( $string )
+	{
+		$this->htmlWrapper = $string;
+	}
+	
 	/**
 	 * Retrieve an email template
 	 *
@@ -242,10 +367,13 @@ class hanEmail
 	 * @param	string		Language to use
 	 * @param	string		Language file to load
 	 * @param	string		Application of language file
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function getTemplate( $name, $language="", $lang_file='public_email_content', $app='core' )
 	{
+		/* Reset $this->message as legacy methods use $this->message when sending notifications, etc */
+		$this->clearContent();
+		
 		//-----------------------------------------
 		// Check..
 		//-----------------------------------------
@@ -305,7 +433,10 @@ class hanEmail
 		// Return
 		//-----------------------------------------
 		
-		$this->template = stripslashes($this->lang->words['email_header']) . stripslashes($this->lang->words[ $name ]) . stripslashes($this->lang->words['email_footer']);
+		$this->template = stripslashes($this->lang->words[ $name ]) . stripslashes($this->lang->words['email_footer']);
+		
+		/* Returns it if called via setPlainTextTemplate */
+		return $this->template;
 	}
 		
 	/**
@@ -313,51 +444,180 @@ class hanEmail
 	 *
 	 * @param	array		Replacement keys to values
 	 * @param	bool		Do not "clean"
-	 * @return	void
+	 * @return	@e void
 	 */
-	public function buildMessage( $words, $noClean=false )
+	public function buildMessage( $words, $noClean=false, $rawHtml=FALSE )
 	{
-		if( $this->template == "" )
+		/* Init */
+		$ptWords   = array();
+		$htmlWords = array();
+		
+		/* Try this first */
+		if ( ! $this->plainTextTemplate && ! $this->htmlTemplate && $this->message )
+		{
+			$this->setPlainTextTemplate( $this->message );
+		}
+		
+		/* need to converge some stuff here */
+		if ( ! $this->plainTextTemplate )
+		{
+			/* Sniff, sniff */
+			if ( stristr( $this->template, '<br' ) )
+			{
+				$this->setHtmlTemplate( $this->template );
+			}
+			else
+			{
+				$this->setPlainTextTemplate( $this->template );
+			}
+		}
+		
+		/* HTML enabled but no specific template: Auto convert */
+		if ( $this->html_email && ! $this->htmlTemplate )
+		{
+			/* It will be dynamically updated at the end */
+			$this->setHtmlTemplate( $this->plainTextTemplate );
+		}
+		
+		/* HTML email with HTML template but no plain text version */
+		if ( $this->htmlTemplate && ! $this->plainTextTemplate )
+		{
+			$msg = $this->htmlTemplate;
+			$msg = preg_replace( '/<#(.+?)#>/', '{{{-\1-}}}', $msg );
+			$msg = str_replace( "<br />", "\n", $msg );
+			$msg = str_replace( "<br>"  , "\n", $msg );
+			$msg = strip_tags( $msg );
+			
+			$msg = html_entity_decode( $msg, ENT_QUOTES );
+			$msg = str_replace( '&#092;', '\\', $msg );
+			$msg = str_replace( '&#036;', '$', $msg );
+			$msg = preg_replace( '/\{\{\{(.+?)\}\}\}/', '<#\1#>', $msg );
+			
+			$this->setPlainTextTemplate( $msg );
+		}
+		
+		if ( $this->plainTextTemplate && ! $this->template && ! $this->htmlTemplate )
 		{
 			$this->error++;
 			$this->fatalError( "Could not build the email message, no template assigned", "Make sure a template is assigned first." );
 		}
 		
-		$this->message = $this->template;
-
-		if( $noClean )
-		{
-			$this->message	= str_replace( "\n", "<br />", str_replace( "\r", "", $this->message ) );
-		}
-
-		//-----------------------------------------
-		// Add some default words
-		//-----------------------------------------
+		/* Bit more clean up */
+		$this->plainTextTemplate = str_replace( array( "\r\n", "\r", "\n" ), "\n", $this->plainTextTemplate );
+		$this->htmlTemplate      = str_replace( array( "\r\n", "\r", "\n" ), "\n", $this->htmlTemplate );
 		
+		/* Add some default words */
 		$words['BOARD_ADDRESS'] = $this->settings['board_url'] . '/index.' . $this->settings['php_ext'];
 		$words['WEB_ADDRESS']   = $this->settings['home_url'];
 		$words['BOARD_NAME']    = $this->settings['board_name'];
 		$words['SIGNATURE']     = $this->settings['signature'] ? $this->settings['signature'] : '';
 		
-		//-----------------------------------------
-		// Swap the words
-		// 10.7.08 - Added replacements in subject
-		//-----------------------------------------
-		
-		if( !$noClean )
+		/* Swap the words: 10.7.08 - Added replacements in subject */
+		foreach( $words as $k => $v )
 		{
-			foreach( $words as $k => $v )
+			if ( ! $noClean )
 			{
-				$words[ $k ]	= $this->cleanMessage( $v );
+				$ptWords[ $k ] = $this->cleanMessage( $v );
 			}
+			
+			$htmlWords[ $k ] = $v;
 		}
 
-		$this->_words = $words;
+		$this->_words = $ptWords;
+		$this->plainTextTemplate = preg_replace_callback( "/<#(.+?)#>/", array( &$this, '_swapWords' ), $this->plainTextTemplate );
 		
-		$this->message = preg_replace_callback( "/<#(.+?)#>/", array( &$this, '_swapWords' ), $this->message );
-		$this->subject = preg_replace_callback( "/<#(.+?)#>/", array( &$this, '_swapWords' ), $this->subject );
+		$this->_words = $htmlWords;
+		$this->htmlTemplate      = preg_replace_callback( "/<#(.+?)#>/", array( &$this, '_swapWords' ), str_replace( array( '&lt;#', '#&gt;' ), array( '<#', '#>' ), $this->htmlTemplate ) );
+		$this->_words            = array();
+		
+		$this->subject           = preg_replace_callback( "/<#(.+?)#>/", array( &$this, '_swapWords' ), $this->subject );
 
-		$this->_words = array();
+		/* Final touches */
+		$this->htmlTemplate      = $this->applyHtmlWrapper( $this->subject, ( $rawHtml ? $this->htmlTemplate : $this->convertTextEmailToHtmlEmail( $this->htmlTemplate ) ) );
+		$this->htmlTemplate      = preg_replace( '#<!--hook\.([^\>]+?)-->#', '', $this->htmlTemplate );
+		$this->htmlTemplate		 = $this->registry->getClass('output')->parseIPSTags( $this->htmlTemplate );
+		$this->plainTextTemplate = stripslashes($this->lang->words['email_header']) . $this->plainTextTemplate . stripslashes($this->lang->words['email_footer']);
+		
+		
+		/* Some older apps use $this->message, so give them plaintext */
+		$this->message = $this->plainTextTemplate;
+	}
+	
+	/**
+	 * Convert text email to HTML
+	 * Pretty nifty method name too.
+	 * 
+	 * @param	string	Plain text email ready to go
+	 * @return	string	We're all HTML'd up in here.
+	 */
+	public function convertTextEmailToHtmlEmail( $content )
+	{	
+		if ( strstr( $content, '[' ) OR strstr( $content, "\n" ) )
+		{
+			/* It's probably HITMAL! */
+			if ( ! is_object( $this->editor ) )
+			{
+				$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/editor/composite.php', 'classes_editor_composite' );
+				$this->editor = new $classToLoad();
+				
+				/* Reset HTML flags */
+				$this->editor->setAllowHtml(false);
+			}
+			
+			IPSText::getTextClass('bbcode')->parse_html = 0;
+			
+			$content = IPSText::getTextClass('bbcode')->preDisplayParse( $this->editor->switchContent( $content, false  ) );
+						
+			/* Switch content makes & &amp; so we need to switch this back */
+			$content = str_replace( '&amp;', '&', $content );
+			
+			/* Other stuffs */
+			$content = preg_replace( '#(\-{10,120})#', '<hr>', $content );
+			
+		}
+		
+		return $content;
+	}
+	
+	/**
+	 * Add <html> tags and such if it doesn't have any already
+	 * 
+	 * @param	string	HTML email
+	 * @return	string	VERY HTML email
+	 */
+	public function applyHtmlWrapper( $subject, $content )
+	{
+		/* Due to some legacy methods with mail queue, buildMessage can be called twice
+		 * for good reason, but it can then re-apply the wrapper. So we add a unique comment
+		 * and then check for this.
+		 */
+		if ( ! stristr( $content, '<!--::ipb.wrapper.added::-->' ) )
+		{
+			$content = '<!--::ipb.wrapper.added::-->' . IPSText::getTextClass('bbcode')->xssHtmlClean( $content );
+			
+			/* Inline wrapper */
+			if ( $this->htmlWrapper )
+			{
+				return str_ireplace( '<#content#>', $content, $this->htmlWrapper );
+			}
+			
+			/* Attempt to load external wrapper */
+			if ( file_exists( IPS_CACHE_PATH . 'cache/skin_cache/emailWrapper.php' ) )
+			{
+				if ( ! is_object( $this->_loadedHtmlTemplateClass ) )
+				{
+					$classToLoad = IPSLib::loadLibrary( IPS_CACHE_PATH . 'cache/skin_cache/emailWrapper.php', 'ipsEmailWrapper' );
+					$this->_loadedHtmlTemplateClass = new $classToLoad();
+				}
+				
+				return $this->_loadedHtmlTemplateClass->getTemplate( $content );
+			}
+			
+			/* Still here? Fail safe */
+			return $this->parseWithDefaultHtmlWrapper( $content );
+		}
+		
+		return $content;
 	}
 	
 	/**
@@ -366,7 +626,7 @@ class hanEmail
 	 * @param	string		Key
 	 * @return	string		Replaced variable
 	 */
-	private function _swapWords( $matches )
+	protected function _swapWords( $matches )
 	{
 		return $this->_words[ $matches[1] ];
 	}
@@ -377,7 +637,7 @@ class hanEmail
 	 * @param	string		In text
 	 * @return	string		Out text
 	 */
-	private function _cleanSubject( $subject )
+	protected function _cleanSubject( $subject )
 	{
 		$subject = strip_tags( $subject );
 		
@@ -392,6 +652,7 @@ class hanEmail
 		$subject = str_replace( "&#93;" , "]" , $subject );
 		$subject = str_replace( "&#064;", '@' , $subject );
 		$subject = str_replace( "&nbsp;" , ' ', $subject );
+		$subject = str_replace( "&amp;" , '&', $subject );
 		
 		return $subject;
 	}
@@ -404,7 +665,7 @@ class hanEmail
 	 */
 	public function cleanMessage( $message = "" ) 
 	{
-		$message = preg_replace( '#\[quote.*\](.+?)\[/quote\]#s', "<br /><br />------------ QUOTE ----------<br />\\1<br />-----------------------------<br /><br />" , $message );
+		$message = preg_replace( '#\[quote(?:[^\]]+?)?\](.+?)\[/quote\]#s', "<br /><br />------------ QUOTE ----------<br />\\1<br />-----------------------------<br /><br />" , $message );
 		$message = preg_replace_callback( '#\[url=(.+?)\](.+?)\[/url\]#', array( $this, "_formatUrl" ), $message );
 		
 
@@ -412,7 +673,7 @@ class hanEmail
 		// Unconvert smilies 'cos at this point they are img tags
 		//-----------------------------------------
 		
-		$message = IPSText::getTextClass('bbcode')->unconvertSmilies( $message );
+		$message = IPSText::unconvertSmilies( $message );
 		
 		//-----------------------------------------
 		// We may want to adjust this later, but for
@@ -424,9 +685,8 @@ class hanEmail
 		IPSText::getTextClass( 'bbcode' )->parse_html		= 0;
 		IPSText::getTextClass( 'bbcode' )->parse_nl2br		= 1;
 		IPSText::getTextClass( 'bbcode' )->parse_bbcode		= 0;
-		IPSText::getTextClass( 'bbcode' )->parse_wordwrap	= -1;
 		
-		$message = IPSText::getTextClass('bbcode')->stripAllTags( $message, true, false );
+		$message = IPSText::getTextClass('bbcode')->stripAllTags( $message, true );
 
 		//-----------------------------------------
 		// Bear with me...
@@ -481,7 +741,7 @@ class hanEmail
 	 * @param	string	File data
 	 * @param	string	File name
 	 * @param	string	File type (MIME)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addAttachment( $data="", $name="", $ctype='application/octet-stream' )
 	{
@@ -495,7 +755,7 @@ class hanEmail
 	 * @param	string		Help key (deprecated)
 	 * @return	bool
 	 */
-	private function fatalError( $msg, $help="" )
+	protected function fatalError( $msg, $help="" )
 	{
 		$this->DB->insert( 'mail_error_logs',
 										array(
@@ -511,5 +771,40 @@ class hanEmail
 									  );
 		
 		return false;
-	}	
+	}
+
+	/**
+	 * Default wrapper for HTML emails - edit the one in skin_global_other
+	 * 
+	 * @param	string HTML content
+	 * @return	string	HTML email done
+	 */
+	protected function parseWithDefaultHtmlWrapper( $content )
+	{
+		$doc =IPS_DOC_CHAR_SET;
+		
+$email = <<<HTML
+	<html>
+		<head>
+			<meta content="text/html; charset={$doc}" http-equiv="Content-Type">
+			<title><#subject#></title>
+			<style type="text/css">
+			* {
+				font-family: Arial;
+				font-size: 14px;
+				color: #000;
+				background: #fff;
+				line-height: 140%;
+			 }
+			</style>
+		</head>
+		<body>
+			{$content}
+		</body>
+	</head>
+  </html>
+HTML;
+
+		return $email;
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/handlers/han_login.php b/upload/admin/sources/handlers/han_login.php
index 38cc946f..dbc5f6dd 100644
--- a/upload/admin/sources/handlers/han_login.php
+++ b/upload/admin/sources/handlers/han_login.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction
- * Last Updated: $Date: 2010-11-12 13:07:33 -0500 (Fri, 12 Nov 2010) $
+ * Last Updated: $Date: 2011-09-16 17:49:58 -0400 (Fri, 16 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 7174 $
+ * @version		$Revision: 9505 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -39,7 +39,7 @@ class han_login
 	 *
 	 * @var		array
 	 */
-	private $modules			= array();
+	protected $modules			= array();
 	
 	/**
 	 * Flag :: ACP Login
@@ -94,7 +94,7 @@ class han_login
 	 * Constructor
 	 *
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -162,7 +162,7 @@ class han_login
 		$_sticky = $_time ? 0 : 1;
 		$_days   = $_time ? $this->settings['login_key_expire'] : 365;
 		
-		if ( $this->settings['login_change_key'] OR !$member['member_login_key'] OR ( $this->settings['login_key_expire'] AND ( time() > $member['member_login_key_expire'] ) ) )
+		if ( !$member['member_login_key'] OR ( $this->settings['login_key_expire'] AND ( time() > $member['member_login_key_expire'] ) ) )
 		{
 			$member['member_login_key'] = IPSMember::generateAutoLoginKey();
 			
@@ -217,7 +217,7 @@ class han_login
 																			      'login_type'		=> $privacy ) );
 			
 		
-		if ( isset( $this->request['referer'] ) AND $this->request['referer'] AND $this->request['section'] != 'register' )
+		if ( !empty( $this->request['referer'] ) AND $this->request['section'] != 'register' )
 		{
 			if ( stripos( $this->request['referer'], 'section=register' ) OR stripos( $this->request['referer'], 'section=login' ) OR stripos( $this->request['referer'], 'section=lostpass' ) )
 			{ 
@@ -256,6 +256,12 @@ class han_login
 		
 		$this->DB->delete( 'validating', 'member_id=' . $this->registry->member()->getProperty('member_id') . ' AND lost_pass=1' );
 
+		//-----------------------------------------
+		// Run member sync
+		//-----------------------------------------
+		
+		IPSLib::runMemberSync( 'onLogin', $member );
+		
 		//-----------------------------------------
 		// Redirect them to either the board
 		// index, or where they came from
@@ -275,9 +281,6 @@ class han_login
 		// Still here?
 		//-----------------------------------------
 		
-		/* Member Sync */
-		IPSLib::runMemberSync( 'onLogin', $member );
-		
 		return array( $this->registry->getClass('class_localization')->words['partial_login'], str_replace( '?&', '?', $url . '&s=' . $session_id ) );
 	}
 	
@@ -292,7 +295,7 @@ class han_login
     	$member		= array();
     	$username	= '';
     	$email		= '';
-		$password	= trim( $this->request['password'] );
+		$password	= trim( $this->request['ips_password'] );
 		$errors		= '';
 		$core		= array();
 
@@ -300,13 +303,13 @@ class han_login
 		// Is this a username or email address?
 		//-----------------------------------------
 		
-		if( IPSText::checkEmailAddress( $this->request['username'] ) )
+		if( IPSText::checkEmailAddress( $this->request['ips_username'] ) )
 		{
-			$email		= $this->request['username'];
+			$email		= $this->request['ips_username'];
 		}
 		else
 		{
-			$username	= $this->request['username'];
+			$username	= $this->request['ips_username'];
 		}
 		
 		//-----------------------------------------
@@ -347,6 +350,10 @@ class han_login
 			{
 				return array( null, null, 'wrong_openid' );
 			}
+			else if( $this->return_code == 'MISSING_EXTENSIONS' )
+			{
+				return array( null, null, 'missing_extensions' );
+			}
 			else if( $this->return_code == 'FLAGGED_REMOTE' )
 			{
 				return array( null, null, 'flagged_remote' );
@@ -376,7 +383,7 @@ class han_login
 		$_sticky = $_time ? 0 : 1;
 		$_days   = $_time ? $this->settings['login_key_expire'] : 365;
 		
-		if ( $this->settings['login_change_key'] OR !$member['member_login_key'] OR ( $this->settings['login_key_expire'] AND ( time() > $member['member_login_key_expire'] ) ) )
+		if ( !$member['member_login_key'] OR ( $this->settings['login_key_expire'] AND ( time() > $member['member_login_key_expire'] ) ) )
 		{
 			$member['member_login_key'] = IPSMember::generateAutoLoginKey();
 			
@@ -418,7 +425,7 @@ class han_login
 		// Create / Update session
 		//-----------------------------------------
 		
-		$privacy    = $this->request['anonymous'] ? 1 : 0;
+		$privacy    = ( !$this->settings['disable_anonymous'] AND $this->request['anonymous'] ) ? 1 : 0;
 		
 		if( $member['g_hide_online_list'] )
 		{
@@ -431,7 +438,7 @@ class han_login
 																			      'login_type'		=> $privacy ) );
 			
 		
-		if ( $this->request['referer'] AND $this->request['referer'] AND $this->request['section'] != 'register' )
+		if ( !empty($this->request['referer']) AND $this->request['section'] != 'register' )
 		{
 			if ( stripos( $this->request['referer'], 'section=register' ) OR stripos( $this->request['referer'], 'section=login' ) OR stripos( $this->request['referer'], 'section=lostpass' ) OR stripos( $this->request['referer'], CP_DIRECTORY . '/' ) )
 			{ 
@@ -468,6 +475,16 @@ class han_login
 		
 		$this->DB->delete( 'validating', 'member_id=' . $this->registry->member()->getProperty('member_id') . ' AND lost_pass=1' );
 
+		//-----------------------------------------
+		// Run member sync
+		//-----------------------------------------
+		
+		$member['plainPassword'] = $password;
+
+		IPSLib::runMemberSync( 'onLogin', $member );
+
+		unset( $member['plainPassword'] );
+		
 		//-----------------------------------------
 		// Redirect them to either the board
 		// index, or where they came from
@@ -486,13 +503,6 @@ class han_login
 		//-----------------------------------------
 		// Still here?
 		//-----------------------------------------
-		
-		$member['plainPassword'] = $password;
-		
-		/* Member Sync */
-		IPSLib::runMemberSync( 'onLogin', $member );
-
-		unset( $member['plainPassword'] );
 
 		return array( $this->registry->getClass('class_localization')->words['partial_login'], $url );
 	}
@@ -500,7 +510,7 @@ class han_login
 	/**
 	 * Initialize class
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
     public function init()
     {
@@ -508,8 +518,8 @@ class han_login
     	// INIT
     	//-----------------------------------------
     	
-    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_core.php' );
-    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_interface.php' );
+    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_core.php' );/*noLibHook*/
+    	require_once( IPS_PATH_CUSTOM_LOGIN . '/login_interface.php' );/*noLibHook*/
     	
     	$classes	= array();
     	$configs	= array();
@@ -527,21 +537,12 @@ class han_login
 			{
 				if( $login_method['login_enabled'] )
 				{
-					if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php' ) )
+					if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php' ) )
 					{
 						$classes[ $login_method['login_order'] ]				= IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php';
-						$configs[ $login_method['login_order'] ]				= IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/conf.php';
 						$this->login_methods[ $login_method['login_order'] ]	= $login_method;
-						$this->login_confs[ $login_method['login_order'] ]		= array();
-						
-						if( file_exists( $configs[ $login_method['login_order'] ] ) )
-						{
-							$LOGIN_CONF	= array();
-							
-							require( $configs[ $login_method['login_order'] ] );
-							$this->login_confs[ $login_method['login_order'] ]	= $LOGIN_CONF;
-						}
-						
+						$this->login_confs[ $login_method['login_order'] ]		= $login_method['login_custom_config'] ? @unserialize( $login_method['login_custom_config'] ) : array();
+
 						$classname = IPSLib::loadLibrary( $classes[ $login_method['login_order'] ], 'login_' . $login_method['login_folder_name'] );
 						$this->modules[ $login_method['login_order'] ] = new $classname( $this->registry, $login_method, $this->login_confs[ $login_method['login_order'] ] );
 					}
@@ -560,24 +561,14 @@ class han_login
     		
 			while( $login_method = $this->DB->fetch() )
 			{
-				if( file_exists( IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php' ) )
+				if( is_file( IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php' ) )
 				{
 					$classes[ $login_method['login_order'] ]				= IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/auth.php';
-					$configs[ $login_method['login_order'] ]				= IPS_PATH_CUSTOM_LOGIN . '/' . $login_method['login_folder_name'] . '/conf.php';
 					$this->login_methods[ $login_method['login_order'] ]	= $login_method;
+					$this->login_confs[ $login_method['login_order'] ]		= $login_method['login_custom_config'] ? @unserialize( $login_method['login_custom_config'] ) : array();
 					
-					if( file_exists( $configs[ $login_method['login_order'] ] ) )
-					{
-						$LOGIN_CONF	= array();
-						
-						require( $configs[ $login_method['login_order'] ] );
-						$this->login_confs[ $login_method['login_order'] ]	= $LOGIN_CONF;
-					}
-					
-					$classname	= "login_" . $login_method['login_folder_name'];
-
-					require_once( $classes[ $login_method['login_order'] ] );
-					$this->modules[ $login_method['login_order'] ]			= new $classname( $this->registry, $login_method, $this->login_confs[ $login_method['login_order'] ] );
+					$classToLoad = IPSLib::loadLibrary( $classes[ $login_method['login_order'] ], 'login_' . $login_method['login_folder_name'] );
+					$this->modules[ $login_method['login_order'] ]			= new $classToLoad( $this->registry, $login_method, $this->login_confs[ $login_method['login_order'] ] );
 				}
 			}
 		}
@@ -595,10 +586,9 @@ class han_login
 	    		$classes[ 0 ]				= IPS_PATH_CUSTOM_LOGIN . '/internal/auth.php';
 				$this->login_methods[ 0 ]	= $login_method;
 				$this->login_confs[ 0 ]		= array();
-				$classname					= "login_internal";
 	
-				require_once( $classes[ 0 ] );
-				$this->modules[ 0 ]			= new $classname( $this->registry, $login_method, array() );
+				$classToLoad = IPSLib::loadLibrary( $classes[ 0 ], 'login_internal' );
+				$this->modules[ 0 ]			= new $classToLoad( $this->registry, $login_method, array() );
 			}
 		}
 		
@@ -853,14 +843,14 @@ class han_login
 				$obj_reference->nameExistsCheck( $nameToCheck, $memberData, $fieldToCheck );
 				$this->return_code 		= $obj_reference->return_code;
 				
-				if( $this->return_code AND !in_array( $this->return_code, array( 'NAME_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID' ) ) )
+				if( $this->return_code AND !in_array( $this->return_code, array( 'NAME_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID', 'MISSING_EXTENSIONS' ) ) )
 				{
 					break;
 				}
 			}
   		}
   		
-		if( $this->return_code AND !in_array( $this->return_code, array( 'NAME_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID' ) ) )
+		if( $this->return_code AND !in_array( $this->return_code, array( 'NAME_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID', 'MISSING_EXTENSIONS' ) ) )
 		{
 			return true;
 		}
@@ -887,14 +877,14 @@ class han_login
 				$obj_reference->emailExistsCheck( $email );
 				$this->return_code 		= $obj_reference->return_code;
 				
-				if( $this->return_code AND !in_array( $this->return_code, array( 'EMAIL_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID' ) ) )
+				if( $this->return_code AND !in_array( $this->return_code, array( 'EMAIL_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID', 'MISSING_EXTENSIONS' ) ) )
 				{
 					break;
 				}
 			}
   		}
   		
-		if( $this->return_code AND !in_array( $this->return_code, array( 'EMAIL_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID' ) ) )
+		if( $this->return_code AND !in_array( $this->return_code, array( 'EMAIL_NOT_IN_USE', 'METHOD_NOT_DEFINED', 'WRONG_AUTH', 'WRONG_OPENID', 'MISSING_EXTENSIONS' ) ) )
 		{
 			return true;
 		}
@@ -1016,6 +1006,12 @@ class han_login
 
 		foreach( $this->login_methods as $k => $method )
 		{
+			/* @link http://community.invisionpower.com/tracker/issue-27425-misleading-enter-username-or-email-text */
+			if( in_array( $method['login_folder_name'], array( 'openid', 'live' ) ) )
+			{
+				continue;
+			}
+
 			if( $method['login_user_id'] == 'either' )
 			{
 				$username	= true;
diff --git a/upload/admin/sources/handlers/han_parse_bbcode.php b/upload/admin/sources/handlers/han_parse_bbcode.php
index 7325948c..00c69f8e 100644
--- a/upload/admin/sources/handlers/han_parse_bbcode.php
+++ b/upload/admin/sources/handlers/han_parse_bbcode.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * BBCode parsing gateway.
- * Last Updated: $Date: 2010-11-12 13:07:33 -0500 (Fri, 12 Nov 2010) $
+ * Last Updated: $Date: 2011-06-07 18:56:57 -0400 (Tue, 07 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 7174 $
+ * @version		$Revision: 8999 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -82,13 +82,6 @@ class parseBbcode
 	 * @var		boolean
 	 */	
 	public $parse_nl2br				= true;
-	
-	/**
-	 * Parse wordwrap
-	 *
-	 * @var		boolean
-	 */	
-	public $parse_wordwrap			= 0;
 
 	/**
 	 * Bypass badwords?
@@ -151,7 +144,7 @@ class parseBbcode
 	 *
 	 * @param	object		Registry object
 	 * @param	string		Parsing method to use
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method='normal' )
 	{
@@ -174,46 +167,27 @@ class parseBbcode
 		/* And some default properties */
 		$this->bypass_badwords	= $this->memberData ? intval( $this->memberData['g_bypass_badwords'] ) : 0;
 		$this->strip_quotes		= $this->settings['strip_quotes'];
-		$this->parse_wordwrap	= $this->settings['post_wordwrap'];
 	}
 	
 	/**
 	 * Load the required bbcode classes and initialize the object
 	 *
-	 * @return	void
-	 * @todo	Needs the new library hook call when implemented
-	 * @todo	Remove that swith and just check for 'if legacy' => load the other file and change class
+	 * @return	@e void
 	 */
-	private function _loadClasses()
+	protected function _loadClasses()
 	{
 		$_NOW = IPSDebug::getMemoryDebugFlag();
 		
 		if ( ! $this->classes_loaded )
 		{
-			$_NOW = IPSDebug::getMemoryDebugFlag();
-			
 			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/bbcode/core.php', 'class_bbcode_core' );
-			
-			IPSDebug::setMemoryDebugFlag( "Require once call for core.php", $_NOW );
-			
-			switch( $this->pre_edit_parse_method )
+
+			if( $this->pre_edit_parse_method == 'legacy' )
 			{
-				case 'legacy':
-					$file	= 'legacy.php';
-					$class 	= 'class_bbcode_legacy';
-					break;
-				default:
-					$file	= '';//'normal.php';
-					$class 	= $classToLoad;
-					break;
+				$classToLoad 	= IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/bbcode/legacy.php', 'class_bbcode_legacy' );
 			}
 			
-			if( $file )
-			{
-				require_once ( IPS_ROOT_PATH . 'sources/classes/bbcode/' . $file );
-			}
-			
-			$this->bbclass			= new $class( $this->registry );
+			$this->bbclass			= new $classToLoad( $this->registry );
 			$this->classes_loaded	= true;
 			$this->error			=& $this->bbclass->error;
 			$this->warning			=& $this->bbclass->warning;
@@ -225,10 +199,13 @@ class parseBbcode
 	/**
 	 * Pass off our settings to our bbcode handler
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _passSettings()
+	protected function _passSettings()
 	{
+		/* Clean out secondary groups just in case of ,, */
+		$this->parsing_mgroup_others = IPSText::cleanPermString( $this->parsing_mgroup_others );
+		
 		//-----------------------------------------
 		// Pass the settings
 		//-----------------------------------------
@@ -241,7 +218,6 @@ class parseBbcode
 		$this->bbclass->parse_bbcode			= $this->parse_bbcode;
 		$this->bbclass->strip_quotes			= $this->strip_quotes;
 		$this->bbclass->parse_nl2br				= $this->parse_nl2br;
-		$this->bbclass->parse_wordwrap			= $this->parse_wordwrap;
 		$this->bbclass->parsing_section			= $this->parsing_section;
 		$this->bbclass->parsing_mgroup			= $this->parsing_mgroup;
 		$this->bbclass->parsing_mgroup_others	= $this->parsing_mgroup_others;
@@ -304,7 +280,7 @@ class parseBbcode
 		$text	= $this->bbclass->preDisplayParse( $text );
 		
 		IPSDebug::setMemoryDebugFlag( "PreDisplayParse completed", $_NOW );
-		
+
 		return $text;
 	}
 	
@@ -317,11 +293,8 @@ class parseBbcode
 	 */
 	public function parsePollTags( $text )
 	{
-		if( $this->settings['poll_tags'] )
-		{
-			$text = $this->bbclass->parseBbcode( $text, 'display', array( 'img', 'url' ) );
-			$text = $this->bbclass->finishNonParsed( $text, 'display' );
-		}
+		$text	= $this->bbclass->parseBbcode( $text, 'display', array( 'img', 'url' ) );
+		$text	= $this->bbclass->finishNonParsed( $text, 'display' );
 		
 		return $text;
 	}
@@ -388,14 +361,13 @@ class parseBbcode
 	 *
 	 * @param 	string			BBCode + HTML text
 	 * @param	boolean			Run through pre_edit_parse
-	 * @param 	boolean		Check "strip from search" option
 	 * @return	string			Raw text with no tags
 	 */
-	public function stripAllTags( $t, $pre_edit_parse=true, $only_search=true )
+	public function stripAllTags( $t, $pre_edit_parse=true )
 	{
 		$this->_passSettings();
 		
-		return $this->bbclass->stripAllTags( $t, $pre_edit_parse, $only_search );
+		return $this->bbclass->stripAllTags( $t, $pre_edit_parse );
 	}
 	
 	/**
@@ -411,6 +383,19 @@ class parseBbcode
 		return $this->bbclass->stripBbcode( 'quote', $t );
 	}
 	
+	/**
+	 * Strip shared media
+	 *
+	 * @param 	string			Raw posted text
+	 * @return	string			Raw text with no shared media
+	 */
+	public function stripSharedMedia( $t )
+	{
+		$t	= preg_replace( "#\[sharedmedia=([^\]]+?)\]#is", " ", $t );
+		
+		return $t;
+	}
+	
 	/**
 	 * Strip emoticons
 	 *
@@ -432,9 +417,7 @@ class parseBbcode
 	 */
 	public function unconvertSmilies( $t )
 	{
-		$this->_passSettings();
-		
-		return $this->bbclass->unconvertSmilies( $t );
+		return IPSText::unconvertSmilies( $t );
 	}
 	
 	/**
@@ -462,22 +445,6 @@ class parseBbcode
 		
 		return $this->bbclass->checkBlacklistUrls( $t );
 	}
-	
-	/**
-	 * Apply word wrapping
-	 *
-	 * @param 	string			BBCode + HTML text
-	 * @param	integer			Number of characters to wrap after
-	 * @param	string			Break string
-	 * @return	string			Raw text with no tags
-	 */
-	public function wordWrap( $t, $chars=80, $break="\n" )
-	{
-		$this->parse_wordwrap	= $chars;
-		$this->_passSettings();
-		
-		return $this->bbclass->applyWordwrap( $t, $chars, $break );
-	}
 
 	/**
 	 * Make data in quotes "safe"
@@ -505,16 +472,4 @@ class parseBbcode
 		
 		return $this->bbclass->checkXss( $t, $fixScript );
 	}
-	
-	/**
-	 * Determines if member is viewing images
-	 * If not, unparses smilies
-	 *
-	 * @param 	string			Raw input text to parse
-	 * @return	string			Parsed text ready to be stored in database
-	 */
-	public function memberViewImages( $text )
-	{
-		return IPSLib::memberViewImages( $text );
-	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/handlers/index.html b/upload/admin/sources/handlers/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/handlers/index.html
+++ b/upload/admin/sources/handlers/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/index.html b/upload/admin/sources/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/index.html
+++ b/upload/admin/sources/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/admin/download_category_form.php b/upload/admin/sources/interfaces/admin/download_category_form.php
new file mode 100644
index 00000000..d4704e0e
--- /dev/null
+++ b/upload/admin/sources/interfaces/admin/download_category_form.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @file		download_category_form.php 	Download category editing form interface
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		02nd March 2011
+ * $LastChangedDate: 2011-03-02 13:57:10 -0500 (Wed, 02 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 7941 $
+ */
+
+/**
+ *
+ * @interface	admin_download_category_form
+ * @brief		Download category editing form interface
+ *
+ */
+interface admin_download_category_form
+{
+	/**
+	 * Returns HTML tabs content for the page
+	 *
+	 * @param	array		$category	Download category data
+	 * @param	integer		$tabsUsed	Number of tabs used so far (your ids should be this +1)
+	 * @return	@e array Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content), 'tabsUsed' (number of tabs you have used)
+	 */
+	public function getDisplayContent( $category, $tabsUsed );
+	
+	/**
+	 * Process the entries for saving and return
+	 *
+	 * @return	@e array Array of keys => values for saving
+	 */
+	public function getForSave();
+}
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/admin/group_form.php b/upload/admin/sources/interfaces/admin/group_form.php
index eef341a7..1513e83b 100644
--- a/upload/admin/sources/interfaces/admin/group_form.php
+++ b/upload/admin/sources/interfaces/admin/group_form.php
@@ -1,41 +1,37 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Group editing form interface
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		June 10 2008
- * @version		$Revision: 5713 $
+ * @file		group_form.php 	Group editing form interface
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: mmecham $
+ * @since		-
+ * $LastChangedDate: 2011-03-11 09:29:56 -0500 (Fri, 11 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8036 $
  */
 
+/**
+ *
+ * @interface	admin_group_form
+ * @brief		Group editing form interface
+ *
+ */
 interface admin_group_form
 {
 	/**
-	 * Returns HTML tab content for the page.
+	 * Returns HTML tabs content for the page
 	 *
-	 * @access	public
-	 * @author	Brandon Farber
-	 * @param    array 				Group data
-	 * @param	integer				Number of tabs used so far (your ids should be this + 1)
-	 * @return   array 				Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content), 'tabsUsed' (number of tabs you have used)
+	 * @param	array		$group		Group data
+	 * @param	integer		$tabsUsed	Number of tabs used so far (your ids should be this +1)
+	 * @return	@e array Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content), 'tabsUsed' (number of tabs you have used)
 	 */
-	public function getDisplayContent();
+	public function getDisplayContent( $group=array(), $tabsUsed=2 );
 	
 	/**
 	 * Process the entries for saving and return
 	 *
-	 * @access	public
-	 * @author	Brandon Farber
-	 * @return   array 				Array of keys => values for saving
+	 * @return	@e array Array of keys => values for saving
 	 */
 	public function getForSave();
 }
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/admin/index.html b/upload/admin/sources/interfaces/admin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/interfaces/admin/index.html
+++ b/upload/admin/sources/interfaces/admin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/admin/member_form.php b/upload/admin/sources/interfaces/admin/member_form.php
index 707979c8..4f5b628e 100644
--- a/upload/admin/sources/interfaces/admin/member_form.php
+++ b/upload/admin/sources/interfaces/admin/member_form.php
@@ -1,22 +1,22 @@
 <?php
-
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Member form plugin interface
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		IP.Board 3.0
- * @version		$Revision: 5713 $
+ * @file		member_form.php 	Member form plugin interface
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		02nd March 2011
+ * $LastChangedDate: 2011-03-02 13:57:10 -0500 (Wed, 02 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 7941 $
  */
 
+/**
+ *
+ * @interface	admin_member_form
+ * @brief		Member form plugin interface
+ *
+ */
 interface admin_member_form
 {
 	/**
@@ -32,29 +32,23 @@ interface admin_member_form
 	 * Use the format:
 	 * $array[] = array( 'img' => '', 'url' => '', 'title' => '' );
 	 *
-	 * @access	public
-	 * @author	Matt Mecham
-	 * @param	array 			Member data
-	 * @return	array 			Array of links
+	 * @param	array	$member		Member data
+	 * @return	@e array Array of links
 	 */
-	public function getSidebarLinks();
+	public function getSidebarLinks( $member=array() );
 	
 	/**
-	 * Returns HTML tab content for the page.
+	 * Returns HTML tabs content for the page
 	 *
-	 * @access	public
-	 * @author	Matt Mecham
-	 * @param	array 				Member data
-	 * @return	array 				Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content)
+	 * @param	array		$member		Member data
+	 * @return	@e array Array of 'tabs' (HTML for the tabs), 'content' (HTML for the content)
 	 */
-	public function getDisplayContent();
+	public function getDisplayContent( $member=array() );
 	
 	/**
 	 * Process the entries for saving and return
 	 *
-	 * @access	public
-	 * @author	Brandon Farber
-	 * @return	array 				Multi-dimensional array (core, extendedProfile) for saving
+	 * @return	@e array Multi-dimensional array (core, extendedProfile) for saving
 	 */
 	public function getForSave();
 }
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/index.html b/upload/admin/sources/interfaces/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/interfaces/index.html
+++ b/upload/admin/sources/interfaces/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/interface_bbcode.php b/upload/admin/sources/interfaces/interface_bbcode.php
index 1c7fe089..f750d736 100644
--- a/upload/admin/sources/interfaces/interface_bbcode.php
+++ b/upload/admin/sources/interfaces/interface_bbcode.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Custom bbcode plugin interfaces
- * Last Updated: $Date: 2010-04-15 15:46:26 -0400 (Thu, 15 Apr 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
  * @author 		$author$
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6133 $ 
- **/
+ * @link		http://hatynka.in
+ * @version		$Rev: 7445 $ 
+ */
 
 interface bbcodePlugin
 {
diff --git a/upload/admin/sources/interfaces/interface_output.php b/upload/admin/sources/interfaces/interface_output.php
index 639f8546..c2d90cc5 100644
--- a/upload/admin/sources/interfaces/interface_output.php
+++ b/upload/admin/sources/interfaces/interface_output.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Output formats interface
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		MattMecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Wednesday 28th May 2008 16:42 GMT
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -24,7 +24,7 @@ interface interface_output
 	 * Prints any header information for this output module
 	 *
 	 * @access	public
-	 * @return	void		Prints header() information
+	 * @return	@e void		Prints header() information
 	 */
 	public function printHeader();
 	
diff --git a/upload/admin/sources/interfaces/interface_search.php b/upload/admin/sources/interfaces/interface_search.php
deleted file mode 100644
index 6e560e31..00000000
--- a/upload/admin/sources/interfaces/interface_search.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Search Interfaces
- * Last Updated: $Date: 2010-09-27 18:18:35 -0400 (Mon, 27 Sep 2010) $
- * </pre>
- *
- * @author 		$author$
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6917 $ 
- **/
-
-interface iSearchRebuild
-{
-	/**
-	 * Clears the search index for the app
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public function clear();
-	
-	/**
-	 * Function to handle rebuilding the search index
-	 *
-	 * @access	public
-	 * @param	integer	$st		Position to start indexing
-	 * @param	integer	$per_go	Number of entries to process
-	 * @return	integer			Number of entries processed
-	 */
-	public function doRebuild( $st, $per_go );
-}
-
-interface iSearchDisplay
-{
-	/**
-	 * Formats the search result for display
-	 *
-	 * @access	public
-	 * @param	array	$search_row	Array of data
-	 * @return	string				Formatted content, ready for display
-	 */
-	public function formatContent( $search_row );
-	
-	/**
-	 * Retuns the html for displaying the filter box on the advanced search page
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	public function getFilterHTML();
-	
-	/**
-	 * Returns an array used in the searchplugin's setCondition method
-	 *
-	 * @access	public
-	 * @param	array	$data	Array of data for filtering
-	 * @return	array			Array with column, operator, and value keys, for use in the setCondition call
-	 */
-	public function buildFilterSQL( $data );
-}
-
-/* May end up making this an abstract class */
-interface iSearchIndexPlugin
-{
-	/**
-	 * Performs search and returns an array of results
-	 *
-	 * @access	public
-	 * @param	string	$search_term
-	 * @param	array	$limit_clause	The param should be array( begin, end )
-	 * @param	string	$sort_by		Either relevance or date
-	 * @param	string	[$group_by]		Field to group on
-	 * @param	bool	$content_title_only	Only search title records
-	 * @return	array
-	 */
-	public function getSearchResults( $search_term, $limit_clause, $sort_by, $group_by='', $content_title_only=false );
-	
-	/**
-	 * Performs live search and returns an array of results
-	 *
-	 * @access	public
-	 * @param	string	$search_term 
-	 * @return	array
-	 */	
-	public function getLiveSearchResults( $search_term );
-	
-	/**
-	 * Returns the total number of results the search will return
-	 *
-	 * @access	public
-	 * @param	string	$search_term
-	 * @param	string	$group_by
-	 * @param	bool	$content_title_only
-	 * @return	integer
-	 */
-	public function getSearchCount( $search_term, $group_by='', $content_title_only=false );
-	
-	/**
-	 * Restrict the date range that the search is performed on
-	 *
-	 * @access	public
-	 * @param	timestamp	$begin
-	 * @param	timestamp	[$end]
-	 * @return	void
-	 */
-	public function setDateRange( $begin, $end=0 );
-	
-	/**
-	 * Generic function for adding special search conditions
-	 *
-	 * @access	public
-	 * @param	string	$column		sql table column for this condition
-	 * @param	string	$operator	Operation to perform for this condition, ex: =, <>, IN, NOT IN
-	 * @param	mixed	$value		Value to check with
-	 * @return	void
-	 */
-	public function setCondition( $column, $operator, $value );
-	
-	/**
-	 * Reassigns fields in a way the index exepcts
-	 *
-	 * @param  array  $r
-	 * @return array
-	 **/
-	public function formatFieldsForIndex( $r );
-	
-	/**
-	 * This function grabs the actual results for display
-	 *
-	 * @param  array  $ids
-	 * @return query result
-	 **/
-	public function getResultsForSphinx( $ids );	
-}
\ No newline at end of file
diff --git a/upload/admin/sources/interfaces/interface_usercp.php b/upload/admin/sources/interfaces/interface_usercp.php
index 0c41a03c..8892a809 100644
--- a/upload/admin/sources/interfaces/interface_usercp.php
+++ b/upload/admin/sources/interfaces/interface_usercp.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * User CP: Handles form display / saving as well as custom events
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		MattMecham
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Wednesday 28th May 2008 16:42 GMT
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -41,7 +41,7 @@ interface interface_usercp
 	 *
 	 * @access	public
 	 * @author	Matt mecham
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function init();
 	
@@ -80,7 +80,7 @@ interface interface_usercp
 	 * @access	public
 	 * @author	Matt Mecham
 	 * @param	string	Current area as defined by 'getLinks'
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function saveForm( $current_area );
 
diff --git a/upload/admin/sources/loginauth/convert/auth.php b/upload/admin/sources/loginauth/convert/auth.php
index d6769cb1..dda4f188 100644
--- a/upload/admin/sources/loginauth/convert/auth.php
+++ b/upload/admin/sources/loginauth/convert/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : Conversion method
- * Last Updated: $Date: 2010-09-07 05:15:45 -0400 (Tue, 07 Sep 2010) $
+ * Last Updated: $Date: 2011-05-12 17:45:20 -0400 (Thu, 12 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 6833 $
+ * @version		$Revision: 8752 $
  *
  */
 
@@ -51,7 +51,7 @@ class login_convert extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -77,7 +77,7 @@ class login_convert extends login_core implements interface_login
 		
 		if( $this->settings['conv_login'] )
 		{
-			require_once( IPS_PATH_CUSTOM_LOGIN . '/convert/newauth.php' );
+			require_once( IPS_PATH_CUSTOM_LOGIN . '/convert/newauth.php' );/*noLibHook*/
 			$conv = new converters( $this->registry, $this );
 			$this->return_code = $conv->go( $username, $email_address, $password );
 			return;
@@ -181,6 +181,10 @@ class login_convert extends login_core implements interface_login
 				$this->_authenticateUbbthreads74( $username, $password );
 			break;
 			
+			case 'seoboard':
+				$this->_authenticateSeoBoard( $username, $password );
+			break;
+			
 			default:
 				$this->return_code = "WRONG_AUTH";
 			break;
@@ -197,12 +201,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * UBB.Threads 7.4.X
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateUbbthreads74( $username, $password )
+	protected function _authenticateUbbthreads74( $username, $password )
 	{
 		if( $this->_memberData[ $this->password_field ] == md5( $this->_memberData['member_id'] . $password ) )
 		{
@@ -220,12 +224,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * phpBB 3
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticatePhpbb( $username, $password )
+	protected function _authenticatePhpbb( $username, $password )
 	{
 		$success			= false;
 		$single_md5_pass	= md5( $password );
@@ -256,12 +260,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * MyBB
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateMybb( $username, $password )
+	protected function _authenticateMybb( $username, $password )
 	{
 		$current_password	= $this->_memberData[ $this->password_field ];
 		$single_md5_pass 	= md5( $password );
@@ -282,12 +286,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * GC Board 3.0 BETA
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticate_gcboards( $username, $password )
+	protected function _authenticate_gcboards( $username, $password )
 	{
 		$myhash				= crypt( $password, 'authenticate' );
 		$single_md5_pass	= md5( $password );
@@ -312,12 +316,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * DCForum+ authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateDcforum( $username, $password )
+	protected function _authenticateDcforum( $username, $password )
 	{
 		$current_password	= $this->_memberData[ $this->password_field ];
 		$crypted_password	= crypt( $password, substr($current_password, 0, 2) );
@@ -339,12 +343,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * punBB authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticatePunbb( $username, $password )
+	protected function _authenticatePunbb( $username, $password )
 	{
 		$success			= false;
 		$single_md5_pass	= md5( $password );
@@ -385,14 +389,14 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * snitz authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateSnitz( $username, $password )
+	protected function _authenticateSnitz( $username, $password )
 	{
-		require_once( IPS_PATH_CUSTOM_LOGIN . '/convert/auth_sha256.php' );
+		require_once( IPS_PATH_CUSTOM_LOGIN . '/convert/auth_sha256.php' );/*noLibHook*/
 		$sha = new auth_sha256();
 
 		if ( $this->_memberData[ $this->password_field ])
@@ -416,17 +420,17 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * vB 3 authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateVb3( $username, $password )
+	protected function _authenticateVb3( $username, $password )
 	{
 		if ( $this->_memberData['misc'])
 		{
 			$single_md5_pass	= md5( $password );
-			$decr 				= md5( str_replace( '&#33;', '!', $password ) . $this->_memberData['misc'] );
+			$decr 				= md5( html_entity_decode( $password ) . $this->_memberData['misc'] );
 
 			if ( $decr == $this->_memberData[ $this->password_field ] )
 			{
@@ -436,7 +440,7 @@ class login_convert extends login_core implements interface_login
 			}
 			else
 			{
-				$single_md5_pass	= md5( str_replace( '&#33;', '!', $password ) );
+				$single_md5_pass	= md5( html_entity_decode( $password ) );
 				$tryagain			= md5( $single_md5_pass . $this->_memberData['misc'] );
 				
 				if ( $tryagain == $this->_memberData[ $this->password_field ] )
@@ -455,12 +459,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * iB 3.1 authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateIb31( $username, $password )
+	protected function _authenticateIb31( $username, $password )
 	{
 		$decr 				= md5( $password . $username );
 		$single_md5_pass	= md5( $password );
@@ -479,12 +483,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * SMF 1.1 authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateSmf11( $username, $password )
+	protected function _authenticateSmf11( $username, $password )
 	{
 		$single_md5_pass = md5($password);
 
@@ -523,12 +527,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * SMF / YABB.SE authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateSmf( $username, $password )
+	protected function _authenticateSmf( $username, $password )
 	{
 		if( $this->_memberData[ $this->password_field ] )
 		{
@@ -564,12 +568,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * UBBThreads .5 authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateUbbthreads5( $username, $password )
+	protected function _authenticateUbbthreads5( $username, $password )
 	{
 		$single_md5_pass	= md5( $password );
 		$success 			= false;
@@ -597,12 +601,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * WWWThreads authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateWwwthreads( $username, $password )
+	protected function _authenticateWwwthreads( $username, $password )
 	{
 		$single_md5_pass = md5( $password );
 
@@ -648,12 +652,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * YABB 2.0 authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateYabb20( $username, $password )
+	protected function _authenticateYabb20( $username, $password )
 	{
 		$myhash				= rtrim( base64_encode( pack( "H*", md5($password) ) ), "=" );
 		$single_md5_pass 	= md5( $password );
@@ -678,12 +682,12 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * SimpleForum authentication
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function _authenticateSimpleforum( $username, $password )
+	protected function _authenticateSimpleforum( $username, $password )
 	{
 		$myhash				= crypt($password, 'SiMpLeFoRuM');
 		$single_md5_pass	= md5( $password );
@@ -710,7 +714,7 @@ class login_convert extends login_core implements interface_login
 	 *
 	 * @access	public
 	 * @param	string		Username
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loadMember( $username )
 	{
@@ -727,7 +731,7 @@ class login_convert extends login_core implements interface_login
 	 *
 	 * @access	public
 	 * @param	string		new password
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function cleanConvertData( $new_pass )
 	{
@@ -827,13 +831,13 @@ class login_convert extends login_core implements interface_login
 	/**
 	 * Private function to encode phpBB3 hash
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Input
 	 * @param	count 		Iteration
 	 * @param	string		Hash-lookup
 	 * @return	string		phpbb3 password hash encoded bit
 	 */
-	private function _hashEncode64($input, $count, &$itoa64)
+	protected function _hashEncode64($input, $count, &$itoa64)
 	{
 		$output	= '';
 		$i		= 0;
@@ -873,4 +877,20 @@ class login_convert extends login_core implements interface_login
 
 		return $output;
 	}
+
+	/**
+	 * Change a password
+	 *
+	 * @access	public
+	 * @param	string		Email Address
+	 * @param	string		New Password
+	 * @param	string		Plain Text Password
+	 * @param	string		Member Array
+	 * @return	boolean		Request was successful
+	 */
+	public function changePass( $email, $new_pass, $plain_pass, $member )
+	{
+		$this->return_code = 'METHOD_NOT_DEFINED';
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/convert/auth_sha256.php b/upload/admin/sources/loginauth/convert/auth_sha256.php
index 5c8d126b..11fdcb61 100644
--- a/upload/admin/sources/loginauth/convert/auth_sha256.php
+++ b/upload/admin/sources/loginauth/convert/auth_sha256.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : Conversion method
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8021 $
  *
  */
 
@@ -23,26 +23,26 @@ class auth_sha256
 	/**
 	 * On Bits for sha256 mapping
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $m_lOnBits	= array(1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535,131071,262143,524287,1048575,2097151,4194303,8388607,16777215,33554431,67108863,134217727,268435455,536870911,1073741823,2147483647);
+	protected $m_lOnBits	= array(1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535,131071,262143,524287,1048575,2097151,4194303,8388607,16777215,33554431,67108863,134217727,268435455,536870911,1073741823,2147483647);
 	
 	/**
 	 * 2nd power sha256 mapping
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $m_l2Power	= array(1,2,4,8,16,32,64,128,256,512,1024,2048,4096,8192,16384,32768,65536,131072,262144,524288,1048576,2097152,4194304,8388608,16777216,33554432,67108864,134217728,268435456,536870912,1073741824);
+	protected $m_l2Power	= array(1,2,4,8,16,32,64,128,256,512,1024,2048,4096,8192,16384,32768,65536,131072,262144,524288,1048576,2097152,4194304,8388608,16777216,33554432,67108864,134217728,268435456,536870912,1073741824);
 	
 	/**
 	 * Hex mapping sha256 mapping
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $K			= array(0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2);
+	protected $K			= array(0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2);
 
 	/**
 	 * Perform SHA256 encoding
@@ -112,12 +112,12 @@ class auth_sha256
 	/**
 	 * Left shift a value x bits
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		String to shift
 	 * @param	integer		Number of bits to shift
 	 * @return	string		Shifted string
 	 */
-	private function LShift($lValue, $iShiftBits) 
+	protected function LShift($lValue, $iShiftBits) 
 	{
 		if ($iShiftBits == 0) 
 		{
@@ -152,12 +152,12 @@ class auth_sha256
 	/**
 	 * Right shift a value x bits
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		String to shift
 	 * @param	integer		Number of bits to shift
 	 * @return	string		Shifted string
 	 */
-	private function RShift($lValue, $iShiftBits)
+	protected function RShift($lValue, $iShiftBits)
 	{
 		if ($iShiftBits == 0) 
 		{
@@ -192,12 +192,12 @@ class auth_sha256
 	/**
 	 * Add unsigned
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		Number
 	 * @param	integer		Number
 	 * @return	string		Added unsigned integer
 	 */
-	private function AddUnsigned($lX, $lY)
+	protected function AddUnsigned($lX, $lY)
 	{
 		$lX8 = $lX & 0x80000000;
 		$lY8 = $lY & 0x80000000;
@@ -232,13 +232,13 @@ class auth_sha256
 	/**
 	 * Ch
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @param	integer		$y
 	 * @param	integer		$z
 	 * @return	mixed		No idea...
 	 */
-	private function Ch($x, $y, $z)
+	protected function Ch($x, $y, $z)
 	{
 		return (($x & $y) ^ ((~ $x) & $z));
 	}
@@ -246,13 +246,13 @@ class auth_sha256
 	/**
 	 * Maj
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @param	integer		$y
 	 * @param	integer		$z
 	 * @return	mixed		No idea...
 	 */
-	private function Maj($x, $y, $z)
+	protected function Maj($x, $y, $z)
 	{
 		return (($x & $y) ^ ($x & $z) ^ ($y & $z));
 	}
@@ -260,12 +260,12 @@ class auth_sha256
 	/**
 	 * S
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @param	integer		$n
 	 * @return	mixed		No idea...
 	 */
-	private function S($x, $n)
+	protected function S($x, $n)
 	{
 		return ($this->RShift($x , ($n & $this->m_lOnBits[4])) | $this->LShift($x , (32 - ($n & $this->m_lOnBits[4]))));
 	}
@@ -273,12 +273,12 @@ class auth_sha256
 	/**
 	 * R
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @param	integer		$n
 	 * @return	mixed		No idea...
 	 */
-	private function R($x, $n)
+	protected function R($x, $n)
 	{
 		return $this->RShift($x , ($n & $this->m_lOnBits[4]));
 	}
@@ -286,11 +286,11 @@ class auth_sha256
 	/**
 	 * Sigma0
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @return	mixed		No idea...
 	 */
-	private function Sigma0($x)
+	protected function Sigma0($x)
 	{
 		return ($this->S($x, 2) ^ $this->S($x, 13) ^ $this->S($x, 22));
 	}
@@ -298,11 +298,11 @@ class auth_sha256
 	/**
 	 * Sigma1
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @return	mixed		No idea...
 	 */
-	private function Sigma1($x)
+	protected function Sigma1($x)
 	{
 		return ($this->S($x, 6) ^ $this->S($x, 11) ^ $this->S($x, 25));
 	}
@@ -310,11 +310,11 @@ class auth_sha256
 	/**
 	 * Gamma0
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @return	mixed		No idea...
 	 */
-	private function Gamma0($x)
+	protected function Gamma0($x)
 	{
 		return ($this->S($x, 7) ^ $this->S($x, 18) ^ $this->R($x, 3));
 	}
@@ -322,11 +322,11 @@ class auth_sha256
 	/**
 	 * Gamma1
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	integer		$x
 	 * @return	mixed		No idea...
 	 */
-	private function Gamma1($x)
+	protected function Gamma1($x)
 	{
 		return ($this->S($x, 17) ^ $this->S($x, 19) ^ $this->R($x, 10));
 	}
@@ -334,11 +334,11 @@ class auth_sha256
 	/**
 	 * Convert to a word array
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Word to convert
 	 * @return	array		Word array
 	 */
-	private function ConvertToWordArray($sMessage)
+	protected function ConvertToWordArray($sMessage)
 	{
 		$BITS_TO_A_BYTE = 8;
 		$BYTES_TO_A_WORD = 4;
diff --git a/upload/admin/sources/loginauth/convert/index.html b/upload/admin/sources/loginauth/convert/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/convert/index.html
+++ b/upload/admin/sources/loginauth/convert/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/convert/newauth.php b/upload/admin/sources/loginauth/convert/newauth.php
index 80912bda..6fb34c4f 100644
--- a/upload/admin/sources/loginauth/convert/newauth.php
+++ b/upload/admin/sources/loginauth/convert/newauth.php
@@ -3,13 +3,13 @@
  * IPS Converters
  * Application Files
  * Login functions
- * Last Updated: $Date: 2010-04-06 14:26:38 +0100 (Tue, 06 Apr 2010) $
+ * Last Updated: $Date: 2011-05-18 21:53:27 -0400 (Wed, 18 May 2011) $
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2006 - 2009 Invision Power Services, Inc.
  * @package		IPS Converters
- * @link		http://www.invisionpower.com
- * @version		$Revision: 440 $
+ * @link		http://hatynka.in
+ * @version		$Revision: 8834 $
  */
 
 class converters
@@ -19,7 +19,7 @@ class converters
 	 * Constructor
 	 *
 	 * @param	ipsRegistry
-	 * @return	void
+	 * @return	@e void
 	 **/
 	public function __construct(ipsRegistry $registry, $parent)
 	{
@@ -65,10 +65,10 @@ class converters
 			$this->parent->cleanConvertData( md5($password) );
 			
 			// Force the log in
-			require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );
+			require_once( IPS_ROOT_PATH . 'sources/handlers/han_login.php' );/*noLibHook*/
 	    	$this->han_login =  new han_login( $this->registry );
 			$this->han_login->loginWithoutCheckingCredentials($this->parent->_memberData['member_id']);
-						
+			
 			// And form our own redirect 
 			$this->registry->getClass('output')->redirectScreen( $this->lang->words['partial_login'] , $this->settings['base_url'] );
 		}
@@ -80,6 +80,18 @@ class converters
 		
 	}
 	
+	private function aef ( $username, $email, $password )
+	{
+		if ( $this->parent->_memberData['conv_password'] == md5 ( $this->parent->_memberData['misc'] . $password ) )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
 	private function bbpress($username, $email, $password) 
 	{
 		$hash = $this->parent->_memberData['conv_password'];
@@ -91,14 +103,97 @@ class converters
 		
 		$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 		$crypt = $this->parent->hashCryptPrivate($_REQUEST['password'], $hash, $itoa64, 'P');
-		if ($crypt[0] == '*') 
+		if ($crypt[0] == '*')
 		{
-			$crypt = crypt( $_REQUEST['password'], $hash ); 
+			$crypt = crypt( $_REQUEST['password'], $hash );
 		}
 		
 		return $crypt == $hash ? TRUE : FALSE;
 	}
 	
+	/**
+	 * Community Server authentication
+	 *
+	 * @access	private
+	 * @param	string		Username
+	 * @param	string		Password
+	 * @return	boolean		Successful
+	 */
+	private function cs( $username, $password )
+	{
+		$hash = $this->parent->_memberData['conv_password'];
+
+		$encodedHashPass = base64_encode(pack("H*", sha1(base64_decode($this->parent->_memberData['misc']) . $password)));
+		$single_md5_pass = md5( $password );
+
+		if ($encodedHashPass == $hash)
+		{
+			$this->return_code = "SUCCESS";
+			return true;
+		}
+		else
+		{
+			$this->return_code = "WRONG_AUTH";
+			return false;
+		}
+	}
+
+	function CSAuth($username, $password)
+	{
+		$wsdl = 'https://internal.auth.com/Service.asmx?wsdl';
+		$dest = 'https://interal.auth.com/Service.asmx';
+		$single_md5_pass = md5( $password );
+
+		try
+		{
+			$client = new SoapClient($wsdl, array('trace' => 1));
+			$client->__setLocation($dest);
+			$loginparams = array('username' => $username, 'password' => $password);
+			$result = $client->AuthCS($loginparams);
+
+			switch ( $result->AuthCSResult )
+			{
+				case 'SUCCESS':
+					$this->cleanConvertData( $single_md5_pass );
+					$this->return_code = $result->AuthCSResult;
+					return TRUE;
+				case 'WRONG_AUTH':
+					$this->return_code = $result->AuthCSResult;
+					return FALSE;
+				default:
+					$this->return_code = 'FAIL';
+					return FALSE;
+			}
+		}
+		catch(Exception $ex)
+		{
+			//handle error
+			$this->return_code = 'FAIL';
+			return FALSE;
+		}
+	}
+
+	/**
+	 * FudForum
+	 **/
+	private function fudforum($username, $email, $password)
+	{
+		$success = false;
+		$single_md5_pass = md5( $password );
+		$hash = $this->parent->_memberData['conv_password'];			
+		
+		if (strlen($hash) == 40)
+		{
+			$success = (sha1($this->parent->_memberData['misc'] . sha1($password)) === $hash) ? true : false;
+		}
+		else
+		{
+			$success = ($single_md5_pass === $hash) ? true : false;
+		}
+
+		return $success;
+	}
+	
 	/**
 	 * PHPBB
 	 **/
@@ -107,7 +202,7 @@ class converters
 		$success = false;
 		$single_md5_pass = md5( $password );
 		$hash = $this->parent->_memberData['conv_password'];
-				
+		
 		$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 		if (strlen($hash) == 34)
 		{
@@ -228,18 +323,38 @@ class converters
 	 * @param	string		Password
 	 * @return	boolean		Successful
 	 */
-	private function webwiz( $username, $password )
+	private function webwiz( $username, $email, $password )
 	{
-		$single_md5_pass 	= md5( $password );
 		$success 			= false;
 
-		if ( webWizAuth::HashEncode($password . $this->parent->_memberData['misc']) == $this->parent->_memberData[ $this->password_field ] )
+		if ( webWizAuth::HashEncode($password . $this->parent->_memberData['misc']) == $this->parent->_memberData['conv_password'] )
 		{
 			$success = true;
 		}
 
 		return $success;
 	}
+	
+	/**
+	 * XenForo authentication
+	 *
+	 * @access	private
+	 * @param	string		Username
+	 * @param	string		Email	  
+	 * @param	string		Password
+	 * @return	boolean		Successful
+	 */
+	private function xenforo( $username, $email, $password )
+	{
+		if ($this->parent->_memberData['conv_password'] == md5(md5($password) . $this->parent->_memberData['misc']))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}		
 
 	/*
 	 * CUSTOM - 607195
@@ -277,7 +392,6 @@ class converters
 			$strChaine = str_replace(substr($p_strSubst, $intCpt, 1), $intCpt, $strChaine);
 		}
 	
-		// dŽcryptage, m�me mŽthode que le cryptage
 		for ($intCpt = 0 ; $intCpt < $intLng ; $intCpt += 3)
 		{
 			$intCarStr = substr($strChaine, $intCpt, 3);
@@ -312,6 +426,33 @@ class converters
 		return (bool) md5( md5( $password ) ) == $this->parent->_memberData['conv_password'];
 	}
 	
+	/**
+	 * punBB
+	 */
+	private function fluxbb($username, $email, $password)
+	{
+		$success = false;
+		$hash = $this->parent->_memberData['conv_password'];
+		
+		if ( strlen($hash) == 40 )
+		{
+			if ( $hash == sha1($this->parent->_memberData['misc'].sha1($password)) )
+			{
+				$success = true;
+			}
+			elseif ( $hash == sha1($password) )
+			{
+				$success = true;
+			}
+		}
+		else
+		{
+			$success = ( md5($password) == $hash ) ? true : false;
+		}
+		
+		return $success;
+	}
+	
 	/**
 	 * punBB
 	 */
@@ -319,7 +460,7 @@ class converters
 	{
 		$success = false;
 		$hash = $this->parent->_memberData['conv_password'];
-				
+		
 		if ( strlen($hash) == 40 )
 		{
 			if ( $hash == sha1($this->parent->_memberData['misc'].sha1($password)) )
@@ -663,8 +804,8 @@ class webWizAuth {
 		$function_ret=$strH[0].$strH[1].$strH[2].$strH[3].$strH[4];
 
 		return $function_ret;
-	} 
-		
+	}
+	
 	private function HexToBinary($btHex)
 	{
 		switch ($btHex)
@@ -721,9 +862,9 @@ class webWizAuth {
 
 			  $function_ret="2222";
 			  break;
-		} 
+		}
 		return $function_ret;
-	} 
+	}
 
 	private function BinaryToHex($strBinary)
 	{
@@ -781,9 +922,9 @@ class webWizAuth {
 
 			  $function_ret="Z";
 			  break;
-		} 
+		}
 	  return $function_ret;
-	} 
+	}
 
 	private function WordToBinary($strWord)
 	{
@@ -811,7 +952,7 @@ class webWizAuth {
 			} else {
 			  $strBinary="1".$strBinary;
 			}
-		} 
+		}
 
 		$strBinary=$intNew.$strBinary;
 		$intTemp=strlen($strBinary)%8;
@@ -822,7 +963,7 @@ class webWizAuth {
 		}
 
 		return $strBinary;
-	} 
+	}
 
 	private function PadBinary($strBinary)
 	{
@@ -842,7 +983,7 @@ class webWizAuth {
 		}
 
 		return $strBinary.$strTemp;
-	} 
+	}
 
 	private function BlockToHex($strBinary)
 	{
@@ -852,7 +993,7 @@ class webWizAuth {
 			$strHex=$strHex . self::BinaryToHex(substr($strBinary,$intPos-1,4));
 		}
 		return $strHex;
-	} 
+	}
 
 	private function DigestHex($strHex,$strH0,$strH1,$strH2,$strH3,$strH4)
 	{
@@ -1008,7 +1149,7 @@ class webWizAuth {
 					$strTemp4= self::BinaryXOR( self::BinaryXOR( self::HexBlockToBinary($strA[1]),
 					self::HexBlockToBinary($strA[2])), self::HexBlockToBinary($strA[3]));
 					break;
-			} 
+			}
 
 			$strTemp= self::BlockToHex($strTemp);
 			$strTemp1=self::BlockToHex($strTemp1);
@@ -1031,7 +1172,7 @@ class webWizAuth {
 
 		//Concatenate the final Hex Digest
 		return $strA[0].$strA[1].$strA[2].$strA[3].$strA[4];
-	} 
+	}
 
 	private function HexAdd($strHex1,$strHex2)
 	{
@@ -1039,13 +1180,13 @@ class webWizAuth {
 		$n2 = hexdec($strHex2);
 		$sum = $n1 + $n2;
 		return sprintf("%08X", $sum);
-	} 
+	}
 
 	private function BinaryShift($strBinary,$intPos)
 	{
 	  return substr($strBinary,strlen($strBinary)-(strlen($strBinary)-intval($intPos))).
 	    substr($strBinary,0,intval($intPos));
-	} 
+	}
 
 	// Function performs an exclusive or function on each position of two binary values
 	private function BinaryXOR($strBin1,$strBin2)
@@ -1065,7 +1206,7 @@ class webWizAuth {
 		}
 
 	  return $strBinaryFinal;
-	} 
+	}
 
 	// Function performs an inclusive or function on each position of two binary values
 	private function BinaryOR($strBin1,$strBin2)
@@ -1078,11 +1219,11 @@ class webWizAuth {
 				$strBinaryFinal=$strBinaryFinal."1";
 			} else {
 				$strBinaryFinal=$strBinaryFinal."0";
-			} 
+			}
 		}
 
 	  return $strBinaryFinal;
-	} 
+	}
 	
 	// Function performs an AND function on each position of two binary values
 	private function BinaryAND($strBin1,$strBin2)
@@ -1117,7 +1258,7 @@ class webWizAuth {
 		}
 
 		return $strBinaryFinal;
-	} 
+	}
 
 	// Function Converts a 8 digit/32 bit hex value to its 32 bit binary equivalent
 	private function HexBlockToBinary($strHex)
diff --git a/upload/admin/sources/loginauth/external/acp.php b/upload/admin/sources/loginauth/external/acp.php
index eed40a91..daa86b01 100644
--- a/upload/admin/sources/loginauth/external/acp.php
+++ b/upload/admin/sources/loginauth/external/acp.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : External method
- * Last Updated: $Date: 2010-03-01 17:36:05 -0500 (Mon, 01 Mar 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5884 $
+ * @version		$Revision: 7445 $
  *
  */
 
diff --git a/upload/admin/sources/loginauth/external/auth.php b/upload/admin/sources/loginauth/external/auth.php
index c52130f2..1f11e201 100644
--- a/upload/admin/sources/loginauth/external/auth.php
+++ b/upload/admin/sources/loginauth/external/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : Internal Method
- * Last Updated: $Date: 2010-03-01 17:36:05 -0500 (Mon, 01 Mar 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5884 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -41,7 +41,7 @@ class login_external extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -54,12 +54,12 @@ class login_external extends login_core implements interface_login
 	/**
 	 * Compare passwords
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Plain text password
 	 * @param	array 		Record from the remote table
 	 * @return	boolean
 	 */
-	private function _comparePasswords( $password, $remote_member )
+	protected function _comparePasswords( $password, $remote_member )
 	{
 		$check_pass = $password;
 		
@@ -136,8 +136,8 @@ class login_external extends login_core implements interface_login
 
 		if ( ! class_exists( 'dbMain' ) )
 		{
-			require_once( IPS_KERNEL_PATH.'classDb.php' );
-			require_once( IPS_KERNEL_PATH.'classDb' . ucwords($this->settings['sql_driver']) . ".php" );
+			require_once( IPS_KERNEL_PATH.'classDb.php' );/*noLibHook*/
+			require_once( IPS_KERNEL_PATH.'classDb' . ucwords($this->settings['sql_driver']) . '.php' );/*noLibHook*/
 		}
 
 		$classname = "db_driver_" . $this->settings['sql_driver'];
@@ -230,11 +230,11 @@ class login_external extends login_core implements interface_login
 	/**
 	 * Load a member
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadMember( $username )
+	protected function _loadMember( $username )
 	{
 		$member = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_l_username='" . mb_strtolower($username) . "'" ) );
 		
diff --git a/upload/admin/sources/loginauth/external/conf.dist.php b/upload/admin/sources/loginauth/external/conf.dist.php
deleted file mode 100644
index 6b289421..00000000
--- a/upload/admin/sources/loginauth/external/conf.dist.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Loginauth configuration file
- * Last Updated: $Date: 2010-03-01 17:36:05 -0500 (Mon, 01 Mar 2010) $
- * </pre>
- *
- * @author 		$Author: josh $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5884 $
- */
-// THIS ONE GOOD FOR PHPBB 2 BOARDS
-
-$LOGIN_CONF = array();
-
-
-/**
-* REMOTE DB SERVER
-* localhost is usually good
-*/
-$LOGIN_CONF['REMOTE_DB_SERVER']   = 'localhost';
-
-/**
-* REMOTE DB PORT
-* leave  blank if you're not sure.
-*/
-$LOGIN_CONF['REMOTE_DB_PORT']     = '';
-
-/**
-* REMOTE DB DATABASE NAME
-* This is the name of the database you want to
-* authorize against
-*/
-$LOGIN_CONF['REMOTE_DB_DATABASE'] = 'testphpbb';
-
-/**
-* REMOTE DB USER
-* This is the MySQL username for the database
-* you want to authorize against
-*/
-$LOGIN_CONF['REMOTE_DB_USER']     = 'root';
-
-/**
-* REMOTE DB PASSWORD
-* This is the MySQL password for the database
-* you want to authorize against
-*/
-$LOGIN_CONF['REMOTE_DB_PASS']     = '--pass--';
-
-/**
-* REMOTE DB TABLE NAME
-* This is the table name which holds your external members
-*/
-$LOGIN_CONF['REMOTE_TABLE_NAME']  = 'phpbb_users';
-
-/**
-* REMOTE DB TABLE PREFIX
-* This is the table prefix for your remote DB
-*/
-$LOGIN_CONF['REMOTE_TABLE_PREFIX']  = '';
-
-/**
-* REMOTE DB FIELD NAME
-* The name of the name field in the member's table
-*/
-$LOGIN_CONF['REMOTE_FIELD_NAME']  = 'username';
-
-/**
-* REMOTE DB PASSWORD FIELD
-* The name of the password field in the member's table
-*/
-$LOGIN_CONF['REMOTE_FIELD_PASS']  = 'user_password';
-
-/**
-* REMOTE DB EXTRA QUERY
-* Any extra query to run (eg: AND status='active')
-*/
-$LOGIN_CONF['REMOTE_EXTRA_QUERY'] = ' AND user_active=1';
-
-/**
-* Password Hasing Scheme
-* Can be one of md5, sha1, or none (for plaintext)
-* If passwords stored hashed in any other method, you will need
-* to modify auth.php to handle the password appropriately
-*/
-$LOGIN_CONF['REMOTE_PASSWORD_SCHEME'] = 'md5';
-
-/**
-* REMOTE DB SQL TYPE
-* This field is only used for databases that use connection types, such as MS-SQL
-*/
-$LOGIN_CONF['REMOTE_SQL_TYPE']  = '';
diff --git a/upload/admin/sources/loginauth/external/index.html b/upload/admin/sources/loginauth/external/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/external/index.html
+++ b/upload/admin/sources/loginauth/external/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/index.html b/upload/admin/sources/loginauth/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/index.html
+++ b/upload/admin/sources/loginauth/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/internal/auth.php b/upload/admin/sources/loginauth/internal/auth.php
index d5407e64..7db2fe6c 100644
--- a/upload/admin/sources/loginauth/internal/auth.php
+++ b/upload/admin/sources/loginauth/internal/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : Internal Method
- * Last Updated: $Date: 2010-06-29 22:16:04 -0400 (Tue, 29 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6588 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -41,7 +41,7 @@ class login_internal extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -93,7 +93,6 @@ class login_internal extends login_core implements interface_login
 	 * @param	string		Array of member data
 	 * @param	srting		Field to check, members_l_username or members_l_display_name
 	 * @return	boolean		Request was successful
-	 * @deprecated	This method was removed and code restored in memberFunctions.php due to this bug
 	 * @link	http://community.invisionpower.com/tracker/issue-21962-duplicate-display-names/
 	 */
 	public function nameExistsCheck( $name, $memberData, $fieldToCheck )
diff --git a/upload/admin/sources/loginauth/internal/index.html b/upload/admin/sources/loginauth/internal/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/internal/index.html
+++ b/upload/admin/sources/loginauth/internal/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/ipconverge/auth.php b/upload/admin/sources/loginauth/ipconverge/auth.php
index 3252f177..db75a322 100644
--- a/upload/admin/sources/loginauth/ipconverge/auth.php
+++ b/upload/admin/sources/loginauth/ipconverge/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : IP.Converge Method
- * Last Updated: $Date: 2010-06-09 20:15:29 -0400 (Wed, 09 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6498 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -37,10 +37,10 @@ class login_ipconverge extends login_core implements interface_login
 	/**
 	 * API Server object
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $api_server;
+	protected $api_server;
 	
 	
 	/**
@@ -50,7 +50,7 @@ class login_ipconverge extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -126,7 +126,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
@@ -212,9 +212,9 @@ class login_ipconverge extends login_core implements interface_login
 		// Allow for custom code execution
 		//-----------------------------------------
 		
-		if( file_exists( IPS_ROOT_PATH . 'sources/loginauth/ipconverge/custom.php' ) )
+		if( is_file( IPS_ROOT_PATH . 'sources/loginauth/ipconverge/custom.php' ) )
 		{
-			include_once( IPS_ROOT_PATH . 'sources/loginauth/ipconverge/custom.php' );
+			include_once( IPS_ROOT_PATH . 'sources/loginauth/ipconverge/custom.php' );/*noLibHook*/
 		}
 
 		//-----------------------------------------
@@ -228,11 +228,11 @@ class login_ipconverge extends login_core implements interface_login
 	/**
 	 * Load the member
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Email Address
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadMember( $email_address )
+	protected function _loadMember( $email_address )
 	{
 		$this->member_data = IPSMember::load( $email_address, 'extendedProfile,groups' );
 		
@@ -272,7 +272,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
@@ -337,7 +337,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
@@ -433,7 +433,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
@@ -498,7 +498,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
@@ -539,7 +539,7 @@ class login_ipconverge extends login_core implements interface_login
 	 *
 	 * @access	public
 	 * @param	void
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function logoutCallback()
 	{		
@@ -553,7 +553,7 @@ class login_ipconverge extends login_core implements interface_login
 			/* Set API class */
 			if ( ! is_object( $this->api_server ) )
 			{
-				require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+				require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 				$this->api_server = new classApiServer();
 			}
 			
@@ -604,7 +604,7 @@ class login_ipconverge extends login_core implements interface_login
 		
 		if ( ! is_object( $this->api_server ) )
 		{
-			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+			require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 			$this->api_server = new classApiServer();
 		}
 		
diff --git a/upload/admin/sources/loginauth/ipconverge/index.html b/upload/admin/sources/loginauth/ipconverge/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/ipconverge/index.html
+++ b/upload/admin/sources/loginauth/ipconverge/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/ldap/acp.php b/upload/admin/sources/loginauth/ldap/acp.php
index 097a403f..1462f10e 100644
--- a/upload/admin/sources/loginauth/ldap/acp.php
+++ b/upload/admin/sources/loginauth/ldap/acp.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : LDAP method
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7445 $
  *
  */
  
diff --git a/upload/admin/sources/loginauth/ldap/auth.php b/upload/admin/sources/loginauth/ldap/auth.php
index d46870f9..c7e0351b 100644
--- a/upload/admin/sources/loginauth/ldap/auth.php
+++ b/upload/admin/sources/loginauth/ldap/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : LDAP method
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -29,42 +29,42 @@ class login_ldap extends login_core implements interface_login
 	/**
 	 * LDAP Connection resource
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		resource
 	 */
-	private $connection_id;
+	protected $connection_id;
 	
 	/**
 	 * LDAP result set resource
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		resource
 	 */
-	private $result;
+	protected $result;
 
 	/**
 	 * LDAP Bind resource
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		resource
 	 */
-	private $bind_id;
+	protected $bind_id;
 
 	/**
 	 * LDAP Fields to retrieve
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $fields;
+	protected $fields;
 
 	/**
 	 * LDAP DN resource
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		resource
 	 */
-	private $dn;
+	protected $dn;
 	
 	/**
 	 * Constructor
@@ -73,7 +73,7 @@ class login_ldap extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -265,11 +265,11 @@ class login_ldap extends login_core implements interface_login
 	/**
 	 * Load a member
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Username
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadMember( $username )
+	protected function _loadMember( $username )
 	{
 		$member = $this->DB->buildAndFetch( array( 'select' => 'member_id', 'from' => 'members', 'where' => "members_l_username='" . mb_strtolower($username) . "'" ) );
 		
@@ -282,10 +282,10 @@ class login_ldap extends login_core implements interface_login
 	/**
 	 * Connect to LDAP server
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	boolean		Connection successful
 	 */
-	private function _ldapConnect()
+	protected function _ldapConnect()
 	{
 		//-----------------------------------------
 		// LDAP compiled in PHP?
@@ -362,7 +362,7 @@ class login_ldap extends login_core implements interface_login
 	 * Destructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/loginauth/ldap/conf.dist.php b/upload/admin/sources/loginauth/ldap/conf.dist.php
deleted file mode 100644
index a06811e5..00000000
--- a/upload/admin/sources/loginauth/ldap/conf.dist.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Loginauth configuration file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
- */
-
-$LOGIN_CONF = array();
-
-/**
-* LDAP SERVER LOCATION
-* This is the location of the LDAP server, either by hostname or IP address.
-*/
-$LOGIN_CONF['ldap_server'] = '';
-
-/**
-* LDAP SERVER PORT
-* If you require a specific port number, enter it here.
-*/
-$LOGIN_CONF['ldap_port'] = '';
-
-/**
-* LDAP SERVER USERNAME
-* If your LDAP server requires a username, enter it here.
-*/
-$LOGIN_CONF['ldap_server_username'] = '';
-
-/**
-* LDAP SERVER PASSWORD
-* If your LDAP server requires password authentication, enter it here.
-*/
-$LOGIN_CONF['ldap_server_password'] = '';
-
-/**
-* LDAP UID FIELD
-* This is the field which contains the user's authenticate name.
-*/
-$LOGIN_CONF['ldap_uid_field'] = 'cn';
-
-/**
-* LDAP BASE DN
-* The part of the world directory that is held on this
-* server, which could be "o=My Company,c=US"
-*
-*/
-$LOGIN_CONF['ldap_base_dn'] = '';
-
-/**
-* LDAP FILTER
-* Specify an LDAP search filter string to return a subset of the search for
-* the ldap_uid_field. The string might be used for restricting authentication
-* to a subgroup of your organisation, e.g. 'ou=your_department'
-*
-* It might be useful to list here the operators that work:
-*  =xyz   - matches exact value
-*  =*xyz  - matches values ending xyz
-*  =xyz*  - matches values beginning xyz
-*  =*xyz* - matches values containing xyz
-*  =*     - matches all values 
-* Boolean operators for constructing complex search
-*  &(term1)(term2)  - matches term1 AND term2
-*  | (term1)(term2) - matches term1 OR term2
-*  !(term1) - matches NOT term1 e.g. '!(ou=Student)'
-* 
-* leave this blank unless you are familiar with the contents of your
-* LDAP server entries.
-* 
-*/
-$LOGIN_CONF['ldap_filter'] = '';
-
-/**
-* LDAP SERVER VERSION
-* Select the relevant major version number for your LDAP server.
-* If unknown, try "3"
-*
-* OPTIONS: 2 = Version 2. 3 = Version 3.
-*/
-$LOGIN_CONF['ldap_server_version'] = 3;
-
-/**
-* LDAP_OPT_REFERRALS
-* If using Win2K3 Active Directory, and using a root dn as your base dn,
-* this must be set to 1.
-*
-* OPTIONS: 1 = yes, 0 = no
-*/
-$LOGIN_CONF['ldap_opt_referrals'] = 0;
-
-/**
-* LDAP USERNAME SUFFIX
-* If you're using Active Directory, you may need to use an account suffix
-* such as '@mydomain.local'. This is not always required.
-*
-*/
-$LOGIN_CONF['ldap_username_suffix'] = '';
-
-/**
-* LDAP USER REQUIRES PASS?
-* This relates to fetching a user's record from the LDAP.
-* If the each user does not have a password switch this to 'no' or authentication will fail.
-* Naturally, it's highly recommended that the LDAP admin chooses to use password authentication!
-*
-* OPTIONS: 1 = Yes. 0 = No
-*/
-$LOGIN_CONF['ldap_user_requires_pass'] = 1;
-
-/**
-* LDAP Display name field
-* If populated, IPB asks LDAP for the value of this field to synchronize the member account
-*
-* Leave blank to have member manually enter in a display name
-*/
-$LOGIN_CONF['ldap_display_name']	= 'cn';
-
-/**
-* LDAP email address field
-* If populated, IPB asks LDAP for the value of this field to synchronize the member account
-*
-* Leave blank to have member manually manage their email address
-*/
-$LOGIN_CONF['ldap_email_field']		= 'mail';
-
-/**
-* ADDITIONAL FIELDS
-* Here you can make a list of additional fields (comma separated) besides dn, display name, mail, and uid
-* that you would like to be returned from the server.
-*/
-$LOGIN_CONF['additional_fields'] = '';
diff --git a/upload/admin/sources/loginauth/ldap/index.html b/upload/admin/sources/loginauth/ldap/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/ldap/index.html
+++ b/upload/admin/sources/loginauth/ldap/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/README.txt b/upload/admin/sources/loginauth/live/README.txt
index 45cb8d31..4e7f31ce 100644
--- a/upload/admin/sources/loginauth/live/README.txt
+++ b/upload/admin/sources/loginauth/live/README.txt
@@ -10,6 +10,6 @@ Replace "(yourdomain.com)" with your domain name, and "(forums)" with the path t
 
 Afterwards you will be presented with some necessary information.  You will need the application ID and the secret key.
 
-Open /admin/sources/loginauth/live/Application-Key.xml and edit the "appid" and "secret" XML keys to the appropriate values supplied when you registered your site.  Then take this file and upload it to your server (it is recommended to store it outside of your public root directory for security purposes).  Finally, you will need to edit /admin/sources/loginauth/live/conf.php to supply the path (not URL) to this Application-Key.xml file.
+Open /admin/sources/loginauth/live/Application-Key.xml and edit the "appid" and "secret" XML keys to the appropriate values supplied when you registered your site.  Then take this file and upload it to your server (it is recommended to store it outside of your public root directory for security purposes).  Finally, you will need to edit the Windows Live configuration in the ACP to supply the path (not URL) to this Application-Key.xml file.
 
 If you require support or assistance, please submit a technical support ticket in your IPS Client Center.
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/acp.php b/upload/admin/sources/loginauth/live/acp.php
index 63ae5a61..b0ab9519 100644
--- a/upload/admin/sources/loginauth/live/acp.php
+++ b/upload/admin/sources/loginauth/live/acp.php
@@ -3,32 +3,26 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : OpenID method
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7445 $
  *
  */
 
 $config		= array(
 					array(
-							'title'			=> 'Ра�положение ключа XML',
-							'description'	=> "�еобходимо зареги�трировать �вое приложение и получить ID дл� и�пользовани� Windows Live(tm) на вашем форуме. Подробнее можно узнать в <a href='http://msdn.microsoft.com/en-us/library/bb676626.aspx'>MSDN Library</a>.  Дл� безопа�но�ти рекомендуем �охранить файл ключа вне директории веб-�ервера.  За подробно�т�ми обращайте�ь к файлу /admin/sources/loginauth/live/README.txt.",
+							'title'			=> 'Location of key XML',
+							'description'	=> "You must register your site as an application and receive an application ID to utilize Windows Live(tm) on your site.  See the <a href='http://msdn.microsoft.com/en-us/library/bb676626.aspx'>MSDN Library</a> for more information.  Note that it is recommended you store this file outside of your web root directory for security purposes.  See /admin/sources/loginauth/live/README.txt for more information.",
 							'key'			=> 'key_file_location',
 							'type'			=> 'string'
 						),
-					array(
-							'title'			=> 'Проверочный URL',
-							'description'	=> "Куда отправл�ть пользовател� дл� входа. �е измен�йте данный URL.",
-							'key'			=> 'login_url',
-							'type'			=> 'string'
-						),
 					);
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/auth.php b/upload/admin/sources/loginauth/live/auth.php
index 5872b53c..d5ce9e09 100644
--- a/upload/admin/sources/loginauth/live/auth.php
+++ b/upload/admin/sources/loginauth/live/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : MSN Live Method
- * Last Updated: $Date: 2010-04-19 08:59:13 -0400 (Mon, 19 Apr 2010) $
+ * Last Updated: $Date: 2011-09-07 21:50:25 -0400 (Wed, 07 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: michael $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 10th August 2009 (5:41)
- * @version		$Revision: 6146 $
+ * @version		$Revision: 9464 $
  *
  */
 
@@ -24,23 +24,36 @@ if ( ! defined( 'IN_IPB' ) )
 	exit();
 }
 
+/**
+ * Emulate mhash function using hash if needed
+ * 
+ * @link	http://community.invisionpower.com/tracker/issue-33215-windows-live-sign-in-using-deprecated-function-mhash
+ */
+if( !function_exists('mhash') AND function_exists('hash') )
+{
+	function mhash( $hash, $data, $key='' )
+	{
+		return hash( "sha256", $data, true );
+	}
+}
+
 class login_live extends login_core implements interface_login
 {
 	/**
 	 * Windows Live Library
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $live;
+	protected $live;
 
 	/**
 	 * Temporary data store
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $data_store	= array();
+	protected $data_store	= array();
 	
 	/**
 	 * Login method configuration
@@ -74,6 +87,13 @@ class login_live extends login_core implements interface_login
 	 */
 	public $missingModules = array();
 	
+	/**
+	 * The control URL to send login requests to
+	 *
+	 * @var		const
+	 */
+	const CONTRL_URL		= "http://login.live.com/wlogin.srf";
+	
 	/**
 	 * Constructor
 	 *
@@ -81,7 +101,7 @@ class login_live extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -99,18 +119,38 @@ class login_live extends login_core implements interface_login
 		// Check for necessary extensions
 		//-----------------------------------------
 		
-		if( !function_exists('mhash') OR !function_exists('mcrypt_decrypt') )
+		if( !function_exists('mhash') )
+		{
+			$this->missingModules[] = 'mhash';
+		}
+		
+		if( !function_exists('mcrypt_decrypt') )
+		{
+			$this->missingModules[] = 'mcrypt_decrypt';
+		}
+		
+		/* Got missing modules? */
+		if ( count($this->missingModules) )
 		{
 			$this->missingExtensions	= true;
-			$this->missingModules		= array( 'mhash', 'mcrypt_decrypt' );
+			$this->return_code			= 'MISSING_EXTENSIONS';
 			return false;
 		}
-
+		
+		/* Got our key file? */
+		if( !is_file( $this->live_config['key_file_location'] ) )
+		{
+			$this->missingModules[]		= $this->live_config['key_file_location'];
+			$this->missingExtensions	= true;
+			$this->return_code			= 'MISSING_EXTENSIONS';
+			return false;
+		}
+		
 		//-----------------------------------------
 		// And grab libs
 		//-----------------------------------------
 		
-		require_once IPS_ROOT_PATH . "sources/loginauth/live/lib/windowslivelogin.php";
+		require_once( IPS_ROOT_PATH . 'sources/loginauth/live/lib/windowslivelogin.php' );/*noLibHook*/
 		
 		$this->live	= WindowsLiveLogin::initFromXml( $this->live_config['key_file_location'] );
 		$this->live->setDebug( FALSE );
@@ -160,7 +200,7 @@ class login_live extends login_core implements interface_login
 		
 		if( !$user AND $this->request['use_live'] )
 		{
-			$this->registry->output->silentRedirect( $this->live_config['login_url'] . '?appid=' . $this->live->getAppId() );
+			$this->registry->output->silentRedirect( self::CONTRL_URL . '?appid=' . $this->live->getAppId() );
 		}
 		
 		if( method_exists( $user, 'getToken' ) )
@@ -225,11 +265,11 @@ class login_live extends login_core implements interface_login
 	/**
 	 * Load a member from an MSN Live user token
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string 		Token
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadMember( $userToken )
+	protected function _loadMember( $userToken )
 	{
 		$check = $this->DB->buildAndFetch( array( 'select'	=> 'member_id',
 														  'from'	=> 'members',
diff --git a/upload/admin/sources/loginauth/live/conf.dist.php b/upload/admin/sources/loginauth/live/conf.dist.php
deleted file mode 100644
index 66372db2..00000000
--- a/upload/admin/sources/loginauth/live/conf.dist.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Loginauth configuration file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
- */
- 
-$LOGIN_CONF = array();
-
-/**
-* Key file location
-* This is the location where the Live Application Key XML file is located
-*/
-$LOGIN_CONF['key_file_location'] = IPS_ROOT_PATH . 'sources/loginauth/live/Application-Key.xml';
-
-/**
-* Login URL
-* The location to send the user to for login purposes.  You should not need to changet his
-*/
-$LOGIN_CONF['login_url'] = 'http://login.live.com/wlogin.srf';
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/index.html b/upload/admin/sources/loginauth/live/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/live/index.html
+++ b/upload/admin/sources/loginauth/live/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/lib/index.html b/upload/admin/sources/loginauth/live/lib/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/live/lib/index.html
+++ b/upload/admin/sources/loginauth/live/lib/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/live/lib/windowslivelogin.php b/upload/admin/sources/loginauth/live/lib/windowslivelogin.php
index a2eef23c..1b868789 100644
--- a/upload/admin/sources/loginauth/live/lib/windowslivelogin.php
+++ b/upload/admin/sources/loginauth/live/lib/windowslivelogin.php
@@ -571,7 +571,7 @@ class WindowsLiveLogin
     /**
      * Sets the application ID. Use this method if you did not specify
      * an application ID at initialization.
-     **/
+     */
     public function setAppId($appid)
     {
         $_force_delauth_nonprovisioned = $this->_force_delauth_nonprovisioned;
diff --git a/upload/admin/sources/loginauth/live/loginauth_install.xml b/upload/admin/sources/loginauth/live/loginauth_install.xml
index c4c890ab..08a08331 100644
--- a/upload/admin/sources/loginauth/live/loginauth_install.xml
+++ b/upload/admin/sources/loginauth/live/loginauth_install.xml
@@ -9,7 +9,7 @@
 			<login_register_url></login_register_url>
 			<login_alt_login_html></login_alt_login_html>
 			<login_alt_acp_html></login_alt_acp_html>
-			<login_settings>0</login_settings>
+			<login_settings>1</login_settings>
 			<login_enabled>0</login_enabled>
 			<login_safemode>0</login_safemode>
 			<login_replace_form>0</login_replace_form>
diff --git a/upload/admin/sources/loginauth/login_core.php b/upload/admin/sources/loginauth/login_core.php
index d45049bb..eec6acdb 100644
--- a/upload/admin/sources/loginauth/login_core.php
+++ b/upload/admin/sources/loginauth/login_core.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction
- * Last Updated: $Date: 2010-10-13 09:41:52 -0400 (Wed, 13 Oct 2010) $
+ * Last Updated: $Date: 2011-08-25 07:48:47 -0400 (Thu, 25 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6968 $
+ * @version		$Revision: 9414 $
  *
  */
 
@@ -36,8 +36,8 @@ class login_core
 	protected $DB;
 	protected $settings;
 	protected $request;
-	protected $lang;
 	protected $member;
+	protected $cache;
 	/**#@-*/
 	
 	/**
@@ -83,17 +83,17 @@ class login_core
 	/**
 	 * Force email check
 	 *
-	 * @access private
+	 * @access protected
 	 * @var		boolean
 	 */
-	private $_forceEmailCheck = FALSE;
+	protected $_forceEmailCheck = FALSE;
 	
 	/**
 	 * Constructor
 	 *
 	 * @access	public
 	 * @param	object		ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -141,8 +141,15 @@ class login_core
 			$type = $this->method_config['login_user_id'];
 		}
 		
+		/* Forcing email? */
+		if ( $this->_forceEmailCheck )
+		{
+			$type = 'email';
+		}
+		
 		/* If we only have one, just take it and run with it */
 		$input = NULL;
+
 		if ( $email_address xor $username )
 		{
 			$input = ( $email_address ) ? $email_address : $username;
@@ -171,7 +178,7 @@ class login_core
 				}
 			break;
 		}
-		
+	
 		//-----------------------------------------
 		// Got an account
 		//-----------------------------------------
@@ -208,7 +215,7 @@ class login_core
 		else
 		{
 			$this->return_code = 'SUCCESS';
-			return false;
+			return true;
 		}
 	}
 	
@@ -232,27 +239,31 @@ class login_core
 	 * @access	public
 	 * @param	array		Member Information [members,pfields,profile_portal]
 	 * @return	array		New member information
-	 * @deprecated			Just redirects to IPSMember::create
 	 */
 	public function createLocalMember( $member )
 	{
 		$member['members']['members_created_remote']	= true;
 		$member['members']['members_display_name']		= ( $member['members']['members_display_name'] ) ? $member['members']['members_display_name'] : $member['members']['name'];
 		
-		$_return	= IPSMember::create( $member, FALSE, FALSE, FALSE );
+		$_return	= IPSMember::create( $member, FALSE, FALSE, TRUE );
 		
 		$this->cache->rebuildCache( 'stats', 'global' );
 		
+		if( $_return['full'] )
+		{
+			IPSLib::runMemberSync( 'onCompleteAccount', $_return );
+		}
+
 		return $_return;
 	}
 
 	/**
 	 * Check failed logins
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	boolean		Account ok or not
 	 */
-	private function _checkFailedLogins()	
+	protected function _checkFailedLogins()	
 	{
 		if ( $this->settings['ipb_bruteforce_attempts'] > 0 )
 		{
@@ -329,10 +340,10 @@ class login_core
 	/**
 	 * Append a failed login
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	boolean		Account ok or not
 	 */
-	private function _appendFailedLogin()
+	protected function _appendFailedLogin()
 	{
 		if( $this->settings['ipb_bruteforce_attempts'] > 0 )
 		{
diff --git a/upload/admin/sources/loginauth/login_interface.php b/upload/admin/sources/loginauth/login_interface.php
index c144dbf3..20992da4 100644
--- a/upload/admin/sources/loginauth/login_interface.php
+++ b/upload/admin/sources/loginauth/login_interface.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -27,7 +27,7 @@ interface interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() );
 
@@ -45,7 +45,7 @@ interface interface_login
 	 * Create a record of the user locally
 	 *
 	 * @param	array 		Member information
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function createLocalMember( $member );
 	
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID.php b/upload/admin/sources/loginauth/openid/Auth/OpenID.php
index b4c194a4..02f04f45 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID.php
@@ -25,10 +25,10 @@ define('Auth_OpenID_VERSION', '2.2.2');
 /**
  * Require the fetcher code.
  */
-require_once "Auth/Yadis/PlainHTTPFetcher.php";
-require_once "Auth/Yadis/ParanoidHTTPFetcher.php";
-require_once "Auth/OpenID/BigMath.php";
-require_once "Auth/OpenID/URINorm.php";
+require_once "Auth/Yadis/PlainHTTPFetcher.php";/*noLibHook*/
+require_once "Auth/Yadis/ParanoidHTTPFetcher.php";/*noLibHook*/
+require_once "Auth/OpenID/BigMath.php";/*noLibHook*/
+require_once "Auth/OpenID/URINorm.php";/*noLibHook*/
 
 /**
  * Status code returned by the server when the only option is to show
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/AX.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/AX.php
index 7370715e..d29df731 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/AX.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/AX.php
@@ -10,9 +10,9 @@
 /**
  * Require utility classes and functions for the consumer.
  */
-require_once "Auth/OpenID/Extension.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/TrustRoot.php";
+require_once "Auth/OpenID/Extension.php";/*noLibHook*/
+require_once "Auth/OpenID/Message.php";/*noLibHook*/
+require_once "Auth/OpenID/TrustRoot.php";/*noLibHook*/
 
 define('Auth_OpenID_AX_NS_URI',
        'http://openid.net/srv/ax/1.0');
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Association.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Association.php
index d1ac1ed9..938e943f 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Association.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Association.php
@@ -17,17 +17,17 @@
 /**
  * @access private
  */
-require_once 'Auth/OpenID/CryptUtil.php';
+require_once 'Auth/OpenID/CryptUtil.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID/KVForm.php';
+require_once 'Auth/OpenID/KVForm.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID/HMAC.php';
+require_once 'Auth/OpenID/HMAC.php';/*noLibHook*/
 
 /**
  * This class represents an association between a server and a
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/BigMath.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/BigMath.php
index 7fca2dc4..589de71c 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/BigMath.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/BigMath.php
@@ -18,12 +18,12 @@
 /**
  * Needed for random number generation
  */
-require_once 'Auth/OpenID/CryptUtil.php';
+require_once 'Auth/OpenID/CryptUtil.php';/*noLibHook*/
 
 /**
  * Need Auth_OpenID::bytes().
  */
-require_once 'Auth/OpenID.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 /**
  * The superclass of all big-integer math implementations
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Consumer.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Consumer.php
index 021c0389..e0131f26 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Consumer.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Consumer.php
@@ -160,18 +160,18 @@
 /**
  * Require utility classes and functions for the consumer.
  */
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/HMAC.php";
-require_once "Auth/OpenID/Association.php";
-require_once "Auth/OpenID/CryptUtil.php";
-require_once "Auth/OpenID/DiffieHellman.php";
-require_once "Auth/OpenID/KVForm.php";
-require_once "Auth/OpenID/Nonce.php";
-require_once "Auth/OpenID/Discover.php";
-require_once "Auth/OpenID/URINorm.php";
-require_once "Auth/Yadis/Manager.php";
-require_once "Auth/Yadis/XRI.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
+require_once "Auth/OpenID/Message.php";/*noLibHook*/
+require_once "Auth/OpenID/HMAC.php";/*noLibHook*/
+require_once "Auth/OpenID/Association.php";/*noLibHook*/
+require_once "Auth/OpenID/CryptUtil.php";/*noLibHook*/
+require_once "Auth/OpenID/DiffieHellman.php";/*noLibHook*/
+require_once "Auth/OpenID/KVForm.php";/*noLibHook*/
+require_once "Auth/OpenID/Nonce.php";/*noLibHook*/
+require_once "Auth/OpenID/Discover.php";/*noLibHook*/
+require_once "Auth/OpenID/URINorm.php";/*noLibHook*/
+require_once "Auth/Yadis/Manager.php";/*noLibHook*/
+require_once "Auth/Yadis/XRI.php";/*noLibHook*/
 
 /**
  * This is the status code returned when the complete method returns
@@ -379,7 +379,7 @@ class Auth_OpenID_Consumer {
         if (!$auth_req->setAnonymous($anonymous)) {
             return new Auth_OpenID_FailureResponse(null,
               "OpenID 1 requests MUST include the identifier " .
-              "in the request.");
+              "in the request.");/*noLibHook*/
         }
         return $auth_req;
     }
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/DiffieHellman.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/DiffieHellman.php
index 3e25b7db..f978780d 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/DiffieHellman.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/DiffieHellman.php
@@ -14,8 +14,8 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache
  */
 
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/BigMath.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
+require_once 'Auth/OpenID/BigMath.php';/*noLibHook*/
 
 function Auth_OpenID_getDefaultMod()
 {
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Discover.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Discover.php
index 3e18e03f..d505db07 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Discover.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Discover.php
@@ -4,11 +4,11 @@
  * The OpenID and Yadis discovery implementation for OpenID 1.2.
  */
 
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Parse.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/Yadis/XRIRes.php";
-require_once "Auth/Yadis/Yadis.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
+require_once "Auth/OpenID/Parse.php";/*noLibHook*/
+require_once "Auth/OpenID/Message.php";/*noLibHook*/
+require_once "Auth/Yadis/XRIRes.php";/*noLibHook*/
+require_once "Auth/Yadis/Yadis.php";/*noLibHook*/
 
 // XML namespace value
 define('Auth_OpenID_XMLNS_1_0', 'http://openid.net/xmlns/1.0');
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/DumbStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/DumbStore.php
index e8f29ace..ed95e0ef 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/DumbStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/DumbStore.php
@@ -17,8 +17,8 @@
 /**
  * Import the interface for creating a new store class.
  */
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMAC.php';
+require_once 'Auth/OpenID/Interface.php';/*noLibHook*/
+require_once 'Auth/OpenID/HMAC.php';/*noLibHook*/
 
 /**
  * This is a store for use in the worst case, when you have no way of
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Extension.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Extension.php
index c4e38c03..554545b5 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Extension.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Extension.php
@@ -9,7 +9,7 @@
 /**
  * Require the Message implementation.
  */
-require_once 'Auth/OpenID/Message.php';
+require_once 'Auth/OpenID/Message.php';/*noLibHook*/
 
 /**
  * A base class for accessing extension request and response data for
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/FileStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/FileStore.php
index 074421a0..95f69751 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/FileStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/FileStore.php
@@ -17,10 +17,10 @@
 /**
  * Require base class for creating a new interface.
  */
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/HMAC.php';
-require_once 'Auth/OpenID/Nonce.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
+require_once 'Auth/OpenID/Interface.php';/*noLibHook*/
+require_once 'Auth/OpenID/HMAC.php';/*noLibHook*/
+require_once 'Auth/OpenID/Nonce.php';/*noLibHook*/
 
 /**
  * This is a filesystem-based store for OpenID associations and
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/HMAC.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/HMAC.php
index e9779bd4..114be6c6 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/HMAC.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/HMAC.php
@@ -14,7 +14,7 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache
  */
 
-require_once 'Auth/OpenID.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 /**
  * SHA1_BLOCKSIZE is this module's SHA1 blocksize used by the fallback
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/HMACSHA1.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/HMACSHA1.php
index 9fc293e7..6efbadf0 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/HMACSHA1.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/HMACSHA1.php
@@ -14,7 +14,7 @@
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
  */
 
-require_once 'Auth/OpenID.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 /**
  * SHA1_BLOCKSIZE is this module's SHA1 blocksize used by the fallback
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/MDB2Store.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/MDB2Store.php
index 80024bad..c6bf8364 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/MDB2Store.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/MDB2Store.php
@@ -13,22 +13,22 @@
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
  */
 
-require_once 'MDB2.php';
+require_once 'MDB2.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID/Interface.php';
+require_once 'Auth/OpenID/Interface.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID/Nonce.php';
+require_once 'Auth/OpenID/Nonce.php';/*noLibHook*/
 
 /**
  * This store uses a PEAR::MDB2 connection to store persistence
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/MemcachedStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/MemcachedStore.php
index fc10800b..85c2ed0a 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/MemcachedStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/MemcachedStore.php
@@ -18,7 +18,7 @@
 /**
  * Import the interface for creating a new store class.
  */
-require_once 'Auth/OpenID/Interface.php';
+require_once 'Auth/OpenID/Interface.php';/*noLibHook*/
 
 /**
  * This is a memcached-based store for OpenID associations and
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Message.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Message.php
index 9aa1fa46..23cd5c47 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Message.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Message.php
@@ -9,10 +9,10 @@
 /**
  * Import tools needed to deal with messages.
  */
-require_once 'Auth/OpenID.php';
-require_once 'Auth/OpenID/KVForm.php';
-require_once 'Auth/Yadis/XML.php';
-require_once 'Auth/OpenID/Consumer.php'; // For Auth_OpenID_FailureResponse
+require_once 'Auth/OpenID.php';/*noLibHook*/
+require_once 'Auth/OpenID/KVForm.php';/*noLibHook*/
+require_once 'Auth/Yadis/XML.php';/*noLibHook*/
+require_once 'Auth/OpenID/Consumer.php';/*noLibHook*/ // For Auth_OpenID_FailureResponse
 
 // This doesn't REALLY belong here, but where is better?
 define('Auth_OpenID_IDENTIFIER_SELECT',
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/MySQLStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/MySQLStore.php
index 810f059f..210c41ee 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/MySQLStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/MySQLStore.php
@@ -9,7 +9,7 @@
 /**
  * Require the base class file.
  */
-require_once "Auth/OpenID/SQLStore.php";
+require_once "Auth/OpenID/SQLStore.php";/*noLibHook*/
 
 /**
  * An SQL store that uses MySQL as its backend.
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Nonce.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Nonce.php
index b83c5911..e3918eca 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Nonce.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Nonce.php
@@ -9,7 +9,7 @@
 /**
  * Need CryptUtil to generate random strings.
  */
-require_once 'Auth/OpenID/CryptUtil.php';
+require_once 'Auth/OpenID/CryptUtil.php';/*noLibHook*/
 
 /**
  * This is the characters that the nonces are made from.
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/PAPE.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/PAPE.php
index f08ca8bd..529f1ef5 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/PAPE.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/PAPE.php
@@ -8,7 +8,7 @@
  * http://openid.net/developers/specs/
  */
 
-require_once "Auth/OpenID/Extension.php";
+require_once "Auth/OpenID/Extension.php";/*noLibHook*/
 
 define('Auth_OpenID_PAPE_NS_URI',
        "http://specs.openid.net/extensions/pape/1.0");
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Parse.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Parse.php
index 6c2e7216..9e180704 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Parse.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Parse.php
@@ -24,7 +24,7 @@
  * - The openid.server URL MUST be an absolute URL. OpenID consumers
  *   MUST NOT attempt to resolve relative URLs.
  *
- * - The openid.server URL MUST NOT include entities other than &amp;,
+ * - The openid.server URL MUST NOT contain entities other than &amp;,
  *   &lt;, &gt;, and &quot;.
  *
  * The parser ignores SGML comments and <![CDATA[blocks]]>. Both kinds
@@ -82,7 +82,7 @@
 /**
  * Require Auth_OpenID::arrayGet().
  */
-require_once "Auth/OpenID.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
 
 class Auth_OpenID_Parse {
 
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/PostgreSQLStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/PostgreSQLStore.php
index d90e43e0..10a176ae 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/PostgreSQLStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/PostgreSQLStore.php
@@ -9,7 +9,7 @@
 /**
  * Require the base class file.
  */
-require_once "Auth/OpenID/SQLStore.php";
+require_once "Auth/OpenID/SQLStore.php";/*noLibHook*/
 
 /**
  * An SQL store that uses PostgreSQL as its backend.
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLStore.php
index c0405973..d4b3f5b5 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLStore.php
@@ -16,18 +16,18 @@
 /**
  * @access private
  */
-require_once 'Auth/OpenID/Interface.php';
-require_once 'Auth/OpenID/Nonce.php';
+require_once 'Auth/OpenID/Interface.php';/*noLibHook*/
+require_once 'Auth/OpenID/Nonce.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID.php';
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 /**
  * @access private
  */
-require_once 'Auth/OpenID/Nonce.php';
+require_once 'Auth/OpenID/Nonce.php';/*noLibHook*/
 
 /**
  * This is the parent class for the SQL stores, which contains the
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLiteStore.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLiteStore.php
index 4558fa1c..89d1900d 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLiteStore.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/SQLiteStore.php
@@ -9,7 +9,7 @@
 /**
  * Require the base class file.
  */
-require_once "Auth/OpenID/SQLStore.php";
+require_once "Auth/OpenID/SQLStore.php";/*noLibHook*/
 
 /**
  * An SQL store that uses SQLite as its backend.
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/SReg.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/SReg.php
index 5ece7072..835af9fe 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/SReg.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/SReg.php
@@ -42,8 +42,8 @@
 /**
  * Import message and extension internals.
  */
-require_once 'Auth/OpenID/Message.php';
-require_once 'Auth/OpenID/Extension.php';
+require_once 'Auth/OpenID/Message.php';/*noLibHook*/
+require_once 'Auth/OpenID/Extension.php';/*noLibHook*/
 
 // The data fields that are listed in the sreg spec
 global $Auth_OpenID_sreg_data_fields;
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/Server.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/Server.php
index cc8ba961..e112b544 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/Server.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/Server.php
@@ -92,16 +92,16 @@
 /**
  * Required imports
  */
-require_once "Auth/OpenID.php";
-require_once "Auth/OpenID/Association.php";
-require_once "Auth/OpenID/CryptUtil.php";
-require_once "Auth/OpenID/BigMath.php";
-require_once "Auth/OpenID/DiffieHellman.php";
-require_once "Auth/OpenID/KVForm.php";
-require_once "Auth/OpenID/TrustRoot.php";
-require_once "Auth/OpenID/ServerRequest.php";
-require_once "Auth/OpenID/Message.php";
-require_once "Auth/OpenID/Nonce.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
+require_once "Auth/OpenID/Association.php";/*noLibHook*/
+require_once "Auth/OpenID/CryptUtil.php";/*noLibHook*/
+require_once "Auth/OpenID/BigMath.php";/*noLibHook*/
+require_once "Auth/OpenID/DiffieHellman.php";/*noLibHook*/
+require_once "Auth/OpenID/KVForm.php";/*noLibHook*/
+require_once "Auth/OpenID/TrustRoot.php";/*noLibHook*/
+require_once "Auth/OpenID/ServerRequest.php";/*noLibHook*/
+require_once "Auth/OpenID/Message.php";/*noLibHook*/
+require_once "Auth/OpenID/Nonce.php";/*noLibHook*/
 
 define('AUTH_OPENID_HTTP_OK', 200);
 define('AUTH_OPENID_HTTP_REDIRECT', 302);
@@ -1060,7 +1060,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
                 ($response_identity === null)) {
                 return new Auth_OpenID_ServerError(null,
                   "Request was an OpenID 1 request, so response must " .
-                  "include an identifier.");
+                  "include an identifier.");/*noLibHook*/
             }
 
             $response->fields->updateArgs(Auth_OpenID_OPENID_NS,
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/ServerRequest.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/ServerRequest.php
index 69222a5e..f175541b 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/ServerRequest.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/ServerRequest.php
@@ -17,7 +17,7 @@
 /**
  * Imports
  */
-require_once "Auth/OpenID.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
 
 /**
  * Object that holds the state of a request to the OpenID server
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/TrustRoot.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/TrustRoot.php
index 000440b5..ed1f98f2 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/TrustRoot.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/TrustRoot.php
@@ -12,7 +12,7 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache
  */
 
-require_once 'Auth/OpenID/Discover.php';
+require_once 'Auth/OpenID/Discover.php';/*noLibHook*/
 
 /**
  * A regular expression that matches a domain ending in a top-level domains.
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/URINorm.php b/upload/admin/sources/loginauth/openid/Auth/OpenID/URINorm.php
index c051b550..219ea737 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/URINorm.php
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/URINorm.php
@@ -9,7 +9,7 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache
  */
 
-require_once 'Auth/Yadis/Misc.php';
+require_once 'Auth/Yadis/Misc.php';/*noLibHook*/
 
 // from appendix B of rfc 3986 (http://www.ietf.org/rfc/rfc3986.txt)
 function Auth_OpenID_getURIPattern()
diff --git a/upload/admin/sources/loginauth/openid/Auth/OpenID/index.html b/upload/admin/sources/loginauth/openid/Auth/OpenID/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/openid/Auth/OpenID/index.html
+++ b/upload/admin/sources/loginauth/openid/Auth/OpenID/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/HTTPFetcher.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/HTTPFetcher.php
index 148cde1b..c9e826d9 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/HTTPFetcher.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/HTTPFetcher.php
@@ -16,7 +16,7 @@
 /**
  * Require logging functionality
  */
-require_once "Auth/OpenID.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
 
 define('Auth_OpenID_FETCHER_MAX_RESPONSE_KB', 1024);
 define('Auth_OpenID_USER_AGENT', 
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/ParanoidHTTPFetcher.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/ParanoidHTTPFetcher.php
index 4da7c94c..137ce938 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/ParanoidHTTPFetcher.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/ParanoidHTTPFetcher.php
@@ -16,9 +16,9 @@
 /**
  * Interface import
  */
-require_once "Auth/Yadis/HTTPFetcher.php";
+require_once "Auth/Yadis/HTTPFetcher.php";/*noLibHook*/
 
-require_once "Auth/OpenID.php";
+require_once "Auth/OpenID.php";/*noLibHook*/
 
 /**
  * A paranoid {@link Auth_Yadis_HTTPFetcher} class which uses CURL
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/PlainHTTPFetcher.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/PlainHTTPFetcher.php
index 26890539..ed1f881b 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/PlainHTTPFetcher.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/PlainHTTPFetcher.php
@@ -17,7 +17,7 @@
 /**
  * Interface import
  */
-require_once "Auth/Yadis/HTTPFetcher.php";
+require_once "Auth/Yadis/HTTPFetcher.php";/*noLibHook*/
 
 /**
  * This class implements a plain, hand-built socket-based fetcher
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRDS.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRDS.php
index 1f5af96f..5f078df4 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRDS.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRDS.php
@@ -16,7 +16,7 @@
 /**
  * Require the XPath implementation.
  */
-require_once 'Auth/Yadis/XML.php';
+require_once 'Auth/Yadis/XML.php';/*noLibHook*/
 
 /**
  * This match mode means a given service must match ALL filters passed
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRI.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRI.php
index 0143a692..09401ef5 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRI.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRI.php
@@ -9,9 +9,9 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache
  */
 
-require_once 'Auth/Yadis/Misc.php';
-require_once 'Auth/Yadis/Yadis.php';
-require_once 'Auth/OpenID.php';
+require_once 'Auth/Yadis/Misc.php';/*noLibHook*/
+require_once 'Auth/Yadis/Yadis.php';/*noLibHook*/
+require_once 'Auth/OpenID.php';/*noLibHook*/
 
 function Auth_Yadis_getDefaultProxy()
 {
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRIRes.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRIRes.php
index 5e115873..dd59de91 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/XRIRes.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/XRIRes.php
@@ -4,8 +4,8 @@
  * Code for using a proxy XRI resolver.
  */
 
-require_once 'Auth/Yadis/XRDS.php';
-require_once 'Auth/Yadis/XRI.php';
+require_once 'Auth/Yadis/XRDS.php';/*noLibHook*/
+require_once 'Auth/Yadis/XRI.php';/*noLibHook*/
 
 class Auth_Yadis_ProxyResolver {
     function Auth_Yadis_ProxyResolver($fetcher, $proxy_url = null)
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/Yadis.php b/upload/admin/sources/loginauth/openid/Auth/Yadis/Yadis.php
index 9ea2db7f..0278c7bc 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/Yadis.php
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/Yadis.php
@@ -17,18 +17,18 @@
  * Need both fetcher types so we can use the right one based on the
  * presence or absence of CURL.
  */
-require_once "Auth/Yadis/PlainHTTPFetcher.php";
-require_once "Auth/Yadis/ParanoidHTTPFetcher.php";
+require_once "Auth/Yadis/PlainHTTPFetcher.php";/*noLibHook*/
+require_once "Auth/Yadis/ParanoidHTTPFetcher.php";/*noLibHook*/
 
 /**
  * Need this for parsing HTML (looking for META tags).
  */
-require_once "Auth/Yadis/ParseHTML.php";
+require_once "Auth/Yadis/ParseHTML.php";/*noLibHook*/
 
 /**
  * Need this to parse the XRDS document during Yadis discovery.
  */
-require_once "Auth/Yadis/XRDS.php";
+require_once "Auth/Yadis/XRDS.php";/*noLibHook*/
 
 /**
  * XRDS (yadis) content type
@@ -165,7 +165,7 @@ function Auth_Yadis_getServiceEndpoints($input_url, $xrds_parse_func,
  *
  * First, require this library into your program source:
  *
- * <pre>  require_once "Auth/Yadis/Yadis.php";</pre>
+ * <pre>  require_once "Auth/Yadis/Yadis.php";/*noLibHook*//*</pre>TERANOTE: remove the additional /* because of libHook
  *
  * To perform Yadis discovery, first call the "discover" method
  * statically with a URI parameter:
diff --git a/upload/admin/sources/loginauth/openid/Auth/Yadis/index.html b/upload/admin/sources/loginauth/openid/Auth/Yadis/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/openid/Auth/Yadis/index.html
+++ b/upload/admin/sources/loginauth/openid/Auth/Yadis/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/openid/Auth/index.html b/upload/admin/sources/loginauth/openid/Auth/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/openid/Auth/index.html
+++ b/upload/admin/sources/loginauth/openid/Auth/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/openid/acp.php b/upload/admin/sources/loginauth/openid/acp.php
index dcd6fa91..4c1ab214 100644
--- a/upload/admin/sources/loginauth/openid/acp.php
+++ b/upload/admin/sources/loginauth/openid/acp.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : OpenID method
- * Last Updated: $Date: 2010-06-28 20:04:10 -0400 (Mon, 28 Jun 2010) $
+ * Last Updated: $Date: 2010-12-17 08:01:38 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6584 $
+ * @version		$Revision: 7445 $
  *
  */
 
diff --git a/upload/admin/sources/loginauth/openid/auth.php b/upload/admin/sources/loginauth/openid/auth.php
index 8122d199..02e39bce 100644
--- a/upload/admin/sources/loginauth/openid/auth.php
+++ b/upload/admin/sources/loginauth/openid/auth.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Login handler abstraction : OpenID Method
- * Last Updated: $Date: 2010-10-05 21:26:08 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-08-18 17:50:15 -0400 (Thu, 18 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6945 $
+ * @version		$Revision: 9399 $
  *
  */
 
@@ -29,26 +29,26 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * OpenID Consumer object
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $consumer;
+	protected $consumer;
 	
 	/**
 	 * OpenID Store object
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		object
 	 */
-	private $store;
+	protected $store;
 	
 	/**
 	 * Temporary data store
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $data_store	= array();
+	protected $data_store	= array();
 	
 	/**
 	 * Login method configuration
@@ -73,7 +73,7 @@ class login_openid extends login_core implements interface_login
 	 * @param	object		ipsRegistry reference
 	 * @param	array 		Configuration info for this method
 	 * @param	array 		Custom configuration info for this method
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry, $method, $conf=array() )
 	{
@@ -86,7 +86,7 @@ class login_openid extends login_core implements interface_login
 		// Fix include path for OpenID libs
 		//-----------------------------------------
 		
-		$path_extra	= dirname( __FILE__ );
+		$path_extra	= dirname( __FILE__ );/*noLibHook*/
 		$path		= ini_get( 'include_path' );
 		$path		= $path_extra . PATH_SEPARATOR . $path;
 		ini_set( 'include_path', $path );
@@ -115,10 +115,10 @@ class login_openid extends login_core implements interface_login
 		// And grab libs
 		//-----------------------------------------
 		 
-		require_once "Auth/OpenID/Consumer.php";
-		require_once "Auth/OpenID/FileStore.php";
-		require_once "Auth/OpenID/SReg.php";
-		require_once "Auth/OpenID/PAPE.php";
+		require_once "Auth/OpenID/Consumer.php";/*noLibHook*/
+		require_once "Auth/OpenID/FileStore.php";/*noLibHook*/
+		require_once "Auth/OpenID/SReg.php";/*noLibHook*/
+		require_once "Auth/OpenID/PAPE.php";/*noLibHook*/
 	}
 	
 	/**
@@ -369,12 +369,12 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * Load a member from an identity url and then try by email
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string 		Identity URL
 	 * @param	string 		Email Address
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _loadMember( $url, $email )
+	protected function _loadMember( $url, $email )
 	{
 		$check = $this->DB->buildAndFetch( array( 'select'	=> 'email',
 														  'from'	=> 'members',
@@ -394,10 +394,10 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * Perform first pass through login handler routine
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	mixed		Boolean on failure else output/redirect
 	 */
-	private function _doFirstPass()
+	protected function _doFirstPass()
 	{
 		//-----------------------------------------
 		// Do the same cleaning we do when storing url
@@ -417,6 +417,16 @@ class login_openid extends login_core implements interface_login
 			$this->return_code 		= 'WRONG_AUTH';
 			return false;
 		}
+		
+		/* TEMP BLOCK 
+			@link	http://community.invisionpower.com/tracker/issue-26374-google-open-id-url-directed-identity/
+		*/
+		if( $url == 'https://www.google.com/accounts/o8/id' )
+		{
+			$this->auth_errors[]	= 'bad_url';
+			$this->return_code 		= 'WRONG_AUTH';
+			return false;
+		}
 
 		$consumer = $this->_getConsumer();
 		
@@ -449,7 +459,7 @@ class login_openid extends login_core implements interface_login
 		
 		if( $this->is_admin_auth )
 		{
-			$process_url 	= $this->settings['base_url'] . 'app=core&module=login&do=login-complete&firstpass=1&myopenid=' . $id;
+			$process_url 	= $this->settings['base_acp_url'] . '/index.php?app=core&module=login&do=login-complete&firstpass=1&myopenid=' . $id;
 		}
 		else
 		{
@@ -498,8 +508,8 @@ class login_openid extends login_core implements interface_login
 		
 		if( $this->request['module'] == 'ajax' )
 		{
-			require_once( IPS_KERNEL_PATH . 'classAjax.php' );
-			$ajax = new classAjax();
+			$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
+			$ajax = new $classToLoad();
 			$ajax->returnJsonArray( array( 'url' => $redirect_url ) );
 		}
 	
@@ -543,10 +553,10 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * Verify login and extract member data information
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	boolean
 	 */
-	private function _checkFirstPass()
+	protected function _checkFirstPass()
 	{
 		//-----------------------------------------
 		// Retrieve stored data
@@ -570,13 +580,23 @@ class login_openid extends login_core implements interface_login
 			return false;
 		}
 		
+		/* TEMP BLOCK 
+			@link	http://community.invisionpower.com/tracker/issue-26374-google-open-id-url-directed-identity/
+		*/
+		if( $this->data_store['fullurl'] == 'https://www.google.com/accounts/o8/id' )
+		{
+			$this->auth_errors[]	= 'bad_url';
+			$this->return_code 		= 'WRONG_AUTH';
+			return false;
+		}
+
 		$this->DB->delete( 'openid_temp', "id='{$id}'" );
 		
 		$consumer	= $this->_getConsumer();
 		
 		if( $this->is_admin_auth )
 		{
-			$return_to 	= $this->settings['base_url'] . 'app=core&module=login&do=login-complete&myopenid=' . $id;
+			$return_to 	= $this->settings['base_acp_url'] . '/index.php?app=core&module=login&do=login-complete&myopenid=' . $id;
 		}
 		else
 		{
@@ -629,15 +649,18 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * Grab the OpenID Store
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	mixed		False on failure, else an OpenID FileStore object
 	 */
-	private function _getStore()
+	protected function _getStore()
 	{
-		if ( !is_dir($this->openid_config['store_path']) AND !mkdir($this->openid_config['store_path']) ) 
+		if ( !is_dir($this->openid_config['store_path']) ) 
 		{
-			$this->auth_errors[] = 'bad_path';
-			return false;
+			if( !@mkdir($this->openid_config['store_path']) )
+			{
+				$this->auth_errors[] = 'bad_path';
+				return false;
+			}
 		}
 
 		return new Auth_OpenID_FileStore( $this->openid_config['store_path'] );
@@ -646,10 +669,10 @@ class login_openid extends login_core implements interface_login
 	/**
 	 * Grab the OpenID Store
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	mixed		False on failure, else an OpenID Consumer object
 	 */
-	private function _getConsumer()
+	protected function _getConsumer()
 	{
 		$store = $this->_getStore();
 			
diff --git a/upload/admin/sources/loginauth/openid/conf.dist.php b/upload/admin/sources/loginauth/openid/conf.dist.php
deleted file mode 100644
index 3a7b4dbe..00000000
--- a/upload/admin/sources/loginauth/openid/conf.dist.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Loginauth configuration file
- * Last Updated: $Date: 2010-06-30 21:01:53 -0400 (Wed, 30 Jun 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 6593 $
- */
- 
-$LOGIN_CONF = array();
-
-/**
-* File-Store location
-* This is the location where the openid filestore should be placed
-*/
-$LOGIN_CONF['store_path'] = DOC_IPS_ROOT_PATH . 'cache/openid';
-
-
-/**
-* Option args to pull
-* Based on OpenID specs, optional args to request
-* http://www.openidenabled.com/openid/simple-registration-extension
-*/
-
-$LOGIN_CONF['args_opt']	= 'nickname,dob,email';//,gender';	= removing gender until core is fixed
-
-/**
-* Required args to pull
-* Based on OpenID specs, required args to request
-* http://www.openidenabled.com/openid/simple-registration-extension
-*/
-
-$LOGIN_CONF['args_req']	= '';
-
-/**
-* Policy URL
-* This is a url to the policy on data you collect (optional)
-* 
-*/
-
-$LOGIN_CONF['openid_policy']	= '';
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/openid/index.html b/upload/admin/sources/loginauth/openid/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/loginauth/openid/index.html
+++ b/upload/admin/sources/loginauth/openid/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/loginauth/openid/loginauth_install.xml b/upload/admin/sources/loginauth/openid/loginauth_install.xml
index 2ecfd05e..01d036e1 100644
--- a/upload/admin/sources/loginauth/openid/loginauth_install.xml
+++ b/upload/admin/sources/loginauth/openid/loginauth_install.xml
@@ -9,7 +9,7 @@
 			<login_register_url></login_register_url>
 			<login_alt_login_html></login_alt_login_html>
 			<login_alt_acp_html><![CDATA[<label for='openid'>Open ID</label> <input type='text' size='20' id='openid' name='openid_url' value='http://'>]]></login_alt_acp_html>
-			<login_settings>0</login_settings>
+			<login_settings>1</login_settings>
 			<login_enabled>0</login_enabled>
 			<login_safemode>0</login_safemode>
 			<login_replace_form>0</login_replace_form>
diff --git a/upload/admin/sources/template_plugins/index.html b/upload/admin/sources/template_plugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/admin/sources/template_plugins/index.html
+++ b/upload/admin/sources/template_plugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/admin/sources/template_plugins/tp_addtohead.php b/upload/admin/sources/template_plugins/tp_addtohead.php
index 1b38afe2..98b207e4 100644
--- a/upload/admin/sources/template_plugins/tp_addtohead.php
+++ b/upload/admin/sources/template_plugins/tp_addtohead.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Plugin: Add to head
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_addtohead extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_currency.php b/upload/admin/sources/template_plugins/tp_currency.php
index b8229ae1..9f80d2b3 100644
--- a/upload/admin/sources/template_plugins/tp_currency.php
+++ b/upload/admin/sources/template_plugins/tp_currency.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Currency
- * Last Updated: $Date: 2010-05-19 06:23:08 -0400 (Wed, 19 May 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6317 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_currency extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_date.php b/upload/admin/sources/template_plugins/tp_date.php
index cb571c39..a5da6fa4 100644
--- a/upload/admin/sources/template_plugins/tp_date.php
+++ b/upload/admin/sources/template_plugins/tp_date.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Date
- * Last Updated: $Date: 2010-03-10 07:00:06 -0500 (Wed, 10 Mar 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5932 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_date extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -47,8 +47,6 @@ class tp_date extends output implements interfaceTemplatePlugins
 		//-----------------------------------------
 				
 		$return = '';
-		$_format      = 'LONG';
-		$_relative    = 1;
 		$timestamp    = $data ? $data : "'{custom:now}'";
 
 		# Fix up string style dates
@@ -67,8 +65,9 @@ class tp_date extends output implements interfaceTemplatePlugins
 		}*/
 
 		$_relative = ( isset( $options['relative'] ) && $options['relative'] == 'false' ) ? 1 : 0;
+		$_format   = empty( $options['format'] ) ? 'LONG' : $options['format'];
 
-		$return = '$this->registry->getClass(\'class_localization\')->getDate(' . $timestamp . ',"' .  $options['format'] . '", ' . $_relative . ')';
+		$return = '$this->registry->getClass(\'class_localization\')->getDate(' . $timestamp . ',"' .  $_format . '", ' . $_relative . ')';
 		
 		return '" . ' . $return . ' . "';
 	}
diff --git a/upload/admin/sources/template_plugins/tp_gallery_resize.php b/upload/admin/sources/template_plugins/tp_editor.php
similarity index 51%
rename from upload/admin/sources/template_plugins/tp_gallery_resize.php
rename to upload/admin/sources/template_plugins/tp_editor.php
index aacc8643..bad3e0d7 100644
--- a/upload/admin/sources/template_plugins/tp_gallery_resize.php
+++ b/upload/admin/sources/template_plugins/tp_editor.php
@@ -3,29 +3,29 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
- * Template Pluging: Resize images in templates proportionately
- * Last Updated: $Date: 2010-01-15 09:55:46 -0500 (Fri, 15 Jan 2010) $
+ * IP.Board v3.2.3
+ * Template Pluging: CCS block parsing
+ * Last Updated: $Date: 2011-09-12 20:59:05 -0400 (Mon, 12 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Content
- * @link		http://www.invisionpower.com
- * @version		$Rev: 166 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9483 $
  */
 
 /**
 * Main loader class
 */
-class tp_gallery_resize extends output implements interfaceTemplatePlugins
+class tp_editor extends output implements interfaceTemplatePlugins
 {
 	/**
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -35,7 +35,7 @@ class tp_gallery_resize extends output implements interfaceTemplatePlugins
 	 * Run the plug-in
 	 *
 	 * @access	public
-	 * @author	Matt Mecham
+	 * @author	Brandon Farber
 	 * @param	string	The initial data from the tag
 	 * @param	array	Array of options
 	 * @return	string	Processed HTML
@@ -45,15 +45,25 @@ class tp_gallery_resize extends output implements interfaceTemplatePlugins
 		//-----------------------------------------
 		// Process the tag and return the data
 		//-----------------------------------------
-
-		if ( ! $data )
+		
+		if( ! $data )
 		{
 			return;	
 		}
 		
-		$return = '$this->registry->getClass(\'gallery\')->inlineResize( ' . $data . ",'" . trim( $options['width'] ) . "','" . trim( $options['height'] ) . '\' )';
+		$_params	= ( $options['options'] ) ? $options['options'] : array();
+		$_content   = ( $options['content'] ) ? str_replace( '\'', '\\\'', $options['content'] ) : '';
 
-		return '" . ' . $return . ' . "';
+		$_phpCode	= "<php>\n";
+		$_phpCode	.= "\t" . '$pluginEditorHook = IPSLib::loadLibrary( IPS_ROOT_PATH . \'sources/classes/editor/composite.php\', \'classes_editor_composite\' );' . "\n";
+		$_phpCode	.= "\t" . '$editor = new $pluginEditorHook();' . "\n</php>";
+		$_phpCode	.= '" . $editor->show(\'' . $data . '\', ' . $_params . ', "' . $_content . '")  . "';
+
+		//-----------------------------------------
+		// Process the tag and return the data
+		//-----------------------------------------
+
+		return $_phpCode;
 	}
 	
 	/**
@@ -72,9 +82,9 @@ class tp_gallery_resize extends output implements interfaceTemplatePlugins
 		// Return the data, it's that simple...
 		//-----------------------------------------
 		
-		return array( 'name'    => 'gallery_resize',
+		return array( 'name'    => 'editor',
 					  'author'  => 'Invision Power Services, Inc.',
-					  'usage'   => '{parse gallery_resize="{$image_tag_html}" width="100" height="100"}',
-					  'options' => array( 'width', 'height' ) );
+					  'usage'   => '{parse editor="FormFieldName" content="" options="array()"}',
+					  'options' => array('options', 'content') );
 	}
 }
\ No newline at end of file
diff --git a/upload/admin/sources/template_plugins/tp_expression.php b/upload/admin/sources/template_plugins/tp_expression.php
index b089e913..96a1fd39 100644
--- a/upload/admin/sources/template_plugins/tp_expression.php
+++ b/upload/admin/sources/template_plugins/tp_expression.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template plugin: execute PHP expression
- * Last Updated: $Date: 2010-08-12 08:32:14 -0400 (Thu, 12 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 6745 $
+ * @version		$Revision: 8644 $
  */
 
 /**
@@ -26,7 +26,7 @@ class tp_expression extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_format_number.php b/upload/admin/sources/template_plugins/tp_format_number.php
index 08412920..33c5fac7 100644
--- a/upload/admin/sources/template_plugins/tp_format_number.php
+++ b/upload/admin/sources/template_plugins/tp_format_number.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Format Number
- * Last Updated: $Date: 2010-08-12 08:32:14 -0400 (Thu, 12 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6745 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_format_number extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_include.php b/upload/admin/sources/template_plugins/tp_include.php
index dd7c2ee0..e9a05369 100644
--- a/upload/admin/sources/template_plugins/tp_include.php
+++ b/upload/admin/sources/template_plugins/tp_include.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Include
- * Last Updated: $Date: 2010-08-12 08:32:14 -0400 (Thu, 12 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6745 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_include extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -62,7 +62,7 @@ class tp_include extends output implements interfaceTemplatePlugins
 		
 		$return = <<<EOF
 ob_start();
-include( "$data" );
+include( "$data" );/*noLibHook*/
 \$data = ob_get_contents();
 ob_end_clean();
 EOF;
diff --git a/upload/admin/sources/template_plugins/tp_js_module.php b/upload/admin/sources/template_plugins/tp_js_module.php
index e5d8593d..a9f756cf 100644
--- a/upload/admin/sources/template_plugins/tp_js_module.php
+++ b/upload/admin/sources/template_plugins/tp_js_module.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: JS Module
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 /**
 * Main loader class
@@ -24,7 +24,7 @@ class tp_js_module extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_lang.php b/upload/admin/sources/template_plugins/tp_lang.php
new file mode 100644
index 00000000..a27ac612
--- /dev/null
+++ b/upload/admin/sources/template_plugins/tp_lang.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * Template plugin: execute PHP expression
+ * Last Updated: $Date: 2011-05-25 10:30:28 -0400 (Wed, 25 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		6/24/2008
+ * @version		$Revision: 8887 $
+ */
+
+/**
+* Main loader class
+*/
+class tp_lang extends output implements interfaceTemplatePlugins
+{
+	/**
+	 * Prevent our main destructor being called by this class
+	 *
+	 * @access	public
+	 * @return	@e void
+	 */
+	public function __destruct()
+	{
+	}
+	
+	/**
+	 * Run the plug-in
+	 *
+	 * @access	public
+	 * @author	Matt Mecham
+	 * @param	string	The initial data from the tag
+	 * @param	array	Array of options
+	 * @return	string	Processed HTML
+	 */
+	public function runPlugin( $data, $options )
+	{
+		//-----------------------------------------
+		// Process the tag and return the data
+		//-----------------------------------------
+
+		return '" . $this->lang->words[\''.$data.'\'] . "';
+	}
+	
+	/**
+	 * Return information about this modifier.
+	 *
+	 * It MUST contain an array  of available options in 'options'. If there are no allowed options, then use an empty array.
+	 * Failure to keep this up to date will most likely break your template tag.
+	 *
+	 * @access	public
+	 * @author	Matt Mecham
+	 * @return	array
+	 */
+	public function getPluginInfo()
+	{
+		return array( 'name'    => 'lang',
+					  'author'  => 'IPS, Inc.',
+					  'usage'   => '{parse lang="some_phrase"}',
+					  'options' => array() );
+	}
+}
\ No newline at end of file
diff --git a/upload/admin/sources/template_plugins/tp_replacement.php b/upload/admin/sources/template_plugins/tp_replacement.php
index a904a919..25e8f4f1 100644
--- a/upload/admin/sources/template_plugins/tp_replacement.php
+++ b/upload/admin/sources/template_plugins/tp_replacement.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template plugin: perform macro replacement
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 /**
@@ -26,7 +26,7 @@ class tp_replacement extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_resize_image.php b/upload/admin/sources/template_plugins/tp_resize_image.php
index 8abb3d6a..22210517 100644
--- a/upload/admin/sources/template_plugins/tp_resize_image.php
+++ b/upload/admin/sources/template_plugins/tp_resize_image.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Resize images in templates proportionately
- * Last Updated: $Date: 2010-01-15 09:55:46 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Content
- * @link		http://www.invisionpower.com
- * @version		$Rev: 166 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_resize_image extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_striping.php b/upload/admin/sources/template_plugins/tp_striping.php
index cf98b771..1168999f 100644
--- a/upload/admin/sources/template_plugins/tp_striping.php
+++ b/upload/admin/sources/template_plugins/tp_striping.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template plugin: Perform row striping
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  */
 
 /**
@@ -26,7 +26,7 @@ class tp_striping extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/admin/sources/template_plugins/tp_template.php b/upload/admin/sources/template_plugins/tp_template.php
index addb4f2d..4b382bc9 100644
--- a/upload/admin/sources/template_plugins/tp_template.php
+++ b/upload/admin/sources/template_plugins/tp_template.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: Template Include
- * Last Updated: $Date: 2010-08-12 08:32:14 -0400 (Thu, 12 Aug 2010) $
+ * Last Updated: $Date: 2011-09-26 10:20:55 -0400 (Mon, 26 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6745 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9547 $
  */
 
 /**
@@ -25,7 +25,7 @@ class tp_template extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -56,9 +56,9 @@ class tp_template extends output implements interfaceTemplatePlugins
 		$_group		= str_replace( '{current_app}', "'.\$this->registry->getCurrentApplication().'", $_group );
 
 		$_params	= $options['params'];
-		
-		$return		= "\$this->registry->getClass('output')->getTemplate('" . $_group . "')->".$data."(".$_params.")";
-	
+
+		$return		= "( method_exists( \$this->registry->getClass('output')->getTemplate('" . $_group . "'), '{$data}' ) ? \$this->registry->getClass('output')->getTemplate('" . $_group . "')->".$data."(".$_params.") : '' )";
+
 		return '" . ' . $return . ' . "';
 	}
 	
diff --git a/upload/admin/sources/template_plugins/tp_url.php b/upload/admin/sources/template_plugins/tp_url.php
index 21eec96a..d9f65c46 100644
--- a/upload/admin/sources/template_plugins/tp_url.php
+++ b/upload/admin/sources/template_plugins/tp_url.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Pluging: URL
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-27 12:31:36 -0400 (Fri, 27 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8912 $
  */
 
 /**
@@ -26,7 +26,7 @@ class tp_url extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -57,18 +57,19 @@ class tp_url extends output implements interfaceTemplatePlugins
 
 		$return = '$this->registry->getClass(\'output\')->formatUrl( $this->registry->getClass(\'output\')->buildUrl( "' . $data . '", "' . $base . '",\'' . $options['httpauth'] . '\' ), "' . $seotitle . '", "' . $template . '" )';
 
-		return '" . ' . $return . ' . "';		
+		return '" . ' . $return . ' . "';
 	}
 	
 	/**
 	 * Clean the data passed to this plugin
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Query string params
 	 * @return	string		Query string params (singular keys)
 	 * @see	http://community.invisionpower.com/tracker/issue-20122-hard-coded-query-strings-in-members-list/
+	 * @deprecated
 	 */
-	private function _cleanData( $data )
+	protected function _cleanData( $data )
 	{
 		$_return	= str_replace( '&amp;', '&', $data );
 		$_pairs		= array();
diff --git a/upload/admin/sources/template_plugins/tp_variable.php b/upload/admin/sources/template_plugins/tp_variable.php
index 595cb528..1ac935b2 100644
--- a/upload/admin/sources/template_plugins/tp_variable.php
+++ b/upload/admin/sources/template_plugins/tp_variable.php
@@ -3,18 +3,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template plugin: Set and retrieve template variables
- * Last Updated: $Date: 2010-09-15 19:24:12 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6/24/2008
- * @version		$Revision: 6882 $
+ * @version		$Revision: 8644 $
  */
 
 /**
@@ -26,7 +26,7 @@ class tp_variable extends output implements interfaceTemplatePlugins
 	 * Prevent our main destructor being called by this class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -64,7 +64,7 @@ class tp_variable extends output implements interfaceTemplatePlugins
 			$phpCode .= "\n" . '$this->__default__templateVars[\'' . $data . '\'] = "' . str_replace( '"', '\\"', $options['default'] ) . '";';
 		}
 		
-		if ( isset($options['oncondition']) AND $options['oncondition'] AND isset( $options['value'] ) )
+		if ( !empty($options['oncondition'])AND isset( $options['value'] ) )
 		{
 			$phpCode .= "\nif ( {$options['oncondition']} )\n{\n\t".'$this->templateVars[\'' . $data . '\'] = "' . str_replace( '"', '\\"', $options['value'] ) . '";' . "\n}";
 			$phpCode .= "\nelse {"  . '$this->templateVars[\'' . $data . '\'] = $this->__default__templateVars[\'' . $data . '\']; }';
diff --git a/upload/admin/upgrade/index.php b/upload/admin/upgrade/index.php
index eec51dba..5e94cfac 100644
--- a/upload/admin/upgrade/index.php
+++ b/upload/admin/upgrade/index.php
@@ -3,28 +3,28 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Upgrade gateway
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $LastChangedDate: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		14th May 2003
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8042 $
  */
 
 define( 'IPB_THIS_SCRIPT', 'admin' );
 define( 'IPS_IS_UPGRADER', TRUE );
 define( 'IPS_IS_INSTALLER', FALSE );
 
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsRegistry_setup.php' );
-require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsController_setup.php' );
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsRegistry_setup.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'setup/sources/base/ipsController_setup.php' );/*noLibHook*/
 
 ipsController::run();
 
diff --git a/upload/cache/index.html b/upload/cache/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/cache/index.html
+++ b/upload/cache/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/cache/lang_cache/index.html b/upload/cache/lang_cache/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/cache/lang_cache/index.html
+++ b/upload/cache/lang_cache/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/cache/openid/index.html b/upload/cache/openid/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/cache/openid/index.html
+++ b/upload/cache/openid/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/cache/skin_cache/emailWrapper.php b/upload/cache/skin_cache/emailWrapper.php
new file mode 100644
index 00000000..ec2c72fa
--- /dev/null
+++ b/upload/cache/skin_cache/emailWrapper.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * HTML Email template
+ * Last Updated: $Date: 2011-05-05 12:03:47 +0100 (Thu, 05 May 2011) $
+ * </pre>
+ *
+ * @author 		$Author: ips_terabyte $
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @since		3.0
+ * @version		$Revision: 8644 $
+ *
+ */
+ 
+class ipsEmailWrapper
+{
+	/**
+	* Constructor
+	*
+	* @access	public
+	* @return	@e void
+	*/	
+	public function __construct()
+	{
+		$registry = ipsRegistry::instance();
+		
+		/* Make registry objects */
+		$this->registry		=  $registry;
+		$this->DB			=  $this->registry->DB();
+		$this->settings		=& $this->registry->fetchSettings();
+		$this->request		=& $this->registry->fetchRequest();
+		$this->lang			=  $this->registry->getClass('class_localization');
+		$this->member		=  $this->registry->member();
+		$this->memberData	=& $this->registry->member()->fetchMemberData();
+		$this->cache		=  $this->registry->cache();
+		$this->caches		=& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	* return the HTML email wrapper
+	*
+	* @access	public
+	* @return	string	html
+	*/	
+	public function getTemplate( $content )
+	{
+		return <<<EOF
+<!DOCTYPE html>
+	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={$this->settings['gb_char_set']}" />
+		<title><#subject#></title>
+		<style type="text/css">
+			body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
+			table {	border-collapse:collapse; border-spacing:0; }
+			fieldset,img { border:0; }
+			address,caption,cite,code,dfn,th,var { font-style:normal; font-weight:normal; }
+			ol,ul { list-style:none; }
+			caption,th { text-align:left; }
+			h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
+			q:before,q:after { content:''; }
+			abbr,acronym { border:0; }
+			address{ display: inline; }
+			
+			html, body {
+				background-color: #d8dde8;
+				color: #5a5a5a;
+			}
+
+			body {
+				font: normal 13px helvetica, arial, sans-serif;
+				position: relative;
+			}
+			
+			h3, strong { font-weight: bold; }
+			em { font-style: italic; }
+			img, .input_check, .input_radio { vertical-align: middle; }
+			legend { display: none; }
+			table { width: 100%; }
+			td { padding: 3px; }
+			
+			a {
+				color: #225985;
+				text-decoration: none;
+			}
+			
+			a:hover { color: #328586; }
+			
+			div.outer { margin: 0 auto; padding: 14px; }
+			
+			table.wrap { max-width: 800px; margin: 0 auto; }
+			
+			td.logo {
+				background-color: #0f3854;
+				padding: 8px;
+			}
+			
+			td.content {
+				background-color: #fff;
+				font-size: 14px !important;
+				color: black !important;
+				line-height: 150% !important;
+				padding: 8px;
+			}
+
+		</style>
+	</head>
+	<body>
+	<div class='outer'>
+	<table class='wrap'>
+		<tr>
+			<td class='logo'><img src="{$this->settings['img_url']}/logo_transparent.png" /></td>
+		</tr>
+		<tr>
+			<td class='content'>{$content}</td>
+		</tr>
+	</table>
+	</div>
+	</body>
+</html>
+EOF;
+	}
+}
\ No newline at end of file
diff --git a/upload/cache/skin_cache/index.html b/upload/cache/skin_cache/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/cache/skin_cache/index.html
+++ b/upload/cache/skin_cache/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/cache/skin_cache/ipsDriverError.php b/upload/cache/skin_cache/ipsDriverError.php
index c92f6ea7..40166f27 100644
--- a/upload/cache/skin_cache/ipsDriverError.php
+++ b/upload/cache/skin_cache/ipsDriverError.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Database driver error template
- * Last Updated: $Date: 2010-08-13 07:08:58 -0400 (Fri, 13 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0
- * @version		$Revision: 6749 $
+ * @version		$Revision: 8644 $
  *
  */
  
@@ -23,7 +23,7 @@ class ipsDriverErrorTemplate
 	* Constructor
 	*
 	* @access	public
-	* @return	void
+	* @return	@e void
 	*/	
 	public function __construct()
 	{
@@ -35,7 +35,7 @@ class ipsDriverErrorTemplate
 	* @access	public
 	* @param	boolean		Show error in template or not
 	* @param	string		Error message (only shown/needed if $showError is true)
-	* @return	void
+	* @return	@e void
 	*/	
 	public function showError( $showError=false, $errorMessage='')
 	{
diff --git a/upload/cache/skin_cache/ipsServerError.php b/upload/cache/skin_cache/ipsServerError.php
index e89c3f59..fd597965 100644
--- a/upload/cache/skin_cache/ipsServerError.php
+++ b/upload/cache/skin_cache/ipsServerError.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Database driver error template
- * Last Updated: $Date: 2010-01-15 15:18:44 +0000 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8644 $
  *
  */
  
@@ -23,7 +23,7 @@ class ipsDriverErrorTemplate
 	* Constructor
 	*
 	* @access	public
-	* @return	void
+	* @return	@e void
 	*/	
 	public function __construct()
 	{
@@ -35,7 +35,7 @@ class ipsDriverErrorTemplate
 	* @access	public
 	* @param	boolean		Show error in template or not
 	* @param	string		Error message (only shown/needed if $showError is true)
-	* @return	void
+	* @return	@e void
 	*/	
 	public function showError( $showError=false, $errorMessage='' )
 	{
diff --git a/upload/cache/skin_cache/masterMap.php b/upload/cache/skin_cache/masterMap.php
index 7f0938cf..ab8e2bbb 100644
--- a/upload/cache/skin_cache/masterMap.php
+++ b/upload/cache/skin_cache/masterMap.php
@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * IN_DEV Remapping.
- * Last Updated: $Date: 2010-07-14 05:39:43 -0400 (Wed, 14 Jul 2010) $
+ * Last Updated: $Date: 2011-09-02 10:54:34 -0400 (Fri, 02 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0
- * @version		$Revision: 6648 $
+ * @version		$Revision: 9449 $
  *
  */
  
@@ -42,30 +42,25 @@ $REMAP = array(
 	'inDevDefault' => 'root',
 	
 	# Master skins - please do not modify
-	'masterKeys'  => array( 'root', 'xmlskin', 'mobile' ),
+	'masterKeys'  => array( 'root', 'mobile' ),
 	
 	# This defines which skins are exported for the installer
 	'export'       => array(  0 => 'root',
-							  2 => 'xmlskin',
 							  1 => 'mobile' ),
 	
 	# Templates array. setID OR setKey => styleDir. styleDir must be created in 'cache/skin_cache' first
 	'templates'    => array(
 							 'root'     => 'master_skin',
-							 'xmlskin'  => 'master_skin_xml',
 							 'mobile'   => 'master_skin_mobile',
-							 #'mytest'   => 'master_skin_mytest',
 						   ),
 						
 	# CSS. setID OR setKey => cssDir. cssDir must be created in 'public/style_css' first
 	'css'		   => array(
 							'root'    => 'master_css',
-							'xmlskin' => 'master_css_xml',
 							'mobile'  => 'master_css_mobile',
 							),
 							
 	# Images						
 	'images'		=> array( 'root'    => 'master',
-							  'xmlskin' => 'master',
 							  'mobile'  => 'mobile' )
 );
\ No newline at end of file
diff --git a/upload/cache/skin_cache/settingsEmpty.html b/upload/cache/skin_cache/settingsEmpty.html
new file mode 100644
index 00000000..39a2006b
--- /dev/null
+++ b/upload/cache/skin_cache/settingsEmpty.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xml:lang="ru" lang="ru" xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<meta http-equiv="Pragma" content="no-cache" />
+		<meta http-equiv="Cache-Control" content="no-cache" />
+		<meta http-equiv="Expires" content="Fri, 01 January 1999 01:00:00 GMT" />
+		<title>Ошибка</title>
+		<style type='text/css'>
+			body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } 
+			table {	border-collapse:collapse; border-spacing:0; }
+			fieldset,img { border:0; }
+			address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; }
+			ol,ul { list-style:none; }
+			caption,th { text-align:left; }
+			h1,h2,h3,h4,h5,h6 { font-size:100%;	font-weight:normal; }
+			q:before,q:after { content:''; }
+			abbr,acronym { border:0; }
+			hr { display: none; }
+			address{ display: inline; }
+			body {
+				font-family: arial, tahoma, sans-serif;
+				font-size: 0.8em;
+				width: 100%;
+			}
+			
+			h1 {
+				font-family: arial, tahoma, "times new roman", serif;
+				font-size: 1.9em;
+				color: #fff;
+			}
+			h2 {
+				font-size: 1.6em;
+				font-weight: normal;
+				margin: 0 0 8px 0;
+				clear: both;
+			}
+			a {
+				color: #3e70a8;
+			}
+			
+				a:hover {
+					color: #3d8ce4;
+				}
+				
+				a.cancel {
+					color: #ad2930;
+				}
+			#branding {
+				background: #484848;
+				padding: 8px;
+			}
+			
+			#content {
+				clear: both;
+				overflow: hidden;
+				padding: 20px 15px 0px 15px;
+			}
+			
+			* #content {
+				height: 1%;
+			}
+			
+			.message {
+				border-width: 1px;
+				border-style: solid;
+				border-color: #d7d7d7;
+				background-color: #f5f5f5;
+				padding: 7px 7px 7px 30px;
+				margin: 0 0 10px 0;
+				clear: both;
+			}
+			
+				.message.error {
+					background-color: #f3dddd;
+					border-color: #deb7b7;
+					color: #281b1b;
+					font-size: 1.3em;
+					font-weight: bold;
+				}
+				
+				.message.unspecific {
+					background-color: #f3f3f3;
+					border-color: #d4d4d4;
+					color: #515151;
+				}
+		</style>
+	</head>
+	<body id='ipboard_body'>
+		<div id='header'>
+			<div id='branding'>
+				<h1>ОШИБК�</h1>
+			</div>
+		</div>
+		<div id='content'>
+			<div class='message error'>
+				IP.Board не удало�ь прочитать на�тройки �и�темы из базы данных. Си�тема не может продолжить работу пока причина ошибки не будет у�транена.
+			</div>
+			
+			<p class='message unspecific'>
+				Данна� ошибка �в�зана � нарушением цело�тно�ти кеша на�троек �и�темы. Это может быть результатом неудачного перено�а базы данных, либо проблем в работе �ервера базы данных.
+				Вам необходимо обратить�� в �лужбу поддержки за дальнейшей помощью в решении проблемы.
+			</p>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/upload/cache/tmp/index.html b/upload/cache/tmp/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/cache/tmp/index.html
+++ b/upload/cache/tmp/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/converge_local/apis/allowed_methods.php b/upload/converge_local/apis/allowed_methods.php
index 8cc16c42..eb248f05 100644
--- a/upload/converge_local/apis/allowed_methods.php
+++ b/upload/converge_local/apis/allowed_methods.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Converge Allowed Methods
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:16:34 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 7447 $
  *
  */
 
diff --git a/upload/converge_local/apis/index.html b/upload/converge_local/apis/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/converge_local/apis/index.html
+++ b/upload/converge_local/apis/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/converge_local/apis/server_functions.php b/upload/converge_local/apis/server_functions.php
index 5f104ab7..3de85913 100644
--- a/upload/converge_local/apis/server_functions.php
+++ b/upload/converge_local/apis/server_functions.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Converge Handler
- * Last Updated: $Date: 2010-10-05 09:09:23 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: terabyte $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 6943 $
+ * @version		$Revision: 8644 $
  *
  */
 
@@ -32,10 +32,10 @@ class Converge_Server
    /**
     * Global registry
     *
-    * @access 	private
+    * @access 	protected
     * @var 		object
     */
-	private $registry;
+	protected $registry;
 	
 	/**
 	* IPS API SERVER Class
@@ -50,7 +50,7 @@ class Converge_Server
 	 * 
 	 * @access	public
 	 * @return 	void
-	 **/		
+	 */		
 	public function __construct( $registry )
     {
 		//-----------------------------------------
@@ -68,7 +68,7 @@ class Converge_Server
 		// list
     	//-----------------------------------------
     	
-		require_once( DOC_IPS_ROOT_PATH . 'converge_local/apis/allowed_methods.php' );
+		require_once( DOC_IPS_ROOT_PATH . 'converge_local/apis/allowed_methods.php' );/*noLibHook*/
 		
 		if ( is_array( $_CONVERGE_ALLOWED_METHODS ) and count( $_CONVERGE_ALLOWED_METHODS ) )
 		{
@@ -90,7 +90,7 @@ class Converge_Server
 	 * @param	int		$limit_a		SQL limit a
 	 * @param	int		$limit_b		SQL limit b
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function requestData( $auth_key, $product_id, $email_address, $getdata_key )
 	{
 		//-----------------------------------------
@@ -112,7 +112,7 @@ class Converge_Server
 			// Grab local extension file
 			//-----------------------------------------
 			
-			require_once( DOC_IPS_ROOT_PATH  . 'converge_local/apis/local_extension.php' );
+			require_once( DOC_IPS_ROOT_PATH  . 'converge_local/apis/local_extension.php' );/*noLibHook*/
 			$extension = new local_extension( $this->registry );
 			
 			if ( is_callable( array( $extension, $getdata_key ) ) )
@@ -144,7 +144,7 @@ class Converge_Server
 	 * @param	string	$auth_key					Authentication Key
 	 * @param	string	$multiple_email_addresses	Comma delimited list of email addresses
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function onMemberDelete( $auth_key, $product_id, $multiple_email_addresses='' )
 	{
 		//-----------------------------------------
@@ -218,7 +218,7 @@ class Converge_Server
 	 * @param	string	$email_address			Email address
 	 * @param	string	$md5_once_password		Plain text password hashed by MD5
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function onPasswordChange( $auth_key, $product_id, $email_address, $md5_once_password )
 	{
 		//-----------------------------------------
@@ -262,7 +262,7 @@ class Converge_Server
 	 * @param	string	$old_email_address	Existing email address
 	 * @param	string	$new_email_address	NEW email address to change
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function onEmailChange( $auth_key, $product_id, $old_email_address, $new_email_address )
 	{
 		//-----------------------------------------
@@ -329,7 +329,7 @@ class Converge_Server
 	 * @param	string	$new_username		NEW username to change
 	 * @param	string	$auth				Email address
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function onUsernameChange( $auth_key, $product_id, $old_username, $new_username, $auth )
 	{
 		//-----------------------------------------
@@ -407,7 +407,7 @@ class Converge_Server
 	 * @param	int		$limit_a		SQL limit a
 	 * @param	int		$limit_b		SQL limit b
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function importMembers( $auth_key, $product_id, $limit_a, $limit_b )
 	{
 		//-----------------------------------------
@@ -483,7 +483,7 @@ class Converge_Server
 	 * @param	string	$auth_key		Authentication Key
 	 * @param	int		$product_id		Product ID
 	 * @return	mixed	xml / boolean
-	 **/	
+	 */	
 	public function getMembersInfo( $auth_key, $product_id )
 	{
 		//-----------------------------------------
@@ -530,7 +530,7 @@ class Converge_Server
 	 * @param	int		$product_id		Product ID
 	 * @param	string	$email_address	Email address of user logged in
 	 * @return	mixed	xml / boolean
-	 **/
+	 */
 	public function convergeLogOut( $auth_key, $product_id, $email_address='' )
 	{
 		//-----------------------------------------
@@ -633,7 +633,7 @@ class Converge_Server
 	 * @param	mixed	$extra_data			Extra member account data
 	 * @param	string	$username			Member's user name
 	 * @return	mixed	xml / boolean
-	 **/
+	 */
 	public function convergeLogIn( $auth_key, $product_id, $email_address='', $md5_once_password='', $ip_address='', $unix_join_date='', $timezone=0, $dst_autocorrect=0, $extra_data='', $username='' )
 	{
 		//-----------------------------------------
@@ -672,21 +672,20 @@ class Converge_Server
 			//-----------------------------------------
 			
 			$member = IPSMember::load( $email_address );
-			$this->registry->member()->setMember( $member['member_id'] );
 			
 			//-----------------------------------------
 			// No such user? Create one!
 			// FAIL SAFE
 			//-----------------------------------------
 			
-			if ( ! $this->memberData['member_id'] )
+			if ( ! $member['member_id'] )
 			{ 
 				$unix_join_date    = $unix_join_date    ? $unix_join_date    : time();
 				$md5_once_password = $md5_once_password ? $md5_once_password : md5( $email_address . $unix_join_date . uniqid( microtime() ) );
 				$ip_address        = $ip_address        ? $ip_address        : '127.0.0.1';
-				
-				$this->registry->member()->setMember( $this->__create_user_account( $email_address, $md5_once_password, $ip_address, $unix_join_date, $timezone, $dst_autocorrect, $username ) );
-				$return = 'SUCCESS';
+
+				$member	= $this->__create_user_account( $email_address, $md5_once_password, $ip_address, $unix_join_date, $timezone, $dst_autocorrect, $username );
+				$return	= 'SUCCESS';
 			}
 			else
 			{
@@ -696,8 +695,8 @@ class Converge_Server
 			//-----------------------------------------
 			// Start session
 			//-----------------------------------------
-			
-			$session = $this->__create_user_session( $this->memberData );
+
+			$session	= $this->__create_user_session( $member );
 
 			//-----------------------------------------
 			// Add cookies
@@ -735,11 +734,11 @@ class Converge_Server
 	 *
 	 * Has to return at least the member ID, member log in key and session ID
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object	$member		Member object (can access as an array of member information thx to SPL)
 	 * @return	array	$session	Session information
-	 **/
-	private function __create_user_session( $member )
+	 */
+	protected function __create_user_session( $member )
 	{
 		//-----------------------------------------
 		// INIT
@@ -751,7 +750,7 @@ class Converge_Server
 		// Generate a new log in key
 		//-----------------------------------------
 
-		if ( $this->settings['login_change_key'] OR ! $member['member_login_key'] )
+		if ( ! $member['member_login_key'] )
 		{
 			$update['member_login_key'] = IPSMember::generateAutoLoginKey();
 		}
@@ -777,8 +776,8 @@ class Converge_Server
 		
 		$this->registry->member()->setMember( $member['member_id'] );
 		
-		require_once( IPS_ROOT_PATH . 'sources/classes/session/publicSessions.php' );
-		require_once( IPS_ROOT_PATH . 'sources/classes/session/convergeSessions.php' );
+		require_once( IPS_ROOT_PATH . 'sources/classes/session/publicSessions.php' );/*noLibHook*/
+		require_once( IPS_ROOT_PATH . 'sources/classes/session/convergeSessions.php' );/*noLibHook*/
 		$session           = new convergeSessions( $this->registry );
 		$session->time_now = time();
 
@@ -801,8 +800,8 @@ class Converge_Server
 	 * @param	string	$dst_autocorrect	The member's DST autocorrect settings
 	 * @param	string	$username			The member's username
 	 * @return	array	$member				Newly created member array
-	 **/
-	private function __create_user_account( $email_address='', $md5_once_password, $ip_address, $unix_join_date, $timezone=0, $dst_autocorrect=0, $username='' )
+	 */
+	protected function __create_user_account( $email_address='', $md5_once_password, $ip_address, $unix_join_date, $timezone=0, $dst_autocorrect=0, $username='' )
 	{
 		//-----------------------------------------
 		// Check to make sure there's not already
@@ -834,9 +833,9 @@ class Converge_Server
 																 'joined'					=> $unix_join_date, 
 																 'ip_address'				=> $ip_address,
 																 'members_created_remote'	=> true
-									)		), false, true		);
+									)		), false, true, false );
 		
-		return $member['member_id'];
+		return $member;
 	}
 	
 	/**
@@ -844,12 +843,12 @@ class Converge_Server
 	 *
 	 * Checks to see if the request is allowed
 	 * 
-	 * @access	private
+	 * @access	protected
 	 * @param	string	$key			Authenticate Key
 	 * @param	string	$product_id		Product ID
 	 * @return	string         			Error message, if any
-	 **/	
-	private function __authenticate( $key, $product_id )
+	 */	
+	protected function __authenticate( $key, $product_id )
 	{
 		$this->registry->getClass( 'class_localization' )->loadLanguageFile( array( 'api_langbits' ), 'core' );
 		
@@ -889,8 +888,8 @@ class Converge_Server
 	 * @param	string	$product_id		Product ID
 	 * @param	string	$gateway_key	Gateway key
 	 * @param	mixed	$arg			Additional arguments
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function requestAdditionalData( $auth_key, $product_id, $getdata_key, $arg )
 	{
 		//-----------------------------------------
@@ -912,7 +911,7 @@ class Converge_Server
 			// Grab local extension file
 			//-----------------------------------------
 			
-			require_once( DOC_IPS_ROOT_PATH  . 'converge_local/apis/additional_methods.php' );
+			require_once( DOC_IPS_ROOT_PATH  . 'converge_local/apis/additional_methods.php' );/*noLibHook*/
 			$extension = new additional_methods( $this->registry );
 			
 			if ( is_callable( array( $extension, $getdata_key ) ) )
diff --git a/upload/converge_local/converge.php b/upload/converge_local/converge.php
index 0cccaa38..1a1af445 100644
--- a/upload/converge_local/converge.php
+++ b/upload/converge_local/converge.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Converge Handler
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8042 $
  *
  */
 
@@ -31,14 +31,14 @@ define( 'IPB_THIS_SCRIPT', 'api' );
 */
 define( 'CVG_IP_MATCH', 1 );
 
-require_once( '../initdata.php' );
+require_once( '../initdata.php' );/*noLibHook*/
 
 //===========================================================================
 // MAIN PROGRAM
 //===========================================================================
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 //-----------------------------------------
 // Set up cookie stuff
@@ -82,7 +82,7 @@ if ( ! ipsRegistry::$settings['ipconverge_enabled'] )
 // Define Service
 //===========================================================================
 
-require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 
 //===========================================================================
 // Create the XML-RPC Server
@@ -226,10 +226,10 @@ class handshake_server
    /**
     * Global registry
     *
-    * @access 	private
+    * @access 	protected
     * @var 		object
     */
-	private $registry;
+	protected $registry;
 	
 	/**
 	* IPS API SERVER Class
@@ -244,7 +244,7 @@ class handshake_server
 	 * 
 	 * @access	public
 	 * @return 	void
-	 **/		
+	 */		
 	public function __construct( $registry ) 
     {
 		//-----------------------------------------
@@ -306,7 +306,7 @@ class handshake_server
 	 * @param	integer		$reg_product_id	Converge product ID (MUST BE PRESENT IN ALL RETURNED API REQUESTS)
 	 * @param	string		$converge_url	Converge application base url (no slashes or paths)
 	 * @return	mixed		xml / boolean false
-	 **/	
+	 */	
 	public function handshakeStart( $reg_id='', $reg_code='', $reg_date='', $reg_product_id='', $converge_url='', $acp_email='', $acp_md5_password='', $http_user='', $http_pass='' )
 	{
 		//-----------------------------------------
@@ -412,7 +412,7 @@ class handshake_server
 	 * @param	string		$converge_url			Converge application base url (no slashes or paths)
 	 * @param	integer		$handshake_completed	All done flag
 	 * @return	mixed		xml / boolean false
-	 **/	
+	 */	
 	public function handshakeEnd( $reg_id='', $reg_code='', $reg_date='', $reg_product_id='', $converge_url='', $handshake_completed='' )
 	{
 		//-----------------------------------------
@@ -486,7 +486,7 @@ class handshake_server
 	 * @param	integer		$reg_id			Converge reg ID
 	 * @param	string		$reg_code		Converge API Code (MUST BE PRESENT IN ALL RETURNED API REQUESTS).
 	 * @return	mixed		xml / boolean false
-	 **/	
+	 */	
 	public function handshakeRemove( $reg_product_id='', $reg_code='' )
 	{
 		//-----------------------------------------
diff --git a/upload/converge_local/converge_server.php b/upload/converge_local/converge_server.php
index 94bbdd86..c92b47c4 100644
--- a/upload/converge_local/converge_server.php
+++ b/upload/converge_local/converge_server.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Converge Server Interface
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		2.1.0
- * @version		$Revision: 5713 $
+ * @version		$Revision: 8042 $
  *
  */
 
@@ -31,13 +31,13 @@ define( 'IPB_THIS_SCRIPT', 'api' );
 */
 define( 'CVG_IP_MATCH', 1 );
 
-require_once( '../initdata.php' );
+require_once( '../initdata.php' );/*noLibHook*/
 
 //===========================================================================
 // MAIN PROGRAM
 //===========================================================================
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
 
 $registry = ipsRegistry::instance();
 $registry->init();
@@ -77,8 +77,8 @@ if ( ! ipsRegistry::$settings['ipconverge_enabled'] )
 // Define Service
 //===========================================================================
 
-require_once( DOC_IPS_ROOT_PATH   . 'converge_local/apis/server_functions.php' );
-require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+require_once( DOC_IPS_ROOT_PATH   . 'converge_local/apis/server_functions.php' );/*noLibHook*/
+require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 
 //===========================================================================
 // Create the XML-RPC Server
diff --git a/upload/converge_local/index.html b/upload/converge_local/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/converge_local/index.html
+++ b/upload/converge_local/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/dav.php b/upload/dav.php
new file mode 100644
index 00000000..9fe40718
--- /dev/null
+++ b/upload/dav.php
@@ -0,0 +1,280 @@
+<?php
+
+/*
++---------------------------------------------------------------------------
+|   IP.Board v3.2.3
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2008 Invision Power Services
+|   http://hatynka.in
+|   ========================================
++---------------------------------------------------------------------------
+|   Invision Power Board IS NOT FREE SOFTWARE!
++---------------------------------------------------------------------------
+|   http://hatynka.in/
+|   > $Id: dav.php 9336 2011-08-01 10:17:11Z mmecham $
+|   > $Revision: 9336 $
+|   > $Date: 2011-08-01 06:17:11 -0400 (Mon, 01 Aug 2011) $
++---------------------------------------------------------------------------
+*/
+@set_time_limit( 3600 );
+
+define( 'IPB_THIS_SCRIPT', 'admin' );
+
+/* Some servers don't have mb_detect_encoding */
+if ( ! function_exists('mb_detect_encoding') )
+{
+	function mb_detect_encoding()
+	{
+		return false;
+	}
+}
+
+/**
+* Main public executable wrapper.
+*
+* Set-up and load module to run
+*
+* @package	IP.Board
+* @author   Matt Mecham
+* @version	3.0
+*/
+
+require_once( './initdata.php' );/*noLibHook*/
+
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+
+$reg = ipsRegistry::instance();
+$reg->init();
+
+$moo = new ipsDav( $reg );
+
+exit();
+
+class ipsDav
+{
+	function __construct( ipsRegistry $registry )
+	{
+		$this->registry   =  $registry;
+		$this->DB         =  $this->registry->DB();
+		$this->settings   =& $this->registry->fetchSettings();
+		$this->request    =& $this->registry->fetchRequest();
+		$this->cache      =  $this->registry->cache();
+		$this->caches     =& $this->registry->cache()->fetchCaches();
+	
+		/* Set require path to include sabre directory */
+		@set_include_path( IPS_KERNEL_PATH . 'sabre/' );/*noLibHook*/
+		
+		ipsRegistry::$settings['use_friendly_urls'] = 0;
+		
+		/* Fetch authentication library */
+		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
+		$login = new $classToLoad( $registry );
+		
+		/* Require spl for sabre */
+	    require_once('Sabre.autoload.php');/*noLibHook*/
+	 
+	   	/* Attempt authentication */ 
+	    $auth = new Sabre_HTTP_BasicAuth();
+	    $auth->setRealm("IP.Board WebDav");
+	    
+	    /* Enabled? */
+	    if ( ! $this->settings['webdav_on'] )
+	    {
+	    	$auth->requireLogin();
+	 		echo "Please visit your Admin CP - Look and Feel - Externally Edit Templates and CSS to enable this functionality";
+	 		exit();
+	 	}
+	 	
+	    /* Fetch details */
+	    $authDetails = $auth->getUserPass();
+	
+	 	/* Check auth */
+	 	$member = IPSMember::load( IPSText::parseCleanValue( $authDetails[0] ), 'all', 'username' );
+	 	
+	 	if ( ! $member['member_id'] )
+	 	{
+	 		$auth->requireLogin();
+	 		print "Authentication Required (User doesn't exist)";
+	 		exit();
+	 	}
+	 	
+	 	/* Internal auth only */
+	 	$result = IPSMember::authenticateMember( $member['member_id'], md5( IPSText::parseCleanValue( $authDetails[1] ) ) );
+	 	
+	 	if ( $result === false )
+	 	{
+	 		$auth->requireLogin();
+	 		print "Authentication Required (Username or password incorrect)";
+	 		exit();
+		}
+		
+		if ( ! $member['g_access_cp'] )
+		{
+			$auth->requireLogin();
+	 		print "Authentication Required (You are not an admin)";
+	 		exit();
+		}
+	 	
+	 	/* Require some files for our sabre implementation */
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/root/skins.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/templates.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/directory/groups.php' );/*noLibHook*/
+	 	require_once( IPS_ROOT_PATH . 'sources/classes/sabre/files/templates.php' );/*noLibHook*/
+	    require_once( IPS_ROOT_PATH . 'sources/classes/sabre/lock/nolocks.php' );/*noLibHook*/
+	 
+	    $tree = new Sabre_DAV_ObjectTree( new sabre_root_skins() );
+	
+	    $server = new Sabre_DAV_Server($tree);
+	 	$server->setBaseUri( $this->getBaseUrl() . '/');
+	 	
+	 	//$server->addPlugin( new Sabre_DAV_Browser_Plugin() );
+	 	
+	    $server->addPlugin( new Sabre_DAV_Locks_Plugin( new sabre_lock_nolocks() ) );
+	 
+	    /* Process */
+	    $server->exec();
+	}
+	
+/** Adapted from Zend **/
+/**
+     * Set the base URL of the request; i.e., the segment leading to the script name
+     *
+     * E.g.:
+     * - /admin
+     * - /myapp
+     * - /subdir/index.php
+     *
+     * Do not use the full URI when providing the base. The following are
+     * examples of what not to use:
+     * - http://example.com/admin (should be just /admin)
+     * - http://example.com/subdir/index.php (should be just /subdir/index.php)
+     *
+     * If no $baseUrl is provided, attempts to determine the base URL from the
+     * environment, using SCRIPT_FILENAME, SCRIPT_NAME, PHP_SELF, and
+     * ORIG_SCRIPT_NAME in its determination.
+     *
+     * @param mixed $baseUrl
+     * @return Zend_Controller_Request_Http
+     */
+    public function getBaseUrl($baseUrl = null)
+    {
+        if ((null !== $baseUrl) && !is_string($baseUrl)) {
+            return $this;
+        }
+
+        if ($baseUrl === null) {
+            $filename = (isset($_SERVER['SCRIPT_FILENAME'])) ? basename($_SERVER['SCRIPT_FILENAME']) : '';
+
+            if (isset($_SERVER['SCRIPT_NAME']) && basename($_SERVER['SCRIPT_NAME']) === $filename) {
+                $baseUrl = $_SERVER['SCRIPT_NAME'];
+            } elseif (isset($_SERVER['PHP_SELF']) && basename($_SERVER['PHP_SELF']) === $filename) {
+                $baseUrl = $_SERVER['PHP_SELF'];
+            } elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $filename) {
+                $baseUrl = $_SERVER['ORIG_SCRIPT_NAME']; // 1and1 shared hosting compatibility
+            } else {
+                // Backtrack up the script_filename to find the portion matching
+                // php_self
+                $path    = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '';
+                $file    = isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : '';
+                $segs    = explode('/', trim($file, '/'));
+                $segs    = array_reverse($segs);
+                $index   = 0;
+                $last    = count($segs);
+                $baseUrl = '';
+                do {
+                    $seg     = $segs[$index];
+                    $baseUrl = '/' . $seg . $baseUrl;
+                    ++$index;
+                } while (($last > $index) && (false !== ($pos = strpos($path, $baseUrl))) && (0 != $pos));
+            }
+
+            // Does the baseUrl have anything in common with the request_uri?
+            $requestUri = $this->getRequestUri();
+
+            if (0 === strpos($requestUri, $baseUrl)) {
+                // full $baseUrl matches
+                $this->_baseUrl = $baseUrl;
+                return $this->_baseUrl;
+            }
+
+            if (0 === strpos($requestUri, dirname($baseUrl))) {
+                // directory portion of $baseUrl matches
+                $this->_baseUrl = rtrim(dirname($baseUrl), '/');
+                return $this->_baseUrl;
+            }
+
+            $truncatedRequestUri = $requestUri;
+            if (($pos = strpos($requestUri, '?')) !== false) {
+                $truncatedRequestUri = substr($requestUri, 0, $pos);
+            }
+
+            $basename = basename($baseUrl);
+            if (empty($basename) || !strpos($truncatedRequestUri, $basename)) {
+                // no match whatsoever; set it blank
+                $this->_baseUrl = '';
+                return $this->_baseUrl;
+            }
+
+            // If using mod_rewrite or ISAPI_Rewrite strip the script filename
+            // out of baseUrl. $pos !== 0 makes sure it is not matching a value
+            // from PATH_INFO or QUERY_STRING
+            if ((strlen($requestUri) >= strlen($baseUrl))
+                && ((false !== ($pos = strpos($requestUri, $baseUrl))) && ($pos !== 0)))
+            {
+                $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+            }
+        }
+
+        $this->_baseUrl = rtrim($baseUrl, '/');
+        return $this->_baseUrl;
+    }
+
+    /**
+     * Set the REQUEST_URI on which the instance operates
+     *
+     * If no request URI is passed, uses the value in $_SERVER['REQUEST_URI'],
+     * $_SERVER['HTTP_X_REWRITE_URL'], or $_SERVER['ORIG_PATH_INFO'] + $_SERVER['QUERY_STRING'].
+     *
+     * @param string $requestUri
+     * @return Zend_Controller_Request_Http
+     */
+    public function getRequestUri($requestUri = null)
+    {
+        if ($requestUri === null) {
+            if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
+                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
+            } elseif (
+                // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
+                isset($_SERVER['IIS_WasUrlRewritten'])
+                && $_SERVER['IIS_WasUrlRewritten'] == '1'
+                && isset($_SERVER['UNENCODED_URL'])
+                && $_SERVER['UNENCODED_URL'] != ''
+                ) {
+                $requestUri = $_SERVER['UNENCODED_URL'];
+            } elseif (isset($_SERVER['REQUEST_URI'])) {
+                $requestUri = $_SERVER['REQUEST_URI'];
+                // Http proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
+                $schemeAndHttpHost = 'http' . '://' . $_SERVER['HTTP_HOST'];
+                if (strpos($requestUri, $schemeAndHttpHost) === 0) {
+                    $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
+                }
+            } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
+                $requestUri = $_SERVER['ORIG_PATH_INFO'];
+                if (!empty($_SERVER['QUERY_STRING'])) {
+                    $requestUri .= '?' . $_SERVER['QUERY_STRING'];
+                }
+            } else {
+                return $this->_requestUri;
+            }
+        } elseif (!is_string($requestUri)) {
+            return $this->_requestUri;
+        }
+
+        $this->_requestUri = $requestUri;
+        return $this->_requestUri;
+    }
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/index.php b/upload/index.php
index 5c8b7d0b..407dca90 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -2,26 +2,26 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Main public executable wrapper.
  * Set-up and load module to run
- * Last Updated: $Date: 2010-10-05 11:57:32 -0400 (Tue, 05 Oct 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6944 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */	
 
 define( 'IPB_THIS_SCRIPT', 'public' );
-require_once( './initdata.php' );
+require_once( './initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 ipsController::run();
 
diff --git a/upload/initdata.php b/upload/initdata.php
index 3db7635b..75c98fb6 100644
--- a/upload/initdata.php
+++ b/upload/initdata.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * INIT File - Sets up globals
- * Last Updated: $Date: 2010-10-27 17:31:21 -0400 (Wed, 27 Oct 2010) $
+ * Last Updated: $Date: 2011-09-13 21:55:41 -0400 (Tue, 13 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7058 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9487 $
  *
  */
 
@@ -55,7 +55,7 @@ if ( ! defined( 'IPS_DEFAULT_PUBLIC_APP' ) )
 */
 if ( ! defined( 'IPS_PUBLIC_SCRIPT' ) )
 {
-	define( 'IPS_PUBLIC_SCRIPT', basename( $_SERVER['SCRIPT_NAME'] ) );
+	define( 'IPS_PUBLIC_SCRIPT', strtolower( basename( $_SERVER['SCRIPT_NAME'] ) ) );
 }
 
 //--------------------------------------------------------------------------
@@ -126,28 +126,6 @@ if ( ! defined( 'IPS_DEFAULT_APP' ) )
 // ADVANCED CONFIGURATION: DEBUG
 //--------------------------------------------------------------------------
 
-/**
-* Making FURL Transliteration for russian forums
-* @since 3.0.0.ru
-*/
-define( 'IPB_USE_SEO_TRANSLIT', FALSE );
-
-define( 'IPB_USE_ONLY_ID_FURL', FALSE );
-
-/**
-* TOPIC MARKING DEBUG MODE
-*
-* Turns on topic marking debugging mode. This is NOT recommended
-* in a production environment due to additional writes
-* @since 2.2.0.2006-11-06
-*/
-define( 'IPS_TOPICMARKERS_DEBUG', FALSE );
-
-/* Enter any groups or member IDs you want to trace like:
- * groups=4,1&ids=345,32,65
- */
-define( 'IPS_TOPICMARKERS_TRACE', '' );
-
 /**
  * E_NOTICE / E_ALL Debug mode
  * Can capture and / or log php errors to a file (cache/phpNotices.cgi)
@@ -155,17 +133,26 @@ define( 'IPS_TOPICMARKERS_TRACE', '' );
  * define( 'IPS_ERROR_CAPTURE', 'classItemMarking,publicSessions' );
  * Set to 'FALSE' for off
  */
-define( 'IPS_ERROR_CAPTURE', FALSE );//'classItemMarking,publicSessions' );
+define( 'IPS_ERROR_CAPTURE', false );//'classItemMarking,publicSessions' );
 
 /**
 * SQL DEBUG MODE
 *
-* Turns on SQL debugging mode. This is NOT recommended
+* Turns on SQL debugging mode to review queries on the board. This is NOT recommended
 * as it opens your board up to potential security risks
 * @since 2.2.0.2006-11-06
 */
 define( 'IPS_SQL_DEBUG_MODE', 0 );
 
+/**
+* SQL DEBUG MODE LOGGING
+*
+* Turns on SQL debugging mode which logs all SQL to cache/. This is NOT recommended
+* as it opens your board up to potential security risks
+* @since 2.2.0.2006-11-06
+*/
+define( 'IPS_SQL_DEBUG_LOG', 0 );
+
 /**
 * SQL LOG FILESORT or TEMP TABLES MODE
 *
@@ -249,6 +236,14 @@ else
 // ADVANCED CONFIGURATION: MISC
 //--------------------------------------------------------------------------
 
+/**
+* Making FURL Transliteration for russian forums
+* @since 3.0.0.ru
+*/
+define( 'IPB_USE_SEO_TRANSLIT', FALSE );
+
+define( 'IPB_USE_ONLY_ID_FURL', FALSE );
+
 /**
 * USE SHUT DOWN
 *
@@ -264,6 +259,12 @@ define( 'IPS_USE_SHUTDOWN', IPS_AREA == 'public' ? 1 : 0 );
 */
 define( 'IPS_ALLOW_UNICODE', 1 );
 
+/**
+ * File and folder permissions
+ */
+define( 'IPS_FILE_PERMISSION', 0777 );
+define( 'IPS_FOLDER_PERMISSION', 0777 );
+
 /**
 * Time now stamp
 */
@@ -343,7 +344,14 @@ if ( @function_exists("set_time_limit") == 1 and SAFE_MODE_ON == 0 )
 */
 if ( function_exists( 'date_default_timezone_set' ) )
 {
-	date_default_timezone_set( 'UTC' );
+	if ( ! @date_default_timezone_get() )
+	{
+		date_default_timezone_set( @ini_get('date.timezone') ? ini_get('date.timezone') : 'UTC' );
+	}
+	else
+	{
+		date_default_timezone_set( 'UTC' );
+	}
 }
 
 //--------------------------------------------------------------------------
@@ -390,7 +398,7 @@ if (!function_exists('json_encode'))
 {
 	function json_encode( $a, $flag=null )
 	{
-		require_once( IPS_KERNEL_PATH . 'PEAR/JSON/JSON.php' );
+		require_once( IPS_KERNEL_PATH . 'PEAR/JSON/JSON.php' );/*noLibHook*/
 
 		$json = new Services_JSON();
 
@@ -409,7 +417,7 @@ if (!function_exists('json_decode'))
 {
 	function json_decode( $a, $assoc=false )
 	{
-		require_once( IPS_KERNEL_PATH . 'PEAR/JSON/JSON.php' );
+		require_once( IPS_KERNEL_PATH . 'PEAR/JSON/JSON.php' );/*noLibHook*/
 
 		if ( $assoc === TRUE )
 		{
diff --git a/upload/interface/blog/apis/index.html b/upload/interface/blog/apis/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/interface/blog/apis/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/interface/blog/apis/methods_blogger.php b/upload/interface/blog/apis/methods_blogger.php
deleted file mode 100644
index 7fdd933e..00000000
--- a/upload/interface/blog/apis/methods_blogger.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Defines blogger API parameters
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- *
- */
-
-$_METAWEBLOG_ALLOWED_METHODS = array();
-
-/**
-* getUsersBlogs
-* return basic Blog information about the users Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['getUsersBlogs'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'string',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* getUserInfo
-* return basic information about the user
-*/
-$_METAWEBLOG_ALLOWED_METHODS['getUserInfo'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'string',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* deletePost
-* Deletes an entry from the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['deletePost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'string',
-													   					'param1'	=> 'integer',
-																		'param2'	=> 'string',
-																		'param3'	=> 'string',
-																		'param4'	=> 'bool',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* newPost
-* Adds a new entry to the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['newPost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'string',
-													   					'param1'	=> 'integer',
-																		'param2'	=> 'string',
-																		'param3'	=> 'string',
-																		'param4'	=> 'string',
-																		'param5'	=> 'bool',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* editPost
-* Edit an entry in the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['editPost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'string',
-													   					'param1'	=> 'integer',
-																		'param2'	=> 'string',
-																		'param3'	=> 'string',
-																		'param4'	=> 'string',
-																		'param5'	=> 'bool'
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
\ No newline at end of file
diff --git a/upload/interface/blog/apis/methods_metaweblog.php b/upload/interface/blog/apis/methods_metaweblog.php
deleted file mode 100644
index 2d4157de..00000000
--- a/upload/interface/blog/apis/methods_metaweblog.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Defines metaweblog API parameters
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- *
- */
-
-$_METAWEBLOG_ALLOWED_METHODS = array();
-
-/**
-* getCategories
-* return the categories used in the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['getCategories'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string'
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* getRecentPosts
-* return the most recent entries of the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['getRecentPosts'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																		'param3'	=> 'integer'
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* newPost
-* Post a new entry to the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['newPost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																		'param3'	=> 'struct',
-																		'param4'	=> 'bool'
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* editPost
-* Edit an entry in the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['editPost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																		'param3'	=> 'struct',
-																		'param4'	=> 'bool'
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* getPost
-* Get an entry from the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['getPost'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
-
-/**
-* newMediaObject
-* Post a media object to the Blog
-*/
-$_METAWEBLOG_ALLOWED_METHODS['newMediaObject'] = array(
-													   'in'  => array(
-													   					'param0'	=> 'integer',
-																		'param1'	=> 'string',
-																		'param2'	=> 'string',
-																		'param3'	=> 'struct',
-																     ),
-													   'out' => array(
-																		'response' => 'xmlrpc'
-																	 )
-													 );
\ No newline at end of file
diff --git a/upload/interface/blog/apis/server_blogger.php b/upload/interface/blog/apis/server_blogger.php
deleted file mode 100644
index 9536cc84..00000000
--- a/upload/interface/blog/apis/server_blogger.php
+++ /dev/null
@@ -1,688 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Blogger API Functions
- * Last Updated: $Date: 2010-10-11 20:21:22 -0400 (Mon, 11 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 6962 $
- *
- */
-
-class xmlrpc_server
-{
-   /**
-    * Defines the service for WSDL
-    *
-    * @access	private
-    * @var		array
-    */
-	public $__dispatch_map = array();
-
-	/**
-	* IPS API SERVER Class
-	*
-    * @access	public
-    * @var		object
-    */
-	public $classApiServer;
-
-	/**
-	* Error string
-	*
-    * @access	public
-    * @var		string
-    */
-	public $error = "";
-	
-   /**
-    * Global registry
-    *
-    * @access 	private
-    * @var 		object
-    */
-	private $registry;
-
-	/**
-	 * CONSTRUCTOR
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void
-	 **/
-	public function __construct( ipsRegistry $registry )
-    {
-		//-----------------------------------------
-		// Set IPS CLASS
-		//-----------------------------------------
-
-		$this->registry = $registry;
-		$this->request	= $this->registry->fetchRequest();
-
-		/* Load the Blog functions library */
-		require_once( IPS_ROOT_PATH . 'applications_addon/ips/blog/sources/classes/blogFunctions.php' );
-		$registry->setClass( 'blogFunctions', new blogFunctions( $registry ) );
-
-   		//-----------------------------------------
-    	// Load allowed methods and build dispatch
-		// list
-    	//-----------------------------------------
-
-		require_once( DOC_IPS_ROOT_PATH . 'interface/blog/apis/methods_blogger.php' );
-
-		if ( is_array( $_METAWEBLOG_ALLOWED_METHODS ) and count( $_METAWEBLOG_ALLOWED_METHODS ) )
-		{
-			foreach( $_METAWEBLOG_ALLOWED_METHODS as $_method => $_data )
-			{
-				$this->__dispatch_map[ $_method ] = $_data;
-			}
-		}
-	}
-
-	/**
-	 * XMLRPC_server::getUsersBlogs()
-	 *
-	 * Retrieves a user's blog entries
-	 *
-	 * This will return a param "response" with either
-	 * - FAILED    		 (Unknown failure)
-	 * - SUCCESS    	 (Added OK)
-	 *
-	 *
-	 * @access	public
-	 * @param	string	$appkey			Application key
-	 * @param	string  $username       Username
-	 * @param	string  $password		Password
-	 * @return	string	xml document
-	 **/
-	public function getUsersBlogs( $appkey, $username, $password )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-
-		$return     = 'FAILED';
-
-		//-----------------------------------------
-		// Authenticate
-		//-----------------------------------------
-
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			//-----------------------------------------
-			// return
-			//-----------------------------------------
-
-			$return = 'SUCCESS';
-			$blog_url = substr( str_replace( "&amp;", "&", $this->registry->blogFunctions->getBlogUrl( $this->blog['blog_id'] ) ), 0, -1 );
-			$this->classApiServer->apiSendReply( array( array( 'url'		=> $blog_url,
-			 													   'blogid'		=> $this->blog['blog_id'],
-			 													   'blogName'	=> IPSText::UNhtmlspecialchars( $this->blog['blog_name'] )
-			 										)	  )		 );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::getUserInfo()
-	 *
-	 * Retrieve user info
-	 *
-	 * This will return a param "response" with either
-	 * - FAILED    		 (Unknown failure)
-	 * - SUCCESS    	 (Added OK)
-	 *
-	 *
-	 * @access	public
-	 * @param	string  $appkey       	   			Appkey (ignored)
-	 * @param	string  $username       	   			Username
-	 * @param	string  $password					Password
-	 * @return	string	xml
-	 **/
-	public function getUserInfo( $appkey, $username, $password )
-	{
-		//-----------------------------------------
-		// Authenticate
-		//-----------------------------------------
-
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			//-----------------------------------------
-			// return
-			//-----------------------------------------
-			$this->classApiServer->apiSendReply( array( 'nickname'	=> $this->memberData['members_display_name'],
-															'userid'	=> $this->memberData['member_id'],
-			 												'url'		=> ipsRegistry::$settings['board_url'].'/index.'.ipsRegistry::$settings['php_ext'].'?showuser='.$this->memberData['member_id'],
-															'email'		=> $this->memberData['email']
-			 										)	  );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::deletePost()
-	 *
-	 * Deletes a Blog entry.
-	 *
-	 * @access	public
-	 * @param	string	$appkey			Appkey (ignored)
-	 * @param	int		$postid			Entry ID
-	 * @param	string	$username		Username
-	 * @param	string	$password		Password
-	 * @param	bool	$publish		Publish (ignored)
-	 * @return	string	xml
-	 **/
-	public function deletePost( $appkey, $postid, $username, $password, $publish )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-
-		//-----------------------------------------
-		// Authenticate
-		//-----------------------------------------
-
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			if (!$this->registry->blogFunctions->allowDelEntry( $this->blog ) )
-			{
-				$this->classApiServer->apiSendError( 100, $this->registry->class_localization->words['blogger_error_1'] );
-				exit();
-			}
-
-			//-----------------------------------------
-			// find the entry
-			//-----------------------------------------
-			$eid = intval($postid);
-		    $entry = $this->registry->DB()->buildAndFetch( array ( 'select'	=>	'*',
-														   'from'	=>	'blog_entries',
-														   'where'	=>	"entry_id = ".$eid
-												 )		 );
-			if ( ! $entry['entry_id'] )
-			{
-				$this->classApiServer->apiSendError( 100, sprintf( $this->registry->class_localization->words['blogger_error_2'], $eid ) );
-				exit();
-			}
-
-			//-----------------------------------------
-			// delete the entry
-			//-----------------------------------------
-			
-			$this->registry->blogFunctions->deleteEntries( array( $eid ) );
-
-			$this->addModlog( $this->registry->class_localization->words['blogger_blog_prefix'] . "({$this->blog['blog_id']}) '{$this->blog['blog_name']}': {$this->registry->class_localization->words['blogger_deleted_log']} '{$entry['entry_name']}'" );
-
-			//-------------------------------------------------
-			// Return
-			//-------------------------------------------------
-			$this->classApiServer->apiSendReply();
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::newPost()
-	 *
-	 * Adds a new post to the Blog.
-	 *
-	 * @access	public
-	 * @param	string  $appkey		Appkey (ignored)
-	 * @param	int     $blogid		Blog ID
-	 * @param	string  $username	Username
-	 * @param	string  $password	Password
-	 * @param	string  $contentd	Content
-	 * @param	bool    $publish	Publish (ignored)
-	 * @return	string	xml
-	 **/
-	public function newPost( $appkey, $blogid, $username, $password, $content, $publish )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-		
-		//-----------------------------------------
-		// Authenticate
-		//-----------------------------------------
-
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			if ( $this->blog['blog_id'] != $blogid )
-			{
-				$this->classApiServer->apiSendError( 100, $this->registry->class_localization->words['blogger_error_3'] );
-				exit();
-			}
-			
-			/* External blog? */
-			if ( $this->blog['blog_type'] != 'local' )
-			{
-				$this->classApiServer->apiSendError( 100, 'Cannot post to external blog' );
-				exit();
-			}
-
-			//-----------------------------------------
-			// return
-			//-----------------------------------------
-			if ( ! $this->_compilePost( $content['description'], $publish ) )
-			{
-				$this->classApiServer->apiSendError( 100, $this->error );
-				exit();
-			}
-
-			$this->registry->DB()->insert( 'blog_entries', $this->entry );
-			$entry_id = $this->registry->DB()->getInsertId();
-
-			$this->registry->blogFunctions->rebuildBlog( $this->blog['blog_id'] );
-
-			//-----------------------------------------
-			// Load and config POST class
-			//-----------------------------------------
-			
-			require_once( BLOG_PATH . "sources/classes/post/blogPost.php" );
-			require_once( BLOG_PATH . "sources/classes/post/entry_new_entry.php" );
-			
-			$this->lib_post				=  new postFunctions( $this->registry );
-			$this->lib_post->blog		= & $this->blog;
-
-			//-------------------------------------------------
-			// If the entry is published, run the Blog tracker and pings
-			//-------------------------------------------------
-
-			$this->lib_post->blogTracker( $entry_id, $this->entry['entry_name'], $this->entry['entry'] );
-			$this->lib_post->blogPings ( $entry_id, $this->entry );
-
-			//-------------------------------------------------
-			// Update the Blog stats
-			//-------------------------------------------------
-			$r = $this->registry->cache()->getCache( 'blog_stats' );
-
-			$r['blog_stats']['stats_num_entries']++;
-			$this->registry->cache()->setCache( 'blog_stats', $r, array( 'array' => 1, 'donow' => 1 ) );
-
-			$this->classApiServer->apiSendReply( $entry_id );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::editPost()
-	 *
-	 * Edit the entry.
-	 *
-	 * @access	public
-	 * @param	string  $appkey       	   			Appkey (ignored)
-	 * @param	int		$postid       	   			Entry ID
-	 * @param	string	$username					Username
-	 * @param	string	$password					Password
-	 * @param	string	$content					Post content
-	 * @param	bool	$publish					Publish?
-	 * @return	string	xml
-	 **/
-	public function editPost( $appkey, $postid, $username, $password, $content, $publish )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-		
-		//-----------------------------------------
-		// Authenticate
-		//-----------------------------------------
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			//-----------------------------------------
-			// find the entry
-			//-----------------------------------------
-		    $entry = $this->registry->DB()->buildAndFetch( array ( 'select'	=>	'*',
-														   'from'	=>	'blog_entries',
-														   'where'	=>	"entry_id = ".intval($postid)
-												 )		 );
-			if ( ! $entry['entry_id'] )
-			{
-				$this->classApiServer->apiSendError( 100, sprintf( $this->registry->class_localization->words['blogger_error_3'], intval($postid) ) );
-				exit();
-			}
-
-			//-----------------------------------------
-			// return
-			//-----------------------------------------
-			if ( ! $this->_compilePost( $content['description'], $publish ) )
-			{
-				$this->classApiServer->apiSendError( 100, $this->error );
-				exit();
-			}
-
-			$this->entry['blog_id']				= $entry['blog_id'];
-			$this->entry['entry_author_id']		= $entry['entry_author_id'];
-			$this->entry['entry_author_name']	= $entry['entry_author_name'];
-			$this->entry['entry_date']			= $entry['entry_date'];
-			$this->entry['entry_last_update']	= $entry['entry_last_update'];
-			$this->entry['entry_edit_time']		= time();
-			$this->entry['entry_edit_name'] 	= $this->memberData['members_display_name'];
-			$this->entry['entry_poll_state']	= $entry['entry_poll_state'];
-
-			//-------------------------------------------------
-			// Update entry in DB
-			//-------------------------------------------------
-			$this->registry->DB()->update( 'blog_entries', $this->entry, 'entry_id='.$entry['entry_id'] );
-
-			//-----------------------------------------
-			// Rebuild the Blog
-			//-----------------------------------------
-			$this->registry->blogFunctions->rebuildBlog ( $this->blog['blog_id'] );
-
-			//-----------------------------------------
-			// Return true
-			//-----------------------------------------
-			$this->classApiServer->apiSendReply();
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * _authenticate()
-	 *
-	 * Authenticates the username and password
-	 *
-	 * This will return
-	 * - false	(Failed)
-	 * - true	(Succes)
-	 *
-	 * @access	private
-	 * @param	string  $username       	   		Username
-	 * @param	string  $password					Password
-	 * @return	boolean
-	 **/
-	private function _authenticate( $username, $password )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-		
-        //-----------------------------------------
-		// Are they banned?
-		//-----------------------------------------
-		if ( is_array( $this->caches['banfilters'] ) and count( $this->caches['banfilters'] ) )
-		{
-			foreach ($this->caches['banfilters'] as $ip)
-			{
-				$ip = str_replace( '\*', '.*', preg_quote($ip, "/") );
-
-				if ( preg_match( "/^$ip$/", $this->member->ip_address ) )
-				{
-					$this->error = $this->registry->class_localization->words['blogger_banned_msg'];
-					return false;
-				}
-			}
-		}
-
-        //-----------------------------------------
-		// load the member
-		//-----------------------------------------
-		$member = IPSMember::load( IPSText::parseCleanValue( $username ), 'extendedProfile', 'username' );
- 
-		if ( ! $member['member_id'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_unknown_user'];
-			return false;
-		}
-		
-		ips_MemberRegistry::setMember( $member['member_id'] );
-
-		//--------------------------------
-		//  Is the board offline?
-		//--------------------------------
-
-		if (ipsRegistry::$settings['board_offline'] == 1)
-		{
-			if ($this->memberData['g_access_offline'] != 1)
-			{
-				$this->error = $this->registry->class_localization->words['blogger_board_offline'];
-				return false;
-			}
-		}
-
- 		//-----------------------------------------
-		// Temporarely banned?
-		//-----------------------------------------
-		if ( $member['temp_ban'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_suspended'];
-			return false;
-		}
-
-		//-----------------------------------------
-		// Load the Blog
-		//-----------------------------------------
-		$this->registry->blogFunctions->buildPerms();
-		
-		//-----------------------------------------
-		// Users can have more than one blog - just
-		// grab first one mysql returns
-		//-----------------------------------------
-		
-		$blog = $this->registry->DB()->buildAndFetch( array( 
-											'select'	=> 'blog_id, blog_name',
-											'from'		=> 'blog_blogs',
-											'where'		=> "member_id={$member['member_id']}" 
-									)	);
-
-		if ( ! $blog['blog_id'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_noblog'];
-			return false;
-		}
-
-		if ( ! $this->blog = $this->registry->blogFunctions->loadBlog( $blog['blog_id'], 1 ) )
-		{
-			$this->error = $this->blogFunctions->error;
-			return false;
-		}
-
-        //-----------------------------------------
-		// Blog post permissions?
-		//-----------------------------------------
-        if ( !$this->blog['allow_entry'] )
-        {
-			$this->error = $this->registry->class_localization->words['blogger_nopost'];
-			return false;
-		}
-
-        //-----------------------------------------
-		// Validate password?
-		//-----------------------------------------
-		if ( !ipsRegistry::$settings['blog_allow_xmlrpc'] or !$this->blog['blog_settings']['enable_xmlrpc'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_noxmlrpc'];
-			return false;
-		}
-
-		if ( $this->blog['blog_settings']['xmlrpc_password'] != md5( IPSText::parseCleanValue( $password ) ) )
-		{
-			if ( isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) && $this->blog['blog_settings']['xmlrpc_failedattempts'] > 5 )
-			{
-				$this->blog['blog_settings']['enable_xmlrpc'] = 0;
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = 0;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->registry->DB()->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-			else
-			{
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) ? intval($this->blog['blog_settings']['xmlrpc_failedattempts'])+1 : 1;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->registry->DB()->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-
-			$this->error = $this->registry->class_localization->words['blogger_inv_pass'];
-			return false;
-		}
-		else
-		{
-			if ( isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) && $this->blog['blog_settings']['xmlrpc_failedattempts'] > 0 )
-			{
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = 0;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->registry->DB()->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-		}
-
-		//-----------------------------------------
-		// Set the member data
-		//-----------------------------------------
-		
-		$this->memberData	= $member;
-		
-		return true;
-	}
-
-    /*-------------------------------------------------------------------------*/
-	// Add an entry to the Mod log
-    /*-------------------------------------------------------------------------*/
-
-	public function addModlog( $mod_title )
-	{
-		$this->registry->DB()->insert( 'moderator_logs', array (
-												  'member_id'   => $this->memberData['member_id'],
-												  'member_name' => $this->memberData['members_display_name'],
-												  'ip_address'  => $this->member->ip_address,
-												  'http_referer'=> htmlspecialchars( my_getenv('HTTP_REFERER') ),
-												  'ctime'       => time(),
-												  'action'      => $mod_title,
-												  'query_string'=> htmlspecialchars( my_getenv('QUERY_STRING') ),
-												)						 );
-	}
-
-    /*-------------------------------------------------------------------------*/
-	// Compile the entry content
-    /*-------------------------------------------------------------------------*/
-
-	private function _compilePost( & $content, $publish )
-	{
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-		
-		//----------------------------------------------------------------
-		// Do we have a valid post?
-		//----------------------------------------------------------------
-		ipsRegistry::$settings['blog_max_entry_length'] = ipsRegistry::$settings['blog_max_entry_length'] ? ipsRegistry::$settings['blog_max_entry_length'] : 2140000;
-
-		if (strlen( trim( IPSText::br2nl( $content['description'] ) ) ) < 1)
-		{
-			$this->error = $this->registry->class_localization->words['blogger_emptypost'];
-			return false;
-		}
-
-		if (strlen( $content ) > (ipsRegistry::$settings['blog_max_entry_length']*1024))
-		{
-			$this->error = $this->registry->class_localization->words['blogger_toolong'];
-			return false;
-		}
-
-		//-------------------------------------------------
-		// check to make sure we have a valid entry title
-		//-------------------------------------------------
-		$title = $content['title'];
-
-		# Fix &amp;
-		$title = str_replace( '&amp;', '&', $title );
-		$title = IPSText::parseCleanValue( $title );
-
-		# Fix up &amp;reg;
-		$title = str_replace( '&amp;reg;', '&reg;', $title );
-		$title = IPSText::getTextClass('parser')->stripBadWords( $title );
-		$title = str_replace( "<br>", "", $title );
-		$title = trim($title);
-
-		//-------------------------------------------------
-		// More unicode..
-		//-------------------------------------------------
-		$temp = IPSText::stripslashes($title);
-		$temp = preg_replace("/&#([0-9]+);/", "-", $temp );
-		if ( strlen($temp) > 64 )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_title_toolong'];
-			return false;
-		}
-		if ( (strlen($temp) < 2) or (!$title)  )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_notitle'];
-			return false;
-		}
-
-		//--------------------------------------------
-		// Sort post content: Convert HTML to BBCode
-		//--------------------------------------------
-
-		IPSText::getTextClass('parser')->parse_smilies		= 1;
-		IPSText::getTextClass('parser')->parse_html			= 0;
-		IPSText::getTextClass('parser')->parse_bbcode		= 1;
-		IPSText::getTextClass('parser')->parsing_section	= 'blog_entry';
-
-		//--------------------------------------------
-		// Clean up..
-		//--------------------------------------------
-
-		$content = preg_replace( "#<br />(\r)?\n#is", "<br />", $content );
-
-		//-----------------------------------------
-		// Post process the editor
-		// Now we have safe HTML and bbcode
-		//-----------------------------------------
-
-		$content = IPSText::getTextClass('parser')->preDbParse( IPSText::getTextClass('editor')->processRawPost( IPSText::stripslashes($content) ) );
-
-		$dte = time();
-		
-		/* Build the entry array */
-		$this->entry = array(
-						'blog_id'			  => $this->blog['blog_id'],
-						'entry_author_id'	  => $this->memberData['member_id'],
-						'entry_author_name'	  => $this->memberData['members_display_name'],
-						'entry_date'		  => $dte,
-						'entry_name'		  => $title,
-						'entry_name_seo'	  => IPSText::makeSeoTitle($title),
-						'entry'     		  => $content,
-						'entry_short'		  => $this->registry->blogFunctions->getEntryExcerpt( array( 'entry_short' => '', 'entry_id' => null, 'entry' => $content ) ),
-						'entry_status'		  => ($publish ? 'published' : 'draft'),
-						'entry_post_key'	  => md5(microtime()),
-						'entry_html_state'	  => 0,
-						'entry_use_emo'		  => 1,
-						'entry_last_update'	  => $dte,
-						'entry_gallery_album' => 0,
-						'entry_poll_state'    => 0,
-					 );
-
-	    // If we had any errors, parse them back to this class
-	    // so we can track them later.
-		if ( is_array(IPSText::getTextClass('parser')->error) && count(IPSText::getTextClass('parser')->error) > 0 )
-		{
-	    	$this->error = implode( " : ", IPSText::getTextClass('parser')->error );
-	    	return false;
-	    }
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/upload/interface/blog/apis/server_metaweblog.php b/upload/interface/blog/apis/server_metaweblog.php
deleted file mode 100644
index 533b4baf..00000000
--- a/upload/interface/blog/apis/server_metaweblog.php
+++ /dev/null
@@ -1,932 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Metaweblog API Functions
- * Last Updated: $Date: 2010-07-07 05:53:45 -0400 (Wed, 07 Jul 2010) $
- * </pre>
- *
- * @author 		$Author: mark $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @since		1st march 2002
- * @version		$Revision: 6607 $
- *
- */
-
-class xmlrpc_server
-{
-   /**
-	* Defines the service for WSDL
-	*
-	* @access	private
-	* @var		array
-	*/
-	public $__dispatch_map = array();
-
-	/**
-	 * IPS API SERVER Class
-	 *
-	 * @access	public
-	 * @var		object
-	 */
-	public $classApiServer;
-
-	/**
-	 * Error string
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $error = "";
-	
-   /**
-	* Global registry
-	*
-	* @access 	private
-	* @var 		object
-	*/
-	private $registry;
-
-	/**
-	 * CONSTRUCTOR
-	 *
-	 * @access	public
-	 * @param	object		ipsRegistry reference
-	 * @return	void
-	 */
-	public function __construct( ipsRegistry $registry )
-    {
-		/* Make registry objects */
-		$this->registry   =  $registry;
-		$this->DB         =  $this->registry->DB();
-		$this->settings   =& $this->registry->fetchSettings();
-		$this->request    =& $this->registry->fetchRequest();
-		$this->lang       =  $this->registry->getClass('class_localization');
-		$this->member     =  $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
-		$this->cache      =  $this->registry->cache();
-		$this->caches     =& $this->registry->cache()->fetchCaches();
-
-		/* Load the Blog functions library */
-		$registry->DB()->loadCacheFile( BLOG_PATH . 'sql/' . ips_DBRegistry::getDriverType() . '_blog_queries.php', 'sql_blog_queries' );
-		require_once( IPS_ROOT_PATH . 'applications_addon/ips/blog/sources/classes/blogFunctions.php' );
-		$registry->setClass( 'blogFunctions', new blogFunctions( $registry ) );
-		
-		/* Language */
-		$this->registry->class_localization->loadLanguageFile( array( 'public_portal' ), 'blog' );
-		
-		/* Allowed Methods and Dispatch Map */
-		require_once( DOC_IPS_ROOT_PATH . 'interface/blog/apis/methods_metaweblog.php' );
-
-		if ( is_array( $_METAWEBLOG_ALLOWED_METHODS ) and count( $_METAWEBLOG_ALLOWED_METHODS ) )
-		{
-			foreach( $_METAWEBLOG_ALLOWED_METHODS as $_method => $_data )
-			{
-				$this->__dispatch_map[ $_method ] = $_data;
-			}
-		}
-	}
-
-	/**
-	 * XMLRPC_server::getCategories()
-	 *
-	 * Returns a list of the Blogs categories.
-	 *
-	 * @access	public
-	 * @param	string	$blogid			Application key
-	 * @param	string  $username       Username
-	 * @param	string  $password		Password
-	 * @return	string	xml document
-	 **/
-	public function getCategories( $blogid, $username, $password )
-	{
-		/* Authenticate the request */
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			if ( $this->blog['blog_id'] != $blogid )
-			{
-				$this->classApiServer->apiSendError( 100, $this->registry->class_localization->words['blogger_error_3'] );
-				exit();
-			}
-		
-			/* Query tags */
-			$this->DB->build( array( 
-										'select'	=> '*', 
-										'from'		=> 'tags_index', 
-										'where'		=> "app='blog' AND type='category' AND type_id_2={$blogid}" 
-							)	);
-			$this->DB->execute();
-			
-			/* Loop through tags and build array */
-			$return_array = array();
-			
-			while( $r = $this->DB->fetch() )
-			{
-				$return_array[] = array(
-										'description'	=> $r['tag'],
-										'htmlUrl'		=> "{$this->settings['base_url']}app=blog&module=display&section=blog&blogid={$this->blog['blog_id']}&tag={$r['tag']}",
-										'rssUrl'		=> ''
-									);
-			}
-			
-			/* Send response */
-			$this->classApiServer->apiSendReply( $return_array );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::getRecentPosts()
-	 *
-	 * Returns a list of the Blogs categories.
-	 *
-	 * @access	public
-	 * @param	int		$blogid       	   			Blog ID
-	 * @param	string	$username					Username
-	 * @param	string	$password					Password
-	 * @param	int		$numberOfPosts				Number of posts
-	 * @return	string	xml
-	 **/
-	public function getRecentPosts( $blogid, $username, $password, $numberOfPosts )
-	{
-		/* INIT */
-		$return_array = array();
-
-		/* Authenticate */
-		if( $this->_authenticate( $username, $password ) )
-		{
-			/* Check the blog id */
-			if ( $this->blog['blog_id'] != $blogid )
-			{
-				$this->classApiServer->apiSendError( 100, $this->registry->class_localization->words['blogger_error_3'] );
-				exit();
-			}
-			
-			/* Blog URL */
-			$blog_url = str_replace( "&amp;", "&", $this->registry->blogFunctions->getBlogUrl( $this->blog['blog_id'] ) );
-
-			$this->DB->build( array( 
-										'select'	=> 'e.*',
-										'from'	 	=> array( 'blog_entries' => 'e' ),
-										'where'		=> "e.blog_id={$this->blog['blog_id']}",
-										'order'		=> 'e.entry_date DESC',
-										'limit'		=> array( 0, intval( $numberOfPosts ) ),
-										'add_join'	=> array(
-										 					array(
-										 							'select'	=> 'm.member_group_id, m.mgroup_others',
-													 				'from'		=> array( 'members' => 'm' ),
-													 				'where'		=> 'm.member_id=e.entry_author_id',
-																	'type'		=> 'left'
-									 							)
-										 					)
-							)	);
-			$q = $this->DB->execute();
-			
-			while( $entry = $this->DB->fetch( $q ) )
-			{
-				/* Setup Parser */
-				IPSText::getTextClass('parser')->parse_html				= $entry['entry_html_state'] ? 1 : 0;
-				IPSText::getTextClass('parser')->parse_wordwrap			= $this->settings['post_wordwrap'];
-				IPSText::getTextClass('parser')->parse_nl2br			= $entry['entry_html_state'] == 2 ? 1 : 0;
-				IPSText::getTextClass('parser')->parse_smilies			= $entry['entry_use_emo'] ? 1: 0;
-				IPSText::getTextClass('parser')->parsing_section		= 'blog_entry';
-				IPSText::getTextClass('parser')->parsing_mgroup			= $entry['member_group_id'];
-				IPSText::getTextClass('parser')->parsing_mgroup_others	= $entry['member_group_id'];
-				
-				/* Parse */
-				$entry['entry'] = IPSText::getTextClass('parser')->preDisplayParse( $entry['entry'] );
-				
-				/* Tags */
-				$this->DB->build( array( 'select' => 'tag', 'from' => 'tags_index', 'where' => "app='blog' AND type_id={$entry['entry_id']} AND type_id_2={$entry['blog_id']}" ) );
-				$this->DB->execute();
-
-				$tags = array();
-				while( $r = $this->DB->fetch() )
-				{
-					$tags[] = $r['tag'];
-				}
-				
-				/* Add to output */
-				$return_array[] = array( 
-											'categories'	=> $tags,
-											'dateCreated'	=> gmdate("Ymd\TH:i:s",$entry['entry_date']),
-											'description'	=> $entry['entry'],
-											'link'			=> $blog_url.'showentry='.$entry['entry_id'],
-											'postid'		=> $entry['entry_id'],
-											'title'			=> $entry['entry_name']
-										);
-			}
-			$force_array = array( 'dateCreated'		=> 'dateTime.iso8601' );
-
-			$this->classApiServer->apiSendReply( $return_array, 0, $force_array );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::newPost()
-	 *
-	 * Post a new entry.
-	 *
-	 * @access	public
-	 * @param	int		$blogid       	   			Blog ID
-	 * @param	string	$username					Username
-	 * @param	string	$password					Password
-	 * @param	array	$content					Post content
-	 * @param	bool	$publish					Publish?
-	 * @return	string	xml
-	 **/
-	public function newPost( $blogid, $username, $password, $content, $publish )
-	{		
-		/* Authenticate */
-		if ( $this->_authenticate( $username, $password ) )
-		{
-			/* Check the ID */
-			if ( $this->blog['blog_id'] != $blogid )
-			{
-				$this->classApiServer->apiSendError( 100, $this->registry->class_localization->words['blogger_error_3'] );
-				exit();
-			}
-			
-			/* External blog? */
-			if ( $this->blog['blog_type'] != 'local' )
-			{
-				$this->classApiServer->apiSendError( 100, 'Cannot post to external blog' );
-				exit();
-			}
-			
-			/* Compile the post */
-			if ( ! $this->_compilePost( $content, $publish ) )
-			{
-				$this->classApiServer->apiSendError( 100, $this->error );
-				exit();
-			}
-			
-			/* Insert the blog */
-			$this->DB->insert( 'blog_entries', $this->entry );
-			$entry_id = $this->DB->getInsertId();
-			
-			/* Rebuild teh blog stats */
-			$this->registry->blogFunctions->rebuildBlog( $this->blog['blog_id'] );
-
-			/* If the entry is published, do tracker and pings */
-			if( $publish )
-			{
-				$this->blogTracker( $entry_id, $this->entry['entry_name'], $this->entry['entry'] );
-				$this->blogPings ( $entry_id, $this->entry );
-			}
-            
-			/* Update Blog Stats */
-			$r = $this->registry->cache()->getCache( 'blog_stats' );
-            
-			$r['blog_stats']['stats_num_entries']++;
-			$this->registry->cache()->setCache( 'blog_stats', $r, array( 'array' => 1, 'donow' => 1 ) );
-
-			$this->classApiServer->apiSendReply( $entry_id );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::editPost()
-	 *
-	 * Edit the entry.
-	 *
-	 * @access	public
-	 * @param	int		$postid       	   			Entry ID
-	 * @param	string	$username					Username
-	 * @param	string	$password					Password
-	 * @param	string	$content					Post content
-	 * @param	bool	$publish					Publish?
-	 * @return	string	xml
-	 **/
-	public function editPost( $postid, $username, $password, $content, $publish )
-	{
-		/* Authenticate request */
-		if( $this->_authenticate( $username, $password ) )
-		{
-			/* Query the entry */
-			$entry = $this->DB->buildAndFetch( array( 
-													'select'	=>	'*',
-													'from'		=>	'blog_entries',
-													'where'		=>	'entry_id = ' . intval( $postid )
-										 	)		 );
-												
-			/* Make sure we have an entry */
-			if( ! $entry['entry_id'] )
-			{
-				$this->classApiServer->apiSendError( 100, sprintf( $this->registry->class_localization->words['blogger_error_2'], intval( $postid ) ) );
-				exit();
-			}
-			
-			/* Compile the post */
-			if ( ! $this->_compilePost( $content, $publish ) )
-			{
-				$this->classApiServer->apiSendError( 100, $this->error );
-				exit();
-			}
-			
-			/* Setup the new entry data */
-			$this->entry['blog_id']				= $entry['blog_id'];
-			$this->entry['entry_author_id']		= $entry['entry_author_id'];
-			$this->entry['entry_author_name']	= $entry['entry_author_name'];
-			$this->entry['entry_date']			= $entry['entry_date'];
-			$this->entry['entry_last_update']	= $entry['entry_last_update'];
-			$this->entry['entry_edit_time']		= time();
-			$this->entry['entry_edit_name'] 	= $this->memberData['members_display_name'];
-			$this->entry['entry_poll_state']	= $entry['entry_poll_state'];
-
-			/* Update the entry */
-			$this->DB->update( 'blog_entries', $this->entry, 'entry_id='.$entry['entry_id'] );
-
-			/* Rebuild the blog */
-			$this->registry->blogFunctions->rebuildBlog ( $this->blog['blog_id'] );
-
-			/* Send Response */
-			$this->classApiServer->apiSendReply();
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::getPost()
-	 *
-	 * Get an entry.
-	 *
-	 * @access	public
-	 * @param	int		$postid       	   			Entry ID
-	 * @param	string	$username					Username
-	 * @param	string	$password					Password
-	 * @return	string	xml
-	 **/
-	public function getPost( $postid, $username, $password )
-	{
-		/* Authenticate the request */
-		if( $this->_authenticate( $username, $password ) )
-		{
-			/* Query the blog entry */
-			$entry = $this->DB->buildAndFetch( array(
-														'select'	=>	'e.*',
-														'from'		=>	array( 'blog_entries' => 'e' ),
-														'where'		=>	'e.entry_id = ' . intval( $postid ),
-														'add_join'	=> array(
-														 					array(
-																					'select'	=> 'm.member_group_id, m.mgroup_others',
-																					'from'		=> array( 'members' => 'm' ),
-																					'where'		=> 'm.member_id=e.entry_author_id',
-																					'type'		=> 'left'
-																				)
-														 					)
-											)	 );
-			
-			/* Make sure we found an entry */
-			if( ! $entry['entry_id'] )
-			{
-				$this->classApiServer->apiSendError( 100, sprintf( $this->registry->class_localization->words['blogger_error_2'], intval($postid) ) );
-				exit();
-			}
-			
-			/* Tags */
-			$this->DB->build( array( 'select' => 'tag', 'from' => 'tags_index', 'where' => "app='blog' AND type_id={$entry['entry_id']} AND type_id_2={$entry['blog_id']}" ) );
-			$this->DB->execute();
-
-			$tags = array();
-			while( $r = $this->DB->fetch() )
-			{
-				$tags[] = $r['tag'];
-			}
-
-			/* Setup the parser */
-			IPSText::getTextClass('parser')->parse_html				= $entry['entry_html_state'] ? 1 : 0;
-			IPSText::getTextClass('parser')->parse_wordwrap			= $this->settings['post_wordwrap'];
-			IPSText::getTextClass('parser')->parse_nl2br			= $entry['entry_html_state'] == 2 ? 1 : 0;
-			IPSText::getTextClass('parser')->parse_smilies			= $entry['entry_use_emo'] ? 1: 0;
-			IPSText::getTextClass('parser')->parsing_section		= 'blog_entry';
-			IPSText::getTextClass('parser')->parsing_mgroup			= $entry['member_group_id'];
-			IPSText::getTextClass('parser')->parsing_mgroup_others	= $entry['member_group_id'];
-			
-			/* Parse the entry */
-			$entry['entry'] = IPSText::getTextClass('parser')->preDisplayParse( $entry['entry'] );
-
-			/* Build the return array */
-			$return_array = array(
-									'postid'		=> $entry['entry_id'],
-									'dateCreated'	=> gmdate("Ymd\TH:i:s",$entry['entry_date']),
-									'title'			=> $entry['entry_name'],
-									'description'	=> $entry['entry'],
-									'categories'	=> $tags
-								);
-								
-			$force_array = array( 'dateCreated'		=> 'dateTime.iso8601' );
-				
-			/* Send Post */
-			$this->classApiServer->apiSendReply( $return_array, 0, $force_array );
-			exit();
-		}
-		else
-		{
-			$this->classApiServer->apiSendError( 100, $this->error );
-			exit();
-		}
-	}
-
-	/**
-	 * XMLRPC_server::newMediaObject()
-	 *
-	 * Post a new entry.
-	 *
-	 * @access	public
-	 * @param  int		$blogid       	   			Blog ID
-	 * @param  string	$username					Username
-	 * @param  string	$password					Password
-	 * @param  array	$file						Uploaded file details
-	 * @return string	xml
-	 **/
-	public function newMediaObject( $blogid, $username, $password, $file )
-	{
-		/* We don't support this yet, just send a response */
-		$this->classApiServer->apiSendReply();
-	}
-
-	/**
-	 * _authenticate()
-	 *
-	 * Authenticates the username and password
-	 *
-	 * This will return
-	 * - false	(Failed)
-	 * - true	(Succes)
-	 *
-	 * @access	private
-	 * @param  string  $username       	   			Username
-	 * @param  string  $password					Password
-	 * @return boolean
-	 **/
-	private function _authenticate( $username, $password )
-	{
-		//-----------------------------------------
-		// Are they banned?
-		//-----------------------------------------
-		if ( is_array( $this->caches['banfilters'] ) and count( $this->caches['banfilters'] ) )
-		{
-			foreach ($this->caches['banfilters'] as $ip)
-			{
-				$ip = str_replace( '\*', '.*', preg_quote($ip, "/") );
-
-				if ( preg_match( "/^$ip$/", $this->member->ip_address ) )
-				{
-					$this->error = $this->registry->class_localization->words['blogger_banned_msg'];
-					return false;
-				}
-			}
-		}
-
-		//-----------------------------------------
-		// load the member
-		//-----------------------------------------
-		$member = IPSMember::load( IPSText::parseCleanValue( $username ), 'extendedProfile', 'username' );
-
-		if ( ! $member['member_id'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_unknown_user'];
-			return false;
-		}
-		
-		ips_MemberRegistry::setMember( $member['member_id'] );
-
-		//--------------------------------
-		//  Is the board offline?
-		//--------------------------------
-
-		if ($this->settings['board_offline'] == 1)
-		{
-			if ($member['g_access_offline'] != 1)
-			{
-				$this->error = $this->registry->class_localization->words['blogger_board_offline'];
-				return false;
-			}
-		}
-
-		//-----------------------------------------
-		// Temporarely banned?
-		//-----------------------------------------
-		if ( $member['temp_ban'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_suspended'];
-			return false;
-		}
-
-		//-----------------------------------------
-		// Load the Blog
-		//-----------------------------------------
-		$this->registry->blogFunctions->buildPerms();
-		
-		//-----------------------------------------
-		// Users can have more than one blog - just
-		// grab first one mysql returns
-		//-----------------------------------------
-		
-		$blog = $this->DB->buildAndFetch( array( 
-												'select'	=> 'blog_id, blog_name',
-												'from'		=> 'blog_blogs',
-												'where'		=> "member_id={$member['member_id']}" 
-									)	);
-
-		if ( ! $blog['blog_id'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_noblog'];
-			return false;
-		}
-
-		if ( ! $this->blog = $this->registry->blogFunctions->loadBlog( $blog['blog_id'], 1 ) )
-		{
-			$this->error = $this->blog_std->error;
-			return false;
-		}
-
-		//-----------------------------------------
-		// Blog post permissions?
-		//-----------------------------------------
-		if ( !$this->blog['allow_entry'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_nopost'];
-			return false;
-		}
-
-		//-----------------------------------------
-		// Validate password?
-		//-----------------------------------------
-		if ( !$this->settings['blog_allow_xmlrpc'] or !$this->blog['blog_settings']['enable_xmlrpc'] )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_noxmlrpc'];
-			return false;
-		}
-
-		if ( $this->blog['blog_settings']['xmlrpc_password'] != md5( IPSText::parseCleanValue( $password ) ) )
-		{
-			if ( isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) && $this->blog['blog_settings']['xmlrpc_failedattempts'] > 5 )
-			{
-				$this->blog['blog_settings']['enable_xmlrpc'] = 0;
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = 0;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->DB->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-			else
-			{
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) ? intval($this->blog['blog_settings']['xmlrpc_failedattempts'])+1 : 1;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->DB->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-			$this->error = $this->registry->class_localization->words['blogger_inv_pass'];
-			return false;
-		}
-		else
-		{
-			if ( isset( $this->blog['blog_settings']['xmlrpc_failedattempts'] ) && $this->blog['blog_settings']['xmlrpc_failedattempts'] > 0 )
-			{
-				$this->blog['blog_settings']['xmlrpc_failedattempts'] = 0;
-				$blog_settings = serialize ( $this->blog['blog_settings'] );
-				$this->DB->update( 'blog_blogs', array( 'blog_settings' => $blog_settings ), "blog_id = {$this->blog['blog_id']}" );
-			}
-		}
-		
-		//-----------------------------------------
-		// Set the member data
-		//-----------------------------------------
-		
-		$this->memberData	= $member;
-
-		return true;
-	}
-
-	/**
-	 * _compilePost()
-	 *
-	 * Compiles a blog entry for inserting to the database
-	 *
-	 * @access	private
-	 * @param	array 	$content
-	 * @param	bool	$password
-	 * @return	bool
-	 **/
-	private function _compilePost( $content, $publish )
-	{
-		/* Set a default max post length, if we don't have one */
-		$this->settings['blog_max_entry_length'] = $this->settings['blog_max_entry_length'] ? $this->settings['blog_max_entry_length'] : 2140000;
-
-		/* Check to make sure we have text for this entry */
-		if( strlen( trim( IPSText::br2nl( $content['description'] ) ) ) < 1 )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_emptypost'];
-			return false;
-		}
-		
-		/* Check to make sure that the entry is not too long */
-		if( strlen( $content['description'] ) > ( $this->settings['blog_max_entry_length'] * 1024 ) )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_toolong'];
-			return false;
-		}
-		
-		/* Check the title */
-		$title = $this->pfCleanTopicTitle( $content['title'] );
-		$title = IPSText::getTextClass( 'bbcode' )->stripBadWords( $title );
-
-		if( ! $title )
-		{
-			$this->error = $this->registry->class_localization->words['blogger_notitle'];
-			return false;
-		}
-
-		/* Setup the parser */
-		IPSText::getTextClass('parser')->parse_smilies		= 1;
-		IPSText::getTextClass('parser')->parse_html			= 0;
-		IPSText::getTextClass('parser')->parse_bbcode		= 1;
-		IPSText::getTextClass('parser')->parsing_section	= 'blog_entry';
-		
-		/* Cleanup and parse the entry */
-		$description = preg_replace( "#<br />(\r)?\n#is", "<br />", $content['description'] );
-		
-		/* Time */
-		$dte = time();
-		
-		/* Set the entry */
-		$this->entry = array(
-						'blog_id'			  => $this->blog['blog_id'],
-						'entry_author_id'	  => $this->memberData['member_id'],
-						'entry_author_name'	  => $this->memberData['members_display_name'],
-						'entry_date'		  => $dte,
-						'entry_name'		  => $title,
-						'entry'     		  => IPSText::getTextClass('bbcode')->preDbParse( $description ),
-						'entry_status'		  => ($publish ? 'published' : 'draft'),
-						'entry_post_key'	  => md5(microtime()),
-						'entry_html_state'	  => 0,
-						'entry_use_emo'		  => 1,
-						'entry_last_update'	  => $dte,
-						'entry_gallery_album' => 0,
-						'entry_poll_state'    => 0,
-					 );
-		
-		/* Check for parser errors */
-		$testParse = IPSText::getTextClass('parser')->preDisplayParse( $description );			
-
-		/* Set any parser errors */
-		if( is_array( IPSText::getTextClass('parser')->error ) && count( IPSText::getTextClass('parser')->error ) > 0 )
-		{
-	    	$this->error = implode( " : ", IPSText::getTextClass('parser')->error );
-	    	return false;
-	    }
-
-		return true;
-	}
-	
-	/**
-	 * Clean topic title
-	 *
-	 * @param  string  $title
-	 * @return string
-	 **/
-	public function pfCleanTopicTitle($title="")
-	{
-		if( $this->settings['etfilter_shout'] )
-		{
-			if( function_exists('mb_convert_case') )
-			{
-				if( in_array( strtolower( $this->settings['gb_char_set'] ), array_map( 'strtolower', mb_list_encodings() ) ) )
-				{
-					$title = mb_convert_case( $title, MB_CASE_TITLE, $this->settings['gb_char_set'] );
-				}
-				else
-				{
-					$title = ucwords( mb_strtolower($title) );
-				}
-			}
-			else
-			{
-				$title = ucwords( mb_strtolower($title) );
-			}
-		}
-		
-		$title = IPSText::parseCleanValue( $title );
-		
-		if( $this->settings['etfilter_punct'] )
-		{
-			$title	= preg_replace( "/\?{1,}/"      , "?"    , $title );		
-			$title	= preg_replace( "/(&#33;){1,}/" , "&#33;", $title );
-		}
-
-		//-----------------------------------------
-		// The DB column is 250 chars, so we need to do true mb_strcut, then fix broken HTML entities
-		// This should be fine, as DB would do it regardless (cept we can fix the entities)
-		//-----------------------------------------
-
-		$title = preg_replace( "/&(#{0,}([a-zA-Z0-9]+?)?)?$/", '', IPSText::mbsubstr( $title, 0, 250 ) );
-		
-		$title = IPSText::stripAttachTag( $title );
-		$title = str_replace( "<br />", "", $title  );
-		$title = trim( $title );
-		
-		//$title = IPSText::getTextClass( 'bbcode' )->stripBadWords( $title );
-
-		return $title;
-	}
-	
-	/**
-	 * Blog tracker
-	 *
-	 * @param  integer  $entry_id
-	 * @param  string   $entry_name
-	 * @param  string   $entry
-	 * @return bool
-	 **/
-	public function blogTracker( $entry_id="", $entry_name="", $entry="" )
-	{
-		if( $entry_id == "" )
-		{
-			return TRUE;
-		}
-
-		//-----------------------------------------
-		// We will send these out immediatly (if published)
-		//-----------------------------------------
-
-		$count = 0;
-		$gotem = array();
-
-		$this->DB->build( array( 
-								'select'   => 'bt.tracker_id',
-								'from'     => array( 'blog_tracker' => 'bt' ),
-								'add_join' => array(
-													array( 
-															'select' => 'm.name, m.email, m.member_id, m.language, m.last_activity, m.members_display_name, m.member_group_id, m.mgroup_others',
-															'from'   => array( 'members' => 'm' ),
-															'where'  => "bt.member_id=m.member_id AND m.member_id <> {$this->memberData['member_id']}",
-															'type'   => 'left' 
-														),
-													array( 
-															'select' => 'p.perm_type_id as auth_blog_id',
-															'from'   => array( 'permission_index' => 'p' ),
-															'where'  => "p.perm_type='blog' AND p.perm_type_id=bt.blog_id AND p.authorized_users LIKE '%,{$this->memberData['member_id']},%'",
-															'type'   => 'left' 
-														)  
-												),
-								'where'    => 'bt.blog_id=' . intval( $this->blog['blog_id'] ) . ' AND m.member_id IS NOT NULL'
-						)	);
-
-		$this->DB->execute();
-
-		while( $r = $this->DB->fetch() )
-		{
-			$gotem[ $r['member_id'] ] = $r;
-		}
-
-		//-----------------------------------------
-		// Row, row and parse, parse
-		//-----------------------------------------
-
-		if( count( $gotem ) )
-		{
-			/* Load teh blog templates */
-			$this->lang->loadLanguageFile( array( 'public_emails' ), 'blog' );
-			
-			foreach( $gotem as $r )
-			{
-				if( $this->blog['blog_view_level'] == 'private' || $this->blog['blog_settings']['category_cache'][$this->entry['category_id']]['category_type'] != 'public' )
-				{
-					//-----------------------------------------
-					// Mod?
-					//-----------------------------------------
-					$mod_canviewprivate = 0;
-					if( count( $this->caches['blogmods'] ) )
-					{
-						$mgroups = explode( ',', $r['mgroup_others'] );
-						foreach( $this->caches['blogmods'] as $i => $m )
-						{
-							if( ( $m['moderate_mg_id'] == $r['member_id'] && $m['moderate_type'] == 'member' ) or
-								 ( $m['moderate_mg_id'] == $r['member_group_id'] && $m['moderate_type'] == 'group' ) or
-								 ( in_array($m['moderate_mg_id'], $mgroups) && $m['moderate_type'] == 'group' ) )
-							{
-								$mod_canviewprivate = $m['moderate_can_view_private'];
-							}
-						}
-					}
-
-					if( $this->blog['blog_view_level'] == 'private' && $r['member_id'] != $this->blog['member_id'] && $this->blog['blog_id'] != $r['auth_blog_id'] && ! $mod_canviewprivate )
-					{
-						continue;
-					}
-					
-					if( $this->blog['blog_view_level'] == 'privateclub' && $r['member_id'] != $this->blog['member_id'] && $this->blog['blog_id'] != $r['auth_blog_id'] && ! $mod_canviewprivate )
-					{
-						continue;
-					}
-				}
-
-				$r['language'] = $r['language'] ? $r['language'] : 'en';
-				
-				IPSText::getTextClass('email')->getTemplate( 'subs_new_entry' );
-					
-				IPSText::getTextClass('email')->buildMessage( array(
-																	'BLOG_ID'         => $this->blog['blog_id'],
-																	'BLOG_NAME'		  => $this->blog['blog_name'],
-																	'ENTRY_ID'        => $entry_id,
-																	'ENTRY_NAME'      => $entry_name,
-																	'NAME'            => $r['members_display_name'],
-																	'POSTER'          => $this->memberData['members_display_name'],
-																	'ENTRY'           => $entry,
-															)	);
-
-				//-----------------------------------------
-				// If it is published, mail now, else put it in the tracker queue
-				//-----------------------------------------
-				if( $this->entry['entry_status'] == 'published' )
-				{
-					$this->DB->insert( 'mail_queue', array( 'mail_to' => $r['email'], 'mail_from' => '', 'mail_date' => time(), 'mail_subject' => $this->lang->words['bt_subject'], 'mail_content' => IPSText::getTextClass('email')->message ) );
-					$count++;
-				}
-				else
-				{
-					$this->DB->insert( 'blog_tracker_queue', array( 'blog_id' => $this->blog['blog_id'], 'entry_id' => $entry_id, 'tq_to' => $r['email'], 'tq_subject' => $this->lang->words['bt_subject'], 'tq_content' => IPSText::getTextClass('email')->message ) );
-				}
-			}
-		}
-
-		if( $count > 0 )
-		{
-			//-----------------------------------------
-			// Update cache with remaning email count
-			//-----------------------------------------
-			$cache = $this->caches['systemvars'];
-			$cache['mail_queue'] += $count;
-			$this->cache->setCache( 'systemvars', $cache, array( 'array' => 1 ) );
-		}
-		
-		return TRUE;
-	}
-	
-	/**
-	 * Ping-e-dee-doo
-	 *
-	 * @param  integer  $entry_id
-	 * @param  array    $entry
-	 * @return void
-	 **/
-	public function blogPings( $entry_id, $entry )
-	{
-		if ( $this->settings['blog_allow_pingblogs'] && is_array( $this->blog['blog_settings']['pings'] ) && count( $this->blog['blog_settings']['pings'] ) > 0 )
-		{
-			$ping_added = 0;
-			foreach( $this->blog['blog_settings']['pings'] as $service => $enabled )
-			{
-				if( $enabled )
-				{
-					$updateping['ping_active'] = ( $entry['entry_status']=='published' ? 1 : 0 );
-					$updateping['ping_time'] = time();
-					$updateping['blog_id'] = $this->blog['blog_id'];
-					$updateping['entry_id'] = $entry_id;
-					$updateping['ping_service'] = $service;
-					$this->DB->insert( 'blog_updatepings', $updateping );
-					$ping_added = $updateping['ping_active'] ? 1 : 0;
-				}
-			}
-			
-			if( $ping_added )
-			{
-				// activate task
-				require_once( IPS_ROOT_PATH . 'sources/classes/class_taskmanager.php' );
-				$task = new class_taskmanager( $this->registry );
-
-				$this_task = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_key='blogpings'" ) );
-				$newdate = $task->generateNextRun($this_task);
-				$this->DB->update( 'task_manager', array( 'task_next_run' => $newdate, 'task_enabled' => 1 ), "task_id=".$this_task['task_id'] );
-				$task->saveNextRunStamp();
-			}
-		}
-	}
-	
-
-}
\ No newline at end of file
diff --git a/upload/interface/blog/index.html b/upload/interface/blog/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/interface/blog/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/interface/blog/xmlrpc.php b/upload/interface/blog/xmlrpc.php
deleted file mode 100644
index fe2bffff..00000000
--- a/upload/interface/blog/xmlrpc.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Blog XMLRPC Interface
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Blog
- * @link		http://www.invisionpower.com
- * @version		$Revision: 5713 $
- *
- */
-
-/**
-* Script type
-*
-*/
-define( 'IPB_THIS_SCRIPT', 'api' );
-define( 'IPB_LOAD_SQL'   , 'queries' );
-
-/**
-* Matches IP address of requesting API
-* Set to 0 to not match with IP address
-*/
-define( 'CVG_IP_MATCH', 1 );
-
-require_once( '../../initdata.php' );
-
-//===========================================================================
-// MAIN PROGRAM
-//===========================================================================
-
-define( 'IPS_CLASS_PATH', IPS_ROOT_PATH . 'sources/classes/' );
-
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
-
-//-----------------------------------------
-// Set up cookie stuff
-//-----------------------------------------
-
-$registry = ipsRegistry::instance();
-$registry->init();
-
-IPSCookie::$sensitive_cookies = array( 'session_id', 'ipb_admin_session_id', 'member_id', 'pass_hash' );
-
-//--------------------------------
-//  Set up our vars
-//--------------------------------
-
-$registry->DB()->obj['use_shutdown'] = 0;
-
-//--------------------------------
-// Set debug mode
-//--------------------------------
-
-$registry->DB()->setDebugMode( ipsRegistry::$settings['sql_debug'] == 1 ? intval($_GET['debug']) : 0 );
-
-//===========================================================================
-// Create the XML-RPC Server
-//===========================================================================
-
-require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
-$server		= new classApiServer();
-$api		= $server->decodeRequest();
-
-//===========================================================================
-// Define Service
-//===========================================================================
-
-$valid_api = 0;
-
-switch( $api )
-{
-	case 'blogger':
-		$valid_api = 1;
-	break;
-	
-	case 'wp':
-	case 'metaWeblog':
-		$api = 'metaWeblog';
-		$valid_api = 1;
-	break;
-}
-
-if( $valid_api )
-{
-	require_once( DOC_IPS_ROOT_PATH . 'interface/blog/apis/server_' . strtolower( $api ) . '.php' );
-
-	$webservice = new xmlrpc_server( $registry );
-	$webservice->classApiServer =& $server;
-
-	$server->addObjectMap( $webservice, 'UTF-8' );
-
-	//-----------------------------------------
-	// Process....
-	//-----------------------------------------
-	$server->getXmlRpc();
-}
-else
-{
-	$server->apiSendError( 100, "Requested API not found" );
-}
-
-exit;
\ No newline at end of file
diff --git a/upload/interface/board/avatar_viewer.php b/upload/interface/board/avatar_viewer.php
deleted file mode 100644
index 5a881237..00000000
--- a/upload/interface/board/avatar_viewer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Members
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- *
- */
-//-----------------------------------------
-// Get stuff we need
-//-----------------------------------------
-
-define( 'IPB_THIS_SCRIPT', 'api' );
-define( 'IPB_LOAD_SQL'   , 'queries' );
-
-require_once( '../../initdata.php' );
-
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-$registry = ipsRegistry::instance();
-$registry->init();
-
-$id		= intval(ipsRegistry::$request['id']);
-$member	= IPSMember::load( $id );
-$avatar = IPSMember::buildAvatar( $member );
-
-//-----------------------------------------
-// Print avatar
-//-----------------------------------------
-
-print <<<HTML
-<!DOCTYPE html 
-	     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-	</head>
-	<body>{$avatar}</body>
-	</html>
-HTML;
-
-exit;
\ No newline at end of file
diff --git a/upload/interface/board/index.php b/upload/interface/board/index.php
index 6025cebe..dfd7a6c5 100644
--- a/upload/interface/board/index.php
+++ b/upload/interface/board/index.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Remote API integration gateway file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
@@ -30,14 +30,14 @@ define( 'IPB_LOAD_SQL'   , 'queries' );
 */
 define( 'CVG_IP_MATCH', 1 );
 
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
 //===========================================================================
 // MAIN PROGRAM
 //===========================================================================
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 //-----------------------------------------
 // Set up cookie stuff
@@ -95,7 +95,7 @@ if ( ! ipsRegistry::$settings['xmlrpc_enable'] )
 // Define Service
 //===========================================================================
 
-require_once( IPS_KERNEL_PATH . 'classApiServer.php' );
+require_once( IPS_KERNEL_PATH . 'classApiServer.php' );/*noLibHook*/
 
 //===========================================================================
 // Create the XML-RPC Server
@@ -110,9 +110,9 @@ $user       = IPSText::md5Clean( $server->params['api_key']);
 // Check for module
 //-----------------------------------------
 
-if ( $module AND file_exists( DOC_IPS_ROOT_PATH . 'interface/board/modules/' . $module . '/api.php' ) )
+if ( $module AND is_file( DOC_IPS_ROOT_PATH . 'interface/board/modules/' . $module . '/api.php' ) )
 {
-	require_once( DOC_IPS_ROOT_PATH . 'interface/board/modules/' . $module . '/api.php' );
+	require_once( DOC_IPS_ROOT_PATH . 'interface/board/modules/' . $module . '/api.php' );/*noLibHook*/
 	
 	$webservice = new API_Server( $registry );
 	$webservice->classApiServer =& $server;
diff --git a/upload/interface/board/live.php b/upload/interface/board/live.php
index 0a9e002c..55561982 100644
--- a/upload/interface/board/live.php
+++ b/upload/interface/board/live.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Remote API integration gateway file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
@@ -25,14 +25,14 @@ define( 'IPB_THIS_SCRIPT', 'api' );
 define( 'IPB_LOAD_SQL'   , 'queries' );
 define( 'IPS_PUBLIC_SCRIPT', 'index.php' );
 
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
-//===========================================================================
-// MAIN PROGRAM
-//===========================================================================
+//-----------------------------------------
+// Main code
+//-----------------------------------------
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 $_GET['app']		= 'core';
 $_REQUEST['app']	= 'core';
@@ -40,6 +40,12 @@ $_GET['module']		= 'global';
 $_GET['section']	= 'login';
 $_GET['do']			= 'process';
 
+//-----------------------------------------
+// Ignore auth key for live requests
+//-----------------------------------------
+
+define( 'IGNORE_AUTH_KEY', true );
+
 ipsController::run();
 
 exit();
\ No newline at end of file
diff --git a/upload/interface/board/modules/index.html b/upload/interface/board/modules/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/interface/board/modules/index.html
+++ b/upload/interface/board/modules/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/interface/board/modules/ipb/api.php b/upload/interface/board/modules/ipb/api.php
index 81d41470..c0024fe8 100644
--- a/upload/interface/board/modules/ipb/api.php
+++ b/upload/interface/board/modules/ipb/api.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Remote API Server
- * Last Updated: $Date: 2010-10-23 08:40:34 -0400 (Sat, 23 Oct 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
  * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 7023 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8644 $
  *
  */
 
@@ -22,7 +22,6 @@ class API_Server
 	/**
 	 * Defines the service for WSDL
 	 *
-	 * @access	public
 	 * @var		array
 	 */			
 	public $__dispatch_map = array();
@@ -30,15 +29,13 @@ class API_Server
 	/**
 	 * IPS Global Class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $registry;
+	protected $registry;
 	
 	/**
 	 * IPS API SERVER Class
 	 *
-	 * @access	public
 	 * @var		object
 	 */
 	public $classApiServer;
@@ -46,9 +43,8 @@ class API_Server
 	/**
 	 * Constructor
 	 * 
-	 * @access	public
-	 * @return	void
-	 **/		
+	 * @return	@e void
+	 */		
 	public function __construct( $registry ) 
     {
 		//-----------------------------------------
@@ -62,7 +58,7 @@ class API_Server
 		// list
     	//-----------------------------------------
     	$ALLOWED_METHODS = array();
-		require_once( DOC_IPS_ROOT_PATH . 'interface/board/modules/ipb/methods.php' );
+		require_once( DOC_IPS_ROOT_PATH . 'interface/board/modules/ipb/methods.php' );/*noLibHook*/
 		
 		if ( is_array( $ALLOWED_METHODS ) and count( $ALLOWED_METHODS ) )
 		{
@@ -76,12 +72,11 @@ class API_Server
 	/**
 	 * Returns the list of online users
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param 	string  $api_module		Module
 	 * @param	string	$sep_character	Separator character
 	 * @return	string	xml
-	 **/	
+	 */	
 	public function fetchOnlineUsers( $api_key, $api_module, $sep_character=',' )
 	{
 		//-----------------------------------------
@@ -97,9 +92,9 @@ class API_Server
 		
 		if ( $this->__authenticate( $api_key, $api_module, 'fetchOnlineUsers' ) !== FALSE )
 		{
-			if ( !$this->settings['au_cutoff'] )
+			if ( !ipsRegistry::$settings['au_cutoff'] )
 			{
-				$this->settings[ 'au_cutoff'] =  15 ;
+				ipsRegistry::$settings[ 'au_cutoff'] =  15 ;
 			}
 		 
 			$cut_off = ipsRegistry::$settings['au_cutoff'] * 60;
@@ -148,18 +143,7 @@ class API_Server
 					
 					if ( ! $cached[ $result['member_name'] ] )
 					{
-						if ( ipsRegistry::$settings['spider_anon'] )
-						{
-							if ( $this->registry->member()->getProperty('g_access_cp') )
-							{
-								$active['NAMES'][] = $result['member_name'];
-							}
-						}
-						else
-						{
-							$active['NAMES'][] = $result['member_name'];
-						}
-						
+						$active['NAMES'][] = $result['member_name'];
 						$cached[ $result['member_name'] ] = 1;
 					}
 					else
@@ -191,11 +175,11 @@ class API_Server
 					{
 						$cached[ $result['member_id'] ] = 1;
 
-						$result['member_name'] = IPSLib::makeNameFormatted( $result['member_name'], $result['member_group'] );
+						$result['member_name'] = IPSMember::makeNameFormatted( $result['member_name'], $result['member_group'] );
 						
 						if ( ! ipsRegistry::$settings['disable_anonymous'] AND $result['login_type'] )
 						{
-							if ( $this->registry->member()->getProperty('g_access_cp') and (ipsRegistry::$settings['disable_admin_anon'] != 1) )
+							if ( $this->registry->member()->getProperty('g_access_cp') )
 							{
 								$active['NAMES'][] = "<a href='" . $this->registry->getClass('output')->buildSEOUrl( "showuser={$result['member_id']}", 'public', $result['seo_name'], 'showuser' ) . "' title='$last_date'>{$result['member_name']}</a>*";
 								$active['ANON']++;
@@ -228,7 +212,6 @@ class API_Server
 	/**
 	 * Returns details about the board
 	 * 
-	 * @access	public
 	 * @param	string  $api_key  	Authentication Key
 	 * @param	string  $api_module  Module
 	 * @return	string	xml
@@ -278,7 +261,6 @@ class API_Server
 	/**
 	 * Returns hello board test
 	 * 
-	 * @access	public
 	 * @param	string  $api_key	Authentication Key
 	 * @param	string  $api_module	Module
 	 * @return	string	xml
@@ -320,7 +302,7 @@ class API_Server
 			 												'upload_url'  		  => ipsRegistry::$settings['upload_url'],
 			 												'ipb_img_url' 		  => ipsRegistry::$settings['ipb_img_url'],
 			 												'board_human_version' => $latest_version['upgrade_version_human'],
-															'board_long_version'  => ( isset($latest_version['upgrade_notes']) AND $latest_version['upgrade_notes'] ) ? $latest_version['upgrade_notes'] : ipsRegistry::$vn_full ) );
+															'board_long_version'  => !empty($latest_version['upgrade_notes']) ? $latest_version['upgrade_notes'] : ipsRegistry::$vn_full ) );
 			
 			exit();
 		}
@@ -329,7 +311,6 @@ class API_Server
 	/**
 	 * Posts a topic to the board remotely
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$member_field	Member field to check (valid: "id", "email", "username", "displayname")
@@ -351,7 +332,6 @@ class API_Server
 		$member_field           = IPSText::parseCleanValue( $member_field );
 		$member_key             = IPSText::parseCleanValue( $member_key );
 		$topic_title            = IPSText::parseCleanValue( $topic_title );
-		$topic_description      = IPSText::parseCleanValue( $topic_description );
 		$forum_id			    = intval( $forum_id );
 		$UNCLEANED_post_content = $post_content;
 		
@@ -393,10 +373,9 @@ class API_Server
 			// Get some classes
 			//-----------------------------------------
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php' );
-			$appClass	= new app_class_forums( $this->registry );
+			ipsRegistry::getAppClass( 'forums' );
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 			$_postClass = new $classToLoad( $this->registry );
 			
@@ -419,8 +398,7 @@ class API_Server
 												   'post_htmlstatus' => 0,
 												   'enableTracker'   => 0 ) );
 			$_postClass->setTopicTitle( $topic_title );
-			$_postClass->setTopicDescription( $topic_description );
-			
+
 			# Switch off perm checks
 			$_postClass->setBypassPermissionCheck(true);
 			/**
@@ -449,7 +427,6 @@ class API_Server
 	/**
 	 * Posts a topic reply
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$member_field	Member field to check (valid: "id", "email", "username", "displayname")
@@ -509,10 +486,9 @@ class API_Server
 			// Get some classes
 			//-----------------------------------------
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php' );
-			$appClass	= new app_class_forums( $this->registry );
+			ipsRegistry::getAppClass( 'forums' );
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );
+			require_once( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPost.php' );/*noLibHook*/
 			$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir( 'forums' ) . '/sources/classes/post/classPostForms.php', 'classPostForms', 'forums' );
 			$_postClass = new $classToLoad( $this->registry );
 			
@@ -569,7 +545,6 @@ class API_Server
 	/**
 	 * Returns a member
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$search_type	Member field to check (valid: "id", "email", "username", "displayname")
@@ -629,7 +604,6 @@ class API_Server
 	/**
 	 * Check if a member exists
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$search_type	Member field to check (valid: "id", "email", "username", "displayname")
@@ -681,7 +655,6 @@ class API_Server
 	 * Fetch the forum options list.
 	 * WARNING: Last two options are deprecated and no longer supported. All viewable forums returned. User is automatically treated like a guest.
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$selected_forum_ids	Comma separated list of forum ids
@@ -720,8 +693,7 @@ class API_Server
 			// Get some classes
 			//-----------------------------------------
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php' );
-			$appClass	= new app_class_forums( $this->registry );
+			ipsRegistry::getAppClass( 'forums' );
 
 			//-----------------------------------------
 			// Fetch forum list
@@ -742,7 +714,6 @@ class API_Server
 	 * Returns the board's forums.
 	 * WARNING: Last option is deprecated and no longer supported.  User is automatically treated like a guest.
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$forum_ids		Comma separated list of forum ids
@@ -783,8 +754,7 @@ class API_Server
 			// Get some classes
 			//-----------------------------------------
 
-			require_once( IPSLib::getAppDir( 'forums' ) . '/app_class_forums.php' );
-			$appClass	= new app_class_forums( $this->registry );
+			ipsRegistry::getAppClass( 'forums' );
 
 			//-----------------------------------------
 			// Fetch forum list
@@ -809,7 +779,6 @@ class API_Server
 	/**
 	 * Returns topics based on request params
 	 * 
-	 * @access	public
 	 * @param	string  $api_key		Authentication Key
 	 * @param	string  $api_module		Module
 	 * @param	string	$forum_ids		Comma separated list of forum ids
@@ -858,8 +827,8 @@ class API_Server
 			// Get API classes
 			//-----------------------------------------
 
-			require_once( IPS_ROOT_PATH . '/api/forums/api_topic_view.php' );
-			$topic_view	= new apiTopicView();
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . '/api/forums/api_topic_view.php', 'apiTopicView' );
+			$topic_view	 = new $classToLoad();
 			
 			//-----------------------------------------
 			// Fetch topic list
@@ -881,26 +850,10 @@ class API_Server
 			exit();
 		}
 	}
-	
 
-	
-	/**
-	 * Has to return at least the member ID, member log in key and session ID
-	 *
-	 * @access	private
-	 * @param	array  $member		Array of member information
-	 * @return	array  $session		Session information
-	 * @deprecated	Session is automatically created via instantiating ipsRegistry
-	 */
-	private function __create_user_session( $member )
-	{
-		return $this->registry->member()->fetchMemberData();
-	}
-	
 	/**
 	 * Routine to create a local user account
 	 *
-	 * @access	protected
 	 * @param	string  $email_address		Email address of user logged in
 	 * @param	string  $md5_once_password	The plain text password, hashed once
 	 * @param	string  $ip_address			IP Address of registree
@@ -950,7 +903,6 @@ class API_Server
 	/**
 	 * Checks to see if the request is allowed
 	 * 
-	 * @access	protected
 	 * @param	string	$api_key		Authenticate Key
 	 * @param	string	$api_module		Module
 	 * @param	string	$api_function	Function 
diff --git a/upload/interface/board/modules/ipb/config.php b/upload/interface/board/modules/ipb/config.php
index d1761945..3124a008 100644
--- a/upload/interface/board/modules/ipb/config.php
+++ b/upload/interface/board/modules/ipb/config.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Remote API Server configuration
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:16:34 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 7447 $
  *
  */
 
diff --git a/upload/interface/board/modules/ipb/index.html b/upload/interface/board/modules/ipb/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/interface/board/modules/ipb/index.html
+++ b/upload/interface/board/modules/ipb/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/interface/board/modules/ipb/methods.php b/upload/interface/board/modules/ipb/methods.php
index a12824a8..6e6f5e50 100644
--- a/upload/interface/board/modules/ipb/methods.php
+++ b/upload/interface/board/modules/ipb/methods.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Defines the allowed methods a remote server may request and the in/out parameters
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-17 08:16:34 -0500 (Fri, 17 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 7447 $
  *
  */
 												
diff --git a/upload/interface/chat/index.html b/upload/interface/chat/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/interface/chat/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/interface/chat/parentProxy.html b/upload/interface/chat/parentProxy.html
deleted file mode 100644
index d61a2c1a..00000000
--- a/upload/interface/chat/parentProxy.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Pragma" content="no-cache" />
-	</head>
-	<body id="parentBody"></body>
-    <script type='text/javascript'>
-    	var localLastMessage	= '';
-    	
-    	function localForwardMessage( data )
-    	{
-    		var message = data ? data : document.location.hash;
-
-			if (message.length > 0)
-			{
-				message = message.substr(1);
-				top.ipb.chat.handleMessageFromChild(message);
-			}
-		}
-		
-		function checkLocalLocation()
-		{
-			var message = document.location.hash;
-
-			if( message != localLastMessage )
-			{
-				localLastMessage	= message;
-
-				localForwardMessage();
-			}
-			
-			setTimeout( "checkLocalLocation()", 500 );
-		}
-		
-		setTimeout( "checkLocalLocation()", 500 );
-			
-		//Event.observe( window, 'resize', forwardMessage );
-	</script>
-</html>
\ No newline at end of file
diff --git a/upload/interface/email/index.html b/upload/interface/email/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/interface/email/index.html
+++ b/upload/interface/email/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/interface/email/piping.php b/upload/interface/email/piping.php
index c1336bc1..ea61860d 100644
--- a/upload/interface/email/piping.php
+++ b/upload/interface/email/piping.php
@@ -3,15 +3,15 @@
 /**
  * Invision Power Services
  * Incoming Email Handler - Piping
- * Last Updated: $Date: 2010-10-13 09:41:52 -0400 (Wed, 13 Oct 2010) $
+ * Last Updated: $Date: 2011-08-23 10:24:47 -0400 (Tue, 23 Aug 2011) $
  *
  * @author 		$Author: mark $
  * @copyright	(c) 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		12th February 2010
- * @version		$Revision: 6968 $
+ * @version		$Revision: 9404 $
  */
  
  	$writeDebug	= FALSE;
@@ -20,11 +20,15 @@
  	//--------------------------------------
  	// Init
  	//--------------------------------------
- 	  	
-	$root = $_SERVER['argv'][0] ? $_SERVER['argv'][0] : $_SERVER['SCRIPT_FILENAME'];
-	define( 'DOC_IPS_ROOT_PATH', str_replace( 'interface/email/piping.php', '', $root ) );
+ 	 	 	  	
+	$root = isset( $_SERVER['argv'][0] ) ? $_SERVER['argv'][0] : $_SERVER['SCRIPT_FILENAME'];
+	define( '_DOC_IPS_ROOT_PATH', str_replace( 'interface/email/piping.php', '', $root ) );
 	
-	require_once( DOC_IPS_ROOT_PATH . "initdata.php" );
+	$INFO = array();
+	require_once( _DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
+	define( 'BASE_URL', $INFO['board_url'] );
+	
+	require_once( _DOC_IPS_ROOT_PATH . 'initdata.php' );/*noLibHook*/
 	define( 'IPS_ROOT_PATH', DOC_IPS_ROOT_PATH . CP_DIRECTORY . '/' );
 	define( 'IPS_KERNEL_PATH', DOC_IPS_ROOT_PATH . "ips_kernel/" );
 	
@@ -41,8 +45,11 @@
 		file_put_contents( $debugPath, $email );
 	}
 		
-	require_once ( IPS_KERNEL_PATH . 'classIncomingEmail.php' );
+	require_once ( IPS_KERNEL_PATH . 'classIncomingEmail.php' );/*noLibHook*/
 	$incomingEmail = new classIncomingEmail( $email );
-	$incomingEmail->route();
+	if ( !$incomingEmail->ignore )
+	{
+		@$incomingEmail->route();
+	}
 	
 	exit();
\ No newline at end of file
diff --git a/upload/hooks/index.html b/upload/interface/email/unrouted.txt
similarity index 100%
rename from upload/hooks/index.html
rename to upload/interface/email/unrouted.txt
diff --git a/upload/interface/facebook/images/index.html b/upload/interface/facebook/images/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/interface/facebook/images/index.html
+++ b/upload/interface/facebook/images/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/interface/facebook/index.php b/upload/interface/facebook/index.php
index 9521ce23..02e6d673 100644
--- a/upload/interface/facebook/index.php
+++ b/upload/interface/facebook/index.php
@@ -2,33 +2,33 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Main public executable wrapper.
  * Set-up and load module to run
- * Last Updated: $Date: 2010-06-25 06:36:57 -0400 (Fri, 25 Jun 2010) $
+ * Last Updated: $Date: 2011-07-27 20:58:18 -0400 (Wed, 27 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6574 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9327 $
  *
  */
 
 define( 'IPS_ENFORCE_ACCESS', TRUE );
 define( 'IPB_THIS_SCRIPT', 'public' );
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 $registry = ipsRegistry::instance();
 $registry->init();
 
-require_once( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php' );
-$facebook = new facebook_connect( $registry );
+$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/facebook/connect.php', 'facebook_connect' );
+$facebook = new $classToLoad( $registry );
 
 /* IPB fiddles with CODE to make it DO */
 if ( ! $_REQUEST['code'] AND $_REQUEST['do'] )
@@ -66,12 +66,12 @@ if ( $_REQUEST['code'] )
 			switch( $msg )
 			{
 				default:
-					$registry->getClass('output')->showError( 'fb_ohnoes', 999990, null, null, 403 );
+					$registry->getClass('output')->showError( 'fb_ohnoes', 1090091, null, null, 403 );
 				break;
 				case 'FACEBOOK_NOT_SET_UP':
-					$registry->getClass('output')->showError( 'fb_not_on', 999991, null, null, 403 );
+					$registry->getClass('output')->showError( 'fb_not_on', 1090092, null, null, 403 );
 				case 'NOT_REMOTE_MEMBER':
-					$registry->getClass('output')->showError( 'fb_not_remote', 999992, null, null, 403 );
+					$registry->getClass('output')->showError( 'fb_not_remote', 1090093, null, null, 403 );
 				break;
 			}
 		}
diff --git a/upload/interface/facebook/xd_receiver.php b/upload/interface/facebook/xd_receiver.php
index 75f9bd44..05fb6d40 100644
--- a/upload/interface/facebook/xd_receiver.php
+++ b/upload/interface/facebook/xd_receiver.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * IP.Board v3.2.3
+ * Last Updated: $LastChangedDate: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0.0
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8229 $
  *
  */
  
diff --git a/upload/interface/facebook/xd_receiver_ssl.php b/upload/interface/facebook/xd_receiver_ssl.php
index 5eff930e..3956cc47 100644
--- a/upload/interface/facebook/xd_receiver_ssl.php
+++ b/upload/interface/facebook/xd_receiver_ssl.php
@@ -3,17 +3,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
- * Last Updated: $LastChangedDate: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
+ * IP.Board v3.2.3
+ * Last Updated: $LastChangedDate: 2011-03-31 06:17:44 -0400 (Thu, 31 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		3.0.0
- * @version		$Rev: 5713 $
+ * @version		$Rev: 8229 $
  *
  */
  
diff --git a/upload/interface/index.html b/upload/interface/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/interface/index.html
+++ b/upload/interface/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/interface/mobile/index.php b/upload/interface/mobile/index.php
index 2d424914..9f2b290b 100644
--- a/upload/interface/mobile/index.php
+++ b/upload/interface/mobile/index.php
@@ -2,32 +2,33 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Mobile API
- * Last Updated: $Date: 2010-08-11 11:54:57 -0400 (Wed, 11 Aug 2010) $
+ * Last Updated: $Date: 2011-07-07 16:40:12 -0400 (Thu, 07 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mat $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6743 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9182 $
  *
  */
 
+define( 'IPS_IS_MOBILE_APP', true );
 define( 'IPB_THIS_SCRIPT', 'public' );
-require_once( '../../initdata.php' );
+
+require_once( '../../initdata.php' );/*noLibHook*/
 		
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 class mobileApiRequest
 {
 	/**#@+
 	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
 	 * @var		object
 	 */
 	protected $registry;
@@ -43,9 +44,8 @@ class mobileApiRequest
 	/**
 	 * Make the registry shortcuts
 	 *
-	 * @access	public
 	 * @param	object	ipsRegistry reference
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
@@ -64,8 +64,7 @@ class mobileApiRequest
 	/**
 	 * Figure out what api is being called
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function dispatch()
 	{
@@ -103,6 +102,14 @@ class mobileApiRequest
 				$this->_handlePostStatus();
 			break;
 			
+			case 'postTopic':
+				$this->_handlePostTopic();
+			break;
+			
+			case 'postReply':
+				$this->_handlePostReply();
+			break;
+			
 			default:
 				$this->_invalidApi();
 			break;
@@ -140,7 +147,7 @@ class mobileApiRequest
 		$_data = $notifyLibrary->fetchUnreadNotifications( 10, 'notify_sent', 'DESC', $unreadOnly, true );
 
 		/* XML Parser */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( 'utf-8' );
 		$xml->newXMLDocument();
 		
@@ -192,7 +199,7 @@ class mobileApiRequest
 		$notifyLibrary->setMember( $this->memberData );
 
 		/* Notifications Data */
-		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig( $this->memberData );
 
 		if( $notifyStatus )
 		{
@@ -241,7 +248,7 @@ class mobileApiRequest
 		}
 		
 		/* Check to see if notifications are enabled */
-		if( ! IPSLib::canReceiveMobileNotifications() )
+		if( ! IPSMember::canReceiveMobileNotifications() )
 		{
 			$this->_returnError( "You are not authorized to receive mobile notifications" );
 		}
@@ -261,7 +268,7 @@ class mobileApiRequest
 	protected function _handleNotificationTypes()
 	{
 		/* Check to see if notifications are enabled */
-		if( ! IPSLib::canReceiveMobileNotifications() )
+		if( ! IPSMember::canReceiveMobileNotifications() )
 		{
 			$this->_returnError( "You are not authorized to receive mobile notifications" );
 		}
@@ -277,7 +284,7 @@ class mobileApiRequest
 		/* Options */
 		$_basicOptions	= array( array( 'email', $this->lang->words['notopt__email'] ), array( 'pm', $this->lang->words['notopt__pm'] ), array( 'inline', $this->lang->words['notopt__inline'] ), array( 'mobile', $this->lang->words['notopt__mobile'] ) );
 		$_configOptions	= $notifyLibrary->getNotificationData( TRUE );
-		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig();
+		$_notifyConfig	= $notifyLibrary->getMemberNotificationConfig( $this->memberData );
 		$_defaultConfig	= $notifyLibrary->getDefaultNotificationConfig();
 		$_formOptions	= array();
 		
@@ -326,7 +333,7 @@ class mobileApiRequest
 			
 			//$_formOptions[ $option['key'] ]['options']		= $_available;
 			
-			$_formOptions[ $option['key'] ]['defaults']		= $_thisConfig['selected'];
+			$_formOptions[ $option['key'] ]['defaults']		= is_array($_thisConfig['selected']) ? $_thisConfig['selected'] : array();
 			$_formOptions[ $option['key'] ]['disabled']		= 0;
 			
 			//-----------------------------------------
@@ -337,7 +344,7 @@ class mobileApiRequest
 			if( $_defaultConfig[ $option['key'] ]['disable_override'] )
 			{
 				$_formOptions[ $option['key'] ]['disabled']		= 1;
-				$_formOptions[ $option['key'] ]['defaults']		= $_defaultConfig[ $option['key'] ]['selected'];
+				$_formOptions[ $option['key'] ]['defaults']		= is_array($_defaultConfig[ $option['key'] ]['selected']) ? $_defaultConfig[ $option['key'] ]['selected'] : array();
 			}
 		}
 		
@@ -350,7 +357,7 @@ class mobileApiRequest
 		);
 		
 		/* XML Parser */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( 'utf-8' );
 		$xml->newXMLDocument();
 		
@@ -423,6 +430,12 @@ class mobileApiRequest
 	 */
 	protected function _handleLogin()
 	{
+		/* 3.2 upwards renames these fields, but since we do this prior to getting capabilities, we don't know version yet */
+		$this->request['ips_username'] = ipsRegistry::$request['ips_username'] = $this->request['username'];
+		$_REQUEST['ips_username'] = $_REQUEST['username'];
+		$this->request['ips_password'] = ipsRegistry::$request['ips_password'] = $this->request['password'];
+		$_REQUEST['ips_password'] = $_REQUEST['password'];
+		
 		/* Load the login handler */
 		$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/handlers/han_login.php', 'han_login' );
 		$this->han_login = new $classToLoad( $this->registry );
@@ -447,6 +460,8 @@ class mobileApiRequest
 										'facebook'			=> IPSLib::fbc_enabled() && $this->han_login->member_data['fb_uid'] ? '1' : '0',
 										'twitter'			=> IPSLib::twitter_enabled() && $this->han_login->member_data['twitter_id'] ? '1' : '0',
     									'albums'			=> $this->_userAlbums( $this->han_login->member_data ),
+    									'version_id'		=> ipsRegistry::$vn_full,
+    									'version_text'		=> ipsRegistry::$version,
 										'form_hash'			=> md5( $this->han_login->member_data['email'].'&'.$this->han_login->member_data['member_login_key'].'&'.$this->han_login->member_data['joined'] )
     						)	);
 		}
@@ -460,7 +475,7 @@ class mobileApiRequest
 	protected function _userEnabledNotifications( $memberData )
 	{
 		/* Check to see if notifications are enabled */
-		if( ! IPSLib::canReceiveMobileNotifications( $memberData ) )
+		if( ! IPSMember::canReceiveMobileNotifications( $memberData ) )
 		{
 			return 0;
 		}
@@ -507,8 +522,8 @@ class mobileApiRequest
 		/* Load status class */
 		if ( ! $this->registry->isClassLoaded( 'memberStatus' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/member/status.php' );
-			$this->registry->setClass( 'memberStatus', new memberStatus( ipsRegistry::instance() ) );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
+			$this->registry->setClass( 'memberStatus', new $classToLoad( ipsRegistry::instance() ) );
 		}
 		
 		return $this->registry->getClass('memberStatus')->canCreate( $memberData ) ? '1' : '0';
@@ -522,41 +537,25 @@ class mobileApiRequest
 	 */
 	protected function _userAlbums( $memberData )
 	{
+		$albums = array();
+		
 		/* Make sure we have gallery */
 		if( ! IPSLib::appIsInstalled( 'gallery' ) )
 		{
 			return array();
 		}
 		
-		/* Libs */
-		define( 'GALLERY_LIBS', IPS_ROOT_PATH . '/applications_addon/ips/gallery/sources/libs/' );
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('gallery') . '/sources/classes/gallery.php', 'ipsGallery', 'gallery' );
+		$this->registry->setClass( 'gallery', new $classToLoad( $this->registry ) );
 		
-		/* Gallery Object */
-		require_once( GALLERY_LIBS . 'lib_gallery.php' );
-		$this->registry->setClass( 'glib', new lib_gallery( $this->registry ) );
+		/* Fetch albums */
+		$_albums = $this->registry->gallery->helper('albums')->fetchAlbumsByOwner( $memberData['member_id'] );
 		
-		/* Load the category object */
-		require_once( GALLERY_LIBS . 'lib_categories.php' );
-		$this->registry->setClass( 'category', new lib_categories( $this->registry ) );
-		$this->registry->category->normalInit();
-		
-		$this->registry->glib->category = $this->registry->category;
-
-		/* Album Library */
-		require_once( GALLERY_LIBS . 'lib_albums.php' );
-		$this->albums = new lib_albums( $this->registry );
-
-		/* Get a list of user albums */
-		$this->albums->fetchAlbumsByOwner( $memberData['member_id'] );
-		
-		/* Build Albums */
-		$albums = array();
-		
-		foreach( $this->albums->album_lookup as $r )
+		foreach( $_albums as $id => $data )
 		{
-			$albums[] = array( 'id' => $r['id'], 'name' => $r['name'] );
+			$albums[] = array( 'id' => $id, 'name' => $data['album_name'] );
 		}
-		
+		 
 		return $albums;
 	}
 	
@@ -585,129 +584,26 @@ class mobileApiRequest
 			$this->_returnError( "Gallery has been disabled" );
 		}
 		
-		/* Libs */
-		define( 'GALLERY_LIBS', IPS_ROOT_PATH . '/applications_addon/ips/gallery/sources/libs/' );
-		
-		/* Gallery Object */
-		require_once( GALLERY_LIBS . 'lib_gallery.php' );
-		$this->registry->setClass( 'glib', new lib_gallery( $this->registry ) );
-		
-		/* Load the category object */
-		require_once( GALLERY_LIBS . 'lib_categories.php' );
-		$this->registry->setClass( 'category', new lib_categories( $this->registry ) );
-		$this->registry->category->normalInit();
-		
-		$this->registry->glib->category = $this->registry->category;
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('gallery') . '/sources/classes/gallery.php', 'ipsGallery', 'gallery' );
+		$this->registry->setClass( 'gallery', new $classToLoad( $this->registry ) );
 		
 		/* Get the album */
 		$albumId = intval( $this->request['album'] );
 		
-		$this->album = $this->registry->glib->fetchAlbumInfo( $albumId );
+		$album = $this->registry->gallery->helper('albums')->fetchAlbumsById( $albumId );
 		
-		/* Check the album owner */
-		if( $this->album['member_id'] != $this->memberData['member_id'] )
+		if ( ! $this->registry->gallery->helper('albums')->isUploadable( $album ) )
 		{
 			$this->_returnError( "You are not allowed to upload images to that album" );
 		}
 		
-		/* Check album limits */
-		if( $this->memberData['g_img_album_limit'] )
-		{
-			$count = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) AS total', 'from' => 'gallery_images', 'where' => "album_id={$albumId}" ) );
-
-			if( $count['total'] >= $this->memberData['g_img_album_limit'] )
-			{
-				$this->_returnError( "You can not upload any more images to that album" );
-			}
-		}
-		
-		if( empty( $this->request['caption'] ) )
-		{
-			$this->request['caption'] = IPSText::parseCleanValue( $_FILES['image']['name'] );
-		}
-		
 		/* Get upload settings */
-		$settings = $this->getUploadSettings();
+		$settings = $this->getUploadSettings( $album );
 		
-		/* Process the file */
-		$new_file_info 	= $this->registry->glib->processUploadedFile( 'image', $settings['thumb'], $settings['watermark'], $settings['container'], $settings['allow_media'], $settings['allow_images'] );
-		
-		//-------------------------------------------------------------
-		// Insert information into the database
-		//-------------------------------------------------------------
-
-		$insert = array( 	'member_id'			=> $this->memberData['member_id'],
-							'category_id'		=> 0,
-							'album_id'			=> $albumId,
-							'caption'			=> $this->request['caption'],
-							'description'		=> $this->request['description'],
-							'approved'			=> $settings['approve'],
-							'thumbnail'			=> $settings['thumbnail'],
-							'views'				=> 0,
-							'comments'			=> 0,
-							'idate'				=> time(),
-							'ratings_total'		=> 0,
-							'ratings_count'		=> 0,
-							'caption_seo'		=> IPSText::makeSeoTitle( $this->request['caption'] ),
-							'image_notes'		=> '',
-						);
-
-		$insert = array_merge( $insert, $new_file_info );
-
-		//-------------------------------------------------------------
-		// Check copyright data
-		//-------------------------------------------------------------
-
-		if( $this->settings['gallery_allow_usercopyright'] != 'disabled' )
-		{
-			$insert['copyright'] = $this->settings['gallery_allow_usercopyright'] == '1' ? ( $this->request['copyright'] ? $this->request['copyright'] : $this->settings['gallery_copyright_default'] ) : $this->settings['gallery_copyright_default'];
-		}	
-
-		//-------------------------------------------------------
-		// Do the insert
-		//-------------------------------------------------------
-
-		$this->DB->insert( 'gallery_images', $insert );
-		
-		if( ! $this->memberData['has_gallery'] )
-		{
-			$this->DB->update( 'members', array( 'has_gallery' => 1 ), "member_id={$this->memberData['member_id']}" );
-		}
-
-		$pid = $this->DB->getInsertId();
-		
-		if( $this->request['notify'] )
-		{
-			$this->DB->insert( 'gallery_subscriptions', array(
-																	'sub_mid'	=> $this->memberData['member_id'],
-																	'sub_type'	=> 'image',
-																	'sub_toid'	=> $pid,
-																	'sub_added'	=> time()
-																)
-								);
-		}
-		
-		//------------------------------------------------------------
-		// Need to update the parents, if they exist and this is a category
-		//------------------------------------------------------------
-
-		$this->registry->glib->reSyncEverything( $insert['category_id'], $insert['album_id'] );
-		
-		if( $insert['approved'] )
-		{
-			require_once( GALLERY_LIBS . 'lib_notifications.php' );
-			$notify 			= new lib_notifications( $this->registry );
-			$notify->category	= $this->category;
-			
-			if( $insert['album_id'] )
-			{
-				$notify->sendAlbumNotifications( $insert['album_id'] );
-			}
-			else
-			{
-				$notify->sendCatNotifications( $insert['category_id'] );
-			}
-		}
+		/* Upload it */
+		$this->registry->gallery->helper('upload')->addImage( 'image', $albumId, array( 'title'       => $this->request['caption'],
+																						'description' => $this->request['description'],
+																						'approved'    => $settings['approved'] ) );
 		
 		exit();
 	}
@@ -733,12 +629,12 @@ class mobileApiRequest
 		/* Load status class */
 		if ( ! $this->registry->isClassLoaded( 'memberStatus' ) )
 		{
-			require_once( IPS_ROOT_PATH . 'sources/classes/member/status.php' );
-			$this->registry->setClass( 'memberStatus', new memberStatus( ipsRegistry::instance() ) );
+			$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/member/status.php', 'memberStatus' );
+			$this->registry->setClass( 'memberStatus', new $classToLoad( ipsRegistry::instance() ) );
 		}
 		
-		require_once( IPS_KERNEL_PATH . 'classAjax.php' );
-		$this->ajax = new classAjax();
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classAjax.php', 'classAjax' );
+		$this->ajax  = new $classToLoad();
 		
 		/* Got content? */
 		if( !trim( $this->ajax->convertAndMakeSafe( $_POST['content'] ) ) )
@@ -772,6 +668,129 @@ class mobileApiRequest
 		exit;
 	}
 	
+	/**
+	 * Handle posting a new topic
+	 * 
+	 * @return	string		XML
+	 */
+	protected function _handlePostTopic()
+	{
+		/* Check the form hash */
+		if( $this->member->form_hash != $this->request['form_hash'] )
+		{
+			$this->_returnError( "Invalid Request" );
+		}
+		
+		$topic_forum = intval( $this->request['f'] );
+		
+		ipsRegistry::getAppClass( 'forums' );
+		
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/post/classPost.php', 'classPost' );
+		$this->registry->setClass( 'classPost', new $classToLoad( ipsRegistry::instance() ) );
+		
+		$this->registry->getClass('class_forums')->strip_invisible = true;
+		$this->registry->getClass('class_forums')->forumsInit();
+		
+		$this->registry->classPost->setIsPreview( false );
+		$this->registry->classPost->setForumData( $this->registry->getClass('class_forums')->forum_by_id[ $topic_forum ] );
+		$this->registry->classPost->setForumID( $topic_forum );
+		$this->registry->classPost->setTopicTitle( $_POST['title'] );
+		$this->registry->classPost->setPostContent( $_POST['body'] );
+		$this->registry->classPost->setAuthor( $this->memberData['member_id'] );
+		$this->registry->classPost->setPublished( true );
+		$this->registry->classPost->setSettings( array( 'enableSignature' => 1,
+											   'enableEmoticons' => 1,
+											   'post_htmlstatus' => 0,
+											   'enableTracker'   => 0 ) );
+		
+		try {
+			if ( $this->registry->classPost->addTopic() === FALSE ) {
+				$this->_returnError( "Topic could not be posted: " . $this->registry->classPost->getPostError() );
+			} else {
+				$topic_id = $this->registry->classPost->getTopicData( 'tid' );
+			}
+		} catch ( Exception $ex ) {
+			$this->_returnError( "Error posting topic: " . $ex->getMessage() );
+		}
+		
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+		$xml = new classXML( 'utf-8' );
+		$xml->newXMLDocument();
+		
+		$xml->addElement( 'topic' );
+		$xml->addElementAsRecord( 'topic', 'info', array( 'topic_id'	=>	$topic_id ) );
+		
+		echo $xml->fetchDocument();
+		exit();
+	}
+	
+	/**
+	 * Handle posting a new reply
+	 * 
+	 * @return	string		XML
+	 */
+	protected function _handlePostReply()
+	{
+		/* Check the form hash */
+		if( $this->member->form_hash != $this->request['form_hash'] )
+		{
+			$this->_returnError( "Invalid Request" );
+		}
+		
+		$topic_forum = intval( $this->request['f'] );
+		$topic_topic = intval( $this->request['t'] );
+		
+		ipsRegistry::getAppClass( 'forums' );
+		
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('forums') . '/sources/classes/post/classPost.php', 'classPost' );
+		$this->registry->setClass( 'classPost', new $classToLoad( ipsRegistry::instance() ) );
+		
+		$this->registry->getClass('class_forums')->strip_invisible = true;
+		$this->registry->getClass('class_forums')->forumsInit();
+		
+		//-----------------------------------------
+		// Need the topic...
+		//-----------------------------------------
+			
+		$topic	= $this->registry->DB()->buildAndFetch( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid=' . $topic_topic ) );
+		
+		$this->registry->classPost->setIsPreview( false );
+		$this->registry->classPost->setForumData( $this->registry->getClass('class_forums')->forum_by_id[ $topic_forum ] );
+		$this->registry->classPost->setForumID( $topic_forum );
+		$this->registry->classPost->setTopicID( $topic_topic );
+		$this->registry->classPost->setTopicData( $topic );
+		$this->registry->classPost->setTopicTitle( $_POST['title'] );
+		$this->registry->classPost->setPostContent( $_POST['body'] );
+		$this->registry->classPost->setAuthor( $this->memberData['member_id'] );
+		$this->registry->classPost->setPublished( true );
+		$this->registry->classPost->setSettings( array( 'enableSignature' => 1,
+											   'enableEmoticons' => 1,
+											   'post_htmlstatus' => 0,
+											   'enableTracker'   => 0 ) );
+		
+		try {
+			if ( $this->registry->classPost->addReply() === FALSE ) {
+				$this->_returnError( "Reply could not be posted: " . $this->registry->classPost->getPostError() );
+			} else {
+				$topic_id = $this->registry->classPost->getTopicData( 'tid' );
+				$post_id = $this->registry->classPost->getPostData( 'pid' );
+			}
+		} catch ( Exception $ex ) {
+			$this->_returnError( "Error posting reply: " . $ex->getMessage() );
+		}
+		
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
+		$xml = new classXML( 'utf-8' );
+		$xml->newXMLDocument();
+		
+		$xml->addElement( 'topic' );
+		$xml->addElementAsRecord( 'topic', 'info', array( 'topic_id'	=>	$topic_id ) );
+		$xml->addElementAsRecord( 'topic', 'info', array( 'post_id'		=>	$post_id ) );
+		
+		echo $xml->fetchDocument();
+		exit();
+	}
+	
 	/**
 	 * Send an error about the selected api
 	 *
@@ -786,12 +805,12 @@ class mobileApiRequest
 	 * Sends an error message in xml
 	 *
 	 * @param	string	$msg
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _returnError( $msg )
 	{
 		/* XML Parser */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( 'utf-8' );
 		$xml->newXMLDocument();
 		
@@ -808,12 +827,12 @@ class mobileApiRequest
 	 * Sends forum data in xml format
 	 *
 	 * @param	array	$dataArray
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _returnXml( $dataArray )
 	{
 		/* XML Parser */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$xml = new classXML( 'utf-8' );
 		$xml->newXMLDocument();
 		
@@ -837,6 +856,9 @@ class mobileApiRequest
 			}
 		}
 		
+		$xml->addElementAsRecord( 'forum', 'version', array( 'version_id' => $dataArray['version_id'] ) );
+		$xml->addElementAsRecord( 'forum', 'version', array( 'version_text' => $dataArray['version_text'] ) );
+		
 		/* Output */
 		echo $xml->fetchDocument();
 		exit();
@@ -845,62 +867,22 @@ class mobileApiRequest
 	/**
 	 * Returns settings used for uploading images
 	 *
-	 * @access	protected
+	 * @param	array		Album array
 	 * @return	array
 	 */
-	protected function getUploadSettings()
+	protected function getUploadSettings( $album=array() )
 	{
-		//-----------------------------------
-		// Category Settings
-		//-----------------------------------
+		$classToLoad = IPSLib::loadLibrary( IPSLib::getAppDir('gallery') . '/sources/classes/gallery.php', 'ipsGallery', 'gallery' );
+		$this->registry->setClass( 'gallery', new $classToLoad( $this->registry ) );
 		
-		if( $this->cat )
-		{
-			$thumb     = ( $this->cat['thumbnail'] && $this->settings['gallery_create_thumbs'] ) ? 1 : 0;
-			$watermark = $this->cat['watermark_images'];
-
-			if ( !$this->memberData['g_movies'] OR !$this->cat['allow_movies'] )  
-        	{
-        		$allow_media = 0;
-        	}
-        	else
-        	{
-        		$allow_media = 1;
-        	}
-
-			$container      = $this->cat['id'];
-			$html           = ( $this->cat['allow_html'] AND $this->memberData['g_dohtml'] ) ? 1 : 0 ;
-			$approve_images = $this->cat['approve_images'] ? 0 : 1;
-			$code           = $this->cat['allow_ibfcode'];
-			$allow_images	= $this->cat['allow_images'];
-		}
-		
-		//-----------------------------------
-		// Album Settings
-		//-----------------------------------
-		
-		else
-		{
-			$cat			= $this->registry->category->cat_lookup[ $this->album['category_id'] ];
-
-			$thumb          = ( $cat['thumbnail'] && $this->settings['gallery_create_thumbs'] ) ? 1 : 0;
-			$watermark      = ( $cat['watermark_images'] && $this->settings['gallery_watermark_path'] ) ? 1 : 0;
-			$allow_media 	= ( $cat['allow_movies'] && $this->memberData['g_movies'] ) ? 1 : 0;
-			$container      = $this->album['id'];
-			$html           = ( $cat['allow_html'] && $this->memberData['g_dohtml'] ) ? 1 : 0 ;
-			$approve_images = ( $cat['approve_images'] ) ? 0 : 1;
-			$code           = ( $cat['allow_ibfcode'] ) ? 1 : 0;
-			$allow_images	= $cat['allow_images'] ? 1 : 0;
-		}
-
-		return array( 	'thumb'     	=> $thumb,
-						'watermark' 	=> $watermark,
-						'html'      	=> $html,
-						'code'			=> $code,
-						'allow_media' 	=> $allow_media,
-						'approve'   	=> $approve_images,
-						'container' 	=> $container,
-						'allow_images'	=> $allow_images,
+		return array( 	'thumb'     	=> 1,
+						'watermark' 	=> ( $this->settings['gallery_watermark_path'] ) ? 1 : 0,
+						'html'      	=> 0,
+						'code'			=> 1,
+						'allow_media' 	=> $this->registry->gallery->helper('media')->allow( $this->memberData['member_id'] ),
+						'approve'   	=> ( $this->registry->gallery->helper('albums')->isGlobal( $album ) && $album['album_g_approve_img'] ) ? 1 : 0,
+						'container' 	=> $album['album_id'],
+						'allow_images'	=> 1,
 					);
 	}
 }
diff --git a/upload/interface/twitter/index.php b/upload/interface/twitter/index.php
index b0706ba0..ccdbb275 100644
--- a/upload/interface/twitter/index.php
+++ b/upload/interface/twitter/index.php
@@ -2,33 +2,33 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Main public executable wrapper.
  * Set-up and load module to run
- * Last Updated: $Date: 2010-06-16 04:32:48 -0400 (Wed, 16 Jun 2010) $
+ * Last Updated: $Date: 2011-07-27 20:58:18 -0400 (Wed, 27 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6540 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 9327 $
  *
  */
 
 define( 'IPS_ENFORCE_ACCESS', TRUE );
 define( 'IPB_THIS_SCRIPT', 'public' );
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 $registry = ipsRegistry::instance();
 $registry->init();
 
-require_once( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php' );
-$twitter = new twitter_connect( $registry );
+$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/twitter/connect.php', 'twitter_connect' );
+$twitter = new $classToLoad( $registry );
 
 if ( $_REQUEST['oauth_token'] )
 {
@@ -53,12 +53,12 @@ if ( $_REQUEST['oauth_token'] )
 			switch( $msg )
 			{
 				default:
-					$registry->getClass('output')->showError( 'twit_ohnoes', 99999, null, null, 403 );
+					$registry->getClass('output')->showError( 'twit_ohnoes', 1090094, null, null, 403 );
 				break;
 				case 'TWITTER_NOT_SET_UP':
-					$registry->getClass('output')->showError( 'twit_not_on', 99999, null, null, 403 );
+					$registry->getClass('output')->showError( 'twit_not_on', 1090095, null, null, 403 );
 				case 'NOT_REMOTE_MEMBER':
-					$registry->getClass('output')->showError( 'twit_not_remote', 99999, null, null, 403 );
+					$registry->getClass('output')->showError( 'twit_not_remote', 1090096, null, null, 403 );
 				break;
 			}
 		}
diff --git a/upload/interface/vkontakte/index.php b/upload/interface/vkontakte/index.php
index 93ad35aa..f54c1287 100644
--- a/upload/interface/vkontakte/index.php
+++ b/upload/interface/vkontakte/index.php
@@ -2,60 +2,75 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.0 Beta 2
+ * IP.Board v3.2.0 Beta 1
  * Main public executable wrapper.
  * Set-up and load module to run
- * Last Updated: $Date: 2010-01-22 03:41:36 -0500 (Fri, 22 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5738 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
 define( 'IPS_ENFORCE_ACCESS', TRUE );
 define( 'IPB_THIS_SCRIPT', 'public' );
-require_once( '../../initdata.php' );
+require_once( '../../initdata.php' );/*noLibHook*/
 
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 $registry = ipsRegistry::instance();
 $registry->init();
 
-require_once( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php' );
-$vk = new vkontakte_connect( $registry );
+$classToLoad = IPSLib::loadLibrary( IPS_ROOT_PATH . 'sources/classes/vkontakte/connect.php', 'vkontakte_connect' );
+$vkontakte = new $classToLoad( $registry );
 
-if ( $_REQUEST['key'] )
+if ( $_REQUEST['code'] )
 {
-	try
+	/* From the log in page */
+	if ( $_REQUEST['key'] )
 	{
-		$vk->finishLogin();
-	}
-	catch( Exception $error )
-	{
-		$msg = $error->getMessage();
-	
-		switch( $msg )
+		try
 		{
-			default:
-				$registry->getClass('output')->showError( 'twit_ohnoes', 99999, null, null, 403 );
-			break;
-			case 'TWITTER_NOT_SET_UP':
-				$registry->getClass('output')->showError( 'twit_not_on', 99999, null, null, 403 );
-			case 'NOT_REMOTE_MEMBER':
-				$registry->getClass('output')->showError( 'twit_not_remote', 99999, null, null, 403 );
-			break;
+			if ( ! intval( $_REQUEST['m'] ) )
+			{
+				$vkontakte->finishLogin();
+			}
+			else
+			{
+				$vkontakte->finishConnection();
+			}
 		}
+		catch( Exception $error )
+		{
+			$msg = $error->getMessage();
+		
+			switch( $msg )
+			{
+				default:
+					$registry->getClass('output')->showError( 'twit_ohnoes', 99999, null, null, 403 );
+				break;
+				case 'TWITTER_NOT_SET_UP':
+					$registry->getClass('output')->showError( 'twit_not_on', 99999, null, null, 403 );
+				case 'NOT_REMOTE_MEMBER':
+					$registry->getClass('output')->showError( 'twit_not_remote', 99999, null, null, 403 );
+				break;
+			}
+		}
+	}
+	else
+	{
+		$vkontakte->finishConnection();
 	}
 }
 else
 {
-	$vk->redirectToConnectPage();
+	$vkontakte->redirectToConnectPage();
 }
 
 exit();
\ No newline at end of file
diff --git a/upload/interface/vkontakte/xd_receiver.htm b/upload/interface/vkontakte/xd_receiver.htm
deleted file mode 100644
index e6cc17d3..00000000
--- a/upload/interface/vkontakte/xd_receiver.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Open API XD Receiver</title>
-  </head>
-  <body>
-    <script src="http://vkontakte.ru/js/api/xd_receiver.js" type="text/javascript"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/FirePHPCore/FirePHP.class.php b/upload/ips_kernel/FirePHPCore/FirePHP.class.php
index 733d2b4d..3289c9c8 100644
--- a/upload/ips_kernel/FirePHPCore/FirePHP.class.php
+++ b/upload/ips_kernel/FirePHPCore/FirePHP.class.php
@@ -6,7 +6,7 @@
  * 
  * Software License Agreement (New BSD License)
  * 
- * Copyright (c) 2006-2008, Christoph Dorn
+ * Copyright (c) 2006-2010, Christoph Dorn
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification,
@@ -36,12 +36,27 @@
  * 
  * ***** END LICENSE BLOCK *****
  * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
+ * @copyright       Copyright (C) 2007-2009 Christoph Dorn
+ * @author          Christoph Dorn <christoph@christophdorn.com>
+ * @license         http://www.opensource.org/licenses/bsd-license.php
+ * @package         FirePHPCore
  */
- 
+
+/**
+ * @see http://code.google.com/p/firephp/issues/detail?id=112
+ */
+if (!defined('E_STRICT')) {
+    define('E_STRICT', 2048);
+}
+if (!defined('E_RECOVERABLE_ERROR')) {
+    define('E_RECOVERABLE_ERROR', 4096);
+}
+if (!defined('E_DEPRECATED')) {
+    define('E_DEPRECATED', 8192);
+}
+if (!defined('E_USER_DEPRECATED')) {
+    define('E_USER_DEPRECATED', 16384);
+} 
  
 /**
  * Sends the given data to the FirePHP Firefox Extension.
@@ -50,1326 +65,1720 @@
  * 
  * For more information see: http://www.firephp.org/
  * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
+ * @copyright       Copyright (C) 2007-2009 Christoph Dorn
+ * @author          Christoph Dorn <christoph@christophdorn.com>
+ * @license         http://www.opensource.org/licenses/bsd-license.php
+ * @package         FirePHPCore
  */
 class FirePHP {
+
+    /**
+     * FirePHP version
+     *
+     * @var string
+     */
+    const VERSION = '0.3';    // @pinf replace '0.3' with '%%package.version%%'
+
+    /**
+     * Firebug LOG level
+     *
+     * Logs a message to firebug console.
+     * 
+     * @var string
+     */
+    const LOG = 'LOG';
   
-  /**
-   * FirePHP version
-   *
-   * @var string
-   */
-  const VERSION = '0.2.1';
-  
-  /**
-   * Firebug LOG level
-   *
-   * Logs a message to firebug console.
-   * 
-   * @var string
-   */
-  const LOG = 'LOG';
-  
-  /**
-   * Firebug INFO level
-   *
-   * Logs a message to firebug console and displays an info icon before the message.
-   * 
-   * @var string
-   */
-  const INFO = 'INFO';
-  
-  /**
-   * Firebug WARN level
-   *
-   * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
-   * 
-   * @var string
-   */
-  const WARN = 'WARN';
-  
-  /**
-   * Firebug ERROR level
-   *
-   * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
-   * 
-   * @var string
-   */
-  const ERROR = 'ERROR';
-  
-  /**
-   * Dumps a variable to firebug's server panel
-   *
-   * @var string
-   */
-  const DUMP = 'DUMP';
-  
-  /**
-   * Displays a stack trace in firebug console
-   *
-   * @var string
-   */
-  const TRACE = 'TRACE';
-  
-  /**
-   * Displays an exception in firebug console
-   * 
-   * Increments the firebug error count.
-   *
-   * @var string
-   */
-  const EXCEPTION = 'EXCEPTION';
-  
-  /**
-   * Displays an table in firebug console
-   *
-   * @var string
-   */
-  const TABLE = 'TABLE';
-  
-  /**
-   * Starts a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_START = 'GROUP_START';
-  
-  /**
-   * Ends a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_END = 'GROUP_END';
-  
-  /**
-   * Singleton instance of FirePHP
-   *
-   * @var FirePHP
-   */
-  protected static $instance = null;
-  
-  /**
-   * Wildfire protocol message index
-   *
-   * @var int
-   */
-  protected $messageIndex = 1;
+    /**
+     * Firebug INFO level
+     *
+     * Logs a message to firebug console and displays an info icon before the message.
+     * 
+     * @var string
+     */
+    const INFO = 'INFO';
     
-  /**
-   * Options for the library
-   * 
-   * @var array
-   */
-  protected $options = array();
-  
-  /**
-   * Filters used to exclude object members when encoding
-   * 
-   * @var array
-   */
-  protected $objectFilters = array();
-  
-  /**
-   * A stack of objects used to detect recursion during object encoding
-   * 
-   * @var object
-   */
-  protected $objectStack = array();
-  
-  /**
-   * Flag to enable/disable logging
-   * 
-   * @var boolean
-   */
-  protected $enabled = true;
-  
-  /**
-   * The object constructor
-   */
-  function __construct() {
-    $this->options['maxObjectDepth'] = 10;
-    $this->options['maxArrayDepth'] = 20;
-    $this->options['useNativeJsonEncode'] = true;
-    $this->options['includeLineNumbers'] = true;
-  }
+    /**
+     * Firebug WARN level
+     *
+     * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
+     * 
+     * @var string
+     */
+    const WARN = 'WARN';
     
-  /**
-   * When the object gets serialized only include specific object members.
-   * 
-   * @return array
-   */  
-  public function __sleep() {
-    return array('options','objectFilters','enabled');
-  }
+    /**
+     * Firebug ERROR level
+     *
+     * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
+     * 
+     * @var string
+     */
+    const ERROR = 'ERROR';
     
-  /**
-   * Gets singleton instance of FirePHP
-   *
-   * @param boolean $AutoCreate
-   * @return FirePHP
-   */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
-      self::init();
-    }
-    return self::$instance;
-  }
-   
-  /**
-   * Creates FirePHP object and stores it for singleton access
-   *
-   * @return FirePHP
-   */
-  public static function init() {
-    return self::$instance = new self();
-  }
-  
-  /**
-   * Enable and disable logging to Firebug
-   * 
-   * @param boolean $Enabled TRUE to enable, FALSE to disable
-   * @return void
-   */
-  public function setEnabled($Enabled) {
-    $this->enabled = $Enabled;
-  }
-  
-  /**
-   * Check if logging is enabled
-   * 
-   * @return boolean TRUE if enabled
-   */
-  public function getEnabled() {
-    return $this->enabled;
-  }
-  
-  /**
-   * Specify a filter to be used when encoding an object
-   * 
-   * Filters are used to exclude object members.
-   * 
-   * @param string $Class The class name of the object
-   * @param array $Filter An array or members to exclude
-   * @return void
-   */
-  public function setObjectFilter($Class, $Filter) {
-    $this->objectFilters[$Class] = $Filter;
-  }
-  
-  /**
-   * Set some options for the library
-   * 
-   * Options:
-   *  - maxObjectDepth: The maximum depth to traverse objects (default: 10)
-   *  - maxArrayDepth: The maximum depth to traverse arrays (default: 20)
-   *  - useNativeJsonEncode: If true will use json_encode() (default: true)
-   *  - includeLineNumbers: If true will include line numbers and filenames (default: true)
-   * 
-   * @param array $Options The options to be set
-   * @return void
-   */
-  public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
-  }
-  
-  /**
-   * Register FirePHP as your error handler
-   * 
-   * Will throw exceptions for each php error.
-   */
-  public function registerErrorHandler()
-  {
-    //NOTE: The following errors will not be caught by this error handler:
-    //      E_ERROR, E_PARSE, E_CORE_ERROR,
-    //      E_CORE_WARNING, E_COMPILE_ERROR,
-    //      E_COMPILE_WARNING, E_STRICT
+    /**
+     * Dumps a variable to firebug's server panel
+     *
+     * @var string
+     */
+    const DUMP = 'DUMP';
     
-    set_error_handler(array($this,'errorHandler'));     
-  }
+    /**
+     * Displays a stack trace in firebug console
+     *
+     * @var string
+     */
+    const TRACE = 'TRACE';
+    
+    /**
+     * Displays an exception in firebug console
+     * 
+     * Increments the firebug error count.
+     *
+     * @var string
+     */
+    const EXCEPTION = 'EXCEPTION';
+    
+    /**
+     * Displays an table in firebug console
+     *
+     * @var string
+     */
+    const TABLE = 'TABLE';
+    
+    /**
+     * Starts a group in firebug console
+     * 
+     * @var string
+     */
+    const GROUP_START = 'GROUP_START';
+    
+    /**
+     * Ends a group in firebug console
+     * 
+     * @var string
+     */
+    const GROUP_END = 'GROUP_END';
+    
+    /**
+     * Singleton instance of FirePHP
+     *
+     * @var FirePHP
+     */
+    protected static $instance = null;
+    
+    /**
+     * Flag whether we are logging from within the exception handler
+     * 
+     * @var boolean
+     */
+    protected $inExceptionHandler = false;
+    
+    /**
+     * Flag whether to throw PHP errors that have been converted to ErrorExceptions
+     * 
+     * @var boolean
+     */
+    protected $throwErrorExceptions = true;
+    
+    /**
+     * Flag whether to convert PHP assertion errors to Exceptions
+     * 
+     * @var boolean
+     */
+    protected $convertAssertionErrorsToExceptions = true;
+    
+    /**
+     * Flag whether to throw PHP assertion errors that have been converted to Exceptions
+     * 
+     * @var boolean
+     */
+    protected $throwAssertionExceptions = false;
 
-  /**
-   * FirePHP's error handler
-   * 
-   * Throws exception for each php error that will occur.
-   *
-   * @param int $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param int $errline
-   * @param array $errcontext
-   */
-  public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-  {
-    // Don't throw exception if error reporting is switched off
-    if (error_reporting() == 0) {
-      return;
+    /**
+     * Wildfire protocol message index
+     *
+     * @var int
+     */
+    protected $messageIndex = 1;
+    
+    /**
+     * Options for the library
+     * 
+     * @var array
+     */
+    protected $options = array('maxDepth' => 10,
+                               'maxObjectDepth' => 5,
+                               'maxArrayDepth' => 5,
+                               'useNativeJsonEncode' => true,
+                               'includeLineNumbers' => true);
+
+    /**
+     * Filters used to exclude object members when encoding
+     * 
+     * @var array
+     */
+    protected $objectFilters = array(
+        'firephp' => array('objectStack', 'instance', 'json_objectStack'),
+        'firephp_test_class' => array('objectStack', 'instance', 'json_objectStack')
+    );
+
+    /**
+     * A stack of objects used to detect recursion during object encoding
+     * 
+     * @var object
+     */
+    protected $objectStack = array();
+
+    /**
+     * Flag to enable/disable logging
+     * 
+     * @var boolean
+     */
+    protected $enabled = true;
+
+    /**
+     * The insight console to log to if applicable
+     * 
+     * @var object
+     */
+    protected $logToInsightConsole = null;
+
+    /**
+     * When the object gets serialized only include specific object members.
+     * 
+     * @return array
+     */  
+    public function __sleep()
+    {
+        return array('options','objectFilters','enabled');
     }
-    // Only throw exceptions for errors we are asking for
-    if (error_reporting() & $errno) {
-      throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-    }
-  }
-  
-  /**
-   * Register FirePHP as your exception handler
-   */
-  public function registerExceptionHandler()
-  {
-    set_exception_handler(array($this,'exceptionHandler'));     
-  }
-  
-  /**
-   * FirePHP's exception handler
-   * 
-   * Logs all exceptions to your firebug console and then stops the script.
-   *
-   * @param Exception $Exception
-   * @throws Exception
-   */
-  function exceptionHandler($Exception) {
-    $this->fb($Exception);
-  }
-  
-  /**
-   * Set custom processor url for FirePHP
-   *
-   * @param string $URL
-   */    
-  public function setProcessorUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-ProcessorURL', $URL);
-  }
-
-  /**
-   * Set custom renderer url for FirePHP
-   *
-   * @param string $URL
-   */
-  public function setRendererUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-RendererURL', $URL);
-  }
-  
-  /**
-   * Start a group for following messages
-   *
-   * @param string $Name
-   * @return true
-   * @throws Exception
-   */
-  public function group($Name) {
-    return $this->fb(null, $Name, FirePHP::GROUP_START);
-  }
-  
-  /**
-   * Ends a group you have started before
-   *
-   * @return true
-   * @throws Exception
-   */
-  public function groupEnd() {
-    return $this->fb(null, null, FirePHP::GROUP_END);
-  }
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::LOG
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function log($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::LOG);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::INFO
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function info($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::INFO);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::WARN
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function warn($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::WARN);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::ERROR
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function error($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::ERROR);
-  } 
-
-  /**
-   * Dumps key and variable to firebug server panel
-   *
-   * @see FirePHP::DUMP
-   * @param string $Key
-   * @param mixed $Variable
-   * @return true
-   * @throws Exception
-   */
-  public function dump($Key, $Variable) {
-    return $this->fb($Variable, $Key, FirePHP::DUMP);
-  }
-  
-  /**
-   * Log a trace in the firebug console
-   *
-   * @see FirePHP::TRACE
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function trace($Label) {
-    return $this->fb($Label, FirePHP::TRACE);
-  } 
-
-  /**
-   * Log a table in the firebug console
-   *
-   * @see FirePHP::TABLE
-   * @param string $Label
-   * @param string $Table
-   * @return true
-   * @throws Exception
-   */
-  public function table($Label, $Table) {
-    return $this->fb($Table, $Label, FirePHP::TABLE);
-  }
-  
-  /**
-   * Check if FirePHP is installed on client
-   *
-   * @return boolean
-   */
-  public function detectClientExtension() {
-    /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
-      return false;
-    }
-    return true;    
-  }
- 
-  /**
-   * Log varible to Firebug
-   * 
-   * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
-   * @throws Exception
-   */
-  public function fb($Object) {
-  
-    if(!$this->enabled) {
-      return false;
-    }
-  
-    if (headers_sent($filename, $linenum)) {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
-    }
-  
-    $Type = null;
-    $Label = null;
-  
-    if(func_num_args()==1) {
-    } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
-        case self::LOG:
-        case self::INFO:
-        case self::WARN:
-        case self::ERROR:
-        case self::DUMP:
-        case self::TRACE:
-        case self::EXCEPTION:
-        case self::TABLE:
-        case self::GROUP_START:
-        case self::GROUP_END:
-          $Type = func_get_arg(1);
-          break;
-        default:
-          $Label = func_get_arg(1);
-          break;
-      }
-    } else
-    if(func_num_args()==3) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-    } else {
-      throw $this->newException('Wrong number of arguments to fb() function!');
-    }
-  
-  
-    if(!$this->detectClientExtension()) {
-      return false;
-    }
-  
-    $meta = array();
-    $skipFinalObjectEncode = false;
-  
-    if($Object instanceof Exception) {
-
-      $meta['file'] = $this->_escapeTraceFile($Object->getFile());
-      $meta['line'] = $Object->getLine();
-      
-      $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
-         && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
-         && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
-           
-        $severity = false;
-        switch($Object->getSeverity()) {
-          case E_WARNING: $severity = 'E_WARNING'; break;
-          case E_NOTICE: $severity = 'E_NOTICE'; break;
-          case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
-          case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
-          case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
-          case E_STRICT: $severity = 'E_STRICT'; break;
-          case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
-          case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
-          case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
+    
+    /**
+     * Gets singleton instance of FirePHP
+     *
+     * @param boolean $AutoCreate
+     * @return FirePHP
+     */
+    public static function getInstance($AutoCreate = false)
+    {
+        if ($AutoCreate===true && !self::$instance) {
+            self::init();
         }
-           
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
-        $skipFinalObjectEncode = true;
-      } else {
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'throw',
-                        'Trace'=>$this->_escapeTrace($trace));
-        $skipFinalObjectEncode = true;
-      }
-      $Type = self::EXCEPTION;
-      
-    } else
-    if($Type==self::TRACE) {
-      
-      $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+        return self::$instance;
+    }
+    
+    /**
+     * Creates FirePHP object and stores it for singleton access
+     *
+     * @return FirePHP
+     */
+    public static function init()
+    {
+        return self::setInstance(new self());
+    }
 
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-          /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-        } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-          /* Skip fb() */
-        } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
-                          'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+    /**
+     * Set the instance of the FirePHP singleton
+     * 
+     * @param FirePHP $instance The FirePHP object instance
+     * @return FirePHP
+     */
+    public static function setInstance($instance)
+    {
+        return self::$instance = $instance;
+    }
 
-          $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-          break;
+    /**
+     * Set an Insight console to direct all logging calls to
+     * 
+     * @param object $console The console object to log to
+     * @return void
+     */
+    public function setLogToInsightConsole($console)
+    {
+        if(is_string($console)) {
+            if(get_class($this)!='FirePHP_Insight' && !is_subclass_of($this, 'FirePHP_Insight')) {
+                throw new Exception('FirePHP instance not an instance or subclass of FirePHP_Insight!');
+            }
+            $this->logToInsightConsole = $this->to('request')->console($console);
+        } else {
+            $this->logToInsightConsole = $console;
         }
-      }
+    }
 
-    } else
-    if($Type==self::TABLE) {
-      
-      if(isset($Object[0]) && is_string($Object[0])) {
-        $Object[1] = $this->encodeTable($Object[1]);
-      } else {
-        $Object = $this->encodeTable($Object);
-      }
-
-      $skipFinalObjectEncode = true;
-      
-    } else {
-      if($Type===null) {
-        $Type = self::LOG;
-      }
+    /**
+     * Enable and disable logging to Firebug
+     * 
+     * @param boolean $Enabled TRUE to enable, FALSE to disable
+     * @return void
+     */
+    public function setEnabled($Enabled)
+    {
+       $this->enabled = $Enabled;
     }
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
-
-        $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
-  
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-            /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-          } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip fb() */
-          } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip FB::fb() */
-          } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-            break;
-          }
-        }      
-      
-      }
-    } else {
-      unset($meta['file']);
-      unset($meta['line']);
-    }
-
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
- 
-    $structure_index = 1;
-    if($Type==self::DUMP) {
-      $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
-    } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-    }
-  
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
-    } else {
-      $msg_meta = array('Type'=>$Type);
-      if($Label!==null) {
-        $msg_meta['Label'] = $Label;
-      }
-      if(isset($meta['file'])) {
-        $msg_meta['File'] = $meta['file'];
-      }
-      if(isset($meta['line'])) {
-        $msg_meta['Line'] = $meta['line'];
-      }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+    /**
+     * Check if logging is enabled
+     * 
+     * @return boolean TRUE if enabled
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
     }
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+    /**
+     * Specify a filter to be used when encoding an object
+     * 
+     * Filters are used to exclude object members.
+     * 
+     * @param string $Class The class name of the object
+     * @param array $Filter An array of members to exclude
+     * @return void
+     */
+    public function setObjectFilter($Class, $Filter)
+    {
+        $this->objectFilters[strtolower($Class)] = $Filter;
+    }
+  
+    /**
+     * Set some options for the library
+     * 
+     * Options:
+     *  - maxDepth: The maximum depth to traverse (default: 10)
+     *  - maxObjectDepth: The maximum depth to traverse objects (default: 5)
+     *  - maxArrayDepth: The maximum depth to traverse arrays (default: 5)
+     *  - useNativeJsonEncode: If true will use json_encode() (default: true)
+     *  - includeLineNumbers: If true will include line numbers and filenames (default: true)
+     * 
+     * @param array $Options The options to be set
+     * @return void
+     */
+    public function setOptions($Options)
+    {
+        $this->options = array_merge($this->options,$Options);
+    }
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
-        
-        $part = $parts[$i];
-        if ($part) {
-            
-            if(count($parts)>2) {
-              // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
+    /**
+     * Get options from the library
+     *
+     * @return array The currently set options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Set an option for the library
+     * 
+     * @param string $Name
+     * @param mixed $Value
+     * @throws Exception
+     * @return void
+     */  
+    public function setOption($Name, $Value)
+    {
+        if (!isset($this->options[$Name])) {
+            throw $this->newException('Unknown option: ' . $Name);
+        }
+        $this->options[$Name] = $Value;
+    }
+
+    /**
+     * Get an option from the library
+     *
+     * @param string $Name
+     * @throws Exception
+     * @return mixed
+     */
+    public function getOption($Name)
+    {
+        if (!isset($this->options[$Name])) {
+            throw $this->newException('Unknown option: ' . $Name);
+        }
+        return $this->options[$Name];
+    }
+
+    /**
+     * Register FirePHP as your error handler
+     * 
+     * Will throw exceptions for each php error.
+     * 
+     * @return mixed Returns a string containing the previously defined error handler (if any)
+     */
+    public function registerErrorHandler($throwErrorExceptions = false)
+    {
+        //NOTE: The following errors will not be caught by this error handler:
+        //      E_ERROR, E_PARSE, E_CORE_ERROR,
+        //      E_CORE_WARNING, E_COMPILE_ERROR,
+        //      E_COMPILE_WARNING, E_STRICT
+    
+        $this->throwErrorExceptions = $throwErrorExceptions;
+    
+        return set_error_handler(array($this,'errorHandler'));     
+    }
+
+    /**
+     * FirePHP's error handler
+     * 
+     * Throws exception for each php error that will occur.
+     *
+     * @param int $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int $errline
+     * @param array $errcontext
+     */
+    public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+        // Don't throw exception if error reporting is switched off
+        if (error_reporting() == 0) {
+            return;
+        }
+        // Only throw exceptions for errors we are asking for
+        if (error_reporting() & $errno) {
+
+            $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
+            if ($this->throwErrorExceptions) {
+                throw $exception;
             } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
-            }
-            
-            $this->messageIndex++;
-            
-            if ($this->messageIndex > 99999) {
-                throw new Exception('Maximum number (99,999) of messages reached!');             
+                $this->fb($exception);
             }
         }
     }
-
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
-
-    return true;
-  }
   
-  /**
-   * Standardizes path for windows systems.
-   *
-   * @param string $Path
-   * @return string
-   */
-  protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
-  }
-  
-  /**
-   * Escape trace path for windows systems
-   *
-   * @param array $Trace
-   * @return array
-   */
-  protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
-        $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
-      }
-      if(isset($Trace[$i]['args'])) {
-        $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
-      }
+    /**
+     * Register FirePHP as your exception handler
+     * 
+     * @return mixed Returns the name of the previously defined exception handler,
+     *               or NULL on error.
+     *               If no previous handler was defined, NULL is also returned.
+     */
+    public function registerExceptionHandler()
+    {
+        return set_exception_handler(array($this,'exceptionHandler'));     
     }
-    return $Trace;    
-  }
   
-  /**
-   * Escape file information of trace for windows systems
-   *
-   * @param string $File
-   * @return string
-   */
-  protected function _escapeTraceFile($File) {
-    /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
-      /* First strip down to single \ */
-      
-      $file = preg_replace('/\\\\+/','\\',$File);
-      
-      return $file;
-    }
-    return $File;
-  }
-
-  /**
-   * Send header
-   *
-   * @param string $Name
-   * @param string_type $Value
-   */
-  protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
-  }
-
-  /**
-   * Get user agent
-   *
-   * @return string|false
-   */
-  protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
-    return $_SERVER['HTTP_USER_AGENT'];
-  }
-
-  /**
-   * Returns a new exception
-   *
-   * @param string $Message
-   * @return Exception
-   */
-  protected function newException($Message) {
-    return new Exception($Message);
-  }
-  
-  /**
-   * Encode an object into a JSON string
-   * 
-   * Uses PHP's jeson_encode() if available
-   * 
-   * @param object $Object The object to be encoded
-   * @return string The JSON string
-   */
-  public function jsonEncode($Object, $skipObjectEncode=false)
-  {
-    if(!$skipObjectEncode) {
-      $Object = $this->encodeObject($Object);
-    }
+    /**
+     * FirePHP's exception handler
+     * 
+     * Logs all exceptions to your firebug console and then stops the script.
+     *
+     * @param Exception $Exception
+     * @throws Exception
+     */
+    function exceptionHandler($Exception)
+    {
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
-
-      return json_encode($Object);
-    } else {
-      return $this->json_encode($Object);
-    }
-  }
-  
-  /**
-   * Encodes a table by encoding each row and column with encodeObject()
-   * 
-   * @param array $Table The table to be encoded
-   * @return array
-   */  
-  protected function encodeTable($Table) {
-    if(!$Table) return $Table;
-    for( $i=0 ; $i<count($Table) ; $i++ ) {
-      if(is_array($Table[$i])) {
-        for( $j=0 ; $j<count($Table[$i]) ; $j++ ) {
-          $Table[$i][$j] = $this->encodeObject($Table[$i][$j]);
+        $this->inExceptionHandler = true;
+    
+        header('HTTP/1.1 500 Internal Server Error');
+    
+        try {
+            $this->fb($Exception);
+        } catch (Exception $e) {
+            echo 'We had an exception: ' . $e;
         }
-      }
+        $this->inExceptionHandler = false;
     }
-    return $Table;
-  }
   
-  /**
-   * Encodes an object including members with
-   * protected and private visibility
-   * 
-   * @param Object $Object The object to be encoded
-   * @param int $Depth The current traversal depth
-   * @return array All members of the object
-   */
-  protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
-  {
-    $return = array();
-
-    if (is_resource($Object)) {
-
-      return '** '.(string)$Object.' **';
-
-    } else    
-    if (is_object($Object)) {
-
-        if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+    /**
+     * Register FirePHP driver as your assert callback
+     * 
+     * @param boolean $convertAssertionErrorsToExceptions
+     * @param boolean $throwAssertionExceptions
+     * @return mixed Returns the original setting or FALSE on errors
+     */
+    public function registerAssertionHandler($convertAssertionErrorsToExceptions = true, $throwAssertionExceptions = false)
+    {
+        $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
+        $this->throwAssertionExceptions = $throwAssertionExceptions;
+        
+        if ($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+            throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
         }
         
-        foreach ($this->objectStack as $refVal) {
-            if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
+        return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
+    }
+  
+    /**
+     * FirePHP's assertion handler
+     *
+     * Logs all assertions to your firebug console and then stops the script.
+     *
+     * @param string $file File source of assertion
+     * @param int    $line Line source of assertion
+     * @param mixed  $code Assertion code
+     */
+    public function assertionHandler($file, $line, $code)
+    {
+        if ($this->convertAssertionErrorsToExceptions) {
+          
+          $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+    
+          if ($this->throwAssertionExceptions) {
+              throw $exception;
+          } else {
+              $this->fb($exception);
+          }
+        
+        } else {
+            $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+        }
+    }
+  
+    /**
+     * Start a group for following messages.
+     * 
+     * Options:
+     *   Collapsed: [true|false]
+     *   Color:     [#RRGGBB|ColorName]
+     *
+     * @param string $Name
+     * @param array $Options OPTIONAL Instructions on how to log the group
+     * @return true
+     * @throws Exception
+     */
+    public function group($Name, $Options = null)
+    {
+    
+        if (!$Name) {
+            throw $this->newException('You must specify a label for the group!');
+        }
+        
+        if ($Options) {
+            if (!is_array($Options)) {
+                throw $this->newException('Options must be defined as an array!');
+            }
+            if (array_key_exists('Collapsed', $Options)) {
+                $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
             }
         }
-        array_push($this->objectStack, $Object);
+        
+        return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
+    }
+  
+    /**
+     * Ends a group you have started before
+     *
+     * @return true
+     * @throws Exception
+     */
+    public function groupEnd()
+    {
+        return $this->fb(null, null, FirePHP::GROUP_END);
+    }
+
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::LOG
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public function log($Object, $Label = null, $Options = array())
+    {
+        return $this->fb($Object, $Label, FirePHP::LOG, $Options);
+    } 
+
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::INFO
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public function info($Object, $Label = null, $Options = array())
+    {
+        return $this->fb($Object, $Label, FirePHP::INFO, $Options);
+    } 
+
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::WARN
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public function warn($Object, $Label = null, $Options = array())
+    {
+        return $this->fb($Object, $Label, FirePHP::WARN, $Options);
+    } 
+
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::ERROR
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public function error($Object, $Label = null, $Options = array())
+    {
+        return $this->fb($Object, $Label, FirePHP::ERROR, $Options);
+    } 
+
+    /**
+     * Dumps key and variable to firebug server panel
+     *
+     * @see FirePHP::DUMP
+     * @param string $Key
+     * @param mixed $Variable
+     * @return true
+     * @throws Exception
+     */
+    public function dump($Key, $Variable, $Options = array())
+    {
+        if (!is_string($Key)) {
+            throw $this->newException('Key passed to dump() is not a string');
+        }
+        if (strlen($Key)>100) {
+            throw $this->newException('Key passed to dump() is longer than 100 characters');
+        }
+        if (!preg_match_all('/^[a-zA-Z0-9-_\.:]*$/', $Key, $m)) {
+            throw $this->newException('Key passed to dump() contains invalid characters [a-zA-Z0-9-_\.:]');
+        }
+        return $this->fb($Variable, $Key, FirePHP::DUMP, $Options);
+    }
+  
+    /**
+     * Log a trace in the firebug console
+     *
+     * @see FirePHP::TRACE
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public function trace($Label)
+    {
+        return $this->fb($Label, FirePHP::TRACE);
+    } 
+
+    /**
+     * Log a table in the firebug console
+     *
+     * @see FirePHP::TABLE
+     * @param string $Label
+     * @param string $Table
+     * @return true
+     * @throws Exception
+     */
+    public function table($Label, $Table, $Options = array())
+    {
+        return $this->fb($Table, $Label, FirePHP::TABLE, $Options);
+    }
+
+    /**
+     * Insight API wrapper
+     * 
+     * @see Insight_Helper::to()
+     */
+    public static function to()
+    {
+        $instance = self::getInstance();
+        if (!method_exists($instance, "_to")) {
+            throw new Exception("FirePHP::to() implementation not loaded");
+        }
+        $args = func_get_args();
+        return call_user_func_array(array($instance, '_to'), $args);
+    }
+
+    /**
+     * Insight API wrapper
+     * 
+     * @see Insight_Helper::plugin()
+     */
+    public static function plugin()
+    {
+        $instance = self::getInstance();
+        if (!method_exists($instance, "_plugin")) {
+            throw new Exception("FirePHP::plugin() implementation not loaded");
+        }
+        $args = func_get_args();
+        return call_user_func_array(array($instance, '_plugin'), $args);
+    }
+
+    /**
+     * Check if FirePHP is installed on client
+     *
+     * @return boolean
+     */
+    public function detectClientExtension()
+    {
+        // Check if FirePHP is installed on client via User-Agent header
+        if (@preg_match_all('/\sFirePHP\/([\.\d]*)\s?/si',$this->getUserAgent(),$m) &&
+           version_compare($m[1][0],'0.0.6','>=')) {
+            return true;
+        } else
+        // Check if FirePHP is installed on client via X-FirePHP-Version header
+        if (@preg_match_all('/^([\.\d]*)$/si',$this->getRequestHeader("X-FirePHP-Version"),$m) &&
+           version_compare($m[1][0],'0.0.6','>=')) {
+            return true;
+        }
+        return false;
+    }
+ 
+    /**
+     * Log varible to Firebug
+     * 
+     * @see http://www.firephp.org/Wiki/Reference/Fb
+     * @param mixed $Object The variable to be logged
+     * @return true Return TRUE if message was added to headers, FALSE otherwise
+     * @throws Exception
+     */
+    public function fb($Object)
+    {
+        if($this instanceof FirePHP_Insight && method_exists($this, '_logUpgradeClientMessage')) {
+            if(!FirePHP_Insight::$upgradeClientMessageLogged) {    // avoid infinite recursion as _logUpgradeClientMessage() logs a message
+                $this->_logUpgradeClientMessage();
+            }
+        }
+
+        static $insightGroupStack = array();
+
+        if (!$this->getEnabled()) {
+            return false;
+        }
+
+        if ($this->headersSent($filename, $linenum)) {
+            // If we are logging from within the exception handler we cannot throw another exception
+            if ($this->inExceptionHandler) {
+                // Simply echo the error out to the page
+                echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
+            } else {
+                throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+            }
+        }
+      
+        $Type = null;
+        $Label = null;
+        $Options = array();
+      
+        if (func_num_args()==1) {
+        } else
+        if (func_num_args()==2) {
+            switch(func_get_arg(1)) {
+                case self::LOG:
+                case self::INFO:
+                case self::WARN:
+                case self::ERROR:
+                case self::DUMP:
+                case self::TRACE:
+                case self::EXCEPTION:
+                case self::TABLE:
+                case self::GROUP_START:
+                case self::GROUP_END:
+                    $Type = func_get_arg(1);
+                    break;
+                default:
+                    $Label = func_get_arg(1);
+                    break;
+            }
+        } else
+        if (func_num_args()==3) {
+            $Type = func_get_arg(2);
+            $Label = func_get_arg(1);
+        } else
+        if (func_num_args()==4) {
+            $Type = func_get_arg(2);
+            $Label = func_get_arg(1);
+            $Options = func_get_arg(3);
+        } else {
+            throw $this->newException('Wrong number of arguments to fb() function!');
+        }
+
+        if($this->logToInsightConsole!==null && (get_class($this)=='FirePHP_Insight' || is_subclass_of($this, 'FirePHP_Insight'))) {
+            $msg = $this->logToInsightConsole;
+            if ($Object instanceof Exception) {
+                $Type = self::EXCEPTION;
+            }
+            if($Label && $Type!=self::TABLE && $Type!=self::GROUP_START) {
+                $msg = $msg->label($Label);
+            }
+            switch($Type) {
+                case self::DUMP:
+                case self::LOG:
+                    return $msg->log($Object);
+                case self::INFO:
+                    return $msg->info($Object);
+                case self::WARN:
+                    return $msg->warn($Object);
+                case self::ERROR:
+                    return $msg->error($Object);
+                case self::TRACE:
+                    return $msg->trace($Object);
+                case self::EXCEPTION:
+                	return $this->plugin('engine')->handleException($Object, $msg);
+                case self::TABLE:
+                    if (isset($Object[0]) && !is_string($Object[0]) && $Label) {
+                        $Object = array($Label, $Object);
+                    }
+                    return $msg->table($Object[0], array_slice($Object[1],1), $Object[1][0]);
+                case self::GROUP_START:
+                	$insightGroupStack[] = $msg->group(md5($Label))->open();
+                    return $msg->log($Label);
+                case self::GROUP_END:
+                	if(count($insightGroupStack)==0) {
+                	    throw new Error('Too many groupEnd() as opposed to group() calls!');
+                	}
+                	$group = array_pop($insightGroupStack);
+                    return $group->close();
+	            default:
+                    return $msg->log($Object);
+            }
+        }
+
+        if (!$this->detectClientExtension()) {
+            return false;
+        }
+      
+        $meta = array();
+        $skipFinalObjectEncode = false;
+      
+        if ($Object instanceof Exception) {
+    
+            $meta['file'] = $this->_escapeTraceFile($Object->getFile());
+            $meta['line'] = $Object->getLine();
+          
+            $trace = $Object->getTrace();
+            if ($Object instanceof ErrorException
+               && isset($trace[0]['function'])
+               && $trace[0]['function']=='errorHandler'
+               && isset($trace[0]['class'])
+               && $trace[0]['class']=='FirePHP') {
+               
+                $severity = false;
+                switch($Object->getSeverity()) {
+                    case E_WARNING: $severity = 'E_WARNING'; break;
+                    case E_NOTICE: $severity = 'E_NOTICE'; break;
+                    case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
+                    case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
+                    case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
+                    case E_STRICT: $severity = 'E_STRICT'; break;
+                    case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
+                    case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
+                    case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
+                }
+                   
+                $Object = array('Class'=>get_class($Object),
+                                'Message'=>$severity.': '.$Object->getMessage(),
+                                'File'=>$this->_escapeTraceFile($Object->getFile()),
+                                'Line'=>$Object->getLine(),
+                                'Type'=>'trigger',
+                                'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+                $skipFinalObjectEncode = true;
+            } else {
+                $Object = array('Class'=>get_class($Object),
+                                'Message'=>$Object->getMessage(),
+                                'File'=>$this->_escapeTraceFile($Object->getFile()),
+                                'Line'=>$Object->getLine(),
+                                'Type'=>'throw',
+                                'Trace'=>$this->_escapeTrace($trace));
+                $skipFinalObjectEncode = true;
+            }
+            $Type = self::EXCEPTION;
+          
+        } else
+        if ($Type==self::TRACE) {
+          
+            $trace = debug_backtrace();
+            if (!$trace) return false;
+            for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+    
+                if (isset($trace[$i]['class'])
+                   && isset($trace[$i]['file'])
+                   && ($trace[$i]['class']=='FirePHP'
+                       || $trace[$i]['class']=='FB')
+                   && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+                       || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+                    /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+                } else
+                if (isset($trace[$i]['class'])
+                   && isset($trace[$i+1]['file'])
+                   && $trace[$i]['class']=='FirePHP'
+                   && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+                    /* Skip fb() */
+                } else
+                if ($trace[$i]['function']=='fb'
+                   || $trace[$i]['function']=='trace'
+                   || $trace[$i]['function']=='send') {
+
+                    $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
+                                    'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
+                                    'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+                                    'Message'=>$trace[$i]['args'][0],
+                                    'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
+                                    'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
+                                    'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
+                                    'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+        
+                    $skipFinalObjectEncode = true;
+                    $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+                    $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+                    break;
+                }
+            }
+    
+        } else
+        if ($Type==self::TABLE) {
+          
+            if (isset($Object[0]) && is_string($Object[0])) {
+                $Object[1] = $this->encodeTable($Object[1]);
+            } else {
+                $Object = $this->encodeTable($Object);
+            }
+    
+            $skipFinalObjectEncode = true;
+          
+        } else
+        if ($Type==self::GROUP_START) {
+          
+            if (!$Label) {
+                throw $this->newException('You must specify a label for the group!');
+            }
+          
+        } else {
+            if ($Type===null) {
+                $Type = self::LOG;
+            }
+        }
+        
+        if ($this->options['includeLineNumbers']) {
+            if (!isset($meta['file']) || !isset($meta['line'])) {
+    
+                $trace = debug_backtrace();
+                for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+          
+                    if (isset($trace[$i]['class'])
+                       && isset($trace[$i]['file'])
+                       && ($trace[$i]['class']=='FirePHP'
+                           || $trace[$i]['class']=='FB')
+                       && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+                           || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+                        /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+                    } else
+                    if (isset($trace[$i]['class'])
+                       && isset($trace[$i+1]['file'])
+                       && $trace[$i]['class']=='FirePHP'
+                       && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+                        /* Skip fb() */
+                    } else
+                    if (isset($trace[$i]['file'])
+                       && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+                        /* Skip FB::fb() */
+                    } else {
+                        $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+                        $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+                        break;
+                    }
+                }      
+            }
+        } else {
+            unset($meta['file']);
+            unset($meta['line']);
+        }
+
+        $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+        $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
+     
+        $structure_index = 1;
+        if ($Type==self::DUMP) {
+            $structure_index = 2;
+            $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+        } else {
+            $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+        }
+      
+        if ($Type==self::DUMP) {
+            $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+        } else {
+            $msg_meta = $Options;
+            $msg_meta['Type'] = $Type;
+            if ($Label!==null) {
+                $msg_meta['Label'] = $Label;
+            }
+            if (isset($meta['file']) && !isset($msg_meta['File'])) {
+                $msg_meta['File'] = $meta['file'];
+            }
+            if (isset($meta['line']) && !isset($msg_meta['Line'])) {
+                $msg_meta['Line'] = $meta['line'];
+            }
+            $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+        }
+        
+        $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+    
+        for( $i=0 ; $i<count($parts) ; $i++) {
+            
+            $part = $parts[$i];
+            if ($part) {
                 
-        $return['__className'] = $class = get_class($Object);
-
-        $reflectionClass = new ReflectionClass($class);  
-        $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
-          $properties[$property->getName()] = $property;
-        }
-            
-        $members = (array)$Object;
-            
-        foreach( $properties as $raw_name => $property ) {
-          
-          $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
-          }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
-          } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
-          } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
-          }
-          
-          if(!(isset($this->objectFilters[$class])
-               && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
-
-            if(array_key_exists($raw_name,$members)
-               && !$property->isStatic()) {
-              
-              $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
-            
-            } else {
-              if(method_exists($property,'setAccessible')) {
-                $property->setAccessible(true);
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else
-              if($property->isPublic()) {
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else {
-                $return[$name] = '** Need PHP 5.3 to get value **';
-              }
+                if (count($parts)>2) {
+                    // Message needs to be split into multiple parts
+                    $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+                                     (($i==0)?strlen($msg):'')
+                                     . '|' . $part . '|'
+                                     . (($i<count($parts)-2)?'\\':''));
+                } else {
+                    $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+                                     strlen($part) . '|' . $part . '|');
+                }
+                
+                $this->messageIndex++;
+                
+                if ($this->messageIndex > 99999) {
+                    throw $this->newException('Maximum number (99,999) of messages reached!');             
+                }
             }
-          } else {
-            $return[$name] = '** Excluded by Filter **';
-          }
         }
-        
-        // Include all members that are not defined in the class
-        // but exist in the object
-        foreach( $members as $raw_name => $value ) {
-          
-          $name = $raw_name;
-          
-          if ($name{0} == "\0") {
-            $parts = explode("\0", $name);
-            $name = $parts[2];
-          }
-          
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
-              
-            if(!(isset($this->objectFilters[$class])
-                 && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
-              
-              $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
-            } else {
-              $return[$name] = '** Excluded by Filter **';
+    
+        $this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
+    
+        return true;
+    }
+  
+    /**
+     * Standardizes path for windows systems.
+     *
+     * @param string $Path
+     * @return string
+     */
+    protected function _standardizePath($Path)
+    {
+        return preg_replace('/\\\\+/','/',$Path);    
+    }
+  
+    /**
+     * Escape trace path for windows systems
+     *
+     * @param array $Trace
+     * @return array
+     */
+    protected function _escapeTrace($Trace)
+    {
+        if (!$Trace) return $Trace;
+        for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
+            if (isset($Trace[$i]['file'])) {
+                $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
+            }
+            if (isset($Trace[$i]['args'])) {
+                $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
             }
-          }
         }
-        
-        array_pop($this->objectStack);
-        
-    } elseif (is_array($Object)) {
+        return $Trace;    
+    }
+  
+    /**
+     * Escape file information of trace for windows systems
+     *
+     * @param string $File
+     * @return string
+     */
+    protected function _escapeTraceFile($File)
+    {
+        /* Check if we have a windows filepath */
+        if (strpos($File,'\\')) {
+            /* First strip down to single \ */
+          
+            $file = preg_replace('/\\\\+/','\\',$File);
+          
+            return $file;
+        }
+        return $File;
+    }
 
-        if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+    /**
+     * Check if headers have already been sent
+     *
+     * @param string $Filename
+     * @param integer $Linenum
+     */
+    protected function headersSent(&$Filename, &$Linenum)
+    {
+        return headers_sent($Filename, $Linenum);
+    }
+
+    /**
+     * Send header
+     *
+     * @param string $Name
+     * @param string $Value
+     */
+    protected function setHeader($Name, $Value)
+    {
+        return header($Name.': '.$Value);
+    }
+
+    /**
+     * Get user agent
+     *
+     * @return string|false
+     */
+    protected function getUserAgent()
+    {
+        if (!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+        return $_SERVER['HTTP_USER_AGENT'];
+    }
+
+    /**
+     * Get all request headers
+     * 
+     * @return array
+     */
+    public static function getAllRequestHeaders() {
+        static $_cached_headers = false;
+        if($_cached_headers!==false) {
+            return $_cached_headers;
         }
+        $headers = array();
+        if(function_exists('getallheaders')) {
+            foreach( getallheaders() as $name => $value ) {
+                $headers[strtolower($name)] = $value;
+            }
+        } else {
+            foreach($_SERVER as $name => $value) {
+                if(substr($name, 0, 5) == 'HTTP_') {
+                    $headers[strtolower(str_replace(' ', '-', str_replace('_', ' ', substr($name, 5))))] = $value;
+                }
+            }
+        }
+        return $_cached_headers = $headers;
+    }
+
+    /**
+     * Get a request header
+     *
+     * @return string|false
+     */
+    protected function getRequestHeader($Name)
+    {
+        $headers = self::getAllRequestHeaders();
+        if (isset($headers[strtolower($Name)])) {
+            return $headers[strtolower($Name)];
+        }
+        return false;
+    }
+
+    /**
+     * Returns a new exception
+     *
+     * @param string $Message
+     * @return Exception
+     */
+    protected function newException($Message)
+    {
+        return new Exception($Message);
+    }
+  
+    /**
+     * Encode an object into a JSON string
+     * 
+     * Uses PHP's jeson_encode() if available
+     * 
+     * @param object $Object The object to be encoded
+     * @return string The JSON string
+     */
+    public function jsonEncode($Object, $skipObjectEncode = false)
+    {
+        if (!$skipObjectEncode) {
+            $Object = $this->encodeObject($Object);
+        }
+        
+        if (function_exists('json_encode')
+           && $this->options['useNativeJsonEncode']!=false) {
+    
+            return json_encode($Object);
+        } else {
+            return $this->json_encode($Object);
+        }
+    }
+
+    /**
+     * Encodes a table by encoding each row and column with encodeObject()
+     * 
+     * @param array $Table The table to be encoded
+     * @return array
+     */  
+    protected function encodeTable($Table)
+    {
+    
+        if (!$Table) return $Table;
+        
+        $new_table = array();
+        foreach($Table as $row) {
       
-        foreach ($Object as $key => $val) {
-          
-          // Encoding the $GLOBALS PHP array causes an infinite loop
-          // if the recursion is not reset here as it contains
-          // a reference to itself. This is the only way I have come up
-          // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
-             && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
-            $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-          }
-          
-          $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
-        }
-    } else {
-      if(self::is_utf8($Object)) {
-        return $Object;
-      } else {
-        return utf8_encode($Object);
-      }
-    }
-    return $return;
-  }
-
-  /**
-   * Returns true if $string is valid UTF-8 and false otherwise.
-   *
-   * @param mixed $str String to be tested
-   * @return boolean
-   */
-  protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
-                $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
-                $bits--;
+            if (is_array($row)) {
+                $new_row = array();
+            
+                foreach($row as $item) {
+                    $new_row[] = $this->encodeObject($item);
+                }
+            
+                $new_table[] = $new_row;
             }
         }
+        
+        return $new_table;
     }
-    return true;
-  } 
 
-  /**
-   * Converts to and from JSON format.
-   *
-   * JSON (JavaScript Object Notation) is a lightweight data-interchange
-   * format. It is easy for humans to read and write. It is easy for machines
-   * to parse and generate. It is based on a subset of the JavaScript
-   * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
-   * This feature can also be found in  Python. JSON is a text format that is
-   * completely language independent but uses conventions that are familiar
-   * to programmers of the C-family of languages, including C, C++, C#, Java,
-   * JavaScript, Perl, TCL, and many others. These properties make JSON an
-   * ideal data-interchange language.
-   *
-   * This package provides a simple encoder and decoder for JSON notation. It
-   * is intended for use with client-side Javascript applications that make
-   * use of HTTPRequest to perform server communication functions - data can
-   * be encoded into JSON notation for use in a client-side javascript, or
-   * decoded from incoming Javascript requests. JSON format is native to
-   * Javascript, and can be directly eval()'ed with no further parsing
-   * overhead
-   *
-   * All strings should be in ASCII or UTF-8 format!
-   *
-   * LICENSE: Redistribution and use in source and binary forms, with or
-   * without modification, are permitted provided that the following
-   * conditions are met: Redistributions of source code must retain the
-   * above copyright notice, this list of conditions and the following
-   * disclaimer. Redistributions in binary form must reproduce the above
-   * copyright notice, this list of conditions and the following disclaimer
-   * in the documentation and/or other materials provided with the
-   * distribution.
-   *
-   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-   * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-   * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-   * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-   * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-   * DAMAGE.
-   *
-   * @category
-   * @package     Services_JSON
-   * @author      Michal Migurski <mike-json@teczno.com>
-   * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
-   * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
-   * @author      Christoph Dorn <christoph@christophdorn.com>
-   * @copyright   2005 Michal Migurski
-   * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
-   * @license     http://www.opensource.org/licenses/bsd-license.php
-   * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
-   */
+    /**
+     * Encodes an object including members with
+     * protected and private visibility
+     * 
+     * @param Object $Object The object to be encoded
+     * @param int $Depth The current traversal depth
+     * @return array All members of the object
+     */
+    protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1, $MaxDepth = 1)
+    {
+        if ($MaxDepth > $this->options['maxDepth']) {
+            return '** Max Depth ('.$this->options['maxDepth'].') **';
+        }
+
+        $return = array();
+    
+        if (is_resource($Object)) {
+    
+            return '** '.(string)$Object.' **';
+    
+        } else    
+        if (is_object($Object)) {
+    
+            if ($ObjectDepth > $this->options['maxObjectDepth']) {
+                return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+            }
+            
+            foreach ($this->objectStack as $refVal) {
+                if ($refVal === $Object) {
+                    return '** Recursion ('.get_class($Object).') **';
+                }
+            }
+            array_push($this->objectStack, $Object);
+                    
+            $return['__className'] = $class = get_class($Object);
+            $class_lower = strtolower($class);
+    
+            $reflectionClass = new ReflectionClass($class);  
+            $properties = array();
+            foreach( $reflectionClass->getProperties() as $property) {
+                $properties[$property->getName()] = $property;
+            }
+                
+            $members = (array)$Object;
+    
+            foreach( $properties as $plain_name => $property ) {
+    
+                $name = $raw_name = $plain_name;
+                if ($property->isStatic()) {
+                    $name = 'static:'.$name;
+                }
+                if ($property->isPublic()) {
+                    $name = 'public:'.$name;
+                } else
+                if ($property->isPrivate()) {
+                    $name = 'private:'.$name;
+                    $raw_name = "\0".$class."\0".$raw_name;
+                } else
+                if ($property->isProtected()) {
+                    $name = 'protected:'.$name;
+                    $raw_name = "\0".'*'."\0".$raw_name;
+                }
+    
+                if (!(isset($this->objectFilters[$class_lower])
+                     && is_array($this->objectFilters[$class_lower])
+                     && in_array($plain_name,$this->objectFilters[$class_lower]))) {
+    
+                    if (array_key_exists($raw_name,$members)
+                       && !$property->isStatic()) {
+                  
+                        $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1, $MaxDepth + 1);      
+                
+                    } else {
+                        if (method_exists($property,'setAccessible')) {
+                            $property->setAccessible(true);
+                            $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1, $MaxDepth + 1);
+                        } else
+                        if ($property->isPublic()) {
+                            $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1, $MaxDepth + 1);
+                        } else {
+                            $return[$name] = '** Need PHP 5.3 to get value **';
+                        }
+                    }
+                } else {
+                    $return[$name] = '** Excluded by Filter **';
+                }
+            }
+            
+            // Include all members that are not defined in the class
+            // but exist in the object
+            foreach( $members as $raw_name => $value ) {
+    
+                $name = $raw_name;/*noLibHook*/
+              
+                if ($name{0} == "\0") {
+                    $parts = explode("\0", $name);
+                    $name = $parts[2];
+                }
+              
+                $plain_name = $name;
+    
+                if (!isset($properties[$name])) {
+                    $name = 'undeclared:'.$name;
+    
+                    if (!(isset($this->objectFilters[$class_lower])
+                         && is_array($this->objectFilters[$class_lower])
+                         && in_array($plain_name,$this->objectFilters[$class_lower]))) {
+    
+                        $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1, $MaxDepth + 1);
+                    } else {
+                        $return[$name] = '** Excluded by Filter **';
+                    }
+                }
+            }
+            
+            array_pop($this->objectStack);
+            
+        } elseif (is_array($Object)) {
+    
+            if ($ArrayDepth > $this->options['maxArrayDepth']) {
+                return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+            }
+          
+            foreach ($Object as $key => $val) {
+              
+                // Encoding the $GLOBALS PHP array causes an infinite loop
+                // if the recursion is not reset here as it contains
+                // a reference to itself. This is the only way I have come up
+                // with to stop infinite recursion in this case.
+                if ($key=='GLOBALS'
+                   && is_array($val)
+                   && array_key_exists('GLOBALS',$val)) {
+                    $val['GLOBALS'] = '** Recursion (GLOBALS) **';
+                }
+              
+                $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1, $MaxDepth + 1);
+            }
+        } else {
+            if (self::is_utf8($Object)) {
+                return $Object;
+            } else {
+                return utf8_encode($Object);
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * Returns true if $string is valid UTF-8 and false otherwise.
+     *
+     * @param mixed $str String to be tested
+     * @return boolean
+     */
+    protected static function is_utf8($str)
+    {
+        if(function_exists('mb_detect_encoding')) {
+            return (mb_detect_encoding($str) == 'UTF-8');
+        }
+        $c=0; $b=0;
+        $bits=0;
+        $len=strlen($str);
+        for($i=0; $i<$len; $i++){
+            $c=ord($str[$i]);
+            if ($c > 128){
+                if (($c >= 254)) return false;
+                elseif ($c >= 252) $bits=6;
+                elseif ($c >= 248) $bits=5;
+                elseif ($c >= 240) $bits=4;
+                elseif ($c >= 224) $bits=3;
+                elseif ($c >= 192) $bits=2;
+                else return false;
+                if (($i+$bits) > $len) return false;
+                while($bits > 1){
+                    $i++;
+                    $b=ord($str[$i]);
+                    if ($b < 128 || $b > 191) return false;
+                    $bits--;
+                }
+            }
+        }
+        return true;
+    } 
+
+    /**
+     * Converts to and from JSON format.
+     *
+     * JSON (JavaScript Object Notation) is a lightweight data-interchange
+     * format. It is easy for humans to read and write. It is easy for machines
+     * to parse and generate. It is based on a subset of the JavaScript
+     * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+     * This feature can also be found in  Python. JSON is a text format that is
+     * completely language independent but uses conventions that are familiar
+     * to programmers of the C-family of languages, including C, C++, C#, Java,
+     * JavaScript, Perl, TCL, and many others. These properties make JSON an
+     * ideal data-interchange language.
+     *
+     * This package provides a simple encoder and decoder for JSON notation. It
+     * is intended for use with client-side Javascript applications that make
+     * use of HTTPRequest to perform server communication functions - data can
+     * be encoded into JSON notation for use in a client-side javascript, or
+     * decoded from incoming Javascript requests. JSON format is native to
+     * Javascript, and can be directly eval()'ed with no further parsing
+     * overhead
+     *
+     * All strings should be in ASCII or UTF-8 format!
+     *
+     * LICENSE: Redistribution and use in source and binary forms, with or
+     * without modification, are permitted provided that the following
+     * conditions are met: Redistributions of source code must retain the
+     * above copyright notice, this list of conditions and the following
+     * disclaimer. Redistributions in binary form must reproduce the above
+     * copyright notice, this list of conditions and the following disclaimer
+     * in the documentation and/or other materials provided with the
+     * distribution.
+     *
+     * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+     * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+     * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+     * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+     * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+     * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+     * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+     * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+     * DAMAGE.
+     *
+     * @category
+     * @package     Services_JSON
+     * @author      Michal Migurski <mike-json@teczno.com>
+     * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+     * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+     * @author      Christoph Dorn <christoph@christophdorn.com>
+     * @copyright   2005 Michal Migurski
+     * @version     CVS: $Id: FirePHP.class.php 8720 2011-05-11 13:18:25Z ips_terabyte $
+     * @license     http://www.opensource.org/licenses/bsd-license.php
+     * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+     */
    
      
-  /**
-   * Keep a list of objects as we descend into the array so we can detect recursion.
-   */
-  private $json_objectStack = array();
+    /**
+     * Keep a list of objects as we descend into the array so we can detect recursion.
+     */
+    private $json_objectStack = array();
 
 
- /**
-  * convert a string from one UTF-8 char to one UTF-16 char
-  *
-  * Normally should be handled by mb_convert_encoding, but
-  * provides a slower PHP-only method for installations
-  * that lack the multibye string extension.
-  *
-  * @param    string  $utf8   UTF-8 character
-  * @return   string  UTF-16 character
-  * @access   private
-  */
-  private function json_utf82utf16($utf8)
-  {
-      // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
-          return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-      }
+   /**
+    * convert a string from one UTF-8 char to one UTF-16 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf8   UTF-8 character
+    * @return   string  UTF-16 character
+    * @access   private
+    */
+    private function json_utf82utf16($utf8)
+    {
+        // oh please oh please oh please oh please oh please
+        if (function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+        }
 
-      switch(strlen($utf8)) {
-          case 1:
-              // this case should never be reached, because we are in ASCII range
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return $utf8;
+        switch(strlen($utf8)) {
+            case 1:
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return $utf8;
 
-          case 2:
-              // return a UTF-16 character from a 2-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr(0x07 & (ord($utf8{0}) >> 2))
-                   . chr((0xC0 & (ord($utf8{0}) << 6))
+            case 2:
+                // return a UTF-16 character from a 2-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x07 & (ord($utf8{0}) >> 2))
+                       . chr((0xC0 & (ord($utf8{0}) << 6))
                        | (0x3F & ord($utf8{1})));
 
-          case 3:
-              // return a UTF-16 character from a 3-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr((0xF0 & (ord($utf8{0}) << 4))
+            case 3:
+                // return a UTF-16 character from a 3-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr((0xF0 & (ord($utf8{0}) << 4))
                        | (0x0F & (ord($utf8{1}) >> 2)))
-                   . chr((0xC0 & (ord($utf8{1}) << 6))
+                       . chr((0xC0 & (ord($utf8{1}) << 6))
                        | (0x7F & ord($utf8{2})));
-      }
+        }
 
-      // ignoring UTF-32 for now, sorry
-      return '';
-  }
-
- /**
-  * encodes an arbitrary variable into JSON format
-  *
-  * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-  *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-  *                           if var is a strng, note that encode() always expects it
-  *                           to be in ASCII or UTF-8 format!
-  *
-  * @return   mixed   JSON string representation of input var or an error if a problem occurs
-  * @access   public
-  */
-  private function json_encode($var)
-  {
-    
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
-        return '"** Recursion **"';
-      }
+        // ignoring UTF-32 for now, sorry
+        return '';
     }
-          
-      switch (gettype($var)) {
-          case 'boolean':
-              return $var ? 'true' : 'false';
 
-          case 'NULL':
-              return 'null';
-
-          case 'integer':
-              return (int) $var;
-
-          case 'double':
-          case 'float':
-              return (float) $var;
-
-          case 'string':
-              // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-              $ascii = '';
-              $strlen_var = strlen($var);
-
-             /*
-              * Iterate over every character in the string,
-              * escaping with a slash or encoding to UTF-8 where necessary
-              */
-              for ($c = 0; $c < $strlen_var; ++$c) {
-
-                  $ord_var_c = ord($var{$c});
-
-                  switch (true) {
-                      case $ord_var_c == 0x08:
-                          $ascii .= '\b';
-                          break;
-                      case $ord_var_c == 0x09:
-                          $ascii .= '\t';
-                          break;
-                      case $ord_var_c == 0x0A:
-                          $ascii .= '\n';
-                          break;
-                      case $ord_var_c == 0x0C:
-                          $ascii .= '\f';
-                          break;
-                      case $ord_var_c == 0x0D:
-                          $ascii .= '\r';
-                          break;
-
-                      case $ord_var_c == 0x22:
-                      case $ord_var_c == 0x2F:
-                      case $ord_var_c == 0x5C:
-                          // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
-                          break;
-
-                      case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                          // characters U-00000000 - U-0000007F (same as ASCII)
-                          $ascii .= $var{$c};
-                          break;
-
-                      case (($ord_var_c & 0xE0) == 0xC0):
-                          // characters U-00000080 - U-000007FF, mask 110XXXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                          $c += 1;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF0) == 0xE0):
-                          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}));
-                          $c += 2;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF8) == 0xF0):
-                          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}));
-                          $c += 3;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFC) == 0xF8):
-                          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}));
-                          $c += 4;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFE) == 0xFC):
-                          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}),
-                                       ord($var{$c + 5}));
-                          $c += 5;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-                  }
-              }
-
-              return '"'.$ascii.'"';
-
-          case 'array':
-             /*
-              * As per JSON spec if any array key is not an integer
-              * we must treat the the whole array as an object. We
-              * also try to catch a sparsely populated associative
-              * array with numeric keys here because some JS engines
-              * will create an array with empty indexes up to
-              * max_index which can cause memory issues and because
-              * the keys, which may be relevant, will be remapped
-              * otherwise.
-              *
-              * As per the ECMA and JSON specification an object may
-              * have any string as a property. Unfortunately due to
-              * a hole in the ECMA specification if the key is a
-              * ECMA reserved word or starts with a digit the
-              * parameter is only accessible using ECMAScript's
-              * bracket notation.
-              */
-
-              // treat as a JSON object
-              if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                  
-                  $this->json_objectStack[] = $var;
-
-                  $properties = array_map(array($this, 'json_name_value'),
-                                          array_keys($var),
-                                          array_values($var));
-
-                  array_pop($this->json_objectStack);
-
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
-                          return $property;
-                      }
-                  }
-
-                  return '{' . join(',', $properties) . '}';
-              }
-
-              $this->json_objectStack[] = $var;
-
-              // treat it like a regular array
-              $elements = array_map(array($this, 'json_encode'), $var);
-
-              array_pop($this->json_objectStack);
-
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
-                      return $element;
-                  }
-              }
-
-              return '[' . join(',', $elements) . ']';
-
-          case 'object':
-              $vars = self::encodeObject($var);
-
-              $this->json_objectStack[] = $var;
-
-              $properties = array_map(array($this, 'json_name_value'),
-                                      array_keys($vars),
-                                      array_values($vars));
-
-              array_pop($this->json_objectStack);
-              
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
-                      return $property;
-                  }
-              }
-                     
-              return '{' . join(',', $properties) . '}';
-
-          default:
-              return null;
-      }
-  }
-
- /**
-  * array-walking function for use in generating JSON-formatted name-value pairs
-  *
-  * @param    string  $name   name of key to use
-  * @param    mixed   $value  reference to an array element to be encoded
-  *
-  * @return   string  JSON-formatted name-value pair, like '"name":value'
-  * @access   private
-  */
-  private function json_name_value($name, $value)
-  {
-      // Encoding the $GLOBALS PHP array causes an infinite loop
-      // if the recursion is not reset here as it contains
-      // a reference to itself. This is the only way I have come up
-      // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
-         && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
-        $value['GLOBALS'] = '** Recursion **';
-      }
+   /**
+    * encodes an arbitrary variable into JSON format
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    private function json_encode($var)
+    {
     
-      $encoded_value = $this->json_encode($value);
+        if (is_object($var)) {
+            if (in_array($var,$this->json_objectStack)) {
+                return '"** Recursion **"';
+            }
+        }
+          
+        switch (gettype($var)) {
+            case 'boolean':
+                return $var ? 'true' : 'false';
 
-      if($encoded_value instanceof Exception) {
-          return $encoded_value;
-      }
+            case 'NULL':
+                return 'null';
 
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
-  }
+            case 'integer':
+                return (int) $var;
+
+            case 'double':
+            case 'float':
+                return (float) $var;
+
+            case 'string':
+                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+                $ascii = '';
+                $strlen_var = strlen($var);
+
+               /*
+                * Iterate over every character in the string,
+                * escaping with a slash or encoding to UTF-8 where necessary
+                */
+                for ($c = 0; $c < $strlen_var; ++$c) {
+
+                    $ord_var_c = ord($var{$c});
+
+                    switch (true) {
+                        case $ord_var_c == 0x08:
+                            $ascii .= '\b';
+                            break;
+                        case $ord_var_c == 0x09:
+                            $ascii .= '\t';
+                            break;
+                        case $ord_var_c == 0x0A:
+                            $ascii .= '\n';
+                            break;
+                        case $ord_var_c == 0x0C:
+                            $ascii .= '\f';
+                            break;
+                        case $ord_var_c == 0x0D:
+                            $ascii .= '\r';
+                            break;
+
+                        case $ord_var_c == 0x22:
+                        case $ord_var_c == 0x2F:
+                        case $ord_var_c == 0x5C:
+                            // double quote, slash, slosh
+                            $ascii .= '\\'.$var{$c};
+                            break;
+
+                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                            // characters U-00000000 - U-0000007F (same as ASCII)
+                            $ascii .= $var{$c};
+                            break;
+
+                        case (($ord_var_c & 0xE0) == 0xC0):
+                            // characters U-00000080 - U-000007FF, mask 110XXXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $c += 1;
+                            $utf16 = $this->json_utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF0) == 0xE0):
+                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}));
+                            $c += 2;
+                            $utf16 = $this->json_utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF8) == 0xF0):
+                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}));
+                            $c += 3;
+                            $utf16 = $this->json_utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFC) == 0xF8):
+                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}));
+                            $c += 4;
+                            $utf16 = $this->json_utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFE) == 0xFC):
+                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}),
+                                         ord($var{$c + 5}));
+                            $c += 5;
+                            $utf16 = $this->json_utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+                    }
+                }
+
+                return '"'.$ascii.'"';
+
+            case 'array':
+                /*
+                 * As per JSON spec if any array key is not an integer
+                 * we must treat the the whole array as an object. We
+                 * also try to catch a sparsely populated associative
+                 * array with numeric keys here because some JS engines
+                 * will create an array with empty indexes up to
+                 * max_index which can cause memory issues and because
+                 * the keys, which may be relevant, will be remapped
+                 * otherwise.
+                 *
+                 * As per the ECMA and JSON specification an object may
+                 * have any string as a property. Unfortunately due to
+                 * a hole in the ECMA specification if the key is a
+                 * ECMA reserved word or starts with a digit the
+                 * parameter is only accessible using ECMAScript's
+                 * bracket notation.
+                 */
+
+                // treat as a JSON object
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                  
+                    $this->json_objectStack[] = $var;
+
+                    $properties = array_map(array($this, 'json_name_value'),
+                                            array_keys($var),
+                                            array_values($var));
+
+                    array_pop($this->json_objectStack);
+
+                    foreach($properties as $property) {
+                        if ($property instanceof Exception) {
+                            return $property;
+                        }
+                    }
+
+                    return '{' . join(',', $properties) . '}';
+                }
+
+                $this->json_objectStack[] = $var;
+
+                // treat it like a regular array
+                $elements = array_map(array($this, 'json_encode'), $var);
+
+                array_pop($this->json_objectStack);
+
+                foreach($elements as $element) {
+                    if ($element instanceof Exception) {
+                        return $element;
+                    }
+                }
+
+                return '[' . join(',', $elements) . ']';
+
+            case 'object':
+                $vars = self::encodeObject($var);
+
+                $this->json_objectStack[] = $var;
+
+                $properties = array_map(array($this, 'json_name_value'),
+                                        array_keys($vars),
+                                        array_values($vars));
+
+                array_pop($this->json_objectStack);
+              
+                foreach($properties as $property) {
+                    if ($property instanceof Exception) {
+                        return $property;
+                    }
+                }
+                     
+                return '{' . join(',', $properties) . '}';
+
+            default:
+                return null;
+        }
+    }
+
+   /**
+    * array-walking function for use in generating JSON-formatted name-value pairs
+    *
+    * @param    string  $name   name of key to use
+    * @param    mixed   $value  reference to an array element to be encoded
+    *
+    * @return   string  JSON-formatted name-value pair, like '"name":value'
+    * @access   private
+    */
+    private function json_name_value($name, $value)
+    {
+        // Encoding the $GLOBALS PHP array causes an infinite loop
+        // if the recursion is not reset here as it contains
+        // a reference to itself. This is the only way I have come up
+        // with to stop infinite recursion in this case.
+        if ($name=='GLOBALS'
+           && is_array($value)
+           && array_key_exists('GLOBALS',$value)) {
+            $value['GLOBALS'] = '** Recursion **';
+        }
+    
+        $encoded_value = $this->json_encode($value);
+
+        if ($encoded_value instanceof Exception) {
+            return $encoded_value;
+        }
+
+        return $this->json_encode(strval($name)) . ':' . $encoded_value;
+    }
+
+    /**
+     * @deprecated
+     */    
+    public function setProcessorUrl($URL)
+    {
+        trigger_error("The FirePHP::setProcessorUrl() method is no longer supported", E_USER_DEPRECATED);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function setRendererUrl($URL)
+    {
+        trigger_error("The FirePHP::setRendererUrl() method is no longer supported", E_USER_DEPRECATED);
+    }  
 }
diff --git a/upload/ips_kernel/FirePHPCore/LICENSE b/upload/ips_kernel/FirePHPCore/LICENSE
index 5bf96191..3e390f9d 100644
--- a/upload/ips_kernel/FirePHPCore/LICENSE
+++ b/upload/ips_kernel/FirePHPCore/LICENSE
@@ -1,6 +1,6 @@
 Software License Agreement (New BSD License)
 
-Copyright (c) 2006-2008, Christoph Dorn
+Copyright (c) 2006-2009, Christoph Dorn
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/upload/ips_kernel/FirePHPCore/fb.php b/upload/ips_kernel/FirePHPCore/fb.php
index 96d97199..2149d0ba 100644
--- a/upload/ips_kernel/FirePHPCore/fb.php
+++ b/upload/ips_kernel/FirePHPCore/fb.php
@@ -6,7 +6,7 @@
  * 
  * Software License Agreement (New BSD License)
  * 
- * Copyright (c) 2006-2008, Christoph Dorn
+ * Copyright (c) 2006-2010, Christoph Dorn
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification,
@@ -36,13 +36,15 @@
  * 
  * ***** END LICENSE BLOCK *****
  * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
+ * @copyright   Copyright (C) 2007-2009 Christoph Dorn
  * @author      Christoph Dorn <christoph@christophdorn.com>
  * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
+ * @package     FirePHPCore
  */
 
-require_once dirname(__FILE__).'/FirePHP.class.php';
+if(!class_exists('FirePHP')) {
+    require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'FirePHP.class.php';/*noLibHook*/
+}
 
 /**
  * Sends the given data to the FirePHP Firefox Extension.
@@ -56,191 +58,219 @@ require_once dirname(__FILE__).'/FirePHP.class.php';
  */
 function fb()
 {
-  $instance = FirePHP::getInstance(true);
+    $instance = FirePHP::getInstance(true);
   
-  $args = func_get_args();
-  return call_user_func_array(array($instance,'fb'),$args);
+    $args = func_get_args();
+    return call_user_func_array(array($instance,'fb'),$args);
 }
 
 
 class FB
 {
-  /**
-   * Enable and disable logging to Firebug
-   * 
-   * @see FirePHP->setEnabled()
-   * @param boolean $Enabled TRUE to enable, FALSE to disable
-   * @return void
-   */
-  public static function setEnabled($Enabled) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setEnabled($Enabled);
-  }
+    /**
+     * Enable and disable logging to Firebug
+     * 
+     * @see FirePHP->setEnabled()
+     * @param boolean $Enabled TRUE to enable, FALSE to disable
+     * @return void
+     */
+    public static function setEnabled($Enabled)
+    {
+        $instance = FirePHP::getInstance(true);
+        $instance->setEnabled($Enabled);
+    }
   
-  /**
-   * Check if logging is enabled
-   * 
-   * @see FirePHP->getEnabled()
-   * @return boolean TRUE if enabled
-   */
-  public static function getEnabled() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getEnabled();
-  }  
+    /**
+     * Check if logging is enabled
+     * 
+     * @see FirePHP->getEnabled()
+     * @return boolean TRUE if enabled
+     */
+    public static function getEnabled()
+    {
+        $instance = FirePHP::getInstance(true);
+        return $instance->getEnabled();
+    }  
   
-  /**
-   * Specify a filter to be used when encoding an object
-   * 
-   * Filters are used to exclude object members.
-   * 
-   * @see FirePHP->setObjectFilter()
-   * @param string $Class The class name of the object
-   * @param array $Filter An array or members to exclude
-   * @return void
-   */
-  public static function setObjectFilter($Class, $Filter) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setObjectFilter($Class, $Filter);
-  }
+    /**
+     * Specify a filter to be used when encoding an object
+     * 
+     * Filters are used to exclude object members.
+     * 
+     * @see FirePHP->setObjectFilter()
+     * @param string $Class The class name of the object
+     * @param array $Filter An array or members to exclude
+     * @return void
+     */
+    public static function setObjectFilter($Class, $Filter)
+    {
+      $instance = FirePHP::getInstance(true);
+      $instance->setObjectFilter($Class, $Filter);
+    }
   
-  /**
-   * Set some options for the library
-   * 
-   * @see FirePHP->setOptions()
-   * @param array $Options The options to be set
-   * @return void
-   */
-  public static function setOptions($Options) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setOptions($Options);
-  }
+    /**
+     * Set some options for the library
+     * 
+     * @see FirePHP->setOptions()
+     * @param array $Options The options to be set
+     * @return void
+     */
+    public static function setOptions($Options)
+    {
+        $instance = FirePHP::getInstance(true);
+        $instance->setOptions($Options);
+    }
 
-  /**
-   * Log object to firebug
-   * 
-   * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object
-   * @return true
-   * @throws Exception
-   */
-  public static function send()
-  {
-    $instance = FirePHP::getInstance(true);
-    $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
-  }
+    /**
+     * Get options for the library
+     * 
+     * @see FirePHP->getOptions()
+     * @return array The options
+     */
+    public static function getOptions()
+    {
+        $instance = FirePHP::getInstance(true);
+        return $instance->getOptions();
+    }
 
-  /**
-   * Start a group for following messages
-   *
-   * @param string $Name
-   * @return true
-   * @throws Exception
-   */
-  public static function group($Name) {
-    return self::send(null, $Name, FirePHP::GROUP_START);
-  }
-  
-  /**
-   * Ends a group you have started before
-   *
-   * @return true
-   * @throws Exception
-   */
-  public static function groupEnd() {
-    return self::send(null, null, FirePHP::GROUP_END);
-  }
+    /**
+     * Log object to firebug
+     * 
+     * @see http://www.firephp.org/Wiki/Reference/Fb
+     * @param mixed $Object
+     * @return true
+     * @throws Exception
+     */
+    public static function send()
+    {
+        $instance = FirePHP::getInstance(true);
+        $args = func_get_args();
+        return call_user_func_array(array($instance,'fb'),$args);
+    }
 
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::LOG
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public static function log($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::LOG);
-  } 
+    /**
+     * Start a group for following messages
+     * 
+     * Options:
+     *   Collapsed: [true|false]
+     *   Color:     [#RRGGBB|ColorName]
+     *
+     * @param string $Name
+     * @param array $Options OPTIONAL Instructions on how to log the group
+     * @return true
+     */
+    public static function group($Name, $Options=null)
+    {
+        $instance = FirePHP::getInstance(true);
+        return $instance->group($Name, $Options);
+    }
 
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::INFO
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public static function info($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::INFO);
-  } 
+    /**
+     * Ends a group you have started before
+     *
+     * @return true
+     * @throws Exception
+     */
+    public static function groupEnd()
+    {
+        return self::send(null, null, FirePHP::GROUP_END);
+    }
 
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::WARN
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public static function warn($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::WARN);
-  } 
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::LOG
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public static function log($Object, $Label=null)
+    {
+        return self::send($Object, $Label, FirePHP::LOG);
+    } 
 
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::ERROR
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public static function error($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::ERROR);
-  } 
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::INFO
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public static function info($Object, $Label=null)
+    {
+        return self::send($Object, $Label, FirePHP::INFO);
+    } 
 
-  /**
-   * Dumps key and variable to firebug server panel
-   *
-   * @see FirePHP::DUMP
-   * @param string $Key
-   * @param mixed $Variable
-   * @return true
-   * @throws Exception
-   */
-  public static function dump($Key, $Variable) {
-    return self::send($Variable, $Key, FirePHP::DUMP);
-  } 
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::WARN
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public static function warn($Object, $Label=null)
+    {
+        return self::send($Object, $Label, FirePHP::WARN);
+    } 
 
-  /**
-   * Log a trace in the firebug console
-   *
-   * @see FirePHP::TRACE
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public static function trace($Label) {
-    return self::send($Label, FirePHP::TRACE);
-  } 
+    /**
+     * Log object with label to firebug console
+     *
+     * @see FirePHP::ERROR
+     * @param mixes $Object
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public static function error($Object, $Label=null)
+    {
+        return self::send($Object, $Label, FirePHP::ERROR);
+    } 
 
-  /**
-   * Log a table in the firebug console
-   *
-   * @see FirePHP::TABLE
-   * @param string $Label
-   * @param string $Table
-   * @return true
-   * @throws Exception
-   */
-  public static function table($Label, $Table) {
-    return self::send($Table, $Label, FirePHP::TABLE);
-  } 
+    /**
+     * Dumps key and variable to firebug server panel
+     *
+     * @see FirePHP::DUMP
+     * @param string $Key
+     * @param mixed $Variable
+     * @return true
+     * @throws Exception
+     */
+    public static function dump($Key, $Variable)
+    {
+        return self::send($Variable, $Key, FirePHP::DUMP);
+    } 
+
+    /**
+     * Log a trace in the firebug console
+     *
+     * @see FirePHP::TRACE
+     * @param string $Label
+     * @return true
+     * @throws Exception
+     */
+    public static function trace($Label)
+    {
+        return self::send($Label, FirePHP::TRACE);
+    } 
+
+    /**
+     * Log a table in the firebug console
+     *
+     * @see FirePHP::TABLE
+     * @param string $Label
+     * @param string $Table
+     * @return true
+     * @throws Exception
+     */
+    public static function table($Label, $Table)
+    {
+        return self::send($Table, $Label, FirePHP::TABLE);
+    } 
 
 }
-
-
diff --git a/upload/ips_kernel/FirePHPCore/index.html b/upload/ips_kernel/FirePHPCore/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/FirePHPCore/index.html
+++ b/upload/ips_kernel/FirePHPCore/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/JSON/JSON.php b/upload/ips_kernel/PEAR/JSON/JSON.php
index 0e568194..803ea7de 100644
--- a/upload/ips_kernel/PEAR/JSON/JSON.php
+++ b/upload/ips_kernel/PEAR/JSON/JSON.php
@@ -51,7 +51,7 @@
  * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
  * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php 268 2009-05-20 13:25:45Z bfarber $
+ * @version     CVS: $Id: JSON.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * @license     http://www.opensource.org/licenses/bsd-license.php
  * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
diff --git a/upload/ips_kernel/PEAR/JSON/index.html b/upload/ips_kernel/PEAR/JSON/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/JSON/index.html
+++ b/upload/ips_kernel/PEAR/JSON/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/Mail/index.html b/upload/ips_kernel/PEAR/Mail/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/Mail/index.html
+++ b/upload/ips_kernel/PEAR/Mail/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/Mail/mime.php b/upload/ips_kernel/PEAR/Mail/mime.php
index c86d1a17..6a38e454 100644
--- a/upload/ips_kernel/PEAR/Mail/mime.php
+++ b/upload/ips_kernel/PEAR/Mail/mime.php
@@ -48,7 +48,7 @@
  * @author    Aleksander Machniak <alec@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   CVS: $Id: mime.php 297878 2010-04-12 10:57:34Z alec $
+ * @version   CVS: $Id: mime.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * @link      http://pear.php.net/package/Mail_mime
  *
  *            This class is based on HTML Mime Mail class from
@@ -63,7 +63,7 @@
  *
  * This package depends on PEAR to raise errors.
  */
-require_once 'PEAR.php';
+require_once 'PEAR.php';/*noLibHook*/
 
 /**
  * require Mail_mimePart
@@ -72,7 +72,7 @@ require_once 'PEAR.php';
  * create all the different parts a mail can
  * consist of.
  */
-require_once 'Mail/mimePart.php';
+require_once 'Mail/mimePart.php';/*noLibHook*/
 
 
 /**
@@ -365,30 +365,28 @@ class Mail_mime
      * Adds a file to the list of attachments.
      *
      * @param string $file        The file name of the file to attach
-     *                            OR the file contents itself
+     *                            or the file contents itself
      * @param string $c_type      The content type
      * @param string $name        The filename of the attachment
      *                            Only use if $file is the contents
-     * @param bool   $isfile      Whether $file is a filename or not
-     *                            Defaults to true
-     * @param string $encoding    The type of encoding to use.
-     *                            Defaults to base64.
-     *                            Possible values: 7bit, 8bit, base64, 
-     *                            or quoted-printable.
+     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
+     * @param string $encoding    The type of encoding to use. Defaults to base64.
+     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
      * @param string $disposition The content-disposition of this file
      *                            Defaults to attachment.
      *                            Possible values: attachment, inline.
-     * @param string $charset     The character set used in the filename
-     *                            of this attachment.
+     * @param string $charset     The character set of attachment's content.
      * @param string $language    The language of the attachment
      * @param string $location    The RFC 2557.4 location of the attachment
-     * @param string $n_encoding  Encoding for attachment name (Content-Type)
+     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
      *                            By default filenames are encoded using RFC2231 method
      *                            Here you can set RFC2047 encoding (quoted-printable
      *                            or base64) instead
-     * @param string $f_encoding  Encoding for attachment filename (Content-Disposition)
-     *                            See $n_encoding description
+     * @param string $f_encoding  Encoding of the attachment's filename
+     *                            in Content-Disposition header.
      * @param string $description Content-Description header
+     * @param string $h_charset   The character set of the headers e.g. filename
+     *                            If not specified, $charset will be used
      *
      * @return mixed              True on success or PEAR_Error object
      * @access public
@@ -404,7 +402,8 @@ class Mail_mime
         $location    = '',
         $n_encoding  = null,
         $f_encoding  = null,
-        $description = ''
+        $description = '',
+        $h_charset   = null
     ) {
         $bodyfile = null;
 
@@ -437,14 +436,15 @@ class Mail_mime
             'body_file'   => $bodyfile,
             'name'        => $filename,
             'c_type'      => $c_type,
-            'encoding'    => $encoding,
             'charset'     => $charset,
+            'encoding'    => $encoding,
             'language'    => $language,
             'location'    => $location,
             'disposition' => $disposition,
             'description' => $description,
             'name_encoding'     => $n_encoding,
-            'filename_encoding' => $f_encoding
+            'filename_encoding' => $f_encoding,
+            'headers_charset'   => $h_charset,
         );
 
         return true;
@@ -621,7 +621,7 @@ class Mail_mime
         $params['content_type'] = $value['c_type'];
         $params['encoding']     = 'base64';
         $params['disposition']  = 'inline';
-        $params['dfilename']    = $value['name'];
+        $params['filename']     = $value['name'];
         $params['cid']          = $value['cid'];
         $params['body_file']    = $value['body_file'];
         $params['eol']          = $this->_build_params['eol'];
@@ -650,19 +650,25 @@ class Mail_mime
     function &_addAttachmentPart(&$obj, $value)
     {
         $params['eol']          = $this->_build_params['eol'];
-        $params['dfilename']    = $value['name'];
+        $params['filename']     = $value['name'];
         $params['encoding']     = $value['encoding'];
         $params['content_type'] = $value['c_type'];
         $params['body_file']    = $value['body_file'];
         $params['disposition']  = isset($value['disposition']) ? 
                                   $value['disposition'] : 'attachment';
-        if ($value['charset']) {
+
+        // content charset
+        if (!empty($value['charset'])) {
             $params['charset'] = $value['charset'];
         }
-        if ($value['language']) {
+        // headers charset (filename, description)
+        if (!empty($value['headers_charset'])) {
+            $params['headers_charset'] = $value['headers_charset'];
+        }
+        if (!empty($value['language'])) {
             $params['language'] = $value['language'];
         }
-        if ($value['location']) {
+        if (!empty($value['location'])) {
             $params['location'] = $value['location'];
         }
         if (!empty($value['name_encoding'])) {
@@ -842,14 +848,16 @@ class Mail_mime
 
         if (isset($this->_headers['From'])) {
             // Bug #11381: Illegal characters in domain ID
-            if (preg_match("|(@[0-9a-zA-Z\-\.]+)|", $this->_headers['From'], $matches)) {
+            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
                 $domainID = $matches[1];
             } else {
-                $domainID = "@localhost";
+                $domainID = '@localhost';
             }
             foreach ($this->_html_images as $i => $img) {
-                $this->_html_images[$i]['cid']
-                    = $this->_html_images[$i]['cid'] . $domainID;
+                $cid = $this->_html_images[$i]['cid']; 
+                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
+                    $this->_html_images[$i]['cid'] = $cid . $domainID;
+                }
             }
         }
 
@@ -993,7 +1001,7 @@ class Mail_mime
             $ret = null;
             return $ret;
         }
-        
+
         // Use saved boundary
         if (!empty($this->_build_params['boundary'])) {
             $boundary = $this->_build_params['boundary'];
@@ -1153,7 +1161,7 @@ class Mail_mime
         // add required boundary parameter if not defined
         if (preg_match('/^multipart\//i', $type)) {
             if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());              
+                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
             }
 
             $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
@@ -1188,6 +1196,24 @@ class Mail_mime
         $this->_headers['From'] = $email;
     }
 
+    /**
+     * Add an email to the To header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addTo($email)
+    {
+        if (isset($this->_headers['To'])) {
+            $this->_headers['To'] .= ", $email";
+        } else {
+            $this->_headers['To'] = $email;
+        }
+    }
+
     /**
      * Add an email to the Cc (carbon copy) header
      * (multiple calls to this method are allowed)
@@ -1367,18 +1393,23 @@ class Mail_mime
 
         if ($headers['Content-Type'] == 'text/plain') {
             // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['text_charset'];
+            // place charset parameter in the same line, if possible
+            // 26 = strlen("Content-Type: text/plain; ")
             $headers['Content-Type']
-                .= ";$eol charset=" . $this->_build_params['text_charset'];
+                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
             $headers['Content-Transfer-Encoding']
                 = $this->_build_params['text_encoding'];
         } else if ($headers['Content-Type'] == 'text/html') {
             // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['html_charset'];
+            // place charset parameter in the same line, if possible
             $headers['Content-Type']
-                .= ";$eol charset=" . $this->_build_params['html_charset'];
+                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
             $headers['Content-Transfer-Encoding']
                 = $this->_build_params['html_encoding'];
         } else {
-            // multipart message: add charset and boundary
+            // multipart message: and boundary
             if (!empty($this->_build_params['boundary'])) {
                 $boundary = $this->_build_params['boundary'];
             } else if (!empty($this->_headers['Content-Type'])
diff --git a/upload/ips_kernel/PEAR/Mail/mimeDecode.php b/upload/ips_kernel/PEAR/Mail/mimeDecode.php
index e1ef20e2..029ffff2 100644
--- a/upload/ips_kernel/PEAR/Mail/mimeDecode.php
+++ b/upload/ips_kernel/PEAR/Mail/mimeDecode.php
@@ -52,7 +52,7 @@
  * @author     Sean Coates <sean@php.net>
  * @copyright  2003-2006 PEAR <pear-group@php.net>
  * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    CVS: $Id: mimeDecode.php 288500 2009-09-21 05:32:32Z alan_k $
+ * @version    CVS: $Id: mimeDecode.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * @link       http://pear.php.net/package/Mail_mime
  */
 
@@ -62,7 +62,7 @@
  *
  * This package depends on PEAR to raise errors.
  */
-require_once 'PEAR.php';
+require_once 'PEAR.php';/*noLibHook*/
 
 
 /**
@@ -129,7 +129,7 @@ class Mail_mimeDecode extends PEAR
      * @var    boolean
      * @access private
      */
-    var $_include_bodies;
+    var $_include_bodies;/*noLibHook*/
 
     /**
      * Flag to determine whether to decode bodies
@@ -154,7 +154,7 @@ class Mail_mimeDecode extends PEAR
      * @var    boolean
      * @access private
      */
-    var $_rfc822_bodies;
+    var $_rfc822_bodies;/*noLibHook*/
 
     /**
      * Constructor.
@@ -197,7 +197,7 @@ class Mail_mimeDecode extends PEAR
     function decode($params = null)
     {
         // determine if this method has been called statically
-        $isStatic = !(isset($this) && get_class($this) == __CLASS__);
+        $isStatic = empty($this) || !is_a($this, __CLASS__);
 
         // Have we been called statically?
 	// If so, create an object and pass details to that.
@@ -247,6 +247,7 @@ class Mail_mimeDecode extends PEAR
         $headers = $this->_parseHeaders($headers);
 
         foreach ($headers as $value) {
+            $value['value'] = $this->_decode_headers ? $this->_decodeHeader($value['value']) : $value['value'];
             if (isset($return->headers[strtolower($value['name'])]) AND !is_array($return->headers[strtolower($value['name'])])) {
                 $return->headers[strtolower($value['name'])]   = array($return->headers[strtolower($value['name'])]);
                 $return->headers[strtolower($value['name'])][] = $value['value'];
@@ -259,8 +260,8 @@ class Mail_mimeDecode extends PEAR
             }
         }
 
-        reset($headers);
-        while (list($key, $value) = each($headers)) {
+
+        foreach ($headers as $key => $value) {
             $headers[$key]['name'] = strtolower($headers[$key]['name']);
             switch ($headers[$key]['name']) {
 
@@ -273,7 +274,7 @@ class Mail_mimeDecode extends PEAR
                     }
 
                     if (isset($content_type['other'])) {
-                        while (list($p_name, $p_value) = each($content_type['other'])) {
+                        foreach($content_type['other'] as $p_name => $p_value) {
                             $return->ctype_parameters[$p_name] = $p_value;
                         }
                     }
@@ -283,7 +284,7 @@ class Mail_mimeDecode extends PEAR
                     $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
                     $return->disposition   = $content_disposition['value'];
                     if (isset($content_disposition['other'])) {
-                        while (list($p_name, $p_value) = each($content_disposition['other'])) {
+                        foreach($content_disposition['other'] as $p_name => $p_value) {
                             $return->d_parameters[$p_name] = $p_value;
                         }
                     }
@@ -315,6 +316,7 @@ class Mail_mimeDecode extends PEAR
                 case 'multipart/alternative':
                 case 'multipart/related':
                 case 'multipart/mixed':
+                case 'application/vnd.wap.multipart.related':
                     if(!isset($content_type['other']['boundary'])){
                         $this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
                         return false;
@@ -337,7 +339,7 @@ class Mail_mimeDecode extends PEAR
 						$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
 						$return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body);
 					}
-                    $obj = &new Mail_mimeDecode($body);
+                    $obj = new Mail_mimeDecode($body);
                     $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
 					                                      'decode_bodies'  => $this->_decode_bodies,
 														  'decode_headers' => $this->_decode_headers));
@@ -417,6 +419,11 @@ class Mail_mimeDecode extends PEAR
         if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
             return array($match[1], $match[2]);
         }
+        // bug #17325 - empty bodies are allowed. - we just check that at least one line 
+        // of headers exist..
+        if (count(explode("\n",$input))) {
+            return array($input, '');
+        }
         $this->_error = 'Could not split header and body';
         return false;
     }
@@ -435,7 +442,12 @@ class Mail_mimeDecode extends PEAR
         if ($input !== '') {
             // Unfold the input
             $input   = preg_replace("/\r?\n/", "\r\n", $input);
+            //#7065 - wrapping.. with encoded stuff.. - probably not needed,
+            // wrapping space should only get removed if the trailing item on previous line is a 
+            // encoded character
+            $input   = preg_replace("/=\r\n(\t| )+/", '=', $input);
             $input   = preg_replace("/\r\n(\t| )+/", ' ', $input);
+            
             $headers = explode("\r\n", trim($input));
 
             foreach ($headers as $value) {
@@ -446,7 +458,7 @@ class Mail_mimeDecode extends PEAR
 
                 $return[] = array(
                                   'name'  => $hdr_name,
-                                  'value' => $this->_decode_headers ? $this->_decodeHeader($hdr_value) : $hdr_value
+                                  'value' =>  $hdr_value
                                  );
             }
         } else {
@@ -470,41 +482,161 @@ class Mail_mimeDecode extends PEAR
     function _parseHeaderValue($input)
     {
 
-        if (($pos = strpos($input, ';')) !== false) {
-
-            $return['value'] = trim(substr($input, 0, $pos));
-            $input = trim(substr($input, $pos+1));
-
-            if (strlen($input) > 0) {
-
-                // This splits on a semi-colon, if there's no preceeding backslash
-                // Now works with quoted values; had to glue the \; breaks in PHP
-                // the regex is already bordering on incomprehensible
-                $splitRegex = '/([^;\'"]*[\'"]([^\'"]*([^\'"]*)*)[\'"][^;\'"]*|([^;]+))(;|$)/';
-                preg_match_all($splitRegex, $input, $matches);
-                $parameters = array();
-                for ($i=0; $i<count($matches[0]); $i++) {
-                    $param = $matches[0][$i];
-                    while (substr($param, -2) == '\;') {
-                        $param .= $matches[0][++$i];
-                    }
-                    $parameters[] = $param;
-                }
-
-                for ($i = 0; $i < count($parameters); $i++) {
-                    $param_name  = trim(substr($parameters[$i], 0, $pos = strpos($parameters[$i], '=')), "'\";\t\\ ");
-                    $param_value = trim(str_replace('\;', ';', substr($parameters[$i], $pos + 1)), "'\";\t\\ ");
-                    if (!empty($param_value[0]) && $param_value[0] == '"') {
-                        $param_value = substr($param_value, 1, -1);
-                    }
-                    $return['other'][$param_name] = $param_value;
-                    $return['other'][strtolower($param_name)] = $param_value;
-                }
-            }
-        } else {
+        if (($pos = strpos($input, ';')) === false) {
+            $input = $this->_decode_headers ? $this->_decodeHeader($input) : $input;
             $return['value'] = trim($input);
+            return $return;
         }
 
+
+
+        $value = substr($input, 0, $pos);
+        $value = $this->_decode_headers ? $this->_decodeHeader($value) : $value;
+        $return['value'] = trim($value);
+        $input = trim(substr($input, $pos+1));
+
+        if (!strlen($input) > 0) {
+            return $return;
+        }
+        // at this point input contains xxxx=".....";zzzz="...."
+        // since we are dealing with quoted strings, we need to handle this properly..
+        $i = 0;
+        $l = strlen($input);
+        $key = '';
+        $val = false; // our string - including quotes..
+        $q = false; // in quote..
+        $lq = ''; // last quote..
+
+        while ($i < $l) {
+            
+            $c = $input[$i];
+            //var_dump(array('i'=>$i,'c'=>$c,'q'=>$q, 'lq'=>$lq, 'key'=>$key, 'val' =>$val));
+
+            $escaped = false;
+            if ($c == '\\') {
+                $i++;
+                if ($i == $l-1) { // end of string.
+                    break;
+                }
+                $escaped = true;
+                $c = $input[$i];
+            }            
+
+
+            // state - in key..
+            if ($val === false) {
+                if (!$escaped && $c == '=') {
+                    $val = '';
+                    $key = trim($key);
+                    $i++;
+                    continue;
+                }
+                if (!$escaped && $c == ';') {
+                    if ($key) { // a key without a value..
+                        $key= trim($key);
+                        $return['other'][$key] = '';
+                        $return['other'][strtolower($key)] = '';
+                    }
+                    $key = '';
+                }
+                $key .= $c;
+                $i++;
+                continue;
+            }
+                     
+            // state - in value.. (as $val is set..)
+
+            if ($q === false) {
+                // not in quote yet.
+                if ((!strlen($val) || $lq !== false) && $c == ' ' ||  $c == "\t") {
+                    $i++;
+                    continue; // skip leading spaces after '=' or after '"'
+                }
+                if (!$escaped && ($c == '"' || $c == "'")) {
+                    // start quoted area..
+                    $q = $c;
+                    // in theory should not happen raw text in value part..
+                    // but we will handle it as a merged part of the string..
+                    $val = !strlen(trim($val)) ? '' : trim($val);
+                    $i++;
+                    continue;
+                }
+                // got end....
+                if (!$escaped && $c == ';') {
+
+                    $val = trim($val);
+                    $added = false;
+                    if (preg_match('/\*[0-9]+$/', $key)) {
+                        // this is the extended aaa*0=...;aaa*1=.... code
+                        // it assumes the pieces arrive in order, and are valid...
+                        $key = preg_replace('/\*[0-9]+$/', '', $key);
+                        if (isset($return['other'][$key])) {
+                            $return['other'][$key] .= $val;
+                            if (strtolower($key) != $key) {
+                                $return['other'][strtolower($key)] .= $val;
+                            }
+                            $added = true;
+                        }
+                        // continue and use standard setters..
+                    }
+                    if (!$added) {
+                        $return['other'][$key] = $val;
+                        $return['other'][strtolower($key)] = $val;
+                    }
+                    $val = false;
+                    $key = '';
+                    $lq = false;
+                    $i++;
+                    continue;
+                }
+
+                $val .= $c;
+                $i++;
+                continue;
+            }
+            
+            // state - in quote..
+            if (!$escaped && $c == $q) {  // potential exit state..
+
+                // end of quoted string..
+                $lq = $q;
+                $q = false;
+                $i++;
+                continue;
+            }
+                
+            // normal char inside of quoted string..
+            $val.= $c;
+            $i++;
+        }
+        
+        // do we have anything left..
+        if (strlen(trim($key)) || $val !== false) {
+           
+            $val = trim($val);
+            $added = false;
+            if ($val !== false && preg_match('/\*[0-9]+$/', $key)) {
+                // no dupes due to our crazy regexp.
+                $key = preg_replace('/\*[0-9]+$/', '', $key);
+                if (isset($return['other'][$key])) {
+                    $return['other'][$key] .= $val;
+                    if (strtolower($key) != $key) {
+                        $return['other'][strtolower($key)] .= $val;
+                    }
+                    $added = true;
+                }
+                // continue and use standard setters..
+            }
+            if (!$added) {
+                $return['other'][$key] = $val;
+                $return['other'][strtolower($key)] = $val;
+            }
+        }
+        // decode values.
+        foreach($return['other'] as $key =>$val) {
+            $return['other'][$key] = $this->_decode_headers ? $this->_decodeHeader($val) : $val;
+        }
+       //print_r($return);
         return $return;
     }
 
@@ -526,13 +658,19 @@ class Mail_mimeDecode extends PEAR
         if ($boundary == $bs_check) {
             $boundary = $bs_possible;
         }
+        $tmp = preg_split("/--".preg_quote($boundary, '/')."((?=\s)|--)/", $input);
 
-        $tmp = explode('--' . $boundary, $input);
-
-        for ($i = 1; $i < count($tmp) - 1; $i++) {
-            $parts[] = $tmp[$i];
+        $len = count($tmp) -1;
+        for ($i = 1; $i < $len; $i++) {
+            if (strlen(trim($tmp[$i]))) {
+                $parts[] = $tmp[$i];
+            }
+        }
+        
+        // add the last part on if it does not end with the 'closing indicator'
+        if (!empty($tmp[$len]) && strlen(trim($tmp[$len])) && $tmp[$len][0] != '-') {
+            $parts[] = $tmp[$len];
         }
-
         return $parts;
     }
 
diff --git a/upload/ips_kernel/PEAR/Mail/mimePart.php b/upload/ips_kernel/PEAR/Mail/mimePart.php
index 186fa92f..ad6b2bb0 100644
--- a/upload/ips_kernel/PEAR/Mail/mimePart.php
+++ b/upload/ips_kernel/PEAR/Mail/mimePart.php
@@ -48,7 +48,7 @@
  * @author    Aleksander Machniak <alec@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   CVS: $Id: mimePart.php 296266 2010-03-16 10:21:59Z alec $
+ * @version   CVS: $Id: mimePart.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * @link      http://pear.php.net/package/Mail_mime
  */
 
@@ -141,17 +141,19 @@ class Mail_mimePart
     *     content_type      - The content type for this part eg multipart/mixed
     *     encoding          - The encoding to use, 7bit, 8bit,
     *                         base64, or quoted-printable
+    *     charset           - Content character set
     *     cid               - Content ID to apply
     *     disposition       - Content disposition, inline or attachment
     *     dfilename         - Filename parameter for content disposition
     *     description       - Content description
-    *     charset           - Character set to use
-    *     name_encoding     - Encoding for attachment name (Content-Type)
+    *     name_encoding     - Encoding of the attachment name (Content-Type)
     *                         By default filenames are encoded using RFC2231
     *                         Here you can set RFC2047 encoding (quoted-printable
     *                         or base64) instead
-    *     filename_encoding - Encoding for attachment filename (Content-Disposition)
+    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
     *                         See 'name_encoding'
+    *     headers_charset   - Charset of the headers e.g. filename, description.
+    *                         If not set, 'charset' will be used
     *     eol               - End of line sequence. Default: "\r\n"
     *     body_file         - Location of file with part's body (instead of $body)
     *
@@ -165,14 +167,8 @@ class Mail_mimePart
             $this->_eol = MAIL_MIMEPART_CRLF;
         }
 
-        $c_type = array();
-        $c_disp = array();
         foreach ($params as $key => $value) {
             switch ($key) {
-            case 'content_type':
-                $c_type['type'] = $value;
-                break;
-
             case 'encoding':
                 $this->_encoding = $value;
                 $headers['Content-Transfer-Encoding'] = $value;
@@ -182,29 +178,6 @@ class Mail_mimePart
                 $headers['Content-ID'] = '<' . $value . '>';
                 break;
 
-            case 'disposition':
-                $c_disp['disp'] = $value;
-                break;
-
-            case 'dfilename':
-                $c_disp['filename'] = $value;
-                $c_type['name'] = $value;
-                break;
-
-            case 'description':
-                $headers['Content-Description'] = $value;
-                break;
-
-            case 'charset':
-                $c_type['charset'] = $value;
-                $c_disp['charset'] = $value;
-                break;
-
-            case 'language':
-                $c_type['language'] = $value;
-                $c_disp['language'] = $value;
-                break;
-
             case 'location':
                 $headers['Content-Location'] = $value;
                 break;
@@ -215,50 +188,59 @@ class Mail_mimePart
             }
         }
 
+        // Default content-type
+        if (empty($params['content_type'])) {
+            $params['content_type'] = 'text/plain';
+        }
+
         // Content-Type
-        if (isset($c_type['type'])) {
-            $headers['Content-Type'] = $c_type['type'];
-            if (isset($c_type['name'])) {
-                $headers['Content-Type'] .= ';' . $this->_eol;
-                $headers['Content-Type'] .= $this->_buildHeaderParam(
-                    'name', $c_type['name'], 
-                    isset($c_type['charset']) ? $c_type['charset'] : 'US-ASCII', 
-                    isset($c_type['language']) ? $c_type['language'] : null,
-                    isset($params['name_encoding']) ?  $params['name_encoding'] : null
-                );
+        $headers['Content-Type'] = $params['content_type'];
+        if (!empty($params['charset'])) {
+            $charset = "charset={$params['charset']}";
+            // place charset parameter in the same line, if possible
+            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
+                $headers['Content-Type'] .= '; ';
+            } else {
+                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
             }
-            if (isset($c_type['charset'])) {
-                $headers['Content-Type']
-                    .= ';' . $this->_eol . " charset={$c_type['charset']}";
+            $headers['Content-Type'] .= $charset;
+
+            // Default headers charset
+            if (!isset($params['headers_charset'])) {
+                $params['headers_charset'] = $params['charset'];
             }
         }
-
-        // Content-Disposition
-        if (isset($c_disp['disp'])) {
-            $headers['Content-Disposition'] = $c_disp['disp'];
-            if (isset($c_disp['filename'])) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol;
-                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
-                    'filename', $c_disp['filename'], 
-                    isset($c_disp['charset']) ? $c_disp['charset'] : 'US-ASCII', 
-                    isset($c_disp['language']) ? $c_disp['language'] : null,
-                    isset($params['filename_encoding']) ?  $params['filename_encoding'] : null
-                );
-            }
-        }
-
-        if (!empty($headers['Content-Description'])) {
-            $headers['Content-Description'] = $this->encodeHeader(
-                'Content-Description', $headers['Content-Description'],
-                isset($c_type['charset']) ? $c_type['charset'] : 'US-ASCII',
-                isset($params['name_encoding']) ?  $params['name_encoding'] : 'quoted-printable',
-                $this->_eol
+        if (!empty($params['filename'])) {
+            $headers['Content-Type'] .= ';' . $this->_eol;
+            $headers['Content-Type'] .= $this->_buildHeaderParam(
+                'name', $params['filename'],
+                !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
+                !empty($params['language']) ? $params['language'] : null,
+                !empty($params['name_encoding']) ? $params['name_encoding'] : null
             );
         }
 
-        // Default content-type
-        if (!isset($headers['Content-Type'])) {
-            $headers['Content-Type'] = 'text/plain';
+        // Content-Disposition
+        if (!empty($params['disposition'])) {
+            $headers['Content-Disposition'] = $params['disposition'];
+            if (!empty($params['filename'])) {
+                $headers['Content-Disposition'] .= ';' . $this->_eol;
+                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
+                    'filename', $params['filename'],
+                    !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
+                    !empty($params['language']) ? $params['language'] : null,
+                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
+                );
+            }
+        }
+
+        if (!empty($params['description'])) {
+            $headers['Content-Description'] = $this->encodeHeader(
+                'Content-Description', $params['description'],
+                !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
+                !empty($params['name_encoding']) ? $params['name_encoding'] : 'quoted-printable',
+                $this->_eol
+            );
         }
 
         // Default encoding
@@ -960,33 +942,39 @@ class Mail_mimePart
      */
     function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
     {
-        if ($encoding == 'base64') {
+        // #17311: Use multibyte aware method (requires mbstring extension)
+        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
+            return $result;
+        }
+
+        // Generate the header using the specified params and dynamicly
+        // determine the maximum length of such strings.
+        // 75 is the value specified in the RFC.
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        $prefix = '=?' . $charset . '?' . $encoding .'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+        $maxLength1stLine = $maxLength - $prefix_len;
+
+        if ($encoding == 'B') {
             // Base64 encode the entire string
             $value = base64_encode($value);
 
-            // Generate the header using the specified params and dynamicly 
-            // determine the maximum length of such strings.
-            // 75 is the value specified in the RFC.
-            $prefix = '=?' . $charset . '?B?';
-            $suffix = '?=';
-            $maxLength = 75 - strlen($prefix . $suffix) - 2;
-            $maxLength1stLine = $maxLength - $prefix_len;
-
-            // We can cut base4 every 4 characters, so the real max
+            // We can cut base64 every 4 characters, so the real max
             // we can get must be rounded down.
             $maxLength = $maxLength - ($maxLength % 4);
             $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
 
             $cutpoint = $maxLength1stLine;
-            $value_out = $value;
             $output = '';
-            while ($value_out) {
+
+            while ($value) {
                 // Split translated string at every $maxLength
-                $part = substr($value_out, 0, $cutpoint);
-                $value_out = substr($value_out, $cutpoint);
+                $part = substr($value, 0, $cutpoint);
+                $value = substr($value, $cutpoint);
                 $cutpoint = $maxLength;
                 // RFC 2047 specifies that any split header should
-                // be seperated by a CRLF SPACE. 
+                // be seperated by a CRLF SPACE.
                 if ($output) {
                     $output .= $eol . ' ';
                 }
@@ -997,30 +985,19 @@ class Mail_mimePart
             // quoted-printable encoding has been selected
             $value = Mail_mimePart::encodeQP($value);
 
-            // Generate the header using the specified params and dynamicly 
-            // determine the maximum length of such strings.
-            // 75 is the value specified in the RFC.
-            $prefix = '=?' . $charset . '?Q?';
-            $suffix = '?=';
-            $maxLength = 75 - strlen($prefix . $suffix) - 3;
-            $maxLength1stLine = $maxLength - $prefix_len;
-            $maxLength = $maxLength - 1;
-
             // This regexp will break QP-encoded text at every $maxLength
             // but will not break any encoded letters.
             $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
             $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
 
-            $value_out = $value;
-            $realMax = $maxLength1stLine + strlen($prefix . $suffix);
-            if (strlen($value_out) >= $realMax) {
+            if (strlen($value) > $maxLength1stLine) {
                 // Begin with the regexp for the first line.
                 $reg = $reg1st;
                 $output = '';
-                while ($value_out) {
+                while ($value) {
                     // Split translated string at every $maxLength
                     // But make sure not to break any translated chars.
-                    $found = preg_match($reg, $value_out, $matches);
+                    $found = preg_match($reg, $value, $matches);
 
                     // After this first line, we need to use a different
                     // regexp for the first line.
@@ -1032,24 +1009,23 @@ class Mail_mimePart
                     if ($found) {
                         $part = $matches[0];
                         $len = strlen($matches[0]);
-                        $value_out = substr($value_out, $len);
+                        $value = substr($value, $len);
                     } else {
-                        $part = $value_out;
-                        $value_out = "";
+                        $part = $value;
+                        $value = '';
                     }
 
-                    // RFC 2047 specifies that any split header should 
+                    // RFC 2047 specifies that any split header should
                     // be seperated by a CRLF SPACE
                     if ($output) {
                         $output .= $eol . ' ';
                     }
                     $output .= $prefix . $part . $suffix;
                 }
-                $value_out = $output;
+                $value = $output;
             } else {
-                $value_out = $prefix . $value_out . $suffix;
+                $value = $prefix . $value . $suffix;
             }
-            $value = $value_out;
         }
 
         return $value;
@@ -1067,7 +1043,7 @@ class Mail_mimePart
     function encodeQP($str)
     {
         // Bug #17226 RFC 2047 restricts some characters
-        // if the word is inside a phrase, permit chars are only:
+        // if the word is inside a phrase, permitted chars are only:
         // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
 
         // "=",  "_",  "?" must be encoded
@@ -1079,6 +1055,110 @@ class Mail_mimePart
         return str_replace(' ', '_', $str);
     }
 
+    /**
+     * Encodes the given string using base64 or quoted-printable.
+     * This method makes sure that encoded-word represents an integral
+     * number of characters as per RFC2047.
+     *
+     * @param string $str        String to encode
+     * @param string $charset    Character set name
+     * @param string $encoding   Encoding name (base64 or quoted-printable)
+     * @param int    $prefix_len Prefix length. Default: 0
+     * @param string $eol        End-of-line sequence. Default: "\r\n"
+     *
+     * @return string     Encoded string
+     * @access public
+     * @since 1.8.0
+     */
+    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    {
+        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
+            return;
+        }
+
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        // 75 is the value specified in the RFC
+        $prefix = '=?' . $charset . '?'.$encoding.'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+
+        // A multi-octet character may not be split across adjacent encoded-words
+        // So, we'll loop over each character
+        // mb_stlen() with wrong charset will generate a warning here and return null
+        $length      = mb_strlen($str, $charset);
+        $result      = '';
+        $line_length = $prefix_len;
+
+        if ($encoding == 'B') {
+            // base64
+            $start = 0;
+            $prev  = '';
+
+            for ($i=1; $i<=$length; $i++) {
+                // See #17311
+                $chunk = mb_substr($str, $start, $i-$start, $charset);
+                $chunk = base64_encode($chunk);
+                $chunk_len = strlen($chunk);
+
+                if ($line_length + $chunk_len == $maxLength || $i == $length) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $result .= $chunk;
+                    $line_length = 0;
+                    $start = $i;
+                } else if ($line_length + $chunk_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    if ($prev) {
+                        $result .= $prev;
+                    }
+                    $line_length = 0;
+                    $start = $i - 1;
+                } else {
+                    $prev = $chunk;
+                }
+            }
+        } else {
+            // quoted-printable
+            // see encodeQP()
+            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+
+            for ($i=0; $i<=$length; $i++) {
+                $char = mb_substr($str, $i, 1, $charset);
+                // RFC recommends underline (instead of =20) in place of the space
+                // that's one of the reasons why we're not using iconv_mime_encode()
+                if ($char == ' ') {
+                    $char = '_';
+                    $char_len = 1;
+                } else {
+                    $char = preg_replace_callback(
+                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
+                    );
+                    $char_len = strlen($char);
+                }
+
+                if ($line_length + $char_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $line_length = 0;
+                }
+
+                $result      .= $char;
+                $line_length += $char_len;
+            }
+        }
+
+        if ($result) {
+            $result = $prefix
+                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
+        }
+
+        return $result;
+    }
+
     /**
      * Callback function to replace extended characters (\x80-xFF) with their
      * ASCII values (RFC2047: quoted-printable)
diff --git a/upload/ips_kernel/PEAR/Text/Diff.php b/upload/ips_kernel/PEAR/Text/Diff.php
index 00fd2f5d..fa780efe 100644
--- a/upload/ips_kernel/PEAR/Text/Diff.php
+++ b/upload/ips_kernel/PEAR/Text/Diff.php
@@ -49,7 +49,7 @@ class Text_Diff {
             $engine = basename($engine);
         }
 
-        require_once 'Text/Diff/Engine/' . $engine . '.php';
+        require_once 'Text/Diff/Engine/' . $engine . '.php';/*noLibHook*/
         $class = 'Text_Diff_Engine_' . $engine;
         $diff_engine = new $class();
 
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Engine/index.html b/upload/ips_kernel/PEAR/Text/Diff/Engine/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Engine/index.html
+++ b/upload/ips_kernel/PEAR/Text/Diff/Engine/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/context.php b/upload/ips_kernel/PEAR/Text/Diff/Renderer/context.php
index af538015..aea3f038 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/context.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/context.php
@@ -15,7 +15,7 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+require_once 'Text/Diff/Renderer.php';/*noLibHook*/
 
 /**
  * @package Text_Diff
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/index.html b/upload/ips_kernel/PEAR/Text/Diff/Renderer/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/index.html
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/inline.php b/upload/ips_kernel/PEAR/Text/Diff/Renderer/inline.php
index 5dd20d2f..813eff1c 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/inline.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/inline.php
@@ -14,7 +14,7 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+require_once 'Text/Diff/Renderer.php';/*noLibHook*/
 
 /**
  * "Inline" diff renderer.
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/ips3waymerge.php b/upload/ips_kernel/PEAR/Text/Diff/Renderer/ips3waymerge.php
index fb50cff7..64ec23d5 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/ips3waymerge.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/ips3waymerge.php
@@ -16,7 +16,7 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+require_once 'Text/Diff/Renderer.php';/*noLibHook*/
 
 /**
  * @package Text_Diff
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/ipsunified.php b/upload/ips_kernel/PEAR/Text/Diff/Renderer/ipsunified.php
index 00d92641..8bd79d7b 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/ipsunified.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/ipsunified.php
@@ -14,7 +14,7 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+require_once 'Text/Diff/Renderer.php';/*noLibHook*/
 
 /**
  * "Inline" diff renderer.
diff --git a/upload/ips_kernel/PEAR/Text/Diff/Renderer/unified.php b/upload/ips_kernel/PEAR/Text/Diff/Renderer/unified.php
index f990f729..9e4ca038 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/Renderer/unified.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/Renderer/unified.php
@@ -16,7 +16,7 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+require_once 'Text/Diff/Renderer.php';/*noLibHook*/
 
 /**
  * @package Text_Diff
diff --git a/upload/ips_kernel/PEAR/Text/Diff/ThreeWay.php b/upload/ips_kernel/PEAR/Text/Diff/ThreeWay.php
index 1f0d35b8..73e11fdf 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/ThreeWay.php
+++ b/upload/ips_kernel/PEAR/Text/Diff/ThreeWay.php
@@ -14,7 +14,7 @@
  */
 
 /** Text_Diff */
-require_once 'Text/Diff.php';
+require_once 'Text/Diff.php';/*noLibHook*/
 
 /**
  * A class for computing three way diffs.
diff --git a/upload/ips_kernel/PEAR/Text/Diff/index.html b/upload/ips_kernel/PEAR/Text/Diff/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/Text/Diff/index.html
+++ b/upload/ips_kernel/PEAR/Text/Diff/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/Text/Diff3.php b/upload/ips_kernel/PEAR/Text/Diff3.php
index 5e4b9273..59fa0dd9 100644
--- a/upload/ips_kernel/PEAR/Text/Diff3.php
+++ b/upload/ips_kernel/PEAR/Text/Diff3.php
@@ -14,7 +14,7 @@
  */
 
 /** Text_Diff */
-require_once 'Text/Diff.php';
+require_once 'Text/Diff.php';/*noLibHook*/
 
 /**
  * A class for computing three way diffs.
@@ -41,10 +41,10 @@ class Text_Diff3 extends Text_Diff {
     function Text_Diff3($orig, $final1, $final2)
     {
         if (extension_loaded('xdiff')) {
-        	require_once 'Text/Diff/Engine/xdiff.php';
+        	require_once 'Text/Diff/Engine/xdiff.php';/*noLibHook*/
             $engine = new Text_Diff_Engine_xdiff();
         } else {
-        	require_once 'Text/Diff/Engine/native.php';
+        	require_once 'Text/Diff/Engine/native.php';/*noLibHook*/
             $engine = new Text_Diff_Engine_native();
         }
         
diff --git a/upload/ips_kernel/PEAR/Text/index.html b/upload/ips_kernel/PEAR/Text/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/Text/index.html
+++ b/upload/ips_kernel/PEAR/Text/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/PEAR/index.html b/upload/ips_kernel/PEAR/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/PEAR/index.html
+++ b/upload/ips_kernel/PEAR/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/classAjax.php b/upload/ips_kernel/classAjax.php
index 0b61570d..9afb618b 100644
--- a/upload/ips_kernel/classAjax.php
+++ b/upload/ips_kernel/classAjax.php
@@ -2,19 +2,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * AJAX input parsing and handling
- * Last Updated: $Date: 2010-10-14 13:11:17 -0400 (Thu, 14 Oct 2010) $
+ * Last Updated: $Date: 2011-09-29 11:44:06 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: ips_terabyte $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 477 $
+ * @version		$Revision: 9567 $
+ * 
  */
 
 
@@ -39,7 +40,7 @@ class classAjax
 	 *
 	 * @var		array			Charsets supported by html_entity_decode
 	 */
-	private $decodeCharsets = array('iso-8859-1'	=> 'ISO-8859-1',
+	protected $decodeCharsets = array('iso-8859-1'	=> 'ISO-8859-1',
 									'iso8859-1' 	=> 'ISO-8859-1',
 									'iso-8859-15' 	=> 'ISO-8859-15',
 									'iso8859-15' 	=> 'ISO-8859-15',
@@ -66,7 +67,7 @@ class classAjax
 	/**
 	 * Constructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -78,7 +79,7 @@ class classAjax
 		$this->xml_header = "<?xml version=\"1.0\" encoding=\"" . IPS_DOC_CHAR_SET . "\"?".'>';
 
 		/* Convert incoming $_POST fields */
-		array_walk_recursive( $_POST, create_function( '&$value, $key', '$value = IPSText::convertCharsets( IPSText::convertUnicode($value), "utf-8", "' . IPS_DOC_CHAR_SET . '" );' ) );
+		array_walk_recursive( $_POST, array( $this, 'arrayWalkConvert' ) );
 		
 		//-----------------------------------------
 		// Using this code allows characters that ARE supported
@@ -96,6 +97,21 @@ class classAjax
 		//array_walk_recursive( $_GET , create_function( '&$value, $key', '$value = IPSText::convertUnicode($value);' ) );
 		//array_walk_recursive( ipsRegistry::$request, create_function( '&$value, $key', '$value = IPSText::convertUnicode($value);' ) );
 	}
+	
+	/**
+	 * Callback to convert unicode and charset for AJAX requests
+	 * 
+	 * @param	mixed		Value
+	 * @param	string		Key
+	 * @return	void
+	 */
+ 	public function arrayWalkConvert( &$value, $key )
+ 	{
+ 		if( is_string( $value ) )
+ 		{
+ 			$value = IPSText::convertCharsets( IPSText::convertUnicode( $value ), "utf-8", IPS_DOC_CHAR_SET );
+ 		}
+ 	}
 
  	/**
 	 * Convert and make safe an incoming string
@@ -152,7 +168,7 @@ class classAjax
 	/**
 	 * Print an error
 	 *
-	 * @return	void		[Outputs XML document and exits]
+	 * @return	@e void		[Outputs XML document and exits]
 	 */
 	public function returnGenericError()
 	{
@@ -171,7 +187,7 @@ class classAjax
 	 * Return a NULL result
 	 *
 	 * @param	mixed		Value to send
-	 * @return	void		[Outputs XML document and exits]
+	 * @return	@e void		[Outputs XML document and exits]
 	 */
 	public function returnNull( $val=0 )
 	{
@@ -188,7 +204,7 @@ class classAjax
 	 * Return a string
 	 *
 	 * @param	string		String to output
-	 * @return	void		[Outputs plaintext string]
+	 * @return	@e void		[Outputs plaintext string]
 	 */
 	public function returnString($string)
 	{
@@ -203,32 +219,49 @@ class classAjax
 	 * Return a JSON error message
 	 *
 	 * @param	string		Error message
-	 * @return	void		[Outputs JSON string and exits]
+	 * @return	@e void		[Outputs JSON string and exits]
 	 */
-	public function returnJsonError( $message )
+	public function returnJsonError( $message, $header="application/json" )
 	{
 		/* Just alias it... */
-		$this->returnJsonArray( array( 'error' => $message ) );
+		$this->returnJsonArray( array( 'error' => $message ), false, $header );
 	}
 
 	/**
 	 * Return a JSON array
 	 *
 	 * @param	array		Single dimensional array of key => value fields
-	 * @return	void		[Outputs JSON string and exits]
+	 * @param	boolean		Clean the data (used when passing HTML)
+	 * @param	string		Optional string (default application/json)
+	 * @param	array		Optional array (template group, bit name) to pass JSON in a custom function
+	 * @return	@e void		[Outputs JSON string and exits]
 	 */
-	public function returnJsonArray( $json=array() )
+	public function returnJsonArray( $json=array(), $cleanData=false, $header="application/json", $templateWrapper=array() )
 	{
-		@header( "Content-type: application/json;charset=" . IPS_DOC_CHAR_SET );
+		@header( "Content-type: " . $header . ";charset=" . IPS_DOC_CHAR_SET );
 		$this->printNocacheHeaders();
 		
 		/* Always return as UTF-8 */
-		array_walk_recursive( $json, create_function( '&$value, $key', '$value = IPSText::convertCharsets($value, "' . IPS_DOC_CHAR_SET . '", "UTF-8");' ) );
-
+		array_walk_recursive( $json, array( 'IPSText', 'arrayWalkCallbackConvert' ) );
+		
+		if ( $cleanData )
+		{
+			array_walk_recursive( $json, array( $this, 'cleanHtml' ) );
+		}
+		
 		$result	= json_encode( $json );
 		$result	= IPSText::convertCharsets($result, "UTF-8", IPS_DOC_CHAR_SET);
-		print $result;
 		
+		/* Print via a wrapper? */
+		if ( is_array( $templateWrapper ) AND count( $templateWrapper ) )
+		{
+			print ipsRegistry::getClass('output')->getTemplate( $templateWrapper[0] )->$templateWrapper[1]( $result );
+		}
+		else
+		{
+			print $result;
+		}
+			
 		exit();
 	}
 	
@@ -236,31 +269,20 @@ class classAjax
 	 * Return HTML content
 	 *
 	 * @param	string		HTML to output
-	 * @return	void		[Outputs HTML and exits]
+	 * @param	boolean		Convert output on the fly
+	 * @return	@e void		[Outputs HTML and exits]
 	 */
-	public function returnHtml( $string )
+	public function returnHtml( $string, $returnAsUtf8=false )
 	{
-		//-----------------------------------------
-		// Stop one from removing cookie protection
-		//-----------------------------------------
-
-		$string = ( $string ) ? $string : '<!--nothing-->';
-		
-		// Fix IE bugs
-		$string = str_ireplace( "&sect", 	"&amp;sect", 	$string );
-		
-		if ( strtolower( IPS_DOC_CHAR_SET ) == 'iso-8859-1' )
+		if ( $string )
 		{
-			$string = str_replace( "ì", "&#8220;", $string );
-			$string = str_replace( "î", "&#8221;", $string );
+			$this->cleanHtml( $string );
 		}
-
-		// Other stuff
-		$string = ipsRegistry::getClass('output')->replaceMacros( $string );
-				
-		if ( ! IN_ACP )
+		
+		/* Always return as UTF-8 */
+		if ( $returnAsUtf8 )
 		{
-			$string = $this->parseAndCleanHooks( $string );
+			$string = IPSText::convertCharsets( $string, IPS_DOC_CHAR_SET, "UTF-8" );
 		}
 		
 		@header( "Content-type: text/html;charset=" . IPS_DOC_CHAR_SET );
@@ -287,7 +309,7 @@ class classAjax
 	/**
 	 * Print nocache headers
 	 *
-	 * @return	void		[Outputs headers]
+	 * @return	@e void		[Outputs headers]
 	 */
 	public function printNocacheHeaders()
 	{
@@ -371,4 +393,31 @@ class classAjax
    		
    		return $t;
 	}
+	
+	/**
+	 * Cleans a HTML string
+	 * @param	string	$string
+	 * @return	string	clean
+	 */
+	public function cleanHtml( &$string, $key='' )
+	{ 
+		// Fix IE bugs
+		$string = str_ireplace( "&sect", 	"&amp;sect", 	$string );
+		
+		if ( strtolower( IPS_DOC_CHAR_SET ) == 'iso-8859-1' )
+		{
+			$string = str_replace( "ì", "&#8220;", $string );
+			$string = str_replace( "î", "&#8221;", $string );
+		}
+
+		// Other stuff
+		$string = ipsRegistry::getClass('output')->replaceMacros( $string );
+				
+		if ( ! IN_ACP )
+		{
+			$string = $this->parseAndCleanHooks( $string );
+		}
+		
+		return $string;
+	}
 }
\ No newline at end of file
diff --git a/upload/ips_kernel/classApiServer.php b/upload/ips_kernel/classApiServer.php
index a6fb9884..1ad83266 100644
--- a/upload/ips_kernel/classApiServer.php
+++ b/upload/ips_kernel/classApiServer.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class can act as an API server, handling API requests
- * Last Updated: $Date: 2010-08-20 17:38:30 -0400 (Fri, 20 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 6th January 2006 (12:24)
- * @version		$Revision: 450 $
+ * @version		$Revision: 8644 $
  *
  * Examples of sending and receiving API data
  * <code>
@@ -48,7 +48,6 @@ class classApiServer
 	/**
 	 * XML-RPC class
 	 *
-	 * @access	public
 	 * @var 		object
 	 */
 	public $xmlrpc;
@@ -56,7 +55,6 @@ class classApiServer
 	/**
 	 * Raw incoming data
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
 	public $raw_request;
@@ -64,31 +62,27 @@ class classApiServer
 	/**
 	 * Requested method name
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
-	private $method_name;
+	protected $method_name;
 	
 	/**
 	 * Raw data incoming
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
-	private $_raw_in_data;
+	protected $_raw_in_data;
 		
 	/**
 	 * Raw data output
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
-	private $_raw_out_data;
+	protected $_raw_out_data;
 	
 	/**
 	 * Method params
 	 *
-	 * @access	public
 	 * @var 		array
 	 */
 	public $params			= array();
@@ -96,23 +90,20 @@ class classApiServer
 	/**
 	 * XML-RPC serialized 64 key
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
-	private $serialized_key = '__serialized64__';
+	protected $serialized_key = '__serialized64__';
 	
 	/**
 	 * Server function object
 	 *
-	 * @access	private
 	 * @var 		object
 	 */
-	private $xml_server;
+	protected $xml_server;
 	
 	/**
 	 * Return cookie information
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $cookies = array();
@@ -120,15 +111,13 @@ class classApiServer
 	/**
 	 * XML-RPC cookie serialized 64 key
 	 *
-	 * @access	private
 	 * @var 		string
 	 */
-	private $cookie_serialized_key = '__cookie__serialized64__';
+	protected $cookie_serialized_key = '__cookie__serialized64__';
 	
 	/**#@+
 	 * HTTP Auth required
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $auth_user = '';
@@ -138,7 +127,6 @@ class classApiServer
 	/**
 	 * Errors array
 	 *
-	 * @access	public
 	 * @var 		array
 	 */
 	public $errors = array();
@@ -146,14 +134,13 @@ class classApiServer
     /**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
 		if ( ! is_object( $this->xmlrpc ) )
 		{
-			require_once( IPS_KERNEL_PATH . '/classXmlRpc.php' );
+			require_once( IPS_KERNEL_PATH . '/classXmlRpc.php' );/*noLibHook*/
 			$this->xmlrpc = new classXmlRpc();
 		}
 		
@@ -163,7 +150,6 @@ class classApiServer
     /**
 	 * Add object map to this class
 	 *
-	 * @access	public
 	 * @param    string    Incoming data
 	 * @return   string    api
 	 */
@@ -199,7 +185,6 @@ class classApiServer
 	/**
 	 * Add object map to this class
 	 *
-	 * @access	public
 	 * @param	object		Server class object
 	 * @param	string		Document type
 	 * @return	boolean
@@ -223,7 +208,6 @@ class classApiServer
 	/**
 	 * Get the XML-RPC data
 	 *
-	 * @access	public
 	 * @param	string		Incoming data
 	 * @return	mixed		Boolean, Output error 
 	 */
@@ -304,9 +288,8 @@ class classApiServer
 	/**
 	 * Set a cookie for the API request
 	 *
-	 * @access	public
 	 * @param	array		Array of params to send
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function apiAddCookieData( $data )
 	{
@@ -319,11 +302,10 @@ class classApiServer
 	/**
 	 * Return API Request
 	 *
-	 * @access	public
 	 * @param	array		Array of params to send
 	 * @param	int  		Complex data: Encode before sending
 	 * @param	array 		Forced data type mapping
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function apiSendReply( $data=array(), $complex_data=0, $force=array() )
 	{
@@ -385,10 +367,9 @@ class classApiServer
 	/**
 	 * Return API Request (ERROR)
 	 *
-	 * @access	public
 	 * @param	int 		Error Code
 	 * @param	string  	Error message
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function apiSendError( $error_code, $error_msg )
 	{
@@ -398,9 +379,8 @@ class classApiServer
 	/**
 	 * Decode API Request
 	 *
-	 * @access	public
 	 * @param	string		Raw data picked up
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function apiDecodeRequest( $raw_data )
 	{
@@ -420,7 +400,6 @@ class classApiServer
 	/**
 	 * Send API Request
 	 *
-	 * @access	public
 	 * @param	string		URL to send request to
 	 * @param	string		Method name for API to pick up
 	 * @param	array		Data to send
@@ -485,7 +464,6 @@ class classApiServer
 	/**
 	 * Process returned data
 	 *
-	 * @access	public
 	 * @param	array		Raw array
 	 * @return	array   	Cleaned array
 	 */
@@ -572,11 +550,10 @@ class classApiServer
 	/**
 	 * Encode array
 	 *
-	 * @access	private
 	 * @param	array	Raw array
 	 * @return	string  Encoded string
 	 */
-	private function _encodeBase64Array( $array )
+	protected function _encodeBase64Array( $array )
 	{
 		return base64_encode( serialize( $array ) );
 	}
@@ -584,11 +561,10 @@ class classApiServer
 	/**
 	 * Decode array
 	 *
-	 * @access	private
 	 * @param	string  Encoded string
 	 * @return	array	Raw array
 	 */
-	private function _decodeBase64Array( $data )
+	protected function _decodeBase64Array( $data )
 	{
 		if ( ! is_array( $data ) )
 		{
diff --git a/upload/ips_kernel/classCacheApc.php b/upload/ips_kernel/classCacheApc.php
index fa75bd65..efd9ae57 100644
--- a/upload/ips_kernel/classCacheApc.php
+++ b/upload/ips_kernel/classCacheApc.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 8024 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,15 +35,14 @@ class classCacheApc implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
     /**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @return	boolean		Initiation successful
 	 */
@@ -61,7 +60,6 @@ class classCacheApc implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -77,7 +75,6 @@ class classCacheApc implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -89,7 +86,6 @@ class classCacheApc implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -104,7 +100,6 @@ class classCacheApc implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
diff --git a/upload/ips_kernel/classCacheDiskcache.php b/upload/ips_kernel/classCacheDiskcache.php
index 4101e4bc..795a9a7b 100644
--- a/upload/ips_kernel/classCacheDiskcache.php
+++ b/upload/ips_kernel/classCacheDiskcache.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 8042 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,15 +35,14 @@ class classCacheDiskcache implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
     /**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @return	boolean		Initiation successful
 	 */
@@ -55,7 +54,7 @@ class classCacheDiskcache implements interfaceCache
 			return false;
 		}
 		
-		if( !file_exists( DOC_IPS_ROOT_PATH . 'cache/diskcache_lock.php' ) )
+		if( !is_file( DOC_IPS_ROOT_PATH . 'cache/diskcache_lock.php' ) )
 		{
 			$fh = @fopen( DOC_IPS_ROOT_PATH . 'cache/diskcache_lock.php', 'wb' );
 			
@@ -74,7 +73,6 @@ class classCacheDiskcache implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -115,7 +113,7 @@ class classCacheDiskcache implements interfaceCache
 		flock( $fh, LOCK_UN );
 		fclose( $fh );
 		
-		@chmod( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php', 0777 );
+		@chmod( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php', IPS_FILE_PERMISSION );
 		
 		flock( $lock, LOCK_UN );
 		fclose( $lock );
@@ -126,7 +124,6 @@ class classCacheDiskcache implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -141,18 +138,18 @@ class classCacheDiskcache implements interfaceCache
 		
 		$return_val = "";
 		
-		if( file_exists( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' ) )
+		if( is_file( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' ) )
 		{
-			require DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php';
+			require DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php';/*noLibHook*/
 			
 			$return_val = stripslashes($value);
 
-			if( isset($is_array) AND $is_array == 1 )
+			if( !empty($is_array) )
 			{
 				$return_val = unserialize($return_val);
 			}
 			
-			if( isset($ttl) AND $ttl > 0 )
+			if( !empty($ttl) )
 			{
 				if( $mtime = filemtime( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' ) )
 				{
@@ -175,7 +172,6 @@ class classCacheDiskcache implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -194,7 +190,6 @@ class classCacheDiskcache implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
@@ -207,7 +202,7 @@ class classCacheDiskcache implements interfaceCache
 			flock( $lock, LOCK_EX );
 		}
 		
-		if( file_exists( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' ) )
+		if( is_file( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' ) )
 		{
 			@unlink( DOC_IPS_ROOT_PATH . 'cache/' . md5( $this->identifier . $key ) . '.php' );
 		}
diff --git a/upload/ips_kernel/classCacheEaccelerator.php b/upload/ips_kernel/classCacheEaccelerator.php
index a7e36aaf..2ae6f44e 100644
--- a/upload/ips_kernel/classCacheEaccelerator.php
+++ b/upload/ips_kernel/classCacheEaccelerator.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 8024 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,15 +35,14 @@ class classCacheEaccelerator implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
     /**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @return	boolean		Initiation successful
 	 */
@@ -61,7 +60,6 @@ class classCacheEaccelerator implements interfaceCache
     /**
 	 * Disconnect from remote cache store
 	 *
-	 * @access	public
 	 * @return	boolean		Disconnect successful
 	 */
 	public function disconnect()
@@ -77,7 +75,6 @@ class classCacheEaccelerator implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -95,7 +92,6 @@ class classCacheEaccelerator implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -107,7 +103,6 @@ class classCacheEaccelerator implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -122,7 +117,6 @@ class classCacheEaccelerator implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
diff --git a/upload/ips_kernel/classCacheMemcache.php b/upload/ips_kernel/classCacheMemcache.php
index e3a544f6..99ca645e 100644
--- a/upload/ips_kernel/classCacheMemcache.php
+++ b/upload/ips_kernel/classCacheMemcache.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-08-04 12:03:04 -0400 (Wed, 04 Aug 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 444 $
+ * @version		$Revision: 8024 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,23 +35,21 @@ class classCacheMemcache implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
 	/**
 	 * Connection resource
 	 *
-	 * @access	private
 	 * @var		resource	Connection resource
 	 */
-	private $link		= null;
+	protected $link		= null;
 	
     /**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @param	array 		Connection information
 	 * @return	boolean		Initiation successful
@@ -72,11 +70,10 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Connect to memcache server
 	 *
-	 * @access	private
 	 * @param	array 		Connection information
 	 * @return	boolean		Initiation successful
 	 */
-	private function _connect( $server_info=array() )
+	protected function _connect( $server_info=array() )
 	{
 		if( !count($server_info) )
 		{
@@ -129,7 +126,6 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Disconnect from remote cache store
 	 *
-	 * @access	public
 	 * @return	boolean		Disconnect successful
 	 */
 	public function disconnect()
@@ -145,7 +141,6 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -159,7 +154,6 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -171,7 +165,6 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -186,7 +179,6 @@ class classCacheMemcache implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
diff --git a/upload/ips_kernel/classCacheWincache.php b/upload/ips_kernel/classCacheWincache.php
index e8fde276..b4346993 100644
--- a/upload/ips_kernel/classCacheWincache.php
+++ b/upload/ips_kernel/classCacheWincache.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 8024 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,15 +35,14 @@ class classCacheWincache implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
     /**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @return	boolean		Initiation successful
 	 */
@@ -61,7 +60,6 @@ class classCacheWincache implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -77,7 +75,6 @@ class classCacheWincache implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -89,7 +86,6 @@ class classCacheWincache implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -104,7 +100,6 @@ class classCacheWincache implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
diff --git a/upload/ips_kernel/classCacheXcache.php b/upload/ips_kernel/classCacheXcache.php
index b2f1527e..5d86aedf 100644
--- a/upload/ips_kernel/classCacheXcache.php
+++ b/upload/ips_kernel/classCacheXcache.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-03-10 21:04:50 -0500 (Thu, 10 Mar 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 8024 $
  *
  * Basic Usage Examples
  * <code>
@@ -35,15 +35,14 @@ class classCacheXcache implements interfaceCache
 {
 	/**
 	 * Identifier
-	 * @access	private
+	 *
 	 * @var		string
 	 */
-	private $identifier	= '';
+	protected $identifier	= '';
 	
     /**
-	* Constructor
+	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string 		Unique identifier
 	 * @return	boolean		Initiation successful
 	 */
@@ -61,7 +60,6 @@ class classCacheXcache implements interfaceCache
     /**
 	 * Put data into remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to add
 	 * @param	integer		[Optional] Time to live
@@ -84,7 +82,6 @@ class classCacheXcache implements interfaceCache
     /**
 	 * Retrieve a value from remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	mixed		Cached value
 	 */
@@ -103,7 +100,6 @@ class classCacheXcache implements interfaceCache
     /**
 	 * Update value in remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @param	string		Cache value to set
 	 * @param	integer		[Optional] Time to live
@@ -118,7 +114,6 @@ class classCacheXcache implements interfaceCache
     /**
 	 * Remove a value in the remote cache store
 	 *
-	 * @access	public
 	 * @param	string		Cache unique key
 	 * @return	boolean		Cache removal successful
 	 */
diff --git a/upload/ips_kernel/classCaptcha.php b/upload/ips_kernel/classCaptcha.php
index 38204388..67d1fc90 100644
--- a/upload/ips_kernel/classCaptcha.php
+++ b/upload/ips_kernel/classCaptcha.php
@@ -1,123 +1,69 @@
 <?php
 
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * CAPTCHA abstraction - easily create, check and display CAPTHCA images
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @file		classCaptcha.php 	Provides methods to handle CAPTCHA abstraction - easily create, check and display CAPTHCA images
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * $LastChangedDate: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8042 $
  */
 
+/**
+ *
+ * @class		classCaptcha
+ * @brief		Provides methods to handle CAPTCHA abstraction - easily create, check and display CAPTHCA images
+ *
+ */
 class classCaptcha
 {
 	/**
-	 * Registry object
+	 * Registry Object Shortcuts
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$registry
+	 * @var		$settings
 	 */
-	protected $registry;
+	public $registry;
+	public $settings;
 	
 	/**
-	 * Database object
+	 * Object that stored the plug in class
 	 *
-	 * @access	protected
-	 * @var		object
+	 * @var		$_plugInClass
 	 */
-	protected $DB;
-	
-	/**
-	 * Settings object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $settings;
-	
-	/**
-	 * Request object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $request;
-	
-	/**
-	 * Language object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $lang;
-	
-	/**
-	 * Member object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $member;
-	
-	/**
-	 * Member data object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	protected $memberData;	
-	
-	/**
-	 * Plug in class
-	 *
-	 * @access	private
-	 * @var		object
-	 */
-	private $_plugInClass;
+	protected $_plugInClass;
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object	ipsRegistry
-	 * @return	void
+	 * @param	object		$registry		Registry Object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
-		$this->registry = $registry;
-		$this->DB       = $this->registry->DB();
+		$this->registry =  $registry;
 		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang     = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
 		
 		$plugin = $this->settings['bot_antispam_type'];
 		
-		if ( ! file_exists( IPS_KERNEL_PATH . 'classCaptchaPlugin/' . $plugin . '.php' ) )
+		if ( ! is_file( IPS_KERNEL_PATH . 'classCaptchaPlugin/' . $plugin . '.php' ) )
 		{
 			$plugin = 'default';
 		}
 	
-		require_once( IPS_KERNEL_PATH . 'classCaptchaPlugin/' . $plugin . '.php' );
+		require_once( IPS_KERNEL_PATH . 'classCaptchaPlugin/' . $plugin . '.php' );/*noLibHook*/
 		$this->_plugInClass = new captchaPlugIn( $registry );
 	}
 	
 	/**
-	 * Magic Call method
+	 * Magic __call method
 	 *
-	 * @param	string	Method Name
-	 * @param	mixed	Method arguments
-	 * @return   mixed
+	 * @param	string		$method		Method name
+	 * @param	mixed		$arguments	Method arguments
+	 * @return	@e mixed
 	 */
 	public function __call( $method, $arguments )
 	{
@@ -134,9 +80,8 @@ class classCaptcha
 	/**
 	 * Magic __get method
 	 *
-	 * @access	public
-	 * @param	mixed
-	 * @return	mixed
+	 * @param	string		$name		Property name
+	 * @return	@e mixed
 	 */
 	public function __get( $name )
 	{
@@ -149,5 +94,4 @@ class classCaptcha
 			trigger_error( $name . " не �уще�твует", E_USER_ERROR );
 		}
 	}
-
-}
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/classCaptchaPlugin/default.php b/upload/ips_kernel/classCaptchaPlugin/default.php
index dc82509d..e95f9dbd 100644
--- a/upload/ips_kernel/classCaptchaPlugin/default.php
+++ b/upload/ips_kernel/classCaptchaPlugin/default.php
@@ -1,156 +1,86 @@
 <?php
-
 /**
- * CAPTCHA CLASS
- * Database Table
- * <code>
- * CREATE TABLE captcha (
- * 	captcha_unique_id	VARCHAR(32) NOT NULL default '',
- * 	captcha_string		VARCHAR(100) NOT NULL default '',
- * 	captcha_ipaddress	VARCHAR(16) NOT NULL default '',
- * 	captcha_date		INT(10) NOT NULL default '',
- * 	PRIMARY KEY (captcha_unique_id )
- * );
- * </code>
- * PLUG IN: Default GD image
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Last Updated: $Date: 2010-09-13 17:11:29 -0400 (Mon, 13 Sep 2010) $
- * </pre>
- *
- * @package		IP.Board
- * @subpackage	Kernel
- * @author		Matt Mecham
- * @copyright	Invision Power Services, Inc.
- * @version		1.0
+ * @file		default.php 	Plugin for the default CAPTCHA GD image
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		Friday 19th May 2006 17:33
+ * $LastChangedDate: 2011-08-17 17:49:31 -0400 (Wed, 17 Aug 2011) $
+ * @version		v3.2.3
+ * $Revision: 9396 $
  */
 
+/**
+ *
+ * @class		captchaPlugin
+ * @brief		Plugin for the default CAPTCHA GD image
+ * @note		This plugin is automatically loaded by classCaptcha class based on the CAPTCHA setting
+ *
+ */
 class captchaPlugin
 {
 	/**
-	 * GD version
+	 * Registry Object Shortcuts
 	 *
-	 * @access	public
-	 * @var 		integer
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$member
 	 */
-	public $gd_version			= 0;
+	public $registry;
+	public $DB;
+	public $settings;
+	public $member;
 	
 	/**
-	 * Backgrounds path
+	 * String that stores the backgrounds path
 	 *
-	 * @access	public
-	 * @var 		string
+	 * @var		$path_background
 	 */
 	public $path_background		= '';
 	
 	/**
-	 * Fonts path
+	 * String that stores the fonts path
 	 *
-	 * @access	public
-	 * @var 		string
+	 * @var		$path_fonts
 	 */
 	public $path_fonts			= '';
-	
-	/**
-	 * Return an error if GD is not installed?
-	 * My most verbose string name. I'm so proud.
-	 *
-	 * @access	public
-	 * @var 		boolean
-	 */
-	public $show_error_gd_img	= false;
-	
-	/**
-	 * Registry object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $registry;
-	
-	/**
-	 * Database object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $DB;
-	
-	/**
-	 * Settings object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $settings;
-	
-	/**
-	 * Request object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $request;
-	
-	/**
-	 * Language object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $lang;
-	
-	/**
-	 * Member object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $member;
-	
-	/**
-	 * Member data object
-	 *
-	 * @access	protected
-	 * @var		object
-	 */
-	public $memberData;	
 
 	/**
-	 * Captcha key
+	 * String that stores the captcha key
 	 *
-	 * @access	public
-	 * @var		string
+	 * @var		$captchaKey
 	 */
-	public $captchaKey = '';
+	public $captchaKey 			= '';
 	
 	/**
 	 * Constructor
 	 *
-	 * @param	object		Registry Object
+	 * @param	object		$registry		Registry Object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
-		$this->registry = $registry;
-		$this->DB       = $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang     = $this->registry->getClass('class_localization');
-		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
+		$this->registry	=  $registry;
+		$this->DB		=  $this->registry->DB();
+		$this->settings	=& $this->registry->fetchSettings();
+		$this->member	=  $this->registry->member();
 		
 		/* Settings */
-		$this->gd_version		= $this->settings['gd_version'];
-		$this->path_background	= DOC_IPS_ROOT_PATH . 'public/style_captcha/captcha_backgrounds';
-		$this->path_fonts		= DOC_IPS_ROOT_PATH . 'public/style_captcha/captcha_fonts';
+		$this->path_background	= DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_captcha/captcha_backgrounds';
+		$this->path_fonts		= DOC_IPS_ROOT_PATH . PUBLIC_DIRECTORY . '/style_captcha/captcha_fonts';
 	}
 	
 	/**
-	 * Returns the template bit
+	 * Returns the captcha template
 	 *
-	 * @access	public
-	 * @return	string
+	 * @return	@e string HTML template for captcha GD form
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $gdImage = $this->getTemplate();
+	 * @endcode
 	 */
 	public function getTemplate()
 	{
@@ -191,7 +121,7 @@ class captchaPlugin
 		//-----------------------------------------
 		// Add to the DB
 		//-----------------------------------------
-	
+		
 		$this->DB->insert( 'captcha', array( 'captcha_unique_id' => $captcha_unique_id,
 											 'captcha_string'    => $captcha_string,
 											 'captcha_ipaddress' => $this->member->ip_address,
@@ -200,45 +130,35 @@ class captchaPlugin
 		/* Make available */
 		$this->captchaKey = $captcha_unique_id;
 		
-		//-----------------------------------------
-		// Return Template Bit
-		//-----------------------------------------
-		
+		/* Return template */
 		return $this->registry->output->getTemplate('global_other')->captchaGD( $captcha_unique_id );
 	}
 	
 	/**
-	 * Validate the captcha image
+	 * Validates the entered captcha code
 	 *
-	 * @access	public
-	 * @return	boolean
+	 * @return	@e boolean TRUE if the code is valid otherwise FALSE
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $isValid = $this->validate();
+	 * @endcode
 	 */
 	public function validate()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$captcha_unique_id       = IPSText::alphanumericalClean( $_REQUEST['captcha_unique_id'] );
 		$captcha_input_NOT_CLEAN = trim( $_REQUEST['captcha_string'] );
 		
-		//-----------------------------------------
-		// Get the info from the DB
-		//-----------------------------------------
-		
-		$captcha = $this->DB->buildAndFetch( array( 'select'	=> '*',
-													 'from'		=> 'captcha',
-													 'where'	=> "captcha_unique_id='". addslashes( $captcha_unique_id )."'" ) );
+		/* Get ID from DB */
+		$captcha = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'captcha', 'where' => "captcha_unique_id='". addslashes( $captcha_unique_id )."'" ) );
 	
 		if ( ! $captcha['captcha_unique_id'] )
 		{
 			return FALSE;
 		}
 		
-		//-----------------------------------------
-		// Check...
-		//-----------------------------------------
-		
+		/* Check */
 		if ( $captcha['captcha_string'] != $captcha_input_NOT_CLEAN )
 		{
 			return FALSE;
@@ -251,19 +171,18 @@ class captchaPlugin
 	}
 	
 	/**
-	 * Show the captcha bot image 
+	 * Generates the captcha image
 	 *
-	 * @access	public
-	 * @param	string	captcha_unique_id	Unique captcha db row id
-	 * @return	mixed	[Boolean on failure],[Output image data/headers]
-	 * @since	1.0
+	 * @param	array		$captcha_unique_id		Key 0 of the array contains the Unique ID
+	 * @return	@e mixed Prints image data and headers on success otherwise FALSE on failure
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $captchaImage = $this->showImage( $captcha_unique_id );
+	 * @endcode
 	 */
 	public function showImage( $captcha_unique_id )
 	{
-		//-----------------------------------------
-		// CHECK
-		//-----------------------------------------
-		
 		//-----------------------------------------
 		// Magic _call method makes an array
 		//-----------------------------------------
@@ -275,35 +194,30 @@ class captchaPlugin
 			return false;
 		}
 		
-		//-----------------------------------------
-		// Get the info from the DB
-		//-----------------------------------------
-		
-		$captcha = $this->DB->buildAndFetch( array( 'select'		=> '*',
-																	 'from'		=> 'captcha',
-																	 'where'	=> "captcha_unique_id='" . $captcha_unique_id . "'", 
-														) 		);
+		/* Get the info from the DB */
+		$captcha = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'captcha', 'where' => "captcha_unique_id='" . $captcha_unique_id . "'" ) );
 	
 		if ( ! $captcha['captcha_unique_id'] )
 		{
 			return false;
 		}
 		
-		//-----------------------------------------
-		// Show it...
-		//-----------------------------------------
-	
+		/* Show it... */
 		$this->_showGDImage( $captcha['captcha_string'] );
 	}
 
 	/**
-	 * Show anti-spam bot GD image numbers
+	 * Prints captcha image and headers
 	 *
-	 * @param	string	Number string
-	 * @return	void
-	 * @since	1.0
+	 * @param	string		$content		Key to show in the GD image
+	 * @return	@e void Prints image data and headers
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $this->_showGDImage( $captcha_string );
+	 * @endcode
 	 */
-	private function _showGDImage( $content="" )
+	protected function _showGDImage( $content="" )
 	{
 		//-----------------------------------------
 		// Is GD Available?
@@ -311,16 +225,9 @@ class captchaPlugin
 		
 		if ( ! extension_loaded('gd') )
 		{
-			if ( $this->show_error_gd_img )
-			{
-				@header( "Content-Type: image/gif" );
-				print base64_decode( "R0lGODlhyAA8AJEAAN/f3z8/P8zMzP///yH5BAAAAAAALAAAAADIADwAAAL/nI+py+0Po5y02ouz3rz7D4biSJbmiabqyrbuC8fyTNf2jef6zvf+DwwKh8Si8YhMlgACwEHQXESfzgOzykQAqgMmFMr9Rq+GbHlqAFsFWnFVrfwIAvQAu15P0A14Nn8/ADhXd4dnl2YYCAioGHBgyDbnNzBIV0gYxzEYWdg1iLAnScmFuQdAt2UKZTcl+mip+HoYG+tKOfv3N5l5garnmPt6CwyaFzrranu7i0crObvoaKvMyMhrIQhFuyzcyGwXcOpoLYg7DGsZXk5r6DSN51RNfF0RPU5sy7gpnH5bjLhrk7Y9/RQNisfq2CRJauTR6xUuFyBx/yrWypMMmTlq/9IwQnKWcKG5cvMeShBIMOFIaV9w2eti6SBABAyjvBRFMaZCMaxsqtxl8iShjpj+VfqGCJg4XzOfJCK5DVWliFNXlSIENKjWrVy7ev0KNqzYsWTFwhlFU8waLk+efGF7hi0aSgu3iGmV1cxdoGTinimbiGOeP8SWhps6z3AkeMMWW20mMykqQyuJDbYWdufKBJWc2uWmAJZdO0yOKfTCCqHGiO4E/oKGriTYaBw5g/MDqynNlW9Uhmx66tM2i05dNcM8O6Rg2MHLYKraLTpDcLebTke4APkcduAoku0DWpe24MI96ewZPdiy6Rlx/0Y+XJevlNu/z6vtlHFxZbpv9f9edYkfxgVmjnqSxXYOYPfFVMgXIHGC0ltWDNXYJ6Lsw82AFVpWEk4pEabgbsfBM5FphyDWRh1OLCUgbC06NtNU6UV1T1Jl3YhjjjruyGOPPv4IZJBC6tDXGUDB4UUaK06RhRl/0aWWF3CR4YWESraR1ZCh6dMOiMNIFE2GI/bRJYiIEeULiloyUNSFLzWC3VXcqEJXTBe1qApDpbXUEYxr2tYeQCyyGMuIcxbokHfPvPjHf25mqeWHoLEX0iH0UScmUzSWNxmj20yH6Z+/yNTeM0N1cumkg9E4GHnluLcfeKLm95yLoO5ZKJrhgeaQm4xlFGshcK3pYZ9LradQrmY5nmhVdMm+qqpKYkIqpDyltWkpjJJaaKmd6kXjHUXvDPborOaei2666q7LbrvuvgtvvPLOS2+9YBUAADs=" );
-				exit();
-			}
-			else
-			{
-				exit();
-			}
+			@header( "Content-Type: image/gif" );
+			print base64_decode( "R0lGODlhyAA8AJEAAN/f3z8/P8zMzP///yH5BAAAAAAALAAAAADIADwAAAL/nI+py+0Po5y02ouz3rz7D4biSJbmiabqyrbuC8fyTNf2jef6zvf+DwwKh8Si8YhMlgACwEHQXESfzgOzykQAqgMmFMr9Rq+GbHlqAFsFWnFVrfwIAvQAu15P0A14Nn8/ADhXd4dnl2YYCAioGHBgyDbnNzBIV0gYxzEYWdg1iLAnScmFuQdAt2UKZTcl+mip+HoYG+tKOfv3N5l5garnmPt6CwyaFzrranu7i0crObvoaKvMyMhrIQhFuyzcyGwXcOpoLYg7DGsZXk5r6DSN51RNfF0RPU5sy7gpnH5bjLhrk7Y9/RQNisfq2CRJauTR6xUuFyBx/yrWypMMmTlq/9IwQnKWcKG5cvMeShBIMOFIaV9w2eti6SBABAyjvBRFMaZCMaxsqtxl8iShjpj+VfqGCJg4XzOfJCK5DVWliFNXlSIENKjWrVy7ev0KNqzYsWTFwhlFU8waLk+efGF7hi0aSgu3iGmV1cxdoGTinimbiGOeP8SWhps6z3AkeMMWW20mMykqQyuJDbYWdufKBJWc2uWmAJZdO0yOKfTCCqHGiO4E/oKGriTYaBw5g/MDqynNlW9Uhmx66tM2i05dNcM8O6Rg2MHLYKraLTpDcLebTke4APkcduAoku0DWpe24MI96ewZPdiy6Rlx/0Y+XJevlNu/z6vtlHFxZbpv9f9edYkfxgVmjnqSxXYOYPfFVMgXIHGC0ltWDNXYJ6Lsw82AFVpWEk4pEabgbsfBM5FphyDWRh1OLCUgbC06NtNU6UV1T1Jl3YhjjjruyGOPPv4IZJBC6tDXGUDB4UUaK06RhRl/0aWWF3CR4YWESraR1ZCh6dMOiMNIFE2GI/bRJYiIEeULiloyUNSFLzWC3VXcqEJXTBe1qApDpbXUEYxr2tYeQCyyGMuIcxbokHfPvPjHf25mqeWHoLEX0iH0UScmUzSWNxmj20yH6Z+/yNTeM0N1cumkg9E4GHnluLcfeKLm95yLoO5ZKJrhgeaQm4xlFGshcK3pYZ9LradQrmY5nmhVdMm+qqpKYkIqpDyltWkpjJJaaKmd6kXjHUXvDPborOaei2666q7LbrvuvgtvvPLOS2+9YBUAADs=" );
+			exit();
 		}
 				
 		//-----------------------------------------
@@ -328,7 +235,6 @@ class captchaPlugin
 		//-----------------------------------------
 		
 		$content       = '  '. preg_replace( "/(\w)/", "\\1 ", $content ) .' ';
-		$allow_fonts   = isset( $this->settings['captcha_allow_fonts'] ) ? $this->settings['captcha_allow_fonts'] : 1;
 		$use_fonts     = 0;
 		$tmp_x         = 135;
 		$tmp_y         = 20;
@@ -350,76 +256,73 @@ class captchaPlugin
 		//-----------------------------------------
 		$_imgs = array();
 		
-		if ( $this->gd_version > 1 )
+		while ( $continue_loop )
 		{
-			while ( $continue_loop )
+			if ( is_array( $backgrounds ) AND count( $backgrounds ) )
 			{
-				if ( is_array( $backgrounds ) AND count( $backgrounds ) )
+				$i = mt_rand(0, count( $backgrounds ) - 1 );
+			
+				$background      = $backgrounds[ $i ];
+				$_file_extension = preg_replace( "#^.*\.(\w{2,4})$#is", "\\1", strtolower( $background ) );
+			
+				switch( $_file_extension )
 				{
-					$i = mt_rand(0, count( $backgrounds ) - 1 );
-				
-					$background      = $backgrounds[ $i ];
-					$_file_extension = preg_replace( "#^.*\.(\w{2,4})$#is", "\\1", strtolower( $background ) );
-				
-					switch( $_file_extension )
-					{
-						case 'jpg':
-						case 'jpe':
-						case 'jpeg':
-							if ( ! function_exists('imagecreatefromjpeg') OR ! $im = @imagecreatefromjpeg($background) )
+					case 'jpg':
+					case 'jpe':
+					case 'jpeg':
+						if ( ! function_exists('imagecreatefromjpeg') OR ! $im = @imagecreatefromjpeg($background) )
+						{
+							unset( $backgrounds[ $i ] );
+						}
+						else
+						{
+							$_imgs[] = $im;
+							
+							if( count( $_imgs ) > 2 )
 							{
-								unset( $backgrounds[ $i ] );
+								$continue_loop = FALSE;
+								$_started      = TRUE;
 							}
-							else
+						}
+						break;
+					case 'gif':
+						if ( ! function_exists('imagecreatefromgif') OR ! $im = @imagecreatefromgif($background) )
+						{
+							unset( $backgrounds[ $i ] );
+						}
+						else
+						{
+							$_imgs[] = $im;
+							
+							if( count( $_imgs ) > 2 )
 							{
-								$_imgs[] = $im;
-								
-								if( count( $_imgs ) > 2 )
-								{
-									$continue_loop = FALSE;
-									$_started      = TRUE;
-								}
+								$continue_loop = FALSE;
+								$_started      = TRUE;
 							}
-							break;
-						case 'gif':
-							if ( ! function_exists('imagecreatefromgif') OR ! $im = @imagecreatefromgif($background) )
+						}
+						break;
+					case 'png':
+						if ( ! function_exists('imagecreatefrompng') OR ! $im = @imagecreatefrompng($background) )
+						{
+							unset( $backgrounds[ $i ] );
+						}
+						else
+						{
+							$_imgs[] = $im;
+							
+							if( count( $_imgs ) > 2 )
 							{
-								unset( $backgrounds[ $i ] );
+								$continue_loop = FALSE;
+								$_started      = TRUE;
 							}
-							else
-							{
-								$_imgs[] = $im;
-								
-								if( count( $_imgs ) > 2 )
-								{
-									$continue_loop = FALSE;
-									$_started      = TRUE;
-								}
-							}
-							break;
-						case 'png':
-							if ( ! function_exists('imagecreatefrompng') OR ! $im = @imagecreatefrompng($background) )
-							{
-								unset( $backgrounds[ $i ] );
-							}
-							else
-							{
-								$_imgs[] = $im;
-								
-								if( count( $_imgs ) > 2 )
-								{
-									$continue_loop = FALSE;
-									$_started      = TRUE;
-								}
-							}
-							break;
-					}
-				}
-				else
-				{
-					$continue_loop = FALSE;
+						}
+						break;
 				}
 			}
+			else
+			{
+				$continue_loop = FALSE;
+			}
 		}
 		
 		/* Create a new background */
@@ -458,16 +361,8 @@ class captchaPlugin
 		
 		if ( $_started !== TRUE )
 		{
-			if ( $this->gd_version == 1 )
-			{
-				$im   = imagecreate($image_x, $image_y);
-				$tmp  = imagecreate($tmp_x, $tmp_y);
-			}
-			else
-			{
-				$im  = imagecreatetruecolor($image_x, $image_y);
-				$tmp = imagecreatetruecolor($tmp_x, $tmp_y);
-			}
+			$im  = imagecreatetruecolor($image_x, $image_y);
+			$tmp = imagecreatetruecolor($tmp_x, $tmp_y);
 			
 			$white  = ImageColorAllocate($tmp, 255, 255, 255);
 			$black  = ImageColorAllocate($tmp, 0, 0, 0);
@@ -557,7 +452,7 @@ class captchaPlugin
 			// Can we use fonts?
 			//-----------------------------------------
 			
-			if ( $allow_fonts AND function_exists('imagettftext') AND is_array( $fonts ) AND count( $fonts ) )
+			if ( function_exists('imagettftext') AND is_array( $fonts ) AND count( $fonts ) )
 			{
 				if ( function_exists('imageantialias') )
 				{
@@ -601,7 +496,7 @@ class captchaPlugin
 							$b   = mt_rand(0,100);
 							$c   = $a + 20;
 							$d   = $b + 20;
-							$e   = ( $i == 3 ) ? mt_rand( 280, 320 ) : mt_rand( -280, -320 );
+							$e   = ( $i == 3 ) ? mt_rand( 280, 320 ) : mt_rand( -320, -280 );
 							
 							imagearc( $im, $a  , $b  , $c, $d, 0, $e, $color_light );
 							imagearc( $im, $a+1, $b+1, $c, $d, 0, $e, $color_main );
@@ -721,13 +616,16 @@ class captchaPlugin
 	/**
 	 * Create wave effect for GD images
 	 *
-	 * @access	private
-	 * @param	resource	Image resource
-	 * @param	integer		Wave factor
-	 * @return	resource	Returned image resource
-	 * @since	1.0
+	 * @param	resources		$im		Image resource
+	 * @param	integer			$wave	Wave factor
+	 * @return	@e resource Returned image resource
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $imageResource = $this->_showGDImageWave( $captcha_string );
+	 * @endcode
 	 */
-	private function _showGDImageWave( $im, $wave=10 )
+	protected function _showGDImageWave( $im, $wave=10 )
 	{
 		$_width  = imagesx( $im );
 		$_height = imagesy( $im );
@@ -765,44 +663,43 @@ class captchaPlugin
 	}
 
 	/**
-	 * Removes extinct captcha sessions
-	 * Clears out "dead" entries
+	 * Removes extinct captcha sessions or 'dead' entries
 	 *
-	 * @access	private
-	 * @param	string	Optional IP address to clear out on
-	 * @return	string	void
+	 * @param	string		$ip_address		Optional IP address to clear out on
+	 * @return	@e void
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $this->_clearSessions( $ip_address );
+	 * @endcode
 	 */
-	private function _clearSessions( $ip_address='' )
+	protected function _clearSessions( $ip_address='' )
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$time  = time() - 60 * 3600;
 		$extra = ( $ip_address ) ? " OR captcha_ipaddress='" . $ip_address . "'" : '';
 		
-		//-----------------------------------------
-		// Remove...
-		//-----------------------------------------
-		
+		/* Remove from DB */
 		$this->DB->delete( 'captcha', 'captcha_date < ' . $time . $extra );
 	}
 	
 	/**
-	 * Loads up the backgrounds.
+	 * Retrieves the list of backgrounds from the specified path
 	 *
-	 * @access	private
-	 * @return	array		backgrounds
+	 * @return	@e array List of backgrouns found
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $images = $this->_getBackgrounds();
+	 * @endcode
 	 */
-	private function _getBackgrounds()
+	protected function _getBackgrounds()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$images = array();
 		$_path  = $this->path_background;
 		
+		/* Loop */
 		if ( $_dir = opendir( $_path ) )
 		{
 			while( false !== ( $_file = readdir( $_dir ) ) )
@@ -818,20 +715,22 @@ class captchaPlugin
 	}
 
 	/**
-	 * Loads up the fonts.
+	 * Retrieves the list of fonts from the specified path
 	 *
-	 * @access	private
-	 * @return	array		fonts
+	 * @return	@e array List of fonts found
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $fonts = $this->_getFonts();
+	 * @endcode
 	 */
-	private function _getFonts()
+	protected function _getFonts()
 	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
+		/* Init vars */
 		$fonts  = array();
 		$_path  = $this->path_fonts;
 		
+		/* Loop */
 		if ( $_dir = @opendir( $_path ) )
 		{
 			while( false !== ( $_file = @readdir( $_dir ) ) )
@@ -845,5 +744,4 @@ class captchaPlugin
 		
 		return $fonts;
 	}
-	
 }
\ No newline at end of file
diff --git a/upload/ips_kernel/classCaptchaPlugin/index.html b/upload/ips_kernel/classCaptchaPlugin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/classCaptchaPlugin/index.html
+++ b/upload/ips_kernel/classCaptchaPlugin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/classCaptchaPlugin/recaptcha.php b/upload/ips_kernel/classCaptchaPlugin/recaptcha.php
index 23bc66bc..816eac01 100644
--- a/upload/ips_kernel/classCaptchaPlugin/recaptcha.php
+++ b/upload/ips_kernel/classCaptchaPlugin/recaptcha.php
@@ -39,68 +39,83 @@
  */
 define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
 define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
+define("RECAPTCHA_VERIFY_SERVER", "http://www.google.com");
 
+
+/**
+ * @file		recaptcha.php 	Plugin for reCAPTCHA
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
+ * @since		Friday 19th May 2006 17:33
+ * $LastChangedDate: 2011-03-09 18:12:09 -0500 (Wed, 09 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8004 $
+ */
+
+/**
+ *
+ * @class		captchaPlugin
+ * @brief		Plugin for reCAPTCHA
+ * @note		This plugin is automatically loaded by classCaptcha class based on the CAPTCHA setting
+ *
+ */
 class captchaPlugin
 {
-	/**#@+
-	 * Registry objects
+	/**
+	 * Registry Object Shortcuts
 	 *
-	 * @var		object
+	 * @var		$registry
+	 * @var		$DB
+	 * @var		$settings
+	 * @var		$member
 	 */
 	public $registry;
 	public $DB;
 	public $settings;
-	public $request;
-	public $lang;
 	public $member;
-	public $memberData;	
-	/**#@-*/
 	
 	/**
-	 * Error code from reCAPTCHA
+	 * String that stores the error code from reCAPTCHA (if any)
 	 *
-	 * @var		string
+	 * @var		$error
 	 */
 	public $error;
 	
 	/**
-	 * reCAPTCHA public key
+	 * String that stores reCAPTCHA public key
 	 *
-	 * @var		string
+	 * @var		$public_key
 	 */
 	public $public_key;
 	
 	/**
-	 * reCAPTCHA private key
+	 * String that stores reCAPTCHA private key
 	 *
-	 * @var		string
+	 * @var		$private_key
 	 */
 	public $private_key;
 	
 	/**
-	 * Flag whether to use SSL or not
+	 * Integer flag that stores whether to use SSL or not for the connection
 	 *
-	 * @var		string
+	 * @var		$private_key
 	 */
 	public $useSSL;
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
-	 * @param	object		Registry Object
-	 * @return	void
+	 * @param	object		$registry		Registry Object
+	 * @return	@e void
 	 */
 	public function __construct( ipsRegistry $registry )
 	{
 		$this->registry = $registry;
 		$this->DB       = $this->registry->DB();
 		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->lang     = $this->registry->getClass('class_localization');
 		$this->member   = $this->registry->member();
-		$this->memberData =& $this->registry->member()->fetchMemberData();
 		
 		/* Settings */
 		$this->public_key	= trim( $this->settings['recaptcha_public_key'] );
@@ -109,12 +124,16 @@ class captchaPlugin
 	}
 	
 	/**
-	 * Gets the challenge HTML (javascript and non-javascript version).
+	 * Returns the reCAPTCHA template (javascript and non-javascript version).
 	 * This is called from the browser, and the resulting reCAPTCHA HTML widget
 	 * is embedded within the HTML form it was called from.
 	 *
-	 * @access	public
-	 * @return 	string		Form HTML to display
+	 * @return	@e string HTML template for reCAPTCHA form
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $recaptchaForm = $this->getTemplate();
+	 * @endcode
 	 */
 	public function getTemplate()
 	{
@@ -155,17 +174,21 @@ class captchaPlugin
 	}
 
 	/**
-	 * Validate the input code
+	 * Validates the entered captcha code
 	 *
-	 * @access	public
-	 * @return	boolean		Validation successful
-	 * @since	1.0
+	 * @return	@e boolean TRUE if the code is valid otherwise FALSE
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $isValid = $this->validate();
+	 * @endcode
 	 */
 	public function validate()
 	{
 		if ( !$this->private_key )
 		{
-			return '';
+			$this->error = 'no_private_key';
+			return FALSE;
 		}
 		
 		$captcha_unique_id	= $_REQUEST['recaptcha_challenge_field'];
@@ -176,16 +199,17 @@ class captchaPlugin
 			return false;
 		}
 		
-		$response = $this->_recaptchaPost( RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-																			array (
-																				'privatekey'	=> $this->private_key,
-																				'remoteip'		=> $this->member->ip_address,
-																				'challenge'		=> $captcha_unique_id,
-																				'response'		=> $captcha_input
-																			)
-												);
+		$classToLoad	= IPSLib::loadLibrary( IPS_KERNEL_PATH . '/classFileManagement.php', 'classFileManagement' );
+		$communication	= new $classToLoad();
 		
-		$answers	= explode( "\n", $response[1] );
+		$response	= $communication->postFileContents( RECAPTCHA_VERIFY_SERVER . "/recaptcha/api/verify", array(
+																											'privatekey'	=> $this->private_key,
+																											'remoteip'		=> $this->member->ip_address,
+																											'challenge'		=> $captcha_unique_id,
+																											'response'		=> $captcha_input
+																										)	);
+
+		$answers	= explode( "\n", $response );
 
 		if ( trim($answers[0]) == 'true' ) 
 		{
@@ -196,88 +220,8 @@ class captchaPlugin
 			/**
 			 * It's an error
 			 */
-			$this->error	= $answers[1];
+			$this->error = $answers[1];
 			return FALSE;
 		}
 	}
-	
-	/**
-	 * Gets a URL where the user can sign up for reCAPTCHA. If your application
-	 * has a configuration page where you enter a key, you should provide a link
-	 * using this function.
-	 *
-	 * @access	public
-	 * @param	string	$domain		The domain where the page is hosted
-	 * @param	string	$appname	The name of your application
-	 */
-	public function getSignupUrl( $domain = null, $appname = null ) 
-	{
-		return "https://www.google.com/recaptcha/admin/create?" .  $this->_encodeQueryString( array( 'domain' => $domain, 'app' => $appname ) );
-	}
-	
-	/**
-	 * Submits an HTTP POST to a reCAPTCHA server
-	 *
-	 * @access	private
-	 * @param	string 		$host
-	 * @param	string		$path
-	 * @param	array 		$data
-	 * @param	int 		port
-	 * @return	array 		response
-	 */
-	private function _recaptchaPost( $host, $path, $data, $port = 80 )
-	{
-		$req = $this->_encodeQueryString( $data );
-		
-		$http_request  = "POST $path HTTP/1.0\r\n";
-		$http_request .= "Host: $host\r\n";
-		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
-		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-		$http_request .= "\r\n";
-		$http_request .= $req;
-		
-		$response = '';
-		
-		if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) 
-		{
-			return false;
-		}
-		
-		fwrite($fs, $http_request);
-		
-		while ( !feof($fs) )
-		{
-			$response .= fgets($fs, 1160); // One TCP-IP packet
-		}
-
-		fclose($fs);
-
-		$response = explode( "\r\n\r\n", $response, 2 );
-
-		return $response;
-	}
-	
-	/**
-	 * Encode array of data into a query string
-	 *
-	 * @access	private
-	 * @param	array 		$data
-	 * @return	string 		query string
-	 */
-	private function _encodeQueryString( $data )
-	{
-		$req = "";
-		
-		foreach ( $data as $key => $value )
-		{
-			$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-		}
-
-		// Cut the last '&'
-		$req = substr( $req, 0, strlen($req)-1 );
-
-		return $req;
-    }
-	
-}
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/classCommunication.php b/upload/ips_kernel/classCommunication.php
deleted file mode 100644
index ce2c6a87..00000000
--- a/upload/ips_kernel/classCommunication.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * HTTP Communications - send data via POST and read response
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Kernel
- * @link		http://www.invisionpower.com
- * @since		Friday 6th January 2006 (12:24)
- * @version		$Revision: 370 $
- *
- * Usage
- * <code>
- * $communication	= new classCommunication;
- * $return			= $communication->communicationSendData( 'http://example.site.com/external.php', array( 'foo' => 'bar' ) );
- * $data			= $communication->communicationReceiveData( $return );
- * print_r($data);
- * </code>
- *
- */
-
-
-if ( ! defined( 'IPS_CLASSES_PATH' ) )
-{
-	/**
-	* Define classes path
-	*/
-	define( 'IPS_CLASSES_PATH', dirname(__FILE__) );
-}
-
-class classCommunication
-{
-	/**
-	 * Use sockets flag
-	 *
-	 * @access	public
-	 * @var 		integer
-	 */
-	public $use_sockets	= 0;
-	
-	/**
-	 * Error array
-	 *
-	 * @access	public
-	 * @var 		array
-	 */
-	public $error		 = array();
-	
-	/**
-	 * Key prefix
-	 * Prefix to identify communication strings
-	 *
-	 * @access	public
-	 * @var 		string
-	 */
-	public $key_prefix	= '__xsx__';
-	
-	/**#@+
-	 * Set Authentication
-	 *
-	 * @access	public
-	 * @var 		string 
-	 */
-	public $auth_req 	= 0;
-	public $auth_user;
-	public $auth_pass;
-	/**#@-*/	
-	
-	/**
-	 * Receive data from the "send" function
-	 *
-	 * @access	public
-	 * @param	array	Array of fields to return
-	 * @return	array	Array of fields
-	 */
-	public function communicationReceiveData( $return_fields=array() )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$return_array = array();
-		
-		//-----------------------------------------
-		// Get data...
-		//-----------------------------------------
-		
-		foreach( $_REQUEST as $k => $v )
-		{
-			if ( strstr( $k, $this->key_prefix ) )
-			{
-				$k = str_replace( $this->key_prefix, '', $k );
-				
-				$return_array[ $k ] = $v;
-			}
-		}
-		
-		return $this->_filterFields( $return_array );
-	}
-	
-	/**
-	 * Send the data
-	 *
-	 * @access	public
-	 * @param	string	URI to post to
-	 * @param	array   Arry of post fields
-	 * @return	string	File data
-	 */
-	public function communicationSendData( $file_location='', $post_array=array() )
-	{
-		if ( ! is_array( $post_array ) OR ! count( $post_array ) )
-		{
-			return false;
-		}
-		
-		if ( ! $file_location )
-		{
-			return false;
-		}
-		
-		return $this->_postData( $file_location, $post_array );
-	}
-	
-	/**
-	 * Filter out fields (optional)
-	 *
-	 * @access	private
-	 * @param	array	Array of fields to return
-	 * @return	array	Array of fields
-	 */
-	private function _filterFields( $in_fields=array(), $out_fields=array() )
-	{
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$return_array = array();
-		
-		//-----------------------------------------
-		// Check
-		//-----------------------------------------
-		
-		if ( ! is_array( $in_fields ) or ! count( $in_fields ) )
-		{
-			return false;
-		}
-		
-		if ( ! is_array( $out_fields ) or ! count( $out_fields ) )
-		{
-			return $in_fields;
-		}
-		
-		//-----------------------------------------
-		// Get data...
-		//-----------------------------------------
-		
-		foreach( $out_fields as $k => $type )
-		{
-			if ( $in_fields[ $k ] )
-			{
-				switch ( $type )
-				{
-					default:
-					case 'string':
-					case 'text':
-						$return_array[ $k ] = trim( $in_fields[ $k ] );
-						break;
-					case 'int':
-					case 'integar':
-						$return_array[ $k ] = intval( $in_fields[ $k ] );
-						break;
-					case 'float':
-					case 'floatval':
-						$return_array[ $k ] = floatval( $in_fields[ $k ] );
-						break;
-				}
-			}
-		}
-		
-		return $return_array;
-	}
-	
-	/**
-	 * Get file contents (with sockets)
-	 *
-	 * @access	private
-	 * @param	string	URI to post to
-	 * @param	array   Arry of post fields
-	 * @return	string	File data
-	 * @todo 	[Future] Doesn't support "chunked" HTTP responses
-	 */
-	private function _postData( $file_location, $post_array )
-	{
-		//-------------------------------
-		// INIT
-		//-------------------------------
-		
-		$data		  = null;
-		$fsocket_timeout = 10;
-		$post_back	  = array();
-		
-		//-------------------------------
-		// Fix up post string
-		//-------------------------------
-		
-		foreach ( $post_array as $key => $val )
-		{
-			$post_back[] = $this->key_prefix . $key . '=' . urlencode($val);
-		}
-		
-		$post_back_str = implode('&', $post_back);
-		
-		//-------------------------------
-		// Parse URL
-		//-------------------------------
-		
-		$url_parts = parse_url($file_location);
-		
-		if ( ! $url_parts['host'] )
-		{
-			$this->errors[] = "�е найден хо�т в URL '{$file_location}'!";
-			return false;
-		}
-		
-		//-------------------------------
-		// Finalize
-		//-------------------------------
-		
-		$host = $url_parts['host'];
-		$port = ( isset($url_parts['port']) ) ? $url_parts['port'] : ( $url_parts['scheme'] == 'https' ? 443 : 80 );
-		
-		//-------------------------------
-		// Tidy up path
-		//-------------------------------
-		
-		if ( ! empty( $url_parts["path"] ) )
-		{
-			$path = $url_parts["path"];
-		}
-		else
-		{
-			$path = "/";
-		}
-		
-		if ( ! empty( $url_parts["query"] ) )
-		{
-			$path .= "?" . $url_parts["query"];
-		}
-		
-		//-------------------------------
-		// Try CURL first...
-		//-------------------------------
-		
-		if ( function_exists("curl_init") AND function_exists("curl_exec") )
-		{
-			if ( $sock = curl_init() )
-			{
-				curl_setopt( $sock, CURLOPT_URL		  , $file_location );
-				curl_setopt( $sock, CURLOPT_TIMEOUT	   , 15 );
-				curl_setopt( $sock, CURLOPT_POST		 , TRUE );
-				curl_setopt( $sock, CURLOPT_POSTFIELDS	, $post_back_str );
-				curl_setopt( $sock, CURLOPT_POSTFIELDSIZE  , 0);
-				curl_setopt( $sock, CURLOPT_RETURNTRANSFER , TRUE ); 
-		
-				$result = curl_exec($sock);
-				
-				curl_close($sock);
-				
-				return $result ? $result : false;
-			}
-		}
-		else
-		{
-		
-		    if ( ! $fp = @fsockopen( $host, $port, $errno, $errstr, $fsocket_timeout ) )
-		  	{
-				$this->errors[] = "�евозможно �оединение � {$host}";
-				return false;
-		 
-			}
-			else
-			{
-				$final_carriage = "";
-				
-				if ( ! $this->auth_req )
-				{
-					$final_carriage = "\r\n";
-				}
-				
-				$header  = "POST $path HTTP/1.0\r\n";
-				$header .= "Host: $host\r\n";
-				$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-				$header .= "Content-Length: " . strlen($post_back_str) . "\r\n{$final_carriage}";
-				
-				if ( ! fputs( $fp, $header . $post_back_str ) )
-				{
-					$this->errors[] = "�евозможно отправить запро� на {$host}!";
-					return false;
-				}
-			
-				if ( $this->auth_req )
-				{
-					if( $this->auth_user && $this->auth_pass )
-					{
-						$header = "Authorization: Basic ". base64_encode( "{$this->auth_user}:{$this->auth_pass}" ) . "\r\n\r\n";
-						
-						if ( ! fputs( $fp, $header ) )
-						{
-							$this->errors[] = "Данные авторизации не верны!";
-							return false;
-						}
-					}
-				}				
-			}
-		
-			@stream_set_timeout($fp, $fsocket_timeout);
-		 	 
-			$status = @socket_get_status($fp);
-		 
-			while( ! feof($fp) && ! $status['timed_out'] )	    
-			{
-				$data .= fgets ($fp,8192);
-				$status = socket_get_status($fp);
-			}
-		 
-			fclose ($fp);
-	    
-			//-------------------------------
-			// Strip headers
-			//-------------------------------
-	    
-			$tmp = split("\r\n\r\n", $data, 2);
-			$data = $tmp[1];
-
-	 		return $data;
-		}
-	}
-	
-}
diff --git a/upload/ips_kernel/classConvertCharset.php b/upload/ips_kernel/classConvertCharset.php
index e13105ac..62632f99 100644
--- a/upload/ips_kernel/classConvertCharset.php
+++ b/upload/ips_kernel/classConvertCharset.php
@@ -3,25 +3,24 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Character set conversion library
- * Last Updated: $Date: 2010-05-07 19:47:45 -0400 (Fri, 07 May 2010) $
+ * Last Updated: $Date: 2011-09-07 14:34:13 -0400 (Wed, 07 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @author		Mikolaj Jedrzejak <mikolajj@op.pl>
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @copyright	Copyright Mikolaj Jedrzejak (c) 2003-2004
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 2nd December 2005 10:18
- * @version		$Revision: 404 $
+ * @version		$Revision: 9462 $
  * @version		1.0 2004-07-27 00:37
  * @link		http://www.unicode.org	Unicode Homepage
  * @link		http://www.mikkom.pl	My Homepage
- * @link		https://www.invisionpower.com/index.php?appcomponent=downloads	Downloads
  *
  * This class is an adaptation of the ConvertCharset.class.php provided by Mikolaj Jedrzejak.
  * In order to use character set conversions, you must first download the conversion libraries from our website.  See the 'Downloads' link.
@@ -51,7 +50,6 @@ class classConvertCharset
 	/**
 	 * Array of error messages associated with the conversion
 	 *
-	 * @access	public
 	 * @var 		array 		Error messages
 	 */
 	public $errors			= array();
@@ -59,16 +57,14 @@ class classConvertCharset
 	/**
 	 * Should characters be turned into numeric entities
 	 *
-	 * @access	private
 	 * @var 		boolean
 	 */
-	private $entities		= false;
+	protected $entities		= false;
 	
 	/**
 	 * Conversion method to use.
 	 * Valid values include: mb, iconv, recode, internal
 	 *
-	 * @access	public
 	 * @var 		string
 	 */
 	public $method			= 'internal';
@@ -76,7 +72,6 @@ class classConvertCharset
 	/**
 	 * Path for character sets
 	 *
-	 * @access	public
 	 * @var 		string
 	 */
 	public $charsetPath		= '';
@@ -84,7 +79,6 @@ class classConvertCharset
 	/**
 	 * Converts a text string from its current charset to a destination charset
 	 *
-	 * @access	public
 	 * @param	string		Text string
 	 * @param	string		Text string char set (original)
 	 * @param	string		Desired character set (destination)
@@ -95,7 +89,8 @@ class classConvertCharset
 		$string_char_set = strtolower($string_char_set);
 		$t               = $string;
 		
-		if ( is_numeric( $t ) )
+		/* Return bools, null, ints, etc. */
+		if ( !is_string( $t ) )
 		{
 			return $t;
 		}
@@ -138,13 +133,12 @@ class classConvertCharset
 	/**
 	 * Converts a text string from its current charset to a destination charset using mb_convert_encoding
 	 *
-	 * @access	private
 	 * @param	string		Text string
 	 * @param	string		Text string char set (original)
 	 * @param	string		Desired character set (destination)
 	 * @return	string		Converted string
 	 */
-	private function convertUsing_mb( $string, $string_char_set, $destination_char_set='UTF-8' )
+	protected function convertUsing_mb( $string, $string_char_set, $destination_char_set='UTF-8' )
 	{
 		if ( function_exists( 'mb_convert_encoding' ) )
 		{
@@ -170,13 +164,12 @@ class classConvertCharset
 	/**
 	 * Converts a text string from its current charset to a destination charset using iconv
 	 *
-	 * @access	private
 	 * @param	string		Text string
 	 * @param	string		Text string char set (original)
 	 * @param	string		Desired character set (destination)
 	 * @return	string		Converted string
 	 */
-	private function convertUsing_iconv( $string, $string_char_set, $destination_char_set='UTF-8' )
+	protected function convertUsing_iconv( $string, $string_char_set, $destination_char_set='UTF-8' )
 	{
 		if ( function_exists( 'iconv' ) )
 		{
@@ -193,13 +186,12 @@ class classConvertCharset
 	/**
 	 * Converts a text string from its current charset to a destination charset using recode_string
 	 *
-	 * @access	private
 	 * @param	string		Text string
 	 * @param	string		Text string char set (original)
 	 * @param	string		Desired character set (destination)
 	 * @return	string		Converted string
 	 */
-	private function convertUsing_recode( $string, $string_char_set, $destination_char_set='UTF-8' )
+	protected function convertUsing_recode( $string, $string_char_set, $destination_char_set='UTF-8' )
 	{
 		if ( function_exists( 'recode_string' ) )
 		{
@@ -217,13 +209,12 @@ class classConvertCharset
 	 * Converts a text string from its current charset to a destination charset using internal conversion class.
 	 * The bulk of this function was written by Mikolaj Jedrzejak and used with permission via the License
 	 *
-	 * @access	private
 	 * @param	string		Text string
 	 * @param	string		Text string char set (original)
 	 * @param	string		Desired character set (destination)
 	 * @return	string		Converted string
 	 */
-	private function convertUsing_internal( $string, $string_char_set, $destination_char_set='UTF-8' )
+	protected function convertUsing_internal( $string, $string_char_set, $destination_char_set='UTF-8' )
 	{
 		$text    	= '';
 		$original	= $string;
@@ -239,12 +230,12 @@ class classConvertCharset
 		 * encoding table to write proper entities.
 		 * 
 		 * This is the first case. We are converting from 1byte chars...
-		 **/
+		 */
 		if ($string_char_set != "utf-8") 
 		{ 
 			/**
 			 * Now build table with both charsets for encoding change. 
-			 **/
+			 */
 			if ($destination_char_set != "utf-8") 
 			{ 
 				$charsetTable = $this->_makeConversionTable( $string_char_set, $destination_char_set );
@@ -262,7 +253,7 @@ class classConvertCharset
 
 			/**
 			 * For each char in a string... 
-			 **/
+			 */
 			for ($i = 0; $i < strlen($string); $i++)
 			{
 				$hexChar		= "";
@@ -332,7 +323,7 @@ class classConvertCharset
 						 * The letters are merge with "plus" sign, there can be more than two chars.
 						 * In Mazowia we have 007A+0142, but sometimes it can look like this
 						 * 0x007A+0x0142+0x2034 (that string means nothing, it just shows the possibility...)
-				     	 **/
+				     	 */
 						for( $unicodeHexCharElement = 0; $unicodeHexCharElement < count($unicodeHexChars); $unicodeHexCharElement++)
 						{
 							if ( $this->entities == true ) 
@@ -356,7 +347,7 @@ class classConvertCharset
 		
 		/**
 		 * This is second case. We are encoding from multibyte char string. 
-		 **/
+		 */
 
 		else if( $string_char_set == "utf-8" )
 		{
@@ -391,12 +382,11 @@ class classConvertCharset
 	/**
 	 * Convert unicode characters to unicode HTML entities
 	 * 
-	 * @access	private
 	 * @param	string		$unicodeString		Input Unicode string (1 char can take more than 1 byte)
 	 * @return	string		This is an input string also with unicode chars, but saved as entities
 	 * @see		_hexToUtf()
 	 */
-	private function _unicodeEntity( $unicodeString ) 
+	protected function _unicodeEntity( $unicodeString ) 
 	{
 		$outString		= "";
 		$stringLength	= strlen( $unicodeString );
@@ -468,12 +458,11 @@ class classConvertCharset
 	 * It is very similar to _unicodeEntity function (link below). There is one difference 
 	 * in returned format. This time it's a regular char(s), in most cases it will be one or two chars. 
 	 * 
-	 * @access	private
 	 * @param	string		$utfCharInHex	Hexadecimal value of a unicode char.
 	 * @return	string		Encoded hexadecimal value as a regular char.
 	 * @see		_unicodeEntity()
 	 */
-	private function _hexToUtf( $utfCharInHex )
+	protected function _hexToUtf( $utfCharInHex )
 	{
 		$outputChar		= "";
 		$utfCharInDec	= hexdec($utfCharInHex);
@@ -530,12 +519,11 @@ class classConvertCharset
 	 * 
 	 * You can get full tables with encodings from http://www.unicode.org
 	 * 
-	 * @access	private
 	 * @param	string		$firstEncoding		Name of first encoding and first encoding filename (thay have to be the same)
 	 * @param	string		$secondEncoding		Name of second encoding and second encoding filename (thay have to be the same). Optional for building a joined table.
 	 * @return	array 		Table necessary to change one encoding to another.
 	 */
-	private function _makeConversionTable( $firstEncoding, $secondEncoding = "" ) 
+	protected function _makeConversionTable( $firstEncoding, $secondEncoding = "" ) 
 	{
 		$convertTable	= array();
 
@@ -544,7 +532,7 @@ class classConvertCharset
 			/**
 			 * Because func_*** can't be used inside of another function call
 			 * we have to save it as a separate value.
-			 **/
+			 */
 			$fileName = func_get_arg($i);
 
 			if ( !is_file( $this->charsetPath . $fileName ) ) 
@@ -560,28 +548,26 @@ class classConvertCharset
 				/**
 				 * We asume that line is not longer
 				 * than 1024 which is the default value for fgets function 
-				 **/
+				 */
 				if( $oneLine = trim( fgets( $fileWithEncTabe, 1024 ) ) )
 				{
 					/**
 					 * We don't need all comment lines. I check only for "#" sign, because
 					 * this is a way of making comments by unicode.org in thair encoding files
 					 * and that's where the files are from :-)
-					 **/
-		
+					 */
 					if ( substr( $oneLine, 0, 1 ) != "#" ) 
 					{
 						/**
 						 * Sometimes inside the charset file the hex walues are separated by
 						 * "space" and sometimes by "tab", the below preg_split can also be used
 						 * to split files where separator is a ",", "\r", "\n" and "\f"
-						 **/
+						 */
 						$hexValue = preg_split ( "/[\s,]+/", $oneLine, 3 );  //We need only first 2 values
 
 						/**
 						 * Sometimes char is UNDEFINED, or missing so we can't use it for convertion
-						 **/
-
+						 */
 						if (substr($hexValue[1], 0, 1) != "#") 
 						{
 							$arrayKey	= strtoupper(str_replace(strtolower("0x"), "", $hexValue[1]));
diff --git a/upload/ips_kernel/classCustomFields.php b/upload/ips_kernel/classCustomFields.php
index 4192ed4f..369c03f2 100644
--- a/upload/ips_kernel/classCustomFields.php
+++ b/upload/ips_kernel/classCustomFields.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Custom fields library
- * Last Updated: $Date: 2010-09-15 19:24:25 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-05-07 17:35:35 -0400 (Sat, 07 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: rtissier $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thursday 8th May 2008 10:31
- * @version		$Revision: 464 $
+ * @version		$Revision: 8670 $
  *
  */
  
@@ -24,57 +24,50 @@ abstract class customFieldPlugin
 	/**
 	 * Custom field name
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $name       = '';
 	
 	/**
 	 * Custom field title
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $title      = '';
 	
 	/**
 	 * Custom field id
 	 *
-	 * @access	public
 	 * @var		integer
-	 **/
+	 */
 	public $id         = 0;
 	
 	/**
 	 * Custom field attributes
 	 *
-	 * @access	public
 	 * @var		array
-	 **/
+	 */
 	public $attributes = array();
 	
 	/**
 	 * Custom field value
 	 *
-	 * @access	public
 	 * @var		array
-	 **/
+	 */
 	public $raw_data   = array();
 	
 	/**
 	 * Custom field mode
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $mode       = '';
 	
 	/**
 	 * Allows you to treat a custom field type as a string
 	 *
-	 * @access	public
 	 * @return	string		Current value of $this->parsed
-	 **/		
+	 */		
 	public function __tostring()
 	{
 		return $this->getValue();
@@ -83,14 +76,13 @@ abstract class customFieldPlugin
 	/**
 	 * Gets the value of the field
 	 *
-	 * @access	public
 	 * @return	string		Current value of $this->parsed
-	 **/		
+	 */		
 	public function getValue()
 	{
 		if( is_array( $this->parsed ) )
 		{
-			return implode( ",", $this->parsed );			
+			return implode( ", ", $this->parsed );			
 		}
 		else
 		{
@@ -101,9 +93,8 @@ abstract class customFieldPlugin
 	/**
 	 * Creates an attribute string from an array
 	 *
-	 * @access	protected
 	 * @return	string
-	 **/	
+	 */	
 	protected function _compileAttributes()
 	{
 		$_attributes = '';
@@ -122,10 +113,9 @@ abstract class customFieldPlugin
 	/**
 	 * Removes harmful html from display
 	 *
-	 * @access	protected
 	 * @var		string		String to make safe
 	 * @return	string
-	 **/
+	 */
 	protected function makeSafeForView( $t )
 	{
 		$t = htmlspecialchars( $t, ENT_QUOTES );
@@ -138,10 +128,9 @@ abstract class customFieldPlugin
 	/**
 	 * Format value for display in a form field
 	 *
-	 * @access	protected
 	 * @var		string		String to make safe
 	 * @return	string
-	 **/	
+	 */	
 	protected function makeSafeForForm( $t )
 	{
 		return str_replace( "'", "&#39;", $t );
@@ -151,64 +140,58 @@ abstract class customFieldPlugin
 /**
  * Interface for custom fields
  *
- **/
+ */
 interface interfaceCustomFieldPlugin
 {
 	/**
 	 * Editing a custom field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function edit();
 	
 	/**
 	 * Viewing a custom field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function view();
 }
 
 /**
  * Text input custom fields
  *
- **/
+ */
 class customFieldText extends customFieldPlugin implements interfaceCustomFieldPlugin
 {
 	/**
 	 * Plugin type
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $plugin_type = '';
 	
 	/**
 	 * Value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $value       = '';
 	
 	/**
 	 * Parsed value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $parsed      = '';
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	array 	$field	Array of field data { id, data, value, class }
 	 * @param	string	$mode	Set to 'view' or 'edit'
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct( $field, $mode )
 	{
 		/* INI */
@@ -234,9 +217,8 @@ class customFieldText extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * edit a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function edit()
 	{
 		/* Attributes */
@@ -258,9 +240,8 @@ class customFieldText extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * view a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function view()
 	{
 		/* Make Safe */
@@ -272,49 +253,44 @@ class customFieldText extends customFieldPlugin implements interfaceCustomFieldP
 /**
  * Check boxes button custom fields
  *
- **/
+ */
 class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldPlugin
 {
 	/**
 	 * Plugin type
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $plugin_type = 'radio';
 	
 	/**
 	 * Value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $value       = '';
 	
 	/**
 	 * Parsed value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $parsed      = '';
 
 	/**
 	 * Data
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $data        = '';
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	array 	$field	Array of field data { id, data, value, class }
 	 * @param	string	$mode	Set to 'view' or 'edit'
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct( $field, $mode )
 	{
 		/* INI */
@@ -340,9 +316,8 @@ class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * edit a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function edit()
 	{
 		/* INI */
@@ -351,7 +326,7 @@ class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldP
 		$_attributes = $this->_compileAttributes();
 		
 		#The first checkbox gets shifted over to the right due to the <label>, so add a linebreak to make them line up
-		$this->parsed .= "<br />";
+		$this->parsed .= "<!--<br />-->";
 		
 		/* Make Safe */
 		foreach( $def_values as $k => $v  )
@@ -369,11 +344,11 @@ class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldP
 			
 			if( count( $def_values ) && in_array( $ov, $def_values ) )
 			{
-				$this->parsed .= "<p><input type='checkbox' class='input_check' id='{$this->name}_{$ov}' name='{$this->name}[$ov]' value='1' checked='checked'{$_attributes}/> $td</p>\n";
+				$this->parsed .= "<span class='f'><input type='checkbox' class='input_check' id='{$this->name}_{$ov}' name='{$this->name}[$ov]' value='1' checked='checked'{$_attributes}/> $td</span>\n";
 			}
 			else
 			{
-				$this->parsed .= "<p><input type='checkbox' class='input_check' id='{$this->name}_{$ov}' name='{$this->name}[$ov]' value='1'{$_attributes}/> $td</p>\n";
+				$this->parsed .= "<span class='f'><input type='checkbox' class='input_check' id='{$this->name}_{$ov}' name='{$this->name}[$ov]' value='1'{$_attributes}/> $td</span>\n";
 			}
 		}
 	}
@@ -381,9 +356,8 @@ class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * view a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function view()
 	{
 		/* INI */
@@ -412,49 +386,44 @@ class customFieldCbox extends customFieldPlugin implements interfaceCustomFieldP
 /**
  * Radio button custom fields
  *
- **/
+ */
 class customFieldRadio extends customFieldPlugin implements interfaceCustomFieldPlugin
 {
 	/**
 	 * Plugin type
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $plugin_type = 'radio';
 	
 	/**
 	 * Value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $value       = '';
 	
 	/**
 	 * Parsed value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $parsed      = '';
 
 	/**
 	 * Data
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $data        = '';
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	array 	$field	Array of field data { id, data, value, class }
 	 * @param	string	$mode	Set to 'view' or 'edit'
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct( $field, $mode )
 	{
 		/* INI */
@@ -480,9 +449,8 @@ class customFieldRadio extends customFieldPlugin implements interfaceCustomField
 	/**
 	 * edit a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function edit()
 	{
 		/* Attributes */
@@ -502,11 +470,11 @@ class customFieldRadio extends customFieldPlugin implements interfaceCustomField
 			
 			if( $this->value == $ov and $this->value )
 			{
-				$this->parsed .= "<input type='radio' class='input_radio' id='{$this->name}_{$ov}' name='{$this->name}' value='$ov' checked='checked'{$_attributes}/> $td\n";
+				$this->parsed .= "<span class='f'><input type='radio' class='input_radio' id='{$this->name}_{$ov}' name='{$this->name}' value='$ov' checked='checked'{$_attributes}/> $td</span>\n";
 			}
 			else
 			{
-				$this->parsed .= "<input type='radio' class='input_radio' id='{$this->name}_{$ov}' name='{$this->name}' value='$ov'{$_attributes}/> $td\n";
+				$this->parsed .= "<span class='f'><input type='radio' class='input_radio' id='{$this->name}_{$ov}' name='{$this->name}' value='$ov'{$_attributes}/> $td</span>\n";
 			}
 		}
 	}
@@ -514,9 +482,8 @@ class customFieldRadio extends customFieldPlugin implements interfaceCustomField
 	/**
 	 * view a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function view()
 	{
 		/* INI */
@@ -544,63 +511,57 @@ class customFieldRadio extends customFieldPlugin implements interfaceCustomField
 /**
  * Dropdown custom fields
  *
- **/
+ */
 class customFieldDrop extends customFieldPlugin implements interfaceCustomFieldPlugin
 {
 	/**
 	 * Plugin type
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $plugin_type = 'drop';
 	
 	/**
 	 * Value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $value       = '';
 	
 	/**
 	 * Parsed value
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $parsed      = '';
 
 	/**
 	 * Data
 	 *
-	 * @access	public
 	 * @var		string
-	 **/
+	 */
 	public $data        = '';
 	
 	/**
 	 * Allow multi-input
 	 *
-	 * @access	private
 	 * @var		boolean
-	 **/
-	private $multi       = false;
+	 */
+	protected $multi       = false;
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	array	$field	Array of field data { id, data, value, class }
 	 * @param	string	$mode	Set to 'view' or 'edit'
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function __construct( $field, $mode )
 	{
 		/* INI */
 		$this->data        = $field['data'];
 		$this->value       = $field['value'];
-		$this->multi       = ( isset( $field['multi'] ) && $field['multi'] == 1 ) ? 1 : 0;
+		$this->multi       = !empty( $field['multi'] ) ? 1 : 0;
 		$this->name        = $this->multi ? 'field_' . $field['id'] . '[]' : 'field_' . $field['id'];		
 		$this->id          = $field['id'];
 		$this->title       = isset( $field['title'] ) ? $field['title'] : '';
@@ -621,14 +582,13 @@ class customFieldDrop extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * edit a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/
+	 * @return	@e void
+	 */
 	public function edit()
 	{
 		/* INI */
 		$carray      = explode( '|', $this->data );
-		$multi       = ( isset( $this->multi ) && $this->multi ) ? " multiple='multiple'" : '';
+		$multi       = !empty( $this->multi ) ? " multiple='multiple'" : '';
 		$def_values  = ( is_array( $this->value ) ) ? $this->value : array( $this->value );
 		$_attributes = $this->_compileAttributes();
 		
@@ -665,9 +625,8 @@ class customFieldDrop extends customFieldPlugin implements interfaceCustomFieldP
 	/**
 	 * view a field
 	 *
-	 * @access	public
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function view()
 	{
 		/* INI */
@@ -695,49 +654,44 @@ class customFieldDrop extends customFieldPlugin implements interfaceCustomFieldP
 /**
  * Primary custom fields class
  *
- **/
+ */
 class classCustomFields
 {
 	/**
 	 * List of fields
 	 *
-	 * @access	private
 	 * @var		array
-	 **/	
-	private $field_list     = array();
+	 */	
+	protected $field_list     = array();
 	
 	/**
 	 * Loaded plugins
 	 *
-	 * @access	private
 	 * @var		array
-	 **/
+	 */
 	public $loaded_plugins = array();
 	
 	/**
 	 * Mode
 	 *
-	 * @access	private
 	 * @var		string
-	 **/
-	private $mode           = '';
+	 */
+	protected $mode           = '';
 	
 	/**
 	 * Custom Fields
 	 *
-	 * @access	public
 	 * @var		array
-	 **/	
+	 */	
 	public $cfields 		= array();
 	
 	/**
 	 * CONSTRUCTOR
 	 *
-	 * @access	public
 	 * @param	array 		Field data
 	 * @param	string		Mode
-	 * @return	void
-	 **/	
+	 * @return	@e void
+	 */	
 	public function __construct( $field_data, $mode='view' )
 	{
 		/* Setup */
@@ -759,9 +713,8 @@ class classCustomFields
 	/**
 	 * Returns an array of supported field types
 	 *
-	 * @access	public
 	 * @return	array
-	 **/	
+	 */	
 	public function getFieldTypes()
 	{
 		return array( 
@@ -776,9 +729,8 @@ class classCustomFields
 	/**
 	 * Returns an array of supported field search types
 	 *
-	 * @access	public
 	 * @return	array
-	 **/	
+	 */	
 	public function getFieldSearchTypes()
 	{
 		return array( 
@@ -790,10 +742,9 @@ class classCustomFields
 	/**
 	 * Parses a submitted form for custom fields
 	 *
-	 * @access	public
 	 * @param	array		Array of field data
 	 * @return	array 		( 'save_array', 'errors' )
-	 **/	
+	 */	
 	public function getFieldsToSave( $input_array )
 	{
 		/* INI */
@@ -868,12 +819,11 @@ class classCustomFields
 	/**
 	 * Parsed a field for display
 	 *
-	 * @access	private
 	 * @param	array	$field		Array of field data
 	 * @param	string	[$mode]		View/Edit, or blank for class default
 	 * @return	object
-	 **/	
-	private function parseField( $field, $mode='' )
+	 */	
+	protected function parseField( $field, $mode='' )
 	{
 		/* INI */
 		$mode = ( $mode ) ? $mode : $this->mode;
@@ -892,10 +842,9 @@ class classCustomFields
 	/**
 	 * Formats the content field for a textarea
 	 *
-	 * @access	public
 	 * @param	string		Content to format
 	 * @return	string
-	 **/	
+	 */	
 	public function formatContentForEdit( $c )
 	{
 		return str_replace( '|', "\n", $c );
@@ -904,10 +853,9 @@ class classCustomFields
 	/**
 	 * Formats the content field for saveing in the database
 	 *
-	 * @access	public
 	 * @param	string		Content to format
 	 * @return	string
-	 **/	
+	 */	
 	public function formatContentForSave( $c )
 	{
 		$c = str_replace( "\r"   , "\n", $c );
@@ -918,19 +866,37 @@ class classCustomFields
 	/**
 	 * Foramts text for saving into the database
 	 *
-	 * @access	public
 	 * @var		string		String to make safe
 	 * @return	string
-	 **/
-	private function formatTextToSave( $t )
+	 */
+	protected function formatTextToSave( $t )
 	{
-		$t = str_replace( "<br>"  , "\n", $t );
-		$t = str_replace( "<br />", "\n", $t );
-		$t = str_replace( "&#39;" , "'" , $t );
-		
-		if ( @get_magic_quotes_gpc() )
+		if( is_array( $t ) )
 		{
-			$t = stripslashes($t);
+			foreach( $t as $k => $v )
+			{
+				$v = str_replace( "<br>"  , "\n", $v );
+				$v = str_replace( "<br />", "\n", $v );
+				$v = str_replace( "&#39;" , "'" , $v );
+				
+				if ( @get_magic_quotes_gpc() )
+				{
+					$v = stripslashes($v);
+				}
+				
+				$t[ $k ]	= $v;
+			}
+		}
+		else
+		{
+			$t = str_replace( "<br>"  , "\n", $t );
+			$t = str_replace( "<br />", "\n", $t );
+			$t = str_replace( "&#39;" , "'" , $t );
+			
+			if ( @get_magic_quotes_gpc() )
+			{
+				$t = stripslashes($t);
+			}
 		}
 		
 		return $t;
diff --git a/upload/ips_kernel/classDb.php b/upload/ips_kernel/classDb.php
index 0b11352d..3290988a 100644
--- a/upload/ips_kernel/classDb.php
+++ b/upload/ips_kernel/classDb.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Database Abstraction Layer
- * Last Updated: $Date: 2010-09-20 20:20:12 -0400 (Mon, 20 Sep 2010) $
+ * Last Updated: $Date: 2011-10-10 16:21:29 -0400 (Mon, 10 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 28th February 2005 16:46
- * @version		$Revision: 467 $
+ * @version		$Revision: 9590 $
  *
  * Basic Usage Examples
  * <code>
@@ -66,6 +66,13 @@ interface interfaceDb
 	 * @return	boolean		Connection successful
 	 */
 	public function connect();
+
+    /**
+	 * Return the connection ID
+	 *
+	 * @return	resource	Connection ID
+	 */
+	public function getConnectionId();
 	
     /**
 	 * Close database connection
@@ -140,7 +147,7 @@ interface interfaceDb
 	 * Takes array of set commands and generates a SQL formatted query
 	 *
 	 * @param	array		Set commands (select, from, where, order, limit, etc)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function build( $data );
 	
@@ -150,7 +157,7 @@ interface interfaceDb
 	 * @param	string		Name of query file method to use
 	 * @param	array		Optional arguments to be parsed inside query function
 	 * @param	string		Optional class name
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function buildFromCache( $method, $args=array(), $class='sql_queries' );
 	
@@ -218,7 +225,7 @@ interface interfaceDb
 	 * Free result set from memory
 	 *
 	 * @param	resource	[Optional] Query id
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function freeResult( $query_id=null );
 
@@ -407,7 +414,7 @@ interface interfaceDb
 	 * Set debug mode flag
 	 *
 	 * @param	boolean		[Optional] Set debug mode on/off
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setDebugMode( $enable=false );
 	
@@ -421,7 +428,7 @@ interface interfaceDb
 	/**
 	 * Flushes the currently queued query
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function flushQuery();
 
@@ -430,7 +437,7 @@ interface interfaceDb
 	 *
 	 * @param	string 		File name
 	 * @param	string 		Classname of file
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loadCacheFile( $filepath, $classname );
 	
@@ -438,7 +445,7 @@ interface interfaceDb
 	 * Checks to see if a query file has been loaded
 	 *
 	 * @param	string 		Classname of file
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function hasLoadedCacheFile( $classname );
 
@@ -446,7 +453,7 @@ interface interfaceDb
 	 * Set fields that shouldn't be escaped
 	 *
 	 * @param	array 		SQL table fields
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function preventAddSlashes( $fields=array() );
 	
@@ -474,15 +481,6 @@ interface interfaceDb
 	 */
 	public function addSlashes( $t );
 
-    /**
-	 * Un-escape strings escaped for DB
-	 *
-	 * @param	string		Text to un-escape
-	 * @return	string		Un-escaped text
-	 * @deprecated	No longer used anywhere, drivers just return the string
-	 */
-	public function removeSlashes( $t );
-
     /**
 	 * Build concat string
 	 *
@@ -595,8 +593,16 @@ interface interfaceDb
 	 * @return	string		[Optional] SQL-formatted "is null" or "is not null" string
 	 */
 	public function buildIsNull( $is_null=true );
-	
+
     /**
+	 * Build coalesce statement
+	 *
+	 * @param	array		Values to check
+	 * @return	string		SQL-formatted coalesce statement
+	 */
+	public function buildCoalesce( $values=array() );
+	
+	/**
 	 * Build from_unixtime string
 	 *
 	 * @param	string		Column name
@@ -604,6 +610,14 @@ interface interfaceDb
 	 * @return	string		SQL-formatted from_unixtime string
 	 */
 	public function buildFromUnixtime( $column, $format='' );
+
+	/**
+	 * Build unix_timestamp string
+	 *
+	 * @param	string		Column name
+	 * @return	string		SQL-formatted unix_timestamp string
+	 */
+	public function buildUnixTimestamp( $column );
 	
     /**
 	 * Build date_format string
@@ -651,6 +665,13 @@ interface interfaceDb
 	 * @return	mixed		Output to screen, or return void
 	 */
 	public function buildWherePermission( array $ids, $field='', $incStarCheck=true );
+
+	/**
+	 * Set Timezone
+	 *
+	 * @param	float		UTC Offset (e.g. 6 or -4.5)
+	 */
+	public function setTimeZone( $offset );
 	
     /**
 	 * Logs SQL error message to log file
@@ -658,7 +679,7 @@ interface interfaceDb
 	 * @param	string		SQL Query
 	 * @param	string		Data to log (i.e. error message)
 	 * @param	integer		Timestamp for log
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function writeDebugLog( $query, $data, $endtime );
 
@@ -818,10 +839,10 @@ abstract class dbMain
 	/**
 	 * Optimization to stop querying the same loaded cache over and over
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		array
 	 */
-	private $_triedToLoadCacheFiles = array();
+	protected $_triedToLoadCacheFiles = array();
 	
 	/**
 	 * Connection variables set when installed
@@ -834,18 +855,17 @@ abstract class dbMain
 	/**
 	 * Over-ride guessed data types in insert/update ops
 	 *
-	 * @access	public
 	 * @var 	array 		Force data types for columns
 	 */
-	public $force_data_type   = array();
+	protected $_dataTypes   = array();
 	
 	/**
-	 * Select which fields aren't escaped during insert/update ops
+	 * Select which fields aren't escaped during insert/update ops.  Set using preventAddSlashes()
 	 *
-	 * @access	public
+	 * @access	protected
 	 * @var 	array 		Do not escape these fields
 	 */
-	public $no_escape_fields  = array();
+	protected $no_escape_fields  = array();
 	
 	/**
 	 * Classname of query cache file
@@ -917,7 +937,7 @@ abstract class dbMain
 	 * db_driver constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -932,7 +952,7 @@ abstract class dbMain
 	 * Global connect class
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function connect()
 	{
@@ -963,12 +983,44 @@ abstract class dbMain
 	{
 	}
 	
+	/**
+	 * Force a column data type
+	 *
+	 * @param	mixed	$column	Column name, or an array of column names
+	 * @param	string	$type	Data type to use
+	 * @return	@e void
+	 */
+	public function setDataType( $column, $type='string' )
+	{
+		if( is_array($column) )
+		{
+			foreach( $column as $_column )
+			{
+				$this->_dataTypes[ $_column ]	= $type;
+			}
+		}
+		else
+		{
+			$this->_dataTypes[ $column ]	= $type;
+		}
+	}
+	
+	/**
+	 * Reset forced data types
+	 *
+	 * @return	@e void
+	 */
+	public function resetDataTypes()
+	{
+		$this->_dataTypes	= array();
+	}
+	
     /**
 	 * Takes array of set commands and generates a SQL formatted query
 	 *
 	 * @access	public
 	 * @param	array		Set commands (select, from, where, order, limit, etc)
-	 * @return	void
+	 * @return	@e void
 	 */
     public function build( $data )
     {
@@ -982,34 +1034,34 @@ abstract class dbMain
 			}
 		}
 		
-    	if ( isset($data['select']) && $data['select'] )
+    	if ( !empty($data['select']) )
     	{
     		$this->_buildSelect( $data['select'], $data['from'], isset($data['where']) ? $data['where'] : '', isset( $data['add_join'] ) ? $data['add_join'] : array(), isset( $data['calcRows'] ) ? $data['calcRows'] : '' );
     	}
     	
-    	if ( isset($data['update']) && $data['update'] )
+    	if ( !empty($data['update']) )
     	{
     		$this->update( $data['update'], $data['set'], isset($data['where']) ? $data['where'] : '', false, true );
     		return;
     	}
     	
-    	if ( isset($data['delete']) && $data['delete'] )
+    	if ( !empty($data['delete']) )
     	{
     		$this->delete( $data['delete'], $data['where'], $data['order'], $data['limit'], false );
     		return;
     	}
     	
-    	if ( isset($data['group']) && $data['group'] )
+    	if ( !empty($data['group']) )
     	{
     		$this->_buildGroupBy( $data['group'] );
     	}
     	
-    	if ( isset($data['having']) && $data['having'] )
+    	if ( !empty($data['having']) )
     	{
     		$this->_buildHaving( $data['having'] );
     	} 	
     	
-    	if ( isset($data['order']) && $data['order'] )
+    	if ( !empty($data['order']) )
     	{
     		$this->_buildOrderBy( $data['order'] );
     	}
@@ -1060,7 +1112,7 @@ abstract class dbMain
 				}
 			}
 		}
-
+		
     	if( $instance )
     	{
     		$this->cur_query .= $instance->$method( $args );
@@ -1119,7 +1171,7 @@ abstract class dbMain
 
     	$res = $this->execute();
     	
-    	if ( isset($data['select']) AND $data['select'] )
+    	if ( !empty($data['select']) )
     	{
     		return $this->fetch( $res );
     	}
@@ -1218,7 +1270,7 @@ abstract class dbMain
 	 *
 	 * @access	public
 	 * @param	boolean		[Optional] Set debug mode on/off
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function setDebugMode( $enable=false )
 	{
@@ -1249,7 +1301,7 @@ abstract class dbMain
 	 * Flushes the currently queued query
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function flushQuery()
 	{
@@ -1260,7 +1312,7 @@ abstract class dbMain
 	 * Set SQL Prefix
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _setPrefix()
 	{
@@ -1278,7 +1330,7 @@ abstract class dbMain
 	 * @access	public
 	 * @param	string 		File name
 	 * @param	string 		Classname of file
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function hasLoadedCacheFile( $classname )
 	{
@@ -1307,7 +1359,7 @@ abstract class dbMain
 		if ( ! isset( $this->_triedToLoadCacheFiles[ $classname ] ) )
 		{
 			/* Try and load it */
-	    	if ( ! file_exists( $filepath ) AND $ignoreMissing === FALSE )
+	    	if ( ! is_file( $filepath ) AND $ignoreMissing === FALSE )
 	    	{
 	    		$this->error	= "�евозможно найти {$filepath} - завершение!";
 
@@ -1315,7 +1367,7 @@ abstract class dbMain
 	    	}
 	    	else if ( $this->hasLoadedCacheFile( $classname ) !== TRUE )
 	    	{
-	    		require_once( $filepath );
+	    		require_once( $filepath );/*noLibHook*/
     		
 	    		if( class_exists( $classname ) )
 	    		{
@@ -1345,23 +1397,23 @@ abstract class dbMain
 		
 		if ( $incStarCheck === true )
 		{
-			$where = ' OR ( ' . $field . '=\'*\' )';
+			$where .= ' OR ( ' . $field . '=\'*\' )';
 		}
 		
-		return $where;
+		return "( " . $where . " )";
 	}
 	
     /**
 	 * Load Query cache file
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _loadCacheFile()
 	{
 		if ( $this->obj['query_cache_file'] )
      	{
-     		require_once( $this->obj['query_cache_file'] );
+     		require_once( $this->obj['query_cache_file'] );/*noLibHook*/
      	
 			$sql_queries_name = $this->sql_queries_name ? $this->sql_queries_name : 'sql_queries';
 
@@ -1374,7 +1426,7 @@ abstract class dbMain
 	 *
 	 * @access	public
 	 * @param	array 		SQL table fields
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function preventAddSlashes( $fields=array() )
 	{
@@ -1402,7 +1454,7 @@ abstract class dbMain
 				$add_slashes = 0;
 			}
 			
-			if ( isset($this->no_escape_fields[ $k ]) AND $this->no_escape_fields[ $k ] )
+			if ( !empty($this->no_escape_fields[ $k ]) )
 			{
 				$add_slashes = 0;
 			}
@@ -1418,21 +1470,21 @@ abstract class dbMain
 			// Forcing data type?
 			//-----------------------------------------
 			
-			if ( isset($this->force_data_type[ $k ]) AND $this->force_data_type[ $k ] )
+			if ( !empty($this->_dataTypes[ $k ]) )
 			{
-				if ( $this->force_data_type[ $k ] == 'string' )
+				if ( $this->_dataTypes[ $k ] == 'string' )
 				{
 					$field_values .= $this->fieldEncapsulate . $v . $this->fieldEncapsulate . ',';
 				}
-				else if ( $this->force_data_type[ $k ] == 'int' )
+				else if ( $this->_dataTypes[ $k ] == 'int' )
 				{
 					$field_values .= intval($v).",";
 				}
-				else if ( $this->force_data_type[ $k ] == 'float' )
+				else if ( $this->_dataTypes[ $k ] == 'float' )
 				{
 					$field_values .= floatval($v).",";
 				}
-				if ( $this->force_data_type[ $k ] == 'null' )
+				if ( $this->_dataTypes[ $k ] == 'null' )
 				{
 					$field_values .= "NULL,";
 				}
@@ -1487,7 +1539,7 @@ abstract class dbMain
 				$add_slashes = 0;
 			}
 			
-			if ( isset($this->no_escape_fields[ $k ]) && $this->no_escape_fields[ $k ] )
+			if ( !empty($this->no_escape_fields[ $k ]) )
 			{
 				$add_slashes = 0;
 			}
@@ -1501,13 +1553,13 @@ abstract class dbMain
 			// Forcing data type?
 			//-----------------------------------------
 			
-			if ( isset($this->force_data_type[ $k ]) && $this->force_data_type[ $k ] )
+			if ( !empty($this->_dataTypes[ $k ]) )
 			{
-				if ( $this->force_data_type[ $k ] == 'string' )
+				if ( $this->_dataTypes[ $k ] == 'string' )
 				{
 					$return_string .= $k . '=' . $this->fieldEncapsulate . $v . $this->fieldEncapsulate . ',';
 				}
-				else if ( $this->force_data_type[ $k ] == 'int' )
+				else if ( $this->_dataTypes[ $k ] == 'int' )
 				{
 					if ( strstr( $v, 'plus:' ) )
 					{
@@ -1522,11 +1574,11 @@ abstract class dbMain
 						$return_string .= $k . "=" . intval($v) . ",";
 					}
 				}
-				else if ( $this->force_data_type[ $k ] == 'float' )
+				else if ( $this->_dataTypes[ $k ] == 'float' )
 				{
 					$return_string .= $k . "=" . floatval($v) . ",";
 				}
-				else if ( $this->force_data_type[ $k ] == 'null' )
+				else if ( $this->_dataTypes[ $k ] == 'null' )
 				{
 					$return_string .= $k . "=NULL,";
 				}
@@ -1550,7 +1602,7 @@ abstract class dbMain
 		}
 		
 		$return_string = rtrim( $return_string, "," );
-		
+
 		return $return_string;
 	}
 	
@@ -1581,7 +1633,7 @@ abstract class dbMain
 	 *
 	 * @access	protected
 	 * @param	string		Order by clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	abstract protected function _buildOrderBy( $order );
 
@@ -1590,7 +1642,7 @@ abstract class dbMain
 	 *
 	 * @access	protected
 	 * @param	string		Having clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	abstract protected function _buildHaving( $having_clause );
 	
@@ -1599,7 +1651,7 @@ abstract class dbMain
 	 *
 	 * @access	protected
 	 * @param	string		Group by clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	abstract protected function _buildGroupBy( $group );
 
@@ -1609,7 +1661,7 @@ abstract class dbMain
 	 * @access	protected
 	 * @param	integer		Start offset
 	 * @param	integer		[Optional] Number of records
-	 * @return	void
+	 * @return	@e void
 	 */
 	abstract protected function _buildLimit( $offset, $limit=0 );
 	
@@ -1621,7 +1673,7 @@ abstract class dbMain
 	 * @param	string		Table name
 	 * @param	string		[Optional] Where clause
 	 * @param	array 		[Optional] Joined table data
-	 * @return	void
+	 * @return	@e void
 	 */
 	abstract protected function _buildSelect( $get, $table, $where, $add_join=array(), $calcRows=FALSE );
 	
@@ -1629,7 +1681,7 @@ abstract class dbMain
 	 * Generates calc rows in the query if supported / runs count(*) if not
 	 *
 	 * @access	protected
-	 * @return	void		Sets $this->_calcRows
+	 * @return	@e void		Sets $this->_calcRows
 	 */
 	abstract protected function _buildCalcRows();
 
@@ -1767,7 +1819,7 @@ abstract class dbMain
 
 			if( $this->use_template )
 			{
-				require_once( DOC_IPS_ROOT_PATH . 'cache/skin_cache/'. $errTemplate . '.php' );
+				require_once( DOC_IPS_ROOT_PATH . 'cache/skin_cache/'. $errTemplate . '.php' );/*noLibHook*/
 				$template = new ipsDriverErrorTemplate();
 				print $template->showError( $errTemplate == 'ipsServerError' ? true : false, $the_error );
 			}
@@ -1798,7 +1850,7 @@ abstract class dbMain
 			    	
 			if( $this->use_template )
 			{
-				require_once( DOC_IPS_ROOT_PATH . 'cache/skin_cache/'. $errTemplate . '.php' );
+				require_once( DOC_IPS_ROOT_PATH . 'cache/skin_cache/'. $errTemplate . '.php' );/*noLibHook*/
 				$template = new ipsDriverErrorTemplate();
 				print $template->showError( true, $the_error );
 			}
@@ -1829,7 +1881,7 @@ abstract class dbMain
 	 * @param	string		SQL Query
 	 * @param	string		Data to log (i.e. error message)
 	 * @param	integer		Timestamp for log
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function writeDebugLog( $query, $data, $endtime, $fileToWrite='', $backTrace=FALSE )
 	{
@@ -1907,7 +1959,7 @@ abstract class dbMain
 	 * db_driver destructor: Runs shutdown queries and closes connection
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
diff --git a/upload/ips_kernel/classDbMysql.php b/upload/ips_kernel/classDbMysql.php
index 34b770cf..0353e8d4 100644
--- a/upload/ips_kernel/classDbMysql.php
+++ b/upload/ips_kernel/classDbMysql.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * MySQL Database Driver :: Further loads mysql or mysqli client appropriately
- * Last Updated: $Date: 2010-10-06 12:04:54 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-10-10 16:21:29 -0400 (Mon, 10 Oct 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 28th February 2005 16:46
- * @version		$Revision: 473 $
+ * @version		$Revision: 9590 $
  */
 
 /**
@@ -29,7 +29,7 @@ define( 'REPLACE_TYPE', 2 );
  */
 if ( ! class_exists( 'dbMain' ) )
 {
-	require_once( dirname( __FILE__ ) . '/classDb.php' );
+	require_once( dirname( __FILE__ ) . '/classDb.php' );/*noLibHook*/
 }
 
 abstract class db_main_mysql extends dbMain
@@ -59,6 +59,16 @@ abstract class db_main_mysql extends dbMain
 	 */
 	public $fieldNameEncapsulate	= '`';
 
+    /**
+	 * Return the connection ID
+	 *
+	 * @return	resource	Connection ID
+	 */
+	public function getConnectionId()
+	{
+		return $this->connection_id;
+	}
+
     /**
 	 * Delete data from a table
 	 *
@@ -109,7 +119,7 @@ abstract class db_main_mysql extends dbMain
 	 * @param	boolean		[Optional] $set is already pre-formatted
 	 * @return	resource	Query id
 	 */
-	public function update( $table, $set, $where='', $shutdown=false, $preformatted=false )
+	public function update( $table, $set, $where='', $shutdown=false, $preformatted=false, $debug=false )
     {
     	//-----------------------------------------
     	// Form query
@@ -123,7 +133,7 @@ abstract class db_main_mysql extends dbMain
     	{
     		$query .= " WHERE " . $where;
     	}
-
+    	
     	return $this->_determineShutdownAndRun( $query, $shutdown );
     }
 
@@ -472,11 +482,18 @@ abstract class db_main_mysql extends dbMain
 	 * @access	public
 	 * @param	string		Table name
 	 * @param	string		Field name
-	 * @return	resource	Query id
+	 * @return	mixed		Query id resource, or null
 	 */
 	public function addFulltextIndex( $table, $field )
 	{
-		return $this->query( "ALTER TABLE " . $this->obj['sql_tbl_prefix'] . $table . " ADD FULLTEXT({$field})" );
+		if( $this->checkFulltextSupport() )
+		{
+			return $this->query( "ALTER TABLE " . $this->obj['sql_tbl_prefix'] . $table . " ADD FULLTEXT({$field})" );
+		}
+		else
+		{
+			return null;
+		}
 	}
 
     /**
@@ -567,24 +584,12 @@ abstract class db_main_mysql extends dbMain
 		}
 	}
 
-    /**
-	 * Un-escape strings escaped for DB
-	 *
-	 * @access	public
-	 * @param	string		Text to un-escape
-	 * @return	string		Un-escaped text
-	 */
-	public function removeSlashes( $t )
-	{
-		return $t;
-	}
-
     /**
 	 * Build order by clause
 	 *
 	 * @access	protected
 	 * @param	string		Order by clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildOrderBy( $order )
 	{
@@ -599,7 +604,7 @@ abstract class db_main_mysql extends dbMain
 	 *
 	 * @access	protected
 	 * @param	string		Having clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildHaving( $having_clause )
 	{
@@ -614,7 +619,7 @@ abstract class db_main_mysql extends dbMain
 	 *
 	 * @access	protected
 	 * @param	string		Group by clause
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildGroupBy( $group )
 	{
@@ -630,7 +635,7 @@ abstract class db_main_mysql extends dbMain
 	 * @access	protected
 	 * @param	integer		Start offset
 	 * @param	integer		[Optional] Number of records
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildLimit( $offset, $limit=0 )
 	{
@@ -733,16 +738,26 @@ abstract class db_main_mysql extends dbMain
 	 * @param	array		Array of values to allow
 	 * @return	string		SQL-formatted concat string
 	 */
-	public function buildLikeChain( $column, $data )
+	public function buildLikeChain( $column, $data, $isNumerical=true )
 	{
 		$return = $column . "='*'";
-
-		if ( is_array( $data ) )
+		$comma  = ',';
+		
+		if ( ! is_array( $data ) )
 		{
-			foreach( $data as $id )
-			{
-				$return .= " OR " . $column . " LIKE '%," . $id . ",%'";
-			}
+			return '1=1';
+		}
+		
+		if ( ! $isNumerical )
+		{
+			$comma  = '';
+			$first  = array_shift( $data );
+			$return = $column . ' LIKE \'%' . $first . '%\'';
+		}
+		
+		foreach( $data as $id )
+		{
+			$return .= " OR " . $column . " LIKE '%" . $comma . $id . $comma . "%'";
 		}
 
 		return $return;
@@ -765,6 +780,11 @@ abstract class db_main_mysql extends dbMain
 		
 		foreach( $ids as $i )
 		{
+			if ( ! $i )
+			{
+				continue;
+			}
+			
 			$_or[] = "FIND_IN_SET(" . $i . "," . $field . ")";
 		}
 		
@@ -785,6 +805,20 @@ abstract class db_main_mysql extends dbMain
 		return $where . ' )';
 	}
 	
+	/**
+	 * Set Timezone
+	 *
+	 * @param	float		UTC Offset (e.g. 6 or -4.5)
+	 */
+	public function setTimeZone( $offset )
+	{
+		$offset = number_format( floatval( $offset ), 2 );
+		$decimal = substr( $offset, strpos( $offset, '.' ) + 1 );
+		$offset = ( $offset >= 0 ? '+' . floor( $offset ) : ceil( $offset ) ) . ':' . str_pad( $decimal = ( 60 / 100 ) * $decimal, 2, '0' );
+
+		$this->query( "SET time_zone = '{$offset}';" );
+	}
+	
     /**
 	 * Build instr string
 	 *
@@ -906,6 +940,22 @@ abstract class db_main_mysql extends dbMain
 	{
 		return $is_null ? " IS NULL " : " IS NOT NULL ";
 	}
+	
+    /**
+	 * Build coalesce statement
+	 *
+	 * @param	array		Values to check
+	 * @return	string		SQL-formatted coalesce statement
+	 */
+	public function buildCoalesce( $values=array() )
+	{
+		if( !count($values) )
+		{
+			return '';
+		}
+
+		return "COALESCE(" . implode( ',', $values ) . ")";
+	}
 
     /**
 	 * Build from_unixtime string
@@ -927,6 +977,17 @@ abstract class db_main_mysql extends dbMain
 		}
 	}
 
+	/**
+	 * Build unix_timestamp string
+	 *
+	 * @param	string		Column name
+	 * @return	string		SQL-formatted unix_timestamp string
+	 */
+	public function buildUnixTimestamp( $column )
+	{
+		return "UNIX_TIMESTAMP(" . $column . ")";
+	}
+
     /**
 	 * Build date_format string
 	 *
@@ -963,7 +1024,7 @@ abstract class db_main_mysql extends dbMain
 	 */
 	public function buildSearchStatement( $column, $keyword, $booleanMode=true, $returnRanking=false, $useFulltext=true )
 	{
-		if( !$useFulltext )
+		if( !$useFulltext OR strtolower($this->connect_vars['mysql_tbl_type']) != 'myisam' )
 		{
 			return "{$column} LIKE '%{$keyword}%'";
 		}
@@ -972,14 +1033,25 @@ abstract class db_main_mysql extends dbMain
 			return "MATCH( {$column} ) AGAINST( '{$keyword}' " . ( $booleanMode === TRUE ? 'IN BOOLEAN MODE' : '' ) . " )" . ( $returnRanking === TRUE ? ' as ranking' : '' );
 		}
 	}
-
+	
+	/**
+	 * Builds a call to MD5 equivalent
+	 *
+	 * @access public
+	 * @return string		SQL-formatted MD5 function call string
+	 */
+	public function buildMd5Statement( $statement )
+	{
+		return "MD5(" . $statement . ")";
+	}
+	
 	/**
 	 * Build calc rows
 	 * We don't have to do anything for MySQL 4+ as it's handled internally
 	 * This is always called before the limit is applied
 	 *
 	 * @access	public
-	 * @return	void		Sets $this->_calcRows
+	 * @return	@e void		Sets $this->_calcRows
 	 */
 	protected function _buildCalcRows()
 	{
@@ -1005,7 +1077,7 @@ abstract class db_main_mysql extends dbMain
 	 * @param	string		Table name
 	 * @param	string		[Optional] Where clause
 	 * @param	array 		[Optional] Joined table data
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function _buildSelect( $get, $table, $where, $add_join=array(), $calcRows=FALSE )
 	{
@@ -1068,12 +1140,12 @@ abstract class db_main_mysql extends dbMain
 	    		foreach( $add_join as $join )
 	    		{
 	    			# Push join's select to stack
-	    			if ( isset($join['select']) AND $join['select'] )
+	    			if ( !empty($join['select']) )
 	    			{
 	    				$select_array[] = $join['select'];
 	    			}
 
-	    			if ( !isset($join['type']) OR !$join['type'] OR $join['type'] == 'left' )
+	    			if ( empty($join['type']) OR $join['type'] == 'left' )
 	    			{
 	    				$hasLeft = true;
 	    				# Join is left or not specified (assume left)
@@ -1149,11 +1221,11 @@ abstract class db_main_mysql extends dbMain
 
 if ( extension_loaded('mysqli') AND ! defined( 'FORCE_MYSQL_ONLY' ) )
 {
-	require( dirname( __FILE__ ) . "/classDbMysqliClient.php" );
+	require( dirname( __FILE__ ) . "/classDbMysqliClient.php" );/*noLibHook*/
 }
 else
 {
-	require( dirname( __FILE__ ) . "/classDbMysqlClient.php" );
+	require( dirname( __FILE__ ) . "/classDbMysqlClient.php" );/*noLibHook*/
 }
 
 //-----------------------------------------
diff --git a/upload/ips_kernel/classDbMysqlClient.php b/upload/ips_kernel/classDbMysqlClient.php
index 34ca6c8a..1a38269e 100644
--- a/upload/ips_kernel/classDbMysqlClient.php
+++ b/upload/ips_kernel/classDbMysqlClient.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * MySQL Database Driver :: MySQL client
- * Last Updated: $Date: 2010-07-13 19:56:26 -0400 (Tue, 13 Jul 2010) $
+ * Last Updated: $Date: 2011-07-06 06:19:23 -0400 (Wed, 06 Jul 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 28th February 2005 16:46
- * @version		$Revision: 438 $
+ * @version		$Revision: 9167 $
  */
 
 class db_driver_mysql extends db_main_mysql implements interfaceDb
@@ -24,7 +24,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 	 * constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -64,6 +64,11 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
      	// Connect
      	//-----------------------------------------
 
+    	if( $this->obj['sql_socket'] )
+    	{
+    		$this->obj['sql_host']	= $this->obj['sql_host'] . ':' . $this->obj['sql_socket'];
+    	}
+
     	if ( $this->obj['persistent'] )
     	{
     	    $this->connection_id = @mysql_pconnect( $this->obj['sql_host'] ,
@@ -149,7 +154,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
         // Change the table prefix if needed
         //-----------------------------------------
 
-        if ( $this->no_prefix_convert )
+        /*if ( $this->no_prefix_convert )
         {
         	$bypass = 1;
         }
@@ -160,7 +165,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 			{
 			   //$the_query = preg_replace("/\sibf_(\S+?)([\s\.,]|$)/", " ".$this->obj['sql_tbl_prefix']."\\1\\2", $the_query);
 			}
-        }
+        }*/
         
         //-----------------------------------------
         // Debug?
@@ -216,7 +221,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
       	// Reset array...
       	//-----------------------------------------
 
-      	$this->force_data_type  = array();
+      	$this->resetDataTypes();
       	$this->allow_sub_select = false;
 
         if (! $this->query_id )
@@ -253,7 +258,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 					$_data .= "\n|Extra: ". $array['Extra'];
 					//$_data .= "\n+------------------------------------------------------------------------------+";
 
-					if ( ( $this->obj['use_bad_log'] AND $this->obj['bad_log'] ) AND stristr( $array['Extra'], 'filesort' ) OR stristr( $array['Extra'], 'temporary' ) )
+					if ( ( $this->obj['use_bad_log'] AND $this->obj['bad_log'] ) AND ( stristr( $array['Extra'], 'filesort' ) OR stristr( $array['Extra'], 'temporary' ) ) )
 					{
 						$this->writeDebugLog( $the_query, $_data, $endtime, $this->obj['bad_log'], TRUE );
 					}
@@ -419,7 +424,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 	 *
 	 * @access	public
 	 * @param	resource	[Optional] Query id
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function freeResult( $query_id=null )
 	{
diff --git a/upload/ips_kernel/classDbMysqliClient.php b/upload/ips_kernel/classDbMysqliClient.php
index c2fdb8ff..ad555d0b 100644
--- a/upload/ips_kernel/classDbMysqliClient.php
+++ b/upload/ips_kernel/classDbMysqliClient.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * MySQL Database Driver :: MySQLi client
- * Last Updated: $Date: 2010-10-06 12:04:54 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated: $Date: 2011-08-12 11:44:48 -0400 (Fri, 12 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mmecham $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 28th February 2005 16:46
- * @version		$Revision: 473 $
+ * @version		$Revision: 9390 $
  */
 
 class db_driver_mysql extends db_main_mysql implements interfaceDb
@@ -23,16 +23,16 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 	/**
 	 * Connection failed flag
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 		boolean 		Connection failed
 	 */
-	private $connect_failed		= false;
+	protected $connect_failed		= false;
 
 	/**
 	 * constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -80,23 +80,57 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 			$this->obj['sql_host'] = $host;
 			$this->obj['sql_port'] = intval( $port );
 		}
-
-     	if( $this->obj['sql_port'] )
-     	{
-			$this->connection_id = @mysqli_connect( $this->obj['sql_host'] ,
-													  $this->obj['sql_user'] ,
-													  $this->obj['sql_pass'],
-													  $this->obj['sql_database'],
-													  $this->obj['sql_port']
-													);
+		
+		/* Persistent connection */
+		if( $this->obj['persistent'] )
+		{
+			$this->obj['sql_host'] = 'p:' . $this->obj['sql_host'];
+		}
+		
+		/* Use socket if specified */
+		if( $this->obj['sql_socket'] )
+		{
+			if( $this->obj['sql_port'] )
+			{
+				$this->connection_id = @mysqli_connect( $this->obj['sql_host'],
+														  $this->obj['sql_user'],
+														  $this->obj['sql_pass'],
+														  $this->obj['sql_database'],
+														  $this->obj['sql_port'],
+														  $this->obj['sql_socket']
+														);
+			}
+			else
+			{
+				$this->connection_id = @mysqli_connect( $this->obj['sql_host'],
+														  $this->obj['sql_user'],
+														  $this->obj['sql_pass'],
+														  $this->obj['sql_database'],
+														  null,
+														  $this->obj['sql_socket']
+														);
+			}
 		}
 		else
 		{
-			$this->connection_id = @mysqli_connect( $this->obj['sql_host'] ,
-													  $this->obj['sql_user'] ,
-													  $this->obj['sql_pass'],
-													  $this->obj['sql_database']
-													);
+			if( $this->obj['sql_port'] )
+			{
+				$this->connection_id = @mysqli_connect( $this->obj['sql_host'],
+														  $this->obj['sql_user'],
+														  $this->obj['sql_pass'],
+														  $this->obj['sql_database'],
+														  $this->obj['sql_port']
+														);
+			}
+			else
+			{
+				$this->connection_id = @mysqli_connect( $this->obj['sql_host'],
+														  $this->obj['sql_user'],
+														  $this->obj['sql_pass'],
+														  $this->obj['sql_database']
+														);
+			}
+
 		}
 
 		if ( ! $this->connection_id )
@@ -167,7 +201,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
         // Change the table prefix if needed
         //-----------------------------------------
 
-        if ( $this->no_prefix_convert )
+        /*if ( $this->no_prefix_convert )
         {
         	$bypass = 1;
         }
@@ -178,7 +212,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 			{
 			   //$the_query = preg_replace("/\sibf_(\S+?)([\s\.,]|$)/", " ".$this->obj['sql_tbl_prefix']."\\1\\2", $the_query);
 			}
-        }
+        }*/
         
         //-----------------------------------------
         // Debug?
@@ -233,7 +267,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
       	// Reset array...
       	//-----------------------------------------
 
-      	$this->force_data_type  = array();
+      	$this->resetDataTypes();
       	$this->allow_sub_select = false;
 
         if (! $this->query_id )
@@ -270,7 +304,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 					$_data .= "\n|Extra: ". $array['Extra'];
 					//$_data .= "\n+------------------------------------------------------------------------------+";
 
-					if ( ( $this->obj['use_bad_log'] AND $this->obj['bad_log'] ) AND stristr( $array['Extra'], 'filesort' ) OR stristr( $array['Extra'], 'temporary' ) )
+					if ( ( $this->obj['use_bad_log'] AND $this->obj['bad_log'] ) AND ( stristr( $array['Extra'], 'filesort' ) OR stristr( $array['Extra'], 'temporary' ) ) )
 					{
 						$this->writeDebugLog( $the_query, $_data, $endtime, $this->obj['bad_log'], TRUE );
 					}
@@ -442,7 +476,7 @@ class db_driver_mysql extends db_main_mysql implements interfaceDb
 	 *
 	 * @access	public
 	 * @param	resource	[Optional] Query id
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function freeResult( $query_id=null )
 	{
diff --git a/upload/ips_kernel/classDifference.php b/upload/ips_kernel/classDifference.php
index 0908bff3..fba164d8 100644
--- a/upload/ips_kernel/classDifference.php
+++ b/upload/ips_kernel/classDifference.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Compare and highlight differences between two strings or files
- * Last Updated: $Date: 2010-04-21 07:40:53 -0400 (Wed, 21 Apr 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Thursday 10th February 2005 (10:47)
- * @version		$Revision: 394 $
+ * @version		$Revision: 8644 $
  */
 
 if ( ! defined( 'IPS_CLASSES_PATH' ) )
@@ -66,7 +66,7 @@ class classDifference
 	* Constructor
 	*
 	* @access	public
-	* @return	void
+	* @return	@e void
 	*/
 	public function __construct()
 	{
@@ -208,12 +208,12 @@ class classDifference
 	/**
 	* Adds space character after HTML tags
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		String
 	* @param	integer		[Optional][0=reverse, 1=normal]
 	* @return	string		Converted string
 	*/
-	private function _diffTagSpace( $str, $rev=0 )
+	protected function _diffTagSpace( $str, $rev=0 )
 	{
 		if ( $rev )
 		{
@@ -228,11 +228,11 @@ class classDifference
 	/**
 	* Explodes input string into words
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Input string
 	* @return	array 		Array of words in string
 	*/
-	private function _diffExplodeStringIntoWords( $str )
+	protected function _diffExplodeStringIntoWords( $str )
 	{
 		$str_array = $this->_explodeTrim( chr(10), $str );
 		$out_array = array();
@@ -253,13 +253,13 @@ class classDifference
 	/**
 	* Explode into array and trim
 	*
-	* @access	private
+	* @access	protected
 	* @param	string 		Delimiter
 	* @param	string		String to check
 	* @param	integer		[Optional] Remove blank lines
 	* @return	array 		Array of lines in string
 	*/
-	private function _explodeTrim( $delim, $str, $remove_blank=0 )
+	protected function _explodeTrim( $delim, $str, $remove_blank=0 )
 	{
 		$tmp   = explode( $delim, trim($str) );
 		$final = array();
@@ -282,26 +282,26 @@ class classDifference
 	/**
 	* Produce differences using PHP
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		comapre string 1
 	* @param	string		comapre string 2
 	* @return	string
 	*/
-    private function _getPhpDiff( $str1 , $str2 )
+    protected function _getPhpDiff( $str1 , $str2 )
     { 
     	$str1 = explode( "\n", str_replace( "\r\n", "\n", $str1 ) );
     	$str2 = explode( "\n", str_replace( "\r\n", "\n", $str2 ) );
     	
 		/* Set include path.. */
-		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );
+		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );/*noLibHook*/
 		
 		/* OMG.. too many PHP 5 errors under strict standards */
 		$oldReportLevel = error_reporting( 0 );
 		error_reporting( $oldReportLevel ^ E_STRICT );
 		
-    	require_once 'Text/Diff.php';
-		require_once 'Text/Diff/Renderer.php';
-		require_once 'Text/Diff/Renderer/inline.php';
+    	require_once 'Text/Diff.php';/*noLibHook*/
+		require_once 'Text/Diff/Renderer.php';/*noLibHook*/
+		require_once 'Text/Diff/Renderer/inline.php';/*noLibHook*/
 		
 		$diff = new Text_Diff( 'auto', array( $str1, $str2 ) );
 		
@@ -333,12 +333,12 @@ class classDifference
 	/**
 	* Produce differences using unix diff
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		comapre string 1
 	* @param	string		comapre string 2
 	* @return	string
 	*/
-	private function _getExecDiff( $str1, $str2 )
+	protected function _getExecDiff( $str1, $str2 )
 	{
 		//-------------------------------
 		// Write the tmp files
@@ -363,7 +363,7 @@ class classDifference
 		// Check
 		//-------------------------------
 		
-		if ( file_exists( $file1 ) and file_exists( $file2 ) )
+		if ( is_file( $file1 ) and is_file( $file2 ) )
 		{
 			exec( $this->diff_command.' '.$file1.' '.$file2, $result );
 			
@@ -381,20 +381,19 @@ class classDifference
 	/**
 	* Produce differences using CGI
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		comapre string 1
 	* @param	string		comapre string 2
 	* @return	string
 	*/
-	private function _getCgiDiff( $str1, $str2 )
+	protected function _getCgiDiff( $str1, $str2 )
 	{
 		//-----------------------------------------
 		// Load file management class
 		//-----------------------------------------
 		
-		require_once( IPS_KERNEL_PATH . '/classFileManagement.php' );
+		require_once( IPS_KERNEL_PATH . '/classFileManagement.php' );/*noLibHook*/
 		$this->classFileManagement = new classFileManagement();
-		$this->classFileManagement->use_sockets = ipsRegistry::$settings['enable_sockets'];
 		
 		//-------------------------------
 		// Write the tmp files
@@ -419,7 +418,7 @@ class classDifference
 		// Check
 		//-------------------------------
 		
-		if ( file_exists( IPS_ROOT_PATH . 'uploads/' . $file1 ) AND file_exists( IPS_ROOT_PATH . 'uploads/' . $file2 ) )
+		if ( is_file( IPS_ROOT_PATH . 'uploads/' . $file1 ) AND is_file( IPS_ROOT_PATH . 'uploads/' . $file2 ) )
 		{
 			$result = $this->classFileManagement->getFileContents( ipsRegistry::$settings['board_url'] . "/" . CP_DIRECTORY . "/" . IPS_CGI_DIRECTORY . "/cgi_getdifference.cgi" );
 			
diff --git a/upload/ips_kernel/classEmail.php b/upload/ips_kernel/classEmail.php
index db4cab83..47503abc 100644
--- a/upload/ips_kernel/classEmail.php
+++ b/upload/ips_kernel/classEmail.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Send email using php mail() or SMTP
- * Last Updated: $Date: 2010-09-09 17:45:22 -0400 (Thu, 09 Sep 2010) $
+ * Last Updated: $Date: 2011-09-05 07:36:28 -0400 (Mon, 05 Sep 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 1st March 2005 (11:52)
- * @version		$Revision: 459 $
+ * @version		$Revision: 9451 $
  *
  *
  * Example usage:
@@ -47,9 +47,8 @@ interface interfaceEmail
 	/**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	array	Initiate class parameters
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $opts=array() );
 
@@ -58,23 +57,20 @@ interface interfaceEmail
 	 *	to prevent having to close/reopen SMTP connection
 	 *	repeatedly.
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearEmail();
 	
 	/**
 	 * Clear stored errors to prepare a new email.
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearError();
 	
 	/**
 	 * Set the from email address
 	 *
-	 * @access	public
 	 * @param	string		From email address
 	 * @param	string		[Optional] From display
 	 * @return	boolean
@@ -84,16 +80,22 @@ interface interfaceEmail
 	/**
 	 * Set the 'to' email address
 	 *
-	 * @access	public
 	 * @param	string		To email address
 	 * @return	boolean
 	 */
 	public function setTo( $email );
 	
+	/**
+	 * Add cc's
+	 *
+	 * @param	string		To email address
+	 * @return	boolean
+	 */
+	public function addCC( $email );
+	
 	/**
 	 * Add bcc's
 	 *
-	 * @access	public
 	 * @param	string		To email address
 	 * @return	boolean
 	 */
@@ -102,7 +104,6 @@ interface interfaceEmail
 	/**
 	 * Set the email subject
 	 *
-	 * @access	public
 	 * @param	string		Email subject
 	 * @return	boolean
 	 */
@@ -111,7 +112,6 @@ interface interfaceEmail
 	/**
 	 * Set the email body
 	 *
-	 * @access	public
 	 * @param	string		Email body
 	 * @return	boolean
 	 */
@@ -120,7 +120,6 @@ interface interfaceEmail
 	/**
 	 * Set a header manually
 	 *
-	 * @access	public
 	 * @param	string		Header key
 	 * @param	string		Header value
 	 * @return	boolean
@@ -130,7 +129,6 @@ interface interfaceEmail
 	/**
 	 * Send the mail (All appropriate params must be set by this point)
 	 *
-	 * @access	public
 	 * @return	boolean		Mail sent successfully
 	 */
 	public function sendMail();
@@ -138,11 +136,10 @@ interface interfaceEmail
 	/**
 	 * Add an attachment to the current email
 	 *
-	 * @access	public
 	 * @param	string	File data
 	 * @param	string	File name
 	 * @param	string	File type (MIME)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addAttachment( $data="", $name="", $ctype='application/octet-stream' );
 
@@ -157,89 +154,85 @@ class classEmail implements interfaceEmail
 	/**
 	 * From email address 
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $from			= "";
+	protected $from			= "";
 	
 	/**
 	 * From email address (displayed)
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $from_display	= "";
+	protected $from_display	= "";
 	
 	/**
 	 * To email address
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $to				= "";
+	protected $to				= "";
 	
 	/**
 	 * Email subject
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $subject		= "";
+	protected $subject		= "";
 	
 	/**
 	 * Email message contents
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $message		= "";
+	protected $message		= "";
 	
 	/**
 	 * PHP mail() extra params
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $extra_opts		= '';
+	protected $extra_opts		= '';
 	
 	/**
 	 * Plain text message contents
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $pt_message		= "";
+	protected $pt_message		= "";
 	
 	/**
 	 * Attachments: Parts
 	 *
-	 * @access	private
 	 * @var 	array
 	 */
-	private $parts			= array();
+	protected $parts			= array();
+	
+	/**
+	 * CC Email addresses 
+	 *
+	 * @var 	array
+	 */
+	protected $cc			= array();
 
 	/**
 	 * BCC Email addresses 
 	 *
-	 * @access	private
 	 * @var 	array
 	 */
-	private $bcc			= array();
+	protected $bcc			= array();
 	
 	/**
 	 * Email headers
 	 *
-	 * @access	private
 	 * @var 	array
 	 */
-	private $mail_headers	= array();
+	protected $mail_headers	= array();
 	
 	/**
 	 * Header EOL
 	 *  RFC specs state \r\n
 	 *  However most servers seem to only support \n
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	const header_eol		= "\n";
@@ -247,47 +240,41 @@ class classEmail implements interfaceEmail
 	/**
 	 * Attachments: Multi-part
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $multipart		= "";
+	protected $multipart		= "";
 	
 	/**
 	 * Attachments: Boundry
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $boundry		= "----=_NextPart_000_0022_01C1BD6C.D0C0F9F0";
+	protected $boundry		= "----=_NextPart_000_0022_01C1BD6C.D0C0F9F0";
 	
 	/**
 	 * HTML email flag
 	 *
-	 * @access	private
 	 * @var 	integer
 	 */
-	private $html_email		= 0;
+	protected $html_email		= 0;
 	
 	/**
 	 * Email character set
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $char_set		= 'utf-8';
+	protected $char_set		= 'utf-8';
 	
 	/**
 	 * SMTP: Resource
 	 *
-	 * @access	private
 	 * @var 	resource
 	 */
-	private $smtp_fp		= null;
+	protected $smtp_fp		= null;
 	
 	/**
 	 * SMTP: Message
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $smtp_msg		= "";
@@ -295,39 +282,34 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Port
 	 *
-	 * @access	private
 	 * @var 	integer
 	 */
-	private $smtp_port		= 25;
+	protected $smtp_port		= 25;
 	
 	/**
 	 * SMTP: Host
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $smtp_host		= "localhost";
+	protected $smtp_host		= "localhost";
 	
 	/**
 	 * SMTP: Username 
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $smtp_user		= "";
+	protected $smtp_user		= "";
 	
 	/**
 	 * SMTP: Password
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $smtp_pass		= "";
+	protected $smtp_pass		= "";
 	
 	/**
 	 * SMTP: HELO or EHLO
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $smtp_helo		= "HELO";
@@ -335,7 +317,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Return code
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $smtp_code		= "";
@@ -343,39 +324,34 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Wrap email addresses in brackets flag
 	 *
-	 * @access	private
 	 * @var 	boolean
 	 */
-	private $wrap_brackets	= false;
+	protected $wrap_brackets	= false;
 	
 	/**
 	 * Default email method (mail or smtp)
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $mail_method	= 'mail';
+	protected $mail_method	= 'mail';
 	
 	/**
 	 * Dump email to flat file for testing
 	 *
-	 * @access	private
 	 * @var 	integer
 	 */
-	private $temp_dump		= 0;
+	protected $temp_dump		= 0;
 	
 	/**
 	 * Path for email dumps
 	 *
-	 * @access	private
 	 * @var 	string
 	 */
-	private $temp_dump_path	= '';
+	protected $temp_dump_path	= '';
 	
 	/**
 	 * Error message
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $error_msg		= '';
@@ -383,7 +359,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Error description
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $error_help		= '';
@@ -391,7 +366,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Error flag
 	 *
-	 * @access	public
 	 * @var 	boolean
 	 */
 	public $error			= false;
@@ -399,27 +373,26 @@ class classEmail implements interfaceEmail
 	/**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	array	Initiate class parameters
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $opts=array() )
 	{
 		$this->mail_method		= ( $opts['method'] AND in_array( strtolower($opts['method']), array( 'smtp', 'mail' ) ) )  ? strtolower($opts['method']) : 'mail';
-		$this->temp_dump		= ( isset($opts['debug']) AND $opts['debug'] ) ? 1 : 0;
-		$this->temp_dump_path	= ( isset($opts['debug_path']) AND $opts['debug_path'] ) ? $opts['debug_path'] : '';
-		$this->html_email		= ( isset($opts['html']) AND $opts['html'] ) ? 1 : 0;
-		$this->char_set			= ( isset($opts['charset']) AND $opts['charset'] ) ? $opts['charset'] : 'utf-8';
+		$this->temp_dump		= !empty($opts['debug']) ? 1 : 0;
+		$this->temp_dump_path	= !empty($opts['debug_path']) ? $opts['debug_path'] : '';
+		$this->html_email		= !empty($opts['html']) ? 1 : 0;
+		$this->char_set			= !empty($opts['charset']) ? $opts['charset'] : 'utf-8';
 
-		$this->smtp_host		= ( isset($opts['smtp_host']) AND $opts['smtp_host'] ) ? $opts['smtp_host'] : '';
-		$this->smtp_port		= ( isset($opts['smtp_port']) AND $opts['smtp_port'] ) ? intval($opts['smtp_port']) : 25;
-		$this->smtp_user		= ( isset($opts['smtp_user']) AND $opts['smtp_user'] ) ? $opts['smtp_user'] : '';
-		$this->smtp_pass		= ( isset($opts['smtp_pass']) AND $opts['smtp_pass'] ) ? $opts['smtp_pass'] : '';
-		$this->smtp_helo		= ( isset($opts['smtp_helo']) AND $opts['smtp_helo'] ) ? $opts['smtp_helo'] : 'HELO';
-		$this->wrap_brackets	= ( isset($opts['wrap_brackets']) AND $opts['wrap_brackets'] ) ? true : false;
-		$this->extra_opts		= ( isset($opts['extra_opts']) AND $opts['extra_opts'] ) ? $opts['extra_opts'] : '';
+		$this->smtp_host		= !empty($opts['smtp_host']) ? $opts['smtp_host'] : '';
+		$this->smtp_port		= !empty($opts['smtp_port']) ? intval($opts['smtp_port']) : 25;
+		$this->smtp_user		= !empty($opts['smtp_user']) ? $opts['smtp_user'] : '';
+		$this->smtp_pass		= !empty($opts['smtp_pass']) ? $opts['smtp_pass'] : '';
+		$this->smtp_helo		= !empty($opts['smtp_helo']) ? $opts['smtp_helo'] : 'HELO';
+		$this->wrap_brackets	= !empty($opts['wrap_brackets']) ? true : false;
+		$this->extra_opts		= !empty($opts['extra_opts']) ? $opts['extra_opts'] : '';
 		
-		if( $this->mail_method == 'smtp' )
+		if ( $this->mail_method == 'smtp' && ! $this->temp_dump )
 		{
 			$this->_smtpConnect();
 		}
@@ -428,8 +401,7 @@ class classEmail implements interfaceEmail
 	/**
 	 * Destructor
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -439,19 +411,46 @@ class classEmail implements interfaceEmail
 		}
 	}
 	
+	/**
+	 * Sets the HTML version of the email
+	 * @param string $content
+	 */
+	public function setHtmlContent( $content )
+	{
+		$this->message = $content;
+	}
+	
+	/**
+	 * Sets plain text version of the email
+	 * @param string $content
+	 */
+	public function setPlainTextContent( $content )
+	{
+		$this->pt_message = $content;
+	}
+	
+	/**
+	 * Sets whether or not this is a HTML email
+	 * @param boolean duh $boolean
+	 */
+	public function setHtmlEmail( $boolean=null )
+	{
+		$this->html_email = ( $boolean ) ? true : false;
+	}
+	
 	/**
 	 * Clear stored data to prepare a new email. Useful
 	 *	to prevent having to close/reopen SMTP connection
 	 *	repeatedly.
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearEmail()
 	{
 		$this->from			= '';
 		$this->from_display	= '';
 		$this->to			= '';
+		$this->cc			= array();
 		$this->bcc			= array();
 		$this->subject		= '';
 		$this->message		= '';
@@ -464,8 +463,7 @@ class classEmail implements interfaceEmail
 	/**
 	 * Clear stored errors to prepare a new email.
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function clearError()
 	{
@@ -477,7 +475,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Set the from email address
 	 *
-	 * @access	public
 	 * @param	string		From email address
 	 * @param	string		[Optional] From display
 	 * @return	boolean
@@ -508,7 +505,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Set a header manually
 	 *
-	 * @access	public
 	 * @param	string		Header key
 	 * @param	string		Header value
 	 * @return	boolean
@@ -523,7 +519,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Set the 'to' email address
 	 *
-	 * @access	public
 	 * @param	string		To email address
 	 * @return	boolean
 	 */
@@ -534,10 +529,22 @@ class classEmail implements interfaceEmail
 		return true;
 	}
 	
+	/**
+	 * Add cc's
+	 *
+	 * @param	string		To email address
+	 * @return	boolean
+	 */
+	public function addCC( $email )
+	{
+		$this->cc[]		= $this->_cleanEmail( $email );
+		
+		return true;
+	}
+	
 	/**
 	 * Add bcc's
 	 *
-	 * @access	public
 	 * @param	string		To email address
 	 * @return	boolean
 	 */
@@ -551,7 +558,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Set the email subject
 	 *
-	 * @access	public
 	 * @param	string		Email subject
 	 * @return	boolean
 	 */
@@ -578,7 +584,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Set the email body
 	 *
-	 * @access	public
 	 * @param	string		Email body
 	 * @return	boolean
 	 */
@@ -592,18 +597,17 @@ class classEmail implements interfaceEmail
 	/**
 	 * Clean an email address
 	 *
-	 * @access	private
 	 * @param	string		Email address
 	 * @return	string		Cleaned email address
 	 */
-	private function _cleanEmail( $email )
+	protected function _cleanEmail( $email )
 	{
 		$email		= str_replace( ' '	, '',	$email );
 		$email		= str_replace( "\t"	, '',	$email );
 		$email		= str_replace( "\r"	, '',	$email );
 		$email		= str_replace( "\n"	, '',	$email );
 		$email		= str_replace( ',,'	, ',',	$email );
-		$email		= preg_replace( "#\#\[\]'\"\(\):;/\$!ï¾£%\^&\*\{\}#" , "", $email  );
+		$email		= preg_replace( '#\#\[\]\'"\(\):;/\$!ï¾£%\^&\*\{\}#' , "", $email  );
 		
 		return $email;
 	}
@@ -611,7 +615,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * Send the mail (All appropriate params must be set by this point)
 	 *
-	 * @access	public
 	 * @return	boolean		Mail sent successfully
 	 */
 	public function sendMail()
@@ -621,7 +624,7 @@ class classEmail implements interfaceEmail
 		//-----------------------------------------
 
 		$this->_buildHeaders();
-		
+				
 		//-----------------------------------------
 		// Verify params are all set
 		//-----------------------------------------
@@ -642,8 +645,8 @@ class classEmail implements interfaceEmail
 
 			if( !is_dir( $this->temp_dump_path ) )
 			{
-				@mkdir( $this->temp_dump_path );
-				@chmod( $this->temp_dump_path, 0777 );
+				@mkdir( $this->temp_dump_path, IPS_FOLDER_PERMISSION );
+				@chmod( $this->temp_dump_path, IPS_FOLDER_PERMISSION );
 			}
 			
 			if( !is_dir( $this->temp_dump_path ) )
@@ -666,7 +669,16 @@ class classEmail implements interfaceEmail
 			
 			if( $this->mail_method != 'smtp' )
 			{
-				if ( ! @mail( $this->to, $this->subject, $this->message, $this->rfc_headers, $this->extra_opts ) )
+				/* Fifth parameter not supported in safe mode 
+			 		@link http://community.invisionpower.com/tracker/issue-30145-php-mail-and-safe-mode */
+				if( ( defined('SAFE_MODE_ON') AND SAFE_MODE_ON ) OR $this->settings['safe_mode_skins'] )
+				{
+					if ( ! @mail( $this->to, $this->subject, $this->message, $this->rfc_headers ) )
+					{
+						$this->_fatalError( "Could not send the email", "Failed at 'mail' command (SAFE MODE)" );
+					}
+				}
+				else if ( ! @mail( $this->to, $this->subject, $this->message, $this->rfc_headers, $this->extra_opts ) )
 				{
 					if ( ! @mail( $this->to, $this->subject, $this->message, $this->rfc_headers ) )
 					{
@@ -693,12 +705,11 @@ class classEmail implements interfaceEmail
 	/**
 	 * Fatal error handler
 	 *
-	 * @access	private
 	 * @param	string	Error Message
 	 * @param	string	Error Help / Description
 	 * @return	boolean
 	 */
-	private function _fatalError( $msg, $help="" )
+	protected function _fatalError( $msg, $help="" )
 	{
 		$this->error		= true;
 		$this->error_msg	= $msg;
@@ -715,10 +726,9 @@ class classEmail implements interfaceEmail
 	/**
 	 * Build the multipart headers for the email
 	 *
-	 * @access	private
 	 * @return	string			Multipart headers
 	 */
-	private function _buildMultipart() 
+	protected function _buildMultipart() 
 	{
 		$multipart	= '';
 		
@@ -733,7 +743,6 @@ class classEmail implements interfaceEmail
 	/**
 	 * ENCODE HEADERS - RFC2047
 	 *
-	 * @access	private
 	 * @param	array 			Array of headers
 	 * @return	array			Headers encoded per RFCs
 	 * @see		http://www.faqs.org/rfcs/rfc822.html
@@ -741,7 +750,7 @@ class classEmail implements interfaceEmail
 	 * @see		http://www.faqs.org/rfcs/rfc2047
 	 * @see		http://us2.php.net/manual/en/function.mail.php#27997
 	 */
-	private function _encodeHeaders( $headers = array() )
+	protected function _encodeHeaders( $headers = array() )
 	{	
 		$enc_headers = count($headers) ? $headers : $this->mail_headers;
 		
@@ -832,13 +841,12 @@ class classEmail implements interfaceEmail
 	/**
 	 * Build the email headers (MIME, Charset, From, BCC, To, Subject, etc)
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _buildHeaders()
+	protected function _buildHeaders()
 	{
 		$extra_headers		= array();
-		$extra_header_rfc	= "";
+		$extra_headers_rfc	= "";
 		
 		//-----------------------------------------
 		// HTML (hitmuhl)
@@ -847,15 +855,18 @@ class classEmail implements interfaceEmail
 		// it for non HTML browsers
 		//-----------------------------------------
 		
-		$this->pt_message = $this->message;
-		$this->pt_message = str_replace( "<br />", "\n", $this->pt_message );
-		$this->pt_message = str_replace( "<br>"  , "\n", $this->pt_message );
-		$this->pt_message = strip_tags( $this->pt_message );
+		if ( ! $this->pt_message )
+		{
+			$this->pt_message = $this->message;
+			$this->pt_message = str_replace( "<br />", "\n", $this->pt_message );
+			$this->pt_message = str_replace( "<br>"  , "\n", $this->pt_message );
+			$this->pt_message = strip_tags( $this->pt_message );
+			
+			$this->pt_message = html_entity_decode( $this->pt_message, ENT_QUOTES );
+			$this->pt_message = str_replace( '&#092;', '\\', $this->pt_message );
+			$this->pt_message = str_replace( '&#036;', '$', $this->pt_message );
+		}
 		
-		$this->pt_message = html_entity_decode( $this->pt_message, ENT_QUOTES );
-		$this->pt_message = str_replace( '&#092;', '\\', $this->pt_message );
-		$this->pt_message = str_replace( '&#036;', '$', $this->pt_message );
-
 		//-----------------------------------------
 		// Start mail headers
 		//-----------------------------------------
@@ -864,9 +875,18 @@ class classEmail implements interfaceEmail
 		$this->mail_headers['Date'] 				= date( "r" );
 		$this->mail_headers['Return-Path']			= $this->from;
 		$this->mail_headers['X-Priority']			= "3";
-		$this->mail_headers['X-MSMail-Priority']	= "Normal";
+		//$this->mail_headers['X-MSMail-Priority']	= "Normal";
 		$this->mail_headers['X-Mailer']				= "IPS PHP Mailer";
 		
+		//-----------------------------------------
+		// Message-ID
+		//-----------------------------------------
+		
+		if( $this->mail_method != 'smtp' )
+		{
+			$this->mail_headers['Message-ID']		= "<" . md5(microtime(true)) . "@" . $_SERVER['HTTP_HOST'] . ">";
+		}
+		
 		//-----------------------------------------
 		// From and to...
 		// @link	http://community.invisionpower.com/tracker/issue-22474-mail-delivery-method-character/
@@ -880,9 +900,13 @@ class classEmail implements interfaceEmail
 		{
 			$this->mail_headers['From']		= '<' . $this->from . '>';
 		}
-		
+				
 		if ( $this->mail_method != 'smtp' )
 		{
+			if( count( $this->cc ) > 0 )
+			{
+				$this->mail_headers['Cc']	= implode( "," , $this->cc );
+			}
 			if( count( $this->bcc ) > 0 )
 			{
 				$this->mail_headers['Bcc']	= implode( "," , $this->bcc );
@@ -896,6 +920,11 @@ class classEmail implements interfaceEmail
 			}
 
 			$this->mail_headers['Subject']	= $this->subject;
+			
+			if( count( $this->cc ) > 0 )
+			{
+				$this->mail_headers['Cc']	= implode( "," , $this->cc );
+			}
 		}
 
 		//-----------------------------------------
@@ -1011,10 +1040,9 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP connect
 	 *
-	 * @access	private
 	 * @return	boolean			Connection successful
 	 */
-    private function _smtpConnect()
+    protected function _smtpConnect()
 	{
 		$this->smtp_fp = @fsockopen( $this->smtp_host, intval($this->smtp_port), $errno, $errstr, 30 );
 		
@@ -1087,10 +1115,9 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP disconnect
 	 *
-	 * @access	private
 	 * @return	boolean			Disconnect successful
 	 */
-    private function _smtpDisconnect()
+    protected function _smtpDisconnect()
 	{
 		$this->_smtpSendCmd( "quit" );
 
@@ -1106,10 +1133,9 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Get next line
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _smtpGetLine()
+	protected function _smtpGetLine()
 	{
 		$this->smtp_msg = "";
 		
@@ -1127,11 +1153,10 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Send command
 	 *
-	 * @access	private
 	 * @param	string		SMTP command
 	 * @return	boolean		Command successful
 	 */
-	private function _smtpSendCmd( $cmd )
+	protected function _smtpSendCmd( $cmd )
 	{
 		$this->smtp_msg  = "";
 		$this->smtp_code = "";
@@ -1148,11 +1173,10 @@ class classEmail implements interfaceEmail
 	/**
 	 * Encode data and make it safe for SMTP transport
 	 *
-	 * @access	private
 	 * @param	string	Raw Data
 	 * @return	string	CRLF Encoded Data
 	 */
-	private function _smtpCrlfEncode( $data )
+	protected function _smtpCrlfEncode( $data )
 	{
 		$data .= "\n";
 		$data  = str_replace( "\n", "\r\n", str_replace( "\r", "", $data ) );
@@ -1164,11 +1188,10 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Error handler
 	 *
-	 * @access	private
 	 * @param	string		SMTP error
 	 * @return	boolean
 	 */
-	private function _smtpError( $err="" )
+	protected function _smtpError( $err="" )
 	{
 		//$this->smtp_msg = $err;
 		$this->_fatalError( $err );
@@ -1178,10 +1201,9 @@ class classEmail implements interfaceEmail
 	/**
 	 * SMTP: Sends the SMTP email
 	 *
-	 * @access	private
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _smtpSendMail()
+	protected function _smtpSendMail()
 	{
 		$data = $this->_smtpCrlfEncode( $this->rfc_headers . "\n\n" . $this->message );
 
@@ -1277,11 +1299,10 @@ class classEmail implements interfaceEmail
 	/**
 	 * Add an attachment to the current email
 	 *
-	 * @access	public
 	 * @param	string	File data
 	 * @param	string	File name
 	 * @param	string	File type (MIME)
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addAttachment( $data="", $name="", $ctype='application/octet-stream' )
 	{
@@ -1295,11 +1316,10 @@ class classEmail implements interfaceEmail
 	/**
 	 * Encode an attachment
 	 *
-	 * @access	private
 	 * @param	array	Raw data [ctype,encode,name,data]
 	 * @return	string	Processed data
 	 */
-	private function _encodeAttachment( $part=array() )
+	protected function _encodeAttachment( $part=array() )
 	{
 		$msg = chunk_split( base64_encode( $part['data'] ) );
 		
diff --git a/upload/ips_kernel/classFileManagement.php b/upload/ips_kernel/classFileManagement.php
index 1859bf8e..a211554c 100644
--- a/upload/ips_kernel/classFileManagement.php
+++ b/upload/ips_kernel/classFileManagement.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Wrapper for retrieving file contents.  Methods available for removing files and directories as well.
- * Last Updated: $Date: 2010-06-24 05:35:43 -0400 (Thu, 24 Jun 2010) $
+ * Last Updated: $Date: 2011-08-23 10:24:47 -0400 (Tue, 23 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: mark $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 22nd February 2005 (16:55)
- * @version		$Revision: 432 $
+ * @version		$Revision: 9404 $
  */
  
 if ( ! defined( 'IPS_CLASSES_PATH' ) )
@@ -31,23 +31,28 @@ class classFileManagement
 	/**
 	 * Use sockets flag
 	 *
-	 * @access	public
-	 * @var 		integer
+	 * @var 	integer
 	 */
-	public $use_sockets = 0;
+	public $use_sockets = 1;
 	
 	/**
 	 * Error array
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $errors	 = array();
 	
+	/**
+	 * Key prefix
+	 * Prefix to identify communication strings
+	 *
+	 * @var 		string
+	 */
+	public $key_prefix	= '';
+
 	/**
 	 * HTTP Status Code/Text
 	 *
-	 * @access	public
 	 * @var		integer		HTTP Status code
 	 */	
 	public $http_status_code	= 0;
@@ -55,7 +60,6 @@ class classFileManagement
 	/**
 	 * HTTP Status Code/Text
 	 *
-	 * @access	public
 	 * @var		string		HTTP Status text
 	 */	
 	public $http_status_text	= "";
@@ -63,7 +67,6 @@ class classFileManagement
 	/**
 	 * Raw HTTP header output
 	 * 
-	 * @access	public
 	 * @var		string		Raw HTTP header results
 	 */
 	public $raw_headers			= '';
@@ -71,18 +74,17 @@ class classFileManagement
 	/**#@+
 	 * Set Authentication
 	 *
-	 * @access	public
 	 * @var 	string
 	 */
 	public $auth_req		= 0;
 	public $auth_user;
 	public $auth_pass;
+	public $auth_raw;
 	/**#@-*/
 	
 	/**
 	 * Timeout setting
 	 *
-	 * @access	public
 	 * @var		int
 	 */
 	public $timeout			= 15;
@@ -90,7 +92,6 @@ class classFileManagement
 	/**
 	 * Get file contents (accepts URL or path)
 	 *
-	 * @access	public
 	 * @param	string		URI / File path
 	 * @param	string		HTTP User
 	 * @param	string		HTTP Pass
@@ -102,8 +103,8 @@ class classFileManagement
 		// INIT
 		//-------------------------------
 		
-		$contents	 = "";
-		$file_location = str_replace( '&amp;', '&', $file_location );
+		$contents		= "";
+		$file_location	= str_replace( '&amp;', '&', $file_location );
 		
 		//-----------------------------------------
 		// Inline user/pass?
@@ -145,7 +146,7 @@ class classFileManagement
 			// Is URL, try curl and then fall back
 			//-------------------------------
 			
-			if( ($contents = $this->_getContentsWithCurl( $file_location )) === false )
+			if( ( $contents = $this->_getContentsWithCurl( $file_location ) ) === false )
 			{
 				if ( $this->use_sockets )
 				{
@@ -161,14 +162,49 @@ class classFileManagement
 		return $contents;
 	}
 	
+	/**
+	 * Sends a POST request to specified URL
+	 *
+	 * @param	string		URI to post to
+	 * @param	array   	Arry of post fields
+	 * @param	string		HTTP User
+	 * @param	string		HTTP Pass
+	 * @return	string		File data
+	 */
+	public function postFileContents( $file_location='', $post_array=array(), $http_user='', $http_pass='' )
+	{
+		//-------------------------------
+		// INIT
+		//-------------------------------
+		
+		$contents		= "";
+		$file_location	= str_replace( '&amp;', '&', $file_location );
+
+		if ( ! is_array( $post_array ) OR ! count( $post_array ) )
+		{
+			return false;
+		}
+		
+		if ( ! $file_location )
+		{
+			return false;
+		}
+
+		if( ( $contents = $this->_getContentsWithCurl( $file_location, $post_array ) ) === false )
+		{
+			$contents = $this->_getContentsWithSocket( $file_location, $post_array );
+		}
+
+		return $contents;
+	}
+	
 	/**
 	 * Get file contents (with PHP's fopen)
 	 *
-	 * @access	private
 	 * @param	string		File location
 	 * @return	string		File data
 	 */
-	private function _getContentsWithFopen( $file_location )
+	protected function _getContentsWithFopen( $file_location )
 	{
 		//-------------------------------
 		// INIT
@@ -204,18 +240,17 @@ class classFileManagement
 	/**
 	 * Get file contents (with sockets)
 	 *
-	 * @access	private
 	 * @param	string		File location
+	 * @param	array 		Data to post (automatically converts to POST request)
 	 * @return	string		File data
 	 */
-	private function _getContentsWithSocket( $file_location )
+	protected function _getContentsWithSocket( $file_location, $post_array=array() )
 	{
 		//-------------------------------
 		// INIT
 		//-------------------------------
 		
 		$data				= null;
-		$fsocket_timeout	= $this->timeout;
 		
 		//-------------------------------
 		// Parse URL
@@ -258,7 +293,7 @@ class classFileManagement
 	 	// Open connection
 	 	//-------------------------------
 	 	
-	 	if ( ! $fp = @fsockopen( $url_parts['scheme'] == 'https' ? "ssl://" . $host : $host, $port, $errno, $errstr, $fsocket_timeout ) )
+	 	if ( ! $fp = @fsockopen( $url_parts['scheme'] == 'https' ? "ssl://" . $host : $host, $port, $errno, $errstr, $this->timeout ) )
 	 	{
 			$this->errors[] = "�е могу у�тановить �оединение � {$host}";
 			return FALSE;
@@ -266,16 +301,33 @@ class classFileManagement
 		}
 		else
 		{
-			$final_carriage = "";
+			$final_carriage	= ( $this->auth_req or $this->auth_raw ) ? "" : "\r\n";
 			
-			if ( ! $this->auth_req )
+			//-----------------------------------------
+			// Are we posting?
+			//-----------------------------------------
+			
+			if( is_array($post_array) AND count($post_array) )
 			{
-				$final_carriage = "\r\n";
+				$post_back	= array();
+				
+				foreach ( $post_array as $key => $val )
+			{
+					$post_back[] = $this->key_prefix . $key . '=' . urlencode($val);
 			}
 			
-			if ( ! fputs( $fp, "GET $path HTTP/1.0\r\nHost:$host\r\nConnection: Keep-Alive\r\n{$final_carriage}" ) )
+				$post_back_str	= implode( '&', $post_back);
+				
+				$header	= "POST {$path} HTTP/1.0\r\nHost:{$host}\r\nContent-Type: application/x-www-form-urlencoded\r\nConnection: Keep-Alive\r\nContent-Length: " . strlen($post_back_str) . "\r\n{$final_carriage}{$post_back_str}";
+			}
+			else
 			{
-				$this->errors[] = "�евозможно отправить запро� на $host!";
+				$header	= "GET {$path} HTTP/1.0\r\nHost:{$host}\r\nConnection: Keep-Alive\r\n{$final_carriage}";
+			}
+
+			if ( ! fputs( $fp, $header ) )
+			{
+				$this->errors[] = "�е удало�ь отправить запро� на {$host}!";
 				return FALSE;
 			}
 			
@@ -292,16 +344,26 @@ class classFileManagement
 					}
 				}
 			}
+			elseif ( $this->auth_raw )
+			{
+				$header = $this->auth_raw."\r\n\r\n";
+					
+				if ( ! fputs( $fp, $header ) )
+				{
+					$this->errors[] = "Authorization Failed!";
+					return FALSE;
+				}
+			}
 		}
 
-		@stream_set_timeout($fp, $fsocket_timeout);
+		@stream_set_timeout( $fp, $this->timeout );
 		
 		$status = @stream_get_meta_data($fp);
 		
 		while( ! feof($fp) && ! $status['timed_out'] )		
 		{
-		  $data .= fgets ($fp,8192);
-		  $status = stream_get_meta_data($fp);
+			$data	.= fgets( $fp, 8192 );
+			$status	= stream_get_meta_data($fp);
 		}
 		
 		fclose ($fp);
@@ -320,7 +382,7 @@ class classFileManagement
 		
 		$_chunked	= false;
 		
-		if( preg_match( "/Transfer\-Encoding:\s*chunked/i", $data ) )
+		if( preg_match( '/Transfer\-Encoding:\s*chunked/i', $data ) )
 		{
 			$_chunked	= true;
 		}
@@ -348,24 +410,27 @@ class classFileManagement
 	/**
 	 * Get file contents (with cURL)
 	 *
-	 * @access	private
 	 * @param	string		File location
+	 * @param	array 		Data to post (automatically converts to POST request)
 	 * @return	string		File data
 	 */
-	private function _getContentsWithCurl( $file_location )
+	protected function _getContentsWithCurl( $file_location, $post_array=array() )
 	{
 		if ( function_exists( 'curl_init' ) AND function_exists("curl_exec") )
 		{
+			//-----------------------------------------
+			// Are we posting?
+			//-----------------------------------------
+
 			$ch = curl_init( $file_location );
 			
-			curl_setopt( $ch, CURLOPT_HEADER		, 1);
-			curl_setopt( $ch, CURLOPT_TIMEOUT		, $this->timeout );
-			curl_setopt( $ch, CURLOPT_POST			, 0 );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 ); 
-			curl_setopt( $ch, CURLOPT_FAILONERROR	, 1 ); 
-			curl_setopt( $ch, CURLOPT_MAXREDIRS		, 10 );
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER		, false );
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST		, 1 );
+			curl_setopt( $ch, CURLOPT_HEADER			, 1 );
+			curl_setopt( $ch, CURLOPT_TIMEOUT			, $this->timeout );
+			curl_setopt( $ch, CURLOPT_RETURNTRANSFER	, 1 ); 
+			curl_setopt( $ch, CURLOPT_FAILONERROR		, 1 ); 
+			curl_setopt( $ch, CURLOPT_MAXREDIRS			, 10 );
+			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER	, false );
+			curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST	, 1 );
 			
 			/**
 			 * Cannot set this when safe_mode or open_basedir is enabled
@@ -380,23 +445,87 @@ class classFileManagement
 			{
 				curl_setopt( $ch, CURLOPT_USERPWD	, "{$this->auth_user}:{$this->auth_pass}" );
 			}
+			elseif ( $this->auth_raw )
+			{
+				curl_setopt( $ch, CURLOPT_HTTPHEADER, array( $this->auth_raw ) );
+			}
+			
+			//-----------------------------------------
+			// Are we posting?
+			//-----------------------------------------
+			
+			if( is_array($post_array) AND count($post_array) )
+			{
+				$post_back	= array();
+				
+				foreach ( $post_array as $key => $val )
+				{
+					$post_back[] = $this->key_prefix . $key . '=' . urlencode($val);
+				}
+				
+				$post_back_str	= implode( '&', $post_back);
+				
+				curl_setopt( $ch, CURLOPT_POST			, true );
+				curl_setopt( $ch, CURLOPT_POSTFIELDS	, $post_back_str );
+			}
+			else
+			{
+				curl_setopt( $ch, CURLOPT_POST			, false );
+			}
 			
 			$data = curl_exec($ch);
+			
+			//-----------------------------------------
+			// Handle some errors we can handle
+			//-----------------------------------------
+			
+			if ( curl_errno($ch) == 60 ||  curl_errno($ch) == 77 )
+			{
+				// CURL_SSL_CACERT
+				if ( defined('CA_BUNDLE_PATH') )
+				{
+					curl_setopt( $ch, CURLOPT_CAINFO, CA_BUNDLE_PATH );
+				}
+				else
+				{
+					curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+				}
+				
+				$data = curl_exec($ch);
+			}
+			else if ( curl_errno($ch) == 6 )
+			{
+				// Name lookup failed / DNS issues
+				$url_parts	= @parse_url( $file_location );
+				$ip			= @gethostbyname( $url_parts['host'] );
+			
+				if ( $ip and preg_match( '#^\d{1,3}\.#', $ip ) )
+				{
+					// Turn of verify SSL as the IP will not match domain of cert
+					curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+					curl_setopt( $ch, CURLOPT_URL, $url_parts['scheme'] . '://' . $ip . '/' . $url_parts['path'] );
+					$data = curl_exec($ch);
+				}
+			}
+		
 			curl_close($ch);
 
 			if( $data )
 			{
-				$tmp	= preg_split("/\r\n\r\n/", $data, 2);
-				$data	= trim($tmp[1]);
-				
+				$tmp  = preg_split("/\r\n\r\n/", $data, 2);
+				$data = trim($tmp[1]);
+
 				$this->raw_headers	= trim($tmp[0]);
 			}
-		
-			if ( $data )
+			
+			$this->http_status_code = substr( $this->raw_headers, 9, 3 );
+			$this->http_status_text = substr( $this->raw_headers, 13, ( strpos( $this->raw_headers, "\r\n" ) - 13 ) );
+
+			if ( $data AND !$this->http_status_code )
 			{
 				$this->http_status_code = 200;
 			}
-		
+			
 			return $data;
 		}
 		else
@@ -408,7 +537,6 @@ class classFileManagement
 	/**
 	 * Tail a file
 	 *
-	 * @access	public
 	 * @param	string		Full path to file
 	 * @param	int			No. lines to tail
 	 */
@@ -418,7 +546,7 @@ class classFileManagement
 		$content	= '';
 		$t			= array();
 		
-		if ( file_exists( $file ) )
+		if ( is_file( $file ) )
 		{
 			$handle = @fopen( $file, 'r' );
 			
@@ -471,22 +599,22 @@ class classFileManagement
 	/**
 	 * Copies contents of one directory to another, creating if necessary
 	 *
-	 * @access	public
 	 * @param	string		File location [from]
 	 * @param	string		File location [destination]
 	 * @param	string		[Optional] CHMOD mode to set
 	 * @return	boolean		Copy successful
 	 */
-	public function copyDirectory($from_path, $to_path, $mode = 0777)
+	public function copyDirectory($from_path, $to_path, $mode = 0 )
 	{
-		$this->errors = array();
+		$this->errors	= array();
+		$mode			= $mode ? $mode : IPS_FOLDER_PERMISSION;
 		
 		//-----------------------------------------
 		// Strip off trailing slashes...
 		//-----------------------------------------
 		
-		$from_path = rtrim( $from_path, '/' );
-		$to_path   = rtrim( $to_path, '/' );
+		$from_path	= rtrim( $from_path, '/' );
+		$to_path	= rtrim( $to_path, '/' );
 	
 		if ( ! is_dir( $from_path ) )
 		{
@@ -523,7 +651,7 @@ class classFileManagement
 					if ( is_file( $from_path."/".$file ) )
 					{
 						copy( $from_path."/".$file, $to_path."/".$file );
-						@chmod( $to_path."/".$file, 0777 );
+						@chmod( $to_path."/".$file, IPS_FILE_PERMISSION );
 					} 
 				}
 			}
@@ -540,7 +668,6 @@ class classFileManagement
 	/**
 	 * Removes a directory
 	 *
-	 * @access	public
 	 * @param	string		File location [from]
 	 * @return	boolean		Removal successful
 	 */
@@ -560,7 +687,7 @@ class classFileManagement
 			// Attempt CHMOD
 			//-----------------------------------------
 			
-			@chmod( $file, 0777 );
+			@chmod( $file, IPS_FOLDER_PERMISSION );
 			
 			if ( is_dir( $file ) )
 			{
@@ -570,7 +697,7 @@ class classFileManagement
 				{
 					if ( ($filename != ".") && ($filename != "..") )
 					{
-						$this->removeDirectory( $file."/".$filename );
+						$this->removeDirectory( $file . "/" . $filename );
 					}
 				}
 				
@@ -603,7 +730,6 @@ class classFileManagement
 	/**
 	 * Empties a directory
 	 *
-	 * @access	public
 	 * @param	string		File location [from]
 	 * @param	int			In a loop (not root folder)
 	 * @return	boolean		Empty successful
@@ -624,7 +750,7 @@ class classFileManagement
 			// Attempt CHMOD
 			//-----------------------------------------
 			
-			@chmod( $file, 0777 );
+			@chmod( $file, IPS_FOLDER_PERMISSION );
 			
 			if ( is_dir( $file ) )
 			{
@@ -667,5 +793,92 @@ class classFileManagement
 		}
 	}
 
-	
+	/**
+	 * Receive data from the "send" function
+	 *
+	 * @param	array	Array of fields to return
+	 * @return	array	Array of fields
+	 */
+	public function communicationReceiveData( $return_fields=array() )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$return_array = array();
+		
+		//-----------------------------------------
+		// Get data...
+		//-----------------------------------------
+		
+		foreach( $_REQUEST as $k => $v )
+		{
+			if ( strstr( $k, $this->key_prefix ) )
+			{
+				$k = str_replace( $this->key_prefix, '', $k );
+				
+				$return_array[ $k ] = $v;
+			}
+		}
+		
+		return $this->_filterFields( $return_array );
+	}
+
+	/**
+	 * Filter out fields (optional)
+	 *
+	 * @param	array	Array of fields to return
+	 * @return	array	Array of fields
+	 */
+	protected function _filterFields( $in_fields=array(), $out_fields=array() )
+	{
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$return_array = array();
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+		
+		if ( ! is_array( $in_fields ) or ! count( $in_fields ) )
+		{
+			return false;
+		}
+		
+		if ( ! is_array( $out_fields ) or ! count( $out_fields ) )
+		{
+			return $in_fields;
+		}
+		
+		//-----------------------------------------
+		// Get data...
+		//-----------------------------------------
+		
+		foreach( $out_fields as $k => $type )
+		{
+			if ( $in_fields[ $k ] )
+			{
+				switch ( $type )
+				{
+					default:
+					case 'string':
+					case 'text':
+						$return_array[ $k ] = trim( $in_fields[ $k ] );
+						break;
+					case 'int':
+					case 'integar':
+						$return_array[ $k ] = intval( $in_fields[ $k ] );
+						break;
+					case 'float':
+					case 'floatval':
+						$return_array[ $k ] = floatval( $in_fields[ $k ] );
+						break;
+				}
+			}
+		}
+		
+		return $return_array;
+	}
 }
\ No newline at end of file
diff --git a/upload/ips_kernel/classFtp.php b/upload/ips_kernel/classFtp.php
new file mode 100644
index 00000000..9f1e1c7d
--- /dev/null
+++ b/upload/ips_kernel/classFtp.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.2.3
+ * FTP Class
+ * Last Updated: $Date: 2011-05-25 10:30:28 -0400 (Wed, 25 May 2011) $ BY $Author: ips_terabyte $
+ * </pre>
+ *
+ * @author 		Mark Wade
+ * @copyright	(c) 2011 Invision Power Services, Inc.
+ * @license		This is NULLED!
+ * @package		IP.Board
+ * @link		http://hatynka.in
+ * @version		$Rev: 8887 $
+ *
+ */
+
+class classFtp
+{
+	/**
+	 * Stream
+	 *
+	 * @param	resource
+	 */
+	private $stream;
+	
+	/**
+	 * Directory
+	 *
+	 * @param	string
+	 */
+	private $directory;
+	
+	/**
+	 * Transfer Mode
+	 *
+	 * @param	int
+	 */
+	public static $transferMode = FTP_ASCII;
+
+	/** 
+	 * Constructor
+	 *
+	 * @param	string		$host		Host name
+	 * @param	string		$user		Username
+	 * @param	string		$pass		Password
+	 * @param	int			$port		Port
+	 * @param	string		$dir		Itnitial directory
+	 * @param	bool|null 	$passive	Passive mode, or NULL to use default
+	 * @param	int			$timeout	Timeout
+	 *
+	 * @return	@e void
+	 *
+	 * @throws	Exception
+	 *  @li CONNECT_FAIL (could not connect)
+	 *  @li	LOGIN_FAIL (could not login)
+	 *  @li	CHDIR_FAILED (could not set directory)
+	 *  @li	PASV_FAIL (could not set passive mode)
+	 */
+	public function __construct( $host, $user, $pass, $port=21, $dir='/', $passive=NULL, $timeout=90 )
+	{
+		/* Connect */
+		if ( !( $this->stream = ftp_connect( $host, $port, $timeout ) ) )
+		{
+			throw new Exception( 'CONNECT_FAIL' );
+		}
+		
+		/* Login */
+		if ( !@ftp_login( $this->stream, $user, $pass ) )
+		{
+			throw new Exception( 'LOGIN_FAIL' );
+		}
+		
+		/* Set passive mode */
+		if ( $passive !== NULL )
+		{
+			if( !@ftp_pasv( $this->stream, $passive ) )
+			{
+				throw new Exception( 'PASV_FAIL' );
+			}
+		}
+		
+		/* Change Directory */
+		$this->chdir( $dir );
+	}
+	
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		@ftp_close( $this->stream );
+	}
+	
+	/**
+	 * List directory contents
+	 *
+	 * @return	array		List of filenames
+	 */
+	public function ls()
+	{
+		return @ftp_nlist( $this->stream, $this->directory );
+	}
+	
+	/**
+	 * Change Directory
+	 *
+	 * @param	string		$dir		New directory
+	 * @return	@e void
+	 * @throws	Exception	CHDIR_FAILED
+	 */
+	public function chdir( $dir )
+	{
+		if ( $dir == '..' )
+		{
+			$chdir = @ftp_cdup( $this->stream );
+		}
+		elseif ( substr( $dir, 0, 1 ) !== '/' )
+		{
+			$dir = $this->directory . '/' . $dir;
+			$chdir = @ftp_chdir( $this->stream, $dir );
+		}
+		else
+		{
+			$chdir = @ftp_chdir( $this->stream, $dir );
+		}
+		
+		if( !$chdir )
+		{
+			throw new Exception( 'CHDIR_FAILED' );
+		}
+		$this->directory = $dir;
+	}
+	
+	/**
+	 * Get File
+	 *
+	 * @param	string	$filename	Filename
+	 * @return	classFtpFile
+	 * @throws	Exception	NO_FILE
+	 */
+	public function file( $filename )
+	{
+		if( !( $size = @ftp_size( $this->stream, $filename ) ) )
+		{
+			throw new Exception( 'NO_FILE' );
+		}
+		$classFtpFile = new classFtpFile( $this->stream, $this->directory . '/' . $filename );
+		$classFtpFile->size = $size;
+		return $classFtpFile;
+	}
+	
+	/**
+	 * Upload
+	 *
+	 * @param	string	$filename	File to upload
+	 * @throws	Exception	UPLOAD_ERROR
+	 */
+	public function upload( $filename, $uploadName=NULL )
+	{
+		if ( !$uploadName )
+		{
+			$exploded = explode( '/', $filename );
+			$uploadName = array_pop( $exploded );
+		}
+		
+		if( !@ftp_put( $this->stream, $uploadName, $filename, self::$transferMode ) )
+		{
+			throw new Exception( 'UPLOAD_ERROR' );
+		}
+		
+		return $this->file( $uploadName );
+	}
+	
+	/**
+	 * Create Directory
+	 *
+	 * @param	string	$name		Directory Name
+	 * @throws	Exception	DIR_CREATE_ERROR
+	 */
+	public function mkdir( $name )
+	{
+		if( !@ftp_mkdir( $this->stream, $name ) )
+		{
+			throw new Exception( 'DIR_CREATE_ERROR' );
+		}
+	}
+	
+	/**
+	 * Delete Directory
+	 *
+	 * @param	string	$name		Directory Name
+	 * @throws	Exception	DIR_REMOVE_ERROR
+	 */
+	public function rmdir( $name )
+	{
+		if( !@ftp_rmdir( $this->stream, $name ) )
+		{
+			throw new Exception( 'DIR_REMOVE_ERROR' );
+		}
+	}
+}
+
+class classFtpFile
+{
+	/**
+	 * Stream
+	 *
+	 * @param	resource
+	 */
+	private $stream;
+	
+	/**
+	 * Filename
+	 *
+	 * @param	string
+	 */
+	private $filename;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param	resource	$stream		FTP Stream
+	 * @param	string		$filename	Filename
+	 */
+	public function __construct( $stream, $filename )
+	{
+		$this->stream	= $stream;
+		$this->filename	= $filename;
+	}
+	
+	/**
+	 * Download
+	 *
+	 * @param	string|null	$target		Local path to store file or NULL to use remote filename
+	 * @throws	Exception	DOWNLOAD_ERROR
+	 */
+	public function download( $target=NULL )
+	{
+		if ( $target === NULL )
+		{
+			$exploded = explode( '/', $this->filename );
+			$target = array_pop( $exploded );
+		}
+	
+		if( !@ftp_get( $this->stream, $target, $this->filename, classFtp::$transferMode ) )
+		{
+			throw new Exception( 'DOWNLOAD_ERROR' );
+		}
+	}
+	
+	/**
+	 * CHMOD
+	 * 
+	 * @param	int		$mode	Mode
+	 * @throws	Exception	CHMOD_ERROR
+	 */
+	public function chmod( $mode )
+	{
+		if( !@ftp_chmod( $this->stream, $mode, $this->filename ) )
+		{
+			throw new Exception( 'CHMOD_ERROR' );
+		}
+	}
+	
+	/**
+	 * Rename
+	 *
+	 * @param	string	$name	New filename
+	 * @throws	Exception	RENAME_ERROR
+	 */
+	public function rename( $name )
+	{
+		if( !@ftp_rename( $this->stream, $this->filename, $name ) )
+		{
+			throw new Exception( 'RENAME_ERROR' );
+		}
+	}
+	
+	/**
+	 * Delete
+	 * 
+	 * @throws	Exception	DELETE_ERROR
+	 */
+	public function delete()
+	{
+		if( !@ftp_delete( $this->stream, $this->filename ) )
+		{
+			throw new Exception( 'DELETE_ERROR' );
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/classGraph.php b/upload/ips_kernel/classGraph.php
index 40d5ceb7..69a39ee3 100644
--- a/upload/ips_kernel/classGraph.php
+++ b/upload/ips_kernel/classGraph.php
@@ -3,14 +3,14 @@
 /**
  * Graph class.
  * This code was written by Remco Wilting (Wizzy) and used with permission in IP.Board.
- * Last Updated   : $Date: 2010-10-06 15:59:29 -0400 (Wed, 06 Oct 2010) $
+ * Last Updated   : $Date: 2011-09-15 17:04:35 -0400 (Thu, 15 Sep 2011) $
  * Last Updated by: $Author: bfarber $
  *
  * @author 		Remco Wilting
  * @copyright	(c) 2008 Remco Wilting
  * @package		IP.Board
  * @since		Sunday 6th July 2008 16:35
- * @version		$Revision: 474 $
+ * @version		$Revision: 9495 $
  */
 
 //+---------------------------------------------------------------------------
@@ -51,9 +51,11 @@ class classGraph
 									 'yaxistitle'		=> '',					// Title for the y-axis (no title if empty)
 									 'showdatalabels'	=> 1,					// Display the datalabels (yes/no)
 									 'showlegend'		=> 1,					// Display the legend (yes/no)
+									 'maxlegendwidth'	=> 20,					// Percentage indicating the maximum width for the legend
 									 'showgridlinesx'	=> 1,					// Show gridlines for the x-axis (yes/no)
 									 'showgridlinesy'	=> 1,					// Show gridlines for the y-axis (yes/no)
-									 'numticks'			=> 5					// Number of ticks used for numeric axes
+									 'numticks'			=> 5,					// Number of ticks used for numeric axes,
+									 'xaxisskip'		=> 0,					// Number of x-axis bars to skip before drawing next one (only implemented for line graphs so far)
 								   );
 
 	/**
@@ -200,7 +202,7 @@ class classGraph
 	*
 	* @access	public
 	* @param	boolean		[Optional] Enable Debug Mode
-	* @return	void
+	* @return	@e void
 	*/
 	public function __construct( $debug = 0 )
 	{
@@ -223,7 +225,7 @@ class classGraph
 	*
 	* @access	public
 	* @param	array		Array of data labels
-	* @return	void
+	* @return	@e void
 	*/
 	public function addLabels( $data = array() )
 	{
@@ -236,7 +238,7 @@ class classGraph
 				define( 'IPS_DOC_CHAR_SET', '' );
 			}
 
-			$_cleanData[ $k ]	= html_entity_decode( $v, ENT_QUOTES, IPS_DOC_CHAR_SET );
+			$_cleanData[ $k ]	= @html_entity_decode( $v, ENT_QUOTES, IPS_DOC_CHAR_SET );
 		}
 		
 		$this->data['xaxis'] = $_cleanData;
@@ -249,7 +251,7 @@ class classGraph
 	* @access	public
 	* @param	string		Name of the data series
 	* @param	array		Array of data values
-	* @return	void
+	* @return	@e void
 	*/
 	public function addSeries( $name = '', $data = array(), $color = '' )
 	{
@@ -271,7 +273,7 @@ class classGraph
         //-----------------------------------------
         // Check font
         //-----------------------------------------
-        if ( $this->options['font'] and is_readable( $this->options['font'] ) )
+        if ( $this->options['font'] and is_readable( $this->options['font'] ) and function_exists('imagettfbbox') )
         {
             $this->use_ttf = 1;
         }
@@ -417,7 +419,7 @@ class classGraph
 	* Draw the graph title
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
 	protected function _drawTitle()
 	{
@@ -462,7 +464,7 @@ class classGraph
 	* Draw the legend
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
 	protected function _drawLegend()
 	{
@@ -475,25 +477,42 @@ class classGraph
 	        $legendx = 0;
 	        $legendy = 0;
 	        $maxtxty = 10;
+	        
+	        $maxlegendwidth = ( $this->grapharea['x1'] / 100 ) * $this->options['maxlegendwidth'];
+	        	        
+	        $lines = array();
 
-	        foreach ( $this->legend as $name )
+	        foreach ( $this->legend as $k => $name )
 	        {
 	            if ( $this->use_ttf )
 	            {
-	                $txtsize = imagettfbbox('10', 0, $this->options['font'], $name );
-	                $legendx = ($txtsize[2]-$txtsize[0]) > $legendx ?  $txtsize[2]-$txtsize[0]  : $legendx;
+	            	$txtsize = array();
+	                $lines[ $k ] = explode( "\n", wordwrap( $name, ceil( ( $maxlegendwidth - 10 ) / imagefontwidth($this->fontsize) ) ) );
+	                foreach ( $lines[ $k ] as $line )
+	                {
+	                	$_txtsize = imagettfbbox('10', 0, $this->options['font'], $line );
+	                	if ( $_txtsize[2]-$_txtsize[0] > $txtsize[2]-$txtsize[0] )
+	                	{
+	                		$txtsize = $_txtsize;
+	                	}
+	                }
+	                
+	                $legendx = ($txtsize[2]-$txtsize[0]) > $legendx ?  $txtsize[2]-$txtsize[0]  : $legendx;	                
 	                $maxtxty = ($txtsize[1]-$txtsize[7]) > $maxtxty ? ($txtsize[1]-$txtsize[7]) : $maxtxty;
 	            }
 	            else
 	            {
 	                $txtsize = strlen( $name ) * imagefontwidth($this->fontsize);
+	                $txtsize = ( $txtsize > $maxlegendwidth ) ? $maxlegendwidth : $txtsize;
 	                $legendx = ($txtsize > $legendx) ?  $txtsize : $legendx;
 	                $maxtxty = imagefontheight($this->fontsize);
+	                $lines[ $k ] = explode( "\n", wordwrap( $name, ceil( ( $maxlegendwidth - 10 ) / imagefontwidth($this->fontsize) ) ) );
 	            }
 
 	            $ci ++;
 
 	        }
+	        	        	        
 	        $legendx = $this->grapharea['x1'] - ($legendx + 25);
 	        $legendy = round( ($this->options['height'] / 2) - ((($maxtxty+5) * $ci) / 2) );
 
@@ -511,7 +530,7 @@ class classGraph
 	        // Draw legends
 	        //-----------------------------------------
 
-	        foreach ( $this->legend as $name )
+	        foreach ( $this->legend as $k => $name )
 	        {
 	            //-----------------------------------------
 	            // Get Pie slice colors
@@ -529,22 +548,25 @@ class classGraph
 
 	            $color = imagecolorallocate( $this->image, $this->color[$ci][0], $this->color[$ci][1], $this->color[$ci][2] );
 	            imagefilledrectangle( $this->image, $legendx+5, $ypos+7  , $legendx+15 , $ypos+17, $color );
-
-	            if ( $this->use_ttf )
-	            {
-	                $txty = $ypos + 5 + $maxtxty/2;
-	                imagettftext($this->image, "10", 0, $legendx+20+1, $txty+5+1, $shadowcolor, $this->options['font'], $name );
-	                imagettftext($this->image, "10", 0, $legendx+20  , $txty+5  , $textcolor  , $this->options['font'], $name );
-	            }
-	            else
-	            {
-	                ImageString( $this->image, $this->fontsize, $legendx+20 , $ypos+7, $name, $this->black);
-	            }
-
-	            $ypos = $ypos + $maxtxty + 5;
-
-	            imagecolordeallocate( $this->image, $color );
-	            $ci ++;
+				
+				foreach ( $lines[ $k ] as $line )
+				{
+		            if ( $this->use_ttf )
+		            {
+		                $txty = $ypos + 5 + $maxtxty/2;
+		                imagettftext($this->image, "10", 0, $legendx+20+1, $txty+5+1, $shadowcolor, $this->options['font'], $line );
+		                imagettftext($this->image, "10", 0, $legendx+20  , $txty+5  , $textcolor  , $this->options['font'], $line );
+		            }
+		            else
+		            {
+		                ImageString( $this->image, $this->fontsize, $legendx+20 , $ypos+7, $line, $this->black);
+		            }
+		            
+		            $ypos = $ypos + $maxtxty + 5;
+	
+		            imagecolordeallocate( $this->image, $color );
+		       	}
+		       	$ci ++;
 	        }
 
 	        imagerectangle( $this->image, $legendx, $legendy, $this->grapharea['x1']-1, $ypos + 5, $textcolor );
@@ -560,7 +582,7 @@ class classGraph
 	* Draw X and Y axes
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
 	protected function _drawAxes()
 	{
@@ -857,6 +879,7 @@ class classGraph
 				$stepwidth = floor( ( ( $this->grapharea['x1'] - $this->grapharea['x0'] ) / $numlabels ) );
 				$this->grapharea['x1'] = $this->grapharea['x0'] + $numlabels * $stepwidth;
 
+
 				for ( $i = 0; $i < $numlabels; $i++ )
 				{
 					$label = $this->x_axis['labels'][$i];
@@ -872,6 +895,14 @@ class classGraph
 					{
 						imageline( $this->image, $x+$depth, $this->grapharea['y1']-$depth, $x+$depth, $this->grapharea['y0']-$depth, $this->black );
 					}
+		
+	                if( $this->options['xaxisskip'] )
+	                {
+	                	if( $i % $this->options['xaxisskip'] != 1 )
+	                	{
+	                		continue;
+	                	}
+                	}
 
 					// Labels
 		            if ( $this->use_ttf )
@@ -919,8 +950,11 @@ class classGraph
 		        }
 
 				$numticks = $this->options['numticks'] > $this->y_axis['max'] ? floor($this->y_axis['max']) : $this->options['numticks'];
+				$numticks = $numticks ? $numticks : 1;
 				$step = floor( $this->y_axis['max'] / $numticks );
+				$step = $step ? $step : 1;
 				$steps = ceil( $this->y_axis['max'] / $step );
+				$steps = $steps ? $steps : 1;
 				$stepheight = ( $this->grapharea['y1'] - $this->grapharea['y0'] ) / $steps;
 				for ( $i = 1; $i <= $steps; $i++ )
 				{
@@ -1024,7 +1058,7 @@ class classGraph
 	* Generate Pie Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawPie()
     {
@@ -1176,7 +1210,7 @@ class classGraph
 	* Generate Doughnut Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawDoughnut()
     {
@@ -1457,7 +1491,7 @@ class classGraph
 	* Generate Bar Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawBars()
     {
@@ -1599,7 +1633,7 @@ class classGraph
 	* Generate Horizontal Bar Charts
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawHorizontalBars()
     {
@@ -1743,7 +1777,7 @@ class classGraph
 	* Generate Line Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawLines()
     {
@@ -1779,8 +1813,11 @@ class classGraph
 		$stepwidth = floor( ( ( $this->grapharea['x1'] - $this->grapharea['x0'] ) / $numbars ) );
 
 		$numticks = $this->options['numticks'] > $maxvalue ? floor($maxvalue) : $this->options['numticks'];
+		$numticks = $numticks ? $numticks : 1;
 		$step = floor( $maxvalue / $numticks );
+		$step = $step ? $step : 1;
 		$steps = ceil( $maxvalue / $step );
+		$steps = $steps ? $steps : 1;
 		$stepheight = ( $this->grapharea['y1'] - $this->grapharea['y0'] ) / $steps;
 
 		$effect3DSize = 20;
@@ -1875,17 +1912,18 @@ class classGraph
 						}
 					}
 
-		            $valuecolor  = ImageColorAllocate($this->image, hexdec(substr($this->options['textcolor'],1,2)), hexdec(substr($this->options['textcolor'],3,2)), hexdec(substr($this->options['textcolor'],5,2)));
+		            $valuecolor  = imagecolorallocate($this->image, hexdec(substr($this->options['textcolor'],1,2)), hexdec(substr($this->options['textcolor'],3,2)), hexdec(substr($this->options['textcolor'],5,2)));
 	                $valshadecolor = imagecolorallocate( $this->image, ($this->color[$ci][0]-50)<0?0:$this->color[$ci][0]-50, ($this->color[$ci][1]-50)<0?0:$this->color[$ci][1]-50, ($this->color[$ci][2]-50)<0?0:$this->color[$ci][2]-50 );
+
 		            if ( $this->use_ttf )
 		            {
 		                $txtsize     = imagettfbbox('10', 0, $this->options['font'], $value2 );
-		                $textx       = $x2 - round(($txtsize[2]-$txtsize[0])/2,0);
+		                $textx       = $x2 - ( round(($txtsize[2]-$txtsize[0])/2,0) * ( strlen($value2)/1.2 ) );
 		                $texty       = $y2 - 3;
 
 		                imagettftext($this->image, "10", 0, $textx-1, $texty-1, $valshadecolor, $this->options['font'], $value2);
-		                imagettftext($this->image, "10", 0, $textx+1, $texty+1, $valshadecolor, $this->options['font'], $value2);
-		                imagettftext($this->image, "10", 0, $textx+2, $texty+2, $valshadecolor, $this->options['font'], $value2);
+		                //imagettftext($this->image, "10", 0, $textx+1, $texty+1, $valshadecolor, $this->options['font'], $value2);
+		                //imagettftext($this->image, "10", 0, $textx+2, $texty+2, $valshadecolor, $this->options['font'], $value2);
 		                imagettftext($this->image, "10", 0, $textx, $texty, $valuecolor, $this->options['font'], $value2);
 		            }
 		            else
@@ -1912,7 +1950,7 @@ class classGraph
 	* Generate Area Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawArea()
     {
@@ -2123,7 +2161,7 @@ class classGraph
 	* Generate Scatter Plot (XY Chart)
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawXY()
     {
@@ -2238,7 +2276,7 @@ class classGraph
 	* Generate Bubble Plot
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawBubble()
     {
@@ -2358,7 +2396,7 @@ class classGraph
 	* Generate Funnel Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawFunnel()
     {
@@ -2519,7 +2557,7 @@ class classGraph
 	* Generate Radar Chart
 	*
 	* @access	protected
-	* @return	void
+	* @return	@e void
 	*/
     protected function _drawRadar()
     {
@@ -2872,7 +2910,7 @@ class classGraph
 	*
 	* @access	protected
 	* @param	int			Minimum number of series
-	* @param	boolean		Require labels
+	* @param	boolean		Check labels exist
 	* @return	boolean		True if all checks pass; false otherwise
 	*/
 	protected function _checkSeries( $minseries=0, $labelsRequired=0 )
@@ -2923,8 +2961,7 @@ class classGraph
 	* Check if a color string is valid
 	*
 	* @access	protected
-	* @param	int			Minimum number of series
-	* @param	boolean		Require labels
+	* @param	string		Color HEX
 	* @return	boolean		True if all checks pass; false otherwise
 	*/
 	protected function _checkColor( $color='' )
@@ -2949,7 +2986,7 @@ class classGraph
 	*
 	* @access	protected
 	* @param	string		Error message
-	* @return	void
+	* @return	@e void
 	*/
 	protected function _error( $msg='' )
 	{
diff --git a/upload/ips_kernel/classImage.php b/upload/ips_kernel/classImage.php
index ef0ce540..4a3c7b2c 100644
--- a/upload/ips_kernel/classImage.php
+++ b/upload/ips_kernel/classImage.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Image Handler: create thumbnails, apply watermarks and copyright tests, save or display final image
- * Last Updated: $Date: 2010-11-10 11:27:28 -0500 (Wed, 10 Nov 2010) $
+ * Last Updated: $Date: 2011-09-08 11:58:29 -0400 (Thu, 08 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 5th May 2008 14:00
- * @version		$Revision: 485 $
+ * @version		$Revision: 9467 $
  *
  * GD Example
  * <code>
@@ -54,12 +54,12 @@ class ips_kernel_image
 	{
 		if ( $load == 'im' )
 		{
-			require_once( IPS_KERNEL_PATH . 'classImageImagemagick.php' );
+			require_once( IPS_KERNEL_PATH . 'classImageImagemagick.php' );/*noLibHook*/
 			$img = new classImageImagemagick();
 		}
 		else
 		{
-			require_once( IPS_KERNEL_PATH . 'classImageGd.php' );
+			require_once( IPS_KERNEL_PATH . 'classImageGd.php' );/*noLibHook*/
 			$img = new classImageGd();
 		}
 		
@@ -109,7 +109,7 @@ interface interfaceImage
     /**
 	 * Print image to screen
 	 *
-	 * @return	void		Image printed and script exits
+	 * @return	@e void		Image printed and script exits
 	 */
 	public function displayImage();
 	
@@ -226,7 +226,7 @@ abstract class classImage
 	 * Image handler desctructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -270,6 +270,77 @@ abstract class classImage
 		return true;
 	}
 	
+	/**
+	 * Checks to see if an uploaded image truly is an image
+	 * @param string $imagePath
+	 * @return mixed (false, is not image, array with data)
+	 */
+	public function extractImageData( $imagePath )
+	{
+		$fileExt = IPSText::getFileExtension( $imagePath );
+		
+		$img_attributes = @getimagesize( $imagePath );
+				
+		if ( ! is_array( $img_attributes ) or ! count( $img_attributes ) )
+		{
+			return false;
+		}
+		else if ( ! $img_attributes[2] )
+		{
+			return false;
+		}
+		else if ( $img_attributes[2] == 1 AND ( $fileExt == 'jpg' OR $fileExt == 'jpeg' ) )
+		{
+			return false;
+		}
+		
+		$return = array( 'width'    => $img_attributes[0],
+						 'height'   => $img_attributes[1],
+						 'fileType' => '' );
+		
+		switch( $img_attributes[2] )
+		{
+			case 1:
+				$return['fileType'] = 'gif';
+			break;
+			case 2:
+				$return['fileType'] = 'jpg';
+			break;
+			case 3:
+				$return['fileType'] = 'png';
+			break;
+		}
+		
+		return $return;
+	}
+	
+	/**
+	* Checks for XSS inside file.  If found, deletes file, sets error_no to 5 and returns
+	*
+	* @return	@e void
+	*/
+	public function hasXssInfile( $fileName )
+	{
+		// HTML added inside an inline file is not good in IE...
+		$fh = fopen( $fileName, 'rb' );
+		
+		$file_check = fread( $fh, 512 );
+		
+		fclose( $fh );
+		
+		if ( ! $file_check )
+		{
+			return true;
+		}
+		# Thanks to Nicolas Grekas from comments at www.splitbrain.org for helping to identify all vulnerable HTML tags
+		else if ( preg_match( '#<script|<html|<head|<title|<body|<pre|<table|<a\s+href|<img|<plaintext|<cross\-domain\-policy#si', $file_check ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
     /**
 	 * Get new dimensions for resizing
 	 *
diff --git a/upload/ips_kernel/classImageGd.php b/upload/ips_kernel/classImageGd.php
index ac253912..259586e4 100644
--- a/upload/ips_kernel/classImageGd.php
+++ b/upload/ips_kernel/classImageGd.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Image Handler: GD2 Library
- * Last Updated: $Date: 2010-10-25 11:38:36 -0400 (Mon, 25 Oct 2010) $
+ * Last Updated: $Date: 2011-08-12 05:44:20 -0400 (Fri, 12 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: mmecham $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 5th May 2008 14:00
- * @version		$Revision: 480 $
+ * @version		$Revision: 9388 $
  *
  * GD Example
  * <code>
@@ -44,10 +44,10 @@ class classImageGd extends classImage implements interfaceImage
 	/**
 	 * Image resource
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		resource	Image resource
 	 */
-	private $image			= null;
+	protected $image			= null;
 	
 	/**
 	 * Image quality settings
@@ -57,7 +57,7 @@ class classImageGd extends classImage implements interfaceImage
 	 */
 	public $quality			= array( 'png' => 8, 'jpg' => 75 );
 	
-    /**
+	/**
 	 * Initiate image handler, perform any necessary setup
 	 *
 	 * @access	public
@@ -70,17 +70,17 @@ class classImageGd extends classImage implements interfaceImage
 	 	// Verify input
 	 	//---------------------------------------------------------
 	 	
-		if( !isset($opts['image_path']) OR !$opts['image_path'] )
+		if( empty($opts['image_path']) )
 		{
 			$this->error		= 'no_image_path';
 			return false;
 		}
 		
-		if( !isset($opts['image_file']) OR !$opts['image_file'] )
+		if( empty($opts['image_file']) )
 		{
 			$this->error		= 'no_image_file';
 			return false;
-		}
+		}	
 		
 	 	//---------------------------------------------------------
 	 	// Store paths
@@ -110,12 +110,12 @@ class classImageGd extends classImage implements interfaceImage
 		// Quality values
 		//---------------------------------------------------------
 		
-		if( isset($opts['jpg_quality']) AND $opts['jpg_quality'] )
+		if( !empty($opts['jpg_quality']) )
 		{
 			$this->quality['jpg']	= $opts['jpg_quality'];
 		}
 		
-		if( isset($opts['png_quality']) AND $opts['png_quality'] )
+		if( !empty($opts['png_quality']) )
 		{
 			$this->quality['png']	= $opts['png_quality'];
 		}
@@ -147,8 +147,12 @@ class classImageGd extends classImage implements interfaceImage
 			
 			case 'png':
 				$this->image = @imagecreatefrompng( $this->image_full );
-				imagealphablending( $this->image, TRUE );
-				imagesavealpha( $this->image, TRUE );
+				
+				if( $this->image )
+				{
+					@imagealphablending( $this->image, TRUE );
+					@imagesavealpha( $this->image, TRUE );
+				}
 			break;
 		}
 		
@@ -184,7 +188,14 @@ class classImageGd extends classImage implements interfaceImage
 	 */
 	public function croppedResize( $width, $height )
 	{
-	 	$ratioOrig = $this->orig_dimensions['width'] / $this->orig_dimensions['height'];
+		/* Changes here made to prevent "division by 0" errors when getimagesize() failed */
+	 	$ratioOrig = $this->orig_dimensions['width'] / ( $this->orig_dimensions['height'] ? $this->orig_dimensions['height'] : 1 );
+	 	
+	 	/* This breaks square thumbs - always adds black bars */
+	 	if( $ratioOrig < 1 )
+	 	{
+	 		//$ratioOrig	= 1;
+	 	}
   
 	    if ( $width / $height > $ratioOrig ) 
 	    {
@@ -212,6 +223,27 @@ class classImageGd extends classImage implements interfaceImage
 		return $this->resizeImage( $width, $height, true );
 	}
 	
+	/**
+	 * Crops an image
+	 *
+	 * @access	public
+	 * @param	int			Crop from X
+	 * @param	int			Crop from Y
+	 * @param	int			Width
+	 * @param	int			Height
+	 *
+	 */
+	public function crop( $x1, $y1, $width, $height )
+	{  		
+        $this->_cropX = $x1;
+        $this->_cropY = $y1;
+       
+        $this->cur_dimensions['width']  = $width;
+ 	    $this->cur_dimensions['height'] = $height;
+
+		return $this->resizeImage( $width, $height, true );
+	}
+	
     /**
 	 * Resize image proportionately
 	 *
@@ -219,9 +251,10 @@ class classImageGd extends classImage implements interfaceImage
 	 * @param	integer 	Maximum width
 	 * @param	integer 	Maximum height
 	 * @param	boolean		Second pass of image for crop
+	 * @param	boolean		Instead of resizing image to same size, return false if the image doesn't need to be resized
 	 * @return	array		Dimensons of the original image and the resized dimensions
 	 */
-	public function resizeImage( $width, $height, $secondPass=false )
+	public function resizeImage( $width, $height, $secondPass=false, $returnIfUnnecessary=false )
 	{
 	 	//---------------------------------------------------------
 	 	// Get proportionate dimensions and store
@@ -244,7 +277,8 @@ class classImageGd extends classImage implements interfaceImage
 				return array( 'originalWidth'  => $this->orig_dimensions['width'],
 					 		  'originalHeight' => $this->orig_dimensions['height'],
 					 		  'newWidth'       => $this->orig_dimensions['width'],
-					 		  'newHeight'      => $this->orig_dimensions['height'] );
+					 		  'newHeight'      => $this->orig_dimensions['height'],
+							  'noResize'	   => true );
 			}
 			else
 			{
@@ -398,15 +432,15 @@ class classImageGd extends classImage implements interfaceImage
 	 * @param	string 		File location (including file name)
 	 * @return	boolean		File write successful
 	 */
-	public function writeImage( $path )
+	public function writeImage( $imagePath )
 	{
 	 	//---------------------------------------------------------
 	 	// Remove image if it exists
 	 	//---------------------------------------------------------
 	 	
-		if( file_exists( $path ) )
+		if( is_file( $imagePath ) )
 		{
-			@unlink( $path );
+			@unlink( $imagePath );
 		}
 	
 	 	//---------------------------------------------------------
@@ -416,23 +450,23 @@ class classImageGd extends classImage implements interfaceImage
 		switch( $this->image_extension )
 		{
 			case 'gif':
-				@imagegif( $this->image, $path );
+				@imagegif( $this->image, $imagePath );
 			break;
 			
 			case 'jpeg':
 			case 'jpg':
 			case 'jpe':
-				@imagejpeg( $this->image, $path, $this->quality['jpg'] );
+				@imagejpeg( $this->image, $imagePath, $this->quality['jpg'] );
 			break;
 			
 			case 'png':
-				@imagepng( $this->image, $path, $this->quality['png'] );
+				@imagepng( $this->image, $imagePath, $this->quality['png'] );
 			break;
 		}
 		
-		if( !file_exists( $path ) )
+		if ( ! is_file( $imagePath ) )
 		{
-	 		$this->error		= 'unable_to_write_image';
+	 		$this->error = 'unable_to_write_image';
 		 	return false;
 	 	}
 		
@@ -440,7 +474,7 @@ class classImageGd extends classImage implements interfaceImage
 	 	// Chmod 777
 	 	//---------------------------------------------------------
 	 	
-	 	@chmod( $path, 0777 );
+	 	@chmod( $imagePath, IPS_FILE_PERMISSION );
 	 	
 	 	//---------------------------------------------------------
 	 	// Destroy image resource
@@ -455,7 +489,7 @@ class classImageGd extends classImage implements interfaceImage
 	 * Print image to screen
 	 *
 	 * @access	public
-	 * @return	void		Image printed and script exits
+	 * @return	@e void		Image printed and script exits
 	 */
 	public function displayImage()
 	{
diff --git a/upload/ips_kernel/classImageImagemagick.php b/upload/ips_kernel/classImageImagemagick.php
index 1bdb8c8a..b3c66192 100644
--- a/upload/ips_kernel/classImageImagemagick.php
+++ b/upload/ips_kernel/classImageImagemagick.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Image Handler: ImageMagick Library
- * Last Updated: $Date: 2010-03-02 16:04:56 -0500 (Tue, 02 Mar 2010) $
+ * Last Updated: $Date: 2011-08-01 17:58:16 -0400 (Mon, 01 Aug 2011) $
  * </pre>
  *
- * @author 		$Author: josh $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 5th May 2008 14:00
- * @version		$Revision: 380 $
+ * @version		$Revision: 9346 $
  *
  * ImageMagick Example
  * <code>
@@ -46,26 +46,26 @@ class classImageImagemagick extends classImage implements interfaceImage
 	/**
 	 * ImageMagick Path
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string		Path to imagemagick binary (folder, no trailing slash)
 	 */
-	private $im_path		= null;
+	protected $im_path		= null;
 	
 	/**
 	 * Temp directory (must be writable)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string		Path to a temp directory
 	 */
-	private $temp_path		= '';
+	protected $temp_path		= '';
 	
 	/**
 	 * Temp file (directory, name, .temp)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string		Full path to the temp file
 	 */
-	private $temp_file		= '';
+	protected $temp_file		= '';
 	
 	/**
 	 * Image quality settings
@@ -88,19 +88,19 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Verify params
 	 	//---------------------------------------------------------
 	 	
-		if( !isset($opts['image_path']) OR !$opts['image_path'] )
+		if( empty($opts['image_path']) )
 		{
 			$this->error		= 'no_image_path';
 			return false;
 		}
 		
-		if( !isset($opts['image_file']) OR !$opts['image_file'] )
+		if( empty($opts['image_file']) )
 		{
 			$this->error		= 'no_image_file';
 			return false;
 		}
 		
-		if( !isset($opts['im_path']) OR !$opts['im_path'] )
+		if( empty($opts['im_path']) )
 		{
 			$this->error		= 'no_imagemagick_path';
 			return false;
@@ -139,7 +139,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 			return false;
 		}
 		
-		if( file_exists( $this->temp_file ) )
+		if( is_file( $this->temp_file ) )
 		{
 			@unlink( $this->temp_file );
 		}
@@ -164,12 +164,12 @@ class classImageImagemagick extends classImage implements interfaceImage
 		// Quality values
 		//---------------------------------------------------------
 		
-		if( isset($opts['jpg_quality']) AND $opts['jpg_quality'] )
+		if( !empty($opts['jpg_quality']) )
 		{
 			$this->quality['jpg']	= $opts['jpg_quality'];
 		}
 		
-		if( isset($opts['png_quality']) AND $opts['png_quality'] )
+		if( !empty($opts['png_quality']) )
 		{
 			$this->quality['png']	= $opts['png_quality'];
 		}
@@ -186,6 +186,71 @@ class classImageImagemagick extends classImage implements interfaceImage
 		return true;
 	}
 	
+	/**
+	 * Resizes and image, then crops an image to a fixed ratio
+	 *
+	 * @access	public
+	 * @param	int		Width of final cropped image
+	 * @param	int		Height of final cropped image
+	 *
+	 */
+	public function croppedResize( $width, $height )
+	{
+		/* Changes here made to prevent "division by 0" errors when getimagesize() failed */
+	 	$ratioOrig = $this->orig_dimensions['width'] / ( $this->orig_dimensions['height'] ? $this->orig_dimensions['height'] : 1 );
+	 	
+	 	if( $ratioOrig < 1 )
+	 	{
+	 		$ratioOrig	= 1;
+	 	}
+  
+	    if ( $width / $height > $ratioOrig ) 
+	    {
+	       $nheight = $width / $ratioOrig;
+	       $nwidth  = $width;
+	    }
+	    else
+	    {
+	       $nwidth  = $height * $ratioOrig;
+	       $nheight = $height;
+	    }
+	
+        $vals = $this->resizeImage( $nwidth, $nheight );
+       
+   		/* Crop from center */
+   		$_x = $vals['newWidth'] / 2;
+   		$_y = $vals['newHeight'] / 2;
+   		
+        $this->_cropX = ( $_x - ( $width / 2 ) );
+        $this->_cropY = ( $_y - ( $height / 2 ) );
+       
+        $this->cur_dimensions['width']  = $width;
+ 	    $this->cur_dimensions['height'] = $height;
+
+		return $this->resizeImage( $width, $height, true );
+	}
+	
+	/**
+	 * Crops an image
+	 *
+	 * @access	public
+	 * @param	int			Crop from X
+	 * @param	int			Crop from Y
+	 * @param	int			Width
+	 * @param	int			Height
+	 *
+	 */
+	public function crop( $x1, $y1, $width, $height )
+	{  		
+        $this->_cropX = $x1;
+        $this->_cropY = $y1;
+       
+        $this->cur_dimensions['width']  = $width;
+ 	    $this->cur_dimensions['height'] = $height;
+
+		return $this->resizeImage( $width, $height, true );
+	}
+	
     /**
 	 * Resize image proportionately
 	 *
@@ -243,7 +308,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Successful?
 	 	//---------------------------------------------------------
 	 	
-	 	if( file_exists( $this->temp_file ) )
+	 	if( is_file( $this->temp_file ) )
 	 	{
 		 	return array( 'originalWidth'  => $this->orig_dimensions['width'],
 						  'originalHeight' => $this->orig_dimensions['height'],
@@ -252,7 +317,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	}
 	 	else
 	 	{
-		 	return array();			
+		 	return array();
 	 	}
 	}
 	
@@ -263,24 +328,24 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 * @param	string 		File location (including file name)
 	 * @return	boolean		File write successful
 	 */
-	public function writeImage( $path )
+	public function writeImage( $imagePath )
 	{
 	 	//---------------------------------------------------------
 	 	// Remove image if it exists
 	 	//---------------------------------------------------------
 	 	
-		if( file_exists( $path ) )
+		if( is_file( $imagePath ) )
 		{
-			@unlink( $path );
+			@unlink( $imagePath );
 		}
 	
 	 	//---------------------------------------------------------
 	 	// Temp file doesn't exist
 	 	//---------------------------------------------------------
 	 	
-		if( !file_exists( $this->temp_file ) )
+		if( !is_file( $this->temp_file ) )
 		{
-	 		$this->error		= 'temp_image_not_exists';
+	 		$this->error = 'temp_image_not_exists';
 		 	return false;
 		}
 		
@@ -288,11 +353,11 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Rename temp file to final destination
 	 	//---------------------------------------------------------
 	 	
-		rename( $this->temp_file, $path );
+		rename( $this->temp_file, $imagePath );
 		
-		if( !file_exists( $path ) )
+		if( !is_file( $imagePath ) )
 		{
-	 		$this->error		= 'unable_to_write_image';
+	 		$this->error = 'unable_to_write_image';
 		 	return false;
 	 	}
 		
@@ -300,7 +365,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Chmod 777 and return
 	 	//---------------------------------------------------------
 	 		 	
-	 	@chmod( $path, 0777 );
+	 	@chmod( $imagePath, IPS_FILE_PERMISSION );
 	 	
 	 	return true;
 	}
@@ -309,7 +374,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 * Print image to screen
 	 *
 	 * @access	public
-	 * @return	void		Image printed and script exits
+	 * @return	@e void		Image printed and script exits
 	 */
 	public function displayImage()
 	{
@@ -385,7 +450,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Working with original file or temp file?
 	 	//---------------------------------------------------------
 	 	
-		$file 		= file_exists( $this->temp_file ) ? $this->temp_file : $this->image_full;
+		$file 		= is_file( $this->temp_file ) ? $this->temp_file : $this->image_full;
 		
 	 	//---------------------------------------------------------
 	 	// Apply watermark and verify
@@ -393,7 +458,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	
 		system("{$this->im_path}/composite -geometry +{$locate_x}+{$locate_y} {$path} {$file} {$this->temp_file}" );
 
-	 	if( file_exists( $this->temp_file ) )
+	 	if( is_file( $this->temp_file ) )
 	 	{
 	 		$this->force_resize	= true;
 	 		
@@ -446,7 +511,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Working with orig file or temp file?
 	 	//---------------------------------------------------------
 	 	
-		$file 		= file_exists( $this->temp_file ) ? $this->temp_file : $this->image_full;
+		$file 		= is_file( $this->temp_file ) ? $this->temp_file : $this->image_full;
 		
 	 	//---------------------------------------------------------
 	 	// Set gravity (location of text)
@@ -487,7 +552,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 			
 		system("{$this->im_path}/composite {$file} -fill {$color} -undercolor #000000 -gravity {$gravity} -annotate +0+5 '{$text}' {$this->temp_file}" );
 
-	 	if( file_exists( $this->temp_file ) )
+	 	if( is_file( $this->temp_file ) )
 	 	{
 	 		$this->force_resize	= true;
 	 		
@@ -503,7 +568,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 * Image handler desctructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -511,7 +576,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	// Remove temp file if it hasn't been saved
 	 	//---------------------------------------------------------
 	 	
-		if( file_exists( $this->temp_file ) )
+		if( is_file( $this->temp_file ) )
 		{
 			@unlink( $this->temp_file );
 		}
@@ -519,4 +584,4 @@ class classImageImagemagick extends classImage implements interfaceImage
 		parent::__destruct();
 	}
 
-}
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/classIncomingEmail.php b/upload/ips_kernel/classIncomingEmail.php
index ff32c3d2..52d71b07 100644
--- a/upload/ips_kernel/classIncomingEmail.php
+++ b/upload/ips_kernel/classIncomingEmail.php
@@ -1,25 +1,26 @@
 <?php
-
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Parse Incoming Emails
- * Last Updated: $Date: 2010-11-15 10:45:42 -0500 (Mon, 15 Nov 2010) $
+ * Last Updated: $Date: 2011-10-03 11:31:57 -0400 (Mon, 03 Oct 2011) $
  * </pre>
  *
  * @author 		$Author: mark $
  * @copyright	(c) 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		25th June 2010
- * @version		$Revision: 486 $
+ * @version		$Revision: 9573 $
  */
  
 class classIncomingEmail
 {
+	public $ignore = FALSE;
+
 	/**
 	 * Recipient Address
 	 *
@@ -69,8 +70,10 @@ class classIncomingEmail
 	 *
 	 * @param	string	Raw message with headers
 	 */
-	public function __construct( $email )
+	public function __construct( $email, $override=array() )
 	{
+		$this->raw = $email;
+		
 		//--------------------------------------
 		// Get some stuff
 		//--------------------------------------
@@ -121,58 +124,128 @@ class classIncomingEmail
 		@error_reporting( E_NONE );
  		@ini_set( 'display_errors', 'off' );
  		
-		require_once ( IPS_KERNEL_PATH . 'PEAR/Mail/mimeDecode.php' );
+		require_once ( IPS_KERNEL_PATH . 'PEAR/Mail/mimeDecode.php' );/*noLibHook*/
 		$decoder = new Mail_mimeDecode( $email );
 		$mail = $decoder->decode( array(
 			'include_bodies'	=> TRUE,
 			'decode_bodies'		=> TRUE,
 			'decode_headers'	=> TRUE,
 			) );
-				
+													
 		//--------------------------------------
 		// Parse Headers
 		//--------------------------------------
-			
+		
 		/* To */
-		if ( $mail->headers['delivered-to'] )
+		if ( isset( $override['to'] ) )
 		{
-			$mail->headers['to'] = $mail->headers['delivered-to'];
-		}
-		$to = array();
-		if ( strpos( $mail->headers['to'], ',' ) === FALSE )
-		{
-			$mail->headers['to'] = array( $mail->headers['to'] );
+			$this->to = $override['to'];
 		}
 		else
 		{
-			$mail->headers['to'] = explode( ',', $mail->headers['to'] );
-		}
-		foreach ( $mail->headers['to'] as $_to )
-		{
-			if ( preg_match( "/.+? <(.+?)>/", $_to, $matches ) )
+			if ( $mail->headers['delivered-to'] )
 			{
-				$to[] = $matches[1];
+				$mail->headers['to'] = $mail->headers['delivered-to'];
+			}
+			$to = array();
+			if ( strpos( $mail->headers['to'], ',' ) === FALSE )
+			{
+				$mail->headers['to'] = array( $mail->headers['to'] );
 			}
 			else
 			{
-				$to[] = trim( $_to, '<>' );
+				$mail->headers['to'] = explode( ',', $mail->headers['to'] );
 			}
+			foreach ( $mail->headers['to'] as $_to )
+			{
+				if ( preg_match( "/.+? <(.+?)>/", $_to, $matches ) )
+				{
+					$to[] = htmlentities( $matches[1] );
+				}
+				else
+				{
+					$to[] = htmlentities( trim( $_to, '<>' ) );
+				}
+			}
+			$this->to = implode( ',', $to );
 		}
-		$this->to = implode( ',', $to );
 				
 		/* From */
-		if ( preg_match( "/.+? <(.+?)>/", $mail->headers['from'], $matches ) )
+		if ( isset( $override['from'] ) )
 		{
-			$this->from = $matches[1];
+			$this->from = $override['from'];
 		}
 		else
 		{
-			$this->from = trim( $mail->headers['from'], '<>' );
+			if ( preg_match( "/.+? <(.+?)>/", $mail->headers['from'], $matches ) )
+			{
+				$this->from = htmlentities( $matches[1] );
+			}
+			else
+			{
+				$this->from = htmlentities( trim( $mail->headers['from'], '<>' ) );
+			}
 		}
 		
 		/* Subject */
-		$this->subject = $mail->headers['subject'] ? $mail->headers['subject'] : '(No Subject)';
+		if ( isset( $override['subject'] ) )
+		{
+			$this->subject = $override['subject'];
+		}
+		else
+		{
+			$this->subject = ( (bool) trim( $mail->headers['subject'] ) ) ? $mail->headers['subject'] : '(No Subject)';
+			$this->subject = htmlentities( $this->subject );
+		}
 		
+		/* CC */
+		if ( strpos( $mail->headers['cc'], ',' ) === FALSE )
+		{
+			$mail->headers['cc'] = array( $mail->headers['cc'] );
+		}
+		else
+		{
+			$mail->headers['cc'] = explode( ',', $mail->headers['cc'] );
+		}
+		foreach ( $mail->headers['cc'] as $_cc )
+		{
+			if ( preg_match( "/.+? <(.+?)>/", $_cc, $matches ) )
+			{
+				$cc[] = htmlentities( $matches[1] );
+			}
+			else
+			{
+				$cc[] = htmlentities( trim( $_cc, '<>' ) );
+			}
+		}		
+		$this->cc = str_replace( array( '&gt;', '&lt;' ), '', implode( ',', $cc ) );
+		
+		//-----------------------------------------
+		// Ignore?
+		//-----------------------------------------
+		
+		$escapedFrom = $this->DB->addSlashes( $this->from );
+		$log = $this->DB->buildAndFetch( array( 'select' => '*', 'from' => 'core_incoming_email_log', 'where' => "log_email='{$escapedFrom}'" ) );
+		if ( $log['log_id'] )
+		{
+			$oneMinuteAgo = time() - 60;
+			if ( $log['log_time'] > $oneMinuteAgo )
+			{
+				$this->ignore = TRUE;
+			}
+			
+			$this->DB->update( 'core_incoming_email_log', array( 'log_time' => time() ), "log_id={$log['log_id']}" );
+			
+			if ( $this->ignore )
+			{
+				return;
+			}
+		}
+		else
+		{
+			$this->DB->insert( 'core_incoming_email_log', array( 'log_email' => $this->from, 'log_time' => time() ) );
+		}
+
 		//--------------------------------------
 		// Parse Body
 		//--------------------------------------
@@ -180,33 +253,23 @@ class classIncomingEmail
 		$this->message = '';
 		$this->attachments = array();
 		$akey = 0;
-			
+									
 		/* Normal message */
 		if ( $mail->ctype_primary == 'text' )
 		{
-			if ( $mail->ctype_secondary == 'html' )
-			{
-				$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( strip_tags( $mail->body ) ) );
-			}
-			else
-			{
-				$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( $mail->body ) );;
-			}
+			$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', $this->cleanMessage( $mail->body ) );
 		}	
 		/* Normal message, sent in both HTML and normal */
-		elseif ( $mail->ctype_primary == 'multipart' AND $mail->ctype_secondary == 'alternative' )
+		elseif ( strtolower( $mail->ctype_primary ) == 'multipart' AND strtolower( $mail->ctype_secondary ) == 'alternative' )
 		{
-			$this->message = '';
+			$this->message = '';			
 			foreach ( $mail->parts as $part )
 			{
-				if ( $part->ctype_secondary == 'html' )
+				if ( in_array( $part->ctype_secondary, array( 'plain', 'html' ) ) )
 				{
-					$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( strip_tags( $part->body ) ) );;
-				}
-				else
-				{
-					$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( $part->body ) );;
-					if ( $part->ctype_secondary == 'plain' )
+					$this->message = str_replace( array( "\n", "\r", "\r\n" ), '<br />', $this->cleanMessage( $part->body ) );
+					
+					if ( strtolower( $part->ctype_secondary ) == 'plain' ) // We prefer plain text
 					{
 						break;
 					}
@@ -218,13 +281,13 @@ class classIncomingEmail
 		{
 			foreach ( $mail->parts as $part )
 			{
-				if ( $part->ctype_primary == 'multipart' AND $part->ctype_secondary == 'alternative' )
+				if ( strtolower( $part->ctype_primary ) == 'multipart' AND strtolower( $part->ctype_secondary ) == 'alternative' )
 				{
 					$add = '';
 					foreach ( $part->parts as $subpart )
 					{
 						$add = str_replace( array( "\n", "\r", "\r\n" ), '<br />', $subpart->body );
-						if ( $subpart->ctype_secondary == 'plain' )
+						if ( strtolower( $subpart->ctype_secondary ) == 'plain' )
 						{
 							break;
 						}
@@ -233,49 +296,45 @@ class classIncomingEmail
 				}
 				elseif ( $part->ctype_primary == 'text' )
 				{
-					if ( $part->ctype_secondary == 'html' )
-					{
-						$this->message .= str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( strip_tags( $part->body ) ) );;
-					}
-					else
-					{
-						$this->message .= str_replace( array( "\n", "\r", "\r\n" ), '<br />', htmlentities( $part->body ) );;
-					}
+					$this->message .= str_replace( array( "\n", "\r", "\r\n" ), '<br />', $this->cleanMessage( $part->body ) );
 				}
 				else
 				{
 					$mime = "{$part->ctype_primary}/{$part->ctype_secondary}";
-					foreach ( $this->types[ $mime ] as $data )
+					if ( isset( $this->types[ $mime ] ) )
 					{
-						$name_parts = explode( '.', $part->ctype_parameters['name'] );
-						$ext = array_pop( $name_parts );
-						if ( $data['atype_extension'] == $ext and $data['atype_post'] )
+						foreach ( $this->types[ $mime ] as $data )
 						{
-							/* Create the file */
-							$masked_name = md5( uniqid( 'email' ) ) . "-{$part->ctype_parameters['name']}";
-							while ( file_exists( $this->upload_dir . "/{$masked_name}" ) )
+							$name_parts = explode( '.', $part->ctype_parameters['name'] );
+							$ext = array_pop( $name_parts );
+							if ( $data['atype_extension'] == $ext and $data['atype_post'] )
 							{
-								$masked_name = md5( uniqid( 'email' ) . microtime() ) . "-{$part->ctype_parameters['name']}";
+								/* Create the file */
+								$masked_name = md5( uniqid( 'email' ) ) . "-{$part->ctype_parameters['name']}";
+								while ( is_file( $this->upload_dir . "/{$masked_name}" ) )
+								{
+									$masked_name = md5( uniqid( 'email' ) . microtime() ) . "-{$part->ctype_parameters['name']}";
+								}
+								file_put_contents( $this->upload_dir . "/{$masked_name}", $part->body );
+								
+								/* Store attachment data */
+								$akey++;
+								$this->attachments[ $akey ] = array(
+									'attach_ext'		=> $ext,
+									'attach_file'		=> $part->ctype_parameters['name'],
+									'attach_location'	=> $masked_name,
+									'attach_is_image'	=> ( $part->ctype_primary == 'image' ) ? 1 : 0,
+									'attach_date'		=> time(),
+									'attach_filesize'	=> $part->d_parameters['size'],
+									);
+								$this->message .= "<!--ATTACHMENT:{$akey}-->";
+								break;
 							}
-							file_put_contents( $this->upload_dir . "/{$masked_name}", $part->body );
-							
-							/* Store attachment data */
-							$akey++;
-							$this->attachments[ $akey ] = array(
-								'attach_ext'		=> $ext,
-								'attach_file'		=> $part->ctype_parameters['name'],
-								'attach_location'	=> $masked_name,
-								'attach_is_image'	=> ( $part->ctype_primary == 'image' ) ? 1 : 0,
-								'attach_date'		=> time(),
-								'attach_filesize'	=> $part->d_parameters['size'],
-								);
-							$this->message .= "<!--ATTACHMENT:{$akey}-->";
-							break;
 						}
 					}
 				}
 			}
-		}		
+		}
 	}
 	
 	/**
@@ -307,7 +366,7 @@ class classIncomingEmail
 					$analyse = $this->message;
 					break;
 			}
-			
+									
 			$match = false;
 			switch ( $row['rule_criteria_type'] )
 			{
@@ -330,7 +389,7 @@ class classIncomingEmail
 					$match = (bool) ( preg_match( "/{$row['rule_criteria_value']}/", $analyse ) == 1 );
 					break;
 			}
-			
+									
 			if ( $match )
 			{
 				$unrouted = FALSE;
@@ -346,24 +405,24 @@ class classIncomingEmail
 						$appdir = IPS_ROOT_PATH . 'applications/' . $row['rule_app'];
 					}
 					
-					if ( file_exists( $appdir . '/extensions/incomingEmails.php' ) )
+					if ( is_file( $appdir . '/extensions/incomingEmails.php' ) )
 					{
 						$class = 'incomingEmails_' . $row['rule_app'];
-						require_once $appdir . '/extensions/incomingEmails.php';
+						require_once( $appdir . '/extensions/incomingEmails.php' );/*noLibHook*/
 						$class = new $class;
-						$class->process( $this->DB, $this->to, $this->from, $this->subject, $this->message, $this->attachments );
+						$class->process( $this->DB, $this->to, $this->from, $this->subject, $this->message, $this->attachments, $this->raw, $this->cc );
 					}
 				}
 				break;
 			}
 		}
-		
+				
 		if ( $unrouted )
 		{
 			$apps = array();
 			foreach ( glob( IPS_ROOT_PATH . 'applications/*' ) as $f )
 			{
-				if ( file_exists( $f . '/extensions/incomingEmails.php' ) )
+				if ( is_file( $f . '/extensions/incomingEmails.php' ) )
 				{
 					$bits = explode( '/', $f );
 					$_appdir = array_pop( $bits );
@@ -372,7 +431,7 @@ class classIncomingEmail
 			}
 			foreach ( glob( IPS_ROOT_PATH . 'applications_addon/ips/*' ) as $f )
 			{
-				if ( file_exists( $f . '/extensions/incomingEmails.php' ) )
+				if ( is_file( $f . '/extensions/incomingEmails.php' ) )
 				{
 					$bits = explode( '/', $f );
 					$_appdir = array_pop( $bits );
@@ -381,24 +440,47 @@ class classIncomingEmail
 			}
 			foreach ( glob( IPS_ROOT_PATH . 'applications_addon/other/*' ) as $f )
 			{
-				if ( file_exists( $f . '/extensions/incomingEmails.php' ) )
+				if ( is_file( $f . '/extensions/incomingEmails.php' ) )
 				{
 					$bits = explode( '/', $f );
 					$_appdir = array_pop( $bits );
 					$apps[ $_appdir ] = $f;
 				}
 			}
-					
+			
+			$routed = FALSE;
 			foreach ( $apps as $_appdir => $appdir )
 			{
-				require_once $appdir . '/extensions/incomingEmails.php';
+				require_once( $appdir . '/extensions/incomingEmails.php' );/*noLibHook*/
 				$class = 'incomingEmails_' . $_appdir;
 				$i = new $class;
-				if ( $i->handleUnrouted( $this->DB, $this->to, $this->from, $this->subject, $this->message, $this->attachments ) )
+				if ( $routed = $i->handleUnrouted( $this->DB, $this->to, $this->from, $this->subject, $this->message, $this->attachments, $this->raw, $this->cc ) )
 				{
 					break;
 				}
 			}
+			
+			if ( !$routed )
+			{
+				$unroutedMessage = @file_get_contents( DOC_IPS_ROOT_PATH . 'interface/email/unrouted.txt' );
+				if ( $unroutedMessage )
+				{
+					$unroutedMessage = nl2br( $unroutedMessage ) . '<br /><br />';
+					foreach ( explode( "<br />", $this->message ) as $line )
+					{
+						$unroutedMessage .= "> {$line}<br />";
+					}
+				
+					$this->DB->insert( 'mail_queue', array(
+						'mail_date'		=> time(),
+						'mail_to'		=> $this->from,
+						'mail_from'		=> $this->to,
+						'mail_subject'	=> "Re: {$this->subject}",
+						'mail_content'	=> $unroutedMessage,
+						'mail_html_on'	=> TRUE
+						) );
+				}
+			}
 		}
 	}
 	
@@ -409,14 +491,14 @@ class classIncomingEmail
 	 * 
 	 * @see route()
 	 */
-	private function initDB()
+	protected function initDB()
 	{
 		/* Init */
 		$INFO = array();
-		@require( DOC_IPS_ROOT_PATH . 'conf_global.php' );
+		@require( DOC_IPS_ROOT_PATH . 'conf_global.php' );/*noLibHook*/
 		
 		$this->DB_driver        = strtolower( $INFO['sql_driver'] );
-		require_once ( IPS_KERNEL_PATH . 'classDb' . ucwords( $this->DB_driver ) . ".php" );
+		require_once( IPS_KERNEL_PATH . 'classDb' . ucwords( $this->DB_driver ) . '.php' );/*noLibHook*/
 		$classname = "db_driver_" . $this->DB_driver;
 			
 		$this->DB = new $classname;
@@ -429,5 +511,65 @@ class classIncomingEmail
 		
 		$this->DB->connect();
 	}
+	
+	/**
+	 * Clean message
+	 * Parses message and removes any nasty stuff
+	 *
+	 * @param	string		Message
+	 * @param	string		Cleaned Message
+	 */
+	protected function cleanMessage( $txt )
+	{		
+		//-----------------------------------------
+		// First try gracfully removing stuff
+		//-----------------------------------------
+		
+		$txt = preg_replace( "/<html(.*)>/U", '', $txt );
+		$txt = preg_replace( "/<head(.+?)>(.+?)<\/head>/ms", '', $txt );
+		$txt = preg_replace( "/<body(.+?)>/", '', $txt );
+		$txt = str_replace( array( '</html>', '</body>' ), '', $txt );
+		
+		$txt = preg_replace( "/<script(.+?)>(.+?)<\/script>/i", '', $txt );
+		$txt = preg_replace( "/style=['\"](.+?)['\"]/i", '', $txt );
+		$txt = str_replace( "<!--", '', $txt );
+		
+				
+		//-----------------------------------------
+		// If anything nasty is still there, strip it out
+		//-----------------------------------------
+		
+		$txt = preg_replace( '#<(\s+?)?s(\s+?)?c(\s+?)?r(\s+?)?i(\s+?)?p(\s+?)?t#is'        , "&lt;script" , $txt );
+		$txt = preg_replace( '#<(\s+?)?/(\s+?)?s(\s+?)?c(\s+?)?r(\s+?)?i(\s+?)?p(\s+?)?t#is', "&lt;/script", $txt );
+		
+		$txt = preg_replace( "/(j)avascript/i" , "\\1&#097;v&#097;script", $txt );
+		$txt = preg_replace( '/(e)((\/\*.*?\*\/)*)x((\/\*.*?\*\/)*)p((\/\*.*?\*\/)*)r((\/\*.*?\*\/)*)e((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)s((\/\*.*?\*\/)*)i((\/\*.*?\*\/)*)o((\/\*.*?\*\/)*)n/is' , "\\1xp<b></b>ressi&#111;n"     , $txt );
+		$txt = preg_replace( '/(e)((\\\|&#092;)*)x((\\\|&#092;)*)p((\\\|&#092;)*)r((\\\|&#092;)*)e((\\\|&#092;)*)s((\\\|&#092;)*)s((\\\|&#092;)*)i((\\\|&#092;)*)o((\\\|&#092;)*)n/is' 	  , "\\1xp<b></b>ressi&#111;n"     	  , $txt );
+		$txt = preg_replace( '/m((\\\|&#092;)*)o((\\\|&#092;)*)z((\\\|&#092;)*)\-((\\\|&#092;)*)b((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)d((\\\|&#092;)*)i((\\\|&#092;)*)n((\\\|&#092;)*)g/is' 	  , "moz-<b></b>b&#105;nding"     	  , $txt );
+		$txt = str_ireplace( "about:"     , "&#097;bout:"         , $txt );
+		$txt = str_ireplace( "document." , "&#100;ocument."      , $txt );
+		$txt = str_ireplace( "window."   , "wind&#111;w."      , $txt );
+		
+		$event_handlers	= array( 'mouseover', 'mouseout', 'mouseup', 'mousemove', 'mousedown', 'mouseenter', 'mouseleave', 'mousewheel',
+		 'contextmenu', 'click', 'dblclick', 'load', 'unload', 'submit', 'blur', 'focus', 'resize', 'scroll',
+		 'change', 'reset', 'select', 'selectionchange', 'selectstart', 'start', 'stop', 'keydown', 'keyup',
+		 'keypress', 'abort', 'error', 'dragdrop', 'move', 'moveend', 'movestart', 'activate', 'afterprint',
+		 'afterupdate', 'beforeactivate', 'beforecopy', 'beforecut', 'beforedeactivate', 'beforeeditfocus',
+		 'beforepaste', 'beforeprint', 'beforeunload', 'begin', 'bounce', 'cellchange', 'controlselect',
+		 'copy', 'cut', 'paste', 'dataavailable', 'datasetchanged', 'datasetcomplete', 'deactivate', 'drag',
+		 'dragend', 'dragleave', 'dragenter', 'dragover', 'drop', 'end', 'errorupdate', 'filterchange', 'finish',
+		 'focusin', 'focusout', 'help', 'layoutcomplete', 'losecapture', 'mediacomplete', 'mediaerror', 'outofsync',
+		 'pause', 'propertychange', 'progress', 'readystatechange', 'repeat', 'resizeend', 'resizestart', 'resume',
+		 'reverse', 'rowsenter', 'rowexit', 'rowdelete', 'rowinserted', 'seek', 'syncrestored', 'timeerror',
+		 'trackchange', 'urlflip',
+		);
+		
+		foreach( $event_handlers as $handler )
+		{
+			$txt = str_ireplace( 'on' . $handler, '&#111;n' . $handler, $txt );
+		}
+		
+		return $txt;
+	}
 
 }
\ No newline at end of file
diff --git a/upload/ips_kernel/classMerge.php b/upload/ips_kernel/classMerge.php
index 453f1231..4b5eff4a 100644
--- a/upload/ips_kernel/classMerge.php
+++ b/upload/ips_kernel/classMerge.php
@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Three Way Merge Class
- * Last Updated: $Date: 2009-02-04 20:03:59 +0000 (Wed, 04 Feb 2009) $ BY $author$
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $ BY $author$
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 3887 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
@@ -22,25 +22,25 @@ class ThreeWayMerge
 	 * Original text
 	 * For example, template bit from 3.0.5
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_ORIG = array();
+	protected $_ORIG = array();
 	
 	/**
 	 * New text
 	 * For example, template bit from 3.1.0
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_NEW = array();
+	protected $_NEW = array();
 	
 	/**
 	 * Custom text
 	 * For example, user customized template bit
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_CUSTOM = array();
+	protected $_CUSTOM = array();
 	
 	/**
 	 * Debug messages
@@ -70,7 +70,7 @@ class ThreeWayMerge
 		}
 		
 		/* Set include path.. */
-		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );
+		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );/*noLibHook*/
 		
 		/* OMG.. too many PHP 5 errors under strict standards */
 		if ( IN_DEV )
@@ -86,15 +86,15 @@ class ThreeWayMerge
 		/* ugh */
 		if ( $this->diffType == 'lite' )
 		{
-			require_once 'Text/Diff3.php';
-			require_once 'Text/Diff/Renderer.php';
-			require_once 'Text/Diff/Renderer/inline.php';
+			require_once 'Text/Diff3.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer/inline.php';/*noLibHook*/
 		}
 		else
 		{
-			require_once 'Text/Diff.php';
-			require_once 'Text/Diff/Renderer.php';
-			require_once 'Text/Diff/Renderer/ips3waymerge.php';
+			require_once 'Text/Diff.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer/ips3waymerge.php';/*noLibHook*/
 		}
 	}
 	
@@ -163,11 +163,11 @@ class ThreeWayMerge
 	/**
 	 * Post process merge (quick)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Merge text
 	 * @return	string		processed text
 	 */
-	private function _postProcessQuick( $text )
+	protected function _postProcessQuick( $text )
 	{
 		/* INIT */
 		$count = 0;
@@ -200,12 +200,12 @@ class ThreeWayMerge
 	 * Takes the two maps (old-new, old-custom) and merges.
 	 * Will throw an error on conflict.
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		old-new map
 	 * @param	array		old-custom map
 	 * @return	string
 	 */
-	private function _processMerge( $orig_new_map, $orig_custom_map )
+	protected function _processMerge( $orig_new_map, $orig_custom_map )
 	{
 		$len      = count( $this->_ORIG );
 		$c        = 0;
@@ -355,12 +355,12 @@ class ThreeWayMerge
 	/**
 	 * Returns an array slice for the ORIG line number X
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Re-processed Diff Array
 	 * @param	int			ORIG line number
 	 * @return	array
 	 */
-	private function _sliceFromLineNumber( $data, $n )
+	protected function _sliceFromLineNumber( $data, $n )
 	{
 		foreach ( $data as $i )
 		{
@@ -376,13 +376,13 @@ class ThreeWayMerge
 	/**
 	 * Returns an array of lines to add at the current ORIG line number X
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Re-processed Diff Array
 	 * @param	int			ORIG line number
 	 * @param	array 		Array to add to
 	 * @return	array
 	 */
-	private function _textToAddAtLine( $data, $n, $return=array(), $p='' )
+	protected function _textToAddAtLine( $data, $n, $return=array(), $p='' )
 	{
 		$return = ( is_array( $return ) AND count( $return ) ) ? $return : array();
 		
@@ -401,11 +401,11 @@ class ThreeWayMerge
 	 * Re-process DIFF.
 	 * Figures out mappings to original line numbers, etc
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array 		Array of DIFF data
 	 * @return	array
 	 */
-	private function _fetchProcessed( $data, $log=0 )
+	protected function _fetchProcessed( $data, $log=0 )
 	{
 		/* Counter to ensure unique entry in $return */
 		$c = 0;
@@ -491,11 +491,11 @@ class ThreeWayMerge
 	/**
 	 * Add debug messages
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		TITLE
 	 * @param	mixed		Data
 	 */
-	private function _addDebugMsg( $title, $data )
+	protected function _addDebugMsg( $title, $data )
 	{
 		$this->_DEBUG[] = $title . "\n" . var_export( $data, TRUE );
 	}
diff --git a/upload/ips_kernel/classRss.php b/upload/ips_kernel/classRss.php
index d68224f2..5e478a31 100644
--- a/upload/ips_kernel/classRss.php
+++ b/upload/ips_kernel/classRss.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * RSS handler: handles importing of RSS documents and exporting of RSS v2 documents
- * Last Updated: $Date: 2010-04-19 18:35:00 -0400 (Mon, 19 Apr 2010) $
+ * Last Updated: $Date: 2011-09-29 22:09:09 -0400 (Thu, 29 Sep 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Monday 5th May 2008 14:00
- * @version		$Revision: 392 $
+ * @version		$Revision: 9570 $
  *
  * EXAMPLE: (CREATING AN RSS FEED)
  * <code>
@@ -72,12 +72,12 @@
  * </code>
  */
 
-if ( ! defined( 'IPS_CLASSES_PATH' ) )
+if ( ! defined( 'IPS_KERNEL_PATH' ) )
 {
 	/**
-	* Define classes path
-	*/
-	define( 'IPS_CLASSES_PATH', dirname(__FILE__) );
+	 * Define classes path
+	 */
+	define( 'IPS_KERNEL_PATH', dirname(__FILE__) );
 }
 
 class classRss
@@ -120,89 +120,89 @@ class classRss
 	 * @access	public
 	 * @var 	integer
 	 */
-	public $use_sockets		= 0;
+	public $use_sockets		= 1;
 	
 	/**#@+
 	 * Work item
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	integer 
 	 */
-	private $in_item		= 0;
-	private $in_image		= 0;
-	private $in_channel		= 0;
+	protected $in_item		= 0;
+	protected $in_image		= 0;
+	protected $in_channel		= 0;
 	public  $rss_count		= 0;
 	public  $rss_max_show	= 3;
-	private $cur_item		= 0;
-	private $cur_channel	= 0;
-	private $set_ttl		= 60;
-	private $tag			= "";
+	protected $cur_item		= 0;
+	protected $cur_channel	= 0;
+	protected $set_ttl		= 60;
+	protected $tag			= "";
 	/**#@-*/
 	
 	/**#@+
 	 * RSS Items
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	array 
 	 */
 	public  $rss_items     = array();
-	private $rss_headers   = array();
-	private $rss_images    = array();
-	private $rss_tag_names = array();
+	protected $rss_headers   = array();
+	protected $rss_images    = array();
+	protected $rss_tag_names = array();
 	/**#@-*/
 	
 	/**#@+
 	 * RSS Parse Items
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	string 
 	 */
-	private $rss_title;
-	private $rss_description;
-	private $rss_link;
-	private $rss_date;
-	private $rss_creator;
-	private $rss_content;
-	private $rss_category;
-	private $rss_guid;
+	protected $rss_title;
+	protected $rss_description;
+	protected $rss_link;
+	protected $rss_date;
+	protected $rss_creator;
+	protected $rss_content;
+	protected $rss_category;
+	protected $rss_guid;
 	/**#@-*/
 	
 	/**#@+
 	 * RSS Parse Images
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	string 
 	 */
-	private $rss_img_url;
-	private $rss_img_title;
-	private $rss_img_link;
-	private $rss_img_width;
-	private $rss_img_height;
-	private $rss_img_desc;
+	protected $rss_img_url;
+	protected $rss_img_title;
+	protected $rss_img_link;
+	protected $rss_img_width;
+	protected $rss_img_height;
+	protected $rss_img_desc;
 	/**#@-*/
 	
 	/**#@+
 	 * RSS Channel items
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	string 
 	 */
-	private $rss_chan_title;
-	private $rss_chan_link;
-	private $rss_chan_desc;
-	private $rss_chan_date;
-	private $rss_chan_lang;
+	protected $rss_chan_title;
+	protected $rss_chan_link;
+	protected $rss_chan_desc;
+	protected $rss_chan_date;
+	protected $rss_chan_lang;
 	/**#@-*/
 	
 	/**#@+
 	 * Create: Channels
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var 	array 
 	 */
-	private $channels       = array();
-	private $items          = array();
-	private $channel_images = array();
+	protected $channels       = array();
+	protected $items          = array();
+	protected $channel_images = array();
 	/**#@-*/
 	
 	/**#@+
@@ -230,7 +230,7 @@ class classRss
 	 * @access	public
 	 * @var		integer
 	 */
-	public $convert_charset		= 0;
+	public $convert_charset		= 1;
 	
 	/**
 	 * Convert newlines
@@ -239,23 +239,7 @@ class classRss
 	 * @var		integer
 	 */
 	public $collapse_newlines	= 0;
-	
-	/**
-	 * Destination charset
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $destination_charset	= 'UTF-8';
-	
-	/**
-	 * Feed char set
-	 *
-	 * @access	public
-	 * @var		string
-	 */
-	public $feed_charset		= 'UTF-8';
-	
+
 	/**
 	 * HTML decoding needed
 	 *
@@ -268,7 +252,7 @@ class classRss
 	 * Constructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -300,7 +284,7 @@ class classRss
 	 * Create the RSS document
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function createRssDocument( )
 	{
@@ -381,7 +365,7 @@ class classRss
 							$extra = ' isPermaLink="false"';
 						}
 						
-						$tmp_data .= "\t\t<" . $tag . $extra . ">" . $this->_xmlEncodeString($data) . "</" . $tag . ">\n";
+						$tmp_data .= "\t\t<" . $tag . $extra . ">" . $this->_xmlEncodeString($data) . "</" . preg_replace( '#^(\S+?)(\s.*$|$)#', "\\1", $tag ) . ">\n";
 					}
 					
 					$tmp_data .= "\t</item>\n";
@@ -441,7 +425,7 @@ class classRss
 	 * @access	public
 	 * @param	integer		Channel ID
 	 * @param	array		Array of image variables
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addImageToChannel( $channel_id=0, $in=array() )
 	{
@@ -456,7 +440,7 @@ class classRss
 	 * @access	public
 	 * @param	integer 	Channel ID
 	 * @param	array		Array of item variables
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addItemToChannel( $channel_id=0, $in=array() )
 	{
@@ -516,7 +500,7 @@ class classRss
 		// Draw image
 		//-------------------------------
 		
-		$img = "<img src='".$in['url']."' $title $alt $width $height />";
+		$img = "<img src='" . $in['url'] . "' {$title} {$alt} {$width} {$height} />";
 		
 		//-------------------------------
 		// Linked?
@@ -524,7 +508,7 @@ class classRss
 		
 		if ( $in['link'] )
 		{
-			$img = "<a href='".$in['link']."'>".$img."</a>";
+			$img = "<a href='" . $in['link'] . "'>" . $img . "</a>";
 		}
 		
 		return $img;
@@ -547,7 +531,7 @@ class classRss
 	 *
 	 * @access	public
 	 * @param	string		URI
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseFeedFromUrl( $feed_location )
 	{
@@ -555,7 +539,7 @@ class classRss
 		// Load file management class
 		//-----------------------------------------
 		
-		require_once( IPS_CLASSES_PATH.'/classFileManagement.php' );
+		require_once( IPS_KERNEL_PATH.'/classFileManagement.php' );/*noLibHook*/
 		$this->classFileManagement = new classFileManagement();
 		
 		$this->classFileManagement->use_sockets = $this->use_sockets;
@@ -583,37 +567,52 @@ class classRss
 			return FALSE;
 		}
 		
+		$_foundIn	= '';
+
 		if( preg_match( "#encoding=[\"'](\S+?)[\"']#si", $data, $matches ) )
 		{
-			$this->orig_doc_type = $matches[1];
+			$this->orig_doc_type	= strtoupper($matches[1]);
+			$_foundIn				= 'encoding';
 		}
 		
-		if( preg_match( "#charset=(\S+?)#si", $data, $matches ) )
+		if( !$this->orig_doc_type AND preg_match( "#charset=(\S+?)#si", $data, $matches ) )
 		{
-			$this->orig_doc_type = $matches[1];
+			$this->orig_doc_type	= strtoupper($matches[1]);
+			$_foundIn				= 'charset';
 		}
-		
+	
 		//-----------------------------------------
-		// Charset conversion?
-		// We convert the actual content in the parse
-		//	routines elsewhere, this causes issues
+		// If feed charset isn't supportd by XML lib,
+		// convert to UTF-8
+		// Edit - ALWAYS use utf-8.  A wide html entity (&#8216;) is
+		// valid in iso-8859-1 output because it is an entity, however
+		// the XML library tries to convert all entities to their appropriate
+		// character which corrupts it.
+		// @link	http://community.invisionpower.com/tracker/issue-33588-rss-import-character-issue
+		// @link	http://us.php.net/manual/en/function.xml-set-character-data-handler.php#35065
 		//-----------------------------------------
 		
-		$supported_encodings = array( "utf-8", "iso-8859-1", "us-ascii" );
-		$charset = in_array( strtolower($this->feed_charset), $supported_encodings ) ? $this->feed_charset : "";
+		$supported_encodings	= array( "UTF-8"/*, "ISO-8859-1", "US-ASCII"*/ );
+		$charset				= ( $this->orig_doc_type AND in_array( $this->orig_doc_type, $supported_encodings ) ) ? $this->orig_doc_type : "UTF-8";
 
-		/*if ( $this->convert_charset AND $data )
+		if ( $this->convert_charset AND $data )
 		{
-			if ( $this->feed_charset != $this->doc_type )
+			if ( $charset != $this->orig_doc_type )
 			{
-				$data = IPSText::convertCharsets( $data, $this->feed_charset, $this->doc_type );
+				$data = IPSText::convertCharsets( $data, $this->orig_doc_type, $charset );
 				
 				# Replace any char-set= data
-				$data = preg_replace( "#encoding=[\"'](\S+?)[\"']#si", "encoding=\"".$this->doc_type."\"", $data );
-				$data = preg_replace( "#charset=(\S+?)#si"           , "charset=".$this->doc_type        , $data );
+				if( $_foundIn == 'encoding' )
+				{
+					$data = preg_replace( "#encoding=[\"'](\S+?)[\"']#si", "encoding=\"" . $charset . "\"", $data );
+				}
+				else
+				{
+					$data = preg_replace( "#charset=(\S+?)#si"           , "charset=" . $charset, $data );
+				}
 			}
-		}*/
-		
+		}
+
 		//-------------------------------
 		// Generate XML parser
 		//-------------------------------
@@ -643,7 +642,7 @@ class classRss
 	 *
 	 * @access	public
 	 * @param	string		Path
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseFeedFromFile( $feed_location )
 	{
@@ -659,7 +658,7 @@ class classRss
 	 *
 	 * @access	public
 	 * @param	string		Raw RSS data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function parseFeedFromData( $data )
 	{
@@ -695,13 +694,13 @@ class classRss
 	/**
 	 * Extract: Call back function for element handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser object
 	 * @param	string		Tag name
 	 * @param	array		Attributes
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _parseStartElement( $parser, $name, $attrs )
+	protected function _parseStartElement( $parser, $name, $attrs )
 	{
 		//-------------------------------
 		// Just in case
@@ -740,7 +739,7 @@ class classRss
 			$this->in_channel = 1;
 		}
 		
-		if( array_key_exists( 'html', $attrs ) AND $attrs['html'] == 1 )
+		if( isset( $attrs['html'] ) AND $attrs['html'] == 1 )
 		{
 			$this->htmlDecodingNeeded	= true;
 		}
@@ -749,12 +748,12 @@ class classRss
 	/**
 	 * Extract: Call back function for element handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser object
 	 * @param	string		Tag name
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _parseEndElement( $parser, $name )
+	protected function _parseEndElement( $parser, $name )
 	{
 		//-------------------------------
 		// Just in case
@@ -872,12 +871,12 @@ class classRss
 	/**
 	 * Extract: Call back function for element handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser object
 	 * @param	string		CDATA
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _parseCharacterData( $parser, $data )
+	protected function _parseCharacterData( $parser, $data )
 	{
 		//-----------------------------------------
 		// Decode HTML if necessary
@@ -984,11 +983,11 @@ class classRss
 	/**
 	 * Internal: Encode attribute
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw Text
 	 * @return	string		Parsed Text
 	 */
-	private function _xmlEncodeAttribute( $t )
+	protected function _xmlEncodeAttribute( $t )
 	{
 		$t = preg_replace("/&(?!#[0-9]+;)/s", '&amp;', $t );
 		$t = str_replace( "<", "&lt;"  , $t );
@@ -1002,11 +1001,11 @@ class classRss
 	/**
 	 * Internal: Dencode attribute
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw Text
 	 * @return	string		Parsed Text
 	 */
-	private function _xmlDecodeAttribute( $t )
+	protected function _xmlDecodeAttribute( $t )
 	{
 		$t = str_replace( "&amp;" , "&", $t );
 		$t = str_replace( "&lt;"  , "<", $t );
@@ -1020,11 +1019,11 @@ class classRss
 	/**
 	 * Internal: Encode string
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw Text
 	 * @return	string		Parsed Text
 	 */
-	private function _xmlEncodeString( $v )
+	protected function _xmlEncodeString( $v )
 	{
 		# Fix up encoded & " ' and any other funnky IPB data
 		$v = str_replace( '&amp;'         , '&'          , $v );
@@ -1052,11 +1051,11 @@ class classRss
 	/**
 	 * Encode CDATA XML attribute (Make safe for transport)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw data
 	 * @return	string		Converted Data
 	 */
-	private function _xmlConvertSafeCdata( $v )
+	protected function _xmlConvertSafeCdata( $v )
 	{
 		# Legacy
 		//$v = str_replace( "<![CDATA[", "<!ï¾¢|CDATA|", $v );
@@ -1072,11 +1071,11 @@ class classRss
 	/**
 	 * Decode CDATA XML attribute (Make safe for transport)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw data
 	 * @return	string		Converted Data
 	 */
-	private function _xmlUnconvertSafeCdata( $v )
+	protected function _xmlUnconvertSafeCdata( $v )
 	{
 		# Legacy
 		$v = str_replace( "<!ï¾¢|CDATA|", "<![CDATA[", $v );
@@ -1092,11 +1091,11 @@ class classRss
 	/**
 	 * Format text string
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Raw data
 	 * @return	string		Converted Data
 	 */
-	private function _formatString( $t )
+	protected function _formatString( $t )
 	{
 		return trim( $t );
 	}
@@ -1104,10 +1103,10 @@ class classRss
 	/**
 	 * Internal: Reset arrays
 	 *
-	 * @access	private
-	 * @return	void
+	 * @access	protected
+	 * @return	@e void
 	 */
-	private function _killElements()
+	protected function _killElements()
 	{
 		$this->rss_link        = "";
 		$this->rss_title       = "";
@@ -1122,10 +1121,10 @@ class classRss
 	/**
 	 * Internal: Reset arrays
 	 *
-	 * @access	private
-	 * @return	void
+	 * @access	protected
+	 * @return	@e void
 	 */
-	private function _killImageElements()
+	protected function _killImageElements()
 	{
 		$this->rss_img_image  = "";
 		$this->rss_img_title  = "";
@@ -1138,10 +1137,10 @@ class classRss
 	/**
 	 * Internal: Reset arrays
 	 *
-	 * @access	private
-	 * @return	void
+	 * @access	protected
+	 * @return	@e void
 	 */
-	private function _killChannelElements()
+	protected function _killChannelElements()
 	{
 		$this->rss_chan_title = "";
 		$this->rss_chan_link  = "";
diff --git a/upload/ips_kernel/classStopForumSpam.php b/upload/ips_kernel/classStopForumSpam.php
index a988aaa6..212f1098 100644
--- a/upload/ips_kernel/classStopForumSpam.php
+++ b/upload/ips_kernel/classStopForumSpam.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Wrapper for interfacing with stopforumspam.com
  * Class written by Matt Mecham
- * Last Updated: $Date: 2009-02-04 20:05:25 +0000 (Wed, 04 Feb 2009) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Tuesday 22nd February 2005 (16:55)
- * @version		$Revision: 222 $
+ * @version		$Revision: 8644 $
  */
  
 if ( ! defined( 'IPS_KERNEL_PATH' ) )
@@ -32,48 +32,43 @@ class classStopForumSpam
 	/**
 	 * Minimum frequency to check for
 	 *
-	 * @access	private
 	 * @var		int
 	 */
-	private $_minF = 3;
+	protected $_minF = 3;
 	
 	/**
 	 * XML object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $_xml = null;
+	protected $_xml = null;
 	
 	/**
 	 * ClassFileManagement object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $_cfm = null;
+	protected $_cfm = null;
 	
 	/**
 	 * Load XML and classFileManagement libraries
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
-	function __construct()
+	public function __construct()
 	{
 		/* CFM */
-		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
+		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );/*noLibHook*/
 		$this->_cfm = new classFileManagement();
 		
 		/* XML */
-		require_once( IPS_KERNEL_PATH . 'classXML.php' );
+		require_once( IPS_KERNEL_PATH . 'classXML.php' );/*noLibHook*/
 		$this->_xml = new classXML('utf-8');
 	}
 	
 	/**
 	 * Set a frequency
 	 *
-	 * @access	public
 	 * @param	int
 	 * @return 	void
 	 */
@@ -85,7 +80,6 @@ class classStopForumSpam
 	/**
 	 * Check to see if IP address is blacklisted
 	 *
-	 * @access	public
 	 * @param	string		IP Address
 	 * @return	boolean		TRUE = blacklisted, FALSE = clean
 	 */
@@ -115,7 +109,6 @@ class classStopForumSpam
 	/**
 	 * Check to see if email address is blacklisted
 	 *
-	 * @access	public
 	 * @param	string		Email address
 	 * @return	boolean		TRUE = blacklisted, FALSE = clean
 	 */
diff --git a/upload/ips_kernel/classTemplateEngine.php b/upload/ips_kernel/classTemplateEngine.php
index 39cb8985..bde84254 100644
--- a/upload/ips_kernel/classTemplateEngine.php
+++ b/upload/ips_kernel/classTemplateEngine.php
@@ -3,21 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Template Parser : Converts HTML "logic" into PHP code
- * Last Updated: $Date: 2010-10-12 18:11:26 -0400 (Tue, 12 Oct 2010) $
+ * Last Updated: $Date: 2011-05-12 22:28:10 -0400 (Thu, 12 May 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Wednesday 23rd February 2005 13:53
- * @version		$Revision: 476 $
+ * @version		$Revision: 8754 $
  * 
- * @todo 		[Future] Explore converting this to an XSLT parser (ala Digi)
  */
 
 define( 'IPS_TEMPLATE_DEBUG'     , 0 );
@@ -95,10 +94,10 @@ class classTemplate
 	* Foreach function blocks
 	* Holds the foreach code
 	*
-	* @access	private
+	* @access	protected
 	* @var  	array 		Holds foreach blocks
 	*/
-	private $foreach_blocks = array();
+	protected $foreach_blocks = array();
 	
 	/**
 	* Allow PHP code to execute
@@ -111,30 +110,30 @@ class classTemplate
 	/**
 	* Modifiers path
 	*
-	* @access	private
+	* @access	protected
 	* @var  	string 		Path to modifiers directory
 	*/
-	static private $template_plugins_class_path;
+	static protected $template_plugins_class_path;
 	
 	/**
 	* Modifiers clases
 	*
-	* @access	private
+	* @access	protected
 	* @var  	array 		Array of modifier classes
 	*/
-	static private $template_plugin_classes = array();
+	static protected $template_plugin_classes = array();
 	
-	private $_skinGroup = '';
+	protected $_skinGroup = '';
 	
 	/**
 	 * Escaped double quote replacement
 	 * Part of a hackish fix to retain manual escpaes in PHP code blocks
 	 * but not elsewhere in the code
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @var		string
 	 */
-	private $_dqReplacement = '{{^|^escapedDQ^|^}}';
+	protected $_dqReplacement = '{{^|^escapedDQ^|^}}';
 	
 	/**
 	* Constructor
@@ -233,12 +232,12 @@ EOF;
 	*
 	* Extracts function data
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		The actual contents of the class, php tags 'an all.
 	* @param	array 		Functions to find
 	* @return	string		Converted content
 	*/
-	private function _returnFunctionData( $data='', $function_find=array() )
+	protected function _returnFunctionData( $data='', $function_find=array() )
 	{
 		//-----------------------------------------
 		// INIT
@@ -311,6 +310,7 @@ EOF;
 				continue;
 			}
 		}
+	
 
 		//-----------------------------------------
 		// Build the file...
@@ -443,6 +443,7 @@ EOF;
 
 			$end = $this->_processPluginTags( $end );
 			
+			/* #todo: we don't use any IPSData or IPSActiveMember that I can remember of. We can remove it I think? */
 			$end = preg_replace( '#\{IPS(Data|ActiveMember|Member|Lib|Text)\:\:([^\}]+?)\}#', '" . ' . "IPS\\1::\\2"      . ' . "', $end );
 			$end = preg_replace( '#\{\\\$this->(settings|request)->([^\}]+?)\}#'     , '" . ' . "\$this->\\1->\\2" . ' . "', $end );
 			
@@ -507,7 +508,13 @@ EOF;
 					
 					if( strpos( $r, '=' ) )
 					{
-						$r = substr( $r, 0, strpos( $r, '=' ) );
+						$r	= trim( substr( $r, 0, strpos( $r, '=' ) ) );
+					}
+					
+					/* Try to fix fatal errors caused by type-hinting */
+					if( strpos( $r, ' ' ) )
+					{
+						$r	= trim( substr( $r, strpos( $r, ' ' ) ) );
 					}
 					
 					$_funcDataNames[] = trim( $r );
@@ -646,12 +653,12 @@ EOF;
 	*
 	* Process the HTML logic 'foreach' tags
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Content
 	* @param	string 		Normal function parameters
 	* @return	string		Converted content
 	*/
-	private function _processForeachLogic( $text, $normal_func_data='', $func_name='' )
+	protected function _processForeachLogic( $text, $normal_func_data='', $func_name='' )
 	{
 		//----------------------------------------
 		// INIT
@@ -681,7 +688,7 @@ EOF;
 		
 		foreach( $_tmp_func_data as $_i )
 		{
-			preg_match( "#".'\$'.'(\w+)(=|,|$)#i', $_i, $match );
+			preg_match( "#".'\$'.'(\w+)\s*(=|,|$)#i', $_i, $match );
 			
 			if( count($match) )
 			{
@@ -873,7 +880,7 @@ EOF;
 					}
 				}
 					
-				$block = $this->_processForeachLogic($block, $_normal_func_data, $func_name);
+				$block = $this->_processForeachLogic($block, trim($_normal_func_data, ','), $func_name);
 			}
 			
 			//----------------------------------------
@@ -900,7 +907,7 @@ EOF;
 			// Create PHP statement
 			//----------------------------------------
 			$__i_count++;
-						
+			
 			$function_name = '__f__'. md5( $__i_count . str_replace( '.', '_', uniqid( mt_rand(), TRUE ) ) );			
 			$php_statement = '<xxforeach_'.$function_name.'xx>$this->'.$function_name.'('.$clean_func_data.')</xxforeach_'.$function_name.'xx>';
 			$php_block     = $this->_processHtmlLogic( addslashes($block), $func_name );
@@ -969,11 +976,11 @@ EOF;
 	*
 	* Process the HTML logic 'php' tags
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Content
 	* @return	string		Converted content
 	*/
-	private function _processPhpTags( $text )
+	protected function _processPhpTags( $text )
 	{
 		//-----------------------------------------
 		// INIT
@@ -1016,11 +1023,11 @@ EOF;
 	* Process the template modifier tags
 	* Convert {parse ...} tags
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Content
 	* @return	string		Converted content
 	*/
-	private function _processPluginTags( $text )
+	protected function _processPluginTags( $text )
 	{
 		$text = IPSText::replaceRecursively( $text, '{parse', '\"}', array( 'classTemplate', '_processPluginTagsCallback' ) );
 		//print "\n\n========\n\n".$text."\n\n========\n\n";
@@ -1060,12 +1067,11 @@ EOF;
 		if ( ! isset( self::$template_plugin_classes[ $_plugin ] ) || ! is_object( self::$template_plugin_classes[ $_plugin ] ) )
 		{
 			$filepath  = self::$template_plugins_class_path . '/tp_' . $_plugin . '.php';
-			$classname = 'tp_' . $_plugin;
-
-			if ( file_exists( $filepath ) )
+			
+			if ( is_file( $filepath ) )
 			{  
-				require_once( $filepath );
-
+				$classname = IPSLib::loadLibrary( $filepath, 'tp_' . $_plugin );
+				
 				if ( class_exists( $classname ) )
 				{
 					$_class = new ReflectionClass( $classname );
@@ -1159,13 +1165,13 @@ EOF;
 	*
 	* Process the normal HTML logic (if, else)
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Content
 	* @param	string		Function name
 	* 
 	* @return	string		Converted content
 	*/
-	private function _processHtmlLogic( $text, $func_name='' )
+	protected function _processHtmlLogic( $text, $func_name='' )
 	{
 		//----------------------------------------
 		// INIT
@@ -1543,11 +1549,11 @@ EOF;
 	/**
 	* Convert IPB Heredoc PHP code to html logic
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw PHP content
 	* @return	string		Converted HTML Logic content
 	*/
-	private function _reverseIpsHtml( $code )
+	protected function _reverseIpsHtml( $code )
 	{
 		$code = $this->_trimSlashes($code);
 		
@@ -1562,11 +1568,11 @@ EOF;
 	/**
 	* Trim newlines
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw code
 	* @return	string		Code with newlines trimmed
 	*/
-	private function _trimNewlines($code)
+	protected function _trimNewlines($code)
 	{
 		$code = preg_replace("/^\n{1,}/s", "", $code );
 		$code = preg_replace("/\n{1,}$/s", "", $code );
@@ -1576,11 +1582,11 @@ EOF;
 	/**
 	* Trim empty if tag newlines
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw code
 	* @return	string		Code with newlines trimmed
 	*/
-	private function _trimEmptyIfs($code)
+	protected function _trimEmptyIfs($code)
 	{
 		return preg_replace('/\"\n\s+?\"/s', "\"\"", $code );
 	}
@@ -1588,11 +1594,11 @@ EOF;
 	/**
 	* Trim slashes
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw code
 	* @return	string		Code with slashes trimmed
 	*/
-	private function _trimSlashes($code)
+	protected function _trimSlashes($code)
 	{
 		$code = str_replace( '\"' , '"', $code );
 		$code = str_replace( "\\'", "'", $code );
@@ -1602,11 +1608,11 @@ EOF;
 	/**
 	* Add a debug message if debugging enabled
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Message
 	* @return	mixed		boolean on success, void when not executed
 	*/
-	private function _addDebug( $msg )
+	protected function _addDebug( $msg )
 	{
 		if ( IPS_TEMPLATE_DEBUG AND IPS_TEMPLATE_DEBUG_FILE )
 		{
@@ -1624,4 +1630,4 @@ EOF;
 			return TRUE;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/classUpload.php b/upload/ips_kernel/classUpload.php
index 09fcabc4..3d095850 100644
--- a/upload/ips_kernel/classUpload.php
+++ b/upload/ips_kernel/classUpload.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Upload handler : Handles $_FILES and checks for security
- * Last Updated: $Date: 2010-04-14 19:25:39 -0400 (Wed, 14 Apr 2010) $
+ * Last Updated: $Date: 2011-06-17 07:48:26 -0400 (Fri, 17 Jun 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		15th March 2004
- * @version		$Revision: 389 $
+ * @version		$Revision: 9058 $
  *
  *
  * Example Usage:
@@ -57,12 +57,21 @@
  *
  */
 
+if ( ! defined( 'IPS_FILE_PERMISSION' ) )
+{
+	 define( 'IPS_FILE_PERMISSION', 0777 );
+}
+
+if ( ! defined( 'IPS_FOLDER_PERMISSION' ) )
+{
+	 define( 'IPS_FOLDER_PERMISSION', 0777 );
+}
+
 class classUpload
 {
 	/**
 	 * Name of upload form field
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $upload_form_field	= 'FILE_UPLOAD';
@@ -71,7 +80,6 @@ class classUpload
 	 * Out filename *without* extension
 	 * (Leave blank to retain user filename)
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $out_file_name		= '';
@@ -79,7 +87,6 @@ class classUpload
 	/**
 	 * Out dir (./upload) - no trailing slash
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $out_file_dir		= './';
@@ -87,7 +94,6 @@ class classUpload
 	/**
 	 * Maximum file size of this upload
 	 *
-	 * @access	public
 	 * @var		integer
 	 */
 	public $max_file_size		= 0;
@@ -95,7 +101,6 @@ class classUpload
 	/**
 	 * Forces PHP, CGI, etc to text
 	 *
-	 * @access	public
 	 * @var		integer
 	 */
 	public $make_script_safe	= 1;
@@ -103,7 +108,6 @@ class classUpload
 	/**
 	 * Force non-img file extenstion (leave blank if not) (ex: 'ibf' makes upload.doc => upload.ibf)
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $force_data_ext		= '';
@@ -111,7 +115,6 @@ class classUpload
 	/**
 	 * Allowed file extensions array( 'gif', 'jpg', 'jpeg'..)
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $allowed_file_ext 	= array();
@@ -119,7 +122,6 @@ class classUpload
 	/**
 	 * Check file extension allowed
 	 *
-	 * @access	public
 	 * @var		boolean
 	 */
 	public $check_file_ext	 	= true;
@@ -127,7 +129,6 @@ class classUpload
 	/**
 	 * Array of IMAGE file extensions
 	 *
-	 * @access	public
 	 * @var		array
 	 */
 	public $image_ext			= array( 'gif', 'jpeg', 'jpg', 'jpe', 'png' );
@@ -135,7 +136,6 @@ class classUpload
 	/**
 	 * Check to make sure an image is an image
 	 *
-	 * @access	public
 	 * @var		boolean
 	 */
 	public $image_check			= true;
@@ -143,7 +143,6 @@ class classUpload
 	/**
 	 * Returns current file extension	
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $file_extension		= '';
@@ -152,7 +151,6 @@ class classUpload
 	 * If force_data_ext == 1, this will return the 'real' extension
 	 * and $file_extension will return the 'force_data_ext'
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $real_file_extension	= '';
@@ -160,7 +158,6 @@ class classUpload
 	/**
 	 * Returns error number [1-5]
 	 *
-	 * @access	public
 	 * @var		integer
 	 */
 	public $error_no			= 0;
@@ -168,7 +165,6 @@ class classUpload
 	/**
 	 * Returns if upload is img or not
 	 *
-	 * @access	public
 	 * @var		boolean
 	 */
 	public $is_image			= 0;
@@ -176,7 +172,6 @@ class classUpload
 	/**
 	 * Returns file name as was uploaded by user
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $original_file_name	= "";
@@ -184,7 +179,6 @@ class classUpload
 	/**
 	 * Returns final file name as is saved on disk. (no path info)
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $parsed_file_name	= "";
@@ -192,7 +186,6 @@ class classUpload
 	/**
 	 * Returns final file name with path info
 	 *
-	 * @access	public
 	 * @var		string
 	 */
 	public $saved_upload_name	= "";
@@ -200,7 +193,6 @@ class classUpload
 	/**
 	 * Processes the upload
 	 *
-	 * @access	public
 	 * @return	boolean		Upload successful
 	 */
 	public function process()
@@ -240,7 +232,7 @@ class classUpload
 			or $_FILES[ $this->upload_form_field ]['name'] == ""
 			or !$_FILES[ $this->upload_form_field ]['name']
 			or !$_FILES[ $this->upload_form_field ]['size']
-			or ($_FILES[ $this->upload_form_field ]['name'] == "none") 
+			or $_FILES[ $this->upload_form_field ]['name'] == "none"
 			)
 		{
 			if( $_FILES[ $this->upload_form_field ]['error'] == 2 )
@@ -274,6 +266,8 @@ class classUpload
 			}
 		}
 		
+		$this->allowed_file_ext = array_map( 'strtolower', $this->allowed_file_ext );
+		
 		//-------------------------------------------------
 		// Get file extension
 		//-------------------------------------------------
@@ -315,7 +309,7 @@ class classUpload
 		
 		$this->original_file_name = $FILE_NAME;
 		
-		$FILE_NAME = preg_replace( "/[^\w\.]/", "_", $FILE_NAME );
+		$FILE_NAME = preg_replace( '/[^\w\.]/', "_", $FILE_NAME );
 
 		//-------------------------------------------------
 		// Convert file name?
@@ -339,11 +333,11 @@ class classUpload
 		
 		if ( $this->make_script_safe )
 		{
-			if ( preg_match( "/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)(\.|$)/i", $FILE_NAME ) )
+			if ( preg_match( '/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)(\.|$)/i', $FILE_NAME ) )
 			{
 				$FILE_TYPE                 = 'text/plain';
 				$this->file_extension      = 'txt';
-				$this->parsed_file_name	   = preg_replace( "/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)(\.|$)/i", "$2", $this->parsed_file_name );
+				$this->parsed_file_name	   = preg_replace( '/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)(\.|$)/i', "$2", $this->parsed_file_name );
 				
 				$renamed = 1;
 			}
@@ -388,10 +382,10 @@ class classUpload
 		}
 		else
 		{
-			@chmod( $this->saved_upload_name, 0777 );
+			@chmod( $this->saved_upload_name, IPS_FILE_PERMISSION );
 		}
 		
-		if( !$renamed AND $this->file_extension != 'txt' )
+		if( ! $renamed AND $this->file_extension != 'txt' )
 		{
 			$this->_checkXSSInfile();
 			
@@ -455,29 +449,25 @@ class classUpload
 	/**
 	* Checks for XSS inside file.  If found, deletes file, sets error_no to 5 and returns
 	*
-	* @access	private
-	* @return	void
+	* @return	@e void
 	*/
-	private function _checkXSSInfile()
+	protected function _checkXSSInfile()
 	{
 		// HTML added inside an inline file is not good in IE...
-		
 		$fh = fopen( $this->saved_upload_name, 'rb' );
 		
 		$file_check = fread( $fh, 512 );
 		
 		fclose( $fh );
 		
-		if( !$file_check )
+		if ( ! $file_check )
 		{
 			@unlink( $this->saved_upload_name );
 			$this->error_no = 5;
 			return false;
 		}
-		
 		# Thanks to Nicolas Grekas from comments at www.splitbrain.org for helping to identify all vulnerable HTML tags
-		
-		else if( preg_match( "#<script|<html|<head|<title|<body|<pre|<table|<a\s+href|<img|<plaintext|<cross\-domain\-policy#si", $file_check ) )
+		else if( preg_match( '#<script|<html|<head|<title|<body|<pre|<table|<a\s+href|<img|<plaintext|<cross\-domain\-policy#si', $file_check ) )
 		{
 			@unlink( $this->saved_upload_name );
 			$this->error_no = 5;
@@ -486,25 +476,27 @@ class classUpload
 	}
 	
 	/**
-	* Returns the file extension of the current filename
-	*
-	* @access	public
-	* @param	string		Filename
-	* @return	string		File extension
-	*/
+	 * Returns the file extension of the current filename
+	 *
+	 * @param	string		Filename
+	 * @return	string		File extension
+	 */
 	public function _getFileExtension($file)
 	{
+		if( class_exists('IPSText') )
+		{
+			return IPSText::getFileExtension( $file );
+		}
+
 		return strtolower( str_replace( ".", "", substr( $file, strrpos( $file, '.' ) ) ) );
 	}
 
 	/**
-	* Trims off trailing slashes
-	*
-	* @access	private
-	* @return	void
-	*/
-	
-	private function _cleanPaths()
+	 * Trims off trailing slashes
+	 *
+	 * @return	@e void
+	 */
+	protected function _cleanPaths()
 	{
 		$this->out_file_dir = rtrim( $this->out_file_dir, '/' );
 	}
diff --git a/upload/ips_kernel/classXML.php b/upload/ips_kernel/classXML.php
index f3af9538..d17e464b 100644
--- a/upload/ips_kernel/classXML.php
+++ b/upload/ips_kernel/classXML.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * XML Handler: Rewritten for PHP5
  * By Matt Mecham
- * Last Updated: $Date: 2010-09-15 19:24:25 -0400 (Wed, 15 Sep 2010) $
+ * Last Updated: $Date: 2011-08-30 16:47:25 -0400 (Tue, 30 Aug 2011) $
  * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		25th February 2004
- * @version		$Revision: 464 $
+ * @version		$Revision: 9433 $
  *
  *
  * Example Usage:
@@ -67,7 +67,7 @@
  * /* Grabbing specific data values from all 'products'... * /
  * foreach( $xml->fetchElements('product') as $products )
  * {
- * 	print $xml->fetchItem( $products, 'title' ) . "\";
+ * 	print $xml->fetchItem( $products, 'title' ) . "\\";
  * }
  * 
  * /* Prints... * /
@@ -155,49 +155,43 @@ class classXML
 	/**
 	 * Document character set
 	 *
-	 * @access	private
 	 * @var		string
 	 */
-	private $_docCharSet = 'utf-8';
+	protected $_docCharSet = 'utf-8';
 	
 	/**
 	 * Current document object
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private $_dom;
+	protected $_dom;
 	
 	/**
 	 * Array of DOM objects
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_domObjects = array();
+	protected $_domObjects = array();
 	
 	/**
 	 * XML array
 	 *
-	 * @access	private
 	 * @var		array
 	 */
-	private $_xmlArray = array();
+	protected $_xmlArray = array();
 	
 	/**
 	 * Conversion class
 	 *
-	 * @access	private
 	 * @var		object
 	 */
-	private static $classConvertCharset;
+	protected static $classConvertCharset;
 	
 	/**
 	 * Constructor
 	 *
-	 * @access	public
 	 * @param	string	Character Set
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $charSet )
 	{
@@ -207,8 +201,7 @@ class classXML
 	/**
 	 * Create new document
 	 *
-	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function newXMLDocument()
 	{
@@ -218,7 +211,6 @@ class classXML
 	/**
 	 * Fetch the document
 	 *
-	 * @access	public
 	 * @return	XML data
 	 */
 	public function fetchDocument()
@@ -230,11 +222,10 @@ class classXML
 	/**
 	 * Add element into the document
 	 *
-	 * @access	public
 	 * @param	string		Name of tag to create
 	 * @param	string		[Name of parent tag (optional)]
 	 * @param	array		[Attributes]
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addElement( $tag, $parentTag='', $attributes=array() )
 	{
@@ -249,11 +240,10 @@ class classXML
 	 * $xml->addElementAsRecord( 'parentTag', 'myTag', $data );
 	 * $xml->addElementAsRecord( 'parentTag', array( 'myTag', array( 'attr' => 'value' ) ), $data );
 	 *
-	 * @access	public
 	 * @param	string		Name of parent tag
 	 * @param	mixed		Tag wrapper
 	 * @param	array 		Array of data to add
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addElementAsRecord( $parentTag, $tag, $data )
 	{
@@ -314,10 +304,9 @@ class classXML
 	/**
 	 * Add attributes to a node
 	 *
-	 * @access	public
 	 * @param	string		Name of tag
 	 * @param	array 		Array of attributes in key => value format
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function addAttributes( $tag, $data )
 	{
@@ -333,9 +322,8 @@ class classXML
 	/**
 	 * Load a document from a file
 	 *
-	 * @access	public
 	 * @param	string 		File name
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function load( $filename )
 	{
@@ -346,20 +334,26 @@ class classXML
 	/**
 	 * Load a document from a string
 	 *
-	 * @access	public
 	 * @param	string 		XML Data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function loadXML( $xmlData )
 	{
 		$this->_dom = new DOMDocument;
-		$this->_dom->loadXML( $xmlData );
+		
+		if( defined('LIBXML_PARSEHUGE') )
+		{
+			$this->_dom->loadXML( $xmlData, LIBXML_PARSEHUGE );
+		}
+		else
+		{
+			$this->_dom->loadXML( $xmlData );
+		}
 	}
 	
 	/**
 	 * Wrapper function: Fetch elements based on tag name
 	 *
-	 * @access	public
 	 * @param	string		Tag  Name to fetch from the DOM tree
 	 * @param	object		Node to start from
 	 * @return	array 		Node elements
@@ -375,7 +369,6 @@ class classXML
 	/**
 	 * Wrapper function: Fetch all items within a parent tag
 	 *
-	 * @access	public
 	 * @param	object		DOM object as returned from getElementsByTagName
 	 * @param	array 		array of node names to skip
 	 * @return	array 		Array of elements
@@ -406,7 +399,6 @@ class classXML
 	/**
 	 * Wrapper function: Fetch items from an element node
 	 *
-	 * @access	public
 	 * @param	object		DOM object as returned from getElementsByTagName
 	 * @param	string 		[Optional: Tag name if the DOM is a parent]
 	 * @return	string		Returned item
@@ -427,7 +419,6 @@ class classXML
 	/**
 	 * Wrapper function: Fetch attributes from an element node's item
 	 *
-	 * @access	public
 	 * @param	object		DOM object as returned from getElementsByTagName
 	 * @param	string 		Attribute name required...
 	 * @param	string 		[Optional: Tag name if the DOM is a parent]
@@ -449,7 +440,6 @@ class classXML
 	/**
 	 * Wrapper function: Fetch all attributes from an element node's item
 	 *
-	 * @access	public
 	 * @param	object		DOM object as returned from getElementsByTagName
 	 * @param	string 		Tag name to fetch attribute from
 	 * @return	array 		Array of node items
@@ -471,7 +461,6 @@ class classXML
 	/**
 	 * Fetch entire DOM tree into a single array
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function fetchXMLAsArray()
@@ -482,11 +471,10 @@ class classXML
 	/**
 	 * Internal function to recurse through and collect nodes and data
 	 *
-	 * @access	private
 	 * @param	DOM object 		Node element
 	 * @return	array
 	 */
-	private function _fetchXMLAsArray( $node )
+	protected function _fetchXMLAsArray( $node )
 	{
 		$_xmlArray = array();
 		
@@ -554,11 +542,10 @@ class classXML
 	/**
 	 * Encode CDATA XML attribute (Make safe for transport)
 	 *
-	 * @access	private
 	 * @param	string		Raw data
 	 * @return	string		Converted Data
 	 */
-	private function _xmlConvertSafecdata( $v )
+	protected function _xmlConvertSafecdata( $v )
 	{
 		$v = str_replace( "<![CDATA[", "<!#^#|CDATA|", $v );
 		$v = str_replace( "]]>"      , "|#^#]>"      , $v );
@@ -569,11 +556,10 @@ class classXML
 	/**
 	 * Decode CDATA XML attribute (Make safe for transport)
 	 *
-	 * @access	private
 	 * @param	string		Raw data
 	 * @return	string		Converted Data
 	 */
-	private function _xmlUnconvertSafecdata( $v )
+	protected function _xmlUnconvertSafecdata( $v )
 	{
 		$v = str_replace( "<!#^#|CDATA|", "<![CDATA[", $v );
 		$v = str_replace( "|#^#]>"      , "]]>"      , $v );
@@ -584,11 +570,10 @@ class classXML
 	/**
 	 * Return a tag object
 	 *
-	 * @access	private
 	 * @param	string		Name of tag
 	 * @return	object		
 	 */
-	private function _node( $tag )
+	protected function _node( $tag )
 	{
 		if ( isset($this->_domObjects[ $tag ]) )
 		{
@@ -603,11 +588,10 @@ class classXML
 	/**
 	 * Convert from native to UTF-8 for saving XML
 	 *
-	 * @access	private
 	 * @param	string		Input Text
 	 * @return	string		Converted Text ready for XML saving
 	 */
-	private function _inputToXml( $text )
+	protected function _inputToXml( $text )
 	{
 		/* Do we need to make safe on CDATA? */
 		if ( preg_match( "/['\"\[\]<>&]/", $text ) )
@@ -634,11 +618,10 @@ class classXML
 	/**
 	 * Convert from UTF-8 to native for saving XML
 	 *
-	 * @access	private
 	 * @param	string		Input Text
 	 * @return	string		Converted Text ready for returning to app
 	 */
-	private function _xmlToOutput( $text )
+	protected function _xmlToOutput( $text )
 	{
 		/* Unconvert cdata */
 		$text = $this->_xmlUnconvertSafecdata( $text );
@@ -662,14 +645,13 @@ class classXML
 	/**
 	 * Convert a string between charsets. XML will always be UTF-8
 	 *
-	 * @access	private
 	 * @param	string		Input String
 	 * @param	string		Current char set
 	 * @param	string		Destination char set
 	 * @return	string		Parsed string
 	 * @todo 	[Future] If an error is set in classConvertCharset, show it or log it somehow
 	 */
-	private function _convertCharsets( $text, $original_cset, $destination_cset="UTF-8" )
+	protected function _convertCharsets( $text, $original_cset, $destination_cset="UTF-8" )
 	{
 		$original_cset    = strtolower($original_cset);
 		$destination_cset = strtolower( $destination_cset );
@@ -686,7 +668,7 @@ class classXML
 
 		if ( ! is_object( self::$classConvertCharset ) )
 		{
-			require_once( dirname(__FILE__) . '/classConvertCharset.php' );
+			require_once( dirname(__FILE__) . '/classConvertCharset.php' );/*noLibHook*/
 			self::$classConvertCharset = new classConvertCharset();
 			
 			//-----------------------------------------
diff --git a/upload/ips_kernel/classXMLArchive.php b/upload/ips_kernel/classXMLArchive.php
index bec281ea..c0c51a17 100644
--- a/upload/ips_kernel/classXMLArchive.php
+++ b/upload/ips_kernel/classXMLArchive.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * XML Archive Hanlder: Can create XML Archives (gzips) of multiple files, binary and ascii
- * Last Updated: $Date: 2010-06-15 09:23:05 -0400 (Tue, 15 Jun 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		25th February 2004
- * @version		$Revision: 425 $
+ * @version		$Revision: 8644 $
  *
  *
  * Example Usage:
@@ -80,15 +80,15 @@ class classXMLArchive
 	/**
 	* XML Object
 	*
-	* @access	private
+	* @access	protected
 	* @var 		object
 	*/
-	private $_xml				= null;
+	protected $_xml				= null;
 	
 	/**
 	* File array
 	*
-	* @access	private
+	* @access	protected
 	* @var 		array
 	*/
 	public $_fileArray		= array();
@@ -112,7 +112,7 @@ class classXMLArchive
 	/**
 	* Work files
 	*
-	* @access	private
+	* @access	protected
 	* @var 		array
 	*/
 	public $_workFiles	= array();
@@ -136,25 +136,25 @@ class classXMLArchive
 	/**
 	* Allow hidden files
 	*
-	* @access	private
+	* @access	protected
 	* @var		boolean
 	*/
-	private $_allowHiddenFiles  = FALSE;
+	protected $_allowHiddenFiles  = FALSE;
 	
 	/**
 	* Root tag values
 	*
-	* @access	private
+	* @access	protected
 	* @var		array
 	*/
-	private $_defaultRootValues = array();
+	protected $_defaultRootValues = array();
 	
 	/**
 	* Constructor
 	*
 	* @access	public
 	* @param	string		Script root path
-	* @return	void
+	* @return	@e void
 	*/
 	public function __construct()
 	{
@@ -162,7 +162,7 @@ class classXMLArchive
 		// Get the XML class
 		//-----------------------------------
 		
-		require_once( dirname( __FILE__ ) . '/classXML.php' );
+		require_once( dirname( __FILE__ ) . '/classXML.php' );/*noLibHook*/
 		$this->_xml = new classXML( IPS_DOC_CHAR_SET );
 		
 		/* Set up the root values */
@@ -262,11 +262,11 @@ class classXMLArchive
 	*
 	* @access	public
 	* @param	string	File name
-	* @return	void
+	* @return	@e void
 	*/
 	public function read( $filename )
 	{
-		if ( file_exists( $filename ) )
+		if ( is_file( $filename ) )
 		{
 			if ( strstr( $filename, '.gz' ) )
 			{
@@ -306,7 +306,7 @@ class classXMLArchive
 	*
 	* @access	public
 	* @param	string	Raw XML Data
-	* @return	void
+	* @return	@e void
 	*/
 	public function readXML( $data )
 	{
@@ -329,7 +329,7 @@ class classXMLArchive
 	*
 	* @access	public
 	* @param	string	Filename
-	* @return	void
+	* @return	@e void
 	*/
 	public function saveGZIP( $filename )
 	{
@@ -358,7 +358,7 @@ class classXMLArchive
 	*
 	* @access	public
 	* @param	string	FIlename
-	* @return	void
+	* @return	@e void
 	*/
 	public function save( $filename )
 	{
@@ -583,7 +583,7 @@ class classXMLArchive
 	* @param	string		File data
 	* @param	string		File name
 	* @param	array 		Extra tags
-	* @return	void
+	* @return	@e void
 	*/
 	public function addData( $data, $filename, $extra_tags=array() )
 	{
@@ -639,10 +639,10 @@ class classXMLArchive
 	/**
 	* Create the XML archive
 	*
-	* @access	private
-	* @return	void
+	* @access	protected
+	* @return	@e void
 	*/
-	private function _create()
+	protected function _create()
 	{
 		$this->_xml->newXMLDocument();
 		$this->_xml->addElement( 'xmlarchive', '', (array)$this->_defaultRootValues );
@@ -660,12 +660,12 @@ class classXMLArchive
 	* Write contents of a file to disk
 	* Creates directories, etc as it goes
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Path with filename to write to
 	* @param	string		Data to write
 	* @return	boolean
 	*/
-	private function _writeContents( $path, $content )
+	protected function _writeContents( $path, $content )
 	{
 		$path      = $this->_stripPath( $path );
 		$_path     = DOC_IPS_ROOT_PATH;
@@ -678,13 +678,13 @@ class classXMLArchive
 			
 			if ( ! is_dir( $_path ) )
 			{
-				if ( ! @mkdir( $_path, 0777 ) )
+				if ( ! @mkdir( $_path, IPS_FOLDER_PERMISSION ) )
 				{
 					return FALSE;
 				}
 				else
 				{
-					@chmod( $_path, 0777 );
+					@chmod( $_path, IPS_FOLDER_PERMISSION );
 				}
 			}
 		}
@@ -694,7 +694,7 @@ class classXMLArchive
 			return FALSE;
 		}
 		
-		@chmod( $_path . '/' . $file, 0777 );
+		@chmod( $_path . '/' . $file, IPS_FILE_PERMISSION );
 		
 		return TRUE;
 	}
@@ -702,11 +702,11 @@ class classXMLArchive
 	/**
 	* Strip path information from the real path
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Input path
 	* @return	string		Converted path
 	*/
-	private function _stripPath( $path )
+	protected function _stripPath( $path )
 	{
 		if ( $this->_stripPathString )
 		{
@@ -719,11 +719,11 @@ class classXMLArchive
 	/**
 	* Get directory contents
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Directory
 	* @return	boolean		Successful
 	*/
-	private function _getDirContents( $dir )
+	protected function _getDirContents( $dir )
 	{
 		if ( file_exists( $dir ) AND is_dir( $dir ) )
 		{
diff --git a/upload/ips_kernel/classXmlRpc.php b/upload/ips_kernel/classXmlRpc.php
index 63b45c9d..95f95760 100644
--- a/upload/ips_kernel/classXmlRpc.php
+++ b/upload/ips_kernel/classXmlRpc.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * XML-RPC Server: Send, receive and process XML-RPC requests
- * Last Updated: $Date: 2010-07-22 04:20:19 -0400 (Thu, 22 Jul 2010) $
+ * Last Updated: $Date: 2011-05-09 18:07:59 -0400 (Mon, 09 May 2011) $
  * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		6th January 2006
- * @version		$Revision: 440 $
+ * @version		$Revision: 8688 $
  *
  *
  * Example Usage:
@@ -348,7 +348,7 @@ class classXmlRpc
 	 *
 	 * @access	public
 	 * @param	string		Value
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function returnValue( $value )
 	{
@@ -498,14 +498,14 @@ class classXmlRpc
 	/**
 	 * Recursive method to build document
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		XML Data
 	 * @param	string		Key
 	 * @param	string		Value
 	 * @param	integer		Depth
 	 * @return	string		finished document
 	 */
-	private function _buildDocumentRecurse( $xmldata, $k, $v, $depth=4 )
+	protected function _buildDocumentRecurse( $xmldata, $k, $v, $depth=4 )
 	{
 		$xmldata .= "\t<member>\n";
 		$xmldata .= "\t\t<name>".$k."</name>\n";
@@ -556,7 +556,7 @@ class classXmlRpc
 	 * Prints a true document and exits
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function returnTrue()
 	{
@@ -587,7 +587,7 @@ class classXmlRpc
 	 *
 	 * @access	public
 	 * @param	array  		Array of params to return in key => value pairs
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function returnParams( $data_array )
 	{
@@ -611,7 +611,7 @@ class classXmlRpc
 	 * @access	public
 	 * @param	int			Error code
 	 * @param	string		Error Message
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function returnError( $error_code, $error_msg )
 	{
@@ -724,7 +724,7 @@ class classXmlRpc
 		else
 		{
 			$header  = "POST $path HTTP/1.0\r\n";
-			$header .= "User-Agent: IPS XML-RPC Client Library (\$Revision: 440 $)\r\n";
+			$header .= "User-Agent: IPS XML-RPC Client Library (\$Revision: 8688 $)\r\n";
 			$header .= "Host: $host\r\n";
 			
 			if ( $this->auth_user && $this->auth_pass )
@@ -762,7 +762,7 @@ class classXmlRpc
 		//-------------------------------
 		
 		$tmp  = explode("\r\n\r\n", $data, 2);
-		$data = $tmp[1];
+		$data = trim($tmp[1]);
 
 		//-----------------------------------------
 		// Debug?
@@ -851,7 +851,7 @@ class classXmlRpc
 	 * Create the XML header
 	 *
 	 * @access	protected
-	 * @return	void
+	 * @return	@e void
 	 */
 	protected function generateHeader()
 	{
@@ -914,7 +914,7 @@ class xmlRpcParser
 	 *
 	 * @access	public
 	 * @param	string		Data
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct( $data=null )
 	{
@@ -930,7 +930,7 @@ class xmlRpcParser
 	 * Destructor
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __destruct()
 	{
@@ -971,13 +971,13 @@ class xmlRpcParser
 	/**
 	 * Open handler for XML object
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser reference
 	 * @param	string		Tag
 	 * @param	array 		Attributes
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rpcOpen($parser, $tag, $attributes)
+	protected function _rpcOpen($parser, $tag, $attributes)
 	{
 		//-----------------------------------------
 		// INIT
@@ -1031,12 +1031,12 @@ class xmlRpcParser
 	/**
 	 * Array unshift wrapper
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Array
 	 * @param	string		Value
 	 * @return	array 		New array
 	 */
-	private function _arrayUnshiftReference(&$array, &$value)
+	protected function _arrayUnshiftReference(&$array, &$value)
 	{
 	   $return = array_unshift($array,'');
 	   $array[0] =& $value;
@@ -1046,12 +1046,12 @@ class xmlRpcParser
 	/**
 	 * XML data handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser reference
 	 * @param	string		Data
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rpcData($parser, $data)
+	protected function _rpcData($parser, $data)
 	{
 		if ( $this->last_opened_tag != NULL )
 		{
@@ -1062,12 +1062,12 @@ class xmlRpcParser
 	/**
 	 * XML close handler
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	object		Parser reference
 	 * @param	string		Tag
-	 * @return	void
+	 * @return	@e void
 	 */
-	private function _rpcClose($parser, $tag)
+	protected function _rpcClose($parser, $tag)
 	{
 		if ( $this->last_opened_tag == $tag )
 		{
diff --git a/upload/ips_kernel/class_xml.php b/upload/ips_kernel/class_xml.php
index 7411d803..bf609bfe 100644
--- a/upload/ips_kernel/class_xml.php
+++ b/upload/ips_kernel/class_xml.php
@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * XML Handler: Can use PHP's internal XML handler, or a lite hand-rolled parser, to create and read XML files
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		25th February 2004
- * @version		$Revision: 370 $
+ * @version		$Revision: 8644 $
  *
  *
  * Example Usage:
@@ -196,7 +196,7 @@ class class_xml
 	*
 	* @access	public
 	* @param	string		Raw XML Data
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_parse_document( $xml )
 	{
@@ -257,7 +257,7 @@ class class_xml
 	*
 	* @access	public
 	* @param	array		Entry array
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_format_document( $entry=array() )
 	{
@@ -280,7 +280,7 @@ class class_xml
 	* @access	public
 	* @param	string		Root tag name
 	* @param	array		Root tag attributes
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_set_root($tag, $attributes=array() )
 	{
@@ -294,7 +294,7 @@ class class_xml
 	* @access	public
 	* @param	string		Tag name
 	* @param	array		Entry values
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_add_entry_to_group($tag, $entry=array() )
 	{
@@ -368,14 +368,14 @@ class class_xml
 	* Build tree node
 	* Adapted from http://eric.pollmann.net/work/public_domain/
 	*
-	* @access	private
+	* @access	protected
 	* @param	array		Values
 	* @param	array		Values
 	* @param	string		Counter
 	* @param	string		Tag type
 	* @return	array
 	*/
-	private function _xmlBuildTag( $thisvals, $vals, &$i, $type )
+	protected function _xmlBuildTag( $thisvals, $vals, &$i, $type )
 	{
 		$tag = array();
 		
@@ -407,12 +407,12 @@ class class_xml
 	* Build a nested array of children
 	* Adapted from http://eric.pollmann.net/work/public_domain/
 	*
-	* @access	private
+	* @access	protected
 	* @param	array		Values
 	* @param	string		Counter
 	* @return	array
 	*/
-	private function _xmlGetChildren($vals, &$i)
+	protected function _xmlGetChildren($vals, &$i)
 	{
 		$children = array();
 		
@@ -489,11 +489,11 @@ class class_xml
 	/**
 	* Builds attribute string
 	*
-	* @access	private
+	* @access	protected
 	* @param	array		Values
 	* @return	string
 	*/
-	private function _xmlBuildAttributeString( $array = array() )
+	protected function _xmlBuildAttributeString( $array = array() )
 	{
 		if ( is_array( $array ) and count( $array ) )
 		{
@@ -513,11 +513,11 @@ class class_xml
 	/**
 	* Encode XML attribute (Make safe for transport)
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw data
 	* @return	string		Converted Data
 	*/
-	private function _xmlEncodeAttribute( $t )
+	protected function _xmlEncodeAttribute( $t )
 	{
 		$t = preg_replace("/&(?!#[0-9]+;)/s", '&amp;', $t );
 		$t = str_replace( "<", "&lt;"  , $t );
@@ -531,11 +531,11 @@ class class_xml
 	/**
 	* Decode XML attribute (Make safe for transport)
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw data
 	* @return	string		Converted Data
 	*/
-	private function _xmlDecodeAttribute( $t )
+	protected function _xmlDecodeAttribute( $t )
 	{
 		$t = str_replace( "&amp;" , "&", $t );
 		$t = str_replace( "&lt;"  , "<", $t );
@@ -549,11 +549,11 @@ class class_xml
 	/**
 	* Encode XML attribute (Make safe for transport)
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw data
 	* @return	string		Converted Data
 	*/
-	private function _xmlEncodeString( $v )
+	protected function _xmlEncodeString( $v )
 	{
 		if ( preg_match( "/['\"\[\]<>&]/", $v ) )
 		{
@@ -571,11 +571,11 @@ class class_xml
 	/**
 	* Encode CDATA XML attribute (Make safe for transport)
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Raw data
 	* @return	string		Converted Data
 	*/
-	private function _xmlConvertSafecdata( $v )
+	protected function _xmlConvertSafecdata( $v )
 	{
 		# Legacy
 		//$v = str_replace( "<![CDATA[", "<!ï¾¢|CDATA|", $v );
@@ -622,9 +622,9 @@ class class_xml
  *
  * @package		IP.Board
  * @subpackage	Kernel
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @since		25th February 2004
- * @version		$Revision: 370 $
+ * @version		$Revision: 8644 $
  */
  
 class xml_lite_parse
@@ -656,10 +656,10 @@ class xml_lite_parse
 	/**
 	* Internal: stack management
 	*
-	* @access	private
+	* @access	protected
 	* @var 		array
 	*/
-	private $stack			= array();
+	protected $stack			= array();
 	
 	/**
 	* Depth level
@@ -714,7 +714,7 @@ class xml_lite_parse
 	*
 	* @access	public
 	* @param	string		Raw xml document
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_parse_it( $xmldoc )
 	{
@@ -742,13 +742,13 @@ class xml_lite_parse
 	/**
 	* Start element callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	object		Parser ref
 	* @param	string		Tag name
 	* @param	array 		Attributes
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myStartElement( &$parser_obj, $name, $attr )
+	protected function _myStartElement( &$parser_obj, $name, $attr )
 	{
 		//-------------------------------
 		// Add to stack
@@ -807,12 +807,12 @@ class xml_lite_parse
 	/**
 	* End element callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	object		Parser ref
 	* @param	string		Tag name
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myEndElement( &$parser_obj, $name )
+	protected function _myEndElement( &$parser_obj, $name )
 	{
 		$this->stack[ $this->array_id ] = array( 'tag'        => $name,
 												 'type'       => 'close',
@@ -851,12 +851,12 @@ class xml_lite_parse
 	/**
 	* Parse data
 	*
-	* @access	private
+	* @access	protected
 	* @param	object		Parser ref
 	* @param	string		Tag name
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myDataElement( &$parser_obj, $data )
+	protected function _myDataElement( &$parser_obj, $data )
 	{
 		if ( $this->tagname )
 		{
@@ -878,12 +878,12 @@ class xml_lite_parse
 	/**
 	* Parse CDATA
 	*
-	* @access	private
+	* @access	protected
 	* @param	object		Parser ref
 	* @param	string		Tag name
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myCdataElement( &$parser_obj, $data )
+	protected function _myCdataElement( &$parser_obj, $data )
 	{
 		$this->_myDataElement( $parser_obj, $data );
 	}
@@ -892,7 +892,7 @@ class xml_lite_parse
 	* Garbage collection
 	*
 	* @access	public
-	* @return	void
+	* @return	@e void
 	*/
 	public function garbage_collect()
 	{
@@ -916,9 +916,9 @@ class xml_lite_parse
  *
  * @package		IP.Board
  * @subpackage	Kernel
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @since		25th February 2004
- * @version		$Revision: 370 $
+ * @version		$Revision: 8644 $
  */
 class xml_extract
 {
@@ -988,7 +988,7 @@ class xml_extract
 	*
 	* @access	public
 	* @param	string		XML Document
-	* @return	void
+	* @return	@e void
 	*/
 	public function xml_parse_document( $xml )
 	{
@@ -1063,11 +1063,11 @@ class xml_extract
 	/**
 	* Parse a tag
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Text
-	* @return	void
+	* @return	@e void
 	*/
-	private function _parseTag( $text )
+	protected function _parseTag( $text )
 	{
 		$attr = array();
 		$text = trim($text);
@@ -1223,11 +1223,11 @@ class xml_extract
 	/**
 	* Parse an attribute
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Text
 	* @return	array 		Attributes
 	*/
-	private function _parseAttr( $text )
+	protected function _parseAttr( $text )
 	{
 		$text         = trim($text);	
 		$attr_array   = array();
@@ -1364,11 +1364,11 @@ class xml_extract
 	/**
 	* Parse between element tags
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Text
-	* @return	void
+	* @return	@e void
 	*/
-	private function _parseBetweenTags( $t )
+	protected function _parseBetweenTags( $t )
 	{
 		if ( trim($t ) != '')
 		{
@@ -1379,11 +1379,11 @@ class xml_extract
 	/**
 	* Exec character callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Data
-	* @return	void
+	* @return	@e void
 	*/
-	private function _execCharacterData( $data )
+	protected function _execCharacterData( $data )
 	{
 		call_user_func( $this->handler_character_data, $this, $data );
 	}
@@ -1391,11 +1391,11 @@ class xml_extract
 	/**
 	* Exec start callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Data
-	* @return	void
+	* @return	@e void
 	*/
-	private function _execStartElement( $tagname, $attr )
+	protected function _execStartElement( $tagname, $attr )
 	{
 		call_user_func( $this->handler_start_element, $this, $tagname, $attr );
 	}
@@ -1403,11 +1403,11 @@ class xml_extract
 	/**
 	* Exec end callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Data
-	* @return	void
+	* @return	@e void
 	*/
-	private function _execEndElement( $tagname )
+	protected function _execEndElement( $tagname )
 	{
 		call_user_func( $this->handler_end_element, $this, $tagname );
 	}
@@ -1415,11 +1415,11 @@ class xml_extract
 	/**
 	* Exec cdata callback
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Data
-	* @return	void
+	* @return	@e void
 	*/
-	private function _execCdataElement( $data )
+	protected function _execCdataElement( $data )
 	{
 		call_user_func( $this->handler_cdata_handler, $this, $data );
 	}
@@ -1427,12 +1427,12 @@ class xml_extract
 	/**
 	* Set the element handler
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		start handler
 	* @param	string		end handler
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myXmlSetElementHandler($startHandler, $endHandler)
+	protected function _myXmlSetElementHandler($startHandler, $endHandler)
 	{
 		$this->handler_start_element = $startHandler;
 		$this->handler_end_element   = $endHandler;
@@ -1441,12 +1441,12 @@ class xml_extract
 	/**
 	* Set the data handler
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		start handler
 	* @param	string		end handler
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myXmlSetCharacterDataHandler($handler)
+	protected function _myXmlSetCharacterDataHandler($handler)
 	{
 		$this->handler_character_data = &$handler;
 	}
@@ -1454,12 +1454,12 @@ class xml_extract
 	/**
 	* Set the cdata handler
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		start handler
 	* @param	string		end handler
-	* @return	void
+	* @return	@e void
 	*/
-	private function _myXmlSetCdataSectionHandler($handler)
+	protected function _myXmlSetCdataSectionHandler($handler)
 	{
 		$this->handler_cdata_handler = &$handler;
 	}
@@ -1467,12 +1467,12 @@ class xml_extract
 	/**
 	* Get nth character of text
 	*
-	* @access	private
+	* @access	protected
 	* @param	string		Text
 	* @param	integer		Position to get
 	* @return	string		Character
 	*/
-	private function _getNthCharFromEnd( $t, $i )
+	protected function _getNthCharFromEnd( $t, $i )
 	{
 		return $t{ ( strlen( $t ) - 1 - $i ) };
 	}
diff --git a/upload/ips_kernel/db_lib/index.html b/upload/ips_kernel/db_lib/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/db_lib/index.html
+++ b/upload/ips_kernel/db_lib/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/db_lib/mysql_tools.php b/upload/ips_kernel/db_lib/mysql_tools.php
index d93a7b10..b2ca3eb9 100644
--- a/upload/ips_kernel/db_lib/mysql_tools.php
+++ b/upload/ips_kernel/db_lib/mysql_tools.php
@@ -1,48 +1,56 @@
 <?php
 
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * MySQL Database Diagnostic Methods
- * Last Updated: $Date: 2010-10-18 16:58:05 -0400 (Mon, 18 Oct 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @file		mysql_tools.php 	Provides methods to diagnostic a MySQL database
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: bfarber $
  * @since		Tuesday 1st March 2005 15:40
- * @version		$Revision: 478 $
+ * $LastChangedDate: 2011-09-14 20:13:56 -0400 (Wed, 14 Sep 2011) $
+ * @version		v3.2.3
+ * $Revision: 9491 $
  */
 
+/**
+ *
+ * @class		db_tools
+ * @brief		Provides methods to diagnostic a MySQL database
+ * @note		The file is automatically loaded based on the driver value in conf_global.php
+ *
+ */
 class db_tools
 {
 	/**
-	 * Missing column/table/index flag
+	 * Boolean flag that holds data about missing column/table/index
 	 *
-	 * @var		boolean			Table/index has issues
-	 * @access	public
+	 * @var		$has_issues
 	 */
-	public $has_issues			= false;
+	public $has_issues	= false;
 	
 	/**
-	 * Internal mapping - ignore me
+	 * Array with an internal mapping of tables/columns
 	 *
-	 * @var		array			Table/column mappings
-	 * @access	private
+	 * @var		$_mapping
 	 */
-	private $_mapping			= array();
+	protected $_mapping	= array();
 
 	/**
 	 * Diagnose table indexes
 	 *
-	 * @access	public
-	 * @param	array 			Array of create table/index statements to check
-	 * @param	array 			Array of issues to fix
-	 * @return	array 			Array of results
+	 * @param	array 	$sql_statements		Array of create table/index statements to check
+	 * @param	string 	$issues_to_fix		String of the issue to fix, can be set to 'all' to fix everything
+	 * @return	@e array Array of results
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * // Retrieve results
+	 * $results = $this->dbIndexDiag( $sql_statements );
+	 * // Retrieve results and fix a index
+	 * $results = $this->dbIndexDiag( $sql_statements, $issues_to_fix );
+	 * // Retrieve results and fix all indexes
+	 * $results = $this->dbIndexDiag( $sql_statements, 'all' );
+	 * @endcode
 	 */
 	public function dbIndexDiag( $sql_statements, $issues_to_fix='' )
 	{
@@ -83,10 +91,12 @@ class db_tools
 				/* Remove backticks */
 				$definition = str_replace( '`', '', $definition );
 				
+				$definition	= preg_replace( "#CREATE\s+TABLE\s+IF\s+NOT\s+EXISTS\s+#i", "CREATE TABLE ", $definition );
+
 				//-----------------------------------------
 				// Is this a create table statement?
 				//-----------------------------------------
-				
+
 		        if ( preg_match( "#CREATE\s+TABLE\s+?(.+?)\s+?\(#ie", $definition, $tablename ) )
 		        {
 			        $tableName	= $tablename[1];
@@ -125,17 +135,6 @@ class db_tools
 					        $final_primary = array( $primary_key ? $primary_key : $primary_fields, $primary_fields );
 	            		}
 			        }
-			        
-					$table_array[$i] = $tableName;
-					
-					//-----------------------------------------
-					// We found a primary key, store it
-					//-----------------------------------------
-					
-					if ( count( $final_primary ) )
-					{
-						$primary_array[$i] = $final_primary;
-					}
 			    }
 
 				//-----------------------------------------
@@ -228,7 +227,7 @@ class db_tools
 			
 			if( isset( $data['primary'] ) && is_array($data['primary']) AND count($data['primary']) )
 			{
-				$index_name = $data['primary'][0];
+				$index_name = preg_replace( "/[^a-zA-Z0-9]/", '_', $data['primary'][0] );
 				$index_cols	= $data['primary'][1];
 				$ok			= 0;
 
@@ -351,6 +350,7 @@ class db_tools
 					$index_name	= $indexes[0];
 					$_checkName	= $index_name;
 					$index_cols	= str_replace( ' ', '', $indexes[1] ? $indexes[1] : $index_name );
+					$index_name	= preg_replace( "/[^a-zA-Z0-9]/", '_', $index_name );
 
 					$ok			= 0;
 
@@ -477,10 +477,19 @@ class db_tools
 	/**
 	 * Diagnose table structure
 	 *
-	 * @access	public
-	 * @param	array 			Array of create table/index statements to check
-	 * @param	array 			Array of issues to fix
-	 * @return	array 			Array of results
+	 * @param	array 	$sql_statements		Array of create table/columns statements to check
+	 * @param	string 	$issues_to_fix		String of the issue to fix, can be set to 'all' to fix everything
+	 * @return	@e array Array of results
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * // Retrieve results
+	 * $results = $this->dbTableDiag( $sql_statements );
+	 * // Retrieve results and fix a table/column
+	 * $results = $this->dbTableDiag( $sql_statements, $issues_to_fix );
+	 * // Retrieve results and fix all tables/columns
+	 * $results = $this->dbTableDiag( $sql_statements, 'all' );
+	 * @endcode
 	 */
 	public function dbTableDiag( $sql_statements, $issues_to_fix='' )
 	{
@@ -512,6 +521,8 @@ class db_tools
 				
 				/* Remove backticks */
 				$the_table = str_replace( '`', '', $the_table );
+				
+				$the_table	= preg_replace( "#CREATE\s+TABLE\s+IF\s+NOT\s+EXISTS\s+#i", "CREATE TABLE ", $the_table );
 
 				//-----------------------------------------
 				// Is this a create table statement?
@@ -565,6 +576,16 @@ class db_tools
 						
 						$temp		= preg_split( "/[\s]+/" , trim($col) );
 						$columnName	= $temp[0];
+						
+						//-----------------------------------------
+						// Ignore custom profile fields
+						// @link	http://community.invisionpower.com/tracker/issue-27495-database-checker-find-removed-custom-profile-fields
+						//-----------------------------------------
+						
+						if( $tableName == 'pfields_content' AND strpos( $columnName, 'field_' ) === 0 )
+						{
+							continue;
+						}
 
 						//-----------------------------------------
 						// If this is a real column, map it
@@ -746,21 +767,21 @@ class db_tools
 		}
 		
 		return array( 'error_count'	=> $error_count, 'results' => $output );
-	}	
-
-
+	}
+	
 	/**
-	* Remove ticks from statement
-	*
-	* @access	private
-	* @param	string 			String
-	* @return	string 			String with ticks removed
-	*/
-	private function _sqlStripTicks( $data )
+	 * Remove ticks from statement
+	 *
+	 * @param	string 	$data		String to clean
+	 * @return	@e string String with ticks removed
+	 *
+	 * <b>Example Usage:</b>
+	 * @code
+	 * $query = $this->_sqlStripTicks( $data );
+	 * @endcode
+	 */
+	protected function _sqlStripTicks( $data )
 	{
 		return str_replace( "`", "", $data );
 	}
-
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/facebook-client/facebook.php b/upload/ips_kernel/facebook-client/facebook.php
index 5210435c..64b1cac4 100644
--- a/upload/ips_kernel/facebook-client/facebook.php
+++ b/upload/ips_kernel/facebook-client/facebook.php
@@ -31,7 +31,7 @@
 // | For help with this library, contact developers-help@facebook.com          |
 // +---------------------------------------------------------------------------+
 
-include_once 'facebookapi_php5_restlib.php';
+include_once 'facebookapi_php5_restlib.php';/*noLibHook*/
 
 define('FACEBOOK_API_VALIDATION_ERROR', 1);
 class Facebook {
diff --git a/upload/ips_kernel/facebook-client/facebookapi_php5_restlib.php b/upload/ips_kernel/facebook-client/facebookapi_php5_restlib.php
index e249a326..676238a2 100644
--- a/upload/ips_kernel/facebook-client/facebookapi_php5_restlib.php
+++ b/upload/ips_kernel/facebook-client/facebookapi_php5_restlib.php
@@ -32,7 +32,7 @@
 // +---------------------------------------------------------------------------+
 //
 
-include_once 'jsonwrapper/jsonwrapper.php';
+include_once 'jsonwrapper/jsonwrapper.php';/*noLibHook*/
 
 class FacebookRestClient {
   public $secret;
diff --git a/upload/ips_kernel/facebook-client/index.html b/upload/ips_kernel/facebook-client/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/facebook-client/index.html
+++ b/upload/ips_kernel/facebook-client/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/facebook-client/jsonwrapper/JSON/JSON.php b/upload/ips_kernel/facebook-client/jsonwrapper/JSON/JSON.php
index 0cddbddb..e8abffe6 100644
--- a/upload/ips_kernel/facebook-client/jsonwrapper/JSON/JSON.php
+++ b/upload/ips_kernel/facebook-client/jsonwrapper/JSON/JSON.php
@@ -51,7 +51,7 @@
  * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
  * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @version     CVS: $Id: JSON.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * @license     http://www.opensource.org/licenses/bsd-license.php
  * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
diff --git a/upload/ips_kernel/facebook-client/jsonwrapper/JSON/index.html b/upload/ips_kernel/facebook-client/jsonwrapper/JSON/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/facebook-client/jsonwrapper/JSON/index.html
+++ b/upload/ips_kernel/facebook-client/jsonwrapper/JSON/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/facebook-client/jsonwrapper/index.html b/upload/ips_kernel/facebook-client/jsonwrapper/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/facebook-client/jsonwrapper/index.html
+++ b/upload/ips_kernel/facebook-client/jsonwrapper/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper.php b/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper.php
index 29509deb..07559fd9 100644
--- a/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper.php
+++ b/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper.php
@@ -1,6 +1,5 @@
 <?php
 # In PHP 5.2 or higher we don't need to bring this in
 if (!function_exists('json_encode')) {
-	require_once 'jsonwrapper_inner.php';
+	require_once 'jsonwrapper_inner.php';/*noLibHook*/
 } 
-?>
diff --git a/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper_inner.php b/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper_inner.php
index 36a3f286..bf26b4d5 100644
--- a/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper_inner.php
+++ b/upload/ips_kernel/facebook-client/jsonwrapper/jsonwrapper_inner.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'JSON/JSON.php';
+require_once 'JSON/JSON.php';/*noLibHook*/
 
 function json_encode($arg)
 {
@@ -20,4 +20,3 @@ function json_decode($arg)
 	return $services_json->decode($arg);
 }
 
-?>
diff --git a/upload/ips_kernel/facebook/base_facebook.php b/upload/ips_kernel/facebook/base_facebook.php
new file mode 100644
index 00000000..63a50f4f
--- /dev/null
+++ b/upload/ips_kernel/facebook/base_facebook.php
@@ -0,0 +1,1119 @@
+<?php
+/**
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+if (!function_exists('json_decode')) {
+  throw new Exception('Facebook needs the JSON PHP extension.');
+}
+
+/**
+ * Thrown when an API call returns an exception.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+class FacebookApiException extends Exception
+{
+  /**
+   * The result from the API server that represents the exception information.
+   */
+  protected $result;
+
+  /**
+   * Make a new API Exception with the given result.
+   *
+   * @param Array $result the result from the API server
+   */
+  public function __construct($result) {
+    $this->result = $result;
+
+    $code = isset($result['error_code']) ? $result['error_code'] : 0;
+
+    if (isset($result['error_description'])) {
+      // OAuth 2.0 Draft 10 style
+      $msg = $result['error_description'];
+    } else if (isset($result['error']) && is_array($result['error'])) {
+      // OAuth 2.0 Draft 00 style
+      $msg = $result['error']['message'];
+    } else if (isset($result['error_msg'])) {
+      // Rest server style
+      $msg = $result['error_msg'];
+    } else {
+      $msg = 'Unknown Error. Check getResult()';
+    }
+
+    parent::__construct($msg, $code);
+  }
+
+  /**
+   * Return the associated result object returned by the API server.
+   *
+   * @returns Array the result from the API server
+   */
+  public function getResult() {
+    return $this->result;
+  }
+
+  /**
+   * Returns the associated type for the error. This will default to
+   * 'Exception' when a type is not available.
+   *
+   * @return String
+   */
+  public function getType() {
+    if (isset($this->result['error'])) {
+      $error = $this->result['error'];
+      if (is_string($error)) {
+        // OAuth 2.0 Draft 10 style
+        return $error;
+      } else if (is_array($error)) {
+        // OAuth 2.0 Draft 00 style
+        if (isset($error['type'])) {
+          return $error['type'];
+        }
+      }
+    }
+
+    return 'Exception';
+  }
+
+  /**
+   * To make debugging easier.
+   *
+   * @returns String the string representation of the error
+   */
+  public function __toString() {
+    $str = $this->getType() . ': ';
+    if ($this->code != 0) {
+      $str .= $this->code . ': ';
+    }
+    return $str . $this->message;
+  }
+}
+
+/**
+ * Provides access to the Facebook Platform.  This class provides
+ * a majority of the functionality needed, but the class is abstract
+ * because it is designed to be subclassed.  The subclass must
+ * implement the three abstract methods listed at the bottom of
+ * the file.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+abstract class BaseFacebook
+{
+  /**
+   * Version.
+   */
+  const VERSION = '3.0.1';
+
+  /**
+   * Default options for curl.
+   */
+  public static $CURL_OPTS = array(
+    CURLOPT_CONNECTTIMEOUT => 10,
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_TIMEOUT        => 60,
+    CURLOPT_USERAGENT      => 'facebook-php-3.0',
+    CURLOPT_SSL_VERIFYPEER	=> false, /* @link http://community.invisionpower.com/tracker/issue-32735-facebook-ssl-failure */
+  );
+
+  /**
+   * List of query parameters that get automatically dropped when rebuilding
+   * the current URL.
+   */
+  protected static $DROP_QUERY_PARAMS = array(
+    'code',
+    'state',
+    'signed_request',
+  );
+
+  /**
+   * Maps aliases to Facebook domains.
+   */
+  public static $DOMAIN_MAP = array(
+    'api'       => 'https://api.facebook.com/',
+    'api_video' => 'https://api-video.facebook.com/',
+    'api_read'  => 'https://api-read.facebook.com/',
+    'graph'     => 'https://graph.facebook.com/',
+    'www'       => 'https://www.facebook.com/',
+  );
+
+  /**
+   * The Application ID.
+   */
+  protected $appId;
+
+  /**
+   * The Application API Secret.
+   */
+  protected $apiSecret;
+
+  /**
+   * The ID of the Facebook user, or 0 if the user is logged out.
+   */
+  protected $user;
+
+  /**
+   * The data from the signed_request token.
+   */
+  protected $signedRequest;
+
+  /**
+   * A CSRF state variable to assist in the defense against
+   * CSRF attacks.
+   */
+  protected $state;
+
+  /**
+   * The OAuth access token received in exchange for a valid authorization
+   * code.  null means the access token has yet to be determined.
+   */
+  protected $accessToken = null;
+
+  /**
+   * Indicates if the CURL based @ syntax for file uploads is enabled.
+   */
+  protected $fileUploadSupport = false;
+
+  /**
+   * Initialize a Facebook Application.
+   *
+   * The configuration:
+   * - appId: the application ID
+   * - secret: the application secret
+   * - fileUpload: (optional) boolean indicating if file uploads are enabled
+   *
+   * @param Array $config the application configuration
+   */
+  public function __construct($config) {
+    $this->setAppId($config['appId']);
+    $this->setApiSecret($config['secret']);
+    if (isset($config['fileUpload'])) {
+      $this->setFileUploadSupport($config['fileUpload']);
+    }
+
+    $state = $this->getPersistentData('state');
+    if (!empty($state)) {
+      $this->state = $this->getPersistentData('state');
+    }
+  }
+
+  /**
+   * Set the Application ID.
+   *
+   * @param String $appId the Application ID
+   */
+  public function setAppId($appId) {
+    $this->appId = $appId;
+    return $this;
+  }
+
+  /**
+   * Get the Application ID.
+   *
+   * @return String the Application ID
+   */
+  public function getAppId() {
+    return $this->appId;
+  }
+
+  /**
+   * Set the API Secret.
+   *
+   * @param String $appId the API Secret
+   */
+  public function setApiSecret($apiSecret) {
+    $this->apiSecret = $apiSecret;
+    return $this;
+  }
+
+  /**
+   * Get the API Secret.
+   *
+   * @return String the API Secret
+   */
+  public function getApiSecret() {
+    return $this->apiSecret;
+  }
+
+  /**
+   * Set the file upload support status.
+   *
+   * @param Boolean the file upload support status.
+   */
+  public function setFileUploadSupport($fileUploadSupport) {
+    $this->fileUploadSupport = $fileUploadSupport;
+    return $this;
+  }
+
+  /**
+   * Get the file upload support status.
+   *
+   * @return Boolean true if and only if the server supports
+   * file upload.
+   */
+  public function useFileUploadSupport() {
+    return $this->fileUploadSupport;
+  }
+
+  /**
+   * Sets the access token for api calls.  Use this if you get
+   * your access token by other means and just want the SDK
+   * to use it.
+   *
+   * @param String $access_token an access token.
+   */
+  public function setAccessToken($access_token) {
+    $this->accessToken = $access_token;
+    return $this;
+  }
+
+  /**
+   * Determines the access token that should be used for API calls.
+   * The first time this is called, $this->accessToken is set equal
+   * to either a valid user access token, or it's set to the application
+   * access token if a valid user access token wasn't available.  Subsequent
+   * calls return whatever the first call returned.
+   *
+   * @return String the access token
+   */
+  public function getAccessToken() {
+    if ($this->accessToken !== null) {
+      // we've done this already and cached it.  Just return.
+      return $this->accessToken;
+    }
+
+    // first establish access token to be the application
+    // access token, in case we navigate to the /oauth/access_token
+    // endpoint, where SOME access token is required.
+    $this->setAccessToken($this->getApplicationAccessToken());
+    if ($user_access_token = $this->getUserAccessToken()) {
+      $this->setAccessToken($user_access_token);
+    }
+
+    return $this->accessToken;
+  }
+
+  /**
+   * Determines and returns the user access token, first using
+   * the signed request if present, and then falling back on
+   * the authorization code if present.  The intent is to
+   * return a valid user access token, or false if one is determined
+   * to not be available.
+   *
+   * @return String a valid user access token, or false if one
+   *         could not be determined.
+   */
+  protected function getUserAccessToken() {
+    // first, consider a signed request if it's supplied.
+    // if there is a signed request, then it alone determines
+    // the access token.
+    $signed_request = $this->getSignedRequest();
+    if ($signed_request) {
+      if (array_key_exists('oauth_token', $signed_request)) {
+        $access_token = $signed_request['oauth_token'];
+        $this->setPersistentData('access_token', $access_token);
+        return $access_token;
+      }
+
+      // signed request states there's no access token, so anything
+      // stored should be cleared.
+      $this->clearAllPersistentData();
+      return false; // respect the signed request's data, even
+                    // if there's an authorization code or something else
+    }
+
+    $code = $this->getCode();
+    if ($code && $code != $this->getPersistentData('code')) {
+      $access_token = $this->getAccessTokenFromCode($code);
+      if ($access_token) {
+        $this->setPersistentData('code', $code);
+        $this->setPersistentData('access_token', $access_token);
+        return $access_token;
+      }
+
+      // code was bogus, so everything based on it should be invalidated.
+      $this->clearAllPersistentData();
+      return false;
+    }
+
+    // as a fallback, just return whatever is in the persistent
+    // store, knowing nothing explicit (signed request, authorization
+    // code, etc.) was present to shadow it (or we saw a code in $_REQUEST,
+    // but it's the same as what's in the persistent store)
+    return $this->getPersistentData('access_token');
+  }
+
+  /**
+   * Get the data from a signed_request token.
+   *
+   * @return String the base domain
+   */
+  public function getSignedRequest() {
+    if (!$this->signedRequest) {
+      if (isset($_REQUEST['signed_request'])) {
+        $this->signedRequest = $this->parseSignedRequest(
+          $_REQUEST['signed_request']);
+      }
+    }
+    return $this->signedRequest;
+  }
+
+  /**
+   * Get the UID of the connected user, or 0
+   * if the Facebook user is not connected.
+   *
+   * @return String the UID if available.
+   */
+  public function getUser() {
+    if ($this->user !== null) {
+      // we've already determined this and cached the value.
+      return $this->user;
+    }
+
+    return $this->user = $this->getUserFromAvailableData();
+  }
+
+  /**
+   * Determines the connected user by first examining any signed
+   * requests, then considering an authorization code, and then
+   * falling back to any persistent store storing the user.
+   *
+   * @return Integer the id of the connected Facebook user, or 0
+   * if no such user exists.
+   */
+  protected function getUserFromAvailableData() {
+    // if a signed request is supplied, then it solely determines
+    // who the user is.
+    $signed_request = $this->getSignedRequest();
+    if ($signed_request) {
+      if (array_key_exists('user_id', $signed_request)) {
+        $user = $signed_request['user_id'];
+        $this->setPersistentData('user_id', $signed_request['user_id']);
+        return $user;
+      }
+
+      // if the signed request didn't present a user id, then invalidate
+      // all entries in any persistent store.
+      $this->clearAllPersistentData();
+      return 0;
+    }
+
+    $user = $this->getPersistentData('user_id', $default = 0);
+    $persisted_access_token = $this->getPersistentData('access_token');
+
+    // use access_token to fetch user id if we have a user access_token, or if
+    // the cached access token has changed.
+    $access_token = $this->getAccessToken();
+    if ($access_token &&
+        $access_token != $this->getApplicationAccessToken() &&
+        !($user && $persisted_access_token == $access_token)) {
+      $user = $this->getUserFromAccessToken();
+      if ($user) {
+        $this->setPersistentData('user_id', $user);
+      } else {
+        $this->clearAllPersistentData();
+      }
+    }
+
+    return $user;
+  }
+
+  /**
+   * Get a Login URL for use with redirects. By default, full page redirect is
+   * assumed. If you are using the generated URL with a window.open() call in
+   * JavaScript, you can pass in display=popup as part of the $params.
+   *
+   * The parameters:
+   * - redirect_uri: the url to go to after a successful login
+   * - scope: comma separated list of requested extended perms
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the login flow
+   */
+  public function getLoginUrl($params=array()) {
+    $this->establishCSRFTokenState();
+    $currentUrl = $this->getCurrentUrl();
+    return $this->getUrl(
+      'www',
+      'dialog/oauth',
+      array_merge(array(
+                    'client_id' => $this->getAppId(),
+                    'redirect_uri' => $currentUrl, // possibly overwritten
+                    'state' => $this->state),
+                  $params));
+  }
+
+  /**
+   * Get a Logout URL suitable for use with redirects.
+   *
+   * The parameters:
+   * - next: the url to go to after a successful logout
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the logout flow
+   */
+  public function getLogoutUrl($params=array()) {
+    return $this->getUrl(
+      'www',
+      'logout.php',
+      array_merge(array(
+        'next' => $this->getCurrentUrl(),
+        'access_token' => $this->getAccessToken(),
+      ), $params)
+    );
+  }
+
+  /**
+   * Get a login status URL to fetch the status from Facebook.
+   *
+   * The parameters:
+   * - ok_session: the URL to go to if a session is found
+   * - no_session: the URL to go to if the user is not connected
+   * - no_user: the URL to go to if the user is not signed into facebook
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the logout flow
+   */
+  public function getLoginStatusUrl($params=array()) {
+    return $this->getUrl(
+      'www',
+      'extern/login_status.php',
+      array_merge(array(
+        'api_key' => $this->getAppId(),
+        'no_session' => $this->getCurrentUrl(),
+        'no_user' => $this->getCurrentUrl(),
+        'ok_session' => $this->getCurrentUrl(),
+        'session_version' => 3,
+      ), $params)
+    );
+  }
+
+  /**
+   * Make an API call.
+   *
+   * @param Array $params the API call parameters
+   * @return the decoded response
+   */
+  public function api(/* polymorphic */) {
+    $args = func_get_args();
+    if (is_array($args[0])) {
+      return $this->_restserver($args[0]);
+    } else {
+      return call_user_func_array(array($this, '_graph'), $args);
+    }
+  }
+
+  /**
+   * Get the authorization code from the query parameters, if it exists,
+   * and otherwise return false to signal no authorization code was
+   * discoverable.
+   *
+   * @return mixed the authorization code, or false if the authorization
+   * code could not be determined.
+   */
+  protected function getCode() {
+    if (isset($_REQUEST['code'])) {
+      if ($this->state !== null &&
+          isset($_REQUEST['state']) &&
+          $this->state === $_REQUEST['state']) {
+
+        // CSRF state has done its job, so clear it
+        $this->state = null;
+        $this->clearPersistentData('state');
+        return $_REQUEST['code'];
+      } else {
+        self::errorLog('CSRF state token does not match one provided.');
+        return false;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Retrieves the UID with the understanding that
+   * $this->accessToken has already been set and is
+   * seemingly legitimate.  It relies on Facebook's Graph API
+   * to retreive user information and then extract
+   * the user ID.
+   *
+   * @return Integer returns the UID of the Facebook user, or
+   * 0 if the Facebook user could not be determined.
+   */
+  protected function getUserFromAccessToken() {
+    try {
+      $user_info = $this->api('/me');
+      return $user_info['id'];
+    } catch (FacebookApiException $e) {
+      return 0;
+    }
+  }
+
+  /**
+   * Returns the access token that should be used for logged out
+   * users when no authorization code is available.
+   *
+   * @return String the application access token, useful for
+   * gathering public information about users and applications.
+   */
+  protected function getApplicationAccessToken() {
+    return $this->appId.'|'.$this->apiSecret;
+  }
+
+  /**
+   * Lays down a CSRF state token for this process.
+   *
+   * @return void
+   */
+  protected function establishCSRFTokenState() {
+    if ($this->state === null) {
+      $this->state = md5(uniqid(mt_rand(), true));
+      $this->setPersistentData('state', $this->state);
+    }
+  }
+
+  /**
+   * Retreives an access token for the given authorization code
+   * (previously generated from www.facebook.com on behalf of
+   * a specific user).  The authorization code is sent to graph.facebook.com
+   * and a legitimate access token is generated provided the access token
+   * and the user for which it was generated all match, and the user is
+   * either logged in to Facebook or has granted an offline access permission.
+   *
+   * @param String $code an authorization code.
+   * @return mixed an access token exchanged for the authorization code, or
+   * false if an access token could not be generated.
+   */
+  protected function getAccessTokenFromCode($code) {
+    if (empty($code)) {
+      return false;
+    }
+
+    try {
+      // need to circumvent json_decode by calling _oauthRequest
+      // directly, since response isn't JSON format.
+      $access_token_response =
+        $this->_oauthRequest(
+          $this->getUrl('graph', '/oauth/access_token'),
+          $params = array('client_id' => $this->getAppId(),
+                          'client_secret' => $this->getApiSecret(),
+                          'redirect_uri' => $this->getCurrentUrl(),
+                          'code' => $code));
+    } catch (FacebookApiException $e) {
+      // most likely that user very recently revoked authorization.
+      // In any event, we don't have an access token, so say so.
+      return false;
+    }
+
+    if (empty($access_token_response)) {
+      return false;
+    }
+
+    $response_params = array();
+    parse_str($access_token_response, $response_params);
+    if (!isset($response_params['access_token'])) {
+      return false;
+    }
+
+    return $response_params['access_token'];
+  }
+
+  /**
+   * Invoke the old restserver.php endpoint.
+   *
+   * @param Array $params method call object
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _restserver($params) {
+    // generic application level parameters
+    $params['api_key'] = $this->getAppId();
+    $params['format'] = 'json-strings';
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getApiUrl($params['method']),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error_code'])) {
+      throw new FacebookApiException($result);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Invoke the Graph API.
+   *
+   * @param String $path the path (required)
+   * @param String $method the http method (default 'GET')
+   * @param Array $params the query/post data
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _graph($path, $method = 'GET', $params = array()) {
+    if (is_array($method) && empty($params)) {
+      $params = $method;
+      $method = 'GET';
+    }
+    $params['method'] = $method; // method override as we always do a POST
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getUrl('graph', $path),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error'])) {
+      $this->throwAPIException($result);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Make a OAuth Request.
+   *
+   * @param String $path the path (required)
+   * @param Array $params the query/post data
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _oauthRequest($url, $params) {
+    if (!isset($params['access_token'])) {
+      $params['access_token'] = $this->getAccessToken();
+    }
+
+    // json_encode all params values that are not strings
+    foreach ($params as $key => $value) {
+      if (!is_string($value)) {
+        $params[$key] = json_encode($value);
+      }
+    }
+
+    return $this->makeRequest($url, $params);
+  }
+
+  /**
+   * Makes an HTTP request. This method can be overriden by subclasses if
+   * developers want to do fancier things or use something other than curl to
+   * make the request.
+   *
+   * @param String $url the URL to make the request to
+   * @param Array $params the parameters to use for the POST body
+   * @param CurlHandler $ch optional initialized curl handle
+   * @return String the response text
+   */
+  protected function makeRequest($url, $params, $ch=null) {
+    if ( function_exists( 'curl_init' ) AND function_exists("curl_exec") AND function_exists('curl_setopt_array') )
+	{
+	    if (!$ch) {
+	      $ch = curl_init();
+	    }
+	
+	    $opts = self::$CURL_OPTS;
+	    if ($this->useFileUploadSupport()) {
+	      $opts[CURLOPT_POSTFIELDS] = $params;
+	    } else {
+	      $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
+	    }
+	    $opts[CURLOPT_URL] = $url;
+	
+	    // disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
+	    // for 2 seconds if the server does not support this header.
+	    if (isset($opts[CURLOPT_HTTPHEADER])) {
+	      $existing_headers = $opts[CURLOPT_HTTPHEADER];
+	      $existing_headers[] = 'Expect:';
+	      $opts[CURLOPT_HTTPHEADER] = $existing_headers;
+	    } else {
+	      $opts[CURLOPT_HTTPHEADER] = array('Expect:');
+	    }
+	
+	    curl_setopt_array($ch, $opts);
+	    $result = curl_exec($ch);
+	
+	    if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
+	      self::errorLog('Invalid or no certificate authority found, '.
+	                     'using bundled information');
+	      curl_setopt($ch, CURLOPT_CAINFO,
+	                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
+	      $result = curl_exec($ch);
+	    }
+		// name lookup timed out / DNS issues
+		else if ( curl_errno( $ch ) == 6 )
+		{ 
+			$url_parts  = @parse_url($url);
+			$ip         = @gethostbyname( $url_parts['host'] );
+			
+			if ( $ip and preg_match( "#^\d{1,3}\.#", $ip ) )
+			{
+				// Turn of verify SSL as the IP will not match domain of cert
+				curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+				curl_setopt($ch, CURLOPT_URL, $url_parts['scheme'] . '://' . $ip . '/' . $url_parts['path'] );
+				$result = curl_exec($ch);
+			}
+		}
+
+	    if ($result === false) {
+	      $e = new FacebookApiException(array(
+	        'error_code' => curl_errno($ch),
+	        'error' => array(
+	        'message' => curl_error($ch),
+	        'type' => 'CurlException',
+	        ),
+	      ));
+	      curl_close($ch);
+	      throw $e;
+	    }
+	    curl_close($ch);
+	    return $result;
+	}
+	else
+	{
+		$url_parts  = @parse_url($url);
+		$postfields = http_build_query( $params );
+		
+		if ( ! $postfields )
+		{
+			$postfields = $url_parts['query'];
+		}
+		
+		$postfields = str_replace( '&amp;', '&', $postfields );
+		
+		/* Use SSL rather than https */
+		$url_parts['scheme'] = ( $url_parts['scheme'] == 'https' ) ? 'ssl' : $url_parts['scheme'];
+		
+		$host = $url_parts['scheme'] . '://' . $url_parts['host'];
+	 	$port = ( isset($url_parts['port']) ) ? $url_parts['port'] : ( $url_parts['scheme'] == 'https' || $url_parts['scheme'] == 'ssl' ? 443 : 80 );
+	 	
+	 	if ( !empty( $url_parts["path"] ) )
+		{
+			$path = $url_parts["path"];
+		}
+		else
+		{
+			$path = "/";
+		}
+		
+		$header  = "POST {$path} HTTP/1.0\r\n";
+		$header .= "Host: " . str_replace( array( 'http://', 'https://', 'ssl://' ), '', $host ) . "\r\n";
+		$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+		$header .= "Content-Length: " . strlen($postfields) . "\r\n\r\n";
+		
+		if ( $fp = fsockopen( $host, $port, $errno, $errstr, 60 ) )
+		{
+			socket_set_timeout($fp, 60);
+			
+			fwrite($fp, $header . $postfields);
+			
+			while( ! feof($fp) && ! $status['timed_out'] )		
+			{
+		  		$data .= fgets ($fp,8192);
+		  		$status  = stream_get_meta_data($fp);
+			}
+			
+			fclose($fp);
+	 	}		
+		
+		/* Strip headers HTTP/1.1 ### ABCD */
+		$httpCode     = substr( $data, 9, 3 );
+		$lastApiCall = $url;
+		
+		/* Chuncked? */
+		
+		$_chunked	= false;
+		
+		if( preg_match( "/Transfer\-Encoding:\s*chunked/i", $data ) )
+		{
+			$_chunked	= true;
+		}
+		
+		$tmp	= explode("\r\n\r\n", $data, 2);
+		$data	= trim($tmp[1]);
+		
+		if ( $_chunked )
+		{
+			$lines	= explode( "\n", $data );
+			array_pop($lines);
+			array_shift($lines);
+			$data	= implode( "\n", $lines );
+		}
+		
+		return $data;
+	}
+  }
+
+  /**
+   * Parses a signed_request and validates the signature.
+   *
+   * @param String A signed token
+   * @return Array the payload inside it or null if the sig is wrong
+   */
+  protected function parseSignedRequest($signed_request) {
+    list($encoded_sig, $payload) = explode('.', $signed_request, 2);
+
+    // decode the data
+    $sig = self::base64UrlDecode($encoded_sig);
+    $data = json_decode(self::base64UrlDecode($payload), true);
+
+    if (strtoupper($data['algorithm']) !== 'HMAC-SHA256') {
+      self::errorLog('Unknown algorithm. Expected HMAC-SHA256');
+      return null;
+    }
+
+    // check sig
+    $expected_sig = hash_hmac('sha256', $payload,
+                              $this->getApiSecret(), $raw = true);
+    if ($sig !== $expected_sig) {
+      self::errorLog('Bad Signed JSON signature!');
+      return null;
+    }
+
+    return $data;
+  }
+
+  /**
+   * Build the URL for api given parameters.
+   *
+   * @param $method String the method name.
+   * @return String the URL for the given parameters
+   */
+  protected function getApiUrl($method) {
+    static $READ_ONLY_CALLS =
+      array('admin.getallocation' => 1,
+            'admin.getappproperties' => 1,
+            'admin.getbannedusers' => 1,
+            'admin.getlivestreamvialink' => 1,
+            'admin.getmetrics' => 1,
+            'admin.getrestrictioninfo' => 1,
+            'application.getpublicinfo' => 1,
+            'auth.getapppublickey' => 1,
+            'auth.getsession' => 1,
+            'auth.getsignedpublicsessiondata' => 1,
+            'comments.get' => 1,
+            'connect.getunconnectedfriendscount' => 1,
+            'dashboard.getactivity' => 1,
+            'dashboard.getcount' => 1,
+            'dashboard.getglobalnews' => 1,
+            'dashboard.getnews' => 1,
+            'dashboard.multigetcount' => 1,
+            'dashboard.multigetnews' => 1,
+            'data.getcookies' => 1,
+            'events.get' => 1,
+            'events.getmembers' => 1,
+            'fbml.getcustomtags' => 1,
+            'feed.getappfriendstories' => 1,
+            'feed.getregisteredtemplatebundlebyid' => 1,
+            'feed.getregisteredtemplatebundles' => 1,
+            'fql.multiquery' => 1,
+            'fql.query' => 1,
+            'friends.arefriends' => 1,
+            'friends.get' => 1,
+            'friends.getappusers' => 1,
+            'friends.getlists' => 1,
+            'friends.getmutualfriends' => 1,
+            'gifts.get' => 1,
+            'groups.get' => 1,
+            'groups.getmembers' => 1,
+            'intl.gettranslations' => 1,
+            'links.get' => 1,
+            'notes.get' => 1,
+            'notifications.get' => 1,
+            'pages.getinfo' => 1,
+            'pages.isadmin' => 1,
+            'pages.isappadded' => 1,
+            'pages.isfan' => 1,
+            'permissions.checkavailableapiaccess' => 1,
+            'permissions.checkgrantedapiaccess' => 1,
+            'photos.get' => 1,
+            'photos.getalbums' => 1,
+            'photos.gettags' => 1,
+            'profile.getinfo' => 1,
+            'profile.getinfooptions' => 1,
+            'stream.get' => 1,
+            'stream.getcomments' => 1,
+            'stream.getfilters' => 1,
+            'users.getinfo' => 1,
+            'users.getloggedinuser' => 1,
+            'users.getstandardinfo' => 1,
+            'users.hasapppermission' => 1,
+            'users.isappuser' => 1,
+            'users.isverified' => 1,
+            'video.getuploadlimits' => 1);
+    $name = 'api';
+    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
+      $name = 'api_read';
+    } else if (strtolower($method) == 'video.upload') {
+      $name = 'api_video';
+    }
+    return self::getUrl($name, 'restserver.php');
+  }
+
+  /**
+   * Build the URL for given domain alias, path and parameters.
+   *
+   * @param $name String the name of the domain
+   * @param $path String optional path (without a leading slash)
+   * @param $params Array optional query parameters
+   * @return String the URL for the given parameters
+   */
+  protected function getUrl($name, $path='', $params=array()) {
+    $url = self::$DOMAIN_MAP[$name];
+    if ($path) {
+      if ($path[0] === '/') {
+        $path = substr($path, 1);
+      }
+      $url .= $path;
+    }
+    if ($params) {
+      $url .= '?' . http_build_query($params, null, '&');
+    }
+
+    return $url;
+  }
+
+  /**
+   * Returns the Current URL, stripping it of known FB parameters that should
+   * not persist.
+   *
+   * @return String the current URL
+   */
+  protected function getCurrentUrl() {
+    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'
+      ? 'https://'
+      : 'http://';
+    $currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $parts = parse_url($currentUrl);
+
+    $query = '';
+    if (!empty($parts['query'])) {
+      // drop known fb params
+      $params = explode('&', $parts['query']);
+      $retained_params = array();
+      foreach ($params as $param) {
+        if ($this->shouldRetainParam($param)) {
+          $retained_params[] = $param;
+        }
+      }
+
+      if (!empty($retained_params)) {
+        $query = '?'.implode($retained_params, '&');
+      }
+    }
+
+    // use port if non default
+    $port =
+      isset($parts['port']) &&
+      (($protocol === 'http://' && $parts['port'] !== 80) ||
+       ($protocol === 'https://' && $parts['port'] !== 443))
+      ? ':' . $parts['port'] : '';
+
+    // rebuild
+    
+    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+  }
+
+  /**
+   * Returns true if and only if the key or key/value pair should
+   * be retained as part of the query string.  This amounts to
+   * a brute-force search of the very small list of Facebook-specific
+   * params that should be stripped out.
+   *
+   * @param String a key or key/value pair within a URL's query (e.g.
+   *        'foo=a', 'foo=', or 'foo'.
+   */
+  protected function shouldRetainParam($param) {
+    foreach (self::$DROP_QUERY_PARAMS as $drop_query_param) {
+      if (strpos($param, $drop_query_param.'=') === 0) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Analyzes the supplied result to see if it was thrown
+   * because the access token is no longer valid.  If that is
+   * the case, then the persistent store is cleared.
+   *
+   * @param $result a record storing the error message returned
+   *        by a failed API call.
+   */
+  protected function throwAPIException($result) {
+    $e = new FacebookApiException($result);
+    switch ($e->getType()) {
+      // OAuth 2.0 Draft 00 style
+      case 'OAuthException':
+        // OAuth 2.0 Draft 10 style
+      case 'invalid_token':
+        $message = $e->getMessage();
+      if ((strpos($message, 'Error validating access token') !== false) ||
+          (strpos($message, 'Invalid OAuth access token') !== false)) {
+        $this->setAccessToken(null);
+        $this->user = 0;
+        $this->clearAllPersistentData();
+      }
+    }
+
+    throw $e;
+  }
+
+
+  /**
+   * Prints to the error log if you aren't in command line mode.
+   *
+   * @param String log message
+   */
+  protected static function errorLog($msg) {
+    // disable error log if we are running in a CLI environment
+    // @codeCoverageIgnoreStart
+    if (php_sapi_name() != 'cli') {
+      error_log($msg);
+    }
+    // uncomment this if you want to see the errors on the page
+    // print 'error_log: '.$msg."\n";
+    // @codeCoverageIgnoreEnd
+  }
+
+  /**
+   * Base64 encoding that doesn't need to be urlencode()ed.
+   * Exactly the same as base64_encode except it uses
+   *   - instead of +
+   *   _ instead of /
+   *
+   * @param String base64UrlEncodeded string
+   */
+  protected static function base64UrlDecode($input) {
+    return base64_decode(strtr($input, '-_', '+/'));
+  }
+
+  /**
+   * Each of the following four methods should be overridden in
+   * a concrete subclass, as they are in the provided Facebook class.
+   * The Facebook class uses PHP sessions to provide a primitive
+   * persistent store, but another subclass--one that you implement--
+   * might use a database, memcache, or an in-memory cache.
+   *
+   * @see Facebook
+   */
+  abstract protected function setPersistentData($key, $value);
+  abstract protected function getPersistentData($key, $default = false);
+  abstract protected function clearPersistentData($key);
+  abstract protected function clearAllPersistentData();
+}
diff --git a/upload/ips_kernel/facebook/facebook.php b/upload/ips_kernel/facebook/facebook.php
index 31c056f5..8ba3139f 100644
--- a/upload/ips_kernel/facebook/facebook.php
+++ b/upload/ips_kernel/facebook/facebook.php
@@ -1,887 +1,93 @@
 <?php
-
 /**
- * Patches (Matt Mecham - Invision Power Services - mmecham@invisionpower.com - May 2010)
- * - added verify peer for IIS/Windows CURL
- * - added non-curl fall back method in makeRequest
- */
-
-if (!function_exists('json_decode')) {
-  throw new Exception('Facebook needs the JSON PHP extension.');
-}
-
-/**
- * Thrown when an API call returns an exception.
+ * Copyright 2011 Facebook, Inc.
  *
- * @author Naitik Shah <naitik@facebook.com>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  */
-class FacebookApiException extends Exception
+
+require_once "base_facebook.php";/*noLibHook*/
+
+/**
+ * Extends the BaseFacebook class with the intent of using
+ * PHP sessions to store user ids and access tokens.
+ */
+class Facebook extends BaseFacebook
 {
   /**
-   * The result from the API server that represents the exception information.
-   */
-  protected $result;
-
-  /**
-   * Make a new API Exception with the given result.
+   * Identical to the parent constructor, except that
+   * we start a PHP session to store the user ID and
+   * access token if during the course of execution
+   * we discover them.
    *
-   * @param Array $result the result from the API server
-   */
-  public function __construct($result) {
-    $this->result = $result;
-
-    $code = isset($result['error_code']) ? $result['error_code'] : 0;
-    $msg  = isset($result['error'])
-              ? $result['error']['message'] : $result['error_msg'];
-    parent::__construct($msg, $code);
-  }
-
-  /**
-   * Return the associated result object returned by the API server.
-   *
-   * @returns Array the result from the API server
-   */
-  public function getResult() {
-    return $this->result;
-  }
-
-  /**
-   * Returns the associated type for the error. This will default to
-   * 'Exception' when a type is not available.
-   *
-   * @return String
-   */
-  public function getType() {
-    return
-      isset($this->result['error']) && isset($this->result['error']['type'])
-      ? $this->result['error']['type']
-      : 'Exception';
-  }
-
-  /**
-   * To make debugging easier.
-   *
-   * @returns String the string representation of the error
-   */
-  public function __toString() {
-    $str = $this->getType() . ': ';
-    if ($this->code != 0) {
-      $str .= $this->code . ': ';
-    }
-    return $str . $this->message;
-  }
-}
-
-/**
- * Provides access to the Facebook Platform.
- *
- * @author Naitik Shah <naitik@facebook.com>
- */
-class Facebook
-{
-  /**
-   * Version.
-   */
-  const VERSION = '2.0.3';
-
-  /**
-   * Default options for curl.
-   */
-  public static $CURL_OPTS = array(
-    CURLOPT_CONNECTTIMEOUT => 10,
-    CURLOPT_RETURNTRANSFER => true,
-    CURLOPT_TIMEOUT        => 60,
-    CURLOPT_USERAGENT      => 'facebook-php-2.0',
-  );
-
-  /**
-   * List of query parameters that get automatically dropped when rebuilding
-   * the current URL.
-   */
-  protected static $DROP_QUERY_PARAMS = array(
-    'session',
-  );
-
-  /**
-   * Maps aliases to Facebook domains.
-   */
-  public static $DOMAIN_MAP = array(
-    'api'      => 'https://api.facebook.com/',
-    'api_read' => 'https://api-read.facebook.com/',
-    'graph'    => 'https://graph.facebook.com/',
-    'www'      => 'https://www.facebook.com/',
-  );
-
-  /**
-   * The Application ID.
-   */
-  protected $appId;
-
-  /**
-   * The Application API Secret.
-   */
-  protected $apiSecret;
-
-  /**
-   * The active user session, if one is available.
-   */
-  protected $session;
-
-  /**
-   * Indicates that we already loaded the session as best as we could.
-   */
-  protected $sessionLoaded = false;
-
-  /**
-   * Indicates if Cookie support should be enabled.
-   */
-  protected $cookieSupport = false;
-
-  /**
-   * Base domain for the Cookie.
-   */
-  protected $baseDomain = '';
-
-  /**
-   * Initialize a Facebook Application.
-   *
-   * The configuration:
-   * - appId: the application ID
-   * - secret: the application secret
-   * - cookie: (optional) boolean true to enable cookie support
-   * - domain: (optional) domain for the cookie
-   *
-   * @param Array $config the application configuration
+   * @param Array $config the application configuration.
+   * @see BaseFacebook::__construct in facebook.php
    */
   public function __construct($config) {
-    $this->setAppId($config['appId']);
-    $this->setApiSecret($config['secret']);
-    if (isset($config['cookie'])) {
-      $this->setCookieSupport($config['cookie']);
-    }
-    if (isset($config['domain'])) {
-      $this->setBaseDomain($config['domain']);
+    if (!session_id()) {
+      session_start();
     }
+    parent::__construct($config);
   }
 
-  /**
-   * Set the Application ID.
-   *
-   * @param String $appId the Application ID
-   */
-  public function setAppId($appId) {
-    $this->appId = $appId;
-    return $this;
-  }
+  protected static $kSupportedKeys =
+    array('state', 'code', 'access_token', 'user_id');
 
   /**
-   * Get the Application ID.
-   *
-   * @return String the Application ID
+   * Provides the implementations of the inherited abstract
+   * methods.  The implementation uses PHP sessions to maintain
+   * a store for authorization codes, user ids, CSRF states, and
+   * access tokens.
    */
-  public function getAppId() {
-    return $this->appId;
-  }
-
-  /**
-   * Set the API Secret.
-   *
-   * @param String $appId the API Secret
-   */
-  public function setApiSecret($apiSecret) {
-    $this->apiSecret = $apiSecret;
-    return $this;
-  }
-
-  /**
-   * Get the API Secret.
-   *
-   * @return String the API Secret
-   */
-  public function getApiSecret() {
-    return $this->apiSecret;
-  }
-
-  /**
-   * Set the Cookie Support status.
-   *
-   * @param Boolean $cookieSupport the Cookie Support status
-   */
-  public function setCookieSupport($cookieSupport) {
-    $this->cookieSupport = $cookieSupport;
-    return $this;
-  }
-
-  /**
-   * Get the Cookie Support status.
-   *
-   * @return Boolean the Cookie Support status
-   */
-  public function useCookieSupport() {
-    return $this->cookieSupport;
-  }
-
-  /**
-   * Set the base domain for the Cookie.
-   *
-   * @param String $domain the base domain
-   */
-  public function setBaseDomain($domain) {
-    $this->baseDomain = $domain;
-    return $this;
-  }
-
-  /**
-   * Get the base domain for the Cookie.
-   *
-   * @return String the base domain
-   */
-  public function getBaseDomain() {
-    return $this->baseDomain;
-  }
-
-  /**
-   * Set the Session.
-   *
-   * @param Array $session the session
-   * @param Boolean $write_cookie indicate if a cookie should be written. this
-   * value is ignored if cookie support has been disabled.
-   */
-  public function setSession($session=null, $write_cookie=true) {
-    $session = $this->validateSessionObject($session);
-    $this->sessionLoaded = true;
-    $this->session = $session;
-    if ($write_cookie) {
-      $this->setCookieFromSession($session);
-    }
-    return $this;
-  }
-
-  /**
-   * Get the session object. This will automatically look for a signed session
-   * sent via the Cookie or Query Parameters if needed.
-   *
-   * @return Array the session
-   */
-  public function getSession() {
-    if (!$this->sessionLoaded) {
-      $session = null;
-      $write_cookie = true;
-
-      // try loading session from $_REQUEST
-      if (isset($_REQUEST['session'])) {
-        $session = json_decode(
-          get_magic_quotes_gpc()
-            ? stripslashes($_REQUEST['session'])
-            : $_REQUEST['session'],
-          true
-        );
-        $session = $this->validateSessionObject($session);
-      }
-
-      // try loading session from cookie if necessary
-      if (!$session && $this->useCookieSupport()) {
-        $cookieName = $this->getSessionCookieName();
-        if (isset($_COOKIE[$cookieName])) {
-          $session = array();
-          parse_str(trim(
-            get_magic_quotes_gpc()
-              ? stripslashes($_COOKIE[$cookieName])
-              : $_COOKIE[$cookieName],
-            '"'
-          ), $session);
-          $session = $this->validateSessionObject($session);
-          // write only if we need to delete a invalid session cookie
-          $write_cookie = empty($session);
-        }
-      }
-
-      $this->setSession($session, $write_cookie);
-    }
-
-    return $this->session;
-  }
-
-  /**
-   * Get the UID from the session.
-   *
-   * @return String the UID if available
-   */
-  public function getUser() {
-    $session = $this->getSession();
-    return $session ? $session['uid'] : null;
-  }
-
-  /**
-   * Get a Login URL for use with redirects. By default, full page redirect is
-   * assumed. If you are using the generated URL with a window.open() call in
-   * JavaScript, you can pass in display=popup as part of the $params.
-   *
-   * The parameters:
-   * - next: the url to go to after a successful login
-   * - cancel_url: the url to go to after the user cancels
-   * - req_perms: comma separated list of requested extended perms
-   * - display: can be "page" (default, full page) or "popup"
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the login flow
-   */
-  public function getLoginUrl($params=array()) {
-    $currentUrl = $this->getCurrentUrl();
-    return $this->getUrl(
-      'www',
-      'login.php',
-      array_merge(array(
-        'api_key'         => $this->getAppId(),
-        'cancel_url'      => $currentUrl,
-        'display'         => 'page',
-        'fbconnect'       => 1,
-        'next'            => $currentUrl,
-        'return_session'  => 1,
-        'session_version' => 3,
-        'v'               => '1.0',
-      ), $params)
-    );
-  }
-
-  /**
-   * Get a Logout URL suitable for use with redirects.
-   *
-   * The parameters:
-   * - next: the url to go to after a successful logout
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the logout flow
-   */
-  public function getLogoutUrl($params=array()) {
-    $session = $this->getSession();
-    return $this->getUrl(
-      'www',
-      'logout.php',
-      array_merge(array(
-        'api_key'     => $this->getAppId(),
-        'next'        => $this->getCurrentUrl(),
-        'session_key' => $session['session_key'],
-      ), $params)
-    );
-  }
-
-  /**
-   * Get a login status URL to fetch the status from facebook.
-   *
-   * The parameters:
-   * - ok_session: the URL to go to if a session is found
-   * - no_session: the URL to go to if the user is not connected
-   * - no_user: the URL to go to if the user is not signed into facebook
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the logout flow
-   */
-  public function getLoginStatusUrl($params=array()) {
-    return $this->getUrl(
-      'www',
-      'extern/login_status.php',
-      array_merge(array(
-        'api_key'         => $this->getAppId(),
-        'no_session'      => $this->getCurrentUrl(),
-        'no_user'         => $this->getCurrentUrl(),
-        'ok_session'      => $this->getCurrentUrl(),
-        'session_version' => 3,
-      ), $params)
-    );
-  }
-
-  /**
-   * Make an API call.
-   *
-   * @param Array $params the API call parameters
-   * @return the decoded response
-   */
-  public function api(/* polymorphic */) {
-    $args = func_get_args();
-    if (is_array($args[0])) {
-      return $this->_restserver($args[0]);
-    } else {
-      return call_user_func_array(array($this, '_graph'), $args);
-    }
-  }
-
-  /**
-   * Invoke the old restserver.php endpoint.
-   *
-   * @param Array $params method call object
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _restserver($params) {
-    // generic application level parameters
-    $params['api_key'] = $this->getAppId();
-    $params['format'] = 'json-strings';
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getApiUrl($params['method']),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error_code'])) {
-      throw new FacebookApiException($result);
-    }
-    return $result;
-  }
-
-  /**
-   * Invoke the Graph API.
-   *
-   * @param String $path the path (required)
-   * @param String $method the http method (default 'GET')
-   * @param Array $params the query/post data
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _graph($path, $method='GET', $params=array()) {
-    if (is_array($method) && empty($params)) {
-      $params = $method;
-      $method = 'GET';
-    }
-    $params['method'] = $method; // method override as we always do a POST
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getUrl('graph', $path),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error'])) {
-      $e = new FacebookApiException($result);
-      if ($e->getType() === 'OAuthException') {
-        $this->setSession(null);
-      }
-      throw $e;
-    }
-    return $result;
-  }
-
-  /**
-   * Make a OAuth Request
-   *
-   * @param String $path the path (required)
-   * @param Array $params the query/post data
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _oauthRequest($url, $params) {
-    if (!isset($params['access_token'])) {
-      $session = $this->getSession();
-      // either user session signed, or app signed
-      if ($session) {
-        $params['access_token'] = $session['access_token'];
-      } else {
-        $params['access_token'] = $this->getAppId() .'|'. $this->getApiSecret();
-      }
-    }
-
-    // json_encode all params values that are not strings
-    foreach ($params as $key => $value) {
-      if (!is_string($value)) {
-        $params[$key] = json_encode($value);
-      }
-    }
-    return $this->makeRequest($url, $params);
-  }
-
-  /**
-   * Makes an HTTP request. This method can be overriden by subclasses if
-   * developers want to do fancier things or use something other than curl to
-   * make the request.
-   *
-   * @param String $url the URL to make the request to
-   * @param Array $params the parameters to use for the POST body
-   * @param CurlHandler $ch optional initialized curl handle
-   * @return String the response text
-   */
-  protected function makeRequest($url, $params, $ch=null) {
-    if ( function_exists( 'curl_init' ) AND function_exists("curl_exec") AND function_exists('curl_setopt_array') )
-	{
-	    if (!$ch) {
-	      $ch = curl_init();
-	    }
-	    $opts = self::$CURL_OPTS;
-	    $opts[CURLOPT_POSTFIELDS] = $params;
-	    $opts[CURLOPT_URL] = $url;
-	    
-	    // stops cURL from doing a Expect: 100-continue
-      	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));	
-      	curl_setopt_array($ch, $opts);
-
-      	$result = curl_exec($ch);
-
-      	if (curl_errno($ch) == 60 ||  curl_errno( $ch ) == 77)
-      	{ // CURLE_SSL_CACERT
-        	if ( defined('CA_BUNDLE_PATH') )
-        	{
-          		curl_setopt($ch, CURLOPT_CAINFO, CA_BUNDLE_PATH);
-        	}
-        	else
-        	{
-          		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-       		}
-       		
-        	$result = curl_exec($ch);
-		}
-		// name lookup timed out / DNS issues
-		else if ( curl_errno( $ch ) == 6 )
-		{ 
-			$url_parts  = @parse_url($url);
-			$ip         = @gethostbyname( $url_parts['host'] );
-			
-			if ( $ip and preg_match( "#^\d{1,3}\.#", $ip ) )
-			{
-				// Turn of verify SSL as the IP will not match domain of cert
-				curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-				curl_setopt($ch, CURLOPT_URL, $url_parts['scheme'] . '://' . $ip . '/' . $url_parts['path'] );
-				$result = curl_exec($ch);
-			}
-		}
-       
-	    if ($result === false)
-	    {
-	      $e = new FacebookApiException(array(
-	        'error_code' => curl_errno($ch),
-	        'error'      => array(
-	          'message' => curl_error($ch),
-	          'type'    => 'CurlException',
-	        ),
-	      ));
-	      curl_close($ch);
-	      throw $e;
-	    }
-	    curl_close($ch);
-	    return $result;
-	}
-	else
-	{
-		$url_parts  = @parse_url($url);
-		$postfields = http_build_query( $params );
-		
-		if ( ! $postfields )
-		{
-			$postfields = $url_parts['query'];
-		}
-		
-		$postfields = str_replace( '&amp;', '&', $postfields );
-		
-		/* Use SSL rather than https */
-		$url_parts['scheme'] = ( $url_parts['scheme'] == 'https' ) ? 'ssl' : $url_parts['scheme'];
-		
-		$host = $url_parts['scheme'] . '://' . $url_parts['host'];
-	 	$port = ( isset($url_parts['port']) ) ? $url_parts['port'] : ( $url_parts['scheme'] == 'https' || $url_parts['scheme'] == 'ssl' ? 443 : 80 );
-	 	
-	 	if ( !empty( $url_parts["path"] ) )
-		{
-			$path = $url_parts["path"];
-		}
-		else
-		{
-			$path = "/";
-		}
-		
-		$header  = "POST {$path} HTTP/1.0\r\n";
-		$header .= "Host: " . str_replace( array( 'http://', 'https://', 'ssl://' ), '', $host ) . "\r\n";
-		$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-		$header .= "Content-Length: " . strlen($postfields) . "\r\n\r\n";
-		
-		if ( $fp = fsockopen( $host, $port, $errno, $errstr, 60 ) )
-		{
-			socket_set_timeout($fp, 60);
-			
-			fwrite($fp, $header . $postfields);
-			
-			while( ! feof($fp) && ! $status['timed_out'] )		
-			{
-		  		$data .= fgets ($fp,8192);
-		  		$status  = stream_get_meta_data($fp);
-			}
-			
-			fclose($fp);
-	 	}		
-		
-		/* Strip headers HTTP/1.1 ### ABCD */
-		$httpCode     = substr( $data, 9, 3 );
-		$lastApiCall = $url;
-		
-		/* Chuncked? */
-		
-		$_chunked	= false;
-		
-		if( preg_match( "/Transfer\-Encoding:\s*chunked/i", $data ) )
-		{
-			$_chunked	= true;
-		}
-		
-		$tmp	= explode("\r\n\r\n", $data, 2);
-		$data	= trim($tmp[1]);
-		
-		if ( $_chunked )
-		{
-			$lines	= explode( "\n", $data );
-			array_pop($lines);
-			array_shift($lines);
-			$data	= implode( "\n", $lines );
-		}
-		
-		return $data;
-	}
-  }
-
-  /**
-   * The name of the Cookie that contains the session.
-   *
-   * @return String the cookie name
-   */
-  protected function getSessionCookieName() {
-    return 'fbs_' . $this->getAppId();
-  }
-
-  /**
-   * Set a JS Cookie based on the _passed in_ session. It does not use the
-   * currently stored session -- you need to explicitly pass it in.
-   *
-   * @param Array $session the session to use for setting the cookie
-   */
-  protected function setCookieFromSession($session=null) {
-    if (!$this->useCookieSupport()) {
+  protected function setPersistentData($key, $value) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to setPersistentData.');
       return;
     }
 
-    $cookieName = $this->getSessionCookieName();
-    $value = 'deleted';
-    $expires = time() - 3600;
-    $domain = $this->getBaseDomain();
-    if ($session) {
-      $value = '"' . http_build_query($session, null, '&') . '"';
-      if (isset($session['base_domain'])) {
-        $domain = $session['base_domain'];
-      }
-      $expires = $session['expires'];
+    $session_var_name = $this->constructSessionVariableName($key);
+    $_SESSION[$session_var_name] = $value;
+  }
+
+  protected function getPersistentData($key, $default = false) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to getPersistentData.');
+      return $default;
     }
 
-    // prepend dot if a domain is found
-    if ($domain) {
-      $domain = '.' . $domain;
-    }
+    $session_var_name = $this->constructSessionVariableName($key);
+    return isset($_SESSION[$session_var_name]) ?
+      $_SESSION[$session_var_name] : $default;
+  }
 
-    // if an existing cookie is not set, we dont need to delete it
-    if ($value == 'deleted' && empty($_COOKIE[$cookieName])) {
+  protected function clearPersistentData($key) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to clearPersistentData.');
       return;
     }
 
-    if (headers_sent()) {
-      // disable error log if we are running in a CLI environment
-      // @codeCoverageIgnoreStart
-      if (php_sapi_name() != 'cli') {
-        error_log('Could not set cookie. Headers already sent.');
-      }
-      // @codeCoverageIgnoreEnd
-
-    // ignore for code coverage as we will never be able to setcookie in a CLI
-    // environment
-    // @codeCoverageIgnoreStart
-    } else {
-      setcookie($cookieName, $value, $expires, '/', $domain);
-    }
-    // @codeCoverageIgnoreEnd
+    $session_var_name = $this->constructSessionVariableName($key);
+    unset($_SESSION[$session_var_name]);
   }
 
-  /**
-   * Validates a session_version=3 style session object.
-   *
-   * @param Array $session the session object
-   * @return Array the session object if it validates, null otherwise
-   */
-  protected function validateSessionObject($session) {
-    // make sure some essential fields exist
-    if (is_array($session) &&
-        isset($session['uid']) &&
-        isset($session['session_key']) &&
-        isset($session['secret']) &&
-        isset($session['access_token']) &&
-        isset($session['sig'])) {
-      // validate the signature
-      $session_without_sig = $session;
-      unset($session_without_sig['sig']);
-      $expected_sig = self::generateSignature(
-        $session_without_sig,
-        $this->getApiSecret()
-      );
-      if ($session['sig'] != $expected_sig) {
-        // disable error log if we are running in a CLI environment
-        // @codeCoverageIgnoreStart
-        if (php_sapi_name() != 'cli') {
-          error_log('Got invalid session signature in cookie.');
-        }
-        // @codeCoverageIgnoreEnd
-        $session = null;
-      }
-      // check expiry time
-    } else {
-      $session = null;
+  protected function clearAllPersistentData() {
+    foreach (self::$kSupportedKeys as $key) {
+      $this->clearPersistentData($key);
     }
-    return $session;
   }
 
-  /**
-   * Build the URL for api given parameters.
-   *
-   * @param $method String the method name.
-   * @return String the URL for the given parameters
-   */
-  protected function getApiUrl($method) {
-    static $READ_ONLY_CALLS =
-      array('admin.getallocation' => 1,
-            'admin.getappproperties' => 1,
-            'admin.getbannedusers' => 1,
-            'admin.getlivestreamvialink' => 1,
-            'admin.getmetrics' => 1,
-            'admin.getrestrictioninfo' => 1,
-            'application.getpublicinfo' => 1,
-            'auth.getapppublickey' => 1,
-            'auth.getsession' => 1,
-            'auth.getsignedpublicsessiondata' => 1,
-            'comments.get' => 1,
-            'connect.getunconnectedfriendscount' => 1,
-            'dashboard.getactivity' => 1,
-            'dashboard.getcount' => 1,
-            'dashboard.getglobalnews' => 1,
-            'dashboard.getnews' => 1,
-            'dashboard.multigetcount' => 1,
-            'dashboard.multigetnews' => 1,
-            'data.getcookies' => 1,
-            'events.get' => 1,
-            'events.getmembers' => 1,
-            'fbml.getcustomtags' => 1,
-            'feed.getappfriendstories' => 1,
-            'feed.getregisteredtemplatebundlebyid' => 1,
-            'feed.getregisteredtemplatebundles' => 1,
-            'fql.multiquery' => 1,
-            'fql.query' => 1,
-            'friends.arefriends' => 1,
-            'friends.get' => 1,
-            'friends.getappusers' => 1,
-            'friends.getlists' => 1,
-            'friends.getmutualfriends' => 1,
-            'gifts.get' => 1,
-            'groups.get' => 1,
-            'groups.getmembers' => 1,
-            'intl.gettranslations' => 1,
-            'links.get' => 1,
-            'notes.get' => 1,
-            'notifications.get' => 1,
-            'pages.getinfo' => 1,
-            'pages.isadmin' => 1,
-            'pages.isappadded' => 1,
-            'pages.isfan' => 1,
-            'permissions.checkavailableapiaccess' => 1,
-            'permissions.checkgrantedapiaccess' => 1,
-            'photos.get' => 1,
-            'photos.getalbums' => 1,
-            'photos.gettags' => 1,
-            'profile.getinfo' => 1,
-            'profile.getinfooptions' => 1,
-            'stream.get' => 1,
-            'stream.getcomments' => 1,
-            'stream.getfilters' => 1,
-            'users.getinfo' => 1,
-            'users.getloggedinuser' => 1,
-            'users.getstandardinfo' => 1,
-            'users.hasapppermission' => 1,
-            'users.isappuser' => 1,
-            'users.isverified' => 1,
-            'video.getuploadlimits' => 1);
-    $name = 'api';
-    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
-      $name = 'api_read';
-    }
-    return self::getUrl($name, 'restserver.php');
-  }
-
-  /**
-   * Build the URL for given domain alias, path and parameters.
-   *
-   * @param $name String the name of the domain
-   * @param $path String optional path (without a leading slash)
-   * @param $params Array optional query parameters
-   * @return String the URL for the given parameters
-   */
-  protected function getUrl($name, $path='', $params=array()) {
-    $url = self::$DOMAIN_MAP[$name];
-    if ($path) {
-      if ($path[0] === '/') {
-        $path = substr($path, 1);
-      }
-      $url .= $path;
-    }
-    if ($params) {
-      $url .= '?' . http_build_query($params);
-    }
-    return $url;
-  }
-
-  /**
-   * Returns the Current URL, stripping it of known FB parameters that should
-   * not persist.
-   *
-   * @return String the current URL
-   */
-  protected function getCurrentUrl() {
-    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'
-      ? 'https://'
-      : 'http://';
-    $currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-    $parts = parse_url($currentUrl);
-
-    // drop known fb params
-    $query = '';
-    if (!empty($parts['query'])) {
-      $params = array();
-      parse_str($parts['query'], $params);
-      foreach(self::$DROP_QUERY_PARAMS as $key) {
-        unset($params[$key]);
-      }
-      if (!empty($params)) {
-        $query = '?' . http_build_query($params);
-      }
-    }
-
-    // use port if non default
-    $port =
-      isset($parts['port']) &&
-      (($protocol === 'http://' && $parts['port'] !== 80) ||
-       ($protocol === 'https://' && $parts['port'] !== 443))
-      ? ':' . $parts['port'] : '';
-
-    // rebuild
-    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
-  }
-
-  /**
-   * Generate a signature for the given params and secret.
-   *
-   * @param Array $params the parameters to sign
-   * @param String $secret the secret to sign with
-   * @return String the generated signature
-   */
-  protected static function generateSignature($params, $secret) {
-    // work with sorted data
-    ksort($params);
-
-    // generate the base string
-    $base_string = '';
-    foreach($params as $key => $value) {
-      $base_string .= $key . '=' . $value;
-    }
-    $base_string .= $secret;
-
-    return md5($base_string);
+  protected function constructSessionVariableName($key) {
+    return implode('_', array('fb',
+                              $this->getAppId(),
+                              $key));
   }
 }
diff --git a/upload/ips_kernel/facebook/facebook_old.php b/upload/ips_kernel/facebook/facebook_old.php
new file mode 100644
index 00000000..b33a52a2
--- /dev/null
+++ b/upload/ips_kernel/facebook/facebook_old.php
@@ -0,0 +1,887 @@
+<?php
+
+/**
+ * Patches (Matt Mecham - Invision Power Services - May 2010)
+ * - added verify peer for IIS/Windows CURL
+ * - added non-curl fall back method in makeRequest
+ */
+
+if (!function_exists('json_decode')) {
+  throw new Exception('Facebook needs the JSON PHP extension.');
+}
+
+/**
+ * Thrown when an API call returns an exception.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+class FacebookApiException extends Exception
+{
+  /**
+   * The result from the API server that represents the exception information.
+   */
+  protected $result;
+
+  /**
+   * Make a new API Exception with the given result.
+   *
+   * @param Array $result the result from the API server
+   */
+  public function __construct($result) {
+    $this->result = $result;
+
+    $code = isset($result['error_code']) ? $result['error_code'] : 0;
+    $msg  = isset($result['error'])
+              ? $result['error']['message'] : $result['error_msg'];
+    parent::__construct($msg, $code);
+  }
+
+  /**
+   * Return the associated result object returned by the API server.
+   *
+   * @returns Array the result from the API server
+   */
+  public function getResult() {
+    return $this->result;
+  }
+
+  /**
+   * Returns the associated type for the error. This will default to
+   * 'Exception' when a type is not available.
+   *
+   * @return String
+   */
+  public function getType() {
+    return
+      isset($this->result['error']) && isset($this->result['error']['type'])
+      ? $this->result['error']['type']
+      : 'Exception';
+  }
+
+  /**
+   * To make debugging easier.
+   *
+   * @returns String the string representation of the error
+   */
+  public function __toString() {
+    $str = $this->getType() . ': ';
+    if ($this->code != 0) {
+      $str .= $this->code . ': ';
+    }
+    return $str . $this->message;
+  }
+}
+
+/**
+ * Provides access to the Facebook Platform.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+class Facebook
+{
+  /**
+   * Version.
+   */
+  const VERSION = '2.0.3';
+
+  /**
+   * Default options for curl.
+   */
+  public static $CURL_OPTS = array(
+    CURLOPT_CONNECTTIMEOUT => 10,
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_TIMEOUT        => 60,
+    CURLOPT_USERAGENT      => 'facebook-php-2.0',
+  );
+
+  /**
+   * List of query parameters that get automatically dropped when rebuilding
+   * the current URL.
+   */
+  protected static $DROP_QUERY_PARAMS = array(
+    'session',
+  );
+
+  /**
+   * Maps aliases to Facebook domains.
+   */
+  public static $DOMAIN_MAP = array(
+    'api'      => 'https://api.facebook.com/',
+    'api_read' => 'https://api-read.facebook.com/',
+    'graph'    => 'https://graph.facebook.com/',
+    'www'      => 'https://www.facebook.com/',
+  );
+
+  /**
+   * The Application ID.
+   */
+  protected $appId;
+
+  /**
+   * The Application API Secret.
+   */
+  protected $apiSecret;
+
+  /**
+   * The active user session, if one is available.
+   */
+  protected $session;
+
+  /**
+   * Indicates that we already loaded the session as best as we could.
+   */
+  protected $sessionLoaded = false;
+
+  /**
+   * Indicates if Cookie support should be enabled.
+   */
+  protected $cookieSupport = false;
+
+  /**
+   * Base domain for the Cookie.
+   */
+  protected $baseDomain = '';
+
+  /**
+   * Initialize a Facebook Application.
+   *
+   * The configuration:
+   * - appId: the application ID
+   * - secret: the application secret
+   * - cookie: (optional) boolean true to enable cookie support
+   * - domain: (optional) domain for the cookie
+   *
+   * @param Array $config the application configuration
+   */
+  public function __construct($config) {
+    $this->setAppId($config['appId']);
+    $this->setApiSecret($config['secret']);
+    if (isset($config['cookie'])) {
+      $this->setCookieSupport($config['cookie']);
+    }
+    if (isset($config['domain'])) {
+      $this->setBaseDomain($config['domain']);
+    }
+  }
+
+  /**
+   * Set the Application ID.
+   *
+   * @param String $appId the Application ID
+   */
+  public function setAppId($appId) {
+    $this->appId = $appId;
+    return $this;
+  }
+
+  /**
+   * Get the Application ID.
+   *
+   * @return String the Application ID
+   */
+  public function getAppId() {
+    return $this->appId;
+  }
+
+  /**
+   * Set the API Secret.
+   *
+   * @param String $appId the API Secret
+   */
+  public function setApiSecret($apiSecret) {
+    $this->apiSecret = $apiSecret;
+    return $this;
+  }
+
+  /**
+   * Get the API Secret.
+   *
+   * @return String the API Secret
+   */
+  public function getApiSecret() {
+    return $this->apiSecret;
+  }
+
+  /**
+   * Set the Cookie Support status.
+   *
+   * @param Boolean $cookieSupport the Cookie Support status
+   */
+  public function setCookieSupport($cookieSupport) {
+    $this->cookieSupport = $cookieSupport;
+    return $this;
+  }
+
+  /**
+   * Get the Cookie Support status.
+   *
+   * @return Boolean the Cookie Support status
+   */
+  public function useCookieSupport() {
+    return $this->cookieSupport;
+  }
+
+  /**
+   * Set the base domain for the Cookie.
+   *
+   * @param String $domain the base domain
+   */
+  public function setBaseDomain($domain) {
+    $this->baseDomain = $domain;
+    return $this;
+  }
+
+  /**
+   * Get the base domain for the Cookie.
+   *
+   * @return String the base domain
+   */
+  public function getBaseDomain() {
+    return $this->baseDomain;
+  }
+
+  /**
+   * Set the Session.
+   *
+   * @param Array $session the session
+   * @param Boolean $write_cookie indicate if a cookie should be written. this
+   * value is ignored if cookie support has been disabled.
+   */
+  public function setSession($session=null, $write_cookie=true) {
+    $session = $this->validateSessionObject($session);
+    $this->sessionLoaded = true;
+    $this->session = $session;
+    if ($write_cookie) {
+      $this->setCookieFromSession($session);
+    }
+    return $this;
+  }
+
+  /**
+   * Get the session object. This will automatically look for a signed session
+   * sent via the Cookie or Query Parameters if needed.
+   *
+   * @return Array the session
+   */
+  public function getSession() {
+    if (!$this->sessionLoaded) {
+      $session = null;
+      $write_cookie = true;
+
+      // try loading session from $_REQUEST
+      if (isset($_REQUEST['session'])) {
+        $session = json_decode(
+          get_magic_quotes_gpc()
+            ? stripslashes($_REQUEST['session'])
+            : $_REQUEST['session'],
+          true
+        );
+        $session = $this->validateSessionObject($session);
+      }
+
+      // try loading session from cookie if necessary
+      if (!$session && $this->useCookieSupport()) {
+        $cookieName = $this->getSessionCookieName();
+        if (isset($_COOKIE[$cookieName])) {
+          $session = array();
+          parse_str(trim(
+            get_magic_quotes_gpc()
+              ? stripslashes($_COOKIE[$cookieName])
+              : $_COOKIE[$cookieName],
+            '"'
+          ), $session);
+          $session = $this->validateSessionObject($session);
+          // write only if we need to delete a invalid session cookie
+          $write_cookie = empty($session);
+        }
+      }
+
+      $this->setSession($session, $write_cookie);
+    }
+
+    return $this->session;
+  }
+
+  /**
+   * Get the UID from the session.
+   *
+   * @return String the UID if available
+   */
+  public function getUser() {
+    $session = $this->getSession();
+    return $session ? $session['uid'] : null;
+  }
+
+  /**
+   * Get a Login URL for use with redirects. By default, full page redirect is
+   * assumed. If you are using the generated URL with a window.open() call in
+   * JavaScript, you can pass in display=popup as part of the $params.
+   *
+   * The parameters:
+   * - next: the url to go to after a successful login
+   * - cancel_url: the url to go to after the user cancels
+   * - req_perms: comma separated list of requested extended perms
+   * - display: can be "page" (default, full page) or "popup"
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the login flow
+   */
+  public function getLoginUrl($params=array()) {
+    $currentUrl = $this->getCurrentUrl();
+    return $this->getUrl(
+      'www',
+      'login.php',
+      array_merge(array(
+        'api_key'         => $this->getAppId(),
+        'cancel_url'      => $currentUrl,
+        'display'         => 'page',
+        'fbconnect'       => 1,
+        'next'            => $currentUrl,
+        'return_session'  => 1,
+        'session_version' => 3,
+        'v'               => '1.0',
+      ), $params)
+    );
+  }
+
+  /**
+   * Get a Logout URL suitable for use with redirects.
+   *
+   * The parameters:
+   * - next: the url to go to after a successful logout
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the logout flow
+   */
+  public function getLogoutUrl($params=array()) {
+    $session = $this->getSession();
+    return $this->getUrl(
+      'www',
+      'logout.php',
+      array_merge(array(
+        'api_key'     => $this->getAppId(),
+        'next'        => $this->getCurrentUrl(),
+        'session_key' => $session['session_key'],
+      ), $params)
+    );
+  }
+
+  /**
+   * Get a login status URL to fetch the status from facebook.
+   *
+   * The parameters:
+   * - ok_session: the URL to go to if a session is found
+   * - no_session: the URL to go to if the user is not connected
+   * - no_user: the URL to go to if the user is not signed into facebook
+   *
+   * @param Array $params provide custom parameters
+   * @return String the URL for the logout flow
+   */
+  public function getLoginStatusUrl($params=array()) {
+    return $this->getUrl(
+      'www',
+      'extern/login_status.php',
+      array_merge(array(
+        'api_key'         => $this->getAppId(),
+        'no_session'      => $this->getCurrentUrl(),
+        'no_user'         => $this->getCurrentUrl(),
+        'ok_session'      => $this->getCurrentUrl(),
+        'session_version' => 3,
+      ), $params)
+    );
+  }
+
+  /**
+   * Make an API call.
+   *
+   * @param Array $params the API call parameters
+   * @return the decoded response
+   */
+  public function api(/* polymorphic */) {
+    $args = func_get_args();
+    if (is_array($args[0])) {
+      return $this->_restserver($args[0]);
+    } else {
+      return call_user_func_array(array($this, '_graph'), $args);
+    }
+  }
+
+  /**
+   * Invoke the old restserver.php endpoint.
+   *
+   * @param Array $params method call object
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _restserver($params) {
+    // generic application level parameters
+    $params['api_key'] = $this->getAppId();
+    $params['format'] = 'json-strings';
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getApiUrl($params['method']),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error_code'])) {
+      throw new FacebookApiException($result);
+    }
+    return $result;
+  }
+
+  /**
+   * Invoke the Graph API.
+   *
+   * @param String $path the path (required)
+   * @param String $method the http method (default 'GET')
+   * @param Array $params the query/post data
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _graph($path, $method='GET', $params=array()) {
+    if (is_array($method) && empty($params)) {
+      $params = $method;
+      $method = 'GET';
+    }
+    $params['method'] = $method; // method override as we always do a POST
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getUrl('graph', $path),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error'])) {
+      $e = new FacebookApiException($result);
+      if ($e->getType() === 'OAuthException') {
+        $this->setSession(null);
+      }
+      throw $e;
+    }
+    return $result;
+  }
+
+  /**
+   * Make a OAuth Request
+   *
+   * @param String $path the path (required)
+   * @param Array $params the query/post data
+   * @return the decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _oauthRequest($url, $params) {
+    if (!isset($params['access_token'])) {
+      $session = $this->getSession();
+      // either user session signed, or app signed
+      if ($session) {
+        $params['access_token'] = $session['access_token'];
+      } else {
+        $params['access_token'] = $this->getAppId() .'|'. $this->getApiSecret();
+      }
+    }
+
+    // json_encode all params values that are not strings
+    foreach ($params as $key => $value) {
+      if (!is_string($value)) {
+        $params[$key] = json_encode($value);
+      }
+    }
+    return $this->makeRequest($url, $params);
+  }
+
+  /**
+   * Makes an HTTP request. This method can be overriden by subclasses if
+   * developers want to do fancier things or use something other than curl to
+   * make the request.
+   *
+   * @param String $url the URL to make the request to
+   * @param Array $params the parameters to use for the POST body
+   * @param CurlHandler $ch optional initialized curl handle
+   * @return String the response text
+   */
+  protected function makeRequest($url, $params, $ch=null) {
+    if ( function_exists( 'curl_init' ) AND function_exists("curl_exec") AND function_exists('curl_setopt_array') )
+	{
+	    if (!$ch) {
+	      $ch = curl_init();
+	    }
+	    $opts = self::$CURL_OPTS;
+	    $opts[CURLOPT_POSTFIELDS] = $params;
+	    $opts[CURLOPT_URL] = $url;
+	    
+	    // stops cURL from doing a Expect: 100-continue
+      	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));	
+      	curl_setopt_array($ch, $opts);
+
+      	$result = curl_exec($ch);
+
+      	if (curl_errno($ch) == 60 ||  curl_errno( $ch ) == 77)
+      	{ // CURLE_SSL_CACERT
+        	if ( defined('CA_BUNDLE_PATH') )
+        	{
+          		curl_setopt($ch, CURLOPT_CAINFO, CA_BUNDLE_PATH);
+        	}
+        	else
+        	{
+          		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+       		}
+       		
+        	$result = curl_exec($ch);
+		}
+		// name lookup timed out / DNS issues
+		else if ( curl_errno( $ch ) == 6 )
+		{ 
+			$url_parts  = @parse_url($url);
+			$ip         = @gethostbyname( $url_parts['host'] );
+			
+			if ( $ip and preg_match( "#^\d{1,3}\.#", $ip ) )
+			{
+				// Turn of verify SSL as the IP will not match domain of cert
+				curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+				curl_setopt($ch, CURLOPT_URL, $url_parts['scheme'] . '://' . $ip . '/' . $url_parts['path'] );
+				$result = curl_exec($ch);
+			}
+		}
+       
+	    if ($result === false)
+	    {
+	      $e = new FacebookApiException(array(
+	        'error_code' => curl_errno($ch),
+	        'error'      => array(
+	          'message' => curl_error($ch),
+	          'type'    => 'CurlException',
+	        ),
+	      ));
+	      curl_close($ch);
+	      throw $e;
+	    }
+	    curl_close($ch);
+	    return $result;
+	}
+	else
+	{
+		$url_parts  = @parse_url($url);
+		$postfields = http_build_query( $params );
+		
+		if ( ! $postfields )
+		{
+			$postfields = $url_parts['query'];
+		}
+		
+		$postfields = str_replace( '&amp;', '&', $postfields );
+		
+		/* Use SSL rather than https */
+		$url_parts['scheme'] = ( $url_parts['scheme'] == 'https' ) ? 'ssl' : $url_parts['scheme'];
+		
+		$host = $url_parts['scheme'] . '://' . $url_parts['host'];
+	 	$port = ( isset($url_parts['port']) ) ? $url_parts['port'] : ( $url_parts['scheme'] == 'https' || $url_parts['scheme'] == 'ssl' ? 443 : 80 );
+	 	
+	 	if ( !empty( $url_parts["path"] ) )
+		{
+			$path = $url_parts["path"];
+		}
+		else
+		{
+			$path = "/";
+		}
+		
+		$header  = "POST {$path} HTTP/1.0\r\n";
+		$header .= "Host: " . str_replace( array( 'http://', 'https://', 'ssl://' ), '', $host ) . "\r\n";
+		$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+		$header .= "Content-Length: " . strlen($postfields) . "\r\n\r\n";
+		
+		if ( $fp = fsockopen( $host, $port, $errno, $errstr, 60 ) )
+		{
+			socket_set_timeout($fp, 60);
+			
+			fwrite($fp, $header . $postfields);
+			
+			while( ! feof($fp) && ! $status['timed_out'] )		
+			{
+		  		$data .= fgets ($fp,8192);
+		  		$status  = stream_get_meta_data($fp);
+			}
+			
+			fclose($fp);
+	 	}		
+		
+		/* Strip headers HTTP/1.1 ### ABCD */
+		$httpCode     = substr( $data, 9, 3 );
+		$lastApiCall = $url;
+		
+		/* Chuncked? */
+		
+		$_chunked	= false;
+		
+		if( preg_match( "/Transfer\-Encoding:\s*chunked/i", $data ) )
+		{
+			$_chunked	= true;
+		}
+		
+		$tmp	= explode("\r\n\r\n", $data, 2);
+		$data	= trim($tmp[1]);
+		
+		if ( $_chunked )
+		{
+			$lines	= explode( "\n", $data );
+			array_pop($lines);
+			array_shift($lines);
+			$data	= implode( "\n", $lines );
+		}
+		
+		return $data;
+	}
+  }
+
+  /**
+   * The name of the Cookie that contains the session.
+   *
+   * @return String the cookie name
+   */
+  protected function getSessionCookieName() {
+    return 'fbs_' . $this->getAppId();
+  }
+
+  /**
+   * Set a JS Cookie based on the _passed in_ session. It does not use the
+   * currently stored session -- you need to explicitly pass it in.
+   *
+   * @param Array $session the session to use for setting the cookie
+   */
+  protected function setCookieFromSession($session=null) {
+    if (!$this->useCookieSupport()) {
+      return;
+    }
+
+    $cookieName = $this->getSessionCookieName();
+    $value = 'deleted';
+    $expires = time() - 3600;
+    $domain = $this->getBaseDomain();
+    if ($session) {
+      $value = '"' . http_build_query($session, null, '&') . '"';
+      if (isset($session['base_domain'])) {
+        $domain = $session['base_domain'];
+      }
+      $expires = $session['expires'];
+    }
+
+    // prepend dot if a domain is found
+    if ($domain) {
+      $domain = '.' . $domain;
+    }
+
+    // if an existing cookie is not set, we dont need to delete it
+    if ($value == 'deleted' && empty($_COOKIE[$cookieName])) {
+      return;
+    }
+
+    if (headers_sent()) {
+      // disable error log if we are running in a CLI environment
+      // @codeCoverageIgnoreStart
+      if (php_sapi_name() != 'cli') {
+        error_log('Could not set cookie. Headers already sent.');
+      }
+      // @codeCoverageIgnoreEnd
+
+    // ignore for code coverage as we will never be able to setcookie in a CLI
+    // environment
+    // @codeCoverageIgnoreStart
+    } else {
+      setcookie($cookieName, $value, $expires, '/', $domain);
+    }
+    // @codeCoverageIgnoreEnd
+  }
+
+  /**
+   * Validates a session_version=3 style session object.
+   *
+   * @param Array $session the session object
+   * @return Array the session object if it validates, null otherwise
+   */
+  protected function validateSessionObject($session) {
+    // make sure some essential fields exist
+    if (is_array($session) &&
+        isset($session['uid']) &&
+        isset($session['session_key']) &&
+        isset($session['secret']) &&
+        isset($session['access_token']) &&
+        isset($session['sig'])) {
+      // validate the signature
+      $session_without_sig = $session;
+      unset($session_without_sig['sig']);
+      $expected_sig = self::generateSignature(
+        $session_without_sig,
+        $this->getApiSecret()
+      );
+      if ($session['sig'] != $expected_sig) {
+        // disable error log if we are running in a CLI environment
+        // @codeCoverageIgnoreStart
+        if (php_sapi_name() != 'cli') {
+          error_log('Got invalid session signature in cookie.');
+        }
+        // @codeCoverageIgnoreEnd
+        $session = null;
+      }
+      // check expiry time
+    } else {
+      $session = null;
+    }
+    return $session;
+  }
+
+  /**
+   * Build the URL for api given parameters.
+   *
+   * @param $method String the method name.
+   * @return String the URL for the given parameters
+   */
+  protected function getApiUrl($method) {
+    static $READ_ONLY_CALLS =
+      array('admin.getallocation' => 1,
+            'admin.getappproperties' => 1,
+            'admin.getbannedusers' => 1,
+            'admin.getlivestreamvialink' => 1,
+            'admin.getmetrics' => 1,
+            'admin.getrestrictioninfo' => 1,
+            'application.getpublicinfo' => 1,
+            'auth.getapppublickey' => 1,
+            'auth.getsession' => 1,
+            'auth.getsignedpublicsessiondata' => 1,
+            'comments.get' => 1,
+            'connect.getunconnectedfriendscount' => 1,
+            'dashboard.getactivity' => 1,
+            'dashboard.getcount' => 1,
+            'dashboard.getglobalnews' => 1,
+            'dashboard.getnews' => 1,
+            'dashboard.multigetcount' => 1,
+            'dashboard.multigetnews' => 1,
+            'data.getcookies' => 1,
+            'events.get' => 1,
+            'events.getmembers' => 1,
+            'fbml.getcustomtags' => 1,
+            'feed.getappfriendstories' => 1,
+            'feed.getregisteredtemplatebundlebyid' => 1,
+            'feed.getregisteredtemplatebundles' => 1,
+            'fql.multiquery' => 1,
+            'fql.query' => 1,
+            'friends.arefriends' => 1,
+            'friends.get' => 1,
+            'friends.getappusers' => 1,
+            'friends.getlists' => 1,
+            'friends.getmutualfriends' => 1,
+            'gifts.get' => 1,
+            'groups.get' => 1,
+            'groups.getmembers' => 1,
+            'intl.gettranslations' => 1,
+            'links.get' => 1,
+            'notes.get' => 1,
+            'notifications.get' => 1,
+            'pages.getinfo' => 1,
+            'pages.isadmin' => 1,
+            'pages.isappadded' => 1,
+            'pages.isfan' => 1,
+            'permissions.checkavailableapiaccess' => 1,
+            'permissions.checkgrantedapiaccess' => 1,
+            'photos.get' => 1,
+            'photos.getalbums' => 1,
+            'photos.gettags' => 1,
+            'profile.getinfo' => 1,
+            'profile.getinfooptions' => 1,
+            'stream.get' => 1,
+            'stream.getcomments' => 1,
+            'stream.getfilters' => 1,
+            'users.getinfo' => 1,
+            'users.getloggedinuser' => 1,
+            'users.getstandardinfo' => 1,
+            'users.hasapppermission' => 1,
+            'users.isappuser' => 1,
+            'users.isverified' => 1,
+            'video.getuploadlimits' => 1);
+    $name = 'api';
+    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
+      $name = 'api_read';
+    }
+    return self::getUrl($name, 'restserver.php');
+  }
+
+  /**
+   * Build the URL for given domain alias, path and parameters.
+   *
+   * @param $name String the name of the domain
+   * @param $path String optional path (without a leading slash)
+   * @param $params Array optional query parameters
+   * @return String the URL for the given parameters
+   */
+  protected function getUrl($name, $path='', $params=array()) {
+    $url = self::$DOMAIN_MAP[$name];
+    if ($path) {
+      if ($path[0] === '/') {
+        $path = substr($path, 1);
+      }
+      $url .= $path;
+    }
+    if ($params) {
+      $url .= '?' . http_build_query($params);
+    }
+    return $url;
+  }
+
+  /**
+   * Returns the Current URL, stripping it of known FB parameters that should
+   * not persist.
+   *
+   * @return String the current URL
+   */
+  protected function getCurrentUrl() {
+    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'
+      ? 'https://'
+      : 'http://';
+    $currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $parts = parse_url($currentUrl);
+
+    // drop known fb params
+    $query = '';
+    if (!empty($parts['query'])) {
+      $params = array();
+      parse_str($parts['query'], $params);
+      foreach(self::$DROP_QUERY_PARAMS as $key) {
+        unset($params[$key]);
+      }
+      if (!empty($params)) {
+        $query = '?' . http_build_query($params);
+      }
+    }
+
+    // use port if non default
+    $port =
+      isset($parts['port']) &&
+      (($protocol === 'http://' && $parts['port'] !== 80) ||
+       ($protocol === 'https://' && $parts['port'] !== 443))
+      ? ':' . $parts['port'] : '';
+
+    // rebuild
+    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+  }
+
+  /**
+   * Generate a signature for the given params and secret.
+   *
+   * @param Array $params the parameters to sign
+   * @param String $secret the secret to sign with
+   * @return String the generated signature
+   */
+  protected static function generateSignature($params, $secret) {
+    // work with sorted data
+    ksort($params);
+
+    // generate the base string
+    $base_string = '';
+    foreach($params as $key => $value) {
+      $base_string .= $key . '=' . $value;
+    }
+    $base_string .= $secret;
+
+    return md5($base_string);
+  }
+}
diff --git a/upload/ips_kernel/facebook/facebookoauth.php b/upload/ips_kernel/facebook/facebookoauth.php
index 1d0d1f37..32492e13 100644
--- a/upload/ips_kernel/facebook/facebookoauth.php
+++ b/upload/ips_kernel/facebook/facebookoauth.php
@@ -4,7 +4,7 @@
  * Simple oAuth wrapper for Facebook
  * Designed to stream line log in  and token exchange
  * By Matt Mecham (Invision Power Services, Inc)
- * http://www.invisionpower.com
+ * http://hatynka.in
  * April 2010
  *
  * Version 0.1
@@ -15,40 +15,40 @@ class FacebookOAuth
 	/**
 	 * Facebook Application ID
 	 * @var		int
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_appId;
+	protected $_appId;
 	 
 	 /**
 	  * Facebook Application Secret 
 	  * @var	string
-	  * @access	private
+	  * @access	protected
 	  */
-	private $_appSecret;
+	protected $_appSecret;
 	 
 	/**
 	 * Call back URL
 	 * URL to redirect oAuth requests to after processing at Facebook
 	 * @var	string
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_callBackUrl;
+	protected $_callBackUrl;
 	
 	/**
 	 * Permissions scope
 	 * Array containing required permissions
 	 * @var		array
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_permsScope = array();
+	protected $_permsScope = array();
 	
 	/**
 	 * Form Factor
 	 * @link http://developers.facebook.com/docs/authentication/
 	 * @var		string
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_formFactor = '';
+	protected $_formFactor = '';
 	
 	/**
 	 * Last http code (200, 403, etc)
@@ -211,13 +211,13 @@ class FacebookOAuth
 	/**
 	 * Make an HTTP request
  	 *
- 	 * @param		private
+ 	 * @param		protected
  	 * @param		string		URL
  	 * @param		string		Method (post or get)
  	 * @param		array		Post data to send
 	 * @return API results
 	*/
-	private function _send($url, $method='POST', $postfields=NULL)
+	protected function _send($url, $method='POST', $postfields=NULL)
 	{
 		/* Compress post fields */
 		if ( is_array( $postfields ) AND count( $postfields ) )
diff --git a/upload/ips_kernel/facebook/fb_ca_chain_bundle.crt b/upload/ips_kernel/facebook/fb_ca_chain_bundle.crt
new file mode 100644
index 00000000..b92d7190
--- /dev/null
+++ b/upload/ips_kernel/facebook/fb_ca_chain_bundle.crt
@@ -0,0 +1,121 @@
+-----BEGIN CERTIFICATE-----
+MIIFgjCCBGqgAwIBAgIQDKKbZcnESGaLDuEaVk6fQjANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEwMDExMzAwMDAwMFoXDTEzMDQxMTIzNTk1OVowaDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEX
+MBUGA1UEChMORmFjZWJvb2ssIEluYy4xFzAVBgNVBAMUDiouZmFjZWJvb2suY29t
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9rzj7QIuLM3sdHu1HcI1VcR3g
+b5FExKNV646agxSle1aQ/sJev1mh/u91ynwqd2BQmM0brZ1Hc3QrfYyAaiGGgEkp
+xbhezyfeYhAyO0TKAYxPnm2cTjB5HICzk6xEIwFbA7SBJ2fSyW1CFhYZyo3tIBjj
+19VjKyBfpRaPkzLmRwIDAQABo4ICrDCCAqgwHwYDVR0jBBgwFoAUUOpzidsp+xCP
+nuUBINTeeZlIg/cwHQYDVR0OBBYEFPp+tsFBozkjrHlEnZ9J4cFj2eM0MA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMF8GA1UdHwRYMFYwKaAnoCWGI2h0dHA6
+Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9jYTMtZmIuY3JsMCmgJ6AlhiNodHRwOi8vY3Js
+NC5kaWdpY2VydC5jb20vY2EzLWZiLmNybDCCAcYGA1UdIASCAb0wggG5MIIBtQYL
+YIZIAYb9bAEDAAEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0
+LmNvbS9zc2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIB
+UgBBAG4AeQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkA
+YwBhAHQAZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEA
+bgBjAGUAIABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMA
+UABTACAAYQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkA
+IABBAGcAcgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwA
+aQBhAGIAaQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8A
+cgBhAHQAZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMA
+ZQAuMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUF
+AAOCAQEACOkTIdxMy11+CKrbGNLBSg5xHaTvu/v1wbyn3dO/mf68pPfJnX6ShPYy
+4XM4Vk0x4uaFaU4wAGke+nCKGi5dyg0Esg7nemLNKEJaFAJZ9enxZm334lSCeARy
+wlDtxULGOFRyGIZZPmbV2eNq5xdU/g3IuBEhL722mTpAye9FU/J8Wsnw54/gANyO
+Gzkewigua8ip8Lbs9Cht399yAfbfhUP1DrAm/xEcnHrzPr3cdCtOyJaM6SRPpRqH
+ITK5Nc06tat9lXVosSinT3KqydzxBYua9gCFFiR3x3DgZfvXkC6KDdUlDrNcJUub
+a1BHnLLP4mxTHL6faAXYd05IxNn/IA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGVTCCBT2gAwIBAgIQCFH5WYFBRcq94CTiEsnCDjANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA3MDQwMzAwMDAwMFoXDTIyMDQwMzAwMDAwMFowZjEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTElMCMGA1UEAxMcRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+Q0EtMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9hCikQH17+NDdR
+CPge+yLtYb4LDXBMUGMmdRW5QYiXtvCgFbsIYOBC6AUpEIc2iihlqO8xB3RtNpcv
+KEZmBMcqeSZ6mdWOw21PoF6tvD2Rwll7XjZswFPPAAgyPhBkWBATaccM7pxCUQD5
+BUTuJM56H+2MEb0SqPMV9Bx6MWkBG6fmXcCabH4JnudSREoQOiPkm7YDr6ictFuf
+1EutkozOtREqqjcYjbTCuNhcBoz4/yO9NV7UfD5+gw6RlgWYw7If48hl66l7XaAs
+zPw82W3tzPpLQ4zJ1LilYRyyQLYoEt+5+F/+07LJ7z20Hkt8HEyZNp496+ynaF4d
+32duXvsCAwEAAaOCAvcwggLzMA4GA1UdDwEB/wQEAwIBhjCCAcYGA1UdIASCAb0w
+ggG5MIIBtQYLYIZIAYb9bAEDAAIwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3
+LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUH
+AgIwggFWHoIBUgBBAG4AeQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQBy
+AHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBj
+AGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAg
+AEMAUAAvAEMAUABTACAAYQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQ
+AGEAcgB0AHkAIABBAGcAcgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBt
+AGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBj
+AG8AcgBwAG8AcgBhAHQAZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBl
+AHIAZQBuAGMAZQAuMA8GA1UdEwEB/wQFMAMBAf8wNAYIKwYBBQUHAQEEKDAmMCQG
+CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wgY8GA1UdHwSBhzCB
+hDBAoD6gPIY6aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0SGlnaEFz
+c3VyYW5jZUVWUm9vdENBLmNybDBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDAfBgNVHSMEGDAW
+gBSxPsNpA/i/RwHUmCYaCALvY2QrwzAdBgNVHQ4EFgQUUOpzidsp+xCPnuUBINTe
+eZlIg/cwDQYJKoZIhvcNAQEFBQADggEBAF1PhPGoiNOjsrycbeUpSXfh59bcqdg1
+rslx3OXb3J0kIZCmz7cBHJvUV5eR13UWpRLXuT0uiT05aYrWNTf58SHEW0CtWakv
+XzoAKUMncQPkvTAyVab+hA4LmzgZLEN8rEO/dTHlIxxFVbdpCJG1z9fVsV7un5Tk
+1nq5GMO41lJjHBC6iy9tXcwFOPRWBW3vnuzoYTYMFEuFFFoMg08iXFnLjIpx2vrF
+EIRYzwfu45DC9fkpx1ojcflZtGQriLCnNseaIGHr+k61rmsb5OPs4tk8QUmoIKRU
+9ZKNu8BVIASm2LAXFszj0Mi0PeXZhMbT9m5teMl5Q+h6N/9cNUm/ocU=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEQjCCA6ugAwIBAgIEQoclDjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEy
+MjIxNTI3MjdaFw0xNDA3MjIxNTU3MjdaMGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQK
+EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNV
+BAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGzOVz5vvUu+UtLTKm3+WBP8nNJUm2cSrD
+1ZQ0Z6IKHLBfaaZAscS3so/QmKSpQVk609yU1jzbdDikSsxNJYL3SqVTEjju80lt
+cZF+Y7arpl/DpIT4T2JRvvjF7Ns4kuMG5QiRDMQoQVX7y1qJFX5x6DW/TXIJPb46
+OFBbdzEbjbPHJEWap6xtABRaBLe6E+tRCphBQSJOZWGHgUFQpnlcid4ZSlfVLuZd
+HFMsfpjNGgYWpGhz0DQEE1yhcdNafFXbXmThN4cwVgTlEbQpgBLxeTmIogIRfCdm
+t4i3ePLKCqg4qwpkwr9mXZWEwaElHoddGlALIBLMQbtuC1E4uEvLAgMBAAGjggET
+MIIBDzASBgNVHRMBAf8ECDAGAQH/AgEBMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggr
+BgEFBQcDAgYIKwYBBQUHAwQwMwYIKwYBBQUHAQEEJzAlMCMGCCsGAQUFBzABhhdo
+dHRwOi8vb2NzcC5lbnRydXN0Lm5ldDAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8v
+Y3JsLmVudHJ1c3QubmV0L3NlcnZlcjEuY3JsMB0GA1UdDgQWBBSxPsNpA/i/RwHU
+mCYaCALvY2QrwzALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7
+UISX8+1i0BowGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCAIEwDQYJKoZIhvcNAQEF
+BQADgYEAUuVY7HCc/9EvhaYzC1rAIo348LtGIiMduEl5Xa24G8tmJnDioD2GU06r
+1kjLX/ktCdpdBgXadbjtdrZXTP59uN0AXlsdaTiFufsqVLPvkp5yMnqnuI3E2o6p
+NpAkoQSbB6kUCNnXcW26valgOjDLZFOnr241QiwdBAJAAE/rRa8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
diff --git a/upload/ips_kernel/facebook/index.html b/upload/ips_kernel/facebook/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/facebook/index.html
+++ b/upload/ips_kernel/facebook/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/i18n/ConvertTables/index.html b/upload/ips_kernel/i18n/ConvertTables/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/i18n/ConvertTables/index.html
+++ b/upload/ips_kernel/i18n/ConvertTables/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/i18n/index.html b/upload/ips_kernel/i18n/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/i18n/index.html
+++ b/upload/ips_kernel/i18n/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/index.html b/upload/ips_kernel/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/index.html
+++ b/upload/ips_kernel/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/interfaces/index.html b/upload/ips_kernel/interfaces/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/interfaces/index.html
+++ b/upload/ips_kernel/interfaces/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/interfaces/interfaceCache.php b/upload/ips_kernel/interfaces/interfaceCache.php
index 502a7be2..24492913 100644
--- a/upload/ips_kernel/interfaces/interfaceCache.php
+++ b/upload/ips_kernel/interfaces/interfaceCache.php
@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * This class acts as a cache layer, allowing you to store and retrieve data in
  *	external cache sources such as memcache or APC
- * Last Updated: $Date: 2010-01-15 10:18:25 -0500 (Fri, 15 Jan 2010) $
+ * Last Updated: $Date: 2010-12-20 06:03:01 -0500 (Mon, 20 Dec 2010) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
  * @subpackage	Kernel
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		Friday 19th May 2006 17:33
- * @version		$Revision: 370 $
+ * @version		$Revision: 7453 $
  *
  */
 
diff --git a/upload/ips_kernel/pop3class/browse_mailbox.php b/upload/ips_kernel/pop3class/browse_mailbox.php
index d92c101d..9b9f2350 100644
--- a/upload/ips_kernel/pop3class/browse_mailbox.php
+++ b/upload/ips_kernel/pop3class/browse_mailbox.php
@@ -15,14 +15,13 @@
 <hr />
 <?php
 
-	require('mime_parser.php');
-	require('rfc822_addresses.php');
-	require("pop3.php");
+	require('mime_parser.php');/*noLibHook*/
+	require('rfc822_addresses.php');/*noLibHook*/
+	require("pop3.php");/*noLibHook*/
 
   /* Uncomment when using SASL authentication mechanisms */
 	/*
-	require("sasl.php");
-	*/
+	require("sasl.php");/*noLibHook*/
 
 	stream_wrapper_register('pop3', 'pop3_stream');  /* Register the pop3 stream handler class */
 
diff --git a/upload/ips_kernel/pop3class/index.html b/upload/ips_kernel/pop3class/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/pop3class/index.html
+++ b/upload/ips_kernel/pop3class/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/pop3class/parse_message.php b/upload/ips_kernel/pop3class/parse_message.php
index b3cd9ec1..d3773667 100644
--- a/upload/ips_kernel/pop3class/parse_message.php
+++ b/upload/ips_kernel/pop3class/parse_message.php
@@ -15,9 +15,9 @@
 <hr />
 <?php
 
-	require('mime_parser.php');
-	require('rfc822_addresses.php');
-	require('pop3.php');
+	require('mime_parser.php');/*noLibHook*/
+	require('rfc822_addresses.php');/*noLibHook*/
+	require('pop3.php');/*noLibHook*/
 
 	stream_wrapper_register('pop3', 'pop3_stream');  /* Register the pop3 stream handler class */
 
diff --git a/upload/ips_kernel/pop3class/test_pop3.php b/upload/ips_kernel/pop3class/test_pop3.php
index 8cf6ce08..adb87c25 100644
--- a/upload/ips_kernel/pop3class/test_pop3.php
+++ b/upload/ips_kernel/pop3class/test_pop3.php
@@ -13,12 +13,11 @@
 <BODY>
 <?php
 
-	require("pop3.php");
+	require("pop3.php");/*noLibHook*/
 
   /* Uncomment when using SASL authentication mechanisms */
 	/*
-	require("sasl.php");
-	*/
+	require("sasl.php");/*noLibHook*/
 
 	$pop3=new pop3_class;
 	$pop3->hostname="localhost";             /* POP 3 server host name                      */
diff --git a/upload/ips_kernel/sabre/LICENSE b/upload/ips_kernel/sabre/LICENSE
new file mode 100644
index 00000000..0bf9461e
--- /dev/null
+++ b/upload/ips_kernel/sabre/LICENSE
@@ -0,0 +1,28 @@
+Copyright (C) 2007-2011 Rooftop Solutions.
+Copyright (C) 2007-2009 FileMobile inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the SabreDAV nor the names of its contributors
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+     
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+    POSSIBILITY OF SUCH DAMAGE.
diff --git a/upload/ips_kernel/sabre/Sabre.autoload.php b/upload/ips_kernel/sabre/Sabre.autoload.php
new file mode 100644
index 00000000..f351227d
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre.autoload.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * SabreDAV's PHP autoloader
+ *
+ * Warning: this file is deprecated. Please use Sabre/autoload.php instead.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @deprecated
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+include dirname(__FILE__) . '/Sabre/autoload.php';/*noLibHook*/
diff --git a/upload/ips_kernel/sabre/Sabre.includes.php b/upload/ips_kernel/sabre/Sabre.includes.php
new file mode 100644
index 00000000..264dd0d3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre.includes.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Library include file
+ *
+ * This file contains all includes to the rest of the SabreDAV library
+ * Make sure the lib/ directory is in PHP's include_path
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/* Utilities */
+include 'Sabre/HTTP/Util.php';/*noLibHook*/
+include 'Sabre/HTTP/Response.php';/*noLibHook*/
+include 'Sabre/HTTP/Request.php';/*noLibHook*/
+include 'Sabre/HTTP/AbstractAuth.php';/*noLibHook*/
+include 'Sabre/HTTP/BasicAuth.php';/*noLibHook*/
+include 'Sabre/HTTP/DigestAuth.php';/*noLibHook*/
+include 'Sabre/HTTP/AWSAuth.php';/*noLibHook*/
+
+/* Version */
+include 'Sabre/DAV/Version.php';/*noLibHook*/
+include 'Sabre/HTTP/Version.php';/*noLibHook*/
+
+/* Exceptions */
+include 'Sabre/DAV/Exception.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/BadRequest.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/Conflict.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/FileNotFound.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/InsufficientStorage.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/Locked.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/LockTokenMatchesRequestUri.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/MethodNotAllowed.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/NotImplemented.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/Forbidden.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/PreconditionFailed.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/UnsupportedMediaType.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/NotAuthenticated.php';/*noLibHook*/
+
+include 'Sabre/DAV/Exception/ConflictingLock.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/ReportNotImplemented.php';/*noLibHook*/
+include 'Sabre/DAV/Exception/InvalidResourceType.php';/*noLibHook*/
+
+/* Properties */
+include 'Sabre/DAV/Property.php';/*noLibHook*/
+include 'Sabre/DAV/Property/GetLastModified.php';/*noLibHook*/
+include 'Sabre/DAV/Property/ResourceType.php';/*noLibHook*/
+include 'Sabre/DAV/Property/SupportedLock.php';/*noLibHook*/
+include 'Sabre/DAV/Property/LockDiscovery.php';/*noLibHook*/
+include 'Sabre/DAV/Property/IHref.php';/*noLibHook*/
+include 'Sabre/DAV/Property/Href.php';/*noLibHook*/
+include 'Sabre/DAV/Property/SupportedReportSet.php';/*noLibHook*/
+include 'Sabre/DAV/Property/Response.php';/*noLibHook*/
+include 'Sabre/DAV/Property/Principal.php';/*noLibHook*/
+
+/* Node interfaces */
+include 'Sabre/DAV/INode.php';/*noLibHook*/
+include 'Sabre/DAV/IFile.php';/*noLibHook*/
+include 'Sabre/DAV/ICollection.php';/*noLibHook*/
+include 'Sabre/DAV/IProperties.php';/*noLibHook*/
+include 'Sabre/DAV/ILockable.php';/*noLibHook*/
+include 'Sabre/DAV/IQuota.php';/*noLibHook*/
+include 'Sabre/DAV/IExtendedCollection.php';/*noLibHook*/
+
+/* Node abstract implementations */
+include 'Sabre/DAV/Node.php';/*noLibHook*/
+include 'Sabre/DAV/File.php';/*noLibHook*/
+include 'Sabre/DAV/Directory.php';/*noLibHook*/
+
+/* Utilities */
+include 'Sabre/DAV/SimpleDirectory.php';/*noLibHook*/
+include 'Sabre/DAV/XMLUtil.php';/*noLibHook*/
+include 'Sabre/DAV/URLUtil.php';/*noLibHook*/
+
+/* Filesystem implementation */
+include 'Sabre/DAV/FS/Node.php';/*noLibHook*/
+include 'Sabre/DAV/FS/File.php';/*noLibHook*/
+include 'Sabre/DAV/FS/Directory.php';/*noLibHook*/
+
+/* Advanced filesystem implementation */
+include 'Sabre/DAV/FSExt/Node.php';/*noLibHook*/
+include 'Sabre/DAV/FSExt/File.php';/*noLibHook*/
+include 'Sabre/DAV/FSExt/Directory.php';/*noLibHook*/
+
+/* Trees */
+include 'Sabre/DAV/Tree.php';/*noLibHook*/
+include 'Sabre/DAV/ObjectTree.php';/*noLibHook*/
+include 'Sabre/DAV/Tree/Filesystem.php';/*noLibHook*/
+
+/* Server */
+include 'Sabre/DAV/Server.php';/*noLibHook*/
+include 'Sabre/DAV/ServerPlugin.php';/*noLibHook*/
+
+/* Browser */
+include 'Sabre/DAV/Browser/Plugin.php';/*noLibHook*/
+include 'Sabre/DAV/Browser/MapGetToPropFind.php';/*noLibHook*/
+include 'Sabre/DAV/Browser/GuessContentType.php';/*noLibHook*/
+
+/* Locks */
+include 'Sabre/DAV/Locks/LockInfo.php';/*noLibHook*/
+include 'Sabre/DAV/Locks/Plugin.php';/*noLibHook*/
+include 'Sabre/DAV/Locks/Backend/Abstract.php';/*noLibHook*/
+include 'Sabre/DAV/Locks/Backend/FS.php';/*noLibHook*/
+include 'Sabre/DAV/Locks/Backend/PDO.php';/*noLibHook*/
+
+/* Temporary File Filter plugin */
+include 'Sabre/DAV/TemporaryFileFilterPlugin.php';/*noLibHook*/
+
+/* Authentication plugin */
+include 'Sabre/DAV/Auth/Plugin.php';/*noLibHook*/
+include 'Sabre/DAV/Auth/Backend/Abstract.php';/*noLibHook*/
+include 'Sabre/DAV/Auth/Backend/AbstractDigest.php';/*noLibHook*/
+include 'Sabre/DAV/Auth/Backend/File.php';/*noLibHook*/
+include 'Sabre/DAV/Auth/Backend/PDO.php';/*noLibHook*/
+
+include 'Sabre/DAV/Auth/Principal.php';/*noLibHook*/
+include 'Sabre/DAV/Auth/PrincipalCollection.php';/*noLibHook*/
+
+/* DavMount plugin */
+include 'Sabre/DAV/Mount/Plugin.php';/*noLibHook*/
+
+
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/Abstract.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/Abstract.php
new file mode 100644
index 00000000..c758a38b
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/Abstract.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Abstract Calendaring backend. Extend this class to create your own backends.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is 
+     *    accessed.
+     *  * principalUri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'. 
+     *
+     * @param string $principalUri 
+     * @return array 
+     */
+    abstract function getCalendarsForUser($principalUri);
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * This function must return a server-wide unique id that can be used 
+     * later to reference the calendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return string|int 
+     */
+    abstract function createCalendar($principalUri,$calendarUri,array $properties); 
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $properties
+     * @return bool|array 
+     */
+    public function updateCalendar($calendarId, array $properties) {
+        
+        return false; 
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects 
+     * 
+     * @param string $calendarId 
+     * @return void
+     */
+    abstract function deleteCalendar($calendarId);
+
+    /**
+     * Returns all calendar objects within a calendar object.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calnedar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     * 
+     * @param string $calendarId 
+     * @return array 
+     */
+    abstract function getCalendarObjects($calendarId);
+
+    /**
+     * Returns information from a single calendar object, based on it's object uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return array 
+     */
+    abstract function getCalendarObject($calendarId,$objectUri);
+
+    /**
+     * Creates a new calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Updates an existing calendarobject, based on it's uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
+
+    /**
+     * Deletes an existing calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return void
+     */
+    abstract function deleteCalendarObject($calendarId,$objectUri);
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/PDO.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/PDO.php
new file mode 100644
index 00000000..f60d1737
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/PDO.php
@@ -0,0 +1,356 @@
+<?php
+
+/**
+ * PDO CalDAV backend
+ *
+ * This backend is used to store calendar-data in a PDO database, such as 
+ * sqlite or MySQL
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
+
+    /**
+     * pdo 
+     * 
+     * @var PDO
+     */
+    private $pdo;
+
+    /**
+     * List of CalDAV properties, and how they map to database fieldnames
+     *
+     * Add your own properties by simply adding on to this array
+     * 
+     * @var array
+     */
+    public $propertyMap = array(
+        '{DAV:}displayname'                          => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
+    );
+
+    /**
+     * Creates the backend 
+     * 
+     * @param PDO $pdo 
+     */
+    public function __construct(PDO $pdo) {
+
+        $this->pdo = $pdo;
+
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is 
+     *    accessed.
+     *  * principalUri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'. 
+     *
+     * @param string $principalUri 
+     * @return array 
+     */
+    public function getCalendarsForUser($principalUri) {
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'ctag';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+
+        // Making fields a comma-delimited list 
+        $fields = implode(', ', $fields);
+        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM calendars WHERE principaluri = ?"); 
+        $stmt->execute(array($principalUri));
+
+        $calendars = array();
+        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+            $components = explode(',',$row['components']);
+
+            $calendar = array(
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
+                '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
+            );
+        
+
+            foreach($this->propertyMap as $xmlName=>$dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $calendars[] = $calendar;
+
+        }
+
+        return $calendars;
+
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return mixed
+     */
+    public function createCalendar($principalUri,$calendarUri, array $properties) {
+
+        $fieldNames = array(
+            'principaluri',
+            'uri',
+            'ctag',
+        );
+        $values = array(
+            ':principaluri' => $principalUri,
+            ':uri'          => $calendarUri,
+            ':ctag'         => 1,
+        );
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        $fieldNames[] = 'components';
+        if (!isset($properties[$sccs])) {
+            $values[':components'] = 'VEVENT,VTODO';
+        } else {
+            if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
+                throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
+            }
+            $values[':components'] = implode(',',$properties[$sccs]->getValue());
+        }
+
+        foreach($this->propertyMap as $xmlName=>$dbName) {
+            if (isset($properties[$xmlName])) {
+
+                $myValue = $properties[$xmlName];
+                $values[':' . $dbName] = $properties[$xmlName];
+                $fieldNames[] = $dbName;
+            }
+        }
+
+        $stmt = $this->pdo->prepare("INSERT INTO calendars (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
+        $stmt->execute($values);
+
+        return $this->pdo->lastInsertId();
+
+    }
+
+    /**
+     * Updates a calendars properties 
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param string $calendarId
+     * @param array $properties
+     * @return bool|array 
+     */
+    public function updateCalendar($calendarId, array $properties) {
+
+        $newValues = array();
+        $result = array(
+            200 => array(), // Ok
+            403 => array(), // Forbidden
+            424 => array(), // Failed Dependency
+        );
+
+        $hasError = false;
+
+        foreach($properties as $propertyName=>$propertyValue) {
+
+            // We don't know about this property. 
+            if (!isset($this->propertyMap[$propertyName])) {
+                $hasError = true;
+                $result[403][$propertyName] = null;
+                unset($properties[$propertyName]);
+                continue;
+            }
+
+            $fieldName = $this->propertyMap[$propertyName];
+            $newValues[$fieldName] = $propertyValue;
+                
+        }
+
+        // If there were any errors we need to fail the request
+        if ($hasError) {
+            // Properties has the remaining properties
+            foreach($properties as $propertyName=>$propertyValue) {
+                $result[424][$propertyName] = null;
+            }
+
+            // Removing unused statuscodes for cleanliness
+            foreach($result as $status=>$properties) {
+                if (is_array($properties) && count($properties)===0) unset($result[$status]);
+            }
+
+            return $result;
+
+        }
+
+        // Success
+
+        // Now we're generating the sql query.
+        $valuesSql = array();
+        foreach($newValues as $fieldName=>$value) {
+            $valuesSql[] = $fieldName . ' = ?';
+        }
+        $valuesSql[] = 'ctag = ctag + 1';
+
+        $stmt = $this->pdo->prepare("UPDATE calendars SET " . implode(', ',$valuesSql) . " WHERE id = ?");
+        $newValues['id'] = $calendarId; 
+        $stmt->execute(array_values($newValues));
+
+        return true; 
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects 
+     * 
+     * @param string $calendarId 
+     * @return void
+     */
+    public function deleteCalendar($calendarId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM calendarobjects WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+
+        $stmt = $this->pdo->prepare('DELETE FROM calendars WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Returns all calendar objects within a calendar object.
+     *
+     * Every item contains an array with the following keys:
+     *   * id - unique identifier which will be used for subsequent updates
+     *   * calendardata - The iCalendar-compatible calnedar data
+     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
+     *   * lastmodified - a timestamp of the last modification time
+     * 
+     * @param string $calendarId 
+     * @return array 
+     */
+    public function getCalendarObjects($calendarId) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM calendarobjects WHERE calendarid = ?');
+        $stmt->execute(array($calendarId));
+        return $stmt->fetchAll();
+
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return array 
+     */
+    public function getCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('SELECT * FROM calendarobjects WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId, $objectUri));
+        return $stmt->fetch();
+
+    }
+
+    /**
+     * Creates a new calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO calendarobjects (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
+        $stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
+        $stmt = $this->pdo->prepare('UPDATE calendars SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @param string $calendarData 
+     * @return void
+     */
+    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
+
+        $stmt = $this->pdo->prepare('UPDATE calendarobjects SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE calendars SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+    /**
+     * Deletes an existing calendar object. 
+     * 
+     * @param string $calendarId 
+     * @param string $objectUri 
+     * @return void
+     */
+    public function deleteCalendarObject($calendarId,$objectUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM calendarobjects WHERE calendarid = ? AND uri = ?');
+        $stmt->execute(array($calendarId,$objectUri));
+        $stmt = $this->pdo->prepare('UPDATE calendars SET ctag = ctag + 1 WHERE id = ?');
+        $stmt->execute(array($calendarId));
+
+    }
+
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/index.html b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Backend/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Calendar.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Calendar.php
new file mode 100644
index 00000000..b99878b7
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Calendar.php
@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * This object represents a CalDAV calendar.
+ *
+ * A calendar can contain multiple TODO and or Events. These are represented
+ * as Sabre_CalDAV_CalendarObject objects.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Calendar implements Sabre_DAV_ICollection, Sabre_DAV_IProperties {
+
+    /**
+     * This is an array with calendar information 
+     * 
+     * @var array 
+     */
+    private $calendarInfo;
+
+    /**
+     * CalDAV backend 
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract 
+     */
+    private $caldavBackend;
+
+    /**
+     * Authentication backend
+     * 
+     * @var Sabre_DAV_Auth_Backend_Abstract 
+     */
+    private $authBackend;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param array $calendarInfo 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_Auth_Backend_Abstract $authBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend,$calendarInfo) {
+
+        $this->caldavBackend = $caldavBackend;
+        $this->authBackend = $authBackend;
+        $this->calendarInfo = $calendarInfo;
+
+
+    }
+
+    /**
+     * Returns the name of the calendar 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->calendarInfo['uri'];
+
+    }
+
+    /**
+     * Updates properties such as the display name and description 
+     * 
+     * @param array $mutations 
+     * @return array 
+     */
+    public function updateProperties($mutations) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
+
+    }
+
+    /**
+     * Returns the list of properties 
+     * 
+     * @param array $properties 
+     * @return array 
+     */
+    public function getProperties($requestedProperties) {
+
+        $response = array();
+
+        if (!$this->hasPrivilege()) return array(); 
+
+        foreach($requestedProperties as $prop) switch($prop) {
+
+            case '{DAV:}resourcetype' : 
+                $response[$prop] =  new Sabre_DAV_Property_ResourceType(array('{urn:ietf:params:xml:ns:caldav}calendar','{DAV:}collection')); 
+                break;
+            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' : 
+                $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData(); 
+                break;
+            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' : 
+                $response[$prop] =  new Sabre_CalDAV_Property_SupportedCollationSet(); 
+                break;
+            case '{DAV:}owner' :
+                $response[$prop] = new Sabre_DAV_Property_Principal(Sabre_DAV_Property_Principal::HREF,$this->calendarInfo['principaluri']);
+                break;
+            default : 
+                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
+                break;
+
+        }
+        return $response;
+
+    }
+
+    /**
+     * Returns a calendar object
+     *
+     * The contained calendar objects are for example Events or Todo's.
+     * 
+     * @param string $name 
+     * @return Sabre_DAV_ICalendarObject 
+     */
+    public function getChild($name) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Calendar object not found');
+        return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+
+    }
+
+    /**
+     * Returns the full list of calendar objects  
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = array();
+        foreach($objs as $obj) {
+            $children[] = new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
+        }
+        return $children;
+
+    }
+
+    /**
+     * Checks if a child-node exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
+        if (!$obj) 
+            return false;
+        else 
+            return true;
+
+    }
+
+    /**
+     * Creates a new directory
+     *
+     * We actually block this, as subdirectories are not allowed in calendars.
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating collections in calendar objects is not allowed');
+
+    }
+
+    /**
+     * Creates a new file
+     *
+     * The contents of the new file must be a valid ICalendar string.
+     * 
+     * @param string $name 
+     * @param resource $calendarData 
+     * @return void
+     */
+    public function createFile($name,$calendarData = null) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        $calendarData = stream_get_contents($calendarData);
+
+        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set']->getValue();
+        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
+
+        $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
+
+    }
+
+    /**
+     * Deletes the calendar. 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Renames the calendar. Note that most calendars use the 
+     * {DAV:}displayname to display a name to display a name. 
+     * 
+     * @param string $newName 
+     * @return void
+     */
+    public function setName($newName) {
+
+        if (!$this->hasPrivilege()) throw new Sabre_DAV_Exception_Forbidden('Permission denied to access this calendar');
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Renaming calendars is not yet supported');
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp.
+     * 
+     * @return void
+     */
+    public function getLastModified() {
+
+        return null;
+
+    }
+
+    /**
+     * Check if user has access.
+     *
+     * This method does a check if the currently logged in user
+     * has permission to access this calendar. There is only read-write
+     * access, so you're in or you're out.
+     * 
+     * @return bool 
+     */
+    protected function hasPrivilege() {
+
+        if (!$user = $this->authBackend->getCurrentUser()) return false;
+        if ($user['uri']!==$this->calendarInfo['principaluri']) return false;
+        return true;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarObject.php b/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarObject.php
new file mode 100644
index 00000000..937bab19
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarObject.php
@@ -0,0 +1,176 @@
+<?php
+
+/**
+ * The CalendarObject represents a single VEVENT or VTODO within a Calendar. 
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_DAV_IProperties {
+
+    /**
+     * Sabre_CalDAV_Backend_Abstract 
+     * 
+     * @var array 
+     */
+    private $caldavBackend;
+
+    /**
+     * Array with information about this CalendarObject 
+     * 
+     * @var array 
+     */
+    private $objectData;
+
+    /**
+     * Array with information about the containing calendar
+     * 
+     * @var array 
+     */
+    private $calendarInfo;
+
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param array $objectData 
+     */
+    public function __construct(Sabre_CalDAV_Backend_Abstract $caldavBackend,$calendarInfo,$objectData) {
+
+        $this->caldavBackend = $caldavBackend;
+        $this->calendarInfo = $calendarInfo;
+        $this->objectData = $objectData;
+
+    }
+
+    /**
+     * Returns the uri for this object 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->objectData['uri'];
+
+    }
+
+    /**
+     * Returns the ICalendar-formatted object 
+     * 
+     * @return string 
+     */
+    public function get() {
+
+        return $this->objectData['calendardata'];
+
+    }
+
+    /**
+     * Updates the ICalendar-formatted object 
+     * 
+     * @param string $calendarData 
+     * @return void 
+     */
+    public function put($calendarData) {
+
+        if (is_resource($calendarData))
+            $calendarData = stream_get_contents($calendarData);
+
+        $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set']->getValue();
+        Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
+
+        $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
+        $this->objectData['calendardata'] = $calendarData;
+
+    }
+
+    /**
+     * Deletes the calendar object 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
+
+    }
+
+    /**
+     * Returns the mime content-type 
+     * 
+     * @return string 
+     */
+    public function getContentType() {
+
+        return 'text/calendar';
+
+    }
+
+    /**
+     * Returns an ETag for this object.
+     *
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     * 
+     * @return string 
+     */
+    public function getETag() {
+
+        return '"' . md5($this->objectData['calendardata']). '"';
+
+    }
+
+    /**
+     * Returns the list of properties for this object
+     * 
+     * @param array $properties 
+     * @return array 
+     */
+    public function getProperties($properties) {
+
+        $response = array();
+        if (in_array('{urn:ietf:params:xml:ns:caldav}calendar-data',$properties)) 
+            $response['{urn:ietf:params:xml:ns:caldav}calendar-data'] = str_replace("\r","",$this->objectData['calendardata']);
+       
+
+        return $response;
+
+    }
+
+    /**
+     * Updates properties
+     * 
+     * @param array $properties
+     * @return array 
+     */
+    public function updateProperties($properties) {
+
+        return false;
+
+    }
+
+    /**
+     * Returns the last modification date as a unix timestamp
+     * 
+     * @return time 
+     */
+    public function getLastModified() {
+
+        return strtotime($this->objectData['lastmodified']);
+
+    }
+
+    /**
+     * Returns the size of this object in bytes 
+     * 
+     * @return int
+     */
+    public function getSize() {
+
+        return strlen($this->objectData['calendardata']);
+
+    }
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarRootNode.php b/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarRootNode.php
new file mode 100644
index 00000000..322722a1
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/CalendarRootNode.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Users collection 
+ *
+ * This object is responsible for generating a collection of users.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_CalendarRootNode extends Sabre_DAV_Directory {
+
+    /**
+     * Authentication Backend 
+     * 
+     * @var Sabre_DAV_Auth_Backend_Abstract 
+     */
+    protected $authBackend;
+
+    /**
+     * CalDAV backend 
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract 
+     */
+    protected $caldavBackend;
+
+    /**
+     * Constructor 
+     *
+     * This constructor needs both an authentication and a caldav backend.
+     *
+     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     */
+    public function __construct(Sabre_DAV_Auth_Backend_Abstract $authBackend,Sabre_CalDAV_Backend_Abstract $caldavBackend) {
+
+        $this->authBackend = $authBackend;
+        $this->caldavBackend = $caldavBackend;
+
+    }
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return Sabre_CalDAV_Plugin::CALENDAR_ROOT;
+
+    }
+
+    /**
+     * Returns the list of users as Sabre_CalDAV_User objects. 
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $users = $this->authBackend->getUsers();
+        $children = array();
+        foreach($users as $user) {
+
+            $children[] = new Sabre_CalDAV_UserCalendars($this->authBackend, $this->caldavBackend, $user['uri']);
+
+        }
+        return $children;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/InvalidICalendarObject.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/InvalidICalendarObject.php
new file mode 100644
index 00000000..24873f5d
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/InvalidICalendarObject.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * InvalidICalendarObject
+ *
+ * This exception is thrown when an attempt is made to create or update
+ * an invalid ICalendar object
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Exception_InvalidICalendarObject extends Sabre_DAV_Exception_PreconditionFailed {
+
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/index.html b/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Exception/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/ICalendarUtil.php b/upload/ips_kernel/sabre/Sabre/CalDAV/ICalendarUtil.php
new file mode 100644
index 00000000..3772cc6a
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/ICalendarUtil.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * This class contains several utilities related to the ICalendar (rfc2445) format
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_ICalendarUtil {
+
+    /**
+     * Validates an ICalendar object
+     *
+     * This method makes sure this ICalendar object is properly formatted.
+     * If we can't parse it, we'll throw exceptions.
+     * 
+     * @param string $icalData 
+     * @param array $allowedComponents 
+     * @return bool 
+     */
+    static function validateICalendarObject($icalData, array $allowedComponents) {
+
+        $xcal = simplexml_load_string(self::toXCal($icalData));
+        if (!$xcal) throw new Sabre_CalDAV_Exception_InvalidICalendarObject('Invalid calendarobject format');
+
+        $xcal->registerXPathNameSpace('cal','urn:ietf:params:xml:ns:xcal');
+        
+        // Check if there's only 1 component
+        $components = array('vevent','vtodo','vjournal','vfreebusy');
+        $componentsFound = array();
+
+        foreach($components as $component) {
+            $test = $xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:' . $component);
+            if (is_array($test)) $componentsFound = array_merge($componentsFound, $test);
+        }
+        if (count($componentsFound)>1) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('Only 1 of VEVENT, VTODO, VJOURNAL or VFREEBUSY may be specified per calendar object');
+        }
+        if (count($componentsFound)<1) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('One VEVENT, VTODO, VJOURNAL or VFREEBUSY must be specified. 0 found.');
+        }
+        $component = $componentsFound[0];
+        
+        // Check if the component is allowed
+        $name = $component->getName();
+        if (!in_array(strtoupper($name),$allowedComponents)) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject(strtoupper($name) . ' is not allowed in this calendar.');
+        }
+
+        if (count($xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:method'))>0) {
+            throw new Sabre_CalDAV_Exception_InvalidICalendarObject('The METHOD property is not allowed in calendar objects');
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Converts ICalendar data to XML.
+     *
+     * Properties are converted to lowercase xml elements. Parameters are;
+     * converted to attributes. BEGIN:VEVENT is converted to <vevent> and
+     * END:VEVENT </vevent> as well as other components.
+     *
+     * It's a very loose parser. If any line does not conform to the spec, it
+     * will simply be ignored. It will try to detect if \r\n or \n line endings
+     * are used.
+     *
+     * @todo Currently quoted attributes are not parsed correctly.
+     * @see http://tools.ietf.org/html/draft-royer-calsch-xcal-03
+     * @param string $icalData 
+     * @return string. 
+     */
+    static function toXCAL($icalData) {
+
+        // Detecting line endings
+        $lb="\r\n";
+        if (strpos($icalData,"\r\n")!==false) $lb = "\r\n";
+        elseif (strpos($icalData,"\n")!==false) $lb = "\n";
+
+        // Splitting up items per line
+        $lines = explode($lb,$icalData);
+
+        // Properties can be folded over 2 lines. In this case the second
+        // line will be preceeded by a space or tab.
+        $lines2 = array();
+        foreach($lines as $line) {
+
+            if (!$line) continue;
+            if ($line[0]===" " || $line[0]==="\t") {
+                $lines2[count($lines2)-1].=substr($line,1);
+                continue;
+            }
+
+            $lines2[]=$line;
+
+        }
+
+        $xml = '<?xml version="1.0"?>' . "\n";
+        $xml.= "<iCalendar xmlns=\"urn:ietf:params:xml:ns:xcal\">\n";
+
+        $spaces = 2;
+        foreach($lines2 as $line) {
+
+            $matches = array();
+            // This matches PROPERTYNAME;ATTRIBUTES:VALUE
+            if (!preg_match('/^([^:^;]*)(?:;([^:]*))?:(.*)$/',$line,$matches))
+                continue;
+
+            $propertyName = strtolower($matches[1]);
+            $attributes = $matches[2];
+            $value = $matches[3];
+
+            // If the line was in the format BEGIN:COMPONENT or END:COMPONENT, we need to special case it.
+            if ($propertyName === 'begin') {
+                $xml.=str_repeat(" ",$spaces);
+                $xml.='<' . strtolower($value) . ">\n";
+                $spaces+=2;
+                continue;
+            } elseif ($propertyName === 'end') {
+                $spaces-=2;
+                $xml.=str_repeat(" ",$spaces);
+                $xml.='</' . strtolower($value) . ">\n";
+                continue;
+            }
+
+            $xml.=str_repeat(" ",$spaces);
+            $xml.='<' . $propertyName;
+            if ($attributes) {
+                // There can be multiple attributes
+                $attributes = explode(';',$attributes);
+                foreach($attributes as $att) {
+  
+                    list($attName,$attValue) = explode('=',$att,2);
+                    $attName = strtolower($attName);
+                    if ($attName === 'language') $attName='xml:lang';
+                    $xml.=' ' . $attName . '="' . htmlspecialchars($attValue) . '"';
+
+                }
+            }
+
+            $xml.='>'. htmlspecialchars(trim($value)) . '</' . $propertyName . ">\n";
+          
+        }
+        $xml.="</iCalendar>";
+        return $xml;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Plugin.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Plugin.php
new file mode 100644
index 00000000..7a29891b
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Plugin.php
@@ -0,0 +1,707 @@
+<?php
+
+/**
+ * CalDAV plugin
+ *
+ * This plugin provides functionality added by CalDAV (RFC 4791)
+ * It implements new reports, and the MKCALENDAR method.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the official CalDAV namespace
+     */
+    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+    
+    /**
+     * This is the namespace for the proprietary calendarserver extensions
+     */
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * The following constants are used to differentiate
+     * the various filters for the calendar-query report
+     */
+    const FILTER_COMPFILTER   = 1;
+    const FILTER_TIMERANGE    = 3;
+    const FILTER_PROPFILTER   = 4;
+    const FILTER_PARAMFILTER  = 5;
+    const FILTER_TEXTMATCH    = 6;
+
+    /**
+     * The hardcoded root for calendar objects. It is unfortunate
+     * that we're stuck with it, but it will have to do for now
+     */
+    const CALENDAR_ROOT = 'calendars';
+
+    /**
+     * Reference to server object 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        // The MKCALENDAR is only available on unmapped uri's, whose
+        // parents extend IExtendedCollection
+        list($parent, $name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        $node = $this->server->tree->getNodeForPath($parent);
+
+        if ($node instanceof Sabre_DAV_IExtendedCollection) {
+            try {
+                $node->getChild($name);
+            } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                return array('MKCALENDAR');
+            }
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the DAV: HTTP header. 
+     * 
+     * @return array 
+     */
+    public function getFeatures() {
+
+        return array('calendar-access');
+
+    }
+
+    /**
+     * Initializes the plugin 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
+        $server->subscribeEvent('report',array($this,'report'));
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
+        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
+
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
+
+        array_push($server->protectedProperties,
+
+            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
+            '{' . self::NS_CALDAV . '}supported-calendar-data',
+            '{' . self::NS_CALDAV . '}max-resource-size',
+            '{' . self::NS_CALDAV . '}min-date-time',
+            '{' . self::NS_CALDAV . '}max-date-time',
+            '{' . self::NS_CALDAV . '}max-instances',
+            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
+            '{' . self::NS_CALDAV . '}calendar-home-set',
+            '{' . self::NS_CALDAV . '}supported-collation-set',
+
+            // scheduling extension
+            '{' . self::NS_CALDAV . '}calendar-user-address-set'
+
+        );
+    }
+
+    /**
+     * This function handles support for the MKCALENDAR method
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function unknownMethod($method, $uri) {
+
+        if ($method!=='MKCALENDAR') return;
+
+        $this->httpMkCalendar($uri);
+        // false is returned to stop the unknownMethod event
+        return false;
+
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV 
+     * 
+     * @param string $reportName 
+     * @param DOMNode $dom 
+     * @return bool 
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) { 
+            case '{'.self::NS_CALDAV.'}calendar-multiget' :
+                $this->calendarMultiGetReport($dom);
+                return false;
+            case '{'.self::NS_CALDAV.'}calendar-query' :
+                $this->calendarQueryReport($dom);
+                return false;
+            default :
+                return true;
+
+        }
+
+
+    }
+
+    /**
+     * This function handles the MKCALENDAR HTTP method, which creates
+     * a new calendar.
+     * 
+     * @param string $uri
+     * @return void 
+     */
+    public function httpMkCalendar($uri) {
+
+        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
+        // for clients matching iCal in the user agent
+        //$ua = $this->server->httpRequest->getHeader('User-Agent');
+        //if (strpos($ua,'iCal/')!==false) {
+        //    throw new Sabre_DAV_Exception_Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //}
+
+        $body = $this->server->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $properties = array();
+        foreach($dom->firstChild->childNodes as $child) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
+            foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
+                $properties[$k] = $prop;
+            }
+        
+        }
+
+        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+
+        $this->server->createCollection($uri,$resourceType,$properties);
+
+        $this->server->httpResponse->sendStatus(201);
+        $this->server->httpResponse->setHeader('Content-Length',0);
+    }
+
+    /**
+     * afterGetProperties
+     *
+     * This method handler is invoked after properties for a specific resource
+     * are received. This allows us to add any properties that might have been
+     * missing.
+     * 
+     * @param string $path
+     * @param array $properties 
+     * @return void
+     */
+    public function afterGetProperties($path, &$properties) {
+
+        // Find out if we are currently looking at a principal resource
+        $currentNode = $this->server->tree->getNodeForPath($path);
+        if ($currentNode instanceof Sabre_DAV_Auth_Principal) {
+
+            // calendar-home-set property
+            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
+            if (array_key_exists($calHome,$properties[404])) {
+                $principalId = $currentNode->getName(); 
+                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
+                unset($properties[404][$calHome]);
+                $properties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
+            }
+
+            // calendar-user-address-set property
+            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
+            if (array_key_exists($calProp,$properties[404])) {
+
+                // Do we have an email address?
+                $props = $currentNode->getProperties(array('{http://sabredav.org/ns}email-address'));
+                if (isset($props['{http://sabredav.org/ns}email-address'])) {
+                    $email = $props['{http://sabredav.org/ns}email-address'];
+                } else {
+                    // We're going to make up an emailaddress
+                    $email = $currentNode->getName() . '.sabredav@' . $this->server->httpRequest->getHeader('host');
+                }
+                $properties[200][$calProp] = new Sabre_DAV_Property_Href('mailto:' . $email, false);
+                unset($properties[404][$calProp]);
+
+            }
+
+
+        }
+
+        if ($currentNode instanceof Sabre_CalDAV_Calendar || $currentNode instanceof Sabre_CalDAV_CalendarObject) {
+            if (array_key_exists('{DAV:}supported-report-set', $properties[200])) {
+                $properties[200]['{DAV:}supported-report-set']->addReport(array(
+                     '{' . self::NS_CALDAV . '}calendar-multiget',
+                     '{' . self::NS_CALDAV . '}calendar-query',
+                //     '{' . self::NS_CALDAV . '}supported-collation-set',
+                //     '{' . self::NS_CALDAV . '}free-busy-query',
+                ));
+            }
+        }
+
+        
+    }
+
+    /**
+     * This function handles the calendar-multiget REPORT.
+     *
+     * This report is used by the client to fetch the content of a series
+     * of urls. Effectively avoiding a lot of redundant requests.
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function calendarMultiGetReport($dom) {
+
+        $properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+        foreach($hrefElems as $elem) {
+            $uri = $this->server->calculateUri($elem->nodeValue);
+            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
+            $propertyList[]=$objProps;
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList));
+
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     * 
+     * @param DOMNode $dom 
+     * @return void
+     */
+    public function calendarQueryReport($dom) {
+
+        $requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
+
+        $filterNode = $dom->getElementsByTagNameNS('urn:ietf:params:xml:ns:caldav','filter');
+        if ($filterNode->length!==1) {
+            throw new Sabre_DAV_Exception_BadRequest('The calendar-query report must have a filter element');
+        }
+        $filters = Sabre_CalDAV_XMLUtil::parseCalendarQueryFilters($filterNode->item(0));
+
+        $requestedCalendarData = true;
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+            // We always retrieve calendar-data, as we need it for filtering.
+            $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+            // If calendar-data wasn't explicitly requested, we need to remove 
+            // it after processing.
+            $requestedCalendarData = false;
+        }
+
+        // These are the list of nodes that potentially match the requirement
+        $candidateNodes = $this->server->getPropertiesForPath($this->server->getRequestUri(),$requestedProperties,$this->server->getHTTPDepth(0));
+
+        $verifiedNodes = array();
+
+        foreach($candidateNodes as $node) {
+
+            // If the node didn't have a calendar-data property, it must not be a calendar object
+            if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) continue;
+
+            if ($this->validateFilters($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'],$filters)) {
+                
+                if (!$requestedCalendarData) {
+                    unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+                }
+                $verifiedNodes[] = $node;
+            } 
+
+        }
+
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($verifiedNodes));
+
+    }
+
+
+    /**
+     * Verify if a list of filters applies to the calendar data object 
+     *
+     * The calendarData object must be a valid iCalendar blob. The list of 
+     * filters must be formatted as parsed by Sabre_CalDAV_Plugin::parseCalendarQueryFilters
+     *
+     * @param string $calendarData 
+     * @param array $filters 
+     * @return bool 
+     */
+    public function validateFilters($calendarData,$filters) {
+
+        // We are converting the calendar object to an XML structure
+        // This makes it far easier to parse
+        $xCalendarData = Sabre_CalDAV_ICalendarUtil::toXCal($calendarData);
+        $xml = simplexml_load_string($xCalendarData);
+        $xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:xcal');
+
+        foreach($filters as $xpath=>$filter) {
+
+            // if-not-defined comes first
+            if (isset($filter['is-not-defined'])) {
+                if (!$xml->xpath($xpath))
+                    continue;
+                else
+                    return false;
+                
+            }
+
+            $elem = $xml->xpath($xpath);
+            
+            if (!$elem) return false;
+            $elem = $elem[0];
+
+            if (isset($filter['time-range'])) {
+
+                switch($elem->getName()) {
+                    case 'vevent' :
+                        $result = $this->validateTimeRangeFilterForEvent($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vtodo' :
+                        $result = $this->validateTimeRangeFilterForTodo($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vjournal' :
+                        // TODO: not implemented
+                        break;
+                        $result = $this->validateTimeRangeFilterForJournal($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'vfreebusy' :
+                        // TODO: not implemented
+                        break;
+                        $result = $this->validateTimeRangeFilterForFreeBusy($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+                    case 'valarm' :
+                        // TODO: not implemented
+                        break;
+                        $result = $this->validateTimeRangeFilterForAlarm($xml,$xpath,$filter);
+                        if ($result===false) return false;
+                        break;
+
+                }
+
+            } 
+
+            if (isset($filter['text-match'])) {
+                $currentString = (string)$elem;
+
+                $isMatching = $this->substringMatch($currentString, $filter['text-match']['value'], $filter['text-match']['collation']);
+                if ($filter['text-match']['negate-condition'] && $isMatching) return false;
+                if (!$filter['text-match']['negate-condition'] && !$isMatching) return false;
+                
+            }
+
+        }
+        return true;
+        
+    }
+
+    private function validateTimeRangeFilterForEvent(SimpleXMLElement $xml,$currentXPath,array $currentFilter) {
+
+        // Grabbing the DTSTART property
+        $xdtstart = $xml->xpath($currentXPath.'/c:dtstart');
+        if (!count($xdtstart)) {
+            throw new Sabre_DAV_Exception_BadRequest('DTSTART property missing from calendar object');
+        }
+
+        // The dtstart can be both a date, or datetime property
+        if ((string)$xdtstart[0]['value']==='DATE') {
+            $isDateTime = false;
+        } else {
+            $isDateTime = true;
+        }
+
+        // Determining the timezone
+        if ($tzid = (string)$xdtstart[0]['tzid']) {
+            $tz = new DateTimeZone($tzid);
+        } else {
+            $tz = null;
+        }
+        if ($isDateTime) {
+            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtstart[0],$tz);
+        } else {
+            $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtstart[0]);
+        }
+
+
+        // Grabbing the DTEND property
+        $xdtend = $xml->xpath($currentXPath.'/c:dtend');
+        $dtend = null;
+
+        if (count($xdtend)) {
+            // Determining the timezone
+            if ($tzid = (string)$xdtend[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+
+            // Since the VALUE parameter of both DTSTART and DTEND must be the same
+            // we can assume we don't need to check the VALUE paramter of DTEND.
+            if ($isDateTime) {
+                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtend[0],$tz);
+            } else {
+                $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtend[0],$tz);
+            }
+
+        } 
+        
+        if (is_null($dtend)) {
+            // The DTEND property was not found. We will first see if the event has a duration
+            // property
+
+            $xduration = $xml->xpath($currentXPath.'/c:duration');
+            if (count($xduration)) {
+                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
+
+                // Making sure that the duration is bigger than 0 seconds.
+                $tempDT = clone $dtstart;
+                $tempDT->modify($duration);
+                if ($tempDT > $dtstart) {
+
+                    // use DTEND = DTSTART + DURATION 
+                    $dtend = $tempDT;
+                } else {
+                    // use DTEND = DTSTART
+                    $dtend = $dtstart;
+                }
+
+            }
+        }
+
+        if (is_null($dtend)) {
+            if ($isDateTime) {
+                // DTEND = DTSTART
+                $dtend = $dtstart;
+            } else {
+                // DTEND = DTSTART + 1 DAY
+                $dtend = clone $dtstart;
+                $dtend->modify('+1 day');
+            }
+        }
+       
+        if (!is_null($currentFilter['time-range']['start']) && $currentFilter['time-range']['start'] >= $dtend)  return false;
+        if (!is_null($currentFilter['time-range']['end'])   && $currentFilter['time-range']['end']   <= $dtstart) return false;
+        return true;
+    
+    }
+
+    private function validateTimeRangeFilterForTodo(SimpleXMLElement $xml,$currentXPath,array $filter) {
+
+        // Gathering all relevant elements
+
+        $dtStart = null;
+        $duration = null;
+        $due = null;
+        $completed = null;
+        $created = null;
+
+        $xdt = $xml->xpath($currentXPath.'/c:dtstart');
+        if (count($xdt)) {
+            // The dtstart can be both a date, or datetime property
+            if ((string)$xdt[0]['value']==='DATE') {
+                $isDateTime = false;
+            } else {
+                $isDateTime = true;
+            }
+
+            // Determining the timezone
+            if ($tzid = (string)$xdt[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+            if ($isDateTime) {
+                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
+            } else {
+                $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
+            }
+        }
+
+        // Only need to grab duration if dtStart is set
+        if (!is_null($dtStart)) {
+
+            $xduration = $xml->xpath($currentXPath.'/c:duration');
+            if (count($xduration)) {
+                $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
+            }
+
+        }
+
+        if (!is_null($dtStart) && !is_null($duration)) {
+
+            // Comparision from RFC 4791:
+            // (start <= DTSTART+DURATION) AND ((end > DTSTART) OR (end >= DTSTART+DURATION))
+
+            $end = clone $dtStart;
+            $end->modify($duration);
+
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $end) &&
+                (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $dtStart || $filter['time-range']['end'] >= $end) ) {
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        // Need to grab the DUE property
+        $xdt = $xml->xpath($currentXPath.'/c:due');
+        if (count($xdt)) {
+            // The due property can be both a date, or datetime property
+            if ((string)$xdt[0]['value']==='DATE') {
+                $isDateTime = false;
+            } else {
+                $isDateTime = true;
+            }
+            // Determining the timezone
+            if ($tzid = (string)$xdt[0]['tzid']) {
+                $tz = new DateTimeZone($tzid);
+            } else {
+                $tz = null;
+            }
+            if ($isDateTime) {
+                $due = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
+            } else {
+                $due = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
+            }
+        }
+
+        if (!is_null($dtStart) && !is_null($due)) {
+
+            // Comparision from RFC 4791:
+            // ((start < DUE) OR (start <= DTSTART)) AND ((end > DTSTART) OR (end >= DUE))
+            
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due || $filter['time-range']['start'] < $dtstart) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        if (!is_null($dtStart)) {
+            
+            // Comparision from RFC 4791
+            // (start <= DTSTART)  AND (end > DTSTART)
+            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $dtStart) &&
+                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] > $dtStart) ) {
+                 return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        if (!is_null($due)) {
+            
+            // Comparison from RFC 4791
+            // (start < DUE) AND (end >= DUE)
+            if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due) &&
+                 (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $due) ) {
+                 return true;
+            } else {
+                return false;
+            }
+
+        }
+        // Need to grab the COMPLETED property
+        $xdt = $xml->xpath($currentXPath.'/c:completed');
+        if (count($xdt)) {
+            $completed = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
+        }
+        // Need to grab the CREATED property
+        $xdt = $xml->xpath($currentXPath.'/c:created');
+        if (count($xdt)) {
+            $created = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
+        }
+
+        if (!is_null($completed) && !is_null($created)) {
+            // Comparison from RFC 4791
+            // ((start <= CREATED) OR (start <= COMPLETED)) AND ((end >= CREATED) OR (end >= COMPLETED))
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $created || $filter['time-range']['start'] <= $completed) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $created   || $filter['time-range']['end'] >= $completed)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if (!is_null($completed)) {
+            // Comparison from RFC 4791
+            // (start <= COMPLETED) AND (end  >= COMPLETED)
+            if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $completed) &&
+                (is_null($filter['time-range']['end'])   || $filter['time-range']['end'] >= $completed)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        if (!is_null($created)) {
+            // Comparison from RFC 4791
+            // (end > CREATED)
+            if( (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $created) ) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        // Everything else is TRUE
+        return true;
+
+    }
+
+    public function substringMatch($haystack, $needle, $collation) {
+
+        switch($collation) {
+            case 'i;ascii-casemap' :
+                // default strtolower takes locale into consideration
+                // we don't want this.
+                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
+                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
+                return strpos($haystack, $needle)!==false;
+
+            case 'i;octet' :
+                return strpos($haystack, $needle)!==false;
+            
+            default:
+                throw new Sabre_DAV_Exception_BadRequest('Unknown collation: ' . $collation);
+        }                
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
new file mode 100644
index 00000000..5a1862d0
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Supported component set property
+ *
+ * This property is a representation of the supported-calendar_component-set 
+ * property in the CalDAV namespace. It simply requires an array of components,
+ * such as VEVENT, VTODO
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
+
+    /**
+     * List of supported components, such as "VEVENT, VTODO" 
+     * 
+     * @var array 
+     */
+    private $components;
+
+    /**
+     * Creates the property 
+     * 
+     * @param array $components 
+     */
+    public function __construct(array $components) {
+
+       $this->components = $components; 
+
+    }
+
+    /**
+     * Returns the list of supported components 
+     * 
+     * @return array 
+     */
+    public function getValue() {
+
+        return $this->components;
+
+    }
+
+    /**
+     * Serializes the property in a DOMDocument 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+       $doc = $node->ownerDocument;
+       foreach($this->components as $component) {
+
+            $xcomp = $doc->createElement('cal:comp');
+            $xcomp->setAttribute('name',$component);
+            $node->appendChild($xcomp); 
+
+       }
+
+    }
+
+    /**
+     * Unserializes the DOMElement back into a Property class.
+     * 
+     * @param DOMElement $node 
+     * @return void
+     */
+    static function unserialize(DOMElement $node) {
+
+        $components = array();
+        foreach($node->childNodes as $childNode) {
+            if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)==='{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}comp') {
+                $components[] = $childNode->getAttribute('name');
+            }
+        }
+        return new self($components);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarData.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarData.php
new file mode 100644
index 00000000..3e9a9d76
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Supported-calendar-data property
+ *
+ * This property is a representation of the supported-calendar-data property
+ * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
+ * so the value is currently hardcoded.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
+
+    /**
+     * Serializes the property in a DOMDocument 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+
+        $prefix = isset($server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV])?$server->xmlNamespaces[Sabre_CalDAV_Plugin::NS_CALDAV]:'cal';
+
+        $caldata = $doc->createElement($prefix . ':calendar-data');
+        $caldata->setAttribute('content-type','text/calendar');
+        $caldata->setAttribute('version','2.0');
+
+        $node->appendChild($caldata); 
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCollationSet.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCollationSet.php
new file mode 100644
index 00000000..2f96591b
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * supported-collation-set property
+ *
+ * This property is a representation of the supported-collation-set property
+ * in the CalDAV namespace. 
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
+
+    function serialize(Sabre_DAV_Server $server,DOMElement $node) {
+
+        $doc = $node->ownerDocument;
+        
+        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
+        if (!$prefix) $prefix = 'cal';
+
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
+        );
+        $node->appendChild(
+            $doc->createElement($prefix . ':supported-collation','i;octet')
+        );
+
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Property/index.html b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Property/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Server.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Server.php
new file mode 100644
index 00000000..33f7a39c
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Server.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * CalDAV server
+ *
+ * This script is a convenience script. It quickly sets up a WebDAV server
+ * with caldav and ACL support, and it creates the root 'principals' and
+ * 'calendars' collections.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Server extends Sabre_DAV_Server {
+
+    /**
+     * Sets up the object. A PDO object must be passed to setup all the backends.
+     * 
+     * @param PDO $pdo 
+     */
+    public function __construct(PDO $pdo) {
+
+        /* Backends */
+        $authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
+        $calendarBackend = new Sabre_CalDAV_Backend_PDO($pdo);
+
+        /* Directory structure */
+        $root = new Sabre_DAV_SimpleDirectory('root');
+        $principals = new Sabre_DAV_Auth_PrincipalCollection($authBackend);
+        $root->addChild($principals);
+        $calendars = new Sabre_CalDAV_CalendarRootNode($authBackend, $calendarBackend);
+        $root->addChild($calendars);
+
+        $objectTree = new Sabre_DAV_ObjectTree($root);
+        
+        /* Initializing server */
+        parent::__construct($objectTree);
+
+        /* Server Plugins */
+        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'SabreDAV');
+        $this->addPlugin($authPlugin);
+
+        $caldavPlugin = new Sabre_CalDAV_Plugin();
+        $this->addPlugin($caldavPlugin);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/UserCalendars.php b/upload/ips_kernel/sabre/Sabre/CalDAV/UserCalendars.php
new file mode 100644
index 00000000..c81b70ba
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/UserCalendars.php
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * The UserCalenders class contains all calendars associated to one user 
+ * 
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection {
+
+    /**
+     * Authentication backend 
+     * 
+     * @var Sabre_DAV_Auth_Backend_Abstract 
+     */
+    protected $authBackend;
+
+    /**
+     * Array with user information 
+     * 
+     * @var array 
+     */
+    protected $userUri;
+
+    /**
+     * CalDAV backend
+     * 
+     * @var Sabre_CalDAV_Backend_Abstract
+     */
+    protected $caldavBackend;
+    
+    /**
+     * Constructor 
+     * 
+     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
+     * @param Sabre_CalDAV_Backend_Abstract $caldavBackend 
+     * @param mixed $userUri 
+     */
+    public function __construct(Sabre_DAV_Auth_Backend_Abstract $authBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $userUri) {
+
+        $this->authBackend = $authBackend;
+        $this->caldavBackend = $caldavBackend;
+        $this->userUri = $userUri;
+       
+    }
+
+    /**
+     * Returns the name of this object 
+     * 
+     * @return string
+     */
+    public function getName() {
+      
+        list(,$name) = Sabre_DAV_URLUtil::splitPath($this->userUri);
+        return $name; 
+
+    }
+
+    /**
+     * Updates the name of this object 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Deletes this object 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden();
+
+    }
+
+    /**
+     * Returns the last modification date 
+     * 
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return null; 
+
+    }
+
+    /**
+     * Creates a new file under this object.
+     *
+     * This is currently not allowed
+     * 
+     * @param string $filename 
+     * @param resource $data 
+     * @return void
+     */
+    public function createFile($filename, $data=null) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new files in this collection is not supported');
+
+    }
+
+    /**
+     * Creates a new directory under this object.
+     *
+     * This is currently not allowed.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function createDirectory($filename) {
+
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Creating new collections in this collection is not supported');
+
+    }
+
+    /**
+     * Returns a single calendar, by name 
+     * 
+     * @param string $name
+     * @todo needs optimizing
+     * @return Sabre_CalDAV_Calendar 
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return $child;
+
+        }
+        throw new Sabre_DAV_Exception_FileNotFound('Calendar with name \'' . $name . '\' could not be found');
+
+    }
+
+    /**
+     * Checks if a calendar exists.
+     * 
+     * @param string $name
+     * @todo needs optimizing
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        foreach($this->getChildren() as $child) {
+            if ($name==$child->getName())
+                return true; 
+
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns a list of calendars
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->userUri);
+        $objs = array();
+        foreach($calendars as $calendar) {
+            $objs[] = new Sabre_CalDAV_Calendar($this->authBackend, $this->caldavBackend, $calendar);
+        }
+        return $objs;
+
+    }
+
+    /**
+     * Creates a new calendar
+     * 
+     * @param string $name 
+     * @param string $properties 
+     * @return void
+     */
+    public function createExtendedCollection($name, array $resourceType, array $properties) {
+
+        if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar',$resourceType) || count($resourceType)!==2) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('Unknown resourceType for this collection');
+        }
+        $this->caldavBackend->createCalendar($this->userUri, $name, $properties);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/Version.php b/upload/ips_kernel/sabre/Sabre/CalDAV/Version.php
new file mode 100644
index 00000000..d7b2e6af
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_CalDAV version constants.
+ * 
+ * @package Sabre
+ * @subpackage CalDAV 
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.3.0';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/XMLUtil.php b/upload/ips_kernel/sabre/Sabre/CalDAV/XMLUtil.php
new file mode 100644
index 00000000..dfa58a0a
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/XMLUtil.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * XML utilities for CalDAV 
+ *
+ * This class contains a few static methods used for parsing certain CalDAV 
+ * requests.
+ *
+ * @package Sabre
+ * @subpackage CalDAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_CalDAV_XMLUtil {
+
+    /**
+     * This function parses the calendar-query report request body
+     *
+     * The body is quite complicated, so we're turning it into a PHP
+     * array.
+     *
+     * The resulting associative array has xpath expressions as keys.
+     * By default the xpath expressions should simply be checked for existance
+     * The xpath expressions can point to elements or attributes.
+     * 
+     * The array values can contain a number of items, which alters the query
+     * filter. 
+     *
+     * * time-range. Must also check if the todo or event falls within the
+     *               specified timerange. How this is interpreted depends on
+     *               the type of object (VTODO, VEVENT, VJOURNAL, etc)
+     * * is-not-defined
+     *               Instead of checking if the attribute or element exist,
+     *               we must check if it doesn't.
+     * * text-match
+     *               Checks if the value of the attribute or element matches
+     *               the specified value. This is actually another array with
+     *               the 'collation', 'value' and 'negate-condition' items.
+     *
+     * Refer to the CalDAV spec for more information.
+     * 
+     * @param DOMNode $domNode 
+     * @param string $basePath used for recursive calls.
+     * @param array $filters used for recursive calls.
+     * @return array 
+     */
+    static public function parseCalendarQueryFilters($domNode,$basePath = '/c:iCalendar', &$filters = array()) {
+
+        foreach($domNode->childNodes as $child) {
+
+            switch(Sabre_DAV_XMLUtil::toClarkNotation($child)) {
+
+                case '{urn:ietf:params:xml:ns:caldav}comp-filter' :
+                case '{urn:ietf:params:xml:ns:caldav}prop-filter' :
+                   
+                    $filterName = $basePath . '/' . 'c:' . strtolower($child->getAttribute('name'));
+                    $filters[$filterName] = array(); 
+
+                    self::parseCalendarQueryFilters($child, $filterName,$filters);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}time-range' :
+               
+                    if ($start = $child->getAttribute('start')) {
+                        $start = self::parseICalendarDateTime($start);
+                    } else {
+                        $start = null;
+                    }
+                    if ($end = $child->getAttribute('end')) {
+                        $end = self::parseICalendarDateTime($end);
+                    } else {
+                        $end = null;
+                    }
+
+                    if (!is_null($start) && !is_null($end) && $end <= $start) {
+                        throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
+                    }
+
+                    $filters[$basePath]['time-range'] = array(
+                        'start' => $start,
+                        'end'   => $end
+                    );
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}is-not-defined' :
+                    $filters[$basePath]['is-not-defined'] = true;
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}param-filter' :
+               
+                    $filterName = $basePath . '/@' . strtolower($child->getAttribute('name'));
+                    $filters[$filterName] = array();
+                    self::parseCalendarQueryFilters($child, $filterName, $filters);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}text-match' :
+               
+                    $collation = $child->getAttribute('collation');
+                    if (!$collation) $collation = 'i;ascii-casemap';
+
+                    $filters[$basePath]['text-match'] = array(
+                        'collation' => $collation,
+                        'negate-condition' => $child->getAttribute('negate-condition')==='yes',
+                        'value' => $child->nodeValue,
+                    );
+                    break;
+
+            }
+
+        }
+
+        return $filters;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * Specifying a reference timezone is optional. It will only be used
+     * if the non-UTC format is used. The argument is used as a reference, the 
+     * returned DateTime object will still be in the UTC timezone.
+     *
+     * @param string $dt 
+     * @param DateTimeZone $tz 
+     * @return DateTime 
+     */
+    static public function parseICalendarDateTime($dt,DateTimeZone $tz = null) {
+
+        // Format is YYYYMMDD + "T" + hhmmss 
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
+        }
+
+        if ($matches[7]==='Z' || is_null($tz)) {
+            $tz = new DateTimeZone('UTC');
+        } 
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
+
+        // Still resetting the timezone, to normalize everything to UTC
+        $date->setTimeZone(new DateTimeZone('UTC'));
+        return $date;
+
+    }
+
+    /**
+     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
+     *
+     * @param string $date 
+     * @param DateTimeZone $tz 
+     * @return DateTime 
+     */
+    static public function parseICalendarDate($date) {
+
+        // Format is YYYYMMDD
+        $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
+
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
+        }
+
+        $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
+        return $date;
+
+    }
+   
+    /**
+     * Parses an iCalendar (RFC5545) formatted duration and returns a string suitable
+     * for strtotime or DateTime::modify.
+     *
+     * NOTE: When we require PHP 5.3 this can be replaced by the DateTimeInterval object, which
+     * supports ISO 8601 Intervals, which is a superset of ICalendar durations.
+     *
+     * For now though, we're just gonna live with this messy system
+     *
+     * @param string $duration
+     * @return string
+     */
+    static public function parseICalendarDuration($duration) {
+
+        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
+        if (!$result) {
+            throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
+        }
+       
+        $parts = array(
+            'week',
+            'day',
+            'hour',
+            'minute',
+            'second',
+        );
+
+        $newDur = '';
+        foreach($parts as $part) {
+            if (isset($matches[$part]) && $matches[$part]) {
+                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
+            }
+        }
+
+        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
+        return $newDur;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/CalDAV/index.html b/upload/ips_kernel/sabre/Sabre/CalDAV/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/CalDAV/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Abstract.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Abstract.php
new file mode 100644
index 00000000..79383fa3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Abstract.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This is the base class for any authentication object.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_Abstract {
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @return bool 
+     */
+    abstract public function authenticate(Sabre_DAV_Server $server,$realm); 
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     * 
+     * @return array|null
+     */
+    abstract public function getCurrentUser();
+
+    /**
+     * Returns the full list of users.
+     *
+     * This method must at least return a uri for each user.
+     *
+     * It is optional to implement this.
+     * 
+     * @return array 
+     */
+    public function getUsers() {
+
+        return array();
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractBasic.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractBasic.php
new file mode 100644
index 00000000..e81ca00f
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * HTTP Basic authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Basic
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the authenticateInternal and getUserInfo methods
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author James David Low (http://jameslow.com/)
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractBasic extends Sabre_DAV_Auth_Backend_Abstract {
+
+    /**
+     * This variable holds information about the currently
+     * logged in user.
+     *
+     * @var array|null
+     */
+    protected $currentUser;
+
+    /**
+     * Validates a username and password
+     *
+     * If the username and password were correct, this method must return
+     * an array with at least a 'uri' key.  
+     *
+     * If the credentials are incorrect, this method must return false.
+     *
+     * @return bool|array
+     */
+    abstract protected function validateUserPass($username, $password);
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return array|null
+     */
+    public function getCurrentUser() {
+        return $this->currentUser;
+    }
+
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $auth = new Sabre_HTTP_BasicAuth();
+        $auth->setHTTPRequest($server->httpRequest);
+        $auth->setHTTPResponse($server->httpResponse);
+        $auth->setRealm($realm);
+        $userpass = $auth->getUserPass();
+        if (!$userpass) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No basic authentication headers were found');
+        }
+
+        // Authenticates the user
+        if (!($userData = $this->validateUserPass($userpass[0],$userpass[1]))) {
+            $auth->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Username or password does not match');
+        }
+        if (!isset($userData['uri'])) {
+            throw new Sabre_DAV_Exception('The returned array from validateUserPass must contain at a uri element');
+        }
+        $this->currentUser = $userData;
+        return true;
+    }
+
+
+} 
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractDigest.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractDigest.php
new file mode 100644
index 00000000..d8cdcb18
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * HTTP Digest authentication backend class
+ *
+ * This class can be used by authentication objects wishing to use HTTP Digest
+ * Most of the digest logic is handled, implementors just need to worry about 
+ * the getUserInfo method 
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Auth_Backend_AbstractDigest extends Sabre_DAV_Auth_Backend_Abstract {
+
+    /**
+     * This variable holds information about the currently
+     * logged in user.
+     * 
+     * @var array|null
+     */
+    protected $currentUser;
+
+    /**
+     * Returns a users information based on its username
+     *
+     * The returned struct must contain at least a uri 
+     * element (which can be identical to username) as well as a digestHash
+     * element.
+     *
+     * If the user was not known, false must be returned. 
+     * 
+     * @param string $realm
+     * @param string $username 
+     * @return array 
+     */
+    abstract public function getUserInfo($realm, $username);
+
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool 
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $digest = new Sabre_HTTP_DigestAuth();
+
+        // Hooking up request and response objects
+        $digest->setHTTPRequest($server->httpRequest);
+        $digest->setHTTPResponse($server->httpResponse);
+
+        $digest->setRealm($realm);
+        $digest->init();
+
+        $username = $digest->getUsername();
+
+        // No username was given
+        if (!$username) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('No digest authentication headers were found');
+        }
+
+        $userData = $this->getUserInfo($realm, $username);
+        // If this was false, the user account didn't exist
+        if ($userData===false) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('The supplied username was not on file');
+        }
+        if (!is_array($userData)) {
+            throw new Sabre_DAV_Exception('The returntype for getUserInfo must be either false or an array');
+        }
+
+        if (!isset($userData['uri']) || !isset($userData['digestHash'])) {
+            throw new Sabre_DAV_Exception('The returned array from getUserInfo must contain at least a uri and digestHash element');
+        }
+
+        // If this was false, the password or part of the hash was incorrect.
+        if (!$digest->validateA1($userData['digestHash'])) {
+            $digest->requireLogin();
+            throw new Sabre_DAV_Exception_NotAuthenticated('Incorrect username');
+        }
+
+        $this->currentUser = $userData;
+        return true;
+
+    }
+
+    /**
+     * Returns information about the currently logged in user. 
+     * 
+     * @return array|null 
+     */
+    public function getCurrentUser() {
+
+        return $this->currentUser;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Apache.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Apache.php
new file mode 100644
index 00000000..0b46270f
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/Apache.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Apache authenticator
+ *
+ * This authentication backend assumes that auhtentication has been
+ * conifgured in apache, rather than within SabreDAV.
+ *
+ * Make sure apache is properly configured for this to work.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_Apache extends Sabre_DAV_Auth_Backend_Abstract {
+
+    /**
+     * Current apache user 
+     * 
+     * @var string 
+     */
+    protected $remoteUser;
+    
+    /**
+     * Authenticates the user based on the current request.
+     *
+     * If authentication is succesful, true must be returned.
+     * If authentication fails, an exception must be thrown.
+     *
+     * @return bool 
+     */
+    public function authenticate(Sabre_DAV_Server $server,$realm) {
+
+        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
+        if (is_null($remoteUser)) {
+            throw new Sabre_DAV_Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
+        }
+
+        $this->remoteUser = $remoteUser;
+        return true;
+
+    }
+
+    /**
+     * Returns information about the currently logged in user.
+     *
+     * If nobody is currently logged in, this method should return null.
+     * 
+     * @return array|null
+     */
+    public function getCurrentUser() {
+
+        return array(
+            'uri' => 'principals/' . $this->remoteUser,
+        );
+
+    }
+
+    /**
+     * Returns the full list of users.
+     *
+     * This method must at least return a uri for each user.
+     *
+     * It is optional to implement this.
+     * 
+     * @return array 
+     */
+    public function getUsers() {
+
+        return array($this->getCurrentUser());
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/File.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/File.php
new file mode 100644
index 00000000..953c49e6
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/File.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    /**
+     * List of users 
+     * 
+     * @var array
+     */
+    protected $users = array();
+
+    /**
+     * Creates the backend object. 
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function __construct($filename=null) {
+
+        if (!is_null($filename))
+            $this->loadFile($filename);
+
+    }
+
+    /**
+     * Loads an htdigest-formatted file. This method can be called multiple times if
+     * more than 1 file is used.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function loadFile($filename) {
+
+        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
+
+            if (substr_count($line, ":") !== 2) 
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
+            
+            list($username,$realm,$A1) = explode(':',$line);
+
+            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
+                throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
+                
+            $this->users[$username] = array(
+                'digestHash' => $A1,
+                'uri'        => 'principals/' . $username
+            );
+
+        }
+
+    }
+
+    /**
+     * Returns a users' information
+     * 
+     * @param string $realm 
+     * @param string $username 
+     * @return string 
+     */
+    public function getUserInfo($realm, $username) {
+
+        return isset($this->users[$username])?$this->users[$username]:false;
+
+    }
+
+
+    /**
+     * Returns the full list of users.
+     *
+     * This method must at least return a uri for each user.
+     * 
+     * @return array 
+     */
+    public function getUsers() {
+
+        $re = array();
+        foreach($this->users as $userName=>$A1) {
+
+            $re[] = array(
+                'uri'=>'principals/' . $userName
+            );
+
+        }
+
+        return $re;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/PDO.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/PDO.php
new file mode 100644
index 00000000..c8808580
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/PDO.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This is an authentication backend that uses a file to manage passwords.
+ *
+ * The backend file must conform to Apache's htdigest format
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
+
+    private $pdo;
+
+    /**
+     * Creates the backend object. 
+     *
+     * If the filename argument is passed in, it will parse out the specified file fist.
+     * 
+     * @param string $filename 
+     * @return void
+     */
+    public function __construct(PDO $pdo) {
+
+        $this->pdo = $pdo;
+
+    }
+
+    /**
+     * Returns a users' information 
+     * 
+     * @param string $realm 
+     * @param string $username 
+     * @return string 
+     */
+    public function getUserInfo($realm,$username) {
+
+        $stmt = $this->pdo->prepare('SELECT username, digesta1, email FROM users WHERE username = ?');
+        $stmt->execute(array($username));
+        $result = $stmt->fetchAll();
+
+        if (!count($result)) return false;
+        $user = array(
+            'uri' => 'principals/' . $result[0]['username'],
+            'digestHash' => $result[0]['digesta1'],
+        );
+        if ($result[0]['email']) $user['{http://sabredav.org/ns}email-address'] = $result[0]['email'];
+        return $user;
+
+    }
+
+    /**
+     * Returns a list of all users
+     *
+     * @return array
+     */
+    public function getUsers() {
+
+        $result = $this->pdo->query('SELECT username, email FROM users')->fetchAll();
+        
+        $rv = array();
+        foreach($result as $user) {
+
+            $r = array(
+                'uri' => 'principals/' . $user['username'],
+            );
+            if ($user['email']) $r['{http://sabredav.org/ns}email-address'] = $user['email'];
+            $rv[] = $r;
+
+        }
+
+        return $rv;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Backend/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Plugin.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Plugin.php
new file mode 100644
index 00000000..cc4f25f3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Plugin.php
@@ -0,0 +1,434 @@
+<?php
+
+/**
+ * This plugin provides Authentication for a WebDAV server.
+ * 
+ * It relies on a Backend object, which provides user information.
+ *
+ * Additionally, it provides support for:
+ *  * {DAV:}current-user-principal property from RFC5397
+ *  * {DAV:}principal-collection-set property from RFC3744
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to main server object 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Authentication backend
+     * 
+     * @var Sabre_DAV_Auth_Backend_Abstract 
+     */
+    private $authBackend;
+
+    /**
+     * The authentication realm. 
+     * 
+     * @var string 
+     */
+    private $realm;
+
+    /**
+     * __construct 
+     * 
+     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
+     * @param string $realm 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_Auth_Backend_Abstract $authBackend, $realm) {
+
+        $this->authBackend = $authBackend;
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Initializes the plugin. This function is automatically called by the server  
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
+        $this->server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+        $this->server->subscribeEvent('report',array($this,'report'));
+
+    }
+
+    /**
+     * This method intercepts calls to PROPFIND and similar lookups 
+     * 
+     * This is done to inject the current-user-principal if this is requested.
+     *
+     * @todo support for 'unauthenticated'
+     * @return void  
+     */
+    public function afterGetProperties($href, &$properties) {
+
+        if (array_key_exists('{DAV:}current-user-principal', $properties[404])) {
+            if ($ui = $this->authBackend->getCurrentUser()) {
+                $properties[200]['{DAV:}current-user-principal'] = new Sabre_DAV_Property_Principal(Sabre_DAV_Property_Principal::HREF, $ui['uri']);
+            } else {
+                $properties[200]['{DAV:}current-user-principal'] = new Sabre_DAV_Property_Principal(Sabre_DAV_Property_Principal::UNAUTHENTICATED);
+            }
+            unset($properties[404]['{DAV:}current-user-principal']);
+        }
+        if (array_key_exists('{DAV:}principal-collection-set', $properties[404])) {
+            $properties[200]['{DAV:}principal-collection-set'] = new Sabre_DAV_Property_Href('principals');
+            unset($properties[404]['{DAV:}principal-collection-set']);
+        }
+        if (array_key_exists('{DAV:}supported-report-set', $properties[200])) {
+            $properties[200]['{DAV:}supported-report-set']->addReport(array(
+                '{DAV:}expand-property',
+            ));
+        }
+
+
+    }
+
+    /**
+     * This method is called before any HTTP method and forces users to be authenticated
+     * 
+     * @param string $method
+     * @throws Sabre_DAV_Exception_NotAuthenticated
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        $this->authBackend->authenticate($this->server,$this->realm);
+
+    }
+
+    /**
+     * This functions handles REPORT requests 
+     * 
+     * @param string $reportName 
+     * @param DOMNode $dom 
+     * @return bool|null 
+     */
+    public function report($reportName,$dom) {
+
+        switch($reportName) { 
+            case '{DAV:}expand-property' :
+                $this->expandPropertyReport($dom);
+                return false;
+            case '{DAV:}principal-property-search' :
+                if ($this->server->getRequestUri()==='principals') {
+                    $this->principalPropertySearchReport($dom);
+                    return false;
+                }
+                break;
+            case '{DAV:}principal-search-property-set' :
+                if ($this->server->getRequestUri()==='principals') {
+                    $this->principalSearchPropertySetReport($dom);
+                    return false;
+                }
+                break;
+                 
+        }
+    
+    }
+
+    /**
+     * The expand-property report is defined in RFC3253 section 3-8. 
+     *
+     * This report is very similar to a standard PROPFIND. The difference is
+     * that it has the additional ability to look at properties containing a
+     * {DAV:}href element, follow that property and grab additional elements
+     * there.
+     *
+     * Other rfc's, such as ACL rely on this report, so it made sense to put
+     * it in this plugin.
+     *
+     * @param DOMElement $dom 
+     * @return void
+     */
+    protected function expandPropertyReport($dom) {
+
+        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
+        $depth = $this->server->getHTTPDepth(0);
+        $requestUri = $this->server->getRequestUri();
+
+        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($result as $entry) {
+
+            $entry->serialize($this->server,$multiStatus);
+
+        }
+
+        $xml = $dom->saveXML();
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+        // Make sure the event chain is broken
+        return false;
+
+    }
+
+    /**
+     * This method is used by expandPropertyReport to parse
+     * out the entire HTTP request.
+     * 
+     * @param DOMElement $node 
+     * @return array 
+     */
+    protected function parseExpandPropertyReportRequest($node) {
+
+        $requestedProperties = array();
+        do {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
+                
+            if ($node->firstChild) {
+                
+                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
+
+            } else {
+
+                $children = array();
+
+            }
+
+            $namespace = $node->getAttribute('namespace');
+            if (!$namespace) $namespace = 'DAV:';
+
+            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
+            $requestedProperties[$propName] = $children; 
+
+        } while ($node = $node->nextSibling);
+
+        return $requestedProperties;
+
+    }
+
+    /**
+     * This method expands all the properties and returns
+     * a list with property values
+     *
+     * @param array $path
+     * @param array $requestedProperties the list of required properties
+     * @param array $depth
+     */
+    protected function expandProperties($path,array $requestedProperties,$depth) { 
+
+        $foundProperties = $this->server->getPropertiesForPath($path,array_keys($requestedProperties),$depth);
+
+        $result = array();
+
+        foreach($foundProperties as $node) {
+
+            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
+
+                // We're only traversing if sub-properties were requested
+                if(count($childRequestedProperties)===0) continue;
+                
+                // We only have to do the expansion if the property was found
+                // and it contains an href element.
+                if (!array_key_exists($propertyName,$node[200])) continue;
+                if (!($node[200][$propertyName] instanceof Sabre_DAV_Property_IHref)) continue;
+
+                $href = $node[200][$propertyName]->getHref();
+                list($node[200][$propertyName]) = $this->expandProperties($href,$childRequestedProperties,0);
+
+            }
+            $result[] = new Sabre_DAV_Property_Response($path, $node);
+
+        }
+
+        return $result;
+
+    }
+
+    protected function principalSearchPropertySetReport(DOMDocument $dom) {
+
+        $searchProperties = array(
+            '{DAV:}displayname' => 'display name'
+
+        );
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+        
+        if ($dom->firstChild->hasChildNodes()) 
+            throw new Sabre_DAV_Exception_BadRequest('The principal-search-property-set report element is not allowed to have child elements'); 
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElement('d:principal-search-property-set');
+        $dom->appendChild($root);
+        // Adding in default namespaces
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $root->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        $nsList = $this->server->xmlNamespaces; 
+
+        foreach($searchProperties as $propertyName=>$description) {
+
+            $psp = $dom->createElement('d:principal-search-property');
+            $root->appendChild($psp);
+
+            $prop = $dom->createElement('d:prop');
+            $psp->appendChild($prop);
+  
+            $propName = null;
+            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+
+            //if (!isset($nsList[$propName[1]])) {
+            //    $nsList[$propName[1]] = 'x' . count($nsList);
+            //}
+
+            // If the namespace was defined in the top-level xml namespaces, it means 
+            // there was already a namespace declaration, and we don't have to worry about it.
+            //if (isset($server->xmlNamespaces[$propName[1]])) {
+                $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+            //} else {
+            //    $currentProperty = $dom->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
+            //}
+            $prop->appendChild($currentProperty);
+
+            $descriptionElem = $dom->createElement('d:description');
+            $descriptionElem->setAttribute('xml:lang','en');
+            $descriptionElem->appendChild($dom->createTextNode($description));
+            $psp->appendChild($descriptionElem);
+
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->sendBody($dom->saveXML());
+
+    }
+
+    protected function principalPropertySearchReport($dom) {
+
+        $searchableProperties = array(
+            '{DAV:}displayname' => 'display name'
+
+        );
+
+        list($searchProperties, $requestedProperties) = $this->parsePrincipalPropertySearchReportRequest($dom);
+
+        $uri = $this->server->getRequestUri();
+        
+        $result = array();
+
+        $lookupResults = $this->server->getPropertiesForPath($uri, array_keys($searchProperties), 1);
+
+        // The first item in the results is the parent, so we get rid of it.
+        array_shift($lookupResults);
+
+        $matches = array();
+
+        foreach($lookupResults as $lookupResult) {
+
+            foreach($searchProperties as $searchProperty=>$searchValue) {
+                if (!isset($searchableProperties[$searchProperty])) {
+                    throw new Sabre_DAV_Exception_BadRequest('Searching for ' . $searchProperty . ' is not supported');
+                }
+                
+                if (isset($lookupResult[200][$searchProperty]) &&
+                    mb_stripos($lookupResult[200][$searchProperty], $searchValue, 0, 'UTF-8')!==false) {
+                        $matches[] = $lookupResult['href'];
+                }
+
+            }
+
+        }
+
+        $matchProperties = array();
+
+        foreach($matches as $match) {
+            
+           list($result) = $this->server->getPropertiesForPath($match, $requestedProperties, 0);
+           $matchProperties[] = $result;
+
+        }
+
+        $xml = $this->server->generateMultiStatus($matchProperties);
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->sendStatus(207);
+        $this->server->httpResponse->sendBody($xml);
+
+    }
+
+    protected function parsePrincipalPropertySearchReportRequest($dom) {
+
+        $httpDepth = $this->server->getHTTPDepth(0);
+        if ($httpDepth!==0) {
+            throw new Sabre_DAV_Exception_BadRequest('This report is only defined when Depth: 0');
+        }
+
+        $searchProperties = array();
+
+        // Parsing the search request
+        foreach($dom->firstChild->childNodes as $searchNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
+                continue;
+
+            $propertyName = null;
+            $propertyValue = null;
+
+            foreach($searchNode->childNodes as $childNode) {
+
+                switch(Sabre_DAV_XMLUtil::toClarkNotation($childNode)) {
+
+                    case '{DAV:}prop' :
+                        $property = Sabre_DAV_XMLUtil::parseProperties($searchNode);
+                        reset($property); 
+                        $propertyName = key($property);
+                        break;
+
+                    case '{DAV:}match' :
+                        $propertyValue = $childNode->textContent;
+                        break;
+
+                }
+
+
+            }
+
+            if (is_null($propertyName) || is_null($propertyValue))
+                throw new Sabre_DAV_Exception_BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
+
+            $searchProperties[$propertyName] = $propertyValue;
+
+        }
+
+        return array($searchProperties, array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild)));
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/Principal.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Principal.php
new file mode 100644
index 00000000..82f0c572
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/Principal.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Principal class
+ *
+ * This class represents a user in the directory tree.
+ * Many WebDAV specs require a user to show up in the directory 
+ * structure. The principal is defined in RFC 3744.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_Principal extends Sabre_DAV_Node implements Sabre_DAV_IProperties {
+
+    /**
+     * Full uri for this principal resource 
+     * 
+     * @var string 
+     */
+    protected $principalUri;/*noLibHook*/
+
+    /**
+     * Struct with principal information.
+     *
+     * @var array 
+     */
+    protected $principalProperties;
+
+    /**
+     * Creates the principal object 
+     *
+     * @param string $principalUri Full uri to the principal resource
+     * @param array $principalProperties
+     */
+    public function __construct($principalUri,array $principalProperties = array()) {
+
+        $this->principalUri = $principalUri;
+        $this->principalProperties = $principalProperties;
+
+    }
+
+    /**
+     * Returns the name of the element 
+     * 
+     * @return void
+     */
+    public function getName() {
+
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
+        return $name;
+
+    }
+
+    /**
+     * Returns the name of the user 
+     * 
+     * @return void
+     */
+    public function getDisplayName() {
+
+        if (isset($this->principalProperties['{DAV:}displayname'])) {
+            return $this->principalProperties['{DAV:}displayname'];
+        } else {
+            return $this->getName();
+        }
+
+    }
+
+    /**
+     * Returns a list of properties 
+     * 
+     * @param array $requestedProperties 
+     * @return void
+     */
+    public function getProperties($requestedProperties) {
+
+        if (!count($requestedProperties)) {
+           
+            // If all properties were requested
+            // we will only returns properties from this list
+            $requestedProperties = array(
+                '{DAV:}resourcetype',
+                '{DAV:}displayname',
+            );
+
+        }
+
+        // We need to always return the resourcetype
+        // This is a bug in the core server, but it is easier to do it this way for now
+        $newProperties = array(
+            '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType('{DAV:}principal')
+        );
+        foreach($requestedProperties as $propName) switch($propName) {
+            
+            case '{DAV:}alternate-URI-set' :
+                if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+                    $href = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+                    $newProperties[$propName] = new Sabre_DAV_Property_Href($href);
+                } else {
+                    $newProperties[$propName] = null;
+                }
+                break;
+            case '{DAV:}group-member-set' :
+            case '{DAV:}group-membership' :
+                $newProperties[$propName] = null;
+                break;
+
+            case '{DAV:}principal-URL' :
+                $newProperties[$propName] = new Sabre_DAV_Property_Href($this->principalUri);
+                break;
+
+            case '{DAV:}displayname' :
+                $newProperties[$propName] = $this->getDisplayName();
+                break;
+
+            default :
+                if (isset($this->principalProperties[$propName])) {
+                    $newProperties[$propName] = $this->principalProperties[$propName];
+                }
+                break;
+
+        }
+
+        return $newProperties;
+        
+
+    }
+
+    /**
+     * Updates this principals properties.
+     *
+     * Currently this is not supported
+     * 
+     * @param array $properties
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array 
+     */
+    public function updateProperties($properties) {
+
+        return false;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/PrincipalCollection.php b/upload/ips_kernel/sabre/Sabre/DAV/Auth/PrincipalCollection.php
new file mode 100644
index 00000000..75cf3af9
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/PrincipalCollection.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Principals Collection
+ *
+ * This collection represents a list of users. It uses
+ * Sabre_DAV_Auth_Backend to determine which users are available on the list.
+ *
+ * The users are instances of Sabre_DAV_Auth_Principal
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Auth_PrincipalCollection extends Sabre_DAV_Directory {
+
+    /**
+     * The name of this object. It is not adviced to change this.
+     * The plugins that depend on the principals collection to exist need to 
+     * be have a common name to find it.
+     */
+    const NODENAME = 'principals';
+
+    /**
+     * Authentication backend 
+     * 
+     * @var Sabre_DAV_Auth_Backend 
+     */
+    protected $authBackend;
+
+    /**
+     * Creates the object 
+     * 
+     * @param Sabre_DAV_Auth_Backend_Abstract $authBackend 
+     */
+    public function __construct(Sabre_DAV_Auth_Backend_Abstract $authBackend) {
+
+        $this->authBackend = $authBackend;
+
+    }
+
+    /**
+     * Returns the name of this collection. 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return self::NODENAME; 
+
+    }
+
+    /**
+     * Retursn the list of users 
+     * 
+     * @return void
+     */
+    public function getChildren() {
+
+        $children = array();
+        foreach($this->authBackend->getUsers() as $principalInfo) {
+
+            $principalUri = $principalInfo['uri'] . '/';
+            $children[] = new Sabre_DAV_Auth_Principal($principalUri,$principalInfo);
+
+
+        }
+        return $children; 
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Auth/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Auth/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Auth/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Browser/GuessContentType.php b/upload/ips_kernel/sabre/Sabre/DAV/Browser/GuessContentType.php
new file mode 100644
index 00000000..430ebde8
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Browser/GuessContentType.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * GuessContentType plugin
+ *
+ * A lot of the built-in File objects just return application/octet-stream
+ * as a content-type by default. This is a problem for some clients, because
+ * they expect a correct contenttype.
+ *
+ * There's really no accurate, fast and portable way to determine the contenttype
+ * so this extension does what the rest of the world does, and guesses it based
+ * on the file extension.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * List of recognized file extensions
+     *
+     * Feel free to add more
+     *
+     * @var array
+     */
+    public $extensionMap = array(
+
+        // images
+        'jpg' => 'image/jpeg',
+        'gif' => 'image/gif',
+        'png' => 'image/png',
+
+        // groupware
+        'ics' => 'text/calendar',
+        'vcf' => 'text/x-vcard',
+
+        // text
+        'txt' => 'text/plain',
+
+    );
+
+    /**
+     * Initializes the plugin 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        // Using a relatively low priority (200) to allow other extensions
+        // to set the content-type first.
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
+
+    }
+
+    /**
+     * Handler for teh afterGetProperties event 
+     * 
+     * @param string $path 
+     * @param array $properties 
+     * @return void
+     */
+    public function afterGetProperties($path, &$properties) {
+
+        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
+           
+            list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
+            $contentType = $this->getContentType($fileName);
+
+            if ($contentType) {
+                $properties[200]['{DAV:}getcontenttype'] = $contentType;
+                unset($properties[404]['{DAV:}getcontenttype']);
+            }
+
+        }
+
+    }
+
+    /**
+     * Simple method to return the contenttype
+     * 
+     * @param string $fileName 
+     * @return string 
+     */
+    protected function getContentType($fileName) {
+
+        // Just grabbing the extension
+        $extension = substr($fileName,strrpos($fileName,'.')+1);
+        if (isset($this->extensionMap[$extension]))
+            return $this->extensionMap[$extension];
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Browser/MapGetToPropFind.php b/upload/ips_kernel/sabre/Sabre/DAV/Browser/MapGetToPropFind.php
new file mode 100644
index 00000000..df60ae43
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * This is a simple plugin that will map any GET request for non-files to 
+ * PROPFIND allprops-requests.
+ *
+ * This should allow easy debugging of PROPFIND
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_MapGetToPropFind extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * Initializes the plugin and subscribes to events 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+    }
+
+    /**
+     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request 
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+       
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_DAV_IFile) return;
+
+        $this->server->invokeMethod('PROPFIND',$uri);
+        return false;
+        
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Browser/Plugin.php b/upload/ips_kernel/sabre/Sabre/DAV/Browser/Plugin.php
new file mode 100644
index 00000000..f718b4fe
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Browser/Plugin.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * Browser Plugin
+ *
+ * This plugin provides a html representation, so that a WebDAV server may be accessed
+ * using a browser.
+ *
+ * The class intercepts GET requests to collection resources and generates a simple 
+ * html index. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * reference to server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    protected $server;
+
+    /**
+     * enableEditing
+     * 
+     * @var bool 
+     */
+    protected $enablePost = true;
+
+    /**
+     * Creates the object.
+     *
+     * By default it will allow file creation and uploads.
+     * Specify the first argument as false to disable this
+     * 
+     * @param bool $enablePost 
+     * @return void
+     */
+    public function __construct($enablePost=true) {
+
+        $this->enablePost = $enablePost; 
+
+    }
+
+    /**
+     * Initializes the plugin and subscribes to events 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
+    }
+
+    /**
+     * This method intercepts GET requests to collections and returns the html 
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function httpGetInterceptor($method, $uri) {
+
+        if ($method!='GET') return true;
+        
+        $node = $this->server->tree->getNodeForPath($uri);
+        if ($node instanceof Sabre_DAV_IFile) return true;
+
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
+
+        $this->server->httpResponse->sendBody(
+            $this->generateDirectoryIndex($uri)
+        );
+
+        return false;
+        
+    }
+
+    /**
+     * Handles POST requests for tree operations
+     * 
+     * This method is not yet used.
+     * 
+     * @param string $method 
+     * @return bool
+     */
+    public function httpPOSTHandler($method, $uri) {
+
+        if ($method!='POST') return true;
+        if (isset($_POST['action'])) switch($_POST['action']) {
+
+            case 'mkcol' :
+                if (isset($_POST['name']) && trim($_POST['name'])) {
+                    // Using basename() because we won't allow slashes
+                    list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($_POST['name']));
+                    $this->server->createDirectory($uri . '/' . $folderName);
+                }
+                break;
+            case 'put' :
+                if ($_FILES) $file = current($_FILES);
+                else break;
+                $newName = trim($file['name']);
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
+                if (isset($_POST['name']) && trim($_POST['name']))
+                    $newName = trim($_POST['name']);
+
+                // Making sure we only have a 'basename' component
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+                    
+               
+                if (is_uploaded_file($file['tmp_name'])) {
+                    $parent = $this->server->tree->getNodeForPath(trim($uri,'/'));
+                    $parent->createFile($newName,fopen($file['tmp_name'],'r'));
+                }
+
+        }
+        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
+        return false;
+
+    }
+
+    /**
+     * Escapes a string for html. 
+     * 
+     * @param string $value 
+     * @return void
+     */
+    public function escapeHTML($value) {
+
+        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
+
+    }
+
+    /**
+     * Generates the html directory index for a given url 
+     *
+     * @param string $path 
+     * @return string 
+     */
+    public function generateDirectoryIndex($path) {
+
+        $html = "<html>
+<head>
+  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . Sabre_DAV_Version::VERSION . "</title>
+  <style type=\"text/css\"> body { Font-family: arial}</style>
+</head>
+<body>
+  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
+  <table>
+    <tr><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
+    <tr><td colspan=\"4\"><hr /></td></tr>";
+    
+    $files = $this->server->getPropertiesForPath($path,array(
+        '{DAV:}displayname',
+        '{DAV:}resourcetype',
+        '{DAV:}getcontenttype',
+        '{DAV:}getcontentlength',
+        '{DAV:}getlastmodified',
+    ),1);
+
+    foreach($files as $k=>$file) {
+
+        // This is the current directory, we can skip it
+        if (rtrim($file['href'],'/')==$path) continue;
+
+        list(, $name) = Sabre_DAV_URLUtil::splitPath($file['href']);
+
+        $type = null;
+
+        if (isset($file[200]['{DAV:}resourcetype'])) {
+            $type = $file[200]['{DAV:}resourcetype']->getValue();
+
+            // resourcetype can have multiple values
+            if (is_array($type)) {
+                $type = implode(', ', $type);
+            }
+
+            // Some name mapping is preferred 
+            switch($type) {
+                case '{DAV:}collection' :
+                    $type = 'Collection';
+                    break;
+            }
+        }
+
+        // If no resourcetype was found, we attempt to use
+        // the contenttype property
+        if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
+            $type = $file[200]['{DAV:}getcontenttype'];
+        }
+        if (!$type) $type = 'Unknown';
+
+        $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
+        $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(DateTime::ATOM):'';
+
+        $fullPath = Sabre_DAV_URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
+
+        $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
+
+        $name = $this->escapeHTML($name);
+        $displayName = $this->escapeHTML($displayName);
+        $type = $this->escapeHTML($type);
+
+        $html.= "<tr>
+<td><a href=\"{$fullPath}\">{$displayName}</a></td>
+<td>{$type}</td>
+<td>{$size}</td>
+<td>{$lastmodified}</td>
+</tr>";
+
+    }
+
+  $html.= "<tr><td colspan=\"4\"><hr /></td></tr>";
+
+  if ($this->enablePost) {
+      $html.= '<tr><td><form method="post" action="">
+            <h3>Create new folder</h3>
+            <input type="hidden" name="action" value="mkcol" />
+            Name: <input type="text" name="name" /><br />
+            <input type="submit" value="create" />
+            </form>
+            <form method="post" action="" enctype="multipart/form-data">
+            <h3>Upload file</h3>
+            <input type="hidden" name="action" value="put" />
+            Name (optional): <input type="text" name="name" /><br />
+            File: <input type="file" name="file" /><br />
+            <input type="submit" value="upload" />
+            </form>
+       </td></tr>';
+  }
+
+  $html.= "</table>
+  <address>Generated by SabreDAV " . Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY . " (c)2007-2010 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
+</body>
+</html>";
+
+        return $html; 
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Browser/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Browser/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Browser/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Directory.php b/upload/ips_kernel/sabre/Sabre/DAV/Directory.php
new file mode 100644
index 00000000..ebc266e1
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Directory.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Directory class
+ *
+ * This is a helper class, that should aid in getting directory classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Directory extends Sabre_DAV_Node implements Sabre_DAV_ICollection {
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
+     * Generally its wise to override this, as this can usually be optimized
+     * 
+     * @param string $name
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        foreach($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return $child;
+
+        }
+        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Checks is a child-node exists.
+     *
+     * It is generally a good idea to try and override this. Usually it can be optimized.
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        try {
+
+            $this->getChild($name);
+            return true;
+
+        } catch(Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload, passed as a readable stream resource. 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create file (filename ' . $name . ')');
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to create directory');
+
+    }
+
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception.php
new file mode 100644
index 00000000..46b710a0
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * SabreDAV base exception
+ *
+ * This is SabreDAV's base exception file, use this to implement your own exception.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * Main Exception class. 
+ *
+ * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occured.
+ * The default for this is 500.
+ *
+ * This class also allows you to generate custom xml data for your exceptions. This will be displayed
+ * in the 'error' element in the failing response.
+ */
+class Sabre_DAV_Exception extends Exception { 
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() { 
+
+        return 500;
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+    
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     * 
+     * @return array 
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        return array();
+
+    } 
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/BadRequest.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/BadRequest.php
new file mode 100644
index 00000000..86f91d5a
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/BadRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * BadRequest
+ *
+ * The BadRequest is thrown when the user submitted an invalid HTTP request
+ * BadRequest 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_BadRequest extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 400; 
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/Conflict.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Conflict.php
new file mode 100644
index 00000000..1d9edbb3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Conflict.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Conflict
+ *
+ * A 409 Conflict is thrown when a user tried to make a directory over an existing
+ * file or in a parent directory that doesn't exist.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Conflict extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 409;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/ConflictingLock.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/ConflictingLock.php
new file mode 100644
index 00000000..64e463ac
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/ConflictingLock.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ConflictingLock 
+ *
+ * Similar to Exception_Locked, this exception thrown when a LOCK request 
+ * was made, on a resource which was already locked
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ConflictingLock extends Sabre_DAV_Exception_Locked {
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/FileNotFound.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/FileNotFound.php
new file mode 100644
index 00000000..cd03d4c7
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/FileNotFound.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * FileNotFound
+ *
+ * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_FileNotFound extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 404;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/Forbidden.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Forbidden.php
new file mode 100644
index 00000000..cde3d9c1
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Forbidden.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Forbidden
+ *
+ * This exception is thrown whenever a user tries to do an operation he's not allowed to
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Forbidden extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 403;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/InsufficientStorage.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/InsufficientStorage.php
new file mode 100644
index 00000000..d18d8089
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/InsufficientStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * InsufficientStorage 
+ *
+ * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InsufficientStorage extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 507;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/InvalidResourceType.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/InvalidResourceType.php
new file mode 100644
index 00000000..36248704
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/InvalidResourceType.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * InvalidResourceType 
+ *
+ * This exception is thrown when the user tried to create a new collection, with
+ * a special resourcetype value that was not recognized by the server.
+ *
+ * See RFC5689 section 3.3
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_InvalidResourceType extends Sabre_DAV_Exception_Forbidden { 
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
+        $errorNode->appendChild($error);
+
+    }
+    
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
new file mode 100644
index 00000000..059ee346
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * LockTokenMatchesRequestUri 
+ *
+ * This exception is thrown by UNLOCK if a supplied lock-token is invalid 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_LockTokenMatchesRequestUri extends Sabre_DAV_Exception_Conflict {
+
+    /**
+     * Creates the exception
+     */
+    public function __construct() {
+
+        $this->message = 'The locktoken supplied does not match any locks on this entity';
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/Locked.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Locked.php
new file mode 100644
index 00000000..3f15ea74
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/Locked.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Locked 
+ *
+ * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_Locked extends Sabre_DAV_Exception {
+
+    /**
+     * Lock information 
+     * 
+     * @var Sabre_DAV_Locks_LockInfo 
+     */
+    protected $lock;
+
+    /**
+     * Creates the exception
+     * 
+     * A LockInfo object should be passed if the user should be informed
+     * which lock actually has the file locked.
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lock 
+     */
+    public function __construct(Sabre_DAV_Locks_LockInfo $lock = null) {
+
+        $this->lock = $lock;
+
+    }
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 423;
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
+            $errorNode->appendChild($error);
+            if (!is_object($this->lock)) var_dump($this->lock);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
+        }
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/MethodNotAllowed.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/MethodNotAllowed.php
new file mode 100644
index 00000000..67ad9a8a
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/MethodNotAllowed.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * MethodNotAllowed
+ *
+ * The 405 is thrown when a client tried to create a directory on an already existing directory
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_MethodNotAllowed extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 405;
+
+    }
+
+    /**
+     * This method allows the exception to return any extra HTTP response headers.
+     *
+     * The headers must be returned as an array.
+     * 
+     * @return array 
+     */
+    public function getHTTPHeaders(Sabre_DAV_Server $server) {
+
+        $methods = $server->getAllowedMethods($server->getRequestUri());
+
+        return array(
+            'Allow' => strtoupper(implode(', ',$methods)),
+        );
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotAuthenticated.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotAuthenticated.php
new file mode 100644
index 00000000..28159853
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotAuthenticated.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NotAuthenticated
+ *
+ * This exception is thrown when the client did not provide valid
+ * authentication credentials.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotAuthenticated extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        
+        return 401;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotImplemented.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotImplemented.php
new file mode 100644
index 00000000..5d746be3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/NotImplemented.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * NotImplemented
+ *
+ * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_NotImplemented extends Sabre_DAV_Exception {
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        
+        return 501;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/PreconditionFailed.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/PreconditionFailed.php
new file mode 100644
index 00000000..1d4c1862
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/PreconditionFailed.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * PreconditionFailed 
+ *
+ * This exception is normally thrown when a client submitted a conditional request, 
+ * like for example an If, If-None-Match or If-Match header, which caused the HTTP 
+ * request to not execute (the condition of the header failed)
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_PreconditionFailed extends Sabre_DAV_Exception {
+
+    /**
+     * When this exception is thrown, the header-name might be set.
+     * 
+     * This allows the exception-catching code to determine which HTTP header
+     * caused the exception.
+     * 
+     * @var string 
+     */
+    public $header = null;
+
+    /**
+     * Create the exception 
+     * 
+     * @param string $message 
+     * @param string $header 
+     */
+    public function __construct($message, $header=null) {
+
+        parent::__construct($message);
+        $this->header = $header;
+
+    } 
+
+    /**
+     * Returns the HTTP statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 412; 
+
+    }
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+        
+        if ($this->header) {
+            $prop = $errorNode->ownerDocument->createElement('s:header');
+            $prop->nodeValue = $this->header;
+            $errorNode->appendChild($prop);
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/ReportNotImplemented.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/ReportNotImplemented.php
new file mode 100644
index 00000000..64526f42
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/ReportNotImplemented.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * ReportNotImplemented
+ *
+ * This exception is thrown when the client requested an unknown report through the REPORT method
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_ReportNotImplemented extends Sabre_DAV_Exception_NotImplemented {
+
+    /**
+     * This method allows the exception to include additonal information into the WebDAV error response 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $errorNode 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
+
+        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
+        $errorNode->appendChild($error);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
new file mode 100644
index 00000000..723138d8
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * RequestedRangeNotSatisfiable 
+ *
+ * This exception is normally thrown when the user 
+ * request a range that is out of the entity bounds.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_RequestedRangeNotSatisfiable extends Sabre_DAV_Exception {
+
+    /**
+     * returns the http statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 416;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/UnsupportedMediaType.php b/upload/ips_kernel/sabre/Sabre/DAV/Exception/UnsupportedMediaType.php
new file mode 100644
index 00000000..d2c31d91
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/UnsupportedMediaType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * UnSupportedMediaType
+ *
+ * The 415 Unsupported Media Type status code is generally sent back when the client 
+ * tried to call an HTTP method, with a body the server didn't understand
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Exception_UnsupportedMediaType extends Sabre_DAV_Exception { 
+
+    /**
+     * returns the http statuscode for this exception 
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+
+        return 415;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Exception/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Exception/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Exception/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FS/Directory.php b/upload/ips_kernel/sabre/Sabre/DAV/FS/Directory.php
new file mode 100644
index 00000000..a3e80e12
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FS/Directory.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Directory class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_Directory extends Sabre_DAV_FS_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * data is a readable stream resource
+     *
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File with name ' . $path . ' could not be located');
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FS_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FS_File($path);
+
+        }
+
+    }
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Checks if a child exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        foreach($this->getChildren() as $child) $child->delete();
+        rmdir($this->path);
+
+    }
+
+    /**
+     * Returns available diskspace information 
+     * 
+     * @return array 
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            ); 
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FS/File.php b/upload/ips_kernel/sabre/Sabre/DAV/FS/File.php
new file mode 100644
index 00000000..dc2e7f98
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FS/File.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * File class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FS_File extends Sabre_DAV_FS_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data 
+     * 
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data 
+     * 
+     * @return string 
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void 
+     */
+    public function delete() {
+
+        unlink($this->path);
+
+    }
+
+    /**
+     * Returns the size of the node, in bytes 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+        
+        return filesize($this->path);
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     * 
+     * @return mixed
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return mixed 
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FS/Node.php b/upload/ips_kernel/sabre/Sabre/DAV/FS/Node.php
new file mode 100644
index 00000000..172af852
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FS/Node.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Base node-class 
+ *
+ * The node class implements the method used by both the File and the Directory classes 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FS_Node implements Sabre_DAV_INode {
+
+    /**
+     * The path to the current node
+     * 
+     * @var string 
+     */
+    protected $path; 
+
+    /**
+     * Sets up the node, expects a full path name 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function __construct($path) {
+
+        $this->path = $path;
+
+    }
+
+
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        list(, $name)  = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $name;
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+
+        $newPath = $parentPath . '/' . $newName;
+        rename($this->path,$newPath);
+        
+        $this->path = $newPath;
+
+    }
+
+
+
+    /**
+     * Returns the last modification time, as a unix timestamp 
+     * 
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return filemtime($this->path);
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FS/index.html b/upload/ips_kernel/sabre/Sabre/DAV/FS/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FS/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Directory.php b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Directory.php
new file mode 100644
index 00000000..b42a9a9d
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Directory.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * Directory class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_Directory extends Sabre_DAV_FSExt_Node implements Sabre_DAV_ICollection, Sabre_DAV_IQuota {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    public function createFile($name, $data = null) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        file_put_contents($newPath,$data);
+
+    }
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    public function createDirectory($name) {
+
+        // We're not allowing dots
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+        $newPath = $this->path . '/' . $name;
+        mkdir($newPath);
+
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        $path = $this->path . '/' . $name;
+
+        if (!file_exists($path)) throw new Sabre_DAV_Exception_FileNotFound('File could not be located');
+        if ($name=='.' || $name=='..') throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..'); 
+
+        if (is_dir($path)) {
+
+            return new Sabre_DAV_FSExt_Directory($path);
+
+        } else {
+
+            return new Sabre_DAV_FSExt_File($path);
+
+        }
+
+    }
+
+    /**
+     * Checks if a child exists. 
+     * 
+     * @param string $name 
+     * @return bool 
+     */
+    public function childExists($name) {
+
+        if ($name=='.' || $name=='..')
+            throw new Sabre_DAV_Exception_Forbidden('Permission denied to . and ..');
+
+        $path = $this->path . '/' . $name;
+        return file_exists($path);
+
+    }
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    public function getChildren() {
+
+        $nodes = array();
+        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
+        return $nodes;
+
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself 
+     * 
+     * @return void
+     */
+    public function delete() {
+
+        // Deleting all children
+        foreach($this->getChildren() as $child) $child->delete();
+
+        // Removing resource info, if its still around
+        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
+
+        // Removing the directory itself
+        rmdir($this->path);
+
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns available diskspace information 
+     * 
+     * @return array 
+     */
+    public function getQuotaInfo() {
+
+        return array(
+            disk_total_space($this->path)-disk_free_space($this->path),
+            disk_free_space($this->path)
+            ); 
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FSExt/File.php b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/File.php
new file mode 100644
index 00000000..987bca33
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/File.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * File class 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_FSExt_File extends Sabre_DAV_FSExt_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data 
+     *
+     * data is a readable stream resource.
+     *
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) {
+
+        file_put_contents($this->path,$data);
+
+    }
+
+    /**
+     * Returns the data
+     *
+     * @return string 
+     */
+    public function get() {
+
+        return fopen($this->path,'r');
+
+    }
+
+    /**
+     * Delete the current file
+     *
+     * @return void 
+     */
+    public function delete() {
+
+        unlink($this->path);
+        return parent::delete();
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     */
+    public function getETag() {
+
+        return '"' . md5_file($this->path). '"';
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the size of the file, in bytes 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+
+        return filesize($this->path);
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Node.php b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Node.php
new file mode 100644
index 00000000..0af346d1
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/Node.php
@@ -0,0 +1,276 @@
+<?php
+
+/**
+ * Base node-class 
+ *
+ * The node class implements the method used by both the File and the Directory classes 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_FSExt_Node extends Sabre_DAV_FS_Node implements Sabre_DAV_ILockable, Sabre_DAV_IProperties {
+
+    /**
+     * Returns all the locks on this node
+     * 
+     * @return array 
+     */
+    function getLocks() {
+
+        $resourceData = $this->getResourceData();
+        $locks = $resourceData['locks'];
+        foreach($locks as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($locks[$k]); 
+        }
+        return $locks;
+
+    }
+
+    /**
+     * Locks this node 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    function lock(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $resourceData = $this->getResourceData();
+        if (!isset($resourceData['locks'])) $resourceData['locks'] = array();
+        $current = null;
+        foreach($resourceData['locks'] as $k=>$lock) {
+            if ($lock->token === $lockInfo->token) $current = $k;
+        }
+        if (!is_null($current)) $resourceData['locks'][$current] = $lockInfo;
+        else $resourceData['locks'][] = $lockInfo;
+
+        $this->putResourceData($resourceData);
+
+    }
+
+    /**
+     * Removes a lock from this node
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        //throw new Sabre_DAV_Exception('bla');
+        $resourceData = $this->getResourceData();
+        foreach($resourceData['locks'] as $k=>$lock) {
+
+            if ($lock->token === $lockInfo->token) {
+
+                unset($resourceData['locks'][$k]);
+                $this->putResourceData($resourceData);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Updates properties on this node,
+     *
+     * @param array $mutations
+     * @see Sabre_DAV_IProperties::updateProperties
+     * @return bool|array 
+     */
+    public function updateProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+        
+        $result = array();
+
+        foreach($properties as $propertyName=>$propertyValue) {
+
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (isset($resourceData['properties'][$propertyName])) {
+                    unset($resourceData['properties'][$propertyName]);
+                }
+            } else {
+                $resourceData['properties'][$propertyName] = $propertyValue;
+            }
+               
+        }
+
+        $this->putResourceData($resourceData);
+        return true; 
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     *
+     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+     * If the array is empty, all properties should be returned
+     *
+     * @param array $properties 
+     * @return void
+     */
+    function getProperties($properties) {
+
+        $resourceData = $this->getResourceData();
+
+        // if the array was empty, we need to return everything
+        if (!$properties) return $resourceData['properties'];
+
+        $props = array();
+        foreach($properties as $property) {
+            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
+        }
+
+        return $props;
+
+    }
+
+    /**
+     * Returns the path to the resource file 
+     * 
+     * @return string 
+     */
+    protected function getResourceInfoPath() {
+
+        list($parentDir) = Sabre_DAV_URLUtil::splitPath($this->path);
+        return $parentDir . '/.sabredav';
+
+    }
+
+    /**
+     * Returns all the stored resource information 
+     * 
+     * @return array 
+     */
+    protected function getResourceData() {
+
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return array('locks'=>array(), 'properties' => array());
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!isset($data[$this->getName()])) {
+            return array('locks'=>array(), 'properties' => array());
+        }
+
+        $data = $data[$this->getName()];
+        if (!isset($data['locks'])) $data['locks'] = array();
+        if (!isset($data['properties'])) $data['properties'] = array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the resource information 
+     * 
+     * @param array $newData 
+     * @return void
+     */
+    protected function putResourceData(array $newData) {
+
+        $path = $this->getResourceInfoPath();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        $data[$this->getName()] = $newData;
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
+        list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
+        $newPath = $parentPath . '/' . $newName;
+
+        // We're deleting the existing resourcedata, and recreating it
+        // for the new path.
+        $resourceData = $this->getResourceData();
+        $this->deleteResourceData();
+
+        rename($this->path,$newPath);
+        $this->path = $newPath;
+        $this->putResourceData($resourceData);
+
+
+    }
+
+    public function deleteResourceData() {
+
+        // When we're deleting this node, we also need to delete any resource information
+        $path = $this->getResourceInfoPath();
+        if (!file_exists($path)) return true;
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        $data = '';
+
+        rewind($handle);
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
+        ftruncate($handle,0);
+        rewind($handle);
+        fwrite($handle,serialize($data));
+        fclose($handle);
+
+    }
+
+    public function delete() {
+
+        return $this->deleteResourceData();
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/FSExt/index.html b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/FSExt/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/File.php b/upload/ips_kernel/sabre/Sabre/DAV/File.php
new file mode 100644
index 00000000..aaaf88e6
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/File.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * File class
+ *
+ * This is a helper class, that should aid in getting file classes setup.
+ * Most of its methods are implemented, and throw permission denied exceptions 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_File extends Sabre_DAV_Node implements Sabre_DAV_IFile {
+
+    /**
+     * Updates the data
+     *
+     * data is a readable stream resource.
+     * 
+     * @param resource $data 
+     * @return void 
+     */
+    public function put($data) { 
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to change data');
+
+    }
+
+    /**
+     * Returns the data 
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed 
+     */
+    public function get() { 
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to read this file');
+
+    }
+    
+    /**
+     * Returns the size of the file, in bytes. 
+     * 
+     * @return int 
+     */
+    public function getSize() {
+
+        return 0;
+
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
+     *
+     * Return null if the ETag can not effectively be determined
+     */
+    public function getETag() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     */ 
+    public function getContentType() {
+
+        return null;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/ICollection.php b/upload/ips_kernel/sabre/Sabre/DAV/ICollection.php
new file mode 100644
index 00000000..814387f8
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/ICollection.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * The ICollection Interface
+ *
+ * This interface should be implemented by each class that represents a collection 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ICollection extends Sabre_DAV_INode {
+
+    /**
+     * Creates a new file in the directory 
+     * 
+     * data is a readable stream resource
+     *
+     * @param string $name Name of the file 
+     * @param resource $data Initial payload 
+     * @return void
+     */
+    function createFile($name, $data = null);
+
+    /**
+     * Creates a new subdirectory 
+     * 
+     * @param string $name 
+     * @return void
+     */
+    function createDirectory($name);
+
+    /**
+     * Returns a specific child node, referenced by its name 
+     * 
+     * @param string $name 
+     * @return Sabre_DAV_INode 
+     */
+    function getChild($name);
+
+    /**
+     * Returns an array with all the child nodes 
+     * 
+     * @return Sabre_DAV_INode[] 
+     */
+    function getChildren();
+
+    /**
+     * Checks if a child-node with the specified name exists 
+     * 
+     * @return bool 
+     */
+    function childExists($name);
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/IExtendedCollection.php b/upload/ips_kernel/sabre/Sabre/DAV/IExtendedCollection.php
new file mode 100644
index 00000000..4210f7f0
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/IExtendedCollection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * The IExtendedCollection interface.
+ *
+ * This interface can be used to create special-type of collection-resources
+ * as defined by RFC 5689.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IExtendedCollection extends Sabre_DAV_ICollection {
+
+    /**
+     * Creates a new collection
+     *
+     * @param string $name 
+     * @param array $resourceType
+     * @param array $properties
+     * @return void
+     */
+    function createExtendedCollection($name, array $resourceType, array $properties);
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/IFile.php b/upload/ips_kernel/sabre/Sabre/DAV/IFile.php
new file mode 100644
index 00000000..949d9a9b
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/IFile.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * This interface represents a file or leaf in the tree.
+ *
+ * The nature of a file is, as you might be aware of, that it doesn't contain sub-nodes and has contents
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IFile extends Sabre_DAV_INode {
+
+    /**
+     * Updates the data 
+     * 
+     * The data argument is a readable stream resource.
+     *
+     * @param resource $data 
+     * @return void 
+     */
+    function put($data);
+
+    /**
+     * Returns the data 
+     * 
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed 
+     */
+    function get();
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     * 
+     * @return void
+     */
+    function getContentType();
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     *
+     * Return null if the ETag can not effectively be determined
+     * 
+     * @return void
+     */
+    function getETag();
+
+    /**
+     * Returns the size of the node, in bytes 
+     * 
+     * @return int 
+     */
+    function getSize();
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/ILockable.php b/upload/ips_kernel/sabre/Sabre/DAV/ILockable.php
new file mode 100644
index 00000000..10ac7067
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/ILockable.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Implement this class to support locking 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_ILockable extends Sabre_DAV_INode {
+
+    /**
+     * Returns an array with locks currently on the node 
+     * 
+     * @return Sabre_DAV_Locks_LockInfo[] 
+     */
+    function getLocks();
+
+    /**
+     * Creates a new lock on the file.  
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
+     * @return void
+     */
+    function lock(Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Unlocks a file 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo The lock information 
+     * @return void 
+     */
+    function unlock(Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/INode.php b/upload/ips_kernel/sabre/Sabre/DAV/INode.php
new file mode 100644
index 00000000..c73696b2
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/INode.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * The INode interface is the base interface, and the parent class of both ICollection and IFile
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_INode {
+
+    /**
+     * Deleted the current node
+     *
+     * @return void 
+     */
+    function delete();
+
+    /**
+     * Returns the name of the node 
+     * 
+     * @return string 
+     */
+    function getName();
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    function setName($name);
+
+    /**
+     * Returns the last modification time, as a unix timestamp 
+     * 
+     * @return int 
+     */
+    function getLastModified();
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/IProperties.php b/upload/ips_kernel/sabre/Sabre/DAV/IProperties.php
new file mode 100644
index 00000000..46121b45
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/IProperties.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * IProperties interface
+ *
+ * Implement this interface to support custom WebDAV properties requested and sent from clients.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IProperties extends Sabre_DAV_INode {
+
+    /**
+     * Updates properties on this node,
+     *
+     * The properties array uses the propertyName in clark-notation as key,
+     * and the array value for the property value. In the case a property
+     * should be deleted, the property value will be null.
+     *
+     * This method must be atomic. If one property cannot be changed, the
+     * entire operation must fail.
+     *
+     * If the operation was successful, true can be returned.
+     * If the operation failed, false can be returned.
+     *
+     * Deletion of a non-existant property is always succesful.
+     *
+     * Lastly, it is optional to return detailed information about any
+     * failures. In this case an array should be returned with the following
+     * structure:
+     *
+     * array(
+     *   403 => array(
+     *      '{DAV:}displayname' => null,
+     *   ),
+     *   424 => array(
+     *      '{DAV:}owner' => null,
+     *   )
+     * )
+     *
+     * In this example it was forbidden to update {DAV:}displayname. 
+     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
+     * (424 Failed Dependency) because the request needs to be atomic.
+     *
+     * @param array $mutations 
+     * @return bool|array 
+     */
+    function updateProperties($properties);
+
+    /**
+     * Returns a list of properties for this nodes.
+     *
+     * The properties list is a list of propertynames the client requested,
+     * encoded in clark-notation {xmlnamespace}tagname
+     *
+     * If the array is empty, it means 'all properties' were requested.
+     *
+     * @param array $properties 
+     * @return void
+     */
+    function getProperties($properties);
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/IQuota.php b/upload/ips_kernel/sabre/Sabre/DAV/IQuota.php
new file mode 100644
index 00000000..afba5efd
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/IQuota.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * IQuota interface
+ *
+ * Implement this interface to add the ability to return quota information. The ObjectTree
+ * will check for quota information on any given node. If the information is not available it will 
+ * attempt to fetch the information from the root node.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_IQuota extends Sabre_DAV_ICollection {
+
+    /**
+     * Returns the quota information
+     *
+     * This method MUST return an array with 2 values, the first being the total used space,
+     * the second the available space (in bytes)
+     */
+    function getQuotaInfo(); 
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/Abstract.php b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/Abstract.php
new file mode 100644
index 00000000..46146f1d
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/Abstract.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This is an alternative approach to doing this on a per-node basis
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    abstract function getLocks($uri);
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    abstract function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    abstract function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo);
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/FS.php b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/FS.php
new file mode 100644
index 00000000..b3e0f513
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/FS.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in the filesystem. By default it will do this in PHP's standard temporary session directory,
+ * but this can be overriden by specifiying an alternative path in the contructor
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_FS extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The default data directory 
+     * 
+     * @var string 
+     */
+    private $dataDir;
+
+    public function __construct($dataDir) {
+
+        $this->dataDir = $dataDir;
+
+    }
+
+    protected function getFileNameForUri($uri) {
+
+        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
+
+    }
+
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    public function getLocks($uri) {
+
+        $lockList = array();
+        $currentPath = '';
+
+        foreach(explode('/',$uri) as $uriPart) {
+
+            // weird algorithm that can probably be improved, but we're traversing the path top down 
+            if ($currentPath) $currentPath.='/'; 
+            $currentPath.=$uriPart;
+
+            $uriLocks = $this->getData($currentPath);
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ingore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+
+        // Checking if we can remove any of these locks
+        foreach($lockList as $k=>$lock) {
+            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]); 
+        }
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 1800;
+        $lockInfo->created = time();
+
+        $locks = $this->getLocks($uri);
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) unset($locks[$k]);
+        }
+        $locks[] = $lockInfo;
+        $this->putData($uri,$locks);
+        return true;
+
+    }
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $locks = $this->getLocks($uri);
+        foreach($locks as $k=>$lock) {
+
+            if ($lock->token == $lockInfo->token) {
+
+                unset($locks[$k]);
+                $this->putData($uri,$locks);
+                return true;
+
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * Returns the stored data for a uri
+     *
+     * @param string $uri
+     * @return array 
+     */
+    protected function getData($uri) {
+
+        $path = $this->getFilenameForUri($uri);
+        if (!file_exists($path)) return array();
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'r');
+        flock($handle,LOCK_SH);
+        $data = '';
+
+        // Reading data until the eof
+        while(!feof($handle)) {
+            $data.=fread($handle,8192);
+        }
+
+        // We're all good
+        fclose($handle);
+
+        // Unserializing and checking if the resource file contains data for this file
+        $data = unserialize($data);
+        if (!$data) return array();
+        return $data;
+
+    }
+
+    /**
+     * Updates the lock information
+     *
+     * @param string $uri
+     * @param array $newData 
+     * @return void
+     */
+    protected function putData($uri,array $newData) {
+
+        $path = $this->getFileNameForUri($uri);
+
+        // opening up the file, and creating a shared lock
+        $handle = fopen($path,'a+');
+        flock($handle,LOCK_EX);
+        ftruncate($handle,0);
+        rewind($handle);
+
+        fwrite($handle,serialize($newData));
+        fclose($handle);
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/PDO.php b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/PDO.php
new file mode 100644
index 00000000..11c7fa96
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/PDO.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * The Lock manager allows you to handle all file-locks centrally.
+ *
+ * This Lock Manager stores all its data in a database. You must pass a PDO
+ * connection object in the constructor.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Backend_PDO extends Sabre_DAV_Locks_Backend_Abstract {
+
+    /**
+     * The PDO connection object 
+     * 
+     * @var pdo 
+     */
+    private $pdo;
+
+    public function __construct(PDO $pdo) {
+
+        $this->pdo = $pdo;
+
+    }
+
+    /**
+     * Returns a list of Sabre_DAV_Locks_LockInfo objects  
+     * 
+     * This method should return all the locks for a particular uri, including
+     * locks that might be set on a parent uri.
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    public function getLocks($uri) {
+
+        // NOTE: the following 10 lines or so could be easily replaced by 
+        // pure sql. MySQL's non-standard string concatination prevents us
+        // from doing this though.
+        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM locks WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
+        $params = array(time(),$uri);
+
+        // We need to check locks for every part in the uri.
+        $uriParts = explode('/',$uri);
+
+        // We already covered the last part of the uri
+        array_pop($uriParts);
+
+        $currentPath='';
+
+        foreach($uriParts as $part) {
+
+            if ($currentPath) $currentPath.='/';
+            $currentPath.=$part;
+
+            $query.=' OR (depth!=0 AND uri = ?)';
+            $params[] = $currentPath;
+
+        }
+
+        $query.=')';
+
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute($params);
+        $result = $stmt->fetchAll();
+
+        $lockList = array();
+        foreach($result as $row) {
+
+            $lockInfo = new Sabre_DAV_Locks_LockInfo();
+            $lockInfo->owner = $row['owner'];
+            $lockInfo->token = $row['token'];
+            $lockInfo->timeout = $row['timeout'];
+            $lockInfo->created = $row['created'];
+            $lockInfo->scope = $row['scope'];
+            $lockInfo->depth = $row['depth'];
+            $lockInfo->uri   = $row['uri'];
+            $lockList[] = $lockInfo;
+
+        }
+
+        return $lockList;
+
+    }
+
+    /**
+     * Locks a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        // We're making the lock timeout 30 minutes
+        $lockInfo->timeout = 30*60;
+        $lockInfo->created = time();
+        $lockInfo->uri = $uri;
+
+        $locks = $this->getLocks($uri);
+        $exists = false;
+        foreach($locks as $k=>$lock) {
+            if ($lock->token == $lockInfo->token) $exists = true;
+        }
+        
+        if ($exists) {
+            $stmt = $this->pdo->prepare('UPDATE locks SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        } else {
+            $stmt = $this->pdo->prepare('INSERT INTO locks (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
+            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
+        }
+
+        return true;
+
+    }
+
+
+
+    /**
+     * Removes a lock from a uri 
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return bool 
+     */
+    public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM locks WHERE uri = ? AND token = ?');
+        $stmt->execute(array($uri,$lockInfo->token));
+
+        return $stmt->rowCount()===1;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Backend/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/LockInfo.php b/upload/ips_kernel/sabre/Sabre/DAV/Locks/LockInfo.php
new file mode 100644
index 00000000..aa174384
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/LockInfo.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * LockInfo class
+ *
+ * An object of the LockInfo class holds all the information relevant to a
+ * single lock.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_LockInfo {
+
+    /**
+     * A shared lock
+     */
+    const SHARED = 1;
+
+    /**
+     * An exclusive lock
+     */
+    const EXCLUSIVE = 2;
+
+    /**
+     * A never expiring timeout
+     */
+    const TIMEOUT_INFINITE = -1;
+
+    /**
+     * The owner of the lock 
+     * 
+     * @var string 
+     */
+    public $owner;
+
+    /**
+     * The locktoken 
+     * 
+     * @var string 
+     */
+    public $token;
+
+    /**
+     * How long till the lock is expiring 
+     * 
+     * @var int 
+     */
+    public $timeout;
+
+    /**
+     * UNIX Timestamp of when this lock was created 
+     * 
+     * @var int 
+     */
+    public $created;
+
+    /**
+     * Exclusive or shared lock 
+     * 
+     * @var int 
+     */
+    public $scope = self::EXCLUSIVE;
+
+    /**
+     * Depth of lock, can be 0 or Sabre_DAV_Server::DEPTH_INFINITY
+     */
+    public $depth = 0;
+
+    /**
+     * The uri this lock locks
+     *
+     * TODO: This value is not always set 
+     * @var mixed
+     */
+    public $uri;
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/Plugin.php b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Plugin.php
new file mode 100644
index 00000000..91dea5fe
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/Plugin.php
@@ -0,0 +1,653 @@
+<?php
+
+/**
+ * Locking plugin
+ *
+ * This plugin provides locking support to a WebDAV server.
+ * The easiest way to get started, is by hooking it up as such:
+ *
+ * $lockBackend = new Sabre_DAV_Locks_Backend_FS('./my_lock_directory');
+ * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $server->addPlugin($lockPlugin);
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * locksBackend 
+     * 
+     * @var Sabre_DAV_Locks_Backend_Abstract 
+     */
+    private $locksBackend;
+
+    /**
+     * server
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * __construct 
+     * 
+     * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
+
+        $this->locksBackend = $locksBackend;        
+
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * This method is automatically called by the Server class after addPlugin.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
+        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+    }
+
+    /**
+     * This method is called by the Server if the user used an HTTP method 
+     * the server didn't recognize.
+     *
+     * This plugin intercepts the LOCK and UNLOCK methods.
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function unknownMethod($method, $uri) {
+
+        switch($method) { 
+
+            case 'LOCK'   : $this->httpLock($uri); return false; 
+            case 'UNLOCK' : $this->httpUnlock($uri); return false; 
+
+        }
+
+    }
+
+    /**
+     * This method is called after most properties have been found
+     * it allows us to add in any Lock-related properties
+     * 
+     * @param string $path 
+     * @param array $properties 
+     * @return bool 
+     */
+    public function afterGetProperties($path,&$newProperties) {
+
+        foreach($newProperties[404] as $propName=>$discard) {
+
+            $node = null;
+
+            switch($propName) {
+
+                case '{DAV:}supportedlock' :
+                    $val = false;
+                    if ($this->locksBackend) $val = true;
+                    else {
+                        if (!$node) $node = $this->server->tree->getNodeForPath($path);
+                        if ($node instanceof Sabre_DAV_ILockable) $val = true;
+                    }
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
+                    unset($newProperties[404][$propName]);
+                    break;
+
+                case '{DAV:}lockdiscovery' :
+                    $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
+                    unset($newProperties[404][$propName]);
+                    break;
+
+            }
+
+
+        }
+        return true;
+
+    }
+
+
+    /**
+     * This method is called before the logic for any HTTP method is
+     * handled.
+     *
+     * This plugin uses that feature to intercept access to locked resources.
+     * 
+     * @param string $method
+     * @param string $uri
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        switch($method) {
+
+            case 'DELETE' :
+            case 'MKCOL' :
+            case 'PROPPATCH' :
+            case 'PUT' :
+                $lastLock = null;
+                if (!$this->validateLock($uri,$lastLock))
+                    throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'MOVE' :
+                $lastLock = null;
+                if (!$this->validateLock(array(
+                      $uri,
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                    ),$lastLock))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+            case 'COPY' :
+                $lastLock = null;
+                if (!$this->validateLock(
+                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+                      $lastLock))
+                        throw new Sabre_DAV_Exception_Locked($lastLock);
+                break;
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        if ($this->locksBackend ||
+            $this->server->tree->getNodeForPath($uri) instanceof Sabre_DAV_ILocks) {
+            return array('LOCK','UNLOCK');
+        }
+        return array();
+
+    }
+
+    /**
+     * Returns a list of features for the HTTP OPTIONS Dav: header.
+     *
+     * In this case this is only the number 2. The 2 in the Dav: header
+     * indicates the server supports locks.
+     * 
+     * @return array 
+     */
+    public function getFeatures() {
+
+        return array(2);
+
+    }
+
+    /**
+     * Returns all lock information on a particular uri 
+     * 
+     * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
+     *
+     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree 
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    public function getLocks($uri) {
+
+        $lockList = array();
+        $currentPath = '';
+        foreach(explode('/',$uri) as $uriPart) {
+
+            $uriLocks = array();
+            if ($currentPath) $currentPath.='/'; 
+            $currentPath.=$uriPart;
+
+            try {
+
+                $node = $this->server->tree->getNodeForPath($currentPath);
+                if ($node instanceof Sabre_DAV_ILockable) $uriLocks = $node->getLocks();
+
+            } catch (Sabre_DAV_Exception_FileNotFound $e){
+                // In case the node didn't exist, this could be a lock-null request
+            }
+
+            foreach($uriLocks as $uriLock) {
+
+                // Unless we're on the leaf of the uri-tree we should ingore locks with depth 0
+                if($uri==$currentPath || $uriLock->depth!=0) {
+                    $uriLock->uri = $currentPath;
+                    $lockList[] = $uriLock;
+                }
+
+            }
+
+        }
+        if ($this->locksBackend) $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri));
+        return $lockList;
+
+    }
+
+    /**
+     * Locks an uri
+     *
+     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type 
+     * of lock (shared or exclusive) and the owner of the lock
+     *
+     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+     *
+     * Additionally, a lock can be requested for a non-existant file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+     * 
+     * @param string $uri
+     * @return void
+     */
+    protected function httpLock($uri) {
+
+        $lastLock = null;
+        if (!$this->validateLock($uri,$lastLock)) {
+
+            // If the existing lock was an exclusive lock, we need to fail
+            if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
+                //var_dump($lastLock);
+                throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+            }
+
+        }
+
+        if ($body = $this->server->httpRequest->getBody(true)) {
+            // This is a new lock request
+            $lockInfo = $this->parseLockRequest($body);
+            $lockInfo->depth = $this->server->getHTTPDepth(); 
+            $lockInfo->uri = $uri;
+            if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+
+        } elseif ($lastLock) {
+
+            // This must have been a lock refresh
+            $lockInfo = $lastLock;
+
+            // The resource could have been locked through another uri. 
+            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
+
+        } else {
+            
+            // There was neither a lock refresh nor a new lock request
+            throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
+
+        }
+
+        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
+
+        $newFile = false;
+
+        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            
+            // We need to call the beforeWriteContent event for RFC3744
+            $this->server->broadcastEvent('beforeWriteContent',array($uri));
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            
+            // It didn't, lets create it
+            $this->server->createFile($uri,fopen('php://memory','r')); 
+            $newFile = true; 
+
+        }
+
+        $this->lockNode($uri,$lockInfo);
+
+        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
+        $this->server->httpResponse->sendStatus($newFile?201:200);
+        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+     * The server should return 204 (No content) on success
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpUnlock($uri) {
+
+        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
+
+        // If the locktoken header is not supplied, we need to throw a bad request exception
+        if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
+
+        $locks = $this->getLocks($uri);
+
+        // We're grabbing the node information, just to rely on the fact it will throw a 404 when the node doesn't exist 
+        //$this->server->tree->getNodeForPath($uri);
+
+        foreach($locks as $lock) {
+
+            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
+
+                $this->unlockNode($uri,$lock);
+                $this->server->httpResponse->setHeader('Content-Length','0');
+                $this->server->httpResponse->sendStatus(204);
+                return;
+
+            }
+
+        }
+
+        // If we got here, it means the locktoken was invalid
+        throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
+
+    }
+
+    /**
+     * Locks a uri
+     *
+     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
+
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            if ($node instanceof Sabre_DAV_ILockable) return $node->lock($lockInfo);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // In case the node didn't exist, this could be a lock-null request
+        }
+        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
+        throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
+
+    }
+
+    /**
+     * Unlocks a uri
+     *
+     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+     * 
+     * @param string $uri 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return void
+     */
+    public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
+        try {
+            $node = $this->server->tree->getNodeForPath($uri);
+            if ($node instanceof Sabre_DAV_ILockable) return $node->unlock($lockInfo);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // In case the node didn't exist, this could be a lock-null request
+        }
+
+        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
+
+    }
+
+
+    /**
+     * Returns the contents of the HTTP Timeout header. 
+     * 
+     * The method formats the header into an integer.
+     *
+     * @return int
+     */
+    public function getTimeoutHeader() {
+
+        $header = $this->server->httpRequest->getHeader('Timeout');
+        
+        if ($header) {
+
+            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
+            else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
+            else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
+
+        } else {
+
+            $header = 0;
+
+        }
+
+        return $header;
+
+    }
+
+    /**
+     * Generates the response for successfull LOCK requests 
+     * 
+     * @param Sabre_DAV_Locks_LockInfo $lockInfo 
+     * @return string 
+     */
+    protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        
+        $prop = $dom->createElementNS('DAV:','d:prop');
+        $dom->appendChild($prop);
+
+        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
+        $prop->appendChild($lockDiscovery);
+
+        $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
+        $lockObj->serialize($this->server,$lockDiscovery);
+
+        return $dom->saveXML();
+
+    }
+    
+    /**
+     * validateLock should be called when a write operation is about to happen
+     * It will check if the requested url is locked, and see if the correct lock tokens are passed 
+     *
+     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
+     * @return bool
+     */
+    protected function validateLock($urls = null,&$lastLock = null) {
+
+        if (is_null($urls)) {
+            $urls = array($this->server->getRequestUri());
+        } elseif (is_string($urls)) {
+            $urls = array($urls);
+        } elseif (!is_array($urls)) {
+            throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
+        }
+
+        $conditions = $this->getIfConditions();
+
+        // We're going to loop through the urls and make sure all lock conditions are satisfied
+        foreach($urls as $url) {
+
+            $locks = $this->getLocks($url);
+
+            // If there were no conditions, but there were locks, we fail 
+            if (!$conditions && $locks) {
+                reset($locks);
+                $lastLock = current($locks);
+                return false;
+            }
+          
+            // If there were no locks or conditions, we go to the next url
+            if (!$locks && !$conditions) continue;
+
+            foreach($conditions as $condition) {
+
+                $conditionUri = $condition['uri']?$this->server->calculateUri($condition['uri']):'';
+
+                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
+                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
+
+                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
+                // At least 1 condition has to be satisfied
+                foreach($condition['tokens'] as $conditionToken) {
+
+                    $etagValid = true;
+                    $lockValid  = true;
+
+                    // key 2 can contain an etag
+                    if ($conditionToken[2]) {
+
+                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri(); 
+                        $node = $this->server->tree->getNodeForPath($uri);
+                        $etagValid = $node->getETag()==$conditionToken[2];
+
+                    }
+
+                    // key 1 can contain a lock token
+                    if ($conditionToken[1]) {
+
+                        $lockValid = false;
+                        // Match all the locks
+                        foreach($locks as $lockIndex=>$lock) {
+
+                            $lockToken = 'opaquelocktoken:' . $lock->token;
+
+                            // Checking NOT
+                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
+
+                                // Condition valid, onto the next
+                                $lockValid = true;
+                                break;
+                            }
+                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
+
+                                $lastLock = $lock;
+                                // Condition valid and lock matched
+                                unset($locks[$lockIndex]);
+                                $lockValid = true;
+                                break;
+
+                            }
+
+                        }
+
+                    }
+
+                    // If, after checking both etags and locks they are stil valid,
+                    // we can continue with the next condition.
+                    if ($etagValid && $lockValid) continue 2;
+               }
+               // No conditions matched, so we fail
+               throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
+            }
+
+            // Conditions were met, we'll also need to check if all the locks are gone
+            if (count($locks)) {
+
+                reset($locks);
+
+                // There's still locks, we fail
+                $lastLock = current($locks);
+                return false;
+
+            }
+
+
+        }
+
+        // We got here, this means every condition was satisfied
+        return true;
+
+    }
+
+    /**
+     * This method is created to extract information from the WebDAV HTTP 'If:' header
+     *
+     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+     * The function will return an array, containg structs with the following keys
+     *
+     *   * uri   - the uri the condition applies to. This can be an empty string for 'every relevant url'
+     *   * tokens - The lock token. another 2 dimensional array containg 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
+     *   * etag - an etag, if supplied
+     * 
+     * @return void
+     */
+    public function getIfConditions() {
+
+        $header = $this->server->httpRequest->getHeader('If'); 
+        if (!$header) return array();
+
+        $matches = array();
+
+        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im'; 
+        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
+
+        $conditions = array();
+
+        foreach($matches as $match) {
+
+            $condition = array(
+                'uri'   => $match['uri'],
+                'tokens' => array(
+                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
+                ),    
+            );
+
+            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
+                $match['not']?0:1,
+                $match['token'],
+                isset($match['etag'])?$match['etag']:''
+            );
+            else {
+                $conditions[] = $condition;
+            }
+
+        }
+
+        return $conditions;
+
+    }
+
+    /**
+     * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object 
+     * 
+     * @param string $body 
+     * @return Sabre_DAV_Locks_LockInfo
+     */
+    protected function parseLockRequest($body) {
+
+        $xml = simplexml_load_string($body,null,LIBXML_NOWARNING);
+        $xml->registerXPathNamespace('d','DAV:');
+        $lockInfo = new Sabre_DAV_Locks_LockInfo();
+     
+        $lockInfo->owner = (string)$xml->owner;
+
+        $lockToken = '44445502';
+        $id = md5(microtime() . 'somethingrandom');
+        $lockToken.='-' . substr($id,0,4) . '-' . substr($id,4,4) . '-' . substr($id,8,4) . '-' . substr($id,12,12);
+
+        $lockInfo->token = $lockToken;
+        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
+
+        return $lockInfo;
+
+    }
+
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Locks/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Locks/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Locks/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Mount/Plugin.php b/upload/ips_kernel/sabre/Sabre/DAV/Mount/Plugin.php
new file mode 100644
index 00000000..c2dc4296
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Mount/Plugin.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This plugin provides support for RFC4709: Mounting WebDAV servers
+ *
+ * Simply append ?mount to any collection to generate the davmount response.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ */
+class Sabre_DAV_Mount_Plugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * Reference to Server class 
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Initializes the plugin and registers event handles 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
+
+    }
+
+    /**
+     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
+     * with ?mount
+     * 
+     * @param string $method 
+     * @return void
+     */
+    public function beforeMethod($method, $uri) {
+
+        if ($method!='GET') return;
+        if ($this->server->httpRequest->getQueryString()!='mount') return;
+
+        $currentUri = $this->server->httpRequest->getAbsoluteUri();
+
+        // Stripping off everything after the ?
+        list($currentUri) = explode('?',$currentUri);
+
+        $this->davMount($currentUri);
+
+        // Returning false to break the event chain
+        return false;
+
+    }
+
+    /**
+     * Generates the davmount response 
+     * 
+     * @param string $uri absolute uri 
+     * @return void
+     */
+    public function davMount($uri) {
+       
+        $this->server->httpResponse->sendStatus(200);
+        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
+        ob_start();
+        echo '<?xml version="1.0"?>', "\n";
+        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
+        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
+        echo "</dm:mount>";
+        $this->server->httpResponse->sendBody(ob_get_clean());
+
+    }
+
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Mount/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Mount/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Mount/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Node.php b/upload/ips_kernel/sabre/Sabre/DAV/Node.php
new file mode 100644
index 00000000..8943b786
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Node.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Node class
+ *
+ * This is a helper class, that should aid in getting nodes setup. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Node implements Sabre_DAV_INode {
+
+    /**
+     * Returns the last modification time 
+     *
+     * In this case, it will simply return the current time
+     *
+     * @return int 
+     */
+    public function getLastModified() {
+
+        return time();
+
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @return void 
+     */
+    public function delete() {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to delete node');
+
+    }
+
+    /**
+     * Renames the node
+     * 
+     * @throws Sabre_DAV_Exception_Forbidden
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name) {
+
+        throw new Sabre_DAV_Exception_Forbidden('Permission denied to rename file');
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/ObjectTree.php b/upload/ips_kernel/sabre/Sabre/DAV/ObjectTree.php
new file mode 100644
index 00000000..836bdf82
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/ObjectTree.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * ObjectTree class
+ *
+ * This implementation of the Tree class makes use of the INode, IFile and ICollection API's 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_ObjectTree extends Sabre_DAV_Tree {
+
+    /**
+     * The root node 
+     * 
+     * @var Sabre_DAV_ICollection
+     */
+    protected $rootNode;
+
+    /**
+     * This is the node cache. Accessed nodes are stored here 
+     * 
+     * @var array 
+     */
+    protected $cache = array();
+
+    /**
+     * Creates the object
+     *
+     * This method expects the rootObject to be passed as a parameter
+     * 
+     * @param Sabre_DAV_ICollection $rootNode 
+     * @return void
+     */
+    public function __construct(Sabre_DAV_ICollection $rootNode) {
+
+        $this->rootNode = $rootNode;
+
+    }
+
+    /**
+     * Returns the INode object for the requested path  
+     * 
+     * @param string $path 
+     * @return Sabre_DAV_INode 
+     */
+    public function getNodeForPath($path) {
+
+        $path = trim($path,'/');
+        if (isset($this->cache[$path])) return $this->cache[$path];
+
+        //if (!$path || $path=='.') return $this->rootNode;
+        $currentNode = $this->rootNode;
+        $i=0;
+        // We're splitting up the path variable into folder/subfolder components and traverse to the correct node.. 
+        foreach(explode('/',$path) as $pathPart) {
+
+            // If this part of the path is just a dot, it actually means we can skip it
+            if ($pathPart=='.' || $pathPart=='') continue;
+
+            if (!($currentNode instanceof Sabre_DAV_ICollection))
+                throw new Sabre_DAV_Exception_FileNotFound('Could not find node at path: ' . $path);
+
+            $currentNode = $currentNode->getChild($pathPart); 
+
+        }
+
+        $this->cache[$path] = $currentNode;
+        return $currentNode;
+
+    }
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * @param string $path 
+     * @return bool 
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            list($parent, $base) = Sabre_DAV_URLUtil::splitPath($path);
+            $parentNode = $this->getNodeForPath($parent);
+            return $parentNode->childExists($base);
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        $children = $node->getChildren();
+        foreach($children as $child) {
+
+            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
+
+        }
+        return $children;
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes 
+     * 
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     * 
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path 
+     * @return void
+     */
+    public function markDirty($path) {
+
+        // We don't care enough about sub-paths
+        // flushing the entire cache
+        $path = trim($path,'/');
+        foreach($this->cache as $nodePath=>$node) {
+            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
+                unset($this->cache[$nodePath]);
+            
+        }
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property.php b/upload/ips_kernel/sabre/Sabre/DAV/Property.php
new file mode 100644
index 00000000..ae0a64c6
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Abstract property class
+ *
+ * Extend this class to create custom complex properties
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Property {
+
+    abstract function serialize(Sabre_DAV_Server $server, DOMElement $prop); 
+
+    static function unserialize(DOMElement $prop) {
+
+        return null;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/GetLastModified.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/GetLastModified.php
new file mode 100644
index 00000000..b066fee0
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/GetLastModified.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This property represents the {DAV:}getlastmodified property.
+ * 
+ * Although this is normally a simple property, windows requires us to add
+ * some new attributes.
+ *
+ * This class uses unix timestamps internally, and converts them to RFC 1123 times for 
+ * serialization
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_GetLastModified extends Sabre_DAV_Property {
+
+    /**
+     * time 
+     * 
+     * @var int 
+     */
+    public $time;
+
+    /**
+     * __construct 
+     * 
+     * @param int|DateTime $time 
+     * @return void
+     */
+    public function __construct($time) {
+
+        if ($time instanceof DateTime) {
+            $this->time = $time;
+        } elseif (is_int($time) || ctype_digit($time)) {
+            $this->time = new DateTime('@' . $time);
+        } else {
+            $this->time = new DateTime($time);
+        }
+
+        // Setting timezone to UTC
+        $this->time->setTimezone(new DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+        $prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
+        $prop->setAttribute('b:dt','dateTime.rfc1123');
+        $prop->nodeValue = $this->time->format(DateTime::RFC1123);
+
+    }
+
+    /**
+     * getTime 
+     * 
+     * @return DateTime 
+     */
+    public function getTime() {
+
+        return $this->time;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/Href.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/Href.php
new file mode 100644
index 00000000..8b9400fb
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/Href.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Href property
+ *
+ * The href property represpents a url within a {DAV:}href element.
+ * This is used by many WebDAV extensions, but not really within the WebDAV core spec
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Href extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * href 
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Automatically prefix the url with the server base directory 
+     * 
+     * @var bool 
+     */
+    private $autoPrefix = true;
+
+    /**
+     * __construct 
+     * 
+     * @param string $href 
+     * @return void
+     */
+    public function __construct($href, $autoPrefix = true) {
+
+        $this->href = $href;
+        $this->autoPrefix = $autoPrefix;
+
+    }
+
+    /**
+     * Returns the uri 
+     * 
+     * @return string 
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes this property.
+     *
+     * It will additionally prepend the href property with the server's base uri.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+
+        $elem = $dom->ownerDocument->createElement($prefix . ':href');
+        $elem->nodeValue = ($this->autoPrefix?$server->getBaseUri():'') . $this->href;
+        $dom->appendChild($elem);
+
+    }
+
+    /**
+     * Unserializes this property from a DOM Element 
+     *
+     * This method returns an instance of this class.
+     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
+     *
+     * @param DOMElement $dom 
+     * @return Sabre_DAV_Property_Href 
+     */
+    static function unserialize(DOMElement $dom) {
+
+        if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
+            return new self($dom->firstChild->textContent,false);
+        }
+
+    } 
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/IHref.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/IHref.php
new file mode 100644
index 00000000..56503acd
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/IHref.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * IHref interface
+ *
+ * Any property implementing this interface can expose a related url.
+ * This is used by certain subsystems to aquire more information about for example
+ * the owner of a file
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+interface Sabre_DAV_Property_IHref {
+
+    /**
+     * getHref 
+     * 
+     * @return string 
+     */
+    function getHref();
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/LockDiscovery.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/LockDiscovery.php
new file mode 100644
index 00000000..2897f6e6
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/LockDiscovery.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Represents {DAV:}lockdiscovery property
+ *
+ * This property contains all the open locks on a given resource
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_LockDiscovery extends Sabre_DAV_Property {
+
+    /**
+     * locks 
+     * 
+     * @var array 
+     */
+    public $locks;
+ 
+    /**
+     * Should we show the locktoken as well? 
+     * 
+     * @var bool 
+     */
+    public $revealLockToken;
+
+    /**
+     * __construct 
+     * 
+     * @param array $locks 
+     * @param bool $revealLockToken 
+     * @return void
+     */
+    public function __construct($locks,$revealLockToken = false) {
+
+        $this->locks = $locks;
+        $this->revealLockToken = $revealLockToken;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        foreach($this->locks as $lock) {
+
+            $activeLock = $doc->createElementNS('DAV:','d:activelock');
+            $prop->appendChild($activeLock);
+
+            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
+            $activeLock->appendChild($lockScope);
+
+            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==Sabre_DAV_Locks_LockInfo::EXCLUSIVE?'exclusive':'shared')));
+
+            $lockType = $doc->createElementNS('DAV:','d:locktype');
+            $activeLock->appendChild($lockType);
+
+            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
+
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == Sabre_DAV_Server::DEPTH_INFINITY?'infinity':$lock->depth)));
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
+
+            if ($this->revealLockToken) {
+                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
+                $activeLock->appendChild($lockToken);
+                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
+            }
+           
+            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
+
+        }
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/Principal.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/Principal.php
new file mode 100644
index 00000000..df3f7848
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/Principal.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Principal property
+ *
+ * The principal property represents a principal from RFC3744 (ACL).
+ * The property can be used to specify a principal or pseudo principals. 
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Principal extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * To specify a not-logged-in user, use the UNAUTHENTICTED principal
+     */
+    const UNAUTHENTICATED = 1;
+
+    /**
+     * To specify any principal that is logged in, use AUTHENTICATED
+     */
+    const AUTHENTICATED = 2;
+
+    /**
+     * Specific princpals can be specified with the HREF
+     */
+    const HREF = 3;
+
+    /**
+     * Principal-type
+     *
+     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+     * 
+     * @var int 
+     */
+    private $type;
+
+    /**
+     * Url to principal
+     *
+     * This value is only used for the HREF principal type.
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Creates the property.
+     *
+     * The 'type' argument must be one of the type constants defined in this class.
+     *
+     * 'href' is only required for the HREF type.
+     * 
+     * @param int $type 
+     * @param string $href 
+     * @return void
+     */
+    public function __construct($type, $href = null) {
+
+        $this->type = $type;
+
+        if ($type===self::HREF && is_null($href)) {
+            throw new Sabre_DAV_Exception('The href argument must be specified for the HREF principal type.');
+        }
+        $this->href = $href;
+
+    }
+
+    /**
+     * Returns the principal type 
+     * 
+     * @return int 
+     */
+    public function getType() {
+
+        return $this->type;
+
+    }
+
+    /**
+     * Returns the principal uri. 
+     * 
+     * @return string
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Serializes the property into a DOMElement. 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $node 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server, DOMElement $node) {
+
+        $prefix = $server->xmlNamespaces['DAV:'];
+        switch($this->type) {
+
+            case self::UNAUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
+                );
+                break;
+            case self::AUTHENTICATED :
+                $node->appendChild(
+                    $node->ownerDocument->createElement($prefix . ':authenticated')
+                );
+                break;
+            case self::HREF :
+                $href = $node->ownerDocument->createElement($prefix . ':href');
+                $href->nodeValue = $server->getBaseUri() . $this->href;
+                $node->appendChild($href);
+                break;
+
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/ResourceType.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/ResourceType.php
new file mode 100644
index 00000000..51022a48
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/ResourceType.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * This class represents the {DAV:}resourcetype property
+ *
+ * Normally for files this is empty, and for collection {DAV:}collection.
+ * However, other specs define different values for this. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_ResourceType extends Sabre_DAV_Property {
+
+    /**
+     * resourceType 
+     * 
+     * @var string 
+     */
+    public $resourceType = null;
+
+    /**
+     * __construct 
+     * 
+     * @param mixed $resourceType 
+     * @return void
+     */
+    public function __construct($resourceType = null) {
+
+        if ($resourceType === Sabre_DAV_Server::NODE_FILE)
+            $this->resourceType = null;
+        elseif ($resourceType === Sabre_DAV_Server::NODE_DIRECTORY)
+            $this->resourceType = '{DAV:}collection';
+        else 
+            $this->resourceType = $resourceType;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $propName = null;
+        $rt = $this->resourceType;
+        if (!is_array($rt)) $rt = array($rt);
+        
+        foreach($rt as $resourceType) {
+            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) { 
+       
+                if (isset($server->xmlNamespaces[$propName[1]])) {
+                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
+                } else {
+                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
+                }
+            
+            }
+        }
+
+    }
+
+    /**
+     * Returns the value in clark-notation
+     *
+     * For example '{DAV:}collection'
+     * 
+     * @return string 
+     */
+    public function getValue() {
+
+        return $this->resourceType;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/Response.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/Response.php
new file mode 100644
index 00000000..6c75e8df
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/Response.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Response property 
+ * 
+ * This class represents the {DAV:}response XML element.
+ * This is used by the Server class to encode individual items within a multistatus 
+ * response.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_Response extends Sabre_DAV_Property implements Sabre_DAV_Property_IHref {
+
+    /**
+     * Url for the response 
+     * 
+     * @var string 
+     */
+    private $href;
+
+    /**
+     * Propertylist, ordered by HTTP status code 
+     * 
+     * @var array 
+     */
+    private $responseProperties;
+
+    /**
+     * The responseProperties argument is a list of properties
+     * within an array with keys representing HTTP status codes
+     * 
+     * @param string $href 
+     * @param array $responseProperties 
+     * @return void
+     */
+    public function __construct($href,array $responseProperties) {
+
+        $this->href = $href;
+        $this->responseProperties = $responseProperties; 
+
+    }
+
+    /**
+     * Returns the url 
+     * 
+     * @return string 
+     */
+    public function getHref() {
+
+        return $this->href;
+
+    }
+
+    /**
+     * Returns the property list 
+     * 
+     * @return array 
+     */
+    public function getResponseProperties() {
+
+        return $this->responseProperties;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @param DOMElement $dom 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $dom) {
+
+        $document = $dom->ownerDocument;
+        $properties = $this->responseProperties;
+        
+        $xresponse = $document->createElement('d:response');
+        $dom->appendChild($xresponse); 
+
+        $uri = Sabre_DAV_URLUtil::encodePath($this->href);
+
+        // Adding the baseurl to the beginning of the url
+        $uri = $server->getBaseUri() . $uri;
+
+        $xresponse->appendChild($document->createElement('d:href',$uri));
+       
+        // The properties variable is an array containing properties, grouped by
+        // HTTP status
+        foreach($properties as $httpStatus=>$propertyGroup) {
+
+            // The 'href' is also in this array, and it's special cased.
+            // We will ignore it
+            if ($httpStatus=='href') continue;
+
+            // If there are no properties in this group, we can also just carry on
+            if (!count($propertyGroup)) continue;
+
+            $xpropstat = $document->createElement('d:propstat');
+            $xresponse->appendChild($xpropstat);
+
+            $xprop = $document->createElement('d:prop');
+            $xpropstat->appendChild($xprop);
+
+            $nsList = $server->xmlNamespaces;
+
+            foreach($propertyGroup as $propertyName=>$propertyValue) {
+
+                $propName = null;
+                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
+            
+                // special case for empty namespaces
+                if ($propName[1]=='') {
+
+                    $currentProperty = $document->createElement($propName[2]);
+                    $xprop->appendChild($currentProperty);
+                    $currentProperty->setAttribute('xmlns','');
+
+                } else {
+
+                    if (!isset($nsList[$propName[1]])) {
+                        $nsList[$propName[1]] = 'x' . count($nsList);
+                    }
+
+                    // If the namespace was defined in the top-level xml namespaces, it means 
+                    // there was already a namespace declaration, and we don't have to worry about it.
+                    if (isset($server->xmlNamespaces[$propName[1]])) {
+                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
+                    } else {
+                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
+                    }
+                    $xprop->appendChild($currentProperty);
+
+                }
+
+                if (is_scalar($propertyValue)) {
+                    $text = $document->createTextNode($propertyValue);
+                    $currentProperty->appendChild($text);
+                } elseif ($propertyValue instanceof Sabre_DAV_Property) {
+                    $propertyValue->serialize($server,$currentProperty);
+                } elseif (!is_null($propertyValue)) {
+                    throw new Sabre_DAV_Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
+                }
+
+            }
+
+            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
+
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedLock.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedLock.php
new file mode 100644
index 00000000..0b7ca0cf
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedLock.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This class represents the {DAV:}supportedlock property
+ *
+ * This property contains information about what kind of locks
+ * this server supports.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedLock extends Sabre_DAV_Property {
+
+    /**
+     * supportsLocks 
+     * 
+     * @var mixed
+     */
+    public $supportsLocks = false;
+
+    /**
+     * __construct 
+     * 
+     * @param mixed $supportsLocks 
+     * @return void
+     */
+    public function __construct($supportsLocks) {
+
+        $this->supportsLocks = $supportsLocks;
+
+    }
+
+    /**
+     * serialize 
+     * 
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        $doc = $prop->ownerDocument;
+
+        if (!$this->supportsLocks) return null;
+
+        $lockEntry1 = $doc->createElementNS('DAV:','d:lockentry');
+        $lockEntry2 = $doc->createElementNS('DAV:','d:lockentry');
+
+        $prop->appendChild($lockEntry1);
+        $prop->appendChild($lockEntry2);
+
+        $lockScope1 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockScope2 = $doc->createElementNS('DAV:','d:lockscope');
+        $lockType1 = $doc->createElementNS('DAV:','d:locktype');
+        $lockType2 = $doc->createElementNS('DAV:','d:locktype');
+
+        $lockEntry1->appendChild($lockScope1);
+        $lockEntry1->appendChild($lockType1);
+        $lockEntry2->appendChild($lockScope2);
+        $lockEntry2->appendChild($lockType2);
+
+        $lockScope1->appendChild($doc->createElementNS('DAV:','d:exclusive'));
+        $lockScope2->appendChild($doc->createElementNS('DAV:','d:shared'));
+
+        $lockType1->appendChild($doc->createElementNS('DAV:','d:write'));
+        $lockType2->appendChild($doc->createElementNS('DAV:','d:write'));
+
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedReportSet.php b/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedReportSet.php
new file mode 100644
index 00000000..8676f4c0
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/SupportedReportSet.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * supported-report-set property.
+ *
+ * This property is defined in RFC3253, but since it's
+ * so common in other webdav-related specs, it is part of the core server.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Property_SupportedReportSet extends Sabre_DAV_Property {
+
+    /**
+     * List of reports 
+     * 
+     * @var array
+     */
+    protected $reports = array();
+
+    /**
+     * Creates the property
+     *
+     * Any reports passed in the constructor
+     * should be valid report-types in clark-notation.
+     *
+     * Either a string or an array of strings must be passed.
+     * 
+     * @param mixed $reports 
+     * @return void
+     */
+    public function __construct($report = null) {
+
+        if (!is_null($report)) 
+            $this->addReport($reports);
+
+    }
+
+    /**
+     * Adds a report to this property
+     *
+     * The report must be a string in clark-notation.
+     * Multiple reports can be specified as an array.
+     * 
+     * @param mixed $report 
+     * @return void
+     */
+    public function addReport($report) {
+
+        if (!is_array($report)) $report = array($report);
+
+        foreach($report as $r) {
+
+            if (!preg_match('/^{([^}]*)}(.*)$/',$r)) 
+                throw new Sabre_DAV_Exception('Reportname must be in clark-notation');
+
+            $this->reports[] = $r;
+
+        }
+
+    }
+
+    /**
+     * Returns the list of supported reports
+     * 
+     * @return array 
+     */
+    public function getValue() {
+
+        return $this->reports;
+
+    }
+
+    /**
+     * Serializes the node 
+     *
+     * @param Sabre_DAV_Server $server
+     * @param DOMElement $prop 
+     * @return void
+     */
+    public function serialize(Sabre_DAV_Server $server,DOMElement $prop) {
+
+        foreach($this->reports as $reportName) {
+     
+            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
+            $prop->appendChild($supportedReport);
+
+            $report = $prop->ownerDocument->createElement('d:report');
+            $supportedReport->appendChild($report);
+
+            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
+            
+            list(, $namespace, $element) = $matches;
+       
+            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
+
+            if ($prefix) {
+                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
+            } else {
+                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
+            }
+
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Property/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Property/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Property/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Server.php b/upload/ips_kernel/sabre/Sabre/DAV/Server.php
new file mode 100644
index 00000000..686758d4
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Server.php
@@ -0,0 +1,1821 @@
+<?php
+
+/**
+ * Main DAV server class
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Server {
+
+    /**
+     * Inifinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
+     */
+    const DEPTH_INFINITY = -1;
+
+    /**
+     * Nodes that are files, should have this as the type property
+     */
+    const NODE_FILE = 1;
+
+    /**
+     * Nodes that are directories, should use this value as the type property
+     */
+    const NODE_DIRECTORY = 2;
+
+    const PROP_SET = 1;
+    const PROP_REMOVE = 2;
+
+    /**
+     * XML namespace for all SabreDAV related elements
+     */
+    const NS_SABREDAV = 'http://sabredav.org/ns';
+
+    /**
+     * The tree object
+     * 
+     * @var Sabre_DAV_Tree 
+     */
+    public $tree;
+
+    /**
+     * The base uri 
+     * 
+     * @var string 
+     */
+    protected $baseUri = null; 
+
+    /**
+     * httpResponse 
+     * 
+     * @var Sabre_HTTP_Response 
+     */
+    public $httpResponse;
+
+    /**
+     * httpRequest
+     * 
+     * @var Sabre_HTTP_Request 
+     */
+    public $httpRequest;
+
+    /**
+     * The list of plugins 
+     * 
+     * @var array 
+     */
+    protected $plugins = array();
+
+    /**
+     * This array contains a list of callbacks we should call when certain events are triggered 
+     * 
+     * @var array
+     */
+    protected $eventSubscriptions = array();
+
+    /**
+     * This is a default list of namespaces.
+     *
+     * If you are defining your own custom namespace, add it here to reduce
+     * bandwidth and improve legibility of xml bodies.
+     * 
+     * @var array
+     */
+    public $xmlNamespaces = array(
+        'DAV:' => 'd',
+        'http://sabredav.org/ns' => 's',
+    );
+
+    /**
+     * The propertymap can be used to map properties from 
+     * requests to property classes.
+     * 
+     * @var array
+     */
+    public $propertyMap = array(
+    );
+
+    public $protectedProperties = array(
+        // RFC4918
+        '{DAV:}getcontentlength',
+        '{DAV:}getetag',
+        '{DAV:}getlastmodified',
+        '{DAV:}lockdiscovery',
+        '{DAV:}resourcetype',
+        '{DAV:}supportedlock',
+
+        // RFC4331
+        '{DAV:}quota-available-bytes',
+        '{DAV:}quota-used-bytes',
+
+        // RFC3744
+        '{DAV:}alternate-URI-set',
+        '{DAV:}principal-URL',
+        '{DAV:}group-membership',
+        '{DAV:}supported-privilege-set',
+        '{DAV:}current-user-privilege-set',
+        '{DAV:}acl',
+        '{DAV:}acl-restrictions',
+        '{DAV:}inherited-acl-set',
+        '{DAV:}principal-collection-set',
+
+        // RFC5397 
+        '{DAV:}current-user-principal',
+    );
+
+    /**
+     * This is a flag that allow or not showing file, line and code
+     * of the exception in the returned XML
+     *
+     * @var bool 
+     */
+    public $debugExceptions = false;
+
+
+    /**
+     * Sets up the server
+     *
+     * If a Sabre_DAV_Tree object is passed as an argument, it will
+     * use it as the directory tree. If a Sabre_DAV_INode is passed, it
+     * will create a Sabre_DAV_ObjectTree and use the node as the root.
+     *
+     * If nothing is passed, a Sabre_DAV_SimpleDirectory is created in 
+     * a Sabre_DAV_ObjectTree.
+     * 
+     * @param Sabre_DAV_Tree $tree The tree object 
+     * @return void
+     */
+    public function __construct($treeOrNode = null) {
+
+        if ($treeOrNode instanceof Sabre_DAV_Tree) {
+            $this->tree = $treeOrNode;
+        } elseif ($treeOrNode instanceof Sabre_DAV_INode) {
+            $this->tree = new Sabre_DAV_ObjectTree($treeOrNode);
+        } elseif (is_null($treeOrNode)) {
+            $root = new Sabre_DAV_SimpleDirectory('root');
+            $this->tree = new Sabre_DAV_ObjectTree($root);
+        } else {
+            throw new Sabre_DAV_Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre_DAV_Tree, Sabre_DAV_INode or null');
+        }
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Starts the DAV Server 
+     *
+     * @return void
+     */
+    public function exec() {
+
+        try {
+
+            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
+
+        } catch (Exception $e) {
+
+            $DOM = new DOMDocument('1.0','utf-8');
+            $DOM->formatOutput = true;
+
+            $error = $DOM->createElementNS('DAV:','d:error');
+            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
+            $DOM->appendChild($error);
+
+            $error->appendChild($DOM->createElement('s:exception',get_class($e)));
+            $error->appendChild($DOM->createElement('s:message',$e->getMessage()));
+            if ($this->debugExceptions) {
+                $error->appendChild($DOM->createElement('s:file',$e->getFile()));
+                $error->appendChild($DOM->createElement('s:line',$e->getLine()));
+                $error->appendChild($DOM->createElement('s:code',$e->getCode()));
+                $error->appendChild($DOM->createElement('s:stacktrace',$e->getTraceAsString()));
+
+            }
+            $error->appendChild($DOM->createElement('s:sabredav-version',Sabre_DAV_Version::VERSION));
+
+            if($e instanceof Sabre_DAV_Exception) {
+
+                $httpCode = $e->getHTTPCode();
+                $e->serialize($this,$error);
+                $headers = $e->getHTTPHeaders($this);
+
+            } else {
+
+                $httpCode = 500;
+                $headers = array();
+
+            }
+            $headers['Content-Type'] = 'application/xml; charset=utf-8';
+            
+            $this->httpResponse->sendStatus($httpCode);
+            $this->httpResponse->setHeaders($headers);
+            $this->httpResponse->sendBody($DOM->saveXML());
+
+        }
+
+    }
+
+    /**
+     * Sets the base server uri
+     * 
+     * @param string $uri
+     * @return void
+     */
+    public function setBaseUri($uri) {
+
+        // If the baseUri does not end with a slash, we must add it
+        if ($uri[strlen($uri)-1]!=='/') 
+            $uri.='/';
+
+        $this->baseUri = $uri;    
+
+    }
+
+    /**
+     * Returns the base responding uri
+     * 
+     * @return string 
+     */
+    public function getBaseUri() {
+
+        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
+        return $this->baseUri;
+
+    }
+
+    /**
+     * This method attempts to detect the base uri.
+     * Only the PATH_INFO variable is considered. 
+     * 
+     * If this variable is not set, the root (/) is assumed. 
+     *
+     * @return void
+     */
+    public function guessBaseUri() {
+
+        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
+        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
+
+        // If PATH_INFO is not found, we just return /
+        if (!empty($pathInfo)) {
+
+            // We need to make sure we ignore the QUERY_STRING part
+            if ($pos = strpos($uri,'?'))
+                $uri = substr($uri,0,$pos);
+
+            // PATH_INFO is only set for urls, such as: /example.php/path
+            // in that case PATH_INFO contains '/path'.
+            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
+            // not, Therefore they are only comparable if we first decode
+            // REQUEST_INFO as well.
+            $decodedUri = Sabre_DAV_URLUtil::decodePath($uri);
+
+            // A simple sanity check:
+            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
+                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
+                return rtrim($baseUri,'/') . '/';
+            }
+
+            throw new Sabre_DAV_Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.'); 
+
+        } 
+
+        // If the url ended with .php, we're going to assume that that's the server root
+        if (strpos($uri,'.php')===strlen($uri)-4) {
+            return $uri . '/';
+        }
+
+        // The last fallback is that we're just going to assume the server root. 
+        return '/';
+
+    }
+
+    /**
+     * Adds a plugin to the server
+     * 
+     * For more information, console the documentation of Sabre_DAV_ServerPlugin
+     *
+     * @param Sabre_DAV_ServerPlugin $plugin 
+     * @return void
+     */
+    public function addPlugin(Sabre_DAV_ServerPlugin $plugin) {
+
+        $this->plugins[get_class($plugin)] = $plugin;
+        $plugin->initialize($this);
+
+    }
+
+    /**
+     * Returns an initialized plugin by it's classname. 
+     *
+     * This function returns null if the plugin was not found.
+     *
+     * @param string $className
+     * @return Sabre_DAV_ServerPlugin 
+     */
+    public function getPlugin($className) {
+
+        if (isset($this->plugins[$className])) return $this->plugins[$className];
+        return null;
+
+    }
+
+    /**
+     * Subscribe to an event.
+     *
+     * When the event is triggered, we'll call all the specified callbacks.
+     * It is possible to control the order of the callbacks through the
+     * priority argument.
+     *
+     * This is for example used to make sure that the authentication plugin
+     * is triggered before anything else. If it's not needed to change this
+     * number, it is recommended to ommit.  
+     * 
+     * @param string $event 
+     * @param callback $callback
+     * @param int $priority
+     * @return void
+     */
+    public function subscribeEvent($event, $callback, $priority = 100) {
+
+        if (!isset($this->eventSubscriptions[$event])) {
+            $this->eventSubscriptions[$event] = array();
+        }
+        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
+        $this->eventSubscriptions[$event][$priority] = $callback;
+        ksort($this->eventSubscriptions[$event]);
+
+    }
+
+    /**
+     * Broadcasts an event
+     *
+     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
+     *
+     * The arguments parameter will be sent to all subscribers
+     *
+     * @param string $eventName
+     * @param array $arguments
+     * @return bool 
+     */
+    public function broadcastEvent($eventName,$arguments = array()) {
+        
+        if (isset($this->eventSubscriptions[$eventName])) {
+
+            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
+
+                $result = call_user_func_array($subscriber,$arguments);
+                if ($result===false) return false;
+
+            }
+
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Handles a http request, and execute a method based on its name 
+     *
+     * @param string $method
+     * @param string $uri
+     * @return void
+     */
+    public function invokeMethod($method, $uri) {
+
+        $method = strtoupper($method); 
+
+        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
+
+        // Make sure this is a HTTP method we support
+        $internalMethods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'MKCOL',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        if (in_array($method,$internalMethods)) {
+
+            call_user_func(array($this,'http' . $method), $uri);
+
+        } else {
+
+            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
+                // Unsupported method
+                throw new Sabre_DAV_Exception_NotImplemented();
+            }
+
+        }
+
+    }
+
+    // {{{ HTTP Method implementations
+    
+    /**
+     * HTTP OPTIONS 
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpOptions($uri) {
+
+        $methods = $this->getAllowedMethods($uri);
+
+        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
+        $features = array('1','3', 'extended-mkcol');
+
+        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
+        
+        $this->httpResponse->setHeader('DAV',implode(', ',$features));
+        $this->httpResponse->setHeader('MS-Author-Via','DAV');
+        $this->httpResponse->setHeader('Accept-Ranges','bytes');
+        $this->httpResponse->setHeader('X-Sabre-Version',Sabre_DAV_Version::VERSION);
+        $this->httpResponse->setHeader('Content-Length',0);
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP GET
+     *
+     * This method simply fetches the contents of a uri, like normal
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpGet($uri) {
+
+        $node = $this->tree->getNodeForPath($uri,0);
+
+        if (!$this->checkPreconditions(true)) return false; 
+
+        if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_NotImplemented('GET is only implemented on File objects');
+        $body = $node->get();
+
+        // Converting string into stream, if needed.
+        if (is_string($body)) {
+            $stream = fopen('php://temp','r+');
+            fwrite($stream,$body);
+            rewind($stream);
+            $body = $stream;
+        }
+
+        /*
+         * TODO: getetag, getlastmodified, getsize should also be used using
+         * this method
+         */
+        $httpHeaders = $this->getHTTPHeaders($uri);
+
+        /* ContentType needs to get a default, because many webservers will otherwise
+         * default to text/html, and we don't want this for security reasons.
+         */
+        if (!isset($httpHeaders['Content-Type'])) {
+            $httpHeaders['Content-Type'] = 'application/octet-stream';
+        }
+
+
+        if (isset($httpHeaders['Content-Length'])) {
+
+            $nodeSize = $httpHeaders['Content-Length'];
+
+            // Need to unset Content-Length, because we'll handle that during figuring out the range
+            unset($httpHeaders['Content-Length']);
+
+        } else {
+            $nodeSize = null;
+        }
+        
+        $this->httpResponse->setHeaders($httpHeaders);
+
+        $range = $this->getHTTPRange();
+        $ifRange = $this->httpRequest->getHeader('If-Range');
+        $ignoreRangeHeader = false;
+
+        // If ifRange is set, and range is specified, we first need to check
+        // the precondition.
+        if ($nodeSize && $range && $ifRange) {
+             
+            // if IfRange is parsable as a date we'll treat it as a DateTime
+            // otherwise, we must treat it as an etag.
+            try {
+                $ifRangeDate = new DateTime($ifRange);
+               
+                // It's a date. We must check if the entity is modified since
+                // the specified date.
+                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
+                else {
+                    $modified = new DateTime($httpHeaders['Last-Modified']);
+                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                }
+
+            } catch (Exception $e) {
+               
+                // It's an entity. We can do a simple comparison. 
+                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
+                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
+            }
+        }
+
+        // We're only going to support HTTP ranges if the backend provided a filesize
+        if (!$ignoreRangeHeader && $nodeSize && $range) {
+
+            // Determining the exact byte offsets
+            if (!is_null($range[0])) {
+
+                $start = $range[0];
+                $end = $range[1]?$range[1]:$nodeSize-1;
+                if($start >= $nodeSize) 
+                    throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+
+                if($end < $start) throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                if($end >= $nodeSize) $end = $nodeSize-1;
+
+            } else {
+
+                $start = $nodeSize-$range[1];
+                $end  = $nodeSize-1;
+
+                if ($start<0) $start = 0;
+
+            }
+
+            // New read/write stream
+            $newStream = fopen('php://temp','r+');
+
+            stream_copy_to_stream($body, $newStream, $end-$start+1, $start);
+            rewind($newStream);
+
+            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
+            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
+            $this->httpResponse->sendStatus(206);
+            $this->httpResponse->sendBody($newStream);
+
+
+        } else {
+
+            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
+            $this->httpResponse->sendStatus(200);
+            $this->httpResponse->sendBody($body);
+
+        }
+
+    }
+
+    /**
+     * HTTP HEAD
+     *
+     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
+     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpHead($uri) {
+
+        $node = $this->tree->getNodeForPath($uri);
+        /* This information is only collection for File objects.
+         * Ideally we want to throw 405 Method Not Allowed for every 
+         * non-file, but MS Office does not like this
+         */
+        if ($node instanceof Sabre_DAV_IFile) {
+            $headers = $this->getHTTPHeaders($this->getRequestUri());
+            if (!isset($headers['Content-Type'])) {
+                $headers['Content-Type'] = 'application/octet-stream';
+            }
+            $this->httpResponse->setHeaders($headers);
+        }
+        $this->httpResponse->sendStatus(200);
+
+    }
+
+    /**
+     * HTTP Delete 
+     *
+     * The HTTP delete method, deletes a given uri
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpDelete($uri) {
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+        $this->tree->delete($uri);
+
+        $this->httpResponse->sendStatus(204);
+        $this->httpResponse->setHeader('Content-Length','0');
+
+    }
+
+
+    /**
+     * WebDAV PROPFIND 
+     *
+     * This WebDAV method requests information about an uri resource, or a list of resources
+     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
+     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
+     *
+     * The request body contains an XML data structure that has a list of properties the client understands 
+     * The response body is also an xml document, containing information about every uri resource and the requested properties
+     *
+     * It has to return a HTTP 207 Multi-status status code
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropfind($uri) {
+
+        // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
+        $requestedProperties = $this->parsePropfindRequest($this->httpRequest->getBody(true));
+
+        $depth = $this->getHTTPDepth(1);
+        // The only two options for the depth of a propfind is 0 or 1 
+        if ($depth!=0) $depth = 1;
+
+        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
+
+        // This is a multi-status response
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+        $data = $this->generateMultiStatus($newProperties);
+        $this->httpResponse->sendBody($data);
+
+    }
+
+    /**
+     * WebDAV PROPPATCH
+     *
+     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
+     * In this XML body it is specified which properties should be set/updated and/or deleted
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPropPatch($uri) {
+
+        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
+        
+        $result = $this->updateProperties($uri, $newProperties);
+
+        $this->httpResponse->sendStatus(207);
+        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $this->httpResponse->sendBody(
+            $this->generateMultiStatus(array($result))
+        );
+
+    }
+
+    /**
+     * HTTP PUT method 
+     * 
+     * This HTTP method updates a file, or creates a new one.
+     *
+     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 200 Ok
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpPut($uri) {
+
+        $body = $this->httpRequest->getBody();
+
+        // Intercepting the Finder problem
+        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
+           
+            /**
+            Many webservers will not cooperate well with Finder PUT requests, 
+            because it uses 'Chunked' transfer encoding for the request body.
+
+            The symptom of this problem is that Finder sends files to the 
+            server, but they arrive as 0-lenght files in PHP.
+
+            If we don't do anything, the user might think they are uploading
+            files successfully, but they end up empty on the server. Instead,
+            we throw back an error if we detect this.
+
+            The reason Finder uses Chunked, is because it thinks the files
+            might change as it's being uploaded, and therefore the
+            Content-Length can vary.
+
+            Instead it sends the X-Expected-Entity-Length header with the size
+            of the file at the very start of the request. If this header is set,
+            but we don't get a request body we will fail the request to
+            protect the end-user.
+            */
+
+            // Only reading first byte
+            $firstByte = fread($body,1);
+            if (strlen($firstByte)!==1) {
+                throw new Sabre_DAV_Exception_Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
+            }
+
+            // The body needs to stay intact, so we copy everything to a
+            // temporary stream.
+
+            $newBody = fopen('php://temp','r+');
+            fwrite($newBody,$firstByte);
+            stream_copy_to_stream($body, $newBody);
+            rewind($newBody);
+
+            $body = $newBody;
+
+        }
+
+        if ($this->tree->nodeExists($uri)) { 
+
+            $node = $this->tree->getNodeForPath($uri);
+          
+            // Checking If-None-Match and related headers.
+            if (!$this->checkPreconditions()) return;
+            
+            // If the node is a collection, we'll deny it
+            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
+            if (!$this->broadcastEvent('beforeWriteContent',array($this->getRequestUri()))) return false;
+
+            $node->put($body);
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(200);
+
+        } else {
+
+            // If we got here, the resource didn't exist yet.
+            $this->createFile($this->getRequestUri(),$body);
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+
+        }
+
+    }
+
+
+    /**
+     * WebDAV MKCOL
+     *
+     * The MKCOL method is used to create a new collection (directory) on the server
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMkcol($uri) {
+
+        $requestBody = $this->httpRequest->getBody(true);
+
+        if ($requestBody) {
+
+            $contentType = $this->httpRequest->getHeader('Content-Type');
+            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
+
+                // We must throw 415 for unsupport mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
+
+            }
+
+            $dom = Sabre_DAV_XMLUtil::loadDOMDocument($requestBody);
+            if (Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
+
+                // We must throw 415 for unsupport mkcol bodies
+                throw new Sabre_DAV_Exception_UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
+
+            }
+
+            $properties = array();
+            foreach($dom->firstChild->childNodes as $childNode) {
+
+                if (Sabre_DAV_XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
+                $properties = array_merge($properties, Sabre_DAV_XMLUtil::parseProperties($childNode, $this->propertyMap));
+
+            }
+            if (!isset($properties['{DAV:}resourcetype'])) 
+                throw new Sabre_DAV_Exception_BadRequest('The mkcol request must include a {DAV:}resourcetype property');/*noLibHook*/
+
+            unset($properties['{DAV:}resourcetype']);
+
+            $resourceType = array();
+            // Need to parse out all the resourcetypes
+            $rtNode = $dom->firstChild->getElementsByTagNameNS('urn:DAV','resourcetype');
+            $rtNode = $rtNode->item(0);
+            foreach($rtNode->childNodes as $childNode) {;
+                $resourceType[] = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
+            }
+
+        } else {
+
+            $properties = array();
+            $resourceType = array('{DAV:}collection');
+
+        }
+
+        $result = $this->createCollection($uri, $resourceType, $properties);
+
+        if (is_array($result)) {
+            $this->httpResponse->sendStatus(207);
+            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+
+            $this->httpResponse->sendBody(
+                $this->generateMultiStatus(array($result))
+            );
+
+        } else {
+            $this->httpResponse->setHeader('Content-Length','0');
+            $this->httpResponse->sendStatus(201);
+        }
+
+    }
+
+    /**
+     * WebDAV HTTP MOVE method
+     *
+     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpMove($uri) {
+
+        $moveInfo = $this->getCopyAndMoveInfo();
+        if ($moveInfo['destinationExists']) {
+
+            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
+            $this->tree->delete($moveInfo['destination']);
+
+        }
+
+        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
+        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
+        $this->tree->move($uri,$moveInfo['destination']);
+        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
+
+    }
+
+    /**
+     * WebDAV HTTP COPY method
+     *
+     * This method copies one uri to a different uri, and works much like the MOVE request
+     * A lot of the actual request processing is done in getCopyMoveInfo
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpCopy($uri) {
+
+        $copyInfo = $this->getCopyAndMoveInfo();
+        if ($copyInfo['destinationExists']) {
+
+            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
+            $this->tree->delete($copyInfo['destination']);
+
+        }
+        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
+        $this->tree->copy($uri,$copyInfo['destination']);
+        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
+
+        // If a resource was overwritten we should send a 204, otherwise a 201
+        $this->httpResponse->setHeader('Content-Length','0');
+        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
+
+    }
+
+
+
+    /**
+     * HTTP REPORT method implementation
+     *
+     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
+     * It's used in a lot of extensions, so it made sense to implement it into the core.
+     *
+     * @param string $uri
+     * @return void
+     */
+    protected function httpReport($uri) {
+
+        $body = $this->httpRequest->getBody(true);
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+
+        $reportName = Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild);
+
+        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
+
+            // If broadcastEvent returned true, it means the report was not supported
+            throw new Sabre_DAV_Exception_ReportNotImplemented();
+
+        }
+
+    }
+
+    // }}}
+    // {{{ HTTP/WebDAV protocol helpers 
+
+    /**
+     * Returns an array with all the supported HTTP methods for a specific uri. 
+     *
+     * @param string $uri 
+     * @return array 
+     */
+    public function getAllowedMethods($uri) {
+
+        $methods = array(
+            'OPTIONS',
+            'GET',
+            'HEAD',
+            'DELETE',
+            'PROPFIND',
+            'PUT',
+            'PROPPATCH',
+            'COPY',
+            'MOVE',
+            'REPORT'
+        );
+
+        // The MKCOL is only allowed on an unmapped uri
+        try {
+            $node = $this->tree->getNodeForPath($uri);
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            $methods[] = 'MKCOL';
+        }
+
+        // We're also checking if any of the plugins register any new methods
+        foreach($this->plugins as $plugin) $methods = array_merge($methods,$plugin->getHTTPMethods($uri));
+        array_unique($methods);
+
+        return $methods;
+
+    }
+
+    /**
+     * Gets the uri for the request, keeping the base uri into consideration 
+     * 
+     * @return string
+     */
+    public function getRequestUri() {
+
+        return $this->calculateUri($this->httpRequest->getUri());
+
+    }
+
+    /**
+     * Calculates the uri for a request, making sure that the base uri is stripped out 
+     * 
+     * @param string $uri 
+     * @throws Sabre_DAV_Exception_Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
+     * @return string
+     */
+    public function calculateUri($uri) {
+
+        if ($uri[0]!='/' && strpos($uri,'://')) {
+
+            $uri = parse_url($uri,PHP_URL_PATH);
+
+        }
+
+        $uri = str_replace('//','/',$uri);
+
+        if (strpos($uri,$this->getBaseUri())===0) {
+
+            return trim(Sabre_DAV_URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
+
+        // A special case, if the baseUri was accessed without a trailing 
+        // slash, we'll accept it as well. 
+        } elseif ($uri.'/' === $this->getBaseUri()) { 
+
+            return '';
+
+        } else {
+
+            throw new Sabre_DAV_Exception_Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
+
+        }
+
+    }
+
+    /**
+     * Returns the HTTP depth header
+     *
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre_DAV_Server::DEPTH_INFINITY object
+     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existant
+     * 
+     * @param mixed $default 
+     * @return int 
+     */
+    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
+
+        // If its not set, we'll grab the default
+        $depth = $this->httpRequest->getHeader('Depth');
+        if (is_null($depth)) return $default;
+
+        if ($depth == 'infinity') return self::DEPTH_INFINITY;
+
+        // If its an unknown value. we'll grab the default
+        if (!ctype_digit($depth)) return $default;
+
+        return (int)$depth;
+
+    }
+
+    /**
+     * Returns the HTTP range header
+     *
+     * This method returns null if there is no well-formed HTTP range request
+     * header or array($start, $end).
+     *
+     * The first number is the offset of the first byte in the range.
+     * The second number is the offset of the last byte in the range.
+     *
+     * If the second offset is null, it should be treated as the offset of the last byte of the entity
+     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity 
+     *
+     * return $mixed
+     */
+    public function getHTTPRange() {
+
+        $range = $this->httpRequest->getHeader('range');
+        if (is_null($range)) return null; 
+
+        // Matching "Range: bytes=1234-5678: both numbers are optional
+
+        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
+
+        if ($matches[1]==='' && $matches[2]==='') return null;
+
+        return array(
+            $matches[1]!==''?$matches[1]:null,
+            $matches[2]!==''?$matches[2]:null,
+        );
+
+    }
+
+
+    /**
+     * Returns information about Copy and Move requests
+     * 
+     * This function is created to help getting information about the source and the destination for the 
+     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions 
+     * 
+     * The returned value is an array with the following keys:
+     *   * destination - Destination path
+     *   * destinationExists - Wether or not the destination is an existing url (and should therefore be overwritten)
+     *
+     * @return array 
+     */
+    public function getCopyAndMoveInfo() {
+
+        // Collecting the relevant HTTP headers
+        if (!$this->httpRequest->getHeader('Destination')) throw new Sabre_DAV_Exception_BadRequest('The destination header was not supplied');
+        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
+        $overwrite = $this->httpRequest->getHeader('Overwrite');
+        if (!$overwrite) $overwrite = 'T';
+        if (strtoupper($overwrite)=='T') $overwrite = true;
+        elseif (strtoupper($overwrite)=='F') $overwrite = false;
+        // We need to throw a bad request exception, if the header was invalid
+        else throw new Sabre_DAV_Exception_BadRequest('The HTTP Overwrite header should be either T or F');
+
+        list($destinationDir) = Sabre_DAV_URLUtil::splitPath($destination);
+
+        try {
+            $destinationParent = $this->tree->getNodeForPath($destinationDir);
+            if (!($destinationParent instanceof Sabre_DAV_ICollection)) throw new Sabre_DAV_Exception_UnsupportedMediaType('The destination node is not a collection');
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            // If the destination parent node is not found, we throw a 409
+            throw new Sabre_DAV_Exception_Conflict('The destination node is not found');
+        }
+
+        try {
+
+            $destinationNode = $this->tree->getNodeForPath($destination);
+            
+            // If this succeeded, it means the destination already exists
+            // we'll need to throw precondition failed in case overwrite is false
+            if (!$overwrite) throw new Sabre_DAV_Exception_PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            // Destination didn't exist, we're all good
+            $destinationNode = false;
+
+
+
+        }
+
+        // These are the three relevant properties we need to return
+        return array(
+            'destination'       => $destination,
+            'destinationExists' => $destinationNode==true,
+            'destinationNode'   => $destinationNode,
+        );
+
+    }
+
+    /**
+     * Returns a list of properties for a path
+     *
+     * This is a simplified version getPropertiesForPath.
+     * if you aren't interested in status codes, but you just
+     * want to have a flat list of properties. Use this method.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     */
+    public function getProperties($path, $propertyNames) {
+
+        $result = $this->getPropertiesForPath($path,$propertyNames,0);
+        return $result[0][200];
+
+    }
+
+    /**
+     * Returns a list of HTTP headers for a particular resource
+     *
+     * The generated http headers are based on properties provided by the 
+     * resource. The method basically provides a simple mapping between
+     * DAV property and HTTP header.
+     *
+     * The headers are intended to be used for HEAD and GET requests.
+     * 
+     * @param string $path
+     */
+    public function getHTTPHeaders($path) {
+
+        $propertyMap = array(
+            '{DAV:}getcontenttype'   => 'Content-Type',
+            '{DAV:}getcontentlength' => 'Content-Length',
+            '{DAV:}getlastmodified'  => 'Last-Modified', 
+            '{DAV:}getetag'          => 'ETag',
+        );
+
+        $properties = $this->getProperties($path,array_keys($propertyMap));
+
+        $headers = array();
+        foreach($propertyMap as $property=>$header) {
+            if (!isset($properties[$property])) continue;
+
+            if (is_scalar($properties[$property])) { 
+                $headers[$header] = $properties[$property];
+
+            // GetLastModified gets special cased 
+            } elseif ($properties[$property] instanceof Sabre_DAV_Property_GetLastModified) {
+                $headers[$header] = $properties[$property]->getTime()->format(DateTime::RFC1123);
+            }
+
+        }
+
+        return $headers;
+        
+    }
+
+    /**
+     * Returns a list of properties for a given path
+     * 
+     * The path that should be supplied should have the baseUrl stripped out
+     * The list of properties should be supplied in Clark notation. If the list is empty
+     * 'allprops' is assumed.
+     *
+     * If a depth of 1 is requested child elements will also be returned.
+     *
+     * @param string $path 
+     * @param array $propertyNames
+     * @param int $depth 
+     * @return array
+     */
+    public function getPropertiesForPath($path,$propertyNames = array(),$depth = 0) {
+
+        if ($depth!=0) $depth = 1;
+
+        $returnPropertyList = array();
+        
+        $parentNode = $this->tree->getNodeForPath($path);
+        $nodes = array(
+            $path => $parentNode
+        );
+        if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
+            foreach($this->tree->getChildren($path) as $childNode)
+                $nodes[$path . '/' . $childNode->getName()] = $childNode;
+        }            
+       
+        // If the propertyNames array is empty, it means all properties are requested.
+        // We shouldn't actually return everything we know though, and only return a
+        // sensible list. 
+        $allProperties = count($propertyNames)==0;
+
+        foreach($nodes as $myPath=>$node) {
+
+            $newProperties = array(
+                '200' => array(),
+                '404' => array(),
+            );
+            if ($node instanceof Sabre_DAV_IProperties) 
+                $newProperties['200'] = $node->getProperties($propertyNames);
+
+            if ($allProperties) {
+
+                // Default list of propertyNames, when all properties were requested.
+                $propertyNames = array(
+                    '{DAV:}getlastmodified',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}resourcetype',
+                    '{DAV:}quota-used-bytes',
+                    '{DAV:}quota-available-bytes',
+                    '{DAV:}getetag',
+                    '{DAV:}getcontenttype',
+                );
+
+                // We need to make sure this includes any propertyname already returned from
+                // $node->getProperties();
+                $propertyNames = array_merge($propertyNames, array_keys($newProperties[200]));
+
+                // Making sure there's no double entries
+                $propertyNames = array_unique($propertyNames);
+
+            }
+
+            // If the resourceType was not part of the list, we manually add it 
+            // and mark it for removal. We need to know the resourcetype in order 
+            // to make certain decisions about the entry.
+            // WebDAV dictates we should add a / and the end of href's for collections
+            $removeRT = false;
+            if (!in_array('{DAV:}resourcetype',$propertyNames)) {
+                $propertyNames[] = '{DAV:}resourcetype';
+                $removeRT = true;
+            }
+
+            foreach($propertyNames as $prop) {
+                
+                if (isset($newProperties[200][$prop])) continue;
+
+                switch($prop) {
+                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
+                    case '{DAV:}getcontentlength'      : if ($node instanceof Sabre_DAV_IFile) $newProperties[200][$prop] = (int)$node->getSize(); break;
+                    case '{DAV:}resourcetype'          : $newProperties[200][$prop] = new Sabre_DAV_Property_ResourceType($node instanceof Sabre_DAV_ICollection?self::NODE_DIRECTORY:self::NODE_FILE); break;
+                    case '{DAV:}quota-used-bytes'      : 
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[0];
+                        }
+                        break;
+                    case '{DAV:}quota-available-bytes' : 
+                        if ($node instanceof Sabre_DAV_IQuota) {
+                            $quotaInfo = $node->getQuotaInfo();
+                            $newProperties[200][$prop] = $quotaInfo[1];
+                        }
+                        break;
+                    case '{DAV:}getetag'               : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
+                    case '{DAV:}getcontenttype'        : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
+                    case '{DAV:}supported-report-set'  : $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet(); break;
+
+                }
+
+                // If we were unable to find the property, we will list it as 404.
+                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
+
+            }
+         
+            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties));
+
+            $newProperties['href'] = trim($myPath,'/'); 
+
+            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
+            // Apple's iCal also requires a trailing slash for principals (rfc 3744).
+            // Therefore we add a trailing / for any non-file. This might need adjustments 
+            // if we find there are other edge cases.
+            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype']) && $newProperties[200]['{DAV:}resourcetype']->getValue()!==null) $newProperties['href'] .='/';
+
+            // If the resourcetype property was manually added to the requested property list,
+            // we will remove it again.
+            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
+
+            $returnPropertyList[] = $newProperties;
+
+        }
+        
+        return $returnPropertyList;
+
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new file.
+     *
+     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
+     * It was important to get this done through a centralized function, 
+     * allowing plugins to intercept this using the beforeCreateFile event.
+     * 
+     * @param string $uri 
+     * @param resource $data 
+     * @return void
+     */
+    public function createFile($uri,$data) {
+
+        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
+        if (!$this->broadcastEvent('beforeCreateFile',array($uri,$data))) return;
+
+        $parent = $this->tree->getNodeForPath($dir);
+        $parent->createFile($name,$data);
+        $this->tree->markDirty($dir);
+
+        $this->broadcastEvent('afterBind',array($uri));
+    }
+
+    /**
+     * This method is invoked by sub-systems creating a new directory.
+     *
+     * @param string $uri 
+     * @return void
+     */
+    public function createDirectory($uri) {
+
+        $this->createCollection($uri,array('{DAV:}collection'),array());
+
+    }
+
+    /**
+     * Use this method to create a new collection
+     *
+     * The {DAV:}resourcetype is specified using the resourceType array.
+     * At the very least it must contain {DAV:}collection. 
+     *
+     * The properties array can contain a list of additional properties.
+     * 
+     * @param string $uri The new uri 
+     * @param array $resourceType The resourceType(s) 
+     * @param array $properties A list of properties
+     * @return void
+     */
+    public function createCollection($uri, array $resourceType, array $properties) {
+
+        list($parentUri,$newName) = Sabre_DAV_URLUtil::splitPath($uri);
+
+        // Making sure {DAV:}collection was specified as resourceType
+        if (!in_array('{DAV:}collection', $resourceType)) {
+            throw new Sabre_DAV_Exception_InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');/*noLibHook*/
+        }
+
+
+        // Making sure the parent exists
+        try {
+
+            $parent = $this->tree->getNodeForPath($parentUri);
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            throw new Sabre_DAV_Exception_Conflict('Parent node does not exist');
+
+        }
+
+        // Making sure the parent is a collection
+        if (!$parent instanceof Sabre_DAV_ICollection) {
+            throw new Sabre_DAV_Exception_Conflict('Parent node is not a collection');
+        }
+
+
+
+        // Making sure the child does not already exist
+        try {
+            $parent->getChild($newName);
+
+            // If we got here.. it means there's already a node on that url, and we need to throw a 405
+            throw new Sabre_DAV_Exception_MethodNotAllowed('The resource you tried to create already exists');
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+            // This is correct
+        }
+
+        
+        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
+
+        // There are 2 modes of operation. The standard collection 
+        // creates the directory, and then updates properties
+        // the extended collection can create it directly.
+        if ($parent instanceof Sabre_DAV_IExtendedCollection) {
+
+            $parent->createExtendedCollection($newName, $resourceType, $properties);
+
+        } else {
+
+            // No special resourcetypes are supported
+            if (count($resourceType)>1) {
+                throw new Sabre_DAV_Exception_InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
+            }
+
+            $parent->createDirectory($newName);
+            $rollBack = false; 
+            $exception = null;
+            $errorResult = null;
+
+            if (count($properties)>0) {
+
+                try {
+
+                    $errorResult = $this->updateProperties($uri, $properties);
+                    if (!isset($errorResult[200])) {
+                        $rollBack = true;
+                    }
+
+                } catch (Sabre_DAV_Exception $e) {
+
+                    $rollBack = true;
+                    $exception = $e;
+
+                }
+
+            }
+
+            if ($rollBack) {
+                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
+                $this->tree->delete($uri);
+
+                // Re-throwing exception
+                if ($exception) throw $exception;
+
+                return $errorResult;
+            }
+                
+        }
+        $this->tree->markDirty($parentUri);
+        $this->broadcastEvent('afterBind',array($uri));
+
+    }
+
+    /**
+     * This method updates a resource's properties
+     *
+     * The properties array must be a list of properties. Array-keys are
+     * property names in clarknotation, array-values are it's values.
+     * If a property must be deleted, the value should be null.
+     * 
+     * Note that this request should either completely succeed, or 
+     * completely fail.
+     *
+     * The response is an array with statuscodes for keys, which in turn
+     * contain arrays with propertynames. This response can be used
+     * to generate a multistatus body.
+     * 
+     * @param string $uri 
+     * @param array $properties 
+     * @return array 
+     */
+    public function updateProperties($uri, array $properties) {
+
+        // we'll start by grabbing the node, this will throw the appropriate
+        // exceptions if it doesn't. 
+        $node = $this->tree->getNodeForPath($uri);
+       
+        $result = array(
+            200 => array(),
+            403 => array(),
+            424 => array(),
+        ); 
+        $remainingProperties = $properties;
+        $hasError = false;
+
+
+        // If the node is not an instance of Sabre_DAV_IProperties, every
+        // property is 403 Forbidden
+        // simply return a 405.
+        if (!($node instanceof Sabre_DAV_IProperties)) {
+            $hasError = true;
+            foreach($properties as $propertyName=> $value) {
+                $result[403][$propertyName] = null;
+            }
+            $remainingProperties = array();
+        }
+
+        // Running through all properties to make sure none of them are protected
+        if (!$hasError) foreach($properties as $propertyName => $value) {
+            if(in_array($propertyName, $this->protectedProperties)) {
+                $result[403][$propertyName] = null;
+                unset($remainingProperties[$propertyName]);
+                $hasError = true;
+            }
+        }
+
+        // Only if there were no errors we may attempt to update the resource
+        if (!$hasError) {
+            $updateResult = $node->updateProperties($properties);
+            $remainingProperties = array();
+
+            if ($updateResult===true) {
+                // success
+                foreach($properties as $propertyName=>$value) {
+                    $result[200][$propertyName] = null;
+                }
+
+            } elseif ($updateResult===false) {
+                // The node failed to update the properties for an
+                // unknown reason
+                foreach($properties as $propertyName=>$value) {
+                    $result[403][$propertyName] = null;
+                }
+
+            } elseif (is_array($updateResult)) {
+                // The node has detailed update information
+                $result = $updateResult;
+
+            } else {
+                throw new Sabre_DAV_Exception('Invalid result from updateProperties');
+            }
+
+        }
+
+        foreach($remainingProperties as $propertyName=>$value) {
+            // if there are remaining properties, it must mean
+            // there's a dependency failure
+            $result[424][$propertyName] = null;
+        }
+
+        // Removing empty array values
+        foreach($result as $status=>$props) {
+
+            if (count($props)===0) unset($result[$status]);
+
+        }
+        $result['href'] = $uri;
+        return $result;
+
+    }
+
+    /**
+     * This method checks the main HTTP preconditions.
+     *
+     * Currently these are:
+     *   * If-Match
+     *   * If-None-Match
+     *   * If-Modified-Since
+     *   * If-Unmodified-Since
+     *
+     * The method will return true if all preconditions are met
+     * The method will return false, or throw an exception if preconditions
+     * failed. If false is returned the operation should be aborted, and
+     * the appropriate HTTP response headers are already set.
+     *
+     * Normally this method will throw 412 Precondition Failed for failures
+     * related to If-None-Match, If-Match and If-Unmodified Since. It will 
+     * set the status to 304 Not Modified for If-Modified_since.
+     *
+     * If the $handleAsGET argument is set to true, it will also return 304 
+     * Not Modified for failure of the If-None-Match precondition. This is the
+     * desired behaviour for HTTP GET and HTTP HEAD requests.
+     *
+     * @return bool 
+     */
+    public function checkPreconditions($handleAsGET = false) {
+
+        $uri = $this->getRequestUri();
+        $node = null;
+        $lastMod = null;
+        $etag = null;
+
+        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
+
+            // If-Match contains an entity tag. Only if the entity-tag
+            // matches we are allowed to make the request succeed.
+            // If the entity-tag is '*' we are only allowed to make the
+            // request succeed if a resource exists at that url.
+            try {
+                $node = $this->tree->getNodeForPath($uri);
+            } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
+            }
+
+            // Only need to check entity tags if they are not *
+            if ($ifMatch!=='*') {
+
+                // There can be multiple etags
+                $ifMatch = explode(',',$ifMatch);
+                $haveMatch = false;
+                foreach($ifMatch as $ifMatchItem) {
+
+                    // Stripping any extra spaces
+                    $ifMatchItem = trim($ifMatchItem,' ');
+                    
+                    $etag = $node->getETag();
+                    if ($etag===$ifMatchItem) {
+                        $haveMatch = true;
+                    }
+                }
+                if (!$haveMatch) {
+                     throw new Sabre_DAV_Exception_PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
+                }
+            }
+        }
+
+        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
+
+            // The If-None-Match header contains an etag.
+            // Only if the ETag does not match the current ETag, the request will succeed
+            // The header can also contain *, in which case the request
+            // will only succeed if the entity does not exist at all.
+            $nodeExists = true;
+            if (!$node) {
+                try {
+                    $node = $this->tree->getNodeForPath($uri);
+                } catch (Sabre_DAV_Exception_FileNotFound $e) {
+                    $nodeExists = false;
+                }
+            }
+            if ($nodeExists) {
+                $haveMatch = false;
+                if ($ifNoneMatch==='*') $haveMatch = true;
+                else {
+
+                    // There might be multiple etags
+                    $ifNoneMatch = explode(',', $ifNoneMatch);
+                    $etag = $node->getETag();
+
+                    foreach($ifNoneMatch as $ifNoneMatchItem) {
+                        
+                        // Stripping any extra spaces
+                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
+                        
+                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
+
+                    }
+
+                }
+
+                if ($haveMatch) {
+                    if ($handleAsGET) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } else {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
+                    }
+                }
+            }
+
+        }
+
+        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
+            
+            // The If-Modified-Since header contains a date. We
+            // will only return the entity if it has been changed since
+            // that date. If it hasn't been changed, we return a 304
+            // header
+            // Note that this header only has to be checked if there was no If-None-Match header
+            // as per the HTTP spec.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifModifiedSince);
+
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod <= $date) {
+                        $this->httpResponse->sendStatus(304);
+                        return false;
+                    } 
+                }
+            }
+        }
+
+        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
+            
+            // The If-Unmodified-Since will allow allow the request if the
+            // entity has not changed since the specified date.
+            $date = Sabre_HTTP_Util::parseHTTPDate($ifUnmodifiedSince);
+           
+            // We must only check the date if it's valid
+            if ($date) {
+                if (is_null($node)) {
+                    $node = $this->tree->getNodeForPath($uri);
+                }   
+                $lastMod = $node->getLastModified();
+                if ($lastMod) {
+                    $lastMod = new DateTime('@' . $lastMod);
+                    if ($lastMod > $date) {
+                        throw new Sabre_DAV_Exception_PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
+                    }
+                }
+            }
+
+        }
+        return true;
+
+    }
+
+    // }}} 
+    // {{{ XML Readers & Writers  
+    
+    
+    /**
+     * Generates a WebDAV propfind response body based on a list of nodes 
+     * 
+     * @param array $fileProperties The list with nodes
+     * @param array $requestedProperties The properties that should be returned
+     * @return string 
+     */
+    public function generateMultiStatus(array $fileProperties) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        //$dom->formatOutput = true;
+        $multiStatus = $dom->createElement('d:multistatus');
+        $dom->appendChild($multiStatus);
+
+        // Adding in default namespaces
+        foreach($this->xmlNamespaces as $namespace=>$prefix) {
+
+            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
+
+        }
+
+        foreach($fileProperties as $entry) {
+
+            $href = $entry['href'];
+            unset($entry['href']);
+            
+            $response = new Sabre_DAV_Property_Response($href,$entry);
+            $response->serialize($this,$multiStatus);
+
+        }
+
+        return $dom->saveXML();
+
+    }
+
+    /**
+     * This method parses a PropPatch request
+     *
+     * PropPatch changes the properties for a resource. This method
+     * returns a list of properties.
+     *
+     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
+     * and the value contains the property value. If a property is to be removed the value
+     * will be null.
+     * 
+     * @param string $body xml body
+     * @return array list of properties in need of updating or deletion
+     */
+    public function parsePropPatchRequest($body) {
+
+        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        
+        $newProperties = array();
+
+        foreach($dom->firstChild->childNodes as $child) {
+
+            if ($child->nodeType !== XML_ELEMENT_NODE) continue; 
+
+            $operation = Sabre_DAV_XMLUtil::toClarkNotation($child);
+
+            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
+            
+            $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
+
+            foreach($innerProperties as $propertyName=>$propertyValue) {
+
+                if ($operation==='{DAV:}remove') {
+                    $propertyValue = null;
+                }
+
+                $newProperties[$propertyName] = $propertyValue;
+
+            }
+
+        }
+
+        return $newProperties;
+
+    }
+
+    /**
+     * This method parses the PROPFIND request and returns its information
+     *
+     * This will either be a list of properties, or an empty array; in which case
+     * an {DAV:}allprop was requested.
+     * 
+     * @param string $body 
+     * @return array 
+     */
+    public function parsePropFindRequest($body) {
+
+        // If the propfind body was empty, it means IE is requesting 'all' properties
+        if (!$body) return array();
+
+        $dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
+        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
+        return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem)); 
+
+    }
+
+    // }}}
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/ServerPlugin.php b/upload/ips_kernel/sabre/Sabre/DAV/ServerPlugin.php
new file mode 100644
index 00000000..f38e8aa3
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/ServerPlugin.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * The baseclass for all server plugins.
+ *
+ * Plugins can modify or extend the servers behaviour. 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_ServerPlugin {
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre_DAV_Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the requires event subscriptions.
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    abstract public function initialize(Sabre_DAV_Server $server);
+    
+    /**
+     * This method should return a list of server-features. 
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     * 
+     * @return array
+     */
+    public function getFeatures() {
+
+        return array();
+
+    }
+
+    /**
+     * Use this method to tell the server this plugin defines additional
+     * HTTP methods.
+     *
+     * This method is passed a uri. It should only return HTTP methods that are 
+     * available for the specified uri.
+     *
+     * @param string $uri
+     * @return array 
+     */
+    public function getHTTPMethods($uri) {
+
+        return array();
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/SimpleDirectory.php b/upload/ips_kernel/sabre/Sabre/DAV/SimpleDirectory.php
new file mode 100644
index 00000000..13299278
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/SimpleDirectory.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * SimpleDirectory
+ *
+ * The SimpleDirectory is used to quickly setup static directory structures.
+ * Just create the object with a proper name, and add children to use it.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_SimpleDirectory extends Sabre_DAV_Directory {
+
+    /**
+     * List of childnodes 
+     *
+     * @var array
+     */
+    protected $children = array();
+
+    /**
+     * Name of this resource 
+     * 
+     * @var string 
+     */
+    protected $name;
+
+    /**
+     * Creates this node
+     *
+     * The name of the node must be passed, child nodes can also be bassed.
+     * This nodes must be instances of Sabre_DAV_INode
+     * 
+     * @param string $name 
+     * @param array $children 
+     * @return void
+     */
+    public function __construct($name,array $children = array()) {
+
+        $this->name = $name;
+        foreach($children as $child) {
+
+            if (!($child instanceof Sabre_DAV_INode)) throw new Sabre_DAV_Exception('Only instances of Sabre_DAV_INode are allowed to be passed in the children argument');
+            $this->addChild($child);
+
+        }
+
+    }
+
+    /**
+     * Adds a new childnode to this collection 
+     * 
+     * @param Sabre_DAV_INode $child 
+     * @return void
+     */
+    public function addChild(Sabre_DAV_INode $child) {
+
+        $this->children[$child->getName()] = $child;
+
+    }
+
+    /**
+     * Returns the name of the collection 
+     * 
+     * @return string 
+     */
+    public function getName() {
+
+        return $this->name;
+
+    }
+
+    /**
+     * Returns a child object, by its name.
+     *
+     * This method makes use of the getChildren method to grab all the child nodes, and compares the name. 
+     * Generally its wise to override this, as this can usually be optimized
+     * 
+     * @param string $name
+     * @throws Sabre_DAV_Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    public function getChild($name) {
+
+        if (isset($this->children[$name])) return $this->children[$name];
+        throw new Sabre_DAV_Exception_FileNotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Returns a list of children for this collection 
+     * 
+     * @return array 
+     */
+    public function getChildren() {
+
+        return array_values($this->children);
+
+    }
+
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/TemporaryFileFilterPlugin.php b/upload/ips_kernel/sabre/Sabre/DAV/TemporaryFileFilterPlugin.php
new file mode 100644
index 00000000..2184f6ee
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/TemporaryFileFilterPlugin.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * Temporary File Filter Plugin
+ *
+ * The purpose of this filter is to intercept some of the garbage files
+ * operation systems and applications tend to generate when mounting
+ * a WebDAV share as a disk.
+ *
+ * It will intercept these files and place them in a separate directory.
+ * these files are not deleted automatically, so it is adviceable to
+ * delete these after they are not accessed for 24 hours.
+ *
+ * Currently it supports:
+ *   * OS/X style resource forks and .DS_Store
+ *   * desktop.ini and Thumbs.db (windows)
+ *   * .*.swp (vim temporary files)
+ *   * .dat.* (smultron temporary files)
+ *
+ * Additional patterns can be added, by adding on to the
+ * temporaryFilePatterns property.
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_TemporaryFileFilterPlugin extends Sabre_DAV_ServerPlugin {
+
+    /**
+     * This is the list of patterns we intercept.
+     * If new patterns are added, they must be valid patterns for preg_match.
+     * 
+     * @var array
+     */
+    public $temporaryFilePatterns = array(
+        '/^\._(.*)$/',     // OS/X resource forks
+        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^desktop.ini$/', // Windows custom folder settings
+        '/^Thumbs.db$/',   // Windows thumbnail cache
+        '/^.(.*).swp$/',   // ViM temporary files
+        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^~lock.(.*)#$/', // Windows 7 lockfiles
+    );
+    
+    /**
+     * This is the directory where this plugin
+     * will store it's files.
+     * 
+     * @var string 
+     */
+    private $dataDir;
+
+    /**
+     * A reference to the main Server class
+     * 
+     * @var Sabre_DAV_Server 
+     */
+    private $server;
+
+    /**
+     * Creates the plugin.
+     *
+     * Make sure you specify a directory for your files. If you don't, we
+     * will use PHP's directory for session-storage instead, and you might
+     * not want that.
+     * 
+     * @param string $dataDir 
+     * @return void
+     */
+    public function __construct($dataDir = null) {
+
+        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
+        if (!is_dir($dataDir)) mkdir($dataDir);
+        $this->dataDir = $dataDir;
+
+    } 
+
+    /**
+     * Initialize the plugin
+     *
+     * This is called automatically be the Server class after this plugin is
+     * added with Sabre_DAV_Server::addPlugin()
+     * 
+     * @param Sabre_DAV_Server $server 
+     * @return void
+     */
+    public function initialize(Sabre_DAV_Server $server) {
+
+        $this->server = $server;
+        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
+        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
+
+    }
+
+    /**
+     * This method is called before any HTTP method handler
+     *
+     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to 
+     * filenames that are known to match the 'temporary file' regex.
+     * 
+     * @param string $method 
+     * @return bool 
+     */
+    public function beforeMethod($method, $uri) {
+
+        if (!$tempLocation = $this->isTempFile($uri))
+            return true;
+
+        switch($method) {
+            case 'GET' :
+                return $this->httpGet($tempLocation);
+            case 'PUT' :
+                return $this->httpPut($tempLocation);
+            case 'PROPFIND' :
+                return $this->httpPropfind($tempLocation, $uri);
+            case 'DELETE' :
+                return $this->httpDelete($tempLocation);
+         }
+         return true;
+
+    }
+
+    /**
+     * This method is invoked if some subsystem creates a new file.
+     *
+     * This is used to deal with HTTP LOCK requests which create a new 
+     * file.
+     * 
+     * @param string $uri 
+     * @param resource $data 
+     * @return bool 
+     */
+    public function beforeCreateFile($uri,$data) {
+
+        if ($tempPath = $this->isTempFile($uri)) {
+            
+            $hR = $this->server->httpResponse;
+            $hR->setHeader('X-Sabre-Temp','true');
+            file_put_contents($tempPath,$data);
+            return false;
+        }
+        return true; 
+
+    }
+
+    /**
+     * This method will check if the url matches the temporary file pattern
+     * if it does, it will return an path based on $this->dataDir for the 
+     * temporary file storage.
+     * 
+     * @param string $path 
+     * @return boolean|string 
+     */
+    protected function isTempFile($path) {
+
+        // We're only interested in the basename.
+        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
+
+        foreach($this->temporaryFilePatterns as $tempFile) {
+
+            if (preg_match($tempFile,$tempPath)) {
+                return $this->dataDir . '/sabredav_' . md5($path) . '.tempfile';
+            }
+
+        }
+
+        return false;
+
+    }
+
+
+    /**
+     * This method handles the GET method for temporary files.
+     * If the file doesn't exist, it will return false which will kick in
+     * the regular system for the GET method.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpGet($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('Content-Type','application/octet-stream');
+        $hR->setHeader('Content-Length',filesize($tempLocation));
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(200);
+        $hR->sendBody(fopen($tempLocation,'r'));
+        return false;
+
+    }
+
+    /**
+     * This method handles the PUT method.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpPut($tempLocation) {
+
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+
+        $newFile = !file_exists($tempLocation);
+       
+        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
+             throw new Sabre_DAV_Exception_PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
+        }
+
+        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
+        $hR->sendStatus($newFile?201:200);
+        return false;
+
+    }
+
+    /**
+     * This method handles the DELETE method.
+     *
+     * If the file didn't exist, it will return false, which will make the 
+     * standard HTTP DELETE handler kick in.
+     * 
+     * @param string $tempLocation 
+     * @return bool 
+     */
+    public function httpDelete($tempLocation) {
+
+        if (!file_exists($tempLocation)) return true;
+
+        unlink($tempLocation);
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(204);
+        return false;
+
+    }
+
+    /**
+     * This method handles the PROPFIND method. 
+     *
+     * It's a very lazy method, it won't bother checking the request body
+     * for which properties were requested, and just sends back a default
+     * set of properties.
+     *
+     * @param string $tempLocation 
+     * @return void
+     */
+    public function httpPropfind($tempLocation, $uri) {
+
+        if (!file_exists($tempLocation)) return true;
+       
+        $hR = $this->server->httpResponse;
+        $hR->setHeader('X-Sabre-Temp','true');
+        $hR->sendStatus(207);
+        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
+
+        $requestedProps = $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true)); 
+
+        $properties = array(
+            'href' => $uri,
+            200 => array(
+                '{DAV:}getlastmodified' => new Sabre_DAV_Property_GetLastModified(filemtime($tempLocation)),
+                '{DAV:}getcontentlength' => filesize($tempLocation),
+                '{DAV:}resourcetype' => new Sabre_DAV_Property_ResourceType(null),
+                '{'.Sabre_DAV_Server::NS_SABREDAV.'}tempFile' => true, 
+
+            ),
+         );
+
+        $data = $this->server->generateMultiStatus(array($properties));
+        $hR->sendBody($data);
+        return false;
+
+    }
+
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Tree.php b/upload/ips_kernel/sabre/Sabre/DAV/Tree.php
new file mode 100644
index 00000000..f7191e23
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Tree.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * Abstract tree object 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_DAV_Tree {
+    
+    /**
+     * This function must return an INode object for a path
+     * If a Path doesn't exist, thrown an Exception_FileNotFound
+     * 
+     * @param string $path 
+     * @throws Exception_FileNotFound
+     * @return Sabre_DAV_INode 
+     */
+    abstract function getNodeForPath($path);
+
+    /**
+     * This function allows you to check if a node exists.
+     *
+     * Implementors of this class should override this method to make 
+     * it cheaper.
+     * 
+     * @param string $path 
+     * @return bool 
+     */
+    public function nodeExists($path) {
+
+        try {
+
+            $this->getNodeForPath($path);
+            return true;
+
+        } catch (Sabre_DAV_Exception_FileNotFound $e) {
+
+            return false;
+
+        }
+
+    }
+
+    /**
+     * Copies a file from path to another
+     *
+     * @param string $sourcePath The source location
+     * @param string $destinationPath The full destination path
+     * @return void 
+     */
+    public function copy($sourcePath, $destinationPath) {
+
+        $sourceNode = $this->getNodeForPath($sourcePath);
+       
+        // grab the dirname and basename components
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        $destinationParent = $this->getNodeForPath($destinationDir);
+        $this->copyNode($sourceNode,$destinationParent,$destinationName);
+
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Moves a file from one location to another 
+     * 
+     * @param string $sourcePath The path to the file which should be moved 
+     * @param string $destinationPath The full destination path, so not just the destination parent node
+     * @return int
+     */
+    public function move($sourcePath, $destinationPath) {
+
+        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        if ($sourceDir===$destinationDir) {
+            $renameable = $this->getNodeForPath($sourcePath);
+            $renameable->setName($destinationName);
+        } else {
+            $this->copy($sourcePath,$destinationPath);
+            $this->getNodeForPath($sourcePath)->delete();
+        }
+        $this->markDirty($sourceDir);
+        $this->markDirty($destinationDir);
+
+    }
+
+    /**
+     * Deletes a node from the tree 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function delete($path) {
+
+        $node = $this->getNodeForPath($path);
+        $node->delete();
+        
+        list($parent) = Sabre_DAV_URLUtil::splitPath($path);
+        $this->markDirty($parent);
+
+    }
+
+    /**
+     * Returns a list of childnodes for a given path. 
+     * 
+     * @param string $path 
+     * @return array 
+     */
+    public function getChildren($path) {
+
+        $node = $this->getNodeForPath($path);
+        return $node->getChildren();
+
+    }
+
+    /**
+     * This method is called with every tree update
+     *
+     * Examples of tree updates are:
+     *   * node deletions
+     *   * node creations
+     *   * copy
+     *   * move
+     *   * renaming nodes 
+     * 
+     * If Tree classes implement a form of caching, this will allow
+     * them to make sure caches will be expired.
+     * 
+     * If a path is passed, it is assumed that the entire subtree is dirty
+     *
+     * @param string $path 
+     * @return void
+     */
+    public function markDirty($path) {
+
+
+    }
+
+    /**
+     * copyNode 
+     * 
+     * @param Sabre_DAV_INode $source 
+     * @param Sabre_DAV_ICollection $destination 
+     * @return void
+     */
+    protected function copyNode(Sabre_DAV_INode $source,Sabre_DAV_ICollection $destinationParent,$destinationName = null) {
+
+        if (!$destinationName) $destinationName = $source->getName();
+
+        if ($source instanceof Sabre_DAV_IFile) {
+
+            $data = $source->get();
+
+            // If the body was a string, we need to convert it to a stream
+            if (is_string($data)) {
+                $stream = fopen('php://temp','r+');
+                fwrite($stream,$data);
+                rewind($stream);
+                $data = $stream;
+            } 
+            $destinationParent->createFile($destinationName,$data);
+            $destination = $destinationParent->getChild($destinationName);
+
+        } elseif ($source instanceof Sabre_DAV_ICollection) {
+
+            $destinationParent->createDirectory($destinationName);
+            
+            $destination = $destinationParent->getChild($destinationName);
+            foreach($source->getChildren() as $child) {
+
+                $this->copyNode($child,$destination);
+
+            }
+
+        }
+        if ($source instanceof Sabre_DAV_IProperties && $destination instanceof Sabre_DAV_IProperties) {
+
+            $props = $source->getProperties(array());
+            $destination->updateProperties($props);
+
+        }
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Tree/Filesystem.php b/upload/ips_kernel/sabre/Sabre/DAV/Tree/Filesystem.php
new file mode 100644
index 00000000..ee195eb2
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Tree/Filesystem.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Sabre_DAV_Tree_Filesystem 
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Tree_Filesystem extends Sabre_DAV_Tree {
+
+    /**
+     * Base url on the filesystem.
+     *
+     * @var string 
+     */
+    protected $basePath;
+
+    /**
+     * Creates this tree
+     *
+     * Supply the path you'd like to share.
+     * 
+     * @param string $basePath 
+     * @return void
+     */
+    public function __construct($basePath) {
+
+        $this->basePath = $basePath;
+
+    }
+
+    /**
+     * Returns a new node for the given path 
+     * 
+     * @param string $path 
+     * @return void
+     */
+    public function getNodeForPath($path) {
+
+        $realPath = $this->getRealPath($path);
+        if (!file_exists($realPath)) throw new Sabre_DAV_Exception_FileNotFound('File at location ' . $realPath . ' not found');
+        if (is_dir($realPath)) { 
+            return new Sabre_DAV_FS_Directory($path);
+        } else {
+            return new Sabre_DAV_FS_File($path);
+        }
+
+    }
+
+    /**
+     * Returns the real filesystem path for a webdav url. 
+     * 
+     * @param string $publicPath 
+     * @return string 
+     */
+    protected function getRealPath($publicPath) {
+
+        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    public function copy($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        $this->realCopy($source,$destination); 
+
+    }
+
+    /**
+     * Used by self::copy 
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    protected function realCopy($source,$destination) {
+
+        if (is_file($source)) {
+            copy($source,$destination);
+        } else {
+            mkdir($destination);
+            foreach(scandir($source) as $subnode) {
+
+                if ($subnode=='.' || $subnode=='..') continue;
+                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
+
+            }
+        }
+
+    }
+
+    /**
+     * Moves a file or directory recursively.
+     *
+     * If the destination exists, delete it first.
+     * 
+     * @param string $source 
+     * @param string $destination 
+     * @return void
+     */
+    public function move($source,$destination) {
+
+        $source = $this->getRealPath($source);
+        $destination = $this->getRealPath($destination);
+        rename($source,$destination);
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Tree/index.html b/upload/ips_kernel/sabre/Sabre/DAV/Tree/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Tree/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/URLUtil.php b/upload/ips_kernel/sabre/Sabre/DAV/URLUtil.php
new file mode 100644
index 00000000..0dfc6896
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/URLUtil.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * URL utility class
+ *
+ * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
+ *
+ * It was not possible to use PHP's built-in methods for this, because some clients don't like
+ * encoding of certain characters.
+ *
+ * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
+ * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
+ * kept as-is.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_URLUtil {
+
+    /**
+     * Encodes the path of a url.
+     *
+     * slashes (/) are treated as path-separators.
+     * 
+     * @param string $path 
+     * @return string 
+     */
+    static function encodePath($path) {
+
+        $path = explode('/',$path);
+        return implode('/',array_map(array('Sabre_DAV_URLUtil','encodePathSegment'), $path));
+
+    }
+
+    /**
+     * Encodes a 1 segment of a path
+     *
+     * Slashes are considered part of the name, and are encoded as %2f
+     * 
+     * @param string $pathSegment 
+     * @return string 
+     */
+    static function encodePathSegment($pathSegment) {
+
+        $newStr = '';
+        for($i=0;$i<strlen($pathSegment);$i++) {
+            $c = ord($pathSegment[$i]);
+
+            if(
+                
+                /* Unreserved chacaters */
+
+                ($c>=0x41 /* A */ && $c<=0x5a /* Z */) ||
+                ($c>=0x61 /* a */ && $c<=0x7a /* z */) ||
+                ($c>=0x30 /* 0 */ && $c<=0x39 /* 9 */) ||
+                $c===0x5f /* _ */ ||
+                $c===0x2d /* - */ ||
+                $c===0x2e /* . */ ||
+                $c===0x7E /* ~ */ ||
+
+                /* Reserved, but no reserved purpose */
+                $c===0x28 /* ( */ ||
+                $c===0x29 /* ) */
+
+            ) { 
+                $newStr.=$pathSegment[$i];
+            } else {
+                $newStr.='%' . str_pad(dechex($c), 2, '0', STR_PAD_LEFT);
+            }
+                
+        }
+        return $newStr;
+
+    }
+
+    /**
+     * Decodes a url-encoded path
+     *
+     * @param string $path 
+     * @return string 
+     */
+    static function decodePath($path) {
+
+        return self::decodePathSegment($path);
+
+    }
+
+    /**
+     * Decodes a url-encoded path segment
+     *
+     * @param string $path 
+     * @return string 
+     */
+    static function decodePathSegment($path) {
+
+        $path = urldecode($path);
+        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
+
+        switch($encoding) {
+
+            case 'ISO-8859-1' : 
+                $path = utf8_encode($path);
+        }
+
+        return $path;
+
+    }
+
+    /**
+     * Returns the 'dirname' and 'basename' for a path. 
+     *
+     * The reason there is a custom function for this purpose, is because
+     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
+     * and we need a method that just operates on UTF-8 characters.
+     *
+     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
+     * directory separator on windows.
+     *
+     * This method returns the 2 components as an array.
+     *
+     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
+     * string is stripped off.
+     *
+     * @param string $path 
+     * @return array 
+     */
+    static function splitPath($path) {
+
+        $matches = array();
+        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
+            return array($matches[1],$matches[2]);
+        } else {
+            return array(null,null);
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/Version.php b/upload/ips_kernel/sabre/Sabre/DAV/Version.php
new file mode 100644
index 00000000..20584782
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the SabreDAV version constants.
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.3.0';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/XMLUtil.php b/upload/ips_kernel/sabre/Sabre/DAV/XMLUtil.php
new file mode 100644
index 00000000..4c9fc5c6
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/XMLUtil.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * XML utilities for WebDAV
+ * 
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_XMLUtil {
+
+    /**
+     * Returns the 'clark notation' for an element.
+     * 
+     * For example, and element encoded as:
+     * <b:myelem xmlns:b="http://www.example.org/" />
+     * will be returned as:
+     * {http://www.example.org}myelem
+     *
+     * This format is used throughout the SabreDAV sourcecode.
+     * Elements encoded with the urn:DAV namespace will 
+     * be returned as if they were in the DAV: namespace. This is to avoid
+     * compatibility problems.
+     *
+     * This function will return null if a nodetype other than an Element is passed.
+     *
+     * @param DOMElement $dom 
+     * @return string 
+     */
+    static function toClarkNotation(DOMNode $dom) {
+
+        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
+
+        // Mapping back to the real namespace, in case it was dav
+        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+        
+        // Mapping to clark notation
+        return '{' . $ns . '}' . $dom->localName;
+
+    }
+
+    /**
+     * This method takes an XML document (as string) and converts all instances of the
+     * DAV: namespace to urn:DAV
+     *
+     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
+     * spec, and causes the DOM to throw errors
+     */
+    static function convertDAVNamespace($xmlDocument) {
+
+        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
+        // namespace is actually a violation of the XML namespaces specification, and will cause errors
+        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
+
+    }
+
+    /**
+     * This method provides a generic way to load a DOMDocument for WebDAV use.
+     *
+     * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
+     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV. 
+     * 
+     * @param string $xml
+     * @throws Sabre_DAV_Exception_BadRequest 
+     * @return DOMDocument 
+     */
+    static function loadDOMDocument($xml) {
+
+        if (empty($xml))
+            throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
+       
+        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
+        // does not support this, so we must intercept this and convert to UTF-8.
+        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
+
+            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
+            $xml = iconv('UTF-16LE','UTF-8',$xml);
+
+            // Because the xml header might specify the encoding, we must also change this.
+            // This regex looks for the string encoding="UTF-16" and replaces it with
+            // encoding="UTF-8".
+            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
+
+        }
+
+        // Retaining old error setting
+        $oldErrorSetting =  libxml_use_internal_errors(true);
+
+        // Clearing any previous errors 
+        libxml_clear_errors();
+
+        $dom = new DOMDocument();
+        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
+
+        // We don't generally care about any whitespace
+        $dom->preserveWhiteSpace = false;
+
+        if ($error = libxml_get_last_error()) {
+            libxml_clear_errors();
+            throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
+        }
+
+        // Restoring old mechanism for error handling
+        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+
+        return $dom;
+
+    }
+
+    /**
+     * Parses all WebDAV properties out of a DOM Element
+     *
+     * Generally WebDAV properties are encloded in {DAV:}prop elements. This
+     * method helps by going through all these and pulling out the actual
+     * propertynames, making them array keys and making the property values,
+     * well.. the array values.
+     *
+     * If no value was given (self-closing element) null will be used as the
+     * value. This is used in for example PROPFIND requests.
+     *
+     * Complex values are supported through the propertyMap argument. The
+     * propertyMap should have the clark-notation properties as it's keys, and
+     * classnames as values. 
+     *
+     * When any of these properties are found, the unserialize() method will be
+     * (statically) called. The result of this method is used as the value.
+     *
+     * @param DOMElement $parentNode
+     * @param array $propertyMap
+     * @return array
+     */
+    static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
+
+        $propList = array();
+        foreach($parentNode->childNodes as $propNode) {
+
+            if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
+
+            foreach($propNode->childNodes as $propNodeData) {
+
+                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+                $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
+                if (isset($propertyMap[$propertyName])) {
+                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData); 
+                } else {
+                    $propList[$propertyName] = $propNodeData->textContent;
+                }
+            }
+
+
+        }
+        return $propList;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/DAV/index.html b/upload/ips_kernel/sabre/Sabre/DAV/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/DAV/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/AWSAuth.php b/upload/ips_kernel/sabre/Sabre/HTTP/AWSAuth.php
new file mode 100644
index 00000000..b97fea9d
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/AWSAuth.php
@@ -0,0 +1,226 @@
+<?php
+
+/**
+ * HTTP AWS Authentication handler
+ *
+ * Use this class to leverage amazon's AWS authentication header
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_AWSAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The signature supplied by the HTTP client 
+     * 
+     * @var string 
+     */
+    private $signature = null;
+
+    /**
+     * The accesskey supplied by the HTTP client 
+     * 
+     * @var string 
+     */
+    private $accessKey = null;
+
+    /**
+     * An error code, if any
+     *
+     * This value will be filled with one of the ERR_* contants
+     * 
+     * @var int
+     */
+    public $errorCode = 0;
+
+    const ERR_NOAWSHEADER = 1;
+    const ERR_MD5CHECKSUMWRONG = 2;
+    const ERR_INVALIDDATEFORMAT = 3;
+    const ERR_REQUESTTIMESKEWED = 4;
+    const ERR_INVALIDSIGNATURE = 5;
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     * 
+     * @return bool 
+     */
+    public function init() {
+
+        $authHeader = $this->httpRequest->getHeader('Authorization');
+        $authHeader = explode(' ',$authHeader);
+
+        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
+            $this->errorCode = self::ERR_NOAWSHEADER;
+             return false;
+        }
+
+        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
+
+        return true;
+
+    }
+
+    /**
+     * Returns the username for the request 
+     * 
+     * @return string 
+     */
+    public function getAccessKey() {
+
+        return $this->accessKey;
+
+    }
+
+    /**
+     * Validates the signature based on the secretKey
+     * 
+     * @return bool 
+     */
+    public function validate($secretKey) {
+
+        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
+
+        if ($contentMD5) {
+            // We need to validate the integrity of the request
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+           
+            if ($contentMD5!=base64_encode(md5($body,true))) {
+                // content-md5 header did not match md5 signature of body
+                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+                return false;
+            }
+
+        }
+
+        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date')) 
+            $requestDate = $this->httpRequest->getHeader('Date');
+
+        if (!$this->validateRFC2616Date($requestDate)) 
+            return false;
+
+        $amzHeaders = $this->getAmzHeaders();
+
+        $signature = base64_encode(
+            $this->hmacsha1($secretKey,
+                $this->httpRequest->getMethod() . "\n" .
+                $contentMD5 . "\n" . 
+                $this->httpRequest->getHeader('Content-type') . "\n" .
+                $requestDate . "\n" .
+                $amzHeaders . 
+                $this->httpRequest->getURI()
+            )
+        );
+
+        if ($this->signature != $signature) {
+
+            $this->errorCode = self::ERR_INVALIDSIGNATURE;
+            return false;
+
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+    /**
+     * Makes sure the supplied value is a valid RFC2616 date.
+     *
+     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a 
+     * user just supplied the word 'now' for the date header.
+     *
+     * This function also makes sure the Date header is within 15 minutes of the operating 
+     * system date, to prevent replay attacks.
+     * 
+     * @param string $dateHeader 
+     * @return bool 
+     */
+    protected function validateRFC2616Date($dateHeader) {
+
+        $date = Sabre_HTTP_Util::parseHTTPDate($dateHeader);
+
+        // Unknown format
+        if (!$date) {
+            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
+            return false;
+        }
+
+        $min = new DateTime('-15 minutes');
+        $max = new DateTime('+15 minutes');
+
+        // We allow 15 minutes around the current date/time
+        if ($date > $max || $date < $min) {
+            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
+            return false;
+        }
+
+        return $date;
+
+    }
+    
+    /**
+     * Returns a list of AMZ headers 
+     * 
+     * @return void
+     */
+    protected function getAmzHeaders() {
+
+        $amzHeaders = array();
+        $headers = $this->httpRequest->getHeaders();
+        foreach($headers as $headerName => $headerValue) {
+            if (strpos(strtolower($headerName),'x-amz-')===0) {
+                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
+            }
+        }
+        ksort($amzHeaders);
+       
+        $headerStr = '';
+        foreach($amzHeaders as $h=>$v) {
+            $headerStr.=$h.':'.$v;
+        }
+
+        return $headerStr;
+
+    }
+
+    /**
+     * Generates an HMAC-SHA1 signature 
+     * 
+     * @param string $key 
+     * @param string $message 
+     * @return string 
+     */
+    private function hmacsha1($key, $message) {
+
+        $blocksize=64;
+        if (strlen($key)>$blocksize)
+            $key=pack('H*', sha1($key));
+        $key=str_pad($key,$blocksize,chr(0x00));
+        $ipad=str_repeat(chr(0x36),$blocksize);
+        $opad=str_repeat(chr(0x5c),$blocksize);
+        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
+        return $hmac;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/AbstractAuth.php b/upload/ips_kernel/sabre/Sabre/HTTP/AbstractAuth.php
new file mode 100644
index 00000000..0abc4bcb
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/AbstractAuth.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * HTTP Authentication baseclass
+ *
+ * This class has the common functionality for BasicAuth and DigestAuth
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+abstract class Sabre_HTTP_AbstractAuth {
+
+    /**
+     * The realm will be displayed in the dialog boxes
+     *
+     * This identifier can be changed through setRealm()
+     * 
+     * @var string
+     */
+    protected $realm = 'SabreDAV';
+
+    /**
+     * HTTP response helper 
+     * 
+     * @var Sabre_HTTP_Response 
+     */
+    protected $httpResponse;
+
+
+    /**
+     * HTTP request helper 
+     * 
+     * @var Sabre_HTTP_Request 
+     */
+    protected $httpRequest;
+
+    /**
+     * __construct 
+     * 
+     */
+    public function __construct() {
+
+        $this->httpResponse = new Sabre_HTTP_Response();
+        $this->httpRequest = new Sabre_HTTP_Request();
+
+    }
+
+    /**
+     * Sets an alternative HTTP response object 
+     * 
+     * @param Sabre_HTTP_Response $response 
+     * @return void
+     */
+    public function setHTTPResponse(Sabre_HTTP_Response $response) {
+
+        $this->httpResponse = $response;
+
+    }
+
+    /**
+     * Sets an alternative HTTP request object 
+     * 
+     * @param Sabre_HTTP_Request $request 
+     * @return void
+     */
+    public function setHTTPRequest(Sabre_HTTP_Request $request) {
+
+        $this->httpRequest = $request;
+
+    }
+
+
+    /**
+     * Sets the realm
+     *
+     * The realm is often displayed in authentication dialog boxes
+     * Commonly an application name displayed here
+     * 
+     * @param string $realm 
+     * @return void
+     */
+    public function setRealm($realm) {
+
+        $this->realm = $realm;
+
+    }
+
+    /**
+     * Returns the realm
+     *
+     * @return string 
+     */
+    public function getRealm() {
+
+        return $this->realm;
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    abstract public function requireLogin(); 
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/BasicAuth.php b/upload/ips_kernel/sabre/Sabre/HTTP/BasicAuth.php
new file mode 100644
index 00000000..c0231b4e
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/BasicAuth.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * HTTP Basic Authentication handler
+ *
+ * Use this class for easy http authentication setup
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * Returns the supplied username and password.
+     *
+     * The returned array has two values:
+     *   * 0 - username
+     *   * 1 - password
+     *
+     * If nothing was supplied, 'false' will be returned
+     *
+     * @return mixed 
+     */
+    public function getUserPass() {
+
+        // Apache and mod_php
+        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
+
+            return array($user,$pass);
+
+        }
+
+        // Most other webservers 
+        $auth = $this->httpRequest->getHeader('Authorization');
+
+        if (!$auth) return false;
+
+        if (strpos(strtolower($auth),'basic')!==0) return false; 
+
+        return explode(':', base64_decode(substr($auth, 6)));
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/DigestAuth.php b/upload/ips_kernel/sabre/Sabre/HTTP/DigestAuth.php
new file mode 100644
index 00000000..bce59594
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/DigestAuth.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * HTTP Digest Authentication handler
+ *
+ * Use this class for easy http digest authentication.
+ * Instructions:
+ *
+ *  1. Create the object
+ *  2. Call the setRealm() method with the realm you plan to use
+ *  3. Call the init method function.
+ *  4. Call the getUserName() function. This function may return false if no
+ *     authentication information was supplied. Based on the username you 
+ *     should check your internal database for either the associated password,
+ *     or the so-called A1 hash of the digest.
+ *  5. Call either validatePassword() or validateA1(). This will return true
+ *     or false. 
+ *  6. To make sure an authentication prompt is displayed, call the
+ *     requireLogin() method.
+ * 
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_DigestAuth extends Sabre_HTTP_AbstractAuth {
+
+    /**
+     * These constants are used in setQOP();
+     */
+    const QOP_AUTH = 1;
+    const QOP_AUTHINT = 2;
+
+    protected $nonce;
+    protected $opaque;
+    protected $digestParts;
+    protected $A1;
+    protected $qop = self::QOP_AUTH;
+
+    /**
+     * Initializes the object 
+     */
+    public function __construct() {
+
+        $this->nonce = uniqid();
+        $this->opaque = md5($this->realm);
+        parent::__construct();
+
+    }
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     * 
+     * @return void
+     */
+    public function init() {
+
+        $digest = $this->getDigest();
+        $this->digestParts = $this->parseDigest($digest);
+
+    }
+
+    /**
+     * Sets the quality of protection value.
+     *
+     * Possible values are:
+     *   Sabre_HTTP_DigestAuth::QOP_AUTH
+     *   Sabre_HTTP_DigestAuth::QOP_AUTHINT
+     *
+     * Multiple values can be specified using logical OR.
+     *
+     * QOP_AUTHINT ensures integrity of the request body, but this is not 
+     * supported by most HTTP clients. QOP_AUTHINT also requires the entire 
+     * request body to be md5'ed, which can put strains on CPU and memory.
+     *
+     * @param int $qop 
+     * @return void
+     */
+    public function setQOP($qop) {
+
+        $this->qop = $qop;
+
+    }
+
+    /**
+     * Validates the user.
+     *
+     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+     *
+     * @param string $A1 
+     * @return bool 
+     */
+    public function validateA1($A1) {
+
+        $this->A1 = $A1;
+        return $this->validate();
+
+    }
+
+    /**
+     * Validates authentication through a password. The actual password must be provided here.
+     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+     * 
+     * @param string $password 
+     * @return bool 
+     */
+    public function validatePassword($password) {
+
+        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+        return $this->validate();
+
+    }
+
+    /**
+     * Returns the username for the request 
+     * 
+     * @return string 
+     */
+    public function getUsername() {
+
+        return $this->digestParts['username'];
+
+    }
+
+    /**
+     * Validates the digest challenge 
+     * 
+     * @return bool 
+     */
+    protected function validate() {
+
+        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
+    
+        if ($this->digestParts['qop']=='auth-int') {
+            // Making sure we support this qop value
+            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            // We need to add an md5 of the entire request body to the A2 part of the hash
+            $body = $this->httpRequest->getBody(true);
+            $this->httpRequest->setBody($body,true);
+            $A2 .= ':' . md5($body);
+        } else {
+
+            // We need to make sure we support this qop value 
+            if (!($this->qop & self::QOP_AUTH)) return false; 
+        }
+
+        $A2 = md5($A2);
+
+        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}"); 
+
+        return $this->digestParts['response']==$validResponse;
+        
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    public function requireLogin() {
+
+        $qop = '';
+        switch($this->qop) {
+            case self::QOP_AUTH    : $qop = 'auth'; break;
+            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
+            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
+        }
+
+        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->httpResponse->sendStatus(401);
+
+    }
+
+
+    /**
+     * This method returns the full digest string.
+     *
+     * It should be compatibile with mod_php format and other webservers.
+     *
+     * If the header could not be found, null will be returned
+     *
+     * @return mixed 
+     */
+    public function getDigest() {
+
+        // mod_php
+        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
+        if ($digest) return $digest;
+
+        // most other servers
+        $digest = $this->httpRequest->getHeader('Authorization');
+
+        if ($digest && strpos(strtolower($digest),'digest')===0) {
+            return substr($digest,7);
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * Parses the different pieces of the digest string into an array.
+     * 
+     * This method returns false if an incomplete digest was supplied
+     *
+     * @param string $digest 
+     * @return mixed 
+     */
+    protected function parseDigest($digest) {
+
+        // protect against missing data
+        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+        $data = array();
+
+        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $m) {
+            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
+            unset($needed_parts[$m[1]]);
+        }
+
+        return $needed_parts ? false : $data; 
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/Request.php b/upload/ips_kernel/sabre/Sabre/HTTP/Request.php
new file mode 100644
index 00000000..8a0059bc
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/Request.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * HTTP Request information
+ *
+ * This object can be used to easily access information about an HTTP request.
+ * It can additionally be used to create 'mock' requests.
+ *
+ * This class mostly operates indepentend, but because of the nature of a single 
+ * request per run it can operate as a singleton. For more information check out 
+ * the behaviour around 'defaultInputStream'.
+ *
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Request {
+
+    /**
+     * PHP's $_SERVER data
+     * 
+     * @var string 
+     */
+    protected $_SERVER;
+
+    /**
+     * The request body, if any.
+     *
+     * This is stored in the form of a stream resource.
+     *
+     * @var resource 
+     */
+    protected $body = null;
+
+    /**
+     * This will be set as the 'default' inputStream for a specific HTTP request
+     * We sometimes need to retain, or rebuild this if we need multiple runs 
+     * of parsing the original HTTP request.
+     * 
+     * @var resource 
+     */
+    static $defaultInputStream=null;
+
+    /**
+     * Sets up the object
+     *
+     * The serverData array can be used to override usage of PHP's 
+     * global _SERVER variable. 
+     * 
+     * @param array $serverData 
+     */
+    public function __construct($serverData = null) {
+
+       if ($serverData) $this->_SERVER = $serverData;
+       else $this->_SERVER =& $_SERVER;
+
+    }
+
+    /**
+     * Returns the value for a specific http header.
+     *
+     * This method returns null if the header did not exist.
+     * 
+     * @param string $name 
+     * @return string 
+     */
+    public function getHeader($name) {
+
+        $serverName = 'HTTP_' . strtoupper(str_replace(array('-'),array('_'),$name));
+        return isset($this->_SERVER[$serverName])?$this->_SERVER[$serverName]:null;
+
+    }
+
+    /**
+     * Returns all (known) HTTP headers.
+     *
+     * All headers are converted to lower-case, and additionally all underscores
+     * are automatically converted to dashes 
+     * 
+     * @return array 
+     */
+    public function getHeaders() {
+
+        $hdrs = array();
+        foreach($this->_SERVER as $key=>$value) {
+
+            if (strpos($key,'HTTP_')===0) {
+                $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
+            }
+
+        }
+
+        return $hdrs;
+
+    }
+
+    /**
+     * Returns the HTTP request method
+     *
+     * This is for example POST or GET 
+     *
+     * @return string 
+     */
+    public function getMethod() {
+
+        return $this->_SERVER['REQUEST_METHOD'];
+
+    }
+
+    /**
+     * Returns the requested uri
+     *
+     * @return string 
+     */
+    public function getUri() {
+       
+        return $this->_SERVER['REQUEST_URI'];
+
+    }
+
+    /**
+     * Will return protocol + the hostname + the uri 
+     * 
+     * @return void
+     */
+    public function getAbsoluteUri() {
+
+        // Checking if the request was made through HTTPS. The last in line is for IIS
+        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
+        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
+
+    }
+
+    /**
+     * Returns everything after the ? from the current url 
+     * 
+     * @return string 
+     */
+    public function getQueryString() {
+
+        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
+
+    }
+
+    /**
+     * Returns the HTTP request body body 
+     *
+     * This method returns a readable stream resource.
+     * If the asString parameter is set to true, a string is sent instead. 
+     *
+     * @param bool asString
+     * @return resource 
+     */
+    public function getBody($asString = false) {
+
+        if (is_null($this->body)) {
+            if (!is_null(self::$defaultInputStream)) {
+                $this->body = self::$defaultInputStream;
+            } else {
+                $this->body = fopen('php://input','r');
+                self::$defaultInputStream = $this->body;
+            }
+        }
+        if ($asString) {
+            $body = stream_get_contents($this->body);
+            return $body;
+        } else {
+            return $this->body;
+        }
+
+    }
+
+    /**
+     * Sets the contents of the HTTP requet body 
+     * 
+     * This method can either accept a string, or a readable stream resource.
+     *
+     * If the setAsDefaultInputStream is set to true, it means for this run of the 
+     * script the supplied body will be used instead of php://input.
+     *
+     * @param mixed $body 
+     * @param bool $setAsDefaultInputStream
+     * @return void
+     */
+    public function setBody($body,$setAsDefaultInputStream = false) {
+
+        if(is_resource($body)) {
+            $this->body = $body;
+        } else {
+
+            $stream = fopen('php://temp','r+');
+            fputs($stream,$body);
+            rewind($stream);
+            // String is assumed
+            $this->body = $stream;
+        }
+        if ($setAsDefaultInputStream) {
+            self::$defaultInputStream = $this->body;
+        }
+
+    }
+
+    /**
+     * Returns a specific item from the _SERVER array. 
+     *
+     * Do not rely on this feature, it is for internal use only.
+     *
+     * @param string $field 
+     * @return string 
+     */
+    public function getRawServerValue($field) {
+
+        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
+
+    }
+
+}
+
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/Response.php b/upload/ips_kernel/sabre/Sabre/HTTP/Response.php
new file mode 100644
index 00000000..15a26874
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/Response.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Sabre_HTTP_Response 
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Response {
+
+    /**
+     * Returns a full HTTP status message for an HTTP status code 
+     * 
+     * @param int $code 
+     * @return string
+     */
+    public function getStatusMessage($code) {
+
+        $msg = array(
+            100 => 'Continue',
+            101 => 'Switching Protocols',
+            102 => 'Processing',
+            200 => 'Ok',
+            201 => 'Created',
+            202 => 'Accepted',
+            203 => 'Non-Authorative Information',
+            204 => 'No Content',
+            205 => 'Reset Content',
+            206 => 'Partial Content',
+            207 => 'Multi-Status', // RFC 4918
+            208 => 'Already Reported', // RFC 5842
+            226 => 'IM Used', // RFC 3229
+            300 => 'Multiple Choices',
+            301 => 'Moved Permanently',
+            302 => 'Found',
+            303 => 'See Other',
+            304 => 'Not Modified',
+            305 => 'Use Proxy',
+            306 => 'Reserved',
+            307 => 'Temporary Redirect',
+            400 => 'Bad request',
+            401 => 'Unauthorized',
+            402 => 'Payment Required',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            405 => 'Method Not Allowed',
+            406 => 'Not Acceptable',
+            407 => 'Proxy Authentication Required',
+            408 => 'Request Timeout',
+            409 => 'Conflict',
+            410 => 'Gone',
+            411 => 'Length Required',
+            412 => 'Precondition failed',
+            413 => 'Request Entity Too Large',
+            414 => 'Request-URI Too Long',
+            415 => 'Unsupported Media Type',
+            416 => 'Requested Range Not Satisfiable',
+            417 => 'Expectation Failed',
+            418 => 'I\'m a teapot', // RFC 2324
+            422 => 'Unprocessable Entity', // RFC 4918
+            423 => 'Locked', // RFC 4918
+            424 => 'Failed Dependency', // RFC 4918
+            426 => 'Upgrade required',
+            500 => 'Internal Server Error',
+            501 => 'Not Implemented',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            505 => 'HTTP Version not supported',
+            506 => 'Variant Also Negotiates',
+            507 => 'Unsufficient Storage', // RFC 4918
+            508 => 'Loop Detected', // RFC 5842
+            510 => 'Not extended',
+       ); 
+
+       return 'HTTP/1.1 ' . $code . ' ' . $msg[$code];
+
+    }
+
+    /**
+     * Sends an HTTP status header to the client 
+     * 
+     * @param int $code HTTP status code 
+     * @return void
+     */
+    public function sendStatus($code) {
+
+        if (!headers_sent()) 
+            return header($this->getStatusMessage($code));
+        else return false;
+
+    }
+
+    /**
+     * Sets an HTTP header for the response
+     * 
+     * @param string $name 
+     * @param string $value 
+     * @return void
+     */
+    public function setHeader($name, $value, $replace = true) {
+
+        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
+        if (!headers_sent()) 
+            return header($name . ': ' . $value, $replace);
+        else return false;
+
+    }
+
+    /**
+     * Sets a bunch of HTTP Headers
+     *
+     * headersnames are specified as keys, value in the array value
+     * 
+     * @param array $headers 
+     * @return void
+     */
+    public function setHeaders(array $headers) {
+
+        foreach($headers as $key=>$value)
+            $this->setHeader($key, $value);
+
+    }
+
+    /**
+     * Sends the entire response body
+     *
+     * This method can accept either an open filestream, or a string.
+     * 
+     * @param mixed $body 
+     * @return void
+     */
+    public function sendBody($body) {
+
+        if (is_resource($body)) {
+        
+            fpassthru($body);
+
+        } else {
+
+            // We assume a string
+            echo $body;
+
+        }
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/Util.php b/upload/ips_kernel/sabre/Sabre/HTTP/Util.php
new file mode 100644
index 00000000..02ae1c0f
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/Util.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * HTTP utility methods 
+ * 
+ * @package Sabre
+ * @subpackage HTTP
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @author Paul Voegler
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Util {
+
+    /**
+     * Parses a RFC2616-compatible date string
+     *
+     * This method returns false if the date is invalid
+     * 
+     * @param string $dateHeader 
+     * @return bool|DateTime 
+     */
+    static function parseHTTPDate($dateHeader) {
+
+        //RFC 2616 section 3.3.1 Full Date
+        //Only the format is checked, valid ranges are checked by strtotime below
+        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+        $time = '[0-2]\d(\:[0-5]\d){2}';
+        $date3 = $month . '\ ([1-3]\d|\ \d)';
+        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $date1 = '[0-3]\d\ ' . $month . '\ [1-9]\d{3}';
+
+        //ANSI C's asctime() format
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $asctime_date = $wkday . '\ ' . $date3 . '\ ' . $time . '\ [1-9]\d{3}';
+        //RFC 850, obsoleted by RFC 1036
+        $rfc850_date = $weekday . ',\ ' . $date2 . '\ ' . $time . '\ GMT';
+        //RFC 822, updated by RFC 1123
+        $rfc1123_date = $wkday . ',\ ' . $date1 . '\ ' . $time . '\ GMT';
+        //allowed date formats by RFC 2616
+        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+        
+        //allow for space around the string and strip it
+        $dateHeader = trim($dateHeader, ' ');
+        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
+            return false;
+
+        //append implicit GMT timezone to ANSI C time format
+        if (!preg_match('/\ GMT$/', $dateHeader))
+            $dateHeader .= ' GMT';
+
+
+        $realDate = strtotime($dateHeader);
+        //strtotime can return -1 or false in case of error
+        if ($realDate !== false && $realDate >= 0)
+            return new DateTime('@' . $realDate, new DateTimeZone('UTC'));
+
+        return false;
+
+    }
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/Version.php b/upload/ips_kernel/sabre/Sabre/HTTP/Version.php
new file mode 100644
index 00000000..5372a49c
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/Version.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This class contains the Sabre_HTTP version constants.
+ * 
+ * @package Sabre
+ * @subpackage HTTP 
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_HTTP_Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.3.0';
+
+    /**
+     * Stability : alpha, beta, stable
+     */
+    const STABILITY = 'stable';
+
+}
diff --git a/upload/ips_kernel/sabre/Sabre/HTTP/index.html b/upload/ips_kernel/sabre/Sabre/HTTP/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/HTTP/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/Sabre/autoload.php b/upload/ips_kernel/sabre/Sabre/autoload.php
new file mode 100644
index 00000000..54b19025
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/autoload.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * SabreDAV's PHP autoloader
+ *
+ * If you love the autoloader, and don't care as much about performance, this
+ * file register a new autoload function using spl_autoload_register. 
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/) 
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+function Sabre_autoload($className) {
+
+    if(strpos($className,'Sabre_')===0) {
+
+        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,6)) . '.php';
+
+    }
+
+}
+
+spl_autoload_register('Sabre_autoload');
+
diff --git a/upload/ips_kernel/sabre/Sabre/index.html b/upload/ips_kernel/sabre/Sabre/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/Sabre/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/sabre/index.html b/upload/ips_kernel/sabre/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/ips_kernel/sabre/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/ips_kernel/twitter/index.html b/upload/ips_kernel/twitter/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/ips_kernel/twitter/index.html
+++ b/upload/ips_kernel/twitter/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/ips_kernel/twitter/twitteroauth.php b/upload/ips_kernel/twitter/twitteroauth.php
index f5a785ad..2b6dfebf 100644
--- a/upload/ips_kernel/twitter/twitteroauth.php
+++ b/upload/ips_kernel/twitter/twitteroauth.php
@@ -15,7 +15,7 @@
  */
 
 /* Load OAuth lib. You can find it at http://oauth.net */
-require_once('OAuth.php');
+require_once('OAuth.php');/*noLibHook*/
 
 /**
  * Twitter OAuth class
diff --git a/upload/ips_kernel/vkontakte/OAuth2Client.php b/upload/ips_kernel/vkontakte/OAuth2Client.php
new file mode 100644
index 00000000..b7144cf9
--- /dev/null
+++ b/upload/ips_kernel/vkontakte/OAuth2Client.php
@@ -0,0 +1,798 @@
+<?php
+
+/**
+ * The default Cache Lifetime (in seconds).
+ */
+define("OAUTH2_DEFAULT_EXPIRES_IN", 3600*60*60*24);
+
+/**
+ * The default Base domain for the Cookie.
+ */
+define("OAUTH2_DEFAULT_BASE_DOMAIN", '');
+
+/**
+ * OAuth2.0 draft v10 client-side implementation.
+ *
+ * @author Originally written by Naitik Shah <naitik@facebook.com>.
+ * @author Update to draft v10 by Edison Wong <hswong3i@pantarei-design.com>.
+ *
+ * @sa <a href="https://github.com/facebook/php-sdk">Facebook PHP SDK</a>.
+ */
+abstract class OAuth2Client {
+
+  /**
+   * Array of persistent variables stored.
+   */
+  protected $conf = array();
+
+  /**
+   * Returns a persistent variable.
+   *
+   * To avoid problems, always use lower case for persistent variable names.
+   *
+   * @param $name
+   *   The name of the variable to return.
+   * @param $default
+   *   The default value to use if this variable has never been set.
+   *
+   * @return
+   *   The value of the variable.
+   */
+  public function getVariable($name, $default = NULL) {
+    return isset($this->conf[$name]) ? $this->conf[$name] : $default;
+  }
+
+  /**
+   * Sets a persistent variable.
+   *
+   * To avoid problems, always use lower case for persistent variable names.
+   *
+   * @param $name
+   *   The name of the variable to set.
+   * @param $value
+   *   The value to set.
+   */
+  public function setVariable($name, $value) {
+    $this->conf[$name] = $value;
+    return $this;
+  }
+
+  // Stuff that should get overridden by subclasses.
+  //
+  // I don't want to make these abstract, because then subclasses would have
+  // to implement all of them, which is too much work.
+  //
+  // So they're just stubs. Override the ones you need.
+
+  /**
+   * Initialize a Drupal OAuth2.0 Application.
+   *
+   * @param $config
+   *   An associative array as below:
+   *   - base_uri: The base URI for the OAuth2.0 endpoints.
+   *   - code: (optional) The authorization code.
+   *   - username: (optional) The username.
+   *   - password: (optional) The password.
+   *   - client_id: (optional) The application ID.
+   *   - client_secret: (optional) The application secret.
+   *   - authorize_uri: (optional) The end-user authorization endpoint URI.
+   *   - access_token_uri: (optional) The token endpoint URI.
+   *   - services_uri: (optional) The services endpoint URI.
+   *   - cookie_support: (optional) TRUE to enable cookie support.
+   *   - base_domain: (optional) The domain for the cookie.
+   *   - file_upload_support: (optional) TRUE if file uploads are enabled.
+   */
+  public function __construct($config = array()) {
+    // We must set base_uri first.
+    $this->setVariable('base_uri', $config['base_uri']);
+    unset($config['base_uri']);
+
+    // Use predefined OAuth2.0 params, or get it from $_REQUEST.
+    foreach (array('code', 'username', 'password') as $name) {
+      if (isset($config[$name]))
+        $this->setVariable($name, $config[$name]);
+      else if (isset($_REQUEST[$name]) && !empty($_REQUEST[$name]))
+        $this->setVariable($name, $_REQUEST[$name]);
+      unset($config[$name]);
+    }
+
+    // Endpoint URIs.
+    foreach (array('authorize_uri', 'access_token_uri', 'services_uri') as $name) {
+      if (isset($config[$name]))
+        if (substr($config[$name], 0, 4) == "http")
+          $this->setVariable($name, $config[$name]);
+        else
+          $this->setVariable($name, $this->getVariable('base_uri') . $config[$name]);
+      unset($config[$name]);
+    }
+
+    // Other else configurations.
+    foreach ($config as $name => $value) {
+      $this->setVariable($name, $value);
+    }
+  }
+
+  /**
+   * Try to get session object from custom method.
+   *
+   * By default we generate session object based on access_token response, or
+   * if it is provided from server with $_REQUEST. For sure, if it is provided
+   * by server it should follow our session object format.
+   *
+   * Session object provided by server can ensure the correct expires and
+   * base_domain setup as predefined in server, also you may get more useful
+   * information for custom functionality, too. BTW, this may require for
+   * additional remote call overhead.
+   *
+   * You may wish to override this function with your custom version due to
+   * your own server-side implementation.
+   *
+   * @param $access_token
+   *   (optional) A valid access token in associative array as below:
+   *   - access_token: A valid access_token generated by OAuth2.0
+   *     authorization endpoint.
+   *   - expires_in: (optional) A valid expires_in generated by OAuth2.0
+   *     authorization endpoint.
+   *   - refresh_token: (optional) A valid refresh_token generated by OAuth2.0
+   *     authorization endpoint.
+   *   - scope: (optional) A valid scope generated by OAuth2.0
+   *     authorization endpoint.
+   *
+   *  @return
+   *    A valid session object in associative array for setup cookie, and
+   *    NULL if not able to generate it with custom method.
+   */
+  protected function getSessionObject($access_token = NULL) {
+    $session = NULL;
+
+    // Try generate local version of session cookie.
+    if (!empty($access_token) && isset($access_token['access_token'])) {
+      $session['access_token'] = $access_token['access_token'];
+      $session['base_domain'] = $this->getVariable('base_domain', OAUTH2_DEFAULT_BASE_DOMAIN);
+      $session['expires'] = isset($access_token['expires_in']) ? time() + $access_token['expires_in'] : time() + $this->getVariable('expires_in', OAUTH2_DEFAULT_EXPIRES_IN);
+      $session['refresh_token'] = isset($access_token['refresh_token']) ? $access_token['refresh_token'] : '';
+      $session['scope'] = isset($access_token['scope']) ? $access_token['scope'] : '';
+      $session['secret'] = md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid())));
+
+      // Provide our own signature.
+      $sig = self::generateSignature(
+        $session,
+        $this->getVariable('client_secret')
+      );
+      $session['sig'] = $sig;
+    }
+
+    // Try loading session from $_REQUEST.
+    if (!$session && isset($_REQUEST['session'])) {
+      $session = json_decode(
+        get_magic_quotes_gpc()
+          ? stripslashes($_REQUEST['session'])
+          : $_REQUEST['session'],
+        TRUE
+      );
+    }
+
+    return $session;
+  }
+
+  /**
+   * Make an API call.
+   *
+   * Support both OAuth2.0 or normal GET/POST API call, with relative
+   * or absolute URI.
+   *
+   * If no valid OAuth2.0 access token found in session object, this function
+   * will automatically switch as normal remote API call without "oauth_token"
+   * parameter.
+   *
+   * Assume server reply in JSON object and always decode during return. If
+   * you hope to issue a raw query, please use makeRequest().
+   *
+   * @param $path
+   *   The target path, relative to base_path/service_uri or an absolute URI.
+   * @param $method
+   *   (optional) The HTTP method (default 'GET').
+   * @param $params
+   *   (optional The GET/POST parameters.
+   *
+   * @return
+   *   The JSON decoded response object.
+   *
+   * @throws OAuth2Exception
+   */
+  public function api($path, $method = 'GET', $params = array()) {
+    if (is_array($method) && empty($params)) {
+      $params = $method;
+      $method = 'GET';
+    }
+
+    // json_encode all params values that are not strings.
+    foreach ($params as $key => $value) {
+      if (!is_string($value)) {
+        $params[$key] = json_encode($value);
+      }
+    }
+
+    $result = json_decode($this->makeOAuth2Request(
+      $this->getUri($path),
+      $method,
+      $params
+    ), TRUE);
+
+    // Results are returned, errors are thrown.
+    if (is_array($result) && isset($result['error'])) {
+     $e = new OAuth2Exception($result);
+      switch ($e->getType()) {
+        // OAuth 2.0 Draft 10 style.
+        case 'invalid_token':
+          $this->setSession(NULL);
+        default:
+          $this->setSession(NULL);
+      }
+      throw $e;
+    }
+    return $result;
+  }
+
+  // End stuff that should get overridden.
+
+  /**
+   * Default options for cURL.
+   */
+  public static $CURL_OPTS = array(
+    CURLOPT_CONNECTTIMEOUT => 10,
+    CURLOPT_RETURNTRANSFER => TRUE,
+    CURLOPT_HEADER         => TRUE,
+    CURLOPT_TIMEOUT        => 60,
+    CURLOPT_USERAGENT      => 'oauth2-draft-v10',
+    CURLOPT_HTTPHEADER     => array("Accept: application/json"),
+  );
+
+  /**
+   * Set the Session.
+   *
+   * @param $session
+   *   (optional) The session object to be set. NULL if hope to frush existing
+   *   session object.
+   * @param $write_cookie
+   *   (optional) TRUE if a cookie should be written. This value is ignored
+   *   if cookie support has been disabled.
+   *
+   * @return
+   *   The current OAuth2.0 client-side instance.
+   */
+  public function setSession($session = NULL, $write_cookie = TRUE) {
+    $this->setVariable('_session', $this->validateSessionObject($session));
+    $this->setVariable('_session_loaded', TRUE);
+    if ($write_cookie) {
+      $this->setCookieFromSession($this->getVariable('_session'));
+    }
+    return $this;
+  }
+
+  /**
+   * Get the session object.
+   *
+   * This will automatically look for a signed session via custom method,
+   * OAuth2.0 grant type with authorization_code, OAuth2.0 grant type with
+   * password, or cookie that we had already setup.
+   *
+   * @return
+   *   The valid session object with OAuth2.0 infomration, and NULL if not
+   *   able to discover any cases.
+   */
+  public function getSession() {
+    if (!$this->getVariable('_session_loaded')) {
+      $session = NULL;
+      $write_cookie = TRUE;
+
+      // Try obtain login session by custom method.
+      // $session = $this->getSessionObject(NULL);
+      // $session = $this->validateSessionObject($session);
+
+      // grant_type == authorization_code.
+      if (!$session && $this->getVariable('code')) {
+        $access_token = $this->getAccessTokenFromAuthorizationCode($this->getVariable('code'));
+        $session = $this->getSessionObject($access_token);
+        $session = $this->validateSessionObject($session);
+      }
+
+      // grant_type == password.
+      if (!$session && $this->getVariable('username') && $this->getVariable('password')) {
+        $access_token = $this->getAccessTokenFromPassword($this->getVariable('username'), $this->getVariable('password'));
+        $session = $this->getSessionObject($access_token);
+        $session = $this->validateSessionObject($session);
+      }
+
+      // Try loading session from cookie if necessary.
+      if (!$session && $this->getVariable('cookie_support')) {
+        $cookie_name = $this->getSessionCookieName();
+        if (isset($_COOKIE[$cookie_name])) {
+          $session = array();
+          parse_str(trim(
+            get_magic_quotes_gpc()
+              ? stripslashes($_COOKIE[$cookie_name])
+              : $_COOKIE[$cookie_name],
+            '"'
+          ), $session);
+          $session = $this->validateSessionObject($session);
+          // Write only if we need to delete a invalid session cookie.
+          $write_cookie = empty($session);
+        }
+      }
+
+      $this->setSession($session, $write_cookie);
+    }
+
+    return $this->getVariable('_session');
+  }
+
+  /**
+   * Gets an OAuth2.0 access token from session.
+   *
+   * This will trigger getSession() and so we MUST initialize with required
+   * configuration.
+   *
+   * @return
+   *   The valid OAuth2.0 access token, and NULL if not exists in session.
+   */
+  public function getAccessToken() {
+    $session = $this->getSession();
+    return isset($session['access_token']) ? $session['access_token'] : NULL;
+  }
+
+  /**
+   * Get access token from OAuth2.0 token endpoint with authorization code.
+   *
+   * This function will only be activated if both access token URI, client
+   * identifier and client secret are setup correctly.
+   *
+   * @param $code
+   *   Authorization code issued by authorization server's authorization
+   *   endpoint.
+   *
+   * @return
+   *   A valid OAuth2.0 JSON decoded access token in associative array, and
+   *   NULL if not enough parameters or JSON decode failed.
+   */
+  private function getAccessTokenFromAuthorizationCode($code) {
+    if ($this->getVariable('access_token_uri') && $this->getVariable('client_id') && $this->getVariable('client_secret')) {
+      return json_decode($this->makeRequest(
+        $this->getVariable('access_token_uri'),
+        'POST',
+        array(
+          'grant_type' => 'authorization_code',
+          'client_id' => $this->getVariable('client_id'),
+          'client_secret' => $this->getVariable('client_secret'),
+          'code' => $code,
+          'redirect_uri' => $this->getCurrentUri(),
+        )
+      ), TRUE);
+    }
+    return NULL;
+  }
+
+  /**
+   * Get access token from OAuth2.0 token endpoint with basic user
+   * credentials.
+   *
+   * This function will only be activated if both username and password
+   * are setup correctly.
+   *
+   * @param $username
+   *   Username to be check with.
+   * @param $password
+   *   Password to be check with.
+   *
+   * @return
+   *   A valid OAuth2.0 JSON decoded access token in associative array, and
+   *   NULL if not enough parameters or JSON decode failed.
+   */
+  private function getAccessTokenFromPassword($username, $password) {
+    if ($this->getVariable('access_token_uri') && $this->getVariable('client_id') && $this->getVariable('client_secret')) {
+      return json_decode($this->makeRequest(
+        $this->getVariable('access_token_uri'),
+        'POST',
+        array(
+          'grant_type' => 'password',
+          'client_id' => $this->getVariable('client_id'),
+          'client_secret' => $this->getVariable('client_secret'),
+          'username' => $username,
+          'password' => $password,
+        )
+      ), TRUE);
+    }
+    return NULL;
+  }
+
+  /**
+   * Make an OAuth2.0 Request.
+   *
+   * Automatically append "oauth_token" in query parameters if not yet
+   * exists and able to discover a valid access token from session. Otherwise
+   * just ignore setup with "oauth_token" and handle the API call AS-IS, and
+   * so may issue a plain API call without OAuth2.0 protection.
+   *
+   * @param $path
+   *   The target path, relative to base_path/service_uri or an absolute URI.
+   * @param $method
+   *   (optional) The HTTP method (default 'GET').
+   * @param $params
+   *   (optional The GET/POST parameters.
+   *
+   * @return
+   *   The JSON decoded response object.
+   *
+   * @throws OAuth2Exception
+   */
+  protected function makeOAuth2Request($path, $method = 'GET', $params = array()) {
+    if ((!isset($params['oauth_token']) || empty($params['oauth_token'])) && $oauth_token = $this->getAccessToken()) {
+      $params['oauth_token'] = $oauth_token;
+    }
+    return $this->makeRequest($path, $method, $params);
+  }
+
+  /**
+   * Makes an HTTP request.
+   *
+   * This method can be overriden by subclasses if developers want to do
+   * fancier things or use something other than cURL to make the request.
+   *
+   * @param $path
+   *   The target path, relative to base_path/service_uri or an absolute URI.
+   * @param $method
+   *   (optional) The HTTP method (default 'GET').
+   * @param $params
+   *   (optional The GET/POST parameters.
+   * @param $ch
+   *   (optional) An initialized curl handle
+   *
+   * @return
+   *   The JSON decoded response object.
+   */
+  protected function makeRequest($path, $method = 'GET', $params = array(), $ch = NULL) {
+    if (!$ch)
+      $ch = curl_init();
+
+    $opts = self::$CURL_OPTS;
+    if ($params) {
+      switch ($method) {
+        case 'GET':
+          $path .= '?' . http_build_query($params, NULL, '&');
+          break;
+        // Method override as we always do a POST.
+        default:
+          if ($this->getVariable('file_upload_support')) {
+            $opts[CURLOPT_POSTFIELDS] = $params;
+          }
+          else {
+            $opts[CURLOPT_POSTFIELDS] = http_build_query($params, NULL, '&');
+          }
+      }
+    }
+    $opts[CURLOPT_URL] = $path;
+    
+    // Disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
+    // for 2 seconds if the server does not support this header.
+    if (isset($opts[CURLOPT_HTTPHEADER])) {
+      $existing_headers = $opts[CURLOPT_HTTPHEADER];
+      $existing_headers[] = 'Expect:';
+      $opts[CURLOPT_HTTPHEADER] = $existing_headers;
+    }
+    else {
+      $opts[CURLOPT_HTTPHEADER] = array('Expect:');
+    }
+
+    curl_setopt_array($ch, $opts);
+    $result = curl_exec($ch);
+
+    if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
+      error_log('Invalid or no certificate authority found, using bundled information');
+      curl_setopt($ch, CURLOPT_CAINFO,
+                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
+      $result = curl_exec($ch);
+    }
+
+    if ($result === FALSE) {
+      $e = new OAuth2Exception(array(
+        'code' => curl_errno($ch),
+        'message' => curl_error($ch),
+      ));
+      curl_close($ch);
+      throw $e;
+    }
+    curl_close($ch);
+
+    // Split the HTTP response into header and body.
+    list($headers, $body) = explode("\r\n\r\n", $result);
+    $headers = explode("\r\n", $headers);
+
+    // We catch HTTP/1.1 4xx or HTTP/1.1 5xx error response.
+    if (strpos($headers[0], 'HTTP/1.1 4') !== FALSE || strpos($headers[0], 'HTTP/1.1 5') !== FALSE) {
+      $result = array(
+        'code' => 0,
+        'message' => '',
+      );
+
+      if (preg_match('/^HTTP\/1.1 ([0-9]{3,3}) (.*)$/', $headers[0], $matches)) {
+        $result['code'] = $matches[1];
+        $result['message'] = $matches[2];
+      }
+
+      // In case retrun with WWW-Authenticate replace the description.
+      foreach ($headers as $header) {
+        if (preg_match("/^WWW-Authenticate:.*error='(.*)'/", $header, $matches)) {
+          $result['error'] = $matches[1];
+        }
+      }
+
+      return json_encode($result);
+    }
+
+    return $body;
+  }
+
+  /**
+   * The name of the cookie that contains the session object.
+   *
+   * @return
+   *   The cookie name.
+   */
+  private function getSessionCookieName() {
+    return 'oauth2_' . $this->getVariable('client_id');
+  }
+
+  /**
+   * Set a JS Cookie based on the _passed in_ session.
+   *
+   * It does not use the currently stored session - you need to explicitly
+   * pass it in.
+   *
+   * @param $session
+   *   The session to use for setting the cookie.
+   */
+  protected function setCookieFromSession($session = NULL) {
+    if (!$this->getVariable('cookie_support'))
+      return;
+
+    $cookie_name = $this->getSessionCookieName();
+    $value = 'deleted';
+    $expires = time() - 3600;
+    $base_domain = $this->getVariable('base_domain', OAUTH2_DEFAULT_BASE_DOMAIN);
+    
+    if ($session) {
+      $value = '"' . http_build_query($session, NULL, '&') . '"';
+      $base_domain = isset($session['base_domain']) ? $session['base_domain'] : $base_domain;
+      $expires = isset($session['expires']) ? $session['expires'] : time() + $this->getVariable('expires_in', OAUTH2_DEFAULT_EXPIRES_IN);
+    }
+
+    // Prepend dot if a domain is found.
+    if ($base_domain)
+      $base_domain = '.' . $base_domain;
+
+    // If an existing cookie is not set, we dont need to delete it.
+    if ($value == 'deleted' && empty($_COOKIE[$cookie_name]))
+      return;
+
+    if (headers_sent())
+      error_log('Could not set cookie. Headers already sent.');
+    else
+      setcookie($cookie_name, $value, $expires, '/', $base_domain);
+  }
+
+  /**
+   * Validates a session_version = 3 style session object.
+   *
+   * @param $session
+   *   The session object.
+   *
+   * @return
+   *   The session object if it validates, NULL otherwise.
+   */
+  protected function validateSessionObject($session) {
+    // Make sure some essential fields exist.
+    if (is_array($session) && isset($session['access_token']) && isset($session['sig'])) {
+      // Validate the signature.
+      $session_without_sig = $session;
+      unset($session_without_sig['sig']);
+
+      $expected_sig = self::generateSignature(
+        $session_without_sig,
+        $this->getVariable('client_secret')
+      );
+
+      if ($session['sig'] != $expected_sig) {
+        error_log('Got invalid session signature in cookie.');
+        $session = NULL;
+      }
+    }
+    else {
+      $session = NULL;
+    }
+    return $session;
+  }
+
+  /**
+   * Since $_SERVER['REQUEST_URI'] is only available on Apache, we
+   * generate an equivalent using other environment variables.
+   */
+  function getRequestUri() {
+    if (isset($_SERVER['REQUEST_URI'])) {
+      $uri = $_SERVER['REQUEST_URI'];
+    }
+    else {
+      if (isset($_SERVER['argv'])) {
+        $uri = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['argv'][0];
+      }
+      elseif (isset($_SERVER['QUERY_STRING'])) {
+        $uri = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];
+      }
+      else {
+        $uri = $_SERVER['SCRIPT_NAME'];
+      }
+    }
+    // Prevent multiple slashes to avoid cross site requests via the Form API.
+    $uri = '/' . ltrim($uri, '/');
+
+    return $uri;
+  }
+
+  /**
+   * Returns the Current URL.
+   *
+   * @return
+   *   The current URL.
+   */
+  protected function getCurrentUri() {
+    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'
+      ? 'https://'
+      : 'http://';
+    $current_uri = $protocol . $_SERVER['HTTP_HOST'] . $this->getRequestUri();
+    $parts = parse_url($current_uri);
+
+    $query = '';
+    if (!empty($parts['query'])) {
+      $params = array();
+      parse_str($parts['query'], $params);
+      $params = array_filter($params);
+      if (!empty($params)) {
+        $query = '?' . http_build_query($params, NULL, '&');
+      }
+    }
+
+    // Use port if non default.
+    $port = isset($parts['port']) &&
+      (($protocol === 'http://' && $parts['port'] !== 80) || ($protocol === 'https://' && $parts['port'] !== 443))
+      ? ':' . $parts['port'] : '';
+
+    // Rebuild.
+    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+  }
+
+  /**
+   * Build the URL for given path and parameters.
+   *
+   * @param $path
+   *   (optional) The path.
+   * @param $params
+   *   (optional) The query parameters in associative array.
+   *
+   * @return
+   *   The URL for the given parameters.
+   */
+  protected function getUri($path = '', $params = array()) {
+    $url = $this->getVariable('services_uri') ? $this->getVariable('services_uri') : $this->getVariable('base_uri');
+
+    if (!empty($path))
+      if (substr($path, 0, 4) == "http")
+        $url = $path;
+      else
+        $url = rtrim($url, '/') . '/' . ltrim($path, '/');
+
+    if (!empty($params))
+      $url .= '?' . http_build_query($params, NULL, '&');
+
+    return $url;
+  }
+
+  /**
+   * Generate a signature for the given params and secret.
+   *
+   * @param $params
+   *   The parameters to sign.
+   * @param $secret
+   *   The secret to sign with.
+   *
+   * @return
+   *   The generated signature
+   */
+  protected function generateSignature($params, $secret) {
+    // Work with sorted data.
+    ksort($params);
+
+    // Generate the base string.
+    $base_string = '';
+    foreach ($params as $key => $value) {
+      $base_string .= $key . '=' . $value;
+    }
+    $base_string .= $secret;
+
+    return md5($base_string);
+  }
+}
+
+class OAuth2Exception extends Exception {
+
+  /**
+   * The result from the API server that represents the exception information.
+   */
+  protected $result;
+
+  /**
+   * Make a new API Exception with the given result.
+   *
+   * @param $result
+   *   The result from the API server.
+   */
+  public function __construct($result) {
+    $this->result = $result;
+
+    $code = isset($result['code']) ? $result['code'] : 0;
+
+    if (isset($result['error'])) {
+      // OAuth 2.0 Draft 10 style
+      $message = $result['error'];
+    }
+    elseif (isset($result['message'])) {
+      // cURL style
+      $message = $result['message'];
+    }
+    else {
+      $message = 'Unknown Error. Check getResult()';
+    }
+
+    parent::__construct($message, $code);
+  }
+
+  /**
+   * Return the associated result object returned by the API server.
+   *
+   * @returns
+   *   The result from the API server.
+   */
+  public function getResult() {
+    return $this->result;
+  }
+
+  /**
+   * Returns the associated type for the error. This will default to
+   * 'Exception' when a type is not available.
+   *
+   * @return
+   *   The type for the error.
+   */
+  public function getType() {
+    if (isset($this->result['error'])) {
+      $message = $this->result['error'];
+      if (is_string($message)) {
+        // OAuth 2.0 Draft 10 style
+        return $message;
+      }
+    }
+    return 'Exception';
+  }
+
+  /**
+   * To make debugging easier.
+   *
+   * @returns
+   *   The string representation of the error.
+   */
+  public function __toString() {
+    $str = $this->getType() . ': ';
+    if ($this->code != 0) {
+      $str .= $this->code . ': ';
+    }
+    return $str . $this->message;
+  }
+}
\ No newline at end of file
diff --git a/upload/ips_kernel/vkontakte/oauth2.php b/upload/ips_kernel/vkontakte/oauth2.php
new file mode 100644
index 00000000..3326bb7a
--- /dev/null
+++ b/upload/ips_kernel/vkontakte/oauth2.php
@@ -0,0 +1,105 @@
+<?php
+require_once( dirname(__FILE__) . '/OAuth2Client.php' );
+
+class vkClient extends OAuth2Client
+{
+    
+    private $_allowed_scopes = array(
+        'notify',       // Пользователь разрешил отправл�ть ему уведомлени�.
+        'friends',      // До�туп к друзь�м.
+        'photos',       // До�туп к фотографи�м.
+        'audio',        // До�туп к аудиозапи��м.
+        'video',        // До�туп к видеозапи��м.
+        'notes',        // До�туп заметкам пользовател�.
+        'pages',        // До�туп к wiki-�траницам.
+        'offers',       // До�туп к предложени�м (у�таревшие методы).
+        'questions',    // До�туп к вопро�ам (у�таревшие методы).
+        'wall',         // До�туп к обычным и ра�ширенным методам работы �о �теной.
+        'messages',     // (дл� Standalone-приложений) До�туп к ра�ширенным методам работы � �ообщени�ми.
+        'offline',      // До�туп к API в любое врем� �о �тороннего �ервера.  
+    );
+    
+    public function __construct($config = array()) 
+    {
+        $configured_scopes = array( 'offline' );
+        
+        if ( isset($config['scope']) )
+        {
+            $config_scopes = array_map( 'trim', explode(',', $config['scope']) );
+
+            foreach( $config_scopes as $scope )
+            {
+                if ( in_array( $scope, $this->_allowed_scopes ) )
+                {
+                    $configured_scopes[] = $scope;
+                }
+            }
+            
+            unset( $config['scope'] );
+        }
+        
+        $this->setVariable( 'scope', implode(',', $configured_scopes) );
+        
+        parent::__construct($config);
+    }
+    
+    /**
+     * Получение ��ылки на авторизацию
+     *
+     * @link http://vkontakte.ru/developers.php?o=-1&p=%C0%E2%F2%EE%F0%E8%E7%E0%F6%E8%FF%20%F1%E0%E9%F2%EE%E2
+     */
+    public function getAuthorizeUrl($params = array())
+    {
+        $params = array_merge(
+            array(
+                'client_id'     => $this->getVariable('client_id'),
+                // зде�ь возможно нужен urlencode + уникальный ключ пользовател�
+                'redirect_uri'  => $this->getVariable('authorize_callback_uri'),
+                'response_type' => ( $this->getVariable('logintype') == 'client' ) ? 'token' : 'code',
+                'scope'         => $this->getVariable( 'scope' ),
+        ), $params);
+        
+        return $this->getUri( $this->getVariable('authorize_uri'), $params);
+    }
+        
+    /**
+    * �вторизационный �ервер vkontakte нам какбы отвечает
+    * {"access_token":"533bacf01e11f55b536a565b57531ac114461ae8736d6506a3", "expires_in":43200, "user_id":6492}
+    *
+    * @link http://vkontakte.ru/developers.php?o=-1&p=%C0%E2%F2%EE%F0%E8%E7%E0%F6%E8%FF%20%F1%E0%E9%F2%EE%E2
+    */
+    protected function getSessionObject($access_token = NULL) 
+    {
+      $session = NULL;
+
+      // Готовим данные дл� куки
+      if (!empty($access_token) && isset($access_token['access_token'])) {
+        $session['access_token'] = $access_token['access_token'];
+        $session['expires'] = ( isset($access_token['expires_in']) && $access_token['expires_in'] ) ? time() + $access_token['expires_in'] : time() + $this->getVariable('expires_in', OAUTH2_DEFAULT_EXPIRES_IN);
+        $session['refresh_token'] = isset($access_token['refresh_token']) ? $access_token['refresh_token'] : '';
+        $session['user_id'] = isset($access_token['user_id']) ? $access_token['user_id'] : 0;
+
+        $sig = self::generateSignature(
+          $session,
+          $this->getVariable('client_secret')
+        );
+        $session['sig'] = $sig;
+      }
+
+      return $session;
+    }
+
+    /**
+     * У vkontakte вме�то oauth_token имеем access_token
+     *
+     * @link http://vkontakte.ru/developers.php?o=-1&p=%C2%FB%EF%EE%EB%ED%E5%ED%E8%E5%20%E7%E0%EF%F0%EE%F1%EE%E2%20%EA%20API
+     */
+    protected function makeOAuth2Request($path, $method = 'GET', $params = array()) 
+    {
+      if ((!isset($params['access_token']) || empty($params['access_token'])) && $oauth_token = $this->getAccessToken()) 
+      {
+        $params['access_token'] = $oauth_token;
+      }
+      return $this->makeRequest($path, $method, $params);
+    }
+}
\ No newline at end of file
diff --git a/upload/lofiversion/index.php b/upload/lofiversion/index.php
index cfec9d9b..5f861f10 100644
--- a/upload/lofiversion/index.php
+++ b/upload/lofiversion/index.php
@@ -1,28 +1,23 @@
 <?php
 
 /**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * Redirect old lofi search results to the new IP.Board 3 urls
- * Last Updated: $Date: 2010-08-17 11:38:47 -0400 (Tue, 17 Aug 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 6763 $
- *
+ * @file		index.php 	Redirects old lofi search results to the new IP.Board 3 urls 
+ *~TERABYTE_DOC_READY~
+ * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
+ * $License: This is NULLED!
+ * $Author: ips_terabyte $
+ * @since		IP.Board 3.0.0
+ * $LastChangedDate: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $
+ * @version		v3.2.3
+ * $Revision: 8042 $
  */
 
 define( 'IPS_PUBLIC_SCRIPT', 'index.php' );
 define( 'LOFIVERSION_CALLED', true );
 
-require_once( '../initdata.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
+require_once( '../initdata.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );/*noLibHook*/
+require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );/*noLibHook*/
 
 /* INIT Registry */
 $reg = ipsRegistry::instance();
diff --git a/upload/public/flowplayer/README.txt b/upload/public/flowplayer/README.txt
index 2f3e1479..4609c6d7 100644
--- a/upload/public/flowplayer/README.txt
+++ b/upload/public/flowplayer/README.txt
@@ -1,5 +1,34 @@
 Version history:
 
+3.2.7
+-----
+
+- Loads the new controlbar plugin version 3.2.5. No other functional changes.
+
+3.2.6
+-----
+- linkUrl should now work better with popup blockers: http://code.google.com/p/flowplayer-core/issues/detail?id=31
+- new linkWindow value "_popup" opens the linked page in a popup browser window
+- added new onClipResized event
+- Added new onUnload event, can be only listened in Flash and not triggered to JS
+- API: Added new url property to plugin objects
+Fixes:
+- it was not possible to call play() in an onFinish listener
+- fix to preserve the infoObject for custom netStream and netConnection clients in cases where the infoObject is a
+  primitive object without properties
+- does not show the error dialog in the debugger player when showErrors: false
+- fixed to correctly handle xx.ca subdomains when validating the license key
+- a custom logo is now sized correctly according to the configured size
+- does not show the buffer animation any more when the player receives the onBufferEmpty message from the netStream.
+  The animation was unnecessarily shown in some situations.
+- fixed #155. added new urlEncoding property to Clip for url ncoding ut8 urls
+
+3.2.5
+-----
+- added new scaling option 'crop' that resizes to fill all available space, cropping on top/bottom or left/right
+- improvements to RSS file parsing
+- Now displays a hand cursor when a linkUrl is used in clips
+
 3.2.4
 -----
 - new flowplayer.js version, with Apple iDevice fixes
@@ -17,6 +46,7 @@ Fixes:
 Fixes:
 - correct verification of license keys in *.ca domains
 - fix to make playback to always reach end of video
+- fixed resuming of live streams
 
 3.2.2
 -----
diff --git a/upload/public/flowplayer/example/flowplayer-3.2.4.min.js b/upload/public/flowplayer/example/flowplayer-3.2.6.min.js
similarity index 65%
rename from upload/public/flowplayer/example/flowplayer-3.2.4.min.js
rename to upload/public/flowplayer/example/flowplayer-3.2.6.min.js
index f05586d2..500492e2 100644
--- a/upload/public/flowplayer/example/flowplayer-3.2.4.min.js
+++ b/upload/public/flowplayer/example/flowplayer-3.2.6.min.js
@@ -1,7 +1,7 @@
 /* 
- * flowplayer.js 3.2.4. The Flowplayer API
+ * flowplayer.js 3.2.6. The Flowplayer API
  * 
- * Copyright 2009 Flowplayer Oy
+ * Copyright 2009-2011 Flowplayer Oy
  * 
  * This file is part of Flowplayer.
  * 
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Flowplayer.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Date: 2010-08-25 12:48:46 +0000 (Wed, 25 Aug 2010)
- * Revision: 551 
+ * Date: 2011-02-04 05:45:28 -0500 (Fri, 04 Feb 2011)
+ * Revision: 614 
  */
-(function(){function g(o){console.log("$f.fireEvent",[].slice.call(o))}function k(q){if(!q||typeof q!="object"){return q}var o=new q.constructor();for(var p in q){if(q.hasOwnProperty(p)){o[p]=k(q[p])}}return o}function m(t,q){if(!t){return}var o,p=0,r=t.length;if(r===undefined){for(o in t){if(q.call(t[o],o,t[o])===false){break}}}else{for(var s=t[0];p<r&&q.call(s,p,s)!==false;s=t[++p]){}}return t}function c(o){return document.getElementById(o)}function i(q,p,o){if(typeof p!="object"){return q}if(q&&p){m(p,function(r,s){if(!o||typeof s!="function"){q[r]=s}})}return q}function n(s){var q=s.indexOf(".");if(q!=-1){var p=s.slice(0,q)||"*";var o=s.slice(q+1,s.length);var r=[];m(document.getElementsByTagName(p),function(){if(this.className&&this.className.indexOf(o)!=-1){r.push(this)}});return r}}function f(o){o=o||window.event;if(o.preventDefault){o.stopPropagation();o.preventDefault()}else{o.returnValue=false;o.cancelBubble=true}return false}function j(q,o,p){q[o]=q[o]||[];q[o].push(p)}function e(){return"_"+(""+Math.random()).slice(2,10)}var h=function(t,r,s){var q=this,p={},u={};q.index=r;if(typeof t=="string"){t={url:t}}i(this,t,true);m(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var v="on"+this;if(v.indexOf("*")!=-1){v=v.slice(0,v.length-1);var w="onBefore"+v.slice(2);q[w]=function(x){j(u,w,x);return q}}q[v]=function(x){j(u,v,x);return q};if(r==-1){if(q[w]){s[w]=q[w]}if(q[v]){s[v]=q[v]}}});i(this,{onCuepoint:function(x,w){if(arguments.length==1){p.embedded=[null,x];return q}if(typeof x=="number"){x=[x]}var v=e();p[v]=[x,w];if(s.isLoaded()){s._api().fp_addCuepoints(x,r,v)}return q},update:function(w){i(q,w);if(s.isLoaded()){s._api().fp_updateClip(w,r)}var v=s.getConfig();var x=(r==-1)?v.clip:v.playlist[r];i(x,w,true)},_fireEvent:function(v,y,w,A){if(v=="onLoad"){m(p,function(B,C){if(C[0]){s._api().fp_addCuepoints(C[0],r,B)}});return false}A=A||q;if(v=="onCuepoint"){var z=p[y];if(z){return z[1].call(s,A,w)}}if(y&&"onBeforeBegin,onMetaData,onStart,onUpdate,onResume".indexOf(v)!=-1){i(A,y);if(y.metaData){if(!A.duration){A.duration=y.metaData.duration}else{A.fullDuration=y.metaData.duration}}}var x=true;m(u[v],function(){x=this.call(s,A,y,w)});return x}});if(t.onCuepoint){var o=t.onCuepoint;q.onCuepoint.apply(q,typeof o=="function"?[o]:o);delete t.onCuepoint}m(t,function(v,w){if(typeof w=="function"){j(u,v,w);delete t[v]}});if(r==-1){s.onCuepoint=this.onCuepoint}};var l=function(p,r,q,t){var o=this,s={},u=false;if(t){i(s,t)}m(r,function(v,w){if(typeof w=="function"){s[v]=w;delete r[v]}});i(this,{animate:function(y,z,x){if(!y){return o}if(typeof z=="function"){x=z;z=500}if(typeof y=="string"){var w=y;y={};y[w]=z;z=500}if(x){var v=e();s[v]=x}if(z===undefined){z=500}r=q._api().fp_animate(p,y,z,v);return o},css:function(w,x){if(x!==undefined){var v={};v[w]=x;w=v}r=q._api().fp_css(p,w);i(o,r);return o},show:function(){this.display="block";q._api().fp_showPlugin(p);return o},hide:function(){this.display="none";q._api().fp_hidePlugin(p);return o},toggle:function(){this.display=q._api().fp_togglePlugin(p);return o},fadeTo:function(y,x,w){if(typeof x=="function"){w=x;x=500}if(w){var v=e();s[v]=w}this.display=q._api().fp_fadeTo(p,y,x,v);this.opacity=y;return o},fadeIn:function(w,v){return o.fadeTo(1,w,v)},fadeOut:function(w,v){return o.fadeTo(0,w,v)},getName:function(){return p},getPlayer:function(){return q},_fireEvent:function(w,v,x){if(w=="onUpdate"){var z=q._api().fp_getPlugin(p);if(!z){return}i(o,z);delete o.methods;if(!u){m(z.methods,function(){var B=""+this;o[B]=function(){var C=[].slice.call(arguments);var D=q._api().fp_invoke(p,B,C);return D==="undefined"||D===undefined?o:D}});u=true}}var A=s[w];if(A){var y=A.apply(o,v);if(w.slice(0,1)=="_"){delete s[w]}return y}return o}})};function b(q,G,t){var w=this,v=null,D=false,u,s,F=[],y={},x={},E,r,p,C,o,A;i(w,{id:function(){return E},isLoaded:function(){return(v!==null&&v.fp_play!==undefined&&!D)},getParent:function(){return q},hide:function(H){if(H){q.style.height="0px"}if(w.isLoaded()){v.style.height="0px"}return w},show:function(){q.style.height=A+"px";if(w.isLoaded()){v.style.height=o+"px"}return w},isHidden:function(){return w.isLoaded()&&parseInt(v.style.height,10)===0},load:function(J){if(!w.isLoaded()&&w._fireEvent("onBeforeLoad")!==false){var H=function(){u=q.innerHTML;if(u&&!flashembed.isSupported(G.version)){q.innerHTML=""}if(J){J.cached=true;j(x,"onLoad",J)}flashembed(q,G,{config:t})};var I=0;m(a,function(){this.unload(function(K){if(++I==a.length){H()}})})}return w},unload:function(J){if(this.isFullscreen()&&/WebKit/i.test(navigator.userAgent)){if(J){J(false)}return w}if(u.replace(/\s/g,"")!==""){if(w._fireEvent("onBeforeUnload")===false){if(J){J(false)}return w}D=true;try{if(v){v.fp_close();w._fireEvent("onUnload")}}catch(H){}var I=function(){v=null;q.innerHTML=u;D=false;if(J){J(true)}};setTimeout(I,50)}else{if(J){J(false)}}return w},getClip:function(H){if(H===undefined){H=C}return F[H]},getCommonClip:function(){return s},getPlaylist:function(){return F},getPlugin:function(H){var J=y[H];if(!J&&w.isLoaded()){var I=w._api().fp_getPlugin(H);if(I){J=new l(H,I,w);y[H]=J}}return J},getScreen:function(){return w.getPlugin("screen")},getControls:function(){return w.getPlugin("controls")._fireEvent("onUpdate")},getLogo:function(){try{return w.getPlugin("logo")._fireEvent("onUpdate")}catch(H){}},getPlay:function(){return w.getPlugin("play")._fireEvent("onUpdate")},getConfig:function(H){return H?k(t):t},getFlashParams:function(){return G},loadPlugin:function(K,J,M,L){if(typeof M=="function"){L=M;M={}}var I=L?e():"_";w._api().fp_loadPlugin(K,J,M,I);var H={};H[I]=L;var N=new l(K,null,w,H);y[K]=N;return N},getState:function(){return w.isLoaded()?v.fp_getState():-1},play:function(I,H){var J=function(){if(I!==undefined){w._api().fp_play(I,H)}else{w._api().fp_play()}};if(w.isLoaded()){J()}else{if(D){setTimeout(function(){w.play(I,H)},50)}else{w.load(function(){J()})}}return w},getVersion:function(){var I="flowplayer.js 3.2.4";if(w.isLoaded()){var H=v.fp_getVersion();H.push(I);return H}return I},_api:function(){if(!w.isLoaded()){throw"Flowplayer "+w.id()+" not loaded when calling an API method"}return v},setClip:function(H){w.setPlaylist([H]);return w},getIndex:function(){return p},_swfHeight:function(){return v.clientHeight}});m(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var H="on"+this;if(H.indexOf("*")!=-1){H=H.slice(0,H.length-1);var I="onBefore"+H.slice(2);w[I]=function(J){j(x,I,J);return w}}w[H]=function(J){j(x,H,J);return w}});m(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed,setKeyboardShortcutsEnabled,isKeyboardShortcutsEnabled").split(","),function(){var H=this;w[H]=function(J,I){if(!w.isLoaded()){return w}var K=null;if(J!==undefined&&I!==undefined){K=v["fp_"+H](J,I)}else{K=(J===undefined)?v["fp_"+H]():v["fp_"+H](J)}return K==="undefined"||K===undefined?w:K}});w._fireEvent=function(Q){if(typeof Q=="string"){Q=[Q]}var R=Q[0],O=Q[1],M=Q[2],L=Q[3],K=0;if(t.debug){g(Q)}if(!w.isLoaded()&&R=="onLoad"&&O=="player"){v=v||c(r);o=w._swfHeight();m(F,function(){this._fireEvent("onLoad")});m(y,function(S,T){T._fireEvent("onUpdate")});s._fireEvent("onLoad")}if(R=="onLoad"&&O!="player"){return}if(R=="onError"){if(typeof O=="string"||(typeof O=="number"&&typeof M=="number")){O=M;M=L}}if(R=="onContextMenu"){m(t.contextMenu[O],function(S,T){T.call(w)});return}if(R=="onPluginEvent"||R=="onBeforePluginEvent"){var H=O.name||O;var I=y[H];if(I){I._fireEvent("onUpdate",O);return I._fireEvent(M,Q.slice(3))}return}if(R=="onPlaylistReplace"){F=[];var N=0;m(O,function(){F.push(new h(this,N++,w))})}if(R=="onClipAdd"){if(O.isInStream){return}O=new h(O,M,w);F.splice(M,0,O);for(K=M+1;K<F.length;K++){F[K].index++}}var P=true;if(typeof O=="number"&&O<F.length){C=O;var J=F[O];if(J){P=J._fireEvent(R,M,L)}if(!J||P!==false){P=s._fireEvent(R,M,L,J)}}m(x[R],function(){P=this.call(w,O,M);if(this.cached){x[R].splice(K,1)}if(P===false){return false}K++});return P};function B(){if($f(q)){$f(q).getParent().innerHTML="";p=$f(q).getIndex();a[p]=w}else{a.push(w);p=a.length-1}A=parseInt(q.style.height,10)||q.clientHeight;E=q.id||"fp"+e();r=G.id||E+"_api";G.id=r;t.playerId=E;if(typeof t=="string"){t={clip:{url:t}}}if(typeof t.clip=="string"){t.clip={url:t.clip}}t.clip=t.clip||{};if(q.getAttribute("href",2)&&!t.clip.url){t.clip.url=q.getAttribute("href",2)}s=new h(t.clip,-1,w);t.playlist=t.playlist||[t.clip];var I=0;m(t.playlist,function(){var K=this;if(typeof K=="object"&&K.length){K={url:""+K}}m(t.clip,function(L,M){if(M!==undefined&&K[L]===undefined&&typeof M!="function"){K[L]=M}});t.playlist[I]=K;K=new h(K,I,w);F.push(K);I++});m(t,function(K,L){if(typeof L=="function"){if(s[K]){s[K](L)}else{j(x,K,L)}delete t[K]}});m(t.plugins,function(K,L){if(L){y[K]=new l(K,L,w)}});if(!t.plugins||t.plugins.controls===undefined){y.controls=new l("controls",null,w)}y.canvas=new l("canvas",null,w);u=q.innerHTML;function J(L){var K=w.hasiPadSupport&&w.hasiPadSupport();if(/iPad|iPhone|iPod/i.test(navigator.userAgent)&&!/.flv$/i.test(F[0].url)&&!K){return true}if(!w.isLoaded()&&w._fireEvent("onBeforeClick")!==false){w.load()}return f(L)}function H(){if(u.replace(/\s/g,"")!==""){if(q.addEventListener){q.addEventListener("click",J,false)}else{if(q.attachEvent){q.attachEvent("onclick",J)}}}else{if(q.addEventListener){q.addEventListener("click",f,false)}w.load()}}setTimeout(H,0)}if(typeof q=="string"){var z=c(q);if(!z){throw"Flowplayer cannot access element: "+q}q=z;B()}else{B()}}var a=[];function d(o){this.length=o.length;this.each=function(p){m(o,p)};this.size=function(){return o.length}}window.flowplayer=window.$f=function(){var p=null;var o=arguments[0];if(!arguments.length){m(a,function(){if(this.isLoaded()){p=this;return false}});return p||a[0]}if(arguments.length==1){if(typeof o=="number"){return a[o]}else{if(o=="*"){return new d(a)}m(a,function(){if(this.id()==o.id||this.id()==o||this.getParent()==o){p=this;return false}});return p}}if(arguments.length>1){var t=arguments[1],q=(arguments.length==3)?arguments[2]:{};if(typeof t=="string"){t={src:t}}t=i({bgcolor:"#000000",version:[9,0],expressInstall:"http://static.flowplayer.org/swf/expressinstall.swf",cachebusting:true},t);if(typeof o=="string"){if(o.indexOf(".")!=-1){var s=[];m(n(o),function(){s.push(new b(this,k(t),k(q)))});return new d(s)}else{var r=c(o);return new b(r!==null?r:o,t,q)}}else{if(o){return new b(o,t,q)}}}return null};i(window.$f,{fireEvent:function(){var o=[].slice.call(arguments);var q=$f(o[0]);return q?q._fireEvent(o.slice(1)):null},addPlugin:function(o,p){b.prototype[o]=p;return $f},each:m,extend:i});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(q,p){if(!arguments.length||typeof arguments[0]=="number"){var o=[];this.each(function(){var r=$f(this);if(r){o.push(r)}});return arguments.length?o[arguments[0]]:new d(o)}return this.each(function(){$f(this,k(q),p?k(p):{})})}}})();(function(){var h=document.all,j="http://www.adobe.com/go/getflashplayer",c=typeof jQuery=="function",e=/(\d+)[^\d]+(\d+)[^\d]*(\d*)/,b={width:"100%",height:"100%",id:"_"+(""+Math.random()).slice(9),allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:[3,0],onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function i(m,l){if(l){for(var f in l){if(l.hasOwnProperty(f)){m[f]=l[f]}}}return m}function a(f,n){var m=[];for(var l in f){if(f.hasOwnProperty(l)){m[l]=n(f[l])}}return m}window.flashembed=function(f,m,l){if(typeof f=="string"){f=document.getElementById(f.replace("#",""))}if(!f){return}if(typeof m=="string"){m={src:m}}return new d(f,i(i({},b),m),l)};var g=i(window.flashembed,{conf:b,getVersion:function(){var m,f;try{f=navigator.plugins["Shockwave Flash"].description.slice(16)}catch(o){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");f=m&&m.GetVariable("$version")}catch(n){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");f=m&&m.GetVariable("$version")}catch(l){}}}f=e.exec(f);return f?[f[1],f[3]]:[0,0]},asString:function(l){if(l===null||l===undefined){return null}var f=typeof l;if(f=="object"&&l.push){f="array"}switch(f){case"string":l=l.replace(new RegExp('(["\\\\])',"g"),"\\$1");l=l.replace(/^\s?(\d+\.?\d+)%/,"$1pct");return'"'+l+'"';case"array":return"["+a(l,function(o){return g.asString(o)}).join(",")+"]";case"function":return'"function()"';case"object":var m=[];for(var n in l){if(l.hasOwnProperty(n)){m.push('"'+n+'":'+g.asString(l[n]))}}return"{"+m.join(",")+"}"}return String(l).replace(/\s/g," ").replace(/\'/g,'"')},getHTML:function(o,l){o=i({},o);var n='<object width="'+o.width+'" height="'+o.height+'" id="'+o.id+'" name="'+o.id+'"';if(o.cachebusting){o.src+=((o.src.indexOf("?")!=-1?"&":"?")+Math.random())}if(o.w3c||!h){n+=' data="'+o.src+'" type="application/x-shockwave-flash"'}else{n+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'}n+=">";if(o.w3c||h){n+='<param name="movie" value="'+o.src+'" />'}o.width=o.height=o.id=o.w3c=o.src=null;o.onFail=o.version=o.expressInstall=null;for(var m in o){if(o[m]){n+='<param name="'+m+'" value="'+o[m]+'" />'}}var p="";if(l){for(var f in l){if(l[f]){var q=l[f];p+=f+"="+(/function|object/.test(typeof q)?g.asString(q):q)+"&"}}p=p.slice(0,-1);n+='<param name="flashvars" value=\''+p+"' />"}n+="</object>";return n},isSupported:function(f){return k[0]>f[0]||k[0]==f[0]&&k[1]>=f[1]}});var k=g.getVersion();function d(f,n,m){if(g.isSupported(n.version)){f.innerHTML=g.getHTML(n,m)}else{if(n.expressInstall&&g.isSupported([6,65])){f.innerHTML=g.getHTML(i(n,{src:n.expressInstall}),{MMredirectURL:location.href,MMplayerType:"PlugIn",MMdoctitle:document.title})}else{if(!f.innerHTML.replace(/\s/g,"")){f.innerHTML="<h2>Flash version "+n.version+" or greater is required</h2><h3>"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"</h3>"+(f.tagName=="A"?"<p>Click here to download latest version</p>":"<p>Download latest version from <a href='"+j+"'>here</a></p>");if(f.tagName=="A"){f.onclick=function(){location.href=j}}}if(n.onFail){var l=n.onFail.call(this);if(typeof l=="string"){f.innerHTML=l}}}}if(h){window[n.id]=document.getElementById(n.id)}i(this,{getRoot:function(){return f},getOptions:function(){return n},getConf:function(){return m},getApi:function(){return f.firstChild}})}if(c){jQuery.tools=jQuery.tools||{version:"3.2.4"};jQuery.tools.flashembed={conf:b};jQuery.fn.flashembed=function(l,f){return this.each(function(){$(this).data("flashembed",flashembed(this,l,f))})}}})();
\ No newline at end of file
+(function(){function g(o){console.log("$f.fireEvent",[].slice.call(o))}function k(q){if(!q||typeof q!="object"){return q}var o=new q.constructor();for(var p in q){if(q.hasOwnProperty(p)){o[p]=k(q[p])}}return o}function m(t,q){if(!t){return}var o,p=0,r=t.length;if(r===undefined){for(o in t){if(q.call(t[o],o,t[o])===false){break}}}else{for(var s=t[0];p<r&&q.call(s,p,s)!==false;s=t[++p]){}}return t}function c(o){return document.getElementById(o)}function i(q,p,o){if(typeof p!="object"){return q}if(q&&p){m(p,function(r,s){if(!o||typeof s!="function"){q[r]=s}})}return q}function n(s){var q=s.indexOf(".");if(q!=-1){var p=s.slice(0,q)||"*";var o=s.slice(q+1,s.length);var r=[];m(document.getElementsByTagName(p),function(){if(this.className&&this.className.indexOf(o)!=-1){r.push(this)}});return r}}function f(o){o=o||window.event;if(o.preventDefault){o.stopPropagation();o.preventDefault()}else{o.returnValue=false;o.cancelBubble=true}return false}function j(q,o,p){q[o]=q[o]||[];q[o].push(p)}function e(){return"_"+(""+Math.random()).slice(2,10)}var h=function(t,r,s){var q=this,p={},u={};q.index=r;if(typeof t=="string"){t={url:t}}i(this,t,true);m(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var v="on"+this;if(v.indexOf("*")!=-1){v=v.slice(0,v.length-1);var w="onBefore"+v.slice(2);q[w]=function(x){j(u,w,x);return q}}q[v]=function(x){j(u,v,x);return q};if(r==-1){if(q[w]){s[w]=q[w]}if(q[v]){s[v]=q[v]}}});i(this,{onCuepoint:function(x,w){if(arguments.length==1){p.embedded=[null,x];return q}if(typeof x=="number"){x=[x]}var v=e();p[v]=[x,w];if(s.isLoaded()){s._api().fp_addCuepoints(x,r,v)}return q},update:function(w){i(q,w);if(s.isLoaded()){s._api().fp_updateClip(w,r)}var v=s.getConfig();var x=(r==-1)?v.clip:v.playlist[r];i(x,w,true)},_fireEvent:function(v,y,w,A){if(v=="onLoad"){m(p,function(B,C){if(C[0]){s._api().fp_addCuepoints(C[0],r,B)}});return false}A=A||q;if(v=="onCuepoint"){var z=p[y];if(z){return z[1].call(s,A,w)}}if(y&&"onBeforeBegin,onMetaData,onStart,onUpdate,onResume".indexOf(v)!=-1){i(A,y);if(y.metaData){if(!A.duration){A.duration=y.metaData.duration}else{A.fullDuration=y.metaData.duration}}}var x=true;m(u[v],function(){x=this.call(s,A,y,w)});return x}});if(t.onCuepoint){var o=t.onCuepoint;q.onCuepoint.apply(q,typeof o=="function"?[o]:o);delete t.onCuepoint}m(t,function(v,w){if(typeof w=="function"){j(u,v,w);delete t[v]}});if(r==-1){s.onCuepoint=this.onCuepoint}};var l=function(p,r,q,t){var o=this,s={},u=false;if(t){i(s,t)}m(r,function(v,w){if(typeof w=="function"){s[v]=w;delete r[v]}});i(this,{animate:function(y,z,x){if(!y){return o}if(typeof z=="function"){x=z;z=500}if(typeof y=="string"){var w=y;y={};y[w]=z;z=500}if(x){var v=e();s[v]=x}if(z===undefined){z=500}r=q._api().fp_animate(p,y,z,v);return o},css:function(w,x){if(x!==undefined){var v={};v[w]=x;w=v}r=q._api().fp_css(p,w);i(o,r);return o},show:function(){this.display="block";q._api().fp_showPlugin(p);return o},hide:function(){this.display="none";q._api().fp_hidePlugin(p);return o},toggle:function(){this.display=q._api().fp_togglePlugin(p);return o},fadeTo:function(y,x,w){if(typeof x=="function"){w=x;x=500}if(w){var v=e();s[v]=w}this.display=q._api().fp_fadeTo(p,y,x,v);this.opacity=y;return o},fadeIn:function(w,v){return o.fadeTo(1,w,v)},fadeOut:function(w,v){return o.fadeTo(0,w,v)},getName:function(){return p},getPlayer:function(){return q},_fireEvent:function(w,v,x){if(w=="onUpdate"){var z=q._api().fp_getPlugin(p);if(!z){return}i(o,z);delete o.methods;if(!u){m(z.methods,function(){var B=""+this;o[B]=function(){var C=[].slice.call(arguments);var D=q._api().fp_invoke(p,B,C);return D==="undefined"||D===undefined?o:D}});u=true}}var A=s[w];if(A){var y=A.apply(o,v);if(w.slice(0,1)=="_"){delete s[w]}return y}return o}})};function b(q,G,t){var w=this,v=null,D=false,u,s,F=[],y={},x={},E,r,p,C,o,A;i(w,{id:function(){return E},isLoaded:function(){return(v!==null&&v.fp_play!==undefined&&!D)},getParent:function(){return q},hide:function(H){if(H){q.style.height="0px"}if(w.isLoaded()){v.style.height="0px"}return w},show:function(){q.style.height=A+"px";if(w.isLoaded()){v.style.height=o+"px"}return w},isHidden:function(){return w.isLoaded()&&parseInt(v.style.height,10)===0},load:function(J){if(!w.isLoaded()&&w._fireEvent("onBeforeLoad")!==false){var H=function(){u=q.innerHTML;if(u&&!flashembed.isSupported(G.version)){q.innerHTML=""}if(J){J.cached=true;j(x,"onLoad",J)}flashembed(q,G,{config:t})};var I=0;m(a,function(){this.unload(function(K){if(++I==a.length){H()}})})}return w},unload:function(J){if(this.isFullscreen()&&/WebKit/i.test(navigator.userAgent)){if(J){J(false)}return w}if(u.replace(/\s/g,"")!==""){if(w._fireEvent("onBeforeUnload")===false){if(J){J(false)}return w}D=true;try{if(v){v.fp_close();w._fireEvent("onUnload")}}catch(H){}var I=function(){v=null;q.innerHTML=u;D=false;if(J){J(true)}};setTimeout(I,50)}else{if(J){J(false)}}return w},getClip:function(H){if(H===undefined){H=C}return F[H]},getCommonClip:function(){return s},getPlaylist:function(){return F},getPlugin:function(H){var J=y[H];if(!J&&w.isLoaded()){var I=w._api().fp_getPlugin(H);if(I){J=new l(H,I,w);y[H]=J}}return J},getScreen:function(){return w.getPlugin("screen")},getControls:function(){return w.getPlugin("controls")._fireEvent("onUpdate")},getLogo:function(){try{return w.getPlugin("logo")._fireEvent("onUpdate")}catch(H){}},getPlay:function(){return w.getPlugin("play")._fireEvent("onUpdate")},getConfig:function(H){return H?k(t):t},getFlashParams:function(){return G},loadPlugin:function(K,J,M,L){if(typeof M=="function"){L=M;M={}}var I=L?e():"_";w._api().fp_loadPlugin(K,J,M,I);var H={};H[I]=L;var N=new l(K,null,w,H);y[K]=N;return N},getState:function(){return w.isLoaded()?v.fp_getState():-1},play:function(I,H){var J=function(){if(I!==undefined){w._api().fp_play(I,H)}else{w._api().fp_play()}};if(w.isLoaded()){J()}else{if(D){setTimeout(function(){w.play(I,H)},50)}else{w.load(function(){J()})}}return w},getVersion:function(){var I="flowplayer.js 3.2.6";if(w.isLoaded()){var H=v.fp_getVersion();H.push(I);return H}return I},_api:function(){if(!w.isLoaded()){throw"Flowplayer "+w.id()+" not loaded when calling an API method"}return v},setClip:function(H){w.setPlaylist([H]);return w},getIndex:function(){return p},_swfHeight:function(){return v.clientHeight}});m(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var H="on"+this;if(H.indexOf("*")!=-1){H=H.slice(0,H.length-1);var I="onBefore"+H.slice(2);w[I]=function(J){j(x,I,J);return w}}w[H]=function(J){j(x,H,J);return w}});m(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed,setKeyboardShortcutsEnabled,isKeyboardShortcutsEnabled").split(","),function(){var H=this;w[H]=function(J,I){if(!w.isLoaded()){return w}var K=null;if(J!==undefined&&I!==undefined){K=v["fp_"+H](J,I)}else{K=(J===undefined)?v["fp_"+H]():v["fp_"+H](J)}return K==="undefined"||K===undefined?w:K}});w._fireEvent=function(Q){if(typeof Q=="string"){Q=[Q]}var R=Q[0],O=Q[1],M=Q[2],L=Q[3],K=0;if(t.debug){g(Q)}if(!w.isLoaded()&&R=="onLoad"&&O=="player"){v=v||c(r);o=w._swfHeight();m(F,function(){this._fireEvent("onLoad")});m(y,function(S,T){T._fireEvent("onUpdate")});s._fireEvent("onLoad")}if(R=="onLoad"&&O!="player"){return}if(R=="onError"){if(typeof O=="string"||(typeof O=="number"&&typeof M=="number")){O=M;M=L}}if(R=="onContextMenu"){m(t.contextMenu[O],function(S,T){T.call(w)});return}if(R=="onPluginEvent"||R=="onBeforePluginEvent"){var H=O.name||O;var I=y[H];if(I){I._fireEvent("onUpdate",O);return I._fireEvent(M,Q.slice(3))}return}if(R=="onPlaylistReplace"){F=[];var N=0;m(O,function(){F.push(new h(this,N++,w))})}if(R=="onClipAdd"){if(O.isInStream){return}O=new h(O,M,w);F.splice(M,0,O);for(K=M+1;K<F.length;K++){F[K].index++}}var P=true;if(typeof O=="number"&&O<F.length){C=O;var J=F[O];if(J){P=J._fireEvent(R,M,L)}if(!J||P!==false){P=s._fireEvent(R,M,L,J)}}m(x[R],function(){P=this.call(w,O,M);if(this.cached){x[R].splice(K,1)}if(P===false){return false}K++});return P};function B(){if($f(q)){$f(q).getParent().innerHTML="";p=$f(q).getIndex();a[p]=w}else{a.push(w);p=a.length-1}A=parseInt(q.style.height,10)||q.clientHeight;E=q.id||"fp"+e();r=G.id||E+"_api";G.id=r;t.playerId=E;if(typeof t=="string"){t={clip:{url:t}}}if(typeof t.clip=="string"){t.clip={url:t.clip}}t.clip=t.clip||{};if(q.getAttribute("href",2)&&!t.clip.url){t.clip.url=q.getAttribute("href",2)}s=new h(t.clip,-1,w);t.playlist=t.playlist||[t.clip];var I=0;m(t.playlist,function(){var K=this;if(typeof K=="object"&&K.length){K={url:""+K}}m(t.clip,function(L,M){if(M!==undefined&&K[L]===undefined&&typeof M!="function"){K[L]=M}});t.playlist[I]=K;K=new h(K,I,w);F.push(K);I++});m(t,function(K,L){if(typeof L=="function"){if(s[K]){s[K](L)}else{j(x,K,L)}delete t[K]}});m(t.plugins,function(K,L){if(L){y[K]=new l(K,L,w)}});if(!t.plugins||t.plugins.controls===undefined){y.controls=new l("controls",null,w)}y.canvas=new l("canvas",null,w);u=q.innerHTML;function J(L){var K=w.hasiPadSupport&&w.hasiPadSupport();if(/iPad|iPhone|iPod/i.test(navigator.userAgent)&&!/.flv$/i.test(F[0].url)&&!K){return true}if(!w.isLoaded()&&w._fireEvent("onBeforeClick")!==false){w.load()}return f(L)}function H(){if(u.replace(/\s/g,"")!==""){if(q.addEventListener){q.addEventListener("click",J,false)}else{if(q.attachEvent){q.attachEvent("onclick",J)}}}else{if(q.addEventListener){q.addEventListener("click",f,false)}w.load()}}setTimeout(H,0)}if(typeof q=="string"){var z=c(q);if(!z){throw"Flowplayer cannot access element: "+q}q=z;B()}else{B()}}var a=[];function d(o){this.length=o.length;this.each=function(p){m(o,p)};this.size=function(){return o.length}}window.flowplayer=window.$f=function(){var p=null;var o=arguments[0];if(!arguments.length){m(a,function(){if(this.isLoaded()){p=this;return false}});return p||a[0]}if(arguments.length==1){if(typeof o=="number"){return a[o]}else{if(o=="*"){return new d(a)}m(a,function(){if(this.id()==o.id||this.id()==o||this.getParent()==o){p=this;return false}});return p}}if(arguments.length>1){var t=arguments[1],q=(arguments.length==3)?arguments[2]:{};if(typeof t=="string"){t={src:t}}t=i({bgcolor:"#000000",version:[9,0],expressInstall:"http://static.flowplayer.org/swf/expressinstall.swf",cachebusting:false},t);if(typeof o=="string"){if(o.indexOf(".")!=-1){var s=[];m(n(o),function(){s.push(new b(this,k(t),k(q)))});return new d(s)}else{var r=c(o);return new b(r!==null?r:o,t,q)}}else{if(o){return new b(o,t,q)}}}return null};i(window.$f,{fireEvent:function(){var o=[].slice.call(arguments);var q=$f(o[0]);return q?q._fireEvent(o.slice(1)):null},addPlugin:function(o,p){b.prototype[o]=p;return $f},each:m,extend:i});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(q,p){if(!arguments.length||typeof arguments[0]=="number"){var o=[];this.each(function(){var r=$f(this);if(r){o.push(r)}});return arguments.length?o[arguments[0]]:new d(o)}return this.each(function(){$f(this,k(q),p?k(p):{})})}}})();(function(){var e=typeof jQuery=="function";var i={width:"100%",height:"100%",allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:null,onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(e){jQuery.tools=jQuery.tools||{};jQuery.tools.flashembed={version:"1.0.4",conf:i}}function j(){if(c.done){return false}var l=document;if(l&&l.getElementsByTagName&&l.getElementById&&l.body){clearInterval(c.timer);c.timer=null;for(var k=0;k<c.ready.length;k++){c.ready[k].call()}c.ready=null;c.done=true}}var c=e?jQuery:function(k){if(c.done){return k()}if(c.timer){c.ready.push(k)}else{c.ready=[k];c.timer=setInterval(j,13)}};function f(l,k){if(k){for(key in k){if(k.hasOwnProperty(key)){l[key]=k[key]}}}return l}function g(k){switch(h(k)){case"string":k=k.replace(new RegExp('(["\\\\])',"g"),"\\$1");k=k.replace(/^\s?(\d+)%/,"$1pct");return'"'+k+'"';case"array":return"["+b(k,function(n){return g(n)}).join(",")+"]";case"function":return'"function()"';case"object":var l=[];for(var m in k){if(k.hasOwnProperty(m)){l.push('"'+m+'":'+g(k[m]))}}return"{"+l.join(",")+"}"}return String(k).replace(/\s/g," ").replace(/\'/g,'"')}function h(l){if(l===null||l===undefined){return false}var k=typeof l;return(k=="object"&&l.push)?"array":k}if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function b(k,n){var m=[];for(var l in k){if(k.hasOwnProperty(l)){m[l]=n(k[l])}}return m}function a(r,t){var q=f({},r);var s=document.all;var n='<object width="'+q.width+'" height="'+q.height+'"';if(s&&!q.id){q.id="_"+(""+Math.random()).substring(9)}if(q.id){n+=' id="'+q.id+'"'}if(q.cachebusting){q.src+=((q.src.indexOf("?")!=-1?"&":"?")+Math.random())}if(q.w3c||!s){n+=' data="'+q.src+'" type="application/x-shockwave-flash"'}else{n+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'}n+=">";if(q.w3c||s){n+='<param name="movie" value="'+q.src+'" />'}q.width=q.height=q.id=q.w3c=q.src=null;for(var l in q){if(q[l]!==null){n+='<param name="'+l+'" value="'+q[l]+'" />'}}var o="";if(t){for(var m in t){if(t[m]!==null){o+=m+"="+(typeof t[m]=="object"?g(t[m]):t[m])+"&"}}o=o.substring(0,o.length-1);n+='<param name="flashvars" value=\''+o+"' />"}n+="</object>";return n}function d(m,p,l){var k=flashembed.getVersion();f(this,{getContainer:function(){return m},getConf:function(){return p},getVersion:function(){return k},getFlashvars:function(){return l},getApi:function(){return m.firstChild},getHTML:function(){return a(p,l)}});var q=p.version;var r=p.expressInstall;var o=!q||flashembed.isSupported(q);if(o){p.onFail=p.version=p.expressInstall=null;m.innerHTML=a(p,l)}else{if(q&&r&&flashembed.isSupported([6,65])){f(p,{src:r});l={MMredirectURL:location.href,MMplayerType:"PlugIn",MMdoctitle:document.title};m.innerHTML=a(p,l)}else{if(m.innerHTML.replace(/\s/g,"")!==""){}else{m.innerHTML="<h2>Flash version "+q+" or greater is required</h2><h3>"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"</h3>"+(m.tagName=="A"?"<p>Click here to download latest version</p>":"<p>Download latest version from <a href='http://www.adobe.com/go/getflashplayer'>here</a></p>");if(m.tagName=="A"){m.onclick=function(){location.href="http://www.adobe.com/go/getflashplayer"}}}}}if(!o&&p.onFail){var n=p.onFail.call(this);if(typeof n=="string"){m.innerHTML=n}}if(document.all){window[p.id]=document.getElementById(p.id)}}window.flashembed=function(l,m,k){if(typeof l=="string"){var n=document.getElementById(l);if(n){l=n}else{c(function(){flashembed(l,m,k)});return}}if(!l){return}if(typeof m=="string"){m={src:m}}var o=f({},i);f(o,m);return new d(l,o,k)};f(window.flashembed,{getVersion:function(){var m=[0,0];if(navigator.plugins&&typeof navigator.plugins["Shockwave Flash"]=="object"){var l=navigator.plugins["Shockwave Flash"].description;if(typeof l!="undefined"){l=l.replace(/^.*\s+(\S+\s+\S+$)/,"$1");var n=parseInt(l.replace(/^(.*)\..*$/,"$1"),10);var r=/r/.test(l)?parseInt(l.replace(/^.*r(.*)$/,"$1"),10):0;m=[n,r]}}else{if(window.ActiveXObject){try{var p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7")}catch(q){try{p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");m=[6,0];p.AllowScriptAccess="always"}catch(k){if(m[0]==6){return m}}try{p=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(o){}}if(typeof p=="object"){l=p.GetVariable("$version");if(typeof l!="undefined"){l=l.replace(/^\S+\s+(.*)$/,"$1").split(",");m=[parseInt(l[0],10),parseInt(l[2],10)]}}}}return m},isSupported:function(k){var m=flashembed.getVersion();var l=(m[0]>k[0])||(m[0]==k[0]&&m[1]>=k[1]);return l},domReady:c,asString:g,getHTML:a});if(e){jQuery.fn.flashembed=function(l,k){var m=null;this.each(function(){m=flashembed(this,l,k)});return l.api===false?this:m}}})();
\ No newline at end of file
diff --git a/upload/public/flowplayer/example/index.html b/upload/public/flowplayer/example/index.html
index 661b3349..61c9dae3 100644
--- a/upload/public/flowplayer/example/index.html
+++ b/upload/public/flowplayer/example/index.html
@@ -7,7 +7,7 @@
 		include flowplayer JavaScript file that does  
 		Flash embedding and provides the Flowplayer API.
 	-->
-	<script type="text/javascript" src="flowplayer-3.2.4.min.js"></script>
+	<script type="text/javascript" src="flowplayer-3.2.6.min.js"></script>
 	
 	<!-- some minimal styling, can be removed -->
 	<link rel="stylesheet" type="text/css" href="style.css">
@@ -25,14 +25,14 @@
 		
 		<!-- this A tag is where your Flowplayer will be placed. it can be anywhere -->
 		<a  
-			 href="http://e1h13.simplecdn.net/flowplayer/flowplayer.flv"  
+			 href="http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv"
 			 style="display:block;width:520px;height:330px"  
 			 id="player"> 
 		</a> 
 	
 		<!-- this will install flowplayer inside previous A- tag. -->
 		<script>
-			flowplayer("player", "../flowplayer-3.2.4.swf");
+			flowplayer("player", "../flowplayer-3.2.7.swf");
 		</script>
 	
 		
diff --git a/upload/public/flowplayer/flowplayer-3.2.4.swf b/upload/public/flowplayer/flowplayer-3.2.4.swf
deleted file mode 100644
index d8c5ce90..00000000
Binary files a/upload/public/flowplayer/flowplayer-3.2.4.swf and /dev/null differ
diff --git a/upload/public/flowplayer/flowplayer-3.2.7.swf b/upload/public/flowplayer/flowplayer-3.2.7.swf
new file mode 100644
index 00000000..20a41193
Binary files /dev/null and b/upload/public/flowplayer/flowplayer-3.2.7.swf differ
diff --git a/upload/public/flowplayer/flowplayer.controls-3.2.2.swf b/upload/public/flowplayer/flowplayer.controls-3.2.2.swf
deleted file mode 100644
index 3f814c07..00000000
Binary files a/upload/public/flowplayer/flowplayer.controls-3.2.2.swf and /dev/null differ
diff --git a/upload/public/flowplayer/flowplayer.controls-3.2.5.swf b/upload/public/flowplayer/flowplayer.controls-3.2.5.swf
new file mode 100644
index 00000000..5507a531
Binary files /dev/null and b/upload/public/flowplayer/flowplayer.controls-3.2.5.swf differ
diff --git a/upload/public/index.html b/upload/public/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/index.html
+++ b/upload/public/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/calendar_date_select.js b/upload/public/js/3rd_party/calendar_date_select/calendar_date_select.js
index fac73af9..9ac3c78e 100644
--- a/upload/public/js/3rd_party/calendar_date_select/calendar_date_select.js
+++ b/upload/public/js/3rd_party/calendar_date_select/calendar_date_select.js
@@ -1,4 +1,4 @@
-// CalendarDateSelect version 1.10.11 - a prototype based date picker
+// CalendarDateSelect version 1.16.3 - a prototype based date picker
 // Questions, comments, bugs? - see the project page: http://code.google.com/p/calendardateselect
 if (typeof Prototype == 'undefined') alert("CalendarDateSelect ошибка: Кла��-прототип не найден. Пожалуй�та убедите�ь, что ваше приложение подключает prototype.js (.g. <%= javascript_include_tag :defaults %>) *перед* подключен calendar_date_select.js (.g. <%= calendar_date_select_includes %>).");
 if (Prototype.Version < "1.6") alert("Требует�� кла��-прототип 1.6.0.  Е�ли и�пользуют�� ранние вер�ии кла��а- прототипа, и�пользуйте calendar_date_select вер�ии 1.8.3");
@@ -15,9 +15,8 @@ Element.addMethods({
 Element.buildAndAppend = function(type, options, style)
 {
   var e = $(document.createElement(type));
-  $H(options).each(function(pair) { eval("e." + pair.key + " = pair.value" ); });
-  if (style) 
-    $H(style).each(function(pair) { eval("e.style." + pair.key + " = pair.value" ); });
+  $H(options).each(function(pair) { e[pair.key] = pair.value });
+  if (style) e.setStyle(style);
   return e;
 };
 nil = null;
@@ -55,7 +54,8 @@ window.f_scrollTop = function() { return ([window.pageYOffset ? window.pageYOffs
 _translations = {
   "OK": "OK",
   "Now": "Сейча�",
-  "Today": "Сегодн�"
+  "Today": "Сегодн�",
+  "Clear": "Очи�тить"
 }
 SelectBox = Class.create();
 SelectBox.prototype = {
@@ -90,12 +90,26 @@ CalendarDateSelect.prototype = {
       popup: nil,
       time: false,
       buttons: true,
+      clear_button: true,
       year_range: 10,
       close_on_click: nil,
       minute_interval: 5,
       popup_by: this.target_element,
       month_year: "dropdowns",
-      onchange: this.target_element.onchange,
+      onchange: function(target_element)
+      { return function()
+        { if(target_element.dispatchEvent)
+          { var event=document.createEvent('HTMLEvents');
+            event.initEvent('change', true, true);
+            target_element.dispatchEvent(event);
+          }
+          else
+          { var event=document.createEventObject();
+            event.type='onChange';
+            target_element.fireEvent('onChange', event);
+          }
+        }; 
+      }(this.target_element),
       valid_date_check: nil
     }).merge(options || {});
     this.use_time = this.options.get("time");
@@ -231,7 +245,7 @@ CalendarDateSelect.prototype = {
           onclick: function() {this.today(false); return false;}.bindAsEventListener(this)
         });
       
-      if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"})
+      if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
       
       if (this.options.get("time")) b = buttons_div.build("a", {
         innerHTML: _translations["Now"],
@@ -239,11 +253,15 @@ CalendarDateSelect.prototype = {
         onclick: function() {this.today(true); return false}.bindAsEventListener(this)
       });
       
-      if (!this.options.get("embedded"))
+      if (!this.options.get("embedded") && !this.closeOnClick())
       {
-        buttons_div.build("span", {innerHTML: "&#160;"});
+        buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
         buttons_div.build("a", { innerHTML: _translations["OK"], href: "#", onclick: function() {this.close(); return false;}.bindAsEventListener(this) });
       }
+      if (this.options.get('clear_button')) {
+        buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
+        buttons_div.build("a", { innerHTML: _translations["Clear"], href: "#", onclick: function() {this.clearDate(); if (!this.options.get("embedded")) this.close(); return false;}.bindAsEventListener(this) });
+      }
     }
   },
   refresh: function ()
@@ -299,7 +317,7 @@ CalendarDateSelect.prototype = {
       this.year_select.setValue(y);
       
     } else {
-      this.month_year_label.update( Date.months[m] + " " + y.toString()  );
+      this.month_year_label.update().insert(Date.months[m] + " " + y.toString());
     }
   },
   populateYearRange: function() {
@@ -316,7 +334,7 @@ CalendarDateSelect.prototype = {
   validYear: function(year) { if (this.flexibleYearRange()) { return true;} else { return this.yearRange().include(year);}  },
   dayHover: function(element) {
     var hover_date = new Date(this.selected_date);
-    hover_date.setYear(element.year); hover_date.setMonth(element.month); hover_date.setDate(element.day);
+    hover_date.setFullYear(element.year, element.month, element.day);
     this.updateFooter(hover_date.toFormattedString(this.use_time));
   },
   dayHoverOut: function(element) { this.updateFooter(); },
@@ -336,23 +354,34 @@ CalendarDateSelect.prototype = {
   parseDate: function()
   {
     var value = $F(this.target_element).strip()
-    this.selection_made = (value != "");
+    var default_time = this.options.get("default_time");
+    this.selection_made = (value != "" || default_time);
     this.date = value=="" ? NaN : Date.parseFormattedString(this.options.get("date") || value);
-    if (isNaN(this.date)) this.date = new Date();
+    if (isNaN(this.date) && !default_time)
+        this.date = new Date();
+    else if (isNaN(this.date) && default_time)
+        this.date = (Object.prototype.toString.apply(default_time) === '[object Function]') ? default_time() : default_time;
+
     if (!this.validYear(this.date.getFullYear())) this.date.setYear( (this.date.getFullYear() < this.yearRange().start) ? this.yearRange().start : this.yearRange().end);
     this.selected_date = new Date(this.date);
     this.use_time = /[0-9]:[0-9]{2}/.exec(value) ? true : false;
     this.date.setDate(1);
   },
   updateFooter:function(text) { if (!text) text = this.dateString(); this.footer_div.purgeChildren(); this.footer_div.build("span", {innerHTML: text }); },
+  clearDate:function() {
+    if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
+    var last_value = this.target_element.value;
+    this.target_element.value = "";
+    this.clearSelectedClass();
+    this.updateFooter('&#160;');
+    if (last_value!=this.target_element.value) this.callback("onchange");
+  },
   updateSelectedDate:function(partsOrElement, via_click) {
     var parts = $H(partsOrElement);
     if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
     if (parts.get("day")) {
       var t_selected_date = this.selected_date, vdc = this.options.get("valid_date_check");
-      for (var x = 0; x<=3; x++) t_selected_date.setDate(parts.get("day"));
-      t_selected_date.setYear(parts.get("year"));
-      t_selected_date.setMonth(parts.get("month"));
+      t_selected_date.setFullYear(parts.get("year"), parts.get("month"), parts.get("day"));
       
       if (vdc && ! vdc(t_selected_date.stripTime())) { return false; }
       this.selected_date = t_selected_date;
@@ -425,7 +454,7 @@ CalendarDateSelect.prototype = {
     Event.stopObserving(document, "keypress", this.keyPress_handler);
     this.calendar_div.remove(); this.closed = true;
     if (this.iframe) this.iframe.remove();
-    if (this.target_element.type!="hidden") this.target_element.focus();
+    if (this.target_element.type != "hidden" && ! this.target_element.disabled) this.target_element.focus();
     this.callback("after_close");
   },
   closeIfClickedOut: function(e) {
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_american.js b/upload/public/js/3rd_party/calendar_date_select/format_american.js
index cbaca01a..13e7bddd 100644
--- a/upload/public/js/3rd_party/calendar_date_select/format_american.js
+++ b/upload/public/js/3rd_party/calendar_date_select/format_american.js
@@ -16,6 +16,7 @@ Date.parseFormattedString = function (string) {
   // 1/1/1111 01:11pm
   // 1/1/1111 1:11pm
   var regexp = "(([0-1]?[0-9])\/[0-3]?[0-9]\/[0-9]{4}) *([0-9]{1,2}(:[0-9]{2})? *(am|pm))?";
+  string = string.strip();
   var d = string.match(new RegExp(regexp, "i"));
   if (d==null) {
     return Date.parse(string); // Give javascript a chance to parse it.
@@ -24,7 +25,7 @@ Date.parseFormattedString = function (string) {
   mdy = d[1].split('/');
   hrs = 0;
   mts = 0;
-  if(d[3] != null) {
+  if(d[3] != null && d[3].strip() != "") {
     hrs = parseInt(d[3].split('')[0], 10);
     if(d[5].toLowerCase() == 'pm') { hrs += 12; } // Add 12 more to hrs
     mts = d[4].split(':')[1];
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_danish.js b/upload/public/js/3rd_party/calendar_date_select/format_danish.js
new file mode 100644
index 00000000..5da7c2c3
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/format_danish.js
@@ -0,0 +1,31 @@
+// Formats date and time as "2000/01/20 17:00"
+Date.prototype.toFormattedString = function(include_time){
+  str = Date.padded2(this.getDate()) + "/" + Date.padded2(this.getMonth() + 1) + "/" + this.getFullYear();
+
+  if (include_time) {
+    str += " " + this.getHours() + ":" + this.getPaddedMinutes();
+  }
+  return str;
+}
+
+// Parses date and time as "2000/01/20 17:00"
+Date.parseFormattedString = function(string) {
+  var regexp = "([0-9]{2})/([0-9]{2})/([0-9]{4})" +
+      "( ([0-9]{1,2}):([0-9]{2})(:([0-9]{2})(.([0-9]{3}))?)?" +
+      ")?";
+  var d = string.match(new RegExp(regexp, "i"));
+  if (d==null) return Date.parse(string); // at least give javascript a crack at it.
+  var offset = 0;
+  var date = new Date(d[3], 0, 1);
+  if (d[2]) { date.setMonth(d[2] - 1); }
+  if (d[1]) { date.setDate(d[1]); }
+  if (d[4]) {
+    hours = parseInt(d[5], 10);
+    date.setHours(hours);
+  }
+  if (d[6]) { date.setMinutes(d[6]); }
+  //if (d[8]) { date.setSeconds(d[7]); }
+  //if (d[9]) { date.setMiliseconds(Number("0." + d[8]) * 1000); }
+
+  return date;
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_finnish.js b/upload/public/js/3rd_party/calendar_date_select/format_finnish.js
index ef86c26b..520390f0 100644
--- a/upload/public/js/3rd_party/calendar_date_select/format_finnish.js
+++ b/upload/public/js/3rd_party/calendar_date_select/format_finnish.js
@@ -8,10 +8,18 @@ Date.prototype.toFormattedString = function(include_time){
   return str;
 }
 Date.parseFormattedString = function (string) {
-  var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
+  var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{2,4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
   var d = string.match(new RegExp(regexp, "i"));
   if (d==null) return Date.parse(string); // at least give javascript a crack at it.
   var offset = 0;
+  if (d[5] && d[5].length == 2) {
+    // we got only two digits for the year...
+    d[5] = Number(d[5]);
+    if (d[5] > 30)
+      d[5] += 1900;
+    else
+      d[5] += 2000;
+  }
   var date = new Date(d[5], 0, 1);
   if (d[3]) { date.setMonth(d[3] - 1); }
   if (d[5]) { date.setDate(d[1]); }
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_hyphen_ampm.js b/upload/public/js/3rd_party/calendar_date_select/format_hyphen_ampm.js
index b584e658..ee7ab1e5 100644
--- a/upload/public/js/3rd_party/calendar_date_select/format_hyphen_ampm.js
+++ b/upload/public/js/3rd_party/calendar_date_select/format_hyphen_ampm.js
@@ -18,11 +18,12 @@ Date.parseFormattedString = function (string) {
   if (d[7]) {
     hours = parseInt(d[7], 10);
     offset=0;
-    is_pm = (d[9].toLowerCase()=="pm")
-    if (is_pm && hours <= 11) hours+=12;
-    if (!is_pm && hours == 12) hours=0;
+    if (d[9]) {
+        is_pm = (d[9].toLowerCase()=="pm");
+        if (is_pm && hours <= 11) hours+=12;
+        if (!is_pm && hours == 12) hours=0;
+    }
     date.setHours(hours); 
-    
   }
   if (d[8]) { date.setMinutes(d[8]); }
   if (d[10]) { date.setSeconds(d[10]); }
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_iso_date.js b/upload/public/js/3rd_party/calendar_date_select/format_iso_date.js
index ea7aa735..6f8a5481 100644
--- a/upload/public/js/3rd_party/calendar_date_select/format_iso_date.js
+++ b/upload/public/js/3rd_party/calendar_date_select/format_iso_date.js
@@ -1,46 +1,29 @@
+// International date format (ISO 8601): yyyy-mm-dd
+// Including time (no seconds): yyyy-mm-dd HH:MM
 Date.prototype.toFormattedString = function(include_time) {
-	var hour;
+        var hour;
     var str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate());
     if (include_time) {
-        hour = this.getHours();
-        str += " " + this.getHours() + ":" + this.getPaddedMinutes();
+        hour = Date.padded2(this.getHours());
+        str += " " + hour + ":" + this.getPaddedMinutes();
     }
     return str;
 };
 
+// TODO: take care of timezone offsets
+// as the timezone is not displayed in the input,
+// this could be tricky (or just unnessesary)
 Date.parseFormattedString = function (string) {
+   var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" +
+                "([T| ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?" +
+                "(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?";
+   var d = string.match(new RegExp(regexp));
 
-    var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" + 
-        "( ([0-9]{1,2}):([0-9]{2})?" +
-        "?)?)?)?"; 
+   var date = new Date(d[1], 0, 1);
 
-    var d = string.match(new RegExp(regexp, "i"));
-    if (d === null) {
-        return Date.parse(string); // at least give javascript a crack at it.
-    }
-    var offset = 0; 
-    var date = new Date(d[1], 0, 1); 
-    if (d[3]) {
-        date.setMonth(d[3] - 1);
-    } 
-    if (d[5]) {
-        date.setDate(d[5]);
-    } 
-    if (d[7]) {
-        date.setHours(d[7]);
-    } 
-    if (d[8]) {
-        date.setMinutes(d[8]);
-    } 
-    if (d[0]) {
-        date.setSeconds(d[0]);
-    } 
-    if (d[2]) {
-        date.setMilliseconds(Number("0." + d[2]));
-    } 
-    if (d[4]) {
-        offset = (Number(d[6])) + Number(d[8]);
-        offset = ((d[5] == '-') ? 1 : -1); 
-    } 
-    return date; 
-};
+   if (d[3]) { date.setMonth(d[3] - 1); }
+   if (d[5]) { date.setDate(d[5]); }
+   if (d[7]) { date.setHours(d[7]); }
+   if (d[8]) { date.setMinutes(d[8]); }
+   return date;
+};
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/format_italian.js b/upload/public/js/3rd_party/calendar_date_select/format_italian.js
index 249fcb59..c60b6adc 100644
--- a/upload/public/js/3rd_party/calendar_date_select/format_italian.js
+++ b/upload/public/js/3rd_party/calendar_date_select/format_italian.js
@@ -3,7 +3,7 @@
 
 Date.prototype.toFormattedString = function(include_time){
   str = this.getDate() + "/" + (this.getMonth() + 1) + "/" + this.getFullYear();
-  if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() }
+  if (include_time) { str += " " + this.getHours() + ":" + this.getPaddedMinutes() }
   return str;
 }
 
diff --git a/upload/public/js/3rd_party/calendar_date_select/index.html b/upload/public/js/3rd_party/calendar_date_select/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/calendar_date_select/index.html
+++ b/upload/public/js/3rd_party/calendar_date_select/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/ar.js b/upload/public/js/3rd_party/calendar_date_select/locale/ar.js
new file mode 100644
index 00000000..22062766
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/ar.js
@@ -0,0 +1,10 @@
+Date.weekdays = ['سبت', 'أحد', 'إثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'];
+Date.months = ['كانون ثاني', 'شباط', 'آذار', 'نيسان', 'أيار', 'حزيران', 'تموز', 'آب', 'أيلول', 'تشرين أول', 'تشرين ثاني', 'كانون أول'];
+Date.first_day_of_week = 6;
+
+_translations = {
+  "OK": "ن�ذ",
+  "Now": "الآن",
+  "Today": "اليوم",
+  "Clear": "إلغاء"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/cs.js b/upload/public/js/3rd_party/calendar_date_select/locale/cs.js
new file mode 100644
index 00000000..34393b98
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/cs.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w("Po Út St Čt Pá So Ne");
+Date.months = $w("Leden Únor Březen Duben Květen Červen Červenec Srpen Září Říjen Listopad Prosinec" );
+
+Date.first_day_of_week = 1
+
+_translations = {
+    "OK": "OK",
+    "Now": "Te�",
+    "Today": "Dnes",
+    "Clear": "Smazat"
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/da.js b/upload/public/js/3rd_party/calendar_date_select/locale/da.js
new file mode 100644
index 00000000..ec70aca3
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/da.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('Ma Ti On To Fr Lø Sø');
+Date.months = $w('Januar Februar Marts April Maj Juni Juli August September Oktober November December');
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "Vælg",
+  "Now": "Nu",
+  "Today": "I dag",
+  "Clear": "Slet"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/de.js b/upload/public/js/3rd_party/calendar_date_select/locale/de.js
new file mode 100644
index 00000000..ff9d439b
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/de.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('Mo Di Mi Do Fr Sa So');
+Date.months = $w('Januar Februar März April Mai Juni Juli August September Oktober November Dezember');
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "OK",
+  "Now": "Jetzt",
+  "Today": "Heute",
+  "Clear": "Löschen"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/es.js b/upload/public/js/3rd_party/calendar_date_select/locale/es.js
new file mode 100644
index 00000000..b3fd5548
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/es.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w("L M X J V S D");
+Date.months = $w("Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre Noviembre Diciembre" );
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "Cancelar",
+  "Now": "Ahora",
+  "Clear": "Limpiar",
+  "Today": "Hoy"
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/fr.js b/upload/public/js/3rd_party/calendar_date_select/locale/fr.js
index 604060c8..78c604ef 100644
--- a/upload/public/js/3rd_party/calendar_date_select/locale/fr.js
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/fr.js
@@ -6,5 +6,6 @@ Date.first_day_of_week = 1;
 _translations = {
   "OK": "OK",
   "Now": "Maintenant",
-  "Today": "Aujourd'hui"
+  "Today": "Aujourd'hui",
+  "Clear": "Effacer",
 }
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/hu.js b/upload/public/js/3rd_party/calendar_date_select/locale/hu.js
new file mode 100644
index 00000000..89f11bc4
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/hu.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('h. k. sze. cs. p. szo. v.');
+Date.months = $w('január február március április május június július augusztus szeptember október november december');
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "OK",
+  "Now": "Most",
+  "Today": "Ma",
+  "Clear": "Bezárás"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/index.html b/upload/public/js/3rd_party/calendar_date_select/locale/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/calendar_date_select/locale/index.html
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/it.js b/upload/public/js/3rd_party/calendar_date_select/locale/it.js
new file mode 100644
index 00000000..6cd5f621
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/it.js
@@ -0,0 +1,9 @@
+Date.weekdays = $w('Lu Ma Me Gi Ve Sa Do');
+Date.months = $w('Gennaio Febbraio Marzo Aprile Maggio Giugno Luglio Agosto Settembre Ottobre Novembre Dicembre');
+Date.first_day_of_week = 1;
+_translations = {
+  "OK": "OK",
+  "Now": "Ora",
+  "Today": "Oggi",
+  "Clear": "Cancella"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/ja.js b/upload/public/js/3rd_party/calendar_date_select/locale/ja.js
new file mode 100644
index 00000000..8a3aaefb
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/ja.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('日 月 � 水 木 金 土');
+Date.months = $w('1月 2月 3月 4月 5月 6月 7月 8月 9月 10月 11月 12月');
+
+Date.first_day_of_week = 0
+
+_translations = {
+  "OK": "OK",
+  "Now": "�在",
+  "Today": "今日",
+  "Clear": "クリア"
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/nl.js b/upload/public/js/3rd_party/calendar_date_select/locale/nl.js
new file mode 100644
index 00000000..00f0f2ec
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/nl.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('Ma Di Wo Do Vr Za Zo');
+Date.months = $w('januari februari maart april mei juni juli augustus september oktober november december');
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "OK",
+  "Now": "Nu",
+  "Today": "Vandaag",
+  "Clear": "Wissen"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/pl.js b/upload/public/js/3rd_party/calendar_date_select/locale/pl.js
index af1b78a1..77bfb2c9 100644
--- a/upload/public/js/3rd_party/calendar_date_select/locale/pl.js
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/pl.js
@@ -6,5 +6,6 @@ Date.first_day_of_week = 1
 _translations = {
   "OK": "OK",
   "Now": "Teraz",
+  "Clear": "Wyczyść",
   "Today": "DziÅ›"
-}
\ No newline at end of file
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/pt.js b/upload/public/js/3rd_party/calendar_date_select/locale/pt.js
index ca2b52d3..30293b50 100644
--- a/upload/public/js/3rd_party/calendar_date_select/locale/pt.js
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/pt.js
@@ -1,10 +1,11 @@
 Date.weekdays = $w('D S T Q Q S S');
-Date.months = $w('Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Novembro Dezembro');
+Date.months = $w('Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro Novembro Dezembro');
 
 Date.first_day_of_week = 0
 
 _translations = {
   "OK": "OK",
   "Now": "Agora",
-  "Today": "Hoje"
-}
\ No newline at end of file
+  "Today": "Hoje",
+  "Clear": "Limpar"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/ru.js b/upload/public/js/3rd_party/calendar_date_select/locale/ru.js
new file mode 100644
index 00000000..8dc5c207
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/ru.js
@@ -0,0 +1,10 @@
+Date.weekdays = $w('Пн Вт Ср Чт Пт Сб В�');
+Date.months = $w('Январь Февраль Март �прель Май Июнь Июль �вгу�т Сент�брь Окт�брь �о�брь Декабрь');
+
+Date.first_day_of_week = 1
+
+_translations = {
+  "OK": "OK",
+  "Now": "Сейча�",
+  "Today": "Сегодн�"
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/sl.js b/upload/public/js/3rd_party/calendar_date_select/locale/sl.js
new file mode 100644
index 00000000..677d3521
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/sl.js
@@ -0,0 +1,11 @@
+Date.weekdays = $w('Po To Sr ÄŒe Pe So Ne');
+Date.months = $w('Januar Februar Marec April Maj Junij Julij Avgust September Oktober November December');
+
+Date.first_day_of_week = 1;
+
+_translations = {
+  "OK": "OK",
+  "Now": "Trenutno",
+  "Today": "Danes",
+  "Clear": "Pobriši"
+}
diff --git a/upload/public/js/3rd_party/calendar_date_select/locale/sv.js b/upload/public/js/3rd_party/calendar_date_select/locale/sv.js
new file mode 100644
index 00000000..096290ba
--- /dev/null
+++ b/upload/public/js/3rd_party/calendar_date_select/locale/sv.js
@@ -0,0 +1,9 @@
+Date.weekdays = $w('Må Ti On To Fr Lö Sö');
+Date.months = $w('Januari Februari Mars April Maj Juni Juli Augusti September Oktober November December');
+Date.first_day_of_week = 1;
+_translations = {
+  "OK": "OK",
+  "Now": "Nu",
+  "Today": "Idag",
+  "Clear": "Avbryt"
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/LICENSE.html b/upload/public/js/3rd_party/ckeditor/LICENSE.html
new file mode 100644
index 00000000..f7ba0679
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/LICENSE.html
@@ -0,0 +1,1334 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+== BEGIN TEXT ONLY VERSION ==
+
+Software License Agreement
+==========================
+
+CKEditor - The text editor for Internet - http://ckeditor.com
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your
+choice:
+
+ - GNU General Public License Version 2 or later (the "GPL")
+   http://www.gnu.org/licenses/gpl.html
+   (See Appendix A)
+
+ - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+   http://www.gnu.org/licenses/lgpl.html
+   (See Appendix B)
+
+ - Mozilla Public License Version 1.1 or later (the "MPL")
+   http://www.mozilla.org/MPL/MPL-1.1.html
+   (See Appendix C)
+
+You are not required to, but if you want to explicitly declare the
+license you have chosen to be bound to when using, reproducing,
+modifying and distributing this software, just include a text file
+titled "legal.txt" in your version of this software, indicating your
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
+
+Sources of Intellectual Property Included in CKEditor
+=====================================================
+
+Where not otherwise indicated, all CKEditor content is authored by
+CKSource engineers and consists of CKSource-owned intellectual
+property. In some specific instances, CKEditor will incorporate work
+done by developers outside of CKSource with their express permission.
+
+YUI Test: At _source/tests/yuitest.js can be found part of the source
+code of YUI, which is licensed under the terms of the BSD License
+(http://developer.yahoo.com/yui/license.txt). YUI is Copyright (C)
+2008, Yahoo! Inc.
+
+Trademarks
+==========
+
+CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
+and product names are trademarks, registered trademarks or service
+marks of their respective holders.
+
+Appendix A: The GPL License
+===========================
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software-to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix B: The LGPL License
+============================
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software-to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages-typically libraries-of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix C: The MPL License
+===========================
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ===============
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+== END TEXT ONLY VERSION ==
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>License - CKEditor</title>
+</head>
+<body>
+	<h1>
+		Software License Agreement
+	</h1>
+	<p>
+		<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
+			http://ckeditor.com</a><br />
+		Copyright &copy; 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+	</p>
+	<p>
+		Licensed under the terms of any of the following licenses at your choice:
+	</p>
+	<ul>
+		<li><a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> Version
+			2 or later (the "GPL");</li>
+		<li><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
+			Version 2.1 or later (the "LGPL");</li>
+		<li><a href="http://www.mozilla.org/MPL/MPL-1.1.html">Mozilla Public License</a> Version
+			1.1 or later (the "MPL").</li>
+	</ul>
+	<p>
+		You are not required to, but if you want to explicitly declare the license you have
+		chosen to be bound to when using, reproducing, modifying and distributing this software,
+		just include a text file titled "LEGAL" in your version of this software, indicating
+		your license choice. In any case, your choice will not restrict any recipient of
+		your version of this software to use, reproduce, modify and distribute this software
+		under any of the above licenses.
+	</p>
+	<h2>
+		Sources of Intellectual Property Included in CKEditor
+	</h2>
+	<p>
+		Where not otherwise indicated, all CKEditor content is authored by CKSource engineers
+		and consists of CKSource-owned intellectual property. In some specific instances,
+		CKEditor will incorporate work done by developers outside of CKSource with their
+		express permission.
+	</p>
+	<p>
+		<a href="http://developer.yahoo.com/yui/yuitest/">YUI Test</a>: At _source/tests/yuitest.js
+		can be found part of the source code of YUI, which is licensed under the terms of
+		the <a href="http://developer.yahoo.com/yui/license.txt">BSD License</a>. YUI is
+		Copyright &copy; 2008, Yahoo! Inc.
+	</p>
+	<h2>
+		Trademarks
+	</h2>
+	<p>
+		CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product
+		names are trademarks, registered trademarks or service marks of their respective
+		holders.
+	</p>
+</body>
+</html>
diff --git a/upload/public/js/3rd_party/ckeditor/ckeditor.js b/upload/public/js/3rd_party/ckeditor/ckeditor.js
new file mode 100644
index 00000000..7f696890
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/ckeditor.js
@@ -0,0 +1,141 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'B8DJ5M3',version:'3.6.2',revision:'7275',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);if(g>=0)f.listeners.splice(g,1);
+}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=d.iOS&&e>=534||!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
+if(d.quirks)d.cssClass+=' cke_browser_quirks';if(d.ie){d.cssClass+=' cke_browser_ie'+(d.version<7?'6':d.version>=8?document.documentMode:'7');if(d.quirks)d.cssClass+=' cke_browser_iequirks';}if(d.gecko&&e<10900)d.cssClass+=' cke_browser_gecko18';if(d.air)d.cssClass+=' cke_browser_air';return d;})();var b=a.env;var c=b.ie;if(a.status=='unloaded')(function(){a.event.implementOn(a);a.loadFullCore=function(){if(a.status!='basic_ready'){a.loadFullCore._load=1;return;}delete a.loadFullCore;var e=document.createElement('script');e.type='text/javascript';e.src=a.basePath+'ckeditor.js';document.getElementsByTagName('head')[0].appendChild(e);};a.loadFullCoreTimeout=0;a.replaceClass='ckeditor';a.replaceByClassEnabled=1;var d=function(e,f,g,h){if(b.isCompatible){if(a.loadFullCore)a.loadFullCore();var i=g(e,f,h);a.add(i);return i;}return null;};a.replace=function(e,f){return d(e,f,a.editor.replace);};a.appendTo=function(e,f,g){return d(e,f,a.editor.appendTo,g);};a.add=function(e){var f=this._.pending||(this._.pending=[]);f.push(e);};a.replaceAll=function(){var e=document.getElementsByTagName('textarea');for(var f=0;f<e.length;f++){var g=null,h=e[f];if(!h.name&&!h.id)continue;if(typeof arguments[0]=='string'){var i=new RegExp('(?:^|\\s)'+arguments[0]+'(?:$|\\s)');if(!i.test(h.className))continue;}else if(typeof arguments[0]=='function'){g={};if(arguments[0](h,g)===false)continue;}this.replace(h,g);}};(function(){var e=function(){var f=a.loadFullCore,g=a.loadFullCoreTimeout;if(a.replaceByClassEnabled)a.replaceAll(a.replaceClass);a.status='basic_ready';if(f&&f._load)f();else if(g)setTimeout(function(){if(a.loadFullCore)a.loadFullCore();},g*1000);};if(window.addEventListener)window.addEventListener('load',e,false);else if(window.attachEvent)window.attachEvent('onload',e);})();a.status='basic_loaded';})();a.dom={};var d=a.dom;(function(){var e=[];a.on('reset',function(){e=[];});a.tools={arrayCompare:function(f,g){if(!f&&!g)return true;if(!f||!g||f.length!=g.length)return false;for(var h=0;h<f.length;h++){if(f[h]!=g[h])return false;}return true;},clone:function(f){var g;if(f&&f instanceof Array){g=[];for(var h=0;h<f.length;h++)g[h]=this.clone(f[h]);return g;}if(f===null||typeof f!='object'||f instanceof String||f instanceof Number||f instanceof Boolean||f instanceof Date||f instanceof RegExp)return f;g=new f.constructor();for(var i in f){var j=f[i];g[i]=this.clone(j);}return g;},capitalize:function(f){return f.charAt(0).toUpperCase()+f.substring(1).toLowerCase();},extend:function(f){var g=arguments.length,h,i;
+if(typeof (h=arguments[g-1])=='boolean')g--;else if(typeof (h=arguments[g-2])=='boolean'){i=arguments[g-1];g-=2;}for(var j=1;j<g;j++){var k=arguments[j];for(var l in k){if(h===true||f[l]==undefined)if(!i||l in i)f[l]=k[l];}}return f;},prototypedCopy:function(f){var g=function(){};g.prototype=f;return new g();},isArray:function(f){return!!f&&f instanceof Array;},isEmpty:function(f){for(var g in f){if(f.hasOwnProperty(g))return false;}return true;},cssStyleToDomStyle:(function(){var f=document.createElement('div').style,g=typeof f.cssFloat!='undefined'?'cssFloat':typeof f.styleFloat!='undefined'?'styleFloat':'float';return function(h){if(h=='float')return g;else return h.replace(/-./g,function(i){return i.substr(1).toUpperCase();});};})(),buildStyleHtml:function(f){f=[].concat(f);var g,h=[];for(var i=0;i<f.length;i++){g=f[i];if(/@import|[{}]/.test(g))h.push('<style>'+g+'</style>');else h.push('<link type="text/css" rel=stylesheet href="'+g+'">');}return h.join('');},htmlEncode:function(f){var g=function(k){var l=new d.element('span');l.setText(k);return l.getHtml();},h=g('\n').toLowerCase()=='<br>'?function(k){return g(k).replace(/<br>/gi,'\n');}:g,i=g('>')=='>'?function(k){return h(k).replace(/>/g,'&gt;');}:h,j=g('  ')=='&nbsp; '?function(k){return i(k).replace(/&nbsp;/g,' ');}:i;this.htmlEncode=j;return this.htmlEncode(f);},htmlEncodeAttr:function(f){return f.replace(/"/g,'&quot;').replace(/</g,'&lt;').replace(/>/g,'&gt;');},getNextNumber:(function(){var f=0;return function(){return++f;};})(),getNextId:function(){return 'cke_'+this.getNextNumber();},override:function(f,g){return g(f);},setTimeout:function(f,g,h,i,j){if(!j)j=window;if(!h)h=j;return j.setTimeout(function(){if(i)f.apply(h,[].concat(i));else f.apply(h);},g||0);},trim:(function(){var f=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(g){return g.replace(f,'');};})(),ltrim:(function(){var f=/^[ \t\n\r]+/g;return function(g){return g.replace(f,'');};})(),rtrim:(function(){var f=/[ \t\n\r]+$/g;return function(g){return g.replace(f,'');};})(),indexOf:Array.prototype.indexOf?function(f,g){return f.indexOf(g);}:function(f,g){for(var h=0,i=f.length;h<i;h++){if(f[h]===g)return h;}return-1;},bind:function(f,g){return function(){return f.apply(g,arguments);};},createClass:function(f){var g=f.$,h=f.base,i=f.privates||f._,j=f.proto,k=f.statics;if(i){var l=g;g=function(){var p=this;var m=p._||(p._={});for(var n in i){var o=i[n];m[n]=typeof o=='function'?a.tools.bind(o,p):o;}l.apply(p,arguments);};}if(h){g.prototype=this.prototypedCopy(h.prototype);
+g.prototype['constructor']=g;g.prototype.base=function(){this.base=h.prototype.base;h.apply(this,arguments);this.base=arguments.callee;};}if(j)this.extend(g.prototype,j,true);if(k)this.extend(g,k,true);return g;},addFunction:function(f,g){return e.push(function(){return f.apply(g||this,arguments);})-1;},removeFunction:function(f){e[f]=null;},callFunction:function(f){var g=e[f];return g&&g.apply(window,Array.prototype.slice.call(arguments,1));},cssLength:(function(){return function(f){return f+(!f||isNaN(Number(f))?'':'px');};})(),convertToPx:(function(){var f;return function(g){if(!f){f=d.element.createFromHtml('<div style="position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"></div>',a.document);a.document.getBody().append(f);}if(!/%$/.test(g)){f.setStyle('width',g);return f.$.clientWidth;}return g;};})(),repeat:function(f,g){return new Array(g+1).join(f);},tryThese:function(){var f;for(var g=0,h=arguments.length;g<h;g++){var i=arguments[g];try{f=i();break;}catch(j){}}return f;},genKey:function(){return Array.prototype.slice.call(arguments).join('-');}};})();var e=a.tools;a.dtd=(function(){var f=e.extend,g={isindex:1,fieldset:1},h={input:1,button:1,select:1,textarea:1,label:1},i=f({a:1},h),j=f({iframe:1},i),k={hr:1,ul:1,menu:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1},l={ins:1,del:1,script:1,style:1},m=f({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1,wbr:1},l),n=f({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1,mark:1},m),o=f({p:1},n),p=f({iframe:1},n,h),q={img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},r=f({a:1},p),s={tr:1},t={'#':1},u=f({param:1},q),v=f({form:1},g,j,k,o),w={li:1},x={style:1,script:1},y={base:1,link:1,meta:1,title:1},z=f(y,x),A={head:1,body:1},B={html:1},C={address:1,blockquote:1,center:1,dir:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};
+return{$nonBodyContent:f(B,A,y),$block:C,$blockLimit:{body:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,td:1,th:1,caption:1,form:1},$inline:r,$body:f({script:1,style:1},C),$cdata:{script:1,style:1},$empty:{area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1,wbr:1},$listItem:{dd:1,dt:1,li:1},$list:{ul:1,ol:1,dl:1},$nonEditable:{applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1,audio:1,video:1},$captionBlock:{caption:1,legend:1},$removeEmpty:{abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1,mark:1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},html:A,head:z,style:t,script:t,body:v,base:{},link:{},meta:{},title:t,col:{},tr:{td:1,th:1},img:{},colgroup:{col:1},noscript:v,td:v,br:{},wbr:{},th:v,center:v,kbd:r,button:f(o,k),basefont:{},h5:r,h4:r,samp:r,h6:r,ol:w,h1:r,h3:r,option:t,h2:r,form:f(g,j,k,o),select:{optgroup:1,option:1},font:r,ins:r,menu:w,abbr:r,label:r,table:{thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1},code:r,tfoot:s,cite:r,li:v,input:{},iframe:v,strong:r,textarea:t,noframes:v,big:r,small:r,span:r,hr:{},dt:r,sub:r,optgroup:{option:1},param:{},bdo:r,'var':r,div:v,object:u,sup:r,dd:v,strike:r,area:{},dir:w,map:f({area:1,form:1,p:1},g,l,k),applet:u,dl:{dt:1,dd:1},del:r,isindex:{},fieldset:f({legend:1},q),thead:s,ul:w,acronym:r,b:r,a:p,blockquote:v,caption:r,i:r,u:r,tbody:s,s:r,address:f(j,o),tt:r,legend:r,q:r,pre:f(m,i),p:r,em:r,dfn:r,section:v,header:v,footer:v,nav:v,article:v,aside:v,figure:v,dialog:v,hgroup:v,mark:r,time:r,meter:r,menu:r,command:r,keygen:r,output:r,progress:u,audio:u,video:u,details:u,datagrid:u,datalist:u};})();var f=a.dtd;d.event=function(g){this.$=g;};d.event.prototype={getKey:function(){return this.$.keyCode||this.$.which;},getKeystroke:function(){var h=this;var g=h.getKey();if(h.$.ctrlKey||h.$.metaKey)g+=1000;if(h.$.shiftKey)g+=2000;if(h.$.altKey)g+=4000;return g;},preventDefault:function(g){var h=this.$;if(h.preventDefault)h.preventDefault();else h.returnValue=false;if(g)this.stopPropagation();},stopPropagation:function(){var g=this.$;if(g.stopPropagation)g.stopPropagation();else g.cancelBubble=true;
+},getTarget:function(){var g=this.$.target||this.$.srcElement;return g?new d.node(g):null;}};a.CTRL=1114112;a.SHIFT=2228224;a.ALT=4456448;d.domObject=function(g){if(g)this.$=g;};d.domObject.prototype=(function(){var g=function(h,i){return function(j){if(typeof a!='undefined')h.fire(i,new d.event(j));};};return{getPrivate:function(){var h;if(!(h=this.getCustomData('_')))this.setCustomData('_',h={});return h;},on:function(h){var k=this;var i=k.getCustomData('_cke_nativeListeners');if(!i){i={};k.setCustomData('_cke_nativeListeners',i);}if(!i[h]){var j=i[h]=g(k,h);if(k.$.attachEvent)k.$.attachEvent('on'+h,j);else if(k.$.addEventListener)k.$.addEventListener(h,j,!!a.event.useCapture);}return a.event.prototype.on.apply(k,arguments);},removeListener:function(h){var k=this;a.event.prototype.removeListener.apply(k,arguments);if(!k.hasListeners(h)){var i=k.getCustomData('_cke_nativeListeners'),j=i&&i[h];if(j){if(k.$.detachEvent)k.$.detachEvent('on'+h,j);else if(k.$.removeEventListener)k.$.removeEventListener(h,j,false);delete i[h];}}},removeAllListeners:function(){var k=this;var h=k.getCustomData('_cke_nativeListeners');for(var i in h){var j=h[i];if(k.$.detachEvent)k.$.detachEvent('on'+i,j);else if(k.$.removeEventListener)k.$.removeEventListener(i,j,false);delete h[i];}}};})();(function(g){var h={};a.on('reset',function(){h={};});g.equals=function(i){return i&&i.$===this.$;};g.setCustomData=function(i,j){var k=this.getUniqueId(),l=h[k]||(h[k]={});l[i]=j;return this;};g.getCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j];return k&&k[i];};g.removeCustomData=function(i){var j=this.$['data-cke-expando'],k=j&&h[j],l=k&&k[i];if(typeof l!='undefined')delete k[i];return l||null;};g.clearCustomData=function(){this.removeAllListeners();var i=this.$['data-cke-expando'];i&&delete h[i];};g.getUniqueId=function(){return this.$['data-cke-expando']||(this.$['data-cke-expando']=e.getNextNumber());};a.event.implementOn(g);})(d.domObject.prototype);d.window=function(g){d.domObject.call(this,g);};d.window.prototype=new d.domObject();e.extend(d.window.prototype,{focus:function(){if(b.webkit&&this.$.parent)this.$.parent.focus();this.$.focus();},getViewPaneSize:function(){var g=this.$.document,h=g.compatMode=='CSS1Compat';return{width:(h?g.documentElement.clientWidth:g.body.clientWidth)||0,height:(h?g.documentElement.clientHeight:g.body.clientHeight)||0};},getScrollPosition:function(){var g=this.$;if('pageXOffset' in g)return{x:g.pageXOffset||0,y:g.pageYOffset||0};else{var h=g.document;
+return{x:h.documentElement.scrollLeft||h.body.scrollLeft||0,y:h.documentElement.scrollTop||h.body.scrollTop||0};}}});d.document=function(g){d.domObject.call(this,g);};var g=d.document;g.prototype=new d.domObject();e.extend(g.prototype,{appendStyleSheet:function(h){if(this.$.createStyleSheet)this.$.createStyleSheet(h);else{var i=new d.element('link');i.setAttributes({rel:'stylesheet',type:'text/css',href:h});this.getHead().append(i);}},appendStyleText:function(h){var k=this;if(k.$.createStyleSheet){var i=k.$.createStyleSheet('');i.cssText=h;}else{var j=new d.element('style',k);j.append(new d.text(h,k));k.getHead().append(j);}},createElement:function(h,i){var j=new d.element(h,this);if(i){if(i.attributes)j.setAttributes(i.attributes);if(i.styles)j.setStyles(i.styles);}return j;},createText:function(h){return new d.text(h,this);},focus:function(){this.getWindow().focus();},getById:function(h){var i=this.$.getElementById(h);return i?new d.element(i):null;},getByAddress:function(h,i){var j=this.$.documentElement;for(var k=0;j&&k<h.length;k++){var l=h[k];if(!i){j=j.childNodes[l];continue;}var m=-1;for(var n=0;n<j.childNodes.length;n++){var o=j.childNodes[n];if(i===true&&o.nodeType==3&&o.previousSibling&&o.previousSibling.nodeType==3)continue;m++;if(m==l){j=o;break;}}}return j?new d.node(j):null;},getElementsByTag:function(h,i){if(!(c&&!(document.documentMode>8))&&i)h=i+':'+h;return new d.nodeList(this.$.getElementsByTagName(h));},getHead:function(){var h=this.$.getElementsByTagName('head')[0];if(!h)h=this.getDocumentElement().append(new d.element('head'),true);else h=new d.element(h);return(this.getHead=function(){return h;})();},getBody:function(){var h=new d.element(this.$.body);return(this.getBody=function(){return h;})();},getDocumentElement:function(){var h=new d.element(this.$.documentElement);return(this.getDocumentElement=function(){return h;})();},getWindow:function(){var h=new d.window(this.$.parentWindow||this.$.defaultView);return(this.getWindow=function(){return h;})();},write:function(h){var i=this;i.$.open('text/html','replace');b.isCustomDomain()&&(i.$.domain=document.domain);i.$.write(h);i.$.close();}});d.node=function(h){if(h){switch(h.nodeType){case 9:return new g(h);case 1:return new d.element(h);case 3:return new d.text(h);}d.domObject.call(this,h);}return this;};d.node.prototype=new d.domObject();a.NODE_ELEMENT=1;a.NODE_DOCUMENT=9;a.NODE_TEXT=3;a.NODE_COMMENT=8;a.NODE_DOCUMENT_FRAGMENT=11;a.POSITION_IDENTICAL=0;a.POSITION_DISCONNECTED=1;a.POSITION_FOLLOWING=2;
+a.POSITION_PRECEDING=4;a.POSITION_IS_CONTAINED=8;a.POSITION_CONTAINS=16;e.extend(d.node.prototype,{appendTo:function(h,i){h.append(this,i);return h;},clone:function(h,i){var j=this.$.cloneNode(h),k=function(l){if(l.nodeType!=1)return;if(!i)l.removeAttribute('id',false);l.removeAttribute('data-cke-expando',false);if(h){var m=l.childNodes;for(var n=0;n<m.length;n++)k(m[n]);}};k(j);return new d.node(j);},hasPrevious:function(){return!!this.$.previousSibling;},hasNext:function(){return!!this.$.nextSibling;},insertAfter:function(h){h.$.parentNode.insertBefore(this.$,h.$.nextSibling);return h;},insertBefore:function(h){h.$.parentNode.insertBefore(this.$,h.$);return h;},insertBeforeMe:function(h){this.$.parentNode.insertBefore(h.$,this.$);return h;},getAddress:function(h){var i=[],j=this.getDocument().$.documentElement,k=this.$;while(k&&k!=j){var l=k.parentNode;if(l)i.unshift(this.getIndex.call({$:k},h));k=l;}return i;},getDocument:function(){return new g(this.$.ownerDocument||this.$.parentNode.ownerDocument);},getIndex:function(h){var i=this.$,j=0;while(i=i.previousSibling){if(h&&i.nodeType==3&&(!i.nodeValue.length||i.previousSibling&&i.previousSibling.nodeType==3))continue;j++;}return j;},getNextSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getFirst&&this.getFirst(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getNext();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getNext();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&i!=l.type)return l.getNextSourceNode(false,i,j);return l;},getPreviousSourceNode:function(h,i,j){if(j&&!j.call){var k=j;j=function(n){return!n.equals(k);};}var l=!h&&this.getLast&&this.getLast(),m;if(!l){if(this.type==1&&j&&j(this,true)===false)return null;l=this.getPrevious();}while(!l&&(m=(m||this).getParent())){if(j&&j(m,true)===false)return null;l=m.getPrevious();}if(!l)return null;if(j&&j(l)===false)return null;if(i&&l.type!=i)return l.getPreviousSourceNode(false,i,j);return l;},getPrevious:function(h){var i=this.$,j;do{i=i.previousSibling;j=i&&new d.node(i);}while(j&&h&&!h(j))return j;},getNext:function(h){var i=this.$,j;do{i=i.nextSibling;j=i&&new d.node(i);}while(j&&h&&!h(j))return j;},getParent:function(){var h=this.$.parentNode;return h&&h.nodeType==1?new d.node(h):null;},getParents:function(h){var i=this,j=[];do j[h?'push':'unshift'](i);while(i=i.getParent())return j;},getCommonAncestor:function(h){var j=this;if(h.equals(j))return j;
+if(h.contains&&h.contains(j))return h;var i=j.contains?j:j.getParent();do{if(i.contains(h))return i;}while(i=i.getParent())return null;},getPosition:function(h){var i=this.$,j=h.$;if(i.compareDocumentPosition)return i.compareDocumentPosition(j);if(i==j)return 0;if(this.type==1&&h.type==1){if(i.contains){if(i.contains(j))return 16+4;if(j.contains(i))return 8+2;}if('sourceIndex' in i)return i.sourceIndex<0||j.sourceIndex<0?1:i.sourceIndex<j.sourceIndex?4:2;}var k=this.getAddress(),l=h.getAddress(),m=Math.min(k.length,l.length);for(var n=0;n<=m-1;n++){if(k[n]!=l[n]){if(n<m)return k[n]<l[n]?4:2;break;}}return k.length<l.length?16+4:8+2;},getAscendant:function(h,i){var j=this.$,k;if(!i)j=j.parentNode;while(j){if(j.nodeName&&(k=j.nodeName.toLowerCase(),typeof h=='string'?k==h:k in h))return new d.node(j);j=j.parentNode;}return null;},hasAscendant:function(h,i){var j=this.$;if(!i)j=j.parentNode;while(j){if(j.nodeName&&j.nodeName.toLowerCase()==h)return true;j=j.parentNode;}return false;},move:function(h,i){h.append(this.remove(),i);},remove:function(h){var i=this.$,j=i.parentNode;if(j){if(h)for(var k;k=i.firstChild;)j.insertBefore(i.removeChild(k),i);j.removeChild(i);}return this;},replace:function(h){this.insertBefore(h);h.remove();},trim:function(){this.ltrim();this.rtrim();},ltrim:function(){var k=this;var h;while(k.getFirst&&(h=k.getFirst())){if(h.type==3){var i=e.ltrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(j-i.length);k.$.removeChild(k.$.firstChild);}}break;}},rtrim:function(){var k=this;var h;while(k.getLast&&(h=k.getLast())){if(h.type==3){var i=e.rtrim(h.getText()),j=h.getLength();if(!i){h.remove();continue;}else if(i.length<j){h.split(i.length);k.$.lastChild.parentNode.removeChild(k.$.lastChild);}}break;}if(!c&&!b.opera){h=k.$.lastChild;if(h&&h.type==1&&h.nodeName.toLowerCase()=='br')h.parentNode.removeChild(h);}},isReadOnly:function(){var h=this;if(this.type!=1)h=this.getParent();if(h&&typeof h.$.isContentEditable!='undefined')return!(h.$.isContentEditable||h.data('cke-editable'));else{var i=h;while(i){if(i.is('body')||!!i.data('cke-editable'))break;if(i.getAttribute('contentEditable')=='false')return true;else if(i.getAttribute('contentEditable')=='true')break;i=i.getParent();}return false;}}});d.nodeList=function(h){this.$=h;};d.nodeList.prototype={count:function(){return this.$.length;},getItem:function(h){var i=this.$[h];return i?new d.node(i):null;}};d.element=function(h,i){if(typeof h=='string')h=(i?i.$:document).createElement(h);
+d.domObject.call(this,h);};var h=d.element;h.get=function(i){return i&&(i.$?i:new h(i));};h.prototype=new d.node();h.createFromHtml=function(i,j){var k=new h('div',j);k.setHtml(i);return k.getFirst().remove();};h.setMarker=function(i,j,k,l){var m=j.getCustomData('list_marker_id')||j.setCustomData('list_marker_id',e.getNextNumber()).getCustomData('list_marker_id'),n=j.getCustomData('list_marker_names')||j.setCustomData('list_marker_names',{}).getCustomData('list_marker_names');i[m]=j;n[k]=1;return j.setCustomData(k,l);};h.clearAllMarkers=function(i){for(var j in i)h.clearMarkers(i,i[j],1);};h.clearMarkers=function(i,j,k){var l=j.getCustomData('list_marker_names'),m=j.getCustomData('list_marker_id');for(var n in l)j.removeCustomData(n);j.removeCustomData('list_marker_names');if(k){j.removeCustomData('list_marker_id');delete i[m];}};e.extend(h.prototype,{type:1,addClass:function(i){var j=this.$.className;if(j){var k=new RegExp('(?:^|\\s)'+i+'(?:\\s|$)','');if(!k.test(j))j+=' '+i;}this.$.className=j||i;},removeClass:function(i){var j=this.getAttribute('class');if(j){var k=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','i');if(k.test(j)){j=j.replace(k,'').replace(/^\s+/,'');if(j)this.setAttribute('class',j);else this.removeAttribute('class');}}},hasClass:function(i){var j=new RegExp('(?:^|\\s+)'+i+'(?=\\s|$)','');return j.test(this.getAttribute('class'));},append:function(i,j){var k=this;if(typeof i=='string')i=k.getDocument().createElement(i);if(j)k.$.insertBefore(i.$,k.$.firstChild);else k.$.appendChild(i.$);return i;},appendHtml:function(i){var k=this;if(!k.$.childNodes.length)k.setHtml(i);else{var j=new h('div',k.getDocument());j.setHtml(i);j.moveChildren(k);}},appendText:function(i){if(this.$.text!=undefined)this.$.text+=i;else this.append(new d.text(i));},appendBogus:function(){var k=this;var i=k.getLast();while(i&&i.type==3&&!e.rtrim(i.getText()))i=i.getPrevious();if(!i||!i.is||!i.is('br')){var j=b.opera?k.getDocument().createText(''):k.getDocument().createElement('br');b.gecko&&j.setAttribute('type','_moz');k.append(j);}},breakParent:function(i){var l=this;var j=new d.range(l.getDocument());j.setStartAfter(l);j.setEndAfter(i);var k=j.extractContents();j.insertNode(l.remove());k.insertAfterNode(l);},contains:c||b.webkit?function(i){var j=this.$;return i.type!=1?j.contains(i.getParent().$):j!=i.$&&j.contains(i.$);}:function(i){return!!(this.$.compareDocumentPosition(i.$)&16);},focus:(function(){function i(){try{this.$.focus();}catch(j){}};return function(j){if(j)e.setTimeout(i,100,this);
+else i.call(this);};})(),getHtml:function(){var i=this.$.innerHTML;return c?i.replace(/<\?[^>]*>/g,''):i;},getOuterHtml:function(){var j=this;if(j.$.outerHTML)return j.$.outerHTML.replace(/<\?[^>]*>/,'');var i=j.$.ownerDocument.createElement('div');i.appendChild(j.$.cloneNode(true));return i.innerHTML;},setHtml:function(i){return this.$.innerHTML=i;},setText:function(i){h.prototype.setText=this.$.innerText!=undefined?function(j){return this.$.innerText=j;}:function(j){return this.$.textContent=j;};return this.setText(i);},getAttribute:(function(){var i=function(j){return this.$.getAttribute(j,2);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){var n=this;switch(j){case 'class':j='className';break;case 'http-equiv':j='httpEquiv';break;case 'name':return n.$.name;case 'tabindex':var k=i.call(n,j);if(k!==0&&n.$.tabIndex===0)k=null;return k;break;case 'checked':var l=n.$.attributes.getNamedItem(j),m=l.specified?l.nodeValue:n.$.checked;return m?'checked':null;case 'hspace':case 'value':return n.$[j];case 'style':return n.$.style.cssText;}return i.call(n,j);};else return i;})(),getChildren:function(){return new d.nodeList(this.$.childNodes);},getComputedStyle:c?function(i){return this.$.currentStyle[e.cssStyleToDomStyle(i)];}:function(i){return this.getWindow().$.getComputedStyle(this.$,'').getPropertyValue(i);},getDtd:function(){var i=f[this.getName()];this.getDtd=function(){return i;};return i;},getElementsByTag:g.prototype.getElementsByTag,getTabIndex:c?function(){var i=this.$.tabIndex;if(i===0&&!f.$tabIndex[this.getName()]&&parseInt(this.getAttribute('tabindex'),10)!==0)i=-1;return i;}:b.webkit?function(){var i=this.$.tabIndex;if(i==undefined){i=parseInt(this.getAttribute('tabindex'),10);if(isNaN(i))i=-1;}return i;}:function(){return this.$.tabIndex;},getText:function(){return this.$.textContent||this.$.innerText||'';},getWindow:function(){return this.getDocument().getWindow();},getId:function(){return this.$.id||null;},getNameAtt:function(){return this.$.name||null;},getName:function(){var i=this.$.nodeName.toLowerCase();if(c&&!(document.documentMode>8)){var j=this.$.scopeName;if(j!='HTML')i=j.toLowerCase()+':'+i;}return(this.getName=function(){return i;})();},getValue:function(){return this.$.value;},getFirst:function(i){var j=this.$.firstChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getNext(i);return k;},getLast:function(i){var j=this.$.lastChild,k=j&&new d.node(j);if(k&&i&&!i(k))k=k.getPrevious(i);return k;},getStyle:function(i){return this.$.style[e.cssStyleToDomStyle(i)];
+},is:function(){var i=this.getName();for(var j=0;j<arguments.length;j++){if(arguments[j]==i)return true;}return false;},isEditable:function(i){var l=this;var j=l.getName();if(l.isReadOnly()||l.getComputedStyle('display')=='none'||l.getComputedStyle('visibility')=='hidden'||f.$nonEditable[j])return false;if(i!==false){var k=f[j]||f.span;return k&&k['#'];}return true;},isIdentical:function(i){if(this.getName()!=i.getName())return false;var j=this.$.attributes,k=i.$.attributes,l=j.length,m=k.length;for(var n=0;n<l;n++){var o=j[n];if(o.nodeName=='_moz_dirty')continue;if((!c||o.specified&&o.nodeName!='data-cke-expando')&&o.nodeValue!=i.getAttribute(o.nodeName))return false;}if(c)for(n=0;n<m;n++){o=k[n];if(o.specified&&o.nodeName!='data-cke-expando'&&o.nodeValue!=this.getAttribute(o.nodeName))return false;}return true;},isVisible:function(){var l=this;var i=(l.$.offsetHeight||l.$.offsetWidth)&&l.getComputedStyle('visibility')!='hidden',j,k;if(i&&(b.webkit||b.opera)){j=l.getWindow();if(!j.equals(a.document.getWindow())&&(k=j.$.frameElement))i=new h(k).isVisible();}return!!i;},isEmptyInlineRemoveable:function(){if(!f.$removeEmpty[this.getName()])return false;var i=this.getChildren();for(var j=0,k=i.count();j<k;j++){var l=i.getItem(j);if(l.type==1&&l.data('cke-bookmark'))continue;if(l.type==1&&!l.isEmptyInlineRemoveable()||l.type==3&&e.trim(l.getText()))return false;}return true;},hasAttributes:c&&(b.ie7Compat||b.ie6Compat)?function(){var i=this.$.attributes;for(var j=0;j<i.length;j++){var k=i[j];switch(k.nodeName){case 'class':if(this.getAttribute('class'))return true;case 'data-cke-expando':continue;default:if(k.specified)return true;}}return false;}:function(){var i=this.$.attributes,j=i.length,k={'data-cke-expando':1,_moz_dirty:1};return j>0&&(j>2||!k[i[0].nodeName]||j==2&&!k[i[1].nodeName]);},hasAttribute:(function(){function i(j){var k=this.$.attributes.getNamedItem(j);return!!(k&&k.specified);};return c&&b.version<8?function(j){if(j=='name')return!!this.$.name;return i.call(this,j);}:i;})(),hide:function(){this.setStyle('display','none');},moveChildren:function(i,j){var k=this.$;i=i.$;if(k==i)return;var l;if(j)while(l=k.lastChild)i.insertBefore(k.removeChild(l),i.firstChild);else while(l=k.firstChild)i.appendChild(k.removeChild(l));},mergeSiblings:(function(){function i(j,k,l){if(k&&k.type==1){var m=[];while(k.data('cke-bookmark')||k.isEmptyInlineRemoveable()){m.push(k);k=l?k.getNext():k.getPrevious();if(!k||k.type!=1)return;}if(j.isIdentical(k)){var n=l?j.getLast():j.getFirst();
+while(m.length)m.shift().move(j,!l);k.moveChildren(j,!l);k.remove();if(n&&n.type==1)n.mergeSiblings();}}};return function(j){var k=this;if(!(j===false||f.$removeEmpty[k.getName()]||k.is('a')))return;i(k,k.getNext(),true);i(k,k.getPrevious());};})(),show:function(){this.setStyles({display:'',visibility:''});},setAttribute:(function(){var i=function(j,k){this.$.setAttribute(j,k);return this;};if(c&&(b.ie7Compat||b.ie6Compat))return function(j,k){var l=this;if(j=='class')l.$.className=k;else if(j=='style')l.$.style.cssText=k;else if(j=='tabindex')l.$.tabIndex=k;else if(j=='checked')l.$.checked=k;else i.apply(l,arguments);return l;};else if(b.ie8Compat&&b.secure)return function(j,k){if(j=='src'&&k.match(/^http:\/\//))try{i.apply(this,arguments);}catch(l){}else i.apply(this,arguments);return this;};else return i;})(),setAttributes:function(i){for(var j in i)this.setAttribute(j,i[j]);return this;},setValue:function(i){this.$.value=i;return this;},removeAttribute:(function(){var i=function(j){this.$.removeAttribute(j);};if(c&&(b.ie7Compat||b.ie6Compat))return function(j){if(j=='class')j='className';else if(j=='tabindex')j='tabIndex';i.call(this,j);};else return i;})(),removeAttributes:function(i){if(e.isArray(i))for(var j=0;j<i.length;j++)this.removeAttribute(i[j]);else for(var k in i)i.hasOwnProperty(k)&&this.removeAttribute(k);},removeStyle:function(i){var j=this;j.setStyle(i,'');if(j.$.style.removeAttribute)j.$.style.removeAttribute(e.cssStyleToDomStyle(i));if(!j.$.style.cssText)j.removeAttribute('style');},setStyle:function(i,j){this.$.style[e.cssStyleToDomStyle(i)]=j;return this;},setStyles:function(i){for(var j in i)this.setStyle(j,i[j]);return this;},setOpacity:function(i){if(c){i=Math.round(i*100);this.setStyle('filter',i>=100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+i+')');}else this.setStyle('opacity',i);},unselectable:b.gecko?function(){this.$.style.MozUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:b.webkit?function(){this.$.style.KhtmlUserSelect='none';this.on('dragstart',function(i){i.data.preventDefault();});}:function(){if(c||b.opera){var i=this.$,j,k=0;i.unselectable='on';while(j=i.all[k++])switch(j.tagName.toLowerCase()){case 'iframe':case 'textarea':case 'input':case 'select':break;default:j.unselectable='on';}}},getPositionedAncestor:function(){var i=this;while(i.getName()!='html'){if(i.getComputedStyle('position')!='static')return i;i=i.getParent();}return null;},getDocumentPosition:function(i){var D=this;
+var j=0,k=0,l=D.getDocument(),m=l.getBody(),n=l.$.compatMode=='BackCompat';if(document.documentElement.getBoundingClientRect){var o=D.$.getBoundingClientRect(),p=l.$,q=p.documentElement,r=q.clientTop||m.$.clientTop||0,s=q.clientLeft||m.$.clientLeft||0,t=true;if(c){var u=l.getDocumentElement().contains(D),v=l.getBody().contains(D);t=n&&v||!n&&u;}if(t){j=o.left+(!n&&q.scrollLeft||m.$.scrollLeft);j-=s;k=o.top+(!n&&q.scrollTop||m.$.scrollTop);k-=r;}}else{var w=D,x=null,y;while(w&&!(w.getName()=='body'||w.getName()=='html')){j+=w.$.offsetLeft-w.$.scrollLeft;k+=w.$.offsetTop-w.$.scrollTop;if(!w.equals(D)){j+=w.$.clientLeft||0;k+=w.$.clientTop||0;}var z=x;while(z&&!z.equals(w)){j-=z.$.scrollLeft;k-=z.$.scrollTop;z=z.getParent();}x=w;w=(y=w.$.offsetParent)?new h(y):null;}}if(i){var A=D.getWindow(),B=i.getWindow();if(!A.equals(B)&&A.$.frameElement){var C=new h(A.$.frameElement).getDocumentPosition(i);j+=C.x;k+=C.y;}}if(!document.documentElement.getBoundingClientRect)if(b.gecko&&!n){j+=D.$.clientLeft?1:0;k+=D.$.clientTop?1:0;}return{x:j,y:k};},scrollIntoView:function(i){var o=this;var j=o.getWindow(),k=j.getViewPaneSize().height,l=k*-1;if(i)l+=k;else{l+=o.$.offsetHeight||0;l+=parseInt(o.getComputedStyle('marginBottom')||0,10)||0;}var m=o.getDocumentPosition();l+=m.y;l=l<0?0:l;var n=j.getScrollPosition().y;if(l>n||l<n-k)j.$.scrollTo(0,l);},setState:function(i){var j=this;switch(i){case 1:j.addClass('cke_on');j.removeClass('cke_off');j.removeClass('cke_disabled');break;case 0:j.addClass('cke_disabled');j.removeClass('cke_off');j.removeClass('cke_on');break;default:j.addClass('cke_off');j.removeClass('cke_on');j.removeClass('cke_disabled');break;}},getFrameDocument:function(){var i=this.$;try{i.contentWindow.document;}catch(j){i.src=i.src;if(c&&b.version<7)window.showModalDialog('javascript:document.write("<script>window.setTimeout(function(){window.close();},50);</script>")');}return i&&new g(i.contentWindow.document);},copyAttributes:function(i,j){var p=this;var k=p.$.attributes;j=j||{};for(var l=0;l<k.length;l++){var m=k[l],n=m.nodeName.toLowerCase(),o;if(n in j)continue;if(n=='checked'&&(o=p.getAttribute(n)))i.setAttribute(n,o);else if(m.specified||c&&m.nodeValue&&n=='value'){o=p.getAttribute(n);if(o===null)o=m.nodeValue;i.setAttribute(n,o);}}if(p.$.style.cssText!=='')i.$.style.cssText=p.$.style.cssText;},renameNode:function(i){var l=this;if(l.getName()==i)return;var j=l.getDocument(),k=new h(i,j);l.copyAttributes(k);l.moveChildren(k);l.getParent()&&l.$.parentNode.replaceChild(k.$,l.$);
+k.$['data-cke-expando']=l.$['data-cke-expando'];l.$=k.$;},getChild:function(i){var j=this.$;if(!i.slice)j=j.childNodes[i];else while(i.length>0&&j)j=j.childNodes[i.shift()];return j?new d.node(j):null;},getChildCount:function(){return this.$.childNodes.length;},disableContextMenu:function(){this.on('contextmenu',function(i){if(!i.data.getTarget().hasClass('cke_enable_context_menu'))i.data.preventDefault();});},getDirection:function(i){var j=this;return i?j.getComputedStyle('direction')||j.getDirection()||j.getDocument().$.dir||j.getDocument().getBody().getDirection(1):j.getStyle('direction')||j.getAttribute('dir');},data:function(i,j){i='data-'+i;if(j===undefined)return this.getAttribute(i);else if(j===false)this.removeAttribute(i);else this.setAttribute(i,j);return null;}});(function(){var i={width:['border-left-width','border-right-width','padding-left','padding-right'],height:['border-top-width','border-bottom-width','padding-top','padding-bottom']};function j(k){var l=0;for(var m=0,n=i[k].length;m<n;m++)l+=parseInt(this.getComputedStyle(i[k][m])||0,10)||0;return l;};h.prototype.setSize=function(k,l,m){if(typeof l=='number'){if(m&&!(c&&b.quirks))l-=j.call(this,k);this.setStyle(k,l+'px');}};h.prototype.getSize=function(k,l){var m=Math.max(this.$['offset'+e.capitalize(k)],this.$['client'+e.capitalize(k)])||0;if(l)m-=j.call(this,k);return m;};})();a.command=function(i,j){this.uiItems=[];this.exec=function(k){if(this.state==0)return false;if(this.editorFocus)i.focus();return j.exec.call(this,i,k)!==false;};e.extend(this,j,{modes:{wysiwyg:1},editorFocus:1,state:2});a.event.call(this);};a.command.prototype={enable:function(){var i=this;if(i.state==0)i.setState(!i.preserveState||typeof i.previousState=='undefined'?2:i.previousState);},disable:function(){this.setState(0);},setState:function(i){var j=this;if(j.state==i)return false;j.previousState=j.state;j.state=i;j.fire('state');return true;},toggleState:function(){var i=this;if(i.state==2)i.setState(1);else if(i.state==1)i.setState(2);}};a.event.implementOn(a.command.prototype,true);a.ENTER_P=1;a.ENTER_BR=2;a.ENTER_DIV=3;a.config={customConfig:'config.js',autoUpdateElement:true,baseHref:'',contentsCss:a.basePath+'contents.css',contentsLangDirection:'ui',contentsLanguage:'',language:'',defaultLanguage:'en',enterMode:1,forceEnterMode:false,shiftEnterMode:2,corePlugins:'',docType:'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',bodyId:'',bodyClass:'',fullPage:false,height:200,plugins:'about,a11yhelp,basicstyles,bidi,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,dialogadvtab,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,iframe,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',extraPlugins:'',removePlugins:'',protectedSource:[],tabIndex:0,theme:'default',skin:'kama',width:'',baseFloatZIndex:10000};
+var i=a.config;a.focusManager=function(j){if(j.focusManager)return j.focusManager;this.hasFocus=false;this._={editor:j};return this;};a.focusManager.prototype={focus:function(){var k=this;if(k._.timer)clearTimeout(k._.timer);if(!k.hasFocus){if(a.currentInstance)a.currentInstance.focusManager.forceBlur();var j=k._.editor;j.container.getChild(1).addClass('cke_focus');k.hasFocus=true;j.fire('focus');}},blur:function(){var j=this;if(j._.timer)clearTimeout(j._.timer);j._.timer=setTimeout(function(){delete j._.timer;j.forceBlur();},100);},forceBlur:function(){if(this.hasFocus){var j=this._.editor;j.container.getChild(1).removeClass('cke_focus');this.hasFocus=false;j.fire('blur');}}};(function(){var j={};a.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,'en-au':1,'en-ca':1,'en-gb':1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,'fr-ca':1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,lt:1,lv:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,'pt-br':1,pt:1,ro:1,ru:1,sk:1,sl:1,'sr-latn':1,sr:1,sv:1,th:1,tr:1,uk:1,vi:1,'zh-cn':1,zh:1},load:function(k,l,m){if(!k||!a.lang.languages[k])k=this.detect(l,k);if(!this[k])a.scriptLoader.load(a.getUrl('lang/'+k+'.js'),function(){m(k,this[k]);},this);else m(k,this[k]);},detect:function(k,l){var m=this.languages;l=l||navigator.userLanguage||navigator.language||k;var n=l.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),o=n[1],p=n[2];if(m[o+'-'+p])o=o+'-'+p;else if(!m[o])o=null;a.lang.detect=o?function(){return o;}:function(q){return q;};return o||k;}};})();a.scriptLoader=(function(){var j={},k={};return{load:function(l,m,n,o){var p=typeof l=='string';if(p)l=[l];if(!n)n=a;var q=l.length,r=[],s=[],t=function(y){if(m)if(p)m.call(n,y);else m.call(n,r,s);};if(q===0){t(true);return;}var u=function(y,z){(z?r:s).push(y);if(--q<=0){o&&a.document.getDocumentElement().removeStyle('cursor');t(z);}},v=function(y,z){j[y]=1;var A=k[y];delete k[y];for(var B=0;B<A.length;B++)A[B](y,z);},w=function(y){if(j[y]){u(y,true);return;}var z=k[y]||(k[y]=[]);z.push(u);if(z.length>1)return;var A=new h('script');A.setAttributes({type:'text/javascript',src:y});if(m)if(c)A.$.onreadystatechange=function(){if(A.$.readyState=='loaded'||A.$.readyState=='complete'){A.$.onreadystatechange=null;v(y,true);}};else{A.$.onload=function(){setTimeout(function(){v(y,true);},0);};A.$.onerror=function(){v(y,false);};}A.appendTo(a.document.getHead());};o&&a.document.getDocumentElement().setStyle('cursor','wait');for(var x=0;x<q;x++)w(l[x]);}};})();a.resourceManager=function(j,k){var l=this;
+l.basePath=j;l.fileName=k;l.registered={};l.loaded={};l.externals={};l._={waitingList:{}};};a.resourceManager.prototype={add:function(j,k){if(this.registered[j])throw '[CKEDITOR.resourceManager.add] The resource name "'+j+'" is already registered.';a.fire(j+e.capitalize(this.fileName)+'Ready',this.registered[j]=k||{});},get:function(j){return this.registered[j]||null;},getPath:function(j){var k=this.externals[j];return a.getUrl(k&&k.dir||this.basePath+j+'/');},getFilePath:function(j){var k=this.externals[j];return a.getUrl(this.getPath(j)+(k&&typeof k.file=='string'?k.file:this.fileName+'.js'));},addExternal:function(j,k,l){j=j.split(',');for(var m=0;m<j.length;m++){var n=j[m];this.externals[n]={dir:k,file:l};}},load:function(j,k,l){if(!e.isArray(j))j=j?[j]:[];var m=this.loaded,n=this.registered,o=[],p={},q={};for(var r=0;r<j.length;r++){var s=j[r];if(!s)continue;if(!m[s]&&!n[s]){var t=this.getFilePath(s);o.push(t);if(!(t in p))p[t]=[];p[t].push(s);}else q[s]=this.get(s);}a.scriptLoader.load(o,function(u,v){if(v.length)throw '[CKEDITOR.resourceManager.load] Resource name "'+p[v[0]].join(',')+'" was not found at "'+v[0]+'".';for(var w=0;w<u.length;w++){var x=p[u[w]];for(var y=0;y<x.length;y++){var z=x[y];q[z]=this.get(z);m[z]=1;}}k.call(l,q);},this);}};a.plugins=new a.resourceManager('plugins/','plugin');var j=a.plugins;j.load=e.override(j.load,function(k){return function(l,m,n){var o={},p=function(q){k.call(this,q,function(r){e.extend(o,r);var s=[];for(var t in r){var u=r[t],v=u&&u.requires;if(v)for(var w=0;w<v.length;w++){if(!o[v[w]])s.push(v[w]);}}if(s.length)p.call(this,s);else{for(t in o){u=o[t];if(u.onLoad&&!u.onLoad._called){u.onLoad();u.onLoad._called=1;}}if(m)m.call(n||window,o);}},this);};p.call(this,l);};});j.setLang=function(k,l,m){var n=this.get(k),o=n.langEntries||(n.langEntries={}),p=n.lang||(n.lang=[]);if(e.indexOf(p,l)==-1)p.push(l);o[l]=m;};a.skins=(function(){var k={},l={},m=function(n,o,p,q){var r=k[o];if(!n.skin){n.skin=r;if(r.init)r.init(n);}var s=function(B){for(var C=0;C<B.length;C++)B[C]=a.getUrl(l[o]+B[C]);};function t(B,C){return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(D,E,F,G){if(/^\/|^\w?:/.test(F))return D;else return 'url('+C+E+F+G+')';});};p=r[p];var u=!p||!!p._isLoaded;if(u)q&&q();else{var v=p._pending||(p._pending=[]);v.push(q);if(v.length>1)return;var w=!p.css||!p.css.length,x=!p.js||!p.js.length,y=function(){if(w&&x){p._isLoaded=1;for(var B=0;B<v.length;B++){if(v[B])v[B]();}}};if(!w){var z=p.css;if(e.isArray(z)){s(z);
+for(var A=0;A<z.length;A++)a.document.appendStyleSheet(z[A]);}else{z=t(z,a.getUrl(l[o]));a.document.appendStyleText(z);}p.css=z;w=1;}if(!x){s(p.js);a.scriptLoader.load(p.js,function(){x=1;y();});}y();}};return{add:function(n,o){k[n]=o;o.skinPath=l[n]||(l[n]=a.getUrl('skins/'+n+'/'));},load:function(n,o,p){var q=n.skinName,r=n.skinPath;if(k[q])m(n,q,o,p);else{l[q]=r;a.scriptLoader.load(a.getUrl(r+'skin.js'),function(){m(n,q,o,p);});}}};})();a.themes=new a.resourceManager('themes/','theme');a.ui=function(k){if(k.ui)return k.ui;this._={handlers:{},items:{},editor:k};return this;};var k=a.ui;k.prototype={add:function(l,m,n){this._.items[l]={type:m,command:n.command||null,args:Array.prototype.slice.call(arguments,2)};},create:function(l){var q=this;var m=q._.items[l],n=m&&q._.handlers[m.type],o=m&&m.command&&q._.editor.getCommand(m.command),p=n&&n.create.apply(q,m.args);m&&(p=e.extend(p,q._.editor.skin[m.type],true));if(o)o.uiItems.push(p);return p;},addHandler:function(l,m){this._.handlers[l]=m;}};a.event.implementOn(k);(function(){var l=0,m=function(){var x='editor'+ ++l;return a.instances&&a.instances[x]?m():x;},n={},o=function(x){var y=x.config.customConfig;if(!y)return false;y=a.getUrl(y);var z=n[y]||(n[y]={});if(z.fn){z.fn.call(x,x.config);if(a.getUrl(x.config.customConfig)==y||!o(x))x.fireOnce('customConfigLoaded');}else a.scriptLoader.load(y,function(){if(a.editorConfig)z.fn=a.editorConfig;else z.fn=function(){};o(x);});return true;},p=function(x,y){x.on('customConfigLoaded',function(){if(y){if(y.on)for(var z in y.on)x.on(z,y.on[z]);e.extend(x.config,y,true);delete x.config.on;}q(x);});if(y&&y.customConfig!=undefined)x.config.customConfig=y.customConfig;if(!o(x))x.fireOnce('customConfigLoaded');},q=function(x){var y=x.config.skin.split(','),z=y[0],A=a.getUrl(y[1]||'skins/'+z+'/');x.skinName=z;x.skinPath=A;x.skinClass='cke_skin_'+z;x.tabIndex=x.config.tabIndex||x.element.getAttribute('tabindex')||0;x.readOnly=!!(x.config.readOnly||x.element.getAttribute('disabled'));x.fireOnce('configLoaded');t(x);},r=function(x){a.lang.load(x.config.language,x.config.defaultLanguage,function(y,z){x.langCode=y;x.lang=e.prototypedCopy(z);if(b.gecko&&b.version<10900&&x.lang.dir=='rtl')x.lang.dir='ltr';x.fire('langLoaded');var A=x.config;A.contentsLangDirection=='ui'&&(A.contentsLangDirection=x.lang.dir);s(x);});},s=function(x){var y=x.config,z=y.plugins,A=y.extraPlugins,B=y.removePlugins;if(A){var C=new RegExp('(?:^|,)(?:'+A.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');
+z+=','+A;}if(B){C=new RegExp('(?:^|,)(?:'+B.replace(/\s*,\s*/g,'|')+')(?=,|$)','g');z=z.replace(C,'');}b.air&&(z+=',adobeair');j.load(z.split(','),function(D){var E=[],F=[],G=[];x.plugins=D;for(var H in D){var I=D[H],J=I.lang,K=j.getPath(H),L=null;I.path=K;if(J){L=e.indexOf(J,x.langCode)>=0?x.langCode:J[0];if(!I.langEntries||!I.langEntries[L])G.push(a.getUrl(K+'lang/'+L+'.js'));else{e.extend(x.lang,I.langEntries[L]);L=null;}}F.push(L);E.push(I);}a.scriptLoader.load(G,function(){var M=['beforeInit','init','afterInit'];for(var N=0;N<M.length;N++)for(var O=0;O<E.length;O++){var P=E[O];if(N===0&&F[O]&&P.lang)e.extend(x.lang,P.langEntries[F[O]]);if(P[M[N]])P[M[N]](x);}x.fire('pluginsLoaded');u(x);});});},t=function(x){a.skins.load(x,'editor',function(){r(x);});},u=function(x){var y=x.config.theme;a.themes.load(y,function(){var z=x.theme=a.themes.get(y);z.path=a.themes.getPath(y);z.build(x);if(x.config.autoUpdateElement)v(x);});},v=function(x){var y=x.element;if(x.elementMode==1&&y.is('textarea')){var z=y.$.form&&new h(y.$.form);if(z){function A(){x.updateElement();};z.on('submit',A);if(!z.$.submit.nodeName&&!z.$.submit.length)z.$.submit=e.override(z.$.submit,function(B){return function(){x.updateElement();if(B.apply)B.apply(this,arguments);else B();};});x.on('destroy',function(){z.removeListener('submit',A);});}}};function w(){var x,y=this._.commands,z=this.mode;if(!z)return;for(var A in y){x=y[A];x[x.startDisabled?'disable':this.readOnly&&!x.readOnly?'disable':x.modes[z]?'enable':'disable']();}};a.editor.prototype._init=function(){var z=this;var x=h.get(z._.element),y=z._.instanceConfig;delete z._.element;delete z._.instanceConfig;z._.commands={};z._.styles=[];z.element=x;z.name=x&&z.elementMode==1&&(x.getId()||x.getNameAtt())||m();if(z.name in a.instances)throw '[CKEDITOR.editor] The instance "'+z.name+'" already exists.';z.id=e.getNextId();z.config=e.prototypedCopy(i);z.ui=new k(z);z.focusManager=new a.focusManager(z);a.fire('instanceCreated',null,z);z.on('mode',w,null,null,1);z.on('readOnly',w,null,null,1);p(z,y);};})();e.extend(a.editor.prototype,{addCommand:function(l,m){return this._.commands[l]=new a.command(this,m);},addCss:function(l){this._.styles.push(l);},destroy:function(l){var m=this;if(!l)m.updateElement();m.fire('destroy');m.theme&&m.theme.destroy(m);a.remove(m);a.fire('instanceDestroyed',null,m);},execCommand:function(l,m){var n=this.getCommand(l),o={name:l,commandData:m,command:n};if(n&&n.state!=0)if(this.fire('beforeCommandExec',o)!==true){o.returnValue=n.exec(o.commandData);
+if(!n.async&&this.fire('afterCommandExec',o)!==true)return o.returnValue;}return false;},getCommand:function(l){return this._.commands[l];},getData:function(){var n=this;n.fire('beforeGetData');var l=n._.data;if(typeof l!='string'){var m=n.element;if(m&&n.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();else l='';}l={dataValue:l};n.fire('getData',l);return l.dataValue;},getSnapshot:function(){var l=this.fire('getSnapshot');if(typeof l!='string'){var m=this.element;if(m&&this.elementMode==1)l=m.is('textarea')?m.getValue():m.getHtml();}return l;},loadSnapshot:function(l){this.fire('loadSnapshot',l);},setData:function(l,m,n){if(m)this.on('dataReady',function(p){p.removeListener();m.call(p.editor);});var o={dataValue:l};!n&&this.fire('setData',o);this._.data=o.dataValue;!n&&this.fire('afterSetData',o);},setReadOnly:function(l){l=l==undefined||l;if(this.readOnly!=l){this.readOnly=l;this.fire('readOnly');}},insertHtml:function(l){this.fire('insertHtml',l);},insertText:function(l){this.fire('insertText',l);},insertElement:function(l){this.fire('insertElement',l);},checkDirty:function(){return this.mayBeDirty&&this._.previousValue!==this.getSnapshot();},resetDirty:function(){if(this.mayBeDirty)this._.previousValue=this.getSnapshot();},updateElement:function(){var n=this;var l=n.element;if(l&&n.elementMode==1){var m=n.getData();if(n.config.htmlEncodeOutput)m=e.htmlEncode(m);if(l.is('textarea'))l.setValue(m);else l.setHtml(m);}}});a.on('loaded',function(){var l=a.editor._pending;if(l){delete a.editor._pending;for(var m=0;m<l.length;m++)l[m]._init();}});a.htmlParser=function(){this._={htmlPartsRegex:new RegExp("<(?:(?:\\/([^>]+)>)|(?:!--([\\S|\\s]*?)-->)|(?:([^\\s>]+)\\s*((?:(?:\"[^\"]*\")|(?:'[^']*')|[^\"'>])*)\\/?>))",'g')};};(function(){var l=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,m={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};a.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(n){var A=this;var o,p,q=0,r;while(o=A._.htmlPartsRegex.exec(n)){var s=o.index;if(s>q){var t=n.substring(q,s);if(r)r.push(t);else A.onText(t);}q=A._.htmlPartsRegex.lastIndex;if(p=o[1]){p=p.toLowerCase();if(r&&f.$cdata[p]){A.onCDATA(r.join(''));r=null;}if(!r){A.onTagClose(p);continue;}}if(r){r.push(o[0]);continue;}if(p=o[3]){p=p.toLowerCase();if(/="/.test(p))continue;
+var u={},v,w=o[4],x=!!(w&&w.charAt(w.length-1)=='/');if(w)while(v=l.exec(w)){var y=v[1].toLowerCase(),z=v[2]||v[3]||v[4]||'';if(!z&&m[y])u[y]=y;else u[y]=z;}A.onTagOpen(p,u,x);if(!r&&f.$cdata[p])r=[];continue;}if(p=o[2])A.onComment(p);}if(n.length>q)A.onText(n.substring(q,n.length));}};})();a.htmlParser.comment=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.comment.prototype={type:8,writeHtml:function(l,m){var n=this.value;if(m){if(!(n=m.onComment(n,this)))return;if(typeof n!='string'){n.parent=this.parent;n.writeHtml(l,m);return;}}l.comment(n);}};(function(){a.htmlParser.text=function(l){this.value=l;this._={isBlockLike:false};};a.htmlParser.text.prototype={type:3,writeHtml:function(l,m){var n=this.value;if(m&&!(n=m.onText(n,this)))return;l.text(n);}};})();(function(){a.htmlParser.cdata=function(l){this.value=l;};a.htmlParser.cdata.prototype={type:3,writeHtml:function(l){l.write(this.value);}};})();a.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:true,hasInlineStarted:false};};(function(){var l=e.extend({table:1,ul:1,ol:1,dl:1},f.table,f.ul,f.ol,f.dl),m=c&&b.version<8?{dd:1,dt:1}:{},n={ol:1,ul:1},o=e.extend({},{html:1},f.html,f.body,f.head,{style:1,script:1});function p(q){return q.name=='a'&&q.attributes.href||f.$removeEmpty[q.name];};a.htmlParser.fragment.fromHtml=function(q,r,s){var t=new a.htmlParser(),u=s||new a.htmlParser.fragment(),v=[],w=[],x=u,y=false,z=false;function A(D){var E;if(v.length>0)for(var F=0;F<v.length;F++){var G=v[F],H=G.name,I=f[H],J=x.name&&f[x.name];if((!J||J[H])&&(!D||!I||I[D]||!f[D])){if(!E){B();E=1;}G=G.clone();G.parent=x;x=G;v.splice(F,1);F--;}else if(H==x.name)C(x,x.parent,1),F--;}};function B(){while(w.length)x.add(w.shift());};function C(D,E,F){if(D.previous!==undefined)return;E=E||x||u;var G=x;if(r&&(!E.type||E.name=='body')){var H,I;if(D.attributes&&(I=D.attributes['data-cke-real-element-type']))H=I;else H=D.name;if(H&&!(H in f.$body||H=='body'||D.isOrphan)){x=E;t.onTagOpen(r,{});D.returnPoint=E=x;}}if(D._.isBlockLike&&D.name!='pre'&&D.name!='textarea'){var J=D.children.length,K=D.children[J-1],L;if(K&&K.type==3)if(!(L=e.rtrim(K.value)))D.children.length=J-1;else K.value=L;}E.add(D);if(D.returnPoint){x=D.returnPoint;delete D.returnPoint;}else x=F?E:G;};t.onTagOpen=function(D,E,F,G){var H=new a.htmlParser.element(D,E);if(H.isUnknown&&F)H.isEmpty=true;H.isOptionalClose=D in m||G;if(p(H)){v.push(H);return;}else if(D=='pre')z=true;else if(D=='br'&&z){x.add(new a.htmlParser.text('\n'));
+return;}else if(D=='textarea')y=true;if(D=='br'){w.push(H);return;}while(1){var I=x.name,J=I?f[I]||(x._.isBlockLike?f.div:f.span):o;if(!H.isUnknown&&!x.isUnknown&&!J[D]){if(x.isOptionalClose)t.onTagClose(I);else if(D in n&&I in n){var K=x.children,L=K[K.length-1];if(!(L&&L.name=='li'))C(L=new a.htmlParser.element('li'),x);!H.returnPoint&&(H.returnPoint=x);x=L;}else if(D in f.$listItem&&I!=D)t.onTagOpen(D=='li'?'ul':'dl',{},0,1);else if(I in l&&I!=D){!H.returnPoint&&(H.returnPoint=x);x=x.parent;}else{if(I in f.$inline)v.unshift(x);if(x.parent)C(x,x.parent,1);else{H.isOrphan=1;break;}}}else break;}A(D);B();H.parent=x;if(H.isEmpty)C(H);else x=H;};t.onTagClose=function(D){for(var E=v.length-1;E>=0;E--){if(D==v[E].name){v.splice(E,1);return;}}var F=[],G=[],H=x;while(H!=u&&H.name!=D){if(!H._.isBlockLike)G.unshift(H);F.push(H);H=H.returnPoint||H.parent;}if(H!=u){for(E=0;E<F.length;E++){var I=F[E];C(I,I.parent);}x=H;if(x.name=='pre')z=false;if(x.name=='textarea')y=false;if(H._.isBlockLike)B();C(H,H.parent);if(H==x)x=x.parent;v=v.concat(G);}if(D=='body')r=false;};t.onText=function(D){if((!x._.hasInlineStarted||w.length)&&!z&&!y){D=e.ltrim(D);if(D.length===0)return;}B();A();if(r&&(!x.type||x.name=='body')&&e.trim(D))this.onTagOpen(r,{},0,1);if(!z&&!y)D=D.replace(/[\t\r\n ]{2,}|[\t\r\n]/g,' ');x.add(new a.htmlParser.text(D));};t.onCDATA=function(D){x.add(new a.htmlParser.cdata(D));};t.onComment=function(D){B();A();x.add(new a.htmlParser.comment(D));};t.parse(q);B(!c&&1);while(x!=u)C(x,x.parent,1);return u;};a.htmlParser.fragment.prototype={add:function(q,r){var t=this;isNaN(r)&&(r=t.children.length);var s=r>0?t.children[r-1]:null;if(s){if(q._.isBlockLike&&s.type==3){s.value=e.rtrim(s.value);if(s.value.length===0){t.children.pop();t.add(q);return;}}s.next=q;}q.previous=s;q.parent=t;t.children.splice(r,0,q);t._.hasInlineStarted=q.type==3||q.type==1&&!q._.isBlockLike;},writeHtml:function(q,r){var s;this.filterChildren=function(){var t=new a.htmlParser.basicWriter();this.writeChildrenHtml.call(this,t,r,true);var u=t.getHtml();this.children=new a.htmlParser.fragment.fromHtml(u).children;s=1;};!this.name&&r&&r.onFragment(this);this.writeChildrenHtml(q,s?null:r);},writeChildrenHtml:function(q,r){for(var s=0;s<this.children.length;s++)this.children[s].writeHtml(q,r);}};})();a.htmlParser.element=function(l,m){var s=this;s.name=l;s.attributes=m||(m={});s.children=[];var n=m['data-cke-real-element-type']||l||'',o=n.match(/^cke:(.*)/);o&&(n=o[1]);var p=f,q=!!(p.$nonBodyContent[n]||p.$block[n]||p.$listItem[n]||p.$tableContent[n]||p.$nonEditable[n]||n=='br'),r=!!p.$empty[l];
+s.isEmpty=r;s.isUnknown=!p[l];s._={isBlockLike:q,hasInlineStarted:r||!q};};a.htmlParser.cssStyle=function(){var l,m=arguments[0],n={};l=m instanceof a.htmlParser.element?m.attributes.style:m;(l||'').replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(o,p,q){p=='font-family'&&(q=q.replace(/["']/g,''));n[p.toLowerCase()]=q;});return{rules:n,populate:function(o){var p=this.toString();if(p)o instanceof h?o.setAttribute('style',p):o instanceof a.htmlParser.element?o.attributes.style=p:o.style=p;},'toString':function(){var o=[];for(var p in n)n[p]&&o.push(p,':',n[p],';');return o.join('');}};};(function(){var l=function(m,n){m=m[0];n=n[0];return m<n?-1:m>n?1:0;};a.htmlParser.element.prototype={type:1,add:a.htmlParser.fragment.prototype.add,clone:function(){return new a.htmlParser.element(this.name,this.attributes);},writeHtml:function(m,n){var o=this.attributes,p=this,q=p.name,r,s,t,u;p.filterChildren=function(){if(!u){var B=new a.htmlParser.basicWriter();a.htmlParser.fragment.prototype.writeChildrenHtml.call(p,B,n);p.children=new a.htmlParser.fragment.fromHtml(B.getHtml(),0,p.clone()).children;u=1;}};if(n){for(;;){if(!(q=n.onElementName(q)))return;p.name=q;if(!(p=n.onElement(p)))return;p.parent=this.parent;if(p.name==q)break;if(p.type!=1){p.writeHtml(m,n);return;}q=p.name;if(!q){for(var v=0,w=this.children.length;v<w;v++)this.children[v].parent=p.parent;this.writeChildrenHtml.call(p,m,u?null:n);return;}}o=p.attributes;}m.openTag(q,o);var x=[];for(var y=0;y<2;y++)for(r in o){s=r;t=o[r];if(y==1)x.push([r,t]);else if(n){for(;;){if(!(s=n.onAttributeName(r))){delete o[r];break;}else if(s!=r){delete o[r];r=s;continue;}else break;}if(s)if((t=n.onAttribute(p,s,t))===false)delete o[s];else o[s]=t;}}if(m.sortAttributes)x.sort(l);var z=x.length;for(y=0;y<z;y++){var A=x[y];m.attribute(A[0],A[1]);}m.openTagClose(q,p.isEmpty);if(!p.isEmpty){this.writeChildrenHtml.call(p,m,u?null:n);m.closeTag(q);}},writeChildrenHtml:function(m,n){a.htmlParser.fragment.prototype.writeChildrenHtml.apply(this,arguments);}};})();(function(){a.htmlParser.filter=e.createClass({$:function(q){this._={elementNames:[],attributeNames:[],elements:{$length:0},attributes:{$length:0}};if(q)this.addRules(q,10);},proto:{addRules:function(q,r){var s=this;if(typeof r!='number')r=10;m(s._.elementNames,q.elementNames,r);m(s._.attributeNames,q.attributeNames,r);n(s._.elements,q.elements,r);n(s._.attributes,q.attributes,r);s._.text=o(s._.text,q.text,r)||s._.text;s._.comment=o(s._.comment,q.comment,r)||s._.comment;
+s._.root=o(s._.root,q.root,r)||s._.root;},onElementName:function(q){return l(q,this._.elementNames);},onAttributeName:function(q){return l(q,this._.attributeNames);},onText:function(q){var r=this._.text;return r?r.filter(q):q;},onComment:function(q,r){var s=this._.comment;return s?s.filter(q,r):q;},onFragment:function(q){var r=this._.root;return r?r.filter(q):q;},onElement:function(q){var v=this;var r=[v._.elements['^'],v._.elements[q.name],v._.elements.$],s,t;for(var u=0;u<3;u++){s=r[u];if(s){t=s.filter(q,v);if(t===false)return null;if(t&&t!=q)return v.onNode(t);if(q.parent&&!q.name)break;}}return q;},onNode:function(q){var r=q.type;return r==1?this.onElement(q):r==3?new a.htmlParser.text(this.onText(q.value)):r==8?new a.htmlParser.comment(this.onComment(q.value)):null;},onAttribute:function(q,r,s){var t=this._.attributes[r];if(t){var u=t.filter(s,q,this);if(u===false)return false;if(typeof u!='undefined')return u;}return s;}}});function l(q,r){for(var s=0;q&&s<r.length;s++){var t=r[s];q=q.replace(t[0],t[1]);}return q;};function m(q,r,s){if(typeof r=='function')r=[r];var t,u,v=q.length,w=r&&r.length;if(w){for(t=0;t<v&&q[t].pri<s;t++){}for(u=w-1;u>=0;u--){var x=r[u];if(x){x.pri=s;q.splice(t,0,x);}}}};function n(q,r,s){if(r)for(var t in r){var u=q[t];q[t]=o(u,r[t],s);if(!u)q.$length++;}};function o(q,r,s){if(r){r.pri=s;if(q){if(!q.splice){if(q.pri>s)q=[r,q];else q=[q,r];q.filter=p;}else m(q,r,s);return q;}else{r.filter=r;return r;}}};function p(q){var r=q.type||q instanceof a.htmlParser.fragment;for(var s=0;s<this.length;s++){if(r)var t=q.type,u=q.name;var v=this[s],w=v.apply(window,arguments);if(w===false)return w;if(r){if(w&&(w.name!=u||w.type!=t))return w;}else if(typeof w!='string')return w;w!=undefined&&(q=w);}return q;};})();a.htmlParser.basicWriter=e.createClass({$:function(){this._={output:[]};},proto:{openTag:function(l,m){this._.output.push('<',l);},openTagClose:function(l,m){if(m)this._.output.push(' />');else this._.output.push('>');},attribute:function(l,m){if(typeof m=='string')m=e.htmlEncodeAttr(m);this._.output.push(' ',l,'="',m,'"');},closeTag:function(l){this._.output.push('</',l,'>');},text:function(l){this._.output.push(l);},comment:function(l){this._.output.push('<!--',l,'-->');},write:function(l){this._.output.push(l);},reset:function(){this._.output=[];this._.indent=false;},getHtml:function(l){var m=this._.output.join('');if(l)this.reset();return m;}}});delete a.loadFullCore;a.instances={};a.document=new g(document);a.add=function(l){a.instances[l.name]=l;
+l.on('focus',function(){if(a.currentInstance!=l){a.currentInstance=l;a.fire('currentInstance');}});l.on('blur',function(){if(a.currentInstance==l){a.currentInstance=null;a.fire('currentInstance');}});};a.remove=function(l){delete a.instances[l.name];};a.on('instanceDestroyed',function(){if(e.isEmpty(this.instances))a.fire('reset');});a.TRISTATE_ON=1;a.TRISTATE_OFF=2;a.TRISTATE_DISABLED=0;d.comment=e.createClass({base:d.node,$:function(l,m){if(typeof l=='string')l=(m?m.$:document).createComment(l);this.base(l);},proto:{type:8,getOuterHtml:function(){return '<!--'+this.$.nodeValue+'-->';}}});(function(){var l={address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1,legend:1,caption:1},m={body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,form:1,fieldset:1},n=function(o){var p=o.getChildren();for(var q=0,r=p.count();q<r;q++){var s=p.getItem(q);if(s.type==1&&f.$block[s.getName()])return true;}return false;};d.elementPath=function(o){var u=this;var p=null,q=null,r=[],s=o;while(s){if(s.type==1){if(!u.lastElement)u.lastElement=s;var t=s.getName();if(c&&s.$.scopeName!='HTML')t=s.$.scopeName.toLowerCase()+':'+t;if(!q){if(!p&&l[t])p=s;if(m[t])if(!p&&t=='div'&&!n(s))p=s;else q=s;}r.push(s);if(t=='body')break;}s=s.getParent();}u.block=p;u.blockLimit=q;u.elements=r;};})();d.elementPath.prototype={compare:function(l){var m=this.elements,n=l&&l.elements;if(!n||m.length!=n.length)return false;for(var o=0;o<m.length;o++){if(!m[o].equals(n[o]))return false;}return true;},contains:function(l){var m=this.elements;for(var n=0;n<m.length;n++){if(m[n].getName() in l)return m[n];}return null;}};d.text=function(l,m){if(typeof l=='string')l=(m?m.$:document).createTextNode(l);this.$=l;};d.text.prototype=new d.node();e.extend(d.text.prototype,{type:3,getLength:function(){return this.$.nodeValue.length;},getText:function(){return this.$.nodeValue;},setText:function(l){this.$.nodeValue=l;},split:function(l){var q=this;if(c&&l==q.getLength()){var m=q.getDocument().createText('');m.insertAfter(q);return m;}var n=q.getDocument(),o=new d.text(q.$.splitText(l),n);if(b.ie8){var p=new d.text('',n);p.insertAfter(o);p.remove();}return o;},substring:function(l,m){if(typeof m!='number')return this.$.nodeValue.substr(l);else return this.$.nodeValue.substring(l,m);}});d.documentFragment=function(l){l=l||a.document;this.$=l.$.createDocumentFragment();};e.extend(d.documentFragment.prototype,h.prototype,{type:11,insertAfterNode:function(l){l=l.$;l.parentNode.insertBefore(this.$,l.nextSibling);
+}},true,{append:1,appendBogus:1,getFirst:1,getLast:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});(function(){function l(s,t){if(this._.end)return null;var u,v=this.range,w,x=this.guard,y=this.type,z=s?'getPreviousSourceNode':'getNextSourceNode';if(!this._.start){this._.start=1;v.trim();if(v.collapsed){this.end();return null;}}if(!s&&!this._.guardLTR){var A=v.endContainer,B=A.getChild(v.endOffset);this._.guardLTR=function(F,G){return(!G||!A.equals(F))&&(!B||!F.equals(B))&&(F.type!=1||!G||F.getName()!='body');};}if(s&&!this._.guardRTL){var C=v.startContainer,D=v.startOffset>0&&C.getChild(v.startOffset-1);this._.guardRTL=function(F,G){return(!G||!C.equals(F))&&(!D||!F.equals(D))&&(F.type!=1||!G||F.getName()!='body');};}var E=s?this._.guardRTL:this._.guardLTR;if(x)w=function(F,G){if(E(F,G)===false)return false;return x(F,G);};else w=E;if(this.current)u=this.current[z](false,y,w);else if(s){u=v.endContainer;if(v.endOffset>0){u=u.getChild(v.endOffset-1);if(w(u)===false)u=null;}else u=w(u,true)===false?null:u.getPreviousSourceNode(true,y,w);}else{u=v.startContainer;u=u.getChild(v.startOffset);if(u){if(w(u)===false)u=null;}else u=w(v.startContainer,true)===false?null:v.startContainer.getNextSourceNode(true,y,w);}while(u&&!this._.end){this.current=u;if(!this.evaluator||this.evaluator(u)!==false){if(!t)return u;}else if(t&&this.evaluator)return false;u=u[z](false,y,w);}this.end();return this.current=null;};function m(s){var t,u=null;while(t=l.call(this,s))u=t;return u;};d.walker=e.createClass({$:function(s){this.range=s;this._={};},proto:{end:function(){this._.end=1;},next:function(){return l.call(this);},previous:function(){return l.call(this,1);},checkForward:function(){return l.call(this,0,1)!==false;},checkBackward:function(){return l.call(this,1,1)!==false;},lastForward:function(){return m.call(this);},lastBackward:function(){return m.call(this,1);},reset:function(){delete this.current;this._={};}}});var n={block:1,'list-item':1,table:1,'table-row-group':1,'table-header-group':1,'table-footer-group':1,'table-row':1,'table-column-group':1,'table-column':1,'table-cell':1,'table-caption':1};h.prototype.isBlockBoundary=function(s){var t=s?e.extend({},f.$block,s||{}):f.$block;return this.getComputedStyle('float')=='none'&&n[this.getComputedStyle('display')]||t[this.getName()];};d.walker.blockBoundary=function(s){return function(t,u){return!(t.type==1&&t.isBlockBoundary(s));
+};};d.walker.listItemBoundary=function(){return this.blockBoundary({br:1});};d.walker.bookmark=function(s,t){function u(v){return v&&v.getName&&v.getName()=='span'&&v.data('cke-bookmark');};return function(v){var w,x;w=v&&!v.getName&&(x=v.getParent())&&u(x);w=s?w:w||u(v);return!!(t^w);};};d.walker.whitespaces=function(s){return function(t){var u=t&&t.type==3&&!e.trim(t.getText());return!!(s^u);};};d.walker.invisible=function(s){var t=d.walker.whitespaces();return function(u){var v=t(u)||u.is&&!u.$.offsetHeight;return!!(s^v);};};d.walker.nodeType=function(s,t){return function(u){return!!(t^u.type==s);};};var o=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,p=d.walker.whitespaces(),q=d.walker.bookmark(),r=function(s){return q(s)||p(s)||s.type==1&&s.getName() in f.$inline&&!(s.getName() in f.$empty);};h.prototype.getBogus=function(){var s=this;do s=s.getPreviousSourceNode();while(r(s))if(s&&(!c?s.is&&s.is('br'):s.getText&&o.test(s.getText())))return s;return false;};})();d.range=function(l){var m=this;m.startContainer=null;m.startOffset=null;m.endContainer=null;m.endOffset=null;m.collapsed=true;m.document=l;};(function(){var l=function(t){t.collapsed=t.startContainer&&t.endContainer&&t.startContainer.equals(t.endContainer)&&t.startOffset==t.endOffset;},m=function(t,u,v,w){t.optimizeBookmark();var x=t.startContainer,y=t.endContainer,z=t.startOffset,A=t.endOffset,B,C;if(y.type==3)y=y.split(A);else if(y.getChildCount()>0)if(A>=y.getChildCount()){y=y.append(t.document.createText(''));C=true;}else y=y.getChild(A);if(x.type==3){x.split(z);if(x.equals(y))y=x.getNext();}else if(!z){x=x.getFirst().insertBeforeMe(t.document.createText(''));B=true;}else if(z>=x.getChildCount()){x=x.append(t.document.createText(''));B=true;}else x=x.getChild(z).getPrevious();var D=x.getParents(),E=y.getParents(),F,G,H;for(F=0;F<D.length;F++){G=D[F];H=E[F];if(!G.equals(H))break;}var I=v,J,K,L,M;for(var N=F;N<D.length;N++){J=D[N];if(I&&!J.equals(x))K=I.append(J.clone());L=J.getNext();while(L){if(L.equals(E[N])||L.equals(y))break;M=L.getNext();if(u==2)I.append(L.clone(true));else{L.remove();if(u==1)I.append(L);}L=M;}if(I)I=K;}I=v;for(var O=F;O<E.length;O++){J=E[O];if(u>0&&!J.equals(y))K=I.append(J.clone());if(!D[O]||J.$.parentNode!=D[O].$.parentNode){L=J.getPrevious();while(L){if(L.equals(D[O])||L.equals(x))break;M=L.getPrevious();if(u==2)I.$.insertBefore(L.$.cloneNode(true),I.$.firstChild);else{L.remove();if(u==1)I.$.insertBefore(L.$,I.$.firstChild);}L=M;}}if(I)I=K;}if(u==2){var P=t.startContainer;if(P.type==3){P.$.data+=P.$.nextSibling.data;
+P.$.parentNode.removeChild(P.$.nextSibling);}var Q=t.endContainer;if(Q.type==3&&Q.$.nextSibling){Q.$.data+=Q.$.nextSibling.data;Q.$.parentNode.removeChild(Q.$.nextSibling);}}else{if(G&&H&&(x.$.parentNode!=G.$.parentNode||y.$.parentNode!=H.$.parentNode)){var R=H.getIndex();if(B&&H.$.parentNode==x.$.parentNode)R--;if(w&&G.type==1){var S=h.createFromHtml('<span data-cke-bookmark="1" style="display:none">&nbsp;</span>',t.document);S.insertAfter(G);G.mergeSiblings(false);t.moveToBookmark({startNode:S});}else t.setStart(H.getParent(),R);}t.collapse(true);}if(B)x.remove();if(C&&y.$.parentNode)y.remove();},n={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1};function o(t){var u=false,v=d.walker.bookmark(true);return function(w){if(v(w))return true;if(w.type==3){if(w.hasAscendant('pre')||e.trim(w.getText()).length)return false;}else if(w.type==1)if(!n[w.getName()])if(!t&&!c&&w.getName()=='br'&&!u)u=true;else return false;return true;};};function p(t){return t.type!=3&&t.getName() in f.$removeEmpty||!e.trim(t.getText())||!!t.getParent().data('cke-bookmark');};var q=new d.walker.whitespaces(),r=new d.walker.bookmark();function s(t){return!q(t)&&!r(t);};d.range.prototype={clone:function(){var u=this;var t=new d.range(u.document);t.startContainer=u.startContainer;t.startOffset=u.startOffset;t.endContainer=u.endContainer;t.endOffset=u.endOffset;t.collapsed=u.collapsed;return t;},collapse:function(t){var u=this;if(t){u.endContainer=u.startContainer;u.endOffset=u.startOffset;}else{u.startContainer=u.endContainer;u.startOffset=u.endOffset;}u.collapsed=true;},cloneContents:function(){var t=new d.documentFragment(this.document);if(!this.collapsed)m(this,2,t);return t;},deleteContents:function(t){if(this.collapsed)return;m(this,0,null,t);},extractContents:function(t){var u=new d.documentFragment(this.document);if(!this.collapsed)m(this,1,u,t);return u;},createBookmark:function(t){var z=this;var u,v,w,x,y=z.collapsed;u=z.document.createElement('span');u.data('cke-bookmark',1);u.setStyle('display','none');u.setHtml('&nbsp;');if(t){w='cke_bm_'+e.getNextNumber();u.setAttribute('id',w+'S');}if(!y){v=u.clone();v.setHtml('&nbsp;');if(t)v.setAttribute('id',w+'E');x=z.clone();x.collapse();x.insertNode(v);}x=z.clone();x.collapse(true);x.insertNode(u);if(v){z.setStartAfter(u);z.setEndBefore(v);}else z.moveToPosition(u,4);return{startNode:t?w+'S':u,endNode:t?w+'E':v,serializable:t,collapsed:y};
+},createBookmark2:function(t){var B=this;var u=B.startContainer,v=B.endContainer,w=B.startOffset,x=B.endOffset,y=B.collapsed,z,A;if(!u||!v)return{start:0,end:0};if(t){if(u.type==1){z=u.getChild(w);if(z&&z.type==3&&w>0&&z.getPrevious().type==3){u=z;w=0;}if(z&&z.type==1)w=z.getIndex(1);}while(u.type==3&&(A=u.getPrevious())&&A.type==3){u=A;w+=A.getLength();}if(!y){if(v.type==1){z=v.getChild(x);if(z&&z.type==3&&x>0&&z.getPrevious().type==3){v=z;x=0;}if(z&&z.type==1)x=z.getIndex(1);}while(v.type==3&&(A=v.getPrevious())&&A.type==3){v=A;x+=A.getLength();}}}return{start:u.getAddress(t),end:y?null:v.getAddress(t),startOffset:w,endOffset:x,normalized:t,collapsed:y,is2:true};},moveToBookmark:function(t){var B=this;if(t.is2){var u=B.document.getByAddress(t.start,t.normalized),v=t.startOffset,w=t.end&&B.document.getByAddress(t.end,t.normalized),x=t.endOffset;B.setStart(u,v);if(w)B.setEnd(w,x);else B.collapse(true);}else{var y=t.serializable,z=y?B.document.getById(t.startNode):t.startNode,A=y?B.document.getById(t.endNode):t.endNode;B.setStartBefore(z);z.remove();if(A){B.setEndBefore(A);A.remove();}else B.collapse(true);}},getBoundaryNodes:function(){var y=this;var t=y.startContainer,u=y.endContainer,v=y.startOffset,w=y.endOffset,x;if(t.type==1){x=t.getChildCount();if(x>v)t=t.getChild(v);else if(x<1)t=t.getPreviousSourceNode();else{t=t.$;while(t.lastChild)t=t.lastChild;t=new d.node(t);t=t.getNextSourceNode()||t;}}if(u.type==1){x=u.getChildCount();if(x>w)u=u.getChild(w).getPreviousSourceNode(true);else if(x<1)u=u.getPreviousSourceNode();else{u=u.$;while(u.lastChild)u=u.lastChild;u=new d.node(u);}}if(t.getPosition(u)&2)t=u;return{startNode:t,endNode:u};},getCommonAncestor:function(t,u){var y=this;var v=y.startContainer,w=y.endContainer,x;if(v.equals(w)){if(t&&v.type==1&&y.startOffset==y.endOffset-1)x=v.getChild(y.startOffset);else x=v;}else x=v.getCommonAncestor(w);return u&&!x.is?x.getParent():x;},optimize:function(){var v=this;var t=v.startContainer,u=v.startOffset;if(t.type!=1)if(!u)v.setStartBefore(t);else if(u>=t.getLength())v.setStartAfter(t);t=v.endContainer;u=v.endOffset;if(t.type!=1)if(!u)v.setEndBefore(t);else if(u>=t.getLength())v.setEndAfter(t);},optimizeBookmark:function(){var v=this;var t=v.startContainer,u=v.endContainer;if(t.is&&t.is('span')&&t.data('cke-bookmark'))v.setStartAt(t,3);if(u&&u.is&&u.is('span')&&u.data('cke-bookmark'))v.setEndAt(u,4);},trim:function(t,u){var B=this;var v=B.startContainer,w=B.startOffset,x=B.collapsed;if((!t||x)&&v&&v.type==3){if(!w){w=v.getIndex();
+v=v.getParent();}else if(w>=v.getLength()){w=v.getIndex()+1;v=v.getParent();}else{var y=v.split(w);w=v.getIndex()+1;v=v.getParent();if(B.startContainer.equals(B.endContainer))B.setEnd(y,B.endOffset-B.startOffset);else if(v.equals(B.endContainer))B.endOffset+=1;}B.setStart(v,w);if(x){B.collapse(true);return;}}var z=B.endContainer,A=B.endOffset;if(!(u||x)&&z&&z.type==3){if(!A){A=z.getIndex();z=z.getParent();}else if(A>=z.getLength()){A=z.getIndex()+1;z=z.getParent();}else{z.split(A);A=z.getIndex()+1;z=z.getParent();}B.setEnd(z,A);}},enlarge:function(t,u){switch(t){case 1:if(this.collapsed)return;var v=this.getCommonAncestor(),w=this.document.getBody(),x,y,z,A,B,C=false,D,E,F=this.startContainer,G=this.startOffset;if(F.type==3){if(G){F=!e.trim(F.substring(0,G)).length&&F;C=!!F;}if(F)if(!(A=F.getPrevious()))z=F.getParent();}else{if(G)A=F.getChild(G-1)||F.getLast();if(!A)z=F;}while(z||A){if(z&&!A){if(!B&&z.equals(v))B=true;if(!w.contains(z))break;if(!C||z.getComputedStyle('display')!='inline'){C=false;if(B)x=z;else this.setStartBefore(z);}A=z.getPrevious();}while(A){D=false;if(A.type==3){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;D=/[\s\ufeff]$/.test(E);}else if((A.$.offsetWidth>0||u&&A.is('br'))&&!A.data('cke-bookmark'))if(C&&f.$removeEmpty[A.getName()]){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;else{var H=A.$.all||A.$.getElementsByTagName('*');for(var I=0,J;J=H[I++];){if(!f.$removeEmpty[J.nodeName.toLowerCase()]){A=null;break;}}}if(A)D=!!E.length;}else A=null;if(D)if(C){if(B)x=z;else if(z)this.setStartBefore(z);}else C=true;if(A){var K=A.getPrevious();if(!z&&!K){z=A;A=null;break;}A=K;}else z=null;}if(z)z=z.getParent();}F=this.endContainer;G=this.endOffset;z=A=null;B=C=false;if(F.type==3){F=!e.trim(F.substring(G)).length&&F;C=!(F&&F.getLength());if(F)if(!(A=F.getNext()))z=F.getParent();}else{A=F.getChild(G);if(!A)z=F;}while(z||A){if(z&&!A){if(!B&&z.equals(v))B=true;if(!w.contains(z))break;if(!C||z.getComputedStyle('display')!='inline'){C=false;if(B)y=z;else if(z)this.setEndAfter(z);}A=z.getNext();}while(A){D=false;if(A.type==3){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;D=/^[\s\ufeff]/.test(E);}else if((A.$.offsetWidth>0||u&&A.is('br'))&&!A.data('cke-bookmark'))if(C&&f.$removeEmpty[A.getName()]){E=A.getText();if(/[^\s\ufeff]/.test(E))A=null;else{H=A.$.all||A.$.getElementsByTagName('*');for(I=0;J=H[I++];){if(!f.$removeEmpty[J.nodeName.toLowerCase()]){A=null;break;}}}if(A)D=!!E.length;}else A=null;if(D)if(C)if(B)y=z;else this.setEndAfter(z);if(A){K=A.getNext();
+if(!z&&!K){z=A;A=null;break;}A=K;}else z=null;}if(z)z=z.getParent();}if(x&&y){v=x.contains(y)?y:x;this.setStartBefore(v);this.setEndAfter(v);}break;case 2:case 3:var L=new d.range(this.document);w=this.document.getBody();L.setStartAt(w,1);L.setEnd(this.startContainer,this.startOffset);var M=new d.walker(L),N,O,P=d.walker.blockBoundary(t==3?{br:1}:null),Q=function(W){var X=P(W);if(!X)N=W;return X;},R=function(W){var X=Q(W);if(!X&&W.is&&W.is('br'))O=W;return X;};M.guard=Q;z=M.lastBackward();N=N||w;this.setStartAt(N,!N.is('br')&&(!z&&this.checkStartOfBlock()||z&&N.contains(z))?1:4);if(t==3){var S=this.clone();M=new d.walker(S);var T=d.walker.whitespaces(),U=d.walker.bookmark();M.evaluator=function(W){return!T(W)&&!U(W);};var V=M.previous();if(V&&V.type==1&&V.is('br'))return;}L=this.clone();L.collapse();L.setEndAt(w,2);M=new d.walker(L);M.guard=t==3?R:Q;N=null;z=M.lastForward();N=N||w;this.setEndAt(N,!z&&this.checkEndOfBlock()||z&&N.contains(z)?2:3);if(O)this.setEndAfter(O);}},shrink:function(t,u){if(!this.collapsed){t=t||2;var v=this.clone(),w=this.startContainer,x=this.endContainer,y=this.startOffset,z=this.endOffset,A=this.collapsed,B=1,C=1;if(w&&w.type==3)if(!y)v.setStartBefore(w);else if(y>=w.getLength())v.setStartAfter(w);else{v.setStartBefore(w);B=0;}if(x&&x.type==3)if(!z)v.setEndBefore(x);else if(z>=x.getLength())v.setEndAfter(x);else{v.setEndAfter(x);C=0;}var D=new d.walker(v),E=d.walker.bookmark();D.evaluator=function(I){return I.type==(t==1?1:3);};var F;D.guard=function(I,J){if(E(I))return true;if(t==1&&I.type==3)return false;if(J&&I.equals(F))return false;if(!J&&I.type==1)F=I;return true;};if(B){var G=D[t==1?'lastForward':'next']();G&&this.setStartAt(G,u?1:3);}if(C){D.reset();var H=D[t==1?'lastBackward':'previous']();H&&this.setEndAt(H,u?2:4);}return!!(B||C);}},insertNode:function(t){var x=this;x.optimizeBookmark();x.trim(false,true);var u=x.startContainer,v=x.startOffset,w=u.getChild(v);if(w)t.insertBefore(w);else u.append(t);if(t.getParent().equals(x.endContainer))x.endOffset++;x.setStartBefore(t);},moveToPosition:function(t,u){this.setStartAt(t,u);this.collapse(true);},selectNodeContents:function(t){this.setStart(t,0);this.setEnd(t,t.type==3?t.getLength():t.getChildCount());},setStart:function(t,u){var v=this;if(t.type==1&&f.$empty[t.getName()])u=t.getIndex(),t=t.getParent();v.startContainer=t;v.startOffset=u;if(!v.endContainer){v.endContainer=t;v.endOffset=u;}l(v);},setEnd:function(t,u){var v=this;if(t.type==1&&f.$empty[t.getName()])u=t.getIndex()+1,t=t.getParent();
+v.endContainer=t;v.endOffset=u;if(!v.startContainer){v.startContainer=t;v.startOffset=u;}l(v);},setStartAfter:function(t){this.setStart(t.getParent(),t.getIndex()+1);},setStartBefore:function(t){this.setStart(t.getParent(),t.getIndex());},setEndAfter:function(t){this.setEnd(t.getParent(),t.getIndex()+1);},setEndBefore:function(t){this.setEnd(t.getParent(),t.getIndex());},setStartAt:function(t,u){var v=this;switch(u){case 1:v.setStart(t,0);break;case 2:if(t.type==3)v.setStart(t,t.getLength());else v.setStart(t,t.getChildCount());break;case 3:v.setStartBefore(t);break;case 4:v.setStartAfter(t);}l(v);},setEndAt:function(t,u){var v=this;switch(u){case 1:v.setEnd(t,0);break;case 2:if(t.type==3)v.setEnd(t,t.getLength());else v.setEnd(t,t.getChildCount());break;case 3:v.setEndBefore(t);break;case 4:v.setEndAfter(t);}l(v);},fixBlock:function(t,u){var x=this;var v=x.createBookmark(),w=x.document.createElement(u);x.collapse(t);x.enlarge(2);x.extractContents().appendTo(w);w.trim();if(!c)w.appendBogus();x.insertNode(w);x.moveToBookmark(v);return w;},splitBlock:function(t){var D=this;var u=new d.elementPath(D.startContainer),v=new d.elementPath(D.endContainer),w=u.blockLimit,x=v.blockLimit,y=u.block,z=v.block,A=null;if(!w.equals(x))return null;if(t!='br'){if(!y){y=D.fixBlock(true,t);z=new d.elementPath(D.endContainer).block;}if(!z)z=D.fixBlock(false,t);}var B=y&&D.checkStartOfBlock(),C=z&&D.checkEndOfBlock();D.deleteContents();if(y&&y.equals(z))if(C){A=new d.elementPath(D.startContainer);D.moveToPosition(z,4);z=null;}else if(B){A=new d.elementPath(D.startContainer);D.moveToPosition(y,3);y=null;}else{z=D.splitElement(y);if(!c&&!y.is('ul','ol'))y.appendBogus();}return{previousBlock:y,nextBlock:z,wasStartOfBlock:B,wasEndOfBlock:C,elementPath:A};},splitElement:function(t){var w=this;if(!w.collapsed)return null;w.setEndAt(t,2);var u=w.extractContents(),v=t.clone(false);u.appendTo(v);v.insertAfter(t);w.moveToPosition(t,4);return v;},checkBoundaryOfElement:function(t,u){var v=u==1,w=this.clone();w.collapse(v);w[v?'setStartAt':'setEndAt'](t,v?1:2);var x=new d.walker(w);x.evaluator=p;return x[v?'checkBackward':'checkForward']();},checkStartOfBlock:function(){var z=this;var t=z.startContainer,u=z.startOffset;if(u&&t.type==3){var v=e.ltrim(t.substring(0,u));if(v.length)return false;}z.trim();var w=new d.elementPath(z.startContainer),x=z.clone();x.collapse(true);x.setStartAt(w.block||w.blockLimit,1);var y=new d.walker(x);y.evaluator=o(true);return y.checkBackward();},checkEndOfBlock:function(){var z=this;
+var t=z.endContainer,u=z.endOffset;if(t.type==3){var v=e.rtrim(t.substring(u));if(v.length)return false;}z.trim();var w=new d.elementPath(z.endContainer),x=z.clone();x.collapse(false);x.setEndAt(w.block||w.blockLimit,2);var y=new d.walker(x);y.evaluator=o(false);return y.checkForward();},checkReadOnly:(function(){function t(u,v){while(u){if(u.type==1)if(u.getAttribute('contentEditable')=='false'&&!u.data('cke-editable'))return 0;else if(u.is('html')||u.getAttribute('contentEditable')=='true'&&(u.contains(v)||u.equals(v)))break;u=u.getParent();}return 1;};return function(){var u=this.startContainer,v=this.endContainer;return!(t(u,v)&&t(v,u));};})(),moveToElementEditablePosition:function(t,u){function v(x,y){var z;if(x.type==1&&x.isEditable(false)&&!f.$nonEditable[x.getName()])z=x[u?'getLast':'getFirst'](s);if(!y&&!z)z=x[u?'getPrevious':'getNext'](s);return z;};var w=0;while(t){if(t.type==3){this.moveToPosition(t,u?4:3);w=1;break;}if(t.type==1)if(t.isEditable()){this.moveToPosition(t,u?2:1);w=1;}t=v(t,w);}return!!w;},moveToElementEditStart:function(t){return this.moveToElementEditablePosition(t);},moveToElementEditEnd:function(t){return this.moveToElementEditablePosition(t,true);},getEnclosedNode:function(){var t=this.clone();t.optimize();if(t.startContainer.type!=1||t.endContainer.type!=1)return null;var u=new d.walker(t),v=d.walker.bookmark(true),w=d.walker.whitespaces(true),x=function(z){return w(z)&&v(z);};t.evaluator=x;var y=u.next();u.reset();return y&&y.equals(u.previous())?y:null;},getTouchedStartNode:function(){var t=this.startContainer;if(this.collapsed||t.type!=1)return t;return t.getChild(this.startOffset)||t;},getTouchedEndNode:function(){var t=this.endContainer;if(this.collapsed||t.type!=1)return t;return t.getChild(this.endOffset-1)||t;}};})();a.POSITION_AFTER_START=1;a.POSITION_BEFORE_END=2;a.POSITION_BEFORE_START=3;a.POSITION_AFTER_END=4;a.ENLARGE_ELEMENT=1;a.ENLARGE_BLOCK_CONTENTS=2;a.ENLARGE_LIST_ITEM_CONTENTS=3;a.START=1;a.END=2;a.STARTEND=3;a.SHRINK_ELEMENT=1;a.SHRINK_TEXT=2;(function(){d.rangeList=function(n){if(n instanceof d.rangeList)return n;if(!n)n=[];else if(n instanceof d.range)n=[n];return e.extend(n,l);};var l={createIterator:function(){var n=this,o=d.walker.bookmark(),p=function(s){return!(s.is&&s.is('tr'));},q=[],r;return{getNextRange:function(s){r=r==undefined?0:r+1;var t=n[r];if(t&&n.length>1){if(!r)for(var u=n.length-1;u>=0;u--)q.unshift(n[u].createBookmark(true));if(s){var v=0;while(n[r+v+1]){var w=t.document,x=0,y=w.getById(q[v].endNode),z=w.getById(q[v+1].startNode),A;
+while(1){A=y.getNextSourceNode(false);if(!z.equals(A)){if(o(A)||A.type==1&&A.isBlockBoundary()){y=A;continue;}}else x=1;break;}if(!x)break;v++;}}t.moveToBookmark(q.shift());while(v--){A=n[++r];A.moveToBookmark(q.shift());t.setEnd(A.endContainer,A.endOffset);}}return t;}};},createBookmarks:function(n){var s=this;var o=[],p;for(var q=0;q<s.length;q++){o.push(p=s[q].createBookmark(n,true));for(var r=q+1;r<s.length;r++){s[r]=m(p,s[r]);s[r]=m(p,s[r],true);}}return o;},createBookmarks2:function(n){var o=[];for(var p=0;p<this.length;p++)o.push(this[p].createBookmark2(n));return o;},moveToBookmarks:function(n){for(var o=0;o<this.length;o++)this[o].moveToBookmark(n[o]);}};function m(n,o,p){var q=n.serializable,r=o[p?'endContainer':'startContainer'],s=p?'endOffset':'startOffset',t=q?o.document.getById(n.startNode):n.startNode,u=q?o.document.getById(n.endNode):n.endNode;if(r.equals(t.getPrevious())){o.startOffset=o.startOffset-r.getLength()-u.getPrevious().getLength();r=u.getNext();}else if(r.equals(u.getPrevious())){o.startOffset=o.startOffset-r.getLength();r=u.getNext();}r.equals(t.getParent())&&o[s]++;r.equals(u.getParent())&&o[s]++;o[p?'endContainer':'startContainer']=r;return o;};})();(function(){if(b.webkit){b.hc=false;return;}var l=h.createFromHtml('<div style="width:0px;height:0px;position:absolute;left:-10000px;border: 1px solid;border-color: red blue;"></div>',a.document);l.appendTo(a.document.getHead());try{b.hc=l.getComputedStyle('border-top-color')==l.getComputedStyle('border-right-color');}catch(m){b.hc=false;}if(b.hc)b.cssClass+=' cke_hc';l.remove();})();j.load(i.corePlugins.split(','),function(){a.status='loaded';a.fire('loaded');var l=a._.pending;if(l){delete a._.pending;for(var m=0;m<l.length;m++)a.add(l[m]);}});if(c)try{document.execCommand('BackgroundImageCache',false,true);}catch(l){}a.skins.add('kama',(function(){var m='cke_ui_color';return{editor:{css:['editor.css']},dialog:{css:['dialog.css']},templates:{css:['templates.css']},margins:[0,0,0,0],init:function(n){if(n.config.width&&!isNaN(n.config.width))n.config.width-=12;var o=[],p=/\$color/g,q='/* UI Color Support */.cke_skin_kama .cke_menuitem .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover .cke_label,.cke_skin_kama .cke_menuitem a:focus .cke_label,.cke_skin_kama .cke_menuitem a:active .cke_label{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label{\tbackground-color: transparent !important;}.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper{\tbackground-color: $color !important;\tborder-color: $color !important;}.cke_skin_kama .cke_menuseparator{\tbackground-color: $color !important;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{\tbackground-color: $color !important;}';
+if(b.webkit){q=q.split('}').slice(0,-1);for(var r=0;r<q.length;r++)q[r]=q[r].split('{');}function s(v){var w=v.getById(m);if(!w){w=v.getHead().append('style');w.setAttribute('id',m);w.setAttribute('type','text/css');}return w;};function t(v,w,x){var y,z,A;for(var B=0;B<v.length;B++){if(b.webkit)for(z=0;z<w.length;z++){A=w[z][1];for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);v[B].$.sheet.addRule(w[z][0],A);}else{A=w;for(y=0;y<x.length;y++)A=A.replace(x[y][0],x[y][1]);if(c)v[B].$.styleSheet.cssText+=A;else v[B].$.innerHTML+=A;}}};var u=/\$color/g;e.extend(n,{uiColor:null,getUiColor:function(){return this.uiColor;},setUiColor:function(v){var w,x=s(a.document),y='.'+n.id,z=[y+' .cke_wrapper',y+'_dialog a.cke_dialog_tab',y+'_dialog .cke_dialog_footer'].join(','),A='background-color: $color !important;';if(b.webkit)w=[[z,A]];else w=z+'{'+A+'}';return(this.setUiColor=function(B){var C=[[u,B]];n.uiColor=B;t([x],w,C);t(o,q,C);})(v);}});n.on('menuShow',function(v){var w=v.data[0],x=w.element.getElementsByTag('iframe').getItem(0).getFrameDocument();if(!x.getById('cke_ui_color')){var y=s(x);o.push(y);var z=n.getUiColor();if(z)t([y],q,[[u,z]]);}});if(n.config.uiColor)n.setUiColor(n.config.uiColor);}};})());(function(){a.dialog?m():a.on('dialogPluginReady',m);function m(){a.dialog.on('resize',function(n){var o=n.data,p=o.width,q=o.height,r=o.dialog,s=r.parts.contents;if(o.skin!='kama')return;s.setStyles({width:p+'px',height:q+'px'});setTimeout(function(){var t=r.parts.dialog.getChild([0,0,0]),u=t.getChild(0),v=t.getChild(2);v.setStyle('width',u.$.offsetWidth+'px');v=t.getChild(7);v.setStyle('width',u.$.offsetWidth-28+'px');v=t.getChild(4);v.setStyle('height',q+u.getChild(0).$.offsetHeight+'px');v=t.getChild(5);v.setStyle('height',q+u.getChild(0).$.offsetHeight+'px');},100);});};})();j.add('about',{requires:['dialog'],init:function(m){var n=m.addCommand('about',new a.dialogCommand('about'));n.modes={wysiwyg:1,source:1};n.canUndo=false;n.readOnly=1;m.ui.addButton('About',{label:m.lang.about.title,command:'about'});a.dialog.add('about',this.path+'dialogs/about.js');}});j.add('basicstyles',{requires:['styles','button'],init:function(m){var n=function(q,r,s,t){var u=new a.style(t);m.attachStyleStateChange(u,function(v){!m.readOnly&&m.getCommand(s).setState(v);});m.addCommand(s,new a.styleCommand(u));m.ui.addButton(q,{label:r,command:s});},o=m.config,p=m.lang;n('Bold',p.bold,'bold',o.coreStyles_bold);n('Italic',p.italic,'italic',o.coreStyles_italic);n('Underline',p.underline,'underline',o.coreStyles_underline);
+n('Strike',p.strike,'strike',o.coreStyles_strike);n('Subscript',p.subscript,'subscript',o.coreStyles_subscript);n('Superscript',p.superscript,'superscript',o.coreStyles_superscript);}});i.coreStyles_bold={element:'strong',overrides:'b'};i.coreStyles_italic={element:'em',overrides:'i'};i.coreStyles_underline={element:'u'};i.coreStyles_strike={element:'strike'};i.coreStyles_subscript={element:'sub'};i.coreStyles_superscript={element:'sup'};(function(){var m={table:1,ul:1,ol:1,blockquote:1,div:1},n={},o={};e.extend(n,m,{tr:1,p:1,div:1,li:1});e.extend(o,n,{td:1});function p(B){q(B);r(B);};function q(B){var C=B.editor,D=B.data.path;if(C.readOnly)return;var E=C.config.useComputedState,F;E=E===undefined||E;if(!E)F=s(D.lastElement);F=F||D.block||D.blockLimit;if(F.is('body')){var G=C.getSelection().getRanges()[0].getEnclosedNode();G&&G.type==1&&(F=G);}if(!F)return;var H=E?F.getComputedStyle('direction'):F.getStyle('direction')||F.getAttribute('dir');C.getCommand('bidirtl').setState(H=='rtl'?1:2);C.getCommand('bidiltr').setState(H=='ltr'?1:2);};function r(B){var C=B.editor,D=B.data.path.block||B.data.path.blockLimit;C.fire('contentDirChanged',D?D.getComputedStyle('direction'):C.lang.dir);};function s(B){while(B&&!(B.getName() in o||B.is('body'))){var C=B.getParent();if(!C)break;B=C;}return B;};function t(B,C,D,E){if(B.isReadOnly())return;h.setMarker(E,B,'bidi_processed',1);var F=B;while((F=F.getParent())&&!F.is('body')){if(F.getCustomData('bidi_processed')){B.removeStyle('direction');B.removeAttribute('dir');return;}}var G='useComputedState' in D.config?D.config.useComputedState:1,H=G?B.getComputedStyle('direction'):B.getStyle('direction')||B.hasAttribute('dir');if(H==C)return;B.removeStyle('direction');if(G){B.removeAttribute('dir');if(C!=B.getComputedStyle('direction'))B.setAttribute('dir',C);}else B.setAttribute('dir',C);D.forceNextSelectionCheck();};function u(B,C,D){var E=B.getCommonAncestor(false,true);B=B.clone();B.enlarge(D==2?3:2);if(B.checkBoundaryOfElement(E,1)&&B.checkBoundaryOfElement(E,2)){var F;while(E&&E.type==1&&(F=E.getParent())&&F.getChildCount()==1&&!(E.getName() in C))E=F;return E.type==1&&E.getName() in C&&E;}};function v(B){return function(C){var D=C.getSelection(),E=C.config.enterMode,F=D.getRanges();if(F&&F.length){var G={},H=D.createBookmarks(),I=F.createIterator(),J,K=0;while(J=I.getNextRange(1)){var L=J.getEnclosedNode();if(!L||L&&!(L.type==1&&L.getName() in n))L=u(J,m,E);L&&t(L,B,C,G);var M,N,O=new d.walker(J),P=H[K].startNode,Q=H[K++].endNode;
+O.evaluator=function(R){return!!(R.type==1&&R.getName() in m&&!(R.getName()==(E==1?'p':'div')&&R.getParent().type==1&&R.getParent().getName()=='blockquote')&&R.getPosition(P)&2&&(R.getPosition(Q)&4+16)==4);};while(N=O.next())t(N,B,C,G);M=J.createIterator();M.enlargeBr=E!=2;while(N=M.getNextParagraph(E==1?'p':'div'))t(N,B,C,G);}h.clearAllMarkers(G);C.forceNextSelectionCheck();D.selectBookmarks(H);C.focus();}};};j.add('bidi',{requires:['styles','button'],init:function(B){var C=function(E,F,G,H){B.addCommand(G,new a.command(B,{exec:H}));B.ui.addButton(E,{label:F,command:G});},D=B.lang.bidi;C('BidiLtr',D.ltr,'bidiltr',v('ltr'));C('BidiRtl',D.rtl,'bidirtl',v('rtl'));B.on('selectionChange',p);B.on('contentDom',function(){B.document.on('dirChanged',function(E){B.fire('dirChanged',{node:E.data,dir:E.data.getDirection(1)});});});}});function w(B){var C=B.getDocument().getBody().getParent();while(B){if(B.equals(C))return false;B=B.getParent();}return true;};function x(B){var C=B==y.setAttribute,D=B==y.removeAttribute,E=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(F,G){var J=this;if(!J.getDocument().equals(a.document)){var H;if((F==(C||D?'dir':'direction')||F=='style'&&(D||E.test(G)))&&!w(J)){H=J.getDirection(1);var I=B.apply(J,arguments);if(H!=J.getDirection(1)){J.getDocument().fire('dirChanged',J);return I;}}}return B.apply(J,arguments);};};var y=h.prototype,z=['setStyle','removeStyle','setAttribute','removeAttribute'];for(var A=0;A<z.length;A++)y[z[A]]=e.override(y[z[A]],x);})();(function(){function m(q,r){var s=r.block||r.blockLimit;if(!s||s.getName()=='body')return 2;if(s.getAscendant('blockquote',true))return 1;return 2;};function n(q){var r=q.editor;if(r.readOnly)return;var s=r.getCommand('blockquote');s.state=m(r,q.data.path);s.fire('state');};function o(q){for(var r=0,s=q.getChildCount(),t;r<s&&(t=q.getChild(r));r++){if(t.type==1&&t.isBlockBoundary())return false;}return true;};var p={exec:function(q){var r=q.getCommand('blockquote').state,s=q.getSelection(),t=s&&s.getRanges(true)[0];if(!t)return;var u=s.createBookmarks();if(c){var v=u[0].startNode,w=u[0].endNode,x;if(v&&v.getParent().getName()=='blockquote'){x=v;while(x=x.getNext()){if(x.type==1&&x.isBlockBoundary()){v.move(x,true);break;}}}if(w&&w.getParent().getName()=='blockquote'){x=w;while(x=x.getPrevious()){if(x.type==1&&x.isBlockBoundary()){w.move(x);break;}}}}var y=t.createIterator(),z;y.enlargeBr=q.config.enterMode!=2;if(r==2){var A=[];while(z=y.getNextParagraph())A.push(z);if(A.length<1){var B=q.document.createElement(q.config.enterMode==1?'p':'div'),C=u.shift();
+t.insertNode(B);B.append(new d.text('\ufeff',q.document));t.moveToBookmark(C);t.selectNodeContents(B);t.collapse(true);C=t.createBookmark();A.push(B);u.unshift(C);}var D=A[0].getParent(),E=[];for(var F=0;F<A.length;F++){z=A[F];D=D.getCommonAncestor(z.getParent());}var G={table:1,tbody:1,tr:1,ol:1,ul:1};while(G[D.getName()])D=D.getParent();var H=null;while(A.length>0){z=A.shift();while(!z.getParent().equals(D))z=z.getParent();if(!z.equals(H))E.push(z);H=z;}while(E.length>0){z=E.shift();if(z.getName()=='blockquote'){var I=new d.documentFragment(q.document);while(z.getFirst()){I.append(z.getFirst().remove());A.push(I.getLast());}I.replace(z);}else A.push(z);}var J=q.document.createElement('blockquote');J.insertBefore(A[0]);while(A.length>0){z=A.shift();J.append(z);}}else if(r==1){var K=[],L={};while(z=y.getNextParagraph()){var M=null,N=null;while(z.getParent()){if(z.getParent().getName()=='blockquote'){M=z.getParent();N=z;break;}z=z.getParent();}if(M&&N&&!N.getCustomData('blockquote_moveout')){K.push(N);h.setMarker(L,N,'blockquote_moveout',true);}}h.clearAllMarkers(L);var O=[],P=[];L={};while(K.length>0){var Q=K.shift();J=Q.getParent();if(!Q.getPrevious())Q.remove().insertBefore(J);else if(!Q.getNext())Q.remove().insertAfter(J);else{Q.breakParent(Q.getParent());P.push(Q.getNext());}if(!J.getCustomData('blockquote_processed')){P.push(J);h.setMarker(L,J,'blockquote_processed',true);}O.push(Q);}h.clearAllMarkers(L);for(F=P.length-1;F>=0;F--){J=P[F];if(o(J))J.remove();}if(q.config.enterMode==2){var R=true;while(O.length){Q=O.shift();if(Q.getName()=='div'){I=new d.documentFragment(q.document);var S=R&&Q.getPrevious()&&!(Q.getPrevious().type==1&&Q.getPrevious().isBlockBoundary());if(S)I.append(q.document.createElement('br'));var T=Q.getNext()&&!(Q.getNext().type==1&&Q.getNext().isBlockBoundary());while(Q.getFirst())Q.getFirst().remove().appendTo(I);if(T)I.append(q.document.createElement('br'));I.replace(Q);R=false;}}}}s.selectBookmarks(u);q.focus();}};j.add('blockquote',{init:function(q){q.addCommand('blockquote',p);q.ui.addButton('Blockquote',{label:q.lang.blockquote,command:'blockquote'});q.on('selectionChange',n);},requires:['domiterator']});})();j.add('button',{beforeInit:function(m){m.ui.addHandler(1,k.button.handler);}});a.UI_BUTTON='button';k.button=function(m){e.extend(this,m,{title:m.label,className:m.className||m.command&&'cke_button_'+m.command||'',click:m.click||(function(n){n.execCommand(m.command);})});this._={};};k.button.handler={create:function(m){return new k.button(m);
+}};(function(){k.button.prototype={render:function(m,n){var o=b,p=this._.id=e.getNextId(),q='',r=this.command,s;this._.editor=m;var t={id:p,button:this,editor:m,focus:function(){var z=a.document.getById(p);z.focus();},execute:function(){if(c&&b.version<7)e.setTimeout(function(){this.button.click(m);},0,this);else this.button.click(m);}},u=e.addFunction(function(z){if(t.onkey){z=new d.event(z);return t.onkey(t,z.getKeystroke())!==false;}}),v=e.addFunction(function(z){var A;if(t.onfocus)A=t.onfocus(t,new d.event(z))!==false;if(b.gecko&&b.version<10900)z.preventBubble();return A;});t.clickFn=s=e.addFunction(t.execute,t);if(this.modes){var w={};function x(){var z=m.mode;if(z){var A=this.modes[z]?w[z]!=undefined?w[z]:2:0;this.setState(m.readOnly&&!this.readOnly?0:A);}};m.on('beforeModeUnload',function(){if(m.mode&&this._.state!=0)w[m.mode]=this._.state;},this);m.on('mode',x,this);!this.readOnly&&m.on('readOnly',x,this);}else if(r){r=m.getCommand(r);if(r){r.on('state',function(){this.setState(r.state);},this);q+='cke_'+(r.state==1?'on':r.state==0?'disabled':'off');}}if(!r)q+='cke_off';if(this.className)q+=' '+this.className;n.push('<span class="cke_button'+(this.icon&&this.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">','<a id="',p,'" class="',q,'"',o.gecko&&o.version>=10900&&!o.hc?'':'" href="javascript:void(\''+(this.title||'').replace("'",'')+"')\"",' title="',this.title,'" tabindex="-1" hidefocus="true" role="button" aria-labelledby="'+p+'_label"'+(this.hasArrow?' aria-haspopup="true"':''));if(o.opera||o.gecko&&o.mac)n.push(' onkeypress="return false;"');if(o.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="return CKEDITOR.tools.callFunction(',u,', event);" onfocus="return CKEDITOR.tools.callFunction(',v,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',s,', this); return false;"><span class="cke_icon"');if(this.icon){var y=(this.iconOffset||0)*-16;n.push(' style="background-image:url(',a.getUrl(this.icon),');background-position:0 '+y+'px;"');}n.push('>&nbsp;</span><span id="',p,'_label" class="cke_label">',this.label,'</span>');if(this.hasArrow)n.push('<span class="cke_buttonarrow">'+(b.hc?'&#9660;':'&nbsp;')+'</span>');n.push('</a>','</span>');if(this.onRender)this.onRender();return t;},setState:function(m){if(this._.state==m)return false;this._.state=m;var n=a.document.getById(this._.id);if(n){n.setState(m);m==0?n.setAttribute('aria-disabled',true):n.removeAttribute('aria-disabled');
+m==1?n.setAttribute('aria-pressed',true):n.removeAttribute('aria-pressed');return true;}else return false;}};})();k.prototype.addButton=function(m,n){this.add(m,1,n);};(function(){var m=function(y,z){var A=y.document,B=A.getBody(),C=0,D=function(){C=1;};B.on(z,D);(b.version>7?A.$:A.$.selection.createRange()).execCommand(z);B.removeListener(z,D);return C;},n=c?function(y,z){return m(y,z);}:function(y,z){try{return y.document.$.execCommand(z,false,null);}catch(A){return false;}},o=function(y){var z=this;z.type=y;z.canUndo=z.type=='cut';z.startDisabled=true;};o.prototype={exec:function(y,z){this.type=='cut'&&t(y);var A=n(y,this.type);if(!A)alert(y.lang.clipboard[this.type+'Error']);return A;}};var p={canUndo:false,exec:c?function(y){y.focus();if(!y.document.getBody().fire('beforepaste')&&!m(y,'paste')){y.fire('pasteDialog');return false;}}:function(y){try{if(!y.document.getBody().fire('beforepaste')&&!y.document.$.execCommand('Paste',false,null))throw 0;}catch(z){setTimeout(function(){y.fire('pasteDialog');},0);return false;}}},q=function(y){if(this.mode!='wysiwyg')return;switch(y.data.keyCode){case 1000+86:case 2000+45:var z=this.document.getBody();if(!c&&z.fire('beforepaste'))y.cancel();else if(b.opera||b.gecko&&b.version<10900)z.fire('paste');return;case 1000+88:case 2000+46:var A=this;this.fire('saveSnapshot');setTimeout(function(){A.fire('saveSnapshot');},0);}};function r(y){y.cancel();};function s(y,z,A){var B=this.document;if(B.getById('cke_pastebin'))return;if(z=='text'&&y.data&&y.data.$.clipboardData){var C=y.data.$.clipboardData.getData('text/plain');if(C){y.data.preventDefault();A(C);return;}}var D=this.getSelection(),E=new d.range(B),F=new h(z=='text'?'textarea':b.webkit?'body':'div',B);F.setAttribute('id','cke_pastebin');b.webkit&&F.append(B.createText('\xa0'));B.getBody().append(F);F.setStyles({position:'absolute',top:D.getStartElement().getDocumentPosition().y+'px',width:'1px',height:'1px',overflow:'hidden'});F.setStyle(this.config.contentsLangDirection=='ltr'?'left':'right','-1000px');var G=D.createBookmarks();this.on('selectionChange',r,null,null,0);if(z=='text')F.$.focus();else{E.setStartAt(F,1);E.setEndAt(F,2);E.select(true);}var H=this;window.setTimeout(function(){z=='text'&&b.gecko&&H.focusGrabber.focus();F.remove();H.removeListener('selectionChange',r);var I;F=b.webkit&&(I=F.getFirst())&&I.is&&I.hasClass('Apple-style-span')?I:F;D.selectBookmarks(G);A(F['get'+(z=='text'?'Value':'Html')]());},0);};function t(y){if(!c||b.quirks)return;var z=y.getSelection(),A;
+if(z.getType()==3&&(A=z.getSelectedElement())){var B=z.getRanges()[0],C=y.document.createText('');C.insertBefore(A);B.setStartBefore(C);B.setEndAfter(A);z.selectRanges([B]);setTimeout(function(){if(A.getParent()){C.remove();z.selectElement(A);}},0);}};var u;function v(y,z){c&&(u=1);var A=2;try{A=z.document.$.queryCommandEnabled(y)?2:0;}catch(B){}u=0;return A;};var w;function x(){var z=this;if(z.mode!='wysiwyg')return;z.getCommand('cut').setState(w?0:v('Cut',z));z.getCommand('copy').setState(v('Copy',z));var y=w?0:b.webkit?2:v('Paste',z);z.fire('pasteState',y);};j.add('clipboard',{requires:['dialog','htmldataprocessor'],init:function(y){y.on('paste',function(A){var B=A.data;if(B.html)y.insertHtml(B.html);else if(B.text)y.insertText(B.text);setTimeout(function(){y.fire('afterPaste');},0);},null,null,1000);y.on('pasteDialog',function(A){setTimeout(function(){y.openDialog('paste');},0);});y.on('pasteState',function(A){y.getCommand('paste').setState(A.data);});function z(A,B,C,D){var E=y.lang[B];y.addCommand(B,C);y.ui.addButton(A,{label:E,command:B});if(y.addMenuItems)y.addMenuItem(B,{label:E,command:B,group:'clipboard',order:D});};z('Cut','cut',new o('cut'),1);z('Copy','copy',new o('copy'),4);z('Paste','paste',p,8);a.dialog.add('paste',a.getUrl(this.path+'dialogs/paste.js'));y.on('key',q,y);y.on('contentDom',function(){var A=y.document.getBody();A.on(b.webkit?'paste':'beforepaste',function(B){if(u)return;var C={mode:'html'};y.fire('beforePaste',C);s.call(y,B,C.mode,function(D){if(!(D=e.trim(D.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,''))))return;var E={};E[C.mode]=D;y.fire('paste',E);});});A.on('contextmenu',function(){u=1;setTimeout(function(){u=0;},10);});A.on('beforecut',function(){!u&&t(y);});A.on('mouseup',function(){setTimeout(function(){x.call(y);},0);},y);A.on('keyup',x,y);});y.on('selectionChange',function(A){w=A.data.selection.getRanges()[0].checkReadOnly();x.call(y);});if(y.contextMenu)y.contextMenu.addListener(function(A,B){var C=B.getRanges()[0].checkReadOnly();return{cut:!C&&v('Cut',y),copy:v('Copy',y),paste:!C&&(b.webkit?2:v('Paste',y))};});}});})();j.add('colorbutton',{requires:['panelbutton','floatpanel','styles'],init:function(m){var n=m.config,o=m.lang.colorButton,p;if(!b.hc){q('TextColor','fore',o.textColorTitle);q('BGColor','back',o.bgColorTitle);}function q(t,u,v){var w=e.getNextId()+'_colorBox';m.ui.add(t,4,{label:v,title:v,className:'cke_button_'+t.toLowerCase(),modes:{wysiwyg:1},panel:{css:m.skin.editor.css,attributes:{role:'listbox','aria-label':o.panelTitle}},onBlock:function(x,y){y.autoSize=true;
+y.element.addClass('cke_colorblock');y.element.setHtml(r(x,u,w));y.element.getDocument().getBody().setStyle('overflow','hidden');k.fire('ready',this);var z=y.keys,A=m.lang.dir=='rtl';z[A?37:39]='next';z[40]='next';z[9]='next';z[A?39:37]='prev';z[38]='prev';z[2000+9]='prev';z[32]='click';},onOpen:function(){var x=m.getSelection(),y=x&&x.getStartElement(),z=new d.elementPath(y),A;y=z.block||z.blockLimit||m.document.getBody();do A=y&&y.getComputedStyle(u=='back'?'background-color':'color')||'transparent';while(u=='back'&&A=='transparent'&&y&&(y=y.getParent()))if(!A||A=='transparent')A='#ffffff';this._.panel._.iframe.getFrameDocument().getById(w).setStyle('background-color',A);}});};function r(t,u,v){var w=[],x=n.colorButton_colors.split(','),y=x.length+(n.colorButton_enableMore?2:1),z=e.addFunction(function(F,G){if(F=='?'){var H=arguments.callee;function I(K){this.removeListener('ok',I);this.removeListener('cancel',I);K.name=='ok'&&H(this.getContentElement('picker','selectedColor').getValue(),G);};m.openDialog('colordialog',function(){this.on('ok',I);this.on('cancel',I);});return;}m.focus();t.hide(false);m.fire('saveSnapshot');new a.style(n['colorButton_'+G+'Style'],{color:'inherit'}).remove(m.document);if(F){var J=n['colorButton_'+G+'Style'];J.childRule=G=='back'?function(K){return s(K);}:function(K){return!(K.is('a')||K.getElementsByTag('a').count())||s(K);};new a.style(J,{color:F}).apply(m.document);}m.fire('saveSnapshot');});w.push('<a class="cke_colorauto" _cke_focus=1 hidefocus=true title="',o.auto,'" onclick="CKEDITOR.tools.callFunction(',z,",null,'",u,"');return false;\" href=\"javascript:void('",o.auto,'\')" role="option" aria-posinset="1" aria-setsize="',y,'"><table role="presentation" cellspacing=0 cellpadding=0 width="100%"><tr><td><span class="cke_colorbox" id="',v,'"></span></td><td colspan=7 align=center>',o.auto,'</td></tr></table></a><table role="presentation" cellspacing=0 cellpadding=0 width="100%">');for(var A=0;A<x.length;A++){if(A%8===0)w.push('</tr><tr>');var B=x[A].split('/'),C=B[0],D=B[1]||C;if(!B[1])C='#'+C.replace(/^(.)(.)(.)$/,'$1$1$2$2$3$3');var E=m.lang.colors[D]||D;w.push('<td><a class="cke_colorbox" _cke_focus=1 hidefocus=true title="',E,'" onclick="CKEDITOR.tools.callFunction(',z,",'",C,"','",u,"'); return false;\" href=\"javascript:void('",E,'\')" role="option" aria-posinset="',A+2,'" aria-setsize="',y,'"><span class="cke_colorbox" style="background-color:#',D,'"></span></a></td>');}if(n.colorButton_enableMore===undefined||n.colorButton_enableMore)w.push('</tr><tr><td colspan=8 align=center><a class="cke_colormore" _cke_focus=1 hidefocus=true title="',o.more,'" onclick="CKEDITOR.tools.callFunction(',z,",'?','",u,"');return false;\" href=\"javascript:void('",o.more,"')\"",' role="option" aria-posinset="',y,'" aria-setsize="',y,'">',o.more,'</a></td>');
+w.push('</tr></table>');return w.join('');};function s(t){return t.getAttribute('contentEditable')=='false'||t.getAttribute('data-nostyle');};}});i.colorButton_colors='000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';i.colorButton_foreStyle={element:'span',styles:{color:'#(color)'},overrides:[{element:'font',attributes:{color:null}}]};i.colorButton_backStyle={element:'span',styles:{'background-color':'#(color)'}};j.colordialog={init:function(m){m.addCommand('colordialog',new a.dialogCommand('colordialog'));a.dialog.add('colordialog',this.path+'dialogs/colordialog.js');}};j.add('colordialog',j.colordialog);j.add('contextmenu',{requires:['menu'],onLoad:function(){j.contextMenu=e.createClass({base:a.menu,$:function(m){this.base.call(this,m,{panel:{className:m.skinClass+' cke_contextmenu',attributes:{'aria-label':m.lang.contextmenu.options}}});},proto:{addTarget:function(m,n){if(b.opera&&!('oncontextmenu' in document.body)){var o;m.on('mousedown',function(s){s=s.data;if(s.$.button!=2){if(s.getKeystroke()==1000+1)m.fire('contextmenu',s);return;}if(n&&(b.mac?s.$.metaKey:s.$.ctrlKey))return;var t=s.getTarget();if(!o){var u=t.getDocument();o=u.createElement('input');o.$.type='button';u.getBody().append(o);}o.setAttribute('style','position:absolute;top:'+(s.$.clientY-2)+'px;left:'+(s.$.clientX-2)+'px;width:5px;height:5px;opacity:0.01');});m.on('mouseup',function(s){if(o){o.remove();o=undefined;m.fire('contextmenu',s.data);}});}m.on('contextmenu',function(s){var t=s.data;if(n&&(b.webkit?p:b.mac?t.$.metaKey:t.$.ctrlKey))return;t.preventDefault();var u=t.getTarget().getDocument().getDocumentElement(),v=t.$.clientX,w=t.$.clientY;e.setTimeout(function(){this.open(u,null,v,w);},c?200:0,this);},this);if(b.opera)m.on('keypress',function(s){var t=s.data;if(t.$.keyCode===0)t.preventDefault();});if(b.webkit){var p,q=function(s){p=b.mac?s.data.$.metaKey:s.data.$.ctrlKey;},r=function(){p=0;};m.on('keydown',q);m.on('keyup',r);m.on('contextmenu',r);}},open:function(m,n,o,p){this.editor.focus();m=m||a.document.getDocumentElement();this.show(m,n,o,p);}}});},beforeInit:function(m){m.contextMenu=new j.contextMenu(m);m.addCommand('contextMenu',{exec:function(){m.contextMenu.open(m.document.getBody());}});}});(function(){function m(o){var p=this.att,q=o&&o.hasAttribute(p)&&o.getAttribute(p)||'';
+if(q!==undefined)this.setValue(q);};function n(){var o;for(var p=0;p<arguments.length;p++){if(arguments[p] instanceof h){o=arguments[p];break;}}if(o){var q=this.att,r=this.getValue();if(r)o.setAttribute(q,r);else o.removeAttribute(q,r);}};j.add('dialogadvtab',{createAdvancedTab:function(o,p){if(!p)p={id:1,dir:1,classes:1,styles:1};var q=o.lang.common,r={id:'advanced',label:q.advancedTab,title:q.advancedTab,elements:[{type:'vbox',padding:1,children:[]}]},s=[];if(p.id||p.dir){if(p.id)s.push({id:'advId',att:'id',type:'text',label:q.id,setup:m,commit:n});if(p.dir)s.push({id:'advLangDir',att:'dir',type:'select',label:q.langDir,'default':'',style:'width:100%',items:[[q.notSet,''],[q.langDirLTR,'ltr'],[q.langDirRTL,'rtl']],setup:m,commit:n});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}if(p.styles||p.classes){s=[];if(p.styles)s.push({id:'advStyles',att:'style',type:'text',label:q.styles,'default':'',validate:a.dialog.validate.inlineStyle(q.invalidInlineStyle),onChange:function(){},getStyle:function(t,u){var v=this.getValue().match(new RegExp(t+'\\s*:\\s*([^;]*)','i'));return v?v[1]:u;},updateStyle:function(t,u){var v=this.getValue();if(v)v=v.replace(new RegExp('\\s*'+t+'s*:[^;]*(?:$|;s*)','i'),'').replace(/^[;\s]+/,'').replace(/\s+$/,'');if(u){v&&!/;\s*$/.test(v)&&(v+='; ');v+=t+': '+u;}this.setValue(v,1);},setup:m,commit:n});if(p.classes)s.push({type:'hbox',widths:['45%','55%'],children:[{id:'advCSSClasses',att:'class',type:'text',label:q.cssClasses,'default':'',setup:m,commit:n}]});r.elements[0].children.push({type:'hbox',widths:['50%','50%'],children:[].concat(s)});}return r;}});})();(function(){j.add('div',{requires:['editingblock','domiterator','styles'],init:function(m){var n=m.lang.div;m.addCommand('creatediv',new a.dialogCommand('creatediv'));m.addCommand('editdiv',new a.dialogCommand('editdiv'));m.addCommand('removediv',{exec:function(o){var p=o.getSelection(),q=p&&p.getRanges(),r,s=p.createBookmarks(),t,u=[];function v(x){var y=new d.elementPath(x),z=y.blockLimit,A=z.is('div')&&z;if(A&&!A.data('cke-div-added')){u.push(A);A.data('cke-div-added');}};for(var w=0;w<q.length;w++){r=q[w];if(r.collapsed)v(p.getStartElement());else{t=new d.walker(r);t.evaluator=v;t.lastForward();}}for(w=0;w<u.length;w++)u[w].remove(true);p.selectBookmarks(s);}});m.ui.addButton('CreateDiv',{label:n.toolbar,command:'creatediv'});if(m.addMenuItems){m.addMenuItems({editdiv:{label:n.edit,command:'editdiv',group:'div',order:1},removediv:{label:n.remove,command:'removediv',group:'div',order:5}});
+if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||o.isReadOnly())return null;var q=new d.elementPath(o),r=q.blockLimit;if(r&&r.getAscendant('div',true))return{editdiv:2,removediv:2};return null;});}a.dialog.add('creatediv',this.path+'dialogs/div.js');a.dialog.add('editdiv',this.path+'dialogs/div.js');}});})();(function(){var m={toolbarFocus:{editorFocus:false,readOnly:1,exec:function(o){var p=o._.elementsPath.idBase,q=a.document.getById(p+'0');q&&q.focus(c||b.air);}}},n='<span class="cke_empty">&nbsp;</span>';j.add('elementspath',{requires:['selection'],init:function(o){var p='cke_path_'+o.name,q,r=function(){if(!q)q=a.document.getById(p);return q;},s='cke_elementspath_'+e.getNextNumber()+'_';o._.elementsPath={idBase:s,filters:[]};o.on('themeSpace',function(x){if(x.data.space=='bottom')x.data.html+='<span id="'+p+'_label" class="cke_voice_label">'+o.lang.elementsPath.eleLabel+'</span>'+'<div id="'+p+'" class="cke_path" role="group" aria-labelledby="'+p+'_label">'+n+'</div>';});function t(x){o.focus();var y=o._.elementsPath.list[x];if(y.is('body')){var z=new d.range(o.document);z.selectNodeContents(y);z.select();}else o.getSelection().selectElement(y);};var u=e.addFunction(t),v=e.addFunction(function(x,y){var z=o._.elementsPath.idBase,A;y=new d.event(y);var B=o.lang.dir=='rtl';switch(y.getKeystroke()){case B?39:37:case 9:A=a.document.getById(z+(x+1));if(!A)A=a.document.getById(z+'0');A.focus();return false;case B?37:39:case 2000+9:A=a.document.getById(z+(x-1));if(!A)A=a.document.getById(z+(o._.elementsPath.list.length-1));A.focus();return false;case 27:o.focus();return false;case 13:case 32:t(x);return false;}return true;});o.on('selectionChange',function(x){var y=b,z=x.data.selection,A=z.getStartElement(),B=[],C=x.editor,D=C._.elementsPath.list=[],E=C._.elementsPath.filters;while(A){var F=0,G;if(A.data('cke-display-name'))G=A.data('cke-display-name');else if(A.data('cke-real-element-type'))G=A.data('cke-real-element-type');else G=A.getName();for(var H=0;H<E.length;H++){var I=E[H](A,G);if(I===false){F=1;break;}G=I||G;}if(!F){var J=D.push(A)-1,K='';if(y.opera||y.gecko&&y.mac)K+=' onkeypress="return false;"';if(y.gecko)K+=' onblur="this.style.cssText = this.style.cssText;"';var L=C.lang.elementsPath.eleTitle.replace(/%1/,G);B.unshift('<a id="',s,J,'" href="javascript:void(\'',G,'\')" tabindex="-1" title="',L,'"'+(b.gecko&&b.version<10900?' onfocus="event.preventBubble();"':'')+' hidefocus="true" '+' onkeydown="return CKEDITOR.tools.callFunction(',v,',',J,', event );"'+K,' onclick="CKEDITOR.tools.callFunction('+u,',',J,'); return false;"',' role="button" aria-labelledby="'+s+J+'_label">',G,'<span id="',s,J,'_label" class="cke_label">'+L+'</span>','</a>');
+}if(G=='body')break;A=A.getParent();}var M=r();M.setHtml(B.join('')+n);C.fire('elementsPathUpdate',{space:M});});function w(){q&&q.setHtml(n);delete o._.elementsPath.list;};o.on('readOnly',w);o.on('contentDomUnload',w);o.addCommand('elementsPathFocus',m.toolbarFocus);}});})();(function(){j.add('enterkey',{requires:['keystrokes','indent'],init:function(t){t.addCommand('enter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){r(v);}});t.addCommand('shiftEnter',{modes:{wysiwyg:1},editorFocus:false,exec:function(v){q(v);}});var u=t.keystrokeHandler.keystrokes;u[13]='enter';u[2000+13]='shiftEnter';}});j.enterkey={enterBlock:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=v.checkStartOfBlock(),z=v.checkEndOfBlock(),A=new d.elementPath(v.startContainer),B=A.block;if(y&&z){if(B&&(B.is('li')||B.getParent().is('li'))){t.execCommand('outdent');return;}if(B&&B.getParent().is('blockquote')){B.breakParent(B.getParent());if(!B.getPrevious().getFirst(d.walker.invisible(1)))B.getPrevious().remove();if(!B.getNext().getFirst(d.walker.invisible(1)))B.getNext().remove();v.moveToElementEditStart(B);v.select();return;}}else if(B&&B.is('pre')){if(!z){n(t,u,v,w);return;}}else if(B&&f.$captionBlock[B.getName()]){n(t,u,v,w);return;}var C=u==3?'div':'p',D=v.splitBlock(C);if(!D)return;var E=D.previousBlock,F=D.nextBlock,G=D.wasStartOfBlock,H=D.wasEndOfBlock,I;if(F){I=F.getParent();if(I.is('li')){F.breakParent(I);F.move(F.getNext(),1);}}else if(E&&(I=E.getParent())&&I.is('li')){E.breakParent(I);I=E.getNext();v.moveToElementEditStart(I);E.move(E.getPrevious());}if(!G&&!H){if(F.is('li')&&(I=F.getFirst(d.walker.invisible(true)))&&I.is&&I.is('ul','ol'))(c?x.createText('\xa0'):x.createElement('br')).insertBefore(I);if(F)v.moveToElementEditStart(F);}else{var J,K;if(E){if(E.is('li')||!(p.test(E.getName())||E.is('pre')))J=E.clone();}else if(F)J=F.clone();if(!J){if(I&&I.is('li'))J=I;else{J=x.createElement(C);if(E&&(K=E.getDirection()))J.setAttribute('dir',K);}}else if(w&&!J.is('li'))J.renameNode(C);var L=D.elementPath;if(L)for(var M=0,N=L.elements.length;M<N;M++){var O=L.elements[M];if(O.equals(L.block)||O.equals(L.blockLimit))break;if(f.$removeEmpty[O.getName()]){O=O.clone();J.moveChildren(O);J.append(O);}}if(!c)J.appendBogus();if(!J.getParent())v.insertNode(J);J.is('li')&&J.removeAttribute('value');if(c&&G&&(!H||!E.getChildCount())){v.moveToElementEditStart(H?E:J);v.select();}v.moveToElementEditStart(G&&!H?F:J);}if(!c)if(F){var P=x.createElement('span');P.setHtml('&nbsp;');v.insertNode(P);
+P.scrollIntoView();v.deleteContents();}else J.scrollIntoView();v.select();},enterBr:function(t,u,v,w){v=v||s(t);if(!v)return;var x=v.document,y=u==3?'div':'p',z=v.checkEndOfBlock(),A=new d.elementPath(t.getSelection().getStartElement()),B=A.block,C=B&&A.block.getName(),D=false;if(!w&&C=='li'){o(t,u,v,w);return;}if(!w&&z&&p.test(C)){var E,F;if(F=B.getDirection()){E=x.createElement('div');E.setAttribute('dir',F);E.insertAfter(B);v.setStart(E,0);}else{x.createElement('br').insertAfter(B);if(b.gecko)x.createText('').insertAfter(B);v.setStartAt(B.getNext(),c?3:1);}}else{var G;D=C=='pre';if(D&&!b.gecko)G=x.createText(c?'\r':'\n');else G=x.createElement('br');v.deleteContents();v.insertNode(G);if(c)v.setStartAt(G,4);else{x.createText('\ufeff').insertAfter(G);if(z)G.getParent().appendBogus();G.getNext().$.nodeValue='';v.setStartAt(G.getNext(),1);var H=null;if(!b.gecko){H=x.createElement('span');H.setHtml('&nbsp;');}else H=x.createElement('br');H.insertBefore(G.getNext());H.scrollIntoView();H.remove();}}v.collapse(true);v.select(D);}};var m=j.enterkey,n=m.enterBr,o=m.enterBlock,p=/^h[1-6]$/;function q(t){if(t.mode!='wysiwyg')return false;return r(t,t.config.shiftEnterMode,1);};function r(t,u,v){v=t.config.forceEnterMode||v;if(t.mode!='wysiwyg')return false;if(!u)u=t.config.enterMode;setTimeout(function(){t.fire('saveSnapshot');if(u==2)n(t,u,null,v);else o(t,u,null,v);t.fire('saveSnapshot');},0);return true;};function s(t){var u=t.getSelection().getRanges(true);for(var v=u.length-1;v>0;v--)u[v].deleteContents();return u[0];};})();(function(){var m='nbsp,gt,lt,amp',n='quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro',o='Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml',p='Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv';
+function q(r,s){var t={},u=[],v={nbsp:'\xa0',shy:'­',gt:'>',lt:'<',amp:'&'};r=r.replace(/\b(nbsp|shy|gt|lt|amp)(?:,|$)/g,function(A,B){var C=s?'&'+B+';':v[B],D=s?v[B]:'&'+B+';';t[C]=D;u.push(C);return '';});if(!s&&r){r=r.split(',');var w=document.createElement('div'),x;w.innerHTML='&'+r.join(';&')+';';x=w.innerHTML;w=null;for(var y=0;y<x.length;y++){var z=x.charAt(y);t[z]='&'+r[y]+';';u.push(z);}}t.regex=u.join(s?'|':'');return t;};j.add('entities',{afterInit:function(r){var s=r.config,t=r.dataProcessor,u=t&&t.htmlFilter;if(u){var v='';if(s.basicEntities!==false)v+=m;if(s.entities){v+=','+n;if(s.entities_latin)v+=','+o;if(s.entities_greek)v+=','+p;if(s.entities_additional)v+=','+s.entities_additional;}var w=q(v),x=w.regex?'['+w.regex+']':'a^';delete w.regex;if(s.entities&&s.entities_processNumerical)x='[^ -~]|'+x;x=new RegExp(x,'g');function y(C){return s.entities_processNumerical=='force'||!w[C]?'&#'+C.charCodeAt(0)+';':w[C];};var z=q([m,'shy'].join(','),true),A=new RegExp(z.regex,'g');function B(C){return z[C];};u.addRules({text:function(C){return C.replace(A,B).replace(x,y);}});}}});})();i.basicEntities=true;i.entities=true;i.entities_latin=true;i.entities_greek=true;i.entities_additional='#39';j.add('find',{init:function(m){var n=j.find;m.ui.addButton('Find',{label:m.lang.findAndReplace.find,command:'find'});var o=m.addCommand('find',new a.dialogCommand('find'));o.canUndo=false;o.readOnly=1;m.ui.addButton('Replace',{label:m.lang.findAndReplace.replace,command:'replace'});var p=m.addCommand('replace',new a.dialogCommand('replace'));p.canUndo=false;a.dialog.add('find',this.path+'dialogs/find.js');a.dialog.add('replace',this.path+'dialogs/find.js');},requires:['styles']});i.find_highlight={element:'span',styles:{'background-color':'#004',color:'#fff'}};(function(){function m(n,o,p,q,r,s,t){var u=n.config,v=r.split(';'),w=[],x={};for(var y=0;y<v.length;y++){var z=v[y];if(z){z=z.split('/');var A={},B=v[y]=z[0];A[p]=w[y]=z[1]||B;x[B]=new a.style(t,A);x[B]._.definition.name=B;}else v.splice(y--,1);}n.ui.addRichCombo(o,{label:q.label,title:q.panelTitle,className:'cke_'+(p=='size'?'fontSize':'font'),panel:{css:n.skin.editor.css.concat(u.contentsCss),multiSelect:false,attributes:{'aria-label':q.panelTitle}},init:function(){this.startGroup(q.panelTitle);for(var C=0;C<v.length;C++){var D=v[C];this.add(D,x[D].buildPreview(),D);}},onClick:function(C){n.focus();n.fire('saveSnapshot');var D=x[C];if(this.getValue()==C)D.remove(n.document);else D.apply(n.document);n.fire('saveSnapshot');
+},onRender:function(){n.on('selectionChange',function(C){var D=this.getValue(),E=C.data.path,F=E.elements;for(var G=0,H;G<F.length;G++){H=F[G];for(var I in x){if(x[I].checkElementRemovable(H,true)){if(I!=D)this.setValue(I);return;}}}this.setValue('',s);},this);}});};j.add('font',{requires:['richcombo','styles'],init:function(n){var o=n.config;m(n,'Font','family',n.lang.font,o.font_names,o.font_defaultLabel,o.font_style);m(n,'FontSize','size',n.lang.fontSize,o.fontSize_sizes,o.fontSize_defaultLabel,o.fontSize_style);}});})();i.font_names='Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif';i.font_defaultLabel='';i.font_style={element:'span',styles:{'font-family':'#(family)'},overrides:[{element:'font',attributes:{face:null}}]};i.fontSize_sizes='8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px';i.fontSize_defaultLabel='';i.fontSize_style={element:'span',styles:{'font-size':'#(size)'},overrides:[{element:'font',attributes:{size:null}}]};j.add('format',{requires:['richcombo','styles'],init:function(m){var n=m.config,o=m.lang.format,p=n.format_tags.split(';'),q={};for(var r=0;r<p.length;r++){var s=p[r];q[s]=new a.style(n['format_'+s]);q[s]._.enterMode=m.config.enterMode;}m.ui.addRichCombo('Format',{label:o.label,title:o.panelTitle,className:'cke_format',panel:{css:m.skin.editor.css.concat(n.contentsCss),multiSelect:false,attributes:{'aria-label':o.panelTitle}},init:function(){this.startGroup(o.panelTitle);for(var t in q){var u=o['tag_'+t];this.add(t,q[t].buildPreview(u),u);}},onClick:function(t){m.focus();m.fire('saveSnapshot');var u=q[t],v=new d.elementPath(m.getSelection().getStartElement());u[u.checkActive(v)?'remove':'apply'](m.document);setTimeout(function(){m.fire('saveSnapshot');},0);},onRender:function(){m.on('selectionChange',function(t){var u=this.getValue(),v=t.data.path;for(var w in q){if(q[w].checkActive(v)){if(w!=u)this.setValue(w,m.lang.format['tag_'+w]);return;}}this.setValue('');},this);}});}});i.format_tags='p;h1;h2;h3;h4;h5;h6;pre;address;div';i.format_p={element:'p'};i.format_div={element:'div'};i.format_pre={element:'pre'};i.format_address={element:'address'};
+i.format_h1={element:'h1'};i.format_h2={element:'h2'};i.format_h3={element:'h3'};i.format_h4={element:'h4'};i.format_h5={element:'h5'};i.format_h6={element:'h6'};j.add('forms',{init:function(m){var n=m.lang;m.addCss('form{border: 1px dotted #FF0000;padding: 2px;}\n');m.addCss('img.cke_hidden{background-image: url('+a.getUrl(this.path+'images/hiddenfield.gif')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 16px !important;'+'height: 16px !important;'+'}');var o=function(q,r,s){m.addCommand(r,new a.dialogCommand(r));m.ui.addButton(q,{label:n.common[q.charAt(0).toLowerCase()+q.slice(1)],command:r});a.dialog.add(r,s);},p=this.path+'dialogs/';o('Form','form',p+'form.js');o('Checkbox','checkbox',p+'checkbox.js');o('Radio','radio',p+'radio.js');o('TextField','textfield',p+'textfield.js');o('Textarea','textarea',p+'textarea.js');o('Select','select',p+'select.js');o('Button','button',p+'button.js');o('ImageButton','imagebutton',j.getPath('image')+'dialogs/image.js');o('HiddenField','hiddenfield',p+'hiddenfield.js');if(m.addMenuItems)m.addMenuItems({form:{label:n.form.menu,command:'form',group:'form'},checkbox:{label:n.checkboxAndRadio.checkboxTitle,command:'checkbox',group:'checkbox'},radio:{label:n.checkboxAndRadio.radioTitle,command:'radio',group:'radio'},textfield:{label:n.textfield.title,command:'textfield',group:'textfield'},hiddenfield:{label:n.hidden.title,command:'hiddenfield',group:'hiddenfield'},imagebutton:{label:n.image.titleButton,command:'imagebutton',group:'imagebutton'},button:{label:n.button.title,command:'button',group:'button'},select:{label:n.select.title,command:'select',group:'select'},textarea:{label:n.textarea.title,command:'textarea',group:'textarea'}});if(m.contextMenu){m.contextMenu.addListener(function(q){if(q&&q.hasAscendant('form',true)&&!q.isReadOnly())return{form:2};});m.contextMenu.addListener(function(q){if(q&&!q.isReadOnly()){var r=q.getName();if(r=='select')return{select:2};if(r=='textarea')return{textarea:2};if(r=='input')switch(q.getAttribute('type')){case 'button':case 'submit':case 'reset':return{button:2};case 'checkbox':return{checkbox:2};case 'radio':return{radio:2};case 'image':return{imagebutton:2};default:return{textfield:2};}if(r=='img'&&q.data('cke-real-element-type')=='hiddenfield')return{hiddenfield:2};}});}m.on('doubleclick',function(q){var r=q.data.element;if(r.is('form'))q.data.dialog='form';else if(r.is('select'))q.data.dialog='select';else if(r.is('textarea'))q.data.dialog='textarea';
+else if(r.is('img')&&r.data('cke-real-element-type')=='hiddenfield')q.data.dialog='hiddenfield';else if(r.is('input'))switch(r.getAttribute('type')){case 'button':case 'submit':case 'reset':q.data.dialog='button';break;case 'checkbox':q.data.dialog='checkbox';break;case 'radio':q.data.dialog='radio';break;case 'image':q.data.dialog='imagebutton';break;default:q.data.dialog='textfield';break;}});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.htmlFilter,p=n&&n.dataFilter;if(c)o&&o.addRules({elements:{input:function(q){var r=q.attributes,s=r.type;if(!s)r.type='text';if(s=='checkbox'||s=='radio')r.value=='on'&&delete r.value;}}});if(p)p.addRules({elements:{input:function(q){if(q.attributes.type=='hidden')return m.createFakeParserElement(q,'cke_hidden','hiddenfield');}}});},requires:['image','fakeobjects']});if(c)h.prototype.hasAttribute=e.override(h.prototype.hasAttribute,function(m){return function(n){var q=this;var o=q.$.attributes.getNamedItem(n);if(q.getName()=='input')switch(n){case 'class':return q.$.className.length>0;case 'checked':return!!q.$.checked;case 'value':var p=q.getAttribute('type');return p=='checkbox'||p=='radio'?q.$.value!='on':q.$.value;}return m.apply(q,arguments);};});(function(){var m={canUndo:false,exec:function(o){var p=o.document.createElement('hr'),q=new d.range(o.document);o.insertElement(p);q.moveToPosition(p,4);var r=p.getNext();if(!r||r.type==1&&!r.isEditable())q.fixBlock(true,o.config.enterMode==3?'div':'p');q.select();}},n='horizontalrule';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('HorizontalRule',{label:o.lang.horizontalrule,command:n});}});})();(function(){var m=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,n='{cke_protected}';function o(T){var U=T.children.length,V=T.children[U-1];while(V&&V.type==3&&!e.trim(V.value))V=T.children[--U];return V;};function p(T,U){var V=T.children,W=o(T);if(W){if((U||!c)&&W.type==1&&W.name=='br')V.pop();if(W.type==3&&m.test(W.value))V.pop();}};function q(T,U,V){if(!U&&(!V||typeof V=='function'&&V(T)===false))return false;if(U&&c&&(document.documentMode>7||T.name in f.tr||T.name in f.$listItem))return false;var W=o(T);return!W||W&&(W.type==1&&W.name=='br'||T.name=='form'&&W.name=='input');};function r(T,U){return function(V){p(V,!T);if(q(V,!T,U))if(T||c)V.add(new a.htmlParser.text('\xa0'));else V.add(new a.htmlParser.element('br',{}));};};var s=f,t=['caption','colgroup','col','thead','tfoot','tbody'],u=e.extend({},s.$block,s.$listItem,s.$tableContent);for(var v in u){if(!('br' in s[v]))delete u[v];
+}delete u.pre;var w={elements:{},attributeNames:[[/^on/,'data-cke-pa-on']]},x={elements:{}};for(v in u)x.elements[v]=r();var y={elementNames:[[/^cke:/,''],[/^\?xml:namespace$/,'']],attributeNames:[[/^data-cke-(saved|pa)-/,''],[/^data-cke-.*/,''],['hidefocus','']],elements:{$:function(T){var U=T.attributes;if(U){if(U['data-cke-temp'])return false;var V=['name','href','src'],W;for(var X=0;X<V.length;X++){W='data-cke-saved-'+V[X];W in U&&delete U[V[X]];}}return T;},table:function(T){var U=T.children;U.sort(function(V,W){return V.type==1&&W.type==V.type?e.indexOf(t,V.name)>e.indexOf(t,W.name)?1:-1:0;});},embed:function(T){var U=T.parent;if(U&&U.name=='object'){var V=U.attributes.width,W=U.attributes.height;V&&(T.attributes.width=V);W&&(T.attributes.height=W);}},param:function(T){T.children=[];T.isEmpty=true;return T;},a:function(T){if(!(T.children.length||T.attributes.name||T.attributes['data-cke-saved-name']))return false;},span:function(T){if(T.attributes['class']=='Apple-style-span')delete T.name;},pre:function(T){c&&p(T);},html:function(T){delete T.attributes.contenteditable;delete T.attributes['class'];},body:function(T){delete T.attributes.spellcheck;delete T.attributes.contenteditable;},style:function(T){var U=T.children[0];U&&U.value&&(U.value=e.trim(U.value));if(!T.attributes.type)T.attributes.type='text/css';},title:function(T){var U=T.children[0];U&&(U.value=T.attributes['data-cke-title']||'');}},attributes:{'class':function(T,U){return e.ltrim(T.replace(/(?:^|\s+)cke_[^\s]*/g,''))||false;}}};if(c)y.attributes.style=function(T,U){return T.replace(/(^|;)([^\:]+)/g,function(V){return V.toLowerCase();});};function z(T){var U=T.attributes;if(U.contenteditable!='false')U['data-cke-editable']=U.contenteditable?'true':1;U.contenteditable='false';};function A(T){var U=T.attributes;switch(U['data-cke-editable']){case 'true':U.contenteditable='true';break;case '1':delete U.contenteditable;break;}};for(v in {input:1,textarea:1}){w.elements[v]=z;y.elements[v]=A;}var B=/<(a|area|img|input)\b([^>]*)>/gi,C=/\b(on\w+|href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,D=/(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,E=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,F=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,G=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,H=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi;function I(T){return T.replace(B,function(U,V,W){return '<'+V+W.replace(C,function(X,Y){if(!/^on/.test(Y)&&W.indexOf('data-cke-saved-'+Y)==-1)return ' data-cke-saved-'+X+' '+X;
+return X;})+'>';});};function J(T){return T.replace(D,function(U){return '<cke:encoded>'+encodeURIComponent(U)+'</cke:encoded>';});};function K(T){return T.replace(E,function(U,V){return decodeURIComponent(V);});};function L(T){return T.replace(F,'$1cke:$2');};function M(T){return T.replace(G,'$1$2');};function N(T){return T.replace(H,'<cke:$1$2></cke:$1>');};function O(T){return T.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,'$1$2$2');};function P(T){return T.replace(/<!--(?!{cke_protected})[\s\S]+?-->/g,function(U){return '<!--'+n+'{C}'+encodeURIComponent(U).replace(/--/g,'%2D%2D')+'-->';});};function Q(T){return T.replace(/<!--\{cke_protected\}\{C\}([\s\S]+?)-->/g,function(U,V){return decodeURIComponent(V);});};function R(T,U){var V=U._.dataStore;return T.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(W,X){return decodeURIComponent(X);}).replace(/\{cke_protected_(\d+)\}/g,function(W,X){return V&&V[X]||'';});};function S(T,U){var V=[],W=U.config.protectedSource,X=U._.dataStore||(U._.dataStore={id:1}),Y=/<\!--\{cke_temp(comment)?\}(\d*?)-->/g,Z=[/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi].concat(W);T=T.replace(/<!--[\s\S]*?-->/g,function(ab){return '<!--{cke_tempcomment}'+(V.push(ab)-1)+'-->';});for(var aa=0;aa<Z.length;aa++)T=T.replace(Z[aa],function(ab){ab=ab.replace(Y,function(ac,ad,ae){return V[ae];});return/cke_temp(comment)?/.test(ab)?ab:'<!--{cke_temp}'+(V.push(ab)-1)+'-->';});T=T.replace(Y,function(ab,ac,ad){return '<!--'+n+(ac?'{C}':'')+encodeURIComponent(V[ad]).replace(/--/g,'%2D%2D')+'-->';});return T.replace(/(['"]).*?\1/g,function(ab){return ab.replace(/<!--\{cke_protected\}([\s\S]+?)-->/g,function(ac,ad){X[X.id]=decodeURIComponent(ad);return '{cke_protected_'+X.id++ +'}';});});};j.add('htmldataprocessor',{requires:['htmlwriter'],init:function(T){var U=T.dataProcessor=new a.htmlDataProcessor(T);U.writer.forceSimpleAmpersand=T.config.forceSimpleAmpersand;U.dataFilter.addRules(w);U.dataFilter.addRules(x);U.htmlFilter.addRules(y);var V={elements:{}};for(v in u)V.elements[v]=r(true,T.config.fillEmptyBlocks);U.htmlFilter.addRules(V);},onLoad:function(){!('fillEmptyBlocks' in i)&&(i.fillEmptyBlocks=1);}});a.htmlDataProcessor=function(T){var U=this;U.editor=T;U.writer=new a.htmlWriter();U.dataFilter=new a.htmlParser.filter();U.htmlFilter=new a.htmlParser.filter();};a.htmlDataProcessor.prototype={toHtml:function(T,U){T=S(T,this.editor);T=I(T);T=J(T);T=L(T);T=N(T);T=O(T);var V=new h('div');V.setHtml('a'+T);T=V.getHtml().substr(1);T=M(T);
+T=K(T);T=Q(T);var W=a.htmlParser.fragment.fromHtml(T,U),X=new a.htmlParser.basicWriter();W.writeHtml(X,this.dataFilter);T=X.getHtml(true);T=P(T);return T;},toDataFormat:function(T,U){var V=this.writer,W=a.htmlParser.fragment.fromHtml(T,U);V.reset();W.writeHtml(V,this.htmlFilter);var X=V.getHtml(true);X=Q(X);X=R(X,this.editor);return X;}};})();(function(){j.add('iframe',{requires:['dialog','fakeobjects'],init:function(m){var n='iframe',o=m.lang.iframe;a.dialog.add(n,this.path+'dialogs/iframe.js');m.addCommand(n,new a.dialogCommand(n));m.addCss('img.cke_iframe{background-image: url('+a.getUrl(this.path+'images/placeholder.png')+');'+'background-position: center center;'+'background-repeat: no-repeat;'+'border: 1px solid #a9a9a9;'+'width: 80px;'+'height: 80px;'+'}');m.ui.addButton('Iframe',{label:o.toolbar,command:n});m.on('doubleclick',function(p){var q=p.data.element;if(q.is('img')&&q.data('cke-real-element-type')=='iframe')p.data.dialog='iframe';});if(m.addMenuItems)m.addMenuItems({iframe:{label:o.title,command:'iframe',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(p&&p.is('img')&&p.data('cke-real-element-type')=='iframe')return{iframe:2};});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter;if(o)o.addRules({elements:{iframe:function(p){return m.createFakeParserElement(p,'cke_iframe','iframe',true);}}});}});})();j.add('image',{init:function(m){var n='image';a.dialog.add(n,this.path+'dialogs/image.js');m.addCommand(n,new a.dialogCommand(n));m.ui.addButton('Image',{label:m.lang.common.image,command:n});m.on('doubleclick',function(o){var p=o.data.element;if(p.is('img')&&!p.data('cke-realelement')&&!p.isReadOnly())o.data.dialog='image';});if(m.addMenuItems)m.addMenuItems({image:{label:m.lang.image.menu,command:'image',group:'image'}});if(m.contextMenu)m.contextMenu.addListener(function(o,p){if(!o||!o.is('img')||o.data('cke-realelement')||o.isReadOnly())return null;return{image:2};});}});i.image_removeLinkByEmptyURL=true;(function(){var m={ol:1,ul:1},n=d.walker.whitespaces(true),o=d.walker.bookmark(false,true);function p(t){var B=this;if(t.editor.readOnly)return null;var u=t.editor,v=t.data.path,w=v&&v.contains(m),x=v.block||v.blockLimit;if(w)return B.setState(2);if(!B.useIndentClasses&&B.name=='indent')return B.setState(2);if(!x)return B.setState(0);if(B.useIndentClasses){var y=x.$.className.match(B.classNameRegex),z=0;if(y){y=y[1];z=B.indentClassMap[y];}if(B.name=='outdent'&&!z||B.name=='indent'&&z==u.config.indentClasses.length)return B.setState(0);
+return B.setState(2);}else{var A=parseInt(x.getStyle(r(x)),10);if(isNaN(A))A=0;if(A<=0)return B.setState(0);return B.setState(2);}};function q(t,u){var w=this;w.name=u;w.useIndentClasses=t.config.indentClasses&&t.config.indentClasses.length>0;if(w.useIndentClasses){w.classNameRegex=new RegExp('(?:^|\\s+)('+t.config.indentClasses.join('|')+')(?=$|\\s)');w.indentClassMap={};for(var v=0;v<t.config.indentClasses.length;v++)w.indentClassMap[t.config.indentClasses[v]]=v+1;}w.startDisabled=u=='outdent';};function r(t,u){return(u||t.getComputedStyle('direction'))=='ltr'?'margin-left':'margin-right';};function s(t){return t.type==1&&t.is('li');};q.prototype={exec:function(t){var u=this,v={};function w(M){var N=C.startContainer,O=C.endContainer;while(N&&!N.getParent().equals(M))N=N.getParent();while(O&&!O.getParent().equals(M))O=O.getParent();if(!N||!O)return;var P=N,Q=[],R=false;while(!R){if(P.equals(O))R=true;Q.push(P);P=P.getNext();}if(Q.length<1)return;var S=M.getParents(true);for(var T=0;T<S.length;T++){if(S[T].getName&&m[S[T].getName()]){M=S[T];break;}}var U=u.name=='indent'?1:-1,V=Q[0],W=Q[Q.length-1],X=j.list.listToArray(M,v),Y=X[W.getCustomData('listarray_index')].indent;for(T=V.getCustomData('listarray_index');T<=W.getCustomData('listarray_index');T++){X[T].indent+=U;var Z=X[T].parent;X[T].parent=new h(Z.getName(),Z.getDocument());}for(T=W.getCustomData('listarray_index')+1;T<X.length&&X[T].indent>Y;T++)X[T].indent+=U;var aa=j.list.arrayToList(X,v,null,t.config.enterMode,M.getDirection());if(u.name=='outdent'){var ab;if((ab=M.getParent())&&ab.is('li')){var ac=aa.listNode.getChildren(),ad=[],ae=ac.count(),af;for(T=ae-1;T>=0;T--){if((af=ac.getItem(T))&&af.is&&af.is('li'))ad.push(af);}}}if(aa)aa.listNode.replace(M);if(ad&&ad.length)for(T=0;T<ad.length;T++){var ag=ad[T],ah=ag;while((ah=ah.getNext())&&ah.is&&ah.getName() in m){if(c&&!ag.getFirst(function(ai){return n(ai)&&o(ai);}))ag.append(C.document.createText('\xa0'));ag.append(ah);}ag.insertAfter(ab);}};function x(){var M=C.createIterator(),N=t.config.enterMode;M.enforceRealBlocks=true;M.enlargeBr=N!=2;var O;while(O=M.getNextParagraph(N==1?'p':'div'))y(O);};function y(M,N){if(M.getCustomData('indent_processed'))return false;if(u.useIndentClasses){var O=M.$.className.match(u.classNameRegex),P=0;if(O){O=O[1];P=u.indentClassMap[O];}if(u.name=='outdent')P--;else P++;if(P<0)return false;P=Math.min(P,t.config.indentClasses.length);P=Math.max(P,0);M.$.className=e.ltrim(M.$.className.replace(u.classNameRegex,''));if(P>0)M.addClass(t.config.indentClasses[P-1]);
+}else{var Q=r(M,N),R=parseInt(M.getStyle(Q),10);if(isNaN(R))R=0;var S=t.config.indentOffset||40;R+=(u.name=='indent'?1:-1)*S;if(R<0)return false;R=Math.max(R,0);R=Math.ceil(R/S)*S;M.setStyle(Q,R?R+(t.config.indentUnit||'px'):'');if(M.getAttribute('style')==='')M.removeAttribute('style');}h.setMarker(v,M,'indent_processed',1);return true;};var z=t.getSelection(),A=z.createBookmarks(1),B=z&&z.getRanges(1),C,D=B.createIterator();while(C=D.getNextRange()){var E=C.getCommonAncestor(),F=E;while(F&&!(F.type==1&&m[F.getName()]))F=F.getParent();if(!F){var G=C.getEnclosedNode();if(G&&G.type==1&&G.getName() in m){C.setStartAt(G,1);C.setEndAt(G,2);F=G;}}if(F&&C.startContainer.type==1&&C.startContainer.getName() in m){var H=new d.walker(C);H.evaluator=s;C.startContainer=H.next();}if(F&&C.endContainer.type==1&&C.endContainer.getName() in m){H=new d.walker(C);H.evaluator=s;C.endContainer=H.previous();}if(F){var I=F.getFirst(s),J=!!I.getNext(s),K=C.startContainer,L=I.equals(K)||I.contains(K);if(!(L&&(u.name=='indent'||u.useIndentClasses||parseInt(F.getStyle(r(F)),10))&&y(F,!J&&I.getDirection())))w(F);}else x();}h.clearAllMarkers(v);t.forceNextSelectionCheck();z.selectBookmarks(A);}};j.add('indent',{init:function(t){var u=t.addCommand('indent',new q(t,'indent')),v=t.addCommand('outdent',new q(t,'outdent'));t.ui.addButton('Indent',{label:t.lang.indent,command:'indent'});t.ui.addButton('Outdent',{label:t.lang.outdent,command:'outdent'});t.on('selectionChange',e.bind(p,u));t.on('selectionChange',e.bind(p,v));if(b.ie6Compat||b.ie7Compat)t.addCss('ul,ol{\tmargin-left: 0px;\tpadding-left: 40px;}');t.on('dirChanged',function(w){var x=new d.range(t.document);x.setStartBefore(w.data.node);x.setEndAfter(w.data.node);var y=new d.walker(x),z;while(z=y.next()){if(z.type==1){if(!z.equals(w.data.node)&&z.getDirection()){x.setStartAfter(z);y=new d.walker(x);continue;}var A=t.config.indentClasses;if(A){var B=w.data.dir=='ltr'?['_rtl','']:['','_rtl'];for(var C=0;C<A.length;C++){if(z.hasClass(A[C]+B[0])){z.removeClass(A[C]+B[0]);z.addClass(A[C]+B[1]);}}}var D=z.getStyle('margin-right'),E=z.getStyle('margin-left');D?z.setStyle('margin-left',D):z.removeStyle('margin-left');E?z.setStyle('margin-right',E):z.removeStyle('margin-right');}}});},requires:['domiterator','list']});})();(function(){function m(r,s){var t=s.block||s.blockLimit;if(!t||t.getName()=='body')return 2;return n(t,r.config.useComputedState)==this.value?1:2;};function n(r,s){s=s===undefined||s;var t;if(s)t=r.getComputedStyle('text-align');
+else{while(!r.hasAttribute||!(r.hasAttribute('align')||r.getStyle('text-align'))){var u=r.getParent();if(!u)break;r=u;}t=r.getStyle('text-align')||r.getAttribute('align')||'';}t&&(t=t.replace(/-moz-|-webkit-|start|auto/i,''));!t&&s&&(t=r.getComputedStyle('direction')=='rtl'?'right':'left');return t;};function o(r){if(r.editor.readOnly)return;var s=r.editor.getCommand(this.name);s.state=m.call(this,r.editor,r.data.path);s.fire('state');};function p(r,s,t){var v=this;v.name=s;v.value=t;var u=r.config.justifyClasses;if(u){switch(t){case 'left':v.cssClassName=u[0];break;case 'center':v.cssClassName=u[1];break;case 'right':v.cssClassName=u[2];break;case 'justify':v.cssClassName=u[3];break;}v.cssClassRegex=new RegExp('(?:^|\\s+)(?:'+u.join('|')+')(?=$|\\s)');}};function q(r){var s=r.editor,t=new d.range(s.document);t.setStartBefore(r.data.node);t.setEndAfter(r.data.node);var u=new d.walker(t),v;while(v=u.next()){if(v.type==1){if(!v.equals(r.data.node)&&v.getDirection()){t.setStartAfter(v);u=new d.walker(t);continue;}var w=s.config.justifyClasses;if(w)if(v.hasClass(w[0])){v.removeClass(w[0]);v.addClass(w[2]);}else if(v.hasClass(w[2])){v.removeClass(w[2]);v.addClass(w[0]);}var x='text-align',y=v.getStyle(x);if(y=='left')v.setStyle(x,'right');else if(y=='right')v.setStyle(x,'left');}}};p.prototype={exec:function(r){var D=this;var s=r.getSelection(),t=r.config.enterMode;if(!s)return;var u=s.createBookmarks(),v=s.getRanges(true),w=D.cssClassName,x,y,z=r.config.useComputedState;z=z===undefined||z;for(var A=v.length-1;A>=0;A--){x=v[A].createIterator();x.enlargeBr=t!=2;while(y=x.getNextParagraph(t==1?'p':'div')){y.removeAttribute('align');y.removeStyle('text-align');var B=w&&(y.$.className=e.ltrim(y.$.className.replace(D.cssClassRegex,''))),C=D.state==2&&(!z||n(y,true)!=D.value);if(w){if(C)y.addClass(w);else if(!B)y.removeAttribute('class');}else if(C)y.setStyle('text-align',D.value);}}r.focus();r.forceNextSelectionCheck();s.selectBookmarks(u);}};j.add('justify',{init:function(r){var s=new p(r,'justifyleft','left'),t=new p(r,'justifycenter','center'),u=new p(r,'justifyright','right'),v=new p(r,'justifyblock','justify');r.addCommand('justifyleft',s);r.addCommand('justifycenter',t);r.addCommand('justifyright',u);r.addCommand('justifyblock',v);r.ui.addButton('JustifyLeft',{label:r.lang.justify.left,command:'justifyleft'});r.ui.addButton('JustifyCenter',{label:r.lang.justify.center,command:'justifycenter'});r.ui.addButton('JustifyRight',{label:r.lang.justify.right,command:'justifyright'});
+r.ui.addButton('JustifyBlock',{label:r.lang.justify.block,command:'justifyblock'});r.on('selectionChange',e.bind(o,s));r.on('selectionChange',e.bind(o,u));r.on('selectionChange',e.bind(o,t));r.on('selectionChange',e.bind(o,v));r.on('dirChanged',q);},requires:['domiterator']});})();j.add('keystrokes',{beforeInit:function(m){m.keystrokeHandler=new a.keystrokeHandler(m);m.specialKeys={};},init:function(m){var n=m.config.keystrokes,o=m.config.blockedKeystrokes,p=m.keystrokeHandler.keystrokes,q=m.keystrokeHandler.blockedKeystrokes;for(var r=0;r<n.length;r++)p[n[r][0]]=n[r][1];for(r=0;r<o.length;r++)q[o[r]]=1;}});a.keystrokeHandler=function(m){var n=this;if(m.keystrokeHandler)return m.keystrokeHandler;n.keystrokes={};n.blockedKeystrokes={};n._={editor:m};return n;};(function(){var m,n=function(p){p=p.data;var q=p.getKeystroke(),r=this.keystrokes[q],s=this._.editor;m=s.fire('key',{keyCode:q})===true;if(!m){if(r){var t={from:'keystrokeHandler'};m=s.execCommand(r,t)!==false;}if(!m){var u=s.specialKeys[q];m=u&&u(s)===true;if(!m)m=!!this.blockedKeystrokes[q];}}if(m)p.preventDefault(true);return!m;},o=function(p){if(m){m=false;p.data.preventDefault(true);}};a.keystrokeHandler.prototype={attach:function(p){p.on('keydown',n,this);if(b.opera||b.gecko&&b.mac)p.on('keypress',o,this);}};})();i.blockedKeystrokes=[1000+66,1000+73,1000+85];i.keystrokes=[[4000+121,'toolbarFocus'],[4000+122,'elementsPathFocus'],[2000+121,'contextMenu'],[1000+2000+121,'contextMenu'],[1000+90,'undo'],[1000+89,'redo'],[1000+2000+90,'redo'],[1000+76,'link'],[1000+66,'bold'],[1000+73,'italic'],[1000+85,'underline'],[4000+(c||b.webkit?189:109),'toolbarCollapse'],[4000+48,'a11yHelp']];j.add('link',{init:function(m){m.addCommand('link',new a.dialogCommand('link'));m.addCommand('anchor',new a.dialogCommand('anchor'));m.addCommand('unlink',new a.unlinkCommand());m.addCommand('removeAnchor',new a.removeAnchorCommand());m.ui.addButton('Link',{label:m.lang.link.toolbar,command:'link'});m.ui.addButton('Unlink',{label:m.lang.unlink,command:'unlink'});m.ui.addButton('Anchor',{label:m.lang.anchor.toolbar,command:'anchor'});a.dialog.add('link',this.path+'dialogs/link.js');a.dialog.add('anchor',this.path+'dialogs/anchor.js');var n=m.lang.dir=='rtl'?'right':'left',o='background:url('+a.getUrl(this.path+'images/anchor.gif')+') no-repeat '+n+' center;'+'border:1px dotted #00f;';m.addCss('a.cke_anchor,a.cke_anchor_empty'+(c&&b.version<7?'':',a[name],a[data-cke-saved-name]')+'{'+o+'padding-'+n+':18px;'+'cursor:auto;'+'}'+(c?'a.cke_anchor_empty{display:inline-block;}':'')+'img.cke_anchor'+'{'+o+'width:16px;'+'min-height:15px;'+'height:1.15em;'+'vertical-align:'+(b.opera?'middle':'text-bottom')+';'+'}');
+m.on('selectionChange',function(p){if(m.readOnly)return;var q=m.getCommand('unlink'),r=p.data.path.lastElement&&p.data.path.lastElement.getAscendant('a',true);if(r&&r.getName()=='a'&&r.getAttribute('href')&&r.getChildCount())q.setState(2);else q.setState(0);});m.on('doubleclick',function(p){var q=j.link.getSelectedLink(m)||p.data.element;if(!q.isReadOnly())if(q.is('a')){p.data.dialog=q.getAttribute('name')&&(!q.getAttribute('href')||!q.getChildCount())?'anchor':'link';m.getSelection().selectElement(q);}else if(j.link.tryRestoreFakeAnchor(m,q))p.data.dialog='anchor';});if(m.addMenuItems)m.addMenuItems({anchor:{label:m.lang.anchor.menu,command:'anchor',group:'anchor',order:1},removeAnchor:{label:m.lang.anchor.remove,command:'removeAnchor',group:'anchor',order:5},link:{label:m.lang.link.menu,command:'link',group:'link',order:1},unlink:{label:m.lang.unlink,command:'unlink',group:'link',order:5}});if(m.contextMenu)m.contextMenu.addListener(function(p,q){if(!p||p.isReadOnly())return null;var r=j.link.tryRestoreFakeAnchor(m,p);if(!r&&!(r=j.link.getSelectedLink(m)))return null;var s={};if(r.getAttribute('href')&&r.getChildCount())s={link:2,unlink:2};if(r&&r.hasAttribute('name'))s.anchor=s.removeAnchor=2;return s;});},afterInit:function(m){var n=m.dataProcessor,o=n&&n.dataFilter,p=n&&n.htmlFilter,q=m._.elementsPath&&m._.elementsPath.filters;if(o)o.addRules({elements:{a:function(r){var s=r.attributes;if(!s.name)return null;var t=!r.children.length;if(j.link.synAnchorSelector){var u=t?'cke_anchor_empty':'cke_anchor',v=s['class'];if(s.name&&(!v||v.indexOf(u)<0))s['class']=(v||'')+' '+u;if(t&&j.link.emptyAnchorFix){s.contenteditable='false';s['data-cke-editable']=1;}}else if(j.link.fakeAnchor&&t)return m.createFakeParserElement(r,'cke_anchor','anchor');return null;}}});if(j.link.emptyAnchorFix&&p)p.addRules({elements:{a:function(r){delete r.attributes.contenteditable;}}});if(q)q.push(function(r,s){if(s=='a')if(j.link.tryRestoreFakeAnchor(m,r)||r.getAttribute('name')&&(!r.getAttribute('href')||!r.getChildCount()))return 'anchor';});},requires:['fakeobjects']});j.link={getSelectedLink:function(m){try{var n=m.getSelection();if(n.getType()==3){var o=n.getSelectedElement();if(o.is('a'))return o;}var p=n.getRanges(true)[0];p.shrink(2);var q=p.getCommonAncestor();return q.getAscendant('a',true);}catch(r){return null;}},fakeAnchor:b.opera||b.webkit,synAnchorSelector:c,emptyAnchorFix:c&&b.version<8,tryRestoreFakeAnchor:function(m,n){if(n&&n.data('cke-real-element-type')&&n.data('cke-real-element-type')=='anchor'){var o=m.restoreRealElement(n);
+if(o.data('cke-saved-name'))return o;}}};a.unlinkCommand=function(){};a.unlinkCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p=n.getRanges(),q,r;for(var s=0;s<p.length;s++){q=p[s].getCommonAncestor(true);r=q.getAscendant('a',true);if(!r)continue;p[s].selectNodeContents(r);}n.selectRanges(p);m.document.$.execCommand('unlink',false,null);n.selectBookmarks(o);},startDisabled:true};a.removeAnchorCommand=function(){};a.removeAnchorCommand.prototype={exec:function(m){var n=m.getSelection(),o=n.createBookmarks(),p;if(n&&(p=n.getSelectedElement())&&(j.link.fakeAnchor&&!p.getChildCount()?j.link.tryRestoreFakeAnchor(m,p):p.is('a')))p.remove(1);else if(p=j.link.getSelectedLink(m))if(p.hasAttribute('href')){p.removeAttributes({name:1,'data-cke-saved-name':1});p.removeClass('cke_anchor');}else p.remove(1);n.selectBookmarks(o);}};e.extend(i,{linkShowAdvancedTab:true,linkShowTargetTab:true});(function(){var m={ol:1,ul:1},n=/^[\n\r\t ]*$/,o=d.walker.whitespaces(),p=d.walker.bookmark(),q=function(G){return!(o(G)||p(G));};function r(G){var H,I,J;if(H=G.getDirection()){I=G.getParent();while(I&&!(J=I.getDirection()))I=I.getParent();if(H==J)G.removeAttribute('dir');}};j.list={listToArray:function(G,H,I,J,K){if(!m[G.getName()])return[];if(!J)J=0;if(!I)I=[];for(var L=0,M=G.getChildCount();L<M;L++){var N=G.getChild(L);if(N.type==1&&N.getName() in f.$list)j.list.listToArray(N,H,I,J+1);if(N.$.nodeName.toLowerCase()!='li')continue;var O={parent:G,indent:J,element:N,contents:[]};if(!K){O.grandparent=G.getParent();if(O.grandparent&&O.grandparent.$.nodeName.toLowerCase()=='li')O.grandparent=O.grandparent.getParent();}else O.grandparent=K;if(H)h.setMarker(H,N,'listarray_index',I.length);I.push(O);for(var P=0,Q=N.getChildCount(),R;P<Q;P++){R=N.getChild(P);if(R.type==1&&m[R.getName()])j.list.listToArray(R,H,I,J+1,O.grandparent);else O.contents.push(R);}}return I;},arrayToList:function(G,H,I,J,K){if(!I)I=0;if(!G||G.length<I+1)return null;var L=G[I].parent.getDocument(),M=new d.documentFragment(L),N=null,O=I,P=Math.max(G[I].indent,0),Q=null,R,S=J==1?'p':'div';while(1){var T=G[O];R=T.element.getDirection(1);if(T.indent==P){if(!N||G[O].parent.getName()!=N.getName()){N=G[O].parent.clone(false,1);K&&N.setAttribute('dir',K);M.append(N);}Q=N.append(T.element.clone(0,1));if(R!=N.getDirection(1))Q.setAttribute('dir',R);for(var U=0;U<T.contents.length;U++)Q.append(T.contents[U].clone(1,1));O++;}else if(T.indent==Math.max(P,0)+1){var V=G[O-1].element.getDirection(1),W=j.list.arrayToList(G,null,O,J,V!=R?R:null);
+if(!Q.getChildCount()&&c&&!(L.$.documentMode>7))Q.append(L.createText('\xa0'));Q.append(W.listNode);O=W.nextIndex;}else if(T.indent==-1&&!I&&T.grandparent){if(m[T.grandparent.getName()])Q=T.element.clone(false,true);else if(K||T.element.hasAttributes()||J!=2){Q=L.createElement(S);T.element.copyAttributes(Q,{type:1,value:1});if(!K&&J==2&&!Q.hasAttributes())Q=new d.documentFragment(L);}else Q=new d.documentFragment(L);if(Q.type==1)if(T.grandparent.getDirection(1)!=R)Q.setAttribute('dir',R);for(U=0;U<T.contents.length;U++)Q.append(T.contents[U].clone(1,1));if(Q.type==11&&O!=G.length-1){var X=Q.getLast();if(X&&X.type==1&&X.getAttribute('type')=='_moz')X.remove();if(!(X=Q.getLast(q)&&X.type==1&&X.getName() in f.$block))Q.append(L.createElement('br'));}if(Q.type==1&&Q.getName()==S&&Q.$.firstChild){Q.trim();var Y=Q.getFirst();if(Y.type==1&&Y.isBlockBoundary()){var Z=new d.documentFragment(L);Q.moveChildren(Z);Q=Z;}}var aa=Q.$.nodeName.toLowerCase();if(!c&&(aa=='div'||aa=='p'))Q.appendBogus();M.append(Q);N=null;O++;}else return null;if(G.length<=O||Math.max(G[O].indent,0)<P)break;}if(H){var ab=M.getFirst(),ac=G[0].parent;while(ab){if(ab.type==1){h.clearMarkers(H,ab);if(ab.getName() in f.$listItem)r(ab);}ab=ab.getNextSourceNode();}}return{listNode:M,nextIndex:O};}};function s(G){if(G.editor.readOnly)return null;var H=G.data.path,I=H.blockLimit,J=H.elements,K,L;for(L=0;L<J.length&&(K=J[L])&&!K.equals(I);L++){if(m[J[L].getName()])return this.setState(this.type==J[L].getName()?1:2);}return this.setState(2);};function t(G,H,I,J){var K=j.list.listToArray(H.root,I),L=[];for(var M=0;M<H.contents.length;M++){var N=H.contents[M];N=N.getAscendant('li',true);if(!N||N.getCustomData('list_item_processed'))continue;L.push(N);h.setMarker(I,N,'list_item_processed',true);}var O=H.root,P=O.getDocument().createElement(this.type);O.copyAttributes(P,{start:1,type:1});P.removeStyle('list-style-type');for(M=0;M<L.length;M++){var Q=L[M].getCustomData('listarray_index');K[Q].parent=P;}var R=j.list.arrayToList(K,I,null,G.config.enterMode),S,T=R.listNode.getChildCount();for(M=0;M<T&&(S=R.listNode.getChild(M));M++){if(S.getName()==this.type)J.push(S);}R.listNode.replace(H.root);};var u=/^h[1-6]$/;function v(G,H,I){var J=H.contents,K=H.root.getDocument(),L=[];if(J.length==1&&J[0].equals(H.root)){var M=K.createElement('div');J[0].moveChildren&&J[0].moveChildren(M);J[0].append(M);J[0]=M;}var N=H.contents[0].getParent();for(var O=0;O<J.length;O++)N=N.getCommonAncestor(J[O].getParent());var P=G.config.useComputedState,Q,R;
+P=P===undefined||P;for(O=0;O<J.length;O++){var S=J[O],T;while(T=S.getParent()){if(T.equals(N)){L.push(S);if(!R&&S.getDirection())R=1;var U=S.getDirection(P);if(Q!==null)if(Q&&Q!=U)Q=null;else Q=U;break;}S=T;}}if(L.length<1)return;var V=L[L.length-1].getNext(),W=K.createElement(this.type);I.push(W);var X,Y;while(L.length){X=L.shift();Y=K.createElement('li');if(X.is('pre')||u.test(X.getName()))X.appendTo(Y);else{X.copyAttributes(Y);if(Q&&X.getDirection()){Y.removeStyle('direction');Y.removeAttribute('dir');}X.moveChildren(Y);X.remove();}Y.appendTo(W);}if(Q&&R)W.setAttribute('dir',Q);if(V)W.insertBefore(V);else W.appendTo(N);};function w(G,H,I){var J=j.list.listToArray(H.root,I),K=[];for(var L=0;L<H.contents.length;L++){var M=H.contents[L];M=M.getAscendant('li',true);if(!M||M.getCustomData('list_item_processed'))continue;K.push(M);h.setMarker(I,M,'list_item_processed',true);}var N=null;for(L=0;L<K.length;L++){var O=K[L].getCustomData('listarray_index');J[O].indent=-1;N=O;}for(L=N+1;L<J.length;L++){if(J[L].indent>J[L-1].indent+1){var P=J[L-1].indent+1-J[L].indent,Q=J[L].indent;while(J[L]&&J[L].indent>=Q){J[L].indent+=P;L++;}L--;}}var R=j.list.arrayToList(J,I,null,G.config.enterMode,H.root.getAttribute('dir')),S=R.listNode,T,U;function V(W){if((T=S[W?'getFirst':'getLast']())&&!(T.is&&T.isBlockBoundary())&&(U=H.root[W?'getPrevious':'getNext'](d.walker.whitespaces(true)))&&!(U.is&&U.isBlockBoundary({br:1})))G.document.createElement('br')[W?'insertBefore':'insertAfter'](T);};V(true);V();S.replace(H.root);};function x(G,H){this.name=G;this.type=H;};function y(G){var H=G.getDirection();if(H){for(var I=0,J=G.getChildren(),K;K=J.getItem(I),I<J.count();I++){if(K.type==1&&K.is('li')&&!K.getDirection())K.setAttribute('dir',H);}G.removeAttribute('dir');}};x.prototype={exec:function(G){var H=G.document,I=G.config,J=G.getSelection(),K=J&&J.getRanges(true);if(!K||K.length<1)return;if(this.state==2){var L=H.getBody();if(!L.getFirst(q)){I.enterMode==2?L.appendBogus():K[0].fixBlock(1,I.enterMode==1?'p':'div');J.selectRanges(K);}else{var M=K.length==1&&K[0],N=M&&M.getEnclosedNode();if(N&&N.is&&this.type==N.getName())this.setState(1);}}var O=J.createBookmarks(true),P=[],Q={},R=K.createIterator(),S=0;while((M=R.getNextRange())&&++S){var T=M.getBoundaryNodes(),U=T.startNode,V=T.endNode;if(U.type==1&&U.getName()=='td')M.setStartAt(T.startNode,1);if(V.type==1&&V.getName()=='td')M.setEndAt(T.endNode,2);var W=M.createIterator(),X;W.forceBrBreak=this.state==2;while(X=W.getNextParagraph()){if(X.getCustomData('list_block'))continue;
+else h.setMarker(Q,X,'list_block',1);var Y=new d.elementPath(X),Z=Y.elements,aa=Z.length,ab=null,ac=0,ad=Y.blockLimit,ae;for(var af=aa-1;af>=0&&(ae=Z[af]);af--){if(m[ae.getName()]&&ad.contains(ae)){ad.removeCustomData('list_group_object_'+S);var ag=ae.getCustomData('list_group_object');if(ag)ag.contents.push(X);else{ag={root:ae,contents:[X]};P.push(ag);h.setMarker(Q,ae,'list_group_object',ag);}ac=1;break;}}if(ac)continue;var ah=ad;if(ah.getCustomData('list_group_object_'+S))ah.getCustomData('list_group_object_'+S).contents.push(X);else{ag={root:ah,contents:[X]};h.setMarker(Q,ah,'list_group_object_'+S,ag);P.push(ag);}}}var ai=[];while(P.length>0){ag=P.shift();if(this.state==2){if(m[ag.root.getName()])t.call(this,G,ag,Q,ai);else v.call(this,G,ag,ai);}else if(this.state==1&&m[ag.root.getName()])w.call(this,G,ag,Q);}for(af=0;af<ai.length;af++){ab=ai[af];var aj,ak=this;(aj=function(al){var am=ab[al?'getPrevious':'getNext'](d.walker.whitespaces(true));if(am&&am.getName&&am.getName()==ak.type){if(am.getDirection(1)!=ab.getDirection(1))y(ab.getDirection()?ab:am);am.remove();am.moveChildren(ab,al);}})();aj(1);}h.clearAllMarkers(Q);J.selectBookmarks(O);G.focus();}};var z=f,A=/[\t\r\n ]*(?:&nbsp;|\xa0)$/;function B(G,H){var I,J=G.children,K=J.length;for(var L=0;L<K;L++){I=J[L];if(I.name&&I.name in H)return L;}return K;};function C(G){return function(H){var I=H.children,J=B(H,z.$list),K=I[J],L=K&&K.previous,M;if(L&&(L.name&&L.name=='br'||L.value&&(M=L.value.match(A)))){var N=L;if(!(M&&M.index)&&N==I[0])I[0]=G||c?new a.htmlParser.text('\xa0'):new a.htmlParser.element('br',{});else if(N.name=='br')I.splice(J-1,1);else N.value=N.value.replace(A,'');}};};var D={elements:{}};for(var E in z.$listItem)D.elements[E]=C();var F={elements:{}};for(E in z.$listItem)F.elements[E]=C(true);j.add('list',{init:function(G){var H=G.addCommand('numberedlist',new x('numberedlist','ol')),I=G.addCommand('bulletedlist',new x('bulletedlist','ul'));G.ui.addButton('NumberedList',{label:G.lang.numberedlist,command:'numberedlist'});G.ui.addButton('BulletedList',{label:G.lang.bulletedlist,command:'bulletedlist'});G.on('selectionChange',e.bind(s,H));G.on('selectionChange',e.bind(s,I));},afterInit:function(G){var H=G.dataProcessor;if(H){H.dataFilter.addRules(D);H.htmlFilter.addRules(F);}},requires:['domiterator']});})();(function(){j.liststyle={requires:['dialog'],init:function(m){m.addCommand('numberedListStyle',new a.dialogCommand('numberedListStyle'));a.dialog.add('numberedListStyle',this.path+'dialogs/liststyle.js');
+m.addCommand('bulletedListStyle',new a.dialogCommand('bulletedListStyle'));a.dialog.add('bulletedListStyle',this.path+'dialogs/liststyle.js');if(m.addMenuItems){m.addMenuGroup('list',108);m.addMenuItems({numberedlist:{label:m.lang.list.numberedTitle,group:'list',command:'numberedListStyle'},bulletedlist:{label:m.lang.list.bulletedTitle,group:'list',command:'bulletedListStyle'}});}if(m.contextMenu)m.contextMenu.addListener(function(n,o){if(!n||n.isReadOnly())return null;while(n){var p=n.getName();if(p=='ol')return{numberedlist:2};else if(p=='ul')return{bulletedlist:2};n=n.getParent();}return null;});}};j.add('liststyle',j.liststyle);})();(function(){function m(s){if(!s||s.type!=1||s.getName()!='form')return[];var t=[],u=['style','className'];for(var v=0;v<u.length;v++){var w=u[v],x=s.$.elements.namedItem(w);if(x){var y=new h(x);t.push([y,y.nextSibling]);y.remove();}}return t;};function n(s,t){if(!s||s.type!=1||s.getName()!='form')return;if(t.length>0)for(var u=t.length-1;u>=0;u--){var v=t[u][0],w=t[u][1];if(w)v.insertBefore(w);else v.appendTo(s);}};function o(s,t){var u=m(s),v={},w=s.$;if(!t){v['class']=w.className||'';w.className='';}v.inline=w.style.cssText||'';if(!t)w.style.cssText='position: static; overflow: visible';n(u);return v;};function p(s,t){var u=m(s),v=s.$;if('class' in t)v.className=t['class'];if('inline' in t)v.style.cssText=t.inline;n(u);};function q(s){var t=a.instances;for(var u in t){var v=t[u];if(v.mode=='wysiwyg'&&!v.readOnly){var w=v.document.getBody();w.setAttribute('contentEditable',false);w.setAttribute('contentEditable',true);}}if(s.focusManager.hasFocus){s.toolbox.focus();s.focus();}};function r(s){if(!c||b.version>6)return null;var t=h.createFromHtml('<iframe frameborder="0" tabindex="-1" src="javascript:void((function(){document.open();'+(b.isCustomDomain()?"document.domain='"+this.getDocument().$.domain+"';":'')+'document.close();'+'})())"'+' style="display:block;position:absolute;z-index:-1;'+'progid:DXImageTransform.Microsoft.Alpha(opacity=0);'+'"></iframe>');return s.append(t,true);};j.add('maximize',{init:function(s){var t=s.lang,u=a.document,v=u.getWindow(),w,x,y,z;function A(){var C=v.getViewPaneSize();z&&z.setStyles({width:C.width+'px',height:C.height+'px'});s.resize(C.width,C.height,null,true);};var B=2;s.addCommand('maximize',{modes:{wysiwyg:!b.iOS,source:!b.iOS},readOnly:1,editorFocus:false,exec:function(){var C=s.container.getChild(1),D=s.getThemeSpace('contents');if(s.mode=='wysiwyg'){var E=s.getSelection();w=E&&E.getRanges();
+x=v.getScrollPosition();}else{var F=s.textarea.$;w=!c&&[F.selectionStart,F.selectionEnd];x=[F.scrollLeft,F.scrollTop];}if(this.state==2){v.on('resize',A);y=v.getScrollPosition();var G=s.container;while(G=G.getParent()){G.setCustomData('maximize_saved_styles',o(G));G.setStyle('z-index',s.config.baseFloatZIndex-1);}D.setCustomData('maximize_saved_styles',o(D,true));C.setCustomData('maximize_saved_styles',o(C,true));var H={overflow:b.webkit?'':'hidden',width:0,height:0};u.getDocumentElement().setStyles(H);!b.gecko&&u.getDocumentElement().setStyle('position','fixed');!(b.gecko&&b.quirks)&&u.getBody().setStyles(H);c?setTimeout(function(){v.$.scrollTo(0,0);},0):v.$.scrollTo(0,0);C.setStyle('position',b.gecko&&b.quirks?'fixed':'absolute');C.$.offsetLeft;C.setStyles({'z-index':s.config.baseFloatZIndex-1,left:'0px',top:'0px'});z=r(C);C.addClass('cke_maximized');A();var I=C.getDocumentPosition();C.setStyles({left:-1*I.x+'px',top:-1*I.y+'px'});b.gecko&&q(s);}else if(this.state==1){v.removeListener('resize',A);var J=[D,C];for(var K=0;K<J.length;K++){p(J[K],J[K].getCustomData('maximize_saved_styles'));J[K].removeCustomData('maximize_saved_styles');}G=s.container;while(G=G.getParent()){p(G,G.getCustomData('maximize_saved_styles'));G.removeCustomData('maximize_saved_styles');}c?setTimeout(function(){v.$.scrollTo(y.x,y.y);},0):v.$.scrollTo(y.x,y.y);C.removeClass('cke_maximized');if(b.webkit){C.setStyle('display','inline');setTimeout(function(){C.setStyle('display','block');},0);}if(z){z.remove();z=null;}s.fire('resize');}this.toggleState();var L=this.uiItems[0];if(L){var M=this.state==2?t.maximize:t.minimize,N=s.element.getDocument().getById(L._.id);N.getChild(1).setHtml(M);N.setAttribute('title',M);N.setAttribute('href','javascript:void("'+M+'");');}if(s.mode=='wysiwyg'){if(w){b.gecko&&q(s);s.getSelection().selectRanges(w);var O=s.getSelection().getStartElement();O&&O.scrollIntoView(true);}else v.$.scrollTo(x.x,x.y);}else{if(w){F.selectionStart=w[0];F.selectionEnd=w[1];}F.scrollLeft=x[0];F.scrollTop=x[1];}w=x=null;B=this.state;},canUndo:false});s.ui.addButton('Maximize',{label:t.maximize,command:'maximize'});s.on('mode',function(){var C=s.getCommand('maximize');C.setState(C.state==0?0:B);},null,null,100);}});})();j.add('newpage',{init:function(m){m.addCommand('newpage',{modes:{wysiwyg:1,source:1},exec:function(n){var o=this;n.setData(n.config.newpage_html||'',function(){setTimeout(function(){n.fire('afterCommandExec',{name:o.name,command:o});n.selectionChange();},200);});
+n.focus();},async:true});m.ui.addButton('NewPage',{label:m.lang.newPage,command:'newpage'});}});j.add('pagebreak',{init:function(m){m.addCommand('pagebreak',j.pagebreakCmd);m.ui.addButton('PageBreak',{label:m.lang.pagebreak,command:'pagebreak'});var n=['{','background: url('+a.getUrl(this.path+'images/pagebreak.gif')+') no-repeat center center;','clear: both;','width:100%; _width:99.9%;','border-top: #999999 1px dotted;','border-bottom: #999999 1px dotted;','padding:0;','height: 5px;','cursor: default;','}'].join('').replace(/;/g,' !important;');m.addCss('div.cke_pagebreak'+n);b.opera&&m.on('contentDom',function(){m.document.on('click',function(o){var p=o.data.getTarget();if(p.is('div')&&p.hasClass('cke_pagebreak'))m.getSelection().selectElement(p);});});},afterInit:function(m){var n=m.lang.pagebreakAlt,o=m.dataProcessor,p=o&&o.dataFilter,q=o&&o.htmlFilter;if(q)q.addRules({attributes:{'class':function(r,s){var t=r.replace('cke_pagebreak','');if(t!=r){var u=a.htmlParser.fragment.fromHtml('<span style="display: none;">&nbsp;</span>');s.children.length=0;s.add(u);var v=s.attributes;delete v['aria-label'];delete v.contenteditable;delete v.title;}return t;}}},5);if(p)p.addRules({elements:{div:function(r){var s=r.attributes,t=s&&s.style,u=t&&r.children.length==1&&r.children[0],v=u&&u.name=='span'&&u.attributes.style;if(v&&/page-break-after\s*:\s*always/i.test(t)&&/display\s*:\s*none/i.test(v)){s.contenteditable='false';s['class']='cke_pagebreak';s['data-cke-display-name']='pagebreak';s['aria-label']=n;s.title=n;r.children.length=0;}}}});},requires:['fakeobjects']});j.pagebreakCmd={exec:function(m){var n=m.lang.pagebreakAlt,o=h.createFromHtml('<div style="page-break-after: always;"contenteditable="false" title="'+n+'" '+'aria-label="'+n+'" '+'data-cke-display-name="pagebreak" '+'class="cke_pagebreak">'+'</div>',m.document),p=m.getSelection().getRanges(true);m.fire('saveSnapshot');for(var q,r=p.length-1;r>=0;r--){q=p[r];if(r<p.length-1)o=o.clone(true);q.splitBlock('p');q.insertNode(o);if(r==p.length-1){var s=o.getNext();q.moveToPosition(o,4);if(!s||s.type==1&&!s.isEditable())q.fixBlock(true,m.config.enterMode==3?'div':'p');q.select();}}m.fire('saveSnapshot');}};(function(){function m(n){n.data.mode='html';};j.add('pastefromword',{init:function(n){var o=0,p=function(q){q&&q.removeListener();n.removeListener('beforePaste',m);o&&setTimeout(function(){o=0;},0);};n.addCommand('pastefromword',{canUndo:false,exec:function(){o=1;n.on('beforePaste',m);if(n.execCommand('paste','html')===false){n.on('dialogShow',function(q){q.removeListener();
+q.data.on('cancel',p);});n.on('dialogHide',function(q){q.data.removeListener('cancel',p);});}n.on('afterPaste',p);}});n.ui.addButton('PasteFromWord',{label:n.lang.pastefromword.toolbar,command:'pastefromword'});n.on('pasteState',function(q){n.getCommand('pastefromword').setState(q.data);});n.on('paste',function(q){var r=q.data,s;if((s=r.html)&&(o||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(s))){var t=this.loadFilterRules(function(){if(t)n.fire('paste',r);else if(!n.config.pasteFromWordPromptCleanup||o||confirm(n.lang.pastefromword.confirmCleanup))r.html=a.cleanWord(s,n);});t&&q.cancel();}},this);},loadFilterRules:function(n){var o=a.cleanWord;if(o)n();else{var p=a.getUrl(i.pasteFromWordCleanupFile||this.path+'filter/default.js');a.scriptLoader.load(p,n,null,true);}return!o;},requires:['clipboard']});})();(function(){var m={exec:function(n){var o=e.tryThese(function(){var p=window.clipboardData.getData('Text');if(!p)throw 0;return p;});if(!o){n.openDialog('pastetext');return false;}else n.fire('paste',{text:o});return true;}};j.add('pastetext',{init:function(n){var o='pastetext',p=n.addCommand(o,m);n.ui.addButton('PasteText',{label:n.lang.pasteText.button,command:o});a.dialog.add(o,a.getUrl(this.path+'dialogs/pastetext.js'));if(n.config.forcePasteAsPlainText){n.on('beforeCommandExec',function(q){var r=q.data.commandData;if(q.data.name=='paste'&&r!='html'){n.execCommand('pastetext');q.cancel();}},null,null,0);n.on('beforePaste',function(q){q.data.mode='text';});}n.on('pasteState',function(q){n.getCommand('pastetext').setState(q.data);});},requires:['clipboard']});})();j.add('popup');e.extend(a.editor.prototype,{popup:function(m,n,o,p){n=n||'80%';o=o||'70%';if(typeof n=='string'&&n.length>1&&n.substr(n.length-1,1)=='%')n=parseInt(window.screen.width*parseInt(n,10)/100,10);if(typeof o=='string'&&o.length>1&&o.substr(o.length-1,1)=='%')o=parseInt(window.screen.height*parseInt(o,10)/100,10);if(n<640)n=640;if(o<420)o=420;var q=parseInt((window.screen.height-o)/2,10),r=parseInt((window.screen.width-n)/2,10);p=(p||'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes')+',width='+n+',height='+o+',top='+q+',left='+r;var s=window.open('',null,p,true);if(!s)return false;try{s.moveTo(r,q);s.resizeTo(n,o);s.focus();s.location.href=m;}catch(t){s=window.open(m,null,p,true);}return true;}});(function(){var m={modes:{wysiwyg:1,source:1},canUndo:false,readOnly:1,exec:function(o){var p,q=o.config,r=q.baseHref?'<base href="'+q.baseHref+'"/>':'',s=b.isCustomDomain();
+if(q.fullPage)p=o.getData().replace(/<head>/,'$&'+r).replace(/[^>]*(?=<\/title>)/,'$& &mdash; '+o.lang.preview);else{var t='<body ',u=o.document&&o.document.getBody();if(u){if(u.getAttribute('id'))t+='id="'+u.getAttribute('id')+'" ';if(u.getAttribute('class'))t+='class="'+u.getAttribute('class')+'" ';}t+='>';p=o.config.docType+'<html dir="'+o.config.contentsLangDirection+'">'+'<head>'+r+'<title>'+o.lang.preview+'</title>'+e.buildStyleHtml(o.config.contentsCss)+'</head>'+t+o.getData()+'</body></html>';}var v=640,w=420,x=80;try{var y=window.screen;v=Math.round(y.width*0.8);w=Math.round(y.height*0.7);x=Math.round(y.width*0.1);}catch(C){}var z='';if(s){window._cke_htmlToLoad=p;z='javascript:void( (function(){document.open();document.domain="'+document.domain+'";'+'document.write( window.opener._cke_htmlToLoad );'+'document.close();'+'window.opener._cke_htmlToLoad = null;'+'})() )';}var A=window.open(z,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+v+',height='+w+',left='+x);if(!s){var B=A.document;B.open();B.write(p);B.close();b.webkit&&setTimeout(function(){B.body.innerHTML+='';},0);}}},n='preview';j.add(n,{init:function(o){o.addCommand(n,m);o.ui.addButton('Preview',{label:o.lang.preview,command:n});}});})();j.add('print',{init:function(m){var n='print',o=m.addCommand(n,j.print);m.ui.addButton('Print',{label:m.lang.print,command:n});}});j.print={exec:function(m){if(b.opera)return;else if(b.gecko)m.window.$.print();else m.document.$.execCommand('Print');},canUndo:false,readOnly:1,modes:{wysiwyg:!b.opera}};j.add('removeformat',{requires:['selection'],init:function(m){m.addCommand('removeFormat',j.removeformat.commands.removeformat);m.ui.addButton('RemoveFormat',{label:m.lang.removeFormat,command:'removeFormat'});m._.removeFormat={filters:[]};}});j.removeformat={commands:{removeformat:{exec:function(m){var n=m._.removeFormatRegex||(m._.removeFormatRegex=new RegExp('^(?:'+m.config.removeFormatTags.replace(/,/g,'|')+')$','i')),o=m._.removeAttributes||(m._.removeAttributes=m.config.removeFormatAttributes.split(',')),p=j.removeformat.filter,q=m.getSelection().getRanges(1),r=q.createIterator(),s;while(s=r.getNextRange()){if(!s.collapsed)s.enlarge(1);var t=s.createBookmark(),u=t.startNode,v=t.endNode,w,x=function(z){var A=new d.elementPath(z),B=A.elements;for(var C=1,D;D=B[C];C++){if(D.equals(A.block)||D.equals(A.blockLimit))break;if(n.test(D.getName())&&p(m,D))z.breakParent(D);}};x(u);if(v){x(v);w=u.getNextSourceNode(true,1);
+while(w){if(w.equals(v))break;var y=w.getNextSourceNode(false,1);if(!(w.getName()=='img'&&w.data('cke-realelement'))&&p(m,w))if(n.test(w.getName()))w.remove(1);else{w.removeAttributes(o);m.fire('removeFormatCleanup',w);}w=y;}}s.moveToBookmark(t);}m.getSelection().selectRanges(q);}}},filter:function(m,n){var o=m._.removeFormat.filters;for(var p=0;p<o.length;p++){if(o[p](n)===false)return false;}return true;}};a.editor.prototype.addRemoveFormatFilter=function(m){this._.removeFormat.filters.push(m);};i.removeFormatTags='b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var';i.removeFormatAttributes='class,style,lang,width,height,align,hspace,valign';j.add('resize',{init:function(m){var n=m.config,o=m.element.getDirection(1);!n.resize_dir&&(n.resize_dir='both');n.resize_maxWidth==undefined&&(n.resize_maxWidth=3000);n.resize_maxHeight==undefined&&(n.resize_maxHeight=3000);n.resize_minWidth==undefined&&(n.resize_minWidth=750);n.resize_minHeight==undefined&&(n.resize_minHeight=250);if(n.resize_enabled!==false){var p=null,q,r,s=(n.resize_dir=='both'||n.resize_dir=='horizontal')&&n.resize_minWidth!=n.resize_maxWidth,t=(n.resize_dir=='both'||n.resize_dir=='vertical')&&n.resize_minHeight!=n.resize_maxHeight;function u(x){var y=x.data.$.screenX-q.x,z=x.data.$.screenY-q.y,A=r.width,B=r.height,C=A+y*(o=='rtl'?-1:1),D=B+z;if(s)A=Math.max(n.resize_minWidth,Math.min(C,n.resize_maxWidth));if(t)B=Math.max(n.resize_minHeight,Math.min(D,n.resize_maxHeight));m.resize(A,B);};function v(x){a.document.removeListener('mousemove',u);a.document.removeListener('mouseup',v);if(m.document){m.document.removeListener('mousemove',u);m.document.removeListener('mouseup',v);}};var w=e.addFunction(function(x){if(!p)p=m.getResizable();r={width:p.$.offsetWidth||0,height:p.$.offsetHeight||0};q={x:x.screenX,y:x.screenY};n.resize_minWidth>r.width&&(n.resize_minWidth=r.width);n.resize_minHeight>r.height&&(n.resize_minHeight=r.height);a.document.on('mousemove',u);a.document.on('mouseup',v);if(m.document){m.document.on('mousemove',u);m.document.on('mouseup',v);}});m.on('destroy',function(){e.removeFunction(w);});m.on('themeSpace',function(x){if(x.data.space=='bottom'){var y='';if(s&&!t)y=' cke_resizer_horizontal';if(!s&&t)y=' cke_resizer_vertical';var z='<div class="cke_resizer'+y+' cke_resizer_'+o+'"'+' title="'+e.htmlEncode(m.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+w+', event)"'+'></div>';o=='ltr'&&y=='ltr'?x.data.html+=z:x.data.html=z+x.data.html;
+}},m,null,100);}}});(function(){var m={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){var p=o.element.$.form;if(p)try{p.submit();}catch(q){if(p.submit.click)p.submit.click();}}},n='save';j.add(n,{init:function(o){var p=o.addCommand(n,m);p.modes={wysiwyg:!!o.element.$.form};o.ui.addButton('Save',{label:o.lang.save,command:n});}});})();(function(){var m='.%2 p,.%2 div,.%2 pre,.%2 address,.%2 blockquote,.%2 h1,.%2 h2,.%2 h3,.%2 h4,.%2 h5,.%2 h6{background-repeat: no-repeat;background-position: top %3;border: 1px dotted gray;padding-top: 8px;padding-%3: 8px;}.%2 p{%1p.png);}.%2 div{%1div.png);}.%2 pre{%1pre.png);}.%2 address{%1address.png);}.%2 blockquote{%1blockquote.png);}.%2 h1{%1h1.png);}.%2 h2{%1h2.png);}.%2 h3{%1h3.png);}.%2 h4{%1h4.png);}.%2 h5{%1h5.png);}.%2 h6{%1h6.png);}',n=/%1/g,o=/%2/g,p=/%3/g,q={readOnly:1,preserveState:true,editorFocus:false,exec:function(r){this.toggleState();this.refresh(r);},refresh:function(r){if(r.document){var s=this.state==1?'addClass':'removeClass';r.document.getBody()[s]('cke_show_blocks');}}};j.add('showblocks',{requires:['wysiwygarea'],init:function(r){var s=r.addCommand('showblocks',q);s.canUndo=false;if(r.config.startupOutlineBlocks)s.setState(1);r.addCss(m.replace(n,'background-image: url('+a.getUrl(this.path)+'images/block_').replace(o,'cke_show_blocks ').replace(p,r.lang.dir=='rtl'?'right':'left'));r.ui.addButton('ShowBlocks',{label:r.lang.showBlocks,command:'showblocks'});r.on('mode',function(){if(s.state!=0)s.refresh(r);});r.on('contentDom',function(){if(s.state!=0)s.refresh(r);});}});})();(function(){var m='cke_show_border',n,o=(b.ie6Compat?['.%1 table.%2,','.%1 table.%2 td, .%1 table.%2 th','{','border : #d3d3d3 1px dotted','}']:['.%1 table.%2,','.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,','.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,','.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,','.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th','{','border : #d3d3d3 1px dotted','}']).join('');n=o.replace(/%2/g,m).replace(/%1/g,'cke_show_borders ');var p={preserveState:true,editorFocus:false,readOnly:1,exec:function(q){this.toggleState();this.refresh(q);},refresh:function(q){if(q.document){var r=this.state==1?'addClass':'removeClass';q.document.getBody()[r]('cke_show_borders');}}};j.add('showborders',{requires:['wysiwygarea'],modes:{wysiwyg:1},init:function(q){var r=q.addCommand('showborders',p);r.canUndo=false;if(q.config.startupShowBorders!==false)r.setState(1);
+q.addCss(n);q.on('mode',function(){if(r.state!=0)r.refresh(q);},null,null,100);q.on('contentDom',function(){if(r.state!=0)r.refresh(q);});q.on('removeFormatCleanup',function(s){var t=s.data;if(q.getCommand('showborders').state==1&&t.is('table')&&(!t.hasAttribute('border')||parseInt(t.getAttribute('border'),10)<=0))t.addClass(m);});},afterInit:function(q){var r=q.dataProcessor,s=r&&r.dataFilter,t=r&&r.htmlFilter;if(s)s.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'],x=parseInt(v.border,10);if((!x||x<=0)&&(!w||w.indexOf(m)==-1))v['class']=(w||'')+' '+m;}}});if(t)t.addRules({elements:{table:function(u){var v=u.attributes,w=v['class'];w&&(v['class']=w.replace(m,'').replace(/\s{2}/,' ').replace(/^\s+|\s+$/,''));}}});}});a.on('dialogDefinition',function(q){var r=q.data.name;if(r=='table'||r=='tableProperties'){var s=q.data.definition,t=s.getContents('info'),u=t.get('txtBorder'),v=u.commit;u.commit=e.override(v,function(y){return function(z,A){y.apply(this,arguments);var B=parseInt(this.getValue(),10);A[!B||B<=0?'addClass':'removeClass'](m);};});var w=s.getContents('advanced'),x=w&&w.get('advCSSClasses');if(x){x.setup=e.override(x.setup,function(y){return function(){y.apply(this,arguments);this.setValue(this.getValue().replace(/cke_show_border/,''));};});x.commit=e.override(x.commit,function(y){return function(z,A){y.apply(this,arguments);if(!parseInt(A.getAttribute('border'),10))A.addClass('cke_show_border');};});}}});})();j.add('sourcearea',{requires:['editingblock'],init:function(m){var n=j.sourcearea,o=a.document.getWindow();m.on('editingBlockReady',function(){var p,q;m.addMode('source',{load:function(r,s){if(c&&b.version<8)r.setStyle('position','relative');m.textarea=p=new h('textarea');p.setAttributes({dir:'ltr',tabIndex:b.webkit?-1:m.tabIndex,role:'textbox','aria-label':m.lang.editorTitle.replace('%1',m.name)});p.addClass('cke_source');p.addClass('cke_enable_context_menu');m.readOnly&&p.setAttribute('readOnly','readonly');var t={width:b.ie7Compat?'99%':'100%',height:'100%',resize:'none',outline:'none','text-align':'left'};if(c){q=function(){p.hide();p.setStyle('height',r.$.clientHeight+'px');p.setStyle('width',r.$.clientWidth+'px');p.show();};m.on('resize',q);o.on('resize',q);setTimeout(q,0);}r.setHtml('');r.append(p);p.setStyles(t);m.fire('ariaWidget',p);p.on('blur',function(){m.focusManager.blur();});p.on('focus',function(){m.focusManager.focus();});m.mayBeDirty=true;this.loadData(s);var u=m.keystrokeHandler;if(u)u.attach(p);setTimeout(function(){m.mode='source';
+m.fire('mode',{previousMode:m._.previousMode});},b.gecko||b.webkit?100:0);},loadData:function(r){p.setValue(r);m.fire('dataReady');},getData:function(){return p.getValue();},getSnapshotData:function(){return p.getValue();},unload:function(r){p.clearCustomData();m.textarea=p=null;if(q){m.removeListener('resize',q);o.removeListener('resize',q);}if(c&&b.version<8)r.removeStyle('position');},focus:function(){p.focus();}});});m.on('readOnly',function(){if(m.mode=='source')if(m.readOnly)m.textarea.setAttribute('readOnly','readonly');else m.textarea.removeAttribute('readOnly');});m.addCommand('source',n.commands.source);if(m.ui.addButton)m.ui.addButton('Source',{label:m.lang.source,command:'source'});m.on('mode',function(){m.getCommand('source').setState(m.mode=='source'?1:2);});}});j.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:false,readOnly:1,exec:function(m){if(m.mode=='wysiwyg')m.fire('saveSnapshot');m.getCommand('source').setState(0);m.setMode(m.mode=='source'?'wysiwyg':'source');},canUndo:false}}};(function(){j.add('stylescombo',{requires:['richcombo','styles'],init:function(n){var o=n.config,p=n.lang.stylesCombo,q={},r=[],s;function t(u){n.getStylesSet(function(v){if(!r.length){var w,x;for(var y=0,z=v.length;y<z;y++){var A=v[y];x=A.name;w=q[x]=new a.style(A);w._name=x;w._.enterMode=o.enterMode;r.push(w);}r.sort(m);}u&&u();});};n.ui.addRichCombo('Styles',{label:p.label,title:p.panelTitle,className:'cke_styles',panel:{css:n.skin.editor.css.concat(o.contentsCss),multiSelect:true,attributes:{'aria-label':p.panelTitle}},init:function(){s=this;t(function(){var u,v,w,x,y,z;for(y=0,z=r.length;y<z;y++){u=r[y];v=u._name;x=u.type;if(x!=w){s.startGroup(p['panelTitle'+String(x)]);w=x;}s.add(v,u.type==3?v:u.buildPreview(),v);}s.commit();});},onClick:function(u){n.focus();n.fire('saveSnapshot');var v=q[u],w=n.getSelection(),x=new d.elementPath(w.getStartElement());v[v.checkActive(x)?'remove':'apply'](n.document);n.fire('saveSnapshot');},onRender:function(){n.on('selectionChange',function(u){var v=this.getValue(),w=u.data.path,x=w.elements;for(var y=0,z=x.length,A;y<z;y++){A=x[y];for(var B in q){if(q[B].checkElementRemovable(A,true)){if(B!=v)this.setValue(B);return;}}}this.setValue('');},this);},onOpen:function(){var B=this;if(c||b.webkit)n.focus();var u=n.getSelection(),v=u.getSelectedElement(),w=new d.elementPath(v||u.getStartElement()),x=[0,0,0,0];B.showAll();B.unmarkAll();for(var y in q){var z=q[y],A=z.type;if(z.checkActive(w))B.mark(y);else if(A==3&&!z.checkApplicable(w)){B.hideItem(y);
+x[A]--;}x[A]++;}if(!x[1])B.hideGroup(p['panelTitle'+String(1)]);if(!x[2])B.hideGroup(p['panelTitle'+String(2)]);if(!x[3])B.hideGroup(p['panelTitle'+String(3)]);},reset:function(){if(s){delete s._.panel;delete s._.list;s._.committed=0;s._.items={};s._.state=2;}q={};r=[];t();}});n.on('instanceReady',function(){t();});}});function m(n,o){var p=n.type,q=o.type;return p==q?0:p==3?-1:q==3?1:q==1?1:-1;};})();j.add('specialchar',{availableLangs:{en:1},init:function(m){var n='specialchar',o=this;a.dialog.add(n,this.path+'dialogs/specialchar.js');m.addCommand(n,{exec:function(){var p=m.langCode;p=o.availableLangs[p]?p:'en';a.scriptLoader.load(a.getUrl(o.path+'lang/'+p+'.js'),function(){e.extend(m.lang.specialChar,o.langEntries[p]);m.openDialog(n);});},modes:{wysiwyg:1},canUndo:false});m.ui.addButton('SpecialChar',{label:m.lang.specialChar.toolbar,command:n});}});i.specialChars=['!','&quot;','#','$','%','&amp;',"'",'(',')','*','+','-','.','/','0','1','2','3','4','5','6','7','8','9',':',';','&lt;','=','&gt;','?','@','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','[',']','^','_','`','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','{','|','}','~','&euro;','&lsquo;','&rsquo;','&ldquo;','&rdquo;','&ndash;','&mdash;','&iexcl;','&cent;','&pound;','&curren;','&yen;','&brvbar;','&sect;','&uml;','&copy;','&ordf;','&laquo;','&not;','&reg;','&macr;','&deg;','&sup2;','&sup3;','&acute;','&micro;','&para;','&middot;','&cedil;','&sup1;','&ordm;','&raquo;','&frac14;','&frac12;','&frac34;','&iquest;','&Agrave;','&Aacute;','&Acirc;','&Atilde;','&Auml;','&Aring;','&AElig;','&Ccedil;','&Egrave;','&Eacute;','&Ecirc;','&Euml;','&Igrave;','&Iacute;','&Icirc;','&Iuml;','&ETH;','&Ntilde;','&Ograve;','&Oacute;','&Ocirc;','&Otilde;','&Ouml;','&times;','&Oslash;','&Ugrave;','&Uacute;','&Ucirc;','&Uuml;','&Yacute;','&THORN;','&szlig;','&agrave;','&aacute;','&acirc;','&atilde;','&auml;','&aring;','&aelig;','&ccedil;','&egrave;','&eacute;','&ecirc;','&euml;','&igrave;','&iacute;','&icirc;','&iuml;','&eth;','&ntilde;','&ograve;','&oacute;','&ocirc;','&otilde;','&ouml;','&divide;','&oslash;','&ugrave;','&uacute;','&ucirc;','&uuml;','&yacute;','&thorn;','&yuml;','&OElig;','&oelig;','&#372;','&#374','&#373','&#375;','&sbquo;','&#8219;','&bdquo;','&hellip;','&trade;','&#9658;','&bull;','&rarr;','&rArr;','&hArr;','&diams;','&asymp;'];(function(){var m={editorFocus:false,modes:{wysiwyg:1,source:1}},n={exec:function(q){q.container.focusNext(true,q.tabIndex);
+}},o={exec:function(q){q.container.focusPrevious(true,q.tabIndex);}};function p(q){return{editorFocus:false,canUndo:false,modes:{wysiwyg:1},exec:function(r){if(r.focusManager.hasFocus){var s=r.getSelection(),t=s.getCommonAncestor(),u;if(u=t.getAscendant('td',true)||t.getAscendant('th',true)){var v=new d.range(r.document),w=e.tryThese(function(){var D=u.getParent(),E=D.$.cells[u.$.cellIndex+(q?-1:1)];E.parentNode.parentNode;return E;},function(){var D=u.getParent(),E=D.getAscendant('table'),F=E.$.rows[D.$.rowIndex+(q?-1:1)];return F.cells[q?F.cells.length-1:0];});if(!(w||q)){var x=u.getAscendant('table').$,y=u.getParent().$.cells,z=new h(x.insertRow(-1),r.document);for(var A=0,B=y.length;A<B;A++){var C=z.append(new h(y[A],r.document).clone(false,false));!c&&C.appendBogus();}v.moveToElementEditStart(z);}else if(w){w=new h(w);v.moveToElementEditStart(w);if(!(v.checkStartOfBlock()&&v.checkEndOfBlock()))v.selectNodeContents(w);}else return true;v.select(true);return true;}}return false;}};};j.add('tab',{requires:['keystrokes'],init:function(q){var r=q.config.enableTabKeyTools!==false,s=q.config.tabSpaces||0,t='';while(s--)t+='\xa0';if(t)q.on('key',function(u){if(u.data.keyCode==9){q.insertHtml(t);u.cancel();}});if(r)q.on('key',function(u){if(u.data.keyCode==9&&q.execCommand('selectNextCell')||u.data.keyCode==2000+9&&q.execCommand('selectPreviousCell'))u.cancel();});if(b.webkit||b.gecko)q.on('key',function(u){var v=u.data.keyCode;if(v==9&&!t){u.cancel();q.execCommand('blur');}if(v==2000+9){q.execCommand('blurBack');u.cancel();}});q.addCommand('blur',e.extend(n,m));q.addCommand('blurBack',e.extend(o,m));q.addCommand('selectNextCell',p());q.addCommand('selectPreviousCell',p(true));}});})();h.prototype.focusNext=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t,u,v;if(p<=0){u=w.getNextSourceNode(m,1);while(u){if(u.isVisible()&&u.getTabIndex()===0){s=u;break;}u=u.getNextSourceNode(false,1);}}else{u=w.getDocument().getBody().getFirst();while(u=u.getNextSourceNode(false,1)){if(!q)if(!r&&u.equals(w)){r=true;if(m){if(!(u=u.getNextSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(u))q=1;if(!u.isVisible()||(v=u.getTabIndex())<0)continue;if(q&&v==p){s=u;break;}if(v>p&&(!s||!t||v<t)){s=u;t=v;}else if(!s&&v===0){s=u;t=v;}}}if(s)s.focus();};h.prototype.focusPrevious=function(m,n){var w=this;var o=w.$,p=n===undefined?w.getTabIndex():n,q,r,s,t=0,u,v=w.getDocument().getBody().getLast();while(v=v.getPreviousSourceNode(false,1)){if(!q)if(!r&&v.equals(w)){r=true;
+if(m){if(!(v=v.getPreviousSourceNode(true,1)))break;q=1;}}else if(r&&!w.contains(v))q=1;if(!v.isVisible()||(u=v.getTabIndex())<0)continue;if(p<=0){if(q&&u===0){s=v;break;}if(u>t){s=v;t=u;}}else{if(q&&u==p){s=v;break;}if(u<p&&(!s||u>t)){s=v;t=u;}}}if(s)s.focus();};(function(){j.add('templates',{requires:['dialog'],init:function(o){a.dialog.add('templates',a.getUrl(this.path+'dialogs/templates.js'));o.addCommand('templates',new a.dialogCommand('templates'));o.ui.addButton('Templates',{label:o.lang.templates.button,command:'templates'});}});var m={},n={};a.addTemplates=function(o,p){m[o]=p;};a.getTemplates=function(o){return m[o];};a.loadTemplates=function(o,p){var q=[];for(var r=0,s=o.length;r<s;r++){if(!n[o[r]]){q.push(o[r]);n[o[r]]=1;}}if(q.length)a.scriptLoader.load(q,p);else setTimeout(p,0);};})();i.templates_files=[a.getUrl('plugins/templates/templates/default.js')];i.templates_replaceContent=true;(function(){var m=function(){this.toolbars=[];this.focusCommandExecuted=false;};m.prototype.focus=function(){for(var o=0,p;p=this.toolbars[o++];)for(var q=0,r;r=p.items[q++];){if(r.focus){r.focus();return;}}};var n={toolbarFocus:{modes:{wysiwyg:1,source:1},readOnly:1,exec:function(o){if(o.toolbox){o.toolbox.focusCommandExecuted=true;if(c||b.air)setTimeout(function(){o.toolbox.focus();},100);else o.toolbox.focus();}}}};j.add('toolbar',{init:function(o){var p,q=function(r,s){var t,u,v=o.lang.dir=='rtl',w=o.config.toolbarGroupCycling;w=w===undefined||w;switch(s){case 9:case 2000+9:while(!u||!u.items.length){u=s==9?(u?u.next:r.toolbar.next)||o.toolbox.toolbars[0]:(u?u.previous:r.toolbar.previous)||o.toolbox.toolbars[o.toolbox.toolbars.length-1];if(u.items.length){r=u.items[p?u.items.length-1:0];while(r&&!r.focus){r=p?r.previous:r.next;if(!r)u=0;}}}if(r)r.focus();return false;case v?37:39:case 40:t=r;do{t=t.next;if(!t&&w)t=r.toolbar.items[0];}while(t&&!t.focus)if(t)t.focus();else q(r,9);return false;case v?39:37:case 38:t=r;do{t=t.previous;if(!t&&w)t=r.toolbar.items[r.toolbar.items.length-1];}while(t&&!t.focus)if(t)t.focus();else{p=1;q(r,2000+9);p=0;}return false;case 27:o.focus();return false;case 13:case 32:r.execute();return false;}return true;};o.on('themeSpace',function(r){if(r.data.space==o.config.toolbarLocation){o.toolbox=new m();var s=e.getNextId(),t=['<div class="cke_toolbox" role="group" aria-labelledby="',s,'" onmousedown="return false;"'],u=o.config.toolbarStartupExpanded!==false,v;t.push(u?'>':' style="display:none">');t.push('<span id="',s,'" class="cke_voice_label">',o.lang.toolbars,'</span>');
+var w=o.toolbox.toolbars,x=o.config.toolbar instanceof Array?o.config.toolbar:o.config['toolbar_'+o.config.toolbar];for(var y=0;y<x.length;y++){var z,A=0,B,C=x[y],D;if(!C)continue;if(v){t.push('</div>');v=0;}if(C==='/'){t.push('<div class="cke_break"></div>');continue;}D=C.items||C;for(var E=0;E<D.length;E++){var F,G=D[E],H;F=o.ui.create(G);if(F){H=F.canGroup!==false;if(!A){z=e.getNextId();A={id:z,items:[]};B=C.name&&(o.lang.toolbarGroups[C.name]||C.name);t.push('<span id="',z,'" class="cke_toolbar"',B?' aria-labelledby="'+z+'_label"':'',' role="toolbar">');B&&t.push('<span id="',z,'_label" class="cke_voice_label">',B,'</span>');t.push('<span class="cke_toolbar_start"></span>');var I=w.push(A)-1;if(I>0){A.previous=w[I-1];A.previous.next=A;}}if(H){if(!v){t.push('<span class="cke_toolgroup" role="presentation">');v=1;}}else if(v){t.push('</span>');v=0;}var J=F.render(o,t);I=A.items.push(J)-1;if(I>0){J.previous=A.items[I-1];J.previous.next=J;}J.toolbar=A;J.onkey=q;J.onfocus=function(){if(!o.toolbox.focusCommandExecuted)o.focus();};}}if(v){t.push('</span>');v=0;}if(A)t.push('<span class="cke_toolbar_end"></span></span>');}t.push('</div>');if(o.config.toolbarCanCollapse){var K=e.addFunction(function(){o.execCommand('toolbarCollapse');});o.on('destroy',function(){e.removeFunction(K);});var L=e.getNextId();o.addCommand('toolbarCollapse',{readOnly:1,exec:function(M){var N=a.document.getById(L),O=N.getPrevious(),P=M.getThemeSpace('contents'),Q=O.getParent(),R=parseInt(P.$.style.height,10),S=Q.$.offsetHeight,T=!O.isVisible();if(!T){O.hide();N.addClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarExpand);}else{O.show();N.removeClass('cke_toolbox_collapser_min');N.setAttribute('title',M.lang.toolbarCollapse);}N.getFirst().setText(T?'â–²':'â—€');var U=Q.$.offsetHeight-S;P.setStyle('height',R-U+'px');M.fire('resize');},modes:{wysiwyg:1,source:1}});t.push('<a title="'+(u?o.lang.toolbarCollapse:o.lang.toolbarExpand)+'" id="'+L+'" tabIndex="-1" class="cke_toolbox_collapser');if(!u)t.push(' cke_toolbox_collapser_min');t.push('" onclick="CKEDITOR.tools.callFunction('+K+')">','<span>&#9650;</span>','</a>');}r.data.html+=t.join('');}});o.on('destroy',function(){var r,s=0,t,u,v;r=this.toolbox.toolbars;for(;s<r.length;s++){u=r[s].items;for(t=0;t<u.length;t++){v=u[t];if(v.clickFn)e.removeFunction(v.clickFn);if(v.keyDownFn)e.removeFunction(v.keyDownFn);}}});o.addCommand('toolbarFocus',n.toolbarFocus);o.ui.add('-',a.UI_SEPARATOR,{});o.ui.addHandler(a.UI_SEPARATOR,{create:function(){return{render:function(r,s){s.push('<span class="cke_separator" role="separator"></span>');
+return{};}};}});}});})();a.UI_SEPARATOR='separator';i.toolbarLocation='top';i.toolbar_Basic=[['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink','-','About']];i.toolbar_Full=[{name:'document',items:['Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates']},{name:'clipboard',items:['Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo']},{name:'editing',items:['Find','Replace','-','SelectAll','-','SpellChecker','Scayt']},{name:'forms',items:['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField']},'/',{name:'basicstyles',items:['Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat']},{name:'paragraph',items:['NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl']},{name:'links',items:['Link','Unlink','Anchor']},{name:'insert',items:['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe']},'/',{name:'styles',items:['Styles','Format','Font','FontSize']},{name:'colors',items:['TextColor','BGColor']},{name:'tools',items:['Maximize','ShowBlocks','-','About']}];i.toolbar='Full';i.toolbarCanCollapse=true;(function(){j.add('undo',{requires:['selection','wysiwygarea'],init:function(s){var t=new o(s),u=s.addCommand('undo',{exec:function(){if(t.undo()){s.selectionChange();this.fire('afterUndo');}},state:0,canUndo:false}),v=s.addCommand('redo',{exec:function(){if(t.redo()){s.selectionChange();this.fire('afterRedo');}},state:0,canUndo:false});t.onChange=function(){u.setState(t.undoable()?2:0);v.setState(t.redoable()?2:0);};function w(x){if(t.enabled&&x.data.command.canUndo!==false)t.save();};s.on('beforeCommandExec',w);s.on('afterCommandExec',w);s.on('saveSnapshot',function(x){t.save(x.data&&x.data.contentOnly);});s.on('contentDom',function(){s.document.on('keydown',function(x){if(!x.data.$.ctrlKey&&!x.data.$.metaKey)t.type(x);});});s.on('beforeModeUnload',function(){s.mode=='wysiwyg'&&t.save(true);});s.on('mode',function(){t.enabled=s.readOnly?false:s.mode=='wysiwyg';t.onChange();});s.ui.addButton('Undo',{label:s.lang.undo,command:'undo'});s.ui.addButton('Redo',{label:s.lang.redo,command:'redo'});s.resetUndo=function(){t.reset();s.fire('saveSnapshot');};s.on('updateSnapshot',function(){if(t.currentImage)t.update();});}});j.undo={};var m=j.undo.Image=function(s){this.editor=s;s.fire('beforeUndoImage');var t=s.getSnapshot(),u=t&&s.getSelection();
+c&&t&&(t=t.replace(/\s+data-cke-expando=".*?"/g,''));this.contents=t;this.bookmarks=u&&u.createBookmarks2(true);s.fire('afterUndoImage');},n=/\b(?:href|src|name)="[^"]*?"/gi;m.prototype={equals:function(s,t){var u=this.contents,v=s.contents;if(c&&(b.ie7Compat||b.ie6Compat)){u=u.replace(n,'');v=v.replace(n,'');}if(u!=v)return false;if(t)return true;var w=this.bookmarks,x=s.bookmarks;if(w||x){if(!w||!x||w.length!=x.length)return false;for(var y=0;y<w.length;y++){var z=w[y],A=x[y];if(z.startOffset!=A.startOffset||z.endOffset!=A.endOffset||!e.arrayCompare(z.start,A.start)||!e.arrayCompare(z.end,A.end))return false;}}return true;}};function o(s){this.editor=s;this.reset();};var p={8:1,46:1},q={16:1,17:1,18:1},r={37:1,38:1,39:1,40:1};o.prototype={type:function(s){var t=s&&s.data.getKey(),u=t in q,v=t in p,w=this.lastKeystroke in p,x=v&&t==this.lastKeystroke,y=t in r,z=this.lastKeystroke in r,A=!v&&!y,B=v&&!x,C=!(u||this.typing)||A&&(w||z);if(C||B){var D=new m(this.editor);e.setTimeout(function(){var F=this;var E=F.editor.getSnapshot();if(c)E=E.replace(/\s+data-cke-expando=".*?"/g,'');if(D.contents!=E){F.typing=true;if(!F.save(false,D,false))F.snapshots.splice(F.index+1,F.snapshots.length-F.index-1);F.hasUndo=true;F.hasRedo=false;F.typesCount=1;F.modifiersCount=1;F.onChange();}},0,this);}this.lastKeystroke=t;if(v){this.typesCount=0;this.modifiersCount++;if(this.modifiersCount>25){this.save(false,null,false);this.modifiersCount=1;}}else if(!y){this.modifiersCount=0;this.typesCount++;if(this.typesCount>25){this.save(false,null,false);this.typesCount=1;}}},reset:function(){var s=this;s.lastKeystroke=0;s.snapshots=[];s.index=-1;s.limit=s.editor.config.undoStackSize||20;s.currentImage=null;s.hasUndo=false;s.hasRedo=false;s.resetType();},resetType:function(){var s=this;s.typing=false;delete s.lastKeystroke;s.typesCount=0;s.modifiersCount=0;},fireChange:function(){var s=this;s.hasUndo=!!s.getNextImage(true);s.hasRedo=!!s.getNextImage(false);s.resetType();s.onChange();},save:function(s,t,u){var w=this;var v=w.snapshots;if(!t)t=new m(w.editor);if(t.contents===false)return false;if(w.currentImage&&t.equals(w.currentImage,s))return false;v.splice(w.index+1,v.length-w.index-1);if(v.length==w.limit)v.shift();w.index=v.push(t)-1;w.currentImage=t;if(u!==false)w.fireChange();return true;},restoreImage:function(s){var u=this;u.editor.loadSnapshot(s.contents);if(s.bookmarks)u.editor.getSelection().selectBookmarks(s.bookmarks);else if(c){var t=u.editor.document.getBody().$.createTextRange();
+t.collapse(true);t.select();}u.index=s.index;u.update();u.fireChange();},getNextImage:function(s){var x=this;var t=x.snapshots,u=x.currentImage,v,w;if(u)if(s)for(w=x.index-1;w>=0;w--){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}else for(w=x.index+1;w<t.length;w++){v=t[w];if(!u.equals(v,true)){v.index=w;return v;}}return null;},redoable:function(){return this.enabled&&this.hasRedo;},undoable:function(){return this.enabled&&this.hasUndo;},undo:function(){var t=this;if(t.undoable()){t.save(true);var s=t.getNextImage(true);if(s)return t.restoreImage(s),true;}return false;},redo:function(){var t=this;if(t.redoable()){t.save(true);if(t.redoable()){var s=t.getNextImage(false);if(s)return t.restoreImage(s),true;}}return false;},update:function(){var s=this;s.snapshots.splice(s.index,1,s.currentImage=new m(s.editor));}};})();(function(){var m=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=d.walker.whitespaces(true);function o(C){return C.isBlockBoundary()&&f.$empty[C.getName()];};function p(C){return function(D){if(this.mode=='wysiwyg'){this.focus();this.fire('saveSnapshot');C.call(this,D.data);e.setTimeout(function(){this.fire('saveSnapshot');},0,this);}};};function q(C){var M=this;if(M.dataProcessor)C=M.dataProcessor.toHtml(C);if(!C)return;var D=M.getSelection(),E=D.getRanges()[0];if(E.checkReadOnly())return;if(b.opera){var F=new d.elementPath(E.startContainer);if(F.block){var G=a.htmlParser.fragment.fromHtml(C,false).children;for(var H=0,I=G.length;H<I;H++){if(G[H]._.isBlockLike){E.splitBlock(M.enterMode==3?'div':'p');E.insertNode(E.document.createText(''));E.select();break;}}}}if(c){var J=D.isLocked;if(J)D.unlock();var K=D.getNative();if(K.type=='Control')K.clear();else if(D.getType()==2){E=D.getRanges()[0];var L=E&&E.endContainer;if(L&&L.type==1&&L.getAttribute('contenteditable')=='false'&&E.checkBoundaryOfElement(L,2)){E.setEndAfter(E.endContainer);E.deleteContents();}}K.createRange().pasteHTML(C);if(J)M.getSelection().lock();}else M.document.$.execCommand('inserthtml',false,C);if(b.webkit){D=M.getSelection();D.scrollIntoView();}};function r(C){var D=this.getSelection(),E=D.getStartElement().hasAscendant('pre',true)?2:this.config.enterMode,F=E==2,G=e.htmlEncode(C.replace(/\r\n|\r/g,'\n'));G=G.replace(/^[ \t]+|[ \t]+$/g,function(M,N,O){if(M.length==1)return '&nbsp;';else if(!N)return e.repeat('&nbsp;',M.length-1)+' ';else return ' '+e.repeat('&nbsp;',M.length-1);});G=G.replace(/[ \t]{2,}/g,function(M){return e.repeat('&nbsp;',M.length-1)+' ';
+});var H=E==1?'p':'div';if(!F)G=G.replace(/(\n{2})([\s\S]*?)(?:$|\1)/g,function(M,N,O){return '<'+H+'>'+O+'</'+H+'>';});G=G.replace(/\n/g,'<br>');if(!(F||c))G=G.replace(new RegExp('<br>(?=</'+H+'>)'),function(M){return e.repeat(M,2);});if(b.gecko||b.webkit){var I=new d.elementPath(D.getStartElement()),J=[];for(var K=0;K<I.elements.length;K++){var L=I.elements[K].getName();if(L in f.$inline)J.unshift(I.elements[K].getOuterHtml().match(/^<.*?>/));else if(L in f.$block)break;}G=J.join('')+G;}q.call(this,G);};function s(C){var D=this.getSelection(),E=D.getRanges(),F=C.getName(),G=f.$block[F],H=D.isLocked;if(H)D.unlock();var I,J,K,L;for(var M=E.length-1;M>=0;M--){I=E[M];if(!I.checkReadOnly()){I.deleteContents(1);J=!M&&C||C.clone(1);var N,O;if(G)while((N=I.getCommonAncestor(0,1))&&(O=f[N.getName()])&&!(O&&O[F])){if(N.getName() in f.span)I.splitElement(N);else if(I.checkStartOfBlock()&&I.checkEndOfBlock()){I.setStartBefore(N);I.collapse(true);N.remove();}else I.splitBlock();}I.insertNode(J);if(!K)K=J;}}if(K){I.moveToPosition(K,4);if(G){var P=K.getNext(n),Q=P&&P.type==1&&P.getName();if(Q&&f.$block[Q]&&f[Q]['#'])I.moveToElementEditStart(P);}}D.selectRanges([I]);if(H)this.getSelection().lock();};function t(C){if(!C.checkDirty())setTimeout(function(){C.resetDirty();},0);};var u=d.walker.whitespaces(true),v=d.walker.bookmark(false,true);function w(C){return u(C)&&v(C);};function x(C){return C.type==3&&e.trim(C.getText()).match(/^(?:&nbsp;|\xa0)$/);};function y(C){if(C.isLocked){C.unlock();setTimeout(function(){C.lock();},0);}};function z(C){return C.getOuterHtml().match(m);};u=d.walker.whitespaces(true);function A(C){var D=C.window,E=C.document,F=C.document.getBody(),G=F.getFirst(),H=F.getChildren().count();if(!H||H==1&&G.type==1&&G.hasAttribute('_moz_editor_bogus_node')){t(C);var I=C.element.getDocument(),J=I.getDocumentElement(),K=J.$.scrollTop,L=J.$.scrollLeft,M=E.$.createEvent('KeyEvents');M.initKeyEvent('keypress',true,true,D.$,false,false,false,false,0,32);E.$.dispatchEvent(M);if(K!=J.$.scrollTop||L!=J.$.scrollLeft)I.getWindow().$.scrollTo(L,K);H&&F.getFirst().remove();E.getBody().appendBogus();var N=new d.range(E);N.setStartAt(F,1);N.select();}};function B(C){var D=C.editor,E=C.data.path,F=E.blockLimit,G=C.data.selection,H=G.getRanges()[0],I=D.document.getBody(),J=D.config.enterMode;if(b.gecko){A(D);var K=E.block||E.blockLimit,L=K&&K.getLast(w);if(K&&K.isBlockBoundary()&&!(L&&L.type==1&&L.isBlockBoundary())&&!K.is('pre')&&!K.getBogus())K.appendBogus();}if(D.config.autoParagraph!==false&&J!=2&&H.collapsed&&F.getName()=='body'&&!E.block){var M=H.fixBlock(true,D.config.enterMode==3?'div':'p');
+if(c){var N=M.getFirst(w);N&&x(N)&&N.remove();}if(z(M)){var O=M.getNext(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditStart(O);M.remove();}else{O=M.getPrevious(u);if(O&&O.type==1&&!o(O)){H.moveToElementEditEnd(O);M.remove();}}}H.select();C.cancel();}var P=new d.range(D.document);P.moveToElementEditEnd(D.document.getBody());var Q=new d.elementPath(P.startContainer);if(!Q.blockLimit.is('body')){var R;if(J!=2)R=I.append(D.document.createElement(J==1?'p':'div'));else R=I;if(!c)R.appendBogus();}};j.add('wysiwygarea',{requires:['editingblock'],init:function(C){var D=C.config.enterMode!=2&&C.config.autoParagraph!==false?C.config.enterMode==3?'div':'p':false,E=C.lang.editorTitle.replace('%1',C.name),F;C.on('editingBlockReady',function(){var L,M,N,O,P,Q,R=b.isCustomDomain(),S=function(V){if(M)M.remove();var W='document.open();'+(R?'document.domain="'+document.domain+'";':'')+'document.close();';W=b.air?'javascript:void(0)':c?'javascript:void(function(){'+encodeURIComponent(W)+'}())':'';M=h.createFromHtml('<iframe style="width:100%;height:100%" frameBorder="0" title="'+E+'"'+' src="'+W+'"'+' tabIndex="'+(b.webkit?-1:C.tabIndex)+'"'+' allowTransparency="true"'+'></iframe>');if(document.location.protocol=='chrome:')a.event.useCapture=true;M.on('load',function(X){P=1;X.removeListener();var Y=M.getFrameDocument();Y.write(V);b.air&&U(Y.getWindow().$);});if(document.location.protocol=='chrome:')a.event.useCapture=false;L.append(M);};F=e.addFunction(U);var T='<script id="cke_actscrpt" type="text/javascript" data-cke-temp="1">'+(R?'document.domain="'+document.domain+'";':'')+'window.parent.CKEDITOR.tools.callFunction( '+F+', window );'+'</script>';function U(V){if(!P)return;P=0;C.fire('ariaWidget',M);var W=V.document,X=W.body,Y=W.getElementById('cke_actscrpt');Y&&Y.parentNode.removeChild(Y);X.spellcheck=!C.config.disableNativeSpellChecker;var Z=!C.readOnly;if(c){X.hideFocus=true;X.disabled=true;X.contentEditable=Z;X.removeAttribute('disabled');}else setTimeout(function(){if(b.gecko&&b.version>=10900||b.opera)W.$.body.contentEditable=Z;else if(b.webkit)W.$.body.parentNode.contentEditable=Z;else W.$.designMode=Z?'off':'on';},0);Z&&b.gecko&&e.setTimeout(A,0,null,C);V=C.window=new d.window(V);W=C.document=new g(W);Z&&W.on('dblclick',function(af){var ag=af.data.getTarget(),ah={element:ag,dialog:''};C.fire('doubleclick',ah);ah.dialog&&C.openDialog(ah.dialog);});c&&W.on('click',function(af){var ag=af.data.getTarget();if(ag.is('input')){var ah=ag.getAttribute('type');if(ah=='submit'||ah=='reset')af.data.preventDefault();
+}});if(!(c||b.opera))W.on('mousedown',function(af){var ag=af.data.getTarget();if(ag.is('img','hr','input','textarea','select'))C.getSelection().selectElement(ag);});if(b.gecko)W.on('mouseup',function(af){if(af.data.$.button==2){var ag=af.data.getTarget();if(!ag.getOuterHtml().replace(m,'')){var ah=new d.range(W);ah.moveToElementEditStart(ag);ah.select(true);}}});W.on('click',function(af){af=af.data;if(af.getTarget().is('a')&&af.$.button!=2)af.preventDefault();});if(b.webkit){W.on('mousedown',function(){ac=1;});W.on('click',function(af){if(af.data.getTarget().is('input','select'))af.data.preventDefault();});W.on('mouseup',function(af){if(af.data.getTarget().is('input','textarea'))af.data.preventDefault();});}if(Z&&c&&W.$.compatMode=='CSS1Compat'||b.gecko||b.opera){var aa=W.getDocumentElement();aa.on('mousedown',function(af){if(af.data.getTarget().equals(aa)){if(b.gecko&&b.version>=10900)J();K.focus();}});}var ab=c?M:V;ab.on('blur',function(){C.focusManager.blur();});var ac;ab.on('focus',function(){var af=C.document;if(Z&&b.gecko&&b.version>=10900)J();else if(b.opera)af.getBody().focus();else if(b.webkit)if(!ac){C.document.getDocumentElement().focus();ac=1;}C.focusManager.focus();});var ad=C.keystrokeHandler;ad.blockedKeystrokes[8]=!Z;ad.attach(W);W.getDocumentElement().addClass(W.$.compatMode);Z&&W.on('keydown',function(af){var ag=af.data.getKeystroke();if(ag in {8:1,46:1}){var ah=C.getSelection(),ai=ah.getSelectedElement(),aj=ah.getRanges()[0];if(ai){C.fire('saveSnapshot');aj.moveToPosition(ai,3);ai.remove();aj.select();C.fire('saveSnapshot');af.data.preventDefault();return;}}});if(c&&W.$.compatMode=='CSS1Compat'){var ae={33:1,34:1};W.on('keydown',function(af){if(af.data.getKeystroke() in ae)setTimeout(function(){C.getSelection().scrollIntoView();},0);});}if(c&&C.config.enterMode!=1)W.on('selectionchange',function(){var af=W.getBody(),ag=C.getSelection().getRanges()[0];if(af.getHtml().match(/^<p>&nbsp;<\/p>$/i)&&ag.startContainer.equals(af))setTimeout(function(){ag=C.getSelection().getRanges()[0];if(!ag.startContainer.equals('body')){af.getFirst().remove(1);ag.moveToElementEditEnd(af);ag.select(1);}},0);});if(C.contextMenu)C.contextMenu.addTarget(W,C.config.browserContextMenuOnCtrl!==false);setTimeout(function(){C.fire('contentDom');if(Q){C.mode='wysiwyg';C.fire('mode',{previousMode:C._.previousMode});Q=false;}N=false;if(O){C.focus();O=false;}setTimeout(function(){C.fire('dataReady');},0);try{C.document.$.execCommand('enableInlineTableEditing',false,!C.config.disableNativeTableHandles);
+}catch(af){}if(C.config.disableObjectResizing)try{C.document.$.execCommand('enableObjectResizing',false,false);}catch(ag){C.document.getBody().on(c?'resizestart':'resize',function(ah){ah.data.preventDefault();});}if(c)setTimeout(function(){if(C.document){var ah=C.document.$.body;ah.runtimeStyle.marginBottom='0px';ah.runtimeStyle.marginBottom='';}},1000);},0);};C.addMode('wysiwyg',{load:function(V,W,X){L=V;if(c&&b.quirks)V.setStyle('position','relative');C.mayBeDirty=true;Q=true;if(X)this.loadSnapshotData(W);else this.loadData(W);},loadData:function(V){N=true;C._.dataStore={id:1};var W=C.config,X=W.fullPage,Y=W.docType,Z='<style type="text/css" data-cke-temp="1">'+C._.styles.join('\n')+'</style>';!X&&(Z=e.buildStyleHtml(C.config.contentsCss)+Z);var aa=W.baseHref?'<base href="'+W.baseHref+'" data-cke-temp="1" />':'';if(X)V=V.replace(/<!DOCTYPE[^>]*>/i,function(ab){C.docType=Y=ab;return '';}).replace(/<\?xml\s[^\?]*\?>/i,function(ab){C.xmlDeclaration=ab;return '';});if(C.dataProcessor)V=C.dataProcessor.toHtml(V,D);if(X){if(!/<body[\s|>]/.test(V))V='<body>'+V;if(!/<html[\s|>]/.test(V))V='<html>'+V+'</html>';if(!/<head[\s|>]/.test(V))V=V.replace(/<html[^>]*>/,'$&<head><title></title></head>');else if(!/<title[\s|>]/.test(V))V=V.replace(/<head[^>]*>/,'$&<title></title>');aa&&(V=V.replace(/<head>/,'$&'+aa));V=V.replace(/<\/head\s*>/,Z+'$&');V=Y+V;}else V=W.docType+'<html dir="'+W.contentsLangDirection+'"'+' lang="'+(W.contentsLanguage||C.langCode)+'">'+'<head>'+'<title>'+E+'</title>'+aa+Z+'</head>'+'<body'+(W.bodyId?' id="'+W.bodyId+'"':'')+(W.bodyClass?' class="'+W.bodyClass+'"':'')+'>'+V+'</html>';if(b.gecko)V=V.replace(/<br \/>(?=\s*<\/(:?html|body)>)/,'$&<br type="_moz" />');V+=T;this.onDispose();S(V);},getData:function(){var V=C.config,W=V.fullPage,X=W&&C.docType,Y=W&&C.xmlDeclaration,Z=M.getFrameDocument(),aa=W?Z.getDocumentElement().getOuterHtml():Z.getBody().getHtml();if(b.gecko)aa=aa.replace(/<br>(?=\s*(:?$|<\/body>))/,'');if(C.dataProcessor)aa=C.dataProcessor.toDataFormat(aa,D);if(V.ignoreEmptyParagraph)aa=aa.replace(m,function(ab,ac){return ac;});if(Y)aa=Y+'\n'+aa;if(X)aa=X+'\n'+aa;return aa;},getSnapshotData:function(){return M.getFrameDocument().getBody().getHtml();},loadSnapshotData:function(V){M.getFrameDocument().getBody().setHtml(V);},onDispose:function(){if(!C.document)return;C.document.getDocumentElement().clearCustomData();C.document.getBody().clearCustomData();C.window.clearCustomData();C.document.clearCustomData();M.clearCustomData();M.remove();
+},unload:function(V){this.onDispose();C.window=C.document=M=L=O=null;C.fire('contentDomUnload');},focus:function(){var V=C.window;if(N)O=true;else if(V){b.air?setTimeout(function(){V.focus();},0):V.focus();C.selectionChange();}}});C.on('insertHtml',p(q),null,null,20);C.on('insertElement',p(s),null,null,20);C.on('insertText',p(r),null,null,20);C.on('selectionChange',function(V){if(C.readOnly)return;var W=C.getSelection();if(W&&!W.isLocked){var X=C.checkDirty();C.fire('saveSnapshot',{contentOnly:1});B.call(this,V);C.fire('updateSnapshot');!X&&C.resetDirty();}},null,null,1);});var G;C.on('contentDom',function(){var L=C.document.getElementsByTag('title').getItem(0);L.data('cke-title',C.document.$.title);C.document.$.title=E;});C.on('readOnly',function(){if(C.mode=='wysiwyg'){var L=C.getMode();L.loadData(L.getData());}});if(a.document.$.documentMode>=8){C.addCss('html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}');var H=[];for(var I in f.$removeEmpty)H.push('html.CSS1Compat '+I+'[contenteditable=false]');C.addCss(H.join(',')+'{ display:inline-block;}');}else if(b.gecko){C.addCss('html { height: 100% !important; }');C.addCss('img:-moz-broken { -moz-force-broken-image-icon : 1;\twidth : 24px; height : 24px; }');}C.addCss('html {\t_overflow-y: scroll; cursor: text;\t*cursor:auto;}');C.addCss('img, input, textarea { cursor: default;}');function J(L){if(C.readOnly)return;e.tryThese(function(){C.document.$.designMode='on';setTimeout(function(){C.document.$.designMode='off';if(a.currentInstance==C)C.document.getBody().focus();},50);},function(){C.document.$.designMode='off';var M=C.document.getBody();M.setAttribute('contentEditable',false);M.setAttribute('contentEditable',true);!L&&J(1);});};if(b.gecko||c||b.opera){var K;C.on('uiReady',function(){K=C.container.append(h.createFromHtml('<span tabindex="-1" style="position:absolute;" role="presentation"></span>'));K.on('focus',function(){C.focus();});C.focusGrabber=K;});C.on('destroy',function(){e.removeFunction(F);K.clearCustomData();delete C.focusGrabber;});}C.on('insertElement',function(L){var M=L.data;if(M.type==1&&(M.is('input')||M.is('textarea'))){var N=M.getAttribute('contenteditable')=='false';if(!N){M.data('cke-editable',M.hasAttribute('contenteditable')?'true':'1');M.setAttribute('contenteditable',false);}}});}});if(b.gecko)(function(){var C=document.body;if(!C)window.addEventListener('load',arguments.callee,false);else{var D=C.getAttribute('onpageshow');C.setAttribute('onpageshow',(D?D+';':'')+'event.persisted && (function(){'+'var allInstances = CKEDITOR.instances, editor, doc;'+'for ( var i in allInstances )'+'{'+'\teditor = allInstances[ i ];'+'\tdoc = editor.document;'+'\tif ( doc )'+'\t{'+'\t\tdoc.$.designMode = "off";'+'\t\tdoc.$.designMode = "on";'+'\t}'+'}'+'})();');
+}})();})();i.disableObjectResizing=false;i.disableNativeTableHandles=true;i.disableNativeSpellChecker=true;i.ignoreEmptyParagraph=true;a.DIALOG_RESIZE_NONE=0;a.DIALOG_RESIZE_WIDTH=1;a.DIALOG_RESIZE_HEIGHT=2;a.DIALOG_RESIZE_BOTH=3;(function(){var m=e.cssLength;function n(S){return!!this._.tabs[S][0].$.offsetHeight;};function o(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S)+T;for(var V=U-1;V>U-T;V--){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function p(){var W=this;var S=W._.currentTabId,T=W._.tabIdList.length,U=e.indexOf(W._.tabIdList,S);for(var V=U+1;V<U+T;V++){if(n.call(W,W._.tabIdList[V%T]))return W._.tabIdList[V%T];}return null;};function q(S,T){var U=S.$.getElementsByTagName('input');for(var V=0,W=U.length;V<W;V++){var X=new h(U[V]);if(X.getAttribute('type').toLowerCase()=='text')if(T){X.setAttribute('value',X.getCustomData('fake_value')||'');X.removeCustomData('fake_value');}else{X.setCustomData('fake_value',X.getAttribute('value'));X.setAttribute('value','');}}};function r(S,T){var V=this;var U=V.getInputElement();if(U)S?U.removeAttribute('aria-invalid'):U.setAttribute('aria-invalid',true);if(!S)if(V.select)V.select();else V.focus();T&&alert(T);V.fire('validated',{valid:S,msg:T});};function s(){var S=this.getInputElement();S&&S.removeAttribute('aria-invalid');};a.dialog=function(S,T){var U=a.dialog._.dialogDefinitions[T],V=e.clone(u),W=S.config.dialog_buttonsOrder||'OS',X=S.lang.dir;if(W=='OS'&&b.mac||W=='rtl'&&X=='ltr'||W=='ltr'&&X=='rtl')V.buttons.reverse();U=e.extend(U(S),V);U=e.clone(U);U=new y(this,U);var Y=a.document,Z=S.theme.buildDialog(S);this._={editor:S,element:Z.element,name:T,contentSize:{width:0,height:0},size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:false,focusList:[],currentFocusIndex:0,hasFocus:false};this.parts=Z.parts;e.setTimeout(function(){S.fire('ariaWidget',this.parts.contents);},0,this);var aa={position:b.ie6Compat?'absolute':'fixed',top:0,visibility:'hidden'};aa[X=='rtl'?'right':'left']=0;this.parts.dialog.setStyles(aa);a.event.call(this);this.definition=U=a.fire('dialogDefinition',{name:T,definition:U},S).definition;var ab={};if(!('removeDialogTabs' in S._)&&S.config.removeDialogTabs){var ac=S.config.removeDialogTabs.split(';');for(i=0;i<ac.length;i++){var ad=ac[i].split(':');if(ad.length==2){var ae=ad[0];if(!ab[ae])ab[ae]=[];ab[ae].push(ad[1]);
+}}S._.removeDialogTabs=ab;}if(S._.removeDialogTabs&&(ab=S._.removeDialogTabs[T]))for(i=0;i<ab.length;i++)U.removeContents(ab[i]);if(U.onLoad)this.on('load',U.onLoad);if(U.onShow)this.on('show',U.onShow);if(U.onHide)this.on('hide',U.onHide);if(U.onOk)this.on('ok',function(ar){S.fire('saveSnapshot');setTimeout(function(){S.fire('saveSnapshot');},0);if(U.onOk.call(this,ar)===false)ar.data.hide=false;});if(U.onCancel)this.on('cancel',function(ar){if(U.onCancel.call(this,ar)===false)ar.data.hide=false;});var af=this,ag=function(ar){var as=af._.contents,at=false;for(var au in as)for(var av in as[au]){at=ar.call(this,as[au][av]);if(at)return;}};this.on('ok',function(ar){ag(function(as){if(as.validate){var at=as.validate(this),au=typeof at=='string'||at===false;if(au){ar.data.hide=false;ar.stop();}r.call(as,!au,typeof at=='string'?at:undefined);return au;}});},this,null,0);this.on('cancel',function(ar){ag(function(as){if(as.isChanged()){if(!confirm(S.lang.common.confirmCancel))ar.data.hide=false;return true;}});},this,null,0);this.parts.close.on('click',function(ar){if(this.fire('cancel',{hide:true}).hide!==false)this.hide();ar.data.preventDefault();},this);function ah(){var ar=af._.focusList;ar.sort(function(au,av){if(au.tabIndex!=av.tabIndex)return av.tabIndex-au.tabIndex;else return au.focusIndex-av.focusIndex;});var as=ar.length;for(var at=0;at<as;at++)ar[at].focusIndex=at;};function ai(ar){var as=af._.focusList,at=ar?1:-1;if(as.length<1)return;var au=af._.currentFocusIndex;try{as[au].getInputElement().$.blur();}catch(ax){}var av=(au+at+as.length)%as.length,aw=av;while(!as[aw].isFocusable()){aw=(aw+at+as.length)%as.length;if(aw==av)break;}as[aw].focus();if(as[aw].type=='text')as[aw].select();};this.changeFocus=ai;var aj;function ak(ar){var aw=this;if(af!=a.dialog._.currentTop)return;var as=ar.data.getKeystroke(),at=S.lang.dir=='rtl';aj=0;if(as==9||as==2000+9){var au=as==2000+9;if(af._.tabBarMode){var av=au?o.call(af):p.call(af);af.selectPage(av);af._.tabs[av][0].focus();}else ai(!au);aj=1;}else if(as==4000+121&&!af._.tabBarMode&&af.getPageCount()>1){af._.tabBarMode=true;af._.tabs[af._.currentTabId][0].focus();aj=1;}else if((as==37||as==39)&&af._.tabBarMode){av=as==(at?39:37)?o.call(af):p.call(af);af.selectPage(av);af._.tabs[av][0].focus();aj=1;}else if((as==13||as==32)&&af._.tabBarMode){aw.selectPage(aw._.currentTabId);aw._.tabBarMode=false;aw._.currentFocusIndex=-1;ai(true);aj=1;}if(aj){ar.stop();ar.data.preventDefault();}};function al(ar){aj&&ar.data.preventDefault();
+};var am=this._.element;this.on('show',function(){am.on('keydown',ak,this,null,0);if(b.opera||b.gecko&&b.mac)am.on('keypress',al,this);});this.on('hide',function(){am.removeListener('keydown',ak);if(b.opera||b.gecko&&b.mac)am.removeListener('keypress',al);ag(function(ar){s.apply(ar);});});this.on('iframeAdded',function(ar){var as=new g(ar.data.iframe.$.contentWindow.document);as.on('keydown',ak,this,null,0);});this.on('show',function(){var av=this;ah();if(S.config.dialog_startupFocusTab&&af._.pageCount>1){af._.tabBarMode=true;af._.tabs[af._.currentTabId][0].focus();}else if(!av._.hasFocus){av._.currentFocusIndex=-1;if(U.onFocus){var ar=U.onFocus.call(av);ar&&ar.focus();}else ai(true);if(av._.editor.mode=='wysiwyg'&&c){var as=S.document.$.selection,at=as.createRange();if(at)if(at.parentElement&&at.parentElement().ownerDocument==S.document.$||at.item&&at.item(0).ownerDocument==S.document.$){var au=document.body.createTextRange();au.moveToElementText(av.getElement().getFirst().$);au.collapse(true);au.select();}}}},this,null,4294967295);if(b.ie6Compat)this.on('load',function(ar){var as=this.getElement(),at=as.getFirst();at.remove();at.appendTo(as);},this);A(this);B(this);new d.text(U.title,a.document).appendTo(this.parts.title);for(var an=0;an<U.contents.length;an++){var ao=U.contents[an];ao&&this.addPage(ao);}this.parts.tabs.on('click',function(ar){var au=this;var as=ar.data.getTarget();if(as.hasClass('cke_dialog_tab')){var at=as.$.id;au.selectPage(at.substring(4,at.lastIndexOf('_')));if(au._.tabBarMode){au._.tabBarMode=false;au._.currentFocusIndex=-1;ai(true);}ar.data.preventDefault();}},this);var ap=[],aq=a.dialog._.uiElementBuilders.hbox.build(this,{type:'hbox',className:'cke_dialog_footer_buttons',widths:[],children:U.buttons},ap).getChild();this.parts.footer.setHtml(ap.join(''));for(an=0;an<aq.length;an++)this._.buttons[aq[an].id]=aq[an];};function t(S,T,U){this.element=T;this.focusIndex=U;this.tabIndex=0;this.isFocusable=function(){return!T.getAttribute('disabled')&&T.isVisible();};this.focus=function(){S._.currentFocusIndex=this.focusIndex;this.element.focus();};T.on('keydown',function(V){if(V.data.getKeystroke() in {32:1,13:1})this.fire('click');});T.on('focus',function(){this.fire('mouseover');});T.on('blur',function(){this.fire('mouseout');});};a.dialog.prototype={destroy:function(){this.hide();this._.element.remove();},resize:(function(){return function(S,T){var U=this;if(U._.contentSize&&U._.contentSize.width==S&&U._.contentSize.height==T)return;a.dialog.fire('resize',{dialog:U,skin:U._.editor.skinName,width:S,height:T},U._.editor);
+U.fire('resize',{skin:U._.editor.skinName,width:S,height:T},U._.editor);if(U._.editor.lang.dir=='rtl'&&U._.position)U._.position.x=a.document.getWindow().getViewPaneSize().width-U._.contentSize.width-parseInt(U._.element.getFirst().getStyle('right'),10);U._.contentSize={width:S,height:T};};})(),getSize:function(){var S=this._.element.getFirst();return{width:S.$.offsetWidth||0,height:S.$.offsetHeight||0};},move:(function(){var S;return function(T,U,V){var ac=this;var W=ac._.element.getFirst(),X=ac._.editor.lang.dir=='rtl';if(S===undefined)S=W.getComputedStyle('position')=='fixed';if(S&&ac._.position&&ac._.position.x==T&&ac._.position.y==U)return;ac._.position={x:T,y:U};if(!S){var Y=a.document.getWindow().getScrollPosition();T+=Y.x;U+=Y.y;}if(X){var Z=ac.getSize(),aa=a.document.getWindow().getViewPaneSize();T=aa.width-Z.width-T;}var ab={top:(U>0?U:0)+'px'};ab[X?'right':'left']=(T>0?T:0)+'px';W.setStyles(ab);V&&(ac._.moved=1);};})(),getPosition:function(){return e.extend({},this._.position);},show:function(){var S=this._.element,T=this.definition;if(!(S.getParent()&&S.getParent().equals(a.document.getBody())))S.appendTo(a.document.getBody());else S.setStyle('display','block');if(b.gecko&&b.version<10900){var U=this.parts.dialog;U.setStyle('position','absolute');setTimeout(function(){U.setStyle('position','fixed');},0);}this.resize(this._.contentSize&&this._.contentSize.width||T.width||T.minWidth,this._.contentSize&&this._.contentSize.height||T.height||T.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);if(a.dialog._.currentZIndex===null)a.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex;this._.element.getFirst().setStyle('z-index',a.dialog._.currentZIndex+=10);if(a.dialog._.currentTop===null){a.dialog._.currentTop=this;this._.parentDialog=null;G(this._.editor);S.on('keydown',K);S.on(b.opera?'keypress':'keyup',L);for(var V in {keyup:1,keydown:1,keypress:1})S.on(V,R);}else{this._.parentDialog=a.dialog._.currentTop;var W=this._.parentDialog.getElement().getFirst();W.$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2);a.dialog._.currentTop=this;}M(this,this,'\x1b',null,function(){this.getButton('cancel')&&this.getButton('cancel').click();});this._.hasFocus=false;e.setTimeout(function(){this.layout();this.parts.dialog.setStyle('visibility','');this.fireOnce('load',{});k.fire('ready',this);this.fire('show',{});this._.editor.fire('dialogShow',this);this.foreach(function(X){X.setInitValue&&X.setInitValue();});},100,this);
+},layout:function(){var U=this;var S=a.document.getWindow().getViewPaneSize(),T=U.getSize();U.move(U._.moved?U._.position.x:(S.width-T.width)/2,U._.moved?U._.position.y:(S.height-T.height)/2);},foreach:function(S){var V=this;for(var T in V._.contents)for(var U in V._.contents[T])S.call(V,V._.contents[T][U]);return V;},reset:(function(){var S=function(T){if(T.reset)T.reset(1);};return function(){this.foreach(S);return this;};})(),setupContent:function(){var S=arguments;this.foreach(function(T){if(T.setup)T.setup.apply(T,S);});},commitContent:function(){var S=arguments;this.foreach(function(T){if(c&&this._.currentFocusIndex==T.focusIndex)T.getInputElement().$.blur();if(T.commit)T.commit.apply(T,S);});},hide:function(){if(!this.parts.dialog.isVisible())return;this.fire('hide',{});this._.editor.fire('dialogHide',this);var S=this._.element;S.setStyle('display','none');this.parts.dialog.setStyle('visibility','hidden');N(this);while(a.dialog._.currentTop!=this)a.dialog._.currentTop.hide();if(!this._.parentDialog)H();else{var T=this._.parentDialog.getElement().getFirst();T.setStyle('z-index',parseInt(T.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2));}a.dialog._.currentTop=this._.parentDialog;if(!this._.parentDialog){a.dialog._.currentZIndex=null;S.removeListener('keydown',K);S.removeListener(b.opera?'keypress':'keyup',L);for(var U in {keyup:1,keydown:1,keypress:1})S.removeListener(U,R);var V=this._.editor;V.focus();if(V.mode=='wysiwyg'&&c){var W=V.getSelection();W&&W.unlock(true);}}else a.dialog._.currentZIndex-=10;delete this._.parentDialog;this.foreach(function(X){X.resetInitValue&&X.resetInitValue();});},addPage:function(S){var ae=this;var T=[],U=S.label?' title="'+e.htmlEncode(S.label)+'"':'',V=S.elements,W=a.dialog._.uiElementBuilders.vbox.build(ae,{type:'vbox',className:'cke_dialog_page_contents',children:S.elements,expand:!!S.expand,padding:S.padding,style:S.style||'width: 100%;height:100%'},T),X=h.createFromHtml(T.join(''));X.setAttribute('role','tabpanel');var Y=b,Z='cke_'+S.id+'_'+e.getNextNumber(),aa=h.createFromHtml(['<a class="cke_dialog_tab"',ae._.pageCount>0?' cke_last':'cke_first',U,!!S.hidden?' style="display:none"':'',' id="',Z,'"',Y.gecko&&Y.version>=10900&&!Y.hc?'':' href="javascript:void(0)"',' tabIndex="-1"',' hidefocus="true"',' role="tab">',S.label,'</a>'].join(''));X.setAttribute('aria-labelledby',Z);ae._.tabs[S.id]=[aa,X];ae._.tabIdList.push(S.id);!S.hidden&&ae._.pageCount++;ae._.lastTab=aa;ae.updateStyle();var ab=ae._.contents[S.id]={},ac,ad=W.getChild();
+while(ac=ad.shift()){ab[ac.id]=ac;if(typeof ac.getChild=='function')ad.push.apply(ad,ac.getChild());}X.setAttribute('name',S.id);X.appendTo(ae.parts.contents);aa.unselectable();ae.parts.tabs.append(aa);if(S.accessKey){M(ae,ae,'CTRL+'+S.accessKey,P,O);ae._.accessKeyMap['CTRL+'+S.accessKey]=S.id;}},selectPage:function(S){if(this._.currentTabId==S)return;if(this.fire('selectPage',{page:S,currentPage:this._.currentTabId})===true)return;for(var T in this._.tabs){var U=this._.tabs[T][0],V=this._.tabs[T][1];if(T!=S){U.removeClass('cke_dialog_tab_selected');V.hide();}V.setAttribute('aria-hidden',T!=S);}var W=this._.tabs[S];W[0].addClass('cke_dialog_tab_selected');if(b.ie6Compat||b.ie7Compat){q(W[1]);W[1].show();setTimeout(function(){q(W[1],1);},0);}else W[1].show();this._.currentTabId=S;this._.currentTabIndex=e.indexOf(this._.tabIdList,S);},updateStyle:function(){this.parts.dialog[(this._.pageCount===1?'add':'remove')+'Class']('cke_single_page');},hidePage:function(S){var U=this;var T=U._.tabs[S]&&U._.tabs[S][0];if(!T||U._.pageCount==1||!T.isVisible())return;else if(S==U._.currentTabId)U.selectPage(o.call(U));T.hide();U._.pageCount--;U.updateStyle();},showPage:function(S){var U=this;var T=U._.tabs[S]&&U._.tabs[S][0];if(!T)return;T.show();U._.pageCount++;U.updateStyle();},getElement:function(){return this._.element;},getName:function(){return this._.name;},getContentElement:function(S,T){var U=this._.contents[S];return U&&U[T];},getValueOf:function(S,T){return this.getContentElement(S,T).getValue();},setValueOf:function(S,T,U){return this.getContentElement(S,T).setValue(U);},getButton:function(S){return this._.buttons[S];},click:function(S){return this._.buttons[S].click();},disableButton:function(S){return this._.buttons[S].disable();},enableButton:function(S){return this._.buttons[S].enable();},getPageCount:function(){return this._.pageCount;},getParentEditor:function(){return this._.editor;},getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement();},addFocusable:function(S,T){var V=this;if(typeof T=='undefined'){T=V._.focusList.length;V._.focusList.push(new t(V,S,T));}else{V._.focusList.splice(T,0,new t(V,S,T));for(var U=T+1;U<V._.focusList.length;U++)V._.focusList[U].focusIndex++;}}};e.extend(a.dialog,{add:function(S,T){if(!this._.dialogDefinitions[S]||typeof T=='function')this._.dialogDefinitions[S]=T;},exists:function(S){return!!this._.dialogDefinitions[S];},getCurrent:function(){return a.dialog._.currentTop;},okButton:(function(){var S=function(T,U){U=U||{};
+return e.extend({id:'ok',type:'button',label:T.lang.common.ok,'class':'cke_dialog_ui_button_ok',onClick:function(V){var W=V.data.dialog;if(W.fire('ok',{hide:true}).hide!==false)W.hide();}},U,true);};S.type='button';S.override=function(T){return e.extend(function(U){return S(U,T);},{type:'button'},true);};return S;})(),cancelButton:(function(){var S=function(T,U){U=U||{};return e.extend({id:'cancel',type:'button',label:T.lang.common.cancel,'class':'cke_dialog_ui_button_cancel',onClick:function(V){var W=V.data.dialog;if(W.fire('cancel',{hide:true}).hide!==false)W.hide();}},U,true);};S.type='button';S.override=function(T){return e.extend(function(U){return S(U,T);},{type:'button'},true);};return S;})(),addUIElement:function(S,T){this._.uiElementBuilders[S]=T;}});a.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};a.event.implementOn(a.dialog);a.event.implementOn(a.dialog.prototype,true);var u={resizable:0,minWidth:600,minHeight:400,buttons:[a.dialog.okButton,a.dialog.cancelButton]},v=function(S,T,U){for(var V=0,W;W=S[V];V++){if(W.id==T)return W;if(U&&W[U]){var X=v(W[U],T,U);if(X)return X;}}return null;},w=function(S,T,U,V,W){if(U){for(var X=0,Y;Y=S[X];X++){if(Y.id==U){S.splice(X,0,T);return T;}if(V&&Y[V]){var Z=w(Y[V],T,U,V,true);if(Z)return Z;}}if(W)return null;}S.push(T);return T;},x=function(S,T,U){for(var V=0,W;W=S[V];V++){if(W.id==T)return S.splice(V,1);if(U&&W[U]){var X=x(W[U],T,U);if(X)return X;}}return null;},y=function(S,T){this.dialog=S;var U=T.contents;for(var V=0,W;W=U[V];V++)U[V]=W&&new z(S,W);e.extend(this,T);};y.prototype={getContents:function(S){return v(this.contents,S);},getButton:function(S){return v(this.buttons,S);},addContents:function(S,T){return w(this.contents,S,T);},addButton:function(S,T){return w(this.buttons,S,T);},removeContents:function(S){x(this.contents,S);},removeButton:function(S){x(this.buttons,S);}};function z(S,T){this._={dialog:S};e.extend(this,T);};z.prototype={get:function(S){return v(this.elements,S,'children');},add:function(S,T){return w(this.elements,S,T,'children');},remove:function(S){x(this.elements,S,'children');}};function A(S){var T=null,U=null,V=S.getElement().getFirst(),W=S.getParentEditor(),X=W.config.dialog_magnetDistance,Y=W.skin.margins||[0,0,0,0];if(typeof X=='undefined')X=20;function Z(ab){var ac=S.getSize(),ad=a.document.getWindow().getViewPaneSize(),ae=ab.data.$.screenX,af=ab.data.$.screenY,ag=ae-T.x,ah=af-T.y,ai,aj;T={x:ae,y:af};U.x+=ag;U.y+=ah;if(U.x+Y[3]<X)ai=-Y[3];
+else if(U.x-Y[1]>ad.width-ac.width-X)ai=ad.width-ac.width+(W.lang.dir=='rtl'?0:Y[1]);else ai=U.x;if(U.y+Y[0]<X)aj=-Y[0];else if(U.y-Y[2]>ad.height-ac.height-X)aj=ad.height-ac.height+Y[2];else aj=U.y;S.move(ai,aj,1);ab.data.preventDefault();};function aa(ab){a.document.removeListener('mousemove',Z);a.document.removeListener('mouseup',aa);if(b.ie6Compat){var ac=E.getChild(0).getFrameDocument();ac.removeListener('mousemove',Z);ac.removeListener('mouseup',aa);}};S.parts.title.on('mousedown',function(ab){T={x:ab.data.$.screenX,y:ab.data.$.screenY};a.document.on('mousemove',Z);a.document.on('mouseup',aa);U=S.getPosition();if(b.ie6Compat){var ac=E.getChild(0).getFrameDocument();ac.on('mousemove',Z);ac.on('mouseup',aa);}ab.data.preventDefault();},S);};function B(S){var T=S.definition,U=T.resizable;if(U==0)return;var V=S.getParentEditor(),W,X,Y,Z,aa,ab,ac=e.addFunction(function(af){aa=S.getSize();var ag=S.parts.contents,ah=ag.$.getElementsByTagName('iframe').length;if(ah){ab=h.createFromHtml('<div class="cke_dialog_resize_cover" style="height: 100%; position: absolute; width: 100%;"></div>');ag.append(ab);}X=aa.height-S.parts.contents.getSize('height',!(b.gecko||b.opera||c&&b.quirks));W=aa.width-S.parts.contents.getSize('width',1);Z={x:af.screenX,y:af.screenY};Y=a.document.getWindow().getViewPaneSize();a.document.on('mousemove',ad);a.document.on('mouseup',ae);if(b.ie6Compat){var ai=E.getChild(0).getFrameDocument();ai.on('mousemove',ad);ai.on('mouseup',ae);}af.preventDefault&&af.preventDefault();});S.on('load',function(){var af='';if(U==1)af=' cke_resizer_horizontal';else if(U==2)af=' cke_resizer_vertical';var ag=h.createFromHtml('<div class="cke_resizer'+af+' cke_resizer_'+V.lang.dir+'"'+' title="'+e.htmlEncode(V.lang.resize)+'"'+' onmousedown="CKEDITOR.tools.callFunction('+ac+', event )"></div>');S.parts.footer.append(ag,1);});V.on('destroy',function(){e.removeFunction(ac);});function ad(af){var ag=V.lang.dir=='rtl',ah=(af.data.$.screenX-Z.x)*(ag?-1:1),ai=af.data.$.screenY-Z.y,aj=aa.width,ak=aa.height,al=aj+ah*(S._.moved?1:2),am=ak+ai*(S._.moved?1:2),an=S._.element.getFirst(),ao=ag&&an.getComputedStyle('right'),ap=S.getPosition();if(ap.y+am>Y.height)am=Y.height-ap.y;if((ag?ao:ap.x)+al>Y.width)al=Y.width-(ag?ao:ap.x);if(U==1||U==3)aj=Math.max(T.minWidth||0,al-W);if(U==2||U==3)ak=Math.max(T.minHeight||0,am-X);S.resize(aj,ak);if(!S._.moved)S.layout();af.data.preventDefault();};function ae(){a.document.removeListener('mouseup',ae);a.document.removeListener('mousemove',ad);
+if(ab){ab.remove();ab=null;}if(b.ie6Compat){var af=E.getChild(0).getFrameDocument();af.removeListener('mouseup',ae);af.removeListener('mousemove',ad);}};};var C,D={},E;function F(S){S.data.preventDefault(1);};function G(S){var T=a.document.getWindow(),U=S.config,V=U.dialog_backgroundCoverColor||'white',W=U.dialog_backgroundCoverOpacity,X=U.baseFloatZIndex,Y=e.genKey(V,W,X),Z=D[Y];if(!Z){var aa=['<div tabIndex="-1" style="position: ',b.ie6Compat?'absolute':'fixed','; z-index: ',X,'; top: 0px; left: 0px; ',!b.ie6Compat?'background-color: '+V:'','" class="cke_dialog_background_cover">'];if(b.ie6Compat){var ab=b.isCustomDomain(),ac="<html><body style=\\'background-color:"+V+";\\'></body></html>";aa.push('<iframe hidefocus="true" frameborder="0" id="cke_dialog_background_iframe" src="javascript:');aa.push('void((function(){document.open();'+(ab?"document.domain='"+document.domain+"';":'')+"document.write( '"+ac+"' );"+'document.close();'+'})())');aa.push('" style="position:absolute;left:0;top:0;width:100%;height: 100%;progid:DXImageTransform.Microsoft.Alpha(opacity=0)"></iframe>');}aa.push('</div>');Z=h.createFromHtml(aa.join(''));Z.setOpacity(W!=undefined?W:0.5);Z.on('keydown',F);Z.on('keypress',F);Z.on('keyup',F);Z.appendTo(a.document.getBody());D[Y]=Z;}else Z.show();E=Z;var ad=function(){var ag=T.getViewPaneSize();Z.setStyles({width:ag.width+'px',height:ag.height+'px'});},ae=function(){var ag=T.getScrollPosition(),ah=a.dialog._.currentTop;Z.setStyles({left:ag.x+'px',top:ag.y+'px'});if(ah)do{var ai=ah.getPosition();ah.move(ai.x,ai.y);}while(ah=ah._.parentDialog)};C=ad;T.on('resize',ad);ad();if(!(b.mac&&b.webkit))Z.focus();if(b.ie6Compat){var af=function(){ae();arguments.callee.prevScrollHandler.apply(this,arguments);};T.$.setTimeout(function(){af.prevScrollHandler=window.onscroll||(function(){});window.onscroll=af;},0);ae();}};function H(){if(!E)return;var S=a.document.getWindow();E.hide();S.removeListener('resize',C);if(b.ie6Compat)S.$.setTimeout(function(){var T=window.onscroll&&window.onscroll.prevScrollHandler;window.onscroll=T||null;},0);C=null;};function I(){for(var S in D)D[S].remove();D={};};var J={},K=function(S){var T=S.data.$.ctrlKey||S.data.$.metaKey,U=S.data.$.altKey,V=S.data.$.shiftKey,W=String.fromCharCode(S.data.$.keyCode),X=J[(T?'CTRL+':'')+(U?'ALT+':'')+(V?'SHIFT+':'')+W];if(!X||!X.length)return;X=X[X.length-1];X.keydown&&X.keydown.call(X.uiElement,X.dialog,X.key);S.data.preventDefault();},L=function(S){var T=S.data.$.ctrlKey||S.data.$.metaKey,U=S.data.$.altKey,V=S.data.$.shiftKey,W=String.fromCharCode(S.data.$.keyCode),X=J[(T?'CTRL+':'')+(U?'ALT+':'')+(V?'SHIFT+':'')+W];
+if(!X||!X.length)return;X=X[X.length-1];if(X.keyup){X.keyup.call(X.uiElement,X.dialog,X.key);S.data.preventDefault();}},M=function(S,T,U,V,W){var X=J[U]||(J[U]=[]);X.push({uiElement:S,dialog:T,key:U,keyup:W||S.accessKeyUp,keydown:V||S.accessKeyDown});},N=function(S){for(var T in J){var U=J[T];for(var V=U.length-1;V>=0;V--){if(U[V].dialog==S||U[V].uiElement==S)U.splice(V,1);}if(U.length===0)delete J[T];}},O=function(S,T){if(S._.accessKeyMap[T])S.selectPage(S._.accessKeyMap[T]);},P=function(S,T){},Q={27:1,13:1},R=function(S){if(S.data.getKeystroke() in Q)S.data.stopPropagation();};(function(){k.dialog={uiElement:function(S,T,U,V,W,X,Y){if(arguments.length<4)return;var Z=(V.call?V(T):V)||'div',aa=['<',Z,' '],ab=(W&&W.call?W(T):W)||{},ac=(X&&X.call?X(T):X)||{},ad=(Y&&Y.call?Y.call(this,S,T):Y)||'',ae=this.domId=ac.id||e.getNextId()+'_uiElement',af=this.id=T.id,ag;ac.id=ae;var ah={};if(T.type)ah['cke_dialog_ui_'+T.type]=1;if(T.className)ah[T.className]=1;if(T.disabled)ah.cke_disabled=1;var ai=ac['class']&&ac['class'].split?ac['class'].split(' '):[];for(ag=0;ag<ai.length;ag++){if(ai[ag])ah[ai[ag]]=1;}var aj=[];for(ag in ah)aj.push(ag);ac['class']=aj.join(' ');if(T.title)ac.title=T.title;var ak=(T.style||'').split(';');if(T.align){var al=T.align;ab['margin-left']=al=='left'?0:'auto';ab['margin-right']=al=='right'?0:'auto';}for(ag in ab)ak.push(ag+':'+ab[ag]);if(T.hidden)ak.push('display:none');for(ag=ak.length-1;ag>=0;ag--){if(ak[ag]==='')ak.splice(ag,1);}if(ak.length>0)ac.style=(ac.style?ac.style+'; ':'')+ak.join('; ');for(ag in ac)aa.push(ag+'="'+e.htmlEncode(ac[ag])+'" ');aa.push('>',ad,'</',Z,'>');U.push(aa.join(''));(this._||(this._={})).dialog=S;if(typeof T.isChanged=='boolean')this.isChanged=function(){return T.isChanged;};if(typeof T.isChanged=='function')this.isChanged=T.isChanged;if(typeof T.setValue=='function')this.setValue=e.override(this.setValue,function(an){return function(ao){an.call(this,T.setValue.call(this,ao));};});if(typeof T.getValue=='function')this.getValue=e.override(this.getValue,function(an){return function(){return T.getValue.call(this,an.call(this));};});a.event.implementOn(this);this.registerEvents(T);if(this.accessKeyUp&&this.accessKeyDown&&T.accessKey)M(this,S,'CTRL+'+T.accessKey);var am=this;S.on('load',function(){var an=am.getInputElement();if(an){var ao=am.type in {checkbox:1,ratio:1}&&c&&b.version<8?'cke_dialog_ui_focused':'';an.on('focus',function(){S._.tabBarMode=false;S._.hasFocus=true;am.fire('focus');ao&&this.addClass(ao);
+});an.on('blur',function(){am.fire('blur');ao&&this.removeClass(ao);});}});if(this.keyboardFocusable){this.tabIndex=T.tabIndex||0;this.focusIndex=S._.focusList.push(this)-1;this.on('focus',function(){S._.currentFocusIndex=am.focusIndex;});}e.extend(this,T);},hbox:function(S,T,U,V,W){if(arguments.length<4)return;this._||(this._={});var X=this._.children=T,Y=W&&W.widths||null,Z=W&&W.height||null,aa={},ab,ac=function(){var ae=['<tbody><tr class="cke_dialog_ui_hbox">'];for(ab=0;ab<U.length;ab++){var af='cke_dialog_ui_hbox_child',ag=[];if(ab===0)af='cke_dialog_ui_hbox_first';if(ab==U.length-1)af='cke_dialog_ui_hbox_last';ae.push('<td class="',af,'" role="presentation" ');if(Y){if(Y[ab])ag.push('width:'+m(Y[ab]));}else ag.push('width:'+Math.floor(100/U.length)+'%');if(Z)ag.push('height:'+m(Z));if(W&&W.padding!=undefined)ag.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ab].align)ag.push('text-align:'+X[ab].align);if(ag.length>0)ae.push('style="'+ag.join('; ')+'" ');ae.push('>',U[ab],'</td>');}ae.push('</tr></tbody>');return ae.join('');},ad={role:'presentation'};W&&W.align&&(ad.align=W.align);k.dialog.uiElement.call(this,S,W||{type:'hbox'},V,'table',aa,ad,ac);},vbox:function(S,T,U,V,W){if(arguments.length<3)return;this._||(this._={});var X=this._.children=T,Y=W&&W.width||null,Z=W&&W.heights||null,aa=function(){var ab=['<table role="presentation" cellspacing="0" border="0" '];ab.push('style="');if(W&&W.expand)ab.push('height:100%;');ab.push('width:'+m(Y||'100%'),';');ab.push('"');ab.push('align="',e.htmlEncode(W&&W.align||(S.getParentEditor().lang.dir=='ltr'?'left':'right')),'" ');ab.push('><tbody>');for(var ac=0;ac<U.length;ac++){var ad=[];ab.push('<tr><td role="presentation" ');if(Y)ad.push('width:'+m(Y||'100%'));if(Z)ad.push('height:'+m(Z[ac]));else if(W&&W.expand)ad.push('height:'+Math.floor(100/U.length)+'%');if(W&&W.padding!=undefined)ad.push('padding:'+m(W.padding));if(c&&b.quirks&&X[ac].align)ad.push('text-align:'+X[ac].align);if(ad.length>0)ab.push('style="',ad.join('; '),'" ');ab.push(' class="cke_dialog_ui_vbox_child">',U[ac],'</td></tr>');}ab.push('</tbody></table>');return ab.join('');};k.dialog.uiElement.call(this,S,W||{type:'vbox'},V,'div',null,{role:'presentation'},aa);}};})();k.dialog.uiElement.prototype={getElement:function(){return a.document.getById(this.domId);},getInputElement:function(){return this.getElement();},getDialog:function(){return this._.dialog;},setValue:function(S,T){this.getInputElement().setValue(S);!T&&this.fire('change',{value:S});
+return this;},getValue:function(){return this.getInputElement().getValue();},isChanged:function(){return false;},selectParentTab:function(){var V=this;var S=V.getInputElement(),T=S,U;while((T=T.getParent())&&T.$.className.search('cke_dialog_page_contents')==-1){}if(!T)return V;U=T.getAttribute('name');if(V._.dialog._.currentTabId!=U)V._.dialog.selectPage(U);return V;},focus:function(){this.selectParentTab().getInputElement().focus();return this;},registerEvents:function(S){var T=/^on([A-Z]\w+)/,U,V=function(X,Y,Z,aa){Y.on('load',function(){X.getInputElement().on(Z,aa,X);});};for(var W in S){if(!(U=W.match(T)))continue;if(this.eventProcessors[W])this.eventProcessors[W].call(this,this._.dialog,S[W]);else V(this,this._.dialog,U[1].toLowerCase(),S[W]);}return this;},eventProcessors:{onLoad:function(S,T){S.on('load',T,this);},onShow:function(S,T){S.on('show',T,this);},onHide:function(S,T){S.on('hide',T,this);}},accessKeyDown:function(S,T){this.focus();},accessKeyUp:function(S,T){},disable:function(){var S=this.getElement(),T=this.getInputElement();T.setAttribute('disabled','true');S.addClass('cke_disabled');},enable:function(){var S=this.getElement(),T=this.getInputElement();T.removeAttribute('disabled');S.removeClass('cke_disabled');},isEnabled:function(){return!this.getElement().hasClass('cke_disabled');},isVisible:function(){return this.getInputElement().isVisible();},isFocusable:function(){if(!this.isEnabled()||!this.isVisible())return false;return true;}};k.dialog.hbox.prototype=e.extend(new k.dialog.uiElement(),{getChild:function(S){var T=this;if(arguments.length<1)return T._.children.concat();if(!S.splice)S=[S];if(S.length<2)return T._.children[S[0]];else return T._.children[S[0]]&&T._.children[S[0]].getChild?T._.children[S[0]].getChild(S.slice(1,S.length)):null;}},true);k.dialog.vbox.prototype=new k.dialog.hbox();(function(){var S={build:function(T,U,V){var W=U.children,X,Y=[],Z=[];for(var aa=0;aa<W.length&&(X=W[aa]);aa++){var ab=[];Y.push(ab);Z.push(a.dialog._.uiElementBuilders[X.type].build(T,X,ab));}return new k.dialog[U.type](T,Z,Y,V,U);}};a.dialog.addUIElement('hbox',S);a.dialog.addUIElement('vbox',S);})();a.dialogCommand=function(S){this.dialogName=S;};a.dialogCommand.prototype={exec:function(S){b.opera?e.setTimeout(function(){S.openDialog(this.dialogName);},0,this):S.openDialog(this.dialogName);},canUndo:false,editorFocus:c||b.webkit};(function(){var S=/^([a]|[^a])+$/,T=/^\d*$/,U=/^\d*(?:\.\d+)?$/,V=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,W=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,X=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;
+a.VALIDATE_OR=1;a.VALIDATE_AND=2;a.dialog.validate={functions:function(){var Y=arguments;return function(){var Z=this&&this.getValue?this.getValue():Y[0],aa=undefined,ab=2,ac=[],ad;for(ad=0;ad<Y.length;ad++){if(typeof Y[ad]=='function')ac.push(Y[ad]);else break;}if(ad<Y.length&&typeof Y[ad]=='string'){aa=Y[ad];ad++;}if(ad<Y.length&&typeof Y[ad]=='number')ab=Y[ad];var ae=ab==2?true:false;for(ad=0;ad<ac.length;ad++){if(ab==2)ae=ae&&ac[ad](Z);else ae=ae||ac[ad](Z);}return!ae?aa:true;};},regex:function(Y,Z){return function(){var aa=this&&this.getValue?this.getValue():arguments[0];return!Y.test(aa)?Z:true;};},notEmpty:function(Y){return this.regex(S,Y);},integer:function(Y){return this.regex(T,Y);},number:function(Y){return this.regex(U,Y);},cssLength:function(Y){return this.functions(function(Z){return W.test(e.trim(Z));},Y);},htmlLength:function(Y){return this.functions(function(Z){return V.test(e.trim(Z));},Y);},inlineStyle:function(Y){return this.functions(function(Z){return X.test(e.trim(Z));},Y);},equals:function(Y,Z){return this.functions(function(aa){return aa==Y;},Z);},notEqual:function(Y,Z){return this.functions(function(aa){return aa!=Y;},Z);}};a.on('instanceDestroyed',function(Y){if(e.isEmpty(a.instances)){var Z;while(Z=a.dialog._.currentTop)Z.hide();I();}var aa=Y.editor._.storedDialogs;for(var ab in aa)aa[ab].destroy();});})();e.extend(a.editor.prototype,{openDialog:function(S,T){if(this.mode=='wysiwyg'&&c){var U=this.getSelection();U&&U.lock();}var V=a.dialog._.dialogDefinitions[S],W=this.skin.dialog;if(a.dialog._.currentTop===null)G(this);if(typeof V=='function'&&W._isLoaded){var X=this._.storedDialogs||(this._.storedDialogs={}),Y=X[S]||(X[S]=new a.dialog(this,S));T&&T.call(Y,Y);Y.show();return Y;}else if(V=='failed'){H();throw new Error('[CKEDITOR.dialog.openDialog] Dialog "'+S+'" failed when loading definition.');}var Z=this;function aa(ac){var ad=a.dialog._.dialogDefinitions[S],ae=Z.skin.dialog;if(!ae._isLoaded||ab&&typeof ac=='undefined')return;if(typeof ad!='function')a.dialog._.dialogDefinitions[S]='failed';Z.openDialog(S,T);};if(typeof V=='string'){var ab=1;a.scriptLoader.load(a.getUrl(V),aa,null,0,1);}a.skins.load(this,'dialog',aa);return null;}});})();j.add('dialog',{requires:['dialogui']});j.add('styles',{requires:['selection'],init:function(m){m.on('contentDom',function(){m.document.setCustomData('cke_includeReadonly',!m.config.disableReadonlyStyling);});}});a.editor.prototype.attachStyleStateChange=function(m,n){var o=this._.styleStateChangeCallbacks;
+if(!o){o=this._.styleStateChangeCallbacks=[];this.on('selectionChange',function(p){for(var q=0;q<o.length;q++){var r=o[q],s=r.style.checkActive(p.data.path)?1:2;r.fn.call(this,s);}});}o.push({style:m,fn:n});};a.STYLE_BLOCK=1;a.STYLE_INLINE=2;a.STYLE_OBJECT=3;(function(){var m={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},n={a:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},o=/\s*(?:;\s*|$)/,p=/#\((.+?)\)/g,q=d.walker.bookmark(0,1),r=d.walker.whitespaces(1);a.style=function(T,U){var W=this;if(U){T=e.clone(T);L(T.attributes,U);L(T.styles,U);}var V=W.element=T.element?typeof T.element=='string'?T.element.toLowerCase():T.element:'*';W.type=m[V]?1:n[V]?3:2;if(typeof W.element=='object')W.type=3;W._={definition:T};};a.style.prototype={apply:function(T){S.call(this,T,false);},remove:function(T){S.call(this,T,true);},applyToRange:function(T){var U=this;return(U.applyToRange=U.type==2?t:U.type==1?x:U.type==3?v:null).call(U,T);},removeFromRange:function(T){var U=this;return(U.removeFromRange=U.type==2?u:U.type==1?y:U.type==3?w:null).call(U,T);},applyToObject:function(T){K(T,this);},checkActive:function(T){var Y=this;switch(Y.type){case 1:return Y.checkElementRemovable(T.block||T.blockLimit,true);case 3:case 2:var U=T.elements;for(var V=0,W;V<U.length;V++){W=U[V];if(Y.type==2&&(W==T.block||W==T.blockLimit))continue;if(Y.type==3){var X=W.getName();if(!(typeof Y.element=='string'?X==Y.element:X in Y.element))continue;}if(Y.checkElementRemovable(W,true))return true;}}return false;},checkApplicable:function(T){switch(this.type){case 2:case 1:break;case 3:return T.lastElement.getAscendant(this.element,true);}return true;},checkElementRemovable:function(T,U){var ae=this;var V=ae._.definition;if(!T||!V.ignoreReadonly&&T.isReadOnly())return false;var W,X=T.getName();if(typeof ae.element=='string'?X==ae.element:X in ae.element){if(!U&&!T.hasAttributes())return true;W=M(V);if(W._length){for(var Y in W){if(Y=='_length')continue;var Z=T.getAttribute(Y)||'';if(Y=='style'?R(W[Y],P(Z,false)):W[Y]==Z){if(!U)return true;}else if(U)return false;}if(U)return true;}else return true;}var aa=N(ae)[T.getName()];if(aa){if(!(W=aa.attributes))return true;for(var ab=0;ab<W.length;ab++){Y=W[ab][0];var ac=T.getAttribute(Y);if(ac){var ad=W[ab][1];if(ad===null||typeof ad=='string'&&ac==ad||ad.test(ac))return true;
+}}}return false;},buildPreview:function(T){var U=this._.definition,V=[],W=U.element;if(W=='bdo')W='span';V=['<',W];var X=U.attributes;if(X)for(var Y in X)V.push(' ',Y,'="',X[Y],'"');var Z=a.style.getStyleText(U);if(Z)V.push(' style="',Z,'"');V.push('>',T||U.name,'</',W,'>');return V.join('');}};a.style.getStyleText=function(T){var U=T._ST;if(U)return U;U=T.styles;var V=T.attributes&&T.attributes.style||'',W='';if(V.length)V=V.replace(o,';');for(var X in U){var Y=U[X],Z=(X+':'+Y).replace(o,';');if(Y=='inherit')W+=Z;else V+=Z;}if(V.length)V=P(V);V+=W;return T._ST=V;};function s(T){var U,V;while(T=T.getParent()){if(T.getName()=='body')break;if(T.getAttribute('data-nostyle'))U=T;else if(!V){var W=T.getAttribute('contentEditable');if(W=='false')U=T;else if(W=='true')V=1;}}return U;};function t(T){var ay=this;var U=T.document;if(T.collapsed){var V=J(ay,U);T.insertNode(V);T.moveToPosition(V,2);return;}var W=ay.element,X=ay._.definition,Y,Z=X.ignoreReadonly,aa=Z||X.includeReadonly;if(aa==undefined)aa=U.getCustomData('cke_includeReadonly');var ab=f[W]||(Y=true,f.span);T.enlarge(1,1);T.trim();var ac=T.createBookmark(),ad=ac.startNode,ae=ac.endNode,af=ad,ag;if(!Z){var ah=s(ad),ai=s(ae);if(ah)af=ah.getNextSourceNode(true);if(ai)ae=ai;}if(af.getPosition(ae)==2)af=0;while(af){var aj=false;if(af.equals(ae)){af=null;aj=true;}else{var ak=af.type,al=ak==1?af.getName():null,am=al&&af.getAttribute('contentEditable')=='false',an=al&&af.getAttribute('data-nostyle');if(al&&af.data('cke-bookmark')){af=af.getNextSourceNode(true);continue;}if(!al||ab[al]&&!an&&(!am||aa)&&(af.getPosition(ae)|4|0|8)==4+0+8&&(!X.childRule||X.childRule(af))){var ao=af.getParent();if(ao&&((ao.getDtd()||f.span)[W]||Y)&&(!X.parentRule||X.parentRule(ao))){if(!ag&&(!al||!f.$removeEmpty[al]||(af.getPosition(ae)|4|0|8)==4+0+8)){ag=new d.range(U);ag.setStartBefore(af);}if(ak==3||am||ak==1&&!af.getChildCount()){var ap=af,aq;while((aj=!ap.getNext(q))&&(aq=ap.getParent(),ab[aq.getName()])&&(aq.getPosition(ad)|2|0|8)==2+0+8&&(!X.childRule||X.childRule(aq)))ap=aq;ag.setEndAfter(ap);}}else aj=true;}else aj=true;af=af.getNextSourceNode(an||am);}if(aj&&ag&&!ag.collapsed){var ar=J(ay,U),as=ar.hasAttributes(),at=ag.getCommonAncestor(),au={styles:{},attrs:{},blockedStyles:{},blockedAttrs:{}},av,aw,ax;while(ar&&at){if(at.getName()==W){for(av in X.attributes){if(au.blockedAttrs[av]||!(ax=at.getAttribute(aw)))continue;if(ar.getAttribute(av)==ax)au.attrs[av]=1;else au.blockedAttrs[av]=1;}for(aw in X.styles){if(au.blockedStyles[aw]||!(ax=at.getStyle(aw)))continue;
+if(ar.getStyle(aw)==ax)au.styles[aw]=1;else au.blockedStyles[aw]=1;}}at=at.getParent();}for(av in au.attrs)ar.removeAttribute(av);for(aw in au.styles)ar.removeStyle(aw);if(as&&!ar.hasAttributes())ar=null;if(ar){ag.extractContents().appendTo(ar);G(ay,ar);ag.insertNode(ar);ar.mergeSiblings();if(!c)ar.$.normalize();}else{ar=new h('span');ag.extractContents().appendTo(ar);ag.insertNode(ar);G(ay,ar);ar.remove(true);}ag=null;}}T.moveToBookmark(ac);T.shrink(2);};function u(T){T.enlarge(1,1);var U=T.createBookmark(),V=U.startNode;if(T.collapsed){var W=new d.elementPath(V.getParent()),X;for(var Y=0,Z;Y<W.elements.length&&(Z=W.elements[Y]);Y++){if(Z==W.block||Z==W.blockLimit)break;if(this.checkElementRemovable(Z)){var aa;if(T.collapsed&&(T.checkBoundaryOfElement(Z,2)||(aa=T.checkBoundaryOfElement(Z,1)))){X=Z;X.match=aa?'start':'end';}else{Z.mergeSiblings();if(Z.getName()==this.element)F(this,Z);else H(Z,N(this)[Z.getName()]);}}}if(X){var ab=V;for(Y=0;true;Y++){var ac=W.elements[Y];if(ac.equals(X))break;else if(ac.match)continue;else ac=ac.clone();ac.append(ab);ab=ac;}ab[X.match=='start'?'insertBefore':'insertAfter'](X);}}else{var ad=U.endNode,ae=this;function af(){var ai=new d.elementPath(V.getParent()),aj=new d.elementPath(ad.getParent()),ak=null,al=null;for(var am=0;am<ai.elements.length;am++){var an=ai.elements[am];if(an==ai.block||an==ai.blockLimit)break;if(ae.checkElementRemovable(an))ak=an;}for(am=0;am<aj.elements.length;am++){an=aj.elements[am];if(an==aj.block||an==aj.blockLimit)break;if(ae.checkElementRemovable(an))al=an;}if(al)ad.breakParent(al);if(ak)V.breakParent(ak);};af();var ag=V;while(!ag.equals(ad)){var ah=ag.getNextSourceNode();if(ag.type==1&&this.checkElementRemovable(ag)){if(ag.getName()==this.element)F(this,ag);else H(ag,N(this)[ag.getName()]);if(ah.type==1&&ah.contains(V)){af();ah=V.getNext();}}ag=ah;}}T.moveToBookmark(U);};function v(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);V&&!V.isReadOnly()&&K(V,this);};function w(T){var U=T.getCommonAncestor(true,true),V=U.getAscendant(this.element,true);if(!V)return;var W=this,X=W._.definition,Y=X.attributes;if(Y)for(var Z in Y)V.removeAttribute(Z,Y[Z]);if(X.styles)for(var aa in X.styles){if(!X.styles.hasOwnProperty(aa))continue;V.removeStyle(aa);}};function x(T){var U=T.createBookmark(true),V=T.createIterator();V.enforceRealBlocks=true;if(this._.enterMode)V.enlargeBr=this._.enterMode!=2;var W,X=T.document,Y;while(W=V.getNextParagraph()){if(!W.isReadOnly()){var Z=J(this,X,W);
+z(W,Z);}}T.moveToBookmark(U);};function y(T){var Y=this;var U=T.createBookmark(1),V=T.createIterator();V.enforceRealBlocks=true;V.enlargeBr=Y._.enterMode!=2;var W;while(W=V.getNextParagraph()){if(Y.checkElementRemovable(W))if(W.is('pre')){var X=Y._.enterMode==2?null:T.document.createElement(Y._.enterMode==1?'p':'div');X&&W.copyAttributes(X);z(W,X);}else F(Y,W,1);}T.moveToBookmark(U);};function z(T,U){var V=!U;if(V){U=T.getDocument().createElement('div');T.copyAttributes(U);}var W=U&&U.is('pre'),X=T.is('pre'),Y=W&&!X,Z=!W&&X;if(Y)U=E(T,U);else if(Z)U=D(V?[T.getHtml()]:B(T),U);else T.moveChildren(U);U.replace(T);if(W)A(U);else if(V)I(U);};function A(T){var U;if(!((U=T.getPrevious(r))&&U.is&&U.is('pre')))return;var V=C(U.getHtml(),/\n$/,'')+'\n\n'+C(T.getHtml(),/^\n/,'');if(c)T.$.outerHTML='<pre>'+V+'</pre>';else T.setHtml(V);U.remove();};function B(T){var U=/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,V=T.getName(),W=C(T.getOuterHtml(),U,function(Y,Z,aa){return Z+'</pre>'+aa+'<pre>';}),X=[];W.replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(Y,Z){X.push(Z);});return X;};function C(T,U,V){var W='',X='';T=T.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(Y,Z,aa){Z&&(W=Z);aa&&(X=aa);return '';});return W+T.replace(U,V)+X;};function D(T,U){var V;if(T.length>1)V=new d.documentFragment(U.getDocument());for(var W=0;W<T.length;W++){var X=T[W];X=X.replace(/(\r\n|\r)/g,'\n');X=C(X,/^[ \t]*\n/,'');X=C(X,/\n$/,'');X=C(X,/^[ \t]+|[ \t]+$/g,function(Z,aa,ab){if(Z.length==1)return '&nbsp;';else if(!aa)return e.repeat('&nbsp;',Z.length-1)+' ';else return ' '+e.repeat('&nbsp;',Z.length-1);});X=X.replace(/\n/g,'<br>');X=X.replace(/[ \t]{2,}/g,function(Z){return e.repeat('&nbsp;',Z.length-1)+' ';});if(V){var Y=U.clone();Y.setHtml(X);V.append(Y);}else U.setHtml(X);}return V||U;};function E(T,U){var V=T.getBogus();V&&V.remove();var W=T.getHtml();W=C(W,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,'');W=W.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'$1');W=W.replace(/([ \t\n\r]+|&nbsp;)/g,' ');W=W.replace(/<br\b[^>]*>/gi,'\n');if(c){var X=T.getDocument().createElement('div');X.append(U);U.$.outerHTML='<pre>'+W+'</pre>';U.copyAttributes(X.getFirst());U=X.getFirst().remove();}else U.setHtml(W);return U;};function F(T,U){var V=T._.definition,W=e.extend({},V.attributes,N(T)[U.getName()]),X=V.styles,Y=e.isEmpty(W)&&e.isEmpty(X);for(var Z in W){if((Z=='class'||T._.definition.fullMatch)&&U.getAttribute(Z)!=O(Z,W[Z]))continue;
+Y=U.hasAttribute(Z);U.removeAttribute(Z);}for(var aa in X){if(T._.definition.fullMatch&&U.getStyle(aa)!=O(aa,X[aa],true))continue;Y=Y||!!U.getStyle(aa);U.removeStyle(aa);}if(Y)!f.$block[U.getName()]||T._.enterMode==2&&!U.hasAttributes()?I(U):U.renameNode(T._.enterMode==1?'p':'div');};function G(T,U){var V=T._.definition,W=V.attributes,X=V.styles,Y=N(T),Z=U.getElementsByTag(T.element);for(var aa=Z.count();--aa>=0;)F(T,Z.getItem(aa));for(var ab in Y){if(ab!=T.element){Z=U.getElementsByTag(ab);for(aa=Z.count()-1;aa>=0;aa--){var ac=Z.getItem(aa);H(ac,Y[ab]);}}}};function H(T,U){var V=U&&U.attributes;if(V)for(var W=0;W<V.length;W++){var X=V[W][0],Y;if(Y=T.getAttribute(X)){var Z=V[W][1];if(Z===null||Z.test&&Z.test(Y)||typeof Z=='string'&&Y==Z)T.removeAttribute(X);}}I(T);};function I(T){if(!T.hasAttributes())if(f.$block[T.getName()]){var U=T.getPrevious(r),V=T.getNext(r);if(U&&(U.type==3||!U.isBlockBoundary({br:1})))T.append('br',1);if(V&&(V.type==3||!V.isBlockBoundary({br:1})))T.append('br');T.remove(true);}else{var W=T.getFirst(),X=T.getLast();T.remove(true);if(W){W.type==1&&W.mergeSiblings();if(X&&!W.equals(X)&&X.type==1)X.mergeSiblings();}}};function J(T,U,V){var W,X=T._.definition,Y=T.element;if(Y=='*')Y='span';W=new h(Y,U);if(V)V.copyAttributes(W);W=K(W,T);if(U.getCustomData('doc_processing_style')&&W.hasAttribute('id'))W.removeAttribute('id');else U.setCustomData('doc_processing_style',1);return W;};function K(T,U){var V=U._.definition,W=V.attributes,X=a.style.getStyleText(V);if(W)for(var Y in W)T.setAttribute(Y,W[Y]);if(X)T.setAttribute('style',X);return T;};function L(T,U){for(var V in T)T[V]=T[V].replace(p,function(W,X){return U[X];});};function M(T){var U=T._AC;if(U)return U;U={};var V=0,W=T.attributes;if(W)for(var X in W){V++;U[X]=W[X];}var Y=a.style.getStyleText(T);if(Y){if(!U.style)V++;U.style=Y;}U._length=V;return T._AC=U;};function N(T){if(T._.overrides)return T._.overrides;var U=T._.overrides={},V=T._.definition.overrides;if(V){if(!e.isArray(V))V=[V];for(var W=0;W<V.length;W++){var X=V[W],Y,Z,aa;if(typeof X=='string')Y=X.toLowerCase();else{Y=X.element?X.element.toLowerCase():T.element;aa=X.attributes;}Z=U[Y]||(U[Y]={});if(aa){var ab=Z.attributes=Z.attributes||[];for(var ac in aa)ab.push([ac.toLowerCase(),aa[ac]]);}}}return U;};function O(T,U,V){var W=new h('span');W[V?'setStyle':'setAttribute'](T,U);return W[V?'getStyle':'getAttribute'](T);};function P(T,U){var V;if(U!==false){var W=new h('span');W.setAttribute('style',T);V=W.getAttribute('style')||'';
+}else V=T;V=V.replace(/(font-family:)(.*?)(?=;|$)/,function(X,Y,Z){var aa=Z.split(',');for(var ab=0;ab<aa.length;ab++)aa[ab]=e.trim(aa[ab].replace(/["']/g,''));return Y+aa.join(',');});return V.replace(/\s*([;:])\s*/,'$1').replace(/([^\s;])$/,'$1;').replace(/,\s+/g,',').replace(/\"/g,'').toLowerCase();};function Q(T){var U={};T.replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(V,W,X){U[W]=X;});return U;};function R(T,U){typeof T=='string'&&(T=Q(T));typeof U=='string'&&(U=Q(U));for(var V in T){if(!(V in U&&(U[V]==T[V]||T[V]=='inherit'||U[V]=='inherit')))return false;}return true;};function S(T,U){var V=T.getSelection(),W=V.createBookmarks(1),X=V.getRanges(),Y=U?this.removeFromRange:this.applyToRange,Z,aa=X.createIterator();while(Z=aa.getNextRange())Y.call(this,Z);if(W.length==1&&W[0].collapsed){V.selectRanges(X);T.getById(W[0].startNode).remove();}else V.selectBookmarks(W);T.removeCustomData('doc_processing_style');};})();a.styleCommand=function(m){this.style=m;};a.styleCommand.prototype.exec=function(m){var o=this;m.focus();var n=m.document;if(n)if(o.state==2)o.style.apply(n);else if(o.state==1)o.style.remove(n);return!!n;};a.stylesSet=new a.resourceManager('','stylesSet');a.addStylesSet=e.bind(a.stylesSet.add,a.stylesSet);a.loadStylesSet=function(m,n,o){a.stylesSet.addExternal(m,n,'');a.stylesSet.load(m,o);};a.editor.prototype.getStylesSet=function(m){if(!this._.stylesDefinitions){var n=this,o=n.config.stylesCombo_stylesSet||n.config.stylesSet||'default';if(o instanceof Array){n._.stylesDefinitions=o;m(o);return;}var p=o.split(':'),q=p[0],r=p[1],s=j.registered.styles.path;a.stylesSet.addExternal(q,r?p.slice(1).join(':'):s+'styles/'+q+'.js','');a.stylesSet.load(q,function(t){n._.stylesDefinitions=t[q];m(n._.stylesDefinitions);});}else m(this._.stylesDefinitions);};j.add('domiterator');(function(){function m(s){var t=this;if(arguments.length<1)return;t.range=s;t.forceBrBreak=0;t.enlargeBr=1;t.enforceRealBlocks=0;t._||(t._={});};var n=/^[\r\n\t ]+$/,o=d.walker.bookmark(false,true),p=d.walker.whitespaces(true),q=function(s){return o(s)&&p(s);};function r(s,t,u){var v=s.getNextSourceNode(t,null,u);while(!o(v))v=v.getNextSourceNode(t,null,u);return v;};m.prototype={getNextParagraph:function(s){var S=this;var t,u,v,w,x,y;if(!S._.lastNode){u=S.range.clone();u.shrink(1,true);w=u.endContainer.hasAscendant('pre',true)||u.startContainer.hasAscendant('pre',true);u.enlarge(S.forceBrBreak&&!w||!S.enlargeBr?3:2);var z=new d.walker(u),A=d.walker.bookmark(true,true);
+z.evaluator=A;S._.nextNode=z.next();z=new d.walker(u);z.evaluator=A;var B=z.previous();S._.lastNode=B.getNextSourceNode(true);if(S._.lastNode&&S._.lastNode.type==3&&!e.trim(S._.lastNode.getText())&&S._.lastNode.getParent().isBlockBoundary()){var C=new d.range(u.document);C.moveToPosition(S._.lastNode,4);if(C.checkEndOfBlock()){var D=new d.elementPath(C.endContainer),E=D.block||D.blockLimit;S._.lastNode=E.getNextSourceNode(true);}}if(!S._.lastNode){S._.lastNode=S._.docEndMarker=u.document.createText('');S._.lastNode.insertAfter(B);}u=null;}var F=S._.nextNode;B=S._.lastNode;S._.nextNode=null;while(F){var G=0,H=F.hasAscendant('pre'),I=F.type!=1,J=0;if(!I){var K=F.getName();if(F.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){if(K=='br')I=1;else if(!u&&!F.getChildCount()&&K!='hr'){t=F;v=F.equals(B);break;}if(u){u.setEndAt(F,3);if(K!='br')S._.nextNode=F;}G=1;}else{if(F.getFirst()){if(!u){u=new d.range(S.range.document);u.setStartAt(F,3);}F=F.getFirst();continue;}I=1;}}else if(F.type==3)if(n.test(F.getText()))I=0;if(I&&!u){u=new d.range(S.range.document);u.setStartAt(F,3);}v=(!G||I)&&F.equals(B);if(u&&!G)while(!F.getNext(q)&&!v){var L=F.getParent();if(L.isBlockBoundary(S.forceBrBreak&&!H&&{br:1})){G=1;I=0;v=v||L.equals(B);u.setEndAt(L,2);break;}F=L;I=1;v=F.equals(B);J=1;}if(I)u.setEndAt(F,4);F=r(F,J,B);v=!F;if(v||G&&u)break;}if(!t){if(!u){S._.docEndMarker&&S._.docEndMarker.remove();S._.nextNode=null;return null;}var M=new d.elementPath(u.startContainer),N=M.blockLimit,O={div:1,th:1,td:1};t=M.block;if(!t&&!S.enforceRealBlocks&&O[N.getName()]&&u.checkStartOfBlock()&&u.checkEndOfBlock())t=N;else if(!t||S.enforceRealBlocks&&t.getName()=='li'){t=S.range.document.createElement(s||'p');u.extractContents().appendTo(t);t.trim();u.insertNode(t);x=y=true;}else if(t.getName()!='li'){if(!u.checkStartOfBlock()||!u.checkEndOfBlock()){t=t.clone(false);u.extractContents().appendTo(t);t.trim();var P=u.splitBlock();x=!P.wasStartOfBlock;y=!P.wasEndOfBlock;u.insertNode(t);}}else if(!v)S._.nextNode=t.equals(B)?null:r(u.getBoundaryNodes().endNode,1,B);}if(x){var Q=t.getPrevious();if(Q&&Q.type==1)if(Q.getName()=='br')Q.remove();else if(Q.getLast()&&Q.getLast().$.nodeName.toLowerCase()=='br')Q.getLast().remove();}if(y){var R=t.getLast();if(R&&R.type==1&&R.getName()=='br')if(c||R.getPrevious(o)||R.getNext(o))R.remove();}if(!S._.nextNode)S._.nextNode=v||t.equals(B)?null:r(t,1,B);return t;}};d.range.prototype.createIterator=function(){return new m(this);};})();j.add('panelbutton',{requires:['button'],onLoad:function(){function m(n){var p=this;
+var o=p._;if(o.state==0)return;p.createPanel(n);if(o.on){o.panel.hide();return;}o.panel.showBlock(p._.id,p.document.getById(p._.id),4);};k.panelButton=e.createClass({base:k.button,$:function(n){var p=this;var o=n.panel;delete n.panel;p.base(n);p.document=o&&o.parent&&o.parent.getDocument()||a.document;o.block={attributes:o.attributes};p.hasArrow=true;p.click=m;p._={panelDefinition:o};},statics:{handler:{create:function(n){return new k.panelButton(n);}}},proto:{createPanel:function(n){var o=this._;if(o.panel)return;var p=this._.panelDefinition||{},q=this._.panelDefinition.block,r=p.parent||a.document.getBody(),s=this._.panel=new k.floatPanel(n,r,p),t=s.addBlock(o.id,q),u=this;s.onShow=function(){if(u.className)this.element.getFirst().addClass(u.className+'_panel');u.setState(1);o.on=1;if(u.onOpen)u.onOpen();};s.onHide=function(v){if(u.className)this.element.getFirst().removeClass(u.className+'_panel');u.setState(u.modes&&u.modes[n.mode]?2:0);o.on=0;if(!v&&u.onClose)u.onClose();};s.onEscape=function(){s.hide();u.document.getById(o.id).focus();};if(this.onBlock)this.onBlock(s,t);t.onHide=function(){o.on=0;u.setState(2);};}}});},beforeInit:function(m){m.ui.addHandler(4,k.panelButton.handler);}});a.UI_PANELBUTTON='panelbutton';j.add('floatpanel',{requires:['panel']});(function(){var m={},n=false;function o(p,q,r,s,t){var u=e.genKey(q.getUniqueId(),r.getUniqueId(),p.skinName,p.lang.dir,p.uiColor||'',s.css||'',t||''),v=m[u];if(!v){v=m[u]=new k.panel(q,s);v.element=r.append(h.createFromHtml(v.renderHtml(p),q));v.element.setStyles({display:'none',position:'absolute'});}return v;};k.floatPanel=e.createClass({$:function(p,q,r,s){r.forceIFrame=1;var t=q.getDocument(),u=o(p,t,q,r,s||0),v=u.element,w=v.getFirst().getFirst();this.element=v;this._={editor:p,panel:u,parentElement:q,definition:r,document:t,iframe:w,children:[],dir:p.lang.dir};p.on('mode',function(){this.hide();},this);},proto:{addBlock:function(p,q){return this._.panel.addBlock(p,q);},addListBlock:function(p,q){return this._.panel.addListBlock(p,q);},getBlock:function(p){return this._.panel.getBlock(p);},showBlock:function(p,q,r,s,t){var u=this._.panel,v=u.showBlock(p);this.allowBlur(false);n=1;this._.returnFocus=this._.editor.focusManager.hasFocus?this._.editor:new h(a.document.$.activeElement);var w=this.element,x=this._.iframe,y=this._.definition,z=q.getDocumentPosition(w.getDocument()),A=this._.dir=='rtl',B=z.x+(s||0),C=z.y+(t||0);if(A&&(r==1||r==4))B+=q.$.offsetWidth;else if(!A&&(r==2||r==3))B+=q.$.offsetWidth-1;
+if(r==3||r==4)C+=q.$.offsetHeight-1;this._.panel._.offsetParentId=q.getId();w.setStyles({top:C+'px',left:0,display:''});w.setOpacity(0);w.getFirst().removeStyle('width');if(!this._.blurSet){var D=c?x:new d.window(x.$.contentWindow);a.event.useCapture=true;D.on('blur',function(E){var G=this;if(!G.allowBlur())return;var F=E.data.getTarget();if(F.getName&&F.getName()!='iframe')return;if(G.visible&&!G._.activeChild&&!n){delete G._.returnFocus;G.hide();}},this);D.on('focus',function(){this._.focused=true;this.hideChild();this.allowBlur(true);},this);a.event.useCapture=false;this._.blurSet=1;}u.onEscape=e.bind(function(E){if(this.onEscape&&this.onEscape(E)===false)return false;},this);e.setTimeout(function(){if(A)B-=w.$.offsetWidth;var E=e.bind(function(){var F=w.getFirst();if(v.autoSize){var G=v.element.$;if(b.gecko||b.opera)G=G.parentNode;if(c)G=G.document.body;var H=G.scrollWidth;if(c&&b.quirks&&H>0)H+=(F.$.offsetWidth||0)-(F.$.clientWidth||0)+3;H+=4;F.setStyle('width',H+'px');v.element.addClass('cke_frameLoaded');var I=v.element.$.scrollHeight;if(c&&b.quirks&&I>0)I+=(F.$.offsetHeight||0)-(F.$.clientHeight||0)+3;F.setStyle('height',I+'px');u._.currentBlock.element.setStyle('display','none').removeStyle('display');}else F.removeStyle('height');var J=u.element,K=J.getWindow(),L=K.getScrollPosition(),M=K.getViewPaneSize(),N={height:J.$.offsetHeight,width:J.$.offsetWidth};if(A?B<0:B+N.width>M.width+L.x)B+=N.width*(A?1:-1);if(C+N.height>M.height+L.y)C-=N.height;if(c){var O=new h(w.$.offsetParent),P=O;if(P.getName()=='html')P=P.getDocument().getBody();if(P.getComputedStyle('direction')=='rtl')if(b.ie8Compat)B-=w.getDocument().getDocumentElement().$.scrollLeft*2;else B-=O.$.scrollWidth-O.$.clientWidth;}var Q=w.getFirst(),R;if(R=Q.getCustomData('activePanel'))R.onHide&&R.onHide.call(this,1);Q.setCustomData('activePanel',this);w.setStyles({top:C+'px',left:B+'px'});w.setOpacity(1);},this);u.isLoaded?E():u.onLoad=E;e.setTimeout(function(){x.$.contentWindow.focus();this.allowBlur(true);},0,this);},b.air?200:0,this);this.visible=1;if(this.onShow)this.onShow.call(this);n=0;},hide:function(p){var r=this;if(r.visible&&(!r.onHide||r.onHide.call(r)!==true)){r.hideChild();b.gecko&&r._.iframe.getFrameDocument().$.activeElement.blur();r.element.setStyle('display','none');r.visible=0;r.element.getFirst().removeCustomData('activePanel');var q=p!==false&&r._.returnFocus;if(q){if(b.webkit&&q.type)q.getWindow().$.focus();q.focus();}}},allowBlur:function(p){var q=this._.panel;if(p!=undefined)q.allowBlur=p;
+return q.allowBlur;},showAsChild:function(p,q,r,s,t,u){if(this._.activeChild==p&&p._.panel._.offsetParentId==r.getId())return;this.hideChild();p.onHide=e.bind(function(){e.setTimeout(function(){if(!this._.focused)this.hide();},0,this);},this);this._.activeChild=p;this._.focused=false;p.showBlock(q,r,s,t,u);if(b.ie7Compat||b.ie8&&b.ie6Compat)setTimeout(function(){p.element.getChild(0).$.style.cssText+='';},100);},hideChild:function(){var p=this._.activeChild;if(p){delete p.onHide;delete p._.returnFocus;delete this._.activeChild;p.hide();}}}});a.on('instanceDestroyed',function(){var p=e.isEmpty(a.instances);for(var q in m){var r=m[q];if(p)r.destroy();else r.element.hide();}p&&(m={});});})();j.add('menu',{beforeInit:function(m){var n=m.config.menu_groups.split(','),o=m._.menuGroups={},p=m._.menuItems={};for(var q=0;q<n.length;q++)o[n[q]]=q+1;m.addMenuGroup=function(r,s){o[r]=s||100;};m.addMenuItem=function(r,s){if(o[s.group])p[r]=new a.menuItem(this,r,s);};m.addMenuItems=function(r){for(var s in r)this.addMenuItem(s,r[s]);};m.getMenuItem=function(r){return p[r];};m.removeMenuItem=function(r){delete p[r];};},requires:['floatpanel']});(function(){a.menu=e.createClass({$:function(n,o){var r=this;o=r._.definition=o||{};r.id=e.getNextId();r.editor=n;r.items=[];r._.listeners=[];r._.level=o.level||1;var p=e.extend({},o.panel,{css:n.skin.editor.css,level:r._.level-1,block:{}}),q=p.block.attributes=p.attributes||{};!q.role&&(q.role='menu');r._.panelDefinition=p;},_:{onShow:function(){var v=this;var n=v.editor.getSelection();if(c)n&&n.lock();var o=n&&n.getStartElement(),p=v._.listeners,q=[];v.removeAll();for(var r=0;r<p.length;r++){var s=p[r](o,n);if(s)for(var t in s){var u=v.editor.getMenuItem(t);if(u&&(!u.command||v.editor.getCommand(u.command).state)){u.state=s[t];v.add(u);}}}},onClick:function(n){this.hide(false);if(n.onClick)n.onClick();else if(n.command)this.editor.execCommand(n.command);},onEscape:function(n){var o=this.parent;if(o){o._.panel.hideChild();var p=o._.panel._.panel._.currentBlock,q=p._.focusIndex;p._.markItem(q);}else if(n==27)this.hide();return false;},onHide:function(){if(c){var n=this.editor.getSelection();n&&n.unlock();}this.onHide&&this.onHide();},showSubMenu:function(n){var v=this;var o=v._.subMenu,p=v.items[n],q=p.getItems&&p.getItems();if(!q){v._.panel.hideChild();return;}var r=v._.panel.getBlock(v.id);r._.focusIndex=n;if(o)o.removeAll();else{o=v._.subMenu=new a.menu(v.editor,e.extend({},v._.definition,{level:v._.level+1},true));o.parent=v;o._.onClick=e.bind(v._.onClick,v);
+}for(var s in q){var t=v.editor.getMenuItem(s);if(t){t.state=q[s];o.add(t);}}var u=v._.panel.getBlock(v.id).element.getDocument().getById(v.id+String(n));o.show(u,2);}},proto:{add:function(n){if(!n.order)n.order=this.items.length;this.items.push(n);},removeAll:function(){this.items=[];},show:function(n,o,p,q){if(!this.parent){this._.onShow();if(!this.items.length)return;}o=o||(this.editor.lang.dir=='rtl'?2:1);var r=this.items,s=this.editor,t=this._.panel,u=this._.element;if(!t){t=this._.panel=new k.floatPanel(this.editor,a.document.getBody(),this._.panelDefinition,this._.level);t.onEscape=e.bind(function(F){if(this._.onEscape(F)===false)return false;},this);t.onHide=e.bind(function(){this._.onHide&&this._.onHide();},this);var v=t.addBlock(this.id,this._.panelDefinition.block);v.autoSize=true;var w=v.keys;w[40]='next';w[9]='next';w[38]='prev';w[2000+9]='prev';w[s.lang.dir=='rtl'?37:39]=c?'mouseup':'click';w[32]=c?'mouseup':'click';c&&(w[13]='mouseup');u=this._.element=v.element;u.addClass(s.skinClass);var x=u.getDocument();x.getBody().setStyle('overflow','hidden');x.getElementsByTag('html').getItem(0).setStyle('overflow','hidden');this._.itemOverFn=e.addFunction(function(F){var G=this;clearTimeout(G._.showSubTimeout);G._.showSubTimeout=e.setTimeout(G._.showSubMenu,s.config.menu_subMenuDelay||400,G,[F]);},this);this._.itemOutFn=e.addFunction(function(F){clearTimeout(this._.showSubTimeout);},this);this._.itemClickFn=e.addFunction(function(F){var H=this;var G=H.items[F];if(G.state==0){H.hide();return;}if(G.getItems)H._.showSubMenu(F);else H._.onClick(G);},this);}m(r);var y=s.container.getChild(1),z=y.hasClass('cke_mixed_dir_content')?' cke_mixed_dir_content':'',A=['<div class="cke_menu'+z+'" role="presentation">'],B=r.length,C=B&&r[0].group;for(var D=0;D<B;D++){var E=r[D];if(C!=E.group){A.push('<div class="cke_menuseparator" role="separator"></div>');C=E.group;}E.render(this,D,A);}A.push('</div>');u.setHtml(A.join(''));k.fire('ready',this);if(this.parent)this.parent._.panel.showAsChild(t,this.id,n,o,p,q);else t.showBlock(this.id,n,o,p,q);s.fire('menuShow',[t]);},addListener:function(n){this._.listeners.push(n);},hide:function(n){var o=this;o._.onHide&&o._.onHide();o._.panel&&o._.panel.hide(n);}}});function m(n){n.sort(function(o,p){if(o.group<p.group)return-1;else if(o.group>p.group)return 1;return o.order<p.order?-1:o.order>p.order?1:0;});};a.menuItem=e.createClass({$:function(n,o,p){var q=this;e.extend(q,p,{order:0,className:'cke_button_'+o});q.group=n._.menuGroups[q.group];
+q.editor=n;q.name=o;},proto:{render:function(n,o,p){var w=this;var q=n.id+String(o),r=typeof w.state=='undefined'?2:w.state,s=' cke_'+(r==1?'on':r==0?'disabled':'off'),t=w.label;if(w.className)s+=' '+w.className;var u=w.getItems;p.push('<span class="cke_menuitem'+(w.icon&&w.icon.indexOf('.png')==-1?' cke_noalphafix':'')+'">'+'<a id="',q,'" class="',s,'" href="javascript:void(\'',(w.label||'').replace("'",''),'\')" title="',w.label,'" tabindex="-1"_cke_focus=1 hidefocus="true" role="menuitem"'+(u?'aria-haspopup="true"':'')+(r==0?'aria-disabled="true"':'')+(r==1?'aria-pressed="true"':''));if(b.opera||b.gecko&&b.mac)p.push(' onkeypress="return false;"');if(b.gecko)p.push(' onblur="this.style.cssText = this.style.cssText;"');var v=(w.iconOffset||0)*-16;p.push(' onmouseover="CKEDITOR.tools.callFunction(',n._.itemOverFn,',',o,');" onmouseout="CKEDITOR.tools.callFunction(',n._.itemOutFn,',',o,');" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',n._.itemClickFn,',',o,'); return false;"><span class="cke_icon_wrapper"><span class="cke_icon"'+(w.icon?' style="background-image:url('+a.getUrl(w.icon)+');background-position:0 '+v+'px;"':'')+'></span></span>'+'<span class="cke_label">');if(u)p.push('<span class="cke_menuarrow">','<span>&#',w.editor.lang.dir=='rtl'?'9668':'9658',';</span>','</span>');p.push(t,'</span></a></span>');}}});})();i.menu_groups='clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div';(function(){var m;j.add('editingblock',{init:function(n){if(!n.config.editingBlock)return;n.on('themeSpace',function(o){if(o.data.space=='contents')o.data.html+='<br>';});n.on('themeLoaded',function(){n.fireOnce('editingBlockReady');});n.on('uiReady',function(){n.setMode(n.config.startupMode);});n.on('afterSetData',function(){if(!m){function o(){m=true;n.getMode().loadData(n.getData());m=false;};if(n.mode)o();else n.on('mode',function(){if(n.mode){o();n.removeListener('mode',arguments.callee);}});}});n.on('beforeGetData',function(){if(!m&&n.mode){m=true;n.setData(n.getMode().getData(),null,1);m=false;}});n.on('getSnapshot',function(o){if(n.mode)o.data=n.getMode().getSnapshotData();});n.on('loadSnapshot',function(o){if(n.mode)n.getMode().loadSnapshotData(o.data);});n.on('mode',function(o){o.removeListener();b.webkit&&n.container.on('focus',function(){n.focus();});if(n.config.startupFocus)n.focus();setTimeout(function(){n.fireOnce('instanceReady');
+a.fire('instanceReady',null,n);},0);});n.on('destroy',function(){var o=this;if(o.mode)o._.modes[o.mode].unload(o.getThemeSpace('contents'));});}});a.editor.prototype.mode='';a.editor.prototype.addMode=function(n,o){o.name=n;(this._.modes||(this._.modes={}))[n]=o;};a.editor.prototype.setMode=function(n){this.fire('beforeSetMode',{newMode:n});var o,p=this.getThemeSpace('contents'),q=this.checkDirty();if(this.mode){if(n==this.mode)return;this._.previousMode=this.mode;this.fire('beforeModeUnload');var r=this.getMode();o=r.getData();r.unload(p);this.mode='';}p.setHtml('');var s=this.getMode(n);if(!s)throw '[CKEDITOR.editor.setMode] Unknown mode "'+n+'".';if(!q)this.on('mode',function(){this.resetDirty();this.removeListener('mode',arguments.callee);});s.load(p,typeof o!='string'?this.getData():o);};a.editor.prototype.getMode=function(n){return this._.modes&&this._.modes[n||this.mode];};a.editor.prototype.focus=function(){this.forceNextSelectionCheck();var n=this.getMode();if(n)n.focus();};})();i.startupMode='wysiwyg';i.editingBlock=true;(function(){function m(){var B=this;try{var y=B.getSelection();if(!y||!y.document.getWindow().$)return;var z=y.getStartElement(),A=new d.elementPath(z);if(!A.compare(B._.selectionPreviousPath)){B._.selectionPreviousPath=A;B.fire('selectionChange',{selection:y,path:A,element:z});}}catch(C){}};var n,o;function p(){o=true;if(n)return;q.call(this);n=e.setTimeout(q,200,this);};function q(){n=null;if(o){e.setTimeout(m,0,this);o=false;}};function r(y){function z(D){return D&&D.type==1&&D.getName() in f.$removeEmpty;};function A(D){var E=y.document.getBody();return!D.is('body')&&E.getChildCount()==1;};var B=y.startContainer,C=y.startOffset;if(B.type==3)return false;return!e.trim(B.getHtml())?z(B)||A(B):z(B.getChild(C-1))||z(B.getChild(C));};var s={modes:{wysiwyg:1,source:1},readOnly:c||b.webkit,exec:function(y){switch(y.mode){case 'wysiwyg':y.document.$.execCommand('SelectAll',false,null);y.forceNextSelectionCheck();y.selectionChange();break;case 'source':var z=y.textarea.$;if(c)z.createTextRange().execCommand('SelectAll');else{z.selectionStart=0;z.selectionEnd=z.value.length;}z.focus();}},canUndo:false};function t(y){w(y);var z=y.createText('​');y.setCustomData('cke-fillingChar',z);return z;};function u(y){return y&&y.getCustomData('cke-fillingChar');};function v(y){var z=y&&u(y);if(z)if(z.getCustomData('ready'))w(y);else z.setCustomData('ready',1);};function w(y){var z=y&&y.removeCustomData('cke-fillingChar');if(z){z.setText(z.getText().replace(/\u200B/g,''));
+z=0;}};j.add('selection',{init:function(y){if(b.webkit){y.on('selectionChange',function(){v(y.document);});y.on('beforeSetMode',function(){w(y.document);});y.on('key',function(D){switch(D.data.keyCode){case 13:case 2000+13:case 37:case 39:case 8:w(y.document);}},null,null,10);var z,A;function B(){var D=y.document,E=u(D);if(E){var F=D.$.defaultView.getSelection();if(F.type=='Caret'&&F.anchorNode==E.$)A=1;z=E.getText();E.setText(z.replace(/\u200B/g,''));}};function C(){var D=y.document,E=u(D);if(E){E.setText(z);if(A){D.$.defaultView.getSelection().setPosition(E.$,E.getLength());A=0;}}};y.on('beforeUndoImage',B);y.on('afterUndoImage',C);y.on('beforeGetData',B,null,null,0);y.on('getData',C);}y.on('contentDom',function(){var D=y.document,E=D.getBody(),F=D.getDocumentElement();if(c){var G,H,I=1;E.on('focusin',function(M){if(M.data.$.srcElement.nodeName!='BODY')return;if(G){if(I){try{G.select();}catch(O){}var N=D.getCustomData('cke_locked_selection');if(N){N.unlock();N.lock();}}G=null;}});E.on('focus',function(){H=1;L();});E.on('beforedeactivate',function(M){if(M.data.$.toElement)return;H=0;I=1;});if(c&&b.version<8)y.on('blur',function(M){try{y.document&&y.document.$.selection.empty();}catch(N){}});F.on('mousedown',function(){I=0;});F.on('mouseup',function(){I=1;});if(c&&(b.ie7Compat||b.version<8||b.quirks))F.on('click',function(M){if(M.data.getTarget().getName()=='html')y.getSelection().getRanges()[0].select();});var J;E.on('mousedown',function(M){if(M.data.$.button==2){var N=y.document.$.selection;if(N.type=='None')J=y.window.getScrollPosition();}K();});E.on('mouseup',function(M){if(M.data.$.button==2&&J){y.document.$.documentElement.scrollLeft=J.x;y.document.$.documentElement.scrollTop=J.y;}J=null;H=1;setTimeout(function(){L(true);},0);});E.on('keydown',K);E.on('keyup',function(){H=1;L();});D.on('selectionchange',L);function K(){H=0;};function L(M){if(H){var N=y.document,O=y.getSelection(),P=O&&O.getNative();if(M&&P&&P.type=='None')if(!N.$.queryCommandEnabled('InsertImage')){e.setTimeout(L,50,this,true);return;}var Q;if(P&&P.type&&P.type!='Control'&&(Q=P.createRange())&&(Q=Q.parentElement())&&(Q=Q.nodeName)&&Q.toLowerCase() in {input:1,textarea:1})return;G=P&&O.getRanges()[0];p.call(y);}};}else{D.on('mouseup',p,y);D.on('keyup',p,y);D.on('selectionchange',p,y);}});y.on('contentDomUnload',y.forceNextSelectionCheck,y);y.addCommand('selectAll',s);y.ui.addButton('SelectAll',{label:y.lang.selectAll,command:'selectAll'});y.selectionChange=p;b.ie9Compat&&y.on('destroy',function(){var D=y.getSelection();
+D&&D.getNative().clear();},null,null,9);}});a.editor.prototype.getSelection=function(){return this.document&&this.document.getSelection();};a.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath;};g.prototype.getSelection=function(){var y=new d.selection(this);return!y||y.isInvalid?null:y;};a.SELECTION_NONE=1;a.SELECTION_TEXT=2;a.SELECTION_ELEMENT=3;d.selection=function(y){var B=this;var z=y.getCustomData('cke_locked_selection');if(z)return z;B.document=y;B.isLocked=0;B._={cache:{}};if(c){var A=B.getNative().createRange();if(!A||A.item&&A.item(0).ownerDocument!=B.document.$||A.parentElement&&A.parentElement().ownerDocument!=B.document.$)B.isInvalid=true;}return B;};var x={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};d.selection.prototype={getNative:c?function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.$.selection);}:function(){return this._.cache.nativeSel||(this._.cache.nativeSel=this.document.getWindow().$.getSelection());},getType:c?function(){var y=this._.cache;if(y.type)return y.type;var z=1;try{var A=this.getNative(),B=A.type;if(B=='Text')z=2;if(B=='Control')z=3;if(A.createRange().parentElement)z=2;}catch(C){}return y.type=z;}:function(){var y=this._.cache;if(y.type)return y.type;var z=2,A=this.getNative();if(!A)z=1;else if(A.rangeCount==1){var B=A.getRangeAt(0),C=B.startContainer;if(C==B.endContainer&&C.nodeType==1&&B.endOffset-B.startOffset==1&&x[C.childNodes[B.startOffset].nodeName.toLowerCase()])z=3;}return y.type=z;},getRanges:(function(){var y=c?(function(){function z(B){return new d.node(B).getIndex();};var A=function(B,C){B=B.duplicate();B.collapse(C);var D=B.parentElement(),E=D.ownerDocument;if(!D.hasChildNodes())return{container:D,offset:0};var F=D.children,G,H,I=B.duplicate(),J=0,K=F.length-1,L=-1,M,N;while(J<=K){L=Math.floor((J+K)/2);G=F[L];I.moveToElementText(G);M=I.compareEndPoints('StartToStart',B);if(M>0)K=L-1;else if(M<0)J=L+1;else if(b.ie9Compat&&G.tagName=='BR'){var O='cke_range_marker';B.execCommand('CreateBookmark',false,O);G=E.getElementsByName(O)[0];var P=z(G);D.removeChild(G);return{container:D,offset:P};}else return{container:D,offset:z(G)};}if(L==-1||L==F.length-1&&M<0){I.moveToElementText(D);I.setEndPoint('StartToStart',B);N=I.text.replace(/(\r\n|\r)/g,'\n').length;F=D.childNodes;if(!N){G=F[F.length-1];if(G.nodeType==1)return{container:D,offset:F.length};else return{container:G,offset:G.nodeValue.length};
+}var Q=F.length;while(N>0)N-=F[--Q].nodeValue.length;return{container:F[Q],offset:-N};}else{I.collapse(M>0?true:false);I.setEndPoint(M>0?'StartToStart':'EndToStart',B);N=I.text.replace(/(\r\n|\r)/g,'\n').length;if(!N)return{container:D,offset:z(G)+(M>0?0:1)};while(N>0)try{H=G[M>0?'previousSibling':'nextSibling'];N-=H.nodeValue.length;G=H;}catch(R){return{container:D,offset:z(G)};}return{container:G,offset:M>0?-N:G.nodeValue.length+N};}};return function(){var L=this;var B=L.getNative(),C=B&&B.createRange(),D=L.getType(),E;if(!B)return[];if(D==2){E=new d.range(L.document);var F=A(C,true);E.setStart(new d.node(F.container),F.offset);F=A(C);E.setEnd(new d.node(F.container),F.offset);if(E.endContainer.getPosition(E.startContainer)&4&&E.endOffset<=E.startContainer.getIndex())E.collapse();return[E];}else if(D==3){var G=[];for(var H=0;H<C.length;H++){var I=C.item(H),J=I.parentNode,K=0;E=new d.range(L.document);for(;K<J.childNodes.length&&J.childNodes[K]!=I;K++){}E.setStart(new d.node(J),K);E.setEnd(new d.node(J),K+1);G.push(E);}return G;}return[];};})():function(){var z=[],A,B=this.document,C=this.getNative();if(!C)return z;if(!C.rangeCount){A=new d.range(B);A.moveToElementEditStart(B.getBody());z.push(A);}for(var D=0;D<C.rangeCount;D++){var E=C.getRangeAt(D);A=new d.range(B);A.setStart(new d.node(E.startContainer),E.startOffset);A.setEnd(new d.node(E.endContainer),E.endOffset);z.push(A);}return z;};return function(z){var A=this._.cache;if(A.ranges&&!z)return A.ranges;else if(!A.ranges)A.ranges=new d.rangeList(y.call(this));if(z){var B=A.ranges;for(var C=0;C<B.length;C++){var D=B[C],E=D.getCommonAncestor();if(E.isReadOnly())B.splice(C,1);if(D.collapsed)continue;if(D.startContainer.isReadOnly()){var F=D.startContainer;while(F){if(F.is('body')||!F.isReadOnly())break;if(F.type==1&&F.getAttribute('contentEditable')=='false')D.setStartAfter(F);F=F.getParent();}}var G=D.startContainer,H=D.endContainer,I=D.startOffset,J=D.endOffset,K=D.clone();if(G&&G.type==3)if(I>=G.getLength())K.setStartAfter(G);else K.setStartBefore(G);if(H&&H.type==3)if(!J)K.setEndBefore(H);else K.setEndAfter(H);var L=new d.walker(K);L.evaluator=function(M){if(M.type==1&&M.isReadOnly()){var N=D.clone();D.setEndBefore(M);if(D.collapsed)B.splice(C--,1);if(!(M.getPosition(K.endContainer)&16)){N.setStartAfter(M);if(!N.collapsed)B.splice(C+1,0,N);}return true;}return false;};L.next();}}return A.ranges;};})(),getStartElement:function(){var F=this;var y=F._.cache;if(y.startElement!==undefined)return y.startElement;
+var z,A=F.getNative();switch(F.getType()){case 3:return F.getSelectedElement();case 2:var B=F.getRanges()[0];if(B){if(!B.collapsed){B.optimize();while(1){var C=B.startContainer,D=B.startOffset;if(D==(C.getChildCount?C.getChildCount():C.getLength())&&!C.isBlockBoundary())B.setStartAfter(C);else break;}z=B.startContainer;if(z.type!=1)return z.getParent();z=z.getChild(B.startOffset);if(!z||z.type!=1)z=B.startContainer;else{var E=z.getFirst();while(E&&E.type==1){z=E;E=E.getFirst();}}}else{z=B.startContainer;if(z.type!=1)z=z.getParent();}z=z.$;}}return y.startElement=z?new h(z):null;},getSelectedElement:function(){var y=this._.cache;if(y.selectedElement!==undefined)return y.selectedElement;var z=this,A=e.tryThese(function(){return z.getNative().createRange().item(0);},function(){var B,C,D=z.getRanges()[0],E=D.getCommonAncestor(1,1),F={table:1,ul:1,ol:1,dl:1};for(var G in F){if(B=E.getAscendant(G,1))break;}if(B){var H=new d.range(this.document);H.setStartAt(B,1);H.setEnd(D.startContainer,D.startOffset);var I=e.extend(F,f.$listItem,f.$tableContent),J=new d.walker(H),K=function(L,M){return function(N,O){if(N.type==3&&(!e.trim(N.getText())||N.getParent().data('cke-bookmark')))return true;var P;if(N.type==1){P=N.getName();if(P=='br'&&M&&N.equals(N.getParent().getBogus()))return true;if(O&&P in I||P in f.$removeEmpty)return true;}L.halted=1;return false;};};J.guard=K(J);if(J.checkBackward()&&!J.halted){J=new d.walker(H);H.setStart(D.endContainer,D.endOffset);H.setEndAt(B,2);J.guard=K(J,1);if(J.checkForward()&&!J.halted)C=B.$;}}if(!C)throw 0;return C;},function(){var B=z.getRanges()[0],C,D;for(var E=2;E&&!((C=B.getEnclosedNode())&&C.type==1&&x[C.getName()]&&(D=C));E--)B.shrink(1);return D.$;});return y.selectedElement=A?new h(A):null;},getSelectedText:function(){var y=this._.cache;if(y.selectedText!==undefined)return y.selectedText;var z='',A=this.getNative();if(this.getType()==2)z=c?A.createRange().text:A.toString();return y.selectedText=z;},lock:function(){var y=this;y.getRanges();y.getStartElement();y.getSelectedElement();y.getSelectedText();y._.cache.nativeSel={};y.isLocked=1;y.document.setCustomData('cke_locked_selection',y);},unlock:function(y){var D=this;var z=D.document,A=z.getCustomData('cke_locked_selection');if(A){z.setCustomData('cke_locked_selection',null);if(y){var B=A.getSelectedElement(),C=!B&&A.getRanges();D.isLocked=0;D.reset();z.getBody().focus();if(B)D.selectElement(B);else D.selectRanges(C);}}if(!A||!y){D.isLocked=0;D.reset();}},reset:function(){this._.cache={};
+},selectElement:function(y){var A=this;if(A.isLocked){var z=new d.range(A.document);z.setStartBefore(y);z.setEndAfter(y);A._.cache.selectedElement=y;A._.cache.startElement=y;A._.cache.ranges=new d.rangeList(z);A._.cache.type=3;return;}z=new d.range(y.getDocument());z.setStartBefore(y);z.setEndAfter(y);z.select();A.document.fire('selectionchange');A.reset();},selectRanges:function(y){var M=this;if(M.isLocked){M._.cache.selectedElement=null;M._.cache.startElement=y[0]&&y[0].getTouchedStartNode();M._.cache.ranges=new d.rangeList(y);M._.cache.type=2;return;}if(c){if(y.length>1){var z=y[y.length-1];y[0].setEnd(z.endContainer,z.endOffset);y.length=1;}if(y[0])y[0].select();M.reset();}else{var A=M.getNative();if(!A)return;if(y.length){A.removeAllRanges();b.webkit&&w(M.document);}for(var B=0;B<y.length;B++){if(B<y.length-1){var C=y[B],D=y[B+1],E=C.clone();E.setStart(C.endContainer,C.endOffset);E.setEnd(D.startContainer,D.startOffset);if(!E.collapsed){E.shrink(1,true);var F=E.getCommonAncestor(),G=E.getEnclosedNode();if(F.isReadOnly()||G&&G.isReadOnly()){D.setStart(C.startContainer,C.startOffset);y.splice(B--,1);continue;}}}var H=y[B],I=M.document.$.createRange(),J=H.startContainer;if(H.collapsed&&(b.opera||b.gecko&&b.version<10900)&&J.type==1&&!J.getChildCount())J.appendText('');if(H.collapsed&&b.webkit&&r(H)){var K=t(M.document);H.insertNode(K);var L=K.getNext();if(L&&!K.getPrevious()&&L.type==1&&L.getName()=='br'){w(M.document);H.moveToPosition(L,3);}else H.moveToPosition(K,4);}I.setStart(H.startContainer.$,H.startOffset);try{I.setEnd(H.endContainer.$,H.endOffset);}catch(N){if(N.toString().indexOf('NS_ERROR_ILLEGAL_VALUE')>=0){H.collapse(1);I.setEnd(H.endContainer.$,H.endOffset);}else throw N;}A.addRange(I);}M.document.fire('selectionchange');M.reset();}},createBookmarks:function(y){return this.getRanges().createBookmarks(y);},createBookmarks2:function(y){return this.getRanges().createBookmarks2(y);},selectBookmarks:function(y){var z=[];for(var A=0;A<y.length;A++){var B=new d.range(this.document);B.moveToBookmark(y[A]);z.push(B);}this.selectRanges(z);return this;},getCommonAncestor:function(){var y=this.getRanges(),z=y[0].startContainer,A=y[y.length-1].endContainer;return z.getCommonAncestor(A);},scrollIntoView:function(){var y=this.getStartElement();y.scrollIntoView();}};})();(function(){var m=d.walker.whitespaces(true),n=/\ufeff|\u00a0/,o={table:1,tbody:1,tr:1};d.range.prototype.select=c?function(p){var A=this;var q=A.collapsed,r,s,t,u=A.getEnclosedNode();if(u)try{t=A.document.$.body.createControlRange();
+t.addElement(u.$);t.select();return;}catch(B){}if(A.startContainer.type==1&&A.startContainer.getName() in o||A.endContainer.type==1&&A.endContainer.getName() in o)A.shrink(1,true);var v=A.createBookmark(),w=v.startNode,x;if(!q)x=v.endNode;t=A.document.$.body.createTextRange();t.moveToElementText(w.$);t.moveStart('character',1);if(x){var y=A.document.$.body.createTextRange();y.moveToElementText(x.$);t.setEndPoint('EndToEnd',y);t.moveEnd('character',-1);}else{var z=w.getNext(m);r=!(z&&z.getText&&z.getText().match(n))&&(p||!w.hasPrevious()||w.getPrevious().is&&w.getPrevious().is('br'));s=A.document.createElement('span');s.setHtml('&#65279;');s.insertBefore(w);if(r)A.document.createText('\ufeff').insertBefore(w);}A.setStartBefore(w);w.remove();if(q){if(r){t.moveStart('character',-1);t.select();A.document.$.selection.clear();}else t.select();A.moveToPosition(s,3);s.remove();}else{A.setEndBefore(x);x.remove();t.select();}A.document.fire('selectionchange');}:function(){this.document.getSelection().selectRanges([this]);};})();(function(){var m=a.htmlParser.cssStyle,n=e.cssLength,o=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i;function p(r,s){var t=o.exec(r),u=o.exec(s);if(t){if(!t[2]&&u[2]=='px')return u[1];if(t[2]=='px'&&!u[2])return u[1]+'px';}return s;};var q={elements:{$:function(r){var s=r.attributes,t=s&&s['data-cke-realelement'],u=t&&new a.htmlParser.fragment.fromHtml(decodeURIComponent(t)),v=u&&u.children[0];if(v&&r.attributes['data-cke-resizable']){var w=new m(r).rules,x=v.attributes,y=w.width,z=w.height;y&&(x.width=p(x.width,y));z&&(x.height=p(x.height,z));}return v;}}};j.add('fakeobjects',{requires:['htmlwriter'],afterInit:function(r){var s=r.dataProcessor,t=s&&s.htmlFilter;if(t)t.addRules(q);}});a.editor.prototype.createFakeElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(r.getOuterHtml()),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.getAttribute('align')||''};if(t)x['data-cke-real-element-type']=t;if(u){x['data-cke-resizable']=u;var y=new m(),z=r.getAttribute('width'),A=r.getAttribute('height');z&&(y.rules.width=n(z));A&&(y.rules.height=n(A));y.populate(x);}return this.document.createElement('img',{attributes:x});};a.editor.prototype.createFakeParserElement=function(r,s,t,u){var v=this.lang.fakeobjects,w=v[t]||v.unknown,x,y=new a.htmlParser.basicWriter();r.writeHtml(y);x=y.getHtml();var z={'class':s,src:a.getUrl('images/spacer.gif'),'data-cke-realelement':encodeURIComponent(x),'data-cke-real-node-type':r.type,alt:w,title:w,align:r.attributes.align||''};
+if(t)z['data-cke-real-element-type']=t;if(u){z['data-cke-resizable']=u;var A=r.attributes,B=new m(),C=A.width,D=A.height;C!=undefined&&(B.rules.width=n(C));D!=undefined&&(B.rules.height=n(D));B.populate(z);}return new a.htmlParser.element('img',z);};a.editor.prototype.restoreRealElement=function(r){if(r.data('cke-real-node-type')!=1)return null;var s=h.createFromHtml(decodeURIComponent(r.data('cke-realelement')),this.document);if(r.data('cke-resizable')){var t=r.getStyle('width'),u=r.getStyle('height');t&&s.setAttribute('width',p(s.getAttribute('width'),t));u&&s.setAttribute('height',p(s.getAttribute('height'),u));}return s;};})();j.add('richcombo',{requires:['floatpanel','listblock','button'],beforeInit:function(m){m.ui.addHandler(3,k.richCombo.handler);}});a.UI_RICHCOMBO='richcombo';k.richCombo=e.createClass({$:function(m){var o=this;e.extend(o,m,{title:m.label,modes:{wysiwyg:1}});var n=o.panel||{};delete o.panel;o.id=e.getNextNumber();o.document=n&&n.parent&&n.parent.getDocument()||a.document;n.className=(n.className||'')+' cke_rcombopanel';n.block={multiSelect:n.multiSelect,attributes:n.attributes};o._={panelDefinition:n,items:{},state:2};},statics:{handler:{create:function(m){return new k.richCombo(m);}}},proto:{renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var o=b,p='cke_'+this.id,q=e.addFunction(function(v){var y=this;var w=y._;if(w.state==0)return;y.createPanel(m);if(w.on){w.panel.hide();return;}y.commit();var x=y.getValue();if(x)w.list.mark(x);else w.list.unmarkAll();w.panel.showBlock(y.id,new h(v),4);},this),r={id:p,combo:this,focus:function(){var v=a.document.getById(p).getChild(1);v.focus();},clickFn:q};function s(){var w=this;var v=w.modes[m.mode]?2:0;w.setState(m.readOnly&&!w.readOnly?0:v);w.setValue('');};m.on('mode',s,this);!this.readOnly&&m.on('readOnly',s,this);var t=e.addFunction(function(v,w){v=new d.event(v);var x=v.getKeystroke();switch(x){case 13:case 32:case 40:e.callFunction(q,w);break;default:r.onkey(r,x);}v.preventDefault();}),u=e.addFunction(function(){r.onfocus&&r.onfocus();});r.keyDownFn=t;n.push('<span class="cke_rcombo" role="presentation">','<span id=',p);if(this.className)n.push(' class="',this.className,' cke_off"');n.push(' role="presentation">','<span id="'+p+'_label" class=cke_label>',this.label,'</span>','<a hidefocus=true title="',this.title,'" tabindex="-1"',o.gecko&&o.version>=10900&&!o.hc?'':" href=\"javascript:void('"+this.label+"')\"",' role="button" aria-labelledby="',p,'_label" aria-describedby="',p,'_text" aria-haspopup="true"');
+if(b.opera||b.gecko&&b.mac)n.push(' onkeypress="return false;"');if(b.gecko)n.push(' onblur="this.style.cssText = this.style.cssText;"');n.push(' onkeydown="CKEDITOR.tools.callFunction( ',t,', event, this );" onfocus="return CKEDITOR.tools.callFunction(',u,', event);" '+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',q,', this); return false;"><span><span id="'+p+'_text" class="cke_text cke_inline_label">'+this.label+'</span>'+'</span>'+'<span class=cke_openbutton><span class=cke_icon>'+(b.hc?'&#9660;':b.air?'&nbsp;':'')+'</span></span>'+'</a>'+'</span>'+'</span>');if(this.onRender)this.onRender();return r;},createPanel:function(m){if(this._.panel)return;var n=this._.panelDefinition,o=this._.panelDefinition.block,p=n.parent||a.document.getBody(),q=new k.floatPanel(m,p,n),r=q.addListBlock(this.id,o),s=this;q.onShow=function(){if(s.className)this.element.getFirst().addClass(s.className+'_panel');s.setState(1);r.focus(!s.multiSelect&&s.getValue());s._.on=1;if(s.onOpen)s.onOpen();};q.onHide=function(t){if(s.className)this.element.getFirst().removeClass(s.className+'_panel');s.setState(s.modes&&s.modes[m.mode]?2:0);s._.on=0;if(!t&&s.onClose)s.onClose();};q.onEscape=function(){q.hide();};r.onClick=function(t,u){s.document.getWindow().focus();if(s.onClick)s.onClick.call(s,t,u);if(u)s.setValue(t,s._.items[t]);else s.setValue('');q.hide(false);};this._.panel=q;this._.list=r;q.getBlock(this.id).onHide=function(){s._.on=0;s.setState(2);};if(this.init)this.init();},setValue:function(m,n){var p=this;p._.value=m;var o=p.document.getById('cke_'+p.id+'_text');if(o){if(!(m||n)){n=p.label;o.addClass('cke_inline_label');}else o.removeClass('cke_inline_label');o.setHtml(typeof n!='undefined'?n:m);}},getValue:function(){return this._.value||'';},unmarkAll:function(){this._.list.unmarkAll();},mark:function(m){this._.list.mark(m);},hideItem:function(m){this._.list.hideItem(m);},hideGroup:function(m){this._.list.hideGroup(m);},showAll:function(){this._.list.showAll();},add:function(m,n,o){this._.items[m]=o||m;this._.list.add(m,n,o);},startGroup:function(m){this._.list.startGroup(m);},commit:function(){var m=this;if(!m._.committed){m._.list.commit();m._.committed=1;k.fire('ready',m);}m._.committed=1;},setState:function(m){var n=this;if(n._.state==m)return;n.document.getById('cke_'+n.id).setState(m);n._.state=m;}}});k.prototype.addRichCombo=function(m,n){this.add(m,3,n);};j.add('htmlwriter');a.htmlWriter=e.createClass({base:a.htmlParser.basicWriter,$:function(){var o=this;
+o.base();o.indentationChars='\t';o.selfClosingEnd=' />';o.lineBreakChars='\n';o.forceSimpleAmpersand=0;o.sortAttributes=1;o._.indent=0;o._.indentation='';o._.inPre=0;o._.rules={};var m=f;for(var n in e.extend({},m.$nonBodyContent,m.$block,m.$listItem,m.$tableContent))o.setRules(n,{indent:1,breakBeforeOpen:1,breakAfterOpen:1,breakBeforeClose:!m[n]['#'],breakAfterClose:1});o.setRules('br',{breakAfterOpen:1});o.setRules('title',{indent:0,breakAfterOpen:0});o.setRules('style',{indent:0,breakBeforeClose:1});o.setRules('pre',{indent:0});},proto:{openTag:function(m,n){var p=this;var o=p._.rules[m];if(p._.indent)p.indentation();else if(o&&o.breakBeforeOpen){p.lineBreak();p.indentation();}p._.output.push('<',m);},openTagClose:function(m,n){var p=this;var o=p._.rules[m];if(n)p._.output.push(p.selfClosingEnd);else{p._.output.push('>');if(o&&o.indent)p._.indentation+=p.indentationChars;}if(o&&o.breakAfterOpen)p.lineBreak();m=='pre'&&(p._.inPre=1);},attribute:function(m,n){if(typeof n=='string'){this.forceSimpleAmpersand&&(n=n.replace(/&amp;/g,'&'));n=e.htmlEncodeAttr(n);}this._.output.push(' ',m,'="',n,'"');},closeTag:function(m){var o=this;var n=o._.rules[m];if(n&&n.indent)o._.indentation=o._.indentation.substr(o.indentationChars.length);if(o._.indent)o.indentation();else if(n&&n.breakBeforeClose){o.lineBreak();o.indentation();}o._.output.push('</',m,'>');m=='pre'&&(o._.inPre=0);if(n&&n.breakAfterClose)o.lineBreak();},text:function(m){var n=this;if(n._.indent){n.indentation();!n._.inPre&&(m=e.ltrim(m));}n._.output.push(m);},comment:function(m){if(this._.indent)this.indentation();this._.output.push('<!--',m,'-->');},lineBreak:function(){var m=this;if(!m._.inPre&&m._.output.length>0)m._.output.push(m.lineBreakChars);m._.indent=1;},indentation:function(){var m=this;if(!m._.inPre)m._.output.push(m._.indentation);m._.indent=0;},setRules:function(m,n){var o=this._.rules[m];if(o)e.extend(o,n,true);else this._.rules[m]=n;}}});j.add('menubutton',{requires:['button','menu'],beforeInit:function(m){m.ui.addHandler(5,k.menuButton.handler);}});a.UI_MENUBUTTON='menubutton';(function(){var m=function(n){var o=this._;if(o.state===0)return;o.previousState=o.state;var p=o.menu;if(!p){p=o.menu=new a.menu(n,{panel:{className:n.skinClass+' cke_contextmenu',attributes:{'aria-label':n.lang.common.options}}});p.onHide=e.bind(function(){this.setState(this.modes&&this.modes[n.mode]?o.previousState:0);},this);if(this.onMenu)p.addListener(this.onMenu);}if(o.on){p.hide();return;}this.setState(1);p.show(a.document.getById(this._.id),4);
+};k.menuButton=e.createClass({base:k.button,$:function(n){var o=n.panel;delete n.panel;this.base(n);this.hasArrow=true;this.click=m;},statics:{handler:{create:function(n){return new k.menuButton(n);}}}});})();j.add('dialogui');(function(){var m=function(u){var x=this;x._||(x._={});x._['default']=x._.initValue=u['default']||'';x._.required=u.required||false;var v=[x._];for(var w=1;w<arguments.length;w++)v.push(arguments[w]);v.push(true);e.extend.apply(e,v);return x._;},n={build:function(u,v,w){return new k.dialog.textInput(u,v,w);}},o={build:function(u,v,w){return new k.dialog[v.type](u,v,w);}},p={build:function(u,v,w){var x=v.children,y,z=[],A=[];for(var B=0;B<x.length&&(y=x[B]);B++){var C=[];z.push(C);A.push(a.dialog._.uiElementBuilders[y.type].build(u,y,C));}return new k.dialog[v.type](u,A,z,w,v);}},q={isChanged:function(){return this.getValue()!=this.getInitValue();},reset:function(u){this.setValue(this.getInitValue(),u);},setInitValue:function(){this._.initValue=this.getValue();},resetInitValue:function(){this._.initValue=this._['default'];},getInitValue:function(){return this._.initValue;}},r=e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onChange:function(u,v){if(!this._.domOnChangeRegistered){u.on('load',function(){this.getInputElement().on('change',function(){if(!u.parts.dialog.isVisible())return;this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},true),s=/^on([A-Z]\w+)/,t=function(u){for(var v in u){if(s.test(v)||v=='title'||v=='type')delete u[v];}return u;};e.extend(k.dialog,{labeledElement:function(u,v,w,x){if(arguments.length<4)return;var y=m.call(this,v);y.labelId=e.getNextId()+'_label';var z=this._.children=[],A=function(){var B=[],C=v.required?' cke_required':'';if(v.labelLayout!='horizontal')B.push('<label class="cke_dialog_ui_labeled_label'+C+'" ',' id="'+y.labelId+'"',' for="'+y.inputId+'"',(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',v.label,'</label>','<div class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+' role="presentation">',x.call(this,u,v),'</div>');else{var D={type:'hbox',widths:v.widths,padding:0,children:[{type:'html',html:'<label class="cke_dialog_ui_labeled_label'+C+'"'+' id="'+y.labelId+'"'+' for="'+y.inputId+'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>'+e.htmlEncode(v.label)+'</span>'},{type:'html',html:'<span class="cke_dialog_ui_labeled_content"'+(v.controlStyle?' style="'+v.controlStyle+'"':'')+'>'+x.call(this,u,v)+'</span>'}]};
+a.dialog._.uiElementBuilders.hbox.build(u,D,B);}return B.join('');};k.dialog.uiElement.call(this,u,v,w,'div',null,{role:'presentation'},A);},textInput:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this._.inputId=e.getNextId()+'_textInput',y={'class':'cke_dialog_ui_input_'+v.type,id:x,type:'text'},z;if(v.validate)this.validate=v.validate;if(v.maxLength)y.maxlength=v.maxLength;if(v.size)y.size=v.size;if(v.inputStyle)y.style=v.inputStyle;var A=this,B=false;u.on('load',function(){A.getInputElement().on('keydown',function(D){if(D.data.getKeystroke()==13)B=true;});A.getInputElement().on('keyup',function(D){if(D.data.getKeystroke()==13&&B){u.getButton('ok')&&setTimeout(function(){u.getButton('ok').click();},0);B=false;}},null,null,1000);});var C=function(){var D=['<div class="cke_dialog_ui_input_',v.type,'" role="presentation"'];if(v.width)D.push('style="width:'+v.width+'" ');D.push('><input ');y['aria-labelledby']=this._.labelId;this._.required&&(y['aria-required']=this._.required);for(var E in y)D.push(E+'="'+y[E]+'" ');D.push(' /></div>');return D.join('');};k.dialog.labeledElement.call(this,u,v,w,C);},textarea:function(u,v,w){if(arguments.length<3)return;m.call(this,v);var x=this,y=this._.inputId=e.getNextId()+'_textarea',z={};if(v.validate)this.validate=v.validate;z.rows=v.rows||5;z.cols=v.cols||20;if(typeof v.inputStyle!='undefined')z.style=v.inputStyle;var A=function(){z['aria-labelledby']=this._.labelId;this._.required&&(z['aria-required']=this._.required);var B=['<div class="cke_dialog_ui_input_textarea" role="presentation"><textarea class="cke_dialog_ui_input_textarea" id="',y,'" '];for(var C in z)B.push(C+'="'+e.htmlEncode(z[C])+'" ');B.push('>',e.htmlEncode(x._['default']),'</textarea></div>');return B.join('');};k.dialog.labeledElement.call(this,u,v,w,A);},checkbox:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v,{'default':!!v['default']});if(v.validate)this.validate=v.validate;var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_checkbox':e.getNextId()+'_checkbox'},true),A=[],B=e.getNextId()+'_label',C={'class':'cke_dialog_ui_checkbox_input',type:'checkbox','aria-labelledby':B};t(z);if(v['default'])C.checked='checked';if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.checkbox=new k.dialog.uiElement(u,z,A,'input',null,C);A.push(' <label id="',B,'" for="',C.id,'"'+(v.labelStyle?' style="'+v.labelStyle+'"':'')+'>',e.htmlEncode(v.label),'</label>');return A.join('');};k.dialog.uiElement.call(this,u,v,w,'span',null,null,y);
+},radio:function(u,v,w){if(arguments.length<3)return;m.call(this,v);if(!this._['default'])this._['default']=this._.initValue=v.items[0][1];if(v.validate)this.validate=v.valdiate;var x=[],y=this,z=function(){var A=[],B=[],C={'class':'cke_dialog_ui_radio_item','aria-labelledby':this._.labelId},D=v.id?v.id+'_radio':e.getNextId()+'_radio';for(var E=0;E<v.items.length;E++){var F=v.items[E],G=F[2]!==undefined?F[2]:F[0],H=F[1]!==undefined?F[1]:F[0],I=e.getNextId()+'_radio_input',J=I+'_label',K=e.extend({},v,{id:I,title:null,type:null},true),L=e.extend({},K,{title:G},true),M={type:'radio','class':'cke_dialog_ui_radio_input',name:D,value:H,'aria-labelledby':J},N=[];if(y._['default']==H)M.checked='checked';t(K);t(L);if(typeof K.inputStyle!='undefined')K.style=K.inputStyle;x.push(new k.dialog.uiElement(u,K,N,'input',null,M));N.push(' ');new k.dialog.uiElement(u,L,N,'label',null,{id:J,'for':M.id},F[0]);A.push(N.join(''));}new k.dialog.hbox(u,x,A,B);return B.join('');};k.dialog.labeledElement.call(this,u,v,w,z);this._.children=x;},button:function(u,v,w){if(!arguments.length)return;if(typeof v=='function')v=v(u.getParentEditor());m.call(this,v,{disabled:v.disabled||false});a.event.implementOn(this);var x=this;u.on('load',function(A){var B=this.getElement();(function(){B.on('click',function(C){x.fire('click',{dialog:x.getDialog()});C.data.preventDefault();});B.on('keydown',function(C){if(C.data.getKeystroke() in {32:1}){x.click();C.data.preventDefault();}});})();B.unselectable();},this);var y=e.extend({},v);delete y.style;var z=e.getNextId()+'_label';k.dialog.uiElement.call(this,u,y,w,'a',null,{style:v.style,href:'javascript:void(0)',title:v.label,hidefocus:'true','class':v['class'],role:'button','aria-labelledby':z},'<span id="'+z+'" class="cke_dialog_ui_button">'+e.htmlEncode(v.label)+'</span>');},select:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v);if(v.validate)this.validate=v.validate;x.inputId=e.getNextId()+'_select';var y=function(){var z=e.extend({},v,{id:v.id?v.id+'_select':e.getNextId()+'_select'},true),A=[],B=[],C={id:x.inputId,'class':'cke_dialog_ui_input_select','aria-labelledby':this._.labelId};if(v.size!=undefined)C.size=v.size;if(v.multiple!=undefined)C.multiple=v.multiple;t(z);for(var D=0,E;D<v.items.length&&(E=v.items[D]);D++)B.push('<option value="',e.htmlEncode(E[1]!==undefined?E[1]:E[0]).replace(/"/g,'&quot;'),'" /> ',e.htmlEncode(E[0]));if(typeof z.inputStyle!='undefined')z.style=z.inputStyle;x.select=new k.dialog.uiElement(u,z,A,'select',null,C,B.join(''));
+return A.join('');};k.dialog.labeledElement.call(this,u,v,w,y);},file:function(u,v,w){if(arguments.length<3)return;if(v['default']===undefined)v['default']='';var x=e.extend(m.call(this,v),{definition:v,buttons:[]});if(v.validate)this.validate=v.validate;var y=function(){x.frameId=e.getNextId()+'_fileInput';var z=b.isCustomDomain(),A=['<iframe frameborder="0" allowtransparency="0" class="cke_dialog_ui_input_file" id="',x.frameId,'" title="',v.label,'" src="javascript:void('];A.push(z?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');A.push(')"></iframe>');return A.join('');};u.on('load',function(){var z=a.document.getById(x.frameId),A=z.getParent();A.addClass('cke_dialog_ui_input_file');});k.dialog.labeledElement.call(this,u,v,w,y);},fileButton:function(u,v,w){if(arguments.length<3)return;var x=m.call(this,v),y=this;if(v.validate)this.validate=v.validate;var z=e.extend({},v),A=z.onClick;z.className=(z.className?z.className+' ':'')+'cke_dialog_ui_button';z.onClick=function(B){var C=v['for'];if(!A||A.call(this,B)!==false){u.getContentElement(C[0],C[1]).submit();this.disable();}};u.on('load',function(){u.getContentElement(v['for'][0],v['for'][1])._.buttons.push(y);});k.dialog.button.call(this,u,z,w);},html:(function(){var u=/^\s*<[\w:]+\s+([^>]*)?>/,v=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,w=/\/$/;return function(x,y,z){if(arguments.length<3)return;var A=[],B,C=y.html,D,E;if(C.charAt(0)!='<')C='<span>'+C+'</span>';var F=y.focus;if(F){var G=this.focus;this.focus=function(){G.call(this);typeof F=='function'&&F.call(this);this.fire('focus');};if(y.isFocusable){var H=this.isFocusable;this.isFocusable=H;}this.keyboardFocusable=true;}k.dialog.uiElement.call(this,x,y,A,'span',null,null,'');B=A.join('');D=B.match(u);E=C.match(v)||['','',''];if(w.test(E[1])){E[1]=E[1].slice(0,-1);E[2]='/'+E[2];}z.push([E[1],' ',D[1]||'',E[2]].join(''));};})(),fieldset:function(u,v,w,x,y){var z=y.label,A=function(){var B=[];z&&B.push('<legend>'+z+'</legend>');for(var C=0;C<w.length;C++)B.push(w[C]);return B.join('');};this._={children:v};k.dialog.uiElement.call(this,u,y,x,'fieldset',null,null,A);}},true);k.dialog.html.prototype=new k.dialog.uiElement();k.dialog.labeledElement.prototype=e.extend(new k.dialog.uiElement(),{setLabel:function(u){var v=a.document.getById(this._.labelId);if(v.getChildCount()<1)new d.text(u,a.document).appendTo(v);else v.getChild(0).$.nodeValue=u;return this;},getLabel:function(){var u=a.document.getById(this._.labelId);
+if(!u||u.getChildCount()<1)return '';else return u.getChild(0).getText();},eventProcessors:r},true);k.dialog.button.prototype=e.extend(new k.dialog.uiElement(),{click:function(){var u=this;if(!u._.disabled)return u.fire('click',{dialog:u._.dialog});u.getElement().$.blur();return false;},enable:function(){this._.disabled=false;var u=this.getElement();u&&u.removeClass('cke_disabled');},disable:function(){this._.disabled=true;this.getElement().addClass('cke_disabled');},isVisible:function(){return this.getElement().getFirst().isVisible();},isEnabled:function(){return!this._.disabled;},eventProcessors:e.extend({},k.dialog.uiElement.prototype.eventProcessors,{onClick:function(u,v){this.on('click',v);}},true),accessKeyUp:function(){this.click();},accessKeyDown:function(){this.focus();},keyboardFocusable:true},true);k.dialog.textInput.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return a.document.getById(this._.inputId);},focus:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();v&&v.$.focus();},0);},select:function(){var u=this.selectParentTab();setTimeout(function(){var v=u.getInputElement();if(v){v.$.focus();v.$.select();}},0);},accessKeyUp:function(){this.select();},setValue:function(u){!u&&(u='');return k.dialog.uiElement.prototype.setValue.apply(this,arguments);},keyboardFocusable:true},q,true);k.dialog.textarea.prototype=new k.dialog.textInput();k.dialog.select.prototype=e.extend(new k.dialog.labeledElement(),{getInputElement:function(){return this._.select.getElement();},add:function(u,v,w){var x=new h('option',this.getDialog().getParentEditor().document),y=this.getInputElement().$;x.$.text=u;x.$.value=v===undefined||v===null?u:v;if(w===undefined||w===null){if(c)y.add(x.$);else y.add(x.$,null);}else y.add(x.$,w);return this;},remove:function(u){var v=this.getInputElement().$;v.remove(u);return this;},clear:function(){var u=this.getInputElement().$;while(u.length>0)u.remove(0);return this;},keyboardFocusable:true},q,true);k.dialog.checkbox.prototype=e.extend(new k.dialog.uiElement(),{getInputElement:function(){return this._.checkbox.getElement();},setValue:function(u,v){this.getInputElement().$.checked=u;!v&&this.fire('change',{value:u});},getValue:function(){return this.getInputElement().$.checked;},accessKeyUp:function(){this.setValue(!this.getValue());},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.checkbox.getElement();
+w.on('propertychange',function(x){x=x.data.$;if(x.propertyName=='checked')this.fire('change',{value:w.$.checked});},this);},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.radio.prototype=e.extend(new k.dialog.uiElement(),{setValue:function(u,v){var w=this._.children,x;for(var y=0;y<w.length&&(x=w[y]);y++)x.getElement().$.checked=x.getValue()==u;!v&&this.fire('change',{value:u});},getValue:function(){var u=this._.children;for(var v=0;v<u.length;v++){if(u[v].getElement().$.checked)return u[v].getValue();}return null;},accessKeyUp:function(){var u=this._.children,v;for(v=0;v<u.length;v++){if(u[v].getElement().$.checked){u[v].getElement().focus();return;}}u[0].getElement().focus();},eventProcessors:{onChange:function(u,v){if(!c)return r.onChange.apply(this,arguments);else{u.on('load',function(){var w=this._.children,x=this;for(var y=0;y<w.length;y++){var z=w[y].getElement();z.on('propertychange',function(A){A=A.data.$;if(A.propertyName=='checked'&&this.$.checked)x.fire('change',{value:this.getAttribute('value')});});}},this);this.on('change',v);}return null;}},keyboardFocusable:true},q,true);k.dialog.file.prototype=e.extend(new k.dialog.labeledElement(),q,{getInputElement:function(){var u=a.document.getById(this._.frameId).getFrameDocument();return u.$.forms.length>0?new h(u.$.forms[0].elements[0]):this.getElement();},submit:function(){this.getInputElement().getParent().$.submit();return this;},getAction:function(){return this.getInputElement().getParent().$.action;},registerEvents:function(u){var v=/^on([A-Z]\w+)/,w,x=function(z,A,B,C){z.on('formLoaded',function(){z.getInputElement().on(B,C,z);});};for(var y in u){if(!(w=y.match(v)))continue;if(this.eventProcessors[y])this.eventProcessors[y].call(this,this._.dialog,u[y]);else x(this,this._.dialog,w[1].toLowerCase(),u[y]);}return this;},reset:function(){var u=this._,v=a.document.getById(u.frameId),w=v.getFrameDocument(),x=u.definition,y=u.buttons,z=this.formLoadedNumber,A=this.formUnloadNumber,B=u.dialog._.editor.lang.dir,C=u.dialog._.editor.langCode;if(!z){z=this.formLoadedNumber=e.addFunction(function(){this.fire('formLoaded');},this);A=this.formUnloadNumber=e.addFunction(function(){this.getInputElement().clearCustomData();},this);this.getDialog()._.editor.on('destroy',function(){e.removeFunction(z);e.removeFunction(A);});}function D(){w.$.open();if(b.isCustomDomain())w.$.domain=document.domain;var E='';if(x.size)E=x.size-(c?7:0);w.$.write(['<html dir="'+B+'" lang="'+C+'"><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">','<form enctype="multipart/form-data" method="POST" dir="'+B+'" lang="'+C+'" action="',e.htmlEncode(x.action),'">','<input type="file" name="',e.htmlEncode(x.id||'cke_upload'),'" size="',e.htmlEncode(E>0?E:''),'" />','</form>','</body></html>','<script>window.parent.CKEDITOR.tools.callFunction('+z+');','window.onbeforeunload = function() {window.parent.CKEDITOR.tools.callFunction('+A+')}</script>'].join(''));
+w.$.close();for(var F=0;F<y.length;F++)y[F].enable();};if(b.gecko)setTimeout(D,500);else D();},getValue:function(){return this.getInputElement().$.value||'';},setInitValue:function(){this._.initValue='';},eventProcessors:{onChange:function(u,v){if(!this._.domOnChangeRegistered){this.on('formLoaded',function(){this.getInputElement().on('change',function(){this.fire('change',{value:this.getValue()});},this);},this);this._.domOnChangeRegistered=true;}this.on('change',v);}},keyboardFocusable:true},true);k.dialog.fileButton.prototype=new k.dialog.button();k.dialog.fieldset.prototype=e.clone(k.dialog.hbox.prototype);a.dialog.addUIElement('text',n);a.dialog.addUIElement('password',n);a.dialog.addUIElement('textarea',o);a.dialog.addUIElement('checkbox',o);a.dialog.addUIElement('radio',o);a.dialog.addUIElement('button',o);a.dialog.addUIElement('select',o);a.dialog.addUIElement('file',o);a.dialog.addUIElement('fileButton',o);a.dialog.addUIElement('html',o);a.dialog.addUIElement('fieldset',p);})();j.add('panel',{beforeInit:function(m){m.ui.addHandler(2,k.panel.handler);}});a.UI_PANEL='panel';k.panel=function(m,n){var o=this;if(n)e.extend(o,n);e.extend(o,{className:'',css:[]});o.id=e.getNextId();o.document=m;o._={blocks:{}};};k.panel.handler={create:function(m){return new k.panel(m);}};k.panel.prototype={renderHtml:function(m){var n=[];this.render(m,n);return n.join('');},render:function(m,n){var p=this;var o=p.id;n.push('<div class="',m.skinClass,'" lang="',m.langCode,'" role="presentation" style="display:none;z-index:'+(m.config.baseFloatZIndex+1)+'">'+'<div'+' id=',o,' dir=',m.lang.dir,' role="presentation" class="cke_panel cke_',m.lang.dir);if(p.className)n.push(' ',p.className);n.push('">');if(p.forceIFrame||p.css.length){n.push('<iframe id="',o,'_frame" frameborder="0" role="application" src="javascript:void(');n.push(b.isCustomDomain()?"(function(){document.open();document.domain='"+document.domain+"';"+'document.close();'+'})()':'0');n.push(')"></iframe>');}n.push('</div></div>');return o;},getHolderElement:function(){var m=this._.holder;if(!m){if(this.forceIFrame||this.css.length){var n=this.document.getById(this.id+'_frame'),o=n.getParent(),p=o.getAttribute('dir'),q=o.getParent().getAttribute('class'),r=o.getParent().getAttribute('lang'),s=n.getFrameDocument();b.iOS&&o.setStyles({overflow:'scroll','-webkit-overflow-scrolling':'touch'});var t=e.addFunction(e.bind(function(w){this.isLoaded=true;if(this.onLoad)this.onLoad();},this)),u='<!DOCTYPE html><html dir="'+p+'" class="'+q+'_container" lang="'+r+'">'+'<head>'+'<style>.'+q+'_container{visibility:hidden}</style>'+'</head>'+'<body class="cke_'+p+' cke_panel_frame '+b.cssClass+'" style="margin:0;padding:0"'+' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction('+t+');"></body>'+e.buildStyleHtml(this.css)+'</html>';
+s.write(u);var v=s.getWindow();v.$.CKEDITOR=a;s.on('key'+(b.opera?'press':'down'),function(w){var z=this;var x=w.data.getKeystroke(),y=z.document.getById(z.id).getAttribute('dir');if(z._.onKeyDown&&z._.onKeyDown(x)===false){w.data.preventDefault();return;}if(x==27||x==(y=='rtl'?39:37))if(z.onEscape&&z.onEscape(x)===false)w.data.preventDefault();},this);m=s.getBody();m.unselectable();b.air&&e.callFunction(t);}else m=this.document.getById(this.id);this._.holder=m;}return m;},addBlock:function(m,n){var o=this;n=o._.blocks[m]=n instanceof k.panel.block?n:new k.panel.block(o.getHolderElement(),n);if(!o._.currentBlock)o.showBlock(m);return n;},getBlock:function(m){return this._.blocks[m];},showBlock:function(m){var r=this;var n=r._.blocks,o=n[m],p=r._.currentBlock,q=r.forceIFrame?r.document.getById(r.id+'_frame'):r._.holder;q.getParent().getParent().disableContextMenu();if(p){q.removeAttributes(p.attributes);p.hide();}r._.currentBlock=o;q.setAttributes(o.attributes);a.fire('ariaWidget',q);o._.focusIndex=-1;r._.onKeyDown=o.onKeyDown&&e.bind(o.onKeyDown,o);o.show();return o;},destroy:function(){this.element&&this.element.remove();}};k.panel.block=e.createClass({$:function(m,n){var o=this;o.element=m.append(m.getDocument().createElement('div',{attributes:{tabIndex:-1,'class':'cke_panel_block',role:'presentation'},styles:{display:'none'}}));if(n)e.extend(o,n);if(!o.attributes.title)o.attributes.title=o.attributes['aria-label'];o.keys={};o._.focusIndex=-1;o.element.disableContextMenu();},_:{markItem:function(m){var p=this;if(m==-1)return;var n=p.element.getElementsByTag('a'),o=n.getItem(p._.focusIndex=m);if(b.webkit||b.opera)o.getDocument().getWindow().focus();o.focus();p.onMark&&p.onMark(o);}},proto:{show:function(){this.element.setStyle('display','');},hide:function(){var m=this;if(!m.onHide||m.onHide.call(m)!==true)m.element.setStyle('display','none');},onKeyDown:function(m){var r=this;var n=r.keys[m];switch(n){case 'next':var o=r._.focusIndex,p=r.element.getElementsByTag('a'),q;while(q=p.getItem(++o)){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'prev':o=r._.focusIndex;p=r.element.getElementsByTag('a');while(o>0&&(q=p.getItem(--o))){if(q.getAttribute('_cke_focus')&&q.$.offsetWidth){r._.focusIndex=o;q.focus();break;}}return false;case 'click':case 'mouseup':o=r._.focusIndex;q=o>=0&&r.element.getElementsByTag('a').getItem(o);if(q)q.$[n]?q.$[n]():q.$['on'+n]();return false;}return true;}}});j.add('listblock',{requires:['panel'],onLoad:function(){k.panel.prototype.addListBlock=function(m,n){return this.addBlock(m,new k.listBlock(this.getHolderElement(),n));
+};k.listBlock=e.createClass({base:k.panel.block,$:function(m,n){var q=this;n=n||{};var o=n.attributes||(n.attributes={});(q.multiSelect=!!n.multiSelect)&&(o['aria-multiselectable']=true);!o.role&&(o.role='listbox');q.base.apply(q,arguments);var p=q.keys;p[40]='next';p[9]='next';p[38]='prev';p[2000+9]='prev';p[32]=c?'mouseup':'click';c&&(p[13]='mouseup');q._.pendingHtml=[];q._.items={};q._.groups={};},_:{close:function(){if(this._.started){this._.pendingHtml.push('</ul>');delete this._.started;}},getClick:function(){if(!this._.click)this._.click=e.addFunction(function(m){var o=this;var n=true;if(o.multiSelect)n=o.toggle(m);else o.mark(m);if(o.onClick)o.onClick(m,n);},this);return this._.click;}},proto:{add:function(m,n,o){var r=this;var p=r._.pendingHtml,q=e.getNextId();if(!r._.started){p.push('<ul role="presentation" class=cke_panel_list>');r._.started=1;r._.size=r._.size||0;}r._.items[m]=q;p.push('<li id=',q,' class=cke_panel_listItem role=presentation><a id="',q,'_option" _cke_focus=1 hidefocus=true title="',o||m,'" href="javascript:void(\'',m,"')\" "+(c?'onclick="return false;" onmouseup':'onclick')+'="CKEDITOR.tools.callFunction(',r._.getClick(),",'",m,"'); return false;\"",' role="option" aria-posinset="'+ ++r._.size+'">',n||m,'</a></li>');},startGroup:function(m){this._.close();var n=e.getNextId();this._.groups[m]=n;this._.pendingHtml.push('<h1 role="presentation" id=',n,' class=cke_panel_grouptitle>',m,'</h1>');},commit:function(){var p=this;p._.close();p.element.appendHtml(p._.pendingHtml.join(''));var m=p._.items,n=p.element.getDocument();for(var o in m)n.getById(m[o]+'_option').setAttribute('aria-setsize',p._.size);delete p._.size;p._.pendingHtml=[];},toggle:function(m){var n=this.isMarked(m);if(n)this.unmark(m);else this.mark(m);return!n;},hideGroup:function(m){var n=this.element.getDocument().getById(this._.groups[m]),o=n&&n.getNext();if(n){n.setStyle('display','none');if(o&&o.getName()=='ul')o.setStyle('display','none');}},hideItem:function(m){this.element.getDocument().getById(this._.items[m]).setStyle('display','none');},showAll:function(){var m=this._.items,n=this._.groups,o=this.element.getDocument();for(var p in m)o.getById(m[p]).setStyle('display','');for(var q in n){var r=o.getById(n[q]),s=r.getNext();r.setStyle('display','');if(s&&s.getName()=='ul')s.setStyle('display','');}},mark:function(m){var p=this;if(!p.multiSelect)p.unmarkAll();var n=p._.items[m],o=p.element.getDocument().getById(n);o.addClass('cke_selected');p.element.getDocument().getById(n+'_option').setAttribute('aria-selected',true);
+p.onMark&&p.onMark(o);},unmark:function(m){var q=this;var n=q.element.getDocument(),o=q._.items[m],p=n.getById(o);p.removeClass('cke_selected');n.getById(o+'_option').removeAttribute('aria-selected');q.onUnmark&&q.onUnmark(p);},unmarkAll:function(){var q=this;var m=q._.items,n=q.element.getDocument();for(var o in m){var p=m[o];n.getById(p).removeClass('cke_selected');n.getById(p+'_option').removeAttribute('aria-selected');}q.onUnmark&&q.onUnmark();},isMarked:function(m){return this.element.getDocument().getById(this._.items[m]).hasClass('cke_selected');},focus:function(m){this._.focusIndex=-1;if(m){var n=this.element.getDocument().getById(this._.items[m]).getFirst(),o=this.element.getElementsByTag('a'),p,q=-1;while(p=o.getItem(++q)){if(p.equals(n)){this._.focusIndex=q;break;}}setTimeout(function(){n.focus();},0);}}}});}});a.themes.add('default',(function(){function m(n,o){var p,q;q=n.config.sharedSpaces;q=q&&q[o];q=q&&a.document.getById(q);if(q){var r='<span class="cke_shared"><span class="'+n.skinClass+' '+n.id+' cke_editor_'+n.name+'">'+'<span class="'+b.cssClass+'">'+'<span class="cke_wrapper cke_'+n.lang.dir+'">'+'<span class="cke_editor">'+'<div class="cke_'+o+'">'+'</div></span></span></span></span></span>',s=q.append(h.createFromHtml(r,q.getDocument()));if(q.getCustomData('cke_hasshared'))s.hide();else q.setCustomData('cke_hasshared',1);p=s.getChild([0,0,0,0]);!n.sharedSpaces&&(n.sharedSpaces={});n.sharedSpaces[o]=p;n.on('focus',function(){for(var t=0,u,v=q.getChildren();u=v.getItem(t);t++){if(u.type==1&&!u.equals(s)&&u.hasClass('cke_shared'))u.hide();}s.show();});n.on('destroy',function(){s.remove();});}return p;};return{build:function(n,o){var p=n.name,q=n.element,r=n.elementMode;if(!q||r==0)return;if(r==1)q.hide();var s=n.fire('themeSpace',{space:'top',html:''}).html,t=n.fire('themeSpace',{space:'contents',html:''}).html,u=n.fireOnce('themeSpace',{space:'bottom',html:''}).html,v=t&&n.config.height,w=n.config.tabIndex||n.element.getAttribute('tabindex')||0;if(!t)v='auto';else if(!isNaN(v))v+='px';var x='',y=n.config.width;if(y){if(!isNaN(y))y+='px';x+='width: '+y+';';}var z=s&&m(n,'top'),A=m(n,'bottom');z&&(z.setHtml(s),s='');A&&(A.setHtml(u),u='');var B=h.createFromHtml(['<span id="cke_',p,'" class="',n.skinClass,' ',n.id,' cke_editor_',p,'" dir="',n.lang.dir,'" title="',b.gecko?' ':'','" lang="',n.langCode,'"'+(b.webkit?' tabindex="'+w+'"':'')+' role="application"'+' aria-labelledby="cke_',p,'_arialbl"'+(x?' style="'+x+'"':'')+'>'+'<span id="cke_',p,'_arialbl" class="cke_voice_label">'+n.lang.editor+'</span>'+'<span class="',b.cssClass,'" role="presentation"><span class="cke_wrapper cke_',n.lang.dir,'" role="presentation"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody><tr',s?'':' style="display:none"',' role="presentation"><td id="cke_top_',p,'" class="cke_top" role="presentation">',s,'</td></tr><tr',t?'':' style="display:none"',' role="presentation"><td id="cke_contents_',p,'" class="cke_contents" style="height:',v,'" role="presentation">',t,'</td></tr><tr',u?'':' style="display:none"',' role="presentation"><td id="cke_bottom_',p,'" class="cke_bottom" role="presentation">',u,'</td></tr></tbody></table><style>.',n.skinClass,'{visibility:hidden;}</style></span></span></span>'].join(''));
+B.getChild([1,0,0,0,0]).unselectable();B.getChild([1,0,0,0,2]).unselectable();if(r==1)B.insertAfter(q);else q.append(B);n.container=B;B.disableContextMenu();n.fireOnce('themeLoaded');n.fireOnce('uiReady');},buildDialog:function(n){var o=e.getNextNumber(),p=h.createFromHtml(['<div class="',n.id,'_dialog cke_editor_',n.name.replace('.','\\.'),'_dialog cke_skin_',n.skinName,'" dir="',n.lang.dir,'" lang="',n.langCode,'" role="dialog" aria-labelledby="%title#"><table class="cke_dialog',' '+b.cssClass,' cke_',n.lang.dir,'" style="position:absolute" role="presentation"><tr><td role="presentation"><div class="%body" role="presentation"><div id="%title#" class="%title" role="presentation"></div><a id="%close_button#" class="%close_button" href="javascript:void(0)" title="'+n.lang.common.close+'" role="button"><span class="cke_label">X</span></a>'+'<div id="%tabs#" class="%tabs" role="tablist"></div>'+'<table class="%contents" role="presentation">'+'<tr>'+'<td id="%contents#" class="%contents" role="presentation"></td>'+'</tr>'+'<tr>'+'<td id="%footer#" class="%footer" role="presentation"></td>'+'</tr>'+'</table>'+'</div>'+'<div id="%tl#" class="%tl"></div>'+'<div id="%tc#" class="%tc"></div>'+'<div id="%tr#" class="%tr"></div>'+'<div id="%ml#" class="%ml"></div>'+'<div id="%mr#" class="%mr"></div>'+'<div id="%bl#" class="%bl"></div>'+'<div id="%bc#" class="%bc"></div>'+'<div id="%br#" class="%br"></div>'+'</td></tr>'+'</table>',c?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+o).replace(/%/g,'cke_dialog_')),q=p.getChild([0,0,0,0,0]),r=q.getChild(0),s=q.getChild(1);r.unselectable();s.unselectable();return{element:p,parts:{dialog:p.getChild(0),title:r,close:s,tabs:q.getChild(2),contents:q.getChild([3,0,0,0]),footer:q.getChild([3,0,1,0])}};},destroy:function(n){var o=n.container;o.clearCustomData();n.element.clearCustomData();if(o)o.remove();if(n.elementMode==1)n.element.show();delete n.element;}};})());a.editor.prototype.getThemeSpace=function(m){var n='cke_'+m,o=this._[n]||(this._[n]=a.document.getById(n+'_'+this.name));return o;};a.editor.prototype.resize=function(m,n,o,p){var q=this.container,r=a.document.getById('cke_contents_'+this.name),s=p?q.getChild(1):q;b.webkit&&s.setStyle('display','none');s.setSize('width',m,true);if(b.webkit){s.$.offsetWidth;s.setStyle('display','');}var t=o?0:(s.$.offsetHeight||0)-(r.$.clientHeight||0);r.setStyle('height',Math.max(n-t,0)+'px');this.fire('resize');};a.editor.prototype.getResizable=function(){return this.container.getChild(1);
+};(function(){var m='ipsautosave';j.add(m,{init:function(n){var o={modes:{wysiwyg:1,source:1},editorFocus:false,canUndo:false,exec:function(s){if(s.config.ips_AutoSaveKey)ipb.textEditor.getEditor().save(s,q);}},p=m,q=n.addCommand(p,o);n.ui.addButton('Ipsautosave',{label:n.lang.ajaxAutoSaveButtonLabel,command:p,icon:this.path+'images/autosave.gif'});var r=setInterval(function(){if(n.checkDirty()){n.execCommand(p);q.setState(0);}},n.config.autoAjaxSaveInterval||120000);n.on('destroy',function(){clearInterval(r);});}});})();j.add('ipsbbcode',{init:function(m){var n=this.path,o='ipsbbcode';a.dialog.add(o,this.path+'dialogs/ipsbbcode.js');m.addCommand(o,new a.dialogCommand(o));m.ui.addButton('Ipsbbcode',{label:ipb.lang.ckeditor__bbcode,command:o,icon:this.path+'images/ips_bbcode.png'});$H(m.config.IPS_BBCODE).each(function(p){var q=p.key,r=p.value;if(r.image&&r.image!=''){m.ui.addButton('Ipsbbcode_'+r.tag,{label:r.title,command:'ipsbbcode_'+r.tag,icon:m.config.IPS_BBCODE_IMG_URL+'/'+r.image});a.dialog.add('ipsbbcode_'+r.tag,n+'dialogs/ipsbbcode.js');m.addCommand('ipsbbcode_'+r.tag,new a.dialogCommand('ipsbbcode_'+r.tag));if(m.config.IPS_BBCODE_BUTTONS.indexOf('Ipsbbcode_'+r.tag)==-1)m.config.IPS_BBCODE_BUTTONS.push('Ipsbbcode_'+r.tag);}});}});(function(){var m={exec:function(n){var o=IPSCKTools.getSelectionHtml(n),p=new h('span');if(o!=''){p.setHtml('[CODE]'+IPSCKTools.cleanHtmlForTagWrap(o)+'[/CODE]');n.insertElement(p);}else n.openDialog('ipscode');return true;}};j.add('ipscode',{init:function(n){var o='ipscode',p=n.addCommand(o,m);n.ui.addButton('Ipscode',{label:ipb.lang.ckeditor__codelabel,command:o,icon:this.path+'images/code.png'});a.dialog.add(o,a.getUrl(this.path+'dialogs/ipscode.js'));if(n.config.forcePasteAsPlainText){n.on('beforeCommandExec',function(q){var r=q.data.commandData;if(q.data.name=='paste'&&r!='html'){n.execCommand('pastetext');q.cancel();}},null,null,0);n.on('beforePaste',function(q){q.data.mode='text';});}n.on('pasteState',function(q){n.getCommand('pastetext').setState(q.data);});},requires:['clipboard']});})();j.add('ipsmedia',{init:function(m){var n='ipsmedia',o=m.addCommand(n,j.ipsmedia);if(ipb.vars.member_id)m.ui.addButton('Ipsmedia',{label:ipb.lang.ckeditor__mymedia,command:n,icon:this.path+'images/mymedia.png'});}});j.ipsmedia={loadTab:function(m,n){$$('#mymedia_tabs li').each(function(q){$(q).removeClassName('active');});$(m+'_'+n).addClassName('active');$('mymedia_toolbar').show();$('sharedmedia_search_app').value=m;$('sharedmedia_search_plugin').value=n;
+var o=$('sharedmedia_search').value;if(o==ipb.vars.sm_init_value)o='';var p=ipb.vars.base_url+'app=core&module=ajax&section=media&do=loadtab&tabapp='+m+'&tabplugin='+n;new Ajax.Request(p.replace(/&amp;/g,'&'),{method:'post',parameters:{md5check:ipb.vars.secure_hash,search:o},onSuccess:function(q){$('mymedia_content').update(q.responseText);}});return false;},exec:function(m){if(!Object.isUndefined(j.ipsmedia.popup))j.ipsmedia.popup.kill();j.ipsmedia.selectedText=IPSCKTools.getSelectionHtml(m);var n=ipb.vars.base_url+'app=core&module=ajax&section=media&secure_key='+ipb.vars.secure_hash;j.ipsmedia.mediaEditor=m;new Ajax.Request(n.replace(/&amp;/g,'&'),{method:'get',evalJSON:'force',onSuccess:function(o){j.ipsmedia.popup=new ipb.Popup('my_media_inline',{type:'pane',initial:o.responseJSON.html,hideAtStart:false,hideClose:true,defer:false,modal:true,w:'800px',h:'410'});}});},insert:function(m){var n=j.ipsmedia.selectedText,o=new h('div');if(n!=''){o.setHtml('[sharedmedia='+m+']'+IPSCKTools.cleanHtmlForTagWrap(n));j.ipsmedia.mediaEditor.insertElement(o);}else{o.setHtml('[sharedmedia='+m+']');j.ipsmedia.mediaEditor.insertElement(o);}$('mymedia_inserted').show().fade({duration:0.3,delay:2});return false;},search:function(){var m=$('sharedmedia_search').value,n=ipb.vars.base_url+'app=core&module=ajax&section=media&do=loadtab&tabapp='+$('sharedmedia_search_app').value+'&tabplugin='+$('sharedmedia_search_plugin').value;new Ajax.Request(n.replace(/&amp;/g,'&'),{method:'post',parameters:{md5check:ipb.vars.secure_hash,search:m},onSuccess:function(o){$('mymedia_content').update(o.responseText);}});return false;},searchinit:function(){$('sharedmedia_submit').observe('click',function(m){Event.stop(m);j.ipsmedia.search();return false;});$('sharedmedia_reset').observe('click',function(m){Event.stop(m);$('sharedmedia_search').value='';j.ipsmedia.search();$('sharedmedia_search').addClassName('inactive').value=ipb.vars.sm_init_value;return false;});$('sharedmedia_search').observe('focus',function(m){if($('sharedmedia_search').value==ipb.vars.sm_init_value)$('sharedmedia_search').removeClassName('inactive').value='';});},canUndo:true,modes:{wysiwyg:1},mediaEditor:null};j.add('ipsoptions',{init:function(m){var n='ipsoptions',o=m.addCommand(n,j.ipsoptions);m.ui.addButton('Ipsoptions',{label:'Editor Options',command:n,icon:this.path+'images/ips_options.png'});}});j.ipsoptions={exec:function(m){if(!Object.isUndefined(j.ipsoptions.popup))j.ipsoptions.popup.kill();var n=ipb.vars.base_url+'app=core&module=ajax&section=editor&do=showSettings&secure_key='+ipb.vars.secure_hash;
+new Ajax.Request(n.replace(/&amp;/g,'&'),{method:'get',evalJSON:'force',onSuccess:function(o){j.ipsoptions.popup=new ipb.Popup('options_popup',{type:'pane',initial:o.responseText,hideAtStart:false,hideClose:false,defer:false,modal:true,w:'200px',h:'170'});$('ipsEditorOptionsSave').observe('click',j.ipsoptions.saveIt.bindAsEventListener(m));}});},saveIt:function(m,n){Event.stop(m);var o=ipb.vars.base_url+'app=core&module=ajax&section=editor&do=saveSettings&secure_key='+ipb.vars.secure_hash;new Ajax.Request(o.replace(/&amp;/g,'&'),{method:'post',evalJSON:'force',parameters:{bw_cke_contextmenu:$F('bw_cke_contextmenu'),clearSavedContent:$F('clearSavedContent')},onSuccess:function(p){if(p.responseJSON.error=='nopermission'||p.responseJSON.error=='no_permission')ipb.global.errorDialogue(ipb.lang.no_permission);else{j.ipsoptions.popup.hide();if($F('clearSavedContent')==1)try{var q='__last_update_stamp_'+ipb.textEditor.getCurrentEditorId(),r=$$('._as_launch').first().up('.cke_path');$$('.'+q).invoke('remove');r.remove();}catch(s){}ipb.global.showInlineNotification('Options saved. Changes will take affect from the next editor load');$('ipsEditorOptionsSave').stopObserving();}},onFailure:function(p,q){Debug.error(q);}});},modes:{wysiwyg:1,source:1}};j.add('ipsquote',{init:function(m){var n='ipsquote',o=m.addCommand(n,j.ipsquote);m.ui.addButton('Ipsquote',{label:ipb.lang.ckeditor__quotelabel,command:n,icon:this.path+'images/quote.png'});}});j.ipsquote={exec:function(m){var n=new h('p');n.setHtml('[quote]'+IPSCKTools.cleanHtmlForTagWrap(IPSCKTools.getSelectionHtml(m))+'[/quote]');m.insertElement(n);},canUndo:true,modes:{wysiwyg:1}};(function(){var m='ipsswitch';j.add(m,{init:function(n){var o={modes:{wysiwyg:1,source:1},editorFocus:false,canUndo:false,exec:function(r){ipb.textEditor.switchEditor();}},p=m,q=n.addCommand(p,o);n.ui.addButton('Ipsswitch',{label:ipb.lang.ckeditor__togglelabel,command:p,icon:this.path+'images/switch.png'});}});})();(function(){j.ipsemoticon={editor:{},emoPerPage:20,emoTotalPages:0,emoTotal:0,emoPage:1,emoAll:{count:false},addEmoticon:function(n){imgObj=Event.findElement(n);editor=j.ipsemoticon.editor;var o=imgObj.readAttribute('src'),p=imgObj.readAttribute('alt'),q=editor.document.createElement('img',{attributes:{src:o,title:p,alt:p,'class':'bbc_emoticon'}});editor.insertElement(q);editor.insertText(' ');Event.stop(n);},createTray:function(){var x=this;var n=j.ipsemoticon.editor,o=$('cke_'+n.name),p=new Element('div',{id:'cke_'+n.name+'_stray','class':'ipsSmileyTray'}).hide();
+o.insert({after:p});x.populateTray($H(IPS_smiles.emoticons));x.emoPage=1;x.emoTotalPages=1;if(IPS_smiles.total>x.emoPerPage)x.emoTotalPages=Math.ceil(IPS_smiles.total/x.emoPerPage);$('cke_'+n.name+'_stray').blindDown({duration:0.4,afterFinish:j.ipsemoticon.addShowAllLink()});x.setUpPrevNext();try{var q=document.viewport.getDimensions(),r=$('cke_'+n.name).getDimensions(),s=$('cke_'+n.name).cumulativeScrollOffset(),t=$('cke_'+n.name).cumulativeOffset(),u=t.top+r.height,v=s.top+q.height;if(u>v){var w=u-v;window.scrollTo(0,s.top+w+100);}}catch(y){Debug.error(y);}ipb.delegate.register('.ipsSmileyTray_next',j.ipsemoticon.fireNext);ipb.delegate.register('.ipsSmileyTray_prev',j.ipsemoticon.firePrev);ipb.delegate.register('.ipsSmileyTray_all',j.ipsemoticon.fireAll);return true;},setUpPrevNext:function(){var n=this;if(n.emoPage<n.emoTotalPages)$('cke_'+n.editor.name+'_stray').insert(new Element('div',{'class':'ipsSmileyTray_next'}));if(n.emoPage>1)$('cke_'+n.editor.name+'_stray').insert(new Element('div',{'class':'ipsSmileyTray_prev'}));},firePrev:function(){if(j.ipsemoticon.emoAll.count===false)j.ipsemoticon.getJson(j.ipsemoticon.firePrev);else{var n=j.ipsemoticon.emoPerPage*(j.ipsemoticon.emoPage-1)-j.ipsemoticon.emoPerPage;j.ipsemoticon.emoPage--;j.ipsemoticon.showPage(n);}},fireNext:function(){if(j.ipsemoticon.emoAll.count===false)j.ipsemoticon.getJson(j.ipsemoticon.fireNext);else{var n=j.ipsemoticon.emoPerPage*j.ipsemoticon.emoPage;j.ipsemoticon.emoPage++;j.ipsemoticon.showPage(n);}},fireAll:function(n,o){var p=ipb.vars.base_url+'&app=forums&module=extras&section=legends';window.open(p,'Emo','status=0,toolbar=0,location=0,menubar=0,width=300,height=600,scrollbars=yes');Event.stop(n);return false;},showPage:function(n){var o=new Hash(),p=0,q=0;$H(j.ipsemoticon.emoAll.emoticons).each(function(r){var s=r.key,t=r.value;if(typeof t.src!='undefined'){q++;if(n==0||q-1>=n){p++;if(p<=j.ipsemoticon.emoPerPage)o.set(s,t);}}});$('cke_'+j.ipsemoticon.editor.name+'_stray').select('span').each(function(r){new Effect.Fade(r,{duration:0.2,afterFinish:function(){j.ipsemoticon.populateTray(o);j.ipsemoticon.setUpPrevNext();}});});},getJson:function(n){j.ipsemoticon.emoAll.count=0;var o=ipb.vars.base_url+'app=core&module=ajax&section=editor&do=getEmoticons&secure_key='+ipb.vars.secure_hash;new Ajax.Request(o.replace(/&amp;/g,'&'),{method:'get',evalJSON:'force',onSuccess:function(p){if(p.responseJSON){j.ipsemoticon.emoAll=p.responseJSON;n();}},onFailure:function(p,q){Debug.error(q);},onException:function(p,q){Debug.error(q);
+}});},populateTray:function(n){var o=j.ipsemoticon.editor;$('cke_'+o.name+'_stray').update('');n.each(function(p){var q=p.key,r=p.value;if(typeof r.src!='undefined'){var s=new Element('img',{src:e.htmlEncode(IPS_smiley_path+r.src),alt:r.text,'class':'bbc_emoticon',id:'ipsEmo__'+q}),t=new Element('span').addClassName('cke_hand').insert(s).hide();$('cke_'+o.name+'_stray').insert(t);$('ipsEmo__'+q).on('click',j.ipsemoticon.addEmoticon);}});$('cke_'+j.ipsemoticon.editor.name+'_stray').select('span').each(function(p){new Effect.Appear(p,{duration:0.2});});},addShowAllLink:function(){var n=j.ipsemoticon.editor;$('cke_'+n.name+'_stray').insert({after:new Element('div',{id:'ips_x_smile_show_all','class':'ipsSmileyTray_all'}).addClassName('ipsText_smaller').update(ipb.lang.emo_show_all)});},removeShowAllLink:function(){$('ips_x_smile_show_all').remove();}};var m={exec:function(n){j.ipsemoticon.editor=n;j.ipsemoticon.emoCount=IPS_smiles.emoticons.total;if($('cke_'+n.name+'_stray')){if($('cke_'+n.name+'_stray').visible())$('cke_'+n.name+'_stray').blindUp({duration:0.4,afterFinish:j.ipsemoticon.removeShowAllLink()});else $('cke_'+n.name+'_stray').blindDown({duration:0.4,afterFinish:j.ipsemoticon.addShowAllLink()});}else j.ipsemoticon.createTray();}};j.add('ipsemoticon',{init:function(n){var o='ipsemoticon',p=n.addCommand(o,m);n.ui.addButton('Ipsemoticon',{label:n.lang.smiley.toolbar,command:o,icon:this.path+'images/ips_emoticon.png'});}});})();})();
diff --git a/upload/public/js/3rd_party/ckeditor/ckeditor_basic.js b/upload/public/js/3rd_party/ckeditor/ckeditor_basic.js
new file mode 100644
index 00000000..01c27fd8
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/ckeditor_basic.js
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'B8DJ5M3',version:'3.6.2',revision:'7275',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;if(!d)throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/'&&!/[&?]t=/.test(d))d+=(d.indexOf('?')>=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();var a=CKEDITOR;if(!a.event){a.event=function(){};a.event.implementOn=function(b){var c=a.event.prototype;for(var d in c){if(b[d]==undefined)b[d]=c[d];}};a.event.prototype=(function(){var b=function(d){var e=d.getPrivate&&d.getPrivate()||d._||(d._={});return e.events||(e.events={});},c=function(d){this.name=d;this.listeners=[];};c.prototype={getListenerIndex:function(d){for(var e=0,f=this.listeners;e<f.length;e++){if(f[e].fn==d)return e;}return-1;}};return{on:function(d,e,f,g,h){var i=b(this),j=i[d]||(i[d]=new c(d));if(j.getListenerIndex(e)<0){var k=j.listeners;if(!f)f=this;if(isNaN(h))h=10;var l=this,m=function(o,p,q,r){var s={name:d,sender:this,editor:o,data:p,listenerData:g,stop:q,cancel:r,removeListener:function(){l.removeListener(d,e);}};e.call(f,s);return s.data;};m.fn=e;m.priority=h;for(var n=k.length-1;n>=0;n--){if(k[n].priority<=h){k.splice(n+1,0,m);return;}}k.unshift(m);}},fire:(function(){var d=false,e=function(){d=true;},f=false,g=function(){f=true;};return function(h,i,j){var k=b(this)[h],l=d,m=f;d=f=false;if(k){var n=k.listeners;if(n.length){n=n.slice(0);for(var o=0;o<n.length;o++){var p=n[o].call(this,j,i,e,g);if(typeof p!='undefined')i=p;if(d||f)break;}}}var q=f||(typeof i=='undefined'?false:i);d=l;f=m;return q;};})(),fireOnce:function(d,e,f){var g=this.fire(d,e,f);delete b(this)[d];return g;},removeListener:function(d,e){var f=b(this)[d];if(f){var g=f.getListenerIndex(e);if(g>=0)f.listeners.splice(g,1);
+}},hasListeners:function(d){var e=b(this)[d];return e&&e.listeners.length>0;}};})();}if(!a.editor){a.ELEMENT_MODE_NONE=0;a.ELEMENT_MODE_REPLACE=1;a.ELEMENT_MODE_APPENDTO=2;a.editor=function(b,c,d,e){var f=this;f._={instanceConfig:b,element:c,data:e};f.elementMode=d||0;a.event.call(f);f._init();};a.editor.replace=function(b,c){var d=b;if(typeof d!='object'){d=document.getElementById(b);if(d&&d.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1})d=null;if(!d){var e=0,f=document.getElementsByName(b);while((d=f[e++])&&d.tagName.toLowerCase()!='textarea'){}}if(!d)throw '[CKEDITOR.editor.replace] The element with id or name "'+b+'" was not found.';}d.style.visibility='hidden';return new a.editor(c,d,1);};a.editor.appendTo=function(b,c,d){var e=b;if(typeof e!='object'){e=document.getElementById(b);if(!e)throw '[CKEDITOR.editor.appendTo] The element with id "'+b+'" was not found.';}return new a.editor(c,e,2,d);};a.editor.prototype={_init:function(){var b=a.editor._pending||(a.editor._pending=[]);b.push(this);},fire:function(b,c){return a.event.prototype.fire.call(this,b,c,this);},fireOnce:function(b,c){return a.event.prototype.fireOnce.call(this,b,c,this);}};a.event.implementOn(a.editor.prototype,true);}if(!a.env)a.env=(function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,d={ie:/*@cc_on!@*/false,opera:!!c&&c.version,webkit:b.indexOf(' applewebkit/')>-1,air:b.indexOf(' adobeair/')>-1,mac:b.indexOf('macintosh')>-1,quirks:document.compatMode=='BackCompat',mobile:b.indexOf('mobile')>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var g=document.domain,h=window.location.hostname;return g!=h&&g!='['+h+']';},secure:location.protocol=='https:'};d.gecko=navigator.product=='Gecko'&&!d.webkit&&!d.opera;var e=0;if(d.ie){e=parseFloat(b.match(/msie (\d+)/)[1]);d.ie8=!!document.documentMode;d.ie8Compat=document.documentMode==8;d.ie9Compat=document.documentMode==9;d.ie7Compat=e==7&&!document.documentMode||document.documentMode==7;d.ie6Compat=e<7||d.quirks;}if(d.gecko){var f=b.match(/rv:([\d\.]+)/);if(f){f=f[1].split('.');e=f[0]*10000+(f[1]||0)*100+ +(f[2]||0);}}if(d.opera)e=parseFloat(c.version());if(d.air)e=parseFloat(b.match(/ adobeair\/(\d+)/)[1]);if(d.webkit)e=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]);d.version=e;d.isCompatible=d.iOS&&e>=534||!d.mobile&&(d.ie&&e>=6||d.gecko&&e>=10801||d.opera&&e>=9.5||d.air&&e>=1||d.webkit&&e>=522||false);d.cssClass='cke_browser_'+(d.ie?'ie':d.gecko?'gecko':d.opera?'opera':d.webkit?'webkit':'unknown');
+if(d.quirks)d.cssClass+=' cke_browser_quirks';if(d.ie){d.cssClass+=' cke_browser_ie'+(d.version<7?'6':d.version>=8?document.documentMode:'7');if(d.quirks)d.cssClass+=' cke_browser_iequirks';}if(d.gecko&&e<10900)d.cssClass+=' cke_browser_gecko18';if(d.air)d.cssClass+=' cke_browser_air';return d;})();var b=a.env;var c=b.ie;if(a.status=='unloaded')(function(){a.event.implementOn(a);a.loadFullCore=function(){if(a.status!='basic_ready'){a.loadFullCore._load=1;return;}delete a.loadFullCore;var e=document.createElement('script');e.type='text/javascript';e.src=a.basePath+'ckeditor.js';document.getElementsByTagName('head')[0].appendChild(e);};a.loadFullCoreTimeout=0;a.replaceClass='ckeditor';a.replaceByClassEnabled=1;var d=function(e,f,g,h){if(b.isCompatible){if(a.loadFullCore)a.loadFullCore();var i=g(e,f,h);a.add(i);return i;}return null;};a.replace=function(e,f){return d(e,f,a.editor.replace);};a.appendTo=function(e,f,g){return d(e,f,a.editor.appendTo,g);};a.add=function(e){var f=this._.pending||(this._.pending=[]);f.push(e);};a.replaceAll=function(){var e=document.getElementsByTagName('textarea');for(var f=0;f<e.length;f++){var g=null,h=e[f];if(!h.name&&!h.id)continue;if(typeof arguments[0]=='string'){var i=new RegExp('(?:^|\\s)'+arguments[0]+'(?:$|\\s)');if(!i.test(h.className))continue;}else if(typeof arguments[0]=='function'){g={};if(arguments[0](h,g)===false)continue;}this.replace(h,g);}};(function(){var e=function(){var f=a.loadFullCore,g=a.loadFullCoreTimeout;if(a.replaceByClassEnabled)a.replaceAll(a.replaceClass);a.status='basic_ready';if(f&&f._load)f();else if(g)setTimeout(function(){if(a.loadFullCore)a.loadFullCore();},g*1000);};if(window.addEventListener)window.addEventListener('load',e,false);else if(window.attachEvent)window.attachEvent('onload',e);})();a.status='basic_loaded';})();})();
diff --git a/upload/public/js/3rd_party/ckeditor/ckeditor_source.js b/upload/public/js/3rd_party/ckeditor/ckeditor_source.js
new file mode 100644
index 00000000..7f2a8ed3
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/ckeditor_source.js
@@ -0,0 +1,35 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+// Compressed version of core/ckeditor_base.js. See original for instructions.
+/*jsl:ignore*/
+if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'3.6.2',revision:'7275',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/')d+=(d.indexOf('?')>=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+/*jsl:end*/
+
+// Uncomment the following line to have a new timestamp generated for each
+// request, having clear cache load of the editor code.
+// CKEDITOR.timestamp = ( new Date() ).valueOf();
+
+if ( CKEDITOR.loader )
+	CKEDITOR.loader.load( 'core/ckeditor' );
+else
+{
+	// Set the script name to be loaded by the loader.
+	CKEDITOR._autoLoad = 'core/ckeditor';
+
+	// Include the loader script.
+	if ( document.body && (!document.readyState || document.readyState == 'complete') )
+	{
+		var script = document.createElement( 'script' );
+		script.type = 'text/javascript';
+		script.src = CKEDITOR.getUrl( '_source/core/loader.js' );
+		document.body.appendChild( script );
+	}
+	else
+	{
+		document.write(
+			'<script type="text/javascript" src="' + CKEDITOR.getUrl( '_source/core/loader.js' ) + '"></script>' );
+	}
+}
diff --git a/upload/public/js/3rd_party/ckeditor/config.js b/upload/public/js/3rd_party/ckeditor/config.js
new file mode 100644
index 00000000..15116022
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/config.js
@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+	// Define changes to default configuration here. For example:
+	// config.language = 'fr';
+	// config.uiColor = '#AADC6E';
+};
diff --git a/upload/public/js/3rd_party/ckeditor/contents.css b/upload/public/js/3rd_party/ckeditor/contents.css
new file mode 100644
index 00000000..fc7d1a38
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/contents.css
@@ -0,0 +1,38 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: 'Helvetica Neue', Arial, Verdana, sans-serif;
+	font-size: 14px;
+
+	/* Text color */
+	color: #222;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+}
+
+/* preserved spaces for rtl list item bullets. (#6249)*/
+ol,ul,dl
+{
+    padding-right:40px;
+}
+
+p { margin: 0px; }
+
+img:-moz-broken
+{
+	-moz-force-broken-image-icon : 1;
+	width : 24px;
+	height : 24px;
+}
+img, input, textarea
+{
+	cursor: default;
+}
+
+img.bbc_emoticon { vertical-align: middle; }
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/images/index.html b/upload/public/js/3rd_party/ckeditor/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_avatars/blank_avatar.gif b/upload/public/js/3rd_party/ckeditor/images/spacer.gif
similarity index 100%
rename from upload/public/style_avatars/blank_avatar.gif
rename to upload/public/js/3rd_party/ckeditor/images/spacer.gif
diff --git a/upload/public/js/3rd_party/ckeditor/index.html b/upload/public/js/3rd_party/ckeditor/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/ips_changed.txt b/upload/public/js/3rd_party/ckeditor/ips_changed.txt
new file mode 100644
index 00000000..a346e37a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/ips_changed.txt
@@ -0,0 +1,64 @@
+/**
+ * IPS Changed stuff
+ */
+ 
+plugins/link/dialogs/link.js
+line 385: hidden: 1
+
+plugins/image/dialogs/link.js
+various: hidden: 1
+
+plugins/smiley/dialogs/smiley.js
+line 40, line 47
+
+/contents.css
+
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: 'Helvetica Neue', Arial, Verdana, sans-serif;
+	font-size: 14px;
+
+	/* Text color */
+	color: #222;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+}
+
+/* preserved spaces for rtl list item bullets. (#6249)*/
+ol,ul,dl
+{
+    padding-right:40px;
+}
+
+html
+{
+	/* #3658: [IE6] Editor document has horizontal scrollbar on long lines
+	To prevent this misbehavior, we show the scrollbar always */
+	_overflow-y: scroll;
+	/* #6341: The text cursor must be set on the editor area. */
+	cursor: text;
+	/* #6632: Avoid having "text" shape of cursor in IE7 scrollbars.*/
+	*cursor:auto;
+}
+
+p { margin: 0px; }
+
+img:-moz-broken
+{
+	-moz-force-broken-image-icon : 1;
+	width : 24px;
+	height : 24px;
+}
+img, input, textarea
+{
+	cursor: default;
+}
+
+img.bbc_emoticon { vertical-align: middle; }
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/ips_config.js b/upload/public/js/3rd_party/ckeditor/ips_config.js
new file mode 100644
index 00000000..2424a6bd
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/ips_config.js
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * Configurations for IP.Board (default)
+ */
+ 
+CKEDITOR.editorConfig = function( config )
+{
+	/* Styles */
+	config.skin   = 'ips';
+	config.uiColor = '#ebebeb';
+	
+	/* RTL */
+	if( isRTL )
+	{
+		config.contentsLangDirection	= 'rtl';
+	}
+	
+	CKEDITOR.lang.languages.ipb		= 1;
+	config.language					= 'ipb';
+	
+	/* Disable width resize */
+	config.resize_maxWidth = '100%';
+
+	/* Use p */
+	config.enterMode      = CKEDITOR.ENTER_P;
+	config.forceEnterMode = false;
+	config.shiftEnterMode = CKEDITOR.ENTER_BR;
+	
+	/* Hide advanced options */
+	config.linkShowAdvancedTab = false;
+	config.linkShowTargetTab   = false;
+	
+	/* Editor autosave frequency in milliseconds */
+	config.autoAjaxSaveInterval = 120000;
+	
+	/* Use numerical entities instead of named entities */
+	//config.entities_processNumerical = 'force';
+	
+	/* Hide elements path body > strong etc, and the right click context menu */
+	IPS_remove_plugins.push('a11yhelp');
+	IPS_remove_plugins.push('elementspath');
+	IPS_remove_plugins.push('contextmenu');
+	IPS_remove_plugins.push('flash');
+	IPS_remove_plugins.push('filebrowser');
+	IPS_remove_plugins.push('iframe');
+	IPS_remove_plugins.push('scayt');
+	IPS_remove_plugins.push('smiley');
+	IPS_remove_plugins.push('table');
+	IPS_remove_plugins.push('tabletools');
+	IPS_remove_plugins.push('wsc');
+	
+	config.removePlugins = IPS_remove_plugins.join(',');
+	
+	/* Only use font-sizes we recognize */
+	config.fontSize_sizes	= '8/8px;10/10px;12/12px;14/14px;18/18px;24/24px;36/36px;48/48px';
+	
+	/* Register our custom plug ins */
+	if ( inACP )
+	{
+		config.extraPlugins = 'ipsbbcode,ipsquote,ipscode,ipsmedia,ipsoptions,ipsautosave,ipsswitch';
+	}
+	else
+	{
+		config.extraPlugins = 'ipsbbcode,ipsquote,ipscode,ipsmedia,ipsautosave,ipsswitch,pastefromword,ipsemoticon';
+	}
+	
+	config.disableNativeSpellChecker = false;
+	
+	/* Define tool bars */
+	config.toolbar = new Array( 'ipsfull', 'ipsmini' );
+	
+	config.toolbar_ipsfull =
+	[
+		['Ipsswitch', 'RemoveFormat', 'Ipsbbcode'], [ '-', 'Font', 'FontSize'], [ '-', 'TextColor', 'Ipsemoticon', 'Ipsmedia' ], ['-','Find', 'Replace'], '-', ['Undo', 'Redo'], '-', ['Copy', 'Paste', 'PasteText', 'PasteFromWord' ],
+		'/',
+		['Bold', 'Italic', 'Underline', 'Strike' ], ['Subscript', 'Superscript'], ['BulletedList', 'NumberedList'],
+		['Link', 'Unlink', 'Image', 'Ipscode', 'Ipsquote' ], config.IPS_BBCODE_BUTTONS, ['Outdent', 'Indent', 'JustifyLeft','JustifyCenter','JustifyRight']
+	
+	];
+
+	config.toolbar_ipsmini =
+	[
+		['Ipsswitch', 'RemoveFormat' ], ['Bold', 'Italic', 'Underline', 'Strike' ], ['BulletedList'], ['Font'], ['TextColor'], ['Smiley', '-', 'Link', 'Unlink', 'Image', '-', 'Ipsmedia', '-', 'Ipscode', 'Ipsquote' ]
+	];
+	
+	if(CKEDITOR.env.opera)
+    {
+        delete config.blockedKeystrokes[config.blockedKeystrokes.indexOf(CKEDITOR.CTRL + 66)];
+        for(var r in config.keystrokes)
+            if(config.keystrokes[r][0]==CKEDITOR.CTRL + 66 && config.keystrokes.splice(r,1)) break;
+    }
+};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/_languages.js b/upload/public/js/3rd_party/ckeditor/lang/_languages.js
new file mode 100644
index 00000000..f923803e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/_languages.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+var CKEDITOR_LANGS=(function(){var b={af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',cy:'Welsh',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-gb':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',is:'Icelandic',it:'Italian',ja:'Japanese',ka:'Georgian',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},c=[];for(var d in b)c.push({code:d,name:b[d]});c.sort(function(e,f){return e.name<f.name?-1:1;});return c;})();
diff --git a/upload/public/js/3rd_party/ckeditor/lang/_translationstatus.txt b/upload/public/js/3rd_party/ckeditor/lang/_translationstatus.txt
new file mode 100644
index 00000000..894ceb28
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/_translationstatus.txt
@@ -0,0 +1,61 @@
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+
+af.js      Found: 549 Missing: 27
+ar.js      Found: 467 Missing: 109
+bg.js      Found: 291 Missing: 285
+bn.js      Found: 292 Missing: 284
+bs.js      Found: 175 Missing: 401
+ca.js      Found: 550 Missing: 26
+cs.js      Found: 550 Missing: 26
+cy.js      Found: 573 Missing: 3
+da.js      Found: 417 Missing: 159
+de.js      Found: 576 Missing: 0
+el.js      Found: 306 Missing: 270
+en-au.js   Found: 345 Missing: 231
+en-ca.js   Found: 345 Missing: 231
+en-gb.js   Found: 518 Missing: 58
+eo.js      Found: 270 Missing: 306
+es.js      Found: 576 Missing: 0
+et.js      Found: 575 Missing: 1
+eu.js      Found: 417 Missing: 159
+fa.js      Found: 576 Missing: 0
+fi.js      Found: 576 Missing: 0
+fo.js      Found: 551 Missing: 25
+fr-ca.js   Found: 319 Missing: 257
+fr.js      Found: 551 Missing: 25
+gl.js      Found: 292 Missing: 284
+gu.js      Found: 320 Missing: 256
+he.js      Found: 576 Missing: 0
+hi.js      Found: 322 Missing: 254
+hr.js      Found: 419 Missing: 157
+hu.js      Found: 573 Missing: 3
+is.js      Found: 326 Missing: 250
+it.js      Found: 573 Missing: 3
+ja.js      Found: 494 Missing: 82
+ka.js      Found: 569 Missing: 7
+km.js      Found: 286 Missing: 290
+ko.js      Found: 304 Missing: 272
+lt.js      Found: 576 Missing: 0
+lv.js      Found: 294 Missing: 282
+mn.js      Found: 320 Missing: 256
+ms.js      Found: 276 Missing: 300
+nb.js      Found: 575 Missing: 1
+nl.js      Found: 576 Missing: 0
+no.js      Found: 575 Missing: 1
+pl.js      Found: 576 Missing: 0
+pt-br.js   Found: 576 Missing: 0
+pt.js      Found: 293 Missing: 283
+ro.js      Found: 317 Missing: 259
+ru.js      Found: 576 Missing: 0
+sk.js      Found: 365 Missing: 211
+sl.js      Found: 426 Missing: 150
+sr-latn.js Found: 287 Missing: 289
+sr.js      Found: 286 Missing: 290
+sv.js      Found: 551 Missing: 25
+th.js      Found: 298 Missing: 278
+tr.js      Found: 536 Missing: 40
+uk.js      Found: 544 Missing: 32
+vi.js      Found: 493 Missing: 83
+zh-cn.js   Found: 576 Missing: 0
+zh.js      Found: 419 Missing: 157
diff --git a/upload/public/js/3rd_party/ckeditor/lang/af.js b/upload/public/js/3rd_party/ckeditor/lang/af.js
new file mode 100644
index 00000000..56e9e5f1
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/af.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.af={dir:'ltr',editorTitle:'Teksverwerker, %1, druk op ALT 0 vir hulp.',toolbars:'Editor toolbars',editor:'Teksverwerker',source:'Bron',newPage:'Nuwe bladsy',save:'Bewaar',preview:'Voorbeeld',cut:'Knip',copy:'Kopiëer',paste:'Plak',print:'Druk',underline:'Onderstreep',bold:'Vet',italic:'Skuins',selectAll:'Selekteer alles',removeFormat:'Verwyder opmaak',strike:'Deurstreep',subscript:'Onderskrif',superscript:'Bo-skrif',horizontalrule:'Horisontale lyn invoeg',pagebreak:'Bladsy-einde invoeg',pagebreakAlt:'Bladsy-einde',unlink:'Verwyder skakel',undo:'Ontdoen',redo:'Oordoen',common:{browseServer:'Blaai op bediener',url:'URL',protocol:'Protokol',upload:'Oplaai',uploadSubmit:'Stuur na bediener',image:'Afbeelding',flash:'Flash',form:'Vorm',checkbox:'Merkhokkie',radio:'Radioknoppie',textField:'Teksveld',textarea:'Teks-area',hiddenField:'Blinde veld',button:'Knop',select:'Keuseveld',imageButton:'Afbeeldingsknop',notSet:'<geen instelling>',id:'Id',name:'Naam',langDir:'Skryfrigting',langDirLtr:'Links na regs (LTR)',langDirRtl:'Regs na links (RTL)',langCode:'Taalkode',longDescr:'Lang beskrywing URL',cssClass:'CSS klasse',advisoryTitle:'Aanbevole titel',cssStyle:'Styl',ok:'OK',cancel:'Kanselleer',close:'Sluit',preview:'Voorbeeld',generalTab:'Algemeen',advancedTab:'Gevorderd',validateNumberFailed:"Hierdie waarde is nie 'n getal nie.",confirmNewPage:"Alle wysiginge sal verlore gaan. Is u seker dat u 'n nuwe bladsy wil laai?",confirmCancel:'Sommige opsies is gewysig. Is u seker dat u hierdie dialoogvenster wil sluit?',options:'Opsies',target:'Doel',targetNew:'Nuwe venster (_blank)',targetTop:'Boonste venster (_top)',targetSelf:'Selfde venster (_self)',targetParent:'Oorspronklike venster (_parent)',langDirLTR:'Links na Regs (LTR)',langDirRTL:'Regs na Links (RTL)',styles:'Styl',cssClasses:'CSS klasse',width:'Breedte',height:'Hoogte',align:'Oplyn',alignLeft:'Links',alignRight:'Regs',alignCenter:'Sentreer',alignTop:'Bo',alignMiddle:'Middel',alignBottom:'Onder',invalidHeight:"Hoogte moet 'n getal wees",invalidWidth:"Breedte moet 'n getal wees.",invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nie beskikbaar nie</span>'},contextmenu:{options:'Konteks Spyskaart-opsies'},specialChar:{toolbar:'Voeg spesiaale karakter in',title:'Kies spesiale karakter',options:'Spesiale karakter-opsies'},link:{toolbar:'Skakel invoeg/wysig',other:'<ander>',menu:'Wysig skakel',title:'Skakel',info:'Skakel informasie',target:'Doel',upload:'Oplaai',advanced:'Gevorderd',type:'Skakelsoort',toUrl:'URL',toAnchor:'Anker in bladsy',toEmail:'E-pos',targetFrame:'<raam>',targetPopup:'<opspringvenster>',targetFrameName:'Naam van doelraam',targetPopupName:'Naam van opspringvenster',popupFeatures:'Eienskappe van opspringvenster',popupResizable:'Herskaalbaar',popupStatusBar:'Statusbalk',popupLocationBar:'Adresbalk',popupToolbar:'Werkbalk',popupMenuBar:'Spyskaartbalk',popupFullScreen:'Volskerm (IE)',popupScrollBars:'Skuifbalke',popupDependent:'Afhanklik (Netscape)',popupLeft:'Posisie links',popupTop:'Posisie bo',id:'Id',langDir:'Skryfrigting',langDirLTR:'Links na regs (LTR)',langDirRTL:'Regs na links (RTL)',acccessKey:'Toegangsleutel',name:'Naam',langCode:'Taalkode',tabIndex:'Tab indeks',advisoryTitle:'Aanbevole titel',advisoryContentType:'Aanbevole inhoudstipe',cssClasses:'CSS klasse',charset:'Karakterstel van geskakelde bron',styles:'Styl',rel:'Relationship',selectAnchor:"Kies 'n anker",anchorName:'Op ankernaam',anchorId:'Op element Id',emailAddress:'E-posadres',emailSubject:'Berig-onderwerp',emailBody:'Berig-inhoud',noAnchors:'(Geen ankers beskikbaar in dokument)',noUrl:'Gee die skakel se URL',noEmail:'Gee die e-posadres'},anchor:{toolbar:'Anker byvoeg/verander',menu:'Anker-eienskappe',title:'Anker-eienskappe',name:'Ankernaam',errorName:'Voltooi die ankernaam asseblief',remove:'Remove Anchor'},list:{numberedTitle:'Eienskappe van genommerde lys',bulletedTitle:'Eienskappe van ongenommerde lys',type:'Tipe',start:'Begin',validateStartNumber:"Beginnommer van lys moet 'n heelgetal wees.",circle:'Sirkel',disc:'Skyf',square:'Vierkant',none:'Geen',notset:'<nie ingestel nie>',armenian:'Armeense nommering',georgian:'Georgiese nommering (an, ban, gan, ens.)',lowerRoman:'Romeinse kleinletters (i, ii, iii, iv, v, ens.)',upperRoman:'Romeinse hoofletters (I, II, III, IV, V, ens.)',lowerAlpha:'Kleinletters (a, b, c, d, e, ens.)',upperAlpha:'Hoofletters (A, B, C, D, E, ens.)',lowerGreek:'Griekse kleinletters (alpha, beta, gamma, ens.)',decimal:'Desimale syfers (1, 2, 3, ens.)',decimalLeadingZero:'Desimale syfers met voorloopnul (01, 02, 03, ens.)'},findAndReplace:{title:'Soek en vervang',find:'Soek',replace:'Vervang',findWhat:'Soek na:',replaceWith:'Vervang met:',notFoundMsg:'Teks nie gevind nie.',findOptions:'Find Options',matchCase:'Hoof/kleinletter sensitief',matchWord:'Hele woord moet voorkom',matchCyclic:'Soek deurlopend',replaceAll:'Vervang alles',replaceSuccessMsg:'%1 voorkoms(te) vervang.'},table:{toolbar:'Tabel',title:'Tabel eienskappe',menu:'Tabel eienskappe',deleteTable:'Verwyder tabel',rows:'Rye',columns:'Kolomme',border:'Randbreedte',widthPx:'piksels',widthPc:'persent',widthUnit:'breedte-eenheid',cellSpace:'Sel-afstand',cellPad:'Sel-spasie',caption:'Naam',summary:'Opsomming',headers:'Opskrifte',headersNone:'Geen',headersColumn:'Eerste kolom',headersRow:'Eerste ry',headersBoth:'Beide    ',invalidRows:"Aantal rye moet 'n getal groter as 0 wees.",invalidCols:"Aantal kolomme moet 'n getal groter as 0 wees.",invalidBorder:"Randbreedte moet 'n getal wees.",invalidWidth:"Tabelbreedte moet 'n getal wees.",invalidHeight:"Tabelhoogte moet 'n getal wees.",invalidCellSpacing:"Sel-afstand moet 'n getal wees.",invalidCellPadding:"Sel-spasie moet 'n getal wees.",cell:{menu:'Sel',insertBefore:'Voeg sel in voor',insertAfter:'Voeg sel in na',deleteCell:'Verwyder sel',merge:'Voeg selle saam',mergeRight:'Voeg saam na regs',mergeDown:'Voeg saam ondertoe',splitHorizontal:'Splits sel horisontaal',splitVertical:'Splits sel vertikaal',title:'Sel eienskappe',cellType:'Sel tipe',rowSpan:'Omspan rye',colSpan:'Omspan kolomme',wordWrap:'Woord terugloop',hAlign:'Horisontale oplyning',vAlign:'Vertikale oplyning',alignBaseline:'Basislyn',bgColor:'Agtergrondkleur',borderColor:'Randkleur',data:'Inhoud',header:'Opskrif',yes:'Ja',no:'Nee',invalidWidth:"Selbreedte moet 'n getal wees.",invalidHeight:"Selhoogte moet 'n getal wees.",invalidRowSpan:"Omspan rye moet 'n heelgetal wees.",invalidColSpan:"Omspan kolomme moet 'n heelgetal wees.",chooseColor:'Kies'},row:{menu:'Ry',insertBefore:'Voeg ry in voor',insertAfter:'Voeg ry in na',deleteRow:'Verwyder ry'},column:{menu:'Kolom',insertBefore:'Voeg kolom in voor',insertAfter:'Voeg kolom in na',deleteColumn:'Verwyder kolom'}},button:{title:'Knop eienskappe',text:'Teks (Waarde)',type:'Soort',typeBtn:'Knop',typeSbm:'Stuur',typeRst:'Maak leeg'},checkboxAndRadio:{checkboxTitle:'Merkhokkie eienskappe',radioTitle:'Radioknoppie eienskappe',value:'Waarde',selected:'Geselekteer'},form:{title:'Vorm eienskappe',menu:'Vorm eienskappe',action:'Aksie',method:'Metode',encoding:'Kodering'},select:{title:'Keuseveld eienskappe',selectInfo:'Info',opAvail:'Beskikbare opsies',value:'Waarde',size:'Grootte',lines:'Lyne',chkMulti:'Laat meer as een keuse toe',opText:'Teks',opValue:'Waarde',btnAdd:'Byvoeg',btnModify:'Wysig',btnUp:'Op',btnDown:'Af',btnSetValue:'Stel as geselekteerde waarde',btnDelete:'Verwyder'},textarea:{title:'Teks-area eienskappe',cols:'Kolomme',rows:'Rye'},textfield:{title:'Teksveld eienskappe',name:'Naam',value:'Waarde',charWidth:'Breedte (karakters)',maxChars:'Maksimum karakters',type:'Soort',typeText:'Teks',typePass:'Wagwoord'},hidden:{title:'Verborge veld eienskappe',name:'Naam',value:'Waarde'},image:{title:'Afbeelding eienskappe',titleButton:'Afbeeldingsknop eienskappe',menu:'Afbeelding eienskappe',infoTab:'Afbeelding informasie',btnUpload:'Stuur na bediener',upload:'Oplaai',alt:'Alternatiewe teks',lockRatio:'Vaste proporsie',resetSize:'Herstel grootte',border:'Rand',hSpace:'HSpasie',vSpace:'VSpasie',alertUrl:'Gee URL van afbeelding.',linkTab:'Skakel',button2Img:"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?",img2Button:"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?",urlMissing:'Die URL na die afbeelding ontbreek.',validateBorder:"Rand moet 'n heelgetal wees.",validateHSpace:"HSpasie moet 'n heelgetal wees.",validateVSpace:"VSpasie moet 'n heelgetal wees."},flash:{properties:'Flash eienskappe',propertiesTab:'Eienskappe',title:'Flash eienskappe',chkPlay:'Speel outomaties',chkLoop:'Herhaal',chkMenu:'Flash spyskaart aan',chkFull:'Laat volledige skerm toe',scale:'Skaal',scaleAll:'Wys alles',scaleNoBorder:'Geen rand',scaleFit:'Presiese pas',access:'Skrip toegang',accessAlways:'Altyd',accessSameDomain:'Selfde domeinnaam',accessNever:'Nooit',alignAbsBottom:'Absoluut-onder',alignAbsMiddle:'Absoluut-middel',alignBaseline:'Basislyn',alignTextTop:'Teks bo',quality:'Kwaliteit',qualityBest:'Beste',qualityHigh:'Hoog',qualityAutoHigh:'Outomaties hoog',qualityMedium:'Gemiddeld',qualityAutoLow:'Outomaties laag',qualityLow:'Laag',windowModeWindow:'Venster',windowModeOpaque:'Ondeursigtig',windowModeTransparent:'Deursigtig',windowMode:'Venster modus',flashvars:'Veranderlikes vir Flash',bgcolor:'Agtergrondkleur',hSpace:'HSpasie',vSpace:'VSpasie',validateSrc:'Voeg die URL in',validateHSpace:"HSpasie moet 'n heelgetal wees.",validateVSpace:"VSpasie moet 'n heelgetal wees."},spellCheck:{toolbar:'Speltoets',title:'Speltoetser',notAvailable:'Jammer, hierdie diens is nie nou beskikbaar nie.',errorLoading:'Fout by inlaai van diens: %s.',notInDic:'Nie in woordeboek nie',changeTo:'Verander na',btnIgnore:'Ignoreer',btnIgnoreAll:'Ignoreer alles',btnReplace:'Vervang',btnReplaceAll:'vervang alles',btnUndo:'Ontdoen',noSuggestions:'- Geen voorstel -',progress:'Spelling word getoets...',noMispell:'Klaar met speltoets: Geen foute nie',noChanges:'Klaar met speltoets: Geen woorde verander nie',oneChange:'Klaar met speltoets: Een woord verander',manyChanges:'Klaar met speltoets: %1 woorde verander',ieSpellDownload:'Speltoetser is nie geïnstalleer nie. Wil u dit nou aflaai?'},smiley:{toolbar:'Lagbekkie',title:'Voeg lagbekkie by',options:'Lagbekkie opsies'},elementsPath:{eleLabel:'Elemente-pad',eleTitle:'%1 element'},numberedlist:'Genommerde lys',bulletedlist:'Ongenommerde lys',indent:'Vergroot inspring',outdent:'Verklein inspring',justify:{left:'Links oplyn',center:'Sentreer',right:'Regs oplyn',block:'Uitvul'},blockquote:'Sitaatblok',clipboard:{title:'Byvoeg',cutError:'U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).',copyError:'U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).',pasteMsg:'Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.',securityMsg:'Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.',pasteArea:'Plak-area'},pastefromword:{confirmCleanup:'Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?',toolbar:'Plak vanuit Word',title:'Plak vanuit Word',error:"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout"},pasteText:{button:'Plak as eenvoudige teks',title:'Plak as eenvoudige teks'},templates:{button:'Sjablone',title:'Inhoud Sjablone',options:'Sjabloon opsies',insertOption:'Vervang huidige inhoud',selectPromptMsg:'Kies die sjabloon om te gebruik in die redigeerder (huidige inhoud gaan verlore):',emptyListMsg:'(Geen sjablone gedefineer nie)'},showBlocks:'Toon blokke',stylesCombo:{label:'Styl',panelTitle:'Opmaak style',panelTitle1:'Blok style',panelTitle2:'Inlyn style',panelTitle3:'Objek style'},format:{label:'Opmaak',panelTitle:'Opmaak',tag_p:'Normaal',tag_pre:'Opgemaak',tag_address:'Adres',tag_h1:'Opskrif 1',tag_h2:'Opskrif 2',tag_h3:'Opskrif 3',tag_h4:'Opskrif 4',tag_h5:'Opskrif 5',tag_h6:'Opskrif 6',tag_div:'Normaal (DIV)'},div:{title:'Skep Div houer',toolbar:'Skep Div houer',cssClassInputLabel:'CSS klasse',styleSelectLabel:'Styl',IdInputLabel:'Id',languageCodeInputLabel:' Taalkode',inlineStyleInputLabel:'Inlyn Styl',advisoryTitleInputLabel:'Aanbevole Titel',langDirLabel:'Skryfrigting',langDirLTRLabel:'Links na regs (LTR)',langDirRTLLabel:'Regs na links (RTL)',edit:'Wysig Div',remove:'Verwyder Div'},iframe:{title:'IFrame Eienskappe',toolbar:'IFrame',noUrl:'Gee die iframe URL',scrolling:'Skuifbalke aan',border:'Wys rand van raam'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Fontnaam'},fontSize:{label:'Grootte',voiceLabel:'Fontgrootte',panelTitle:'Fontgrootte'},colorButton:{textColorTitle:'Tekskleur',bgColorTitle:'Agtergrondkleur',panelTitle:'Kleure',auto:'Outomaties',more:'Meer Kleure...'},colors:{'000':'Swart',800000:'Meroen','8B4513':'Sjokoladebruin','2F4F4F':'Donkerleisteengrys','008080':'Blougroen','000080':'Vlootblou','4B0082':'Indigo',696969:'Donkergrys',B22222:'Rooibaksteen',A52A2A:'Bruin',DAA520:'Donkergeel','006400':'Donkergroen','40E0D0':'Turkoois','0000CD':'Middelblou',800080:'Pers',808080:'Grys',F00:'Rooi',FF8C00:'Donkeroranje',FFD700:'Goud','008000':'Groen','0FF':'Siaan','00F':'Blou',EE82EE:'Viooltjieblou',A9A9A9:'Donkergrys',FFA07A:'Ligsalm',FFA500:'Oranje',FFFF00:'Geel','00FF00':'Lemmetjie',AFEEEE:'Ligturkoois',ADD8E6:'Ligblou',DDA0DD:'Pruim',D3D3D3:'Liggrys',FFF0F5:'Linne',FAEBD7:'Ivoor',FFFFE0:'Liggeel',F0FFF0:'Heuningdou',F0FFFF:'Asuur',F0F8FF:'Ligte hemelsblou',E6E6FA:'Laventel',FFF:'Wit'},scayt:{title:'Speltoets terwyl u tik',opera_title:'Nie ondersteun deur Opera nie',enable:'SCAYT aan',disable:'SCAYT af',about:'SCAYT info',toggle:'SCAYT wissel aan/af',options:'Opsies',langs:'Tale',moreSuggestions:'Meer voorstelle',ignore:'Ignoreer',ignoreAll:'Ignoreer alles',addWord:'Voeg woord by',emptyDic:'Woordeboeknaam mag nie leeg wees nie.',optionsTab:'Opsies',allCaps:'Ignoreer woorde in hoofletters',ignoreDomainNames:'Ignoreer domeinname',mixedCase:'Ignoreer woorde met hoof- en kleinletters',mixedWithDigits:'Ignoreer woorde met syfers',languagesTab:'Tale',dictionariesTab:'Woordeboeke',dic_field_name:'Naam van woordeboek',dic_create:'Skep',dic_restore:'Herstel',dic_delete:'Verwijder',dic_rename:'Hernoem',dic_info:"Aanvanklik word die gebruikerswoordeboek in 'n koekie gestoor. Koekies is egter beperk in grootte. Wanneer die gebruikerswoordeboek te groot vir 'n koekie geword het, kan dit op ons bediener gestoor word. Om u persoonlike woordeboek op ons bediener te stoor, gee asb. 'n naam vir u woordeboek. Indien u alreeds 'n gestoorde woordeboek het, tik die naam en kliek op die Herstel knop.",aboutTab:'Info'},about:{title:'Info oor CKEditor',dlgTitle:'Info oor CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Vir lisensie-informasie, besoek asb. ons webwerf:',copy:'Kopiereg &copy; $1. Alle regte voorbehou.'},maximize:'Maksimaliseer',minimize:'Minimaliseer',fakeobjects:{anchor:'Anker',flash:'Flash animasie',iframe:'IFrame',hiddenfield:'Verborge veld',unknown:'Onbekende objek'},resize:'Sleep om te herskaal',colordialog:{title:'Kies kleur',options:'Kleuropsies',highlight:'Aktief',selected:'Geselekteer',clear:'Herstel'},toolbarCollapse:'Verklein werkbalk',toolbarExpand:'Vergroot werkbalk',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Skryfrigting van links na regs',rtl:'Skryfrigting van regs na links'},docprops:{label:'Dokument Eienskappe',title:'Dokument Eienskappe',design:'Design',meta:'Meta Data',chooseColor:'Kies',other:'<ander>',docTitle:'Bladsy Opskrif',charset:'Karakterstel Kodeering',charsetOther:'Ander Karakterstel Kodeering',charsetASCII:'ASCII',charsetCE:'Sentraal Europa',charsetCT:'Chinees Traditioneel (Big5)',charsetCR:'Cyrillic',charsetGR:'Grieks',charsetJP:'Japanees',charsetKR:'Koreans',charsetTR:'Turks',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Dokument Opskrif Soort',docTypeOther:'Ander Dokument Opskrif Soort',xhtmlDec:'Voeg XHTML verklaring by',bgColor:'Agtergrond kleur',bgImage:'Agtergrond Beeld URL',bgFixed:'Vasgeklemde Agtergrond',txtColor:'Tekskleur',margin:'Bladsy Rante',marginTop:'Bo',marginLeft:'Links',marginRight:'Regs',marginBottom:'Onder',metaKeywords:'Dokument Index Sleutelwoorde(comma verdeelt)',metaDescription:'Dokument Beskrywing',metaAuthor:'Skrywer',metaCopyright:'Kopiereg',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ar.js b/upload/public/js/3rd_party/ckeditor/lang/ar.js
new file mode 100644
index 00000000..dab6ea54
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ar.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ar={dir:'rtl',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'المصدر',newPage:'ص�حة جديدة',save:'ح�ظ',preview:'معاينة الص�حة',cut:'قص',copy:'نسخ',paste:'لصق',print:'طباعة',underline:'تسطير',bold:'غامق',italic:'مائل',selectAll:'تحديد الكل',removeFormat:'إزالة التنسيقات',strike:'يتوسطه خط',subscript:'منخ�ض',superscript:'مرت�ع',horizontalrule:'خط �اصل',pagebreak:'إدخال ص�حة جديدة',pagebreakAlt:'Page Break',unlink:'إزالة رابط',undo:'تراجع',redo:'إعادة',common:{browseServer:'تص�ح',url:'الرابط',protocol:'البروتوكول',upload:'ر�ع',uploadSubmit:'أرسل',image:'صورة',flash:'�لاش',form:'نموذج',checkbox:'خانة إختيار',radio:'زر اختيار',textField:'مربع نص',textarea:'مساحة نصية',hiddenField:'إدراج حقل خ�ي',button:'زر ضغط',select:'اختار',imageButton:'زر صورة',notSet:'<بدون تحديد>',id:'الرقم',name:'الاسم',langDir:'إتجاه النص',langDirLtr:'اليسار لليمين (LTR)',langDirRtl:'اليمين لليسار (RTL)',langCode:'رمز اللغة',longDescr:'الوص� الت�صيلى',cssClass:'�ئات التنسيق',advisoryTitle:'عنوان التقرير',cssStyle:'نمط',ok:'موا�ق',cancel:'إلغاء الأمر',close:'Close',preview:'Preview',generalTab:'عام',advancedTab:'متقدم',validateNumberFailed:'لايوجد نتيجة',confirmNewPage:'ست�قد أي متغييرات اذا لم تقم بح�ظها اولا. هل أنت متأكد أنك تريد ص�حة جديدة؟',confirmCancel:'بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'العرض',height:'الإرت�اع',align:'محاذاة',alignLeft:'يسار',alignRight:'يمين',alignCenter:'وسط',alignTop:'أعلى',alignMiddle:'وسط',alignBottom:'أس�ل',invalidHeight:'الارت�اع يجب أن يكون عدداً.',invalidWidth:'العرض يجب أن يكون عدداً.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, غير متاح</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'إدراج  خاص.�',title:'اختر الخواص',options:'Special Character Options'},link:{toolbar:'رابط',other:'<أخرى>',menu:'تحرير رابط',title:'إرتباط تشعبي',info:'معلومات الرابط',target:'هد� الرابط',upload:'ر�ع',advanced:'متقدم',type:'نوع الربط',toUrl:'URL',toAnchor:'مكان �ي هذا المستند',toEmail:'بريد إلكتروني',targetFrame:'<إطار>',targetPopup:'<نا�ذة منبثقة>',targetFrameName:'اسم الإطار المستهد�',targetPopupName:'اسم النا�ذة المنبثقة',popupFeatures:'خصائص النا�ذة المنبثقة',popupResizable:'قابلة التشكيل',popupStatusBar:'شريط الحالة',popupLocationBar:'شريط العنوان',popupToolbar:'شريط الأدوات',popupMenuBar:'القوائم الرئيسية',popupFullScreen:'ملئ الشاشة (IE)',popupScrollBars:'أشرطة التمرير',popupDependent:'تابع (Netscape)',popupLeft:'التمركز لليسار',popupTop:'التمركز للأعلى',id:'هوية',langDir:'إتجاه النص',langDirLTR:'اليسار لليمين (LTR)',langDirRTL:'اليمين لليسار (RTL)',acccessKey:'م�اتيح الإختصار',name:'الاسم',langCode:'كود النص',tabIndex:'الترتيب',advisoryTitle:'عنوان التقرير',advisoryContentType:'نوع التقرير',cssClasses:'�ئات التنسيق',charset:'ترميز المادة المطلوبة',styles:'نمط',rel:'Relationship',selectAnchor:'اختر علامة مرجعية',anchorName:'حسب الاسم',anchorId:'حسب رقم العنصر',emailAddress:'عنوان البريد إلكتروني',emailSubject:'موضوع الرسالة',emailBody:'محتوى الرسالة',noAnchors:'(لا توجد علامات مرجعية �ي هذا المستند)',noUrl:'من �ضلك أدخل عنوان الموقع الذي يشير إليه الرابط',noEmail:'من �ضلك أدخل عنوان البريد الإلكتروني'},anchor:{toolbar:'إشارة مرجعية',menu:'تحرير الإشارة المرجعية',title:'خصائص الإشارة المرجعية',name:'اسم الإشارة المرجعية',errorName:'الرجاء كتابة اسم الإشارة المرجعية',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'بحث واستبدال',find:'بحث',replace:'إستبدال',findWhat:'البحث بـ:',replaceWith:'إستبدال بـ:',notFoundMsg:'لم يتم العثور على النص المحدد.',findOptions:'Find Options',matchCase:'مطابقة حالة الأحر�',matchWord:'مطابقة بالكامل',matchCyclic:'مطابقة دورية',replaceAll:'إستبدال الكل',replaceSuccessMsg:'تم استبدال 1% من الحالات '},table:{toolbar:'جدول',title:'خصائص الجدول',menu:'خصائص الجدول',deleteTable:'حذ� الجدول',rows:'ص�و�',columns:'أعمدة',border:'الحدود',widthPx:'بكسل',widthPc:'بالمئة',widthUnit:'width unit',cellSpace:'تباعد الخلايا',cellPad:'المسا�ة البادئة',caption:'الوص�',summary:'الخلاصة',headers:'العناوين',headersNone:'بدون',headersColumn:'العمود الأول',headersRow:'الص� الأول',headersBoth:'كلاهما',invalidRows:'عدد الص�و� يجب أن يكون عدداً أكبر من ص�ر.',invalidCols:'عدد الأعمدة يجب أن يكون عدداً أكبر من ص�ر.',invalidBorder:'حجم الحد يجب أن يكون عدداً.',invalidWidth:'عرض الجدول يجب أن يكون عدداً.',invalidHeight:'ارت�اع الجدول يجب أن يكون عدداً.',invalidCellSpacing:'المسا�ة بين الخلايا يجب أن تكون عدداً.',invalidCellPadding:'المسا�ة البادئة يجب أن تكون عدداً',cell:{menu:'خلية',insertBefore:'إدراج خلية قبل',insertAfter:'إدراج خلية بعد',deleteCell:'حذ� خلية',merge:'دمج خلايا',mergeRight:'دمج لليمين',mergeDown:'دمج للأس�ل',splitHorizontal:'تقسيم الخلية أ�قياً',splitVertical:'تقسيم الخلية عمودياً',title:'خصائص الخلية',cellType:'نوع الخلية',rowSpan:'امتداد الص�و�',colSpan:'امتداد الأعمدة',wordWrap:'الت�ا� النص',hAlign:'محاذاة أ�قية',vAlign:'محاذاة رأسية',alignBaseline:'خط القاعدة',bgColor:'لون الخل�ية',borderColor:'لون الحدود',data:'بيانات',header:'عنوان',yes:'نعم',no:'لا',invalidWidth:'عرض الخلية يجب أن يكون عدداً.',invalidHeight:'ارت�اع الخلية يجب أن يكون عدداً.',invalidRowSpan:'امتداد الص�و� يجب أن يكون عدداً صحيحاً.',invalidColSpan:'امتداد الأعمدة يجب أن يكون عدداً صحيحاً.',chooseColor:'اختر'},row:{menu:'ص�',insertBefore:'إدراج ص� قبل',insertAfter:'إدراج ص� بعد',deleteRow:'حذ� ص�و�'},column:{menu:'عمود',insertBefore:'إدراج عمود قبل',insertAfter:'إدراج عمود بعد',deleteColumn:'حذ� أعمدة'}},button:{title:'خصائص زر الضغط',text:'القيمة/التسمية',type:'نوع الزر',typeBtn:'زر',typeSbm:'إرسال',typeRst:'إعادة تعيين'},checkboxAndRadio:{checkboxTitle:'خصائص خانة الإختيار',radioTitle:'خصائص زر الخيار',value:'القيمة',selected:'محدد'},form:{title:'خصائص النموذج',menu:'خصائص النموذج',action:'اسم المل�',method:'الأسلوب',encoding:'تش�ير'},select:{title:'خصائص اختيار الحقل',selectInfo:'اختار معلومات',opAvail:'الخيارات المتاحة',value:'القيمة',size:'الحجم',lines:'الأسطر',chkMulti:'السماح بتحديدات متعددة',opText:'النص',opValue:'القيمة',btnAdd:'إضا�ة',btnModify:'تعديل',btnUp:'أعلى',btnDown:'أس�ل',btnSetValue:'إجعلها محددة',btnDelete:'إزالة'},textarea:{title:'خصائص مساحة النص',cols:'الأعمدة',rows:'الص�و�'},textfield:{title:'خصائص مربع النص',name:'الاسم',value:'القيمة',charWidth:'عرض السمات',maxChars:'اقصى عدد للسمات',type:'نوع المحتوى',typeText:'نص',typePass:'كلمة مرور'},hidden:{title:'خصائص الحقل المخ�ي',name:'الاسم',value:'القيمة'},image:{title:'خصائص الصورة',titleButton:'خصائص زر الصورة',menu:'خصائص الصورة',infoTab:'معلومات الصورة',btnUpload:'أرسلها للخادم',upload:'ر�ع',alt:'عنوان الصورة',lockRatio:'تناسق الحجم',resetSize:'إستعادة الحجم الأصلي',border:'سمك الحدود',hSpace:'تباعد أ�قي',vSpace:'تباعد عمودي',alertUrl:'�ضلاً أكتب الموقع الذي توجد عليه هذه الصورة.',linkTab:'الرابط',button2Img:'هل تريد تحويل زر الصورة المختار إلى صورة بسيطة؟',img2Button:'هل تريد تحويل الصورة المختارة إلى زر صورة؟',urlMissing:'عنوان مصدر الصورة م�قود',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'خصائص ال�لاش',propertiesTab:'الخصائص',title:'خصائص �يلم ال�لاش',chkPlay:'تشغيل تلقائي',chkLoop:'تكرار',chkMenu:'تمكين قائمة �يلم ال�لاش',chkFull:'ملء الشاشة',scale:'الحجم',scaleAll:'إظهار الكل',scaleNoBorder:'بلا حدود',scaleFit:'ضبط تام',access:'دخول النص البرمجي',accessAlways:'دائماً',accessSameDomain:'ن�س النطاق',accessNever:'مطلقاً',alignAbsBottom:'أس�ل النص',alignAbsMiddle:'وسط السطر',alignBaseline:'على السطر',alignTextTop:'أعلى النص',quality:'جودة',qualityBest:'أ�ضل',qualityHigh:'عالية',qualityAutoHigh:'عالية تلقائياً',qualityMedium:'متوسطة',qualityAutoLow:'منخ�ضة تلقائياً',qualityLow:'منخ�ضة',windowModeWindow:'نا�ذة',windowModeOpaque:'غير ش�ا�',windowModeTransparent:'ش�ا�',windowMode:'وضع النا�ذة',flashvars:'متغيرات ال�لاش',bgcolor:'لون الخل�ية',hSpace:'تباعد أ�قي',vSpace:'تباعد عمودي',validateSrc:'�ضلاً أدخل عنوان الموقع الذي يشير إليه الرابط',validateHSpace:'HSpace يجب أن يكون عدداً.',validateVSpace:'VSpace يجب أن يكون عدداً.'},spellCheck:{toolbar:'تدقيق إملائي',title:'التدقيق الإملائي',notAvailable:'ع�واً، ولكن هذه الخدمة غير متاحة الان',errorLoading:'خطأ �ي تحميل تطبيق خدمة الاستضا�ة: %s.',notInDic:'ليست �ي القاموس',changeTo:'التغيير إلى',btnIgnore:'تجاهل',btnIgnoreAll:'تجاهل الكل',btnReplace:'تغيير',btnReplaceAll:'تغيير الكل',btnUndo:'تراجع',noSuggestions:'- لا توجد إقتراحات -',progress:'جاري التدقيق الاملائى',noMispell:'تم التدقيق الإملائي: لم يتم العثور على أي أخطاء إملائية',noChanges:'تم التدقيق الإملائي: لم يتم تغيير أي كلمة',oneChange:'تم التدقيق الإملائي: تم تغيير كلمة واحدة �قط',manyChanges:'تم إكمال التدقيق الإملائي: تم تغيير %1 من كلمات',ieSpellDownload:'المدقق الإملائي (الإنجليزي) غير مثبّت. هل تود تحميله الآن؟'},smiley:{toolbar:'ابتسامات',title:'إدراج ابتسامات',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'عنصر 1%'},numberedlist:'ادخال/حذ� تعداد رقمي',bulletedlist:'ادخال/حذ� تعداد نقطي',indent:'زيادة المسا�ة البادئة',outdent:'إنقاص المسا�ة البادئة',justify:{left:'محاذاة إلى اليسار',center:'توسيط',right:'محاذاة إلى اليمين',block:'ضبط'},blockquote:'اقتباس',clipboard:{title:'لصق',cutError:'الإعدادات الأمنية للمتص�ح الذي تستخدمه تمنع القص التلقائي. �ضلاً إستخدم لوحة الم�اتيح ل�عل ذلك (Ctrl/Cmd+X).',copyError:'الإعدادات الأمنية للمتص�ح الذي تستخدمه تمنع النسخ التلقائي. �ضلاً إستخدم لوحة الم�اتيح ل�عل ذلك (Ctrl/Cmd+C).',pasteMsg:'الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) �ي لوحة الم�اتيح، ثم اضغط زر  <STRONG>موا�ق</STRONG>.',securityMsg:'نظراً لإعدادات الأمان الخاصة بمتص�حك، لن يتمكن هذا المحرر من الوصول لمحتوى حا�ظتك، لذلك يجب عليك لصق المحتوى مرة أخرى �ي هذه النا�ذة.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظي�ه قبل الشروع �ي عملية اللصق؟',toolbar:'لصق من وورد',title:'لصق من وورد',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'لصق كنص بسيط',title:'لصق كنص بسيط'},templates:{button:'القوالب',title:'قوالب المحتوى',options:'Template Options',insertOption:'استبدال المحتوى',selectPromptMsg:'اختر القالب الذي تود وضعه �ي المحرر',emptyListMsg:'(لم يتم تعري� أي قالب)'},showBlocks:'مخطط ت�صيلي',stylesCombo:{label:'أنماط',panelTitle:'Formatting Styles',panelTitle1:'أنماط ال�قرة',panelTitle2:'أنماط مضمنة',panelTitle3:'أنماط الكائن'},format:{label:'تنسيق',panelTitle:'تنسيق ال�قرة',tag_p:'عادي',tag_pre:'منسّق',tag_address:'عنوان',tag_h1:'العنوان 1',tag_h2:'العنوان  2',tag_h3:'العنوان  3',tag_h4:'العنوان  4',tag_h5:'العنوان  5',tag_h6:'العنوان  6',tag_div:'عادي (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'خط',voiceLabel:'حجم الخط',panelTitle:'حجم الخط'},fontSize:{label:'حجم الخط',voiceLabel:'حجم الخط',panelTitle:'حجم الخط'},colorButton:{textColorTitle:'لون النص',bgColorTitle:'لون الخل�ية',panelTitle:'Colors',auto:'تلقائي',more:'ألوان إضا�ية...'},colors:{'000':'أسود',800000:'كستنائي','8B4513':'بني �اتح','2F4F4F':'رمادي أردوازي غامق','008080':'أزرق مخضر','000080':'أزرق داكن','4B0082':'كحلي',696969:'رمادي داكن',B22222:'طوبي',A52A2A:'بني',DAA520:'ذهبي داكن','006400':'أخضر داكن','40E0D0':'�يروزي','0000CD':'أزرق متوسط',800080:'بن�سجي غامق',808080:'رمادي',F00:'أحمر',FF8C00:'برتقالي داكن',FFD700:'ذهبي','008000':'أخضر','0FF':'تركواز','00F':'أزرق',EE82EE:'بن�سجي',A9A9A9:'رمادي شاحب',FFA07A:'برتقالي وردي',FFA500:'برتقالي',FFFF00:'أص�ر','00FF00':'ليموني',AFEEEE:'�يروزي شاحب',ADD8E6:'أزرق �اتح',DDA0DD:'بن�سجي �اتح',D3D3D3:'رمادي �اتح',FFF0F5:'وردي �اتح',FAEBD7:'أبيض عتيق',FFFFE0:'أص�ر �اتح',F0FFF0:'أبيض مائل للأخضر',F0FFFF:'سماوي',F0F8FF:'لبني',E6E6FA:'أرجواني',FFF:'أبيض'},scayt:{title:'تدقيق إملائي أثناء الكتابة',opera_title:'Not supported by Opera',enable:'ت�عيل SCAYT',disable:'تعطيل SCAYT',about:'عن SCAYT',toggle:'تثبيت SCAYT',options:'خيارات',langs:'لغات',moreSuggestions:'المزيد من المقترحات',ignore:'تجاهل',ignoreAll:'تجاهل الكل',addWord:'إضا�ة كلمة',emptyDic:'اسم القاموس يجب ألا يكون �ارغاً.',optionsTab:'خيارات',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'لغات',dictionariesTab:'قواميس',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'عن'},about:{title:'عن CKEditor',dlgTitle:'عن CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'للحصول على معلومات الترخيص ، يرجى زيارة موقعنا على شبكة الانترنت:',copy:'حقوق النشر &copy; $1. جميع الحقوق مح�وظة.'},maximize:'تكبير',minimize:'تصغير',fakeobjects:{anchor:'إرساء',flash:'رسم متحرك بال�لاش',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'كائن غير معرو�'},resize:'اسحب لتغيير الحجم',colordialog:{title:'اختر لون',options:'Color Options',highlight:'إلقاء الضوء',selected:'م�ختار',clear:'مسح'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'خصائص الص�حة',title:'خصائص الص�حة',design:'Design',meta:'المعرّ�ات الرأسية',chooseColor:'اختر',other:'<أخرى>',docTitle:'عنوان الص�حة',charset:'ترميز الحرو�',charsetOther:'ترميز آخر',charsetASCII:'ASCII',charsetCE:'أوروبا الوسطى',charsetCT:'الصينية التقليدية (Big5)',charsetCR:'السيريلية',charsetGR:'اليونانية',charsetJP:'اليابانية',charsetKR:'الكورية',charsetTR:'التركية',charsetUN:'Unicode (UTF-8)',charsetWE:'أوروبا الغربية',docType:'ترويسة نوع  الص�حة',docTypeOther:'ترويسة نوع  ص�حة أخرى',xhtmlDec:'تضمين   إعلانات لغة XHTMLَ',bgColor:'لون الخل�ية',bgImage:'رابط الصورة الخل�ية',bgFixed:'جعلها علامة مائية',txtColor:'لون النص',margin:'هوامش الص�حة',marginTop:'علوي',marginLeft:'أيسر',marginRight:'أيمن',marginBottom:'س�لي',metaKeywords:'الكلمات الأساسية (م�صولة ب�واصل)َ',metaDescription:'وص� الص�حة',metaAuthor:'الكاتب',metaCopyright:'المالك',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/bg.js b/upload/public/js/3rd_party/ckeditor/lang/bg.js
new file mode 100644
index 00000000..cc213792
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/bg.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bg={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Код',newPage:'�ова �траница',save:'Запази',preview:'Предварителен изглед',cut:'Изрежи',copy:'Запамети',paste:'Вмъкни',print:'Печат',underline:'Подчертан',bold:'Удебелен',italic:'Кур�ив',selectAll:'Селектирай в�ичко',removeFormat:'Изтрий форматирането',strike:'Зачертан',subscript:'Индек� за база',superscript:'Индек� за �тепен',horizontalrule:'Вмъкни хоризонтална лини�',pagebreak:'Вмъкни нов ред',pagebreakAlt:'Page Break',unlink:'Изтрий връзка',undo:'Отмени',redo:'Повтори',common:{browseServer:'Разгледай �ървъра',url:'Пълен път (URL)',protocol:'Протокол',upload:'Качи',uploadSubmit:'Прати към �ървъра',image:'Изображение',flash:'Flash',form:'Формул�р',checkbox:'Поле за отметка',radio:'Поле за опци�',textField:'Тек�тово поле',textarea:'Тек�това обла�т',hiddenField:'Скрито поле',button:'Бутон',select:'Падащо меню � опции',imageButton:'Бутон-изображение',notSet:'<не е на�троен>',id:'Идентификатор',name:'Име',langDir:'по�ока на речта',langDirLtr:'От л�во на д��но',langDirRtl:'От д��но на л�во',langCode:'Код на езика',longDescr:'Опи�ание на връзката',cssClass:'Кла� от �тиловите таблици',advisoryTitle:'Препоръчително заглавие',cssStyle:'Стил',ok:'ОК',cancel:'Отказ',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Подробно�ти...',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Ширина',height:'Ви�очина',align:'Подравн�ване',alignLeft:'Л�во',alignRight:'Д��но',alignCenter:'Център',alignTop:'Отгоре',alignMiddle:'По �редата',alignBottom:'Долу',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Вмъкни �пециален �имвол',title:'Изберете �пециален �имвол',options:'Special Character Options'},link:{toolbar:'Добави/Редактирай връзка',other:'<друг>',menu:'Редактирай връзка',title:'Връзка',info:'Информаци� за връзката',target:'Цел',upload:'Качи',advanced:'Подробно�ти...',type:'Вид на връзката',toUrl:'URL',toAnchor:'Котва в текущата �траница',toEmail:'Е-поща',targetFrame:'<рамка>',targetPopup:'<дъщерен прозорец>',targetFrameName:'Име на целеви� прозорец',targetPopupName:'Име на дъщерни� прозорец',popupFeatures:'Параметри на дъщерни� прозорец',popupResizable:'Resizable',popupStatusBar:'Поле за �тату�',popupLocationBar:'Поле за адре�',popupToolbar:'Панел � бутони',popupMenuBar:'Меню',popupFullScreen:'Гол�м екран (MS IE)',popupScrollBars:'Плъзгач',popupDependent:'Зави�им (Netscape)',popupLeft:'Координати - X',popupTop:'Координати - Y',id:'Id',langDir:'по�ока на речта',langDirLTR:'От л�во на д��но',langDirRTL:'От д��но на л�во',acccessKey:'Бърз клавиш',name:'Име',langCode:'по�ока на речта',tabIndex:'Ред на до�тъп',advisoryTitle:'Препоръчително заглавие',advisoryContentType:'Препоръчителен тип на �ъдържанието',cssClasses:'Кла� от �тиловите таблици',charset:'Тип на �вързани� ре�ур�',styles:'Стил',rel:'Relationship',selectAnchor:'Изберете котва',anchorName:'По име на котвата',anchorId:'По идентификатор на елемент',emailAddress:'�дре� за е-поща',emailSubject:'Тема на пи�мото',emailBody:'Тек�т на пи�мото',noAnchors:'(��ма котви в текущи� документ)',noUrl:'Мол�, напишете пълни� път (URL)',noEmail:'Мол�, напишете адре�а за е-поща'},anchor:{toolbar:'Добави/Редактирай котва',menu:'Параметри на котвата',title:'Параметри на котвата',name:'Име на котвата',errorName:'Мол�, въведете име на котвата',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Тър�и',replace:'Заме�ти',findWhat:'Тър�и:',replaceWith:'Заме�ти �:',notFoundMsg:'Указани� тек�т не беше намерен.',findOptions:'Find Options',matchCase:'Съ� �ъщи� реги�тър',matchWord:'Тър�и �ъщата дума',matchCyclic:'Match cyclic',replaceAll:'Заме�ти в�ички',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Таблица',title:'Параметри на таблицата',menu:'Параметри на таблицата',deleteTable:'Изтрий таблицата',rows:'Редове',columns:'Колони',border:'Размер на рамката',widthPx:'пик�ели',widthPc:'проценти',widthUnit:'width unit',cellSpace:'Раз�то�ние между клетките',cellPad:'От�тъп на �ъдържанието в клетките',caption:'Заглавие',summary:'Резюме',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Изтрий клетките',merge:'Обедини клетките',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Изтрий редовете'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Изтрий колоните'}},button:{title:'Параметри на бутона',text:'Тек�т (Стойно�т)',type:'Тип',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Параметри на полето за отметка',radioTitle:'Параметри на полето за опци�',value:'Стойно�т',selected:'Отметнато'},form:{title:'Параметри на формул�ра',menu:'Параметри на формул�ра',action:'Дей�твие',method:'Метод',encoding:'Encoding'},select:{title:'Параметри на падащото меню � опции',selectInfo:'Информаци�',opAvail:'Възможни опции',value:'Стойно�т',size:'Размер',lines:'линии',chkMulti:'Разрешено множе�твено �електиране',opText:'Тек�т',opValue:'Стойно�т',btnAdd:'Добави',btnModify:'Промени',btnUp:'�агоре',btnDown:'�адолу',btnSetValue:'�а�трой като избрана �тойно�т',btnDelete:'Изтрий'},textarea:{title:'Параметри на тек�товата обла�т',cols:'Колони',rows:'Редове'},textfield:{title:'Параметри на тек�товото-поле',name:'Име',value:'Стойно�т',charWidth:'Ширина на �имволите',maxChars:'Мак�имум �имволи',type:'Тип',typeText:'Тек�т',typePass:'Парола'},hidden:{title:'Параметри на �критото поле',name:'Име',value:'Стойно�т'},image:{title:'Параметри на изображението',titleButton:'Параметри на бутона-изображение',menu:'Параметри на изображението',infoTab:'Информаци� за изображението',btnUpload:'Прати към �ървъра',upload:'Качи',alt:'�лтернативен тек�т',lockRatio:'Запази пропорци�та',resetSize:'Въз�танови размера',border:'Рамка',hSpace:'Хоризонтален от�тъп',vSpace:'Вертикален от�тъп',alertUrl:'Мол�, въведете пълни� път до изображението',linkTab:'Връзка',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Параметри на Flash обекта',propertiesTab:'Properties',title:'Параметри на Flash обекта',chkPlay:'�втоматично �тартиране',chkLoop:'�ово �тартиране �лед завършването',chkMenu:'Разрешено Flash меню',chkFull:'Allow Fullscreen',scale:'Оразмер�ване',scaleAll:'Покажи цели� обект',scaleNoBorder:'Без рамка',scaleFit:'Според м��тото',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'�ай-долу',alignAbsMiddle:'Точно по �редата',alignBaseline:'По базовата лини�',alignTextTop:'Върху тек�та',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Цв�т на фона',hSpace:'Хоризонтален от�тъп',vSpace:'Вертикален от�тъп',validateSrc:'Мол�, напишете пълни� път (URL)',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Провери правопи�а',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Лип�ва в речника',changeTo:'Промени на',btnIgnore:'Игнорирай',btnIgnoreAll:'Игнорирай в�ички',btnReplace:'Заме�ти',btnReplaceAll:'Заме�ти в�ички',btnUndo:'Отмени',noSuggestions:'- ��ма предложени� -',progress:'Извършване на проверката за правопи�...',noMispell:'Проверката за правопи� завършена: не �а открити правопи�ни грешки',noChanges:'Проверката за правопи� завършена: н�ма променени думи',oneChange:'Проверката за правопи� завършена: една дума е променена',manyChanges:'Проверката за правопи� завършена: %1 думи �а променени',ieSpellDownload:'Ин�трументът за проверка на правопи� не е ин�талиран. Желаете ли да го ин�талирате ?'},smiley:{toolbar:'У�мивка',title:'Добави у�мивка',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'�умериран �пи�ък',bulletedlist:'�енумериран �пи�ък',indent:'Увеличи от�тъпа',outdent:'�амали от�тъпа',justify:{left:'Подравн�ване в л�во',center:'Подравн�вне в �редата',right:'Подравн�ване в д��но',block:'Дву�транно подравн�ване'},blockquote:'Block Quote',clipboard:{title:'Вмъкни',cutError:'�а�тройките за �игурно�т на ваши� бразуър не разрешават на редактора да изпълни изр�зването. За целта използвайте клавиатурата (Ctrl/Cmd+X).',copyError:'�а�тройките за �игурно�т на ваши� бразуър не разрешават на редактора да изпълни запамет�ването. За целта използвайте клавиатурата (Ctrl/Cmd+C).',pasteMsg:'Вмъкнете тук �ъдъжанието � клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и нати�нете <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Вмъкни от MS Word',title:'Вмъкни от MS Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Вмъкни като чи�т тек�т',title:'Вмъкни като чи�т тек�т'},templates:{button:'Шаблони',title:'Шаблони',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Изберете шаблон <br>(текущото �ъдържание на редактора ще бъде загубено):',emptyListMsg:'(��ма дефинирани шаблони)'},showBlocks:'Show Blocks',stylesCombo:{label:'Стил',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Формат',panelTitle:'Формат',tag_p:'�ормален',tag_pre:'Форматиран',tag_address:'�дре�',tag_h1:'Заглавие 1',tag_h2:'Заглавие 2',tag_h3:'Заглавие 3',tag_h4:'Заглавие 4',tag_h5:'Заглавие 5',tag_h6:'Заглавие 6',tag_div:'Параграф (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Шрифт',voiceLabel:'Font',panelTitle:'Шрифт'},fontSize:{label:'Размер',voiceLabel:'Font Size',panelTitle:'Размер'},colorButton:{textColorTitle:'Цв�т на тек�та',bgColorTitle:'Цв�т на фона',panelTitle:'Colors',auto:'По подразбиране',more:'Други цветове...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Параметри на документа',title:'Параметри на документа',design:'Design',meta:'Мета данни',chooseColor:'Choose',other:'<друг>',docTitle:'Заглавие на �траницата',charset:'Кодиране на �имволите',charsetOther:'Друго кодиране на �имволите',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Тип на документа',docTypeOther:'Друг тип на документа',xhtmlDec:'Включи XHTML деклараци�',bgColor:'Цв�т на фона',bgImage:'Пълен път до фоновото изображение',bgFixed:'�е-повтар�що �е фоново изображение',txtColor:'Цв�т на тек�та',margin:'От�тъпи на �траницата',marginTop:'Горе',marginLeft:'Л�во',marginRight:'Д��но',marginBottom:'Долу',metaKeywords:'Ключови думи за документа (разделени �ъ� запетаи)',metaDescription:'Опи�ание на документа',metaAuthor:'�втор',metaCopyright:'�втор�ки права',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/bn.js b/upload/public/js/3rd_party/ckeditor/lang/bn.js
new file mode 100644
index 00000000..ba4e0226
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/bn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bn={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'সোর�স',newPage:'নত�ন পেজ',save:'সংরক�ষন কর',preview:'প�রিভিউ',cut:'কাট',copy:'কপি',paste:'পেস�ট',print:'প�রিন�ট',underline:'আন�ডারলাইন',bold:'বোল�ড',italic:'ইটালিক',selectAll:'সব সিলেক�ট কর',removeFormat:'ফরমেট সরাও',strike:'স�ট�রাইক থ�র�',subscript:'অধোলেখ',superscript:'অভিলেখ',horizontalrule:'রেখা য�ক�ত কর',pagebreak:'পেজ ব�রেক',pagebreakAlt:'Page Break',unlink:'লিংক সরাও',undo:'আনড�',redo:'রি-ড�',common:{browseServer:'ব�রাউজ সার�ভার',url:'URL',protocol:'প�রোটোকল',upload:'আপলোড',uploadSubmit:'ইহাকে সার�ভারে প�রেরন কর',image:'ছবির লেবেল য�ক�ত কর',flash:'ফ�লাশ লেবেল য�ক�ত কর',form:'ফর�ম',checkbox:'চেক বাক�স',radio:'রেডিও বাটন',textField:'টেক�সট ফীল�ড',textarea:'টেক�সট �রিয়া',hiddenField:'গ�প�ত ফীল�ড',button:'বাটন',select:'বাছাই ফীল�ড',imageButton:'ছবির বাটন',notSet:'<সেট নেই>',id:'আইডি',name:'নাম',langDir:'ভাষা লেখার দিক',langDirLtr:'বাম থেকে ডান (LTR)',langDirRtl:'ডান থেকে বাম (RTL)',langCode:'ভাষা কোড',longDescr:'URL �র লম�বা বর�ণনা',cssClass:'স�টাইল-শীট ক�লাস',advisoryTitle:'পরামর�শ শীর�ষক',cssStyle:'স�টাইল',ok:'ওকে',cancel:'বাতিল',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�ডভান�সড',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'প�রস�থ',height:'দৈর�ঘ�য',align:'�লাইন',alignLeft:'বামে',alignRight:'ডানে',alignCenter:'মা�খানে',alignTop:'উপর',alignMiddle:'মধ�য',alignBottom:'নীচে',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'বিশেষ অক�ষর য�ক�ত কর',title:'বিশেষ ক�যারেক�টার বাছাই কর',options:'Special Character Options'},link:{toolbar:'লিংক য�ক�ত কর',other:'<other>',menu:'লিংক সম�পাদন',title:'লিংক',info:'লিংক তথ�য',target:'টার�গেট',upload:'আপলোড',advanced:'�ডভান�সড',type:'লিংক প�রকার',toUrl:'URL',toAnchor:'�ই পেজে নোঙর কর',toEmail:'ইমেইল',targetFrame:'<ফ�রেম>',targetPopup:'<পপআপ উইন�ডো>',targetFrameName:'টার�গেট ফ�রেমের নাম',targetPopupName:'পপআপ উইন�ডোর নাম',popupFeatures:'পপআপ উইন�ডো ফীচার সমূহ',popupResizable:'Resizable',popupStatusBar:'স�ট�যাটাস বার',popupLocationBar:'লোকেশন বার',popupToolbar:'ট�ল বার',popupMenuBar:'মেন�য� বার',popupFullScreen:'পূর�ণ পর�দা জ�ড়ে (IE)',popupScrollBars:'স�ক�রল বার',popupDependent:'ডিপেন�ডেন�ট (Netscape)',popupLeft:'বামের পজিশন',popupTop:'ডানের পজিশন',id:'Id',langDir:'ভাষা লেখার দিক',langDirLTR:'বাম থেকে ডান (LTR)',langDirRTL:'ডান থেকে বাম (RTL)',acccessKey:'�ক�সেস কী',name:'নাম',langCode:'ভাষা লেখার দিক',tabIndex:'ট�যাব ইন�ডেক�স',advisoryTitle:'পরামর�শ শীর�ষক',advisoryContentType:'পরামর�শ কন�টেন�টের প�রকার',cssClasses:'স�টাইল-শীট ক�লাস',charset:'লিংক রিসোর�স ক�যারেক�টর সেট',styles:'স�টাইল',rel:'Relationship',selectAnchor:'নোঙর বাছাই',anchorName:'নোঙরের নাম দিয়ে',anchorId:'নোঙরের আইডি দিয়ে',emailAddress:'ইমেইল ঠিকানা',emailSubject:'মেসেজের বিষয়',emailBody:'মেসেজের দেহ',noAnchors:'(No anchors available in the document)',noUrl:'অন�গ�রহ করে URL লিংক টাইপ কর�ন',noEmail:'অন�গ�রহ করে ইমেইল �ড�রেস টাইপ কর�ন'},anchor:{toolbar:'নোঙ�গর',menu:'নোঙর প�রোপার�টি',title:'নোঙর প�রোপার�টি',name:'নোঙরের নাম',errorName:'নোঙরের নাম টাইপ কর�ন',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'খোজো',replace:'রিপ�লেস',findWhat:'যা খ��জতে হবে:',replaceWith:'যার সাথে বদলাতে হবে:',notFoundMsg:'আপনার উল�লেখিত টেকস�ট পাওয়া যায়নি',findOptions:'Find Options',matchCase:'কেস মিলাও',matchWord:'প�রা শব�দ মেলাও',matchCyclic:'Match cyclic',replaceAll:'সব বদলে দাও',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'টেবিলের লেবেল য�ক�ত কর',title:'টেবিল প�রোপার�টি',menu:'টেবিল প�রোপার�টি',deleteTable:'টেবিল ডিলীট কর',rows:'রো',columns:'কলাম',border:'বর�ডার সাইজ',widthPx:'পিক�সেল',widthPc:'শতকরা',widthUnit:'width unit',cellSpace:'সেল স�পেস',cellPad:'সেল প�যাডিং',caption:'শীর�ষক',summary:'সারাংশ',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'সেল',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'সেল ম�ছে দাও',merge:'সেল জোড়া দাও',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'রো',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'রো ম�ছে দাও'},column:{menu:'কলাম',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'কলাম ম�ছে দাও'}},button:{title:'বাটন প�রোপার�টি',text:'টেক�সট (ভ�যাল�)',type:'প�রকার',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'চেক বক�স প�রোপার�টি',radioTitle:'রেডিও বাটন প�রোপার�টি',value:'ভ�যাল�',selected:'সিলেক�টেড'},form:{title:'ফর�ম প�রোপার�টি',menu:'ফর�ম প�রোপার�টি',action:'�কশ�যন',method:'পদ�ধতি',encoding:'Encoding'},select:{title:'বাছাই ফীল�ড প�রোপার�টি',selectInfo:'তথ�য',opAvail:'অন�যান�য বিকল�প',value:'ভ�যাল�',size:'সাইজ',lines:'লাইন সমূহ',chkMulti:'�কাধিক সিলেকশন �লাউ কর',opText:'টেক�সট',opValue:'ভ�যাল�',btnAdd:'য�ক�ত',btnModify:'বদলে দাও',btnUp:'উপর',btnDown:'নীচে',btnSetValue:'বাছাই করা ভ�যাল� হিসেবে সেট কর',btnDelete:'ডিলীট'},textarea:{title:'টেক�সট �রিয়া প�রোপার�টি',cols:'কলাম',rows:'রো'},textfield:{title:'টেক�সট ফীল�ড প�রোপার�টি',name:'নাম',value:'ভ�যাল�',charWidth:'ক�যারেক�টার প�রশস�ততা',maxChars:'সর�বাধিক ক�যারেক�টার',type:'টাইপ',typeText:'টেক�সট',typePass:'পাসওয়ার�ড'},hidden:{title:'গ�প�ত ফীল�ড প�রোপার�টি',name:'নাম',value:'ভ�যাল�'},image:{title:'ছবির প�রোপার�টি',titleButton:'ছবি বাটন প�রোপার�টি',menu:'ছবির প�রোপার�টি',infoTab:'ছবির তথ�য',btnUpload:'ইহাকে সার�ভারে প�রেরন কর',upload:'আপলোড',alt:'বিকল�প টেক�সট',lockRatio:'অন�পাত লক কর',resetSize:'সাইজ পূর�বাবস�থায় ফিরিয়ে দাও',border:'বর�ডার',hSpace:'হরাইজন�টাল স�পেস',vSpace:'ভার�টিকেল স�পেস',alertUrl:'অন�গ�রহক করে ছবির URL টাইপ কর�ন',linkTab:'লিংক',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'ফ�লাশ প�রোপার�টি',propertiesTab:'Properties',title:'ফ�ল�যাশ প�রোপার�টি',chkPlay:'অটো প�লে',chkLoop:'লূপ',chkMenu:'ফ�ল�যাশ মেন� �নাবল কর',chkFull:'Allow Fullscreen',scale:'স�কেল',scaleAll:'সব দেখাও',scaleNoBorder:'কোনো বর�ডার নেই',scaleFit:'নিখ��ত ফিট',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs নীচে',alignAbsMiddle:'Abs উপর',alignBaseline:'মূল রেখা',alignTextTop:'টেক�সট উপর',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'বেকগ�রাউন�ড রং',hSpace:'হরাইজন�টাল স�পেস',vSpace:'ভার�টিকেল স�পেস',validateSrc:'অন�গ�রহ করে URL লিংক টাইপ কর�ন',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'বানান চেক',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'শব�দকোষে নেই',changeTo:'�তে বদলাও',btnIgnore:'ইগনোর কর',btnIgnoreAll:'সব ইগনোর কর',btnReplace:'বদলে দাও',btnReplaceAll:'সব বদলে দাও',btnUndo:'আন�ড�',noSuggestions:'- কোন সাজেশন নেই -',progress:'বানান পরীক�ষা চলছে...',noMispell:'বানান পরীক�ষা শেষ: কোন ভ�ল বানান পাওয়া যায়নি',noChanges:'বানান পরীক�ষা শেষ: কোন শব�দ পরিবর�তন করা হয়নি',oneChange:'বানান পরীক�ষা শেষ: �কটি মাত�র শব�দ পরিবর�তন করা হয়েছে',manyChanges:'বানান পরীক�ষা শেষ: %1 গ�লো শব�দ বদলে গ�যাছে',ieSpellDownload:'বানান পরীক�ষক ইনস�টল করা নেই। আপনি কি �খনই �টা ডাউনলোড করতে চান?'},smiley:{toolbar:'স�মাইলী',title:'স�মাইলী য�ক�ত কর',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'সাংখ�যিক লিস�টের লেবেল',bulletedlist:'ব�লেট লিস�ট লেবেল',indent:'ইনডেন�ট বাড়াও',outdent:'ইনডেন�ট কমাও',justify:{left:'বা দিকে ঘে�ষা',center:'মা� বরাবর ঘেষা',right:'ডান দিকে ঘে�ষা',block:'ব�লক জাস�টিফাই'},blockquote:'Block Quote',clipboard:{title:'পেস�ট',cutError:'আপনার ব�রাউজারের স�রক�ষা সেটিংস �ডিটরকে অটোমেটিক কাট করার অন�মতি দেয়নি। দয়া করে �ই কাজের জন�য কিবোর�ড ব�যবহার কর�ন (Ctrl/Cmd+X)।',copyError:'আপনার ব�রাউজারের স�রক�ষা সেটিংস �ডিটরকে অটোমেটিক কপি করার অন�মতি দেয়নি। দয়া করে �ই কাজের জন�য কিবোর�ড ব�যবহার কর�ন (Ctrl/Cmd+C)।',pasteMsg:'অন�গ�রহ করে নীচের বাক�সে কিবোর�ড ব�যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস�ট কর�ন �বং <STRONG>OK</STRONG> চাপ দিন',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'পেস�ট (শব�দ)',title:'পেস�ট (শব�দ)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'সাদা টেক�সট হিসেবে পেস�ট কর',title:'সাদা টেক�সট হিসেবে পেস�ট কর'},templates:{button:'টেমপ�লেট',title:'কনটেন�ট টেমপ�লেট',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'অন�গ�রহ করে �ডিটরে ওপেন করার জন�য টেমপ�লেট বাছাই কর�ন<br>(আসল কনটেন�ট হারিয়ে যাবে):',emptyListMsg:'(কোন টেমপ�লেট ডিফাইন করা নেই)'},showBlocks:'Show Blocks',stylesCombo:{label:'স�টাইল',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'ফন�ট ফরমেট',panelTitle:'ফন�ট ফরমেট',tag_p:'সাধারণ',tag_pre:'ফর�মেটেড',tag_address:'ঠিকানা',tag_h1:'শীর�ষক ১',tag_h2:'শীর�ষক ২',tag_h3:'শীর�ষক ৩',tag_h4:'শীর�ষক ৪',tag_h5:'শীর�ষক ৫',tag_h6:'শীর�ষক ৬',tag_div:'শীর�ষক (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'ফন�ট',voiceLabel:'Font',panelTitle:'ফন�ট'},fontSize:{label:'সাইজ',voiceLabel:'Font Size',panelTitle:'সাইজ'},colorButton:{textColorTitle:'টেক�স�ট রং',bgColorTitle:'বেকগ�রাউন�ড রং',panelTitle:'Colors',auto:'অটোমেটিক',more:'আরও রং...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'ডক�য�মেন�ট প�রোপার�টি',title:'ডক�য�মেন�ট প�রোপার�টি',design:'Design',meta:'মেটাডেটা',chooseColor:'Choose',other:'<other>',docTitle:'পেজ শীর�ষক',charset:'ক�যারেক�টার সেট �নকোডিং',charsetOther:'অন�য ক�যারেক�টার সেট �নকোডিং',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ডক�য�মেন�ট টাইপ হেডিং',docTypeOther:'অন�য ডক�য�মেন�ট টাইপ হেডিং',xhtmlDec:'XHTML ডেক�লারেশন য�ক�ত কর',bgColor:'ব�যাকগ�রাউন�ড রং',bgImage:'ব�যাকগ�রাউন�ড ছবির URL',bgFixed:'স�ক�রলহীন ব�যাকগ�রাউন�ড',txtColor:'টেক�স�ট রং',margin:'পেজ মার�জিন',marginTop:'উপর',marginLeft:'বামে',marginRight:'ডানে',marginBottom:'নীচে',metaKeywords:'ডক�য�মেন�ট ইন�ডেক�স কিওয়ার�ড (কমা দ�বারা বিচ�ছিন�ন)',metaDescription:'ডক�যূমেন�ট বর�ণনা',metaAuthor:'লেখক',metaCopyright:'কপীরাইট',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/bs.js b/upload/public/js/3rd_party/ckeditor/lang/bs.js
new file mode 100644
index 00000000..32ebe95f
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/bs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.bs={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML kôd',newPage:'Novi dokument',save:'Snimi',preview:'Prikaži',cut:'Izreži',copy:'Kopiraj',paste:'Zalijepi',print:'Štampaj',underline:'Podvuci',bold:'Boldiraj',italic:'Ukosi',selectAll:'Selektuj sve',removeFormat:'Poništi format',strike:'Precrtaj',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Ubaci horizontalnu liniju',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Izbriši link',undo:'Vrati',redo:'Ponovi',common:{browseServer:'Browse Server',url:'URL',protocol:'Protokol',upload:'Šalji',uploadSubmit:'Šalji na server',image:'Slika',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<nije podešeno>',id:'Id',name:'Naziv',langDir:'Smjer pisanja',langDirLtr:'S lijeva na desno (LTR)',langDirRtl:'S desna na lijevo (RTL)',langCode:'Jezièni kôd',longDescr:'Dugaèki opis URL-a',cssClass:'Klase CSS stilova',advisoryTitle:'Advisory title',cssStyle:'Stil',ok:'OK',cancel:'Odustani',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Naprednije',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Visina',align:'Poravnanje',alignLeft:'Lijevo',alignRight:'Desno',alignCenter:'Centar',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dno',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Ubaci specijalni karater',title:'Izaberi specijalni karakter',options:'Special Character Options'},link:{toolbar:'Ubaci/Izmjeni link',other:'<other>',menu:'Izmjeni link',title:'Link',info:'Link info',target:'Prozor',upload:'Šalji',advanced:'Naprednije',type:'Tip linka',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<frejm>',targetPopup:'<popup prozor>',targetFrameName:'Target Frame Name',targetPopupName:'Naziv popup prozora',popupFeatures:'Moguænosti popup prozora',popupResizable:'Resizable',popupStatusBar:'Statusna traka',popupLocationBar:'Traka za lokaciju',popupToolbar:'Traka sa alatima',popupMenuBar:'Izborna traka',popupFullScreen:'Cijeli ekran (IE)',popupScrollBars:'Scroll traka',popupDependent:'Ovisno (Netscape)',popupLeft:'Lijeva pozicija',popupTop:'Gornja pozicija',id:'Id',langDir:'Smjer pisanja',langDirLTR:'S lijeva na desno (LTR)',langDirRTL:'S desna na lijevo (RTL)',acccessKey:'Pristupna tipka',name:'Naziv',langCode:'Smjer pisanja',tabIndex:'Tab indeks',advisoryTitle:'Advisory title',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Klase CSS stilova',charset:'Linked Resource Charset',styles:'Stil',rel:'Relationship',selectAnchor:'Izaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id-u elementa',emailAddress:'E-Mail Adresa',emailSubject:'Subjekt poruke',emailBody:'Poruka',noAnchors:'(Nema dostupnih sidra na stranici)',noUrl:'Molimo ukucajte URL link',noEmail:'Molimo ukucajte e-mail adresu'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Naði',replace:'Zamjeni',findWhat:'Naði šta:',replaceWith:'Zamjeni sa:',notFoundMsg:'Traženi tekst nije pronaðen.',findOptions:'Find Options',matchCase:'Uporeðuj velika/mala slova',matchWord:'Uporeðuj samo cijelu rijeè',matchCyclic:'Match cyclic',replaceAll:'Zamjeni sve',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Svojstva tabele',menu:'Svojstva tabele',deleteTable:'Delete Table',rows:'Redova',columns:'Kolona',border:'Okvir',widthPx:'piksela',widthPc:'posto',widthUnit:'width unit',cellSpace:'Razmak æelija',cellPad:'Uvod æelija',caption:'Naslov',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Briši æelije',merge:'Spoji æelije',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Briši redove'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Briši kolone'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Svojstva slike',titleButton:'Image Button Properties',menu:'Svojstva slike',infoTab:'Info slike',btnUpload:'Šalji na server',upload:'Šalji',alt:'Tekst na slici',lockRatio:'Zakljuèaj odnos',resetSize:'Resetuj dimenzije',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Molimo ukucajte URL od slike.',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs dole',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Molimo ukucajte URL link',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smješko',title:'Ubaci smješka',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numerisana lista',bulletedlist:'Lista',indent:'Poveæaj uvod',outdent:'Smanji uvod',justify:{left:'Lijevo poravnanje',center:'Centralno poravnanje',right:'Desno poravnanje',block:'Puno poravnanje'},blockquote:'Block Quote',clipboard:{title:'Zalijepi',cutError:'Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).',copyError:'Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).',pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Zalijepi iz Word-a',title:'Zalijepi iz Word-a',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Zalijepi kao obièan tekst',title:'Zalijepi kao obièan tekst'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Velièina',voiceLabel:'Font Size',panelTitle:'Velièina'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Colors',auto:'Automatska',more:'Više boja...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ca.js b/upload/public/js/3rd_party/ckeditor/lang/ca.js
new file mode 100644
index 00000000..a0aebfbf
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ca={dir:'ltr',editorTitle:'Editor de text enriquit, %1, prem ALT 0 per obtenir ajuda.',toolbars:'Editor toolbars',editor:'Editor de text enriquit',source:'Codi font',newPage:'Nova pàgina',save:'Desa',preview:'Visualització prèvia',cut:'Retalla',copy:'Copia',paste:'Enganxa',print:'Imprimeix',underline:'Subratllat',bold:'Negreta',italic:'Cursiva',selectAll:'Selecciona-ho tot',removeFormat:'Elimina Format',strike:'Barrat',subscript:'Subíndex',superscript:'Superíndex',horizontalrule:'Insereix línia horitzontal',pagebreak:'Insereix salt de pàgina',pagebreakAlt:'Salt de pàgina',unlink:"Elimina l'enllaç",undo:'Desfés',redo:'Refés',common:{browseServer:'Veure servidor',url:'URL',protocol:'Protocol',upload:'Puja',uploadSubmit:'Envia-la al servidor',image:'Imatge',flash:'Flash',form:'Formulari',checkbox:'Casella de verificació',radio:"Botó d'opció",textField:'Camp de text',textarea:'Àrea de text',hiddenField:'Camp ocult',button:'Botó',select:'Camp de selecció',imageButton:"Botó d'imatge",notSet:'<no definit>',id:'Id',name:'Nom',langDir:"Direcció de l'idioma",langDirLtr:"D'esquerra a dreta (LTR)",langDirRtl:'De dreta a esquerra (RTL)',langCode:"Codi d'idioma",longDescr:'Descripció llarga de la URL',cssClass:"Classes del full d'estil",advisoryTitle:'Títol consultiu',cssStyle:'Estil',ok:"D'acord",cancel:'Cancel·la',close:'Tanca',preview:'Previsualitza',generalTab:'General',advancedTab:'Avançat',validateNumberFailed:'Aquest valor no és un número.',confirmNewPage:'Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?',confirmCancel:"Algunes opcions s'han canviat. Esteu segur que voleu tancar la finestra de diàleg?",options:'Opcions',target:'Destí',targetNew:'Nova finestra (_blank)',targetTop:'Finestra major (_top)',targetSelf:'Mateixa finestra (_self)',targetParent:'Finestra pare (_parent)',langDirLTR:"D'esquerra a dreta (LTR)",langDirRTL:'De dreta a esquerra (RTL)',styles:'Estil',cssClasses:"Classes del full d'estil",width:'Amplada',height:'Alçada',align:'Alineació',alignLeft:"Ajusta a l'esquerra",alignRight:'Ajusta a la dreta',alignCenter:'Centre',alignTop:'Superior',alignMiddle:'Centre',alignBottom:'Inferior',invalidHeight:"L'alçada ha de ser un nombre.",invalidWidth:"L'amplada ha de ser un nombre.",invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, no disponible</span>'},contextmenu:{options:'Opcions del menú contextual'},specialChar:{toolbar:'Insereix caràcter especial',title:'Selecciona el caràcter especial',options:'Opcions de caràcters especials'},link:{toolbar:'Insereix/Edita enllaç',other:'<altre>',menu:"Edita l'enllaç",title:'Enllaç',info:"Informació de l'enllaç",target:'Destí',upload:'Puja',advanced:'Avançat',type:"Tipus d'enllaç",toUrl:'URL',toAnchor:'Àncora en aquesta pàgina',toEmail:'Correu electrònic',targetFrame:'<marc>',targetPopup:'<finestra emergent>',targetFrameName:'Nom del marc de destí',targetPopupName:'Nom finestra popup',popupFeatures:'Característiques finestra popup',popupResizable:'Redimensionable',popupStatusBar:"Barra d'estat",popupLocationBar:"Barra d'adreça",popupToolbar:"Barra d'eines",popupMenuBar:'Barra de menú',popupFullScreen:'Pantalla completa (IE)',popupScrollBars:"Barres d'scroll",popupDependent:'Depenent (Netscape)',popupLeft:'Posició esquerra',popupTop:'Posició dalt',id:'Id',langDir:"Direcció de l'idioma",langDirLTR:"D'esquerra a dreta (LTR)",langDirRTL:'De dreta a esquerra (RTL)',acccessKey:"Clau d'accés",name:'Nom',langCode:"Direcció de l'idioma",tabIndex:'Index de Tab',advisoryTitle:'Títol consultiu',advisoryContentType:'Tipus de contingut consultiu',cssClasses:"Classes del full d'estil",charset:'Conjunt de caràcters font enllaçat',styles:'Estil',rel:'Relationship',selectAnchor:'Selecciona una àncora',anchorName:"Per nom d'àncora",anchorId:"Per Id d'element",emailAddress:'Adreça de correu electrònic',emailSubject:'Assumpte del missatge',emailBody:'Cos del missatge',noAnchors:'(No hi ha àncores disponibles en aquest document)',noUrl:"Si us plau, escrigui l'enllaç URL",noEmail:"Si us plau, escrigui l'adreça correu electrònic"},anchor:{toolbar:'Insereix/Edita àncora',menu:"Propietats de l'àncora",title:"Propietats de l'àncora",name:"Nom de l'àncora",errorName:"Si us plau, escriviu el nom de l'ancora",remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Cerca i reemplaça',find:'Cerca',replace:'Reemplaça',findWhat:'Cerca:',replaceWith:'Remplaça amb:',notFoundMsg:"El text especificat no s'ha trobat.",findOptions:'Find Options',matchCase:'Distingeix majúscules/minúscules',matchWord:'Només paraules completes',matchCyclic:'Match cyclic',replaceAll:'Reemplaça-ho tot',replaceSuccessMsg:'%1 ocurrència/es reemplaçada/es.'},table:{toolbar:'Taula',title:'Propietats de la taula',menu:'Propietats de la taula',deleteTable:'Suprimeix la taula',rows:'Files',columns:'Columnes',border:'Mida vora',widthPx:'píxels',widthPc:'percentatge',widthUnit:"unitat d'amplada",cellSpace:'Espaiat de cel·les',cellPad:'Encoixinament de cel·les',caption:'Títol',summary:'Resum',headers:'Capçaleres',headersNone:'Cap',headersColumn:'Primera columna',headersRow:'Primera fila',headersBoth:'Ambdues',invalidRows:'El nombre de files ha de ser un nombre major que 0.',invalidCols:'El nombre de columnes ha de ser un nombre major que 0.',invalidBorder:'El gruix de la vora ha de ser un nombre.',invalidWidth:"L'amplada de la taula  ha de ser un nombre.",invalidHeight:"L'alçada de la taula  ha de ser un nombre.",invalidCellSpacing:"L'espaiat de cel·la  ha de ser un nombre.",invalidCellPadding:"L'encoixinament de cel·la  ha de ser un nombre.",cell:{menu:'Cel·la',insertBefore:'Insereix abans',insertAfter:'Insereix després',deleteCell:'Suprimeix',merge:'Fusiona',mergeRight:'Fusiona a la dreta',mergeDown:'Fusiona avall',splitHorizontal:'Divideix horitzontalment',splitVertical:'Divideix verticalment',title:'Propietats de la cel·la',cellType:'Tipus de cel·la',rowSpan:'Expansió de files',colSpan:'Expansió de columnes',wordWrap:'Ajustar al contingut',hAlign:'Alineació Horizontal',vAlign:'Alineació Vertical',alignBaseline:'A la línia base',bgColor:'Color de fons',borderColor:'Color de la vora',data:'Dades',header:'Capçalera',yes:'Sí',no:'No',invalidWidth:"L'amplada de cel·la ha de ser un nombre.",invalidHeight:"L'alçada de cel·la ha de ser un nombre.",invalidRowSpan:"L'expansió de files ha de ser un nombre enter.",invalidColSpan:"L'expansió de columnes ha de ser un nombre enter.",chooseColor:'Trieu'},row:{menu:'Fila',insertBefore:'Insereix fila abans de',insertAfter:'Insereix fila darrera',deleteRow:'Suprimeix una fila'},column:{menu:'Columna',insertBefore:'Insereix columna abans de',insertAfter:'Insereix columna darrera',deleteColumn:'Suprimeix una columna'}},button:{title:'Propietats del botó',text:'Text (Valor)',type:'Tipus',typeBtn:'Botó',typeSbm:'Transmet formulari',typeRst:'Reinicia formulari'},checkboxAndRadio:{checkboxTitle:'Propietats de la casella de verificació',radioTitle:"Propietats del botó d'opció",value:'Valor',selected:'Seleccionat'},form:{title:'Propietats del formulari',menu:'Propietats del formulari',action:'Acció',method:'Mètode',encoding:'Codificació'},select:{title:'Propietats del camp de selecció',selectInfo:'Info',opAvail:'Opcions disponibles',value:'Valor',size:'Mida',lines:'Línies',chkMulti:'Permet múltiples seleccions',opText:'Text',opValue:'Valor',btnAdd:'Afegeix',btnModify:'Modifica',btnUp:'Amunt',btnDown:'Avall',btnSetValue:'Selecciona per defecte',btnDelete:'Elimina'},textarea:{title:"Propietats de l'àrea de text",cols:'Columnes',rows:'Files'},textfield:{title:'Propietats del camp de text',name:'Nom',value:'Valor',charWidth:'Amplada',maxChars:'Nombre màxim de caràcters',type:'Tipus',typeText:'Text',typePass:'Contrasenya'},hidden:{title:'Propietats del camp ocult',name:'Nom',value:'Valor'},image:{title:'Propietats de la imatge',titleButton:"Propietats del botó d'imatge",menu:'Propietats de la imatge',infoTab:'Informació de la imatge',btnUpload:'Envia-la al servidor',upload:'Puja',alt:'Text alternatiu',lockRatio:'Bloqueja les proporcions',resetSize:'Restaura la mida',border:'Vora',hSpace:'Espaiat horit.',vSpace:'Espaiat vert.',alertUrl:'Si us plau, escriviu la URL de la imatge',linkTab:'Enllaç',button2Img:"Voleu transformar el botó d'imatge seleccionat en una simple imatge?",img2Button:"Voleu transformar la imatge seleccionada en un botó d'imatge?",urlMissing:'Falta la URL de la imatge.',validateBorder:'La vora ha de ser un nombre enter.',validateHSpace:'HSpace ha de ser un nombre enter.',validateVSpace:'VSpace ha de ser un nombre enter.'},flash:{properties:'Propietats del Flash',propertiesTab:'Propietats',title:'Propietats del Flash',chkPlay:'Reprodució automàtica',chkLoop:'Bucle',chkMenu:'Habilita menú Flash',chkFull:'Permetre la pantalla completa',scale:'Escala',scaleAll:'Mostra-ho tot',scaleNoBorder:'Sense vores',scaleFit:'Mida exacta',access:'Accés a scripts',accessAlways:'Sempre',accessSameDomain:'El mateix domini',accessNever:'Mai',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Qualitat',qualityBest:'La millor',qualityHigh:'Alta',qualityAutoHigh:'Alta automàtica',qualityMedium:'Mitjana',qualityAutoLow:'Baixa automàtica',qualityLow:'Baixa',windowModeWindow:'Finestra',windowModeOpaque:'Opaca',windowModeTransparent:'Transparent',windowMode:'Mode de la finestra',flashvars:'Variables de Flash',bgcolor:'Color de Fons',hSpace:'Espaiat horit.',vSpace:'Espaiat vert.',validateSrc:"Si us plau, escrigui l'enllaç URL",validateHSpace:"L'espaiat horitzonatal ha de ser un nombre.",validateVSpace:"L'espaiat vertical ha de ser un nombre."},spellCheck:{toolbar:"Revisa l'ortografia",title:"Comprova l'ortografia",notAvailable:'El servei no es troba disponible ara.',errorLoading:'Error carregant el servidor: %s.',notInDic:'No és al diccionari',changeTo:'Reemplaça amb',btnIgnore:'Ignora',btnIgnoreAll:'Ignora-les totes',btnReplace:'Canvia',btnReplaceAll:'Canvia-les totes',btnUndo:'Desfés',noSuggestions:'Cap suggeriment',progress:'Verificació ortogràfica en curs...',noMispell:'Verificació ortogràfica acabada: no hi ha cap paraula mal escrita',noChanges:"Verificació ortogràfica: no s'ha canviat cap paraula",oneChange:"Verificació ortogràfica: s'ha canviat una paraula",manyChanges:"Verificació ortogràfica: s'han canviat %1 paraules",ieSpellDownload:'Verificació ortogràfica no instal·lada. Voleu descarregar-ho ara?'},smiley:{toolbar:'Icona',title:'Insereix una icona',options:"Opcions d'emoticones"},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Llista numerada',bulletedlist:'Llista de pics',indent:'Augmenta el sagnat',outdent:'Redueix el sagnat',justify:{left:"Alinea a l'esquerra",center:'Centrat',right:'Alinea a la dreta',block:'Justificat'},blockquote:'Bloc de cita',clipboard:{title:'Enganxa',cutError:'La seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl+X).',copyError:'La seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).',pasteMsg:'Si us plau, enganxeu dins del següent camp utilitzant el teclat (<STRONG>Ctrl+V</STRONG>) i premeu <STRONG>OK</STRONG>.',securityMsg:"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir al porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.",pasteArea:"Àrea d'enganxat"},pastefromword:{confirmCleanup:'El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?',toolbar:'Enganxa des del Word',title:'Enganxa des del Word',error:'No ha estat possible netejar les dades enganxades degut a un error intern'},pasteText:{button:'Enganxa com a text no formatat',title:'Enganxa com a text no formatat'},templates:{button:'Plantilles',title:'Plantilles de contingut',options:'Opcions de plantilla',insertOption:'Reemplaça el contingut actual',selectPromptMsg:"Seleccioneu una plantilla per usar a l'editor<br>(per defecte s'elimina el contingut actual):",emptyListMsg:'(No hi ha plantilles definides)'},showBlocks:'Mostra els blocs',stylesCombo:{label:'Estil',panelTitle:'Estils de format',panelTitle1:'Estils de bloc',panelTitle2:'Estils incrustats',panelTitle3:"Estils d'objecte"},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatejat',tag_address:'Adreça',tag_h1:'Encapçalament 1',tag_h2:'Encapçalament 2',tag_h3:'Encapçalament 3',tag_h4:'Encapçalament 4',tag_h5:'Encapçalament 5',tag_h6:'Encapçalament 6',tag_div:'Normal (DIV)'},div:{title:'Crea un contenidor Div',toolbar:'Crea un contenidor Div',cssClassInputLabel:"Classes de la fulla d'estils",styleSelectLabel:'Estil',IdInputLabel:'Id',languageCodeInputLabel:" Codi d'idioma",inlineStyleInputLabel:'Estil en línia',advisoryTitleInputLabel:'Títol de guia',langDirLabel:"Direcció de l'idioma",langDirLTRLabel:"D'esquerra a dreta (LTR)",langDirRTLLabel:'De dreta a esquerra (RTL)',edit:'Edita Div',remove:'Elimina Div'},iframe:{title:'Propietats IFrame',toolbar:'IFrame',noUrl:"Si us plau, introduïu la URL de l'iframe URL",scrolling:'Activa les barrres de desplaçament',border:'Mostra la vora del marc'},font:{label:'Tipus de lletra',voiceLabel:'Tipus de lletra',panelTitle:'Tipus de lletra'},fontSize:{label:'Mida',voiceLabel:'Mida de la lletra',panelTitle:'Mida'},colorButton:{textColorTitle:'Color de Text',bgColorTitle:'Color de Fons',panelTitle:'Colors',auto:'Automàtic',more:'Més colors...'},colors:{'000':'Negre',800000:'Granat','8B4513':'Marró sella','2F4F4F':'Gris pissarra fosca','008080':'Blau xarxet','000080':'Blau marí','4B0082':'Indi',696969:'Gris intens',B22222:'Maó',A52A2A:'Marró (web)',DAA520:'Solidago','006400':'Verd fosc','40E0D0':'Turquesa','0000CD':'Atzur',800080:'Lila',808080:'Gris',F00:'Vermell',FF8C00:'Taronja fosc',FFD700:'Or','008000':'Verd','0FF':'Cian','00F':'Blau',EE82EE:'Lavanda rosat',A9A9A9:'Gris clar',FFA07A:'Salmó clar',FFA500:'Taronja',FFFF00:'Groc','00FF00':'Verd llima',AFEEEE:'Blau pàlid',ADD8E6:'Blau clar',DDA0DD:'Pruna',D3D3D3:'Gris clar',FFF0F5:'Lavanda rosat',FAEBD7:'Blanc antic',FFFFE0:'Groc clar',F0FFF0:'Verd pàlid',F0FFFF:'Blau cel pàlid',F0F8FF:'Cian pàlid',E6E6FA:'Lavanda',FFF:'Blanc'},scayt:{title:'Spell Check As You Type',opera_title:"No és compatible amb l'Opera",enable:"Habilitat l'SCAYT",disable:'Deshabilita SCAYT',about:"Quant a l'SCAYT",toggle:"Commuta l'SCAYT",options:'Opcions',langs:'Idiomes',moreSuggestions:'Més suggerències',ignore:'Ignora',ignoreAll:"Ignora'ls tots",addWord:'Afegeix una paraula',emptyDic:"El nom del diccionari no hauria d'estar buit.",optionsTab:'Opcions',allCaps:'Ignora paraules en majúscules',ignoreDomainNames:'Ignora els noms de domini',mixedCase:'Ignora paraules amb majúscules i minúscules',mixedWithDigits:'Ignora paraules amb números ',languagesTab:'Idiomes',dictionariesTab:'Diccionaris',dic_field_name:'Nom del diccionari',dic_create:'Crea',dic_restore:'Restaura',dic_delete:'Elimina',dic_rename:'Canvia el nom',dic_info:"Inicialment el diccionari d'usuari s'emmagatzema en una galeta. De totes maneres, les galetes tenen la mida limitada. Quan el diccionari creix massa, llavors el diccionari es pot emmagatzemar al nostre servidor. Per desar el vostre diccionari personal al nostre servidor heu d.'especificar un nom pel diccionari. Si ja heu desat un diccionari, teclegeu si us plau el seu nom i cliqueu el botó de restauració.",aboutTab:'Quant a'},about:{title:'Quant al CKEditor',dlgTitle:'Quant al CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Per informació sobre llicències visiteu el web:',copy:'Copyright &copy; $1. Tots els drets reservats.'},maximize:'Maximitza',minimize:'Minimitza',fakeobjects:{anchor:'Àncora',flash:'Animació Flash',iframe:'IFrame',hiddenfield:'Camp ocult',unknown:'Objecte desconegut'},resize:'Arrossegueu per redimensionar',colordialog:{title:'Selecciona el color',options:'Opcions del color',highlight:'Destacat',selected:'Seleccionat',clear:'Neteja'},toolbarCollapse:"Redueix la barra d'eines",toolbarExpand:"Amplia la barra d'eines",toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:"Direcció del text d'esquerra a dreta",rtl:'Direcció del text de dreta a esquerra'},docprops:{label:'Propietats del document',title:'Propietats del document',design:'Design',meta:'Metadades',chooseColor:'Trieu',other:'<altre>',docTitle:'Títol de la pàgina',charset:'Codificació de conjunt de caràcters',charsetOther:'Una altra codificació de caràcters',charsetASCII:'ASCII',charsetCE:'Centreeuropeu',charsetCT:'Xinès tradicional (Big5)',charsetCR:'Ciríl·lic',charsetGR:'Grec',charsetJP:'Japonès',charsetKR:'Coreà',charsetTR:'Turc',charsetUN:'Unicode (UTF-8)',charsetWE:'Europeu occidental',docType:'Capçalera de tipus de document',docTypeOther:'Un altra capçalera de tipus de document',xhtmlDec:'Incloure declaracions XHTML',bgColor:'Color de fons',bgImage:'URL de la imatge de fons',bgFixed:'Fons fixe',txtColor:'Color de Text',margin:'Marges de pàgina',marginTop:'Cap',marginLeft:'Esquerra',marginRight:'Dreta',marginBottom:'Peu',metaKeywords:'Mots clau per a indexació (separats per coma)',metaDescription:'Descripció del document',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/cs.js b/upload/public/js/3rd_party/ckeditor/lang/cs.js
new file mode 100644
index 00000000..1797c341
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/cs.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.cs={dir:'ltr',editorTitle:'Textový editor, %1, nápovědu zobrazíte stiskem ALT 0.',toolbars:'Editor toolbars',editor:'Textový editor',source:'Zdroj',newPage:'Nová stránka',save:'Uložit',preview:'Náhled',cut:'Vyjmout',copy:'Kopírovat',paste:'Vložit',print:'Tisk',underline:'Podtržené',bold:'Tu�né',italic:'Kurzíva',selectAll:'Vybrat vše',removeFormat:'Odstranit formátování',strike:'Přeškrtnuté',subscript:'Dolní index',superscript:'Horní index',horizontalrule:'Vložit vodorovnou linku',pagebreak:'Vložit konec stránky',pagebreakAlt:'Konec stránky',unlink:'Odstranit odkaz',undo:'Zpět',redo:'Znovu',common:{browseServer:'Vybrat na serveru',url:'URL',protocol:'Protokol',upload:'Odeslat',uploadSubmit:'Odeslat na server',image:'Obrázek',flash:'Flash',form:'Formulář',checkbox:'Zaškrtávací polí�ko',radio:'Přepína�',textField:'Textové pole',textarea:'Textová oblast',hiddenField:'Skryté pole',button:'Tla�ítko',select:'Seznam',imageButton:'Obrázkové tla�ítko',notSet:'<nenastaveno>',id:'Id',name:'Jméno',langDir:'Orientace jazyka',langDirLtr:'Zleva do prava (LTR)',langDirRtl:'Zprava do leva (RTL)',langCode:'Kód jazyka',longDescr:'Dlouhý popis URL',cssClass:'Třída stylu',advisoryTitle:'Pomocný titulek',cssStyle:'Styl',ok:'OK',cancel:'Storno',close:'Zavřít',preview:'Náhled',generalTab:'Obecné',advancedTab:'Rozšířené',validateNumberFailed:'Zadaná hodnota není �íselná.',confirmNewPage:'Jakékoliv neuložené změny obsahu budou ztraceny. Skute�ně chete otevrít novou stránku?',confirmCancel:'Některá z nastavení byla změněna. Skute�ně chete zavřít dialogové okno?',options:'Nastavení',target:'Cíl',targetNew:'Nové okno (_blank)',targetTop:'Okno nejvyšší úrovně (_top)',targetSelf:'Stejné okno (_self)',targetParent:'Rodi�ovské onko (_parent)',langDirLTR:'Zleva doprava (LTR)',langDirRTL:'Zprava doleva (RTL)',styles:'Styly',cssClasses:'Třídy stylů',width:'Šířka',height:'Výška',align:'Zarovnání',alignLeft:'Vlevo',alignRight:'Vpravo',alignCenter:'Na střed',alignTop:'Nahoru',alignMiddle:'Na střed',alignBottom:'Dolů',invalidHeight:'Zadaná výška musí být �íslo.',invalidWidth:'Zadaná šířka musí být �íslo.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nedostupné</span>'},contextmenu:{options:'Nastavení kontextové nabídky'},specialChar:{toolbar:'Vložit speciální znaky',title:'Výběr speciálního znaku',options:'Nastavení speciálních znaků'},link:{toolbar:'Vložit/změnit odkaz',other:'<jiný>',menu:'Změnit odkaz',title:'Odkaz',info:'Informace o odkazu',target:'Cíl',upload:'Odeslat',advanced:'Rozšířené',type:'Typ odkazu',toUrl:'URL',toAnchor:'Kotva v této stránce',toEmail:'E-Mail',targetFrame:'<rámec>',targetPopup:'<vyskakovací okno>',targetFrameName:'Název cílového rámu',targetPopupName:'Název vyskakovacího okna',popupFeatures:'Vlastnosti vyskakovacího okna',popupResizable:'Umožňující měnit velikost',popupStatusBar:'Stavový řádek',popupLocationBar:'Panel umístění',popupToolbar:'Panel nástrojů',popupMenuBar:'Panel nabídky',popupFullScreen:'Celá obrazovka (IE)',popupScrollBars:'Posuvníky',popupDependent:'Závislost (Netscape)',popupLeft:'Levý okraj',popupTop:'Horní okraj',id:'Id',langDir:'Orientace jazyka',langDirLTR:'Zleva do prava (LTR)',langDirRTL:'Zprava do leva (RTL)',acccessKey:'Přístupový klí�',name:'Jméno',langCode:'Orientace jazyka',tabIndex:'Pořadí prvku',advisoryTitle:'Pomocný titulek',advisoryContentType:'Pomocný typ obsahu',cssClasses:'Třída stylu',charset:'Přiřazená znaková sada',styles:'Styl',rel:'Relationship',selectAnchor:'Vybrat kotvu',anchorName:'Podle jména kotvy',anchorId:'Podle Id objektu',emailAddress:'E-Mailová adresa',emailSubject:'Předmět zprávy',emailBody:'Tělo zprávy',noAnchors:'(Ve stránce není definována žádná kotva!)',noUrl:'Zadejte prosím URL odkazu',noEmail:'Zadejte prosím e-mailovou adresu'},anchor:{toolbar:'Vložít/změnit záložku',menu:'Vlastnosti záložky',title:'Vlastnosti záložky',name:'Název záložky',errorName:'Zadejte prosím název záložky',remove:'Remove Anchor'},list:{numberedTitle:'Vlastnosti �íslování',bulletedTitle:'Vlastnosti odrážek',type:'Typ',start:'Po�átek',validateStartNumber:'Číslování musí za�ínat celým �íslem.',circle:'Kroužky',disc:'Kole�ka',square:'Čtverce',none:'Nic',notset:'<nenastaveno>',armenian:'Arménské',georgian:'Gruzínské (an, ban, gan, atd.)',lowerRoman:'Malé římské (i, ii, iii, iv, v, atd.)',upperRoman:'Velké římské (I, II, III, IV, V, atd.)',lowerAlpha:'Malá latinka (a, b, c, d, e, atd.)',upperAlpha:'Velká latinka (A, B, C, D, E, atd.)',lowerGreek:'Malé řecké (alpha, beta, gamma, atd.)',decimal:'Arabská �ísla (1, 2, 3, atd.)',decimalLeadingZero:'Arabská �ísla uvozená nulou (01, 02, 03, atd.)'},findAndReplace:{title:'Najít a nahradit',find:'Hledat',replace:'Nahradit',findWhat:'Co hledat:',replaceWith:'Čím nahradit:',notFoundMsg:'Hledaný text nebyl nalezen.',findOptions:'Find Options',matchCase:'Rozlišovat velikost písma',matchWord:'Pouze celá slova',matchCyclic:'Procházet opakovaně',replaceAll:'Nahradit vše',replaceSuccessMsg:'%1 nahrazení.'},table:{toolbar:'Tabulka',title:'Vlastnosti tabulky',menu:'Vlastnosti tabulky',deleteTable:'Smazat tabulku',rows:'Řádky',columns:'Sloupce',border:'Ohrani�ení',widthPx:'bodů',widthPc:'procent',widthUnit:'jednotka šířky',cellSpace:'Vzdálenost buněk',cellPad:'Odsazení obsahu v buňce',caption:'Popis',summary:'Souhrn',headers:'Záhlaví',headersNone:'Žádné',headersColumn:'První sloupec',headersRow:'První řádek',headersBoth:'Obojí',invalidRows:'Po�et řádků musí být �íslo větší než 0.',invalidCols:'Po�et sloupců musí být �íslo větší než 0.',invalidBorder:'Zdaná velikost okraje musí být �íselná.',invalidWidth:'Zadaná šířka tabulky musí být �íselná.',invalidHeight:'zadaná výška tabulky musí být �íselná.',invalidCellSpacing:'Zadaná vzdálenost buněk musí být �íselná.',invalidCellPadding:'Zadané odsazení obsahu v buňce musí být �íselné.',cell:{menu:'Buňka',insertBefore:'Vložit buňku před',insertAfter:'Vložit buňku za',deleteCell:'Smazat buňky',merge:'Slou�it buňky',mergeRight:'Slou�it doprava',mergeDown:'Slou�it dolů',splitHorizontal:'Rozdělit buňky vodorovně',splitVertical:'Rozdělit buňky svisle',title:'Vlastnosti buňky',cellType:'Typ buňky',rowSpan:'Spojit řádky',colSpan:'Spojit sloupce',wordWrap:'Zalamování',hAlign:'Vodorovné zarovnání',vAlign:'Svislé zarovnání',alignBaseline:'Na ú�aří',bgColor:'Barva pozadí',borderColor:'Barva okraje',data:'Data',header:'Hlavi�ka',yes:'Ano',no:'Ne',invalidWidth:'Zadaná šířka buňky musí být �íslená.',invalidHeight:'Zadaná výška buňky musí být �íslená.',invalidRowSpan:'Zadaný po�et slou�ených řádků musí být celé �íslo.',invalidColSpan:'Zadaný po�et slou�ených sloupců musí být celé �íslo.',chooseColor:'Výběr'},row:{menu:'Řádek',insertBefore:'Vložit řádek před',insertAfter:'Vložit řádek za',deleteRow:'Smazat řádky'},column:{menu:'Sloupec',insertBefore:'Vložit sloupec před',insertAfter:'Vložit sloupec za',deleteColumn:'Smazat sloupec'}},button:{title:'Vlastnosti tla�ítka',text:'Popisek',type:'Typ',typeBtn:'Tla�ítko',typeSbm:'Odeslat',typeRst:'Obnovit'},checkboxAndRadio:{checkboxTitle:'Vlastnosti zaškrtávacího polí�ka',radioTitle:'Vlastnosti přepína�e',value:'Hodnota',selected:'Zaškrtnuto'},form:{title:'Vlastnosti formuláře',menu:'Vlastnosti formuláře',action:'Akce',method:'Metoda',encoding:'Kódování'},select:{title:'Vlastnosti seznamu',selectInfo:'Info',opAvail:'Dostupná nastavení',value:'Hodnota',size:'Velikost',lines:'Řádků',chkMulti:'Povolit mnohonásobné výběry',opText:'Text',opValue:'Hodnota',btnAdd:'Přidat',btnModify:'Změnit',btnUp:'Nahoru',btnDown:'Dolů',btnSetValue:'Nastavit jako vybranou hodnotu',btnDelete:'Smazat'},textarea:{title:'Vlastnosti textové oblasti',cols:'Sloupců',rows:'Řádků'},textfield:{title:'Vlastnosti textového pole',name:'Název',value:'Hodnota',charWidth:'Šířka ve znacích',maxChars:'Maximální po�et znaků',type:'Typ',typeText:'Text',typePass:'Heslo'},hidden:{title:'Vlastnosti skrytého pole',name:'Název',value:'Hodnota'},image:{title:'Vlastnosti obrázku',titleButton:'Vlastností obrázkového tla�ítka',menu:'Vlastnosti obrázku',infoTab:'Informace o obrázku',btnUpload:'Odeslat na server',upload:'Odeslat',alt:'Alternativní text',lockRatio:'Zámek',resetSize:'Původní velikost',border:'Okraje',hSpace:'H-mezera',vSpace:'V-mezera',alertUrl:'Zadejte prosím URL obrázku',linkTab:'Odkaz',button2Img:'Skute�ně chcete převést zvolené obrázkové tla�ítko na oby�ejný obrázek?',img2Button:'Skute�ně chcete převést zvolený obrázek na obrázkové tla�ítko?',urlMissing:'Zadané URL zdroje obrázku nebylo nalezeno.',validateBorder:'Okraj musí být nastaven v celých �íslech.',validateHSpace:'H-mezera musí být nastavena v celých �íslech.',validateVSpace:'V-mezera musí být nastavena v celých �íslech.'},flash:{properties:'Vlastnosti Flashe',propertiesTab:'Vlastnosti',title:'Vlastnosti Flashe',chkPlay:'Automatické spuštění',chkLoop:'Opakování',chkMenu:'Nabídka Flash',chkFull:'Povolit celoobrazovkový režim',scale:'Zobrazit',scaleAll:'Zobrazit vše',scaleNoBorder:'Bez okraje',scaleFit:'Přizpůsobit',access:'Přístup ke skriptu',accessAlways:'Vždy',accessSameDomain:'Ve stejné doméně',accessNever:'Nikdy',alignAbsBottom:'Zcela dolů',alignAbsMiddle:'Doprostřed',alignBaseline:'Na ú�aří',alignTextTop:'Na horní okraj textu',quality:'Kvalita',qualityBest:'Nejlepší',qualityHigh:'Vysoká',qualityAutoHigh:'Vysoká - auto',qualityMedium:'Střední',qualityAutoLow:'Nízká - auto',qualityLow:'Nejnižší',windowModeWindow:'Okno',windowModeOpaque:'Neprůhledné',windowModeTransparent:'Průhledné',windowMode:'Režim okna',flashvars:'Proměnné pro Flash',bgcolor:'Barva pozadí',hSpace:'H-mezera',vSpace:'V-mezera',validateSrc:'Zadejte prosím URL odkazu',validateHSpace:'Zadaná H-mezera musí být �íslo.',validateVSpace:'Zadaná V-mezera musí být �íslo.'},spellCheck:{toolbar:'Zkontrolovat pravopis',title:'Kontrola pravopisu',notAvailable:'Omlouváme se, ale služba nyní není dostupná.',errorLoading:'Chyba nahrávání služby aplikace z: %s.',notInDic:'Není ve slovníku',changeTo:'Změnit na',btnIgnore:'Přesko�it',btnIgnoreAll:'Přeskakovat vše',btnReplace:'Zaměnit',btnReplaceAll:'Zaměňovat vše',btnUndo:'Zpět',noSuggestions:'- žádné návrhy -',progress:'Probíhá kontrola pravopisu...',noMispell:'Kontrola pravopisu dokon�ena: Žádné pravopisné chyby nenalezeny',noChanges:'Kontrola pravopisu dokon�ena: Beze změn',oneChange:'Kontrola pravopisu dokon�ena: Jedno slovo změněno',manyChanges:'Kontrola pravopisu dokon�ena: %1 slov změněno',ieSpellDownload:'Kontrola pravopisu není nainstalována. Chcete ji nyní stáhnout?'},smiley:{toolbar:'Smajlíky',title:'Vkládání smajlíků',options:'Nastavení smajlíků'},elementsPath:{eleLabel:'Cesta objektu',eleTitle:'%1 objekt'},numberedlist:'Číslování',bulletedlist:'Odrážky',indent:'Zvětšit odsazení',outdent:'Zmenšit odsazení',justify:{left:'Zarovnat vlevo',center:'Zarovnat na střed',right:'Zarovnat vpravo',block:'Zarovnat do bloku'},blockquote:'Citace',clipboard:{title:'Vložit',cutError:'Bezpe�nostní nastavení Vašeho prohlíže�e nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).',copyError:'Bezpe�nostní nastavení Vašeho prohlíže�e nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).',pasteMsg:'Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.',securityMsg:'Z důvodů nastavení bezpe�nosti Vašeho prohlíže�e nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.',pasteArea:'Oblast vlkádání'},pastefromword:{confirmCleanup:'Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vy�istit?',toolbar:'Vložit z Wordu',title:'Vložit z Wordu',error:'Z důvodu vnitřní chyby nebylo možné provést vy�ištění vkládaného textu.'},pasteText:{button:'Vložit jako �istý text',title:'Vložit jako �istý text'},templates:{button:'Šablony',title:'Šablony obsahu',options:'Nastavení šablon',insertOption:'Nahradit aktuální obsah',selectPromptMsg:'Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):',emptyListMsg:'(Není definována žádná šablona)'},showBlocks:'Ukázat bloky',stylesCombo:{label:'Styl',panelTitle:'Formátovací styly',panelTitle1:'Blokové styly',panelTitle2:'Řádkové styly',panelTitle3:'Objektové styly'},format:{label:'Formát',panelTitle:'Formát',tag_p:'Normální',tag_pre:'Naformátováno',tag_address:'Adresa',tag_h1:'Nadpis 1',tag_h2:'Nadpis 2',tag_h3:'Nadpis 3',tag_h4:'Nadpis 4',tag_h5:'Nadpis 5',tag_h6:'Nadpis 6',tag_div:'Normální (DIV)'},div:{title:'Vytvořit Div kontejner',toolbar:'Vytvořit Div kontejner',cssClassInputLabel:'Třídy stylů',styleSelectLabel:'Styly',IdInputLabel:'Id',languageCodeInputLabel:' Kód jazyka',inlineStyleInputLabel:'Vnitřní styly',advisoryTitleInputLabel:'Nápovědní titulek',langDirLabel:'Orientace textu',langDirLTRLabel:'Zleva doprava (LTR)',langDirRTLLabel:'Zprava doleva (RTL)',edit:'Změnit Div',remove:'Odstranit Div'},iframe:{title:'Vlastnosti IFrame',toolbar:'IFrame',noUrl:'Zadejte prosím URL obsahu pro IFrame',scrolling:'Zapnout posuvníky',border:'Zobrazit okraj'},font:{label:'Písmo',voiceLabel:'Písmo',panelTitle:'Písmo'},fontSize:{label:'Velikost',voiceLabel:'Velikost písma',panelTitle:'Velikost'},colorButton:{textColorTitle:'Barva textu',bgColorTitle:'Barva pozadí',panelTitle:'Barvy',auto:'Automaticky',more:'Více barev...'},colors:{'000':'Černá',800000:'Kaštanová','8B4513':'Sedlová hně�','2F4F4F':'Tmavě bledě šedá','008080':'Čírka','000080':'Námořnická modř','4B0082':'Inkoustová',696969:'Tmavě šedá',B22222:'Pálená cihla',A52A2A:'Hnědá',DAA520:'Zlatý prut','006400':'Tmavě zelená','40E0D0':'Tyrkisová','0000CD':'Středně modrá',800080:'Purpurová',808080:'Šedá',F00:'Červená',FF8C00:'Tmavě oranžová',FFD700:'Zlatá','008000':'Zelená','0FF':'Kyanidová','00F':'Modrá',EE82EE:'Fialová',A9A9A9:'Kalně šedá',FFA07A:'Světle lososová',FFA500:'Oranžová',FFFF00:'Žlutá','00FF00':'Limetková',AFEEEE:'Bledě tyrkisová',ADD8E6:'Světle modrá',DDA0DD:'Švestková',D3D3D3:'Světle šedá',FFF0F5:'Levandulově ruměnná',FAEBD7:'Antická bílá',FFFFE0:'Světle žlutá',F0FFF0:'Medová rosa',F0FFFF:'Azurová',F0F8FF:'Alen�ina modrá',E6E6FA:'Lavendulová',FFF:'Bílá'},scayt:{title:'Kontrola pravopisu během psaní (SCAYT)',opera_title:'Not supported by Opera',enable:'Zapnout SCAYT',disable:'Vypnout SCAYT',about:'O aplikaci SCAYT',toggle:'Vypína� SCAYT',options:'Nastavení',langs:'Jazyky',moreSuggestions:'Více návrhů',ignore:'Přesko�it',ignoreAll:'Přesko�it vše',addWord:'Přidat slovo',emptyDic:'Název slovníku nesmí být prázdný.',optionsTab:'Nastavení',allCaps:'Ignorovat slova velkými písmeny',ignoreDomainNames:'Ignorovat doménová jména',mixedCase:'Ignorovat slova obsahující různou velikost písma',mixedWithDigits:'Ignorovat slova obsahující �ísla',languagesTab:'Jazyky',dictionariesTab:'Slovníky',dic_field_name:'Název slovníku',dic_create:'vytvořit',dic_restore:'Obnovit',dic_delete:'Smazat',dic_rename:'Přejmenovat',dic_info:'Zpo�átku se uživatelský slovník ukládá do cookies ve vašem prohlíže�i. Ovšem cookies mají omezenou velikost, takže když slovník dosáhne velikosti, kdy se již do cookies nevejde, může být uložen na našem serveru. Chcete-li uložit Váš osobní slovník na našem serveru, je třeba slovník nejdříve pojmenovat. Máte-li již slovník pojmenován a uložen, zadejte jeho název a klepněte na tla�ítko Obnovit.',aboutTab:'O aplikaci'},about:{title:'O aplikaci CKEditor',dlgTitle:'O aplikaci CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Pro informace o lincenci navštivte naši webovou stránku:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximalizovat',minimize:'Minimalizovat',fakeobjects:{anchor:'Záložka',flash:'Flash animace',iframe:'IFrame',hiddenfield:'Skryté pole',unknown:'Neznámý objekt'},resize:'Uchopit pro změnu velikosti',colordialog:{title:'Výběr barvy',options:'Nastavení barvy',highlight:'Zvýraznit',selected:'Vybráno',clear:'Vy�istit'},toolbarCollapse:'Skrýt panel nástrojů',toolbarExpand:'Zobrazit panel nástrojů',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Orientace textu zleva doprava',rtl:'Orientace textu zprava do leva'},docprops:{label:'Vlastnosti dokumentu',title:'Vlastnosti dokumentu',design:'Design',meta:'Metadata',chooseColor:'Výběr',other:'<jiný>',docTitle:'Titulek stránky',charset:'Znaková sada',charsetOther:'Další znaková sada',charsetASCII:'ASCII',charsetCE:'Středoevropské jazyky',charsetCT:'Tradi�ní �ínština (Big5)',charsetCR:'Cyrilice',charsetGR:'Ře�tina',charsetJP:'Japonština',charsetKR:'Korejština',charsetTR:'Ture�tina',charsetUN:'Unicode (UTF-8)',charsetWE:'Západoevropské jazyky',docType:'Typ dokumentu',docTypeOther:'Jiný typ dokumetu',xhtmlDec:'Zahrnou deklarace XHTML',bgColor:'Barva pozadí',bgImage:'URL obrázku na pozadí',bgFixed:'Nerolovatelné pozadí',txtColor:'Barva textu',margin:'Okraje stránky',marginTop:'Horní',marginLeft:'Levý',marginRight:'Pravý',marginBottom:'Dolní',metaKeywords:'Klí�ová slova (oddělená �árkou)',metaDescription:'Popis dokumentu',metaAuthor:'Autor',metaCopyright:'Autorská práva',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/cy.js b/upload/public/js/3rd_party/ckeditor/lang/cy.js
new file mode 100644
index 00000000..036d6278
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/cy.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.cy={dir:'ltr',editorTitle:'Golygydd testun cyfoethog, %1, gwasgwch ALT 0 am gymorth.',toolbars:'Bariau offer golygydd',editor:'Golygydd Testun Cyfoethog',source:'Tarddle',newPage:'Tudalen newydd',save:'Cadw',preview:'Rhagolwg',cut:'Torri',copy:'Copïo',paste:'Gludo',print:'Argraffu',underline:'Tanlinellu',bold:'Bras',italic:'Italig',selectAll:'Dewis Popeth',removeFormat:'Tynnu Fformat',strike:'Llinell Trwyddo',subscript:'Is-sgript',superscript:'Uwchsgript',horizontalrule:'Mewnosod Llinell Lorweddol',pagebreak:'Mewnosod Toriad Tudalen i Argraffu',pagebreakAlt:'Toriad Tudalen',unlink:'Datgysylltu',undo:'Dadwneud',redo:'Ailadrodd',common:{browseServer:"Pori'r Gweinydd",url:'URL',protocol:'Protocol',upload:'Lanlwytho',uploadSubmit:"Anfon i'r Gweinydd",image:'Delwedd',flash:'Flash',form:'Ffurflen',checkbox:'Blwch ticio',radio:'Botwm Radio',textField:'Maes Testun',textarea:'Ardal Testun',hiddenField:'Maes Cudd',button:'Botwm',select:'Maes Dewis',imageButton:'Botwm Delwedd',notSet:'<heb osod>',id:'Id',name:'Name',langDir:'Cyfeiriad Iaith',langDirLtr:"Chwith i'r Dde (LTR)",langDirRtl:"Dde i'r Chwith (RTL)",langCode:'Cod Iaith',longDescr:'URL Disgrifiad Hir',cssClass:'Dosbarth Dalen Arddull',advisoryTitle:'Teitl Cynghorol',cssStyle:'Arddull',ok:'Iawn',cancel:'Diddymu',close:'Cau',preview:'Rhagolwg',generalTab:'Cyffredinol',advancedTab:'Uwch',validateNumberFailed:"Nid yw'r gwerth hwn yn rhif.",confirmNewPage:"Byddwch yn colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. A ydych am barhau i lwytho tudalen newydd?",confirmCancel:"Mae rhai o'r opsiynau wedi'u newid. A ydych wir am gau'r deialog?",options:'Opsiynau',target:'Targed',targetNew:'Ffenest Newydd (_blank)',targetTop:'Ffenest ar y Brig (_top)',targetSelf:'Yr un Ffenest (_self)',targetParent:'Ffenest y Rhiant (_parent)',langDirLTR:"Chwith i'r Dde (LTR)",langDirRTL:"Dde i'r Chwith (RTL)",styles:'Arddull',cssClasses:'Dosbarthiadau Ffeil Ddiwyg',width:'Lled',height:'Uchder',align:'Alinio',alignLeft:'Chwith',alignRight:'Dde',alignCenter:'Canol',alignTop:'Brig',alignMiddle:'Canol',alignBottom:'Gwaelod',invalidHeight:"Rhaid i'r Uchder fod yn rhif.",invalidWidth:"Rhaid i'r Lled fod yn rhif.",invalidCssLength:"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).",invalidHtmlLength:"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).",invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ddim ar gael</span>'},contextmenu:{options:'Opsiynau Dewislen Cyd-destun'},specialChar:{toolbar:'Mewnosod Nodau Arbennig',title:'Dewis Nod Arbennig',options:'Opsiynau Nodau Arbennig'},link:{toolbar:'Dolen',other:'<eraill>',menu:'Golygu Dolen',title:'Dolen',info:'Gwyb ar y Ddolen',target:'Targed',upload:'Lanlwytho',advanced:'Uwch',type:'Math y Ddolen',toUrl:'URL',toAnchor:'Dolen at angor yn y testun',toEmail:'E-bost',targetFrame:'<ffrâm>',targetPopup:'<ffenestr bop>',targetFrameName:'Enw Ffrâm y Targed',targetPopupName:'Enw Ffenestr Bop',popupFeatures:'Nodweddion Ffenestr Bop',popupResizable:'Ailfeintiol',popupStatusBar:'Bar Statws',popupLocationBar:'Bar Safle',popupToolbar:'Bar Offer',popupMenuBar:'Dewislen',popupFullScreen:'Sgrin Llawn (IE)',popupScrollBars:'Barrau Sgrolio',popupDependent:'Dibynnol (Netscape)',popupLeft:'Safle Chwith',popupTop:'Safle Top',id:'Id',langDir:'Cyfeiriad Iaith',langDirLTR:"Chwith i'r Dde (LTR)",langDirRTL:"Dde i'r Chwith (RTL)",acccessKey:'Allwedd Mynediad',name:'Enw',langCode:'Cod Iaith',tabIndex:'Indecs Tab',advisoryTitle:'Teitl Cynghorol',advisoryContentType:'Math y Cynnwys Cynghorol',cssClasses:'Dosbarthiadau Dalen Arddull',charset:"Set nodau'r Adnodd Cysylltiedig",styles:'Arddull',rel:'Perthynas',selectAnchor:'Dewiswch Angor',anchorName:"Gan Enw'r Angor",anchorId:'Gan Id yr Elfen',emailAddress:'Cyfeiriad E-Bost',emailSubject:'Testun y Message Subject',emailBody:'Pwnc y Neges',noAnchors:'(Dim angorau ar gael yn y ddogfen)',noUrl:'Teipiwch URL y ddolen',noEmail:'Teipiwch gyfeiriad yr e-bost'},anchor:{toolbar:'Angor',menu:'Golygwch yr Angor',title:"Priodweddau'r Angor",name:"Enw'r Angor",errorName:"Teipiwch enw'r angor",remove:'Tynnwch yr Angor'},list:{numberedTitle:'Priodweddau Rhestr Rifol',bulletedTitle:'Priodweddau Rhestr Fwled',type:'Math',start:'Dechrau',validateStartNumber:'Rhaid bod y rhif cychwynnol yn gyfanrif.',circle:'Cylch',disc:'Disg',square:'Sgwâr',none:'Dim',notset:'<heb osod>',armenian:'Rhifau Armeneg',georgian:'Rhifau Sioraidd (an, ban, gan, ayyb.)',lowerRoman:'Rhufeinig Is (i, ii, iii, iv, v, ayyb.)',upperRoman:'Rhufeinig Uwch (I, II, III, IV, V, ayyb.)',lowerAlpha:'Alffa Is (a, b, c, d, e, ayyb.)',upperAlpha:'Alffa Uwch (A, B, C, D, E, ayyb.)',lowerGreek:'Groeg Is (alpha, beta, gamma, ayyb.)',decimal:'Degol (1, 2, 3, ayyb.)',decimalLeadingZero:'Degol â sero arweiniol (01, 02, 03, ayyb.)'},findAndReplace:{title:'Chwilio ac Amnewid',find:'Chwilio',replace:'Amnewid',findWhat:"Chwilio'r term:",replaceWith:'Amnewid gyda:',notFoundMsg:"Nid oedd y testun wedi'i ddarganfod.",findOptions:'Find Options',matchCase:"Cyfateb i'r cas",matchWord:'Cyfateb gair cyfan',matchCyclic:'Cyfateb cylchol',replaceAll:'Amnewid pob un',replaceSuccessMsg:'Amnewidiwyd %1 achlysur.'},table:{toolbar:'Tabl',title:'Nodweddion Tabl',menu:'Nodweddion Tabl',deleteTable:'Dileu Tabl',rows:'Rhesi',columns:'Colofnau',border:'Maint yr Ymyl',widthPx:'picsel',widthPc:'y cant',widthUnit:'uned lled',cellSpace:"Bylchu'r gell",cellPad:"Padio'r gell",caption:'Pennawd',summary:'Crynodeb',headers:'Penynnau',headersNone:'Dim',headersColumn:'Colofn gyntaf',headersRow:'Rhes gyntaf',headersBoth:'Y Ddau',invalidRows:"Mae'n rhaid cael o leiaf un rhes.",invalidCols:"Mae'n rhaid cael o leiaf un golofn.",invalidBorder:"Mae'n rhaid i faint yr ymyl fod yn rhif.",invalidWidth:"Mae'n rhaid i led y tabl fod yn rhif.",invalidHeight:"Mae'n rhaid i uchder y tabl fod yn rhif.",invalidCellSpacing:"Mae'n rhaid i fylchiad y gell fod yn rhif positif.",invalidCellPadding:"Mae'n rhaid i badiad y gell fod yn rhif positif.",cell:{menu:'Cell',insertBefore:'Mewnosod Cell Cyn',insertAfter:'Mewnosod Cell Ar Ôl',deleteCell:'Dileu Celloedd',merge:'Cyfuno Celloedd',mergeRight:"Cyfuno i'r Dde",mergeDown:'Cyfuno i Lawr',splitHorizontal:"Hollti'r Gell yn Lorweddol",splitVertical:"Hollti'r Gell yn Fertigol",title:"Priodweddau'r Gell",cellType:'Math y Gell',rowSpan:'Rhychwant Rhesi',colSpan:'Rhychwant Colofnau',wordWrap:'Lapio Geiriau',hAlign:'Aliniad Llorweddol',vAlign:'Aliniad Fertigol',alignBaseline:'Baslinell',bgColor:'Lliw Cefndir',borderColor:'Lliw Ymyl',data:'Data',header:'Pennyn',yes:'Ie',no:'Na',invalidWidth:"Mae'n rhaid i led y gell fod yn rhif.",invalidHeight:"Mae'n rhaid i uchder y gell fod yn rhif.",invalidRowSpan:"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.",invalidColSpan:"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.",chooseColor:'Choose'},row:{menu:'Rhes',insertBefore:'Mewnosod Rhes Cyn',insertAfter:'Mewnosod Rhes Ar Ôl',deleteRow:'Dileu Rhesi'},column:{menu:'Colofn',insertBefore:'Mewnosod Colofn Cyn',insertAfter:'Mewnosod Colofn Ar Ôl',deleteColumn:'Dileu Colofnau'}},button:{title:'Priodweddau Botymau',text:'Testun (Gwerth)',type:'Math',typeBtn:'Botwm',typeSbm:'Gyrru',typeRst:'Ailosod'},checkboxAndRadio:{checkboxTitle:'Priodweddau Blwch Ticio',radioTitle:'Priodweddau Botwm Radio',value:'Gwerth',selected:'Dewiswyd'},form:{title:'Priodweddau Ffurflen',menu:'Priodweddau Ffurflen',action:'Gweithred',method:'Dull',encoding:'Amgodio'},select:{title:'Priodweddau Maes Dewis',selectInfo:'Gwyb Dewis',opAvail:'Opsiynau ar Gael',value:'Gwerth',size:'Maint',lines:'llinellau',chkMulti:'Caniatàu aml-ddewisiadau',opText:'Testun',opValue:'Gwerth',btnAdd:'Ychwanegu',btnModify:'Newid',btnUp:'Lan',btnDown:'Lawr',btnSetValue:'Gosod fel gwerth a ddewiswyd',btnDelete:'Dileu'},textarea:{title:'Priodweddau Ardal Testun',cols:'Colofnau',rows:'Rhesi'},textfield:{title:'Priodweddau Maes Testun',name:'Enw',value:'Gwerth',charWidth:'Lled Nod',maxChars:'Uchafswm y Nodau',type:'Math',typeText:'Testun',typePass:'Cyfrinair'},hidden:{title:'Priodweddau Maes Cudd',name:'Enw',value:'Gwerth'},image:{title:'Priodweddau Delwedd',titleButton:'Priodweddau Botwm Delwedd',menu:'Priodweddau Delwedd',infoTab:'Gwyb Delwedd',btnUpload:"Anfon i'r Gweinydd",upload:'lanlwytho',alt:'Testun Amgen',lockRatio:'Cloi Cymhareb',resetSize:'Ailosod Maint',border:'Ymyl',hSpace:'BwlchLl',vSpace:'BwlchF',alertUrl:'Rhowch URL y ddelwedd',linkTab:'Dolen',button2Img:"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?",img2Button:"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?",urlMissing:"URL tarddle'r ddelwedd ar goll.",validateBorder:"Rhaid i'r ymyl fod yn gyfanrif.",validateHSpace:"Rhaid i'r HSpace fod yn gyfanrif.",validateVSpace:"Rhaid i'r VSpace fod yn gyfanrif."},flash:{properties:'Priodweddau Flash',propertiesTab:'Priodweddau',title:'Priodweddau Flash',chkPlay:'AwtoChwarae',chkLoop:'Lwpio',chkMenu:'Galluogi Dewislen Flash',chkFull:'Caniatàu Sgrin Llawn',scale:'Graddfa',scaleAll:'Dangos pob',scaleNoBorder:'Dim Ymyl',scaleFit:'Ffit Union',access:'Mynediad Sgript',accessAlways:'Pob amser',accessSameDomain:"R'un parth",accessNever:'Byth',alignAbsBottom:'Gwaelod Abs',alignAbsMiddle:'Canol Abs',alignBaseline:'Baslinell',alignTextTop:'Testun Top',quality:'Ansawdd',qualityBest:'Gorau',qualityHigh:'Uchel',qualityAutoHigh:'Uchel Awto',qualityMedium:'Canolig',qualityAutoLow:'Isel Awto',qualityLow:'Isel',windowModeWindow:'Ffenestr',windowModeOpaque:'Afloyw',windowModeTransparent:'Tryloyw',windowMode:'Modd ffenestr',flashvars:'Newidynnau ar gyfer Flash',bgcolor:'Lliw cefndir',hSpace:'BwlchLl',vSpace:'BwlchF',validateSrc:'Ni all yr URL fod yn wag.',validateHSpace:"Rhaid i'r BwlchLl fod yn rhif.",validateVSpace:"Rhaid i'r BwlchF fod yn rhif."},spellCheck:{toolbar:'Gwirio Sillafu',title:'Gwirio Sillafu',notAvailable:"Nid yw'r gwasanaeth hwn ar gael yn bresennol.",errorLoading:'Error loading application service host: %s.',notInDic:"Nid i'w gael yn y geiriadur",changeTo:'Newid i',btnIgnore:'Anwybyddu Un',btnIgnoreAll:'Anwybyddu Pob',btnReplace:'Amnewid Un',btnReplaceAll:'Amnewid Pob',btnUndo:'Dadwneud',noSuggestions:'- Dim awgrymiadau -',progress:'Gwirio sillafu yn ar y gweill...',noMispell:'Gwirio sillafu wedi gorffen: Dim camsillaf.',noChanges:'Gwirio sillafu wedi gorffen: Dim newidiadau',oneChange:'Gwirio sillafu wedi gorffen: Newidiwyd 1 gair',manyChanges:'Gwirio sillafu wedi gorffen: Newidiwyd %1 gair',ieSpellDownload:'Gwirydd sillafu heb ei arsefydlu. A ydych am ei lawrlwytho nawr?'},smiley:{toolbar:'Gwenoglun',title:'Mewnosod Gwenoglun',options:'Opsiynau Gwenogluniau'},elementsPath:{eleLabel:'Llwybr elfennau',eleTitle:'Elfen %1'},numberedlist:'Mewnosod/Tynnu Rhestr Rhifol',bulletedlist:'Mewnosod/Tynnu Rhestr Bwled',indent:"Cynyddu'r Mewnoliad",outdent:"Lleihau'r Mewnoliad",justify:{left:"Alinio i'r Chwith",center:"Alinio i'r Canol",right:"Alinio i'r Dde",block:'Aliniad Bloc'},blockquote:'Dyfyniad bloc',clipboard:{title:'Gludo',cutError:"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).",copyError:"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).",pasteMsg:"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.",securityMsg:"Oherwydd gosodiadau diogelwch eich porwr, nid yw'r porwr yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.",pasteArea:'Ardal Gludo'},pastefromword:{confirmCleanup:"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?",toolbar:'Gludo o Word',title:'Gludo o Word',error:'Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol'},pasteText:{button:'Gludo fel testun plaen',title:'Gludo fel Testun Plaen'},templates:{button:'Templedi',title:'Templedi Cynnwys',options:'Opsiynau Templedi',insertOption:'Amnewid y cynnwys go iawn',selectPromptMsg:"Dewiswch dempled i'w agor yn y golygydd",emptyListMsg:"(Dim templedi wedi'u diffinio)"},showBlocks:'Dangos Blociau',stylesCombo:{label:'Arddulliau',panelTitle:'Arddulliau Fformatio',panelTitle1:'Arddulliau Bloc',panelTitle2:'Arddulliau Mewnol',panelTitle3:'Arddulliau Gwrthrych'},format:{label:'Fformat',panelTitle:'Fformat Paragraff',tag_p:'Normal',tag_pre:"Wedi'i Fformatio",tag_address:'Cyfeiriad',tag_h1:'Pennawd 1',tag_h2:'Pennawd 2',tag_h3:'Pennawd 3',tag_h4:'Pennawd 4',tag_h5:'Pennawd 5',tag_h6:'Pennawd 6',tag_div:'Normal (DIV)'},div:{title:'Creu Cynhwysydd Div',toolbar:'Creu Cynhwysydd Div',cssClassInputLabel:'Dosbarthiadau Ffeil Ddiwyg',styleSelectLabel:'Arddull',IdInputLabel:'Id',languageCodeInputLabel:' Cod Iaith',inlineStyleInputLabel:'Arddull Mewn Llinell',advisoryTitleInputLabel:'Teitl Cynghorol',langDirLabel:'Cyfeiriad yr Iaith',langDirLTRLabel:"Chwith i'r Dde (LTR)",langDirRTLLabel:"Dde i'r Chwith (RTL)",edit:'Golygu Div',remove:'Tynnu Div'},iframe:{title:'Priodweddau IFrame',toolbar:'IFrame',noUrl:'Rhowch fath URL yr iframe',scrolling:'Galluogi bariau sgrolio',border:'Dangos ymyl y ffrâm'},font:{label:'Ffont',voiceLabel:'Ffont',panelTitle:"Enw'r Ffont"},fontSize:{label:'Maint',voiceLabel:'Maint y Ffont',panelTitle:'Maint y Ffont'},colorButton:{textColorTitle:'Lliw Testun',bgColorTitle:'Lliw Cefndir',panelTitle:'Lliwiau',auto:'Awtomatig',more:'Mwy o Liwiau...'},colors:{'000':'Du',800000:'Marwn','8B4513':'Brown Cyfrwy','2F4F4F':'Llechen Tywyll','008080':'Corhwyad','000080':'Nefi','4B0082':'Indigo',696969:'Llwyd Pwl',B22222:'Bric Tân',A52A2A:'Brown',DAA520:'Rhoden Aur','006400':'Gwyrdd Tywyll','40E0D0':'Gwyrddlas','0000CD':'Glas Canolig',800080:'Porffor',808080:'Llwyd',F00:'Coch',FF8C00:'Oren Tywyll',FFD700:'Aur','008000':'Gwyrdd','0FF':'Cyan','00F':'Glas',EE82EE:'Fioled',A9A9A9:'Llwyd Tywyll',FFA07A:'Samwn Golau',FFA500:'Oren',FFFF00:'Melyn','00FF00':'Leim',AFEEEE:'Gwyrddlas Golau',ADD8E6:'Glas Golau',DDA0DD:'Eirinen',D3D3D3:'Llwyd Golau',FFF0F5:'Gwrid Lafant',FAEBD7:'Gwyn Hynafol',FFFFE0:'Melyn Golau',F0FFF0:'Melwn Gwyrdd Golau',F0FFFF:'Aswr',F0F8FF:'Glas Alys',E6E6FA:'Lafant',FFF:'Gwyn'},scayt:{title:"Gwirio'r Sillafu Wrth Deipio",opera_title:'Heb ei gynnal gan Opera',enable:'Galluogi SCAYT',disable:'Analluogi SCAYT',about:'Ynghylch SCAYT',toggle:'Togl SCAYT',options:'Opsiynau',langs:'Ieithoedd',moreSuggestions:'Awgrymiadau pellach',ignore:'Anwybyddu',ignoreAll:'Anwybyddu pob',addWord:'Ychwanegu Gair',emptyDic:"Ni ddylai enw'r geiriadur fod yn wag.",optionsTab:'Opsiynau',allCaps:'Anwybyddu Geiriau Nodau Uwch i Gyd',ignoreDomainNames:'Anwybyddu Enwau Parth',mixedCase:'Anwybyddu Geiriau â Chymysgedd Nodau Uwch ac Is',mixedWithDigits:'Anwybyddu Geiriau â Rhifau',languagesTab:'Ieithoedd',dictionariesTab:'Geiriaduron',dic_field_name:"Enw'r geiriadur",dic_create:'Creu',dic_restore:'Adfer',dic_delete:'Dileu',dic_rename:'Ailenwi',dic_info:"Ar y cychwyn, caiff y Geiriadur ei storio mewn Cwci. Er, mae terfyn ar faint cwcis. Pan fydd Gweiriadur Defnyddiwr yn tyfu tu hwnt i gyfyngiadau maint Cwci, caiff y geiriadur ei storio ar ein gweinydd ni. er mwyn storio eich geiriadur poersonol chi ar ein gweinydd, bydd angen i chi osod enw ar gyfer y geiriadur. Os oes geiriadur 'da chi ar ein gweinydd yn barod, teipiwch ei enw a chliciwch y botwm Adfer.",aboutTab:'Ynghylch'},about:{title:'Ynghylch CKEditor',dlgTitle:'Ynghylch CKEditor',help:'Gwirio $1 am gymorth.',userGuide:'Canllawiau Defnyddiwr CKEditor',moreInfo:"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:",copy:'Hawlfraint &copy; $1. Cedwir pob hawl.'},maximize:'Mwyhau',minimize:'Lleihau',fakeobjects:{anchor:'Angor',flash:'Animeiddiant Flash',iframe:'IFrame',hiddenfield:'Maes Cudd',unknown:'Gwrthrych Anhysbys'},resize:'Llusgo i ailfeintio',colordialog:{title:'Dewis lliw',options:'Opsiynau Lliw',highlight:'Uwcholeuo',selected:'Dewiswyd',clear:'Clirio'},toolbarCollapse:"Cyfangu'r Bar Offer",toolbarExpand:"Ehangu'r Bar Offer",toolbarGroups:{document:'Dogfen',clipboard:'Clipfwrdd/Dadwneud',editing:'Golygu',forms:'Ffurflenni',basicstyles:'Arddulliau Sylfaenol',paragraph:'Paragraff',links:'Dolenni',insert:'Mewnosod',styles:'Arddulliau',colors:'Lliwiau',tools:'Offer'},bidi:{ltr:"Cyfeiriad testun o'r chwith i'r dde",rtl:"Cyfeiriad testun o'r dde i'r chwith"},docprops:{label:'Priodweddau Dogfen',title:'Priodweddau Dogfen',design:'Cynllunio',meta:'Tagiau Meta',chooseColor:'Dewis',other:'Arall...',docTitle:'Teitl y Dudalen',charset:'Amgodio Set Nodau',charsetOther:'Amgodio Set Nodau Arall',charsetASCII:'ASCII',charsetCE:'Ewropeaidd Canol',charsetCT:'Tsieinëeg Traddodiadol (Big5)',charsetCR:'Syrilig',charsetGR:'Groeg',charsetJP:'Siapanëeg',charsetKR:'Corëeg',charsetTR:'Tyrceg',charsetUN:'Unicode (UTF-8)',charsetWE:'Ewropeaidd Gorllewinol',docType:'Pennawd Math y Ddogfen',docTypeOther:'Pennawd Math y Ddogfen Arall',xhtmlDec:'Cynnwys Datganiadau XHTML',bgColor:'Lliw Cefndir',bgImage:'URL Delwedd Cefndir',bgFixed:'Cefndir Sefydlog (Ddim yn Sgrolio)',txtColor:'Lliw y Testun',margin:'Ffin y Dudalen',marginTop:'Brig',marginLeft:'Chwith',marginRight:'Dde',marginBottom:'Gwaelod',metaKeywords:'Allweddeiriau Indecsio Dogfen (gwahanu gyda choma)',metaDescription:'Disgrifiad y Ddogfen',metaAuthor:'Awdur',metaCopyright:'Hawlfraint',previewHtml:'<p>Dyma ychydig o <strong>destun sampl</strong>. Rydych chi\'n defnyddio <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/da.js b/upload/public/js/3rd_party/ckeditor/lang/da.js
new file mode 100644
index 00000000..edcc5706
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/da.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.da={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kilde',newPage:'Ny side',save:'Gem',preview:'Vis eksempel',cut:'Klip',copy:'Kopiér',paste:'Indsæt',print:'Udskriv',underline:'Understreget',bold:'Fed',italic:'Kursiv',selectAll:'Vælg alt',removeFormat:'Fjern formatering',strike:'Gennemstreget',subscript:'Sænket skrift',superscript:'Hævet skrift',horizontalrule:'Indsæt vandret streg',pagebreak:'Indsæt sideskift',pagebreakAlt:'Page Break',unlink:'Fjern hyperlink',undo:'Fortryd',redo:'Annullér fortryd',common:{browseServer:'Gennemse...',url:'URL',protocol:'Protokol',upload:'Upload',uploadSubmit:'Upload',image:'Indsæt billede',flash:'Indsæt Flash',form:'Indsæt formular',checkbox:'Indsæt afkrydsningsfelt',radio:'Indsæt alternativknap',textField:'Indsæt tekstfelt',textarea:'Indsæt tekstboks',hiddenField:'Indsæt skjult felt',button:'Indsæt knap',select:'Indsæt liste',imageButton:'Indsæt billedknap',notSet:'<intet valgt>',id:'Id',name:'Navn',langDir:'Tekstretning',langDirLtr:'Fra venstre mod højre (LTR)',langDirRtl:'Fra højre mod venstre (RTL)',langCode:'Sprogkode',longDescr:'Udvidet beskrivelse',cssClass:'Typografiark (CSS)',advisoryTitle:'Titel',cssStyle:'Typografi (CSS)',ok:'OK',cancel:'Annullér',close:'Close',preview:'Preview',generalTab:'Generelt',advancedTab:'Avanceret',validateNumberFailed:'Værdien er ikke et tal.',confirmNewPage:'Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?',confirmCancel:'Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Bredde',height:'Højde',align:'Justering',alignLeft:'Venstre',alignRight:'Højre',alignCenter:'Centreret',alignTop:'Øverst',alignMiddle:'Centreret',alignBottom:'Nederst',invalidHeight:'Højde skal være et tal.',invalidWidth:'Bredde skal være et tal.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ikke tilgængelig</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Indsæt symbol',title:'Vælg symbol',options:'Special Character Options'},link:{toolbar:'Indsæt/redigér hyperlink',other:'<anden>',menu:'Redigér hyperlink',title:'Egenskaber for hyperlink',info:'Generelt',target:'Mål',upload:'Upload',advanced:'Avanceret',type:'Type',toUrl:'URL',toAnchor:'Bogmærke på denne side',toEmail:'E-mail',targetFrame:'<ramme>',targetPopup:'<popup vindue>',targetFrameName:'Destinationsvinduets navn',targetPopupName:'Popup vinduets navn',popupFeatures:'Egenskaber for popup',popupResizable:'Justérbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Værktøjslinje',popupMenuBar:'Menulinje',popupFullScreen:'Fuld skærm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Koblet/dependent (Netscape)',popupLeft:'Position fra venstre',popupTop:'Position fra toppen',id:'Id',langDir:'Tekstretning',langDirLTR:'Fra venstre mod højre (LTR)',langDirRTL:'Fra højre mod venstre (RTL)',acccessKey:'Genvejstast',name:'Navn',langCode:'Tekstretning',tabIndex:'Tabulator indeks',advisoryTitle:'Titel',advisoryContentType:'Indholdstype',cssClasses:'Typografiark',charset:'Tegnsæt',styles:'Typografi',rel:'Relationship',selectAnchor:'Vælg et anker',anchorName:'Efter anker navn',anchorId:'Efter element Id',emailAddress:'E-mail adresse',emailSubject:'Emne',emailBody:'Besked',noAnchors:'(Ingen bogmærker i dokumentet)',noUrl:'Indtast hyperlink URL!',noEmail:'Indtast e-mail adresse!'},anchor:{toolbar:'Indsæt/redigér bogmærke',menu:'Egenskaber for bogmærke',title:'Egenskaber for bogmærke',name:'Bogmærke navn',errorName:'Indtast bogmærke navn',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Søg og erstat',find:'Søg',replace:'Erstat',findWhat:'Søg efter:',replaceWith:'Erstat med:',notFoundMsg:'Søgeteksten blev ikke fundet',findOptions:'Find Options',matchCase:'Forskel på store og små bogstaver',matchWord:'Kun hele ord',matchCyclic:'Match cyklisk',replaceAll:'Erstat alle',replaceSuccessMsg:'%1 forekomst(er) erstattet.'},table:{toolbar:'Tabel',title:'Egenskaber for tabel',menu:'Egenskaber for tabel',deleteTable:'Slet tabel',rows:'Rækker',columns:'Kolonner',border:'Rammebredde',widthPx:'pixels',widthPc:'procent',widthUnit:'width unit',cellSpace:'Celleafstand',cellPad:'Cellemargen',caption:'Titel',summary:'Resumé',headers:'Header',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første række',headersBoth:'Begge',invalidRows:'Antallet af rækker skal være større end 0.',invalidCols:'Antallet af kolonner skal være større end 0.',invalidBorder:'Rammetykkelse skal være et tal.',invalidWidth:'Tabelbredde skal være et tal.',invalidHeight:'Tabelhøjde skal være et tal.',invalidCellSpacing:'Celleafstand skal være et tal.',invalidCellPadding:'Cellemargen skal være et tal.',cell:{menu:'Celle',insertBefore:'Indsæt celle før',insertAfter:'Indsæt celle efter',deleteCell:'Slet celle',merge:'Flet celler',mergeRight:'Flet til højre',mergeDown:'Flet nedad',splitHorizontal:'Del celle vandret',splitVertical:'Del celle lodret',title:'Celleegenskaber',cellType:'Celletype',rowSpan:'Række span (rows span)',colSpan:'Kolonne span (columns span)',wordWrap:'Tekstombrydning',hAlign:'Vandret justering',vAlign:'Lodret justering',alignBaseline:'Grundlinje',bgColor:'Baggrundsfarve',borderColor:'Rammefarve',data:'Data',header:'Header',yes:'Ja',no:'Nej',invalidWidth:'Cellebredde skal være et tal.',invalidHeight:'Cellehøjde skal være et tal.',invalidRowSpan:'Række span skal være et heltal.',invalidColSpan:'Kolonne span skal være et heltal.',chooseColor:'Choose'},row:{menu:'Række',insertBefore:'Indsæt række før',insertAfter:'Indsæt række efter',deleteRow:'Slet række'},column:{menu:'Kolonne',insertBefore:'Indsæt kolonne før',insertAfter:'Indsæt kolonne efter',deleteColumn:'Slet kolonne'}},button:{title:'Egenskaber for knap',text:'Tekst',type:'Type',typeBtn:'Knap',typeSbm:'Send',typeRst:'Nulstil'},checkboxAndRadio:{checkboxTitle:'Egenskaber for afkrydsningsfelt',radioTitle:'Egenskaber for alternativknap',value:'Værdi',selected:'Valgt'},form:{title:'Egenskaber for formular',menu:'Egenskaber for formular',action:'Handling',method:'Metode',encoding:'Kodning (encoding)'},select:{title:'Egenskaber for liste',selectInfo:'Generelt',opAvail:'Valgmuligheder',value:'Værdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillad flere valg',opText:'Tekst',opValue:'Værdi',btnAdd:'Tilføj',btnModify:'Redigér',btnUp:'Op',btnDown:'Ned',btnSetValue:'Sæt som valgt',btnDelete:'Slet'},textarea:{title:'Egenskaber for tekstboks',cols:'Kolonner',rows:'Rækker'},textfield:{title:'Egenskaber for tekstfelt',name:'Navn',value:'Værdi',charWidth:'Bredde (tegn)',maxChars:'Max. antal tegn',type:'Type',typeText:'Tekst',typePass:'Adgangskode'},hidden:{title:'Egenskaber for skjult felt',name:'Navn',value:'Værdi'},image:{title:'Egenskaber for billede',titleButton:'Egenskaber for billedknap',menu:'Egenskaber for billede',infoTab:'Generelt',btnUpload:'Upload',upload:'Upload',alt:'Alternativ tekst',lockRatio:'Lås størrelsesforhold',resetSize:'Nulstil størrelse',border:'Ramme',hSpace:'Vandret margen',vSpace:'Lodret margen',alertUrl:'Indtast stien til billedet',linkTab:'Hyperlink',button2Img:'Vil du lave billedknappen om til et almindeligt billede?',img2Button:'Vil du lave billedet om til en billedknap?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Egenskaber for Flash',propertiesTab:'Egenskaber',title:'Egenskaber for Flash',chkPlay:'Automatisk afspilning',chkLoop:'Gentagelse',chkMenu:'Vis Flash menu',chkFull:'Tillad fuldskærm',scale:'Skalér',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Tilpas størrelse',access:'Script adgang',accessAlways:'Altid',accessSameDomain:'Samme domæne',accessNever:'Aldrig',alignAbsBottom:'Absolut nederst',alignAbsMiddle:'Absolut centreret',alignBaseline:'Grundlinje',alignTextTop:'Toppen af teksten',quality:'Kvalitet',qualityBest:'Bedste',qualityHigh:'Høj',qualityAutoHigh:'Auto høj',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindue',windowModeOpaque:'Gennemsigtig (opaque)',windowModeTransparent:'Transparent',windowMode:'Vinduestilstand',flashvars:'Variabler for Flash',bgcolor:'Baggrundsfarve',hSpace:'Vandret margen',vSpace:'Lodret margen',validateSrc:'Indtast hyperlink URL!',validateHSpace:'Vandret margen skal være et tal.',validateVSpace:'Lodret margen skal være et tal.'},spellCheck:{toolbar:'Stavekontrol',title:'Stavekontrol',notAvailable:'Stavekontrol er desværre ikke tilgængelig.',errorLoading:'Fejl ved indlæsning af host: %s.',notInDic:'Ikke i ordbogen',changeTo:'Forslag',btnIgnore:'Ignorér',btnIgnoreAll:'Ignorér alle',btnReplace:'Erstat',btnReplaceAll:'Erstat alle',btnUndo:'Tilbage',noSuggestions:'(ingen forslag)',progress:'Stavekontrollen arbejder...',noMispell:'Stavekontrol færdig: Ingen fejl fundet',noChanges:'Stavekontrol færdig: Ingen ord ændret',oneChange:'Stavekontrol færdig: Et ord ændret',manyChanges:'Stavekontrol færdig: %1 ord ændret',ieSpellDownload:'Stavekontrol ikke installeret. Vil du installere den nu?'},smiley:{toolbar:'Smiley',title:'Vælg smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Talopstilling',bulletedlist:'Punktopstilling',indent:'Forøg indrykning',outdent:'Formindsk indrykning',justify:{left:'Venstrestillet',center:'Centreret',right:'Højrestillet',block:'Lige margener'},blockquote:'Blokcitat',clipboard:{title:'Indsæt',cutError:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).',copyError:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).',pasteMsg:'Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.',securityMsg:'Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?',toolbar:'Indsæt fra Word',title:'Indsæt fra Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Indsæt som ikke-formateret tekst',title:'Indsæt som ikke-formateret tekst'},templates:{button:'Skabeloner',title:'Indholdsskabeloner',options:'Template Options',insertOption:'Erstat det faktiske indhold',selectPromptMsg:'Vælg den skabelon, som skal åbnes i editoren (nuværende indhold vil blive overskrevet):',emptyListMsg:'(Der er ikke defineret nogen skabelon)'},showBlocks:'Vis afsnitsmærker',stylesCombo:{label:'Typografi',panelTitle:'Formatting Styles',panelTitle1:'Block typografi',panelTitle2:'Inline typografi',panelTitle3:'Object typografi'},format:{label:'Formatering',panelTitle:'Formatering',tag_p:'Normal',tag_pre:'Formateret',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Skrifttype',voiceLabel:'Skrifttype',panelTitle:'Skrifttype'},fontSize:{label:'Skriftstørrelse',voiceLabel:'Skriftstørrelse',panelTitle:'Skriftstørrelse'},colorButton:{textColorTitle:'Tekstfarve',bgColorTitle:'Baggrundsfarve',panelTitle:'Colors',auto:'Automatisk',more:'Flere farver...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Stavekontrol mens du skriver',opera_title:'Not supported by Opera',enable:'Aktivér SCAYT',disable:'Deaktivér SCAYT',about:'Om SCAYT',toggle:'Skift/toggle SCAYT',options:'Indstillinger',langs:'Sprog',moreSuggestions:'Flere forslag',ignore:'Ignorér',ignoreAll:'Ignorér alle',addWord:'Tilføj ord',emptyDic:'Ordbogsnavn må ikke være tom.',optionsTab:'Indstillinger',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Sprog',dictionariesTab:'Ordbøger',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For informationer omkring licens, se venligst vores hjemmeside (på engelsk):',copy:'Copyright &copy; $1. Alle rettigheder forbeholdes.'},maximize:'Maximér',minimize:'Minimize',fakeobjects:{anchor:'Anker',flash:'Flashanimation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Ukendt objekt'},resize:'Træk for at skalere',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Egenskaber for dokument',title:'Egenskaber for dokument',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'<anden>',docTitle:'Sidetitel',charset:'Tegnsæt kode',charsetOther:'Anden tegnsæt kode',charsetASCII:'ASCII',charsetCE:'Centraleuropæisk',charsetCT:'Traditionel kinesisk (Big5)',charsetCR:'Kyrillisk',charsetGR:'Græsk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropæisk',docType:'Dokumenttype kategori',docTypeOther:'Anden dokumenttype kategori',xhtmlDec:'Inkludere XHTML deklartion',bgColor:'Baggrundsfarve',bgImage:'Baggrundsbillede URL',bgFixed:'Fastlåst baggrund',txtColor:'Tekstfarve',margin:'Sidemargen',marginTop:'Øverst',marginLeft:'Venstre',marginRight:'Højre',marginBottom:'Nederst',metaKeywords:'Dokument index nøgleord (kommasepareret)',metaDescription:'Dokument beskrivelse',metaAuthor:'Forfatter',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/de.js b/upload/public/js/3rd_party/ckeditor/lang/de.js
new file mode 100644
index 00000000..8c80e0bb
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/de.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.de={dir:'ltr',editorTitle:'WYSIWYG-Editor, %1, drücken Sie ALT 0 für Hilfe.',toolbars:'Editor Symbolleisten',editor:'WYSIWYG-Editor',source:'Quellcode',newPage:'Neue Seite',save:'Speichern',preview:'Vorschau',cut:'Ausschneiden',copy:'Kopieren',paste:'Einfügen',print:'Drucken',underline:'Unterstrichen',bold:'Fett',italic:'Kursiv',selectAll:'Alles auswählen',removeFormat:'Formatierungen entfernen',strike:'Durchgestrichen',subscript:'Tiefgestellt',superscript:'Hochgestellt',horizontalrule:'Horizontale Linie einfügen',pagebreak:'Seitenumbruch einfügen',pagebreakAlt:'Seitenumbruch einfügen',unlink:'Link entfernen',undo:'Rückgängig',redo:'Wiederherstellen',common:{browseServer:'Server durchsuchen',url:'URL',protocol:'Protokoll',upload:'Hochladen',uploadSubmit:'Zum Server senden',image:'Bild',flash:'Flash',form:'Formular',checkbox:'Checkbox',radio:'Radiobutton',textField:'Textfeld einzeilig',textarea:'Textfeld mehrzeilig',hiddenField:'Verstecktes Feld',button:'Klickbutton',select:'Auswahlfeld',imageButton:'Bildbutton',notSet:'<nichts>',id:'ID',name:'Name',langDir:'Schreibrichtung',langDirLtr:'Links nach Rechts (LTR)',langDirRtl:'Rechts nach Links (RTL)',langCode:'Sprachenkürzel',longDescr:'Langform URL',cssClass:'Stylesheet Klasse',advisoryTitle:'Titel Beschreibung',cssStyle:'Style',ok:'OK',cancel:'Abbrechen',close:'Schließen',preview:'Vorschau',generalTab:'Allgemein',advancedTab:'Erweitert',validateNumberFailed:'Dieser Wert ist keine Nummer.',confirmNewPage:'Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?',confirmCancel:'Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?',options:'Optionen',target:'Zielseite',targetNew:'Neues Fenster (_blank)',targetTop:'Oberstes Fenster (_top)',targetSelf:'Gleiches Fenster (_self)',targetParent:'Oberes Fenster (_parent)',langDirLTR:'Links nach Rechts (LNR)',langDirRTL:'Rechts nach Links (RNL)',styles:'Style',cssClasses:'Stylesheet Klasse',width:'Breite',height:'Höhe',align:'Ausrichtung',alignLeft:'Links',alignRight:'Rechts',alignCenter:'Zentriert',alignTop:'Oben',alignMiddle:'Mitte',alignBottom:'Unten',invalidHeight:'Höhe muss eine Zahl sein.',invalidWidth:'Breite muss eine Zahl sein.',invalidCssLength:'Wert spezifiziert für "%1" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).',invalidHtmlLength:'Wert spezifiziert für "%1" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).',invalidInlineStyle:'Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format "Name : Wert" getrennt mit Semikolons.',cssLengthTooltip:'Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).',unavailable:'%1<span class="cke_accessibility">, nicht verfügbar</span>'},contextmenu:{options:'Kontextmenü Optionen'},specialChar:{toolbar:'Sonderzeichen einfügen/editieren',title:'Sonderzeichen auswählen',options:'Sonderzeichen Optionen'},link:{toolbar:'Link einfügen/editieren',other:'<andere>',menu:'Link editieren',title:'Link',info:'Link-Info',target:'Zielseite',upload:'Hochladen',advanced:'Erweitert',type:'Link-Typ',toUrl:'URL',toAnchor:'Anker in dieser Seite',toEmail:'E-Mail',targetFrame:'<Frame>',targetPopup:'<Pop-up Fenster>',targetFrameName:'Ziel-Fenster-Name',targetPopupName:'Pop-up Fenster-Name',popupFeatures:'Pop-up Fenster-Eigenschaften',popupResizable:'Größe änderbar',popupStatusBar:'Statusleiste',popupLocationBar:'Adress-Leiste',popupToolbar:'Symbolleiste',popupMenuBar:'Menü-Leiste',popupFullScreen:'Vollbild (IE)',popupScrollBars:'Rollbalken',popupDependent:'Abhängig (Netscape)',popupLeft:'Linke Position',popupTop:'Obere Position',id:'Id',langDir:'Schreibrichtung',langDirLTR:'Links nach Rechts (LTR)',langDirRTL:'Rechts nach Links (RTL)',acccessKey:'Zugriffstaste',name:'Name',langCode:'Sprachenkürzel',tabIndex:'Tab-Index',advisoryTitle:'Titel Beschreibung',advisoryContentType:'Inhaltstyp',cssClasses:'Stylesheet Klasse',charset:'Ziel-Zeichensatz',styles:'Style',rel:'Beziehung',selectAnchor:'Anker auswählen',anchorName:'nach Anker Name',anchorId:'nach Element Id',emailAddress:'E-Mail Addresse',emailSubject:'Betreffzeile',emailBody:'Nachrichtentext',noAnchors:'(keine Anker im Dokument vorhanden)',noUrl:'Bitte geben Sie die Link-URL an',noEmail:'Bitte geben Sie e-Mail Adresse an'},anchor:{toolbar:'Anker einfügen/editieren',menu:'Anker-Eigenschaften',title:'Anker-Eigenschaften',name:'Anker Name',errorName:'Bitte geben Sie den Namen des Ankers ein',remove:'Anker entfernen'},list:{numberedTitle:'Nummerierte Listen-Eigenschaften',bulletedTitle:'Listen-Eigenschaften',type:'Typ',start:'Start',validateStartNumber:'List Startnummer muss eine ganze Zahl sein.',circle:'Ring',disc:'Kreis',square:'Quadrat',none:'Keine',notset:'<nicht gesetzt>',armenian:'Armenisch Nummerierung',georgian:'Georgisch Nummerierung (an, ban, gan, etc.)',lowerRoman:'Klein römisch (i, ii, iii, iv, v, etc.)',upperRoman:'Groß römisch (I, II, III, IV, V, etc.)',lowerAlpha:'Klein alpha (a, b, c, d, e, etc.)',upperAlpha:'Groß alpha (A, B, C, D, E, etc.)',lowerGreek:'Klein griechisch (alpha, beta, gamma, etc.)',decimal:'Dezimal (1, 2, 3, etc.)',decimalLeadingZero:'Dezimal mit führende  Null (01, 02, 03, etc.)'},findAndReplace:{title:'Suchen und Ersetzen',find:'Suchen',replace:'Ersetzen',findWhat:'Suche nach:',replaceWith:'Ersetze mit:',notFoundMsg:'Der gesuchte Text wurde nicht gefunden.',findOptions:'Suchoptionen',matchCase:'Groß-Kleinschreibung beachten',matchWord:'Nur ganze Worte suchen',matchCyclic:'Zyklische Suche',replaceAll:'Alle ersetzen',replaceSuccessMsg:'%1 vorkommen ersetzt.'},table:{toolbar:'Tabelle',title:'Tabellen-Eigenschaften',menu:'Tabellen-Eigenschaften',deleteTable:'Tabelle löschen',rows:'Zeile',columns:'Spalte',border:'Rahmen',widthPx:'Pixel',widthPc:'%',widthUnit:'Breite Einheit',cellSpace:'Zellenabstand außen',cellPad:'Zellenabstand innen',caption:'Überschrift',summary:'Inhaltsübersicht',headers:'Kopfzeile',headersNone:'Keine',headersColumn:'Erste Spalte',headersRow:'Erste Zeile',headersBoth:'Beide',invalidRows:'Die Anzahl der Zeilen muß größer als 0 sein.',invalidCols:'Die Anzahl der Spalten muß größer als 0 sein..',invalidBorder:'Die Rahmenbreite muß eine Zahl sein.',invalidWidth:'Die Tabellenbreite muss eine Zahl sein.',invalidHeight:'Die Tabellenbreite muß eine Zahl sein.',invalidCellSpacing:'Der Zellenabstand außen muß eine positive Zahl sein.',invalidCellPadding:'Der Zellenabstand innen muß eine positive Zahl sein.',cell:{menu:'Zelle',insertBefore:'Zelle davor einfügen',insertAfter:'Zelle danach einfügen',deleteCell:'Zelle löschen',merge:'Zellen verbinden',mergeRight:'Nach rechts verbinden',mergeDown:'Nach unten verbinden',splitHorizontal:'Zelle horizontal teilen',splitVertical:'Zelle vertikal teilen',title:'Zellen-Eigenschaften',cellType:'Zellart',rowSpan:'Anzahl Zeilen verbinden',colSpan:'Anzahl Spalten verbinden',wordWrap:'Zeilenumbruch',hAlign:'Horizontale Ausrichtung',vAlign:'Vertikale Ausrichtung',alignBaseline:'Grundlinie',bgColor:'Hintergrundfarbe',borderColor:'Rahmenfarbe',data:'Daten',header:'Überschrift',yes:'Ja',no:'Nein',invalidWidth:'Zellenbreite muß eine Zahl sein.',invalidHeight:'Zellenhöhe muß eine Zahl sein.',invalidRowSpan:'"Anzahl Zeilen verbinden" muss eine Ganzzahl sein.',invalidColSpan:'"Anzahl Spalten verbinden" muss eine Ganzzahl sein.',chooseColor:'Wählen'},row:{menu:'Zeile',insertBefore:'Zeile oberhalb einfügen',insertAfter:'Zeile unterhalb einfügen',deleteRow:'Zeile entfernen'},column:{menu:'Spalte',insertBefore:'Spalte links davor einfügen',insertAfter:'Spalte rechts danach einfügen',deleteColumn:'Spalte löschen'}},button:{title:'Button-Eigenschaften',text:'Text (Wert)',type:'Typ',typeBtn:'Button',typeSbm:'Absenden',typeRst:'Zurücksetzen'},checkboxAndRadio:{checkboxTitle:'Checkbox-Eigenschaften',radioTitle:'Optionsfeld-Eigenschaften',value:'Wert',selected:'ausgewählt'},form:{title:'Formular-Eigenschaften',menu:'Formular-Eigenschaften',action:'Action',method:'Method',encoding:'Zeichenkodierung'},select:{title:'Auswahlfeld-Eigenschaften',selectInfo:'Info',opAvail:'Mögliche Optionen',value:'Wert',size:'Größe',lines:'Linien',chkMulti:'Erlaube Mehrfachauswahl',opText:'Text',opValue:'Wert',btnAdd:'Hinzufügen',btnModify:'Ändern',btnUp:'Hoch',btnDown:'Runter',btnSetValue:'Setze als Standardwert',btnDelete:'Entfernen'},textarea:{title:'Textfeld (mehrzeilig) Eigenschaften',cols:'Spalten',rows:'Reihen'},textfield:{title:'Textfeld (einzeilig) Eigenschaften',name:'Name',value:'Wert',charWidth:'Zeichenbreite',maxChars:'Max. Zeichen',type:'Typ',typeText:'Text',typePass:'Passwort'},hidden:{title:'Verstecktes Feld-Eigenschaften',name:'Name',value:'Wert'},image:{title:'Bild-Eigenschaften',titleButton:'Bildbutton-Eigenschaften',menu:'Bild-Eigenschaften',infoTab:'Bild-Info',btnUpload:'Zum Server senden',upload:'Hochladen',alt:'Alternativer Text',lockRatio:'Größenverhältnis beibehalten',resetSize:'Größe zurücksetzen',border:'Rahmen',hSpace:'Horizontal-Abstand',vSpace:'Vertikal-Abstand',alertUrl:'Bitte geben Sie die Bild-URL an',linkTab:'Link',button2Img:'Möchten Sie den gewählten Bild-Button in ein einfaches Bild umwandeln?',img2Button:'Möchten Sie das gewählten Bild in einen Bild-Button umwandeln?',urlMissing:'Imagequelle URL fehlt.',validateBorder:'Rahmen muß eine ganze Zahl sein.',validateHSpace:'Horizontal-Abstand muß eine ganze Zahl sein.',validateVSpace:'Vertikal-Abstand muß eine ganze Zahl sein.'},flash:{properties:'Flash-Eigenschaften',propertiesTab:'Eigenschaften',title:'Flash-Eigenschaften',chkPlay:'Automatisch Abspielen',chkLoop:'Endlosschleife',chkMenu:'Flash-Menü aktivieren',chkFull:'Vollbildmodus erlauben',scale:'Skalierung',scaleAll:'Alles anzeigen',scaleNoBorder:'Ohne Rand',scaleFit:'Passgenau',access:'Skript Zugang',accessAlways:'Immer',accessSameDomain:'Gleiche Domain',accessNever:'Nie',alignAbsBottom:'Abs Unten',alignAbsMiddle:'Abs Mitte',alignBaseline:'Baseline',alignTextTop:'Text Oben',quality:'Qualität',qualityBest:'Beste',qualityHigh:'Hoch',qualityAutoHigh:'Auto Hoch',qualityMedium:'Medium',qualityAutoLow:'Auto Niedrig',qualityLow:'Niedrig',windowModeWindow:'Fenster',windowModeOpaque:'Deckend',windowModeTransparent:'Transparent',windowMode:'Fenster Modus',flashvars:'Variablen für Flash',bgcolor:'Hintergrundfarbe',hSpace:'Horizontal-Abstand',vSpace:'Vertikal-Abstand',validateSrc:'Bitte geben Sie die Link-URL an',validateHSpace:'HSpace muss eine Zahl sein.',validateVSpace:'VSpace muss eine Zahl sein.'},spellCheck:{toolbar:'Rechtschreibprüfung',title:'Rechtschreibprüfung',notAvailable:'Entschuldigung, aber dieser Dienst steht im Moment nicht zur Verfügung.',errorLoading:'Fehler beim laden des Dienstanbieters: %s.',notInDic:'Nicht im Wörterbuch',changeTo:'Ändern in',btnIgnore:'Ignorieren',btnIgnoreAll:'Alle Ignorieren',btnReplace:'Ersetzen',btnReplaceAll:'Alle Ersetzen',btnUndo:'Rückgängig',noSuggestions:' - keine Vorschläge - ',progress:'Rechtschreibprüfung läuft...',noMispell:'Rechtschreibprüfung abgeschlossen - keine Fehler gefunden',noChanges:'Rechtschreibprüfung abgeschlossen - keine Worte geändert',oneChange:'Rechtschreibprüfung abgeschlossen - ein Wort geändert',manyChanges:'Rechtschreibprüfung abgeschlossen - %1 Wörter geändert',ieSpellDownload:'Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?'},smiley:{toolbar:'Smiley',title:'Smiley auswählen',options:'Smiley Optionen'},elementsPath:{eleLabel:'Elements Pfad',eleTitle:'%1 Element'},numberedlist:'Nummerierte Liste',bulletedlist:'Liste',indent:'Einzug erhöhen',outdent:'Einzug verringern',justify:{left:'Linksbündig',center:'Zentriert',right:'Rechtsbündig',block:'Blocksatz'},blockquote:'Zitatblock',clipboard:{title:'Einfügen',cutError:'Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).',copyError:'Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).',pasteMsg:'Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.',securityMsg:'Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.',pasteArea:'Einfügebereich'},pastefromword:{confirmCleanup:'Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?',toolbar:'Aus MS-Word einfügen',title:'Aus MS-Word einfügen',error:'Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen'},pasteText:{button:'Als Text einfügen',title:'Als Text einfügen'},templates:{button:'Vorlagen',title:'Vorlagen',options:'Vorlagen Optionen',insertOption:'Aktuellen Inhalt ersetzen',selectPromptMsg:'Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen (der aktuelle Inhalt wird dabei gelöscht!):',emptyListMsg:'(keine Vorlagen definiert)'},showBlocks:'Blöcke anzeigen',stylesCombo:{label:'Stil',panelTitle:'Formatierungenstil',panelTitle1:'Block Stilart',panelTitle2:'Inline Stilart',panelTitle3:'Objekt Stilart'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatiert',tag_address:'Addresse',tag_h1:'Überschrift 1',tag_h2:'Überschrift 2',tag_h3:'Überschrift 3',tag_h4:'Überschrift 4',tag_h5:'Überschrift 5',tag_h6:'Überschrift 6',tag_div:'Normal (DIV)'},div:{title:'Div Container erzeugen',toolbar:'Div Container erzeugen',cssClassInputLabel:'Stylesheet Klasse',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:'Sprachenkürzel',inlineStyleInputLabel:'Inline Stil',advisoryTitleInputLabel:'Tooltip',langDirLabel:'Sprache Richtung',langDirLTRLabel:'Links nach Rechs (LTR)',langDirRTLLabel:'Rechs nach Links (RTL)',edit:'Div bearbeiten',remove:'Div entfernen'},iframe:{title:'IFrame-Eigenschaften',toolbar:'IFrame',noUrl:'Bitte geben Sie die IFrame-URL an',scrolling:'Rollbalken anzeigen',border:'Rahmen anzeigen'},font:{label:'Schriftart',voiceLabel:'Schriftart',panelTitle:'Schriftart'},fontSize:{label:'Größe',voiceLabel:'Schrifgröße',panelTitle:'Größe'},colorButton:{textColorTitle:'Textfarbe',bgColorTitle:'Hintergrundfarbe',panelTitle:'Farben',auto:'Automatisch',more:'Weitere Farben...'},colors:{'000':'Schwarz',800000:'Kastanienbraun','8B4513':'Braun','2F4F4F':'Dunkles Schiefergrau','008080':'Blaugrün','000080':'Navy','4B0082':'Indigo',696969:'Dunkelgrau',B22222:'Ziegelrot',A52A2A:'Braun',DAA520:'Goldgelb','006400':'Dunkelgrün','40E0D0':'Türkis','0000CD':'Medium Blau',800080:'Lila',808080:'Grau',F00:'Rot',FF8C00:'Dunkelorange',FFD700:'Gold','008000':'Grün','0FF':'Cyan','00F':'Blau',EE82EE:'Hellviolett',A9A9A9:'Dunkelgrau',FFA07A:'Helles Lachsrosa',FFA500:'Orange',FFFF00:'Gelb','00FF00':'Lime',AFEEEE:'Blaß-Türkis',ADD8E6:'Hellblau',DDA0DD:'Pflaumenblau',D3D3D3:'Hellgrau',FFF0F5:'Lavendel',FAEBD7:'Antik Weiß',FFFFE0:'Hellgelb',F0FFF0:'Honigtau',F0FFFF:'Azurblau',F0F8FF:'Alice Blau',E6E6FA:'Lavendel',FFF:'Weiß'},scayt:{title:'Rechtschreibprüfung während der Texteingabe (SCAYT)',opera_title:'Nicht von Opera unterstützt',enable:'SCAYT einschalten',disable:'SCAYT ausschalten',about:'Über SCAYT',toggle:'SCAYT umschalten',options:'Optionen',langs:'Sprachen',moreSuggestions:'Mehr Vorschläge',ignore:'Ignorieren',ignoreAll:'Alle ignorieren',addWord:'Wort hinzufügen',emptyDic:'Wörterbuchname sollte leer sein.',optionsTab:'Optionen',allCaps:'Groß geschriebenen Wörter ignorieren',ignoreDomainNames:'Domain-Namen ignorieren',mixedCase:'Wörter mit gemischte Setzkasten ignorieren',mixedWithDigits:'Wörter mit Zahlen ignorieren',languagesTab:'Sprachen',dictionariesTab:'Wörterbücher',dic_field_name:'Wörterbuchname',dic_create:'Erzeugen',dic_restore:'Wiederherstellen',dic_delete:'Löschen',dic_rename:'Umbenennen',dic_info:'Anfangs wird das Benutzerwörterbuch in einem Cookie gespeichert. Allerdings sind Cookies in der Größe begrenzt. Wenn das Benutzerwörterbuch bis zu einem Punkt wächst, wo es nicht mehr in einem Cookie gespeichert werden kann, wird das Benutzerwörterbuch auf dem Server gespeichert. Um Ihr persönliches Wörterbuch auf dem Server zu speichern, müssen Sie einen Namen für das Wörterbuch angeben. Falls  Sie schon ein gespeicherte Wörterbuch haben, geben Sie bitte dessen Namen ein und klicken Sie auf die Schaltfläche Wiederherstellen.',aboutTab:'Über'},about:{title:'Über CKEditor',dlgTitle:'Über CKEditor',help:'Prüfe $1 für Hilfe.',userGuide:'CKEditor Benutzerhandbuch',moreInfo:'Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:',copy:'Copyright &copy; $1. Alle Rechte vorbehalten.'},maximize:'Maximieren',minimize:'Minimieren',fakeobjects:{anchor:'Anker',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Verstecktes Feld',unknown:'Unbekanntes Objekt'},resize:'Zum Vergrößern ziehen',colordialog:{title:'Farbe wählen',options:'Farbeoptionen',highlight:'Hervorheben',selected:'Ausgewählte Farbe',clear:'Entfernen'},toolbarCollapse:'Symbolleiste einklappen',toolbarExpand:'Symbolleiste ausklappen',toolbarGroups:{document:'Dokument',clipboard:'Zwischenablage/Rückgängig',editing:'Editieren',forms:'Formularen',basicstyles:'Grundstile',paragraph:'Absatz',links:'Links',insert:'Einfügen',styles:'Stile',colors:'Farben',tools:'Werkzeuge'},bidi:{ltr:'Leserichtung von Links nach Rechts',rtl:'Leserichtung von Rechts nach Links'},docprops:{label:'Dokument-Eigenschaften',title:'Dokument-Eigenschaften',design:'Design',meta:'Metadaten',chooseColor:'Wählen',other:'<andere>',docTitle:'Seitentitel',charset:'Zeichenkodierung',charsetOther:'Andere Zeichenkodierung',charsetASCII:'ASCII',charsetCE:'Zentraleuropäisch',charsetCT:'traditionell Chinesisch (Big5)',charsetCR:'Kyrillisch',charsetGR:'Griechisch',charsetJP:'Japanisch',charsetKR:'Koreanisch',charsetTR:'Türkisch',charsetUN:'Unicode (UTF-8)',charsetWE:'Westeuropäisch',docType:'Dokumententyp',docTypeOther:'Anderer Dokumententyp',xhtmlDec:'Beziehe XHTML Deklarationen ein',bgColor:'Hintergrundfarbe',bgImage:'Hintergrundbild URL',bgFixed:'feststehender Hintergrund',txtColor:'Textfarbe',margin:'Seitenränder',marginTop:'Oben',marginLeft:'Links',marginRight:'Rechts',marginBottom:'Unten',metaKeywords:'Schlüsselwörter (durch Komma getrennt)',metaDescription:'Dokument-Beschreibung',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>Das ist ein <strong>Beispieltext</strong>. Du schreibst in <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/el.js b/upload/public/js/3rd_party/ckeditor/lang/el.js
new file mode 100644
index 00000000..f8ba03ba
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/el.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.el={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML κώδικας',newPage:'�έα Σελίδα',save:'Αποθήκευση',preview:'Π�οεπισκόπιση',cut:'Αποκοπή',copy:'Αντιγ�αφή',paste:'Επικόλληση',print:'Εκτ�πωση',underline:'Υπογ�άμμιση',bold:'Έντονα',italic:'Πλάγια',selectAll:'Επιλογή όλων',removeFormat:'Αφαί�εση Μο�φοποίησης',strike:'Διαγ�άμμιση',subscript:'Δείκτης',superscript:'Εκθέτης',horizontalrule:'Εισαγωγή Ο�ιζόντιας Γ�αμμής',pagebreak:'Εισαγωγή τέλους σελίδας',pagebreakAlt:'Page Break',unlink:'Αφαί�εση Συνδέσμου (Link)',undo:'Αναί�εση',redo:'Επαναφο�ά',common:{browseServer:'Εξε�ε�νηση διακομιστή',url:'URL',protocol:'Π�οτόκολο',upload:'Αποστολή',uploadSubmit:'Αποστολή στον Διακομιστή',image:'Εικόνα',flash:'Εισαγωγή Flash',form:'Φό�μα',checkbox:'Κουτί επιλογής',radio:'Κουμπί Radio',textField:'Πεδίο κειμένου',textarea:'Πε�ιοχή κειμένου',hiddenField:'Κ�υφό πεδίο',button:'Κουμπί',select:'Πεδίο επιλογής',imageButton:'Κουμπί εικόνας',notSet:'<χω�ίς>',id:'Id',name:'Όνομα',langDir:'Κατε�θυνση κειμένου',langDirLtr:'Α�ιστε�ά π�ος Δεξιά (LTR)',langDirRtl:'Δεξιά π�ος Α�ιστε�ά (RTL)',langCode:'Κωδικός Γλώσσας',longDescr:'Αναλυτική πε�ιγ�αφή URL',cssClass:'Stylesheet Classes',advisoryTitle:'Συμβουλευτικός τίτλος',cssStyle:'Στ�λ',ok:'OK',cancel:'Ακ��ωση',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Για π�οχω�ημένους',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Πλάτος',height:'Ύψος',align:'Ευθυγ�άμμιση (Align)',alignLeft:'Α�ιστε�ά',alignRight:'Δεξιά (Right)',alignCenter:'Κέντ�ο',alignTop:'Πάνω (Top)',alignMiddle:'Μέση (Middle)',alignBottom:'Κάτω (Bottom)',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Εισαγωγή Ειδικο� Συμβόλου',title:'Επιλέξτε ένα Ειδικό Σ�μβολο',options:'Special Character Options'},link:{toolbar:'Εισαγωγή/Μεταβολή Συνδέσμου (Link)',other:'<άλλος>',menu:'Μεταβολή Συνδέσμου (Link)',title:'Σ�νδεσμος (Link)',info:'Link',target:'Πα�άθυ�ο Στόχος (Target)',upload:'Αποστολή',advanced:'Για π�οχω�ημένους',type:'Τ�πος συνδέσμου (Link)',toUrl:'URL',toAnchor:'Άγκυ�α σε αυτή τη σελίδα',toEmail:'E-Mail',targetFrame:'<πλαίσιο>',targetPopup:'<πα�άθυ�ο popup>',targetFrameName:'Όνομα πλαισίου στόχου',targetPopupName:'Όνομα Popup Window',popupFeatures:'Επιλογές Popup Window',popupResizable:'Resizable',popupStatusBar:'Μπά�α Status',popupLocationBar:'Μπά�α Τοποθεσίας',popupToolbar:'Μπά�α Ε�γαλείων',popupMenuBar:'Μπά�α Menu',popupFullScreen:'Ολόκλη�η η Οθόνη (IE)',popupScrollBars:'Μπά�ες Κ�λισης',popupDependent:'Dependent (Netscape)',popupLeft:'Τοποθεσία Α�ιστε�ής Άκ�ης',popupTop:'Τοποθεσία Πάνω Άκ�ης',id:'Id',langDir:'Κατε�θυνση κειμένου',langDirLTR:'Α�ιστε�ά π�ος Δεξιά (LTR)',langDirRTL:'Δεξιά π�ος Α�ιστε�ά (RTL)',acccessKey:'Συντόμευση (Access Key)',name:'Όνομα',langCode:'Κατε�θυνση κειμένου',tabIndex:'Tab Index',advisoryTitle:'Συμβουλευτικός τίτλος',advisoryContentType:'Συμβουλευτικός τίτλος πε�ιεχομένου',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Στ�λ',rel:'Relationship',selectAnchor:'Επιλέξτε μια άγκυ�α',anchorName:'Βάσει του Ονόματος (Name) της άγκυ�ας',anchorId:'Βάσει του Element Id',emailAddress:'Διε�θυνση Ηλεκτ�ονικο� Ταχυδ�ομείου',emailSubject:'Θέμα Μην�ματος',emailBody:'Κείμενο Μην�ματος',noAnchors:'(Δεν υπά�χουν άγκυ�ες στο κείμενο)',noUrl:'Εισάγετε την τοποθεσία (URL) του υπε�συνδέσμου (Link)',noEmail:'Εισάγετε την διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου'},anchor:{toolbar:'Εισαγωγή/επεξε�γασία Anchor',menu:'Ιδιότητες άγκυ�ας',title:'Ιδιότητες άγκυ�ας',name:'Όνομα άγκυ�ας',errorName:'Πα�ακαλο�με εισάγετε όνομα άγκυ�ας',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Αναζήτηση',replace:'Αντικατάσταση',findWhat:'Αναζήτηση:',replaceWith:'Αντικατάσταση με:',notFoundMsg:'Το κείμενο δεν β�έθηκε.',findOptions:'Find Options',matchCase:'Έλεγχος πεζών/κεφαλαίων',matchWord:'Ε��εση πλή�ους λέξης',matchCyclic:'Match cyclic',replaceAll:'Αντικατάσταση Όλων',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Πίνακας',title:'Ιδιότητες Πίνακα',menu:'Ιδιότητες Πίνακα',deleteTable:'Διαγ�αφή πίνακα',rows:'Γ�αμμές',columns:'Κολώνες',border:'Μέγεθος Πε�ιθω�ίου',widthPx:'pixels',widthPc:'%',widthUnit:'width unit',cellSpace:'Απόσταση κελιών',cellPad:'Γέμισμα κελιών',caption:'Υπέ�τιτλος',summary:'Πε�ίληψη',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Κελί',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Διαγ�αφή Κελιών',merge:'Ενοποίηση Κελιών',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Σει�ά',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Διαγ�αφή Γ�αμμών'},column:{menu:'Στήλη',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Διαγ�αφή Κολωνών'}},button:{title:'Ιδιότητες κουμπιο�',text:'Κείμενο (Τιμή)',type:'Τ�πος',typeBtn:'Κουμπί',typeSbm:'Καταχώ�ηση',typeRst:'Επαναφο�ά'},checkboxAndRadio:{checkboxTitle:'Ιδιότητες κουμπιο� επιλογής',radioTitle:'Ιδιότητες κουμπιο� radio',value:'Τιμή',selected:'Επιλεγμένο'},form:{title:'Ιδιότητες φό�μας',menu:'Ιδιότητες φό�μας',action:'Δ�άση',method:'Μάθοδος',encoding:'Encoding'},select:{title:'Ιδιότητες πεδίου επιλογής',selectInfo:'Πλη�οφο�ίες',opAvail:'Διαθέσιμες επιλογές',value:'Τιμή',size:'Μέγεθος',lines:'γ�αμμές',chkMulti:'Πολλαπλές επιλογές',opText:'Κείμενο',opValue:'Τιμή',btnAdd:'Π�οσθήκη',btnModify:'Αλλαγή',btnUp:'Πάνω',btnDown:'Κάτω',btnSetValue:'Π�οεπιλεγμένη επιλογή',btnDelete:'Διαγ�αφή'},textarea:{title:'Ιδιότητες πε�ιοχής κειμένου',cols:'Στήλες',rows:'Σει�ές'},textfield:{title:'Ιδιότητες πεδίου κειμένου',name:'Όνομα',value:'Τιμή',charWidth:'Μήκος χα�ακτή�ων',maxChars:'Μέγιστοι χα�ακτή�ες',type:'Τ�πος',typeText:'Κείμενο',typePass:'Κωδικός'},hidden:{title:'Ιδιότητες κ�υφο� πεδίου',name:'Όνομα',value:'Τιμή'},image:{title:'Ιδιότητες Εικόνας',titleButton:'Ιδιότητες κουμπιο� εικόνας',menu:'Ιδιότητες Εικόνας',infoTab:'Πλη�οφο�ίες Εικόνας',btnUpload:'Αποστολή στον Διακομιστή',upload:'Αποστολή',alt:'Εναλλακτικό Κείμενο (ALT)',lockRatio:'Κλείδωμα Αναλογίας',resetSize:'Επαναφο�ά Α�χικο� Μεγέθους',border:'Πε�ιθώ�ιο',hSpace:'Ο�ιζόντιος Χώ�ος (HSpace)',vSpace:'Κάθετος Χώ�ος (VSpace)',alertUrl:'Εισάγετε την τοποθεσία (URL) της εικόνας',linkTab:'Σ�νδεσμος',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Ιδιότητες Flash',propertiesTab:'Properties',title:'Ιδιότητες flash',chkPlay:'Αυτόματη ένα�ξη',chkLoop:'Επανάληψη',chkMenu:'Ενε�γοποίηση Flash Menu',chkFull:'Allow Fullscreen',scale:'Κλίμακα',scaleAll:'Εμφάνιση όλων',scaleNoBorder:'Χω�ίς ό�ια',scaleFit:'Ακ�ιβής εφα�μογή',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Απόλυτα Κάτω (Abs Bottom)',alignAbsMiddle:'Απόλυτα στη Μέση (Abs Middle)',alignBaseline:'Γ�αμμή Βάσης (Baseline)',alignTextTop:'Κο�υφή Κειμένου (Text Top)',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Χ�ώμα Υποβάθ�ου',hSpace:'Ο�ιζόντιος Χώ�ος (HSpace)',vSpace:'Κάθετος Χώ�ος (VSpace)',validateSrc:'Εισάγετε την τοποθεσία (URL) του υπε�συνδέσμου (Link)',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Ο�θογ�αφικός έλεγχος',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Δεν υπά�χει στο λεξικό',changeTo:'Αλλαγή σε',btnIgnore:'Αγνόηση',btnIgnoreAll:'Αγνόηση όλων',btnReplace:'Αντικατάσταση',btnReplaceAll:'Αντικατάσταση όλων',btnUndo:'Αναί�εση',noSuggestions:'- Δεν υπά�χουν π�οτάσεις -',progress:'Ο�θογ�αφικός έλεγχος σε εξέλιξη...',noMispell:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Δεν β�έθηκαν λάθη',noChanges:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Δεν άλλαξαν λέξεις',oneChange:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: Μια λέξη άλλαξε',manyChanges:'Ο ο�θογ�αφικός έλεγχος ολοκλη�ώθηκε: %1 λέξεις άλλαξαν',ieSpellDownload:'Δεν υπά�χει εγκατεστημένος ο�θογ�άφος. Θέλετε να τον κατεβάσετε τώ�α;'},smiley:{toolbar:'Smiley',title:'Επιλέξτε ένα Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Λίστα με Α�ιθμο�ς',bulletedlist:'Λίστα με Bullets',indent:'Α�ξηση Εσοχής',outdent:'Μείωση Εσοχής',justify:{left:'Στοίχιση Α�ιστε�ά',center:'Στοίχιση στο Κέντ�ο',right:'Στοίχιση Δεξιά',block:'Πλή�ης Στοίχιση (Block)'},blockquote:'Block Quote',clipboard:{title:'Επικόλληση',cutError:'Οι �υθμίσεις ασφαλείας του φυλλομετ�ητή σας δεν επιτ�έπουν την επιλεγμένη ε�γασία αποκοπής. Χ�ησιμοποιείστε το πληκτ�ολόγιο (Ctrl/Cmd+X).',copyError:'Οι �υθμίσεις ασφαλείας του φυλλομετ�ητή σας δεν επιτ�έπουν την επιλεγμένη ε�γασία αντιγ�αφής. Χ�ησιμοποιείστε το πληκτ�ολόγιο (Ctrl/Cmd+C).',pasteMsg:'Πα�ακαλώ επικολήστε στο ακόλουθο κουτί χ�ησιμοποιόντας το πληκτ�ολόγιο (<STRONG>Ctrl/Cmd+V</STRONG>) και πατήστε <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Επικόλληση από το Word',title:'Επικόλληση από το Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Επικόλληση ως Απλό Κείμενο',title:'Επικόλληση ως Απλό Κείμενο'},templates:{button:'Π�ότυπα',title:'Π�ότυπα πε�ιεχομένου',options:'Template Options',insertOption:'Αντικατάσταση υπά�χοντων πε�ιεχομένων',selectPromptMsg:'Πα�ακαλώ επιλέξτε π�ότυπο για εισαγωγή στο π�όγ�αμμα<br>(τα υπά�χοντα πε�ιεχόμενα θα χαθο�ν):',emptyListMsg:'(Δεν έχουν καθο�ιστεί π�ότυπα)'},showBlocks:'Show Blocks',stylesCombo:{label:'Στυλ',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Μο�φή Γ�αμματοσει�άς',panelTitle:'Μο�φή Γ�αμματοσει�άς',tag_p:'Κανονικό',tag_pre:'Μο�φοποιημένο',tag_address:'Διε�θυνση',tag_h1:'Επικεφαλίδα 1',tag_h2:'Επικεφαλίδα 2',tag_h3:'Επικεφαλίδα 3',tag_h4:'Επικεφαλίδα 4',tag_h5:'Επικεφαλίδα 5',tag_h6:'Επικεφαλίδα 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Γ�αμματοσει�ά',voiceLabel:'Font',panelTitle:'Γ�αμματοσει�ά'},fontSize:{label:'Μέγεθος',voiceLabel:'Font Size',panelTitle:'Μέγεθος'},colorButton:{textColorTitle:'Χ�ώμα Γ�αμμάτων',bgColorTitle:'Χ�ώμα Υποβάθ�ου',panelTitle:'Colors',auto:'Αυτόματο',more:'Πε�ισσότε�α χ�ώματα...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Ιδιότητες εγγ�άφου',title:'Ιδιότητες εγγ�άφου',design:'Design',meta:'Δεδομένα Meta',chooseColor:'Choose',other:'<άλλος>',docTitle:'Τίτλος σελίδας',charset:'Κωδικοποίηση χα�ακτή�ων',charsetOther:'Άλλη κωδικοποίηση χα�ακτή�ων',charsetASCII:'ASCII',charsetCE:'Κεντ�ικής Ευ�ώπης',charsetCT:'Πα�αδοσιακά κινέζικα (Big5)',charsetCR:'Κυ�ιλλική',charsetGR:'Ελληνική',charsetJP:'Ιαπωνική',charsetKR:'Κο�εάτικη',charsetTR:'Του�κική',charsetUN:'Διεθνής (UTF-8)',charsetWE:'Δυτικής Ευ�ώπης',docType:'Επικεφαλίδα τ�που εγγ�άφου',docTypeOther:'Άλλη επικεφαλίδα τ�που εγγ�άφου',xhtmlDec:'�α συμπε�ιληφθο�ν οι δηλώσεις XHTML',bgColor:'Χ�ώμα φόντου',bgImage:'Διε�θυνση εικόνας φόντου',bgFixed:'Φόντο χω�ίς κ�λιση',txtColor:'Χ�ώμα Γ�αμμάτων',margin:'Πε�ιθώ�ια σελίδας',marginTop:'Κο�υφή',marginLeft:'Α�ιστε�ά',marginRight:'Δεξιά',marginBottom:'Κάτω',metaKeywords:'Λέξεις κλειδιά δείκτες εγγ�άφου (διαχω�ισμός με κόμμα)',metaDescription:'Πε�ιγ�αφή εγγ�άφου',metaAuthor:'Συγγ�αφέας',metaCopyright:'Πνευματικά δικαιώματα',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/en-au.js b/upload/public/js/3rd_party/ckeditor/lang/en-au.js
new file mode 100644
index 00000000..d34b3618
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/en-au.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-au']={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colors',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/en-ca.js b/upload/public/js/3rd_party/ckeditor/lang/en-ca.js
new file mode 100644
index 00000000..442294c2
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/en-ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-ca']={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colors',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/en-gb.js b/upload/public/js/3rd_party/ckeditor/lang/en-gb.js
new file mode 100644
index 00000000..eea8c3af
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/en-gb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['en-gb']={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Align',alignLeft:'Left',alignRight:'Right',alignCenter:'Centre',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a number.',invalidCellPadding:'Cell padding must be a number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background colour',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Centre',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Colour',bgColorTitle:'Background Colour',panelTitle:'Colours',auto:'Automatic',more:'More Colours...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Grey','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Grey',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Grey',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Grey',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximise',minimize:'Minimise',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select colour',options:'Colour Options',highlight:'Highlight',selected:'Selected Colour',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/en.js b/upload/public/js/3rd_party/ckeditor/lang/en.js
new file mode 100644
index 00000000..550c81d8
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/en.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.en={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'New Page',save:'Save',preview:'Preview',cut:'Cut',copy:'Copy',paste:'Paste',print:'Print',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Select All',removeFormat:'Remove Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Insert Horizontal Line',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Unlink',undo:'Undo',redo:'Redo',common:{browseServer:'Browse Server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Send it to the Server',image:'Image',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<not set>',id:'Id',name:'Name',langDir:'Language Direction',langDirLtr:'Left to Right (LTR)',langDirRtl:'Right to Left (RTL)',langCode:'Language Code',longDescr:'Long Description URL',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'OK',cancel:'Cancel',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Width',height:'Height',align:'Alignment',alignLeft:'Left',alignRight:'Right',alignCenter:'Center',alignTop:'Top',alignMiddle:'Middle',alignBottom:'Bottom',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insert Special Character',title:'Select Special Character',options:'Special Character Options'},link:{toolbar:'Link',other:'<other>',menu:'Edit Link',title:'Link',info:'Link Info',target:'Target',upload:'Upload',advanced:'Advanced',type:'Link Type',toUrl:'URL',toAnchor:'Link to anchor in the text',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Target Frame Name',targetPopupName:'Popup Window Name',popupFeatures:'Popup Window Features',popupResizable:'Resizable',popupStatusBar:'Status Bar',popupLocationBar:'Location Bar',popupToolbar:'Toolbar',popupMenuBar:'Menu Bar',popupFullScreen:'Full Screen (IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Left Position',popupTop:'Top Position',id:'Id',langDir:'Language Direction',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',acccessKey:'Access Key',name:'Name',langCode:'Language Code',tabIndex:'Tab Index',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'Select an Anchor',anchorName:'By Anchor Name',anchorId:'By Element Id',emailAddress:'E-Mail Address',emailSubject:'Message Subject',emailBody:'Message Body',noAnchors:'(No anchors available in the document)',noUrl:'Please type the link URL',noEmail:'Please type the e-mail address'},anchor:{toolbar:'Anchor',menu:'Edit Anchor',title:'Anchor Properties',name:'Anchor Name',errorName:'Please type the anchor name',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Find',replace:'Replace',findWhat:'Find what:',replaceWith:'Replace with:',notFoundMsg:'The specified text was not found.',findOptions:'Find Options',matchCase:'Match case',matchWord:'Match whole word',matchCyclic:'Match cyclic',replaceAll:'Replace All',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Table',title:'Table Properties',menu:'Table Properties',deleteTable:'Delete Table',rows:'Rows',columns:'Columns',border:'Border size',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Cell spacing',cellPad:'Cell padding',caption:'Caption',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Delete Cells',merge:'Merge Cells',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Delete Rows'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Delete Columns'}},button:{title:'Button Properties',text:'Text (Value)',type:'Type',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Checkbox Properties',radioTitle:'Radio Button Properties',value:'Value',selected:'Selected'},form:{title:'Form Properties',menu:'Form Properties',action:'Action',method:'Method',encoding:'Encoding'},select:{title:'Selection Field Properties',selectInfo:'Select Info',opAvail:'Available Options',value:'Value',size:'Size',lines:'lines',chkMulti:'Allow multiple selections',opText:'Text',opValue:'Value',btnAdd:'Add',btnModify:'Modify',btnUp:'Up',btnDown:'Down',btnSetValue:'Set as selected value',btnDelete:'Delete'},textarea:{title:'Textarea Properties',cols:'Columns',rows:'Rows'},textfield:{title:'Text Field Properties',name:'Name',value:'Value',charWidth:'Character Width',maxChars:'Maximum Characters',type:'Type',typeText:'Text',typePass:'Password'},hidden:{title:'Hidden Field Properties',name:'Name',value:'Value'},image:{title:'Image Properties',titleButton:'Image Button Properties',menu:'Image Properties',infoTab:'Image Info',btnUpload:'Send it to the Server',upload:'Upload',alt:'Alternative Text',lockRatio:'Lock Ratio',resetSize:'Reset Size',border:'Border',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Please type the image URL',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'Baseline',alignTextTop:'Text Top',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Background color',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'URL must not be empty.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Check Spelling',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Not in dictionary',changeTo:'Change to',btnIgnore:'Ignore',btnIgnoreAll:'Ignore All',btnReplace:'Replace',btnReplaceAll:'Replace All',btnUndo:'Undo',noSuggestions:'- No suggestions -',progress:'Spell check in progress...',noMispell:'Spell check complete: No misspellings found',noChanges:'Spell check complete: No words changed',oneChange:'Spell check complete: One word changed',manyChanges:'Spell check complete: %1 words changed',ieSpellDownload:'Spell checker not installed. Do you want to download it now?'},smiley:{toolbar:'Smiley',title:'Insert a Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Insert/Remove Numbered List',bulletedlist:'Insert/Remove Bulleted List',indent:'Increase Indent',outdent:'Decrease Indent',justify:{left:'Align Left',center:'Center',right:'Align Right',block:'Justify'},blockquote:'Block Quote',clipboard:{title:'Paste',cutError:"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).",copyError:"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).",pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Paste from Word',title:'Paste from Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Paste as plain text',title:'Paste as Plain Text'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Styles',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Paragraph Format',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font Name'},fontSize:{label:'Size',voiceLabel:'Font Size',panelTitle:'Font Size'},colorButton:{textColorTitle:'Text Color',bgColorTitle:'Background Color',panelTitle:'Colors',auto:'Automatic',more:'More Colors...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Document Properties',title:'Document Properties',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'Other...',docTitle:'Page Title',charset:'Character Set Encoding',charsetOther:'Other Character Set Encoding',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Document Type Heading',docTypeOther:'Other Document Type Heading',xhtmlDec:'Include XHTML Declarations',bgColor:'Background Color',bgImage:'Background Image URL',bgFixed:'Non-scrolling (Fixed) Background',txtColor:'Text Color',margin:'Page Margins',marginTop:'Top',marginLeft:'Left',marginRight:'Right',marginBottom:'Bottom',metaKeywords:'Document Indexing Keywords (comma separated)',metaDescription:'Document Description',metaAuthor:'Author',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/eo.js b/upload/public/js/3rd_party/ckeditor/lang/eo.js
new file mode 100644
index 00000000..75dbd108
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/eo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.eo={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Fonto',newPage:'Nova Pa�o',save:'Sekurigi',preview:'Vidigi Aspekton',cut:'Eltondi',copy:'Kopii',paste:'Interglui',print:'Presi',underline:'Substreko',bold:'Grasa',italic:'Kursiva',selectAll:'Elekti ĉion',removeFormat:'Forigi Formaton',strike:'Trastreko',subscript:'Subskribo',superscript:'Superskribo',horizontalrule:'Enmeti Horizonta Linio',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Forigi Ligilon',undo:'Malfari',redo:'Refari',common:{browseServer:'Foliumi en la Servilo',url:'URL',protocol:'Protokolo',upload:'Al�uti',uploadSubmit:'Sendu al Servilo',image:'Bildo',flash:'Flash',form:'Formularo',checkbox:'Markobutono',radio:'Radiobutono',textField:'Teksta kampo',textarea:'Teksta Areo',hiddenField:'Ka�ita Kampo',button:'Butono',select:'Elekta Kampo',imageButton:'Bildbutono',notSet:'<Defaŭlta>',id:'Id',name:'Nomo',langDir:'Skribdirekto',langDirLtr:'De maldekstro dekstren (LTR)',langDirRtl:'De dekstro maldekstren (RTL)',langCode:'Lingva Kodo',longDescr:'URL de Longa Priskribo',cssClass:'Klasoj de Stilfolioj',advisoryTitle:'Indika Titolo',cssStyle:'Stilo',ok:'Akcepti',cancel:'Rezigni',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Speciala',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Lar�o',height:'Alto',align:'Ĝisrandigo',alignLeft:'Maldekstre',alignRight:'Dekstre',alignCenter:'Centre',alignTop:'Supre',alignMiddle:'Centre',alignBottom:'Malsupre',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Enmeti Specialan Signon',title:'Enmeti Specialan Signon',options:'Special Character Options'},link:{toolbar:'Enmeti/Ŝan�i Ligilon',other:'<other>',menu:'Modifier Ligilon',title:'Ligilo',info:'Informoj pri la Ligilo',target:'Celo',upload:'Al�uti',advanced:'Speciala',type:'Tipo de Ligilo',toUrl:'URL',toAnchor:'Ankri en tiu ĉi pa�o',toEmail:'Retpo�to',targetFrame:'<kadro>',targetPopup:'<�prucfenestro>',targetFrameName:'Nomo de Kadro',targetPopupName:'Nomo de Ŝprucfenestro',popupFeatures:'Atributoj de la Ŝprucfenestro',popupResizable:'Resizable',popupStatusBar:'Statobreto',popupLocationBar:'Adresobreto',popupToolbar:'Ilobreto',popupMenuBar:'Menubreto',popupFullScreen:'Tutekrane (IE)',popupScrollBars:'Rulumlisteloj',popupDependent:'Dependa (Netscape)',popupLeft:'Pozicio de Maldekstro',popupTop:'Pozicio de Supro',id:'Id',langDir:'Skribdirekto',langDirLTR:'De maldekstro dekstren (LTR)',langDirRTL:'De dekstro maldekstren (RTL)',acccessKey:'Fulmoklavo',name:'Nomo',langCode:'Skribdirekto',tabIndex:'Taba Ordo',advisoryTitle:'Indika Titolo',advisoryContentType:'Indika Enhavotipo',cssClasses:'Klasoj de Stilfolioj',charset:'Signaro de la Ligita Rimedo',styles:'Stilo',rel:'Relationship',selectAnchor:'Elekti Ankron',anchorName:'Per Ankronomo',anchorId:'Per Elementidentigilo',emailAddress:'Retadreso',emailSubject:'Temlinio',emailBody:'Mesa�a korpo',noAnchors:'<Ne disponeblas ankroj en la dokumento>',noUrl:'Bonvolu entajpi la URL-on',noEmail:'Bonvolu entajpi la retadreson'},anchor:{toolbar:'Enmeti/Ŝan�i Ankron',menu:'Ankraj Atributoj',title:'Ankraj Atributoj',name:'Ankra Nomo',errorName:'Bv tajpi la ankran nomon',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Serĉi',replace:'Anstataŭigi',findWhat:'Serĉi:',replaceWith:'Anstataŭigi per:',notFoundMsg:'La celteksto ne estas trovita.',findOptions:'Find Options',matchCase:'Kongruigi Usklecon',matchWord:'Tuta Vorto',matchCyclic:'Match cyclic',replaceAll:'Anstataŭigi Ĉiun',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabelo',title:'Atributoj de Tabelo',menu:'Atributoj de Tabelo',deleteTable:'Delete Table',rows:'Linioj',columns:'Kolumnoj',border:'Bordero',widthPx:'Bitbilderoj',widthPc:'elcentoj',widthUnit:'width unit',cellSpace:'Interspacigo de Ĉeloj',cellPad:'Ĉirkaŭenhava Plenigado',caption:'Titolo',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Forigi Ĉelojn',merge:'Kunfandi Ĉelojn',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Forigi Liniojn'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Forigi Kolumnojn'}},button:{title:'Butonaj Atributoj',text:'Teksto (Valoro)',type:'Tipo',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Markobutonaj Atributoj',radioTitle:'Radiobutonaj Atributoj',value:'Valoro',selected:'Elektita'},form:{title:'Formularaj Atributoj',menu:'Formularaj Atributoj',action:'Ago',method:'Metodo',encoding:'Encoding'},select:{title:'Atributoj de Elekta Kampo',selectInfo:'Select Info',opAvail:'Elektoj Disponeblaj',value:'Valoro',size:'Grando',lines:'Linioj',chkMulti:'Permesi Plurajn Elektojn',opText:'Teksto',opValue:'Valoro',btnAdd:'Aldoni',btnModify:'Modifi',btnUp:'Supren',btnDown:'Malsupren',btnSetValue:'Agordi kiel Elektitan Valoron',btnDelete:'Forigi'},textarea:{title:'Atributoj de Teksta Areo',cols:'Kolumnoj',rows:'Vicoj'},textfield:{title:'Atributoj de Teksta Kampo',name:'Nomo',value:'Valoro',charWidth:'Signolar�o',maxChars:'Maksimuma Nombro da Signoj',type:'Tipo',typeText:'Teksto',typePass:'Pasvorto'},hidden:{title:'Atributoj de Ka�ita Kampo',name:'Nomo',value:'Valoro'},image:{title:'Atributoj de Bildo',titleButton:'Bildbutonaj Atributoj',menu:'Atributoj de Bildo',infoTab:'Informoj pri Bildo',btnUpload:'Sendu al Servilo',upload:'Al�uti',alt:'Anstataŭiga Teksto',lockRatio:'Konservi Proporcion',resetSize:'Origina Grando',border:'Bordero',hSpace:'HSpaco',vSpace:'VSpaco',alertUrl:'Bonvolu tajpi la URL de la bildo',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Malsupre',alignAbsMiddle:'Abs Centre',alignBaseline:'Je Malsupro de Teksto',alignTextTop:'Je Supro de Teksto',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Fona Koloro',hSpace:'HSpaco',vSpace:'VSpaco',validateSrc:'Bonvolu entajpi la URL-on',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Literumada Kontrolilo',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Ne trovita en la vortaro',changeTo:'Ŝan�i al',btnIgnore:'Malatenti',btnIgnoreAll:'Malatenti Ĉiun',btnReplace:'Anstataŭigi',btnReplaceAll:'Anstataŭigi Ĉiun',btnUndo:'Malfari',noSuggestions:'- Neniu propono -',progress:'Literumkontrolado daŭras...',noMispell:'Literumkontrolado finita: neniu fu�o trovita',noChanges:'Literumkontrolado finita: neniu vorto �an�ita',oneChange:'Literumkontrolado finita: unu vorto �an�ita',manyChanges:'Literumkontrolado finita: %1 vortoj �an�itaj',ieSpellDownload:'Literumada Kontrolilo ne instalita. Ĉu vi volas el�uti �in nun?'},smiley:{toolbar:'Mienvinjeto',title:'Enmeti Mienvinjeton',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numera Listo',bulletedlist:'Bula Listo',indent:'Pligrandigi Krommar�enon',outdent:'Malpligrandigi Krommar�enon',justify:{left:'Maldekstrigi',center:'Centrigi',right:'Dekstrigi',block:'Ĝisrandigi Ambaŭflanke'},blockquote:'Block Quote',clipboard:{title:'Interglui',cutError:'La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).',copyError:'La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).',pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Interglui el Word',title:'Interglui el Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Interglui kiel Tekston',title:'Interglui kiel Tekston'},templates:{button:'Templates',title:'Content Templates',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Please select the template to open in the editor',emptyListMsg:'(No templates defined)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stilo',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normala',tag_pre:'Formatita',tag_address:'Adreso',tag_h1:'Titolo 1',tag_h2:'Titolo 2',tag_h3:'Titolo 3',tag_h4:'Titolo 4',tag_h5:'Titolo 5',tag_h6:'Titolo 6',tag_div:'Paragrafo (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Tiparo',voiceLabel:'Font',panelTitle:'Tiparo'},fontSize:{label:'Grando',voiceLabel:'Font Size',panelTitle:'Grando'},colorButton:{textColorTitle:'Teksta Koloro',bgColorTitle:'Fona Koloro',panelTitle:'Colors',auto:'Aŭtomata',more:'Pli da Koloroj...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Dokumentaj Atributoj',title:'Dokumentaj Atributoj',design:'Design',meta:'Metadatumoj',chooseColor:'Choose',other:'<other>',docTitle:'Pa�otitolo',charset:'Signara Kodo',charsetOther:'Alia Signara Kodo',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Dokumenta Tipo',docTypeOther:'Alia Dokumenta Tipo',xhtmlDec:'Inkluzivi XHTML Deklaroj',bgColor:'Fona Koloro',bgImage:'URL de Fona Bildo',bgFixed:'Neruluma Fono',txtColor:'Teksta Koloro',margin:'Pa�aj Mar�enoj',marginTop:'Supra',marginLeft:'Maldekstra',marginRight:'Dekstra',marginBottom:'Malsupra',metaKeywords:'Ŝlosilvortoj de la Dokumento (apartigita de komoj)',metaDescription:'Dokumenta Priskribo',metaAuthor:'Verkinto',metaCopyright:'Kopirajto',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/es.js b/upload/public/js/3rd_party/ckeditor/lang/es.js
new file mode 100644
index 00000000..a172958c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/es.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.es={dir:'ltr',editorTitle:'Editor de texto, %1, pulse ALT 0 para ayuda.',toolbars:'Barras de herramientas del editor',editor:'Editor de texto enriquecido',source:'Fuente HTML',newPage:'Nueva Página',save:'Guardar',preview:'Vista Previa',cut:'Cortar',copy:'Copiar',paste:'Pegar',print:'Imprimir',underline:'Subrayado',bold:'Negrita',italic:'Cursiva',selectAll:'Seleccionar Todo',removeFormat:'Eliminar Formato',strike:'Tachado',subscript:'Subíndice',superscript:'Superíndice',horizontalrule:'Insertar Línea Horizontal',pagebreak:'Insertar Salto de Página',pagebreakAlt:'Salto de página',unlink:'Eliminar Vínculo',undo:'Deshacer',redo:'Rehacer',common:{browseServer:'Ver Servidor',url:'URL',protocol:'Protocolo',upload:'Cargar',uploadSubmit:'Enviar al Servidor',image:'Imagen',flash:'Flash',form:'Formulario',checkbox:'Casilla de Verificación',radio:'Botones de Radio',textField:'Campo de Texto',textarea:'Area de Texto',hiddenField:'Campo Oculto',button:'Botón',select:'Campo de Selección',imageButton:'Botón Imagen',notSet:'<No definido>',id:'Id',name:'Nombre',langDir:'Orientación',langDirLtr:'Izquierda a Derecha (LTR)',langDirRtl:'Derecha a Izquierda (RTL)',langCode:'Cód. de idioma',longDescr:'Descripción larga URL',cssClass:'Clases de hojas de estilo',advisoryTitle:'Título',cssStyle:'Estilo',ok:'Aceptar',cancel:'Cancelar',close:'Cerrar',preview:'Previsualización',generalTab:'General',advancedTab:'Avanzado',validateNumberFailed:'El valor no es un número.',confirmNewPage:'Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?',confirmCancel:'Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?',options:'Opciones',target:'Destino',targetNew:'Nueva ventana (_blank)',targetTop:'Ventana principal (_top)',targetSelf:'Misma ventana (_self)',targetParent:'Ventana padre (_parent)',langDirLTR:'Izquierda a derecha (LTR)',langDirRTL:'Derecha a izquierda (RTL)',styles:'Estilos',cssClasses:'Clase de la hoja de estilos',width:'Anchura',height:'Altura',align:'Alineación',alignLeft:'Izquierda',alignRight:'Derecha',alignCenter:'Centrado',alignTop:'Tope',alignMiddle:'Centro',alignBottom:'Pie',invalidHeight:'Altura debe ser un número.',invalidWidth:'Anchura debe ser un número.',invalidCssLength:'El valor especificado para el campo "%1" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).',invalidHtmlLength:'El valor especificado para el campo "%1" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).',invalidInlineStyle:'El valor especificado para el estilo debe consistir en uno o más pares con el formato "nombre: valor", separados por punto y coma.',cssLengthTooltip:'Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).',unavailable:'%1<span class="cke_accessibility">, no disponible</span>'},contextmenu:{options:'Opciones del menú contextual'},specialChar:{toolbar:'Insertar Caracter Especial',title:'Seleccione un caracter especial',options:'Opciones de caracteres especiales'},link:{toolbar:'Insertar/Editar Vínculo',other:'<otro>',menu:'Editar Vínculo',title:'Vínculo',info:'Información de Vínculo',target:'Destino',upload:'Cargar',advanced:'Avanzado',type:'Tipo de vínculo',toUrl:'URL',toAnchor:'Referencia en esta página',toEmail:'E-Mail',targetFrame:'<marco>',targetPopup:'<ventana emergente>',targetFrameName:'Nombre del Marco Destino',targetPopupName:'Nombre de Ventana Emergente',popupFeatures:'Características de Ventana Emergente',popupResizable:'Redimensionable',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de ubicación',popupToolbar:'Barra de Herramientas',popupMenuBar:'Barra de Menú',popupFullScreen:'Pantalla Completa (IE)',popupScrollBars:'Barras de desplazamiento',popupDependent:'Dependiente (Netscape)',popupLeft:'Posición Izquierda',popupTop:'Posición Derecha',id:'Id',langDir:'Orientación',langDirLTR:'Izquierda a Derecha (LTR)',langDirRTL:'Derecha a Izquierda (RTL)',acccessKey:'Tecla de Acceso',name:'Nombre',langCode:'Código idioma',tabIndex:'Indice de tabulación',advisoryTitle:'Título',advisoryContentType:'Tipo de Contenido',cssClasses:'Clases de hojas de estilo',charset:'Fuente de caracteres vinculado',styles:'Estilo',rel:'Relación',selectAnchor:'Seleccionar una referencia',anchorName:'Por Nombre de Referencia',anchorId:'Por ID de elemento',emailAddress:'Dirección de E-Mail',emailSubject:'Título del Mensaje',emailBody:'Cuerpo del Mensaje',noAnchors:'(No hay referencias disponibles en el documento)',noUrl:'Por favor escriba el vínculo URL',noEmail:'Por favor escriba la dirección de e-mail'},anchor:{toolbar:'Referencia',menu:'Propiedades de Referencia',title:'Propiedades de Referencia',name:'Nombre de la Referencia',errorName:'Por favor, complete el nombre de la Referencia',remove:'Quitar Referencia'},list:{numberedTitle:'Propiedades de lista numerada',bulletedTitle:'Propiedades de viñetas',type:'Tipo',start:'Inicio',validateStartNumber:'El Inicio debe ser un número entero.',circle:'Círculo',disc:'Disco',square:'Cuadrado',none:'Ninguno',notset:'<sin establecer>',armenian:'Numeración armenia',georgian:'Numeración georgiana (an, ban, gan, etc.)',lowerRoman:'Números romanos en minúsculas (i, ii, iii, iv, v, etc.)',upperRoman:'Números romanos en mayúsculas (I, II, III, IV, V, etc.)',lowerAlpha:'Alfabeto en minúsculas (a, b, c, d, e, etc.)',upperAlpha:'Alfabeto en mayúsculas  (A, B, C, D, E, etc.)',lowerGreek:'Letras griegas (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal con cero inicial (01, 02, 03, etc.)'},findAndReplace:{title:'Buscar y Reemplazar',find:'Buscar',replace:'Reemplazar',findWhat:'Texto a buscar:',replaceWith:'Reemplazar con:',notFoundMsg:'El texto especificado no ha sido encontrado.',findOptions:'Opciones de búsqueda',matchCase:'Coincidir may/min',matchWord:'Coincidir toda la palabra',matchCyclic:'Buscar en todo el contenido',replaceAll:'Reemplazar Todo',replaceSuccessMsg:'La expresión buscada ha sido reemplazada %1 veces.'},table:{toolbar:'Tabla',title:'Propiedades de Tabla',menu:'Propiedades de Tabla',deleteTable:'Eliminar Tabla',rows:'Filas',columns:'Columnas',border:'Tamaño de Borde',widthPx:'pixeles',widthPc:'porcentaje',widthUnit:'unidad de la anchura',cellSpace:'Esp. e/celdas',cellPad:'Esp. interior',caption:'Título',summary:'Síntesis',headers:'Encabezados',headersNone:'Ninguno',headersColumn:'Primera columna',headersRow:'Primera fila',headersBoth:'Ambas',invalidRows:'El número de filas debe ser un número mayor que 0.',invalidCols:'El número de columnas debe ser un número mayor que 0.',invalidBorder:'El tamaño del borde debe ser un número.',invalidWidth:'La anchura de tabla debe ser un número.',invalidHeight:'La altura de tabla debe ser un número.',invalidCellSpacing:'El espaciado entre celdas debe ser un número.',invalidCellPadding:'El espaciado interior debe ser un número.',cell:{menu:'Celda',insertBefore:'Insertar celda a la izquierda',insertAfter:'Insertar celda a la derecha',deleteCell:'Eliminar Celdas',merge:'Combinar Celdas',mergeRight:'Combinar a la derecha',mergeDown:'Combinar hacia abajo',splitHorizontal:'Dividir la celda horizontalmente',splitVertical:'Dividir la celda verticalmente',title:'Propiedades de celda',cellType:'Tipo de Celda',rowSpan:'Expandir filas',colSpan:'Expandir columnas',wordWrap:'Ajustar al contenido',hAlign:'Alineación Horizontal',vAlign:'Alineación Vertical',alignBaseline:'Linea de base',bgColor:'Color de fondo',borderColor:'Color de borde',data:'Datos',header:'Encabezado',yes:'Sí',no:'No',invalidWidth:'La anchura de celda debe ser un número.',invalidHeight:'La altura de celda debe ser un número.',invalidRowSpan:'La expansión de filas debe ser un número entero.',invalidColSpan:'La expansión de columnas debe ser un número entero.',chooseColor:'Elegir'},row:{menu:'Fila',insertBefore:'Insertar fila en la parte superior',insertAfter:'Insertar fila en la parte inferior',deleteRow:'Eliminar Filas'},column:{menu:'Columna',insertBefore:'Insertar columna a la izquierda',insertAfter:'Insertar columna a la derecha',deleteColumn:'Eliminar Columnas'}},button:{title:'Propiedades de Botón',text:'Texto (Valor)',type:'Tipo',typeBtn:'Boton',typeSbm:'Enviar',typeRst:'Reestablecer'},checkboxAndRadio:{checkboxTitle:'Propiedades de Casilla',radioTitle:'Propiedades de Botón de Radio',value:'Valor',selected:'Seleccionado'},form:{title:'Propiedades de Formulario',menu:'Propiedades de Formulario',action:'Acción',method:'Método',encoding:'Codificación'},select:{title:'Propiedades de Campo de Selección',selectInfo:'Información',opAvail:'Opciones disponibles',value:'Valor',size:'Tamaño',lines:'Lineas',chkMulti:'Permitir múltiple selección',opText:'Texto',opValue:'Valor',btnAdd:'Agregar',btnModify:'Modificar',btnUp:'Subir',btnDown:'Bajar',btnSetValue:'Establecer como predeterminado',btnDelete:'Eliminar'},textarea:{title:'Propiedades de Area de Texto',cols:'Columnas',rows:'Filas'},textfield:{title:'Propiedades de Campo de Texto',name:'Nombre',value:'Valor',charWidth:'Caracteres de ancho',maxChars:'Máximo caracteres',type:'Tipo',typeText:'Texto',typePass:'Contraseña'},hidden:{title:'Propiedades de Campo Oculto',name:'Nombre',value:'Valor'},image:{title:'Propiedades de Imagen',titleButton:'Propiedades de Botón de Imagen',menu:'Propiedades de Imagen',infoTab:'Información de Imagen',btnUpload:'Enviar al Servidor',upload:'Cargar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamaño Original',border:'Borde',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',alertUrl:'Por favor escriba la URL de la imagen',linkTab:'Vínculo',button2Img:'¿Desea convertir el botón de imagen en una simple imagen?',img2Button:'¿Desea convertir la imagen en un botón de imagen?',urlMissing:'Debe indicar la URL de la imagen.',validateBorder:'El borde debe ser un número.',validateHSpace:'El espaciado horizontal debe ser un número.',validateVSpace:'El espaciado vertical debe ser un número.'},flash:{properties:'Propiedades de Flash',propertiesTab:'Propiedades',title:'Propiedades de Flash',chkPlay:'Autoejecución',chkLoop:'Repetir',chkMenu:'Activar Menú Flash',chkFull:'Permitir pantalla completa',scale:'Escala',scaleAll:'Mostrar todo',scaleNoBorder:'Sin Borde',scaleFit:'Ajustado',access:'Acceso de scripts',accessAlways:'Siempre',accessSameDomain:'Mismo dominio',accessNever:'Nunca',alignAbsBottom:'Abs inferior',alignAbsMiddle:'Abs centro',alignBaseline:'Línea de base',alignTextTop:'Tope del texto',quality:'Calidad',qualityBest:'La mejor',qualityHigh:'Alta',qualityAutoHigh:'Auto Alta',qualityMedium:'Media',qualityAutoLow:'Auto Baja',qualityLow:'Baja',windowModeWindow:'Ventana',windowModeOpaque:'Opaco',windowModeTransparent:'Transparente',windowMode:'WindowMode',flashvars:'Opciones',bgcolor:'Color de Fondo',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',validateSrc:'Por favor escriba el vínculo URL',validateHSpace:'Esp.Horiz debe ser un número.',validateVSpace:'Esp.Vert debe ser un número.'},spellCheck:{toolbar:'Ortografía',title:'Comprobar ortografía',notAvailable:'Lo sentimos pero el servicio no está disponible.',errorLoading:'Error cargando la aplicación del servidor: %s.',notInDic:'No se encuentra en el Diccionario',changeTo:'Cambiar a',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Todo',btnReplace:'Reemplazar',btnReplaceAll:'Reemplazar Todo',btnUndo:'Deshacer',noSuggestions:'- No hay sugerencias -',progress:'Control de Ortografía en progreso...',noMispell:'Control finalizado: no se encontraron errores',noChanges:'Control finalizado: no se ha cambiado ninguna palabra',oneChange:'Control finalizado: se ha cambiado una palabra',manyChanges:'Control finalizado: se ha cambiado %1 palabras',ieSpellDownload:'Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?'},smiley:{toolbar:'Emoticonos',title:'Insertar un Emoticon',options:'Opciones de emoticonos'},elementsPath:{eleLabel:'Ruta de los elementos',eleTitle:'%1 elemento'},numberedlist:'Numeración',bulletedlist:'Viñetas',indent:'Aumentar Sangría',outdent:'Disminuir Sangría',justify:{left:'Alinear a Izquierda',center:'Centrar',right:'Alinear a Derecha',block:'Justificado'},blockquote:'Cita',clipboard:{title:'Pegar',cutError:'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).',copyError:'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).',pasteMsg:'Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.',securityMsg:'Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.',pasteArea:'Zona de pegado'},pastefromword:{confirmCleanup:'El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?',toolbar:'Pegar desde Word',title:'Pegar desde Word',error:'No ha sido posible limpiar los datos debido a un error interno'},pasteText:{button:'Pegar como Texto Plano',title:'Pegar como Texto Plano'},templates:{button:'Plantillas',title:'Contenido de Plantillas',options:'Opciones de plantillas',insertOption:'Reemplazar el contenido actual',selectPromptMsg:'Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):',emptyListMsg:'(No hay plantillas definidas)'},showBlocks:'Mostrar bloques',stylesCombo:{label:'Estilo',panelTitle:'Estilos para formatear',panelTitle1:'Estilos de párrafo',panelTitle2:'Estilos de carácter',panelTitle3:'Estilos de objeto'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Con formato',tag_address:'Dirección',tag_h1:'Encabezado 1',tag_h2:'Encabezado 2',tag_h3:'Encabezado 3',tag_h4:'Encabezado 4',tag_h5:'Encabezado 5',tag_h6:'Encabezado 6',tag_div:'Normal (DIV)'},div:{title:'Crear contenedor DIV',toolbar:'Crear contenedor DIV',cssClassInputLabel:'Clase de hoja de estilos',styleSelectLabel:'Estilo',IdInputLabel:'Id',languageCodeInputLabel:' Codigo de idioma',inlineStyleInputLabel:'Estilo',advisoryTitleInputLabel:'Título',langDirLabel:'Orientación',langDirLTRLabel:'Izquierda a Derecha (LTR)',langDirRTLLabel:'Derecha a Izquierda (RTL)',edit:'Editar Div',remove:'Quitar Div'},iframe:{title:'Propiedades de iframe',toolbar:'IFrame',noUrl:'Por favor, escriba la dirección del iframe',scrolling:'Activar barras de desplazamiento',border:'Mostrar borde del marco'},font:{label:'Fuente',voiceLabel:'Fuente',panelTitle:'Fuente'},fontSize:{label:'Tamaño',voiceLabel:'Tamaño de fuente',panelTitle:'Tamaño'},colorButton:{textColorTitle:'Color de Texto',bgColorTitle:'Color de Fondo',panelTitle:'Colores',auto:'Automático',more:'Más Colores...'},colors:{'000':'Negro',800000:'Marrón oscuro','8B4513':'Marrón tierra','2F4F4F':'Pizarra Oscuro','008080':'Azul verdoso','000080':'Azul marino','4B0082':'Añil',696969:'Gris oscuro',B22222:'Ladrillo',A52A2A:'Marrón',DAA520:'Oro oscuro','006400':'Verde oscuro','40E0D0':'Turquesa','0000CD':'Azul medio-oscuro',800080:'Púrpura',808080:'Gris',F00:'Rojo',FF8C00:'Naranja oscuro',FFD700:'Oro','008000':'Verde','0FF':'Cian','00F':'Azul',EE82EE:'Violeta',A9A9A9:'Gris medio',FFA07A:'Salmón claro',FFA500:'Naranja',FFFF00:'Amarillo','00FF00':'Lima',AFEEEE:'Turquesa claro',ADD8E6:'Azul claro',DDA0DD:'Violeta claro',D3D3D3:'Gris claro',FFF0F5:'Lavanda rojizo',FAEBD7:'Blanco antiguo',FFFFE0:'Amarillo claro',F0FFF0:'Miel',F0FFFF:'Azul celeste',F0F8FF:'Azul pálido',E6E6FA:'Lavanda',FFF:'Blanco'},scayt:{title:'Comprobar Ortografía Mientras Escribe',opera_title:'No soportado en Opera',enable:'Activar Corrector',disable:'Desactivar Corrector',about:'Acerca de Corrector',toggle:'Cambiar Corrector',options:'Opciones',langs:'Idiomas',moreSuggestions:'Más sugerencias',ignore:'Ignorar',ignoreAll:'Ignorar Todas',addWord:'Añadir palabra',emptyDic:'El nombre del diccionario no puede estar en blanco.',optionsTab:'Opciones',allCaps:'Omitir palabras en MAYÚSCULAS',ignoreDomainNames:'Omitir nombres de dominio',mixedCase:'Ignorar palabras con combinación de mayúsculas y minúsculas',mixedWithDigits:'Omitir palabras con números',languagesTab:'Idiomas',dictionariesTab:'Diccionarios',dic_field_name:'Nombre del diccionario',dic_create:'Crear',dic_restore:'Recuperar',dic_delete:'Borrar',dic_rename:'Renombrar',dic_info:'Inicialmente el Diccionario de usuario se guarda en una Cookie. Sin embargo, las cookies están limitadas en tamaño. Cuando el diccionario crece a un punto en el que no se puede guardar en una Cookie, el diccionario puede ser almacenado en nuestro servidor. Para almacenar su diccionario personalizado en nuestro servidor debe especificar un nombre para su diccionario. Si ya ha guardado un diccionaro, por favor, escriba su nombre y pulse el botón Recuperar',aboutTab:'Acerca de'},about:{title:'Acerca de CKEditor',dlgTitle:'Acerca de CKEditor',help:'Lea la  $1 para resolver sus dudas.',userGuide:'Guía de usuario de CKEditor',moreInfo:'Para información de licencia, por favor visite nuestro sitio web:',copy:'Copyright &copy; $1. Todos los derechos reservados.'},maximize:'Maximizar',minimize:'Minimizar',fakeobjects:{anchor:'Ancla',flash:'Animación flash',iframe:'IFrame',hiddenfield:'Campo oculto',unknown:'Objeto desconocido'},resize:'Arrastre para redimensionar',colordialog:{title:'Elegir color',options:'Opciones de colores',highlight:'Muestra',selected:'Elegido',clear:'Borrar'},toolbarCollapse:'Contraer barra de herramientas',toolbarExpand:'Expandir barra de herramientas',toolbarGroups:{document:'Documento',clipboard:'Portapapeles/Deshacer',editing:'Edición',forms:'Formularios',basicstyles:'Estilos básicos',paragraph:'Párrafo',links:'Enlaces',insert:'Insertar',styles:'Estilos',colors:'Colores',tools:'Herramientas'},bidi:{ltr:'Dirección del texto de izquierda a derecha',rtl:'Dirección del texto de derecha a izquierda'},docprops:{label:'Propiedades del documento',title:'Propiedades del documento',design:'Diseño',meta:'Meta Tags',chooseColor:'Elegir',other:'Otro...',docTitle:'Título de página',charset:'Codificación de caracteres',charsetOther:'Otra codificación de caracteres',charsetASCII:'ASCII',charsetCE:'Centro Europeo',charsetCT:'Chino Tradicional (Big5)',charsetCR:'Ruso',charsetGR:'Griego',charsetJP:'Japonés',charsetKR:'Koreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europeo occidental',docType:'Tipo de documento',docTypeOther:'Otro tipo de documento',xhtmlDec:'Incluir declaración XHTML',bgColor:'Color de fondo',bgImage:'Imagen de fondo',bgFixed:'Fondo fijo (no se desplaza)',txtColor:'Color del texto',margin:'Márgenes',marginTop:'Superior',marginLeft:'Izquierdo',marginRight:'Derecho',marginBottom:'Inferior',metaKeywords:'Palabras claves del documento separadas por coma (meta keywords)',metaDescription:'Descripción del documento',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>Este es un <strong>texto de ejemplo</strong>. Usted está usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/et.js b/upload/public/js/3rd_party/ckeditor/lang/et.js
new file mode 100644
index 00000000..cd62e80b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/et.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.et={dir:'ltr',editorTitle:'Rikkalik tekstiredaktor %1, abi jaoks vajuta ALT 0.',toolbars:'Redaktori tööriistaribad',editor:'Rikkalik tekstiredaktor',source:'Lähtekood',newPage:'Uus leht',save:'Salvestamine',preview:'Eelvaade',cut:'Lõika',copy:'Kopeeri',paste:'Aseta',print:'Printimine',underline:'Allajoonitud',bold:'Paks',italic:'Kursiiv',selectAll:'Kõige valimine',removeFormat:'Vormingu eemaldamine',strike:'Läbijoonitud',subscript:'Allindeks',superscript:'Ülaindeks',horizontalrule:'Horisontaaljoone sisestamine',pagebreak:'Lehevahetuskoha sisestamine',pagebreakAlt:'Lehevahetuskoht',unlink:'Lingi eemaldamine',undo:'Tagasivõtmine',redo:'Toimingu kordamine',common:{browseServer:'Serveri sirvimine',url:'URL',protocol:'Protokoll',upload:'Laadi üles',uploadSubmit:'Saada serverisse',image:'Pilt',flash:'Flash',form:'Vorm',checkbox:'Märkeruut',radio:'Raadionupp',textField:'Tekstilahter',textarea:'Tekstiala',hiddenField:'Varjatud lahter',button:'Nupp',select:'Valiklahter',imageButton:'Piltnupp',notSet:'<määramata>',id:'ID',name:'Nimi',langDir:'Keele suund',langDirLtr:'Vasakult paremale (LTR)',langDirRtl:'Paremalt vasakule (RTL)',langCode:'Keele kood',longDescr:'Pikk kirjeldus URL',cssClass:'Stiilistiku klassid',advisoryTitle:'Soovituslik pealkiri',cssStyle:'Laad',ok:'OK',cancel:'Loobu',close:'Sulge',preview:'Eelvaade',generalTab:'Üldine',advancedTab:'Täpsemalt',validateNumberFailed:'See väärtus pole number.',confirmNewPage:'Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?',confirmCancel:'Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?',options:'Valikud',target:'Sihtkoht',targetNew:'Uus aken (_blank)',targetTop:'Kõige ülemine aken (_top)',targetSelf:'Sama aken (_self)',targetParent:'Vanemaken (_parent)',langDirLTR:'Vasakult paremale (LTR)',langDirRTL:'Paremalt vasakule (RTL)',styles:'Stiili',cssClasses:'Stiililehe klassid',width:'Laius',height:'Kõrgus',align:'Joondus',alignLeft:'Vasak',alignRight:'Paremale',alignCenter:'Kesk',alignTop:'Üles',alignMiddle:'Keskele',alignBottom:'Alla',invalidHeight:'Kõrgus peab olema number.',invalidWidth:'Laius peab olema number.',invalidCssLength:'"%1" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.',invalidHtmlLength:'"%1" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.',invalidInlineStyle:'Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: "nimi : väärtus".',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, pole saadaval</span>'},contextmenu:{options:'Kontekstimenüü valikud'},specialChar:{toolbar:'Erimärgi sisestamine',title:'Erimärgi valimine',options:'Erimärkide valikud'},link:{toolbar:'Lingi lisamine/muutmine',other:'<muu>',menu:'Muuda linki',title:'Link',info:'Lingi info',target:'Sihtkoht',upload:'Lae üles',advanced:'Täpsemalt',type:'Lingi liik',toUrl:'URL',toAnchor:'Ankur sellel lehel',toEmail:'E-post',targetFrame:'<raam>',targetPopup:'<hüpikaken>',targetFrameName:'Sihtmärk raami nimi',targetPopupName:'Hüpikakna nimi',popupFeatures:'Hüpikakna omadused',popupResizable:'Suurust saab muuta',popupStatusBar:'Olekuriba',popupLocationBar:'Aadressiriba',popupToolbar:'Tööriistariba',popupMenuBar:'Menüüriba',popupFullScreen:'Täisekraan (IE)',popupScrollBars:'Kerimisribad',popupDependent:'Sõltuv (Netscape)',popupLeft:'Vasak asukoht',popupTop:'Ülemine asukoht',id:'ID',langDir:'Keele suund',langDirLTR:'Vasakult paremale (LTR)',langDirRTL:'Paremalt vasakule (RTL)',acccessKey:'Juurdepääsu võti',name:'Nimi',langCode:'Keele suund',tabIndex:'Tab indeks',advisoryTitle:'Juhendav tiitel',advisoryContentType:'Juhendava sisu tüüp',cssClasses:'Stiilistiku klassid',charset:'Lingitud ressursi märgistik',styles:'Laad',rel:'Suhe',selectAnchor:'Vali ankur',anchorName:'Ankru nime järgi',anchorId:'Elemendi id järgi',emailAddress:'E-posti aadress',emailSubject:'Sõnumi teema',emailBody:'Sõnumi tekst',noAnchors:'(Selles dokumendis pole ankruid)',noUrl:'Palun kirjuta lingi URL',noEmail:'Palun kirjuta e-posti aadress'},anchor:{toolbar:'Ankru sisestamine/muutmine',menu:'Ankru omadused',title:'Ankru omadused',name:'Ankru nimi',errorName:'Palun sisesta ankru nimi',remove:'Eemalda ankur'},list:{numberedTitle:'Numberloendi omadused',bulletedTitle:'Punktloendi omadused',type:'Liik',start:'Algus',validateStartNumber:'Loendi algusnumber peab olema täisarv.',circle:'Ring',disc:'Täpp',square:'Ruut',none:'Puudub',notset:'<pole määratud>',armenian:'Armeenia numbrid',georgian:'Gruusia numbrid (an, ban, gan, jne)',lowerRoman:'Väiksed rooma numbrid (i, ii, iii, iv, v, jne)',upperRoman:'Suured rooma numbrid (I, II, III, IV, V, jne)',lowerAlpha:'Väiketähed (a, b, c, d, e, jne)',upperAlpha:'Suurtähed (A, B, C, D, E, jne)',lowerGreek:'Kreeka väiketähed (alpha, beta, gamma, jne)',decimal:'Numbrid (1, 2, 3, jne)',decimalLeadingZero:'Numbrid algusnulliga (01, 02, 03, jne)'},findAndReplace:{title:'Otsimine ja asendamine',find:'Otsi',replace:'Asenda',findWhat:'Otsitav:',replaceWith:'Asendus:',notFoundMsg:'Otsitud teksti ei leitud.',findOptions:'Otsingu valikud',matchCase:'Suur- ja väiketähtede eristamine',matchWord:'Ainult terved sõnad',matchCyclic:'Jätkatakse algusest',replaceAll:'Asenda kõik',replaceSuccessMsg:'%1 vastet asendati.'},table:{toolbar:'Tabel',title:'Tabeli omadused',menu:'Tabeli omadused',deleteTable:'Kustuta tabel',rows:'Read',columns:'Veerud',border:'Joone suurus',widthPx:'pikslit',widthPc:'protsenti',widthUnit:'laiuse ühik',cellSpace:'Lahtri vahe',cellPad:'Lahtri täidis',caption:'Tabeli tiitel',summary:'Kokkuvõte',headers:'Päised',headersNone:'Puudub',headersColumn:'Esimene tulp',headersRow:'Esimene rida',headersBoth:'Mõlemad',invalidRows:'Ridade arv peab olema nullist suurem.',invalidCols:'Tulpade arv peab olema nullist suurem.',invalidBorder:'Äärise suurus peab olema number.',invalidWidth:'Tabeli laius peab olema number.',invalidHeight:'Tabeli kõrgus peab olema number.',invalidCellSpacing:'Lahtrite vahe peab olema positiivne arv.',invalidCellPadding:'Lahtrite polsterdus (padding) peab olema positiivne arv.',cell:{menu:'Lahter',insertBefore:'Sisesta lahter enne',insertAfter:'Sisesta lahter peale',deleteCell:'Eemalda lahtrid',merge:'Ühenda lahtrid',mergeRight:'Ühenda paremale',mergeDown:'Ühenda alla',splitHorizontal:'Poolita lahter horisontaalselt',splitVertical:'Poolita lahter vertikaalselt',title:'Lahtri omadused',cellType:'Lahtri liik',rowSpan:'Ridade vahe',colSpan:'Tulpade vahe',wordWrap:'Sõnade murdmine',hAlign:'Horisontaalne joondus',vAlign:'Vertikaalne joondus',alignBaseline:'Baasjoon',bgColor:'Tausta värv',borderColor:'Äärise värv',data:'Andmed',header:'Päis',yes:'Jah',no:'Ei',invalidWidth:'Lahtri laius peab olema number.',invalidHeight:'Lahtri kõrgus peab olema number.',invalidRowSpan:'Ridade vahe peab olema täisarv.',invalidColSpan:'Tulpade vahe peab olema täisarv.',chooseColor:'Vali'},row:{menu:'Rida',insertBefore:'Sisesta rida enne',insertAfter:'Sisesta rida peale',deleteRow:'Eemalda read'},column:{menu:'Veerg',insertBefore:'Sisesta veerg enne',insertAfter:'Sisesta veerg peale',deleteColumn:'Eemalda veerud'}},button:{title:'Nupu omadused',text:'Tekst (väärtus)',type:'Liik',typeBtn:'Nupp',typeSbm:'Saada',typeRst:'Lähtesta'},checkboxAndRadio:{checkboxTitle:'Märkeruudu omadused',radioTitle:'Raadionupu omadused',value:'Väärtus',selected:'Märgitud'},form:{title:'Vormi omadused',menu:'Vormi omadused',action:'Toiming',method:'Meetod',encoding:'Kodeering'},select:{title:'Valiklahtri omadused',selectInfo:'Info',opAvail:'Võimalikud valikud:',value:'Väärtus',size:'Suurus',lines:'ridu',chkMulti:'Võimalik mitu valikut',opText:'Tekst',opValue:'Väärtus',btnAdd:'Lisa',btnModify:'Muuda',btnUp:'Üles',btnDown:'Alla',btnSetValue:'Määra vaikimisi',btnDelete:'Kustuta'},textarea:{title:'Tekstiala omadused',cols:'Veerge',rows:'Ridu'},textfield:{title:'Tekstilahtri omadused',name:'Nimi',value:'Väärtus',charWidth:'Laius (tähemärkides)',maxChars:'Maksimaalselt tähemärke',type:'Liik',typeText:'Tekst',typePass:'Parool'},hidden:{title:'Varjatud lahtri omadused',name:'Nimi',value:'Väärtus'},image:{title:'Pildi omadused',titleButton:'Piltnupu omadused',menu:'Pildi omadused',infoTab:'Pildi info',btnUpload:'Saada serverisse',upload:'Lae üles',alt:'Alternatiivne tekst',lockRatio:'Lukusta kuvasuhe',resetSize:'Lähtesta suurus',border:'Joon',hSpace:'H. vaheruum',vSpace:'V. vaheruum',alertUrl:'Palun kirjuta pildi URL',linkTab:'Link',button2Img:'Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?',img2Button:'Kas tahad teisendada valitud tavalise pildi pildiga nupuks?',urlMissing:'Pildi lähte-URL on puudu.',validateBorder:'Äärise laius peab olema täisarv.',validateHSpace:'Horisontaalne vaheruum peab olema täisarv.',validateVSpace:'Vertikaalne vaheruum peab olema täisarv.'},flash:{properties:'Flashi omadused',propertiesTab:'Omadused',title:'Flashi omadused',chkPlay:'Automaatne start ',chkLoop:'Korduv',chkMenu:'Flashi menüü lubatud',chkFull:'Täisekraan lubatud',scale:'Mastaap',scaleAll:'Näidatakse kõike',scaleNoBorder:'Äärist ei ole',scaleFit:'Täpne sobivus',access:'Skriptide ligipääs',accessAlways:'Kõigile',accessSameDomain:'Samalt domeenilt',accessNever:'Mitte ühelegi',alignAbsBottom:'Abs alla',alignAbsMiddle:'Abs keskele',alignBaseline:'Baasjoonele',alignTextTop:'Tekstist üles',quality:'Kvaliteet',qualityBest:'Parim',qualityHigh:'Kõrge',qualityAutoHigh:'Automaatne kõrge',qualityMedium:'Keskmine',qualityAutoLow:'Automaatne madal',qualityLow:'Madal',windowModeWindow:'Aken',windowModeOpaque:'Läbipaistmatu',windowModeTransparent:'Läbipaistev',windowMode:'Akna režiim',flashvars:'Flashi muutujad',bgcolor:'Tausta värv',hSpace:'H. vaheruum',vSpace:'V. vaheruum',validateSrc:'Palun kirjuta lingi URL',validateHSpace:'H. vaheruum peab olema number.',validateVSpace:'V. vaheruum peab olema number.'},spellCheck:{toolbar:'Õigekirjakontroll',title:'Õigekirjakontroll',notAvailable:'Kahjuks ei ole teenus praegu saadaval.',errorLoading:'Viga rakenduse teenushosti laadimisel: %s.',notInDic:'Puudub sõnastikust',changeTo:'Muuda',btnIgnore:'Ignoreeri',btnIgnoreAll:'Ignoreeri kõiki',btnReplace:'Asenda',btnReplaceAll:'Asenda kõik',btnUndo:'Võta tagasi',noSuggestions:'- Soovitused puuduvad -',progress:'Toimub õigekirja kontroll...',noMispell:'Õigekirja kontroll sooritatud: õigekirjuvigu ei leitud',noChanges:'Õigekirja kontroll sooritatud: ühtegi sõna ei muudetud',oneChange:'Õigekirja kontroll sooritatud: üks sõna muudeti',manyChanges:'Õigekirja kontroll sooritatud: %1 sõna muudetud',ieSpellDownload:'Õigekirja kontrollija ei ole paigaldatud. Soovid sa selle alla laadida?'},smiley:{toolbar:'Emotikon',title:'Sisesta emotikon',options:'Emotikonide valikud'},elementsPath:{eleLabel:'Elementide asukoht',eleTitle:'%1 element'},numberedlist:'Numberloend',bulletedlist:'Punktloend',indent:'Taande suurendamine',outdent:'Taande vähendamine',justify:{left:'Vasakjoondus',center:'Keskjoondus',right:'Paremjoondus',block:'Rööpjoondus'},blockquote:'Blokktsitaat',clipboard:{title:'Asetamine',cutError:'Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).',copyError:'Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).',pasteMsg:'Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.',securityMsg:'Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.',pasteArea:'Asetamise ala'},pastefromword:{confirmCleanup:'Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?',toolbar:'Asetamine Wordist',title:'Asetamine Wordist',error:'Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik'},pasteText:{button:'Asetamine tavalise tekstina',title:'Asetamine tavalise tekstina'},templates:{button:'Mall',title:'Sisumallid',options:'Malli valikud',insertOption:'Praegune sisu asendatakse',selectPromptMsg:'Palun vali mall, mis avada redaktoris<br />(praegune sisu läheb kaotsi):',emptyListMsg:'(Ühtegi malli ei ole defineeritud)'},showBlocks:'Blokkide näitamine',stylesCombo:{label:'Stiil',panelTitle:'Vormindusstiilid',panelTitle1:'Blokkstiilid',panelTitle2:'Reasisesed stiilid',panelTitle3:'Objektistiilid'},format:{label:'Vorming',panelTitle:'Vorming',tag_p:'Tavaline',tag_pre:'Vormindatud',tag_address:'Aadress',tag_h1:'Pealkiri 1',tag_h2:'Pealkiri 2',tag_h3:'Pealkiri 3',tag_h4:'Pealkiri 4',tag_h5:'Pealkiri 5',tag_h6:'Pealkiri 6',tag_div:'Tavaline (DIV)'},div:{title:'Div-konteineri loomine',toolbar:'Div-konteineri loomine',cssClassInputLabel:'Stiililehe klassid',styleSelectLabel:'Stiil',IdInputLabel:'ID',languageCodeInputLabel:' Keelekood',inlineStyleInputLabel:'Reasisene stiil',advisoryTitleInputLabel:'Soovitatav pealkiri',langDirLabel:'Keele suund',langDirLTRLabel:'Vasakult paremale (LTR)',langDirRTLLabel:'Paremalt vasakule (RTL)',edit:'Muuda Div',remove:'Eemalda Div'},iframe:{title:'IFrame omadused',toolbar:'IFrame',noUrl:'Vali iframe URLi liik',scrolling:'Kerimisribade lubamine',border:'Raami äärise näitamine'},font:{label:'Kiri',voiceLabel:'Kiri',panelTitle:'Kiri'},fontSize:{label:'Suurus',voiceLabel:'Kirja suurus',panelTitle:'Suurus'},colorButton:{textColorTitle:'Teksti värv',bgColorTitle:'Tausta värv',panelTitle:'Värvid',auto:'Automaatne',more:'Rohkem värve...'},colors:{'000':'Must',800000:'Kastanpruun','8B4513':'Sadulapruun','2F4F4F':'Tume paehall','008080':'Sinakasroheline','000080':'Meresinine','4B0082':'Indigosinine',696969:'Tumehall',B22222:'Šamottkivi',A52A2A:'Pruun',DAA520:'Kuldkollane','006400':'Tumeroheline','40E0D0':'Türkiissinine','0000CD':'Keskmine sinine',800080:'Lilla',808080:'Hall',F00:'Punanae',FF8C00:'Tumeoranž',FFD700:'Kuldne','008000':'Roheline','0FF':'Tsüaniidsinine','00F':'Sinine',EE82EE:'Violetne',A9A9A9:'Tuhm hall',FFA07A:'Hele lõhe',FFA500:'Oranž',FFFF00:'Kollane','00FF00':'Lubja hall',AFEEEE:'Kahvatu türkiis',ADD8E6:'Helesinine',DDA0DD:'Ploomililla',D3D3D3:'Helehall',FFF0F5:'Lavendlipunane',FAEBD7:'Antiikvalge',FFFFE0:'Helekollane',F0FFF0:'Meloniroheline',F0FFFF:'Taevasinine',F0F8FF:'Beebisinine',E6E6FA:'Lavendel',FFF:'Valge'},scayt:{title:'Õigekirjakontroll kirjutamise ajal',opera_title:'Operas pole toetatud',enable:'SCAYT lubatud',disable:'SCAYT keelatud',about:'SCAYT-ist lähemalt',toggle:'SCAYT sisse/välja lülitamine',options:'Valikud',langs:'Keeled',moreSuggestions:'Veel soovitusi',ignore:'Eira',ignoreAll:'Eira kõiki',addWord:'Lisa sõna',emptyDic:'Sõnaraamatu nimi ei tohi olla tühi.',optionsTab:'Valikud',allCaps:'Läbivate suurtähtedega sõnade eiramine',ignoreDomainNames:'Domeeninimede eiramine',mixedCase:'Tavapäratu tõstuga sõnade eiramine',mixedWithDigits:'Numbreid sisaldavate sõnade eiramine',languagesTab:'Keeled',dictionariesTab:'Sõnaraamatud',dic_field_name:'Sõnaraamatu nimi',dic_create:'Loo',dic_restore:'Taasta',dic_delete:'Kustuta',dic_rename:'Nimeta ümber',dic_info:'Alguses säilitatakse kasutaja sõnaraamatut küpsises. Küpsise suurus on piiratud. Pärast sõnaraamatu kasvamist nii suureks, et see küpsisesse ei mahu, võib sõnaraamatut hoida meie serveris. Oma isikliku sõnaraamatu hoidmiseks meie serveris pead andma sellele nime. Kui sa juba oled sõnaraamatu salvestanud, sisesta selle nimi ja klõpsa taastamise nupule.',aboutTab:'Lähemalt'},about:{title:'CKEditorist',dlgTitle:'CKEditorist',help:'Abi jaoks vaata $1.',userGuide:'CKEditori kasutusjuhendit',moreInfo:'Litsentsi andmed leiab meie veebilehelt:',copy:'Copyright &copy; $1. Kõik õigused kaitstud.'},maximize:'Maksimeerimine',minimize:'Minimeerimine',fakeobjects:{anchor:'Ankur',flash:'Flashi animatsioon',iframe:'IFrame',hiddenfield:'Varjatud väli',unknown:'Tundmatu objekt'},resize:'Suuruse muutmiseks lohista',colordialog:{title:'Värvi valimine',options:'Värvi valikud',highlight:'Näidis',selected:'Valitud värv',clear:'Eemalda'},toolbarCollapse:'Tööriistariba peitmine',toolbarExpand:'Tööriistariba näitamine',toolbarGroups:{document:'Dokument',clipboard:'Lõikelaud/tagasivõtmine',editing:'Muutmine',forms:'Vormid',basicstyles:'Põhistiilid',paragraph:'Lõik',links:'Lingid',insert:'Sisesta',styles:'Stiilid',colors:'Värvid',tools:'Tööriistad'},bidi:{ltr:'Teksti suund vasakult paremale',rtl:'Teksti suund paremalt vasakule'},docprops:{label:'Dokumendi omadused',title:'Dokumendi omadused',design:'Disain',meta:'Meta andmed',chooseColor:'Vali',other:'<muu>',docTitle:'Lehekülje tiitel',charset:'Märgistiku kodeering',charsetOther:'Ülejäänud märgistike kodeeringud',charsetASCII:'ASCII',charsetCE:'Kesk-Euroopa',charsetCT:'Hiina traditsiooniline (Big5)',charsetCR:'Kirillisa',charsetGR:'Kreeka',charsetJP:'Jaapani',charsetKR:'Korea',charsetTR:'Türgi',charsetUN:'Unicode (UTF-8)',charsetWE:'Lääne-Euroopa',docType:'Dokumendi tüüppäis',docTypeOther:'Teised dokumendi tüüppäised',xhtmlDec:'Arva kaasa XHTML deklaratsioonid',bgColor:'Taustavärv',bgImage:'Taustapildi URL',bgFixed:'Mittekeritav tagataust',txtColor:'Teksti värv',margin:'Lehekülje äärised',marginTop:'Ülaserv',marginLeft:'Vasakserv',marginRight:'Paremserv',marginBottom:'Alaserv',metaKeywords:'Dokumendi võtmesõnad (eraldatud komadega)',metaDescription:'Dokumendi kirjeldus',metaAuthor:'Autor',metaCopyright:'Autoriõigus',previewHtml:'<p>See on <strong>näidistekst</strong>. Sa kasutad <a href="javascript:void(0)">CKEditori</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/eu.js b/upload/public/js/3rd_party/ckeditor/lang/eu.js
new file mode 100644
index 00000000..8380dde6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/eu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.eu={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML Iturburua',newPage:'Orrialde Berria',save:'Gorde',preview:'Aurrebista',cut:'Ebaki',copy:'Kopiatu',paste:'Itsatsi',print:'Inprimatu',underline:'Azpimarratu',bold:'Lodia',italic:'Etzana',selectAll:'Hautatu dena',removeFormat:'Kendu Formatua',strike:'Marratua',subscript:'Azpi-indize',superscript:'Goi-indize',horizontalrule:'Txertatu Marra Horizontala',pagebreak:'Txertatu Orrialde-jauzia',pagebreakAlt:'Page Break',unlink:'Kendu Esteka',undo:'Desegin',redo:'Berregin',common:{browseServer:'Zerbitzaria arakatu',url:'URL',protocol:'Protokoloa',upload:'Gora kargatu',uploadSubmit:'Zerbitzarira bidalia',image:'Irudia',flash:'Flasha',form:'Formularioa',checkbox:'Kontrol-laukia',radio:'Aukera-botoia',textField:'Testu Eremua',textarea:'Testu-area',hiddenField:'Ezkutuko Eremua',button:'Botoia',select:'Hautespen Eremua',imageButton:'Irudi Botoia',notSet:'<Ezarri gabe>',id:'Id',name:'Izena',langDir:'Hizkuntzaren Norabidea',langDirLtr:'Ezkerretik Eskumara(LTR)',langDirRtl:'Eskumatik Ezkerrera (RTL)',langCode:'Hizkuntza Kodea',longDescr:'URL Deskribapen Luzea',cssClass:'Estilo-orriko Klaseak',advisoryTitle:'Izenburua',cssStyle:'Estiloa',ok:'Ados',cancel:'Utzi',close:'Close',preview:'Preview',generalTab:'Orokorra',advancedTab:'Aurreratua',validateNumberFailed:'Balio hau ez da zenbaki bat.',confirmNewPage:'Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?',confirmCancel:'Aukera batzuk aldatu egin dira. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Zabalera',height:'Altuera',align:'Lerrokatu',alignLeft:'Ezkerrera',alignRight:'Eskuman',alignCenter:'Erdian',alignTop:'Goian',alignMiddle:'Erdian',alignBottom:'Behean',invalidHeight:'Altuera zenbaki bat izan behar da.',invalidWidth:'Zabalera zenbaki bat izan behar da.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, erabilezina</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Txertatu Karaktere Berezia',title:'Karaktere Berezia Aukeratu',options:'Special Character Options'},link:{toolbar:'Txertatu/Editatu Esteka',other:'<other>',menu:'Aldatu Esteka',title:'Esteka',info:'Estekaren Informazioa',target:'Target (Helburua)',upload:'Gora kargatu',advanced:'Aurreratua',type:'Esteka Mota',toUrl:'URL',toAnchor:'Aingura orrialde honetan',toEmail:'ePosta',targetFrame:'<marko>',targetPopup:'<popup leihoa>',targetFrameName:'Marko Helburuaren Izena',targetPopupName:'Popup Leihoaren Izena',popupFeatures:'Popup Leihoaren Ezaugarriak',popupResizable:'Tamaina Aldakorra',popupStatusBar:'Egoera Barra',popupLocationBar:'Kokaleku Barra',popupToolbar:'Tresna Barra',popupMenuBar:'Menu Barra',popupFullScreen:'Pantaila Osoa (IE)',popupScrollBars:'Korritze Barrak',popupDependent:'Menpekoa (Netscape)',popupLeft:'Ezkerreko  Posizioa',popupTop:'Goiko Posizioa',id:'Id',langDir:'Hizkuntzaren Norabidea',langDirLTR:'Ezkerretik Eskumara(LTR)',langDirRTL:'Eskumatik Ezkerrera (RTL)',acccessKey:'Sarbide-gakoa',name:'Izena',langCode:'Hizkuntzaren Norabidea',tabIndex:'Tabulazio Indizea',advisoryTitle:'Izenburua',advisoryContentType:'Eduki Mota (Content Type)',cssClasses:'Estilo-orriko Klaseak',charset:'Estekatutako Karaktere Multzoa',styles:'Estiloa',rel:'Relationship',selectAnchor:'Aingura bat hautatu',anchorName:'Aingura izenagatik',anchorId:'Elementuaren ID-gatik',emailAddress:'ePosta Helbidea',emailSubject:'Mezuaren Gaia',emailBody:'Mezuaren Gorputza',noAnchors:'(Ez daude aingurak eskuragarri dokumentuan)',noUrl:'Mesedez URL esteka idatzi',noEmail:'Mesedez ePosta helbidea idatzi'},anchor:{toolbar:'Aingura',menu:'Ainguraren Ezaugarriak',title:'Ainguraren Ezaugarriak',name:'Ainguraren Izena',errorName:'Idatzi ainguraren izena',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Bilatu eta Ordeztu',find:'Bilatu',replace:'Ordezkatu',findWhat:'Zer bilatu:',replaceWith:'Zerekin ordeztu:',notFoundMsg:'Idatzitako testua ez da topatu.',findOptions:'Find Options',matchCase:'Maiuskula/minuskula',matchWord:'Esaldi osoa bilatu',matchCyclic:'Bilaketa ziklikoa',replaceAll:'Ordeztu Guztiak',replaceSuccessMsg:'Zenbat aldiz ordeztua: %1'},table:{toolbar:'Taula',title:'Taularen Ezaugarriak',menu:'Taularen Ezaugarriak',deleteTable:'Ezabatu Taula',rows:'Lerroak',columns:'Zutabeak',border:'Ertzaren Zabalera',widthPx:'pixel',widthPc:'ehuneko',widthUnit:'width unit',cellSpace:'Gelaxka arteko tartea',cellPad:'Gelaxken betegarria',caption:'Epigrafea',summary:'Laburpena',headers:'Goiburuak',headersNone:'Bat ere ez',headersColumn:'Lehen zutabea',headersRow:'Lehen lerroa',headersBoth:'Biak',invalidRows:'Lerro kopurua 0 baino handiagoa den zenbakia izan behar da.',invalidCols:'Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.',invalidBorder:'Ertzaren tamaina zenbaki bat izan behar da.',invalidWidth:'Taularen zabalera zenbaki bat izan behar da.',invalidHeight:'Taularen altuera zenbaki bat izan behar da.',invalidCellSpacing:'Gelaxka arteko tartea zenbaki bat izan behar da.',invalidCellPadding:'Gelaxken betegarria zenbaki bat izan behar da.',cell:{menu:'Gelaxka',insertBefore:'Txertatu Gelaxka Aurretik',insertAfter:'Txertatu Gelaxka Ostean',deleteCell:'Kendu Gelaxkak',merge:'Batu Gelaxkak',mergeRight:'Elkartu Eskumara',mergeDown:'Elkartu Behera',splitHorizontal:'Banatu Gelaxkak Horizontalki',splitVertical:'Banatu Gelaxkak Bertikalki',title:'Gelaxken Ezaugarriak',cellType:'Gelaxka Mota',rowSpan:'Hedatutako Lerroak',colSpan:'Hedatutako Zutabeak',wordWrap:'Itzulbira',hAlign:'Lerrokatze Horizontala',vAlign:'Lerrokatze Bertikala',alignBaseline:'Oinarri-lerroan',bgColor:'Fondoaren Kolorea',borderColor:'Ertzaren Kolorea',data:'Data',header:'Goiburua',yes:'Bai',no:'Ez',invalidWidth:'Gelaxkaren zabalera zenbaki bat izan behar da.',invalidHeight:'Gelaxkaren altuera zenbaki bat izan behar da.',invalidRowSpan:'Lerroen hedapena zenbaki osoa izan behar da.',invalidColSpan:'Zutabeen hedapena zenbaki osoa izan behar da.',chooseColor:'Choose'},row:{menu:'Lerroa',insertBefore:'Txertatu Lerroa Aurretik',insertAfter:'Txertatu Lerroa Ostean',deleteRow:'Ezabatu Lerroak'},column:{menu:'Zutabea',insertBefore:'Txertatu Zutabea Aurretik',insertAfter:'Txertatu Zutabea Ostean',deleteColumn:'Ezabatu Zutabeak'}},button:{title:'Botoiaren Ezaugarriak',text:'Testua (Balorea)',type:'Mota',typeBtn:'Botoia',typeSbm:'Bidali',typeRst:'Garbitu'},checkboxAndRadio:{checkboxTitle:'Kontrol-laukiko Ezaugarriak',radioTitle:'Aukera-botoiaren Ezaugarriak',value:'Balorea',selected:'Hautatuta'},form:{title:'Formularioaren Ezaugarriak',menu:'Formularioaren Ezaugarriak',action:'Ekintza',method:'Metodoa',encoding:'Kodeketa'},select:{title:'Hautespen Eremuaren Ezaugarriak',selectInfo:'Informazioa',opAvail:'Aukera Eskuragarriak',value:'Balorea',size:'Tamaina',lines:'lerro kopurura',chkMulti:'Hautaketa anitzak baimendu',opText:'Testua',opValue:'Balorea',btnAdd:'Gehitu',btnModify:'Aldatu',btnUp:'Gora',btnDown:'Behera',btnSetValue:'Aukeratutako balorea ezarri',btnDelete:'Ezabatu'},textarea:{title:'Testu-arearen Ezaugarriak',cols:'Zutabeak',rows:'Lerroak'},textfield:{title:'Testu Eremuaren Ezaugarriak',name:'Izena',value:'Balorea',charWidth:'Zabalera',maxChars:'Zenbat karaktere gehienez',type:'Mota',typeText:'Testua',typePass:'Pasahitza'},hidden:{title:'Ezkutuko Eremuaren Ezaugarriak',name:'Izena',value:'Balorea'},image:{title:'Irudi Ezaugarriak',titleButton:'Irudi Botoiaren Ezaugarriak',menu:'Irudi Ezaugarriak',infoTab:'Irudi informazioa',btnUpload:'Zerbitzarira bidalia',upload:'Gora Kargatu',alt:'Ordezko Testua',lockRatio:'Erlazioa Blokeatu',resetSize:'Tamaina Berrezarri',border:'Ertza',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Mesedez Irudiaren URLa idatzi',linkTab:'Esteka',button2Img:'Aukeratutako irudi botoia, irudi normal batean eraldatu nahi duzu?',img2Button:'Aukeratutako irudia, irudi botoi batean eraldatu nahi duzu?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flasharen Ezaugarriak',propertiesTab:'Ezaugarriak',title:'Flasharen Ezaugarriak',chkPlay:'Automatikoki Erreproduzitu',chkLoop:'Begizta',chkMenu:'Flasharen Menua Gaitu',chkFull:'Onartu Pantaila osoa',scale:'Eskalatu',scaleAll:'Dena erakutsi',scaleNoBorder:'Ertzik gabe',scaleFit:'Doitu',access:'Scriptak baimendu',accessAlways:'Beti',accessSameDomain:'Domeinu berdinekoak',accessNever:'Inoiz ere ez',alignAbsBottom:'Abs Behean',alignAbsMiddle:'Abs Erdian',alignBaseline:'Oinan',alignTextTop:'Testua Goian',quality:'Kalitatea',qualityBest:'Hoberena',qualityHigh:'Altua',qualityAutoHigh:'Auto Altua',qualityMedium:'Ertaina',qualityAutoLow:'Auto Baxua',qualityLow:'Baxua',windowModeWindow:'Leihoa',windowModeOpaque:'Opakoa',windowModeTransparent:'Gardena',windowMode:'Leihoaren modua',flashvars:'Flash Aldagaiak',bgcolor:'Atzeko kolorea',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Mesedez URL esteka idatzi',validateHSpace:'HSpace zenbaki bat izan behar da.',validateVSpace:'VSpace zenbaki bat izan behar da.'},spellCheck:{toolbar:'Ortografia',title:'Ortografia zuzenketa',notAvailable:'Barkatu baina momentu honetan zerbitzua ez dago erabilgarri.',errorLoading:'Errorea gertatu da aplikazioa zerbitzaritik kargatzean: %s.',notInDic:'Ez dago hiztegian',changeTo:'Honekin ordezkatu',btnIgnore:'Ezikusi',btnIgnoreAll:'Denak Ezikusi',btnReplace:'Ordezkatu',btnReplaceAll:'Denak Ordezkatu',btnUndo:'Desegin',noSuggestions:'- Iradokizunik ez -',progress:'Zuzenketa ortografikoa martxan...',noMispell:'Zuzenketa ortografikoa bukatuta: Akatsik ez',noChanges:'Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu',oneChange:'Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da',manyChanges:'Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira',ieSpellDownload:'Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?'},smiley:{toolbar:'Aurpegierak',title:'Aurpegiera Sartu',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 elementua'},numberedlist:'Zenbakidun Zerrenda',bulletedlist:'Buletdun Zerrenda',indent:'Handitu Koska',outdent:'Txikitu Koska',justify:{left:'Lerrokatu Ezkerrean',center:'Lerrokatu Erdian',right:'Lerrokatu Eskuman',block:'Justifikatu'},blockquote:'Aipamen blokea',clipboard:{title:'Itsatsi',cutError:'Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki moztea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl/Cmd+X).',copyError:'Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki kopiatzea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl/Cmd+C).',pasteMsg:'Mesedez teklatua erabilita (<STRONG>Ctrl/Cmd+V</STRONG>) ondorego eremuan testua itsatsi eta <STRONG>OK</STRONG> sakatu.',securityMsg:'Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Itsatsi nahi duzun testua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?',toolbar:'Itsatsi Word-etik',title:'Itsatsi Word-etik',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Testu Arrunta bezala Itsatsi',title:'Testu Arrunta bezala Itsatsi'},templates:{button:'Txantiloiak',title:'Eduki Txantiloiak',options:'Template Options',insertOption:'Ordeztu oraingo edukiak',selectPromptMsg:'Mesedez txantiloia aukeratu editorean kargatzeko<br>(orain dauden edukiak galduko dira):',emptyListMsg:'(Ez dago definitutako txantiloirik)'},showBlocks:'Blokeak erakutsi',stylesCombo:{label:'Estiloa',panelTitle:'Formatting Styles',panelTitle1:'Bloke Estiloak',panelTitle2:'Inline Estiloak',panelTitle3:'Objektu Estiloak'},format:{label:'Formatua',panelTitle:'Formatua',tag_p:'Arrunta',tag_pre:'Formateatua',tag_address:'Helbidea',tag_h1:'Izenburua 1',tag_h2:'Izenburua 2',tag_h3:'Izenburua 3',tag_h4:'Izenburua 4',tag_h5:'Izenburua 5',tag_h6:'Izenburua 6',tag_div:'Paragrafoa (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Letra-tipoa',voiceLabel:'Letra-tipoa',panelTitle:'Letra-tipoa'},fontSize:{label:'Tamaina',voiceLabel:'Tamaina',panelTitle:'Tamaina'},colorButton:{textColorTitle:'Testu Kolorea',bgColorTitle:'Atzeko kolorea',panelTitle:'Colors',auto:'Automatikoa',more:'Kolore gehiago...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Ortografia Zuzenketa Idatzi Ahala (SCAYT)',opera_title:'Not supported by Opera',enable:'Gaitu SCAYT',disable:'Desgaitu SCAYT',about:'SCAYTi buruz',toggle:'SCAYT aldatu',options:'Aukerak',langs:'Hizkuntzak',moreSuggestions:'Iradokizun gehiago',ignore:'Baztertu',ignoreAll:'Denak baztertu',addWord:'Hitza Gehitu',emptyDic:'Hiztegiaren izena ezin da hutsik egon.',optionsTab:'Aukerak',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Hizkuntzak',dictionariesTab:'Hiztegiak',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Honi buruz'},about:{title:'CKEditor(r)i buruz',dlgTitle:'CKEditor(r)i buruz',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Lizentziari buruzko informazioa gure webgunean:',copy:'Copyright &copy; $1. Eskubide guztiak erreserbaturik.'},maximize:'Maximizatu',minimize:'Minimize',fakeobjects:{anchor:'Aingura',flash:'Flash Animazioa',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Objektu ezezaguna'},resize:'Arrastatu tamaina aldatzeko',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Dokumentuaren Ezarpenak',title:'Dokumentuaren Ezarpenak',design:'Design',meta:'Meta Informazioa',chooseColor:'Choose',other:'<other>',docTitle:'Orriaren Izenburua',charset:'Karaktere Multzoaren Kodeketa',charsetOther:'Beste Karaktere Multzoko Kodeketa',charsetASCII:'ASCII',charsetCE:'Erdialdeko Europakoa',charsetCT:'Txinatar Tradizionala (Big5)',charsetCR:'Zirilikoa',charsetGR:'Grekoa',charsetJP:'Japoniarra',charsetKR:'Korearra',charsetTR:'Turkiarra',charsetUN:'Unicode (UTF-8)',charsetWE:'Mendebaldeko Europakoa',docType:'Document Type Goiburua',docTypeOther:'Beste Document Type Goiburua',xhtmlDec:'XHTML Ezarpenak',bgColor:'Atzeko Kolorea',bgImage:'Atzeko Irudiaren URL-a',bgFixed:'Korritze gabeko Atzealdea',txtColor:'Testu Kolorea',margin:'Orrialdearen marjinak',marginTop:'Goian',marginLeft:'Ezkerrean',marginRight:'Eskuman',marginBottom:'Behean',metaKeywords:'Dokumentuaren Gako-hitzak (komarekin bananduta)',metaDescription:'Dokumentuaren Deskribapena',metaAuthor:'Egilea',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/fa.js b/upload/public/js/3rd_party/ckeditor/lang/fa.js
new file mode 100644
index 00000000..9ac20754
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/fa.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fa={dir:'rtl',editorTitle:'ویرایشگر متن غنی, %1, کلید Alt+0 را برای راهنمایی ب�شارید.',toolbars:'نوار ابزار',editor:'ویرایشگر متن غنی',source:'منبع',newPage:'برگهٴ تازه',save:'ذخیره',preview:'پیشنمایش',cut:'برش',copy:'کپی',paste:'چسباندن',print:'چاپ',underline:'زیرخطدار',bold:'درشت',italic:'خمیده',selectAll:'گزینش همه',removeFormat:'برداشتن �رمت',strike:'میانخط',subscript:'زیرنویس',superscript:'بالانویس',horizontalrule:'گنجاندن خط ا�قی',pagebreak:'گنجاندن شکستگی پایان برگه',pagebreakAlt:'شکستن ص�حه',unlink:'برداشتن پیوند',undo:'واچیدن',redo:'بازچیدن',common:{browseServer:'�هرستنمایی سرور',url:'URL',protocol:'پروتکل',upload:'انتقال به سرور',uploadSubmit:'به سرور ب�رست',image:'تصویر',flash:'�لش',form:'�رم',checkbox:'خانهٴ گزینهای',radio:'دکمهٴ رادیویی',textField:'�یلد متنی',textarea:'ناحیهٴ متنی',hiddenField:'�یلد پنهان',button:'دکمه',select:'�یلد چندگزینهای',imageButton:'دکمهٴ تصویری',notSet:'<تعین نشده>',id:'شناسه',name:'نام',langDir:'جهتنمای زبان',langDirLtr:'چپ به راست (LTR)',langDirRtl:'راست به چپ (RTL)',langCode:'کد زبان',longDescr:'URL توصی� طولانی',cssClass:'کلاسهای شیوهنامه(Stylesheet)',advisoryTitle:'عنوان کمکی',cssStyle:'شیوه(style)',ok:'پذیرش',cancel:'انصرا�',close:'بستن',preview:'پیشنمایش',generalTab:'عمومی',advancedTab:'پیشر�ته',validateNumberFailed:'این مقدار یک عدد نیست.',confirmNewPage:'هر تغییر ایجاد شدهی ذخیره نشده از بین خواهد ر�ت. آیا اطمینان دارید که قصد بارگیری ص�حه جدیدی را دارید؟',confirmCancel:'برخی از گزینهها تغییر کردهاند. آیا واقعا قصد بستن این پنجره را دارید؟',options:'گزینهها',target:'مسیر',targetNew:'پنجره جدید (_blank)',targetTop:'بالاترین پنجره (_top)',targetSelf:'همان پنجره (_self)',targetParent:'پنجره والد (_parent)',langDirLTR:'چپ به راست (LTR)',langDirRTL:'راست به چپ (RTL)',styles:'سبک',cssClasses:'کلاسهای شیوهنامه',width:'پهنا',height:'درازا',align:'چینش',alignLeft:'چپ',alignRight:'راست',alignCenter:'وسط',alignTop:'بالا',alignMiddle:'وسط',alignBottom:'پائین',invalidHeight:'ارت�اع باید یک عدد باشد.',invalidWidth:'پهنا باید یک عدد باشد.',invalidCssLength:'عدد تعیین شده برای �یلد "%1" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'عدد تعیین شده برای �یلد "%1" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).',invalidInlineStyle:'عدد تعیین شده برای سبک درونخطی(Inline Style) باید دارای یک یا چند چندتایی با شکلی شبیه "name : value" که باید با یک ","(semi-colons) از هم جدا شوند.',cssLengthTooltip:'یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">، غیر قابل دسترس</span>'},contextmenu:{options:'گزینههای منوی زمینه'},specialChar:{toolbar:'گنجاندن نویسهٴ ویژه',title:'گزینش نویسهٴ ویژه',options:'گزینههای نویسههای ویژه'},link:{toolbar:'گنجاندن/ویرایش پیوند',other:'<سایر>',menu:'ویرایش پیوند',title:'پیوند',info:'اطلاعات پیوند',target:'مقصد',upload:'انتقال به سرور',advanced:'پیشر�ته',type:'نوع پیوند',toUrl:'URL',toAnchor:'لنگر در همین ص�حه',toEmail:'پست الکترونیکی',targetFrame:'<�ریم>',targetPopup:'<پنجرهٴ پاپاپ>',targetFrameName:'نام �ریم مقصد',targetPopupName:'نام پنجرهٴ پاپاپ',popupFeatures:'ویژگیهای پنجرهٴ پاپاپ',popupResizable:'قابل تغییر اندازه',popupStatusBar:'نوار وضعیت',popupLocationBar:'نوار موقعیت',popupToolbar:'نوارابزار',popupMenuBar:'نوار منو',popupFullScreen:'تمامص�حه (IE)',popupScrollBars:'میلههای پیمایش',popupDependent:'وابسته (Netscape)',popupLeft:'موقعیت چپ',popupTop:'موقعیت بالا',id:'شناسه',langDir:'جهتنمای زبان',langDirLTR:'چپ به راست (LTR)',langDirRTL:'راست به چپ (RTL)',acccessKey:'کلید دستیابی',name:'نام',langCode:'جهتنمای زبان',tabIndex:'نمایهٴ دسترسی با برگه',advisoryTitle:'عنوان کمکی',advisoryContentType:'نوع محتوای کمکی',cssClasses:'کلاسهای شیوهنامه(Stylesheet)',charset:'نویسهگان منبع پیوند شده',styles:'شیوه(style)',rel:'وابستگی',selectAnchor:'یک لنگر برگزینید',anchorName:'با نام لنگر',anchorId:'با شناسهٴ المان',emailAddress:'نشانی پست الکترونیکی',emailSubject:'موضوع پیام',emailBody:'متن پیام',noAnchors:'(در این سند لنگری دردسترس نیست)',noUrl:'لط�ا URL پیوند را بنویسید',noEmail:'لط�ا نشانی پست الکترونیکی را بنویسید'},anchor:{toolbar:'گنجاندن/ویرایش لنگر',menu:'ویژگیهای لنگر',title:'ویژگیهای لنگر',name:'نام لنگر',errorName:'لط�ا نام لنگر را بنویسید',remove:'حذ� لنگر'},list:{numberedTitle:'ویژگیهای �هرست شمارهدار',bulletedTitle:'ویژگیهای �هرست گلولهدار',type:'نوع',start:'شروع',validateStartNumber:'�هرست شماره شروع باید یک عدد صحیح باشد.',circle:'دایره',disc:'ص�حه گرد',square:'چهارگوش',none:'هیچ',notset:'<تنظیم نشده>',armenian:'شمارهگذاری ارمنی',georgian:'شمارهگذاری گریگورین (an, ban, gan, etc.)',lowerRoman:'پانویس رومی (i, ii, iii, iv, v, etc.)',upperRoman:'بالانویس رومی (I, II, III, IV, V, etc.)',lowerAlpha:'پانویس ال�بایی (a, b, c, d, e, etc.)',upperAlpha:'بالانویس ال�بایی (A, B, C, D, E, etc.)',lowerGreek:'پانویس یونانی (alpha, beta, gamma, etc.)',decimal:'دهدهی (1, 2, 3, etc.)',decimalLeadingZero:'دهدهی همراه با ص�ر (01, 02, 03, etc.)'},findAndReplace:{title:'جستجو و جایگزینی',find:'جستجو',replace:'جایگزینی',findWhat:'چه چیز را مییابید:',replaceWith:'جایگزینی با:',notFoundMsg:'متن موردنظر یا�ت نشد.',findOptions:'گزینههای جستجو',matchCase:'همسانی در بزرگی و کوچکی نویسهها',matchWord:'همسانی با واژهٴ کامل',matchCyclic:'همسانی با چرخه',replaceAll:'جایگزینی همهٴ یا�تهها',replaceSuccessMsg:'%1 رخداد جایگزین شد.'},table:{toolbar:'جدول',title:'ویژگیهای جدول',menu:'ویژگیهای جدول',deleteTable:'پاک کردن جدول',rows:'سطرها',columns:'ستونها',border:'اندازهٴ لبه',widthPx:'پیکسل',widthPc:'درصد',widthUnit:'واحد پهنا',cellSpace:'�اصلهٴ میان سلولها',cellPad:'�اصلهٴ پرشده در سلول',caption:'عنوان',summary:'خلاصه',headers:'سرنویسها',headersNone:'هیچ',headersColumn:'اولین ستون',headersRow:'اولین ردی�',headersBoth:'هردو',invalidRows:'تعداد ردی�ها باید یک عدد بزرگتر از 0 باشد.',invalidCols:'تعداد ستونها باید یک عدد بزرگتر از 0 باشد.',invalidBorder:'مقدار اندازه خطوط باید یک عدد باشد.',invalidWidth:'مقدار پهنای جدول باید یک عدد باشد.',invalidHeight:'مقدار ارت�اع  جدول باید یک عدد باشد.',invalidCellSpacing:'مقدار �اصلهگذاری سلول باید یک عدد باشد.',invalidCellPadding:'بالشتک سلول باید یک عدد باشد.',cell:{menu:'سلول',insertBefore:'ا�زودن سلول قبل از',insertAfter:'ا�زودن سلول بعد از',deleteCell:'حذ� سلولها',merge:'ادغام سلولها',mergeRight:'ادغام به راست',mergeDown:'ادغام به پایین',splitHorizontal:'جدا کردن ا�قی سلول',splitVertical:'جدا کردن عمودی سلول',title:'ویژگیهای سلول',cellType:'نوع سلول',rowSpan:'محدوده ردی�ها',colSpan:'محدوده ستونها',wordWrap:'شکستن کلمه',hAlign:'چینش ا�قی',vAlign:'چینش عمودی',alignBaseline:'خط مبنا',bgColor:'رنگ زمینه',borderColor:'رنگ خطوط',data:'اطلاعات',header:'سرنویس',yes:'بله',no:'خیر',invalidWidth:'عرض سلول باید یک عدد باشد.',invalidHeight:'ارت�اع سلول باید عدد باشد.',invalidRowSpan:'مقدار محدوده ردی�ها باید یک عدد باشد.',invalidColSpan:'مقدار محدوده ستونها باید یک عدد باشد.',chooseColor:'انتخاب'},row:{menu:'سطر',insertBefore:'ا�زودن سطر قبل از',insertAfter:'ا�زودن سطر بعد از',deleteRow:'حذ� سطرها'},column:{menu:'ستون',insertBefore:'ا�زودن ستون قبل از',insertAfter:'ا�زودن ستون بعد از',deleteColumn:'حذ� ستونها'}},button:{title:'ویژگیهای دکمه',text:'متن (مقدار)',type:'نوع',typeBtn:'دکمه',typeSbm:'ثبت',typeRst:'بازنشانی (Reset)'},checkboxAndRadio:{checkboxTitle:'ویژگیهای خانهٴ گزینهای',radioTitle:'ویژگیهای دکمهٴ رادیویی',value:'مقدار',selected:'برگزیده'},form:{title:'ویژگیهای �رم',menu:'ویژگیهای �رم',action:'رویداد',method:'متد',encoding:'رمزنگاری'},select:{title:'ویژگیهای �یلد چندگزینهای',selectInfo:'اطلاعات',opAvail:'گزینههای دردسترس',value:'مقدار',size:'اندازه',lines:'خطوط',chkMulti:'گزینش چندگانه �راهم باشد',opText:'متن',opValue:'مقدار',btnAdd:'ا�زودن',btnModify:'ویرایش',btnUp:'بالا',btnDown:'پائین',btnSetValue:'تنظیم به عنوان مقدار برگزیده',btnDelete:'پاککردن'},textarea:{title:'ویژگیهای ناحیهٴ متنی',cols:'ستونها',rows:'سطرها'},textfield:{title:'ویژگیهای �یلد متنی',name:'نام',value:'مقدار',charWidth:'پهنای نویسه',maxChars:'بیشینهٴ نویسهها',type:'نوع',typeText:'متن',typePass:'گذرواژه'},hidden:{title:'ویژگیهای �یلد پنهان',name:'نام',value:'مقدار'},image:{title:'ویژگیهای تصویر',titleButton:'ویژگیهای دکمهٴ تصویری',menu:'ویژگیهای تصویر',infoTab:'اطلاعات تصویر',btnUpload:'به سرور ب�رست',upload:'انتقال به سرور',alt:'متن جایگزین',lockRatio:'ق�ل کردن نسبت',resetSize:'بازنشانی اندازه',border:'لبه',hSpace:'�اصلهٴ ا�قی',vSpace:'�اصلهٴ عمودی',alertUrl:'لط�ا URL تصویر را بنویسید',linkTab:'پیوند',button2Img:'آیا مایلید از یک تصویر ساده روی دکمه تصویری انتخاب شده است�اده کنید؟',img2Button:'آیا مایلید از یک دکمه تصویری روی تصویر انتخاب شده است�اده کنید؟',urlMissing:'آدرس URL اصلی تصویر یا�ت نشد.',validateBorder:'مقدار خطوط باید یک عدد باشد.',validateHSpace:'مقدار �اصلهگذاری ا�قی باید یک عدد باشد.',validateVSpace:'مقدار �اصلهگذاری عمودی باید یک عدد باشد.'},flash:{properties:'ویژگیهای �لش',propertiesTab:'ویژگیها',title:'ویژگیهای �لش',chkPlay:'آغاز خودکار',chkLoop:'اجرای پیاپی',chkMenu:'در دسترس بودن منوی �لش',chkFull:'اجازه تمام ص�حه',scale:'مقیاس',scaleAll:'نمایش همه',scaleNoBorder:'بدون کران',scaleFit:'جایگیری کامل',access:'دسترسی به اسکریپت',accessAlways:'همیشه',accessSameDomain:'همان دامنه',accessNever:'هرگز',alignAbsBottom:'پائین مطلق',alignAbsMiddle:'وسط مطلق',alignBaseline:'خط پایه',alignTextTop:'متن بالا',quality:'کی�یت',qualityBest:'بهترین',qualityHigh:'بالا',qualityAutoHigh:'بالا - خودکار',qualityMedium:'متوسط',qualityAutoLow:'پایین - خودکار',qualityLow:'پایین',windowModeWindow:'پنجره',windowModeOpaque:'مات',windowModeTransparent:'ش�ا�',windowMode:'حالت پنجره',flashvars:'مقادیر برای �لش',bgcolor:'رنگ پسزمینه',hSpace:'�اصلهٴ ا�قی',vSpace:'�اصلهٴ عمودی',validateSrc:'لط�ا URL پیوند را بنویسید',validateHSpace:'مقدار �اصلهگذاری ا�قی باید یک عدد باشد.',validateVSpace:'مقدار �اصلهگذاری عمودی باید یک عدد باشد.'},spellCheck:{toolbar:'بررسی املا',title:'بررسی املا',notAvailable:'با عرض پوزش خدمات الان در دسترس نیستند.',errorLoading:'خطا در بارگیری برنامه خدمات میزبان: %s.',notInDic:'در واژه~نامه یا�ت نشد',changeTo:'تغییر به',btnIgnore:'چشمپوشی',btnIgnoreAll:'چشمپوشی همه',btnReplace:'جایگزینی',btnReplaceAll:'جایگزینی همه',btnUndo:'واچینش',noSuggestions:'- پیشنهادی نیست -',progress:'بررسی املا در حال انجام...',noMispell:'بررسی املا انجام شد. هیچ غلط املائی یا�ت نشد',noChanges:'بررسی املا انجام شد. هیچ واژهای تغییر نیا�ت',oneChange:'بررسی املا انجام شد. یک واژه تغییر یا�ت',manyChanges:'بررسی املا انجام شد. %1 واژه تغییر یا�ت',ieSpellDownload:'بررسی کنندهٴ املا نصب نشده است. آیا میخواهید آن را هماکنون دریا�ت کنید؟'},smiley:{toolbar:'خندانک',title:'گنجاندن خندانک',options:'گزینههای خندانک'},elementsPath:{eleLabel:'مسیر عناصر',eleTitle:'%1 عنصر'},numberedlist:'�هرست شمارهدار',bulletedlist:'�هرست نقطهای',indent:'ا�زایش تور�تگی',outdent:'کاهش تور�تگی',justify:{left:'چپچین',center:'میانچین',right:'راستچین',block:'بلوکچین'},blockquote:'بلوک نقل قول',clipboard:{title:'چسباندن',cutError:'تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لط�ا با دکمههای ص�حه کلید این کار را انجام دهید (Ctrl/Cmd+X).',copyError:'تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لط�ا با دکمههای ص�حه کلید این کار را انجام دهید (Ctrl/Cmd+C).',pasteMsg:'لط�ا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.',securityMsg:'به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.',pasteArea:'محل چسباندن'},pastefromword:{confirmCleanup:'متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟',toolbar:'چسباندن از Word',title:'چسباندن از Word',error:'به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.'},pasteText:{button:'چسباندن به عنوان متن �ساده',title:'چسباندن به عنوان متن �ساده'},templates:{button:'الگوها',title:'الگوهای محتویات',options:'گزینههای الگو',insertOption:'محتویات کنونی جایگزین شوند',selectPromptMsg:'لط�ا الگوی موردنظر را برای بازکردن در ویرایشگر برگزینید<br>(محتویات کنونی از دست خواهند ر�ت):',emptyListMsg:'(الگوئی تعری� نشده است)'},showBlocks:'نمایش بلوکها',stylesCombo:{label:'سبک',panelTitle:'سبکهای قالببندی',panelTitle1:'سبکهای بلوک',panelTitle2:'سبکهای درونخطی',panelTitle3:'سبکهای شیء'},format:{label:'�رمت',panelTitle:'�رمت',tag_p:'نرمال',tag_pre:'�رمت شده',tag_address:'آدرس',tag_h1:'سرنویس 1',tag_h2:'سرنویس 2',tag_h3:'سرنویس 3',tag_h4:'سرنویس 4',tag_h5:'سرنویس 5',tag_h6:'سرنویس 6',tag_div:'بند'},div:{title:'ایجاد یک محل DIV',toolbar:'ایجاد یک محل DIV',cssClassInputLabel:'کلاسهای شیوهنامه',styleSelectLabel:'سبک',IdInputLabel:'شناسه',languageCodeInputLabel:' کد زبان',inlineStyleInputLabel:'سبک درونخطی(Inline Style)',advisoryTitleInputLabel:'عنوان مشاوره',langDirLabel:'جهت نوشتاری زبان',langDirLTRLabel:'چپ به راست (LTR)',langDirRTLLabel:'راست به چپ (RTL)',edit:'ویرایش Div',remove:'حذ� Div'},iframe:{title:'ویژگیهای IFrame',toolbar:'IFrame',noUrl:'لط�ا مسیر URL iframe را درج کنید',scrolling:'نمایش خطکشها',border:'نمایش خطوط frame'},font:{label:'قلم',voiceLabel:'قلم',panelTitle:'قلم'},fontSize:{label:'اندازه',voiceLabel:'اندازه قلم',panelTitle:'اندازه'},colorButton:{textColorTitle:'رنگ متن',bgColorTitle:'رنگ پسزمینه',panelTitle:'رنگها',auto:'خودکار',more:'رنگهای بیشتر...'},colors:{'000':'سیاه',800000:'خرمایی','8B4513':'قهوهای شکلاتی','2F4F4F':'ارغوانی مایل به خاکستری','008080':'آبی مایل به خاکستری','000080':'آبی سیر','4B0082':'نیلی',696969:'خاکستری تیره',B22222:'آتش آجری',A52A2A:'قهوهای',DAA520:'میلهی طلایی','006400':'سبز تیره','40E0D0':'�یروزهای','0000CD':'آبی روشن',800080:'ارغوانی',808080:'خاکستری',F00:'قرمز',FF8C00:'نارنجی پررنگ',FFD700:'طلایی','008000':'سبز','0FF':'آبی مایل به سبز','00F':'آبی',EE82EE:'بن�ش',A9A9A9:'خاکستری مات',FFA07A:'صورتی کدر روشن',FFA500:'نارنجی',FFFF00:'زرد','00FF00':'�س�ری',AFEEEE:'�یروزهای رنگ پریده',ADD8E6:'آبی کمرنگ',DDA0DD:'آلویی',D3D3D3:'خاکستری روشن',FFF0F5:'بن�ش کمرنگ',FAEBD7:'عتیقه س�ید',FFFFE0:'زرد روشن',F0FFF0:'عسلی',F0FFFF:'لاجوردی',F0F8FF:'آبی براق',E6E6FA:'بن�ش کمرنگ',FFF:'س�ید'},scayt:{title:'بررسی املای تایپ شما',opera_title:'توسط اپرا پشتیبانی نمیشود',enable:'�عالسازی SCAYT',disable:'غیر�عالسازی SCAYT',about:'درباره SCAYT',toggle:'ضامن SCAYT',options:'گزینهها',langs:'زبانها',moreSuggestions:'پیشنهادهای بیشتر',ignore:'عبور کردن',ignoreAll:'عبور کردن از همه',addWord:'ا�زودن Word',emptyDic:'نام دیکشنری نباید خالی باشد.',optionsTab:'گزینهها',allCaps:'نادیده گر�تن همه کلاه-واژهها',ignoreDomainNames:'عبور از نامهای دامنه',mixedCase:'عبور از کلماتی مرکب از حرو� بزرگ و کوچک',mixedWithDigits:'عبور از کلمات به همراه عدد',languagesTab:'زبانها',dictionariesTab:'دیکشنریها',dic_field_name:'نام دیکشنری',dic_create:'ایجاد',dic_restore:'بازیا�ت',dic_delete:'حذ�',dic_rename:'تغییر نام',dic_info:'در ابتدا دیکشنری کاربر در کوکی ذخیره میشود. با این حال، کوکیها در اندازه محدود شدهاند. وقتی که دیکشنری کاربری بزرگ میشود و به نقطهای که نمیتواند در کوکی ذخیره شود، پس از آن دیکشنری ممکن است بر روی سرور ما ذخیره شود. برای ذخیره دیکشنری شخصی شما بر روی سرور ما، باید یک نام برای دیکشنری خود مشخص نمایید. اگر شما قبلا یک دیکشنری روی سرور ما ذخیره کردهاید، لط�ا نام آنرا درج و روی دکمه بازیا�ت کلیک نمایید.',aboutTab:'درباره'},about:{title:'درباره CKEditor',dlgTitle:'درباره CKEditor',help:'بررسی $1 برای راهنمایی.',userGuide:'راهنمای کاربران CKEditor',moreInfo:'برای کسب اطلاعات مجوز لط�ا به وب سایت ما مراجعه کنید:',copy:'حق نشر &copy; $1. کلیه حقوق مح�وظ است.'},maximize:'حداکثر کردن',minimize:'حداقل کردن',fakeobjects:{anchor:'لنگر',flash:'انیمشن �لش',iframe:'IFrame',hiddenfield:'�یلد پنهان',unknown:'شیء ناشناخته'},resize:'کشیدن برای تغییر اندازه',colordialog:{title:'انتخاب رنگ',options:'گزینههای رنگ',highlight:'متمایز',selected:'رنگ انتخاب شده',clear:'پاک کردن'},toolbarCollapse:'بستن نوار ابزار',toolbarExpand:'بازکردن نوار ابزار',toolbarGroups:{document:'سند',clipboard:'حا�ظه موقت/برگشت',editing:'در حال ویرایش',forms:'�رمها',basicstyles:'شیوههای پایه',paragraph:'بند',links:'پیوندها',insert:'ورود',styles:'شیوهها',colors:'رنگها',tools:'ابزارها'},bidi:{ltr:'نوشتار متن از چپ به راست',rtl:'نوشتار متن از راست به چپ'},docprops:{label:'ویژگیهای سند',title:'ویژگیهای سند',design:'طراحی',meta:'�راداده',chooseColor:'انتخاب',other:'<سایر>',docTitle:'عنوان ص�حه',charset:'رمزگذاری نویسهگان',charsetOther:'رمزگذاری نویسهگان دیگر',charsetASCII:'ASCII',charsetCE:'اروپای مرکزی',charsetCT:'چینی رسمی (Big5)',charsetCR:'سیریلیک',charsetGR:'یونانی',charsetJP:'ژاپنی',charsetKR:'کرهای',charsetTR:'ترکی',charsetUN:'یونیک�د (UTF-8)',charsetWE:'اروپای غربی',docType:'عنوان نوع سند',docTypeOther:'عنوان نوع سند دیگر',xhtmlDec:'شامل تعاری� XHTML',bgColor:'رنگ پسزمینه',bgImage:'URL تصویر پسزمینه',bgFixed:'پسزمینهٴ پیمایش ناپذیر',txtColor:'رنگ متن',margin:'حاشیههای ص�حه',marginTop:'بالا',marginLeft:'چپ',marginRight:'راست',marginBottom:'پایین',metaKeywords:'کلیدواژگان نمایهگذاری سند (با کاما جدا شوند)',metaDescription:'توصی� سند',metaAuthor:'نویسنده',metaCopyright:'حق انتشار',previewHtml:'<p>این یک <strong>متن نمونه</strong> است. شما در حال است�اده از <a href="javascript:void(0)">CKEditor</a> هستید.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/fi.js b/upload/public/js/3rd_party/ckeditor/lang/fi.js
new file mode 100644
index 00000000..ef83ddb9
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/fi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fi={dir:'ltr',editorTitle:'Rikastekstieditori, %1, paina ALT 0 nähdäksesi ohjeen.',toolbars:'Editorin työkalupalkit',editor:'Rikastekstieditori',source:'Koodi',newPage:'Tyhjennä',save:'Tallenna',preview:'Esikatsele',cut:'Leikkaa',copy:'Kopioi',paste:'Liitä',print:'Tulosta',underline:'Alleviivattu',bold:'Lihavoitu',italic:'Kursivoitu',selectAll:'Valitse kaikki',removeFormat:'Poista muotoilu',strike:'Yliviivattu',subscript:'Alaindeksi',superscript:'Yläindeksi',horizontalrule:'Lisää murtoviiva',pagebreak:'Lisää sivunvaihto',pagebreakAlt:'Sivunvaihto',unlink:'Poista linkki',undo:'Kumoa',redo:'Toista',common:{browseServer:'Selaa palvelinta',url:'Osoite',protocol:'Protokolla',upload:'Lisää tiedosto',uploadSubmit:'Lähetä palvelimelle',image:'Kuva',flash:'Flash-animaatio',form:'Lomake',checkbox:'Valintaruutu',radio:'Radiopainike',textField:'Tekstikenttä',textarea:'Tekstilaatikko',hiddenField:'Piilokenttä',button:'Painike',select:'Valintakenttä',imageButton:'Kuvapainike',notSet:'<ei asetettu>',id:'Tunniste',name:'Nimi',langDir:'Kielen suunta',langDirLtr:'Vasemmalta oikealle (LTR)',langDirRtl:'Oikealta vasemmalle (RTL)',langCode:'Kielikoodi',longDescr:'Pitkän kuvauksen URL',cssClass:'Tyyliluokat',advisoryTitle:'Avustava otsikko',cssStyle:'Tyyli',ok:'OK',cancel:'Peruuta',close:'Sulje',preview:'Esikatselu',generalTab:'Yleinen',advancedTab:'Lisäominaisuudet',validateNumberFailed:'Arvon pitää olla numero.',confirmNewPage:'Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?',confirmCancel:'Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?',options:'Asetukset',target:'Kohde',targetNew:'Uusi ikkuna (_blank)',targetTop:'Päällimmäinen ikkuna (_top)',targetSelf:'Sama ikkuna (_self)',targetParent:'Ylemmän tason ikkuna (_parent)',langDirLTR:'Vasemmalta oikealle (LTR)',langDirRTL:'Oikealta vasemmalle (RTL)',styles:'Tyyli',cssClasses:'Tyylitiedoston luokat',width:'Leveys',height:'Korkeus',align:'Kohdistus',alignLeft:'Vasemmalle',alignRight:'Oikealle',alignCenter:'Keskelle',alignTop:'Ylös',alignMiddle:'Keskelle',alignBottom:'Alas',invalidHeight:'Korkeuden täytyy olla numero.',invalidWidth:'Leveyden täytyy olla numero.',invalidCssLength:'Kentän "%1" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.',invalidHtmlLength:'Kentän "%1" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.',invalidInlineStyle:'Tyylille annetun arvon täytyy koostua yhdestä tai useammasta "nimi : arvo" parista, jotka ovat eroteltuna toisistaan puolipisteillä.',cssLengthTooltip:'Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).',unavailable:'%1<span class="cke_accessibility">, ei saatavissa</span>'},contextmenu:{options:'Pikavalikon ominaisuudet'},specialChar:{toolbar:'Lisää erikoismerkki',title:'Valitse erikoismerkki',options:'Erikoismerkin ominaisuudet'},link:{toolbar:'Lisää linkki/muokkaa linkkiä',other:'<muu>',menu:'Muokkaa linkkiä',title:'Linkki',info:'Linkin tiedot',target:'Kohde',upload:'Lisää tiedosto',advanced:'Lisäominaisuudet',type:'Linkkityyppi',toUrl:'Osoite',toAnchor:'Ankkuri tässä sivussa',toEmail:'Sähköposti',targetFrame:'<kehys>',targetPopup:'<popup ikkuna>',targetFrameName:'Kohdekehyksen nimi',targetPopupName:'Popup ikkunan nimi',popupFeatures:'Popup ikkunan ominaisuudet',popupResizable:'Venytettävä',popupStatusBar:'Tilarivi',popupLocationBar:'Osoiterivi',popupToolbar:'Vakiopainikkeet',popupMenuBar:'Valikkorivi',popupFullScreen:'Täysi ikkuna (IE)',popupScrollBars:'Vierityspalkit',popupDependent:'Riippuva (Netscape)',popupLeft:'Vasemmalta (px)',popupTop:'Ylhäältä (px)',id:'Tunniste',langDir:'Kielen suunta',langDirLTR:'Vasemmalta oikealle (LTR)',langDirRTL:'Oikealta vasemmalle (RTL)',acccessKey:'Pikanäppäin',name:'Nimi',langCode:'Kielen suunta',tabIndex:'Tabulaattori indeksi',advisoryTitle:'Avustava otsikko',advisoryContentType:'Avustava sisällön tyyppi',cssClasses:'Tyyliluokat',charset:'Linkitetty kirjaimisto',styles:'Tyyli',rel:'Suhde',selectAnchor:'Valitse ankkuri',anchorName:'Ankkurin nimen mukaan',anchorId:'Ankkurin ID:n mukaan',emailAddress:'Sähköpostiosoite',emailSubject:'Aihe',emailBody:'Viesti',noAnchors:'(Ei ankkureita tässä dokumentissa)',noUrl:'Linkille on kirjoitettava URL',noEmail:'Kirjoita sähköpostiosoite'},anchor:{toolbar:'Lisää ankkuri/muokkaa ankkuria',menu:'Ankkurin ominaisuudet',title:'Ankkurin ominaisuudet',name:'Nimi',errorName:'Ankkurille on kirjoitettava nimi',remove:'Poista ankkuri'},list:{numberedTitle:'Numeroidun listan ominaisuudet',bulletedTitle:'Numeroimattoman listan ominaisuudet',type:'Tyyppi',start:'Alku',validateStartNumber:'Listan ensimmäisen numeron tulee olla kokonaisluku.',circle:'Ympyrä',disc:'Levy',square:'Neliö',none:'Ei mikään',notset:'<ei asetettu>',armenian:'Armeenialainen numerointi',georgian:'Georgialainen numerointi (an, ban, gan, etc.)',lowerRoman:'Pienet roomalaiset (i, ii, iii, iv, v, jne.)',upperRoman:'Isot roomalaiset (I, II, III, IV, V, jne.)',lowerAlpha:'Pienet aakkoset (a, b, c, d, e, jne.)',upperAlpha:'Isot aakkoset (A, B, C, D, E, jne.)',lowerGreek:'Pienet kreikkalaiset (alpha, beta, gamma, jne.)',decimal:'Desimaalit (1, 2, 3, jne.)',decimalLeadingZero:'Desimaalit, alussa nolla (01, 02, 03, jne.)'},findAndReplace:{title:'Etsi ja korvaa',find:'Etsi',replace:'Korvaa',findWhat:'Etsi mitä:',replaceWith:'Korvaa tällä:',notFoundMsg:'Etsittyä tekstiä ei löytynyt.',findOptions:'Hakuasetukset',matchCase:'Sama kirjainkoko',matchWord:'Koko sana',matchCyclic:'Kierrä ympäri',replaceAll:'Korvaa kaikki',replaceSuccessMsg:'%1 esiintymä(ä) korvattu.'},table:{toolbar:'Taulu',title:'Taulun ominaisuudet',menu:'Taulun ominaisuudet',deleteTable:'Poista taulu',rows:'Rivit',columns:'Sarakkeet',border:'Rajan paksuus',widthPx:'pikseliä',widthPc:'prosenttia',widthUnit:'leveysyksikkö',cellSpace:'Solujen väli',cellPad:'Solujen sisennys',caption:'Otsikko',summary:'Yhteenveto',headers:'Ylätunnisteet',headersNone:'Ei',headersColumn:'Ensimmäinen sarake',headersRow:'Ensimmäinen rivi',headersBoth:'Molemmat',invalidRows:'Rivien määrän täytyy olla suurempi kuin 0.',invalidCols:'Sarakkeiden määrän täytyy olla suurempi kuin 0.',invalidBorder:'Reunan koon täytyy olla numero.',invalidWidth:'Taulun leveyden täytyy olla numero.',invalidHeight:'Taulun korkeuden täytyy olla numero.',invalidCellSpacing:'Solujen välin täytyy olla numero.',invalidCellPadding:'Solujen sisennyksen täytyy olla numero.',cell:{menu:'Solu',insertBefore:'Lisää solu eteen',insertAfter:'Lisää solu perään',deleteCell:'Poista solut',merge:'Yhdistä solut',mergeRight:'Yhdistä oikealla olevan kanssa',mergeDown:'Yhdistä alla olevan kanssa',splitHorizontal:'Jaa solu vaakasuunnassa',splitVertical:'Jaa solu pystysuunnassa',title:'Solun ominaisuudet',cellType:'Solun tyyppi',rowSpan:'Rivin jatkuvuus',colSpan:'Solun jatkuvuus',wordWrap:'Rivitys',hAlign:'Horisontaali kohdistus',vAlign:'Vertikaali kohdistus',alignBaseline:'Alas (teksti)',bgColor:'Taustan väri',borderColor:'Reunan väri',data:'Data',header:'Ylätunniste',yes:'Kyllä',no:'Ei',invalidWidth:'Solun leveyden täytyy olla numero.',invalidHeight:'Solun korkeuden täytyy olla numero.',invalidRowSpan:'Rivin jatkuvuuden täytyy olla kokonaisluku.',invalidColSpan:'Solun jatkuvuuden täytyy olla kokonaisluku.',chooseColor:'Valitse'},row:{menu:'Rivi',insertBefore:'Lisää rivi yläpuolelle',insertAfter:'Lisää rivi alapuolelle',deleteRow:'Poista rivit'},column:{menu:'Sarake',insertBefore:'Lisää sarake vasemmalle',insertAfter:'Lisää sarake oikealle',deleteColumn:'Poista sarakkeet'}},button:{title:'Painikkeen ominaisuudet',text:'Teksti (arvo)',type:'Tyyppi',typeBtn:'Painike',typeSbm:'Lähetä',typeRst:'Tyhjennä'},checkboxAndRadio:{checkboxTitle:'Valintaruudun ominaisuudet',radioTitle:'Radiopainikkeen ominaisuudet',value:'Arvo',selected:'Valittu'},form:{title:'Lomakkeen ominaisuudet',menu:'Lomakkeen ominaisuudet',action:'Toiminto',method:'Tapa',encoding:'Enkoodaus'},select:{title:'Valintakentän ominaisuudet',selectInfo:'Info',opAvail:'Ominaisuudet',value:'Arvo',size:'Koko',lines:'Rivit',chkMulti:'Salli usea valinta',opText:'Teksti',opValue:'Arvo',btnAdd:'Lisää',btnModify:'Muuta',btnUp:'Ylös',btnDown:'Alas',btnSetValue:'Aseta valituksi',btnDelete:'Poista'},textarea:{title:'Tekstilaatikon ominaisuudet',cols:'Sarakkeita',rows:'Rivejä'},textfield:{title:'Tekstikentän ominaisuudet',name:'Nimi',value:'Arvo',charWidth:'Leveys',maxChars:'Maksimi merkkimäärä',type:'Tyyppi',typeText:'Teksti',typePass:'Salasana'},hidden:{title:'Piilokentän ominaisuudet',name:'Nimi',value:'Arvo'},image:{title:'Kuvan ominaisuudet',titleButton:'Kuvapainikkeen ominaisuudet',menu:'Kuvan ominaisuudet',infoTab:'Kuvan tiedot',btnUpload:'Lähetä palvelimelle',upload:'Lisää kuva',alt:'Vaihtoehtoinen teksti',lockRatio:'Lukitse suhteet',resetSize:'Alkuperäinen koko',border:'Kehys',hSpace:'Vaakatila',vSpace:'Pystytila',alertUrl:'Kirjoita kuvan osoite (URL)',linkTab:'Linkki',button2Img:'Haluatko muuntaa valitun kuvanäppäimen kuvaksi?',img2Button:'Haluatko muuntaa valitun kuvan kuvanäppäimeksi?',urlMissing:'Kuvan lähdeosoite puuttuu.',validateBorder:'Kehyksen täytyy olla kokonaisluku.',validateHSpace:'HSpace-määrityksen täytyy olla kokonaisluku.',validateVSpace:'VSpace-määrityksen täytyy olla kokonaisluku.'},flash:{properties:'Flash-ominaisuudet',propertiesTab:'Ominaisuudet',title:'Flash ominaisuudet',chkPlay:'Automaattinen käynnistys',chkLoop:'Toisto',chkMenu:'Näytä Flash-valikko',chkFull:'Salli kokoruututila',scale:'Levitä',scaleAll:'Näytä kaikki',scaleNoBorder:'Ei rajaa',scaleFit:'Tarkka koko',access:'Skriptien pääsy',accessAlways:'Aina',accessSameDomain:'Sama verkkotunnus',accessNever:'Ei koskaan',alignAbsBottom:'Aivan alas',alignAbsMiddle:'Aivan keskelle',alignBaseline:'Alas (teksti)',alignTextTop:'Ylös (teksti)',quality:'Laatu',qualityBest:'Paras',qualityHigh:'Korkea',qualityAutoHigh:'Automaattinen korkea',qualityMedium:'Keskitaso',qualityAutoLow:'Automaattinen matala',qualityLow:'Matala',windowModeWindow:'Ikkuna',windowModeOpaque:'Läpinäkyvyys',windowModeTransparent:'Läpinäkyvä',windowMode:'Ikkuna tila',flashvars:'Muuttujat Flash:lle',bgcolor:'Taustaväri',hSpace:'Vaakatila',vSpace:'Pystytila',validateSrc:'Linkille on kirjoitettava URL',validateHSpace:'Vaakatilan täytyy olla numero.',validateVSpace:'Pystytilan täytyy olla numero.'},spellCheck:{toolbar:'Tarkista oikeinkirjoitus',title:'Oikoluku',notAvailable:'Valitettavasti oikoluku ei ole käytössä tällä hetkellä.',errorLoading:'Virhe ladattaessa oikolukupalvelua isännältä: %s.',notInDic:'Ei sanakirjassa',changeTo:'Vaihda',btnIgnore:'Jätä huomioimatta',btnIgnoreAll:'Jätä kaikki huomioimatta',btnReplace:'Korvaa',btnReplaceAll:'Korvaa kaikki',btnUndo:'Kumoa',noSuggestions:'Ei ehdotuksia',progress:'Tarkistus käynnissä...',noMispell:'Tarkistus valmis: Ei virheitä',noChanges:'Tarkistus valmis: Yhtään sanaa ei muutettu',oneChange:'Tarkistus valmis: Yksi sana muutettiin',manyChanges:'Tarkistus valmis: %1 sanaa muutettiin',ieSpellDownload:'Oikeinkirjoituksen tarkistusta ei ole asennettu. Haluatko ladata sen nyt?'},smiley:{toolbar:'Hymiö',title:'Lisää hymiö',options:'Hymiön ominaisuudet'},elementsPath:{eleLabel:'Elementin polku',eleTitle:'%1 elementti'},numberedlist:'Numerointi',bulletedlist:'Luottelomerkit',indent:'Suurenna sisennystä',outdent:'Pienennä sisennystä',justify:{left:'Tasaa vasemmat reunat',center:'Keskitä',right:'Tasaa oikeat reunat',block:'Tasaa molemmat reunat'},blockquote:'Lainaus',clipboard:{title:'Liitä',cutError:'Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).',copyError:'Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).',pasteMsg:'Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.',securityMsg:'Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.',pasteArea:'Leikealue'},pastefromword:{confirmCleanup:'Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)',toolbar:'Liitä Word-dokumentista',title:'Liitä Word-dokumentista',error:'Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia'},pasteText:{button:'Liitä tekstinä',title:'Liitä tekstinä'},templates:{button:'Pohjat',title:'Sisältöpohjat',options:'Sisältöpohjan ominaisuudet',insertOption:'Korvaa editorin koko sisältö',selectPromptMsg:'Valitse pohja editoriin<br>(aiempi sisältö menetetään):',emptyListMsg:'(Ei määriteltyjä pohjia)'},showBlocks:'Näytä elementit',stylesCombo:{label:'Tyyli',panelTitle:'Muotoilujen tyylit',panelTitle1:'Lohkojen tyylit',panelTitle2:'Rivinsisäiset tyylit',panelTitle3:'Objektien tyylit'},format:{label:'Muotoilu',panelTitle:'Muotoilu',tag_p:'Normaali',tag_pre:'Muotoiltu',tag_address:'Osoite',tag_h1:'Otsikko 1',tag_h2:'Otsikko 2',tag_h3:'Otsikko 3',tag_h4:'Otsikko 4',tag_h5:'Otsikko 5',tag_h6:'Otsikko 6',tag_div:'Normaali (DIV)'},div:{title:'Luo div-kehikko',toolbar:'Luo div-kehikko',cssClassInputLabel:'Tyylitiedoston luokat',styleSelectLabel:'Tyyli',IdInputLabel:'Id',languageCodeInputLabel:' Kielen koodi',inlineStyleInputLabel:'Sisätyyli',advisoryTitleInputLabel:'Ohjeistava otsikko',langDirLabel:'Kielen suunta',langDirLTRLabel:'Vasemmalta oikealle (LTR)',langDirRTLLabel:'Oikealta vasemmalle (RTL)',edit:'Muokkaa Diviä',remove:'Poista Div'},iframe:{title:'IFrame-kehyksen ominaisuudet',toolbar:'IFrame-kehys',noUrl:'Anna IFrame-kehykselle lähdeosoite (src)',scrolling:'Näytä vierityspalkit',border:'Näytä kehyksen reunat'},font:{label:'Kirjaisinlaji',voiceLabel:'Kirjaisinlaji',panelTitle:'Kirjaisinlaji'},fontSize:{label:'Koko',voiceLabel:'Kirjaisimen koko',panelTitle:'Koko'},colorButton:{textColorTitle:'Tekstiväri',bgColorTitle:'Taustaväri',panelTitle:'Värit',auto:'Automaattinen',more:'Lisää värejä...'},colors:{'000':'Musta',800000:'Kastanjanruskea','8B4513':'Satulanruskea','2F4F4F':'Tumma liuskekivenharmaa','008080':'Sinivihreä','000080':'Laivastonsininen','4B0082':'Indigonsininen',696969:'Tummanharmaa',B22222:'Tiili',A52A2A:'Ruskea',DAA520:'Kultapiisku','006400':'Tummanvihreä','40E0D0':'Turkoosi','0000CD':'Keskisininen',800080:'Purppura',808080:'Harmaa',F00:'Punainen',FF8C00:'Tumma oranssi',FFD700:'Kulta','008000':'Vihreä','0FF':'Syaani','00F':'Sininen',EE82EE:'Violetti',A9A9A9:'Tummanharmaa',FFA07A:'Vaaleanlohenpunainen',FFA500:'Oranssi',FFFF00:'Keltainen','00FF00':'Limetin vihreä',AFEEEE:'Haalea turkoosi',ADD8E6:'Vaaleansininen',DDA0DD:'Luumu',D3D3D3:'Vaaleanharmaa',FFF0F5:'Laventelinpunainen',FAEBD7:'Antiikinvalkoinen',FFFFE0:'Vaaleankeltainen',F0FFF0:'Hunajameloni',F0FFFF:'Asurinsininen',F0F8FF:'Alice Blue -sininen',E6E6FA:'Lavanteli',FFF:'Valkoinen'},scayt:{title:'Oikolue kirjoitettaessa',opera_title:'Opera ei tue tätä ominaisuutta',enable:'Ota käyttöön oikoluku kirjoitettaessa',disable:'Poista käytöstä oikoluku kirjoitetaessa',about:'Tietoja oikoluvusta kirjoitetaessa',toggle:'Vaihda oikoluku kirjoittaessa tilaa',options:'Asetukset',langs:'Kielet',moreSuggestions:'Lisää ehdotuksia',ignore:'Ohita',ignoreAll:'Ohita kaikki',addWord:'Lisää sana',emptyDic:'Sanakirjan nimi on annettava.',optionsTab:'Asetukset',allCaps:'Ohita sanat, jotka on kirjoitettu kokonaan isoilla kirjaimilla',ignoreDomainNames:'Ohita verkkotunnukset',mixedCase:'Ohita sanat, joissa on sekoitettu isoja ja pieniä kirjaimia',mixedWithDigits:'Ohita sanat, joissa on numeroita',languagesTab:'Kielet',dictionariesTab:'Sanakirjat',dic_field_name:'Sanakirjan nimi',dic_create:'Luo',dic_restore:'Palauta',dic_delete:'Poista',dic_rename:'Nimeä uudelleen',dic_info:'Oletuksena sanakirjat tallennetaan evästeeseen, mutta evästeiden koko on kuitenkin rajallinen. Sanakirjan kasvaessa niin suureksi, ettei se enää mahdu evästeeseen, sanakirja täytyy tallentaa palvelimellemme. Tallentaaksesi sanakirjasi palvelimellemme tulee sinun antaa sille nimi. Jos olet jo tallentanut sanakirjan, anna sen nimi ja klikkaa Palauta-painiketta',aboutTab:'Tietoa'},about:{title:'Tietoa CKEditorista',dlgTitle:'Tietoa CKEditorista',help:'Katso ohjeet: $1.',userGuide:'CKEditorin käyttäjäopas',moreInfo:'Lisenssitiedot löytyvät kotisivuiltamme:',copy:'Copyright &copy; $1. Kaikki oikeuden pidätetään.'},maximize:'Suurenna',minimize:'Pienennä',fakeobjects:{anchor:'Ankkuri',flash:'Flash animaatio',iframe:'IFrame-kehys',hiddenfield:'Piilokenttä',unknown:'Tuntematon objekti'},resize:'Raahaa muuttaaksesi kokoa',colordialog:{title:'Valitse väri',options:'Värin ominaisuudet',highlight:'Korostus',selected:'Valittu',clear:'Poista'},toolbarCollapse:'Kutista työkalupalkki',toolbarExpand:'Laajenna työkalupalkki',toolbarGroups:{document:'Dokumentti',clipboard:'Leikepöytä/Kumoa',editing:'Muokkaus',forms:'Lomakkeet',basicstyles:'Perustyylit',paragraph:'Kappale',links:'Linkit',insert:'Lisää',styles:'Tyylit',colors:'Värit',tools:'Työkalut'},bidi:{ltr:'Tekstin suunta vasemmalta oikealle',rtl:'Tekstin suunta oikealta vasemmalle'},docprops:{label:'Dokumentin ominaisuudet',title:'Dokumentin ominaisuudet',design:'Sommittelu',meta:'Metatieto',chooseColor:'Valitse',other:'<muu>',docTitle:'Sivun nimi',charset:'Merkistökoodaus',charsetOther:'Muu merkistökoodaus',charsetASCII:'ASCII',charsetCE:'Keskieurooppalainen',charsetCT:'Kiina, perinteinen (Big5)',charsetCR:'Kyrillinen',charsetGR:'Kreikka',charsetJP:'Japani',charsetKR:'Korealainen',charsetTR:'Turkkilainen',charsetUN:'Unicode (UTF-8)',charsetWE:'Länsieurooppalainen',docType:'Dokumentin tyyppi',docTypeOther:'Muu dokumentin tyyppi',xhtmlDec:'Lisää XHTML julistukset',bgColor:'Taustaväri',bgImage:'Taustakuva',bgFixed:'Paikallaanpysyvä tausta',txtColor:'Tekstiväri',margin:'Sivun marginaalit',marginTop:'Ylä',marginLeft:'Vasen',marginRight:'Oikea',marginBottom:'Ala',metaKeywords:'Hakusanat (pilkulla erotettuna)',metaDescription:'Kuvaus',metaAuthor:'Tekijä',metaCopyright:'Tekijänoikeudet',previewHtml:'<p>Tämä on <strong>esimerkkitekstiä</strong>. Käytät juuri <a href="javascript:void(0)">CKEditoria</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/fo.js b/upload/public/js/3rd_party/ckeditor/lang/fo.js
new file mode 100644
index 00000000..e694ad0c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/fo.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fo={dir:'ltr',editorTitle:'Rich text editor, %1, trýst ALT og 0 fyri vegleiðing.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kelda',newPage:'Nýggj síða',save:'Goym',preview:'Frumsýning',cut:'Kvett',copy:'Avrita',paste:'Innrita',print:'Prenta',underline:'Undirstrikað',bold:'Feit skrift',italic:'Skráskrift',selectAll:'Markera alt',removeFormat:'Strika sniðgeving',strike:'Yvirstrikað',subscript:'Lækkað skrift',superscript:'Hækkað skrift',horizontalrule:'Ger vatnrætta linju',pagebreak:'Ger síðuskift',pagebreakAlt:'Síðuskift',unlink:'Strika tilknýti',undo:'Angra',redo:'Vend aftur',common:{browseServer:'Ambætarakagi',url:'URL',protocol:'Protokoll',upload:'Send til ambætaran',uploadSubmit:'Send til ambætaran',image:'Myndir',flash:'Flash',form:'Formur',checkbox:'Flugubein',radio:'Radioknøttur',textField:'Tekstteigur',textarea:'Tekstumráði',hiddenField:'Fjaldur teigur',button:'Knøttur',select:'Valskrá',imageButton:'Myndaknøttur',notSet:'<ikki sett>',id:'Id',name:'Navn',langDir:'Tekstkós',langDirLtr:'Frá vinstru til høgru (LTR)',langDirRtl:'Frá høgru til vinstru (RTL)',langCode:'Málkoda',longDescr:'Víðkað URL frágreiðing',cssClass:'Typografi klassar',advisoryTitle:'Vegleiðandi heiti',cssStyle:'Typografi',ok:'Góðkent',cancel:'Avlýst',close:'Lat aftur',preview:'Frumsýn',generalTab:'Generelt',advancedTab:'Fjølbroytt',validateNumberFailed:'Hetta er ikki eitt tal.',confirmNewPage:'Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?',confirmCancel:'Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?',options:'Options',target:'Target',targetNew:'Nýtt vindeyga (_blank)',targetTop:'Vindeyga ovast (_top)',targetSelf:'Sama vindeyga (_self)',targetParent:'Upphavligt vindeyga (_parent)',langDirLTR:'Frá vinstru til høgru (LTR)',langDirRTL:'Frá høgru til vinstru (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Breidd',height:'Hædd',align:'Justering',alignLeft:'Vinstra',alignRight:'Høgra',alignCenter:'Miðsett',alignTop:'Ovast',alignMiddle:'Miðja',alignBottom:'Botnur',invalidHeight:'Hædd má vera eitt tal.',invalidWidth:'Breidd má vera eitt tal.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ikki tøkt</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Set inn sertekn',title:'Vel sertekn',options:'Møguleikar við serteknum'},link:{toolbar:'Ger/broyt tilknýti',other:'<annað>',menu:'Broyt tilknýti',title:'Tilknýti',info:'Tilknýtis upplýsingar',target:'Target',upload:'Send til ambætaran',advanced:'Fjølbroytt',type:'Tilknýtisslag',toUrl:'URL',toAnchor:'Tilknýti til marknastein í tekstinum',toEmail:'Teldupostur',targetFrame:'<ramma>',targetPopup:'<popup vindeyga>',targetFrameName:'Vís navn vindeygans',targetPopupName:'Popup vindeygans navn',popupFeatures:'Popup vindeygans víðkaðu eginleikar',popupResizable:'Stødd kann broytast',popupStatusBar:'Støðufrágreiðingarbjálki',popupLocationBar:'Adressulinja',popupToolbar:'Amboðsbjálki',popupMenuBar:'Skrábjálki',popupFullScreen:'Fullur skermur (IE)',popupScrollBars:'Rullibjálki',popupDependent:'Bundið (Netscape)',popupLeft:'Frástøða frá vinstru',popupTop:'Frástøða frá íerva',id:'Id',langDir:'Tekstkós',langDirLTR:'Frá vinstru til høgru (LTR)',langDirRTL:'Frá høgru til vinstru (RTL)',acccessKey:'Snarvegisknöttur',name:'Navn',langCode:'Tekstkós',tabIndex:'Tabulator indeks',advisoryTitle:'Vegleiðandi heiti',advisoryContentType:'Vegleiðandi innihaldsslag',cssClasses:'Typografi klassar',charset:'Atknýtt teknsett',styles:'Typografi',rel:'Relationship',selectAnchor:'Vel ein marknastein',anchorName:'Eftir navni á marknasteini',anchorId:'Eftir element Id',emailAddress:'Teldupost-adressa',emailSubject:'Evni',emailBody:'Breyðtekstur',noAnchors:'(Eingir marknasteinar eru í hesum dokumentið)',noUrl:'Vinarliga skriva tilknýti (URL)',noEmail:'Vinarliga skriva teldupost-adressu'},anchor:{toolbar:'Ger/broyt marknastein',menu:'Eginleikar fyri marknastein',title:'Eginleikar fyri marknastein',name:'Heiti marknasteinsins',errorName:'Vinarliga rita marknasteinsins heiti',remove:'Remove Anchor'},list:{numberedTitle:'Eginleikar fyri lista við tølum',bulletedTitle:'Eginleikar fyri lista við prikkum',type:'Slag',start:'Byrjan',validateStartNumber:'Byrjunartalið fyri lista má vera eitt heiltal.',circle:'Sirkul',disc:'Disc',square:'Fýrkantur',none:'Einki',notset:'<ikki sett>',armenian:'Armensk talskipan',georgian:'Georgisk talskipan (an, ban, gan, osv.)',lowerRoman:'Lítil rómaratøl (i, ii, iii, iv, v, etc.)',upperRoman:'Stór rómaratøl (I, II, III, IV, V, etc.)',lowerAlpha:'Lítlir bókstavir (a, b, c, d, e, etc.)',upperAlpha:'Stórir bókstavir (A, B, C, D, E, etc.)',lowerGreek:'Grikskt við lítlum (alpha, beta, gamma, etc.)',decimal:'Vanlig tøl (1, 2, 3, etc.)',decimalLeadingZero:'Tøl við null frammanfyri (01, 02, 03, etc.)'},findAndReplace:{title:'Finn og broyt',find:'Leita',replace:'Yvirskriva',findWhat:'Finn:',replaceWith:'Yvirskriva við:',notFoundMsg:'Leititeksturin varð ikki funnin',findOptions:'Find Options',matchCase:'Munur á stórum og smáum bókstavum',matchWord:'Bert heil orð',matchCyclic:'Match cyclic',replaceAll:'Yvirskriva alt',replaceSuccessMsg:'%1 úrslit broytt.'},table:{toolbar:'Tabell',title:'Eginleikar fyri tabell',menu:'Eginleikar fyri tabell',deleteTable:'Strika tabell',rows:'Røðir',columns:'Kolonnur',border:'Bordabreidd',widthPx:'pixels',widthPc:'prosent',widthUnit:'breiddar unit',cellSpace:'Fjarstøða millum meskar',cellPad:'Meskubreddi',caption:'Tabellfrágreiðing',summary:'Samandráttur',headers:'Yvirskriftir',headersNone:'Eingin',headersColumn:'Fyrsta kolonna',headersRow:'Fyrsta rað',headersBoth:'Báðir',invalidRows:'Talið av røðum má vera eitt tal størri enn 0.',invalidCols:'Talið av kolonnum má vera eitt tal størri enn 0.',invalidBorder:'Borda-stødd má vera eitt tal.',invalidWidth:'Tabell-breidd má vera eitt tal.',invalidHeight:'Tabell-hædd má vera eitt tal.',invalidCellSpacing:'Cell spacing má vera eitt tal.',invalidCellPadding:'Cell padding má vera eitt tal.',cell:{menu:'Meski',insertBefore:'Set meska inn áðrenn',insertAfter:'Set meska inn aftaná',deleteCell:'Strika meskar',merge:'Flætta meskar',mergeRight:'Flætta meskar til høgru',mergeDown:'Flætta saman',splitHorizontal:'Kloyv meska vatnrætt',splitVertical:'Kloyv meska loddrætt',title:'Mesku eginleikar',cellType:'Mesku slag',rowSpan:'Ræð spenni',colSpan:'Kolonnu spenni',wordWrap:'Orðkloyving',hAlign:'Horisontal plasering',vAlign:'Loddrøtt plasering',alignBaseline:'Basislinja',bgColor:'Bakgrundslitur',borderColor:'Bordalitur',data:'Data',header:'Header',yes:'Ja',no:'Nei',invalidWidth:'Meskubreidd má vera eitt tal.',invalidHeight:'Meskuhædd má vera eitt tal.',invalidRowSpan:'Raðspennið má vera eitt heiltal.',invalidColSpan:'Kolonnuspennið má vera eitt heiltal.',chooseColor:'Vel'},row:{menu:'Rað',insertBefore:'Set rað inn áðrenn',insertAfter:'Set rað inn aftaná',deleteRow:'Strika røðir'},column:{menu:'Kolonna',insertBefore:'Set kolonnu inn áðrenn',insertAfter:'Set kolonnu inn aftaná',deleteColumn:'Strika kolonnur'}},button:{title:'Eginleikar fyri knøtt',text:'Tekstur',type:'Slag',typeBtn:'Knøttur',typeSbm:'Send',typeRst:'Nullstilla'},checkboxAndRadio:{checkboxTitle:'Eginleikar fyri flugubein',radioTitle:'Eginleikar fyri radioknøtt',value:'Virði',selected:'Valt'},form:{title:'Eginleikar fyri Form',menu:'Eginleikar fyri Form',action:'Hending',method:'Háttur',encoding:'Encoding'},select:{title:'Eginleikar fyri valskrá',selectInfo:'Upplýsingar',opAvail:'Tøkir møguleikar',value:'Virði',size:'Stødd',lines:'Linjur',chkMulti:'Loyv fleiri valmøguleikum samstundis',opText:'Tekstur',opValue:'Virði',btnAdd:'Legg afturat',btnModify:'Broyt',btnUp:'Upp',btnDown:'Niður',btnSetValue:'Set sum valt virði',btnDelete:'Strika'},textarea:{title:'Eginleikar fyri tekstumráði',cols:'kolonnur',rows:'røðir'},textfield:{title:'Eginleikar fyri tekstteig',name:'Navn',value:'Virði',charWidth:'Breidd (sjónlig tekn)',maxChars:'Mest loyvdu tekn',type:'Slag',typeText:'Tekstur',typePass:'Loyniorð'},hidden:{title:'Eginleikar fyri fjaldan teig',name:'Navn',value:'Virði'},image:{title:'Myndaeginleikar',titleButton:'Eginleikar fyri myndaknøtt',menu:'Myndaeginleikar',infoTab:'Myndaupplýsingar',btnUpload:'Send til ambætaran',upload:'Send',alt:'Alternativur tekstur',lockRatio:'Læs lutfallið',resetSize:'Upprunastødd',border:'Bordi',hSpace:'Høgri breddi',vSpace:'Vinstri breddi',alertUrl:'Rita slóðina til myndina',linkTab:'Tilknýti',button2Img:'Skal valdi myndaknøttur gerast til vanliga mynd?',img2Button:'Skal valda mynd gerast til myndaknøtt?',urlMissing:'URL til mynd manglar.',validateBorder:'Bordi má vera eitt heiltal.',validateHSpace:'HSpace má vera eitt heiltal.',validateVSpace:'VSpace má vera eitt heiltal.'},flash:{properties:'Flash eginleikar',propertiesTab:'Eginleikar',title:'Flash eginleikar',chkPlay:'Avspælingin byrjar sjálv',chkLoop:'Endurspæl',chkMenu:'Ger Flash skrá virkna',chkFull:'Loyv fullan skerm',scale:'Skalering',scaleAll:'Vís alt',scaleNoBorder:'Eingin bordi',scaleFit:'Neyv skalering',access:'Script atgongd',accessAlways:'Altíð',accessSameDomain:'Sama navnaøki',accessNever:'Ongantíð',alignAbsBottom:'Abs botnur',alignAbsMiddle:'Abs miðja',alignBaseline:'Basislinja',alignTextTop:'Tekst toppur',quality:'Góðska',qualityBest:'Besta',qualityHigh:'Høg',qualityAutoHigh:'Auto høg',qualityMedium:'Meðal',qualityAutoLow:'Auto Lág',qualityLow:'Lág',windowModeWindow:'Rútur',windowModeOpaque:'Ikki transparent',windowModeTransparent:'Transparent',windowMode:'Slag av rúti',flashvars:'Variablar fyri Flash',bgcolor:'Bakgrundslitur',hSpace:'Høgri breddi',vSpace:'Vinstri breddi',validateSrc:'Vinarliga skriva tilknýti (URL)',validateHSpace:'HSpace má vera eitt tal.',validateVSpace:'VSpace má vera eitt tal.'},spellCheck:{toolbar:'Kanna stavseting',title:'Kanna stavseting',notAvailable:'Tíverri, ikki tøkt í løtuni.',errorLoading:'Feilur við innlesing av application service host: %s.',notInDic:'Finst ikki í orðabókini',changeTo:'Broyt til',btnIgnore:'Forfjóna',btnIgnoreAll:'Forfjóna alt',btnReplace:'Yvirskriva',btnReplaceAll:'Yvirskriva alt',btnUndo:'Angra',noSuggestions:'- Einki uppskot -',progress:'Rættstavarin arbeiðir...',noMispell:'Rættstavarain liðugur: Eingin feilur funnin',noChanges:'Rættstavarain liðugur: Einki orð varð broytt',oneChange:'Rættstavarain liðugur: Eitt orð er broytt',manyChanges:'Rættstavarain liðugur: %1 orð broytt',ieSpellDownload:'Rættstavarin er ikki tøkur í tekstviðgeranum. Vilt tú heinta hann nú?'},smiley:{toolbar:'Smiley',title:'Vel Smiley',options:'Møguleikar fyri Smiley'},elementsPath:{eleLabel:'Slóð til elementir',eleTitle:'%1 element'},numberedlist:'Talmerktur listi',bulletedlist:'Punktmerktur listi',indent:'Økja reglubrotarinntriv',outdent:'Minka reglubrotarinntriv',justify:{left:'Vinstrasett',center:'Miðsett',right:'Høgrasett',block:'Javnir tekstkantar'},blockquote:'Blockquote',clipboard:{title:'Innrita',cutError:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).',copyError:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).',pasteMsg:'Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.',securityMsg:'Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.',pasteArea:'Avritingarumráði'},pastefromword:{confirmCleanup:'Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?',toolbar:'Innrita frá Word',title:'Innrita frá Word',error:'Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil'},pasteText:{button:'Innrita som reinan tekst',title:'Innrita som reinan tekst'},templates:{button:'Skabelónir',title:'Innihaldsskabelónir',options:'Møguleikar fyri Template',insertOption:'Yvirskriva núverandi innihald',selectPromptMsg:'Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):',emptyListMsg:'(Ongar skabelónir tøkar)'},showBlocks:'Vís blokkar',stylesCombo:{label:'Typografi',panelTitle:'Formatterings stílir',panelTitle1:'Blokk stílir',panelTitle2:'Inline stílir',panelTitle3:'Object stílir'},format:{label:'Skriftsnið',panelTitle:'Skriftsnið',tag_p:'Vanligt',tag_pre:'Sniðgivið',tag_address:'Adressa',tag_h1:'Yvirskrift 1',tag_h2:'Yvirskrift 2',tag_h3:'Yvirskrift 3',tag_h4:'Yvirskrift 4',tag_h5:'Yvirskrift 5',tag_h6:'Yvirskrift 6',tag_div:'Vanligt (DIV)'},div:{title:'Ger Div Container',toolbar:'Ger Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Vinstru til høgru (LTR)',langDirRTLLabel:'Høgru til vinstru (RTL)',edit:'Redigera Div',remove:'Strika Div'},iframe:{title:'Møguleikar fyri IFrame',toolbar:'IFrame',noUrl:'Vinarliga skriva URL til iframe',scrolling:'Loyv scrollbars',border:'Vís frame kant'},font:{label:'Skrift',voiceLabel:'Skrift',panelTitle:'Skrift'},fontSize:{label:'Skriftstødd',voiceLabel:'Skriftstødd',panelTitle:'Skriftstødd'},colorButton:{textColorTitle:'Tekstlitur',bgColorTitle:'Bakgrundslitur',panelTitle:'Litir',auto:'Automatiskt',more:'Fleiri litir...'},colors:{'000':'Svart',800000:'Maroon','8B4513':'Saðilsbrúnt','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Myrkagrátt',B22222:'Fire Brick',A52A2A:'Brúnt',DAA520:'Gullstavur','006400':'Myrkagrønt','40E0D0':'Turquoise','0000CD':'Meðal blátt',800080:'Purple',808080:'Grátt',F00:'Reytt',FF8C00:'Myrkt appelsingult',FFD700:'Gull','008000':'Grønt','0FF':'Cyan','00F':'Blátt',EE82EE:'Violet',A9A9A9:'Døkt grátt',FFA07A:'Ljósur laksur',FFA500:'Appelsingult',FFFF00:'Gult','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Ljósablátt',DDA0DD:'Plum',D3D3D3:'Ljósagrátt',FFF0F5:'Lavender Blush',FAEBD7:'Klassiskt hvítt',FFFFE0:'Ljósagult',F0FFF0:'Hunangsdøggur',F0FFFF:'Azure',F0F8FF:'Alice Blátt',E6E6FA:'Lavender',FFF:'Hvítt'},scayt:{title:'Kanna stavseting, meðan tú skrivar',opera_title:'Ikki stuðlað í Opera',enable:'Loyv SCAYT',disable:'Nokta SCAYT',about:'Um SCAYT',toggle:'Toggle SCAYT',options:'Uppseting',langs:'Tungumál',moreSuggestions:'Fleiri tilráðingar',ignore:'Ignorera',ignoreAll:'Ignorera alt',addWord:'Legg orð afturat',emptyDic:'Heiti á orðabók eigur ikki at vera tómt.',optionsTab:'Uppseting',allCaps:'Loyp orð við bert stórum stavum um',ignoreDomainNames:'loyp økisnøvn um',mixedCase:'Loyp orð við blandaðum smáum og stórum stavum um',mixedWithDigits:'Loyp orð við tølum um',languagesTab:'Tungumál',dictionariesTab:'Orðabøkur',dic_field_name:'Orðabókanavn',dic_create:'Upprætta nýggja',dic_restore:'Endurskapa',dic_delete:'Strika',dic_rename:'Broyt',dic_info:'Upprunaliga er brúkara-orðabókin goymd í eini cookie í tínum egna kaga. Men hesar eru avmarkaðar í stødd. Tá brúkara-orðabókin veksur seg ov stóra til eina cookie, so er møguligt at goyma hana á ambætara okkara. Fyri at goyma persónligu orðabókina á ambætaranum eigur tú at velja eitt navn til tína skuffu. Hevur tú longu goymt eina orðabók, so vinarliga skriva navnið og klikk á knøttin Endurskapa.',aboutTab:'Um'},about:{title:'Um CKEditor',dlgTitle:'Um CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Licens upplýsingar finnast á heimasíðu okkara:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maksimera',minimize:'Minimera',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Fjaldur teigur',unknown:'Ókent Object'},resize:'Drag fyri at broyta stødd',colordialog:{title:'Vel lit',options:'Litmøguleikar',highlight:'Framheva',selected:'Valdur litur',clear:'Strika'},toolbarCollapse:'Lat Toolbar aftur',toolbarExpand:'Vís Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Tekstkós frá vinstru til høgru',rtl:'Tekstkós frá høgru til vinstru'},docprops:{label:'Eginleikar fyri dokument',title:'Eginleikar fyri dokument',design:'Design',meta:'META-upplýsingar',chooseColor:'Vel',other:'<annað>',docTitle:'Síðuheiti',charset:'Teknsett koda',charsetOther:'Onnur teknsett koda',charsetASCII:'ASCII',charsetCE:'Miðeuropa',charsetCT:'Kinesiskt traditionelt (Big5)',charsetCR:'Cyrilliskt',charsetGR:'Grikst',charsetJP:'Japanskt',charsetKR:'Koreanskt',charsetTR:'Turkiskt',charsetUN:'Unicode (UTF-8)',charsetWE:'Vestureuropa',docType:'Dokumentslag yvirskrift',docTypeOther:'Annað dokumentslag yvirskrift',xhtmlDec:'Viðfest XHTML deklaratiónir',bgColor:'Bakgrundslitur',bgImage:'Leið til bakgrundsmynd (URL)',bgFixed:'Læst bakgrund (rullar ikki)',txtColor:'Tekstlitur',margin:'Síðubreddar',marginTop:'Ovast',marginLeft:'Vinstra',marginRight:'Høgra',marginBottom:'Niðast',metaKeywords:'Dokument index lyklaorð (sundurbýtt við komma)',metaDescription:'Dokumentlýsing',metaAuthor:'Høvundur',metaCopyright:'Upphavsrættindi',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/fr-ca.js b/upload/public/js/3rd_party/ckeditor/lang/fr-ca.js
new file mode 100644
index 00000000..1996932b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/fr-ca.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['fr-ca']={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Source',newPage:'Nouvelle page',save:'Sauvegarder',preview:'Previsualiser',cut:'Couper',copy:'Copier',paste:'Coller',print:'Imprimer',underline:'Souligné',bold:'Gras',italic:'Italique',selectAll:'Tout sélectionner',removeFormat:'Supprimer le formatage',strike:'Barrer',subscript:'Indice',superscript:'Exposant',horizontalrule:'Insérer un séparateur',pagebreak:'Insérer un saut de page',pagebreakAlt:'Page Break',unlink:'Supprimer le lien',undo:'Annuler',redo:'Refaire',common:{browseServer:'Parcourir le serveur',url:'URL',protocol:'Protocole',upload:'Télécharger',uploadSubmit:'Envoyer sur le serveur',image:'Image',flash:'Animation Flash',form:'Formulaire',checkbox:'Case à cocher',radio:'Bouton radio',textField:'Champ texte',textarea:'Zone de texte',hiddenField:'Champ caché',button:'Bouton',select:'Champ de sélection',imageButton:'Bouton image',notSet:'<Par défaut>',id:'Id',name:'Nom',langDir:"Sens d'écriture",langDirLtr:'De gauche à droite (LTR)',langDirRtl:'De droite à gauche (RTL)',langCode:'Code langue',longDescr:'URL de description longue',cssClass:'Classes de feuilles de style',advisoryTitle:'Titre',cssStyle:'Style',ok:'OK',cancel:'Annuler',close:'Close',preview:'Preview',generalTab:'Général',advancedTab:'Avancée',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Largeur',height:'Hauteur',align:'Alignement',alignLeft:'Gauche',alignRight:'Droite',alignCenter:'Centré',alignTop:'Haut',alignMiddle:'Milieu',alignBottom:'Bas',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Insérer un caractère spécial',title:'Insérer un caractère spécial',options:'Special Character Options'},link:{toolbar:'Insérer/modifier le lien',other:'<other>',menu:'Modifier le lien',title:'Propriétés du lien',info:'Informations sur le lien',target:'Destination',upload:'Télécharger',advanced:'Avancée',type:'Type de lien',toUrl:'URL',toAnchor:'Ancre dans cette page',toEmail:'E-Mail',targetFrame:'<Cadre>',targetPopup:'<fenêtre popup>',targetFrameName:'Nom du cadre de destination',targetPopupName:'Nom de la fenêtre popup',popupFeatures:'Caractéristiques de la fenêtre popup',popupResizable:'Resizable',popupStatusBar:"Barre d'état",popupLocationBar:"Barre d'adresses",popupToolbar:"Barre d'outils",popupMenuBar:'Barre de menu',popupFullScreen:'Plein écran (IE)',popupScrollBars:'Barres de défilement',popupDependent:'Dépendante (Netscape)',popupLeft:'Position à partir de la gauche',popupTop:'Position à partir du haut',id:'Id',langDir:"Sens d'écriture",langDirLTR:'De gauche à droite (LTR)',langDirRTL:'De droite à gauche (RTL)',acccessKey:'Équivalent clavier',name:'Nom',langCode:"Sens d'écriture",tabIndex:'Ordre de tabulation',advisoryTitle:'Titre',advisoryContentType:'Type de contenu',cssClasses:'Classes de feuilles de style',charset:'Encodage de caractère',styles:'Style',rel:'Relationship',selectAnchor:'Sélectionner une ancre',anchorName:'Par nom',anchorId:'Par id',emailAddress:'Adresse E-Mail',emailSubject:'Sujet du message',emailBody:'Corps du message',noAnchors:"(Pas d'ancre disponible dans le document)",noUrl:"Veuillez saisir l'URL",noEmail:"Veuillez saisir l'adresse e-mail"},anchor:{toolbar:"Insérer/modifier l'ancre",menu:"Propriétés de l'ancre",title:"Propriétés de l'ancre",name:"Nom de l'ancre",errorName:"Veuillez saisir le nom de l'ancre",remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Chercher et Remplacer',find:'Chercher',replace:'Remplacer',findWhat:'Rechercher:',replaceWith:'Remplacer par:',notFoundMsg:'Le texte indiqué est introuvable.',findOptions:'Find Options',matchCase:'Respecter la casse',matchWord:'Mot entier',matchCyclic:'Match cyclic',replaceAll:'Tout remplacer',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tableau',title:'Propriétés du tableau',menu:'Propriétés du tableau',deleteTable:'Supprimer le tableau',rows:'Lignes',columns:'Colonnes',border:'Taille de la bordure',widthPx:'pixels',widthPc:'pourcentage',widthUnit:'width unit',cellSpace:'Espacement',cellPad:'Contour',caption:'Titre',summary:'Résumé',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cellule',insertBefore:'Insérer une cellule avant',insertAfter:'Insérer une cellule après',deleteCell:'Supprimer des cellules',merge:'Fusionner les cellules',mergeRight:'Fusionner à droite',mergeDown:'Fusionner en bas',splitHorizontal:'Scinder la cellule horizontalement',splitVertical:'Scinder la cellule verticalement',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Ligne',insertBefore:'Insérer une ligne avant',insertAfter:'Insérer une ligne après',deleteRow:'Supprimer des lignes'},column:{menu:'Colonne',insertBefore:'Insérer une colonne avant',insertAfter:'Insérer une colonne après',deleteColumn:'Supprimer des colonnes'}},button:{title:'Propriétés du bouton',text:'Texte (Valeur)',type:'Type',typeBtn:'Bouton',typeSbm:'Soumettre',typeRst:'Réinitialiser'},checkboxAndRadio:{checkboxTitle:'Propriétés de la case à cocher',radioTitle:'Propriétés du bouton radio',value:'Valeur',selected:'Sélectionné'},form:{title:'Propriétés du formulaire',menu:'Propriétés du formulaire',action:'Action',method:'Méthode',encoding:'Encoding'},select:{title:'Propriétés de la liste/du menu',selectInfo:'Info',opAvail:'Options disponibles',value:'Valeur',size:'Taille',lines:'lignes',chkMulti:'Sélection multiple',opText:'Texte',opValue:'Valeur',btnAdd:'Ajouter',btnModify:'Modifier',btnUp:'Monter',btnDown:'Descendre',btnSetValue:'Valeur sélectionnée',btnDelete:'Supprimer'},textarea:{title:'Propriétés de la zone de texte',cols:'Colonnes',rows:'Lignes'},textfield:{title:'Propriétés du champ texte',name:'Nom',value:'Valeur',charWidth:'Largeur en caractères',maxChars:'Nombre maximum de caractères',type:'Type',typeText:'Texte',typePass:'Mot de passe'},hidden:{title:'Propriétés du champ caché',name:'Nom',value:'Valeur'},image:{title:"Propriétés de l'image",titleButton:'Propriétés du bouton image',menu:"Propriétés de l'image",infoTab:"Informations sur l'image",btnUpload:'Envoyer sur le serveur',upload:'Télécharger',alt:'Texte de remplacement',lockRatio:'Garder les proportions',resetSize:'Taille originale',border:'Bordure',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',alertUrl:"Veuillez saisir l'URL de l'image",linkTab:'Lien',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:"Propriétés de l'animation Flash",propertiesTab:'Properties',title:"Propriétés de l'animation Flash",chkPlay:'Lecture automatique',chkLoop:'Boucle',chkMenu:'Activer le menu Flash',chkFull:'Allow Fullscreen',scale:'Affichage',scaleAll:'Par défaut (tout montrer)',scaleNoBorder:'Sans bordure',scaleFit:'Ajuster aux dimensions',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bas',alignAbsMiddle:'Abs Milieu',alignBaseline:'Bas du texte',alignTextTop:'Haut du texte',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Couleur de fond',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',validateSrc:"Veuillez saisir l'URL",validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Orthographe',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Pas dans le dictionnaire',changeTo:'Changer en',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer tout',btnReplace:'Remplacer',btnReplaceAll:'Remplacer tout',btnUndo:'Annuler',noSuggestions:'- Pas de suggestion -',progress:"Vérification d'orthographe en cours...",noMispell:"Vérification d'orthographe terminée: pas d'erreur trouvée",noChanges:"Vérification d'orthographe terminée: Pas de modifications",oneChange:"Vérification d'orthographe terminée: Un mot modifié",manyChanges:"Vérification d'orthographe terminée: %1 mots modifiés",ieSpellDownload:"Le Correcteur d'orthographe n'est pas installé. Souhaitez-vous le télécharger maintenant?"},smiley:{toolbar:'Emoticon',title:'Insérer un Emoticon',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Liste numérotée',bulletedlist:'Liste à puces',indent:'Augmenter le retrait',outdent:'Diminuer le retrait',justify:{left:'Aligner à gauche',center:'Centrer',right:'Aligner à Droite',block:'Texte justifié'},blockquote:'Citation',clipboard:{title:'Coller',cutError:"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).",copyError:"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).",pasteMsg:'Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.',securityMsg:"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.",pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Coller en tant que Word (formaté)',title:'Coller en tant que Word (formaté)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Coller comme texte',title:'Coller comme texte'},templates:{button:'Modèles',title:'Modèles de contenu',options:'Template Options',insertOption:'Remplacer tout le contenu actuel',selectPromptMsg:"Sélectionner le modèle à ouvrir dans l'éditeur<br>(le contenu actuel sera remplacé):",emptyListMsg:'(Aucun modèle disponible)'},showBlocks:'Afficher les blocs',stylesCombo:{label:'Style',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formaté',tag_address:'Adresse',tag_h1:'En-tête 1',tag_h2:'En-tête 2',tag_h3:'En-tête 3',tag_h4:'En-tête 4',tag_h5:'En-tête 5',tag_h6:'En-tête 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Police',voiceLabel:'Font',panelTitle:'Police'},fontSize:{label:'Taille',voiceLabel:'Font Size',panelTitle:'Taille'},colorButton:{textColorTitle:'Couleur de caractère',bgColorTitle:'Couleur de fond',panelTitle:'Colors',auto:'Automatique',more:'Plus de couleurs...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriétés du document',title:'Propriétés du document',design:'Design',meta:'Méta-Données',chooseColor:'Choose',other:'<other>',docTitle:'Titre de la page',charset:'Encodage de caractère',charsetOther:'Autre encodage de caractère',charsetASCII:'ASCII',charsetCE:'Europe Centrale',charsetCT:'Chinois Traditionnel (Big5)',charsetCR:'Cyrillique',charsetGR:'Grecque',charsetJP:'Japonais',charsetKR:'Coréen',charsetTR:'Turcque',charsetUN:'Unicode (UTF-8)',charsetWE:'Occidental',docType:'Type de document',docTypeOther:'Autre type de document',xhtmlDec:'Inclure les déclarations XHTML',bgColor:'Couleur de fond',bgImage:'Image de fond',bgFixed:'Image fixe sans défilement',txtColor:'Couleur de caractère',margin:'Marges',marginTop:'Haut',marginLeft:'Gauche',marginRight:'Droite',marginBottom:'Bas',metaKeywords:'Mots-clés (séparés par des virgules)',metaDescription:'Description',metaAuthor:'Auteur',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/fr.js b/upload/public/js/3rd_party/ckeditor/lang/fr.js
new file mode 100644
index 00000000..7cd14d7b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/fr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.fr={dir:'ltr',editorTitle:"Éditeur de Texte Enrichi, %1, appuyez sur ALT-0 pour l'aide.",toolbars:'Editor toolbars',editor:'Éditeur de Texte Enrichi',source:'Source',newPage:'Nouvelle page',save:'Enregistrer',preview:'Aperçu',cut:'Couper',copy:'Copier',paste:'Coller',print:'Imprimer',underline:'Souligné',bold:'Gras',italic:'Italique',selectAll:'Tout sélectionner',removeFormat:'Supprimer la mise en forme',strike:'Barré',subscript:'Indice',superscript:'Exposant',horizontalrule:'Ligne horizontale',pagebreak:'Saut de page',pagebreakAlt:'Saut de page',unlink:'Supprimer le lien',undo:'Annuler',redo:'Rétablir',common:{browseServer:'Explorer le serveur',url:'URL',protocol:'Protocole',upload:'Envoyer',uploadSubmit:'Envoyer sur le serveur',image:'Image',flash:'Flash',form:'Formulaire',checkbox:'Case à cocher',radio:'Bouton Radio',textField:'Champ texte',textarea:'Zone de texte',hiddenField:'Champ caché',button:'Bouton',select:'Liste déroulante',imageButton:'Bouton image',notSet:'<non défini>',id:'Id',name:'Nom',langDir:"Sens d'écriture",langDirLtr:'Gauche à droite (LTR)',langDirRtl:'Droite à gauche (RTL)',langCode:'Code de langue',longDescr:'URL de description longue (longdesc => malvoyant)',cssClass:'Classe CSS',advisoryTitle:'Description (title)',cssStyle:'Style',ok:'OK',cancel:'Annuler',close:'Fermer',preview:'Aperçu',generalTab:'Général',advancedTab:'Avancé',validateNumberFailed:"Cette valeur n'est pas un nombre.",confirmNewPage:'Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page?',confirmCancel:'Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer?',options:'Options',target:'Cible (Target)',targetNew:'Nouvelle fenêtre (_blank)',targetTop:'Fenêtre supérieure (_top)',targetSelf:'Même fenêtre (_self)',targetParent:'Fenêtre parent (_parent)',langDirLTR:'Gauche à Droite (LTR)',langDirRTL:'Droite à Gauche (RTL)',styles:'Style',cssClasses:'Classes de style',width:'Largeur',height:'Hauteur',align:'Alignement',alignLeft:'Gauche',alignRight:'Droite',alignCenter:'Centré',alignTop:'Haut',alignMiddle:'Milieu',alignBottom:'Bas',invalidHeight:'La hauteur doit être un nombre.',invalidWidth:'La largeur doit être un nombre.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, Indisponible</span>'},contextmenu:{options:'Options du menu contextuel'},specialChar:{toolbar:'Insérer un caractère spécial',title:'Sélectionnez un caractère',options:'Options des caractères spéciaux'},link:{toolbar:'Lien',other:'<autre>',menu:'Editer le lien',title:'Lien',info:'Infos sur le lien',target:'Cible',upload:'Envoyer',advanced:'Avancé',type:'Type de lien',toUrl:'URL',toAnchor:'Transformer le lien en ancre dans le texte',toEmail:'E-mail',targetFrame:'<cadre>',targetPopup:'<fenêtre popup>',targetFrameName:'Nom du Cadre destination',targetPopupName:'Nom de la fenêtre popup',popupFeatures:'Options de la fenêtre popup',popupResizable:'Redimensionnable',popupStatusBar:'Barre de status',popupLocationBar:"Barre d'adresse",popupToolbar:"Barre d'outils",popupMenuBar:'Barre de menu',popupFullScreen:'Plein écran (IE)',popupScrollBars:'Barres de défilement',popupDependent:'Dépendante (Netscape)',popupLeft:'Position gauche',popupTop:'Position haute',id:'Id',langDir:"Sens d'écriture",langDirLTR:'Gauche à droite',langDirRTL:'Droite à gauche',acccessKey:"Touche d'accessibilité",name:'Nom',langCode:'Code de langue',tabIndex:'Index de tabulation',advisoryTitle:'Description (title)',advisoryContentType:'Type de contenu (ex: text/html)',cssClasses:'Classe CSS',charset:'Charset de la cible',styles:'Style',rel:'Relation',selectAnchor:"Sélectionner l'ancre",anchorName:"Par nom d'ancre",anchorId:"Par ID d'élément",emailAddress:'Adresse E-Mail',emailSubject:'Sujet du message',emailBody:'Corps du message',noAnchors:'(Aucune ancre disponible dans ce document)',noUrl:"Veuillez entrer l'adresse du lien",noEmail:"Veuillez entrer l'adresse e-mail"},anchor:{toolbar:'Ancre',menu:"Editer l'ancre",title:"Propriétés de l'ancre",name:"Nom de l'ancre",errorName:"Veuillez entrer le nom de l'ancre.",remove:'Remove Anchor'},list:{numberedTitle:'Propriétés de la liste numérotée',bulletedTitle:'Propriétés de la liste à puces',type:'Type',start:'Début',validateStartNumber:'Le premier élément de la liste doit être un nombre entier.',circle:'Cercle',disc:'Disque',square:'Carré',none:'Aucun',notset:'<Non défini>',armenian:'Numération arménienne',georgian:'Numération géorgienne (an, ban, gan, etc.)',lowerRoman:'Nombres romains minuscules (i, ii, iii, iv, v, etc.)',upperRoman:'Nombres romains majuscules (I, II, III, IV, V, etc.)',lowerAlpha:'Alphabétique minuscules (a, b, c, d, e, etc.)',upperAlpha:'Alphabétique majuscules (A, B, C, D, E, etc.)',lowerGreek:'Grec minuscule (alpha, beta, gamma, etc.)',decimal:'Décimal (1, 2, 3, etc.)',decimalLeadingZero:'Décimal précédé par un 0 (01, 02, 03, etc.)'},findAndReplace:{title:'Trouver et remplacer',find:'Trouver',replace:'Remplacer',findWhat:'Expression à trouver: ',replaceWith:'Remplacer par: ',notFoundMsg:'Le texte spécifié ne peut être trouvé.',findOptions:'Find Options',matchCase:'Respecter la casse',matchWord:'Mot entier uniquement',matchCyclic:'Boucler',replaceAll:'Remplacer tout',replaceSuccessMsg:'%1 occurrence(s) replacée(s).'},table:{toolbar:'Tableau',title:'Propriétés du tableau',menu:'Propriétés du tableau',deleteTable:'Supprimer le tableau',rows:'Lignes',columns:'Colonnes',border:'Taille de la bordure',widthPx:'pixels',widthPc:'% pourcents',widthUnit:'unité de largeur',cellSpace:'Espacement des cellules',cellPad:'Marge interne des cellules',caption:'Titre du tableau',summary:'Résumé (description)',headers:'En-Têtes',headersNone:'Aucunes',headersColumn:'Première colonne',headersRow:'Première ligne',headersBoth:'Les deux',invalidRows:'Le nombre de lignes doit être supérieur à 0.',invalidCols:'Le nombre de colonnes doit être supérieur à 0.',invalidBorder:'La taille de la bordure doit être un nombre.',invalidWidth:'La largeur du tableau doit être un nombre.',invalidHeight:'La hauteur du tableau doit être un nombre.',invalidCellSpacing:"L'espacement des cellules doit être un nombre positif.",invalidCellPadding:'La marge intérieure des cellules doit être un nombre positif.',cell:{menu:'Cellule',insertBefore:'Insérer une cellule avant',insertAfter:'Insérer une cellule après',deleteCell:'Supprimer les cellules',merge:'Fusionner les cellules',mergeRight:'Fusionner à droite',mergeDown:'Fusionner en bas',splitHorizontal:'Fractionner horizontalement',splitVertical:'Fractionner verticalement',title:'Propriétés de la cellule',cellType:'Type de cellule',rowSpan:'Fusion de lignes',colSpan:'Fusion de colonnes',wordWrap:'Césure',hAlign:'Alignement Horizontal',vAlign:'Alignement Vertical',alignBaseline:'Bas du texte',bgColor:"Couleur d'arrière-plan",borderColor:'Couleur de Bordure',data:'Données',header:'Entête',yes:'Oui',no:'Non',invalidWidth:'La Largeur de Cellule doit être un nombre.',invalidHeight:'La Hauteur de Cellule doit être un nombre.',invalidRowSpan:'La fusion de lignes doit être un nombre entier.',invalidColSpan:'La fusion de colonnes doit être un nombre entier.',chooseColor:'Choisissez'},row:{menu:'Ligne',insertBefore:'Insérer une ligne avant',insertAfter:'Insérer une ligne après',deleteRow:'Supprimer les lignes'},column:{menu:'Colonnes',insertBefore:'Insérer une colonne avant',insertAfter:'Insérer une colonne après',deleteColumn:'Supprimer les colonnes'}},button:{title:'Propriétés du bouton',text:'Texte (Value)',type:'Type',typeBtn:'Bouton',typeSbm:'Validation (submit)',typeRst:'Remise à zéro'},checkboxAndRadio:{checkboxTitle:'Propriétés de la case à cocher',radioTitle:'Propriétés du bouton Radio',value:'Valeur',selected:'Sélectionné'},form:{title:'Propriétés du formulaire',menu:'Propriétés du formulaire',action:'Action',method:'Méthode',encoding:'Encodage'},select:{title:'Propriétés du menu déroulant',selectInfo:'Informations sur le menu déroulant',opAvail:'Options disponibles',value:'Valeur',size:'Taille',lines:'Lignes',chkMulti:'Permettre les sélections multiples',opText:'Texte',opValue:'Valeur',btnAdd:'Ajouter',btnModify:'Modifier',btnUp:'Haut',btnDown:'Bas',btnSetValue:'Définir comme valeur sélectionnée',btnDelete:'Supprimer'},textarea:{title:'Propriétés de la zone de texte',cols:'Colonnes',rows:'Lignes'},textfield:{title:'Propriétés du champ texte',name:'Nom',value:'Valeur',charWidth:'Taille des caractères',maxChars:'Nombre maximum de caractères',type:'Type',typeText:'Texte',typePass:'Mot de passe'},hidden:{title:'Propriétés du champ caché',name:'Nom',value:'Valeur'},image:{title:"Propriétés de l'image",titleButton:'Propriétés du bouton image',menu:"Propriétés de l'image",infoTab:"Informations sur l'image",btnUpload:'Envoyer sur le serveur',upload:'Envoyer',alt:'Texte de remplacement',lockRatio:'Conserver les proportions',resetSize:"Taille d'origine",border:'Bordure',hSpace:'Espacement horizontal',vSpace:'Espacement vertical',alertUrl:"Veuillez entrer l'adresse de l'image",linkTab:'Lien',button2Img:'Voulez-vous transformer le bouton image sélectionné en simple image?',img2Button:"Voulez-vous transformer l'image en bouton image?",urlMissing:"L'adresse source de l'image est manquante.",validateBorder:'Bordure doit être un entier.',validateHSpace:'HSpace doit être un entier.',validateVSpace:'VSpace doit être un entier.'},flash:{properties:'Propriétés du Flash',propertiesTab:'Propriétés',title:'Propriétés du Flash',chkPlay:'Jouer automatiquement',chkLoop:'Boucle',chkMenu:'Activer le menu Flash',chkFull:'Permettre le plein écran',scale:'Echelle',scaleAll:'Afficher tout',scaleNoBorder:'Pas de bordure',scaleFit:"Taille d'origine",access:'Accès aux scripts',accessAlways:'Toujours',accessSameDomain:'Même domaine',accessNever:'Jamais',alignAbsBottom:'Bas absolu',alignAbsMiddle:'Milieu absolu',alignBaseline:'Bas du texte',alignTextTop:'Haut du texte',quality:'Qualité',qualityBest:'Meilleure',qualityHigh:'Haute',qualityAutoHigh:'Haute Auto',qualityMedium:'Moyenne',qualityAutoLow:'Basse Auto',qualityLow:'Basse',windowModeWindow:'Fenêtre',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Mode fenêtre',flashvars:'Variables du Flash',bgcolor:"Couleur d'arrière-plan",hSpace:'Espacement horizontal',vSpace:'Espacement vertical',validateSrc:"L'adresse ne doit pas être vide.",validateHSpace:"L'espacement horizontal doit être un nombre.",validateVSpace:"L'espacement vertical doit être un nombre."},spellCheck:{toolbar:"Vérifier l'orthographe",title:"Vérifier l'orthographe",notAvailable:'Désolé, le service est indisponible actuellement.',errorLoading:"Erreur du chargement du service depuis l'hôte : %s.",notInDic:"N'existe pas dans le dictionnaire.",changeTo:'Modifier pour',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer tout',btnReplace:'Remplacer',btnReplaceAll:'Remplacer tout',btnUndo:'Annuler',noSuggestions:'- Aucune suggestion -',progress:"Vérification de l'orthographe en cours...",noMispell:"Vérification de l'orthographe terminée : aucune erreur trouvée.",noChanges:"Vérification de l'orthographe terminée : Aucun mot corrigé.",oneChange:"Vérification de l'orthographe terminée : Un seul mot corrigé.",manyChanges:"Vérification de l'orthographe terminée : %1 mots corrigés.",ieSpellDownload:"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?"},smiley:{toolbar:'Émoticones',title:'Insérer un émoticone',options:'Options des émoticones'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 éléments'},numberedlist:'Insérer/Supprimer la liste numérotée',bulletedlist:'Insérer/Supprimer la liste à puces',indent:'Augmenter le retrait (tabulation)',outdent:'Diminuer le retrait (tabulation)',justify:{left:'Aligner à gauche',center:'Centrer',right:'Aligner à droite',block:'Justifier'},blockquote:'Citation',clipboard:{title:'Coller',cutError:"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement l'opération \"couper\". Veuillez utiliser le raccourci clavier (Ctrl/Cmd+X).",copyError:"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement des opérations de copie. Veuillez utiliser le raccourci clavier (Ctrl/Cmd+C).",pasteMsg:'Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.',securityMsg:"A cause des paramètres de sécurité de votre navigateur, l'éditeur n'est pas en mesure d'accéder directement à vos données contenues dans le presse-papier. Vous devriez réessayer de coller les données dans la fenêtre.",pasteArea:'Coller la zone'},pastefromword:{confirmCleanup:'Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?',toolbar:'Coller depuis Word',title:'Coller depuis Word',error:"Il n'a pas été possible de nettoyer les données collées à la suite d'une erreur interne."},pasteText:{button:'Coller comme texte sans mise en forme',title:'Coller comme texte sans mise en forme'},templates:{button:'Modèles',title:'Contenu des modèles',options:'Options des modèles',insertOption:'Remplacer le contenu actuel',selectPromptMsg:"Veuillez sélectionner le modèle pour l'ouvrir dans l'éditeur",emptyListMsg:'(Aucun modèle disponible)'},showBlocks:'Afficher les blocs',stylesCombo:{label:'Styles',panelTitle:'Styles de mise en page',panelTitle1:'Styles de blocs',panelTitle2:'Styles en ligne',panelTitle3:"Styles d'objet"},format:{label:'Format',panelTitle:'Format de paragraphe',tag_p:'Normal',tag_pre:'Formaté',tag_address:'Adresse',tag_h1:'Titre 1',tag_h2:'Titre 2',tag_h3:'Titre 3',tag_h4:'Titre 4',tag_h5:'Titre 5',tag_h6:'Titre 6',tag_div:'Normal (DIV)'},div:{title:'Créer un container DIV',toolbar:'Créer un container DIV',cssClassInputLabel:'Classe CSS',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:'Code de langue',inlineStyleInputLabel:'Style en ligne',advisoryTitleInputLabel:'Advisory Title',langDirLabel:"Sens d'écriture",langDirLTRLabel:'Gauche à droite (LTR)',langDirRTLLabel:'Droite à gauche (RTL)',edit:'Éditer la DIV',remove:'Enlever la DIV'},iframe:{title:'Propriétés de la IFrame',toolbar:'IFrame',noUrl:"Veuillez entrer l'adresse du lien de la IFrame",scrolling:'Permettre à la barre de défilement',border:'Afficher une bordure de la IFrame'},font:{label:'Police',voiceLabel:'Police',panelTitle:'Style de police'},fontSize:{label:'Taille',voiceLabel:'Taille de police',panelTitle:'Taille de police'},colorButton:{textColorTitle:'Couleur de texte',bgColorTitle:"Couleur d'arrière plan",panelTitle:'Couleurs',auto:'Automatique',more:'Plus de couleurs...'},colors:{'000':'Noir',800000:'Marron','8B4513':'Brun moyen','2F4F4F':'Vert sombre','008080':'Canard','000080':'Bleu marine','4B0082':'Indigo',696969:'Gris foncé',B22222:'Rouge brique',A52A2A:'Brun',DAA520:'Or terni','006400':'Vert foncé','40E0D0':'Turquoise','0000CD':'Bleu royal',800080:'Pourpre',808080:'Gris',F00:'Rouge',FF8C00:'Orange foncé',FFD700:'Or','008000':'Vert','0FF':'Cyan','00F':'Bleu',EE82EE:'Violet',A9A9A9:'Gris moyen',FFA07A:'Saumon',FFA500:'Orange',FFFF00:'Jaune','00FF00':'Lime',AFEEEE:'Turquoise clair',ADD8E6:'Bleu clair',DDA0DD:'Prune',D3D3D3:'Gris clair',FFF0F5:'Fard Lavande',FAEBD7:'Blanc antique',FFFFE0:'Jaune clair',F0FFF0:'Honeydew',F0FFFF:'Azur',F0F8FF:'Bleu Alice',E6E6FA:'Lavande',FFF:'Blanc'},scayt:{title:"Vérification de l'Orthographe en Cours de Frappe (SCAYT)",opera_title:'Non supporté par Opera',enable:'Activer SCAYT',disable:'Désactiver SCAYT',about:'A propos de SCAYT',toggle:'Activer/Désactiver SCAYT',options:'Options',langs:'Langues',moreSuggestions:'Plus de suggestions',ignore:'Ignorer',ignoreAll:'Ignorer Tout',addWord:'Ajouter le mot',emptyDic:'Le nom du dictionnaire ne devrait pas être vide.',optionsTab:'Options',allCaps:'Ignorer les mots entierement en majuscules',ignoreDomainNames:'Ignorer les noms de domaines',mixedCase:'Ignorer les mots à casse multiple',mixedWithDigits:'Ignorer les mots contenant des chiffres',languagesTab:'Langues',dictionariesTab:'Dictionnaires',dic_field_name:'Nom du dictionnaire',dic_create:'Créer',dic_restore:'Restaurer',dic_delete:'Effacer',dic_rename:'Renommer',dic_info:"Initiallement, le dictionnaire de l'utilisateur est stocké dans un cookie. Cependant, les cookies sont limités en taille. Quand le dictionnaire atteint une taille qu'il n'est plus possible de stocker dans un cookie, il peut alors être stocké sur nos serveurs. Afin de stocker votre dictionnaire personnel sur nos serveurs, vous devez spécifier un nom pour ce dictionnaire. Si vous avez déjà un dictionnaire stocké, merci de taper son nom puis cliquer sur Restaurer pour le récupérer.",aboutTab:'À propos de'},about:{title:'A propos de CKEditor',dlgTitle:'A propos de CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Pour les informations de licence, veuillez visiter notre site web:',copy:'Copyright &copy; $1. Tous droits réservés.'},maximize:'Agrandir',minimize:'Minimiser',fakeobjects:{anchor:'Ancre',flash:'Animation Flash',iframe:'IFrame',hiddenfield:'Champ caché',unknown:'Objet inconnu'},resize:'Déplacer pour modifier la taille',colordialog:{title:'Choisir une couleur',options:'Option des couleurs',highlight:'Détails',selected:'Couleur choisie',clear:'Effacer'},toolbarCollapse:"Enrouler la barre d'outils",toolbarExpand:"Dérouler la barre d'outils",toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Direction du texte de la gauche vers la droite',rtl:'Direction du texte de la droite vers la gauche'},docprops:{label:'Propriétés du document',title:'Propriétés du document',design:'Design',meta:'Métadonnées',chooseColor:'Choisissez',other:'<autre>',docTitle:'Titre de la page',charset:'Encodage de caractère',charsetOther:'Autre encodage de caractère',charsetASCII:'ASCII',charsetCE:'Europe Centrale',charsetCT:'Chinois Traditionnel (Big5)',charsetCR:'Cyrillique',charsetGR:'Grec',charsetJP:'Japonais',charsetKR:'Coréen',charsetTR:'Turc',charsetUN:'Unicode (UTF-8)',charsetWE:'Occidental',docType:'Type de document',docTypeOther:'Autre type de document',xhtmlDec:'Inclure les déclarations XHTML',bgColor:'Couleur de fond',bgImage:'Image de fond',bgFixed:'Image fixe sans défilement',txtColor:'Couleur de texte',margin:'Marges',marginTop:'Haut',marginLeft:'Gauche',marginRight:'Droite',marginBottom:'Bas',metaKeywords:'Mots-clés (séparés par des virgules)',metaDescription:'Description',metaAuthor:'Auteur',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/gl.js b/upload/public/js/3rd_party/ckeditor/lang/gl.js
new file mode 100644
index 00000000..3536991e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/gl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.gl={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Código Fonte',newPage:'Nova Páxina',save:'Gardar',preview:'Vista Previa',cut:'Cortar',copy:'Copiar',paste:'Pegar',print:'Imprimir',underline:'Sub-raiado',bold:'Negrita',italic:'Cursiva',selectAll:'Seleccionar todo',removeFormat:'Eliminar Formato',strike:'Tachado',subscript:'Subíndice',superscript:'Superíndice',horizontalrule:'Inserir Liña Horizontal',pagebreak:'Inserir Salto de Páxina',pagebreakAlt:'Page Break',unlink:'Eliminar Ligazón',undo:'Desfacer',redo:'Refacer',common:{browseServer:'Navegar no Servidor',url:'URL',protocol:'Protocolo',upload:'Carregar',uploadSubmit:'Enviar ó Servidor',image:'Imaxe',flash:'Flash',form:'Formulario',checkbox:'Cadro de Verificación',radio:'Botón de Radio',textField:'Campo de Texto',textarea:'�rea de Texto',hiddenField:'Campo Oculto',button:'Botón',select:'Campo de Selección',imageButton:'Botón de Imaxe',notSet:'<non definido>',id:'Id',name:'Nome',langDir:'Orientación do Idioma',langDirLtr:'Esquerda a Dereita (LTR)',langDirRtl:'Dereita a Esquerda (RTL)',langCode:'Código do Idioma',longDescr:'Descrición Completa da URL',cssClass:'Clases da Folla de Estilos',advisoryTitle:'Título',cssStyle:'Estilo',ok:'OK',cancel:'Cancelar',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanzado',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Largura',height:'Altura',align:'Aliñamento',alignLeft:'Esquerda',alignRight:'Dereita',alignCenter:'Centro',alignTop:'Tope',alignMiddle:'Centro',alignBottom:'Pé',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Inserir Carácter Especial',title:'Seleccione Caracter Especial',options:'Special Character Options'},link:{toolbar:'Inserir/Editar Ligazón',other:'<outro>',menu:'Editar Ligazón',title:'Ligazón',info:'Información da Ligazón',target:'Destino',upload:'Carregar',advanced:'Advanzado',type:'Tipo de Ligazón',toUrl:'URL',toAnchor:'Referencia nesta páxina',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<Xanela Emerxente>',targetFrameName:'Nome do Marco Destino',targetPopupName:'Nome da Xanela Emerxente',popupFeatures:'Características da Xanela Emerxente',popupResizable:'Resizable',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de Localización',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menú',popupFullScreen:'A Toda Pantalla (IE)',popupScrollBars:'Barras de Desplazamento',popupDependent:'Dependente (Netscape)',popupLeft:'Posición Esquerda',popupTop:'Posición dende Arriba',id:'Id',langDir:'Orientación do Idioma',langDirLTR:'Esquerda a Dereita (LTR)',langDirRTL:'Dereita a Esquerda (RTL)',acccessKey:'Chave de Acceso',name:'Nome',langCode:'Orientación do Idioma',tabIndex:'�ndice de Tabulación',advisoryTitle:'Título',advisoryContentType:'Tipo de Contido',cssClasses:'Clases da Folla de Estilos',charset:'Fonte de Caracteres Vinculado',styles:'Estilo',rel:'Relationship',selectAnchor:'Seleccionar unha Referencia',anchorName:'Por Nome de Referencia',anchorId:'Por Element Id',emailAddress:'Enderezo de E-Mail',emailSubject:'Asunto do Mensaxe',emailBody:'Corpo do Mensaxe',noAnchors:'(Non hai referencias disponibles no documento)',noUrl:'Por favor, escriba a ligazón URL',noEmail:'Por favor, escriba o enderezo de e-mail'},anchor:{toolbar:'Inserir/Editar Referencia',menu:'Propriedades da Referencia',title:'Propriedades da Referencia',name:'Nome da Referencia',errorName:'Por favor, escriba o nome da referencia',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Procurar',replace:'Substituir',findWhat:'Texto a procurar:',replaceWith:'Substituir con:',notFoundMsg:'Non te atopou o texto indicado.',findOptions:'Find Options',matchCase:'Coincidir Mai./min.',matchWord:'Coincidir con toda a palabra',matchCyclic:'Match cyclic',replaceAll:'Substitiur Todo',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabla',title:'Propiedades da Táboa',menu:'Propiedades da Táboa',deleteTable:'Borrar Táboa',rows:'Filas',columns:'Columnas',border:'Tamaño do Borde',widthPx:'pixels',widthPc:'percent',widthUnit:'width unit',cellSpace:'Marxe entre Celas',cellPad:'Marxe interior',caption:'Título',summary:'Sumario',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cela',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Borrar Cela',merge:'Unir Celas',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Fila',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Borrar Filas'},column:{menu:'Columna',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Borrar Columnas'}},button:{title:'Propriedades do Botón',text:'Texto (Valor)',type:'Tipo',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Propriedades do Cadro de Verificación',radioTitle:'Propriedades do Botón de Radio',value:'Valor',selected:'Seleccionado'},form:{title:'Propriedades do Formulario',menu:'Propriedades do Formulario',action:'Acción',method:'Método',encoding:'Encoding'},select:{title:'Propriedades do Campo de Selección',selectInfo:'Info',opAvail:'Opcións Disponibles',value:'Valor',size:'Tamaño',lines:'liñas',chkMulti:'Permitir múltiples seleccións',opText:'Texto',opValue:'Valor',btnAdd:'Engadir',btnModify:'Modificar',btnUp:'Subir',btnDown:'Baixar',btnSetValue:'Definir como valor por defecto',btnDelete:'Borrar'},textarea:{title:'Propriedades da �rea de Texto',cols:'Columnas',rows:'Filas'},textfield:{title:'Propriedades do Campo de Texto',name:'Nome',value:'Valor',charWidth:'Tamaño do Caracter',maxChars:'Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Chave'},hidden:{title:'Propriedades do Campo Oculto',name:'Nome',value:'Valor'},image:{title:'Propriedades da Imaxe',titleButton:'Propriedades do Botón de Imaxe',menu:'Propriedades da Imaxe',infoTab:'Información da Imaxe',btnUpload:'Enviar ó Servidor',upload:'Carregar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamaño Orixinal',border:'Límite',hSpace:'Esp. Horiz.',vSpace:'Esp. Vert.',alertUrl:'Por favor, escriba a URL da imaxe',linkTab:'Ligazón',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Propriedades Flash',propertiesTab:'Properties',title:'Propriedades Flash',chkPlay:'Auto Execución',chkLoop:'Bucle',chkMenu:'Activar Menú Flash',chkFull:'Allow Fullscreen',scale:'Escalar',scaleAll:'Amosar Todo',scaleNoBorder:'Sen Borde',scaleFit:'Encaixar axustando',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Inferior',alignAbsMiddle:'Abs Centro',alignBaseline:'Liña Base',alignTextTop:'Tope do Texto',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Cor do Fondo',hSpace:'Esp. Horiz.',vSpace:'Esp. Vert.',validateSrc:'Por favor, escriba a ligazón URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Corrección Ortográfica',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Non está no diccionario',changeTo:'Cambiar a',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Todas',btnReplace:'Substituir',btnReplaceAll:'Substituir Todas',btnUndo:'Desfacer',noSuggestions:'- Sen candidatos -',progress:'Corrección ortográfica en progreso...',noMispell:'Corrección ortográfica rematada: Non se atoparon erros',noChanges:'Corrección ortográfica rematada: Non se substituiu nengunha verba',oneChange:'Corrección ortográfica rematada: Unha verba substituida',manyChanges:'Corrección ortográfica rematada: %1 verbas substituidas',ieSpellDownload:'O corrector ortográfico non está instalado. ¿Quere descargalo agora?'},smiley:{toolbar:'Smiley',title:'Inserte un Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Lista Numerada',bulletedlist:'Marcas',indent:'Aumentar Sangría',outdent:'Disminuir Sangría',justify:{left:'Aliñar á Esquerda',center:'Centrado',right:'Aliñar á Dereita',block:'Xustificado'},blockquote:'Block Quote',clipboard:{title:'Pegar',cutError:'Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de corte. Por favor, use o teclado para iso (Ctrl/Cmd+X).',copyError:'Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de copia. Por favor, use o teclado para iso (Ctrl/Cmd+C).',pasteMsg:'Por favor, pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e pulse <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Pegar dende Word',title:'Pegar dende Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Pegar como texto plano',title:'Pegar como texto plano'},templates:{button:'Plantillas',title:'Plantillas de Contido',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Por favor, seleccione a plantilla a abrir no editor<br>(o contido actual perderase):',emptyListMsg:'(Non hai plantillas definidas)'},showBlocks:'Show Blocks',stylesCombo:{label:'Estilo',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Formateado',tag_address:'Enderezo',tag_h1:'Enacabezado 1',tag_h2:'Encabezado 2',tag_h3:'Encabezado 3',tag_h4:'Encabezado 4',tag_h5:'Encabezado 5',tag_h6:'Encabezado 6',tag_div:'Paragraph (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Tipo',voiceLabel:'Font',panelTitle:'Tipo'},fontSize:{label:'Tamaño',voiceLabel:'Font Size',panelTitle:'Tamaño'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor do Fondo',panelTitle:'Colors',auto:'Automático',more:'Máis Cores...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriedades do Documento',title:'Propriedades do Documento',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'<outro>',docTitle:'Título da Páxina',charset:'Codificación do Xogo de Caracteres',charsetOther:'Outra Codificación do Xogo de Caracteres',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Encabezado do Tipo de Documento',docTypeOther:'Outro Encabezado do Tipo de Documento',xhtmlDec:'Incluir Declaracións XHTML',bgColor:'Cor de Fondo',bgImage:'URL da Imaxe de Fondo',bgFixed:'Fondo Fixo',txtColor:'Cor do Texto',margin:'Marxes da Páxina',marginTop:'Arriba',marginLeft:'Esquerda',marginRight:'Dereita',marginBottom:'Abaixo',metaKeywords:'Palabras Chave de Indexación do Documento (separadas por comas)',metaDescription:'Descripción do Documento',metaAuthor:'Autor',metaCopyright:'Copyright',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/gu.js b/upload/public/js/3rd_party/ckeditor/lang/gu.js
new file mode 100644
index 00000000..b271c389
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/gu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.gu={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'મૂળ કે પ�રાથમિક દસ�તાવેજ',newPage:'નવ� પાન�ં',save:'સેવ',preview:'પૂર�વદર�શન',cut:'કાપવ�ં',copy:'નકલ',paste:'પેસ�ટ',print:'પ�રિન�ટ',underline:'અન�ડર�લાઇન, નીચે લીટી',bold:'બોલ�ડ/સ�પષ�ટ',italic:'ઇટેલિક, ત�રાંસા',selectAll:'બઘ�ં પસંદ કરવ�ં',removeFormat:'ફૉર�મટ કાઢવ�ં',strike:'છેકી નાખવ�ં',subscript:'�ક ચિહ�નની નીચે કરેલ�ં બીજ�ં ચિહ�ન',superscript:'�ક ચિહ�ન ઉપર કરેલ�ં બીજ�ં ચિહ�ન.',horizontalrule:'સમસ�તરીય રેખા ઇન�સર�ટ/દાખલ કરવી',pagebreak:'ઇન�સર�ટ પેજબ�રેક/પાનાને અલગ કરવ�ં/દાખલ કરવ�ં',pagebreakAlt:'Page Break',unlink:'લિંક કાઢવી',undo:'રદ કરવ�ં; પહેલાં હતી �વી સ�થિતિ પાછી લાવવી',redo:'રિડૂ; પછી હતી �વી સ�થિતિ પાછી લાવવી',common:{browseServer:'સર�વર બ�રાઉ� કરો',url:'URL',protocol:'પ�રોટોકૉલ',upload:'અપલોડ',uploadSubmit:'આ સર�વરને મોકલવ�ં',image:'ચિત�ર',flash:'ફ�લૅશ',form:'ફૉર�મ/પત�રક',checkbox:'ચેક બોક�સ',radio:'રેડિઓ બટન',textField:'ટેક�સ�ટ ફીલ�ડ, શબ�દ ક�ષેત�ર',textarea:'ટેક�સ�ટ �રિઆ, શબ�દ વિસ�તાર',hiddenField:'ગ�પ�ત ક�ષેત�ર',button:'બટન',select:'પસંદગી ક�ષેત�ર',imageButton:'ચિત�ર બટન',notSet:'<સેટ નથી>',id:'Id',name:'નામ',langDir:'ભાષા લેખવાની પદ�ધતિ',langDirLtr:'ડાબે થી જમણે (LTR)',langDirRtl:'જમણે થી ડાબે (RTL)',langCode:'ભાષા કોડ',longDescr:'વધારે માહિતી માટે URL',cssClass:'સ�ટાઇલ-શીટ ક�લાસ',advisoryTitle:'મ�ખ�ય મથાળ�ં',cssStyle:'સ�ટાઇલ',ok:'ઠીક છે',cancel:'રદ કરવ�ં',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'અડ�વાન�સડ',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'પહોળાઈ',height:'ઊંચાઈ',align:'લાઇનદોરીમાં ગોઠવવ�ં',alignLeft:'ડાબી બાજ� ગોઠવવ�ં',alignRight:'જમણી',alignCenter:'મધ�ય સેન�ટર',alignTop:'ઉપર',alignMiddle:'વચ�ચે',alignBottom:'નીચે',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'વિશિષ�ટ અક�ષર ઇન�સર�ટ/દાખલ કરવ�ં',title:'સ�પેશિઅલ વિશિષ�ટ અક�ષર પસંદ કરો',options:'Special Character Options'},link:{toolbar:'લિંક ઇન�સર�ટ/દાખલ કરવી',other:'<other>',menu:' લિંક �ડિટ/માં ફેરફાર કરવો',title:'લિંક',info:'લિંક ઇન�ફૉ ટૅબ',target:'ટાર�ગેટ/લક�ષ�ય',upload:'અપલોડ',advanced:'અડ�વાન�સડ',type:'લિંક પ�રકાર',toUrl:'URL',toAnchor:'આ પેજનો �ંકર',toEmail:'ઈ-મેલ',targetFrame:'<ફ�રેમ>',targetPopup:'<પૉપ-અપ વિન�ડો>',targetFrameName:'ટાર�ગેટ ફ�રેમ ન�ં નામ',targetPopupName:'પૉપ-અપ વિન�ડો ન�ં નામ',popupFeatures:'પૉપ-અપ વિન�ડો ફીચરસૅ',popupResizable:'Resizable',popupStatusBar:'સ�ટૅટસ બાર',popupLocationBar:'લોકેશન બાર',popupToolbar:'ટૂલ બાર',popupMenuBar:'મેન�યૂ બાર',popupFullScreen:'ફ�લ સ�ક�રીન (IE)',popupScrollBars:'સ�ક�રોલ બાર',popupDependent:'ડિપેન�ડન�ટ (Netscape)',popupLeft:'ડાબી બાજ�',popupTop:'જમણી બાજ�',id:'Id',langDir:'ભાષા લેખવાની પદ�ધતિ',langDirLTR:'ડાબે થી જમણે (LTR)',langDirRTL:'જમણે થી ડાબે (RTL)',acccessKey:'�ક�સેસ કી',name:'નામ',langCode:'ભાષા લેખવાની પદ�ધતિ',tabIndex:'ટૅબ ઇન�ડેક�સ',advisoryTitle:'મ�ખ�ય મથાળ�ં',advisoryContentType:'મ�ખ�ય કન�ટેન�ટ પ�રકાર',cssClasses:'સ�ટાઇલ-શીટ ક�લાસ',charset:'લિંક રિસૉર�સ કૅરિક�ટર સેટ',styles:'સ�ટાઇલ',rel:'Relationship',selectAnchor:'�ંકર પસંદ કરો',anchorName:'�ંકર નામથી પસંદ કરો',anchorId:'�ંકર �લિમન�ટ Id થી પસંદ કરો',emailAddress:'ઈ-મેલ સરનામ�ં',emailSubject:'ઈ-મેલ વિષય',emailBody:'સંદેશ',noAnchors:'(ડૉક�ય�મન�ટમાં �ંકરની સંખ�યા)',noUrl:'લિંક  URL ટાઇપ કરો',noEmail:'ઈ-મેલ સરનામ�ં ટાઇપ કરો'},anchor:{toolbar:'�ંકર ઇન�સર�ટ/દાખલ કરવી',menu:'�ંકરના ગ�ણ',title:'�ંકરના ગ�ણ',name:'�ંકરન�ં નામ',errorName:'�ંકરન�ં નામ ટાઈપ કરો',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'શોધવ�ં અને બદલવ�ં',find:'શોધવ�ં',replace:'રિપ�લેસ/બદલવ�ં',findWhat:'આ શોધો',replaceWith:'આનાથી બદલો',notFoundMsg:'તમે શોધેલી ટેક�સ�ટ નથી મળી',findOptions:'Find Options',matchCase:'કેસ સરખા રાખો',matchWord:'બઘા શબ�દ સરખા રાખો',matchCyclic:'Match cyclic',replaceAll:'બઘા બદલી ',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'ટેબલ, કોઠો',title:'ટેબલ, કોઠાન�ં મથાળ�ં',menu:'ટેબલ, કોઠાન�ં મથાળ�ં',deleteTable:'કોઠો ડિલીટ/કાઢી નાખવ�ં',rows:'પંક�તિના ખાના',columns:'કૉલમ/ઊભી કટાર',border:'કોઠાની બાજ�(બોર�ડર) સાઇ�',widthPx:'પિકસલ',widthPc:'પ�રતિશત',widthUnit:'width unit',cellSpace:'સેલ અંતર',cellPad:'સેલ પૅડિંગ',caption:'મથાળ�ં/કૅપ�શન ',summary:'ટૂંકો �હેવાલ',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'કોષના ખાના',insertBefore:'પહેલાં કોષ ઉમેરવો',insertAfter:'પછી કોષ ઉમેરવો',deleteCell:'કોષ ડિલીટ/કાઢી નાખવો',merge:'કોષ ભેગા કરવા',mergeRight:'જમણી બાજ� ભેગા કરવા',mergeDown:'નીચે ભેગા કરવા',splitHorizontal:'કોષને સમસ�તરીય વિભાજન કરવ�ં',splitVertical:'કોષને સીધ�ં ને ઊભ�ં વિભાજન કરવ�ં',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'પંક�તિના ખાના',insertBefore:'પહેલાં પંક�તિ ઉમેરવી',insertAfter:'પછી પંક�તિ ઉમેરવી',deleteRow:'પંક�તિઓ ડિલીટ/કાઢી નાખવી'},column:{menu:'કૉલમ/ઊભી કટાર',insertBefore:'પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી',insertAfter:'પછી કૉલમ/ઊભી કટાર ઉમેરવી',deleteColumn:'કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી'}},button:{title:'બટનના ગ�ણ',text:'ટેક�સ�ટ (વૅલ�યૂ)',type:'પ�રકાર',typeBtn:'બટન',typeSbm:'સબ�મિટ',typeRst:'રિસેટ'},checkboxAndRadio:{checkboxTitle:'ચેક બોક�સ ગ�ણ',radioTitle:'રેડિઓ બટનના ગ�ણ',value:'વૅલ�યૂ',selected:'સિલેક�ટેડ'},form:{title:'ફૉર�મ/પત�રકના ગ�ણ',menu:'ફૉર�મ/પત�રકના ગ�ણ',action:'ક�રિયા',method:'પદ�ધતિ',encoding:'Encoding'},select:{title:'પસંદગી ક�ષેત�રના ગ�ણ',selectInfo:'સૂચના',opAvail:'ઉપલબ�ધ વિકલ�પ',value:'વૅલ�યૂ',size:'સાઇ�',lines:'લીટીઓ',chkMulti:'�કથી વધારે પસંદ કરી શકો',opText:'ટેક�સ�ટ',opValue:'વૅલ�યૂ',btnAdd:'ઉમેરવ�ં',btnModify:'બદલવ�ં',btnUp:'ઉપર',btnDown:'નીચે',btnSetValue:'પસંદ કરલી વૅલ�યૂ સેટ કરો',btnDelete:'રદ કરવ�ં'},textarea:{title:'ટેક�સ�ટ �અરિઆ, શબ�દ વિસ�તારના ગ�ણ',cols:'કૉલમ/ઊભી કટાર',rows:'પંક�તિઓ'},textfield:{title:'ટેક�સ�ટ ફીલ�ડ, શબ�દ ક�ષેત�રના ગ�ણ',name:'નામ',value:'વૅલ�યૂ',charWidth:'કેરેક�ટરની પહોળાઈ',maxChars:'અધિકતમ કેરેક�ટર',type:'ટાઇપ',typeText:'ટેક�સ�ટ',typePass:'પાસવર�ડ'},hidden:{title:'ગ�પ�ત ક�ષેત�રના ગ�ણ',name:'નામ',value:'વૅલ�યૂ'},image:{title:'ચિત�રના ગ�ણ',titleButton:'ચિત�ર બટનના ગ�ણ',menu:'ચિત�રના ગ�ણ',infoTab:'ચિત�ર ની જાણકારી',btnUpload:'આ સર�વરને મોકલવ�ં',upload:'અપલોડ',alt:'ઑલ�ટર�નટ ટેક�સ�ટ',lockRatio:'લૉક ગ�ણોત�તર',resetSize:'રીસેટ સાઇ�',border:'બોર�ડર',hSpace:'સમસ�તરીય જગ�યા',vSpace:'લંબરૂપ જગ�યા',alertUrl:'ચિત�રની URL ટાઇપ કરો',linkTab:'લિંક',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'ફ�લૅશના ગ�ણ',propertiesTab:'Properties',title:'ફ�લૅશ ગ�ણ',chkPlay:'ઑટો/સ�વયં પ�લે',chkLoop:'લૂપ',chkMenu:'ફ�લૅશ મેન�યૂ નો પ�રયોગ કરો',chkFull:'Allow Fullscreen',scale:'સ�કેલ',scaleAll:'સ�કેલ ઓલ/બધ� બતાવો',scaleNoBorder:'સ�કેલ બોર�ડર વગર',scaleFit:'સ�કેલ �કદમ ફીટ',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs નીચે',alignAbsMiddle:'Abs ઉપર',alignBaseline:'આધાર લીટી',alignTextTop:'ટેક�સ�ટ ઉપર',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'બૅકગ�રાઉન�ડ રંગ,',hSpace:'સમસ�તરીય જગ�યા',vSpace:'લંબરૂપ જગ�યા',validateSrc:'લિંક  URL ટાઇપ કરો',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'જોડણી (સ�પેલિંગ) તપાસવી',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'શબ�દકોશમાં નથી',changeTo:'આનાથી બદલવ�ં',btnIgnore:'ઇગ�નોર/અવગણના કરવી',btnIgnoreAll:'બધાની ઇગ�નોર/અવગણના કરવી',btnReplace:'બદલવ�ં',btnReplaceAll:'બધા બદલી કરો',btnUndo:'અન�ડૂ',noSuggestions:'- કઇ સજેશન નથી -',progress:'શબ�દની જોડણી/સ�પેલ ચેક ચાલ� છે...',noMispell:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: ખોટી જોડણી મળી નથી',noChanges:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: �કપણ શબ�દ બદલયો નથી',oneChange:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: �ક શબ�દ બદલયો છે',manyChanges:'શબ�દની જોડણી/સ�પેલ ચેક પૂર�ણ: %1 શબ�દ બદલયા છે',ieSpellDownload:'સ�પેલ-ચેકર ઇન�સ�ટોલ નથી. શ�ં તમે ડાઉનલોડ કરવા માંગો છો?'},smiley:{toolbar:'સ�માઇલી',title:'સ�માઇલી  પસંદ કરો',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'સંખ�યાંકન સૂચિ',bulletedlist:'બ�લેટ સૂચિ',indent:'ઇન�ડેન�ટ, લીટીના આરંભમાં જગ�યા વધારવી',outdent:'ઇન�ડેન�ટ લીટીના આરંભમાં જગ�યા ઘટાડવી',justify:{left:'ડાબી બાજ��/બાજ� તરફ',center:'સંકેંદ�રણ/સેંટરિંગ',right:'જમણી બાજ��/બાજ� તરફ',block:'બ�લૉક, અંતરાય જસ�ટિફાઇ'},blockquote:'બ�લૉક-કોટ, અવતરણચિહ�નો',clipboard:{title:'પેસ�ટ',cutError:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.',copyError:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प�रयोग करें।',pasteMsg:'Ctrl/Cmd+V નો પ�રયોગ કરી પેસ�ટ કરો',securityMsg:'તમારા બ�રાઉ�ર ની સ�રક�ષિત સેટિંગસના કારણે,�ડિટર તમારા કિલ�પબોર�ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન�ડોમાં ફરીથી પેસ�ટ કરવ�ં પડશે.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'પેસ�ટ (વડૅ ટેક�સ�ટ)',title:'પેસ�ટ (વડૅ ટેક�સ�ટ)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'પેસ�ટ (ટેક�સ�ટ)',title:'પેસ�ટ (ટેક�સ�ટ)'},templates:{button:'ટેમ�પ�લેટ',title:'કન�ટેન�ટ ટેમ�પ�લેટ',options:'Template Options',insertOption:'મૂળ શબ�દને બદલો',selectPromptMsg:'�ડિટરમાં ઓપન કરવા ટેમ�પ�લેટ પસંદ કરો (વર�તમાન કન�ટેન�ટ સેવ નહીં થાય):',emptyListMsg:'(કોઈ ટેમ�પ�લેટ ડિફાઇન નથી)'},showBlocks:'બ�લૉક બતાવવ�ં',stylesCombo:{label:'શૈલી/રીત',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'ફૉન�ટ ફૉર�મટ, રચનાની શૈલી',panelTitle:'ફૉન�ટ ફૉર�મટ, રચનાની શૈલી',tag_p:'સામાન�ય',tag_pre:'ફૉર�મટેડ',tag_address:'સરનામ�ં',tag_h1:'શીર�ષક 1',tag_h2:'શીર�ષક 2',tag_h3:'શીર�ષક 3',tag_h4:'શીર�ષક 4',tag_h5:'શીર�ષક 5',tag_h6:'શીર�ષક 6',tag_div:'શીર�ષક (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'ફૉન�ટ',voiceLabel:'Font',panelTitle:'ફૉન�ટ'},fontSize:{label:'ફૉન�ટ સાઇ�/કદ',voiceLabel:'Font Size',panelTitle:'ફૉન�ટ સાઇ�/કદ'},colorButton:{textColorTitle:'શબ�દનો રંગ',bgColorTitle:'બૅકગ�રાઉન�ડ રંગ,',panelTitle:'Colors',auto:'સ�વચાલિત',more:'ઔર રંગ...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'ડૉક�ય�મન�ટ ગ�ણ/પ�રૉપર�ટિ�',title:'ડૉક�ય�મન�ટ ગ�ણ/પ�રૉપર�ટિ�',design:'Design',meta:'મેટાડૅટા',chooseColor:'Choose',other:'<other>',docTitle:'પેજ મથાળ�ં/ટાઇટલ',charset:'કેરેક�ટર સેટ �ન�કોડિંગ',charsetOther:'અન�ય કેરેક�ટર સેટ �ન�કોડિંગ',charsetASCII:'ASCII',charsetCE:'મધ�ય ય�રોપિઅન (Central European)',charsetCT:'ચાઇની� (Chinese Traditional Big5)',charsetCR:'સિરીલિક (Cyrillic)',charsetGR:'ગ�રીક (Greek)',charsetJP:'જાપાનિ� (Japanese)',charsetKR:'કોરીયન (Korean)',charsetTR:'ટર�કિ (Turkish)',charsetUN:'યૂનિકોડ (UTF-8)',charsetWE:'પશ�ચિમ ય�રોપિઅન (Western European)',docType:'ડૉક�ય�મન�ટ પ�રકાર શીર�ષક',docTypeOther:'અન�ય ડૉક�ય�મન�ટ પ�રકાર શીર�ષક',xhtmlDec:'XHTML સૂચના સમાવિષ�ટ કરવી',bgColor:'બૅકગ�રાઉન�ડ રંગ',bgImage:'બૅકગ�રાઉન�ડ ચિત�ર URL',bgFixed:'સ�ક�રોલ ન થાય તેવ�ં બૅકગ�રાઉન�ડ',txtColor:'શબ�દનો રંગ',margin:'પેજ માર�જિન',marginTop:'ઉપર',marginLeft:'ડાબી',marginRight:'જમણી',marginBottom:'નીચે',metaKeywords:'ડૉક�ય�મન�ટ ઇન�ડેક�સ સંકેતશબ�દ (અલ�પવિરામ (,) થી અલગ કરો)',metaDescription:'ડૉક�ય�મન�ટ વર�ણન',metaAuthor:'લેખક',metaCopyright:'કૉપિરાઇટ',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/he.js b/upload/public/js/3rd_party/ckeditor/lang/he.js
new file mode 100644
index 00000000..2ed8a463
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/he.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.he={dir:'rtl',editorTitle:'עורך טקסט עשיר, %1, לחץ �לט (ALT) + 0 לעזרה.',toolbars:'סרגלי כלי� של העורך',editor:'עורך טקסט עשיר',source:'מקור',newPage:'דף חדש',save:'שמירה',preview:'תצוגה מקדימה',cut:'גזירה',copy:'העתקה',paste:'הדבקה',print:'הדפסה',underline:'קו תחתון',bold:'מודגש',italic:'נטוי',selectAll:'בחירת הכל',removeFormat:'הסרת העיצוב',strike:'כתיב מחוק',subscript:'כתיב תחתון',superscript:'כתיב עליון',horizontalrule:'הוספת קו �ופקי',pagebreak:'הוספת שבירת דף',pagebreakAlt:'שבירת דף',unlink:'הסרת הקישור',undo:'ביטול צעד �חרון',redo:'חזרה על צעד �חרון',common:{browseServer:'סייר השרת',url:'כתובת (URL)',protocol:'פרוטוקול',upload:'העל�ה',uploadSubmit:'שליחה לשרת',image:'תמונה',flash:'פל�ש',form:'טופס',checkbox:'תיבת סימון',radio:'לחצן �פשרויות',textField:'שדה טקסט',textarea:'�יזור טקסט',hiddenField:'שדה חבוי',button:'כפתור',select:'שדה בחירה',imageButton:'כפתור תמונה',notSet:'<ל� נקבע>',id:'זיהוי (ID)',name:'ש�',langDir:'כיוון שפה',langDirLtr:'שמ�ל לימין (LTR)',langDirRtl:'ימין לשמ�ל (RTL)',langCode:'קוד שפה',longDescr:'קישור לתי�ור מפורט',cssClass:'מחלקת עיצוב (CSS Class)',advisoryTitle:'כותרת מוצעת',cssStyle:'סגנון',ok:'�ישור',cancel:'ביטול',close:'סגירה',preview:'תצוגה מקדימה',generalTab:'כללי',advancedTab:'�פשרויות מתקדמות',validateNumberFailed:'הערך חייב להיות מספרי.',confirmNewPage:'כל השינויי� של� נשמרו י�בדו. ה�� להעלות דף חדש?',confirmCancel:'חלק מה�פשרויות שונו, ה�� לסגור �ת הדי�לוג?',options:'�פשרויות',target:'מטרה',targetNew:'חלון חדש (_blank)',targetTop:'החלון העליון ביותר (_top)',targetSelf:'�ותו חלון (_self)',targetParent:'חלון ה�ב (_parent)',langDirLTR:'שמ�ל לימין (LTR)',langDirRTL:'ימין לשמ�ל (RTL)',styles:'סגנון',cssClasses:'מחלקות גליונות סגנון',width:'רוחב',height:'גובה',align:'יישור',alignLeft:'לשמ�ל',alignRight:'לימין',alignCenter:'מרכז',alignTop:'למעלה',alignMiddle:'ל�מצע',alignBottom:'לתחתית',invalidHeight:'הגובה חייב להיות מספר.',invalidWidth:'הרוחב חייב להיות מספר.',invalidCssLength:'הערך שצוין לשדה "%1" חייב להיות מספר חיובי ע� �ו לל� יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, �ו pc).',invalidHtmlLength:'הערך שצוין לשדה "%1" חייב להיות מספר חיובי ע� �ו לל� יחידת מידה חוקית של HTML (px �ו %).',invalidInlineStyle:'הערך שצויין לשדה הסגנון חייב להכיל זוג ערכי� �חד �ו יותר בפורמט "ש� : ערך", מופרדי� על ידי נקודה-פסיק.',cssLengthTooltip:'יש להכניס מספר המייצג פיקסלי� �ו מספר ע� יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, ל� זמין</span>'},contextmenu:{options:'�פשרויות תפריט ההקשר'},specialChar:{toolbar:'הוספת תו מיוחד',title:'בחירת תו מיוחד',options:'�פשרויות תווי� מיוחדי�'},link:{toolbar:'הוספת/עריכת קישור',other:'<�חר>',menu:'מ�פייני קישור',title:'קישור',info:'מידע על הקישור',target:'מטרה',upload:'העל�ה',advanced:'�פשרויות מתקדמות',type:'סוג קישור',toUrl:'כתובת (URL)',toAnchor:'עוגן בעמוד זה',toEmail:'דו�"ל',targetFrame:'<מסגרת>',targetPopup:'<חלון קופץ>',targetFrameName:'ש� מסגרת היעד',targetPopupName:'ש� החלון הקופץ',popupFeatures:'תכונות החלון הקופץ',popupResizable:'שינוי גודל',popupStatusBar:'סרגל חיווי',popupLocationBar:'סרגל כתובת',popupToolbar:'סרגל הכלי�',popupMenuBar:'סרגל תפריט',popupFullScreen:'מסך מל� (IE)',popupScrollBars:'ניתן לגלילה',popupDependent:'תלוי (Netscape)',popupLeft:'מיקו� צד שמ�ל',popupTop:'מיקו� צד עליון',id:'זיהוי (ID)',langDir:'כיוון שפה',langDirLTR:'שמ�ל לימין (LTR)',langDirRTL:'ימין לשמ�ל (RTL)',acccessKey:'מקש גישה',name:'ש�',langCode:'קוד שפה',tabIndex:'מספר ט�ב',advisoryTitle:'כותרת מוצעת',advisoryContentType:'Content Type מוצע',cssClasses:'גיליונות עיצוב קבוצות',charset:'קידוד המש�ב המקושר',styles:'סגנון',rel:'קשר גומלין',selectAnchor:'בחירת עוגן',anchorName:'עפ"י ש� העוגן',anchorId:'עפ"י זיהוי (ID) ה�למנט',emailAddress:'כתובת הדו�"ל',emailSubject:'נוש� ההודעה',emailBody:'גוף ההודעה',noAnchors:'(�ין עוגני� זמיני� בדף)',noUrl:'יש להקליד �ת כתובת הקישור (URL)',noEmail:'יש להקליד �ת כתובת הדו�"ל'},anchor:{toolbar:'הוספת/עריכת נקודת עיגון',menu:'מ�פייני נקודת עיגון',title:'מ�פייני נקודת עיגון',name:'ש� לנקודת עיגון',errorName:'יש להקליד ש� לנקודת עיגון',remove:'מחיקת נקודת עיגון'},list:{numberedTitle:'תכונות רשימה ממוספרת',bulletedTitle:'תכונות רשימת תבליטי�',type:'סוג',start:'תחילת מספור',validateStartNumber:'שדה תחילת המספור חייב להכיל מספר של�.',circle:'עיגול ריק',disc:'עיגול מל�',square:'ריבוע',none:'לל�',notset:'<ל� נקבע>',armenian:'ספרות �רמניות',georgian:"ספרות גי�ורגיות (an, ban, gan וכו')",lowerRoman:"ספירה רומית ב�ותיות קטנות (i, ii, iii, iv, v וכו')",upperRoman:"ספירה רומיות ב�ותיות גדולות (I, II, III, IV, V וכו')",lowerAlpha:"�ותיות �נגליות קטנות (a, b, c, d, e וכו')",upperAlpha:"�ותיות �נגליות גדולות (A, B, C, D, E וכו')",lowerGreek:"�ותיות יווניות קטנות (alpha, beta, gamma וכו')",decimal:"ספרות (1, 2, 3 וכו')",decimalLeadingZero:"ספרות ע� 0 בהתחלה (01, 02, 03 וכו')"},findAndReplace:{title:'חיפוש והחלפה',find:'חיפוש',replace:'החלפה',findWhat:'חיפוש מחרוזת:',replaceWith:'החלפה במחרוזת:',notFoundMsg:'הטקסט המבוקש ל� נמצ�.',findOptions:'�פשרויות חיפוש',matchCase:'הבחנה בין �ותיות רשיות לקטנות (Case)',matchWord:'הת�מה למילה המל�ה',matchCyclic:'הת�מה מחזורית',replaceAll:'החלפה בכל העמוד',replaceSuccessMsg:'%1 טקסטי� הוחלפו.'},table:{toolbar:'טבלה',title:'מ�פייני טבלה',menu:'מ�פייני טבלה',deleteTable:'מחק טבלה',rows:'שורות',columns:'עמודות',border:'גודל מסגרת',widthPx:'פיקסלי�',widthPc:'�חוז',widthUnit:'יחידת רוחב',cellSpace:'מרווח ת�',cellPad:'ריפוד ת�',caption:'כיתוב',summary:'תקציר',headers:'כותרות',headersNone:'�ין',headersColumn:'עמודה ר�שונה',headersRow:'שורה ר�שונה',headersBoth:'שניה�',invalidRows:'שדה מספר השורות חייב להיות מספר גדול מ 0.',invalidCols:'שדה מספר העמודות חייב להיות מספר גדול מ 0.',invalidBorder:'שדה גודל המסגרת חייב להיות מספר.',invalidWidth:'שדה רוחב הטבלה חייב להיות מספר.',invalidHeight:'שדה גובה הטבלה חייב להיות מספר.',invalidCellSpacing:'שדה ריווח הת�י� חייב להיות מספר חיובי.',invalidCellPadding:'שדה ריפוד הת�י� חייב להיות מספר חיובי.',cell:{menu:'מ�פייני ת�',insertBefore:'הוספת ת� לפני',insertAfter:'הוספת ת� �חרי',deleteCell:'מחיקת ת�י�',merge:'מיזוג ת�י�',mergeRight:'מזג ימינה',mergeDown:'מזג למטה',splitHorizontal:'פיצול ת� �ופקית',splitVertical:'פיצול ת� �נכית',title:'תכונות הת�',cellType:'סוג הת�',rowSpan:'מתיחת השורות',colSpan:'מתיחת הת�י�',wordWrap:'מניעת גלישת שורות',hAlign:'יישור �ופקי',vAlign:'יישור �נכי',alignBaseline:'שורת בסיס',bgColor:'צבע רקע',borderColor:'צבע מסגרת',data:'מידע',header:'כותרת',yes:'כן',no:'ל�',invalidWidth:'שדה רוחב הת� חייב להיות מספר.',invalidHeight:'שדה גובה הת� חייב להיות מספר.',invalidRowSpan:'שדה מתיחת השורות חייב להיות מספר של�.',invalidColSpan:'שדה מתיחת העמודות חייב להיות מספר של�.',chooseColor:'בחר'},row:{menu:'שורה',insertBefore:'הוספת שורה לפני',insertAfter:'הוספת שורה �חרי',deleteRow:'מחיקת שורות'},column:{menu:'עמודה',insertBefore:'הוספת עמודה לפני',insertAfter:'הוספת עמודה �חרי',deleteColumn:'מחיקת עמודות'}},button:{title:'מ�פייני כפתור',text:'טקסט (ערך)',type:'סוג',typeBtn:'כפתור',typeSbm:'שליחה',typeRst:'�יפוס'},checkboxAndRadio:{checkboxTitle:'מ�פייני תיבת סימון',radioTitle:'מ�פייני לחצן �פשרויות',value:'ערך',selected:'מסומן'},form:{title:'מ�פיני טופס',menu:'מ�פיני טופס',action:'שלח �ל',method:'סוג שליחה',encoding:'קידוד'},select:{title:'מ�פייני שדה בחירה',selectInfo:'מידע',opAvail:'�פשרויות זמינות',value:'ערך',size:'גודל',lines:'שורות',chkMulti:'�יפשור בחירות מרובות',opText:'טקסט',opValue:'ערך',btnAdd:'הוספה',btnModify:'שינוי',btnUp:'למעלה',btnDown:'למטה',btnSetValue:'קביעה כברירת מחדל',btnDelete:'מחיקה'},textarea:{title:'מ�פייני �יזור טקסט',cols:'עמודות',rows:'שורות'},textfield:{title:'מ�פייני שדה טקסט',name:'ש�',value:'ערך',charWidth:'רוחב לפי תווי�',maxChars:'מקסימו� תווי�',type:'סוג',typeText:'טקסט',typePass:'סיסמה'},hidden:{title:'מ�פיני שדה חבוי',name:'ש�',value:'ערך'},image:{title:'מ�פייני התמונה',titleButton:'מ�פיני כפתור תמונה',menu:'תכונות התמונה',infoTab:'מידע על התמונה',btnUpload:'שליחה לשרת',upload:'העל�ה',alt:'טקסט חלופי',lockRatio:'נעילת היחס',resetSize:'�יפוס הגודל',border:'מסגרת',hSpace:'מרווח �ופקי',vSpace:'מרווח �נכי',alertUrl:'יש להקליד �ת כתובת התמונה',linkTab:'קישור',button2Img:'ה�� להפוך �ת תמונת הכפתור לתמונה פשוטה?',img2Button:'ה�� להפוך �ת התמונה לכפתור תמונה?',urlMissing:'כתובת התמונה חסרה.',validateBorder:'שדה המסגרת חייב להיות מספר של�.',validateHSpace:'שדה המרווח ה�ופקי חייב להיות מספר של�.',validateVSpace:'שדה המרווח ה�נכי חייב להיות מספר של�.'},flash:{properties:'מ�פייני פל�ש',propertiesTab:'מ�פייני�',title:'מ�פיני פל�ש',chkPlay:'ניגון �וטומטי',chkLoop:'לול�ה',chkMenu:'�פשר תפריט פל�ש',chkFull:'�פשר חלון מל�',scale:'גודל',scaleAll:'הצג הכל',scaleNoBorder:'לל� גבולות',scaleFit:'הת�מה מושלמת',access:'גישת סקריפט',accessAlways:'תמיד',accessSameDomain:'דומיין זהה',accessNever:'�ף פע�',alignAbsBottom:'לתחתית ה�בסולוטית',alignAbsMiddle:'מרכוז �בסולוטי',alignBaseline:'לקו התחתית',alignTextTop:'לר�ש הטקסט',quality:'�יכות',qualityBest:'מעולה',qualityHigh:'גבוהה',qualityAutoHigh:'גבוהה �וטומטית',qualityMedium:'ממוצעת',qualityAutoLow:'נמוכה �וטומטית',qualityLow:'נמוכה',windowModeWindow:'חלון',windowModeOpaque:'�טו�',windowModeTransparent:'שקוף',windowMode:'מצב חלון',flashvars:'משתני� לפל�ש',bgcolor:'צבע רקע',hSpace:'מרווח �ופקי',vSpace:'מרווח �נכי',validateSrc:'יש להקליד �ת כתובת סרטון הפל�ש (URL)',validateHSpace:'המרווח ה�ופקי חייב להיות מספר.',validateVSpace:'המרווח ה�נכי חייב להיות מספר.'},spellCheck:{toolbar:'בדיקת �יות',title:'בדיקת �יות',notAvailable:'ל� נמצ� שירות זמין.',errorLoading:'שגי�ה בהעל�ת השירות: %s.',notInDic:'ל� נמצ� במילון',changeTo:'שינוי ל',btnIgnore:'התעלמות',btnIgnoreAll:'התעלמות מהכל',btnReplace:'החלפה',btnReplaceAll:'החלפת הכל',btnUndo:'החזרה',noSuggestions:'- �ין הצעות -',progress:'בודק ה�יות בתהליך בדיקה....',noMispell:'בדיקות �יות הסתיימה: ל� נמצ�ו שגי�ות כתיב',noChanges:'בדיקות �יות הסתיימה: ל� שונתה �ף מילה',oneChange:'בדיקות �יות הסתיימה: שונתה מילה �חת',manyChanges:'בדיקות �יות הסתיימה: %1 מילי� שונו',ieSpellDownload:'בודק ה�יות ל� מותקן, ה�� להורידו?'},smiley:{toolbar:'סמיילי',title:'הוספת סמיילי',options:'�פשרויות סמיילי�'},elementsPath:{eleLabel:'עץ ה�למנטי�',eleTitle:'%1 �למנט'},numberedlist:'רשימה ממוספרת',bulletedlist:'רשימת נקודות',indent:'הגדלת הזחה',outdent:'הקטנת הזחה',justify:{left:'יישור לשמ�ל',center:'מרכוז',right:'יישור לימין',block:'יישור לשוליי�'},blockquote:'בלוק ציטוט',clipboard:{title:'הדבקה',cutError:'הגדרות ה�בטחה בדפדפן שלך ל� מ�פשרות לעורך לבצע פעולות גזירה �וטומטיות. יש להשתמש במקלדת לש� כך (Ctrl/Cmd+X).',copyError:'הגדרות ה�בטחה בדפדפן שלך ל� מ�פשרות לעורך לבצע פעולות העתקה �וטומטיות. יש להשתמש במקלדת לש� כך (Ctrl/Cmd+C).',pasteMsg:'נ� להדביק בתוך הקופסה ב�מצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>�ישור</b>.',securityMsg:'עקב הגדרות �בטחה בדפדפן, ל� ניתן לגשת �ל לוח הגזירי� (Clipboard) בצורה ישירה. נ� להדביק שוב בחלון זה.',pasteArea:'�יזור הדבקה'},pastefromword:{confirmCleanup:'נר�ה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. ה�� ברצונך לנקות �ותו טר� ההדבקה?',toolbar:'הדבקה מ-Word',title:'הדבקה מ-Word',error:'ל� ניתן היה לנקות �ת המידע בשל תקלה פנימית.'},pasteText:{button:'הדבקה כטקסט פשוט',title:'הדבקה כטקסט פשוט'},templates:{button:'תבניות',title:'תביות תוכן',options:'�פשרויות התבניות',insertOption:'החלפת תוכן ממשי',selectPromptMsg:'יש לבחור תבנית לפתיחה בעורך.<br />התוכן המקורי ימחק:',emptyListMsg:'(ל� הוגדרו תבניות)'},showBlocks:'הצגת בלוקי�',stylesCombo:{label:'סגנון',panelTitle:'סגנונות פורמט',panelTitle1:'סגנונות בלוק',panelTitle2:'סגנונות רצף',panelTitle3:'סגנונות �ובייקט'},format:{label:'עיצוב',panelTitle:'עיצוב',tag_p:'נורמלי',tag_pre:'קוד',tag_address:'כתובת',tag_h1:'כותרת',tag_h2:'כותרת 2',tag_h3:'כותרת 3',tag_h4:'כותרת 4',tag_h5:'כותרת 5',tag_h6:'כותרת 6',tag_div:'נורמלי (DIV)'},div:{title:'יצירת מיכל (Div)',toolbar:'יצירת מיכל (Div)',cssClassInputLabel:'מחלקת עיצוב',styleSelectLabel:'סגנון',IdInputLabel:'מזהה (ID)',languageCodeInputLabel:'קוד שפה',inlineStyleInputLabel:'סגנון פנימי',advisoryTitleInputLabel:'כותרת מוצעת',langDirLabel:'כיוון שפה',langDirLTRLabel:'שמ�ל לימין (LTR)',langDirRTLLabel:'ימין לשמ�ל (RTL)',edit:'עריכת מיכל (Div)',remove:'הסרת מיכל (Div)'},iframe:{title:'מ�פייני חלון פנימי (iframe)',toolbar:'חלון פנימי (iframe)',noUrl:'יש להכניס כתובת לחלון.',scrolling:'�פשר פסי גלילה',border:'הר�ה מסגרת לחלון'},font:{label:'גופן',voiceLabel:'גופן',panelTitle:'גופן'},fontSize:{label:'גודל',voiceLabel:'גודל',panelTitle:'גודל'},colorButton:{textColorTitle:'צבע טקסט',bgColorTitle:'צבע רקע',panelTitle:'צבעי�',auto:'�וטומטי',more:'צבעי� נוספי�...'},colors:{'000':'שחור',800000:'סגול כהה','8B4513':'חו� בהיר','2F4F4F':'�פור צפחה','008080':'כחול-ירוק','000080':'כחול-סגול','4B0082':'�ינדיגו',696969:'�פור מעומע�',B22222:'�דו�-חו�',A52A2A:'חו�',DAA520:'כתו� זהב','006400':'ירוק כהה','40E0D0':'טורקיז','0000CD':'כחול בינוני',800080:'סגול',808080:'�פור',F00:'�דו�',FF8C00:'כתו� כהה',FFD700:'זהב','008000':'ירוק','0FF':'צי�ן','00F':'כחול',EE82EE:'סגלגל',A9A9A9:'�פור כהה',FFA07A:'כתו�-וורוד',FFA500:'כתו�',FFFF00:'צהוב','00FF00':'ליי�',AFEEEE:'טורקיז בהיר',ADD8E6:'כחול בהיר',DDA0DD:'שזיף',D3D3D3:'�פור בהיר',FFF0F5:'לבנדר מסמיק',FAEBD7:'לבן עתיק',FFFFE0:'צהוב בהיר',F0FFF0:'טל דבש',F0FFFF:'תכלת',F0F8FF:'כחול טיפת מי�',E6E6FA:'לבנדר',FFF:'לבן'},scayt:{title:'בדיקת �יות בזמן כתיבה (SCAYT)',opera_title:'ל� זמין בדפדפן �ופרה',enable:'�פשר SCAYT',disable:'בטל SCAYT',about:'�ודות SCAYT',toggle:'שינוי SCAYT',options:'�פשרויות',langs:'שפות',moreSuggestions:'הצעות נוספות',ignore:'התעלמות',ignoreAll:'התעלמות מהכל',addWord:'הוספת מילה',emptyDic:'יש לבחור מילון.',optionsTab:'�פשרויות',allCaps:'התעל� ממילי� שכל �ותיותיהן גדולות',ignoreDomainNames:'התעל� משמות מתח�',mixedCase:'התעל� ממילי� ע� �ותיות גדולות וקטנות ביחד',mixedWithDigits:'התעל� ממילי� ע� מספרי�',languagesTab:'שפות',dictionariesTab:'מילון',dic_field_name:'ש� המילון',dic_create:'יצירה',dic_restore:'שחזור',dic_delete:'מחיקה',dic_rename:'שינוי ש�',dic_info:'בהתחלה מילון המשתמש מ�וחסן בעוגיה, �ך עוגיות מוגבלות במקו�. כ�שר המילון מגיע לגודל בו הו� �ינו יכול להת�כסן בעוגיה, המילון צריך להת�כסן בשרתנו. לש� כך עליך לתת ש� למילון. �� כבר יש לך מילון מ�וחסן, יש להכניס �ת שמו וללחוץ על כפתור השחזור.',aboutTab:'�ודות'},about:{title:'�ודות CKEditor',dlgTitle:'�ודות CKEditor',help:'היכנסו ל$1 לעזרה.',userGuide:'מדריך המשתמש של CKEditor',moreInfo:'למידע נוסף בקרו ב�תרנו:',copy:'Copyright &copy; $1. כל הזכויות שמורות.'},maximize:'הגדלה למקסימו�',minimize:'הקטנה למינימו�',fakeobjects:{anchor:'עוגן',flash:'סרטון פל�ש',iframe:'חלון פנימי (iframe)',hiddenfield:'שדה חבוי',unknown:'�ובייקט ל� ידוע'},resize:'יש לגרור בכדי לשנות �ת הגודל',colordialog:{title:'בחירת צבע',options:'�פשרויות צבע',highlight:'סימון',selected:'בחירה',clear:'ניקוי'},toolbarCollapse:'מזעור סרגל כלי�',toolbarExpand:'הרחבת סרגל כלי�',toolbarGroups:{document:'מסמך',clipboard:'לוח הגזירי� (Clipboard)/צעד �חרון',editing:'עריכה',forms:'טפסי�',basicstyles:'עיצוב בסיסי',paragraph:'פסקה',links:'קישורי�',insert:'הכנסה',styles:'עיצוב',colors:'צבעי�',tools:'כלי�'},bidi:{ltr:'כיוון טקסט משמ�ל לימין (LTR)',rtl:'כיוון טקסט מימין לשמ�ל (RTL)'},docprops:{label:'מ�פייני מסמך',title:'מ�פייני מסמך',design:'עיצוב',meta:'תגי Meta',chooseColor:'בחירה',other:'�חר...',docTitle:'כותרת עמוד',charset:'קידוד תווי�',charsetOther:'קידוד תווי� �חר',charsetASCII:'ASCII',charsetCE:'מרכז �ירופ�י',charsetCT:'סיני מסורתי (Big5)',charsetCR:'קירילי',charsetGR:'יווני',charsetJP:'יפני',charsetKR:'קורי�ני',charsetTR:'טורקי',charsetUN:'יוניקוד (UTF-8)',charsetWE:'מערב �ירופ�י',docType:'כותר סוג מסמך',docTypeOther:'כותר סוג מסמך �חר',xhtmlDec:'כלול הכרזות XHTML',bgColor:'צבע רקע',bgImage:'כתובת של תמונת רקע',bgFixed:'רקע ל� נגלל (צמוד)',txtColor:'צבע טקסט',margin:'מרווחי עמוד',marginTop:'עליון',marginLeft:'שמ�לי',marginRight:'ימני',marginBottom:'תחתון',metaKeywords:'מילות מפתח של המסמך (מופרדות בפסיק)',metaDescription:'תי�ור המסמך',metaAuthor:'מחבר/ת',metaCopyright:'זכויות יוצרי�',previewHtml:'<p>זהו <strong>טקסט הדגמה</strong>. �ת/ה משתמש/ת ב<a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/hi.js b/upload/public/js/3rd_party/ckeditor/lang/hi.js
new file mode 100644
index 00000000..92035c73
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/hi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hi={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'सोर�स',newPage:'नया पेज',save:'सेव',preview:'प�रीव�यू',cut:'कट',copy:'कॉपी',paste:'पेस�ट',print:'प�रिन�ट',underline:'रेखांकण',bold:'बोल�ड',italic:'इटैलिक',selectAll:'सब सॅलॅक�ट करें',removeFormat:'फ़ॉर�मैट हटायें',strike:'स�ट�राइक थ�रू',subscript:'अधोलेख',superscript:'अभिलेख',horizontalrule:'हॉरिज़ॉन�टल रेखा इन�सर�ट करें',pagebreak:'पेज ब�रेक इन�सर�ट� करें',pagebreakAlt:'Page Break',unlink:'लिंक हटायें',undo:'अन�डू',redo:'रीडू',common:{browseServer:'सर�वर ब�राउज़ करें',url:'URL',protocol:'प�रोटोकॉल',upload:'अपलोड',uploadSubmit:'इसे सर�वर को भेजें',image:'तस�वीर',flash:'फ़�लैश',form:'फ़ॉर�म',checkbox:'चॅक बॉक�स',radio:'रेडिओ बटन',textField:'टेक�स�ट फ़ील�ड',textarea:'टेक�स�ट �रिया',hiddenField:'ग�प�त फ़ील�ड',button:'बटन',select:'च�नाव फ़ील�ड',imageButton:'तस�वीर बटन',notSet:'<सॅट नहीं>',id:'Id',name:'नाम',langDir:'भाषा लिखने की दिशा',langDirLtr:'बायें से दायें (LTR)',langDirRtl:'दायें से बायें (RTL)',langCode:'भाषा कोड',longDescr:'अधिक विवरण के लि� URL',cssClass:'स�टाइल-शीट क�लास',advisoryTitle:'परामर�श शीर�शक',cssStyle:'स�टाइल',ok:'ठीक है',cancel:'रद�द करें',close:'Close',preview:'Preview',generalTab:'सामान�य',advancedTab:'�ड�वान�स�ड',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'चौड़ाई',height:'ऊ�चाई',align:'�लाइन',alignLeft:'दायें',alignRight:'दायें',alignCenter:'बीच में',alignTop:'ऊपर',alignMiddle:'मध�य',alignBottom:'नीचे',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'विशेष करॅक�टर इन�सर�ट करें',title:'विशेष करॅक�टर च�नें',options:'Special Character Options'},link:{toolbar:'लिंक इन�सर�ट/संपादन',other:'<अन�य>',menu:'लिंक संपादन',title:'लिंक',info:'लिंक  ',target:'टार�गेट',upload:'अपलोड',advanced:'�ड�वान�स�ड',type:'लिंक प�रकार',toUrl:'URL',toAnchor:'इस पेज का �ंकर',toEmail:'ई-मेल',targetFrame:'<फ़�रेम>',targetPopup:'<पॉप-अप विन�डो>',targetFrameName:'टार�गेट फ़�रेम का नाम',targetPopupName:'पॉप-अप विन�डो का नाम',popupFeatures:'पॉप-अप विन�डो फ़ीचर�स',popupResizable:'Resizable',popupStatusBar:'स�टेटस बार',popupLocationBar:'लोकेशन बार',popupToolbar:'टूल बार',popupMenuBar:'मॅन�यू बार',popupFullScreen:'फ़�ल स�क�रीन (IE)',popupScrollBars:'स�क�रॉल बार',popupDependent:'डिपेन�डॅन�ट (Netscape)',popupLeft:'बायीं तरफ',popupTop:'दायीं तरफ',id:'Id',langDir:'भाषा लिखने की दिशा',langDirLTR:'बायें से दायें (LTR)',langDirRTL:'दायें से बायें (RTL)',acccessKey:'�क�सॅस की',name:'नाम',langCode:'भाषा लिखने की दिशा',tabIndex:'टैब इन�डॅक�स',advisoryTitle:'परामर�श शीर�शक',advisoryContentType:'परामर�श कन�टॅन�ट प�रकार',cssClasses:'स�टाइल-शीट क�लास',charset:'लिंक रिसोर�स करॅक�टर सॅट',styles:'स�टाइल',rel:'Relationship',selectAnchor:'�ंकर च�नें',anchorName:'�ंकर नाम से',anchorId:'�लीमॅन�ट Id से',emailAddress:'ई-मेल पता',emailSubject:'संदेश विषय',emailBody:'संदेश',noAnchors:'(डॉक�यूमॅन�ट में �ंकर�स की संख�या)',noUrl:'लिंक URL टाइप करें',noEmail:'ई-मेल पता टाइप करें'},anchor:{toolbar:'�ंकर इन�सर�ट/संपादन',menu:'�ंकर प�रॉपर�टीज़',title:'�ंकर प�रॉपर�टीज़',name:'�ंकर का नाम',errorName:'�ंकर का नाम टाइप करें',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'खोजें और बदलें',find:'खोजें',replace:'रीप�लेस',findWhat:'यह खोजें:',replaceWith:'इससे रिप�लेस करें:',notFoundMsg:'आपके द�वारा दिया गया टेक�स�ट नहीं मिला',findOptions:'Find Options',matchCase:'केस मिलायें',matchWord:'पूरा शब�द मिलायें',matchCyclic:'Match cyclic',replaceAll:'सभी रिप�लेस करें',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'टेबल',title:'टेबल प�रॉपर�टीज़',menu:'टेबल प�रॉपर�टीज़',deleteTable:'टेबल डिलीट करें',rows:'पंक�तिया�',columns:'कालम',border:'बॉर�डर साइज़',widthPx:'पिक�सैल',widthPc:'प�रतिशत',widthUnit:'width unit',cellSpace:'सैल अंतर',cellPad:'सैल पैडिंग',caption:'शीर�षक',summary:'सारांश',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'खाना',insertBefore:'पहले सैल डालें',insertAfter:'बाद में सैल डालें',deleteCell:'सैल डिलीट करें',merge:'सैल मिलायें',mergeRight:'बा�या विलय',mergeDown:'नीचे विलय करें',splitHorizontal:'सैल को क�षैतिज स�थिति में विभाजित करें',splitVertical:'सैल को लम�बाकार में विभाजित करें',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'पंक�ति',insertBefore:'पहले पंक�ति डालें',insertAfter:'बाद में पंक�ति डालें',deleteRow:'पंक�तिया� डिलीट करें'},column:{menu:'कालम',insertBefore:'पहले कालम डालें',insertAfter:'बाद में कालम डालें',deleteColumn:'कालम डिलीट करें'}},button:{title:'बटन प�रॉपर�टीज़',text:'टेक�स�ट (वैल�यू)',type:'प�रकार',typeBtn:'बटन',typeSbm:'सब�मिट',typeRst:'रिसेट'},checkboxAndRadio:{checkboxTitle:'चॅक बॉक�स प�रॉपर�टीज़',radioTitle:'रेडिओ बटन प�रॉपर�टीज़',value:'वैल�यू',selected:'सॅलॅक�टॅड'},form:{title:'फ़ॉर�म प�रॉपर�टीज़',menu:'फ़ॉर�म प�रॉपर�टीज़',action:'क�रिया',method:'तरीका',encoding:'Encoding'},select:{title:'च�नाव फ़ील�ड प�रॉपर�टीज़',selectInfo:'सूचना',opAvail:'उपलब�ध विकल�प',value:'वैल�यू',size:'साइज़',lines:'पंक�तिया�',chkMulti:'�क से ज�यादा विकल�प च�नने दें',opText:'टेक�स�ट',opValue:'वैल�यू',btnAdd:'जोड़ें',btnModify:'बदलें',btnUp:'ऊपर',btnDown:'नीचे',btnSetValue:'च�नी गई वैल�यू सॅट करें',btnDelete:'डिलीट'},textarea:{title:'टेक�स�त �रिया प�रॉपर�टीज़',cols:'कालम',rows:'पंक�तियां'},textfield:{title:'टेक�स�ट फ़ील�ड प�रॉपर�टीज़',name:'नाम',value:'वैल�यू',charWidth:'करॅक�टर की चौ�ाई',maxChars:'अधिकतम करॅक�टर',type:'टाइप',typeText:'टेक�स�ट',typePass:'पास�वर�ड'},hidden:{title:'ग�प�त फ़ील�ड प�रॉपर�टीज़',name:'नाम',value:'वैल�यू'},image:{title:'तस�वीर प�रॉपर�टीज़',titleButton:'तस�वीर बटन प�रॉपर�टीज़',menu:'तस�वीर प�रॉपर�टीज़',infoTab:'तस�वीर की जानकारी',btnUpload:'इसे सर�वर को भेजें',upload:'अपलोड',alt:'वैकल�पिक टेक�स�ट',lockRatio:'लॉक अन�पात',resetSize:'रीसॅट साइज़',border:'बॉर�डर',hSpace:'हॉरिज़ॉन�टल स�पेस',vSpace:'वर�टिकल स�पेस',alertUrl:'तस�वीर का URL टाइप करें ',linkTab:'लिंक',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'फ़�लैश प�रॉपर�टीज़',propertiesTab:'Properties',title:'फ़�लैश प�रॉपर�टीज़',chkPlay:'ऑटो प�ले',chkLoop:'लूप',chkMenu:'फ़�लैश मॅन�यू का प�रयोग करें',chkFull:'Allow Fullscreen',scale:'स�केल',scaleAll:'सभी दिखायें',scaleNoBorder:'कोई बॉर�डर नहीं',scaleFit:'बिल�क�ल फ़िट',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs नीचे',alignAbsMiddle:'Abs ऊपर',alignBaseline:'मूल रेखा',alignTextTop:'टेक�स�ट ऊपर',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'बैक�ग�राउन�ड रंग',hSpace:'हॉरिज़ॉन�टल स�पेस',vSpace:'वर�टिकल स�पेस',validateSrc:'लिंक URL टाइप करें',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'वर�तनी (स�पेलिंग) जा�च',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'शब�दकोश में नहीं',changeTo:'इसमें बदलें',btnIgnore:'इग�नोर',btnIgnoreAll:'सभी इग�नोर करें',btnReplace:'रिप�लेस',btnReplaceAll:'सभी रिप�लेस करें',btnUndo:'अन�डू',noSuggestions:'- कोई स��ाव नहीं -',progress:'वर�तनी की जा�च (स�पॅल-चॅक) जारी है...',noMispell:'वर�तनी की जा�च : कोई गलत वर�तनी (स�पॅलिंग) नहीं पाई गई',noChanges:'वर�तनी की जा�च :कोई शब�द नहीं बदला गया',oneChange:'वर�तनी की जा�च : �क शब�द बदला गया',manyChanges:'वर�तनी की जा�च : %1 शब�द बदले गये',ieSpellDownload:'स�पॅल-चॅकर इन�स�टाल नहीं किया गया है। क�या आप इसे डाउनलोड करना चाहेंगे?'},smiley:{toolbar:'स�माइली',title:'स�माइली इन�सर�ट करें',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'अंकीय सूची',bulletedlist:'ब�लॅट सूची',indent:'इन�डॅन�ट ब�ायें',outdent:'इन�डॅन�ट कम करें',justify:{left:'बायीं तरफ',center:'बीच में',right:'दायीं तरफ',block:'ब�लॉक जस�टीफ़ाई'},blockquote:'ब�लॉक-कोट',clipboard:{title:'पेस�ट',cutError:'आपके ब�राउज़र की स�रक�षा सॅटिन�ग�स ने कट करने की अन�मति नहीं प�रदान की है। (Ctrl/Cmd+X) का प�रयोग करें।',copyError:'आपके ब�राआउज़र की स�रक�षा सॅटिन�ग�स ने कॉपी करने की अन�मति नहीं प�रदान की है। (Ctrl/Cmd+C) का प�रयोग करें।',pasteMsg:'Ctrl/Cmd+V का प�रयोग करके पेस�ट करें और ठीक है करें.',securityMsg:'आपके ब�राउज़र की स�रक�षा आपके ब�राउज़र की स�रKश सैटिंग के कारण, �डिटर आपके क�लिपबोर�ड डेटा को नहीं पा सकता है. आपको उसे इस विन�डो में दोबारा पेस�ट करना होगा.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'पेस�ट (वर�ड से)',title:'पेस�ट (वर�ड से)',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'पेस�ट (सादा टॅक�स�ट)',title:'पेस�ट (सादा टॅक�स�ट)'},templates:{button:'टॅम�प�लेट',title:'कन�टेन�ट टॅम�प�लेट',options:'Template Options',insertOption:'मूल शब�दों को बदलें',selectPromptMsg:'�डिटर में ओपन करने हेत� टॅम�प�लेट च�नें(वर�तमान कन�टॅन�ट सेव नहीं होंगे):',emptyListMsg:'(कोई टॅम�प�लेट डिफ़ाइन नहीं किया गया है)'},showBlocks:'ब�लॉक दिखायें',stylesCombo:{label:'स�टाइल',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'फ़ॉर�मैट',panelTitle:'फ़ॉर�मैट',tag_p:'साधारण',tag_pre:'फ़ॉर�मैटॅड',tag_address:'पता',tag_h1:'शीर�षक 1',tag_h2:'शीर�षक 2',tag_h3:'शीर�षक 3',tag_h4:'शीर�षक 4',tag_h5:'शीर�षक 5',tag_h6:'शीर�षक 6',tag_div:'शीर�षक (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'फ़ॉन�ट',voiceLabel:'Font',panelTitle:'फ़ॉन�ट'},fontSize:{label:'साइज़',voiceLabel:'Font Size',panelTitle:'साइज़'},colorButton:{textColorTitle:'टेक�स�ट रंग',bgColorTitle:'बैक�ग�राउन�ड रंग',panelTitle:'Colors',auto:'स�वचालित',more:'और रंग...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'डॉक�यूमॅन�ट प�रॉपर�टीज़',title:'डॉक�यूमॅन�ट प�रॉपर�टीज़',design:'Design',meta:'मॅटाडेटा',chooseColor:'Choose',other:'<अन�य>',docTitle:'पेज शीर�षक',charset:'करेक�टर सॅट �न�कोडिंग',charsetOther:'अन�य करेक�टर सॅट �न�कोडिंग',charsetASCII:'ASCII',charsetCE:'मध�य यूरोपीय (Central European)',charsetCT:'चीनी (Chinese Traditional Big5)',charsetCR:'सिरीलिक (Cyrillic)',charsetGR:'यवन (Greek)',charsetJP:'जापानी (Japanese)',charsetKR:'कोरीयन (Korean)',charsetTR:'त�र�की (Turkish)',charsetUN:'यूनीकोड (UTF-8)',charsetWE:'पश�चिम यूरोपीय (Western European)',docType:'डॉक�यूमॅन�ट प�रकार शीर�षक',docTypeOther:'अन�य डॉक�यूमॅन�ट प�रकार शीर�षक',xhtmlDec:'XHTML सूचना सम�मिलित करें',bgColor:'बैक�ग�राउन�ड रंग',bgImage:'बैक�ग�राउन�ड तस�वीर URL',bgFixed:'स�क�रॉल न करने वाला बैक�ग�राउन�ड',txtColor:'टेक�स�ट रंग',margin:'पेज मार�जिन',marginTop:'ऊपर',marginLeft:'बायें',marginRight:'दायें',marginBottom:'नीचे',metaKeywords:'डॉक�य�मॅन�ट इन�डेक�स संकेतशब�द (अल�पविराम से अलग करें)',metaDescription:'डॉक�यूमॅन�ट करॅक�टरन',metaAuthor:'लेखक',metaCopyright:'कॉपीराइट',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/hr.js b/upload/public/js/3rd_party/ckeditor/lang/hr.js
new file mode 100644
index 00000000..1eb06e5b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/hr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hr={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kôd',newPage:'Nova stranica',save:'Snimi',preview:'Pregledaj',cut:'Izreži',copy:'Kopiraj',paste:'Zalijepi',print:'Ispiši',underline:'Potcrtano',bold:'Podebljaj',italic:'Ukosi',selectAll:'Odaberi sve',removeFormat:'Ukloni formatiranje',strike:'Precrtano',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Ubaci vodoravnu liniju',pagebreak:'Ubaci prijelom stranice',pagebreakAlt:'Page Break',unlink:'Ukloni link',undo:'Poništi',redo:'Ponovi',common:{browseServer:'Pretraži server',url:'URL',protocol:'Protokol',upload:'Pošalji',uploadSubmit:'Pošalji na server',image:'Slika',flash:'Flash',form:'Form',checkbox:'Checkbox',radio:'Radio Button',textField:'Text Field',textarea:'Textarea',hiddenField:'Hidden Field',button:'Button',select:'Selection Field',imageButton:'Image Button',notSet:'<nije postavljeno>',id:'Id',name:'Naziv',langDir:'Smjer jezika',langDirLtr:'S lijeva na desno (LTR)',langDirRtl:'S desna na lijevo (RTL)',langCode:'Kôd jezika',longDescr:'Duga�ki opis URL',cssClass:'Stylesheet klase',advisoryTitle:'Advisory naslov',cssStyle:'Stil',ok:'OK',cancel:'Poništi',close:'Close',preview:'Preview',generalTab:'Općenito',advancedTab:'Napredno',validateNumberFailed:'Ova vrijednost nije broj.',confirmNewPage:'Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite u�itati novu stranicu?',confirmCancel:'Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Visina',align:'Poravnaj',alignLeft:'Lijevo',alignRight:'Desno',alignCenter:'Središnje',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dolje',invalidHeight:'Visina mora biti broj.',invalidWidth:'Širina mora biti broj.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nedostupno</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Ubaci posebne znakove',title:'Odaberite posebni karakter',options:'Special Character Options'},link:{toolbar:'Ubaci/promijeni link',other:'<drugi>',menu:'Promijeni link',title:'Link',info:'Link Info',target:'Meta',upload:'Pošalji',advanced:'Napredno',type:'Link vrsta',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<okvir>',targetPopup:'<popup prozor>',targetFrameName:'Ime ciljnog okvira',targetPopupName:'Naziv popup prozora',popupFeatures:'Mogućnosti popup prozora',popupResizable:'Promjenjiva veli�ina',popupStatusBar:'Statusna traka',popupLocationBar:'Traka za lokaciju',popupToolbar:'Traka s alatima',popupMenuBar:'Izborna traka',popupFullScreen:'Cijeli ekran (IE)',popupScrollBars:'Scroll traka',popupDependent:'Ovisno (Netscape)',popupLeft:'Lijeva pozicija',popupTop:'Gornja pozicija',id:'Id',langDir:'Smjer jezika',langDirLTR:'S lijeva na desno (LTR)',langDirRTL:'S desna na lijevo (RTL)',acccessKey:'Pristupna tipka',name:'Naziv',langCode:'Smjer jezika',tabIndex:'Tab Indeks',advisoryTitle:'Advisory naslov',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Stylesheet klase',charset:'Kodna stranica povezanih resursa',styles:'Stil',rel:'Relationship',selectAnchor:'Odaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id elementa',emailAddress:'E-Mail adresa',emailSubject:'Naslov',emailBody:'Sadržaj poruke',noAnchors:'(Nema dostupnih sidra)',noUrl:'Molimo upišite URL link',noEmail:'Molimo upišite e-mail adresu'},anchor:{toolbar:'Ubaci/promijeni sidro',menu:'Svojstva sidra',title:'Svojstva sidra',name:'Ime sidra',errorName:'Molimo unesite ime sidra',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Pronađi i zamijeni',find:'Pronađi',replace:'Zamijeni',findWhat:'Pronađi:',replaceWith:'Zamijeni s:',notFoundMsg:'Traženi tekst nije pronađen.',findOptions:'Find Options',matchCase:'Usporedi mala/velika slova',matchWord:'Usporedi cijele rije�i',matchCyclic:'Usporedi kružno',replaceAll:'Zamijeni sve',replaceSuccessMsg:'Zamijenjeno %1 pojmova.'},table:{toolbar:'Tablica',title:'Svojstva tablice',menu:'Svojstva tablice',deleteTable:'Izbriši tablicu',rows:'Redova',columns:'Kolona',border:'Veli�ina okvira',widthPx:'piksela',widthPc:'postotaka',widthUnit:'width unit',cellSpace:'Prostornost ćelija',cellPad:'Razmak ćelija',caption:'Naslov',summary:'Sažetak',headers:'Zaglavlje',headersNone:'Ništa',headersColumn:'Prva kolona',headersRow:'Prvi red',headersBoth:'Oba',invalidRows:'Broj redova mora biti broj veći od 0.',invalidCols:'Broj kolona mora biti broj veći od 0.',invalidBorder:'Debljina ruba mora biti broj.',invalidWidth:'Širina tablice mora biti broj.',invalidHeight:'Visina tablice mora biti broj.',invalidCellSpacing:'Prostornost ćelija mora biti broj.',invalidCellPadding:'Razmak ćelija mora biti broj.',cell:{menu:'Ćelija',insertBefore:'Ubaci ćeliju prije',insertAfter:'Ubaci ćeliju poslije',deleteCell:'Izbriši ćelije',merge:'Spoji ćelije',mergeRight:'Spoji desno',mergeDown:'Spoji dolje',splitHorizontal:'Podijeli ćeliju vodoravno',splitVertical:'Podijeli ćeliju okomito',title:'Svojstva ćelije',cellType:'Vrsta ćelije',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Prelazak u novi red',hAlign:'Vodoravno poravnanje',vAlign:'Okomito poravnanje',alignBaseline:'Osnovna linija',bgColor:'Boja pozadine',borderColor:'Boja ruba',data:'Podatak',header:'Zaglavlje',yes:'Da',no:'ne',invalidWidth:'Širina ćelije mora biti broj.',invalidHeight:'Visina ćelije mora biti broj.',invalidRowSpan:'Rows span mora biti cijeli broj.',invalidColSpan:'Columns span mora biti cijeli broj.',chooseColor:'Choose'},row:{menu:'Red',insertBefore:'Ubaci red prije',insertAfter:'Ubaci red poslije',deleteRow:'Izbriši redove'},column:{menu:'Kolona',insertBefore:'Ubaci kolonu prije',insertAfter:'Ubaci kolonu poslije',deleteColumn:'Izbriši kolone'}},button:{title:'Image Button svojstva',text:'Tekst (vrijednost)',type:'Vrsta',typeBtn:'Gumb',typeSbm:'Pošalji',typeRst:'Poništi'},checkboxAndRadio:{checkboxTitle:'Checkbox svojstva',radioTitle:'Radio Button svojstva',value:'Vrijednost',selected:'Odabrano'},form:{title:'Form svojstva',menu:'Form svojstva',action:'Akcija',method:'Metoda',encoding:'Encoding'},select:{title:'Selection svojstva',selectInfo:'Info',opAvail:'Dostupne opcije',value:'Vrijednost',size:'Veli�ina',lines:'linija',chkMulti:'Dozvoli višestruki odabir',opText:'Tekst',opValue:'Vrijednost',btnAdd:'Dodaj',btnModify:'Promijeni',btnUp:'Gore',btnDown:'Dolje',btnSetValue:'Postavi kao odabranu vrijednost',btnDelete:'Obriši'},textarea:{title:'Textarea svojstva',cols:'Kolona',rows:'Redova'},textfield:{title:'Text Field svojstva',name:'Ime',value:'Vrijednost',charWidth:'Širina',maxChars:'Najviše karaktera',type:'Vrsta',typeText:'Tekst',typePass:'Šifra'},hidden:{title:'Hidden Field svojstva',name:'Ime',value:'Vrijednost'},image:{title:'Svojstva slika',titleButton:'Image Button svojstva',menu:'Svojstva slika',infoTab:'Info slike',btnUpload:'Pošalji na server',upload:'Pošalji',alt:'Alternativni tekst',lockRatio:'Zaklju�aj odnos',resetSize:'Obriši veli�inu',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Unesite URL slike',linkTab:'Link',button2Img:'Želite li promijeniti odabrani gumb u jednostavnu sliku?',img2Button:'Želite li promijeniti odabranu sliku u gumb?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash svojstva',propertiesTab:'Svojstva',title:'Flash svojstva',chkPlay:'Auto Play',chkLoop:'Ponavljaj',chkMenu:'Omogući Flash izbornik',chkFull:'Omogući Fullscreen',scale:'Omjer',scaleAll:'Prikaži sve',scaleNoBorder:'Bez okvira',scaleFit:'To�na veli�ina',access:'Script Access',accessAlways:'Uvijek',accessSameDomain:'Ista domena',accessNever:'Nikad',alignAbsBottom:'Abs dolje',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Kvaliteta',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Vrsta prozora',flashvars:'Varijable za Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Molimo upišite URL link',validateHSpace:'HSpace mora biti broj.',validateVSpace:'VSpace mora biti broj.'},spellCheck:{toolbar:'Provjeri pravopis',title:'Provjera pravopisa',notAvailable:'Žao nam je, ali usluga trenutno nije dostupna.',errorLoading:'Greška u�itavanja aplikacije: %s.',notInDic:'Nije u rje�niku',changeTo:'Promijeni u',btnIgnore:'Zanemari',btnIgnoreAll:'Zanemari sve',btnReplace:'Zamijeni',btnReplaceAll:'Zamijeni sve',btnUndo:'Vrati',noSuggestions:'-Nema preporuke-',progress:'Provjera u tijeku...',noMispell:'Provjera završena: Nema grešaka',noChanges:'Provjera završena: Nije napravljena promjena',oneChange:'Provjera završena: Jedna rije� promjenjena',manyChanges:'Provjera završena: Promijenjeno %1 rije�i',ieSpellDownload:'Provjera pravopisa nije instalirana. Želite li skinuti provjeru pravopisa?'},smiley:{toolbar:'Smješko',title:'Ubaci smješka',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Broj�ana lista',bulletedlist:'Obi�na lista',indent:'Pomakni udesno',outdent:'Pomakni ulijevo',justify:{left:'Lijevo poravnanje',center:'Središnje poravnanje',right:'Desno poravnanje',block:'Blok poravnanje'},blockquote:'Blockquote',clipboard:{title:'Zalijepi',cutError:'Sigurnosne postavke Vašeg pretraživa�a ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).',copyError:'Sigurnosne postavke Vašeg pretraživa�a ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).',pasteMsg:'Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.',securityMsg:'Zbog sigurnosnih postavki Vašeg pretraživa�a, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Tekst koji želite zalijepiti �ini se da je kopiran iz Worda. Želite li prije o�istiti tekst?',toolbar:'Zalijepi iz Worda',title:'Zalijepi iz Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Zalijepi kao �isti tekst',title:'Zalijepi kao �isti tekst'},templates:{button:'Predlošci',title:'Predlošci sadržaja',options:'Template Options',insertOption:'Zamijeni trenutne sadržaje',selectPromptMsg:'Molimo odaberite predložak koji želite otvoriti<br>(stvarni sadržaj će biti izgubljen):',emptyListMsg:'(Nema definiranih predložaka)'},showBlocks:'Prikaži blokove',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block stilovi',panelTitle2:'Inline stilovi',panelTitle3:'Object stilovi'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Veli�ina',voiceLabel:'Veli�ina slova',panelTitle:'Veli�ina'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Colors',auto:'Automatski',more:'Više boja...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Provjeri pravopis tijekom tipkanja (SCAYT)',opera_title:'Not supported by Opera',enable:'Omogući SCAYT',disable:'Onemogući SCAYT',about:'O SCAYT',toggle:'Omoguću/Onemogući SCAYT',options:'Opcije',langs:'Jezici',moreSuggestions:'Više prijedloga',ignore:'Zanemari',ignoreAll:'Zanemari sve',addWord:'Dodaj rije�',emptyDic:'Naziv rje�nika ne smije biti prazno.',optionsTab:'Opcije',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Jezici',dictionariesTab:'Rje�nici',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'O SCAYT'},about:{title:'O CKEditoru',dlgTitle:'O CKEditoru',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Za informacije o licencama posjetite našu web stranicu:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Povećaj',minimize:'Minimize',fakeobjects:{anchor:'Sidro',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Nepoznati objekt'},resize:'Povuci za promjenu veli�ine',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Svojstva dokumenta',title:'Svojstva dokumenta',design:'Design',meta:'Meta Data',chooseColor:'Choose',other:'<drugi>',docTitle:'Naslov stranice',charset:'Enkodiranje znakova',charsetOther:'Ostalo enkodiranje znakova',charsetASCII:'ASCII',charsetCE:'Središnja Europa',charsetCT:'Tradicionalna kineska (Big5)',charsetCR:'Ćirilica',charsetGR:'Gr�ka',charsetJP:'Japanska',charsetKR:'Koreanska',charsetTR:'Turska',charsetUN:'Unicode (UTF-8)',charsetWE:'Zapadna Europa',docType:'Zaglavlje vrste dokumenta',docTypeOther:'Ostalo zaglavlje vrste dokumenta',xhtmlDec:'Ubaci XHTML deklaracije',bgColor:'Boja pozadine',bgImage:'URL slike pozadine',bgFixed:'Pozadine se ne pomi�e',txtColor:'Boja teksta',margin:'Margine stranice',marginTop:'Vrh',marginLeft:'Lijevo',marginRight:'Desno',marginBottom:'Dolje',metaKeywords:'Klju�ne rije�i dokumenta (odvojene zarezom)',metaDescription:'Opis dokumenta',metaAuthor:'Autor',metaCopyright:'Autorska prava',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/hu.js b/upload/public/js/3rd_party/ckeditor/lang/hu.js
new file mode 100644
index 00000000..12e99921
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/hu.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.hu={dir:'ltr',editorTitle:'HTML szerkesztő',toolbars:'Szerkesztő Eszköztár',editor:'HTML szerkesztő',source:'Forráskód',newPage:'Új oldal',save:'Mentés',preview:'Előnézet',cut:'Kivágás',copy:'Másolás',paste:'Beillesztés',print:'Nyomtatás',underline:'Aláhúzott',bold:'Félkövér',italic:'Dőlt',selectAll:'Mindent kijelöl',removeFormat:'Formázás eltávolítása',strike:'�thúzott',subscript:'Alsó index',superscript:'Felső index',horizontalrule:'Elválasztóvonal beillesztése',pagebreak:'Oldaltörés beillesztése',pagebreakAlt:'Oldaltörés',unlink:'Hivatkozás törlése',undo:'Visszavonás',redo:'Ismétlés',common:{browseServer:'Böngészés a szerveren',url:'Hivatkozás',protocol:'Protokoll',upload:'Feltöltés',uploadSubmit:'Küldés a szerverre',image:'Kép',flash:'Flash',form:'Űrlap',checkbox:'Jelölőnégyzet',radio:'Választógomb',textField:'Szövegmező',textarea:'Szövegterület',hiddenField:'Rejtettmező',button:'Gomb',select:'Legördülő lista',imageButton:'Képgomb',notSet:'<nincs beállítva>',id:'Azonosító',name:'Név',langDir:'�rás iránya',langDirLtr:'Balról jobbra',langDirRtl:'Jobbról balra',langCode:'Nyelv kódja',longDescr:'Részletes leírás webcíme',cssClass:'Stíluskészlet',advisoryTitle:'Súgócimke',cssStyle:'Stílus',ok:'Rendben',cancel:'Mégsem',close:'Bezárás',preview:'Előnézet',generalTab:'�ltalános',advancedTab:'További opciók',validateNumberFailed:'A mezőbe csak számokat írhat.',confirmNewPage:'Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?',confirmCancel:'Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?',options:'Beállítások',target:'Cél',targetNew:'Új ablak (_blank)',targetTop:'Legfelső ablak (_top)',targetSelf:'Aktuális ablakban (_self)',targetParent:'Szülő ablak (_parent)',langDirLTR:'Balról jobbra (LTR)',langDirRTL:'Jobbról balra (RTL)',styles:'Stílus',cssClasses:'Stíluslap osztály',width:'Szélesség',height:'Magasság',align:'Igazítás',alignLeft:'Bal',alignRight:'Jobbra',alignCenter:'Középre',alignTop:'Tetejére',alignMiddle:'Középre',alignBottom:'Aljára',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidCssLength:'"%1"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).',invalidHtmlLength:'"%1"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nem elérhető</span>'},contextmenu:{options:'Helyi menü opciók'},specialChar:{toolbar:'Speciális karakter beillesztése',title:'Speciális karakter választása',options:'Speciális karakter opciók'},link:{toolbar:'Hivatkozás beillesztése/módosítása',other:'<más>',menu:'Hivatkozás módosítása',title:'Hivatkozás tulajdonságai',info:'Alaptulajdonságok',target:'Tartalom megjelenítése',upload:'Feltöltés',advanced:'További opciók',type:'Hivatkozás típusa',toUrl:'URL',toAnchor:'Horgony az oldalon',toEmail:'E-Mail',targetFrame:'<keretben>',targetPopup:'<felugró ablakban>',targetFrameName:'Keret neve',targetPopupName:'Felugró ablak neve',popupFeatures:'Felugró ablak jellemzői',popupResizable:'�tméretezés',popupStatusBar:'�llapotsor',popupLocationBar:'Címsor',popupToolbar:'Eszköztár',popupMenuBar:'Menü sor',popupFullScreen:'Teljes képernyő (csak IE)',popupScrollBars:'Gördítősáv',popupDependent:'Szülőhöz kapcsolt (csak Netscape)',popupLeft:'Bal pozíció',popupTop:'Felső pozíció',id:'Id',langDir:'�rás iránya',langDirLTR:'Balról jobbra',langDirRTL:'Jobbról balra',acccessKey:'Billentyűkombináció',name:'Név',langCode:'�rás iránya',tabIndex:'Tabulátor index',advisoryTitle:'Súgócimke',advisoryContentType:'Súgó tartalomtípusa',cssClasses:'Stíluskészlet',charset:'Hivatkozott tartalom kódlapja',styles:'Stílus',rel:'Kapcsolat típusa',selectAnchor:'Horgony választása',anchorName:'Horgony név szerint',anchorId:'Azonosító szerint',emailAddress:'E-Mail cím',emailSubject:'Üzenet tárgya',emailBody:'Üzenet',noAnchors:'(Nincs horgony a dokumentumban)',noUrl:'Adja meg a hivatkozás webcímét',noEmail:'Adja meg az E-Mail címet'},anchor:{toolbar:'Horgony beillesztése/szerkesztése',menu:'Horgony tulajdonságai',title:'Horgony tulajdonságai',name:'Horgony neve',errorName:'Kérem adja meg a horgony nevét',remove:'Horgony eltávolítása'},list:{numberedTitle:'Sorszámozott lista tulajdonságai',bulletedTitle:'Pontozott lista tulajdonságai',type:'Típus',start:'Kezdőszám',validateStartNumber:'A kezdőszám nem lehet tört érték.',circle:'Kör',disc:'Korong',square:'Négyzet',none:'Nincs',notset:'<Nincs beállítva>',armenian:'Örmény számozás',georgian:'Grúz számozás (an, ban, gan, stb.)',lowerRoman:'Római kisbetűs (i, ii, iii, iv, v, stb.)',upperRoman:'Római nagybetűs (I, II, III, IV, V, stb.)',lowerAlpha:'Kisbetűs (a, b, c, d, e, stb.)',upperAlpha:'Nagybetűs (A, B, C, D, E, stb.)',lowerGreek:'Görög (alpha, beta, gamma, stb.)',decimal:'Arab számozás (1, 2, 3, stb.)',decimalLeadingZero:'Számozás bevezető nullákkal (01, 02, 03, stb.)'},findAndReplace:{title:'Keresés és csere',find:'Keresés',replace:'Csere',findWhat:'Keresett szöveg:',replaceWith:'Csere erre:',notFoundMsg:'A keresett szöveg nem található.',findOptions:'Find Options',matchCase:'kis- és nagybetű megkülönböztetése',matchWord:'csak ha ez a teljes szó',matchCyclic:'Ciklikus keresés',replaceAll:'Az összes cseréje',replaceSuccessMsg:'%1 egyezőség cserélve.'},table:{toolbar:'Táblázat',title:'Táblázat tulajdonságai',menu:'Táblázat tulajdonságai',deleteTable:'Táblázat törlése',rows:'Sorok',columns:'Oszlopok',border:'Szegélyméret',widthPx:'képpont',widthPc:'százalék',widthUnit:'Szélesség egység',cellSpace:'Cella térköz',cellPad:'Cella belső margó',caption:'Felirat',summary:'Leírás',headers:'Fejlécek',headersNone:'Nincsenek',headersColumn:'Első oszlop',headersRow:'Első sor',headersBoth:'Mindkettő',invalidRows:'A sorok számának nagyobbnak kell lenni mint 0.',invalidCols:'Az oszlopok számának nagyobbnak kell lenni mint 0.',invalidBorder:'A szegélyméret mezőbe csak számokat írhat.',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidCellSpacing:'A cella térköz mezőbe csak számokat írhat.',invalidCellPadding:'A cella belső margó mezőbe csak számokat írhat.',cell:{menu:'Cella',insertBefore:'Beszúrás balra',insertAfter:'Beszúrás jobbra',deleteCell:'Cellák törlése',merge:'Cellák egyesítése',mergeRight:'Cellák egyesítése jobbra',mergeDown:'Cellák egyesítése lefelé',splitHorizontal:'Cellák szétválasztása vízszintesen',splitVertical:'Cellák szétválasztása függőlegesen',title:'Cella tulajdonságai',cellType:'Cella típusa',rowSpan:'Függőleges egyesítés',colSpan:'Vízszintes egyesítés',wordWrap:'Hosszú sorok törése',hAlign:'Vízszintes igazítás',vAlign:'Függőleges igazítás',alignBaseline:'Alapvonalra',bgColor:'Háttér színe',borderColor:'Keret színe',data:'Adat',header:'Fejléc',yes:'Igen',no:'Nem',invalidWidth:'A szélesség mezőbe csak számokat írhat.',invalidHeight:'A magasság mezőbe csak számokat írhat.',invalidRowSpan:'A függőleges egyesítés mezőbe csak számokat írhat.',invalidColSpan:'A vízszintes egyesítés mezőbe csak számokat írhat.',chooseColor:'Válasszon'},row:{menu:'Sor',insertBefore:'Beszúrás fölé',insertAfter:'Beszúrás alá',deleteRow:'Sorok törlése'},column:{menu:'Oszlop',insertBefore:'Beszúrás balra',insertAfter:'Beszúrás jobbra',deleteColumn:'Oszlopok törlése'}},button:{title:'Gomb tulajdonságai',text:'Szöveg (Érték)',type:'Típus',typeBtn:'Gomb',typeSbm:'Küldés',typeRst:'Alaphelyzet'},checkboxAndRadio:{checkboxTitle:'Jelölőnégyzet tulajdonságai',radioTitle:'Választógomb tulajdonságai',value:'Érték',selected:'Kiválasztott'},form:{title:'Űrlap tulajdonságai',menu:'Űrlap tulajdonságai',action:'Adatfeldolgozást végző hivatkozás',method:'Adatküldés módja',encoding:'Kódolás'},select:{title:'Legördülő lista tulajdonságai',selectInfo:'Alaptulajdonságok',opAvail:'Elérhető opciók',value:'Érték',size:'Méret',lines:'sor',chkMulti:'több sor is kiválasztható',opText:'Szöveg',opValue:'Érték',btnAdd:'Hozzáad',btnModify:'Módosít',btnUp:'Fel',btnDown:'Le',btnSetValue:'Legyen az alapértelmezett érték',btnDelete:'Töröl'},textarea:{title:'Szövegterület tulajdonságai',cols:'Karakterek száma egy sorban',rows:'Sorok száma'},textfield:{title:'Szövegmező tulajdonságai',name:'Név',value:'Érték',charWidth:'Megjelenített karakterek száma',maxChars:'Maximális karakterszám',type:'Típus',typeText:'Szöveg',typePass:'Jelszó'},hidden:{title:'Rejtett mező tulajdonságai',name:'Név',value:'Érték'},image:{title:'Kép tulajdonságai',titleButton:'Képgomb tulajdonságai',menu:'Kép tulajdonságai',infoTab:'Alaptulajdonságok',btnUpload:'Küldés a szerverre',upload:'Feltöltés',alt:'Buborék szöveg',lockRatio:'Arány megtartása',resetSize:'Eredeti méret',border:'Keret',hSpace:'Vízsz. táv',vSpace:'Függ. táv',alertUrl:'Töltse ki a kép webcímét',linkTab:'Hivatkozás',button2Img:'A kiválasztott képgombból sima képet szeretne csinálni?',img2Button:'A kiválasztott képből képgombot szeretne csinálni?',urlMissing:'Hiányzik a kép URL-je',validateBorder:'A keret méretének egész számot kell beírni!',validateHSpace:'Vízszintes távolságnak egész számot kell beírni!',validateVSpace:'Függőleges távolságnak egész számot kell beírni!'},flash:{properties:'Flash tulajdonságai',propertiesTab:'Tulajdonságok',title:'Flash tulajdonságai',chkPlay:'Automata lejátszás',chkLoop:'Folyamatosan',chkMenu:'Flash menü engedélyezése',chkFull:'Teljes képernyő engedélyezése',scale:'Méretezés',scaleAll:'Mindent mutat',scaleNoBorder:'Keret nélkül',scaleFit:'Teljes kitöltés',access:'Szkript hozzáférés',accessAlways:'Mindig',accessSameDomain:'Azonos domainről',accessNever:'Soha',alignAbsBottom:'Legaljára',alignAbsMiddle:'Közepére',alignBaseline:'Alapvonalhoz',alignTextTop:'Szöveg tetejére',quality:'Minőség',qualityBest:'Legjobb',qualityHigh:'Jó',qualityAutoHigh:'Automata jó',qualityMedium:'Közepes',qualityAutoLow:'Automata gyenge',qualityLow:'Gyenge',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Ablak mód',flashvars:'Flash változók',bgcolor:'Háttérszín',hSpace:'Vízsz. táv',vSpace:'Függ. táv',validateSrc:'Adja meg a hivatkozás webcímét',validateHSpace:'A vízszintes távolsűág mezőbe csak számokat írhat.',validateVSpace:'A függőleges távolsűág mezőbe csak számokat írhat.'},spellCheck:{toolbar:'Helyesírás-ellenőrzés',title:'Helyesírás ellenörző',notAvailable:'Sajnálom, de a szolgáltatás jelenleg nem elérhető.',errorLoading:'Hiba a szolgáltatás host betöltése közben: %s.',notInDic:'Nincs a szótárban',changeTo:'Módosítás',btnIgnore:'Kihagyja',btnIgnoreAll:'Mindet kihagyja',btnReplace:'Csere',btnReplaceAll:'Összes cseréje',btnUndo:'Visszavonás',noSuggestions:'Nincs javaslat',progress:'Helyesírás-ellenőrzés folyamatban...',noMispell:'Helyesírás-ellenőrzés kész: Nem találtam hibát',noChanges:'Helyesírás-ellenőrzés kész: Nincs változtatott szó',oneChange:'Helyesírás-ellenőrzés kész: Egy szó cserélve',manyChanges:'Helyesírás-ellenőrzés kész: %1 szó cserélve',ieSpellDownload:'A helyesírás-ellenőrző nincs telepítve. Szeretné letölteni most?'},smiley:{toolbar:'Hangulatjelek',title:'Hangulatjel beszúrása',options:'Hangulatjel opciók'},elementsPath:{eleLabel:'Elem utak',eleTitle:'%1 elem'},numberedlist:'Számozás',bulletedlist:'Felsorolás',indent:'Behúzás növelése',outdent:'Behúzás csökkentése',justify:{left:'Balra',center:'Középre',right:'Jobbra',block:'Sorkizárt'},blockquote:'Idézet blokk',clipboard:{title:'Beillesztés',cutError:'A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).',copyError:'A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).',pasteMsg:'Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.',securityMsg:'A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.',pasteArea:'Beszúrás mező'},pastefromword:{confirmCleanup:'Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)',toolbar:'Beillesztés Word-ből',title:'Beillesztés Word-ből',error:'Egy belső hiba miatt nem sikerült megtisztítani a szöveget'},pasteText:{button:'Beillesztés formázatlan szövegként',title:'Beillesztés formázatlan szövegként'},templates:{button:'Sablonok',title:'Elérhető sablonok',options:'Sablon opciók',insertOption:'Kicseréli a jelenlegi tartalmat',selectPromptMsg:'Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):',emptyListMsg:'(Nincs sablon megadva)'},showBlocks:'Blokkok megjelenítése',stylesCombo:{label:'Stílus',panelTitle:'Formázási stílusok',panelTitle1:'Blokk stílusok',panelTitle2:'Inline stílusok',panelTitle3:'Objektum stílusok'},format:{label:'Formátum',panelTitle:'Formátum',tag_p:'Normál',tag_pre:'Formázott',tag_address:'Címsor',tag_h1:'Fejléc 1',tag_h2:'Fejléc 2',tag_h3:'Fejléc 3',tag_h4:'Fejléc 4',tag_h5:'Fejléc 5',tag_h6:'Fejléc 6',tag_div:'Bekezdés (DIV)'},div:{title:'DIV tároló létrehozása',toolbar:'DIV tároló létrehozása',cssClassInputLabel:'Stíluslap osztály',styleSelectLabel:'Stílus',IdInputLabel:'Azonosító',languageCodeInputLabel:' Nyelv kódja',inlineStyleInputLabel:'Inline stílus',advisoryTitleInputLabel:'Tipp szöveg',langDirLabel:'Nyelvi irány',langDirLTRLabel:'Balról jobbra (LTR)',langDirRTLLabel:'Jobbról balra (RTL)',edit:'DIV szerkesztése',remove:'DIV eltávolítása'},iframe:{title:'IFrame Tulajdonságok',toolbar:'IFrame',noUrl:'Kérem írja be a iframe URL-t',scrolling:'Gördítősáv bekapcsolása',border:'Legyen keret'},font:{label:'Betűtípus',voiceLabel:'Betűtípus',panelTitle:'Betűtípus'},fontSize:{label:'Méret',voiceLabel:'Betűméret',panelTitle:'Méret'},colorButton:{textColorTitle:'Betűszín',bgColorTitle:'Háttérszín',panelTitle:'Színek',auto:'Automatikus',more:'További színek...'},colors:{'000':'Fekete',800000:'Bordó','8B4513':'Barna','2F4F4F':'Sötét türkiz','008080':'Türkiz','000080':'Király kék','4B0082':'Indigó kék',696969:'Szürke',B22222:'Tégla vörös',A52A2A:'Vörös',DAA520:'Arany sárga','006400':'Sötét zöld','40E0D0':'Türkiz','0000CD':'Kék',800080:'Lila',808080:'Szürke',F00:'Piros',FF8C00:'Sötét narancs',FFD700:'Arany','008000':'Zöld','0FF':'Türkiz','00F':'Kék',EE82EE:'Rózsaszín',A9A9A9:'Sötét szürke',FFA07A:'Lazac',FFA500:'Narancs',FFFF00:'Citromsárga','00FF00':'Neon zöld',AFEEEE:'Világos türkiz',ADD8E6:'Világos kék',DDA0DD:'Világos lila',D3D3D3:'Világos szürke',FFF0F5:'Lavender Blush',FAEBD7:'Törtfehér',FFFFE0:'Világos sárga',F0FFF0:'Menta',F0FFFF:'Azúr kék',F0F8FF:'Halvány kék',E6E6FA:'Lavender',FFF:'Fehér'},scayt:{title:'Helyesírás ellenőrzés gépelés közben',opera_title:'Az Opera nem támogatja',enable:'SCAYT engedélyezése',disable:'SCAYT letiltása',about:'SCAYT névjegy',toggle:'SCAYT kapcsolása',options:'Beállítások',langs:'Nyelvek',moreSuggestions:'További javaslatok',ignore:'Kihagy',ignoreAll:'Összes kihagyása',addWord:'Szó hozzáadása',emptyDic:'A szótár nevét meg kell adni.',optionsTab:'Beállítások',allCaps:'Nagybetűs szavak kihagyása',ignoreDomainNames:'Domain nevek kihagyása',mixedCase:'Kis és nagybetűt is tartalmazó szavak kihagyása',mixedWithDigits:'Számokat tartalmazó szavak kihagyása',languagesTab:'Nyelvek',dictionariesTab:'Szótár',dic_field_name:'Szótár neve',dic_create:'Létrehozás',dic_restore:'Visszaállítás',dic_delete:'Törlés',dic_rename:'�tnevezés',dic_info:'Kezdetben a felhasználói szótár böngésző sütiben tárolódik. Azonban a sütik maximális mérete korlátozott. Amikora a szótár akkora lesz, hogy már sütiben nem lehet tárolni, akkor a szótárat tárolhatja a szerveren is. Ehhez egy nevet kell megadni a szótárhoz. Amennyiben már van szerveren tárolt szótára, adja meg a nevét és kattintson a visszaállítás gombra.',aboutTab:'Névjegy'},about:{title:'CKEditor névjegy',dlgTitle:'CKEditor névjegy',help:'Itt találsz segítséget: $1',userGuide:'CKEditor Felhasználói útmutató',moreInfo:'Licenszelési információkért kérjük látogassa meg weboldalunkat:',copy:'Copyright &copy; $1. Minden jog fenntartva.'},maximize:'Teljes méret',minimize:'Kis méret',fakeobjects:{anchor:'Horgony',flash:'Flash animáció',iframe:'IFrame',hiddenfield:'Rejtett mezõ',unknown:'Ismeretlen objektum'},resize:'Húzza az átméretezéshez',colordialog:{title:'Válasszon színt',options:'Szín opciók',highlight:'Nagyítás',selected:'Kiválasztott',clear:'Ürítés'},toolbarCollapse:'Eszköztár összecsukása',toolbarExpand:'Eszköztár szétnyitása',toolbarGroups:{document:'Dokumentum',clipboard:'Vágólap/Visszavonás',editing:'Szerkesztés',forms:'Űrlapok',basicstyles:'Alapstílusok',paragraph:'Bekezdés',links:'Hivatkozások',insert:'Beszúrás',styles:'Stílusok',colors:'Színek',tools:'Eszközök'},bidi:{ltr:'Szöveg iránya balról jobbra',rtl:'Szöveg iránya jobbról balra'},docprops:{label:'Dokumentum tulajdonságai',title:'Dokumentum tulajdonságai',design:'Design',meta:'Meta adatok',chooseColor:'Válasszon',other:'<más>',docTitle:'Oldalcím',charset:'Karakterkódolás',charsetOther:'Más karakterkódolás',charsetASCII:'ASCII',charsetCE:'Közép-Európai',charsetCT:'Kínai Tradicionális (Big5)',charsetCR:'Cyrill',charsetGR:'Görög',charsetJP:'Japán',charsetKR:'Koreai',charsetTR:'Török',charsetUN:'Unicode (UTF-8)',charsetWE:'Nyugat-Európai',docType:'Dokumentum típus fejléc',docTypeOther:'Más dokumentum típus fejléc',xhtmlDec:'XHTML deklarációk beillesztése',bgColor:'Háttérszín',bgImage:'Háttérkép cím',bgFixed:'Nem gördíthető háttér',txtColor:'Betűszín',margin:'Oldal margók',marginTop:'Felső',marginLeft:'Bal',marginRight:'Jobb',marginBottom:'Alsó',metaKeywords:'Dokumentum keresőszavak (vesszővel elválasztva)',metaDescription:'Dokumentum leírás',metaAuthor:'Szerző',metaCopyright:'Szerzői jog',previewHtml:'<p>Ez itt egy <strong>példa</strong>. A <a href="javascript:void(0)">CKEditor</a>-t használod.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/index.html b/upload/public/js/3rd_party/ckeditor/lang/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ipb.js b/upload/public/js/3rd_party/ckeditor/lang/ipb.js
new file mode 100644
index 00000000..0998ce47
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ipb.js
@@ -0,0 +1,762 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the {@link CKEDITOR.lang} object, for the English
+ *		language. This is the base file for all translations.
+ */
+
+/**#@+
+   @type String
+   @example
+*/
+
+/**
+ * Constains the dictionary of language entries.
+ * @namespace
+ */
+CKEDITOR.lang['ipb'] =
+{
+	/**
+	 * The language reading direction. Possible values are "rtl" for
+	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
+	 * languages (like English).
+	 * @default 'ltr'
+	 */
+	dir : isRTL ? 'rtl' : 'ltr',
+
+	/*
+	 * Screenreader titles. Please note that screenreaders are not always capable
+	 * of reading non-English words. So be careful while translating it.
+	 */
+	editorTitle : 'Rich text editor, %1, press ALT 0 for help.',
+
+	// ARIA descriptions.
+	toolbar	: ipb.lang['ckeditor__toolbar'],
+	editor	: ipb.lang['ckeditor__editor'],
+
+	// Toolbar buttons without dialogs.
+	source			: ipb.lang['ckeditor__source'],
+	newPage			: ipb.lang['ckeditor__newpage'],
+	save			: ipb.lang['ckeditor__save'],
+	preview			: ipb.lang['ckeditor__preview'],
+	cut				: ipb.lang['ckeditor__cut'],
+	copy			: ipb.lang['ckeditor__copy'],
+	paste			: ipb.lang['ckeditor__paste'],
+	print			: ipb.lang['ckeditor__print'],
+	underline		: ipb.lang['ckeditor__underline'],
+	bold			: ipb.lang['ckeditor__bold'],
+	italic			: ipb.lang['ckeditor__italic'],
+	selectAll		: ipb.lang['ckeditor__selectall'],
+	removeFormat	: ipb.lang['ckeditor__removeformat'],
+	strike			: ipb.lang['ckeditor__strike'],
+	subscript		: ipb.lang['ckeditor__subscript'],
+	superscript		: ipb.lang['ckeditor__superscript'],
+	horizontalrule	: ipb.lang['ckeditor__hr'],
+	pagebreak		: ipb.lang['ckeditor__pb'],
+	pagebreakAlt	: ipb.lang['ckeditor__pba'],
+	unlink			: ipb.lang['ckeditor__unlink'],
+	undo			: ipb.lang['ckeditor__undo'],
+	redo			: ipb.lang['ckeditor__redo'],
+
+	// Common messages and labels.
+	common :
+	{
+		browseServer	: ipb.lang['ckeditor__browse_server'],
+		url				: ipb.lang['ckeditor__url'],
+		protocol		: ipb.lang['ckeditor__protocol'],
+		upload			: ipb.lang['ckeditor__upload'],
+		uploadSubmit	: ipb.lang['ckeditor__server_send'],
+		image			: ipb.lang['ckeditor__image'],
+		flash			: ipb.lang['ckeditor__flash'],
+		form			: ipb.lang['ckeditor__form'],
+		checkbox		: ipb.lang['ckeditor__checkbox'],
+		radio			: ipb.lang['ckeditor__radiobutton'],
+		textField		: ipb.lang['ckeditor__textfield'],
+		textarea		: ipb.lang['ckeditor__textarea'],
+		hiddenField		: ipb.lang['ckeditor__hiddenfield'],
+		button			: ipb.lang['ckeditor__button'],
+		select			: ipb.lang['ckeditor__selectfield'],
+		imageButton		: ipb.lang['ckeditor__imagebutton'],
+		notSet			: ipb.lang['ckeditor__notset'],
+		id				: ipb.lang['ckeditor__id'],
+		name			: ipb.lang['ckeditor__name'],
+		langDir			: ipb.lang['ckeditor__languagedir'],
+		langDirLtr		: ipb.lang['ckeditor__ltrlang'],
+		langDirRtl		: ipb.lang['ckeditor__rtllang'],
+		langCode		: ipb.lang['ckeditor__langcode'],
+		longDescr		: ipb.lang['ckeditor__longdescurl'],
+		cssClass		: ipb.lang['ckeditor__css_classes'],
+		advisoryTitle	: ipb.lang['ckeditor__advisorytitle'],
+		cssStyle		: ipb.lang['ckeditor__style'],
+		ok				: ipb.lang['ckeditor__ok'],
+		cancel			: ipb.lang['ckeditor__cancel'],
+		close			: ipb.lang['ckeditor__close'],
+		preview			: ipb.lang['ckeditor__preview'],
+		generalTab		: ipb.lang['ckeditor__general'],
+		advancedTab		: ipb.lang['ckeditor__advanced'],
+		validateNumberFailed : ipb.lang['ckeditor__nan'],
+		confirmNewPage	: ipb.lang['ckeditor__confirmreload'],
+		confirmCancel	: ipb.lang['ckeditor__confirmcancel'],
+		options			: ipb.lang['ckeditor__options'],
+		target			: ipb.lang['ckeditor__target'],
+		targetNew		: ipb.lang['ckeditor__tnewwindow'],
+		targetTop		: ipb.lang['ckeditor__ttopwindow'],
+		targetSelf		: ipb.lang['ckeditor__tsamewindow'],
+		targetParent	: ipb.lang['ckeditor__tparentwindow'],
+		langDirLTR		: ipb.lang['ckeditor__ltrlang'],
+		langDirRTL		: ipb.lang['ckeditor__rtllang'],
+		styles			: ipb.lang['ckeditor__style'],
+		cssClasses		: ipb.lang['ckeditor__css_classes'],
+		width			: ipb.lang['ckeditor__width'],
+		height			: ipb.lang['ckeditor__height'],
+		align			: ipb.lang['ckeditor__alignment'],
+		alignLeft		: ipb.lang['ckeditor__left'],
+		alignRight		: ipb.lang['ckeditor__right'],
+		alignCenter		: ipb.lang['ckeditor__center'],
+		alignTop		: ipb.lang['ckeditor__top'],
+		alignMiddle		: ipb.lang['ckeditor__middle'],
+		alignBottom		: ipb.lang['ckeditor__bottom'],
+		invalidHeight	: ipb.lang['ckeditor__height_nan'],
+		invalidWidth	: ipb.lang['ckeditor__width_nan'],
+
+		// Put the voice-only part of the label in the span.
+		unavailable		: '%1<span class="cke_accessibility">, ' + ipb.lang['ckeditor__unavailable'] + '</span>'
+	},
+
+	contextmenu :
+	{
+		options : ipb.lang['ckeditor__contextmenopt']
+	},
+
+	// Special char dialog.
+	specialChar		:
+	{
+		toolbar		: ipb.lang['ckeditor__insertspecial'],
+		title		: ipb.lang['ckeditor__selectspecial'],
+		options : ipb.lang['ckeditor__speccharopts']
+	},
+
+	// Link dialog.
+	link :
+	{
+		toolbar		: ipb.lang['ckeditor__link'],
+		other 		: ipb.lang['ckeditor__linkother'],
+		menu		: ipb.lang['ckeditor__editlink'],
+		title		: ipb.lang['ckeditor__link'],
+		info		: ipb.lang['ckeditor__link_info'],
+		target		: ipb.lang['ckeditor__target'],
+		upload		: ipb.lang['ckeditor__upload'],
+		advanced	: ipb.lang['ckeditor__advanced'],
+		type		: ipb.lang['ckeditor__link_type'],
+		toUrl		: ipb.lang['ckeditor__url'],
+		toAnchor	: ipb.lang['ckeditor__anchorlink'],
+		toEmail		: ipb.lang['ckeditor__emaillink'],
+		targetFrame		: ipb.lang['ckeditor__framelink'],
+		targetPopup		: ipb.lang['ckeditor__popuplink'],
+		targetFrameName	: ipb.lang['ckeditor__targframename'],
+		targetPopupName	: ipb.lang['ckeditor__popupwinname'],
+		popupFeatures	: ipb.lang['ckeditor__popupfeat'],
+		popupResizable	: ipb.lang['ckeditor__popupresize'],
+		popupStatusBar	: ipb.lang['ckeditor__popupstatusba'],
+		popupLocationBar: ipb.lang['ckeditor__popuplocation'],
+		popupToolbar	: ipb.lang['ckeditor__popuptoolbar'],
+		popupMenuBar	: ipb.lang['ckeditor__popupmenubar'],
+		popupFullScreen	: ipb.lang['ckeditor__popupfullscr'],
+		popupScrollBars	: ipb.lang['ckeditor__popupscroll'],
+		popupDependent	: ipb.lang['ckeditor__popupdepend'],
+		popupLeft		: ipb.lang['ckeditor__popupleftpos'],
+		popupTop		: ipb.lang['ckeditor__popuptoppos'],
+		id				: ipb.lang['ckeditor__id'],
+		langDir			: ipb.lang['ckeditor__languagedir'],
+		langDirLTR		: ipb.lang['ckeditor__ltrlang'],
+		langDirRTL		: ipb.lang['ckeditor__rtllang'],
+		acccessKey		: ipb.lang['ckeditor__accesskey'],
+		name			: ipb.lang['ckeditor__name'],
+		langCode		: ipb.lang['ckeditor__langcode'],
+		tabIndex		: ipb.lang['ckeditor__tab_index'],
+		advisoryTitle	: ipb.lang['ckeditor__advisorytitle'],
+		advisoryContentType	: ipb.lang['ckeditor__advisorytype'],
+		cssClasses		: ipb.lang['ckeditor__css_classes'],
+		charset			: ipb.lang['ckeditor__linked_char'],
+		styles			: ipb.lang['ckeditor__style'],
+		selectAnchor	: ipb.lang['ckeditor__selectanchor'],
+		anchorName		: ipb.lang['ckeditor__byanchorname'],
+		anchorId		: ipb.lang['ckeditor__byelementid'],
+		emailAddress	: ipb.lang['ckeditor__byemailaddy'],
+		emailSubject	: ipb.lang['ckeditor__emailsubject'],
+		emailBody		: ipb.lang['ckeditor__emailbody'],
+		noAnchors		: ipb.lang['ckeditor__noanchorsa'],
+		noUrl			: ipb.lang['ckeditor__type_url'],
+		noEmail			: ipb.lang['ckeditor__type_email']
+	},
+
+	// Anchor dialog
+	anchor :
+	{
+		toolbar		: ipb.lang['ckeditor__anchor'],
+		menu		: ipb.lang['ckeditor__editanchor'],
+		title		: ipb.lang['ckeditor__anchorprop'],
+		name		: ipb.lang['ckeditor__anchorname'],
+		errorName	: ipb.lang['ckeditor__typeanchor']
+	},
+
+	// List style dialog
+	list:
+	{
+		numberedTitle		: ipb.lang['ckeditor__numberedlist'],
+		bulletedTitle		: ipb.lang['ckeditor__bulletlist'],
+		type				: ipb.lang['ckeditor__type'],
+		start				: ipb.lang['ckeditor__start'],
+		validateStartNumber				: ipb.lang['ckeditor__list_nan'],
+		circle				: ipb.lang['ckeditor__circle'],
+		disc				: ipb.lang['ckeditor__disc'],
+		square				: ipb.lang['ckeditor__square'],
+		none				: ipb.lang['ckeditor__none'],
+		notset				: ipb.lang['ckeditor__notset'],
+		armenian			: ipb.lang['ckeditor__armeniannumb'],
+		georgian			: ipb.lang['ckeditor__georgiannumb'],
+		lowerRoman			: ipb.lang['ckeditor__lowerroman'],
+		upperRoman			: ipb.lang['ckeditor__upperroman'],
+		lowerAlpha			: ipb.lang['ckeditor__loweralpha'],
+		upperAlpha			: ipb.lang['ckeditor__upperalpha'],
+		lowerGreek			: ipb.lang['ckeditor__lowergreek'],
+		decimal				: ipb.lang['ckeditor__decimal'],
+		decimalLeadingZero	: ipb.lang['ckeditor__decimal_zero']
+	},
+
+	// Find And Replace Dialog
+	findAndReplace :
+	{
+		title				: ipb.lang['ckeditor__findreplace'],
+		find				: ipb.lang['ckeditor__find'],
+		replace				: ipb.lang['ckeditor__replace'],
+		findWhat			: ipb.lang['ckeditor__find_what'],
+		replaceWith			: ipb.lang['ckeditor__replace_with'],
+		notFoundMsg			: ipb.lang['ckeditor__text_notfound'],
+		matchCase			: ipb.lang['ckeditor__match_case'],
+		matchWord			: ipb.lang['ckeditor__match_word'],
+		matchCyclic			: ipb.lang['ckeditor__match_cyclic'],
+		replaceAll			: ipb.lang['ckeditor__replace_all'],
+		replaceSuccessMsg	: ipb.lang['ckeditor__replace_cnt']
+	},
+
+	// Table Dialog
+	// Not translating because we don't support table button in editor
+	table :
+	{
+		toolbar		: 'Table',
+		title		: 'Table Properties',
+		menu		: 'Table Properties',
+		deleteTable	: 'Delete Table',
+		rows		: 'Rows',
+		columns		: 'Columns',
+		border		: 'Border size',
+		widthPx		: 'pixels',
+		widthPc		: 'percent',
+		widthUnit	: 'width unit',
+		cellSpace	: 'Cell spacing',
+		cellPad		: 'Cell padding',
+		caption		: 'Caption',
+		summary		: 'Summary',
+		headers		: 'Headers',
+		headersNone		: ipb.lang['ckeditor__none'],
+		headersColumn	: 'First column',
+		headersRow		: 'First Row',
+		headersBoth		: 'Both',
+		invalidRows		: 'Number of rows must be a number greater than 0.',
+		invalidCols		: 'Number of columns must be a number greater than 0.',
+		invalidBorder	: 'Border size must be a number.',
+		invalidWidth	: 'Table width must be a number.',
+		invalidHeight	: 'Table height must be a number.',
+		invalidCellSpacing	: 'Cell spacing must be a number.',
+		invalidCellPadding	: 'Cell padding must be a number.',
+
+		cell :
+		{
+			menu			: 'Cell',
+			insertBefore	: 'Insert Cell Before',
+			insertAfter		: 'Insert Cell After',
+			deleteCell		: 'Delete Cells',
+			merge			: 'Merge Cells',
+			mergeRight		: 'Merge Right',
+			mergeDown		: 'Merge Down',
+			splitHorizontal	: 'Split Cell Horizontally',
+			splitVertical	: 'Split Cell Vertically',
+			title			: 'Cell Properties',
+			cellType		: 'Cell Type',
+			rowSpan			: 'Rows Span',
+			colSpan			: 'Columns Span',
+			wordWrap		: 'Word Wrap',
+			hAlign			: 'Horizontal Alignment',
+			vAlign			: 'Vertical Alignment',
+			alignBaseline	: 'Baseline',
+			bgColor			: ipb.lang['ckeditor__bg_color'],
+			borderColor		: 'Border Color',
+			data			: 'Data',
+			header			: 'Header',
+			yes				: 'Yes',
+			no				: 'No',
+			invalidWidth	: 'Cell width must be a number.',
+			invalidHeight	: 'Cell height must be a number.',
+			invalidRowSpan	: 'Rows span must be a whole number.',
+			invalidColSpan	: 'Columns span must be a whole number.',
+			chooseColor		: 'Choose'
+		},
+
+		row :
+		{
+			menu			: 'Row',
+			insertBefore	: 'Insert Row Before',
+			insertAfter		: 'Insert Row After',
+			deleteRow		: 'Delete Rows'
+		},
+
+		column :
+		{
+			menu			: 'Column',
+			insertBefore	: 'Insert Column Before',
+			insertAfter		: 'Insert Column After',
+			deleteColumn	: 'Delete Columns'
+		}
+	},
+
+	// Button Dialog.
+	// Not translating because we don't support forms in editor
+	button :
+	{
+		title		: 'Button Properties',
+		text		: 'Text (Value)',
+		type		: ipb.lang['ckeditor__type'],
+		typeBtn		: ipb.lang['ckeditor__button'],
+		typeSbm		: 'Submit',
+		typeRst		: 'Reset'
+	},
+
+	// Checkbox and Radio Button Dialogs.
+	// Not translating because we don't support forms in editor
+	checkboxAndRadio :
+	{
+		checkboxTitle : 'Checkbox Properties',
+		radioTitle	: 'Radio Button Properties',
+		value		: ipb.lang['ckeditor__value'],
+		selected	: 'Selected'
+	},
+
+	// Form Dialog.
+	// Not translating because we don't support forms in editor
+	form :
+	{
+		title		: 'Form Properties',
+		menu		: 'Form Properties',
+		action		: 'Action',
+		method		: 'Method',
+		encoding	: 'Encoding'
+	},
+
+	// Select Field Dialog.
+	// Not translating because we don't support forms in editor
+	select :
+	{
+		title		: 'Selection Field Properties',
+		selectInfo	: 'Select Info',
+		opAvail		: 'Available Options',
+		value		: ipb.lang['ckeditor__value'],
+		size		: 'Size',
+		lines		: 'lines',
+		chkMulti	: 'Allow multiple selections',
+		opText		: 'Text',
+		opValue		: ipb.lang['ckeditor__value'],
+		btnAdd		: 'Add',
+		btnModify	: 'Modify',
+		btnUp		: 'Up',
+		btnDown		: 'Down',
+		btnSetValue : 'Set as selected value',
+		btnDelete	: ipb.lang['ckeditor__delete']
+	},
+
+	// Textarea Dialog.
+	// Not translating because we don't support forms in editor
+	textarea :
+	{
+		title		: 'Textarea Properties',
+		cols		: 'Columns',
+		rows		: 'Rows'
+	},
+
+	// Text Field Dialog.
+	// Not translating because we don't support forms in editor
+	textfield :
+	{
+		title		: 'Text Field Properties',
+		name		: ipb.lang['ckeditor__name'],
+		value		: ipb.lang['ckeditor__value'],
+		charWidth	: 'Character Width',
+		maxChars	: 'Maximum Characters',
+		type		: ipb.lang['ckeditor__type'],
+		typeText	: 'Text',
+		typePass	: 'Password'
+	},
+
+	// Hidden Field Dialog.
+	// Not translating because we don't support forms in editor
+	hidden :
+	{
+		title	: 'Hidden Field Properties',
+		name	: ipb.lang['ckeditor__name'],
+		value	: ipb.lang['ckeditor__value']
+	},
+
+	// Image Dialog.
+	image :
+	{
+		title		: ipb.lang['ckeditor__image_prop'],
+		titleButton	: ipb.lang['ckeditor__imagebutton_p'],
+		menu		: ipb.lang['ckeditor__image_prop'],
+		infoTab		: ipb.lang['ckeditor__image_info'],
+		btnUpload	: ipb.lang['ckeditor__server_send'],
+		upload		: ipb.lang['ckeditor__upload'],
+		alt			: ipb.lang['ckeditor__alt_text'],
+		lockRatio	: ipb.lang['ckeditor__lock_ratio'],
+		unlockRatio	: ipb.lang['ckeditor__unlock_ratio'],
+		resetSize	: ipb.lang['ckeditor__reset_size'],
+		border		: ipb.lang['ckeditor__border'],
+		hSpace		: ipb.lang['ckeditor__hspace'],
+		vSpace		: ipb.lang['ckeditor__vspace'],
+		alertUrl	: ipb.lang['ckeditor__image_url'],
+		linkTab		: ipb.lang['ckeditor__link'],
+		button2Img	: ipb.lang['ckeditor__buttontoimage'],
+		img2Button	: ipb.lang['ckeditor__imagetobutton'],
+		urlMissing	: ipb.lang['ckeditor__missingimgurl'],
+		validateBorder	: ipb.lang['ckeditor__border_nan'],
+		validateHSpace	: ipb.lang['ckeditor__hspace_nan'],
+		validateVSpace	: ipb.lang['ckeditor__vspace_nan']
+	},
+
+	// Flash Dialog
+	// Not translating because we don't support flash in editor
+	flash :
+	{
+		properties		: ipb.lang['ckeditor__flash_prop'],
+		propertiesTab	: ipb.lang['ckeditor__properties'],
+		title			: ipb.lang['ckeditor__flash_prop'],
+		chkPlay			: 'Auto Play',
+		chkLoop			: 'Loop',
+		chkMenu			: 'Enable Flash Menu',
+		chkFull			: 'Allow Fullscreen',
+ 		scale			: 'Scale',
+		scaleAll		: 'Show all',
+		scaleNoBorder	: 'No Border',
+		scaleFit		: 'Exact Fit',
+		access			: 'Script Access',
+		accessAlways	: 'Always',
+		accessSameDomain: 'Same domain',
+		accessNever		: 'Never',
+		alignAbsBottom	: 'Abs Bottom',
+		alignAbsMiddle	: 'Abs Middle',
+		alignBaseline	: 'Baseline',
+		alignTextTop	: 'Text Top',
+		quality			: 'Quality',
+		qualityBest		: 'Best',
+		qualityHigh		: 'High',
+		qualityAutoHigh	: 'Auto High',
+		qualityMedium	: 'Medium',
+		qualityAutoLow	: 'Auto Low',
+		qualityLow		: 'Low',
+		windowModeWindow: 'Window',
+		windowModeOpaque: 'Opaque',
+		windowModeTransparent : 'Transparent',
+		windowMode		: 'Window mode',
+		flashvars		: 'Variables for Flash',
+		bgcolor			: ipb.lang['ckeditor__bg_color'],
+		hSpace			: ipb.lang['ckeditor__hspace'],
+		vSpace			: ipb.lang['ckeditor__vspace'],
+		validateSrc		: 'URL must not be empty.',
+		validateHSpace	: ipb.lang['ckeditor__hspace_nan'],
+		validateVSpace	: ipb.lang['ckeditor__vspace_nan']
+	},
+
+	// Speller Pages Dialog
+	// Not translating because we don't support spell checker in editor
+	spellCheck :
+	{
+		toolbar			: 'Check Spelling',
+		title			: 'Spell Check',
+		notAvailable	: 'Sorry, but service is unavailable now.',
+		errorLoading	: 'Error loading application service host: %s.',
+		notInDic		: 'Not in dictionary',
+		changeTo		: 'Change to',
+		btnIgnore		: ipb.lang['ckeditor__ignore'],
+		btnIgnoreAll	: ipb.lang['ckeditor__ignore_all'],
+		btnReplace		: ipb.lang['ckeditor__replace'],
+		btnReplaceAll	: ipb.lang['ckeditor__replace_all'],
+		btnUndo			: ipb.lang['ckeditor__undo'],
+		noSuggestions	: '- No suggestions -',
+		progress		: 'Spell check in progress...',
+		noMispell		: 'Spell check complete: No misspellings found',
+		noChanges		: 'Spell check complete: No words changed',
+		oneChange		: 'Spell check complete: One word changed',
+		manyChanges		: 'Spell check complete: %1 words changed',
+		ieSpellDownload	: 'Spell checker not installed. Do you want to download it now?'
+	},
+
+	smiley :
+	{
+		toolbar	: ipb.lang['ckeditor__smiley'],
+		title	: ipb.lang['ckeditor__insertsmilie'],
+		options : ipb.lang['ckeditor__smileyopts']
+	},
+
+	elementsPath :
+	{
+		eleLabel : ipb.lang['ckeditor__elementspath'],
+		eleTitle : ipb.lang['ckeditor__xelements']
+	},
+
+	numberedlist	: ipb.lang['ckeditor__insdelnumlist'],
+	bulletedlist	: ipb.lang['ckeditor__insdelbullist'],
+	indent			: ipb.lang['ckeditor__inc_indent'],
+	outdent			: ipb.lang['ckeditor__dec_indent'],
+
+	justify :
+	{
+		left	: ipb.lang['ckeditor__alignleft'],
+		center	: ipb.lang['ckeditor__center'],
+		right	: ipb.lang['ckeditor__alignright'],
+		block	: ipb.lang['ckeditor__justify']
+	},
+
+	blockquote : ipb.lang['ckeditor__blockquote'],
+
+	clipboard :
+	{
+		title		: ipb.lang['ckeditor__paste'],
+		cutError	: ipb.lang['ckeditor__paste_err1'],
+		copyError	: ipb.lang['ckeditor__paste_err2'],
+		pasteMsg	: ipb.lang['ckeditor__paste_box'],
+		securityMsg	: ipb.lang['ckeditor__paste_err3'],
+		pasteArea	: ipb.lang['ckeditor__paste_area']
+	},
+
+	pastefromword :
+	{
+		confirmCleanup	: ipb.lang['ckeditor__clean_word'],
+		toolbar			: ipb.lang['ckeditor__paste_word'],
+		title			: ipb.lang['ckeditor__paste_word'],
+		error			: ipb.lang['ckeditor__nocleanword']
+	},
+
+	pasteText :
+	{
+		button	: ipb.lang['ckeditor__paste_ptext'],
+		title	: ipb.lang['ckeditor__paste_ptext']
+	},
+
+	templates :
+	{
+		button			: ipb.lang['ckeditor__templates'],
+		title			: ipb.lang['ckeditor__contenttemps'],
+		options 		: ipb.lang['ckeditor__templateopts'],
+		insertOption	: ipb.lang['ckeditor__repactconts'],
+		selectPromptMsg	: ipb.lang['ckeditor__whichtempl'],
+		emptyListMsg	: ipb.lang['ckeditor__notemplates']
+	},
+
+	showBlocks : ipb.lang['ckeditor__show_blocks'],
+
+	stylesCombo :
+	{
+		label		: ipb.lang['ckeditor__styles'],
+		panelTitle	: ipb.lang['ckeditor__format_styles'],
+		panelTitle1	: ipb.lang['ckeditor__block_styles'],
+		panelTitle2	: ipb.lang['ckeditor__inline_styles'],
+		panelTitle3	: ipb.lang['ckeditor__object_styles']
+	},
+
+	format :
+	{
+		label		: ipb.lang['ckeditor__formaat'],
+		panelTitle	: ipb.lang['ckeditor__para_format'],
+
+		tag_p		: ipb.lang['ckeditor__normal'],
+		tag_pre		: ipb.lang['ckeditor__formatted'],
+		tag_address	: ipb.lang['ckeditor__address'],
+		tag_h1		: ipb.lang['ckeditor__heading'] + ' 1',
+		tag_h2		: ipb.lang['ckeditor__heading'] + ' 2',
+		tag_h3		: ipb.lang['ckeditor__heading'] + ' 3',
+		tag_h4		: ipb.lang['ckeditor__heading'] + ' 4',
+		tag_h5		: ipb.lang['ckeditor__heading'] + ' 5',
+		tag_h6		: ipb.lang['ckeditor__heading'] + ' 6',
+		tag_div		: ipb.lang['ckeditor__normal_div']
+	},
+
+	div :
+	{
+		title				: ipb.lang['ckeditor__divcontainer'],
+		toolbar				: ipb.lang['ckeditor__divcontainer'],
+		cssClassInputLabel	: ipb.lang['ckeditor__css_classes'],
+		styleSelectLabel	: ipb.lang['ckeditor__style'],
+		IdInputLabel		: ipb.lang['ckeditor__id'],
+		languageCodeInputLabel	: ipb.lang['ckeditor__langcode'],
+		inlineStyleInputLabel	: ipb.lang['ckeditor__inlinestyle'],
+		advisoryTitleInputLabel	: ipb.lang['ckeditor__advisorytitle'],
+		langDirLabel		: ipb.lang['ckeditor__languagedir'],
+		langDirLTRLabel		: ipb.lang['ckeditor__ltrlang'],
+		langDirRTLLabel		: ipb.lang['ckeditor__rtllang'],
+		edit				: ipb.lang['ckeditor__edit_div'],
+		remove				: ipb.lang['ckeditor__remove_div']
+  	},
+
+	iframe :
+	{
+		title		: ipb.lang['ckeditor__iframeprops'],
+		toolbar		: ipb.lang['ckeditor__iframe'],
+		noUrl		: ipb.lang['ckeditor__iframeurl'],
+		scrolling	: ipb.lang['ckeditor__iframescroll'],
+		border		: ipb.lang['ckeditor__iframeborder']
+	},
+
+	font :
+	{
+		label		: ipb.lang['ckeditor__font'],
+		voiceLabel	: ipb.lang['ckeditor__font'],
+		panelTitle	: ipb.lang['ckeditor__font_name']
+	},
+
+	fontSize :
+	{
+		label		: ipb.lang['ckeditor__size'],
+		voiceLabel	: ipb.lang['ckeditor__font_size'],
+		panelTitle	: ipb.lang['ckeditor__font_size']
+	},
+
+	colorButton :
+	{
+		textColorTitle	: ipb.lang['ckeditor__text_color'],
+		bgColorTitle	: ipb.lang['ckeditor__bg_color'],
+		panelTitle		: ipb.lang['ckeditor__colors'],
+		auto			: ipb.lang['ckeditor__automatic'],
+		more			: ipb.lang['ckeditor__more_colors']
+	},
+
+	colors :
+	{
+		'000' : ipb.lang['ckcolor__black'],
+		'800000' : ipb.lang['ckcolor__maroon'],
+		'8B4513' : ipb.lang['ckcolor__sadbrown'],
+		'2F4F4F' : ipb.lang['ckcolor__dsgray'],
+		'008080' : ipb.lang['ckcolor__teal'],
+		'000080' : ipb.lang['ckcolor__navy'],
+		'4B0082' : ipb.lang['ckcolor__indigo'],
+		'696969' : ipb.lang['ckcolor__darkgray'],
+		'B22222' : ipb.lang['ckcolor__firebrick'],
+		'A52A2A' : ipb.lang['ckcolor__brown'],
+		'DAA520' : ipb.lang['ckcolor__goldenrod'],
+		'006400' : ipb.lang['ckcolor__darkgreen'],
+		'40E0D0' : ipb.lang['ckcolor__turquoise'],
+		'0000CD' : ipb.lang['ckcolor__medblue'],
+		'800080' : ipb.lang['ckcolor__purple'],
+		'808080' : ipb.lang['ckcolor__gray'],
+		'F00' : ipb.lang['ckcolor__red'],
+		'FF8C00' : ipb.lang['ckcolor__darkorange'],
+		'FFD700' : ipb.lang['ckcolor__gold'],
+		'008000' : ipb.lang['ckcolor__green'],
+		'0FF' : ipb.lang['ckcolor__cyan'],
+		'00F' : ipb.lang['ckcolor__blue'],
+		'EE82EE' : ipb.lang['ckcolor__violet'],
+		'A9A9A9' : ipb.lang['ckcolor__dimgray'],
+		'FFA07A' : ipb.lang['ckcolor__lightsalmon'],
+		'FFA500' : ipb.lang['ckcolor__orange'],
+		'FFFF00' : ipb.lang['ckcolor__yellow'],
+		'00FF00' : ipb.lang['ckcolor__lime'],
+		'AFEEEE' : ipb.lang['ckcolor__paleturq'],
+		'ADD8E6' : ipb.lang['ckcolor__lightblue'],
+		'DDA0DD' : ipb.lang['ckcolor__plum'],
+		'D3D3D3' : ipb.lang['ckcolor__lightgray'],
+		'FFF0F5' : ipb.lang['ckcolor__lavender'],
+		'FAEBD7' : ipb.lang['ckcolor__antique'],
+		'FFFFE0' : ipb.lang['ckcolor__lightyellow'],
+		'F0FFF0' : ipb.lang['ckcolor__honeydew'],
+		'F0FFFF' : ipb.lang['ckcolor__azure'],
+		'F0F8FF' : ipb.lang['ckcolor__aliceblue'],
+		'E6E6FA' : ipb.lang['ckcolor__reglavender'],
+		'FFF' : ipb.lang['ckcolor__white']
+	},
+
+	scayt :
+	{
+		title			: ipb.lang['ckeditor__scayt'],
+		opera_title		: ipb.lang['ckeditor__nooperalol'],
+		enable			: ipb.lang['ckeditor__enablescayt'],
+		disable			: ipb.lang['ckeditor__disablescayt'],
+		about			: ipb.lang['ckeditor__aboutscayt'],
+		toggle			: ipb.lang['ckeditor__togglescayt'],
+		options			: ipb.lang['ckeditor__options'],
+		langs			: ipb.lang['ckeditor__languages'],
+		moreSuggestions	: ipb.lang['ckeditor__moresuggs'],
+		ignore			: ipb.lang['ckeditor__ignore'],
+		ignoreAll		: ipb.lang['ckeditor__ignore_all'],
+		addWord			: ipb.lang['ckeditor__add_word'],
+		emptyDic		: ipb.lang['ckeditor__dict_name'],
+
+		optionsTab		: ipb.lang['ckeditor__options'],
+		allCaps			: ipb.lang['ckeditor__ignoreallcaps'],
+		ignoreDomainNames : ipb.lang['ckeditor__ignoredomains'],
+		mixedCase		: ipb.lang['ckeditor__ignoremixedc'],
+		mixedWithDigits	: ipb.lang['ckeditor__ignorewnumber'],
+
+		languagesTab	: ipb.lang['ckeditor__languages'],
+
+		dictionariesTab	: ipb.lang['ckeditor__dictionaries'],
+		dic_field_name	: ipb.lang['ckeditor__diction_name'],
+		dic_create		: ipb.lang['ckeditor__create'],
+		dic_restore		: ipb.lang['ckeditor__restore'],
+		dic_delete		: ipb.lang['ckeditor__delete'],
+		dic_rename		: ipb.lang['ckeditor__rename'],
+		dic_info		: ipb.lang['ckeditor__dict_cookie'],
+
+		aboutTab		: ipb.lang['ckeditor__about']
+	},
+
+	about :
+	{
+		title		: ipb.lang['ckeditor__about_ck'],
+		dlgTitle	: ipb.lang['ckeditor__about_ck'],
+		moreInfo	: ipb.lang['ckeditor__licvisitsite'],
+		copy		: ipb.lang['ckeditor__copyright']
+	},
+
+	maximize : ipb.lang['ckeditor__maximize'],
+	minimize : ipb.lang['ckeditor__minimize'],
+
+	fakeobjects :
+	{
+		anchor		: ipb.lang['ckeditor__anchor'],
+		flash		: ipb.lang['ckeditor__flashanima'],
+		iframe		: ipb.lang['ckeditor__iframe'],
+		hiddenfield	: ipb.lang['ckeditor__hiddenfield'],
+		unknown		: ipb.lang['ckeditor__unknownobj']
+	},
+
+	resize : ipb.lang['ckeditor__dragtoresize'],
+
+	colordialog :
+	{
+		title		: ipb.lang['ckeditor__selectcolor'],
+		options		: ipb.lang['ckeditor__color_options'],
+		highlight	: ipb.lang['ckeditor__highlight'],
+		selected	: ipb.lang['ckeditor__selectedcolor'],
+		clear		: ipb.lang['ckeditor__clear']
+	},
+
+	toolbarCollapse	: ipb.lang['ckeditor__collapsetools'],
+	toolbarExpand	: ipb.lang['ckeditor__expandtools'],
+
+	bidi :
+	{
+		ltr : ipb.lang['ckeditor__bidiltr'],
+		rtl : ipb.lang['ckeditor__bidirtl']
+	}
+};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/is.js b/upload/public/js/3rd_party/ckeditor/lang/is.js
new file mode 100644
index 00000000..f14bcf44
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/is.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.is={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kóði',newPage:'Ný síða',save:'Vista',preview:'Forskoða',cut:'Klippa',copy:'Afrita',paste:'Líma',print:'Prenta',underline:'Undirstrikað',bold:'Feitletrað',italic:'Skáletrað',selectAll:'Velja allt',removeFormat:'Fjarlægja snið',strike:'Yfirstrikað',subscript:'Niðurskrifað',superscript:'Uppskrifað',horizontalrule:'Lóðrétt lína',pagebreak:'Setja inn síðuskil',pagebreakAlt:'Page Break',unlink:'Fjarlægja stiklu',undo:'Afturkalla',redo:'Hætta við afturköllun',common:{browseServer:'Fletta í skjalasafni',url:'Vefslóð',protocol:'Samskiptastaðall',upload:'Senda upp',uploadSubmit:'Hlaða upp',image:'Setja inn mynd',flash:'Flash',form:'Setja inn innsláttarform',checkbox:'Setja inn hökunarreit',radio:'Setja inn valhnapp',textField:'Setja inn textareit',textarea:'Setja inn textasvæði',hiddenField:'Setja inn falið svæði',button:'Setja inn hnapp',select:'Setja inn lista',imageButton:'Setja inn myndahnapp',notSet:'<ekkert valið>',id:'Auðkenni',name:'Nafn',langDir:'Lesstefna',langDirLtr:'Frá vinstri til hægri (LTR)',langDirRtl:'Frá hægri til vinstri (RTL)',langCode:'Tungumálakóði',longDescr:'Nánari lýsing',cssClass:'Stílsniðsflokkur',advisoryTitle:'Titill',cssStyle:'Stíll',ok:'� lagi',cancel:'Hætta við',close:'Close',preview:'Preview',generalTab:'Almennt',advancedTab:'Tæknilegt',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Breidd',height:'Hæð',align:'Jöfnun',alignLeft:'Vinstri',alignRight:'Hægri',alignCenter:'Miðjað',alignTop:'Efst',alignMiddle:'Miðjuð',alignBottom:'Neðst',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Setja inn merki',title:'Velja tákn',options:'Special Character Options'},link:{toolbar:'Stofna/breyta stiklu',other:'<annar>',menu:'Breyta stiklu',title:'Stikla',info:'Almennt',target:'Mark',upload:'Senda upp',advanced:'Tæknilegt',type:'Stikluflokkur',toUrl:'URL',toAnchor:'Bókamerki á þessari síðu',toEmail:'Netfang',targetFrame:'<rammi>',targetPopup:'<sprettigluggi>',targetFrameName:'Nafn markglugga',targetPopupName:'Nafn sprettiglugga',popupFeatures:'Eigindi sprettiglugga',popupResizable:'Resizable',popupStatusBar:'Stöðustika',popupLocationBar:'Fanglína',popupToolbar:'Verkfærastika',popupMenuBar:'Vallína',popupFullScreen:'Heilskjár (IE)',popupScrollBars:'Skrunstikur',popupDependent:'Háð venslum (Netscape)',popupLeft:'Fjarlægð frá vinstri',popupTop:'Fjarlægð frá efri brún',id:'Id',langDir:'Lesstefna',langDirLTR:'Frá vinstri til hægri (LTR)',langDirRTL:'Frá hægri til vinstri (RTL)',acccessKey:'Skammvalshnappur',name:'Nafn',langCode:'Lesstefna',tabIndex:'Raðnúmer innsláttarreits',advisoryTitle:'Titill',advisoryContentType:'Tegund innihalds',cssClasses:'Stílsniðsflokkur',charset:'Táknróf',styles:'Stíll',rel:'Relationship',selectAnchor:'Veldu akkeri',anchorName:'Eftir akkerisnafni',anchorId:'Eftir auðkenni einingar',emailAddress:'Netfang',emailSubject:'Efni',emailBody:'Meginmál',noAnchors:'<Engin bókamerki á skrá>',noUrl:'Sláðu inn veffang stiklunnar!',noEmail:'Sláðu inn netfang!'},anchor:{toolbar:'Stofna/breyta kaflamerki',menu:'Eigindi kaflamerkis',title:'Eigindi kaflamerkis',name:'Nafn bókamerkis',errorName:'Sláðu inn nafn bókamerkis!',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Finna og skipta',find:'Leita',replace:'Skipta út',findWhat:'Leita að:',replaceWith:'Skipta út fyrir:',notFoundMsg:'Leitartexti fannst ekki!',findOptions:'Find Options',matchCase:'Gera greinarmun á¡ há¡- og lágstöfum',matchWord:'Aðeins heil orð',matchCyclic:'Match cyclic',replaceAll:'Skipta út allsstaðar',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tafla',title:'Eigindi töflu',menu:'Eigindi töflu',deleteTable:'Fella töflu',rows:'Raðir',columns:'Dálkar',border:'Breidd ramma',widthPx:'myndeindir',widthPc:'prósent',widthUnit:'width unit',cellSpace:'Bil milli reita',cellPad:'Reitaspássía',caption:'Titill',summary:'�fram',headers:'Fyrirsagnir',headersNone:'Engar',headersColumn:'Fyrsti dálkur',headersRow:'Fyrsta röð',headersBoth:'Hvort tveggja',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Reitur',insertBefore:'Skjóta inn reiti fyrir aftan',insertAfter:'Skjóta inn reiti fyrir framan',deleteCell:'Fella reit',merge:'Sameina reiti',mergeRight:'Sameina til hægri',mergeDown:'Sameina niður á við',splitHorizontal:'Kljúfa reit lárétt',splitVertical:'Kljúfa reit lóðrétt',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Röð',insertBefore:'Skjóta inn röð fyrir ofan',insertAfter:'Skjóta inn röð fyrir neðan',deleteRow:'Eyða röð'},column:{menu:'Dálkur',insertBefore:'Skjóta inn dálki vinstra megin',insertAfter:'Skjóta inn dálki hægra megin',deleteColumn:'Fella dálk'}},button:{title:'Eigindi hnapps',text:'Texti',type:'Gerð',typeBtn:'Hnappur',typeSbm:'Staðfesta',typeRst:'Hreinsa'},checkboxAndRadio:{checkboxTitle:'Eigindi markreits',radioTitle:'Eigindi valhnapps',value:'Gildi',selected:'Valið'},form:{title:'Eigindi innsláttarforms',menu:'Eigindi innsláttarforms',action:'Aðgerð',method:'Aðferð',encoding:'Encoding'},select:{title:'Eigindi lista',selectInfo:'Upplýsingar',opAvail:'Kostir',value:'Gildi',size:'Stærð',lines:'línur',chkMulti:'Leyfa fleiri kosti',opText:'Texti',opValue:'Gildi',btnAdd:'Bæta við',btnModify:'Breyta',btnUp:'Upp',btnDown:'Niður',btnSetValue:'Merkja sem valið',btnDelete:'Eyða'},textarea:{title:'Eigindi textasvæðis',cols:'Dálkar',rows:'Línur'},textfield:{title:'Eigindi textareits',name:'Nafn',value:'Gildi',charWidth:'Breidd (leturtákn)',maxChars:'Hámarksfjöldi leturtákna',type:'Gerð',typeText:'Texti',typePass:'Lykilorð'},hidden:{title:'Eigindi falins svæðis',name:'Nafn',value:'Gildi'},image:{title:'Eigindi myndar',titleButton:'Eigindi myndahnapps',menu:'Eigindi myndar',infoTab:'Almennt',btnUpload:'Hlaða upp',upload:'Hlaða upp',alt:'Baklægur texti',lockRatio:'Festa stærðarhlutfall',resetSize:'Reikna stærð',border:'Rammi',hSpace:'Vinstri bil',vSpace:'Hægri bil',alertUrl:'Sláðu inn slóðina að myndinni',linkTab:'Stikla',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Eigindi Flash',propertiesTab:'Properties',title:'Eigindi Flash',chkPlay:'Sjálfvirk spilun',chkLoop:'Endurtekning',chkMenu:'Sýna Flash-valmynd',chkFull:'Allow Fullscreen',scale:'Skali',scaleAll:'Sýna allt',scaleNoBorder:'�n ramma',scaleFit:'Fella skala að stærð',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs neðst',alignAbsMiddle:'Abs miðjuð',alignBaseline:'Grunnlína',alignTextTop:'Efri brún texta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Bakgrunnslitur',hSpace:'Vinstri bil',vSpace:'Hægri bil',validateSrc:'Sláðu inn veffang stiklunnar!',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Villuleit',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Ekki í orðabókinni',changeTo:'Tillaga',btnIgnore:'Hunsa',btnIgnoreAll:'Hunsa allt',btnReplace:'Skipta',btnReplaceAll:'Skipta öllu',btnUndo:'Til baka',noSuggestions:'- engar tillögur -',progress:'Villuleit í gangi...',noMispell:'Villuleit lokið: Engin villa fannst',noChanges:'Villuleit lokið: Engu orði breytt',oneChange:'Villuleit lokið: Einu orði breytt',manyChanges:'Villuleit lokið: %1 orðum breytt',ieSpellDownload:'Villuleit ekki sett upp.<br>Viltu setja hana upp?'},smiley:{toolbar:'Svipur',title:'Velja svip',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Númeraður listi',bulletedlist:'Punktalisti',indent:'Minnka inndrátt',outdent:'Auka inndrátt',justify:{left:'Vinstrijöfnun',center:'Miðja texta',right:'Hægrijöfnun',block:'Jafna báðum megin'},blockquote:'Inndráttur',clipboard:{title:'Líma',cutError:'Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).',copyError:'Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).',pasteMsg:'Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.',securityMsg:'Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Líma úr Word',title:'Líma úr Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Líma sem ósniðinn texta',title:'Líma sem ósniðinn texta'},templates:{button:'Sniðmát',title:'Innihaldssniðmát',options:'Template Options',insertOption:'Skipta út raunverulegu innihaldi',selectPromptMsg:'Veldu sniðmát til að opna í ritlinum.<br>(Núverandi innihald víkur fyrir því!):',emptyListMsg:'(Ekkert sniðmát er skilgreint!)'},showBlocks:'Sýna blokkir',stylesCombo:{label:'Stílflokkur',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Stílsnið',panelTitle:'Stílsnið',tag_p:'Venjulegt letur',tag_pre:'Forsniðið',tag_address:'Vistfang',tag_h1:'Fyrirsögn 1',tag_h2:'Fyrirsögn 2',tag_h3:'Fyrirsögn 3',tag_h4:'Fyrirsögn 4',tag_h5:'Fyrirsögn 5',tag_h6:'Fyrirsögn 6',tag_div:'Venjulegt (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Leturgerð ',voiceLabel:'Font',panelTitle:'Leturgerð '},fontSize:{label:'Leturstærð ',voiceLabel:'Font Size',panelTitle:'Leturstærð '},colorButton:{textColorTitle:'Litur texta',bgColorTitle:'Bakgrunnslitur',panelTitle:'Colors',auto:'Sjálfval',more:'Fleiri liti...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Eigindi skjals',title:'Eigindi skjals',design:'Design',meta:'Lýsigögn',chooseColor:'Choose',other:'<annar>',docTitle:'Titill síðu',charset:'Letursett',charsetOther:'Annað letursett',charsetASCII:'ASCII',charsetCE:'Mið-evrópskt',charsetCT:'Kínverskt, hefðbundið (Big5)',charsetCR:'Kýrilskt',charsetGR:'Grískt',charsetJP:'Japanskt',charsetKR:'Kóreskt',charsetTR:'Tyrkneskt',charsetUN:'Unicode (UTF-8)',charsetWE:'Vestur-evrópst',docType:'Flokkur skjalategunda',docTypeOther:'Annar flokkur skjalategunda',xhtmlDec:'Fella inn XHTML lýsingu',bgColor:'Bakgrunnslitur',bgImage:'Slóð bakgrunnsmyndar',bgFixed:'Læstur bakgrunnur',txtColor:'Litur texta',margin:'Hliðarspássía',marginTop:'Efst',marginLeft:'Vinstri',marginRight:'Hægri',marginBottom:'Neðst',metaKeywords:'Lykilorð efnisorðaskrár (aðgreind með kommum)',metaDescription:'Lýsing skjals',metaAuthor:'Höfundur',metaCopyright:'Höfundarréttur',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/it.js b/upload/public/js/3rd_party/ckeditor/lang/it.js
new file mode 100644
index 00000000..09ce4f57
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/it.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.it={dir:'ltr',editorTitle:"Rich text editor, %1, premere ALT 0 per l'help in linea.",toolbars:'Editor toolbar',editor:'Rich Text Editor',source:'Codice Sorgente',newPage:'Nuova pagina vuota',save:'Salva',preview:'Anteprima',cut:'Taglia',copy:'Copia',paste:'Incolla',print:'Stampa',underline:'Sottolineato',bold:'Grassetto',italic:'Corsivo',selectAll:'Seleziona tutto',removeFormat:'Elimina formattazione',strike:'Barrato',subscript:'Pedice',superscript:'Apice',horizontalrule:'Inserisci riga orizzontale',pagebreak:'Inserisci interruzione di pagina',pagebreakAlt:'Interruzione di pagina',unlink:'Elimina collegamento',undo:'Annulla',redo:'Ripristina',common:{browseServer:'Cerca sul server',url:'URL',protocol:'Protocollo',upload:'Carica',uploadSubmit:'Invia al server',image:'Immagine',flash:'Oggetto Flash',form:'Modulo',checkbox:'Checkbox',radio:'Radio Button',textField:'Campo di testo',textarea:'Area di testo',hiddenField:'Campo nascosto',button:'Bottone',select:'Menu di selezione',imageButton:'Bottone immagine',notSet:'<non impostato>',id:'Id',name:'Nome',langDir:'Direzione scrittura',langDirLtr:'Da Sinistra a Destra (LTR)',langDirRtl:'Da Destra a Sinistra (RTL)',langCode:'Codice Lingua',longDescr:'URL descrizione estesa',cssClass:'Nome classe CSS',advisoryTitle:'Titolo',cssStyle:'Stile',ok:'OK',cancel:'Annulla',close:'Chiudi',preview:'Anteprima',generalTab:'Generale',advancedTab:'Avanzate',validateNumberFailed:'Il valore inserito non è un numero.',confirmNewPage:'Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?',confirmCancel:'Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?',options:'Opzioni',target:'Destinazione',targetNew:'Nuova finestra (_blank)',targetTop:'Finestra in primo piano (_top)',targetSelf:'Stessa finestra (_self)',targetParent:'Finestra Padre (_parent)',langDirLTR:'Da sinistra a destra (LTR)',langDirRTL:'Da destra a sinistra (RTL)',styles:'Stile',cssClasses:'Classi di stile',width:'Larghezza',height:'Altezza',align:'Allineamento',alignLeft:'Sinistra',alignRight:'Destra',alignCenter:'Centrato',alignTop:'In Alto',alignMiddle:'Centrato',alignBottom:'In Basso',invalidHeight:"L'altezza dev'essere un numero",invalidWidth:"La Larghezza dev'essere un numero",invalidCssLength:'Il valore indicato per il campo "%1" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).',invalidHtmlLength:'Il valore indicato per il campo "%1" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, non disponibile</span>'},contextmenu:{options:'Opzioni del menù contestuale'},specialChar:{toolbar:'Inserisci carattere speciale',title:'Seleziona carattere speciale',options:'Opzioni carattere speciale'},link:{toolbar:'Inserisci/Modifica collegamento',other:'<altro>',menu:'Modifica collegamento',title:'Collegamento',info:'Informazioni collegamento',target:'Destinazione',upload:'Carica',advanced:'Avanzate',type:'Tipo di Collegamento',toUrl:'URL',toAnchor:'Ancora nella pagina',toEmail:'E-Mail',targetFrame:'<riquadro>',targetPopup:'<finestra popup>',targetFrameName:'Nome del riquadro di destinazione',targetPopupName:'Nome finestra popup',popupFeatures:'Caratteristiche finestra popup',popupResizable:'Ridimensionabile',popupStatusBar:'Barra di stato',popupLocationBar:'Barra degli indirizzi',popupToolbar:'Barra degli strumenti',popupMenuBar:'Barra del menu',popupFullScreen:'A tutto schermo (IE)',popupScrollBars:'Barre di scorrimento',popupDependent:'Dipendente (Netscape)',popupLeft:'Posizione da sinistra',popupTop:"Posizione dall'alto",id:'Id',langDir:'Direzione scrittura',langDirLTR:'Da Sinistra a Destra (LTR)',langDirRTL:'Da Destra a Sinistra (RTL)',acccessKey:'Scorciatoia<br />da tastiera',name:'Nome',langCode:'Direzione scrittura',tabIndex:'Ordine di tabulazione',advisoryTitle:'Titolo',advisoryContentType:'Tipo della risorsa collegata',cssClasses:'Nome classe CSS',charset:'Set di caretteri della risorsa collegata',styles:'Stile',rel:'Relazioni',selectAnchor:'Scegli Ancora',anchorName:'Per Nome',anchorId:'Per id elemento',emailAddress:'Indirizzo E-Mail',emailSubject:'Oggetto del messaggio',emailBody:'Corpo del messaggio',noAnchors:'(Nessuna ancora disponibile nel documento)',noUrl:"Devi inserire l'URL del collegamento",noEmail:"Devi inserire un'indirizzo e-mail"},anchor:{toolbar:'Inserisci/Modifica Ancora',menu:'Proprietà ancora',title:'Proprietà ancora',name:'Nome ancora',errorName:"Inserici il nome dell'ancora",remove:"Rimuovi l'ancora"},list:{numberedTitle:'Proprietà liste numerate',bulletedTitle:'Proprietà liste puntate',type:'Tipo',start:'Inizio',validateStartNumber:'Il numero di inizio di una lista numerata deve essere un numero intero.',circle:'Cerchio',disc:'Disco',square:'Quadrato',none:'Nessuno',notset:'<non impostato>',armenian:'Numerazione Armena',georgian:'Numerazione Georgiana (an, ban, gan, ecc.)',lowerRoman:'Numerazione Romana minuscola (i, ii, iii, iv, v, ecc.)',upperRoman:'Numerazione Romana maiuscola (I, II, III, IV, V, ecc.)',lowerAlpha:'Alfabetico minuscolo (a, b, c, d, e, ecc.)',upperAlpha:'Alfabetico maiuscolo (A, B, C, D, E, ecc.)',lowerGreek:'Greco minuscolo (alpha, beta, gamma, ecc.)',decimal:'Decimale (1, 2, 3, ecc.)',decimalLeadingZero:'Decimale preceduto da 0 (01, 02, 03, ecc.)'},findAndReplace:{title:'Cerca e Sostituisci',find:'Trova',replace:'Sostituisci',findWhat:'Trova:',replaceWith:'Sostituisci con:',notFoundMsg:"L'elemento cercato non è stato trovato.",findOptions:'Find Options',matchCase:'Maiuscole/minuscole',matchWord:'Solo parole intere',matchCyclic:'Ricerca ciclica',replaceAll:'Sostituisci tutto',replaceSuccessMsg:'%1 occorrenza(e) sostituite.'},table:{toolbar:'Tabella',title:'Proprietà tabella',menu:'Proprietà tabella',deleteTable:'Cancella Tabella',rows:'Righe',columns:'Colonne',border:'Dimensione bordo',widthPx:'pixel',widthPc:'percento',widthUnit:'unità larghezza',cellSpace:'Spaziatura celle',cellPad:'Padding celle',caption:'Intestazione',summary:'Indice',headers:'Intestazione',headersNone:'Nessuna',headersColumn:'Prima Colonna',headersRow:'Prima Riga',headersBoth:'Entrambe',invalidRows:"Il numero di righe dev'essere un numero maggiore di 0.",invalidCols:"Il numero di colonne dev'essere un numero maggiore di 0.",invalidBorder:"La dimensione del bordo dev'essere un numero.",invalidWidth:"La larghezza della tabella dev'essere un numero.",invalidHeight:"L'altezza della tabella dev'essere un numero.",invalidCellSpacing:"La spaziatura tra le celle dev'essere un numero.",invalidCellPadding:"Il paging delle celle dev'essere un numero",cell:{menu:'Cella',insertBefore:'Inserisci Cella Prima',insertAfter:'Inserisci Cella Dopo',deleteCell:'Elimina celle',merge:'Unisce celle',mergeRight:'Unisci a Destra',mergeDown:'Unisci in Basso',splitHorizontal:'Dividi Cella Orizzontalmente',splitVertical:'Dividi Cella Verticalmente',title:'Proprietà della cella',cellType:'Tipo di cella',rowSpan:'Su più righe',colSpan:'Su più colonne',wordWrap:'Ritorno a capo',hAlign:'Allineamento orizzontale',vAlign:'Allineamento verticale',alignBaseline:'Linea Base',bgColor:'Colore di Sfondo',borderColor:'Colore del Bordo',data:'Dati',header:'Intestazione',yes:'Si',no:'No',invalidWidth:"La larghezza della cella dev'essere un numero.",invalidHeight:"L'altezza della cella dev'essere un numero.",invalidRowSpan:"Il numero di righe dev'essere un numero intero.",invalidColSpan:"Il numero di colonne dev'essere un numero intero.",chooseColor:'Scegli'},row:{menu:'Riga',insertBefore:'Inserisci Riga Prima',insertAfter:'Inserisci Riga Dopo',deleteRow:'Elimina righe'},column:{menu:'Colonna',insertBefore:'Inserisci Colonna Prima',insertAfter:'Inserisci Colonna Dopo',deleteColumn:'Elimina colonne'}},button:{title:'Proprietà bottone',text:'Testo (Valore)',type:'Tipo',typeBtn:'Bottone',typeSbm:'Invio',typeRst:'Annulla'},checkboxAndRadio:{checkboxTitle:'Proprietà checkbox',radioTitle:'Proprietà radio button',value:'Valore',selected:'Selezionato'},form:{title:'Proprietà modulo',menu:'Proprietà modulo',action:'Azione',method:'Metodo',encoding:'Codifica'},select:{title:'Proprietà menu di selezione',selectInfo:'Info',opAvail:'Opzioni disponibili',value:'Valore',size:'Dimensione',lines:'righe',chkMulti:'Permetti selezione multipla',opText:'Testo',opValue:'Valore',btnAdd:'Aggiungi',btnModify:'Modifica',btnUp:'Su',btnDown:'Gi',btnSetValue:'Imposta come predefinito',btnDelete:'Rimuovi'},textarea:{title:'Proprietà area di testo',cols:'Colonne',rows:'Righe'},textfield:{title:'Proprietà campo di testo',name:'Nome',value:'Valore',charWidth:'Larghezza',maxChars:'Numero massimo di caratteri',type:'Tipo',typeText:'Testo',typePass:'Password'},hidden:{title:'Proprietà campo nascosto',name:'Nome',value:'Valore'},image:{title:'Proprietà immagine',titleButton:'Proprietà bottone immagine',menu:'Proprietà immagine',infoTab:'Informazioni immagine',btnUpload:'Invia al server',upload:'Carica',alt:'Testo alternativo',lockRatio:'Blocca rapporto',resetSize:'Reimposta dimensione',border:'Bordo',hSpace:'HSpace',vSpace:'VSpace',alertUrl:"Devi inserire l'URL per l'immagine",linkTab:'Collegamento',button2Img:"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?",img2Button:"Vuoi trasferomare l'immagine selezionata in un bottone immagine?",urlMissing:"Manca l'URL dell'immagine.",validateBorder:'Il campo Bordo deve essere un numero intero.',validateHSpace:'Il campo HSpace deve essere un numero intero.',validateVSpace:'Il campo VSpace deve essere un numero intero.'},flash:{properties:'Proprietà Oggetto Flash',propertiesTab:'Proprietà',title:'Proprietà Oggetto Flash',chkPlay:'Avvio Automatico',chkLoop:'Riavvio automatico',chkMenu:'Abilita Menu di Flash',chkFull:'Permetti la modalità tutto schermo',scale:'Ridimensiona',scaleAll:'Mostra Tutto',scaleNoBorder:'Senza Bordo',scaleFit:'Dimensione Esatta',access:'Accesso Script',accessAlways:'Sempre',accessSameDomain:'Solo stesso dominio',accessNever:'Mai',alignAbsBottom:'In basso assoluto',alignAbsMiddle:'Centrato assoluto',alignBaseline:'Linea base',alignTextTop:'In alto al testo',quality:'Qualità',qualityBest:'Massima',qualityHigh:'Alta',qualityAutoHigh:'Alta Automatica',qualityMedium:'Intermedia',qualityAutoLow:'Bassa Automatica',qualityLow:'Bassa',windowModeWindow:'Finestra',windowModeOpaque:'Opaca',windowModeTransparent:'Trasparente',windowMode:'Modalità finestra',flashvars:'Variabili per Flash',bgcolor:'Colore sfondo',hSpace:'HSpace',vSpace:'VSpace',validateSrc:"Devi inserire l'URL del collegamento",validateHSpace:"L'HSpace dev'essere un numero.",validateVSpace:"Il VSpace dev'essere un numero."},spellCheck:{toolbar:'Correttore ortografico',title:'Controllo ortografico',notAvailable:'Il servizio non è momentaneamente disponibile.',errorLoading:"Errore nel caricamento dell'host col servizio applicativo: %s.",notInDic:'Non nel dizionario',changeTo:'Cambia in',btnIgnore:'Ignora',btnIgnoreAll:'Ignora tutto',btnReplace:'Cambia',btnReplaceAll:'Cambia tutto',btnUndo:'Annulla',noSuggestions:'- Nessun suggerimento -',progress:'Controllo ortografico in corso',noMispell:'Controllo ortografico completato: nessun errore trovato',noChanges:'Controllo ortografico completato: nessuna parola cambiata',oneChange:'Controllo ortografico completato: 1 parola cambiata',manyChanges:'Controllo ortografico completato: %1 parole cambiate',ieSpellDownload:'Contollo ortografico non installato. Lo vuoi scaricare ora?'},smiley:{toolbar:'Emoticon',title:'Inserisci emoticon',options:'Opzioni Smiley'},elementsPath:{eleLabel:'Percorso degli elementi',eleTitle:'%1 elemento'},numberedlist:'Elenco numerato',bulletedlist:'Elenco puntato',indent:'Aumenta rientro',outdent:'Riduci rientro',justify:{left:'Allinea a sinistra',center:'Centra',right:'Allinea a destra',block:'Giustifica'},blockquote:'Citazione',clipboard:{title:'Incolla',cutError:'Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).',copyError:'Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).',pasteMsg:"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.",securityMsg:"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.",pasteArea:'Incolla'},pastefromword:{confirmCleanup:'Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?',toolbar:'Incolla da Word',title:'Incolla da Word',error:'Non è stato possibile eliminarre il testo incollato a causa di un errore interno.'},pasteText:{button:'Incolla come testo semplice',title:'Incolla come testo semplice'},templates:{button:'Modelli',title:'Contenuto dei modelli',options:'Opzioni del Modello',insertOption:'Cancella il contenuto corrente',selectPromptMsg:"Seleziona il modello da aprire nell'editor<br />(il contenuto attuale verrà eliminato):",emptyListMsg:'(Nessun modello definito)'},showBlocks:'Visualizza Blocchi',stylesCombo:{label:'Stile',panelTitle:'Stili di formattazione',panelTitle1:'Stili per blocchi',panelTitle2:'Stili in linea',panelTitle3:'Stili per oggetti'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normale',tag_pre:'Formattato',tag_address:'Indirizzo',tag_h1:'Titolo 1',tag_h2:'Titolo 2',tag_h3:'Titolo 3',tag_h4:'Titolo 4',tag_h5:'Titolo 5',tag_h6:'Titolo 6',tag_div:'Paragrafo (DIV)'},div:{title:'Crea DIV contenitore',toolbar:'Crea DIV contenitore',cssClassInputLabel:'Classi di stile',styleSelectLabel:'Stile',IdInputLabel:'Id',languageCodeInputLabel:'Codice lingua',inlineStyleInputLabel:'Stile Inline',advisoryTitleInputLabel:'Titolo Avviso',langDirLabel:'Direzione di scrittura',langDirLTRLabel:'Da sinistra a destra (LTR)',langDirRTLLabel:'Da destra a sinistra (RTL)',edit:'Modifica DIV',remove:'Rimuovi DIV'},iframe:{title:'Proprietà IFrame',toolbar:'IFrame',noUrl:"Inserire l'URL del campo IFrame",scrolling:'Abilita scrollbar',border:'Mostra il bordo'},font:{label:'Carattere',voiceLabel:'Carattere',panelTitle:'Carattere'},fontSize:{label:'Dimensione',voiceLabel:'Dimensione Carattere',panelTitle:'Dimensione'},colorButton:{textColorTitle:'Colore testo',bgColorTitle:'Colore sfondo',panelTitle:'Colori',auto:'Automatico',more:'Altri colori...'},colors:{'000':'Nero',800000:'Marrone Castagna','8B4513':'Marrone Cuoio','2F4F4F':'Grigio Fumo di Londra','008080':'Acquamarina','000080':'Blu Oceano','4B0082':'Indigo',696969:'Grigio Scuro',B22222:'Giallo Fiamma',A52A2A:'Marrone',DAA520:'Giallo Mimosa','006400':'Verde Scuro','40E0D0':'Turchese','0000CD':'Blue Scuro',800080:'Viola',808080:'Grigio',F00:'Rosso',FF8C00:'Arancio Scuro',FFD700:'Oro','008000':'Verde','0FF':'Ciano','00F':'Blu',EE82EE:'Violetto',A9A9A9:'Grigio Scuro',FFA07A:'Salmone',FFA500:'Arancio',FFFF00:'Giallo','00FF00':'Lime',AFEEEE:'Turchese Chiaro',ADD8E6:'Blu Chiaro',DDA0DD:'Rosso Ciliegia',D3D3D3:'Grigio Chiaro',FFF0F5:'Lavanda Chiara',FAEBD7:'Bianco Antico',FFFFE0:'Giallo Chiaro',F0FFF0:'Verde Mela',F0FFFF:'Azzurro',F0F8FF:'Celeste',E6E6FA:'Lavanda',FFF:'Bianco'},scayt:{title:'Controllo Ortografico Mentre Scrivi',opera_title:'Non supportato da Opera',enable:'Abilita COMS',disable:'Disabilita COMS',about:'About COMS',toggle:'Inverti abilitazione SCOMS',options:'Opzioni',langs:'Lingue',moreSuggestions:'Altri suggerimenti',ignore:'Ignora',ignoreAll:'Ignora tutti',addWord:'Aggiungi Parola',emptyDic:'Il nome del dizionario non può essere vuoto.',optionsTab:'Opzioni',allCaps:'Ignora Parole in maiuscolo',ignoreDomainNames:'Ignora nomi di dominio',mixedCase:'Ignora parole con maiuscole e minuscole',mixedWithDigits:'Ignora parole con numeri',languagesTab:'Lingue',dictionariesTab:'Dizionari',dic_field_name:'Nome del dizionario',dic_create:'Crea',dic_restore:'Ripristina',dic_delete:'Cancella',dic_rename:'Rinomina',dic_info:'Inizialmente il dizionario utente è memorizzato in un Cookie. I Cookie però hanno una dimensioni massima limitata. Quando il dizionario utente creasce a tal punto da non poter più essere memorizzato in un Cookie, allora il dizionario può essere memorizzato sul nostro server. Per memorizzare il proprio dizionario personale sul nostro server, è necessario specificare un nome per il proprio dizionario. Se avete già memorizzato un dizionario, inserite il nome che gli avete dato e premete il pulsante Ripristina.',aboutTab:'Info'},about:{title:'Riguardo CKEditor',dlgTitle:'Riguardo CKEditor',help:"Vedi $1 per l'aiuto.",userGuide:'Guida Utente CKEditor',moreInfo:'Per le informazioni sulla licenza si prega di visitare il nostro sito:',copy:'Copyright &copy; $1. Tutti i diritti riservati.'},maximize:'Massimizza',minimize:'Minimizza',fakeobjects:{anchor:'Ancora',flash:'Animazione Flash',iframe:'IFrame',hiddenfield:'Campo Nascosto',unknown:'Oggetto sconosciuto'},resize:'Trascina per ridimensionare',colordialog:{title:'Selezionare il colore',options:'Opzioni colore',highlight:'Evidenzia',selected:'Seleziona il colore',clear:'cancella'},toolbarCollapse:'Minimizza Toolbar',toolbarExpand:'Espandi Toolbar',toolbarGroups:{document:'Documento',clipboard:'Copia negli appunti/Indietro',editing:'Modifica',forms:'Form',basicstyles:'Stili di base',paragraph:'Paragrafo',links:'Link',insert:'Inserisci',styles:'Stili',colors:'Colori',tools:'Strumenti'},bidi:{ltr:'Direzione del testo da sinistra verso destra',rtl:'Direzione del testo da destra verso sinistra'},docprops:{label:'Proprietà del Documento',title:'Proprietà del Documento',design:'Disegna',meta:'Meta Data',chooseColor:'Scegli',other:'<altro>',docTitle:'Titolo pagina',charset:'Set di caretteri',charsetOther:'Altro set di caretteri',charsetASCII:'ASCII',charsetCE:'Europa Centrale',charsetCT:'Cinese Tradizionale (Big5)',charsetCR:'Cirillico',charsetGR:'Greco',charsetJP:'Giapponese',charsetKR:'Coreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europa Occidentale',docType:'Intestazione DocType',docTypeOther:'Altra intestazione DocType',xhtmlDec:'Includi dichiarazione XHTML',bgColor:'Colore di sfondo',bgImage:'Immagine di sfondo',bgFixed:'Sfondo fissato',txtColor:'Colore testo',margin:'Margini',marginTop:'In Alto',marginLeft:'A Sinistra',marginRight:'A Destra',marginBottom:'In Basso',metaKeywords:'Chiavi di indicizzazione documento (separate da virgola)',metaDescription:'Descrizione documento',metaAuthor:'Autore',metaCopyright:'Copyright',previewHtml:'<p>Questo è un <strong>testo di esempio</strong>. State usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ja.js b/upload/public/js/3rd_party/ckeditor/lang/ja.js
new file mode 100644
index 00000000..afffa552
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ja.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ja={dir:'ltr',editorTitle:'リッ�テキストエディタ, %1, ヘルプ� ALT 0 を押������',toolbars:'Editor toolbars',editor:'リッ�テキストエディタ',source:'ソース',newPage:'新��ページ',save:'�存',preview:'プレビュー',cut:'切り�り',copy:'コピー',paste:'貼り付�',print:'�刷',underline:'下線',bold:'太字',italic:'斜体',selectAll:'����択',removeFormat:'フォーマット削除',strike:'打�消�線',subscript:'添�字',superscript:'上付�文字',horizontalrule:'横罫線',pagebreak:'改ページ挿入',pagebreakAlt:'Page Break',unlink:'リンク削除',undo:'元�戻�',redo:'やり直�',common:{browseServer:'サー�ーブラウザー',url:'URL',protocol:'プロトコル',upload:'アップロード',uploadSubmit:'サー�ー��信',image:'イメージ',flash:'Flash',form:'フォーム',checkbox:'�ェックボックス',radio:'ラジオボタン',textField:'１行テキスト',textarea:'テキストエリア',hiddenField:'��視フィールド',button:'ボタン',select:'�択フィールド',imageButton:'画�ボタン',notSet:'<��>',id:'Id',name:'Name属性',langDir:'文字表記�方�',langDirLtr:'左�ら� (LTR)',langDirRtl:'��ら左 (RTL)',langCode:'言語コード',longDescr:'longdesc属性(長文説明)',cssClass:'スタイルシートクラス',advisoryTitle:'Title属性',cssStyle:'スタイルシート',ok:'OK',cancel:'キャンセル',close:'閉�る',preview:'プレビュー',generalTab:'全般',advancedTab:'高度�設定',validateNumberFailed:'値�数���り��ん',confirmNewPage:'変更内容を�存��� 新��ページを開��もよ�����ょ��？',confirmCancel:'オプション設定を変更����。ダイアログを閉��もよ�����ょ��？',options:'オプション',target:'ターゲット',targetNew:'新��ウィンドウ (_空白)',targetTop:'最上部ウィンドウ (_トップ)',targetSelf:'��ウィンドウ (_�一)',targetParent:'親ウィンドウ (_親)',langDirLTR:'左�ら� (LTR)',langDirRTL:'��ら左 (RTL)',styles:'スタイル',cssClasses:'スタイルシートクラス',width:'幅',height:'高�',align:'行��',alignLeft:'左',alignRight:'�',alignCenter:'中央',alignTop:'上',alignMiddle:'中央',alignBottom:'下',invalidHeight:'高��数値�入力������。',invalidWidth:'幅�数値�入力������。',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, 利用��能</span>'},contextmenu:{options:'コンテキストメニューオプション'},specialChar:{toolbar:'特殊文字挿入',title:'特殊文字�択',options:'特殊文字オプション'},link:{toolbar:'リンク挿入/編集',other:'<��他�>',menu:'リンク編集',title:'�イパーリンク',info:'�イパーリンク 情報',target:'ターゲット',upload:'アップロード',advanced:'高度�設定',type:'リンクタイプ',toUrl:'URL',toAnchor:'��ページ�アンカー',toEmail:'E-Mail',targetFrame:'<フレーム>',targetPopup:'<�ップアップウィンドウ>',targetFrameName:'目的�フレーム�',targetPopupName:'�ップアップウィンドウ�',popupFeatures:'�ップアップウィンドウ特徴',popupResizable:'サイズ�変',popupStatusBar:'ステータス�ー',popupLocationBar:'ロケーション�ー',popupToolbar:'ツール�ー',popupMenuBar:'メニュー�ー',popupFullScreen:'全画�モード(IE)',popupScrollBars:'スクロール�ー',popupDependent:'開��ウィンドウ�連動��閉�る (Netscape)',popupLeft:'左端�ら�座標�指定',popupTop:'上端�ら�座標�指定',id:'Id',langDir:'文字表記�方�',langDirLTR:'左�ら� (LTR)',langDirRTL:'��ら左 (RTL)',acccessKey:'アクセスキー',name:'Name属性',langCode:'言語コード',tabIndex:'タブインデックス',advisoryTitle:'Title属性',advisoryContentType:'Content Type属性',cssClasses:'スタイルシートクラス',charset:'リンクcharset属性',styles:'スタイルシート',rel:'Relationship',selectAnchor:'アンカーを�択',anchorName:'アンカー�',anchorId:'エレメントID',emailAddress:'E-Mail アドレス',emailSubject:'件�',emailBody:'本文',noAnchors:'(ドキュメント����利用�能�アンカー��り��ん。)',noUrl:'リンクURLを入力������。',noEmail:'メールアドレスを入力������。'},anchor:{toolbar:'アンカー挿入/編集',menu:'アンカー プロパティ',title:'アンカー プロパティ',name:'アンカー�',errorName:'アンカー�を必�入力������。',remove:'Remove Anchor'},list:{numberedTitle:'段�番� プロパティ',bulletedTitle:'箇�書� プロパティ',type:'タイプ',start:'開始',validateStartNumber:'リスト開始番��数値�入力������。',circle:'白丸',disc:'黒丸',square:'四角',none:'��',notset:'<��>',armenian:'アルメニア数字',georgian:'グルジア数字 (an, ban, gan, etc.)',lowerRoman:'�文字ローマ数字 (i, ii, iii, iv, v, etc.)',upperRoman:'大文字ローマ数字 (I, II, III, IV, V, etc.)',lowerAlpha:'�文字アルファベット (a, b, c, d, e, etc.)',upperAlpha:'大文字アルファベット (A, B, C, D, E, etc.)',lowerGreek:'�文字ギリシャ文字 (alpha, beta, gamma, etc.)',decimal:'数字 (1, 2, 3, etc.)',decimalLeadingZero:'上���0を���数字 (01, 02, 03, etc.)'},findAndReplace:{title:'検索��置�',find:'検索',replace:'置���',findWhat:'検索�る文字列:',replaceWith:'置���る文字列:',notFoundMsg:'指定�れ�文字列�見��り��ん���。',findOptions:'Find Options',matchCase:'大文字��文字を区別�る',matchWord:'�語���探�',matchCyclic:'一周�る',replaceAll:'���置��',replaceSuccessMsg:'%1 個置�����。'},table:{toolbar:'テーブル',title:'テーブル プロパティ',menu:'テーブル プロパティ',deleteTable:'テーブル削除',rows:'行',columns:'列',border:'ボーダーサイズ',widthPx:'ピクセル',widthPc:'パーセント',widthUnit:'ユニット',cellSpace:'セル内余白',cellPad:'セル内間隔',caption:'キャプション',summary:'テーブル�概�',headers:'テーブルヘッダ(th)',headersNone:'��',headersColumn:'���列��',headersRow:'���行��',headersBoth:'両方',invalidRows:'行�0より大��数値�入力������。',invalidCols:'列�0より大��数値�入力������。',invalidBorder:'ボーダーサイズ�数値�入力������。',invalidWidth:'幅�数値�入力������。',invalidHeight:'高��数値�入力������。',invalidCellSpacing:'セル内余白�数値�入力������。',invalidCellPadding:'セル内間隔�数値�入力������。',cell:{menu:'セル',insertBefore:'セル���挿入',insertAfter:'セル�後�挿入',deleteCell:'セル削除',merge:'セル��',mergeRight:'����',mergeDown:'下���',splitHorizontal:'セルを水平方�分割',splitVertical:'セルを垂直方��分割',title:'セルプロパティ',cellType:'セルタイプ',rowSpan:'縦幅(行数)',colSpan:'横幅(列数)',wordWrap:'折り返�',hAlign:'セル横�整列',vAlign:'セル縦�整列',alignBaseline:'ベースライン',bgColor:'背景色',borderColor:'ボーダーカラー',data:'テーブルデータ(td)',header:'テーブルヘッダ(th)',yes:'Yes',no:'No',invalidWidth:'セル幅�数値�入力������。',invalidHeight:'セル高��数値�入力������。',invalidRowSpan:'縦幅(行数)�数値�入力������。',invalidColSpan:'横幅(列数)�数値�入力������。',chooseColor:'色��択'},row:{menu:'行',insertBefore:'行���挿入',insertAfter:'行�後�挿入',deleteRow:'行削除'},column:{menu:'カラム',insertBefore:'カラム���挿入',insertAfter:'カラム�後�挿入',deleteColumn:'列削除'}},button:{title:'ボタン プロパティ',text:'テキスト (値)',type:'タイプ',typeBtn:'ボタン',typeSbm:'�信',typeRst:'リセット'},checkboxAndRadio:{checkboxTitle:'�ェックボックス プロパティ',radioTitle:'ラジオボタン プロパティ',value:'値',selected:'�択済�'},form:{title:'フォーム プロパティ',menu:'フォーム プロパティ',action:'アクション',method:'メソッド',encoding:'エンコーディング'},select:{title:'�択フィールド プロパティ',selectInfo:'情報',opAvail:'利用�能�オプション',value:'�択項目値',size:'サイズ',lines:'行',chkMulti:'複数項目�択を許�',opText:'�択項目�',opValue:'値',btnAdd:'追加',btnModify:'編集',btnUp:'上�',btnDown:'下�',btnSetValue:'�択��値を設定',btnDelete:'削除'},textarea:{title:'テキストエリア プロパティ',cols:'列',rows:'行'},textfield:{title:'１行テキスト プロパティ',name:'��',value:'値',charWidth:'サイズ',maxChars:'最大長',type:'タイプ',typeText:'テキスト',typePass:'パスワード入力'},hidden:{title:'��視フィールド プロパティ',name:'��',value:'値'},image:{title:'イメージ プロパティ',titleButton:'画�ボタン プロパティ',menu:'イメージ プロパティ',infoTab:'イメージ 情報',btnUpload:'サー�ー��信',upload:'アップロード',alt:'代替テキスト',lockRatio:'ロック比率',resetSize:'サイズリセット',border:'ボーダー',hSpace:'横間隔',vSpace:'縦間隔',alertUrl:'イメージ�URLを入力������。',linkTab:'リンク',button2Img:'�択��ボタンを画��置������？',img2Button:'�択��画�をボタン�置������？',urlMissing:'イメージ�URLを入力������。',validateBorder:'ボーダー�数値�入力������。',validateHSpace:'横間隔�数値�入力������。',validateVSpace:'縦間隔�数値�入力������。'},flash:{properties:'Flash プロパティ',propertiesTab:'プロパティ',title:'Flash プロパティ',chkPlay:'�生',chkLoop:'ループ�生',chkMenu:'Flashメニュー�能',chkFull:'フルスクリーン許�',scale:'拡大縮�設定',scaleAll:'���表示',scaleNoBorder:'外�見���様�拡大',scaleFit:'上下左��フィット',access:'スプリクトアクセス(AllowScriptAccess)',accessAlways:'����場��通信�能(Always)',accessSameDomain:'�一ドメイン���通信�能(Same domain)',accessNever:'����場��通信��能(Never)',alignAbsBottom:'下部(絶対的)',alignAbsMiddle:'中央(絶対的)',alignBaseline:'ベースライン',alignTextTop:'テキスト上部',quality:'画質',qualityBest:'�質優先',qualityHigh:'高',qualityAutoHigh:'自動/高',qualityMedium:'中',qualityAutoLow:'自動/低',qualityLow:'低',windowModeWindow:'標準',windowModeOpaque:'背景を��明設定',windowModeTransparent:'背景を��設定',windowMode:'ウィンドウモード',flashvars:'フラッシュ�渡�変数(FlashVars)',bgcolor:'背景色',hSpace:'横間隔',vSpace:'縦間隔',validateSrc:'リンクURLを入力������。',validateHSpace:'横間隔�数値�入力������。',validateVSpace:'縦間隔�数値�入力������。'},spellCheck:{toolbar:'スペル�ェック',title:'スペル�ェック',notAvailable:'申�訳�り��ん��在サービスを利用�る�������ん',errorLoading:'アプリケーションサービスホスト読込�エラー: %s.',notInDic:'辞書��り��ん',changeTo:'変更',btnIgnore:'無視',btnIgnoreAll:'���無視',btnReplace:'置�',btnReplaceAll:'���置�',btnUndo:'やり直�',noSuggestions:'- 該当�� -',progress:'スペル�ェック処�中...',noMispell:'スペル�ェック完了: スペル�誤り��り��ん���',noChanges:'スペル�ェック完了: 語��変更�れ��ん���',oneChange:'スペル�ェック完了: １語�変更�れ���',manyChanges:'スペル�ェック完了: %1 語�変更�れ���',ieSpellDownload:'スペル�ェッカー�インストール�れ����ん。今��ダウンロード����?'},smiley:{toolbar:'絵文字',title:'顔文字挿入',options:'絵文字オプション'},elementsPath:{eleLabel:'エレメントパス',eleTitle:'%1 エレメント'},numberedlist:'段�番�',bulletedlist:'箇�書�',indent:'インデント',outdent:'インデント解除',justify:{left:'左��',center:'中央��',right:'���',block:'両端��'},blockquote:'ブロック引用',clipboard:{title:'貼り付�',cutError:'ブラウザー�セキュリティ設定�よりエディタ�切り�り�作�自動�実行�る�������ん。実行�る��手動�キーボード�(Ctrl/Cmd+X)を使用������。',copyError:'ブラウザー�セキュリティ設定�よりエディタ�コピー�作�自動�実行�る�������ん。実行�る��手動�キーボード�(Ctrl/Cmd+C)を使用������。',pasteMsg:'キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用���次�入力エリア内�貼���<STRONG>OK</STRONG>を押������。',securityMsg:'ブラウザ�セキュリティ設定�より�エディタ�クリップボード・データ�直接アクセス�る�������ん。��ウィンドウ�貼り付��作を行�度�表示�れ��。',pasteArea:'貼り付�場所'},pastefromword:{confirmCleanup:'貼り付�を行�テキスト��ワード文章�らコピー�れよ�������。貼り付�る��クリーニングを行����？',toolbar:'ワード文章�ら貼り付�',title:'ワード文章�ら貼り付�',error:'内部エラー�より貼り付��データ�クリア����ん���'},pasteText:{button:'プレーンテキスト貼り付�',title:'プレーンテキスト貼り付�'},templates:{button:'テンプレート(雛形)',title:'テンプレート内容',options:'テンプレートオプション',insertOption:'�在�エディタ�内容�置��を���',selectPromptMsg:'エディター�使用�るテンプレートを�択������。<br>(�在�エディタ�内容�失�れ��):',emptyListMsg:'(テンプレート�定義�れ����ん)'},showBlocks:'ブロック表示',stylesCombo:{label:'スタイル',panelTitle:'スタイル',panelTitle1:'ブロックスタイル',panelTitle2:'インラインスタイル',panelTitle3:'オブジェクトスタイル'},format:{label:'フォーマット',panelTitle:'フォーマット',tag_p:'標準',tag_pre:'書�付�',tag_address:'アドレス',tag_h1:'見出� 1',tag_h2:'見出� 2',tag_h3:'見出� 3',tag_h4:'見出� 4',tag_h5:'見出� 5',tag_h6:'見出� 6',tag_div:'標準 (DIV)'},div:{title:'Divコンテナ',toolbar:'Divコンテナ',cssClassInputLabel:'スタイルシートクラス',styleSelectLabel:'スタイル',IdInputLabel:'Id',languageCodeInputLabel:' 言語コード',inlineStyleInputLabel:'インラインスタイル',advisoryTitleInputLabel:'Title属性',langDirLabel:'文字表記�方�',langDirLTRLabel:'左�ら� (LTR)',langDirRTLLabel:'��ら左 (RTL)',edit:'Divコンテナ 編集',remove:'Divコンテナ 削除'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'フォント',voiceLabel:'フォント',panelTitle:'フォント'},fontSize:{label:'サイズ',voiceLabel:'フォントサイズ',panelTitle:'サイズ'},colorButton:{textColorTitle:'テキスト色',bgColorTitle:'背景色',panelTitle:'色',auto:'自動',more:'��他�色...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'スペル�ェック設定(SCAYT)',opera_title:'Opera��サ�ート�れ��ん',enable:'SCAYT有効',disable:'SCAYT無効',about:'SCAYTﾊﾞｰｼﾞｮ�',toggle:'SCAYT切替',options:'オプション',langs:'言語',moreSuggestions:'他�候補',ignore:'無視',ignoreAll:'���無視',addWord:'語�追加',emptyDic:'辞書��必�入力������',optionsTab:'オプション',allCaps:'全�大文字��語を無視',ignoreDomainNames:'ドメイン�を無視',mixedCase:'大文字�文字混在��語を無視',mixedWithDigits:'数字付��語を無視',languagesTab:'言語',dictionariesTab:'辞書',dic_field_name:'辞書�',dic_create:'登録',dic_restore:'元�戻�',dic_delete:'削除',dic_rename:'��変更',dic_info:'始�ユーザーディレクトリ��Cookie��存�れ��。但� Cookie �サイズ�制���り��。ユーザーディレクトリ�Cookie��存����サイズ�到��る�ディレクトリ�サー�ー上��存�れ��。個人�ディレクトリをサー�ー上��存�る���ディレクトリ�を明示�る必���り��。も�既��存�れ�ディレクトリ��る場������を入力��元�戻�ボタンを押������。',aboutTab:'�ージョン情報'},about:{title:'CKEditor�ージョン情報',dlgTitle:'CKEditor�ージョン情報',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'ライセンス情報�詳細�ウェブサイト��確�������:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'最大化',minimize:'最�化',fakeobjects:{anchor:'アンカー',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'ドラッグ��リサイズ',colordialog:{title:'色�択',options:'カラーオプション',highlight:'�イライト',selected:'�択�れ�色',clear:'クリア'},toolbarCollapse:'ツール�ーを閉�る',toolbarExpand:'ツール�ーを開�',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'テキスト��� : 左�ら��',rtl:'テキスト��� : ��ら左�'},docprops:{label:'文書 プロパティ',title:'文書 プロパティ',design:'Design',meta:'メタデータ',chooseColor:'色��択',other:'<��他�>',docTitle:'ページタイトル',charset:'文字セット符�化',charsetOther:'他�文字セット符�化',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'文書タイプヘッダー',docTypeOther:'��他文書タイプヘッダー',xhtmlDec:'XHTML宣言をインクルード',bgColor:'背景色',bgImage:'背景画� URL',bgFixed:'スクロール���背景',txtColor:'テキスト色',margin:'ページ・マージン',marginTop:'上部',marginLeft:'左',marginRight:'�',marginBottom:'下部',metaKeywords:'文書�キーワード(カンマ区切り)',metaDescription:'文書�概�',metaAuthor:'文書�作者',metaCopyright:'文書�著作権',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ka.js b/upload/public/js/3rd_party/ckeditor/lang/ka.js
new file mode 100644
index 00000000..faae9d1d
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ka.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ka={dir:'ltr',editorTitle:'ტექსტის რედ�ქტ�რი, %1, დ��ჭირეთ ALT 0-ს დ�ხმ�რების მის�ღებ�დ.',toolbars:'Editor toolbars',editor:'ტექსტის რედ�ქტ�რი',source:'კ�დები',newPage:'�ხ�ლი გვერდი',save:'ჩ�წერ�',preview:'გ�დ�ხედვ�',cut:'�მ�ჭრ�',copy:'�სლი',paste:'ჩ�სმ�',print:'ბეჭდვ�',underline:'გ�ხ�ზული',bold:'მსხვილი',italic:'დ�ხრილი',selectAll:'ყველ�ფრის მ�ნიშნვ�',removeFormat:'ფ�რმ�ტირების მ�ხსნ�',strike:'გ�დ�ხ�ზული',subscript:'ინდექსი',superscript:'ხ�რისხი',horizontalrule:'ჰ�რიზ�ნტ�ლური ხ�ზის ჩ�სმ�',pagebreak:'გვერდის წყვეტ� ბეჭდვისთვის',pagebreakAlt:'გვერდის წყვეტ�',unlink:'ბმულის მ�ხსნ�',undo:'გ�უქმებ�',redo:'გ�მე�რებ�',common:{browseServer:'სერვერზე დ�თვ�ლიერებ�',url:'URL',protocol:'პრ�ტ�კ�ლი',upload:'�ტვირთვ�',uploadSubmit:'სერვერზე გ�გზ�ვნ�',image:'სურ�თი',flash:'Flash',form:'ფ�რმ�',checkbox:'მ�ნიშვნის ღილ�კი',radio:'�მ�რჩევის ღილ�კი',textField:'ტექსტური ველი',textarea:'ტექსტური �რე',hiddenField:'მ�ლული ველი',button:'ღილ�კი',select:'�რჩევის ველი',imageButton:'სურ�თი�ნი ღილ�კი',notSet:'<�რ�ფერი>',id:'Id',name:'ს�ხელი',langDir:'ენის მიმ�რთულებ�',langDirLtr:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRtl:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',langCode:'ენის კ�დი',longDescr:'დიდი �ღწერის URL',cssClass:'CSS კლ�სი',advisoryTitle:'ს�თ�ური',cssStyle:'CSS სტილი',ok:'დი�ხ',cancel:'გ�უქმებ�',close:'დ�ხურვ�',preview:'გ�დ�ხედვ�',generalTab:'ინფ�რმ�ცი�',advancedTab:'გ�ფ�რთ�ებული',validateNumberFailed:'ეს მნიშვნელ�ბ� �რ�� რიცხვი.',confirmNewPage:'�მ დ�კუმენტში ყველ� ჩ�უწერელი ცვლილებ� დ�იკ�რგებ�. დ�რწმუნებული ხ�რთ რ�მ �ხ�ლი გვერდის ჩ�ტვირთვ� გინდ�თ?',confirmCancel:'ზ�გიერთი პ�რ�მეტრი შეცვლილი�, დ�რწმუნებულილ ხ�რთ რ�მ ფ�ნჯრის დ�ხურვ� გსურთ?',options:'პ�რ�მეტრები',target:'გ�ხსნის �დგილი',targetNew:'�ხ�ლი ფ�ნჯ�რ� (_blank)',targetTop:'ზედ� ფ�ნჯ�რ� (_top)',targetSelf:'იგივე ფ�ნჯ�რ� (_self)',targetParent:'მშ�ბელი ფ�ნჯ�რ� (_parent)',langDirLTR:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRTL:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',styles:'სტილი',cssClasses:'CSS კლ�სი',width:'სიგ�ნე',height:'სიმ�ღლე',align:'სწ�რებ�',alignLeft:'მ�რცხენ�',alignRight:'მ�რჯვენ�',alignCenter:'შუ�',alignTop:'ზემ�თ�',alignMiddle:'შუ�',alignBottom:'ქვემ�თ�',invalidHeight:'სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidWidth:'სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, მიუწვდ�მელი�</span>'},contextmenu:{options:'კ�ნტექსტური მენიუს პ�რ�მეტრები'},specialChar:{toolbar:'სპეცი�ლური სიმბ�ლ�ს ჩ�სმ�',title:'სპეცი�ლური სიმბ�ლ�ს �რჩევ�',options:'სპეცი�ლური სიმბ�ლ�ს პ�რ�მეტრები'},link:{toolbar:'ბმული',other:'<სხვ�>',menu:'ბმულის რედ�ქტირებ�',title:'ბმული',info:'ბმულის ინფ�რმ�ცი�',target:'გ�ხსნის �დგილი',upload:'�ქ�ჩვ�',advanced:'დ�წვრილებით',type:'ბმულის ტიპი',toUrl:'URL',toAnchor:'ბმული ტექსტში ღუზ�ზე',toEmail:'ელფ�სტ�',targetFrame:'<frame>',targetPopup:'<popup ფ�ნჯ�რ�>',targetFrameName:'Frame-ის ს�ხელი',targetPopupName:'Popup ფ�ნჯრის ს�ხელი',popupFeatures:'Popup ფ�ნჯრის პ�რ�მეტრები',popupResizable:'ცვ�ლებ�დი ზ�მით',popupStatusBar:'სტ�ტუსის ზ�ლი',popupLocationBar:'ნ�ვიგ�ციის ზ�ლი',popupToolbar:'ხელს�წყ�თ� ზ�ლი',popupMenuBar:'მენიუს ზ�ლი',popupFullScreen:'მთელი ეკრ�ნი (IE)',popupScrollBars:'გ�დ�ხვევის ზ�ლები',popupDependent:'დ�მ�კიდებული (Netscape)',popupLeft:'მ�რცხენ� პ�ზიცი�',popupTop:'ზედ� პ�ზიცი�',id:'Id',langDir:'ენის მიმ�რთულებ�',langDirLTR:'მ�რცხნიდ�ნ მ�რჯვნივ (LTR)',langDirRTL:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',acccessKey:'წვდ�მის ღილ�კი',name:'ს�ხელი',langCode:'ენის კ�დი',tabIndex:'Tab-ის ინდექსი',advisoryTitle:'ს�თ�ური',advisoryContentType:'შიგთ�ვსის ტიპი',cssClasses:'CSS კლ�სი',charset:'კ�დირებ�',styles:'CSS სტილი',rel:'კ�ვშირი',selectAnchor:'�ირჩიეთ ღუზ�',anchorName:'ღუზის ს�ხელით',anchorId:'ელემენტის Id-თ',emailAddress:'ელფ�სტის მის�მ�რთები',emailSubject:'წერილის ს�თ�ური',emailBody:'წერილის ტექსტი',noAnchors:'(�მ დ�კუმენტში ღუზ� �რ��)',noUrl:'�კრიფეთ ბმულის URL',noEmail:'�კრიფეთ ელფ�სტის მის�მ�რთი'},anchor:{toolbar:'ღუზ�',menu:'ღუზის რედ�ქტირებ�',title:'ღუზის პ�რ�მეტრები',name:'ღუზუს ს�ხელი',errorName:'�კრიფეთ ღუზის ს�ხელი',remove:'Remove Anchor'},list:{numberedTitle:'გ�დ�ნ�მრილი სიის პ�რ�მეტრები',bulletedTitle:'ღილები�ნი სიის პ�რ�მეტრები',type:'ტიპი',start:'ს�წყისი',validateStartNumber:'სიის ს�წყისი მთელი რიცხვი უნდ� იყ�ს.',circle:'წრეწირი',disc:'წრე',square:'კვ�დრ�ტი',none:'�რ�ფერი',notset:'<�რ�ფერი>',armenian:'ს�მხური გ�დ�ნ�მრვ�',georgian:'ქ�რთული გ�დ�ნ�მრვ� (�ნ, ბ�ნ, გ�ნ, ..)',lowerRoman:'რ�მ�ული გ�დ�ნ�მრვც� პ�ტ�რ� ციფრებით (i, ii, iii, iv, v, ..)',upperRoman:'რ�მ�ული გ�დ�ნ�მრვ� დიდი ციფრებით (I, II, III, IV, V, etc.)',lowerAlpha:'პ�ტ�რ� ლ�თინური �ს�ებით (a, b, c, d, e, ..)',upperAlpha:'დიდი ლ�თინური �ს�ებით (A, B, C, D, E, ..)',lowerGreek:'პ�ტ�რ� ბერძნული �ს�ებით (�ლფ�, ბეტ�, გ�მ�, ..)',decimal:'რიცხვებით (1, 2, 3, ..)',decimalLeadingZero:'ნულით დ�წყებული რიცხვებით (01, 02, 03, ..)'},findAndReplace:{title:'ძებნ� დ� შეცვლ�',find:'ძებნ�',replace:'შეცვლ�',findWhat:'ს�ძიებელი ტექსტი:',replaceWith:'შეცვლის ტექსტი:',notFoundMsg:'მითითებული ტექსტი �რ მ�იძებნ�.',findOptions:'Find Options',matchCase:'დიდი დ� პ�ტ�რ� �ს�ების დ�მთხვევ�',matchWord:'მთელი სიტყვის დ�მთხვევ�',matchCyclic:'დ�კუმენტის ბ�ლ�ში გ�სვლის მერე თ�ვიდ�ნ დ�წყებ�',replaceAll:'ყველ�ს შეცვლ�',replaceSuccessMsg:'%1 მ�ძებნილი შეიცვ�ლ�.'},table:{toolbar:'ცხრილი',title:'ცხრილის პ�რ�მეტრები',menu:'ცხრილის პ�რ�მეტრები',deleteTable:'ცხრილის წ�შლ�',rows:'სტრიქ�ნი',columns:'სვეტი',border:'ჩ�რჩ�ს ზ�მ�',widthPx:'წერტილი',widthPc:'პრ�ცენტი',widthUnit:'ს�ზ�მი ერთეული',cellSpace:'უჯრის სივრცე (spacing)',cellPad:'უჯრის კიდე (padding)',caption:'ს�თ�ური',summary:'შეჯ�მებ�',headers:'ს�თ�ურები',headersNone:'�რ�ფერი',headersColumn:'პირველი სვეტი',headersRow:'პირველი სტრიქ�ნი',headersBoth:'�რივე',invalidRows:'სტრიქ�ნების რ��დენ�ბ� დ�დებითი რიცხვი უნდ� იყ�ს.',invalidCols:'სვეტების რ��დენ�ბ� დ�დებითი რიცხვი უნდ� იყ�ს.',invalidBorder:'ჩ�რჩ�ს ზ�მ� რიცხვით უდნ� იყ�ს წ�რმ�დგენილი.',invalidWidth:'ცხრილის სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidHeight:'ცხრილის სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCellSpacing:'უჯრის სივრცე (spacing) რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidCellPadding:'უჯრის კიდე (padding) რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',cell:{menu:'უჯრ�',insertBefore:'უჯრის ჩ�სმ� მ�ნ�მდე',insertAfter:'უჯრის ჩ�სმ� მერე',deleteCell:'უჯრების წ�შლ�',merge:'უჯრების შეერთებ�',mergeRight:'შეერთებ� მ�რჯვენ�სთ�ნ',mergeDown:'შეერთებ� ქვემ�თ�სთ�ნ',splitHorizontal:'გ�ყ�ფ� ჰ�რიზ�ნტ�ლურ�დ',splitVertical:'გ�ყ�ფ� ვერტიკ�ლურ�დ',title:'უჯრის პ�რ�მეტრები',cellType:'უჯრის ტიპი',rowSpan:'სტრიქ�ნების �დენ�ბ�',colSpan:'სვეტების �დენ�ბ�',wordWrap:'სტრიქ�ნის გ�დ�ტ�ნ� (Word Wrap)',hAlign:'ჰ�რიზ�ნტ�ლური სწ�რებ�',vAlign:'ვერტიკ�ლური სწ�რებ�',alignBaseline:'ძირით�დი ხ�ზის გ�სწვრივ',bgColor:'ფ�ნის ფერი',borderColor:'ჩ�რჩ�ს ფერი',data:'მ�ნ�ცემები',header:'ს�თ�ური',yes:'დი�ხ',no:'�რ�',invalidWidth:'უჯრის სიგ�ნე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidHeight:'უჯრის სიმ�ღლე რიცხვით უნდ� იყ�ს წ�რმ�დგენილი.',invalidRowSpan:'სტრიქ�ნების რ��დენ�ბ� მთელი რიცხვი უნდ� იყ�ს.',invalidColSpan:'სვეტების რ��დენ�ბ� მთელი რიცხვი უნდ� იყ�ს.',chooseColor:'�რჩევ�'},row:{menu:'სტრიქ�ნი',insertBefore:'სტრიქ�ნის ჩ�მ�ტებ� წინ',insertAfter:'სტრიქ�ნის ჩ�მ�ტებ� მერე',deleteRow:'სტრიქ�ნების წ�შლ�'},column:{menu:'სვეტი',insertBefore:'სვეტის ჩ�მ�ტებ� წინ',insertAfter:'სვეტის ჩ�მ�ტებ� მერე',deleteColumn:'სვეტების წ�შლ�'}},button:{title:'ღილ�კის პ�რ�მეტრები',text:'ტექსტი',type:'ტიპი',typeBtn:'ღილ�კი',typeSbm:'გ�გზ�ვნ�',typeRst:'გ�სუფთ�ვებ�'},checkboxAndRadio:{checkboxTitle:'მ�ნიშვნის ღილ�კის (Checkbox) პ�რ�მეტრები',radioTitle:'�ს�რჩევი ღილ�კის (Radio) პ�რ�მეტრები',value:'ტექსტი',selected:'�რჩეული'},form:{title:'ფ�რმის პ�რ�მეტრები',menu:'ფ�რმის პ�რ�მეტრები',action:'ქმედებ�',method:'მეთ�დი',encoding:'კ�დირებ�'},select:{title:'�რჩევის ველის პ�რ�მეტრები',selectInfo:'ინფ�რმ�ცი�',opAvail:'შეს�ძლებელი ვ�რი�ნტები',value:'მნიშვნელ�ბ�',size:'ზ�მ�',lines:'ხ�ზები',chkMulti:'მრ�ვლ�ბითი �რჩევ�ნის ს�შუ�ლებ�',opText:'ტექსტი',opValue:'მნიშვნელ�ბ�',btnAdd:'დ�მ�ტებ�',btnModify:'შეცვლ�',btnUp:'ზემ�თ',btnDown:'ქვემ�თ',btnSetValue:'�მ�რჩეულ მნიშვნელ�ვნ�დ დ�ყენებ�',btnDelete:'წ�შლ�'},textarea:{title:'ტექსტური �რის პ�რ�მეტრები',cols:'სვეტები',rows:'სტრიქ�ნები'},textfield:{title:'ტექსტური ველის პ�რ�მეტრები',name:'ს�ხელი',value:'მნიშვნელ�ბ�',charWidth:'სიმბ�ლ�ს ზ�მ�',maxChars:'�ს�ების მ�ქსიმ�ლური �დენ�ბ�',type:'ტიპი',typeText:'ტექსტი',typePass:'პ�რ�ლი'},hidden:{title:'მ�ლული ველის პ�რ�მეტრები',name:'ს�ხელი',value:'მნიშვნელ�ბ�'},image:{title:'სურ�თის პ�რ�მეტრები',titleButton:'სურ�თი�ნი ღილ�კის პ�რ�მეტრები',menu:'სურ�თის პ�რ�მეტრები',infoTab:'სურ�თის ინფ�რმცი�',btnUpload:'სერვერისთვის გ�გზ�ვნ�',upload:'�ტვირთვ�',alt:'ს�ნ�ცვლ� ტექსტი',lockRatio:'პრ�პ�რციის შენ�რჩუნებ�',resetSize:'ზ�მის დ�ბრუნებ�',border:'ჩ�რჩ�',hSpace:'ჰ�რიზ�ნტ�ლური სივრცე',vSpace:'ვერტიკ�ლური სივრცე',alertUrl:'�კრიფეთ სურ�თის URL',linkTab:'ბმული',button2Img:'გსურთ �რჩეული სურ�თი�ნი ღილ�კის გ�დ�ქცევ� ჩვეულებრივ ღილ�კ�დ?',img2Button:'გსურთ �რჩეული ჩვეულებრივი ღილ�კის გ�დ�ქცევ� სურ�თი�ნ ღილ�კ�დ?',urlMissing:'სურ�თის URL �რ�� შევსებული.',validateBorder:'ჩ�რჩ� მთელი რიცხვი უნდ� იყ�ს.',validateHSpace:'ჰ�რიზ�ნტ�ლური სივრცე მთელი რიცხვი უნდ� იყ�ს.',validateVSpace:'ვერტიკ�ლური სივრცე მთელი რიცხვი უნდ� იყ�ს.'},flash:{properties:'Flash-ის პ�რ�მეტრები',propertiesTab:'პ�რ�მეტრები',title:'Flash-ის პ�რ�მეტრები',chkPlay:'�ვტ� გ�შვებ�',chkLoop:'ჩ�ციკლვ�',chkMenu:'Flash-ის მენიუს დ�შვებ�',chkFull:'მთელი ეკრ�ნის დ�შვებ�',scale:'მ�სშტ�ბირებ�',scaleAll:'ყველ�ფრის ჩვენებ�',scaleNoBorder:'ჩ�რჩ�ს გ�რეშე',scaleFit:'ზუსტი ჩ�სმ�',access:'სკრიპტის წვდ�მ�',accessAlways:'ყ�ველთვის',accessSameDomain:'იგივე დ�მენი',accessNever:'�რ�სდრ�ს',alignAbsBottom:'ჩ�რჩ�ს ქვემ�თ� ნ�წილის სწ�რებ� ტექსტისთვის',alignAbsMiddle:'ჩ�რჩ�ს შუ� ნ�წილის სწ�რებ� ტექსტისთვის',alignBaseline:'ს�ბ�ზის� ხ�ზის სწ�რებ�',alignTextTop:'ტექსტი ზემ�დ�ნ',quality:'ხ�რისხი',qualityBest:'ს�უკეთეს�',qualityHigh:'მ�ღ�ლი',qualityAutoHigh:'მ�ღ�ლი (�ვტ�მ�ტური)',qualityMedium:'ს�შუ�ლ�',qualityAutoLow:'ძ�ლი�ნ დ�ბ�ლი',qualityLow:'დ�ბ�ლი',windowModeWindow:'ფ�ნჯ�რ�',windowModeOpaque:'გ�უმჭვირვ�ლე',windowModeTransparent:'გ�მჭვირვ�ლე',windowMode:'ფ�ნჯრის რეჟიმი',flashvars:'ცვლ�დები Flash-ისთვის',bgcolor:'ფ�ნის ფერი',hSpace:'ჰ�რიზ. სივრცე',vSpace:'ვერტ. სივრცე',validateSrc:'URL �რ უნდ� იყ�ს ც�რიელი.',validateHSpace:'ჰ�რიზ�ნტ�ლური სივრცე �რ უნდ� იყ�ს ც�რიელი.',validateVSpace:'ვერტიკ�ლური სივრცე �რ უნდ� იყ�ს ც�რიელი.'},spellCheck:{toolbar:'მ�რთლწერ�',title:'მ�რთლწერ�',notAvailable:'უკ�ცრ�ვ�დ, ეს სერვისი �მჟ�მ�დ მიუწვდ�მელი�.',errorLoading:'სერვისის გ�მ�ძ�ხების შეცდ�მ�: %s.',notInDic:'�რ�� ლექსიკ�ნში',changeTo:'შეცვლელი',btnIgnore:'უგულებელყ�ფ�',btnIgnoreAll:'ყველ�ს უგულებელყ�ფ�',btnReplace:'შეცვლ�',btnReplaceAll:'ყველ�ს შეცვლ�',btnUndo:'გ�უქმებ�',noSuggestions:'- �რ�� შემ�თ�ვ�ზებ� -',progress:'მიმდინ�რე�ბს მ�რთლწერის შემ�წმებ�...',noMispell:'მ�რთლწერის შემ�წმებ�: შეცდ�მ� �რ მ�იძებნ�',noChanges:'მ�რთლწერის შემ�წმებ�: �რ�ფერი შეცვლილ�',oneChange:'მ�რთლწერის შემ�წმებ�: ერთი სიტყვ� შეიცვ�ლ�',manyChanges:'მ�რთლწერის შემ�წმებ�: %1 სიტყვ� შეიცვ�ლ�',ieSpellDownload:'მ�რთლწერის შემ�წმებ� �რ�� დ�ინსტ�ლირებული. ჩ�მ�ვქ�ჩ�თ ინტერნეტიდ�ნ?'},smiley:{toolbar:'სიცილ�კები',title:'სიცილ�კის ჩ�სმ�',options:'სიცილ�კის პ�რ�მეტრები'},elementsPath:{eleLabel:'ელემეტის გზ�',eleTitle:'%1 ელემენტი'},numberedlist:'გ�დ�ნ�მრილი სი�',bulletedlist:'ღილი�ნი სი�',indent:'მეტ�დ შეწევ�',outdent:'ნ�კლებ�დ შეწევ�',justify:{left:'მ�რცხნივ სწ�რებ�',center:'შუ�ში სწ�რებ�',right:'მ�რჯვნივ სწ�რებ�',block:'გ�დ�სწ�რებ�'},blockquote:'ციტ�ტ�',clipboard:{title:'ჩ�სმ�',cutError:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� �მ�ჭრის �პერ�ციის �ვტ�მ�ტურ�დ გ�ნხ�რციელების ს�შუ�ლებ�ს. გ�მ�იყენეთ კლ�ვი�ტურ� �მისთვის (Ctrl/Cmd+X).',copyError:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� �სლის �პერ�ციის �ვტ�მ�ტურ�დ გ�ნხ�რციელების ს�შუ�ლებ�ს. გ�მ�იყენეთ კლ�ვი�ტურ� �მისთვის (Ctrl/Cmd+C).',pasteMsg:'ჩ�სვით �მ �რის შიგნით კლ�ვი�ტურის გ�მ�ყენებით (<strong>Ctrl/Cmd+V</strong>) დ� დ��ჭირეთ OK-ს',securityMsg:'თქვენი ბრ�უზერის უს�ფრთხ�ების პ�რ�მეტრები �რ იძლევ� clipboard-ის მ�ნ�ცემების წვდ�მის უფლებ�ს. კიდევ უნდ� ჩ�სვ�თ ტექსტი �მ ფ�ნჯ�რ�ში.',pasteArea:'ჩ�სმის �რე'},pastefromword:{confirmCleanup:'ჩ�ს�სმელი ტექსტი ვ�რდიდ�ნ გ�დმ�ტ�ნილს გ�ვს - გინდ�თ მისი წინ�სწ�რ გ�წმენდ�?',toolbar:'ვ�რდიდ�ნ ჩ�სმ�',title:'ვ�რდიდ�ნ ჩ�სმ�',error:'შიდ� შეცდ�მის გ�მ� ვერ მ�ხერხდ� ტექსტის გ�წმენდ�'},pasteText:{button:'მხ�ლ�დ ტექსტის ჩ�სმ�',title:'მხ�ლ�დ ტექსტის ჩ�სმ�'},templates:{button:'თ�რგები',title:'თ�რგები',options:'თ�რგების პ�რ�მეტრები',insertOption:'მიმდინ�რე შეგთ�ვსის შეცვლ�',selectPromptMsg:'�ირჩიეთ თ�რგი რედ�ქტ�რისთვის',emptyListMsg:'(თ�რგი �რ�� გ�ნს�ზღვრული)'},showBlocks:'�რეების ჩვენებ�',stylesCombo:{label:'სტილები',panelTitle:'ფ�რმ�ტირების სტილები',panelTitle1:'�რის სტილები',panelTitle2:'თ�ნდ�რთული სტილები',panelTitle3:'�ბიექტის სტილები'},format:{label:'ფი�რმ�ტირებ�',panelTitle:'ფ�რმ�ტირებ�',tag_p:'ჩვეულებრივი',tag_pre:'ფ�რმ�ტირებული',tag_address:'მის�მ�რთი',tag_h1:'ს�თ�ური 1',tag_h2:'ს�თ�ური 2',tag_h3:'ს�თ�ური 3',tag_h4:'ს�თ�ური 4',tag_h5:'ს�თ�ური 5',tag_h6:'ს�თ�ური 6',tag_div:'ჩვეულებრივი (DIV)'},div:{title:'Div კ�ნტეინერის შექმნ�',toolbar:'Div კ�ნტეინერის შექმნ�',cssClassInputLabel:'CSS კლ�სები',styleSelectLabel:'სტილი',IdInputLabel:'Id',languageCodeInputLabel:'ენის კ�დი',inlineStyleInputLabel:'თ�ნდ�რთული სტილი',advisoryTitleInputLabel:'ს�თ�ური',langDirLabel:'ენის მინ�რთულებ�',langDirLTRLabel:'მ�რცხნიდ�ნ მ�რჯვნიც (LTR)',langDirRTLLabel:'მ�რჯვნიდ�ნ მ�რცხნივ (RTL)',edit:'Div-ის რედ�ქტირებ�',remove:'Div-ის წ�შლ�'},iframe:{title:'IFrame-ის პ�რ�მეტრები',toolbar:'IFrame',noUrl:'�კრიფეთ iframe-ის URL',scrolling:'გ�დ�ხვევის ზ�ლების დ�შვებ�',border:'ჩ�რჩ�ს გ�მ�ჩენ�'},font:{label:'ფ�ნტი',voiceLabel:'ფ�ნტი',panelTitle:'ფ�ნტის ს�ხელი'},fontSize:{label:'ზ�მ�',voiceLabel:'ტექსტის ზ�მ�',panelTitle:'ტექსტის ზ�მ�'},colorButton:{textColorTitle:'ტექსტის ფერი',bgColorTitle:'ფ�ნის ფერი',panelTitle:'ფერები',auto:'�ვტ�მ�ტური',more:'მეტი ფერი...'},colors:{'000':'შ�ვი',800000:'მუქი შინდისფერი','8B4513':'ყ�ვისფერი','2F4F4F':'მ�ლურჯ� ნ�ცრისფერი','008080':'ჩ�მქრ�ლი ლურჯი','000080':'მუქი ლურჯი','4B0082':'ი�ს�მნისფერი',696969:'მუქი ნ�ცრისფერი',B22222:'�გურისფერი',A52A2A:'მუქი ყ�ვისფერი',DAA520:'მ�ყვით�ლ�','006400':'მუქი მწვ�ნე','40E0D0':'ცისფერი','0000CD':'ზ�მიერ�დ ლურჯი',800080:'იისფერი',808080:'ნ�ცრისფერი',F00:'წითელი',FF8C00:'მუქი სტ�ფილ�სფერი',FFD700:'�ქრ�სფერი','008000':'მწვ�ნე','0FF':'ღი� ცისფერი','00F':'ლურჯი',EE82EE:'იისფერი',A9A9A9:'ბ�ცი ნ�ცრისფერი',FFA07A:'ჩ�მქრ�ლი ვ�რდისფერი',FFA500:'სტ�ფილ�სფერი',FFFF00:'ყვითელი','00FF00':'ლურჯი',AFEEEE:'ცისფერი',ADD8E6:'ღი� ლურჯი',DDA0DD:'ღი� იისფერი',D3D3D3:'ღი� ნ�ცრისფერი',FFF0F5:'ღი� ვ�რდისფერი',FAEBD7:'ღი� ყ�ვისფერი',FFFFE0:'ნ�თელი ყვითელი',F0FFF0:'ღი� მწვ�ნე',F0FFFF:'ღი� ცისფერი 2',F0F8FF:'ღი� ცისფერი 3',E6E6FA:'ღი� იისფერი 2',FFF:'თეთრი'},scayt:{title:'მ�რთლწერის შემ�წმებ� კრეფის�ს',opera_title:'�რ�� მხ�რდ�ჭერილი Opera-ს მიერ',enable:'SCAYT-ის ჩ�რთვ�',disable:'SCAYT-ის გ�მ�რთვ�',about:'SCAYT-ის შეს�ხებ',toggle:'SCAYT-ის გ�დ�რთვ�',options:'პ�რ�მეტრები',langs:'ენები',moreSuggestions:'მეტი შემ�თ�ვ�ზებ�',ignore:'უგულებელყ�ფ�',ignoreAll:'ყველ�ს უგულებელყ�ფ�',addWord:'სიტყვის დ�მ�ტებ�',emptyDic:'ლექსიკ�ნის სიტყვ� �რ უნდ� იყ�ს ც�რიელი.',optionsTab:'პ�რ�მეტრები',allCaps:'დიდი �ს�ებით დ�წერილი სიტყვების უგულებელყ�ფ�',ignoreDomainNames:'დ�მენური ს�ხელების უგულებელყ�ფ�',mixedCase:'შერეული �ს�ებ�ნი სიტყვების უგულებელყ�ფ�',mixedWithDigits:'ციფრები�ნი სიტყვების უგულებელყ�ფ�',languagesTab:'ენები',dictionariesTab:'ლექსიკ�ნები',dic_field_name:'ლექსიკ�ნის ს�ხელი',dic_create:'შექმნ�',dic_restore:'დ�ბრუნებ�',dic_delete:'წ�შლ�',dic_rename:'გ�დ�რქმევ�',dic_info:'თ�ვდ�პირველ�დ მ�მხმ�რებლის ლექსიკ�ნი ინ�ხებ� Cookie-ში. თუმც� Cookie შეზღუდული� ზ�მ�ში. რ�ც� ლექსიკ�ნის ზ�მ� გ�იზრდებ� ს�კმ��დ ის შეიძლებ� შევინ�ხ�თ ჩვენს სერვერზე. ჩვენს სერვერზე ლექსიკ�ნს შეს�ნ�ხ�დ უნდ� მიუთით�თ მისი ს�ხელი. თუ უკე გ�ქვთ ლექსიკ�ნი, �კრიფეთ მისი ს�ხელი დ� დ��ჭირეთ "დ�ბრუნების" ღილ�კს.',aboutTab:'ინფ�რმ�ცი�'},about:{title:'CKEditor-ის შეს�ხებ',dlgTitle:'CKEditor-ის შეს�ხებ',help:'დ�ხმ�რებისთვის იხილეთ $1.',userGuide:'CKEditor-ის მ�მხმ�რებლის ს�ხელმძღვ�ნელ�',moreInfo:'ლიცენზიის ინფ�რმ�ციისთვის ეწვიეთ ჩვენს ს�იტს:',copy:'Copyright &copy; $1. ყველ� უფლებ� დ�ცული�.'},maximize:'გ�დიდებ�',minimize:'დ�პ�ტ�რ�ვებ�',fakeobjects:{anchor:'ღუზ�',flash:'Flash �ნიმ�ცი�',iframe:'IFrame',hiddenfield:'მ�ლული ველი',unknown:'უცნ�ბი �ბიექტი'},resize:'გ�წიე ზ�მის შეს�ცვლელ�დ',colordialog:{title:'ფერის შეცვლ�',options:'ფერის პ�რ�მეტრები',highlight:'ჩვენებ�',selected:'�რჩეული ფერი',clear:'გ�სუფთ�ვებ�'},toolbarCollapse:'ხელს�წყ�თ� ზ�ლის შეწევ�',toolbarExpand:'ხელს�წყ�თ� ზ�ლის გ�მ�წევ�',toolbarGroups:{document:'დ�კუმენტი',clipboard:'Clipboard/გ�უქმებ�',editing:'რედ�ქტირებ�',forms:'ფ�რმები',basicstyles:'ძირით�დი სტილები',paragraph:'�ბზ�ცი',links:'ბმულები',insert:'ჩ�სმ�',styles:'სტილები',colors:'ფერები',tools:'ხელს�წყ�ები'},bidi:{ltr:'ტექსტის მიმ�რთულებ� მ�რცხნიდ�ნ მ�რჯვნივ',rtl:'ტექსტის მიმ�რთულებ� მ�რჯვნიდ�ნ მ�რცხნივ'},docprops:{label:'დ�კუმენტის პ�რ�მეტრები',title:'დ�კუმენტის პ�რ�მეტრები',design:'დიზ�ინი',meta:'მეტ�Tag-ები',chooseColor:'�რჩევ�',other:'სხვ�...',docTitle:'გვერდის ს�თ�ური',charset:'კ�დირებ�',charsetOther:'სხვ� კ�დირებები',charsetASCII:'�მერიკული (ASCII)',charsetCE:'ცენტრ�ლურ ევრ�პული',charsetCT:'ტრ�დიციული ჩინური (Big5)',charsetCR:'კირილური',charsetGR:'ბერძნული',charsetJP:'ი�პ�ნური',charsetKR:'კ�რეული',charsetTR:'თურქული',charsetUN:'უნიკ�დი (UTF-8)',charsetWE:'დ�ს�ვლეთ ევრ�პული',docType:'დ�კუმენტის ტიპი',docTypeOther:'სხვ� ტიპის დ�კუმენტი',xhtmlDec:'XHTML დეკლ�რ�ციების ჩ�რთვ�',bgColor:'ფ�ნის ფერი',bgImage:'ფ�ნური სურ�თის URL',bgFixed:'უმ�ძრ�� (ფიქსირებული) ფ�ნი',txtColor:'ტექსტის ფერი',margin:'გვერდის კიდეები',marginTop:'ზედ�',marginLeft:'მ�რცხენ�',marginRight:'მ�რჯვენ�',marginBottom:'ქვედ�',metaKeywords:'დ�კუმენტის ს�კვ�ნძ� სიტყვები (მძიმით გ�მ�ყ�ფილი)',metaDescription:'დ�კუმენტის �ღწერ�',metaAuthor:'�ვტ�რი',metaCopyright:'Copyright',previewHtml:'<p>ეს �რის <strong>ს�ცდელი ტექსტი</strong>. თქვენ <a href="javascript:void(0)">CKEditor</a>-ით ს�რგებლ�ბთ.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/km.js b/upload/public/js/3rd_party/ckeditor/lang/km.js
new file mode 100644
index 00000000..0b8fe440
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/km.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.km={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'កូ�',newPage:'ទំព�រ�្មី',save:'រក្សាទុក',preview:'មើលសាកល្បង',cut:'កា�់យក',copy:'ចំលងយក',paste:'ចំលងដាក់',print:'បោះពុម្ភ',underline:'ដិ�បន្ទា�់ពីក្រោមអក្សរ',bold:'អក្សរដិ�ធំ',italic:'អក្សរផ្��ក',selectAll:'ជ្រើសរើសទាំងអស់',removeFormat:'លប់ចោល ការរចនា',strike:'ដិ�បន្ទា�់ពាក់កណ្�ាលអក្សរ',subscript:'អក្សរ�ូចក្រោម',superscript:'អក្សរ�ូចលើ',horizontalrule:'បន្�ែមបន្ទា�់ផ្��ក',pagebreak:'បន្�ែម ការផ្�ាច់ទំព�រ',pagebreakAlt:'Page Break',unlink:'លប់ឈ្នាប់',undo:'សារឡើងវិញ',redo:'ធ្វើឡើងវិញ',common:{browseServer:'មើល',url:'URL',protocol:'ប្រូ�ូកូល',upload:'ទាញយក',uploadSubmit:'បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្�ល់ស�វា',image:'រូបភាព',flash:'Flash',form:'បែបបទ',checkbox:'ប្រអប់ជ្រើសរើស',radio:'ប៉ូ�ុនរង្វង់មូល',textField:'ជួរសរស�រអ�្�បទ',textarea:'�ំបន់សរស�រអ�្�បទ',hiddenField:'ជួរលាក់',button:'ប៉ូ�ុន',select:'ជួរជ្រើសរើស',imageButton:'ប៉ូ�ុនរូបភាព',notSet:'<មិនមែន>',id:'Id',name:'ឈ្មោះ',langDir:'ទិសដៅភាសា',langDirLtr:'ពីឆ្វ�ងទៅស្�ាំ(LTR)',langDirRtl:'ពីស្�ាំទៅឆ្វ�ង(RTL)',langCode:'ល��កូ�ភាសា',longDescr:'អធិប្បាយ URL វែង',cssClass:'Stylesheet Classes',advisoryTitle:'ចំណងជើង ប្រឹក្សា',cssStyle:'ម៉ូ�',ok:'យល់ព្រម',cancel:'មិនយល់ព្រម',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'កំរិ��្ពស់',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'ទទឹង',height:'កំពស់',align:'កំណ�់ទី�ាំង',alignLeft:'�ាងឆ្វង',alignRight:'�ាងស្�ាំ',alignCenter:'កណ្�ាល',alignTop:'�ាងលើ',alignMiddle:'កណ្�ាល',alignBottom:'�ាងក្រោម',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'បន្�ែមអក្សរពិស�ស',title:'�ូអក្សរពិស�ស',options:'Special Character Options'},link:{toolbar:'បន្�ែម/កែប្រែ ឈ្នាប់',other:'<other>',menu:'កែប្រែឈ្នាប់',title:'ឈ្នាប់',info:'ព�៌មានអំពីឈ្នាប់',target:'គោលដៅ',upload:'ទាញយក',advanced:'កំរិ��្ពស់',type:'ប្រភ�ទឈ្នាប់',toUrl:'URL',toAnchor:'យុ�្កានៅក្នុងទំព�រន�ះ',toEmail:'អ៊ីមែល',targetFrame:'<ហ្វ្រ�ម>',targetPopup:'<វីនដូវ លោ�>',targetFrameName:'ឈ្មោះហ្រ្វ�មដែលជាគោលដៅ',targetPopupName:'ឈ្មោះវីនដូវលោ�',popupFeatures:'លក្�ណះរបស់វីនដូលលោ�',popupResizable:'Resizable',popupStatusBar:'របា ព�៌មាន',popupLocationBar:'របា ទី�ាំង',popupToolbar:'របា ឩបករណ�',popupMenuBar:'របា មឺនុយ',popupFullScreen:'អ�ក្រុងព�ញ(IE)',popupScrollBars:'របា ទាញ',popupDependent:'អាស្រ�យលើ (Netscape)',popupLeft:'ទី�ាំង�ាងឆ្វ�ង',popupTop:'ទី�ាំង�ាងលើ',id:'Id',langDir:'ទិសដៅភាសា',langDirLTR:'ពីឆ្វ�ងទៅស្�ាំ(LTR)',langDirRTL:'ពីស្�ាំទៅឆ្វ�ង(RTL)',acccessKey:'ឃី សំរាប់ចូល',name:'ឈ្មោះ',langCode:'ទិសដៅភាសា',tabIndex:'ល�� Tab',advisoryTitle:'ចំណងជើង ប្រឹក្សា',advisoryContentType:'ប្រភ�ទអ�្�បទ ប្រឹក្សា',cssClasses:'Stylesheet Classes',charset:'ល��កូ�អក្សររបស់ឈ្នាប់',styles:'ម៉ូ�',rel:'Relationship',selectAnchor:'ជ្រើសរើសយុ�្កា',anchorName:'�ាមឈ្មោះរបស់យុ�្កា',anchorId:'�ាម Id',emailAddress:'អ៊ីមែល',emailSubject:'ចំណងជើងអ�្�បទ',emailBody:'អ�្�បទ',noAnchors:'(No anchors available in the document)',noUrl:'សូមសរស�រ អាស�យដ្ឋាន URL',noEmail:'សូមសរស�រ អាស�យដ្ឋាន អ៊ីមែល'},anchor:{toolbar:'បន្�ែម/កែប្រែ យុ�្កា',menu:'ការកំណ�់យុ�្កា',title:'ការកំណ�់យុ�្កា',name:'ឈ្មោះយុទ្ធ�្កា',errorName:'សូមសរស�រ ឈ្មោះយុទ្ធ�្កា',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'ស្វែងរក',replace:'ជំនួស',findWhat:'ស្វែងរកអ្វី:',replaceWith:'ជំនួសជាមួយ:',notFoundMsg:'ពាក្យន�ះ រកមិនឃើញទ� ។',findOptions:'Find Options',matchCase:'ករណ៉�្រូវរក',matchWord:'�្រូវពាក្យទាំងអស់',matchCyclic:'Match cyclic',replaceAll:'ជំនួសទាំងអស់',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'�ារាង',title:'ការកំណ�់ �ារាង',menu:'ការកំណ�់ �ារាង',deleteTable:'លប់�ារាង',rows:'ជួរផ្��ក',columns:'ជួរឈរ',border:'ទំហំស៊ុម',widthPx:'ភីកសែល',widthPc:'ភាគរយ',widthUnit:'width unit',cellSpace:'គំលា�សែល',cellPad:'គែមសែល',caption:'ចំណងជើង',summary:'ស�ចក្�ីសង្��ប',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'លប់សែល',merge:'បញ្ជូលសែល',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'លប់ជួរផ្��ក'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'លប់ជួរឈរ'}},button:{title:'ការកំណ�់ ប៉ូ�ុន',text:'អ�្�បទ(�ំលៃ)',type:'ប្រភ�ទ',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'ការកំណ�់ប្រអប់ជ្រើសរើស',radioTitle:'ការកំណ�់ប៉ូ�ុនរង្វង់',value:'�ំលៃ',selected:'បានជ្រើសរើស'},form:{title:'ការកំណ�់បែបបទ',menu:'ការកំណ�់បែបបទ',action:'សកម្មភាព',method:'វិធី',encoding:'Encoding'},select:{title:'ការកំណ�់ជួរជ្រើសរើស',selectInfo:'ព�៌មាន',opAvail:'ការកំណ�់ជ្រើសរើស ដែលអាចកំណ�់បាន',value:'�ំលៃ',size:'ទំហំ',lines:'បន្ទា�់',chkMulti:'អនុញ្ញា�អោយជ្រើសរើសច្រើន',opText:'ពាក្យ',opValue:'�ំលៃ',btnAdd:'បន្�ែម',btnModify:'ផ្លាស់ប្�ូរ',btnUp:'លើ',btnDown:'ក្រោម',btnSetValue:'Set as selected value',btnDelete:'លប់'},textarea:{title:'ការកំណ�់កន្លែងសរស�រអ�្�បទ',cols:'ជូរឈរ',rows:'ជូរផ្��ក'},textfield:{title:'ការកំណ�់ជួរអ�្�បទ',name:'ឈ្មោះ',value:'�ំលៃ',charWidth:'ទទឹង អក្សរ',maxChars:'អក្សរអ�ិបរិមា',type:'ប្រភ�ទ',typeText:'ពាក្យ',typePass:'ពាក្យសំងា�់'},hidden:{title:'ការកំណ�់ជួរលាក់',name:'ឈ្មោះ',value:'�ំលៃ'},image:{title:'ការកំណ�់រូបភាព',titleButton:'ការកំណ�់ប៉ូ�ុនរូបភាព',menu:'ការកំណ�់រូបភាព',infoTab:'ព�៌មានអំពីរូបភាព',btnUpload:'បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្�ល់ស�វា',upload:'ទាញយក',alt:'អ�្�បទជំនួស',lockRatio:'អ�្រាឡុក',resetSize:'កំណ�់ទំហំឡើងវិញ',border:'ស៊ុម',hSpace:'គំលា�ទទឹង',vSpace:'គំលា�បណ្�ោយ',alertUrl:'សូមសរស�រងាស�យដ្ឋានរបស់រូបភាព',linkTab:'ឈ្នាប់',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'ការកំណ�់ Flash',propertiesTab:'Properties',title:'ការកំណ�់ Flash',chkPlay:'ល�ងដោយស្វ�យប្រវ�្�',chkLoop:'ចំនួនដង',chkMenu:'បង្ហាញ មឺនុយរបស់ Flash',chkFull:'Allow Fullscreen',scale:'ទំហំ',scaleAll:'បង្ហាញទាំងអស់',scaleNoBorder:'មិនបង្ហាញស៊ុម',scaleFit:'�្រូវល្មម',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs Bottom',alignAbsMiddle:'Abs Middle',alignBaseline:'បន្ទា�់ជាមូលដ្ឋាន',alignTextTop:'លើអ�្�បទ',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'ពណ៌ផ្ទៃ�ាងក្រោយ',hSpace:'គំលា�ទទឹង',vSpace:'គំលា�បណ្�ោយ',validateSrc:'សូមសរស�រ អាស�យដ្ឋាន URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'ពិនិ�្យអក្�រាវិរុទ្ធ',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'គ្មានក្នុងវចនានុក្រម',changeTo:'ផ្លាស់ប្�ូរទៅ',btnIgnore:'មិនផ្លាស់ប្�ូរ',btnIgnoreAll:'មិនផ្លាស់ប្�ូរ ទាំងអស់',btnReplace:'ជំនួស',btnReplaceAll:'ជំនួសទាំងអស់',btnUndo:'សារឡើងវិញ',noSuggestions:'- គ្មានសំណើរ -',progress:'កំពុងពិនិ�្យអក្�រាវិរុទ្ធ...',noMispell:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: គ្មានកំហុស',noChanges:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: ពុំមានផ្លាស់ប្�ូរ',oneChange:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: ពាក្យមួយ�្រូចបានផ្លាស់ប្�ូរ',manyChanges:'ការពិនិ�្យអក្�រាវិរុទ្ធបានចប់: %1 ពាក្យបានផ្លាស់ប្�ូរ',ieSpellDownload:'ពុំមានកម្មវិធីពិនិ�្យអក្�រាវិរុទ្ធ ។ �ើចង់ទាញយកពីណា?'},smiley:{toolbar:'រូបភាព',title:'បញ្ជូលរូបភាព',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'បញ្ជីជាអក្សរ',bulletedlist:'បញ្ជីជារង្វង់មូល',indent:'បន្�ែមការចូលបន្ទា�់',outdent:'បន្�យការចូលបន្ទា�់',justify:{left:'�ំរឹមឆ្វ�ង',center:'�ំរឹមកណ្�ាល',right:'�ំរឹមស្�ាំ',block:'�ំរឹមសង�ាង'},blockquote:'Block Quote',clipboard:{title:'ចំលងដាក់',cutError:'ការកំណ�់សុវ�្�ភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក ន�ះ​មិនអាចធ្វើកម្មវិធី�ាក់�ែងអ�្�បទ កា�់អ�្�បទយកដោយស្វ�យប្រវ�្�បានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចន�ះ  (Ctrl/Cmd+X) ។',copyError:'ការកំណ�់សុវ�្�ភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក ន�ះ​មិនអាចធ្វើកម្មវិធី�ាក់�ែងអ�្�បទ ចំលងអ�្�បទយកដោយស្វ�យប្រវ�្�បានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចន�ះ (Ctrl/Cmd+C)។',pasteMsg:'សូមចំលងអ�្�បទទៅដាក់ក្នុងប្រអប់ដូច�ាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'ចំលងដាក់ពី Word',title:'ចំលងដាក់ពី Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'ចំលងដាក់អ�្�បទធម្ម�ា',title:'ចំលងដាក់អ�្�បទធម្ម�ា'},templates:{button:'ឯកសារគំរូ',title:'ឯកសារគំរូ របស់អ�្�ន�យ',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'សូមជ្រើសរើសឯកសារគំរូ ដើម្បីបើកនៅក្នុងកម្មវិធី�ាក់�ែងអ�្�បទ<br>(អ�្�បទនឹងបា�់បង់):',emptyListMsg:'(ពុំមានឯកសារគំរូ�្រូវបានកំណ�់)'},showBlocks:'Show Blocks',stylesCombo:{label:'ម៉ូ�',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'រចនា',panelTitle:'រចនា',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'ហ្វុង',voiceLabel:'Font',panelTitle:'ហ្វុង'},fontSize:{label:'ទំហំ',voiceLabel:'Font Size',panelTitle:'ទំហំ'},colorButton:{textColorTitle:'ពណ៌អក្សរ',bgColorTitle:'ពណ៌ផ្ទៃ�ាងក្រោយ',panelTitle:'Colors',auto:'ស្វ�យប្រវ�្�',more:'ពណ៌ផ្ស�ងទៀ�..'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'ការកំណ�់ ឯកសារ',title:'ការកំណ�់ ឯកសារ',design:'Design',meta:'ទិន្នន�យម�',chooseColor:'Choose',other:'<other>',docTitle:'ចំណងជើងទំព�រ',charset:'កំណ�់ល��កូ�ភាសា',charsetOther:'កំណ�់ល��កូ�ភាសាផ្ស�ងទៀ�',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ប្រភ�ទក្បាលទំព�រ',docTypeOther:'ប្រភ�ទក្បាលទំព�រផ្ស�ងទៀ�',xhtmlDec:'បញ្ជូល XHTML',bgColor:'ពណ៌�ាងក្រោម',bgImage:'URL របស់រូបភាព�ាងក្រោម',bgFixed:'ទំព�រក្រោមមិនប្�ូរ',txtColor:'ពណ៌អក្សរ',margin:'ស៊ុមទំព�រ',marginTop:'លើ',marginLeft:'ឆ្វ�ង',marginRight:'ស្ដាំ',marginBottom:'ក្រោម',metaKeywords:'ពាក្យនៅក្នុងឯកសារ (ផ្�ាច់ពីគ្នាដោយក្បៀស)',metaDescription:'ស�ចក្�ីអ�្�ាធិប្បាយអំពីឯកសារ',metaAuthor:'អ្នកនិពន្ធ',metaCopyright:'រក្សាសិទ្ធិ�',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ko.js b/upload/public/js/3rd_party/ckeditor/lang/ko.js
new file mode 100644
index 00000000..0009c0a2
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ko.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ko={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'소스',newPage:'새 문서',save:'저장하기',preview:'미리보기',cut:'잘�내기',copy:'복사하기',paste:'붙여넣기',print:'�쇄하기',underline:'밑줄',bold:'진하게',italic:'�텔릭',selectAll:'전체선�',removeFormat:'�맷 지우기',strike:'취소선',subscript:'아래 첨�',superscript:'위 첨�',horizontalrule:'수�선 삽입',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'�� 삭제',undo:'취소',redo:'재실행',common:{browseServer:'서버 보기',url:'URL',protocol:'프로토콜',upload:'업로드',uploadSubmit:'서버로 전송',image:'�미지',flash:'플래쉬',form:'�',checkbox:'체�박스',radio:'�디오버튼',textField:'입력필드',textarea:'입력�역',hiddenField:'숨김필드',button:'버튼',select:'펼침목�',imageButton:'�미지버튼',notSet:'<설정�지 않�>',id:'ID',name:'Name',langDir:'쓰기 방향',langDirLtr:'왼쪽�서 오른쪽 (LTR)',langDirRtl:'오른쪽�서 왼쪽 (RTL)',langCode:'언어 코드',longDescr:'URL 설명',cssClass:'Stylesheet Classes',advisoryTitle:'Advisory Title',cssStyle:'Style',ok:'예',cancel:'아니오',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�세히',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'너비',height:'높�',align:'정렬',alignLeft:'왼쪽',alignRight:'오른쪽',alignCenter:'가운�',alignTop:'위',alignMiddle:'중간',alignBottom:'아래',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'특수문� 삽입',title:'특수문� 선�',options:'Special Character Options'},link:{toolbar:'�� 삽입/변경',other:'<기타>',menu:'�� 수정',title:'��',info:'�� 정보',target:'타겟',upload:'업로드',advanced:'�세히',type:'�� 종류',toUrl:'URL',toAnchor:'책갈피',toEmail:'�메�',targetFrame:'<프레임>',targetPopup:'<�업창>',targetFrameName:'타겟 프레임 �름',targetPopupName:'�업창 �름',popupFeatures:'�업창 설정',popupResizable:'Resizable',popupStatusBar:'�태바',popupLocationBar:'주소표시줄',popupToolbar:'툴바',popupMenuBar:'메뉴바',popupFullScreen:'전체화면 (IE)',popupScrollBars:'스�롤바',popupDependent:'Dependent (Netscape)',popupLeft:'왼쪽 위치',popupTop:'윗쪽 위치',id:'Id',langDir:'쓰기 방향',langDirLTR:'왼쪽�서 오른쪽 (LTR)',langDirRTL:'오른쪽�서 왼쪽 (RTL)',acccessKey:'엑세스 키',name:'Name',langCode:'쓰기 방향',tabIndex:'탭 순서',advisoryTitle:'Advisory Title',advisoryContentType:'Advisory Content Type',cssClasses:'Stylesheet Classes',charset:'Linked Resource Charset',styles:'Style',rel:'Relationship',selectAnchor:'책갈피 선�',anchorName:'책갈피 �름',anchorId:'책갈피 ID',emailAddress:'�메� 주소',emailSubject:'제목',emailBody:'내용',noAnchors:'(문서� 책갈피가 없습니다.)',noUrl:'�� URL� 입력하십시요.',noEmail:'�메�주소를 입력하십시요.'},anchor:{toolbar:'책갈피 삽입/변경',menu:'책갈피 �성',title:'책갈피 �성',name:'책갈피 �름',errorName:'책갈피 �름� 입력하십시요.',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'찾기 & 바꾸기',find:'찾기',replace:'바꾸기',findWhat:'찾� 문�열:',replaceWith:'바꿀 문�열:',notFoundMsg:'문�열� 찾� 수 없습니다.',findOptions:'Find Options',matchCase:'대소문� 구분',matchWord:'온전한 단어',matchCyclic:'Match cyclic',replaceAll:'모� 바꾸기',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'표',title:'표 설정',menu:'표 설정',deleteTable:'표 삭제',rows:'가로줄',columns:'세로줄',border:'테�리 �기',widthPx:'픽셀',widthPc:'�센트',widthUnit:'width unit',cellSpace:'셀 간격',cellPad:'셀 여백',caption:'캡션',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'셀/칸(Cell)',insertBefore:'앞� 셀/칸 삽입',insertAfter:'뒤� 셀/칸 삽입',deleteCell:'셀 삭제',merge:'셀 합치기',mergeRight:'오른쪽 뭉치기',mergeDown:'왼쪽 뭉치기',splitHorizontal:'수� 나누기',splitVertical:'수� 나누기',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'행(Row)',insertBefore:'앞� 행 삽입',insertAfter:'뒤� 행 삽입',deleteRow:'가로줄 삭제'},column:{menu:'열(Column)',insertBefore:'앞� 열 삽입',insertAfter:'뒤� 열 삽입',deleteColumn:'세로줄 삭제'}},button:{title:'버튼 �성',text:'버튼글�(값)',type:'버튼종류',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'체�박스 �성',radioTitle:'�디오버튼 �성',value:'값',selected:'선��'},form:{title:'� �성',menu:'� �성',action:'실행경로(Action)',method:'방법(Method)',encoding:'Encoding'},select:{title:'펼침목� �성',selectInfo:'정보',opAvail:'선�옵션',value:'값',size:'세로�기',lines:'줄',chkMulti:'여러항목 선� 허용',opText:'�름',opValue:'값',btnAdd:'추가',btnModify:'변경',btnUp:'위로',btnDown:'아래로',btnSetValue:'선��것으로 설정',btnDelete:'삭제'},textarea:{title:'입력�역 �성',cols:'칸수',rows:'줄수'},textfield:{title:'입력필드 �성',name:'�름',value:'값',charWidth:'글� 너비',maxChars:'최대 글�수',type:'종류',typeText:'문�열',typePass:'비밀번호'},hidden:{title:'숨김필드 �성',name:'�름',value:'값'},image:{title:'�미지 설정',titleButton:'�미지버튼 �성',menu:'�미지 설정',infoTab:'�미지 정보',btnUpload:'서버로 전송',upload:'업로드',alt:'�미지 설명',lockRatio:'비율 유지',resetSize:'�래 �기로',border:'테�리',hSpace:'수�여백',vSpace:'수�여백',alertUrl:'�미지 URL� 입력하십시요',linkTab:'��',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'플래쉬 �성',propertiesTab:'Properties',title:'플래쉬 등�정보',chkPlay:'��재�',chkLoop:'반복',chkMenu:'플래쉬메뉴 가능',chkFull:'Allow Fullscreen',scale:'�역',scaleAll:'모�보기',scaleNoBorder:'경계선없�',scaleFit:'�역��조절',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'줄아래(Abs Bottom)',alignAbsMiddle:'줄중간(Abs Middle)',alignBaseline:'기준선',alignTextTop:'글��단',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'배경 색�',hSpace:'수�여백',vSpace:'수�여백',validateSrc:'�� URL� 입력하십시요.',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'철�검사',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'사전� 없는 단어',changeTo:'변경할 단어',btnIgnore:'건너뜀',btnIgnoreAll:'모� 건너뜀',btnReplace:'변경',btnReplaceAll:'모� 변경',btnUndo:'취소',noSuggestions:'- 추천단어 없� -',progress:'철�검사를 진행중입니다...',noMispell:'철�검사 완료: 잘못� 철�가 없습니다.',noChanges:'철�검사 완료: 변경� 단어가 없습니다.',oneChange:'철�검사 완료: 단어가 변경�었습니다.',manyChanges:'철�검사 완료: %1 단어가 변경�었습니다.',ieSpellDownload:'철� 검사기가 철치�지 않았습니다. 지금 다운로드하시겠습니까?'},smiley:{toolbar:'아�콘',title:'아�콘 삽입',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'순서있는 목�',bulletedlist:'순서없는 목�',indent:'들여쓰기',outdent:'내어쓰기',justify:{left:'왼쪽 정렬',center:'가운� 정렬',right:'오른쪽 정렬',block:'양쪽 맞춤'},blockquote:'Block Quote',clipboard:{title:'붙여넣기',cutError:'브�우저� 보안설정때문� 잘�내기 기능� 실행할 수 없습니다. 키보드 명령� 사용하십시요. (Ctrl/Cmd+X).',copyError:'브�우저� 보안설정때문� 복사하기 기능� 실행할 수 없습니다. 키보드 명령� 사용하십시요.  (Ctrl/Cmd+C).',pasteMsg:'키보드� (<STRONG>Ctrl/Cmd+V</STRONG>) 를 �용해서 ��안� 붙여넣고 <STRONG>OK</STRONG> 를 누르세요.',securityMsg:'브러우저 보안 설정으로 �해, �립보드� �료를 �접 접근할 수 없습니다. � 창� 다시 붙여넣기 하십시오.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'MS Word 형��서 붙여넣기',title:'MS Word 형��서 붙여넣기',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'�스트로 붙여넣기',title:'�스트로 붙여넣기'},templates:{button:'템플릿',title:'내용 템플릿',options:'Template Options',insertOption:'현재 내용 바꾸기',selectPromptMsg:'�디터�서 사용할 템플릿� 선�하십시요.<br>(지금까지 작성� 내용� 사�집니다.):',emptyListMsg:'(템플릿� 없습니다.)'},showBlocks:'Show Blocks',stylesCombo:{label:'스타�',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'�맷',panelTitle:'�맷',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'�트',voiceLabel:'Font',panelTitle:'�트'},fontSize:{label:'글� �기',voiceLabel:'Font Size',panelTitle:'글� �기'},colorButton:{textColorTitle:'글� 색�',bgColorTitle:'배경 색�',panelTitle:'Colors',auto:'기본색�',more:'색�선�...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'문서 �성',title:'문서 �성',design:'Design',meta:'메타��터',chooseColor:'Choose',other:'<기타>',docTitle:'페�지명',charset:'�릭터셋 �코딩',charsetOther:'다른 �릭터셋 �코딩',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'문서 헤드',docTypeOther:'다른 문서헤드',xhtmlDec:'XHTML 문서정� �함',bgColor:'배경색�',bgImage:'배경�미지 URL',bgFixed:'스�롤�지않는 배경',txtColor:'글� 색�',margin:'페�지 여백',marginTop:'위',marginLeft:'왼쪽',marginRight:'오른쪽',marginBottom:'아래',metaKeywords:'문서 키워드 (콤마로 구분)',metaDescription:'문서 설명',metaAuthor:'작성�',metaCopyright:'저작권',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/lt.js b/upload/public/js/3rd_party/ckeditor/lang/lt.js
new file mode 100644
index 00000000..26060e5a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/lt.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.lt={dir:'ltr',editorTitle:'Pilnas redaktorius, %1, spauskite ALT 0 dėl pagalbos.',toolbars:'Redaktoriaus įrankiai',editor:'Pilnas redaktorius',source:'Šaltinis',newPage:'Naujas puslapis',save:'Išsaugoti',preview:'Peržiūra',cut:'Iškirpti',copy:'Kopijuoti',paste:'Įdėti',print:'Spausdinti',underline:'Pabrauktas',bold:'Pusjuodis',italic:'Kursyvas',selectAll:'Pažymėti viską',removeFormat:'Panaikinti formatą',strike:'Perbrauktas',subscript:'Apatinis indeksas',superscript:'Viršutinis indeksas',horizontalrule:'Įterpti horizontalią liniją',pagebreak:'Įterpti puslapių skirtuką',pagebreakAlt:'Puslapio skirtukas',unlink:'Panaikinti nuorodą',undo:'Atšaukti',redo:'Atstatyti',common:{browseServer:'Naršyti po serverį',url:'URL',protocol:'Protokolas',upload:'Siųsti',uploadSubmit:'Siųsti į serverį',image:'Vaizdas',flash:'Flash',form:'Forma',checkbox:'Žymimasis langelis',radio:'Žymimoji akutė',textField:'Teksto laukas',textarea:'Teksto sritis',hiddenField:'Nerodomas laukas',button:'Mygtukas',select:'Atrankos laukas',imageButton:'Vaizdinis mygtukas',notSet:'<nėra nustatyta>',id:'Id',name:'Vardas',langDir:'Teksto kryptis',langDirLtr:'Iš kairės į dešinę (LTR)',langDirRtl:'Iš dešinės į kairę (RTL)',langCode:'Kalbos kodas',longDescr:'Ilgas aprašymas URL',cssClass:'Stilių lentelės klasės',advisoryTitle:'Konsultacinė antraštė',cssStyle:'Stilius',ok:'OK',cancel:'Nutraukti',close:'Uždaryti',preview:'Peržiūrėti',generalTab:'Bendros savybės',advancedTab:'Papildomas',validateNumberFailed:'Ši reikšmė nėra skai�ius.',confirmNewPage:'Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?',confirmCancel:'Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?',options:'Parametrai',target:'Tikslinė nuoroda',targetNew:'Naujas langas (_blank)',targetTop:'Viršutinis langas (_top)',targetSelf:'Esamas langas (_self)',targetParent:'Paskutinis langas (_parent)',langDirLTR:'Iš kairės į dešinę (LTR)',langDirRTL:'Iš dešinės į kairę (RTL)',styles:'Stilius',cssClasses:'Stilių klasės',width:'Plotis',height:'Aukštis',align:'Lygiuoti',alignLeft:'Kairę',alignRight:'Dešinę',alignCenter:'Centrą',alignTop:'Viršūnę',alignMiddle:'Vidurį',alignBottom:'Apa�ią',invalidHeight:'Aukštis turi būti nurodytas skai�iais.',invalidWidth:'Plotis turi būti nurodytas skai�iais.',invalidCssLength:'Reikšmė nurodyta "%1" laukui, turi būti teigiamas skai�ius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).',invalidHtmlLength:'Reikšmė nurodyta "%1" laukui, turi būti teigiamas skai�ius su arba be tinkamo HTML matavimo vieneto (px arba %).',invalidInlineStyle:'Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių "vardas : reikšmė", atskirta kabliataškiais.',cssLengthTooltip:'Įveskite reikšmę pikseliais arba skai�iais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).',unavailable:'%1<span class="cke_accessibility">, netinkamas</span>'},contextmenu:{options:'Kontekstinio meniu parametrai'},specialChar:{toolbar:'Įterpti specialų simbolį',title:'Pasirinkite specialų simbolį',options:'Specialaus simbolio nustatymai'},link:{toolbar:'Įterpti/taisyti nuorodą',other:'<kitas>',menu:'Taisyti nuorodą',title:'Nuoroda',info:'Nuorodos informacija',target:'Paskirties vieta',upload:'Siųsti',advanced:'Papildomas',type:'Nuorodos tipas',toUrl:'Nuoroda',toAnchor:'Žymė šiame puslapyje',toEmail:'El.paštas',targetFrame:'<kadras>',targetPopup:'<išskleidžiamas langas>',targetFrameName:'Paskirties kadro vardas',targetPopupName:'Paskirties lango vardas',popupFeatures:'Išskleidžiamo lango savybės',popupResizable:'Kintamas dydis',popupStatusBar:'Būsenos juosta',popupLocationBar:'Adreso juosta',popupToolbar:'Mygtukų juosta',popupMenuBar:'Meniu juosta',popupFullScreen:'Visas ekranas (IE)',popupScrollBars:'Slinkties juostos',popupDependent:'Priklausomas (Netscape)',popupLeft:'Kairė pozicija',popupTop:'Viršutinė pozicija',id:'Id',langDir:'Teksto kryptis',langDirLTR:'Iš kairės į dešinę (LTR)',langDirRTL:'Iš dešinės į kairę (RTL)',acccessKey:'Prieigos raktas',name:'Vardas',langCode:'Teksto kryptis',tabIndex:'Tabuliavimo indeksas',advisoryTitle:'Konsultacinė antraštė',advisoryContentType:'Konsultacinio turinio tipas',cssClasses:'Stilių lentelės klasės',charset:'Susietų išteklių simbolių lentelė',styles:'Stilius',rel:'Sąsajos',selectAnchor:'Pasirinkite žymę',anchorName:'Pagal žymės vardą',anchorId:'Pagal žymės Id',emailAddress:'El.pašto adresas',emailSubject:'Žinutės tema',emailBody:'Žinutės turinys',noAnchors:'(Šiame dokumente žymių nėra)',noUrl:'Prašome įvesti nuorodos URL',noEmail:'Prašome įvesti el.pašto adresą'},anchor:{toolbar:'Įterpti/modifikuoti žymę',menu:'Žymės savybės',title:'Žymės savybės',name:'Žymės vardas',errorName:'Prašome įvesti žymės vardą',remove:'Pašalinti žymę'},list:{numberedTitle:'Skaitmeninio sąrašo nustatymai',bulletedTitle:'Ženklelinio sąrašo nustatymai',type:'Rūšis',start:'Pradžia',validateStartNumber:'Sąrašo pradžios skaitmuo turi būti sveikas skai�ius.',circle:'Apskritimas',disc:'Diskas',square:'Kvadratas',none:'Niekas',notset:'<nenurodytas>',armenian:'Armėniški skaitmenys',georgian:'Gruziniški skaitmenys (an, ban, gan, t.t)',lowerRoman:'Mažosios Romėnų (i, ii, iii, iv, v, t.t)',upperRoman:'Didžiosios Romėnų (I, II, III, IV, V, t.t)',lowerAlpha:'Mažosios Alpha (a, b, c, d, e, t.t)',upperAlpha:'Didžiosios Alpha (A, B, C, D, E, t.t)',lowerGreek:'Mažosios Graikų (alpha, beta, gamma, t.t)',decimal:'Dešimtainis (1, 2, 3, t.t)',decimalLeadingZero:'Dešimtainis su nuliu priekyje (01, 02, 03, t.t)'},findAndReplace:{title:'Surasti ir pakeisti',find:'Rasti',replace:'Pakeisti',findWhat:'Surasti tekstą:',replaceWith:'Pakeisti tekstu:',notFoundMsg:'Nurodytas tekstas nerastas.',findOptions:'Paieškos nustatymai',matchCase:'Skirti didžiąsias ir mažąsias raides',matchWord:'Atitikti pilną žodį',matchCyclic:'Sutampantis cikliškumas',replaceAll:'Pakeisti viską',replaceSuccessMsg:'%1 sutapimas(ų) buvo pakeisti.'},table:{toolbar:'Lentelė',title:'Lentelės savybės',menu:'Lentelės savybės',deleteTable:'Šalinti lentelę',rows:'Eilutės',columns:'Stulpeliai',border:'Rėmelio dydis',widthPx:'taškais',widthPc:'procentais',widthUnit:'plo�io vienetas',cellSpace:'Tarpas tarp langelių',cellPad:'Trapas nuo langelio rėmo iki teksto',caption:'Antraštė',summary:'Santrauka',headers:'Antraštės',headersNone:'Nėra',headersColumn:'Pirmas stulpelis',headersRow:'Pirma eilutė',headersBoth:'Abu',invalidRows:'Skai�ius turi būti didesnis nei 0.',invalidCols:'Skai�ius turi būti didesnis nei 0.',invalidBorder:'Reikšmė turi būti nurodyta skai�iumi.',invalidWidth:'Reikšmė turi būti nurodyta skai�iumi.',invalidHeight:'Reikšmė turi būti nurodyta skai�iumi.',invalidCellSpacing:'Reikšmė turi būti nurodyta skai�iumi.',invalidCellPadding:'Reikšmė turi būti nurodyta skai�iumi.',cell:{menu:'Langelis',insertBefore:'Įterpti langelį prieš',insertAfter:'Įterpti langelį po',deleteCell:'Šalinti langelius',merge:'Sujungti langelius',mergeRight:'Sujungti su dešine',mergeDown:'Sujungti su apa�ia',splitHorizontal:'Skaidyti langelį horizontaliai',splitVertical:'Skaidyti langelį vertikaliai',title:'Cell nustatymai',cellType:'Cell rūšis',rowSpan:'Eilu�ių Span',colSpan:'Stulpelių Span',wordWrap:'Sutraukti raides',hAlign:'Horizontalus lygiavimas',vAlign:'Vertikalus lygiavimas',alignBaseline:'Apatinė linija',bgColor:'Fono spalva',borderColor:'Rėmelio spalva',data:'Data',header:'Antraštė',yes:'Taip',no:'Ne',invalidWidth:'Reikšmė turi būti skai�ius.',invalidHeight:'Reikšmė turi būti skai�ius.',invalidRowSpan:'Reikšmė turi būti skai�ius.',invalidColSpan:'Reikšmė turi būti skai�ius.',chooseColor:'Pasirinkite'},row:{menu:'Eilutė',insertBefore:'Įterpti eilutę prieš',insertAfter:'Įterpti eilutę po',deleteRow:'Šalinti eilutes'},column:{menu:'Stulpelis',insertBefore:'Įterpti stulpelį prieš',insertAfter:'Įterpti stulpelį po',deleteColumn:'Šalinti stulpelius'}},button:{title:'Mygtuko savybės',text:'Tekstas (Reikšmė)',type:'Tipas',typeBtn:'Mygtukas',typeSbm:'Siųsti',typeRst:'Išvalyti'},checkboxAndRadio:{checkboxTitle:'Žymimojo langelio savybės',radioTitle:'Žymimosios akutės savybės',value:'Reikšmė',selected:'Pažymėtas'},form:{title:'Formos savybės',menu:'Formos savybės',action:'Veiksmas',method:'Metodas',encoding:'Kodavimas'},select:{title:'Atrankos lauko savybės',selectInfo:'Informacija',opAvail:'Galimos parinktys',value:'Reikšmė',size:'Dydis',lines:'eilu�ių',chkMulti:'Leisti daugeriopą atranką',opText:'Tekstas',opValue:'Reikšmė',btnAdd:'Įtraukti',btnModify:'Modifikuoti',btnUp:'Aukštyn',btnDown:'Žemyn',btnSetValue:'Laikyti pažymėta reikšme',btnDelete:'Trinti'},textarea:{title:'Teksto srities savybės',cols:'Ilgis',rows:'Plotis'},textfield:{title:'Teksto lauko savybės',name:'Vardas',value:'Reikšmė',charWidth:'Ilgis simboliais',maxChars:'Maksimalus simbolių skai�ius',type:'Tipas',typeText:'Tekstas',typePass:'Slaptažodis'},hidden:{title:'Nerodomo lauko savybės',name:'Vardas',value:'Reikšmė'},image:{title:'Vaizdo savybės',titleButton:'Vaizdinio mygtuko savybės',menu:'Vaizdo savybės',infoTab:'Vaizdo informacija',btnUpload:'Siųsti į serverį',upload:'Nusiųsti',alt:'Alternatyvus Tekstas',lockRatio:'Išlaikyti proporciją',resetSize:'Atstatyti dydį',border:'Rėmelis',hSpace:'Hor.Erdvė',vSpace:'Vert.Erdvė',alertUrl:'Prašome įvesti vaizdo URL',linkTab:'Nuoroda',button2Img:'Ar norite mygtuką paversti paprastu paveiksliuku?',img2Button:'Ar norite paveiksliuką paversti mygtuku?',urlMissing:'Paveiksliuko nuorodos nėra.',validateBorder:'Reikšmė turi būti sveikas skai�ius.',validateHSpace:'Reikšmė turi būti sveikas skai�ius.',validateVSpace:'Reikšmė turi būti sveikas skai�ius.'},flash:{properties:'Flash savybės',propertiesTab:'Nustatymai',title:'Flash savybės',chkPlay:'Automatinis paleidimas',chkLoop:'Ciklas',chkMenu:'Leisti Flash meniu',chkFull:'Leisti per visą ekraną',scale:'Mastelis',scaleAll:'Rodyti visą',scaleNoBorder:'Be rėmelio',scaleFit:'Tikslus atitikimas',access:'Skripto priėjimas',accessAlways:'Visada',accessSameDomain:'Tas pats domenas',accessNever:'Niekada',alignAbsBottom:'Absoliu�ią apa�ią',alignAbsMiddle:'Absoliutų vidurį',alignBaseline:'Apatinę liniją',alignTextTop:'Teksto viršūnę',quality:'Kokybė',qualityBest:'Geriausia',qualityHigh:'Gera',qualityAutoHigh:'Automatiškai Gera',qualityMedium:'Vidutinė',qualityAutoLow:'Automatiškai Žema',qualityLow:'Žema',windowModeWindow:'Langas',windowModeOpaque:'Nepermatomas',windowModeTransparent:'Permatomas',windowMode:'Lango režimas',flashvars:'Flash kintamieji',bgcolor:'Fono spalva',hSpace:'Hor.Erdvė',vSpace:'Vert.Erdvė',validateSrc:'Prašome įvesti nuorodos URL',validateHSpace:'HSpace turi būti skai�ius.',validateVSpace:'VSpace turi būti skai�ius.'},spellCheck:{toolbar:'Rašybos tikrinimas',title:'Tikrinti klaidas',notAvailable:'Atleiskite, šiuo metu servisas neprieinamas.',errorLoading:'Klaida įkraunant servisą: %s.',notInDic:'Žodyne nerastas',changeTo:'Pakeisti į',btnIgnore:'Ignoruoti',btnIgnoreAll:'Ignoruoti visus',btnReplace:'Pakeisti',btnReplaceAll:'Pakeisti visus',btnUndo:'Atšaukti',noSuggestions:'- Nėra pasiūlymų -',progress:'Vyksta rašybos tikrinimas...',noMispell:'Rašybos tikrinimas baigtas: Nerasta rašybos klaidų',noChanges:'Rašybos tikrinimas baigtas: Nėra pakeistų žodžių',oneChange:'Rašybos tikrinimas baigtas: Vienas žodis pakeistas',manyChanges:'Rašybos tikrinimas baigtas: Pakeista %1 žodžių',ieSpellDownload:'Rašybos tikrinimas neinstaliuotas. Ar Jūs norite jį dabar atsisiųsti?'},smiley:{toolbar:'Veideliai',title:'Įterpti veidelį',options:'Šypsenėlių nustatymai'},elementsPath:{eleLabel:'Elemento kelias',eleTitle:'%1 elementas'},numberedlist:'Numeruotas sąrašas',bulletedlist:'Suženklintas sąrašas',indent:'Padidinti įtrauką',outdent:'Sumažinti įtrauką',justify:{left:'Lygiuoti kairę',center:'Centruoti',right:'Lygiuoti dešinę',block:'Lygiuoti abi puses'},blockquote:'Citata',clipboard:{title:'Įdėti',cutError:'Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).',copyError:'Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).',pasteMsg:'Žemiau esan�iame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.',securityMsg:'Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.',pasteArea:'Įkelti dalį'},pastefromword:{confirmCleanup:'Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?',toolbar:'Įdėti iš Word',title:'Įdėti iš Word',error:'Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto'},pasteText:{button:'Įdėti kaip gryną tekstą',title:'Įdėti kaip gryną tekstą'},templates:{button:'Šablonai',title:'Turinio šablonai',options:'Template Options',insertOption:'Pakeisti dabartinį turinį pasirinktu šablonu',selectPromptMsg:'Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):',emptyListMsg:'(Šablonų sąrašas tuš�ias)'},showBlocks:'Rodyti blokus',stylesCombo:{label:'Stilius',panelTitle:'Stilių formatavimas',panelTitle1:'Blokų stiliai',panelTitle2:'Vidiniai stiliai',panelTitle3:'Objektų stiliai'},format:{label:'Šrifto formatas',panelTitle:'Šrifto formatas',tag_p:'Normalus',tag_pre:'Formuotas',tag_address:'Kreipinio',tag_h1:'Antraštinis 1',tag_h2:'Antraštinis 2',tag_h3:'Antraštinis 3',tag_h4:'Antraštinis 4',tag_h5:'Antraštinis 5',tag_h6:'Antraštinis 6',tag_div:'Normalus (DIV)'},div:{title:'Sukurti Div elementą',toolbar:'Sukurti Div elementą',cssClassInputLabel:'Stilių klasės',styleSelectLabel:'Stilius',IdInputLabel:'Id',languageCodeInputLabel:' Kalbos kodas',inlineStyleInputLabel:'Vidiniai stiliai',advisoryTitleInputLabel:'Patariamas pavadinimas',langDirLabel:'Kalbos nurodymai',langDirLTRLabel:'Iš kairės į dešinę (LTR)',langDirRTLLabel:'Iš dešinės į kairę (RTL)',edit:'Redaguoti Div',remove:'Pašalinti Div'},iframe:{title:'IFrame nustatymai',toolbar:'IFrame',noUrl:'Nurodykite iframe nuorodą',scrolling:'Įjungti slankiklius',border:'Rodyti rėmelį'},font:{label:'Šriftas',voiceLabel:'Šriftas',panelTitle:'Šriftas'},fontSize:{label:'Šrifto dydis',voiceLabel:'Šrifto dydis',panelTitle:'Šrifto dydis'},colorButton:{textColorTitle:'Teksto spalva',bgColorTitle:'Fono spalva',panelTitle:'Spalva',auto:'Automatinis',more:'Daugiau spalvų...'},colors:{'000':'Juoda',800000:'Kaštoninė','8B4513':'Tamsiai ruda','2F4F4F':'Pilka tamsaus šiferio','008080':'Teal','000080':'Karinis','4B0082':'Indigo',696969:'Tamsiai pilka',B22222:'Ugnies',A52A2A:'Ruda',DAA520:'Aukso','006400':'Tamsiai žalia','40E0D0':'Turquoise','0000CD':'Vidutinė mėlyna',800080:'Violetinė',808080:'Pilka',F00:'Raudona',FF8C00:'Tamsiai oranžinė',FFD700:'Auksinė','008000':'Žalia','0FF':'Žydra','00F':'Mėlyna',EE82EE:'Violetinė',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Oranžinė',FFFF00:'Geltona','00FF00':'Citrinų',AFEEEE:'Pale Turquoise',ADD8E6:'Šviesiai mėlyna',DDA0DD:'Plum',D3D3D3:'Šviesiai pilka',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Šviesiai geltona',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'Balta'},scayt:{title:'Tikrinti klaidas kai rašoma',opera_title:'Nepalaikoma naršyklėje Opera',enable:'Įjungti SCAYT',disable:'Išjungti SCAYT',about:'Apie SCAYT',toggle:'Perjungti SCAYT',options:'Parametrai',langs:'Kalbos',moreSuggestions:'Daugiau patarimų',ignore:'Ignoruoti',ignoreAll:'Ignoruoti viską',addWord:'Pridėti žodį',emptyDic:'Žodyno vardas neturėtų būti tuš�ias.',optionsTab:'Parametrai',allCaps:'Ignoruoti visas didžiąsias raides',ignoreDomainNames:'Ignoruoti domenų vardus',mixedCase:'Ignoruoti maišyto dydžio raides',mixedWithDigits:'Ignoruoti raides su skai�iais',languagesTab:'Kalbos',dictionariesTab:'Žodynai',dic_field_name:'Žodyno pavadinimas',dic_create:'Sukurti',dic_restore:'Atstatyti',dic_delete:'Ištrinti',dic_rename:'Pervadinti',dic_info:'Paprastai žodynas yra saugojamas sausainėliuose (cookies), kurių dydis, bet kokiu atveju, yra apribotas. Esant sausainėlių apimties pervišiui, viskas bus saugoma serveryje. Jei norite iš kart viską saugoti serveryje, turite sugalvoti žodynui pavadinimą. Jei jau turite žodyną, įrašykite pavadinimą ir nuspauskite Atstatyti mygtuką.',aboutTab:'Apie'},about:{title:'Apie CKEditor',dlgTitle:'Apie CKEditor',help:'Patikrinkite $1 dėl pagalbos.',userGuide:'CKEditor Vartotojo Gidas',moreInfo:'Dėl licencijavimo apsilankykite mūsų svetainėje:',copy:'Copyright &copy; $1. Visos teiss saugomos.'},maximize:'Išdidinti',minimize:'Sumažinti',fakeobjects:{anchor:'Žymė',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Paslėptas laukas',unknown:'Nežinomas objektas'},resize:'Pavilkite, kad pakeistumėte dydį',colordialog:{title:'Pasirinkite spalvą',options:'Spalvos nustatymai',highlight:'Paryškinti',selected:'Pasirinkta spalva',clear:'Išvalyti'},toolbarCollapse:'Apjungti įrankių juostą',toolbarExpand:'Išplėsti įrankių juostą',toolbarGroups:{document:'Dokumentas',clipboard:'Atmintinė/Atgal',editing:'Redagavimas',forms:'Formos',basicstyles:'Pagrindiniai stiliai',paragraph:'Paragrafas',links:'Nuorodos',insert:'Įterpti',styles:'Stiliai',colors:'Spalvos',tools:'Įrankiai'},bidi:{ltr:'Tekstas iš kairės į dešinę',rtl:'Tekstas iš dešinės į kairę'},docprops:{label:'Dokumento savybės',title:'Dokumento savybės',design:'Išdėstymas',meta:'Meta duomenys',chooseColor:'Pasirinkite',other:'<kitas>',docTitle:'Puslapio antraštė',charset:'Simbolių kodavimo lentelė',charsetOther:'Kita simbolių kodavimo lentelė',charsetASCII:'ASCII',charsetCE:'Centrinės Europos',charsetCT:'Tradicinės kinų (Big5)',charsetCR:'Kirilica',charsetGR:'Graikų',charsetJP:'Japonų',charsetKR:'Korėjie�ių',charsetTR:'Turkų',charsetUN:'Unikodas (UTF-8)',charsetWE:'Vakarų Europos',docType:'Dokumento tipo antraštė',docTypeOther:'Kita dokumento tipo antraštė',xhtmlDec:'Įtraukti XHTML deklaracijas',bgColor:'Fono spalva',bgImage:'Fono paveikslėlio nuoroda (URL)',bgFixed:'Neslenkantis fonas',txtColor:'Teksto spalva',margin:'Puslapio kraštinės',marginTop:'Viršuje',marginLeft:'Kairėje',marginRight:'Dešinėje',marginBottom:'Apa�ioje',metaKeywords:'Dokumento indeksavimo raktiniai žodžiai (atskirti kableliais)',metaDescription:'Dokumento apibūdinimas',metaAuthor:'Autorius',metaCopyright:'Autorinės teisės',previewHtml:'<p>Tai yra <strong>pavyzdinis tekstas</strong>. Jūs naudojate <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/lv.js b/upload/public/js/3rd_party/ckeditor/lang/lv.js
new file mode 100644
index 00000000..e6e2e423
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/lv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.lv={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'HTML kods',newPage:'Jauna lapa',save:'Saglab�t',preview:'P�rskatīt',cut:'Izgriezt',copy:'Kopēt',paste:'Ievietot',print:'Druk�t',underline:'Apakšsvītra',bold:'Treknu šriftu',italic:'Slīprakst�',selectAll:'Iezīmēt visu',removeFormat:'Noņemt stilus',strike:'P�rsvītrots',subscript:'Zemrakst�',superscript:'Augšrakst�',horizontalrule:'Ievietot horizont�lu Atdalīt�jsvītru',pagebreak:'Ievietot lapas p�rtraukumu',pagebreakAlt:'Page Break',unlink:'Noņemt hipersaiti',undo:'Atcelt',redo:'Atk�rtot',common:{browseServer:'Skatīt servera saturu',url:'URL',protocol:'Protokols',upload:'Augšupiel�dēt',uploadSubmit:'Nosūtīt serverim',image:'Attēls',flash:'Flash',form:'Forma',checkbox:'Atzīmēšanas kastīte',radio:'Izvēles poga',textField:'Teksta rinda',textarea:'Teksta laukums',hiddenField:'Paslēpta teksta rinda',button:'Poga',select:'Iezīmēšanas lauks',imageButton:'Attēlpoga',notSet:'<nav iestatīts>',id:'Id',name:'Nosaukums',langDir:'Valodas lasīšanas virziens',langDirLtr:'No kreis�s uz labo (LTR)',langDirRtl:'No lab�s uz kreiso (RTL)',langCode:'Valodas kods',longDescr:'Gara apraksta Hipersaite',cssClass:'Stilu saraksta klases',advisoryTitle:'Konsultatīvs virsraksts',cssStyle:'Stils',ok:'Darīts!',cancel:'Atcelt',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Izvērstais',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Platums',height:'Augstums',align:'Nolīdzin�t',alignLeft:'Pa kreisi',alignRight:'Pa labi',alignCenter:'Centrēti',alignTop:'Augš�',alignMiddle:'Vertik�li centrēts',alignBottom:'Apakš�',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Ievietot speci�lo simbolu',title:'Ievietot īpašu simbolu',options:'Special Character Options'},link:{toolbar:'Ievietot/Labot hipersaiti',other:'<cits>',menu:'Labot hipersaiti',title:'Hipersaite',info:'Hipersaites inform�cija',target:'Mērķis',upload:'Augšupiel�dēt',advanced:'Izvērstais',type:'Hipersaites tips',toUrl:'URL',toAnchor:'Iezīme šaj� lap�',toEmail:'E-pasts',targetFrame:'<ietvars>',targetPopup:'<uznirstoš� log�>',targetFrameName:'Mērķa ietvara nosaukums',targetPopupName:'Uznirstoš� loga nosaukums',popupFeatures:'Uznirstoš� loga nosaukums īpašības',popupResizable:'Resizable',popupStatusBar:'Statusa josla',popupLocationBar:'Atrašan�s vietas josla',popupToolbar:'Rīku josla',popupMenuBar:'Izvēlnes josla',popupFullScreen:'Piln� ekr�n� (IE)',popupScrollBars:'Ritjoslas',popupDependent:'Atkarīgs (Netscape)',popupLeft:'Kreis� koordin�te',popupTop:'Augšēj� koordin�te',id:'Id',langDir:'Valodas lasīšanas virziens',langDirLTR:'No kreis�s uz labo (LTR)',langDirRTL:'No lab�s uz kreiso (RTL)',acccessKey:'Pieejas kods',name:'Nosaukums',langCode:'Valodas lasīšanas virziens',tabIndex:'Ciļņu indekss',advisoryTitle:'Konsultatīvs virsraksts',advisoryContentType:'Konsultatīvs satura tips',cssClasses:'Stilu saraksta klases',charset:'Pievienot� resursa kodu tabula',styles:'Stils',rel:'Relationship',selectAnchor:'Izvēlēties iezīmi',anchorName:'Pēc iezīmes nosaukuma',anchorId:'Pēc elementa ID',emailAddress:'E-pasta adrese',emailSubject:'Ziņas tēma',emailBody:'Ziņas saturs',noAnchors:'(Šaj� dokument� nav iezīmju)',noUrl:'Lūdzu nor�di hipersaiti',noEmail:'Lūdzu nor�di e-pasta adresi'},anchor:{toolbar:'Ievietot/Labot iezīmi',menu:'Iezīmes īpašības',title:'Iezīmes īpašības',name:'Iezīmes nosaukums',errorName:'Lūdzu nor�diet iezīmes nosaukumu',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Meklēt',replace:'Nomainīt',findWhat:'Meklēt:',replaceWith:'Nomainīt uz:',notFoundMsg:'Nor�dīt� fr�ze netika atrasta.',findOptions:'Find Options',matchCase:'Reģistrjūtīgs',matchWord:'J�sakrīt pilnīb�',matchCyclic:'Match cyclic',replaceAll:'Aizvietot visu',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabula',title:'Tabulas īpašības',menu:'Tabulas īpašības',deleteTable:'Dzēst tabulu',rows:'Rindas',columns:'Kolonnas',border:'R�mja izmērs',widthPx:'pikseļos',widthPc:'procentu�li',widthUnit:'width unit',cellSpace:'Rūtiņu atstatums',cellPad:'Rūtiņu nobīde',caption:'Leģenda',summary:'Anot�cija',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Šūna',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Dzēst rūtiņas',merge:'Apvienot rūtiņas',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Rinda',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Dzēst rindas'},column:{menu:'Kolonna',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Dzēst kolonnas'}},button:{title:'Pogas īpašības',text:'Teksts (vērtība)',type:'Tips',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Atzīmēšanas kastītes īpašības',radioTitle:'Izvēles poga īpašības',value:'Vērtība',selected:'Iezīmēts'},form:{title:'Formas īpašības',menu:'Formas īpašības',action:'Darbība',method:'Metode',encoding:'Encoding'},select:{title:'Iezīmēšanas lauka īpašības',selectInfo:'Inform�cija',opAvail:'Pieejam�s iespējas',value:'Vērtība',size:'Izmērs',lines:'rindas',chkMulti:'Atļaut vair�kus iezīmējumus',opText:'Teksts',opValue:'Vērtība',btnAdd:'Pievienot',btnModify:'Veikt izmaiņas',btnUp:'Augšup',btnDown:'Lejup',btnSetValue:'Noteikt k� iezīmēto vērtību',btnDelete:'Dzēst'},textarea:{title:'Teksta laukuma īpašības',cols:'Kolonnas',rows:'Rindas'},textfield:{title:'Teksta rindas  īpašības',name:'Nosaukums',value:'Vērtība',charWidth:'Simbolu platums',maxChars:'Simbolu maksim�lais daudzums',type:'Tips',typeText:'Teksts',typePass:'Parole'},hidden:{title:'Paslēpt�s teksta rindas īpašības',name:'Nosaukums',value:'Vērtība'},image:{title:'Attēla īpašības',titleButton:'Attēlpogas īpašības',menu:'Attēla īpašības',infoTab:'Inform�cija par attēlu',btnUpload:'Nosūtīt serverim',upload:'Augšupiel�dēt',alt:'Alternatīvais teksts',lockRatio:'Nemainīga Augstuma/Platuma attiecība',resetSize:'Atjaunot s�kotnējo izmēru',border:'R�mis',hSpace:'Horizont�l� telpa',vSpace:'Vertik�l� telpa',alertUrl:'Lūdzu nor�dīt attēla hipersaiti',linkTab:'Hipersaite',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash īpašības',propertiesTab:'Properties',title:'Flash īpašības',chkPlay:'Autom�tiska atskaņošana',chkLoop:'Nep�rtraukti',chkMenu:'Atļaut Flash izvēlni',chkFull:'Allow Fullscreen',scale:'Mainīt izmēru',scaleAll:'R�dīt visu',scaleNoBorder:'Bez r�mja',scaleFit:'Precīzs izmērs',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Absolūti apakš�',alignAbsMiddle:'Absolūti vertik�li centrēts',alignBaseline:'Pamatrind�',alignTextTop:'Teksta augš�',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Fona kr�sa',hSpace:'Horizont�l� telpa',vSpace:'Vertik�l� telpa',validateSrc:'Lūdzu nor�di hipersaiti',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Pareizrakstības p�rbaude',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Netika atrasts v�rdnīc�',changeTo:'Nomainīt uz',btnIgnore:'Ignorēt',btnIgnoreAll:'Ignorēt visu',btnReplace:'Aizvietot',btnReplaceAll:'Aizvietot visu',btnUndo:'Atcelt',noSuggestions:'- Nav ieteikumu -',progress:'Notiek pareizrakstības p�rbaude...',noMispell:'Pareizrakstības p�rbaude pabeigta: kļūdas netika atrastas',noChanges:'Pareizrakstības p�rbaude pabeigta: nekas netika labots',oneChange:'Pareizrakstības p�rbaude pabeigta: 1 v�rds izmainīts',manyChanges:'Pareizrakstības p�rbaude pabeigta: %1 v�rdi tika mainīti',ieSpellDownload:'Pareizrakstības p�rbaudīt�js nav pievienots. Vai vēlaties to lejupiel�dēt tagad?'},smiley:{toolbar:'Smaidiņi',title:'Ievietot smaidiņu',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numurēts saraksts',bulletedlist:'Izcelts saraksts',indent:'Palielin�t atk�pi',outdent:'Samazin�t atk�pi',justify:{left:'Izlīdzin�t pa kreisi',center:'Izlīdzin�t pret centru',right:'Izlīdzin�t pa labi',block:'Izlīdzin�t malas'},blockquote:'Block Quote',clipboard:{title:'Ievietot',cutError:'Jūsu p�rlūkprogrammas drošības iestatījumi nepieļauj editoram autom�tiski veikt izgriešanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X, lai veiktu šo darbību.',copyError:'Jūsu p�rlūkprogrammas drošības iestatījumi nepieļauj editoram autom�tiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.',pasteMsg:'Lūdzu, ievietojiet tekstu šaj� laukum�, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Ievietot no Worda',title:'Ievietot no Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Ievietot k� vienk�ršu tekstu',title:'Ievietot k� vienk�ršu tekstu'},templates:{button:'Sagataves',title:'Satura sagataves',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Lūdzu, nor�diet sagatavi, ko atvērt editor�<br>(patreizējie dati tiks zaudēti):',emptyListMsg:'(Nav nor�dītas sagataves)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stils',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Form�ts',panelTitle:'Form�ts',tag_p:'Norm�ls teksts',tag_pre:'Formatēts teksts',tag_address:'Adrese',tag_h1:'Virsraksts 1',tag_h2:'Virsraksts 2',tag_h3:'Virsraksts 3',tag_h4:'Virsraksts 4',tag_h5:'Virsraksts 5',tag_h6:'Virsraksts 6',tag_div:'Rindkopa (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Šrifts',voiceLabel:'Font',panelTitle:'Šrifts'},fontSize:{label:'Izmērs',voiceLabel:'Font Size',panelTitle:'Izmērs'},colorButton:{textColorTitle:'Teksta kr�sa',bgColorTitle:'Fona kr�sa',panelTitle:'Colors',auto:'Autom�tiska',more:'Plaš�ka palete...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Dokumenta īpašības',title:'Dokumenta īpašības',design:'Design',meta:'META dati',chooseColor:'Choose',other:'<cits>',docTitle:'Dokumenta virsraksts <Title>',charset:'Simbolu kodējums',charsetOther:'Cits simbolu kodējums',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Dokumenta tips',docTypeOther:'Cits dokumenta tips',xhtmlDec:'Ietvert XHTML deklar�cijas',bgColor:'Fona kr�sa',bgImage:'Fona attēla hipersaite',bgFixed:'Fona attēls ir fiksēts',txtColor:'Teksta kr�sa',margin:'Lapas robežas',marginTop:'Augš�',marginLeft:'Pa kreisi',marginRight:'Pa labi',marginBottom:'Apakš�',metaKeywords:'Dokumentu aprakstoši atslēgv�rdi (atdalīti ar komatu)',metaDescription:'Dokumenta apraksts',metaAuthor:'Autors',metaCopyright:'Autortiesības',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/mn.js b/upload/public/js/3rd_party/ckeditor/lang/mn.js
new file mode 100644
index 00000000..58a84d62
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/mn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.mn={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Код',newPage:'Шин� хууда�',save:'Хадгалах',preview:'Уридчлан харах',cut:'Хайчлах',copy:'Хуулах',paste:'Буулгах',print:'Х�вл�х',underline:'Доогуур нь зураа�тай болгох',bold:'Тод бүдүүн',italic:'�алуу',selectAll:'Бүгдийг нь �онгох',removeFormat:'Формат авч ха�х',strike:'Дундуур нь зураа�тай болгох',subscript:'Суурь болгох',superscript:'З�р�г болгох',horizontalrule:'Хөндлөн зураа� оруулах',pagebreak:'Хууда� ту�гаарлагч оруулах',pagebreakAlt:'Page Break',unlink:'Линк авч ха�х',undo:'Хүчингүй болгох',redo:'Өмнөх үйлдл�� ��рг��х',common:{browseServer:'Сервер харуулах',url:'URL',protocol:'Протокол',upload:'Хуулах',uploadSubmit:'Үүнийг �ерв�ррүү илг��',image:'Зураг',flash:'Флаш',form:'Форм',checkbox:'Чекбок�',radio:'Радио товч',textField:'Техт талбар',textarea:'Техт орчин',hiddenField:'�ууц талбар',button:'Товч',select:'Сонгогч талбар',imageButton:'Зурагтай товч',notSet:'<Оноохгүй>',id:'Id',name:'��р',langDir:'Х�лний чигл�л',langDirLtr:'Зүүн��� баруун (LTR)',langDirRtl:'Баруунаа� зүүн (RTL)',langCode:'Х�лний код',longDescr:'URL-ын тайлбар',cssClass:'Stylesheet кла��ууд',advisoryTitle:'Зөвлөлдөх гарчиг',cssStyle:'Загвар',ok:'OK',cancel:'Болих',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'��м�лт',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Өргөн',height:'Өндөр',align:'Эгн��',alignLeft:'Зүүн',alignRight:'Баруун',alignCenter:'Төвд',alignTop:'Д��д талд',alignMiddle:'Дунд талд',alignBottom:'Доод талд',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Онцгой т�мд�гт оруулах',title:'Онцгой т�мд�гт �онгох',options:'Special Character Options'},link:{toolbar:'Линк Оруулах/За�варлах',other:'<other>',menu:'Холбоо� за�варлах',title:'Линк',info:'Линкийн м�д��л�л',target:'Байрлал',upload:'Хуулах',advanced:'��м�лт',type:'Линкийн төрөл',toUrl:'URL',toAnchor:'Эн� хууда�андах холбоо�',toEmail:'E-Mail',targetFrame:'<�гуулах хүр��>',targetPopup:'<popup цонх>',targetFrameName:'Очих фремын н�р',targetPopupName:'Popup цонхны н�р',popupFeatures:'Popup цонхны онцлог',popupResizable:'Resizable',popupStatusBar:'Стату� х���г',popupLocationBar:'Location х���г',popupToolbar:'Багажны х���г',popupMenuBar:'Meню х���г',popupFullScreen:'Цонх дүүрг�х (IE)',popupScrollBars:'Скрол х���гүүд',popupDependent:'Хамаатай (Netscape)',popupLeft:'Зүүн байрлал',popupTop:'Д��д байрлал',id:'Id',langDir:'Х�лний чигл�л',langDirLTR:'Зүүн��� баруун (LTR)',langDirRTL:'Баруунаа� зүүн (RTL)',acccessKey:'Холбох түлхүүр',name:'��р',langCode:'Х�лний чигл�л',tabIndex:'Tab индек�',advisoryTitle:'Зөвлөлдөх гарчиг',advisoryContentType:'Зөвлөлдөх төрлийн агуулга',cssClasses:'Stylesheet кла��ууд',charset:'Т�мд�гт оноох нөөцөд холбогд�он',styles:'Загвар',rel:'Relationship',selectAnchor:'Холбоо� �онгох',anchorName:'Холбоо�ын н�р��р',anchorId:'Элем�нт Id-гаар',emailAddress:'E-Mail Ха�г',emailSubject:'Message гарчиг',emailBody:'Message-ийн агуулга',noAnchors:'(Баримт бичиг холбоо�гүй байна)',noUrl:'Линк URL-�� төрөлжүүлн� үү',noEmail:'Е-mail ха�гаа төрөлжүүлн� үү'},anchor:{toolbar:'Холбоо� Оруулах/За�варлах',menu:'Холбоо� шинж чанар',title:'Холбоо� шинж чанар',name:'Холбоо� н�р',errorName:'Холбоо� төрөл оруулна уу',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Хай мөн Дарж бич',find:'Хайх',replace:'Солих',findWhat:'Хайх үг/ү��г:',replaceWith:'Солих үг:',notFoundMsg:'Хай�ан тек�т ол�онгүй.',findOptions:'Find Options',matchCase:'Т�нц�х төлөв',matchWord:'Т�нц�х бүт�н үг',matchCyclic:'Match cyclic',replaceAll:'Бүгдийг нь Солих',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Хү�н�гт',title:'Хү�н�гт',menu:'Хү�н�гт',deleteTable:'Хү�н�гт у�тгах',rows:'Мөр',columns:'Багана',border:'Хүр��ний х�мж��',widthPx:'ц�г',widthPc:'хувь',widthUnit:'width unit',cellSpace:'�үх хоорондын зай (spacing)',cellPad:'�үх доторлох(padding)',caption:'Тайлбар',summary:'Тайлбар',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'�үх/зай',insertBefore:'�үх/зай өмнө нь оруулах',insertAfter:'�үх/зай дараа нь оруулах',deleteCell:'�үх у�тгах',merge:'�үх н�гт�х',mergeRight:'Баруун тийш н�гтг�х',mergeDown:'Доош н�гтг�х',splitHorizontal:'�үх/зайг бо�оогоор нь ту�гаарлах',splitVertical:'�үх/зайг хөндлөнгөөр нь ту�гаарлах',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Мөр',insertBefore:'Мөр өмнө нь оруулах',insertAfter:'Мөр дараа нь оруулах',deleteRow:'Мөр у�тгах'},column:{menu:'Багана',insertBefore:'Багана өмнө нь оруулах',insertAfter:'Багана дараа нь оруулах',deleteColumn:'Багана у�тгах'}},button:{title:'Товчны шинж чанар',text:'Т�к�т (Утга)',type:'Төрөл',typeBtn:'Товч',typeSbm:'Submit',typeRst:'Болих'},checkboxAndRadio:{checkboxTitle:'Чекбок�ны шинж чанар',radioTitle:'Радио товчны шинж чанар',value:'Утга',selected:'Сонгогд�он'},form:{title:'Форм шинж чанар',menu:'Форм шинж чанар',action:'Үйлд�л',method:'�рга',encoding:'Encoding'},select:{title:'Согогч талбарын шинж чанар',selectInfo:'М�д��л�л',opAvail:'Идв�хт�й �онголт',value:'Утга',size:'Х�мж��',lines:'Мөр',chkMulti:'Олон �онголт зөвшөөрөх',opText:'Т�к�т',opValue:'Утга',btnAdd:'��м�х',btnModify:'Өөрчлөх',btnUp:'Д��ш',btnDown:'Доош',btnSetValue:'Сонгогд�ан утга оноох',btnDelete:'У�тгах'},textarea:{title:'Тек�т орчны шинж чанар',cols:'Багана',rows:'Мөр'},textfield:{title:'Тек�т талбарын шинж чанар',name:'��р',value:'Утга',charWidth:'Т�мд�гтын өргөн',maxChars:'Хамгийн их т�мд�гт',type:'Төрөл',typeText:'Тек�т',typePass:'�ууц үг'},hidden:{title:'�ууц талбарын шинж чанар',name:'��р',value:'Утга'},image:{title:'Зураг',titleButton:'Зурган товчны шинж чанар',menu:'Зураг',infoTab:'Зурагны м�д��л�л',btnUpload:'Үүнийг �ерв�ррүү илг��',upload:'Хуулах',alt:'Тайлбар тек�т',lockRatio:'Радио түгжих',resetSize:'х�мж�� дахин оноох',border:'Хүр��',hSpace:'Хөндлөн зай',vSpace:'Бо�оо зай',alertUrl:'Зурагны URL-ын төрлийн �онгоно уу',linkTab:'Линк',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Флаш шинж чанар',propertiesTab:'Properties',title:'Флаш  шинж чанар',chkPlay:'�втоматаар тоглох',chkLoop:'Давтах',chkMenu:'Флаш ц�� идв�хжүүл�х',chkFull:'Allow Fullscreen',scale:'Өргөгтгөх',scaleAll:'Бүгдийг харуулах',scaleNoBorder:'Хүр��гүй',scaleFit:'Яг тааруулах',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs доод талд',alignAbsMiddle:'Abs Дунд талд',alignBaseline:'Baseline',alignTextTop:'Тек�т д��р',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Фонны өнгө',hSpace:'Хөндлөн зай',vSpace:'Бо�оо зай',validateSrc:'Линк URL-�� төрөлжүүлн� үү',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Үгийн дүр�х шалгах',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Толь бичиггүй',changeTo:'Өөрчлөх',btnIgnore:'Зөвшөөрөх',btnIgnoreAll:'Бүгдийг зөвшөөрөх',btnReplace:'Дарж бичих',btnReplaceAll:'Бүгдийг Дарж бичих',btnUndo:'Буцаах',noSuggestions:'- Тайлбаргүй -',progress:'Дүр�м шалгаж байгаа үйл �вц...',noMispell:'Дүр�м шалгаад дуу��ан: �лдаа олд�онгүй',noChanges:'Дүр�м шалгаад дуу��ан: үг өөрчлөгдөөгүй',oneChange:'Дүр�м шалгаад дуу��ан: 1 үг өөрчлөгд�өн',manyChanges:'Дүр�м шалгаад дуу��ан: %1 үг өөрчлөгд�өн',ieSpellDownload:'Дүр�м шалгагч �уугаагүй байна. Татаж авахыг хү�ч байна уу?'},smiley:{toolbar:'Тодорхойлолт',title:'Тодорхойлолт оруулах',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Дугаарлагд�ан жаг�аалт',bulletedlist:'Ц�гт�й жаг�аалт',indent:'Догол мөр ха�ах',outdent:'Догол мөр н�м�х',justify:{left:'Зүүн талд байрлуулах',center:'Төвд байрлуулах',right:'Баруун талд байрлуулах',block:'Блок х�лб�р��р байрлуулах'},blockquote:'Хайрцаглах',clipboard:{title:'Буулгах',cutError:'Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлд�лийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хо�лолыг ашиглана уу.',copyError:'Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлд�лийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хо�лолыг ашиглана уу.',pasteMsg:'(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийн� үү. Мөн <strong>OK</strong> дар.',securityMsg:'Таны үзүүл�гч/browser/-н хамгаалалтын тохиргооноо� болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Эн� цонход дахин paste хийхийг оролд.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Word-оо� буулгах',title:'Word-оо� буулгах',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Plain Text-��� буулгах',title:'Plain Text-��� буулгах'},templates:{button:'Загварууд',title:'Загварын агуулга',options:'Template Options',insertOption:'Одоогийн агууллагыг дарж бичих',selectPromptMsg:'Загварыг н��ж editor-рүү �онгож оруулна уу<br />(Одоогийн агууллагыг у�таж магадгүй):',emptyListMsg:'(Загвар тодорхойлогдоогүй байна)'},showBlocks:'Block-уудыг үзүүл�х',stylesCombo:{label:'Загвар',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Формат',panelTitle:'Формат',tag_p:'Х�вийн',tag_pre:'Formatted',tag_address:'Ха�г',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Paragraph (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Фонт',voiceLabel:'Font',panelTitle:'Фонт'},fontSize:{label:'Х�мж��',voiceLabel:'Font Size',panelTitle:'Х�мж��'},colorButton:{textColorTitle:'Фонтны өнгө',bgColorTitle:'Фонны өнгө',panelTitle:'Colors',auto:'�втоматаар',more:'��м�лт өнгөнүүд...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Баримт бичиг шинж чанар',title:'Баримт бичиг шинж чанар',design:'Design',meta:'Meta өгөгдөл',chooseColor:'Choose',other:'<other>',docTitle:'Хууда�ны гарчиг',charset:'Encoding т�мд�гт',charsetOther:'Encoding-д өөр т�мд�гт оноох',charsetASCII:'ASCII',charsetCE:'Төв европ',charsetCT:'Х�тадын уламжлалт (Big5)',charsetCR:'Крил',charsetGR:'Гред',charsetJP:'Япон',charsetKR:'Солонго�',charsetTR:'Tурк',charsetUN:'Юникод (UTF-8)',charsetWE:'Баруун европ',docType:'Баримт бичгийн төрөл Heading',docTypeOther:'Бу�ад баримт бичгийн төрөл Heading',xhtmlDec:'XHTML агуулж зарлах',bgColor:'Фоно өнгө',bgImage:'Фоно зурагны URL',bgFixed:'Гүйд�ггүй фоно',txtColor:'Фонтны өнгө',margin:'Хууда�ны захын зай',marginTop:'Д��д тал',marginLeft:'Зүүн тал',marginRight:'Баруун тал',marginBottom:'Доод тал',metaKeywords:'Баримт бичгийн индек� түлхүүр үг (та�лалаар ту�гаарлагдана)',metaDescription:'Баримт бичгийн тайлбар',metaAuthor:'Зохиогч',metaCopyright:'Зохиогчийн �рх',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ms.js b/upload/public/js/3rd_party/ckeditor/lang/ms.js
new file mode 100644
index 00000000..04d6314a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ms.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ms={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Sumber',newPage:'Helaian Baru',save:'Simpan',preview:'Prebiu',cut:'Potong',copy:'Salin',paste:'Tampal',print:'Cetak',underline:'Underline',bold:'Bold',italic:'Italic',selectAll:'Pilih Semua',removeFormat:'Buang Format',strike:'Strike Through',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Masukkan Garisan Membujur',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Buang Sambungan',undo:'Batalkan',redo:'Ulangkan',common:{browseServer:'Browse Server',url:'URL',protocol:'Protokol',upload:'Muat Naik',uploadSubmit:'Hantar ke Server',image:'Gambar',flash:'Flash',form:'Borang',checkbox:'Checkbox',radio:'Butang Radio',textField:'Text Field',textarea:'Textarea',hiddenField:'Field Tersembunyi',button:'Butang',select:'Field Pilihan',imageButton:'Butang Bergambar',notSet:'<tidak di set>',id:'Id',name:'Nama',langDir:'Arah Tulisan',langDirLtr:'Kiri ke Kanan (LTR)',langDirRtl:'Kanan ke Kiri (RTL)',langCode:'Kod Bahasa',longDescr:'Butiran Panjang URL',cssClass:'Kelas-kelas Stylesheet',advisoryTitle:'Tajuk Makluman',cssStyle:'Stail',ok:'OK',cancel:'Batal',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Advanced',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Lebar',height:'Tinggi',align:'Jajaran',alignLeft:'Kiri',alignRight:'Kanan',alignCenter:'Tengah',alignTop:'Atas',alignMiddle:'Pertengahan',alignBottom:'Bawah',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Masukkan Huruf Istimewa',title:'Sila pilih huruf istimewa',options:'Special Character Options'},link:{toolbar:'Masukkan/Sunting Sambungan',other:'<lain>',menu:'Sunting Sambungan',title:'Sambungan',info:'Butiran Sambungan',target:'Sasaran',upload:'Muat Naik',advanced:'Advanced',type:'Jenis Sambungan',toUrl:'URL',toAnchor:'Pautan dalam muka surat ini',toEmail:'E-Mail',targetFrame:'<bingkai>',targetPopup:'<tetingkap popup>',targetFrameName:'Nama Bingkai Sasaran',targetPopupName:'Nama Tetingkap Popup',popupFeatures:'Ciri Tetingkap Popup',popupResizable:'Resizable',popupStatusBar:'Bar Status',popupLocationBar:'Bar Lokasi',popupToolbar:'Toolbar',popupMenuBar:'Bar Menu',popupFullScreen:'Skrin Penuh (IE)',popupScrollBars:'Bar-bar skrol',popupDependent:'Bergantungan (Netscape)',popupLeft:'Posisi Kiri',popupTop:'Posisi Atas',id:'Id',langDir:'Arah Tulisan',langDirLTR:'Kiri ke Kanan (LTR)',langDirRTL:'Kanan ke Kiri (RTL)',acccessKey:'Kunci Akses',name:'Nama',langCode:'Arah Tulisan',tabIndex:'Indeks Tab ',advisoryTitle:'Tajuk Makluman',advisoryContentType:'Jenis Kandungan Makluman',cssClasses:'Kelas-kelas Stylesheet',charset:'Linked Resource Charset',styles:'Stail',rel:'Relationship',selectAnchor:'Sila pilih pautan',anchorName:'dengan menggunakan nama pautan',anchorId:'dengan menggunakan ID elemen',emailAddress:'Alamat E-Mail',emailSubject:'Subjek Mesej',emailBody:'Isi Kandungan Mesej',noAnchors:'(Tiada pautan terdapat dalam dokumen ini)',noUrl:'Sila taip sambungan URL',noEmail:'Sila taip alamat e-mail'},anchor:{toolbar:'Masukkan/Sunting Pautan',menu:'Ciri-ciri Pautan',title:'Ciri-ciri Pautan',name:'Nama Pautan',errorName:'Sila taip nama pautan',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Cari',replace:'Ganti',findWhat:'Perkataan yang dicari:',replaceWith:'Diganti dengan:',notFoundMsg:'Text yang dicari tidak dijumpai.',findOptions:'Find Options',matchCase:'Padanan case huruf',matchWord:'Padana Keseluruhan perkataan',matchCyclic:'Match cyclic',replaceAll:'Ganti semua',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Jadual',title:'Ciri-ciri Jadual',menu:'Ciri-ciri Jadual',deleteTable:'Delete Table',rows:'Barisan',columns:'Jaluran',border:'Saiz Border',widthPx:'piksel-piksel',widthPc:'peratus',widthUnit:'width unit',cellSpace:'Ruangan Antara Sel',cellPad:'Tambahan Ruang Sel',caption:'Keterangan',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Buangkan Sel-sel',merge:'Cantumkan Sel-sel',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Buangkan Baris'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Buangkan Lajur'}},button:{title:'Ciri-ciri Butang',text:'Teks (Nilai)',type:'Jenis',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Ciri-ciri Checkbox',radioTitle:'Ciri-ciri Butang Radio',value:'Nilai',selected:'Dipilih'},form:{title:'Ciri-ciri Borang',menu:'Ciri-ciri Borang',action:'Tindakan borang',method:'Cara borang dihantar',encoding:'Encoding'},select:{title:'Ciri-ciri Selection Field',selectInfo:'Select Info',opAvail:'Pilihan sediada',value:'Nilai',size:'Saiz',lines:'garisan',chkMulti:'Benarkan pilihan pelbagai',opText:'Teks',opValue:'Nilai',btnAdd:'Tambah Pilihan',btnModify:'Ubah Pilihan',btnUp:'Naik ke atas',btnDown:'Turun ke bawah',btnSetValue:'Set sebagai nilai terpilih',btnDelete:'Padam'},textarea:{title:'Ciri-ciri Textarea',cols:'Lajur',rows:'Baris'},textfield:{title:'Ciri-ciri Text Field',name:'Nama',value:'Nilai',charWidth:'Lebar isian',maxChars:'Isian Maksimum',type:'Jenis',typeText:'Teks',typePass:'Kata Laluan'},hidden:{title:'Ciri-ciri Field Tersembunyi',name:'Nama',value:'Nilai'},image:{title:'Ciri-ciri Imej',titleButton:'Ciri-ciri Butang Bergambar',menu:'Ciri-ciri Imej',infoTab:'Info Imej',btnUpload:'Hantar ke Server',upload:'Muat Naik',alt:'Text Alternatif',lockRatio:'Tetapkan Nisbah',resetSize:'Saiz Set Semula',border:'Border',hSpace:'Ruang Melintang',vSpace:'Ruang Menegak',alertUrl:'Sila taip URL untuk fail gambar',linkTab:'Sambungan',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash Properties',propertiesTab:'Properties',title:'Flash Properties',chkPlay:'Auto Play',chkLoop:'Loop',chkMenu:'Enable Flash Menu',chkFull:'Allow Fullscreen',scale:'Scale',scaleAll:'Show all',scaleNoBorder:'No Border',scaleFit:'Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Bawah Mutlak',alignAbsMiddle:'Pertengahan Mutlak',alignBaseline:'Garis Dasar',alignTextTop:'Atas Text',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Warna Latarbelakang',hSpace:'Ruang Melintang',vSpace:'Ruang Menegak',validateSrc:'Sila taip sambungan URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Semak Ejaan',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Tidak terdapat didalam kamus',changeTo:'Tukarkan kepada',btnIgnore:'Biar',btnIgnoreAll:'Biarkan semua',btnReplace:'Ganti',btnReplaceAll:'Gantikan Semua',btnUndo:'Batalkan',noSuggestions:'- Tiada cadangan -',progress:'Pemeriksaan ejaan sedang diproses...',noMispell:'Pemeriksaan ejaan siap: Tiada salah ejaan',noChanges:'Pemeriksaan ejaan siap: Tiada perkataan diubah',oneChange:'Pemeriksaan ejaan siap: Satu perkataan telah diubah',manyChanges:'Pemeriksaan ejaan siap: %1 perkataan diubah',ieSpellDownload:'Pemeriksa ejaan tidak dipasang. Adakah anda mahu muat turun sekarang?'},smiley:{toolbar:'Smiley',title:'Masukkan Smiley',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Senarai bernombor',bulletedlist:'Senarai tidak bernombor',indent:'Tambahkan Inden',outdent:'Kurangkan Inden',justify:{left:'Jajaran Kiri',center:'Jajaran Tengah',right:'Jajaran Kanan',block:'Jajaran Blok'},blockquote:'Block Quote',clipboard:{title:'Tampal',cutError:'Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).',copyError:'Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).',pasteMsg:'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Tampal dari Word',title:'Tampal dari Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Tampal sebagai text biasa',title:'Tampal sebagai text biasa'},templates:{button:'Templat',title:'Templat Kandungan',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):',emptyListMsg:'(Tiada Templat Disimpan)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stail',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Telah Diformat',tag_address:'Alamat',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Perenggan (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Saiz',voiceLabel:'Font Size',panelTitle:'Saiz'},colorButton:{textColorTitle:'Warna Text',bgColorTitle:'Warna Latarbelakang',panelTitle:'Colors',auto:'Otomatik',more:'Warna lain-lain...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Ciri-ciri dokumen',title:'Ciri-ciri dokumen',design:'Design',meta:'Data Meta',chooseColor:'Choose',other:'<lain>',docTitle:'Tajuk Muka Surat',charset:'Enkod Set Huruf',charsetOther:'Enkod Set Huruf yang Lain',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Jenis Kepala Dokumen',docTypeOther:'Jenis Kepala Dokumen yang Lain',xhtmlDec:'Masukkan pemula kod XHTML',bgColor:'Warna Latarbelakang',bgImage:'URL Gambar Latarbelakang',bgFixed:'Imej Latarbelakang tanpa Skrol',txtColor:'Warna Text',margin:'Margin Muka Surat',marginTop:'Atas',marginLeft:'Kiri',marginRight:'Kanan',marginBottom:'Bawah',metaKeywords:'Kata Kunci Indeks Dokumen (dipisahkan oleh koma)',metaDescription:'Keterangan Dokumen',metaAuthor:'Penulis',metaCopyright:'Hakcipta',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/nb.js b/upload/public/js/3rd_party/ckeditor/lang/nb.js
new file mode 100644
index 00000000..e567503c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/nb.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.nb={dir:'ltr',editorTitle:'Rikteksteditor, %1, trykk ALT 0 for hjelp.',toolbars:'Verktøylinjer for editor',editor:'Rikteksteditor',source:'Kilde',newPage:'Ny side',save:'Lagre',preview:'Forhåndsvis',cut:'Klipp ut',copy:'Kopier',paste:'Lim inn',print:'Skriv ut',underline:'Understreking',bold:'Fet',italic:'Kursiv',selectAll:'Merk alt',removeFormat:'Fjern formatering',strike:'Gjennomstreking',subscript:'Senket skrift',superscript:'Hevet skrift',horizontalrule:'Sett inn horisontal linje',pagebreak:'Sett inn sideskift for utskrift',pagebreakAlt:'Sideskift',unlink:'Fjern lenke',undo:'Angre',redo:'Gjør om',common:{browseServer:'Bla igjennom server',url:'URL',protocol:'Protokoll',upload:'Last opp',uploadSubmit:'Send det til serveren',image:'Bilde',flash:'Flash',form:'Skjema',checkbox:'Avmerkingsboks',radio:'Alternativknapp',textField:'Tekstboks',textarea:'Tekstområde',hiddenField:'Skjult felt',button:'Knapp',select:'Rullegardinliste',imageButton:'Bildeknapp',notSet:'<ikke satt>',id:'Id',name:'Navn',langDir:'Språkretning',langDirLtr:'Venstre til høyre (VTH)',langDirRtl:'Høyre til venstre (HTV)',langCode:'Språkkode',longDescr:'Utvidet beskrivelse',cssClass:'Stilarkklasser',advisoryTitle:'Tittel',cssStyle:'Stil',ok:'OK',cancel:'Avbryt',close:'Lukk',preview:'Forhåndsvis',generalTab:'Generelt',advancedTab:'Avansert',validateNumberFailed:'Denne verdien er ikke et tall.',confirmNewPage:'Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?',confirmCancel:'Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?',options:'Valg',target:'Mål',targetNew:'Nytt vindu (_blank)',targetTop:'Hele vindu (_top)',targetSelf:'Samme vindu (_self)',targetParent:'Foreldrevindu (_parent)',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',styles:'Stil',cssClasses:'Stilarkklasser',width:'Bredde',height:'Høyde',align:'Juster',alignLeft:'Venstre',alignRight:'Høyre',alignCenter:'Midtjuster',alignTop:'Topp',alignMiddle:'Midten',alignBottom:'Bunn',invalidHeight:'Høyde må være et tall.',invalidWidth:'Bredde må være et tall.',invalidCssLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).',invalidHtmlLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).',invalidInlineStyle:'Verdi angitt for inline stil må bestå av en eller flere sett med formatet "navn : verdi", separert med semikolon',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, utilgjenglig</span>'},contextmenu:{options:'Alternativer for høyreklikkmeny'},specialChar:{toolbar:'Sett inn spesialtegn',title:'Velg spesialtegn',options:'Alternativer for spesialtegn'},link:{toolbar:'Sett inn/Rediger lenke',other:'<annen>',menu:'Rediger lenke',title:'Lenke',info:'Lenkeinfo',target:'Mål',upload:'Last opp',advanced:'Avansert',type:'Lenketype',toUrl:'URL',toAnchor:'Lenke til anker i teksten',toEmail:'E-post',targetFrame:'<ramme>',targetPopup:'<popup-vindu>',targetFrameName:'Målramme',targetPopupName:'Navn på popup-vindu',popupFeatures:'Egenskaper for popup-vindu',popupResizable:'Skalerbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Verktøylinje',popupMenuBar:'Menylinje',popupFullScreen:'Fullskjerm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Avhenging (Netscape)',popupLeft:'Venstre posisjon',popupTop:'Topp-posisjon',id:'Id',langDir:'Språkretning',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',acccessKey:'Aksessknapp',name:'Navn',langCode:'Språkkode',tabIndex:'Tabindeks',advisoryTitle:'Tittel',advisoryContentType:'Type',cssClasses:'Stilarkklasser',charset:'Lenket tegnsett',styles:'Stil',rel:'Relasjon (rel)',selectAnchor:'Velg et anker',anchorName:'Anker etter navn',anchorId:'Element etter ID',emailAddress:'E-postadresse',emailSubject:'Meldingsemne',emailBody:'Melding',noAnchors:'(Ingen anker i dokumentet)',noUrl:'Vennligst skriv inn lenkens URL',noEmail:'Vennligst skriv inn e-postadressen'},anchor:{toolbar:'Sett inn/Rediger anker',menu:'Egenskaper for anker',title:'Egenskaper for anker',name:'Ankernavn',errorName:'Vennligst skriv inn ankernavnet',remove:'Fjern anker'},list:{numberedTitle:'Egenskaper for nummerert liste',bulletedTitle:'Egenskaper for punktmerket liste',type:'Type',start:'Start',validateStartNumber:'Starten på listen må være et heltall.',circle:'Sirkel',disc:'Disk',square:'Firkant',none:'Ingen',notset:'<ikke satt>',armenian:'Armensk nummerering',georgian:'Georgisk nummerering (an, ban, gan, osv.)',lowerRoman:'Romertall, små (i, ii, iii, iv, v, osv.)',upperRoman:'Romertall, store (I, II, III, IV, V, osv.)',lowerAlpha:'Alfabetisk, små (a, b, c, d, e, osv.)',upperAlpha:'Alfabetisk, store (A, B, C, D, E, osv.)',lowerGreek:'Gresk, små (alpha, beta, gamma, osv.)',decimal:'Tall (1, 2, 3, osv.)',decimalLeadingZero:'Tall, med førstesiffer null (01, 02, 03, osv.)'},findAndReplace:{title:'Søk og erstatt',find:'Søk',replace:'Erstatt',findWhat:'Søk etter:',replaceWith:'Erstatt med:',notFoundMsg:'Fant ikke søketeksten.',findOptions:'Søkealternativer',matchCase:'Skill mellom store og små bokstaver',matchWord:'Bare hele ord',matchCyclic:'Søk i hele dokumentet',replaceAll:'Erstatt alle',replaceSuccessMsg:'%1 tilfelle(r) erstattet.'},table:{toolbar:'Tabell',title:'Egenskaper for tabell',menu:'Egenskaper for tabell',deleteTable:'Slett tabell',rows:'Rader',columns:'Kolonner',border:'Rammestørrelse',widthPx:'piksler',widthPc:'prosent',widthUnit:'Bredde-enhet',cellSpace:'Cellemarg',cellPad:'Cellepolstring',caption:'Tittel',summary:'Sammendrag',headers:'Overskrifter',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første rad',headersBoth:'Begge',invalidRows:'Antall rader må være et tall større enn 0.',invalidCols:'Antall kolonner må være et tall større enn 0.',invalidBorder:'Rammestørrelse må være et tall.',invalidWidth:'Tabellbredde må være et tall.',invalidHeight:'Tabellhøyde må være et tall.',invalidCellSpacing:'Cellemarg må være et positivt tall.',invalidCellPadding:'Cellepolstring må være et positivt tall.',cell:{menu:'Celle',insertBefore:'Sett inn celle før',insertAfter:'Sett inn celle etter',deleteCell:'Slett celler',merge:'Slå sammen celler',mergeRight:'Slå sammen høyre',mergeDown:'Slå sammen ned',splitHorizontal:'Del celle horisontalt',splitVertical:'Del celle vertikalt',title:'Celleegenskaper',cellType:'Celletype',rowSpan:'Radspenn',colSpan:'Kolonnespenn',wordWrap:'Tekstbrytning',hAlign:'Horisontal justering',vAlign:'Vertikal justering',alignBaseline:'Grunnlinje',bgColor:'Bakgrunnsfarge',borderColor:'Rammefarge',data:'Data',header:'Overskrift',yes:'Ja',no:'Nei',invalidWidth:'Cellebredde må være et tall.',invalidHeight:'Cellehøyde må være et tall.',invalidRowSpan:'Radspenn må være et heltall.',invalidColSpan:'Kolonnespenn må være et heltall.',chooseColor:'Velg'},row:{menu:'Rader',insertBefore:'Sett inn rad før',insertAfter:'Sett inn rad etter',deleteRow:'Slett rader'},column:{menu:'Kolonne',insertBefore:'Sett inn kolonne før',insertAfter:'Sett inn kolonne etter',deleteColumn:'Slett kolonner'}},button:{title:'Egenskaper for knapp',text:'Tekst (verdi)',type:'Type',typeBtn:'Knapp',typeSbm:'Send',typeRst:'Nullstill'},checkboxAndRadio:{checkboxTitle:'Egenskaper for avmerkingsboks',radioTitle:'Egenskaper for alternativknapp',value:'Verdi',selected:'Valgt'},form:{title:'Egenskaper for skjema',menu:'Egenskaper for skjema',action:'Handling',method:'Metode',encoding:'Encoding'},select:{title:'Egenskaper for rullegardinliste',selectInfo:'Info',opAvail:'Tilgjenglige alternativer',value:'Verdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillat flervalg',opText:'Tekst',opValue:'Verdi',btnAdd:'Legg til',btnModify:'Endre',btnUp:'Opp',btnDown:'Ned',btnSetValue:'Sett som valgt',btnDelete:'Slett'},textarea:{title:'Egenskaper for tekstområde',cols:'Kolonner',rows:'Rader'},textfield:{title:'Egenskaper for tekstfelt',name:'Navn',value:'Verdi',charWidth:'Tegnbredde',maxChars:'Maks antall tegn',type:'Type',typeText:'Tekst',typePass:'Passord'},hidden:{title:'Egenskaper for skjult felt',name:'Navn',value:'Verdi'},image:{title:'Bildeegenskaper',titleButton:'Egenskaper for bildeknapp',menu:'Bildeegenskaper',infoTab:'Bildeinformasjon',btnUpload:'Send det til serveren',upload:'Last opp',alt:'Alternativ tekst',lockRatio:'Lås forhold',resetSize:'Tilbakestill størrelse',border:'Ramme',hSpace:'HMarg',vSpace:'VMarg',alertUrl:'Vennligst skriv bilde-urlen',linkTab:'Lenke',button2Img:'Vil du endre den valgte bildeknappen til et vanlig bilde?',img2Button:'Vil du endre det valgte bildet til en bildeknapp?',urlMissing:'Bildets adresse mangler.',validateBorder:'Ramme må være et heltall.',validateHSpace:'HMarg må være et heltall.',validateVSpace:'VMarg må være et heltall.'},flash:{properties:'Egenskaper for Flash-objekt',propertiesTab:'Egenskaper',title:'Flash-egenskaper',chkPlay:'Autospill',chkLoop:'Loop',chkMenu:'Slå på Flash-meny',chkFull:'Tillat fullskjerm',scale:'Skaler',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Skaler til å passe',access:'Scripttilgang',accessAlways:'Alltid',accessSameDomain:'Samme domene',accessNever:'Aldri',alignAbsBottom:'Abs bunn',alignAbsMiddle:'Abs midten',alignBaseline:'Bunnlinje',alignTextTop:'Tekst topp',quality:'Kvalitet',qualityBest:'Best',qualityHigh:'Høy',qualityAutoHigh:'Auto høy',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindu',windowModeOpaque:'Opaque',windowModeTransparent:'Gjennomsiktig',windowMode:'Vindumodus',flashvars:'Variabler for flash',bgcolor:'Bakgrunnsfarge',hSpace:'HMarg',vSpace:'VMarg',validateSrc:'Vennligst skriv inn lenkens url.',validateHSpace:'HMarg må være et tall.',validateVSpace:'VMarg må være et tall.'},spellCheck:{toolbar:'Stavekontroll',title:'Stavekontroll',notAvailable:'Beklager, tjenesten er utilgjenglig nå.',errorLoading:'Feil under lasting av applikasjonstjenestetjener: %s.',notInDic:'Ikke i ordboken',changeTo:'Endre til',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer alle',btnReplace:'Erstatt',btnReplaceAll:'Erstatt alle',btnUndo:'Angre',noSuggestions:'- Ingen forslag -',progress:'Stavekontroll pågår...',noMispell:'Stavekontroll fullført: ingen feilstavinger funnet',noChanges:'Stavekontroll fullført: ingen ord endret',oneChange:'Stavekontroll fullført: Ett ord endret',manyChanges:'Stavekontroll fullført: %1 ord endret',ieSpellDownload:'Stavekontroll er ikke installert. Vil du laste den ned nå?'},smiley:{toolbar:'Smil',title:'Sett inn smil',options:'Alternativer for smil'},elementsPath:{eleLabel:'Element-sti',eleTitle:'%1 element'},numberedlist:'Legg til/Fjern nummerert liste',bulletedlist:'Legg til/Fjern punktmerket liste',indent:'Øk innrykk',outdent:'Reduser innrykk',justify:{left:'Venstrejuster',center:'Midtstill',right:'Høyrejuster',block:'Blokkjuster'},blockquote:'Sitatblokk',clipboard:{title:'Lim inn',cutError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk klipping av tekst. Vennligst bruk snareveien (Ctrl/Cmd+X).',copyError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snareveien (Ctrl/Cmd+C).',pasteMsg:'Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.',securityMsg:'Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.',pasteArea:'Innlimingsområde'},pastefromword:{confirmCleanup:'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?',toolbar:'Lim inn fra Word',title:'Lim inn fra Word',error:'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil'},pasteText:{button:'Lim inn som ren tekst',title:'Lim inn som ren tekst'},templates:{button:'Maler',title:'Innholdsmaler',options:'Alternativer for mal',insertOption:'Erstatt gjeldende innhold',selectPromptMsg:'Velg malen du vil åpne i redigeringsverktøyet:',emptyListMsg:'(Ingen maler definert)'},showBlocks:'Vis blokker',stylesCombo:{label:'Stil',panelTitle:'Stilformater',panelTitle1:'Blokkstiler',panelTitle2:'Inlinestiler',panelTitle3:'Objektstiler'},format:{label:'Format',panelTitle:'Avsnittsformat',tag_p:'Normal',tag_pre:'Formatert',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Sett inn Div Container',toolbar:'Sett inn Div Container',cssClassInputLabel:'Stilark-klasser',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkode',inlineStyleInputLabel:'Inlinestiler',advisoryTitleInputLabel:'Tittel',langDirLabel:'Språkretning',langDirLTRLabel:'Venstre til høyre (VTH)',langDirRTLLabel:'Høyre til venstre (HTV)',edit:'Rediger Div',remove:'Fjern Div'},iframe:{title:'Egenskaper for IFrame',toolbar:'IFrame',noUrl:'Vennligst skriv inn URL for iframe',scrolling:'Aktiver scrollefelt',border:'Viss ramme rundt iframe'},font:{label:'Skrift',voiceLabel:'Font',panelTitle:'Skrift'},fontSize:{label:'Størrelse',voiceLabel:'Font Størrelse',panelTitle:'Størrelse'},colorButton:{textColorTitle:'Tekstfarge',bgColorTitle:'Bakgrunnsfarge',panelTitle:'Farger',auto:'Automatisk',more:'Flere farger...'},colors:{'000':'Svart',800000:'Rødbrun','8B4513':'Salbrun','2F4F4F':'Grønnsvart','008080':'Blågrønn','000080':'Marineblått','4B0082':'Indigo',696969:'Mørk grå',B22222:'Mørkerød',A52A2A:'Brun',DAA520:'Lys brun','006400':'Mørk grønn','40E0D0':'Turkis','0000CD':'Medium blå',800080:'Purpur',808080:'Grå',F00:'Rød',FF8C00:'Mørk oransje',FFD700:'Gull','008000':'Grønn','0FF':'Cyan','00F':'Blå',EE82EE:'Fiolett',A9A9A9:'Svak grå',FFA07A:'Rosa-oransje',FFA500:'Oransje',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Svak turkis',ADD8E6:'Lys Blå',DDA0DD:'Plomme',D3D3D3:'Lys grå',FFF0F5:'Svak lavendelrosa',FAEBD7:'Antikk-hvit',FFFFE0:'Lys gul',F0FFF0:'Honningmelon',F0FFFF:'Svakt asurblått',F0F8FF:'Svak cyan',E6E6FA:'Lavendel',FFF:'Hvit'},scayt:{title:'Stavekontroll mens du skriver',opera_title:'Ikke støttet av Opera',enable:'Slå på SCAYT',disable:'Slå av SCAYT',about:'Om SCAYT',toggle:'Veksle SCAYT',options:'Valg',langs:'Språk',moreSuggestions:'Flere forslag',ignore:'Ignorer',ignoreAll:'Ignorer Alle',addWord:'Legg til ord',emptyDic:'Ordboknavn bør ikke være tom.',optionsTab:'Valg',allCaps:'Ikke kontroller ord med kun store bokstaver',ignoreDomainNames:'Ikke kontroller domenenavn',mixedCase:'Ikke kontroller ord med blandet små og store bokstaver',mixedWithDigits:'Ikke kontroller ord som inneholder tall',languagesTab:'Språk',dictionariesTab:'Ordbøker',dic_field_name:'Ordboknavn',dic_create:'Opprett',dic_restore:'Gjenopprett',dic_delete:'Slett',dic_rename:'Gi nytt navn',dic_info:'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Se $1 for hjelp.',userGuide:'CKEditors brukerveiledning',moreInfo:'For lisensieringsinformasjon, vennligst besøk vårt nettsted:',copy:'Copyright &copy; $1. Alle rettigheter reservert.'},maximize:'Maksimer',minimize:'Minimer',fakeobjects:{anchor:'Anker',flash:'Flash-animasjon',iframe:'IFrame',hiddenfield:'Skjult felt',unknown:'Ukjent objekt'},resize:'Dra for å skalere',colordialog:{title:'Velg farge',options:'Alternativer for farge',highlight:'Merk',selected:'Valgt',clear:'Tøm'},toolbarCollapse:'Skjul verktøylinje',toolbarExpand:'Vis verktøylinje',toolbarGroups:{document:'Dokument',clipboard:'Utklippstavle/Angre',editing:'Redigering',forms:'Skjema',basicstyles:'Basisstiler',paragraph:'Avsnitt',links:'Lenker',insert:'Innsetting',styles:'Stiler',colors:'Farger',tools:'Verktøy'},bidi:{ltr:'Tekstretning fra venstre til høyre',rtl:'Tekstretning fra høyre til venstre'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Meta-data',chooseColor:'Velg',other:'<annen>',docTitle:'Sidetittel',charset:'Tegnsett',charsetOther:'Annet tegnsett',charsetASCII:'ASCII',charsetCE:'Sentraleuropeisk',charsetCT:'Tradisonell kinesisk(Big5)',charsetCR:'Kyrillisk',charsetGR:'Gresk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropeisk',docType:'Dokumenttype header',docTypeOther:'Annet dokumenttype header',xhtmlDec:'Inkluder XHTML-deklarasjon',bgColor:'Bakgrunnsfarge',bgImage:'URL for bakgrunnsbilde',bgFixed:'Lås bakgrunnsbilde',txtColor:'Tekstfarge',margin:'Sidemargin',marginTop:'Topp',marginLeft:'Venstre',marginRight:'Høyre',marginBottom:'Bunn',metaKeywords:'Dokument nøkkelord (kommaseparert)',metaDescription:'Dokumentbeskrivelse',metaAuthor:'Forfatter',metaCopyright:'Kopirett',previewHtml:'<p>Dette er en <strong>eksempeltekst</strong>. Du bruker <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/nl.js b/upload/public/js/3rd_party/ckeditor/lang/nl.js
new file mode 100644
index 00000000..b2a4a3a7
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/nl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.nl={dir:'ltr',editorTitle:'Tekstverwerker, %1, druk op ALT 0 voor hulp.',toolbars:'Werkbalken',editor:'Tekstverwerker',source:'Code',newPage:'Nieuwe pagina',save:'Opslaan',preview:'Voorbeeld',cut:'Knippen',copy:'Kopiëren',paste:'Plakken',print:'Printen',underline:'Onderstreept',bold:'Vet',italic:'Schuingedrukt',selectAll:'Alles selecteren',removeFormat:'Opmaak verwijderen',strike:'Doorhalen',subscript:'Subscript',superscript:'Superscript',horizontalrule:'Horizontale lijn invoegen',pagebreak:'Pagina-einde invoegen',pagebreakAlt:'Pagina-einde',unlink:'Link verwijderen',undo:'Ongedaan maken',redo:'Opnieuw uitvoeren',common:{browseServer:'Bladeren op server',url:'URL',protocol:'Protocol',upload:'Upload',uploadSubmit:'Naar server verzenden',image:'Afbeelding',flash:'Flash',form:'Formulier',checkbox:'Aanvinkvakje',radio:'Selectievakje',textField:'Tekstveld',textarea:'Tekstvak',hiddenField:'Verborgen veld',button:'Knop',select:'Selectieveld',imageButton:'Afbeeldingsknop',notSet:'<niet ingevuld>',id:'Kenmerk',name:'Naam',langDir:'Schrijfrichting',langDirLtr:'Links naar rechts (LTR)',langDirRtl:'Rechts naar links (RTL)',langCode:'Taalcode',longDescr:'Lange URL-omschrijving',cssClass:'Stylesheet-klassen',advisoryTitle:'Aanbevolen titel',cssStyle:'Stijl',ok:'OK',cancel:'Annuleren',close:'Sluiten',preview:'Voorbeeld',generalTab:'Algemeen',advancedTab:'Geavanceerd',validateNumberFailed:'Deze waarde is geen geldig getal.',confirmNewPage:'Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?',confirmCancel:'Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?',options:'Opties',target:'Doel',targetNew:'Nieuw venster (_blank)',targetTop:'Hele venster (_top)',targetSelf:'Zelfde venster (_self)',targetParent:'Origineel venster (_parent)',langDirLTR:'Links naar rechts (LTR)',langDirRTL:'Rechts naar links (RTL)',styles:'Stijlen',cssClasses:'Stylesheet klassen',width:'Breedte',height:'Hoogte',align:'Uitlijning',alignLeft:'Links',alignRight:'Rechts',alignCenter:'Centreren',alignTop:'Boven',alignMiddle:'Midden',alignBottom:'Beneden',invalidHeight:'De hoogte moet een getal zijn.',invalidWidth:'De breedte moet een getal zijn.',invalidCssLength:'Waarde in veld "%1" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).',invalidHtmlLength:'Waarde in veld "%1" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).',invalidInlineStyle:'Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat "naam : waarde", gescheiden door puntkomma\'s.',cssLengthTooltip:'Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).',unavailable:'%1<span class="cke_accessibility">, niet beschikbaar</span>'},contextmenu:{options:'Context menu opties'},specialChar:{toolbar:'Speciaal teken invoegen',title:'Selecteer speciaal teken',options:'Speciale tekens opties'},link:{toolbar:'Link invoegen/wijzigen',other:'<ander>',menu:'Link wijzigen',title:'Link',info:'Linkomschrijving',target:'Doel',upload:'Upload',advanced:'Geavanceerd',type:'Linktype',toUrl:'URL',toAnchor:'Interne link in pagina',toEmail:'E-mail',targetFrame:'<frame>',targetPopup:'<popup window>',targetFrameName:'Naam doelframe',targetPopupName:'Naam popupvenster',popupFeatures:'Instellingen popupvenster',popupResizable:'Herschaalbaar',popupStatusBar:'Statusbalk',popupLocationBar:'Locatiemenu',popupToolbar:'Menubalk',popupMenuBar:'Menubalk',popupFullScreen:'Volledig scherm (IE)',popupScrollBars:'Schuifbalken',popupDependent:'Afhankelijk (Netscape)',popupLeft:'Positie links',popupTop:'Positie boven',id:'Id',langDir:'Schrijfrichting',langDirLTR:'Links naar rechts (LTR)',langDirRTL:'Rechts naar links (RTL)',acccessKey:'Toegangstoets',name:'Naam',langCode:'Schrijfrichting',tabIndex:'Tabvolgorde',advisoryTitle:'Aanbevolen titel',advisoryContentType:'Aanbevolen content-type',cssClasses:'Stylesheet-klassen',charset:'Karakterset van gelinkte bron',styles:'Stijl',rel:'Relatie',selectAnchor:'Kies een interne link',anchorName:'Op naam interne link',anchorId:'Op kenmerk interne link',emailAddress:'E-mailadres',emailSubject:'Onderwerp bericht',emailBody:'Inhoud bericht',noAnchors:'(Geen interne links in document gevonden)',noUrl:'Geef de link van de URL',noEmail:'Geef een e-mailadres'},anchor:{toolbar:'Interne link',menu:'Eigenschappen interne link',title:'Eigenschappen interne link',name:'Naam interne link',errorName:'Geef de naam van de interne link op',remove:'Interne link verwijderen'},list:{numberedTitle:'Eigenschappen genummerde lijst',bulletedTitle:'Eigenschappen lijst met opsommingstekens',type:'Type',start:'Start',validateStartNumber:'Starnummer van de lijst moet een heel nummer zijn.',circle:'Cirkel',disc:'Schijf',square:'Vierkant',none:'Geen',notset:'<niet gezet>',armenian:'Armeense numering',georgian:'Greorgische numering (an, ban, gan, etc.)',lowerRoman:'Romeins kleine letters (i, ii, iii, iv, v, etc.)',upperRoman:'Romeins hoofdletters (I, II, III, IV, V, etc.)',lowerAlpha:'Kleine letters (a, b, c, d, e, etc.)',upperAlpha:'Hoofdletters (A, B, C, D, E, etc.)',lowerGreek:'Grieks kleine letters (alpha, beta, gamma, etc.)',decimal:'Cijfers (1, 2, 3, etc.)',decimalLeadingZero:'Cijfers beginnen met nul (01, 02, 03, etc.)'},findAndReplace:{title:'Zoeken en vervangen',find:'Zoeken',replace:'Vervangen',findWhat:'Zoeken naar:',replaceWith:'Vervangen met:',notFoundMsg:'De opgegeven tekst is niet gevonden.',findOptions:'Zoekopties',matchCase:'Hoofdlettergevoelig',matchWord:'Hele woord moet voorkomen',matchCyclic:'Doorlopend zoeken',replaceAll:'Alles vervangen',replaceSuccessMsg:'%1 resulaten vervangen.'},table:{toolbar:'Tabel',title:'Eigenschappen tabel',menu:'Eigenschappen tabel',deleteTable:'Tabel verwijderen',rows:'Rijen',columns:'Kolommen',border:'Breedte rand',widthPx:'pixels',widthPc:'procent',widthUnit:'eenheid breedte',cellSpace:'Afstand tussen cellen',cellPad:'Ruimte in de cel',caption:'Naam',summary:'Samenvatting',headers:'Koppen',headersNone:'Geen',headersColumn:'Eerste kolom',headersRow:'Eerste rij',headersBoth:'Beide',invalidRows:'Het aantal rijen moet een getal zijn groter dan 0.',invalidCols:'Het aantal kolommen moet een getal zijn groter dan 0.',invalidBorder:'De rand breedte moet een getal zijn.',invalidWidth:'De tabel breedte moet een getal zijn.',invalidHeight:'De tabel hoogte moet een getal zijn.',invalidCellSpacing:'Afstand tussen cellen moet een getal zijn.',invalidCellPadding:'Ruimte in de cel moet een getal zijn.',cell:{menu:'Cel',insertBefore:'Voeg cel in voor',insertAfter:'Voeg cel in achter',deleteCell:'Cellen verwijderen',merge:'Cellen samenvoegen',mergeRight:'Voeg samen naar rechts',mergeDown:'Voeg samen naar beneden',splitHorizontal:'Splits cellen horizontaal',splitVertical:'Splits cellen verticaal',title:'Cel eigenschappen',cellType:'Cel type',rowSpan:'Rijen samenvoegen',colSpan:'Kolommen samenvoegen',wordWrap:'Automatische terugloop',hAlign:'Horizontale uitlijning',vAlign:'Verticale uitlijning',alignBaseline:'Basislijn',bgColor:'Achtergrondkleur',borderColor:'Kleur rand',data:'Inhoud',header:'Kop',yes:'Ja',no:'Nee',invalidWidth:'De celbreedte moet een getal zijn.',invalidHeight:'De celhoogte moet een getal zijn.',invalidRowSpan:'Rijen samenvoegen moet een heel getal zijn.',invalidColSpan:'Kolommen samenvoegen moet een heel getal zijn.',chooseColor:'Kies'},row:{menu:'Rij',insertBefore:'Voeg rij in voor',insertAfter:'Voeg rij in achter',deleteRow:'Rijen verwijderen'},column:{menu:'Kolom',insertBefore:'Voeg kolom in voor',insertAfter:'Voeg kolom in achter',deleteColumn:'Kolommen verwijderen'}},button:{title:'Eigenschappen knop',text:'Tekst (waarde)',type:'Soort',typeBtn:'Knop',typeSbm:'Versturen',typeRst:'Leegmaken'},checkboxAndRadio:{checkboxTitle:'Eigenschappen aanvinkvakje',radioTitle:'Eigenschappen selectievakje',value:'Waarde',selected:'Geselecteerd'},form:{title:'Eigenschappen formulier',menu:'Eigenschappen formulier',action:'Actie',method:'Methode',encoding:'Codering'},select:{title:'Eigenschappen selectieveld',selectInfo:'Informatie',opAvail:'Beschikbare opties',value:'Waarde',size:'Grootte',lines:'Regels',chkMulti:'Gecombineerde selecties toestaan',opText:'Tekst',opValue:'Waarde',btnAdd:'Toevoegen',btnModify:'Wijzigen',btnUp:'Omhoog',btnDown:'Omlaag',btnSetValue:'Als geselecteerde waarde instellen',btnDelete:'Verwijderen'},textarea:{title:'Eigenschappen tekstvak',cols:'Kolommen',rows:'Rijen'},textfield:{title:'Eigenschappen tekstveld',name:'Naam',value:'Waarde',charWidth:'Breedte (tekens)',maxChars:'Maximum aantal tekens',type:'Soort',typeText:'Tekst',typePass:'Wachtwoord'},hidden:{title:'Eigenschappen verborgen veld',name:'Naam',value:'Waarde'},image:{title:'Eigenschappen afbeelding',titleButton:'Eigenschappen afbeeldingsknop',menu:'Eigenschappen afbeelding',infoTab:'Informatie afbeelding',btnUpload:'Naar server verzenden',upload:'Upload',alt:'Alternatieve tekst',lockRatio:'Afmetingen vergrendelen',resetSize:'Afmetingen resetten',border:'Rand',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Geef de URL van de afbeelding',linkTab:'Link',button2Img:'Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?',img2Button:'Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?',urlMissing:'De URL naar de afbeelding ontbreekt.',validateBorder:'Rand moet een heel nummer zijn.',validateHSpace:'HSpace moet een heel nummer zijn.',validateVSpace:'VSpace moet een heel nummer zijn.'},flash:{properties:'Eigenschappen Flash',propertiesTab:'Eigenschappen',title:'Eigenschappen Flash',chkPlay:'Automatisch afspelen',chkLoop:'Herhalen',chkMenu:"Flashmenu's inschakelen",chkFull:'Schermvullend toestaan',scale:'Schaal',scaleAll:'Alles tonen',scaleNoBorder:'Geen rand',scaleFit:'Precies passend',access:'Script toegang',accessAlways:'Altijd',accessSameDomain:'Zelfde domeinnaam',accessNever:'Nooit',alignAbsBottom:'Absoluut-onder',alignAbsMiddle:'Absoluut-midden',alignBaseline:'Basislijn',alignTextTop:'Boven tekst',quality:'Kwaliteit',qualityBest:'Beste',qualityHigh:'Hoog',qualityAutoHigh:'Automatisch hoog',qualityMedium:'Gemiddeld',qualityAutoLow:'Automatisch laag',qualityLow:'Laag',windowModeWindow:'Venster',windowModeOpaque:'Ondoorzichtig',windowModeTransparent:'Doorzichtig',windowMode:'Venster modus',flashvars:'Variabelen voor Flash',bgcolor:'Achtergrondkleur',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Geef de link van de URL',validateHSpace:'De HSpace moet een getal zijn.',validateVSpace:'De VSpace moet een getal zijn.'},spellCheck:{toolbar:'Spellingscontrole',title:'Spellingscontrole',notAvailable:'Excuses, deze dienst is momenteel niet beschikbaar.',errorLoading:'Er is een fout opgetreden bij het laden van de diesnt: %s.',notInDic:'Niet in het woordenboek',changeTo:'Wijzig in',btnIgnore:'Negeren',btnIgnoreAll:'Alles negeren',btnReplace:'Vervangen',btnReplaceAll:'Alles vervangen',btnUndo:'Ongedaan maken',noSuggestions:'-Geen suggesties-',progress:'Bezig met spellingscontrole...',noMispell:'Klaar met spellingscontrole: geen fouten gevonden',noChanges:'Klaar met spellingscontrole: geen woorden aangepast',oneChange:'Klaar met spellingscontrole: één woord aangepast',manyChanges:'Klaar met spellingscontrole: %1 woorden aangepast',ieSpellDownload:'De spellingscontrole niet geïnstalleerd. Wilt u deze nu downloaden?'},smiley:{toolbar:'Smiley',title:'Smiley invoegen',options:'Smiley opties'},elementsPath:{eleLabel:'Elementenpad',eleTitle:'%1 element'},numberedlist:'Genummerde lijst',bulletedlist:'Opsomming',indent:'Inspringen vergroten',outdent:'Inspringen verkleinen',justify:{left:'Links uitlijnen',center:'Centreren',right:'Rechts uitlijnen',block:'Uitvullen'},blockquote:'Citaatblok',clipboard:{title:'Plakken',cutError:'De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.',copyError:'De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.',pasteMsg:'Plak de tekst in het volgende vak gebruik makend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op <strong>OK</strong>.',securityMsg:'Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.',pasteArea:'Plakgebied'},pastefromword:{confirmCleanup:'De tekst die u plakte lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?',toolbar:'Plakken als Word-gegevens',title:'Plakken als Word-gegevens',error:'Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout'},pasteText:{button:'Plakken als platte tekst',title:'Plakken als platte tekst'},templates:{button:'Sjablonen',title:'Inhoud sjabonen',options:'Template opties',insertOption:'Vervang de huidige inhoud',selectPromptMsg:'Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):',emptyListMsg:'(Geen sjablonen gedefinieerd)'},showBlocks:'Toon blokken',stylesCombo:{label:'Stijl',panelTitle:'Opmaakstijlen',panelTitle1:'Blok stijlen',panelTitle2:'In-line stijlen',panelTitle3:'Object stijlen'},format:{label:'Opmaak',panelTitle:'Opmaak',tag_p:'Normaal',tag_pre:'Met opmaak',tag_address:'Adres',tag_h1:'Kop 1',tag_h2:'Kop 2',tag_h3:'Kop 3',tag_h4:'Kop 4',tag_h5:'Kop 5',tag_h6:'Kop 6',tag_div:'Normaal (DIV)'},div:{title:'Div aanmaken',toolbar:'Div aanmaken',cssClassInputLabel:'Stylesheet klassen',styleSelectLabel:'Stijl',IdInputLabel:'Id',languageCodeInputLabel:' Taalcode',inlineStyleInputLabel:'Inline stijl',advisoryTitleInputLabel:'informatieve titel',langDirLabel:'Schrijfrichting',langDirLTRLabel:'Links naar rechts (LTR)',langDirRTLLabel:'Rechts naar links (RTL)',edit:'Div wijzigen',remove:'Div verwijderen'},iframe:{title:'IFrame eigenschappen',toolbar:'IFrame',noUrl:'Geef de IFrame URL in',scrolling:'Scrollbalken inschakelen',border:'Framerand tonen'},font:{label:'Lettertype',voiceLabel:'Lettertype',panelTitle:'Lettertype'},fontSize:{label:'Lettergrootte',voiceLabel:'Lettergrootte',panelTitle:'Lettergrootte'},colorButton:{textColorTitle:'Tekstkleur',bgColorTitle:'Achtergrondkleur',panelTitle:'Kleuren',auto:'Automatisch',more:'Meer kleuren...'},colors:{'000':'Zwart',800000:'Kastanjebruin','8B4513':'Chocoladebruin','2F4F4F':'Donkerleigrijs','008080':'Blauwgroen','000080':'Marine','4B0082':'Indigo',696969:'Donkergrijs',B22222:'Baksteen',A52A2A:'Bruin',DAA520:'Donkergeel','006400':'Donkergroen','40E0D0':'Turquoise','0000CD':'Middenblauw',800080:'Paars',808080:'Grijs',F00:'Rood',FF8C00:'Donkeroranje',FFD700:'Goud','008000':'Groen','0FF':'Cyaan','00F':'Blauw',EE82EE:'Violet',A9A9A9:'Donkergrijs',FFA07A:'Lichtzalm',FFA500:'Oranje',FFFF00:'Geel','00FF00':'Felgroen',AFEEEE:'Lichtturquoise',ADD8E6:'Lichtblauw',DDA0DD:'Pruim',D3D3D3:'Lichtgrijs',FFF0F5:'Linnen',FAEBD7:'Ivoor',FFFFE0:'Lichtgeel',F0FFF0:'Honingdauw',F0FFFF:'Azuur',F0F8FF:'Licht hemelsblauw',E6E6FA:'Lavendel',FFF:'Wit'},scayt:{title:'Controleer de spelling tijdens het typen',opera_title:'Niet ondersteund door Opera',enable:'SCAYT inschakelen',disable:'SCAYT uitschakelen',about:'Over SCAYT',toggle:'SCAYT in/uitschakelen',options:'Opties',langs:'Talen',moreSuggestions:'Meer suggesties',ignore:'Negeren',ignoreAll:'Alles negeren',addWord:'Woord toevoegen',emptyDic:'De naam van het woordenboek mag niet leeg zijn.',optionsTab:'Opties',allCaps:'Negeer woorden helemaal in hoofdletters',ignoreDomainNames:'Negeer domeinnamen',mixedCase:'Negeer woorden met hoofd- en kleine letters',mixedWithDigits:'Negeer woorden met cijfers',languagesTab:'Talen',dictionariesTab:'Woordenboeken',dic_field_name:'Naam woordenboek',dic_create:'Aanmaken',dic_restore:'Terugzetten',dic_delete:'Verwijderen',dic_rename:'Hernoemen',dic_info:'Initieel wordt het gebruikerswoordenboek opgeslagen in een cookie. Cookies zijn echter beperkt in grootte. Zodra het gebruikerswoordenboek het punt bereikt waarop het niet meer in een cookie opgeslagen kan worden, dan wordt het woordenboek op de server opgeslagen. Om je persoonlijke woordenboek op je eigen server op te slaan, moet je een mapnaam opgeven. Indien je al een woordenboek hebt opgeslagen, typ dan de naam en klik op de Terugzetten knop.',aboutTab:'Over'},about:{title:'Over CKEditor',dlgTitle:'Over CKEditor',help:'Bekijk $1 voor hulp.',userGuide:'CKEditor gebruiksaanwijzing',moreInfo:'Voor licentie informatie, bezoek onze website:',copy:'Copyright &copy; $1. Alle rechten voorbehouden.'},maximize:'Maximaliseren',minimize:'Minimaliseren',fakeobjects:{anchor:'Anker',flash:'Flash animatie',iframe:'IFrame',hiddenfield:'Verborgen veld',unknown:'Onbekend object'},resize:'Sleep om te herschalen',colordialog:{title:'Selecteer kleur',options:'Kleuropties',highlight:'Actief',selected:'Geselecteerd',clear:'Wissen'},toolbarCollapse:'Werkbalk inklappen',toolbarExpand:'Werkbalk uitklappen',toolbarGroups:{document:'Document',clipboard:'Klembord/Ongedaan maken',editing:'Bewerken',forms:'Formulieren',basicstyles:'Basisstijlen',paragraph:'Paragraaf',links:'Links',insert:'Invoegen',styles:'Stijlen',colors:'Kleuren',tools:'Toepassingen'},bidi:{ltr:'Schrijfrichting van links naar rechts',rtl:'Schrijfrichting van rechts naar links'},docprops:{label:'Documenteigenschappen',title:'Documenteigenschappen',design:'Ontwerp',meta:'Meta tags',chooseColor:'Kiezen',other:'Anders...',docTitle:'Paginatitel',charset:'Tekencodering',charsetOther:'Andere tekencodering',charsetASCII:'ASCII',charsetCE:'Centraal Europees',charsetCT:'Tranditioneel Chinees (Big5)',charsetCR:'Cyrillisch',charsetGR:'Grieks',charsetJP:'Japans',charsetKR:'Koreaans',charsetTR:'Turks',charsetUN:'Unicode (UTF-8)',charsetWE:'West Europees',docType:'Documenttype-definitie',docTypeOther:'Andere documenttype-definitie',xhtmlDec:'XHTML declaratie invoegen',bgColor:'Achtergrondkleur',bgImage:'Achtergrondafbeelding URL',bgFixed:'Niet-scrollend (gefixeerde) achtergrond',txtColor:'Tekstkleur',margin:'Pagina marges',marginTop:'Boven',marginLeft:'Links',marginRight:'Rechts',marginBottom:'Onder',metaKeywords:'Trefwoorden voor indexering (komma-gescheiden)',metaDescription:'Documentbeschrijving',metaAuthor:'Auteur',metaCopyright:'Auteursrechten',previewHtml:'<p>Dit is <strong>voorbeeld tekst</strong>. Je gebruikt <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/no.js b/upload/public/js/3rd_party/ckeditor/lang/no.js
new file mode 100644
index 00000000..cd2598f0
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/no.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.no={dir:'ltr',editorTitle:'Rikteksteditor, %1, trykk ALT 0 for hjelp.',toolbars:'Verktøylinjer for editor',editor:'Rikteksteditor',source:'Kilde',newPage:'Ny side',save:'Lagre',preview:'Forhåndsvis',cut:'Klipp ut',copy:'Kopier',paste:'Lim inn',print:'Skriv ut',underline:'Understreking',bold:'Fet',italic:'Kursiv',selectAll:'Merk alt',removeFormat:'Fjern formatering',strike:'Gjennomstreking',subscript:'Senket skrift',superscript:'Hevet skrift',horizontalrule:'Sett inn horisontal linje',pagebreak:'Sett inn sideskift for utskrift',pagebreakAlt:'Sideskift',unlink:'Fjern lenke',undo:'Angre',redo:'Gjør om',common:{browseServer:'Bla igjennom server',url:'URL',protocol:'Protokoll',upload:'Last opp',uploadSubmit:'Send det til serveren',image:'Bilde',flash:'Flash',form:'Skjema',checkbox:'Avmerkingsboks',radio:'Alternativknapp',textField:'Tekstboks',textarea:'Tekstområde',hiddenField:'Skjult felt',button:'Knapp',select:'Rullegardinliste',imageButton:'Bildeknapp',notSet:'<ikke satt>',id:'Id',name:'Navn',langDir:'Språkretning',langDirLtr:'Venstre til høyre (VTH)',langDirRtl:'Høyre til venstre (HTV)',langCode:'Språkkode',longDescr:'Utvidet beskrivelse',cssClass:'Stilarkklasser',advisoryTitle:'Tittel',cssStyle:'Stil',ok:'OK',cancel:'Avbryt',close:'Lukk',preview:'Forhåndsvis',generalTab:'Generelt',advancedTab:'Avansert',validateNumberFailed:'Denne verdien er ikke et tall.',confirmNewPage:'Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?',confirmCancel:'Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?',options:'Valg',target:'Mål',targetNew:'Nytt vindu (_blank)',targetTop:'Hele vindu (_top)',targetSelf:'Samme vindu (_self)',targetParent:'Foreldrevindu (_parent)',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',styles:'Stil',cssClasses:'Stilarkklasser',width:'Bredde',height:'Høyde',align:'Juster',alignLeft:'Venstre',alignRight:'Høyre',alignCenter:'Midtjuster',alignTop:'Topp',alignMiddle:'Midten',alignBottom:'Bunn',invalidHeight:'Høyde må være et tall.',invalidWidth:'Bredde må være et tall.',invalidCssLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).',invalidHtmlLength:'Den angitte verdien for feltet "%1" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).',invalidInlineStyle:'Verdi angitt for inline stil må bestå av en eller flere sett med formatet "navn : verdi", separert med semikolon',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, utilgjenglig</span>'},contextmenu:{options:'Alternativer for høyreklikkmeny'},specialChar:{toolbar:'Sett inn spesialtegn',title:'Velg spesialtegn',options:'Alternativer for spesialtegn'},link:{toolbar:'Sett inn/Rediger lenke',other:'<annen>',menu:'Rediger lenke',title:'Lenke',info:'Lenkeinfo',target:'Mål',upload:'Last opp',advanced:'Avansert',type:'Lenketype',toUrl:'URL',toAnchor:'Lenke til anker i teksten',toEmail:'E-post',targetFrame:'<ramme>',targetPopup:'<popup-vindu>',targetFrameName:'Målramme',targetPopupName:'Navn på popup-vindu',popupFeatures:'Egenskaper for popup-vindu',popupResizable:'Skalerbar',popupStatusBar:'Statuslinje',popupLocationBar:'Adresselinje',popupToolbar:'Verktøylinje',popupMenuBar:'Menylinje',popupFullScreen:'Fullskjerm (IE)',popupScrollBars:'Scrollbar',popupDependent:'Avhenging (Netscape)',popupLeft:'Venstre posisjon',popupTop:'Topp-posisjon',id:'Id',langDir:'Språkretning',langDirLTR:'Venstre til høyre (VTH)',langDirRTL:'Høyre til venstre (HTV)',acccessKey:'Aksessknapp',name:'Navn',langCode:'Språkkode',tabIndex:'Tabindeks',advisoryTitle:'Tittel',advisoryContentType:'Type',cssClasses:'Stilarkklasser',charset:'Lenket tegnsett',styles:'Stil',rel:'Relasjon (rel)',selectAnchor:'Velg et anker',anchorName:'Anker etter navn',anchorId:'Element etter ID',emailAddress:'E-postadresse',emailSubject:'Meldingsemne',emailBody:'Melding',noAnchors:'(Ingen anker i dokumentet)',noUrl:'Vennligst skriv inn lenkens URL',noEmail:'Vennligst skriv inn e-postadressen'},anchor:{toolbar:'Sett inn/Rediger anker',menu:'Egenskaper for anker',title:'Egenskaper for anker',name:'Ankernavn',errorName:'Vennligst skriv inn ankernavnet',remove:'Fjern anker'},list:{numberedTitle:'Egenskaper for nummerert liste',bulletedTitle:'Egenskaper for punktmerket liste',type:'Type',start:'Start',validateStartNumber:'Starten på listen må være et heltall.',circle:'Sirkel',disc:'Disk',square:'Firkant',none:'Ingen',notset:'<ikke satt>',armenian:'Armensk nummerering',georgian:'Georgisk nummerering (an, ban, gan, osv.)',lowerRoman:'Romertall, små (i, ii, iii, iv, v, osv.)',upperRoman:'Romertall, store (I, II, III, IV, V, osv.)',lowerAlpha:'Alfabetisk, små (a, b, c, d, e, osv.)',upperAlpha:'Alfabetisk, store (A, B, C, D, E, osv.)',lowerGreek:'Gresk, små (alpha, beta, gamma, osv.)',decimal:'Tall (1, 2, 3, osv.)',decimalLeadingZero:'Tall, med førstesiffer null (01, 02, 03, osv.)'},findAndReplace:{title:'Søk og erstatt',find:'Søk',replace:'Erstatt',findWhat:'Søk etter:',replaceWith:'Erstatt med:',notFoundMsg:'Fant ikke søketeksten.',findOptions:'Søkealternativer',matchCase:'Skill mellom store og små bokstaver',matchWord:'Bare hele ord',matchCyclic:'Søk i hele dokumentet',replaceAll:'Erstatt alle',replaceSuccessMsg:'%1 tilfelle(r) erstattet.'},table:{toolbar:'Tabell',title:'Egenskaper for tabell',menu:'Egenskaper for tabell',deleteTable:'Slett tabell',rows:'Rader',columns:'Kolonner',border:'Rammestørrelse',widthPx:'piksler',widthPc:'prosent',widthUnit:'Bredde-enhet',cellSpace:'Cellemarg',cellPad:'Cellepolstring',caption:'Tittel',summary:'Sammendrag',headers:'Overskrifter',headersNone:'Ingen',headersColumn:'Første kolonne',headersRow:'Første rad',headersBoth:'Begge',invalidRows:'Antall rader må være et tall større enn 0.',invalidCols:'Antall kolonner må være et tall større enn 0.',invalidBorder:'Rammestørrelse må være et tall.',invalidWidth:'Tabellbredde må være et tall.',invalidHeight:'Tabellhøyde må være et tall.',invalidCellSpacing:'Cellemarg må være et positivt tall.',invalidCellPadding:'Cellepolstring må være et positivt tall.',cell:{menu:'Celle',insertBefore:'Sett inn celle før',insertAfter:'Sett inn celle etter',deleteCell:'Slett celler',merge:'Slå sammen celler',mergeRight:'Slå sammen høyre',mergeDown:'Slå sammen ned',splitHorizontal:'Del celle horisontalt',splitVertical:'Del celle vertikalt',title:'Celleegenskaper',cellType:'Celletype',rowSpan:'Radspenn',colSpan:'Kolonnespenn',wordWrap:'Tekstbrytning',hAlign:'Horisontal justering',vAlign:'Vertikal justering',alignBaseline:'Grunnlinje',bgColor:'Bakgrunnsfarge',borderColor:'Rammefarge',data:'Data',header:'Overskrift',yes:'Ja',no:'Nei',invalidWidth:'Cellebredde må være et tall.',invalidHeight:'Cellehøyde må være et tall.',invalidRowSpan:'Radspenn må være et heltall.',invalidColSpan:'Kolonnespenn må være et heltall.',chooseColor:'Velg'},row:{menu:'Rader',insertBefore:'Sett inn rad før',insertAfter:'Sett inn rad etter',deleteRow:'Slett rader'},column:{menu:'Kolonne',insertBefore:'Sett inn kolonne før',insertAfter:'Sett inn kolonne etter',deleteColumn:'Slett kolonner'}},button:{title:'Egenskaper for knapp',text:'Tekst (verdi)',type:'Type',typeBtn:'Knapp',typeSbm:'Send',typeRst:'Nullstill'},checkboxAndRadio:{checkboxTitle:'Egenskaper for avmerkingsboks',radioTitle:'Egenskaper for alternativknapp',value:'Verdi',selected:'Valgt'},form:{title:'Egenskaper for skjema',menu:'Egenskaper for skjema',action:'Handling',method:'Metode',encoding:'Encoding'},select:{title:'Egenskaper for rullegardinliste',selectInfo:'Info',opAvail:'Tilgjenglige alternativer',value:'Verdi',size:'Størrelse',lines:'Linjer',chkMulti:'Tillat flervalg',opText:'Tekst',opValue:'Verdi',btnAdd:'Legg til',btnModify:'Endre',btnUp:'Opp',btnDown:'Ned',btnSetValue:'Sett som valgt',btnDelete:'Slett'},textarea:{title:'Egenskaper for tekstområde',cols:'Kolonner',rows:'Rader'},textfield:{title:'Egenskaper for tekstfelt',name:'Navn',value:'Verdi',charWidth:'Tegnbredde',maxChars:'Maks antall tegn',type:'Type',typeText:'Tekst',typePass:'Passord'},hidden:{title:'Egenskaper for skjult felt',name:'Navn',value:'Verdi'},image:{title:'Bildeegenskaper',titleButton:'Egenskaper for bildeknapp',menu:'Bildeegenskaper',infoTab:'Bildeinformasjon',btnUpload:'Send det til serveren',upload:'Last opp',alt:'Alternativ tekst',lockRatio:'Lås forhold',resetSize:'Tilbakestill størrelse',border:'Ramme',hSpace:'HMarg',vSpace:'VMarg',alertUrl:'Vennligst skriv bilde-urlen',linkTab:'Lenke',button2Img:'Vil du endre den valgte bildeknappen til et vanlig bilde?',img2Button:'Vil du endre det valgte bildet til en bildeknapp?',urlMissing:'Bildets adresse mangler.',validateBorder:'Ramme må være et heltall.',validateHSpace:'HMarg må være et heltall.',validateVSpace:'VMarg må være et heltall.'},flash:{properties:'Egenskaper for Flash-objekt',propertiesTab:'Egenskaper',title:'Flash-egenskaper',chkPlay:'Autospill',chkLoop:'Loop',chkMenu:'Slå på Flash-meny',chkFull:'Tillat fullskjerm',scale:'Skaler',scaleAll:'Vis alt',scaleNoBorder:'Ingen ramme',scaleFit:'Skaler til å passe',access:'Scripttilgang',accessAlways:'Alltid',accessSameDomain:'Samme domene',accessNever:'Aldri',alignAbsBottom:'Abs bunn',alignAbsMiddle:'Abs midten',alignBaseline:'Bunnlinje',alignTextTop:'Tekst topp',quality:'Kvalitet',qualityBest:'Best',qualityHigh:'Høy',qualityAutoHigh:'Auto høy',qualityMedium:'Medium',qualityAutoLow:'Auto lav',qualityLow:'Lav',windowModeWindow:'Vindu',windowModeOpaque:'Opaque',windowModeTransparent:'Gjennomsiktig',windowMode:'Vindumodus',flashvars:'Variabler for flash',bgcolor:'Bakgrunnsfarge',hSpace:'HMarg',vSpace:'VMarg',validateSrc:'Vennligst skriv inn lenkens url.',validateHSpace:'HMarg må være et tall.',validateVSpace:'VMarg må være et tall.'},spellCheck:{toolbar:'Stavekontroll',title:'Stavekontroll',notAvailable:'Beklager, tjenesten er utilgjenglig nå.',errorLoading:'Feil under lasting av applikasjonstjenestetjener: %s.',notInDic:'Ikke i ordboken',changeTo:'Endre til',btnIgnore:'Ignorer',btnIgnoreAll:'Ignorer alle',btnReplace:'Erstatt',btnReplaceAll:'Erstatt alle',btnUndo:'Angre',noSuggestions:'- Ingen forslag -',progress:'Stavekontroll pågår...',noMispell:'Stavekontroll fullført: ingen feilstavinger funnet',noChanges:'Stavekontroll fullført: ingen ord endret',oneChange:'Stavekontroll fullført: Ett ord endret',manyChanges:'Stavekontroll fullført: %1 ord endret',ieSpellDownload:'Stavekontroll er ikke installert. Vil du laste den ned nå?'},smiley:{toolbar:'Smil',title:'Sett inn smil',options:'Alternativer for smil'},elementsPath:{eleLabel:'Element-sti',eleTitle:'%1 element'},numberedlist:'Legg til/Fjern nummerert liste',bulletedlist:'Legg til/Fjern punktmerket liste',indent:'Øk innrykk',outdent:'Reduser innrykk',justify:{left:'Venstrejuster',center:'Midtstill',right:'Høyrejuster',block:'Blokkjuster'},blockquote:'Sitatblokk',clipboard:{title:'Lim inn',cutError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk klipping av tekst. Vennligst bruk snareveien (Ctrl/Cmd+X).',copyError:'Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snareveien (Ctrl/Cmd+C).',pasteMsg:'Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.',securityMsg:'Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.',pasteArea:'Innlimingsområde'},pastefromword:{confirmCleanup:'Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?',toolbar:'Lim inn fra Word',title:'Lim inn fra Word',error:'Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil'},pasteText:{button:'Lim inn som ren tekst',title:'Lim inn som ren tekst'},templates:{button:'Maler',title:'Innholdsmaler',options:'Alternativer for mal',insertOption:'Erstatt gjeldende innhold',selectPromptMsg:'Velg malen du vil åpne i redigeringsverktøyet:',emptyListMsg:'(Ingen maler definert)'},showBlocks:'Vis blokker',stylesCombo:{label:'Stil',panelTitle:'Stilformater',panelTitle1:'Blokkstiler',panelTitle2:'Inlinestiler',panelTitle3:'Objektstiler'},format:{label:'Format',panelTitle:'Avsnittsformat',tag_p:'Normal',tag_pre:'Formatert',tag_address:'Adresse',tag_h1:'Overskrift 1',tag_h2:'Overskrift 2',tag_h3:'Overskrift 3',tag_h4:'Overskrift 4',tag_h5:'Overskrift 5',tag_h6:'Overskrift 6',tag_div:'Normal (DIV)'},div:{title:'Sett inn Div Container',toolbar:'Sett inn Div Container',cssClassInputLabel:'Stilark-klasser',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkode',inlineStyleInputLabel:'Inlinestiler',advisoryTitleInputLabel:'Tittel',langDirLabel:'Språkretning',langDirLTRLabel:'Venstre til høyre (VTH)',langDirRTLLabel:'Høyre til venstre (HTV)',edit:'Rediger Div',remove:'Fjern Div'},iframe:{title:'Egenskaper for IFrame',toolbar:'IFrame',noUrl:'Vennligst skriv inn URL for iframe',scrolling:'Aktiver scrollefelt',border:'Viss ramme rundt iframe'},font:{label:'Skrift',voiceLabel:'Font',panelTitle:'Skrift'},fontSize:{label:'Størrelse',voiceLabel:'Font Størrelse',panelTitle:'Størrelse'},colorButton:{textColorTitle:'Tekstfarge',bgColorTitle:'Bakgrunnsfarge',panelTitle:'Farger',auto:'Automatisk',more:'Flere farger...'},colors:{'000':'Svart',800000:'Rødbrun','8B4513':'Salbrun','2F4F4F':'Grønnsvart','008080':'Blågrønn','000080':'Marineblått','4B0082':'Indigo',696969:'Mørk grå',B22222:'Mørkerød',A52A2A:'Brun',DAA520:'Lys brun','006400':'Mørk grønn','40E0D0':'Turkis','0000CD':'Medium blå',800080:'Purpur',808080:'Grå',F00:'Rød',FF8C00:'Mørk oransje',FFD700:'Gull','008000':'Grønn','0FF':'Cyan','00F':'Blå',EE82EE:'Fiolett',A9A9A9:'Svak grå',FFA07A:'Rosa-oransje',FFA500:'Oransje',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Svak turkis',ADD8E6:'Lys Blå',DDA0DD:'Plomme',D3D3D3:'Lys grå',FFF0F5:'Svak lavendelrosa',FAEBD7:'Antikk-hvit',FFFFE0:'Lys gul',F0FFF0:'Honningmelon',F0FFFF:'Svakt asurblått',F0F8FF:'Svak cyan',E6E6FA:'Lavendel',FFF:'Hvit'},scayt:{title:'Stavekontroll mens du skriver',opera_title:'Ikke støttet av Opera',enable:'Slå på SCAYT',disable:'Slå av SCAYT',about:'Om SCAYT',toggle:'Veksle SCAYT',options:'Valg',langs:'Språk',moreSuggestions:'Flere forslag',ignore:'Ignorer',ignoreAll:'Ignorer Alle',addWord:'Legg til ord',emptyDic:'Ordboknavn bør ikke være tom.',optionsTab:'Valg',allCaps:'Ikke kontroller ord med kun store bokstaver',ignoreDomainNames:'Ikke kontroller domenenavn',mixedCase:'Ikke kontroller ord med blandet små og store bokstaver',mixedWithDigits:'Ikke kontroller ord som inneholder tall',languagesTab:'Språk',dictionariesTab:'Ordbøker',dic_field_name:'Ordboknavn',dic_create:'Opprett',dic_restore:'Gjenopprett',dic_delete:'Slett',dic_rename:'Gi nytt navn',dic_info:'Brukerordboken lagres først i en informasjonskapsel på din maskin, men det er en begrensning på hvor mye som kan lagres her. Når ordboken blir for stor til å lagres i en informasjonskapsel, vil vi i stedet lagre ordboken på vår server. For å lagre din personlige ordbok på vår server, burde du velge et navn for ordboken din. Hvis du allerede har lagret en ordbok, vennligst skriv inn ordbokens navn og klikk på Gjenopprett-knappen.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Se $1 for hjelp.',userGuide:'CKEditors brukerveiledning',moreInfo:'For lisensieringsinformasjon, vennligst besøk vårt nettsted:',copy:'Copyright &copy; $1. Alle rettigheter reservert.'},maximize:'Maksimer',minimize:'Minimer',fakeobjects:{anchor:'Anker',flash:'Flash-animasjon',iframe:'IFrame',hiddenfield:'Skjult felt',unknown:'Ukjent objekt'},resize:'Dra for å skalere',colordialog:{title:'Velg farge',options:'Alternativer for farge',highlight:'Merk',selected:'Valgt',clear:'Tøm'},toolbarCollapse:'Skjul verktøylinje',toolbarExpand:'Vis verktøylinje',toolbarGroups:{document:'Dokument',clipboard:'Utklippstavle/Angre',editing:'Redigering',forms:'Skjema',basicstyles:'Basisstiler',paragraph:'Avsnitt',links:'Lenker',insert:'Innsetting',styles:'Stiler',colors:'Farger',tools:'Verktøy'},bidi:{ltr:'Tekstretning fra venstre til høyre',rtl:'Tekstretning fra høyre til venstre'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Meta-data',chooseColor:'Velg',other:'<annen>',docTitle:'Sidetittel',charset:'Tegnsett',charsetOther:'Annet tegnsett',charsetASCII:'ASCII',charsetCE:'Sentraleuropeisk',charsetCT:'Tradisonell kinesisk(Big5)',charsetCR:'Kyrillisk',charsetGR:'Gresk',charsetJP:'Japansk',charsetKR:'Koreansk',charsetTR:'Tyrkisk',charsetUN:'Unicode (UTF-8)',charsetWE:'Vesteuropeisk',docType:'Dokumenttype header',docTypeOther:'Annet dokumenttype header',xhtmlDec:'Inkluder XHTML-deklarasjon',bgColor:'Bakgrunnsfarge',bgImage:'URL for bakgrunnsbilde',bgFixed:'Lås bakgrunnsbilde',txtColor:'Tekstfarge',margin:'Sidemargin',marginTop:'Topp',marginLeft:'Venstre',marginRight:'Høyre',marginBottom:'Bunn',metaKeywords:'Dokument nøkkelord (kommaseparert)',metaDescription:'Dokumentbeskrivelse',metaAuthor:'Forfatter',metaCopyright:'Kopirett',previewHtml:'<p>Dette er en <strong>eksempeltekst</strong>. Du bruker <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/pl.js b/upload/public/js/3rd_party/ckeditor/lang/pl.js
new file mode 100644
index 00000000..acf2ac4d
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/pl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.pl={dir:'ltr',editorTitle:'Edytor tekstu sformatowanego, %1, w celu uzyskania pomocy naciśnij ALT 0.',toolbars:'Paski narzędzi edytora',editor:'Edytor tekstu sformatowanego',source:'Źródło dokumentu',newPage:'Nowa strona',save:'Zapisz',preview:'Podgląd',cut:'Wytnij',copy:'Kopiuj',paste:'Wklej',print:'Drukuj',underline:'Podkreślenie',bold:'Pogrubienie',italic:'Kursywa',selectAll:'Zaznacz wszystko',removeFormat:'Usuń formatowanie',strike:'Przekreślenie',subscript:'Indeks dolny',superscript:'Indeks górny',horizontalrule:'Wstaw poziomą linię',pagebreak:'Wstaw pdodział strony',pagebreakAlt:'Wstaw podział strony',unlink:'Usuń odnośnik',undo:'Cofnij',redo:'Ponów',common:{browseServer:'Przeglądaj',url:'Adres URL',protocol:'Protokół',upload:'Wyślij',uploadSubmit:'Wyślij',image:'Obrazek',flash:'Flash',form:'Formularz',checkbox:'Pole wyboru (checkbox)',radio:'Przycisk opcji (radio)',textField:'Pole tekstowe',textarea:'Obszar tekstowy',hiddenField:'Pole ukryte',button:'Przycisk',select:'Lista wyboru',imageButton:'Przycisk graficzny',notSet:'<nie ustawiono>',id:'Id',name:'Nazwa',langDir:'Kierunek tekstu',langDirLtr:'Od lewej do prawej (LTR)',langDirRtl:'Od prawej do lewej (RTL)',langCode:'Kod języka',longDescr:'Adres URL długiego opisu',cssClass:'Nazwa klasy CSS',advisoryTitle:'Opis obiektu docelowego',cssStyle:'Styl',ok:'OK',cancel:'Anuluj',close:'Zamknij',preview:'Podgląd',generalTab:'Ogólne',advancedTab:'Zaawansowane',validateNumberFailed:'Ta wartość nie jest liczbą.',confirmNewPage:'Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?',confirmCancel:'Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?',options:'Opcje',target:'Obiekt docelowy',targetNew:'Nowe okno (_blank)',targetTop:'Okno najwyżej w hierarchii (_top)',targetSelf:'To samo okno (_self)',targetParent:'Okno nadrzędne (_parent)',langDirLTR:'Od lewej do prawej (LTR)',langDirRTL:'Od prawej do lewej (RTL)',styles:'Style',cssClasses:'Klasy arkusza stylów',width:'Szerokość',height:'Wysokość',align:'Wyrównaj',alignLeft:'Do lewej',alignRight:'Do prawej',alignCenter:'Do środka',alignTop:'Do góry',alignMiddle:'Do środka',alignBottom:'Do dołu',invalidHeight:'Wysokość musi być liczbą.',invalidWidth:'Szerokość musi być liczbą.',invalidCssLength:'Wartość podana dla pola "%1" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).',invalidHtmlLength:'Wartość podana dla pola "%1" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).',invalidInlineStyle:'Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie "nazwa : wartość", rozdzielonych średnikami.',cssLengthTooltip:'Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).',unavailable:'%1<span class="cke_accessibility">, niedostępne</span>'},contextmenu:{options:'Opcje menu kontekstowego'},specialChar:{toolbar:'Wstaw znak specjalny',title:'Wybierz znak specjalny',options:'Opcje znaków specjalnych'},link:{toolbar:'Wstaw/edytuj odnośnik',other:'<inny>',menu:'Edytuj odnośnik',title:'Odnośnik',info:'Informacje ',target:'Obiekt docelowy',upload:'Wyślij',advanced:'Zaawansowane',type:'Typ odnośnika',toUrl:'Adres URL',toAnchor:'Odnośnik wewnątrz strony (kotwica)',toEmail:'Adres e-mail',targetFrame:'<ramka>',targetPopup:'<wyskakujące okno>',targetFrameName:'Nazwa ramki docelowej',targetPopupName:'Nazwa wyskakującego okna',popupFeatures:'Właściwości wyskakującego okna',popupResizable:'Skalowalny',popupStatusBar:'Pasek statusu',popupLocationBar:'Pasek adresu',popupToolbar:'Pasek narzędzi',popupMenuBar:'Pasek menu',popupFullScreen:'Pełny ekran (IE)',popupScrollBars:'Paski przewijania',popupDependent:'Okno zależne (Netscape)',popupLeft:'Pozycja w poziomie',popupTop:'Pozycja w pionie',id:'Id',langDir:'Kierunek tekstu',langDirLTR:'Od lewej do prawej (LTR)',langDirRTL:'Od prawej do lewej (RTL)',acccessKey:'Klawisz dostępu',name:'Nazwa',langCode:'Kod języka',tabIndex:'Indeks kolejności',advisoryTitle:'Opis obiektu docelowego',advisoryContentType:'Typ MIME obiektu docelowego',cssClasses:'Nazwa klasy CSS',charset:'Kodowanie znaków obiektu docelowego',styles:'Styl',rel:'Relacja',selectAnchor:'Wybierz kotwicę',anchorName:'Wg nazwy',anchorId:'Wg identyfikatora',emailAddress:'Adres e-mail',emailSubject:'Temat',emailBody:'Treść',noAnchors:'(W dokumencie nie zdefiniowano żadnych kotwic)',noUrl:'Podaj adres URL',noEmail:'Podaj adres e-mail'},anchor:{toolbar:'Wstaw/edytuj kotwicę',menu:'Właściwości kotwicy',title:'Właściwości kotwicy',name:'Nazwa kotwicy',errorName:'Wpisz nazwę kotwicy',remove:'Usuń kotwicę'},list:{numberedTitle:'Właściwości list numerowanych',bulletedTitle:'Właściwości list wypunktowanych',type:'Typ punktora',start:'Początek',validateStartNumber:'Listę musi rozpoczynać liczba całkowita.',circle:'Koło',disc:'Okrąg',square:'Kwadrat',none:'Brak',notset:'<nie ustawiono>',armenian:'Numerowanie armeńskie',georgian:'Numerowanie gruzińskie (an, ban, gan itd.)',lowerRoman:'Małe cyfry rzymskie (i, ii, iii, iv, v itd.)',upperRoman:'Duże cyfry rzymskie (I, II, III, IV, V itd.)',lowerAlpha:'Małe litery (a, b, c, d, e itd.)',upperAlpha:'Duże litery (A, B, C, D, E itd.)',lowerGreek:'Małe litery greckie (alpha, beta, gamma itd.)',decimal:'Liczby (1, 2, 3 itd.)',decimalLeadingZero:'Liczby z początkowym zerem (01, 02, 03 itd.)'},findAndReplace:{title:'Znajdź i zamień',find:'Znajdź',replace:'Zamień',findWhat:'Znajdź:',replaceWith:'Zastąp przez:',notFoundMsg:'Nie znaleziono szukanego hasła.',findOptions:'Opcje wyszukiwania',matchCase:'Uwzględnij wielkość liter',matchWord:'Całe słowa',matchCyclic:'Cykliczne dopasowanie',replaceAll:'Zamień wszystko',replaceSuccessMsg:'%1 wystąpień zastąpionych.'},table:{toolbar:'Tabela',title:'Właściwości tabeli',menu:'Właściwości tabeli',deleteTable:'Usuń tabelę',rows:'Liczba wierszy',columns:'Liczba kolumn',border:'Grubość obramowania',widthPx:'piksele',widthPc:'%',widthUnit:'jednostka szerokości',cellSpace:'Odstęp pomiędzy komórkami',cellPad:'Dopełnienie komórek',caption:'Tytuł',summary:'Podsumowanie',headers:'Nagłówki',headersNone:'Brak',headersColumn:'Pierwsza kolumna',headersRow:'Pierwszy wiersz',headersBoth:'Oba',invalidRows:'Liczba wierszy musi być większa niż 0.',invalidCols:'Liczba kolumn musi być większa niż 0.',invalidBorder:'Wartość obramowania musi być liczbą.',invalidWidth:'Szerokość tabeli musi być liczbą.',invalidHeight:'Wysokość tabeli musi być liczbą.',invalidCellSpacing:'Odstęp pomiędzy komórkami musi być liczbą dodatnią.',invalidCellPadding:'Dopełnienie komórek musi być liczbą dodatnią.',cell:{menu:'Komórka',insertBefore:'Wstaw komórkę z lewej',insertAfter:'Wstaw komórkę z prawej',deleteCell:'Usuń komórki',merge:'Połącz komórki',mergeRight:'Połącz z komórką z prawej',mergeDown:'Połącz z komórką poniżej',splitHorizontal:'Podziel komórkę poziomo',splitVertical:'Podziel komórkę pionowo',title:'Właściwości komórki',cellType:'Typ komórki',rowSpan:'Scalenie wierszy',colSpan:'Scalenie komórek',wordWrap:'Zawijanie słów',hAlign:'Wyrównanie poziome',vAlign:'Wyrównanie pionowe',alignBaseline:'Linia bazowa',bgColor:'Kolor tła',borderColor:'Kolor obramowania',data:'Dane',header:'Nagłowek',yes:'Tak',no:'Nie',invalidWidth:'Szerokość komórki musi być liczbą.',invalidHeight:'Wysokość komórki musi być liczbą.',invalidRowSpan:'Scalenie wierszy musi być liczbą całkowitą.',invalidColSpan:'Scalenie komórek musi być liczbą całkowitą.',chooseColor:'Wybierz'},row:{menu:'Wiersz',insertBefore:'Wstaw wiersz powyżej',insertAfter:'Wstaw wiersz poniżej',deleteRow:'Usuń wiersze'},column:{menu:'Kolumna',insertBefore:'Wstaw kolumnę z lewej',insertAfter:'Wstaw kolumnę z prawej',deleteColumn:'Usuń kolumny'}},button:{title:'Właściwości przycisku',text:'Tekst (Wartość)',type:'Typ',typeBtn:'Przycisk',typeSbm:'Wyślij',typeRst:'Wyczyść'},checkboxAndRadio:{checkboxTitle:'Właściwości pola wyboru (checkbox)',radioTitle:'Właściwości przycisku opcji (radio)',value:'Wartość',selected:'Zaznaczone'},form:{title:'Właściwości formularza',menu:'Właściwości formularza',action:'Akcja',method:'Metoda',encoding:'Kodowanie'},select:{title:'Właściwości listy wyboru',selectInfo:'Informacje',opAvail:'Dostępne opcje',value:'Wartość',size:'Rozmiar',lines:'wierszy',chkMulti:'Wielokrotny wybór',opText:'Tekst',opValue:'Wartość',btnAdd:'Dodaj',btnModify:'Zmień',btnUp:'Do góry',btnDown:'Do dołu',btnSetValue:'Ustaw jako zaznaczoną',btnDelete:'Usuń'},textarea:{title:'Właściwości obszaru tekstowego',cols:'Liczba kolumn',rows:'Liczba wierszy'},textfield:{title:'Właściwości pola tekstowego',name:'Nazwa',value:'Wartość',charWidth:'Szerokość w znakach',maxChars:'Szerokość maksymalna',type:'Typ',typeText:'Tekst',typePass:'Hasło'},hidden:{title:'Właściwości pola ukrytego',name:'Nazwa',value:'Wartość'},image:{title:'Właściwości obrazka',titleButton:'Właściwości przycisku graficznego',menu:'Właściwości obrazka',infoTab:'Informacje o obrazku',btnUpload:'Wyślij',upload:'Wyślij',alt:'Tekst zastępczy',lockRatio:'Zablokuj proporcje',resetSize:'Przywróć rozmiar',border:'Obramowanie',hSpace:'Odstęp poziomy',vSpace:'Odstęp pionowy',alertUrl:'Podaj adres obrazka.',linkTab:'Hiperłącze',button2Img:'Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?',img2Button:'Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?',urlMissing:'Podaj adres URL obrazka.',validateBorder:'Wartość obramowania musi być liczbą całkowitą.',validateHSpace:'Wartość odstępu poziomego musi być liczbą całkowitą.',validateVSpace:'Wartość odstępu pionowego musi być liczbą całkowitą.'},flash:{properties:'Właściwości obiektu Flash',propertiesTab:'Właściwości',title:'Właściwości obiektu Flash',chkPlay:'Autoodtwarzanie',chkLoop:'Pętla',chkMenu:'Włącz menu',chkFull:'Zezwól na pełny ekran',scale:'Skaluj',scaleAll:'Pokaż wszystko',scaleNoBorder:'Bez obramowania',scaleFit:'Dokładne dopasowanie',access:'Dostęp skryptów',accessAlways:'Zawsze',accessSameDomain:'Ta sama domena',accessNever:'Nigdy',alignAbsBottom:'Do dołu',alignAbsMiddle:'Do środka w pionie',alignBaseline:'Do linii bazowej',alignTextTop:'Do góry tekstu',quality:'Jakość',qualityBest:'Najlepsza',qualityHigh:'Wysoka',qualityAutoHigh:'Auto wysoka',qualityMedium:'Średnia',qualityAutoLow:'Auto niska',qualityLow:'Niska',windowModeWindow:'Okno',windowModeOpaque:'Nieprzezroczyste',windowModeTransparent:'Przezroczyste',windowMode:'Tryb okna',flashvars:'Zmienne obiektu Flash',bgcolor:'Kolor tła',hSpace:'Odstęp poziomy',vSpace:'Odstęp pionowy',validateSrc:'Podaj adres URL',validateHSpace:'Odstęp poziomy musi być liczbą.',validateVSpace:'Odstęp pionowy musi być liczbą.'},spellCheck:{toolbar:'Sprawdź pisownię',title:'Sprawdź pisownię',notAvailable:'Przepraszamy, ale usługa jest obecnie niedostępna.',errorLoading:'Błąd wczytywania hosta aplikacji usługi: %s.',notInDic:'Słowa nie ma w słowniku',changeTo:'Zmień na',btnIgnore:'Ignoruj',btnIgnoreAll:'Ignoruj wszystkie',btnReplace:'Zmień',btnReplaceAll:'Zmień wszystkie',btnUndo:'Cofnij',noSuggestions:'- Brak sugestii -',progress:'Trwa sprawdzanie...',noMispell:'Sprawdzanie zakończone: nie znaleziono błędów',noChanges:'Sprawdzanie zakończone: nie zmieniono żadnego słowa',oneChange:'Sprawdzanie zakończone: zmieniono jedno słowo',manyChanges:'Sprawdzanie zakończone: zmieniono %l słów',ieSpellDownload:'Słownik nie jest zainstalowany. Czy chcesz go pobrać?'},smiley:{toolbar:'Emotikony',title:'Wstaw emotikona',options:'Opcje emotikonów'},elementsPath:{eleLabel:'Ścieżka elementów',eleTitle:'element %1'},numberedlist:'Lista numerowana',bulletedlist:'Lista wypunktowana',indent:'Zwiększ wcięcie',outdent:'Zmniejsz wcięcie',justify:{left:'Wyrównaj do lewej',center:'Wyśrodkuj',right:'Wyrównaj do prawej',block:'Wyjustuj'},blockquote:'Cytat',clipboard:{title:'Wklej',cutError:'Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.',copyError:'Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.',pasteMsg:'Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.',securityMsg:'Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.',pasteArea:'Obszar wklejania'},pastefromword:{confirmCleanup:'Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?',toolbar:'Wklej z programu MS Word',title:'Wklej z programu MS Word',error:'Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.'},pasteText:{button:'Wklej jako czysty tekst',title:'Wklej jako czysty tekst'},templates:{button:'Szablony',title:'Szablony zawartości',options:'Opcje szablonów',insertOption:'Zastąp obecną zawartość',selectPromptMsg:'Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):',emptyListMsg:'(Brak zdefiniowanych szablonów)'},showBlocks:'Pokaż bloki',stylesCombo:{label:'Styl',panelTitle:'Style formatujące',panelTitle1:'Style blokowe',panelTitle2:'Style liniowe',panelTitle3:'Style obiektowe'},format:{label:'Format',panelTitle:'Format',tag_p:'Normalny',tag_pre:'Tekst sformatowany',tag_address:'Adres',tag_h1:'Nagłówek 1',tag_h2:'Nagłówek 2',tag_h3:'Nagłówek 3',tag_h4:'Nagłówek 4',tag_h5:'Nagłówek 5',tag_h6:'Nagłówek 6',tag_div:'Normalny (DIV)'},div:{title:'Utwórz pojemnik Div',toolbar:'Utwórz pojemnik Div',cssClassInputLabel:'Klasy arkusza stylów',styleSelectLabel:'Styl',IdInputLabel:'Id',languageCodeInputLabel:'Kod języka',inlineStyleInputLabel:'Style liniowe',advisoryTitleInputLabel:'Opis obiektu docelowego',langDirLabel:'Kierunek tekstu',langDirLTRLabel:'Od lewej do prawej (LTR)',langDirRTLLabel:'Od prawej do lewej (RTL)',edit:'Edytuj pojemnik Div',remove:'Usuń pojemnik Div'},iframe:{title:'Właściwości elementu IFrame',toolbar:'IFrame',noUrl:'Podaj adres URL elementu IFrame',scrolling:'Włącz paski przewijania',border:'Pokaż obramowanie obiektu IFrame'},font:{label:'Czcionka',voiceLabel:'Czcionka',panelTitle:'Czcionka'},fontSize:{label:'Rozmiar',voiceLabel:'Rozmiar czcionki',panelTitle:'Rozmiar'},colorButton:{textColorTitle:'Kolor tekstu',bgColorTitle:'Kolor tła',panelTitle:'Kolory',auto:'Automatycznie',more:'Więcej kolorów...'},colors:{'000':'Czarny',800000:'Kasztanowy','8B4513':'Czekoladowy','2F4F4F':'Ciemnografitowy','008080':'Morski','000080':'Granatowy','4B0082':'Indygo',696969:'Ciemnoszary',B22222:'Czerwień żelazowa',A52A2A:'Brązowy',DAA520:'Ciemnozłoty','006400':'Ciemnozielony','40E0D0':'Turkusowy','0000CD':'Ciemnoniebieski',800080:'Purpurowy',808080:'Szary',F00:'Czerwony',FF8C00:'Ciemnopomarańczowy',FFD700:'Złoty','008000':'Zielony','0FF':'Cyjan','00F':'Niebieski',EE82EE:'Fioletowy',A9A9A9:'Przygaszony szary',FFA07A:'�ososiowy',FFA500:'Pomarańczowy',FFFF00:'Żółty','00FF00':'Limonkowy',AFEEEE:'Bladoturkusowy',ADD8E6:'Jasnoniebieski',DDA0DD:'Śliwkowy',D3D3D3:'Jasnoszary',FFF0F5:'Jasnolawendowy',FAEBD7:'Kremowobiały',FFFFE0:'Jasnożółty',F0FFF0:'Bladozielony',F0FFFF:'Jasnolazurowy',F0F8FF:'Jasnobłękitny',E6E6FA:'Lawendowy',FFF:'Biały'},scayt:{title:'Sprawdź pisownię podczas pisania (SCAYT)',opera_title:'Funkcja nie jest obsługiwana przez przeglądarkę Opera',enable:'Włącz SCAYT',disable:'Wyłącz SCAYT',about:'Informacje o SCAYT',toggle:'Przełącz SCAYT',options:'Opcje',langs:'Języki',moreSuggestions:'Więcej sugestii',ignore:'Ignoruj',ignoreAll:'Ignoruj wszystkie',addWord:'Dodaj słowo',emptyDic:'Nazwa słownika nie może być pusta.',optionsTab:'Opcje',allCaps:'Ignoruj wyrazy pisane dużymi literami',ignoreDomainNames:'Ignoruj nazwy domen',mixedCase:'Ignoruj wyrazy pisane dużymi i małymi literami',mixedWithDigits:'Ignoruj wyrazy zawierające cyfry',languagesTab:'Języki',dictionariesTab:'Słowniki',dic_field_name:'Nazwa słownika',dic_create:'Utwórz',dic_restore:'Przywróć',dic_delete:'Usuń',dic_rename:'Zmień nazwę',dic_info:'Początkowo słownik użytkownika przechowywany jest w cookie. Pliki cookie mają jednak ograniczoną pojemność. Jeśli słownik użytkownika przekroczy wielkość dopuszczalną dla pliku cookie, możliwe jest przechowanie go na naszym serwerze. W celu zapisania słownika na serwerze niezbędne jest nadanie mu nazwy. Jeśli słownik został już zapisany na serwerze, wystarczy podać jego nazwę i nacisnąć przycisk Przywróć.',aboutTab:'Informacje o SCAYT'},about:{title:'Informacje o programie CKEditor',dlgTitle:'Informacje o programie CKEditor',help:'Pomoc znajdziesz w $1.',userGuide:'podręczniku użytkownika programu CKEditor',moreInfo:'Informacje na temat licencji można znaleźć na naszej stronie:',copy:'Copyright &copy; $1. Wszelkie prawa zastrzeżone.'},maximize:'Maksymalizuj',minimize:'Minimalizuj',fakeobjects:{anchor:'Kotwica',flash:'Animacja Flash',iframe:'IFrame',hiddenfield:'Pole ukryte',unknown:'Nieznany obiekt'},resize:'Przeciągnij, aby zmienić rozmiar',colordialog:{title:'Wybierz kolor',options:'Opcje koloru',highlight:'Zaznacz',selected:'Wybrany',clear:'Wyczyść'},toolbarCollapse:'Zwiń pasek narzędzi',toolbarExpand:'Rozwiń pasek narzędzi',toolbarGroups:{document:'Dokument',clipboard:'Schowek/Wstecz',editing:'Edycja',forms:'Formularze',basicstyles:'Style podstawowe',paragraph:'Akapit',links:'Hiperłącza',insert:'Wstawianie',styles:'Style',colors:'Kolory',tools:'Narzędzia'},bidi:{ltr:'Kierunek tekstu od lewej strony do prawej',rtl:'Kierunek tekstu od prawej strony do lewej'},docprops:{label:'Właściwości dokumentu',title:'Właściwości dokumentu',design:'Projekt strony',meta:'Znaczniki meta',chooseColor:'Wybierz',other:'Inne',docTitle:'Tytuł strony',charset:'Kodowanie znaków',charsetOther:'Inne kodowanie znaków',charsetASCII:'ASCII',charsetCE:'Środkowoeuropejskie',charsetCT:'Chińskie tradycyjne (Big5)',charsetCR:'Cyrylica',charsetGR:'Greckie',charsetJP:'Japońskie',charsetKR:'Koreańskie',charsetTR:'Tureckie',charsetUN:'Unicode (UTF-8)',charsetWE:'Zachodnioeuropejskie',docType:'Definicja typu dokumentu',docTypeOther:'Inna definicja typu dokumentu',xhtmlDec:'Uwzględnij deklaracje XHTML',bgColor:'Kolor tła',bgImage:'Adres URL obrazka tła',bgFixed:'Tło nieruchome (nieprzewijające się)',txtColor:'Kolor tekstu',margin:'Marginesy strony',marginTop:'Górny',marginLeft:'Lewy',marginRight:'Prawy',marginBottom:'Dolny',metaKeywords:'Słowa kluczowe dokumentu (oddzielone przecinkami)',metaDescription:'Opis dokumentu',metaAuthor:'Autor',metaCopyright:'Prawa autorskie',previewHtml:'<p>To jest <strong>przykładowy tekst</strong>. Korzystasz z programu <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/pt-br.js b/upload/public/js/3rd_party/ckeditor/lang/pt-br.js
new file mode 100644
index 00000000..0ccb6e19
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/pt-br.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['pt-br']={dir:'ltr',editorTitle:'Editor de Texto, %1, pressione ALT 0 para obter ajuda.',toolbars:'Barra de Ferramentas do Editor',editor:'Editor de Texto',source:'Código-Fonte',newPage:'Novo',save:'Salvar',preview:'Visualizar',cut:'Recortar',copy:'Copiar',paste:'Colar',print:'Imprimir',underline:'Sublinhado',bold:'Negrito',italic:'Itálico',selectAll:'Selecionar Tudo',removeFormat:'Remover Formatação',strike:'Tachado',subscript:'Subscrito',superscript:'Sobrescrito',horizontalrule:'Inserir Linha Horizontal',pagebreak:'Inserir Quebra de Página',pagebreakAlt:'Quebra de Página',unlink:'Remover Link',undo:'Desfazer',redo:'Refazer',common:{browseServer:'Localizar no Servidor',url:'URL',protocol:'Protocolo',upload:'Enviar ao Servidor',uploadSubmit:'Enviar para o Servidor',image:'Imagem',flash:'Flash',form:'Formulário',checkbox:'Caixa de Seleção',radio:'Botão de Opção',textField:'Caixa de Texto',textarea:'�rea de Texto',hiddenField:'Campo Oculto',button:'Botão',select:'Caixa de Listagem',imageButton:'Botão de Imagem',notSet:'<não ajustado>',id:'Id',name:'Nome',langDir:'Direção do idioma',langDirLtr:'Esquerda para Direita (LTR)',langDirRtl:'Direita para Esquerda (RTL)',langCode:'Idioma',longDescr:'Descrição da URL',cssClass:'Classe de CSS',advisoryTitle:'Título',cssStyle:'Estilos',ok:'OK',cancel:'Cancelar',close:'Fechar',preview:'Visualizar',generalTab:'Geral',advancedTab:'Avançado',validateNumberFailed:'Este valor não é um número.',confirmNewPage:'Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?',confirmCancel:'Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?',options:'Opções',target:'Destino',targetNew:'Nova Janela (_blank)',targetTop:'Janela de Cima (_top)',targetSelf:'Mesma Janela (_self)',targetParent:'Janela Pai (_parent)',langDirLTR:'Esquerda para Direita (LTR)',langDirRTL:'Direita para Esquerda (RTL)',styles:'Estilo',cssClasses:'Classes',width:'Largura',height:'Altura',align:'Alinhamento',alignLeft:'Esquerda',alignRight:'Direita',alignCenter:'Centralizado',alignTop:'Superior',alignMiddle:'Centralizado',alignBottom:'Inferior',invalidHeight:'A altura tem que ser um número',invalidWidth:'A largura tem que ser um número.',invalidCssLength:'O valor do campo "%1" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'O valor do campo "%1" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px or %).',invalidInlineStyle:'O valor válido para estilo deve conter uma ou mais tuplas no formato "nome : valor", separados por ponto e vírgula.',cssLengthTooltip:'Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, indisponível</span>'},contextmenu:{options:'Opções Menu de Contexto'},specialChar:{toolbar:'Inserir Caractere Especial',title:'Selecione um Caractere Especial',options:'Opções de Caractere Especial'},link:{toolbar:'Inserir/Editar Link',other:'<outro>',menu:'Editar Link',title:'Editar Link',info:'Informações',target:'Destino',upload:'Enviar ao Servidor',advanced:'Avançado',type:'Tipo de hiperlink',toUrl:'URL',toAnchor:'Âncora nesta página',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<janela popup>',targetFrameName:'Nome do Frame de Destino',targetPopupName:'Nome da Janela Pop-up',popupFeatures:'Propriedades da Janela Pop-up',popupResizable:'Redimensionável',popupStatusBar:'Barra de Status',popupLocationBar:'Barra de Endereços',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menus',popupFullScreen:'Modo Tela Cheia (IE)',popupScrollBars:'Barras de Rolagem',popupDependent:'Dependente (Netscape)',popupLeft:'Esquerda',popupTop:'Topo',id:'Id',langDir:'Direção do idioma',langDirLTR:'Esquerda para Direita (LTR)',langDirRTL:'Direita para Esquerda (RTL)',acccessKey:'Chave de Acesso',name:'Nome',langCode:'Direção do idioma',tabIndex:'�ndice de Tabulação',advisoryTitle:'Título',advisoryContentType:'Tipo de Conteúdo',cssClasses:'Classe de CSS',charset:'Charset do Link',styles:'Estilos',rel:'Tipo de Relação',selectAnchor:'Selecione uma âncora',anchorName:'Nome da âncora',anchorId:'Id da âncora',emailAddress:'Endereço E-Mail',emailSubject:'Assunto da Mensagem',emailBody:'Corpo da Mensagem',noAnchors:'(Não há âncoras no documento)',noUrl:'Por favor, digite o endereço do Link',noEmail:'Por favor, digite o endereço de e-mail'},anchor:{toolbar:'Inserir/Editar Âncora',menu:'Formatar Âncora',title:'Formatar Âncora',name:'Nome da Âncora',errorName:'Por favor, digite o nome da âncora',remove:'Remover Âncora'},list:{numberedTitle:'Propriedades da Lista Numerada',bulletedTitle:'Propriedades da Lista sem Numeros',type:'Tipo',start:'Início',validateStartNumber:'O número inicial da lista deve ser um número inteiro.',circle:'Círculo',disc:'Disco',square:'Quadrado',none:'Nenhum',notset:'<não definido>',armenian:'Numeração Armêna',georgian:'Numeração da Geórgia (an, ban, gan, etc.)',lowerRoman:'Numeração Romana minúscula (i, ii, iii, iv, v, etc.)',upperRoman:'Numeração Romana maiúscula (I, II, III, IV, V, etc.)',lowerAlpha:'Numeração Alfabética minúscula (a, b, c, d, e, etc.)',upperAlpha:'Numeração Alfabética Maiúscula (A, B, C, D, E, etc.)',lowerGreek:'Numeração Grega minúscula (alpha, beta, gamma, etc.)',decimal:'Numeração Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Numeração Decimal com zeros (01, 02, 03, etc.)'},findAndReplace:{title:'Localizar e Substituir',find:'Localizar',replace:'Substituir',findWhat:'Procurar por:',replaceWith:'Substituir por:',notFoundMsg:'O texto especificado não foi encontrado.',findOptions:'Opções',matchCase:'Coincidir Maiúsculas/Minúsculas',matchWord:'Coincidir a palavra inteira',matchCyclic:'Coincidir cíclico',replaceAll:'Substituir Tudo',replaceSuccessMsg:'%1 ocorrência(s) substituída(s).'},table:{toolbar:'Tabela',title:'Formatar Tabela',menu:'Formatar Tabela',deleteTable:'Apagar Tabela',rows:'Linhas',columns:'Colunas',border:'Borda',widthPx:'pixels',widthPc:'%',widthUnit:'unidade largura',cellSpace:'Espaçamento',cellPad:'Margem interna',caption:'Legenda',summary:'Resumo',headers:'Cabeçalho',headersNone:'Nenhum',headersColumn:'Primeira coluna',headersRow:'Primeira linha',headersBoth:'Ambos',invalidRows:'O número de linhas tem que ser um número maior que 0.',invalidCols:'O número de colunas tem que ser um número maior que 0.',invalidBorder:'O tamanho da borda tem que ser um número.',invalidWidth:'A largura da tabela tem que ser um número.',invalidHeight:'A altura da tabela tem que ser um número.',invalidCellSpacing:'O espaçamento das células tem que ser um número.',invalidCellPadding:'A margem interna das células tem que ser um número.',cell:{menu:'Célula',insertBefore:'Inserir célula a esquerda',insertAfter:'Inserir célula a direita',deleteCell:'Remover Células',merge:'Mesclar Células',mergeRight:'Mesclar com célula a direita',mergeDown:'Mesclar com célula abaixo',splitHorizontal:'Dividir célula horizontalmente',splitVertical:'Dividir célula verticalmente',title:'Propriedades da célula',cellType:'Tipo de célula',rowSpan:'Linhas cobertas',colSpan:'Colunas cobertas',wordWrap:'Quebra de palavra',hAlign:'Alinhamento horizontal',vAlign:'Alinhamento vertical',alignBaseline:'Patamar de alinhamento',bgColor:'Cor de fundo',borderColor:'Cor das bordas',data:'Dados',header:'Cabeçalho',yes:'Sim',no:'Não',invalidWidth:'A largura da célula tem que ser um número.',invalidHeight:'A altura da célula tem que ser um número.',invalidRowSpan:'Linhas cobertas tem que ser um número inteiro.',invalidColSpan:'Colunas cobertas tem que ser um número inteiro.',chooseColor:'Escolher'},row:{menu:'Linha',insertBefore:'Inserir linha acima',insertAfter:'Inserir linha abaixo',deleteRow:'Remover Linhas'},column:{menu:'Coluna',insertBefore:'Inserir coluna a esquerda',insertAfter:'Inserir coluna a direita',deleteColumn:'Remover Colunas'}},button:{title:'Formatar Botão',text:'Texto (Valor)',type:'Tipo',typeBtn:'Botão',typeSbm:'Enviar',typeRst:'Limpar'},checkboxAndRadio:{checkboxTitle:'Formatar Caixa de Seleção',radioTitle:'Formatar Botão de Opção',value:'Valor',selected:'Selecionado'},form:{title:'Formatar Formulário',menu:'Formatar Formulário',action:'Ação',method:'Método',encoding:'Codificação'},select:{title:'Formatar Caixa de Listagem',selectInfo:'Informações',opAvail:'Opções disponíveis',value:'Valor',size:'Tamanho',lines:'linhas',chkMulti:'Permitir múltiplas seleções',opText:'Texto',opValue:'Valor',btnAdd:'Adicionar',btnModify:'Modificar',btnUp:'Para cima',btnDown:'Para baixo',btnSetValue:'Definir como selecionado',btnDelete:'Remover'},textarea:{title:'Formatar �rea de Texto',cols:'Colunas',rows:'Linhas'},textfield:{title:'Formatar Caixa de Texto',name:'Nome',value:'Valor',charWidth:'Comprimento (em caracteres)',maxChars:'Número Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Senha'},hidden:{title:'Formatar Campo Oculto',name:'Nome',value:'Valor'},image:{title:'Formatar Imagem',titleButton:'Formatar Botão de Imagem',menu:'Formatar Imagem',infoTab:'Informações da Imagem',btnUpload:'Enviar para o Servidor',upload:'Enviar',alt:'Texto Alternativo',lockRatio:'Travar Proporções',resetSize:'Redefinir para o Tamanho Original',border:'Borda',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Por favor, digite a URL da imagem.',linkTab:'Link',button2Img:'Deseja transformar o botão de imagem em uma imagem comum?',img2Button:'Deseja transformar a imagem em um botão de imagem?',urlMissing:'URL da imagem está faltando.',validateBorder:'A borda deve ser um número inteiro.',validateHSpace:'O HSpace deve ser um número inteiro.',validateVSpace:'O VSpace deve ser um número inteiro.'},flash:{properties:'Propriedades do Flash',propertiesTab:'Propriedades',title:'Propriedades do Flash',chkPlay:'Tocar Automaticamente',chkLoop:'Tocar Infinitamente',chkMenu:'Habilita Menu Flash',chkFull:'Permitir tela cheia',scale:'Escala',scaleAll:'Mostrar tudo',scaleNoBorder:'Sem Borda',scaleFit:'Escala Exata',access:'Acesso ao script',accessAlways:'Sempre',accessSameDomain:'Acessar Mesmo Domínio',accessNever:'Nunca',alignAbsBottom:'Inferior Absoluto',alignAbsMiddle:'Centralizado Absoluto',alignBaseline:'Baseline',alignTextTop:'Superior Absoluto',quality:'Qualidade',qualityBest:'Qualidade Melhor',qualityHigh:'Qualidade Alta',qualityAutoHigh:'Qualidade Alta Automática',qualityMedium:'Qualidade Média',qualityAutoLow:'Qualidade Baixa Automática',qualityLow:'Qualidade Baixa',windowModeWindow:'Janela',windowModeOpaque:'Opaca',windowModeTransparent:'Transparente',windowMode:'Modo da janela',flashvars:'Variáveis do Flash',bgcolor:'Cor do Plano de Fundo',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Por favor, digite o endereço do link',validateHSpace:'O HSpace tem que ser um número',validateVSpace:'O VSpace tem que ser um número.'},spellCheck:{toolbar:'Verificar Ortografia',title:'Corretor Ortográfico',notAvailable:'Desculpe, o serviço não está disponível no momento.',errorLoading:'Erro carregando servidor de aplicação: %s.',notInDic:'Não encontrada',changeTo:'Alterar para',btnIgnore:'Ignorar uma vez',btnIgnoreAll:'Ignorar Todas',btnReplace:'Alterar',btnReplaceAll:'Alterar Todas',btnUndo:'Desfazer',noSuggestions:'-sem sugestões de ortografia-',progress:'Verificação ortográfica em andamento...',noMispell:'Verificação encerrada: Não foram encontrados erros de ortografia',noChanges:'Verificação ortográfica encerrada: Não houve alterações',oneChange:'Verificação ortográfica encerrada: Uma palavra foi alterada',manyChanges:'Verificação ortográfica encerrada: %1 palavras foram alteradas',ieSpellDownload:'A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?'},smiley:{toolbar:'Emoticon',title:'Inserir Emoticon',options:'Opções de Emoticons'},elementsPath:{eleLabel:'Caminho dos Elementos',eleTitle:'Elemento %1'},numberedlist:'Lista numerada',bulletedlist:'Lista sem números',indent:'Aumentar Recuo',outdent:'Diminuir Recuo',justify:{left:'Alinhar Esquerda',center:'Centralizar',right:'Alinhar Direita',block:'Justificado'},blockquote:'Citação',clipboard:{title:'Colar',cutError:'As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).',copyError:'As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).',pasteMsg:'Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.',securityMsg:'As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.',pasteArea:'�rea para Colar'},pastefromword:{confirmCleanup:'O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?',toolbar:'Colar do Word',title:'Colar do Word',error:'Não foi possível limpar os dados colados devido a um erro interno'},pasteText:{button:'Colar como Texto sem Formatação',title:'Colar como Texto sem Formatação'},templates:{button:'Modelos de layout',title:'Modelo de layout de conteúdo',options:'Opções de Template',insertOption:'Substituir o conteúdo atual',selectPromptMsg:'Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):',emptyListMsg:'(Não foram definidos modelos de layout)'},showBlocks:'Mostrar blocos de código',stylesCombo:{label:'Estilo',panelTitle:'Estilos de Formatação',panelTitle1:'Estilos de bloco',panelTitle2:'Estilos de texto corrido',panelTitle3:'Estilos de objeto'},format:{label:'Formatação',panelTitle:'Formatação',tag_p:'Normal',tag_pre:'Formatado',tag_address:'Endereço',tag_h1:'Título 1',tag_h2:'Título 2',tag_h3:'Título 3',tag_h4:'Título 4',tag_h5:'Título 5',tag_h6:'Título 6',tag_div:'Normal (DIV)'},div:{title:'Criar Container de DIV',toolbar:'Criar Container de DIV',cssClassInputLabel:'Classes de CSS',styleSelectLabel:'Estilo',IdInputLabel:'Id',languageCodeInputLabel:'Código de Idioma',inlineStyleInputLabel:'Estilo Inline',advisoryTitleInputLabel:'Título Consulta',langDirLabel:'Direção da Escrita',langDirLTRLabel:'Esquerda para Direita (LTR)',langDirRTLLabel:'Direita para Esquerda (RTL)',edit:'Editar Div',remove:'Remover Div'},iframe:{title:'Propriedade do IFrame',toolbar:'IFrame',noUrl:'Insira a URL do iframe',scrolling:'Abilita scrollbars',border:'Mostra borda do iframe'},font:{label:'Fonte',voiceLabel:'Fonte',panelTitle:'Fonte'},fontSize:{label:'Tamanho',voiceLabel:'Tamanho da fonte',panelTitle:'Tamanho'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor do Plano de Fundo',panelTitle:'Cores',auto:'Automático',more:'Mais Cores...'},colors:{'000':'Preto',800000:'Foquete','8B4513':'Marrom 1','2F4F4F':'Cinza 1','008080':'Cerceta','000080':'Azul Marinho','4B0082':'�ndigo',696969:'Cinza 2',B22222:'Tijolo de Fogo',A52A2A:'Marrom 2',DAA520:'Vara Dourada','006400':'Verde Escuro','40E0D0':'Turquesa','0000CD':'Azul Médio',800080:'Roxo',808080:'Cinza 3',F00:'Vermelho',FF8C00:'Laranja Escuro',FFD700:'Dourado','008000':'Verde','0FF':'Ciano','00F':'Azul',EE82EE:'Violeta',A9A9A9:'Cinza Escuro',FFA07A:'Salmão Claro',FFA500:'Laranja',FFFF00:'Amarelo','00FF00':'Lima',AFEEEE:'Turquesa Pálido',ADD8E6:'Azul Claro',DDA0DD:'Ameixa',D3D3D3:'Cinza Claro',FFF0F5:'Lavanda 1',FAEBD7:'Branco Antiguidade',FFFFE0:'Amarelo Claro',F0FFF0:'Orvalho',F0FFFF:'Azure',F0F8FF:'Azul Alice',E6E6FA:'Lavanda 2',FFF:'Branco'},scayt:{title:'Correção ortográfica durante a digitação',opera_title:'Não suportado no Opera',enable:'Habilitar correção ortográfica durante a digitação',disable:'Desabilitar correção ortográfica durante a digitação',about:'Sobre a correção ortográfica durante a digitação',toggle:'Ativar/desativar correção ortográfica durante a digitação',options:'Opções',langs:'Idiomas',moreSuggestions:'Mais sugestões',ignore:'Ignorar',ignoreAll:'Ignorar todas',addWord:'Adicionar palavra',emptyDic:'O nome do dicionário não deveria estar vazio.',optionsTab:'Opções',allCaps:'Ignorar palavras maiúsculas',ignoreDomainNames:'Ignorar nomes de domínio',mixedCase:'Ignorar palavras com maiúsculas e minúsculas misturadas',mixedWithDigits:'Ignorar palavras com números',languagesTab:'Idiomas',dictionariesTab:'Dicionários',dic_field_name:'Nome do Dicionário',dic_create:'Criar',dic_restore:'Restaurar',dic_delete:'Excluir',dic_rename:'Renomear',dic_info:'Inicialmente, o dicionário do usuário fica armazenado em um Cookie. Porém, Cookies tem tamanho limitado, portanto quand o dicionário do usuário atingir o tamanho limite poderá ser armazenado no nosso servidor. Para armazenar seu dicionário pessoal no nosso servidor deverá especificar um nome para ele. Se já tiver um dicionário armazenado por favor especifique o seu nome e clique em Restaurar.',aboutTab:'Sobre'},about:{title:'Sobre o CKEditor',dlgTitle:'Sobre o CKEditor',help:'Verifique o $1 para obter ajuda.',userGuide:'Guia do Usuário do CKEditor',moreInfo:'Para informações sobre a licença por favor visite o nosso site:',copy:'Copyright &copy; $1. Todos os direitos reservados.'},maximize:'Maximizar',minimize:'Minimize',fakeobjects:{anchor:'Âncora',flash:'Animação em Flash',iframe:'IFrame',hiddenfield:'Campo Oculto',unknown:'Objeto desconhecido'},resize:'Arraste para redimensionar',colordialog:{title:'Selecione uma Cor',options:'Opções de Cor',highlight:'Grifar',selected:'Cor Selecionada',clear:'Limpar'},toolbarCollapse:'Diminuir Barra de Ferramentas',toolbarExpand:'Aumentar Barra de Ferramentas',toolbarGroups:{document:'Documento',clipboard:'Clipboard/Desfazer',editing:'Edição',forms:'Formulários',basicstyles:'Estilos Básicos',paragraph:'Paragrafo',links:'Links',insert:'Inserir',styles:'Estilos',colors:'Cores',tools:'Ferramentas'},bidi:{ltr:'Direção do texto da esquerda para a direita',rtl:'Direção do texto da direita para a esquerda'},docprops:{label:'Propriedades Documento',title:'Propriedades Documento',design:'Design',meta:'Meta Dados',chooseColor:'Escolher',other:'<outro>',docTitle:'Título da Página',charset:'Codificação de Caracteres',charsetOther:'Outra Codificação de Caracteres',charsetASCII:'ASCII',charsetCE:'Europa Central',charsetCT:'Chinês Tradicional (Big5)',charsetCR:'Cirílico',charsetGR:'Grego',charsetJP:'Japonês',charsetKR:'Coreano',charsetTR:'Turco',charsetUN:'Unicode (UTF-8)',charsetWE:'Europa Ocidental',docType:'Cabeçalho Tipo de Documento',docTypeOther:'Outro Tipo de Documento',xhtmlDec:'Incluir Declarações XHTML',bgColor:'Cor do Plano de Fundo',bgImage:'URL da Imagem de Plano de Fundo',bgFixed:'Plano de Fundo Fixo',txtColor:'Cor do Texto',margin:'Margens da Página',marginTop:'Superior',marginLeft:'Inferior',marginRight:'Direita',marginBottom:'Inferior',metaKeywords:'Palavras-chave de Indexação do Documento (separadas por vírgula)',metaDescription:'Descrição do Documento',metaAuthor:'Autor',metaCopyright:'Direitos Autorais',previewHtml:'<p>Este é um <strong>texto de exemplo</strong>. Você está usando <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/pt.js b/upload/public/js/3rd_party/ckeditor/lang/pt.js
new file mode 100644
index 00000000..211b6f29
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/pt.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.pt={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Fonte',newPage:'Nova Página',save:'Guardar',preview:'Pré-visualizar',cut:'Cortar',copy:'Copiar',paste:'Colar',print:'Imprimir',underline:'Sublinhado',bold:'Negrito',italic:'Itálico',selectAll:'Seleccionar Tudo',removeFormat:'Eliminar Formato',strike:'Rasurado',subscript:'Superior à Linha',superscript:'Inferior à Linha',horizontalrule:'Inserir Linha Horizontal',pagebreak:'Inserir Quebra de Página',pagebreakAlt:'Page Break',unlink:'Eliminar Hiperligação',undo:'Anular',redo:'Repetir',common:{browseServer:'Navegar no Servidor',url:'URL',protocol:'Protocolo',upload:'Carregar',uploadSubmit:'Enviar para o Servidor',image:'Imagem',flash:'Flash',form:'Formulário',checkbox:'Caixa de Verificação',radio:'Botão de Opção',textField:'Campo de Texto',textarea:'�rea de Texto',hiddenField:'Campo Escondido',button:'Botão',select:'Caixa de Combinação',imageButton:'Botão de Imagem',notSet:'<Não definido>',id:'Id',name:'Nome',langDir:'Orientação de idioma',langDirLtr:'Esquerda à Direita (LTR)',langDirRtl:'Direita a Esquerda (RTL)',langCode:'Código de Idioma',longDescr:'Descrição Completa do URL',cssClass:'Classes de Estilo de Folhas Classes',advisoryTitle:'Título',cssStyle:'Estilo',ok:'OK',cancel:'Cancelar',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Avançado',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Largura',height:'Altura',align:'Alinhamento',alignLeft:'Esquerda',alignRight:'Direita',alignCenter:'Centrado',alignTop:'Topo',alignMiddle:'Centro',alignBottom:'Fundo',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Inserir Caracter Especial',title:'Seleccione um caracter especial',options:'Special Character Options'},link:{toolbar:'Inserir/Editar Hiperligação',other:'<outro>',menu:'Editar Hiperligação',title:'Hiperligação',info:'Informação de Hiperligação',target:'Destino',upload:'Carregar',advanced:'Avançado',type:'Tipo de Hiperligação',toUrl:'URL',toAnchor:'Referência a esta página',toEmail:'E-Mail',targetFrame:'<Frame>',targetPopup:'<Janela de popup>',targetFrameName:'Nome do Frame Destino',targetPopupName:'Nome da Janela de Popup',popupFeatures:'Características de Janela de Popup',popupResizable:'Resizable',popupStatusBar:'Barra de Estado',popupLocationBar:'Barra de localização',popupToolbar:'Barra de Ferramentas',popupMenuBar:'Barra de Menu',popupFullScreen:'Janela Completa (IE)',popupScrollBars:'Barras de deslocamento',popupDependent:'Dependente (Netscape)',popupLeft:'Posição Esquerda',popupTop:'Posição Direita',id:'Id',langDir:'Orientação de idioma',langDirLTR:'Esquerda à Direita (LTR)',langDirRTL:'Direita a Esquerda (RTL)',acccessKey:'Chave de Acesso',name:'Nome',langCode:'Orientação de idioma',tabIndex:'�ndice de Tubulação',advisoryTitle:'Título',advisoryContentType:'Tipo de Conteúdo',cssClasses:'Classes de Estilo de Folhas Classes',charset:'Fonte de caracteres vinculado',styles:'Estilo',rel:'Relationship',selectAnchor:'Seleccionar una referência',anchorName:'Por Nome de Referência',anchorId:'Por ID de elemento',emailAddress:'Endereço de E-Mail',emailSubject:'Título de Mensagem',emailBody:'Corpo da Mensagem',noAnchors:'(Não há referências disponíveis no documento)',noUrl:'Por favor introduza a hiperligação URL',noEmail:'Por favor introduza o endereço de e-mail'},anchor:{toolbar:' Inserir/Editar Âncora',menu:'Propriedades da Âncora',title:'Propriedades da Âncora',name:'Nome da Âncora',errorName:'Por favor, introduza o nome da âncora',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Procurar',replace:'Substituir',findWhat:'Texto a Procurar:',replaceWith:'Substituir por:',notFoundMsg:'O texto especificado não foi encontrado.',findOptions:'Find Options',matchCase:'Maiúsculas/Minúsculas',matchWord:'Coincidir com toda a palavra',matchCyclic:'Match cyclic',replaceAll:'Substituir Tudo',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Propriedades da Tabela',menu:'Propriedades da Tabela',deleteTable:'Eliminar Tabela',rows:'Linhas',columns:'Colunas',border:'Tamanho do Limite',widthPx:'pixeis',widthPc:'percentagem',widthUnit:'width unit',cellSpace:'Esp. e/células',cellPad:'Esp. interior',caption:'Título',summary:'Sumário',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Célula',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Eliminar Célula',merge:'Unir Células',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Linha',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Eliminar Linhas'},column:{menu:'Coluna',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Eliminar Coluna'}},button:{title:'Propriedades do Botão',text:'Texto (Valor)',type:'Tipo',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Propriedades da Caixa de Verificação',radioTitle:'Propriedades do Botão de Opção',value:'Valor',selected:'Seleccionado'},form:{title:'Propriedades do Formulário',menu:'Propriedades do Formulário',action:'Acção',method:'Método',encoding:'Encoding'},select:{title:'Propriedades da Caixa de Combinação',selectInfo:'Informação',opAvail:'Opções Possíveis',value:'Valor',size:'Tamanho',lines:'linhas',chkMulti:'Permitir selecções múltiplas',opText:'Texto',opValue:'Valor',btnAdd:'Adicionar',btnModify:'Modificar',btnUp:'Para cima',btnDown:'Para baixo',btnSetValue:'Definir um valor por defeito',btnDelete:'Apagar'},textarea:{title:'Propriedades da �rea de Texto',cols:'Colunas',rows:'Linhas'},textfield:{title:'Propriedades do Campo de Texto',name:'Nome',value:'Valor',charWidth:'Tamanho do caracter',maxChars:'Nr. Máximo de Caracteres',type:'Tipo',typeText:'Texto',typePass:'Palavra-chave'},hidden:{title:'Propriedades do Campo Escondido',name:'Nome',value:'Valor'},image:{title:'Propriedades da Imagem',titleButton:'Propriedades do Botão de imagens',menu:'Propriedades da Imagem',infoTab:'Informação da Imagem',btnUpload:'Enviar para o Servidor',upload:'Carregar',alt:'Texto Alternativo',lockRatio:'Proporcional',resetSize:'Tamanho Original',border:'Limite',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',alertUrl:'Por favor introduza o URL da imagem',linkTab:'Hiperligação',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Propriedades do Flash',propertiesTab:'Properties',title:'Propriedades do Flash',chkPlay:'Reproduzir automaticamente',chkLoop:'Loop',chkMenu:'Permitir Menu do Flash',chkFull:'Allow Fullscreen',scale:'Escala',scaleAll:'Mostrar tudo',scaleNoBorder:'Sem Limites',scaleFit:'Tamanho Exacto',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs inferior',alignAbsMiddle:'Abs centro',alignBaseline:'Linha de base',alignTextTop:'Topo do texto',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Cor de Fundo',hSpace:'Esp.Horiz',vSpace:'Esp.Vert',validateSrc:'Por favor introduza a hiperligação URL',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Verificação Ortográfica',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Não está num directório',changeTo:'Mudar para',btnIgnore:'Ignorar',btnIgnoreAll:'Ignorar Tudo',btnReplace:'Substituir',btnReplaceAll:'Substituir Tudo',btnUndo:'Anular',noSuggestions:'- Sem sugestões -',progress:'Verificação ortográfica em progresso…',noMispell:'Verificação ortográfica completa: não foram encontrados erros',noChanges:'Verificação ortográfica completa: não houve alteração de palavras',oneChange:'Verificação ortográfica completa: uma palavra alterada',manyChanges:'Verificação ortográfica completa: %1 palavras alteradas',ieSpellDownload:' Verificação ortográfica não instalada. Quer descarregar agora?'},smiley:{toolbar:'Emoticons',title:'Inserir um Emoticon',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Numeração',bulletedlist:'Marcas',indent:'Aumentar Avanço',outdent:'Diminuir Avanço',justify:{left:'Alinhar à Esquerda',center:'Alinhar ao Centro',right:'Alinhar à Direita',block:'Justificado'},blockquote:'Block Quote',clipboard:{title:'Colar',cutError:'A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).',copyError:'A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).',pasteMsg:'Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prima <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Colar do Word',title:'Colar do Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Colar como Texto Simples',title:'Colar como Texto Simples'},templates:{button:'Modelos',title:'Modelo de Conteúdo',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Por favor, seleccione o modelo a abrir no editor<br>(o conteúdo actual será perdido):',emptyListMsg:'(Sem modelos definidos)'},showBlocks:'Show Blocks',stylesCombo:{label:'Estilo',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formato',panelTitle:'Formato',tag_p:'Normal',tag_pre:'Formatado',tag_address:'Endereço',tag_h1:'Título 1',tag_h2:'Título 2',tag_h3:'Título 3',tag_h4:'Título 4',tag_h5:'Título 5',tag_h6:'Título 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Tipo de Letra',voiceLabel:'Font',panelTitle:'Tipo de Letra'},fontSize:{label:'Tamanho',voiceLabel:'Font Size',panelTitle:'Tamanho'},colorButton:{textColorTitle:'Cor do Texto',bgColorTitle:'Cor de Fundo',panelTitle:'Colors',auto:'Automático',more:'Mais Cores...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Propriedades do Documento',title:'Propriedades do Documento',design:'Design',meta:'Meta Data',chooseColor:'Choose',other:'<outro>',docTitle:'Título da Página',charset:'Codificação de Caracteres',charsetOther:'Outra Codificação de Caracteres',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Tipo de Cabeçalho do Documento',docTypeOther:'Outro Tipo de Cabeçalho do Documento',xhtmlDec:'Incluir Declarações XHTML',bgColor:'Cor de Fundo',bgImage:'Caminho para a Imagem de Fundo',bgFixed:'Fundo Fixo',txtColor:'Cor do Texto',margin:'Margem das Páginas',marginTop:'Topo',marginLeft:'Esquerda',marginRight:'Direita',marginBottom:'Fundo',metaKeywords:'Palavras de Indexação do Documento (separadas por virgula)',metaDescription:'Descrição do Documento',metaAuthor:'Autor',metaCopyright:'Direitos de Autor',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ro.js b/upload/public/js/3rd_party/ckeditor/lang/ro.js
new file mode 100644
index 00000000..66fe7ebf
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ro.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ro={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Sursa',newPage:'Pagină nouă',save:'Salvează',preview:'Previzualizare',cut:'Taie',copy:'Copiază',paste:'Adaugă',print:'Printează',underline:'Subliniat (underline)',bold:'Îngroşat (bold)',italic:'Înclinat (italic)',selectAll:'Selectează tot',removeFormat:'Înlătură formatarea',strike:'Tăiat (strike through)',subscript:'Indice (subscript)',superscript:'Putere (superscript)',horizontalrule:'Inserează linie orizontă',pagebreak:'Inserează separator de pagină (Page Break)',pagebreakAlt:'Page Break',unlink:'Înlătură link (legătură web)',undo:'Starea anterioară (undo)',redo:'Starea ulterioară (redo)',common:{browseServer:'Răsfoieşte server',url:'URL',protocol:'Protocol',upload:'Încarcă',uploadSubmit:'Trimite la server',image:'Imagine',flash:'Flash',form:'Formular (Form)',checkbox:'Bifă (Checkbox)',radio:'Buton radio (RadioButton)',textField:'Câmp text (TextField)',textarea:'Suprafaţă text (Textarea)',hiddenField:'Câmp ascuns (HiddenField)',button:'Buton',select:'Câmp selecţie (SelectionField)',imageButton:'Buton imagine (ImageButton)',notSet:'<nesetat>',id:'Id',name:'Nume',langDir:'Direcţia cuvintelor',langDirLtr:'stânga-dreapta (LTR)',langDirRtl:'dreapta-stânga (RTL)',langCode:'Codul limbii',longDescr:'Descrierea lungă URL',cssClass:'Clasele cu stilul paginii (CSS)',advisoryTitle:'Titlul consultativ',cssStyle:'Stil',ok:'Bine',cancel:'Anulare',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Avansat',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Lăţime',height:'Înălţime',align:'Aliniere',alignLeft:'Stânga',alignRight:'Dreapta',alignCenter:'Centru',alignTop:'Sus',alignMiddle:'Mijloc',alignBottom:'Jos',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Inserează caracter special',title:'Selectează caracter special',options:'Special Character Options'},link:{toolbar:'Inserează/Editează link (legătură web)',other:'<alt>',menu:'Editează Link',title:'Link (Legătură web)',info:'Informaţii despre link (Legătură web)',target:'Ţintă (Target)',upload:'Încarcă',advanced:'Avansat',type:'Tipul link-ului (al legăturii web)',toUrl:'URL',toAnchor:'Ancoră în această pagină',toEmail:'E-Mail',targetFrame:'<frame>',targetPopup:'<fereastra popup>',targetFrameName:'Numele frame-ului ţintă',targetPopupName:'Numele ferestrei popup',popupFeatures:'Proprietăţile ferestrei popup',popupResizable:'Resizable',popupStatusBar:'Bara de status',popupLocationBar:'Bara de locaţie',popupToolbar:'Bara de opţiuni',popupMenuBar:'Bara de meniu',popupFullScreen:'Tot ecranul (Full Screen)(IE)',popupScrollBars:'Scroll Bars',popupDependent:'Dependent (Netscape)',popupLeft:'Poziţia la stânga',popupTop:'Poziţia la dreapta',id:'Id',langDir:'Direcţia cuvintelor',langDirLTR:'stânga-dreapta (LTR)',langDirRTL:'dreapta-stânga (RTL)',acccessKey:'Tasta de acces',name:'Nume',langCode:'Direcţia cuvintelor',tabIndex:'Indexul tabului',advisoryTitle:'Titlul consultativ',advisoryContentType:'Tipul consultativ al titlului',cssClasses:'Clasele cu stilul paginii (CSS)',charset:'Setul de caractere al resursei legate',styles:'Stil',rel:'Relationship',selectAnchor:'Selectaţi o ancoră',anchorName:'după numele ancorei',anchorId:'după Id-ul elementului',emailAddress:'Adresă de e-mail',emailSubject:'Subiectul mesajului',emailBody:'Conţinutul mesajului',noAnchors:'(Nicio ancoră disponibilă în document)',noUrl:'Vă rugăm să scrieţi URL-ul',noEmail:'Vă rugăm să scrieţi adresa de e-mail'},anchor:{toolbar:'Inserează/Editează ancoră',menu:'Proprietăţi ancoră',title:'Proprietăţi ancoră',name:'Numele ancorei',errorName:'Vă rugăm scrieţi numele ancorei',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Găseşte şi înlocuieşte',find:'Găseşte',replace:'Înlocuieşte',findWhat:'Găseşte:',replaceWith:'Înlocuieşte cu:',notFoundMsg:'Textul specificat nu a fost găsit.',findOptions:'Find Options',matchCase:'Deosebeşte majuscule de minuscule (Match case)',matchWord:'Doar cuvintele întregi',matchCyclic:'Match cyclic',replaceAll:'Înlocuieşte tot',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabel',title:'Proprietăţile tabelului',menu:'Proprietăţile tabelului',deleteTable:'Şterge tabel',rows:'Linii',columns:'Coloane',border:'Mărimea marginii',widthPx:'pixeli',widthPc:'procente',widthUnit:'width unit',cellSpace:'Spaţiu între celule',cellPad:'Spaţiu în cadrul celulei',caption:'Titlu (Caption)',summary:'Rezumat',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Celulă',insertBefore:'Inserează celulă înainte',insertAfter:'Inserează celulă după',deleteCell:'Şterge celule',merge:'Uneşte celule',mergeRight:'Uneşte la dreapta',mergeDown:'Uneşte jos',splitHorizontal:'Împarte celula pe orizontală',splitVertical:'Împarte celula pe verticală',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Linie',insertBefore:'Inserează linie înainte',insertAfter:'Inserează linie după',deleteRow:'Şterge linii'},column:{menu:'Coloană',insertBefore:'Inserează coloană înainte',insertAfter:'Inserează coloană după',deleteColumn:'Şterge celule'}},button:{title:'Proprietăţi buton',text:'Text (Valoare)',type:'Tip',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Proprietăţi bifă (Checkbox)',radioTitle:'Proprietăţi buton radio (Radio Button)',value:'Valoare',selected:'Selectat'},form:{title:'Proprietăţi formular (Form)',menu:'Proprietăţi formular (Form)',action:'Acţiune',method:'Metodă',encoding:'Encoding'},select:{title:'Proprietăţi câmp selecţie (Selection Field)',selectInfo:'Informaţii',opAvail:'Opţiuni disponibile',value:'Valoare',size:'Mărime',lines:'linii',chkMulti:'Permite selecţii multiple',opText:'Text',opValue:'Valoare',btnAdd:'Adaugă',btnModify:'Modifică',btnUp:'Sus',btnDown:'Jos',btnSetValue:'Setează ca valoare selectată',btnDelete:'Şterge'},textarea:{title:'Proprietăţi suprafaţă text (Textarea)',cols:'Coloane',rows:'Linii'},textfield:{title:'Proprietăţi câmp text (Text Field)',name:'Nume',value:'Valoare',charWidth:'Lărgimea caracterului',maxChars:'Caractere maxime',type:'Tip',typeText:'Text',typePass:'Parolă'},hidden:{title:'Proprietăţi câmp ascuns (Hidden Field)',name:'Nume',value:'Valoare'},image:{title:'Proprietăţile imaginii',titleButton:'Proprietăţi buton imagine (Image Button)',menu:'Proprietăţile imaginii',infoTab:'Informaţii despre imagine',btnUpload:'Trimite la server',upload:'Încarcă',alt:'Text alternativ',lockRatio:'Păstrează proporţiile',resetSize:'Resetează mărimea',border:'Margine',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Vă rugăm să scrieţi URL-ul imaginii',linkTab:'Link (Legătură web)',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Proprietăţile flash-ului',propertiesTab:'Properties',title:'Proprietăţile flash-ului',chkPlay:'Rulează automat',chkLoop:'Repetă (Loop)',chkMenu:'Activează meniul flash',chkFull:'Allow Fullscreen',scale:'Scală',scaleAll:'Arată tot',scaleNoBorder:'Fără margini (No border)',scaleFit:'Potriveşte',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Jos absolut (Abs Bottom)',alignAbsMiddle:'Mijloc absolut (Abs Middle)',alignBaseline:'Linia de jos (Baseline)',alignTextTop:'Text sus',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Coloarea fundalului',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Vă rugăm să scrieţi URL-ul',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Verifică text',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Nu e în dicţionar',changeTo:'Schimbă în',btnIgnore:'Ignoră',btnIgnoreAll:'Ignoră toate',btnReplace:'Înlocuieşte',btnReplaceAll:'Înlocuieşte tot',btnUndo:'Starea anterioară (undo)',noSuggestions:'- Fără sugestii -',progress:'Verificarea textului în desfăşurare...',noMispell:'Verificarea textului terminată: Nicio greşeală găsită',noChanges:'Verificarea textului terminată: Niciun cuvânt modificat',oneChange:'Verificarea textului terminată: Un cuvânt modificat',manyChanges:'Verificarea textului terminată: 1% cuvinte modificate',ieSpellDownload:'Unealta pentru verificat textul (Spell checker) neinstalată. Doriţi să o descărcaţi acum?'},smiley:{toolbar:'Figură expresivă (Emoticon)',title:'Inserează o figură expresivă (Emoticon)',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Listă numerotată',bulletedlist:'Listă cu puncte',indent:'Creşte indentarea',outdent:'Scade indentarea',justify:{left:'Aliniere la stânga',center:'Aliniere centrală',right:'Aliniere la dreapta',block:'Aliniere în bloc (Block Justify)'},blockquote:'Citat',clipboard:{title:'Adaugă',cutError:'Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).',copyError:'Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).',pasteMsg:'Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<STRONG>Ctrl/Cmd+V</STRONG>) şi apăsaţi <STRONG>OK</STRONG>.',securityMsg:'Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Adaugă din Word',title:'Adaugă din Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Adaugă ca text simplu (Plain Text)',title:'Adaugă ca text simplu (Plain Text)'},templates:{button:'Template-uri (şabloane)',title:'Template-uri (şabloane) de conţinut',options:'Template Options',insertOption:'Înlocuieşte cuprinsul actual',selectPromptMsg:'Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):',emptyListMsg:'(Niciun template (şablon) definit)'},showBlocks:'Arată blocurile',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formatare',panelTitle:'Formatare',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Mărime',voiceLabel:'Font Size',panelTitle:'Mărime'},colorButton:{textColorTitle:'Culoarea textului',bgColorTitle:'Coloarea fundalului',panelTitle:'Colors',auto:'Automatic',more:'Mai multe culori...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Proprietăţile documentului',title:'Proprietăţile documentului',design:'Design',meta:'Meta Tags',chooseColor:'Choose',other:'<alt>',docTitle:'Titlul paginii',charset:'Encoding setului de caractere',charsetOther:'Alt encoding al setului de caractere',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinezesc tradiţional (Big5)',charsetCR:'Chirilic',charsetGR:'Grecesc',charsetJP:'Japonez',charsetKR:'Corean',charsetTR:'Turcesc',charsetUN:'Unicode (UTF-8)',charsetWE:'Vest european',docType:'Document Type Heading',docTypeOther:'Alt Document Type Heading',xhtmlDec:'Include declaraţii XHTML',bgColor:'Culoarea fundalului (Background Color)',bgImage:'URL-ul imaginii din fundal (Background Image URL)',bgFixed:'Fundal neflotant, fix (Non-scrolling Background)',txtColor:'Culoarea textului',margin:'Marginile paginii',marginTop:'Sus',marginLeft:'Stânga',marginRight:'Dreapta',marginBottom:'Jos',metaKeywords:'Cuvinte cheie după care se va indexa documentul (separate prin virgulă)',metaDescription:'Descrierea documentului',metaAuthor:'Autor',metaCopyright:'Drepturi de autor',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/ru.js b/upload/public/js/3rd_party/ckeditor/lang/ru.js
new file mode 100644
index 00000000..364cf0f7
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/ru.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.ru={dir:'ltr',editorTitle:'Визуальный редактор тек�та, %1, нажмите ALT-0 дл� открыти� �правки.',toolbars:'Панели ин�трументов редактора',editor:'Визуальный редактор тек�та',source:'И�точник',newPage:'�ова� �траница',save:'Сохранить',preview:'Предварительный про�мотр',cut:'Вырезать',copy:'Копировать',paste:'В�тавить',print:'Печать',underline:'Подчеркнутый',bold:'Полужирный',italic:'Кур�ив',selectAll:'Выделить в�е',removeFormat:'Убрать форматирование',strike:'Зачеркнутый',subscript:'Под�трочный индек�',superscript:'�ад�трочный индек�',horizontalrule:'В�тавить горизонтальную линию',pagebreak:'В�тавить разрыв �траницы дл� печати',pagebreakAlt:'Разрыв �траницы',unlink:'Убрать ��ылку',undo:'Отменить',redo:'Повторить',common:{browseServer:'Выбор на �ервере',url:'С�ылка',protocol:'Протокол',upload:'Загрузка',uploadSubmit:'Загрузить на �ервер',image:'Изображение',flash:'Flash',form:'Форма',checkbox:'Флагова� кнопка',radio:'Кнопка выбора',textField:'Тек�товое поле',textarea:'Много�трочное тек�товое поле',hiddenField:'Скрытое поле',button:'Кнопка',select:'Спи�ок выбора',imageButton:'Изображение-кнопка',notSet:'<не указано>',id:'Идентификатор',name:'Им�',langDir:'�аправление тек�та',langDirLtr:'Слева направо (LTR)',langDirRtl:'Справа налево (RTL)',langCode:'Код �зыка',longDescr:'Длинное опи�ание ��ылки',cssClass:'Кла�� CSS',advisoryTitle:'Заголовок',cssStyle:'Стиль',ok:'ОК',cancel:'Отмена',close:'Закрыть',preview:'Предпро�мотр',generalTab:'О�новное',advancedTab:'Дополнительно',validateNumberFailed:'Это значение не �вл�ет�� чи�лом.',confirmNewPage:'�е�охранённые изменени� будут потер�ны! Вы дей�твительно желаете перейти на другую �траницу?',confirmCancel:'�екоторые параметры были изменены. Вы уверены, что желаете закрыть без �охранени�?',options:'Параметры',target:'Цель',targetNew:'�овое окно (_blank)',targetTop:'Главное окно (_top)',targetSelf:'Текущее окно (_self)',targetParent:'Родитель�кое окно (_parent)',langDirLTR:'Слева направо (LTR)',langDirRTL:'Справа налево (RTL)',styles:'Стиль',cssClasses:'Кла��ы CSS',width:'Ширина',height:'Вы�ота',align:'Выравнивание',alignLeft:'По левому краю',alignRight:'По правому краю',alignCenter:'По центру',alignTop:'По верху',alignMiddle:'По �ередине',alignBottom:'По низу',invalidHeight:'Вы�ота задает�� чи�лом.',invalidWidth:'Ширина задает�� чи�лом.',invalidCssLength:'Значение, указанное в поле "%1", должно быть положительным целым чи�лом. Допу�кает�� указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).',invalidHtmlLength:'Значение, указанное в поле "%1", должно быть положительным целым чи�лом. Допу�кает�� указание единиц меры HTML (px или %).',invalidInlineStyle:'Значение, указанное дл� �тил� �лемента, должно �о�то�ть из одной или не�кольких пар данных в формате "параметр : значение", разделённых точкой � зап�той.',cssLengthTooltip:'Введите значение в пик�ел�х, либо чи�ло � корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).',unavailable:'%1<span class="cke_accessibility">, недо�тупно</span>'},contextmenu:{options:'Параметры контек�тного меню'},specialChar:{toolbar:'В�тавить �пециальный �имвол',title:'Выберите �пециальный �имвол',options:'Выбор �пециального �имвола'},link:{toolbar:'В�тавить/Редактировать ��ылку',other:'<другой>',menu:'Редактировать ��ылку',title:'С�ылка',info:'Информаци� о ��ылке',target:'Цель',upload:'Загрузка',advanced:'Дополнительно',type:'Тип ��ылки',toUrl:'С�ылка',toAnchor:'С�ылка на �корь в тек�те',toEmail:'Email',targetFrame:'<фрейм>',targetPopup:'<в�плывающее окно>',targetFrameName:'Им� целевого фрейма',targetPopupName:'Им� в�плывающего окна',popupFeatures:'Параметры в�плывающего окна',popupResizable:'Измен�емый размер',popupStatusBar:'Строка �о�то�ни�',popupLocationBar:'Панель адре�а',popupToolbar:'Панель ин�трументов',popupMenuBar:'Панель меню',popupFullScreen:'Полно�кранное (IE)',popupScrollBars:'Поло�ы прокрутки',popupDependent:'Зави�имое (Netscape)',popupLeft:'От�туп �лева',popupTop:'От�туп �верху',id:'Идентификатор',langDir:'�аправление тек�та',langDirLTR:'Слева направо (LTR)',langDirRTL:'Справа налево (RTL)',acccessKey:'Клавиша до�тупа',name:'Им�',langCode:'Код �зыка',tabIndex:'По�ледовательно�ть перехода',advisoryTitle:'Заголовок',advisoryContentType:'Тип �одержимого',cssClasses:'Кла��ы CSS',charset:'Кодировка ре�ур�а',styles:'Стиль',rel:'Отношение',selectAnchor:'Выберите �корь',anchorName:'По имени',anchorId:'По идентификатору',emailAddress:'Email адре�',emailSubject:'Тема �ообщени�',emailBody:'Тек�т �ообщени�',noAnchors:'(В документе нет ни одного �кор�)',noUrl:'Пожалуй�та, введите ��ылку',noEmail:'Пожалуй�та, введите email адре�'},anchor:{toolbar:'В�тавить / редактировать �корь',menu:'Изменить �корь',title:'Свой�тва �кор�',name:'Им� �кор�',errorName:'Пожалуй�та, введите им� �кор�',remove:'Удалить �корь'},list:{numberedTitle:'Свой�тва нумерованного �пи�ка',bulletedTitle:'Свой�тва маркированного �пи�ка',type:'Тип',start:'�ачина� �',validateStartNumber:'Первый номер �пи�ка должен быть задан обычным целым чи�лом.',circle:'Круг',disc:'Окружно�ть',square:'Квадрат',none:'�ет',notset:'<не указано>',armenian:'�рм�н�ка� нумераци�',georgian:'Грузин�ка� нумераци� (ани, бани, гани, и т.д.)',lowerRoman:'Строчные рим�кие (i, ii, iii, iv, v, и т.д.)',upperRoman:'Заглавные рим�кие (I, II, III, IV, V, и т.д.)',lowerAlpha:'Строчные латин�кие (a, b, c, d, e, и т.д.)',upperAlpha:'Заглавные латин�кие (A, B, C, D, E, и т.д.)',lowerGreek:'Строчные грече�кие (альфа, бета, гамма, и т.д.)',decimal:'Де��тичные (1, 2, 3, и т.д.)',decimalLeadingZero:'Де��тичные � ведущим нулём (01, 02, 03, и т.д.)'},findAndReplace:{title:'Пои�к и замена',find:'�айти',replace:'Заменить',findWhat:'�айти:',replaceWith:'Заменить на:',notFoundMsg:'И�комый тек�т не найден.',findOptions:'Опции пои�ка',matchCase:'Учитывать реги�тр',matchWord:'Только �лово целиком',matchCyclic:'По в�ему тек�ту',replaceAll:'Заменить в�ё',replaceSuccessMsg:'У�пешно заменено %1 раз(а).'},table:{toolbar:'Таблица',title:'Свой�тва таблицы',menu:'Свой�тва таблицы',deleteTable:'Удалить таблицу',rows:'Строки',columns:'Колонки',border:'Размер границ',widthPx:'пик�елей',widthPc:'процентов',widthUnit:'единица измерени�',cellSpace:'Внешний от�туп �чеек',cellPad:'Внутренний от�туп �чеек',caption:'Заголовок',summary:'Итоги',headers:'Заголовки',headersNone:'Без заголовков',headersColumn:'Лева� колонка',headersRow:'Верхн�� �трока',headersBoth:'Сверху и �лева',invalidRows:'Количе�тво �трок должно быть больше 0.',invalidCols:'Количе�тво �толбцов должно быть больше 0.',invalidBorder:'Размер границ должен быть чи�лом.',invalidWidth:'Ширина таблицы должна быть чи�лом.',invalidHeight:'Вы�ота таблицы должна быть чи�лом.',invalidCellSpacing:'Внешний от�туп �чеек (cellspacing) должен быть чи�лом.',invalidCellPadding:'Внутренний от�туп �чеек (cellpadding) должен быть чи�лом.',cell:{menu:'Ячейка',insertBefore:'В�тавить �чейку �лева',insertAfter:'В�тавить �чейку �права',deleteCell:'Удалить �чейки',merge:'Объединить �чейки',mergeRight:'Объединить � правой',mergeDown:'Объединить � нижней',splitHorizontal:'Разделить �чейку по горизонтали',splitVertical:'Разделить �чейку по вертикали',title:'Свой�тва �чейки',cellType:'Тип �чейки',rowSpan:'Объедин�ет �трок',colSpan:'Объедин�ет колонок',wordWrap:'Перено� по �ловам',hAlign:'Горизонтальное выравнивание',vAlign:'Вертикальное выравнивание',alignBaseline:'По базовой линии',bgColor:'Цвет фона',borderColor:'Цвет границ',data:'Данные',header:'Заголовок',yes:'Да',no:'�ет',invalidWidth:'Ширина �чейки должна быть чи�лом.',invalidHeight:'Вы�ота �чейки должна быть чи�лом.',invalidRowSpan:'Количе�тво объедин�емых �трок должно быть задано чи�лом.',invalidColSpan:'Количе�тво объедин�емых колонок должно быть задано чи�лом.',chooseColor:'Выберите'},row:{menu:'Строка',insertBefore:'В�тавить �троку �верху',insertAfter:'В�тавить �троку �низу',deleteRow:'Удалить �троки'},column:{menu:'Колонка',insertBefore:'В�тавить колонку �лева',insertAfter:'В�тавить колонку �права',deleteColumn:'Удалить колонки'}},button:{title:'Свой�тва кнопки',text:'Тек�т (Значение)',type:'Тип',typeBtn:'Кнопка',typeSbm:'Отправка',typeRst:'Сбро�'},checkboxAndRadio:{checkboxTitle:'Свой�тва флаговой кнопки',radioTitle:'Свой�тва кнопки выбора',value:'Значение',selected:'Выбрано'},form:{title:'Свой�тва формы',menu:'Свой�тва формы',action:'Дей�твие',method:'Метод',encoding:'Кодировка'},select:{title:'Свой�тва �пи�ка выбора',selectInfo:'Информаци� о �пи�ке выбора',opAvail:'До�тупные варианты',value:'Значение',size:'Размер',lines:'�трок(и)',chkMulti:'Разрешить выбор не�кольких вариантов',opText:'Тек�т',opValue:'Значение',btnAdd:'Добавить',btnModify:'Изменить',btnUp:'Подн�ть',btnDown:'Опу�тить',btnSetValue:'Пометить как выбранное',btnDelete:'Удалить'},textarea:{title:'Свой�тва много�трочного тек�тового пол�',cols:'Колонок',rows:'Строк'},textfield:{title:'Свой�тва тек�тового пол�',name:'Им�',value:'Значение',charWidth:'Ширина пол� (в �имволах)',maxChars:'Мак�. количе�тво �имволов',type:'Тип �одержимого',typeText:'Тек�т',typePass:'Пароль'},hidden:{title:'Свой�тва �крытого пол�',name:'Им�',value:'Значение'},image:{title:'Свой�тва изображени�',titleButton:'Свой�тва изображени�-кнопки',menu:'Свой�тва изображени�',infoTab:'Данные об изображении',btnUpload:'Загрузить на �ервер',upload:'Загрузить',alt:'�льтернативный тек�т',lockRatio:'Сохран�ть пропорции',resetSize:'Вернуть обычные размеры',border:'Граница',hSpace:'Гориз. от�туп',vSpace:'Вертик. от�туп',alertUrl:'Пожалуй�та, введите ��ылку на изображение',linkTab:'С�ылка',button2Img:'Вы желаете преобразовать �то изображение-кнопку в обычное изображение?',img2Button:'Вы желаете преобразовать �то обычное изображение в изображение-кнопку?',urlMissing:'�е указана ��ылка на изображение.',validateBorder:'Размер границ должен быть задан чи�лом.',validateHSpace:'Горизонтальный от�туп должен быть задан чи�лом.',validateVSpace:'Вертикальный от�туп должен быть задан чи�лом.'},flash:{properties:'Свой�тва Flash',propertiesTab:'Свой�тва',title:'Свой�тва Flash',chkPlay:'�втоматиче�кое во�произведение',chkLoop:'Повтор�ть',chkMenu:'Включить меню Flash',chkFull:'Разрешить полно�кранный режим',scale:'Ма�штабировать',scaleAll:'Пропорционально',scaleNoBorder:'Заходить за границы',scaleFit:'Заполн�ть',access:'До�туп к �криптам',accessAlways:'В�егда',accessSameDomain:'В том же домене',accessNever:'�икогда',alignAbsBottom:'По низу тек�та',alignAbsMiddle:'По �ередине тек�та',alignBaseline:'По базовой линии',alignTextTop:'По верху тек�та',quality:'Каче�тво',qualityBest:'Лучшее',qualityHigh:'Вы�окое',qualityAutoHigh:'Запу�к на вы�оком',qualityMedium:'Среднее',qualityAutoLow:'Запу�к на низком',qualityLow:'�изкое',windowModeWindow:'Обычный',windowModeOpaque:'�епрозрачный',windowModeTransparent:'Прозрачный',windowMode:'Взаимодей�твие � окном',flashvars:'Переменные дл� Flash',bgcolor:'Цвет фона',hSpace:'Гориз. от�туп',vSpace:'Вертик. от�туп',validateSrc:'Вы должны вве�ти ��ылку',validateHSpace:'Горизонтальный от�туп задает�� чи�лом.',validateVSpace:'Вертикальный от�туп задает�� чи�лом.'},spellCheck:{toolbar:'Проверить орфографию',title:'Проверка орфографии',notAvailable:'Извините, но в данный момент �ерви� недо�тупен.',errorLoading:'Произошла ошибка при подключении к �ерверу проверки орфографии: %s.',notInDic:'От�ут�твует в �ловаре',changeTo:'Изменить на',btnIgnore:'Пропу�тить',btnIgnoreAll:'Пропу�тить в�ё',btnReplace:'Заменить',btnReplaceAll:'Заменить в�ё',btnUndo:'Отменить',noSuggestions:'- Варианты от�ут�твуют -',progress:'Орфографи� провер�ет��...',noMispell:'Проверка орфографии завершена. Ошибок не найдено',noChanges:'Проверка орфографии завершена. �е изменено ни одного �лова',oneChange:'Проверка орфографии завершена. Изменено одно �лово',manyChanges:'Проверка орфографии завершена. Изменено �лов: %1',ieSpellDownload:'Модуль проверки орфографии не у�тановлен. Хотите �качать его?'},smiley:{toolbar:'Смайлы',title:'В�тавить �майл',options:'Выбор �майла'},elementsPath:{eleLabel:'Путь �лементов',eleTitle:'Элемент %1'},numberedlist:'В�тавить / удалить нумерованный �пи�ок',bulletedlist:'В�тавить / удалить маркированный �пи�ок',indent:'Увеличить от�туп',outdent:'Уменьшить от�туп',justify:{left:'По левому краю',center:'По центру',right:'По правому краю',block:'По ширине'},blockquote:'Цитата',clipboard:{title:'В�тавить',cutError:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть операции по вырезке тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+X).',copyError:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору выполн�ть операции по копированию тек�та. Пожалуй�та, и�пользуйте дл� �того клавиатуру (Ctrl/Cmd+C).',pasteMsg:'Пожалуй�та, в�тавьте тек�т в зону ниже, и�пользу� клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку "OK".',securityMsg:'�а�тройки безопа�но�ти вашего браузера не разрешают редактору напр�мую обращать�� к буферу обмена. Вы должны в�тавить тек�т �нова в �то окно.',pasteArea:'Зона дл� в�тавки'},pastefromword:{confirmCleanup:'Тек�т, который вы желаете в�тавить, по в�ей видимо�ти, был �копирован из Word. Следует ли очи�тить его перед в�тавкой?',toolbar:'В�тавить из Word',title:'В�тавить из Word',error:'�евозможно очи�тить в�тавленные данные из-за внутренней ошибки'},pasteText:{button:'В�тавить только тек�т',title:'В�тавить только тек�т'},templates:{button:'Шаблоны',title:'Шаблоны �одержимого',options:'Параметры шаблона',insertOption:'Заменить текущее �одержимое',selectPromptMsg:'Пожалуй�та, выберите, какой шаблон �ледует открыть в редакторе',emptyListMsg:'(не определено ни одного шаблона)'},showBlocks:'Отображать блоки',stylesCombo:{label:'Стили',panelTitle:'Стили форматировани�',panelTitle1:'Стили блока',panelTitle2:'Стили �лемента',panelTitle3:'Стили объекта'},format:{label:'Форматирование',panelTitle:'Форматирование',tag_p:'Обычное',tag_pre:'Моноширинное',tag_address:'�дре�',tag_h1:'Заголовок 1',tag_h2:'Заголовок 2',tag_h3:'Заголовок 3',tag_h4:'Заголовок 4',tag_h5:'Заголовок 5',tag_h6:'Заголовок 6',tag_div:'Обычное (div)'},div:{title:'Создать Div-контейнер',toolbar:'Создать Div-контейнер',cssClassInputLabel:'Кла��ы CSS',styleSelectLabel:'Стиль',IdInputLabel:'Идентификатор',languageCodeInputLabel:'Код �зыка',inlineStyleInputLabel:'Стиль �лемента',advisoryTitleInputLabel:'Заголовок',langDirLabel:'�аправление тек�та',langDirLTRLabel:'Слева направо (LTR)',langDirRTLLabel:'Справа налево (RTL)',edit:'Редактировать контейнер',remove:'Удалить контейнер'},iframe:{title:'Свой�тва iFrame',toolbar:'iFrame',noUrl:'Пожалуй�та, введите ��ылку фрейма',scrolling:'Отображать поло�ы прокрутки',border:'Показать границы фрейма'},font:{label:'Шрифт',voiceLabel:'Шрифт',panelTitle:'Шрифт'},fontSize:{label:'Размер',voiceLabel:'Размер шрифта',panelTitle:'Размер шрифта'},colorButton:{textColorTitle:'Цвет тек�та',bgColorTitle:'Цвет фона',panelTitle:'Цвета',auto:'�втоматиче�ки',more:'Ещё цвета...'},colors:{'000':'Чёрный',800000:'Бордовый','8B4513':'Кожано-коричневый','2F4F4F':'Темный �иневато-�ерый','008080':'Сине-зелёный','000080':'Тёмно-�иний','4B0082':'Индиго',696969:'Тёмно-�ерый',B22222:'Кирпичный',A52A2A:'Коричневый',DAA520:'Золоти�то-берёзовый','006400':'Темно-зелёный','40E0D0':'Бирюзовый','0000CD':'Умеренно �иний',800080:'Пурпурный',808080:'Серый',F00:'Кра�ный',FF8C00:'Темно-оранжевый',FFD700:'Золоти�тый','008000':'Зелёный','0FF':'Ва�ильковый','00F':'Синий',EE82EE:'Фиолетовый',A9A9A9:'Ту�кло-�ерый',FFA07A:'Светло-ло�о�евый',FFA500:'Оранжевый',FFFF00:'Жёлтый','00FF00':'Лайма',AFEEEE:'Бледно-�иний',ADD8E6:'Свелто-голубой',DDA0DD:'Сливовый',D3D3D3:'Светло-�ерый',FFF0F5:'Розово-лавандовый',FAEBD7:'�нтичный белый',FFFFE0:'Светло-жёлтый',F0FFF0:'Медв�ной ро�ы',F0FFFF:'Лазурный',F0F8FF:'Бледно-голубой',E6E6FA:'Лавандовый',FFF:'Белый'},scayt:{title:'Проверка орфографии по мере ввода (SCAYT)',opera_title:'�е поддерживает�� Opera',enable:'Включить SCAYT',disable:'Отключить SCAYT',about:'О SCAYT',toggle:'Переключить SCAYT',options:'�а�тройки',langs:'Языки',moreSuggestions:'Ещё варианты',ignore:'Пропу�тить',ignoreAll:'Пропу�тить в�ё',addWord:'Добавить �лово',emptyDic:'Вы должны указать название �ловар�.',optionsTab:'Параметры',allCaps:'Игнорировать �лова из заглавных букв',ignoreDomainNames:'Игнорировать доменные имена',mixedCase:'Игнорировать �лова из букв в разном реги�тре',mixedWithDigits:'Игнорировать �лова, �одержащие цифры',languagesTab:'Языки',dictionariesTab:'Словари',dic_field_name:'�азвание �ловар�',dic_create:'Создать',dic_restore:'Во��тановить',dic_delete:'Удалить',dic_rename:'Переименовать',dic_info:'Изначально, пользователь�кий �ловарь хранит�� в cookie, которые ограничены в размере. Когда �ловарь пользовател� выра�тает до размеров, что его невозможно хранить в cookie, он перено�ит�� на хранение на наш �ервер. Чтобы �охранить ваш �ловарь на нашем �ервере, вам �ледует указать название вашего �ловар�. Е�ли у ва� уже был �ловарь, который вы �охран�ли на нашем �ервере, то укажите зде�ь его название и нажмите кнопку Во��тановить.',aboutTab:'О SCAYT'},about:{title:'О CKEditor',dlgTitle:'О CKEditor',help:'$1 �одержит подробную �правку по и�пользованию.',userGuide:'Руковод�тво пользовател� CKEditor',moreInfo:'Дл� получени� информации о лицензии, пожалуй�та, перейдите на наш �айт:',copy:'Copyright &copy; $1. В�е права защищены.'},maximize:'Развернуть',minimize:'Свернуть',fakeobjects:{anchor:'Якорь',flash:'Flash анимаци�',iframe:'iFrame',hiddenfield:'Скрытое поле',unknown:'�еизве�тный объект'},resize:'Перетащите дл� изменени� размера',colordialog:{title:'Выберите цвет',options:'�а�тройки цвета',highlight:'Под кур�ором',selected:'Выбранный цвет',clear:'Очи�тить'},toolbarCollapse:'Свернуть панель ин�трументов',toolbarExpand:'Развернуть панель ин�трументов',toolbarGroups:{document:'Документ',clipboard:'Буфер обмена / Отмена дей�твий',editing:'Корректировка',forms:'Формы',basicstyles:'Про�тые �тили',paragraph:'�бзац',links:'С�ылки',insert:'В�тавка',styles:'Стили',colors:'Цвета',tools:'Ин�трументы'},bidi:{ltr:'�аправление тек�та �лева направо',rtl:'�аправление тек�та �права налево'},docprops:{label:'Свой�тва документа',title:'Свой�тва документа',design:'Дизайн',meta:'Метаданные',chooseColor:'Выберите',other:'Другой ...',docTitle:'Заголовок �траницы',charset:'Кодировка набора �имволов',charsetOther:'Друга� кодировка набора �имволов',charsetASCII:'ASCII',charsetCE:'Центрально-европей�ка�',charsetCT:'Китай�ка� традиционна� (Big5)',charsetCR:'Кириллица',charsetGR:'Грече�ка�',charsetJP:'Япон�ка�',charsetKR:'Корей�ка�',charsetTR:'Турецка�',charsetUN:'Юникод (UTF-8)',charsetWE:'Западно-европей�ка�',docType:'Заголовок типа документа',docTypeOther:'Другой заголовок типа документа',xhtmlDec:'Включить объ�влени� XHTML',bgColor:'Цвет фона',bgImage:'С�ылка на фоновое изображение',bgFixed:'Фон прикреплён (не проматывает��)',txtColor:'Цвет тек�та',margin:'От�тупы �траницы',marginTop:'Верхний',marginLeft:'Левый',marginRight:'Правый',marginBottom:'�ижний',metaKeywords:'Ключевые �лова документа (через зап�тую)',metaDescription:'Опи�ание документа',metaAuthor:'�втор',metaCopyright:'�втор�кие права',previewHtml:'<p>Это <strong>пример</strong> тек�та, напи�анного � помощью <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/sk.js b/upload/public/js/3rd_party/ckeditor/lang/sk.js
new file mode 100644
index 00000000..6705876a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/sk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sk={dir:'ltr',editorTitle:'Rich text editor, %1, stla�te ALT 0 pre nápovedu.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Zdroj',newPage:'Nová stránka',save:'Uložiť',preview:'Náhľad',cut:'Vystrihnúť',copy:'Kopírovať',paste:'Vložiť',print:'Tla�',underline:'Pod�iarknuté',bold:'Tu�né',italic:'Kurzíva',selectAll:'Vybrať všetko',removeFormat:'Odstrániť formátovanie',strike:'Pre�iarknuté',subscript:'Dolný index',superscript:'Horný index',horizontalrule:'Vložiť vodorovnú �iaru',pagebreak:'Vložiť oddeľova� stránky',pagebreakAlt:'Zalomenie strany',unlink:'Odstrániť odkaz',undo:'Späť',redo:'Znovu',common:{browseServer:'Prechádzať server',url:'URL',protocol:'Protokol',upload:'Odoslať',uploadSubmit:'Odoslať na server',image:'Obrázok',flash:'Flash',form:'Formulár',checkbox:'Zaškrtávacie polí�ko',radio:'Prepína�',textField:'Textové pole',textarea:'Textová oblasť',hiddenField:'Skryté pole',button:'Tla�idlo',select:'Rozbaľovací zoznam',imageButton:'Obrázkové tla�idlo',notSet:'<nenastavené>',id:'Id',name:'Meno',langDir:'Orientácia jazyka',langDirLtr:'Zľava doprava (LTR)',langDirRtl:'Sprava doľava (RTL)',langCode:'Kód jazyka',longDescr:'Dlhý popis URL',cssClass:'Trieda štýlu',advisoryTitle:'Pomocný titulok',cssStyle:'Štýl',ok:'OK',cancel:'Zrušiť',close:'Zatvorit',preview:'Náhľad',generalTab:'Hlavné',advancedTab:'Rozšírené',validateNumberFailed:'Hodnota nieje �íslo.',confirmNewPage:'Prajete si na�ítat novú stránku? Všetky neuložené zmeny budú stratené. ',confirmCancel:'Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Šírka',height:'Výška',align:'Zarovnanie',alignLeft:'Vľavo',alignRight:'Vpravo',alignCenter:'Na stred',alignTop:'Nahor',alignMiddle:'Na stred',alignBottom:'Dole',invalidHeight:'Výška musí byť �íslo.',invalidWidth:'Šírka musí byť �íslo.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Vložiť špeciálne znaky',title:'Výber špeciálneho znaku',options:'Možnosti špecíalneho znaku'},link:{toolbar:'Vložiť/zmeniť odkaz',other:'<iný>',menu:'Zmeniť odkaz',title:'Odkaz',info:'Informácie o odkaze',target:'Cieľ',upload:'Odoslať',advanced:'Rozšírené',type:'Typ odkazu',toUrl:'URL',toAnchor:'Kotva v tejto stránke',toEmail:'E-Mail',targetFrame:'<rámec>',targetPopup:'<vyskakovacie okno>',targetFrameName:'Meno rámu cieľa',targetPopupName:'Názov vyskakovacieho okna',popupFeatures:'Vlastnosti vyskakovacieho okna',popupResizable:'Meniteľná veľkosť',popupStatusBar:'Stavový riadok',popupLocationBar:'Panel umiestnenia',popupToolbar:'Panel nástrojov',popupMenuBar:'Panel ponuky',popupFullScreen:'Celá obrazovka (IE)',popupScrollBars:'Posuvníky',popupDependent:'Závislosť (Netscape)',popupLeft:'Ľavý okraj',popupTop:'Horný okraj',id:'Id',langDir:'Orientácia jazyka',langDirLTR:'Zľava doprava (LTR)',langDirRTL:'Sprava doľava (RTL)',acccessKey:'Prístupový kľú�',name:'Meno',langCode:'Orientácia jazyka',tabIndex:'Poradie prvku',advisoryTitle:'Pomocný titulok',advisoryContentType:'Pomocný typ obsahu',cssClasses:'Trieda štýlu',charset:'Priradená znaková sada',styles:'Štýl',rel:'Relationship',selectAnchor:'Vybrať kotvu',anchorName:'Podľa mena kotvy',anchorId:'Podľa Id objektu',emailAddress:'E-Mailová adresa',emailSubject:'Predmet správy',emailBody:'Telo správy',noAnchors:'(V stránke nie je definovaná žiadna kotva)',noUrl:'Zadajte prosím URL odkazu',noEmail:'Zadajte prosím e-mailovú adresu'},anchor:{toolbar:'Vložiť/zmeniť kotvu',menu:'Vlastnosti kotvy',title:'Vlastnosti kotvy',name:'Meno kotvy',errorName:'Zadajte prosím meno kotvy',remove:'Remove Anchor'},list:{numberedTitle:'Vlastnosti �íselného zoznamu',bulletedTitle:'Bulleted List Properties',type:'Druh',start:'Za�iatok',validateStartNumber:'Za�iato�né �íslo �íselného zoznamu musí byť celé �íslo.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Nájsť a nahradiť',find:'Hľadať',replace:'Nahradiť',findWhat:'Čo hľadať:',replaceWith:'Čím nahradiť:',notFoundMsg:'Hľadaný text nebol nájdený.',findOptions:'Find Options',matchCase:'Rozlišovať malé/veľké písmená',matchWord:'Len celé slová',matchCyclic:'Match cyclic',replaceAll:'Nahradiť všetko',replaceSuccessMsg:'%1 výskyt(ov) nahradených.'},table:{toolbar:'Tabuľka',title:'Vlastnosti tabuľky',menu:'Vlastnosti tabuľky',deleteTable:'Vymazať tabuľku',rows:'Riadky',columns:'Stĺpce',border:'Ohrani�enie',widthPx:'pixelov',widthPc:'percent',widthUnit:'width unit',cellSpace:'Vzdialenosť buniek',cellPad:'Odsadenie obsahu',caption:'Popis',summary:'Prehľad',headers:'Hlavi�ka',headersNone:'Žiadne',headersColumn:'Prvý stĺpec',headersRow:'Prvý riadok',headersBoth:'Obe',invalidRows:'Po�et riadkov musí byť �íslo vä�šie ako 0.',invalidCols:'Po�et stĺpcov musí byť �íslo vä�šie ako 0.',invalidBorder:'Širka rámu musí byť celé �íslo.',invalidWidth:'Širka tabuľky musí byť �íslo.',invalidHeight:'Výška tabuľky musí byť �íslo.',invalidCellSpacing:'Medzera mädzi bunkami (spacing) musí byť �íslo.',invalidCellPadding:'Odsadenie v bunkách (padding) musí byť �íslo.',cell:{menu:'Bunka',insertBefore:'Vložiť bunku pred',insertAfter:'Vložiť bunku za',deleteCell:'Vymazať bunky',merge:'Zlú�iť bunky',mergeRight:'Zlú�iť doprava',mergeDown:'Zlú�iť dole',splitHorizontal:'Rozdeliť bunky horizontálne',splitVertical:'Rozdeliť bunky vertikálne',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Riadok',insertBefore:'Vložiť riadok za',insertAfter:'Vložiť riadok pred',deleteRow:'Vymazať riadok'},column:{menu:'Stĺpec',insertBefore:'Vložiť stĺpec za',insertAfter:'Vložiť stĺpec pred',deleteColumn:'Zmazať stĺpec'}},button:{title:'Vlastnosti tla�idla',text:'Text',type:'Typ',typeBtn:'Tla�idlo',typeSbm:'Odoslať',typeRst:'Vymazať'},checkboxAndRadio:{checkboxTitle:'Vlastnosti zaškrtávacieho polí�ka',radioTitle:'Vlastnosti prepína�a',value:'Hodnota',selected:'Vybrané'},form:{title:'Vlastnosti formulára',menu:'Vlastnosti formulára',action:'Akcie',method:'Metóda',encoding:'Kódovanie'},select:{title:'Vlastnosti rozbaľovacieho zoznamu',selectInfo:'Info',opAvail:'Dostupné možnosti',value:'Hodnota',size:'Veľkosť',lines:'riadkov',chkMulti:'Povoliť viacnásobný výber',opText:'Text',opValue:'Hodnota',btnAdd:'Pridať',btnModify:'Zmeniť',btnUp:'Hore',btnDown:'Dole',btnSetValue:'Nastaviť ako vybranú hodnotu',btnDelete:'Zmazať'},textarea:{title:'Vlastnosti textovej oblasti',cols:'Stĺpce',rows:'Riadky'},textfield:{title:'Vlastnosti textového poľa',name:'Názov',value:'Hodnota',charWidth:'Šírka pola (znakov)',maxChars:'Maximálny po�et znakov',type:'Typ',typeText:'Text',typePass:'Heslo'},hidden:{title:'Vlastnosti skrytého poľa',name:'Názov',value:'Hodnota'},image:{title:'Vlastnosti obrázku',titleButton:'Vlastnosti obrázkového tla�idla',menu:'Vlastnosti obrázku',infoTab:'Informácie o obrázku',btnUpload:'Odoslať na server',upload:'Odoslať',alt:'Alternatívny text',lockRatio:'Zámok',resetSize:'Pôvodná veľkosť',border:'Okraje',hSpace:'H-medzera',vSpace:'V-medzera',alertUrl:'Zadajte prosím URL obrázku',linkTab:'Odkaz',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Vlastnosti Flashu',propertiesTab:'Properties',title:'Vlastnosti Flashu',chkPlay:'Automatické prehrávanie',chkLoop:'Opakovanie',chkMenu:'Povoliť Flash Menu',chkFull:'Allow Fullscreen',scale:'Mierka',scaleAll:'Zobraziť mierku',scaleNoBorder:'Bez okrajov',scaleFit:'Roztiahnuť na celé',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Úplne dole',alignAbsMiddle:'Do stredu',alignBaseline:'Na základňu',alignTextTop:'Na horný okraj textu',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Farba pozadia',hSpace:'H-medzera',vSpace:'V-medzera',validateSrc:'Zadajte prosím URL odkazu',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Kontrola pravopisu',title:'Spell Check',notAvailable:'Služba práve nieje dostupná.',errorLoading:'Chyba pri na�ítaní slovníka z adresy: %s.',notInDic:'Nie je v slovníku',changeTo:'Zmeniť na',btnIgnore:'Ignorovať',btnIgnoreAll:'Ignorovať všetko',btnReplace:'Prepísat',btnReplaceAll:'Prepísat všetko',btnUndo:'Späť',noSuggestions:'- Žiadny návrh -',progress:'Prebieha kontrola pravopisu...',noMispell:'Kontrola pravopisu dokon�ená: bez chýb',noChanges:'Kontrola pravopisu dokon�ená: žiadne slová nezmenené',oneChange:'Kontrola pravopisu dokon�ená: zmenené jedno slovo',manyChanges:'Kontrola pravopisu dokon�ená: zmenených %1 slov',ieSpellDownload:'Kontrola pravopisu nie je naištalovaná. Chcete ju hne� stiahnuť?'},smiley:{toolbar:'Smajlíky',title:'Vkladanie smajlíkov',options:'Možnosti smajlíkov'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Číslovanie',bulletedlist:'Odrážky',indent:'Zvä�šiť odsadenie',outdent:'Zmenšiť odsadenie',justify:{left:'Zarovnať vľavo',center:'Zarovnať na stred',right:'Zarovnať vpravo',block:'Zarovnať do bloku'},blockquote:'Citácia',clipboard:{title:'Vložiť',cutError:'Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre vystrihnutie zvoleného textu do schránky. Prosím vystrihnite zvolený text do schránky pomocou klávesnice (Ctrl/Cmd+X).',copyError:'Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre kopírovanie zvoleného textu do schránky. Prosím skopírujte zvolený text do schránky pomocou klávesnice (Ctrl/Cmd+C).',pasteMsg:'Prosím vložte nasledovný rám�ek použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stla�te <STRONG>OK</STRONG>.',securityMsg:'Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru pristupovať priamo k datám v schránke. Musíte ich vložiť znovu do tohto okna.',pasteArea:'Vložiť pole'},pastefromword:{confirmCleanup:'Vkladaný text vyzerá byť skopírovaný z Wordu. Chcete ho automaticky vy�istiť pred vkladaním?',toolbar:'Vložiť z Wordu',title:'Vložiť z Wordu',error:'Nastala chyba pri �istení údajov. Nie je možné vy�istiť vložené údaje.'},pasteText:{button:'Vložiť ako �istý text',title:'Vložiť ako �istý text'},templates:{button:'Šablóny',title:'Šablóny obsahu',options:'Vlastnosti šablóny',insertOption:'Nahradiť aktuálny obsah',selectPromptMsg:'Prosím vyberte šablóny na otvorenie v editore<br>(súšasný obsah bude stratený):',emptyListMsg:'(žiadne šablóny nenájdené)'},showBlocks:'Ukázať bloky',stylesCombo:{label:'Štýl',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Formát',panelTitle:'Formát',tag_p:'Normálny',tag_pre:'Formátovaný',tag_address:'Adresa',tag_h1:'Nadpis 1',tag_h2:'Nadpis 2',tag_h3:'Nadpis 3',tag_h4:'Nadpis 4',tag_h5:'Nadpis 5',tag_h6:'Nadpis 6',tag_div:'Odsek (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame - vlastnosti',toolbar:'IFrame',noUrl:'Vložte URL pre iframe',scrolling:'Povoliť skrolovanie',border:'Zobraziť orámovanie'},font:{label:'Písmo',voiceLabel:'Font',panelTitle:'Písmo'},fontSize:{label:'Veľkosť',voiceLabel:'Veľkosť písma',panelTitle:'Veľkosť'},colorButton:{textColorTitle:'Farba textu',bgColorTitle:'Farba pozadia',panelTitle:'Farby',auto:'Automaticky',more:'Viac farieb...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximalizovať',minimize:'Minimalizovať',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Vlastnosti dokumentu',title:'Vlastnosti dokumentu',design:'Design',meta:'Meta Data',chooseColor:'Choose',other:'<iný>',docTitle:'Titulok',charset:'Kódová stránka',charsetOther:'Iná kódová stránka',charsetASCII:'ASCII',charsetCE:'Stredoeurópske',charsetCT:'Čínština tradi�ná (Big5)',charsetCR:'Cyrillika',charsetGR:'Gré�tina',charsetJP:'Japon�ina',charsetKR:'Korej�ina',charsetTR:'Ture�tina',charsetUN:'Unicode (UTF-8)',charsetWE:'Západná európa',docType:'Typ záhlavia dokumentu',docTypeOther:'Iný typ záhlavia dokumentu',xhtmlDec:'Obsahuje deklarácie XHTML',bgColor:'Farba pozadia',bgImage:'URL adresa obrázku na pozadí',bgFixed:'Fixné pozadie',txtColor:'Farba textu',margin:'Okraje stránky',marginTop:'Horný',marginLeft:'Ľavý',marginRight:'Pravý',marginBottom:'Dolný',metaKeywords:'Kľú�ové slová pre indexovanie (oddelené �iarkou)',metaDescription:'Popis stránky',metaAuthor:'Autor',metaCopyright:'Autorské práva',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/sl.js b/upload/public/js/3rd_party/ckeditor/lang/sl.js
new file mode 100644
index 00000000..ee237871
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/sl.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sl={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Izvorna koda',newPage:'Nova stran',save:'Shrani',preview:'Predogled',cut:'Izreži',copy:'Kopiraj',paste:'Prilepi',print:'Natisni',underline:'Pod�rtano',bold:'Krepko',italic:'Leže�e',selectAll:'Izberi vse',removeFormat:'Odstrani oblikovanje',strike:'Pre�rtano',subscript:'Podpisano',superscript:'Nadpisano',horizontalrule:'Vstavi vodoravno �rto',pagebreak:'Vstavi prelom strani',pagebreakAlt:'Page Break',unlink:'Odstrani povezavo',undo:'Razveljavi',redo:'Ponovi',common:{browseServer:'Prebrskaj na strežniku',url:'URL',protocol:'Protokol',upload:'Prenesi',uploadSubmit:'Pošlji na strežnik',image:'Slika',flash:'Flash',form:'Obrazec',checkbox:'Potrditveno polje',radio:'Izbirno polje',textField:'Vnosno polje',textarea:'Vnosno obmo�je',hiddenField:'Skrito polje',button:'Gumb',select:'Spustni seznam',imageButton:'Gumb s sliko',notSet:'<ni postavljen>',id:'Id',name:'Ime',langDir:'Smer jezika',langDirLtr:'Od leve proti desni (LTR)',langDirRtl:'Od desne proti levi (RTL)',langCode:'Oznaka jezika',longDescr:'Dolg opis URL-ja',cssClass:'Razred stilne predloge',advisoryTitle:'Predlagani naslov',cssStyle:'Slog',ok:'V redu',cancel:'Prekli�i',close:'Close',preview:'Preview',generalTab:'Splošno',advancedTab:'Napredno',validateNumberFailed:'Ta vrednost ni število.',confirmNewPage:'Vse neshranjene spremembe te vsebine bodo izgubljene. Ali gotovo želiš naložiti novo stran?',confirmCancel:'Nekaj možnosti je bilo spremenjenih. Ali gotovo želiš zapreti okno?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Višina',align:'Poravnava',alignLeft:'Levo',alignRight:'Desno',alignCenter:'Sredinsko',alignTop:'Na vrh',alignMiddle:'V sredino',alignBottom:'Na dno',invalidHeight:'Višina mora biti število.',invalidWidth:'Širina mora biti število.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, nedosegljiv</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Vstavi posebni znak',title:'Izberi posebni znak',options:'Special Character Options'},link:{toolbar:'Vstavi/uredi povezavo',other:'<drug>',menu:'Uredi povezavo',title:'Povezava',info:'Podatki o povezavi',target:'Cilj',upload:'Prenesi',advanced:'Napredno',type:'Vrsta povezave',toUrl:'URL',toAnchor:'Zaznamek na tej strani',toEmail:'Elektronski naslov',targetFrame:'<okvir>',targetPopup:'<pojavno okno>',targetFrameName:'Ime ciljnega okvirja',targetPopupName:'Ime pojavnega okna',popupFeatures:'Zna�ilnosti pojavnega okna',popupResizable:'Spremenljive velikosti',popupStatusBar:'Vrstica stanja',popupLocationBar:'Naslovna vrstica',popupToolbar:'Orodna vrstica',popupMenuBar:'Menijska vrstica',popupFullScreen:'Celozaslonska slika (IE)',popupScrollBars:'Drsniki',popupDependent:'Podokno (Netscape)',popupLeft:'Lega levo',popupTop:'Lega na vrhu',id:'Id',langDir:'Smer jezika',langDirLTR:'Od leve proti desni (LTR)',langDirRTL:'Od desne proti levi (RTL)',acccessKey:'Vstopno geslo',name:'Ime',langCode:'Smer jezika',tabIndex:'Številka tabulatorja',advisoryTitle:'Predlagani naslov',advisoryContentType:'Predlagani tip vsebine (content-type)',cssClasses:'Razred stilne predloge',charset:'Kodna tabela povezanega vira',styles:'Slog',rel:'Relationship',selectAnchor:'Izberi zaznamek',anchorName:'Po imenu zaznamka',anchorId:'Po ID-ju elementa',emailAddress:'Elektronski naslov',emailSubject:'Predmet sporo�ila',emailBody:'Vsebina sporo�ila',noAnchors:'(V tem dokumentu ni zaznamkov)',noUrl:'Vnesite URL povezave',noEmail:'Vnesite elektronski naslov'},anchor:{toolbar:'Vstavi/uredi zaznamek',menu:'Lastnosti zaznamka',title:'Lastnosti zaznamka',name:'Ime zaznamka',errorName:'Prosim vnesite ime zaznamka',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Najdi in zamenjaj',find:'Najdi',replace:'Zamenjaj',findWhat:'Najdi:',replaceWith:'Zamenjaj z:',notFoundMsg:'Navedeno besedilo ni bilo najdeno.',findOptions:'Find Options',matchCase:'Razlikuj velike in male �rke',matchWord:'Samo cele besede',matchCyclic:'Primerjaj znake v cirilici',replaceAll:'Zamenjaj vse',replaceSuccessMsg:'%1 pojavitev je bilo zamenjano.'},table:{toolbar:'Tabela',title:'Lastnosti tabele',menu:'Lastnosti tabele',deleteTable:'Izbriši tabelo',rows:'Vrstice',columns:'Stolpci',border:'Velikost obrobe',widthPx:'pik',widthPc:'procentov',widthUnit:'width unit',cellSpace:'Razmik med celicami',cellPad:'Polnilo med celicami',caption:'Naslov',summary:'Povzetek',headers:'Glave',headersNone:'Brez',headersColumn:'Prvi stolpec',headersRow:'Prva vrstica',headersBoth:'Oboje',invalidRows:'Število vrstic mora biti ve�je od 0.',invalidCols:'Število stolpcev mora biti ve�je od 0.',invalidBorder:'Širina obrobe mora biti število.',invalidWidth:'Širina tabele mora biti število.',invalidHeight:'Višina tabele mora biti število.',invalidCellSpacing:'Razmik med celicami mora biti število.',invalidCellPadding:'Zamik celic mora biti število',cell:{menu:'Celica',insertBefore:'Vstavi celico pred',insertAfter:'Vstavi celico za',deleteCell:'Izbriši celice',merge:'Združi celice',mergeRight:'Združi desno',mergeDown:'Druži navzdol',splitHorizontal:'Razdeli celico vodoravno',splitVertical:'Razdeli celico navpi�no',title:'Lastnosti celice',cellType:'Vrsta celice',rowSpan:'Razpon vrstic',colSpan:'Razpon stolpcev',wordWrap:'Prelom besedila',hAlign:'Vodoravna poravnava',vAlign:'Navpi�na poravnava',alignBaseline:'Osnovnica',bgColor:'Barva ozadja',borderColor:'Barva obrobe',data:'Podatki',header:'Glava',yes:'Da',no:'Ne',invalidWidth:'Širina celice mora biti število.',invalidHeight:'Višina celice mora biti število.',invalidRowSpan:'Razpon vrstic mora biti celo število.',invalidColSpan:'Razpon stolpcev mora biti celo število.',chooseColor:'Izberi'},row:{menu:'Vrstica',insertBefore:'Vstavi vrstico pred',insertAfter:'Vstavi vrstico za',deleteRow:'Izbriši vrstice'},column:{menu:'Stolpec',insertBefore:'Vstavi stolpec pred',insertAfter:'Vstavi stolpec za',deleteColumn:'Izbriši stolpce'}},button:{title:'Lastnosti gumba',text:'Besedilo (Vrednost)',type:'Tip',typeBtn:'Gumb',typeSbm:'Potrdi',typeRst:'Ponastavi'},checkboxAndRadio:{checkboxTitle:'Lastnosti potrditvenega polja',radioTitle:'Lastnosti izbirnega polja',value:'Vrednost',selected:'Izbrano'},form:{title:'Lastnosti obrazca',menu:'Lastnosti obrazca',action:'Akcija',method:'Metoda',encoding:'Kodiranje znakov'},select:{title:'Lastnosti spustnega seznama',selectInfo:'Podatki',opAvail:'Razpoložljive izbire',value:'Vrednost',size:'Velikost',lines:'vrstic',chkMulti:'Dovoli izbor ve�ih vrstic',opText:'Besedilo',opValue:'Vrednost',btnAdd:'Dodaj',btnModify:'Spremeni',btnUp:'Gor',btnDown:'Dol',btnSetValue:'Postavi kot privzeto izbiro',btnDelete:'Izbriši'},textarea:{title:'Lastnosti vnosnega obmo�ja',cols:'Stolpcev',rows:'Vrstic'},textfield:{title:'Lastnosti vnosnega polja',name:'Ime',value:'Vrednost',charWidth:'Dolžina',maxChars:'Najve�je število znakov',type:'Tip',typeText:'Besedilo',typePass:'Geslo'},hidden:{title:'Lastnosti skritega polja',name:'Ime',value:'Vrednost'},image:{title:'Lastnosti slike',titleButton:'Lastnosti gumba s sliko',menu:'Lastnosti slike',infoTab:'Podatki o sliki',btnUpload:'Pošlji na strežnik',upload:'Pošlji',alt:'Nadomestno besedilo',lockRatio:'Zakleni razmerje',resetSize:'Ponastavi velikost',border:'Obroba',hSpace:'Vodoravni razmik',vSpace:'Navpi�ni razmik',alertUrl:'Vnesite URL slike',linkTab:'Povezava',button2Img:'Želiš pretvoriti izbrani gumb s sliko v preprosto sliko?',img2Button:'Želiš pretvoriti izbrano sliko v gumb s sliko?',urlMissing:'Manjka vir (URL) slike.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Lastnosti Flash',propertiesTab:'Lastnosti',title:'Lastnosti Flash',chkPlay:'Samodejno predvajaj',chkLoop:'Ponavljanje',chkMenu:'Omogo�i Flash Meni',chkFull:'Dovoli celozaslonski na�in',scale:'Pove�ava',scaleAll:'Pokaži vse',scaleNoBorder:'Brez obrobe',scaleFit:'Natan�no prileganje',access:'Dostop skript',accessAlways:'Vedno',accessSameDomain:'Samo ista domena',accessNever:'Nikoli',alignAbsBottom:'Popolnoma na dno',alignAbsMiddle:'Popolnoma v sredino',alignBaseline:'Na osnovno �rto',alignTextTop:'Besedilo na vrh',quality:'Kakovost',qualityBest:'Najvišja',qualityHigh:'Visoka',qualityAutoHigh:'Samodejno visoka',qualityMedium:'Srednja',qualityAutoLow:'Samodejno nizka',qualityLow:'Nizka',windowModeWindow:'Okno',windowModeOpaque:'Motno',windowModeTransparent:'Prosojno',windowMode:'Vrsta okna',flashvars:'Spremenljivke za Flash',bgcolor:'Barva ozadja',hSpace:'Vodoravni razmik',vSpace:'Navpi�ni razmik',validateSrc:'Vnesite URL povezave',validateHSpace:'Vodoravni razmik mora biti število.',validateVSpace:'Navpi�ni razmik mora biti število.'},spellCheck:{toolbar:'Preveri �rkovanje',title:'Črkovalnik',notAvailable:'Oprostite, storitev trenutno ni dosegljiva.',errorLoading:'Napaka pri nalaganju storitve programa na naslovu %s.',notInDic:'Ni v slovarju',changeTo:'Spremeni v',btnIgnore:'Prezri',btnIgnoreAll:'Prezri vse',btnReplace:'Zamenjaj',btnReplaceAll:'Zamenjaj vse',btnUndo:'Razveljavi',noSuggestions:'- Ni predlogov -',progress:'Preverjanje �rkovanja se izvaja...',noMispell:'Črkovanje je kon�ano: Brez napak',noChanges:'Črkovanje je kon�ano: Nobena beseda ni bila spremenjena',oneChange:'Črkovanje je kon�ano: Spremenjena je bila ena beseda',manyChanges:'Črkovanje je kon�ano: Spremenjenih je bilo %1 besed',ieSpellDownload:'Črkovalnik ni nameš�en. Ali ga želite prenesti sedaj?'},smiley:{toolbar:'Smeško',title:'Vstavi smeška',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Oštevil�en seznam',bulletedlist:'Ozna�en seznam',indent:'Pove�aj zamik',outdent:'Zmanjšaj zamik',justify:{left:'Leva poravnava',center:'Sredinska poravnava',right:'Desna poravnava',block:'Obojestranska poravnava'},blockquote:'Citat',clipboard:{title:'Prilepi',cutError:'Varnostne nastavitve brskalnika ne dopuš�ajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).',copyError:'Varnostne nastavitve brskalnika ne dopuš�ajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).',pasteMsg:'Prosim prilepite v sle�i okvir s pomo�jo tipkovnice (<STRONG>Ctrl/Cmd+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.',securityMsg:'Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložiš�a. Vsebino odložiš�a ponovno prilepite v to okno.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Prilepi iz Worda',title:'Prilepi iz Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Prilepi kot golo besedilo',title:'Prilepi kot golo besedilo'},templates:{button:'Predloge',title:'Vsebinske predloge',options:'Template Options',insertOption:'Zamenjaj trenutno vsebino',selectPromptMsg:'Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):',emptyListMsg:'(Ni pripravljenih predlog)'},showBlocks:'Prikaži ograde',stylesCombo:{label:'Slog',panelTitle:'Formatting Styles',panelTitle1:'Slogi odstavkov',panelTitle2:'Slogi besedila',panelTitle3:'Slogi objektov'},format:{label:'Oblika',panelTitle:'Oblika',tag_p:'Navaden',tag_pre:'Oblikovan',tag_address:'Napis',tag_h1:'Naslov 1',tag_h2:'Naslov 2',tag_h3:'Naslov 3',tag_h4:'Naslov 4',tag_h5:'Naslov 5',tag_h6:'Naslov 6',tag_div:'Navaden (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Pisava',voiceLabel:'Pisava',panelTitle:'Pisava'},fontSize:{label:'Velikost',voiceLabel:'Velikost',panelTitle:'Velikost'},colorButton:{textColorTitle:'Barva besedila',bgColorTitle:'Barva ozadja',panelTitle:'Colors',auto:'Samodejno',more:'Ve� barv...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Črkovanje med tipkanjem',opera_title:'Not supported by Opera',enable:'Omogo�i SCAYT',disable:'Onemogo�i SCAYT',about:'O storitvi SCAYT',toggle:'Preklopi SCAYT',options:'Možnosti',langs:'Jeziki',moreSuggestions:'Ve� predlogov',ignore:'Prezri',ignoreAll:'Prezri vse',addWord:'Dodaj besedo',emptyDic:'Ime slovarja ne more biti prazno.',optionsTab:'Možnosti',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Jeziki',dictionariesTab:'Slovarji',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'O storitvi'},about:{title:'O programu CKEditor',dlgTitle:'O programu CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Za informacijo o licenci prostim obiš�ite našo spletno stran:',copy:'Copyright &copy; $1. Vse pravice pridržane.'},maximize:'Maksimiraj',minimize:'Minimiraj',fakeobjects:{anchor:'Sidro',flash:'Flash animacija',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Neznan objekt'},resize:'Potegni za spremembo velikosti',colordialog:{title:'Izberi barvo',options:'Color Options',highlight:'Poudarjeno',selected:'Izbrano',clear:'Po�isti'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Lastnosti dokumenta',title:'Lastnosti dokumenta',design:'Design',meta:'Meta podatki',chooseColor:'Izberi',other:'<drug>',docTitle:'Naslov strani',charset:'Kodna tabela',charsetOther:'Druga kodna tabela',charsetASCII:'ASCII',charsetCE:'Srednjeevropsko',charsetCT:'Tradicionalno Kitajsko (Big5)',charsetCR:'Cirilica',charsetGR:'Grško',charsetJP:'Japonsko',charsetKR:'Korejsko',charsetTR:'Turško',charsetUN:'Unicode (UTF-8)',charsetWE:'Zahodnoevropsko',docType:'Glava tipa dokumenta',docTypeOther:'Druga glava tipa dokumenta',xhtmlDec:'Vstavi XHTML deklaracije',bgColor:'Barva ozadja',bgImage:'URL slike za ozadje',bgFixed:'Nepremi�no ozadje',txtColor:'Barva besedila',margin:'Zamiki strani',marginTop:'Na vrhu',marginLeft:'Levo',marginRight:'Desno',marginBottom:'Spodaj',metaKeywords:'Klju�ne besede (lo�ene z vejicami)',metaDescription:'Opis strani',metaAuthor:'Avtor',metaCopyright:'Avtorske pravice',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/sr-latn.js b/upload/public/js/3rd_party/ckeditor/lang/sr-latn.js
new file mode 100644
index 00000000..ed3c342a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/sr-latn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['sr-latn']={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kôd',newPage:'Nova stranica',save:'Sa�uvaj',preview:'Izgled stranice',cut:'Iseci',copy:'Kopiraj',paste:'Zalepi',print:'Štampa',underline:'Podvu�eno',bold:'Podebljano',italic:'Kurziv',selectAll:'Ozna�i sve',removeFormat:'Ukloni formatiranje',strike:'Precrtano',subscript:'Indeks',superscript:'Stepen',horizontalrule:'Unesi horizontalnu liniju',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Ukloni link',undo:'Poni�ti akciju',redo:'Ponovi akciju',common:{browseServer:'Pretraži server',url:'URL',protocol:'Protokol',upload:'Pošalji',uploadSubmit:'Pošalji na server',image:'Slika',flash:'Fleš',form:'Forma',checkbox:'Polje za potvrdu',radio:'Radio-dugme',textField:'Tekstualno polje',textarea:'Zona teksta',hiddenField:'Skriveno polje',button:'Dugme',select:'Izborno polje',imageButton:'Dugme sa slikom',notSet:'<nije postavljeno>',id:'Id',name:'Naziv',langDir:'Smer jezika',langDirLtr:'S leva na desno (LTR)',langDirRtl:'S desna na levo (RTL)',langCode:'Kôd jezika',longDescr:'Pun opis URL',cssClass:'Stylesheet klase',advisoryTitle:'Advisory naslov',cssStyle:'Stil',ok:'OK',cancel:'Otkaži',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'Napredni tagovi',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Širina',height:'Visina',align:'Ravnanje',alignLeft:'Levo',alignRight:'Desno',alignCenter:'Sredina',alignTop:'Vrh',alignMiddle:'Sredina',alignBottom:'Dole',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Unesi specijalni karakter',title:'Odaberite specijalni karakter',options:'Special Character Options'},link:{toolbar:'Unesi/izmeni link',other:'<о�тало>',menu:'Izmeni link',title:'Link',info:'Link Info',target:'Meta',upload:'Pošalji',advanced:'Napredni tagovi',type:'Vrsta linka',toUrl:'URL',toAnchor:'Sidro na ovoj stranici',toEmail:'E-Mail',targetFrame:'<okvir>',targetPopup:'<popup prozor>',targetFrameName:'Naziv odredišnog frejma',targetPopupName:'Naziv popup prozora',popupFeatures:'Mogućnosti popup prozora',popupResizable:'Resizable',popupStatusBar:'Statusna linija',popupLocationBar:'Lokacija',popupToolbar:'Toolbar',popupMenuBar:'Kontekstni meni',popupFullScreen:'Prikaz preko celog ekrana (IE)',popupScrollBars:'Scroll bar',popupDependent:'Zavisno (Netscape)',popupLeft:'Od leve ivice ekrana (px)',popupTop:'Od vrha ekrana (px)',id:'Id',langDir:'Smer jezika',langDirLTR:'S leva na desno (LTR)',langDirRTL:'S desna na levo (RTL)',acccessKey:'Pristupni taster',name:'Naziv',langCode:'Smer jezika',tabIndex:'Tab indeks',advisoryTitle:'Advisory naslov',advisoryContentType:'Advisory vrsta sadržaja',cssClasses:'Stylesheet klase',charset:'Linked Resource Charset',styles:'Stil',rel:'Relationship',selectAnchor:'Odaberi sidro',anchorName:'Po nazivu sidra',anchorId:'Po Id-ju elementa',emailAddress:'E-Mail adresa',emailSubject:'Naslov',emailBody:'Sadržaj poruke',noAnchors:'(Nema dostupnih sidra)',noUrl:'Unesite URL linka',noEmail:'Otkucajte adresu elektronske pote'},anchor:{toolbar:'Unesi/izmeni sidro',menu:'Osobine sidra',title:'Osobine sidra',name:'Ime sidra',errorName:'Unesite ime sidra',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Pretraga',replace:'Zamena',findWhat:'Pronadi:',replaceWith:'Zameni sa:',notFoundMsg:'Traženi tekst nije pronađen.',findOptions:'Find Options',matchCase:'Razlikuj mala i velika slova',matchWord:'Uporedi cele reci',matchCyclic:'Match cyclic',replaceAll:'Zameni sve',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Tabela',title:'Osobine tabele',menu:'Osobine tabele',deleteTable:'Delete Table',rows:'Redova',columns:'Kolona',border:'Veli�ina okvira',widthPx:'piksela',widthPc:'procenata',widthUnit:'width unit',cellSpace:'Ćelijski prostor',cellPad:'Razmak ćelija',caption:'Naslov tabele',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Obriši ćelije',merge:'Spoj celije',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Obriši redove'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Obriši kolone'}},button:{title:'Osobine dugmeta',text:'Tekst (vrednost)',type:'Tip',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'Osobine polja za potvrdu',radioTitle:'Osobine radio-dugmeta',value:'Vrednost',selected:'Ozna�eno'},form:{title:'Osobine forme',menu:'Osobine forme',action:'Akcija',method:'Metoda',encoding:'Encoding'},select:{title:'Osobine izbornog polja',selectInfo:'Info',opAvail:'Dostupne opcije',value:'Vrednost',size:'Veli�ina',lines:'linija',chkMulti:'Dozvoli višestruku selekciju',opText:'Tekst',opValue:'Vrednost',btnAdd:'Dodaj',btnModify:'Izmeni',btnUp:'Gore',btnDown:'Dole',btnSetValue:'Podesi kao ozna�enu vrednost',btnDelete:'Obriši'},textarea:{title:'Osobine zone teksta',cols:'Broj kolona',rows:'Broj redova'},textfield:{title:'Osobine tekstualnog polja',name:'Naziv',value:'Vrednost',charWidth:'Širina (karaktera)',maxChars:'Maksimalno karaktera',type:'Tip',typeText:'Tekst',typePass:'Lozinka'},hidden:{title:'Osobine skrivenog polja',name:'Naziv',value:'Vrednost'},image:{title:'Osobine slika',titleButton:'Osobine dugmeta sa slikom',menu:'Osobine slika',infoTab:'Info slike',btnUpload:'Pošalji na server',upload:'Pošalji',alt:'Alternativni tekst',lockRatio:'Zaklju�aj odnos',resetSize:'Resetuj veli�inu',border:'Okvir',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Unesite URL slike',linkTab:'Link',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Osobine fleša',propertiesTab:'Properties',title:'Osobine fleša',chkPlay:'Automatski start',chkLoop:'Ponavljaj',chkMenu:'Uklju�i fleš meni',chkFull:'Allow Fullscreen',scale:'Skaliraj',scaleAll:'Prikaži sve',scaleNoBorder:'Bez ivice',scaleFit:'Popuni površinu',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs dole',alignAbsMiddle:'Abs sredina',alignBaseline:'Bazno',alignTextTop:'Vrh teksta',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Boja pozadine',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Unesite URL linka',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Proveri spelovanje',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'Nije u re�niku',changeTo:'Izmeni',btnIgnore:'Ignoriši',btnIgnoreAll:'Ignoriši sve',btnReplace:'Zameni',btnReplaceAll:'Zameni sve',btnUndo:'Vrati akciju',noSuggestions:'- Bez sugestija -',progress:'Provera spelovanja u toku...',noMispell:'Provera spelovanja završena: greške nisu pronadene',noChanges:'Provera spelovanja završena: Nije izmenjena nijedna rec',oneChange:'Provera spelovanja završena: Izmenjena je jedna re�',manyChanges:'Provera spelovanja završena: %1 re�(i) je izmenjeno',ieSpellDownload:'Provera spelovanja nije instalirana. Da li želite da je skinete sa Interneta?'},smiley:{toolbar:'Smajli',title:'Unesi smajlija',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'Nabrojiva lista',bulletedlist:'Nenabrojiva lista',indent:'Uvećaj levu marginu',outdent:'Smanji levu marginu',justify:{left:'Levo ravnanje',center:'Centriran tekst',right:'Desno ravnanje',block:'Obostrano ravnanje'},blockquote:'Block Quote',clipboard:{title:'Zalepi',cutError:'Sigurnosna podešavanja Vašeg pretraživa�a ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite pre�icu sa tastature (Ctrl/Cmd+X).',copyError:'Sigurnosna podešavanja Vašeg pretraživa�a ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite pre�icu sa tastature (Ctrl/Cmd+C).',pasteMsg:'Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu pre�icu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Zalepi iz Worda',title:'Zalepi iz Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Zalepi kao �ist tekst',title:'Zalepi kao �ist tekst'},templates:{button:'Obrasci',title:'Obrasci za sadržaj',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Molimo Vas da odaberete obrazac koji ce biti primenjen na stranicu (trenutni sadržaj ce biti obrisan):',emptyListMsg:'(Nema definisanih obrazaca)'},showBlocks:'Show Blocks',stylesCombo:{label:'Stil',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Format',panelTitle:'Format',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Adresa',tag_h1:'Naslov 1',tag_h2:'Naslov 2',tag_h3:'Naslov 3',tag_h4:'Naslov 4',tag_h5:'Naslov 5',tag_h6:'Naslov 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Font',voiceLabel:'Font',panelTitle:'Font'},fontSize:{label:'Veli�ina fonta',voiceLabel:'Font Size',panelTitle:'Veli�ina fonta'},colorButton:{textColorTitle:'Boja teksta',bgColorTitle:'Boja pozadine',panelTitle:'Colors',auto:'Automatski',more:'Više boja...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Osobine dokumenta',title:'Osobine dokumenta',design:'Design',meta:'Metapodaci',chooseColor:'Choose',other:'<о�тало>',docTitle:'Naslov stranice',charset:'Kodiranje skupa karaktera',charsetOther:'Ostala kodiranja skupa karaktera',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Zaglavlje tipa dokumenta',docTypeOther:'Ostala zaglavlja tipa dokumenta',xhtmlDec:'Ukljuci XHTML deklaracije',bgColor:'Boja pozadine',bgImage:'URL pozadinske slike',bgFixed:'Fiksirana pozadina',txtColor:'Boja teksta',margin:'Margine stranice',marginTop:'Gornja',marginLeft:'Leva',marginRight:'Desna',marginBottom:'Donja',metaKeywords:'Klju�ne reci za indeksiranje dokumenta (razdvojene zarezima)',metaDescription:'Opis dokumenta',metaAuthor:'Autor',metaCopyright:'Autorska prava',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/sr.js b/upload/public/js/3rd_party/ckeditor/lang/sr.js
new file mode 100644
index 00000000..b2249907
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/sr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sr={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Kôд',newPage:'�ова �траница',save:'Сачувај',preview:'Изглед �транице',cut:'И�еци',copy:'Копирај',paste:'Залепи',print:'Штампа',underline:'Подвучено',bold:'Подебљано',italic:'Курзив',selectAll:'Означи �ве',removeFormat:'Уклони форматирање',strike:'Прецртано',subscript:'Индек�',superscript:'Степен',horizontalrule:'Уне�и хоризонталну линију',pagebreak:'Insert Page Break for Printing',pagebreakAlt:'Page Break',unlink:'Уклони линк',undo:'Поништи акцију',redo:'Понови акцију',common:{browseServer:'Претражи �ервер',url:'УРЛ',protocol:'Протокол',upload:'Пошаљи',uploadSubmit:'Пошаљи на �ервер',image:'Слика',flash:'Флеш елемент',form:'Форма',checkbox:'Поље за потврду',radio:'Радио-дугме',textField:'Тек�туално поље',textarea:'Зона тек�та',hiddenField:'Скривено поље',button:'Дугме',select:'Изборно поље',imageButton:'Дугме �а �ликом',notSet:'<није по�тављено>',id:'Ид',name:'�азив',langDir:'Смер језика',langDirLtr:'С лева на де�но (LTR)',langDirRtl:'С де�на на лево (RTL)',langCode:'Kôд језика',longDescr:'Пун опи� УРЛ',cssClass:'Stylesheet кла�е',advisoryTitle:'Advisory на�лов',cssStyle:'Стил',ok:'OK',cancel:'Oткажи',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'�апредни тагови',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Ширина',height:'Ви�ина',align:'Равнање',alignLeft:'Лево',alignRight:'Де�но',alignCenter:'Средина',alignTop:'Врх',alignMiddle:'Средина',alignBottom:'Доле',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Уне�и �пецијални карактер',title:'Одаберите �пецијални карактер',options:'Special Character Options'},link:{toolbar:'Уне�и/измени линк',other:'<other>',menu:'Промени линк',title:'Линк',info:'Линк инфо',target:'Meтa',upload:'Пошаљи',advanced:'�апредни тагови',type:'Вр�та линка',toUrl:'URL',toAnchor:'Сидро на овој �траници',toEmail:'Eлектрон�ка пошта',targetFrame:'<оквир>',targetPopup:'<и�качући прозор>',targetFrameName:'�азив одредишног фрејма',targetPopupName:'�азив и�качућег прозора',popupFeatures:'Могућно�ти и�качућег прозора',popupResizable:'Resizable',popupStatusBar:'Стату�на линија',popupLocationBar:'Локација',popupToolbar:'Toolbar',popupMenuBar:'Контек�тни мени',popupFullScreen:'Приказ преко целог екрана (ИE)',popupScrollBars:'Скрол бар',popupDependent:'Зави�но (Netscape)',popupLeft:'Од леве ивице екрана (пик�ела)',popupTop:'Од врха екрана (пик�ела)',id:'Id',langDir:'Смер језика',langDirLTR:'С лева на де�но (LTR)',langDirRTL:'С де�на на лево (RTL)',acccessKey:'При�тупни та�тер',name:'�азив',langCode:'Смер језика',tabIndex:'Таб индек�',advisoryTitle:'Advisory на�лов',advisoryContentType:'Advisory вр�та �адржаја',cssClasses:'Stylesheet кла�е',charset:'Linked Resource Charset',styles:'Стил',rel:'Relationship',selectAnchor:'Одабери �идро',anchorName:'По називу �идра',anchorId:'Пo Ид-jу елемента',emailAddress:'�дре�а електрон�ке поште',emailSubject:'�а�лов',emailBody:'Садржај поруке',noAnchors:'(�ема до�тупних �идра)',noUrl:'Уне�ите УРЛ линка',noEmail:'Откуцајте адре�у електрон�ке поште'},anchor:{toolbar:'Уне�и/измени �идро',menu:'О�обине �идра',title:'О�обине �идра',name:'Име �идра',errorName:'Молимо Ва� да уне�ете име �идра',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'Претрага',replace:'Замена',findWhat:'Пронађи:',replaceWith:'Замени �а:',notFoundMsg:'Тражени тек�т није пронађен.',findOptions:'Find Options',matchCase:'Разликуј велика и мала �лова',matchWord:'Упореди целе речи',matchCyclic:'Match cyclic',replaceAll:'Замени �ве',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'Табела',title:'О�обине табеле',menu:'О�обине табеле',deleteTable:'Delete Table',rows:'Редова',columns:'Kолона',border:'Величина оквира',widthPx:'пик�ела',widthPc:'процената',widthUnit:'width unit',cellSpace:'Ћелиј�ки про�тор',cellPad:'Размак ћелија',caption:'�а�лов табеле',summary:'Summary',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'Cell',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'Обриши ћелије',merge:'Спој ћелије',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'Row',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'Обриши редове'},column:{menu:'Column',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'Обриши колоне'}},button:{title:'О�обине дугмета',text:'Тек�т (вредно�т)',type:'Tип',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'О�обине поља за потврду',radioTitle:'О�обине радио-дугмета',value:'Вредно�т',selected:'Означено'},form:{title:'О�обине форме',menu:'О�обине форме',action:'Aкција',method:'Mетода',encoding:'Encoding'},select:{title:'О�обине изборног поља',selectInfo:'Инфо',opAvail:'До�тупне опције',value:'Вредно�т',size:'Величина',lines:'линија',chkMulti:'Дозволи више�труку �елекцију',opText:'Тек�т',opValue:'Вредно�т',btnAdd:'Додај',btnModify:'Измени',btnUp:'Горе',btnDown:'Доле',btnSetValue:'Поде�и као означену вредно�т',btnDelete:'Обриши'},textarea:{title:'О�обине зоне тек�та',cols:'Број колона',rows:'Број редова'},textfield:{title:'О�обине тек�туалног поља',name:'�азив',value:'Вредно�т',charWidth:'Ширина (карактера)',maxChars:'Мак�имално карактера',type:'Тип',typeText:'Тек�т',typePass:'Лозинка'},hidden:{title:'О�обине �кривеног поља',name:'�азив',value:'Вредно�т'},image:{title:'О�обине �лика',titleButton:'О�обине дугмета �а �ликом',menu:'О�обине �лика',infoTab:'Инфо �лике',btnUpload:'Пошаљи на �ервер',upload:'Пошаљи',alt:'�лтернативни тек�т',lockRatio:'Закључај одно�',resetSize:'Ре�етуј величину',border:'Оквир',hSpace:'HSpace',vSpace:'VSpace',alertUrl:'Уне�ите УРЛ �лике',linkTab:'Линк',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'О�обине Флеша',propertiesTab:'Properties',title:'О�обине флеша',chkPlay:'�утомат�ки �тарт',chkLoop:'Понављај',chkMenu:'Укључи флеш мени',chkFull:'Allow Fullscreen',scale:'Скалирај',scaleAll:'Прикажи �ве',scaleNoBorder:'Без ивице',scaleFit:'Попуни површину',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'Abs доле',alignAbsMiddle:'Abs �редина',alignBaseline:'Базно',alignTextTop:'Врх тек�та',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'Боја позадине',hSpace:'HSpace',vSpace:'VSpace',validateSrc:'Уне�ите УРЛ линка',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'Провери �пеловање',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'�ије у речнику',changeTo:'Измени',btnIgnore:'Игнориши',btnIgnoreAll:'Игнориши �ве',btnReplace:'Замени',btnReplaceAll:'Замени �ве',btnUndo:'Врати акцију',noSuggestions:'- Без �уге�тија -',progress:'Провера �пеловања у току...',noMispell:'Провера �пеловања завршена: грешке ни�у пронађене',noChanges:'Провера �пеловања завршена: �ије измењена ниједна реч',oneChange:'Провера �пеловања завршена: Измењена је једна реч',manyChanges:'Провера �пеловања завршена:  %1 реч(и) је измењено',ieSpellDownload:'Провера �пеловања није ин�талирана. Да ли желите да је �кинете �а Интернета?'},smiley:{toolbar:'Смајли',title:'Уне�и �мајлија',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'�абројиву ли�ту',bulletedlist:'�енабројива ли�та',indent:'Увећај леву маргину',outdent:'Смањи леву маргину',justify:{left:'Лево равнање',center:'Центриран тек�т',right:'Де�но равнање',block:'Обо�трано равнање'},blockquote:'Block Quote',clipboard:{title:'Залепи',cutError:'Сигурно�на подешавања Вашег претраживача не дозвољавају операције аутомат�ког и�ецања тек�та. Молимо Ва� да кори�тите пречицу �а та�татуре (Ctrl/Cmd+X).',copyError:'Сигурно�на подешавања Вашег претраживача не дозвољавају операције аутомат�ког копирања тек�та. Молимо Ва� да кори�тите пречицу �а та�татуре (Ctrl/Cmd+C).',pasteMsg:'Молимо Ва� да залепите унутар доње површине кори�тећи та�татурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да прити�нете <STRONG>OK</STRONG>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'Залепи из Worda',title:'Залепи из Worda',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Залепи као чи�т тек�т',title:'Залепи као чи�т тек�т'},templates:{button:'Обра�ци',title:'Обра�ци за �адржај',options:'Template Options',insertOption:'Replace actual contents',selectPromptMsg:'Молимо Ва� да одаберете образац који ће бити примењен на �траницу (тренутни �адржај ће бити обри�ан):',emptyListMsg:'(�ема дефини�аних образаца)'},showBlocks:'Show Blocks',stylesCombo:{label:'Стил',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'Формат',panelTitle:'Формат',tag_p:'Normal',tag_pre:'Formatirano',tag_address:'Adresa',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Normal (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Фонт',voiceLabel:'Font',panelTitle:'Фонт'},fontSize:{label:'Величина фонта',voiceLabel:'Font Size',panelTitle:'Величина фонта'},colorButton:{textColorTitle:'Боја тек�та',bgColorTitle:'Боја позадине',panelTitle:'Colors',auto:'�утомат�ки',more:'Више боја...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'О�обине документа',title:'О�обине документа',design:'Design',meta:'Метаподаци',chooseColor:'Choose',other:'<other>',docTitle:'�а�лов �транице',charset:'Кодирање �купа карактера',charsetOther:'О�тала кодирања �купа карактера',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'Заглавље типа документа',docTypeOther:'О�тала заглавља типа документа',xhtmlDec:'Улључи XHTML декларације',bgColor:'Боја позадине',bgImage:'УРЛ позадин�ке �лике',bgFixed:'Фик�ирана позадина',txtColor:'Боја тек�та',margin:'Маргине �транице',marginTop:'Горња',marginLeft:'Лева',marginRight:'Де�на',marginBottom:'Доња',metaKeywords:'Кључне речи за индек�ирање документа (раздвојене зарезом)',metaDescription:'Опи� документа',metaAuthor:'�утор',metaCopyright:'�утор�ка права',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/sv.js b/upload/public/js/3rd_party/ckeditor/lang/sv.js
new file mode 100644
index 00000000..5d36347c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/sv.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.sv={dir:'ltr',editorTitle:'Rich text editor, %1, tryck ALT 0 för hjälp.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'Källa',newPage:'Ny sida',save:'Spara',preview:'Förhandsgranska',cut:'Klipp ut',copy:'Kopiera',paste:'Klistra in',print:'Skriv ut',underline:'Understruken',bold:'Fet',italic:'Kursiv',selectAll:'Markera allt',removeFormat:'Radera formatering',strike:'Genomstruken',subscript:'Nedsänkta tecken',superscript:'Upphöjda tecken',horizontalrule:'Infoga horisontal linje',pagebreak:'Infoga sidbrytning',pagebreakAlt:'Sidbrytning',unlink:'Radera länk',undo:'Ångra',redo:'Gör om',common:{browseServer:'Bläddra på server',url:'URL',protocol:'Protokoll',upload:'Ladda upp',uploadSubmit:'Skicka till server',image:'Bild',flash:'Flash',form:'Formulär',checkbox:'Kryssruta',radio:'Alternativknapp',textField:'Textfält',textarea:'Textruta',hiddenField:'Dolt fält',button:'Knapp',select:'Flervalslista',imageButton:'Bildknapp',notSet:'<ej angivet>',id:'Id',name:'Namn',langDir:'Språkriktning',langDirLtr:'Vänster till Höger (VTH)',langDirRtl:'Höger till Vänster (HTV)',langCode:'Språkkod',longDescr:'URL-beskrivning',cssClass:'Stilmall',advisoryTitle:'Titel',cssStyle:'Stilmall',ok:'OK',cancel:'Avbryt',close:'Stäng',preview:'Förhandsgranska',generalTab:'Allmänt',advancedTab:'Avancerad',validateNumberFailed:'Värdet är inte ett nummer.',confirmNewPage:'Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?',confirmCancel:'Några av de alternativ har ändrats. Är du säker på att stänga dialogrutan?',options:'Alternativ',target:'Mål',targetNew:'Nytt fönster (_blank)',targetTop:'Översta fönstret (_top)',targetSelf:'Samma fönster (_self)',targetParent:'Föregående fönster (_parent)',langDirLTR:'Vänster till höger (LTR)',langDirRTL:'Höger till vänster (RTL)',styles:'Stil',cssClasses:'Stilmallar',width:'Bredd',height:'Höjd',align:'Justering',alignLeft:'Vänster',alignRight:'Höger',alignCenter:'Centrerad',alignTop:'Överkant',alignMiddle:'Mitten',alignBottom:'Nederkant',invalidHeight:'Höjd måste vara ett nummer.',invalidWidth:'Bredd måste vara ett nummer.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, Ej tillgänglig</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'Klistra in utökat tecken',title:'Välj utökat tecken',options:'Special Character Options'},link:{toolbar:'Infoga/Redigera länk',other:'<annan>',menu:'Redigera länk',title:'Länk',info:'Länkinformation',target:'Mål',upload:'Ladda upp',advanced:'Avancerad',type:'Länktyp',toUrl:'URL',toAnchor:'Ankare i sidan',toEmail:'E-post',targetFrame:'<ram>',targetPopup:'<popup-fönster>',targetFrameName:'Målets ramnamn',targetPopupName:'Popup-fönstrets namn',popupFeatures:'Popup-fönstrets egenskaper',popupResizable:'Resizable',popupStatusBar:'Statusfält',popupLocationBar:'Adressfält',popupToolbar:'Verktygsfält',popupMenuBar:'Menyfält',popupFullScreen:'Helskärm (endast IE)',popupScrollBars:'Scrolllista',popupDependent:'Beroende (endast Netscape)',popupLeft:'Position från vänster',popupTop:'Position från sidans topp',id:'Id',langDir:'Språkriktning',langDirLTR:'Vänster till höger (VTH)',langDirRTL:'Höger till vänster (HTV)',acccessKey:'Behörighetsnyckel',name:'Namn',langCode:'Språkriktning',tabIndex:'Tabindex',advisoryTitle:'Titel',advisoryContentType:'Innehållstyp',cssClasses:'Stylesheet class',charset:'Teckenuppställning',styles:'Stilmall',rel:'Relationship',selectAnchor:'Välj ett ankare',anchorName:'efter ankarnamn',anchorId:'efter objektid',emailAddress:'E-postadress',emailSubject:'Ämne',emailBody:'Innehåll',noAnchors:'(Inga ankare kunde hittas)',noUrl:'Var god ange länkens URL',noEmail:'Var god ange E-postadress'},anchor:{toolbar:'Infoga/Redigera ankarlänk',menu:'Egenskaper för ankarlänk',title:'Egenskaper för ankarlänk',name:'Ankarnamn',errorName:'Var god ange ett ankarnamn',remove:'Remove Anchor'},list:{numberedTitle:'Egenskaper för punktlista',bulletedTitle:'Egenskaper för punktlista',type:'Typ',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Cirkel',disc:'Disk',square:'Fyrkant',none:'Ingen',notset:'<ej angiven>',armenian:'Armenisk numrering',georgian:'Georgisk numrering (an, ban, gan, etc.)',lowerRoman:'Romerska gemener (i, ii, iii, iv, v, etc.)',upperRoman:'Romerska versaler (I, II, III, IV, V, etc.)',lowerAlpha:'Alpha gemener (a, b, c, d, e, etc.)',upperAlpha:'Alpha versaler (A, B, C, D, E, etc.)',lowerGreek:'Grekiska gemener (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal nolla (01, 02, 03, etc.)'},findAndReplace:{title:'Sök och ersätt',find:'Sök',replace:'Ersätt',findWhat:'Sök efter:',replaceWith:'Ersätt med:',notFoundMsg:'Angiven text kunde ej hittas.',findOptions:'Find Options',matchCase:'Skiftläge',matchWord:'Inkludera hela ord',matchCyclic:'Matcha cykliska',replaceAll:'Ersätt alla',replaceSuccessMsg:'%1 förekomst(er) ersatta.'},table:{toolbar:'Tabell',title:'Tabellegenskaper',menu:'Tabellegenskaper',deleteTable:'Radera tabell',rows:'Rader',columns:'Kolumner',border:'Kantstorlek',widthPx:'pixlar',widthPc:'procent',widthUnit:'enhet bredd',cellSpace:'Cellavstånd',cellPad:'Cellutfyllnad',caption:'Rubrik',summary:'Sammanfattning',headers:'Ruberiker',headersNone:'Ingen',headersColumn:'Första kolumnen',headersRow:'Första raden',headersBoth:'Båda',invalidRows:'Antal rader måste vara större än 0.',invalidCols:'Antal kolumner måste vara ett nummer större än 0.',invalidBorder:'Ram måste vara ett nummer.',invalidWidth:'Tabell måste vara ett nummer.',invalidHeight:'Tabellens höjd måste vara ett nummer.',invalidCellSpacing:'Luft i cell måste vara ett nummer.',invalidCellPadding:'Luft i cell måste vara ett nummer.',cell:{menu:'Cell',insertBefore:'Lägg till cell före',insertAfter:'Lägg till cell efter',deleteCell:'Radera celler',merge:'Sammanfoga celler',mergeRight:'Sammanfoga höger',mergeDown:'Sammanfoga ner',splitHorizontal:'Dela cell horisontellt',splitVertical:'Dela cell vertikalt',title:'Egenskaper för cell',cellType:'Celltyp',rowSpan:'Rad spann',colSpan:'Kolumnen spann',wordWrap:'Radbrytning',hAlign:'Horisontell justering',vAlign:'Vertikal justering',alignBaseline:'Baslinje',bgColor:'Bakgrundsfärg',borderColor:'Ramfärg',data:'Data',header:'Rubrik',yes:'Ja',no:'Nej',invalidWidth:'Cellens bredd måste vara ett nummer.',invalidHeight:'Cellens höjd måste vara ett nummer.',invalidRowSpan:'Radutvidgning måste vara ett heltal.',invalidColSpan:'Kolumn måste vara ett heltal.',chooseColor:'Välj'},row:{menu:'Rad',insertBefore:'Lägg till Rad Före',insertAfter:'Lägg till rad efter',deleteRow:'Radera rad'},column:{menu:'Kolumn',insertBefore:'Lägg till kolumn före',insertAfter:'Lägg till kolumn efter',deleteColumn:'Radera kolumn'}},button:{title:'Egenskaper för knapp',text:'Text (värde)',type:'Typ',typeBtn:'Knapp',typeSbm:'Skicka',typeRst:'Återställ'},checkboxAndRadio:{checkboxTitle:'Egenskaper för kryssruta',radioTitle:'Egenskaper för alternativknapp',value:'Värde',selected:'Vald'},form:{title:'Egenskaper för formulär',menu:'Egenskaper för formulär',action:'Funktion',method:'Metod',encoding:'Kodning'},select:{title:'Egenskaper för flervalslista',selectInfo:'Information',opAvail:'Befintliga val',value:'Värde',size:'Storlek',lines:'Linjer',chkMulti:'Tillåt flerval',opText:'Text',opValue:'Värde',btnAdd:'Lägg till',btnModify:'Redigera',btnUp:'Upp',btnDown:'Ner',btnSetValue:'Markera som valt värde',btnDelete:'Radera'},textarea:{title:'Egenskaper för textruta',cols:'Kolumner',rows:'Rader'},textfield:{title:'Egenskaper för textfält',name:'Namn',value:'Värde',charWidth:'Teckenbredd',maxChars:'Max antal tecken',type:'Typ',typeText:'Text',typePass:'Lösenord'},hidden:{title:'Egenskaper för dolt fält',name:'Namn',value:'Värde'},image:{title:'Bildegenskaper',titleButton:'Egenskaper för bildknapp',menu:'Bildegenskaper',infoTab:'Bildinformation',btnUpload:'Skicka till server',upload:'Ladda upp',alt:'Alternativ text',lockRatio:'Lås höjd/bredd förhållanden',resetSize:'Återställ storlek',border:'Kant',hSpace:'Horis. marginal',vSpace:'Vert. marginal',alertUrl:'Var god och ange bildens URL',linkTab:'Länk',button2Img:'Vill du omvandla den valda bildknappen på en enkel bild?',img2Button:'Vill du omvandla den valda bildknappen på en enkel bild?',urlMissing:'Bildkällans URL saknas.',validateBorder:'Kantlinje måste vara ett heltal.',validateHSpace:'HSpace måste vara ett heltal.',validateVSpace:'VSpace måste vara ett heltal.'},flash:{properties:'Flashegenskaper',propertiesTab:'Egenskaper',title:'Flashegenskaper',chkPlay:'Automatisk uppspelning',chkLoop:'Upprepa/Loopa',chkMenu:'Aktivera Flashmeny',chkFull:'Tillåt helskärm',scale:'Skala',scaleAll:'Visa allt',scaleNoBorder:'Ingen ram',scaleFit:'Exakt passning',access:'Script-tillgång',accessAlways:'Alltid',accessSameDomain:'Samma domän',accessNever:'Aldrig',alignAbsBottom:'Absolut nederkant',alignAbsMiddle:'Absolut centrering',alignBaseline:'Baslinje',alignTextTop:'Text överkant',quality:'Kvalitet',qualityBest:'Bäst',qualityHigh:'Hög',qualityAutoHigh:'Auto Hög',qualityMedium:'Medium',qualityAutoLow:'Auto Låg',qualityLow:'Låg',windowModeWindow:'Fönster',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Fönsterläge',flashvars:'Variabler för Flash',bgcolor:'Bakgrundsfärg',hSpace:'Horis. marginal',vSpace:'Vert. marginal',validateSrc:'Var god ange länkens URL',validateHSpace:'HSpace måste vara ett nummer.',validateVSpace:'VSpace måste vara ett nummer.'},spellCheck:{toolbar:'Stavningskontroll',title:'Kontrollera stavning',notAvailable:'Tyvärr är tjänsten ej tillgänglig nu',errorLoading:'Tjänsten är ej tillgänglig: %s.',notInDic:'Saknas i ordlistan',changeTo:'Ändra till',btnIgnore:'Ignorera',btnIgnoreAll:'Ignorera alla',btnReplace:'Ersätt',btnReplaceAll:'Ersätt alla',btnUndo:'Ångra',noSuggestions:'- Förslag saknas -',progress:'Stavningskontroll pågår...',noMispell:'Stavningskontroll slutförd: Inga stavfel påträffades.',noChanges:'Stavningskontroll slutförd: Inga ord rättades.',oneChange:'Stavningskontroll slutförd: Ett ord rättades.',manyChanges:'Stavningskontroll slutförd: %1 ord rättades.',ieSpellDownload:'Stavningskontrollen är ej installerad. Vill du göra det nu?'},smiley:{toolbar:'Smiley',title:'Infoga smiley',options:'Smileyinställningar'},elementsPath:{eleLabel:'Elementets sökväg',eleTitle:'%1 element'},numberedlist:'Numrerad lista',bulletedlist:'Punktlista',indent:'Öka indrag',outdent:'Minska indrag',justify:{left:'Vänsterjustera',center:'Centrera',right:'Högerjustera',block:'Justera till marginaler'},blockquote:'Blockcitat',clipboard:{title:'Klistra in',cutError:'Säkerhetsinställningar i Er webläsare tillåter inte åtgården Klipp ut. Använd (Ctrl/Cmd+X) istället.',copyError:'Säkerhetsinställningar i Er webläsare tillåter inte åtgården Kopiera. Använd (Ctrl/Cmd+C) istället',pasteMsg:'Var god och klistra in Er text i rutan nedan genom att använda (<STRONG>Ctrl/Cmd+V</STRONG>) klicka sen på <STRONG>OK</STRONG>.',securityMsg:'På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa innan du klistrar?',toolbar:'Klistra in från Word',title:'Klistra in från Word',error:'Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel'},pasteText:{button:'Klistra in som vanlig text',title:'Klistra in som vanlig text'},templates:{button:'Sidmallar',title:'Sidmallar',options:'Inställningar för mall',insertOption:'Ersätt aktuellt innehåll',selectPromptMsg:'Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):',emptyListMsg:'(Ingen mall är vald)'},showBlocks:'Visa block',stylesCombo:{label:'Anpassad stil',panelTitle:'Formatmallar',panelTitle1:'Blockstil',panelTitle2:'Inbäddad stil',panelTitle3:'Objektets stil'},format:{label:'Teckenformat',panelTitle:'Teckenformat',tag_p:'Normal',tag_pre:'Formaterad',tag_address:'Adress',tag_h1:'Rubrik 1',tag_h2:'Rubrik 2',tag_h3:'Rubrik 3',tag_h4:'Rubrik 4',tag_h5:'Rubrik 5',tag_h6:'Rubrik 6',tag_div:'Normal (DIV)'},div:{title:'Skapa Div container',toolbar:'Skapa Div container',cssClassInputLabel:'Stilmallar',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Språkkod',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Rådgivande titel',langDirLabel:'Språkriktning',langDirLTRLabel:'Vänster till Höger (LTR)',langDirRTLLabel:'Höger till vänster (RTL)',edit:'Redigera Div',remove:'Ta bort Div'},iframe:{title:'iFrame Egenskaper',toolbar:'iFrame',noUrl:'Skriv in URL för iFrame',scrolling:'Aktivera rullningslister',border:'Visa ramkant'},font:{label:'Typsnitt',voiceLabel:'Typsnitt',panelTitle:'Typsnitt'},fontSize:{label:'Storlek',voiceLabel:'Teckenstorlek',panelTitle:'Storlek'},colorButton:{textColorTitle:'Textfärg',bgColorTitle:'Bakgrundsfärg',panelTitle:'Färger',auto:'Automatisk',more:'Fler färger...'},colors:{'000':'Svart',800000:'Rödbrun','8B4513':'Mörkbrun','2F4F4F':'Skiffergrå','008080':'Kricka','000080':'Marinblå','4B0082':'Indigo',696969:'Mörkgrå',B22222:'Tegelsten',A52A2A:'Brun',DAA520:'Mörk guld','006400':'Mörkgrön','40E0D0':'Turkos','0000CD':'Medium blå',800080:'Lila',808080:'Grå',F00:'Röd',FF8C00:'Mörkorange',FFD700:'Guld','008000':'Grön','0FF':'Turkos','00F':'Blå',EE82EE:'Violett',A9A9A9:'Matt grå',FFA07A:'Laxrosa',FFA500:'Orange',FFFF00:'Gul','00FF00':'Lime',AFEEEE:'Ljusturkos',ADD8E6:'Ljusblå',DDA0DD:'Plommon',D3D3D3:'Ljusgrå',FFF0F5:'Ljus lavender',FAEBD7:'Antikvit',FFFFE0:'Ljusgul',F0FFF0:'Honung',F0FFFF:'Azurblå',F0F8FF:'Aliceblå',E6E6FA:'Lavender',FFF:'Vit'},scayt:{title:'Stavningskontroll medan du skriver',opera_title:'Stöds ej av Opera',enable:'Aktivera SCAYT',disable:'Inaktivera SCAYT',about:'Om SCAYT',toggle:'Växla SCAYT',options:'Inställningar',langs:'Språk',moreSuggestions:'Fler förslag',ignore:'Ignorera',ignoreAll:'Ignorera alla',addWord:'Lägg till ord',emptyDic:'Ordlistans namn får ej vara tomt.',optionsTab:'Inställningar',allCaps:'Ignorera alla ord med enbart versaler',ignoreDomainNames:'Ignorera domännamn',mixedCase:'Ignorera ord med blandat shiftläge',mixedWithDigits:'Ignorera ord med nummer',languagesTab:'Språk',dictionariesTab:'Ordlistor',dic_field_name:'Ordlistans namn',dic_create:'Skapa',dic_restore:'Återställ',dic_delete:'Ta bort',dic_rename:'Byt namn',dic_info:'Inledningsvis lagras ordlistan i en cookie. När ordlista växer till en punkt där det inte kan lagras i en cookie, lagras den på vår server. För att lagra din personliga ordlista på vår server du ska ange ett namn för din ordbok. Om du redan har en lagrad ordbok, skriv namnet och klicka på knappen Återställ.',aboutTab:'Om'},about:{title:'Om CKEditor',dlgTitle:'Om CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'För information av licenciering besök vår hemsida:',copy:'Copyright &copy; $1. Alla rättigheter reserverade.'},maximize:'Maximera',minimize:'Minimera',fakeobjects:{anchor:'Ankare',flash:'Flashanimation',iframe:'iFrame',hiddenfield:'Gömt fält',unknown:'Okänt objekt'},resize:'Dra för att ändra storlek',colordialog:{title:'Välj färg',options:'Färgalternativ',highlight:'Markera',selected:'Vald färg',clear:'Rensa'},toolbarCollapse:'Dölj verktygsfält',toolbarExpand:'Visa verktygsfält',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text riktning från vänster till höger',rtl:'Text riktning från höger till vänster'},docprops:{label:'Dokumentegenskaper',title:'Dokumentegenskaper',design:'Design',meta:'Metadata',chooseColor:'Välj',other:'<annan>',docTitle:'Sidtitel',charset:'Teckenuppsättningar',charsetOther:'Övriga teckenuppsättningar',charsetASCII:'ASCII',charsetCE:'Central Europa',charsetCT:'Traditionell Kinesisk (Big5)',charsetCR:'Kyrillisk',charsetGR:'Grekiska',charsetJP:'Japanska',charsetKR:'Koreanska',charsetTR:'Turkiska',charsetUN:'Unicode (UTF-8)',charsetWE:'Väst Europa',docType:'Sidhuvud',docTypeOther:'Övriga sidhuvuden',xhtmlDec:'Inkludera XHTML deklaration',bgColor:'Bakgrundsfärg',bgImage:'Bakgrundsbildens URL',bgFixed:'Fast bakgrund',txtColor:'Textfärg',margin:'Sidmarginal',marginTop:'Topp',marginLeft:'Vänster',marginRight:'Höger',marginBottom:'Botten',metaKeywords:'Sidans nyckelord',metaDescription:'Sidans beskrivning',metaAuthor:'Författare',metaCopyright:'Upphovsrätt',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/th.js b/upload/public/js/3rd_party/ckeditor/lang/th.js
new file mode 100644
index 00000000..6202ea68
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/th.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.th={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'ดูรหัส HTML',newPage:'สร้างหน้าเอ�สารใหม่',save:'บันทึ�',preview:'ดูหน้าเอ�สารตัวอย่าง',cut:'ตัด',copy:'สำเนา',paste:'วาง',print:'สั่งพิมพ์',underline:'ตัวขีดเส้นใต้',bold:'ตัวหนา',italic:'ตัวเอียง',selectAll:'เลือ�ทั้งหมด',removeFormat:'ล้างรูป�บบ',strike:'ตัวขีดเส้นทับ',subscript:'ตัวห้อย',superscript:'ตัวย�',horizontalrule:'�ทร�เส้นคั่นบรรทัด',pagebreak:'�ทร�ตัว�บ่งหน้า Page Break',pagebreakAlt:'Page Break',unlink:'ลบ ลิงค์',undo:'ย�เลิ�คำสั่ง',redo:'ทำซ้ำคำสั่ง',common:{browseServer:'เปิดหน้าต่างจัด�ารไฟล์อัพโหลด',url:'ที่อยู่อ้างอิง URL',protocol:'โปรโตคอล',upload:'อัพโหลดไฟล์',uploadSubmit:'อัพโหลดไฟล์ไปเ�็บไว้ที่เครื่อง�ม่ข่าย (เซิร์ฟเวอร์)',image:'รูปภาพ',flash:'ไฟล์ Flash',form:'�บบฟอร์ม',checkbox:'เช็คบ๊อ�',radio:'เรดิโอบัตตอน',textField:'เท็�ซ์ฟิลด์',textarea:'เท็�ซ์�อเรีย',hiddenField:'ฮิดเดนฟิลด์',button:'ปุ่ม',select:'�ถบตัวเลือ�',imageButton:'ปุ่ม�บบรูปภาพ',notSet:'<ไม่ระบุ>',id:'ไอดี',name:'ชื่อ',langDir:'�ารเขียน-อ่านภาษา',langDirLtr:'จา�ซ้ายไปขวา (LTR)',langDirRtl:'จา�ขวามาซ้าย (RTL)',langCode:'รหัสภาษา',longDescr:'คำอธิบายประ�อบ URL',cssClass:'คลาสของไฟล์�ำหนดลั�ษณะ�าร�สดงผล',advisoryTitle:'คำเ�ริ่นนำ',cssStyle:'ลั�ษณะ�าร�สดงผล',ok:'ต�ลง',cancel:'ย�เลิ�',close:'Close',preview:'Preview',generalTab:'General',advancedTab:'ขั้นสูง',validateNumberFailed:'This value is not a number.',confirmNewPage:'Any unsaved changes to this content will be lost. Are you sure you want to load new page?',confirmCancel:'Some of the options have been changed. Are you sure to close the dialog?',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'ความ�ว้าง',height:'ความสูง',align:'�ารจัดวาง',alignLeft:'ชิดซ้าย',alignRight:'ชิดขวา',alignCenter:'�ึ่ง�ลาง',alignTop:'บนสุด',alignMiddle:'�ึ่ง�ลาง�นวตั้ง',alignBottom:'ชิดด้านล่าง',invalidHeight:'Height must be a number.',invalidWidth:'Width must be a number.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, unavailable</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'�ทร�ตัวอั�ษรพิเศษ',title:'�ทร�ตัวอั�ษรพิเศษ',options:'Special Character Options'},link:{toolbar:'�ทร�/��้ไข ลิงค์',other:'<อื่น ๆ>',menu:'��้ไข ลิงค์',title:'ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ',info:'รายละเอียด',target:'�ารเปิดหน้าลิงค์',upload:'อัพโหลดไฟล์',advanced:'ขั้นสูง',type:'ประเภทของลิงค์',toUrl:'URL',toAnchor:'จุดเชื่อมโยง (Anchor)',toEmail:'ส่งอีเมล์ (E-Mail)',targetFrame:'<เปิดในเฟรม>',targetPopup:'<เปิดหน้าจอเล็� (Pop-up)>',targetFrameName:'ชื่อทาร์เ�็ตเฟรม',targetPopupName:'ระบุชื่อหน้าจอเล็� (Pop-up)',popupFeatures:'คุณสมบัติของหน้าจอเล็� (Pop-up)',popupResizable:'Resizable',popupStatusBar:'�สดง�ถบสถานะ',popupLocationBar:'�สดงที่อยู่ของไฟล์',popupToolbar:'�สดง�ถบเครื่องมือ',popupMenuBar:'�สดง�ถบเมนู',popupFullScreen:'�สดงเต็มหน้าจอ (IE5.5++ เท่านั้น)',popupScrollBars:'�สดง�ถบเลื่อน',popupDependent:'�สดงเต็มหน้าจอ (Netscape)',popupLeft:'พิ�ัดซ้าย (Left Position)',popupTop:'พิ�ัดบน (Top Position)',id:'Id',langDir:'�ารเขียน-อ่านภาษา',langDirLTR:'จา�ซ้ายไปขวา (LTR)',langDirRTL:'จา�ขวามาซ้าย (RTL)',acccessKey:'�อคเซส คีย์',name:'ชื่อ',langCode:'�ารเขียน-อ่านภาษา',tabIndex:'ลำดับของ �ท็บ',advisoryTitle:'คำเ�ริ่นนำ',advisoryContentType:'ชนิดของคำเ�ริ่นนำ',cssClasses:'คลาสของไฟล์�ำหนดลั�ษณะ�าร�สดงผล',charset:'ลิงค์เชื่อมโยงไปยังชุดตัวอั�ษร',styles:'ลั�ษณะ�าร�สดงผล',rel:'Relationship',selectAnchor:'ระบุข้อมูลของจุดเชื่อมโยง (Anchor)',anchorName:'ชื่อ',anchorId:'ไอดี',emailAddress:'อีเมล์ (E-Mail)',emailSubject:'หัวเรื่อง',emailBody:'ข้อความ',noAnchors:'(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอ�สารนี้)',noUrl:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)',noEmail:'�รุณาระบุอีเมล์ (E-mail)'},anchor:{toolbar:'�ทร�/��้ไข Anchor',menu:'รายละเอียด Anchor',title:'รายละเอียด Anchor',name:'ชื่อ Anchor',errorName:'�รุณาระบุชื่อของ Anchor',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'Find and Replace',find:'ค้นหา',replace:'ค้นหา�ละ�ทนที่',findWhat:'ค้นหาคำว่า:',replaceWith:'�ทนที่ด้วย:',notFoundMsg:'ไม่พบคำที่ค้นหา.',findOptions:'Find Options',matchCase:'ตัวโห�่-เล็� ต้องตรง�ัน',matchWord:'ต้องตรง�ันทุ�คำ',matchCyclic:'Match cyclic',replaceAll:'�ทนที่ทั้งหมดที่พบ',replaceSuccessMsg:'%1 occurrence(s) replaced.'},table:{toolbar:'ตาราง',title:'คุณสมบัติของ ตาราง',menu:'คุณสมบัติของ ตาราง',deleteTable:'ลบตาราง',rows:'�ถว',columns:'สดมน์',border:'ขนาดเส้นขอบ',widthPx:'จุดสี',widthPc:'เปอร์เซ็น',widthUnit:'width unit',cellSpace:'ระยะ�นวนอนน',cellPad:'ระยะ�นวตั้ง',caption:'หัวเรื่องของตาราง',summary:'สรุปความ',headers:'Headers',headersNone:'None',headersColumn:'First column',headersRow:'First Row',headersBoth:'Both',invalidRows:'Number of rows must be a number greater than 0.',invalidCols:'Number of columns must be a number greater than 0.',invalidBorder:'Border size must be a number.',invalidWidth:'Table width must be a number.',invalidHeight:'Table height must be a number.',invalidCellSpacing:'Cell spacing must be a positive number.',invalidCellPadding:'Cell padding must be a positive number.',cell:{menu:'ช่องตาราง',insertBefore:'Insert Cell Before',insertAfter:'Insert Cell After',deleteCell:'ลบช่อง',merge:'ผสานช่อง',mergeRight:'Merge Right',mergeDown:'Merge Down',splitHorizontal:'Split Cell Horizontally',splitVertical:'Split Cell Vertically',title:'Cell Properties',cellType:'Cell Type',rowSpan:'Rows Span',colSpan:'Columns Span',wordWrap:'Word Wrap',hAlign:'Horizontal Alignment',vAlign:'Vertical Alignment',alignBaseline:'Baseline',bgColor:'Background Color',borderColor:'Border Color',data:'Data',header:'Header',yes:'Yes',no:'No',invalidWidth:'Cell width must be a number.',invalidHeight:'Cell height must be a number.',invalidRowSpan:'Rows span must be a whole number.',invalidColSpan:'Columns span must be a whole number.',chooseColor:'Choose'},row:{menu:'�ถว',insertBefore:'Insert Row Before',insertAfter:'Insert Row After',deleteRow:'ลบ�ถว'},column:{menu:'คอลัมน์',insertBefore:'Insert Column Before',insertAfter:'Insert Column After',deleteColumn:'ลบสดมน์'}},button:{title:'รายละเอียดของ ปุ่ม',text:'ข้อความ (ค่าตัว�ปร)',type:'ข้อความ',typeBtn:'Button',typeSbm:'Submit',typeRst:'Reset'},checkboxAndRadio:{checkboxTitle:'คุณสมบัติของ เช็คบ๊อ�',radioTitle:'คุณสมบัติของ เรดิโอบัตตอน',value:'ค่าตัว�ปร',selected:'เลือ�เป็นค่าเริ่มต้น'},form:{title:'คุณสมบัติของ �บบฟอร์ม',menu:'คุณสมบัติของ �บบฟอร์ม',action:'�อคชั่น',method:'เมธอด',encoding:'Encoding'},select:{title:'คุณสมบัติของ �ถบตัวเลือ�',selectInfo:'อินโฟ',opAvail:'ราย�ารตัวเลือ�',value:'ค่าตัว�ปร',size:'ขนาด',lines:'บรรทัด',chkMulti:'เลือ�หลายค่าได้',opText:'ข้อความ',opValue:'ค่าตัว�ปร',btnAdd:'เพิ่ม',btnModify:'��้ไข',btnUp:'บน',btnDown:'ล่าง',btnSetValue:'เลือ�เป็นค่าเริ่มต้น',btnDelete:'ลบ'},textarea:{title:'คุณสมบัติของ เท็��อเรีย',cols:'สดมภ์',rows:'�ถว'},textfield:{title:'คุณสมบัติของ เท็�ซ์ฟิลด์',name:'ชื่อ',value:'ค่าตัว�ปร',charWidth:'ความ�ว้าง',maxChars:'จำนวนตัวอั�ษรสูงสุด',type:'ชนิด',typeText:'ข้อความ',typePass:'รหัสผ่าน'},hidden:{title:'คุณสมบัติของ ฮิดเดนฟิลด์',name:'ชื่อ',value:'ค่าตัว�ปร'},image:{title:'คุณสมบัติของ รูปภาพ',titleButton:'คุณสมบัติของ ปุ่ม�บบรูปภาพ',menu:'คุณสมบัติของ รูปภาพ',infoTab:'ข้อมูลของรูปภาพ',btnUpload:'อัพโหลดไฟล์ไปเ�็บไว้ที่เครื่อง�ม่ข่าย (เซิร์ฟเวอร์)',upload:'อัพโหลดไฟล์',alt:'คำประ�อบรูปภาพ',lockRatio:'�ำหนดอัตราส่วน �ว้าง-สูง �บบคงที่',resetSize:'�ำหนดรูปเท่าขนาดจริง',border:'ขนาดขอบรูป',hSpace:'ระยะ�นวนอน',vSpace:'ระยะ�นวตั้ง',alertUrl:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ของไฟล์รูปภาพ (URL)',linkTab:'ลิ้งค์',button2Img:'Do you want to transform the selected image button on a simple image?',img2Button:'Do you want to transform the selected image on a image button?',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'คุณสมบัติของไฟล์ Flash',propertiesTab:'Properties',title:'คุณสมบัติของไฟล์ Flash',chkPlay:'เล่นอัตโนมัติ Auto Play',chkLoop:'เล่นวนรอบ Loop',chkMenu:'ให้ใช้งานเมนูของ Flash',chkFull:'Allow Fullscreen',scale:'อัตราส่วน Scale',scaleAll:'�สดงให้เห็นทั้งหมด Show all',scaleNoBorder:'ไม่�สดงเส้นขอบ No Border',scaleFit:'�สดงให้พอดี�ับพื้นที่ Exact Fit',access:'Script Access',accessAlways:'Always',accessSameDomain:'Same domain',accessNever:'Never',alignAbsBottom:'ชิดด้านล่างสุด',alignAbsMiddle:'�ึ่ง�ลาง',alignBaseline:'ชิดบรรทัด',alignTextTop:'ใต้ตัวอั�ษร',quality:'Quality',qualityBest:'Best',qualityHigh:'High',qualityAutoHigh:'Auto High',qualityMedium:'Medium',qualityAutoLow:'Auto Low',qualityLow:'Low',windowModeWindow:'Window',windowModeOpaque:'Opaque',windowModeTransparent:'Transparent',windowMode:'Window mode',flashvars:'Variables for Flash',bgcolor:'สีพื้นหลัง',hSpace:'ระยะ�นวนอน',vSpace:'ระยะ�นวตั้ง',validateSrc:'�รุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)',validateHSpace:'HSpace must be a number.',validateVSpace:'VSpace must be a number.'},spellCheck:{toolbar:'ตรวจ�ารสะ�ดคำ',title:'Spell Check',notAvailable:'Sorry, but service is unavailable now.',errorLoading:'Error loading application service host: %s.',notInDic:'ไม่พบในดิ�ชันนารี',changeTo:'��้ไขเป็น',btnIgnore:'ย�เว้น',btnIgnoreAll:'ย�เว้นทั้งหมด',btnReplace:'�ทนที่',btnReplaceAll:'�ทนที่ทั้งหมด',btnUndo:'ย�เลิ�',noSuggestions:'- ไม่มีคำ�นะนำใดๆ -',progress:'�ำลังตรวจสอบคำสะ�ด...',noMispell:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ไม่พบคำสะ�ดผิด',noChanges:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ไม่มี�าร��้คำใดๆ',oneChange:'ตรวจสอบคำสะ�ดเสร็จสิ้น: ��้ไข1คำ',manyChanges:'ตรวจสอบคำสะ�ดเสร็จสิ้น:: ��้ไข %1 คำ',ieSpellDownload:'ไม่ได้ติดตั้งระบบตรวจสอบคำสะ�ด. ต้อง�ารติดตั้งไหมครับ?'},smiley:{toolbar:'รูปสื่ออารมณ์',title:'�ทร�สั�ลั�ษณ์สื่ออารมณ์',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 element'},numberedlist:'ลำดับราย�าร�บบตัวเลข',bulletedlist:'ลำดับราย�าร�บบสั�ลั�ษณ์',indent:'เพิ่มระยะย่อหน้า',outdent:'ลดระยะย่อหน้า',justify:{left:'จัดชิดซ้าย',center:'จัด�ึ่ง�ลาง',right:'จัดชิดขวา',block:'จัดพอดีหน้า�ระดาษ'},blockquote:'Block Quote',clipboard:{title:'วาง',cutError:'ไม่สามารถตัดข้อความที่เลือ�ไว้ได้เนื่องจา��าร�ำหนดค่าระดับความปลอดภัย. �รุณาใช้ปุ่มลัดเพื่อวางข้อความ�ทน (�ดปุ่ม Ctrl/Cmd �ละตัว X พร้อม�ัน).',copyError:'ไม่สามารถสำเนาข้อความที่เลือ�ไว้ได้เนื่องจา��าร�ำหนดค่าระดับความปลอดภัย. �รุณาใช้ปุ่มลัดเพื่อวางข้อความ�ทน (�ดปุ่ม Ctrl/Cmd �ละตัว C พร้อม�ัน).',pasteMsg:'�รุณาใช้คีย์บอร์ดเท่านั้น โดย�ดปุ๋ม (<strong>Ctrl/Cmd �ละ V</strong>)พร้อมๆ�ัน �ละ�ด <strong>OK</strong>.',securityMsg:'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?',toolbar:'วางสำเนาจา�ตัวอั�ษรเวิร์ด',title:'วางสำเนาจา�ตัวอั�ษรเวิร์ด',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'วาง�บบตัวอั�ษรธรรมดา',title:'วาง�บบตัวอั�ษรธรรมดา'},templates:{button:'เทมเพลต',title:'เทมเพลตของส่วนเนื้อหาเว็บไซต์',options:'Template Options',insertOption:'�ทนที่เนื้อหาเว็บไซต์ที่เลือ�',selectPromptMsg:'�รุณาเลือ� เทมเพลต เพื่อนำไป��้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):',emptyListMsg:'(ยังไม่มี�าร�ำหนดเทมเพลต)'},showBlocks:'Show Blocks',stylesCombo:{label:'ลั�ษณะ',panelTitle:'Formatting Styles',panelTitle1:'Block Styles',panelTitle2:'Inline Styles',panelTitle3:'Object Styles'},format:{label:'รูป�บบ',panelTitle:'รูป�บบ',tag_p:'Normal',tag_pre:'Formatted',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Paragraph (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'�บบอั�ษร',voiceLabel:'Font',panelTitle:'�บบอั�ษร'},fontSize:{label:'ขนาด',voiceLabel:'Font Size',panelTitle:'ขนาด'},colorButton:{textColorTitle:'สีตัวอั�ษร',bgColorTitle:'สีพื้นหลัง',panelTitle:'Colors',auto:'สีอัตโนมัติ',more:'เลือ�สีอื่นๆ...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Spell Check As You Type',opera_title:'Not supported by Opera',enable:'Enable SCAYT',disable:'Disable SCAYT',about:'About SCAYT',toggle:'Toggle SCAYT',options:'Options',langs:'Languages',moreSuggestions:'More suggestions',ignore:'Ignore',ignoreAll:'Ignore All',addWord:'Add Word',emptyDic:'Dictionary name should not be empty.',optionsTab:'Options',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'Languages',dictionariesTab:'Dictionaries',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'About'},about:{title:'About CKEditor',dlgTitle:'About CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'For licensing information please visit our web site:',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'Maximize',minimize:'Minimize',fakeobjects:{anchor:'Anchor',flash:'Flash Animation',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Unknown Object'},resize:'Drag to resize',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'คุณสมบัติของเอ�สาร',title:'คุณสมบัติของเอ�สาร',design:'Design',meta:'ข้อมูลสำหรับเสิร์ชเอนจิ้น',chooseColor:'Choose',other:'<อื่น ๆ>',docTitle:'ชื่อไตเติ้ล',charset:'ชุดตัวอั�ษร',charsetOther:'ชุดตัวอั�ษรอื่นๆ',charsetASCII:'ASCII',charsetCE:'Central European',charsetCT:'Chinese Traditional (Big5)',charsetCR:'Cyrillic',charsetGR:'Greek',charsetJP:'Japanese',charsetKR:'Korean',charsetTR:'Turkish',charsetUN:'Unicode (UTF-8)',charsetWE:'Western European',docType:'ประเภทของเอ�สาร',docTypeOther:'ประเภทเอ�สารอื่นๆ',xhtmlDec:'รวมเอา  XHTML Declarations ไว้ด้วย',bgColor:'สีพื้นหลัง',bgImage:'ที่อยู่อ้างอิงออนไลน์ของรูปพื้นหลัง (Image URL)',bgFixed:'พื้นหลัง�บบไม่มี�ถบเลื่อน',txtColor:'สีตัวอั�ษร',margin:'ระยะขอบของหน้าเอ�สาร',marginTop:'ด้านบน',marginLeft:'ด้านซ้าย',marginRight:'ด้านขวา',marginBottom:'ด้านล่าง',metaKeywords:'คำสำคั�อธิบายเอ�สาร (คั่นคำด้วย คอมม่า)',metaDescription:'ประโยคอธิบายเ�ี่ยว�ับเอ�สาร',metaAuthor:'ผู้สร้างเอ�สาร',metaCopyright:'สงวนลิขสิทธิ์',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/tr.js b/upload/public/js/3rd_party/ckeditor/lang/tr.js
new file mode 100644
index 00000000..9bc9b315
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/tr.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.tr={dir:'ltr',editorTitle:'Zengin metin editörü, %1, yardım için ALT 0 tuşuna basın.',toolbars:'Editor toolbars',editor:'Zengin Metin Editörü',source:'Kaynak',newPage:'Yeni Sayfa',save:'Kaydet',preview:'Ön İzleme',cut:'Kes',copy:'Kopyala',paste:'Yapıştır',print:'Yazdır',underline:'Altı Çizgili',bold:'Kalın',italic:'İtalik',selectAll:'Tümünü Seç',removeFormat:'Biçimi Kaldır',strike:'Üstü Çizgili',subscript:'Alt Simge',superscript:'Üst Simge',horizontalrule:'Yatay Satır Ekle',pagebreak:'Sayfa Sonu Ekle',pagebreakAlt:'Page Break',unlink:'Köprü Kaldır',undo:'Geri Al',redo:'Tekrarla',common:{browseServer:'Sunucuyu Gez',url:'URL',protocol:'Protokol',upload:'Karşıya Yükle',uploadSubmit:'Sunucuya Yolla',image:'Resim',flash:'Flash',form:'Form',checkbox:'Onay Kutusu',radio:'Seçenek Düğmesi',textField:'Metin Girişi',textarea:'Çok Satırlı Metin',hiddenField:'Gizli Veri',button:'Düğme',select:'Seçim Menüsü',imageButton:'Resimli Düğme',notSet:'<tanımlanmamış>',id:'Kimlik',name:'Ad',langDir:'Dil Yönü',langDirLtr:'Soldan Sağa (LTR)',langDirRtl:'Sağdan Sola (RTL)',langCode:'Dil Kodlaması',longDescr:'Uzun Tanımlı URL',cssClass:'Biçem Sayfası Sınıfları',advisoryTitle:'Danışma Başlığı',cssStyle:'Biçem',ok:'Tamam',cancel:'İptal',close:'Kapat',preview:'Ön gösterim',generalTab:'Genel',advancedTab:'Gelişmiş',validateNumberFailed:'Bu değer sayı değildir.',confirmNewPage:'İceriğiniz kayıt edilmediğinden dolayı kaybolacaktır. Yeni bir sayfa yüklemek istediğinize eminsiniz?',confirmCancel:'Bazı seçenekler değişmiştir. Dialog penceresini kapatmak istediğinize eminmisiniz?',options:'Seçenekler',target:'Hedef',targetNew:'Yeni Pencere (_blank)',targetTop:'Enüst Pencere (_top)',targetSelf:'Aynı Pencere (_self)',targetParent:'Ana Pencere (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Genişlik',height:'Yükseklik',align:'Hizalama',alignLeft:'Sol',alignRight:'Sağ',alignCenter:'Merkez',alignTop:'Tepe',alignMiddle:'Orta',alignBottom:'Alt',invalidHeight:'Yükseklik sayı olmalıdır.',invalidWidth:'Genişlik bir sayı olmalıdır.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, hazır değildir</span>'},contextmenu:{options:'İçerik Menüsü Seçenekleri'},specialChar:{toolbar:'Özel Karakter Ekle',title:'Özel Karakter Seç',options:'Özel Karakter Seçenekleri'},link:{toolbar:'Link Ekle/Düzenle',other:'<diğer>',menu:'Link Düzenle',title:'Link',info:'Link Bilgisi',target:'Hedef',upload:'Karşıya Yükle',advanced:'Gelişmiş',type:'Link Türü',toUrl:'URL',toAnchor:'Bu sayfada çapa',toEmail:'E-Posta',targetFrame:'<çerçeve>',targetPopup:'<yeni açılan pencere>',targetFrameName:'Hedef Çerçeve Adı',targetPopupName:'Yeni Açılan Pencere Adı',popupFeatures:'Yeni Açılan Pencere Özellikleri',popupResizable:'Resizable',popupStatusBar:'Durum Çubuğu',popupLocationBar:'Yer Çubuğu',popupToolbar:'Araç Çubuğu',popupMenuBar:'Menü Çubuğu',popupFullScreen:'Tam Ekran (IE)',popupScrollBars:'Kaydırma Çubukları',popupDependent:'Bağımlı (Netscape)',popupLeft:'Sola Göre Konum',popupTop:'Yukarıya Göre Konum',id:'Id',langDir:'Dil Yönü',langDirLTR:'Soldan Sağa (LTR)',langDirRTL:'Sağdan Sola (RTL)',acccessKey:'Erişim Tuşu',name:'Ad',langCode:'Dil Yönü',tabIndex:'Sekme İndeksi',advisoryTitle:'Danışma Başlığı',advisoryContentType:'Danışma İçerik Türü',cssClasses:'Biçem Sayfası Sınıfları',charset:'Bağlı Kaynak Karakter Gurubu',styles:'Biçem',rel:'Relationship',selectAnchor:'Bağlantı Seç',anchorName:'Bağlantı Adı ile',anchorId:'Eleman Kimlik Numarası ile',emailAddress:'E-Posta Adresi',emailSubject:'İleti Konusu',emailBody:'İleti Gövdesi',noAnchors:'(Bu belgede hiç çapa yok)',noUrl:"Lütfen Link URL'sini yazın",noEmail:'Lütfen E-posta adresini yazın'},anchor:{toolbar:'Bağlantı Ekle/Düzenle',menu:'Bağlantı Özellikleri',title:'Bağlantı Özellikleri',name:'Bağlantı Adı',errorName:'Lütfen bağlantı için ad giriniz',remove:'Remove Anchor'},list:{numberedTitle:'Sayılandırılmış Liste Özellikleri',bulletedTitle:'Simgeli Liste Özellikleri',type:'Tipi',start:'Başla',validateStartNumber:'List start number must be a whole number.',circle:'Daire',disc:'Disk',square:'Kare',none:'Yok',notset:'<ayarlanmamış>',armenian:'Ermenice sayılandırma',georgian:'Gürcüce numaralandırma (an, ban, gan, vs.)',lowerRoman:'Küçük Roman (i, ii, iii, iv, v, vs.)',upperRoman:'Büyük Roman (I, II, III, IV, V, vs.)',lowerAlpha:'Küçük Alpha (a, b, c, d, e, vs.)',upperAlpha:'Büyük Alpha (A, B, C, D, E, vs.)',lowerGreek:'Küçük Greek (alpha, beta, gamma, vs.)',decimal:'Ondalık (1, 2, 3, vs.)',decimalLeadingZero:'Başı sıfırlı ondalık (01, 02, 03, vs.)'},findAndReplace:{title:'Bul ve Değiştir',find:'Bul',replace:'Değiştir',findWhat:'Aranan:',replaceWith:'Bununla değiştir:',notFoundMsg:'Belirtilen yazı bulunamadı.',findOptions:'Find Options',matchCase:'Büyük/küçük harf duyarlı',matchWord:'Kelimenin tamamı uysun',matchCyclic:'Eşleşen döngü',replaceAll:'Tümünü Değiştir',replaceSuccessMsg:'%1 bulunanlardan değiştirildi.'},table:{toolbar:'Tablo',title:'Tablo Özellikleri',menu:'Tablo Özellikleri',deleteTable:'Tabloyu Sil',rows:'Satırlar',columns:'Sütunlar',border:'Kenar Kalınlığı',widthPx:'piksel',widthPc:'yüzde',widthUnit:'genişlik birimi',cellSpace:'Izgara kalınlığı',cellPad:'Izgara yazı arası',caption:'Başlık',summary:'Özet',headers:'Başlıklar',headersNone:'Yok',headersColumn:'İlk Sütun',headersRow:'İlk Satır',headersBoth:'Her İkisi',invalidRows:'Satır sayısı 0 sayısından büyük olmalıdır.',invalidCols:'Sütün sayısı 0 sayısından büyük olmalıdır.',invalidBorder:'Çerceve büyüklüklüğü sayı olmalıdır.',invalidWidth:'Tablo genişliği sayı olmalıdır.',invalidHeight:'Tablo yüksekliği sayı olmalıdır.',invalidCellSpacing:'Hücre boşluğu (spacing) sayı olmalıdır.',invalidCellPadding:'Hücre aralığı (padding) sayı olmalıdır.',cell:{menu:'Hücre',insertBefore:'Hücre Ekle - Önce',insertAfter:'Hücre Ekle - Sonra',deleteCell:'Hücre Sil',merge:'Hücreleri Birleştir',mergeRight:'Birleştir - Sağdaki İle ',mergeDown:'Birleştir - Aşağıdaki İle ',splitHorizontal:'Hücreyi Yatay Böl',splitVertical:'Hücreyi Dikey Böl',title:'Hücre Özellikleri',cellType:'Hücre Tipi',rowSpan:'Satırlar Mesafesi (Span)',colSpan:'Sütünlar Mesafesi (Span)',wordWrap:'Kelime Kaydırma',hAlign:'Düşey Hizalama',vAlign:'Yataş Hizalama',alignBaseline:'Tabana',bgColor:'Arkaplan Rengi',borderColor:'Çerçeve Rengi',data:'Veri',header:'Başlık',yes:'Evet',no:'Hayır',invalidWidth:'Hücre genişliği sayı olmalıdır.',invalidHeight:'Hücre yüksekliği sayı olmalıdır.',invalidRowSpan:'Satırların mesafesi tam sayı olmalıdır.',invalidColSpan:'Sütünların mesafesi tam sayı olmalıdır.',chooseColor:'Seçiniz'},row:{menu:'Satır',insertBefore:'Satır Ekle - Önce',insertAfter:'Satır Ekle - Sonra',deleteRow:'Satır Sil'},column:{menu:'Sütun',insertBefore:'Kolon Ekle - Önce',insertAfter:'Kolon Ekle - Sonra',deleteColumn:'Sütun Sil'}},button:{title:'Düğme Özellikleri',text:'Metin (Değer)',type:'Tip',typeBtn:'Düğme',typeSbm:'Gönder',typeRst:'Sıfırla'},checkboxAndRadio:{checkboxTitle:'Onay Kutusu Özellikleri',radioTitle:'Seçenek Düğmesi Özellikleri',value:'Değer',selected:'Seçili'},form:{title:'Form Özellikleri',menu:'Form Özellikleri',action:'İşlem',method:'Yöntem',encoding:'Kodlama'},select:{title:'Seçim Menüsü Özellikleri',selectInfo:'Bilgi',opAvail:'Mevcut Seçenekler',value:'Değer',size:'Boyut',lines:'satır',chkMulti:'Çoklu seçime izin ver',opText:'Metin',opValue:'Değer',btnAdd:'Ekle',btnModify:'Düzenle',btnUp:'Yukarı',btnDown:'Aşağı',btnSetValue:'Seçili değer olarak ata',btnDelete:'Sil'},textarea:{title:'Çok Satırlı Metin Özellikleri',cols:'Sütunlar',rows:'Satırlar'},textfield:{title:'Metin Girişi Özellikleri',name:'Ad',value:'Değer',charWidth:'Karakter Genişliği',maxChars:'En Fazla Karakter',type:'Tür',typeText:'Metin',typePass:'Şifre'},hidden:{title:'Gizli Veri Özellikleri',name:'Ad',value:'Değer'},image:{title:'Resim Özellikleri',titleButton:'Resimli Düğme Özellikleri',menu:'Resim Özellikleri',infoTab:'Resim Bilgisi',btnUpload:'Sunucuya Yolla',upload:'Karşıya Yükle',alt:'Alternatif Yazı',lockRatio:'Oranı Kilitle',resetSize:'Boyutu Başa Döndür',border:'Kenar',hSpace:'Yatay Boşluk',vSpace:'Dikey Boşluk',alertUrl:"Lütfen resmin URL'sini yazınız",linkTab:'Köprü',button2Img:'Seçili resim butonunu basit resime çevirmek istermisiniz?',img2Button:'Seçili olan resimi, resimli butona çevirmek istermisiniz?',urlMissing:'Resmin URL kaynağı eksiktir.',validateBorder:'Çerçeve tam sayı olmalıdır.',validateHSpace:'HSpace tam sayı olmalıdır.',validateVSpace:'VSpace tam sayı olmalıdır.'},flash:{properties:'Flash Özellikleri',propertiesTab:'Özellikler',title:'Flash Özellikleri',chkPlay:'Otomatik Oynat',chkLoop:'Döngü',chkMenu:'Flash Menüsünü Kullan',chkFull:'Tam ekrana İzinver',scale:'Boyutlandır',scaleAll:'Hepsini Göster',scaleNoBorder:'Kenar Yok',scaleFit:'Tam Sığdır',access:'Kod İzni',accessAlways:'Herzaman',accessSameDomain:'Aynı domain',accessNever:'Asla',alignAbsBottom:'Tam Altı',alignAbsMiddle:'Tam Ortası',alignBaseline:'Taban Çizgisi',alignTextTop:'Yazı Tepeye',quality:'Kalite',qualityBest:'En iyi',qualityHigh:'Yüksek',qualityAutoHigh:'Otomatik Yükseklik',qualityMedium:'Orta',qualityAutoLow:'Otomatik Düşüklük',qualityLow:'Düşük',windowModeWindow:'Pencere',windowModeOpaque:'Opak',windowModeTransparent:'Şeffaf',windowMode:'Pencere modu',flashvars:'Flash Değerleri',bgcolor:'Arka Renk',hSpace:'Yatay Boşluk',vSpace:'Dikey Boşluk',validateSrc:"Lütfen köprü URL'sini yazın",validateHSpace:'HSpace sayı olmalıdır.',validateVSpace:'VSpace sayı olmalıdır.'},spellCheck:{toolbar:'Yazım Denetimi',title:'Yazımı Denetle',notAvailable:'Üzügünüz, bu servis şuanda hizmet dışıdır.',errorLoading:'Uygulamada yüklerken hata oluştu: %s.',notInDic:'Sözlükte Yok',changeTo:'Şuna değiştir:',btnIgnore:'Yoksay',btnIgnoreAll:'Tümünü Yoksay',btnReplace:'Değiştir',btnReplaceAll:'Tümünü Değiştir',btnUndo:'Geri Al',noSuggestions:'- Öneri Yok -',progress:'Yazım denetimi işlemde...',noMispell:'Yazım denetimi tamamlandı: Yanlış yazıma rastlanmadı',noChanges:'Yazım denetimi tamamlandı: Hiçbir kelime değiştirilmedi',oneChange:'Yazım denetimi tamamlandı: Bir kelime değiştirildi',manyChanges:'Yazım denetimi tamamlandı: %1 kelime değiştirildi',ieSpellDownload:'Yazım denetimi yüklenmemiş. Şimdi yüklemek ister misiniz?'},smiley:{toolbar:'İfade',title:'İfade Ekle',options:'İfade Seçenekleri'},elementsPath:{eleLabel:'Elementlerin yolu',eleTitle:'%1 element'},numberedlist:'Numaralı Liste',bulletedlist:'Simgeli Liste',indent:'Sekme Arttır',outdent:'Sekme Azalt',justify:{left:'Sola Dayalı',center:'Ortalanmış',right:'Sağa Dayalı',block:'İki Kenara Yaslanmış'},blockquote:'Blok Oluştur',clipboard:{title:'Yapıştır',cutError:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.',copyError:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.',pasteMsg:'Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.',securityMsg:'Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?",toolbar:"Word'den Yapıştır",title:"Word'den Yapıştır",error:'Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir'},pasteText:{button:'Düz Metin Olarak Yapıştır',title:'Düz Metin Olarak Yapıştır'},templates:{button:'Şablonlar',title:'İçerik Şablonları',options:'Şablon Seçenekleri',insertOption:'Mevcut içerik ile değiştir',selectPromptMsg:'Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):',emptyListMsg:'(Belirli bir şablon seçilmedi)'},showBlocks:'Blokları Göster',stylesCombo:{label:'Biçem',panelTitle:'Stilleri Düzenliyor',panelTitle1:'Blok Stilleri',panelTitle2:'Inline Stilleri',panelTitle3:'Nesne Stilleri'},format:{label:'Biçim',panelTitle:'Biçim',tag_p:'Normal',tag_pre:'Biçimli',tag_address:'Adres',tag_h1:'Başlık 1',tag_h2:'Başlık 2',tag_h3:'Başlık 3',tag_h4:'Başlık 4',tag_h5:'Başlık 5',tag_h6:'Başlık 6',tag_div:'Paragraf (DIV)'},div:{title:'Div İçeriği Oluştur',toolbar:'Div İçeriği Oluştur',cssClassInputLabel:'Stilltipi Sınıfı',styleSelectLabel:'Stil',IdInputLabel:'Id',languageCodeInputLabel:' Dil Kodu',inlineStyleInputLabel:'Inline Stili',advisoryTitleInputLabel:'Tavsiye Başlığı',langDirLabel:'Dil Yönü',langDirLTRLabel:'Soldan sağa (LTR)',langDirRTLLabel:'Sağdan sola (RTL)',edit:'Div Düzenle',remove:'Div Kaldır'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Yazı Türü',voiceLabel:'Font',panelTitle:'Yazı Türü'},fontSize:{label:'Boyut',voiceLabel:'Font Size',panelTitle:'Boyut'},colorButton:{textColorTitle:'Yazı Rengi',bgColorTitle:'Arka Renk',panelTitle:'Renkler',auto:'Otomatik',more:'Diğer renkler...'},colors:{'000':'Siyah',800000:'Kestane','8B4513':'Koyu Kahverengi','2F4F4F':'Koyu Kurşuni Gri','008080':'Teal','000080':'Mavi','4B0082':'Çivit Mavisi',696969:'Silik Gri',B22222:'Ateş Tuğlası',A52A2A:'Kahverengi',DAA520:'Altun Sırık','006400':'Koyu Yeşil','40E0D0':'Turkuaz','0000CD':'Orta Mavi',800080:'Pembe',808080:'Gri',F00:'Kırmızı',FF8C00:'Koyu Portakal',FFD700:'Altın','008000':'Yeşil','0FF':'Ciyan','00F':'Mavi',EE82EE:'Menekşe',A9A9A9:'Koyu Gri',FFA07A:'Açık Sarımsı',FFA500:'Portakal',FFFF00:'Sarı','00FF00':'Açık Yeşil',AFEEEE:'Sönük Turkuaz',ADD8E6:'Açık Mavi',DDA0DD:'Mor',D3D3D3:'Açık Gri',FFF0F5:'Eflatun Pembe',FAEBD7:'Antik Beyaz',FFFFE0:'Açık Sarı',F0FFF0:'Balsarısı',F0FFFF:'Gök Mavisi',F0F8FF:'Reha Mavi',E6E6FA:'Eflatun',FFF:'Beyaz'},scayt:{title:'Girmiş olduğunuz kelime denetimi',opera_title:'Opera tarafından desteklenmemektedir',enable:'SCAYT etkinleştir',disable:'SCAYT pasifleştir',about:'SCAYT hakkında',toggle:'SCAYT değiştir',options:'Seçenekler',langs:'Diller',moreSuggestions:'Daha fazla öneri',ignore:'Yoksay',ignoreAll:'Tümünü Yoksay',addWord:'Kelime Ekle',emptyDic:'Sözlük adı boş olamaz.',optionsTab:'Seçenekler',allCaps:'Tüm büyük küçük kelimeleri yoksay',ignoreDomainNames:'Domain adlarını yoksay',mixedCase:'Karışık büyüklük ile Sözcükler yoksay',mixedWithDigits:'Sayılarla Kelimeler yoksay',languagesTab:'Diller',dictionariesTab:'Sözlükler',dic_field_name:'Sözlük adı',dic_create:'Oluştur',dic_restore:'Geri al',dic_delete:'Sil',dic_rename:'Yeniden adlandır',dic_info:"Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it's name and click the Restore button.",aboutTab:'Hakkında'},about:{title:'CKEditor Hakkında',dlgTitle:'CKEditor Hakkında',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:',copy:'Copyright &copy; $1. Tüm hakları saklıdır.'},maximize:'Büyült',minimize:'Küçült',fakeobjects:{anchor:'Bağlantı',flash:'Flash Animasyonu',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'Bilinmeyen Nesne'},resize:'Boyutlandırmak için sürükle',colordialog:{title:'Renk seç',options:'Renk Seçenekleri',highlight:'İşaretle',selected:'Seçilmiş',clear:'Temizle'},toolbarCollapse:"Toolbar'ı topla",toolbarExpand:"Toolbar'ı aç",toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Belge Özellikleri',title:'Belge Özellikleri',design:'Design',meta:'Tanım Bilgisi (Meta)',chooseColor:'Seçiniz',other:'<diğer>',docTitle:'Sayfa Başlığı',charset:'Karakter Kümesi Kodlaması',charsetOther:'Diğer Karakter Kümesi Kodlaması',charsetASCII:'ASCII',charsetCE:'Orta Avrupa',charsetCT:'Geleneksel Çince (Big5)',charsetCR:'Kiril',charsetGR:'Yunanca',charsetJP:'Japonca',charsetKR:'Korece',charsetTR:'Türkçe',charsetUN:'Unicode (UTF-8)',charsetWE:'Batı Avrupa',docType:'Belge Türü Başlığı',docTypeOther:'Diğer Belge Türü Başlığı',xhtmlDec:'XHTML Bildirimlerini Dahil Et',bgColor:'Arka Plan Rengi',bgImage:'Arka Plan Resim URLsi',bgFixed:'Sabit Arka Plan',txtColor:'Yazı Rengi',margin:'Kenar Boşlukları',marginTop:'Tepe',marginLeft:'Sol',marginRight:'Sağ',marginBottom:'Alt',metaKeywords:'Belge Dizinleme Anahtar Kelimeleri (virgülle ayrılmış)',metaDescription:'Belge Tanımı',metaAuthor:'Yazar',metaCopyright:'Telif',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/uk.js b/upload/public/js/3rd_party/ckeditor/lang/uk.js
new file mode 100644
index 00000000..e658a87e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/uk.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.uk={dir:'ltr',editorTitle:'Тек�товий редактор, %1, нати�ніть ALT 0 дл� довідки.',toolbars:'Editor toolbars',editor:'Тек�товий редактор',source:'Джерело',newPage:'�ова �торінка',save:'Зберегти',preview:'Попередній перегл�д',cut:'Вирізати',copy:'Копіювати',paste:'В�тавити',print:'Друк',underline:'Підкре�лений',bold:'Жирний',italic:'Кур�ив',selectAll:'Виділити в�е',removeFormat:'Очи�тити форматуванн�',strike:'Закре�лений',subscript:'�ижній індек�',superscript:'Верхній індек�',horizontalrule:'Горизонтальна ліні�',pagebreak:'В�тавити розрив �торінки',pagebreakAlt:'Page Break',unlink:'Видалити по�иланн�',undo:'Повернути',redo:'Повторити',common:{browseServer:'Огл�д',url:'URL',protocol:'Протокол',upload:'�аді�лати',uploadSubmit:'�аді�лати на �ервер',image:'Зображенн�',flash:'Flash',form:'Форма',checkbox:'Галочка',radio:'Кнопка вибору',textField:'Тек�тове поле',textarea:'Тек�това обла�ть',hiddenField:'Приховане поле',button:'Кнопка',select:'Спи�ок',imageButton:'Кнопка із зображенн�м',notSet:'<не визначено>',id:'Ідентифікатор',name:"Ім'�",langDir:'�апр�мок мови',langDirLtr:'Зліва направо (LTR)',langDirRtl:'Справа наліво (RTL)',langCode:'Код мови',longDescr:'Довгий опи� URL',cssClass:'Кла� CSS',advisoryTitle:'Заголовок',cssStyle:'Стиль CSS',ok:'ОК',cancel:'Ска�увати',close:'Закрити',preview:'Попередній перегл�д',generalTab:'О�новне',advancedTab:'Додаткове',validateNumberFailed:'Значенн� не є цілим чи�лом.',confirmNewPage:'В�і незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову �торінку?',confirmCancel:'Де�кі опції змінено. Закрити вікно без збереженн� змін?',options:'Опції',target:'Ціль',targetNew:'�ове вікно (_blank)',targetTop:'Поточне вікно (_top)',targetSelf:'Поточний фрейм/вікно (_self)',targetParent:'Батьків�ький фрейм/вікно (_parent)',langDirLTR:'Зліва направо (LTR)',langDirRTL:'Справа наліво (RTL)',styles:'Стиль CSS',cssClasses:'Кла� CSS',width:'Ширина',height:'Ви�ота',align:'Вирівнюванн�',alignLeft:'По лівому краю',alignRight:'По правому краю',alignCenter:'По центру',alignTop:'По верхньому краю',alignMiddle:'По �ередині',alignBottom:'По нижньому краю',invalidHeight:'Ви�ота повинна бути цілим чи�лом.',invalidWidth:'Ширина повинна бути цілим чи�лом.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, не до�тупне</span>'},contextmenu:{options:'Опції контек�тного меню'},specialChar:{toolbar:'Спеціальний �имвол',title:'Оберіть �пеціальний �имвол',options:'Опції'},link:{toolbar:'В�тавити/Редагувати по�иланн�',other:'<інший>',menu:'В�тавити по�иланн�',title:'По�иланн�',info:'Інформаці� по�иланн�',target:'Ціль',upload:'�аді�лати',advanced:'Додаткове',type:'Тип по�иланн�',toUrl:'URL',toAnchor:'Якір на цю �торінку',toEmail:'Ел. пошта',targetFrame:'<фрейм>',targetPopup:'<випливаюче вікно>',targetFrameName:"Ім'� цільового фрейму",targetPopupName:"Ім'� випливаючого вікна",popupFeatures:'Вла�тиво�ті випливаючого вікна',popupResizable:'Ма�штабоване',popupStatusBar:'Р�док �тату�у',popupLocationBar:'Панель локації',popupToolbar:'Панель ін�трументів',popupMenuBar:'Панель меню',popupFullScreen:'Повний екран (IE)',popupScrollBars:'Стрічки прокрутки',popupDependent:'Залежний (Netscape)',popupLeft:'Позиці� зліва',popupTop:'Позиці� зверху',id:'Ідентифікатор',langDir:'�апр�мок мови',langDirLTR:'Зліва направо (LTR)',langDirRTL:'Справа наліво (RTL)',acccessKey:'Гар�ча клавіша',name:"Ім'�",langCode:'Код мови',tabIndex:'По�лідовні�ть переходу',advisoryTitle:'Заголовок',advisoryContentType:'Тип вмі�ту',cssClasses:'Кла� CSS',charset:'Кодуванн�',styles:'Стиль CSS',rel:'Relationship',selectAnchor:'Оберіть �кір',anchorName:"За ім'�м елементу",anchorId:'За ідентифікатором елементу',emailAddress:'�дре�а ел. пошти',emailSubject:'Тема ли�та',emailBody:'Тіло повідомленн�',noAnchors:'(В цьому документі немає �корів)',noUrl:'Будь ла�ка, вкажіть URL по�иланн�',noEmail:'Будь ла�ка, вкажіть адре� ел. пошти'},anchor:{toolbar:'В�тавити/Редагувати �кір',menu:'Вла�тиво�ті �кор�',title:'Вла�тиво�ті �кор�',name:"Ім'� �кор�",errorName:"Будь ла�ка, вкажіть ім'� �кор�",remove:'Remove Anchor'},list:{numberedTitle:'Опції нумерованого �пи�ку',bulletedTitle:'Опції маркірованого �пи�ку',type:'Тип',start:'Почати з...',validateStartNumber:'Початковий номер �пи�ку повинен бути цілим чи�лом.',circle:'Кільце',disc:'Кружечок',square:'Квадратик',none:'�ема',notset:'<не вказано>',armenian:'Вірмен�ька нумераці�',georgian:'Грузин�ька нумераці� (an, ban, gan і т.д.)',lowerRoman:'Малі рим�ькі (i, ii, iii, iv, v і т.д.)',upperRoman:'Великі рим�ькі (I, II, III, IV, V і т.д.)',lowerAlpha:'Малі лат. букви (a, b, c, d, e і т.д.)',upperAlpha:'Великі лат. букви (A, B, C, D, E і т.д.)',lowerGreek:'Малі гр. букви (альфа, бета, гамма і т.д.)',decimal:'Де��ткові (1, 2, 3 і т.д.)',decimalLeadingZero:'Де��ткові з нулем (01, 02, 03 і т.д.)'},findAndReplace:{title:'Знайти і замінити',find:'Пошук',replace:'Заміна',findWhat:'Шукати:',replaceWith:'Замінити на:',notFoundMsg:'Вказаний тек�т не знайдено.',findOptions:'Find Options',matchCase:'Враховувати регі�тр',matchWord:'Збіг цілих �лів',matchCyclic:'Циклічна заміна',replaceAll:'Замінити в�е',replaceSuccessMsg:'%1 �півпадінь(н�) замінено.'},table:{toolbar:'Таблиц�',title:'Вла�тиво�ті таблиці',menu:'Вла�тиво�ті таблиці',deleteTable:'Видалити таблицю',rows:'Р�дки',columns:'Стовбці',border:'Розмір рамки',widthPx:'пік�елів',widthPc:'від�отків',widthUnit:'Одиниці вимір.',cellSpace:'Проміжок',cellPad:'Внутр. від�туп',caption:'Заголовок таблиці',summary:'Детальний опи� заголовку таблиці',headers:'Заголовки �товбців/р�дків',headersNone:'Без заголовків',headersColumn:'Стовбці',headersRow:'Р�дки',headersBoth:'Стовбці і р�дки',invalidRows:'Кількі�ть р�дків повинна бути більшою 0.',invalidCols:'Кількі�ть �товбців повинна бути більшою 0.',invalidBorder:'Розмір рамки повинен бути цілим чи�лом.',invalidWidth:'Ширина таблиці повинна бути цілим чи�лом.',invalidHeight:'Ви�ота таблиці повинна бути цілим чи�лом.',invalidCellSpacing:'Проміжок між комірками повинен бути цілим чи�лом.',invalidCellPadding:'Внутр. від�туп комірки повинен бути цілим чи�лом.',cell:{menu:'Комірки',insertBefore:'В�тавити комірку перед',insertAfter:'В�тавити комірку пі�л�',deleteCell:'Видалити комірки',merge:"Об'єднати комірки",mergeRight:"Об'єднати �права",mergeDown:"Об'єднати донизу",splitHorizontal:'Розділити комірку по горизонталі',splitVertical:'Розділити комірку по вертикалі',title:'Вла�тиво�ті комірки',cellType:'Тип комірки',rowSpan:"Об'єднанн� р�дків",colSpan:"Об'єднанн� �товпців",wordWrap:'�втоперене�енн� тек�ту',hAlign:'Гориз. вирівнюванн�',vAlign:'Верт. вирівнюванн�',alignBaseline:'По базовій лінії',bgColor:'Колір фону',borderColor:'Колір рамки',data:'Дані',header:'Заголовок',yes:'Так',no:'�і',invalidWidth:'Ширина комірки повинна бути цілим чи�лом.',invalidHeight:'Ви�ота комірки повинна бути цілим чи�лом.',invalidRowSpan:"Кількі�ть об'єднуваних р�дків повинна бути цілим чи�лом.",invalidColSpan:"Кількі�ть об'єднуваних �товбців повинна бути цілим чи�лом.",chooseColor:'Обрати'},row:{menu:'Р�дки',insertBefore:'В�тавити р�док перед',insertAfter:'В�тавити р�док пі�л�',deleteRow:'Видалити р�дки'},column:{menu:'Стовбці',insertBefore:'В�тавити �товбець перед',insertAfter:'В�тавити �товбець пі�л�',deleteColumn:'Видалити �товбці'}},button:{title:'Вла�тиво�ті кнопки',text:'Значенн�',type:'Тип',typeBtn:'Кнопка (button)',typeSbm:'�аді�лати (submit)',typeRst:'Очи�тити (reset)'},checkboxAndRadio:{checkboxTitle:'Вла�тиво�ті галочки',radioTitle:'Вла�тиво�ті кнопки вибору',value:'Значенн�',selected:'Обрана'},form:{title:'Вла�тиво�ті форми',menu:'Вла�тиво�ті форми',action:'Ді�',method:'Метод',encoding:'Кодуванн�'},select:{title:'Вла�тиво�ті �пи�ку',selectInfo:'Інфо',opAvail:'До�тупні варіанти',value:'Значенн�',size:'Кількі�ть',lines:'видимих позицій у �пи�ку',chkMulti:'Спи�ок з мультивибором',opText:'Тек�т',opValue:'Значенн�',btnAdd:'Добавити',btnModify:'Змінити',btnUp:'Вгору',btnDown:'Вниз',btnSetValue:'В�тановити �к обране значенн�',btnDelete:'Видалити'},textarea:{title:'Вла�тиво�ті тек�тової обла�ті',cols:'Стовбці',rows:'Р�дки'},textfield:{title:'Вла�тиво�ті тек�тового пол�',name:"Ім'�",value:'Значенн�',charWidth:'Ширина',maxChars:'Мак�. к-ть �имволів',type:'Тип',typeText:'Тек�т',typePass:'Пароль'},hidden:{title:'Вла�тиво�ті прихованого пол�',name:"Ім'�",value:'Значенн�'},image:{title:'Вла�тиво�ті зображенн�',titleButton:'Вла�тиво�ті кнопки із зображенн�м',menu:'Вла�тиво�ті зображенн�',infoTab:'Інформаці� про зображенн�',btnUpload:'�аді�лати на �ервер',upload:'�аді�лати',alt:'�льтернативний тек�т',lockRatio:'Зберегти пропорції',resetSize:'Очи�тити пол� розмірів',border:'Рамка',hSpace:'Гориз. від�туп',vSpace:'Верт. від�туп',alertUrl:'Будь ла�ка, вкажіть URL зображенн�',linkTab:'По�иланн�',button2Img:'Бажаєте перетворити обрану кнопку-зображенн� на про�те зображенн�?',img2Button:'Бажаєте перетворити обране зображенн� на кнопку-зображенн�?',urlMissing:'Вкажіть URL зображенн�.',validateBorder:'Ширина рамки повинна бути цілим чи�лом.',validateHSpace:'Гориз. від�туп повинен бути цілим чи�лом.',validateVSpace:'Верт. від�туп повинен бути цілим чи�лом.'},flash:{properties:'Вла�тиво�ті Flash',propertiesTab:'Вла�тиво�ті',title:'Вла�тиво�ті Flash',chkPlay:'�втопрограванн�',chkLoop:'Циклічно',chkMenu:'Дозволити меню Flash',chkFull:'Дозволити повноекранний перегл�д',scale:'Ма�штаб',scaleAll:'Показати в�е',scaleNoBorder:'Без рамки',scaleFit:'Поч. розмір',access:'До�туп до �крипта',accessAlways:'Завжди',accessSameDomain:'З того ж домена',accessNever:'�іколи',alignAbsBottom:'По нижньому краю (abs)',alignAbsMiddle:'По �ередині (abs)',alignBaseline:'По базовій лінії',alignTextTop:'Тек�т по верхньому краю',quality:'Які�ть',qualityBest:'Відмінна',qualityHigh:'Ви�ока',qualityAutoHigh:'�втом. відмінна',qualityMedium:'Середн�',qualityAutoLow:'�втом. низька',qualityLow:'�изька',windowModeWindow:'Вікно',windowModeOpaque:'�епрозорі�ть',windowModeTransparent:'Прозорі�ть',windowMode:'Віконний режим',flashvars:'Змінні Flash',bgcolor:'Колір фону',hSpace:'Гориз. від�туп',vSpace:'Верт. від�туп',validateSrc:'Будь ла�ка, вкажіть URL по�иланн�',validateHSpace:'Гориз. від�туп повинен бути цілим чи�лом.',validateVSpace:'Верт. від�туп повинен бути цілим чи�лом.'},spellCheck:{toolbar:'Перевірити орфографію',title:'Перевірка орфографії',notAvailable:'Вибачте, але �ерві� наразі недо�тупний.',errorLoading:'Помилка завантаженн� : %s.',notInDic:'�емає в �ловнику',changeTo:'Замінити на',btnIgnore:'Пропу�тити',btnIgnoreAll:'Пропу�тити в�е',btnReplace:'Замінити',btnReplaceAll:'Замінити в�е',btnUndo:'�азад',noSuggestions:'- немає варіантів -',progress:'Виконуєть�� перевірка орфографії...',noMispell:'Перевірку орфографії завершено: помилок не знайдено',noChanges:'Перевірку орфографії завершено: жодне �лово не змінено',oneChange:'Перевірку орфографії завершено: змінено одне �лово',manyChanges:'Перевірку орфографії завершено: 1% �лів(ова) змінено',ieSpellDownload:'Модуль перевірки орфографії не в�тановлено. Бажаєте завантажити його зараз?'},smiley:{toolbar:'Смайлик',title:'В�тавити �майлик',options:'Опції �майликів'},elementsPath:{eleLabel:'Шл�х',eleTitle:'%1 елемент'},numberedlist:'�умерований �пи�ок',bulletedlist:'Маркірований �пи�ок',indent:'Збільшити від�туп',outdent:'Зменшити від�туп',justify:{left:'По лівому краю',center:'По центру',right:'По правому краю',block:'По ширині'},blockquote:'Цитата',clipboard:{title:'В�тавити',cutError:'�алаштуванн� безпеки Вашого браузера не дозвол�ють редактору автоматично виконувати операції вирізуванн�. Будь ла�ка, викори�товуйте клавіатуру дл� цього (Ctrl/Cmd+X)',copyError:'�алаштуванн� безпеки Вашого браузера не дозвол�ють редактору автоматично виконувати операції копіюванн�. Будь ла�ка, викори�товуйте клавіатуру дл� цього (Ctrl/Cmd+C).',pasteMsg:'Будь ла�ка, в�тавте інформацію з буфера обміну в цю обла�ть, кори�туючи�ь комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та нати�ніть <STRONG>OK</STRONG>.',securityMsg:"Редактор не може отримати пр�мий до�туп до буферу обміну у зв'�зку з налаштуванн�ми Вашого браузера. Вам потрібно в�тавити інформацію в це вікно.",pasteArea:'Обла�ть в�тавки'},pastefromword:{confirmCleanup:'Тек�т, що Ви намагаєте�ь в�тавити, �хожий на �копійований з Word. Бажаєте очи�тити його форматуванн� перед в�тавл�нн�м?',toolbar:'В�тавити з Word',title:'В�тавити з Word',error:'�еможливо очи�тити форматуванн� через внутрішню помилку.'},pasteText:{button:'В�тавити тільки тек�т',title:'В�тавити тільки тек�т'},templates:{button:'Шаблони',title:'Шаблони змі�ту',options:'Опції шаблону',insertOption:'Замінити поточний вмі�т',selectPromptMsg:'Оберіть, будь ла�ка, шаблон дл� відкритт� в редакторі<br>(поточний змі�т буде втрачено):',emptyListMsg:'(�е знайдено жодного шаблону)'},showBlocks:'Показувати блоки',stylesCombo:{label:'Стиль',panelTitle:'Стилі форматуванн�',panelTitle1:'Блочні �тилі',panelTitle2:'Р�дкові �тилі',panelTitle3:"Об'єктні �тилі"},format:{label:'Форматуванн�',panelTitle:'Форматуванн�',tag_p:'�ормальний',tag_pre:'Форматований',tag_address:'�дре�а',tag_h1:'Заголовок 1',tag_h2:'Заголовок 2',tag_h3:'Заголовок 3',tag_h4:'Заголовок 4',tag_h5:'Заголовок 5',tag_h6:'Заголовок 6',tag_div:'�ормальний (div)'},div:{title:'Створити блок-контейнер',toolbar:'Створити блок-контейнер',cssClassInputLabel:'Кла� CSS',styleSelectLabel:'Стиль CSS',IdInputLabel:'Ідентифікатор',languageCodeInputLabel:'Код мови',inlineStyleInputLabel:'Впи�аний �тиль',advisoryTitleInputLabel:'Змі�т випливаючої підказки',langDirLabel:'�апр�мок мови',langDirLTRLabel:'Зліва направо (LTR)',langDirRTLLabel:'Справа наліво (RTL)',edit:'Редагувати блок',remove:'Видалити блок'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Шрифт',voiceLabel:'Шрифт',panelTitle:'Шрифт'},fontSize:{label:'Розмір',voiceLabel:'Розмір шрифту',panelTitle:'Розмір'},colorButton:{textColorTitle:'Колір тек�ту',bgColorTitle:'Колір фону',panelTitle:'Кольори',auto:'�вто',more:'Кольори...'},colors:{'000':'Чорний',800000:'Бордовий','8B4513':'Коричневий','2F4F4F':'Темний �іро-зелений','008080':'Мор�ької хвилі','000080':'Сливовий','4B0082':'Індиго',696969:'Темно�ірий',B22222:'Темночервоний',A52A2A:'Каштановий',DAA520:'Бежевий','006400':'Темнозелений','40E0D0':'Бірюзовий','0000CD':'Темно�иній',800080:'Пурпурний',808080:'Сірий',F00:'Червоний',FF8C00:'Темнооранжевий',FFD700:'Жовтий','008000':'Зелений','0FF':'Синьо-зелений','00F':'Синій',EE82EE:'Фіолетовий',A9A9A9:'Світло�ірий',FFA07A:'Рожевий',FFA500:'Оранжевий',FFFF00:'Я�кравожовтий','00FF00':'Салатовий',AFEEEE:'Світлобірюзовий',ADD8E6:'Блакитний',DDA0DD:'Світлофіолетовий',D3D3D3:'Срібл��тий',FFF0F5:'Світлорожевий',FAEBD7:'Світлооранжевий',FFFFE0:'Світложовтий',F0FFF0:'Світлозелений',F0FFFF:'Світлий �иньо-зелений',F0F8FF:'Світлоблакитний',E6E6FA:'Лавандовий',FFF:'Білий'},scayt:{title:'Перефірка орфографії по мірі набору',opera_title:'�е підтримуєть�� в Opera',enable:'Ввімкнути SCAYT',disable:'Вимкнути SCAYT',about:'Про SCAYT',toggle:'Перемкнути SCAYT',options:'Опції',langs:'Мови',moreSuggestions:'Більше варіантів',ignore:'Пропу�тити',ignoreAll:'Пропу�тити в�і',addWord:'Додати �лово',emptyDic:'�азва �ловника повинна бути вказана.',optionsTab:'Опції',allCaps:'Пропу�тити пропи�ні �лова',ignoreDomainNames:'Пропу�тити доменні назви',mixedCase:'Пропу�тити �лова зі змішаним регі�тром',mixedWithDigits:'Пропу�тити �лова, що мі�т�ть цифри',languagesTab:'Мови',dictionariesTab:'Словники',dic_field_name:'�азва �ловника',dic_create:'Створити',dic_restore:'Відновити',dic_delete:'Видалити',dic_rename:'Перейменувати',dic_info:'Як правило, кори�тувацькі �ловники зберігають�� у cookie-файлах. Однак, cookie-файли мають обмеженн� на розмір. Якщо кори�тувацький �ловник зро�тає в об��зі на�тільки, що вже не може бути збережений у cookie-файлі, тоді його можна зберегти на нашому �ервері. Щоб зберегти Ваш пер�ональний �ловник на нашому �ервері необхідно вказати назву �ловника. Якщо Ви вже зберігали �ловник на �ервері, будь ла�ка, вкажіть назву збереженого �ловника і нати�ніть кнопку Відновити.',aboutTab:'Про SCAYT'},about:{title:'Про CKEditor',dlgTitle:'Про CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Щодо інформації з ліцензуванн� завітайте на наш �айт:',copy:'Copyright &copy; $1. В�і права за�тережено.'},maximize:'Мак�имізувати',minimize:'Мінімізувати',fakeobjects:{anchor:'Якір',flash:'Flash-анімаці�',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:"�евідомий об'єкт"},resize:'Пот�гніть дл� зміни розмірів',colordialog:{title:'Обрати колір',options:'Опції кольорів',highlight:'Колір, на �кий вказує кур�ор',selected:'Обраний колір',clear:'Очи�тити'},toolbarCollapse:'Згорнути панель ін�трументів',toolbarExpand:'Розгорнути панель ін�трументів',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'�апр�мок тек�ту зліва направо',rtl:'�апр�мок тек�ту �права наліво'},docprops:{label:'Вла�тиво�ті документа',title:'Вла�тиво�ті документа',design:'Design',meta:'Мета дані',chooseColor:'Обрати',other:'<інший>',docTitle:'Заголовок �торінки',charset:'Кодуванн� набору �имволів',charsetOther:'Інше кодуванн� набору �имволів',charsetASCII:'ASCII',charsetCE:'Центрально-європей�ька',charsetCT:'Китай�ька традиційна (Big5)',charsetCR:'Кирилиц�',charsetGR:'Грецька',charsetJP:'Япон�ька',charsetKR:'Корей�ька',charsetTR:'Турецька',charsetUN:'Юнікод (UTF-8)',charsetWE:'Західно-европей�ка�',docType:'Заголовок типу документу',docTypeOther:'Інший заголовок типу документу',xhtmlDec:'Ввімкнути XHTML оголошенн�',bgColor:'Колір тла',bgImage:'URL зображенн� тла',bgFixed:'Тло без прокрутки',txtColor:'Колір тек�ту',margin:'Від�тупи �торінки',marginTop:'Верхній',marginLeft:'Лівий',marginRight:'Правий',marginBottom:'�ижній',metaKeywords:'Ключові �лова документа (розділені комами)',metaDescription:'Опи� документа',metaAuthor:'�втор',metaCopyright:'�втор�ькі права',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/vi.js b/upload/public/js/3rd_party/ckeditor/lang/vi.js
new file mode 100644
index 00000000..76498e12
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/vi.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.vi={dir:'ltr',editorTitle:'Bộ soạn thảo, %1, nhấn ALT + 0 để xem hướng dẫn.',toolbars:'Editor toolbars',editor:'Bộ soạn thảo',source:'Mã HTML',newPage:'Trang mới',save:'Lưu',preview:'Xem trước',cut:'Cắt',copy:'Sao chép',paste:'Dán',print:'In',underline:'Gạch chân',bold:'�ậm',italic:'Nghiêng',selectAll:'Ch�n tất cả',removeFormat:'Xoá định dạng',strike:'Gạch xuyên ngang',subscript:'Chỉ số dưới',superscript:'Chỉ số trên',horizontalrule:'Chèn đư�ng phân cách ngang',pagebreak:'Chèn ngắt trang',pagebreakAlt:'Page Break',unlink:'Xoá liên kết',undo:'Khôi phục thao tác',redo:'Làm lại thao tác',common:{browseServer:'Duyệt trên máy chủ',url:'URL',protocol:'Giao thức',upload:'Tải lên',uploadSubmit:'Tải lên máy chủ',image:'Hình ảnh',flash:'Flash',form:'Biểu mẫu',checkbox:'Nút kiểm',radio:'Nút ch�n',textField:'Trư�ng văn bản',textarea:'Vùng văn bản',hiddenField:'Trư�ng ẩn',button:'Nút',select:'Ô ch�n',imageButton:'Nút hình ảnh',notSet:'<không thiết lập>',id:'�ịnh danh',name:'Tên',langDir:'Hướng ngôn ngữ',langDirLtr:'Trái sang phải (LTR)',langDirRtl:'Phải sang trái (RTL)',langCode:'Mã ngôn ngữ',longDescr:'Mô tả URL',cssClass:'Lớp Stylesheet',advisoryTitle:'Nhan đ� hướng dẫn',cssStyle:'Kiểu (style)',ok:'�ồng ý',cancel:'B� qua',close:'�óng',preview:'Xem trước',generalTab:'Tab chung',advancedTab:'Tab mở rộng',validateNumberFailed:'Giá trị này không phải là số.',confirmNewPage:'M�i thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?',confirmCancel:'Một vài tùy ch�n đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?',options:'Tùy ch�n',target:'�ích đến',targetNew:'Cửa sổ mới (_blank)',targetTop:'Cửa sổ trên cùng (_top)',targetSelf:'Tại trang (_self)',targetParent:'Cửa sổ cha (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'Chi�u rộng',height:'chi�u cao',align:'Vị trí',alignLeft:'Trái',alignRight:'Phải',alignCenter:'Giữa',alignTop:'Trên',alignMiddle:'Giữa',alignBottom:'Dưới',invalidHeight:'Chi�u cao phải là số nguyên.',invalidWidth:'Chi�u rộng phải là số nguyên.',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, không có</span>'},contextmenu:{options:'Tùy ch�n menu bổ xung'},specialChar:{toolbar:'Chèn ký tự đặc biệt',title:'Hãy ch�n ký tự đặc biệt',options:'Tùy ch�n các ký tự đặc biệt'},link:{toolbar:'Chèn/Sửa liên kết',other:'<khác>',menu:'Sửa liên kết',title:'Liên kết',info:'Thông tin liên kết',target:'�ích',upload:'Tải lên',advanced:'Mở rộng',type:'Kiểu liên kết',toUrl:'URL',toAnchor:'Neo trong trang này',toEmail:'Thư điện tử',targetFrame:'<khung>',targetPopup:'<cửa sổ popup>',targetFrameName:'Tên khung đích',targetPopupName:'Tên cửa sổ Popup',popupFeatures:'�ặc điểm của cửa sổ Popup',popupResizable:'Có thể thay đổi kích cỡ',popupStatusBar:'Thanh trạng thái',popupLocationBar:'Thanh vị trí',popupToolbar:'Thanh công cụ',popupMenuBar:'Thanh Menu',popupFullScreen:'Toàn màn hình (IE)',popupScrollBars:'Thanh cuộn',popupDependent:'Phụ thuộc (Netscape)',popupLeft:'Vị trí bên trái',popupTop:'Vị trí phía trên',id:'�ịnh danh',langDir:'Hướng ngôn ngữ',langDirLTR:'Trái sang phải (LTR)',langDirRTL:'Phải sang trái (RTL)',acccessKey:'Phím hỗ trợ truy cập',name:'Tên',langCode:'Mã ngôn ngữ',tabIndex:'Chỉ số của Tab',advisoryTitle:'Nhan đ� hướng dẫn',advisoryContentType:'Nội dung hướng dẫn',cssClasses:'Lớp Stylesheet',charset:'Bảng mã của tài nguyên được liên kết đến',styles:'Kiểu (style)',rel:'Relationship',selectAnchor:'Ch�n một điểm neo',anchorName:'Theo tên điểm neo',anchorId:'Theo định danh thành phần',emailAddress:'Thư điện tử',emailSubject:'Tiêu đ� thông điệp',emailBody:'Nội dung thông điệp',noAnchors:'(Không có điểm neo nào trong tài liệu)',noUrl:'Hãy đưa vào đư�ng dẫn liên kết (URL)',noEmail:'Hãy đưa vào địa chỉ thư điện tử'},anchor:{toolbar:'Chèn/Sửa điểm neo',menu:'Thuộc tính điểm neo',title:'Thuộc tính điểm neo',name:'Tên của điểm neo',errorName:'Hãy nhập vào tên của điểm neo',remove:'Remove Anchor'},list:{numberedTitle:'Thuộc tính danh sách có thứ tự',bulletedTitle:'Thuộc tính danh sách không thứ tự',type:'Kiểu loại',start:'Bắt đầu',validateStartNumber:'List start number must be a whole number.',circle:'Khuyên tròn',disc:'Hình đĩa',square:'Hình vuông',none:'Không gì cả',notset:'<không thiết lập>',armenian:'Số theo kiểu Armenian',georgian:'Số theo kiểu Georgian (an, ban, gan...)',lowerRoman:'Số La Mã kiểu thư�ng (i, ii, iii, iv, v...)',upperRoman:'Số La Mã kiểu HOA (I, II, III, IV, V...)',lowerAlpha:'Kiểu abc thư�ng (a, b, c, d, e...)',upperAlpha:'Kiểu ABC HOA (A, B, C, D, E...)',lowerGreek:'Kiểu Hy Lạp (alpha, beta, gamma...)',decimal:'Kiểu số (1, 2, 3 ...)',decimalLeadingZero:'Kiểu số (01, 02, 03...)'},findAndReplace:{title:'Tìm kiếm và thay thế',find:'Tìm kiếm',replace:'Thay thế',findWhat:'Tìm chuỗi:',replaceWith:'Thay bằng:',notFoundMsg:'Không tìm thấy chuỗi cần tìm.',findOptions:'Find Options',matchCase:'Phân biệt chữ hoa/thư�ng',matchWord:'Giống toàn bộ từ',matchCyclic:'Giống một phần',replaceAll:'Thay thế tất cả',replaceSuccessMsg:'%1 vị trí đã được thay thế.'},table:{toolbar:'Bảng',title:'Thuộc tính bảng',menu:'Thuộc tính bảng',deleteTable:'Xóa bảng',rows:'Số hàng',columns:'Số cột',border:'Kích thước đư�ng vi�n',widthPx:'�iểm ảnh (px)',widthPc:'Phần trăm (%)',widthUnit:'�ơn vị',cellSpace:'Khoảng cách giữa các ô',cellPad:'Khoảng đệm giữ ô và nội dung',caption:'�ầu đ�',summary:'Tóm lược',headers:'�ầu đ�',headersNone:'Không có',headersColumn:'Cột đầu tiên',headersRow:'Hàng đầu tiên',headersBoth:'Cả hai',invalidRows:'Số lượng hàng phải là một số lớn hơn 0.',invalidCols:'Số lượng cột phải là một số lớn hơn 0.',invalidBorder:'Kích cỡ của đư�ng biên phải là một số nguyên.',invalidWidth:'Chi�u rộng của bảng phải là một số nguyên.',invalidHeight:'Chi�u cao của bảng phải là một số nguyên.',invalidCellSpacing:'Khoảng cách giữa các ô phải là một số nguyên.',invalidCellPadding:'Khoảng đệm giữa ô và nội dung phải là một số nguyên.',cell:{menu:'Ô',insertBefore:'Chèn ô Phía trước',insertAfter:'Chèn ô Phía sau',deleteCell:'Xoá ô',merge:'Kết hợp ô',mergeRight:'Kết hợp sang phải',mergeDown:'Kết hợp xuống dưới',splitHorizontal:'Phân tách ô theo chi�u ngang',splitVertical:'Phân tách ô theo chi�u d�c',title:'Thuộc tính của ô',cellType:'Kiểu của ô',rowSpan:'Kết hợp hàng',colSpan:'Kết hợp cột',wordWrap:'Chữ li�n hàng',hAlign:'Canh l� ngang',vAlign:'Canh l� d�c',alignBaseline:'�ư�ng cơ sở',bgColor:'Màu n�n',borderColor:'Màu vi�n',data:'Dữ liệu',header:'�ầu đ�',yes:'Có',no:'Không',invalidWidth:'Chi�u rộng của ô phải là một số nguyên.',invalidHeight:'Chi�u cao của ô phải là một số nguyên.',invalidRowSpan:'Số hàng kết hợp phải là một số nguyên.',invalidColSpan:'Số cột kết hợp phải là một số nguyên.',chooseColor:'Ch�n màu'},row:{menu:'Hàng',insertBefore:'Chèn hàng phía trước',insertAfter:'Chèn hàng phía sau',deleteRow:'Xoá hàng'},column:{menu:'Cột',insertBefore:'Chèn cột phía trước',insertAfter:'Chèn cột phía sau',deleteColumn:'Xoá cột'}},button:{title:'Thuộc tính của nút',text:'Chuỗi hiển thị (giá trị)',type:'Kiểu',typeBtn:'Nút bấm',typeSbm:'Nút gửi',typeRst:'Nút nhập lại'},checkboxAndRadio:{checkboxTitle:'Thuộc tính nút kiểm',radioTitle:'Thuộc tính nút ch�n',value:'Giá trị',selected:'�ược ch�n'},form:{title:'Thuộc tính biểu mẫu',menu:'Thuộc tính biểu mẫu',action:'Hành động',method:'Phương thức',encoding:'Bảng mã'},select:{title:'Thuộc tính ô ch�n',selectInfo:'Thông tin',opAvail:'Các tùy ch�n có thể sử dụng',value:'Giá trị',size:'Kích cỡ',lines:'dòng',chkMulti:'Cho phép ch�n nhi�u',opText:'Văn bản',opValue:'Giá trị',btnAdd:'Thêm',btnModify:'Thay đổi',btnUp:'Lên',btnDown:'Xuống',btnSetValue:'Giá trị được ch�n',btnDelete:'Nút xoá'},textarea:{title:'Thuộc tính vùng văn bản',cols:'Số cột',rows:'Số hàng'},textfield:{title:'Thuộc tính trư�ng văn bản',name:'Tên',value:'Giá trị',charWidth:'�ộ rộng của ký tự',maxChars:'Số ký tự tối đa',type:'Kiểu',typeText:'Ký tự',typePass:'Mật khẩu'},hidden:{title:'Thuộc tính trư�ng ẩn',name:'Tên',value:'Giá trị'},image:{title:'Thuộc tính của ảnh',titleButton:'Thuộc tính nút của ảnh',menu:'Thuộc tính của ảnh',infoTab:'Thông tin của ảnh',btnUpload:'Tải lên máy chủ',upload:'Tải lên',alt:'Chú thích ảnh',lockRatio:'Giữ nguyên tỷ lệ',resetSize:'Kích thước gốc',border:'�ư�ng vi�n',hSpace:'Khoảng đệm ngang',vSpace:'Khoảng đệm d�c',alertUrl:'Hãy đưa vào đư�ng dẫn của ảnh',linkTab:'Tab liên kết',button2Img:'Bạn có muốn chuyển nút bấm bằng ảnh được ch�n thành ảnh?',img2Button:'Bạn có muốn chuyển đổi ảnh được ch�n thành nút bấm bằng ảnh?',urlMissing:'Thiếu đư�ng dẫn hình ảnh',validateBorder:'Chi�u rộng của đư�ng vi�n phải là một số nguyên dương',validateHSpace:'Khoảng đệm ngang phải là một số nguyên dương',validateVSpace:'Khoảng đệm d�c phải là một số nguyên dương'},flash:{properties:'Thuộc tính Flash',propertiesTab:'Thuộc tính',title:'Thuộc tính Flash',chkPlay:'Tự động chạy',chkLoop:'Lặp',chkMenu:'Cho phép bật menu của Flash',chkFull:'Cho phép toàn màn hình',scale:'Tỷ lệ',scaleAll:'Hiển thị tất cả',scaleNoBorder:'Không đư�ng vi�n',scaleFit:'Vừa vặn',access:'Truy cập mã',accessAlways:'Luôn luôn',accessSameDomain:'Cùng tên mi�n',accessNever:'Không bao gi�',alignAbsBottom:'Dưới tuyệt đối',alignAbsMiddle:'Giữa tuyệt đối',alignBaseline:'�ư�ng cơ sở',alignTextTop:'Phía trên chữ',quality:'Chất lượng',qualityBest:'Tốt nhất',qualityHigh:'Cao',qualityAutoHigh:'Cao tự động',qualityMedium:'Trung bình',qualityAutoLow:'Thấp tự động',qualityLow:'Thấp',windowModeWindow:'Cửa sổ',windowModeOpaque:'M� đục',windowModeTransparent:'Trong suốt',windowMode:'Chế độ cửa sổ',flashvars:'Các biến số dành cho Flash',bgcolor:'Màu n�n',hSpace:'Khoảng đệm ngang',vSpace:'Khoảng đệm d�c',validateSrc:'Hãy đưa vào đư�ng dẫn liên kết',validateHSpace:'Khoảng đệm ngang phải là số nguyên.',validateVSpace:'Khoảng đệm d�c phải là số nguyên.'},spellCheck:{toolbar:'Kiểm tra chính tả',title:'Kiểm tra chính tả',notAvailable:'Xin lỗi, dịch vụ này hiện tại không có.',errorLoading:'Lỗi khi đang nạp dịch vụ ứng dụng: %s.',notInDic:'Không có trong từ điển',changeTo:'Chuyển thành',btnIgnore:'B� qua',btnIgnoreAll:'B� qua tất cả',btnReplace:'Thay thế',btnReplaceAll:'Thay thế tất cả',btnUndo:'Phục hồi lại',noSuggestions:'- Không đưa ra gợi ý v� từ -',progress:'�ang tiến hành kiểm tra chính tả...',noMispell:'Hoàn tất kiểm tra chính tả: Không có lỗi chính tả',noChanges:'Hoàn tất kiểm tra chính tả: Không có từ nào được thay đổi',oneChange:'Hoàn tất kiểm tra chính tả: Một từ đã được thay đổi',manyChanges:'Hoàn tất kiểm tra chính tả: %1 từ đã được thay đổi',ieSpellDownload:'Chức năng kiểm tra chính tả chưa được cài đặt. Bạn có muốn tải v� ngay bây gi�?'},smiley:{toolbar:'Hình biểu lộ cảm xúc (mặt cư�i)',title:'Chèn hình biểu lộ cảm xúc (mặt cư�i)',options:'Tùy ch�n hình  biểu lộ cảm xúc'},elementsPath:{eleLabel:'Nhãn thành phần',eleTitle:'%1 thành phần'},numberedlist:'Danh sách có thứ tự',bulletedlist:'Danh sách không thứ tự',indent:'Dịch vào trong',outdent:'Dịch ra ngoài',justify:{left:'Canh trái',center:'Canh giữa',right:'Canh phải',block:'Canh đ�u'},blockquote:'Khối trích dẫn',clipboard:{title:'Dán',cutError:'Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).',copyError:'Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).',pasteMsg:'Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>�ồng ý</STRONG>.',securityMsg:'Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.',pasteArea:'Khu vực dán'},pastefromword:{confirmCleanup:'Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại b� định dạng Word trước khi dán?',toolbar:'Dán với định dạng Word',title:'Dán với định dạng Word',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'Dán theo định dạng văn bản thuần',title:'Dán theo định dạng văn bản thuần'},templates:{button:'Mẫu dựng sẵn',title:'Nội dung Mẫu dựng sẵn',options:'Tùy ch�n mẫu dựng sẵn',insertOption:'Thay thế nội dung hiện tại',selectPromptMsg:'Hãy ch�n mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):',emptyListMsg:'(Không có mẫu dựng sẵn nào được định nghĩa)'},showBlocks:'Hiển thị các khối',stylesCombo:{label:'Kiểu',panelTitle:'Phong cách định dạng',panelTitle1:'Kiểu khối',panelTitle2:'Kiểu trực tiếp',panelTitle3:'Kiểu đối tượng'},format:{label:'�ịnh dạng',panelTitle:'�ịnh dạng',tag_p:'Bình thư�ng (P)',tag_pre:'�ã thiết lập',tag_address:'Address',tag_h1:'Heading 1',tag_h2:'Heading 2',tag_h3:'Heading 3',tag_h4:'Heading 4',tag_h5:'Heading 5',tag_h6:'Heading 6',tag_div:'Bình thư�ng (DIV)'},div:{title:'Tạo khối các thành phần',toolbar:'Tạo khối các thành phần',cssClassInputLabel:'Các lớp CSS',styleSelectLabel:'Kiểu (style)',IdInputLabel:'�ịnh danh (id)',languageCodeInputLabel:'Mã ngôn ngữ',inlineStyleInputLabel:'Kiểu nội dòng',advisoryTitleInputLabel:'Nhan đ� hướng dẫn',langDirLabel:'Hướng ngôn ngữ',langDirLTRLabel:'Trái sang phải (LTR)',langDirRTLLabel:'Phải qua trái (RTL)',edit:'Chỉnh sửa',remove:'Xóa b�'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'Phông',voiceLabel:'Phông',panelTitle:'Phông'},fontSize:{label:'Cỡ chữ',voiceLabel:'Kích cỡ phông',panelTitle:'Cỡ chữ'},colorButton:{textColorTitle:'Màu chữ',bgColorTitle:'Màu n�n',panelTitle:'Màu sắc',auto:'Tự động',more:'Màu khác...'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'Kiểm tra chính tả ngay khi gõ chữ (SCAYT)',opera_title:'Không hỗ trợ trên trình duyệt Opera',enable:'Bật SCAYT',disable:'Tắt SCAYT',about:'Thông tin v� SCAYT',toggle:'Bật tắt SCAYT',options:'Tùy ch�n',langs:'Ngôn ngữ',moreSuggestions:'�� xuất thêm',ignore:'B� qua',ignoreAll:'B� qua tất cả',addWord:'Thêm từ',emptyDic:'Tên của từ điển không được để trống.',optionsTab:'Tùy ch�n',allCaps:'Không phân biệt chữ HOA chữ thư�ng',ignoreDomainNames:'B� qua tên mi�n',mixedCase:'Không phân biệt loại chữ',mixedWithDigits:'Không phân biệt chữ và số',languagesTab:'Tab ngôn ngữ',dictionariesTab:'Từ điển',dic_field_name:'Tên từ điển',dic_create:'Tạo',dic_restore:'Phục hồi',dic_delete:'Xóa',dic_rename:'Thay tên',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'Thông tin'},about:{title:'Thông tin v� CKEditor',dlgTitle:'Thông tin v� CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'Vui lòng ghé thăm trang web của chúng tôi để có thông tin v� giấy phép:',copy:'Bản quy�n &copy; $1. Giữ toàn quy�n.'},maximize:'Phóng to tối đa',minimize:'Thu nh�',fakeobjects:{anchor:'�iểm neo',flash:'Flash',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'�ối tượng không rõ ràng'},resize:'Kéo rê để thay đổi kích cỡ',colordialog:{title:'Ch�n màu',options:'Color Options',highlight:'Màu ch�n',selected:'Màu đã ch�n',clear:'Xóa b�'},toolbarCollapse:'Thu g�n thanh công cụ',toolbarExpand:'Mở rộng thnah công cụ',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'Thuộc tính Tài liệu',title:'Thuộc tính Tài liệu',design:'Design',meta:'Siêu dữ liệu',chooseColor:'Ch�n màu',other:'<khác>',docTitle:'Tiêu đ� Trang',charset:'Bảng mã ký tự',charsetOther:'Bảng mã ký tự khác',charsetASCII:'ASCII',charsetCE:'Trung Âu',charsetCT:'Tiếng Trung Quốc (Big5)',charsetCR:'Tiếng Kirin',charsetGR:'Tiếng Hy Lạp',charsetJP:'Tiếng Nhật',charsetKR:'Tiếng Hàn',charsetTR:'Tiếng Thổ Nhĩ Kỳ',charsetUN:'Unicode (UTF-8)',charsetWE:'Tây Âu',docType:'Kiểu �� mục Tài liệu',docTypeOther:'Kiểu �� mục Tài liệu khác',xhtmlDec:'Bao gồm cả định nghĩa XHTML',bgColor:'Màu n�n',bgImage:'URL của Hình ảnh n�n',bgFixed:'Không cuộn n�n',txtColor:'Màu chữ',margin:'�ư�ng biên của Trang',marginTop:'Trên',marginLeft:'Trái',marginRight:'Phải',marginBottom:'Dưới',metaKeywords:'Các từ khóa chỉ mục tài liệu (phân cách bởi dấu phẩy)',metaDescription:'Mô tả tài liệu',metaAuthor:'Tác giả',metaCopyright:'Bản quy�n',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/zh-cn.js b/upload/public/js/3rd_party/ckeditor/lang/zh-cn.js
new file mode 100644
index 00000000..d8bb04cc
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/zh-cn.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang['zh-cn']={dir:'ltr',editorTitle:'所��所得编辑器, %1, 按 ALT+0 查看帮助。',toolbars:'工具�',editor:'所��所得编辑器',source:'��',newPage:'新建',save:'�存',preview:'预览',cut:'剪切',copy:'�制',paste:'粘贴',print:'打�',underline:'下划线',bold:'加粗',italic:'倾斜',selectAll:'全选',removeFormat:'清除格�',strike:'删除线',subscript:'下标',superscript:'上标',horizontalrule:'�入水平线',pagebreak:'�入分页符',pagebreakAlt:'分页符',unlink:'�消超链接',undo:'撤消',redo:'��',common:{browseServer:'�览�务器',url:'�文件',protocol:'�议',upload:'上传',uploadSubmit:'上传到�务器上',image:'图象',flash:'Flash',form:'表�',checkbox:'�选框',radio:'�选按钮',textField:'�行文本',textarea:'多行文本',hiddenField:'��域',button:'按钮',select:'列表/��',imageButton:'图�域',notSet:'<没有设置>',id:'ID',name:'�称',langDir:'语言方�',langDirLtr:'从左到� (LTR)',langDirRtl:'从�到左 (RTL)',langCode:'语言代�',longDescr:'详细说明地�',cssClass:'样�类�称',advisoryTitle:'标题',cssStyle:'行内样�',ok:'确定',cancel:'�消',close:'关闭',preview:'预览',generalTab:'常规',advancedTab:'高级',validateNumberFailed:'需�输入数字格�',confirmNewPage:'当�文档内容未�存,是�确认新建文档？',confirmCancel:'部分修改尚未�存，是�确认关闭对�框？',options:'选项',target:'目标窗�',targetNew:'新窗� (_blank)',targetTop:'整页 (_top)',targetSelf:'本窗� (_self)',targetParent:'父窗� (_parent)',langDirLTR:'从左到� (LTR)',langDirRTL:'从�到左 (RTL)',styles:'样�',cssClasses:'样�类',width:'宽度',height:'高度',align:'对�方�',alignLeft:'左对�',alignRight:'�对�',alignCenter:'居中',alignTop:'顶端',alignMiddle:'居中',alignBottom:'底部',invalidHeight:'高度必须为数字格�',invalidWidth:'宽度必须为数字格�',invalidCssLength:'该字段必须为��的CSS长度值，包括��(px, %, in, cm, mm, em, ex, pt 或 pc)',invalidHtmlLength:'该字段必须为��的HTML长度值，包括��(px 或 %)',invalidInlineStyle:'内�样�必须为格�是以分�分隔的一个或多个“属性� : 属性值�',cssLengthTooltip:'该字段必须为��的CSS长度值，包括��(px, %, in, cm, mm, em, ex, pt 或 pc)',unavailable:'%1<span class="cke_accessibility">, ��用</span>'},contextmenu:{options:'快���选项'},specialChar:{toolbar:'�入特殊符�',title:'选择特殊符�',options:'特殊符�选项'},link:{toolbar:'�入/编辑超链接',other:'<其他>',menu:'编辑超链接',title:'超链接',info:'超链接信�',target:'目标',upload:'上传',advanced:'高级',type:'超链接类型',toUrl:'地�',toAnchor:'页内锚点链接',toEmail:'电�邮件',targetFrame:'<框架>',targetPopup:'<弹出窗�>',targetFrameName:'目标框架�称',targetPopupName:'弹出窗��称',popupFeatures:'弹出窗�属性',popupResizable:'�缩放',popupStatusBar:'状��',popupLocationBar:'地��',popupToolbar:'工具�',popupMenuBar:'���',popupFullScreen:'全� (IE)',popupScrollBars:'滚动�',popupDependent:'�附 (NS)',popupLeft:'左',popupTop:'�',id:'ID',langDir:'语言方�',langDirLTR:'从左到� (LTR)',langDirRTL:'从�到左 (RTL)',acccessKey:'访问键',name:'�称',langCode:'语言代�',tabIndex:'Tab 键次�',advisoryTitle:'标题',advisoryContentType:'内容类型',cssClasses:'样�类�称',charset:'字符编�',styles:'行内样�',rel:'关�',selectAnchor:'选择一个锚点',anchorName:'按锚点�称',anchorId:'按锚点 ID',emailAddress:'地�',emailSubject:'主题',emailBody:'内容',noAnchors:'(此文档没有�用的锚点)',noUrl:'请输入超链接地�',noEmail:'请输入电�邮件地�'},anchor:{toolbar:'�入/编辑锚点链接',menu:'锚点链接属性',title:'锚点链接属性',name:'锚点�称',errorName:'请输入锚点�称',remove:'删除锚点'},list:{numberedTitle:'编�列表属性',bulletedTitle:'项目列表属性',type:'标记类型',start:'开始��',validateStartNumber:'列表开始��必须为整数格�',circle:'空心圆',disc:'实心圆',square:'实心方�',none:'无标记',notset:'<没有设置>',armenian:'传统的亚美尼亚编�方�',georgian:'传统的乔治亚编�方�(an, ban, gan, 等)',lowerRoman:'�写罗马数字(i, ii, iii, iv, v, 等)',upperRoman:'大写罗马数字(I, II, III, IV, V, 等)',lowerAlpha:'�写英文字�(a, b, c, d, e, 等)',upperAlpha:'大写英文字�(A, B, C, D, E, 等)',lowerGreek:'�写希腊字�(alpha, beta, gamma, 等)',decimal:'数字 (1, 2, 3, 等)',decimalLeadingZero:'0开头的数字标记(01, 02, 03, 等)'},findAndReplace:{title:'查找和替�',find:'查找',replace:'替�',findWhat:'查找:',replaceWith:'替�:',notFoundMsg:'指定文本没有找到',findOptions:'查找选项',matchCase:'区分大�写',matchWord:'全字匹�',matchCyclic:'循环匹�',replaceAll:'全部替�',replaceSuccessMsg:'共完� %1 处替�.'},table:{toolbar:'表格',title:'表格属性',menu:'表格属性',deleteTable:'删除表格',rows:'行数',columns:'列数',border:'边框',widthPx:'�素',widthPc:'百分比',widthUnit:'宽度��',cellSpace:'间�',cellPad:'边�',caption:'标题',summary:'摘�',headers:'标题�元格',headersNone:'无',headersColumn:'第一列',headersRow:'第一行',headersBoth:'第一列和第一行',invalidRows:'指定的列数必须大于零',invalidCols:'指定的行数必须大于零',invalidBorder:'边框粗细必须为数字格�',invalidWidth:'表格宽度必须为数字格�',invalidHeight:'表格高度必须为数字格�',invalidCellSpacing:'�元格间�必须为数字格�',invalidCellPadding:'�元格填充必须为数字格�',cell:{menu:'�元格',insertBefore:'在左侧�入�元格',insertAfter:'在�侧�入�元格',deleteCell:'删除�元格',merge:'�并�元格',mergeRight:'���并�元格',mergeDown:'�下�并�元格',splitHorizontal:'水平拆分�元格',splitVertical:'垂直拆分�元格',title:'�元格属性',cellType:'�元格类型',rowSpan:'纵跨行数',colSpan:'横跨列数',wordWrap:'自动�行',hAlign:'水平对�',vAlign:'垂直对�',alignBaseline:'基线',bgColor:'背景颜色',borderColor:'边框颜色',data:'数�',header:'表头',yes:'是',no:'�',invalidWidth:'�元格宽度必须为数字格�',invalidHeight:'�元格高度必须为数字格�',invalidRowSpan:'行跨度必须为整数格�',invalidColSpan:'列跨度必须为整数格�',chooseColor:'选择'},row:{menu:'行',insertBefore:'在上方�入行',insertAfter:'在下方�入行',deleteRow:'删除行'},column:{menu:'列',insertBefore:'在左侧�入列',insertAfter:'在�侧�入列',deleteColumn:'删除列'}},button:{title:'按钮属性',text:'标签(值)',type:'类型',typeBtn:'按钮',typeSbm:'�交',typeRst:'�设'},checkboxAndRadio:{checkboxTitle:'�选框属性',radioTitle:'�选按钮属性',value:'选定值',selected:'已勾选'},form:{title:'表�属性',menu:'表�属性',action:'动作',method:'方法',encoding:'表�编�'},select:{title:'��/列表属性',selectInfo:'选择信�',opAvail:'�选项',value:'值',size:'高度',lines:'行',chkMulti:'�许多选',opText:'选项文本',opValue:'选项值',btnAdd:'添加',btnModify:'修改',btnUp:'上移',btnDown:'下移',btnSetValue:'设为�始选定',btnDelete:'删除'},textarea:{title:'多行文本属性',cols:'字符宽度',rows:'行数'},textfield:{title:'�行文本属性',name:'�称',value:'�始值',charWidth:'字符宽度',maxChars:'最多字符数',type:'类型',typeText:'文本',typePass:'密�'},hidden:{title:'��域属性',name:'�称',value:'�始值'},image:{title:'图象属性',titleButton:'图�域属性',menu:'图象属性',infoTab:'图象',btnUpload:'上传到�务器上',upload:'上传',alt:'替�文本',lockRatio:'�定比例',resetSize:'原始尺寸',border:'边框大�',hSpace:'水平间�',vSpace:'垂直间�',alertUrl:'请输入图象地�',linkTab:'链接',button2Img:'确定�把当�按钮改�为图��?',img2Button:'确定�把当�图�改�为按钮�?',urlMissing:'缺少图��文件地�',validateBorder:'边框大�必须为整数格�',validateHSpace:'水平间�必须为整数格�',validateVSpace:'垂直间�必须为整数格�'},flash:{properties:'Flash 属性',propertiesTab:'属性',title:'标题',chkPlay:'自动播放',chkLoop:'循环',chkMenu:'�用 Flash ��',chkFull:'�用全�',scale:'缩放',scaleAll:'全部显示',scaleNoBorder:'无边框',scaleFit:'严格匹�',access:'�许脚本访问',accessAlways:'总是',accessSameDomain:'�域',accessNever:'从�',alignAbsBottom:'�对底部',alignAbsMiddle:'�对居中',alignBaseline:'基线',alignTextTop:'文本上方',quality:'质�',qualityBest:'最好',qualityHigh:'高',qualityAutoHigh:'高(自动)',qualityMedium:'中(自动)',qualityAutoLow:'低(自动)',qualityLow:'低',windowModeWindow:'窗体',windowModeOpaque:'��明',windowModeTransparent:'�明',windowMode:'窗体模�',flashvars:'Flash ��',bgcolor:'背景颜色',hSpace:'水平间�',vSpace:'垂直间�',validateSrc:'请输入�文件地�',validateHSpace:'水平间�必须为数字格�',validateVSpace:'垂直间�必须为数字格�'},spellCheck:{toolbar:'拼写检查',title:'拼写检查',notAvailable:'抱歉, �务目�暂��用',errorLoading:'加载应该�务主机时出错: %s.',notInDic:'没有在字典里',changeTo:'更改为',btnIgnore:'忽略',btnIgnoreAll:'全部忽略',btnReplace:'替�',btnReplaceAll:'全部替�',btnUndo:'撤消',noSuggestions:'- 没有建议 -',progress:'正在进行拼写检查...',noMispell:'拼写检查完�: 没有�现拼写错误',noChanges:'拼写检查完�: 没有更改任何��',oneChange:'拼写检查完�: 更改了一个��',manyChanges:'拼写检查完�: 更改了 %1 个��',ieSpellDownload:'拼写检查�件还没安装, 你是�想现在就下载?'},smiley:{toolbar:'表情符',title:'�入表情图标',options:'表情图标选项'},elementsPath:{eleLabel:'元素路径',eleTitle:'%1 元素'},numberedlist:'编�列表',bulletedlist:'项目列表',indent:'增加缩进�',outdent:'�少缩进�',justify:{left:'左对�',center:'居中',right:'�对�',block:'两端对�'},blockquote:'�引用',clipboard:{title:'粘贴',cutError:'您的�览器安全设置��许编辑器自动执行剪切�作, 请使用键盘快�键(Ctrl/Cmd+X)�完�',copyError:'您的�览器安全设置��许编辑器自动执行�制�作, 请使用键盘快�键(Ctrl/Cmd+C)�完�',pasteMsg:'请使用键盘快�键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下�的方框里，�按 <STRONG>确定</STRONG>',securityMsg:'因为你的�览器的安全设置原因, 本编辑器�能直接访问你的剪贴�内容, 你需�在本窗��新粘贴一次',pasteArea:'粘贴区域'},pastefromword:{confirmCleanup:'您�粘贴的内容好�是�自 MS Word, 是��清除 MS Word 格���粘贴?',toolbar:'从 MS Word 粘贴',title:'从 MS Word 粘贴',error:'由于内部错误无法清��粘贴的数�'},pasteText:{button:'粘贴为无格�文本',title:'粘贴为无格�文本'},templates:{button:'模�',title:'内容模�',options:'模�选项',insertOption:'替�当�内容',selectPromptMsg:'请选择编辑器内容模�:',emptyListMsg:'(没有模�)'},showBlocks:'显示区�',stylesCombo:{label:'样�',panelTitle:'样�',panelTitle1:'�级元素样�',panelTitle2:'内�元素样�',panelTitle3:'对象元素样�'},format:{label:'格�',panelTitle:'格�',tag_p:'普通',tag_pre:'已编排格�',tag_address:'地�',tag_h1:'标题 1',tag_h2:'标题 2',tag_h3:'标题 3',tag_h4:'标题 4',tag_h5:'标题 5',tag_h6:'标题 6',tag_div:'段�(DIV)'},div:{title:'创建 DIV 容器',toolbar:'创建 DIV 容器',cssClassInputLabel:'样�类�称',styleSelectLabel:'样�',IdInputLabel:'ID',languageCodeInputLabel:'语言代�',inlineStyleInputLabel:'行内样�',advisoryTitleInputLabel:'标题',langDirLabel:'语言方�',langDirLTRLabel:'从左到� (LTR)',langDirRTLLabel:'从�到左 (RTL)',edit:'编辑 DIV',remove:'移除 DIV'},iframe:{title:'iFrame属性',toolbar:'iFrame',noUrl:'请输入框架的 URL',scrolling:'�许滚动�',border:'显示框架边框'},font:{label:'字体',voiceLabel:'字体',panelTitle:'字体'},fontSize:{label:'大�',voiceLabel:'文字大�',panelTitle:'大�'},colorButton:{textColorTitle:'文本颜色',bgColorTitle:'背景颜色',panelTitle:'颜色',auto:'自动',more:'其它颜色...'},colors:{'000':'黑',800000:'�红','8B4513':'深�','2F4F4F':'墨绿','008080':'绿�石','000080':'海军�','4B0082':'��',696969:'暗�',B22222:'砖红',A52A2A:'�',DAA520:'金黄','006400':'深绿','40E0D0':'�绿','0000CD':'中�',800080:'紫',808080:'�',F00:'红',FF8C00:'深橙',FFD700:'金','008000':'绿','0FF':'�','00F':'�',EE82EE:'紫罗兰',A9A9A9:'深�',FFA07A:'亮橙',FFA500:'橙',FFFF00:'黄','00FF00':'水绿',AFEEEE:'粉�',ADD8E6:'亮�',DDA0DD:'梅红',D3D3D3:'淡�',FFF0F5:'淡紫红',FAEBD7:'�董白',FFFFE0:'淡黄',F0FFF0:'蜜白',F0FFFF:'天�',F0F8FF:'淡�',E6E6FA:'淡紫',FFF:'白'},scayt:{title:'�时拼写检查',opera_title:'�支� Opera �览器',enable:'�用�时拼写检查',disable:'�用�时拼写检查',about:'关于�时拼写检查',toggle:'暂�/�用�时拼写检查',options:'选项',langs:'语言',moreSuggestions:'更多拼写建议',ignore:'忽略',ignoreAll:'全部忽略',addWord:'添加��',emptyDic:'字典��应为空.',optionsTab:'选项',allCaps:'忽略所有大写��',ignoreDomainNames:'忽略域�',mixedCase:'忽略大�写混�的��',mixedWithDigits:'忽略带数字的��',languagesTab:'语言',dictionariesTab:'字典',dic_field_name:'字典�称',dic_create:'创建',dic_restore:'还原',dic_delete:'删除',dic_rename:'�命�',dic_info:'一开始用户�典储存在 Cookie 中, 但是 Cookies 的容�是有�的, 当用户�典增长到超出 Cookie �制时就无法�储存了, 这时您�以将�典储存到我们的�务器上. �把您的个人�典到储存到我们的�务器上的�, 需�为您的�典指定一个�称, 如果您在我们的�务器上已�有储存有一个�典, 请输入�典�称并按还原按钮.',aboutTab:'关于'},about:{title:'关于CKEditor',dlgTitle:'关于CKEditor',help:'请访问 $1 以获�帮助.',userGuide:'CKEditor 用户�导',moreInfo:'访问我们的网站以获�更多关于�议的信�',copy:'Copyright &copy; $1. 版�所有。'},maximize:'全�',minimize:'最�化',fakeobjects:{anchor:'锚点',flash:'Flash 动画',iframe:'IFrame',hiddenfield:'��域',unknown:'未知对象'},resize:'拖拽以改�尺寸',colordialog:{title:'选择颜色',options:'颜色选项',highlight:'高亮',selected:'选择颜色',clear:'清除'},toolbarCollapse:'折�工具�',toolbarExpand:'展开工具�',toolbarGroups:{document:'文档',clipboard:'剪贴�/撤销',editing:'编辑',forms:'表�',basicstyles:'基本格�',paragraph:'段�',links:'链接',insert:'�入',styles:'样�',colors:'颜色',tools:'工具'},bidi:{ltr:'文字方�为从左至�',rtl:'文字方�为从�至左'},docprops:{label:'页�属性',title:'页�属性',design:'设计',meta:'Meta 数�',chooseColor:'选择',other:'<其他>',docTitle:'页�标题',charset:'字符编�',charsetOther:'其它字符编�',charsetASCII:'ASCII',charsetCE:'中欧',charsetCT:'�体中文 (Big5)',charsetCR:'西里尔文',charsetGR:'希腊文',charsetJP:'日文',charsetKR:'韩文',charsetTR:'土耳其文',charsetUN:'Unicode (UTF-8)',charsetWE:'西欧',docType:'文档类型',docTypeOther:'其它文档类型',xhtmlDec:'包� XHTML 声明',bgColor:'背景颜色',bgImage:'背景图�',bgFixed:'�滚动背景图�',txtColor:'文本颜色',margin:'页�边�',marginTop:'上',marginLeft:'左',marginRight:'�',marginBottom:'下',metaKeywords:'页�索引关键字 (用�角逗�[,]分隔)',metaDescription:'页�说明',metaAuthor:'作者',metaCopyright:'版�',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/lang/zh.js b/upload/public/js/3rd_party/ckeditor/lang/zh.js
new file mode 100644
index 00000000..41459fb6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/lang/zh.js
@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.lang.zh={dir:'ltr',editorTitle:'Rich text editor, %1, press ALT 0 for help.',toolbars:'Editor toolbars',editor:'Rich Text Editor',source:'原始碼',newPage:'開新檔案',save:'儲存',preview:'�覽',cut:'剪下',copy:'複製',paste:'貼上',print:'列�',underline:'底線',bold:'粗體',italic:'斜體',selectAll:'全�',removeFormat:'清除格�',strike:'刪除線',subscript:'下標',superscript:'上標',horizontalrule:'�入水平線',pagebreak:'�入分�符號',pagebreakAlt:'Page Break',unlink:'移除超連�',undo:'復原',redo:'�複',common:{browseServer:'�覽伺�器端',url:'URL',protocol:'通訊�定',upload:'上傳',uploadSubmit:'上傳至伺�器',image:'影�',flash:'Flash',form:'表單',checkbox:'核�方塊',radio:'�項按鈕',textField:'文字方塊',textarea:'文字�域',hiddenField:'隱�欄�',button:'按鈕',select:'清單/�單',imageButton:'影�按鈕',notSet:'<尚未設定>',id:'ID',name:'�稱',langDir:'語言方�',langDirLtr:'由左而� (LTR)',langDirRtl:'由�而左 (RTL)',langCode:'語言代碼',longDescr:'詳細 URL',cssClass:'樣�表類別',advisoryTitle:'標題',cssStyle:'樣�',ok:'確定',cancel:'�消',close:'Close',preview:'Preview',generalTab:'一般',advancedTab:'進階',validateNumberFailed:'需�輸入數字格�',confirmNewPage:'�存的修改尚未儲存，�開新檔案？',confirmCancel:'部份�項尚未儲存，�關閉�話盒？',options:'Options',target:'Target',targetNew:'New Window (_blank)',targetTop:'Topmost Window (_top)',targetSelf:'Same Window (_self)',targetParent:'Parent Window (_parent)',langDirLTR:'Left to Right (LTR)',langDirRTL:'Right to Left (RTL)',styles:'Style',cssClasses:'Stylesheet Classes',width:'寬度',height:'高度',align:'�齊',alignLeft:'�左�齊',alignRight:'���齊',alignCenter:'置中',alignTop:'�上�齊',alignMiddle:'置中�齊',alignBottom:'�下�齊',invalidHeight:'高度必須為數字格�',invalidWidth:'寬度必須為數字格�',invalidCssLength:'Value specified for the "%1" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).',invalidHtmlLength:'Value specified for the "%1" field must be a positive number with or without a valid HTML measurement unit (px or %).',invalidInlineStyle:'Value specified for the inline style must consist of one or more tuples with the format of "name : value", separated by semi-colons.',cssLengthTooltip:'Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).',unavailable:'%1<span class="cke_accessibility">, 已關閉</span>'},contextmenu:{options:'Context Menu Options'},specialChar:{toolbar:'�入特殊符號',title:'請�擇特殊符號',options:'Special Character Options'},link:{toolbar:'�入/編輯超連�',other:'<其他>',menu:'編輯超連�',title:'超連�',info:'超連�資訊',target:'目標',upload:'上傳',advanced:'進階',type:'超連接類型',toUrl:'URL',toAnchor:'本�錨點',toEmail:'電�郵件',targetFrame:'<框架>',targetPopup:'<快顯視窗>',targetFrameName:'目標框架�稱',targetPopupName:'快顯視窗�稱',popupFeatures:'快顯視窗屬性',popupResizable:'�縮放',popupStatusBar:'狀態列',popupLocationBar:'網�列',popupToolbar:'工具列',popupMenuBar:'�單列',popupFullScreen:'全螢幕 (IE)',popupScrollBars:'�軸',popupDependent:'從屬 (NS)',popupLeft:'左',popupTop:'�',id:'ID',langDir:'語言方�',langDirLTR:'由左而� (LTR)',langDirRTL:'由�而左 (RTL)',acccessKey:'存��',name:'�稱',langCode:'語言方�',tabIndex:'定�順�',advisoryTitle:'標題',advisoryContentType:'內容類型',cssClasses:'樣�表類別',charset:'連�資�之編碼',styles:'樣�',rel:'Relationship',selectAnchor:'請�擇錨點',anchorName:'�錨點�稱',anchorId:'�元件 ID',emailAddress:'電�郵件',emailSubject:'郵件主旨',emailBody:'郵件內容',noAnchors:'(本文件尚無�用之錨點)',noUrl:'請輸入欲連�的 URL',noEmail:'請輸入電�郵件��'},anchor:{toolbar:'�入/編輯錨點',menu:'錨點屬性',title:'錨點屬性',name:'錨點�稱',errorName:'請輸入錨點�稱',remove:'Remove Anchor'},list:{numberedTitle:'Numbered List Properties',bulletedTitle:'Bulleted List Properties',type:'Type',start:'Start',validateStartNumber:'List start number must be a whole number.',circle:'Circle',disc:'Disc',square:'Square',none:'None',notset:'<not set>',armenian:'Armenian numbering',georgian:'Georgian numbering (an, ban, gan, etc.)',lowerRoman:'Lower Roman (i, ii, iii, iv, v, etc.)',upperRoman:'Upper Roman (I, II, III, IV, V, etc.)',lowerAlpha:'Lower Alpha (a, b, c, d, e, etc.)',upperAlpha:'Upper Alpha (A, B, C, D, E, etc.)',lowerGreek:'Lower Greek (alpha, beta, gamma, etc.)',decimal:'Decimal (1, 2, 3, etc.)',decimalLeadingZero:'Decimal leading zero (01, 02, 03, etc.)'},findAndReplace:{title:'尋找與�代',find:'尋找',replace:'�代',findWhat:'尋找:',replaceWith:'�代:',notFoundMsg:'未找到指定的文字。',findOptions:'Find Options',matchCase:'大�寫須相符',matchWord:'全字相符',matchCyclic:'循環�索',replaceAll:'全部�代',replaceSuccessMsg:'共完� %1 次�代'},table:{toolbar:'表格',title:'表格屬性',menu:'表格屬性',deleteTable:'刪除表格',rows:'列數',columns:'欄數',border:'邊框',widthPx:'�素',widthPc:'百分比',widthUnit:'width unit',cellSpace:'間�',cellPad:'內�',caption:'標題',summary:'摘�',headers:'標題',headersNone:'無標題',headersColumn:'第一欄',headersRow:'第一列',headersBoth:'第一欄和第一列',invalidRows:'必須有一或更多的列',invalidCols:'必須有一或更多的欄',invalidBorder:'邊框大�必須為數字格�',invalidWidth:'表格寬度必須為數字格�',invalidHeight:'表格高度必須為數字格�',invalidCellSpacing:'儲存格間�必須為數字格�',invalidCellPadding:'儲存格內�必須為數字格�',cell:{menu:'儲存格',insertBefore:'�左�入儲存格',insertAfter:'���入儲存格',deleteCell:'刪除儲存格',merge:'�併儲存格',mergeRight:'���併儲存格',mergeDown:'�下�併儲存格',splitHorizontal:'橫�分割儲存格',splitVertical:'縱�分割儲存格',title:'儲存格屬性',cellType:'儲存格類別',rowSpan:'儲存格列數',colSpan:'儲存格欄數',wordWrap:'自動�行',hAlign:'水平�齊',vAlign:'垂直�齊',alignBaseline:'基線�齊',bgColor:'背景�色',borderColor:'邊框�色',data:'數據',header:'標題',yes:'是',no:'�',invalidWidth:'儲存格寬度必須為數字格�',invalidHeight:'儲存格高度必須為數字格�',invalidRowSpan:'儲存格列數必須為整數格�',invalidColSpan:'儲存格欄數度必須為整數格�',chooseColor:'Choose'},row:{menu:'列',insertBefore:'�上�入列',insertAfter:'�下�入列',deleteRow:'刪除列'},column:{menu:'欄',insertBefore:'�左�入欄',insertAfter:'���入欄',deleteColumn:'刪除欄'}},button:{title:'按鈕屬性',text:'顯示文字 (值)',type:'類型',typeBtn:'按鈕 (Button)',typeSbm:'�出 (Submit)',typeRst:'�設 (Reset)'},checkboxAndRadio:{checkboxTitle:'核�方塊屬性',radioTitle:'�項按鈕屬性',value:'��值',selected:'已��'},form:{title:'表單屬性',menu:'表單屬性',action:'動作',method:'方法',encoding:'表單編碼'},select:{title:'清單/�單屬性',selectInfo:'資訊',opAvail:'�用�項',value:'值',size:'大�',lines:'行',chkMulti:'�多�',opText:'顯示文字',opValue:'��值',btnAdd:'新增',btnModify:'修改',btnUp:'上移',btnDown:'下移',btnSetValue:'設為�設值',btnDelete:'刪除'},textarea:{title:'文字�域屬性',cols:'字元寬度',rows:'列數'},textfield:{title:'文字方塊屬性',name:'�稱',value:'值',charWidth:'字元寬度',maxChars:'最多字元數',type:'類型',typeText:'文字',typePass:'密碼'},hidden:{title:'隱�欄�屬性',name:'�稱',value:'值'},image:{title:'影�屬性',titleButton:'影�按鈕屬性',menu:'影�屬性',infoTab:'影�資訊',btnUpload:'上傳至伺�器',upload:'上傳',alt:'替代文字',lockRatio:'等比例',resetSize:'�設為原大�',border:'邊框',hSpace:'水平�離',vSpace:'垂直�離',alertUrl:'請輸入影� URL',linkTab:'超連�',button2Img:'�把影�按鈕改�影�嗎？',img2Button:'�把影�改�影�按鈕嗎？',urlMissing:'Image source URL is missing.',validateBorder:'Border must be a whole number.',validateHSpace:'HSpace must be a whole number.',validateVSpace:'VSpace must be a whole number.'},flash:{properties:'Flash 屬性',propertiesTab:'屬性',title:'Flash 屬性',chkPlay:'自動播放',chkLoop:'�複',chkMenu:'開啟�單',chkFull:'啟動全螢幕顯示',scale:'縮放',scaleAll:'全部顯示',scaleNoBorder:'無邊框',scaleFit:'精確符�',access:'�許腳本訪�',accessAlways:'永�',accessSameDomain:'相�域�',accessNever:'永�',alignAbsBottom:'絕�下方',alignAbsMiddle:'絕�中間',alignBaseline:'基準線',alignTextTop:'文字上方',quality:'質素',qualityBest:'最好',qualityHigh:'高',qualityAutoHigh:'高（自動）',qualityMedium:'中（自動）',qualityAutoLow:'低（自動）',qualityLow:'低',windowModeWindow:'視窗',windowModeOpaque:'��明',windowModeTransparent:'�明',windowMode:'視窗模�',flashvars:'Flash 變數',bgcolor:'背景�色',hSpace:'水平�離',vSpace:'垂直�離',validateSrc:'請輸入欲連�的 URL',validateHSpace:'水平間�必須為數字格�',validateVSpace:'垂直間�必須為數字格�'},spellCheck:{toolbar:'拼字檢查',title:'拼字檢查',notAvailable:'抱歉，�務目�暫��用',errorLoading:'無法�系��器: %s.',notInDic:'�在字典中',changeTo:'更改為',btnIgnore:'忽略',btnIgnoreAll:'全部忽略',btnReplace:'�代',btnReplaceAll:'全部�代',btnUndo:'復原',noSuggestions:'- 無建議值 -',progress:'進行拼字檢查中…',noMispell:'拼字檢查完�：未發�拼字錯誤',noChanges:'拼字檢查完�：未更改任何單字',oneChange:'拼字檢查完�：更改了 1 個單字',manyChanges:'拼字檢查完�：更改了 %1 個單字',ieSpellDownload:'尚未安�拼字檢查元件。您是�想��在下載？'},smiley:{toolbar:'表情符號',title:'�入表情符號',options:'Smiley Options'},elementsPath:{eleLabel:'Elements path',eleTitle:'%1 元素'},numberedlist:'編號清單',bulletedlist:'項目清單',indent:'增加縮排',outdent:'減少縮排',justify:{left:'�左�齊',center:'置中',right:'���齊',block:'左��齊'},blockquote:'引用文字',clipboard:{title:'貼上',cutError:'�覽器的安全性設定��許編輯器自動執行剪下動作。請使用快�� (Ctrl/Cmd+X) 剪下。',copyError:'�覽器的安全性設定��許編輯器自動執行複製動作。請使用快�� (Ctrl/Cmd+C) 複製。',pasteMsg:'請使用快�� (<strong>Ctrl/Cmd+V</strong>) 貼到下方�域中並按下 <strong>確定</strong>',securityMsg:'因為�覽器的安全性設定，本編輯器無法直接存�您的剪貼簿資料，請您自行在本視窗進行貼上動作。',pasteArea:'Paste Area'},pastefromword:{confirmCleanup:'您想貼上的文字似乎是自 Word 複製而來，請�您是��先清除 Word 的格�後�行貼上？',toolbar:'自 Word 貼上',title:'自 Word 貼上',error:'It was not possible to clean up the pasted data due to an internal error'},pasteText:{button:'貼為純文字格�',title:'貼為純文字格�'},templates:{button:'樣版',title:'內容樣版',options:'Template Options',insertOption:'�代原有內容',selectPromptMsg:'請�擇欲開啟的樣版<br> (原有的內容將會被清除):',emptyListMsg:'(無樣版)'},showBlocks:'顯示�塊',stylesCombo:{label:'樣�',panelTitle:'Formatting Styles',panelTitle1:'塊級元素樣�',panelTitle2:'內�元素樣�',panelTitle3:'物件元素樣�'},format:{label:'格�',panelTitle:'格�',tag_p:'一般',tag_pre:'已格�化',tag_address:'��',tag_h1:'標題 1',tag_h2:'標題 2',tag_h3:'標題 3',tag_h4:'標題 4',tag_h5:'標題 5',tag_h6:'標題 6',tag_div:'一般 (DIV)'},div:{title:'Create Div Container',toolbar:'Create Div Container',cssClassInputLabel:'Stylesheet Classes',styleSelectLabel:'Style',IdInputLabel:'Id',languageCodeInputLabel:' Language Code',inlineStyleInputLabel:'Inline Style',advisoryTitleInputLabel:'Advisory Title',langDirLabel:'Language Direction',langDirLTRLabel:'Left to Right (LTR)',langDirRTLLabel:'Right to Left (RTL)',edit:'Edit Div',remove:'Remove Div'},iframe:{title:'IFrame Properties',toolbar:'IFrame',noUrl:'Please type the iframe URL',scrolling:'Enable scrollbars',border:'Show frame border'},font:{label:'字體',voiceLabel:'字體',panelTitle:'字體'},fontSize:{label:'大�',voiceLabel:'文字大�',panelTitle:'大�'},colorButton:{textColorTitle:'文字�色',bgColorTitle:'背景�色',panelTitle:'Colors',auto:'自動',more:'更多�色…'},colors:{'000':'Black',800000:'Maroon','8B4513':'Saddle Brown','2F4F4F':'Dark Slate Gray','008080':'Teal','000080':'Navy','4B0082':'Indigo',696969:'Dark Gray',B22222:'Fire Brick',A52A2A:'Brown',DAA520:'Golden Rod','006400':'Dark Green','40E0D0':'Turquoise','0000CD':'Medium Blue',800080:'Purple',808080:'Gray',F00:'Red',FF8C00:'Dark Orange',FFD700:'Gold','008000':'Green','0FF':'Cyan','00F':'Blue',EE82EE:'Violet',A9A9A9:'Dim Gray',FFA07A:'Light Salmon',FFA500:'Orange',FFFF00:'Yellow','00FF00':'Lime',AFEEEE:'Pale Turquoise',ADD8E6:'Light Blue',DDA0DD:'Plum',D3D3D3:'Light Grey',FFF0F5:'Lavender Blush',FAEBD7:'Antique White',FFFFE0:'Light Yellow',F0FFF0:'Honeydew',F0FFFF:'Azure',F0F8FF:'Alice Blue',E6E6FA:'Lavender',FFF:'White'},scayt:{title:'�時拼寫檢查',opera_title:'Not supported by Opera',enable:'啟用�時拼寫檢查',disable:'關閉�時拼寫檢查',about:'關於�時拼寫檢查',toggle:'啟用�關閉�時拼寫檢查',options:'�項',langs:'語言',moreSuggestions:'更多拼寫建議',ignore:'忽略',ignoreAll:'全部忽略',addWord:'添加單詞',emptyDic:'字典��應為空.',optionsTab:'�項',allCaps:'Ignore All-Caps Words',ignoreDomainNames:'Ignore Domain Names',mixedCase:'Ignore Words with Mixed Case',mixedWithDigits:'Ignore Words with Numbers',languagesTab:'語言',dictionariesTab:'字典',dic_field_name:'Dictionary name',dic_create:'Create',dic_restore:'Restore',dic_delete:'Delete',dic_rename:'Rename',dic_info:'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.',aboutTab:'關於'},about:{title:'關於 CKEditor',dlgTitle:'關於 CKEditor',help:'Check $1 for help.',userGuide:"CKEditor User's Guide",moreInfo:'訪�我們的網站以��更多關於�議的信�',copy:'Copyright &copy; $1. All rights reserved.'},maximize:'最大化',minimize:'Minimize',fakeobjects:{anchor:'錨點',flash:'Flash 動畫',iframe:'IFrame',hiddenfield:'Hidden Field',unknown:'�明物件'},resize:'拖拽改變大�',colordialog:{title:'Select color',options:'Color Options',highlight:'Highlight',selected:'Selected Color',clear:'Clear'},toolbarCollapse:'Collapse Toolbar',toolbarExpand:'Expand Toolbar',toolbarGroups:{document:'Document',clipboard:'Clipboard/Undo',editing:'Editing',forms:'Forms',basicstyles:'Basic Styles',paragraph:'Paragraph',links:'Links',insert:'Insert',styles:'Styles',colors:'Colors',tools:'Tools'},bidi:{ltr:'Text direction from left to right',rtl:'Text direction from right to left'},docprops:{label:'文件屬性',title:'文件屬性',design:'Design',meta:'Meta 資料',chooseColor:'Choose',other:'<其他>',docTitle:'��標題',charset:'字元編碼',charsetOther:'其他字元編碼',charsetASCII:'ASCII',charsetCE:'中�語系',charsetCT:'正體中文 (Big5)',charsetCR:'斯拉夫文',charsetGR:'希臘文',charsetJP:'日文',charsetKR:'韓文',charsetTR:'土耳其文',charsetUN:'Unicode (UTF-8)',charsetWE:'西�語系',docType:'文件類型',docTypeOther:'其他文件類型',xhtmlDec:'包� XHTML 定義',bgColor:'背景�色',bgImage:'背景影�',bgFixed:'浮水�',txtColor:'文字�色',margin:'��邊界',marginTop:'上',marginLeft:'左',marginRight:'�',marginBottom:'下',metaKeywords:'文件索引關�字 (用�形逗號[,]分隔)',metaDescription:'文件說明',metaAuthor:'作者',metaCopyright:'版權所有',previewHtml:'<p>This is some <strong>sample text</strong>. You are using <a href="javascript:void(0)">CKEditor</a>.</p>'}};
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
new file mode 100644
index 00000000..2c8cb7a2
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -0,0 +1,222 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'a11yHelp', function( editor )
+{
+	var lang = editor.lang.accessibilityHelp,
+		id = CKEDITOR.tools.getNextId();
+
+	// CharCode <-> KeyChar.
+	var keyMap =
+	{
+		8 : "BACKSPACE",
+		9 : "TAB" ,
+		13 : "ENTER" ,
+		16 : "SHIFT" ,
+		17 : "CTRL" ,
+		18 : "ALT" ,
+		19 : "PAUSE" ,
+		20 : "CAPSLOCK" ,
+		27 : "ESCAPE" ,
+		33 : "PAGE UP" ,
+		34 : "PAGE DOWN" ,
+		35 : "END" ,
+		36 : "HOME" ,
+		37 : "LEFT ARROW" ,
+		38 : "UP ARROW" ,
+		39 : "RIGHT ARROW" ,
+		40 : "DOWN ARROW" ,
+		45 : "INSERT" ,
+		46 : "DELETE" ,
+		91 : "LEFT WINDOW KEY" ,
+		92 : "RIGHT WINDOW KEY" ,
+		93 : "SELECT KEY" ,
+		96 : "NUMPAD  0" ,
+		97 : "NUMPAD  1" ,
+		98 : "NUMPAD  2" ,
+		99 : "NUMPAD  3" ,
+		100 : "NUMPAD  4" ,
+		101 : "NUMPAD  5" ,
+		102 : "NUMPAD  6" ,
+		103 : "NUMPAD  7" ,
+		104 : "NUMPAD  8" ,
+		105 : "NUMPAD  9" ,
+		106 : "MULTIPLY" ,
+		107 : "ADD" ,
+		109 : "SUBTRACT" ,
+		110 : "DECIMAL POINT" ,
+		111 : "DIVIDE" ,
+		112 : "F1" ,
+		113 : "F2" ,
+		114 : "F3" ,
+		115 : "F4" ,
+		116 : "F5" ,
+		117 : "F6" ,
+		118 : "F7" ,
+		119 : "F8" ,
+		120 : "F9" ,
+		121 : "F10" ,
+		122 : "F11" ,
+		123 : "F12" ,
+		144 : "NUM LOCK" ,
+		145 : "SCROLL LOCK" ,
+		186 : "SEMI-COLON" ,
+		187 : "EQUAL SIGN" ,
+		188 : "COMMA" ,
+		189 : "DASH" ,
+		190 : "PERIOD" ,
+		191 : "FORWARD SLASH" ,
+		192 : "GRAVE ACCENT" ,
+		219 : "OPEN BRACKET" ,
+		220 : "BACK SLASH" ,
+		221 : "CLOSE BRAKET" ,
+		222 : "SINGLE QUOTE"
+	};
+
+	// Modifier keys override.
+	keyMap[ CKEDITOR.ALT ] = 'ALT';
+	keyMap[ CKEDITOR.SHIFT ] = 'SHIFT';
+	keyMap[ CKEDITOR.CTRL ] = 'CTRL';
+
+	// Sort in desc.
+	var modifiers = [ CKEDITOR.ALT, CKEDITOR.SHIFT, CKEDITOR.CTRL ];
+
+	function representKeyStroke( keystroke )
+	{
+		var quotient,
+				modifier,
+				presentation = [];
+
+		for ( var i = 0; i < modifiers.length; i++ )
+		{
+			modifier = modifiers[ i ];
+			quotient = keystroke / modifiers[ i ];
+			if ( quotient > 1 && quotient <= 2 )
+			{
+				keystroke -= modifier;
+				presentation.push( keyMap[ modifier ] );
+			}
+		}
+
+		presentation.push( keyMap[ keystroke ]
+			|| String.fromCharCode( keystroke ) );
+
+		return presentation.join( '+' );
+	}
+
+	var variablesPattern = /\$\{(.*?)\}/g;
+	function replaceVariables( match, name )
+	{
+		var keystrokes = editor.config.keystrokes,
+				definition,
+				length = keystrokes.length;
+
+		for ( var i = 0; i < length; i++ )
+		{
+			definition = keystrokes[ i ];
+			if ( definition[ 1 ] == name )
+				break;
+		}
+		return representKeyStroke( definition[ 0 ] );
+	}
+
+	// Create the help list directly from lang file entries.
+	function buildHelpContents()
+	{
+		var pageTpl = '<div class="cke_accessibility_legend" role="document" aria-labelledby="' + id + '_arialbl" tabIndex="-1">%1</div>' +
+				'<span id="' + id + '_arialbl" class="cke_voice_label">' + lang.contents + ' </span>',
+			sectionTpl = '<h1>%1</h1><dl>%2</dl>',
+			itemTpl = '<dt>%1</dt><dd>%2</dd>';
+
+		var pageHtml = [],
+			sections = lang.legend,
+			sectionLength = sections.length;
+
+		for ( var i = 0; i < sectionLength; i++ )
+		{
+			var section = sections[ i ],
+				sectionHtml = [],
+				items = section.items,
+				itemsLength = items.length;
+
+			for ( var j = 0; j < itemsLength; j++ )
+			{
+				var item = items[ j ],
+					itemHtml;
+				itemHtml = itemTpl.replace( '%1', item.name ).
+					replace( '%2', item.legend.replace( variablesPattern, replaceVariables ) );
+				sectionHtml.push( itemHtml );
+			}
+
+			pageHtml.push( sectionTpl.replace( '%1', section.name ).replace( '%2', sectionHtml.join( '' ) ) );
+		}
+
+		return pageTpl.replace( '%1', pageHtml.join( '' ) );
+	}
+
+	return {
+		title : lang.title,
+		minWidth : 600,
+		minHeight : 400,
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.common.generalTab,
+				expand : true,
+				elements :
+				[
+					{
+						type : 'html',
+						id : 'legends',
+						style : 'white-space:normal;',
+						focus : function() {},
+						html : buildHelpContents() +
+							'<style type="text/css">' +
+							'.cke_accessibility_legend' +
+							'{' +
+								'width:600px;' +
+								'height:400px;' +
+								'padding-right:5px;' +
+								'overflow-y:auto;' +
+								'overflow-x:hidden;' +
+							'}' +
+							// Some adjustments are to be done for IE6 and Quirks to work "properly" (#5757)
+							'.cke_browser_quirks .cke_accessibility_legend,' +
+							'.cke_browser_ie6 .cke_accessibility_legend' +
+							'{' +
+								'height:390px' +
+							'}' +
+							// Override non-wrapping white-space rule in reset css.
+							'.cke_accessibility_legend *' +
+							'{' +
+								'white-space:normal;' +
+							'}' +
+							'.cke_accessibility_legend h1' +
+							'{' +
+								'font-size: 20px;' +
+								'border-bottom: 1px solid #AAA;' +
+								'margin: 5px 0px 15px;' +
+							'}' +
+							'.cke_accessibility_legend dl' +
+							'{' +
+								'margin-left: 5px;' +
+							'}' +
+							'.cke_accessibility_legend dt' +
+							'{' +
+								'font-size: 13px;' +
+								'font-weight: bold;' +
+							'}' +
+							'.cke_accessibility_legend dd' +
+							'{' +
+								'margin:10px' +
+							'}' +
+						'</style>'
+					}
+				]
+			}
+		],
+		buttons : [ CKEDITOR.dialog.cancelButton ]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/index.html b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/en.js b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/en.js
new file mode 100644
index 00000000..729e0d36
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/en.js
@@ -0,0 +1,108 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'a11yhelp', 'en',
+{
+	accessibilityHelp :
+	{
+		title : 'Accessibility Instructions',
+		contents : 'Help Contents. To close this dialog press ESC.',
+		legend :
+		[
+			{
+				name : 'General',
+				items :
+						[
+							{
+								name : 'Editor Toolbar',
+								legend:
+									'Press ${toolbarFocus} to navigate to the toolbar. ' +
+									'Move to the next and previous toolbar group with TAB and SHIFT-TAB. ' +
+									'Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. ' +
+									'Press SPACE or ENTER to activate the toolbar button.'
+							},
+
+							{
+								name : 'Editor Dialog',
+								legend :
+									'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog. ' +
+									'For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. ' +
+									'Then move to next tab with TAB OR RIGTH ARROW. ' +
+									'Move to previous tab with SHIFT + TAB or LEFT ARROW. ' +
+									'Press SPACE or ENTER to select the tab page.'
+							},
+
+							{
+								name : 'Editor Context Menu',
+								legend :
+									'Press ${contextMenu} or APPLICATION KEY to open context-menu. ' +
+									'Then move to next menu option with TAB or DOWN ARROW. ' +
+									'Move to previous option with  SHIFT+TAB or UP ARROW. ' +
+									'Press SPACE or ENTER to select the menu option. ' +
+									'Open sub-menu of current option wtih SPACE or ENTER or RIGHT ARROW. ' +
+									'Go back to parent menu item with ESC or LEFT ARROW. ' +
+									'Close context menu with ESC.'
+							},
+
+							{
+								name : 'Editor List Box',
+								legend :
+									'Inside a list-box, move to next list item with TAB OR DOWN ARROW. ' +
+									'Move to previous list item with SHIFT + TAB or UP ARROW. ' +
+									'Press SPACE or ENTER to select the list option. ' +
+									'Press ESC to close the list-box.'
+							},
+
+							{
+								name : 'Editor Element Path Bar',
+								legend :
+									'Press ${elementsPathFocus} to navigate to the elements path bar. ' +
+									'Move to next element button with TAB or RIGHT ARROW. ' +
+									'Move to previous button with  SHIFT+TAB or LEFT ARROW. ' +
+									'Press SPACE or ENTER to select the element in editor.'
+							}
+						]
+			},
+			{
+				name : 'Commands',
+				items :
+						[
+							{
+								name : ' Undo command',
+								legend : 'Press ${undo}'
+							},
+							{
+								name : ' Redo command',
+								legend : 'Press ${redo}'
+							},
+							{
+								name : ' Bold command',
+								legend : 'Press ${bold}'
+							},
+							{
+								name : ' Italic command',
+								legend : 'Press ${italic}'
+							},
+							{
+								name : ' Underline command',
+								legend : 'Press ${underline}'
+							},
+							{
+								name : ' Link command',
+								legend : 'Press ${link}'
+							},
+							{
+								name : ' Toolbar Collapse command',
+								legend : 'Press ${toolbarCollapse}'
+							},
+							{
+								name : ' Accessibility Help',
+								legend : 'Press ${a11yHelp}'
+							}
+						]
+			}
+		]
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/he.js b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/he.js
new file mode 100644
index 00000000..9ebb316b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/he.js
@@ -0,0 +1,216 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'a11yhelp', 'he',
+{
+	accessibilityHelp :
+	{
+		title : 'הור�ות נגישות',
+		contents : 'הור�ות נגישות. לסגירה לחץ �סקייפ (ESC).',
+		legend :
+		[
+			{
+				name : 'כללי',
+				items :
+						[
+							{
+								name : 'סרגל הכלי�',
+								legend:
+									'לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלי�. ' +
+									'עבור לכפתור הב� ע� מקש הט�ב (TAB) �ו חץ שמ�לי. ' +
+									'עבור לכפתור הקוד� ע� מקש השיפט (SHIFT) + ט�ב (TAB) �ו חץ ימני. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי להפעיל �ת הכפתור הנבחר.'
+							},
+
+							{
+								name : 'די�לוגי� (חלונות תש�ול)',
+								legend :
+									'בתוך די�לוג, לחץ ט�ב (TAB) כדי לנווט לשדה הב�, לחץ שיפט (SHIFT) + ט�ב (TAB) כדי לנווט לשדה הקוד�, לחץ �נטר (ENTER) כדי לשלוח �ת הדי�לוג, לחץ �סקייפ (ESC) כדי לבטל. ' +
+									'בתוך די�לוגי� בעלי מספר ט�בי� (לשוניות), לחץ �לט (ALT) + F10 כדי לנווט לשורת הט�בי�. ' +
+									'נווט לט�ב הב� ע� ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'עבור לט�ב הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי להיכנס לט�ב.'
+							},
+
+							{
+								name : 'תפריט ההקשר (Context Menu)',
+								legend :
+									'לחץ ${contextMenu} �ו APPLICATION KEYכדי לפתוח �ת תפריט ההקשר. ' +
+									'עבור ל�פשרות הב�ה ע� ט�ב (TAB) �ו חץ למטה. ' +
+									'עבור ל�פשרות הקודמת ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ למעלה. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�פשרות. ' +
+									'פתח �ת תת התפריט (Sub-menu) של ה�פשרות הנוכחית ע� רווח �ו �נטר (ENTER) �ו חץ שמ�לי. ' +
+									'חזור לתפריט ה�ב ע� �סקייפ (ESC) �ו חץ שמ�לי. ' +
+									'סגור �ת תפריט ההקשר ע� �סקייפ (ESC).'
+							},
+
+							{
+								name : 'תפריטי� צפי� (List boxes)',
+								legend :
+									'בתוך תפריט צף, עבור לפריט הב� ע� ט�ב (TAB) �ו חץ למטה. ' +
+									'עבור לתפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) or חץ עליון. ' +
+									'Press SPACE or ENTER to select the list option. ' +
+									'Press ESC to close the list-box.'
+							},
+
+							{
+								name : 'עץ �למנטי� (Elements Path)',
+								legend :
+									'לחץ ${elementsPathFocus} כדי לנווט לעץ ה�למנטי�. ' +
+									'עבור לפריט הב� ע� ט�ב (TAB) �ו חץ ימני. ' +
+									'עבור לפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�למנט בעורך.'
+							}
+						]
+			},
+			{
+				name : 'פקודות',
+				items :
+						[
+							{
+								name : ' ביטול צעד �חרון',
+								legend : 'לחץ ${undo}'
+							},
+							{
+								name : ' חזרה על צעד �חרון',
+								legend : 'לחץ ${redo}'
+							},
+							{
+								name : ' הדגשה',
+								legend : 'לחץ ${bold}'
+							},
+							{
+								name : ' הטייה',
+								legend : 'לחץ ${italic}'
+							},
+							{
+								name : ' הוספת קו תחתון',
+								legend : 'לחץ ${underline}'
+							},
+							{
+								name : ' הוספת לינק',
+								legend : 'לחץ ${link}'
+							},
+							{
+								name : ' כיווץ סרגל הכלי�',
+								legend : 'לחץ ${toolbarCollapse}'
+							},
+							{
+								name : ' הור�ות נגישות',
+								legend : 'לחץ ${a11yHelp}'
+							}
+						]
+			}
+		]
+	}
+});
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'a11yhelp', 'he',
+{
+	accessibilityHelp :
+	{
+		title : 'הור�ות נגישות',
+		contents : 'הור�ות נגישות. לסגירה לחץ �סקייפ (ESC).',
+		legend :
+		[
+			{
+				name : 'כללי',
+				items :
+						[
+							{
+								name : 'סרגל הכלי�',
+								legend:
+									'לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלי�. ' +
+									'עבור לכפתור הב� ע� מקש הט�ב (TAB) �ו חץ שמ�לי. ' +
+									'עבור לכפתור הקוד� ע� מקש השיפט (SHIFT) + ט�ב (TAB) �ו חץ ימני. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי להפעיל �ת הכפתור הנבחר.'
+							},
+
+							{
+								name : 'די�לוגי� (חלונות תש�ול)',
+								legend :
+									'בתוך די�לוג, לחץ ט�ב (TAB) כדי לנווט לשדה הב�, לחץ שיפט (SHIFT) + ט�ב (TAB) כדי לנווט לשדה הקוד�, לחץ �נטר (ENTER) כדי לשלוח �ת הדי�לוג, לחץ �סקייפ (ESC) כדי לבטל. ' +
+									'בתוך די�לוגי� בעלי מספר ט�בי� (לשוניות), לחץ �לט (ALT) + F10 כדי לנווט לשורת הט�בי�. ' +
+									'נווט לט�ב הב� ע� ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'עבור לט�ב הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי להיכנס לט�ב.'
+							},
+
+							{
+								name : 'תפריט ההקשר (Context Menu)',
+								legend :
+									'לחץ ${contextMenu} �ו APPLICATION KEYכדי לפתוח �ת תפריט ההקשר. ' +
+									'עבור ל�פשרות הב�ה ע� ט�ב (TAB) �ו חץ למטה. ' +
+									'עבור ל�פשרות הקודמת ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ למעלה. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�פשרות. ' +
+									'פתח �ת תת התפריט (Sub-menu) של ה�פשרות הנוכחית ע� רווח �ו �נטר (ENTER) �ו חץ שמ�לי. ' +
+									'חזור לתפריט ה�ב ע� �סקייפ (ESC) �ו חץ שמ�לי. ' +
+									'סגור �ת תפריט ההקשר ע� �סקייפ (ESC).'
+							},
+
+							{
+								name : 'תפריטי� צפי� (List boxes)',
+								legend :
+									'בתוך תפריט צף, עבור לפריט הב� ע� ט�ב (TAB) �ו חץ למטה. ' +
+									'עבור לתפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) or חץ עליון. ' +
+									'Press SPACE or ENTER to select the list option. ' +
+									'Press ESC to close the list-box.'
+							},
+
+							{
+								name : 'עץ �למנטי� (Elements Path)',
+								legend :
+									'לחץ ${elementsPathFocus} כדי לנווט לעץ ה�למנטי�. ' +
+									'עבור לפריט הב� ע� ט�ב (TAB) �ו חץ ימני. ' +
+									'עבור לפריט הקוד� ע� שיפט (SHIFT) + ט�ב (TAB) �ו חץ שמ�לי. ' +
+									'לחץ רווח �ו �נטר (ENTER) כדי לבחור �ת ה�למנט בעורך.'
+							}
+						]
+			},
+			{
+				name : 'פקודות',
+				items :
+						[
+							{
+								name : ' ביטול צעד �חרון',
+								legend : 'לחץ ${undo}'
+							},
+							{
+								name : ' חזרה על צעד �חרון',
+								legend : 'לחץ ${redo}'
+							},
+							{
+								name : ' הדגשה',
+								legend : 'לחץ ${bold}'
+							},
+							{
+								name : ' הטייה',
+								legend : 'לחץ ${italic}'
+							},
+							{
+								name : ' הוספת קו תחתון',
+								legend : 'לחץ ${underline}'
+							},
+							{
+								name : ' הוספת לינק',
+								legend : 'לחץ ${link}'
+							},
+							{
+								name : ' כיווץ סרגל הכלי�',
+								legend : 'לחץ ${toolbarCollapse}'
+							},
+							{
+								name : ' הור�ות נגישות',
+								legend : 'לחץ ${a11yHelp}'
+							}
+						]
+			}
+		]
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/index.html b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/a11yhelp/lang/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/about.js b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/about.js
new file mode 100644
index 00000000..222abcab
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/about.js
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'about', function( editor )
+{
+	var lang = editor.lang.about;
+
+	return {
+		title : CKEDITOR.env.ie ? lang.dlgTitle : lang.title,
+		minWidth : 390,
+		minHeight : 230,
+		contents : [
+			{
+				id : 'tab1',
+				label : '',
+				title : '',
+				expand : true,
+				padding : 0,
+				elements :
+				[
+					{
+						type : 'html',
+						html :
+							'<style type="text/css">' +
+								'.cke_about_container' +
+								'{' +
+									'color:#000 !important;' +
+									'padding:10px 10px 0;' +
+									'margin-top:5px' +
+								'}' +
+								'.cke_about_container p' +
+								'{' +
+									'margin: 0 0 10px;' +
+								'}' +
+								'.cke_about_container .cke_about_logo' +
+								'{' +
+									'height:81px;' +
+									'background-color:#fff;' +
+									'background-image:url(' + CKEDITOR.plugins.get( 'about' ).path + 'dialogs/logo_ckeditor.png);' +
+									'background-position:center; ' +
+									'background-repeat:no-repeat;' +
+									'margin-bottom:10px;' +
+								'}' +
+								'.cke_about_container a' +
+								'{' +
+									'cursor:pointer !important;' +
+									'color:blue !important;' +
+									'text-decoration:underline !important;' +
+								'}' +
+							'</style>' +
+							'<div class="cke_about_container">' +
+								'<div class="cke_about_logo"></div>' +
+								'<p>' +
+									'CKEditor ' + CKEDITOR.version + ' (revision ' + CKEDITOR.revision + ')<br>' +
+									'<a href="http://ckeditor.com/">http://ckeditor.com</a>' +
+								'</p>' +
+								'<p>' +
+									lang.help.replace( '$1', '<a href="http://docs.cksource.com/CKEditor_3.x/Users_Guide/Quick_Reference">' + lang.userGuide + '</a>' ) +
+								'</p>' +
+								'<p>' +
+									lang.moreInfo + '<br>' +
+									'<a href="http://ckeditor.com/license">http://ckeditor.com/license</a>' +
+								'</p>' +
+								'<p>' +
+									lang.copy.replace( '$1', '<a href="http://cksource.com/">CKSource</a> - Frederico Knabben' ) +
+								'</p>' +
+							'</div>'
+					}
+				]
+			}
+		],
+		buttons : [ CKEDITOR.dialog.cancelButton ]
+	};
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/logo_ckeditor.png
new file mode 100644
index 00000000..ad019021
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/about/dialogs/logo_ckeditor.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/about/index.html b/upload/public/js/3rd_party/ckeditor/plugins/about/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/about/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/adobeair/index.html b/upload/public/js/3rd_party/ckeditor/plugins/adobeair/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/adobeair/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/adobeair/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/adobeair/plugin.js
new file mode 100644
index 00000000..0bba405e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/adobeair/plugin.js
@@ -0,0 +1,228 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var eventNameList = [ 'click', 'keydown', 'mousedown', 'keypress', 'mouseover', 'mouseout' ];
+
+	// Inline event callbacks assigned via innerHTML/outerHTML, such as
+	// onclick/onmouseover, are ignored in AIR.
+	// Use DOM2 event listeners to substitue inline handlers instead.
+	function convertInlineHandlers( container )
+	{
+		// TODO: document.querySelectorAll is not supported in AIR.
+		var children = container.getElementsByTag( '*' ),
+			count = children.count(),
+			child;
+
+		for ( var i = 0; i < count; i++ )
+		{
+			child = children.getItem( i );
+
+			(function( node )
+			{
+				for ( var j = 0; j < eventNameList.length; j++ )
+				{
+					(function( eventName )
+					{
+						var inlineEventHandler = node.getAttribute( 'on' + eventName );
+						if ( node.hasAttribute( 'on' + eventName ) )
+						{
+							node.removeAttribute( 'on' + eventName );
+							node.on( eventName, function( evt )
+							{
+								var callFunc = /(return\s*)?CKEDITOR\.tools\.callFunction\(([^)]+)\)/.exec( inlineEventHandler ),
+									hasReturn = callFunc && callFunc[ 1 ],
+									callFuncArgs = callFunc &&  callFunc[ 2 ].split( ',' ),
+									preventDefault = /return false;/.test( inlineEventHandler );
+
+								if ( callFuncArgs )
+								{
+									var nums = callFuncArgs.length,
+										argName;
+
+									for ( var i = 0; i < nums; i++ )
+									{
+										// Trim spaces around param.
+										callFuncArgs[ i ] = argName = CKEDITOR.tools.trim( callFuncArgs[ i ] );
+
+										// String form param.
+										var strPattern = argName.match( /^(["'])([^"']*?)\1$/ );
+										if ( strPattern )
+										{
+											callFuncArgs[ i ] = strPattern[ 2 ];
+											continue;
+										}
+
+										// Integer form param.
+										if ( argName.match( /\d+/ ) )
+										{
+											callFuncArgs[ i ] = parseInt( argName, 10 );
+											continue;
+										}
+
+										// Speical variables.
+										switch( argName )
+										{
+											case 'this' :
+												callFuncArgs[ i ] = node.$;
+												break;
+											case 'event' :
+												callFuncArgs[ i ] = evt.data.$;
+												break;
+											case 'null' :
+												callFuncArgs [ i ] = null;
+												break;
+										}
+									}
+
+									var retval = CKEDITOR.tools.callFunction.apply( window, callFuncArgs );
+									if ( hasReturn && retval === false )
+										 preventDefault = 1;
+								}
+
+								if ( preventDefault )
+									evt.data.preventDefault();
+							});
+						}
+					})( eventNameList[ j ] );
+				}
+			})( child );
+		}
+	}
+
+	CKEDITOR.plugins.add( 'adobeair',
+	{
+		init : function( editor )
+		{
+			if ( !CKEDITOR.env.air )
+				return;
+
+			// Body doesn't get default margin on AIR.
+			editor.addCss( 'body { padding: 8px }' );
+
+			editor.on( 'uiReady', function()
+				{
+					convertInlineHandlers( editor.container );
+
+					if ( editor.sharedSpaces )
+					{
+						for ( var space in editor.sharedSpaces )
+							convertInlineHandlers( editor.sharedSpaces[ space ] );
+					}
+
+					editor.on( 'elementsPathUpdate', function( evt ) { convertInlineHandlers( evt.data.space ); } );
+				});
+
+			editor.on( 'contentDom', function()
+				{
+					// Hyperlinks are enabled in editable documents in Adobe
+					// AIR. Prevent their click behavior.
+					editor.document.on( 'click', function( ev )
+						{
+							ev.data.preventDefault( true );
+						});
+				});
+		}
+	});
+
+	CKEDITOR.ui.on( 'ready', function( evt )
+		{
+			var ui = evt.data;
+			// richcombo, panelbutton and menu
+			if ( ui._.panel )
+			{
+				var panel = ui._.panel._.panel,
+						holder;
+
+				( function()
+				{
+					// Adding dom event listeners off-line are not supported in AIR,
+					// waiting for panel iframe loaded.
+					if ( !panel.isLoaded )
+					{
+						setTimeout( arguments.callee, 30 );
+						return;
+					}
+					holder = panel._.holder;
+					convertInlineHandlers( holder );
+				})();
+			}
+			else if ( ui instanceof CKEDITOR.dialog )
+				convertInlineHandlers( ui._.element );
+		});
+})();
+
+CKEDITOR.dom.document.prototype.write = CKEDITOR.tools.override( CKEDITOR.dom.document.prototype.write,
+	function( original_write )
+	{
+		function appendElement( parent, tagName, fullTag, text )
+		{
+			var node = parent.append( tagName ),
+				attrs = CKEDITOR.htmlParser.fragment.fromHtml( fullTag ).children[ 0 ].attributes;
+			attrs && node.setAttributes( attrs );
+			text && node.append( parent.getDocument().createText( text ) );
+		}
+
+		return function( html, mode )
+			{
+				// document.write() or document.writeln() fail silently after
+				// the page load event in Adobe AIR.
+				// DOM manipulation could be used instead.
+				if ( this.getBody() )
+				{
+					// We're taking the below extra work only because innerHTML
+					// on <html> element doesn't work as expected.
+					var doc = this,
+						head = this.getHead();
+
+					// Create style nodes for inline css. ( <style> content doesn't applied when setting via innerHTML )
+					html = html.replace( /(<style[^>]*>)([\s\S]*?)<\/style>/gi,
+						function ( match, startTag, styleText )
+						{
+							appendElement( head, 'style', startTag, styleText );
+							return '';
+						});
+
+					html = html.replace( /<base\b[^>]*\/>/i,
+						function( match )
+						{
+							appendElement( head, 'base', match );
+							return '';
+						});
+
+					html = html.replace( /<title>([\s\S]*)<\/title>/i,
+						function( match, title )
+						{
+							doc.$.title = title;
+							return '';
+						});
+
+					// Move the rest of head stuff.
+					html = html.replace( /<head>([\s\S]*)<\/head>/i,
+						function( headHtml )
+						{
+							// Inject the <head> HTML inside a <div>.
+							// Do that before getDocumentHead because WebKit moves
+							// <link css> elements to the <head> at this point.
+							var div = new CKEDITOR.dom.element( 'div', doc );
+							div.setHtml( headHtml );
+							// Move the <div> nodes to <head>.
+							div.moveChildren( head );
+							return '';
+						});
+
+					html.replace( /(<body[^>]*>)([\s\S]*)(?=$|<\/body>)/i,
+						function( match, startTag, innerHTML )
+						{
+							doc.getBody().setHtml( innerHTML );
+							var attrs = CKEDITOR.htmlParser.fragment.fromHtml( startTag ).children[ 0 ].attributes;
+							attrs && doc.getBody().setAttributes( attrs );
+						});
+				}
+				else
+					original_write.apply( this, arguments );
+			};
+	});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ajax/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/ajax/plugin.js
new file mode 100644
index 00000000..dbf0d33d
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ajax/plugin.js
@@ -0,0 +1,152 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the {@link CKEDITOR.ajax} object, which holds ajax methods for
+ *		data loading.
+ */
+
+(function()
+{
+	CKEDITOR.plugins.add( 'ajax',
+		{
+			requires : [ 'xml' ]
+		});
+
+	/**
+	 * Ajax methods for data loading.
+	 * @namespace
+	 * @example
+	 */
+	CKEDITOR.ajax = (function()
+	{
+		var createXMLHttpRequest = function()
+		{
+			// In IE, using the native XMLHttpRequest for local files may throw
+			// "Access is Denied" errors.
+			if ( !CKEDITOR.env.ie || location.protocol != 'file:' )
+				try { return new XMLHttpRequest(); } catch(e) {}
+
+			try { return new ActiveXObject( 'Msxml2.XMLHTTP' ); } catch (e) {}
+			try { return new ActiveXObject( 'Microsoft.XMLHTTP' ); } catch (e) {}
+
+			return null;
+		};
+
+		var checkStatus = function( xhr )
+		{
+			// HTTP Status Codes:
+			//	 2xx : Success
+			//	 304 : Not Modified
+			//	   0 : Returned when running locally (file://)
+			//	1223 : IE may change 204 to 1223 (see http://dev.jquery.com/ticket/1450)
+
+			return ( xhr.readyState == 4 &&
+					(	( xhr.status >= 200 && xhr.status < 300 ) ||
+						xhr.status == 304 ||
+						xhr.status === 0 ||
+						xhr.status == 1223 ) );
+		};
+
+		var getResponseText = function( xhr )
+		{
+			if ( checkStatus( xhr ) )
+				return xhr.responseText;
+			return null;
+		};
+
+		var getResponseXml = function( xhr )
+		{
+			if ( checkStatus( xhr ) )
+			{
+				var xml = xhr.responseXML;
+				return new CKEDITOR.xml( xml && xml.firstChild ? xml : xhr.responseText );
+			}
+			return null;
+		};
+
+		var load = function( url, callback, getResponseFn )
+		{
+			var async = !!callback;
+
+			var xhr = createXMLHttpRequest();
+
+			if ( !xhr )
+				return null;
+
+			xhr.open( 'GET', url, async );
+
+			if ( async )
+			{
+				// TODO: perform leak checks on this closure.
+				/** @ignore */
+				xhr.onreadystatechange = function()
+				{
+					if ( xhr.readyState == 4 )
+					{
+						callback( getResponseFn( xhr ) );
+						xhr = null;
+					}
+				};
+			}
+
+			xhr.send(null);
+
+			return async ? '' : getResponseFn( xhr );
+		};
+
+		return 	/** @lends CKEDITOR.ajax */ {
+
+			/**
+			 * Loads data from an URL as plain text.
+			 * @param {String} url The URL from which load data.
+			 * @param {Function} [callback] A callback function to be called on
+			 *		data load. If not provided, the data will be loaded
+			 *		synchronously.
+			 * @returns {String} The loaded data. For asynchronous requests, an
+			 *		empty string. For invalid requests, null.
+			 * @example
+			 * // Load data synchronously.
+			 * var data = CKEDITOR.ajax.load( 'somedata.txt' );
+			 * alert( data );
+			 * @example
+			 * // Load data asynchronously.
+			 * var data = CKEDITOR.ajax.load( 'somedata.txt', function( data )
+			 *     {
+			 *         alert( data );
+			 *     } );
+			 */
+			load : function( url, callback )
+			{
+				return load( url, callback, getResponseText );
+			},
+
+			/**
+			 * Loads data from an URL as XML.
+			 * @param {String} url The URL from which load data.
+			 * @param {Function} [callback] A callback function to be called on
+			 *		data load. If not provided, the data will be loaded
+			 *		synchronously.
+			 * @returns {CKEDITOR.xml} An XML object holding the loaded data. For asynchronous requests, an
+			 *		empty string. For invalid requests, null.
+			 * @example
+			 * // Load XML synchronously.
+			 * var xml = CKEDITOR.ajax.loadXml( 'somedata.xml' );
+			 * alert( xml.getInnerXml( '//' ) );
+			 * @example
+			 * // Load XML asynchronously.
+			 * var data = CKEDITOR.ajax.loadXml( 'somedata.xml', function( xml )
+			 *     {
+			 *         alert( xml.getInnerXml( '//' ) );
+			 *     } );
+			 */
+			loadXml : function( url, callback )
+			{
+				return load( url, callback, getResponseXml );
+			}
+		};
+	})();
+
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/autogrow/index.html b/upload/public/js/3rd_party/ckeditor/plugins/autogrow/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/autogrow/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/autogrow/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/autogrow/plugin.js
new file mode 100644
index 00000000..dd5a1fb8
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/autogrow/plugin.js
@@ -0,0 +1,141 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @file AutoGrow plugin
+ */
+(function(){
+
+	// Actual content height, figured out by appending check the last element's document position.
+	function contentHeight( scrollable )
+	{
+		var overflowY = scrollable.getStyle( 'overflow-y' );
+
+		var doc = scrollable.getDocument();
+		// Create a temporary marker element.
+		var marker = CKEDITOR.dom.element.createFromHtml( '<span style="margin:0;padding:0;border:0;clear:both;width:1px;height:1px;display:block;">' + ( CKEDITOR.env.webkit ? '&nbsp;' : '' ) + '</span>', doc );
+		doc[ CKEDITOR.env.ie? 'getBody' : 'getDocumentElement']().append( marker );
+
+		var height = marker.getDocumentPosition( doc ).y + marker.$.offsetHeight;
+		marker.remove();
+		scrollable.setStyle( 'overflow-y', overflowY );
+		return height;
+	}
+
+	var resizeEditor = function( editor )
+	{
+		if ( !editor.window )
+			return;
+
+		var doc = editor.document,
+			iframe = new CKEDITOR.dom.element( doc.getWindow().$.frameElement ),
+			body = doc.getBody(),
+			htmlElement = doc.getDocumentElement(),
+			currentHeight = editor.window.getViewPaneSize().height,
+			// Quirks mode overflows body, standards overflows document element
+			scrollable = doc.$.compatMode == 'BackCompat' ? body : htmlElement,
+			newHeight = contentHeight( scrollable );
+
+		// Additional space specified by user.
+		newHeight += ( editor.config.autoGrow_bottomSpace || 0 );
+
+		var min = editor.config.autoGrow_minHeight != undefined ? editor.config.autoGrow_minHeight : 200,
+			max = editor.config.autoGrow_maxHeight || Infinity;
+
+		newHeight = Math.max( newHeight, min );
+		newHeight = Math.min( newHeight, max );
+
+		if ( newHeight != currentHeight )
+		{
+			newHeight = editor.fire( 'autoGrow', { currentHeight : currentHeight, newHeight : newHeight } ).newHeight;
+			editor.resize( editor.container.getStyle( 'width' ), newHeight, true );
+		}
+
+		if ( scrollable.$.scrollHeight > scrollable.$.clientHeight && newHeight < max )
+			scrollable.setStyle( 'overflow-y', 'hidden' );
+		else
+			scrollable.removeStyle( 'overflow-y' );
+
+
+	};
+
+	CKEDITOR.plugins.add( 'autogrow',
+	{
+		init : function( editor )
+		{
+			editor.addCommand( 'autogrow', { exec : resizeEditor, modes : { wysiwyg:1 }, readOnly: 1, canUndo: false, editorFocus: false } );
+
+			var eventsList = { contentDom:1, key:1, selectionChange:1, insertElement:1 };
+			editor.config.autoGrow_onStartup && ( eventsList[ 'instanceReady' ] = 1 );
+			for ( var eventName in eventsList )
+			{
+				editor.on( eventName, function( evt )
+				{
+					var maximize = editor.getCommand( 'maximize' );
+					// Some time is required for insertHtml, and it gives other events better performance as well.
+					if ( evt.editor.mode == 'wysiwyg' &&
+						// Disable autogrow when the editor is maximized .(#6339)
+						( !maximize || maximize.state != CKEDITOR.TRISTATE_ON ) )
+					{
+						setTimeout( function()
+						{
+							resizeEditor( evt.editor );
+							// Second pass to make correction upon
+							// the first resize, e.g. scrollbar.
+							resizeEditor( evt.editor );
+						}, 100 );
+					}
+				});
+			}
+		}
+	});
+})();
+/**
+ * The minimum height that the editor can reach using the AutoGrow feature.
+ * @name CKEDITOR.config.autoGrow_minHeight
+ * @type Number
+ * @default <code>200</code>
+ * @since 3.4
+ * @example
+ * config.autoGrow_minHeight = 300;
+ */
+
+/**
+ * The maximum height that the editor can reach using the AutoGrow feature. Zero means unlimited.
+ * @name CKEDITOR.config.autoGrow_maxHeight
+ * @type Number
+ * @default <code>0</code>
+ * @since 3.4
+ * @example
+ * config.autoGrow_maxHeight = 400;
+ */
+
+ /**
+ * Whether to have the auto grow happen on editor creation.
+ * @name CKEDITOR.config.autoGrow_onStartup
+ * @type Boolean
+ * @default false
+ * @since 3.6.2
+ * @example
+ * config.autoGrow_onStartup = true;
+ */
+
+/**
+ * Fired when the AutoGrow plugin is about to change the size of the editor.
+ * @name CKEDITOR.editor#autogrow
+ * @event
+ * @param {Number} data.currentHeight The current height of the editor (before resizing).
+ * @param {Number} data.newHeight The new height of the editor (after resizing). It can be changed
+ *				to determine a different height value to be used instead.
+ */
+
+
+/**
+ *  Extra height in pixel to leave between the bottom boundary of content with document size when auto resizing.
+ * @name CKEDITOR.config.autoGrow_bottomSpace
+ * @type Number
+ * @default 0
+ * @since 3.6.2
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/bbcode/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/bbcode/plugin.js
new file mode 100644
index 00000000..51a09c14
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/bbcode/plugin.js
@@ -0,0 +1,943 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	CKEDITOR.on( 'dialogDefinition', function( ev )
+	{
+		var tab, name = ev.data.name,
+			definition = ev.data.definition;
+
+		if ( name == 'link' )
+		{
+			definition.removeContents( 'target' );
+			definition.removeContents( 'upload' );
+			definition.removeContents( 'advanced' );
+			tab = definition.getContents( 'info' );
+			tab.remove( 'emailSubject' );
+			tab.remove( 'emailBody' );
+		}
+		else if ( name == 'image' )
+		{
+			definition.removeContents( 'advanced' );
+			tab = definition.getContents( 'Link' );
+			tab.remove( 'cmbTarget' );
+			tab = definition.getContents( 'info' );
+			tab.remove( 'txtAlt' );
+			tab.remove( 'basic' );
+		}
+	});
+
+	var bbcodeMap = { 'b' : 'strong', 'u': 'u', 'i' : 'em', 'color' : 'span', 'size' : 'span', 'url' : 'a', 'email' : 'span', 'img' : 'span', '*' : 'li', 'list' : 'ol' },
+			convertMap = { 'strong' : 'b' , 'b' : 'b', 'u': 'u', 'em' : 'i', 'i': 'i', 'li' : '*' },
+			tagnameMap = { 'strong' : 'b', 'em' : 'i', 'u' : 'u', 'li' : '*', 'ul' : 'list', 'ol' : 'list', 'a' : 'link', 'img' : 'img' },
+			stylesMap = { 'color' : 'color', 'size' : 'font-size' },
+			attributesMap = { 'url' : 'href', 'email' : 'mailhref', 'list' : 'listType' };
+
+	// List of block-like tags.
+	var dtd =  CKEDITOR.dtd,
+		blockLikeTags = CKEDITOR.tools.extend( { table:1 }, dtd.$block, dtd.$listItem, dtd.$tableContent, dtd.$list );
+
+	var semicolonFixRegex = /\s*(?:;\s*|$)/;
+	function serializeStyleText( stylesObject )
+	{
+		var styleText = '';
+		for ( var style in stylesObject )
+		{
+			var styleVal = stylesObject[ style ],
+				text = ( style + ':' + styleVal ).replace( semicolonFixRegex, ';' );
+
+			styleText += text;
+		}
+		return styleText;
+	}
+
+	function parseStyleText( styleText )
+	{
+		var retval = {};
+		( styleText || '' )
+				.replace( /&quot;/g, '"' )
+				.replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, function( match, name, value )
+		{
+			retval[ name.toLowerCase() ] = value;
+		} );
+		return retval;
+	}
+
+	function RGBToHex( cssStyle )
+	{
+		return cssStyle.replace( /(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi, function( match, red, green, blue )
+			{
+				red = parseInt( red, 10 ).toString( 16 );
+				green = parseInt( green, 10 ).toString( 16 );
+				blue = parseInt( blue, 10 ).toString( 16 );
+				var color = [red, green, blue] ;
+
+				// Add padding zeros if the hex value is less than 0x10.
+				for ( var i = 0 ; i < color.length ; i++ )
+					color[i] = String( '0' + color[i] ).slice( -2 ) ;
+
+				return '#' + color.join( '' ) ;
+			 });
+	}
+
+	// Maintain the map of smiley-to-description.
+	var smileyMap = {"smiley":":)","sad":":(","wink":";)","laugh":":D","cheeky":":P","blush":":*)","surprise":":-o","indecision":":|","angry":">:(","angel":"o:)","cool":"8-)","devil":">:-)","crying":";(","kiss":":-*" },
+		smileyReverseMap = {},
+		smileyRegExp = [];
+
+	// Build regexp for the list of smiley text.
+	for ( var i in smileyMap )
+	{
+		smileyReverseMap[ smileyMap[ i ] ] = i;
+		smileyRegExp.push( smileyMap[ i ].replace( /\(|\)|\:|\/|\*|\-|\|/g, function( match ) { return '\\' + match; } ) );
+	}
+
+	smileyRegExp = new RegExp( smileyRegExp.join( '|' ), 'g' );
+
+	var decodeHtml = ( function ()
+	{
+		var regex = [],
+			entities =
+			{
+				nbsp	: '\u00A0',		// IE | FF
+				shy		: '\u00AD',		// IE
+				//gt		: '\u003E',		// IE | FF |   --   | Opera
+				//lt		: '\u003C'		// IE | FF | Safari | Opera
+			};
+
+		for ( var entity in entities )
+			regex.push( entity );
+
+		regex = new RegExp( '&(' + regex.join( '|' ) + ');', 'g' );
+
+		return function( html )
+		{
+			return html.replace( regex, function( match, entity )
+			{
+				return entities[ entity ];
+			});
+		};
+	})();
+
+	CKEDITOR.BBCodeParser = function()
+	{
+		this._ =
+		{
+			bbcPartsRegex : /(?:\[([^\/\]=]*?)(?:=([^\]]*?))?\])|(?:\[\/([a-z]{1,16})\])/ig
+		};
+	};
+
+	CKEDITOR.BBCodeParser.prototype =
+	{
+		parse : function( bbcode )
+		{
+			var parts,
+					part,
+					lastIndex = 0;
+
+			while ( ( parts = this._.bbcPartsRegex.exec( bbcode ) ) )
+			{
+				var tagIndex = parts.index;
+				if ( tagIndex > lastIndex )
+				{
+					var text = bbcode.substring( lastIndex, tagIndex );
+					this.onText( text, 1 );
+				}
+
+				lastIndex = this._.bbcPartsRegex.lastIndex;
+
+				/*
+				 "parts" is an array with the following items:
+				 0 : The entire match for opening/closing tags and line-break;
+				 1 : line-break;
+				 2 : open of tag excludes option;
+				 3 : tag option;
+				 4 : close of tag;
+				 */
+
+				part = ( parts[ 1 ] || parts[ 3 ] || '' ).toLowerCase();
+				// Unrecognized tags should be delivered as a simple text (#7860).
+				if ( part && !bbcodeMap[ part ] )
+				{
+					this.onText( parts[ 0 ] );
+					continue;
+				}
+
+				// Opening tag
+				if ( parts[ 1 ] )
+				{
+					var tagName = bbcodeMap[ part ],
+							attribs = {},
+							styles = {},
+							optionPart = parts[ 2 ];
+
+					if ( optionPart )
+					{
+						if ( part == 'list' )
+						{
+							if ( !isNaN( optionPart ) )
+								optionPart = 'decimal';
+							else if ( /^[a-z]+$/.test( optionPart ) )
+								optionPart = 'lower-alpha';
+							else if ( /^[A-Z]+$/.test( optionPart ) )
+								optionPart = 'upper-alpha';
+						}
+
+						if ( stylesMap[ part ] )
+						{
+							// Font size represents percentage.
+							if ( part == 'size' )
+								optionPart += '%';
+
+							styles[ stylesMap[ part ] ] = optionPart;
+							attribs.style = serializeStyleText( styles );
+						}
+						else if ( attributesMap[ part ] )
+							attribs[ attributesMap[ part ] ] = optionPart;
+					}
+
+					// Two special handling - image and email, protect them
+					// as "span" with an attribute marker.
+					if ( part == 'email' || part == 'img' )
+						attribs[ 'bbcode' ] = part;
+
+					this.onTagOpen( tagName, attribs, CKEDITOR.dtd.$empty[ tagName ] );
+				}
+				// Closing tag
+				else if ( parts[ 3 ] )
+					this.onTagClose( bbcodeMap[ part ] );
+			}
+
+			if ( bbcode.length > lastIndex )
+				this.onText( bbcode.substring( lastIndex, bbcode.length ), 1 );
+		}
+	};
+
+	/**
+	 * Creates a {@link CKEDITOR.htmlParser.fragment} from an HTML string.
+	 * @param {String} source The HTML to be parsed, filling the fragment.
+	 * @param {Number} [fixForBody=false] Wrap body with specified element if needed.
+	 * @returns CKEDITOR.htmlParser.fragment The fragment created.
+	 * @example
+	 * var fragment = CKEDITOR.htmlParser.fragment.fromHtml( '<b>Sample</b> Text' );
+	 * alert( fragment.children[0].name );  "b"
+	 * alert( fragment.children[1].value );  " Text"
+	 */
+	CKEDITOR.htmlParser.fragment.fromBBCode = function( source )
+	{
+		var parser = new CKEDITOR.BBCodeParser(),
+			fragment = new CKEDITOR.htmlParser.fragment(),
+			pendingInline = [],
+			pendingBrs = 0,
+			currentNode = fragment,
+			returnPoint;
+
+		function checkPending( newTagName )
+		{
+			if ( pendingInline.length > 0 )
+			{
+				for ( var i = 0 ; i < pendingInline.length ; i++ )
+				{
+					var pendingElement = pendingInline[ i ],
+						pendingName = pendingElement.name,
+						pendingDtd = CKEDITOR.dtd[ pendingName ],
+						currentDtd = currentNode.name && CKEDITOR.dtd[ currentNode.name ];
+
+					if ( ( !currentDtd || currentDtd[ pendingName ] ) && ( !newTagName || !pendingDtd || pendingDtd[ newTagName ] || !CKEDITOR.dtd[ newTagName ] ) )
+					{
+						// Get a clone for the pending element.
+						pendingElement = pendingElement.clone();
+
+						// Add it to the current node and make it the current,
+						// so the new element will be added inside of it.
+						pendingElement.parent = currentNode;
+						currentNode = pendingElement;
+
+						// Remove the pending element (back the index by one
+						// to properly process the next entry).
+						pendingInline.splice( i, 1 );
+						i--;
+					}
+				}
+			}
+		}
+
+		function checkPendingBrs( tagName, closing )
+		{
+			var len = currentNode.children.length,
+				previous = len > 0 && currentNode.children[ len - 1 ],
+				lineBreakParent = !previous && BBCodeWriter.getRule( tagnameMap[ currentNode.name ], 'breakAfterOpen' ),
+				lineBreakPrevious = previous && previous.type == CKEDITOR.NODE_ELEMENT && BBCodeWriter.getRule( tagnameMap[ previous.name ], 'breakAfterClose' ),
+				lineBreakCurrent = tagName && BBCodeWriter.getRule( tagnameMap[ tagName ], closing ? 'breakBeforeClose' : 'breakBeforeOpen' );
+
+			if ( pendingBrs && ( lineBreakParent || lineBreakPrevious || lineBreakCurrent ) )
+				pendingBrs--;
+
+			// 1. Either we're at the end of block, where it requires us to compensate the br filler
+			// removing logic (from htmldataprocessor).
+			// 2. Or we're at the end of pseudo block, where it requires us to compensate
+			// the bogus br effect.
+			if ( pendingBrs && tagName in blockLikeTags )
+				pendingBrs++;
+
+			while ( pendingBrs && pendingBrs-- )
+				currentNode.children.push( previous = new CKEDITOR.htmlParser.element( 'br' ) );
+		}
+
+		function addElement( node, target )
+		{
+			checkPendingBrs( node.name, 1 );
+
+			target = target || currentNode || fragment;
+
+			var len = target.children.length,
+				previous = len > 0 && target.children[ len - 1 ] || null;
+
+			node.previous = previous;
+			node.parent = target;
+
+			target.children.push( node );
+
+			if ( node.returnPoint )
+			{
+				currentNode = node.returnPoint;
+				delete node.returnPoint;
+			}
+		}
+
+		parser.onTagOpen = function( tagName, attributes, selfClosing )
+		{
+			var element = new CKEDITOR.htmlParser.element( tagName, attributes );
+
+			// This is a tag to be removed if empty, so do not add it immediately.
+			if ( CKEDITOR.dtd.$removeEmpty[ tagName ] )
+			{
+				pendingInline.push( element );
+				return;
+			}
+
+			var currentName = currentNode.name;
+
+			var currentDtd = currentName
+				&& ( CKEDITOR.dtd[ currentName ]
+					|| ( currentNode._.isBlockLike ? CKEDITOR.dtd.div : CKEDITOR.dtd.span ) );
+
+			// If the element cannot be child of the current element.
+			if ( currentDtd && !currentDtd[ tagName ] )
+			{
+				var reApply = false,
+					addPoint;   // New position to start adding nodes.
+
+				// If the element name is the same as the current element name,
+				// then just close the current one and append the new one to the
+				// parent. This situation usually happens with <p>, <li>, <dt> and
+				// <dd>, specially in IE. Do not enter in this if block in this case.
+				if ( tagName == currentName )
+					addElement( currentNode, currentNode.parent );
+				else if ( tagName in CKEDITOR.dtd.$listItem )
+				{
+					parser.onTagOpen( 'ul', {} );
+					addPoint = currentNode;
+					reApply = true;
+				}
+				else
+				{
+					addElement( currentNode, currentNode.parent );
+
+					// The current element is an inline element, which
+					// cannot hold the new one. Put it in the pending list,
+					// and try adding the new one after it.
+					pendingInline.unshift( currentNode );
+					reApply = true;
+				}
+
+				if ( addPoint )
+					currentNode = addPoint;
+				// Try adding it to the return point, or the parent element.
+				else
+					currentNode = currentNode.returnPoint || currentNode.parent;
+
+				if ( reApply )
+				{
+					parser.onTagOpen.apply( this, arguments );
+					return;
+				}
+			}
+
+			checkPending( tagName );
+			checkPendingBrs( tagName );
+
+			element.parent = currentNode;
+			element.returnPoint = returnPoint;
+			returnPoint = 0;
+
+			if ( element.isEmpty )
+				addElement( element );
+			else
+				currentNode = element;
+		};
+
+		parser.onTagClose = function( tagName )
+		{
+			// Check if there is any pending tag to be closed.
+			for ( var i = pendingInline.length - 1 ; i >= 0 ; i-- )
+			{
+				// If found, just remove it from the list.
+				if ( tagName == pendingInline[ i ].name )
+				{
+					pendingInline.splice( i, 1 );
+					return;
+				}
+			}
+
+			var pendingAdd = [],
+				newPendingInline = [],
+				candidate = currentNode;
+
+			while ( candidate.type && candidate.name != tagName )
+			{
+				// If this is an inline element, add it to the pending list, if we're
+				// really closing one of the parents element later, they will continue
+				// after it.
+				if ( !candidate._.isBlockLike )
+					newPendingInline.unshift( candidate );
+
+				// This node should be added to it's parent at this point. But,
+				// it should happen only if the closing tag is really closing
+				// one of the nodes. So, for now, we just cache it.
+				pendingAdd.push( candidate );
+
+				candidate = candidate.parent;
+			}
+
+			if ( candidate.type )
+			{
+				// Add all elements that have been found in the above loop.
+				for ( i = 0 ; i < pendingAdd.length ; i++ )
+				{
+					var node = pendingAdd[ i ];
+					addElement( node, node.parent );
+				}
+
+				currentNode = candidate;
+
+
+				addElement( candidate, candidate.parent );
+
+				// The parent should start receiving new nodes now, except if
+				// addElement changed the currentNode.
+				if ( candidate == currentNode )
+					currentNode = currentNode.parent;
+
+				pendingInline = pendingInline.concat( newPendingInline );
+			}
+		};
+
+		parser.onText = function( text )
+		{
+			var currentDtd = CKEDITOR.dtd[ currentNode.name ];
+			if ( !currentDtd || currentDtd[ '#' ] )
+			{
+				checkPendingBrs();
+				checkPending();
+
+				text.replace(/([\r\n])|[^\r\n]*/g, function( piece, lineBreak )
+				{
+					if ( lineBreak !== undefined && lineBreak.length )
+						pendingBrs++;
+					else if ( piece.length )
+					{
+						var lastIndex = 0;
+
+						// Create smiley from text emotion.
+						piece.replace( smileyRegExp, function( match, index )
+						{
+							addElement( new CKEDITOR.htmlParser.text( piece.substring( lastIndex, index ) ), currentNode );
+							addElement( new CKEDITOR.htmlParser.element( 'smiley', { 'desc': smileyReverseMap[ match ] } ), currentNode );
+							lastIndex = index + match.length;
+						});
+
+						if ( lastIndex != piece.length )
+							addElement( new CKEDITOR.htmlParser.text( piece.substring( lastIndex, piece.length ) ), currentNode );
+					}
+				});
+			}
+		};
+
+		// Parse it.
+		parser.parse( CKEDITOR.tools.htmlEncode( source ) );
+
+		// Close all hanging nodes.
+		while ( currentNode.type )
+		{
+			var parent = currentNode.parent,
+				node = currentNode;
+
+			addElement( node, parent );
+			currentNode = parent;
+		}
+
+		return fragment;
+	};
+
+	CKEDITOR.htmlParser.BBCodeWriter = CKEDITOR.tools.createClass(
+	{
+		$ : function()
+		{
+			this._ =
+			{
+				output : [],
+				rules : []
+			};
+
+			// List and list item.
+			this.setRules( 'list',
+		   {
+			   breakBeforeOpen : 1,
+			   breakAfterOpen : 1,
+			   breakBeforeClose : 1,
+			   breakAfterClose : 1
+		   } );
+
+			this.setRules( '*',
+		   {
+			   breakBeforeOpen : 1,
+			   breakAfterOpen : 0,
+			   breakBeforeClose : 1,
+			   breakAfterClose : 0
+		   } );
+
+			this.setRules( 'quote',
+		   {
+			   breakBeforeOpen : 1,
+			   breakAfterOpen : 0,
+			   breakBeforeClose : 0,
+			   breakAfterClose : 1
+		   } );
+		},
+
+		proto :
+		{
+			/**
+			 * Sets formatting rules for a given tag. The possible rules are:
+			 * <ul>
+			 *	<li><b>breakBeforeOpen</b>: break line before the opener tag for this element.</li>
+			 *	<li><b>breakAfterOpen</b>: break line after the opener tag for this element.</li>
+			 *	<li><b>breakBeforeClose</b>: break line before the closer tag for this element.</li>
+			 *	<li><b>breakAfterClose</b>: break line after the closer tag for this element.</li>
+			 * </ul>
+			 *
+			 * All rules default to "false". Each call to the function overrides
+			 * already present rules, leaving the undefined untouched.
+			 *
+			 * @param {String} tagName The tag name to which set the rules.
+			 * @param {Object} rules An object containing the element rules.
+			 * @example
+			 * // Break line before and after "img" tags.
+			 * writer.setRules( 'list',
+			 *     {
+			 *         breakBeforeOpen : true
+			 *         breakAfterOpen : true
+			 *     });
+			 */
+			setRules : function( tagName, rules )
+			{
+				var currentRules = this._.rules[ tagName ];
+
+				if ( currentRules )
+					CKEDITOR.tools.extend( currentRules, rules, true );
+				else
+					this._.rules[ tagName ] = rules;
+			},
+
+			getRule : function( tagName, ruleName )
+			{
+				return this._.rules[ tagName ] && this._.rules[ tagName ][ ruleName ];
+			},
+
+			openTag : function( tag, attributes )
+			{
+				if ( tag in bbcodeMap )
+				{
+					if ( this.getRule( tag, 'breakBeforeOpen' ) )
+						this.lineBreak( 1 );
+
+					this.write( '[', tag );
+					var option = attributes.option;
+					option && this.write( '=', option );
+					this.write( ']' );
+
+					if ( this.getRule( tag, 'breakAfterOpen' ) )
+						this.lineBreak( 1 );
+				}
+				else if ( tag == 'br' )
+					this._.output.push( '\n' );
+			},
+
+			openTagClose : function() { },
+			attribute : function() { },
+
+			closeTag : function( tag )
+			{
+				if ( tag == 'div' )
+				{
+					this._.output.push( '\n' );
+				}
+				
+				if ( tag in bbcodeMap )
+				{
+					if ( this.getRule( tag, 'breakBeforeClose' ) )
+						this.lineBreak( 1 );
+
+					tag != '*' && this.write( '[/', tag, ']' );
+
+					if ( this.getRule( tag, 'breakAfterClose' ) )
+						this.lineBreak( 1 );
+				}
+			},
+
+			text : function( text )
+			{
+				this.write( text );
+			},
+
+			/**
+			 * Writes a comment.
+			 * @param {String} comment The comment text.
+			 * @example
+			 * // Writes "&lt;!-- My comment --&gt;".
+			 * writer.comment( ' My comment ' );
+			 */
+			comment : function() {},
+
+			/*
+			* Output line-break for formatting.
+			 */
+			lineBreak : function()
+			{
+				// Avoid line break when:
+				// 1) Previous tag already put one.
+				// 2) We're at output start.
+				if ( !this._.hasLineBreak && this._.output.length )
+				{
+					this.write( '\n' );
+					this._.hasLineBreak = 1;
+				}
+			},
+
+			write : function()
+			{
+				this._.hasLineBreak = 0;
+				var data = Array.prototype.join.call( arguments, '' );
+				this._.output.push( data );
+			},
+
+			reset : function()
+			{
+				this._.output = [];
+				this._.hasLineBreak = 0;
+			},
+
+			getHtml : function( reset )
+			{
+				var bbcode = this._.output.join( '' );
+
+				if ( reset )
+					this.reset();
+				
+				return decodeHtml ( bbcode );
+			}
+		}
+	});
+
+	var BBCodeWriter = new CKEDITOR.htmlParser.BBCodeWriter();
+
+	CKEDITOR.plugins.add( 'bbcode',
+	  {
+		  requires : [ 'htmldataprocessor', 'entities' ],
+		  beforeInit : function( editor )
+		  {
+			  // Adapt some critical editor configuration for better support
+			  // of BBCode environment.
+			  var config = editor.config;
+			  CKEDITOR.tools.extend( config,
+			  {
+				  enterMode : CKEDITOR.ENTER_BR,
+				  basicEntities: false,
+				  entities : false,
+				  fillEmptyBlocks : false
+			  }, true );
+		  },
+		  init : function( editor )
+		  {
+			  var config = editor.config;
+
+			  function BBCodeToHtml( code )
+			  {
+				  var fragment = CKEDITOR.htmlParser.fragment.fromBBCode( code ),
+						  writer = new CKEDITOR.htmlParser.basicWriter();
+
+				  fragment.writeHtml( writer, dataFilter );
+				  return writer.getHtml( true );
+			  }
+
+			  var dataFilter = new CKEDITOR.htmlParser.filter();
+			  dataFilter.addRules(
+			  {
+				  elements :
+				  {
+					  'blockquote' : function( element )
+					  {
+						  var quoted = new CKEDITOR.htmlParser.element( 'div' );
+						  quoted.children = element.children;
+						  element.children = [ quoted ];
+						  var citeText = element.attributes.cite;
+						  if ( citeText )
+						  {
+							  var cite = new CKEDITOR.htmlParser.element( 'cite' );
+							  cite.add( new CKEDITOR.htmlParser.text( citeText.replace( /^"|"$/g, '' ) ) );
+							  delete element.attributes.cite;
+							  element.children.unshift( cite );
+						  }
+					  },
+					  'span' : function( element )
+					  {
+						  var bbcode;
+						  if ( ( bbcode = element.attributes.bbcode ) )
+						  {
+							  if ( bbcode == 'img' )
+							  {
+								  element.name = 'img';
+								  element.attributes.src = element.children[ 0 ].value;
+								  element.children = [];
+							  }
+							  else if ( bbcode == 'email' )
+							  {
+								  element.name = 'a';
+								  element.attributes.href = 'mailto:' + element.children[ 0 ].value;
+							  }
+
+							  delete element.attributes.bbcode;
+						  }
+					  },
+					  'ol' : function ( element )
+					  {
+						  if ( element.attributes.listType )
+						  {
+							  if ( element.attributes.listType != 'decimal' )
+								  element.attributes.style = 'list-style-type:' + element.attributes.listType;
+						  }
+						  else
+							  element.name = 'ul';
+
+						  delete element.attributes.listType;
+					  },
+					  a : function( element )
+					  {
+					  
+						  if ( !element.attributes.href )
+							  element.attributes.href = element.children[ 0 ].value;
+					  },
+					  'smiley' : function( element )
+					  {
+							element.name = 'img';
+
+							var description = element.attributes.desc,
+								image = config.smiley_images[ CKEDITOR.tools.indexOf( config.smiley_descriptions, description ) ],
+								src = CKEDITOR.tools.htmlEncode( config.smiley_path + image );
+
+						  element.attributes =
+						  {
+							  src : src,
+							  'data-cke-saved-src' : src,
+							  title :  description,
+							  alt : description
+						  };
+					  }
+				  }
+			  } );
+
+			  editor.dataProcessor.htmlFilter.addRules(
+			  {
+				elements :
+				{
+					$ : function( element )
+					{
+						var attributes = element.attributes,
+								style = parseStyleText( attributes.style ),
+								value;
+
+						var tagName = element.name;
+						if ( tagName in convertMap )
+							tagName = convertMap[ tagName ];
+						else if ( tagName == 'span' )
+						{
+							if ( ( value = style.color ) )
+							{
+								tagName = 'color';
+								value = RGBToHex( value );
+							}
+							else if ( ( value = style[ 'font-size' ] ) )
+							{
+								var percentValue = value.match( /(\d+)%$/ );
+								if ( percentValue )
+								{
+									value = percentValue[ 1 ];
+									tagName = 'size';
+								}
+							}
+						}
+						else if ( tagName == 'ol' || tagName == 'ul' )
+						{
+							if ( ( value = style[ 'list-style-type'] ) )
+							{
+								switch ( value )
+								{
+									case 'lower-alpha':
+										value = 'a';
+										break;
+									case 'upper-alpha':
+										value = 'A';
+										break;
+								}
+							}
+							else if ( tagName == 'ol' )
+								value = 1;
+
+							tagName = 'list';
+						}
+						else if ( tagName == 'blockquote' )
+						{
+							try
+							{
+								var cite = element.children[ 0 ],
+										quoted = element.children[ 1 ],
+										citeText = cite.name == 'cite' && cite.children[ 0 ].value;
+
+								if ( citeText )
+								{
+									value = '"' + citeText + '"';
+									element.children = quoted.children;
+								}
+
+							}
+							catch( er )
+							{
+							}
+
+							tagName = 'quote';
+						}
+						else if ( tagName == 'a' )
+						{
+							if ( ( value = attributes.href ) )
+							{
+								if ( value.indexOf( 'mailto:' ) !== -1 )
+								{
+									tagName = 'email';
+									// [email] should have a single text child with email address.
+									element.children = [ new CKEDITOR.htmlParser.text( value.replace( 'mailto:', '' ) ) ];
+									value = '';
+								}
+								else
+								{
+									value = value.replace( /&quot;/g, '' );
+									value = value.replace( /"/g, '' );
+									value = value.replace( /&#39;/g, '' );
+									value = value.replace( /'/g, '' );
+									
+									var singleton = element.children.length == 1 && element.children[ 0 ];
+									
+									if ( singleton
+											&& singleton.type == CKEDITOR.NODE_TEXT
+											&& singleton.value == value )
+										value = '';
+
+									tagName = 'url';
+								}
+							}
+						}
+						else if ( tagName == 'img' )
+						{
+							element.isEmpty = 0;
+
+							// Translate smiley (image) to text emotion.
+							var src = attributes[ 'data-cke-saved-src' ];
+							if ( src && src.indexOf( editor.config.smiley_path ) != -1 )
+								return new CKEDITOR.htmlParser.text( smileyMap[ attributes.alt ] );
+							else
+								element.children = [ new CKEDITOR.htmlParser.text( src ) ];
+						}
+
+						element.name = tagName;
+						value && ( element.attributes.option = value );
+
+						return null;
+					},
+
+					// Remove any bogus br from the end of a pseudo block,
+					// e.g. <div>some text<br /><p>paragraph</p></div>
+					br : function( element )
+					{
+						var next = element.next;
+						if ( next && next.name in blockLikeTags )
+							return false;
+					}
+				}
+			  }, 1 );
+
+			  editor.dataProcessor.writer = BBCodeWriter;
+
+			  editor.on( 'beforeSetMode', function( evt )
+			  {
+				  evt.removeListener();
+				  var wysiwyg = editor._.modes[ 'wysiwyg' ];
+				  wysiwyg.loadData = CKEDITOR.tools.override( wysiwyg.loadData, function( org )
+				  {
+					  return function( data )
+					  {
+						  return ( org.call( this, BBCodeToHtml( data ) ) );
+					  };
+				  } );
+			  } );
+		  },
+
+		  afterInit : function( editor )
+		  {
+			  var filters;
+			  if ( editor._.elementsPath  )
+			  {
+				  // Eliminate irrelevant elements from displaying, e.g body and p.
+				  if ( ( filters = editor._.elementsPath.filters ) )
+					filters.push( function( element )
+						{
+							var htmlName = element.getName(),
+								name = tagnameMap[ htmlName ] || false;
+
+							// Specialized anchor presents as email.
+							if ( name == 'link' && element.getAttribute( 'href' ).indexOf( 'mailto:' ) === 0 )
+								name = 'email';
+							// Styled span could be either size or color.
+							else if ( htmlName == 'span' )
+							{
+								if ( element.getStyle( 'font-size' ) )
+									name = 'size';
+								else if ( element.getStyle( 'color' ) )
+									name = 'color';
+							}
+							else if ( name == 'img' )
+							{
+								var src = element.data( 'cke-saved-src' );
+								if ( src && src.indexOf( editor.config.smiley_path ) === 0 )
+									name = 'smiley';
+							}
+
+							return name;
+						});
+			  }
+		  }
+	  } );
+
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/paste.js b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/paste.js
new file mode 100644
index 00000000..f591f9aa
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -0,0 +1,223 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'paste', function( editor )
+{
+	var lang = editor.lang.clipboard;
+	var isCustomDomain = CKEDITOR.env.isCustomDomain();
+
+	function onPasteFrameLoad( win )
+	{
+		var doc = new CKEDITOR.dom.document( win.document ),
+			docElement = doc.$;
+
+		var script = doc.getById( 'cke_actscrpt' );
+		script && script.remove();
+
+		CKEDITOR.env.ie ?
+			docElement.body.contentEditable = "true" :
+			docElement.designMode = "on";
+
+		// IE before version 8 will leave cursor blinking inside the document after
+		// editor blurred unless we clean up the selection. (#4716)
+		if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
+		{
+			doc.getWindow().on( 'blur', function()
+			{
+				docElement.selection.empty();
+			} );
+		}
+
+		doc.on( "keydown", function( e )
+		{
+			var domEvent = e.data,
+				key = domEvent.getKeystroke(),
+				processed;
+
+			switch( key )
+			{
+				case 27 :
+					this.hide();
+					processed = 1;
+					break;
+
+				case 9 :
+				case CKEDITOR.SHIFT + 9 :
+					this.changeFocus( true );
+					processed = 1;
+			}
+
+			processed && domEvent.preventDefault();
+		}, this );
+
+		editor.fire( 'ariaWidget', new CKEDITOR.dom.element( win.frameElement ) );
+	}
+
+	return {
+		title : lang.title,
+
+		minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 370 : 350,
+		minHeight : CKEDITOR.env.quirks ? 250 : 245,
+		onShow : function()
+		{
+			// FIREFOX BUG: Force the browser to render the dialog to make the to-be-
+			// inserted iframe editable. (#3366)
+			this.parts.dialog.$.offsetHeight;
+
+			this.setupContent();
+		},
+
+		onHide : function()
+		{
+			if ( CKEDITOR.env.ie )
+				this.getParentEditor().document.getBody().$.contentEditable = 'true';
+		},
+
+		onLoad : function()
+		{
+			if ( ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) && editor.lang.dir == 'rtl' )
+				this.parts.contents.setStyle( 'overflow', 'hidden' );
+		},
+
+		onOk : function()
+		{
+			this.commitContent();
+		},
+
+		contents : [
+			{
+				id : 'general',
+				label : editor.lang.common.generalTab,
+				elements : [
+					{
+						type : 'html',
+						id : 'securityMsg',
+						html : '<div style="white-space:normal;width:340px;">' + lang.securityMsg + '</div>'
+					},
+					{
+						type : 'html',
+						id : 'pasteMsg',
+						html : '<div style="white-space:normal;width:340px;">'+lang.pasteMsg +'</div>'
+					},
+					{
+						type : 'html',
+						id : 'editing_area',
+						style : 'width: 100%; height: 100%;',
+						html : '',
+						focus : function()
+						{
+							var win = this.getInputElement().$.contentWindow;
+
+							// #3291 : JAWS needs the 500ms delay to detect that the editor iframe
+							// iframe is no longer editable. So that it will put the focus into the
+							// Paste from Word dialog's editable area instead.
+							setTimeout( function()
+							{
+								win.focus();
+							}, 500 );
+						},
+						setup : function()
+						{
+							var dialog = this.getDialog();
+							var htmlToLoad =
+								'<html dir="' + editor.config.contentsLangDirection + '"' +
+								' lang="' + ( editor.config.contentsLanguage || editor.langCode ) + '">' +
+								'<head><style>body { margin: 3px; height: 95%; } </style></head><body>' +
+								'<script id="cke_actscrpt" type="text/javascript">' +
+								'window.parent.CKEDITOR.tools.callFunction( ' + CKEDITOR.tools.addFunction( onPasteFrameLoad, dialog ) + ', this );' +
+								'</script></body>' +
+								'</html>';
+
+							var src =
+								CKEDITOR.env.air ?
+									'javascript:void(0)' :
+								isCustomDomain ?
+									'javascript:void((function(){' +
+										'document.open();' +
+										'document.domain=\'' + document.domain + '\';' +
+										'document.close();' +
+									'})())"'
+								:
+									'';
+
+							var iframe = CKEDITOR.dom.element.createFromHtml(
+								'<iframe' +
+									' class="cke_pasteframe"' +
+									' frameborder="0" ' +
+									' allowTransparency="true"' +
+									' src="' + src + '"' +
+									' role="region"' +
+									' aria-label="' + lang.pasteArea + '"' +
+									' aria-describedby="' + dialog.getContentElement( 'general', 'pasteMsg' ).domId + '"' +
+									' aria-multiple="true"' +
+									'></iframe>' );
+
+							iframe.on( 'load', function( e )
+							{
+								e.removeListener();
+
+								var doc = iframe.getFrameDocument();
+								doc.write( htmlToLoad );
+
+								if ( CKEDITOR.env.air )
+									onPasteFrameLoad.call( this, doc.getWindow().$ );
+							}, dialog );
+
+							iframe.setCustomData( 'dialog', dialog );
+
+							var container = this.getElement();
+							container.setHtml( '' );
+							container.append( iframe );
+
+							// IE need a redirect on focus to make
+							// the cursor blinking inside iframe. (#5461)
+							if ( CKEDITOR.env.ie )
+							{
+								var focusGrabber = CKEDITOR.dom.element.createFromHtml( '<span tabindex="-1" style="position:absolute;" role="presentation"></span>' );
+								focusGrabber.on( 'focus', function()
+								{
+									iframe.$.contentWindow.focus();
+								});
+								container.append( focusGrabber );
+
+								// Override focus handler on field.
+								this.focus = function()
+								{
+									focusGrabber.focus();
+									this.fire( 'focus' );
+								};
+							}
+
+							this.getInputElement = function(){ return iframe; };
+
+							// Force container to scale in IE.
+							if ( CKEDITOR.env.ie )
+							{
+								container.setStyle( 'display', 'block' );
+								container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' );
+							}
+						},
+						commit : function( data )
+						{
+							var container = this.getElement(),
+								editor = this.getDialog().getParentEditor(),
+								body = this.getInputElement().getFrameDocument().getBody(),
+								bogus = body.getBogus(),
+								html;
+							bogus && bogus.remove();
+
+							// Saving the contents so changes until paste is complete will not take place (#7500)
+							html = body.getHtml();
+
+							setTimeout( function(){
+								editor.fire( 'paste', { 'html' : html } );
+							}, 0 );
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/clipboard/index.html b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/clipboard/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/colordialog.js b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/colordialog.js
new file mode 100644
index 00000000..0fbb82d7
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -0,0 +1,340 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'colordialog', function( editor )
+	{
+		// Define some shorthands.
+		var $el = CKEDITOR.dom.element,
+			$doc = CKEDITOR.document,
+			$tools = CKEDITOR.tools,
+			lang = editor.lang.colordialog;
+
+		// Reference the dialog.
+		var dialog;
+
+		var spacer =
+		{
+			type : 'html',
+			html : '&nbsp;'
+		};
+
+		function clearSelected()
+		{
+			$doc.getById( selHiColorId ).removeStyle( 'background-color' );
+			dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' );
+		}
+
+		function updateSelected( evt )
+		{
+			if ( ! ( evt instanceof CKEDITOR.dom.event ) )
+				evt = new CKEDITOR.dom.event( evt );
+
+			var target = evt.getTarget(),
+				color;
+
+			if ( target.getName() == 'a' && ( color = target.getChild( 0 ).getHtml() ) )
+				dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color );
+		}
+
+		function updateHighlight( event )
+		{
+			if ( ! ( event instanceof CKEDITOR.dom.event ) )
+				event = event.data;
+
+			var target = event.getTarget(),
+					color;
+
+			if ( target.getName() == 'a' && ( color = target.getChild( 0 ).getHtml() ) )
+			{
+				$doc.getById( hicolorId ).setStyle( 'background-color', color );
+				$doc.getById( hicolorTextId ).setHtml( color );
+			}
+		}
+
+		function clearHighlight()
+		{
+			$doc.getById( hicolorId ).removeStyle( 'background-color' );
+			$doc.getById( hicolorTextId ).setHtml( '&nbsp;' );
+		}
+
+		var onMouseout = $tools.addFunction( clearHighlight ),
+			onClick = updateSelected,
+			onClickHandler = CKEDITOR.tools.addFunction( onClick ),
+			onFocus = updateHighlight,
+			onBlur = clearHighlight;
+
+		var onKeydownHandler = CKEDITOR.tools.addFunction( function( ev )
+		{
+			ev = new CKEDITOR.dom.event( ev );
+			var element = ev.getTarget();
+			var relative, nodeToMove;
+			var keystroke = ev.getKeystroke(),
+				rtl = editor.lang.dir == 'rtl';
+
+			switch ( keystroke )
+			{
+				// UP-ARROW
+				case 38 :
+					// relative is TR
+					if ( ( relative = element.getParent().getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getChild( [element.getParent().getIndex(), 0] );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+					}
+					ev.preventDefault();
+					break;
+				// DOWN-ARROW
+				case 40 :
+					// relative is TR
+					if ( ( relative = element.getParent().getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( [ element.getParent().getIndex(), 0 ] );
+						if ( nodeToMove && nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+						}
+					}
+					ev.preventDefault();
+					break;
+				// SPACE
+				// ENTER is already handled as onClick
+				case 32 :
+					onClick( ev );
+					ev.preventDefault();
+					break;
+
+				// RIGHT-ARROW
+				case rtl ? 37 : 39 :
+					// relative is TD
+					if ( ( relative = element.getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( 0 );
+						if ( nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+							ev.preventDefault( true );
+						}
+						else
+							onBlur( null, element );
+					}
+					// relative is TR
+					else if ( ( relative = element.getParent().getParent().getNext() ) )
+					{
+						nodeToMove = relative.getChild( [ 0, 0 ] );
+						if ( nodeToMove && nodeToMove.type == 1 )
+						{
+							nodeToMove.focus();
+							onBlur( ev, element );
+							onFocus( ev, nodeToMove );
+							ev.preventDefault( true );
+						}
+						else
+							onBlur( null, element );
+					}
+					break;
+
+				// LEFT-ARROW
+				case rtl ? 39 : 37 :
+					// relative is TD
+					if ( ( relative = element.getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getChild( 0 );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+						ev.preventDefault( true );
+					}
+					// relative is TR
+					else if ( ( relative = element.getParent().getParent().getPrevious() ) )
+					{
+						nodeToMove = relative.getLast().getChild( 0 );
+						nodeToMove.focus();
+						onBlur( ev, element );
+						onFocus( ev, nodeToMove );
+						ev.preventDefault( true );
+					}
+					else
+						onBlur( null, element );
+					break;
+				default :
+					// Do not stop not handled events.
+					return;
+			}
+		});
+
+		function createColorTable()
+		{
+			// Create the base colors array.
+			var aColors = [ '00', '33', '66', '99', 'cc', 'ff' ];
+
+			// This function combines two ranges of three values from the color array into a row.
+			function appendColorRow( rangeA, rangeB )
+			{
+				for ( var i = rangeA ; i < rangeA + 3 ; i++ )
+				{
+					var row = table.$.insertRow( -1 );
+
+					for ( var j = rangeB ; j < rangeB + 3 ; j++ )
+					{
+						for ( var n = 0 ; n < 6 ; n++ )
+						{
+							appendColorCell( row, '#' + aColors[j] + aColors[n] + aColors[i] );
+						}
+					}
+				}
+			}
+
+			// This function create a single color cell in the color table.
+			function appendColorCell( targetRow, color )
+			{
+				var cell = new $el( targetRow.insertCell( -1 ) );
+				cell.setAttribute( 'class', 'ColorCell' );
+				cell.setStyle( 'background-color', color );
+
+				cell.setStyle( 'width', '15px' );
+				cell.setStyle( 'height', '15px' );
+
+				var index = cell.$.cellIndex + 1 + 18 * targetRow.rowIndex;
+				cell.append( CKEDITOR.dom.element.createFromHtml(
+						'<a href="javascript: void(0);" role="option"' +
+						' aria-posinset="' + index + '"' +
+						' aria-setsize="' + 13 * 18 + '"' +
+						' style="cursor: pointer;display:block;width:100%;height:100% " title="'+ CKEDITOR.tools.htmlEncode( color )+ '"' +
+						' onkeydown="CKEDITOR.tools.callFunction( ' + onKeydownHandler + ', event, this )"' +
+						' onclick="CKEDITOR.tools.callFunction(' + onClickHandler + ', event, this ); return false;"' +
+						' tabindex="-1"><span class="cke_voice_label">' + color + '</span>&nbsp;</a>', CKEDITOR.document ) );
+			}
+
+			appendColorRow( 0, 0 );
+			appendColorRow( 3, 0 );
+			appendColorRow( 0, 3 );
+			appendColorRow( 3, 3 );
+
+			// Create the last row.
+			var oRow = table.$.insertRow(-1) ;
+
+			// Create the gray scale colors cells.
+			for ( var n = 0 ; n < 6 ; n++ )
+			{
+				appendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ;
+			}
+
+			// Fill the row with black cells.
+			for ( var i = 0 ; i < 12 ; i++ )
+			{
+				appendColorCell( oRow, '#000000' ) ;
+			}
+		}
+
+		var table = new $el( 'table' );
+		createColorTable();
+		var html = table.getHtml();
+
+		var numbering = function( id )
+			{
+				return CKEDITOR.tools.getNextId() + '_' + id;
+			},
+			hicolorId = numbering( 'hicolor' ),
+			hicolorTextId = numbering( 'hicolortext' ),
+			selHiColorId = numbering( 'selhicolor' ),
+			tableLabelId = numbering( 'color_table_label' );
+
+		return {
+			title : lang.title,
+			minWidth : 360,
+			minHeight : 220,
+			onLoad : function()
+			{
+				// Update reference.
+				dialog = this;
+			},
+			contents : [
+				{
+					id : 'picker',
+					label : lang.title,
+					accessKey : 'I',
+					elements :
+					[
+						{
+							type : 'hbox',
+							padding : 0,
+							widths : [ '70%', '10%', '30%' ],
+							children :
+							[
+								{
+									type : 'html',
+									html :	'<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' +
+											( !CKEDITOR.env.webkit ? html : '' ) +
+										'</table><span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',
+									onLoad : function()
+									{
+										var table = CKEDITOR.document.getById( this.domId );
+										table.on( 'mouseover', updateHighlight );
+										// In WebKit, the table content must be inserted after this event call (#6150)
+										CKEDITOR.env.webkit && table.setHtml( html );
+									},
+									focus: function()
+									{
+										var firstColor = this.getElement().getElementsByTag( 'a' ).getItem( 0 );
+										firstColor.focus();
+									}
+								},
+								spacer,
+								{
+									type : 'vbox',
+									padding : 0,
+									widths : [ '70%', '5%', '25%' ],
+									children :
+									[
+										{
+											type : 'html',
+											html : '<span>' + lang.highlight +'</span>\
+												<div id="' + hicolorId + '" style="border: 1px solid; height: 74px; width: 74px;"></div>\
+												<div id="' + hicolorTextId + '">&nbsp;</div><span>' + lang.selected + '</span>\
+												<div id="' + selHiColorId + '" style="border: 1px solid; height: 20px; width: 74px;"></div>'
+										},
+										{
+											type : 'text',
+											label : lang.selected,
+											labelStyle: 'display:none',
+											id : 'selectedColor',
+											style : 'width: 74px',
+											onChange : function()
+											{
+												// Try to update color preview with new value. If fails, then set it no none.
+												try
+												{
+													$doc.getById( selHiColorId ).setStyle( 'background-color', this.getValue() );
+												}
+												catch ( e )
+												{
+													clearSelected();
+												}
+											}
+										},
+										spacer,
+										{
+											type : 'button',
+											id : 'clear',
+											style : 'margin-top: 5px',
+											label : lang.clear,
+											onClick : clearSelected
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			]
+		};
+	}
+	);
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/colordialog/index.html b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/colordialog/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/devtools/lang/en.js b/upload/public/js/3rd_party/ckeditor/plugins/devtools/lang/en.js
new file mode 100644
index 00000000..e7eb7bb7
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/devtools/lang/en.js
@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'devtools', 'en',
+{
+	devTools :
+	{
+		title		: 'Element Information',
+		dialogName	: 'Dialog window name',
+		tabName		: 'Tab name',
+		elementId	: 'Element ID',
+		elementType	: 'Element type'
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/devtools/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/devtools/plugin.js
new file mode 100644
index 00000000..7bc4fdb3
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/devtools/plugin.js
@@ -0,0 +1,173 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add( 'devtools',
+{
+	lang : [ 'en' ],
+
+	init : function( editor )
+	{
+		editor._.showDialogDefinitionTooltips = 1;
+	},
+	onLoad : function()
+	{
+		CKEDITOR.document.appendStyleText( CKEDITOR.config.devtools_styles ||
+							'#cke_tooltip { padding: 5px; border: 2px solid #333; background: #ffffff }' +
+							'#cke_tooltip h2 { font-size: 1.1em; border-bottom: 1px solid; margin: 0; padding: 1px; }' +
+							'#cke_tooltip ul { padding: 0pt; list-style-type: none; }' );
+	}
+});
+
+(function()
+{
+	function defaultCallback( editor, dialog, element, tabName )
+	{
+		var lang = editor.lang.devTools,
+			link = '<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.' +
+					( element ? ( element.type == 'text' ? 'textInput' : element.type ) : 'content' ) +
+					'.html" target="_blank">' + ( element ? element.type : 'content' ) + '</a>',
+			str =
+				'<h2>' + lang.title + '</h2>' +
+				'<ul>' +
+					'<li><strong>' + lang.dialogName + '</strong> : ' + dialog.getName() + '</li>' +
+					'<li><strong>' + lang.tabName + '</strong> : ' + tabName + '</li>';
+
+		if ( element )
+			str += '<li><strong>' + lang.elementId + '</strong> : ' + element.id + '</li>';
+
+		str += '<li><strong>' + lang.elementType + '</strong> : ' + link + '</li>';
+
+		return str + '</ul>';
+	}
+
+	function showTooltip( callback, el, editor, dialog, obj, tabName )
+	{
+		var pos = el.getDocumentPosition(),
+			styles = { 'z-index' : CKEDITOR.dialog._.currentZIndex + 10, top : ( pos.y + el.getSize( 'height' ) ) + 'px' };
+
+		tooltip.setHtml( callback( editor, dialog, obj, tabName ) );
+		tooltip.show();
+
+		// Translate coordinate for RTL.
+		if ( editor.lang.dir == 'rtl' )
+		{
+			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
+			styles.right = ( viewPaneSize.width - pos.x - el.getSize( 'width' ) ) + 'px';
+		}
+		else
+			styles.left = pos.x + 'px';
+
+		tooltip.setStyles( styles );
+	}
+
+	var tooltip;
+	CKEDITOR.on( 'reset', function()
+	{
+		tooltip && tooltip.remove();
+		tooltip = null;
+	});
+
+	CKEDITOR.on( 'dialogDefinition', function( evt )
+	{
+		var editor = evt.editor;
+		if ( editor._.showDialogDefinitionTooltips )
+		{
+			if ( !tooltip )
+			{
+				tooltip = CKEDITOR.dom.element.createFromHtml( '<div id="cke_tooltip" tabindex="-1" style="position: absolute"></div>', CKEDITOR.document );
+				tooltip.hide();
+				tooltip.on( 'mouseover', function(){ this.show(); } );
+				tooltip.on( 'mouseout', function(){ this.hide(); } );
+				tooltip.appendTo( CKEDITOR.document.getBody() );
+			}
+
+			var dialog = evt.data.definition.dialog,
+				callback = editor.config.devtools_textCallback || defaultCallback;
+
+			dialog.on( 'load', function()
+			{
+				var tabs = dialog.parts.tabs.getChildren(), tab;
+				for ( var i = 0, len = tabs.count(); i < len; i++ )
+				{
+					tab = tabs.getItem( i );
+					tab.on( 'mouseover', function()
+					{
+						var id = this.$.id;
+						showTooltip( callback, this, editor, dialog, null, id.substring( 4, id.lastIndexOf( '_' ) ) );
+					});
+					tab.on( 'mouseout', function()
+					{
+						tooltip.hide();
+					});
+				}
+
+				dialog.foreach( function( obj )
+				{
+					if ( obj.type in { hbox : 1, vbox : 1 } )
+						return;
+
+					var el = obj.getElement();
+					if ( el )
+					{
+						el.on( 'mouseover', function()
+						{
+							showTooltip( callback, this, editor, dialog, obj, dialog._.currentTabId );
+						});
+						el.on( 'mouseout', function()
+						{
+							tooltip.hide();
+						});
+					}
+				});
+			});
+		}
+	});
+})();
+
+/**
+ * A function that returns the text to be displayed inside the Developer Tools tooltip when hovering over a dialog UI element.
+ * There are 4 parameters that are being passed into the function: editor, dialog window, element, tab name.
+ * @name editor.config.devtools_textCallback
+ * @since 3.6
+ * @type Function
+ * @default (see example)
+ * @example
+ * // This is actually the default value.
+ * // Show dialog window name, tab ID, and element ID.
+ * config.devtools_textCallback = function( editor, dialog, element, tabName )
+ * {
+ * 	var lang = editor.lang.devTools,
+ * 		link = '<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.' +
+ * 				( element ? ( element.type == 'text' ? 'textInput' : element.type ) : 'content' ) +
+ * 				'.html" target="_blank">' + ( element ? element.type : 'content' ) + '</a>',
+ * 		str =
+ * 			'<h2>' + lang.title + '</h2>' +
+ * 			'<ul>' +
+ * 				'<li><strong>' + lang.dialogName + '</strong> : ' + dialog.getName() + '</li>' +
+ * 				'<li><strong>' + lang.tabName + '</strong> : ' + tabName + '</li>';
+ *
+ * 	if ( element )
+ * 		str += '<li><strong>' + lang.elementId + '</strong> : ' + element.id + '</li>';
+ *
+ * 	str += '<li><strong>' + lang.elementType + '</strong> : ' + link + '</li>';
+ *
+ * 	return str + '</ul>';
+ * }
+ */
+
+/**
+ * A setting that stores CSS rules to be injected into the page with styles to be applied to the tooltip element.
+ * @name CKEDITOR.config.devtools_styles
+ * @since 3.6
+ * @type String
+ * @default (see example)
+ * @example
+ * // This is actually the default value.
+ * CKEDITOR.config.devtools_styles = &quot;
+ *  #cke_tooltip { padding: 5px; border: 2px solid #333; background: #ffffff }
+ *  #cke_tooltip h2 { font-size: 1.1em; border-bottom: 1px solid; margin: 0; padding: 1px; }
+ *  #cke_tooltip ul { padding: 0pt; list-style-type: none; }
+ * &quot;;
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/dialog/dialogDefinition.js b/upload/public/js/3rd_party/ckeditor/plugins/dialog/dialogDefinition.js
new file mode 100644
index 00000000..330177be
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/dialog/dialogDefinition.js
@@ -0,0 +1,1166 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the "virtual" dialog, dialog content and dialog button
+ * definition classes.
+ */
+
+/**
+ * The definition of a dialog window.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialogs.
+ * </div>
+ * @name CKEDITOR.dialog.definition
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * CKEDITOR.dialog.add( 'testOnly', function( editor )
+ *       {
+ *           return {
+ *               title : 'Test Dialog',
+ *               resizable : CKEDITOR.DIALOG_RESIZE_BOTH,
+ *               minWidth : 500,
+ *               minHeight : 400,
+ *               contents : [
+ *                   {
+ *                       id : 'tab1',
+ *                       label : 'First Tab',
+ *                       title : 'First Tab Title',
+ *                       accessKey : 'Q',
+ *                       elements : [
+ *                           {
+ *                               type : 'text',
+ *                               label : 'Test Text 1',
+ *                               id : 'testText1',
+ *                               'default' : 'hello world!'
+ *                           }
+ *                       ]
+ *                    }
+ *               ]
+ *           };
+ *       });
+ */
+
+/**
+ * The dialog title, displayed in the dialog's header. Required.
+ * @name CKEDITOR.dialog.definition.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * How the dialog can be resized, must be one of the four contents defined below.
+ * <br /><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_NONE</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_WIDTH</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_HEIGHT</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_BOTH</strong><br />
+ * @name CKEDITOR.dialog.definition.prototype.resizable
+ * @field
+ * @type Number
+ * @default CKEDITOR.DIALOG_RESIZE_NONE
+ * @example
+ */
+
+/**
+ * The minimum width of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.minWidth
+ * @field
+ * @type Number
+ * @default 600
+ * @example
+ */
+
+/**
+ * The minimum height of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.minHeight
+ * @field
+ * @type Number
+ * @default 400
+ * @example
+ */
+
+
+/**
+ * The initial width of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.width
+ * @field
+ * @type Number
+ * @default @CKEDITOR.dialog.definition.prototype.minWidth
+ * @since 3.5.3
+ * @example
+ */
+
+/**
+ * The initial height of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.height
+ * @field
+ * @type Number
+ * @default @CKEDITOR.dialog.definition.prototype.minHeight
+ * @since 3.5.3
+ * @example
+ */
+
+/**
+ * The buttons in the dialog, defined as an array of
+ * {@link CKEDITOR.dialog.definition.button} objects.
+ * @name CKEDITOR.dialog.definition.prototype.buttons
+ * @field
+ * @type Array
+ * @default [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ]
+ * @example
+ */
+
+/**
+ * The contents in the dialog, defined as an array of
+ * {@link CKEDITOR.dialog.definition.content} objects. Required.
+ * @name CKEDITOR.dialog.definition.prototype.contents
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * The function to execute when OK is pressed.
+ * @name CKEDITOR.dialog.definition.prototype.onOk
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The function to execute when Cancel is pressed.
+ * @name CKEDITOR.dialog.definition.prototype.onCancel
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The function to execute when the dialog is displayed for the first time.
+ * @name CKEDITOR.dialog.definition.prototype.onLoad
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The function to execute when the dialog is loaded (executed every time the dialog is opened).
+ * @name CKEDITOR.dialog.definition.prototype.onShow
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * <div class="notapi">This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialog content pages.</div>
+ * @name CKEDITOR.dialog.definition.content
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ */
+
+/**
+ * The id of the content page.
+ * @name CKEDITOR.dialog.definition.content.prototype.id
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The tab label of the content page.
+ * @name CKEDITOR.dialog.definition.content.prototype.label
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The popup message of the tab label.
+ * @name CKEDITOR.dialog.definition.content.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The CTRL hotkey for switching to the tab.
+ * @name CKEDITOR.dialog.definition.content.prototype.accessKey
+ * @field
+ * @type String
+ * @example
+ * contentDefinition.accessKey = 'Q';	// Switch to this page when CTRL-Q is pressed.
+ */
+
+/**
+ * The UI elements contained in this content page, defined as an array of
+ * {@link CKEDITOR.dialog.definition.uiElement} objects.
+ * @name CKEDITOR.dialog.definition.content.prototype.elements
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * The definition of user interface element (textarea, radio etc).
+ * <div class="notapi">This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialog UI elements.</div>
+ * @name CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @see CKEDITOR.ui.dialog.uiElement
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ */
+
+/**
+ * The id of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.id
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The type of the UI element. Required.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.type
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The popup label of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * CSS class names to append to the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.className
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Inline CSS classes to append to the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.style
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Horizontal alignment (in container) of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.align
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Function to execute the first time the UI element is displayed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onLoad
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog is displayed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onShow
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog is closed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onHide
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog's {@link CKEDITOR.dialog.definition.setupContent} method is executed.
+ * It usually takes care of the respective UI element as a standalone element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.setup
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog's {@link CKEDITOR.dialog.definition.commitContent} method is executed.
+ * It usually takes care of the respective UI element as a standalone element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.commit
+ * @field
+ * @type Function
+ * @example
+ */
+
+// ----- hbox -----
+
+/**
+ * Horizontal layout box for dialog UI elements, auto-expends to available width of container.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create horizontal layouts.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.hbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * @name CKEDITOR.dialog.definition.hbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'hbox',</b>
+ * 	widths : [ '25%', '25%', '50%' ],
+ * 	children :
+ * 	[
+ * 		{
+ * 			type : 'text',
+ * 			id : 'id1',
+ * 			width : '40px',
+ * 		},
+ * 		{
+ * 			type : 'text',
+ * 			id : 'id2',
+ * 			width : '40px',
+ * 		},
+ * 		{
+ * 			type : 'text',
+ * 			id : 'id3'
+ * 		}
+ * 	]
+ * }
+ */
+
+/**
+ * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.children
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The widths of child cells.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.widths
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The height of the layout.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.height
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * The CSS styles to apply to this element.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.styles
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) The padding width inside child cells. Example: 0, 1.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.padding
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * (Optional) The alignment of the whole layout. Example: center, top.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.align
+ * @field
+ * @type String
+ * @example
+ */
+
+// ----- vbox -----
+
+/**
+ * Vertical layout box for dialog UI elements.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create vertical layouts.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.vbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * <style type="text/css">.details .detailList {display:none;} </style>
+ * @name CKEDITOR.dialog.definition.vbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'vbox',</b>
+ * 	align : 'right',
+ * 	width : '200px',
+ * 	children :
+ * 	[
+ * 		{
+ * 			type : 'text',
+ * 			id : 'age',
+ * 			label : 'Age'
+ * 		},
+ * 		{
+ * 			type : 'text',
+ * 			id : 'sex',
+ * 			label : 'Sex'
+ * 		},
+ * 		{
+ * 			type : 'text',
+ * 			id : 'nationality',
+ * 			label : 'Nationality'
+ * 		}
+ * 	]
+ * }
+ */
+
+/**
+ * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.children
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The width of the layout.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.width
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The heights of individual cells.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.heights
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * The CSS styles to apply to this element.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.styles
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) The padding width inside child cells. Example: 0, 1.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.padding
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * (Optional) The alignment of the whole layout. Example: center, top.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.align
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) Whether the layout should expand vertically to fill its container.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.expand
+ * @field
+ * @type Boolean
+ * @example
+ */
+
+// ----- labeled element ------
+
+/**
+ * The definition of labeled user interface element (textarea, textInput etc).
+ * <div class="notapi">This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialog UI elements.</div>
+ * @name CKEDITOR.dialog.definition.labeledElement
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @see CKEDITOR.ui.dialog.labeledElement
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.label
+ * @type String
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label '
+ * }
+ */
+
+/**
+ * (Optional) Specify the layout of the label. Set to 'horizontal' for horizontal layout.
+ * The default layout is vertical.
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.labelLayout
+ * @type String
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label ',
+ * 	<strong>	labelLayout : 'horizontal',</strong>
+ * }
+ */
+
+/**
+ * (Optional) Applies only to horizontal layouts: a two elements array of lengths to specify the widths of the
+* 	label and the content element. See also {@link CKEDITOR.dialog.definition.labeledElement#labelLayout}.
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.widths
+ * @type Array
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label ',
+ * 		labelLayout : 'horizontal',
+ * 	<strong>	widths : [100, 200],</strong>
+ * }
+ */
+
+/**
+ *  Specify the inline style of the uiElement label.
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.labelStyle
+ * @type String
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label ',
+ * 	<strong>	labelStyle : 'color: red',</strong>
+ * }
+ */
+
+
+/**
+ *  Specify the inline style of the input element.
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.inputStyle
+ * @type String
+ * @since 3.6.1
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label ',
+ * 	<strong>	inputStyle : 'text-align:center',</strong>
+ * }
+ */
+
+/**
+ *  Specify the inline style of the input element container .
+ * @name CKEDITOR.dialog.definition.labeledElement.prototype.controlStyle
+ * @type String
+ * @since 3.6.1
+ * @field
+ * @example
+ * {
+ * 		type : 'text',
+ * 		label : 'My Label ',
+ * 	<strong>	controlStyle : 'width:3em',</strong>
+ * }
+ */
+
+
+// ----- button ------
+
+/**
+ * The definition of a button.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create buttons.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.button} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.button
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'button',</b>
+ * 	id : 'buttonId',
+ * 	label : 'Click me',
+ * 	title : 'My title',
+ * 	onClick : function() {
+ * 		// this = CKEDITOR.ui.dialog.button
+ * 		alert( 'Clicked: ' + this.id );
+ * 	}
+ * }
+ */
+
+/**
+ * Whether the button is disabled.
+ * @name CKEDITOR.dialog.definition.button.prototype.disabled
+ * @type Boolean
+ * @field
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.button.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- checkbox ------
+
+/**
+ * The definition of a checkbox element.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create groups of checkbox buttons.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.checkbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.checkbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'checkbox',</b>
+ * 	id : 'agree',
+ * 	label : 'I agree',
+ * 	'default' : 'checked',
+ * 	onClick : function() {
+ * 		// this = CKEDITOR.ui.dialog.checkbox
+ * 		alert( 'Checked: ' + this.getValue() );
+ * 	}
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The default state.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.default
+ * @type String
+ * @field
+ * @default
+ * '' (unchecked)
+ * @example
+ */
+
+// ----- file -----
+
+/**
+ * The definition of a file upload input.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create file upload elements.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.file} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.file
+ * @extends CKEDITOR.dialog.definition.labeledElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'file'</b>,
+ * 	id : 'upload',
+ * 	label : 'Select file from your computer',
+ * 	size : 38
+ * },
+ * {
+ * 	type : 'fileButton',
+ * 	id : 'fileId',
+ * 	label : 'Upload file',
+ * 	'for' : [ 'tab1', 'upload' ]
+ * 	filebrowser : {
+ * 		onSelect : function( fileUrl, data ) {
+ * 			alert( 'Successfully uploaded: ' + fileUrl );
+ * 		}
+ * 	}
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.file.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * (Optional) The action attribute of the form element associated with this file upload input.
+ * If empty, CKEditor will use path to server connector for currently opened folder.
+ * @name CKEDITOR.dialog.definition.file.prototype.action
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The size of the UI element.
+ * @name CKEDITOR.dialog.definition.file.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+// ----- fileButton -----
+
+/**
+ * The definition of a button for submitting the file in a file upload input.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create a button for submitting the file in a file upload input.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.fileButton} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.fileButton
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	type : 'file',
+ * 	id : 'upload',
+ * 	label : 'Select file from your computer',
+ * 	size : 38
+ * },
+ * {
+ * 	<b>type : 'fileButton'</b>,
+ * 	id : 'fileId',
+ * 	label : 'Upload file',
+ * 	'for' : [ 'tab1', 'upload' ]
+ * 	filebrowser : {
+ * 		onSelect : function( fileUrl, data ) {
+ * 			alert( 'Successfully uploaded: ' + fileUrl );
+ * 		}
+ * 	}
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The instruction for CKEditor how to deal with file upload.
+ * By default, the file and fileButton elements will not work "as expected" if this attribute is not set.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.filebrowser
+ * @type String|Object
+ * @field
+ * @example
+ * // Update field with id 'txtUrl' in the 'tab1' tab when file is uploaded.
+ * filebrowser : 'tab1:txtUrl'
+ *
+ * // Call custom onSelect function when file is successfully uploaded.
+ * filebrowser : {
+ * 	onSelect : function( fileUrl, data ) {
+ * 		alert( 'Successfully uploaded: ' + fileUrl );
+ * 	}
+ * }
+ */
+
+/**
+ * An array that contains pageId and elementId of the file upload input element for which this button is created.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.for
+ * @type String
+ * @field
+ * @example
+ * [ pageId, elementId ]
+ */
+
+// ----- html -----
+
+/**
+ * The definition of a raw HTML element.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create elements made from raw HTML code.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.html} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.<br />
+ * To access HTML elements use {@link CKEDITOR.dom.document#getById}
+ * @name CKEDITOR.dialog.definition.html
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example 1:
+ * {
+ * 	<b>type : 'html',</b>
+ * 	html : '&lt;h3>This is some sample HTML content.&lt;/h3>'
+ * }
+ * @example
+ * // Example 2:
+ * // Complete sample with document.getById() call when the "Ok" button is clicked.
+ * var dialogDefinition =
+ * {
+ * 	title : 'Sample dialog',
+ * 	minWidth : 300,
+ * 	minHeight : 200,
+ * 	onOk : function() {
+ * 		// "this" is now a CKEDITOR.dialog object.
+ * 		var document = this.getElement().getDocument();
+ * 		// document = CKEDITOR.dom.document
+ * 		var element = <b>document.getById( 'myDiv' );</b>
+ * 		if ( element )
+ * 			alert( element.getHtml() );
+ * 	},
+ * 	contents : [
+ * 		{
+ * 			id : 'tab1',
+ * 			label : '',
+ * 			title : '',
+ * 			elements :
+ * 			[
+ * 				{
+ * 					<b>type : 'html',</b>
+ * 					html : '<b>&lt;div id="myDiv">Sample &lt;b>text&lt;/b>.&lt;/div></b>&lt;div id="otherId">Another div.&lt;/div>'
+ * 				},
+ * 			]
+ * 		}
+ * 	],
+ * 	buttons : [ CKEDITOR.dialog.cancelButton, CKEDITOR.dialog.okButton ]
+ * };
+ */
+
+/**
+ * (Required) HTML code of this element.
+ * @name CKEDITOR.dialog.definition.html.prototype.html
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- radio ------
+
+/**
+ * The definition of a radio group.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create groups of radio buttons.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.radio} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.radio
+ * @extends CKEDITOR.dialog.definition.labeledElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'radio',</b>
+ * 	id : 'country',
+ * 	label : 'Which country is bigger',
+ * 	items : [ [ 'France', 'FR' ], [ 'Germany', 'DE' ] ] ,
+ * 	style : 'color:green',
+ * 	'default' : 'DE',
+ * 	onClick : function() {
+ * 		// this = CKEDITOR.ui.dialog.radio
+ * 		alert( 'Current value: ' + this.getValue() );
+ * 	}
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.radio.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.radio.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ *  An array of options. Each option is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' is missing, then the value would be assumed to be the same as the description.
+ * @name CKEDITOR.dialog.definition.radio.prototype.items
+ * @field
+ * @type Array
+ * @example
+ */
+
+// ----- selectElement ------
+
+/**
+ * The definition of a select element.
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create select elements.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.select} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.select
+ * @extends CKEDITOR.dialog.definition.labeledElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'select',</b>
+ * 	id : 'sport',
+ * 	label : 'Select your favourite sport',
+ * 	items : [ [ 'Basketball' ], [ 'Baseball' ], [ 'Hockey' ], [ 'Football' ] ],
+ * 	'default' : 'Football',
+ * 	onChange : function( api ) {
+ * 		// this = CKEDITOR.ui.dialog.select
+ * 		alert( 'Current value: ' + this.getValue() );
+ * 	}
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.select.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.select.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ *  An array of options. Each option is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' is missing, then the value would be assumed to be the same as the description.
+ * @name CKEDITOR.dialog.definition.select.prototype.items
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) Set this to true if you'd like to have a multiple-choice select box.
+ * @name CKEDITOR.dialog.definition.select.prototype.multiple
+ * @type Boolean
+ * @field
+ * @example
+ * @default false
+ */
+
+/**
+ * (Optional) The number of items to display in the select box.
+ * @name CKEDITOR.dialog.definition.select.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+// ----- textInput -----
+
+/**
+ * The definition of a text field (single line).
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create text fields.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textInput} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.textInput
+ * @extends CKEDITOR.dialog.definition.labeledElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * {
+ * 	<b>type : 'text',</b>
+ * 	id : 'name',
+ * 	label : 'Your name',
+ * 	'default' : '',
+ * 	validate : function() {
+ * 		if ( !this.getValue() )
+ * 		{
+ * 			api.openMsgDialog( '', 'Name cannot be empty.' );
+ * 			return false;
+ * 		}
+ * 	}
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The maximum length.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.maxLength
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The size of the input field.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+// ----- textarea ------
+
+/**
+ * The definition of a text field (multiple lines).
+ * <div class="notapi">
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create textarea.
+ * <br /><br />Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textarea} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ * </div>
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.textarea
+ * @extends CKEDITOR.dialog.definition.labeledElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * 	<b>type : 'textarea',</b>
+ * 	id : 'message',
+ * 	label : 'Your comment',
+ * 	'default' : '',
+ * 	validate : function() {
+ * 		if ( this.getValue().length < 5 )
+ * 		{
+ * 			api.openMsgDialog( 'The comment is too short.' );
+ * 			return false;
+ * 		}
+ * 	}
+ * }
+ */
+
+/**
+ * The number of rows.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.rows
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * The number of columns.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.cols
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/dialog/index.html b/upload/public/js/3rd_party/ckeditor/plugins/dialog/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/dialog/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/div.js b/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/div.js
new file mode 100644
index 00000000..b9709b87
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/div.js
@@ -0,0 +1,535 @@
+/*
+ * Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+(function()
+{
+
+	/**
+	 * Add to collection with DUP examination.
+	 * @param {Object} collection
+	 * @param {Object} element
+	 * @param {Object} database
+	 */
+	function addSafely( collection, element, database )
+	{
+		// 1. IE doesn't support customData on text nodes;
+		// 2. Text nodes never get chance to appear twice;
+		if ( !element.is || !element.getCustomData( 'block_processed' ) )
+		{
+			element.is && CKEDITOR.dom.element.setMarker( database, element, 'block_processed', true );
+			collection.push( element );
+		}
+	}
+
+	function getNonEmptyChildren( element )
+	{
+		var retval = [];
+		var children = element.getChildren();
+		for ( var i = 0 ; i < children.count() ; i++ )
+		{
+			var child = children.getItem( i );
+			if ( ! ( child.type === CKEDITOR.NODE_TEXT
+				&& ( /^[ \t\n\r]+$/ ).test( child.getText() ) ) )
+				retval.push( child );
+		}
+		return retval;
+	}
+
+
+	/**
+	 * Dialog reused by both 'creatediv' and 'editdiv' commands.
+	 * @param {Object} editor
+	 * @param {String} command	The command name which indicate what the current command is.
+	 */
+	function divDialog( editor, command )
+	{
+		// Definition of elements at which div operation should stopped.
+		var divLimitDefinition = ( function(){
+
+			// Customzie from specialize blockLimit elements
+			var definition = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$blockLimit );
+
+			// Exclude 'div' itself.
+			delete definition.div;
+
+			// Exclude 'td' and 'th' when 'wrapping table'
+			if ( editor.config.div_wrapTable )
+			{
+				delete definition.td;
+				delete definition.th;
+			}
+			return definition;
+		})();
+
+		// DTD of 'div' element
+		var dtd = CKEDITOR.dtd.div;
+
+		/**
+		 * Get the first div limit element on the element's path.
+		 * @param {Object} element
+		 */
+		function getDivLimitElement( element )
+		{
+			var pathElements = new CKEDITOR.dom.elementPath( element ).elements;
+			var divLimit;
+			for ( var i = 0; i < pathElements.length ; i++ )
+			{
+				if ( pathElements[ i ].getName() in divLimitDefinition )
+				{
+					divLimit = pathElements[ i ];
+					break;
+				}
+			}
+			return divLimit;
+		}
+
+		/**
+		 * Init all fields' setup/commit function.
+		 * @memberof divDialog
+		 */
+		function setupFields()
+		{
+			this.foreach( function( field )
+			{
+				// Exclude layout container elements
+				if ( /^(?!vbox|hbox)/.test( field.type ) )
+				{
+					if ( !field.setup )
+					{
+						// Read the dialog fields values from the specified
+						// element attributes.
+						field.setup = function( element )
+						{
+							field.setValue( element.getAttribute( field.id ) || '' );
+						};
+					}
+					if ( !field.commit )
+					{
+						// Set element attributes assigned by the dialog
+						// fields.
+						field.commit = function( element )
+						{
+							var fieldValue = this.getValue();
+							// ignore default element attribute values
+							if ( 'dir' == field.id && element.getComputedStyle( 'direction' ) == fieldValue )
+								return;
+
+							if ( fieldValue )
+								element.setAttribute( field.id, fieldValue );
+							else
+								element.removeAttribute( field.id );
+						};
+					}
+				}
+			} );
+		}
+
+		/**
+		 * Wrapping 'div' element around appropriate blocks among the selected ranges.
+		 * @param {Object} editor
+		 */
+		function createDiv( editor )
+		{
+			// new adding containers OR detected pre-existed containers.
+			var containers = [];
+			// node markers store.
+			var database = {};
+			// All block level elements which contained by the ranges.
+			var containedBlocks = [], block;
+
+			// Get all ranges from the selection.
+			var selection = editor.document.getSelection(),
+				ranges = selection.getRanges();
+			var bookmarks = selection.createBookmarks();
+			var i, iterator;
+
+			// Calcualte a default block tag if we need to create blocks.
+			var blockTag = editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p';
+
+			// collect all included elements from dom-iterator
+			for ( i = 0 ; i < ranges.length ; i++ )
+			{
+				iterator = ranges[ i ].createIterator();
+				while ( ( block = iterator.getNextParagraph() ) )
+				{
+					// include contents of blockLimit elements.
+					if ( block.getName() in divLimitDefinition )
+					{
+						var j, childNodes = block.getChildren();
+						for ( j = 0 ; j < childNodes.count() ; j++ )
+							addSafely( containedBlocks, childNodes.getItem( j ) , database );
+					}
+					else
+					{
+						// Bypass dtd disallowed elements.
+						while ( !dtd[ block.getName() ] && block.getName() != 'body' )
+							block = block.getParent();
+						addSafely( containedBlocks, block, database );
+					}
+				}
+			}
+
+			CKEDITOR.dom.element.clearAllMarkers( database );
+
+			var blockGroups = groupByDivLimit( containedBlocks );
+			var ancestor, blockEl, divElement;
+
+			for ( i = 0 ; i < blockGroups.length ; i++ )
+			{
+				var currentNode = blockGroups[ i ][ 0 ];
+
+				// Calculate the common parent node of all contained elements.
+				ancestor = currentNode.getParent();
+				for ( j = 1 ; j < blockGroups[ i ].length; j++ )
+					ancestor = ancestor.getCommonAncestor( blockGroups[ i ][ j ] );
+
+				divElement = new CKEDITOR.dom.element( 'div', editor.document );
+
+				// Normalize the blocks in each group to a common parent.
+				for ( j = 0; j < blockGroups[ i ].length ; j++ )
+				{
+					currentNode = blockGroups[ i ][ j ];
+
+					while ( !currentNode.getParent().equals( ancestor ) )
+						currentNode = currentNode.getParent();
+
+					// This could introduce some duplicated elements in array.
+					blockGroups[ i ][ j ] = currentNode;
+				}
+
+				// Wrapped blocks counting
+				var fixedBlock = null;
+				for ( j = 0 ; j < blockGroups[ i ].length ; j++ )
+				{
+					currentNode = blockGroups[ i ][ j ];
+
+					// Avoid DUP elements introduced by grouping.
+					if ( !( currentNode.getCustomData && currentNode.getCustomData( 'block_processed' ) ) )
+					{
+						currentNode.is && CKEDITOR.dom.element.setMarker( database, currentNode, 'block_processed', true );
+
+						// Establish new container, wrapping all elements in this group.
+						if ( !j )
+							divElement.insertBefore( currentNode );
+
+						divElement.append( currentNode );
+					}
+				}
+
+				CKEDITOR.dom.element.clearAllMarkers( database );
+				containers.push( divElement );
+			}
+
+			selection.selectBookmarks( bookmarks );
+			return containers;
+		}
+
+		function getDiv( editor )
+		{
+			var path = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() ),
+				blockLimit = path.blockLimit,
+				div = blockLimit && blockLimit.getAscendant( 'div', true );
+			return div;
+		}
+		/**
+		 * Divide a set of nodes to different groups by their path's blocklimit element.
+		 * Note: the specified nodes should be in source order naturally, which mean they are supposed to producea by following class:
+		 *  * CKEDITOR.dom.range.Iterator
+		 *  * CKEDITOR.dom.domWalker
+		 *  @return {Array []} the grouped nodes
+		 */
+		function groupByDivLimit( nodes )
+		{
+			var groups = [],
+				lastDivLimit = null,
+				path, block;
+			for ( var i = 0 ; i < nodes.length ; i++ )
+			{
+				block = nodes[i];
+				var limit = getDivLimitElement( block );
+				if ( !limit.equals( lastDivLimit ) )
+				{
+					lastDivLimit = limit ;
+					groups.push( [] ) ;
+				}
+				groups[ groups.length - 1 ].push( block ) ;
+			}
+			return groups;
+		}
+
+		// Synchronous field values to other impacted fields is required, e.g. div styles
+		// change should also alter inline-style text.
+		function commitInternally( targetFields )
+		{
+			var dialog = this.getDialog(),
+				 element = dialog._element && dialog._element.clone()
+						 || new CKEDITOR.dom.element( 'div', editor.document );
+
+			// Commit this field and broadcast to target fields.
+			this.commit( element, true );
+
+			targetFields = [].concat( targetFields );
+			var length = targetFields.length, field;
+			for ( var i = 0; i < length; i++ )
+			{
+				field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );
+				field && field.setup && field.setup( element, true );
+			}
+		}
+
+
+		// Registered 'CKEDITOR.style' instances.
+		var styles = {} ;
+		/**
+		 * Hold a collection of created block container elements.
+		 */
+		var containers = [];
+		/**
+		 * @type divDialog
+		 */
+		return {
+			title : editor.lang.div.title,
+			minWidth : 400,
+			minHeight : 165,
+			contents :
+			[
+			{
+				id :'info',
+				label :editor.lang.common.generalTab,
+				title :editor.lang.common.generalTab,
+				elements :
+				[
+					{
+						type :'hbox',
+						widths : [ '50%', '50%' ],
+						children :
+						[
+							{
+								id :'elementStyle',
+								type :'select',
+								style :'width: 100%;',
+								label :editor.lang.div.styleSelectLabel,
+								'default' : '',
+								// Options are loaded dynamically.
+								items :
+								[
+									[ editor.lang.common.notSet , '' ]
+								],
+								onChange : function()
+								{
+									commitInternally.call( this, [ 'info:class', 'advanced:dir', 'advanced:style' ] );
+								},
+								setup : function( element )
+								{
+									for ( var name in styles )
+										styles[ name ].checkElementRemovable( element, true ) && this.setValue( name );
+								},
+								commit: function( element )
+								{
+									var styleName;
+									if ( ( styleName = this.getValue() ) )
+									{
+										var style = styles[ styleName ];
+										var customData = element.getCustomData( 'elementStyle' ) || '';
+
+										style.applyToObject( element );
+										element.setCustomData( 'elementStyle', customData + style._.definition.attributes.style );
+									}
+								}
+							},
+							{
+								id :'class',
+								type :'text',
+								label :editor.lang.common.cssClass,
+								'default' : ''
+							}
+						]
+					}
+				]
+			},
+			{
+					id :'advanced',
+					label :editor.lang.common.advancedTab,
+					title :editor.lang.common.advancedTab,
+					elements :
+					[
+					{
+						type :'vbox',
+						padding :1,
+						children :
+						[
+							{
+								type :'hbox',
+								widths : [ '50%', '50%' ],
+								children :
+								[
+									{
+										type :'text',
+										id :'id',
+										label :editor.lang.common.id,
+										'default' : ''
+									},
+									{
+										type :'text',
+										id :'lang',
+										label :editor.lang.link.langCode,
+										'default' : ''
+									}
+								]
+							},
+							{
+								type :'hbox',
+								children :
+								[
+										{
+											type :'text',
+											id :'style',
+											style :'width: 100%;',
+											label :editor.lang.common.cssStyle,
+											'default' : '',
+											commit : function( element )
+											{
+												// Merge with 'elementStyle', which is of higher priority.
+												var merged = this.getValue() + ( element.getCustomData( 'elementStyle' ) || '' );
+												element.setAttribute( 'style', merged );
+											}
+										}
+								]
+							},
+							{
+								type :'hbox',
+								children :
+								[
+										{
+											type :'text',
+											id :'title',
+											style :'width: 100%;',
+											label :editor.lang.common.advisoryTitle,
+											'default' : ''
+										}
+								]
+							},
+							{
+								type :'select',
+								id :'dir',
+								style :'width: 100%;',
+								label :editor.lang.common.langDir,
+								'default' : '',
+								items :
+								[
+									[ editor.lang.common.notSet , '' ],
+									[
+										editor.lang.common.langDirLtr,
+										'ltr'
+									],
+									[
+										editor.lang.common.langDirRtl,
+										'rtl'
+									]
+								]
+							}
+						]
+					}
+					]
+				}
+			],
+			onLoad : function()
+			{
+				setupFields.call( this );
+
+				// Preparing for the 'elementStyle' field.
+				var dialog = this,
+					 stylesField = this.getContentElement( 'info', 'elementStyle' );
+
+				 // Reuse the 'stylescombo' plugin's styles definition.
+				editor.getStylesSet( function( stylesDefinitions )
+				{
+					var styleName;
+
+					if ( stylesDefinitions )
+					{
+						// Digg only those styles that apply to 'div'.
+						for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
+						{
+							var styleDefinition = stylesDefinitions[ i ];
+							if ( styleDefinition.element && styleDefinition.element == 'div' )
+							{
+								styleName = styleDefinition.name;
+								styles[ styleName ] = new CKEDITOR.style( styleDefinition );
+
+								// Populate the styles field options with style name.
+								stylesField.items.push( [ styleName, styleName ] );
+								stylesField.add( styleName, styleName );
+							}
+						}
+					}
+
+					// We should disable the content element
+					// it if no options are available at all.
+					stylesField[ stylesField.items.length > 1 ? 'enable' : 'disable' ]();
+
+					// Now setup the field value manually.
+					setTimeout( function() { stylesField.setup( dialog._element ); }, 0 );
+				} );
+			},
+			onShow : function()
+			{
+				// Whether always create new container regardless of existed
+				// ones.
+				if ( command == 'editdiv' )
+				{
+					// Try to discover the containers that already existed in
+					// ranges
+					var div = getDiv( editor );
+					// update dialog field values
+					div && this.setupContent( this._element = div );
+				}
+			},
+			onOk : function()
+			{
+				if ( command == 'editdiv' )
+					containers = [ this._element ];
+				else
+					containers = createDiv( editor, true );
+
+				// Update elements attributes
+				var size = containers.length;
+				for ( var i = 0; i < size; i++ )
+				{
+					this.commitContent( containers[ i ] );
+
+					// Remove empty 'style' attribute.
+					!containers[ i ].getAttribute( 'style' ) && containers[ i ].removeAttribute( 'style' );
+				}
+
+				this.hide();
+			},
+			onHide : function()
+			{
+				// Remove style only when editing existing DIV. (#6315)
+				if ( command == 'editdiv' )
+					this._element.removeCustomData( 'elementStyle' );
+				delete this._element;
+			}
+		};
+	}
+
+	CKEDITOR.dialog.add( 'creatediv', function( editor )
+		{
+			return divDialog( editor, 'creatediv' );
+		} );
+	CKEDITOR.dialog.add( 'editdiv', function( editor )
+		{
+			return divDialog( editor, 'editdiv' );
+		} );
+} )();
+
+/*
+ * @name CKEDITOR.config.div_wrapTable
+ * Whether to wrap the whole table instead of indivisual cells when created 'div' in table cell.
+ * @type Boolean
+ * @default false
+ * @example config.div_wrapTable = true;
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/div/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/div/index.html b/upload/public/js/3rd_party/ckeditor/plugins/div/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/div/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/docprops/dialogs/docprops.js b/upload/public/js/3rd_party/ckeditor/plugins/docprops/dialogs/docprops.js
new file mode 100644
index 00000000..da7cd6a5
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/docprops/dialogs/docprops.js
@@ -0,0 +1,674 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'docProps', function( editor )
+{
+	var lang = editor.lang.docprops,
+		langCommon = editor.lang.common,
+		metaHash = {};
+
+	function getDialogValue( dialogName, callback )
+	{
+		var onOk = function()
+		{
+			releaseHandlers( this );
+			callback( this, this._.parentDialog );
+		};
+		var releaseHandlers = function( dialog )
+		{
+			dialog.removeListener( 'ok', onOk );
+			dialog.removeListener( 'cancel', releaseHandlers );
+		};
+		var bindToDialog = function( dialog )
+		{
+			dialog.on( 'ok', onOk );
+			dialog.on( 'cancel', releaseHandlers );
+		};
+		editor.execCommand( dialogName );
+		if ( editor._.storedDialogs.colordialog )
+			bindToDialog( editor._.storedDialogs.colordialog );
+		else
+		{
+			CKEDITOR.on( 'dialogDefinition', function( e )
+			{
+				if ( e.data.name != dialogName )
+					return;
+
+				var definition = e.data.definition;
+
+				e.removeListener();
+				definition.onLoad = CKEDITOR.tools.override( definition.onLoad, function( orginal )
+				{
+					return function()
+					{
+						bindToDialog( this );
+						definition.onLoad = orginal;
+						if ( typeof orginal == 'function' )
+							orginal.call( this );
+					};
+				});
+			});
+		}
+	}
+	function handleOther()
+	{
+		var dialog = this.getDialog(),
+			other = dialog.getContentElement( 'general', this.id + 'Other' );
+		if ( !other )
+			return;
+		if ( this.getValue() == 'other' )
+		{
+			other.getInputElement().removeAttribute( 'readOnly' );
+			other.focus();
+			other.getElement().removeClass( 'cke_disabled' );
+		}
+		else
+		{
+			other.getInputElement().setAttribute( 'readOnly', true );
+			other.getElement().addClass( 'cke_disabled' );
+		}
+	}
+	function commitMeta( name, isHttp, value )
+	{
+		return function( doc, html, head )
+		{
+			var hash = metaHash,
+				val = typeof value != 'undefined' ? value : this.getValue();
+			if ( !val && ( name in hash ) )
+				hash[ name ].remove();
+			else if ( val && ( name in hash ) )
+				hash[ name ].setAttribute( 'content', val );
+			else if ( val )
+			{
+				var meta = new CKEDITOR.dom.element( 'meta', editor.document );
+				meta.setAttribute( isHttp ? 'http-equiv' : 'name', name );
+				meta.setAttribute( 'content', val );
+				head.append( meta );
+			}
+		};
+	}
+	function setupMeta( name, ret )
+	{
+		return function()
+		{
+			var hash = metaHash,
+				result = ( name in hash ) ? hash[ name ].getAttribute( 'content' ) || '' : '';
+			if ( ret )
+				return result;
+			this.setValue( result );
+			return null;
+		};
+	}
+	function commitMargin( name )
+	{
+		return function( doc, html, head, body )
+		{
+			body.removeAttribute( 'margin' + name );
+			var val = this.getValue();
+			if ( val !== '' )
+				body.setStyle( 'margin-' + name, CKEDITOR.tools.cssLength( val ) );
+			else
+				body.removeStyle( 'margin-' + name );
+		};
+	}
+
+	function createMetaHash( doc )
+	{
+		var hash = {},
+			metas = doc.getElementsByTag( 'meta' ),
+			count = metas.count();
+
+		for ( var i = 0; i < count; i++ )
+		{
+			var meta = metas.getItem( i );
+			hash[ meta.getAttribute( meta.hasAttribute( 'http-equiv' ) ? 'http-equiv' : 'name' ).toLowerCase() ] = meta;
+		}
+		return hash;
+	}
+	// We cannot just remove the style from the element, as it might be affected from non-inline stylesheets.
+	// To get the proper result, we should manually set the inline style to its default value.
+	function resetStyle( element, prop, resetVal )
+	{
+		element.removeStyle( prop );
+		if ( element.getComputedStyle( prop ) != resetVal )
+			element.setStyle( prop, resetVal );
+	}
+
+	// Utilty to shorten the creation of color fields in the dialog.
+	var colorField = function( id, label, fieldProps )
+	{
+		return {
+			type : 'hbox',
+			padding : 0,
+			widths : [ '60%', '40%' ],
+			children : [
+				CKEDITOR.tools.extend( {
+					type : 'text',
+					id : id,
+					label : lang[ label ]
+				}, fieldProps || {}, 1 ),
+				{
+					type : 'button',
+					id : id + 'Choose',
+					label : lang.chooseColor,
+					className : 'colorChooser',
+					onClick : function()
+					{
+						var self = this;
+						getDialogValue( 'colordialog', function( colorDialog )
+						{
+							var dialog = self.getDialog();
+							dialog.getContentElement( dialog._.currentTabId, id ).setValue( colorDialog.getContentElement( 'picker', 'selectedColor' ).getValue() );
+						});
+					}
+				}
+			]
+		};
+	};
+	var previewSrc = 'javascript:' +
+		'void((function(){' +
+			encodeURIComponent(
+				'document.open();' +
+				( CKEDITOR.env.isCustomDomain() ? 'document.domain=\'' + document.domain + '\';' : '' ) +
+				'document.write( \'<html style="background-color: #ffffff; height: 100%"><head></head><body style="width: 100%; height: 100%; margin: 0px">' + lang.previewHtml + '</body></html>\' );' +
+				'document.close();'
+			) +
+		'})())';
+
+	return {
+		title : lang.title,
+		minHeight: 330,
+		minWidth: 500,
+		onShow : function()
+		{
+			var doc = editor.document,
+				html = doc.getElementsByTag( 'html' ).getItem( 0 ),
+				head = doc.getHead(),
+				body = doc.getBody();
+			metaHash = createMetaHash( doc );
+			this.setupContent( doc, html, head, body );
+		},
+		onHide : function()
+		{
+			metaHash = {};
+		},
+		onOk : function()
+		{
+			var doc = editor.document,
+				html = doc.getElementsByTag( 'html' ).getItem( 0 ),
+				head = doc.getHead(),
+				body = doc.getBody();
+			this.commitContent( doc, html, head, body );
+		},
+		contents : [
+			{
+				id : 'general',
+				label : langCommon.generalTab,
+				elements : [
+					{
+						type : 'text',
+						id : 'title',
+						label : lang.docTitle,
+						setup : function( doc )
+						{
+							this.setValue( doc.getElementsByTag( 'title' ).getItem( 0 ).data( 'cke-title' ) );
+						},
+						commit : function( doc, html, head, body, isPreview )
+						{
+							if ( isPreview )
+								return;
+							doc.getElementsByTag( 'title' ).getItem( 0 ).data( 'cke-title', this.getValue() );
+						}
+					},
+					{
+						type : 'hbox',
+						children : [
+							{
+								type : 'select',
+								id : 'dir',
+								label : langCommon.langDir,
+								style : 'width: 100%',
+								items : [
+									[ langCommon.notSet , '' ],
+									[ langCommon.langDirLtr, 'ltr' ],
+									[ langCommon.langDirRtl, 'rtl' ]
+								],
+								setup : function( doc, html, head, body )
+								{
+									this.setValue( body.getDirection() || '' );
+								},
+								commit : function( doc, html, head, body )
+								{
+									var val = this.getValue();
+									if ( val )
+										body.setAttribute( 'dir', val );
+									else
+										body.removeAttribute( 'dir' );
+									body.removeStyle( 'direction' );
+								}
+							},
+							{
+								type : 'text',
+								id : 'langCode',
+								label : langCommon.langCode,
+								setup : function( doc, html )
+								{
+									this.setValue( html.getAttribute( 'xml:lang' ) || html.getAttribute( 'lang' ) || '' );
+								},
+								commit : function( doc, html, head, body, isPreview )
+								{
+									if ( isPreview )
+										return;
+									var val = this.getValue();
+									if ( val )
+										html.setAttributes( { 'xml:lang' : val, lang : val } );
+									else
+										html.removeAttributes( { 'xml:lang' : 1, lang : 1 } );
+								}
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						children : [
+							{
+								type : 'select',
+								id : 'charset',
+								label : lang.charset,
+								style : 'width: 100%',
+								items : [
+									[ langCommon.notSet, '' ],
+									[ lang.charsetASCII, 'us-ascii' ],
+									[ lang.charsetCE, 'iso-8859-2' ],
+									[ lang.charsetCT, 'big5' ],
+									[ lang.charsetCR, 'iso-8859-5' ],
+									[ lang.charsetGR, 'iso-8859-7' ],
+									[ lang.charsetJP, 'iso-2022-jp' ],
+									[ lang.charsetKR, 'iso-2022-kr' ],
+									[ lang.charsetTR, 'iso-8859-9' ],
+									[ lang.charsetUN, 'utf-8' ],
+									[ lang.charsetWE, 'iso-8859-1' ],
+									[ lang.other, 'other' ]
+								],
+								'default' : '',
+								onChange : function()
+								{
+									this.getDialog().selectedCharset = this.getValue() != 'other' ? this.getValue() : '';
+									handleOther.call( this );
+								},
+								setup : function()
+								{
+									this.metaCharset = ( 'charset' in metaHash );
+
+									var func = setupMeta( this.metaCharset ? 'charset' : 'content-type', 1, 1 ),
+										val = func.call( this );
+
+									!this.metaCharset && val.match( /charset=[^=]+$/ ) && ( val = val.substring( val.indexOf( '=' ) + 1 ) );
+
+									if ( val )
+									{
+										this.setValue( val.toLowerCase() );
+										if ( !this.getValue() )
+										{
+											this.setValue( 'other' );
+											var other = this.getDialog().getContentElement( 'general', 'charsetOther' );
+											other && other.setValue( val );
+										}
+										this.getDialog().selectedCharset = val;
+									}
+
+									handleOther.call( this );
+								},
+								commit : function( doc, html, head, body, isPreview )
+								{
+									if ( isPreview )
+										return;
+									var value = this.getValue(),
+										other = this.getDialog().getContentElement( 'general', 'charsetOther' );
+
+									value == 'other' && ( value = other ? other.getValue() : '' );
+
+									value && !this.metaCharset && ( value = ( metaHash[ 'content-type' ] ? metaHash[ 'content-type' ].getAttribute( 'content' ).split( ';' )[0] : 'text/html' ) + '; charset=' + value );
+
+									var func = commitMeta( this.metaCharset ? 'charset' : 'content-type', 1, value );
+									func.call( this, doc, html, head );
+								}
+							},
+							{
+								type : 'text',
+								id : 'charsetOther',
+								label : lang.charsetOther,
+								onChange : function(){ this.getDialog().selectedCharset = this.getValue(); }
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						children : [
+							{
+								type : 'select',
+								id : 'docType',
+								label : lang.docType,
+								style : 'width: 100%',
+								items : [
+									[ langCommon.notSet , '' ],
+									[ 'XHTML 1.1', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">' ],
+									[ 'XHTML 1.0 Transitional', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' ],
+									[ 'XHTML 1.0 Strict', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' ],
+									[ 'XHTML 1.0 Frameset', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">' ],
+									[ 'HTML 5', '<!DOCTYPE html>' ],
+									[ 'HTML 4.01 Transitional', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' ],
+									[ 'HTML 4.01 Strict', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' ],
+									[ 'HTML 4.01 Frameset', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">' ],
+									[ 'HTML 3.2', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">' ],
+									[ 'HTML 2.0', '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">' ],
+									[ lang.other, 'other' ]
+								],
+								onChange : handleOther,
+								setup : function()
+								{
+									if ( editor.docType )
+									{
+										this.setValue( editor.docType );
+										if ( !this.getValue() )
+										{
+											this.setValue( 'other' );
+											var other = this.getDialog().getContentElement( 'general', 'docTypeOther' );
+											other && other.setValue( editor.docType );
+										}
+									}
+									handleOther.call( this );
+								},
+								commit : function( doc, html, head, body, isPreview )
+								{
+									if ( isPreview )
+										return;
+									var value = this.getValue(),
+										other = this.getDialog().getContentElement( 'general', 'docTypeOther' );
+									editor.docType = value == 'other' ? ( other ? other.getValue() : '' ) : value;
+								}
+							},
+							{
+								type : 'text',
+								id : 'docTypeOther',
+								label : lang.docTypeOther
+							}
+						]
+					},
+					{
+						type : 'checkbox',
+						id : 'xhtmlDec',
+						label : lang.xhtmlDec,
+						setup : function()
+						{
+							this.setValue( !!editor.xmlDeclaration );
+						},
+						commit : function( doc, html, head, body, isPreview )
+						{
+							if ( isPreview )
+								return;
+							if ( this.getValue() )
+							{
+								editor.xmlDeclaration = '<?xml version="1.0" encoding="' + ( this.getDialog().selectedCharset || 'utf-8' )+ '"?>' ;
+								html.setAttribute( 'xmlns', 'http://www.w3.org/1999/xhtml' );
+							}
+							else
+							{
+								editor.xmlDeclaration = '';
+								html.removeAttribute( 'xmlns' );
+							}
+						}
+					}
+				]
+			},
+			{
+				id : 'design',
+				label : lang.design,
+				elements : [
+					{
+						type : 'hbox',
+						widths : [ '60%', '40%' ],
+						children : [
+							{
+								type : 'vbox',
+								children : [
+									colorField( 'txtColor', 'txtColor',
+									{
+										setup : function( doc, html, head, body )
+										{
+											this.setValue( body.getComputedStyle( 'color' ) );
+										},
+										commit : function( doc, html, head, body, isPreview )
+										{
+											if ( this.isChanged() || isPreview )
+											{
+												body.removeAttribute( 'text' );
+												var val = this.getValue();
+												if ( val )
+													body.setStyle( 'color', val );
+												else
+													body.removeStyle( 'color' );
+											}
+										}
+									}),
+									colorField( 'bgColor', 'bgColor', {
+										setup : function( doc, html, head, body )
+										{
+											var val = body.getComputedStyle( 'background-color' ) || '';
+											this.setValue( val == 'transparent' ? '' : val );
+										},
+										commit : function( doc, html, head, body, isPreview )
+										{
+											if ( this.isChanged() || isPreview )
+											{
+												body.removeAttribute( 'bgcolor' );
+												var val = this.getValue();
+												if ( val )
+													body.setStyle( 'background-color', val );
+												else
+													resetStyle( body, 'background-color', 'transparent' );
+											}
+										}
+									}),
+									{
+										type : 'hbox',
+										widths : [ '60%', '40%' ],
+										padding : 1,
+										children : [
+											{
+												type : 'text',
+												id : 'bgImage',
+												label : lang.bgImage,
+												setup : function( doc, html, head, body )
+												{
+													var val = body.getComputedStyle( 'background-image' ) || '';
+													if ( val == 'none' )
+														val = '';
+													else
+													{
+														val = val.replace( /url\(\s*(["']?)\s*([^\)]*)\s*\1\s*\)/i, function( match, quote, url )
+														{
+															return url;
+														});
+													}
+													this.setValue( val );
+												},
+												commit : function( doc, html, head, body )
+												{
+													body.removeAttribute( 'background' );
+													var val = this.getValue();
+													if ( val )
+														body.setStyle( 'background-image', 'url(' + val + ')' );
+													else
+														resetStyle( body, 'background-image', 'none' );
+												}
+											},
+											{
+												type : 'button',
+												id : 'bgImageChoose',
+												label : langCommon.browseServer,
+												style : 'display:inline-block;margin-top:10px;',
+												hidden : true,
+												filebrowser : 'design:bgImage'
+											}
+										]
+									},
+									{
+										type : 'checkbox',
+										id : 'bgFixed',
+										label : lang.bgFixed,
+										setup : function( doc, html, head, body )
+										{
+											this.setValue( body.getComputedStyle( 'background-attachment' ) == 'fixed' );
+										},
+										commit : function( doc, html, head, body )
+										{
+											if ( this.getValue() )
+												body.setStyle( 'background-attachment', 'fixed' );
+											else
+												resetStyle( body, 'background-attachment', 'scroll' );
+										}
+									}
+								]
+							},
+							{
+								type : 'vbox',
+								children : [
+									{
+										type : 'html',
+										id : 'marginTitle',
+										html : '<div style="text-align: center; margin: 0px auto; font-weight: bold">' + lang.margin + '</div>'
+									},
+									{
+										type : 'text',
+										id : 'marginTop',
+										label : lang.marginTop,
+										style : 'width: 80px; text-align: center',
+										align : 'center',
+										inputStyle : 'text-align: center',
+										setup : function( doc, html, head, body )
+										{
+											this.setValue( body.getStyle( 'margin-top' ) || body.getAttribute( 'margintop' ) || '' );
+										},
+										commit : commitMargin( 'top' )
+									},
+									{
+										type : 'hbox',
+										children : [
+											{
+												type : 'text',
+												id : 'marginLeft',
+												label : lang.marginLeft,
+												style : 'width: 80px; text-align: center',
+												align : 'center',
+												inputStyle : 'text-align: center',
+												setup : function( doc, html, head, body )
+												{
+													this.setValue( body.getStyle( 'margin-left' ) || body.getAttribute( 'marginleft' ) || '' );
+												},
+												commit : commitMargin( 'left' )
+											},
+											{
+												type : 'text',
+												id : 'marginRight',
+												label : lang.marginRight,
+												style : 'width: 80px; text-align: center',
+												align : 'center',
+												inputStyle : 'text-align: center',
+												setup : function( doc, html, head, body )
+												{
+													this.setValue( body.getStyle( 'margin-right' ) || body.getAttribute( 'marginright' ) || '' );
+												},
+												commit : commitMargin( 'right' )
+											}
+										]
+									},
+									{
+										type : 'text',
+										id : 'marginBottom',
+										label : lang.marginBottom,
+										style : 'width: 80px; text-align: center',
+										align : 'center',
+										inputStyle : 'text-align: center',
+										setup : function( doc, html, head, body )
+										{
+											this.setValue( body.getStyle( 'margin-bottom' ) || body.getAttribute( 'marginbottom' ) || '' );
+										},
+										commit : commitMargin( 'bottom' )
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				id : 'meta',
+				label : lang.meta,
+				elements : [
+					{
+						type : 'textarea',
+						id : 'metaKeywords',
+						label : lang.metaKeywords,
+						setup : setupMeta( 'keywords' ),
+						commit : commitMeta( 'keywords' )
+					},
+					{
+						type : 'textarea',
+						id : 'metaDescription',
+						label : lang.metaDescription,
+						setup : setupMeta( 'description' ),
+						commit : commitMeta( 'description' )
+					},
+					{
+						type : 'text',
+						id : 'metaAuthor',
+						label : lang.metaAuthor,
+						setup : setupMeta( 'author' ),
+						commit : commitMeta( 'author' )
+					},
+					{
+						type : 'text',
+						id : 'metaCopyright',
+						label : lang.metaCopyright,
+						setup : setupMeta( 'copyright' ),
+						commit : commitMeta( 'copyright' )
+					}
+				]
+			},
+			{
+				id : 'preview',
+				label : langCommon.preview,
+				elements : [
+					{
+						type : 'html',
+						id : 'previewHtml',
+						html : '<iframe src="' + previewSrc + '" style="width: 100%; height: 310px" hidefocus="true" frameborder="0" ' +
+								'id="cke_docProps_preview_iframe"></iframe>',
+						onLoad : function()
+						{
+							this.getDialog().on( 'selectPage', function( ev )
+							{
+								if ( ev.data.page == 'preview' )
+								{
+									var self = this;
+									setTimeout( function()
+									{
+										var doc = CKEDITOR.document.getById( 'cke_docProps_preview_iframe' ).getFrameDocument(),
+											html = doc.getElementsByTag( 'html' ).getItem( 0 ),
+											head = doc.getHead(),
+											body = doc.getBody();
+										self.commitContent( doc, html, head, body, 1 );
+									}, 50 );
+								}
+							});
+							CKEDITOR.document.getById( 'cke_docProps_preview_iframe' ).getAscendant( 'table' ).setStyle( 'height', '100%' );
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/docprops/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/docprops/plugin.js
new file mode 100644
index 00000000..288f668b
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/docprops/plugin.js
@@ -0,0 +1,22 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add( 'docprops',
+{
+	init : function( editor )
+	{
+		var cmd = new CKEDITOR.dialogCommand( 'docProps' );
+		// Only applicable on full page mode.
+		cmd.modes = { wysiwyg : editor.config.fullPage };
+		editor.addCommand( 'docProps', cmd );
+		CKEDITOR.dialog.add( 'docProps', this.path + 'dialogs/docprops.js' );
+
+		editor.ui.addButton( 'DocProps',
+		{
+			label : editor.lang.docprops.label,
+			command : 'docProps'
+		});
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/find.js b/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/find.js
new file mode 100644
index 00000000..af73f579
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/find.js
@@ -0,0 +1,915 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var isReplace;
+
+	function findEvaluator( node )
+	{
+		return node.type == CKEDITOR.NODE_TEXT && node.getLength() > 0 && ( !isReplace || !node.isReadOnly() );
+	}
+
+	/**
+	 * Elements which break characters been considered as sequence.
+	*/
+	function nonCharactersBoundary( node )
+	{
+		return !( node.type == CKEDITOR.NODE_ELEMENT && node.isBlockBoundary(
+			CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$empty, CKEDITOR.dtd.$nonEditable ) ) );
+	}
+
+	/**
+	 * Get the cursor object which represent both current character and it's dom
+	 * position thing.
+	 */
+	var cursorStep = function()
+	{
+		return {
+			textNode : this.textNode,
+			offset : this.offset,
+			character : this.textNode ?
+				this.textNode.getText().charAt( this.offset ) : null,
+			hitMatchBoundary : this._.matchBoundary
+		};
+	};
+
+	var pages = [ 'find', 'replace' ],
+		fieldsMapping = [
+		[ 'txtFindFind', 'txtFindReplace' ],
+		[ 'txtFindCaseChk', 'txtReplaceCaseChk' ],
+		[ 'txtFindWordChk', 'txtReplaceWordChk' ],
+		[ 'txtFindCyclic', 'txtReplaceCyclic' ] ];
+
+	/**
+	 * Synchronize corresponding filed values between 'replace' and 'find' pages.
+	 * @param {String} currentPageId	The page id which receive values.
+	 */
+	function syncFieldsBetweenTabs( currentPageId )
+	{
+		var sourceIndex, targetIndex,
+			sourceField, targetField;
+
+		sourceIndex = currentPageId === 'find' ? 1 : 0;
+		targetIndex = 1 - sourceIndex;
+		var i, l = fieldsMapping.length;
+		for ( i = 0 ; i < l ; i++ )
+		{
+			sourceField = this.getContentElement( pages[ sourceIndex ],
+					fieldsMapping[ i ][ sourceIndex ] );
+			targetField = this.getContentElement( pages[ targetIndex ],
+					fieldsMapping[ i ][ targetIndex ] );
+
+			targetField.setValue( sourceField.getValue() );
+		}
+	}
+
+	var findDialog = function( editor, startupPage )
+	{
+		// Style object for highlights: (#5018)
+		// 1. Defined as full match style to avoid compromising ordinary text color styles.
+		// 2. Must be apply onto inner-most text to avoid conflicting with ordinary text color styles visually.
+		var highlightStyle = new CKEDITOR.style(
+			CKEDITOR.tools.extend( { attributes : { 'data-cke-highlight': 1 }, fullMatch : 1, ignoreReadonly : 1, childRule : function(){ return 0; } },
+			editor.config.find_highlight, true ) );
+
+		/**
+		 * Iterator which walk through the specified range char by char. By
+		 * default the walking will not stop at the character boundaries, until
+		 * the end of the range is encountered.
+		 * @param { CKEDITOR.dom.range } range
+		 * @param {Boolean} matchWord Whether the walking will stop at character boundary.
+		 */
+		var characterWalker = function( range , matchWord )
+		{
+			var self = this;
+			var walker =
+				new CKEDITOR.dom.walker( range );
+			walker.guard = matchWord ? nonCharactersBoundary : function( node )
+			{
+				!nonCharactersBoundary( node ) && ( self._.matchBoundary = true );
+			};
+			walker[ 'evaluator' ] = findEvaluator;
+			walker.breakOnFalse = 1;
+
+			if ( range.startContainer.type == CKEDITOR.NODE_TEXT )
+			{
+				this.textNode = range.startContainer;
+				this.offset = range.startOffset - 1;
+			}
+
+			this._ = {
+				matchWord : matchWord,
+				walker : walker,
+				matchBoundary : false
+			};
+		};
+
+		characterWalker.prototype = {
+			next : function()
+			{
+				return this.move();
+			},
+
+			back : function()
+			{
+				return this.move( true );
+			},
+
+			move : function( rtl )
+			{
+				var currentTextNode = this.textNode;
+				// Already at the end of document, no more character available.
+				if ( currentTextNode === null )
+					return cursorStep.call( this );
+
+				this._.matchBoundary = false;
+
+				// There are more characters in the text node, step forward.
+				if ( currentTextNode
+				    && rtl
+					&& this.offset > 0 )
+				{
+					this.offset--;
+					return cursorStep.call( this );
+				}
+				else if ( currentTextNode
+					&& this.offset < currentTextNode.getLength() - 1 )
+				{
+					this.offset++;
+					return cursorStep.call( this );
+				}
+				else
+				{
+					currentTextNode = null;
+					// At the end of the text node, walking foward for the next.
+					while ( !currentTextNode )
+					{
+						currentTextNode =
+							this._.walker[ rtl ? 'previous' : 'next' ].call( this._.walker );
+
+						// Stop searching if we're need full word match OR
+						// already reach document end.
+						if ( this._.matchWord && !currentTextNode
+							 || this._.walker._.end )
+							break;
+					}
+					// Found a fresh text node.
+					this.textNode = currentTextNode;
+					if ( currentTextNode )
+						this.offset = rtl ? currentTextNode.getLength() - 1 : 0;
+					else
+						this.offset = 0;
+				}
+
+				return cursorStep.call( this );
+			}
+
+		};
+
+		/**
+		 * A range of cursors which represent a trunk of characters which try to
+		 * match, it has the same length as the pattern  string.
+		 */
+		var characterRange = function( characterWalker, rangeLength )
+		{
+			this._ = {
+				walker : characterWalker,
+				cursors : [],
+				rangeLength : rangeLength,
+				highlightRange : null,
+				isMatched : 0
+			};
+		};
+
+		characterRange.prototype = {
+			/**
+			 * Translate this range to {@link CKEDITOR.dom.range}
+			 */
+			toDomRange : function()
+			{
+				var range = new CKEDITOR.dom.range( editor.document );
+				var cursors = this._.cursors;
+				if ( cursors.length < 1 )
+				{
+					var textNode = this._.walker.textNode;
+					if ( textNode )
+							range.setStartAfter( textNode );
+					else
+						return null;
+				}
+				else
+				{
+					var first = cursors[0],
+							last = cursors[ cursors.length - 1 ];
+
+					range.setStart( first.textNode, first.offset );
+					range.setEnd( last.textNode, last.offset + 1 );
+				}
+
+				return range;
+			},
+			/**
+			 * Reflect the latest changes from dom range.
+			 */
+			updateFromDomRange : function( domRange )
+			{
+				var cursor,
+						walker = new characterWalker( domRange );
+				this._.cursors = [];
+				do
+				{
+					cursor = walker.next();
+					if ( cursor.character )
+						this._.cursors.push( cursor );
+				}
+				while ( cursor.character );
+				this._.rangeLength = this._.cursors.length;
+			},
+
+			setMatched : function()
+			{
+				this._.isMatched = true;
+			},
+
+			clearMatched : function()
+			{
+				this._.isMatched = false;
+			},
+
+			isMatched : function()
+			{
+				return this._.isMatched;
+			},
+
+			/**
+			 * Hightlight the current matched chunk of text.
+			 */
+			highlight : function()
+			{
+				// Do not apply if nothing is found.
+				if ( this._.cursors.length < 1 )
+					return;
+
+				// Remove the previous highlight if there's one.
+				if ( this._.highlightRange )
+					this.removeHighlight();
+
+				// Apply the highlight.
+				var range = this.toDomRange(),
+					bookmark = range.createBookmark();
+				highlightStyle.applyToRange( range );
+				range.moveToBookmark( bookmark );
+				this._.highlightRange = range;
+
+				// Scroll the editor to the highlighted area.
+				var element = range.startContainer;
+				if ( element.type != CKEDITOR.NODE_ELEMENT )
+					element = element.getParent();
+				element.scrollIntoView();
+
+				// Update the character cursors.
+				this.updateFromDomRange( range );
+			},
+
+			/**
+			 * Remove highlighted find result.
+			 */
+			removeHighlight : function()
+			{
+				if ( !this._.highlightRange )
+					return;
+
+				var bookmark = this._.highlightRange.createBookmark();
+				highlightStyle.removeFromRange( this._.highlightRange );
+				this._.highlightRange.moveToBookmark( bookmark );
+				this.updateFromDomRange( this._.highlightRange );
+				this._.highlightRange = null;
+			},
+
+			isReadOnly : function()
+			{
+				if ( !this._.highlightRange )
+					return 0;
+
+				return this._.highlightRange.startContainer.isReadOnly();
+			},
+
+			moveBack : function()
+			{
+				var retval = this._.walker.back(),
+					cursors = this._.cursors;
+
+				if ( retval.hitMatchBoundary )
+					this._.cursors = cursors = [];
+
+				cursors.unshift( retval );
+				if ( cursors.length > this._.rangeLength )
+					cursors.pop();
+
+				return retval;
+			},
+
+			moveNext : function()
+			{
+				var retval = this._.walker.next(),
+					cursors = this._.cursors;
+
+				// Clear the cursors queue if we've crossed a match boundary.
+				if ( retval.hitMatchBoundary )
+					this._.cursors = cursors = [];
+
+				cursors.push( retval );
+				if ( cursors.length > this._.rangeLength )
+					cursors.shift();
+
+				return retval;
+			},
+
+			getEndCharacter : function()
+			{
+				var cursors = this._.cursors;
+				if ( cursors.length < 1 )
+					return null;
+
+				return cursors[ cursors.length - 1 ].character;
+			},
+
+			getNextCharacterRange : function( maxLength )
+			{
+				var lastCursor,
+						nextRangeWalker,
+						cursors = this._.cursors;
+
+				if ( ( lastCursor = cursors[ cursors.length - 1 ] ) && lastCursor.textNode )
+					nextRangeWalker = new characterWalker( getRangeAfterCursor( lastCursor ) );
+				// In case it's an empty range (no cursors), figure out next range from walker (#4951).
+				else
+					nextRangeWalker = this._.walker;
+
+				return new characterRange( nextRangeWalker, maxLength );
+			},
+
+			getCursors : function()
+			{
+				return this._.cursors;
+			}
+		};
+
+
+		// The remaining document range after the character cursor.
+		function getRangeAfterCursor( cursor , inclusive )
+		{
+			var range = new CKEDITOR.dom.range();
+			range.setStart( cursor.textNode,
+						   ( inclusive ? cursor.offset : cursor.offset + 1 ) );
+			range.setEndAt( editor.document.getBody(),
+							CKEDITOR.POSITION_BEFORE_END );
+			return range;
+		}
+
+		// The document range before the character cursor.
+		function getRangeBeforeCursor( cursor )
+		{
+			var range = new CKEDITOR.dom.range();
+			range.setStartAt( editor.document.getBody(),
+							CKEDITOR.POSITION_AFTER_START );
+			range.setEnd( cursor.textNode, cursor.offset );
+			return range;
+		}
+
+		var KMP_NOMATCH = 0,
+			KMP_ADVANCED = 1,
+			KMP_MATCHED = 2;
+		/**
+		 * Examination the occurrence of a word which implement KMP algorithm.
+		 */
+		var kmpMatcher = function( pattern, ignoreCase )
+		{
+			var overlap = [ -1 ];
+			if ( ignoreCase )
+				pattern = pattern.toLowerCase();
+			for ( var i = 0 ; i < pattern.length ; i++ )
+			{
+				overlap.push( overlap[i] + 1 );
+				while ( overlap[ i + 1 ] > 0
+					&& pattern.charAt( i ) != pattern
+						.charAt( overlap[ i + 1 ] - 1 ) )
+					overlap[ i + 1 ] = overlap[ overlap[ i + 1 ] - 1 ] + 1;
+			}
+
+			this._ = {
+				overlap : overlap,
+				state : 0,
+				ignoreCase : !!ignoreCase,
+				pattern : pattern
+			};
+		};
+
+		kmpMatcher.prototype =
+		{
+			feedCharacter : function( c )
+			{
+				if ( this._.ignoreCase )
+					c = c.toLowerCase();
+
+				while ( true )
+				{
+					if ( c == this._.pattern.charAt( this._.state ) )
+					{
+						this._.state++;
+						if ( this._.state == this._.pattern.length )
+						{
+							this._.state = 0;
+							return KMP_MATCHED;
+						}
+						return KMP_ADVANCED;
+					}
+					else if ( !this._.state )
+						return KMP_NOMATCH;
+					else
+						this._.state = this._.overlap[ this._.state ];
+				}
+
+				return null;
+			},
+
+			reset : function()
+			{
+				this._.state = 0;
+			}
+		};
+
+		var wordSeparatorRegex =
+		/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/;
+
+		var isWordSeparator = function( c )
+		{
+			if ( !c )
+				return true;
+			var code = c.charCodeAt( 0 );
+			return ( code >= 9 && code <= 0xd )
+				|| ( code >= 0x2000 && code <= 0x200a )
+				|| wordSeparatorRegex.test( c );
+		};
+
+		var finder = {
+			searchRange : null,
+			matchRange : null,
+			find : function( pattern, matchCase, matchWord, matchCyclic, highlightMatched, cyclicRerun )
+			{
+				if ( !this.matchRange )
+					this.matchRange =
+						new characterRange(
+							new characterWalker( this.searchRange ),
+							pattern.length );
+				else
+				{
+					this.matchRange.removeHighlight();
+					this.matchRange = this.matchRange.getNextCharacterRange( pattern.length );
+				}
+
+				var matcher = new kmpMatcher( pattern, !matchCase ),
+					matchState = KMP_NOMATCH,
+					character = '%';
+
+				while ( character !== null )
+				{
+					this.matchRange.moveNext();
+					while ( ( character = this.matchRange.getEndCharacter() ) )
+					{
+						matchState = matcher.feedCharacter( character );
+						if ( matchState == KMP_MATCHED )
+							break;
+						if ( this.matchRange.moveNext().hitMatchBoundary )
+							matcher.reset();
+					}
+
+					if ( matchState == KMP_MATCHED )
+					{
+						if ( matchWord )
+						{
+							var cursors = this.matchRange.getCursors(),
+								tail = cursors[ cursors.length - 1 ],
+								head = cursors[ 0 ];
+
+							var headWalker = new characterWalker( getRangeBeforeCursor( head ), true ),
+								tailWalker = new characterWalker( getRangeAfterCursor( tail ), true );
+
+							if ( ! ( isWordSeparator( headWalker.back().character )
+										&& isWordSeparator( tailWalker.next().character ) ) )
+								continue;
+						}
+						this.matchRange.setMatched();
+						if ( highlightMatched !== false )
+							this.matchRange.highlight();
+						return true;
+					}
+				}
+
+				this.matchRange.clearMatched();
+				this.matchRange.removeHighlight();
+				// Clear current session and restart with the default search
+				// range.
+				// Re-run the finding once for cyclic.(#3517)
+				if ( matchCyclic && !cyclicRerun )
+				{
+					this.searchRange = getSearchRange( 1 );
+					this.matchRange = null;
+					return arguments.callee.apply( this,
+						Array.prototype.slice.call( arguments ).concat( [ true ] ) );
+				}
+
+				return false;
+			},
+
+			/**
+			 * Record how much replacement occurred toward one replacing.
+			 */
+			replaceCounter : 0,
+
+			replace : function( dialog, pattern, newString, matchCase, matchWord,
+				matchCyclic , isReplaceAll )
+			{
+				isReplace = 1;
+
+				// Successiveness of current replace/find.
+				var result = 0;
+
+				// 1. Perform the replace when there's already a match here.
+				// 2. Otherwise perform the find but don't replace it immediately.
+				if ( this.matchRange && this.matchRange.isMatched()
+						&& !this.matchRange._.isReplaced && !this.matchRange.isReadOnly() )
+				{
+					// Turn off highlight for a while when saving snapshots.
+					this.matchRange.removeHighlight();
+					var domRange = this.matchRange.toDomRange();
+					var text = editor.document.createText( newString );
+					if ( !isReplaceAll )
+					{
+						// Save undo snaps before and after the replacement.
+						var selection = editor.getSelection();
+						selection.selectRanges( [ domRange ] );
+						editor.fire( 'saveSnapshot' );
+					}
+					domRange.deleteContents();
+					domRange.insertNode( text );
+					if ( !isReplaceAll )
+					{
+						selection.selectRanges( [ domRange ] );
+						editor.fire( 'saveSnapshot' );
+					}
+					this.matchRange.updateFromDomRange( domRange );
+					if ( !isReplaceAll )
+						this.matchRange.highlight();
+					this.matchRange._.isReplaced = true;
+					this.replaceCounter++;
+					result = 1;
+				}
+				else
+					result = this.find( pattern, matchCase, matchWord, matchCyclic, !isReplaceAll );
+
+				isReplace = 0;
+
+				return result;
+			}
+		};
+
+		/**
+		 * The range in which find/replace happened, receive from user
+		 * selection prior.
+		 */
+		function getSearchRange( isDefault )
+		{
+			var searchRange,
+				sel = editor.getSelection(),
+				body = editor.document.getBody();
+			if ( sel && !isDefault )
+			{
+				searchRange = sel.getRanges()[ 0 ].clone();
+				searchRange.collapse( true );
+			}
+			else
+			{
+				searchRange = new CKEDITOR.dom.range();
+				searchRange.setStartAt( body, CKEDITOR.POSITION_AFTER_START );
+			}
+			searchRange.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+			return searchRange;
+		}
+
+		var lang = editor.lang.findAndReplace;
+		return {
+			title : lang.title,
+			resizable : CKEDITOR.DIALOG_RESIZE_NONE,
+			minWidth : 350,
+			minHeight : 170,
+			buttons : [ CKEDITOR.dialog.cancelButton ],		// Cancel button only.
+			contents : [
+				{
+					id : 'find',
+					label : lang.find,
+					title : lang.find,
+					accessKey : '',
+					elements : [
+						{
+							type : 'hbox',
+							widths : [ '230px', '90px' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'txtFindFind',
+									label : lang.findWhat,
+									isChanged : false,
+									labelLayout : 'horizontal',
+									accessKey : 'F'
+								},
+								{
+									type : 'button',
+									id : 'btnFind',
+									align : 'left',
+									style : 'width:100%',
+									label : lang.find,
+									onClick : function()
+									{
+										var dialog = this.getDialog();
+										if ( !finder.find( dialog.getValueOf( 'find', 'txtFindFind' ),
+													dialog.getValueOf( 'find', 'txtFindCaseChk' ),
+													dialog.getValueOf( 'find', 'txtFindWordChk' ),
+													dialog.getValueOf( 'find', 'txtFindCyclic' ) ) )
+											alert( lang
+												.notFoundMsg );
+									}
+								}
+							]
+						},
+						{
+							type : 'fieldset',
+							label : CKEDITOR.tools.htmlEncode( lang.findOptions ),
+							style : 'margin-top:29px',
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'checkbox',
+											id : 'txtFindCaseChk',
+											isChanged : false,
+											label : lang.matchCase
+										},
+										{
+											type : 'checkbox',
+											id : 'txtFindWordChk',
+											isChanged : false,
+											label : lang.matchWord
+										},
+										{
+											type : 'checkbox',
+											id : 'txtFindCyclic',
+											isChanged : false,
+											'default' : true,
+											label : lang.matchCyclic
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					id : 'replace',
+					label : lang.replace,
+					accessKey : 'M',
+					elements : [
+						{
+							type : 'hbox',
+							widths : [ '230px', '90px' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'txtFindReplace',
+									label : lang.findWhat,
+									isChanged : false,
+									labelLayout : 'horizontal',
+									accessKey : 'F'
+								},
+								{
+									type : 'button',
+									id : 'btnFindReplace',
+									align : 'left',
+									style : 'width:100%',
+									label : lang.replace,
+									onClick : function()
+									{
+										var dialog = this.getDialog();
+										if ( !finder.replace( dialog,
+													dialog.getValueOf( 'replace', 'txtFindReplace' ),
+													dialog.getValueOf( 'replace', 'txtReplace' ),
+													dialog.getValueOf( 'replace', 'txtReplaceCaseChk' ),
+													dialog.getValueOf( 'replace', 'txtReplaceWordChk' ),
+													dialog.getValueOf( 'replace', 'txtReplaceCyclic' ) ) )
+											alert( lang
+												.notFoundMsg );
+									}
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '230px', '90px' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'txtReplace',
+									label : lang.replaceWith,
+									isChanged : false,
+									labelLayout : 'horizontal',
+									accessKey : 'R'
+								},
+								{
+									type : 'button',
+									id : 'btnReplaceAll',
+									align : 'left',
+									style : 'width:100%',
+									label : lang.replaceAll,
+									isChanged : false,
+									onClick : function()
+									{
+										var dialog = this.getDialog();
+										var replaceNums;
+
+										finder.replaceCounter = 0;
+
+										// Scope to full document.
+										finder.searchRange = getSearchRange( 1 );
+										if ( finder.matchRange )
+										{
+											finder.matchRange.removeHighlight();
+											finder.matchRange = null;
+										}
+										editor.fire( 'saveSnapshot' );
+										while ( finder.replace( dialog,
+											dialog.getValueOf( 'replace', 'txtFindReplace' ),
+											dialog.getValueOf( 'replace', 'txtReplace' ),
+											dialog.getValueOf( 'replace', 'txtReplaceCaseChk' ),
+											dialog.getValueOf( 'replace', 'txtReplaceWordChk' ),
+											false, true ) )
+										{ /*jsl:pass*/ }
+
+										if ( finder.replaceCounter )
+										{
+											alert( lang.replaceSuccessMsg.replace( /%1/, finder.replaceCounter ) );
+											editor.fire( 'saveSnapshot' );
+										}
+										else
+											alert( lang.notFoundMsg );
+									}
+								}
+							]
+						},
+						{
+							type : 'fieldset',
+							label : CKEDITOR.tools.htmlEncode( lang.findOptions ),
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'checkbox',
+											id : 'txtReplaceCaseChk',
+											isChanged : false,
+											label : lang.matchCase
+										},
+										{
+											type : 'checkbox',
+											id : 'txtReplaceWordChk',
+											isChanged : false,
+											label : lang.matchWord
+										},
+										{
+											type : 'checkbox',
+											id : 'txtReplaceCyclic',
+											isChanged : false,
+											'default' : true,
+											label : lang.matchCyclic
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			],
+			onLoad : function()
+			{
+				var dialog = this;
+
+				// Keep track of the current pattern field in use.
+				var patternField, wholeWordChkField;
+
+				// Ignore initial page select on dialog show
+				var isUserSelect = 0;
+				this.on( 'hide', function()
+						{
+							isUserSelect = 0;
+						});
+				this.on( 'show', function()
+						{
+							isUserSelect = 1;
+						});
+
+				this.selectPage = CKEDITOR.tools.override( this.selectPage, function( originalFunc )
+					{
+						return function( pageId )
+						{
+							originalFunc.call( dialog, pageId );
+
+							var currPage = dialog._.tabs[ pageId ];
+							var patternFieldInput, patternFieldId, wholeWordChkFieldId;
+							patternFieldId = pageId === 'find' ? 'txtFindFind' : 'txtFindReplace';
+							wholeWordChkFieldId = pageId === 'find' ? 'txtFindWordChk' : 'txtReplaceWordChk';
+
+							patternField = dialog.getContentElement( pageId,
+								patternFieldId );
+							wholeWordChkField = dialog.getContentElement( pageId,
+								wholeWordChkFieldId );
+
+							// Prepare for check pattern text filed 'keyup' event
+							if ( !currPage.initialized )
+							{
+								patternFieldInput = CKEDITOR.document
+									.getById( patternField._.inputId );
+								currPage.initialized = true;
+							}
+
+							// Synchronize fields on tab switch.
+							if ( isUserSelect )
+								syncFieldsBetweenTabs.call( this, pageId );
+						};
+					} );
+
+			},
+			onShow : function()
+			{
+				// Establish initial searching start position.
+				finder.searchRange = getSearchRange();
+
+				// Fill in the find field with selected text.
+				var selectedText = this.getParentEditor().getSelection().getSelectedText(),
+					patternFieldId = ( startupPage == 'find' ? 'txtFindFind' : 'txtFindReplace' );
+
+				var field = this.getContentElement( startupPage, patternFieldId );
+				field.setValue( selectedText );
+				field.select();
+
+				this.selectPage( startupPage );
+
+				this[ ( startupPage == 'find' && this._.editor.readOnly? 'hide' : 'show' ) + 'Page' ]( 'replace');
+			},
+			onHide : function()
+			{
+				var range;
+				if ( finder.matchRange && finder.matchRange.isMatched() )
+				{
+					finder.matchRange.removeHighlight();
+					editor.focus();
+
+					range = finder.matchRange.toDomRange();
+					if ( range )
+						editor.getSelection().selectRanges( [ range ] );
+				}
+
+				// Clear current session before dialog close
+				delete finder.matchRange;
+			},
+			onFocus : function()
+			{
+				if ( startupPage == 'replace' )
+					return this.getContentElement( 'replace', 'txtFindReplace' );
+				else
+					return this.getContentElement( 'find', 'txtFindFind' );
+			}
+		};
+	};
+
+	CKEDITOR.dialog.add( 'find', function( editor )
+		{
+			return findDialog( editor, 'find' );
+		});
+
+	CKEDITOR.dialog.add( 'replace', function( editor )
+		{
+			return findDialog( editor, 'replace' );
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/find/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/find/index.html b/upload/public/js/3rd_party/ckeditor/plugins/find/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/find/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/flash.js b/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/flash.js
new file mode 100644
index 00000000..f0d1072a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/flash.js
@@ -0,0 +1,674 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	/*
+	 * It is possible to set things in three different places.
+	 * 1. As attributes in the object tag.
+	 * 2. As param tags under the object tag.
+	 * 3. As attributes in the embed tag.
+	 * It is possible for a single attribute to be present in more than one place.
+	 * So let's define a mapping between a sementic attribute and its syntactic
+	 * equivalents.
+	 * Then we'll set and retrieve attribute values according to the mapping,
+	 * instead of having to check and set each syntactic attribute every time.
+	 *
+	 * Reference: http://kb.adobe.com/selfservice/viewContent.do?externalId=tn_12701
+	 */
+	var ATTRTYPE_OBJECT = 1,
+		ATTRTYPE_PARAM = 2,
+		ATTRTYPE_EMBED = 4;
+
+	var attributesMap =
+	{
+		id : [ { type : ATTRTYPE_OBJECT, name :  'id' } ],
+		classid : [ { type : ATTRTYPE_OBJECT, name : 'classid' } ],
+		codebase : [ { type : ATTRTYPE_OBJECT, name : 'codebase'} ],
+		pluginspage : [ { type : ATTRTYPE_EMBED, name : 'pluginspage' } ],
+		src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' }, { type : ATTRTYPE_OBJECT, name :  'data' } ],
+		name : [ { type : ATTRTYPE_EMBED, name : 'name' } ],
+		align : [ { type : ATTRTYPE_OBJECT, name : 'align' } ],
+		title : [ { type : ATTRTYPE_OBJECT, name : 'title' }, { type : ATTRTYPE_EMBED, name : 'title' } ],
+		'class' : [ { type : ATTRTYPE_OBJECT, name : 'class' }, { type : ATTRTYPE_EMBED, name : 'class'} ],
+		width : [ { type : ATTRTYPE_OBJECT, name : 'width' }, { type : ATTRTYPE_EMBED, name : 'width' } ],
+		height : [ { type : ATTRTYPE_OBJECT, name : 'height' }, { type : ATTRTYPE_EMBED, name : 'height' } ],
+		hSpace : [ { type : ATTRTYPE_OBJECT, name : 'hSpace' }, { type : ATTRTYPE_EMBED, name : 'hSpace' } ],
+		vSpace : [ { type : ATTRTYPE_OBJECT, name : 'vSpace' }, { type : ATTRTYPE_EMBED, name : 'vSpace' } ],
+		style : [ { type : ATTRTYPE_OBJECT, name : 'style' }, { type : ATTRTYPE_EMBED, name : 'style' } ],
+		type : [ { type : ATTRTYPE_EMBED, name : 'type' } ]
+	};
+
+	var names = [ 'play', 'loop', 'menu', 'quality', 'scale', 'salign', 'wmode', 'bgcolor', 'base', 'flashvars', 'allowScriptAccess',
+		'allowFullScreen' ];
+	for ( var i = 0 ; i < names.length ; i++ )
+		attributesMap[ names[i] ] = [ { type : ATTRTYPE_EMBED, name : names[i] }, { type : ATTRTYPE_PARAM, name : names[i] } ];
+	names = [ 'allowFullScreen', 'play', 'loop', 'menu' ];
+	for ( i = 0 ; i < names.length ; i++ )
+		attributesMap[ names[i] ][0]['default'] = attributesMap[ names[i] ][1]['default'] = true;
+
+	var defaultToPixel = CKEDITOR.tools.cssLength;
+
+	function loadValue( objectNode, embedNode, paramMap )
+	{
+		var attributes = attributesMap[ this.id ];
+		if ( !attributes )
+			return;
+
+		var isCheckbox = ( this instanceof CKEDITOR.ui.dialog.checkbox );
+		for ( var i = 0 ; i < attributes.length ; i++ )
+		{
+			var attrDef = attributes[ i ];
+			switch ( attrDef.type )
+			{
+				case ATTRTYPE_OBJECT:
+					if ( !objectNode )
+						continue;
+					if ( objectNode.getAttribute( attrDef.name ) !== null )
+					{
+						var value = objectNode.getAttribute( attrDef.name );
+						if ( isCheckbox )
+							this.setValue( value.toLowerCase() == 'true' );
+						else
+							this.setValue( value );
+						return;
+					}
+					else if ( isCheckbox )
+						this.setValue( !!attrDef[ 'default' ] );
+					break;
+				case ATTRTYPE_PARAM:
+					if ( !objectNode )
+						continue;
+					if ( attrDef.name in paramMap )
+					{
+						value = paramMap[ attrDef.name ];
+						if ( isCheckbox )
+							this.setValue( value.toLowerCase() == 'true' );
+						else
+							this.setValue( value );
+						return;
+					}
+					else if ( isCheckbox )
+						this.setValue( !!attrDef[ 'default' ] );
+					break;
+				case ATTRTYPE_EMBED:
+					if ( !embedNode )
+						continue;
+					if ( embedNode.getAttribute( attrDef.name ) )
+					{
+						value = embedNode.getAttribute( attrDef.name );
+						if ( isCheckbox )
+							this.setValue( value.toLowerCase() == 'true' );
+						else
+							this.setValue( value );
+						return;
+					}
+					else if ( isCheckbox )
+						this.setValue( !!attrDef[ 'default' ] );
+			}
+		}
+	}
+
+	function commitValue( objectNode, embedNode, paramMap )
+	{
+		var attributes = attributesMap[ this.id ];
+		if ( !attributes )
+			return;
+
+		var isRemove = ( this.getValue() === '' ),
+			isCheckbox = ( this instanceof CKEDITOR.ui.dialog.checkbox );
+
+		for ( var i = 0 ; i < attributes.length ; i++ )
+		{
+			var attrDef = attributes[i];
+			switch ( attrDef.type )
+			{
+				case ATTRTYPE_OBJECT:
+					// Avoid applying the data attribute when not needed (#7733)
+					if ( !objectNode || ( attrDef.name == 'data' && embedNode && !objectNode.hasAttribute( 'data' ) ) )
+						continue;
+					var value = this.getValue();
+					if ( isRemove || isCheckbox && value === attrDef[ 'default' ] )
+						objectNode.removeAttribute( attrDef.name );
+					else
+						objectNode.setAttribute( attrDef.name, value );
+					break;
+				case ATTRTYPE_PARAM:
+					if ( !objectNode )
+						continue;
+					value = this.getValue();
+					if ( isRemove || isCheckbox && value === attrDef[ 'default' ] )
+					{
+						if ( attrDef.name in paramMap )
+							paramMap[ attrDef.name ].remove();
+					}
+					else
+					{
+						if ( attrDef.name in paramMap )
+							paramMap[ attrDef.name ].setAttribute( 'value', value );
+						else
+						{
+							var param = CKEDITOR.dom.element.createFromHtml( '<cke:param></cke:param>', objectNode.getDocument() );
+							param.setAttributes( { name : attrDef.name, value : value } );
+							if ( objectNode.getChildCount() < 1 )
+								param.appendTo( objectNode );
+							else
+								param.insertBefore( objectNode.getFirst() );
+						}
+					}
+					break;
+				case ATTRTYPE_EMBED:
+					if ( !embedNode )
+						continue;
+					value = this.getValue();
+					if ( isRemove || isCheckbox && value === attrDef[ 'default' ])
+						embedNode.removeAttribute( attrDef.name );
+					else
+						embedNode.setAttribute( attrDef.name, value );
+			}
+		}
+	}
+
+	CKEDITOR.dialog.add( 'flash', function( editor )
+	{
+		var makeObjectTag = !editor.config.flashEmbedTagOnly,
+			makeEmbedTag = editor.config.flashAddEmbedTag || editor.config.flashEmbedTagOnly;
+
+		var previewPreloader,
+			previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>' +
+			'<div id="cke_FlashPreviewLoader' + CKEDITOR.tools.getNextNumber() + '" style="display:none"><div class="loading">&nbsp;</div></div>' +
+			'<div id="cke_FlashPreviewBox' + CKEDITOR.tools.getNextNumber() + '" class="FlashPreviewBox"></div></div>';
+
+		return {
+			title : editor.lang.flash.title,
+			minWidth : 420,
+			minHeight : 310,
+			onShow : function()
+			{
+				// Clear previously saved elements.
+				this.fakeImage = this.objectNode = this.embedNode = null;
+				previewPreloader = new CKEDITOR.dom.element( 'embed', editor.document );
+
+				// Try to detect any embed or object tag that has Flash parameters.
+				var fakeImage = this.getSelectedElement();
+				if ( fakeImage && fakeImage.data( 'cke-real-element-type' ) && fakeImage.data( 'cke-real-element-type' ) == 'flash' )
+				{
+					this.fakeImage = fakeImage;
+
+					var realElement = editor.restoreRealElement( fakeImage ),
+						objectNode = null, embedNode = null, paramMap = {};
+					if ( realElement.getName() == 'cke:object' )
+					{
+						objectNode = realElement;
+						var embedList = objectNode.getElementsByTag( 'embed', 'cke' );
+						if ( embedList.count() > 0 )
+							embedNode = embedList.getItem( 0 );
+						var paramList = objectNode.getElementsByTag( 'param', 'cke' );
+						for ( var i = 0, length = paramList.count() ; i < length ; i++ )
+						{
+							var item = paramList.getItem( i ),
+								name = item.getAttribute( 'name' ),
+								value = item.getAttribute( 'value' );
+							paramMap[ name ] = value;
+						}
+					}
+					else if ( realElement.getName() == 'cke:embed' )
+						embedNode = realElement;
+
+					this.objectNode = objectNode;
+					this.embedNode = embedNode;
+
+					this.setupContent( objectNode, embedNode, paramMap, fakeImage );
+				}
+			},
+			onOk : function()
+			{
+				// If there's no selected object or embed, create one. Otherwise, reuse the
+				// selected object and embed nodes.
+				var objectNode = null,
+					embedNode = null,
+					paramMap = null;
+				if ( !this.fakeImage )
+				{
+					if ( makeObjectTag )
+					{
+						objectNode = CKEDITOR.dom.element.createFromHtml( '<cke:object></cke:object>', editor.document );
+						var attributes = {
+							classid : 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',
+							codebase : 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'
+						};
+						objectNode.setAttributes( attributes );
+					}
+					if ( makeEmbedTag )
+					{
+						embedNode = CKEDITOR.dom.element.createFromHtml( '<cke:embed></cke:embed>', editor.document );
+						embedNode.setAttributes(
+							{
+								type : 'application/x-shockwave-flash',
+								pluginspage : 'http://www.macromedia.com/go/getflashplayer'
+							} );
+						if ( objectNode )
+							embedNode.appendTo( objectNode );
+					}
+				}
+				else
+				{
+					objectNode = this.objectNode;
+					embedNode = this.embedNode;
+				}
+
+				// Produce the paramMap if there's an object tag.
+				if ( objectNode )
+				{
+					paramMap = {};
+					var paramList = objectNode.getElementsByTag( 'param', 'cke' );
+					for ( var i = 0, length = paramList.count() ; i < length ; i++ )
+						paramMap[ paramList.getItem( i ).getAttribute( 'name' ) ] = paramList.getItem( i );
+				}
+
+				// A subset of the specified attributes/styles
+				// should also be applied on the fake element to
+				// have better visual effect. (#5240)
+				var extraStyles = {}, extraAttributes = {};
+				this.commitContent( objectNode, embedNode, paramMap, extraStyles, extraAttributes );
+
+				// Refresh the fake image.
+				var newFakeImage = editor.createFakeElement( objectNode || embedNode, 'cke_flash', 'flash', true );
+				newFakeImage.setAttributes( extraAttributes );
+				newFakeImage.setStyles( extraStyles );
+				if ( this.fakeImage )
+				{
+					newFakeImage.replace( this.fakeImage );
+					editor.getSelection().selectElement( newFakeImage );
+				}
+				else
+					editor.insertElement( newFakeImage );
+			},
+
+			onHide : function()
+			{
+				if ( this.preview )
+					this.preview.setHtml('');
+			},
+
+			contents : [
+				{
+					id : 'info',
+					label : editor.lang.common.generalTab,
+					accessKey : 'I',
+					elements :
+					[
+						{
+							type : 'vbox',
+							padding : 0,
+							children :
+							[
+								{
+									type : 'hbox',
+									widths : [ '280px', '110px' ],
+									align : 'right',
+									children :
+									[
+										{
+											id : 'src',
+											type : 'text',
+											label : editor.lang.common.url,
+											required : true,
+											validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.flash.validateSrc ),
+											setup : loadValue,
+											commit : commitValue,
+											onLoad : function()
+											{
+												var dialog = this.getDialog(),
+												updatePreview = function( src ){
+													// Query the preloader to figure out the url impacted by based href.
+													previewPreloader.setAttribute( 'src', src );
+													dialog.preview.setHtml( '<embed height="100%" width="100%" src="'
+														+ CKEDITOR.tools.htmlEncode( previewPreloader.getAttribute( 'src' ) )
+														+ '" type="application/x-shockwave-flash"></embed>' );
+												};
+												// Preview element
+												dialog.preview = dialog.getContentElement( 'info', 'preview' ).getElement().getChild( 3 );
+
+												// Sync on inital value loaded.
+												this.on( 'change', function( evt ){
+
+														if ( evt.data && evt.data.value )
+															updatePreview( evt.data.value );
+													} );
+												// Sync when input value changed.
+												this.getInputElement().on( 'change', function( evt ){
+
+													updatePreview( this.getValue() );
+												}, this );
+											}
+										},
+										{
+											type : 'button',
+											id : 'browse',
+											filebrowser : 'info:src',
+											hidden : true,
+											// v-align with the 'src' field.
+											// TODO: We need something better than a fixed size here.
+											style : 'display:inline-block;margin-top:10px;',
+											label : editor.lang.common.browseServer
+										}
+									]
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '25%', '25%', '25%', '25%', '25%' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'width',
+									style : 'width:95px',
+									label : editor.lang.common.width,
+									validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength.replace( '%1', editor.lang.common.width ) ),
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									type : 'text',
+									id : 'height',
+									style : 'width:95px',
+									label : editor.lang.common.height,
+									validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength.replace( '%1', editor.lang.common.height ) ),
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									type : 'text',
+									id : 'hSpace',
+									style : 'width:95px',
+									label : editor.lang.flash.hSpace,
+									validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateHSpace ),
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									type : 'text',
+									id : 'vSpace',
+									style : 'width:95px',
+									label : editor.lang.flash.vSpace,
+									validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateVSpace ),
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+
+						{
+							type : 'vbox',
+							children :
+							[
+								{
+									type : 'html',
+									id : 'preview',
+									style : 'width:95%;',
+									html : previewAreaHtml
+								}
+							]
+						}
+					]
+				},
+				{
+					id : 'Upload',
+					hidden : true,
+					filebrowser : 'uploadButton',
+					label : editor.lang.common.upload,
+					elements :
+					[
+						{
+							type : 'file',
+							id : 'upload',
+							label : editor.lang.common.upload,
+							size : 38
+						},
+						{
+							type : 'fileButton',
+							id : 'uploadButton',
+							label : editor.lang.common.uploadSubmit,
+							filebrowser : 'info:src',
+							'for' : [ 'Upload', 'upload' ]
+						}
+					]
+				},
+				{
+					id : 'properties',
+					label : editor.lang.flash.propertiesTab,
+					elements :
+					[
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									id : 'scale',
+									type : 'select',
+									label : editor.lang.flash.scale,
+									'default' : '',
+									style : 'width : 100%;',
+									items :
+									[
+										[ editor.lang.common.notSet , ''],
+										[ editor.lang.flash.scaleAll, 'showall' ],
+										[ editor.lang.flash.scaleNoBorder, 'noborder' ],
+										[ editor.lang.flash.scaleFit, 'exactfit' ]
+									],
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'allowScriptAccess',
+									type : 'select',
+									label : editor.lang.flash.access,
+									'default' : '',
+									style : 'width : 100%;',
+									items :
+									[
+										[ editor.lang.common.notSet , ''],
+										[ editor.lang.flash.accessAlways, 'always' ],
+										[ editor.lang.flash.accessSameDomain, 'samedomain' ],
+										[ editor.lang.flash.accessNever, 'never' ]
+									],
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									id : 'wmode',
+									type : 'select',
+									label : editor.lang.flash.windowMode,
+									'default' : '',
+									style : 'width : 100%;',
+									items :
+									[
+										[ editor.lang.common.notSet , '' ],
+										[ editor.lang.flash.windowModeWindow, 'window' ],
+										[ editor.lang.flash.windowModeOpaque, 'opaque' ],
+										[ editor.lang.flash.windowModeTransparent, 'transparent' ]
+									],
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'quality',
+									type : 'select',
+									label : editor.lang.flash.quality,
+									'default' : 'high',
+									style : 'width : 100%;',
+									items :
+									[
+										[ editor.lang.common.notSet , '' ],
+										[ editor.lang.flash.qualityBest, 'best' ],
+										[ editor.lang.flash.qualityHigh, 'high' ],
+										[ editor.lang.flash.qualityAutoHigh, 'autohigh' ],
+										[ editor.lang.flash.qualityMedium, 'medium' ],
+										[ editor.lang.flash.qualityAutoLow, 'autolow' ],
+										[ editor.lang.flash.qualityLow, 'low' ]
+									],
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									id : 'align',
+									type : 'select',
+									label : editor.lang.common.align,
+									'default' : '',
+									style : 'width : 100%;',
+									items :
+									[
+										[ editor.lang.common.notSet , ''],
+										[ editor.lang.common.alignLeft , 'left'],
+										[ editor.lang.flash.alignAbsBottom , 'absBottom'],
+										[ editor.lang.flash.alignAbsMiddle , 'absMiddle'],
+										[ editor.lang.flash.alignBaseline , 'baseline'],
+										[ editor.lang.common.alignBottom , 'bottom'],
+										[ editor.lang.common.alignMiddle , 'middle'],
+										[ editor.lang.common.alignRight , 'right'],
+										[ editor.lang.flash.alignTextTop , 'textTop'],
+										[ editor.lang.common.alignTop , 'top']
+									],
+									setup : loadValue,
+									commit : function( objectNode, embedNode, paramMap, extraStyles, extraAttributes )
+									{
+										var value = this.getValue();
+										commitValue.apply( this, arguments );
+										value && ( extraAttributes.align = value );
+									}
+								},
+								{
+									type : 'html',
+									html : '<div></div>'
+								}
+							]
+						},
+						{
+							type : 'fieldset',
+							label : CKEDITOR.tools.htmlEncode( editor.lang.flash.flashvars ),
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'checkbox',
+											id : 'menu',
+											label : editor.lang.flash.chkMenu,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'play',
+											label : editor.lang.flash.chkPlay,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'loop',
+											label : editor.lang.flash.chkLoop,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										},
+										{
+											type : 'checkbox',
+											id : 'allowFullScreen',
+											label : editor.lang.flash.chkFull,
+											'default' : true,
+											setup : loadValue,
+											commit : commitValue
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					id : 'advanced',
+					label : editor.lang.common.advancedTab,
+					elements :
+					[
+						{
+							type : 'hbox',
+							widths : [ '45%', '55%' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'id',
+									label : editor.lang.common.id,
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									type : 'text',
+									id : 'title',
+									label : editor.lang.common.advisoryTitle,
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '45%', '55%' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'bgcolor',
+									label : editor.lang.flash.bgcolor,
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									type : 'text',
+									id : 'class',
+									label : editor.lang.common.cssClass,
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'text',
+							id : 'style',
+							validate : CKEDITOR.dialog.validate.inlineStyle( editor.lang.common.invalidInlineStyle ),
+							label : editor.lang.common.cssStyle,
+							setup : loadValue,
+							commit : commitValue
+						}
+					]
+				}
+			]
+		};
+	} );
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/flash/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/flash/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/flash/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/flash/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/flash/images/placeholder.png b/upload/public/js/3rd_party/ckeditor/plugins/flash/images/placeholder.png
new file mode 100644
index 00000000..0bc6caa7
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/flash/images/placeholder.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/flash/index.html b/upload/public/js/3rd_party/ckeditor/plugins/flash/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/flash/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/button.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/button.js
new file mode 100644
index 00000000..60a8bc64
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/button.js
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'button', function( editor )
+{
+	function commitAttributes( element )
+	{
+		var val = this.getValue();
+		if ( val )
+		{
+			element.attributes[ this.id ] = val;
+			if ( this.id == 'name' )
+				element.attributes[ 'data-cke-saved-name' ] = val;
+		}
+		else
+		{
+			delete element.attributes[ this.id ];
+			if ( this.id == 'name' )
+				delete element.attributes[ 'data-cke-saved-name' ];
+		}
+	}
+
+	return {
+		title : editor.lang.button.title,
+		minWidth : 350,
+		minHeight : 150,
+		onShow : function()
+		{
+			delete this.button;
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+			if ( element && element.is( 'input' ) )
+			{
+				var type = element.getAttribute( 'type' );
+				if ( type in { button:1, reset:1, submit:1 } )
+				{
+					this.button = element;
+					this.setupContent( element );
+				}
+			}
+		},
+		onOk : function()
+		{
+			var editor = this.getParentEditor(),
+				element = this.button,
+				isInsertMode = !element;
+
+			var fake = element ? CKEDITOR.htmlParser.fragment.fromHtml( element.getOuterHtml() ).children[ 0 ]
+					: new CKEDITOR.htmlParser.element( 'input' );
+			this.commitContent( fake );
+
+			var writer = new CKEDITOR.htmlParser.basicWriter();
+			fake.writeHtml( writer );
+			var newElement = CKEDITOR.dom.element.createFromHtml( writer.getHtml(), editor.document );
+
+			if ( isInsertMode )
+				editor.insertElement( newElement );
+			else
+			{
+				newElement.replace( element );
+				editor.getSelection().selectElement( newElement );
+			}
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.button.title,
+				title : editor.lang.button.title,
+				elements : [
+					{
+						id : 'name',
+						type : 'text',
+						label : editor.lang.common.name,
+						'default' : '',
+						setup : function( element )
+						{
+							this.setValue(
+									element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : commitAttributes
+					},
+					{
+						id : 'value',
+						type : 'text',
+						label : editor.lang.button.text,
+						accessKey : 'V',
+						'default' : '',
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'value' ) || '' );
+						},
+						commit : commitAttributes
+					},
+					{
+						id : 'type',
+						type : 'select',
+						label : editor.lang.button.type,
+						'default' : 'button',
+						accessKey : 'T',
+						items :
+						[
+							[ editor.lang.button.typeBtn, 'button' ],
+							[ editor.lang.button.typeSbm, 'submit' ],
+							[ editor.lang.button.typeRst, 'reset' ]
+						],
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'type' ) || '' );
+						},
+						commit : commitAttributes
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/checkbox.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/checkbox.js
new file mode 100644
index 00000000..f8565e64
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/checkbox.js
@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'checkbox', function( editor )
+{
+	return {
+		title : editor.lang.checkboxAndRadio.checkboxTitle,
+		minWidth : 350,
+		minHeight : 140,
+		onShow : function()
+		{
+			delete this.checkbox;
+
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+
+			if ( element && element.getAttribute( 'type' ) == 'checkbox' )
+			{
+				this.checkbox = element;
+				this.setupContent( element );
+			}
+		},
+		onOk : function()
+		{
+			var editor,
+				element = this.checkbox,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+			{
+				editor = this.getParentEditor();
+				element = editor.document.createElement( 'input' );
+				element.setAttribute( 'type', 'checkbox' );
+				editor.insertElement( element );
+			}
+			this.commitContent( { element : element } );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.checkboxAndRadio.checkboxTitle,
+				title : editor.lang.checkboxAndRadio.checkboxTitle,
+				startupFocus : 'txtName',
+				elements : [
+					{
+						id : 'txtName',
+						type : 'text',
+						label : editor.lang.common.name,
+						'default' : '',
+						accessKey : 'N',
+						setup : function( element )
+						{
+							this.setValue(
+									element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							// IE failed to update 'name' property on input elements, protect it now.
+							if ( this.getValue() )
+								element.data( 'cke-saved-name', this.getValue() );
+							else
+							{
+								element.data( 'cke-saved-name', false );
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						id : 'txtValue',
+						type : 'text',
+						label : editor.lang.checkboxAndRadio.value,
+						'default' : '',
+						accessKey : 'V',
+						setup : function( element )
+						{
+							var value = element.getAttribute( 'value' );
+							// IE Return 'on' as default attr value.
+							this.setValue(  CKEDITOR.env.ie && value == 'on' ? '' : value  );
+						},
+						commit : function( data )
+						{
+							var element = data.element,
+								value = this.getValue();
+
+							if ( value && !( CKEDITOR.env.ie && value == 'on' ) )
+								element.setAttribute( 'value', value );
+							else
+							{
+								if ( CKEDITOR.env.ie )
+								{
+									// Remove attribute 'value' of checkbox (#4721).
+									var checkbox = new CKEDITOR.dom.element( 'input', element.getDocument() );
+									element.copyAttributes( checkbox, { value: 1 } );
+									checkbox.replace( element );
+									editor.getSelection().selectElement( checkbox );
+									data.element = checkbox;
+								}
+								else
+									element.removeAttribute( 'value' );
+							}
+						}
+					},
+					{
+						id : 'cmbSelected',
+						type : 'checkbox',
+						label : editor.lang.checkboxAndRadio.selected,
+						'default' : '',
+						accessKey : 'S',
+						value : "checked",
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'checked' ) );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							if ( CKEDITOR.env.ie )
+							{
+								var isElementChecked = !!element.getAttribute( 'checked' ),
+									isChecked = !!this.getValue();
+
+								if ( isElementChecked != isChecked )
+								{
+									var replace = CKEDITOR.dom.element.createFromHtml( '<input type="checkbox"'
+										   + ( isChecked ? ' checked="checked"' : '' )
+										   + '/>', editor.document );
+
+									element.copyAttributes( replace, { type : 1, checked : 1 } );
+									replace.replace( element );
+									editor.getSelection().selectElement( replace );
+									data.element = replace;
+								}
+							}
+							else
+							{
+								var value = this.getValue();
+								if ( value )
+									element.setAttribute( 'checked', 'checked' );
+								else
+									element.removeAttribute( 'checked' );
+							}
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/form.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/form.js
new file mode 100644
index 00000000..a253c105
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/form.js
@@ -0,0 +1,177 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'form', function( editor )
+{
+	var autoAttributes =
+	{
+		action : 1,
+		id : 1,
+		method : 1,
+		enctype : 1,
+		target : 1
+	};
+
+	return {
+		title : editor.lang.form.title,
+		minWidth : 350,
+		minHeight : 200,
+		onShow : function()
+		{
+			delete this.form;
+
+			var element = this.getParentEditor().getSelection().getStartElement();
+			var form = element && element.getAscendant( 'form', true );
+			if ( form )
+			{
+				this.form = form;
+				this.setupContent( form );
+			}
+		},
+		onOk : function()
+		{
+			var editor,
+				element = this.form,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+			{
+				editor = this.getParentEditor();
+				element = editor.document.createElement( 'form' );
+				!CKEDITOR.env.ie && element.append( editor.document.createElement( 'br' ) );
+			}
+
+			if ( isInsertMode )
+				editor.insertElement( element );
+			this.commitContent( element );
+		},
+		onLoad : function()
+		{
+			function autoSetup( element )
+			{
+				this.setValue( element.getAttribute( this.id ) || '' );
+			}
+
+			function autoCommit( element )
+			{
+				if ( this.getValue() )
+					element.setAttribute( this.id, this.getValue() );
+				else
+					element.removeAttribute( this.id );
+			}
+
+			this.foreach( function( contentObj )
+				{
+					if ( autoAttributes[ contentObj.id ] )
+					{
+						contentObj.setup = autoSetup;
+						contentObj.commit = autoCommit;
+					}
+				} );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.form.title,
+				title : editor.lang.form.title,
+				elements : [
+					{
+						id : 'txtName',
+						type : 'text',
+						label : editor.lang.common.name,
+						'default' : '',
+						accessKey : 'N',
+						setup : function( element )
+						{
+							this.setValue( element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : function( element )
+						{
+							if ( this.getValue() )
+								element.data( 'cke-saved-name', this.getValue() );
+							else
+							{
+								element.data( 'cke-saved-name', false );
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						id : 'action',
+						type : 'text',
+						label : editor.lang.form.action,
+						'default' : '',
+						accessKey : 'T'
+					},
+					{
+						type : 'hbox',
+						widths : [ '45%', '55%' ],
+						children :
+						[
+							{
+								id : 'id',
+								type : 'text',
+								label : editor.lang.common.id,
+								'default' : '',
+								accessKey : 'I'
+							},
+							{
+								id : 'enctype',
+								type : 'select',
+								label : editor.lang.form.encoding,
+								style : 'width:100%',
+								accessKey : 'E',
+								'default' : '',
+								items :
+								[
+									[ '' ],
+									[ 'text/plain' ],
+									[ 'multipart/form-data' ],
+									[ 'application/x-www-form-urlencoded' ]
+								]
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						widths : [ '45%', '55%' ],
+						children :
+						[
+							{
+								id : 'target',
+								type : 'select',
+								label : editor.lang.common.target,
+								style : 'width:100%',
+								accessKey : 'M',
+								'default' : '',
+								items :
+								[
+									[ editor.lang.common.notSet, '' ],
+									[ editor.lang.common.targetNew, '_blank' ],
+									[ editor.lang.common.targetTop, '_top' ],
+									[ editor.lang.common.targetSelf, '_self' ],
+									[ editor.lang.common.targetParent, '_parent' ]
+								]
+							},
+							{
+								id : 'method',
+								type : 'select',
+								label : editor.lang.form.method,
+								accessKey : 'M',
+								'default' : 'GET',
+								items :
+								[
+									[ 'GET', 'get' ],
+									[ 'POST', 'post' ]
+								]
+							}
+						]
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/hiddenfield.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/hiddenfield.js
new file mode 100644
index 00000000..d214da99
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/hiddenfield.js
@@ -0,0 +1,100 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'hiddenfield', function( editor )
+{
+	return {
+		title : editor.lang.hidden.title,
+		hiddenField : null,
+		minWidth : 350,
+		minHeight : 110,
+		onShow : function()
+		{
+			delete this.hiddenField;
+
+			var editor = this.getParentEditor(),
+				selection = editor.getSelection(),
+				element = selection.getSelectedElement();
+
+			if ( element && element.data( 'cke-real-element-type' ) && element.data( 'cke-real-element-type' ) == 'hiddenfield' )
+			{
+				this.hiddenField = element;
+				element = editor.restoreRealElement( this.hiddenField );
+				this.setupContent( element );
+				selection.selectElement( this.hiddenField );
+			}
+		},
+		onOk : function()
+		{
+			var name = this.getValueOf( 'info', '_cke_saved_name' ),
+				value = this.getValueOf( 'info', 'value' ),
+				editor = this.getParentEditor(),
+				element = CKEDITOR.env.ie && !( CKEDITOR.document.$.documentMode >= 8 ) ?
+					editor.document.createElement( '<input name="' + CKEDITOR.tools.htmlEncode( name ) + '">' )
+					: editor.document.createElement( 'input' );
+
+			element.setAttribute( 'type', 'hidden' );
+			this.commitContent( element );
+			var fakeElement = editor.createFakeElement( element, 'cke_hidden', 'hiddenfield' );
+			if ( !this.hiddenField )
+				editor.insertElement( fakeElement );
+			else
+			{
+				fakeElement.replace( this.hiddenField );
+				editor.getSelection().selectElement( fakeElement );
+			}
+			return true;
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.hidden.title,
+				title : editor.lang.hidden.title,
+				elements : [
+					{
+						id : '_cke_saved_name',
+						type : 'text',
+						label : editor.lang.hidden.name,
+						'default' : '',
+						accessKey : 'N',
+						setup : function( element )
+						{
+							this.setValue(
+									element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : function( element )
+						{
+							if ( this.getValue() )
+								element.setAttribute( 'name', this.getValue() );
+							else
+							{
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						id : 'value',
+						type : 'text',
+						label : editor.lang.hidden.value,
+						'default' : '',
+						accessKey : 'V',
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'value' ) || '' );
+						},
+						commit : function( element )
+						{
+							if ( this.getValue() )
+								element.setAttribute( 'value', this.getValue() );
+							else
+								element.removeAttribute( 'value' );
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/radio.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/radio.js
new file mode 100644
index 00000000..ce7f6e2f
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/radio.js
@@ -0,0 +1,135 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'radio', function( editor )
+{
+	return {
+		title : editor.lang.checkboxAndRadio.radioTitle,
+		minWidth : 350,
+		minHeight : 140,
+		onShow : function()
+		{
+			delete this.radioButton;
+
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+			if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) == 'radio' )
+			{
+				this.radioButton = element;
+				this.setupContent( element );
+			}
+		},
+		onOk : function()
+		{
+			var editor,
+				element = this.radioButton,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+			{
+				editor = this.getParentEditor();
+				element = editor.document.createElement( 'input' );
+				element.setAttribute( 'type', 'radio' );
+			}
+
+			if ( isInsertMode )
+				editor.insertElement( element );
+			this.commitContent( { element : element } );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.checkboxAndRadio.radioTitle,
+				title : editor.lang.checkboxAndRadio.radioTitle,
+				elements : [
+					{
+						id : 'name',
+						type : 'text',
+						label : editor.lang.common.name,
+						'default' : '',
+						accessKey : 'N',
+						setup : function( element )
+						{
+							this.setValue(
+									element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							if ( this.getValue() )
+								element.data( 'cke-saved-name', this.getValue() );
+							else
+							{
+								element.data( 'cke-saved-name', false );
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						id : 'value',
+						type : 'text',
+						label : editor.lang.checkboxAndRadio.value,
+						'default' : '',
+						accessKey : 'V',
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'value' ) || '' );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							if ( this.getValue() )
+								element.setAttribute( 'value', this.getValue() );
+							else
+								element.removeAttribute( 'value' );
+						}
+					},
+					{
+						id : 'checked',
+						type : 'checkbox',
+						label : editor.lang.checkboxAndRadio.selected,
+						'default' : '',
+						accessKey : 'S',
+						value : "checked",
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'checked' ) );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
+							{
+								if ( this.getValue() )
+									element.setAttribute( 'checked', 'checked' );
+								else
+									element.removeAttribute( 'checked' );
+							}
+							else
+							{
+								var isElementChecked = element.getAttribute( 'checked' );
+								var isChecked = !!this.getValue();
+
+								if ( isElementChecked != isChecked )
+								{
+									var replace = CKEDITOR.dom.element.createFromHtml( '<input type="radio"'
+											+ ( isChecked ? ' checked="checked"' : '' )
+											+ '></input>', editor.document );
+									element.copyAttributes( replace, { type : 1, checked : 1 } );
+									replace.replace( element );
+									editor.getSelection().selectElement( replace );
+									data.element = replace;
+								}
+							}
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/select.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/select.js
new file mode 100644
index 00000000..29c2579c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/select.js
@@ -0,0 +1,558 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'select', function( editor )
+{
+	// Add a new option to a SELECT object (combo or list).
+	function addOption( combo, optionText, optionValue, documentObject, index )
+	{
+		combo = getSelect( combo );
+		var oOption;
+		if ( documentObject )
+			oOption = documentObject.createElement( "OPTION" );
+		else
+			oOption = document.createElement( "OPTION" );
+
+		if ( combo && oOption && oOption.getName() == 'option' )
+		{
+			if ( CKEDITOR.env.ie ) {
+				if ( !isNaN( parseInt( index, 10) ) )
+					combo.$.options.add( oOption.$, index );
+				else
+					combo.$.options.add( oOption.$ );
+
+				oOption.$.innerHTML = optionText.length > 0 ? optionText : '';
+				oOption.$.value     = optionValue;
+			}
+			else
+			{
+				if ( index !== null && index < combo.getChildCount() )
+					combo.getChild( index < 0 ? 0 : index ).insertBeforeMe( oOption );
+				else
+					combo.append( oOption );
+
+				oOption.setText( optionText.length > 0 ? optionText : '' );
+				oOption.setValue( optionValue );
+			}
+		}
+		else
+			return false;
+
+		return oOption;
+	}
+	// Remove all selected options from a SELECT object.
+	function removeSelectedOptions( combo )
+	{
+		combo = getSelect( combo );
+
+		// Save the selected index
+		var iSelectedIndex = getSelectedIndex( combo );
+
+		// Remove all selected options.
+		for ( var i = combo.getChildren().count() - 1 ; i >= 0 ; i-- )
+		{
+			if ( combo.getChild( i ).$.selected )
+				combo.getChild( i ).remove();
+		}
+
+		// Reset the selection based on the original selected index.
+		setSelectedIndex( combo, iSelectedIndex );
+	}
+	//Modify option  from a SELECT object.
+	function modifyOption( combo, index, title, value )
+	{
+		combo = getSelect( combo );
+		if ( index < 0 )
+			return false;
+		var child = combo.getChild( index );
+		child.setText( title );
+		child.setValue( value );
+		return child;
+	}
+	function removeAllOptions( combo )
+	{
+		combo = getSelect( combo );
+		while ( combo.getChild( 0 ) && combo.getChild( 0 ).remove() )
+		{ /*jsl:pass*/ }
+	}
+	// Moves the selected option by a number of steps (also negative).
+	function changeOptionPosition( combo, steps, documentObject )
+	{
+		combo = getSelect( combo );
+		var iActualIndex = getSelectedIndex( combo );
+		if ( iActualIndex < 0 )
+			return false;
+
+		var iFinalIndex = iActualIndex + steps;
+		iFinalIndex = ( iFinalIndex < 0 ) ? 0 : iFinalIndex;
+		iFinalIndex = ( iFinalIndex >= combo.getChildCount() ) ? combo.getChildCount() - 1 : iFinalIndex;
+
+		if ( iActualIndex == iFinalIndex )
+			return false;
+
+		var oOption = combo.getChild( iActualIndex ),
+			sText	= oOption.getText(),
+			sValue	= oOption.getValue();
+
+		oOption.remove();
+
+		oOption = addOption( combo, sText, sValue, ( !documentObject ) ? null : documentObject, iFinalIndex );
+		setSelectedIndex( combo, iFinalIndex );
+		return oOption;
+	}
+	function getSelectedIndex( combo )
+	{
+		combo = getSelect( combo );
+		return combo ? combo.$.selectedIndex : -1;
+	}
+	function setSelectedIndex( combo, index )
+	{
+		combo = getSelect( combo );
+		if ( index < 0 )
+			return null;
+		var count = combo.getChildren().count();
+		combo.$.selectedIndex = ( index >= count ) ? ( count - 1 ) : index;
+		return combo;
+	}
+	function getOptions( combo )
+	{
+		combo = getSelect( combo );
+		return combo ? combo.getChildren() : false;
+	}
+	function getSelect( obj )
+	{
+		if ( obj && obj.domId && obj.getInputElement().$ )				// Dialog element.
+			return  obj.getInputElement();
+		else if ( obj && obj.$ )
+			return obj;
+		return false;
+	}
+
+	return {
+		title : editor.lang.select.title,
+		minWidth : CKEDITOR.env.ie ? 460 : 395,
+		minHeight : CKEDITOR.env.ie ? 320 : 300,
+		onShow : function()
+		{
+			delete this.selectBox;
+			this.setupContent( 'clear' );
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+			if ( element && element.getName() == "select" )
+			{
+				this.selectBox = element;
+				this.setupContent( element.getName(), element );
+
+				// Load Options into dialog.
+				var objOptions = getOptions( element );
+				for ( var i = 0 ; i < objOptions.count() ; i++ )
+					this.setupContent( 'option', objOptions.getItem( i ) );
+			}
+		},
+		onOk : function()
+		{
+			var editor = this.getParentEditor(),
+				element = this.selectBox,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+				element = editor.document.createElement( 'select' );
+			this.commitContent( element );
+
+			if ( isInsertMode )
+			{
+				editor.insertElement( element );
+				if ( CKEDITOR.env.ie )
+				{
+					var sel = editor.getSelection(),
+						bms = sel.createBookmarks();
+					setTimeout(function()
+					{
+						sel.selectBookmarks( bms );
+					}, 0 );
+				}
+			}
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.select.selectInfo,
+				title : editor.lang.select.selectInfo,
+				accessKey : '',
+				elements : [
+					{
+						id : 'txtName',
+						type : 'text',
+						widths : [ '25%','75%' ],
+						labelLayout : 'horizontal',
+						label : editor.lang.common.name,
+						'default' : '',
+						accessKey : 'N',
+						style : 'width:350px',
+						setup : function( name, element )
+						{
+							if ( name == 'clear' )
+								this.setValue( this[ 'default' ] || '' );
+							else if ( name == 'select' )
+							{
+								this.setValue(
+										element.data( 'cke-saved-name' ) ||
+										element.getAttribute( 'name' ) ||
+										'' );
+							}
+						},
+						commit : function( element )
+						{
+							if ( this.getValue() )
+								element.data( 'cke-saved-name', this.getValue() );
+							else
+							{
+								element.data( 'cke-saved-name', false );
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						id : 'txtValue',
+						type : 'text',
+						widths : [ '25%','75%' ],
+						labelLayout : 'horizontal',
+						label : editor.lang.select.value,
+						style : 'width:350px',
+						'default' : '',
+						className : 'cke_disabled',
+						onLoad : function()
+						{
+							this.getInputElement().setAttribute( 'readOnly', true );
+						},
+						setup : function( name, element )
+						{
+							if ( name == 'clear' )
+								this.setValue( '' );
+							else if ( name == 'option' && element.getAttribute( 'selected' ) )
+								this.setValue( element.$.value );
+						}
+					},
+					{
+						type : 'hbox',
+						widths : [ '175px', '170px' ],
+						children :
+						[
+							{
+								id : 'txtSize',
+								type : 'text',
+								labelLayout : 'horizontal',
+								label : editor.lang.select.size,
+								'default' : '',
+								accessKey : 'S',
+								style : 'width:175px',
+								validate: function()
+								{
+									var func = CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed );
+									return ( ( this.getValue() === '' ) || func.apply( this ) );
+								},
+								setup : function( name, element )
+								{
+									if ( name == 'select' )
+										this.setValue( element.getAttribute( 'size' ) || '' );
+									if ( CKEDITOR.env.webkit )
+										this.getInputElement().setStyle( 'width', '86px' );
+								},
+								commit : function( element )
+								{
+									if ( this.getValue() )
+										element.setAttribute( 'size', this.getValue() );
+									else
+										element.removeAttribute( 'size' );
+								}
+							},
+							{
+								type : 'html',
+								html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.select.lines ) + '</span>'
+							}
+						]
+					},
+					{
+						type : 'html',
+						html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.select.opAvail ) + '</span>'
+					},
+					{
+						type : 'hbox',
+						widths : [ '115px', '115px' ,'100px' ],
+						children :
+						[
+							{
+								type : 'vbox',
+								children :
+								[
+									{
+										id : 'txtOptName',
+										type : 'text',
+										label : editor.lang.select.opText,
+										style : 'width:115px',
+										setup : function( name, element )
+										{
+											if ( name == 'clear' )
+												this.setValue( "" );
+										}
+									},
+									{
+										type : 'select',
+										id : 'cmbName',
+										label : '',
+										title : '',
+										size : 5,
+										style : 'width:115px;height:75px',
+										items : [],
+										onChange : function()
+										{
+											var dialog = this.getDialog(),
+												values = dialog.getContentElement( 'info', 'cmbValue' ),
+												optName = dialog.getContentElement( 'info', 'txtOptName' ),
+												optValue = dialog.getContentElement( 'info', 'txtOptValue' ),
+												iIndex = getSelectedIndex( this );
+
+											setSelectedIndex( values, iIndex );
+											optName.setValue( this.getValue() );
+											optValue.setValue( values.getValue() );
+										},
+										setup : function( name, element )
+										{
+											if ( name == 'clear' )
+												removeAllOptions( this );
+											else if ( name == 'option' )
+												addOption( this, element.getText(), element.getText(),
+													this.getDialog().getParentEditor().document );
+										},
+										commit : function( element )
+										{
+											var dialog = this.getDialog(),
+												optionsNames = getOptions( this ),
+												optionsValues = getOptions( dialog.getContentElement( 'info', 'cmbValue' ) ),
+												selectValue = dialog.getContentElement( 'info', 'txtValue' ).getValue();
+
+											removeAllOptions( element );
+
+											for ( var i = 0 ; i < optionsNames.count() ; i++ )
+											{
+												var oOption = addOption( element, optionsNames.getItem( i ).getValue(),
+													optionsValues.getItem( i ).getValue(), dialog.getParentEditor().document );
+												if ( optionsValues.getItem( i ).getValue() == selectValue )
+												{
+													oOption.setAttribute( 'selected', 'selected' );
+													oOption.selected = true;
+												}
+											}
+										}
+									}
+								]
+							},
+							{
+								type : 'vbox',
+								children :
+								[
+									{
+										id : 'txtOptValue',
+										type : 'text',
+										label : editor.lang.select.opValue,
+										style : 'width:115px',
+										setup : function( name, element )
+										{
+											if ( name == 'clear' )
+												this.setValue( "" );
+										}
+									},
+									{
+										type : 'select',
+										id : 'cmbValue',
+										label : '',
+										size : 5,
+										style : 'width:115px;height:75px',
+										items : [],
+										onChange : function()
+										{
+											var dialog = this.getDialog(),
+												names = dialog.getContentElement( 'info', 'cmbName' ),
+												optName = dialog.getContentElement( 'info', 'txtOptName' ),
+												optValue = dialog.getContentElement( 'info', 'txtOptValue' ),
+												iIndex = getSelectedIndex( this );
+
+											setSelectedIndex( names, iIndex );
+											optName.setValue( names.getValue() );
+											optValue.setValue( this.getValue() );
+										},
+										setup : function( name, element )
+										{
+											if ( name == 'clear' )
+												removeAllOptions( this );
+											else if ( name == 'option' )
+											{
+												var oValue	= element.getValue();
+												addOption( this, oValue, oValue,
+													this.getDialog().getParentEditor().document );
+												if ( element.getAttribute( 'selected' ) == 'selected' )
+													this.getDialog().getContentElement( 'info', 'txtValue' ).setValue( oValue );
+											}
+										}
+									}
+								]
+							},
+							{
+								type : 'vbox',
+								padding : 5,
+								children :
+								[
+									{
+										type : 'button',
+										id : 'btnAdd',
+										style : '',
+										label : editor.lang.select.btnAdd,
+										title : editor.lang.select.btnAdd,
+										style : 'width:100%;',
+										onClick : function()
+										{
+											//Add new option.
+											var dialog = this.getDialog(),
+												parentEditor = dialog.getParentEditor(),
+												optName = dialog.getContentElement( 'info', 'txtOptName' ),
+												optValue = dialog.getContentElement( 'info', 'txtOptValue' ),
+												names = dialog.getContentElement( 'info', 'cmbName' ),
+												values = dialog.getContentElement( 'info', 'cmbValue' );
+
+											addOption(names, optName.getValue(), optName.getValue(), dialog.getParentEditor().document );
+											addOption(values, optValue.getValue(), optValue.getValue(), dialog.getParentEditor().document );
+
+											optName.setValue( "" );
+											optValue.setValue( "" );
+										}
+									},
+									{
+										type : 'button',
+										id : 'btnModify',
+										label : editor.lang.select.btnModify,
+										title : editor.lang.select.btnModify,
+										style : 'width:100%;',
+										onClick : function()
+										{
+											//Modify selected option.
+											var dialog = this.getDialog(),
+												optName = dialog.getContentElement( 'info', 'txtOptName' ),
+												optValue = dialog.getContentElement( 'info', 'txtOptValue' ),
+												names = dialog.getContentElement( 'info', 'cmbName' ),
+												values = dialog.getContentElement( 'info', 'cmbValue' ),
+												iIndex = getSelectedIndex( names );
+
+											if ( iIndex >= 0 )
+											{
+												modifyOption( names, iIndex, optName.getValue(), optName.getValue() );
+												modifyOption( values, iIndex, optValue.getValue(), optValue.getValue() );
+											}
+										}
+									},
+									{
+										type : 'button',
+										id : 'btnUp',
+										style : 'width:100%;',
+										label : editor.lang.select.btnUp,
+										title : editor.lang.select.btnUp,
+										onClick : function()
+										{
+											//Move up.
+											var dialog = this.getDialog(),
+												names = dialog.getContentElement( 'info', 'cmbName' ),
+												values = dialog.getContentElement( 'info', 'cmbValue' );
+
+											changeOptionPosition( names, -1, dialog.getParentEditor().document );
+											changeOptionPosition( values, -1, dialog.getParentEditor().document );
+										}
+									},
+									{
+										type : 'button',
+										id : 'btnDown',
+										style : 'width:100%;',
+										label : editor.lang.select.btnDown,
+										title : editor.lang.select.btnDown,
+										onClick : function()
+										{
+											//Move down.
+											var dialog = this.getDialog(),
+												names = dialog.getContentElement( 'info', 'cmbName' ),
+												values = dialog.getContentElement( 'info', 'cmbValue' );
+
+											changeOptionPosition( names, 1, dialog.getParentEditor().document );
+											changeOptionPosition( values, 1, dialog.getParentEditor().document );
+										}
+									}
+								]
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						widths : [ '40%', '20%', '40%' ],
+						children :
+						[
+							{
+								type : 'button',
+								id : 'btnSetValue',
+								label : editor.lang.select.btnSetValue,
+								title : editor.lang.select.btnSetValue,
+								onClick : function()
+								{
+									//Set as default value.
+									var dialog = this.getDialog(),
+										values = dialog.getContentElement( 'info', 'cmbValue' ),
+										txtValue = dialog.getContentElement( 'info', 'txtValue' );
+									txtValue.setValue( values.getValue() );
+								}
+							},
+							{
+								type : 'button',
+								id : 'btnDelete',
+								label : editor.lang.select.btnDelete,
+								title : editor.lang.select.btnDelete,
+								onClick : function()
+								{
+									// Delete option.
+									var dialog = this.getDialog(),
+										names = dialog.getContentElement( 'info', 'cmbName' ),
+										values = dialog.getContentElement( 'info', 'cmbValue' ),
+										optName = dialog.getContentElement( 'info', 'txtOptName' ),
+										optValue = dialog.getContentElement( 'info', 'txtOptValue' );
+
+									removeSelectedOptions( names );
+									removeSelectedOptions( values );
+
+									optName.setValue( "" );
+									optValue.setValue( "" );
+								}
+							},
+							{
+								id : 'chkMulti',
+								type : 'checkbox',
+								label : editor.lang.select.chkMulti,
+								'default' : '',
+								accessKey : 'M',
+								value : "checked",
+								setup : function( name, element )
+								{
+									if ( name == 'select' )
+										this.setValue( element.getAttribute( 'multiple' ) );
+									if ( CKEDITOR.env.webkit )
+										this.getElement().getParent().setStyle( 'vertical-align', 'middle' );
+								},
+								commit : function( element )
+								{
+									if ( this.getValue() )
+										element.setAttribute( 'multiple', this.getValue() );
+									else
+										element.removeAttribute( 'multiple' );
+								}
+							}
+						]
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textarea.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textarea.js
new file mode 100644
index 00000000..fcf10be8
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textarea.js
@@ -0,0 +1,135 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'textarea', function( editor )
+{
+	return {
+		title : editor.lang.textarea.title,
+		minWidth : 350,
+		minHeight : 220,
+		onShow : function()
+		{
+			delete this.textarea;
+
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+			if ( element && element.getName() == "textarea" )
+			{
+				this.textarea = element;
+				this.setupContent( element );
+			}
+		},
+		onOk : function()
+		{
+			var editor,
+				element = this.textarea,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+			{
+				editor = this.getParentEditor();
+				element = editor.document.createElement( 'textarea' );
+			}
+			this.commitContent( element );
+
+			if ( isInsertMode )
+				editor.insertElement( element );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.textarea.title,
+				title : editor.lang.textarea.title,
+				elements : [
+					{
+						id : '_cke_saved_name',
+						type : 'text',
+						label : editor.lang.common.name,
+						'default' : '',
+						accessKey : 'N',
+						setup : function( element )
+						{
+							this.setValue(
+									element.data( 'cke-saved-name' ) ||
+									element.getAttribute( 'name' ) ||
+									'' );
+						},
+						commit : function( element )
+						{
+							if ( this.getValue() )
+								element.data( 'cke-saved-name', this.getValue() );
+							else
+							{
+								element.data( 'cke-saved-name', false );
+								element.removeAttribute( 'name' );
+							}
+						}
+					},
+					{
+						type : 'hbox',
+						widths:['50%','50%'],
+						children:[
+							{
+								id : 'cols',
+								type : 'text',
+								label : editor.lang.textarea.cols,
+								'default' : '',
+								accessKey : 'C',
+								style : 'width:50px',
+								validate : CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed ),
+								setup : function( element )
+								{
+									var value = element.hasAttribute( 'cols' ) && element.getAttribute( 'cols' );
+									this.setValue( value || '' );
+								},
+								commit : function( element )
+								{
+									if ( this.getValue() )
+										element.setAttribute( 'cols', this.getValue() );
+									else
+										element.removeAttribute( 'cols' );
+								}
+							},
+							{
+								id : 'rows',
+								type : 'text',
+								label : editor.lang.textarea.rows,
+								'default' : '',
+								accessKey : 'R',
+								style : 'width:50px',
+								validate : CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed ),
+								setup : function( element )
+								{
+									var value = element.hasAttribute( 'rows' ) && element.getAttribute( 'rows' );
+									this.setValue( value || '' );
+								},
+								commit : function( element )
+								{
+									if ( this.getValue() )
+										element.setAttribute( 'rows', this.getValue() );
+									else
+										element.removeAttribute( 'rows' );
+								}
+							}
+						]
+					},
+					{
+						id : 'value',
+						type : 'textarea',
+						label : editor.lang.textfield.value,
+						'default' : '',
+						setup : function( element )
+						{
+							this.setValue( element.$.defaultValue );
+						},
+						commit : function( element )
+						{
+							element.$.value = element.$.defaultValue = this.getValue() ;
+						}
+					}
+
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textfield.js b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textfield.js
new file mode 100644
index 00000000..c0801a09
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/dialogs/textfield.js
@@ -0,0 +1,199 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add( 'textfield', function( editor )
+{
+	var autoAttributes =
+	{
+		value : 1,
+		size : 1,
+		maxLength : 1
+	};
+
+	var acceptedTypes =
+	{
+		text : 1,
+		password : 1
+	};
+
+	return {
+		title : editor.lang.textfield.title,
+		minWidth : 350,
+		minHeight : 150,
+		onShow : function()
+		{
+			delete this.textField;
+
+			var element = this.getParentEditor().getSelection().getSelectedElement();
+			if ( element && element.getName() == "input" &&
+					( acceptedTypes[ element.getAttribute( 'type' ) ] || !element.getAttribute( 'type' ) ) )
+			{
+				this.textField = element;
+				this.setupContent( element );
+			}
+		},
+		onOk : function()
+		{
+			var editor,
+				element = this.textField,
+				isInsertMode = !element;
+
+			if ( isInsertMode )
+			{
+				editor = this.getParentEditor();
+				element = editor.document.createElement( 'input' );
+				element.setAttribute( 'type', 'text' );
+			}
+
+			if ( isInsertMode )
+				editor.insertElement( element );
+			this.commitContent( { element : element } );
+		},
+		onLoad : function()
+		{
+			var autoSetup = function( element )
+			{
+				var value = element.hasAttribute( this.id ) && element.getAttribute( this.id );
+				this.setValue( value || '' );
+			};
+
+			var autoCommit = function( data )
+			{
+				var element = data.element;
+				var value = this.getValue();
+
+				if ( value )
+					element.setAttribute( this.id, value );
+				else
+					element.removeAttribute( this.id );
+			};
+
+			this.foreach( function( contentObj )
+				{
+					if ( autoAttributes[ contentObj.id ] )
+					{
+						contentObj.setup = autoSetup;
+						contentObj.commit = autoCommit;
+					}
+				} );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.textfield.title,
+				title : editor.lang.textfield.title,
+				elements : [
+					{
+						type : 'hbox',
+						widths : [ '50%', '50%' ],
+						children :
+						[
+							{
+								id : '_cke_saved_name',
+								type : 'text',
+								label : editor.lang.textfield.name,
+								'default' : '',
+								accessKey : 'N',
+								setup : function( element )
+								{
+									this.setValue(
+											element.data( 'cke-saved-name' ) ||
+											element.getAttribute( 'name' ) ||
+											'' );
+								},
+								commit : function( data )
+								{
+									var element = data.element;
+
+									if ( this.getValue() )
+										element.data( 'cke-saved-name', this.getValue() );
+									else
+									{
+										element.data( 'cke-saved-name', false );
+										element.removeAttribute( 'name' );
+									}
+								}
+							},
+							{
+								id : 'value',
+								type : 'text',
+								label : editor.lang.textfield.value,
+								'default' : '',
+								accessKey : 'V'
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						widths : [ '50%', '50%' ],
+						children :
+						[
+							{
+								id : 'size',
+								type : 'text',
+								label : editor.lang.textfield.charWidth,
+								'default' : '',
+								accessKey : 'C',
+								style : 'width:50px',
+								validate : CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed )
+							},
+							{
+								id : 'maxLength',
+								type : 'text',
+								label : editor.lang.textfield.maxChars,
+								'default' : '',
+								accessKey : 'M',
+								style : 'width:50px',
+								validate : CKEDITOR.dialog.validate.integer( editor.lang.common.validateNumberFailed )
+							}
+						],
+						onLoad : function()
+						{
+							// Repaint the style for IE7 (#6068)
+							if ( CKEDITOR.env.ie7Compat )
+								this.getElement().setStyle( 'zoom', '100%' );
+						}
+					},
+					{
+						id : 'type',
+						type : 'select',
+						label : editor.lang.textfield.type,
+						'default' : 'text',
+						accessKey : 'M',
+						items :
+						[
+							[ editor.lang.textfield.typeText, 'text' ],
+							[ editor.lang.textfield.typePass, 'password' ]
+						],
+						setup : function( element )
+						{
+							this.setValue( element.getAttribute( 'type' ) );
+						},
+						commit : function( data )
+						{
+							var element = data.element;
+
+							if ( CKEDITOR.env.ie )
+							{
+								var elementType = element.getAttribute( 'type' );
+								var myType = this.getValue();
+
+								if ( elementType != myType )
+								{
+									var replace = CKEDITOR.dom.element.createFromHtml( '<input type="' + myType + '"></input>', editor.document );
+									element.copyAttributes( replace, { type : 1 } );
+									replace.replace( element );
+									editor.getSelection().selectElement( replace );
+									data.element = replace;
+								}
+							}
+							else
+								element.setAttribute( 'type', this.getValue() );
+						}
+					}
+				]
+			}
+		]
+	};
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/images/hiddenfield.gif b/upload/public/js/3rd_party/ckeditor/plugins/forms/images/hiddenfield.gif
new file mode 100644
index 00000000..953f643b
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/forms/images/hiddenfield.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/forms/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/forms/index.html b/upload/public/js/3rd_party/ckeditor/plugins/forms/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/forms/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/iframe.js b/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/iframe.js
new file mode 100644
index 00000000..9bdf4a03
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/iframe.js
@@ -0,0 +1,229 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	// Map 'true' and 'false' values to match W3C's specifications
+	// http://www.w3.org/TR/REC-html40/present/frames.html#h-16.5
+	var checkboxValues =
+	{
+		scrolling : { 'true' : 'yes', 'false' : 'no' },
+		frameborder : { 'true' : '1', 'false' : '0' }
+	};
+
+	function loadValue( iframeNode )
+	{
+		var isCheckbox = this instanceof CKEDITOR.ui.dialog.checkbox;
+		if ( iframeNode.hasAttribute( this.id ) )
+		{
+			var value = iframeNode.getAttribute( this.id );
+			if ( isCheckbox )
+				this.setValue( checkboxValues[ this.id ][ 'true' ] == value.toLowerCase() );
+			else
+				this.setValue( value );
+		}
+	}
+
+	function commitValue( iframeNode )
+	{
+		var isRemove = this.getValue() === '',
+			isCheckbox = this instanceof CKEDITOR.ui.dialog.checkbox,
+			value = this.getValue();
+		if ( isRemove )
+			iframeNode.removeAttribute( this.att || this.id );
+		else if ( isCheckbox )
+			iframeNode.setAttribute( this.id, checkboxValues[ this.id ][ value ] );
+		else
+			iframeNode.setAttribute( this.att || this.id, value );
+	}
+
+	CKEDITOR.dialog.add( 'iframe', function( editor )
+	{
+		var iframeLang = editor.lang.iframe,
+			commonLang = editor.lang.common,
+			dialogadvtab = editor.plugins.dialogadvtab;
+		return {
+			title : iframeLang.title,
+			minWidth : 350,
+			minHeight : 260,
+			onShow : function()
+			{
+				// Clear previously saved elements.
+				this.fakeImage = this.iframeNode = null;
+
+				var fakeImage = this.getSelectedElement();
+				if ( fakeImage && fakeImage.data( 'cke-real-element-type' ) && fakeImage.data( 'cke-real-element-type' ) == 'iframe' )
+				{
+					this.fakeImage = fakeImage;
+
+					var iframeNode = editor.restoreRealElement( fakeImage );
+					this.iframeNode = iframeNode;
+
+					this.setupContent( iframeNode );
+				}
+			},
+			onOk : function()
+			{
+				var iframeNode;
+				if ( !this.fakeImage )
+					iframeNode = new CKEDITOR.dom.element( 'iframe' );
+				else
+					iframeNode = this.iframeNode;
+
+				// A subset of the specified attributes/styles
+				// should also be applied on the fake element to
+				// have better visual effect. (#5240)
+				var extraStyles = {}, extraAttributes = {};
+				this.commitContent( iframeNode, extraStyles, extraAttributes );
+
+				// Refresh the fake image.
+				var newFakeImage = editor.createFakeElement( iframeNode, 'cke_iframe', 'iframe', true );
+				newFakeImage.setAttributes( extraAttributes );
+				newFakeImage.setStyles( extraStyles );
+				if ( this.fakeImage )
+				{
+					newFakeImage.replace( this.fakeImage );
+					editor.getSelection().selectElement( newFakeImage );
+				}
+				else
+					editor.insertElement( newFakeImage );
+			},
+			contents : [
+				{
+					id : 'info',
+					label : commonLang.generalTab,
+					accessKey : 'I',
+					elements :
+					[
+						{
+							type : 'vbox',
+							padding : 0,
+							children :
+							[
+								{
+									id : 'src',
+									type : 'text',
+									label : commonLang.url,
+									required : true,
+									validate : CKEDITOR.dialog.validate.notEmpty( iframeLang.noUrl ),
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							children :
+							[
+								{
+									id : 'width',
+									type : 'text',
+									style : 'width:100%',
+									labelLayout : 'vertical',
+									label : commonLang.width,
+									validate : CKEDITOR.dialog.validate.htmlLength( commonLang.invalidHtmlLength.replace( '%1', commonLang.width ) ),
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'height',
+									type : 'text',
+									style : 'width:100%',
+									labelLayout : 'vertical',
+									label : commonLang.height,
+									validate : CKEDITOR.dialog.validate.htmlLength( commonLang.invalidHtmlLength.replace( '%1', commonLang.height ) ),
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'align',
+									type : 'select',
+									'default' : '',
+									items :
+									[
+										[ commonLang.notSet , '' ],
+										[ commonLang.alignLeft , 'left' ],
+										[ commonLang.alignRight , 'right' ],
+										[ commonLang.alignTop , 'top' ],
+										[ commonLang.alignMiddle , 'middle' ],
+										[ commonLang.alignBottom , 'bottom' ]
+									],
+									style : 'width:100%',
+									labelLayout : 'vertical',
+									label : commonLang.align,
+									setup : function( iframeNode, fakeImage )
+									{
+										loadValue.apply( this, arguments );
+										if ( fakeImage )
+										{
+											var fakeImageAlign = fakeImage.getAttribute( 'align' );
+											this.setValue( fakeImageAlign && fakeImageAlign.toLowerCase() || '' );
+										}
+									},
+									commit : function( iframeNode, extraStyles, extraAttributes )
+									{
+										commitValue.apply( this, arguments );
+										if ( this.getValue() )
+											extraAttributes.align = this.getValue();
+									}
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									id : 'scrolling',
+									type : 'checkbox',
+									label : iframeLang.scrolling,
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'frameborder',
+									type : 'checkbox',
+									label : iframeLang.border,
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									id : 'name',
+									type : 'text',
+									label : commonLang.name,
+									setup : loadValue,
+									commit : commitValue
+								},
+								{
+									id : 'title',
+									type : 'text',
+									label : commonLang.advisoryTitle,
+									setup : loadValue,
+									commit : commitValue
+								}
+							]
+						},
+						{
+							id : 'longdesc',
+							type : 'text',
+							label : commonLang.longDescr,
+							setup : loadValue,
+							commit : commitValue
+						}
+					]
+				},
+				dialogadvtab && dialogadvtab.createAdvancedTab( editor, { id:1, classes:1, styles:1 })
+			]
+		};
+	});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframe/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/placeholder.png b/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/placeholder.png
new file mode 100644
index 00000000..b40c7b20
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/iframe/images/placeholder.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframe/index.html b/upload/public/js/3rd_party/ckeditor/plugins/iframe/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframe/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/index.html b/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/plugin.js
new file mode 100644
index 00000000..6c901c79
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/iframedialog/plugin.js
@@ -0,0 +1,188 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Plugin for making iframe based dialogs.
+ */
+
+CKEDITOR.plugins.add( 'iframedialog',
+{
+	requires : [ 'dialog' ],
+	onLoad : function()
+	{
+		/**
+		 * An iframe base dialog.
+		 * @param {String} name Name of the dialog
+		 * @param {String} title Title of the dialog
+		 * @param {Number} minWidth Minimum width of the dialog
+		 * @param {Number} minHeight Minimum height of the dialog
+		 * @param {Function} [onContentLoad] Function called when the iframe has been loaded.
+		 * If it isn't specified, the inner frame is notified of the dialog events ('load',
+		 * 'resize', 'ok' and 'cancel') on a function called 'onDialogEvent'
+		 * @param {Object} [userDefinition] Additional properties for the dialog definition
+		 * @example
+		 */
+		CKEDITOR.dialog.addIframe = function( name, title, src, minWidth, minHeight, onContentLoad, userDefinition )
+		{
+			var element =
+			{
+				type : 'iframe',
+				src : src,
+				width : '100%',
+				height : '100%'
+			};
+
+			if ( typeof( onContentLoad ) == 'function' )
+				element.onContentLoad = onContentLoad;
+			else
+				element.onContentLoad = function()
+				{
+					var element = this.getElement(),
+						childWindow = element.$.contentWindow;
+
+					// If the inner frame has defined a "onDialogEvent" function, setup listeners
+					if ( childWindow.onDialogEvent )
+					{
+						var dialog = this.getDialog(),
+							notifyEvent = function(e)
+							{
+								return childWindow.onDialogEvent(e);
+							};
+
+						dialog.on( 'ok', notifyEvent );
+						dialog.on( 'cancel', notifyEvent );
+						dialog.on( 'resize', notifyEvent );
+
+						// Clear listeners
+						dialog.on( 'hide', function(e)
+							{
+								dialog.removeListener( 'ok', notifyEvent );
+								dialog.removeListener( 'cancel', notifyEvent );
+								dialog.removeListener( 'resize', notifyEvent );
+
+								e.removeListener();
+							} );
+
+						// Notify child iframe of load:
+						childWindow.onDialogEvent( {
+								name : 'load',
+								sender : this,
+								editor : dialog._.editor
+							} );
+					}
+				};
+
+			var definition =
+			{
+				title : title,
+				minWidth : minWidth,
+				minHeight : minHeight,
+				contents :
+				[
+					{
+						id : 'iframe',
+						label : title,
+						expand : true,
+						elements : [ element ]
+					}
+				]
+			};
+
+			for ( var i in userDefinition )
+				definition[i] = userDefinition[i];
+
+			this.add( name, function(){ return definition; } );
+		};
+
+		(function()
+		{
+			/**
+			 * An iframe element.
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @example
+			 * @constructor
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>src</strong> (Required) The src field of the iframe. </li>
+			 * 	<li><strong>width</strong> (Required) The iframe's width.</li>
+			 * 	<li><strong>height</strong> (Required) The iframe's height.</li>
+			 * 	<li><strong>onContentLoad</strong> (Optional) A function to be executed
+			 * 	after the iframe's contents has finished loading.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			var iframeElement = function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				var _ = ( this._ || ( this._ = {} ) ),
+					contentLoad = elementDefinition.onContentLoad && CKEDITOR.tools.bind( elementDefinition.onContentLoad, this ),
+					cssWidth = CKEDITOR.tools.cssLength( elementDefinition.width ),
+					cssHeight = CKEDITOR.tools.cssLength( elementDefinition.height );
+				_.frameId = CKEDITOR.tools.getNextId() + '_iframe';
+
+				// IE BUG: Parent container does not resize to contain the iframe automatically.
+				dialog.on( 'load', function()
+					{
+						var iframe = CKEDITOR.document.getById( _.frameId ),
+							parentContainer = iframe.getParent();
+
+						parentContainer.setStyles(
+							{
+								width : cssWidth,
+								height : cssHeight
+							} );
+					} );
+
+				var attributes =
+				{
+					src : '%2',
+					id : _.frameId,
+					frameborder : 0,
+					allowtransparency : true
+				};
+				var myHtml = [];
+
+				if ( typeof( elementDefinition.onContentLoad ) == 'function' )
+					attributes.onload = 'CKEDITOR.tools.callFunction(%1);';
+
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, myHtml, 'iframe',
+						{
+							width : cssWidth,
+							height : cssHeight
+						}, attributes, '' );
+
+				// Put a placeholder for the first time.
+				htmlList.push( '<div style="width:' + cssWidth + ';height:' + cssHeight + ';" id="' + this.domId + '"></div>' );
+
+				// Iframe elements should be refreshed whenever it is shown.
+				myHtml = myHtml.join( '' );
+				dialog.on( 'show', function()
+					{
+						var iframe = CKEDITOR.document.getById( _.frameId ),
+							parentContainer = iframe.getParent(),
+							callIndex = CKEDITOR.tools.addFunction( contentLoad ),
+							html = myHtml.replace( '%1', callIndex ).replace( '%2', CKEDITOR.tools.htmlEncode( elementDefinition.src ) );
+						parentContainer.setHtml( html );
+					} );
+			};
+
+			iframeElement.prototype = new CKEDITOR.ui.dialog.uiElement;
+
+			CKEDITOR.dialog.addUIElement( 'iframe',
+				{
+					build : function( dialog, elementDefinition, output )
+					{
+						return new iframeElement( dialog, elementDefinition, output );
+					}
+				} );
+		})();
+	}
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/image.js b/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/image.js
new file mode 100644
index 00000000..95dd6bc6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/image.js
@@ -0,0 +1,1411 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var imageDialog = function( editor, dialogType )
+	{
+		// Load image preview.
+		var IMAGE = 1,
+			LINK = 2,
+			PREVIEW = 4,
+			CLEANUP = 8,
+			regexGetSize = /^\s*(\d+)((px)|\%)?\s*$/i,
+			regexGetSizeOrEmpty = /(^\s*(\d+)((px)|\%)?\s*$)|^$/i,
+			pxLengthRegex = /^\d+px$/;
+
+		var onSizeChange = function()
+		{
+			var value = this.getValue(),	// This = input element.
+				dialog = this.getDialog(),
+				aMatch  =  value.match( regexGetSize );	// Check value
+			if ( aMatch )
+			{
+				if ( aMatch[2] == '%' )			// % is allowed - > unlock ratio.
+					switchLockRatio( dialog, false );	// Unlock.
+				value = aMatch[1];
+			}
+
+			// Only if ratio is locked
+			if ( dialog.lockRatio )
+			{
+				var oImageOriginal = dialog.originalElement;
+				if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+				{
+					if ( this.id == 'txtHeight' )
+					{
+						if ( value && value != '0' )
+							value = Math.round( oImageOriginal.$.width * ( value  / oImageOriginal.$.height ) );
+						if ( !isNaN( value ) )
+							dialog.setValueOf( 'info', 'txtWidth', value );
+					}
+					else		//this.id = txtWidth.
+					{
+						if ( value && value != '0' )
+							value = Math.round( oImageOriginal.$.height * ( value  / oImageOriginal.$.width ) );
+						if ( !isNaN( value ) )
+							dialog.setValueOf( 'info', 'txtHeight', value );
+					}
+				}
+			}
+			updatePreview( dialog );
+		};
+
+		var updatePreview = function( dialog )
+		{
+			//Don't load before onShow.
+			if ( !dialog.originalElement || !dialog.preview )
+				return 1;
+
+			// Read attributes and update imagePreview;
+			dialog.commitContent( PREVIEW, dialog.preview );
+			return 0;
+		};
+
+		// Custom commit dialog logic, where we're intended to give inline style
+		// field (txtdlgGenStyle) higher priority to avoid overwriting styles contribute
+		// by other fields.
+		function commitContent()
+		{
+			var args = arguments;
+			var inlineStyleField = this.getContentElement( 'advanced', 'txtdlgGenStyle' );
+			inlineStyleField && inlineStyleField.commit.apply( inlineStyleField, args );
+
+			this.foreach( function( widget )
+			{
+				if ( widget.commit &&  widget.id != 'txtdlgGenStyle' )
+					widget.commit.apply( widget, args );
+			});
+		}
+
+		// Avoid recursions.
+		var incommit;
+
+		// Synchronous field values to other impacted fields is required, e.g. border
+		// size change should alter inline-style text as well.
+		function commitInternally( targetFields )
+		{
+			if ( incommit )
+				return;
+
+			incommit = 1;
+
+			var dialog = this.getDialog(),
+				element = dialog.imageElement;
+			if ( element )
+			{
+				// Commit this field and broadcast to target fields.
+				this.commit( IMAGE, element );
+
+				targetFields = [].concat( targetFields );
+				var length = targetFields.length,
+					field;
+				for ( var i = 0; i < length; i++ )
+				{
+					field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );
+					// May cause recursion.
+					field && field.setup( IMAGE, element );
+				}
+			}
+
+			incommit = 0;
+		}
+
+		var switchLockRatio = function( dialog, value )
+		{
+			if ( !dialog.getContentElement( 'info', 'ratioLock' ) )
+				return null;
+
+			var oImageOriginal = dialog.originalElement;
+
+			// Dialog may already closed. (#5505)
+			if( !oImageOriginal )
+				return null;
+
+			// Check image ratio and original image ratio, but respecting user's preference.
+			if ( value == 'check' )
+			{
+				if ( !dialog.userlockRatio && oImageOriginal.getCustomData( 'isReady' ) == 'true'  )
+				{
+					var width = dialog.getValueOf( 'info', 'txtWidth' ),
+						height = dialog.getValueOf( 'info', 'txtHeight' ),
+						originalRatio = oImageOriginal.$.width * 1000 / oImageOriginal.$.height,
+						thisRatio = width * 1000 / height;
+					dialog.lockRatio  = false;		// Default: unlock ratio
+
+					if ( !width && !height )
+						dialog.lockRatio = true;
+					else if ( !isNaN( originalRatio ) && !isNaN( thisRatio ) )
+					{
+						if ( Math.round( originalRatio ) == Math.round( thisRatio ) )
+							dialog.lockRatio = true;
+					}
+				}
+			}
+			else if ( value != undefined )
+				dialog.lockRatio = value;
+			else
+			{
+				dialog.userlockRatio = 1;
+				dialog.lockRatio = !dialog.lockRatio;
+			}
+
+			var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
+			if ( dialog.lockRatio )
+				ratioButton.removeClass( 'cke_btn_unlocked' );
+			else
+				ratioButton.addClass( 'cke_btn_unlocked' );
+
+			ratioButton.setAttribute( 'aria-checked', dialog.lockRatio );
+
+			// Ratio button hc presentation - WHITE SQUARE / BLACK SQUARE
+			if ( CKEDITOR.env.hc )
+			{
+				var icon = ratioButton.getChild( 0 );
+				icon.setHtml(  dialog.lockRatio ? CKEDITOR.env.ie ? '\u25A0': '\u25A3' : CKEDITOR.env.ie ? '\u25A1' : '\u25A2' );
+			}
+
+			return dialog.lockRatio;
+		};
+
+		var resetSize = function( dialog )
+		{
+			var oImageOriginal = dialog.originalElement;
+			if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+			{
+				var widthField = dialog.getContentElement( 'info', 'txtWidth' ),
+					heightField = dialog.getContentElement( 'info', 'txtHeight' );
+				widthField && widthField.setValue( oImageOriginal.$.width );
+				heightField && heightField.setValue( oImageOriginal.$.height );
+			}
+			updatePreview( dialog );
+		};
+
+		var setupDimension = function( type, element )
+		{
+			if ( type != IMAGE )
+				return;
+
+			function checkDimension( size, defaultValue )
+			{
+				var aMatch  =  size.match( regexGetSize );
+				if ( aMatch )
+				{
+					if ( aMatch[2] == '%' )				// % is allowed.
+					{
+						aMatch[1] += '%';
+						switchLockRatio( dialog, false );	// Unlock ratio
+					}
+					return aMatch[1];
+				}
+				return defaultValue;
+			}
+
+			var dialog = this.getDialog(),
+				value = '',
+				dimension = this.id == 'txtWidth' ? 'width' : 'height',
+				size = element.getAttribute( dimension );
+
+			if ( size )
+				value = checkDimension( size, value );
+			value = checkDimension( element.getStyle( dimension ), value );
+
+			this.setValue( value );
+		};
+
+		var previewPreloader;
+
+		var onImgLoadEvent = function()
+		{
+			// Image is ready.
+			var original = this.originalElement;
+			original.setCustomData( 'isReady', 'true' );
+			original.removeListener( 'load', onImgLoadEvent );
+			original.removeListener( 'error', onImgLoadErrorEvent );
+			original.removeListener( 'abort', onImgLoadErrorEvent );
+
+			// Hide loader
+			CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
+
+			// New image -> new domensions
+			if ( !this.dontResetSize )
+				resetSize( this );
+
+			if ( this.firstLoad )
+				CKEDITOR.tools.setTimeout( function(){ switchLockRatio( this, 'check' ); }, 0, this );
+
+			this.firstLoad = false;
+			this.dontResetSize = false;
+		};
+
+		var onImgLoadErrorEvent = function()
+		{
+			// Error. Image is not loaded.
+			var original = this.originalElement;
+			original.removeListener( 'load', onImgLoadEvent );
+			original.removeListener( 'error', onImgLoadErrorEvent );
+			original.removeListener( 'abort', onImgLoadErrorEvent );
+
+			// Set Error image.
+			var noimage = CKEDITOR.getUrl( editor.skinPath + 'images/noimage.png' );
+
+			if ( this.preview )
+				this.preview.setAttribute( 'src', noimage );
+
+			// Hide loader
+			CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
+			switchLockRatio( this, false );	// Unlock.
+		};
+
+		var numbering = function( id )
+			{
+				return CKEDITOR.tools.getNextId() + '_' + id;
+			},
+			btnLockSizesId = numbering( 'btnLockSizes' ),
+			btnResetSizeId = numbering( 'btnResetSize' ),
+			imagePreviewLoaderId = numbering( 'ImagePreviewLoader' ),
+			imagePreviewBoxId = numbering( 'ImagePreviewBox' ),
+			previewLinkId = numbering( 'previewLink' ),
+			previewImageId = numbering( 'previewImage' );
+
+		return {
+			title : editor.lang.image[ dialogType == 'image' ? 'title' : 'titleButton' ],
+			minWidth : 420,
+			minHeight : 360,
+			onShow : function()
+			{
+				this.imageElement = false;
+				this.linkElement = false;
+
+				// Default: create a new element.
+				this.imageEditMode = false;
+				this.linkEditMode = false;
+
+				this.lockRatio = true;
+				this.userlockRatio = 0;
+				this.dontResetSize = false;
+				this.firstLoad = true;
+				this.addLink = false;
+
+				var editor = this.getParentEditor(),
+					sel = this.getParentEditor().getSelection(),
+					element = sel.getSelectedElement(),
+					link = element && element.getAscendant( 'a' );
+
+				//Hide loader.
+				CKEDITOR.document.getById( imagePreviewLoaderId ).setStyle( 'display', 'none' );
+				// Create the preview before setup the dialog contents.
+				previewPreloader = new CKEDITOR.dom.element( 'img', editor.document );
+				this.preview = CKEDITOR.document.getById( previewImageId );
+
+				// Copy of the image
+				this.originalElement = editor.document.createElement( 'img' );
+				this.originalElement.setAttribute( 'alt', '' );
+				this.originalElement.setCustomData( 'isReady', 'false' );
+
+				if ( link )
+				{
+					this.linkElement = link;
+					this.linkEditMode = true;
+
+					// Look for Image element.
+					var linkChildren = link.getChildren();
+					if ( linkChildren.count() == 1 )			// 1 child.
+					{
+						var childTagName = linkChildren.getItem( 0 ).getName();
+						if ( childTagName == 'img' || childTagName == 'input' )
+						{
+							this.imageElement = linkChildren.getItem( 0 );
+							if ( this.imageElement.getName() == 'img' )
+								this.imageEditMode = 'img';
+							else if ( this.imageElement.getName() == 'input' )
+								this.imageEditMode = 'input';
+						}
+					}
+					// Fill out all fields.
+					if ( dialogType == 'image' )
+						this.setupContent( LINK, link );
+				}
+
+				if ( element && element.getName() == 'img' && !element.data( 'cke-realelement' )
+					|| element && element.getName() == 'input' && element.getAttribute( 'type' ) == 'image' )
+				{
+					this.imageEditMode = element.getName();
+					this.imageElement = element;
+				}
+
+				if ( this.imageEditMode )
+				{
+					// Use the original element as a buffer from  since we don't want
+					// temporary changes to be committed, e.g. if the dialog is canceled.
+					this.cleanImageElement = this.imageElement;
+					this.imageElement = this.cleanImageElement.clone( true, true );
+
+					// Fill out all fields.
+					this.setupContent( IMAGE, this.imageElement );
+				}
+				else
+					this.imageElement =  editor.document.createElement( 'img' );
+
+				// Refresh LockRatio button
+				switchLockRatio ( this, true );
+
+				// Dont show preview if no URL given.
+				if ( !CKEDITOR.tools.trim( this.getValueOf( 'info', 'txtUrl' ) ) )
+				{
+					this.preview.removeAttribute( 'src' );
+					this.preview.setStyle( 'display', 'none' );
+				}
+			},
+			onOk : function()
+			{
+				// Edit existing Image.
+				if ( this.imageEditMode )
+				{
+					var imgTagName = this.imageEditMode;
+
+					// Image dialog and Input element.
+					if ( dialogType == 'image' && imgTagName == 'input' && confirm( editor.lang.image.button2Img ) )
+					{
+						// Replace INPUT-> IMG
+						imgTagName = 'img';
+						this.imageElement = editor.document.createElement( 'img' );
+						this.imageElement.setAttribute( 'alt', '' );
+						editor.insertElement( this.imageElement );
+					}
+					// ImageButton dialog and Image element.
+					else if ( dialogType != 'image' && imgTagName == 'img' && confirm( editor.lang.image.img2Button ))
+					{
+						// Replace IMG -> INPUT
+						imgTagName = 'input';
+						this.imageElement = editor.document.createElement( 'input' );
+						this.imageElement.setAttributes(
+							{
+								type : 'image',
+								alt : ''
+							}
+						);
+						editor.insertElement( this.imageElement );
+					}
+					else
+					{
+						// Restore the original element before all commits.
+						this.imageElement = this.cleanImageElement;
+						delete this.cleanImageElement;
+					}
+				}
+				else	// Create a new image.
+				{
+					// Image dialog -> create IMG element.
+					if ( dialogType == 'image' )
+						this.imageElement = editor.document.createElement( 'img' );
+					else
+					{
+						this.imageElement = editor.document.createElement( 'input' );
+						this.imageElement.setAttribute ( 'type' ,'image' );
+					}
+					this.imageElement.setAttribute( 'alt', '' );
+				}
+
+				// Create a new link.
+				if ( !this.linkEditMode )
+					this.linkElement = editor.document.createElement( 'a' );
+
+				// Set attributes.
+				this.commitContent( IMAGE, this.imageElement );
+				this.commitContent( LINK, this.linkElement );
+
+				// Remove empty style attribute.
+				if ( !this.imageElement.getAttribute( 'style' ) )
+					this.imageElement.removeAttribute( 'style' );
+
+				// Insert a new Image.
+				if ( !this.imageEditMode )
+				{
+					if ( this.addLink )
+					{
+						//Insert a new Link.
+						if ( !this.linkEditMode )
+						{
+							editor.insertElement( this.linkElement );
+							this.linkElement.append( this.imageElement, false );
+						}
+						else	 //Link already exists, image not.
+							editor.insertElement( this.imageElement );
+					}
+					else
+						editor.insertElement( this.imageElement );
+				}
+				else		// Image already exists.
+				{
+					//Add a new link element.
+					if ( !this.linkEditMode && this.addLink )
+					{
+						editor.insertElement( this.linkElement );
+						this.imageElement.appendTo( this.linkElement );
+					}
+					//Remove Link, Image exists.
+					else if ( this.linkEditMode && !this.addLink )
+					{
+						editor.getSelection().selectElement( this.linkElement );
+						editor.insertElement( this.imageElement );
+					}
+				}
+			},
+			onLoad : function()
+			{
+				if ( dialogType != 'image' )
+					this.hidePage( 'Link' );		//Hide Link tab.
+				var doc = this._.element.getDocument();
+
+				if ( this.getContentElement( 'info', 'ratioLock' ) )
+				{
+					this.addFocusable( doc.getById( btnResetSizeId ), 5 );
+					this.addFocusable( doc.getById( btnLockSizesId ), 5 );
+				}
+
+				this.commitContent = commitContent;
+			},
+			onHide : function()
+			{
+				if ( this.preview )
+					this.commitContent( CLEANUP, this.preview );
+
+				if ( this.originalElement )
+				{
+					this.originalElement.removeListener( 'load', onImgLoadEvent );
+					this.originalElement.removeListener( 'error', onImgLoadErrorEvent );
+					this.originalElement.removeListener( 'abort', onImgLoadErrorEvent );
+					this.originalElement.remove();
+					this.originalElement = false;		// Dialog is closed.
+				}
+
+				delete this.imageElement;
+			},
+			contents : [
+				{
+					id : 'info',
+					label : editor.lang.image.infoTab,
+					accessKey : 'I',
+					elements :
+					[
+						{
+							type : 'vbox',
+							padding : 0,
+							children :
+							[
+								{
+									type : 'hbox',
+									widths : [ '280px', '110px' ],
+									align : 'right',
+									children :
+									[
+										{
+											id : 'txtUrl',
+											type : 'text',
+											label : editor.lang.common.url,
+											required: true,
+											onChange : function()
+											{
+												var dialog = this.getDialog(),
+													newUrl = this.getValue();
+
+												//Update original image
+												if ( newUrl.length > 0 )	//Prevent from load before onShow
+												{
+													dialog = this.getDialog();
+													var original = dialog.originalElement;
+
+													dialog.preview.removeStyle( 'display' );
+
+													original.setCustomData( 'isReady', 'false' );
+													// Show loader
+													var loader = CKEDITOR.document.getById( imagePreviewLoaderId );
+													if ( loader )
+														loader.setStyle( 'display', '' );
+
+													original.on( 'load', onImgLoadEvent, dialog );
+													original.on( 'error', onImgLoadErrorEvent, dialog );
+													original.on( 'abort', onImgLoadErrorEvent, dialog );
+													original.setAttribute( 'src', newUrl );
+
+													// Query the preloader to figure out the url impacted by based href.
+													previewPreloader.setAttribute( 'src', newUrl );
+													dialog.preview.setAttribute( 'src', previewPreloader.$.src );
+													updatePreview( dialog );
+												}
+												// Dont show preview if no URL given.
+												else if ( dialog.preview )
+												{
+													dialog.preview.removeAttribute( 'src' );
+													dialog.preview.setStyle( 'display', 'none' );
+												}
+											},
+											setup : function( type, element )
+											{
+												if ( type == IMAGE )
+												{
+													var url = element.data( 'cke-saved-src' ) || element.getAttribute( 'src' );
+													var field = this;
+
+													this.getDialog().dontResetSize = true;
+
+													field.setValue( url );		// And call this.onChange()
+													// Manually set the initial value.(#4191)
+													field.setInitValue();
+												}
+											},
+											commit : function( type, element )
+											{
+												if ( type == IMAGE && ( this.getValue() || this.isChanged() ) )
+												{
+													element.data( 'cke-saved-src', this.getValue() );
+													element.setAttribute( 'src', this.getValue() );
+												}
+												else if ( type == CLEANUP )
+												{
+													element.setAttribute( 'src', '' );	// If removeAttribute doesn't work.
+													element.removeAttribute( 'src' );
+												}
+											},
+											validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.image.urlMissing )
+										},
+										{
+											type : 'button',
+											id : 'browse',
+											// v-align with the 'txtUrl' field.
+											// TODO: We need something better than a fixed size here.
+											style : 'display:inline-block;margin-top:10px;',
+											align : 'center',
+											label : editor.lang.common.browseServer,
+											hidden : true,
+											filebrowser : 'info:txtUrl'
+										}
+									]
+								}
+							]
+						},
+						{
+							id : 'txtAlt',
+							hidden: true,
+							type : 'text',
+							label : editor.lang.image.alt,
+							accessKey : 'T',
+							'default' : '',
+							onChange : function()
+							{
+								updatePreview( this.getDialog() );
+							},
+							setup : function( type, element )
+							{
+								if ( type == IMAGE )
+									this.setValue( element.getAttribute( 'alt' ) );
+							},
+							commit : function( type, element )
+							{
+								if ( type == IMAGE )
+								{
+									if ( this.getValue() || this.isChanged() )
+										element.setAttribute( 'alt', this.getValue() );
+								}
+								else if ( type == PREVIEW )
+								{
+									element.setAttribute( 'alt', this.getValue() );
+								}
+								else if ( type == CLEANUP )
+								{
+									element.removeAttribute( 'alt' );
+								}
+							}
+						},
+						{
+							type : 'hbox',
+							hidden: true,
+							children :
+							[
+								{
+									id : 'basic',
+									type : 'vbox',
+									children :
+									[
+										{
+											type : 'hbox',
+											widths : [ '50%', '50%' ],
+											children :
+											[
+												{
+													type : 'vbox',
+													padding : 1,
+													children :
+													[
+														{
+															type : 'text',
+															width: '40px',
+															id : 'txtWidth',
+															label : editor.lang.common.width,
+															onKeyUp : onSizeChange,
+															onChange : function()
+															{
+																commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+															},
+															validate : function()
+															{
+																var aMatch  =  this.getValue().match( regexGetSizeOrEmpty ),
+																	isValid = !!( aMatch && parseInt( aMatch[1], 10 ) !== 0 );
+																if ( !isValid )
+																	alert( editor.lang.common.invalidWidth );
+																return isValid;
+															},
+															setup : setupDimension,
+															commit : function( type, element, internalCommit )
+															{
+																var value = this.getValue();
+																if ( type == IMAGE )
+																{
+																	if ( value )
+																		element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
+																	else
+																		element.removeStyle( 'width' );
+
+																	!internalCommit && element.removeAttribute( 'width' );
+																}
+																else if ( type == PREVIEW )
+																{
+																	var aMatch = value.match( regexGetSize );
+																	if ( !aMatch )
+																	{
+																		var oImageOriginal = this.getDialog().originalElement;
+																		if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+																			element.setStyle( 'width',  oImageOriginal.$.width + 'px');
+																	}
+																	else
+																		element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
+																}
+																else if ( type == CLEANUP )
+																{
+																	element.removeAttribute( 'width' );
+																	element.removeStyle( 'width' );
+																}
+															}
+														},
+														{
+															type : 'text',
+															id : 'txtHeight',
+															width: '40px',
+															label : editor.lang.common.height,
+															onKeyUp : onSizeChange,
+															onChange : function()
+															{
+																commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+															},
+															validate : function()
+															{
+																var aMatch = this.getValue().match( regexGetSizeOrEmpty ),
+																	isValid = !!( aMatch && parseInt( aMatch[1], 10 ) !== 0 );
+																if ( !isValid )
+																	alert( editor.lang.common.invalidHeight );
+																return isValid;
+															},
+															setup : setupDimension,
+															commit : function( type, element, internalCommit )
+															{
+																var value = this.getValue();
+																if ( type == IMAGE )
+																{
+																	if ( value )
+																		element.setStyle( 'height', CKEDITOR.tools.cssLength( value ) );
+																	else
+																		element.removeStyle( 'height' );
+
+																	!internalCommit && element.removeAttribute( 'height' );
+																}
+																else if ( type == PREVIEW )
+																{
+																	var aMatch = value.match( regexGetSize );
+																	if ( !aMatch )
+																	{
+																		var oImageOriginal = this.getDialog().originalElement;
+																		if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+																			element.setStyle( 'height', oImageOriginal.$.height + 'px' );
+																	}
+																	else
+																		element.setStyle( 'height',  CKEDITOR.tools.cssLength( value ) );
+																}
+																else if ( type == CLEANUP )
+																{
+																	element.removeAttribute( 'height' );
+																	element.removeStyle( 'height' );
+																}
+															}
+														}
+													]
+												},
+												{
+													id : 'ratioLock',
+													type : 'html',
+													style : 'margin-top:30px;width:40px;height:40px;',
+													onLoad : function()
+													{
+														// Activate Reset button
+														var	resetButton = CKEDITOR.document.getById( btnResetSizeId ),
+															ratioButton = CKEDITOR.document.getById( btnLockSizesId );
+														if ( resetButton )
+														{
+															resetButton.on( 'click', function( evt )
+																{
+																	resetSize( this );
+																	evt.data && evt.data.preventDefault();
+																}, this.getDialog() );
+															resetButton.on( 'mouseover', function()
+																{
+																	this.addClass( 'cke_btn_over' );
+																}, resetButton );
+															resetButton.on( 'mouseout', function()
+																{
+																	this.removeClass( 'cke_btn_over' );
+																}, resetButton );
+														}
+														// Activate (Un)LockRatio button
+														if ( ratioButton )
+														{
+															ratioButton.on( 'click', function(evt)
+																{
+																	var locked = switchLockRatio( this ),
+																		oImageOriginal = this.originalElement,
+																		width = this.getValueOf( 'info', 'txtWidth' );
+
+																	if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' && width )
+																	{
+																		var height = oImageOriginal.$.height / oImageOriginal.$.width * width;
+																		if ( !isNaN( height ) )
+																		{
+																			this.setValueOf( 'info', 'txtHeight', Math.round( height ) );
+																			updatePreview( this );
+																		}
+																	}
+																	evt.data && evt.data.preventDefault();
+																}, this.getDialog() );
+															ratioButton.on( 'mouseover', function()
+																{
+																	this.addClass( 'cke_btn_over' );
+																}, ratioButton );
+															ratioButton.on( 'mouseout', function()
+																{
+																	this.removeClass( 'cke_btn_over' );
+																}, ratioButton );
+														}
+													},
+													html : '<div>'+
+														'<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.lockRatio +
+														'" class="cke_btn_locked" id="' + btnLockSizesId + '" role="checkbox"><span class="cke_icon"></span><span class="cke_label">' + editor.lang.image.lockRatio + '</span></a>' +
+														'<a href="javascript:void(0)" tabindex="-1" title="' + editor.lang.image.resetSize +
+														'" class="cke_btn_reset" id="' + btnResetSizeId + '" role="button"><span class="cke_label">' + editor.lang.image.resetSize + '</span></a>'+
+														'</div>'
+												}
+											]
+										},
+										{
+											type : 'vbox',
+											padding : 1,
+											children :
+											[
+												{
+													type : 'text',
+													id : 'txtBorder',
+													width: '60px',
+													label : editor.lang.image.border,
+													'default' : '',
+													onKeyUp : function()
+													{
+														updatePreview( this.getDialog() );
+													},
+													onChange : function()
+													{
+														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateBorder ),
+													setup : function( type, element )
+													{
+														if ( type == IMAGE )
+														{
+															var value,
+																borderStyle = element.getStyle( 'border-width' );
+															borderStyle = borderStyle && borderStyle.match( /^(\d+px)(?: \1 \1 \1)?$/ );
+															value = borderStyle && parseInt( borderStyle[ 1 ], 10 );
+															isNaN ( parseInt( value, 10 ) ) && ( value = element.getAttribute( 'border' ) );
+															this.setValue( value );
+														}
+													},
+													commit : function( type, element, internalCommit )
+													{
+														var value = parseInt( this.getValue(), 10 );
+														if ( type == IMAGE || type == PREVIEW )
+														{
+															if ( !isNaN( value ) )
+															{
+																element.setStyle( 'border-width', CKEDITOR.tools.cssLength( value ) );
+																element.setStyle( 'border-style', 'solid' );
+															}
+															else if ( !value && this.isChanged() )
+															{
+																element.removeStyle( 'border-width' );
+																element.removeStyle( 'border-style' );
+																element.removeStyle( 'border-color' );
+															}
+
+															if ( !internalCommit && type == IMAGE )
+																element.removeAttribute( 'border' );
+														}
+														else if ( type == CLEANUP )
+														{
+															element.removeAttribute( 'border' );
+															element.removeStyle( 'border-width' );
+															element.removeStyle( 'border-style' );
+															element.removeStyle( 'border-color' );
+														}
+													}
+												},
+												{
+													type : 'text',
+													id : 'txtHSpace',
+													width: '60px',
+													label : editor.lang.image.hSpace,
+													'default' : '',
+													onKeyUp : function()
+													{
+														updatePreview( this.getDialog() );
+													},
+													onChange : function()
+													{
+														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateHSpace ),
+													setup : function( type, element )
+													{
+														if ( type == IMAGE )
+														{
+															var value,
+																marginLeftPx,
+																marginRightPx,
+																marginLeftStyle = element.getStyle( 'margin-left' ),
+																marginRightStyle = element.getStyle( 'margin-right' );
+
+															marginLeftStyle = marginLeftStyle && marginLeftStyle.match( pxLengthRegex );
+															marginRightStyle = marginRightStyle && marginRightStyle.match( pxLengthRegex );
+															marginLeftPx = parseInt( marginLeftStyle, 10 );
+															marginRightPx = parseInt( marginRightStyle, 10 );
+
+															value = ( marginLeftPx == marginRightPx ) && marginLeftPx;
+															isNaN( parseInt( value, 10 ) ) && ( value = element.getAttribute( 'hspace' ) );
+
+															this.setValue( value );
+														}
+													},
+													commit : function( type, element, internalCommit )
+													{
+														var value = parseInt( this.getValue(), 10 );
+														if ( type == IMAGE || type == PREVIEW )
+														{
+															if ( !isNaN( value ) )
+															{
+																element.setStyle( 'margin-left', CKEDITOR.tools.cssLength( value ) );
+																element.setStyle( 'margin-right', CKEDITOR.tools.cssLength( value ) );
+															}
+															else if ( !value && this.isChanged( ) )
+															{
+																element.removeStyle( 'margin-left' );
+																element.removeStyle( 'margin-right' );
+															}
+
+															if ( !internalCommit && type == IMAGE )
+																element.removeAttribute( 'hspace' );
+														}
+														else if ( type == CLEANUP )
+														{
+															element.removeAttribute( 'hspace' );
+															element.removeStyle( 'margin-left' );
+															element.removeStyle( 'margin-right' );
+														}
+													}
+												},
+												{
+													type : 'text',
+													id : 'txtVSpace',
+													width : '60px',
+													label : editor.lang.image.vSpace,
+													'default' : '',
+													onKeyUp : function()
+													{
+														updatePreview( this.getDialog() );
+													},
+													onChange : function()
+													{
+														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+													},
+													validate : CKEDITOR.dialog.validate.integer( editor.lang.image.validateVSpace ),
+													setup : function( type, element )
+													{
+														if ( type == IMAGE )
+														{
+															var value,
+																marginTopPx,
+																marginBottomPx,
+																marginTopStyle = element.getStyle( 'margin-top' ),
+																marginBottomStyle = element.getStyle( 'margin-bottom' );
+
+															marginTopStyle = marginTopStyle && marginTopStyle.match( pxLengthRegex );
+															marginBottomStyle = marginBottomStyle && marginBottomStyle.match( pxLengthRegex );
+															marginTopPx = parseInt( marginTopStyle, 10 );
+															marginBottomPx = parseInt( marginBottomStyle, 10 );
+
+															value = ( marginTopPx == marginBottomPx ) && marginTopPx;
+															isNaN ( parseInt( value, 10 ) ) && ( value = element.getAttribute( 'vspace' ) );
+															this.setValue( value );
+														}
+													},
+													commit : function( type, element, internalCommit )
+													{
+														var value = parseInt( this.getValue(), 10 );
+														if ( type == IMAGE || type == PREVIEW )
+														{
+															if ( !isNaN( value ) )
+															{
+																element.setStyle( 'margin-top', CKEDITOR.tools.cssLength( value ) );
+																element.setStyle( 'margin-bottom', CKEDITOR.tools.cssLength( value ) );
+															}
+															else if ( !value && this.isChanged( ) )
+															{
+																element.removeStyle( 'margin-top' );
+																element.removeStyle( 'margin-bottom' );
+															}
+
+															if ( !internalCommit && type == IMAGE )
+																element.removeAttribute( 'vspace' );
+														}
+														else if ( type == CLEANUP )
+														{
+															element.removeAttribute( 'vspace' );
+															element.removeStyle( 'margin-top' );
+															element.removeStyle( 'margin-bottom' );
+														}
+													}
+												},
+												{
+													id : 'cmbAlign',
+													type : 'select',
+													widths : [ '35%','65%' ],
+													style : 'width:90px',
+													label : editor.lang.common.align,
+													'default' : '',
+													items :
+													[
+														[ editor.lang.common.notSet , ''],
+														[ editor.lang.common.alignLeft , 'left'],
+														[ editor.lang.common.alignRight , 'right']
+														// Backward compatible with v2 on setup when specified as attribute value,
+														// while these values are no more available as select options.
+														//	[ editor.lang.image.alignAbsBottom , 'absBottom'],
+														//	[ editor.lang.image.alignAbsMiddle , 'absMiddle'],
+														//  [ editor.lang.image.alignBaseline , 'baseline'],
+														//  [ editor.lang.image.alignTextTop , 'text-top'],
+														//  [ editor.lang.image.alignBottom , 'bottom'],
+														//  [ editor.lang.image.alignMiddle , 'middle'],
+														//  [ editor.lang.image.alignTop , 'top']
+													],
+													onChange : function()
+													{
+														updatePreview( this.getDialog() );
+														commitInternally.call( this, 'advanced:txtdlgGenStyle' );
+													},
+													setup : function( type, element )
+													{
+														if ( type == IMAGE )
+														{
+															var value = element.getStyle( 'float' );
+															switch( value )
+															{
+																// Ignore those unrelated values.
+																case 'inherit':
+																case 'none':
+																	value = '';
+															}
+
+															!value && ( value = ( element.getAttribute( 'align' ) || '' ).toLowerCase() );
+															this.setValue( value );
+														}
+													},
+													commit : function( type, element, internalCommit )
+													{
+														var value = this.getValue();
+														if ( type == IMAGE || type == PREVIEW )
+														{
+															if ( value )
+																element.setStyle( 'float', value );
+															else
+																element.removeStyle( 'float' );
+
+															if ( !internalCommit && type == IMAGE )
+															{
+																value = ( element.getAttribute( 'align' ) || '' ).toLowerCase();
+																switch( value )
+																{
+																	// we should remove it only if it matches "left" or "right",
+																	// otherwise leave it intact.
+																	case 'left':
+																	case 'right':
+																		element.removeAttribute( 'align' );
+																}
+															}
+														}
+														else if ( type == CLEANUP )
+															element.removeStyle( 'float' );
+
+													}
+												}
+											]
+										}
+									]
+								},
+								{
+									type : 'vbox',
+									height : '250px',
+									children :
+									[
+										{
+											type : 'html',
+											id : 'htmlPreview',
+											style : 'width:95%;',
+											html : '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>'+
+											'<div id="' + imagePreviewLoaderId + '" class="ImagePreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>'+
+											'<div id="' + imagePreviewBoxId + '" class="ImagePreviewBox"><table><tr><td>'+
+											'<a href="javascript:void(0)" target="_blank" onclick="return false;" id="' + previewLinkId + '">'+
+											'<img id="' + previewImageId + '" alt="" /></a>' +
+											( editor.config.image_previewText ||
+											'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. '+
+											'Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, '+
+											'nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.' ) +
+											'</td></tr></table></div></div>'
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					id : 'Link',
+					hidden: true,
+					label : editor.lang.link.title,
+					padding : 0,
+					elements :
+					[
+						{
+							id : 'txtUrl',
+							type : 'text',
+							label : editor.lang.common.url,
+							style : 'width: 100%',
+							'default' : '',
+							setup : function( type, element )
+							{
+								if ( type == LINK )
+								{
+									var href = element.data( 'cke-saved-href' );
+									if ( !href )
+										href = element.getAttribute( 'href' );
+									this.setValue( href );
+								}
+							},
+							commit : function( type, element )
+							{
+								if ( type == LINK )
+								{
+									if ( this.getValue() || this.isChanged() )
+									{
+										var url = decodeURI( this.getValue() );
+										element.data( 'cke-saved-href', url );
+										element.setAttribute( 'href', url );
+
+										if ( this.getValue() || !editor.config.image_removeLinkByEmptyURL )
+											this.getDialog().addLink = true;
+									}
+								}
+							}
+						},
+						{
+							type : 'button',
+							id : 'browse',
+							filebrowser :
+							{
+								action : 'Browse',
+								target: 'Link:txtUrl',
+								url: editor.config.filebrowserImageBrowseLinkUrl
+							},
+							style : 'float:right',
+							hidden : true,
+							label : editor.lang.common.browseServer
+						},
+						{
+							id : 'cmbTarget',
+							type : 'select',
+							label : editor.lang.common.target,
+							'default' : '',
+							items :
+							[
+								[ editor.lang.common.notSet , ''],
+								[ editor.lang.common.targetNew , '_blank'],
+								[ editor.lang.common.targetTop , '_top'],
+								[ editor.lang.common.targetSelf , '_self'],
+								[ editor.lang.common.targetParent , '_parent']
+							],
+							setup : function( type, element )
+							{
+								if ( type == LINK )
+									this.setValue( element.getAttribute( 'target' ) || '' );
+							},
+							commit : function( type, element )
+							{
+								if ( type == LINK )
+								{
+									if ( this.getValue() || this.isChanged() )
+										element.setAttribute( 'target', this.getValue() );
+								}
+							}
+						}
+					]
+				},
+				{
+					id : 'Upload',
+					hidden : true,
+					filebrowser : 'uploadButton',
+					label : editor.lang.image.upload,
+					elements :
+					[
+						{
+							type : 'file',
+							id : 'upload',
+							label : editor.lang.image.btnUpload,
+							style: 'height:40px',
+							size : 38
+						},
+						{
+							type : 'fileButton',
+							id : 'uploadButton',
+							filebrowser : 'info:txtUrl',
+							label : editor.lang.image.btnUpload,
+							'for' : [ 'Upload', 'upload' ]
+						}
+					]
+				},
+				{
+					id : 'advanced',
+					hidden: true,
+					label : editor.lang.common.advancedTab,
+					elements :
+					[
+						{
+							type : 'hbox',
+							widths : [ '50%', '25%', '25%' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'linkId',
+									label : editor.lang.common.id,
+									setup : function( type, element )
+									{
+										if ( type == IMAGE )
+											this.setValue( element.getAttribute( 'id' ) );
+									},
+									commit : function( type, element )
+									{
+										if ( type == IMAGE )
+										{
+											if ( this.getValue() || this.isChanged() )
+												element.setAttribute( 'id', this.getValue() );
+										}
+									}
+								},
+								{
+									id : 'cmbLangDir',
+									type : 'select',
+									style : 'width : 100px;',
+									label : editor.lang.common.langDir,
+									'default' : '',
+									items :
+									[
+										[ editor.lang.common.notSet, '' ],
+										[ editor.lang.common.langDirLtr, 'ltr' ],
+										[ editor.lang.common.langDirRtl, 'rtl' ]
+									],
+									setup : function( type, element )
+									{
+										if ( type == IMAGE )
+											this.setValue( element.getAttribute( 'dir' ) );
+									},
+									commit : function( type, element )
+									{
+										if ( type == IMAGE )
+										{
+											if ( this.getValue() || this.isChanged() )
+												element.setAttribute( 'dir', this.getValue() );
+										}
+									}
+								},
+								{
+									type : 'text',
+									id : 'txtLangCode',
+									label : editor.lang.common.langCode,
+									'default' : '',
+									setup : function( type, element )
+									{
+										if ( type == IMAGE )
+											this.setValue( element.getAttribute( 'lang' ) );
+									},
+									commit : function( type, element )
+									{
+										if ( type == IMAGE )
+										{
+											if ( this.getValue() || this.isChanged() )
+												element.setAttribute( 'lang', this.getValue() );
+										}
+									}
+								}
+							]
+						},
+						{
+							type : 'text',
+							id : 'txtGenLongDescr',
+							label : editor.lang.common.longDescr,
+							setup : function( type, element )
+							{
+								if ( type == IMAGE )
+									this.setValue( element.getAttribute( 'longDesc' ) );
+							},
+							commit : function( type, element )
+							{
+								if ( type == IMAGE )
+								{
+									if ( this.getValue() || this.isChanged() )
+										element.setAttribute( 'longDesc', this.getValue() );
+								}
+							}
+						},
+						{
+							type : 'hbox',
+							widths : [ '50%', '50%' ],
+							children :
+							[
+								{
+									type : 'text',
+									id : 'txtGenClass',
+									label : editor.lang.common.cssClass,
+									'default' : '',
+									setup : function( type, element )
+									{
+										if ( type == IMAGE )
+											this.setValue( element.getAttribute( 'class' ) );
+									},
+									commit : function( type, element )
+									{
+										if ( type == IMAGE )
+										{
+											if ( this.getValue() || this.isChanged() )
+												element.setAttribute( 'class', this.getValue() );
+										}
+									}
+								},
+								{
+									type : 'text',
+									id : 'txtGenTitle',
+									label : editor.lang.common.advisoryTitle,
+									'default' : '',
+									onChange : function()
+									{
+										updatePreview( this.getDialog() );
+									},
+									setup : function( type, element )
+									{
+										if ( type == IMAGE )
+											this.setValue( element.getAttribute( 'title' ) );
+									},
+									commit : function( type, element )
+									{
+										if ( type == IMAGE )
+										{
+											if ( this.getValue() || this.isChanged() )
+												element.setAttribute( 'title', this.getValue() );
+										}
+										else if ( type == PREVIEW )
+										{
+											element.setAttribute( 'title', this.getValue() );
+										}
+										else if ( type == CLEANUP )
+										{
+											element.removeAttribute( 'title' );
+										}
+									}
+								}
+							]
+						},
+						{
+							type : 'text',
+							id : 'txtdlgGenStyle',
+							label : editor.lang.common.cssStyle,
+							validate : CKEDITOR.dialog.validate.inlineStyle( editor.lang.common.invalidInlineStyle ),
+							'default' : '',
+							setup : function( type, element )
+							{
+								if ( type == IMAGE )
+								{
+									var genStyle = element.getAttribute( 'style' );
+									if ( !genStyle && element.$.style.cssText )
+										genStyle = element.$.style.cssText;
+									this.setValue( genStyle );
+
+									var height = element.$.style.height,
+										width = element.$.style.width,
+										aMatchH  = ( height ? height : '' ).match( regexGetSize ),
+										aMatchW  = ( width ? width : '').match( regexGetSize );
+
+									this.attributesInStyle =
+									{
+										height : !!aMatchH,
+										width : !!aMatchW
+									};
+								}
+							},
+							onChange : function ()
+							{
+								commitInternally.call( this,
+									[ 'info:cmbFloat', 'info:cmbAlign',
+									  'info:txtVSpace', 'info:txtHSpace',
+									  'info:txtBorder',
+									  'info:txtWidth', 'info:txtHeight' ] );
+								updatePreview( this );
+							},
+							commit : function( type, element )
+							{
+								if ( type == IMAGE && ( this.getValue() || this.isChanged() ) )
+								{
+									element.setAttribute( 'style', this.getValue() );
+								}
+							}
+						}
+					]
+				}
+			]
+		};
+	};
+
+	CKEDITOR.dialog.add( 'image', function( editor )
+		{
+			return imageDialog( editor, 'image' );
+		});
+
+	CKEDITOR.dialog.add( 'imagebutton', function( editor )
+		{
+			return imageDialog( editor, 'imagebutton' );
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/image/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/image/index.html b/upload/public/js/3rd_party/ckeditor/plugins/image/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/image/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/index.html b/upload/public/js/3rd_party/ckeditor/plugins/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/ipsbbcode.js b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/ipsbbcode.js
new file mode 100644
index 00000000..84ec7c60
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/dialogs/ipsbbcode.js
@@ -0,0 +1,246 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*
+* This plug in by:
+* Matt Mecham 2011
+* Invision Power Services, Inc.
+*/
+
+(function()
+{
+	var ipsBbCodeDialog = function( editor, initVal )
+	{
+		var fetchDdContents = function()
+		{
+			arr = [];
+			arr[0] = [ ipb.lang['ckeditor__pselectbbcode'], 'nill' ];
+								
+			$H(editor.config.IPS_BBCODE).each( function( tag )
+			{
+				k = tag.key;
+				v = tag.value;
+				
+				arr[ arr.length ] = [ v.title, v.tag ];
+			} );
+			
+			return arr;
+		};
+			
+		var fetchTagData = function( tag )
+		{
+			return ( editor.config.IPS_BBCODE[tag] ) ? editor.config.IPS_BBCODE[tag] : [];
+		}
+		
+		// Handles the event when the "Type" selection box is changed.
+		var bbCodeChanged = function()
+		{
+			var dialog    = this.getDialog(),
+				typeValue = this.getValue();
+				
+			var tagData   = fetchTagData( typeValue );
+			var option    = dialog.getContentElement( 'info', 'option' ).getElement();
+			var content   = dialog.getContentElement( 'info', 'content' ).getElement();
+Debug.dir( tagData );
+			option.hide();
+			content.hide();
+			$('bbcode-description').hide();
+				
+			if ( typeValue != 'nill' && tagData.tag )
+			{
+				$('bbcode-description').update( tagData.desc ).show();
+
+				/* Show contents */
+				if ( parseInt( tagData.useoption ) == 1 )
+				{
+					oid = option.getAttribute('id');
+					option.show();
+					$(oid).down('label').update( tagData.menu_option_text ? tagData.menu_option_text : ipb.lang['ckeditor__genoption'] );
+				}
+				
+				/* Show value */
+				if( parseInt( tagData.single_tag ) == 0 )
+				{
+					cid = content.getAttribute('id');
+					content.show();
+					$(cid).down('label').update( tagData.menu_content_text ? tagData.menu_content_text : ipb.lang['ckeditor__gencontent'] );
+					
+					var html	   = IPSCKTools.getSelectionHtml( editor );
+					var sText      = IPSCKTools.cleanHtmlForTagWrap( html );
+					
+					if ( sText != '' )
+					{
+				        $(cid).down('textarea').value = sText;
+					}
+				}
+			}
+		};
+	
+		return {
+			title : ipb.lang['ckeditor__bbcode'],
+			minWidth : 350,
+			minHeight : 140,
+			onShow : function()
+			{
+				var element = this.getParentEditor().getSelection().getSelectedElement();
+			},
+			onOk : function()
+			{
+				var editor    = this.getParentEditor();
+				
+				element = editor.document.createElement( 'span' );
+				element.setAttribute( 'name', 'bbcodename' );
+				
+				this.commitContent( { element : element } );
+				
+			    tag			= element.getAttribute('cke-saved-bbcode-tag');
+				option		= element.getAttribute('cke-saved-bbcode-option');
+				ourcontent	= element.getAttribute('cke-saved-bbcode-content');
+				
+				if( ourcontent == 'false' )
+				{
+					ourcontent = '';
+				}
+				
+				if( option == 'false' )
+				{
+					option = '';
+				}
+
+				var tagData = fetchTagData( tag );
+				
+				if ( tagData.tag )
+				{
+					if( parseInt( tagData.single_tag ) == 1 )
+					{
+						if ( parseInt( tagData.useoption ) == 1 )
+						{
+							mytag = '[' + tag + '=\'' + option + '\']';
+						}
+						else
+						{
+							mytag = '[' + tag + ']';
+						}
+					}
+					else if ( parseInt( tagData.useoption ) == 1 )
+					{
+						if ( tagData.optional_option == 1 && option == '' )
+						{
+							mytag = '[' + tag + ']' + ourcontent + '[/' + tag + ']';
+						}
+						else
+						{
+							mytag = '[' + tag + '=\'' + option + '\']' + ourcontent + '[/' + tag + ']';
+						}
+					}
+					else
+					{
+						mytag = '[' + tag + ']' + ourcontent + '[/' + tag + ']';
+					}
+					
+					// @link http://community.invisionpower.com/tracker/issue-29434-html-code-gets-stripped
+					// Insert as pure text otherwise tags can get stripped
+					editor.insertText( mytag );
+				}
+				
+			},
+			contents : [
+				{
+					id : 'info',
+					label : ipb.lang['ckeditor__bbcodelabel'],
+					title : ipb.lang['ckeditor__bbcodelabel'],
+					elements : [
+						{
+							id : 'bbcodeTag',
+							type : 'select',
+							label : ipb.lang['ckeditor__bbcodelabel'],
+							items : fetchDdContents(),
+							'default': initVal,
+							onLoad: bbCodeChanged,
+							onChange : bbCodeChanged,
+							commit : function( data )
+							{
+								var element = data.element;
+	
+								if ( this.getValue() )
+									element.setAttribute( 'cke-saved-bbcode-tag', this.getValue() );
+								else
+								{
+									element.setAttribute( 'cke-saved-bbcode-tag', false );
+								}
+							}
+						},
+						{
+							id : 'codedescription',
+							type : 'html',
+							html: '<div id="bbcode-description"></div>'
+						},
+						{
+							id : 'option',
+							type : 'text',
+							label : ipb.lang['ckeditor__genoption'],
+							hidden: 1,
+							'default' : '',
+							accessKey : 'N',
+							setup : function( element )
+							{
+							},
+							commit : function( data )
+							{
+								var element = data.element;
+	
+								if ( this.getValue() )
+									element.setAttribute( 'cke-saved-bbcode-option', this.getValue() );
+								else
+								{
+									element.setAttribute( 'cke-saved-bbcode-option', false );
+								}
+							}
+						},
+						{
+							id : 'content',
+							type : 'textarea',
+							label : ipb.lang['ckeditor__gencontent'],
+							'default' : '',
+							hidden: 1,
+							accessKey : 'O',
+							setup : function( data )
+							{
+							},
+							commit : function( data )
+							{
+								var element = data.element;
+	
+								if ( this.getValue() )
+									element.setAttribute( 'cke-saved-bbcode-content', this.getValue() );
+								else
+								{
+									element.setAttribute( 'cke-saved-bbcode-content', false );
+								}
+							}
+						}
+					]
+				}
+			]
+		};
+	};
+	
+	
+	$H(CKEDITOR.config.IPS_BBCODE).each( function( tag )
+	{
+		k = tag.key;
+		v = tag.value;
+
+		if ( v.image && v.image != '' )
+		{
+			eval( "CKEDITOR.dialog.add( 'ipsbbcode_" + v.tag + "', function( editor ) { return ipsBbCodeDialog( editor, '" + v.tag + "' ); } );" );
+		}
+	} );
+		
+	CKEDITOR.dialog.add( 'ipsbbcode', function( editor )
+	{
+		return ipsBbCodeDialog( editor, '' );
+		
+	} );
+	
+} )();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/ips_bbcode.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/ips_bbcode.png
new file mode 100644
index 00000000..40a94c9b
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/images/ips_bbcode.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsbbcode/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/ipscode.js b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/ipscode.js
new file mode 100644
index 00000000..4afc158e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/dialogs/ipscode.js
@@ -0,0 +1,72 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{ 
+	CKEDITOR.dialog.add( 'ipscode', function( editor )
+		{
+			return {
+				title : ipb.lang['ckeditor__code_title'],
+
+				minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 368 : 350,
+				minHeight : 340,
+
+				onShow : function()
+				{
+					// Reset the textarea value.
+					this.getContentElement( 'general', 'content' ).getInputElement().setValue( '' );
+				},
+
+				onOk : function()
+				{
+					// Get the textarea value.
+					var text = this.getContentElement( 'general', 'content' ).getInputElement().getValue(),
+						editor = this.getParentEditor();
+
+					setTimeout( function()
+					{
+						editor.fire( 'paste', { 'text' : "[CODE]\n" + text + "\n[/CODE]" } );
+					}, 0 );
+				},
+
+				contents :
+				[
+					{
+						label : ipb.lang['ckeditor__code_title'],
+						id : 'general',
+						elements :
+						[
+							{
+								type : 'html',
+								id : 'pasteMsg',
+								html : '<div style="white-space:normal;width:340px;">' + editor.lang.clipboard.pasteMsg + '</div>'
+							},
+							{
+								type : 'textarea',
+								id : 'content',
+								className : 'cke_pastetext',
+
+								onLoad : function()
+								{
+									var label = this.getDialog().getContentElement( 'general', 'pasteMsg' ).getElement(),
+										input = this.getElement().getElementsByTag( 'textarea' ).getItem( 0 );
+
+									input.setAttribute( 'aria-labelledby', label.$.id );
+									input.setStyle( 'width', '98%' );
+									input.setStyle( 'height', '280px' );
+									input.setStyle( 'direction', editor.config.contentsLangDirection );
+								},
+
+								focus : function()
+								{
+									this.getElement().focus();
+								}
+							}
+						]
+					}
+				]
+			};
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/code.png b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/code.png
new file mode 100644
index 00000000..e093032a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/code.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipscode/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipscode/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/ips_emoticon.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/ips_emoticon.png
new file mode 100644
index 00000000..8dd2b4c1
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/images/ips_emoticon.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsemoticon/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/mymedia.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/mymedia.png
new file mode 100644
index 00000000..fc5a52f5
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/images/mymedia.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsmedia/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/ips_options.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/ips_options.png
new file mode 100644
index 00000000..1b1c71aa
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/images/ips_options.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsoptions/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/quote.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/quote.png
new file mode 100644
index 00000000..7bc9233e
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/images/quote.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsquote/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/switch.png b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/switch.png
new file mode 100644
index 00000000..04bb1e0b
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/images/switch.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/index.html b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/ipsswitch/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/anchor.js b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/anchor.js
new file mode 100644
index 00000000..9f743b19
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/anchor.js
@@ -0,0 +1,144 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'anchor', function( editor )
+{
+	// Function called in onShow to load selected element.
+	var loadElements = function( element )
+	{
+		this._.selectedElement = element;
+
+		var attributeValue = element.data( 'cke-saved-name' );
+		this.setValueOf( 'info','txtName', attributeValue || '' );
+	};
+
+	function createFakeAnchor( editor, anchor )
+	{
+		return editor.createFakeElement( anchor, 'cke_anchor', 'anchor' );
+	}
+
+	return {
+		title : editor.lang.anchor.title,
+		minWidth : 300,
+		minHeight : 60,
+		onOk : function()
+		{
+			var name = this.getValueOf( 'info', 'txtName' );
+			var attributes =
+			{
+				name : name,
+				'data-cke-saved-name' : name
+			};
+
+			if ( this._.selectedElement )
+			{
+				if ( this._.selectedElement.data( 'cke-realelement' ) )
+				{
+					var newFake = createFakeAnchor( editor, editor.document.createElement( 'a', { attributes: attributes } ) );
+					newFake.replace( this._.selectedElement );
+				}
+				else
+					this._.selectedElement.setAttributes( attributes );
+			}
+			else
+			{
+				var sel = editor.getSelection(),
+						range = sel && sel.getRanges()[ 0 ];
+
+				// Empty anchor
+				if ( range.collapsed )
+				{
+					if ( CKEDITOR.plugins.link.synAnchorSelector )
+						attributes[ 'class' ] = 'cke_anchor_empty';
+
+					if ( CKEDITOR.plugins.link.emptyAnchorFix )
+					{
+						attributes[ 'contenteditable' ] = 'false';
+						attributes[ 'data-cke-editable' ] = 1;
+					}
+
+					var anchor = editor.document.createElement( 'a', { attributes: attributes } );
+
+					// Transform the anchor into a fake element for browsers that need it.
+					if ( CKEDITOR.plugins.link.fakeAnchor )
+						anchor = createFakeAnchor( editor, anchor );
+
+					range.insertNode( anchor );
+				}
+				else
+				{
+					if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
+						attributes['class'] = 'cke_anchor';
+
+					// Apply style.
+					var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
+					style.type = CKEDITOR.STYLE_INLINE;
+					style.apply( editor.document );
+				}
+			}
+		},
+
+		onHide : function()
+		{
+			delete this._.selectedElement;
+		},
+
+		onShow : function()
+		{
+			var selection = editor.getSelection(),
+				fullySelected = selection.getSelectedElement(),
+				partialSelected;
+
+			// Detect the anchor under selection.
+			if ( fullySelected )
+			{
+				if ( CKEDITOR.plugins.link.fakeAnchor )
+				{
+					var realElement = CKEDITOR.plugins.link.tryRestoreFakeAnchor( editor, fullySelected );
+					realElement && loadElements.call( this, realElement );
+					this._.selectedElement = fullySelected;
+				}
+				else if ( fullySelected.is( 'a' ) && fullySelected.hasAttribute( 'name' ) )
+					loadElements.call( this, fullySelected );
+			}
+			else
+			{
+				partialSelected = CKEDITOR.plugins.link.getSelectedLink( editor );
+				if ( partialSelected )
+				{
+					loadElements.call( this, partialSelected );
+					selection.selectElement( partialSelected );
+				}
+			}
+
+			this.getContentElement( 'info', 'txtName' ).focus();
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.anchor.title,
+				accessKey : 'I',
+				elements :
+				[
+					{
+						type : 'text',
+						id : 'txtName',
+						label : editor.lang.anchor.name,
+						required: true,
+						validate : function()
+						{
+							if ( !this.getValue() )
+							{
+								alert( editor.lang.anchor.errorName );
+								return false;
+							}
+							return true;
+						}
+					}
+				]
+			}
+		]
+	};
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/link.js b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/link.js
new file mode 100644
index 00000000..b19401b4
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/link/dialogs/link.js
@@ -0,0 +1,1425 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'link', function( editor )
+{
+	var plugin = CKEDITOR.plugins.link;
+	// Handles the event when the "Target" selection box is changed.
+	var targetChanged = function()
+	{
+		var dialog = this.getDialog(),
+			popupFeatures = dialog.getContentElement( 'target', 'popupFeatures' ),
+			targetName = dialog.getContentElement( 'target', 'linkTargetName' ),
+			value = this.getValue();
+
+		if ( !popupFeatures || !targetName )
+			return;
+
+		popupFeatures = popupFeatures.getElement();
+		popupFeatures.hide();
+		targetName.setValue( '' );
+
+		switch ( value )
+ 		{
+			case 'frame' :
+				targetName.setLabel( editor.lang.link.targetFrameName );
+				targetName.getElement().show();
+				break;
+			case 'popup' :
+				popupFeatures.show();
+				targetName.setLabel( editor.lang.link.targetPopupName );
+				targetName.getElement().show();
+				break;
+			default :
+				targetName.setValue( value );
+				targetName.getElement().hide();
+				break;
+ 		}
+
+	};
+
+	// Handles the event when the "Type" selection box is changed.
+	var linkTypeChanged = function()
+	{
+		var dialog = this.getDialog(),
+			partIds = [ 'urlOptions', 'anchorOptions', 'emailOptions' ],
+			typeValue = this.getValue(),
+			uploadTab = dialog.definition.getContents( 'upload' ),
+			uploadInitiallyHidden = uploadTab && uploadTab.hidden;
+
+		if ( typeValue == 'url' )
+		{
+			if ( editor.config.linkShowTargetTab )
+				dialog.showPage( 'target' );
+			if ( !uploadInitiallyHidden )
+				dialog.showPage( 'upload' );
+		}
+		else
+		{
+			dialog.hidePage( 'target' );
+			if ( !uploadInitiallyHidden )
+				dialog.hidePage( 'upload' );
+		}
+
+		for ( var i = 0 ; i < partIds.length ; i++ )
+		{
+			var element = dialog.getContentElement( 'info', partIds[i] );
+			if ( !element )
+				continue;
+
+			element = element.getElement().getParent().getParent();
+			if ( partIds[i] == typeValue + 'Options' )
+				element.show();
+			else
+				element.hide();
+		}
+
+		dialog.layout();
+	};
+
+	// Loads the parameters in a selected link to the link dialog fields.
+	var javascriptProtocolRegex = /^javascript:/,
+		emailRegex = /^mailto:([^?]+)(?:\?(.+))?$/,
+		emailSubjectRegex = /subject=([^;?:@&=$,\/]*)/,
+		emailBodyRegex = /body=([^;?:@&=$,\/]*)/,
+		anchorRegex = /^#(.*)$/,
+		urlRegex = /^((?:http|https|ftp|news):\/\/)?(.*)$/,
+		selectableTargets = /^(_(?:self|top|parent|blank))$/,
+		encodedEmailLinkRegex = /^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,
+		functionCallProtectedEmailLinkRegex = /^javascript:([^(]+)\(([^)]+)\)$/;
+
+	var popupRegex =
+		/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/;
+	var popupFeaturesRegex = /(?:^|,)([^=]+)=(\d+|yes|no)/gi;
+
+	var parseLink = function( editor, element )
+	{
+		var href = ( element  && ( element.data( 'cke-saved-href' ) || element.getAttribute( 'href' ) ) ) || '',
+		 	javascriptMatch,
+			emailMatch,
+			anchorMatch,
+			urlMatch,
+			retval = {};
+
+		if ( ( javascriptMatch = href.match( javascriptProtocolRegex ) ) )
+		{
+			if ( emailProtection == 'encode' )
+			{
+				href = href.replace( encodedEmailLinkRegex,
+						function ( match, protectedAddress, rest )
+						{
+							return 'mailto:' +
+							       String.fromCharCode.apply( String, protectedAddress.split( ',' ) ) +
+							       ( rest && unescapeSingleQuote( rest ) );
+						});
+			}
+			// Protected email link as function call.
+			else if ( emailProtection )
+			{
+				href.replace( functionCallProtectedEmailLinkRegex, function( match, funcName, funcArgs )
+				{
+					if ( funcName == compiledProtectionFunction.name )
+					{
+						retval.type = 'email';
+						var email = retval.email = {};
+
+						var paramRegex = /[^,\s]+/g,
+							paramQuoteRegex = /(^')|('$)/g,
+							paramsMatch = funcArgs.match( paramRegex ),
+							paramsMatchLength = paramsMatch.length,
+							paramName,
+							paramVal;
+
+						for ( var i = 0; i < paramsMatchLength; i++ )
+						{
+							paramVal = decodeURIComponent( unescapeSingleQuote( paramsMatch[ i ].replace( paramQuoteRegex, '' ) ) );
+							paramName = compiledProtectionFunction.params[ i ].toLowerCase();
+							email[ paramName ] = paramVal;
+						}
+						email.address = [ email.name, email.domain ].join( '@' );
+					}
+				} );
+			}
+		}
+
+		if ( !retval.type )
+		{
+			if ( ( anchorMatch = href.match( anchorRegex ) ) )
+			{
+				retval.type = 'anchor';
+				retval.anchor = {};
+				retval.anchor.name = retval.anchor.id = anchorMatch[1];
+			}
+			// Protected email link as encoded string.
+			else if ( ( emailMatch = href.match( emailRegex ) ) )
+			{
+				var subjectMatch = href.match( emailSubjectRegex ),
+					bodyMatch = href.match( emailBodyRegex );
+
+				retval.type = 'email';
+				var email = ( retval.email = {} );
+				email.address = emailMatch[ 1 ];
+				subjectMatch && ( email.subject = decodeURIComponent( subjectMatch[ 1 ] ) );
+				bodyMatch && ( email.body = decodeURIComponent( bodyMatch[ 1 ] ) );
+			}
+			// urlRegex matches empty strings, so need to check for href as well.
+			else if (  href && ( urlMatch = href.match( urlRegex ) ) )
+			{
+				retval.type = 'url';
+				retval.url = {};
+				retval.url.protocol = urlMatch[1];
+				retval.url.url = urlMatch[2];
+			}
+			else
+				retval.type = 'url';
+		}
+
+		// Load target and popup settings.
+		if ( element )
+		{
+			var target = element.getAttribute( 'target' );
+			retval.target = {};
+			retval.adv = {};
+
+			// IE BUG: target attribute is an empty string instead of null in IE if it's not set.
+			if ( !target )
+			{
+				var onclick = element.data( 'cke-pa-onclick' ) || element.getAttribute( 'onclick' ),
+					onclickMatch = onclick && onclick.match( popupRegex );
+				if ( onclickMatch )
+				{
+					retval.target.type = 'popup';
+					retval.target.name = onclickMatch[1];
+
+					var featureMatch;
+					while ( ( featureMatch = popupFeaturesRegex.exec( onclickMatch[2] ) ) )
+					{
+						// Some values should remain numbers (#7300)
+						if ( ( featureMatch[2] == 'yes' || featureMatch[2] == '1' ) && !( featureMatch[1] in { height:1, width:1, top:1, left:1 } ) )
+							retval.target[ featureMatch[1] ] = true;
+						else if ( isFinite( featureMatch[2] ) )
+							retval.target[ featureMatch[1] ] = featureMatch[2];
+					}
+				}
+			}
+			else
+			{
+				var targetMatch = target.match( selectableTargets );
+				if ( targetMatch )
+					retval.target.type = retval.target.name = target;
+				else
+				{
+					retval.target.type = 'frame';
+					retval.target.name = target;
+				}
+			}
+
+			var me = this;
+			var advAttr = function( inputName, attrName )
+			{
+				var value = element.getAttribute( attrName );
+				if ( value !== null )
+					retval.adv[ inputName ] = value || '';
+			};
+			advAttr( 'advId', 'id' );
+			advAttr( 'advLangDir', 'dir' );
+			advAttr( 'advAccessKey', 'accessKey' );
+
+			retval.adv.advName =
+				element.data( 'cke-saved-name' )
+				|| element.getAttribute( 'name' )
+				|| '';
+			advAttr( 'advLangCode', 'lang' );
+			advAttr( 'advTabIndex', 'tabindex' );
+			advAttr( 'advTitle', 'title' );
+			advAttr( 'advContentType', 'type' );
+			CKEDITOR.plugins.link.synAnchorSelector ?
+				retval.adv.advCSSClasses = getLinkClass( element )
+				: advAttr( 'advCSSClasses', 'class' );
+			advAttr( 'advCharset', 'charset' );
+			advAttr( 'advStyles', 'style' );
+			advAttr( 'advRel', 'rel' );
+		}
+
+		// Find out whether we have any anchors in the editor.
+		var anchors = retval.anchors = [],
+			item;
+
+		// For some browsers we set contenteditable="false" on anchors, making document.anchors not to include them, so we must traverse the links manually (#7893).
+		if ( CKEDITOR.plugins.link.emptyAnchorFix )
+		{
+			var links = editor.document.getElementsByTag( 'a' );
+			for ( i = 0, count = links.count(); i < count; i++ )
+			{
+				item = links.getItem( i );
+				if ( item.data( 'cke-saved-name' ) || item.hasAttribute( 'name' ) )
+					anchors.push( { name : item.data( 'cke-saved-name' ) || item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) } );
+			}
+		}
+		else
+		{
+			var anchorList = new CKEDITOR.dom.nodeList( editor.document.$.anchors );
+			for ( var i = 0, count = anchorList.count(); i < count; i++ )
+			{
+				item = anchorList.getItem( i );
+				anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) };
+			}
+		}
+
+		if ( CKEDITOR.plugins.link.fakeAnchor )
+		{
+			var imgs = editor.document.getElementsByTag( 'img' );
+			for ( i = 0, count = imgs.count(); i < count; i++ )
+			{
+				if ( ( item = CKEDITOR.plugins.link.tryRestoreFakeAnchor( editor, imgs.getItem( i ) ) ) )
+					anchors.push( { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) } );
+			}
+		}
+
+		// Record down the selected element in the dialog.
+		this._.selectedElement = element;
+		return retval;
+	};
+
+	var setupParams = function( page, data )
+	{
+		if ( data[page] )
+			this.setValue( data[page][this.id] || '' );
+	};
+
+	var setupPopupParams = function( data )
+	{
+		return setupParams.call( this, 'target', data );
+	};
+
+	var setupAdvParams = function( data )
+	{
+		return setupParams.call( this, 'adv', data );
+	};
+
+	var commitParams = function( page, data )
+	{
+		if ( !data[page] )
+			data[page] = {};
+
+		data[page][this.id] = this.getValue() || '';
+	};
+
+	var commitPopupParams = function( data )
+	{
+		return commitParams.call( this, 'target', data );
+	};
+
+	var commitAdvParams = function( data )
+	{
+		return commitParams.call( this, 'adv', data );
+	};
+
+	function unescapeSingleQuote( str )
+	{
+		return str.replace( /\\'/g, '\'' );
+	}
+
+	function escapeSingleQuote( str )
+	{
+		return str.replace( /'/g, '\\$&' );
+	}
+
+	var emailProtection = editor.config.emailProtection || '';
+
+	// Compile the protection function pattern.
+	if ( emailProtection && emailProtection != 'encode' )
+	{
+		var compiledProtectionFunction = {};
+
+		emailProtection.replace( /^([^(]+)\(([^)]+)\)$/, function( match, funcName, params )
+		{
+			compiledProtectionFunction.name = funcName;
+			compiledProtectionFunction.params = [];
+			params.replace( /[^,\s]+/g, function( param )
+			{
+				compiledProtectionFunction.params.push( param );
+			} );
+		} );
+	}
+
+	function protectEmailLinkAsFunction( email )
+	{
+		var retval,
+			name = compiledProtectionFunction.name,
+			params = compiledProtectionFunction.params,
+			paramName,
+			paramValue;
+
+		retval = [ name, '(' ];
+		for ( var i = 0; i < params.length; i++ )
+		{
+			paramName = params[ i ].toLowerCase();
+			paramValue = email[ paramName ];
+
+			i > 0 && retval.push( ',' );
+			retval.push( '\'',
+						 paramValue ?
+						 escapeSingleQuote( encodeURIComponent( email[ paramName ] ) )
+						 : '',
+						 '\'');
+		}
+		retval.push( ')' );
+		return retval.join( '' );
+	}
+
+	function protectEmailAddressAsEncodedString( address )
+	{
+		var charCode,
+			length = address.length,
+			encodedChars = [];
+		for ( var i = 0; i < length; i++ )
+		{
+			charCode = address.charCodeAt( i );
+			encodedChars.push( charCode );
+		}
+		return 'String.fromCharCode(' + encodedChars.join( ',' ) + ')';
+	}
+
+	function getLinkClass( ele )
+	{
+		var className = ele.getAttribute( 'class' );
+		return className ? className.replace( /\s*(?:cke_anchor_empty|cke_anchor)(?:\s*$)?/g, '' ) : '';
+	}
+
+	var commonLang = editor.lang.common,
+		linkLang = editor.lang.link;
+
+	return {
+		title : linkLang.title,
+		minWidth : 350,
+		minHeight : 230,
+		contents : [
+			{
+				id : 'info',
+				label : linkLang.info,
+				title : linkLang.info,
+				elements :
+				[
+					{
+						id : 'linkType',
+						type : 'select',
+						label : linkLang.type,
+						'default' : 'url',
+						items :
+						[
+							[ linkLang.toUrl, 'url' ],
+							[ linkLang.toAnchor, 'anchor' ],
+							[ linkLang.toEmail, 'email' ]
+						],
+						onChange : linkTypeChanged,
+						setup : function( data )
+						{
+							if ( data.type )
+								this.setValue( data.type );
+						},
+						commit : function( data )
+						{
+							data.type = this.getValue();
+						}
+					},
+					{
+						type : 'vbox',
+						id : 'urlOptions',
+						children :
+						[
+							{
+								type : 'hbox',
+								widths : [ '25%', '75%' ],
+								children :
+								[
+									{
+										id : 'protocol',
+										type : 'select',
+										label : commonLang.protocol,
+										'default' : 'http://',
+										items :
+										[
+											// Force 'ltr' for protocol names in BIDI. (#5433)
+											[ 'http://\u200E', 'http://' ],
+											[ 'https://\u200E', 'https://' ],
+											[ 'ftp://\u200E', 'ftp://' ],
+											[ 'news://\u200E', 'news://' ],
+											[ linkLang.other , '' ]
+										],
+										setup : function( data )
+										{
+											if ( data.url )
+												this.setValue( data.url.protocol || '' );
+										},
+										commit : function( data )
+										{
+											if ( !data.url )
+												data.url = {};
+
+											data.url.protocol = this.getValue();
+										}
+									},
+									{
+										type : 'text',
+										id : 'url',
+										label : commonLang.url,
+										required: true,
+										onLoad : function ()
+										{
+											this.allowOnChange = true;
+										},
+										onKeyUp : function()
+										{
+											this.allowOnChange = false;
+											var	protocolCmb = this.getDialog().getContentElement( 'info', 'protocol' ),
+												url = this.getValue(),
+												urlOnChangeProtocol = /^(http|https|ftp|news):\/\/(?=.)/i,
+												urlOnChangeTestOther = /^((javascript:)|[#\/\.\?])/i;
+
+											var protocol = urlOnChangeProtocol.exec( url );
+											if ( protocol )
+											{
+												this.setValue( url.substr( protocol[ 0 ].length ) );
+												protocolCmb.setValue( protocol[ 0 ].toLowerCase() );
+											}
+											else if ( urlOnChangeTestOther.test( url ) )
+												protocolCmb.setValue( '' );
+
+											this.allowOnChange = true;
+										},
+										onChange : function()
+										{
+											if ( this.allowOnChange )		// Dont't call on dialog load.
+												this.onKeyUp();
+										},
+										validate : function()
+										{
+											var dialog = this.getDialog();
+
+											if ( dialog.getContentElement( 'info', 'linkType' ) &&
+													dialog.getValueOf( 'info', 'linkType' ) != 'url' )
+												return true;
+
+											if ( this.getDialog().fakeObj )	// Edit Anchor.
+												return true;
+
+											var func = CKEDITOR.dialog.validate.notEmpty( linkLang.noUrl );
+											return func.apply( this );
+										},
+										setup : function( data )
+										{
+											this.allowOnChange = false;
+											if ( data.url )
+												this.setValue( data.url.url );
+											this.allowOnChange = true;
+
+										},
+										commit : function( data )
+										{
+											// IE will not trigger the onChange event if the mouse has been used
+											// to carry all the operations #4724
+											this.onChange();
+
+											if ( !data.url )
+												data.url = {};
+
+											data.url.url = this.getValue();
+											this.allowOnChange = false;
+										}
+									}
+								],
+								setup : function( data )
+								{
+									if ( !this.getDialog().getContentElement( 'info', 'linkType' ) )
+										this.getElement().show();
+								}
+							},
+							{
+								type : 'button',
+								id : 'browse',
+								hidden : 'true',
+								filebrowser : 'info:url',
+								label : commonLang.browseServer
+							}
+						]
+					},
+					{
+						type : 'vbox',
+						id : 'anchorOptions',
+						width : 260,
+						align : 'center',
+						padding : 0,
+						children :
+						[
+							{
+								type : 'fieldset',
+								id : 'selectAnchorText',
+								label : linkLang.selectAnchor,
+								setup : function( data )
+								{
+									if ( data.anchors.length > 0 )
+										this.getElement().show();
+									else
+										this.getElement().hide();
+								},
+								children :
+								[
+									{
+										type : 'hbox',
+										id : 'selectAnchor',
+										children :
+										[
+											{
+												type : 'select',
+												id : 'anchorName',
+												'default' : '',
+												label : linkLang.anchorName,
+												style : 'width: 100%;',
+												items :
+												[
+													[ '' ]
+												],
+												setup : function( data )
+												{
+													this.clear();
+													this.add( '' );
+													for ( var i = 0 ; i < data.anchors.length ; i++ )
+													{
+														if ( data.anchors[i].name )
+															this.add( data.anchors[i].name );
+													}
+
+													if ( data.anchor )
+														this.setValue( data.anchor.name );
+
+													var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
+													if ( linkType && linkType.getValue() == 'email' )
+														this.focus();
+												},
+												commit : function( data )
+												{
+													if ( !data.anchor )
+														data.anchor = {};
+
+													data.anchor.name = this.getValue();
+												}
+											},
+											{
+												type : 'select',
+												id : 'anchorId',
+												'default' : '',
+												label : linkLang.anchorId,
+												style : 'width: 100%;',
+												items :
+												[
+													[ '' ]
+												],
+												setup : function( data )
+												{
+													this.clear();
+													this.add( '' );
+													for ( var i = 0 ; i < data.anchors.length ; i++ )
+													{
+														if ( data.anchors[i].id )
+															this.add( data.anchors[i].id );
+													}
+
+													if ( data.anchor )
+														this.setValue( data.anchor.id );
+												},
+												commit : function( data )
+												{
+													if ( !data.anchor )
+														data.anchor = {};
+
+													data.anchor.id = this.getValue();
+												}
+											}
+										],
+										setup : function( data )
+										{
+											if ( data.anchors.length > 0 )
+												this.getElement().show();
+											else
+												this.getElement().hide();
+										}
+									}
+								]
+							},
+							{
+								type : 'html',
+								id : 'noAnchors',
+								style : 'text-align: center;',
+								html : '<div role="label" tabIndex="-1">' + CKEDITOR.tools.htmlEncode( linkLang.noAnchors ) + '</div>',
+								// Focus the first element defined in above html.
+								focus : true,
+								setup : function( data )
+								{
+									if ( data.anchors.length < 1 )
+										this.getElement().show();
+									else
+										this.getElement().hide();
+								}
+							}
+						],
+						setup : function( data )
+						{
+							if ( !this.getDialog().getContentElement( 'info', 'linkType' ) )
+								this.getElement().hide();
+						}
+					},
+					{
+						type :  'vbox',
+						id : 'emailOptions',
+						padding : 1,
+						children :
+						[
+							{
+								type : 'text',
+								id : 'emailAddress',
+								label : linkLang.emailAddress,
+								required : true,
+								validate : function()
+								{
+									var dialog = this.getDialog();
+
+									if ( !dialog.getContentElement( 'info', 'linkType' ) ||
+											dialog.getValueOf( 'info', 'linkType' ) != 'email' )
+										return true;
+
+									var func = CKEDITOR.dialog.validate.notEmpty( linkLang.noEmail );
+									return func.apply( this );
+								},
+								setup : function( data )
+								{
+									if ( data.email )
+										this.setValue( data.email.address );
+
+									var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
+									if ( linkType && linkType.getValue() == 'email' )
+										this.select();
+								},
+								commit : function( data )
+								{
+									if ( !data.email )
+										data.email = {};
+
+									data.email.address = this.getValue();
+								}
+							},
+							{
+								type : 'text',
+								id : 'emailSubject',
+								label : linkLang.emailSubject,
+								setup : function( data )
+								{
+									if ( data.email )
+										this.setValue( data.email.subject );
+								},
+								commit : function( data )
+								{
+									if ( !data.email )
+										data.email = {};
+
+									data.email.subject = this.getValue();
+								}
+							},
+							{
+								type : 'textarea',
+								id : 'emailBody',
+								label : linkLang.emailBody,
+								rows : 3,
+								'default' : '',
+								setup : function( data )
+								{
+									if ( data.email )
+										this.setValue( data.email.body );
+								},
+								commit : function( data )
+								{
+									if ( !data.email )
+										data.email = {};
+
+									data.email.body = this.getValue();
+								}
+							}
+						],
+						setup : function( data )
+						{
+							if ( !this.getDialog().getContentElement( 'info', 'linkType' ) )
+								this.getElement().hide();
+						}
+					}
+				]
+			},
+			{
+				id : 'target',
+				label : linkLang.target,
+				title : linkLang.target,
+				elements :
+				[
+					{
+						type : 'hbox',
+						widths : [ '50%', '50%' ],
+						children :
+						[
+							{
+								type : 'select',
+								id : 'linkTargetType',
+								label : commonLang.target,
+								'default' : 'notSet',
+								style : 'width : 100%;',
+								'items' :
+								[
+									[ commonLang.notSet, 'notSet' ],
+									[ linkLang.targetFrame, 'frame' ],
+									[ linkLang.targetPopup, 'popup' ],
+									[ commonLang.targetNew, '_blank' ],
+									[ commonLang.targetTop, '_top' ],
+									[ commonLang.targetSelf, '_self' ],
+									[ commonLang.targetParent, '_parent' ]
+								],
+								onChange : targetChanged,
+								setup : function( data )
+								{
+									if ( data.target )
+										this.setValue( data.target.type || 'notSet' );
+									targetChanged.call( this );
+								},
+								commit : function( data )
+								{
+									if ( !data.target )
+										data.target = {};
+
+									data.target.type = this.getValue();
+								}
+							},
+							{
+								type : 'text',
+								id : 'linkTargetName',
+								label : linkLang.targetFrameName,
+								'default' : '',
+								setup : function( data )
+								{
+									if ( data.target )
+										this.setValue( data.target.name );
+								},
+								commit : function( data )
+								{
+									if ( !data.target )
+										data.target = {};
+
+									data.target.name = this.getValue().replace(/\W/gi, '');
+								}
+							}
+						]
+					},
+					{
+						type : 'vbox',
+						width : '100%',
+						align : 'center',
+						padding : 2,
+						id : 'popupFeatures',
+						children :
+						[
+							{
+								type : 'fieldset',
+								label : linkLang.popupFeatures,
+								children :
+								[
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'resizable',
+												label : linkLang.popupResizable,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+											},
+											{
+												type : 'checkbox',
+												id : 'status',
+												label : linkLang.popupStatusBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									},
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'location',
+												label : linkLang.popupLocationBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'toolbar',
+												label : linkLang.popupToolbar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									},
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'menubar',
+												label : linkLang.popupMenuBar,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'fullscreen',
+												label : linkLang.popupFullScreen,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									},
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type : 'checkbox',
+												id : 'scrollbars',
+												label : linkLang.popupScrollBars,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type : 'checkbox',
+												id : 'dependent',
+												label : linkLang.popupDependent,
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									},
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type :  'text',
+												widths : [ '50%', '50%' ],
+												labelLayout : 'horizontal',
+												label : commonLang.width,
+												id : 'width',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												widths : [ '50%', '50%' ],
+												label : linkLang.popupLeft,
+												id : 'left',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									},
+									{
+										type : 'hbox',
+										children :
+										[
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												widths : [ '50%', '50%' ],
+												label : commonLang.height,
+												id : 'height',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											},
+											{
+												type :  'text',
+												labelLayout : 'horizontal',
+												label : linkLang.popupTop,
+												widths : [ '50%', '50%' ],
+												id : 'top',
+												setup : setupPopupParams,
+												commit : commitPopupParams
+
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				id : 'upload',
+				label : linkLang.upload,
+				title : linkLang.upload,
+				hidden : true,
+				filebrowser : 'uploadButton',
+				elements :
+				[
+					{
+						type : 'file',
+						id : 'upload',
+						label : commonLang.upload,
+						style: 'height:40px',
+						size : 29
+					},
+					{
+						type : 'fileButton',
+						id : 'uploadButton',
+						label : commonLang.uploadSubmit,
+						filebrowser : 'info:url',
+						'for' : [ 'upload', 'upload' ]
+					}
+				]
+			},
+			{
+				id : 'advanced',
+				label : linkLang.advanced,
+				title : linkLang.advanced,
+				elements :
+				[
+					{
+						type : 'vbox',
+						padding : 1,
+						children :
+						[
+							{
+								type : 'hbox',
+								widths : [ '45%', '35%', '20%' ],
+								children :
+								[
+									{
+										type : 'text',
+										id : 'advId',
+										label : linkLang.id,
+										setup : setupAdvParams,
+										commit : commitAdvParams
+									},
+									{
+										type : 'select',
+										id : 'advLangDir',
+										label : linkLang.langDir,
+										'default' : '',
+										style : 'width:110px',
+										items :
+										[
+											[ commonLang.notSet, '' ],
+											[ linkLang.langDirLTR, 'ltr' ],
+											[ linkLang.langDirRTL, 'rtl' ]
+										],
+										setup : setupAdvParams,
+										commit : commitAdvParams
+									},
+									{
+										type : 'text',
+										id : 'advAccessKey',
+										width : '80px',
+										label : linkLang.acccessKey,
+										maxLength : 1,
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									}
+								]
+							},
+							{
+								type : 'hbox',
+								widths : [ '45%', '35%', '20%' ],
+								children :
+								[
+									{
+										type : 'text',
+										label : linkLang.name,
+										id : 'advName',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									},
+									{
+										type : 'text',
+										label : linkLang.langCode,
+										id : 'advLangCode',
+										width : '110px',
+										'default' : '',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									},
+									{
+										type : 'text',
+										label : linkLang.tabIndex,
+										id : 'advTabIndex',
+										width : '80px',
+										maxLength : 5,
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									}
+								]
+							}
+						]
+					},
+					{
+						type : 'vbox',
+						padding : 1,
+						children :
+						[
+							{
+								type : 'hbox',
+								widths : [ '45%', '55%' ],
+								children :
+								[
+									{
+										type : 'text',
+										label : linkLang.advisoryTitle,
+										'default' : '',
+										id : 'advTitle',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									},
+									{
+										type : 'text',
+										label : linkLang.advisoryContentType,
+										'default' : '',
+										id : 'advContentType',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									}
+								]
+							},
+							{
+								type : 'hbox',
+								widths : [ '45%', '55%' ],
+								children :
+								[
+									{
+										type : 'text',
+										label : linkLang.cssClasses,
+										'default' : '',
+										id : 'advCSSClasses',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									},
+									{
+										type : 'text',
+										label : linkLang.charset,
+										'default' : '',
+										id : 'advCharset',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+
+									}
+								]
+							},
+							{
+								type : 'hbox',
+								widths : [ '45%', '55%' ],
+								children :
+								[
+									{
+										type : 'text',
+										label : linkLang.rel,
+										'default' : '',
+										id : 'advRel',
+										setup : setupAdvParams,
+										commit : commitAdvParams
+									},
+									{
+										type : 'text',
+										label : linkLang.styles,
+										'default' : '',
+										id : 'advStyles',
+										validate : CKEDITOR.dialog.validate.inlineStyle( editor.lang.common.invalidInlineStyle ),
+										setup : setupAdvParams,
+										commit : commitAdvParams
+									}
+								]
+							}
+						]
+					}
+				]
+			}
+		],
+		onShow : function()
+		{
+			var editor = this.getParentEditor(),
+				selection = editor.getSelection(),
+				element = null;
+
+			// Fill in all the relevant fields if there's already one link selected.
+			if ( ( element = plugin.getSelectedLink( editor ) ) && element.hasAttribute( 'href' ) )
+				selection.selectElement( element );
+			else
+				element = null;
+
+			this.setupContent( parseLink.apply( this, [ editor, element ] ) );
+		},
+		onOk : function()
+		{
+			var attributes = {},
+				removeAttributes = [],
+				data = {},
+				me = this,
+				editor = this.getParentEditor();
+
+			this.commitContent( data );
+
+			// Compose the URL.
+			switch ( data.type || 'url' )
+			{
+				case 'url':
+					var protocol = ( data.url && data.url.protocol != undefined ) ? data.url.protocol : 'http://',
+						url = ( data.url && CKEDITOR.tools.trim( data.url.url ) ) || '';
+					attributes[ 'data-cke-saved-href' ] = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;
+					break;
+				case 'anchor':
+					var name = ( data.anchor && data.anchor.name ),
+						id = ( data.anchor && data.anchor.id );
+					attributes[ 'data-cke-saved-href' ] = '#' + ( name || id || '' );
+					break;
+				case 'email':
+
+					var linkHref,
+						email = data.email,
+						address = email.address;
+
+					switch( emailProtection )
+					{
+						case '' :
+						case 'encode' :
+						{
+							var subject = encodeURIComponent( email.subject || '' ),
+								body = encodeURIComponent( email.body || '' );
+
+							// Build the e-mail parameters first.
+							var argList = [];
+							subject && argList.push( 'subject=' + subject );
+							body && argList.push( 'body=' + body );
+							argList = argList.length ? '?' + argList.join( '&' ) : '';
+
+							if ( emailProtection == 'encode' )
+							{
+								linkHref = [ 'javascript:void(location.href=\'mailto:\'+',
+											 protectEmailAddressAsEncodedString( address ) ];
+								// parameters are optional.
+								argList && linkHref.push( '+\'', escapeSingleQuote( argList ), '\'' );
+
+								linkHref.push( ')' );
+							}
+							else
+								linkHref = [ 'mailto:', address, argList ];
+
+							break;
+						}
+						default :
+						{
+							// Separating name and domain.
+							var nameAndDomain = address.split( '@', 2 );
+							email.name = nameAndDomain[ 0 ];
+							email.domain = nameAndDomain[ 1 ];
+
+							linkHref = [ 'javascript:', protectEmailLinkAsFunction( email ) ];
+						}
+					}
+
+					attributes[ 'data-cke-saved-href' ] = linkHref.join( '' );
+					break;
+			}
+
+			// Popups and target.
+			if ( data.target )
+			{
+				if ( data.target.type == 'popup' )
+				{
+					var onclickList = [ 'window.open(this.href, \'',
+							data.target.name || '', '\', \'' ];
+					var featureList = [ 'resizable', 'status', 'location', 'toolbar', 'menubar', 'fullscreen',
+							'scrollbars', 'dependent' ];
+					var featureLength = featureList.length;
+					var addFeature = function( featureName )
+					{
+						if ( data.target[ featureName ] )
+							featureList.push( featureName + '=' + data.target[ featureName ] );
+					};
+
+					for ( var i = 0 ; i < featureLength ; i++ )
+						featureList[i] = featureList[i] + ( data.target[ featureList[i] ] ? '=yes' : '=no' ) ;
+					addFeature( 'width' );
+					addFeature( 'left' );
+					addFeature( 'height' );
+					addFeature( 'top' );
+
+					onclickList.push( featureList.join( ',' ), '\'); return false;' );
+					attributes[ 'data-cke-pa-onclick' ] = onclickList.join( '' );
+
+					// Add the "target" attribute. (#5074)
+					removeAttributes.push( 'target' );
+				}
+				else
+				{
+					if ( data.target.type != 'notSet' && data.target.name )
+						attributes.target = data.target.name;
+					else
+						removeAttributes.push( 'target' );
+
+					removeAttributes.push( 'data-cke-pa-onclick', 'onclick' );
+				}
+			}
+
+			// Advanced attributes.
+			if ( data.adv )
+			{
+				var advAttr = function( inputName, attrName )
+				{
+					var value = data.adv[ inputName ];
+					if ( value )
+						attributes[attrName] = value;
+					else
+						removeAttributes.push( attrName );
+				};
+
+				advAttr( 'advId', 'id' );
+				advAttr( 'advLangDir', 'dir' );
+				advAttr( 'advAccessKey', 'accessKey' );
+
+				if ( data.adv[ 'advName' ] )
+					attributes[ 'name' ] = attributes[ 'data-cke-saved-name' ] = data.adv[ 'advName' ];
+				else
+					removeAttributes = removeAttributes.concat( [ 'data-cke-saved-name', 'name' ] );
+
+				advAttr( 'advLangCode', 'lang' );
+				advAttr( 'advTabIndex', 'tabindex' );
+				advAttr( 'advTitle', 'title' );
+				advAttr( 'advContentType', 'type' );
+				advAttr( 'advCSSClasses', 'class' );
+				advAttr( 'advCharset', 'charset' );
+				advAttr( 'advStyles', 'style' );
+				advAttr( 'advRel', 'rel' );
+			}
+
+
+			// Browser need the "href" fro copy/paste link to work. (#6641)
+			attributes.href = attributes[ 'data-cke-saved-href' ];
+
+			if ( !this._.selectedElement )
+			{
+				// Create element if current selection is collapsed.
+				var selection = editor.getSelection(),
+					ranges = selection.getRanges( true );
+				if ( ranges.length == 1 && ranges[0].collapsed )
+				{
+					// Short mailto link text view (#5736).
+					var text = new CKEDITOR.dom.text( data.type == 'email' ?
+							data.email.address : attributes[ 'data-cke-saved-href' ], editor.document );
+					ranges[0].insertNode( text );
+					ranges[0].selectNodeContents( text );
+					selection.selectRanges( ranges );
+				}
+
+				// Apply style.
+				var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
+				style.type = CKEDITOR.STYLE_INLINE;		// need to override... dunno why.
+				style.apply( editor.document );
+			}
+			else
+			{
+				// We're only editing an existing link, so just overwrite the attributes.
+				var element = this._.selectedElement,
+					href = element.data( 'cke-saved-href' ),
+					textView = element.getHtml();
+
+				element.setAttributes( attributes );
+				element.removeAttributes( removeAttributes );
+
+				if ( data.adv && data.adv.advName && CKEDITOR.plugins.link.synAnchorSelector )
+					element.addClass( element.getChildCount() ? 'cke_anchor' : 'cke_anchor_empty' );
+
+				// Update text view when user changes protocol (#4612).
+				if ( href == textView || data.type == 'email' && textView.indexOf( '@' ) != -1 )
+				{
+					// Short mailto link text view (#5736).
+					element.setHtml( data.type == 'email' ?
+						data.email.address : attributes[ 'data-cke-saved-href' ] );
+				}
+
+				delete this._.selectedElement;
+			}
+		},
+		onLoad : function()
+		{
+			if ( !editor.config.linkShowAdvancedTab )
+				this.hidePage( 'advanced' );		//Hide Advanded tab.
+
+			if ( !editor.config.linkShowTargetTab )
+				this.hidePage( 'target' );		//Hide Target tab.
+
+		},
+		// Inital focus on 'url' field if link is of type URL.
+		onFocus : function()
+		{
+			var linkType = this.getContentElement( 'info', 'linkType' ),
+					urlField;
+			if ( linkType && linkType.getValue() == 'url' )
+			{
+				urlField = this.getContentElement( 'info', 'url' );
+				urlField.select();
+			}
+		}
+	};
+});
+
+/**
+ * The e-mail address anti-spam protection option. The protection will be
+ * applied when creating or modifying e-mail links through the editor interface.<br>
+ * Two methods of protection can be choosed:
+ * <ol>	<li>The e-mail parts (name, domain and any other query string) are
+ *			assembled into a function call pattern. Such function must be
+ *			provided by the developer in the pages that will use the contents.
+ *		<li>Only the e-mail address is obfuscated into a special string that
+ *			has no meaning for humans or spam bots, but which is properly
+ *			rendered and accepted by the browser.</li></ol>
+ * Both approaches require JavaScript to be enabled.
+ * @name CKEDITOR.config.emailProtection
+ * @since 3.1
+ * @type String
+ * @default '' (empty string = disabled)
+ * @example
+ * // href="mailto:tester@ckeditor.com?subject=subject&body=body"
+ * config.emailProtection = '';
+ * @example
+ * // href="<a href=\"javascript:void(location.href=\'mailto:\'+String.fromCharCode(116,101,115,116,101,114,64,99,107,101,100,105,116,111,114,46,99,111,109)+\'?subject=subject&body=body\')\">e-mail</a>"
+ * config.emailProtection = 'encode';
+ * @example
+ * // href="javascript:mt('tester','ckeditor.com','subject','body')"
+ * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)';
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/images/anchor.gif b/upload/public/js/3rd_party/ckeditor/plugins/link/images/anchor.gif
new file mode 100644
index 00000000..5aa797b2
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/link/images/anchor.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/link/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/link/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/link/index.html b/upload/public/js/3rd_party/ckeditor/plugins/link/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/link/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/liststyle.js b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/liststyle.js
new file mode 100644
index 00000000..3480eb05
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/dialogs/liststyle.js
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+(function()
+{
+	function getListElement( editor, listTag )
+	{
+		var range;
+		try { range  = editor.getSelection().getRanges()[ 0 ]; }
+		catch( e ) { return null; }
+
+		range.shrink( CKEDITOR.SHRINK_TEXT );
+		return range.getCommonAncestor().getAscendant( listTag, 1 );
+	}
+
+	var listItem = function( node ) { return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' ); };
+
+	var mapListStyle = {
+		'a' : 'lower-alpha',
+		'A' : 'upper-alpha',
+		'i' : 'lower-roman',
+		'I' : 'upper-roman',
+		'1' : 'decimal',
+		'disc' : 'disc',
+		'circle': 'circle',
+		'square' : 'square'
+	};
+
+	function listStyle( editor, startupPage )
+	{
+		var lang = editor.lang.list;
+		if ( startupPage == 'bulletedListStyle' )
+		{
+			return {
+				title : lang.bulletedTitle,
+				minWidth : 300,
+				minHeight : 50,
+				contents :
+				[
+					{
+						id : 'info',
+						accessKey : 'I',
+						elements :
+						[
+							{
+								type : 'select',
+								label : lang.type,
+								id : 'type',
+								align : 'center',
+								style : 'width:150px',
+								items :
+								[
+									[ lang.notset, '' ],
+									[ lang.circle, 'circle' ],
+									[ lang.disc,  'disc' ],
+									[ lang.square, 'square' ]
+								],
+								setup : function( element )
+								{
+									var value = element.getStyle( 'list-style-type' )
+												|| mapListStyle[ element.getAttribute( 'type' ) ]
+												|| element.getAttribute( 'type' )
+												|| '';
+
+									this.setValue( value );
+								},
+								commit : function( element )
+								{
+									var value = this.getValue();
+									if ( value )
+										element.setStyle( 'list-style-type', value );
+									else
+										element.removeStyle( 'list-style-type' );
+								}
+							}
+						]
+					}
+				],
+				onShow: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ul' );
+
+					element && this.setupContent( element );
+				},
+				onOk: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ul' );
+
+					element && this.commitContent( element );
+				}
+			};
+		}
+		else if ( startupPage == 'numberedListStyle'  )
+		{
+
+			var listStyleOptions =
+			[
+				[ lang.notset, '' ],
+				[ lang.lowerRoman, 'lower-roman' ],
+				[ lang.upperRoman, 'upper-roman' ],
+				[ lang.lowerAlpha, 'lower-alpha' ],
+				[ lang.upperAlpha, 'upper-alpha' ],
+				[ lang.decimal, 'decimal' ]
+			];
+
+			if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 7 )
+			{
+				listStyleOptions.concat( [
+					[ lang.armenian, 'armenian' ],
+					[ lang.decimalLeadingZero, 'decimal-leading-zero' ],
+					[ lang.georgian, 'georgian' ],
+					[ lang.lowerGreek, 'lower-greek' ]
+				]);
+			}
+
+			return {
+				title : lang.numberedTitle,
+				minWidth : 300,
+				minHeight : 50,
+				contents :
+				[
+					{
+						id : 'info',
+						accessKey : 'I',
+						elements :
+						[
+							{
+								type : 'hbox',
+								widths : [ '25%', '75%' ],
+								children :
+								[
+									{
+										label : lang.start,
+										type : 'text',
+										id : 'start',
+										validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),
+										setup : function( element )
+										{
+											// List item start number dominates.
+											var value = element.getFirst( listItem ).getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
+											value && this.setValue( value );
+										},
+										commit : function( element )
+										{
+											var firstItem = element.getFirst( listItem );
+											var oldStart = firstItem.getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
+
+											// Force start number on list root.
+											element.getFirst( listItem ).removeAttribute( 'value' );
+											var val = parseInt( this.getValue(), 10 );
+											if ( isNaN( val ) )
+												element.removeAttribute( 'start' );
+											else
+												element.setAttribute( 'start', val );
+
+											// Update consequent list item numbering.
+											var nextItem = firstItem, conseq = oldStart, startNumber = isNaN( val ) ? 1 : val;
+											while ( ( nextItem = nextItem.getNext( listItem ) ) && conseq++ )
+											{
+												if ( nextItem.getAttribute( 'value' ) == conseq )
+													nextItem.setAttribute( 'value', startNumber + conseq - oldStart );
+											}
+										}
+									},
+									{
+										type : 'select',
+										label : lang.type,
+										id : 'type',
+										style : 'width: 100%;',
+										items : listStyleOptions,
+										setup : function( element )
+										{
+											var value = element.getStyle( 'list-style-type' )
+												|| mapListStyle[ element.getAttribute( 'type' ) ]
+												|| element.getAttribute( 'type' )
+												|| '';
+
+											this.setValue( value );
+										},
+										commit : function( element )
+										{
+											var value = this.getValue();
+											if ( value )
+												element.setStyle( 'list-style-type', value );
+											else
+												element.removeStyle( 'list-style-type' );
+										}
+									}
+								]
+							}
+						]
+					}
+				],
+				onShow: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ol' );
+
+					element && this.setupContent( element );
+				},
+				onOk: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ol' );
+
+					element && this.commitContent( element );
+				}
+			};
+		}
+	}
+
+	CKEDITOR.dialog.add( 'numberedListStyle', function( editor )
+		{
+			return listStyle( editor, 'numberedListStyle' );
+		});
+
+	CKEDITOR.dialog.add( 'bulletedListStyle', function( editor )
+		{
+			return listStyle( editor, 'bulletedListStyle' );
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/liststyle/index.html b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/liststyle/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/pagebreak.gif b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/pagebreak.gif
new file mode 100644
index 00000000..8d1cffd6
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/images/pagebreak.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pagebreak/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/default.js b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/default.js
new file mode 100644
index 00000000..943a327e
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/default.js
@@ -0,0 +1,1367 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var fragmentPrototype = CKEDITOR.htmlParser.fragment.prototype,
+		elementPrototype = CKEDITOR.htmlParser.element.prototype;
+
+	fragmentPrototype.onlyChild = elementPrototype.onlyChild = function()
+	{
+		var children = this.children,
+			count = children.length,
+			firstChild = ( count == 1 ) && children[ 0 ];
+		return firstChild || null;
+	};
+
+	elementPrototype.removeAnyChildWithName = function( tagName )
+	{
+		var children = this.children,
+			childs = [],
+			child;
+
+		for ( var i = 0; i < children.length; i++ )
+		{
+			child = children[ i ];
+			if ( !child.name )
+				continue;
+
+			if ( child.name == tagName )
+			{
+				childs.push( child );
+				children.splice( i--, 1 );
+			}
+			childs = childs.concat( child.removeAnyChildWithName( tagName ) );
+		}
+		return childs;
+	};
+
+	elementPrototype.getAncestor = function( tagNameRegex )
+	{
+		var parent = this.parent;
+		while ( parent && !( parent.name && parent.name.match( tagNameRegex ) ) )
+			parent = parent.parent;
+		return parent;
+	};
+
+	fragmentPrototype.firstChild = elementPrototype.firstChild = function( evaluator )
+	{
+		var child;
+
+		for ( var i = 0 ; i < this.children.length ; i++ )
+		{
+			child = this.children[ i ];
+			if ( evaluator( child ) )
+				return child;
+			else if ( child.name )
+			{
+				child = child.firstChild( evaluator );
+				if ( child )
+					return child;
+			}
+		}
+
+		return null;
+	};
+
+	// Adding a (set) of styles to the element's 'style' attributes.
+	elementPrototype.addStyle = function( name, value, isPrepend )
+	{
+		var styleText, addingStyleText = '';
+		// name/value pair.
+		if ( typeof value == 'string' )
+			addingStyleText += name + ':' + value + ';';
+		else
+		{
+			// style literal.
+			if ( typeof name == 'object' )
+			{
+				for ( var style in name )
+				{
+					if ( name.hasOwnProperty( style ) )
+						addingStyleText += style + ':' + name[ style ] + ';';
+				}
+			}
+			// raw style text form.
+			else
+				addingStyleText += name;
+
+			isPrepend = value;
+		}
+
+		if ( !this.attributes )
+			this.attributes = {};
+
+		styleText = this.attributes.style || '';
+
+		styleText = ( isPrepend ?
+		              [ addingStyleText, styleText ]
+					  : [ styleText, addingStyleText ] ).join( ';' );
+
+		this.attributes.style = styleText.replace( /^;|;(?=;)/, '' );
+	};
+
+	/**
+	 * Return the DTD-valid parent tag names of the specified one.
+	 * @param tagName
+	 */
+	CKEDITOR.dtd.parentOf = function( tagName )
+	{
+		var result = {};
+		for ( var tag in this )
+		{
+			if ( tag.indexOf( '$' ) == -1 && this[ tag ][ tagName ] )
+				result[ tag ] = 1;
+		}
+		return result;
+	};
+
+	// 1. move consistent list item styles up to list root.
+	// 2. clear out unnecessary list item numbering.
+	function postProcessList( list )
+	{
+		var children = list.children,
+			child,
+			attrs,
+			count = list.children.length,
+			match,
+			mergeStyle,
+			styleTypeRegexp = /list-style-type:(.*?)(?:;|$)/,
+			stylesFilter = CKEDITOR.plugins.pastefromword.filters.stylesFilter;
+
+		attrs = list.attributes;
+		if ( styleTypeRegexp.exec( attrs.style ) )
+			return;
+
+		for ( var i = 0; i < count; i++ )
+		{
+			child = children[ i ];
+
+			if ( child.attributes.value && Number( child.attributes.value ) == i + 1 )
+				delete child.attributes.value;
+
+			match = styleTypeRegexp.exec( child.attributes.style );
+
+			if ( match )
+			{
+				if ( match[ 1 ] == mergeStyle || !mergeStyle )
+					mergeStyle = match[ 1 ];
+				else
+				{
+					mergeStyle = null;
+					break;
+				}
+			}
+		}
+
+		if ( mergeStyle )
+		{
+			for ( i = 0; i < count; i++ )
+			{
+				attrs = children[ i ].attributes;
+				attrs.style && ( attrs.style = stylesFilter( [ [ 'list-style-type'] ] )( attrs.style ) || '' );
+			}
+
+			list.addStyle( 'list-style-type', mergeStyle );
+		}
+	}
+
+	var cssLengthRelativeUnit = /^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
+	var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/;		// e.g. 0px 0pt 0px
+	var romanLiternalPattern = '^m{0,4}(cm|cd|d?c{0,3})(xc|xl|l?x{0,3})(ix|iv|v?i{0,3})$',
+		lowerRomanLiteralRegex = new RegExp( romanLiternalPattern ),
+		upperRomanLiteralRegex = new RegExp( romanLiternalPattern.toUpperCase() );
+
+	var orderedPatterns = { 'decimal' : /\d+/, 'lower-roman': lowerRomanLiteralRegex, 'upper-roman': upperRomanLiteralRegex, 'lower-alpha' : /^[a-z]+$/, 'upper-alpha': /^[A-Z]+$/ },
+		unorderedPatterns = { 'disc' : /[l\u00B7\u2002]/, 'circle' : /[\u006F\u00D8]/,'square' : /[\u006E\u25C6]/},
+		listMarkerPatterns = { 'ol' : orderedPatterns, 'ul' : unorderedPatterns },
+		romans = [ [1000, 'M'], [900, 'CM'], [500, 'D'], [400, 'CD'], [100, 'C'], [90, 'XC'], [50, 'L'], [40, 'XL'], [10, 'X'], [9, 'IX'], [5, 'V'], [4, 'IV'], [1, 'I'] ],
+		alpahbets = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+	// Convert roman numbering back to decimal.
+	function fromRoman( str )
+	 {
+		 str = str.toUpperCase();
+		 var l = romans.length, retVal = 0;
+		 for ( var i = 0; i < l; ++i )
+		 {
+			 for ( var j = romans[i], k = j[1].length; str.substr( 0, k ) == j[1]; str = str.substr( k ) )
+				 retVal += j[ 0 ];
+		 }
+		 return retVal;
+	 }
+
+	// Convert alphabet numbering back to decimal.
+	function fromAlphabet( str )
+	{
+		str = str.toUpperCase();
+		var l = alpahbets.length, retVal = 1;
+		for ( var x = 1; str.length > 0; x *= l )
+		{
+			retVal += alpahbets.indexOf( str.charAt( str.length - 1 ) ) * x;
+			str = str.substr( 0, str.length - 1 );
+		}
+		return retVal;
+	}
+
+	var listBaseIndent = 0,
+		previousListItemMargin = null,
+		previousListId;
+
+	var plugin = ( CKEDITOR.plugins.pastefromword =
+	{
+		utils :
+		{
+			// Create a <cke:listbullet> which indicate an list item type.
+			createListBulletMarker : function ( bullet, bulletText )
+			{
+				var marker = new CKEDITOR.htmlParser.element( 'cke:listbullet' );
+				marker.attributes = { 'cke:listsymbol' : bullet[ 0 ] };
+				marker.add( new CKEDITOR.htmlParser.text( bulletText ) );
+				return marker;
+			},
+
+			isListBulletIndicator : function( element )
+			{
+				var styleText = element.attributes && element.attributes.style;
+				if ( /mso-list\s*:\s*Ignore/i.test( styleText ) )
+					return true;
+			},
+
+			isContainingOnlySpaces : function( element )
+			{
+				var text;
+				return ( ( text = element.onlyChild() )
+					    && ( /^(:?\s|&nbsp;)+$/ ).test( text.value ) );
+			},
+
+			resolveList : function( element )
+			{
+				// <cke:listbullet> indicate a list item.
+				var attrs = element.attributes,
+					listMarker;
+
+				if ( ( listMarker = element.removeAnyChildWithName( 'cke:listbullet' ) )
+						&& listMarker.length
+						&& ( listMarker = listMarker[ 0 ] ) )
+				{
+					element.name = 'cke:li';
+
+					if ( attrs.style )
+					{
+						attrs.style = plugin.filters.stylesFilter(
+								[
+									// Text-indent is not representing list item level any more.
+									[ 'text-indent' ],
+									[ 'line-height' ],
+									// First attempt is to resolve indent level from on a constant margin increment.
+									[ ( /^margin(:?-left)?$/ ), null, function( margin )
+									{
+										// Deal with component/short-hand form.
+										var values = margin.split( ' ' );
+										margin = CKEDITOR.tools.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
+
+										// Figure out the indent unit by checking the first time of incrementation.
+										if ( !listBaseIndent && previousListItemMargin !== null && margin > previousListItemMargin )
+											listBaseIndent = margin - previousListItemMargin;
+
+										previousListItemMargin = margin;
+
+										attrs[ 'cke:indent' ] = listBaseIndent && ( Math.ceil( margin / listBaseIndent ) + 1 ) || 1;
+									} ],
+									// The best situation: "mso-list:l0 level1 lfo2" tells the belonged list root, list item indentation, etc.
+									[ ( /^mso-list$/ ), null, function( val )
+									{
+										val = val.split( ' ' );
+										var listId = Number( val[ 0 ].match( /\d+/ ) ),
+											indent = Number( val[ 1 ].match( /\d+/ ) );
+
+										if ( indent == 1 )
+										{
+											listId !== previousListId && ( attrs[ 'cke:reset' ] = 1 );
+											previousListId = listId;
+										}
+										attrs[ 'cke:indent' ] = indent;
+									} ]
+								] )( attrs.style, element ) || '';
+					}
+
+					// First level list item might be presented without a margin.
+
+
+					// In case all above doesn't apply.
+					if ( !attrs[ 'cke:indent' ] )
+					{
+						previousListItemMargin = 0;
+						attrs[ 'cke:indent' ] = 1;
+					}
+
+					// Inherit attributes from bullet.
+					CKEDITOR.tools.extend( attrs, listMarker.attributes );
+					return true;
+				}
+				// Current list disconnected.
+				else
+					previousListId = previousListItemMargin = listBaseIndent = null;
+
+				return false;
+			},
+
+			// Providing a shorthand style then retrieve one or more style component values.
+			getStyleComponents : ( function()
+			{
+				var calculator = CKEDITOR.dom.element.createFromHtml(
+								'<div style="position:absolute;left:-9999px;top:-9999px;"></div>',
+								CKEDITOR.document );
+				CKEDITOR.document.getBody().append( calculator );
+
+				return function( name, styleValue, fetchList )
+				{
+					calculator.setStyle( name, styleValue );
+					var styles = {},
+						count = fetchList.length;
+					for ( var i = 0; i < count; i++ )
+						styles[ fetchList[ i ] ]  = calculator.getStyle( fetchList[ i ] );
+
+					return styles;
+				};
+			} )(),
+
+			listDtdParents : CKEDITOR.dtd.parentOf( 'ol' )
+		},
+
+		filters :
+		{
+				// Transform a normal list into flat list items only presentation.
+				// E.g. <ul><li>level1<ol><li>level2</li></ol></li> =>
+				// <cke:li cke:listtype="ul" cke:indent="1">level1</cke:li>
+				// <cke:li cke:listtype="ol" cke:indent="2">level2</cke:li>
+				flattenList : function( element, level )
+				{
+					level = typeof level == 'number' ? level : 1;
+
+					var	attrs = element.attributes,
+						listStyleType;
+
+					// All list items are of the same type.
+					switch ( attrs.type )
+					{
+						case 'a' :
+							listStyleType = 'lower-alpha';
+							break;
+						case '1' :
+							listStyleType = 'decimal';
+							break;
+						// TODO: Support more list style type from MS-Word.
+					}
+
+					var children = element.children,
+						child;
+
+					for ( var i = 0; i < children.length; i++ )
+					{
+						child = children[ i ];
+
+						if ( child.name in CKEDITOR.dtd.$listItem )
+						{
+							var attributes = child.attributes,
+								listItemChildren = child.children,
+								count = listItemChildren.length,
+								last = listItemChildren[ count - 1 ];
+
+							// Move out nested list.
+							if ( last.name in CKEDITOR.dtd.$list )
+							{
+								element.add( last, i + 1 );
+
+								// Remove the parent list item if it's just a holder.
+								if ( !--listItemChildren.length )
+									children.splice( i--, 1 );
+							}
+
+							child.name = 'cke:li';
+
+							// Inherit numbering from list root on the first list item.
+							attrs.start && !i && ( attributes.value = attrs.start );
+
+							plugin.filters.stylesFilter(
+								[
+									[ 'tab-stops', null, function( val )
+									{
+										var margin = val.split( ' ' )[ 1 ].match( cssLengthRelativeUnit );
+										margin && ( previousListItemMargin = CKEDITOR.tools.convertToPx( margin[ 0 ] ) );
+									} ],
+									( level == 1 ? [ 'mso-list', null, function( val )
+									{
+										val = val.split( ' ' );
+										var listId = Number( val[ 0 ].match( /\d+/ ) );
+										listId !== previousListId && ( attributes[ 'cke:reset' ] = 1 );
+										previousListId = listId;
+									 } ] : null )
+								] )( attributes.style );
+
+							attributes[ 'cke:indent' ] = level;
+							attributes[ 'cke:listtype' ] = element.name;
+							attributes[ 'cke:list-style-type' ] = listStyleType;
+						}
+						// Flatten sub list.
+						else if ( child.name in CKEDITOR.dtd.$list )
+						{
+							// Absorb sub list children.
+							arguments.callee.apply( this, [ child, level + 1 ] );
+							children = children.slice( 0, i ).concat( child.children ).concat( children.slice( i + 1 ) );
+							element.children = [];
+							for ( var j = 0, num = children.length; j < num ; j++ )
+								element.add( children[ j ] );
+						}
+					}
+
+					delete element.name;
+
+					// We're loosing tag name here, signalize this element as a list.
+					attrs[ 'cke:list' ] = 1;
+				},
+
+				/**
+				 *  Try to collect all list items among the children and establish one
+				 *  or more HTML list structures for them.
+				 * @param element
+				 */
+				assembleList : function( element )
+				{
+					var children = element.children, child,
+							listItem,   // The current processing cke:li element.
+							listItemAttrs,
+							listItemIndent, // Indent level of current list item.
+							lastIndent,
+							lastListItem, // The previous one just been added to the list.
+							list, // Current staging list and it's parent list if any.
+							openedLists = [],
+							previousListStyleType,
+							previousListType;
+
+					// Properties of the list item are to be resolved from the list bullet.
+					var bullet,
+						listType,
+						listStyleType,
+						itemNumeric;
+
+					for ( var i = 0; i < children.length; i++ )
+					{
+						child = children[ i ];
+
+						if ( 'cke:li' == child.name )
+						{
+							child.name = 'li';
+							listItem = child;
+							listItemAttrs = listItem.attributes;
+							bullet = listItemAttrs[ 'cke:listsymbol' ];
+							bullet = bullet && bullet.match( /^(?:[(]?)([^\s]+?)([.)]?)$/ );
+							listType = listStyleType = itemNumeric = null;
+
+							if ( listItemAttrs[ 'cke:ignored' ] )
+							{
+								children.splice( i--, 1 );
+								continue;
+							}
+
+
+							// This's from a new list root.
+							listItemAttrs[ 'cke:reset' ] && ( list = lastIndent = lastListItem = null );
+
+							// List item indent level might come from a real list indentation or
+							// been resolved from a pseudo list item's margin value, even get
+							// no indentation at all.
+							listItemIndent = Number( listItemAttrs[ 'cke:indent' ] );
+
+							// We're moving out of the current list, cleaning up.
+							if ( listItemIndent != lastIndent )
+								previousListType = previousListStyleType = null;
+
+							// List type and item style are already resolved.
+							if ( !bullet )
+							{
+								listType = listItemAttrs[ 'cke:listtype' ] || 'ol';
+								listStyleType = listItemAttrs[ 'cke:list-style-type' ];
+							}
+							else
+							{
+								// Probably share the same list style type with previous list item,
+								// give it priority to avoid ambiguous between C(Alpha) and C.(Roman).
+								if ( previousListType && listMarkerPatterns[ previousListType ] [ previousListStyleType ].test( bullet[ 1 ] ) )
+								{
+									listType = previousListType;
+									listStyleType = previousListStyleType;
+								}
+								else
+								{
+									for ( var type in listMarkerPatterns )
+									{
+										for ( var style in listMarkerPatterns[ type ] )
+										{
+											if ( listMarkerPatterns[ type ][ style ].test( bullet[ 1 ] ) )
+											{
+												// Small numbering has higher priority, when dealing with ambiguous
+												// between C(Alpha) and C.(Roman).
+												if ( type == 'ol' && ( /alpha|roman/ ).test( style ) )
+												{
+													var num = /roman/.test( style ) ? fromRoman( bullet[ 1 ] ) : fromAlphabet( bullet[ 1 ] );
+													if ( !itemNumeric || num < itemNumeric )
+													{
+														itemNumeric = num;
+														listType = type;
+														listStyleType = style;
+													}
+												}
+												else
+												{
+													listType = type;
+													listStyleType = style;
+													break;
+												}
+											}
+										}
+									}
+								}
+
+								// Simply use decimal/disc for the rest forms of unrepresentable
+								// numerals, e.g. Chinese..., but as long as there a second part
+								// included, it has a bigger chance of being a order list ;)
+								!listType && ( listType = bullet[ 2 ] ? 'ol' : 'ul' );
+							}
+
+							previousListType = listType;
+							previousListStyleType = listStyleType || ( listType == 'ol' ? 'decimal' : 'disc' );
+							if ( listStyleType && listStyleType != ( listType == 'ol' ? 'decimal' : 'disc' ) )
+								listItem.addStyle( 'list-style-type', listStyleType );
+
+							// Figure out start numbering.
+							if ( listType == 'ol' && bullet )
+							{
+								switch ( listStyleType )
+								{
+									case 'decimal' :
+										itemNumeric = Number( bullet[ 1 ] );
+										break;
+									case 'lower-roman':
+									case 'upper-roman':
+										itemNumeric = fromRoman( bullet[ 1 ] );
+										break;
+									case 'lower-alpha':
+									case 'upper-alpha':
+										itemNumeric = fromAlphabet( bullet[ 1 ] );
+										break;
+								}
+
+								// Always create the numbering, swipe out unnecessary ones later.
+								listItem.attributes.value = itemNumeric;
+							}
+
+							// Start the list construction.
+							if ( !list )
+							{
+								openedLists.push( list = new CKEDITOR.htmlParser.element( listType ) );
+								list.add( listItem );
+								children[ i ] = list;
+							}
+							else
+							{
+								if ( listItemIndent > lastIndent )
+								{
+									openedLists.push( list = new CKEDITOR.htmlParser.element( listType ) );
+									list.add( listItem );
+									lastListItem.add( list );
+								}
+								else if ( listItemIndent < lastIndent )
+								{
+									// There might be a negative gap between two list levels. (#4944)
+									var diff = lastIndent - listItemIndent,
+											parent;
+									while ( diff-- && ( parent = list.parent ) )
+										list = parent.parent;
+
+									list.add( listItem );
+								}
+								else
+									list.add( listItem );
+
+								children.splice( i--, 1 );
+							}
+
+							lastListItem = listItem;
+							lastIndent = listItemIndent;
+						}
+						else if ( list )
+							list = lastIndent = lastListItem = null;
+					}
+
+					for ( i = 0; i < openedLists.length; i++ )
+						postProcessList( openedLists[ i ] );
+
+					list = lastIndent = lastListItem = previousListId = previousListItemMargin = listBaseIndent = null;
+				},
+
+				/**
+				 * A simple filter which always rejecting.
+				 */
+				falsyFilter : function( value )
+				{
+					return false;
+				},
+
+				/**
+				 * A filter dedicated on the 'style' attribute filtering, e.g. dropping/replacing style properties.
+				 * @param styles {Array} in form of [ styleNameRegexp, styleValueRegexp,
+				 *  newStyleValue/newStyleGenerator, newStyleName ] where only the first
+				 *  parameter is mandatory.
+				 * @param whitelist {Boolean} Whether the {@param styles} will be considered as a white-list.
+				 */
+				stylesFilter : function( styles, whitelist )
+				{
+					return function( styleText, element )
+					{
+						 var rules = [];
+						// html-encoded quote might be introduced by 'font-family'
+						// from MS-Word which confused the following regexp. e.g.
+						//'font-family: &quot;Lucida, Console&quot;'
+						( styleText || '' )
+							.replace( /&quot;/g, '"' )
+							.replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
+								 function( match, name, value )
+								 {
+									 name = name.toLowerCase();
+									 name == 'font-family' && ( value = value.replace( /["']/g, '' ) );
+
+									 var namePattern,
+										 valuePattern,
+										 newValue,
+										 newName;
+									 for ( var i = 0 ; i < styles.length; i++ )
+									 {
+										if ( styles[ i ] )
+										{
+											namePattern = styles[ i ][ 0 ];
+											valuePattern = styles[ i ][ 1 ];
+											newValue = styles[ i ][ 2 ];
+											newName = styles[ i ][ 3 ];
+
+											if ( name.match( namePattern )
+												 && ( !valuePattern || value.match( valuePattern ) ) )
+											{
+												name = newName || name;
+												whitelist && ( newValue = newValue || value );
+
+												if ( typeof newValue == 'function' )
+													newValue = newValue( value, element, name );
+
+												// Return an couple indicate both name and value
+												// changed.
+												if ( newValue && newValue.push )
+													name = newValue[ 0 ], newValue = newValue[ 1 ];
+
+												if ( typeof newValue == 'string' )
+													rules.push( [ name, newValue ] );
+												return;
+											}
+										}
+									 }
+
+									 !whitelist && rules.push( [ name, value ] );
+
+								 });
+
+						for ( var i = 0 ; i < rules.length ; i++ )
+							 rules[ i ] = rules[ i ].join( ':' );
+						return rules.length ?
+						         ( rules.join( ';' ) + ';' ) : false;
+					 };
+				},
+
+				/**
+				 * Migrate the element by decorate styles on it.
+				 * @param styleDefiniton
+				 * @param variables
+				 */
+				elementMigrateFilter : function ( styleDefiniton, variables )
+				{
+					return function( element )
+						{
+							var styleDef =
+									variables ?
+										new CKEDITOR.style( styleDefiniton, variables )._.definition
+										: styleDefiniton;
+							element.name = styleDef.element;
+							CKEDITOR.tools.extend( element.attributes, CKEDITOR.tools.clone( styleDef.attributes ) );
+							element.addStyle( CKEDITOR.style.getStyleText( styleDef ) );
+						};
+				},
+
+				/**
+				 * Migrate styles by creating a new nested stylish element.
+				 * @param styleDefinition
+				 */
+				styleMigrateFilter : function( styleDefinition, variableName )
+				{
+
+					var elementMigrateFilter = this.elementMigrateFilter;
+					return function( value, element )
+					{
+						// Build an stylish element first.
+						var styleElement = new CKEDITOR.htmlParser.element( null ),
+							variables = {};
+
+						variables[ variableName ] = value;
+						elementMigrateFilter( styleDefinition, variables )( styleElement );
+						// Place the new element inside the existing span.
+						styleElement.children = element.children;
+						element.children = [ styleElement ];
+					};
+				},
+
+				/**
+				 * A filter which remove cke-namespaced-attribute on
+				 * all none-cke-namespaced elements.
+				 * @param value
+				 * @param element
+				 */
+				bogusAttrFilter : function( value, element )
+				{
+					if ( element.name.indexOf( 'cke:' ) == -1 )
+						return false;
+				},
+
+				/**
+				 * A filter which will be used to apply inline css style according the stylesheet
+				 * definition rules, is generated lazily when filtering.
+				 */
+				applyStyleFilter : null
+
+			},
+
+		getRules : function( editor )
+		{
+			var dtd = CKEDITOR.dtd,
+				blockLike = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent ),
+				config = editor.config,
+				filters = this.filters,
+				falsyFilter = filters.falsyFilter,
+				stylesFilter = filters.stylesFilter,
+				elementMigrateFilter = filters.elementMigrateFilter,
+				styleMigrateFilter = CKEDITOR.tools.bind( this.filters.styleMigrateFilter, this.filters ),
+				createListBulletMarker = this.utils.createListBulletMarker,
+				flattenList = filters.flattenList,
+				assembleList = filters.assembleList,
+				isListBulletIndicator = this.utils.isListBulletIndicator,
+				containsNothingButSpaces = this.utils.isContainingOnlySpaces,
+				resolveListItem = this.utils.resolveList,
+				convertToPx = function( value )
+					{
+						value = CKEDITOR.tools.convertToPx( value );
+						return isNaN( value ) ? value : value + 'px';
+					},
+				getStyleComponents = this.utils.getStyleComponents,
+				listDtdParents = this.utils.listDtdParents,
+				removeFontStyles = config.pasteFromWordRemoveFontStyles !== false,
+				removeStyles = config.pasteFromWordRemoveStyles !== false;
+
+			return {
+
+				elementNames :
+				[
+					// Remove script, meta and link elements.
+					[ ( /meta|link|script/ ), '' ]
+				],
+
+				root : function( element )
+				{
+					element.filterChildren();
+					assembleList( element );
+				},
+
+				elements :
+				{
+					'^' : function( element )
+					{
+						// Transform CSS style declaration to inline style.
+						var applyStyleFilter;
+						if ( CKEDITOR.env.gecko && ( applyStyleFilter = filters.applyStyleFilter ) )
+							applyStyleFilter( element );
+					},
+
+					$ : function( element )
+					{
+						var tagName = element.name || '',
+							attrs = element.attributes;
+
+						// Convert length unit of width/height on blocks to
+						// a more editor-friendly way (px).
+						if ( tagName in blockLike
+							&& attrs.style )
+						{
+							attrs.style = stylesFilter(
+										[ [ ( /^(:?width|height)$/ ), null, convertToPx ] ] )( attrs.style ) || '';
+						}
+
+						// Processing headings.
+						if ( tagName.match( /h\d/ ) )
+						{
+							element.filterChildren();
+							// Is the heading actually a list item?
+							if ( resolveListItem( element ) )
+								return;
+
+							// Adapt heading styles to editor's convention.
+							elementMigrateFilter( config[ 'format_' + tagName ] )( element );
+						}
+						// Remove inline elements which contain only empty spaces.
+						else if ( tagName in dtd.$inline )
+						{
+							element.filterChildren();
+							if ( containsNothingButSpaces( element ) )
+								delete element.name;
+						}
+						// Remove element with ms-office namespace,
+						// with it's content preserved, e.g. 'o:p'.
+						else if ( tagName.indexOf( ':' ) != -1
+								 && tagName.indexOf( 'cke' ) == -1 )
+						{
+							element.filterChildren();
+
+							// Restore image real link from vml.
+							if ( tagName == 'v:imagedata' )
+							{
+								var href = element.attributes[ 'o:href' ];
+								if ( href )
+									element.attributes.src = href;
+								element.name = 'img';
+								return;
+							}
+							delete element.name;
+						}
+
+						// Assembling list items into a whole list.
+						if ( tagName in listDtdParents )
+						{
+							element.filterChildren();
+							assembleList( element );
+						}
+					},
+
+					// We'll drop any style sheet, but Firefox conclude
+					// certain styles in a single style element, which are
+					// required to be changed into inline ones.
+					'style' : function( element )
+					{
+						if ( CKEDITOR.env.gecko )
+						{
+							// Grab only the style definition section.
+							var styleDefSection = element.onlyChild().value.match( /\/\* Style Definitions \*\/([\s\S]*?)\/\*/ ),
+								styleDefText = styleDefSection && styleDefSection[ 1 ],
+								rules = {}; // Storing the parsed result.
+
+							if ( styleDefText )
+							{
+								styleDefText
+									// Remove line-breaks.
+									.replace(/[\n\r]/g,'')
+									// Extract selectors and style properties.
+									.replace( /(.+?)\{(.+?)\}/g,
+										function( rule, selectors, styleBlock )
+										{
+											selectors = selectors.split( ',' );
+											var length = selectors.length, selector;
+											for ( var i = 0; i < length; i++ )
+											{
+												// Assume MS-Word mostly generate only simple
+												// selector( [Type selector][Class selector]).
+												CKEDITOR.tools.trim( selectors[ i ] )
+															  .replace( /^(\w+)(\.[\w-]+)?$/g,
+												function( match, tagName, className )
+												{
+													tagName = tagName || '*';
+													className = className.substring( 1, className.length );
+
+													// Reject MS-Word Normal styles.
+													if ( className.match( /MsoNormal/ ) )
+														return;
+
+													if ( !rules[ tagName ] )
+														rules[ tagName ] = {};
+													if ( className )
+														rules[ tagName ][ className ] = styleBlock;
+													else
+														rules[ tagName ] = styleBlock;
+												} );
+											}
+										});
+
+								filters.applyStyleFilter = function( element )
+								{
+									var name = rules[ '*' ] ? '*' : element.name,
+										className = element.attributes && element.attributes[ 'class' ],
+										style;
+									if ( name in rules )
+									{
+										style = rules[ name ];
+										if ( typeof style == 'object' )
+											style = style[ className ];
+										// Maintain style rules priorities.
+										style && element.addStyle( style, true );
+									}
+								};
+							}
+						}
+						return false;
+					},
+
+					'p' : function( element )
+					{
+						// This's a fall-back approach to recognize list item in FF3.6,
+						// as it's not perfect as not all list style (e.g. "heading list") is shipped
+						// with this pattern. (#6662)
+						if ( /MsoListParagraph/.exec( element.attributes[ 'class' ] ) )
+						{
+							var bulletText = element.firstChild( function( node )
+							{
+								return node.type == CKEDITOR.NODE_TEXT && !containsNothingButSpaces( node.parent );
+							});
+							var bullet = bulletText && bulletText.parent,
+								bulletAttrs = bullet && bullet.attributes;
+							bulletAttrs && !bulletAttrs.style && ( bulletAttrs.style = 'mso-list: Ignore;' );
+						}
+
+						element.filterChildren();
+
+						// Is the paragraph actually a list item?
+						if ( resolveListItem( element ) )
+							return;
+
+						// Adapt paragraph formatting to editor's convention
+						// according to enter-mode.
+						if ( config.enterMode == CKEDITOR.ENTER_BR )
+						{
+							// We suffer from attribute/style lost in this situation.
+							delete element.name;
+							element.add( new CKEDITOR.htmlParser.element( 'br' ) );
+						}
+						else
+							elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element );
+					},
+
+					'div' : function( element )
+					{
+						// Aligned table with no text surrounded is represented by a wrapper div, from which
+						// table cells inherit as text-align styles, which is wrong.
+						// Instead we use a clear-float div after the table to properly achieve the same layout.
+						var singleChild = element.onlyChild();
+						if ( singleChild && singleChild.name == 'table' )
+						{
+							var attrs = element.attributes;
+							singleChild.attributes = CKEDITOR.tools.extend( singleChild.attributes, attrs );
+							attrs.style && singleChild.addStyle( attrs.style );
+
+							var clearFloatDiv = new CKEDITOR.htmlParser.element( 'div' );
+							clearFloatDiv.addStyle( 'clear' ,'both' );
+							element.add( clearFloatDiv );
+							delete element.name;
+						}
+					},
+
+					'td' : function ( element )
+					{
+						// 'td' in 'thead' is actually <th>.
+						if ( element.getAncestor( 'thead') )
+							element.name = 'th';
+					},
+
+					// MS-Word sometimes present list as a mixing of normal list
+					// and pseudo-list, normalize the previous ones into pseudo form.
+					'ol' : flattenList,
+					'ul' : flattenList,
+					'dl' : flattenList,
+
+					'font' : function( element )
+					{
+						// Drop the font tag if it comes from list bullet text.
+						if ( isListBulletIndicator( element.parent ) )
+						{
+							delete element.name;
+							return;
+						}
+
+						element.filterChildren();
+
+						var attrs = element.attributes,
+							styleText = attrs.style,
+							parent = element.parent;
+
+						if ( 'font' == parent.name )     // Merge nested <font> tags.
+						{
+							CKEDITOR.tools.extend( parent.attributes,
+									element.attributes );
+							styleText && parent.addStyle( styleText );
+							delete element.name;
+						}
+						// Convert the merged into a span with all attributes preserved.
+						else
+						{
+							styleText = styleText || '';
+							// IE's having those deprecated attributes, normalize them.
+							if ( attrs.color )
+							{
+								attrs.color != '#000000' && ( styleText += 'color:' + attrs.color + ';' );
+								delete attrs.color;
+							}
+							if ( attrs.face )
+							{
+								styleText += 'font-family:' + attrs.face + ';';
+								delete attrs.face;
+							}
+							// TODO: Mapping size in ranges of xx-small,
+							// x-small, small, medium, large, x-large, xx-large.
+							if ( attrs.size )
+							{
+								styleText += 'font-size:' +
+								             ( attrs.size > 3 ? 'large'
+										             : ( attrs.size < 3 ? 'small' : 'medium' ) ) + ';';
+								delete attrs.size;
+							}
+
+							element.name = 'span';
+							element.addStyle( styleText );
+						}
+					},
+
+					'span' : function( element )
+					{
+						// Remove the span if it comes from list bullet text.
+						if ( isListBulletIndicator( element.parent ) )
+							return false;
+
+						element.filterChildren();
+						if ( containsNothingButSpaces( element ) )
+						{
+							delete element.name;
+							return null;
+						}
+
+						// List item bullet type is supposed to be indicated by
+						// the text of a span with style 'mso-list : Ignore' or an image.
+						if ( isListBulletIndicator( element ) )
+						{
+							var listSymbolNode = element.firstChild( function( node )
+							{
+								return node.value || node.name == 'img';
+							});
+
+							var listSymbol =  listSymbolNode && ( listSymbolNode.value || 'l.' ),
+								listType = listSymbol && listSymbol.match( /^(?:[(]?)([^\s]+?)([.)]?)$/ );
+
+							if ( listType )
+							{
+								var marker = createListBulletMarker( listType, listSymbol );
+								// Some non-existed list items might be carried by an inconsequential list, indicate by "mso-hide:all/display:none",
+								// those are to be removed later, now mark it with "cke:ignored".
+								var ancestor = element.getAncestor( 'span' );
+								if ( ancestor && (/ mso-hide:\s*all|display:\s*none /).test( ancestor.attributes.style ) )
+									marker.attributes[ 'cke:ignored' ] = 1;
+								return marker;
+							}
+						}
+
+						// Update the src attribute of image element with href.
+						var children = element.children,
+							attrs = element.attributes,
+							styleText = attrs && attrs.style,
+							firstChild = children && children[ 0 ];
+
+						// Assume MS-Word mostly carry font related styles on <span>,
+						// adapting them to editor's convention.
+						if ( styleText )
+						{
+							attrs.style = stylesFilter(
+									[
+										// Drop 'inline-height' style which make lines overlapping.
+										[ 'line-height' ],
+										[ ( /^font-family$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'font_style' ], 'family' ) : null ] ,
+										[ ( /^font-size$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'fontSize_style' ], 'size' ) : null ] ,
+										[ ( /^color$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_foreStyle' ], 'color' ) : null ] ,
+										[ ( /^background-color$/ ), null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_backStyle' ], 'color' ) : null ]
+									] )( styleText, element ) || '';
+						}
+
+						return null;
+					},
+
+					// Migrate basic style formats to editor configured ones.
+					'b' : elementMigrateFilter( config[ 'coreStyles_bold' ] ),
+					'i' : elementMigrateFilter( config[ 'coreStyles_italic' ] ),
+					'u' : elementMigrateFilter( config[ 'coreStyles_underline' ] ),
+					's' : elementMigrateFilter( config[ 'coreStyles_strike' ] ),
+					'sup' : elementMigrateFilter( config[ 'coreStyles_superscript' ] ),
+					'sub' : elementMigrateFilter( config[ 'coreStyles_subscript' ] ),
+					// Editor doesn't support anchor with content currently (#3582),
+					// drop such anchors with content preserved.
+					'a' : function( element )
+					{
+						var attrs = element.attributes;
+						if ( attrs && !attrs.href && attrs.name )
+							delete element.name;
+						else if ( CKEDITOR.env.webkit && attrs.href && attrs.href.match( /file:\/\/\/[\S]+#/i ) )
+							attrs.href = attrs.href.replace( /file:\/\/\/[^#]+/i,'' );
+					},
+					'cke:listbullet' : function( element )
+					{
+						if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList )
+							delete element.name;
+					}
+				},
+
+				attributeNames :
+				[
+					// Remove onmouseover and onmouseout events (from MS Word comments effect)
+					[ ( /^onmouse(:?out|over)/ ), '' ],
+					// Onload on image element.
+					[ ( /^onload$/ ), '' ],
+					// Remove office and vml attribute from elements.
+					[ ( /(?:v|o):\w+/ ), '' ],
+					// Remove lang/language attributes.
+					[ ( /^lang/ ), '' ]
+				],
+
+				attributes :
+				{
+					'style' : stylesFilter(
+					removeStyles ?
+					// Provide a white-list of styles that we preserve, those should
+					// be the ones that could later be altered with editor tools.
+					[
+						// Leave list-style-type
+						[ ( /^list-style-type$/ ), null ],
+
+						// Preserve margin-left/right which used as default indent style in the editor.
+						[ ( /^margin$|^margin-(?!bottom|top)/ ), null, function( value, element, name )
+							{
+								if ( element.name in { p : 1, div : 1 } )
+								{
+									var indentStyleName = config.contentsLangDirection == 'ltr' ?
+											'margin-left' : 'margin-right';
+
+									// Extract component value from 'margin' shorthand.
+									if ( name == 'margin' )
+									{
+										value = getStyleComponents( name, value,
+												[ indentStyleName ] )[ indentStyleName ];
+									}
+									else if ( name != indentStyleName )
+										return null;
+
+									if ( value && !emptyMarginRegex.test( value ) )
+										return [ indentStyleName, value ];
+								}
+
+								return null;
+							} ],
+
+						// Preserve clear float style.
+						[ ( /^clear$/ ) ],
+
+						[ ( /^border.*|margin.*|vertical-align|float$/ ), null,
+							function( value, element )
+							{
+								if ( element.name == 'img' )
+									return value;
+							} ],
+
+						[ (/^width|height$/ ), null,
+							function( value, element )
+							{
+								if ( element.name in { table : 1, td : 1, th : 1, img : 1 } )
+									return value;
+							} ]
+					] :
+					// Otherwise provide a black-list of styles that we remove.
+					[
+						[ ( /^mso-/ ) ],
+						// Fixing color values.
+						[ ( /-color$/ ), null, function( value )
+						{
+							if ( value == 'transparent' )
+								return false;
+							if ( CKEDITOR.env.gecko )
+								return value.replace( /-moz-use-text-color/g, 'transparent' );
+						} ],
+						// Remove empty margin values, e.g. 0.00001pt 0em 0pt
+						[ ( /^margin$/ ), emptyMarginRegex ],
+						[ 'text-indent', '0cm' ],
+						[ 'page-break-before' ],
+						[ 'tab-stops' ],
+						[ 'display', 'none' ],
+						removeFontStyles ? [ ( /font-?/ ) ] : null
+					], removeStyles ),
+
+					// Prefer width styles over 'width' attributes.
+					'width' : function( value, element )
+					{
+						if ( element.name in dtd.$tableContent )
+							return false;
+					},
+					// Prefer border styles over table 'border' attributes.
+					'border' : function( value, element )
+					{
+						if ( element.name in dtd.$tableContent )
+							return false;
+					},
+
+					// Only Firefox carry style sheet from MS-Word, which
+					// will be applied by us manually. For other browsers
+					// the css className is useless.
+					'class' : falsyFilter,
+
+					// MS-Word always generate 'background-color' along with 'bgcolor',
+					// simply drop the deprecated attributes.
+					'bgcolor' : falsyFilter,
+
+					// Deprecate 'valign' attribute in favor of 'vertical-align'.
+					'valign' : removeStyles ? falsyFilter : function( value, element )
+					{
+						element.addStyle( 'vertical-align', value );
+						return false;
+					}
+				},
+
+				// Fore none-IE, some useful data might be buried under these IE-conditional
+				// comments where RegExp were the right approach to dig them out where usual approach
+				// is transform it into a fake element node which hold the desired data.
+				comment :
+					!CKEDITOR.env.ie ?
+						function( value, node )
+						{
+							var imageInfo = value.match( /<img.*?>/ ),
+								listInfo = value.match( /^\[if !supportLists\]([\s\S]*?)\[endif\]$/ );
+
+							// Seek for list bullet indicator.
+							if ( listInfo )
+							{
+								// Bullet symbol could be either text or an image.
+								var listSymbol = listInfo[ 1 ] || ( imageInfo && 'l.' ),
+									listType = listSymbol && listSymbol.match( />(?:[(]?)([^\s]+?)([.)]?)</ );
+								return createListBulletMarker( listType, listSymbol );
+							}
+
+							// Reveal the <img> element in conditional comments for Firefox.
+							if ( CKEDITOR.env.gecko && imageInfo )
+							{
+								var img = CKEDITOR.htmlParser.fragment.fromHtml( imageInfo[ 0 ] ).children[ 0 ],
+									previousComment = node.previous,
+									// Try to dig the real image link from vml markup from previous comment text.
+									imgSrcInfo = previousComment && previousComment.value.match( /<v:imagedata[^>]*o:href=['"](.*?)['"]/ ),
+									imgSrc = imgSrcInfo && imgSrcInfo[ 1 ];
+
+								// Is there a real 'src' url to be used?
+								imgSrc && ( img.attributes.src = imgSrc );
+								return img;
+							}
+
+							return false;
+						}
+					: falsyFilter
+			};
+		}
+	});
+
+	// The paste processor here is just a reduced copy of html data processor.
+	var pasteProcessor = function()
+	{
+		this.dataFilter = new CKEDITOR.htmlParser.filter();
+	};
+
+	pasteProcessor.prototype =
+	{
+		toHtml : function( data )
+		{
+			var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, false ),
+				writer = new CKEDITOR.htmlParser.basicWriter();
+
+			fragment.writeHtml( writer, this.dataFilter );
+			return writer.getHtml( true );
+		}
+	};
+
+	CKEDITOR.cleanWord = function( data, editor )
+	{
+		// Firefox will be confused by those downlevel-revealed IE conditional
+		// comments, fixing them first( convert it to upperlevel-revealed one ).
+		// e.g. <![if !vml]>...<![endif]>
+		if ( CKEDITOR.env.gecko )
+			data = data.replace( /(<!--\[if[^<]*?\])-->([\S\s]*?)<!--(\[endif\]-->)/gi, '$1$2$3' );
+
+		var dataProcessor = new pasteProcessor(),
+			dataFilter = dataProcessor.dataFilter;
+
+		// These rules will have higher priorities than default ones.
+		dataFilter.addRules( CKEDITOR.plugins.pastefromword.getRules( editor ) );
+
+		// Allow extending data filter rules.
+		editor.fire( 'beforeCleanWord', { filter : dataFilter } );
+
+		try
+		{
+			data = dataProcessor.toHtml( data, false );
+		}
+		catch ( e )
+		{
+			alert( editor.lang.pastefromword.error );
+		}
+
+		/* Below post processing those things that are unable to delivered by filter rules. */
+
+		// Remove 'cke' namespaced attribute used in filter rules as marker.
+		data = data.replace( /cke:.*?".*?"/g, '' );
+
+		// Remove empty style attribute.
+		data = data.replace( /style=""/g, '' );
+
+		// Remove the dummy spans ( having no inline style ).
+		data = data.replace( /<span>/g, '' );
+
+		return data;
+	};
+})();
+
+/**
+ * Whether to ignore all font related formatting styles, including:
+ * <ul>	<li>font size;</li>
+ *		<li>font family;</li>
+ *		<li>font foreground/background color.</li></ul>
+ * @name CKEDITOR.config.pasteFromWordRemoveFontStyles
+ * @since 3.1
+ * @type Boolean
+ * @default true
+ * @example
+ * config.pasteFromWordRemoveFontStyles = false;
+ */
+
+/**
+ * Whether to transform MS Word outline numbered headings into lists.
+ * @name CKEDITOR.config.pasteFromWordNumberedHeadingToList
+ * @since 3.1
+ * @type Boolean
+ * @default false
+ * @example
+ * config.pasteFromWordNumberedHeadingToList = true;
+ */
+
+/**
+ * Whether to remove element styles that can't be managed with the editor. Note
+ * that this doesn't handle the font specific styles, which depends on the
+ * {@link CKEDITOR.config.pasteFromWordRemoveFontStyles} setting instead.
+ * @name CKEDITOR.config.pasteFromWordRemoveStyles
+ * @since 3.1
+ * @type Boolean
+ * @default true
+ * @example
+ * config.pasteFromWordRemoveStyles = false;
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/filter/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastefromword/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/pastetext.js b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/pastetext.js
new file mode 100644
index 00000000..4c18fa97
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/dialogs/pastetext.js
@@ -0,0 +1,67 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	CKEDITOR.dialog.add( 'pastetext', function( editor )
+		{
+			return {
+				title : editor.lang.pasteText.title,
+
+				minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 368 : 350,
+				minHeight : 240,
+
+				onShow : function(){ this.setupContent(); },
+				onOk : function(){ this.commitContent(); },
+
+				contents :
+				[
+					{
+						label : editor.lang.common.generalTab,
+						id : 'general',
+						elements :
+						[
+							{
+								type : 'html',
+								id : 'pasteMsg',
+								html : '<div style="white-space:normal;width:340px;">' + editor.lang.clipboard.pasteMsg + '</div>'
+							},
+							{
+								type : 'textarea',
+								id : 'content',
+								className : 'cke_pastetext',
+
+								onLoad : function()
+								{
+									var label = this.getDialog().getContentElement( 'general', 'pasteMsg' ).getElement(),
+										input = this.getElement().getElementsByTag( 'textarea' ).getItem( 0 );
+
+									input.setAttribute( 'aria-labelledby', label.$.id );
+									input.setStyle( 'direction', editor.config.contentsLangDirection );
+								},
+
+								focus : function()
+								{
+									this.getElement().focus();
+								},
+								setup : function()
+								{
+									this.setValue( '' );
+								},
+								commit : function()
+								{
+									var value = this.getValue();
+									setTimeout( function()
+									{
+										editor.fire( 'paste', { 'text' : value } );
+									}, 0 );
+								}
+							}
+						]
+					}
+				]
+			};
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/pastetext/index.html b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/pastetext/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/placeholder.js b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/placeholder.js
new file mode 100644
index 00000000..94479eaa
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/dialogs/placeholder.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+(function()
+{
+	function placeholderDialog( editor, isEdit )
+	{
+
+		var lang = editor.lang.placeholder,
+			generalLabel = editor.lang.common.generalTab;
+		return {
+			title : lang.title,
+			minWidth : 300,
+			minHeight : 80,
+			contents :
+			[
+				{
+					id : 'info',
+					label : generalLabel,
+					title : generalLabel,
+					elements :
+					[
+						{
+							id : 'text',
+							type : 'text',
+							style : 'width: 100%;',
+							label : lang.text,
+							'default' : '',
+							required : true,
+							validate : CKEDITOR.dialog.validate.notEmpty( lang.textMissing ),
+							setup : function( element )
+							{
+								if ( isEdit )
+									this.setValue( element.getText().slice( 2, -2 ) );
+							},
+							commit : function( element )
+							{
+								var text = '[[' + this.getValue() + ']]';
+								// The placeholder must be recreated.
+								CKEDITOR.plugins.placeholder.createPlaceholder( editor, element, text );
+							}
+						}
+					]
+				}
+			],
+			onShow : function()
+			{
+				if ( isEdit )
+					this._element = CKEDITOR.plugins.placeholder.getSelectedPlaceHoder( editor );
+
+				this.setupContent( this._element );
+			},
+			onOk : function()
+			{
+				this.commitContent( this._element );
+				delete this._element;
+			}
+		};
+	}
+
+	CKEDITOR.dialog.add( 'createplaceholder', function( editor )
+		{
+			return placeholderDialog( editor );
+		});
+	CKEDITOR.dialog.add( 'editplaceholder', function( editor )
+		{
+			return placeholderDialog( editor, 1 );
+		});
+} )();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/index.html b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/en.js b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/en.js
new file mode 100644
index 00000000..5a476996
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/en.js
@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'en',
+{
+	placeholder :
+	{
+		title		: 'Placeholder Properties',
+		toolbar		: 'Create Placeholder',
+		text		: 'Placeholder Text',
+		edit		: 'Edit Placeholder',
+		textMissing	: 'The placeholder must contain text.'
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/he.js b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/he.js
new file mode 100644
index 00000000..8cdc5067
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/he.js
@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'placeholder', 'he',
+{
+	placeholder :
+	{
+		title		: 'מ�פייני שומר מקו�',
+		toolbar		: 'צור שומר מקו�',
+		text		: 'תוכן שומר המקו�',
+		edit		: 'ערוך שומר מקו�',
+		textMissing	: 'שומר המקו� חייב להכיל טקסט.'
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/index.html b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/lang/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/placeholder.gif b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/placeholder.gif
new file mode 100644
index 00000000..c07078c1
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/placeholder.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/placeholder/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/plugin.js
new file mode 100644
index 00000000..4f7fa6f9
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/placeholder/plugin.js
@@ -0,0 +1,171 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview The "placeholder" plugin.
+ *
+ */
+
+(function()
+{
+	var placeholderReplaceRegex = /\[\[[^\]]+\]\]/g;
+	CKEDITOR.plugins.add( 'placeholder',
+	{
+		requires : [ 'dialog' ],
+		lang : [ 'en', 'he' ],
+		init : function( editor )
+		{
+			var lang = editor.lang.placeholder;
+
+			editor.addCommand( 'createplaceholder', new CKEDITOR.dialogCommand( 'createplaceholder' ) );
+			editor.addCommand( 'editplaceholder', new CKEDITOR.dialogCommand( 'editplaceholder' ) );
+
+			editor.ui.addButton( 'CreatePlaceholder',
+			{
+				label : lang.toolbar,
+				command :'createplaceholder',
+				icon : this.path + 'placeholder.gif'
+			});
+
+			if ( editor.addMenuItems )
+			{
+				editor.addMenuGroup( 'placeholder', 20 );
+				editor.addMenuItems(
+					{
+						editplaceholder :
+						{
+							label : lang.edit,
+							command : 'editplaceholder',
+							group : 'placeholder',
+							order : 1,
+							icon : this.path + 'placeholder.gif'
+						}
+					} );
+
+				if ( editor.contextMenu )
+				{
+					editor.contextMenu.addListener( function( element, selection )
+						{
+							if ( !element || !element.data( 'cke-placeholder' ) )
+								return null;
+
+							return { editplaceholder : CKEDITOR.TRISTATE_OFF };
+						} );
+				}
+			}
+
+			editor.on( 'doubleclick', function( evt )
+				{
+					if ( CKEDITOR.plugins.placeholder.getSelectedPlaceHoder( editor ) )
+						evt.data.dialog = 'editplaceholder';
+				});
+
+			editor.addCss(
+				'.cke_placeholder' +
+				'{' +
+					'background-color: #ffff00;' +
+					( CKEDITOR.env.gecko ? 'cursor: default;' : '' ) +
+				'}'
+			);
+
+			editor.on( 'contentDom', function()
+				{
+					editor.document.getBody().on( 'resizestart', function( evt )
+						{
+							if ( editor.getSelection().getSelectedElement().data( 'cke-placeholder' ) )
+								evt.data.preventDefault();
+						});
+				});
+
+			CKEDITOR.dialog.add( 'createplaceholder', this.path + 'dialogs/placeholder.js' );
+			CKEDITOR.dialog.add( 'editplaceholder', this.path + 'dialogs/placeholder.js' );
+		},
+		afterInit : function( editor )
+		{
+			var dataProcessor = editor.dataProcessor,
+				dataFilter = dataProcessor && dataProcessor.dataFilter,
+				htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+			if ( dataFilter )
+			{
+				dataFilter.addRules(
+				{
+					text : function( text )
+					{
+						return text.replace( placeholderReplaceRegex, function( match )
+							{
+								return CKEDITOR.plugins.placeholder.createPlaceholder( editor, null, match, 1 );
+							});
+					}
+				});
+			}
+
+			if ( htmlFilter )
+			{
+				htmlFilter.addRules(
+				{
+					elements :
+					{
+						'span' : function( element )
+						{
+							if ( element.attributes && element.attributes[ 'data-cke-placeholder' ] )
+								delete element.name;
+						}
+					}
+				});
+			}
+		}
+	});
+})();
+
+CKEDITOR.plugins.placeholder =
+{
+	createPlaceholder : function( editor, oldElement, text, isGet )
+	{
+		var element = new CKEDITOR.dom.element( 'span', editor.document );
+		element.setAttributes(
+			{
+				contentEditable		: 'false',
+				'data-cke-placeholder'	: 1,
+				'class'			: 'cke_placeholder'
+			}
+		);
+
+		text && element.setText( text );
+
+		if ( isGet )
+			return element.getOuterHtml();
+
+		if ( oldElement )
+		{
+			if ( CKEDITOR.env.ie )
+			{
+				element.insertAfter( oldElement );
+				// Some time is required for IE before the element is removed.
+				setTimeout( function()
+					{
+						oldElement.remove();
+						element.focus();
+					}, 10 );
+			}
+			else
+				element.replace( oldElement );
+		}
+		else
+			editor.insertElement( element );
+
+		return null;
+	},
+
+	getSelectedPlaceHoder : function( editor )
+	{
+		var range = editor.getSelection().getRanges()[ 0 ];
+		range.shrink( CKEDITOR.SHRINK_TEXT );
+		var node = range.startContainer;
+		while( node && !( node.type == CKEDITOR.NODE_ELEMENT && node.data( 'cke-placeholder' ) ) )
+			node = node.getParent();
+		return node;
+	}
+};
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/options.js b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/options.js
new file mode 100644
index 00000000..a50bf15a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/options.js
@@ -0,0 +1,537 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'scaytcheck', function( editor )
+{
+	var firstLoad = true,
+		captions,
+		doc = CKEDITOR.document,
+		editorName = editor.name,
+		tags = CKEDITOR.plugins.scayt.getUiTabs( editor ),
+		i,
+		contents = [],
+		userDicActive = 0,
+		dic_buttons = [
+			// [0] contains buttons for creating
+			"dic_create_" + editorName + ",dic_restore_" + editorName,
+			// [1] contains buton for manipulation
+			"dic_rename_" + editorName + ",dic_delete_" + editorName
+		],
+		optionsIds = [ 'mixedCase', 'mixedWithDigits', 'allCaps', 'ignoreDomainNames' ];
+
+	// common operations
+
+	function getBOMAllOptions()
+	{
+		if (typeof document.forms["optionsbar_" + editorName] != "undefined")
+			return document.forms["optionsbar_" + editorName]["options"];
+		return [];
+	}
+	function getBOMAllLangs()
+	{
+		if (typeof document.forms["languagesbar_" + editorName] != "undefined")
+			return document.forms["languagesbar_" + editorName]["scayt_lang"];
+		return [];
+	}
+
+	function setCheckedValue( radioObj, newValue )
+	{
+		if ( !radioObj )
+			return;
+		var radioLength = radioObj.length;
+		if ( radioLength == undefined )
+		{
+			radioObj.checked = radioObj.value == newValue.toString();
+			return;
+		}
+		for ( var i = 0; i < radioLength; i++ )
+		{
+			radioObj[i].checked = false;
+			if ( radioObj[i].value == newValue.toString() )
+				radioObj[i].checked = true;
+		}
+	}
+
+	var lang = editor.lang.scayt;
+	var tags_contents =  [
+				{
+					id : 'options',
+					label : lang.optionsTab,
+					elements : [
+						{
+							type : 'html',
+							id : 'options',
+							html : 	'<form name="optionsbar_' + editorName + '"><div class="inner_options">' +
+									'	<div class="messagebox"></div>' +
+									'	<div style="display:none;">' +
+									'		<input type="checkbox" name="options"  id="allCaps_' + editorName + '" />' +
+									'		<label for="allCaps" id="label_allCaps_' + editorName + '"></label>' +
+									'	</div>' +
+									'	<div style="display:none;">' +
+									'		<input name="options" type="checkbox"  id="ignoreDomainNames_' + editorName + '" />' +
+									'		<label for="ignoreDomainNames" id="label_ignoreDomainNames_' + editorName + '"></label>' +
+									'	</div>' +
+									'	<div style="display:none;">' +
+									'	<input name="options" type="checkbox"  id="mixedCase_' + editorName + '" />' +
+									'		<label for="mixedCase" id="label_mixedCase_' + editorName + '"></label>' +
+									'	</div>' +
+									'	<div style="display:none;">' +
+									'		<input name="options" type="checkbox"  id="mixedWithDigits_' + editorName + '" />' +
+									'		<label for="mixedWithDigits" id="label_mixedWithDigits_' + editorName + '"></label>' +
+									'	</div>' +
+									'</div></form>'
+						}
+					]
+				},
+				{
+					id : 'langs',
+					label : lang.languagesTab,
+					elements : [
+						{
+							type : 'html',
+							id : 'langs',
+							html : 	'<form name="languagesbar_' + editorName + '"><div class="inner_langs">' +
+									'	<div class="messagebox"></div>	' +
+									'   <div style="float:left;width:45%;margin-left:5px;" id="scayt_lcol_' + editorName + '" ></div>' +
+									'   <div style="float:left;width:45%;margin-left:15px;" id="scayt_rcol_' + editorName + '"></div>' +
+									'</div></form>'
+						}
+					]
+				},
+				{
+					id : 'dictionaries',
+					label : lang.dictionariesTab,
+					elements : [
+						{
+							type : 'html',
+							style: '',
+							id : 'dictionaries',
+							html : 	'<form name="dictionarybar_' + editorName + '"><div class="inner_dictionary" style="text-align:left; white-space:normal; width:320px; overflow: hidden;">' +
+									'	<div style="margin:5px auto; width:80%;white-space:normal; overflow:hidden;" id="dic_message_' + editorName + '"> </div>' +
+									'	<div style="margin:5px auto; width:80%;white-space:normal;"> ' +
+									'       <span class="cke_dialog_ui_labeled_label" >Dictionary name</span><br>'+
+									'		<span class="cke_dialog_ui_labeled_content" >'+
+									'			<div class="cke_dialog_ui_input_text">'+
+									'				<input id="dic_name_' + editorName + '" type="text" class="cke_dialog_ui_input_text"/>'+
+									'		</div></span></div>'+
+									'		<div style="margin:5px auto; width:80%;white-space:normal;">'+
+									'			<a style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_create_' + editorName + '">'+
+									'				</a>' +
+									'			<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_delete_' + editorName + '">'+
+									'				</a>' +
+									'			<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_rename_' + editorName + '">'+
+									'				</a>' +
+									'			<a  style="display:none;" class="cke_dialog_ui_button" href="javascript:void(0)" id="dic_restore_' + editorName + '">'+
+									'				</a>' +
+									'		</div>' +
+									'	<div style="margin:5px auto; width:95%;white-space:normal;" id="dic_info_' + editorName + '"></div>' +
+									'</div></form>'
+						}
+					]
+				},
+				{
+					id : 'about',
+					label : lang.aboutTab,
+					elements : [
+						{
+							type : 'html',
+							id : 'about',
+							style : 'margin: 5px 5px;',
+							html : '<div id="scayt_about_' + editorName + '"></div>'
+						}
+					]
+				}
+			];
+
+	var dialogDefiniton = {
+		title : lang.title,
+		minWidth : 360,
+		minHeight : 220,
+		onShow : function()
+		{
+			var dialog = this;
+			dialog.data = editor.fire( 'scaytDialog', {} );
+			dialog.options = dialog.data.scayt_control.option();
+			dialog.chosed_lang = dialog.sLang = dialog.data.scayt_control.sLang;
+
+			if ( !dialog.data || !dialog.data.scayt || !dialog.data.scayt_control )
+			{
+				alert( 'Error loading application service' );
+				dialog.hide();
+				return;
+			}
+
+			var stop = 0;
+			if ( firstLoad )
+			{
+				dialog.data.scayt.getCaption( editor.langCode || 'en', function( caps )
+				{
+					if ( stop++ > 0 )	// Once only
+						return;
+					captions = caps;
+					init_with_captions.apply( dialog );
+					reload.apply( dialog );
+					firstLoad = false;
+				});
+			}
+			else
+				reload.apply( dialog );
+
+			dialog.selectPage( dialog.data.tab );
+		},
+		onOk : function()
+		{
+			var scayt_control =  this.data.scayt_control;
+			scayt_control.option( this.options );
+			// Setup language if it was changed.
+			var csLang = this.chosed_lang;
+			scayt_control.setLang( csLang );
+			scayt_control.refresh();
+		},
+		onCancel: function()
+		{
+			var o = getBOMAllOptions();
+			for ( var i in o )
+				o[i].checked = false;
+
+			setCheckedValue( getBOMAllLangs(), "" );
+		},
+		contents : contents
+	};
+
+	var scayt_control = CKEDITOR.plugins.scayt.getScayt( editor );
+
+	for ( i = 0; i < tags.length; i++ )
+	{
+		if ( tags[ i ] == 1 )
+			contents[ contents.length ] = tags_contents[ i ];
+	}
+	if ( tags[2] == 1 )
+		userDicActive = 1;
+
+	var init_with_captions = function()
+	{
+		var dialog = this,
+			lang_list = dialog.data.scayt.getLangList(),
+			buttonCaptions = [ 'dic_create', 'dic_delete', 'dic_rename', 'dic_restore' ],
+			buttonIds = [],
+			langList = [],
+			labels = optionsIds,
+			i;
+
+		// Add buttons titles
+		if ( userDicActive )
+		{
+			for ( i = 0; i < buttonCaptions.length; i++ )
+			{
+				buttonIds[ i ] = buttonCaptions[ i ] + "_" + editorName;
+				doc.getById( buttonIds[ i ] ).setHtml( '<span class="cke_dialog_ui_button">' + captions[ 'button_' + buttonCaptions[ i ]]  +'</span>' );
+			}
+			doc.getById( 'dic_info_' + editorName ).setHtml( captions[ 'dic_info' ] );
+		}
+
+		// Fill options and dictionary labels.
+		if ( tags[0] == 1 )
+		{
+			for ( i in labels )
+			{
+				var labelCaption = 'label_' + labels[ i ],
+					labelId = labelCaption + '_' + editorName,
+					labelElement = doc.getById( labelId );
+
+				if (  'undefined' != typeof labelElement
+				   && 'undefined' != typeof captions[ labelCaption ]
+				   && 'undefined' != typeof dialog.options[labels[ i ]] )
+				{
+					labelElement.setHtml( captions[ labelCaption ] );
+					var labelParent = labelElement.getParent();
+					labelParent.$.style.display = "block";
+				}
+			}
+		}
+
+		var about = '<p><img src="' + window.scayt.getAboutInfo().logoURL + '" /></p>' +
+				'<p>' + captions[ 'version' ] + window.scayt.getAboutInfo().version.toString() + '</p>' +
+				'<p>' + captions[ 'about_throwt_copy' ] + '</p>';
+
+		doc.getById( 'scayt_about_' + editorName ).setHtml( about );
+
+		// Create languages tab.
+		var createOption = function( option, list )
+		{
+			var label = doc.createElement( 'label' );
+			label.setAttribute( 'for', 'cke_option' + option );
+			label.setHtml( list[ option ] );
+
+			if ( dialog.sLang == option )	// Current.
+				dialog.chosed_lang = option;
+
+			var div = doc.createElement( 'div' );
+			var radio = CKEDITOR.dom.element.createFromHtml( '<input id="cke_option' +
+					option + '" type="radio" ' +
+					( dialog.sLang == option ? 'checked="checked"' : '' ) +
+					' value="' + option + '" name="scayt_lang" />' );
+
+			radio.on( 'click', function()
+				{
+					this.$.checked = true;
+					dialog.chosed_lang = option;
+				});
+
+			div.append( radio );
+			div.append( label );
+
+			return {
+				lang : list[ option ],
+				code : option,
+				radio : div
+			};
+		};
+
+		if ( tags[1] ==1 )
+		{
+			for ( i in lang_list.rtl )
+				langList[ langList.length ] = createOption( i, lang_list.ltr );
+
+			for ( i in lang_list.ltr )
+				langList[ langList.length  ] = createOption( i, lang_list.ltr );
+
+			langList.sort( 	function( lang1, lang2 )
+				{
+					return ( lang2.lang > lang1.lang ) ? -1 : 1 ;
+				});
+
+			var fieldL = doc.getById( 'scayt_lcol_' + editorName ),
+				fieldR = doc.getById( 'scayt_rcol_' + editorName );
+			for ( i=0; i < langList.length; i++ )
+			{
+				var field = ( i < langList.length / 2 ) ? fieldL : fieldR;
+				field.append( langList[ i ].radio );
+			}
+		}
+
+		// user dictionary handlers
+		var dic = {};
+		dic.dic_create = function( el, dic_name , dic_buttons )
+		{
+			// comma separated button's ids include repeats if exists
+			var all_buttons = dic_buttons[0] + ',' + dic_buttons[1];
+
+			var err_massage = captions["err_dic_create"];
+			var suc_massage = captions["succ_dic_create"];
+
+			window.scayt.createUserDictionary( dic_name,
+				function( arg )
+				{
+					hide_dic_buttons ( all_buttons );
+					display_dic_buttons ( dic_buttons[1] );
+					suc_massage = suc_massage.replace("%s" , arg.dname );
+					dic_success_message (suc_massage);
+				},
+				function( arg )
+				{
+					err_massage = err_massage.replace("%s" ,arg.dname );
+					dic_error_message ( err_massage + "( "+ (arg.message || "") +")");
+				});
+
+		};
+
+		dic.dic_rename = function( el, dic_name )
+		{
+			//
+			// try to rename dictionary
+			var err_massage = captions["err_dic_rename"] || "";
+			var suc_massage = captions["succ_dic_rename"] || "";
+			window.scayt.renameUserDictionary( dic_name,
+				function( arg )
+					{
+						suc_massage = suc_massage.replace("%s" , arg.dname );
+						set_dic_name( dic_name );
+						dic_success_message ( suc_massage );
+					},
+				function( arg )
+					{
+						err_massage = err_massage.replace("%s" , arg.dname  );
+						set_dic_name( dic_name );
+						dic_error_message( err_massage + "( " + ( arg.message || "" ) + " )" );
+					});
+		};
+
+		dic.dic_delete = function( el, dic_name , dic_buttons )
+		{
+			var all_buttons = dic_buttons[0] + ',' + dic_buttons[1];
+			var err_massage = captions["err_dic_delete"];
+			var suc_massage = captions["succ_dic_delete"];
+
+			// try to delete dictionary
+			window.scayt.deleteUserDictionary(
+				function( arg )
+				{
+					suc_massage = suc_massage.replace("%s" , arg.dname );
+					hide_dic_buttons ( all_buttons );
+					display_dic_buttons ( dic_buttons[0] );
+					set_dic_name( "" ); // empty input field
+					dic_success_message( suc_massage );
+				},
+				function( arg )
+				{
+					err_massage = err_massage.replace("%s" , arg.dname );
+					dic_error_message(err_massage);
+				});
+		};
+
+		dic.dic_restore = dialog.dic_restore || function( el, dic_name , dic_buttons )
+			{
+				// try to restore existing dictionary
+				var all_buttons = dic_buttons[0] + ',' + dic_buttons[1];
+				var err_massage = captions["err_dic_restore"];
+				var suc_massage = captions["succ_dic_restore"];
+
+				window.scayt.restoreUserDictionary(dic_name,
+					function( arg )
+					{
+						suc_massage = suc_massage.replace("%s" , arg.dname );
+						hide_dic_buttons ( all_buttons );
+						display_dic_buttons(dic_buttons[1]);
+						dic_success_message( suc_massage );
+					},
+					function( arg )
+					{
+						err_massage = err_massage.replace("%s" , arg.dname );
+						dic_error_message( err_massage );
+					});
+			};
+
+		function onDicButtonClick( ev )
+		{
+			var dic_name = doc.getById('dic_name_' + editorName).getValue();
+			if ( !dic_name )
+			{
+				dic_error_message(" Dictionary name should not be empty. ");
+				return false;
+			}
+			try{
+				var el = ev.data.getTarget().getParent();
+				var id = /(dic_\w+)_[\w\d]+/.exec(el.getId())[1];
+				dic[ id ].apply( null, [ el, dic_name, dic_buttons ] );
+			}
+			catch(err)
+			{
+				dic_error_message(" Dictionary error. ");
+			}
+
+			return true;
+		}
+
+		// ** bind event listeners
+		var arr_buttons = ( dic_buttons[0] + ',' + dic_buttons[1] ).split( ',' ),
+			l;
+
+		for ( i = 0, l = arr_buttons.length ; i < l ; i += 1 )
+		{
+			var dic_button = doc.getById(arr_buttons[i]);
+			if ( dic_button )
+				dic_button.on( 'click', onDicButtonClick, this );
+		}
+	};
+
+	var reload = function()
+	{
+		var dialog = this;
+		// for enabled options tab
+		if ( tags[0] == 1 ){
+			var opto = getBOMAllOptions();
+
+			// Animate options.
+			for ( var k=0,l = opto.length; k<l;k++ )
+			{
+
+				var i = opto[k].id;
+				var checkbox = doc.getById( i );
+
+				if ( checkbox )
+				{
+					opto[k].checked = false;
+					//alert (opto[k].removeAttribute)
+					if ( dialog.options[ i.split("_")[0] ] == 1 )
+					{
+						opto[k].checked = true;
+					}
+
+
+					// Bind events. Do it only once.
+					if ( firstLoad )
+					{
+						checkbox.on( 'click', function()
+						{
+							dialog.options[ this.getId().split("_")[0] ] = this.$.checked ? 1 : 0 ;
+						});
+					}
+				}
+			}
+		}
+
+		//for enabled languages tab
+		if ( tags[1] == 1 )
+		{
+			var domLang = doc.getById("cke_option" + dialog.sLang);
+			setCheckedValue( domLang.$,dialog.sLang );
+		}
+
+		// * user dictionary
+		if ( userDicActive )
+		{
+			window.scayt.getNameUserDictionary(
+				function( o )
+				{
+					var dic_name = o.dname;
+					hide_dic_buttons( dic_buttons[0] + ',' + dic_buttons[1] );
+					if ( dic_name )
+					{
+						doc.getById( 'dic_name_' + editorName ).setValue(dic_name);
+						display_dic_buttons( dic_buttons[1] );
+					}
+					else
+						display_dic_buttons( dic_buttons[0] );
+
+				},
+				function()
+				{
+					doc.getById( 'dic_name_' + editorName ).setValue("");
+				});
+			dic_success_message("");
+		}
+
+	};
+
+	function dic_error_message( m )
+	{
+		doc.getById('dic_message_' + editorName).setHtml('<span style="color:red;">' + m + '</span>' );
+	}
+	function dic_success_message( m )
+	{
+		doc.getById('dic_message_' + editorName).setHtml('<span style="color:blue;">' + m + '</span>') ;
+	}
+	function display_dic_buttons( sIds )
+	{
+		sIds = String( sIds );
+		var aIds = sIds.split(',');
+		for ( var i=0, l = aIds.length; i < l ; i+=1)
+			doc.getById( aIds[i] ).$.style.display = "inline";
+	}
+	function hide_dic_buttons( sIds )
+	{
+		sIds = String( sIds );
+		var aIds = sIds.split(',');
+		for ( var i = 0, l = aIds.length; i < l ; i += 1 )
+			doc.getById( aIds[i] ).$.style.display = "none";
+	}
+	function set_dic_name( dic_name )
+	{
+		doc.getById('dic_name_' + editorName).$.value= dic_name;
+	}
+
+	return dialogDefiniton;
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/toolbar.css b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/toolbar.css
new file mode 100644
index 00000000..ecabdac9
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/scayt/dialogs/toolbar.css
@@ -0,0 +1,71 @@
+a
+{
+	text-decoration:none;
+	padding: 2px 4px 4px 6px;
+	display : block;
+	border-width: 1px;
+	border-style: solid;
+	margin : 0px;
+}
+
+a.cke_scayt_toogle:hover,
+a.cke_scayt_toogle:focus,
+a.cke_scayt_toogle:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
+	margin : 0px;
+}
+a.cke_scayt_toogle {
+	color : #316ac5;
+	border-color: #fff;
+}
+.scayt_enabled a.cke_scayt_item {
+	color : #316ac5;
+	border-color: #fff;
+	margin : 0px;
+}
+.scayt_disabled a.cke_scayt_item {
+	color : gray;
+	border-color : #fff;
+}
+.scayt_enabled a.cke_scayt_item:hover,
+.scayt_enabled a.cke_scayt_item:focus,
+.scayt_enabled a.cke_scayt_item:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
+}
+.scayt_disabled a.cke_scayt_item:hover,
+.scayt_disabled a.cke_scayt_item:focus,
+.scayt_disabled a.cke_scayt_item:active
+{
+	border-color: gray;
+	background-color: #dff1ff;
+	color : gray;
+	cursor: no-drop;
+}
+.cke_scayt_set_on, .cke_scayt_set_off
+{
+	display: none;
+}
+.scayt_enabled .cke_scayt_set_on
+{
+	display: none;
+}
+.scayt_disabled .cke_scayt_set_on
+{
+	display: inline;
+}
+.scayt_disabled .cke_scayt_set_off
+{
+	display: none;
+}
+.scayt_enabled  .cke_scayt_set_off
+{
+	display: inline;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/scayt/index.html b/upload/public/js/3rd_party/ckeditor/plugins/scayt/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/scayt/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_address.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_address.png
new file mode 100644
index 00000000..1ee67aa2
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_address.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_blockquote.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_blockquote.png
new file mode 100644
index 00000000..cae3aec6
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_blockquote.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_div.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_div.png
new file mode 100644
index 00000000..c71f3978
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_div.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h1.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h1.png
new file mode 100644
index 00000000..3a643473
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h1.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h2.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h2.png
new file mode 100644
index 00000000..8062ebe8
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h2.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h3.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h3.png
new file mode 100644
index 00000000..5b6a4030
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h3.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h4.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h4.png
new file mode 100644
index 00000000..6c7f7951
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h4.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h5.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h5.png
new file mode 100644
index 00000000..e153de09
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h5.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h6.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h6.png
new file mode 100644
index 00000000..c8d993a9
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_h6.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_p.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_p.png
new file mode 100644
index 00000000..4e6035d2
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_p.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_pre.png b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_pre.png
new file mode 100644
index 00000000..d11a0fff
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/block_pre.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/showblocks/index.html b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/showblocks/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/smiley.js b/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/smiley.js
new file mode 100644
index 00000000..c8e4cf88
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -0,0 +1,224 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'smiley', function( editor )
+{
+	var config = editor.config,
+		lang = editor.lang.smiley,
+		images = config.smiley_images,
+		columns = config.smiley_columns || 8,
+		i;
+
+	/**
+	 * Simulate "this" of a dialog for non-dialog events.
+	 * @type {CKEDITOR.dialog}
+	 */
+	var dialog;
+	var onClick = function( evt )
+	{
+		var target = evt.data.getTarget(),
+			targetName = target.getName();
+
+		if ( targetName == 'a' )
+			target = target.getChild( 0 );
+		else if ( targetName != 'img' )
+			return;
+
+		var src = target.getAttribute( 'cke_src' ),
+			title = target.getAttribute( 'title' );
+
+		var img = editor.document.createElement( 'img',
+			{
+				attributes :
+				{
+					src : src,
+					'data-cke-saved-src' : src,
+					title : title,
+					alt : title,
+					width : target.$.width,
+					height : target.$.height
+				}
+			});
+
+		editor.insertElement( img );
+
+		dialog.hide();
+		evt.data.preventDefault();
+	};
+
+	var onKeydown = CKEDITOR.tools.addFunction( function( ev, element )
+	{
+		ev = new CKEDITOR.dom.event( ev );
+		element = new CKEDITOR.dom.element( element );
+		var relative, nodeToMove;
+
+		var keystroke = ev.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
+		switch ( keystroke )
+		{
+			// UP-ARROW
+			case 38 :
+				// relative is TR
+				if ( ( relative = element.getParent().getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getChild( [element.getParent().getIndex(), 0] );
+					nodeToMove.focus();
+				}
+				ev.preventDefault();
+				break;
+			// DOWN-ARROW
+			case 40 :
+				// relative is TR
+				if ( ( relative = element.getParent().getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( [element.getParent().getIndex(), 0] );
+					if ( nodeToMove )
+						nodeToMove.focus();
+				}
+				ev.preventDefault();
+				break;
+			// ENTER
+			// SPACE
+			case 32 :
+				onClick( { data: ev } );
+				ev.preventDefault();
+				break;
+
+			// RIGHT-ARROW
+			case rtl ? 37 : 39 :
+			// TAB
+			case 9 :
+				// relative is TD
+				if ( ( relative = element.getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( 0 );
+					nodeToMove.focus();
+					ev.preventDefault(true);
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( [0, 0] );
+					if ( nodeToMove )
+						nodeToMove.focus();
+					ev.preventDefault(true);
+				}
+				break;
+
+			// LEFT-ARROW
+			case rtl ? 39 : 37 :
+			// SHIFT + TAB
+			case CKEDITOR.SHIFT + 9 :
+				// relative is TD
+				if ( ( relative = element.getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getChild( 0 );
+					nodeToMove.focus();
+					ev.preventDefault(true);
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getLast().getChild( 0 );
+					nodeToMove.focus();
+					ev.preventDefault(true);
+				}
+				break;
+			default :
+				// Do not stop not handled events.
+				return;
+		}
+	});
+
+	// Build the HTML for the smiley images table.
+	var labelId = CKEDITOR.tools.getNextId() + '_smiley_emtions_label';
+	var html =
+	[
+		'<div>' +
+		'<span id="' + labelId + '" class="cke_voice_label">' + lang.options +'</span>',
+		'<table role="listbox" aria-labelledby="' + labelId + '" style="width:100%;height:100%" cellspacing="2" cellpadding="2"',
+		CKEDITOR.env.ie && CKEDITOR.env.quirks ? ' style="position:absolute;"' : '',
+		'><tbody>'
+	];
+
+	var size = images.length;
+	for ( i = 0 ; i < size ; i++ )
+	{
+		if ( i % columns === 0 )
+			html.push( '<tr>' );
+
+		var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
+		html.push(
+			'<td class="cke_dark_background cke_centered" style="vertical-align: middle;">' +
+				'<a href="javascript:void(0)" role="option"',
+					' aria-posinset="' + ( i +1 ) + '"',
+					' aria-setsize="' + size + '"',
+					' aria-labelledby="' + smileyLabelId + '"',
+					' class="cke_smile cke_hand" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',
+					'<img class="cke_hand" title="', config.smiley_descriptions[i], '"' +
+						' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', config.smiley_descriptions[i], '"',
+						' src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '"',
+						// IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.
+						( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ),
+					'>' +
+					'<span id="' + smileyLabelId + '" class="cke_voice_label">' +config.smiley_descriptions[ i ]  + '</span>' +
+				'</a>',
+ 			'</td>' );
+
+		if ( i % columns == columns - 1 )
+			html.push( '</tr>' );
+	}
+
+	if ( i < columns - 1 )
+	{
+		for ( ; i < columns - 1 ; i++ )
+			html.push( '<td></td>' );
+		html.push( '</tr>' );
+	}
+
+	html.push( '</tbody></table></div>' );
+
+	var smileySelector =
+	{
+		type : 'html',
+		id : 'smileySelector',
+		html : html.join( '' ),
+		onLoad : function( event )
+		{
+			dialog = event.sender;
+		},
+		focus : function()
+		{
+			var self = this;
+			// IE need a while to move the focus (#6539).
+			setTimeout( function ()
+			{
+				var firstSmile = self.getElement().getElementsByTag( 'a' ).getItem( 0 );
+				firstSmile.focus();
+			}, 0 );
+		},
+		onClick : onClick,
+		style : 'width: 100%; border-collapse: separate;'
+	};
+
+	return {
+		title : editor.lang.smiley.title,
+		minWidth : 270,
+		minHeight : 120,
+		contents : [
+			{
+				id : 'tab1',
+				label : '',
+				title : '',
+				expand : true,
+				padding : 0,
+				elements : [
+						smileySelector
+					]
+			}
+		],
+		buttons : [ CKEDITOR.dialog.cancelButton ]
+	};
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angel_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angel_smile.gif
new file mode 100644
index 00000000..2cf48947
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angel_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angry_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angry_smile.gif
new file mode 100644
index 00000000..40b52d3a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/angry_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/broken_heart.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/broken_heart.gif
new file mode 100644
index 00000000..b6d0166a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/broken_heart.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/confused_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/confused_smile.gif
new file mode 100644
index 00000000..a52db7a4
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/confused_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/cry_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/cry_smile.gif
new file mode 100644
index 00000000..1ef6ba4f
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/cry_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/devil_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/devil_smile.gif
new file mode 100644
index 00000000..bfb25077
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/devil_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/embaressed_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/embaressed_smile.gif
new file mode 100644
index 00000000..d9cedc56
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/embaressed_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/envelope.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/envelope.gif
new file mode 100644
index 00000000..94e0b1fa
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/envelope.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/heart.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/heart.gif
new file mode 100644
index 00000000..680ae2fc
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/heart.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/kiss.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/kiss.gif
new file mode 100644
index 00000000..70e52551
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/kiss.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/lightbulb.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/lightbulb.gif
new file mode 100644
index 00000000..d44c2ffe
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/lightbulb.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/omg_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/omg_smile.gif
new file mode 100644
index 00000000..ab7ea699
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/omg_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/regular_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/regular_smile.gif
new file mode 100644
index 00000000..e5bc34be
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/regular_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/sad_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/sad_smile.gif
new file mode 100644
index 00000000..ae4cf1e3
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/sad_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/shades_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/shades_smile.gif
new file mode 100644
index 00000000..b4540175
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/shades_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/teeth_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/teeth_smile.gif
new file mode 100644
index 00000000..7d734d15
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/teeth_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_down.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_down.gif
new file mode 100644
index 00000000..90b9978c
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_down.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_up.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_up.gif
new file mode 100644
index 00000000..b6332848
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/thumbs_up.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/tounge_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/tounge_smile.gif
new file mode 100644
index 00000000..b2e657fa
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/tounge_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
new file mode 100644
index 00000000..77098821
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/wink_smile.gif b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/wink_smile.gif
new file mode 100644
index 00000000..b2102954
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/smiley/images/wink_smile.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/smiley/index.html b/upload/public/js/3rd_party/ckeditor/plugins/smiley/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/smiley/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/specialchar.js b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/specialchar.js
new file mode 100644
index 00000000..9c8bfa2d
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -0,0 +1,350 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'specialchar', function( editor )
+{
+	/**
+	 * Simulate "this" of a dialog for non-dialog events.
+	 * @type {CKEDITOR.dialog}
+	 */
+	var dialog,
+		lang = editor.lang.specialChar;
+
+	var onChoice = function( evt )
+	{
+		var target, value;
+		if ( evt.data )
+			target = evt.data.getTarget();
+		else
+			target = new CKEDITOR.dom.element( evt );
+
+		if ( target.getName() == 'a' && ( value = target.getChild( 0 ).getHtml() ) )
+		{
+			target.removeClass( "cke_light_background" );
+			dialog.hide();
+
+			// We must use "insertText" here to keep text styled.
+			var span = editor.document.createElement( 'span' );
+			span.setHtml( value );
+			editor.insertText( span.getText() );
+		}
+	};
+
+	var onClick = CKEDITOR.tools.addFunction( onChoice );
+
+	var focusedNode;
+
+	var onFocus = function( evt, target )
+	{
+		var value;
+		target = target || evt.data.getTarget();
+
+		if ( target.getName() == 'span' )
+			target = target.getParent();
+
+		if ( target.getName() == 'a' && ( value = target.getChild( 0 ).getHtml() ) )
+		{
+			// Trigger blur manually if there is focused node.
+			if ( focusedNode )
+				onBlur( null, focusedNode );
+
+			var htmlPreview = dialog.getContentElement( 'info', 'htmlPreview' ).getElement();
+
+			dialog.getContentElement( 'info', 'charPreview' ).getElement().setHtml( value );
+			htmlPreview.setHtml( CKEDITOR.tools.htmlEncode( value ) );
+			target.getParent().addClass( "cke_light_background" );
+
+			// Memorize focused node.
+			focusedNode = target;
+		}
+	};
+
+	var onBlur = function( evt, target )
+	{
+		target = target || evt.data.getTarget();
+
+		if ( target.getName() == 'span' )
+			target = target.getParent();
+
+		if ( target.getName() == 'a' )
+		{
+			dialog.getContentElement( 'info', 'charPreview' ).getElement().setHtml( '&nbsp;' );
+			dialog.getContentElement( 'info', 'htmlPreview' ).getElement().setHtml( '&nbsp;' );
+			target.getParent().removeClass( "cke_light_background" );
+
+			focusedNode = undefined;
+		}
+	};
+
+	var onKeydown = CKEDITOR.tools.addFunction( function( ev )
+	{
+		ev = new CKEDITOR.dom.event( ev );
+
+		// Get an Anchor element.
+		var element = ev.getTarget();
+		var relative, nodeToMove;
+		var keystroke = ev.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
+
+		switch ( keystroke )
+		{
+			// UP-ARROW
+			case 38 :
+				// relative is TR
+				if ( ( relative = element.getParent().getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getChild( [element.getParent().getIndex(), 0] );
+					nodeToMove.focus();
+					onBlur( null, element );
+					onFocus( null, nodeToMove );
+				}
+				ev.preventDefault();
+				break;
+			// DOWN-ARROW
+			case 40 :
+				// relative is TR
+				if ( ( relative = element.getParent().getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( [ element.getParent().getIndex(), 0 ] );
+					if ( nodeToMove && nodeToMove.type == 1 )
+					{
+						nodeToMove.focus();
+						onBlur( null, element );
+						onFocus( null, nodeToMove );
+					}
+				}
+				ev.preventDefault();
+				break;
+			// SPACE
+			// ENTER is already handled as onClick
+			case 32 :
+				onChoice( { data: ev } );
+				ev.preventDefault();
+				break;
+
+			// RIGHT-ARROW
+			case rtl ? 37 : 39 :
+			// TAB
+			case 9 :
+				// relative is TD
+				if ( ( relative = element.getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( 0 );
+					if ( nodeToMove.type == 1 )
+					{
+						nodeToMove.focus();
+						onBlur( null, element );
+						onFocus( null, nodeToMove );
+						ev.preventDefault( true );
+					}
+					else
+						onBlur( null, element );
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getParent().getNext() ) )
+				{
+					nodeToMove = relative.getChild( [ 0, 0 ] );
+					if ( nodeToMove && nodeToMove.type == 1 )
+					{
+						nodeToMove.focus();
+						onBlur( null, element );
+						onFocus( null, nodeToMove );
+						ev.preventDefault( true );
+					}
+					else
+						onBlur( null, element );
+				}
+				break;
+
+			// LEFT-ARROW
+			case rtl ? 39 : 37 :
+			// SHIFT + TAB
+			case CKEDITOR.SHIFT + 9 :
+				// relative is TD
+				if ( ( relative = element.getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getChild( 0 );
+					nodeToMove.focus();
+					onBlur( null, element );
+					onFocus( null, nodeToMove );
+					ev.preventDefault( true );
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getParent().getPrevious() ) )
+				{
+					nodeToMove = relative.getLast().getChild( 0 );
+					nodeToMove.focus();
+					onBlur( null, element );
+					onFocus( null, nodeToMove );
+					ev.preventDefault( true );
+				}
+				else
+					onBlur( null, element );
+				break;
+			default :
+				// Do not stop not handled events.
+				return;
+		}
+	});
+
+	return {
+		title : lang.title,
+		minWidth : 430,
+		minHeight : 280,
+		buttons : [ CKEDITOR.dialog.cancelButton ],
+		charColumns : 17,
+		onLoad :  function()
+		{
+			var columns = this.definition.charColumns,
+				extraChars = editor.config.extraSpecialChars,
+				chars = editor.config.specialChars;
+
+			var charsTableLabel =  CKEDITOR.tools.getNextId() + '_specialchar_table_label';
+			var html = [ '<table role="listbox" aria-labelledby="' + charsTableLabel + '"' +
+						 			' style="width: 320px; height: 100%; border-collapse: separate;"' +
+						 			' align="center" cellspacing="2" cellpadding="2" border="0">' ];
+
+			var i = 0,
+				size = chars.length,
+				character,
+				charDesc;
+
+			while ( i < size )
+			{
+				html.push( '<tr>' ) ;
+
+				for ( var j = 0 ; j < columns ; j++, i++ )
+				{
+					if ( ( character = chars[ i ] ) )
+					{
+						charDesc = '';
+
+						if ( character instanceof Array )
+						{
+							charDesc = character[ 1 ];
+							character = character[ 0 ];
+						}
+						else
+						{
+							var _tmpName = character.replace( '&', '' ).replace( ';', '' ).replace( '#', '' );
+
+							// Use character in case description unavailable.
+							charDesc = lang[ _tmpName ] || character;
+						}
+
+						var charLabelId =  'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
+
+						html.push(
+							'<td class="cke_dark_background" style="cursor: default" role="presentation">' +
+							'<a href="javascript: void(0);" role="option"' +
+							' aria-posinset="' + ( i +1 ) + '"',
+							' aria-setsize="' + size + '"',
+							' aria-labelledby="' + charLabelId + '"',
+							' style="cursor: inherit; display: block; height: 1.25em; margin-top: 0.25em; text-align: center;" title="', CKEDITOR.tools.htmlEncode( charDesc ), '"' +
+							' onkeydown="CKEDITOR.tools.callFunction( ' + onKeydown + ', event, this )"' +
+							' onclick="CKEDITOR.tools.callFunction(' + onClick + ', this); return false;"' +
+							' tabindex="-1">' +
+							'<span style="margin: 0 auto;cursor: inherit">' +
+							character +
+							'</span>' +
+							'<span class="cke_voice_label" id="' + charLabelId + '">' +
+							charDesc +
+							'</span></a>');
+					}
+					else
+						html.push( '<td class="cke_dark_background">&nbsp;' );
+
+					html.push( '</td>' );
+				}
+				html.push( '</tr>' );
+			}
+
+			html.push( '</tbody></table>', '<span id="' + charsTableLabel + '" class="cke_voice_label">' + lang.options +'</span>' );
+
+			this.getContentElement( 'info', 'charContainer' ).getElement().setHtml( html.join( '' ) );
+		},
+		contents : [
+			{
+				id : 'info',
+				label : editor.lang.common.generalTab,
+				title : editor.lang.common.generalTab,
+				padding : 0,
+				align : 'top',
+				elements : [
+					{
+						type : 'hbox',
+						align : 'top',
+						widths : [ '320px', '90px' ],
+						children :
+						[
+							{
+								type : 'html',
+								id : 'charContainer',
+								html : '',
+								onMouseover : onFocus,
+								onMouseout : onBlur,
+								focus : function()
+								{
+									var firstChar = this.getElement().getElementsByTag( 'a' ).getItem( 0 );
+									setTimeout( function()
+									{
+										firstChar.focus();
+										onFocus( null, firstChar );
+									}, 0 );
+								},
+								onShow : function()
+								{
+									var firstChar = this.getElement().getChild( [ 0, 0, 0, 0, 0 ] );
+									setTimeout( function()
+										{
+											firstChar.focus();
+											onFocus( null, firstChar );
+										}, 0 );
+								},
+								onLoad : function( event )
+								{
+									dialog = event.sender;
+								}
+							},
+							{
+								type : 'hbox',
+								align : 'top',
+								widths : [ '100%' ],
+								children :
+								[
+									{
+										type : 'vbox',
+										align : 'top',
+										children :
+										[
+											{
+												type : 'html',
+												html : '<div></div>'
+											},
+											{
+												type : 'html',
+												id : 'charPreview',
+												className : 'cke_dark_background',
+												style : 'border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:\'Microsoft Sans Serif\',Arial,Helvetica,Verdana;text-align:center;',
+												html : '<div>&nbsp;</div>'
+											},
+											{
+												type : 'html',
+												id : 'htmlPreview',
+												className : 'cke_dark_background',
+												style : 'border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:\'Microsoft Sans Serif\',Arial,Helvetica,Verdana;text-align:center;',
+												html : '<div>&nbsp;</div>'
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			}
+		]
+	};
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/specialchar/index.html b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/en.js b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/en.js
new file mode 100644
index 00000000..b1e2199c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/en.js
@@ -0,0 +1,122 @@
+
+CKEDITOR.plugins.setLang( 'specialchar', 'en',
+{
+	euro: "Euro sign",
+	lsquo: "Left single quotation mark",
+	rsquo: "Right single quotation mark",
+	ldquo: "Left double quotation mark",
+	rdquo: "Right double quotation mark",
+	ndash: "En dash",
+	mdash: "Em dash",
+	iexcl: "Inverted exclamation mark",
+	cent: "Cent sign",
+	pound: "Pound sign",
+	curren: "Currency sign",
+	yen: "Yen sign",
+	brvbar: "Broken bar",
+	sect: "Section sign",
+	uml: "Diaeresis",
+	copy: "Copyright sign",
+	ordf: "Feminine ordinal indicator",
+	laquo: "Left-pointing double angle quotation mark",
+	not: "Not sign",
+	reg: "Registered sign",
+	macr: "Macron",
+	deg: "Degree sign",
+	sup2: "Superscript two",
+	sup3: "Superscript three",
+	acute: "Acute accent",
+	micro: "Micro sign",
+	para: "Pilcrow sign",
+	middot: "Middle dot",
+	cedil: "Cedilla",
+	sup1: "Superscript one",
+	ordm: "Masculine ordinal indicator",
+	raquo: "Right-pointing double angle quotation mark",
+	frac14: "Vulgar fraction one quarter",
+	frac12: "Vulgar fraction one half",
+	frac34: "Vulgar fraction three quarters",
+	iquest: "Inverted question mark",
+	Agrave: "Latin capital letter A with grave accent",
+	Aacute: "Latin capital letter A with acute accent",
+	Acirc: "Latin capital letter A with circumflex",
+	Atilde: "Latin capital letter A with tilde",
+	Auml: "Latin capital letter A with diaeresis",
+	Aring: "Latin capital letter A with ring above",
+	AElig: "Latin Capital letter Æ",
+	Ccedil: "Latin capital letter C with cedilla",
+	Egrave: "Latin capital letter E with grave accent",
+	Eacute: "Latin capital letter E with acute accent",
+	Ecirc: "Latin capital letter E with circumflex",
+	Euml: "Latin capital letter E with diaeresis",
+	Igrave: "Latin capital letter I with grave accent",
+	Iacute: "Latin capital letter I with acute accent",
+	Icirc: "Latin capital letter I with circumflex",
+	Iuml: "Latin capital letter I with diaeresis",
+	ETH: "Latin capital letter Eth",
+	Ntilde: "Latin capital letter N with tilde",
+	Ograve: "Latin capital letter O with grave accent",
+	Oacute: "Latin capital letter O with acute accent",
+	Ocirc: "Latin capital letter O with circumflex",
+	Otilde: "Latin capital letter O with tilde",
+	Ouml: "Latin capital letter O with diaeresis",
+	times: "Multiplication sign",
+	Oslash: "Latin capital letter O with stroke",
+	Ugrave: "Latin capital letter U with grave accent",
+	Uacute: "Latin capital letter U with acute accent",
+	Ucirc: "Latin capital letter U with circumflex",
+	Uuml: "Latin capital letter U with diaeresis",
+	Yacute: "Latin capital letter Y with acute accent",
+	THORN: "Latin capital letter Thorn",
+	szlig: "Latin small letter sharp s",
+	agrave: "Latin small letter a with grave accent",
+	aacute: "Latin small letter a with acute accent",
+	acirc: "Latin small letter a with circumflex",
+	atilde: "Latin small letter a with tilde",
+	auml: "Latin small letter a with diaeresis",
+	aring: "Latin small letter a with ring above",
+	aelig: "Latin small letter æ",
+	ccedil: "Latin small letter c with cedilla",
+	egrave: "Latin small letter e with grave accent",
+	eacute: "Latin small letter e with acute accent",
+	ecirc: "Latin small letter e with circumflex",
+	euml: "Latin small letter e with diaeresis",
+	igrave: "Latin small letter i with grave accent",
+	iacute: "Latin small letter i with acute accent",
+	icirc: "Latin small letter i with circumflex",
+	iuml: "Latin small letter i with diaeresis",
+	eth: "Latin small letter eth",
+	ntilde: "Latin small letter n with tilde",
+	ograve: "Latin small letter o with grave accent",
+	oacute: "Latin small letter o with acute accent",
+	ocirc: "Latin small letter o with circumflex",
+	otilde: "Latin small letter o with tilde",
+	ouml: "Latin small letter o with diaeresis",
+	divide: "Division sign",
+	oslash: "Latin small letter o with stroke",
+	ugrave: "Latin small letter u with grave accent",
+	uacute: "Latin small letter u with acute accent",
+	ucirc: "Latin small letter u with circumflex",
+	uuml: "Latin small letter u with diaeresis",
+	yacute: "Latin small letter y with acute accent",
+	thorn: "Latin small letter thorn",
+	yuml: "Latin small letter y with diaeresis",
+	OElig: "Latin capital ligature OE",
+	oelig: "Latin small ligature oe",
+	'372': "Latin capital letter W with circumflex",
+	'374': "Latin capital letter Y with circumflex",
+	'373': "Latin small letter w with circumflex",
+	'375': "Latin small letter y with circumflex",
+	sbquo: "Single low-9 quotation mark",
+	'8219': "Single high-reversed-9 quotation mark",
+	bdquo: "Double low-9 quotation mark",
+	hellip: "Horizontal ellipsis",
+	trade: "Trade mark sign",
+	'9658': "Black right-pointing pointer",
+	bull: "Bullet",
+	rarr: "Rightwards arrow",
+	rArr: "Rightwards double arrow",
+	hArr: "Left right double arrow",
+	diams: "Black diamond suit",
+	asymp: "Almost equal to"
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/index.html b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/specialchar/lang/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/styles/index.html b/upload/public/js/3rd_party/ckeditor/plugins/styles/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/styles/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/default.js b/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/default.js
new file mode 100644
index 00000000..4c766f39
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/default.js
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.stylesSet.add( 'default',
+[
+	/* Block Styles */
+
+	// These styles are already available in the "Format" combo, so they are
+	// not needed here by default. You may enable them to avoid placing the
+	// "Format" combo in the toolbar, maintaining the same features.
+	/*
+	{ name : 'Paragraph'		, element : 'p' },
+	{ name : 'Heading 1'		, element : 'h1' },
+	{ name : 'Heading 2'		, element : 'h2' },
+	{ name : 'Heading 3'		, element : 'h3' },
+	{ name : 'Heading 4'		, element : 'h4' },
+	{ name : 'Heading 5'		, element : 'h5' },
+	{ name : 'Heading 6'		, element : 'h6' },
+	{ name : 'Preformatted Text', element : 'pre' },
+	{ name : 'Address'			, element : 'address' },
+	*/
+
+	{ name : 'Blue Title'		, element : 'h3', styles : { 'color' : 'Blue' } },
+	{ name : 'Red Title'		, element : 'h3', styles : { 'color' : 'Red' } },
+
+	/* Inline Styles */
+
+	// These are core styles available as toolbar buttons. You may opt enabling
+	// some of them in the Styles combo, removing them from the toolbar.
+	/*
+	{ name : 'Strong'			, element : 'strong', overrides : 'b' },
+	{ name : 'Emphasis'			, element : 'em'	, overrides : 'i' },
+	{ name : 'Underline'		, element : 'u' },
+	{ name : 'Strikethrough'	, element : 'strike' },
+	{ name : 'Subscript'		, element : 'sub' },
+	{ name : 'Superscript'		, element : 'sup' },
+	*/
+
+	{ name : 'Marker: Yellow'	, element : 'span', styles : { 'background-color' : 'Yellow' } },
+	{ name : 'Marker: Green'	, element : 'span', styles : { 'background-color' : 'Lime' } },
+
+	{ name : 'Big'				, element : 'big' },
+	{ name : 'Small'			, element : 'small' },
+	{ name : 'Typewriter'		, element : 'tt' },
+
+	{ name : 'Computer Code'	, element : 'code' },
+	{ name : 'Keyboard Phrase'	, element : 'kbd' },
+	{ name : 'Sample Text'		, element : 'samp' },
+	{ name : 'Variable'			, element : 'var' },
+
+	{ name : 'Deleted Text'		, element : 'del' },
+	{ name : 'Inserted Text'	, element : 'ins' },
+
+	{ name : 'Cited Work'		, element : 'cite' },
+	{ name : 'Inline Quotation'	, element : 'q' },
+
+	{ name : 'Language: RTL'	, element : 'span', attributes : { 'dir' : 'rtl' } },
+	{ name : 'Language: LTR'	, element : 'span', attributes : { 'dir' : 'ltr' } },
+
+	/* Object Styles */
+
+	{
+		name : 'Image on Left',
+		element : 'img',
+		attributes :
+		{
+			'style' : 'padding: 5px; margin-right: 5px',
+			'border' : '2',
+			'align' : 'left'
+		}
+	},
+
+	{
+		name : 'Image on Right',
+		element : 'img',
+		attributes :
+		{
+			'style' : 'padding: 5px; margin-left: 5px',
+			'border' : '2',
+			'align' : 'right'
+		}
+	},
+
+	{ name : 'Borderless Table', element : 'table', styles: { 'border-style': 'hidden', 'background-color' : '#E6E6FA' } },
+	{ name : 'Square Bulleted List', element : 'ul', styles : { 'list-style-type' : 'square' } }
+]);
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/index.html b/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/styles/styles/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/stylesheetparser/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/stylesheetparser/plugin.js
new file mode 100644
index 00000000..758464f6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/stylesheetparser/plugin.js
@@ -0,0 +1,148 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @stylesheetParser plugin.
+ */
+
+(function()
+{
+	// We want to extract only the elements with classes defined in the stylesheets:
+	function parseClasses( aRules, skipSelectors, validSelectors )
+	{
+		// aRules are just the different rules in the style sheets
+		// We want to merge them and them split them by commas, so we end up with only
+		// the selectors
+		var s = aRules.join(' ');
+		// Remove selectors splitting the elements, leave only the class selector (.)
+		s = s.replace( /(,|>|\+|~)/g, ' ' );
+		// Remove attribute selectors: table[border="0"]
+		s = s.replace( /\[[^\]]*/g, '' );
+		// Remove Ids: div#main
+		s = s.replace( /#[^\s]*/g, '' );
+		// Remove pseudo-selectors and pseudo-elements: :hover :nth-child(2n+1) ::before
+		s = s.replace( /\:{1,2}[^\s]*/g, '' );
+
+		s = s.replace( /\s+/g, ' ' );
+
+		var aSelectors = s.split( ' ' ),
+			aClasses = [];
+
+		for ( var i = 0; i < aSelectors.length ; i++ )
+		{
+			var selector = aSelectors[ i ];
+
+			if ( validSelectors.test( selector ) && !skipSelectors.test( selector ) )
+			{
+				// If we still don't know about this one, add it
+				if ( CKEDITOR.tools.indexOf( aClasses, selector ) == -1 )
+					aClasses.push( selector );
+			}
+		}
+
+		return aClasses;
+	}
+
+	function LoadStylesCSS( theDoc, skipSelectors, validSelectors )
+	{
+		var styles = [],
+			// It will hold all the rules of the applied stylesheets (except those internal to CKEditor)
+			aRules = [],
+			i;
+
+		for ( i = 0; i < theDoc.styleSheets.length; i++ )
+		{
+			var sheet = theDoc.styleSheets[ i ],
+				node = sheet.ownerNode || sheet.owningElement;
+
+			// Skip the internal stylesheets
+			if ( node.getAttribute( 'data-cke-temp' ) )
+				continue;
+
+			// Exclude stylesheets injected by extensions
+			if ( sheet.href && sheet.href.substr(0, 9) == 'chrome://' )
+				continue;
+
+			var sheetRules = sheet.cssRules || sheet.rules;
+			for ( var j = 0; j < sheetRules.length; j++ )
+				aRules.push( sheetRules[ j ].selectorText );
+		}
+
+		var aClasses = parseClasses( aRules, skipSelectors, validSelectors );
+
+		// Add each style to our "Styles" collection.
+		for ( i = 0; i < aClasses.length; i++ )
+		{
+			var oElement = aClasses[ i ].split( '.' ),
+				element = oElement[ 0 ].toLowerCase(),
+				sClassName = oElement[ 1 ];
+
+			styles.push( {
+				name : element + '.' + sClassName,
+				element : element,
+				attributes : {'class' : sClassName}
+			});
+		}
+
+		return styles;
+	}
+
+	// Register a plugin named "stylesheetparser".
+	CKEDITOR.plugins.add( 'stylesheetparser',
+	{
+		requires: [ 'styles' ],
+		onLoad : function()
+		{
+			var obj = CKEDITOR.editor.prototype;
+			obj.getStylesSet = CKEDITOR.tools.override( obj.getStylesSet,  function( org )
+			{
+				return function( callback )
+				{
+					var self = this;
+					org.call( this, function( definitions )
+					{
+						// Rules that must be skipped
+						var skipSelectors = self.config.stylesheetParser_skipSelectors || ( /(^body\.|^\.)/i ),
+							// Rules that are valid
+							validSelectors = self.config.stylesheetParser_validSelectors || ( /\w+\.\w+/ );
+
+						callback( ( self._.stylesDefinitions = definitions.concat( LoadStylesCSS( self.document.$, skipSelectors, validSelectors ) ) ) );
+					});
+				};
+			});
+
+		}
+	});
+})();
+
+
+/**
+ * A regular expression that defines whether a CSS rule will be
+ * skipped by the Stylesheet Parser plugin. A CSS rule matching
+ * the regular expression will be ignored and will not be available
+ * in the Styles drop-down list.
+ * @name CKEDITOR.config.stylesheetParser_skipSelectors
+ * @type RegExp
+ * @default /(^body\.|^\.)/i
+ * @since 3.6
+ * @see CKEDITOR.config.stylesheetParser_validSelectors
+ * @example
+ * // Ignore rules for body and caption elements, classes starting with "high", and any class defined for no specific element.
+ * config.stylesheetParser_skipSelectors = /(^body\.|^caption\.|\.high|^\.)/i;
+ */
+
+ /**
+ * A regular expression that defines which CSS rules will be used
+ * by the Stylesheet Parser plugin. A CSS rule matching the regular
+ * expression will be available in the Styles drop-down list.
+ * @name CKEDITOR.config.stylesheetParser_validSelectors
+ * @type RegExp
+ * @default /\w+\.\w+/
+ * @since 3.6
+ * @see CKEDITOR.config.stylesheetParser_skipSelectors
+ * @example
+ * // Only add rules for p and span elements.
+ * config.stylesheetParser_validSelectors = /\^(p|span)\.\w+/;
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/table.js b/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/table.js
new file mode 100644
index 00000000..5d1733c0
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/table/dialogs/table.js
@@ -0,0 +1,623 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var defaultToPixel = CKEDITOR.tools.cssLength;
+
+	var commitValue = function( data )
+	{
+		var id = this.id;
+		if ( !data.info )
+			data.info = {};
+		data.info[id] = this.getValue();
+	};
+
+	function tableColumns( table )
+	{
+		var cols = 0, maxCols = 0;
+		for ( var i = 0, row, rows = table.$.rows.length; i < rows; i++ )
+		{
+			row = table.$.rows[ i ], cols = 0;
+			for ( var j = 0, cell, cells = row.cells.length; j < cells; j++ )
+			{
+				cell = row.cells[ j ];
+				cols += cell.colSpan;
+			}
+
+			cols > maxCols && ( maxCols = cols );
+		}
+
+		return maxCols;
+	}
+
+	function tableDialog( editor, command )
+	{
+		var makeElement = function( name )
+			{
+				return new CKEDITOR.dom.element( name, editor.document );
+			};
+
+		var dialogadvtab = editor.plugins.dialogadvtab;
+
+		return {
+			title : editor.lang.table.title,
+			minWidth : 310,
+			minHeight : CKEDITOR.env.ie ? 310 : 280,
+
+			onLoad : function()
+			{
+				var dialog = this;
+
+				var styles = dialog.getContentElement( 'advanced', 'advStyles' );
+
+				if ( styles )
+				{
+					styles.on( 'change', function( evt )
+						{
+							// Synchronize width value.
+							var width = this.getStyle( 'width', '' ),
+								txtWidth = dialog.getContentElement( 'info', 'txtWidth' );
+
+							txtWidth && txtWidth.setValue( width, true );
+
+							// Synchronize height value.
+							var height = this.getStyle( 'height', '' ),
+								txtHeight = dialog.getContentElement( 'info', 'txtHeight' );
+
+							txtHeight && txtHeight.setValue( height, true );
+						});
+				}
+			},
+
+			onShow : function()
+			{
+				// Detect if there's a selected table.
+				var selection = editor.getSelection(),
+					ranges = selection.getRanges(),
+					selectedTable = null;
+
+				var rowsInput = this.getContentElement( 'info', 'txtRows' ),
+					colsInput = this.getContentElement( 'info', 'txtCols' ),
+					widthInput = this.getContentElement( 'info', 'txtWidth' ),
+					heightInput = this.getContentElement( 'info', 'txtHeight' );
+
+				if ( command == 'tableProperties' )
+				{
+					if ( ( selectedTable = selection.getSelectedElement() ) )
+						selectedTable = selectedTable.getAscendant( 'table', true );
+					else if ( ranges.length > 0 )
+					{
+						// Webkit could report the following range on cell selection (#4948):
+						// <table><tr><td>[&nbsp;</td></tr></table>]
+						if ( CKEDITOR.env.webkit )
+							ranges[ 0 ].shrink( CKEDITOR.NODE_ELEMENT );
+
+						var rangeRoot = ranges[0].getCommonAncestor( true );
+						selectedTable = rangeRoot.getAscendant( 'table', true );
+					}
+
+					// Save a reference to the selected table, and push a new set of default values.
+					this._.selectedElement = selectedTable;
+				}
+
+				// Enable or disable the row, cols, width fields.
+				if ( selectedTable )
+				{
+					this.setupContent( selectedTable );
+					rowsInput && rowsInput.disable();
+					colsInput && colsInput.disable();
+				}
+				else
+				{
+					rowsInput && rowsInput.enable();
+					colsInput && colsInput.enable();
+				}
+
+				// Call the onChange method for the widht and height fields so
+				// they get reflected into the Advanced tab.
+				widthInput && widthInput.onChange();
+				heightInput && heightInput.onChange();
+			},
+			onOk : function()
+			{
+				var selection = editor.getSelection(),
+					bms = this._.selectedElement && selection.createBookmarks();
+
+				var table = this._.selectedElement || makeElement( 'table' ),
+					me = this,
+					data = {};
+
+				this.commitContent( data, table );
+
+				if ( data.info )
+				{
+					var info = data.info;
+
+					// Generate the rows and cols.
+					if ( !this._.selectedElement )
+					{
+						var tbody = table.append( makeElement( 'tbody' ) ),
+							rows = parseInt( info.txtRows, 10 ) || 0,
+							cols = parseInt( info.txtCols, 10 ) || 0;
+
+						for ( var i = 0 ; i < rows ; i++ )
+						{
+							var row = tbody.append( makeElement( 'tr' ) );
+							for ( var j = 0 ; j < cols ; j++ )
+							{
+								var cell = row.append( makeElement( 'td' ) );
+								if ( !CKEDITOR.env.ie )
+									cell.append( makeElement( 'br' ) );
+							}
+						}
+					}
+
+					// Modify the table headers. Depends on having rows and cols generated
+					// correctly so it can't be done in commit functions.
+
+					// Should we make a <thead>?
+					var headers = info.selHeaders;
+					if ( !table.$.tHead && ( headers == 'row' || headers == 'both' ) )
+					{
+						var thead = new CKEDITOR.dom.element( table.$.createTHead() );
+						tbody = table.getElementsByTag( 'tbody' ).getItem( 0 );
+						var theRow = tbody.getElementsByTag( 'tr' ).getItem( 0 );
+
+						// Change TD to TH:
+						for ( i = 0 ; i < theRow.getChildCount() ; i++ )
+						{
+							var th = theRow.getChild( i );
+							// Skip bookmark nodes. (#6155)
+							if ( th.type == CKEDITOR.NODE_ELEMENT && !th.data( 'cke-bookmark' ) )
+							{
+								th.renameNode( 'th' );
+								th.setAttribute( 'scope', 'col' );
+							}
+						}
+						thead.append( theRow.remove() );
+					}
+
+					if ( table.$.tHead !== null && !( headers == 'row' || headers == 'both' ) )
+					{
+						// Move the row out of the THead and put it in the TBody:
+						thead = new CKEDITOR.dom.element( table.$.tHead );
+						tbody = table.getElementsByTag( 'tbody' ).getItem( 0 );
+
+						var previousFirstRow = tbody.getFirst();
+						while ( thead.getChildCount() > 0 )
+						{
+							theRow = thead.getFirst();
+							for ( i = 0; i < theRow.getChildCount() ; i++ )
+							{
+								var newCell = theRow.getChild( i );
+								if ( newCell.type == CKEDITOR.NODE_ELEMENT )
+								{
+									newCell.renameNode( 'td' );
+									newCell.removeAttribute( 'scope' );
+								}
+							}
+							theRow.insertBefore( previousFirstRow );
+						}
+						thead.remove();
+					}
+
+					// Should we make all first cells in a row TH?
+					if ( !this.hasColumnHeaders && ( headers == 'col' || headers == 'both' ) )
+					{
+						for ( row = 0 ; row < table.$.rows.length ; row++ )
+						{
+							newCell = new CKEDITOR.dom.element( table.$.rows[ row ].cells[ 0 ] );
+							newCell.renameNode( 'th' );
+							newCell.setAttribute( 'scope', 'row' );
+						}
+					}
+
+					// Should we make all first TH-cells in a row make TD? If 'yes' we do it the other way round :-)
+					if ( ( this.hasColumnHeaders ) && !( headers == 'col' || headers == 'both' ) )
+					{
+						for ( i = 0 ; i < table.$.rows.length ; i++ )
+						{
+							row = new CKEDITOR.dom.element( table.$.rows[i] );
+							if ( row.getParent().getName() == 'tbody' )
+							{
+								newCell = new CKEDITOR.dom.element( row.$.cells[0] );
+								newCell.renameNode( 'td' );
+								newCell.removeAttribute( 'scope' );
+							}
+						}
+					}
+
+					// Set the width and height.
+					info.txtHeight ? table.setStyle( 'height', info.txtHeight ) : table.removeStyle( 'height' );
+					info.txtWidth ? table.setStyle( 'width', info.txtWidth ) : table.removeStyle( 'width' );
+
+					if ( !table.getAttribute( 'style' ) )
+						table.removeAttribute( 'style' );
+				}
+
+				// Insert the table element if we're creating one.
+				if ( !this._.selectedElement )
+				{
+					editor.insertElement( table );
+					// Override the default cursor position after insertElement to place
+					// cursor inside the first cell (#7959), IE needs a while.
+					setTimeout( function()
+						{
+							var firstCell = new CKEDITOR.dom.element( table.$.rows[ 0 ].cells[ 0 ] );
+							var range = new CKEDITOR.dom.range( editor.document );
+							range.moveToPosition( firstCell, CKEDITOR.POSITION_AFTER_START );
+							range.select( 1 );
+						}, 0 );
+				}
+				// Properly restore the selection, (#4822) but don't break
+				// because of this, e.g. updated table caption.
+				else
+					try { selection.selectBookmarks( bms ); } catch( er ){}
+			},
+			contents : [
+				{
+					id : 'info',
+					label : editor.lang.table.title,
+					elements :
+					[
+						{
+							type : 'hbox',
+							widths : [ null, null ],
+							styles : [ 'vertical-align:top' ],
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'text',
+											id : 'txtRows',
+											'default' : 3,
+											label : editor.lang.table.rows,
+											required : true,
+											controlStyle : 'width:5em',
+											validate : function()
+											{
+												var pass = true,
+													value = this.getValue();
+												pass = pass && CKEDITOR.dialog.validate.integer()( value )
+													&& value > 0;
+												if ( !pass )
+												{
+													alert( editor.lang.table.invalidRows );
+													this.select();
+												}
+												return pass;
+											},
+											setup : function( selectedElement )
+											{
+												this.setValue( selectedElement.$.rows.length );
+											},
+											commit : commitValue
+										},
+										{
+											type : 'text',
+											id : 'txtCols',
+											'default' : 2,
+											label : editor.lang.table.columns,
+											required : true,
+											controlStyle : 'width:5em',
+											validate : function()
+											{
+												var pass = true,
+													value = this.getValue();
+												pass = pass && CKEDITOR.dialog.validate.integer()( value )
+													&& value > 0;
+												if ( !pass )
+												{
+													alert( editor.lang.table.invalidCols );
+													this.select();
+												}
+												return pass;
+											},
+											setup : function( selectedTable )
+											{
+												this.setValue( tableColumns( selectedTable ) );
+											},
+											commit : commitValue
+										},
+										{
+											type : 'html',
+											html : '&nbsp;'
+										},
+										{
+											type : 'select',
+											id : 'selHeaders',
+											'default' : '',
+											label : editor.lang.table.headers,
+											items :
+											[
+												[ editor.lang.table.headersNone, '' ],
+												[ editor.lang.table.headersRow, 'row' ],
+												[ editor.lang.table.headersColumn, 'col' ],
+												[ editor.lang.table.headersBoth, 'both' ]
+											],
+											setup : function( selectedTable )
+											{
+												// Fill in the headers field.
+												var dialog = this.getDialog();
+												dialog.hasColumnHeaders = true;
+
+												// Check if all the first cells in every row are TH
+												for ( var row = 0 ; row < selectedTable.$.rows.length ; row++ )
+												{
+													// If just one cell isn't a TH then it isn't a header column
+													var headCell = selectedTable.$.rows[row].cells[0];
+													if ( headCell && headCell.nodeName.toLowerCase() != 'th' )
+													{
+														dialog.hasColumnHeaders = false;
+														break;
+													}
+												}
+
+												// Check if the table contains <thead>.
+												if ( ( selectedTable.$.tHead !== null) )
+													this.setValue( dialog.hasColumnHeaders ? 'both' : 'row' );
+												else
+													this.setValue( dialog.hasColumnHeaders ? 'col' : '' );
+											},
+											commit : commitValue
+										},
+										{
+											type : 'text',
+											id : 'txtBorder',
+											'default' : 1,
+											label : editor.lang.table.border,
+											controlStyle : 'width:3em',
+											validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidBorder ),
+											setup : function( selectedTable )
+											{
+												this.setValue( selectedTable.getAttribute( 'border' ) || '' );
+											},
+											commit : function( data, selectedTable )
+											{
+												if ( this.getValue() )
+													selectedTable.setAttribute( 'border', this.getValue() );
+												else
+													selectedTable.removeAttribute( 'border' );
+											}
+										},
+										{
+											id : 'cmbAlign',
+											type : 'select',
+											'default' : '',
+											label : editor.lang.common.align,
+											items :
+											[
+												[ editor.lang.common.notSet , ''],
+												[ editor.lang.common.alignLeft , 'left'],
+												[ editor.lang.common.alignCenter , 'center'],
+												[ editor.lang.common.alignRight , 'right']
+											],
+											setup : function( selectedTable )
+											{
+												this.setValue( selectedTable.getAttribute( 'align' ) || '' );
+											},
+											commit : function( data, selectedTable )
+											{
+												if ( this.getValue() )
+													selectedTable.setAttribute( 'align', this.getValue() );
+												else
+													selectedTable.removeAttribute( 'align' );
+											}
+										}
+									]
+								},
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'hbox',
+											widths : [ '5em' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'txtWidth',
+													controlStyle : 'width:5em',
+													label : editor.lang.common.width,
+													title : editor.lang.common.cssLengthTooltip,
+													'default' : 500,
+													getValue : defaultToPixel,
+													validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.width ) ),
+													onChange : function()
+													{
+														var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' );
+														styles && styles.updateStyle( 'width', this.getValue() );
+													},
+													setup : function( selectedTable )
+													{
+														var val = selectedTable.getStyle( 'width' );
+														val && this.setValue( val );
+													},
+													commit : commitValue
+												}
+											]
+										},
+										{
+											type : 'hbox',
+											widths : [ '5em' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'txtHeight',
+													controlStyle : 'width:5em',
+													label : editor.lang.common.height,
+													title : editor.lang.common.cssLengthTooltip,
+													'default' : '',
+													getValue : defaultToPixel,
+													validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength.replace( '%1', editor.lang.common.height ) ),
+													onChange : function()
+													{
+														var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' );
+														styles && styles.updateStyle( 'height', this.getValue() );
+													},
+
+													setup : function( selectedTable )
+													{
+														var val = selectedTable.getStyle( 'width' );
+														val && this.setValue( val );
+													},
+													commit : commitValue
+												}
+											]
+										},
+										{
+											type : 'html',
+											html : '&nbsp;'
+										},
+										{
+											type : 'text',
+											id : 'txtCellSpace',
+											controlStyle : 'width:3em',
+											label : editor.lang.table.cellSpace,
+											'default' : 1,
+											validate : CKEDITOR.dialog.validate.number( editor.lang.table.invalidCellSpacing ),
+											setup : function( selectedTable )
+											{
+												this.setValue( selectedTable.getAttribute( 'cellSpacing' ) || '' );
+											},
+											commit : function( data, selectedTable )
+											{
+												if ( this.getValue() )
+													selectedTable.setAttribute( 'cellSpacing', this.getValue() );
+												else
+													selectedTable.removeAttribute( 'cellSpacing' );
+											}
+										},
+										{
+											type : 'text',
+											id : 'txtCellPad',
+											controlStyle : 'width:3em',
+											label : editor.lang.table.cellPad,
+											'default' : 1,
+											validate : CKEDITOR.dialog.validate.number( editor.lang.table.invalidCellPadding ),
+											setup : function( selectedTable )
+											{
+												this.setValue( selectedTable.getAttribute( 'cellPadding' ) || '' );
+											},
+											commit : function( data, selectedTable )
+											{
+												if ( this.getValue() )
+													selectedTable.setAttribute( 'cellPadding', this.getValue() );
+												else
+													selectedTable.removeAttribute( 'cellPadding' );
+											}
+										}
+									]
+								}
+							]
+						},
+						{
+							type : 'html',
+							align : 'right',
+							html : ''
+						},
+						{
+							type : 'vbox',
+							padding : 0,
+							children :
+							[
+								{
+									type : 'text',
+									id : 'txtCaption',
+									label : editor.lang.table.caption,
+									setup : function( selectedTable )
+									{
+										this.enable();
+
+										var nodeList = selectedTable.getElementsByTag( 'caption' );
+										if ( nodeList.count() > 0 )
+										{
+											var caption = nodeList.getItem( 0 );
+											var firstElementChild = caption.getFirst( CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT ) );
+
+											if ( firstElementChild && !firstElementChild.equals( caption.getBogus() ) )
+											{
+												this.disable();
+												this.setValue( caption.getText() );
+												return;
+											}
+
+											caption = CKEDITOR.tools.trim( caption.getText() );
+											this.setValue( caption );
+										}
+									},
+									commit : function( data, table )
+									{
+										if ( !this.isEnabled() )
+											return;
+
+										var caption = this.getValue(),
+											captionElement = table.getElementsByTag( 'caption' );
+										if ( caption )
+										{
+											if ( captionElement.count() > 0 )
+											{
+												captionElement = captionElement.getItem( 0 );
+												captionElement.setHtml( '' );
+											}
+											else
+											{
+												captionElement = new CKEDITOR.dom.element( 'caption', editor.document );
+												if ( table.getChildCount() )
+													captionElement.insertBefore( table.getFirst() );
+												else
+													captionElement.appendTo( table );
+											}
+											captionElement.append( new CKEDITOR.dom.text( caption, editor.document ) );
+										}
+										else if ( captionElement.count() > 0 )
+										{
+											for ( var i = captionElement.count() - 1 ; i >= 0 ; i-- )
+												captionElement.getItem( i ).remove();
+										}
+									}
+								},
+								{
+									type : 'text',
+									id : 'txtSummary',
+									label : editor.lang.table.summary,
+									setup : function( selectedTable )
+									{
+										this.setValue( selectedTable.getAttribute( 'summary' ) || '' );
+									},
+									commit : function( data, selectedTable )
+									{
+										if ( this.getValue() )
+											selectedTable.setAttribute( 'summary', this.getValue() );
+										else
+											selectedTable.removeAttribute( 'summary' );
+									}
+								}
+							]
+						}
+					]
+				},
+				dialogadvtab && dialogadvtab.createAdvancedTab( editor )
+			]
+		};
+	}
+
+	CKEDITOR.dialog.add( 'table', function( editor )
+		{
+			return tableDialog( editor, 'table' );
+		} );
+	CKEDITOR.dialog.add( 'tableProperties', function( editor )
+		{
+			return tableDialog( editor, 'tableProperties' );
+		} );
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/table/index.html b/upload/public/js/3rd_party/ckeditor/plugins/table/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/table/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/tableresize/index.html b/upload/public/js/3rd_party/ckeditor/plugins/tableresize/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/tableresize/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/tableresize/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/tableresize/plugin.js
new file mode 100644
index 00000000..4736ceb8
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/tableresize/plugin.js
@@ -0,0 +1,443 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var pxUnit = CKEDITOR.tools.cssLength,
+		needsIEHacks = CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks || CKEDITOR.env.version < 7 );
+
+	function getWidth( el )
+	{
+		return CKEDITOR.env.ie ? el.$.clientWidth : parseInt( el.getComputedStyle( 'width' ), 10 );
+	}
+
+	function getBorderWidth( element, side )
+	{
+		var computed = element.getComputedStyle( 'border-' + side + '-width' ),
+			borderMap =
+			{
+				thin: '0px',
+				medium: '1px',
+				thick: '2px'
+			};
+
+		if ( computed.indexOf( 'px' ) < 0 )
+		{
+			// look up keywords
+			if ( computed in borderMap && element.getComputedStyle( 'border-style' ) != 'none' )
+				computed = borderMap[ computed ];
+			else
+				computed = 0;
+		}
+
+		return parseInt( computed, 10 );
+	}
+
+	// Gets the table row that contains the most columns.
+	function getMasterPillarRow( table )
+	{
+		var $rows = table.$.rows,
+			maxCells = 0, cellsCount,
+			$elected, $tr;
+
+		for ( var i = 0, len = $rows.length ; i < len; i++ )
+		{
+			$tr = $rows[ i ];
+			cellsCount = $tr.cells.length;
+
+			if ( cellsCount > maxCells )
+			{
+				maxCells = cellsCount;
+				$elected = $tr;
+			}
+		}
+
+		return $elected;
+	}
+
+	function buildTableColumnPillars( table )
+	{
+		var pillars = [],
+			pillarIndex = -1,
+			rtl = ( table.getComputedStyle( 'direction' ) == 'rtl' );
+
+		// Get the raw row element that cointains the most columns.
+		var $tr = getMasterPillarRow( table );
+
+		// Get the tbody element and position, which will be used to set the
+		// top and bottom boundaries.
+		var tbody = new CKEDITOR.dom.element( table.$.tBodies[ 0 ] ),
+			tbodyPosition = tbody.getDocumentPosition();
+
+		// Loop thorugh all cells, building pillars after each one of them.
+		for ( var i = 0, len = $tr.cells.length ; i < len ; i++ )
+		{
+			// Both the current cell and the successive one will be used in the
+			// pillar size calculation.
+			var td = new CKEDITOR.dom.element( $tr.cells[ i ] ),
+				nextTd = $tr.cells[ i + 1 ] && new CKEDITOR.dom.element( $tr.cells[ i + 1 ] );
+
+			pillarIndex += td.$.colSpan || 1;
+
+			// Calculate the pillar boundary positions.
+			var pillarLeft, pillarRight, pillarWidth;
+
+			var x = td.getDocumentPosition().x;
+
+			// Calculate positions based on the current cell.
+			rtl ?
+				pillarRight = x + getBorderWidth( td, 'left' ) :
+				pillarLeft  = x + td.$.offsetWidth - getBorderWidth( td, 'right' );
+
+			// Calculate positions based on the next cell, if available.
+			if ( nextTd )
+			{
+				x =  nextTd.getDocumentPosition().x;
+
+				rtl ?
+					pillarLeft	= x + nextTd.$.offsetWidth - getBorderWidth( nextTd, 'right' ) :
+					pillarRight	= x + getBorderWidth( nextTd, 'left' );
+			}
+			// Otherwise calculate positions based on the table (for last cell).
+			else
+			{
+				x =  table.getDocumentPosition().x;
+
+				rtl ?
+					pillarLeft	= x :
+					pillarRight	= x + table.$.offsetWidth;
+			}
+
+			pillarWidth = Math.max( pillarRight - pillarLeft, 3 );
+
+			// The pillar should reflects exactly the shape of the hovered
+			// column border line.
+			pillars.push( {
+				table : table,
+				index : pillarIndex,
+				x : pillarLeft,
+				y : tbodyPosition.y,
+				width : pillarWidth,
+				height : tbody.$.offsetHeight,
+				rtl : rtl } );
+		}
+
+		return pillars;
+	}
+
+	function getPillarAtPosition( pillars, positionX )
+	{
+		for ( var i = 0, len = pillars.length ; i < len ; i++ )
+		{
+			var pillar = pillars[ i ];
+
+			if ( positionX >= pillar.x && positionX <= ( pillar.x + pillar.width ) )
+				return pillar;
+		}
+
+		return null;
+	}
+
+	function cancel( evt )
+	{
+		( evt.data || evt ).preventDefault();
+	}
+
+	function columnResizer( editor )
+	{
+		var pillar,
+			document,
+			resizer,
+			isResizing,
+			startOffset,
+			currentShift;
+
+		var leftSideCells, rightSideCells, leftShiftBoundary, rightShiftBoundary;
+
+		function detach()
+		{
+			pillar = null;
+			currentShift = 0;
+			isResizing = 0;
+
+			document.removeListener( 'mouseup', onMouseUp );
+			resizer.removeListener( 'mousedown', onMouseDown );
+			resizer.removeListener( 'mousemove', onMouseMove );
+
+			document.getBody().setStyle( 'cursor', 'auto' );
+
+			// Hide the resizer (remove it on IE7 - #5890).
+			needsIEHacks ? resizer.remove() : resizer.hide();
+		}
+
+		function resizeStart()
+		{
+			// Before starting to resize, figure out which cells to change
+			// and the boundaries of this resizing shift.
+
+			var columnIndex = pillar.index,
+				map = CKEDITOR.tools.buildTableMap( pillar.table ),
+				leftColumnCells = [],
+				rightColumnCells = [],
+				leftMinSize = Number.MAX_VALUE,
+				rightMinSize = leftMinSize,
+				rtl = pillar.rtl;
+
+			for ( var i = 0, len = map.length ; i < len ; i++ )
+			{
+				var row			= map[ i ],
+					leftCell	= row[ columnIndex + ( rtl ? 1 : 0 ) ],
+					rightCell	= row[ columnIndex + ( rtl ? 0 : 1 ) ];
+
+				leftCell	= leftCell && new CKEDITOR.dom.element( leftCell );
+				rightCell	= rightCell && new CKEDITOR.dom.element( rightCell );
+
+				if ( !leftCell || !rightCell || !leftCell.equals( rightCell ) )
+				{
+					leftCell && ( leftMinSize = Math.min( leftMinSize, getWidth( leftCell ) ) );
+					rightCell && ( rightMinSize = Math.min( rightMinSize, getWidth( rightCell ) ) );
+
+					leftColumnCells.push( leftCell );
+					rightColumnCells.push( rightCell );
+				}
+			}
+
+			// Cache the list of cells to be resized.
+			leftSideCells = leftColumnCells;
+			rightSideCells = rightColumnCells;
+
+			// Cache the resize limit boundaries.
+			leftShiftBoundary =  pillar.x - leftMinSize;
+			rightShiftBoundary = pillar.x + rightMinSize;
+
+			resizer.setOpacity( 0.5 );
+			startOffset = parseInt( resizer.getStyle( 'left' ), 10 );
+			currentShift = 0;
+			isResizing = 1;
+
+			resizer.on( 'mousemove', onMouseMove );
+
+			// Prevent the native drag behavior otherwise 'mousemove' won't fire.
+			document.on( 'dragstart', cancel );
+		}
+
+		function resizeEnd()
+		{
+			isResizing = 0;
+
+			resizer.setOpacity( 0 );
+
+			currentShift && resizeColumn();
+
+			var table = pillar.table;
+			setTimeout( function () { table.removeCustomData( '_cke_table_pillars' ); }, 0 );
+
+			document.removeListener( 'dragstart', cancel );
+		}
+
+		function resizeColumn()
+		{
+			var rtl = pillar.rtl,
+				cellsCount = rtl ? rightSideCells.length : leftSideCells.length;
+
+			// Perform the actual resize to table cells, only for those by side of the pillar.
+			for ( var i = 0 ; i < cellsCount ; i++ )
+			{
+				var leftCell = leftSideCells[ i ],
+					rightCell = rightSideCells[ i ],
+					table = pillar.table;
+
+				// Defer the resizing to avoid any interference among cells.
+				CKEDITOR.tools.setTimeout(
+					function( leftCell, leftOldWidth, rightCell, rightOldWidth, tableWidth, sizeShift )
+					{
+						leftCell && leftCell.setStyle( 'width', pxUnit( Math.max( leftOldWidth + sizeShift, 0 ) ) );
+						rightCell && rightCell.setStyle( 'width', pxUnit( Math.max( rightOldWidth - sizeShift, 0 ) ) );
+
+						// If we're in the last cell, we need to resize the table as well
+						if ( tableWidth )
+							table.setStyle( 'width', pxUnit( tableWidth + sizeShift * ( rtl ? -1 : 1 ) ) );
+					}
+					, 0,
+					this, [
+						leftCell, leftCell && getWidth( leftCell ),
+						rightCell, rightCell && getWidth( rightCell ),
+						( !leftCell || !rightCell ) && ( getWidth( table ) + getBorderWidth( table, 'left' ) + getBorderWidth( table, 'right' ) ),
+						currentShift ] );
+			}
+		}
+
+		function onMouseDown( evt )
+		{
+			cancel( evt );
+
+			resizeStart();
+
+			document.on( 'mouseup', onMouseUp, this );
+		}
+
+		function onMouseUp( evt )
+		{
+			evt.removeListener();
+
+			resizeEnd();
+		}
+
+		function onMouseMove( evt )
+		{
+			move( evt.data.$.clientX );
+		}
+
+		document = editor.document;
+
+		resizer = CKEDITOR.dom.element.createFromHtml(
+			'<div data-cke-temp=1 contenteditable=false unselectable=on '+
+			'style="position:absolute;cursor:col-resize;filter:alpha(opacity=0);opacity:0;' +
+				'padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"></div>', document );
+
+		// Except on IE6/7 (#5890), place the resizer after body to prevent it
+		// from being editable.
+		if ( !needsIEHacks )
+			document.getDocumentElement().append( resizer );
+
+		this.attachTo = function( targetPillar )
+		{
+			// Accept only one pillar at a time.
+			if ( isResizing )
+				return;
+
+			// On IE6/7, we append the resizer everytime we need it. (#5890)
+			if ( needsIEHacks )
+			{
+				document.getBody().append( resizer );
+				currentShift = 0;
+			}
+
+			pillar = targetPillar;
+
+			resizer.setStyles(
+				{
+					width: pxUnit( targetPillar.width ),
+					height : pxUnit( targetPillar.height ),
+					left : pxUnit( targetPillar.x ),
+					top : pxUnit( targetPillar.y )
+				});
+
+			// In IE6/7, it's not possible to have custom cursors for floating
+			// elements in an editable document. Show the resizer in that case,
+			// to give the user a visual clue.
+			needsIEHacks && resizer.setOpacity( 0.25 );
+
+			resizer.on( 'mousedown', onMouseDown, this );
+
+			document.getBody().setStyle( 'cursor', 'col-resize' );
+
+			// Display the resizer to receive events but don't show it,
+			// only change the cursor to resizable shape.
+			resizer.show();
+		};
+
+		var move = this.move = function( posX )
+		{
+			if ( !pillar )
+				return 0;
+
+			if ( !isResizing && ( posX < pillar.x || posX > ( pillar.x + pillar.width ) ) )
+			{
+				detach();
+				return 0;
+			}
+
+			var resizerNewPosition = posX - Math.round( resizer.$.offsetWidth / 2 );
+
+			if ( isResizing )
+			{
+				if ( resizerNewPosition == leftShiftBoundary || resizerNewPosition == rightShiftBoundary )
+					return 1;
+
+				resizerNewPosition = Math.max( resizerNewPosition, leftShiftBoundary );
+				resizerNewPosition = Math.min( resizerNewPosition, rightShiftBoundary );
+
+				currentShift = resizerNewPosition - startOffset;
+			}
+
+			resizer.setStyle( 'left', pxUnit( resizerNewPosition ) );
+
+			return 1;
+		};
+	}
+
+	function clearPillarsCache( evt )
+	{
+		var target = evt.data.getTarget();
+
+		if ( evt.name == 'mouseout' )
+		{
+			// Bypass interal mouse move.
+			if ( !target.is ( 'table' ) )
+				return;
+
+			var dest = new CKEDITOR.dom.element( evt.data.$.relatedTarget || evt.data.$.toElement );
+			while( dest && dest.$ && !dest.equals( target ) && !dest.is( 'body' ) )
+				dest = dest.getParent();
+			if ( !dest || dest.equals( target ) )
+				return;
+		}
+
+		target.getAscendant( 'table', 1 ).removeCustomData( '_cke_table_pillars' );
+		evt.removeListener();
+	}
+
+	CKEDITOR.plugins.add( 'tableresize',
+	{
+		requires : [ 'tabletools' ],
+		init : function( editor )
+		{
+			editor.on( 'contentDom', function()
+			{
+				var resizer;
+
+				editor.document.getBody().on( 'mousemove', function( evt )
+					{
+						evt = evt.data;
+
+						// If we're already attached to a pillar, simply move the
+						// resizer.
+						if ( resizer && resizer.move( evt.$.clientX ) )
+						{
+							cancel( evt );
+							return;
+						}
+
+						// Considering table, tr, td, tbody but nothing else.
+						var target = evt.getTarget(),
+							table,
+							pillars;
+
+						if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', 1 ) )
+							return;
+
+						table = target.getAscendant( 'table', 1 );
+
+						if ( !( pillars = table.getCustomData( '_cke_table_pillars' ) ) )
+						{
+							// Cache table pillars calculation result.
+							table.setCustomData( '_cke_table_pillars', ( pillars = buildTableColumnPillars( table ) ) );
+							table.on( 'mouseout', clearPillarsCache );
+							table.on( 'mousedown', clearPillarsCache );
+						}
+
+						var pillar = getPillarAtPosition( pillars, evt.$.clientX );
+						if ( pillar )
+						{
+							!resizer && ( resizer = new columnResizer( editor ) );
+							resizer.attachTo( pillar );
+						}
+					});
+			});
+		}
+	});
+
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/tableCell.js b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/tableCell.js
new file mode 100644
index 00000000..2c31e361
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -0,0 +1,525 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'cellProperties', function( editor )
+	{
+		var langTable = editor.lang.table,
+			langCell = langTable.cell,
+			langCommon = editor.lang.common,
+			validate = CKEDITOR.dialog.validate,
+			widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,
+			heightPattern = /^(\d+(?:\.\d+)?)px$/,
+			bind = CKEDITOR.tools.bind,
+			spacer = { type : 'html', html : '&nbsp;' },
+			rtl = editor.lang.dir == 'rtl';
+
+		/**
+		 *
+		 * @param dialogName
+		 * @param callback [ childDialog ]
+		 */
+		function getDialogValue( dialogName, callback )
+		{
+			var onOk = function()
+			{
+				releaseHandlers( this );
+				callback( this, this._.parentDialog );
+				this._.parentDialog.changeFocus( true );
+			};
+			var onCancel = function()
+			{
+				releaseHandlers( this );
+				this._.parentDialog.changeFocus();
+			};
+			var releaseHandlers = function( dialog )
+			{
+				dialog.removeListener( 'ok', onOk );
+				dialog.removeListener( 'cancel', onCancel );
+			};
+			var bindToDialog = function( dialog )
+			{
+				dialog.on( 'ok', onOk );
+				dialog.on( 'cancel', onCancel );
+			};
+			editor.execCommand( dialogName );
+			if ( editor._.storedDialogs.colordialog )
+				bindToDialog( editor._.storedDialogs.colordialog );
+			else
+			{
+				CKEDITOR.on( 'dialogDefinition', function( e )
+				{
+					if ( e.data.name != dialogName )
+						return;
+
+					var definition = e.data.definition;
+
+					e.removeListener();
+					definition.onLoad = CKEDITOR.tools.override( definition.onLoad, function( orginal )
+					{
+						return function()
+						{
+							bindToDialog( this );
+							definition.onLoad = orginal;
+							if ( typeof orginal == 'function' )
+								orginal.call( this );
+						};
+					} );
+				});
+			}
+		}
+
+		return {
+			title : langCell.title,
+			minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks? 450 : 410,
+			minHeight : CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks )?  230 : 200,
+			contents : [
+				{
+					id : 'info',
+					label : langCell.title,
+					accessKey : 'I',
+					elements :
+					[
+						{
+							type : 'hbox',
+							widths : [ '40%', '5%', '40%' ],
+							children :
+							[
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'hbox',
+											widths : [ '70%', '30%' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'width',
+													width: '100px',
+													label : langCommon.width,
+													validate : validate[ 'number' ]( langCell.invalidWidth ),
+
+													// Extra labelling of width unit type.
+													onLoad : function()
+													{
+														var widthType = this.getDialog().getContentElement( 'info', 'widthType' ),
+															labelElement = widthType.getElement(),
+															inputElement = this.getInputElement(),
+															ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );
+
+														inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+													},
+
+													setup : function( element )
+													{
+														var widthAttr = parseInt( element.getAttribute( 'width' ), 10 ),
+																widthStyle = parseInt( element.getStyle( 'width' ), 10 );
+
+														!isNaN( widthAttr ) && this.setValue( widthAttr );
+														!isNaN( widthStyle ) && this.setValue( widthStyle );
+													},
+													commit : function( element )
+													{
+														var value = parseInt( this.getValue(), 10 ),
+																unit = this.getDialog().getValueOf( 'info', 'widthType' );
+
+														if ( !isNaN( value ) )
+															element.setStyle( 'width', value + unit );
+														else
+															element.removeStyle( 'width' );
+
+														element.removeAttribute( 'width' );
+													},
+													'default' : ''
+												},
+												{
+													type : 'select',
+													id : 'widthType',
+													label : editor.lang.table.widthUnit,
+													labelStyle: 'visibility:hidden',
+													'default' : 'px',
+													items :
+													[
+														[ langTable.widthPx, 'px' ],
+														[ langTable.widthPc, '%' ]
+													],
+													setup : function( selectedCell )
+													{
+														var widthMatch = widthPattern.exec( selectedCell.getStyle( 'width' ) || selectedCell.getAttribute( 'width' ) );
+														if ( widthMatch )
+															this.setValue( widthMatch[2] );
+													}
+												}
+											]
+										},
+										{
+											type : 'hbox',
+											widths : [ '70%', '30%' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'height',
+													label : langCommon.height,
+													width: '100px',
+													'default' : '',
+													validate : validate[ 'number' ]( langCell.invalidHeight ),
+
+													// Extra labelling of height unit type.
+													onLoad : function()
+													{
+														var heightType = this.getDialog().getContentElement( 'info', 'htmlHeightType' ),
+															labelElement = heightType.getElement(),
+															inputElement = this.getInputElement(),
+															ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );
+
+														inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+													},
+
+													setup : function( element )
+													{
+														var heightAttr = parseInt( element.getAttribute( 'height' ), 10 ),
+																heightStyle = parseInt( element.getStyle( 'height' ), 10 );
+
+														!isNaN( heightAttr ) && this.setValue( heightAttr );
+														!isNaN( heightStyle ) && this.setValue( heightStyle );
+													},
+													commit : function( element )
+													{
+														var value = parseInt( this.getValue(), 10 );
+
+														if ( !isNaN( value ) )
+															element.setStyle( 'height', CKEDITOR.tools.cssLength( value ) );
+														else
+															element.removeStyle( 'height' );
+
+														element.removeAttribute( 'height' );
+													}
+												},
+												{
+													id : 'htmlHeightType',
+													type : 'html',
+													html : '<br />'+ langTable.widthPx
+												}
+											]
+										},
+										spacer,
+										{
+											type : 'select',
+											id : 'wordWrap',
+											label : langCell.wordWrap,
+											'default' : 'yes',
+											items :
+											[
+												[ langCell.yes, 'yes' ],
+												[ langCell.no, 'no' ]
+											],
+											setup : function( element )
+											{
+												var wordWrapAttr = element.getAttribute( 'noWrap' ),
+														wordWrapStyle = element.getStyle( 'white-space' );
+
+												if ( wordWrapStyle == 'nowrap' || wordWrapAttr )
+													this.setValue( 'no' );
+											},
+											commit : function( element )
+											{
+												if ( this.getValue() == 'no' )
+													element.setStyle( 'white-space', 'nowrap' );
+												else
+													element.removeStyle( 'white-space' );
+
+												element.removeAttribute( 'noWrap' );
+											}
+										},
+										spacer,
+										{
+											type : 'select',
+											id : 'hAlign',
+											label : langCell.hAlign,
+											'default' : '',
+											items :
+											[
+												[ langCommon.notSet, '' ],
+												[ langCommon.alignLeft, 'left' ],
+												[ langCommon.alignCenter, 'center' ],
+												[ langCommon.alignRight, 'right' ]
+											],
+											setup : function( element )
+											{
+												var alignAttr = element.getAttribute( 'align' ),
+														textAlignStyle = element.getStyle( 'text-align');
+
+												this.setValue(  textAlignStyle || alignAttr || '' );
+											},
+											commit : function( selectedCell )
+											{
+												var value = this.getValue();
+
+												if ( value )
+													selectedCell.setStyle( 'text-align', value );
+												else
+													selectedCell.removeStyle( 'text-align' );
+
+												selectedCell.removeAttribute( 'align' );
+											}
+										},
+										{
+											type : 'select',
+											id : 'vAlign',
+											label : langCell.vAlign,
+											'default' : '',
+											items :
+											[
+												[ langCommon.notSet, '' ],
+												[ langCommon.alignTop, 'top' ],
+												[ langCommon.alignMiddle, 'middle' ],
+												[ langCommon.alignBottom, 'bottom' ],
+												[ langCell.alignBaseline, 'baseline' ]
+											],
+											setup : function( element )
+											{
+												var vAlignAttr = element.getAttribute( 'vAlign' ),
+														vAlignStyle = element.getStyle( 'vertical-align' );
+
+												switch( vAlignStyle )
+												{
+													// Ignore all other unrelated style values..
+													case 'top':
+													case 'middle':
+													case 'bottom':
+													case 'baseline':
+														break;
+													default:
+														vAlignStyle = '';
+												}
+
+												this.setValue( vAlignStyle || vAlignAttr || '' );
+											},
+											commit : function( element )
+											{
+												var value = this.getValue();
+
+												if ( value )
+													element.setStyle( 'vertical-align', value );
+												else
+													element.removeStyle( 'vertical-align' );
+
+												element.removeAttribute( 'vAlign' );
+											}
+										}
+									]
+								},
+								spacer,
+								{
+									type : 'vbox',
+									padding : 0,
+									children :
+									[
+										{
+											type : 'select',
+											id : 'cellType',
+											label : langCell.cellType,
+											'default' : 'td',
+											items :
+											[
+												[ langCell.data, 'td' ],
+												[ langCell.header, 'th' ]
+											],
+											setup : function( selectedCell )
+											{
+												this.setValue( selectedCell.getName() );
+											},
+											commit : function( selectedCell )
+											{
+												selectedCell.renameNode( this.getValue() );
+											}
+										},
+										spacer,
+										{
+											type : 'text',
+											id : 'rowSpan',
+											label : langCell.rowSpan,
+											'default' : '',
+											validate : validate.integer( langCell.invalidRowSpan ),
+											setup : function( selectedCell )
+											{
+												var attrVal = parseInt( selectedCell.getAttribute( 'rowSpan' ), 10 );
+												if ( attrVal && attrVal  != 1 )
+												 	this.setValue(  attrVal );
+											},
+											commit : function( selectedCell )
+											{
+												var value = parseInt( this.getValue(), 10 );
+												if ( value && value != 1 )
+													selectedCell.setAttribute( 'rowSpan', this.getValue() );
+												else
+													selectedCell.removeAttribute( 'rowSpan' );
+											}
+										},
+										{
+											type : 'text',
+											id : 'colSpan',
+											label : langCell.colSpan,
+											'default' : '',
+											validate : validate.integer( langCell.invalidColSpan ),
+											setup : function( element )
+											{
+												var attrVal = parseInt( element.getAttribute( 'colSpan' ), 10 );
+												if ( attrVal && attrVal  != 1 )
+												 	this.setValue(  attrVal );
+											},
+											commit : function( selectedCell )
+											{
+												var value = parseInt( this.getValue(), 10 );
+												if ( value && value != 1 )
+													selectedCell.setAttribute( 'colSpan', this.getValue() );
+												else
+													selectedCell.removeAttribute( 'colSpan' );
+											}
+										},
+										spacer,
+										{
+											type : 'hbox',
+											padding : 0,
+											widths : [ '60%', '40%' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'bgColor',
+													label : langCell.bgColor,
+													'default' : '',
+													setup : function( element )
+													{
+														var bgColorAttr = element.getAttribute( 'bgColor' ),
+																bgColorStyle = element.getStyle( 'background-color' );
+
+														this.setValue( bgColorStyle || bgColorAttr );
+													},
+													commit : function( selectedCell )
+													{
+														var value = this.getValue();
+
+														if ( value )
+															selectedCell.setStyle( 'background-color', this.getValue() );
+														else
+															selectedCell.removeStyle( 'background-color' );
+
+														selectedCell.removeAttribute( 'bgColor');
+													}
+												},
+												{
+													type : 'button',
+													id : 'bgColorChoose',
+													"class" : 'colorChooser',
+													label : langCell.chooseColor,
+													onLoad : function()
+													{
+														// Stick the element to the bottom (#5587)
+														this.getElement().getParent().setStyle( 'vertical-align', 'bottom' );
+													},
+													onClick : function()
+													{
+														var self = this;
+														getDialogValue( 'colordialog', function( colorDialog )
+														{
+															self.getDialog().getContentElement( 'info', 'bgColor' ).setValue(
+																colorDialog.getContentElement( 'picker', 'selectedColor' ).getValue()
+															);
+														} );
+													}
+												}
+											]
+										},
+										spacer,
+										{
+											type : 'hbox',
+											padding : 0,
+											widths : [ '60%', '40%' ],
+											children :
+											[
+												{
+													type : 'text',
+													id : 'borderColor',
+													label : langCell.borderColor,
+													'default' : '',
+													setup : function( element )
+													{
+														var borderColorAttr = element.getAttribute( 'borderColor' ),
+																borderColorStyle = element.getStyle( 'border-color' );
+
+														this.setValue( borderColorStyle || borderColorAttr );
+													},
+													commit : function( selectedCell )
+													{
+														var value = this.getValue();
+														if ( value )
+															selectedCell.setStyle( 'border-color', this.getValue() );
+														else
+															selectedCell.removeStyle( 'border-color' );
+
+														selectedCell.removeAttribute( 'borderColor');
+													}
+												},
+												{
+													type : 'button',
+													id : 'borderColorChoose',
+													"class" : 'colorChooser',
+													label : langCell.chooseColor,
+													style : ( rtl ? 'margin-right' : 'margin-left' ) + ': 10px',
+													onLoad : function()
+													{
+														// Stick the element to the bottom (#5587)
+														this.getElement().getParent().setStyle( 'vertical-align', 'bottom' );
+													},
+													onClick : function()
+													{
+														var self = this;
+														getDialogValue( 'colordialog', function( colorDialog )
+														{
+															self.getDialog().getContentElement( 'info', 'borderColor' ).setValue(
+																colorDialog.getContentElement( 'picker', 'selectedColor' ).getValue()
+															);
+														} );
+													}
+												}
+											]
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			],
+			onShow : function()
+			{
+				this.cells = CKEDITOR.plugins.tabletools.getSelectedCells(
+					this._.editor.getSelection() );
+				this.setupContent( this.cells[ 0 ] );
+			},
+			onOk : function()
+			{
+				var selection = this._.editor.getSelection(),
+					bookmarks = selection.createBookmarks();
+
+				var cells = this.cells;
+				for ( var i = 0 ; i < cells.length ; i++ )
+					this.commitContent( cells[ i ] );
+
+				selection.selectBookmarks( bookmarks );
+
+				// Force selectionChange event because of alignment style.
+				var firstElement = selection.getStartElement();
+				var currentPath = new CKEDITOR.dom.elementPath( firstElement );
+
+				this._.editor._.selectionPreviousPath = currentPath;
+				this._.editor.fire( 'selectionChange', { selection : selection, path : currentPath, element : firstElement } );
+			}
+		};
+	} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/tabletools/index.html b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/tabletools/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/templates.js b/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/templates.js
new file mode 100644
index 00000000..925c5c9a
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/dialogs/templates.js
@@ -0,0 +1,234 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	var doc = CKEDITOR.document;
+
+	CKEDITOR.dialog.add( 'templates', function( editor )
+		{
+			// Constructs the HTML view of the specified templates data.
+			function renderTemplatesList( container, templatesDefinitions )
+			{
+				// clear loading wait text.
+				container.setHtml( '' );
+
+				for ( var i = 0, totalDefs = templatesDefinitions.length ; i < totalDefs ; i++ )
+				{
+					var definition = CKEDITOR.getTemplates( templatesDefinitions[ i ] ),
+						imagesPath = definition.imagesPath,
+						templates = definition.templates,
+						count = templates.length;
+
+					for ( var j = 0 ; j < count ; j++ )
+					{
+						var template = templates[ j ],
+							item =  createTemplateItem( template, imagesPath );
+						item.setAttribute( 'aria-posinset', j + 1 );
+						item.setAttribute( 'aria-setsize', count );
+						container.append( item );
+					}
+				}
+			}
+
+			function createTemplateItem( template, imagesPath )
+			{
+				var item = CKEDITOR.dom.element.createFromHtml(
+						'<a href="javascript:void(0)" tabIndex="-1" role="option" >' +
+							'<div class="cke_tpl_item"></div>' +
+						'</a>' );
+
+				// Build the inner HTML of our new item DIV.
+				var html = '<table style="width:350px;" class="cke_tpl_preview" role="presentation"><tr>';
+
+				if ( template.image && imagesPath )
+					html += '<td class="cke_tpl_preview_img"><img src="' + CKEDITOR.getUrl( imagesPath + template.image ) + '"' + ( CKEDITOR.env.ie6Compat ? ' onload="this.width=this.width"' : '' ) + ' alt="" title=""></td>';
+
+				html += '<td style="white-space:normal;"><span class="cke_tpl_title">' + template.title + '</span><br/>';
+
+				if ( template.description )
+					html += '<span>' + template.description + '</span>';
+
+				html += '</td></tr></table>';
+
+				item.getFirst().setHtml( html );
+
+				item.on( 'click', function() { insertTemplate( template.html ); } );
+
+				return item;
+			}
+
+			/**
+			 * Insert the specified template content into editor.
+			 * @param {Number} index
+			 */
+			function insertTemplate( html )
+			{
+				var dialog = CKEDITOR.dialog.getCurrent(),
+					isInsert = dialog.getValueOf( 'selectTpl', 'chkInsertOpt' );
+
+				if ( isInsert )
+				{
+					// Everything should happen after the document is loaded (#4073).
+					editor.on( 'contentDom', function( evt )
+					{
+						evt.removeListener();
+						dialog.hide();
+
+						// Place the cursor at the first editable place.
+						var range = new CKEDITOR.dom.range( editor.document );
+						range.moveToElementEditStart( editor.document.getBody() );
+						range.select( 1 );
+						setTimeout( function()
+						{
+							editor.fire( 'saveSnapshot' );
+						}, 0 );
+					});
+
+					editor.fire( 'saveSnapshot' );
+					editor.setData( html );
+				}
+				else
+				{
+					editor.insertHtml( html );
+					dialog.hide();
+				}
+			}
+
+			function keyNavigation( evt )
+			{
+				var target = evt.data.getTarget(),
+						onList = listContainer.equals( target );
+
+				// Keyboard navigation for template list.
+				if (  onList || listContainer.contains( target ) )
+				{
+					var keystroke = evt.data.getKeystroke(),
+						items = listContainer.getElementsByTag( 'a' ),
+						focusItem;
+
+					if ( items )
+					{
+						// Focus not yet onto list items?
+						if ( onList )
+							focusItem = items.getItem( 0 );
+						else
+						{
+							switch ( keystroke )
+							{
+								case 40 :					// ARROW-DOWN
+									focusItem = target.getNext();
+									break;
+
+								case 38 :					// ARROW-UP
+									focusItem = target.getPrevious();
+									break;
+
+								case 13 :					// ENTER
+								case 32 :					// SPACE
+									target.fire( 'click' );
+							}
+						}
+
+						if ( focusItem )
+						{
+							focusItem.focus();
+							evt.data.preventDefault();
+						}
+					}
+				}
+			}
+
+			// Load skin at first.
+			CKEDITOR.skins.load( editor, 'templates' );
+
+			var listContainer;
+
+			var templateListLabelId = 'cke_tpl_list_label_' + CKEDITOR.tools.getNextNumber(),
+				lang = editor.lang.templates,
+				config = editor.config;
+			return {
+				title :editor.lang.templates.title,
+
+				minWidth : CKEDITOR.env.ie ? 440 : 400,
+				minHeight : 340,
+
+				contents :
+				[
+					{
+						id :'selectTpl',
+						label : lang.title,
+						elements :
+						[
+							{
+								type : 'vbox',
+								padding : 5,
+								children :
+								[
+									{
+										id : 'selectTplText',
+										type : 'html',
+										html :
+											'<span>'  +
+												lang.selectPromptMsg +
+											'</span>'
+									},
+									{
+										id : 'templatesList',
+										type : 'html',
+										focus: true,
+										html :
+											'<div class="cke_tpl_list" tabIndex="-1" role="listbox" aria-labelledby="' + templateListLabelId+ '">' +
+												'<div class="cke_tpl_loading"><span></span></div>' +
+											'</div>' +
+											'<span class="cke_voice_label" id="' + templateListLabelId + '">' + lang.options+ '</span>'
+									},
+									{
+										id : 'chkInsertOpt',
+										type : 'checkbox',
+										label : lang.insertOption,
+										'default' : config.templates_replaceContent
+									}
+								]
+							}
+						]
+					}
+				],
+
+				buttons : [ CKEDITOR.dialog.cancelButton ],
+
+				onShow : function()
+				{
+					var templatesListField = this.getContentElement( 'selectTpl' , 'templatesList' );
+					listContainer = templatesListField.getElement();
+
+					CKEDITOR.loadTemplates( config.templates_files, function()
+						{
+							var templates = ( config.templates || 'default' ).split( ',' );
+
+							if ( templates.length )
+							{
+								renderTemplatesList( listContainer, templates );
+								templatesListField.focus();
+							}
+							else
+							{
+								listContainer.setHtml(
+									'<div class="cke_tpl_empty">' +
+										'<span>' + lang.emptyListMsg + '</span>' +
+									'</div>' );
+							}
+						});
+
+					this._.element.on( 'keydown', keyNavigation );
+				},
+
+				onHide : function()
+				{
+					this._.element.removeListener( 'keydown', keyNavigation );
+				}
+			};
+		});
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/index.html b/upload/public/js/3rd_party/ckeditor/plugins/templates/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/default.js b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/default.js
new file mode 100644
index 00000000..c068f2b6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/default.js
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+// Register a templates definition set named "default".
+CKEDITOR.addTemplates( 'default',
+{
+	// The name of sub folder which hold the shortcut preview images of the
+	// templates.
+	imagesPath : CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'templates' ) + 'templates/images/' ),
+
+	// The templates definitions.
+	templates :
+		[
+			{
+				title: 'Image and Title',
+				image: 'template1.gif',
+				description: 'One main image with a title and text that surround the image.',
+				html:
+					'<h3>' +
+						'<img style="margin-right: 10px" height="100" width="100" align="left"/>' +
+						'Type the title here'+
+					'</h3>' +
+					'<p>' +
+						'Type the text here' +
+					'</p>'
+			},
+			{
+				title: 'Strange Template',
+				image: 'template2.gif',
+				description: 'A template that defines two colums, each one with a title, and some text.',
+				html:
+					'<table cellspacing="0" cellpadding="0" style="width:100%" border="0">' +
+						'<tr>' +
+							'<td style="width:50%">' +
+								'<h3>Title 1</h3>' +
+							'</td>' +
+							'<td></td>' +
+							'<td style="width:50%">' +
+								'<h3>Title 2</h3>' +
+							'</td>' +
+						'</tr>' +
+						'<tr>' +
+							'<td>' +
+								'Text 1' +
+							'</td>' +
+							'<td></td>' +
+							'<td>' +
+								'Text 2' +
+							'</td>' +
+						'</tr>' +
+					'</table>' +
+					'<p>' +
+						'More text goes here.' +
+					'</p>'
+			},
+			{
+				title: 'Text and Table',
+				image: 'template3.gif',
+				description: 'A title with some text and a table.',
+				html:
+					'<div style="width: 80%">' +
+						'<h3>' +
+							'Title goes here' +
+						'</h3>' +
+						'<table style="width:150px;float: right" cellspacing="0" cellpadding="0" border="1">' +
+							'<caption style="border:solid 1px black">' +
+								'<strong>Table title</strong>' +
+							'</caption>' +
+							'</tr>' +
+							'<tr>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+							'</tr>' +
+							'<tr>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+							'</tr>' +
+							'<tr>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+								'<td>&nbsp;</td>' +
+							'</tr>' +
+						'</table>' +
+						'<p>' +
+							'Type the text here' +
+						'</p>' +
+					'</div>'
+			}
+		]
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/index.html b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template1.gif b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template1.gif
new file mode 100644
index 00000000..efdabbeb
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template1.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template2.gif b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template2.gif
new file mode 100644
index 00000000..d1cebb3a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template2.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template3.gif b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template3.gif
new file mode 100644
index 00000000..db41cb4f
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/images/template3.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/index.html b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/templates/templates/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/uicolor.js b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/uicolor.js
new file mode 100644
index 00000000..83050d71
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/dialogs/uicolor.js
@@ -0,0 +1,205 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'uicolor', function( editor )
+{
+	var dialog, picker, pickerContents,
+		// Actual UI color value.
+		uiColor = editor.getUiColor(),
+		pickerId = 'cke_uicolor_picker' + CKEDITOR.tools.getNextNumber();
+
+	function setNewPickerColor( color )
+	{
+		// Convert HEX representation to RGB, stripping # char.
+		if ( /^#/.test( color ) )
+			color = window.YAHOO.util.Color.hex2rgb( color.substr( 1 ) );
+		picker.setValue( color, true );
+		// Refresh picker UI.
+		picker.refresh( pickerId );
+	}
+
+	function setNewUiColor( color, force )
+	{
+		if ( force || dialog._.contents.tab1.livePeview.getValue() )
+			editor.setUiColor( color );
+		// Write new config string into textbox.
+		dialog._.contents.tab1.configBox.setValue(
+			'config.uiColor = "#' + picker.get( "hex" ) + '"'
+		);
+	}
+
+	pickerContents =
+	{
+		id : 'yuiColorPicker',
+		type : 'html',
+		html : "<div id='" + pickerId + "' class='cke_uicolor_picker' style='width: 360px; height: 200px; position: relative;'></div>",
+		onLoad : function( event )
+		{
+			var url = CKEDITOR.getUrl(
+					'_source/' + // @Packager.RemoveLine
+					'plugins/uicolor/yui/'
+				);
+
+			// Create new color picker widget.
+			picker = new window.YAHOO.widget.ColorPicker( pickerId,
+				{
+					showhsvcontrols : true,
+					showhexcontrols : true,
+					images :
+					{
+						PICKER_THUMB : url + "assets/picker_thumb.png",
+						HUE_THUMB : url + "assets/hue_thumb.png"
+					}
+				});
+
+			// Set actual UI color to the picker.
+			if ( uiColor )
+				setNewPickerColor( uiColor );
+
+			// Subscribe to the rgbChange event.
+			picker.on( "rgbChange", function()
+				{
+					// Reset predefined box.
+					dialog._.contents.tab1.predefined.setValue( '' );
+					setNewUiColor( '#' + picker.get( 'hex' ) );
+				});
+
+			// Fix input class names.
+			var inputs = new CKEDITOR.dom.nodeList( picker.getElementsByTagName( 'input' ) );
+			for ( var i = 0; i < inputs.count() ; i++ )
+				inputs.getItem( i ).addClass( 'cke_dialog_ui_input_text' );
+		}
+	};
+
+	var skipPreviewChange = true;
+
+	return {
+		title : editor.lang.uicolor.title,
+		minWidth : 360,
+		minHeight : 320,
+		onLoad : function()
+		{
+			dialog = this;
+			this.setupContent();
+
+			// #3808
+			if ( CKEDITOR.env.ie7Compat )
+				dialog.parts.contents.setStyle( 'overflow', 'hidden' );
+		},
+		contents : [
+			{
+				id : 'tab1',
+				label : '',
+				title : '',
+				expand : true,
+				padding : 0,
+				elements : [
+						pickerContents,
+						{
+							id : 'tab1',
+							type : 'vbox',
+							children :
+							[
+								{
+									id : 'livePeview',
+									type : 'checkbox',
+									label : editor.lang.uicolor.preview,
+									'default' : 1,
+									onLoad : function()
+									{
+										skipPreviewChange = true;
+									},
+									onChange : function()
+									{
+										if ( skipPreviewChange )
+											return;
+										var on = this.getValue(),
+											color = on ? '#' + picker.get( 'hex' ) : uiColor;
+										setNewUiColor( color, true );
+									}
+								},
+								{
+									type : 'hbox',
+									children :
+									[
+										{
+											id : 'predefined',
+											type : 'select',
+											'default' : '',
+											label : editor.lang.uicolor.predefined,
+											items :
+											[
+												[ '' ],
+												[ 'Light blue', '#9AB8F3' ],
+												[ 'Sand', '#D2B48C' ],
+												[ 'Metallic', '#949AAA' ],
+												[ 'Purple', '#C2A3C7' ],
+												[ 'Olive', '#A2C980' ],
+												[ 'Happy green', '#9BD446' ],
+												[ 'Jezebel Blue', '#14B8C4' ],
+												[ 'Burn', '#FF893A' ],
+												[ 'Easy red', '#FF6969' ],
+												[ 'Pisces 3', '#48B4F2' ],
+												[ 'Aquarius 5', '#487ED4' ],
+												[ 'Absinthe', '#A8CF76' ],
+												[ 'Scrambled Egg', '#C7A622' ],
+												[ 'Hello monday', '#8E8D80' ],
+												[ 'Lovely sunshine', '#F1E8B1' ],
+												[ 'Recycled air', '#B3C593' ],
+												[ 'Down', '#BCBCA4' ],
+												[ 'Mark Twain', '#CFE91D' ],
+												[ 'Specks of dust', '#D1B596' ],
+												[ 'Lollipop', '#F6CE23' ]
+											],
+											onChange : function()
+											{
+												var color = this.getValue();
+												if ( color )
+												{
+													setNewPickerColor( color );
+													setNewUiColor( color );
+													// Refresh predefined preview box.
+													CKEDITOR.document.getById( 'predefinedPreview' ).setStyle( 'background', color );
+												}
+												else
+													CKEDITOR.document.getById( 'predefinedPreview' ).setStyle( 'background', '' );
+											},
+											onShow : function()
+											{
+												var color = editor.getUiColor();
+												if ( color )
+													this.setValue( color );
+											}
+										},
+										{
+											id : 'predefinedPreview',
+											type : 'html',
+											html : '<div id="cke_uicolor_preview" style="border: 1px solid black; padding: 3px; width: 30px;">' +
+													'<div id="predefinedPreview" style="width: 30px; height: 30px;">&nbsp;</div>' +
+												'</div>'
+										}
+									]
+								},
+								{
+									id : 'configBox',
+									type : 'text',
+									label : editor.lang.uicolor.config,
+									onShow : function()
+									{
+										var color = editor.getUiColor();
+										if ( color )
+											this.setValue(
+												'config.uiColor = "' + color + '"'
+											);
+									}
+								}
+							]
+						}
+					]
+			}
+		],
+		buttons : [ CKEDITOR.dialog.okButton ]
+	};
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/index.html b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/en.js b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/en.js
new file mode 100644
index 00000000..21a29ba3
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/en.js
@@ -0,0 +1,15 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'en',
+{
+	uicolor :
+	{
+		title : 'UI Color Picker',
+		preview : 'Live preview',
+		config : 'Paste this string into your config.js file',
+		predefined : 'Predefined color sets'
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/he.js b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/he.js
new file mode 100644
index 00000000..dcd873ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/he.js
@@ -0,0 +1,15 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'he',
+{
+	uicolor :
+	{
+		title : 'בחירת צבע ממשק משתמש',
+		preview : 'תצוגה מקדימה',
+		config : 'הדבק �ת הטקסט הב� לתוך הקובץ config.js',
+		predefined : 'קבוצות צבעי� מוגדרות מר�ש'
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/index.html b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/lang/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/plugin.js
new file mode 100644
index 00000000..59d7e761
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/plugin.js
@@ -0,0 +1,37 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add( 'uicolor',
+{
+	requires : [ 'dialog' ],
+	lang : [ 'en', 'he' ],
+
+	init : function( editor )
+	{
+		if ( CKEDITOR.env.ie6Compat )
+			return;
+
+		editor.addCommand( 'uicolor', new CKEDITOR.dialogCommand( 'uicolor' ) );
+		editor.ui.addButton( 'UIColor',
+			{
+				label : editor.lang.uicolor.title,
+				command : 'uicolor',
+				icon : this.path + 'uicolor.gif'
+			});
+		CKEDITOR.dialog.add( 'uicolor', this.path + 'dialogs/uicolor.js' );
+
+		// Load YUI js files.
+		CKEDITOR.scriptLoader.load( CKEDITOR.getUrl(
+			'_source/' + // @Packager.RemoveLine
+			'plugins/uicolor/yui/yui.js'
+		));
+
+		// Load YUI css files.
+		editor.element.getDocument().appendStyleSheet( CKEDITOR.getUrl(
+				'_source/' + // @Packager.RemoveLine
+				'plugins/uicolor/yui/assets/yui.css'
+		));
+	}
+} );
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/uicolor.gif b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/uicolor.gif
new file mode 100644
index 00000000..ec33de6e
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/uicolor.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_bg.png b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
new file mode 100644
index 00000000..d9bcdeb5
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_bg.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
new file mode 100644
index 00000000..14d5db48
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/index.html b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_mask.png b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
new file mode 100644
index 00000000..f8d91932
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_mask.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
new file mode 100644
index 00000000..78445a2f
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/yui.css b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/yui.css
new file mode 100644
index 00000000..e7dbd797
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/assets/yui.css
@@ -0,0 +1,15 @@
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+.yui-h-slider,.yui-v-slider{position:relative;}.yui-h-slider .yui-slider-thumb,.yui-v-slider .yui-slider-thumb{position:absolute;cursor:default;}.yui-skin-sam .yui-h-slider{background:url(bg-h.gif) no-repeat 5px 0;height:28px;width:228px;}.yui-skin-sam .yui-h-slider .yui-slider-thumb{top:4px;}.yui-skin-sam .yui-v-slider{background:url(bg-v.gif) no-repeat 12px 0;height:228px;width:48px;}
+
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+.cke_uicolor_picker .yui-picker-panel{background:#e3e3e3;border-color:#888;}.cke_uicolor_picker .yui-picker-panel .hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid #e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000;}.cke_uicolor_picker .yui-picker-panel .bd{background:#e8e8e8;margin:1px;height:200px;}.cke_uicolor_picker .yui-picker-panel .ft{background:#e8e8e8;margin:1px;padding:1px;}.cke_uicolor_picker .yui-picker{position:relative;}.cke_uicolor_picker .yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute;}.cke_uicolor_picker .yui-picker-hue-bg{-moz-outline:none;outline:0 none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png) no-repeat;top:4px;}.cke_uicolor_picker .yui-picker-bg{-moz-outline:none;outline:0 none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png);}*html .cke_uicolor_picker .yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='picker_mask.png',sizingMethod='scale');}.cke_uicolor_picker .yui-picker-mask{position:absolute;z-index:1;top:0;left:0;}.cke_uicolor_picker .yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px;}.cke_uicolor_picker .yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px solid #888;}.cke_uicolor_picker .yui-picker-controls{position:absolute;top:72px;left:226px;font:1em monospace;}.cke_uicolor_picker .yui-picker-controls .hd{background:transparent;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls .bd{height:100px;border-width:0!important;}.cke_uicolor_picker .yui-picker-controls ul{float:left;padding:0 2px 0 0;margin:0;}.cke_uicolor_picker .yui-picker-controls li{padding:2px;list-style:none;margin:0;}.cke_uicolor_picker .yui-picker-controls input{font-size:.85em;width:2.4em;}.cke_uicolor_picker .yui-picker-hex-controls{clear:both;padding:2px;}.cke_uicolor_picker .yui-picker-hex-controls input{width:4.6em;}.cke_uicolor_picker .yui-picker-controls a{font:1em arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000;}
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/index.html b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/yui.js b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/yui.js
new file mode 100644
index 00000000..42ce14ba
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/uicolor/yui/yui.js
@@ -0,0 +1,71 @@
+/*jsl:ignoreall*/
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var A=arguments,E=null,C,B,D;for(C=0;C<A.length;C=C+1){D=(""+A[C]).split(".");E=YAHOO;for(B=(D[0]=="YAHOO")?1:0;B<D.length;B=B+1){E[D[B]]=E[D[B]]||{};E=E[D[B]];}}return E;};YAHOO.log=function(D,A,C){var B=YAHOO.widget.Logger;if(B&&B.log){return B.log(D,A,C);}else{return false;}};YAHOO.register=function(A,E,D){var I=YAHOO.env.modules,B,H,G,F,C;if(!I[A]){I[A]={versions:[],builds:[]};}B=I[A];H=D.version;G=D.build;F=YAHOO.env.listeners;B.name=A;B.version=H;B.build=G;B.versions.push(H);B.builds.push(G);B.mainClass=E;for(C=0;C<F.length;C=C+1){F[C](B);}if(E){E.VERSION=H;E.BUILD=G;}else{YAHOO.log("mainClass is undefined for module "+A,"warn");}};YAHOO.env=YAHOO.env||{modules:[],listeners:[]};YAHOO.env.getVersion=function(A){return YAHOO.env.modules[A]||null;};YAHOO.env.ua=function(){var C={ie:0,opera:0,gecko:0,webkit:0,mobile:null,air:0,caja:0},B=navigator.userAgent,A;if((/KHTML/).test(B)){C.webkit=1;}A=B.match(/AppleWebKit\/([^\s]*)/);if(A&&A[1]){C.webkit=parseFloat(A[1]);if(/ Mobile\//.test(B)){C.mobile="Apple";}else{A=B.match(/NokiaN[^\/]*/);if(A){C.mobile=A[0];}}A=B.match(/AdobeAIR\/([^\s]*)/);if(A){C.air=A[0];}}if(!C.webkit){A=B.match(/Opera[\s\/]([^\s]*)/);if(A&&A[1]){C.opera=parseFloat(A[1]);A=B.match(/Opera Mini[^;]*/);if(A){C.mobile=A[0];}}else{A=B.match(/MSIE\s([^;]*)/);if(A&&A[1]){C.ie=parseFloat(A[1]);}else{A=B.match(/Gecko\/([^\s]*)/);if(A){C.gecko=1;A=B.match(/rv:([^\s\)]*)/);if(A&&A[1]){C.gecko=parseFloat(A[1]);}}}}}A=B.match(/Caja\/([^\s]*)/);if(A&&A[1]){C.caja=parseFloat(A[1]);}return C;}();(function(){YAHOO.namespace("util","widget","example");if("undefined"!==typeof YAHOO_config){var B=YAHOO_config.listener,A=YAHOO.env.listeners,D=true,C;if(B){for(C=0;C<A.length;C=C+1){if(A[C]==B){D=false;break;}}if(D){A.push(B);}}}})();YAHOO.lang=YAHOO.lang||{};(function(){var B=YAHOO.lang,F="[object Array]",C="[object Function]",A=Object.prototype,E=["toString","valueOf"],D={isArray:function(G){return A.toString.apply(G)===F;},isBoolean:function(G){return typeof G==="boolean";},isFunction:function(G){return A.toString.apply(G)===C;},isNull:function(G){return G===null;},isNumber:function(G){return typeof G==="number"&&isFinite(G);},isObject:function(G){return(G&&(typeof G==="object"||B.isFunction(G)))||false;},isString:function(G){return typeof G==="string";},isUndefined:function(G){return typeof G==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(I,H){var G,K,J;for(G=0;G<E.length;G=G+1){K=E[G];J=H[K];if(B.isFunction(J)&&J!=A[K]){I[K]=J;}}}:function(){},extend:function(J,K,I){if(!K||!J){throw new Error("extend failed, please check that "+"all dependencies are included.");}var H=function(){},G;H.prototype=K.prototype;J.prototype=new H();J.prototype.constructor=J;J.superclass=K.prototype;if(K.prototype.constructor==A.constructor){K.prototype.constructor=K;}if(I){for(G in I){if(B.hasOwnProperty(I,G)){J.prototype[G]=I[G];}}B._IEEnumFix(J.prototype,I);}},augmentObject:function(K,J){if(!J||!K){throw new Error("Absorb failed, verify dependencies.");}var G=arguments,I,L,H=G[2];if(H&&H!==true){for(I=2;I<G.length;I=I+1){K[G[I]]=J[G[I]];}}else{for(L in J){if(H||!(L in K)){K[L]=J[L];}}B._IEEnumFix(K,J);}},augmentProto:function(J,I){if(!I||!J){throw new Error("Augment failed, verify dependencies.");}var G=[J.prototype,I.prototype],H;for(H=2;H<arguments.length;H=H+1){G.push(arguments[H]);}B.augmentObject.apply(this,G);},dump:function(G,L){var I,K,N=[],O="{...}",H="f(){...}",M=", ",J=" => ";if(!B.isObject(G)){return G+"";}else{if(G instanceof Date||("nodeType" in G&&"tagName" in G)){return G;}else{if(B.isFunction(G)){return H;}}}L=(B.isNumber(L))?L:3;if(B.isArray(G)){N.push("[");for(I=0,K=G.length;I<K;I=I+1){if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}if(N.length>1){N.pop();}N.push("]");}else{N.push("{");for(I in G){if(B.hasOwnProperty(G,I)){N.push(I+J);if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}}if(N.length>1){N.pop();}N.push("}");}return N.join("");},substitute:function(V,H,O){var L,K,J,R,S,U,Q=[],I,M="dump",P=" ",G="{",T="}",N;for(;;){L=V.lastIndexOf(G);if(L<0){break;}K=V.indexOf(T,L);if(L+1>=K){break;}I=V.substring(L+1,K);R=I;U=null;J=R.indexOf(P);if(J>-1){U=R.substring(J+1);R=R.substring(0,J);}S=H[R];if(O){S=O(R,S,U);}if(B.isObject(S)){if(B.isArray(S)){S=B.dump(S,parseInt(U,10));}else{U=U||"";N=U.indexOf(M);if(N>-1){U=U.substring(4);}if(S.toString===A.toString||N>-1){S=B.dump(S,parseInt(U,10));}else{S=S.toString();}}}else{if(!B.isString(S)&&!B.isNumber(S)){S="~-"+Q.length+"-~";Q[Q.length]=I;}}V=V.substring(0,L)+S+V.substring(K+1);}for(L=Q.length-1;L>=0;L=L-1){V=V.replace(new RegExp("~-"+L+"-~"),"{"+Q[L]+"}","g");}return V;},trim:function(G){try{return G.replace(/^\s+|\s+$/g,"");}catch(H){return G;}},merge:function(){var J={},H=arguments,G=H.length,I;for(I=0;I<G;I=I+1){B.augmentObject(J,H[I],true);}return J;},later:function(N,H,O,J,K){N=N||0;H=H||{};var I=O,M=J,L,G;if(B.isString(O)){I=H[O];}if(!I){throw new TypeError("method undefined");}if(!B.isArray(M)){M=[J];}L=function(){I.apply(H,M);};G=(K)?setInterval(L,N):setTimeout(L,N);return{interval:K,cancel:function(){if(this.interval){clearInterval(G);}else{clearTimeout(G);}}};},isValue:function(G){return(B.isObject(G)||B.isString(G)||B.isNumber(G)||B.isBoolean(G));}};B.hasOwnProperty=(A.hasOwnProperty)?function(G,H){return G&&G.hasOwnProperty(H);}:function(G,H){return !B.isUndefined(G[H])&&G.constructor.prototype[H]!==G[H];};D.augmentObject(B,D,true);YAHOO.util.Lang=B;B.augment=B.augmentProto;YAHOO.augment=B.augmentProto;YAHOO.extend=B.extend;})();YAHOO.register("yahoo",YAHOO,{version:"2.7.0",build:"1796"});(function(){YAHOO.env._id_counter=YAHOO.env._id_counter||0;var E=YAHOO.util,L=YAHOO.lang,m=YAHOO.env.ua,A=YAHOO.lang.trim,d={},h={},N=/^t(?:able|d|h)$/i,X=/color$/i,K=window.document,W=K.documentElement,e="ownerDocument",n="defaultView",v="documentElement",t="compatMode",b="offsetLeft",P="offsetTop",u="offsetParent",Z="parentNode",l="nodeType",C="tagName",O="scrollLeft",i="scrollTop",Q="getBoundingClientRect",w="getComputedStyle",a="currentStyle",M="CSS1Compat",c="BackCompat",g="class",F="className",J="",B=" ",s="(?:^|\\s)",k="(?= |$)",U="g",p="position",f="fixed",V="relative",j="left",o="top",r="medium",q="borderLeftWidth",R="borderTopWidth",D=m.opera,I=m.webkit,H=m.gecko,T=m.ie;E.Dom={CUSTOM_ATTRIBUTES:(!W.hasAttribute)?{"for":"htmlFor","class":F}:{"htmlFor":"for","className":g},get:function(y){var AA,Y,z,x,G;if(y){if(y[l]||y.item){return y;}if(typeof y==="string"){AA=y;y=K.getElementById(y);if(y&&y.id===AA){return y;}else{if(y&&K.all){y=null;Y=K.all[AA];for(x=0,G=Y.length;x<G;++x){if(Y[x].id===AA){return Y[x];}}}}return y;}if(y.DOM_EVENTS){y=y.get("element");}if("length" in y){z=[];for(x=0,G=y.length;x<G;++x){z[z.length]=E.Dom.get(y[x]);}return z;}return y;}return null;},getComputedStyle:function(G,Y){if(window[w]){return G[e][n][w](G,null)[Y];}else{if(G[a]){return E.Dom.IE_ComputedStyle.get(G,Y);}}},getStyle:function(G,Y){return E.Dom.batch(G,E.Dom._getStyle,Y);},_getStyle:function(){if(window[w]){return function(G,y){y=(y==="float")?y="cssFloat":E.Dom._toCamel(y);var x=G.style[y],Y;if(!x){Y=G[e][n][w](G,null);if(Y){x=Y[y];}}return x;};}else{if(W[a]){return function(G,y){var x;switch(y){case"opacity":x=100;try{x=G.filters["DXImageTransform.Microsoft.Alpha"].opacity;}catch(z){try{x=G.filters("alpha").opacity;}catch(Y){}}return x/100;case"float":y="styleFloat";default:y=E.Dom._toCamel(y);x=G[a]?G[a][y]:null;return(G.style[y]||x);}};}}}(),setStyle:function(G,Y,x){E.Dom.batch(G,E.Dom._setStyle,{prop:Y,val:x});},_setStyle:function(){if(T){return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){switch(x){case"opacity":if(L.isString(Y.style.filter)){Y.style.filter="alpha(opacity="+y*100+")";if(!Y[a]||!Y[a].hasLayout){Y.style.zoom=1;}}break;case"float":x="styleFloat";default:Y.style[x]=y;}}else{}};}else{return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){if(x=="float"){x="cssFloat";}Y.style[x]=y;}else{}};}}(),getXY:function(G){return E.Dom.batch(G,E.Dom._getXY);},_canPosition:function(G){return(E.Dom._getStyle(G,"display")!=="none"&&E.Dom._inDoc(G));},_getXY:function(){if(K[v][Q]){return function(y){var z,Y,AA,AF,AE,AD,AC,G,x,AB=Math.floor,AG=false;if(E.Dom._canPosition(y)){AA=y[Q]();AF=y[e];z=E.Dom.getDocumentScrollLeft(AF);Y=E.Dom.getDocumentScrollTop(AF);AG=[AB(AA[j]),AB(AA[o])];if(T&&m.ie<8){AE=2;AD=2;AC=AF[t];G=S(AF[v],q);x=S(AF[v],R);if(m.ie===6){if(AC!==c){AE=0;AD=0;}}if((AC==c)){if(G!==r){AE=parseInt(G,10);}if(x!==r){AD=parseInt(x,10);}}AG[0]-=AE;AG[1]-=AD;}if((Y||z)){AG[0]+=z;AG[1]+=Y;}AG[0]=AB(AG[0]);AG[1]=AB(AG[1]);}else{}return AG;};}else{return function(y){var x,Y,AA,AB,AC,z=false,G=y;if(E.Dom._canPosition(y)){z=[y[b],y[P]];x=E.Dom.getDocumentScrollLeft(y[e]);Y=E.Dom.getDocumentScrollTop(y[e]);AC=((H||m.webkit>519)?true:false);while((G=G[u])){z[0]+=G[b];z[1]+=G[P];if(AC){z=E.Dom._calcBorders(G,z);}}if(E.Dom._getStyle(y,p)!==f){G=y;while((G=G[Z])&&G[C]){AA=G[i];AB=G[O];if(H&&(E.Dom._getStyle(G,"overflow")!=="visible")){z=E.Dom._calcBorders(G,z);}if(AA||AB){z[0]-=AB;z[1]-=AA;}}z[0]+=x;z[1]+=Y;}else{if(D){z[0]-=x;z[1]-=Y;}else{if(I||H){z[0]+=x;z[1]+=Y;}}}z[0]=Math.floor(z[0]);z[1]=Math.floor(z[1]);}else{}return z;};}}(),getX:function(G){var Y=function(x){return E.Dom.getXY(x)[0];};return E.Dom.batch(G,Y,E.Dom,true);},getY:function(G){var Y=function(x){return E.Dom.getXY(x)[1];};return E.Dom.batch(G,Y,E.Dom,true);},setXY:function(G,x,Y){E.Dom.batch(G,E.Dom._setXY,{pos:x,noRetry:Y});},_setXY:function(G,z){var AA=E.Dom._getStyle(G,p),y=E.Dom.setStyle,AD=z.pos,Y=z.noRetry,AB=[parseInt(E.Dom.getComputedStyle(G,j),10),parseInt(E.Dom.getComputedStyle(G,o),10)],AC,x;if(AA=="static"){AA=V;y(G,p,AA);}AC=E.Dom._getXY(G);if(!AD||AC===false){return false;}if(isNaN(AB[0])){AB[0]=(AA==V)?0:G[b];}if(isNaN(AB[1])){AB[1]=(AA==V)?0:G[P];}if(AD[0]!==null){y(G,j,AD[0]-AC[0]+AB[0]+"px");}if(AD[1]!==null){y(G,o,AD[1]-AC[1]+AB[1]+"px");}if(!Y){x=E.Dom._getXY(G);if((AD[0]!==null&&x[0]!=AD[0])||(AD[1]!==null&&x[1]!=AD[1])){E.Dom._setXY(G,{pos:AD,noRetry:true});}}},setX:function(Y,G){E.Dom.setXY(Y,[G,null]);},setY:function(G,Y){E.Dom.setXY(G,[null,Y]);},getRegion:function(G){var Y=function(x){var y=false;if(E.Dom._canPosition(x)){y=E.Region.getRegion(x);}else{}return y;};return E.Dom.batch(G,Y,E.Dom,true);},getClientWidth:function(){return E.Dom.getViewportWidth();},getClientHeight:function(){return E.Dom.getViewportHeight();},getElementsByClassName:function(AB,AF,AC,AE,x,AD){AB=L.trim(AB);AF=AF||"*";AC=(AC)?E.Dom.get(AC):null||K;if(!AC){return[];}var Y=[],G=AC.getElementsByTagName(AF),z=E.Dom.hasClass;for(var y=0,AA=G.length;y<AA;++y){if(z(G[y],AB)){Y[Y.length]=G[y];}}if(AE){E.Dom.batch(Y,AE,x,AD);}return Y;},hasClass:function(Y,G){return E.Dom.batch(Y,E.Dom._hasClass,G);},_hasClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(Y.exec){G=Y.test(y);}else{G=Y&&(B+y+B).indexOf(B+Y+B)>-1;}}else{}return G;},addClass:function(Y,G){return E.Dom.batch(Y,E.Dom._addClass,G);},_addClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(!E.Dom._hasClass(x,Y)){E.Dom.setAttribute(x,F,A(y+B+Y));G=true;}}else{}return G;},removeClass:function(Y,G){return E.Dom.batch(Y,E.Dom._removeClass,G);},_removeClass:function(y,x){var Y=false,AA,z,G;if(y&&x){AA=E.Dom.getAttribute(y,F)||J;E.Dom.setAttribute(y,F,AA.replace(E.Dom._getClassRegex(x),J));z=E.Dom.getAttribute(y,F);if(AA!==z){E.Dom.setAttribute(y,F,A(z));Y=true;if(E.Dom.getAttribute(y,F)===""){G=(y.hasAttribute&&y.hasAttribute(g))?g:F;y.removeAttribute(G);}}}else{}return Y;},replaceClass:function(x,Y,G){return E.Dom.batch(x,E.Dom._replaceClass,{from:Y,to:G});
+},_replaceClass:function(y,x){var Y,AB,AA,G=false,z;if(y&&x){AB=x.from;AA=x.to;if(!AA){G=false;}else{if(!AB){G=E.Dom._addClass(y,x.to);}else{if(AB!==AA){z=E.Dom.getAttribute(y,F)||J;Y=(B+z.replace(E.Dom._getClassRegex(AB),B+AA)).split(E.Dom._getClassRegex(AA));Y.splice(1,0,B+AA);E.Dom.setAttribute(y,F,A(Y.join(J)));G=true;}}}}else{}return G;},generateId:function(G,x){x=x||"yui-gen";var Y=function(y){if(y&&y.id){return y.id;}var z=x+YAHOO.env._id_counter++;if(y){if(y[e].getElementById(z)){return E.Dom.generateId(y,z+x);}y.id=z;}return z;};return E.Dom.batch(G,Y,E.Dom,true)||Y.apply(E.Dom,arguments);},isAncestor:function(Y,x){Y=E.Dom.get(Y);x=E.Dom.get(x);var G=false;if((Y&&x)&&(Y[l]&&x[l])){if(Y.contains&&Y!==x){G=Y.contains(x);}else{if(Y.compareDocumentPosition){G=!!(Y.compareDocumentPosition(x)&16);}}}else{}return G;},inDocument:function(G,Y){return E.Dom._inDoc(E.Dom.get(G),Y);},_inDoc:function(Y,x){var G=false;if(Y&&Y[C]){x=x||Y[e];G=E.Dom.isAncestor(x[v],Y);}else{}return G;},getElementsBy:function(Y,AF,AB,AD,y,AC,AE){AF=AF||"*";AB=(AB)?E.Dom.get(AB):null||K;if(!AB){return[];}var x=[],G=AB.getElementsByTagName(AF);for(var z=0,AA=G.length;z<AA;++z){if(Y(G[z])){if(AE){x=G[z];break;}else{x[x.length]=G[z];}}}if(AD){E.Dom.batch(x,AD,y,AC);}return x;},getElementBy:function(x,G,Y){return E.Dom.getElementsBy(x,G,Y,null,null,null,true);},batch:function(x,AB,AA,z){var y=[],Y=(z)?AA:window;x=(x&&(x[C]||x.item))?x:E.Dom.get(x);if(x&&AB){if(x[C]||x.length===undefined){return AB.call(Y,x,AA);}for(var G=0;G<x.length;++G){y[y.length]=AB.call(Y,x[G],AA);}}else{return false;}return y;},getDocumentHeight:function(){var Y=(K[t]!=M||I)?K.body.scrollHeight:W.scrollHeight,G=Math.max(Y,E.Dom.getViewportHeight());return G;},getDocumentWidth:function(){var Y=(K[t]!=M||I)?K.body.scrollWidth:W.scrollWidth,G=Math.max(Y,E.Dom.getViewportWidth());return G;},getViewportHeight:function(){var G=self.innerHeight,Y=K[t];if((Y||T)&&!D){G=(Y==M)?W.clientHeight:K.body.clientHeight;}return G;},getViewportWidth:function(){var G=self.innerWidth,Y=K[t];if(Y||T){G=(Y==M)?W.clientWidth:K.body.clientWidth;}return G;},getAncestorBy:function(G,Y){while((G=G[Z])){if(E.Dom._testElement(G,Y)){return G;}}return null;},getAncestorByClassName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return E.Dom.hasClass(y,G);};return E.Dom.getAncestorBy(Y,x);},getAncestorByTagName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return y[C]&&y[C].toUpperCase()==G.toUpperCase();};return E.Dom.getAncestorBy(Y,x);},getPreviousSiblingBy:function(G,Y){while(G){G=G.previousSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getPreviousSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getPreviousSiblingBy(G);},getNextSiblingBy:function(G,Y){while(G){G=G.nextSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getNextSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getNextSiblingBy(G);},getFirstChildBy:function(G,x){var Y=(E.Dom._testElement(G.firstChild,x))?G.firstChild:null;return Y||E.Dom.getNextSiblingBy(G.firstChild,x);},getFirstChild:function(G,Y){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getFirstChildBy(G);},getLastChildBy:function(G,x){if(!G){return null;}var Y=(E.Dom._testElement(G.lastChild,x))?G.lastChild:null;return Y||E.Dom.getPreviousSiblingBy(G.lastChild,x);},getLastChild:function(G){G=E.Dom.get(G);return E.Dom.getLastChildBy(G);},getChildrenBy:function(Y,y){var x=E.Dom.getFirstChildBy(Y,y),G=x?[x]:[];E.Dom.getNextSiblingBy(x,function(z){if(!y||y(z)){G[G.length]=z;}return false;});return G;},getChildren:function(G){G=E.Dom.get(G);if(!G){}return E.Dom.getChildrenBy(G);},getDocumentScrollLeft:function(G){G=G||K;return Math.max(G[v].scrollLeft,G.body.scrollLeft);},getDocumentScrollTop:function(G){G=G||K;return Math.max(G[v].scrollTop,G.body.scrollTop);},insertBefore:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}return G[Z].insertBefore(Y,G);},insertAfter:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}if(G.nextSibling){return G[Z].insertBefore(Y,G.nextSibling);}else{return G[Z].appendChild(Y);}},getClientRegion:function(){var x=E.Dom.getDocumentScrollTop(),Y=E.Dom.getDocumentScrollLeft(),y=E.Dom.getViewportWidth()+Y,G=E.Dom.getViewportHeight()+x;return new E.Region(x,y,G,Y);},setAttribute:function(Y,G,x){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;Y.setAttribute(G,x);},getAttribute:function(Y,G){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;return Y.getAttribute(G);},_toCamel:function(Y){var x=d;function G(y,z){return z.toUpperCase();}return x[Y]||(x[Y]=Y.indexOf("-")===-1?Y:Y.replace(/-([a-z])/gi,G));},_getClassRegex:function(Y){var G;if(Y!==undefined){if(Y.exec){G=Y;}else{G=h[Y];if(!G){Y=Y.replace(E.Dom._patterns.CLASS_RE_TOKENS,"\\$1");G=h[Y]=new RegExp(s+Y+k,U);}}}return G;},_patterns:{ROOT_TAG:/^body|html$/i,CLASS_RE_TOKENS:/([\.\(\)\^\$\*\+\?\|\[\]\{\}])/g},_testElement:function(G,Y){return G&&G[l]==1&&(!Y||Y(G));},_calcBorders:function(x,y){var Y=parseInt(E.Dom[w](x,R),10)||0,G=parseInt(E.Dom[w](x,q),10)||0;if(H){if(N.test(x[C])){Y=0;G=0;}}y[0]+=G;y[1]+=Y;return y;}};var S=E.Dom[w];if(m.opera){E.Dom[w]=function(Y,G){var x=S(Y,G);if(X.test(G)){x=E.Dom.Color.toRGB(x);}return x;};}if(m.webkit){E.Dom[w]=function(Y,G){var x=S(Y,G);if(x==="rgba(0, 0, 0, 0)"){x="transparent";}return x;};}})();YAHOO.util.Region=function(C,D,A,B){this.top=C;this.y=C;this[1]=C;this.right=D;this.bottom=A;this.left=B;this.x=B;this[0]=B;this.width=this.right-this.left;this.height=this.bottom-this.top;};YAHOO.util.Region.prototype.contains=function(A){return(A.left>=this.left&&A.right<=this.right&&A.top>=this.top&&A.bottom<=this.bottom);};YAHOO.util.Region.prototype.getArea=function(){return((this.bottom-this.top)*(this.right-this.left));};YAHOO.util.Region.prototype.intersect=function(E){var C=Math.max(this.top,E.top),D=Math.min(this.right,E.right),A=Math.min(this.bottom,E.bottom),B=Math.max(this.left,E.left);if(A>=C&&D>=B){return new YAHOO.util.Region(C,D,A,B);
+}else{return null;}};YAHOO.util.Region.prototype.union=function(E){var C=Math.min(this.top,E.top),D=Math.max(this.right,E.right),A=Math.max(this.bottom,E.bottom),B=Math.min(this.left,E.left);return new YAHOO.util.Region(C,D,A,B);};YAHOO.util.Region.prototype.toString=function(){return("Region {"+"top: "+this.top+", right: "+this.right+", bottom: "+this.bottom+", left: "+this.left+", height: "+this.height+", width: "+this.width+"}");};YAHOO.util.Region.getRegion=function(D){var F=YAHOO.util.Dom.getXY(D),C=F[1],E=F[0]+D.offsetWidth,A=F[1]+D.offsetHeight,B=F[0];return new YAHOO.util.Region(C,E,A,B);};YAHOO.util.Point=function(A,B){if(YAHOO.lang.isArray(A)){B=A[1];A=A[0];}YAHOO.util.Point.superclass.constructor.call(this,B,A,B,A);};YAHOO.extend(YAHOO.util.Point,YAHOO.util.Region);(function(){var B=YAHOO.util,A="clientTop",F="clientLeft",J="parentNode",K="right",W="hasLayout",I="px",U="opacity",L="auto",D="borderLeftWidth",G="borderTopWidth",P="borderRightWidth",V="borderBottomWidth",S="visible",Q="transparent",N="height",E="width",H="style",T="currentStyle",R=/^width|height$/,O=/^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz|%){1}?/i,M={get:function(X,Z){var Y="",a=X[T][Z];if(Z===U){Y=B.Dom.getStyle(X,U);}else{if(!a||(a.indexOf&&a.indexOf(I)>-1)){Y=a;}else{if(B.Dom.IE_COMPUTED[Z]){Y=B.Dom.IE_COMPUTED[Z](X,Z);}else{if(O.test(a)){Y=B.Dom.IE.ComputedStyle.getPixel(X,Z);}else{Y=a;}}}}return Y;},getOffset:function(Z,e){var b=Z[T][e],X=e.charAt(0).toUpperCase()+e.substr(1),c="offset"+X,Y="pixel"+X,a="",d;if(b==L){d=Z[c];if(d===undefined){a=0;}a=d;if(R.test(e)){Z[H][e]=d;if(Z[c]>d){a=d-(Z[c]-d);}Z[H][e]=L;}}else{if(!Z[H][Y]&&!Z[H][e]){Z[H][e]=b;}a=Z[H][Y];}return a+I;},getBorderWidth:function(X,Z){var Y=null;if(!X[T][W]){X[H].zoom=1;}switch(Z){case G:Y=X[A];break;case V:Y=X.offsetHeight-X.clientHeight-X[A];break;case D:Y=X[F];break;case P:Y=X.offsetWidth-X.clientWidth-X[F];break;}return Y+I;},getPixel:function(Y,X){var a=null,b=Y[T][K],Z=Y[T][X];Y[H][K]=Z;a=Y[H].pixelRight;Y[H][K]=b;return a+I;},getMargin:function(Y,X){var Z;if(Y[T][X]==L){Z=0+I;}else{Z=B.Dom.IE.ComputedStyle.getPixel(Y,X);}return Z;},getVisibility:function(Y,X){var Z;while((Z=Y[T])&&Z[X]=="inherit"){Y=Y[J];}return(Z)?Z[X]:S;},getColor:function(Y,X){return B.Dom.Color.toRGB(Y[T][X])||Q;},getBorderColor:function(Y,X){var Z=Y[T],a=Z[X]||Z.color;return B.Dom.Color.toRGB(B.Dom.Color.toHex(a));}},C={};C.top=C.right=C.bottom=C.left=C[E]=C[N]=M.getOffset;C.color=M.getColor;C[G]=C[P]=C[V]=C[D]=M.getBorderWidth;C.marginTop=C.marginRight=C.marginBottom=C.marginLeft=M.getMargin;C.visibility=M.getVisibility;C.borderColor=C.borderTopColor=C.borderRightColor=C.borderBottomColor=C.borderLeftColor=M.getBorderColor;B.Dom.IE_COMPUTED=C;B.Dom.IE_ComputedStyle=M;})();(function(){var C="toString",A=parseInt,B=RegExp,D=YAHOO.util;D.Dom.Color={KEYWORDS:{black:"000",silver:"c0c0c0",gray:"808080",white:"fff",maroon:"800000",red:"f00",purple:"800080",fuchsia:"f0f",green:"008000",lime:"0f0",olive:"808000",yellow:"ff0",navy:"000080",blue:"00f",teal:"008080",aqua:"0ff"},re_RGB:/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i,re_hex:/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i,re_hex3:/([0-9A-F])/gi,toRGB:function(E){if(!D.Dom.Color.re_RGB.test(E)){E=D.Dom.Color.toHex(E);}if(D.Dom.Color.re_hex.exec(E)){E="rgb("+[A(B.$1,16),A(B.$2,16),A(B.$3,16)].join(", ")+")";}return E;},toHex:function(H){H=D.Dom.Color.KEYWORDS[H]||H;if(D.Dom.Color.re_RGB.exec(H)){var G=(B.$1.length===1)?"0"+B.$1:Number(B.$1),F=(B.$2.length===1)?"0"+B.$2:Number(B.$2),E=(B.$3.length===1)?"0"+B.$3:Number(B.$3);H=[G[C](16),F[C](16),E[C](16)].join("");}if(H.length<6){H=H.replace(D.Dom.Color.re_hex3,"$1$1");}if(H!=="transparent"&&H.indexOf("#")<0){H="#"+H;}return H.toLowerCase();}};}());YAHOO.register("dom",YAHOO.util.Dom,{version:"2.7.0",build:"1796"});YAHOO.util.CustomEvent=function(D,C,B,A){this.type=D;this.scope=C||window;this.silent=B;this.signature=A||YAHOO.util.CustomEvent.LIST;this.subscribers=[];if(!this.silent){}var E="_YUICEOnSubscribe";if(D!==E){this.subscribeEvent=new YAHOO.util.CustomEvent(E,this,true);}this.lastError=null;};YAHOO.util.CustomEvent.LIST=0;YAHOO.util.CustomEvent.FLAT=1;YAHOO.util.CustomEvent.prototype={subscribe:function(A,B,C){if(!A){throw new Error("Invalid callback for subscriber to '"+this.type+"'");}if(this.subscribeEvent){this.subscribeEvent.fire(A,B,C);}this.subscribers.push(new YAHOO.util.Subscriber(A,B,C));},unsubscribe:function(D,F){if(!D){return this.unsubscribeAll();}var E=false;for(var B=0,A=this.subscribers.length;B<A;++B){var C=this.subscribers[B];if(C&&C.contains(D,F)){this._delete(B);E=true;}}return E;},fire:function(){this.lastError=null;var K=[],E=this.subscribers.length;if(!E&&this.silent){return true;}var I=[].slice.call(arguments,0),G=true,D,J=false;if(!this.silent){}var C=this.subscribers.slice(),A=YAHOO.util.Event.throwErrors;for(D=0;D<E;++D){var M=C[D];if(!M){J=true;}else{if(!this.silent){}var L=M.getScope(this.scope);if(this.signature==YAHOO.util.CustomEvent.FLAT){var B=null;if(I.length>0){B=I[0];}try{G=M.fn.call(L,B,M.obj);}catch(F){this.lastError=F;if(A){throw F;}}}else{try{G=M.fn.call(L,this.type,I,M.obj);}catch(H){this.lastError=H;if(A){throw H;}}}if(false===G){if(!this.silent){}break;}}}return(G!==false);},unsubscribeAll:function(){var A=this.subscribers.length,B;for(B=A-1;B>-1;B--){this._delete(B);}this.subscribers=[];return A;},_delete:function(A){var B=this.subscribers[A];if(B){delete B.fn;delete B.obj;}this.subscribers.splice(A,1);},toString:function(){return"CustomEvent: "+"'"+this.type+"', "+"context: "+this.scope;}};YAHOO.util.Subscriber=function(A,B,C){this.fn=A;this.obj=YAHOO.lang.isUndefined(B)?null:B;this.overrideContext=C;};YAHOO.util.Subscriber.prototype.getScope=function(A){if(this.overrideContext){if(this.overrideContext===true){return this.obj;}else{return this.overrideContext;}}return A;};YAHOO.util.Subscriber.prototype.contains=function(A,B){if(B){return(this.fn==A&&this.obj==B);}else{return(this.fn==A);}};YAHOO.util.Subscriber.prototype.toString=function(){return"Subscriber { obj: "+this.obj+", overrideContext: "+(this.overrideContext||"no")+" }";};if(!YAHOO.util.Event){YAHOO.util.Event=function(){var H=false;var I=[];var J=[];var G=[];var E=[];var C=0;var F=[];var B=[];var A=0;var D={63232:38,63233:40,63234:37,63235:39,63276:33,63277:34,25:9};var K=YAHOO.env.ua.ie?"focusin":"focus";var L=YAHOO.env.ua.ie?"focusout":"blur";return{POLL_RETRYS:2000,POLL_INTERVAL:20,EL:0,TYPE:1,FN:2,WFN:3,UNLOAD_OBJ:3,ADJ_SCOPE:4,OBJ:5,OVERRIDE:6,lastError:null,isSafari:YAHOO.env.ua.webkit,webkit:YAHOO.env.ua.webkit,isIE:YAHOO.env.ua.ie,_interval:null,_dri:null,DOMReady:false,throwErrors:false,startInterval:function(){if(!this._interval){var M=this;var N=function(){M._tryPreloadAttach();};this._interval=setInterval(N,this.POLL_INTERVAL);}},onAvailable:function(S,O,Q,R,P){var M=(YAHOO.lang.isString(S))?[S]:S;for(var N=0;N<M.length;N=N+1){F.push({id:M[N],fn:O,obj:Q,overrideContext:R,checkReady:P});}C=this.POLL_RETRYS;this.startInterval();},onContentReady:function(P,M,N,O){this.onAvailable(P,M,N,O,true);},onDOMReady:function(M,N,O){if(this.DOMReady){setTimeout(function(){var P=window;if(O){if(O===true){P=N;}else{P=O;}}M.call(P,"DOMReady",[],N);},0);}else{this.DOMReadyEvent.subscribe(M,N,O);}},_addListener:function(O,M,Y,S,W,b){if(!Y||!Y.call){return false;}if(this._isValidCollection(O)){var Z=true;for(var T=0,V=O.length;T<V;++T){Z=this.on(O[T],M,Y,S,W)&&Z;}return Z;}else{if(YAHOO.lang.isString(O)){var R=this.getEl(O);if(R){O=R;}else{this.onAvailable(O,function(){YAHOO.util.Event.on(O,M,Y,S,W);});return true;}}}if(!O){return false;}if("unload"==M&&S!==this){J[J.length]=[O,M,Y,S,W];return true;}var N=O;if(W){if(W===true){N=S;}else{N=W;}}var P=function(c){return Y.call(N,YAHOO.util.Event.getEvent(c,O),S);};var a=[O,M,Y,P,N,S,W];var U=I.length;I[U]=a;if(this.useLegacyEvent(O,M)){var Q=this.getLegacyIndex(O,M);if(Q==-1||O!=G[Q][0]){Q=G.length;B[O.id+M]=Q;G[Q]=[O,M,O["on"+M]];E[Q]=[];O["on"+M]=function(c){YAHOO.util.Event.fireLegacyEvent(YAHOO.util.Event.getEvent(c),Q);};}E[Q].push(a);}else{try{this._simpleAdd(O,M,P,b);}catch(X){this.lastError=X;this.removeListener(O,M,Y);return false;}}return true;},addListener:function(N,Q,M,O,P){return this._addListener(N,Q,M,O,P,false);},addFocusListener:function(N,M,O,P){return this._addListener(N,K,M,O,P,true);},removeFocusListener:function(N,M){return this.removeListener(N,K,M);},addBlurListener:function(N,M,O,P){return this._addListener(N,L,M,O,P,true);},removeBlurListener:function(N,M){return this.removeListener(N,L,M);},fireLegacyEvent:function(R,P){var T=true,M,V,U,N,S;V=E[P].slice();for(var O=0,Q=V.length;O<Q;++O){U=V[O];if(U&&U[this.WFN]){N=U[this.ADJ_SCOPE];S=U[this.WFN].call(N,R);T=(T&&S);}}M=G[P];if(M&&M[2]){M[2](R);}return T;},getLegacyIndex:function(N,O){var M=this.generateId(N)+O;if(typeof B[M]=="undefined"){return -1;}else{return B[M];}},useLegacyEvent:function(M,N){return(this.webkit&&this.webkit<419&&("click"==N||"dblclick"==N));},removeListener:function(N,M,V){var Q,T,X;if(typeof N=="string"){N=this.getEl(N);}else{if(this._isValidCollection(N)){var W=true;for(Q=N.length-1;Q>-1;Q--){W=(this.removeListener(N[Q],M,V)&&W);}return W;}}if(!V||!V.call){return this.purgeElement(N,false,M);}if("unload"==M){for(Q=J.length-1;Q>-1;Q--){X=J[Q];if(X&&X[0]==N&&X[1]==M&&X[2]==V){J.splice(Q,1);return true;}}return false;}var R=null;var S=arguments[3];if("undefined"===typeof S){S=this._getCacheIndex(N,M,V);}if(S>=0){R=I[S];}if(!N||!R){return false;}if(this.useLegacyEvent(N,M)){var P=this.getLegacyIndex(N,M);var O=E[P];if(O){for(Q=0,T=O.length;Q<T;++Q){X=O[Q];if(X&&X[this.EL]==N&&X[this.TYPE]==M&&X[this.FN]==V){O.splice(Q,1);break;}}}}else{try{this._simpleRemove(N,M,R[this.WFN],false);}catch(U){this.lastError=U;return false;}}delete I[S][this.WFN];delete I[S][this.FN];
+I.splice(S,1);return true;},getTarget:function(O,N){var M=O.target||O.srcElement;return this.resolveTextNode(M);},resolveTextNode:function(N){try{if(N&&3==N.nodeType){return N.parentNode;}}catch(M){}return N;},getPageX:function(N){var M=N.pageX;if(!M&&0!==M){M=N.clientX||0;if(this.isIE){M+=this._getScrollLeft();}}return M;},getPageY:function(M){var N=M.pageY;if(!N&&0!==N){N=M.clientY||0;if(this.isIE){N+=this._getScrollTop();}}return N;},getXY:function(M){return[this.getPageX(M),this.getPageY(M)];},getRelatedTarget:function(N){var M=N.relatedTarget;if(!M){if(N.type=="mouseout"){M=N.toElement;}else{if(N.type=="mouseover"){M=N.fromElement;}}}return this.resolveTextNode(M);},getTime:function(O){if(!O.time){var N=new Date().getTime();try{O.time=N;}catch(M){this.lastError=M;return N;}}return O.time;},stopEvent:function(M){this.stopPropagation(M);this.preventDefault(M);},stopPropagation:function(M){if(M.stopPropagation){M.stopPropagation();}else{M.cancelBubble=true;}},preventDefault:function(M){if(M.preventDefault){M.preventDefault();}else{M.returnValue=false;}},getEvent:function(O,M){var N=O||window.event;if(!N){var P=this.getEvent.caller;while(P){N=P.arguments[0];if(N&&Event==N.constructor){break;}P=P.caller;}}return N;},getCharCode:function(N){var M=N.keyCode||N.charCode||0;if(YAHOO.env.ua.webkit&&(M in D)){M=D[M];}return M;},_getCacheIndex:function(Q,R,P){for(var O=0,N=I.length;O<N;O=O+1){var M=I[O];if(M&&M[this.FN]==P&&M[this.EL]==Q&&M[this.TYPE]==R){return O;}}return -1;},generateId:function(M){var N=M.id;if(!N){N="yuievtautoid-"+A;++A;M.id=N;}return N;},_isValidCollection:function(N){try{return(N&&typeof N!=="string"&&N.length&&!N.tagName&&!N.alert&&typeof N[0]!=="undefined");}catch(M){return false;}},elCache:{},getEl:function(M){return(typeof M==="string")?document.getElementById(M):M;},clearCache:function(){},DOMReadyEvent:new YAHOO.util.CustomEvent("DOMReady",this),_load:function(N){if(!H){H=true;var M=YAHOO.util.Event;M._ready();M._tryPreloadAttach();}},_ready:function(N){var M=YAHOO.util.Event;if(!M.DOMReady){M.DOMReady=true;M.DOMReadyEvent.fire();M._simpleRemove(document,"DOMContentLoaded",M._ready);}},_tryPreloadAttach:function(){if(F.length===0){C=0;if(this._interval){clearInterval(this._interval);this._interval=null;}return;}if(this.locked){return;}if(this.isIE){if(!this.DOMReady){this.startInterval();return;}}this.locked=true;var S=!H;if(!S){S=(C>0&&F.length>0);}var R=[];var T=function(V,W){var U=V;if(W.overrideContext){if(W.overrideContext===true){U=W.obj;}else{U=W.overrideContext;}}W.fn.call(U,W.obj);};var N,M,Q,P,O=[];for(N=0,M=F.length;N<M;N=N+1){Q=F[N];if(Q){P=this.getEl(Q.id);if(P){if(Q.checkReady){if(H||P.nextSibling||!S){O.push(Q);F[N]=null;}}else{T(P,Q);F[N]=null;}}else{R.push(Q);}}}for(N=0,M=O.length;N<M;N=N+1){Q=O[N];T(this.getEl(Q.id),Q);}C--;if(S){for(N=F.length-1;N>-1;N--){Q=F[N];if(!Q||!Q.id){F.splice(N,1);}}this.startInterval();}else{if(this._interval){clearInterval(this._interval);this._interval=null;}}this.locked=false;},purgeElement:function(Q,R,T){var O=(YAHOO.lang.isString(Q))?this.getEl(Q):Q;var S=this.getListeners(O,T),P,M;if(S){for(P=S.length-1;P>-1;P--){var N=S[P];this.removeListener(O,N.type,N.fn);}}if(R&&O&&O.childNodes){for(P=0,M=O.childNodes.length;P<M;++P){this.purgeElement(O.childNodes[P],R,T);}}},getListeners:function(O,M){var R=[],N;if(!M){N=[I,J];}else{if(M==="unload"){N=[J];}else{N=[I];}}var T=(YAHOO.lang.isString(O))?this.getEl(O):O;for(var Q=0;Q<N.length;Q=Q+1){var V=N[Q];if(V){for(var S=0,U=V.length;S<U;++S){var P=V[S];if(P&&P[this.EL]===T&&(!M||M===P[this.TYPE])){R.push({type:P[this.TYPE],fn:P[this.FN],obj:P[this.OBJ],adjust:P[this.OVERRIDE],scope:P[this.ADJ_SCOPE],index:S});}}}}return(R.length)?R:null;},_unload:function(T){var N=YAHOO.util.Event,Q,P,O,S,R,U=J.slice(),M;for(Q=0,S=J.length;Q<S;++Q){O=U[Q];if(O){M=window;if(O[N.ADJ_SCOPE]){if(O[N.ADJ_SCOPE]===true){M=O[N.UNLOAD_OBJ];}else{M=O[N.ADJ_SCOPE];}}O[N.FN].call(M,N.getEvent(T,O[N.EL]),O[N.UNLOAD_OBJ]);U[Q]=null;}}O=null;M=null;J=null;if(I){for(P=I.length-1;P>-1;P--){O=I[P];if(O){N.removeListener(O[N.EL],O[N.TYPE],O[N.FN],P);}}O=null;}G=null;N._simpleRemove(window,"unload",N._unload);},_getScrollLeft:function(){return this._getScroll()[1];},_getScrollTop:function(){return this._getScroll()[0];},_getScroll:function(){var M=document.documentElement,N=document.body;if(M&&(M.scrollTop||M.scrollLeft)){return[M.scrollTop,M.scrollLeft];}else{if(N){return[N.scrollTop,N.scrollLeft];}else{return[0,0];}}},regCE:function(){},_simpleAdd:function(){if(window.addEventListener){return function(O,P,N,M){O.addEventListener(P,N,(M));};}else{if(window.attachEvent){return function(O,P,N,M){O.attachEvent("on"+P,N);};}else{return function(){};}}}(),_simpleRemove:function(){if(window.removeEventListener){return function(O,P,N,M){O.removeEventListener(P,N,(M));};}else{if(window.detachEvent){return function(N,O,M){N.detachEvent("on"+O,M);};}else{return function(){};}}}()};}();(function(){var EU=YAHOO.util.Event;EU.on=EU.addListener;EU.onFocus=EU.addFocusListener;EU.onBlur=EU.addBlurListener;
+/* DOMReady: based on work by: Dean Edwards/John Resig/Matthias Miller */
+if(EU.isIE){YAHOO.util.Event.onDOMReady(YAHOO.util.Event._tryPreloadAttach,YAHOO.util.Event,true);var n=document.createElement("p");EU._dri=setInterval(function(){try{n.doScroll("left");clearInterval(EU._dri);EU._dri=null;EU._ready();n=null;}catch(ex){}},EU.POLL_INTERVAL);}else{if(EU.webkit&&EU.webkit<525){EU._dri=setInterval(function(){var rs=document.readyState;if("loaded"==rs||"complete"==rs){clearInterval(EU._dri);EU._dri=null;EU._ready();}},EU.POLL_INTERVAL);}else{EU._simpleAdd(document,"DOMContentLoaded",EU._ready);}}EU._simpleAdd(window,"load",EU._load);EU._simpleAdd(window,"unload",EU._unload);EU._tryPreloadAttach();})();}YAHOO.util.EventProvider=function(){};YAHOO.util.EventProvider.prototype={__yui_events:null,__yui_subscribers:null,subscribe:function(A,C,F,E){this.__yui_events=this.__yui_events||{};var D=this.__yui_events[A];if(D){D.subscribe(C,F,E);
+}else{this.__yui_subscribers=this.__yui_subscribers||{};var B=this.__yui_subscribers;if(!B[A]){B[A]=[];}B[A].push({fn:C,obj:F,overrideContext:E});}},unsubscribe:function(C,E,G){this.__yui_events=this.__yui_events||{};var A=this.__yui_events;if(C){var F=A[C];if(F){return F.unsubscribe(E,G);}}else{var B=true;for(var D in A){if(YAHOO.lang.hasOwnProperty(A,D)){B=B&&A[D].unsubscribe(E,G);}}return B;}return false;},unsubscribeAll:function(A){return this.unsubscribe(A);},createEvent:function(G,D){this.__yui_events=this.__yui_events||{};var A=D||{};var I=this.__yui_events;if(I[G]){}else{var H=A.scope||this;var E=(A.silent);var B=new YAHOO.util.CustomEvent(G,H,E,YAHOO.util.CustomEvent.FLAT);I[G]=B;if(A.onSubscribeCallback){B.subscribeEvent.subscribe(A.onSubscribeCallback);}this.__yui_subscribers=this.__yui_subscribers||{};var F=this.__yui_subscribers[G];if(F){for(var C=0;C<F.length;++C){B.subscribe(F[C].fn,F[C].obj,F[C].overrideContext);}}}return I[G];},fireEvent:function(E,D,A,C){this.__yui_events=this.__yui_events||{};var G=this.__yui_events[E];if(!G){return null;}var B=[];for(var F=1;F<arguments.length;++F){B.push(arguments[F]);}return G.fire.apply(G,B);},hasEvent:function(A){if(this.__yui_events){if(this.__yui_events[A]){return true;}}return false;}};(function(){var A=YAHOO.util.Event,C=YAHOO.lang;YAHOO.util.KeyListener=function(D,I,E,F){if(!D){}else{if(!I){}else{if(!E){}}}if(!F){F=YAHOO.util.KeyListener.KEYDOWN;}var G=new YAHOO.util.CustomEvent("keyPressed");this.enabledEvent=new YAHOO.util.CustomEvent("enabled");this.disabledEvent=new YAHOO.util.CustomEvent("disabled");if(C.isString(D)){D=document.getElementById(D);}if(C.isFunction(E)){G.subscribe(E);}else{G.subscribe(E.fn,E.scope,E.correctScope);}function H(O,N){if(!I.shift){I.shift=false;}if(!I.alt){I.alt=false;}if(!I.ctrl){I.ctrl=false;}if(O.shiftKey==I.shift&&O.altKey==I.alt&&O.ctrlKey==I.ctrl){var J,M=I.keys,L;if(YAHOO.lang.isArray(M)){for(var K=0;K<M.length;K++){J=M[K];L=A.getCharCode(O);if(J==L){G.fire(L,O);break;}}}else{L=A.getCharCode(O);if(M==L){G.fire(L,O);}}}}this.enable=function(){if(!this.enabled){A.on(D,F,H);this.enabledEvent.fire(I);}this.enabled=true;};this.disable=function(){if(this.enabled){A.removeListener(D,F,H);this.disabledEvent.fire(I);}this.enabled=false;};this.toString=function(){return"KeyListener ["+I.keys+"] "+D.tagName+(D.id?"["+D.id+"]":"");};};var B=YAHOO.util.KeyListener;B.KEYDOWN="keydown";B.KEYUP="keyup";B.KEY={ALT:18,BACK_SPACE:8,CAPS_LOCK:20,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,META:224,NUM_LOCK:144,PAGE_DOWN:34,PAGE_UP:33,PAUSE:19,PRINTSCREEN:44,RIGHT:39,SCROLL_LOCK:145,SHIFT:16,SPACE:32,TAB:9,UP:38};})();YAHOO.register("event",YAHOO.util.Event,{version:"2.7.0",build:"1796"});YAHOO.register("yahoo-dom-event", YAHOO, {version: "2.7.0", build: "1796"});
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+if(!YAHOO.util.DragDropMgr){YAHOO.util.DragDropMgr=function(){var A=YAHOO.util.Event,B=YAHOO.util.Dom;return{useShim:false,_shimActive:false,_shimState:false,_debugShim:false,_createShim:function(){var C=document.createElement("div");C.id="yui-ddm-shim";if(document.body.firstChild){document.body.insertBefore(C,document.body.firstChild);}else{document.body.appendChild(C);}C.style.display="none";C.style.backgroundColor="red";C.style.position="absolute";C.style.zIndex="99999";B.setStyle(C,"opacity","0");this._shim=C;A.on(C,"mouseup",this.handleMouseUp,this,true);A.on(C,"mousemove",this.handleMouseMove,this,true);A.on(window,"scroll",this._sizeShim,this,true);},_sizeShim:function(){if(this._shimActive){var C=this._shim;C.style.height=B.getDocumentHeight()+"px";C.style.width=B.getDocumentWidth()+"px";C.style.top="0";C.style.left="0";}},_activateShim:function(){if(this.useShim){if(!this._shim){this._createShim();}this._shimActive=true;var C=this._shim,D="0";if(this._debugShim){D=".5";}B.setStyle(C,"opacity",D);this._sizeShim();C.style.display="block";}},_deactivateShim:function(){this._shim.style.display="none";this._shimActive=false;},_shim:null,ids:{},handleIds:{},dragCurrent:null,dragOvers:{},deltaX:0,deltaY:0,preventDefault:true,stopPropagation:true,initialized:false,locked:false,interactionInfo:null,init:function(){this.initialized=true;},POINT:0,INTERSECT:1,STRICT_INTERSECT:2,mode:0,_execOnAll:function(E,D){for(var F in this.ids){for(var C in this.ids[F]){var G=this.ids[F][C];if(!this.isTypeOfDD(G)){continue;}G[E].apply(G,D);}}},_onLoad:function(){this.init();A.on(document,"mouseup",this.handleMouseUp,this,true);A.on(document,"mousemove",this.handleMouseMove,this,true);A.on(window,"unload",this._onUnload,this,true);A.on(window,"resize",this._onResize,this,true);},_onResize:function(C){this._execOnAll("resetConstraints",[]);},lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isLocked:function(){return this.locked;},locationCache:{},useCache:true,clickPixelThresh:3,clickTimeThresh:1000,dragThreshMet:false,clickTimeout:null,startX:0,startY:0,fromTimeout:false,regDragDrop:function(D,C){if(!this.initialized){this.init();}if(!this.ids[C]){this.ids[C]={};}this.ids[C][D.id]=D;},removeDDFromGroup:function(E,C){if(!this.ids[C]){this.ids[C]={};}var D=this.ids[C];if(D&&D[E.id]){delete D[E.id];}},_remove:function(E){for(var D in E.groups){if(D){var C=this.ids[D];if(C&&C[E.id]){delete C[E.id];}}}delete this.handleIds[E.id];},regHandle:function(D,C){if(!this.handleIds[D]){this.handleIds[D]={};}this.handleIds[D][C]=C;},isDragDrop:function(C){return(this.getDDById(C))?true:false;},getRelated:function(H,D){var G=[];for(var F in H.groups){for(var E in this.ids[F]){var C=this.ids[F][E];if(!this.isTypeOfDD(C)){continue;}if(!D||C.isTarget){G[G.length]=C;}}}return G;},isLegalTarget:function(G,F){var D=this.getRelated(G,true);for(var E=0,C=D.length;E<C;++E){if(D[E].id==F.id){return true;}}return false;},isTypeOfDD:function(C){return(C&&C.__ygDragDrop);},isHandle:function(D,C){return(this.handleIds[D]&&this.handleIds[D][C]);},getDDById:function(D){for(var C in this.ids){if(this.ids[C][D]){return this.ids[C][D];}}return null;},handleMouseDown:function(E,D){this.currentTarget=YAHOO.util.Event.getTarget(E);this.dragCurrent=D;var C=D.getEl();this.startX=YAHOO.util.Event.getPageX(E);this.startY=YAHOO.util.Event.getPageY(E);this.deltaX=this.startX-C.offsetLeft;this.deltaY=this.startY-C.offsetTop;this.dragThreshMet=false;this.clickTimeout=setTimeout(function(){var F=YAHOO.util.DDM;F.startDrag(F.startX,F.startY);F.fromTimeout=true;},this.clickTimeThresh);},startDrag:function(C,E){if(this.dragCurrent&&this.dragCurrent.useShim){this._shimState=this.useShim;this.useShim=true;}this._activateShim();clearTimeout(this.clickTimeout);var D=this.dragCurrent;if(D&&D.events.b4StartDrag){D.b4StartDrag(C,E);D.fireEvent("b4StartDragEvent",{x:C,y:E});}if(D&&D.events.startDrag){D.startDrag(C,E);D.fireEvent("startDragEvent",{x:C,y:E});}this.dragThreshMet=true;},handleMouseUp:function(C){if(this.dragCurrent){clearTimeout(this.clickTimeout);if(this.dragThreshMet){if(this.fromTimeout){this.fromTimeout=false;this.handleMouseMove(C);}this.fromTimeout=false;this.fireEvents(C,true);}else{}this.stopDrag(C);this.stopEvent(C);}},stopEvent:function(C){if(this.stopPropagation){YAHOO.util.Event.stopPropagation(C);}if(this.preventDefault){YAHOO.util.Event.preventDefault(C);}},stopDrag:function(E,D){var C=this.dragCurrent;if(C&&!D){if(this.dragThreshMet){if(C.events.b4EndDrag){C.b4EndDrag(E);C.fireEvent("b4EndDragEvent",{e:E});}if(C.events.endDrag){C.endDrag(E);C.fireEvent("endDragEvent",{e:E});}}if(C.events.mouseUp){C.onMouseUp(E);C.fireEvent("mouseUpEvent",{e:E});}}if(this._shimActive){this._deactivateShim();if(this.dragCurrent&&this.dragCurrent.useShim){this.useShim=this._shimState;this._shimState=false;}}this.dragCurrent=null;this.dragOvers={};},handleMouseMove:function(F){var C=this.dragCurrent;if(C){if(YAHOO.util.Event.isIE&&!F.button){this.stopEvent(F);return this.handleMouseUp(F);}else{if(F.clientX<0||F.clientY<0){}}if(!this.dragThreshMet){var E=Math.abs(this.startX-YAHOO.util.Event.getPageX(F));var D=Math.abs(this.startY-YAHOO.util.Event.getPageY(F));if(E>this.clickPixelThresh||D>this.clickPixelThresh){this.startDrag(this.startX,this.startY);}}if(this.dragThreshMet){if(C&&C.events.b4Drag){C.b4Drag(F);C.fireEvent("b4DragEvent",{e:F});}if(C&&C.events.drag){C.onDrag(F);C.fireEvent("dragEvent",{e:F});}if(C){this.fireEvents(F,false);}}this.stopEvent(F);}},fireEvents:function(V,L){var a=this.dragCurrent;if(!a||a.isLocked()||a.dragOnly){return;}var N=YAHOO.util.Event.getPageX(V),M=YAHOO.util.Event.getPageY(V),P=new YAHOO.util.Point(N,M),K=a.getTargetCoord(P.x,P.y),F=a.getDragEl(),E=["out","over","drop","enter"],U=new YAHOO.util.Region(K.y,K.x+F.offsetWidth,K.y+F.offsetHeight,K.x),I=[],D={},Q=[],c={outEvts:[],overEvts:[],dropEvts:[],enterEvts:[]};for(var S in this.dragOvers){var d=this.dragOvers[S];if(!this.isTypeOfDD(d)){continue;
+}if(!this.isOverTarget(P,d,this.mode,U)){c.outEvts.push(d);}I[S]=true;delete this.dragOvers[S];}for(var R in a.groups){if("string"!=typeof R){continue;}for(S in this.ids[R]){var G=this.ids[R][S];if(!this.isTypeOfDD(G)){continue;}if(G.isTarget&&!G.isLocked()&&G!=a){if(this.isOverTarget(P,G,this.mode,U)){D[R]=true;if(L){c.dropEvts.push(G);}else{if(!I[G.id]){c.enterEvts.push(G);}else{c.overEvts.push(G);}this.dragOvers[G.id]=G;}}}}}this.interactionInfo={out:c.outEvts,enter:c.enterEvts,over:c.overEvts,drop:c.dropEvts,point:P,draggedRegion:U,sourceRegion:this.locationCache[a.id],validDrop:L};for(var C in D){Q.push(C);}if(L&&!c.dropEvts.length){this.interactionInfo.validDrop=false;if(a.events.invalidDrop){a.onInvalidDrop(V);a.fireEvent("invalidDropEvent",{e:V});}}for(S=0;S<E.length;S++){var Y=null;if(c[E[S]+"Evts"]){Y=c[E[S]+"Evts"];}if(Y&&Y.length){var H=E[S].charAt(0).toUpperCase()+E[S].substr(1),X="onDrag"+H,J="b4Drag"+H,O="drag"+H+"Event",W="drag"+H;if(this.mode){if(a.events[J]){a[J](V,Y,Q);a.fireEvent(J+"Event",{event:V,info:Y,group:Q});}if(a.events[W]){a[X](V,Y,Q);a.fireEvent(O,{event:V,info:Y,group:Q});}}else{for(var Z=0,T=Y.length;Z<T;++Z){if(a.events[J]){a[J](V,Y[Z].id,Q[0]);a.fireEvent(J+"Event",{event:V,info:Y[Z].id,group:Q[0]});}if(a.events[W]){a[X](V,Y[Z].id,Q[0]);a.fireEvent(O,{event:V,info:Y[Z].id,group:Q[0]});}}}}}},getBestMatch:function(E){var G=null;var D=E.length;if(D==1){G=E[0];}else{for(var F=0;F<D;++F){var C=E[F];if(this.mode==this.INTERSECT&&C.cursorIsOver){G=C;break;}else{if(!G||!G.overlap||(C.overlap&&G.overlap.getArea()<C.overlap.getArea())){G=C;}}}}return G;},refreshCache:function(D){var F=D||this.ids;for(var C in F){if("string"!=typeof C){continue;}for(var E in this.ids[C]){var G=this.ids[C][E];if(this.isTypeOfDD(G)){var H=this.getLocation(G);if(H){this.locationCache[G.id]=H;}else{delete this.locationCache[G.id];}}}}},verifyEl:function(D){try{if(D){var C=D.offsetParent;if(C){return true;}}}catch(E){}return false;},getLocation:function(H){if(!this.isTypeOfDD(H)){return null;}var F=H.getEl(),K,E,D,M,L,N,C,J,G;try{K=YAHOO.util.Dom.getXY(F);}catch(I){}if(!K){return null;}E=K[0];D=E+F.offsetWidth;M=K[1];L=M+F.offsetHeight;N=M-H.padding[0];C=D+H.padding[1];J=L+H.padding[2];G=E-H.padding[3];return new YAHOO.util.Region(N,C,J,G);},isOverTarget:function(K,C,E,F){var G=this.locationCache[C.id];if(!G||!this.useCache){G=this.getLocation(C);this.locationCache[C.id]=G;}if(!G){return false;}C.cursorIsOver=G.contains(K);var J=this.dragCurrent;if(!J||(!E&&!J.constrainX&&!J.constrainY)){return C.cursorIsOver;}C.overlap=null;if(!F){var H=J.getTargetCoord(K.x,K.y);var D=J.getDragEl();F=new YAHOO.util.Region(H.y,H.x+D.offsetWidth,H.y+D.offsetHeight,H.x);}var I=F.intersect(G);if(I){C.overlap=I;return(E)?true:C.cursorIsOver;}else{return false;}},_onUnload:function(D,C){this.unregAll();},unregAll:function(){if(this.dragCurrent){this.stopDrag();this.dragCurrent=null;}this._execOnAll("unreg",[]);this.ids={};},elementCache:{},getElWrapper:function(D){var C=this.elementCache[D];if(!C||!C.el){C=this.elementCache[D]=new this.ElementWrapper(YAHOO.util.Dom.get(D));}return C;},getElement:function(C){return YAHOO.util.Dom.get(C);},getCss:function(D){var C=YAHOO.util.Dom.get(D);return(C)?C.style:null;},ElementWrapper:function(C){this.el=C||null;this.id=this.el&&C.id;this.css=this.el&&C.style;},getPosX:function(C){return YAHOO.util.Dom.getX(C);},getPosY:function(C){return YAHOO.util.Dom.getY(C);},swapNode:function(E,C){if(E.swapNode){E.swapNode(C);}else{var F=C.parentNode;var D=C.nextSibling;if(D==E){F.insertBefore(E,C);}else{if(C==E.nextSibling){F.insertBefore(C,E);}else{E.parentNode.replaceChild(C,E);F.insertBefore(E,D);}}}},getScroll:function(){var E,C,F=document.documentElement,D=document.body;if(F&&(F.scrollTop||F.scrollLeft)){E=F.scrollTop;C=F.scrollLeft;}else{if(D){E=D.scrollTop;C=D.scrollLeft;}else{}}return{top:E,left:C};},getStyle:function(D,C){return YAHOO.util.Dom.getStyle(D,C);},getScrollTop:function(){return this.getScroll().top;},getScrollLeft:function(){return this.getScroll().left;},moveToEl:function(C,E){var D=YAHOO.util.Dom.getXY(E);YAHOO.util.Dom.setXY(C,D);},getClientHeight:function(){return YAHOO.util.Dom.getViewportHeight();},getClientWidth:function(){return YAHOO.util.Dom.getViewportWidth();},numericSort:function(D,C){return(D-C);},_timeoutCount:0,_addListeners:function(){var C=YAHOO.util.DDM;if(YAHOO.util.Event&&document){C._onLoad();}else{if(C._timeoutCount>2000){}else{setTimeout(C._addListeners,10);if(document&&document.body){C._timeoutCount+=1;}}}},handleWasClicked:function(C,E){if(this.isHandle(E,C.id)){return true;}else{var D=C.parentNode;while(D){if(this.isHandle(E,D.id)){return true;}else{D=D.parentNode;}}}return false;}};}();YAHOO.util.DDM=YAHOO.util.DragDropMgr;YAHOO.util.DDM._addListeners();}(function(){var A=YAHOO.util.Event;var B=YAHOO.util.Dom;YAHOO.util.DragDrop=function(E,C,D){if(E){this.init(E,C,D);}};YAHOO.util.DragDrop.prototype={events:null,on:function(){this.subscribe.apply(this,arguments);},id:null,config:null,dragElId:null,handleElId:null,invalidHandleTypes:null,invalidHandleIds:null,invalidHandleClasses:null,startPageX:0,startPageY:0,groups:null,locked:false,lock:function(){this.locked=true;},unlock:function(){this.locked=false;},isTarget:true,padding:null,dragOnly:false,useShim:false,_domRef:null,__ygDragDrop:true,constrainX:false,constrainY:false,minX:0,maxX:0,minY:0,maxY:0,deltaX:0,deltaY:0,maintainOffset:false,xTicks:null,yTicks:null,primaryButtonOnly:true,available:false,hasOuterHandles:false,cursorIsOver:false,overlap:null,b4StartDrag:function(C,D){},startDrag:function(C,D){},b4Drag:function(C){},onDrag:function(C){},onDragEnter:function(C,D){},b4DragOver:function(C){},onDragOver:function(C,D){},b4DragOut:function(C){},onDragOut:function(C,D){},b4DragDrop:function(C){},onDragDrop:function(C,D){},onInvalidDrop:function(C){},b4EndDrag:function(C){},endDrag:function(C){},b4MouseDown:function(C){},onMouseDown:function(C){},onMouseUp:function(C){},onAvailable:function(){},getEl:function(){if(!this._domRef){this._domRef=B.get(this.id);
+}return this._domRef;},getDragEl:function(){return B.get(this.dragElId);},init:function(F,C,D){this.initTarget(F,C,D);A.on(this._domRef||this.id,"mousedown",this.handleMouseDown,this,true);for(var E in this.events){this.createEvent(E+"Event");}},initTarget:function(E,C,D){this.config=D||{};this.events={};this.DDM=YAHOO.util.DDM;this.groups={};if(typeof E!=="string"){this._domRef=E;E=B.generateId(E);}this.id=E;this.addToGroup((C)?C:"default");this.handleElId=E;A.onAvailable(E,this.handleOnAvailable,this,true);this.setDragElId(E);this.invalidHandleTypes={A:"A"};this.invalidHandleIds={};this.invalidHandleClasses=[];this.applyConfig();},applyConfig:function(){this.events={mouseDown:true,b4MouseDown:true,mouseUp:true,b4StartDrag:true,startDrag:true,b4EndDrag:true,endDrag:true,drag:true,b4Drag:true,invalidDrop:true,b4DragOut:true,dragOut:true,dragEnter:true,b4DragOver:true,dragOver:true,b4DragDrop:true,dragDrop:true};if(this.config.events){for(var C in this.config.events){if(this.config.events[C]===false){this.events[C]=false;}}}this.padding=this.config.padding||[0,0,0,0];this.isTarget=(this.config.isTarget!==false);this.maintainOffset=(this.config.maintainOffset);this.primaryButtonOnly=(this.config.primaryButtonOnly!==false);this.dragOnly=((this.config.dragOnly===true)?true:false);this.useShim=((this.config.useShim===true)?true:false);},handleOnAvailable:function(){this.available=true;this.resetConstraints();this.onAvailable();},setPadding:function(E,C,F,D){if(!C&&0!==C){this.padding=[E,E,E,E];}else{if(!F&&0!==F){this.padding=[E,C,E,C];}else{this.padding=[E,C,F,D];}}},setInitPosition:function(F,E){var G=this.getEl();if(!this.DDM.verifyEl(G)){if(G&&G.style&&(G.style.display=="none")){}else{}return;}var D=F||0;var C=E||0;var H=B.getXY(G);this.initPageX=H[0]-D;this.initPageY=H[1]-C;this.lastPageX=H[0];this.lastPageY=H[1];this.setStartPosition(H);},setStartPosition:function(D){var C=D||B.getXY(this.getEl());this.deltaSetXY=null;this.startPageX=C[0];this.startPageY=C[1];},addToGroup:function(C){this.groups[C]=true;this.DDM.regDragDrop(this,C);},removeFromGroup:function(C){if(this.groups[C]){delete this.groups[C];}this.DDM.removeDDFromGroup(this,C);},setDragElId:function(C){this.dragElId=C;},setHandleElId:function(C){if(typeof C!=="string"){C=B.generateId(C);}this.handleElId=C;this.DDM.regHandle(this.id,C);},setOuterHandleElId:function(C){if(typeof C!=="string"){C=B.generateId(C);}A.on(C,"mousedown",this.handleMouseDown,this,true);this.setHandleElId(C);this.hasOuterHandles=true;},unreg:function(){A.removeListener(this.id,"mousedown",this.handleMouseDown);this._domRef=null;this.DDM._remove(this);},isLocked:function(){return(this.DDM.isLocked()||this.locked);},handleMouseDown:function(J,I){var D=J.which||J.button;if(this.primaryButtonOnly&&D>1){return;}if(this.isLocked()){return;}var C=this.b4MouseDown(J),F=true;if(this.events.b4MouseDown){F=this.fireEvent("b4MouseDownEvent",J);}var E=this.onMouseDown(J),H=true;if(this.events.mouseDown){H=this.fireEvent("mouseDownEvent",J);}if((C===false)||(E===false)||(F===false)||(H===false)){return;}this.DDM.refreshCache(this.groups);var G=new YAHOO.util.Point(A.getPageX(J),A.getPageY(J));if(!this.hasOuterHandles&&!this.DDM.isOverTarget(G,this)){}else{if(this.clickValidator(J)){this.setStartPosition();this.DDM.handleMouseDown(J,this);this.DDM.stopEvent(J);}else{}}},clickValidator:function(D){var C=YAHOO.util.Event.getTarget(D);return(this.isValidHandleChild(C)&&(this.id==this.handleElId||this.DDM.handleWasClicked(C,this.id)));},getTargetCoord:function(E,D){var C=E-this.deltaX;var F=D-this.deltaY;if(this.constrainX){if(C<this.minX){C=this.minX;}if(C>this.maxX){C=this.maxX;}}if(this.constrainY){if(F<this.minY){F=this.minY;}if(F>this.maxY){F=this.maxY;}}C=this.getTick(C,this.xTicks);F=this.getTick(F,this.yTicks);return{x:C,y:F};},addInvalidHandleType:function(C){var D=C.toUpperCase();this.invalidHandleTypes[D]=D;},addInvalidHandleId:function(C){if(typeof C!=="string"){C=B.generateId(C);}this.invalidHandleIds[C]=C;},addInvalidHandleClass:function(C){this.invalidHandleClasses.push(C);},removeInvalidHandleType:function(C){var D=C.toUpperCase();delete this.invalidHandleTypes[D];},removeInvalidHandleId:function(C){if(typeof C!=="string"){C=B.generateId(C);}delete this.invalidHandleIds[C];},removeInvalidHandleClass:function(D){for(var E=0,C=this.invalidHandleClasses.length;E<C;++E){if(this.invalidHandleClasses[E]==D){delete this.invalidHandleClasses[E];}}},isValidHandleChild:function(F){var E=true;var H;try{H=F.nodeName.toUpperCase();}catch(G){H=F.nodeName;}E=E&&!this.invalidHandleTypes[H];E=E&&!this.invalidHandleIds[F.id];for(var D=0,C=this.invalidHandleClasses.length;E&&D<C;++D){E=!B.hasClass(F,this.invalidHandleClasses[D]);}return E;},setXTicks:function(F,C){this.xTicks=[];this.xTickSize=C;var E={};for(var D=this.initPageX;D>=this.minX;D=D-C){if(!E[D]){this.xTicks[this.xTicks.length]=D;E[D]=true;}}for(D=this.initPageX;D<=this.maxX;D=D+C){if(!E[D]){this.xTicks[this.xTicks.length]=D;E[D]=true;}}this.xTicks.sort(this.DDM.numericSort);},setYTicks:function(F,C){this.yTicks=[];this.yTickSize=C;var E={};for(var D=this.initPageY;D>=this.minY;D=D-C){if(!E[D]){this.yTicks[this.yTicks.length]=D;E[D]=true;}}for(D=this.initPageY;D<=this.maxY;D=D+C){if(!E[D]){this.yTicks[this.yTicks.length]=D;E[D]=true;}}this.yTicks.sort(this.DDM.numericSort);},setXConstraint:function(E,D,C){this.leftConstraint=parseInt(E,10);this.rightConstraint=parseInt(D,10);this.minX=this.initPageX-this.leftConstraint;this.maxX=this.initPageX+this.rightConstraint;if(C){this.setXTicks(this.initPageX,C);}this.constrainX=true;},clearConstraints:function(){this.constrainX=false;this.constrainY=false;this.clearTicks();},clearTicks:function(){this.xTicks=null;this.yTicks=null;this.xTickSize=0;this.yTickSize=0;},setYConstraint:function(C,E,D){this.topConstraint=parseInt(C,10);this.bottomConstraint=parseInt(E,10);this.minY=this.initPageY-this.topConstraint;this.maxY=this.initPageY+this.bottomConstraint;if(D){this.setYTicks(this.initPageY,D);
+}this.constrainY=true;},resetConstraints:function(){if(this.initPageX||this.initPageX===0){var D=(this.maintainOffset)?this.lastPageX-this.initPageX:0;var C=(this.maintainOffset)?this.lastPageY-this.initPageY:0;this.setInitPosition(D,C);}else{this.setInitPosition();}if(this.constrainX){this.setXConstraint(this.leftConstraint,this.rightConstraint,this.xTickSize);}if(this.constrainY){this.setYConstraint(this.topConstraint,this.bottomConstraint,this.yTickSize);}},getTick:function(I,F){if(!F){return I;}else{if(F[0]>=I){return F[0];}else{for(var D=0,C=F.length;D<C;++D){var E=D+1;if(F[E]&&F[E]>=I){var H=I-F[D];var G=F[E]-I;return(G>H)?F[D]:F[E];}}return F[F.length-1];}}},toString:function(){return("DragDrop "+this.id);}};YAHOO.augment(YAHOO.util.DragDrop,YAHOO.util.EventProvider);})();YAHOO.util.DD=function(C,A,B){if(C){this.init(C,A,B);}};YAHOO.extend(YAHOO.util.DD,YAHOO.util.DragDrop,{scroll:true,autoOffset:function(C,B){var A=C-this.startPageX;var D=B-this.startPageY;this.setDelta(A,D);},setDelta:function(B,A){this.deltaX=B;this.deltaY=A;},setDragElPos:function(C,B){var A=this.getDragEl();this.alignElWithMouse(A,C,B);},alignElWithMouse:function(C,G,F){var E=this.getTargetCoord(G,F);if(!this.deltaSetXY){var H=[E.x,E.y];YAHOO.util.Dom.setXY(C,H);var D=parseInt(YAHOO.util.Dom.getStyle(C,"left"),10);var B=parseInt(YAHOO.util.Dom.getStyle(C,"top"),10);this.deltaSetXY=[D-E.x,B-E.y];}else{YAHOO.util.Dom.setStyle(C,"left",(E.x+this.deltaSetXY[0])+"px");YAHOO.util.Dom.setStyle(C,"top",(E.y+this.deltaSetXY[1])+"px");}this.cachePosition(E.x,E.y);var A=this;setTimeout(function(){A.autoScroll.call(A,E.x,E.y,C.offsetHeight,C.offsetWidth);},0);},cachePosition:function(B,A){if(B){this.lastPageX=B;this.lastPageY=A;}else{var C=YAHOO.util.Dom.getXY(this.getEl());this.lastPageX=C[0];this.lastPageY=C[1];}},autoScroll:function(J,I,E,K){if(this.scroll){var L=this.DDM.getClientHeight();var B=this.DDM.getClientWidth();var N=this.DDM.getScrollTop();var D=this.DDM.getScrollLeft();var H=E+I;var M=K+J;var G=(L+N-I-this.deltaY);var F=(B+D-J-this.deltaX);var C=40;var A=(document.all)?80:30;if(H>L&&G<C){window.scrollTo(D,N+A);}if(I<N&&N>0&&I-N<C){window.scrollTo(D,N-A);}if(M>B&&F<C){window.scrollTo(D+A,N);}if(J<D&&D>0&&J-D<C){window.scrollTo(D-A,N);}}},applyConfig:function(){YAHOO.util.DD.superclass.applyConfig.call(this);this.scroll=(this.config.scroll!==false);},b4MouseDown:function(A){this.setStartPosition();this.autoOffset(YAHOO.util.Event.getPageX(A),YAHOO.util.Event.getPageY(A));},b4Drag:function(A){this.setDragElPos(YAHOO.util.Event.getPageX(A),YAHOO.util.Event.getPageY(A));},toString:function(){return("DD "+this.id);}});YAHOO.util.DDProxy=function(C,A,B){if(C){this.init(C,A,B);this.initFrame();}};YAHOO.util.DDProxy.dragElId="ygddfdiv";YAHOO.extend(YAHOO.util.DDProxy,YAHOO.util.DD,{resizeFrame:true,centerFrame:false,createFrame:function(){var B=this,A=document.body;if(!A||!A.firstChild){setTimeout(function(){B.createFrame();},50);return;}var F=this.getDragEl(),E=YAHOO.util.Dom;if(!F){F=document.createElement("div");F.id=this.dragElId;var D=F.style;D.position="absolute";D.visibility="hidden";D.cursor="move";D.border="2px solid #aaa";D.zIndex=999;D.height="25px";D.width="25px";var C=document.createElement("div");E.setStyle(C,"height","100%");E.setStyle(C,"width","100%");E.setStyle(C,"background-color","#ccc");E.setStyle(C,"opacity","0");F.appendChild(C);A.insertBefore(F,A.firstChild);}},initFrame:function(){this.createFrame();},applyConfig:function(){YAHOO.util.DDProxy.superclass.applyConfig.call(this);this.resizeFrame=(this.config.resizeFrame!==false);this.centerFrame=(this.config.centerFrame);this.setDragElId(this.config.dragElId||YAHOO.util.DDProxy.dragElId);},showFrame:function(E,D){var C=this.getEl();var A=this.getDragEl();var B=A.style;this._resizeProxy();if(this.centerFrame){this.setDelta(Math.round(parseInt(B.width,10)/2),Math.round(parseInt(B.height,10)/2));}this.setDragElPos(E,D);YAHOO.util.Dom.setStyle(A,"visibility","visible");},_resizeProxy:function(){if(this.resizeFrame){var H=YAHOO.util.Dom;var B=this.getEl();var C=this.getDragEl();var G=parseInt(H.getStyle(C,"borderTopWidth"),10);var I=parseInt(H.getStyle(C,"borderRightWidth"),10);var F=parseInt(H.getStyle(C,"borderBottomWidth"),10);var D=parseInt(H.getStyle(C,"borderLeftWidth"),10);if(isNaN(G)){G=0;}if(isNaN(I)){I=0;}if(isNaN(F)){F=0;}if(isNaN(D)){D=0;}var E=Math.max(0,B.offsetWidth-I-D);var A=Math.max(0,B.offsetHeight-G-F);H.setStyle(C,"width",E+"px");H.setStyle(C,"height",A+"px");}},b4MouseDown:function(B){this.setStartPosition();var A=YAHOO.util.Event.getPageX(B);var C=YAHOO.util.Event.getPageY(B);this.autoOffset(A,C);},b4StartDrag:function(A,B){this.showFrame(A,B);},b4EndDrag:function(A){YAHOO.util.Dom.setStyle(this.getDragEl(),"visibility","hidden");},endDrag:function(D){var C=YAHOO.util.Dom;var B=this.getEl();var A=this.getDragEl();C.setStyle(A,"visibility","");C.setStyle(B,"visibility","hidden");YAHOO.util.DDM.moveToEl(B,A);C.setStyle(A,"visibility","hidden");C.setStyle(B,"visibility","");},toString:function(){return("DDProxy "+this.id);}});YAHOO.util.DDTarget=function(C,A,B){if(C){this.initTarget(C,A,B);}};YAHOO.extend(YAHOO.util.DDTarget,YAHOO.util.DragDrop,{toString:function(){return("DDTarget "+this.id);}});YAHOO.register("dragdrop",YAHOO.util.DragDropMgr,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+(function(){var B=YAHOO.util.Dom.getXY,A=YAHOO.util.Event,D=Array.prototype.slice;function C(G,E,F,H){C.ANIM_AVAIL=(!YAHOO.lang.isUndefined(YAHOO.util.Anim));if(G){this.init(G,E,true);this.initSlider(H);this.initThumb(F);}}YAHOO.lang.augmentObject(C,{getHorizSlider:function(F,G,I,H,E){return new C(F,F,new YAHOO.widget.SliderThumb(G,F,I,H,0,0,E),"horiz");},getVertSlider:function(G,H,E,I,F){return new C(G,G,new YAHOO.widget.SliderThumb(H,G,0,0,E,I,F),"vert");},getSliderRegion:function(G,H,J,I,E,K,F){return new C(G,G,new YAHOO.widget.SliderThumb(H,G,J,I,E,K,F),"region");},SOURCE_UI_EVENT:1,SOURCE_SET_VALUE:2,SOURCE_KEY_EVENT:3,ANIM_AVAIL:false},true);YAHOO.extend(C,YAHOO.util.DragDrop,{_mouseDown:false,dragOnly:true,initSlider:function(E){this.type=E;this.createEvent("change",this);this.createEvent("slideStart",this);this.createEvent("slideEnd",this);this.isTarget=false;this.animate=C.ANIM_AVAIL;this.backgroundEnabled=true;this.tickPause=40;this.enableKeys=true;this.keyIncrement=20;this.moveComplete=true;this.animationDuration=0.2;this.SOURCE_UI_EVENT=1;this.SOURCE_SET_VALUE=2;this.valueChangeSource=0;this._silent=false;this.lastOffset=[0,0];},initThumb:function(F){var E=this;this.thumb=F;F.cacheBetweenDrags=true;if(F._isHoriz&&F.xTicks&&F.xTicks.length){this.tickPause=Math.round(360/F.xTicks.length);}else{if(F.yTicks&&F.yTicks.length){this.tickPause=Math.round(360/F.yTicks.length);}}F.onAvailable=function(){return E.setStartSliderState();};F.onMouseDown=function(){E._mouseDown=true;return E.focus();};F.startDrag=function(){E._slideStart();};F.onDrag=function(){E.fireEvents(true);};F.onMouseUp=function(){E.thumbMouseUp();};},onAvailable:function(){this._bindKeyEvents();},_bindKeyEvents:function(){A.on(this.id,"keydown",this.handleKeyDown,this,true);A.on(this.id,"keypress",this.handleKeyPress,this,true);},handleKeyPress:function(F){if(this.enableKeys){var E=A.getCharCode(F);switch(E){case 37:case 38:case 39:case 40:case 36:case 35:A.preventDefault(F);break;default:}}},handleKeyDown:function(J){if(this.enableKeys){var G=A.getCharCode(J),F=this.thumb,H=this.getXValue(),E=this.getYValue(),I=true;switch(G){case 37:H-=this.keyIncrement;break;case 38:E-=this.keyIncrement;break;case 39:H+=this.keyIncrement;break;case 40:E+=this.keyIncrement;break;case 36:H=F.leftConstraint;E=F.topConstraint;break;case 35:H=F.rightConstraint;E=F.bottomConstraint;break;default:I=false;}if(I){if(F._isRegion){this._setRegionValue(C.SOURCE_KEY_EVENT,H,E,true);}else{this._setValue(C.SOURCE_KEY_EVENT,(F._isHoriz?H:E),true);}A.stopEvent(J);}}},setStartSliderState:function(){this.setThumbCenterPoint();this.baselinePos=B(this.getEl());this.thumb.startOffset=this.thumb.getOffsetFromParent(this.baselinePos);if(this.thumb._isRegion){if(this.deferredSetRegionValue){this._setRegionValue.apply(this,this.deferredSetRegionValue);this.deferredSetRegionValue=null;}else{this.setRegionValue(0,0,true,true,true);}}else{if(this.deferredSetValue){this._setValue.apply(this,this.deferredSetValue);this.deferredSetValue=null;}else{this.setValue(0,true,true,true);}}},setThumbCenterPoint:function(){var E=this.thumb.getEl();if(E){this.thumbCenterPoint={x:parseInt(E.offsetWidth/2,10),y:parseInt(E.offsetHeight/2,10)};}},lock:function(){this.thumb.lock();this.locked=true;},unlock:function(){this.thumb.unlock();this.locked=false;},thumbMouseUp:function(){this._mouseDown=false;if(!this.isLocked()&&!this.moveComplete){this.endMove();}},onMouseUp:function(){this._mouseDown=false;if(this.backgroundEnabled&&!this.isLocked()&&!this.moveComplete){this.endMove();}},getThumb:function(){return this.thumb;},focus:function(){this.valueChangeSource=C.SOURCE_UI_EVENT;var E=this.getEl();if(E.focus){try{E.focus();}catch(F){}}this.verifyOffset();return !this.isLocked();},onChange:function(E,F){},onSlideStart:function(){},onSlideEnd:function(){},getValue:function(){return this.thumb.getValue();},getXValue:function(){return this.thumb.getXValue();},getYValue:function(){return this.thumb.getYValue();},setValue:function(){var E=D.call(arguments);E.unshift(C.SOURCE_SET_VALUE);return this._setValue.apply(this,E);},_setValue:function(I,L,G,H,E){var F=this.thumb,K,J;if(!F.available){this.deferredSetValue=arguments;return false;}if(this.isLocked()&&!H){return false;}if(isNaN(L)){return false;}if(F._isRegion){return false;}this._silent=E;this.valueChangeSource=I||C.SOURCE_SET_VALUE;F.lastOffset=[L,L];this.verifyOffset(true);this._slideStart();if(F._isHoriz){K=F.initPageX+L+this.thumbCenterPoint.x;this.moveThumb(K,F.initPageY,G);}else{J=F.initPageY+L+this.thumbCenterPoint.y;this.moveThumb(F.initPageX,J,G);}return true;},setRegionValue:function(){var E=D.call(arguments);E.unshift(C.SOURCE_SET_VALUE);return this._setRegionValue.apply(this,E);},_setRegionValue:function(F,J,H,I,G,K){var L=this.thumb,E,M;if(!L.available){this.deferredSetRegionValue=arguments;return false;}if(this.isLocked()&&!G){return false;}if(isNaN(J)){return false;}if(!L._isRegion){return false;}this._silent=K;this.valueChangeSource=F||C.SOURCE_SET_VALUE;L.lastOffset=[J,H];this.verifyOffset(true);this._slideStart();E=L.initPageX+J+this.thumbCenterPoint.x;M=L.initPageY+H+this.thumbCenterPoint.y;this.moveThumb(E,M,I);return true;},verifyOffset:function(F){var G=B(this.getEl()),E=this.thumb;if(!this.thumbCenterPoint||!this.thumbCenterPoint.x){this.setThumbCenterPoint();}if(G){if(G[0]!=this.baselinePos[0]||G[1]!=this.baselinePos[1]){this.setInitPosition();this.baselinePos=G;E.initPageX=this.initPageX+E.startOffset[0];E.initPageY=this.initPageY+E.startOffset[1];E.deltaSetXY=null;this.resetThumbConstraints();return false;}}return true;},moveThumb:function(K,J,I,G){var L=this.thumb,M=this,F,E,H;if(!L.available){return;}L.setDelta(this.thumbCenterPoint.x,this.thumbCenterPoint.y);E=L.getTargetCoord(K,J);F=[Math.round(E.x),Math.round(E.y)];if(this.animate&&L._graduated&&!I){this.lock();this.curCoord=B(this.thumb.getEl());this.curCoord=[Math.round(this.curCoord[0]),Math.round(this.curCoord[1])];setTimeout(function(){M.moveOneTick(F);
+},this.tickPause);}else{if(this.animate&&C.ANIM_AVAIL&&!I){this.lock();H=new YAHOO.util.Motion(L.id,{points:{to:F}},this.animationDuration,YAHOO.util.Easing.easeOut);H.onComplete.subscribe(function(){M.unlock();if(!M._mouseDown){M.endMove();}});H.animate();}else{L.setDragElPos(K,J);if(!G&&!this._mouseDown){this.endMove();}}}},_slideStart:function(){if(!this._sliding){if(!this._silent){this.onSlideStart();this.fireEvent("slideStart");}this._sliding=true;}},_slideEnd:function(){if(this._sliding&&this.moveComplete){var E=this._silent;this._sliding=false;this._silent=false;this.moveComplete=false;if(!E){this.onSlideEnd();this.fireEvent("slideEnd");}}},moveOneTick:function(F){var H=this.thumb,G=this,I=null,E,J;if(H._isRegion){I=this._getNextX(this.curCoord,F);E=(I!==null)?I[0]:this.curCoord[0];I=this._getNextY(this.curCoord,F);J=(I!==null)?I[1]:this.curCoord[1];I=E!==this.curCoord[0]||J!==this.curCoord[1]?[E,J]:null;}else{if(H._isHoriz){I=this._getNextX(this.curCoord,F);}else{I=this._getNextY(this.curCoord,F);}}if(I){this.curCoord=I;this.thumb.alignElWithMouse(H.getEl(),I[0]+this.thumbCenterPoint.x,I[1]+this.thumbCenterPoint.y);if(!(I[0]==F[0]&&I[1]==F[1])){setTimeout(function(){G.moveOneTick(F);},this.tickPause);}else{this.unlock();if(!this._mouseDown){this.endMove();}}}else{this.unlock();if(!this._mouseDown){this.endMove();}}},_getNextX:function(E,F){var H=this.thumb,J,G=[],I=null;if(E[0]>F[0]){J=H.tickSize-this.thumbCenterPoint.x;G=H.getTargetCoord(E[0]-J,E[1]);I=[G.x,G.y];}else{if(E[0]<F[0]){J=H.tickSize+this.thumbCenterPoint.x;G=H.getTargetCoord(E[0]+J,E[1]);I=[G.x,G.y];}else{}}return I;},_getNextY:function(E,F){var H=this.thumb,J,G=[],I=null;if(E[1]>F[1]){J=H.tickSize-this.thumbCenterPoint.y;G=H.getTargetCoord(E[0],E[1]-J);I=[G.x,G.y];}else{if(E[1]<F[1]){J=H.tickSize+this.thumbCenterPoint.y;G=H.getTargetCoord(E[0],E[1]+J);I=[G.x,G.y];}else{}}return I;},b4MouseDown:function(E){if(!this.backgroundEnabled){return false;}this.thumb.autoOffset();this.resetThumbConstraints();},onMouseDown:function(F){if(!this.backgroundEnabled||this.isLocked()){return false;}this._mouseDown=true;var E=A.getPageX(F),G=A.getPageY(F);this.focus();this._slideStart();this.moveThumb(E,G);},onDrag:function(F){if(this.backgroundEnabled&&!this.isLocked()){var E=A.getPageX(F),G=A.getPageY(F);this.moveThumb(E,G,true,true);this.fireEvents();}},endMove:function(){this.unlock();this.fireEvents();this.moveComplete=true;this._slideEnd();},resetThumbConstraints:function(){var E=this.thumb;E.setXConstraint(E.leftConstraint,E.rightConstraint,E.xTickSize);E.setYConstraint(E.topConstraint,E.bottomConstraint,E.xTickSize);},fireEvents:function(G){var F=this.thumb,I,H,E;if(!G){F.cachePosition();}if(!this.isLocked()){if(F._isRegion){I=F.getXValue();H=F.getYValue();if(I!=this.previousX||H!=this.previousY){if(!this._silent){this.onChange(I,H);this.fireEvent("change",{x:I,y:H});}}this.previousX=I;this.previousY=H;}else{E=F.getValue();if(E!=this.previousVal){if(!this._silent){this.onChange(E);this.fireEvent("change",E);}}this.previousVal=E;}}},toString:function(){return("Slider ("+this.type+") "+this.id);}});YAHOO.lang.augmentProto(C,YAHOO.util.EventProvider);YAHOO.widget.Slider=C;})();YAHOO.widget.SliderThumb=function(G,B,E,D,A,F,C){if(G){YAHOO.widget.SliderThumb.superclass.constructor.call(this,G,B);this.parentElId=B;}this.isTarget=false;this.tickSize=C;this.maintainOffset=true;this.initSlider(E,D,A,F,C);this.scroll=false;};YAHOO.extend(YAHOO.widget.SliderThumb,YAHOO.util.DD,{startOffset:null,dragOnly:true,_isHoriz:false,_prevVal:0,_graduated:false,getOffsetFromParent0:function(C){var A=YAHOO.util.Dom.getXY(this.getEl()),B=C||YAHOO.util.Dom.getXY(this.parentElId);return[(A[0]-B[0]),(A[1]-B[1])];},getOffsetFromParent:function(H){var A=this.getEl(),E,I,F,B,K,D,C,J,G;if(!this.deltaOffset){I=YAHOO.util.Dom.getXY(A);F=H||YAHOO.util.Dom.getXY(this.parentElId);E=[(I[0]-F[0]),(I[1]-F[1])];B=parseInt(YAHOO.util.Dom.getStyle(A,"left"),10);K=parseInt(YAHOO.util.Dom.getStyle(A,"top"),10);D=B-E[0];C=K-E[1];if(isNaN(D)||isNaN(C)){}else{this.deltaOffset=[D,C];}}else{J=parseInt(YAHOO.util.Dom.getStyle(A,"left"),10);G=parseInt(YAHOO.util.Dom.getStyle(A,"top"),10);E=[J+this.deltaOffset[0],G+this.deltaOffset[1]];}return E;},initSlider:function(D,C,A,E,B){this.initLeft=D;this.initRight=C;this.initUp=A;this.initDown=E;this.setXConstraint(D,C,B);this.setYConstraint(A,E,B);if(B&&B>1){this._graduated=true;}this._isHoriz=(D||C);this._isVert=(A||E);this._isRegion=(this._isHoriz&&this._isVert);},clearTicks:function(){YAHOO.widget.SliderThumb.superclass.clearTicks.call(this);this.tickSize=0;this._graduated=false;},getValue:function(){return(this._isHoriz)?this.getXValue():this.getYValue();},getXValue:function(){if(!this.available){return 0;}var A=this.getOffsetFromParent();if(YAHOO.lang.isNumber(A[0])){this.lastOffset=A;return(A[0]-this.startOffset[0]);}else{return(this.lastOffset[0]-this.startOffset[0]);}},getYValue:function(){if(!this.available){return 0;}var A=this.getOffsetFromParent();if(YAHOO.lang.isNumber(A[1])){this.lastOffset=A;return(A[1]-this.startOffset[1]);}else{return(this.lastOffset[1]-this.startOffset[1]);}},toString:function(){return"SliderThumb "+this.id;},onChange:function(A,B){}});(function(){var A=YAHOO.util.Event,B=YAHOO.widget;function C(I,F,H,D){var G=this,J={min:false,max:false},E,K;this.minSlider=I;this.maxSlider=F;this.activeSlider=I;this.isHoriz=I.thumb._isHoriz;E=this.minSlider.thumb.onMouseDown;K=this.maxSlider.thumb.onMouseDown;this.minSlider.thumb.onMouseDown=function(){G.activeSlider=G.minSlider;E.apply(this,arguments);};this.maxSlider.thumb.onMouseDown=function(){G.activeSlider=G.maxSlider;K.apply(this,arguments);};this.minSlider.thumb.onAvailable=function(){I.setStartSliderState();J.min=true;if(J.max){G.fireEvent("ready",G);}};this.maxSlider.thumb.onAvailable=function(){F.setStartSliderState();J.max=true;if(J.min){G.fireEvent("ready",G);}};I.onMouseDown=F.onMouseDown=function(L){return this.backgroundEnabled&&G._handleMouseDown(L);
+};I.onDrag=F.onDrag=function(L){G._handleDrag(L);};I.onMouseUp=F.onMouseUp=function(L){G._handleMouseUp(L);};I._bindKeyEvents=function(){G._bindKeyEvents(this);};F._bindKeyEvents=function(){};I.subscribe("change",this._handleMinChange,I,this);I.subscribe("slideStart",this._handleSlideStart,I,this);I.subscribe("slideEnd",this._handleSlideEnd,I,this);F.subscribe("change",this._handleMaxChange,F,this);F.subscribe("slideStart",this._handleSlideStart,F,this);F.subscribe("slideEnd",this._handleSlideEnd,F,this);this.createEvent("ready",this);this.createEvent("change",this);this.createEvent("slideStart",this);this.createEvent("slideEnd",this);D=YAHOO.lang.isArray(D)?D:[0,H];D[0]=Math.min(Math.max(parseInt(D[0],10)|0,0),H);D[1]=Math.max(Math.min(parseInt(D[1],10)|0,H),0);if(D[0]>D[1]){D.splice(0,2,D[1],D[0]);}this.minVal=D[0];this.maxVal=D[1];this.minSlider.setValue(this.minVal,true,true,true);this.maxSlider.setValue(this.maxVal,true,true,true);}C.prototype={minVal:-1,maxVal:-1,minRange:0,_handleSlideStart:function(E,D){this.fireEvent("slideStart",D);},_handleSlideEnd:function(E,D){this.fireEvent("slideEnd",D);},_handleDrag:function(D){B.Slider.prototype.onDrag.call(this.activeSlider,D);},_handleMinChange:function(){this.activeSlider=this.minSlider;this.updateValue();},_handleMaxChange:function(){this.activeSlider=this.maxSlider;this.updateValue();},_bindKeyEvents:function(D){A.on(D.id,"keydown",this._handleKeyDown,this,true);A.on(D.id,"keypress",this._handleKeyPress,this,true);},_handleKeyDown:function(D){this.activeSlider.handleKeyDown.apply(this.activeSlider,arguments);},_handleKeyPress:function(D){this.activeSlider.handleKeyPress.apply(this.activeSlider,arguments);},setValues:function(H,K,I,E,J){var F=this.minSlider,M=this.maxSlider,D=F.thumb,L=M.thumb,N=this,G={min:false,max:false};if(D._isHoriz){D.setXConstraint(D.leftConstraint,L.rightConstraint,D.tickSize);L.setXConstraint(D.leftConstraint,L.rightConstraint,L.tickSize);}else{D.setYConstraint(D.topConstraint,L.bottomConstraint,D.tickSize);L.setYConstraint(D.topConstraint,L.bottomConstraint,L.tickSize);}this._oneTimeCallback(F,"slideEnd",function(){G.min=true;if(G.max){N.updateValue(J);setTimeout(function(){N._cleanEvent(F,"slideEnd");N._cleanEvent(M,"slideEnd");},0);}});this._oneTimeCallback(M,"slideEnd",function(){G.max=true;if(G.min){N.updateValue(J);setTimeout(function(){N._cleanEvent(F,"slideEnd");N._cleanEvent(M,"slideEnd");},0);}});F.setValue(H,I,E,false);M.setValue(K,I,E,false);},setMinValue:function(F,H,I,E){var G=this.minSlider,D=this;this.activeSlider=G;D=this;this._oneTimeCallback(G,"slideEnd",function(){D.updateValue(E);setTimeout(function(){D._cleanEvent(G,"slideEnd");},0);});G.setValue(F,H,I);},setMaxValue:function(D,H,I,F){var G=this.maxSlider,E=this;this.activeSlider=G;this._oneTimeCallback(G,"slideEnd",function(){E.updateValue(F);setTimeout(function(){E._cleanEvent(G,"slideEnd");},0);});G.setValue(D,H,I);},updateValue:function(J){var E=this.minSlider.getValue(),K=this.maxSlider.getValue(),F=false,D,M,H,I,L,G;if(E!=this.minVal||K!=this.maxVal){F=true;D=this.minSlider.thumb;M=this.maxSlider.thumb;H=this.isHoriz?"x":"y";G=this.minSlider.thumbCenterPoint[H]+this.maxSlider.thumbCenterPoint[H];I=Math.max(K-G-this.minRange,0);L=Math.min(-E-G-this.minRange,0);if(this.isHoriz){I=Math.min(I,M.rightConstraint);D.setXConstraint(D.leftConstraint,I,D.tickSize);M.setXConstraint(L,M.rightConstraint,M.tickSize);}else{I=Math.min(I,M.bottomConstraint);D.setYConstraint(D.leftConstraint,I,D.tickSize);M.setYConstraint(L,M.bottomConstraint,M.tickSize);}}this.minVal=E;this.maxVal=K;if(F&&!J){this.fireEvent("change",this);}},selectActiveSlider:function(H){var E=this.minSlider,D=this.maxSlider,J=E.isLocked()||!E.backgroundEnabled,G=D.isLocked()||!E.backgroundEnabled,F=YAHOO.util.Event,I;if(J||G){this.activeSlider=J?D:E;}else{if(this.isHoriz){I=F.getPageX(H)-E.thumb.initPageX-E.thumbCenterPoint.x;}else{I=F.getPageY(H)-E.thumb.initPageY-E.thumbCenterPoint.y;}this.activeSlider=I*2>D.getValue()+E.getValue()?D:E;}},_handleMouseDown:function(D){if(!D._handled){D._handled=true;this.selectActiveSlider(D);return B.Slider.prototype.onMouseDown.call(this.activeSlider,D);}else{return false;}},_handleMouseUp:function(D){B.Slider.prototype.onMouseUp.apply(this.activeSlider,arguments);},_oneTimeCallback:function(F,D,E){F.subscribe(D,function(){F.unsubscribe(D,arguments.callee);E.apply({},[].slice.apply(arguments));});},_cleanEvent:function(K,E){var J,I,D,G,H,F;if(K.__yui_events&&K.events[E]){for(I=K.__yui_events.length;I>=0;--I){if(K.__yui_events[I].type===E){J=K.__yui_events[I];break;}}if(J){H=J.subscribers;F=[];G=0;for(I=0,D=H.length;I<D;++I){if(H[I]){F[G++]=H[I];}}J.subscribers=F;}}}};YAHOO.lang.augmentProto(C,YAHOO.util.EventProvider);B.Slider.getHorizDualSlider=function(H,J,K,G,F,D){var I=new B.SliderThumb(J,H,0,G,0,0,F),E=new B.SliderThumb(K,H,0,G,0,0,F);return new C(new B.Slider(H,H,I,"horiz"),new B.Slider(H,H,E,"horiz"),G,D);};B.Slider.getVertDualSlider=function(H,J,K,G,F,D){var I=new B.SliderThumb(J,H,0,0,0,G,F),E=new B.SliderThumb(K,H,0,0,0,G,F);return new B.DualSlider(new B.Slider(H,H,I,"vert"),new B.Slider(H,H,E,"vert"),G,D);};YAHOO.widget.DualSlider=C;})();YAHOO.register("slider",YAHOO.widget.Slider,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+YAHOO.util.Attribute=function(B,A){if(A){this.owner=A;this.configure(B,true);}};YAHOO.util.Attribute.prototype={name:undefined,value:null,owner:null,readOnly:false,writeOnce:false,_initialConfig:null,_written:false,method:null,setter:null,getter:null,validator:null,getValue:function(){var A=this.value;if(this.getter){A=this.getter.call(this.owner,this.name);}return A;},setValue:function(F,B){var E,A=this.owner,C=this.name;var D={type:C,prevValue:this.getValue(),newValue:F};if(this.readOnly||(this.writeOnce&&this._written)){return false;}if(this.validator&&!this.validator.call(A,F)){return false;}if(!B){E=A.fireBeforeChangeEvent(D);if(E===false){return false;}}if(this.setter){F=this.setter.call(A,F,this.name);if(F===undefined){}}if(this.method){this.method.call(A,F,this.name);}this.value=F;this._written=true;D.type=C;if(!B){this.owner.fireChangeEvent(D);}return true;},configure:function(B,C){B=B||{};if(C){this._written=false;}this._initialConfig=this._initialConfig||{};for(var A in B){if(B.hasOwnProperty(A)){this[A]=B[A];if(C){this._initialConfig[A]=B[A];}}}},resetValue:function(){return this.setValue(this._initialConfig.value);},resetConfig:function(){this.configure(this._initialConfig,true);},refresh:function(A){this.setValue(this.value,A);}};(function(){var A=YAHOO.util.Lang;YAHOO.util.AttributeProvider=function(){};YAHOO.util.AttributeProvider.prototype={_configs:null,get:function(C){this._configs=this._configs||{};var B=this._configs[C];if(!B||!this._configs.hasOwnProperty(C)){return null;}return B.getValue();},set:function(D,E,B){this._configs=this._configs||{};var C=this._configs[D];if(!C){return false;}return C.setValue(E,B);},getAttributeKeys:function(){this._configs=this._configs;var C=[],B;for(B in this._configs){if(A.hasOwnProperty(this._configs,B)&&!A.isUndefined(this._configs[B])){C[C.length]=B;}}return C;},setAttributes:function(D,B){for(var C in D){if(A.hasOwnProperty(D,C)){this.set(C,D[C],B);}}},resetValue:function(C,B){this._configs=this._configs||{};if(this._configs[C]){this.set(C,this._configs[C]._initialConfig.value,B);return true;}return false;},refresh:function(E,C){this._configs=this._configs||{};var F=this._configs;E=((A.isString(E))?[E]:E)||this.getAttributeKeys();for(var D=0,B=E.length;D<B;++D){if(F.hasOwnProperty(E[D])){this._configs[E[D]].refresh(C);}}},register:function(B,C){this.setAttributeConfig(B,C);},getAttributeConfig:function(C){this._configs=this._configs||{};var B=this._configs[C]||{};var D={};for(C in B){if(A.hasOwnProperty(B,C)){D[C]=B[C];}}return D;},setAttributeConfig:function(B,C,D){this._configs=this._configs||{};C=C||{};if(!this._configs[B]){C.name=B;this._configs[B]=this.createAttribute(C);}else{this._configs[B].configure(C,D);}},configureAttribute:function(B,C,D){this.setAttributeConfig(B,C,D);},resetAttributeConfig:function(B){this._configs=this._configs||{};this._configs[B].resetConfig();},subscribe:function(B,C){this._events=this._events||{};if(!(B in this._events)){this._events[B]=this.createEvent(B);}YAHOO.util.EventProvider.prototype.subscribe.apply(this,arguments);},on:function(){this.subscribe.apply(this,arguments);},addListener:function(){this.subscribe.apply(this,arguments);},fireBeforeChangeEvent:function(C){var B="before";B+=C.type.charAt(0).toUpperCase()+C.type.substr(1)+"Change";C.type=B;return this.fireEvent(C.type,C);},fireChangeEvent:function(B){B.type+="Change";return this.fireEvent(B.type,B);},createAttribute:function(B){return new YAHOO.util.Attribute(B,this);}};YAHOO.augment(YAHOO.util.AttributeProvider,YAHOO.util.EventProvider);})();(function(){var B=YAHOO.util.Dom,C=YAHOO.util.AttributeProvider;var A=function(D,E){this.init.apply(this,arguments);};A.DOM_EVENTS={"click":true,"dblclick":true,"keydown":true,"keypress":true,"keyup":true,"mousedown":true,"mousemove":true,"mouseout":true,"mouseover":true,"mouseup":true,"focus":true,"blur":true,"submit":true,"change":true};A.prototype={DOM_EVENTS:null,DEFAULT_HTML_SETTER:function(F,D){var E=this.get("element");if(E){E[D]=F;}},DEFAULT_HTML_GETTER:function(D){var E=this.get("element"),F;if(E){F=E[D];}return F;},appendChild:function(D){D=D.get?D.get("element"):D;return this.get("element").appendChild(D);},getElementsByTagName:function(D){return this.get("element").getElementsByTagName(D);},hasChildNodes:function(){return this.get("element").hasChildNodes();},insertBefore:function(D,E){D=D.get?D.get("element"):D;E=(E&&E.get)?E.get("element"):E;return this.get("element").insertBefore(D,E);},removeChild:function(D){D=D.get?D.get("element"):D;return this.get("element").removeChild(D);},replaceChild:function(D,E){D=D.get?D.get("element"):D;E=E.get?E.get("element"):E;return this.get("element").replaceChild(D,E);},initAttributes:function(D){},addListener:function(H,G,I,F){var E=this.get("element")||this.get("id");F=F||this;var D=this;if(!this._events[H]){if(E&&this.DOM_EVENTS[H]){YAHOO.util.Event.addListener(E,H,function(J){if(J.srcElement&&!J.target){J.target=J.srcElement;}D.fireEvent(H,J);},I,F);}this.createEvent(H,this);}return YAHOO.util.EventProvider.prototype.subscribe.apply(this,arguments);},on:function(){return this.addListener.apply(this,arguments);},subscribe:function(){return this.addListener.apply(this,arguments);},removeListener:function(E,D){return this.unsubscribe.apply(this,arguments);},addClass:function(D){B.addClass(this.get("element"),D);},getElementsByClassName:function(E,D){return B.getElementsByClassName(E,D,this.get("element"));},hasClass:function(D){return B.hasClass(this.get("element"),D);},removeClass:function(D){return B.removeClass(this.get("element"),D);},replaceClass:function(E,D){return B.replaceClass(this.get("element"),E,D);},setStyle:function(E,D){return B.setStyle(this.get("element"),E,D);},getStyle:function(D){return B.getStyle(this.get("element"),D);},fireQueue:function(){var E=this._queue;for(var F=0,D=E.length;F<D;++F){this[E[F][0]].apply(this,E[F][1]);}},appendTo:function(E,F){E=(E.get)?E.get("element"):B.get(E);this.fireEvent("beforeAppendTo",{type:"beforeAppendTo",target:E});
+F=(F&&F.get)?F.get("element"):B.get(F);var D=this.get("element");if(!D){return false;}if(!E){return false;}if(D.parent!=E){if(F){E.insertBefore(D,F);}else{E.appendChild(D);}}this.fireEvent("appendTo",{type:"appendTo",target:E});return D;},get:function(D){var F=this._configs||{},E=F.element;if(E&&!F[D]&&!YAHOO.lang.isUndefined(E.value[D])){this._setHTMLAttrConfig(D);}return C.prototype.get.call(this,D);},setAttributes:function(J,G){var E={},H=this._configOrder;for(var I=0,D=H.length;I<D;++I){if(J[H[I]]!==undefined){E[H[I]]=true;this.set(H[I],J[H[I]],G);}}for(var F in J){if(J.hasOwnProperty(F)&&!E[F]){this.set(F,J[F],G);}}},set:function(E,G,D){var F=this.get("element");if(!F){this._queue[this._queue.length]=["set",arguments];if(this._configs[E]){this._configs[E].value=G;}return;}if(!this._configs[E]&&!YAHOO.lang.isUndefined(F[E])){this._setHTMLAttrConfig(E);}return C.prototype.set.apply(this,arguments);},setAttributeConfig:function(D,E,F){this._configOrder.push(D);C.prototype.setAttributeConfig.apply(this,arguments);},createEvent:function(E,D){this._events[E]=true;return C.prototype.createEvent.apply(this,arguments);},init:function(E,D){this._initElement(E,D);},destroy:function(){var D=this.get("element");YAHOO.util.Event.purgeElement(D,true);this.unsubscribeAll();if(D&&D.parentNode){D.parentNode.removeChild(D);}this._queue=[];this._events={};this._configs={};this._configOrder=[];},_initElement:function(F,E){this._queue=this._queue||[];this._events=this._events||{};this._configs=this._configs||{};this._configOrder=[];E=E||{};E.element=E.element||F||null;var H=false;var D=A.DOM_EVENTS;this.DOM_EVENTS=this.DOM_EVENTS||{};for(var G in D){if(D.hasOwnProperty(G)){this.DOM_EVENTS[G]=D[G];}}if(typeof E.element==="string"){this._setHTMLAttrConfig("id",{value:E.element});}if(B.get(E.element)){H=true;this._initHTMLElement(E);this._initContent(E);}YAHOO.util.Event.onAvailable(E.element,function(){if(!H){this._initHTMLElement(E);}this.fireEvent("available",{type:"available",target:B.get(E.element)});},this,true);YAHOO.util.Event.onContentReady(E.element,function(){if(!H){this._initContent(E);}this.fireEvent("contentReady",{type:"contentReady",target:B.get(E.element)});},this,true);},_initHTMLElement:function(D){this.setAttributeConfig("element",{value:B.get(D.element),readOnly:true});},_initContent:function(D){this.initAttributes(D);this.setAttributes(D,true);this.fireQueue();},_setHTMLAttrConfig:function(D,F){var E=this.get("element");F=F||{};F.name=D;F.setter=F.setter||this.DEFAULT_HTML_SETTER;F.getter=F.getter||this.DEFAULT_HTML_GETTER;F.value=F.value||E[D];this._configs[D]=new YAHOO.util.Attribute(F,this);}};YAHOO.augment(A,C);YAHOO.util.Element=A;})();YAHOO.register("element",YAHOO.util.Element,{version:"2.7.0",build:"1796"});/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+YAHOO.util.Color=function(){var A="0",B=YAHOO.lang.isArray,C=YAHOO.lang.isNumber;return{real2dec:function(D){return Math.min(255,Math.round(D*256));},hsv2rgb:function(H,O,M){if(B(H)){return this.hsv2rgb.call(this,H[0],H[1],H[2]);}var D,I,L,G=Math.floor((H/60)%6),J=(H/60)-G,F=M*(1-O),E=M*(1-J*O),N=M*(1-(1-J)*O),K;switch(G){case 0:D=M;I=N;L=F;break;case 1:D=E;I=M;L=F;break;case 2:D=F;I=M;L=N;break;case 3:D=F;I=E;L=M;break;case 4:D=N;I=F;L=M;break;case 5:D=M;I=F;L=E;break;}K=this.real2dec;return[K(D),K(I),K(L)];},rgb2hsv:function(D,H,I){if(B(D)){return this.rgb2hsv.apply(this,D);}D/=255;H/=255;I/=255;var G,L,E=Math.min(Math.min(D,H),I),J=Math.max(Math.max(D,H),I),K=J-E,F;switch(J){case E:G=0;break;case D:G=60*(H-I)/K;if(H<I){G+=360;}break;case H:G=(60*(I-D)/K)+120;break;case I:G=(60*(D-H)/K)+240;break;}L=(J===0)?0:1-(E/J);F=[Math.round(G),L,J];return F;},rgb2hex:function(F,E,D){if(B(F)){return this.rgb2hex.apply(this,F);}var G=this.dec2hex;return G(F)+G(E)+G(D);},dec2hex:function(D){D=parseInt(D,10)|0;D=(D>255||D<0)?0:D;return(A+D.toString(16)).slice(-2).toUpperCase();},hex2dec:function(D){return parseInt(D,16);},hex2rgb:function(D){var E=this.hex2dec;return[E(D.slice(0,2)),E(D.slice(2,4)),E(D.slice(4,6))];},websafe:function(F,E,D){if(B(F)){return this.websafe.apply(this,F);}var G=function(H){if(C(H)){H=Math.min(Math.max(0,H),255);var I,J;for(I=0;I<256;I=I+51){J=I+51;if(H>=I&&H<=J){return(H-I>25)?J:I;}}}return H;};return[G(F),G(E),G(D)];}};}();(function(){var J=0,F=YAHOO.util,C=YAHOO.lang,D=YAHOO.widget.Slider,B=F.Color,E=F.Dom,I=F.Event,A=C.substitute,H="yui-picker";function G(L,K){J=J+1;K=K||{};if(arguments.length===1&&!YAHOO.lang.isString(L)&&!L.nodeName){K=L;L=K.element||null;}if(!L&&!K.element){L=this._createHostElement(K);}G.superclass.constructor.call(this,L,K);this.initPicker();}YAHOO.extend(G,YAHOO.util.Element,{ID:{R:H+"-r",R_HEX:H+"-rhex",G:H+"-g",G_HEX:H+"-ghex",B:H+"-b",B_HEX:H+"-bhex",H:H+"-h",S:H+"-s",V:H+"-v",PICKER_BG:H+"-bg",PICKER_THUMB:H+"-thumb",HUE_BG:H+"-hue-bg",HUE_THUMB:H+"-hue-thumb",HEX:H+"-hex",SWATCH:H+"-swatch",WEBSAFE_SWATCH:H+"-websafe-swatch",CONTROLS:H+"-controls",RGB_CONTROLS:H+"-rgb-controls",HSV_CONTROLS:H+"-hsv-controls",HEX_CONTROLS:H+"-hex-controls",HEX_SUMMARY:H+"-hex-summary",CONTROLS_LABEL:H+"-controls-label"},TXT:{ILLEGAL_HEX:"Illegal hex value entered",SHOW_CONTROLS:"Show color details",HIDE_CONTROLS:"Hide color details",CURRENT_COLOR:"Currently selected color: {rgb}",CLOSEST_WEBSAFE:"Closest websafe color: {rgb}. Click to select.",R:"R",G:"G",B:"B",H:"H",S:"S",V:"V",HEX:"#",DEG:"\u00B0",PERCENT:"%"},IMAGE:{PICKER_THUMB:"../../build/colorpicker/assets/picker_thumb.png",HUE_THUMB:"../../build/colorpicker/assets/hue_thumb.png"},DEFAULT:{PICKER_SIZE:180},OPT:{HUE:"hue",SATURATION:"saturation",VALUE:"value",RED:"red",GREEN:"green",BLUE:"blue",HSV:"hsv",RGB:"rgb",WEBSAFE:"websafe",HEX:"hex",PICKER_SIZE:"pickersize",SHOW_CONTROLS:"showcontrols",SHOW_RGB_CONTROLS:"showrgbcontrols",SHOW_HSV_CONTROLS:"showhsvcontrols",SHOW_HEX_CONTROLS:"showhexcontrols",SHOW_HEX_SUMMARY:"showhexsummary",SHOW_WEBSAFE:"showwebsafe",CONTAINER:"container",IDS:"ids",ELEMENTS:"elements",TXT:"txt",IMAGES:"images",ANIMATE:"animate"},skipAnim:true,_createHostElement:function(){var K=document.createElement("div");if(this.CSS.BASE){K.className=this.CSS.BASE;}return K;},_updateHueSlider:function(){var K=this.get(this.OPT.PICKER_SIZE),L=this.get(this.OPT.HUE);L=K-Math.round(L/360*K);if(L===K){L=0;}this.hueSlider.setValue(L,this.skipAnim);},_updatePickerSlider:function(){var L=this.get(this.OPT.PICKER_SIZE),M=this.get(this.OPT.SATURATION),K=this.get(this.OPT.VALUE);M=Math.round(M*L/100);K=Math.round(L-(K*L/100));this.pickerSlider.setRegionValue(M,K,this.skipAnim);},_updateSliders:function(){this._updateHueSlider();this._updatePickerSlider();},setValue:function(L,K){K=(K)||false;this.set(this.OPT.RGB,L,K);this._updateSliders();},hueSlider:null,pickerSlider:null,_getH:function(){var K=this.get(this.OPT.PICKER_SIZE),L=(K-this.hueSlider.getValue())/K;L=Math.round(L*360);return(L===360)?0:L;},_getS:function(){return this.pickerSlider.getXValue()/this.get(this.OPT.PICKER_SIZE);},_getV:function(){var K=this.get(this.OPT.PICKER_SIZE);return(K-this.pickerSlider.getYValue())/K;},_updateSwatch:function(){var M=this.get(this.OPT.RGB),O=this.get(this.OPT.WEBSAFE),N=this.getElement(this.ID.SWATCH),L=M.join(","),K=this.get(this.OPT.TXT);E.setStyle(N,"background-color","rgb("+L+")");N.title=A(K.CURRENT_COLOR,{"rgb":"#"+this.get(this.OPT.HEX)});N=this.getElement(this.ID.WEBSAFE_SWATCH);L=O.join(",");E.setStyle(N,"background-color","rgb("+L+")");N.title=A(K.CLOSEST_WEBSAFE,{"rgb":"#"+B.rgb2hex(O)});},_getValuesFromSliders:function(){this.set(this.OPT.RGB,B.hsv2rgb(this._getH(),this._getS(),this._getV()));},_updateFormFields:function(){this.getElement(this.ID.H).value=this.get(this.OPT.HUE);this.getElement(this.ID.S).value=this.get(this.OPT.SATURATION);this.getElement(this.ID.V).value=this.get(this.OPT.VALUE);this.getElement(this.ID.R).value=this.get(this.OPT.RED);this.getElement(this.ID.R_HEX).innerHTML=B.dec2hex(this.get(this.OPT.RED));this.getElement(this.ID.G).value=this.get(this.OPT.GREEN);this.getElement(this.ID.G_HEX).innerHTML=B.dec2hex(this.get(this.OPT.GREEN));this.getElement(this.ID.B).value=this.get(this.OPT.BLUE);this.getElement(this.ID.B_HEX).innerHTML=B.dec2hex(this.get(this.OPT.BLUE));this.getElement(this.ID.HEX).value=this.get(this.OPT.HEX);},_onHueSliderChange:function(N){var L=this._getH(),K=B.hsv2rgb(L,1,1),M="rgb("+K.join(",")+")";this.set(this.OPT.HUE,L,true);E.setStyle(this.getElement(this.ID.PICKER_BG),"background-color",M);if(this.hueSlider.valueChangeSource!==D.SOURCE_SET_VALUE){this._getValuesFromSliders();}this._updateFormFields();this._updateSwatch();},_onPickerSliderChange:function(M){var L=this._getS(),K=this._getV();this.set(this.OPT.SATURATION,Math.round(L*100),true);this.set(this.OPT.VALUE,Math.round(K*100),true);if(this.pickerSlider.valueChangeSource!==D.SOURCE_SET_VALUE){this._getValuesFromSliders();
+}this._updateFormFields();this._updateSwatch();},_getCommand:function(K){var L=I.getCharCode(K);if(L===38){return 3;}else{if(L===13){return 6;}else{if(L===40){return 4;}else{if(L>=48&&L<=57){return 1;}else{if(L>=97&&L<=102){return 2;}else{if(L>=65&&L<=70){return 2;}else{if("8, 9, 13, 27, 37, 39".indexOf(L)>-1||K.ctrlKey||K.metaKey){return 5;}else{return 0;}}}}}}}},_useFieldValue:function(L,K,N){var M=K.value;if(N!==this.OPT.HEX){M=parseInt(M,10);}if(M!==this.get(N)){this.set(N,M);}},_rgbFieldKeypress:function(M,K,O){var N=this._getCommand(M),L=(M.shiftKey)?10:1;switch(N){case 6:this._useFieldValue.apply(this,arguments);break;case 3:this.set(O,Math.min(this.get(O)+L,255));this._updateFormFields();break;case 4:this.set(O,Math.max(this.get(O)-L,0));this._updateFormFields();break;default:}},_hexFieldKeypress:function(L,K,N){var M=this._getCommand(L);if(M===6){this._useFieldValue.apply(this,arguments);}},_hexOnly:function(L,K){var M=this._getCommand(L);switch(M){case 6:case 5:case 1:break;case 2:if(K!==true){break;}default:I.stopEvent(L);return false;}},_numbersOnly:function(K){return this._hexOnly(K,true);},getElement:function(K){return this.get(this.OPT.ELEMENTS)[this.get(this.OPT.IDS)[K]];},_createElements:function(){var N,M,P,O,L,K=this.get(this.OPT.IDS),Q=this.get(this.OPT.TXT),S=this.get(this.OPT.IMAGES),R=function(U,V){var W=document.createElement(U);if(V){C.augmentObject(W,V,true);}return W;},T=function(U,V){var W=C.merge({autocomplete:"off",value:"0",size:3,maxlength:3},V);W.name=W.id;return new R(U,W);};L=this.get("element");N=new R("div",{id:K[this.ID.PICKER_BG],className:"yui-picker-bg",tabIndex:-1,hideFocus:true});M=new R("div",{id:K[this.ID.PICKER_THUMB],className:"yui-picker-thumb"});P=new R("img",{src:S.PICKER_THUMB});M.appendChild(P);N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.HUE_BG],className:"yui-picker-hue-bg",tabIndex:-1,hideFocus:true});M=new R("div",{id:K[this.ID.HUE_THUMB],className:"yui-picker-hue-thumb"});P=new R("img",{src:S.HUE_THUMB});M.appendChild(P);N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.CONTROLS],className:"yui-picker-controls"});L.appendChild(N);L=N;N=new R("div",{className:"hd"});M=new R("a",{id:K[this.ID.CONTROLS_LABEL],href:"#"});N.appendChild(M);L.appendChild(N);N=new R("div",{className:"bd"});L.appendChild(N);L=N;N=new R("ul",{id:K[this.ID.RGB_CONTROLS],className:"yui-picker-rgb-controls"});M=new R("li");M.appendChild(document.createTextNode(Q.R+" "));O=new T("input",{id:K[this.ID.R],className:"yui-picker-r"});M.appendChild(O);N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.G+" "));O=new T("input",{id:K[this.ID.G],className:"yui-picker-g"});M.appendChild(O);N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.B+" "));O=new T("input",{id:K[this.ID.B],className:"yui-picker-b"});M.appendChild(O);N.appendChild(M);L.appendChild(N);N=new R("ul",{id:K[this.ID.HSV_CONTROLS],className:"yui-picker-hsv-controls"});M=new R("li");M.appendChild(document.createTextNode(Q.H+" "));O=new T("input",{id:K[this.ID.H],className:"yui-picker-h"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.DEG));N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.S+" "));O=new T("input",{id:K[this.ID.S],className:"yui-picker-s"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.PERCENT));N.appendChild(M);M=new R("li");M.appendChild(document.createTextNode(Q.V+" "));O=new T("input",{id:K[this.ID.V],className:"yui-picker-v"});M.appendChild(O);M.appendChild(document.createTextNode(" "+Q.PERCENT));N.appendChild(M);L.appendChild(N);N=new R("ul",{id:K[this.ID.HEX_SUMMARY],className:"yui-picker-hex_summary"});M=new R("li",{id:K[this.ID.R_HEX]});N.appendChild(M);M=new R("li",{id:K[this.ID.G_HEX]});N.appendChild(M);M=new R("li",{id:K[this.ID.B_HEX]});N.appendChild(M);L.appendChild(N);N=new R("div",{id:K[this.ID.HEX_CONTROLS],className:"yui-picker-hex-controls"});N.appendChild(document.createTextNode(Q.HEX+" "));M=new T("input",{id:K[this.ID.HEX],className:"yui-picker-hex",size:6,maxlength:6});N.appendChild(M);L.appendChild(N);L=this.get("element");N=new R("div",{id:K[this.ID.SWATCH],className:"yui-picker-swatch"});L.appendChild(N);N=new R("div",{id:K[this.ID.WEBSAFE_SWATCH],className:"yui-picker-websafe-swatch"});L.appendChild(N);},_attachRGBHSV:function(L,K){I.on(this.getElement(L),"keydown",function(N,M){M._rgbFieldKeypress(N,this,K);},this);I.on(this.getElement(L),"keypress",this._numbersOnly,this,true);I.on(this.getElement(L),"blur",function(N,M){M._useFieldValue(N,this,K);},this);},_updateRGB:function(){var K=[this.get(this.OPT.RED),this.get(this.OPT.GREEN),this.get(this.OPT.BLUE)];this.set(this.OPT.RGB,K);this._updateSliders();},_initElements:function(){var O=this.OPT,N=this.get(O.IDS),L=this.get(O.ELEMENTS),K,M,P;for(K in this.ID){if(C.hasOwnProperty(this.ID,K)){N[this.ID[K]]=N[K];}}M=E.get(N[this.ID.PICKER_BG]);if(!M){this._createElements();}else{}for(K in N){if(C.hasOwnProperty(N,K)){M=E.get(N[K]);P=E.generateId(M);N[K]=P;N[N[K]]=P;L[P]=M;}}},initPicker:function(){this._initSliders();this._bindUI();this.syncUI(true);},_initSliders:function(){var K=this.ID,L=this.get(this.OPT.PICKER_SIZE);this.hueSlider=D.getVertSlider(this.getElement(K.HUE_BG),this.getElement(K.HUE_THUMB),0,L);this.pickerSlider=D.getSliderRegion(this.getElement(K.PICKER_BG),this.getElement(K.PICKER_THUMB),0,L,0,L);this.set(this.OPT.ANIMATE,this.get(this.OPT.ANIMATE));},_bindUI:function(){var K=this.ID,L=this.OPT;this.hueSlider.subscribe("change",this._onHueSliderChange,this,true);this.pickerSlider.subscribe("change",this._onPickerSliderChange,this,true);I.on(this.getElement(K.WEBSAFE_SWATCH),"click",function(M){this.setValue(this.get(L.WEBSAFE));},this,true);I.on(this.getElement(K.CONTROLS_LABEL),"click",function(M){this.set(L.SHOW_CONTROLS,!this.get(L.SHOW_CONTROLS));I.preventDefault(M);},this,true);this._attachRGBHSV(K.R,L.RED);this._attachRGBHSV(K.G,L.GREEN);this._attachRGBHSV(K.B,L.BLUE);this._attachRGBHSV(K.H,L.HUE);
+this._attachRGBHSV(K.S,L.SATURATION);this._attachRGBHSV(K.V,L.VALUE);I.on(this.getElement(K.HEX),"keydown",function(N,M){M._hexFieldKeypress(N,this,L.HEX);},this);I.on(this.getElement(this.ID.HEX),"keypress",this._hexOnly,this,true);I.on(this.getElement(this.ID.HEX),"blur",function(N,M){M._useFieldValue(N,this,L.HEX);},this);},syncUI:function(K){this.skipAnim=K;this._updateRGB();this.skipAnim=false;},_updateRGBFromHSV:function(){var L=[this.get(this.OPT.HUE),this.get(this.OPT.SATURATION)/100,this.get(this.OPT.VALUE)/100],K=B.hsv2rgb(L);this.set(this.OPT.RGB,K);this._updateSliders();},_updateHex:function(){var N=this.get(this.OPT.HEX),K=N.length,O,M,L;if(K===3){O=N.split("");for(M=0;M<K;M=M+1){O[M]=O[M]+O[M];}N=O.join("");}if(N.length!==6){return false;}L=B.hex2rgb(N);this.setValue(L);},_hideShowEl:function(M,K){var L=(C.isString(M)?this.getElement(M):M);E.setStyle(L,"display",(K)?"":"none");},initAttributes:function(K){K=K||{};G.superclass.initAttributes.call(this,K);this.setAttributeConfig(this.OPT.PICKER_SIZE,{value:K.size||this.DEFAULT.PICKER_SIZE});this.setAttributeConfig(this.OPT.HUE,{value:K.hue||0,validator:C.isNumber});this.setAttributeConfig(this.OPT.SATURATION,{value:K.saturation||0,validator:C.isNumber});this.setAttributeConfig(this.OPT.VALUE,{value:C.isNumber(K.value)?K.value:100,validator:C.isNumber});this.setAttributeConfig(this.OPT.RED,{value:C.isNumber(K.red)?K.red:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.GREEN,{value:C.isNumber(K.green)?K.green:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.BLUE,{value:C.isNumber(K.blue)?K.blue:255,validator:C.isNumber});this.setAttributeConfig(this.OPT.HEX,{value:K.hex||"FFFFFF",validator:C.isString});this.setAttributeConfig(this.OPT.RGB,{value:K.rgb||[255,255,255],method:function(O){this.set(this.OPT.RED,O[0],true);this.set(this.OPT.GREEN,O[1],true);this.set(this.OPT.BLUE,O[2],true);var Q=B.websafe(O),P=B.rgb2hex(O),N=B.rgb2hsv(O);this.set(this.OPT.WEBSAFE,Q,true);this.set(this.OPT.HEX,P,true);if(N[1]){this.set(this.OPT.HUE,N[0],true);}this.set(this.OPT.SATURATION,Math.round(N[1]*100),true);this.set(this.OPT.VALUE,Math.round(N[2]*100),true);},readonly:true});this.setAttributeConfig(this.OPT.CONTAINER,{value:null,method:function(N){if(N){N.showEvent.subscribe(function(){this.pickerSlider.focus();},this,true);}}});this.setAttributeConfig(this.OPT.WEBSAFE,{value:K.websafe||[255,255,255]});var M=K.ids||C.merge({},this.ID),L;if(!K.ids&&J>1){for(L in M){if(C.hasOwnProperty(M,L)){M[L]=M[L]+J;}}}this.setAttributeConfig(this.OPT.IDS,{value:M,writeonce:true});this.setAttributeConfig(this.OPT.TXT,{value:K.txt||this.TXT,writeonce:true});this.setAttributeConfig(this.OPT.IMAGES,{value:K.images||this.IMAGE,writeonce:true});this.setAttributeConfig(this.OPT.ELEMENTS,{value:{},readonly:true});this.setAttributeConfig(this.OPT.SHOW_CONTROLS,{value:C.isBoolean(K.showcontrols)?K.showcontrols:true,method:function(N){var O=E.getElementsByClassName("bd","div",this.getElement(this.ID.CONTROLS))[0];this._hideShowEl(O,N);this.getElement(this.ID.CONTROLS_LABEL).innerHTML=(N)?this.get(this.OPT.TXT).HIDE_CONTROLS:this.get(this.OPT.TXT).SHOW_CONTROLS;}});this.setAttributeConfig(this.OPT.SHOW_RGB_CONTROLS,{value:C.isBoolean(K.showrgbcontrols)?K.showrgbcontrols:true,method:function(N){this._hideShowEl(this.ID.RGB_CONTROLS,N);}});this.setAttributeConfig(this.OPT.SHOW_HSV_CONTROLS,{value:C.isBoolean(K.showhsvcontrols)?K.showhsvcontrols:false,method:function(N){this._hideShowEl(this.ID.HSV_CONTROLS,N);if(N&&this.get(this.OPT.SHOW_HEX_SUMMARY)){this.set(this.OPT.SHOW_HEX_SUMMARY,false);}}});this.setAttributeConfig(this.OPT.SHOW_HEX_CONTROLS,{value:C.isBoolean(K.showhexcontrols)?K.showhexcontrols:false,method:function(N){this._hideShowEl(this.ID.HEX_CONTROLS,N);}});this.setAttributeConfig(this.OPT.SHOW_WEBSAFE,{value:C.isBoolean(K.showwebsafe)?K.showwebsafe:true,method:function(N){this._hideShowEl(this.ID.WEBSAFE_SWATCH,N);}});this.setAttributeConfig(this.OPT.SHOW_HEX_SUMMARY,{value:C.isBoolean(K.showhexsummary)?K.showhexsummary:true,method:function(N){this._hideShowEl(this.ID.HEX_SUMMARY,N);if(N&&this.get(this.OPT.SHOW_HSV_CONTROLS)){this.set(this.OPT.SHOW_HSV_CONTROLS,false);}}});this.setAttributeConfig(this.OPT.ANIMATE,{value:C.isBoolean(K.animate)?K.animate:true,method:function(N){if(this.pickerSlider){this.pickerSlider.animate=N;this.hueSlider.animate=N;}}});this.on(this.OPT.HUE+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.SATURATION+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.VALUE+"Change",this._updateRGBFromHSV,this,true);this.on(this.OPT.RED+"Change",this._updateRGB,this,true);this.on(this.OPT.GREEN+"Change",this._updateRGB,this,true);this.on(this.OPT.BLUE+"Change",this._updateRGB,this,true);this.on(this.OPT.HEX+"Change",this._updateHex,this,true);this._initElements();}});YAHOO.widget.ColorPicker=G;})();YAHOO.register("colorpicker",YAHOO.widget.ColorPicker,{version:"2.7.0",build:"1796"});
+
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+(function(){var B=YAHOO.util;var A=function(D,C,E,F){if(!D){}this.init(D,C,E,F);};A.NAME="Anim";A.prototype={toString:function(){var C=this.getEl()||{};var D=C.id||C.tagName;return(this.constructor.NAME+": "+D);},patterns:{noNegatives:/width|height|opacity|padding/i,offsetAttribute:/^((width|height)|(top|left))$/,defaultUnit:/width|height|top$|bottom$|left$|right$/i,offsetUnit:/\d+(em|%|en|ex|pt|in|cm|mm|pc)$/i},doMethod:function(C,E,D){return this.method(this.currentFrame,E,D-E,this.totalFrames);},setAttribute:function(C,F,E){var D=this.getEl();if(this.patterns.noNegatives.test(C)){F=(F>0)?F:0;}if("style" in D){B.Dom.setStyle(D,C,F+E);}else{if(C in D){D[C]=F;}}},getAttribute:function(C){var E=this.getEl();var G=B.Dom.getStyle(E,C);if(G!=="auto"&&!this.patterns.offsetUnit.test(G)){return parseFloat(G);}var D=this.patterns.offsetAttribute.exec(C)||[];var H=!!(D[3]);var F=!!(D[2]);if("style" in E){if(F||(B.Dom.getStyle(E,"position")=="absolute"&&H)){G=E["offset"+D[0].charAt(0).toUpperCase()+D[0].substr(1)];}else{G=0;}}else{if(C in E){G=E[C];}}return G;},getDefaultUnit:function(C){if(this.patterns.defaultUnit.test(C)){return"px";}return"";},setRuntimeAttribute:function(D){var I;var E;var F=this.attributes;this.runtimeAttributes[D]={};var H=function(J){return(typeof J!=="undefined");};if(!H(F[D]["to"])&&!H(F[D]["by"])){return false;}I=(H(F[D]["from"]))?F[D]["from"]:this.getAttribute(D);if(H(F[D]["to"])){E=F[D]["to"];}else{if(H(F[D]["by"])){if(I.constructor==Array){E=[];for(var G=0,C=I.length;G<C;++G){E[G]=I[G]+F[D]["by"][G]*1;}}else{E=I+F[D]["by"]*1;}}}this.runtimeAttributes[D].start=I;this.runtimeAttributes[D].end=E;this.runtimeAttributes[D].unit=(H(F[D].unit))?F[D]["unit"]:this.getDefaultUnit(D);return true;},init:function(E,J,I,C){var D=false;var F=null;var H=0;E=B.Dom.get(E);this.attributes=J||{};this.duration=!YAHOO.lang.isUndefined(I)?I:1;this.method=C||B.Easing.easeNone;this.useSeconds=true;this.currentFrame=0;this.totalFrames=B.AnimMgr.fps;this.setEl=function(M){E=B.Dom.get(M);};this.getEl=function(){return E;};this.isAnimated=function(){return D;};this.getStartTime=function(){return F;};this.runtimeAttributes={};this.animate=function(){if(this.isAnimated()){return false;}this.currentFrame=0;this.totalFrames=(this.useSeconds)?Math.ceil(B.AnimMgr.fps*this.duration):this.duration;if(this.duration===0&&this.useSeconds){this.totalFrames=1;}B.AnimMgr.registerElement(this);return true;};this.stop=function(M){if(!this.isAnimated()){return false;}if(M){this.currentFrame=this.totalFrames;this._onTween.fire();}B.AnimMgr.stop(this);};var L=function(){this.onStart.fire();this.runtimeAttributes={};for(var M in this.attributes){this.setRuntimeAttribute(M);}D=true;H=0;F=new Date();};var K=function(){var O={duration:new Date()-this.getStartTime(),currentFrame:this.currentFrame};O.toString=function(){return("duration: "+O.duration+", currentFrame: "+O.currentFrame);};this.onTween.fire(O);var N=this.runtimeAttributes;for(var M in N){this.setAttribute(M,this.doMethod(M,N[M].start,N[M].end),N[M].unit);}H+=1;};var G=function(){var M=(new Date()-F)/1000;var N={duration:M,frames:H,fps:H/M};N.toString=function(){return("duration: "+N.duration+", frames: "+N.frames+", fps: "+N.fps);};D=false;H=0;this.onComplete.fire(N);};this._onStart=new B.CustomEvent("_start",this,true);this.onStart=new B.CustomEvent("start",this);this.onTween=new B.CustomEvent("tween",this);this._onTween=new B.CustomEvent("_tween",this,true);this.onComplete=new B.CustomEvent("complete",this);this._onComplete=new B.CustomEvent("_complete",this,true);this._onStart.subscribe(L);this._onTween.subscribe(K);this._onComplete.subscribe(G);}};B.Anim=A;})();YAHOO.util.AnimMgr=new function(){var C=null;var B=[];var A=0;this.fps=1000;this.delay=1;this.registerElement=function(F){B[B.length]=F;A+=1;F._onStart.fire();this.start();};this.unRegister=function(G,F){F=F||E(G);if(!G.isAnimated()||F==-1){return false;}G._onComplete.fire();B.splice(F,1);A-=1;if(A<=0){this.stop();}return true;};this.start=function(){if(C===null){C=setInterval(this.run,this.delay);}};this.stop=function(H){if(!H){clearInterval(C);for(var G=0,F=B.length;G<F;++G){this.unRegister(B[0],0);}B=[];C=null;A=0;}else{this.unRegister(H);}};this.run=function(){for(var H=0,F=B.length;H<F;++H){var G=B[H];if(!G||!G.isAnimated()){continue;}if(G.currentFrame<G.totalFrames||G.totalFrames===null){G.currentFrame+=1;if(G.useSeconds){D(G);}G._onTween.fire();}else{YAHOO.util.AnimMgr.stop(G,H);}}};var E=function(H){for(var G=0,F=B.length;G<F;++G){if(B[G]==H){return G;}}return -1;};var D=function(G){var J=G.totalFrames;var I=G.currentFrame;var H=(G.currentFrame*G.duration*1000/G.totalFrames);var F=(new Date()-G.getStartTime());var K=0;if(F<G.duration*1000){K=Math.round((F/H-1)*G.currentFrame);}else{K=J-(I+1);}if(K>0&&isFinite(K)){if(G.currentFrame+K>=J){K=J-(I+1);}G.currentFrame+=K;}};};YAHOO.util.Bezier=new function(){this.getPosition=function(E,D){var F=E.length;var C=[];for(var B=0;B<F;++B){C[B]=[E[B][0],E[B][1]];}for(var A=1;A<F;++A){for(B=0;B<F-A;++B){C[B][0]=(1-D)*C[B][0]+D*C[parseInt(B+1,10)][0];C[B][1]=(1-D)*C[B][1]+D*C[parseInt(B+1,10)][1];}}return[C[0][0],C[0][1]];};};(function(){var A=function(F,E,G,H){A.superclass.constructor.call(this,F,E,G,H);};A.NAME="ColorAnim";A.DEFAULT_BGCOLOR="#fff";var C=YAHOO.util;YAHOO.extend(A,C.Anim);var D=A.superclass;var B=A.prototype;B.patterns.color=/color$/i;B.patterns.rgb=/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i;B.patterns.hex=/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i;B.patterns.hex3=/^#?([0-9A-F]{1})([0-9A-F]{1})([0-9A-F]{1})$/i;B.patterns.transparent=/^transparent|rgba\(0, 0, 0, 0\)$/;B.parseColor=function(E){if(E.length==3){return E;}var F=this.patterns.hex.exec(E);if(F&&F.length==4){return[parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16)];}F=this.patterns.rgb.exec(E);if(F&&F.length==4){return[parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10)];}F=this.patterns.hex3.exec(E);if(F&&F.length==4){return[parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16)];
+}return null;};B.getAttribute=function(E){var G=this.getEl();if(this.patterns.color.test(E)){var I=YAHOO.util.Dom.getStyle(G,E);var H=this;if(this.patterns.transparent.test(I)){var F=YAHOO.util.Dom.getAncestorBy(G,function(J){return !H.patterns.transparent.test(I);});if(F){I=C.Dom.getStyle(F,E);}else{I=A.DEFAULT_BGCOLOR;}}}else{I=D.getAttribute.call(this,E);}return I;};B.doMethod=function(F,J,G){var I;if(this.patterns.color.test(F)){I=[];for(var H=0,E=J.length;H<E;++H){I[H]=D.doMethod.call(this,F,J[H],G[H]);}I="rgb("+Math.floor(I[0])+","+Math.floor(I[1])+","+Math.floor(I[2])+")";}else{I=D.doMethod.call(this,F,J,G);}return I;};B.setRuntimeAttribute=function(F){D.setRuntimeAttribute.call(this,F);if(this.patterns.color.test(F)){var H=this.attributes;var J=this.parseColor(this.runtimeAttributes[F].start);var G=this.parseColor(this.runtimeAttributes[F].end);if(typeof H[F]["to"]==="undefined"&&typeof H[F]["by"]!=="undefined"){G=this.parseColor(H[F].by);for(var I=0,E=J.length;I<E;++I){G[I]=J[I]+G[I];}}this.runtimeAttributes[F].start=J;this.runtimeAttributes[F].end=G;}};C.ColorAnim=A;})();
+/*
+TERMS OF USE - EASING EQUATIONS
+Open source under the BSD License.
+Copyright 2001 Robert Penner All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+YAHOO.util.Easing={easeNone:function(B,A,D,C){return D*B/C+A;},easeIn:function(B,A,D,C){return D*(B/=C)*B+A;},easeOut:function(B,A,D,C){return -D*(B/=C)*(B-2)+A;},easeBoth:function(B,A,D,C){if((B/=C/2)<1){return D/2*B*B+A;}return -D/2*((--B)*(B-2)-1)+A;},easeInStrong:function(B,A,D,C){return D*(B/=C)*B*B*B+A;},easeOutStrong:function(B,A,D,C){return -D*((B=B/C-1)*B*B*B-1)+A;},easeBothStrong:function(B,A,D,C){if((B/=C/2)<1){return D/2*B*B*B*B+A;}return -D/2*((B-=2)*B*B*B-2)+A;},elasticIn:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return -(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;},elasticOut:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return B*Math.pow(2,-10*C)*Math.sin((C*F-D)*(2*Math.PI)/E)+G+A;},elasticBoth:function(C,A,G,F,B,E){if(C==0){return A;}if((C/=F/2)==2){return A+G;}if(!E){E=F*(0.3*1.5);}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}if(C<1){return -0.5*(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;}return B*Math.pow(2,-10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E)*0.5+G+A;},backIn:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}return E*(B/=D)*B*((C+1)*B-C)+A;},backOut:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}return E*((B=B/D-1)*B*((C+1)*B+C)+1)+A;},backBoth:function(B,A,E,D,C){if(typeof C=="undefined"){C=1.70158;}if((B/=D/2)<1){return E/2*(B*B*(((C*=(1.525))+1)*B-C))+A;}return E/2*((B-=2)*B*(((C*=(1.525))+1)*B+C)+2)+A;},bounceIn:function(B,A,D,C){return D-YAHOO.util.Easing.bounceOut(C-B,0,D,C)+A;},bounceOut:function(B,A,D,C){if((B/=C)<(1/2.75)){return D*(7.5625*B*B)+A;}else{if(B<(2/2.75)){return D*(7.5625*(B-=(1.5/2.75))*B+0.75)+A;}else{if(B<(2.5/2.75)){return D*(7.5625*(B-=(2.25/2.75))*B+0.9375)+A;}}}return D*(7.5625*(B-=(2.625/2.75))*B+0.984375)+A;},bounceBoth:function(B,A,D,C){if(B<C/2){return YAHOO.util.Easing.bounceIn(B*2,0,D,C)*0.5+A;}return YAHOO.util.Easing.bounceOut(B*2-C,0,D,C)*0.5+D*0.5+A;}};(function(){var A=function(H,G,I,J){if(H){A.superclass.constructor.call(this,H,G,I,J);}};A.NAME="Motion";var E=YAHOO.util;YAHOO.extend(A,E.ColorAnim);var F=A.superclass;var C=A.prototype;C.patterns.points=/^points$/i;C.setAttribute=function(G,I,H){if(this.patterns.points.test(G)){H=H||"px";F.setAttribute.call(this,"left",I[0],H);F.setAttribute.call(this,"top",I[1],H);}else{F.setAttribute.call(this,G,I,H);}};C.getAttribute=function(G){if(this.patterns.points.test(G)){var H=[F.getAttribute.call(this,"left"),F.getAttribute.call(this,"top")];}else{H=F.getAttribute.call(this,G);}return H;};C.doMethod=function(G,K,H){var J=null;if(this.patterns.points.test(G)){var I=this.method(this.currentFrame,0,100,this.totalFrames)/100;J=E.Bezier.getPosition(this.runtimeAttributes[G],I);}else{J=F.doMethod.call(this,G,K,H);}return J;};C.setRuntimeAttribute=function(P){if(this.patterns.points.test(P)){var H=this.getEl();var J=this.attributes;var G;var L=J["points"]["control"]||[];var I;var M,O;if(L.length>0&&!(L[0] instanceof Array)){L=[L];}else{var K=[];for(M=0,O=L.length;M<O;++M){K[M]=L[M];}L=K;}if(E.Dom.getStyle(H,"position")=="static"){E.Dom.setStyle(H,"position","relative");}if(D(J["points"]["from"])){E.Dom.setXY(H,J["points"]["from"]);
+}else{E.Dom.setXY(H,E.Dom.getXY(H));}G=this.getAttribute("points");if(D(J["points"]["to"])){I=B.call(this,J["points"]["to"],G);var N=E.Dom.getXY(this.getEl());for(M=0,O=L.length;M<O;++M){L[M]=B.call(this,L[M],G);}}else{if(D(J["points"]["by"])){I=[G[0]+J["points"]["by"][0],G[1]+J["points"]["by"][1]];for(M=0,O=L.length;M<O;++M){L[M]=[G[0]+L[M][0],G[1]+L[M][1]];}}}this.runtimeAttributes[P]=[G];if(L.length>0){this.runtimeAttributes[P]=this.runtimeAttributes[P].concat(L);}this.runtimeAttributes[P][this.runtimeAttributes[P].length]=I;}else{F.setRuntimeAttribute.call(this,P);}};var B=function(G,I){var H=E.Dom.getXY(this.getEl());G=[G[0]-H[0]+I[0],G[1]-H[1]+I[1]];return G;};var D=function(G){return(typeof G!=="undefined");};E.Motion=A;})();(function(){var D=function(F,E,G,H){if(F){D.superclass.constructor.call(this,F,E,G,H);}};D.NAME="Scroll";var B=YAHOO.util;YAHOO.extend(D,B.ColorAnim);var C=D.superclass;var A=D.prototype;A.doMethod=function(E,H,F){var G=null;if(E=="scroll"){G=[this.method(this.currentFrame,H[0],F[0]-H[0],this.totalFrames),this.method(this.currentFrame,H[1],F[1]-H[1],this.totalFrames)];}else{G=C.doMethod.call(this,E,H,F);}return G;};A.getAttribute=function(E){var G=null;var F=this.getEl();if(E=="scroll"){G=[F.scrollLeft,F.scrollTop];}else{G=C.getAttribute.call(this,E);}return G;};A.setAttribute=function(E,H,G){var F=this.getEl();if(E=="scroll"){F.scrollLeft=H[0];F.scrollTop=H[1];}else{C.setAttribute.call(this,E,H,G);}};B.Scroll=D;})();YAHOO.register("animation",YAHOO.util.Anim,{version:"2.7.0",build:"1799"});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/ciframe.html b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/ciframe.html
new file mode 100644
index 00000000..f8801771
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/ciframe.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function gup( name )
+{
+	name = name.replace( /[\[]/, '\\\[' ).replace( /[\]]/, '\\\]' ) ;
+	var regexS = '[\\?&]' + name + '=([^&#]*)' ;
+	var regex = new RegExp( regexS ) ;
+	var results = regex.exec( window.location.href ) ;
+
+	if ( results )
+		return results[ 1 ] ;
+	else
+		return '' ;
+}
+
+var interval;
+
+function sendData2Master()
+{
+	var destination = window.parent.parent ;
+	try
+	{
+		if ( destination.XDTMaster )
+		{
+			var t = destination.XDTMaster.read( [ gup( 'cmd' ), gup( 'data' ) ] ) ;
+			window.clearInterval( interval ) ;
+		}
+	}
+	catch (e) {}
+}
+
+function onLoad()
+{
+	interval = window.setInterval( sendData2Master, 100 );
+}
+
+</script>
+</head>
+<body onload="onLoad()"><p></p></body>
+</html>
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/index.html b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
new file mode 100644
index 00000000..bec11ae4
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function doLoadScript( url )
+{
+	if ( !url )
+		return false ;
+
+	var s = document.createElement( "script" ) ;
+	s.type = "text/javascript" ;
+	s.src = url ;
+	document.getElementsByTagName( "head" )[ 0 ].appendChild( s ) ;
+
+	return true ;
+}
+
+var opener;
+function tryLoad()
+{
+	opener = window.parent;
+
+	// get access to global parameters
+	var oParams = window.opener.oldFramesetPageParams;
+
+	// make frameset rows string prepare
+	var sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
+	document.getElementById( 'itFrameset' ).rows = sFramesetRows ;
+
+	// dynamic including init frames and crossdomain transport code
+	// from config sproxy_js_frameset url
+	var addScriptUrl = oParams.sproxy_js_frameset ;
+	doLoadScript( addScriptUrl ) ;
+}
+
+	</script>
+</head>
+
+<frameset id="itFrameset" onload="tryLoad();" border="0" rows="30,*,*,0">
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"></frame>
+    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"></frame>
+</frameset>
+</html>
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.css b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.css
new file mode 100644
index 00000000..b73dae40
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.css
@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+.midtext
+{
+	padding:0px;
+	margin:10px;
+}
+
+.midtext p
+{
+	padding:0px;
+	margin:10px;
+}
+
+.Button
+{
+	border: #737357 1px solid;
+	color: #3b3b1f;
+	background-color: #c7c78f;
+}
+
+.PopupTabArea
+{
+	color: #737357;
+	background-color: #e3e3c7;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #d5d59d 1px solid;
+}
+.PopupTabEmptyArea
+{
+	padding-left: 10px;
+	border-bottom: #d5d59d 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #d5d59d 1px solid;
+	border-top: #d5d59d 1px solid;
+	border-left: #d5d59d 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #737357;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #d5d59d 1px solid;
+	cursor: pointer;
+}
+
+.PopupTabSelected
+{
+	font-weight: bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f1f1e3 1px solid;
+	background-color: #f1f1e3;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.js b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.js
new file mode 100644
index 00000000..299245df
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -0,0 +1,192 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'checkspell', function( editor )
+{
+	var number = CKEDITOR.tools.getNextNumber(),
+		iframeId = 'cke_frame_' + number,
+		textareaId = 'cke_data_' + number,
+		errorBoxId = 'cke_error_' + number,
+		interval,
+		protocol = document.location.protocol || 'http:',
+		errorMsg = editor.lang.spellCheck.notAvailable;
+
+	var pasteArea = '<textarea'+
+			' style="display: none"' +
+			' id="' + textareaId + '"' +
+			' rows="10"' +
+			' cols="40">' +
+		' </textarea><div' +
+			' id="' + errorBoxId + '"' +
+			' style="display:none;color:red;font-size:16px;font-weight:bold;padding-top:160px;text-align:center;z-index:11;">' +
+		'</div><iframe' +
+			' src=""' +
+			' style="width:100%;background-color:#f1f1e3;"' +
+			' frameborder="0"' +
+			' name="' + iframeId + '"' +
+			' id="' + iframeId + '"' +
+			' allowtransparency="1">' +
+		'</iframe>';
+
+	var wscCoreUrl = editor.config.wsc_customLoaderScript || ( protocol +
+			'//loader.webspellchecker.net/sproxy_fck/sproxy.php'
+			+ '?plugin=fck2'
+			+ '&customerid=' + editor.config.wsc_customerId
+			+ '&cmd=script&doc=wsc&schema=22'
+		);
+
+	if ( editor.config.wsc_customLoaderScript )
+		errorMsg += '<p style="color:#000;font-size:11px;font-weight: normal;text-align:center;padding-top:10px">' +
+			editor.lang.spellCheck.errorLoading.replace( /%s/g, editor.config.wsc_customLoaderScript ) + '</p>';
+
+	function burnSpelling( dialog, errorMsg )
+	{
+		var i = 0;
+		return function ()
+		{
+			if ( typeof( window.doSpell ) == 'function' )
+			{
+				//Call from window.setInteval expected at once.
+				if ( typeof( interval ) != 'undefined' )
+					window.clearInterval( interval );
+
+				initAndSpell( dialog );
+			}
+			else if ( i++ == 180 )								// Timeout: 180 * 250ms = 45s.
+				window._cancelOnError( errorMsg );
+		};
+	}
+
+	window._cancelOnError = function( m )
+	{
+		if ( typeof( window.WSC_Error ) == 'undefined' )
+		{
+			CKEDITOR.document.getById( iframeId ).setStyle( 'display', 'none' );
+			var errorBox = CKEDITOR.document.getById( errorBoxId );
+			errorBox.setStyle( 'display', 'block' );
+			errorBox.setHtml( m || editor.lang.spellCheck.notAvailable );
+		}
+	};
+
+	function initAndSpell( dialog )
+	{
+		var LangComparer = new window._SP_FCK_LangCompare(),							// Language abbr standarts comparer.
+			pluginPath = CKEDITOR.getUrl( editor.plugins.wsc.path + 'dialogs/' ),			// Service paths corecting/preparing.
+			framesetPath = pluginPath + 'tmpFrameset.html';
+
+		// global var is used in FCK specific core
+		// change on equal var used in fckplugin.js
+		window.gFCKPluginName = 'wsc';
+
+		LangComparer.setDefaulLangCode( editor.config.defaultLanguage );
+
+		window.doSpell({
+			ctrl : textareaId,
+
+			lang : editor.config.wsc_lang || LangComparer.getSPLangCode(editor.langCode ),
+			intLang: editor.config.wsc_uiLang || LangComparer.getSPLangCode(editor.langCode ),
+			winType : iframeId,		// If not defined app will run on winpopup.
+
+			// Callback binding section.
+			onCancel : function()
+			{
+				dialog.hide();
+			},
+			onFinish : function( dT )
+			{
+				editor.focus();
+				dialog.getParentEditor().setData( dT.value );
+				dialog.hide();
+			},
+
+			// Some manipulations with client static pages.
+			staticFrame : framesetPath,
+			framesetPath : framesetPath,
+			iframePath : pluginPath + 'ciframe.html',
+
+			// Styles defining.
+			schemaURI : pluginPath + 'wsc.css',
+
+			userDictionaryName: editor.config.wsc_userDictionaryName,
+			customDictionaryName: editor.config.wsc_customDictionaryIds && editor.config.wsc_customDictionaryIds.split(","),
+			domainName: editor.config.wsc_domainName
+
+		});
+
+		// Hide user message console (if application was loaded more then after timeout).
+		CKEDITOR.document.getById( errorBoxId ).setStyle( 'display', 'none' );
+		CKEDITOR.document.getById( iframeId ).setStyle( 'display', 'block' );
+	}
+
+	return {
+		title : editor.config.wsc_dialogTitle || editor.lang.spellCheck.title,
+		minWidth : 485,
+		minHeight : 380,
+		buttons : [ CKEDITOR.dialog.cancelButton ],
+		onShow : function()
+		{
+			var contentArea = this.getContentElement( 'general', 'content' ).getElement();
+			contentArea.setHtml( pasteArea );
+			contentArea.getChild( 2 ).setStyle( 'height', this._.contentSize.height + 'px' );
+
+			if ( typeof( window.doSpell ) != 'function' )
+			{
+				// Load script.
+				CKEDITOR.document.getHead().append(
+					CKEDITOR.document.createElement( 'script',
+						{
+							attributes :
+								{
+									type : 'text/javascript',
+									src : wscCoreUrl
+								}
+						})
+				);
+			}
+
+			var sData = editor.getData();											// Get the data to be checked.
+			CKEDITOR.document.getById( textareaId ).setValue( sData );
+
+			interval = window.setInterval( burnSpelling( this, errorMsg ), 250 );
+		},
+		onHide : function()
+		{
+			window.ooo = undefined;
+			window.int_framsetLoaded = undefined;
+			window.framesetLoaded = undefined;
+			window.is_window_opened = false;
+		},
+		contents : [
+			{
+				id : 'general',
+				label : editor.config.wsc_dialogTitle || editor.lang.spellCheck.title,
+				padding : 0,
+				elements : [
+					{
+						type : 'html',
+						id : 'content',
+						html : ''
+					}
+				]
+			}
+		]
+	};
+});
+
+// Expand the spell-check frame when dialog resized. (#6829)
+CKEDITOR.dialog.on( 'resize', function( evt )
+{
+	var data = evt.data,
+		dialog = data.dialog;
+
+	if ( dialog._.name == 'checkspell' )
+	{
+		var content = dialog.getContentElement( 'general', 'content' ).getElement(),
+			iframe = content && content.getChild( 2 );
+
+		iframe && iframe.setSize( 'height', data.height );
+		iframe && iframe.setSize( 'width', data.width );
+	}
+});
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/wsc/index.html b/upload/public/js/3rd_party/ckeditor/plugins/wsc/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/wsc/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/plugins/xml/plugin.js b/upload/public/js/3rd_party/ckeditor/plugins/xml/plugin.js
new file mode 100644
index 00000000..d622fdd3
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/plugins/xml/plugin.js
@@ -0,0 +1,170 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the {@link CKEDITOR.xml} class, which represents a
+ *		loaded XML document.
+ */
+
+(function()
+{
+	CKEDITOR.plugins.add( 'xml', {});
+
+	/**
+	 * Represents a loaded XML document.
+	 * @constructor
+	 * @param {object|string} xmlObjectOrData A native XML (DOM document) object or
+	 *		a string containing the XML definition to be loaded.
+	 * @example
+	 * var xml = <b>new CKEDITOR.xml( '<books><book title="My Book" /></books>' )</b>;
+	 */
+	CKEDITOR.xml = function( xmlObjectOrData )
+	{
+		var baseXml = null;
+
+		if ( typeof xmlObjectOrData == 'object' )
+			baseXml = xmlObjectOrData;
+		else
+		{
+			var data = ( xmlObjectOrData || '' ).replace( /&nbsp;/g, '\xA0' );
+			if ( window.DOMParser )
+				baseXml = (new DOMParser()).parseFromString( data, 'text/xml' );
+			else if ( window.ActiveXObject )
+			{
+				try { baseXml = new ActiveXObject( 'MSXML2.DOMDocument' ); }
+				catch(e)
+				{
+					try { baseXml = new ActiveXObject( 'Microsoft.XmlDom' ); } catch(e) {}
+				}
+
+				if ( baseXml )
+				{
+					baseXml.async = false;
+					baseXml.resolveExternals = false;
+					baseXml.validateOnParse = false;
+					baseXml.loadXML( data );
+				}
+			}
+		}
+
+		/**
+		 * The native XML (DOM document) used by the class instance.
+		 * @type object
+		 * @example
+		 */
+		this.baseXml = baseXml;
+	};
+
+	CKEDITOR.xml.prototype =
+	{
+		/**
+		 * Get a single node from the XML document, based on a XPath query.
+		 * @param {String} xpath The XPath query to execute.
+		 * @param {Object} [contextNode] The XML DOM node to be used as the context
+		 *		for the XPath query. The document root is used by default.
+		 * @returns {Object} A XML node element or null if the query has no results.
+		 * @example
+		 * // Create the XML instance.
+		 * var xml = new CKEDITOR.xml( '<list><item id="test1" /><item id="test2" /></list>' );
+		 * // Get the first <item> node.
+		 * var itemNode = <b>xml.selectSingleNode( 'list/item' )</b>;
+		 * // Alert "item".
+		 * alert( itemNode.nodeName );
+		 */
+		selectSingleNode : function( xpath, contextNode )
+		{
+			var baseXml = this.baseXml;
+
+			if ( contextNode || ( contextNode = baseXml ) )
+			{
+				if ( CKEDITOR.env.ie || contextNode.selectSingleNode )	// IE
+					return contextNode.selectSingleNode( xpath );
+				else if ( baseXml.evaluate )							// Others
+				{
+					var result = baseXml.evaluate( xpath, contextNode, null, 9, null);
+					return ( result && result.singleNodeValue ) || null;
+				}
+			}
+
+			return null;
+		},
+
+		/**
+		 * Gets a list node from the XML document, based on a XPath query.
+		 * @param {String} xpath The XPath query to execute.
+		 * @param {Object} [contextNode] The XML DOM node to be used as the context
+		 *		for the XPath query. The document root is used by default.
+		 * @returns {ArrayLike} An array containing all matched nodes. The array will
+		 *		be empty if the query has no results.
+		 * @example
+		 * // Create the XML instance.
+		 * var xml = new CKEDITOR.xml( '<list><item id="test1" /><item id="test2" /></list>' );
+		 * // Get the first <item> node.
+		 * var itemNodes = xml.selectSingleNode( 'list/item' );
+		 * // Alert "item" twice, one for each <item>.
+		 * for ( var i = 0 ; i < itemNodes.length ; i++ )
+		 *     alert( itemNodes[i].nodeName );
+		 */
+		selectNodes : function( xpath, contextNode )
+		{
+			var baseXml = this.baseXml,
+				nodes = [];
+
+			if ( contextNode || ( contextNode = baseXml ) )
+			{
+				if ( CKEDITOR.env.ie || contextNode.selectNodes )		// IE
+					return contextNode.selectNodes( xpath );
+				else if ( baseXml.evaluate )							// Others
+				{
+					var result = baseXml.evaluate( xpath, contextNode, null, 5, null);
+
+					if ( result )
+					{
+						var node;
+						while ( ( node = result.iterateNext() ) )
+							nodes.push( node );
+					}
+				}
+			}
+
+			return nodes;
+		},
+
+		/**
+		 * Gets the string representation of hte inner contents of a XML node,
+		 * based on a XPath query.
+		 * @param {String} xpath The XPath query to execute.
+		 * @param {Object} [contextNode] The XML DOM node to be used as the context
+		 *		for the XPath query. The document root is used by default.
+		 * @returns {String} The textual representation of the inner contents of
+		 *		the node or null if the query has no results.
+		 * @example
+		 * // Create the XML instance.
+		 * var xml = new CKEDITOR.xml( '<list><item id="test1" /><item id="test2" /></list>' );
+		 * // Alert "<item id="test1" /><item id="test2" />".
+		 * alert( xml.getInnerXml( 'list' ) );
+		 */
+		getInnerXml : function( xpath, contextNode )
+		{
+			var node = this.selectSingleNode( xpath, contextNode ),
+				xml = [];
+			if ( node )
+			{
+				node = node.firstChild;
+				while ( node )
+				{
+					if ( node.xml )				// IE
+						xml.push( node.xml );
+					else if ( window.XMLSerializer )	// Others
+						xml.push( ( new XMLSerializer() ).serializeToString( node ) );
+
+					node = node.nextSibling;
+				}
+			}
+
+			return xml.length ? xml.join( '' ) : null;
+		}
+	};
+})();
diff --git a/upload/public/js/3rd_party/ckeditor/skins/index.html b/upload/public/js/3rd_party/ckeditor/skins/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/dialog.css b/upload/public/js/3rd_party/ckeditor/skins/ips/dialog.css
new file mode 100644
index 00000000..5f9f92ad
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/dialog.css
@@ -0,0 +1,465 @@
+/* IPS */
+body .cke_dialog {
+visibility:visible;
+}
+
+.cke_skin_ips .cke_dialog_body {
+margin:0px;
+position:relative;
+z-index:1;
+-webkit-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7);
+-moz-box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7);
+box-shadow: 0px 12px 25px rgba(0, 0, 0, 0.7 );
+-moz-border-radius: 4px;
+-webkit-border-radius: 4px;
+border-radius: 4px;
+font-size: 12px !important;
+}
+
+.cke_skin_ips .cke_dialog_tl,
+.cke_skin_ips .cke_dialog_tr,
+.cke_skin_ips .cke_dialog_tc,
+.cke_skin_ips .cke_dialog_bl,
+.cke_skin_ips .cke_dialog_br,
+.cke_skin_ips .cke_dialog_bc,
+.cke_skin_ips .cke_dialog_ml,
+.cke_skin_ips .cke_dialog_mr {
+background-image:none;
+background-repeat:no-repeat;
+position:absolute;
+height:0px !important;
+width:0x !important;
+display: none !important;
+}
+
+.cke_skin_ips .cke_dialog_title {
+/* background-color:#8db1ff;
+background-image:url(images/sprites2.png);
+background-position:0 -678px;
+background-repeat:repeat-x;
+background:#eee url(images/gradient.png); */
+background-position:0 -60px;
+color:#444;
+cursor:move;
+font-size:18px;
+font-weight:bold;
+padding:7px 10px 26px;
+position:relative;
+font-family:"Helveticae Neue", Helvetica, Arial, sans-serif;;
+}
+
+.cke_skin_ips .cke_browser_ie.cke_rtl .cke_dialog_title {
+position:static!important;
+unicode-bidi:bidi-override;
+}
+
+.cke_skin_ips .cke_dialog_contents {
+background-color:#fff;
+font-size: 12px;
+border-top:1px solid #bbb;
+overflow:auto;
+padding:5px 10px;
+}
+
+.cke_skin_ips .cke_dialog_footer {
+background-color:#fff;
+text-align:right;
+}
+
+.cke_skin_ips .cke_rtl .cke_dialog_footer {
+text-align:left;
+}
+
+.cke_skin_ips .cke_dialog_tabs {
+/*display:inline-block;*/
+/*height:19px;*/
+margin-left:0px;
+margin-right:0px;
+margin-top:-4px;
+margin-bottom: -1px;
+padding-left: 5px;
+/*left: 0; right: 0;
+position:absolute;*/
+z-index:2;
+}
+
+.cke_skin_ips a.cke_dialog_tab,.cke_skin_ips a:link.cke_dialog_tab,.cke_skin_ips a:active.cke_dialog_tab,.cke_skin_ips a:hover.cke_dialog_tab,.cke_skin_ips a:visited.cke_dialog_tab {
+border-left:1px solid #aaa;
+border-right:1px solid #aaa;
+border-top:1px solid #aaa;
+color:#444;
+cursor:pointer;
+display:inline-block;
+height:14px;
+padding:5px 12px 2px;
+margin-right:5px;
+-webkit-border-top-left-radius: 2px;
+-webkit-border-top-right-radius: 2px;
+-moz-border-radius-topleft: 2px;
+-moz-border-radius-topright: 2px;
+border-top-left-radius: 2px;
+border-top-right-radius: 2px;
+/*background:url(images/gradient.png);*/
+color:#444;
+}
+
+.cke_skin_ips .cke_browser_gecko18 a.cke_dialog_tab,.cke_skin_ips .cke_browser_gecko18 a:link.cke_dialog_tab,.cke_skin_ips .cke_browser_gecko18 a:active.cke_dialog_tab,.cke_skin_ips .cke_browser_gecko18 a:hover.cke_dialog_tab,.cke_skin_ips .cke_browser_gecko18 a:visited.cke_dialog_tab {
+display:inline;
+position:relative;
+top:6px;
+}
+
+.cke_skin_ips a.cke_dialog_tab {
+background-color:#dedede;
+}
+
+.cke_skin_ips a:hover.cke_dialog_tab {
+background-color:#fff;
+}
+
+.cke_skin_ips a.cke_dialog_tab_selected,.cke_skin_ips a:link.cke_dialog_tab_selected,.cke_skin_ips a:active.cke_dialog_tab_selected,.cke_skin_ips a:hover.cke_dialog_tab_selected,.cke_skin_ips a:visited.cke_dialog_tab_selected {
+background:#fff;
+border-bottom:1px solid #fff;
+cursor:default;
+font-weight:normal;
+}
+
+.cke_skin_ips .cke_hc .cke_dialog_tabs a,.cke_skin_ips .cke_hc .cke_dialog_footer a {
+border:1px solid #FFF;
+filter:alpha(opacity=100);
+opacity:1;
+}
+
+.cke_skin_ips .cke_single_page .cke_dialog_title {
+padding-bottom:3px;
+}
+
+.cke_skin_ips .cke_dialog_ui_vbox table,.cke_skin_ips .cke_dialog_ui_hbox table {
+margin:auto;
+}
+
+.cke_skin_ips .cke_dialog_ui_vbox_child {
+padding:5px 0;
+}
+
+.cke_skin_ips input.cke_dialog_ui_input_text,.cke_skin_ips input.cke_dialog_ui_input_password {
+background-color:#FFF;
+border:none;
+height:14px;
+padding:0;
+width:100%;
+}
+
+input:focus {
+outline: none;
+}
+
+.cke_skin_ips .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_text,.cke_skin_ips .cke_browser_gecko.cke_hc div.cke_dialog_ui_input_password {
+border-width:0;
+}
+
+.cke_skin_ips .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_text,.cke_skin_ips .cke_browser_gecko18.cke_hc div.cke_dialog_ui_input_password {
+border-width:1px;
+}
+
+.cke_skin_ips textarea.cke_dialog_ui_input_textarea {
+background-color:#FFF;
+border:none;
+overflow:auto;
+padding:0;
+resize:none;
+width:100%;
+}
+
+.cke_skin_ips div.cke_disabled .cke_dialog_ui_labeled_content * {
+background-color:#a0a0a0;
+cursor:default;
+}
+
+.cke_skin_ips .cke_dialog_ui_hbox {
+width:100%;
+}
+
+.cke_skin_ips .cke_dialog_ui_hbox_first,.cke_skin_ips .cke_dialog_ui_hbox_child,.cke_skin_ips .cke_dialog_ui_hbox_last {
+vertical-align:top;
+}
+
+.cke_skin_ips .cke_ltr .cke_dialog_ui_hbox_first,.cke_skin_ips .cke_ltr .cke_dialog_ui_hbox_child {
+padding-right:10px;
+}
+
+.cke_skin_ips .cke_rtl .cke_dialog_ui_hbox_first,.cke_skin_ips .cke_rtl .cke_dialog_ui_hbox_child {
+padding-left:10px;
+}
+
+.cke_skin_ips a.cke_dialog_ui_button {
+border-collapse:separate;
+cursor:default;
+}
+
+.cke_skin_ips span.cke_dialog_ui_button {
+/*background:url(images/gradient.png) repeat-x;*/
+border:1px solid #bebebe;
+color:#444;
+cursor:default;
+display:inline-block;
+padding:4px 8px;
+text-align:center;
+font-family:"Helveticae Neue", Helvetica, Arial, sans-serif;
+-webkit-border-radius: 2px;
+-moz-border-radius: 2px;
+border-radius: 2px;
+}
+
+.cke_skin_ips a.cke_dialog_ui_button span.cke_disabled {
+background-color:#c5c5b3;
+border:#898980 1px solid;
+color:#5e5e55;
+}
+
+.cke_skin_ips a:focus span.cke_dialog_ui_button,.cke_skin_ips a:active span.cke_dialog_ui_button {
+background-color:#8db1ff;
+}
+
+.cke_skin_ips .cke_hc a:focus span.cke_dialog_ui_button,.cke_skin_ips .cke_hc a:active span.cke_dialog_ui_button {
+border-width:2px;
+}
+
+.cke_skin_ips .cke_dialog_footer_buttons {
+display:inline-table;
+margin-left:12px;
+margin-right:12px;
+position:relative;
+width:auto;
+}
+
+.cke_skin_ips .cke_dialog_footer_buttons span.cke_dialog_ui_button {
+margin:7px 0;
+width:60px;
+}
+
+.cke_skin_ips a.cke_dialog_close_button,.cke_skin_ips a:hover.cke_dialog_close_button,.cke_skin_ips .cke_browser_ie6 a.cke_dialog_close_button,.cke_skin_ips .cke_browser_ie6 a:hover.cke_dialog_close_button {
+background-image:url(images/sprites2.png);
+background-position:-20px -655px;
+background-repeat:no-repeat;
+cursor:pointer;
+height:21px;
+position:absolute;
+text-align:center;
+top:7px;
+width:21px;
+}
+
+.cke_skin_ips .cke_rtl a.cke_dialog_close_button,.cke_skin_ips .cke_rtl a:hover.cke_dialog_close_button {
+left:10px;
+}
+
+.cke_skin_ips .cke_browser_ie6.cke_rtl a.cke_dialog_close_button,.cke_skin_ips .cke_browser_ie6.cke_rtl a:hover.cke_dialog_close_button {
+float:left;
+margin-left:-7px;
+margin-top:-55px;
+position:relative;
+}
+
+.cke_skin_ips .cke_browser_iequirks.cke_rtl.cke_single_page a.cke_dialog_close_button,.cke_skin_ips .cke_browser_iequirks.cke_rtl.cke_single_page a:hover.cke_dialog_close_button {
+margin-top:-32px;
+}
+
+.cke_skin_ips .cke_browser_iequirks.cke_ltr a.cke_dialog_close_button,.cke_skin_ips .cke_browser_iequirks.cke_ltr a:hover.cke_dialog_close_button {
+margin-top:0;
+}
+
+.cke_skin_ips .cke_dialog_ui_input_select {
+background-color:#FFF;
+border:1px solid #aaa;
+padding:3px;
+}
+
+.cke_skin_ips .cke_dialog_ui_input_file {
+height:25px;
+width:100%;
+}
+
+.cke_skin_ips .cke_dialog .cke_dark_background {
+background-color:#fff;
+font-size:14px;
+text-align:center;
+}
+
+.cke_skin_ips .cke_dialog .cke_hand {
+cursor:pointer;
+}
+
+.cke_skin_ips .cke_dialog .cke_centered {
+text-align:center;
+}
+
+.cke_skin_ips .cke_dialog a.cke_btn_reset {
+background-image:url(images/mini.gif);
+background-position:0 -32px;
+background-repeat:no-repeat;
+border:1px none;
+float:right;
+font-size:1px;
+height:16px;
+width:16px;
+}
+
+.cke_skin_ips .cke_dialog a.cke_btn_locked,.cke_skin_ips .cke_dialog a.cke_btn_unlocked {
+background-image:url(images/mini.gif);
+background-position:0 0;
+background-repeat:no-repeat;
+border:none 1px;
+float:left;
+font-size:1px;
+height:16px;
+width:16px;
+}
+
+.cke_skin_ips .cke_dialog a.cke_btn_unlocked {
+background-image:url(images/mini.gif);
+background-position:0 -16px;
+}
+
+.cke_skin_ips .cke_dialog .cke_btn_over {
+border:outset 1px;
+cursor:pointer;
+}
+
+.cke_skin_ips .cke_dialog .ImagePreviewBox {
+background-color:#FFF;
+border:2px ridge #000;
+height:160px;
+overflow:scroll;
+padding:2px;
+width:230px;
+}
+
+.cke_skin_ips .cke_dialog .ImagePreviewBox table td {
+white-space:normal;
+}
+
+.cke_skin_ips .cke_dialog .ImagePreviewLoader {
+background-color:#e4e4e4;
+filter:alpha(opacity=90);
+height:160px;
+margin:2px;
+opacity:.9;
+overflow:hidden;
+padding:2px;
+position:absolute;
+white-space:normal;
+width:230px;
+}
+
+.cke_skin_ips .cke_dialog .FlashPreviewBox {
+background-color:#FFF;
+border:2px ridge #000;
+height:160px;
+overflow:auto;
+padding:2px;
+white-space:normal;
+width:390px;
+}
+
+.cke_skin_ips .cke_dialog .cke_pastetext {
+height:170px;
+width:346px;
+}
+
+.cke_skin_ips .cke_dialog .cke_pastetext textarea {
+height:170px;
+resize:none;
+width:340px;
+}
+
+.cke_skin_ips .cke_dialog iframe.cke_pasteframe {
+background-color:#FFF;
+border:1px solid #000;
+height:130px;
+width:346px;
+}
+
+.cke_skin_ips .cke_dialog .cke_light_background {
+background-color:#ffffbe;
+text-align:center;
+}
+
+.cke_skin_ips .cke_disabled {
+color:#a0a0a0;
+}
+
+.cke_skin_ips .cke_hc .cke_dialog_title,.cke_skin_ips .cke_hc .cke_dialog_tabs,.cke_skin_ips .cke_hc .cke_dialog_contents,.cke_skin_ips .cke_hc .cke_dialog_footer {
+border-left:1px solid;
+border-right:1px solid;
+}
+
+.cke_skin_ips .cke_hc .cke_dialog_title {
+border-top:1px solid;
+}
+
+.cke_skin_ips .cke_hc .cke_dialog_footer {
+border-bottom:1px solid;
+}
+
+.cke_skin_ips .cke_hc .cke_dialog_close_button span {
+cursor:pointer;
+display:inline;
+font-weight:bold;
+position:relative;
+top:3px;
+}
+
+.cke_skin_ips .cke_hc a.cke_btn_locked,.cke_skin_ips .cke_hc a.cke_btn_unlocked,.cke_skin_ips .cke_hc a.cke_btn_reset {
+border-style:solid;
+float:left;
+height:auto;
+width:auto;
+}
+
+.cke_skin_ips table.cke_dialog.cke_browser_gecko,.cke_skin_ips .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button {
+display:block;
+}
+
+.cke_skin_ips .cke_rtl .cke_dialog_tabs,.cke_skin_ips .cke_ltr a.cke_dialog_close_button {
+right:10px;
+}
+
+.cke_skin_ips .cke_hc a:hover.cke_dialog_tab,.cke_skin_ips .cke_hc a.cke_dialog_tab_selected,.cke_skin_ips .cke_hc a:link.cke_dialog_tab_selected,.cke_skin_ips .cke_hc a:active.cke_dialog_tab_selected,.cke_skin_ips .cke_hc a:hover.cke_dialog_tab_selected,.cke_skin_ips .cke_hc a:visited.cke_dialog_tab_selected {
+border-width:3px;
+padding:2px 3px!important;
+}
+
+.cke_skin_ips .cke_single_page .cke_dialog_tabs,.cke_skin_ips a.cke_dialog_close_button span,.cke_skin_ips .cke_dialog_body .cke_label {
+display:none;
+}
+
+.cke_skin_ips div.cke_dialog_ui_input_text,.cke_skin_ips div.cke_dialog_ui_input_password,.cke_skin_ips div.cke_dialog_ui_input_textarea {
+border:1px solid #aaa;
+padding:4px;
+font-family:"Helveticae Neue", Helvetica, Arial, sans-serif;
+-webkit-border-radius: 2px;
+-moz-border-radius: 2px;
+border-radius: 2px;
+background:#f9f9f9;
+}
+
+.cke_skin_ips .cke_browser_gecko18 .cke_dialog_footer_buttons,.cke_skin_ips .cke_hc .cke_dialog_body .cke_label {
+display:inline;
+}
+
+.cke_skin_ips strong,.cke_skin_ips .cke_dialog_body label.cke_required {
+font-weight:bold;
+}
+
+.cke_skin_ips .cke_rtl .cke_dialog a.cke_btn_locked,.cke_skin_ips .cke_rtl .cke_dialog a.cke_btn_unlocked,.cke_skin_ips .cke_rtl.cke_hc a.cke_btn_locked,.cke_skin_ips .cke_rtl.cke_hc a.cke_btn_unlocked,.cke_skin_ips .cke_rtl.cke_hc a.cke_btn_reset {
+float:right;
+}
+
+.cke_skin_ips .cke_dialog_ui_hbox_last .cke_dialog_ui_button {
+margin-top:7px!important;
+}
+
+.cke_skin_ips .cke_dialog_ui_vbox table td {
+vertical-align:middle;
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/editor.css b/upload/public/js/3rd_party/ckeditor/skins/ips/editor.css
new file mode 100644
index 00000000..d60074c6
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/editor.css
@@ -0,0 +1,1822 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/** --------------------------------------- reset.css  ---------------------------------------*/
+
+/**
+ * Reset and Default Values
+ */
+.cke_skin_ips *,
+.cke_skin_ips a:hover,
+.cke_skin_ips a:link,
+.cke_skin_ips a:visited,
+.cke_skin_ips a:active
+{
+	margin: 0;
+	padding: 0;
+	border: 0;
+	background: transparent;
+	text-decoration: none;
+	font: normal normal normal 100% Sans-Serif;
+	width: auto;
+	height: auto;
+	border-collapse: collapse;
+	text-align: left;
+	vertical-align: baseline;
+	white-space: nowrap;
+	cursor: auto;
+	color: #444;
+
+    font-size: 11px;
+    font-family: "Helvetica Neue", Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+}
+
+.cke_skin_ips .cke_rtl *,
+.cke_skin_ips .cke_rtl a:hover,
+.cke_skin_ips .cke_rtl a:link,
+.cke_skin_ips .cke_rtl a:visited,
+.cke_skin_ips .cke_rtl a:active,
+.cke_rtl .cke_skin_ips *,
+.cke_rtl .cke_skin_ips a:hover,
+.cke_rtl .cke_skin_ips a:link,
+.cke_rtl .cke_skin_ips a:visited,
+.cke_rtl .cke_skin_ips a:active
+{
+	text-align: right;
+}
+
+.cke_skin_ips iframe
+{
+	vertical-align: inherit;	/** For IE */
+}
+
+.cke_skin_ips textarea
+{
+	white-space: pre;
+}
+
+.cke_skin_ips .cke_browser_gecko textarea
+{
+	cursor: text;
+}
+
+.cke_skin_ips .cke_browser_gecko textarea[disabled]
+{
+	cursor: default;
+}
+
+.cke_skin_ips input[type="text"],
+.cke_skin_ips input[type="password"]
+{
+	cursor: text;
+}
+
+.cke_skin_ips input[type="text"][disabled],
+.cke_skin_ips input[type="password"][disabled]
+{
+	cursor: default;
+}
+
+.cke_skin_ips fieldset
+{
+	padding: 10px;
+	border: 2px groove #E0DFE3;
+}
+
+/** --------------------------------------- mainui.css  ---------------------------------------*/
+
+.cke_skin_ips
+{
+	display: block;
+	margin-bottom: 5px;
+}
+
+/* Main editor only settings. */
+span.cke_skin_ips
+{
+	/*-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	border: 1px solid #D3D3D3;
+	padding: 5px;*/
+	/*border: 1px solid #d6d6d6;*/
+	border: 0 !important;
+}
+
+.cke_skin_ips span.cke_browser_webkit,
+.cke_skin_ips span.cke_browser_gecko18
+{
+	display: block;
+}
+
+.cke_skin_ips .cke_wrapper
+{
+	/*-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;*/
+	background-color: #d3d3d3;
+	-moz-box-shadow: 0px 1px 0px rgba(255,255,255,0.6) inset;
+	background-image: url(images/sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -1950px;
+	display: block;
+	/* IE Quirks: editor chrome overflow horizontally without an explicit width. */
+	_display: inline-block;
+	padding: 5px;
+	/*background-color: Red;*/
+}
+
+.cke_shared .cke_skin_ips .cke_wrapper
+{
+	padding-bottom: 0;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_wrapper,
+.cke_skin_ips .cke_browser_iequirks .cke_wrapper
+{
+	background-image: none;
+}
+
+.cke_skin_ips .cke_editor
+{
+/*
+	border: solid 1px #dcdcdc;
+*/
+	display: inline-table;
+	width: 100%;
+}
+
+.cke_skin_ips .ltr .cke_browser_ie iframe
+{
+	margin-right: -10px;
+}
+
+.cke_skin_ips .rtl .cke_browser_ie iframe
+{
+	margin-left: -10px;
+}
+
+.cke_skin_ips .rtl .cke_path {
+	padding-right:5px;
+	float: right;
+}
+
+.cke_skin_ips .cke_browser_opera .cke_editor.cke_skin_ips .cke_resizer
+{
+	display: table;
+}
+
+.cke_skin_ips .cke_contents
+{
+	margin: 5px;
+}
+
+.cke_skin_ips .cke_hc .cke_contents
+{
+	border: 1px solid black;
+}
+
+.cke_skin_ips .cke_contents iframe
+{
+	background-color: #fff;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #bbb #ddd #ddd #bbb;
+}
+
+.cke_skin_ips .cke_focus
+{
+	outline: auto 5px -webkit-focus-ring-color;
+}
+
+.cke_skin_ips textarea.cke_source
+{
+	font-family: 'Courier New' , Monospace;
+	font-size: small;
+	background-color: #fff;
+	white-space: pre;
+}
+
+.cke_skin_ips .cke_browser_iequirks textarea.cke_source
+{
+	/* For IE6+Quirks only */
+	_white-space: normal;
+}
+
+.cke_skin_ips .cke_resizer
+{
+	width: 12px;
+	height: 12px;
+	margin-top: 9px;
+	display: block;
+	float: right;
+	/* resizer.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0 -1428px;
+	background-repeat: no-repeat;
+	cursor: se-resize;
+}
+
+/* Adobe AIR doesn't support *-resize cursor shape. */
+.cke_skin_ips .cke_browser_air .cke_resizer,
+.cke_skin_ips .cke_browser_air .cke_rtl .cke_resizer
+{
+	cursor: move;
+}
+
+.cke_skin_ips .cke_rtl .cke_resizer
+{
+	cursor: sw-resize;
+	/* resizer_rtl.gif*/
+	background-position: 0 -1455px;
+	float: left;
+}
+
+.cke_skin_ips .cke_resizer_horizontal,
+.cke_skin_ips .cke_rtl .cke_resizer_horizontal
+{
+	cursor: e-resize;
+}
+
+.cke_skin_ips .cke_resizer_vertical,
+.cke_skin_ips .cke_rtl .cke_resizer_vertical
+{
+	cursor: n-resize;
+}
+
+.cke_skin_ips .cke_maximized .cke_resizer
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_contents textarea,
+.cke_skin_ips .cke_browser_ie7 .cke_contents textarea
+{
+	position: absolute;
+}
+
+.cke_skin_ips .cke_browser_ie.cke_browser_quirks .cke_contents iframe
+{
+	position: absolute;
+	top: 0;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_editor,
+.cke_skin_ips .cke_browser_ie7 .cke_editor
+{
+	display: inline-block;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_editor,
+.cke_shared .cke_skin_ips .cke_browser_ie7 .cke_wrapper
+{
+	padding-bottom: 5px;
+}
+
+/* All voice labels are not displayed. */
+.cke_skin_ips .cke_voice_label
+{
+	display: none;
+}
+
+.cke_skin_ips legend.cke_voice_label
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_ie legend.cke_voice_label
+{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+.cke_skin_ips .cke_path {
+	color: #d3d3d3 !important;
+	font-size: 11px;
+	padding-left:5px;
+	padding-top: 3px;
+	float: left;
+}
+
+.cke_skin_ips .cke_path a, .cke_skin_ips .cke_path a:active, .cke_skin_ips .cke_path a:visited, .cke_skin_ips .cke_path a:hover {
+	color: #676767 !important;
+	cursor: pointer;
+}
+
+.cke_skin_ips .cke_rtl .cke_path {
+	padding-right:5px;
+	float: right;
+}
+
+/** --------------------------------------- panel.css  ---------------------------------------*/
+
+.cke_skin_ips .cke_panel
+{
+	border: 1px solid #8f8f73;
+	background-color: #fff;
+
+	width: 120px;
+	height: 100px;
+
+	overflow: hidden;
+
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.cke_skin_ips .cke_contextmenu
+{
+	margin: 0;
+}
+
+/* Ideally we would use "inherit here"... but you know... IE :( */
+.cke_skin_ips .cke_panel iframe
+{
+	width: 100%;
+	height: 100%;
+}
+
+/*
+ * All the following styles are to be used inside the iframe that holds panel
+ * contents. We don't use the cke_skin_default there to avoid the reset to be
+ * active.
+ * This is not an issue as we'll never have two skins running inside the same
+ * panel iframe.
+ */
+
+html.cke_skin_ips_container
+{
+	overflow: auto;
+	overflow-x: hidden;
+}
+
+body.cke_panel_frame
+{
+	overflow: auto;
+}
+
+.cke_panel_frame .cke_label
+{
+	display: none;
+}
+
+ul.cke_panel_list
+{
+	list-style-type: none;
+	margin: 3px;
+	padding: 0px;
+	white-space: nowrap;
+}
+
+li.cke_panel_listItem
+{
+	margin: 0px;
+}
+
+.cke_panel_listItem a
+{
+	padding: 2px;
+	display: block;
+	border: 1px solid #fff;
+	color: inherit !important;
+	text-decoration: none;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* IE6 */
+* html .cke_panel_listItem a
+{
+	width : 100%;
+
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+/* IE7 */
+*:first-child+html .cke_panel_listItem a
+{
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+.cke_panel_listItem.cke_selected a
+{
+	border: 1px solid #ccc;
+	background-color: #e9f5ff;
+}
+
+.cke_panel_listItem a:hover,
+.cke_panel_listItem a:focus,
+.cke_panel_listItem a:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+}
+
+.cke_hc .cke_panel_listItem.cke_selected a,
+.cke_hc .cke_panel_listItem a:hover,
+.cke_hc .cke_panel_listItem a:focus,
+.cke_hc .cke_panel_listItem a:active
+{
+	border-width: 3px;
+	padding: 0px;
+}
+
+.cke_panel_grouptitle
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+	font-weight: bold;
+	white-space: nowrap;
+	background-color: #dcdcdc;
+	color: #000;
+	margin:0px;
+	padding:3px;
+}
+
+.cke_panel_listItem p,
+.cke_panel_listItem h1,
+.cke_panel_listItem h2,
+.cke_panel_listItem h3,
+.cke_panel_listItem h4,
+.cke_panel_listItem h5,
+.cke_panel_listItem h6,
+.cke_panel_listItem pre
+{
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
+.cke_skin_ips .cke_button_textcolor_panel,
+.cke_skin_ips .cke_button_bgcolor_panel
+{
+	width: 150px;
+	height: 135px;
+}
+
+.cke_colorblock
+{
+	padding: 3px;
+   font-size: 11px;
+   font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.cke_colorblock,
+.cke_colorblock a
+{
+	text-decoration: none;
+	color: #000;
+}
+
+span.cke_colorbox
+{
+	width: 10px;
+	height: 10px;
+   border: #808080 1px solid;
+	float: left;
+}
+
+.cke_rtl span.cke_colorbox
+{
+	float: right;
+}
+
+a.cke_colorbox
+{
+	border: #fff 1px solid;
+	padding: 2px;
+	float: left;
+}
+
+.cke_rtl a.cke_colorbox
+{
+	float: right;
+}
+
+a:hover.cke_colorbox,
+a:focus.cke_colorbox,
+a:active.cke_colorbox
+{
+	border: #316ac5 1px solid;
+	background-color: #dff1ff;
+}
+
+a.cke_colorauto,
+a.cke_colormore
+{
+	border: #fff 1px solid;
+	padding: 2px;
+	display: block;
+	cursor: pointer;
+}
+
+a:hover.cke_colorauto,
+a:hover.cke_colormore,
+a:focus.cke_colorauto,
+a:focus.cke_colormore,
+a:active.cke_colorauto,
+a:active.cke_colormore
+{
+	border: #316ac5 1px solid;
+	background-color: #dff1ff;
+}
+
+
+/** --------------------------------------- toolbar.css  ---------------------------------------*/
+
+@media print
+{
+	/* For printing, we simply hide the toolbar */
+
+	.cke_skin_ips .cke_toolbox
+	{
+		display: none;
+	}
+}
+
+.cke_skin_ips .cke_browser_webkit .cke_toolbox,
+.cke_skin_ips .cke_browser_webkit .cke_toolbox > span
+{
+	white-space: normal;
+}
+
+.cke_skin_ips .cke_toolbox
+{
+	clear: both;
+	/* Define the padding-bottom otherwise the collapser button will not be clickable #4932*/
+	padding-bottom: 1px;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser,
+.cke_skin_ips a:hover.cke_toolbox_collapser
+{
+	/* arrowtop.gif */
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 3px -1366px; /* +3px +4px */
+	background-repeat: no-repeat;
+	width: 11px;
+	height: 11px;
+	float: right;
+	border: 1px outset #D3D3D3;
+	margin: 11px 0 2px;
+	cursor: pointer;
+}
+
+.cke_skin_ips .cke_rtl a.cke_toolbox_collapser,
+.cke_skin_ips .cke_rtl a:hover.cke_toolbox_collapser
+{
+	float: left;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser span
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_hc a.cke_toolbox_collapser span
+{
+	font-size: 10px;
+	font-weight: bold;
+	font-family: Arial;
+	display: inline;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser_min,
+.cke_skin_ips a:hover.cke_toolbox_collapser_min
+{
+	/* arrowleft.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 4px -1387px; /* +4px +3px */
+	background-repeat: no-repeat;
+	margin: 2px 4px;
+}
+
+.cke_skin_ips .cke_rtl a.cke_toolbox_collapser_min,
+.cke_skin_ips .cke_rtl a:hover.cke_toolbox_collapser_min
+{
+	/* arrowright.gif*/
+	background-position: 4px -1408px; /* +2px +3px */
+}
+
+.cke_skin_ips .cke_toolbar
+{
+	margin-top: 1px;
+	display: inline;
+}
+
+.cke_skin_ips .cke_separator
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_break
+{
+	font-size: 0;
+	clear: left;
+}
+
+.cke_skin_ips .cke_rtl .cke_break
+{
+	clear: right;
+}
+
+.cke_skin_ips .cke_toolbar_start
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_toolgroup
+{
+	-moz-border-radius:2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	/*background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-repeat: repeat-x;
+	background-position: 0 -500px;*/
+	background: #f4f4f4;
+	float: left;
+	margin-right: 6px;
+	margin-bottom: 5px;
+	padding: 2px;
+	display: inline;
+}
+
+.cke_skin_ips .cke_rtl .cke_toolgroup
+{
+	float: right;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+.cke_skin_ips .cke_rtl .cke_separator
+{
+	float: right !important;
+}
+
+.cke_skin_ips .cke_toolgroup
+{
+	display: block;
+	height: 22px;
+}
+
+.cke_skin_ips .cke_button a,
+.cke_skin_ips .cke_button a:hover,
+.cke_skin_ips .cke_button a:focus,
+.cke_skin_ips .cke_button a:active,
+.cke_skin_ips .cke_button a.cke_off
+{
+	border-radius: 3px;
+	outline: none;
+	padding: 3px 5px;
+	height: 18px;
+	display: inline-block;
+	cursor: default;
+}
+
+.cke_skin_ips .cke_button a,
+.cke_skin_ips .cke_button a.cke_off
+{
+	/*filter: alpha(opacity=70);
+	opacity: 0.70;*/
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.cke_skin_ips .cke_hc .cke_button a,
+.cke_skin_ips .cke_hc .cke_button a.cke_off
+{
+	opacity: 1.0;
+	filter: alpha(opacity=100);
+	border: 1px solid white;
+}
+
+.cke_skin_ips .cke_button a.cke_on
+{
+	/*background-color: #a3d7ff;*/
+	background-color: #F0F0F0;
+	border: 1px solid #bbb;
+	-moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.2) inset;
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	padding: 2px 4px;
+}
+
+.cke_skin_ips .cke_hc .cke_button a.cke_on
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_ips .cke_button a.cke_disabled *
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.3; /* Safari, Opera and Mozilla */
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie6 a:hover.cke_button .cke_disabled *
+{
+	filter: alpha(opacity=30);
+}
+
+.cke_skin_ips .cke_hc .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *
+{
+	filter: alpha(opacity=60);
+	opacity: 0.6;
+}
+
+.cke_skin_ips .cke_button a:hover.cke_on,
+.cke_skin_ips .cke_button a:focus.cke_on,
+.cke_skin_ips .cke_button a:active.cke_on,	/* IE */
+.cke_skin_ips .cke_button a:hover.cke_off,
+.cke_skin_ips .cke_button a:focus.cke_off,
+.cke_skin_ips .cke_button a:active.cke_off	/* IE */
+{
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	/*padding: 2px 4px;*/
+}
+
+.cke_skin_ips .cke_button a:hover,
+.cke_skin_ips .cke_button a:focus,
+.cke_skin_ips .cke_button a:active	/* IE */
+{
+	background-color: #dff1ff;
+}
+
+.cke_skin_ips .cke_button a:hover.cke_on,
+.cke_skin_ips .cke_button a:focus.cke_on,
+.cke_skin_ips .cke_button a:active.cke_on	/* IE */
+{
+	background-color: #86caff;
+}
+
+.cke_skin_ips .cke_hc .cke_button a:hover,
+.cke_skin_ips .cke_hc .cke_button a:focus,
+.cke_skin_ips .cke_hc .cke_button a:active	/* IE */
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_ips .cke_button .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat: no-repeat;
+	margin-top: 1px;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	float: left;
+	cursor: default;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_ie6 .cke_rtl .cke_button .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_icon
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_button .cke_label
+{
+	cursor: default;
+	display: none;
+	padding-left: 3px;
+	line-height: 18px;
+	vertical-align: middle;
+	float: left;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_label
+{
+	padding-left: 0;
+	padding-right: 3px;
+	float: right;
+}
+
+.cke_skin_ips .cke_hc .cke_button .cke_label
+{
+	padding: 0;
+	display: inline-block;
+}
+
+.cke_skin_ips .cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_accessibility
+{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+.cke_skin_ips .cke_button .cke_buttonarrow
+{
+	display: inline-block;
+	height: 17px;
+	width: 8px;
+	background-position: 2px -1469px; /* (+2, -5) */
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-repeat: no-repeat;
+	float: left;
+	cursor: default;
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button .cke_buttonarrow
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button .cke_buttonarrow
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_buttonarrow
+{
+	background-position: 0 -1469px; /* (0, -5) */
+	float: right;
+}
+
+/*** Firefox 2 ***/
+
+.cke_skin_ips .cke_browser_gecko .cke_toolbar,
+.cke_skin_ips .cke_browser_gecko .cke_button a,
+.cke_skin_ips .cke_browser_gecko .cke_button a.cke_off,
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_buttonarrow,
+.cke_skin_ips .cke_browser_gecko .cke_separator,
+.cke_skin_ips .cke_browser_gecko .cke_toolbar_start
+{
+	display: block;
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_gecko.cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_toolbar,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button a,
+.cke_skin_ips .cke_browser_gecko .cke_rtl.cke_button a.cke_off,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_toolbar_start
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_label,
+.cke_skin_ips .cke_browser_gecko .cke_break
+{
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_label,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_break
+{
+	float: right;
+}
+
+/*** IE ***/
+
+/* The biggest problem with IE is the RTL support (and float:right). It's
+   totally broken, and quite delicate. IE8 fixed these issues. */
+
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_label,
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow
+{
+	float: none;
+}
+
+/*** WebKit ***/
+
+/* We have originally used display:inline-block+float for cke_toolbar and it
+   worked well in all browsers, except IE+RTL. We had to change it to inline
+   and remove the float. This change didn't play well with Safari. */
+
+.cke_skin_ips .cke_browser_webkit .cke_toolbar
+{
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_webkit .cke_rtl .cke_toolbar
+{
+	float: right;
+}
+
+/*** Mixed Fixes ***/
+
+.cke_skin_ips .cke_browser_ie8 .cke_button .cke_label,
+.cke_skin_ips .cke_browser_opera .cke_button .cke_label,
+.cke_skin_ips .cke_browser_webkit .cke_button .cke_label
+{
+	line-height: 20px;
+}
+
+.cke_skin_ips .cke_browser_opera.cke_browser_quirks .cke_button .cke_label,
+.cke_skin_ips .cke_browser_iequirks .cke_button .cke_label
+{
+	line-height: 17px;
+}
+
+/* Fix cursor shape consistency on toolbar combos (#4031) */
+.cke_skin_ips .cke_browser_ie .cke_rcombo,
+.cke_skin_ips .cke_browser_ie .cke_rcombo *
+{
+	cursor: default;
+}
+
+.cke_skin_ips .cke_browser_ie .cke_toolbox
+{
+	padding-bottom: 5px;
+	_padding-bottom: 6px;
+}
+
+.cke_shared .cke_skin_ips .cke_browser_ie .cke_toolbox
+{
+	padding-bottom: 0;
+}
+
+/** --------------------------------------- menu.css  ---------------------------------------*/
+
+.cke_skin_ips .cke_contextmenu
+{
+	padding: 2px;
+}
+
+.cke_skin_ips .cke_menuitem a
+{
+	display:block;
+}
+
+.cke_skin_ips .cke_menuitem span
+{
+	cursor: default;
+}
+
+.cke_skin_ips .cke_menuitem a:hover,
+.cke_skin_ips .cke_menuitem a:focus,
+.cke_skin_ips .cke_menuitem a:active
+{
+	background-color: #D3D3D3;
+	display:block;
+}
+
+.cke_hc .cke_menuitem a:hover,
+.cke_hc .cke_menuitem a:focus,
+.cke_hc .cke_menuitem a:active
+{
+	border: 2px solid;
+}
+
+.cke_skin_ips .cke_menuitem .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat:no-repeat;
+	background-color: transparent;
+	width: 16px;
+	height: 16px;
+	float: left;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	background-color: #E4EBF2;
+	border: solid 4px #E4EBF2;
+	width: 16px;
+	height: 16px;
+	float: left;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+	clear: both;
+}
+
+.cke_skin_ips .cke_menuitem.cke_noalphafix .cke_icon_wrapper .cke_icon
+{
+	width: 20px;
+	height: 20px;
+	margin-left: -2px;
+	margin-top: -2px;
+}
+
+/* IE9 insists on border box model on this element.*/
+ .cke_browser_ie9 .cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	width:24px;
+	height:24px;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_menuitem a:hover .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:focus .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:active .cke_icon_wrapper
+{
+	background-color: #9d9d9d;
+	border: solid 4px #9d9d9d;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_ips .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:active.cke_disabled .cke_icon_wrapper
+{
+	background-color: #D3D3D3;
+	border: solid 4px #D3D3D3;
+}
+
+.cke_skin_ips .cke_menuitem .cke_label
+{
+	display:block;
+	padding-right: 3px;
+	padding-top: 5px;
+	padding-left: 4px;
+	height:19px;
+	margin-left: 24px;
+	background-color: #fff;
+}
+
+/* IE9 insists on border box model on this element.*/
+.cke_browser_ie9 .cke_skin_ips .cke_menuitem .cke_label
+{
+	height:24px;
+}
+
+/* Set these after the document has been loaded and we know the dimensions*/
+.cke_skin_ips .cke_frameLoaded .cke_menuitem .cke_label
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_label
+{
+	padding-right: 0;
+	margin-left: 0;
+	padding-left: 3px;
+	margin-right: 28px;
+}
+
+.cke_skin_ips .cke_menuitem a.cke_disabled .cke_label
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_ips .cke_menuitem a:hover .cke_label,
+.cke_skin_ips .cke_menuitem a:focus .cke_label,
+.cke_skin_ips .cke_menuitem a:active .cke_label
+{
+	background-color: #D3D3D3;
+}
+
+.cke_skin_ips .cke_menuitem a.cke_disabled:hover .cke_label,
+.cke_skin_ips .cke_menuitem a.cke_disabled:focus .cke_label,
+.cke_skin_ips .cke_menuitem a.cke_disabled:active .cke_label
+{
+	background-color: transparent;
+}
+
+.cke_skin_ips .cke_menuseparator
+{
+	background-color: #D3D3D3;
+	height: 2px;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+
+	_font-size: 0;
+}
+
+.cke_skin_ips .cke_menuarrow
+{
+	/* arrowright.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0 -1411px;
+	background-repeat: no-repeat;
+	height: 5px;
+	width: 3px;
+	float: right;
+	margin-right: 2px;
+	margin-top: 3px;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuarrow
+{
+	float: left;
+	margin-right: 0;
+	margin-left: 2px;
+	/* arrowleft.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0px -1390px;
+	background-repeat: no-repeat;
+}
+
+.cke_skin_ips .cke_menuarrow span
+{
+	display: none;
+}
+
+.cke_hc .cke_skin_ips .cke_menuarrow
+{
+	width: auto;
+	margin-top: 0;
+}
+
+.cke_hc .cke_skin_ips .cke_menuarrow span
+{
+	display: inline;
+}
+
+/* #3766 In the context menu, long labels with second level menu get wrapped */
+.cke_browser_ie.cke_ltr .cke_skin_ips .cke_menuarrow
+{
+	position: absolute;
+	right: 2px;
+}
+
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuarrow
+{
+	position: absolute;
+	left: 2px;
+}
+/* END #3766 */
+
+
+/** --------------------------------------- richcombo.css  ---------------------------------------*/
+
+.cke_skin_ips .cke_rcombo {
+display:inline-block;
+/*float:left;*/
+margin-left:2px;
+margin-right:2px;
+margin-top:2px;
+vertical-align:top;
+}
+
+.cke_skin_ips .cke_rcombopanel {
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border:1px solid #aaa;
+border-top-left-radius:0;
+}
+
+.cke_skin_ips .cke_rcombo a {
+display:inline-block;
+filter:alpha(opacity=70);
+float:left;
+opacity:.70;
+}
+
+.cke_skin_ips .cke_rcombo .cke_label {
+cursor:default;
+display:inline-block;
+filter:alpha(opacity=70);
+float:left;
+height:24px;
+line-height:24px;
+opacity:.70;
+padding-left:4px;
+padding-right:5px;
+vertical-align:top;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_label {
+float:right;
+padding-left:5px;
+padding-right:4px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_text {
+background-color:#fff;
+border:1px solid #8f8f73;
+cursor:default;
+display:inline-block;
+height:14px;
+overflow:hidden;
+padding:4px 5px;
+text-overflow:ellipsis;
+vertical-align:top;
+width:60px;
+}
+
+.cke_skin_ips .cke_ltr .cke_rcombo .cke_text {
+-moz-border-radius-bottomleft:3px;
+-moz-border-radius-topleft:3px;
+-webkit-border-bottom-left-radius:3px;
+-webkit-border-top-left-radius:3px;
+border-bottom-left-radius:3px;
+border-top-left-radius:3px;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_text {
+-moz-border-radius-bottomright:3px;
+-moz-border-radius-topright:3px;
+-webkit-border-bottom-right-radius:3px;
+-webkit-border-top-right-radius:3px;
+border-bottom-right-radius:3px;
+border-top-right-radius:3px;
+}
+
+.cke_skin_ips .cke_browser_iequirks .cke_rcombo .cke_text {
+height:22px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_openbutton {
+background-image:url(images/sprites3.png);
+background-position:5px -1002px;
+background-repeat:no-repeat;
+border-bottom:1px solid #8f8f73;
+border-top:1px solid #8f8f73;
+display:inline-block;
+height:22px;
+width:14px;
+}
+
+.cke_skin_ips .cke_ltr .cke_rcombo .cke_openbutton {
+-moz-border-radius-bottomright:3px;
+-moz-border-radius-topright:3px;
+-webkit-border-bottom-right-radius:3px;
+-webkit-border-top-right-radius:3px;
+border-bottom-right-radius:3px;
+border-right:1px solid #8f8f73;
+border-top-right-radius:3px;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_openbutton {
+-moz-border-radius-bottomleft:3px;
+-moz-border-radius-topleft:3px;
+-webkit-border-bottom-left-radius:3px;
+-webkit-border-top-left-radius:3px;
+border-bottom-left-radius:3px;
+border-left:1px solid #8f8f73;
+border-top-left-radius:3px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_ips .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_ips .cke_rcombo .cke_off a:active .cke_text,.cke_skin_ips .cke_rcombo .cke_on .cke_text {
+border-color:#aaa;
+}
+
+.cke_skin_ips .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_on .cke_openbutton {
+background-color:#eee;
+border-color:#aaa;
+}
+
+.cke_skin_ips .cke_rcombo .cke_on .cke_text {
+-moz-border-radius-bottomleft:0;
+-webkit-border-bottom-left-radius:0;
+border-bottom-left-radius:0;
+}
+
+.cke_skin_ips .cke_rcombo .cke_on .cke_openbutton {
+-moz-border-radius-bottomright:0;
+-webkit-border-bottom-right-radius:0;
+border-bottom-right-radius:0;
+}
+
+.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_label {
+filter:alpha(opacity=70);
+opacity:.7;
+}
+
+.cke_skin_ips .cke_rcombo .cke_disabled .cke_text,.cke_skin_ips .cke_rcombo .cke_disabled .cke_openbutton {
+filter:alpha(opacity=50);
+opacity:.5;
+}
+
+.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_openbutton {
+filter:alpha(opacity=80);
+opacity:.8;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_ips .cke_rtl .cke_rcombo .cke_fontSize .cke_text {
+direction:ltr;
+}
+
+.cke_skin_ips .cke_rcombo .cke_label { display: none; }
+
+/** --------------------------------------- elementspath.css  ---------------------------------------*/
+/* Don't need */
+
+/** --------------------------------------- icons.css  ---------------------------------------*/
+
+.cke_skin_ips .cke_button_source .cke_icon
+{
+	background-position: 0 0;
+}
+
+.cke_skin_ips .cke_button_newpage .cke_icon
+{
+	background-position: 0 -48px;
+}
+
+.cke_skin_ips .cke_button_preview .cke_icon
+{
+	background-position: 0 -64px;
+}
+
+.cke_skin_ips .cke_button_cut .cke_icon
+{
+	background-position: 0 -96px;
+}
+
+.cke_skin_ips .cke_button_copy .cke_icon
+{
+	background-position: 0 -112px;
+}
+
+.cke_skin_ips .cke_button_paste .cke_icon
+{
+	background-position: 0 -128px;
+}
+
+.cke_skin_ips .cke_button_pastetext .cke_icon
+{
+	background-position: 0 -144px;
+}
+
+.cke_skin_ips .cke_button_find .cke_icon
+{
+	background-position: 0 -240px;
+}
+
+.cke_skin_ips .cke_button_replace .cke_icon
+{
+	background-position: 0 -256px;
+}
+
+.cke_skin_ips .cke_button_selectAll .cke_icon
+{
+	background-position: 0 -272px;
+}
+
+.cke_skin_ips .cke_button_removeFormat .cke_icon
+{
+	background-position: 0 -288px;
+}
+
+.cke_skin_ips .cke_button_bold .cke_icon
+{
+	background-position: 0 -304px;
+}
+
+.cke_skin_ips .cke_button_italic .cke_icon
+{
+	background-position: 0 -320px;
+}
+
+.cke_skin_ips .cke_button_underline .cke_icon
+{
+	background-position: 0 -336px;
+}
+
+.cke_skin_ips .cke_button_strike .cke_icon
+{
+	background-position: 0 -352px;
+}
+
+.cke_skin_ips .cke_button_subscript .cke_icon
+{
+	background-position: 0 -368px;
+}
+
+.cke_skin_ips .cke_button_superscript .cke_icon
+{
+	background-position: 0 -384px;
+}
+
+.cke_skin_ips .cke_button_table .cke_icon
+{
+	background-position: 0 -608px;
+}
+
+.cke_skin_ips .cke_button_horizontalrule .cke_icon
+{
+	background-position: 0 -624px;
+}
+
+.cke_skin_ips .cke_button_smiley .cke_icon
+{
+	background-position: 0 -640px;
+}
+
+.cke_skin_ips .cke_button_link .cke_icon
+{
+	background-position: 0 -528px;
+}
+
+.cke_skin_ips .cke_button_unlink .cke_icon
+{
+	background-position: 0 -544px;
+}
+
+.cke_skin_ips .cke_button_anchor .cke_icon
+{
+	background-position: 0 -560px;
+}
+
+.cke_skin_ips .cke_button_image .cke_icon
+{
+	background-position: 0 -576px;
+}
+
+.cke_skin_ips .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_ips .cke_button_specialchar .cke_icon
+{
+	background-position: 0 -656px;
+}
+
+.cke_skin_ips .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_ips .cke_button_print .cke_icon
+{
+	background-position: 0 -176px;
+}
+
+.cke_skin_ips .cke_button_checkspell .cke_icon,
+.cke_skin_ips .cke_button_scayt .cke_icon
+{
+	background-position: 0 -192px;
+}
+
+.cke_skin_ips .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_ips .cke_button_textcolor .cke_icon
+{
+	background-position: 0 -704px;
+}
+
+.cke_skin_ips .cke_button_bgcolor .cke_icon
+{
+	background-position: 0 -720px;
+}
+
+.cke_skin_ips .cke_button_form .cke_icon
+{
+	background-position: 0 -752px;
+}
+
+.cke_skin_ips .cke_button_checkbox .cke_icon
+{
+	background-position: 0 -768px;
+}
+
+.cke_skin_ips .cke_button_radio .cke_icon
+{
+	background-position: 0 -784px;
+}
+
+.cke_skin_ips .cke_button_textfield .cke_icon
+{
+	background-position: 0 -800px;
+}
+
+.cke_skin_ips .cke_button_textarea .cke_icon
+{
+	background-position: 0 -816px;
+}
+.cke_skin_ips .cke_button_showblocks .cke_icon
+{
+	background-position: 0 -1136px;
+}
+
+.cke_skin_ips .cke_button_select .cke_icon
+{
+	background-position: 0 -832px;
+}
+
+.cke_skin_ips .cke_button_button .cke_icon
+{
+	background-position: 0 -848px;
+}
+
+.cke_skin_ips .cke_button_imagebutton .cke_icon
+{
+	background-position: 0 -864px;
+}
+
+.cke_skin_ips .cke_button_hiddenfield .cke_icon
+{
+	background-position: 0 -880px;
+}
+
+.cke_skin_ips .cke_button_undo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_ips .cke_rtl .cke_button_undo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_ips .cke_button_redo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_ips .cke_rtl .cke_button_redo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_ips .cke_button_templates .cke_icon
+{
+	background-position: 0 -80px;
+}
+
+.cke_skin_ips .cke_button_numberedlist .cke_icon
+{
+	background-position: 0 -400px;
+}
+
+.cke_skin_ips .cke_button_bulletedlist .cke_icon
+{
+	background-position: 0 -416px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_numberedlist .cke_icon
+{
+	background-position: 0 -1217px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon
+{
+	background-position: 0 -1233px;
+}
+
+.cke_skin_ips .cke_button_outdent .cke_icon
+{
+	background-position: 0 -432px;
+}
+
+.cke_skin_ips .cke_button_indent .cke_icon
+{
+	background-position: 0 -448px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_indent .cke_icon
+{
+	background-position: 0 -1265px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_outdent .cke_icon
+{
+	background-position: 0 -1249px;
+}
+
+.cke_skin_ips .cke_button_justifyleft .cke_icon
+{
+	background-position: 0 -464px;
+}
+
+.cke_skin_ips .cke_button_justifycenter .cke_icon
+{
+	background-position: 0 -480px;
+}
+
+.cke_skin_ips .cke_button_justifyright .cke_icon
+{
+	background-position: 0 -496px;
+}
+
+.cke_skin_ips .cke_button_justifyblock .cke_icon
+{
+	background-position: 0 -512px;
+}
+
+.cke_skin_ips .cke_button_blockquote .cke_icon
+{
+	background-position: 0 -1152px;
+}
+
+.cke_skin_ips .cke_button_creatediv .cke_icon
+{
+	background-position: 0 -1168px;
+}
+.cke_skin_ips .cke_button_editdiv .cke_icon
+{
+	background-position: 0 -1184px;
+}
+.cke_skin_ips .cke_button_removediv .cke_icon
+{
+	background-position: 0 -1200px;
+}
+
+.cke_skin_ips .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_ips .cke_button_pastefromword .cke_icon
+{
+	background-position: 0 -160px;
+}
+
+.cke_skin_ips .cke_button_save .cke_icon
+{
+	background-position: 0 -32px;
+}
+
+.cke_skin_ips .cke_button_about .cke_icon
+{
+	background-position: 0 -736px;
+}
+
+.cke_skin_ips .cke_button_maximize .cke_icon
+{
+	background-position: 0 -1040px;
+}
+
+.cke_skin_ips .cke_button_editdiv .cke_icon
+{
+	background-position: 0 -1184px;
+}
+
+.cke_skin_ips .cke_button_bidirtl .cke_icon
+{
+	background-position: 0 -1072px;
+}
+
+.cke_skin_ips .cke_button_bidiltr .cke_icon
+{
+	background-position: 0 -1056px;
+}
+.cke_skin_ips .cke_button_iframe .cke_icon
+{
+	background-position: 0 -1279px;
+}
+
+/** --------------------------------------- presets.css  ---------------------------------------*/
+
+/* "Source" button label */
+.cke_skin_ips .cke_button_source .cke_label
+{
+	display: inline;
+}
+
+/* "Styles" panel size */
+.cke_skin_ips .cke_styles_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Format" panel size */
+.cke_skin_ips .cke_format_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Font" panel size */
+.cke_skin_ips .cke_font_panel
+{
+	width: auto;
+	height: 170px;
+}
+
+/* "Font Size" panel size */
+.cke_skin_ips .cke_fontSize_panel
+{
+	height: 170px;
+}
+
+/* "Font Size" combo width */
+.cke_skin_ips .cke_fontSize .cke_text
+{
+	min-width: 40px;
+	width: auto;
+}
+
+/* "Font Size" combo width (IE Quirks) */
+.cke_skin_ips .cke_browser_iequirks .cke_fontSize .cke_text
+{
+	width: auto;
+}
+
+
+
+
+/* Restore the container visibility */
+html .cke_skin_ips
+{
+	visibility: inherit;
+}
+
+html.cke_skin_ips_container
+{
+	visibility: visible;
+}
+
+/* bug fix for IE7 & 8 */
+.cke_skin_ips .cke_browser_ie7 .cke_openbutton,
+.cke_skin_ips .cke_browser_ie8 .cke_openbutton {
+	position: relative !important;
+	top: -10px !important;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/elementspath.css b/upload/public/js/3rd_party/ckeditor/skins/ips/elementspath.css
new file mode 100644
index 00000000..62f0d4c9
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/elementspath.css
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+@media print
+{
+	.cke_path
+	{
+		display: none;
+	}
+}
+
+.cke_skin_kama .cke_path
+{
+	display: inline-block;
+	float: left;
+	margin-top: 5px;
+}
+
+.cke_skin_kama .cke_rtl .cke_path
+{
+	float: right;
+}
+
+.cke_shared .cke_skin_kama .cke_path
+{
+	_width: 100%;
+	margin: 0 0 5px;
+}
+
+.cke_skin_kama .cke_path a,
+.cke_skin_kama .cke_path .cke_empty
+{
+	display: inline-block;
+	float: left;
+	padding: 1px 4px 0;
+	color: #60676a;
+	cursor: default;
+}
+
+.cke_skin_kama .cke_path .cke_empty
+{
+	visibility: hidden;
+}
+
+.cke_skin_kama .cke_rtl .cke_path a,
+.cke_skin_kama .cke_rtl .cke_path cke_empty
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_path a:hover,
+.cke_skin_kama .cke_path a:focus,
+.cke_skin_kama .cke_path a:active	/* IE */
+{
+	background-color: #dff1ff;
+	padding: 1px 4px 0;
+	outline: none;
+	color : #000;
+}
+
+/* IE double float-right workaround */
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path a,
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path .cke_empty
+{
+	float: none;
+}
+
+.cke_skin_kama .cke_path .cke_label
+{
+	display: none;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/icons.css b/upload/public/js/3rd_party/ckeditor/skins/ips/icons.css
new file mode 100644
index 00000000..de7b2d02
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/icons.css
@@ -0,0 +1,361 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_ips .cke_button_source .cke_icon
+{
+	background-position: 0 0;
+}
+
+.cke_skin_ips .cke_button_newpage .cke_icon
+{
+	background-position: 0 -48px;
+}
+
+.cke_skin_ips .cke_button_preview .cke_icon
+{
+	background-position: 0 -64px;
+}
+
+.cke_skin_ips .cke_button_cut .cke_icon
+{
+	background-position: 0 -96px;
+}
+
+.cke_skin_ips .cke_button_copy .cke_icon
+{
+	background-position: 0 -112px;
+}
+
+.cke_skin_ips .cke_button_paste .cke_icon
+{
+	background-position: 0 -128px;
+}
+
+.cke_skin_ips .cke_button_pastetext .cke_icon
+{
+	background-position: 0 -144px;
+}
+
+.cke_skin_ips .cke_button_find .cke_icon
+{
+	background-position: 0 -240px;
+}
+
+.cke_skin_ips .cke_button_replace .cke_icon
+{
+	background-position: 0 -256px;
+}
+
+.cke_skin_ips .cke_button_selectAll .cke_icon
+{
+	background-position: 0 -272px;
+}
+
+.cke_skin_ips .cke_button_removeFormat .cke_icon
+{
+	background-position: 0 -288px;
+}
+
+.cke_skin_ips .cke_button_bold .cke_icon
+{
+	background-position: 0 -304px;
+}
+
+.cke_skin_ips .cke_button_italic .cke_icon
+{
+	background-position: 0 -320px;
+}
+
+.cke_skin_ips .cke_button_underline .cke_icon
+{
+	background-position: 0 -336px;
+}
+
+.cke_skin_ips .cke_button_strike .cke_icon
+{
+	background-position: 0 -352px;
+}
+
+.cke_skin_ips .cke_button_subscript .cke_icon
+{
+	background-position: 0 -368px;
+}
+
+.cke_skin_ips .cke_button_superscript .cke_icon
+{
+	background-position: 0 -384px;
+}
+
+.cke_skin_ips .cke_button_table .cke_icon
+{
+	background-position: 0 -608px;
+}
+
+.cke_skin_ips .cke_button_horizontalrule .cke_icon
+{
+	background-position: 0 -624px;
+}
+
+.cke_skin_ips .cke_button_smiley .cke_icon
+{
+	background-position: 0 -640px;
+}
+
+.cke_skin_ips .cke_button_link .cke_icon
+{
+	background-position: 0 -528px;
+}
+
+.cke_skin_ips .cke_button_unlink .cke_icon
+{
+	background-position: 0 -544px;
+}
+
+.cke_skin_ips .cke_button_anchor .cke_icon
+{
+	background-position: 0 -560px;
+}
+
+.cke_skin_ips .cke_button_image .cke_icon
+{
+	background-position: 0 -576px;
+}
+
+.cke_skin_ips .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_ips .cke_button_specialchar .cke_icon
+{
+	background-position: 0 -656px;
+}
+
+.cke_skin_ips .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_ips .cke_button_print .cke_icon
+{
+	background-position: 0 -176px;
+}
+
+.cke_skin_ips .cke_button_checkspell .cke_icon,
+.cke_skin_ips .cke_button_scayt .cke_icon
+{
+	background-position: 0 -192px;
+}
+
+.cke_skin_ips .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_ips .cke_button_textcolor .cke_icon
+{
+	background-position: 0 -704px;
+}
+
+.cke_skin_ips .cke_button_bgcolor .cke_icon
+{
+	background-position: 0 -720px;
+}
+
+.cke_skin_ips .cke_button_form .cke_icon
+{
+	background-position: 0 -752px;
+}
+
+.cke_skin_ips .cke_button_checkbox .cke_icon
+{
+	background-position: 0 -768px;
+}
+
+.cke_skin_ips .cke_button_radio .cke_icon
+{
+	background-position: 0 -784px;
+}
+
+.cke_skin_ips .cke_button_textfield .cke_icon
+{
+	background-position: 0 -800px;
+}
+
+.cke_skin_ips .cke_button_textarea .cke_icon
+{
+	background-position: 0 -816px;
+}
+.cke_skin_ips .cke_button_showblocks .cke_icon
+{
+	background-position: 0 -1136px;
+}
+
+.cke_skin_ips .cke_button_select .cke_icon
+{
+	background-position: 0 -832px;
+}
+
+.cke_skin_ips .cke_button_button .cke_icon
+{
+	background-position: 0 -848px;
+}
+
+.cke_skin_ips .cke_button_imagebutton .cke_icon
+{
+	background-position: 0 -864px;
+}
+
+.cke_skin_ips .cke_button_hiddenfield .cke_icon
+{
+	background-position: 0 -880px;
+}
+
+.cke_skin_ips .cke_button_undo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_ips .cke_rtl .cke_button_undo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_ips .cke_button_redo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_ips .cke_rtl .cke_button_redo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_ips .cke_button_templates .cke_icon
+{
+	background-position: 0 -80px;
+}
+
+.cke_skin_ips .cke_button_numberedlist .cke_icon
+{
+	background-position: 0 -400px;
+}
+
+.cke_skin_ips .cke_button_bulletedlist .cke_icon
+{
+	background-position: 0 -416px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_numberedlist .cke_icon
+{
+	background-position: 0 -1217px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon
+{
+	background-position: 0 -1233px;
+}
+
+.cke_skin_ips .cke_button_outdent .cke_icon
+{
+	background-position: 0 -432px;
+}
+
+.cke_skin_ips .cke_button_indent .cke_icon
+{
+	background-position: 0 -448px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_indent .cke_icon
+{
+	background-position: 0 -1265px;
+}
+
+.cke_skin_ips .cke_mixed_dir_content .cke_button_outdent .cke_icon
+{
+	background-position: 0 -1249px;
+}
+
+.cke_skin_ips .cke_button_justifyleft .cke_icon
+{
+	background-position: 0 -464px;
+}
+
+.cke_skin_ips .cke_button_justifycenter .cke_icon
+{
+	background-position: 0 -480px;
+}
+
+.cke_skin_ips .cke_button_justifyright .cke_icon
+{
+	background-position: 0 -496px;
+}
+
+.cke_skin_ips .cke_button_justifyblock .cke_icon
+{
+	background-position: 0 -512px;
+}
+
+.cke_skin_ips .cke_button_blockquote .cke_icon
+{
+	background-position: 0 -1152px;
+}
+
+.cke_skin_ips .cke_button_creatediv .cke_icon
+{
+	background-position: 0 -1168px;
+}
+.cke_skin_ips .cke_button_editdiv .cke_icon
+{
+	background-position: 0 -1184px;
+}
+.cke_skin_ips .cke_button_removediv .cke_icon
+{
+	background-position: 0 -1200px;
+}
+
+.cke_skin_ips .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_ips .cke_button_pastefromword .cke_icon
+{
+	background-position: 0 -160px;
+}
+
+.cke_skin_ips .cke_button_save .cke_icon
+{
+	background-position: 0 -32px;
+}
+
+.cke_skin_ips .cke_button_about .cke_icon
+{
+	background-position: 0 -736px;
+}
+
+.cke_skin_ips .cke_button_maximize .cke_icon
+{
+	background-position: 0 -1040px;
+}
+
+.cke_skin_ips .cke_button_editdiv .cke_icon
+{
+	background-position: 0 -1184px;
+}
+
+.cke_skin_ips .cke_button_bidirtl .cke_icon
+{
+	background-position: 0 -1072px;
+}
+
+.cke_skin_ips .cke_button_bidiltr .cke_icon
+{
+	background-position: 0 -1056px;
+}
+.cke_skin_ips .cke_button_iframe .cke_icon
+{
+	background-position: 0 -1279px;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/icons.png b/upload/public/js/3rd_party/ckeditor/skins/ips/icons.png
new file mode 100644
index 00000000..e93d3ecf
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/icons.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/icons_rtl.png b/upload/public/js/3rd_party/ckeditor/skins/ips/icons_rtl.png
new file mode 100644
index 00000000..83eee28a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/icons_rtl.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.gif b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.gif
new file mode 100644
index 00000000..8f91b475
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.png
new file mode 100644
index 00000000..1042a61c
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides_rtl.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides_rtl.png
new file mode 100644
index 00000000..d7f7b49f
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/dialog_sides_rtl.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/index.html b/upload/public/js/3rd_party/ckeditor/skins/ips/images/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/images/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/ips_bbcode.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/ips_bbcode.png
new file mode 100644
index 00000000..04f22bad
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/ips_bbcode.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/mini.gif b/upload/public/js/3rd_party/ckeditor/skins/ips/images/mini.gif
new file mode 100644
index 00000000..54d91074
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/mini.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/noimage.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/noimage.png
new file mode 100644
index 00000000..15981130
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/noimage.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites.png
new file mode 100644
index 00000000..936d82cc
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites2.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites2.png
new file mode 100644
index 00000000..eb329d2e
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites2.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites3.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites3.png
new file mode 100644
index 00000000..94073b2a
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites3.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites_ie6.png b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites_ie6.png
new file mode 100644
index 00000000..5bb305c8
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/sprites_ie6.png differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/images/toolbar_start.gif b/upload/public/js/3rd_party/ckeditor/skins/ips/images/toolbar_start.gif
new file mode 100644
index 00000000..1774246c
Binary files /dev/null and b/upload/public/js/3rd_party/ckeditor/skins/ips/images/toolbar_start.gif differ
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/index.html b/upload/public/js/3rd_party/ckeditor/skins/ips/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/mainui.css b/upload/public/js/3rd_party/ckeditor/skins/ips/mainui.css
new file mode 100644
index 00000000..3b7d4554
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/mainui.css
@@ -0,0 +1,228 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/* bug fix for IE7 & 8 */
+.cke_skin_ips .cke_browser_ie .cke_rcombo .cke_openbutton,
+.cke_skin_ips .cke_browser_ie .cke_rcombo .cke_openbutton {
+	position: relative !important;
+	top: -10px !important;
+}
+
+.cke_skin_ips
+{
+	display: block;
+	margin-bottom: 5px;
+}
+
+/* Main editor only settings. */
+span.cke_skin_ips
+{
+	/*-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	border: 1px solid #D3D3D3;
+	padding: 5px;*/
+	/*border: 1px solid #d6d6d6;*/
+	border: 0 !important;
+}
+
+.cke_skin_ips span.cke_browser_webkit,
+.cke_skin_ips span.cke_browser_gecko18
+{
+	display: block;
+}
+
+.cke_skin_ips .cke_wrapper
+{
+	/*-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;*/
+	background-color: #d3d3d3;
+	-moz-box-shadow: 0px 1px 0px rgba(255,255,255,0.6) inset;
+	background-image: url(images/sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -1950px;
+	display: block;
+	/* IE Quirks: editor chrome overflow horizontally without an explicit width. */
+	_display: inline-block;
+	padding: 5px;
+	/*background-color: Red;*/
+}
+
+.cke_shared .cke_skin_ips .cke_wrapper
+{
+	padding-bottom: 0;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_wrapper,
+.cke_skin_ips .cke_browser_iequirks .cke_wrapper
+{
+	background-image: none;
+}
+
+.cke_skin_ips .cke_editor
+{
+/*
+	border: solid 1px #dcdcdc;
+*/
+	display: inline-table;
+	width: 100%;
+}
+
+.cke_skin_ips .ltr .cke_browser_ie iframe
+{
+	margin-right: -10px;
+}
+
+.cke_skin_ips .rtl .cke_browser_ie iframe
+{
+	margin-left: -10px;
+}
+
+.cke_skin_ips .cke_browser_opera .cke_editor.cke_skin_ips .cke_resizer
+{
+	display: table;
+}
+
+.cke_skin_ips .cke_contents
+{
+	margin: 5px;
+}
+
+.cke_skin_ips .cke_hc .cke_contents
+{
+	border: 1px solid black;
+}
+
+.cke_skin_ips .cke_contents iframe
+{
+	background-color: #fff;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #bbb #ddd #ddd #bbb;
+}
+
+.cke_skin_ips .cke_focus
+{
+	outline: auto 5px -webkit-focus-ring-color;
+}
+
+.cke_skin_ips textarea.cke_source
+{
+	font-family: 'Courier New' , Monospace;
+	font-size: small;
+	background-color: #fff;
+	white-space: pre;
+}
+
+.cke_skin_ips .cke_browser_iequirks textarea.cke_source
+{
+	/* For IE6+Quirks only */
+	_white-space: normal;
+}
+
+.cke_skin_ips .cke_resizer
+{
+	width: 12px;
+	height: 12px;
+	margin-top: 9px;
+	display: block;
+	float: right;
+	/* resizer.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0 -1428px;
+	background-repeat: no-repeat;
+	cursor: se-resize;
+}
+
+/* Adobe AIR doesn't support *-resize cursor shape. */
+.cke_skin_ips .cke_browser_air .cke_resizer,
+.cke_skin_ips .cke_browser_air .cke_rtl .cke_resizer
+{
+	cursor: move;
+}
+
+.cke_skin_ips .cke_rtl .cke_resizer
+{
+	cursor: sw-resize;
+	/* resizer_rtl.gif*/
+	background-position: 0 -1455px;
+	float: left;
+}
+
+.cke_skin_ips .cke_resizer_horizontal,
+.cke_skin_ips .cke_rtl .cke_resizer_horizontal
+{
+	cursor: e-resize;
+}
+
+.cke_skin_ips .cke_resizer_vertical,
+.cke_skin_ips .cke_rtl .cke_resizer_vertical
+{
+	cursor: n-resize;
+}
+
+.cke_skin_ips .cke_maximized .cke_resizer
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_contents textarea,
+.cke_skin_ips .cke_browser_ie7 .cke_contents textarea
+{
+	position: absolute;
+}
+
+.cke_skin_ips .cke_browser_ie.cke_browser_quirks .cke_contents iframe
+{
+	position: absolute;
+	top: 0;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_editor,
+.cke_skin_ips .cke_browser_ie7 .cke_editor
+{
+	display: inline-block;
+}
+
+.cke_skin_ips .cke_browser_ie6 .cke_editor,
+.cke_shared .cke_skin_ips .cke_browser_ie7 .cke_wrapper
+{
+	padding-bottom: 5px;
+}
+
+/* All voice labels are not displayed. */
+.cke_skin_ips .cke_voice_label
+{
+	display: none;
+}
+
+.cke_skin_ips legend.cke_voice_label
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_ie legend.cke_voice_label
+{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+.cke_skin_ips .cke_path {
+	color: #d3d3d3 !important;
+	font-size: 11px;
+	padding-left:5px;
+	padding-top: 3px;
+	float: left;
+}
+
+.cke_skin_ips .cke_path a, .cke_skin_ips .cke_path a:active, .cke_skin_ips .cke_path a:visited, .cke_skin_ips .cke_path a:hover {
+	color: #676767 !important;
+	cursor: pointer;
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/menu.css b/upload/public/js/3rd_party/ckeditor/skins/ips/menu.css
new file mode 100644
index 00000000..e1247b4c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/menu.css
@@ -0,0 +1,252 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_ips .cke_contextmenu
+{
+	padding: 2px;
+}
+
+.cke_skin_ips .cke_menuitem a
+{
+	display:block;
+}
+
+.cke_skin_ips .cke_menuitem span
+{
+	cursor: default;
+}
+
+.cke_skin_ips .cke_menuitem a:hover,
+.cke_skin_ips .cke_menuitem a:focus,
+.cke_skin_ips .cke_menuitem a:active
+{
+	background-color: #D3D3D3;
+	display:block;
+}
+
+.cke_hc .cke_menuitem a:hover,
+.cke_hc .cke_menuitem a:focus,
+.cke_hc .cke_menuitem a:active
+{
+	border: 2px solid;
+}
+
+.cke_skin_ips .cke_menuitem .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat:no-repeat;
+	background-color: transparent;
+	width: 16px;
+	height: 16px;
+	float: left;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_ips .cke_menuitem .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_ips .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	background-color: #E4EBF2;
+	border: solid 4px #E4EBF2;
+	width: 16px;
+	height: 16px;
+	float: left;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+	clear: both;
+}
+
+.cke_skin_ips .cke_menuitem.cke_noalphafix .cke_icon_wrapper .cke_icon
+{
+	width: 20px;
+	height: 20px;
+	margin-left: -2px;
+	margin-top: -2px;
+}
+
+/* IE9 insists on border box model on this element.*/
+ .cke_browser_ie9 .cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	width:24px;
+	height:24px;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_icon_wrapper
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_menuitem a:hover .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:focus .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:active .cke_icon_wrapper
+{
+	background-color: #9d9d9d;
+	border: solid 4px #9d9d9d;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_ips .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,
+.cke_skin_ips .cke_menuitem a:active.cke_disabled .cke_icon_wrapper
+{
+	background-color: #D3D3D3;
+	border: solid 4px #D3D3D3;
+}
+
+.cke_skin_ips .cke_menuitem .cke_label
+{
+	display:block;
+	padding-right: 3px;
+	padding-top: 5px;
+	padding-left: 4px;
+	height:19px;
+	margin-left: 24px;
+	background-color: #fff;
+}
+
+/* IE9 insists on border box model on this element.*/
+.cke_browser_ie9 .cke_skin_ips .cke_menuitem .cke_label
+{
+	height:24px;
+}
+
+/* Set these after the document has been loaded and we know the dimensions*/
+.cke_skin_ips .cke_frameLoaded .cke_menuitem .cke_label
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_rtl .cke_skin_ips .cke_menuitem .cke_label
+{
+	padding-right: 0;
+	margin-left: 0;
+	padding-left: 3px;
+	margin-right: 28px;
+}
+
+.cke_skin_ips .cke_menuitem a.cke_disabled .cke_label
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_ips .cke_menuitem a:hover .cke_label,
+.cke_skin_ips .cke_menuitem a:focus .cke_label,
+.cke_skin_ips .cke_menuitem a:active .cke_label
+{
+	background-color: #D3D3D3;
+}
+
+.cke_skin_ips .cke_menuitem a.cke_disabled:hover .cke_label,
+.cke_skin_ips .cke_menuitem a.cke_disabled:focus .cke_label,
+.cke_skin_ips .cke_menuitem a.cke_disabled:active .cke_label
+{
+	background-color: transparent;
+}
+
+.cke_skin_ips .cke_menuseparator
+{
+	background-color: #D3D3D3;
+	height: 2px;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+
+	_font-size: 0;
+}
+
+.cke_skin_ips .cke_menuarrow
+{
+	/* arrowright.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0 -1411px;
+	background-repeat: no-repeat;
+	height: 5px;
+	width: 3px;
+	float: right;
+	margin-right: 2px;
+	margin-top: 3px;
+}
+
+.cke_rtl .cke_skin_ips .cke_menuarrow
+{
+	float: left;
+	margin-right: 0;
+	margin-left: 2px;
+	/* arrowleft.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 0px -1390px;
+	background-repeat: no-repeat;
+}
+
+.cke_skin_ips .cke_menuarrow span
+{
+	display: none;
+}
+
+.cke_hc .cke_skin_ips .cke_menuarrow
+{
+	width: auto;
+	margin-top: 0;
+}
+
+.cke_hc .cke_skin_ips .cke_menuarrow span
+{
+	display: inline;
+}
+
+/* #3766 In the context menu, long labels with second level menu get wrapped */
+.cke_browser_ie.cke_ltr .cke_skin_ips .cke_menuarrow
+{
+	position: absolute;
+	right: 2px;
+}
+
+.cke_browser_ie.cke_rtl .cke_skin_ips .cke_menuarrow
+{
+	position: absolute;
+	left: 2px;
+}
+/* END #3766 */
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/panel.css b/upload/public/js/3rd_party/ckeditor/skins/ips/panel.css
new file mode 100644
index 00000000..96968395
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/panel.css
@@ -0,0 +1,217 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_ips .cke_panel
+{
+	border: 1px solid #8f8f73;
+	background-color: #fff;
+
+	width: 120px;
+	height: 100px;
+
+	overflow: hidden;
+
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.cke_skin_ips .cke_contextmenu
+{
+	margin: 0;
+}
+
+/* Ideally we would use "inherit here"... but you know... IE :( */
+.cke_skin_ips .cke_panel iframe
+{
+	width: 100%;
+	height: 100%;
+}
+
+/*
+ * All the following styles are to be used inside the iframe that holds panel
+ * contents. We don't use the cke_skin_default there to avoid the reset to be
+ * active.
+ * This is not an issue as we'll never have two skins running inside the same
+ * panel iframe.
+ */
+
+html.cke_skin_ips_container
+{
+	overflow: auto;
+	overflow-x: hidden;
+}
+
+body.cke_panel_frame
+{
+	overflow: auto;
+}
+
+.cke_panel_frame .cke_label
+{
+	display: none;
+}
+
+ul.cke_panel_list
+{
+	list-style-type: none;
+	margin: 3px;
+	padding: 0px;
+	white-space: nowrap;
+}
+
+li.cke_panel_listItem
+{
+	margin: 0px;
+}
+
+.cke_panel_listItem a
+{
+	padding: 2px;
+	display: block;
+	border: 1px solid #fff;
+	color: inherit !important;
+	text-decoration: none;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* IE6 */
+* html .cke_panel_listItem a
+{
+	width : 100%;
+
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+/* IE7 */
+*:first-child+html .cke_panel_listItem a
+{
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+.cke_panel_listItem.cke_selected a
+{
+	border: 1px solid #ccc;
+	background-color: #e9f5ff;
+}
+
+.cke_panel_listItem a:hover,
+.cke_panel_listItem a:focus,
+.cke_panel_listItem a:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+}
+
+.cke_hc .cke_panel_listItem.cke_selected a,
+.cke_hc .cke_panel_listItem a:hover,
+.cke_hc .cke_panel_listItem a:focus,
+.cke_hc .cke_panel_listItem a:active
+{
+	border-width: 3px;
+	padding: 0px;
+}
+
+.cke_panel_grouptitle
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+	font-weight: bold;
+	white-space: nowrap;
+	background-color: #dcdcdc;
+	color: #000;
+	margin:0px;
+	padding:3px;
+}
+
+.cke_panel_listItem p,
+.cke_panel_listItem h1,
+.cke_panel_listItem h2,
+.cke_panel_listItem h3,
+.cke_panel_listItem h4,
+.cke_panel_listItem h5,
+.cke_panel_listItem h6,
+.cke_panel_listItem pre
+{
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
+.cke_skin_ips .cke_button_textcolor_panel,
+.cke_skin_ips .cke_button_bgcolor_panel
+{
+	width: 150px;
+	height: 135px;
+}
+
+.cke_colorblock
+{
+	padding: 3px;
+   font-size: 11px;
+   font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.cke_colorblock,
+.cke_colorblock a
+{
+	text-decoration: none;
+	color: #000;
+}
+
+span.cke_colorbox
+{
+	width: 10px;
+	height: 10px;
+   border: #808080 1px solid;
+	float: left;
+}
+
+.cke_rtl span.cke_colorbox
+{
+	float: right;
+}
+
+a.cke_colorbox
+{
+	border: #fff 1px solid;
+	padding: 2px;
+	float: left;
+}
+
+.cke_rtl a.cke_colorbox
+{
+	float: right;
+}
+
+a:hover.cke_colorbox,
+a:focus.cke_colorbox,
+a:active.cke_colorbox
+{
+	border: #316ac5 1px solid;
+	background-color: #dff1ff;
+}
+
+a.cke_colorauto,
+a.cke_colormore
+{
+	border: #fff 1px solid;
+	padding: 2px;
+	display: block;
+	cursor: pointer;
+}
+
+a:hover.cke_colorauto,
+a:hover.cke_colormore,
+a:focus.cke_colorauto,
+a:focus.cke_colormore,
+a:active.cke_colorauto,
+a:active.cke_colormore
+{
+	border: #316ac5 1px solid;
+	background-color: #dff1ff;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/presets.css b/upload/public/js/3rd_party/ckeditor/skins/ips/presets.css
new file mode 100644
index 00000000..4e30caee
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/presets.css
@@ -0,0 +1,49 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/* "Source" button label */
+.cke_skin_ips .cke_button_source .cke_label
+{
+	display: inline;
+}
+
+/* "Styles" panel size */
+.cke_skin_ips .cke_styles_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Format" panel size */
+.cke_skin_ips .cke_format_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Font" panel size */
+.cke_skin_ips .cke_font_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Font Size" panel size */
+.cke_skin_ips .cke_fontSize_panel
+{
+	height: 170px;
+}
+
+/* "Font Size" combo width */
+.cke_skin_ips .cke_fontSize .cke_text
+{
+	width: 30px;
+}
+
+/* "Font Size" combo width (IE Quirks) */
+.cke_skin_ips .cke_browser_iequirks .cke_fontSize .cke_text
+{
+	width: 37px;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/reset.css b/upload/public/js/3rd_party/ckeditor/skins/ips/reset.css
new file mode 100644
index 00000000..0bd817ab
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/reset.css
@@ -0,0 +1,84 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * Reset and Default Values
+ */
+.cke_skin_ips *,
+.cke_skin_ips a:hover,
+.cke_skin_ips a:link,
+.cke_skin_ips a:visited,
+.cke_skin_ips a:active
+{
+	margin: 0;
+	padding: 0;
+	border: 0;
+	background: transparent;
+	text-decoration: none;
+	font: normal normal normal 100% Sans-Serif;
+	width: auto;
+	height: auto;
+	border-collapse: collapse;
+	text-align: left;
+	vertical-align: baseline;
+	white-space: nowrap;
+	cursor: auto;
+	color: #444;
+
+    font-size: 11px;
+    font-family: "Helvetica Neue", Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+}
+
+.cke_skin_ips .cke_rtl *,
+.cke_skin_ips .cke_rtl a:hover,
+.cke_skin_ips .cke_rtl a:link,
+.cke_skin_ips .cke_rtl a:visited,
+.cke_skin_ips .cke_rtl a:active,
+.cke_rtl .cke_skin_ips *,
+.cke_rtl .cke_skin_ips a:hover,
+.cke_rtl .cke_skin_ips a:link,
+.cke_rtl .cke_skin_ips a:visited,
+.cke_rtl .cke_skin_ips a:active
+{
+	text-align: right;
+}
+
+.cke_skin_ips iframe
+{
+	vertical-align: inherit;	/** For IE */
+}
+
+.cke_skin_ips textarea
+{
+	white-space: pre;
+}
+
+.cke_skin_ips .cke_browser_gecko textarea
+{
+	cursor: text;
+}
+
+.cke_skin_ips .cke_browser_gecko textarea[disabled]
+{
+	cursor: default;
+}
+
+.cke_skin_ips input[type="text"],
+.cke_skin_ips input[type="password"]
+{
+	cursor: text;
+}
+
+.cke_skin_ips input[type="text"][disabled],
+.cke_skin_ips input[type="password"][disabled]
+{
+	cursor: default;
+}
+
+.cke_skin_ips fieldset
+{
+	padding: 10px;
+	border: 2px groove #E0DFE3;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/richcombo.css b/upload/public/js/3rd_party/ckeditor/skins/ips/richcombo.css
new file mode 100644
index 00000000..3043dfea
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/richcombo.css
@@ -0,0 +1,149 @@
+.cke_skin_ips .cke_rcombo {
+display:inline-block;
+float:left;
+margin-left:2px;
+margin-right:2px;
+margin-top:2px;
+vertical-align:top;
+}
+
+.cke_skin_ips .cke_rcombopanel {
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border:1px solid #aaa;
+border-top-left-radius:0;
+}
+
+.cke_skin_ips .cke_rcombo a {
+display:inline-block;
+filter:alpha(opacity=70);
+float:left;
+opacity:.70;
+}
+
+.cke_skin_ips .cke_rcombo .cke_label {
+cursor:default;
+display:inline-block;
+filter:alpha(opacity=70);
+float:left;
+height:24px;
+line-height:24px;
+opacity:.70;
+padding-left:4px;
+padding-right:5px;
+vertical-align:top;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_label {
+float:right;
+padding-left:5px;
+padding-right:4px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_text {
+background-color:#fff;
+border:1px solid #8f8f73;
+cursor:default;
+display:inline-block;
+height:14px;
+overflow:hidden;
+padding:4px 5px;
+text-overflow:ellipsis;
+vertical-align:top;
+width:60px;
+}
+
+.cke_skin_ips .cke_ltr .cke_rcombo .cke_text {
+-moz-border-radius-bottomleft:3px;
+-moz-border-radius-topleft:3px;
+-webkit-border-bottom-left-radius:3px;
+-webkit-border-top-left-radius:3px;
+border-bottom-left-radius:3px;
+border-top-left-radius:3px;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_text {
+-moz-border-radius-bottomright:3px;
+-moz-border-radius-topright:3px;
+-webkit-border-bottom-right-radius:3px;
+-webkit-border-top-right-radius:3px;
+border-bottom-right-radius:3px;
+border-top-right-radius:3px;
+}
+
+.cke_skin_ips .cke_browser_iequirks .cke_rcombo .cke_text {
+height:22px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_openbutton {
+background-image:url(images/sprites3.png);
+background-position:5px -1002px;
+background-repeat:no-repeat;
+border-bottom:1px solid #8f8f73;
+border-top:1px solid #8f8f73;
+display:inline-block;
+height:22px;
+width:14px;
+}
+
+.cke_skin_ips .cke_ltr .cke_rcombo .cke_openbutton {
+-moz-border-radius-bottomright:3px;
+-moz-border-radius-topright:3px;
+-webkit-border-bottom-right-radius:3px;
+-webkit-border-top-right-radius:3px;
+border-bottom-right-radius:3px;
+border-right:1px solid #8f8f73;
+border-top-right-radius:3px;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_openbutton {
+-moz-border-radius-bottomleft:3px;
+-moz-border-radius-topleft:3px;
+-webkit-border-bottom-left-radius:3px;
+-webkit-border-top-left-radius:3px;
+border-bottom-left-radius:3px;
+border-left:1px solid #8f8f73;
+border-top-left-radius:3px;
+}
+
+.cke_skin_ips .cke_rcombo .cke_off a:hover .cke_text,.cke_skin_ips .cke_rcombo .cke_off a:focus .cke_text,.cke_skin_ips .cke_rcombo .cke_off a:active .cke_text,.cke_skin_ips .cke_rcombo .cke_on .cke_text {
+border-color:#aaa;
+}
+
+.cke_skin_ips .cke_rcombo .cke_off a:hover .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_off a:focus .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_off a:active .cke_openbutton,.cke_skin_ips .cke_rcombo .cke_on .cke_openbutton {
+background-color:#eee;
+border-color:#aaa;
+}
+
+.cke_skin_ips .cke_rcombo .cke_on .cke_text {
+-moz-border-radius-bottomleft:0;
+-webkit-border-bottom-left-radius:0;
+border-bottom-left-radius:0;
+}
+
+.cke_skin_ips .cke_rcombo .cke_on .cke_openbutton {
+-moz-border-radius-bottomright:0;
+-webkit-border-bottom-right-radius:0;
+border-bottom-right-radius:0;
+}
+
+.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_label {
+filter:alpha(opacity=70);
+opacity:.7;
+}
+
+.cke_skin_ips .cke_rcombo .cke_disabled .cke_text,.cke_skin_ips .cke_rcombo .cke_disabled .cke_openbutton {
+filter:alpha(opacity=50);
+opacity:.5;
+}
+
+.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_text,.cke_skin_ips .cke_hc .cke_rcombo .cke_disabled .cke_openbutton {
+filter:alpha(opacity=80);
+opacity:.8;
+}
+
+.cke_skin_ips .cke_rtl .cke_rcombo .cke_font .cke_text,.cke_skin_ips .cke_rtl .cke_rcombo .cke_fontSize .cke_text {
+direction:ltr;
+}
+
+.cke_skin_ips .cke_rcombo .cke_label { display: none; }
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/skin.js b/upload/public/js/3rd_party/ckeditor/skins/ips/skin.js
new file mode 100644
index 00000000..5b6d9653
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/skin.js
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add( 'ips', (function()
+{
+	return {
+		editor		: { css : [ 'editor.css' ] },
+		dialog		: { css : [ 'dialog.css' ] },
+		templates	: { css : [ 'templates.css' ] },
+		margins		: [ 0, 0, 0, 0 ],
+		init : function( editor )
+		{
+			if ( editor.config.width && !isNaN( editor.config.width ) )
+				editor.config.width -= 12;
+		
+			CKEDITOR.tools.extend( editor,
+			{
+				uiColor: null,
+
+				getUiColor : function()
+				{
+					return this.uiColor;
+				},
+
+				setUiColor : function( color )
+				{
+					
+				}
+			});
+		}
+	};
+})() );
+
+(function()
+{
+	CKEDITOR.dialog ? dialogSetup() : CKEDITOR.on( 'dialogPluginReady', dialogSetup );
+
+	function dialogSetup()
+	{
+		CKEDITOR.dialog.on( 'resize', function( evt )
+			{
+				var data = evt.data,
+					width = data.width,
+					height = data.height,
+					dialog = data.dialog,
+					contents = dialog.parts.contents;
+
+				if ( data.skin != 'ips' )
+					return;
+
+				contents.setStyles(
+					{
+						width : width + 'px',
+						height : height + 'px'
+					});
+
+				// Fix the size of the elements which have flexible lengths.
+				setTimeout( function()
+					{
+						var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
+							body = innerDialog.getChild( 0 );
+
+						// tc
+						var el = innerDialog.getChild( 2 );
+						el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
+
+						// bc
+						el = innerDialog.getChild( 7 );
+						el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
+
+						// ml
+						el = innerDialog.getChild( 4 );
+						el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+
+						// mr
+						el = innerDialog.getChild( 5 );
+						el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+					},
+					100 );
+			});
+	}
+})();
+
+/**
+ * The base user interface color to be used by the editor. Not all skins are
+ * compatible with this setting.
+ * @name CKEDITOR.config.uiColor
+ * @type String
+ * @default '' (empty)
+ * @example
+ * // Using a color code.
+ * config.uiColor = '#AADC6E';
+ * @example
+ * // Using an HTML color name.
+ * config.uiColor = 'Gold';
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/templates.css b/upload/public/js/3rd_party/ckeditor/skins/ips/templates.css
new file mode 100644
index 00000000..bb755ab3
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/templates.css
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * Styles for the "templates" plugin.
+ */
+
+.cke_skin_ips .cke_tpl_list
+{
+	border: #dcdcdc 2px solid;
+	background-color: #ffffff;
+	overflow-y: auto;
+	overflow-x: hidden;
+	width: 100%;
+	height: 220px;
+}
+
+.cke_skin_ips .cke_tpl_item
+{
+	margin: 5px;
+	padding: 7px;
+	border: #eeeeee 1px solid;
+	*width: 88%;
+}
+
+.cke_skin_ips .cke_tpl_preview
+{
+	border-collapse: separate;
+	text-indent:0;
+	width: 100%;
+}
+.cke_skin_ips .cke_tpl_preview td
+{
+	padding: 2px;
+	vertical-align: middle;
+}
+.cke_skin_ips .cke_tpl_preview .cke_tpl_preview_img
+{
+	width: 100px;
+}
+.cke_skin_ips .cke_tpl_preview span
+{
+	white-space: normal;
+}
+
+.cke_skin_ips .cke_tpl_title
+{
+	font-weight: bold;
+}
+
+.cke_skin_ips .cke_tpl_list a:active .cke_tpl_item,
+.cke_skin_ips .cke_tpl_list a:hover .cke_tpl_item,
+.cke_skin_ips .cke_tpl_list a:focus .cke_tpl_item
+{
+	border: #ff9933 1px solid;
+	background-color: #fffacd;
+}
+
+.cke_skin_ips .cke_tpl_list a:active *,
+.cke_skin_ips .cke_tpl_list a:hover *,
+.cke_skin_ips .cke_tpl_list a:focus *
+{
+	cursor: pointer;
+}
+
+/* IE6 contextual selectors childs won't get :hover transition until,
+	the hover style of the link itself contains certain CSS declarations.*/
+.cke_skin_ips .cke_browser_ie6 .cke_tpl_list a:active,
+.cke_skin_ips .cke_browser_ie6 .cke_tpl_list a:hover,
+.cke_skin_ips .cke_browser_ie6 .cke_tpl_list a:focus
+{
+	background-position: 0 0;
+}
+
+.cke_skin_ips .cke_hc .cke_tpl_list a:active .cke_tpl_item,
+.cke_skin_ips .cke_hc .cke_tpl_list a:hover .cke_tpl_item,
+.cke_skin_ips .cke_hc .cke_tpl_list a:focus .cke_tpl_item
+{
+	border-width: 3px;
+}
+
+.cke_skin_ips .cke_tpl_empty, .cke_tpl_loading
+{
+	text-align: center;
+	padding: 5px;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/skins/ips/toolbar.css b/upload/public/js/3rd_party/ckeditor/skins/ips/toolbar.css
new file mode 100644
index 00000000..9193165c
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/skins/ips/toolbar.css
@@ -0,0 +1,454 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+@media print
+{
+	/* For printing, we simply hide the toolbar */
+
+	.cke_skin_ips .cke_toolbox
+	{
+		display: none;
+	}
+}
+
+.cke_skin_ips .cke_browser_webkit .cke_toolbox,
+.cke_skin_ips .cke_browser_webkit .cke_toolbox > span
+{
+	white-space: normal;
+}
+
+.cke_skin_ips .cke_toolbox
+{
+	clear: both;
+	/* Define the padding-bottom otherwise the collapser button will not be clickable #4932*/
+	padding-bottom: 1px;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser,
+.cke_skin_ips a:hover.cke_toolbox_collapser
+{
+	/* arrowtop.gif */
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 3px -1366px; /* +3px +4px */
+	background-repeat: no-repeat;
+	width: 11px;
+	height: 11px;
+	float: right;
+	border: 1px outset #D3D3D3;
+	margin: 11px 0 2px;
+	cursor: pointer;
+}
+
+.cke_skin_ips .cke_rtl a.cke_toolbox_collapser,
+.cke_skin_ips .cke_rtl a:hover.cke_toolbox_collapser
+{
+	float: left;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser span
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_hc a.cke_toolbox_collapser span
+{
+	font-size: 10px;
+	font-weight: bold;
+	font-family: Arial;
+	display: inline;
+}
+
+.cke_skin_ips a.cke_toolbox_collapser_min,
+.cke_skin_ips a:hover.cke_toolbox_collapser_min
+{
+	/* arrowleft.gif*/
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-position: 4px -1387px; /* +4px +3px */
+	background-repeat: no-repeat;
+	margin: 2px 4px;
+}
+
+.cke_skin_ips .cke_rtl a.cke_toolbox_collapser_min,
+.cke_skin_ips .cke_rtl a:hover.cke_toolbox_collapser_min
+{
+	/* arrowright.gif*/
+	background-position: 4px -1408px; /* +2px +3px */
+}
+
+.cke_skin_ips .cke_toolbar
+{
+	margin-top: 1px;
+	display: inline;
+}
+
+.cke_skin_ips .cke_separator
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_break
+{
+	font-size: 0;
+	clear: left;
+}
+
+.cke_skin_ips .cke_rtl .cke_break
+{
+	clear: right;
+}
+
+.cke_skin_ips .cke_toolbar_start
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_toolgroup
+{
+	-moz-border-radius:2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	/*background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-repeat: repeat-x;
+	background-position: 0 -500px;*/
+	background: #f4f4f4;
+	float: left;
+	margin-right: 6px;
+	margin-bottom: 5px;
+	padding: 2px;
+	display: inline;
+}
+
+.cke_skin_ips .cke_rtl .cke_toolgroup
+{
+	float: right;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+.cke_skin_ips .cke_toolgroup
+{
+	display: block;
+	height: 22px;
+}
+
+.cke_skin_ips .cke_button a,
+.cke_skin_ips .cke_button a:hover,
+.cke_skin_ips .cke_button a:focus,
+.cke_skin_ips .cke_button a:active,
+.cke_skin_ips .cke_button a.cke_off
+{
+	border-radius: 3px;
+	outline: none;
+	padding: 3px 5px;
+	height: 18px;
+	display: inline-block;
+	cursor: default;
+}
+
+.cke_skin_ips .cke_button a,
+.cke_skin_ips .cke_button a.cke_off
+{
+	/*filter: alpha(opacity=70);
+	opacity: 0.70;*/
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.cke_skin_ips .cke_hc .cke_button a,
+.cke_skin_ips .cke_hc .cke_button a.cke_off
+{
+	opacity: 1.0;
+	filter: alpha(opacity=100);
+	border: 1px solid white;
+}
+
+.cke_skin_ips .cke_button a.cke_on
+{
+	/*background-color: #a3d7ff;*/
+	background-color: #F0F0F0;
+	border: 1px solid #bbb;
+	-moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.2) inset;
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	padding: 2px 4px;
+}
+
+.cke_skin_ips .cke_hc .cke_button a.cke_on
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_ips .cke_button a.cke_disabled *
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.3; /* Safari, Opera and Mozilla */
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie6 a:hover.cke_button .cke_disabled *
+{
+	filter: alpha(opacity=30);
+}
+
+.cke_skin_ips .cke_hc .cke_button a.cke_disabled *,
+.cke_skin_ips .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *
+{
+	filter: alpha(opacity=60);
+	opacity: 0.6;
+}
+
+.cke_skin_ips .cke_button a:hover.cke_on,
+.cke_skin_ips .cke_button a:focus.cke_on,
+.cke_skin_ips .cke_button a:active.cke_on,	/* IE */
+.cke_skin_ips .cke_button a:hover.cke_off,
+.cke_skin_ips .cke_button a:focus.cke_off,
+.cke_skin_ips .cke_button a:active.cke_off	/* IE */
+{
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	/*padding: 2px 4px;*/
+}
+
+.cke_skin_ips .cke_button a:hover,
+.cke_skin_ips .cke_button a:focus,
+.cke_skin_ips .cke_button a:active	/* IE */
+{
+	background-color: #dff1ff;
+}
+
+.cke_skin_ips .cke_button a:hover.cke_on,
+.cke_skin_ips .cke_button a:focus.cke_on,
+.cke_skin_ips .cke_button a:active.cke_on	/* IE */
+{
+	background-color: #86caff;
+}
+
+.cke_skin_ips .cke_hc .cke_button a:hover,
+.cke_skin_ips .cke_hc .cke_button a:focus,
+.cke_skin_ips .cke_hc .cke_button a:active	/* IE */
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_ips .cke_button .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat: no-repeat;
+	margin-top: 1px;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	float: left;
+	cursor: default;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_ie6 .cke_rtl .cke_button .cke_icon
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_icon
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_button .cke_label
+{
+	cursor: default;
+	display: none;
+	padding-left: 3px;
+	line-height: 18px;
+	vertical-align: middle;
+	float: left;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_label
+{
+	padding-left: 0;
+	padding-right: 3px;
+	float: right;
+}
+
+.cke_skin_ips .cke_hc .cke_button .cke_label
+{
+	padding: 0;
+	display: inline-block;
+}
+
+.cke_skin_ips .cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_accessibility
+{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+.cke_skin_ips .cke_button .cke_buttonarrow
+{
+	display: inline-block;
+	height: 17px;
+	width: 8px;
+	background-position: 2px -1469px; /* (+2, -5) */
+	background-image: url(images/sprites.png);
+	_background-image: url(images/sprites_ie6.png);
+	background-repeat: no-repeat;
+	float: left;
+	cursor: default;
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_ips .cke_browser_ie .cke_button .cke_buttonarrow
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_ips .cke_browser_ie6 .cke_button .cke_buttonarrow
+{
+	filter: ;
+}
+
+.cke_skin_ips .cke_rtl .cke_button .cke_buttonarrow
+{
+	background-position: 0 -1469px; /* (0, -5) */
+	float: right;
+}
+
+/*** Firefox 2 ***/
+
+.cke_skin_ips .cke_browser_gecko .cke_toolbar,
+.cke_skin_ips .cke_browser_gecko .cke_button a,
+.cke_skin_ips .cke_browser_gecko .cke_button a.cke_off,
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_buttonarrow,
+.cke_skin_ips .cke_browser_gecko .cke_separator,
+.cke_skin_ips .cke_browser_gecko .cke_toolbar_start
+{
+	display: block;
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_gecko.cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_toolbar,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button a,
+.cke_skin_ips .cke_browser_gecko .cke_rtl.cke_button a.cke_off,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_toolbar_start
+{
+	float: right;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_button .cke_label,
+.cke_skin_ips .cke_browser_gecko .cke_break
+{
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_button .cke_label,
+.cke_skin_ips .cke_browser_gecko .cke_rtl .cke_break
+{
+	float: right;
+}
+
+/*** IE ***/
+
+/* The biggest problem with IE is the RTL support (and float:right). It's
+   totally broken, and quite delicate. IE8 fixed these issues. */
+
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_icon,
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_label,
+.cke_skin_ips .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow
+{
+	float: none;
+}
+
+/*** WebKit ***/
+
+/* We have originally used display:inline-block+float for cke_toolbar and it
+   worked well in all browsers, except IE+RTL. We had to change it to inline
+   and remove the float. This change didn't play well with Safari. */
+
+.cke_skin_ips .cke_browser_webkit .cke_toolbar
+{
+	float: left;
+}
+
+.cke_skin_ips .cke_browser_webkit .cke_rtl .cke_toolbar
+{
+	float: right;
+}
+
+/*** Mixed Fixes ***/
+
+.cke_skin_ips .cke_browser_ie8 .cke_button .cke_label,
+.cke_skin_ips .cke_browser_opera .cke_button .cke_label,
+.cke_skin_ips .cke_browser_webkit .cke_button .cke_label
+{
+	line-height: 20px;
+}
+
+.cke_skin_ips .cke_browser_opera.cke_browser_quirks .cke_button .cke_label,
+.cke_skin_ips .cke_browser_iequirks .cke_button .cke_label
+{
+	line-height: 17px;
+}
+
+/* Fix cursor shape consistency on toolbar combos (#4031) */
+.cke_skin_ips .cke_browser_ie .cke_rcombo,
+.cke_skin_ips .cke_browser_ie .cke_rcombo *
+{
+	cursor: default;
+}
+
+.cke_skin_ips .cke_browser_ie .cke_toolbox
+{
+	padding-bottom: 5px;
+	_padding-bottom: 6px;
+}
+
+.cke_shared .cke_skin_ips .cke_browser_ie .cke_toolbox
+{
+	padding-bottom: 0;
+}
diff --git a/upload/public/js/3rd_party/ckeditor/themes/default/index.html b/upload/public/js/3rd_party/ckeditor/themes/default/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/themes/default/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/ckeditor/themes/default/theme.js b/upload/public/js/3rd_party/ckeditor/themes/default/theme.js
new file mode 100644
index 00000000..7238f208
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/themes/default/theme.js
@@ -0,0 +1,368 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @name CKEDITOR.theme
+ * @class
+ */
+
+CKEDITOR.themes.add( 'default', (function()
+{
+	function checkSharedSpace( editor, spaceName )
+	{
+		var container,
+			element;
+
+		// Try to retrieve the target element from the sharedSpaces settings.
+		element = editor.config.sharedSpaces;
+		element = element && element[ spaceName ];
+		element = element && CKEDITOR.document.getById( element );
+
+		// If the element is available, we'll then create the container for
+		// the space.
+		if ( element )
+		{
+			// Creates an HTML structure that reproduces the editor class hierarchy.
+			var html =
+				'<span class="cke_shared">' +
+				'<span class="' + editor.skinClass + ' ' + editor.id + ' cke_editor_' + editor.name + '">' +
+				'<span class="' + CKEDITOR.env.cssClass + '">' +
+				'<span class="cke_wrapper cke_' + editor.lang.dir + '">' +
+				'<span class="cke_editor">' +
+				'<div class="cke_' + spaceName + '">' +
+				'</div></span></span></span></span></span>';
+
+			var mainContainer = element.append( CKEDITOR.dom.element.createFromHtml( html, element.getDocument() ) );
+
+			// Only the first container starts visible. Others get hidden.
+			if ( element.getCustomData( 'cke_hasshared' ) )
+				mainContainer.hide();
+			else
+				element.setCustomData( 'cke_hasshared', 1 );
+
+			// Get the deeper inner <div>.
+			container = mainContainer.getChild( [0,0,0,0] );
+
+			// Save a reference to the shared space container.
+			!editor.sharedSpaces && ( editor.sharedSpaces = {} );
+			editor.sharedSpaces[ spaceName ] = container;
+
+			// When the editor gets focus, we show the space container, hiding others.
+			editor.on( 'focus', function()
+				{
+					for ( var i = 0, sibling, children = element.getChildren() ; ( sibling = children.getItem( i ) ) ; i++ )
+					{
+						if ( sibling.type == CKEDITOR.NODE_ELEMENT
+							&& !sibling.equals( mainContainer )
+							&& sibling.hasClass( 'cke_shared' ) )
+						{
+							sibling.hide();
+						}
+					}
+
+					mainContainer.show();
+				});
+
+			editor.on( 'destroy', function()
+				{
+					mainContainer.remove();
+				});
+		}
+
+		return container;
+	}
+
+	return /** @lends CKEDITOR.theme */ {
+		build : function( editor, themePath )
+		{
+			var name = editor.name,
+				element = editor.element,
+				elementMode = editor.elementMode;
+
+			if ( !element || elementMode == CKEDITOR.ELEMENT_MODE_NONE )
+				return;
+
+			if ( elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
+				element.hide();
+
+			// Get the HTML for the predefined spaces.
+			var topHtml			= editor.fire( 'themeSpace', { space : 'top', html : '' } ).html;
+			var contentsHtml	= editor.fire( 'themeSpace', { space : 'contents', html : '' } ).html;
+			var bottomHtml		= editor.fireOnce( 'themeSpace', { space : 'bottom', html : '' } ).html;
+
+			var height	= contentsHtml && editor.config.height;
+
+			var tabIndex = editor.config.tabIndex || editor.element.getAttribute( 'tabindex' ) || 0;
+
+			// The editor height is considered only if the contents space got filled.
+			if ( !contentsHtml )
+				height = 'auto';
+			else if ( !isNaN( height ) )
+				height += 'px';
+
+			var style = '';
+			var width	= editor.config.width;
+
+			if ( width )
+			{
+				if ( !isNaN( width ) )
+					width += 'px';
+
+				style += "width: " + width + ";";
+			}
+
+			var sharedTop		= topHtml && checkSharedSpace( editor, 'top' ),
+				sharedBottoms	= checkSharedSpace( editor, 'bottom' );
+
+			sharedTop		&& ( sharedTop.setHtml( topHtml )		, topHtml = '' );
+			sharedBottoms	&& ( sharedBottoms.setHtml( bottomHtml ), bottomHtml = '' );
+
+			var container = CKEDITOR.dom.element.createFromHtml( [
+				'<span' +
+					' id="cke_', name, '"' +
+					' class="', editor.skinClass, ' ', editor.id, ' cke_editor_', name, '"' +
+					' dir="', editor.lang.dir, '"' +
+					' title="', ( CKEDITOR.env.gecko ? ' ' : '' ), '"' +
+					' lang="', editor.langCode, '"' +
+						( CKEDITOR.env.webkit? ' tabindex="' + tabIndex + '"' : '' ) +
+					' role="application"' +
+					' aria-labelledby="cke_', name, '_arialbl"' +
+					( style ? ' style="' + style + '"' : '' ) +
+					'>' +
+					'<span id="cke_', name, '_arialbl" class="cke_voice_label">' + editor.lang.editor + '</span>' +
+					'<span class="' , CKEDITOR.env.cssClass, '" role="presentation">' +
+						'<span class="cke_wrapper cke_', editor.lang.dir, '" role="presentation">' +
+							'<table class="cke_editor" border="0" cellspacing="0" cellpadding="0" role="presentation"><tbody>' +
+								'<tr', topHtml		? '' : ' style="display:none"', ' role="presentation"><td id="cke_top_'		, name, '" class="cke_top" role="presentation">'	, topHtml		, '</td></tr>' +
+								'<tr', contentsHtml	? '' : ' style="display:none"', ' role="presentation"><td id="cke_contents_', name, '" class="cke_contents" style="height:', height, '" role="presentation">', contentsHtml, '</td></tr>' +
+								'<tr', bottomHtml	? '' : ' style="display:none"', ' role="presentation"><td id="cke_bottom_'	, name, '" class="cke_bottom" role="presentation">'	, bottomHtml	, '</td></tr>' +
+							'</tbody></table>' +
+							//Hide the container when loading skins, later restored by skin css.
+							'<style>.', editor.skinClass, '{visibility:hidden;}</style>' +
+						'</span>' +
+					'</span>' +
+				'</span>' ].join( '' ) );
+
+			container.getChild( [1, 0, 0, 0, 0] ).unselectable();
+			container.getChild( [1, 0, 0, 0, 2] ).unselectable();
+
+			if ( elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
+				container.insertAfter( element );
+			else
+				element.append( container );
+
+			/**
+			 * The DOM element that holds the main editor interface.
+			 * @name CKEDITOR.editor.prototype.container
+			 * @type CKEDITOR.dom.element
+			 * @example
+			 * var editor = CKEDITOR.instances.editor1;
+			 * alert( <b>editor.container</b>.getName() );  "span"
+			 */
+			editor.container = container;
+
+			// Disable browser context menu for editor's chrome.
+			container.disableContextMenu();
+
+			editor.fireOnce( 'themeLoaded' );
+			editor.fireOnce( 'uiReady' );
+		},
+
+		buildDialog : function( editor )
+		{
+			var baseIdNumber = CKEDITOR.tools.getNextNumber();
+
+			var element = CKEDITOR.dom.element.createFromHtml( [
+					'<div class="', editor.id, '_dialog cke_editor_', editor.name.replace('.', '\\.'), '_dialog cke_skin_', editor.skinName,
+						'" dir="', editor.lang.dir, '"' +
+						' lang="', editor.langCode, '"' +
+						' role="dialog"' +
+						' aria-labelledby="%title#"' +
+						'>' +
+						'<table class="cke_dialog', ' ' + CKEDITOR.env.cssClass,
+							' cke_', editor.lang.dir, '" style="position:absolute" role="presentation">' +
+							'<tr><td role="presentation">' +
+							'<div class="%body" role="presentation">' +
+								'<div id="%title#" class="%title" role="presentation"></div>' +
+								'<a id="%close_button#" class="%close_button" href="javascript:void(0)" title="' +  editor.lang.common.close+'" role="button"><span class="cke_label">X</span></a>' +
+								'<div id="%tabs#" class="%tabs" role="tablist"></div>' +
+								'<table class="%contents" role="presentation">' +
+								'<tr>' +
+								  '<td id="%contents#" class="%contents" role="presentation"></td>' +
+								'</tr>' +
+								'<tr>' +
+								  '<td id="%footer#" class="%footer" role="presentation"></td>' +
+								'</tr>' +
+								'</table>' +
+							'</div>' +
+							'<div id="%tl#" class="%tl"></div>' +
+							'<div id="%tc#" class="%tc"></div>' +
+							'<div id="%tr#" class="%tr"></div>' +
+							'<div id="%ml#" class="%ml"></div>' +
+							'<div id="%mr#" class="%mr"></div>' +
+							'<div id="%bl#" class="%bl"></div>' +
+							'<div id="%bc#" class="%bc"></div>' +
+							'<div id="%br#" class="%br"></div>' +
+							'</td></tr>' +
+						'</table>',
+
+						//Hide the container when loading skins, later restored by skin css.
+						( CKEDITOR.env.ie ? '' : '<style>.cke_dialog{visibility:hidden;}</style>' ),
+
+					'</div>'
+				].join( '' )
+					.replace( /#/g, '_' + baseIdNumber )
+					.replace( /%/g, 'cke_dialog_' ) );
+
+			var body = element.getChild( [ 0, 0, 0, 0, 0 ] ),
+				title = body.getChild( 0 ),
+				close = body.getChild( 1 );
+
+			// Make the Title and Close Button unselectable.
+			title.unselectable();
+			close.unselectable();
+
+
+			return {
+				element : element,
+				parts :
+				{
+					dialog		: element.getChild( 0 ),
+					title		: title,
+					close		: close,
+					tabs		: body.getChild( 2 ),
+					contents	: body.getChild( [ 3, 0, 0, 0 ] ),
+					footer		: body.getChild( [ 3, 0, 1, 0 ] )
+				}
+			};
+		},
+
+		destroy : function( editor )
+		{
+			var container = editor.container;
+			container.clearCustomData();
+			editor.element.clearCustomData();
+
+			if ( container )
+				container.remove();
+
+			if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
+				editor.element.show();
+
+			delete editor.element;
+		}
+	};
+})() );
+
+/**
+ * Returns the DOM element that represents a theme space. The default theme defines
+ * three spaces, namely "top", "contents" and "bottom", representing the main
+ * blocks that compose the editor interface.
+ * @param {String} spaceName The space name.
+ * @returns {CKEDITOR.dom.element} The element that represents the space.
+ * @example
+ * // Hide the bottom space in the UI.
+ * var bottom = editor.getThemeSpace( 'bottom' );
+ * bottom.setStyle( 'display', 'none' );
+ */
+CKEDITOR.editor.prototype.getThemeSpace = function( spaceName )
+{
+	var spacePrefix = 'cke_' + spaceName;
+	var space = this._[ spacePrefix ] ||
+		( this._[ spacePrefix ] = CKEDITOR.document.getById( spacePrefix + '_' + this.name ) );
+	return space;
+};
+
+/**
+ * Resizes the editor interface.
+ * @param {Number|String} width The new width. It can be an pixels integer or a
+ *		CSS size value.
+ * @param {Number|String} height The new height. It can be an pixels integer or
+ *		a CSS size value.
+ * @param {Boolean} [isContentHeight] Indicates that the provided height is to
+ *		be applied to the editor contents space, not to the entire editor
+ *		interface. Defaults to false.
+ * @param {Boolean} [resizeInner] Indicates that the first inner interface
+ *		element must receive the size, not the outer element. The default theme
+ *		defines the interface inside a pair of span elements
+ *		(&lt;span&gt;&lt;span&gt;...&lt;/span&gt;&lt;/span&gt;). By default the
+ *		first span element receives the sizes. If this parameter is set to
+ *		true, the second span is sized instead.
+ * @example
+ * editor.resize( 900, 300 );
+ * @example
+ * editor.resize( '100%', 450, true );
+ */
+CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, resizeInner )
+{
+	var container = this.container,
+		contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
+		outer = resizeInner ? container.getChild( 1 ) : container;
+
+	// Resize the width first.
+	// WEBKIT BUG: Webkit requires that we put the editor off from display when we
+	// resize it. If we don't, the browser crashes!
+	CKEDITOR.env.webkit && outer.setStyle( 'display', 'none' );
+	// Set as border box width. (#5353)
+	outer.setSize( 'width',  width, true );
+	if ( CKEDITOR.env.webkit )
+	{
+		outer.$.offsetWidth;
+		outer.setStyle( 'display', '' );
+	}
+
+	// Get the height delta between the outer table and the content area.
+	// If we're setting the content area's height, then we don't need the delta.
+	var delta = isContentHeight ? 0 : ( outer.$.offsetHeight || 0 ) - ( contents.$.clientHeight || 0 );
+	contents.setStyle( 'height', Math.max( height - delta, 0 ) + 'px' );
+
+	// Emit a resize event.
+	this.fire( 'resize' );
+};
+
+/**
+ * Gets the element that can be freely used to check the editor size. This method
+ * is mainly used by the resize plugin, which adds a UI handle that can be used
+ * to resize the editor.
+ * @returns {CKEDITOR.dom.element} The resizable element.
+ * @example
+ */
+CKEDITOR.editor.prototype.getResizable = function()
+{
+	return this.container.getChild( 1 );
+};
+
+/**
+ * Makes it possible to place some of the editor UI blocks, like the toolbar
+ * and the elements path, into any element in the page.
+ * The elements used to hold the UI blocks can be shared among several editor
+ * instances. In that case, only the blocks of the active editor instance will
+ * display.
+ * @name CKEDITOR.config.sharedSpaces
+ * @type Object
+ * @default undefined
+ * @example
+ * // Place the toolbar inside the element with ID "someElementId" and the
+ * // elements path into the element with ID "anotherId".
+ * config.sharedSpaces =
+ * {
+ *     top : 'someElementId',
+ *     bottom : 'anotherId'
+ * };
+ * @example
+ * // Place the toolbar inside the element with ID "someElementId". The
+ * // elements path will remain attached to the editor UI.
+ * config.sharedSpaces =
+ * {
+ *     top : 'someElementId'
+ * };
+ */
+
+/**
+ * Fired after the editor instance is resized through
+ * the {@link CKEDITOR.editor.prototype.resize} method.
+ * @name CKEDITOR#resize
+ * @event
+ */
diff --git a/upload/public/js/3rd_party/ckeditor/themes/index.html b/upload/public/js/3rd_party/ckeditor/themes/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/ckeditor/themes/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/colorpicker/index.html b/upload/public/js/3rd_party/colorpicker/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/colorpicker/index.html
+++ b/upload/public/js/3rd_party/colorpicker/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/colorpicker/jscolor.js b/upload/public/js/3rd_party/colorpicker/jscolor.js
index 1d7713ba..d0e78647 100644
--- a/upload/public/js/3rd_party/colorpicker/jscolor.js
+++ b/upload/public/js/3rd_party/colorpicker/jscolor.js
@@ -1,11 +1,11 @@
 /**
  * jscolor, JavaScript Color Picker
  *
- * @version 1.3.1
+ * @version 1.3.9
  * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html
  * @author  Jan Odvarko, http://odvarko.cz
  * @created 2008-06-15
- * @updated 2010-01-23
+ * @updated 2011-07-28
  * @link    http://jscolor.com
  */
 
@@ -136,13 +136,13 @@ var jscolor = {
 		if(!el) {
 			return;
 		}
-		if(document.createEventObject) {
-			var ev = document.createEventObject();
-			el.fireEvent('on'+evnt, ev);
-		} else if(document.createEvent) {
+		if(document.createEvent) {
 			var ev = document.createEvent('HTMLEvents');
 			ev.initEvent(evnt, true, true);
 			el.dispatchEvent(ev);
+		} else if(document.createEventObject) {
+			var ev = document.createEventObject();
+			el.fireEvent('on'+evnt, ev);
 		} else if(el['on'+evnt]) { // alternatively use the traditional event model (IE5)
 			el['on'+evnt]();
 		}
@@ -171,16 +171,17 @@ var jscolor = {
 	},
 
 
-	getMousePos : function(e) {
-		if(!e) { e = window.event; }
-		if(typeof e.pageX === 'number') {
-			return [e.pageX, e.pageY];
-		} else if(typeof e.clientX === 'number') {
-			return [
-				e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft,
-				e.clientY + document.body.scrollTop + document.documentElement.scrollTop
-			];
+	getRelMousePos : function(e) {
+		var x = 0, y = 0;
+		if (!e) { e = window.event; }
+		if (typeof e.offsetX === 'number') {
+			x = e.offsetX;
+			y = e.offsetY;
+		} else if (typeof e.layerX === 'number') {
+			x = e.layerX;
+			y = e.layerY;
 		}
+		return { x: x, y: y };
 	},
 
 
@@ -329,6 +330,7 @@ var jscolor = {
 		this.adjust = true; // adjust value to uniform notation?
 		this.hash = false; // prefix color with # symbol?
 		this.caps = true; // uppercase?
+		this.slider = true; // show the value/saturation slider?
 		this.valueElement = target; // value holder
 		this.styleElement = target; // where to reflect current color
 		this.hsv = [0, 0, 1]; // read-only  0-6, 0-1, 0-1
@@ -337,6 +339,10 @@ var jscolor = {
 		this.pickerOnfocus = true; // display picker on focus?
 		this.pickerMode = 'HSV'; // HSV | HVS
 		this.pickerPosition = 'bottom'; // left | right | top | bottom
+		this.pickerButtonHeight = 20; // px
+		this.pickerClosable = false;
+		this.pickerCloseText = 'Close';
+		this.pickerButtonColor = 'ButtonText'; // px
 		this.pickerFace = 10; // px
 		this.pickerFaceColor = 'ThreeDFace'; // CSS color
 		this.pickerBorder = 1; // px
@@ -366,10 +372,7 @@ var jscolor = {
 				var ts = jscolor.getElementSize(target); // target size
 				var vp = jscolor.getViewPos(); // view pos
 				var vs = jscolor.getViewSize(); // view size
-				var ps = [ // picker size
-					2*this.pickerBorder + 4*this.pickerInset + 2*this.pickerFace + jscolor.images.pad[0] + 2*jscolor.images.arrow[0] + jscolor.images.sld[0],
-					2*this.pickerBorder + 2*this.pickerInset + 2*this.pickerFace + jscolor.images.pad[1]
-				];
+				var ps = getPickerDims(this); // picker size
 				var a, b, c;
 				switch(this.pickerPosition.toLowerCase()) {
 					case 'left': a=1; b=0; c=-1; break;
@@ -552,7 +555,10 @@ var jscolor = {
 					padM : document.createElement('div'),
 					sld : document.createElement('div'),
 					sldB : document.createElement('div'),
-					sldM : document.createElement('div')
+					sldM : document.createElement('div'),
+					btn : document.createElement('div'),
+					btnS : document.createElement('span'),
+					btnT : document.createTextNode(THIS.pickerCloseText)
 				};
 				for(var i=0,segSize=4; i<jscolor.images.sld[1]; i+=segSize) {
 					var seg = document.createElement('div');
@@ -567,24 +573,29 @@ var jscolor = {
 				jscolor.picker.padB.appendChild(jscolor.picker.pad);
 				jscolor.picker.box.appendChild(jscolor.picker.padB);
 				jscolor.picker.box.appendChild(jscolor.picker.padM);
+				jscolor.picker.btnS.appendChild(jscolor.picker.btnT);
+				jscolor.picker.btn.appendChild(jscolor.picker.btnS);
+				jscolor.picker.box.appendChild(jscolor.picker.btn);
 				jscolor.picker.boxB.appendChild(jscolor.picker.box);
 			}
 
 			var p = jscolor.picker;
 
-			// recompute controls positions
-			posPad = [
-				x+THIS.pickerBorder+THIS.pickerFace+THIS.pickerInset,
-				y+THIS.pickerBorder+THIS.pickerFace+THIS.pickerInset ];
-			posSld = [
-				null,
-				y+THIS.pickerBorder+THIS.pickerFace+THIS.pickerInset ];
-
 			// controls interaction
 			p.box.onmouseup =
 			p.box.onmouseout = function() { target.focus(); };
 			p.box.onmousedown = function() { abortBlur=true; };
-			p.box.onmousemove = function(e) { holdPad && setPad(e); holdSld && setSld(e); };
+			p.box.onmousemove = function(e) {
+				if (holdPad || holdSld) {
+					holdPad && setPad(e);
+					holdSld && setSld(e);
+					if (document.selection) {
+						document.selection.empty();
+					} else if (window.getSelection) {
+						window.getSelection().removeAllRanges();
+					}
+				}
+			};
 			p.padM.onmouseup =
 			p.padM.onmouseout = function() { if(holdPad) { holdPad=false; jscolor.fireEvent(valueElement,'change'); } };
 			p.padM.onmousedown = function(e) { holdPad=true; setPad(e); };
@@ -593,8 +604,9 @@ var jscolor = {
 			p.sldM.onmousedown = function(e) { holdSld=true; setSld(e); };
 
 			// picker
-			p.box.style.width = 4*THIS.pickerInset + 2*THIS.pickerFace + jscolor.images.pad[0] + 2*jscolor.images.arrow[0] + jscolor.images.sld[0] + 'px';
-			p.box.style.height = 2*THIS.pickerInset + 2*THIS.pickerFace + jscolor.images.pad[1] + 'px';
+			var dims = getPickerDims(THIS);
+			p.box.style.width = dims[0] + 'px';
+			p.box.style.height = dims[1] + 'px';
 
 			// picker border
 			p.boxB.style.position = 'absolute';
@@ -631,6 +643,7 @@ var jscolor = {
 			p.sld.style.height = jscolor.images.sld[1]+'px';
 
 			// slider border
+			p.sldB.style.display = THIS.slider ? 'block' : 'none';
 			p.sldB.style.position = 'absolute';
 			p.sldB.style.right = THIS.pickerFace+'px';
 			p.sldB.style.top = THIS.pickerFace+'px';
@@ -638,6 +651,7 @@ var jscolor = {
 			p.sldB.style.borderColor = THIS.pickerInsetColor;
 
 			// slider mouse area
+			p.sldM.style.display = THIS.slider ? 'block' : 'none';
 			p.sldM.style.position = 'absolute';
 			p.sldM.style.right = '0';
 			p.sldM.style.top = '0';
@@ -649,14 +663,45 @@ var jscolor = {
 				p.sldM.style.cursor = 'hand';
 			}
 
+			// "close" button
+			function setBtnBorder() {
+				var insetColors = THIS.pickerInsetColor.split(/\s+/);
+				var pickerOutsetColor = insetColors.length < 2 ? insetColors[0] : insetColors[1] + ' ' + insetColors[0] + ' ' + insetColors[0] + ' ' + insetColors[1];
+				p.btn.style.borderColor = pickerOutsetColor;
+			}
+			p.btn.style.display = THIS.pickerClosable ? 'block' : 'none';
+			p.btn.style.position = 'absolute';
+			p.btn.style.left = THIS.pickerFace + 'px';
+			p.btn.style.bottom = THIS.pickerFace + 'px';
+			p.btn.style.padding = '0 15px';
+			p.btn.style.height = '18px';
+			p.btn.style.border = THIS.pickerInset + 'px solid';
+			setBtnBorder();
+			p.btn.style.color = THIS.pickerButtonColor;
+			p.btn.style.font = '12px sans-serif';
+			p.btn.style.textAlign = 'center';
+			try {
+				p.btn.style.cursor = 'pointer';
+			} catch(eOldIE) {
+				p.btn.style.cursor = 'hand';
+			}
+			p.btn.onmousedown = function () {
+				THIS.hidePicker();
+			};
+			p.btnS.style.lineHeight = p.btn.style.height;
+
 			// load images in optimal order
 			switch(modeID) {
 				case 0: var padImg = 'hs.png'; break;
 				case 1: var padImg = 'hv.png'; break;
 			}
-			p.padM.style.background = "url('"+jscolor.getDir()+"cross.gif') no-repeat";
-			p.sldM.style.background = "url('"+jscolor.getDir()+"arrow.gif') no-repeat";
-			p.pad.style.background = "url('"+jscolor.getDir()+padImg+"') 0 0 no-repeat";
+			p.padM.style.backgroundImage = "url('"+jscolor.getDir()+"cross.gif')";
+			p.padM.style.backgroundRepeat = "no-repeat";
+			p.sldM.style.backgroundImage = "url('"+jscolor.getDir()+"arrow.gif')";
+			p.sldM.style.backgroundRepeat = "no-repeat";
+			p.pad.style.backgroundImage = "url('"+jscolor.getDir()+padImg+"')";
+			p.pad.style.backgroundRepeat = "no-repeat";
+			p.pad.style.backgroundPosition = "0 0";
 
 			// place pointers
 			redrawPad();
@@ -667,6 +712,18 @@ var jscolor = {
 		}
 
 
+		function getPickerDims(o) {
+			var dims = [
+				2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[0] +
+					(o.slider ? 2*o.pickerInset + 2*jscolor.images.arrow[0] + jscolor.images.sld[0] : 0),
+				o.pickerClosable ?
+					4*o.pickerInset + 3*o.pickerFace + jscolor.images.pad[1] + o.pickerButtonHeight :
+					2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[1]
+			];
+			return dims;
+		}
+
+
 		function redrawPad() {
 			// redraw the pad pointer
 			switch(modeID) {
@@ -754,9 +811,9 @@ var jscolor = {
 
 
 		function setPad(e) {
-			var posM = jscolor.getMousePos(e);
-			var x = posM[0]-posPad[0];
-			var y = posM[1]-posPad[1];
+			var mpos = jscolor.getRelMousePos(e);
+			var x = mpos.x - THIS.pickerFace - THIS.pickerInset;
+			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;
 			switch(modeID) {
 				case 0: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), 1 - y/(jscolor.images.pad[1]-1), null, leaveSld); break;
 				case 1: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), null, 1 - y/(jscolor.images.pad[1]-1), leaveSld); break;
@@ -765,8 +822,8 @@ var jscolor = {
 
 
 		function setSld(e) {
-			var posM = jscolor.getMousePos(e);
-			var y = posM[1]-posPad[1];
+			var mpos = jscolor.getRelMousePos(e);
+			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;
 			switch(modeID) {
 				case 0: THIS.fromHSV(null, null, 1 - y/(jscolor.images.sld[1]-1), leavePad); break;
 				case 1: THIS.fromHSV(null, 1 - y/(jscolor.images.sld[1]-1), null, leavePad); break;
@@ -783,9 +840,6 @@ var jscolor = {
 		var
 			holdPad = false,
 			holdSld = false;
-		var
-			posPad,
-			posSld;
 		var
 			leaveValue = 1<<0,
 			leaveStyle = 1<<1,
diff --git a/upload/public/js/3rd_party/cropper/cropper.css b/upload/public/js/3rd_party/cropper/cropper.css
new file mode 100644
index 00000000..6fb480d3
--- /dev/null
+++ b/upload/public/js/3rd_party/cropper/cropper.css
@@ -0,0 +1,185 @@
+.imgCrop_wrap {
+	/* width: 500px;   @done_in_js */
+	/* height: 375px;  @done_in_js */
+	position: relative;
+	cursor: crosshair;
+}
+
+/* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
+.imgCrop_wrap.opera8 .imgCrop_overlay,
+.imgCrop_wrap.opera8 .imgCrop_clickArea { 
+	background-color: transparent;
+}
+
+/* fix for IE displaying all boxes at line-height by default, although they are still 1 pixel high until we combine them with the pointless span */
+.imgCrop_wrap,
+.imgCrop_wrap * {
+	font-size: 0;
+	line-height: 0;
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+.imgCrop_overlay {
+	background-color: #000;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+}
+
+.imgCrop_selArea {
+	position: absolute;
+	/* @done_in_js 
+	top: 20px;
+	left: 20px;
+	width: 200px;
+	height: 200px;
+	background: transparent url(castle.jpg) no-repeat  -210px -110px;
+	*/
+	cursor: move;
+	z-index: 2;
+}
+
+/* clickArea is all a fix for IE 5.5 & 6 to allow the user to click on the given area */
+.imgCrop_clickArea {
+	width: 100%;
+	height: 100%;
+	background-color: #FFF;
+	opacity: 0.01;
+	filter:alpha(opacity=01);
+}
+
+.imgCrop_marqueeHoriz {
+	position: absolute;
+	width: 100%;
+	height: 1px;
+	background: transparent url(marqueeHoriz.gif) repeat-x 0 0;
+	z-index: 3;
+}
+
+.imgCrop_marqueeVert {
+	position: absolute;
+	height: 100%;
+	width: 1px;
+	background: transparent url(marqueeVert.gif) repeat-y 0 0;
+	z-index: 3;
+}
+
+/* 
+ *  FIX MARCHING ANTS IN IE
+ *	As IE <6 tries to load background images we can uncomment the follwoing hack 
+ *  to remove that issue, not as pretty - but is anything in IE?
+ *  And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
+ *
+* html .imgCrop_marqueeHoriz,
+* html .imgCrop_marqueeVert {
+	background: transparent;
+	filter: Invert; 
+}
+* html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
+* html .imgCrop_marqueeEast  { border-right: 1px dashed #000; }
+* html .imgCrop_marqueeSouth { border-bottom: 1px dashed #000; }
+* html .imgCrop_marqueeWest  { border-left: 1px dashed #000; }
+*/
+
+.imgCrop_marqueeNorth { top: 0; left: 0; }
+.imgCrop_marqueeEast  { top: 0; right: 0; }
+.imgCrop_marqueeSouth { bottom: 0px; left: 0; }
+.imgCrop_marqueeWest  { top: 0; left: 0; }
+
+
+.imgCrop_handle {
+	position: absolute;
+	border: 1px solid #333;
+	width: 6px;
+	height: 6px;
+	background: #FFF;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	z-index: 4;
+}
+
+/* fix IE 5 box model */
+* html .imgCrop_handle {
+	width: 8px;
+	height: 8px;
+	wid\th: 6px;
+	hei\ght: 6px;
+}
+
+.imgCrop_handleN {
+	top: -3px;
+	left: 0;
+	/* margin-left: 49%;    @done_in_js */
+	cursor: n-resize;
+}
+
+.imgCrop_handleNE { 
+	top: -3px;
+	right: -3px;
+	cursor: ne-resize;
+}
+
+.imgCrop_handleE {
+	top: 0;
+	right: -3px;
+	/* margin-top: 49%;    @done_in_js */
+	cursor: e-resize;
+}
+
+.imgCrop_handleSE {
+	right: -3px;
+	bottom: -3px;
+	cursor: se-resize;
+}
+
+.imgCrop_handleS {
+	right: 0;
+	bottom: -3px;
+	/* margin-right: 49%; @done_in_js */
+	cursor: s-resize;
+}
+
+.imgCrop_handleSW {
+	left: -3px;
+	bottom: -3px;
+	cursor: sw-resize;
+}
+
+.imgCrop_handleW {
+	top: 0;
+	left: -3px;
+	/* margin-top: 49%;  @done_in_js */
+	cursor: w-resize;
+}
+
+.imgCrop_handleNW {
+	top: -3px;
+	left: -3px;
+	cursor: nw-resize;
+}
+
+/**
+ * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
+ */
+.imgCrop_dragArea {
+	width: 100%;
+	height: 100%;
+	z-index: 200;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.imgCrop_previewWrap {
+	/* width: 200px;  @done_in_js */
+	/* height: 200px; @done_in_js */
+	overflow: hidden;
+	position: relative;
+}
+
+.imgCrop_previewWrap img {
+	position: absolute;
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/cropper/cropper.js b/upload/public/js/3rd_party/cropper/cropper.js
new file mode 100644
index 00000000..c364c5ce
--- /dev/null
+++ b/upload/public/js/3rd_party/cropper/cropper.js
@@ -0,0 +1,17 @@
+/** 
+ * Copyright (c) 2006-2009, David Spurr (http://www.defusion.org.uk/)
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the David Spurr nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * http://www.opensource.org/licenses/bsd-license.php
+ * 
+ * See scriptaculous.js for full scriptaculous licence
+ */
+
+var CropDraggable=Class.create(Draggable,{initialize:function(a){this.options=Object.extend({drawMethod:function(){}},arguments[1]||{});this.element=$(a);this.handle=this.element;this.delta=this.currentDelta();this.dragging=false;this.eventMouseDown=this.initDrag.bindAsEventListener(this);Event.observe(this.handle,"mousedown",this.eventMouseDown);Draggables.register(this);},draw:function(a){var e=Element.cumulativeOffset(this.element),c=this.currentDelta();e[0]-=c[0];e[1]-=c[1];var b=[0,1].map(function(d){return(a[d]-e[d]-this.offset[d]);}.bind(this));this.options.drawMethod(b);}});var Cropper={};Cropper.Img=Class.create({initialize:function(c,a){this.options=Object.extend({ratioDim:{x:0,y:0},minWidth:0,minHeight:0,displayOnInit:false,onEndCrop:Prototype.emptyFunction,captureKeys:true,onloadCoords:null,maxWidth:0,maxHeight:0,autoIncludeCSS:true},a||{});this.img=$(c);this.clickCoords={x:0,y:0};this.dragging=false;this.resizing=false;this.isWebKit=/Konqueror|Safari|KHTML/.test(navigator.userAgent);this.isIE=/MSIE/.test(navigator.userAgent);this.isOpera8=/Opera\s[1-8]/.test(navigator.userAgent);this.ratioX=0;this.ratioY=0;this.attached=false;this.fixedWidth=(this.options.maxWidth>0&&(this.options.minWidth>=this.options.maxWidth));this.fixedHeight=(this.options.maxHeight>0&&(this.options.minHeight>=this.options.maxHeight));if(typeof this.img=="undefined"){return;}if(this.options.autoIncludeCSS){$$("script").each(function(e){if(e.src.match(/\/cropper([^\/]*)\.js/)){var f=e.src.replace(/\/cropper([^\/]*)\.js.*/,""),d=document.createElement("link");d.rel="stylesheet";d.type="text/css";d.href=f+"/cropper.css";d.media="screen";document.getElementsByTagName("head")[0].appendChild(d);}});}if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){var b=this.getGCD(this.options.ratioDim.x,this.options.ratioDim.y);this.ratioX=this.options.ratioDim.x/b;this.ratioY=this.options.ratioDim.y/b;}this.subInitialize();if(this.img.complete||this.isWebKit){this.onLoad();}else{Event.observe(this.img,"load",this.onLoad.bindAsEventListener(this));}},getGCD:function(d,c){if(c===0){return d;}return this.getGCD(c,d%c);},onLoad:function(){var c="imgCrop_";var e=this.img.parentNode;var b="";if(this.isOpera8){b=" opera8";}this.imgWrap=new Element("div",{"class":c+"wrap"+b});this.north=new Element("div",{"class":c+"overlay "+c+"north"}).insert(new Element("span"));this.east=new Element("div",{"class":c+"overlay "+c+"east"}).insert(new Element("span"));this.south=new Element("div",{"class":c+"overlay "+c+"south"}).insert(new Element("span"));this.west=new Element("div",{"class":c+"overlay "+c+"west"}).insert(new Element("span"));var d=[this.north,this.east,this.south,this.west];this.dragArea=new Element("div",{"class":c+"dragArea"});d.each(function(f){this.dragArea.insert(f);},this);this.handleN=new Element("div",{"class":c+"handle "+c+"handleN"});this.handleNE=new Element("div",{"class":c+"handle "+c+"handleNE"});this.handleE=new Element("div",{"class":c+"handle "+c+"handleE"});this.handleSE=new Element("div",{"class":c+"handle "+c+"handleSE"});this.handleS=new Element("div",{"class":c+"handle "+c+"handleS"});this.handleSW=new Element("div",{"class":c+"handle "+c+"handleSW"});this.handleW=new Element("div",{"class":c+"handle "+c+"handleW"});this.handleNW=new Element("div",{"class":c+"handle "+c+"handleNW"});this.selArea=new Element("div",{"class":c+"selArea"});[new Element("div",{"class":c+"marqueeHoriz "+c+"marqueeNorth"}).insert(new Element("span")),new Element("div",{"class":c+"marqueeVert "+c+"marqueeEast"}).insert(new Element("span")),new Element("div",{"class":c+"marqueeHoriz "+c+"marqueeSouth"}).insert(new Element("span")),new Element("div",{"class":c+"marqueeVert "+c+"marqueeWest"}).insert(new Element("span")),this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW,new Element("div",{"class":c+"clickArea"})].each(function(f){this.selArea.insert(f);},this);this.imgWrap.appendChild(this.img);this.imgWrap.appendChild(this.dragArea);this.dragArea.appendChild(this.selArea);this.dragArea.appendChild(new Element("div",{"class":c+"clickArea"}));e.appendChild(this.imgWrap);this.startDragBind=this.startDrag.bindAsEventListener(this);Event.observe(this.dragArea,"mousedown",this.startDragBind);this.onDragBind=this.onDrag.bindAsEventListener(this);Event.observe(document,"mousemove",this.onDragBind);this.endCropBind=this.endCrop.bindAsEventListener(this);Event.observe(document,"mouseup",this.endCropBind);this.resizeBind=this.startResize.bindAsEventListener(this);this.handles=[this.handleN,this.handleNE,this.handleE,this.handleSE,this.handleS,this.handleSW,this.handleW,this.handleNW];this.registerHandles(true);if(this.options.captureKeys){this.keysBind=this.handleKeys.bindAsEventListener(this);Event.observe(document,"keypress",this.keysBind);}var a=new CropDraggable(this.selArea,{drawMethod:this.moveArea.bindAsEventListener(this)});this.setParams();},registerHandles:function(b){for(var d=0;d<this.handles.length;d++){var g=$(this.handles[d]);if(b){var a=false;if(this.fixedWidth&&this.fixedHeight){a=true;}else{if(this.fixedWidth||this.fixedHeight){var c=g.className.match(/([S|N][E|W])$/),f=g.className.match(/(E|W)$/),e=g.className.match(/(N|S)$/);if(c||(this.fixedWidth&&f)||(this.fixedHeight&&e)){a=true;}}}if(a){g.hide();}else{Event.observe(g,"mousedown",this.resizeBind);}}else{g.show();Event.stopObserving(g,"mousedown",this.resizeBind);}}},setParams:function(){this.imgW=this.img.width;this.imgH=this.img.height;$(this.north).setStyle({height:0});$(this.east).setStyle({width:0,height:0});$(this.south).setStyle({height:0});$(this.west).setStyle({width:0,height:0});$(this.imgWrap).setStyle({width:this.imgW+"px",height:this.imgH+"px"});$(this.selArea).hide();var b={x1:0,y1:0,x2:0,y2:0},a=false;if(this.options.onloadCoords!==null){b=this.cloneCoords(this.options.onloadCoords);a=true;}else{if(this.options.ratioDim.x>0&&this.options.ratioDim.y>0){b.x1=Math.ceil((this.imgW-this.options.ratioDim.x)/2);b.y1=Math.ceil((this.imgH-this.options.ratioDim.y)/2);b.x2=b.x1+this.options.ratioDim.x;b.y2=b.y1+this.options.ratioDim.y;a=true;}}this.setAreaCoords(b,false,false,1);if(this.options.displayOnInit&&a){this.selArea.show();this.drawArea();this.endCrop();}this.attached=true;},remove:function(){if(this.attached){this.attached=false;this.imgWrap.parentNode.insertBefore(this.img,this.imgWrap);this.imgWrap.parentNode.removeChild(this.imgWrap);Event.stopObserving(this.dragArea,"mousedown",this.startDragBind);Event.stopObserving(document,"mousemove",this.onDragBind);Event.stopObserving(document,"mouseup",this.endCropBind);this.registerHandles(false);if(this.options.captureKeys){Event.stopObserving(document,"keypress",this.keysBind);}}},reset:function(){if(!this.attached){this.onLoad();}else{this.setParams();}this.endCrop();},handleKeys:function(b){var a={x:0,y:0};if(!this.dragging){switch(b.keyCode){case (37):a.x=-1;break;case (38):a.y=-1;break;case (39):a.x=1;break;case (40):a.y=1;break;}if(a.x!==0||a.y!==0){if(b.shiftKey){a.x*=10;a.y*=10;}this.moveArea([this.areaCoords.x1+a.x,this.areaCoords.y1+a.y]);this.endCrop();Event.stop(b);}}},calcW:function(){return(this.areaCoords.x2-this.areaCoords.x1);},calcH:function(){return(this.areaCoords.y2-this.areaCoords.y1);},moveArea:function(a){this.setAreaCoords({x1:a[0],y1:a[1],x2:a[0]+this.calcW(),y2:a[1]+this.calcH()},true,false);this.drawArea();},cloneCoords:function(a){return{x1:a.x1,y1:a.y1,x2:a.x2,y2:a.y2};},setAreaCoords:function(i,a,m,h,k){if(a){var j=i.x2-i.x1,f=i.y2-i.y1;if(i.x1<0){i.x1=0;i.x2=j;}if(i.y1<0){i.y1=0;i.y2=f;}if(i.x2>this.imgW){i.x2=this.imgW;i.x1=this.imgW-j;}if(i.y2>this.imgH){i.y2=this.imgH;i.y1=this.imgH-f;}}else{if(i.x1<0){i.x1=0;}if(i.y1<0){i.y1=0;}if(i.x2>this.imgW){i.x2=this.imgW;}if(i.y2>this.imgH){i.y2=this.imgH;}if(h!==null){if(this.ratioX>0){this.applyRatio(i,{x:this.ratioX,y:this.ratioY},h,k);}else{if(m){this.applyRatio(i,{x:1,y:1},h,k);}}var b=[this.options.minWidth,this.options.minHeight],l=[this.options.maxWidth,this.options.maxHeight];if(b[0]>0||b[1]>0||l[0]>0||l[1]>0){var g={a1:i.x1,a2:i.x2},e={a1:i.y1,a2:i.y2},d={min:0,max:this.imgW},c={min:0,max:this.imgH};if((b[0]!==0||b[1]!==0)&&m){if(b[0]>0){b[1]=b[0];}else{if(b[1]>0){b[0]=b[1];}}}if((l[0]!==0||l[0]!==0)&&m){if(l[0]>0&&l[0]<=l[1]){l[1]=l[0];}else{if(l[1]>0&&l[1]<=l[0]){l[0]=l[1];}}}if(b[0]>0){this.applyDimRestriction(g,b[0],h.x,d,"min");}if(b[1]>1){this.applyDimRestriction(e,b[1],h.y,c,"min");}if(l[0]>0){this.applyDimRestriction(g,l[0],h.x,d,"max");}if(l[1]>1){this.applyDimRestriction(e,l[1],h.y,c,"max");}i={x1:g.a1,y1:e.a1,x2:g.a2,y2:e.a2};}}}this.areaCoords=i;},applyDimRestriction:function(d,f,e,c,b){var a;if(b=="min"){a=((d.a2-d.a1)<f);}else{a=((d.a2-d.a1)>f);}if(a){if(e==1){d.a2=d.a1+f;}else{d.a1=d.a2-f;}if(d.a1<c.min){d.a1=c.min;d.a2=f;}else{if(d.a2>c.max){d.a1=c.max-f;d.a2=c.max;}}}},applyRatio:function(c,a,e,b){var d;if(b=="N"||b=="S"){d=this.applyRatioToAxis({a1:c.y1,b1:c.x1,a2:c.y2,b2:c.x2},{a:a.y,b:a.x},{a:e.y,b:e.x},{min:0,max:this.imgW});c.x1=d.b1;c.y1=d.a1;c.x2=d.b2;c.y2=d.a2;}else{d=this.applyRatioToAxis({a1:c.x1,b1:c.y1,a2:c.x2,b2:c.y2},{a:a.x,b:a.y},{a:e.x,b:e.y},{min:0,max:this.imgH});c.x1=d.a1;c.y1=d.b1;c.x2=d.a2;c.y2=d.b2;}},applyRatioToAxis:function(i,f,h,b){var j=Object.extend(i,{}),e=j.a2-j.a1,a=Math.floor(e*f.b/f.a),g=null,c=null,d=null;if(h.b==1){g=j.b1+a;if(g>b.max){g=b.max;d=g-j.b1;}j.b2=g;}else{g=j.b2-a;if(g<b.min){g=b.min;d=g+j.b2;}j.b1=g;}if(d!==null){c=Math.floor(d*f.a/f.b);if(h.a==1){j.a2=j.a1+c;}else{j.a1=j.a1=j.a2-c;}}return j;},drawArea:function(){var h=this.calcW(),e=this.calcH();var g="px",c=[this.areaCoords.x1+g,this.areaCoords.y1+g,h+g,e+g,this.areaCoords.x2+g,this.areaCoords.y2+g,(this.img.width-this.areaCoords.x2)+g,(this.img.height-this.areaCoords.y2)+g];var f=this.selArea.style;f.left=c[0];f.top=c[1];f.width=c[2];f.height=c[3];var i=Math.ceil((h-6)/2)+g,d=Math.ceil((e-6)/2)+g;this.handleN.style.left=i;this.handleE.style.top=d;this.handleS.style.left=i;this.handleW.style.top=d;this.north.style.height=c[1];var a=this.east.style;a.top=c[1];a.height=c[3];a.left=c[4];a.width=c[6];var j=this.south.style;j.top=c[5];j.height=c[7];var b=this.west.style;b.top=c[1];b.height=c[3];b.width=c[0];this.subDrawArea();this.forceReRender();},forceReRender:function(){if(this.isIE||this.isWebKit){var g=document.createTextNode(" ");var e,b,f,a;if(this.isIE){fixEl=this.selArea;}else{if(this.isWebKit){fixEl=document.getElementsByClassName("imgCrop_marqueeSouth",this.imgWrap)[0];e=new Element("div");e.style.visibility="hidden";var c=["SE","S","SW"];for(a=0;a<c.length;a++){b=document.getElementsByClassName("imgCrop_handle"+c[a],this.selArea)[0];if(b.childNodes.length){b.removeChild(b.childNodes[0]);}b.appendChild(e);}}}fixEl.appendChild(g);fixEl.removeChild(g);}},startResize:function(a){this.startCoords=this.cloneCoords(this.areaCoords);this.resizing=true;this.resizeHandle=Event.element(a).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/,"");Event.stop(a);},startDrag:function(a){this.selArea.show();this.clickCoords=this.getCurPos(a);this.setAreaCoords({x1:this.clickCoords.x,y1:this.clickCoords.y,x2:this.clickCoords.x,y2:this.clickCoords.y},false,false,null);this.dragging=true;this.onDrag(a);Event.stop(a);},getCurPos:function(b){var a=this.imgWrap,c=Element.cumulativeOffset(a);while(a.nodeName!="BODY"){c[1]-=a.scrollTop||0;c[0]-=a.scrollLeft||0;a=a.parentNode;}return{x:Event.pointerX(b)-c[0],y:Event.pointerY(b)-c[1]};},onDrag:function(f){if(this.dragging||this.resizing){var b=null,a=this.getCurPos(f),d=this.cloneCoords(this.areaCoords),c={x:1,y:1};if(this.dragging){if(a.x<this.clickCoords.x){c.x=-1;}if(a.y<this.clickCoords.y){c.y=-1;}this.transformCoords(a.x,this.clickCoords.x,d,"x");this.transformCoords(a.y,this.clickCoords.y,d,"y");}else{if(this.resizing){b=this.resizeHandle;if(b.match(/E/)){this.transformCoords(a.x,this.startCoords.x1,d,"x");if(a.x<this.startCoords.x1){c.x=-1;}}else{if(b.match(/W/)){this.transformCoords(a.x,this.startCoords.x2,d,"x");if(a.x<this.startCoords.x2){c.x=-1;}}}if(b.match(/N/)){this.transformCoords(a.y,this.startCoords.y2,d,"y");if(a.y<this.startCoords.y2){c.y=-1;}}else{if(b.match(/S/)){this.transformCoords(a.y,this.startCoords.y1,d,"y");if(a.y<this.startCoords.y1){c.y=-1;}}}}}this.setAreaCoords(d,false,f.shiftKey,c,b);this.drawArea();Event.stop(f);}},transformCoords:function(b,a,e,d){var c=[b,a];if(b>a){c.reverse();}e[d+"1"]=c[0];e[d+"2"]=c[1];},endCrop:function(){this.dragging=false;this.resizing=false;this.options.onEndCrop(this.areaCoords,{width:this.calcW(),height:this.calcH()});},subInitialize:function(){},subDrawArea:function(){}});Cropper.ImgWithPreview=Class.create(Cropper.Img,{subInitialize:function(){this.hasPreviewImg=false;if(typeof(this.options.previewWrap)!="undefined"&&this.options.minWidth>0&&this.options.minHeight>0){this.previewWrap=$(this.options.previewWrap);this.previewImg=this.img.cloneNode(false);this.previewImg.id="imgCrop_"+this.previewImg.id;this.options.displayOnInit=true;this.hasPreviewImg=true;this.previewWrap.addClassName("imgCrop_previewWrap");this.previewWrap.setStyle({width:this.options.minWidth+"px",height:this.options.minHeight+"px"});this.previewWrap.appendChild(this.previewImg);}},subDrawArea:function(){if(this.hasPreviewImg){var d=this.calcW(),e=this.calcH();var f={x:this.imgW/d,y:this.imgH/e};var c={x:d/this.options.minWidth,y:e/this.options.minHeight};var a={w:Math.ceil(this.options.minWidth*f.x)+"px",h:Math.ceil(this.options.minHeight*f.y)+"px",x:"-"+Math.ceil(this.areaCoords.x1/c.x)+"px",y:"-"+Math.ceil(this.areaCoords.y1/c.y)+"px"};var b=this.previewImg.style;b.width=a.w;b.height=a.h;b.left=a.x;b.top=a.y;}}});
diff --git a/upload/public/js/3rd_party/cropper/cropper.uncompressed.js b/upload/public/js/3rd_party/cropper/cropper.uncompressed.js
new file mode 100644
index 00000000..ff2378c9
--- /dev/null
+++ b/upload/public/js/3rd_party/cropper/cropper.uncompressed.js
@@ -0,0 +1,1362 @@
+/**
+ * Image Cropper (v. 1.2.1 - 2009-10-06 )
+ * Copyright (c) 2006-2009 David Spurr (http://www.defusion.org.uk/)
+ * 
+ * The image cropper provides a way to draw a crop area on an image and capture
+ * the coordinates of the drawn crop area.
+ * 
+ * Features include:
+ *   - Based on Prototype and Scriptaculous
+ *   - Image editing package styling, the crop area functions and looks 
+ *     like those found in popular image editing software
+ *   - Dynamic inclusion of required styles
+ *   - Drag to draw areas
+ *   - Shift drag to draw/resize areas as squares
+ *   - Selection area can be moved 
+ *   - Seleciton area can be resized using resize handles
+ *   - Allows dimension ratio limited crop areas
+ *   - Allows minimum dimension crop areas
+ *   - Allows maximum dimesion crop areas
+ *   - If both min & max dimension options set to the same value for a single axis,then the cropper will not 
+ *     display the resize handles as appropriate (when min & max dimensions are passed for both axes this
+ *     results in a 'fixed size' crop area)
+ *   - Allows dynamic preview of resultant crop ( if minimum width & height are provided ), this is
+ *     implemented as a subclass so can be excluded when not required
+ *   - Movement of selection area by arrow keys ( shift + arrow key will move selection area by
+ *     10 pixels )
+ *   - All operations stay within bounds of image
+ *   - All functionality & display compatible with most popular browsers supported by Prototype:
+ *       PC:  IE 8, 7, 6 & 5.5, Firefox 2, 3, 3.5, Opera 8.5 (see known issues) & 9.0b
+ *       MAC: Camino 1.0, Firefox 2, 3, 3.5, Safari 3.x, 4
+ * 
+ * Requires:
+ *   - Prototype v. 1.5.0_rc0 > (as packaged with Scriptaculous 1.6.1)
+ *   - Scriptaculous v. 1.6.1 > modules: dragdrop 
+ *   
+ * Known issues:
+ *   - Safari animated gifs, only one of each will animate, this seems to be a known Safari issue
+ *   
+ *   - After drawing an area and then clicking to start a new drag in IE 5.5 the rendered height 
+ *       appears as the last height until the user drags, this appears to be the related to the error 
+ *       that the forceReRender() method fixes for IE 6, i.e. IE 5.5 is not redrawing the box properly.
+ *   
+ *   - Lack of CSS opacity support in Opera before version 9 mean we disable those style rules, these 
+ *     could be fixed by using PNGs with transparency if Opera 8.5 support is high priority for you
+ *   
+ *   - Marching ants keep reloading in IE <6, it is a known issue in IE and I have 
+ *       found no viable workarounds that can be included in the release. If this really is an issue for you
+ *       either try this post: http://mir.aculo.us/articles/2005/08/28/internet-explorer-and-ajax-image-caching-woes
+ *       or uncomment the 'FIX MARCHING ANTS IN IE' rules in the CSS file
+ *   
+ *   - Styling & borders on image, any CSS styling applied directly to the image itself (floats, borders, padding, margin, etc.) will 
+ *     cause problems with the cropper. The use of a wrapper element to apply these styles to is recommended.
+ *   
+ *   - overflow: auto or overflow: scroll on parent will cause cropper to burst out of parent in IE and Opera (maybe Mac browsers too)
+ *     I'm not sure why yet.
+ *   
+ * Usage:
+ *   See Cropper.Img & Cropper.ImgWithPreview for usage details
+ * 
+ * Changelog:
+ * v1.2.1 - 2009-10-06
+ *    + Added support for latest versions of Prototype & script.aculo.us
+ *      (1.6.1.0 & 1.8.2 respectively). Changes provided by Tom Hirashima.
+ *    - No-longer package prototype & script.aculo.us with the release
+ *    * Changed tests to use google ajax libraries api to load prototype & script.aculo.us
+ *    + Added option to not auto include the cropper CSS file
+ *    * #00008 - Fixed bug: Dynamic include of cropper CSS expected cropper.js and failed when using cropper.uncompressed.js
+ *    * #00028 - Fixed bug: Doesn't work with latest script.aculo.us - Fix by Tom Hirashima
+ *    * #00030 - Fixed bug: Doesn't work in Firefox 3.5 (CSS include issue)
+ *    * #00007 - Fixed bug: onEndCrop isn't called when moving with keys
+ *    * #00011 - Fixed bug: The image that is to be cropped does not show in IE6.0 -- included CSS fix
+ *    * Tidied up source code & fixed issues that jslint found so it will compress better
+ * 
+ * v1.2.0 - 2006-10-30
+ *    + Added id to the preview image element using 'imgCrop_[originalImageID]'
+ *      * #00001 - Fixed bug: Doesn't account for scroll offsets
+ *      * #00009 - Fixed bug: Placing the cropper inside differently positioned elements causes incorrect co-ordinates and display
+ *      * #00013 - Fixed bug: I-bar cursor appears on drag plane
+ *      * #00014 - Fixed bug: If ID for image tag is not found in document script throws error
+ *      * Fixed bug with drag start co-ordinates if wrapper element has moved in browser (e.g. dragged to a new position)
+ *      * Fixed bug with drag start co-ordinates if image contained in a wrapper with scrolling - this may be buggy if image 
+ *      has other ancestors with scrolling applied (except the body)
+ *      * #00015 - Fixed bug: When cropper removed and then reapplied onEndCrop callback gets called multiple times, solution suggestion from Bill Smith
+ *      * Various speed increases & code cleanup which meant improved performance in Mac - which allowed removal of different overlay methods for
+ *        IE and all other browsers, which led to a fix for:
+ *    * #00010 - Fixed bug: Select area doesn't adhere to image size when image resized using img attributes
+ *      - #00006 - Removed default behaviour of automatically setting a ratio when both min width & height passed, the ratioDimensions must be passed in
+ *    + #00005 - Added ability to set maximum crop dimensions, if both min & max set as the same value then we'll get a fixed cropper size on the axes as appropriate
+ *        and the resize handles will not be displayed as appropriate
+ *    * Switched keydown for keypress for moving select area with cursor keys (makes for nicer action) - doesn't appear to work in Safari
+ *    
+ * v1.1.3 - 2006-08-21
+ *    * Fixed wrong cursor on western handle in CSS
+ *    + #00008 & #00003 - Added feature: Allow to set dimensions & position for cropper on load
+ *      * #00002 - Fixed bug: Pressing 'remove cropper' twice removes image in IE
+ *    
+ * v1.1.2 - 2006-06-09
+ *    * Fixed bugs with ratios when GCD is low (patch submitted by Andy Skelton)
+ * 
+ * v1.1.1 - 2006-06-03
+ *    * Fixed bug with rendering issues fix in IE 5.5
+ *    * Fixed bug with endCrop callback issues once cropper had been removed & reset in IE
+ * 
+ * v1.1.0 - 2006-06-02
+ *    * Fixed bug with IE constantly trying to reload select area background image
+ *    * Applied more robust fix to Safari & IE rendering issues
+ *    + Added method to reset parameters - useful for when dynamically changing img cropper attached to
+ *    + Added method to remove cropper from image
+ *    
+ * v1.0.0 - 2006-05-18 
+ *    + Initial verison
+ * 
+ * 
+ * Copyright (c) 2006-2009, David Spurr (http://www.defusion.org.uk/)
+ * 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the David Spurr nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * http://www.opensource.org/licenses/bsd-license.php
+ * 
+ * See scriptaculous.js for full scriptaculous licence
+ */
+ 
+/**
+ * Extend the Draggable class to allow us to pass the rendering
+ * down to the Cropper object.
+ */
+var CropDraggable = Class.create(Draggable, {
+	
+	initialize: function(element) {
+		this.options = Object.extend(
+			{
+				/**
+				 * The draw method to defer drawing to
+				 */
+				drawMethod: function() {}
+			}, 
+			arguments[1] || {}
+		);
+
+		this.element = $(element);
+
+		this.handle = this.element;
+
+		this.delta    = this.currentDelta();
+		this.dragging = false;   
+
+		this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+		Event.observe(this.handle, "mousedown", this.eventMouseDown);
+
+		Draggables.register(this);
+	},
+	
+	/**
+	 * Defers the drawing of the draggable to the supplied method
+	 */
+	draw: function(point) {
+		var pos = Element.cumulativeOffset(this.element),
+		    d = this.currentDelta();
+		pos[0] -= d[0]; 
+		pos[1] -= d[1];
+				
+		var p = [0,1].map(function(i) { 
+			return (point[i]-pos[i]-this.offset[i]);
+		}.bind(this));
+				
+		this.options.drawMethod( p );
+	}
+	
+});
+
+
+/**
+ * The Cropper object, this will attach itself to the provided image by wrapping it with 
+ * the generated xHTML structure required by the cropper.
+ * 
+ * Usage:
+ *  @param obj Image element to attach to
+ *  @param obj Optional options:
+ *     - ratioDim obj 
+ *       The pixel dimensions to apply as a restrictive ratio, with properties x & y
+ *     
+ *     - minWidth int 
+ *       The minimum width for the select area in pixels
+ *     
+ *     - minHeight	int 
+ *       The mimimum height for the select area in pixels
+ *     
+ *     - maxWidth int
+ *       The maximum width for the select areas in pixels (if both minWidth & maxWidth set to same the width of the cropper will be fixed)
+ *     
+ *     - maxHeight int
+ *       The maximum height for the select areas in pixels (if both minHeight & maxHeight set to same the height of the cropper will be fixed)
+ *     
+ *     - displayOnInit int 
+ *       Whether to display the select area on initialisation, only used when providing minimum width & height or ratio
+ *     
+ *     - onEndCrop func
+ *       The callback function to provide the crop details to on end of a crop (see below)
+ *     
+ *     - captureKeys boolean
+ *       Whether to capture the keys for moving the select area, as these can cause some problems at the moment
+ *     
+ *     - onloadCoords obj
+ *       A coordinates object with properties x1, y1, x2 & y2; for the coordinates of the select area to display onload
+ *     
+ *     - autoIncludeCSS boolean
+ *       Whether to automatically include the stylesheet (assumes it lives in the same location as the cropper JS file)
+ *-    ---------------------------------------------
+ * 
+ * The callback function provided via the onEndCrop option should accept the following parameters:
+ *   - coords obj
+ *     The coordinates object with properties x1, y1, x2 & y2; for the coordinates of the select area
+ *   
+ *   - dimensions obj
+ *     The dimensions object with properites width & height; for the dimensions of the select area
+ *   
+ *   
+ *   Example:
+ *     function onEndCrop( coords, dimensions ) {
+ *         $( 'x1' ).value = coords.x1;
+ *         $( 'y1' ).value = coords.y1;
+ *         $( 'x2' ).value = coords.x2;
+ *         $( 'y2' ).value = coords.y2;
+ *         $( 'width' ).value = dimensions.width;
+ *         $( 'height' ).value = dimensions.height;
+ *     }
+ * 
+ */
+var Cropper = {};
+Cropper.Img = Class.create({
+	
+	/**
+	 * Initialises the class
+	 * 
+	 * @access public
+	 * @param obj Image element to attach to
+	 * @param obj Options
+	 * @return void
+	 */
+	initialize: function(element, options) {
+		this.options = Object.extend(
+			{
+				/**
+				 * @var obj
+				 * The pixel dimensions to apply as a restrictive ratio
+				 */
+				ratioDim: { x: 0, y: 0 },
+				/**
+				 * @var int
+				 * The minimum pixel width, also used as restrictive ratio if min height passed too
+				 */
+				minWidth:		0,
+				/**
+				 * @var int
+				 * The minimum pixel height, also used as restrictive ratio if min width passed too
+				 */
+				minHeight:		0,
+				/**
+				 * @var boolean
+				 * Whether to display the select area on initialisation, only used when providing minimum width & height or ratio
+				 */
+				displayOnInit:	false,
+				/**
+				 * @var function
+				 * The call back function to pass the final values to
+				 */
+				onEndCrop: Prototype.emptyFunction,
+				/**
+				 * @var boolean
+				 * Whether to capture key presses or not
+				 */
+				captureKeys: true,
+				/**
+				 * @var obj Coordinate object x1, y1, x2, y2
+				 * The coordinates to optionally display the select area at onload
+				 */
+				onloadCoords: null,
+				/**
+				 * @var int
+				 * The maximum width for the select areas in pixels (if both minWidth & maxWidth set to same the width of the cropper will be fixed)
+				 */
+				maxWidth: 0,
+				/**
+				 * @var int
+				 * The maximum height for the select areas in pixels (if both minHeight & maxHeight set to same the height of the cropper will be fixed)
+				 */
+				maxHeight: 0,
+				/**
+				 * @var boolean - default true
+				 * Whether to automatically include the stylesheet (assumes it lives in the same location as the cropper JS file)
+				 */
+				autoIncludeCSS: true
+			}, 
+			options || {}
+		);				
+		/**
+		 * @var obj
+		 * The img node to attach to
+		 */
+		this.img = $( element );
+		/**
+		 * @var obj
+		 * The x & y coordinates of the click point
+		 */
+		this.clickCoords = { x: 0, y: 0 };
+		/**
+		 * @var boolean
+		 * Whether the user is dragging
+		 */
+		this.dragging = false;
+		/**
+		 * @var boolean
+		 * Whether the user is resizing
+		 */
+		this.resizing = false;
+		/**
+		 * @var boolean
+		 * Whether the user is on a webKit browser
+		 */
+		this.isWebKit = /Konqueror|Safari|KHTML/.test( navigator.userAgent );
+		/**
+		 * @var boolean
+		 * Whether the user is on IE
+		 */
+		this.isIE = /MSIE/.test( navigator.userAgent );
+		/**
+		 * @var boolean
+		 * Whether the user is on Opera below version 9
+		 */
+		this.isOpera8 = /Opera\s[1-8]/.test( navigator.userAgent );
+		/**
+		 * @var int
+		 * The x ratio 
+		 */
+		this.ratioX = 0;
+		/**
+		 * @var int
+		 * The y ratio
+		 */
+		this.ratioY = 0;
+		/**
+		 * @var boolean
+		 * Whether we've attached sucessfully
+		 */
+		this.attached = false;
+		/**
+		 * @var boolean
+		 * Whether we've got a fixed width (if minWidth EQ or GT maxWidth then we have a fixed width
+		 * in the case of minWidth > maxWidth maxWidth wins as the fixed width)
+		 */
+		this.fixedWidth = ( this.options.maxWidth > 0 && ( this.options.minWidth >= this.options.maxWidth ) );
+		/**
+		 * @var boolean
+		 * Whether we've got a fixed height (if minHeight EQ or GT maxHeight then we have a fixed height
+		 * in the case of minHeight > maxHeight maxHeight wins as the fixed height)
+		 */
+		this.fixedHeight = ( this.options.maxHeight > 0 && ( this.options.minHeight >= this.options.maxHeight ) );
+		
+		// quit if the image element doesn't exist
+		if( typeof this.img == 'undefined' ) { return; }
+		
+		// include the stylesheet
+		if( this.options.autoIncludeCSS ) {
+			$$('script').each(function(s) {
+				if( s.src.match( /\/cropper([^\/]*)\.js/ ) ) {
+					var path    = s.src.replace( /\/cropper([^\/]*)\.js.*/, '' ),
+					    style   = document.createElement( 'link' );
+					style.rel   = 'stylesheet';
+					style.type  = 'text/css';
+					style.href  = path + '/cropper.css';
+					style.media = 'screen';
+					document.getElementsByTagName( 'head' )[0].appendChild( style );
+				}
+			});   
+		}
+	
+		// calculate the ratio when neccessary
+		if( this.options.ratioDim.x > 0 && this.options.ratioDim.y > 0 ) {
+			var gcd = this.getGCD( this.options.ratioDim.x, this.options.ratioDim.y );
+			this.ratioX = this.options.ratioDim.x / gcd;
+			this.ratioY = this.options.ratioDim.y / gcd;
+			// dump( 'RATIO : ' + this.ratioX + ':' + this.ratioY + '\n' );
+		}
+							
+		// initialise sub classes
+		this.subInitialize();
+
+		// only load the event observers etc. once the image is loaded
+		// this is done after the subInitialize() call just in case the sub class does anything
+		// that will affect the result of the call to onLoad()
+		if( this.img.complete || this.isWebKit ) {
+			this.onLoad(); // for some reason Safari seems to support img.complete but returns 'undefined' on the this.img object
+		} else {
+			Event.observe( this.img, 'load', this.onLoad.bindAsEventListener( this) );
+		}
+	},
+	
+	/**
+	 * The Euclidean algorithm used to find the greatest common divisor
+	 * 
+	 * @acces private
+	 * @param int Value 1
+	 * @param int Value 2
+	 * @return int
+	 */
+	getGCD : function( a , b ) {
+		if( b === 0 ) { return a; }
+		return this.getGCD(b, a % b );
+	},
+	
+	/**
+	 * Attaches the cropper to the image once it has loaded
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	onLoad: function( ) {
+		/*
+		 * Build the container and all related elements, will result in the following
+		 *
+		 * <div class="imgCrop_wrap">
+		 *   <img ... this.img ... />
+		 *   <div class="imgCrop_dragArea">
+		 *     <!-- the inner spans are only required for IE to stop it making the divs 1px high/wide -->
+		 *     <div class="imgCrop_overlay imageCrop_north"><span></span></div>
+		 *     <div class="imgCrop_overlay imageCrop_east"><span></span></div>
+		 *     <div class="imgCrop_overlay imageCrop_south"><span></span></div>
+		 *     <div class="imgCrop_overlay imageCrop_west"><span></span></div>
+		 *     <div class="imgCrop_selArea">
+		 *       <!-- marquees -->
+		 *       <!-- the inner spans are only required for IE to stop it making the divs 1px high/wide -->
+		 *       <div class="imgCrop_marqueeHoriz imgCrop_marqueeNorth"><span></span></div>
+		 *       <div class="imgCrop_marqueeVert imgCrop_marqueeEast"><span></span></div>
+		 *       <div class="imgCrop_marqueeHoriz imgCrop_marqueeSouth"><span></span></div>
+		 *       <div class="imgCrop_marqueeVert imgCrop_marqueeWest"><span></span></div>
+		 *       <!-- handles -->
+		 *       <div class="imgCrop_handle imgCrop_handleN"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleNE"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleE"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleSE"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleS"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleSW"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleW"></div>
+		 *       <div class="imgCrop_handle imgCrop_handleNW"></div>
+		 *       <div class="imgCrop_clickArea"></div>
+		 *     </div>
+		 *     <div class="imgCrop_clickArea"></div>
+		 *   </div>
+		 * </div>
+		 */
+		var cNamePrefix = 'imgCrop_';
+		
+		// get the point to insert the container
+		var insertPoint = this.img.parentNode;
+		
+		// apply an extra class to the wrapper to fix Opera below version 9
+		var fixOperaClass = '';
+		if( this.isOpera8 ) { fixOperaClass = ' opera8'; }
+		this.imgWrap = new Element( 'div', { 'class': cNamePrefix + 'wrap' + fixOperaClass } );
+		
+		this.north = new Element( 'div', { 'class': cNamePrefix + 'overlay ' + cNamePrefix + 'north' }).insert(new Element( 'span' ));
+		this.east  = new Element( 'div', { 'class': cNamePrefix + 'overlay ' + cNamePrefix + 'east' }).insert(new Element( 'span' ));
+		this.south = new Element( 'div', { 'class': cNamePrefix + 'overlay ' + cNamePrefix + 'south' }).insert(new Element( 'span' ));
+		this.west  = new Element( 'div', { 'class': cNamePrefix + 'overlay ' + cNamePrefix + 'west' }).insert(new Element( 'span' ));
+		
+		var overlays = [ this.north, this.east, this.south, this.west ];
+
+		this.dragArea = new Element( 'div', { 'class': cNamePrefix + 'dragArea' } );
+		
+		overlays.each(function(o){this.dragArea.insert(o);}, this);
+		
+		this.handleN  = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleN' } );
+		this.handleNE = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleNE' } );
+		this.handleE  = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleE' } );
+		this.handleSE = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleSE' } );
+		this.handleS  = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleS' } );
+		this.handleSW = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleSW' } );
+		this.handleW  = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleW' } );
+		this.handleNW = new Element( 'div', { 'class': cNamePrefix + 'handle ' + cNamePrefix + 'handleNW' } );
+				
+		this.selArea = new Element( 'div', { 'class': cNamePrefix + 'selArea' });
+			[
+				new Element( 'div', { 'class': cNamePrefix + 'marqueeHoriz ' + cNamePrefix + 'marqueeNorth' }).insert(new Element( 'span' )),
+				new Element( 'div', { 'class': cNamePrefix + 'marqueeVert ' + cNamePrefix + 'marqueeEast' }).insert(new Element( 'span' )),
+				new Element( 'div', { 'class': cNamePrefix + 'marqueeHoriz ' + cNamePrefix + 'marqueeSouth' }).insert(new Element( 'span' )),
+				new Element( 'div', { 'class': cNamePrefix + 'marqueeVert ' + cNamePrefix + 'marqueeWest' }).insert(new Element( 'span' )),
+				this.handleN,
+				this.handleNE,
+				this.handleE,
+				this.handleSE,
+				this.handleS,
+				this.handleSW,
+				this.handleW,
+				this.handleNW,
+				new Element( 'div', { 'class': cNamePrefix + 'clickArea' } )
+			].each(function(o){this.selArea.insert(o);}, this);
+		
+				
+		this.imgWrap.appendChild( this.img );
+		this.imgWrap.appendChild( this.dragArea );
+		this.dragArea.appendChild( this.selArea );
+		this.dragArea.appendChild( new Element( 'div', { 'class': cNamePrefix + 'clickArea' } ) );
+
+		insertPoint.appendChild( this.imgWrap );
+
+		// add event observers
+		this.startDragBind = this.startDrag.bindAsEventListener( this );
+		Event.observe( this.dragArea, 'mousedown', this.startDragBind );
+		
+		this.onDragBind = this.onDrag.bindAsEventListener( this );
+		Event.observe( document, 'mousemove', this.onDragBind );
+		
+		this.endCropBind = this.endCrop.bindAsEventListener( this );
+		Event.observe( document, 'mouseup', this.endCropBind );
+		
+		this.resizeBind = this.startResize.bindAsEventListener( this );
+		this.handles = [ this.handleN, this.handleNE, this.handleE, this.handleSE, this.handleS, this.handleSW, this.handleW, this.handleNW ];
+		this.registerHandles( true );
+		
+		if( this.options.captureKeys ) {
+			this.keysBind = this.handleKeys.bindAsEventListener( this );
+			Event.observe( document, 'keypress', this.keysBind );
+		}
+
+		// attach the dragable to the select area
+		var x = new CropDraggable( this.selArea, { drawMethod: this.moveArea.bindAsEventListener( this ) } );
+		
+		this.setParams();
+	},
+	
+	/**
+	 * Manages adding or removing the handle event handler and hiding or displaying them as appropriate
+	 * 
+	 * @access private
+	 * @param boolean registration true = add, false = remove
+	 * @return void
+	 */
+	registerHandles: function( registration ) {	
+		for( var i = 0; i < this.handles.length; i++ ) {
+			var handle = $( this.handles[i] );
+			
+			if( registration ) {
+				var hideHandle	= false;	// whether to hide the handle
+				
+				// disable handles asappropriate if we've got fixed dimensions
+				// if both dimensions are fixed we don't need to do much
+				if( this.fixedWidth && this.fixedHeight ) {
+					hideHandle = true;
+				} else if( this.fixedWidth || this.fixedHeight ) {
+					// if one of the dimensions is fixed then just hide those handles
+					var isCornerHandle = handle.className.match( /([S|N][E|W])$/ ),
+					    isWidthHandle  = handle.className.match( /(E|W)$/ ),
+					    isHeightHandle = handle.className.match( /(N|S)$/ );
+					if( isCornerHandle || ( this.fixedWidth && isWidthHandle ) || ( this.fixedHeight && isHeightHandle ) ) {
+						hideHandle = true;
+					}
+				}
+				if( hideHandle ) { 
+					handle.hide(); 
+				} else {
+					Event.observe( handle, 'mousedown', this.resizeBind );
+				}
+			} else {
+				handle.show();
+				Event.stopObserving( handle, 'mousedown', this.resizeBind );
+			}
+		}
+	},
+		
+	/**
+	 * Sets up all the cropper parameters, this can be used to reset the cropper when dynamically
+	 * changing the images
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	setParams: function() {
+		/**
+		 * @var int
+		 * The image width
+		 */
+		this.imgW = this.img.readAttribute('width');
+		/**
+		 * @var int
+		 * The image height
+		 */
+		this.imgH = this.img.readAttribute('height');			
+
+		$( this.north ).setStyle( { height: 0 } );
+		$( this.east ).setStyle( { width: 0, height: 0 } );
+		$( this.south ).setStyle( { height: 0 } );
+		$( this.west ).setStyle( { width: 0, height: 0 } );
+		
+		// resize the container to fit the image
+		$( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
+		
+		// hide the select area
+		$( this.selArea ).hide();
+						
+		// setup the starting position of the select area
+		var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 },
+		    validCoordsSet = false;
+		
+		// display the select area 
+		if( this.options.onloadCoords !== null ) {
+			// if we've being given some coordinates to 
+			startCoords = this.cloneCoords( this.options.onloadCoords );
+			validCoordsSet = true;
+		} else if( this.options.ratioDim.x > 0 && this.options.ratioDim.y > 0 ) {
+			// if there is a ratio limit applied and the then set it to initial ratio
+			startCoords.x1 = Math.ceil( ( this.imgW - this.options.ratioDim.x ) / 2 );
+			startCoords.y1 = Math.ceil( ( this.imgH - this.options.ratioDim.y ) / 2 );
+			startCoords.x2 = startCoords.x1 + this.options.ratioDim.x;
+			startCoords.y2 = startCoords.y1 + this.options.ratioDim.y;
+			validCoordsSet = true;
+		}
+		
+		this.setAreaCoords( startCoords, false, false, 1 );
+		
+		if( this.options.displayOnInit && validCoordsSet ) {
+			this.selArea.show();
+			this.drawArea();
+			this.endCrop();
+		}
+		
+		this.attached = true;
+	},
+	
+	/**
+	 * Removes the cropper
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	remove: function() {
+		if( this.attached ) {
+			this.attached = false;
+			
+			// remove the elements we inserted
+			this.imgWrap.parentNode.insertBefore( this.img, this.imgWrap );
+			this.imgWrap.parentNode.removeChild( this.imgWrap );
+			
+			// remove the event observers
+			Event.stopObserving( this.dragArea, 'mousedown', this.startDragBind );
+			Event.stopObserving( document, 'mousemove', this.onDragBind );		
+			Event.stopObserving( document, 'mouseup', this.endCropBind );
+			this.registerHandles( false );
+			if( this.options.captureKeys ) {
+				Event.stopObserving( document, 'keypress', this.keysBind );
+			}
+		}
+	},
+	
+	/**
+	 * Resets the cropper, can be used either after being removed or any time you wish
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	reset: function() {
+		if( !this.attached ) {
+			this.onLoad();
+		} else {
+			this.setParams();
+		}
+		this.endCrop();
+	},
+	
+	/**
+	 * Handles the key functionality, currently just using arrow keys to move, if the user
+	 * presses shift then the area will move by 10 pixels
+	 */
+	handleKeys: function( e ) {
+		var dir = { x: 0, y: 0 }; // direction to move it in & the amount in pixels
+		if( !this.dragging ) {
+			
+			// catch the arrow keys
+			switch( e.keyCode ) {
+				case( 37 ) : // left
+					dir.x = -1;
+					break;
+				case( 38 ) : // up
+					dir.y = -1;
+					break;
+				case( 39 ) : // right
+					dir.x = 1;
+					break;
+				case( 40 ) : // down
+					dir.y = 1;
+					break;
+			}
+			
+			if( dir.x !== 0 || dir.y !== 0 ) {
+				// if shift is pressed then move by 10 pixels
+				if( e.shiftKey ) {
+					dir.x *= 10;
+					dir.y *= 10;
+				}
+				
+				this.moveArea( [ this.areaCoords.x1 + dir.x, this.areaCoords.y1 + dir.y ] );
+				this.endCrop();
+				Event.stop( e ); 
+			}
+		}
+	},
+	
+	/**
+	 * Calculates the width from the areaCoords
+	 * 
+	 * @access private
+	 * @return int
+	 */
+	calcW: function() {
+		return (this.areaCoords.x2 - this.areaCoords.x1);
+	},
+	
+	/**
+	 * Calculates the height from the areaCoords
+	 * 
+	 * @access private
+	 * @return int
+	 */
+	calcH: function() {
+		return (this.areaCoords.y2 - this.areaCoords.y1);
+	},
+	
+	/**
+	 * Moves the select area to the supplied point (assumes the point is x1 & y1 of the select area)
+	 * 
+	 * @access public
+	 * @param array Point for x1 & y1 to move select area to
+	 * @return void
+	 */
+	moveArea: function( point ) {
+		// dump( 'moveArea        : ' + point[0] + ',' + point[1] + ',' + ( point[0] + ( this.areaCoords.x2 - this.areaCoords.x1 ) ) + ',' + ( point[1] + ( this.areaCoords.y2 - this.areaCoords.y1 ) ) + '\n' );
+		this.setAreaCoords( 
+			{
+				x1: point[0], 
+				y1: point[1],
+				x2: point[0] + this.calcW(),
+				y2: point[1] + this.calcH()
+			},
+			true,
+			false
+		);
+		this.drawArea();
+	},
+
+	/**
+	 * Clones a co-ordinates object, stops problems with handling them by reference
+	 * 
+	 * @access private
+	 * @param obj Coordinate object x1, y1, x2, y2
+	 * @return obj Coordinate object x1, y1, x2, y2
+	 */
+	cloneCoords: function( coords ) {
+		return { x1: coords.x1, y1: coords.y1, x2: coords.x2, y2: coords.y2 };
+	},
+
+	/**
+	 * Sets the select coords to those provided but ensures they don't go
+	 * outside the bounding box
+	 * 
+	 * @access private
+	 * @param obj Coordinates x1, y1, x2, y2
+	 * @param boolean Whether this is a move
+	 * @param boolean Whether to apply squaring
+	 * @param obj Direction of mouse along both axis x, y ( -1 = negative, 1 = positive ) only required when moving etc.
+	 * @param string The current resize handle || null
+	 * @return void
+	 */
+	setAreaCoords: function( coords, moving, square, direction, resizeHandle ) {
+		// dump( 'setAreaCoords (in) : ' + coords.x1 + ',' + coords.y1 + ',' + coords.x2 + ',' + coords.y2 );
+		if( moving ) {
+			// if moving
+			var targW = coords.x2 - coords.x1,
+			    targH = coords.y2 - coords.y1;
+			
+			// ensure we're within the bounds
+			if( coords.x1 < 0 ) {
+				coords.x1 = 0;
+				coords.x2 = targW;
+			}
+			if( coords.y1 < 0 ) {
+				coords.y1 = 0;
+				coords.y2 = targH;
+			}
+			if( coords.x2 > this.imgW ) {
+				coords.x2 = this.imgW;
+				coords.x1 = this.imgW - targW;
+			}
+			if( coords.y2 > this.imgH ) {
+				coords.y2 = this.imgH;
+				coords.y1 = this.imgH - targH;
+			}			
+		} else {
+			// ensure we're within the bounds
+			if( coords.x1 < 0 ) { coords.x1 = 0; }
+			if( coords.y1 < 0 ) { coords.y1 = 0; }
+			if( coords.x2 > this.imgW ) { coords.x2 = this.imgW; }
+			if( coords.y2 > this.imgH ) { coords.y2 = this.imgH; }
+			
+			// This is passed as null in onload
+			if( direction !== null ) {
+								
+				// apply the ratio or squaring where appropriate
+				if( this.ratioX > 0 ) {
+					this.applyRatio( coords, { x: this.ratioX, y: this.ratioY }, direction, resizeHandle );
+				} else if( square ) {
+					this.applyRatio( coords, { x: 1, y: 1 }, direction, resizeHandle );
+				}
+										
+				var mins = [ this.options.minWidth, this.options.minHeight ], // minimum dimensions [x,y]			
+				    maxs = [ this.options.maxWidth, this.options.maxHeight ]; // maximum dimensions [x,y]
+		
+				// apply dimensions where appropriate
+				if( mins[0] > 0 || mins[1] > 0 || maxs[0] > 0 || maxs[1] > 0) {
+				
+					var coordsTransX = { a1: coords.x1, a2: coords.x2 },
+					    coordsTransY = { a1: coords.y1, a2: coords.y2 },
+					    boundsX      = { min: 0, max: this.imgW },
+					    boundsY      = { min: 0, max: this.imgH };
+
+					// handle squaring properly on single axis minimum dimensions
+					if( (mins[0] !== 0 || mins[1] !== 0) && square ) {
+						if( mins[0] > 0 ) {
+							mins[1] = mins[0];
+						} else if( mins[1] > 0 ) {
+							mins[0] = mins[1];
+						}
+					}
+					
+					if( (maxs[0] !== 0 || maxs[0] !== 0) && square ) {
+						// if we have a max x value & it is less than the max y value then we set the y max to the max x (so we don't go over the minimum maximum of one of the axes - if that makes sense)
+						if( maxs[0] > 0 && maxs[0] <= maxs[1] ) {
+							maxs[1] = maxs[0];
+						} else if( maxs[1] > 0 && maxs[1] <= maxs[0] ) {
+							maxs[0] = maxs[1];
+						}
+					}
+					
+					if( mins[0] > 0 ) { this.applyDimRestriction( coordsTransX, mins[0], direction.x, boundsX, 'min' ); }
+					if( mins[1] > 1 ) { this.applyDimRestriction( coordsTransY, mins[1], direction.y, boundsY, 'min' ); }
+					
+					if( maxs[0] > 0 ) { this.applyDimRestriction( coordsTransX, maxs[0], direction.x, boundsX, 'max' ); }
+					if( maxs[1] > 1 ) { this.applyDimRestriction( coordsTransY, maxs[1], direction.y, boundsY, 'max' ); }
+					
+					coords = { x1: coordsTransX.a1, y1: coordsTransY.a1, x2: coordsTransX.a2, y2: coordsTransY.a2 };
+				}
+				
+			}
+		}
+		
+		// dump( 'setAreaCoords (out) : ' + coords.x1 + ',' + coords.y1 + ',' + coords.x2 + ',' + coords.y2 + '\n' );
+		this.areaCoords = coords;
+	},
+	
+	/**
+	* Applies the supplied dimension restriction to the supplied coordinates along a single axis
+	 * 
+	 * @access private
+	 * @param obj Single axis coordinates, a1, a2 (e.g. for the x axis a1 = x1 & a2 = x2)
+	 * @param int The restriction value
+	 * @param int The direction ( -1 = negative, 1 = positive )
+	 * @param obj The bounds of the image ( for this axis )
+	 * @param string The dimension restriction type ( 'min' | 'max' )
+	 * @return void
+	 */
+	applyDimRestriction: function( coords, val, direction, bounds, type ) {
+		var check;
+		if( type == 'min' ) { check = ( ( coords.a2 - coords.a1 ) < val ); }
+		else { check = ( ( coords.a2 - coords.a1 ) > val ); }
+		if( check ) {
+			if( direction == 1 ) { coords.a2 = coords.a1 + val; }
+			else { coords.a1 = coords.a2 - val; }
+			
+			// make sure we're still in the bounds (not too pretty for the user, but needed)
+			if( coords.a1 < bounds.min ) {
+				coords.a1 = bounds.min;
+				coords.a2 = val;
+			} else if( coords.a2 > bounds.max ) {
+				coords.a1 = bounds.max - val;
+				coords.a2 = bounds.max;
+			}
+		}
+	},
+		
+	/**
+	 * Applies the supplied ratio to the supplied coordinates
+	 * 
+	 * @access private
+	 * @param obj Coordinates, x1, y1, x2, y2
+	 * @param obj Ratio, x, y
+	 * @param obj Direction of mouse, x & y : -1 == negative 1 == positive
+	 * @param string The current resize handle || null
+	 * @return void
+	 */
+	applyRatio : function( coords, ratio, direction, resizeHandle ) {
+		// dump( 'direction.y : ' + direction.y + '\n');
+		var newCoords;
+		if( resizeHandle == 'N' || resizeHandle == 'S' ) {
+			// dump( 'north south \n');
+			// if moving on either the lone north & south handles apply the ratio on the y axis
+			newCoords = this.applyRatioToAxis( 
+				{ a1: coords.y1, b1: coords.x1, a2: coords.y2, b2: coords.x2 },
+				{ a: ratio.y, b: ratio.x },
+				{ a: direction.y, b: direction.x },
+				{ min: 0, max: this.imgW }
+			);
+			coords.x1 = newCoords.b1;
+			coords.y1 = newCoords.a1;
+			coords.x2 = newCoords.b2;
+			coords.y2 = newCoords.a2;
+		} else {
+			// otherwise deal with it as if we're applying the ratio on the x axis
+			newCoords = this.applyRatioToAxis( 
+				{ a1: coords.x1, b1: coords.y1, a2: coords.x2, b2: coords.y2 },
+				{ a: ratio.x, b: ratio.y },
+				{ a: direction.x, b: direction.y },
+				{ min: 0, max: this.imgH }
+			);
+			coords.x1 = newCoords.a1;
+			coords.y1 = newCoords.b1;
+			coords.x2 = newCoords.a2;
+			coords.y2 = newCoords.b2;
+		}
+		
+	},
+	
+	/**
+	 * Applies the provided ratio to the provided coordinates based on provided direction & bounds,
+	 * use to encapsulate functionality to make it easy to apply to either axis. This is probably
+	 * quite hard to visualise so see the x axis example within applyRatio()
+	 * 
+	 * Example in parameter details & comments is for requesting applying ratio to x axis.
+	 * 
+	 * @access private
+	 * @param obj Coords object (a1, b1, a2, b2) where a = x & b = y in example
+	 * @param obj Ratio object (a, b) where a = x & b = y in example
+	 * @param obj Direction object (a, b) where a = x & b = y in example
+	 * @param obj Bounds (min, max)
+	 * @return obj Coords object (a1, b1, a2, b2) where a = x & b = y in example
+	 */
+	applyRatioToAxis: function( coords, ratio, direction, bounds ) {
+		var newCoords = Object.extend( coords, {} ),
+				calcDimA = newCoords.a2 - newCoords.a1, // calculate dimension a (e.g. width)
+				targDimB = Math.floor( calcDimA * ratio.b / ratio.a ), // the target dimension b (e.g. height)
+				targB = null, // to hold target b (e.g. y value)
+				targDimA = null, // to hold target dimension a (e.g. width)
+				calcDimB = null; // to hold calculated dimension b (e.g. height)
+		
+		// dump( 'newCoords[0]: ' + newCoords.a1 + ',' + newCoords.b1 + ','+ newCoords.a2 + ',' + newCoords.b2 + '\n');
+				
+		if( direction.b == 1 ) { // if travelling in a positive direction
+			// make sure we're not going out of bounds
+			targB = newCoords.b1 + targDimB;
+			if( targB > bounds.max ) {
+				targB = bounds.max;
+				calcDimB = targB - newCoords.b1; // calcuate dimension b (e.g. height)
+			}
+			
+			newCoords.b2 = targB;
+		} else { // if travelling in a negative direction
+			// make sure we're not going out of bounds
+			targB = newCoords.b2 - targDimB;
+			if( targB < bounds.min ) {
+				targB = bounds.min;
+				calcDimB = targB + newCoords.b2; // calcuate dimension b (e.g. height)
+			}
+			newCoords.b1 = targB;
+		}
+		
+		// dump( 'newCoords[1]: ' + newCoords.a1 + ',' + newCoords.b1 + ','+ newCoords.a2 + ',' + newCoords.b2 + '\n');
+			
+		// apply the calculated dimensions
+		if( calcDimB !== null ) {
+			targDimA = Math.floor( calcDimB * ratio.a / ratio.b );
+			
+			if( direction.a == 1 ) { newCoords.a2 = newCoords.a1 + targDimA; }
+			else { newCoords.a1 = newCoords.a1 = newCoords.a2 - targDimA; }
+		}
+		
+		// dump( 'newCoords[2]: ' + newCoords.a1 + ',' + newCoords.b1 + ','+ newCoords.a2 + ',' + newCoords.b2 + '\n');
+			
+		return newCoords;
+	},
+	
+	/**
+	 * Draws the select area
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	drawArea: function( ) {	
+		/*
+			NOTE: I'm not using the Element.setStyle() shortcut as they make it 
+			quite sluggish on Mac based browsers
+		*/
+		// dump( 'drawArea        : ' + this.areaCoords.x1 + ',' + this.areaCoords.y1 + ',' + this.areaCoords.x2 + ',' + this.areaCoords.y2 + '\n' );
+		var areaWidth     = this.calcW(),
+		    areaHeight    = this.calcH();
+		
+		/*
+			Calculate all the style strings before we use them, allows reuse & produces quicker
+			rendering (especially noticable in Mac based browsers)
+		*/
+		var px = 'px',
+		    params = [
+			this.areaCoords.x1 + px, // the left of the selArea
+			this.areaCoords.y1 + px, // the top of the selArea
+			areaWidth + px,          // width of the selArea
+			areaHeight + px,         // height of the selArea
+			this.areaCoords.x2 + px, // bottom of the selArea
+			this.areaCoords.y2 + px, // right of the selArea
+			(this.img.readAttribute('width') - this.areaCoords.x2) + px, // right edge of selArea
+			(this.img.readAttribute('height')- this.areaCoords.y2) + px // bottom edge of selArea
+		];
+				
+		// do the select area
+		var areaStyle    = this.selArea.style;
+		areaStyle.left   = params[0];
+		areaStyle.top    = params[1];
+		areaStyle.width  = params[2];
+		areaStyle.height = params[3];
+
+		// position the north, east, south & west handles
+		var horizHandlePos = Math.ceil( (areaWidth - 6) / 2 ) + px,
+		    vertHandlePos = Math.ceil( (areaHeight - 6) / 2 ) + px;
+		
+		this.handleN.style.left = horizHandlePos;
+		this.handleE.style.top  = vertHandlePos;
+		this.handleS.style.left = horizHandlePos;
+		this.handleW.style.top  = vertHandlePos;
+		
+		// draw the four overlays
+		this.north.style.height = params[1];
+		
+		var eastStyle     = this.east.style;
+		eastStyle.top     = params[1];
+		eastStyle.height  = params[3];
+		eastStyle.left    = params[4];
+		eastStyle.width   = params[6];
+
+		var southStyle    = this.south.style;
+		southStyle.top    = params[5];
+		southStyle.height = params[7];
+
+		var westStyle     = this.west.style;
+		westStyle.top     = params[1];
+		westStyle.height  = params[3];
+		westStyle.width   = params[0];
+
+		// call the draw method on sub classes
+		this.subDrawArea();
+		
+		this.forceReRender();
+	},
+	
+	/**
+	 * Force the re-rendering of the selArea element which fixes rendering issues in Safari 
+	 * & IE PC, especially evident when re-sizing perfectly vertical using any of the south handles
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	forceReRender: function() {
+		if( this.isIE || this.isWebKit) {
+			var n = document.createTextNode(' ');
+			var d,el,fixEL,i;
+		
+			if( this.isIE ) { fixEl = this.selArea; }
+			else if( this.isWebKit ) {
+				fixEl = document.getElementsByClassName( 'imgCrop_marqueeSouth', this.imgWrap )[0];
+				/* 
+					we have to be a bit more forceful for Safari, otherwise the the marquee &
+					the south handles still don't move
+				*/ 
+				d = new Element( 'div' );
+				d.style.visibility = 'hidden';
+				
+				var classList = ['SE','S','SW'];
+				for( i = 0; i < classList.length; i++ ) {
+					el = document.getElementsByClassName( 'imgCrop_handle' + classList[i], this.selArea )[0];
+					if( el.childNodes.length ) { el.removeChild( el.childNodes[0] ); }
+					el.appendChild(d);
+				}
+			}
+			fixEl.appendChild(n);
+			fixEl.removeChild(n);
+		}
+	},
+	
+	/**
+	 * Starts the resize
+	 * 
+	 * @access private
+	 * @param obj Event
+	 * @return void
+	 */
+	startResize: function( e ) {
+		this.startCoords = this.cloneCoords( this.areaCoords );
+		
+		this.resizing = true;
+		this.resizeHandle = Event.element( e ).classNames().toString().replace(/([^N|NE|E|SE|S|SW|W|NW])+/, '');
+		// dump( 'this.resizeHandle : ' + this.resizeHandle + '\n' );
+		Event.stop( e );
+	},
+	
+	/**
+	 * Starts the drag
+	 * 
+	 * @access private
+	 * @param obj Event
+	 * @return void
+	 */
+	startDrag: function( e ) {
+		this.selArea.show();
+		this.clickCoords = this.getCurPos( e );
+
+		this.setAreaCoords( { x1: this.clickCoords.x, y1: this.clickCoords.y, x2: this.clickCoords.x, y2: this.clickCoords.y }, false, false, null );
+
+		this.dragging = true;
+		this.onDrag( e ); // incase the user just clicks once after already making a selection
+		Event.stop( e );
+	},
+	
+	/**
+	 * Gets the current cursor position relative to the image
+	 * 
+	 * @access private
+	 * @param obj Event
+	 * @return obj x,y pixels of the cursor
+	 */
+	getCurPos: function( e ) {
+		// get the offsets for the wrapper within the document
+		// get the offsets for the wrapper within the document
+		var el = this.imgWrap, wrapOffsets = Element.cumulativeOffset( el );
+		// remove any scrolling that is applied to the wrapper (this may be buggy) - don't count the scroll on the body as that won't affect us
+		while( el.nodeName != 'BODY' ) {
+			wrapOffsets[1] -= el.scrollTop  || 0;
+			wrapOffsets[0] -= el.scrollLeft || 0;
+			el = el.parentNode;
+		}
+		return { 
+			x: Event.pointerX(e) - wrapOffsets[0],
+			y: Event.pointerY(e) - wrapOffsets[1]
+		};
+	},
+	                               
+	/**                            
+	 * Performs the drag for both   resize & inital draw dragging
+	 *
+	 * @access private             
+	 * @param obj Event
+	 * @return void
+	 */
+	onDrag: function( e ) {
+		if( this.dragging || this.resizing ) {
+		
+			var resizeHandle = null,
+					curPos = this.getCurPos( e ),
+					newCoords = this.cloneCoords( this.areaCoords ),
+					direction = { x: 1, y: 1 };
+			
+			if( this.dragging ) {
+				if( curPos.x < this.clickCoords.x ) { direction.x = -1; }
+				if( curPos.y < this.clickCoords.y ) { direction.y = -1; }
+				
+				this.transformCoords( curPos.x, this.clickCoords.x, newCoords, 'x' );
+				this.transformCoords( curPos.y, this.clickCoords.y, newCoords, 'y' );
+			} else if( this.resizing ) {
+				resizeHandle = this.resizeHandle;
+				// do x movements first
+				if( resizeHandle.match(/E/) ) {
+					// if we're moving an east handle
+					this.transformCoords( curPos.x, this.startCoords.x1, newCoords, 'x' );
+					if( curPos.x < this.startCoords.x1 ) { direction.x = -1; }
+				} else if( resizeHandle.match(/W/) ) {
+					// if we're moving an west handle
+					this.transformCoords( curPos.x, this.startCoords.x2, newCoords, 'x' );
+					if( curPos.x < this.startCoords.x2 ) { direction.x = -1; }
+				}
+									
+				// do y movements second
+				if( resizeHandle.match(/N/) ) {
+					// if we're moving an north handle	
+					this.transformCoords( curPos.y, this.startCoords.y2, newCoords, 'y' );
+					if( curPos.y < this.startCoords.y2 ) { direction.y = -1; }
+				} else if( resizeHandle.match(/S/) ) {
+					// if we're moving an south handle
+					this.transformCoords( curPos.y, this.startCoords.y1, newCoords, 'y' );
+					if( curPos.y < this.startCoords.y1 ) { direction.y = -1; }
+				}
+				
+			}
+		
+			this.setAreaCoords( newCoords, false, e.shiftKey, direction, resizeHandle );
+			this.drawArea();
+			Event.stop( e ); // stop the default event (selecting images & text) in Safari & IE PC
+		}
+	},
+	
+	/**
+	 * Applies the appropriate transform to supplied co-ordinates, on the
+	 * defined axis, depending on the relationship of the supplied values
+	 * 
+	 * @access private
+	 * @param int Current value of pointer
+	 * @param int Base value to compare current pointer val to
+	 * @param obj Coordinates to apply transformation on x1, x2, y1, y2
+	 * @param string Axis to apply transformation on 'x' || 'y'
+	 * @return void
+	 */
+	transformCoords : function( curVal, baseVal, coords, axis ) {
+		var newVals = [ curVal, baseVal ];
+		if( curVal > baseVal ) { newVals.reverse(); }
+		coords[ axis + '1' ] = newVals[0];
+		coords[ axis + '2' ] = newVals[1];
+	},
+	
+	/**
+	 * Ends the crop & passes the values of the select area on to the appropriate 
+	 * callback function on completion of a crop
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	endCrop : function() {
+		this.dragging = false;
+		this.resizing = false;
+		
+		this.options.onEndCrop(
+			this.areaCoords,
+			{
+				width: this.calcW(), 
+				height: this.calcH() 
+			}
+		);
+	},
+	
+	/**
+	 * Abstract method called on the end of initialization
+	 * 
+	 * @access private
+	 * @abstract
+	 * @return void
+	 */
+	subInitialize: function() {},
+	
+	/**
+	 * Abstract method called on the end of drawArea()
+	 * 
+	 * @access private
+	 * @abstract
+	 * @return void
+	 */
+	subDrawArea: function() {}
+});
+
+
+
+
+/**
+ *	Extend the Cropper.Img class to allow for presentation of a preview image of the resulting crop,
+ *	the option for displayOnInit is always overridden to true when displaying a preview image
+ * 
+ *	Usage:
+ *		@param obj Image element to attach to
+ *		@param obj Optional options:
+ *			- see Cropper.Img for base options
+ *			- previewWrap obj HTML element that will be used as a container for the preview image
+ */
+Cropper.ImgWithPreview = Class.create(Cropper.Img, {
+	
+	/**
+	 * Implements the abstract method from Cropper.Img to initialize preview image settings.
+	 * Will only attach a preview image is the previewWrap element is defined and the minWidth
+	 * & minHeight options are set.
+	 * 
+	 * @see Croper.Img.subInitialize
+	 */
+	subInitialize: function() {
+		/**
+		* Whether or not we've attached a preview image
+		* @var boolean
+		*/
+		this.hasPreviewImg = false;
+		if( typeof(this.options.previewWrap) != 'undefined' && this.options.minWidth > 0 && this.options.minHeight > 0 ) {
+			/**
+			 * The preview image wrapper element
+			 * @var obj HTML element
+			 */
+			this.previewWrap = $( this.options.previewWrap );
+			/**
+			 * The preview image element
+			 * @var obj HTML IMG element
+			 */
+			this.previewImg = this.img.cloneNode( false );
+			// set the ID of the preview image to be unique
+			this.previewImg.id = 'imgCrop_' + this.previewImg.id;
+			
+			// set the displayOnInit option to true so we display the select area at the same time as the thumbnail
+			this.options.displayOnInit = true;
+
+			this.hasPreviewImg = true;
+			
+			this.previewWrap.addClassName( 'imgCrop_previewWrap' );
+			
+			this.previewWrap.setStyle({ 
+				width: this.options.minWidth + 'px',
+				height: this.options.minHeight + 'px'
+			});
+			
+			this.previewWrap.appendChild( this.previewImg );
+		}
+	},
+	
+	/**
+	 * Implements the abstract method from Cropper.Img to draw the preview image
+	 * 
+	 * @see Croper.Img.subDrawArea
+	 */
+	subDrawArea: function() {
+		if( this.hasPreviewImg ) {
+			// get the ratio of the select area to the src image
+			var calcWidth = this.calcW(),
+			    calcHeight = this.calcH();
+			// ratios for the dimensions of the preview image
+			var dimRatio = { 
+				x: this.imgW / calcWidth, 
+				y: this.imgH / calcHeight 
+			}; 
+			//ratios for the positions within the preview
+			var posRatio = { 
+				x: calcWidth / this.options.minWidth, 
+				y: calcHeight / this.options.minHeight 
+			};
+			
+			// setting the positions in an obj before apply styles for rendering speed increase
+			var calcPos = {
+				w: Math.ceil( this.options.minWidth * dimRatio.x ) + 'px',
+				h: Math.ceil( this.options.minHeight * dimRatio.y ) + 'px',
+				x: '-' + Math.ceil( this.areaCoords.x1 / posRatio.x )  + 'px',
+				y: '-' + Math.ceil( this.areaCoords.y1 / posRatio.y ) + 'px'
+			};
+			
+			var previewStyle = this.previewImg.style;
+			previewStyle.width = calcPos.w;
+			previewStyle.height= calcPos.h;
+			previewStyle.left = calcPos.x;
+			previewStyle.top = calcPos.y;
+		}
+	}
+	
+});
diff --git a/upload/public/js/3rd_party/cropper/index.html b/upload/public/js/3rd_party/cropper/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/cropper/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/cropper/licence.txt b/upload/public/js/3rd_party/cropper/licence.txt
new file mode 100644
index 00000000..6615ca4f
--- /dev/null
+++ b/upload/public/js/3rd_party/cropper/licence.txt
@@ -0,0 +1,11 @@
+Copyright (c) 2006-2009, David Spurr (www.defusion.org.uk)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the David Spurr nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+http://www.opensource.org/licenses/bsd-license.php
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/cropper/marqueeHoriz.gif b/upload/public/js/3rd_party/cropper/marqueeHoriz.gif
new file mode 100644
index 00000000..25317e57
Binary files /dev/null and b/upload/public/js/3rd_party/cropper/marqueeHoriz.gif differ
diff --git a/upload/public/js/3rd_party/cropper/marqueeVert.gif b/upload/public/js/3rd_party/cropper/marqueeVert.gif
new file mode 100644
index 00000000..354070bb
Binary files /dev/null and b/upload/public/js/3rd_party/cropper/marqueeVert.gif differ
diff --git a/upload/public/js/3rd_party/index.html b/upload/public/js/3rd_party/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/index.html
+++ b/upload/public/js/3rd_party/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/iscroll/iscroll.js b/upload/public/js/3rd_party/iscroll/iscroll.js
new file mode 100644
index 00000000..e366d045
--- /dev/null
+++ b/upload/public/js/3rd_party/iscroll/iscroll.js
@@ -0,0 +1,1058 @@
+/*!
+ * iScroll v4.1.9 ~ Copyright (c) 2011 Matteo Spinelli, http://cubiq.org
+ * Released under MIT license, http://cubiq.org/license
+ */
+
+(function(){
+var m = Math,
+	vendor = (/webkit/i).test(navigator.appVersion) ? 'webkit' :
+		(/firefox/i).test(navigator.userAgent) ? 'Moz' :
+		'opera' in window ? 'O' : '',
+
+	// Browser capabilities
+	has3d = 'WebKitCSSMatrix' in window && 'm11' in new WebKitCSSMatrix(),
+	hasTouch = 'ontouchstart' in window,
+	hasTransform = vendor + 'Transform' in document.documentElement.style,
+	isAndroid = (/android/gi).test(navigator.appVersion),
+	isIDevice = (/iphone|ipad/gi).test(navigator.appVersion),
+	isPlaybook = (/playbook/gi).test(navigator.appVersion),
+	hasTransitionEnd = isIDevice || isPlaybook,
+	nextFrame = (function() {
+	    return window.requestAnimationFrame
+			|| window.webkitRequestAnimationFrame
+			|| window.mozRequestAnimationFrame
+			|| window.oRequestAnimationFrame
+			|| window.msRequestAnimationFrame
+			|| function(callback) { return setTimeout(callback, 1); }
+	})(),
+	cancelFrame = (function () {
+	    return window.cancelRequestAnimationFrame
+			|| window.webkitCancelRequestAnimationFrame
+			|| window.mozCancelRequestAnimationFrame
+			|| window.oCancelRequestAnimationFrame
+			|| window.msCancelRequestAnimationFrame
+			|| clearTimeout
+	})(),
+
+	// Events
+	RESIZE_EV = 'onorientationchange' in window ? 'orientationchange' : 'resize',
+	START_EV = hasTouch ? 'touchstart' : 'mousedown',
+	MOVE_EV = hasTouch ? 'touchmove' : 'mousemove',
+	END_EV = hasTouch ? 'touchend' : 'mouseup',
+	CANCEL_EV = hasTouch ? 'touchcancel' : 'mouseup',
+	WHEEL_EV = vendor == 'Moz' ? 'DOMMouseScroll' : 'mousewheel',
+
+	// Helpers
+	trnOpen = 'translate' + (has3d ? '3d(' : '('),
+	trnClose = has3d ? ',0)' : ')',
+
+	// Constructor
+	iScroll = function (el, options) {
+		var that = this,
+			doc = document,
+			i;
+
+		that.wrapper = typeof el == 'object' ? el : doc.getElementById(el);
+		that.wrapper.style.overflow = 'hidden';
+		that.scroller = that.wrapper.children[0];
+
+		// Default options
+		that.options = {
+			hScroll: true,
+			vScroll: true,
+			x: 0,
+			y: 0,
+			bounce: true,
+			bounceLock: false,
+			momentum: true,
+			lockDirection: true,
+			useTransform: true,
+			useTransition: false,
+			topOffset: 0,
+			checkDOMChanges: false,		// Experimental
+
+			// Scrollbar
+			hScrollbar: true,
+			vScrollbar: true,
+			fixedScrollbar: isAndroid,
+			hideScrollbar: isIDevice,
+			fadeScrollbar: isIDevice && has3d,
+			scrollbarClass: '',
+
+			// Zoom
+			zoom: false,
+			zoomMin: 1,
+			zoomMax: 4,
+			doubleTapZoom: 2,
+			wheelAction: 'scroll',
+
+			// Snap
+			snap: false,
+			snapThreshold: 1,
+
+			// Events
+			onRefresh: null,
+			onBeforeScrollStart: function (e) { e.preventDefault(); },
+			onScrollStart: null,
+			onBeforeScrollMove: null,
+			onScrollMove: null,
+			onBeforeScrollEnd: null,
+			onScrollEnd: null,
+			onTouchEnd: null,
+			onDestroy: null,
+			onZoomStart: null,
+			onZoom: null,
+			onZoomEnd: null
+		};
+
+		// User defined options
+		for (i in options) that.options[i] = options[i];
+		
+		// Set starting position
+		that.x = that.options.x;
+		that.y = that.options.y;
+
+		// Normalize options
+		that.options.useTransform = hasTransform ? that.options.useTransform : false;
+		that.options.hScrollbar = that.options.hScroll && that.options.hScrollbar;
+		that.options.vScrollbar = that.options.vScroll && that.options.vScrollbar;
+		that.options.zoom = that.options.useTransform && that.options.zoom;
+		that.options.useTransition = hasTransitionEnd && that.options.useTransition;
+		
+		// Set some default styles
+		that.scroller.style[vendor + 'TransitionProperty'] = that.options.useTransform ? '-' + vendor.toLowerCase() + '-transform' : 'top left';
+		that.scroller.style[vendor + 'TransitionDuration'] = '0';
+		that.scroller.style[vendor + 'TransformOrigin'] = '0 0';
+		if (that.options.useTransition) that.scroller.style[vendor + 'TransitionTimingFunction'] = 'cubic-bezier(0.33,0.66,0.66,1)';
+		
+		if (that.options.useTransform) that.scroller.style[vendor + 'Transform'] = trnOpen + that.x + 'px,' + that.y + 'px' + trnClose;
+		else that.scroller.style.cssText += ';position:absolute;top:' + that.y + 'px;left:' + that.x + 'px';
+
+		if (that.options.useTransition) that.options.fixedScrollbar = true;
+
+		that.refresh();
+
+		that._bind(RESIZE_EV, window);
+		that._bind(START_EV);
+		if (!hasTouch) {
+			that._bind('mouseout', that.wrapper);
+			that._bind(WHEEL_EV);
+		}
+
+		if (that.options.checkDOMChanges) that.checkDOMTime = setInterval(function () {
+			that._checkDOMChanges();
+		}, 500);
+	};
+
+// Prototype
+iScroll.prototype = {
+	enabled: true,
+	x: 0,
+	y: 0,
+	steps: [],
+	scale: 1,
+	currPageX: 0, currPageY: 0,
+	pagesX: [], pagesY: [],
+	aniTime: null,
+	wheelZoomCount: 0,
+	
+	handleEvent: function (e) {
+		var that = this;
+		switch(e.type) {
+			case START_EV:
+				if (!hasTouch && e.button !== 0) return;
+				that._start(e);
+				break;
+			case MOVE_EV: that._move(e); break;
+			case END_EV:
+			case CANCEL_EV: that._end(e); break;
+			case RESIZE_EV: that._resize(); break;
+			case WHEEL_EV: that._wheel(e); break;
+			case 'mouseout': that._mouseout(e); break;
+			case 'webkitTransitionEnd': that._transitionEnd(e); break;
+		}
+	},
+	
+	_checkDOMChanges: function () {
+		if (this.moved || this.zoomed || this.animating ||
+			(this.scrollerW == this.scroller.offsetWidth * this.scale && this.scrollerH == this.scroller.offsetHeight * this.scale)) return;
+
+		this.refresh();
+	},
+	
+	_scrollbar: function (dir) {
+		var that = this,
+			doc = document,
+			bar;
+
+		if (!that[dir + 'Scrollbar']) {
+			if (that[dir + 'ScrollbarWrapper']) {
+				if (hasTransform) that[dir + 'ScrollbarIndicator'].style[vendor + 'Transform'] = '';
+				that[dir + 'ScrollbarWrapper'].parentNode.removeChild(that[dir + 'ScrollbarWrapper']);
+				that[dir + 'ScrollbarWrapper'] = null;
+				that[dir + 'ScrollbarIndicator'] = null;
+			}
+
+			return;
+		}
+
+		if (!that[dir + 'ScrollbarWrapper']) {
+			// Create the scrollbar wrapper
+			bar = doc.createElement('div');
+
+			if (that.options.scrollbarClass) bar.className = that.options.scrollbarClass + dir.toUpperCase();
+			else bar.style.cssText = 'position:absolute;z-index:100;' + (dir == 'h' ? 'height:7px;bottom:1px;left:2px;right:' + (that.vScrollbar ? '7' : '2') + 'px' : 'width:7px;bottom:' + (that.hScrollbar ? '7' : '2') + 'px;top:2px;right:1px');
+
+			bar.style.cssText += ';pointer-events:none;-' + vendor + '-transition-property:opacity;-' + vendor + '-transition-duration:' + (that.options.fadeScrollbar ? '350ms' : '0') + ';overflow:hidden;opacity:' + (that.options.hideScrollbar ? '0' : '1');
+
+			that.wrapper.appendChild(bar);
+			that[dir + 'ScrollbarWrapper'] = bar;
+
+			// Create the scrollbar indicator
+			bar = doc.createElement('div');
+			if (!that.options.scrollbarClass) {
+				bar.style.cssText = 'position:absolute;z-index:100;background:rgba(0,0,0,0.5);border:1px solid rgba(255,255,255,0.9);-' + vendor + '-background-clip:padding-box;-' + vendor + '-box-sizing:border-box;' + (dir == 'h' ? 'height:100%' : 'width:100%') + ';-' + vendor + '-border-radius:3px;border-radius:3px';
+			}
+			bar.style.cssText += ';pointer-events:none;-' + vendor + '-transition-property:-' + vendor + '-transform;-' + vendor + '-transition-timing-function:cubic-bezier(0.33,0.66,0.66,1);-' + vendor + '-transition-duration:0;-' + vendor + '-transform:' + trnOpen + '0,0' + trnClose;
+			if (that.options.useTransition) bar.style.cssText += ';-' + vendor + '-transition-timing-function:cubic-bezier(0.33,0.66,0.66,1)';
+
+			that[dir + 'ScrollbarWrapper'].appendChild(bar);
+			that[dir + 'ScrollbarIndicator'] = bar;
+		}
+
+		if (dir == 'h') {
+			that.hScrollbarSize = that.hScrollbarWrapper.clientWidth;
+			that.hScrollbarIndicatorSize = m.max(m.round(that.hScrollbarSize * that.hScrollbarSize / that.scrollerW), 8);
+			that.hScrollbarIndicator.style.width = that.hScrollbarIndicatorSize + 'px';
+			that.hScrollbarMaxScroll = that.hScrollbarSize - that.hScrollbarIndicatorSize;
+			that.hScrollbarProp = that.hScrollbarMaxScroll / that.maxScrollX;
+		} else {
+			that.vScrollbarSize = that.vScrollbarWrapper.clientHeight;
+			that.vScrollbarIndicatorSize = m.max(m.round(that.vScrollbarSize * that.vScrollbarSize / that.scrollerH), 8);
+			that.vScrollbarIndicator.style.height = that.vScrollbarIndicatorSize + 'px';
+			that.vScrollbarMaxScroll = that.vScrollbarSize - that.vScrollbarIndicatorSize;
+			that.vScrollbarProp = that.vScrollbarMaxScroll / that.maxScrollY;
+		}
+
+		// Reset position
+		that._scrollbarPos(dir, true);
+	},
+	
+	_resize: function () {
+		var that = this;
+		setTimeout(function () { that.refresh(); }, isAndroid ? 200 : 0);
+	},
+	
+	_pos: function (x, y) {
+		x = this.hScroll ? x : 0;
+		y = this.vScroll ? y : 0;
+
+		if (this.options.useTransform) {
+			this.scroller.style[vendor + 'Transform'] = trnOpen + x + 'px,' + y + 'px' + trnClose + ' scale(' + this.scale + ')';
+		} else {
+			x = m.round(x);
+			y = m.round(y);
+			this.scroller.style.left = x + 'px';
+			this.scroller.style.top = y + 'px';
+		}
+
+		this.x = x;
+		this.y = y;
+
+		this._scrollbarPos('h');
+		this._scrollbarPos('v');
+	},
+
+	_scrollbarPos: function (dir, hidden) {
+		var that = this,
+			pos = dir == 'h' ? that.x : that.y,
+			size;
+
+		if (!that[dir + 'Scrollbar']) return;
+
+		pos = that[dir + 'ScrollbarProp'] * pos;
+
+		if (pos < 0) {
+			if (!that.options.fixedScrollbar) {
+				size = that[dir + 'ScrollbarIndicatorSize'] + m.round(pos * 3);
+				if (size < 8) size = 8;
+				that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px';
+			}
+			pos = 0;
+		} else if (pos > that[dir + 'ScrollbarMaxScroll']) {
+			if (!that.options.fixedScrollbar) {
+				size = that[dir + 'ScrollbarIndicatorSize'] - m.round((pos - that[dir + 'ScrollbarMaxScroll']) * 3);
+				if (size < 8) size = 8;
+				that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px';
+				pos = that[dir + 'ScrollbarMaxScroll'] + (that[dir + 'ScrollbarIndicatorSize'] - size);
+			} else {
+				pos = that[dir + 'ScrollbarMaxScroll'];
+			}
+		}
+
+		that[dir + 'ScrollbarWrapper'].style[vendor + 'TransitionDelay'] = '0';
+		that[dir + 'ScrollbarWrapper'].style.opacity = hidden && that.options.hideScrollbar ? '0' : '1';
+		that[dir + 'ScrollbarIndicator'].style[vendor + 'Transform'] = trnOpen + (dir == 'h' ? pos + 'px,0' : '0,' + pos + 'px') + trnClose;
+	},
+	
+	_start: function (e) {
+		var that = this,
+			point = hasTouch ? e.touches[0] : e,
+			matrix, x, y,
+			c1, c2;
+
+		if (!that.enabled) return;
+
+		if (that.options.onBeforeScrollStart) that.options.onBeforeScrollStart.call(that, e);
+
+		if (that.options.useTransition || that.options.zoom) that._transitionTime(0);
+
+		that.moved = false;
+		that.animating = false;
+		that.zoomed = false;
+		that.distX = 0;
+		that.distY = 0;
+		that.absDistX = 0;
+		that.absDistY = 0;
+		that.dirX = 0;
+		that.dirY = 0;
+
+		// Gesture start
+		if (that.options.zoom && hasTouch && e.touches.length > 1) {
+			c1 = m.abs(e.touches[0].pageX-e.touches[1].pageX);
+			c2 = m.abs(e.touches[0].pageY-e.touches[1].pageY);
+			that.touchesDistStart = m.sqrt(c1 * c1 + c2 * c2);
+
+			that.originX = m.abs(e.touches[0].pageX + e.touches[1].pageX - that.wrapperOffsetLeft * 2) / 2 - that.x;
+			that.originY = m.abs(e.touches[0].pageY + e.touches[1].pageY - that.wrapperOffsetTop * 2) / 2 - that.y;
+
+			if (that.options.onZoomStart) that.options.onZoomStart.call(that, e);
+		}
+
+		if (that.options.momentum) {
+			if (that.options.useTransform) {
+				// Very lame general purpose alternative to CSSMatrix
+				matrix = getComputedStyle(that.scroller, null)[vendor + 'Transform'].replace(/[^0-9-.,]/g, '').split(',');
+				x = matrix[4] * 1;
+				y = matrix[5] * 1;
+			} else {
+				x = getComputedStyle(that.scroller, null).left.replace(/[^0-9-]/g, '') * 1;
+				y = getComputedStyle(that.scroller, null).top.replace(/[^0-9-]/g, '') * 1;
+			}
+			
+			if (x != that.x || y != that.y) {
+				if (that.options.useTransition) that._unbind('webkitTransitionEnd');
+				else cancelFrame(that.aniTime);
+				that.steps = [];
+				that._pos(x, y);
+			}
+		}
+
+		that.absStartX = that.x;	// Needed by snap threshold
+		that.absStartY = that.y;
+
+		that.startX = that.x;
+		that.startY = that.y;
+		that.pointX = point.pageX;
+		that.pointY = point.pageY;
+
+		that.startTime = e.timeStamp || Date.now();
+
+		if (that.options.onScrollStart) that.options.onScrollStart.call(that, e);
+
+		that._bind(MOVE_EV);
+		that._bind(END_EV);
+		that._bind(CANCEL_EV);
+	},
+	
+	_move: function (e) {
+		var that = this,
+			point = hasTouch ? e.touches[0] : e,
+			deltaX = point.pageX - that.pointX,
+			deltaY = point.pageY - that.pointY,
+			newX = that.x + deltaX,
+			newY = that.y + deltaY,
+			c1, c2, scale,
+			timestamp = e.timeStamp || Date.now();
+
+		if (that.options.onBeforeScrollMove) that.options.onBeforeScrollMove.call(that, e);
+
+		// Zoom
+		if (that.options.zoom && hasTouch && e.touches.length > 1) {
+			c1 = m.abs(e.touches[0].pageX - e.touches[1].pageX);
+			c2 = m.abs(e.touches[0].pageY - e.touches[1].pageY);
+			that.touchesDist = m.sqrt(c1*c1+c2*c2);
+
+			that.zoomed = true;
+
+			scale = 1 / that.touchesDistStart * that.touchesDist * this.scale;
+
+			if (scale < that.options.zoomMin) scale = 0.5 * that.options.zoomMin * Math.pow(2.0, scale / that.options.zoomMin);
+			else if (scale > that.options.zoomMax) scale = 2.0 * that.options.zoomMax * Math.pow(0.5, that.options.zoomMax / scale);
+
+			that.lastScale = scale / this.scale;
+
+			newX = this.originX - this.originX * that.lastScale + this.x,
+			newY = this.originY - this.originY * that.lastScale + this.y;
+
+			this.scroller.style[vendor + 'Transform'] = trnOpen + newX + 'px,' + newY + 'px' + trnClose + ' scale(' + scale + ')';
+
+			if (that.options.onZoom) that.options.onZoom.call(that, e);
+			return;
+		}
+
+		that.pointX = point.pageX;
+		that.pointY = point.pageY;
+
+		// Slow down if outside of the boundaries
+		if (newX > 0 || newX < that.maxScrollX) {
+			newX = that.options.bounce ? that.x + (deltaX / 2) : newX >= 0 || that.maxScrollX >= 0 ? 0 : that.maxScrollX;
+		}
+		if (newY > that.minScrollY || newY < that.maxScrollY) { 
+			newY = that.options.bounce ? that.y + (deltaY / 2) : newY >= that.minScrollY || that.maxScrollY >= 0 ? that.minScrollY : that.maxScrollY;
+		}
+
+		if (that.absDistX < 6 && that.absDistY < 6) {
+			that.distX += deltaX;
+			that.distY += deltaY;
+			that.absDistX = m.abs(that.distX);
+			that.absDistY = m.abs(that.distY);
+
+			return;
+		}
+
+		// Lock direction
+		if (that.options.lockDirection) {
+			if (that.absDistX > that.absDistY + 5) {
+				newY = that.y;
+				deltaY = 0;
+			} else if (that.absDistY > that.absDistX + 5) {
+				newX = that.x;
+				deltaX = 0;
+			}
+		}
+
+		that.moved = true;
+		that._pos(newX, newY);
+		that.dirX = deltaX > 0 ? -1 : deltaX < 0 ? 1 : 0;
+		that.dirY = deltaY > 0 ? -1 : deltaY < 0 ? 1 : 0;
+
+		if (timestamp - that.startTime > 300) {
+			that.startTime = timestamp;
+			that.startX = that.x;
+			that.startY = that.y;
+		}
+		
+		if (that.options.onScrollMove) that.options.onScrollMove.call(that, e);
+	},
+	
+	_end: function (e) {
+		if (hasTouch && e.touches.length != 0) return;
+
+		var that = this,
+			point = hasTouch ? e.changedTouches[0] : e,
+			target, ev,
+			momentumX = { dist:0, time:0 },
+			momentumY = { dist:0, time:0 },
+			duration = (e.timeStamp || Date.now()) - that.startTime,
+			newPosX = that.x,
+			newPosY = that.y,
+			distX, distY,
+			newDuration,
+			snap,
+			scale;
+
+		that._unbind(MOVE_EV);
+		that._unbind(END_EV);
+		that._unbind(CANCEL_EV);
+
+		if (that.options.onBeforeScrollEnd) that.options.onBeforeScrollEnd.call(that, e);
+
+		if (that.zoomed) {
+			scale = that.scale * that.lastScale;
+			scale = Math.max(that.options.zoomMin, scale);
+			scale = Math.min(that.options.zoomMax, scale);
+			that.lastScale = scale / that.scale;
+			that.scale = scale;
+
+			that.x = that.originX - that.originX * that.lastScale + that.x;
+			that.y = that.originY - that.originY * that.lastScale + that.y;
+			
+			that.scroller.style[vendor + 'TransitionDuration'] = '200ms';
+			that.scroller.style[vendor + 'Transform'] = trnOpen + that.x + 'px,' + that.y + 'px' + trnClose + ' scale(' + that.scale + ')';
+			
+			that.zoomed = false;
+			that.refresh();
+
+			if (that.options.onZoomEnd) that.options.onZoomEnd.call(that, e);
+			return;
+		}
+
+		if (!that.moved) {
+			if (hasTouch) {
+				if (that.doubleTapTimer && that.options.zoom) {
+					// Double tapped
+					clearTimeout(that.doubleTapTimer);
+					that.doubleTapTimer = null;
+					if (that.options.onZoomStart) that.options.onZoomStart.call(that, e);
+					that.zoom(that.pointX, that.pointY, that.scale == 1 ? that.options.doubleTapZoom : 1);
+					if (that.options.onZoomEnd) {
+						setTimeout(function() {
+							that.options.onZoomEnd.call(that, e);
+						}, 200); // 200 is default zoom duration
+					}
+				} else {
+					that.doubleTapTimer = setTimeout(function () {
+						that.doubleTapTimer = null;
+
+						// Find the last touched element
+						target = point.target;
+						while (target.nodeType != 1) target = target.parentNode;
+
+						if (target.tagName != 'SELECT' && target.tagName != 'INPUT' && target.tagName != 'TEXTAREA') {
+							ev = document.createEvent('MouseEvents');
+							ev.initMouseEvent('click', true, true, e.view, 1,
+								point.screenX, point.screenY, point.clientX, point.clientY,
+								e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+								0, null);
+							ev._fake = true;
+							target.dispatchEvent(ev);
+						}
+					}, that.options.zoom ? 250 : 0);
+				}
+			}
+
+			that._resetPos(200);
+
+			if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
+			return;
+		}
+
+		if (duration < 300 && that.options.momentum) {
+			momentumX = newPosX ? that._momentum(newPosX - that.startX, duration, -that.x, that.scrollerW - that.wrapperW + that.x, that.options.bounce ? that.wrapperW : 0) : momentumX;
+			momentumY = newPosY ? that._momentum(newPosY - that.startY, duration, -that.y, (that.maxScrollY < 0 ? that.scrollerH - that.wrapperH + that.y - that.minScrollY : 0), that.options.bounce ? that.wrapperH : 0) : momentumY;
+
+			newPosX = that.x + momentumX.dist;
+			newPosY = that.y + momentumY.dist;
+
+ 			if ((that.x > 0 && newPosX > 0) || (that.x < that.maxScrollX && newPosX < that.maxScrollX)) momentumX = { dist:0, time:0 };
+ 			if ((that.y > that.minScrollY && newPosY > that.minScrollY) || (that.y < that.maxScrollY && newPosY < that.maxScrollY)) momentumY = { dist:0, time:0 };
+		}
+
+		if (momentumX.dist || momentumY.dist) {
+			newDuration = m.max(m.max(momentumX.time, momentumY.time), 10);
+
+			// Do we need to snap?
+			if (that.options.snap) {
+				distX = newPosX - that.absStartX;
+				distY = newPosY - that.absStartY;
+				if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) { that.scrollTo(that.absStartX, that.absStartY, 200); }
+				else {
+					snap = that._snap(newPosX, newPosY);
+					newPosX = snap.x;
+					newPosY = snap.y;
+					newDuration = m.max(snap.time, newDuration);
+				}
+			}
+
+			that.scrollTo(m.round(newPosX), m.round(newPosY), newDuration);
+
+			if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
+			return;
+		}
+
+		// Do we need to snap?
+		if (that.options.snap) {
+			distX = newPosX - that.absStartX;
+			distY = newPosY - that.absStartY;
+			if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) that.scrollTo(that.absStartX, that.absStartY, 200);
+			else {
+				snap = that._snap(that.x, that.y);
+				if (snap.x != that.x || snap.y != that.y) that.scrollTo(snap.x, snap.y, snap.time);
+			}
+
+			if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
+			return;
+		}
+
+		that._resetPos(200);
+		if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
+	},
+	
+	_resetPos: function (time) {
+		var that = this,
+			resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x,
+			resetY = that.y >= that.minScrollY || that.maxScrollY > 0 ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y;
+
+		if (resetX == that.x && resetY == that.y) {
+			if (that.moved) {
+				that.moved = false;
+				if (that.options.onScrollEnd) that.options.onScrollEnd.call(that);		// Execute custom code on scroll end
+			}
+
+			if (that.hScrollbar && that.options.hideScrollbar) {
+				if (vendor == 'webkit') that.hScrollbarWrapper.style[vendor + 'TransitionDelay'] = '300ms';
+				that.hScrollbarWrapper.style.opacity = '0';
+			}
+			if (that.vScrollbar && that.options.hideScrollbar) {
+				if (vendor == 'webkit') that.vScrollbarWrapper.style[vendor + 'TransitionDelay'] = '300ms';
+				that.vScrollbarWrapper.style.opacity = '0';
+			}
+
+			return;
+		}
+
+		that.scrollTo(resetX, resetY, time || 0);
+	},
+
+	_wheel: function (e) {
+		var that = this,
+			wheelDeltaX, wheelDeltaY,
+			deltaX, deltaY,
+			deltaScale;
+
+		if ('wheelDeltaX' in e) {
+			wheelDeltaX = e.wheelDeltaX / 12;
+			wheelDeltaY = e.wheelDeltaY / 12;
+		} else if ('detail' in e) {
+			wheelDeltaX = wheelDeltaY = -e.detail * 3;
+		} else {
+			wheelDeltaX = wheelDeltaY = -e.wheelDelta;
+		}
+		
+		if (that.options.wheelAction == 'zoom') {
+			deltaScale = that.scale * Math.pow(2, 1/3 * (wheelDeltaY ? wheelDeltaY / Math.abs(wheelDeltaY) : 0));
+			if (deltaScale < that.options.zoomMin) deltaScale = that.options.zoomMin;
+			if (deltaScale > that.options.zoomMax) deltaScale = that.options.zoomMax;
+			
+			if (deltaScale != that.scale) {
+				if (!that.wheelZoomCount && that.options.onZoomStart) that.options.onZoomStart.call(that, e);
+				that.wheelZoomCount++;
+				
+				that.zoom(e.pageX, e.pageY, deltaScale, 400);
+				
+				setTimeout(function() {
+					that.wheelZoomCount--;
+					if (!that.wheelZoomCount && that.options.onZoomEnd) that.options.onZoomEnd.call(that, e);
+				}, 400);
+			}
+			
+			return;
+		}
+		
+		deltaX = that.x + wheelDeltaX;
+		deltaY = that.y + wheelDeltaY;
+
+		if (deltaX > 0) deltaX = 0;
+		else if (deltaX < that.maxScrollX) deltaX = that.maxScrollX;
+
+		if (deltaY > that.minScrollY) deltaY = that.minScrollY;
+		else if (deltaY < that.maxScrollY) deltaY = that.maxScrollY;
+
+		that.scrollTo(deltaX, deltaY, 0);
+	},
+	
+	_mouseout: function (e) {
+		var t = e.relatedTarget;
+
+		if (!t) {
+			this._end(e);
+			return;
+		}
+
+		while (t = t.parentNode) if (t == this.wrapper) return;
+		
+		this._end(e);
+	},
+
+	_transitionEnd: function (e) {
+		var that = this;
+
+		if (e.target != that.scroller) return;
+
+		that._unbind('webkitTransitionEnd');
+		
+		that._startAni();
+	},
+
+
+	/**
+	 *
+	 * Utilities
+	 *
+	 */
+	_startAni: function () {
+		var that = this,
+			startX = that.x, startY = that.y,
+			startTime = Date.now(),
+			step, easeOut,
+			animate;
+
+		if (that.animating) return;
+		
+		if (!that.steps.length) {
+			that._resetPos(400);
+			return;
+		}
+		
+		step = that.steps.shift();
+		
+		if (step.x == startX && step.y == startY) step.time = 0;
+
+		that.animating = true;
+		that.moved = true;
+		
+		if (that.options.useTransition) {
+			that._transitionTime(step.time);
+			that._pos(step.x, step.y);
+			that.animating = false;
+			if (step.time) that._bind('webkitTransitionEnd');
+			else that._resetPos(0);
+			return;
+		}
+
+		animate = function () {
+			var now = Date.now(),
+				newX, newY;
+
+			if (now >= startTime + step.time) {
+				that._pos(step.x, step.y);
+				that.animating = false;
+				if (that.options.onAnimationEnd) that.options.onAnimationEnd.call(that);			// Execute custom code on animation end
+				that._startAni();
+				return;
+			}
+
+			now = (now - startTime) / step.time - 1;
+			easeOut = m.sqrt(1 - now * now);
+			newX = (step.x - startX) * easeOut + startX;
+			newY = (step.y - startY) * easeOut + startY;
+			that._pos(newX, newY);
+			if (that.animating) that.aniTime = nextFrame(animate);
+		};
+
+		animate();
+	},
+
+	_transitionTime: function (time) {
+		time += 'ms';
+		this.scroller.style[vendor + 'TransitionDuration'] = time;
+		if (this.hScrollbar) this.hScrollbarIndicator.style[vendor + 'TransitionDuration'] = time;
+		if (this.vScrollbar) this.vScrollbarIndicator.style[vendor + 'TransitionDuration'] = time;
+	},
+
+	_momentum: function (dist, time, maxDistUpper, maxDistLower, size) {
+		var deceleration = 0.0006,
+			speed = m.abs(dist) / time,
+			newDist = (speed * speed) / (2 * deceleration),
+			newTime = 0, outsideDist = 0;
+
+		// Proportinally reduce speed if we are outside of the boundaries 
+		if (dist > 0 && newDist > maxDistUpper) {
+			outsideDist = size / (6 / (newDist / speed * deceleration));
+			maxDistUpper = maxDistUpper + outsideDist;
+			speed = speed * maxDistUpper / newDist;
+			newDist = maxDistUpper;
+		} else if (dist < 0 && newDist > maxDistLower) {
+			outsideDist = size / (6 / (newDist / speed * deceleration));
+			maxDistLower = maxDistLower + outsideDist;
+			speed = speed * maxDistLower / newDist;
+			newDist = maxDistLower;
+		}
+
+		newDist = newDist * (dist < 0 ? -1 : 1);
+		newTime = speed / deceleration;
+
+		return { dist: newDist, time: m.round(newTime) };
+	},
+
+	_offset: function (el) {
+		var left = -el.offsetLeft,
+			top = -el.offsetTop;
+			
+		while (el = el.offsetParent) {
+			left -= el.offsetLeft;
+			top -= el.offsetTop;
+		}
+		
+		if (el != this.wrapper) {
+			left *= this.scale;
+			top *= this.scale;
+		}
+
+		return { left: left, top: top };
+	},
+
+	_snap: function (x, y) {
+		var that = this,
+			i, l,
+			page, time,
+			sizeX, sizeY;
+
+		// Check page X
+		page = that.pagesX.length - 1;
+		for (i=0, l=that.pagesX.length; i<l; i++) {
+			if (x >= that.pagesX[i]) {
+				page = i;
+				break;
+			}
+		}
+		if (page == that.currPageX && page > 0 && that.dirX < 0) page--;
+		x = that.pagesX[page];
+		sizeX = m.abs(x - that.pagesX[that.currPageX]);
+		sizeX = sizeX ? m.abs(that.x - x) / sizeX * 500 : 0;
+		that.currPageX = page;
+
+		// Check page Y
+		page = that.pagesY.length-1;
+		for (i=0; i<page; i++) {
+			if (y >= that.pagesY[i]) {
+				page = i;
+				break;
+			}
+		}
+		if (page == that.currPageY && page > 0 && that.dirY < 0) page--;
+		y = that.pagesY[page];
+		sizeY = m.abs(y - that.pagesY[that.currPageY]);
+		sizeY = sizeY ? m.abs(that.y - y) / sizeY * 500 : 0;
+		that.currPageY = page;
+
+		// Snap with constant speed (proportional duration)
+		time = m.round(m.max(sizeX, sizeY)) || 200;
+
+		return { x: x, y: y, time: time };
+	},
+
+	_bind: function (type, el, bubble) {
+		(el || this.scroller).addEventListener(type, this, !!bubble);
+	},
+
+	_unbind: function (type, el, bubble) {
+		(el || this.scroller).removeEventListener(type, this, !!bubble);
+	},
+
+
+	/**
+	 *
+	 * Public methods
+	 *
+	 */
+	destroy: function () {
+		var that = this;
+
+		that.scroller.style[vendor + 'Transform'] = '';
+
+		// Remove the scrollbars
+		that.hScrollbar = false;
+		that.vScrollbar = false;
+		that._scrollbar('h');
+		that._scrollbar('v');
+
+		// Remove the event listeners
+		that._unbind(RESIZE_EV, window);
+		that._unbind(START_EV);
+		that._unbind(MOVE_EV);
+		that._unbind(END_EV);
+		that._unbind(CANCEL_EV);
+		
+		if (that.options.hasTouch) {
+			that._unbind('mouseout', that.wrapper);
+			that._unbind(WHEEL_EV);
+		}
+		
+		if (that.options.useTransition) that._unbind('webkitTransitionEnd');
+		
+		if (that.options.checkDOMChanges) clearInterval(that.checkDOMTime);
+		
+		if (that.options.onDestroy) that.options.onDestroy.call(that);
+	},
+
+	refresh: function () {
+		var that = this,
+			offset,
+			i, l,
+			els,
+			pos = 0,
+			page = 0;
+
+		if (that.scale < that.options.zoomMin) that.scale = that.options.zoomMin;
+		that.wrapperW = that.wrapper.clientWidth || 1;
+		that.wrapperH = that.wrapper.clientHeight || 1;
+
+		that.minScrollY = -that.options.topOffset || 0;
+		that.scrollerW = m.round(that.scroller.offsetWidth * that.scale);
+		that.scrollerH = m.round((that.scroller.offsetHeight + that.minScrollY) * that.scale);
+		that.maxScrollX = that.wrapperW - that.scrollerW;
+		that.maxScrollY = that.wrapperH - that.scrollerH + that.minScrollY;
+		that.dirX = 0;
+		that.dirY = 0;
+
+		if (that.options.onRefresh) that.options.onRefresh.call(that);
+
+		that.hScroll = that.options.hScroll && that.maxScrollX < 0;
+		that.vScroll = that.options.vScroll && (!that.options.bounceLock && !that.hScroll || that.scrollerH > that.wrapperH);
+
+		that.hScrollbar = that.hScroll && that.options.hScrollbar;
+		that.vScrollbar = that.vScroll && that.options.vScrollbar && that.scrollerH > that.wrapperH;
+
+		offset = that._offset(that.wrapper);
+		that.wrapperOffsetLeft = -offset.left;
+		that.wrapperOffsetTop = -offset.top;
+
+		// Prepare snap
+		if (typeof that.options.snap == 'string') {
+			that.pagesX = [];
+			that.pagesY = [];
+			els = that.scroller.querySelectorAll(that.options.snap);
+			for (i=0, l=els.length; i<l; i++) {
+				pos = that._offset(els[i]);
+				pos.left += that.wrapperOffsetLeft;
+				pos.top += that.wrapperOffsetTop;
+				that.pagesX[i] = pos.left < that.maxScrollX ? that.maxScrollX : pos.left * that.scale;
+				that.pagesY[i] = pos.top < that.maxScrollY ? that.maxScrollY : pos.top * that.scale;
+			}
+		} else if (that.options.snap) {
+			that.pagesX = [];
+			while (pos >= that.maxScrollX) {
+				that.pagesX[page] = pos;
+				pos = pos - that.wrapperW;
+				page++;
+			}
+			if (that.maxScrollX%that.wrapperW) that.pagesX[that.pagesX.length] = that.maxScrollX - that.pagesX[that.pagesX.length-1] + that.pagesX[that.pagesX.length-1];
+
+			pos = 0;
+			page = 0;
+			that.pagesY = [];
+			while (pos >= that.maxScrollY) {
+				that.pagesY[page] = pos;
+				pos = pos - that.wrapperH;
+				page++;
+			}
+			if (that.maxScrollY%that.wrapperH) that.pagesY[that.pagesY.length] = that.maxScrollY - that.pagesY[that.pagesY.length-1] + that.pagesY[that.pagesY.length-1];
+		}
+
+		// Prepare the scrollbars
+		that._scrollbar('h');
+		that._scrollbar('v');
+
+		if (!that.zoomed) {
+			that.scroller.style[vendor + 'TransitionDuration'] = '0';
+			that._resetPos(200);
+		}
+	},
+
+	scrollTo: function (x, y, time, relative) {
+		var that = this,
+			step = x,
+			i, l;
+
+		that.stop();
+
+		if (!step.length) step = [{ x: x, y: y, time: time, relative: relative }];
+		
+		for (i=0, l=step.length; i<l; i++) {
+			if (step[i].relative) { step[i].x = that.x - step[i].x; step[i].y = that.y - step[i].y; }
+			that.steps.push({ x: step[i].x, y: step[i].y, time: step[i].time || 0 });
+		}
+
+		that._startAni();
+	},
+
+	scrollToElement: function (el, time) {
+		var that = this, pos;
+		el = el.nodeType ? el : that.scroller.querySelector(el);
+		if (!el) return;
+
+		pos = that._offset(el);
+		pos.left += that.wrapperOffsetLeft;
+		pos.top += that.wrapperOffsetTop;
+
+		pos.left = pos.left > 0 ? 0 : pos.left < that.maxScrollX ? that.maxScrollX : pos.left;
+		pos.top = pos.top > that.minScrollY ? that.minScrollY : pos.top < that.maxScrollY ? that.maxScrollY : pos.top;
+		time = time === undefined ? m.max(m.abs(pos.left)*2, m.abs(pos.top)*2) : time;
+
+		that.scrollTo(pos.left, pos.top, time);
+	},
+
+	scrollToPage: function (pageX, pageY, time) {
+		var that = this, x, y;
+
+		if (that.options.onScrollStart) that.options.onScrollStart.call(that);
+
+		if (that.options.snap) {
+			pageX = pageX == 'next' ? that.currPageX+1 : pageX == 'prev' ? that.currPageX-1 : pageX;
+			pageY = pageY == 'next' ? that.currPageY+1 : pageY == 'prev' ? that.currPageY-1 : pageY;
+
+			pageX = pageX < 0 ? 0 : pageX > that.pagesX.length-1 ? that.pagesX.length-1 : pageX;
+			pageY = pageY < 0 ? 0 : pageY > that.pagesY.length-1 ? that.pagesY.length-1 : pageY;
+
+			that.currPageX = pageX;
+			that.currPageY = pageY;
+			x = that.pagesX[pageX];
+			y = that.pagesY[pageY];
+		} else {
+			x = -that.wrapperW * pageX;
+			y = -that.wrapperH * pageY;
+			if (x < that.maxScrollX) x = that.maxScrollX;
+			if (y < that.maxScrollY) y = that.maxScrollY;
+		}
+
+		that.scrollTo(x, y, time || 400);
+	},
+
+	disable: function () {
+		this.stop();
+		this._resetPos(0);
+		this.enabled = false;
+
+		// If disabled after touchstart we make sure that there are no left over events
+		this._unbind(MOVE_EV);
+		this._unbind(END_EV);
+		this._unbind(CANCEL_EV);
+	},
+	
+	enable: function () {
+		this.enabled = true;
+	},
+	
+	stop: function () {
+		if (this.options.useTransition) this._unbind('webkitTransitionEnd');
+		else cancelFrame(this.aniTime);
+		this.steps = [];
+		this.moved = false;
+		this.animating = false;
+	},
+	
+	zoom: function (x, y, scale, time) {
+		var that = this,
+			relScale = scale / that.scale;
+
+		if (!that.options.useTransform) return;
+
+		that.zoomed = true;
+		time = time === undefined ? 200 : time;
+		x = x - that.wrapperOffsetLeft - that.x;
+		y = y - that.wrapperOffsetTop - that.y;
+		that.x = x - x * relScale + that.x;
+		that.y = y - y * relScale + that.y;
+
+		that.scale = scale;
+		that.refresh();
+
+		that.x = that.x > 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x;
+		that.y = that.y > that.minScrollY ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y;
+
+		that.scroller.style[vendor + 'TransitionDuration'] = time + 'ms';
+		that.scroller.style[vendor + 'Transform'] = trnOpen + that.x + 'px,' + that.y + 'px' + trnClose + ' scale(' + scale + ')';
+		that.zoomed = false;
+	},
+	
+	isReady: function () {
+		return !this.moved && !this.zoomed && !this.animating;
+	}
+};
+
+if (typeof exports !== 'undefined') exports.iScroll = iScroll;
+else window.iScroll = iScroll;
+
+})();
diff --git a/upload/public/js/3rd_party/iscroll/license.txt b/upload/public/js/3rd_party/iscroll/license.txt
new file mode 100644
index 00000000..60418c2b
--- /dev/null
+++ b/upload/public/js/3rd_party/iscroll/license.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2011 Matteo Spinelli, http://cubiq.org/
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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.
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/lightbox.js b/upload/public/js/3rd_party/lightbox.js
index 88461256..2af2567f 100644
--- a/upload/public/js/3rd_party/lightbox.js
+++ b/upload/public/js/3rd_party/lightbox.js
@@ -1,8 +1,8 @@
 // -----------------------------------------------------------------------------------
 //
-//	Lightbox v2.04
+//	Lightbox v2.05
 //	by Lokesh Dhakar - http://www.lokeshdhakar.com
-//	Last Modification: 2/9/08
+//	Last Modification: 3/18/11
 //
 //	For more information, visit:
 //	http://lokeshdhakar.com/projects/lightbox2/
@@ -15,11 +15,12 @@
 //  		Artemy Tregubenko (arty.name) for cleanup and help in updating to latest ver of proto-aculous.
 //
 // -----------------------------------------------------------------------------------
-var Lightbox=Class.create();Lightbox.prototype={imageArray:[],activeImage:undefined,initialize:function(){this.updateImageList();this.keyboardAction=this.keyboardAction.bindAsEventListener(this);if(LightboxOptions.resizeSpeed>10)LightboxOptions.resizeSpeed=10;if(LightboxOptions.resizeSpeed<1)LightboxOptions.resizeSpeed=1;this.resizeDuration=LightboxOptions.animate?((11-LightboxOptions.resizeSpeed)*0.15):0;this.overlayDuration=LightboxOptions.animate?0.2:0;var size=(LightboxOptions.animate?250:1)+'px';var objBody=$$('body')[0];objBody.appendChild(Builder.node('div',{id:'overlay'}));objBody.appendChild(Builder.node('div',{id:'lightbox'},[Builder.node('div',{id:'outerImageContainer'},Builder.node('div',{id:'imageContainer'},[Builder.node('img',{id:'lightboxImage'}),Builder.node('div',{id:'hoverNav'},[Builder.node('a',{id:'prevLink',href:'#'}),Builder.node('a',{id:'nextLink',href:'#'})]),Builder.node('div',{id:'loading'},Builder.node('a',{id:'loadingLink',href:'#'},Builder.node('img',{src:LightboxOptions.fileLoadingImage})))])),Builder.node('div',{id:'imageDataContainer'},Builder.node('div',{id:'imageData'},[Builder.node('div',{id:'imageDetails'},[Builder.node('span',{id:'caption'}),Builder.node('span',{id:'numberDisplay'})]),Builder.node('div',{id:'bottomNav'},Builder.node('a',{id:'bottomNavClose',href:'#'},Builder.node('img',{src:LightboxOptions.fileBottomNavCloseImage})))]))]));$('overlay').hide().observe('click',(function(){this.end();}).bind(this));$('lightbox').hide().observe('click',(function(event){if(event.element().id=='lightbox')this.end();}).bind(this));$('outerImageContainer').setStyle({width:size,height:size});$('prevLink').observe('click',(function(event){event.stop();this.changeImage(this.activeImage-1);}).bindAsEventListener(this));$('nextLink').observe('click',(function(event){event.stop();this.changeImage(this.activeImage+1);}).bindAsEventListener(this));$('loadingLink').observe('click',(function(event){event.stop();this.end();}).bind(this));$('bottomNavClose').observe('click',(function(event){event.stop();this.end();}).bind(this));var th=this;(function(){var ids='overlay lightbox outerImageContainer imageContainer lightboxImage hoverNav prevLink nextLink loading loadingLink '+'imageDataContainer imageData imageDetails caption numberDisplay bottomNav bottomNavClose';$w(ids).each(function(id){th[id]=$(id);});}).defer();},updateImageList:function(){this.updateImageList=Prototype.emptyFunction;document.observe('click',(function(event){var target=event.findElement('a[rel*="lightbox"]')||event.findElement('area[rel*="lightbox"]');if(target){event.stop();this.start(target);}}).bind(this));},start:function(imageLink){$$('select','object','embed').each(function(node){node.style.visibility='hidden'});var arrayPageSize=this.getPageSize();$('overlay').setStyle({width:arrayPageSize[0]+'px',height:arrayPageSize[1]+'px'});new Effect.Appear(this.overlay,{duration:this.overlayDuration,from:0.0,to:LightboxOptions.overlayOpacity});this.imageArray=[];var imageNum=0;if((imageLink.rel=='lightbox')){this.imageArray.push([imageLink.href,imageLink.title]);}else{this.imageArray=$$(imageLink.tagName+'[href][rel="'+imageLink.rel+'"]').collect(function(anchor){return[anchor.href,anchor.title];}).uniq();while(this.imageArray[imageNum][0]!=imageLink.href){imageNum++;}}
-var arrayPageScroll=document.viewport.getScrollOffsets();var lightboxTop=arrayPageScroll[1]+(document.viewport.getHeight()/10);var lightboxLeft=arrayPageScroll[0];this.lightbox.setStyle({top:lightboxTop+'px',left:lightboxLeft+'px'}).show();this.changeImage(imageNum);},changeImage:function(imageNum){this.activeImage=imageNum;if(LightboxOptions.animate)this.loading.show();this.lightboxImage.hide();this.hoverNav.hide();this.prevLink.hide();this.nextLink.hide();this.imageDataContainer.setStyle({opacity:.0001});this.numberDisplay.hide();var imgPreloader=new Image();imgPreloader.onload=(function(){this.lightboxImage.src=this.imageArray[this.activeImage][0];this.resizeImageContainer(imgPreloader.width,imgPreloader.height);}).bind(this);imgPreloader.src=this.imageArray[this.activeImage][0];},resizeImageContainer:function(imgWidth,imgHeight){var widthCurrent=this.outerImageContainer.getWidth();var heightCurrent=this.outerImageContainer.getHeight();var widthNew=(imgWidth+LightboxOptions.borderSize*2);var heightNew=(imgHeight+LightboxOptions.borderSize*2);var xScale=(widthNew/widthCurrent)*100;var yScale=(heightNew/heightCurrent)*100;var wDiff=widthCurrent-widthNew;var hDiff=heightCurrent-heightNew;if(hDiff!=0)new Effect.Scale(this.outerImageContainer,yScale,{scaleX:false,duration:this.resizeDuration,queue:'front'});if(wDiff!=0)new Effect.Scale(this.outerImageContainer,xScale,{scaleY:false,duration:this.resizeDuration,delay:this.resizeDuration});var timeout=0;if((hDiff==0)&&(wDiff==0)){timeout=100;if(Prototype.Browser.IE)timeout=250;}
-(function(){this.prevLink.setStyle({height:imgHeight+'px'});this.nextLink.setStyle({height:imgHeight+'px'});this.imageDataContainer.setStyle({width:widthNew+'px'});this.showImage();}).bind(this).delay(timeout/1000);},showImage:function(){this.loading.hide();new Effect.Appear(this.lightboxImage,{duration:this.resizeDuration,queue:'end',afterFinish:(function(){this.updateDetails();}).bind(this)});this.preloadNeighborImages();},updateDetails:function(){if(this.imageArray[this.activeImage][1]!=""){this.caption.update(this.imageArray[this.activeImage][1]).show();}
-if(this.imageArray.length>1){this.numberDisplay.update(LightboxOptions.labelImage+' '+(this.activeImage+1)+' '+LightboxOptions.labelOf+'  '+this.imageArray.length).show();}
-new Effect.Parallel([new Effect.SlideDown(this.imageDataContainer,{sync:true,duration:this.resizeDuration,from:0.0,to:1.0}),new Effect.Appear(this.imageDataContainer,{sync:true,duration:this.resizeDuration})],{duration:this.resizeDuration,afterFinish:(function(){var arrayPageSize=this.getPageSize();this.overlay.setStyle({height:arrayPageSize[1]+'px'});this.updateNav();}).bind(this)});},updateNav:function(){this.hoverNav.show();if(this.activeImage>0)this.prevLink.show();if(this.activeImage<(this.imageArray.length-1))this.nextLink.show();this.enableKeyboardNav();},enableKeyboardNav:function(){document.observe('keydown',this.keyboardAction);},disableKeyboardNav:function(){document.stopObserving('keydown',this.keyboardAction);},keyboardAction:function(event){var keycode=event.keyCode;var escapeKey;if(event.DOM_VK_ESCAPE){escapeKey=event.DOM_VK_ESCAPE;}else{escapeKey=27;}
+
+
+/*LightboxOptions=Object.extend({fileLoadingImage:LightboxOptions.fileLoadingImage,fileBottomNavCloseImage:LightboxOptions.fileBottomNavCloseImage,overlayOpacity:0.8,animate:true,resizeSpeed:7,borderSize:10,labelImage:"Image",labelOf:"of"},window.LightboxOptions||{});*/var Lightbox=Class.create();Lightbox.prototype={imageArray:[],activeImage:undefined,initialize:function(){this.updateImageList();this.keyboardAction=this.keyboardAction.bindAsEventListener(this);if(LightboxOptions.resizeSpeed>10)LightboxOptions.resizeSpeed=10;if(LightboxOptions.resizeSpeed<1)LightboxOptions.resizeSpeed=1;this.resizeDuration=LightboxOptions.animate?((11-LightboxOptions.resizeSpeed)*0.15):0;this.overlayDuration=LightboxOptions.animate?0.2:0;var size=(LightboxOptions.animate?250:1)+'px';var objBody=$$('body')[0];objBody.appendChild(Builder.node('div',{id:'overlay'}));objBody.appendChild(Builder.node('div',{id:'lightbox'},[Builder.node('div',{id:'outerImageContainer'},Builder.node('div',{id:'imageContainer'},[Builder.node('img',{id:'lightboxImage'}),Builder.node('div',{id:'hoverNav'},[Builder.node('a',{id:'prevLink',href:'#'}),Builder.node('a',{id:'nextLink',href:'#'})]),Builder.node('div',{id:'loading'},Builder.node('a',{id:'loadingLink',href:'#'},Builder.node('img',{src:LightboxOptions.fileLoadingImage})))])),Builder.node('div',{id:'imageDataContainer'},Builder.node('div',{id:'imageData'},[Builder.node('div',{id:'imageDetails'},[Builder.node('span',{id:'caption'}),Builder.node('span',{id:'numberDisplay'})]),Builder.node('div',{id:'bottomNav'},Builder.node('a',{id:'bottomNavClose',href:'#'},Builder.node('img',{src:LightboxOptions.fileBottomNavCloseImage})))]))]));$('overlay').hide().observe('click',(function(){this.end();}).bind(this));$('lightbox').hide().observe('click',(function(event){if(event.element().id=='lightbox')this.end();}).bind(this));$('outerImageContainer').setStyle({width:size,height:size});$('prevLink').observe('click',(function(event){event.stop();this.changeImage(this.activeImage-1);}).bindAsEventListener(this));$('nextLink').observe('click',(function(event){event.stop();this.changeImage(this.activeImage+1);}).bindAsEventListener(this));$('loadingLink').observe('click',(function(event){event.stop();this.end();}).bind(this));$('bottomNavClose').observe('click',(function(event){event.stop();this.end();}).bind(this));var th=this;(function(){var ids='overlay lightbox outerImageContainer imageContainer lightboxImage hoverNav prevLink nextLink loading loadingLink '+'imageDataContainer imageData imageDetails caption numberDisplay bottomNav bottomNavClose';$w(ids).each(function(id){th[id]=$(id);});}).defer();},updateImageList:function(){this.updateImageList=Prototype.emptyFunction;document.observe('click',(function(event){var target=event.findElement('a[rel^=lightbox]')||event.findElement('span[rel^=lightbox]')||event.findElement('area[rel^=lightbox]');if(target){if(target.match(".signature [rel^=lightbox]")){return;}event.stop();this.start(target);}}).bind(this));},start:function(imageLink){$$('select','object','embed').each(function(node){node.style.visibility='hidden'});var arrayPageSize=this.getPageSize();$('overlay').setStyle({width:arrayPageSize[0]+'px',height:arrayPageSize[1]+'px'});new Effect.Appear(this.overlay,{duration:this.overlayDuration,from:0.0,to:LightboxOptions.overlayOpacity});this.imageArray=[];var imageNum=0;if((imageLink.getAttribute("rel")=='lightbox')){if(imageLink.tagName=='SPAN'){this.imageArray.push([imageLink.down('img').src,imageLink.down('img').alt] );}else{this.imageArray.push([imageLink.href,imageLink.title]);}}else{this.imageArray=$$(imageLink.tagName+'[href][rel="'+imageLink.rel+'"]').collect(function(anchor){return[anchor.href,anchor.title];}).uniq();while(this.imageArray[imageNum][0]!=imageLink.href){imageNum++;}}
+var arrayPageScroll=document.viewport.getScrollOffsets();var lightboxTop=arrayPageScroll[1]+(document.viewport.getHeight()/10);var lightboxLeft=arrayPageScroll[0];this.lightbox.setStyle({top:lightboxTop+'px',left:lightboxLeft+'px'}).show();this.changeImage(imageNum);},changeImage:function(imageNum){this.activeImage=imageNum;if(LightboxOptions.animate)this.loading.show();this.lightboxImage.hide();this.hoverNav.hide();this.prevLink.hide();this.nextLink.hide();this.imageDataContainer.setStyle({opacity:.0001});this.numberDisplay.hide();var imgPreloader=new Image();imgPreloader.onload=(function(){this.lightboxImage.src=this.imageArray[this.activeImage][0];this.lightboxImage.width=imgPreloader.width;this.lightboxImage.height=imgPreloader.height;this.resizeImageContainer(imgPreloader.width,imgPreloader.height);}).bind(this);imgPreloader.src=this.imageArray[this.activeImage][0];},resizeImageContainer:function(imgWidth,imgHeight){var widthCurrent=this.outerImageContainer.getWidth();var heightCurrent=this.outerImageContainer.getHeight();var widthNew=(imgWidth+LightboxOptions.borderSize*2);var heightNew=(imgHeight+LightboxOptions.borderSize*2);if(widthNew<250){widthNew=250;}if(heightNew<250){heightNew=250;}var xScale=(widthNew/widthCurrent)*100;var yScale=(heightNew/heightCurrent)*100;var wDiff=widthCurrent-widthNew;var hDiff=heightCurrent-heightNew;if(hDiff!=0)new Effect.Scale(this.outerImageContainer,yScale,{scaleX:false,duration:this.resizeDuration,queue:'front'});if(wDiff!=0)new Effect.Scale(this.outerImageContainer,xScale,{scaleY:false,duration:this.resizeDuration,delay:this.resizeDuration});var timeout=0;if((hDiff==0)&&(wDiff==0)){timeout=100;if(Prototype.Browser.IE)timeout=250;}
+(function(){this.prevLink.setStyle({height:imgHeight+'px'});this.nextLink.setStyle({height:imgHeight+'px'});this.imageDataContainer.setStyle({width:widthNew+'px'});this.showImage();}).bind(this).delay(timeout/1000);},showImage:function(){this.loading.hide();new Effect.Appear(this.lightboxImage,{duration:this.resizeDuration,queue:'end',afterFinish:(function(){this.updateDetails();}).bind(this)});this.preloadNeighborImages();},updateDetails:function(){this.caption.update(this.imageArray[this.activeImage][1]).show();if(this.imageArray.length>1){this.numberDisplay.update(LightboxOptions.labelImage+' '+(this.activeImage+1)+' '+LightboxOptions.labelOf+'  '+this.imageArray.length).show();}
+new Effect.Parallel([new Effect.SlideDown(this.imageDataContainer,{sync:true,duration:this.resizeDuration,from:0.0,to:1.0}),new Effect.Appear(this.imageDataContainer,{sync:true,duration:this.resizeDuration})],{duration:this.resizeDuration,afterFinish:(function(){var arrayPageSize=this.getPageSize();this.overlay.setStyle({width:arrayPageSize[0]+'px',height:arrayPageSize[1]+'px'});this.updateNav();}).bind(this)});},updateNav:function(){this.hoverNav.show();if(this.activeImage>0)this.prevLink.show();if(this.activeImage<(this.imageArray.length-1))this.nextLink.show();this.enableKeyboardNav();},enableKeyboardNav:function(){document.observe('keydown',this.keyboardAction);},disableKeyboardNav:function(){document.stopObserving('keydown',this.keyboardAction);},keyboardAction:function(event){var keycode=event.keyCode;var escapeKey;if(event.DOM_VK_ESCAPE){escapeKey=event.DOM_VK_ESCAPE;}else{escapeKey=27;}
 var key=String.fromCharCode(keycode).toLowerCase();if(key.match(/x|o|c/)||(keycode==escapeKey)){this.end();}else if((key=='p')||(keycode==37)){if(this.activeImage!=0){this.disableKeyboardNav();this.changeImage(this.activeImage-1);}}else if((key=='n')||(keycode==39)){if(this.activeImage!=(this.imageArray.length-1)){this.disableKeyboardNav();this.changeImage(this.activeImage+1);}}},preloadNeighborImages:function(){var preloadNextImage,preloadPrevImage;if(this.imageArray.length>this.activeImage+1){preloadNextImage=new Image();preloadNextImage.src=this.imageArray[this.activeImage+1][0];}
 if(this.activeImage>0){preloadPrevImage=new Image();preloadPrevImage.src=this.imageArray[this.activeImage-1][0];}},end:function(){this.disableKeyboardNav();this.lightbox.hide();new Effect.Fade(this.overlay,{duration:this.overlayDuration});$$('select','object','embed').each(function(node){node.style.visibility='visible'});},getPageSize:function(){var xScroll,yScroll;if(window.innerHeight&&window.scrollMaxY){xScroll=window.innerWidth+window.scrollMaxX;yScroll=window.innerHeight+window.scrollMaxY;}else if(document.body.scrollHeight>document.body.offsetHeight){xScroll=document.body.scrollWidth;yScroll=document.body.scrollHeight;}else{xScroll=document.body.offsetWidth;yScroll=document.body.offsetHeight;}
 var windowWidth,windowHeight;if(self.innerHeight){if(document.documentElement.clientWidth){windowWidth=document.documentElement.clientWidth;}else{windowWidth=self.innerWidth;}
diff --git a/upload/public/js/3rd_party/prettify/index.html b/upload/public/js/3rd_party/prettify/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/prettify/index.html
+++ b/upload/public/js/3rd_party/prettify/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/progressbar/index.html b/upload/public/js/3rd_party/progressbar/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/js/3rd_party/progressbar/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/progressbar/progress_bar.gif b/upload/public/js/3rd_party/progressbar/progress_bar.gif
new file mode 100644
index 00000000..d8127126
Binary files /dev/null and b/upload/public/js/3rd_party/progressbar/progress_bar.gif differ
diff --git a/upload/public/js/3rd_party/progressbar/progressbar.css b/upload/public/js/3rd_party/progressbar/progressbar.css
new file mode 100644
index 00000000..b33e13ca
--- /dev/null
+++ b/upload/public/js/3rd_party/progressbar/progressbar.css
@@ -0,0 +1,33 @@
+#progress_bar {  
+    width:102px;  
+    height:7px;  
+    border:1px solid #ccc;  
+    padding:0;  
+    margin:0;  
+    position:relative;  
+    background-image:url("progress_bar.gif");  
+    background-repeat:repeat-x;  
+} 
+ 
+#progress_bar div {  
+    background-color:#fff;  
+}
+
+
+#progresswrapper
+{
+	height: 40px;
+	padding: 20px;
+	position:relative;
+	margin-left: 175px;
+}
+
+#progressmsg
+{
+	font-size: 0.8em;
+	margin-top: 15px;
+	margin-left:-175px;
+	text-align: center;
+	color: #555555;
+	clear:both;
+}
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/progressbar/progressbar.js b/upload/public/js/3rd_party/progressbar/progressbar.js
new file mode 100644
index 00000000..77a5adb1
--- /dev/null
+++ b/upload/public/js/3rd_party/progressbar/progressbar.js
@@ -0,0 +1,478 @@
+/**
+ * Simple wrapper for IPBs use
+ * options
+ * 
+ */
+IPBProgressBar = Class.create( {
+	initialize: function( options )
+	{
+		this.controlbar = null;
+		this.counter = 0;
+		this.lastId  = 0;
+		this.options = {
+               title: "Processing",
+               total: null,
+               pergo: null,
+               ajaxUrl: ''
+            }
+        
+        Object.extend(this.options,options || {});
+		
+		this.current = 0;
+		this.done    = 0;
+		
+		/* inc css */
+		curUrl = $('progressbarScript').readAttribute('src').replace(/progressbar.js/, '' );
+		
+		$$('head')[0].insert( new Element( 'link', { type: 'text/css', rel: 'stylesheet', media: 'screen', href: curUrl + 'progressbar.css' } ) )
+	},
+	
+	show: function()
+	{
+		if ( $('showProgressBar_popup') )
+		{
+			$('showProgressBar_popup').remove();
+		}
+		
+		new ipb.Popup( 'showProgressBar', {  type: 'pane',
+											 initial: "<h3>" + this.options.title + "</h3><div id='progresswrapper'><div id='progress_bar'></div><div id='progressmsg'>Ready...</div></div>",
+											 stem: false,
+											 hideAtStart: false,
+											 hideClose: false,
+											 defer: false,
+											 w: 200 } );
+		
+		/* Give it a chance to appear */
+		setTimeout( this._show.bind(this), 150 );
+	},
+	
+	_show: function()
+	{
+		this.controlbar = new Control.ProgressBar('progress_bar' );
+		
+		if ( this.options.total === null || this.options.pergo === null )
+		{
+			this.getOptionsViaAjax();
+		}
+		else
+		{
+			this.runAjax();
+		}
+	},
+	
+	runAjax: function()
+	{
+		/* Pings ajax, expects json back:
+		 * status: (processing, done, error)
+		 * msg: (Optional message to show)
+		 * lastId: (last ID processed)
+		 *  */
+		Debug.write( url + '&pb_act=fire&pb_pergo=' + this.options.pergo + '&pb_lastId=' + this.lastId + '&pb_done=' + this.done );
+		
+		new Ajax.Request( 	url + '&pb_act=fire&pb_pergo=' + this.options.pergo + '&pb_lastId=' + this.lastId + '&pb_done=' + this.done,
+			 				{
+								method: 'get',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									json = t.responseJSON;
+									
+									if ( t.responseJSON['error'] )
+									{
+										alert( t.responseJSON['error'] );
+									}
+									else
+									{
+										if ( json['status'] == 'done' )
+										{
+											Debug.write( "Done");
+											this.finish();
+										}
+										else if ( json['status'] == 'error' )
+										{
+											this.finish( "An error occured " + json['msg'] );
+										}
+										else
+										{
+										
+											/* We're still processing, so.. */
+											this.lastId = json['lastId'];
+											this.done  += this.options.pergo;
+											
+											num = 0;
+											
+											if ( this.done >= this.options.total )
+											{
+												num = 100;
+											}
+											else
+											{
+												num = Math.round( ( 100 / this.options.total ) * this.done );
+											}
+											
+											/* Increment bar */
+											this.controlbar.setProgress( num );
+											
+											/* Update message */
+											this.updateStatus( ( json['msg'] ) ? json['msg'] : "Processed " + this.done + " of " + this.options.total + '...' );
+		
+											/* Go again! */
+											this.runAjax();
+										}
+									}
+								}.bind(this)
+							}
+						);
+	},
+	
+	/**
+	 * fetch data via ajax. Expects json['pergo'] json['total']
+	 */
+	getOptionsViaAjax: function()
+	{
+		this.updateStatus( "Fetching details..." );
+		
+		Debug.write( url + '&pb_act=getOptions' );
+		
+		// Send AJAX request
+		new Ajax.Request( 	url + '&pb_act=getOptions',
+			 				{
+								method: 'get',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									json = t.responseJSON;
+									
+									Debug.dir( json );
+									
+									if ( t.responseJSON['error'] )
+									{
+										alert( t.responseJSON['error'] );
+									}
+									else
+									{
+										if ( json['total'] && json['pergo'] )
+										{
+											this.options.total = parseInt( json['total'] );
+											this.options.pergo = parseInt( json['pergo'] );
+											
+											this.runAjax();
+										}
+										else
+										{
+											Debug.write( "No data found, so assume nothing to rebuild");
+											this.finish();
+										}
+									}
+								}.bind(this)
+							}
+						);
+	},
+	
+	/**
+	 * Updates status innit
+	 */
+	updateStatus: function( msg )
+	{
+		$('progressmsg').update( msg );
+	},
+	
+	/**
+	 * Finish
+	 */
+	finish: function( msg )
+	{
+		msg = msg ? msg : "Finished";
+		
+		this.updateStatus( msg );
+		
+		this.controlbar.setProgress(0);
+	}
+
+
+} );
+
+/**
+ * @author Ryan Johnson <http://syntacticx.com/>
+ * @copyright 2008 PersonalGrid Corporation <http://personalgrid.com/>
+ * @package LivePipe UI
+ * @license MIT
+ * @url http://livepipe.net/core
+ * @require prototype.js
+ */
+
+if(typeof(Control) == 'undefined')
+    Control = {};
+    
+var $proc = function(proc){
+    return typeof(proc) == 'function' ? proc : function(){return proc};
+};
+
+var $value = function(value){
+    return typeof(value) == 'function' ? value() : value;
+};
+
+Object.Event = {
+    extend: function(object){
+        object._objectEventSetup = function(event_name){
+            this._observers = this._observers || {};
+            this._observers[event_name] = this._observers[event_name] || [];
+        };
+        object.observe = function(event_name,observer){
+            if(typeof(event_name) == 'string' && typeof(observer) != 'undefined'){
+                this._objectEventSetup(event_name);
+                if(!this._observers[event_name].include(observer))
+                    this._observers[event_name].push(observer);
+            }else
+                for(var e in event_name)
+                    this.observe(e,event_name[e]);
+        };
+        object.stopObserving = function(event_name,observer){
+            this._objectEventSetup(event_name);
+            if(event_name && observer)
+                this._observers[event_name] = this._observers[event_name].without(observer);
+            else if(event_name)
+                this._observers[event_name] = [];
+            else
+                this._observers = {};
+        };
+        object.observeOnce = function(event_name,outer_observer){
+            var inner_observer = function(){
+                outer_observer.apply(this,arguments);
+                this.stopObserving(event_name,inner_observer);
+            }.bind(this);
+            this._objectEventSetup(event_name);
+            this._observers[event_name].push(inner_observer);
+        };
+        object.notify = function(event_name){
+            this._objectEventSetup(event_name);
+            var collected_return_values = [];
+            var args = $A(arguments).slice(1);
+            try{
+                for(var i = 0; i < this._observers[event_name].length; ++i)
+                    collected_return_values.push(this._observers[event_name][i].apply(this._observers[event_name][i],args) || null);
+            }catch(e){
+                if(e == $break)
+                    return false;
+                else
+                    throw e;
+            }
+            return collected_return_values;
+        };
+        if(object.prototype){
+            object.prototype._objectEventSetup = object._objectEventSetup;
+            object.prototype.observe = object.observe;
+            object.prototype.stopObserving = object.stopObserving;
+            object.prototype.observeOnce = object.observeOnce;
+            object.prototype.notify = function(event_name){
+                if(object.notify){
+                    var args = $A(arguments).slice(1);
+                    args.unshift(this);
+                    args.unshift(event_name);
+                    object.notify.apply(object,args);
+                }
+                this._objectEventSetup(event_name);
+                var args = $A(arguments).slice(1);
+                var collected_return_values = [];
+                try{
+                    if(this.options && this.options[event_name] && typeof(this.options[event_name]) == 'function')
+                        collected_return_values.push(this.options[event_name].apply(this,args) || null);
+                    for(var i = 0; i < this._observers[event_name].length; ++i)
+                        collected_return_values.push(this._observers[event_name][i].apply(this._observers[event_name][i],args) || null);
+                }catch(e){
+                    if(e == $break)
+                        return false;
+                    else
+                        throw e;
+                }
+                return collected_return_values;
+            };
+        }
+    }
+};
+
+/* Begin Core Extensions */
+
+//Element.observeOnce
+Element.addMethods({
+    observeOnce: function(element,event_name,outer_callback){
+        var inner_callback = function(){
+            outer_callback.apply(this,arguments);
+            Element.stopObserving(element,event_name,inner_callback);
+        };
+        Element.observe(element,event_name,inner_callback);
+    }
+});
+
+//mouse:wheel
+(function(){
+    function wheel(event){
+        var delta, element, custom_event;
+        // normalize the delta
+        if (event.wheelDelta) { // IE & Opera
+            delta = event.wheelDelta / 120;
+        } else if (event.detail) { // W3C
+            delta =- event.detail / 3;
+        }
+        if (!delta) { return; }
+        element = Event.extend(event).target;
+        element = Element.extend(element.nodeType === Node.TEXT_NODE ? element.parentNode : element);
+        custom_event = element.fire('mouse:wheel',{ delta: delta });
+        if (custom_event.stopped) {
+            Event.stop(event);
+            return false;
+        }
+    }
+    document.observe('mousewheel',wheel);
+    document.observe('DOMMouseScroll',wheel);
+})();
+
+/* End Core Extensions */
+
+//from PrototypeUI
+var IframeShim = Class.create({
+    initialize: function() {
+        this.element = new Element('iframe',{
+            style: 'position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);display:none',
+            src: 'javascript:void(0);',
+            frameborder: 0 
+        });
+        $(document.body).insert(this.element);
+    },
+    hide: function() {
+        this.element.hide();
+        return this;
+    },
+    show: function() {
+        this.element.show();
+        return this;
+    },
+    positionUnder: function(element) {
+        var element = $(element);
+        var offset = element.cumulativeOffset();
+        var dimensions = element.getDimensions();
+        this.element.setStyle({
+            left: offset[0] + 'px',
+            top: offset[1] + 'px',
+            width: dimensions.width + 'px',
+            height: dimensions.height + 'px',
+            zIndex: element.getStyle('zIndex') - 1
+        }).show();
+        return this;
+    },
+    setBounds: function(bounds) {
+        for(prop in bounds)
+            bounds[prop] += 'px';
+        this.element.setStyle(bounds);
+        return this;
+    },
+    destroy: function() {
+        if(this.element)
+            this.element.remove();
+        return this;
+    }
+});
+
+/**
+ * @author Ryan Johnson <http://syntacticx.com/>
+ * @copyright 2008 PersonalGrid Corporation <http://personalgrid.com/>
+ * @package LivePipe UI
+ * @license MIT
+ * @url http://livepipe.net/control/progressbar
+ * @require prototype.js, livepipe.js
+ */
+
+/*global document, Prototype, Ajax, Class, PeriodicalExecuter, $, $A, Control */
+
+if(typeof(Prototype) == "undefined") {
+    throw "Control.ProgressBar requires Prototype to be loaded."; }
+if(typeof(Object.Event) == "undefined") {
+    throw "Control.ProgressBar requires Object.Event to be loaded."; }
+
+Control.ProgressBar = Class.create({
+    initialize: function(container,options){
+        this.progress = 0;
+        this.executer = false;
+        this.active = false;
+        this.poller = false;
+        this.container = $(container);
+        this.containerWidth = this.container.getDimensions().width - (parseInt(this.container.getStyle('border-right-width').replace(/px/,''), 10) + parseInt(this.container.getStyle('border-left-width').replace(/px/,''), 10));
+        this.progressContainer = $(document.createElement('div'));
+        this.progressContainer.setStyle({
+            width: this.containerWidth + 'px',
+            height: '100%',
+            position: 'absolute',
+            top: '0px',
+            right: '0px'
+        });
+       
+        this.container.appendChild(this.progressContainer);
+        this.options = {
+            afterChange: Prototype.emptyFunction,
+            interval: 0.25,
+            step: 1,
+            classNames: {
+                active: 'progress_bar_active',
+                inactive: 'progress_bar_inactive'
+            }
+        };
+        Object.extend(this.options,options || {});
+        this.container.addClassName(this.options.classNames.inactive);
+        this.active = false;
+    },
+    setProgress: function(value){
+        this.progress = value;
+        this.draw();
+        if(this.progress >= 100) {
+            this.stop(false); }
+        this.notify('afterChange',this.progress,this.active);
+    },
+    poll: function (url, interval, ajaxOptions){
+        // Extend the passed ajax options and success callback with our own.
+        ajaxOptions = ajaxOptions || {};
+        var success = ajaxOptions.onSuccess || Prototype.emptyFunction;
+        ajaxOptions.onSuccess = success.wrap(function (callOriginal, request) {
+            this.setProgress(parseInt(request.responseText, 10));
+            if(!this.active) { this.poller.stop(); }
+            callOriginal(request);
+        }).bind(this);
+
+        this.active = true;
+        this.poller = new PeriodicalExecuter(function(){
+            var a = new Ajax.Request(url, ajaxOptions);
+        }.bind(this),interval || 3);
+    },
+    start: function(){
+        this.active = true;
+        this.container.removeClassName(this.options.classNames.inactive);
+        this.container.addClassName(this.options.classNames.active);
+        this.executer = new PeriodicalExecuter(this.step.bind(this,this.options.step),this.options.interval);
+    },
+    stop: function(reset){
+        this.active = false;
+        if(this.executer) {
+            this.executer.stop(); }
+        this.container.removeClassName(this.options.classNames.active);
+        this.container.addClassName(this.options.classNames.inactive);
+        if (typeof reset  === 'undefined' || reset === true) {
+            this.reset(); }
+    },
+    step: function(amount){
+        this.active = true;
+        this.setProgress(Math.min(100,this.progress + amount));
+    },
+    reset: function(){
+        this.active = false;
+        this.setProgress(0);
+    },
+    draw: function(){
+        this.progressContainer.setStyle({
+            width: (this.containerWidth - Math.floor((parseInt(this.progress, 10) / 100) * this.containerWidth)) + 'px'
+        });
+    },
+    notify: function(event_name){
+        if(this.options[event_name]) {
+            return [this.options[event_name].apply(this.options[event_name],$A(arguments).slice(1))]; }
+    }
+});
+Object.Event.extend(Control.ProgressBar);
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/prototype.js b/upload/public/js/3rd_party/prototype.js
index 85c21040..bf383dec 100644
--- a/upload/public/js/3rd_party/prototype.js
+++ b/upload/public/js/3rd_party/prototype.js
@@ -1,5 +1,5 @@
-/*  Prototype JavaScript framework, version 1.6.1
- *  (c) 2005-2009 Sam Stephenson
+/*  Prototype JavaScript framework, version 1.7
+ *  (c) 2005-2010 Sam Stephenson
  *
  *  Prototype is freely distributable under the terms of an MIT-style license.
  *  For details, see the Prototype web site: http://www.prototypejs.org/
@@ -7,7 +7,8 @@
  *--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.6.1',
+
+  Version: '1.7',
 
   Browser: (function(){
     var ua = navigator.userAgent;
@@ -17,13 +18,15 @@ var Prototype = {
       Opera:          isOpera,
       WebKit:         ua.indexOf('AppleWebKit/') > -1,
       Gecko:          ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1,
-      MobileSafari:   /Apple.*Mobile.*Safari/.test(ua)
+      MobileSafari:   /Apple.*Mobile/.test(ua)
     }
   })(),
 
   BrowserFeatures: {
     XPath: !!document.evaluate,
+
     SelectorsAPI: !!document.querySelector,
+
     ElementExtensions: (function() {
       var constructor = window.Element || window.HTMLElement;
       return !!(constructor && constructor.prototype);
@@ -32,9 +35,9 @@ var Prototype = {
       if (typeof window.HTMLDivElement !== 'undefined')
         return true;
 
-      var div = document.createElement('div');
-      var form = document.createElement('form');
-      var isSupported = false;
+      var div = document.createElement('div'),
+          form = document.createElement('form'),
+          isSupported = false;
 
       if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) {
         isSupported = true;
@@ -50,6 +53,7 @@ var Prototype = {
   JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
 
   emptyFunction: function() { },
+
   K: function(x) { return x }
 };
 
@@ -79,6 +83,14 @@ var Try = {
 /* Based on Alex Arnell's inheritance implementation. */
 
 var Class = (function() {
+
+  var IS_DONTENUM_BUGGY = (function(){
+    for (var p in { toString: 1 }) {
+      if (p === 'toString') return false;
+    }
+    return true;
+  })();
+
   function subclass() {};
   function create() {
     var parent = null, properties = $A(arguments);
@@ -99,7 +111,7 @@ var Class = (function() {
       parent.subclasses.push(klass);
     }
 
-    for (var i = 0; i < properties.length; i++)
+    for (var i = 0, length = properties.length; i < length; i++)
       klass.addMethods(properties[i]);
 
     if (!klass.prototype.initialize)
@@ -110,10 +122,10 @@ var Class = (function() {
   }
 
   function addMethods(source) {
-    var ancestor   = this.superclass && this.superclass.prototype;
-    var properties = Object.keys(source);
+    var ancestor   = this.superclass && this.superclass.prototype,
+        properties = Object.keys(source);
 
-    if (!Object.keys({ toString: true }).length) {
+    if (IS_DONTENUM_BUGGY) {
       if (source.toString != Object.prototype.toString)
         properties.push("toString");
       if (source.valueOf != Object.prototype.valueOf)
@@ -123,7 +135,7 @@ var Class = (function() {
     for (var i = 0, length = properties.length; i < length; i++) {
       var property = properties[i], value = source[property];
       if (ancestor && Object.isFunction(value) &&
-          value.argumentNames().first() == "$super") {
+          value.argumentNames()[0] == "$super") {
         var method = value;
         value = (function(m) {
           return function() { return ancestor[m].apply(this, arguments); };
@@ -147,7 +159,37 @@ var Class = (function() {
 })();
 (function() {
 
-  var _toString = Object.prototype.toString;
+  var _toString = Object.prototype.toString,
+      NULL_TYPE = 'Null',
+      UNDEFINED_TYPE = 'Undefined',
+      BOOLEAN_TYPE = 'Boolean',
+      NUMBER_TYPE = 'Number',
+      STRING_TYPE = 'String',
+      OBJECT_TYPE = 'Object',
+      FUNCTION_CLASS = '[object Function]',
+      BOOLEAN_CLASS = '[object Boolean]',
+      NUMBER_CLASS = '[object Number]',
+      STRING_CLASS = '[object String]',
+      ARRAY_CLASS = '[object Array]',
+      DATE_CLASS = '[object Date]',
+      NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON &&
+        typeof JSON.stringify === 'function' &&
+        JSON.stringify(0) === '0' &&
+        typeof JSON.stringify(Prototype.K) === 'undefined';
+
+  function Type(o) {
+    switch(o) {
+      case null: return NULL_TYPE;
+      case (void 0): return UNDEFINED_TYPE;
+    }
+    var type = typeof o;
+    switch(type) {
+      case 'boolean': return BOOLEAN_TYPE;
+      case 'number':  return NUMBER_TYPE;
+      case 'string':  return STRING_TYPE;
+    }
+    return OBJECT_TYPE;
+  }
 
   function extend(destination, source) {
     for (var property in source)
@@ -166,27 +208,70 @@ var Class = (function() {
     }
   }
 
-  function toJSON(object) {
-    var type = typeof object;
+  function toJSON(value) {
+    return Str('', { '': value }, []);
+  }
+
+  function Str(key, holder, stack) {
+    var value = holder[key],
+        type = typeof value;
+
+    if (Type(value) === OBJECT_TYPE && typeof value.toJSON === 'function') {
+      value = value.toJSON(key);
+    }
+
+    var _class = _toString.call(value);
+
+    switch (_class) {
+      case NUMBER_CLASS:
+      case BOOLEAN_CLASS:
+      case STRING_CLASS:
+        value = value.valueOf();
+    }
+
+    switch (value) {
+      case null: return 'null';
+      case true: return 'true';
+      case false: return 'false';
+    }
+
+    type = typeof value;
     switch (type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
+      case 'string':
+        return value.inspect(true);
+      case 'number':
+        return isFinite(value) ? String(value) : 'null';
+      case 'object':
+
+        for (var i = 0, length = stack.length; i < length; i++) {
+          if (stack[i] === value) { throw new TypeError(); }
+        }
+        stack.push(value);
+
+        var partial = [];
+        if (_class === ARRAY_CLASS) {
+          for (var i = 0, length = value.length; i < length; i++) {
+            var str = Str(i, value, stack);
+            partial.push(typeof str === 'undefined' ? 'null' : str);
+          }
+          partial = '[' + partial.join(',') + ']';
+        } else {
+          var keys = Object.keys(value);
+          for (var i = 0, length = keys.length; i < length; i++) {
+            var key = keys[i], str = Str(key, value, stack);
+            if (typeof str !== "undefined") {
+               partial.push(key.inspect(true)+ ':' + str);
+             }
+          }
+          partial = '{' + partial.join(',') + '}';
+        }
+        stack.pop();
+        return partial;
     }
+  }
 
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (isElement(object)) return;
-
-    var results = [];
-    for (var property in object) {
-      var value = toJSON(object[property]);
-      if (!isUndefined(value))
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
+  function stringify(object) {
+    return JSON.stringify(object);
   }
 
   function toQueryString(object) {
@@ -198,9 +283,13 @@ var Class = (function() {
   }
 
   function keys(object) {
+    if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); }
     var results = [];
-    for (var property in object)
-      results.push(property);
+    for (var property in object) {
+      if (object.hasOwnProperty(property)) {
+        results.push(property);
+      }
+    }
     return results;
   }
 
@@ -220,24 +309,34 @@ var Class = (function() {
   }
 
   function isArray(object) {
-    return _toString.call(object) == "[object Array]";
+    return _toString.call(object) === ARRAY_CLASS;
   }
 
+  var hasNativeIsArray = (typeof Array.isArray == 'function')
+    && Array.isArray([]) && !Array.isArray({});
+
+  if (hasNativeIsArray) {
+    isArray = Array.isArray;
+  }
 
   function isHash(object) {
     return object instanceof Hash;
   }
 
   function isFunction(object) {
-    return typeof object === "function";
+    return _toString.call(object) === FUNCTION_CLASS;
   }
 
   function isString(object) {
-    return _toString.call(object) == "[object String]";
+    return _toString.call(object) === STRING_CLASS;
   }
 
   function isNumber(object) {
-    return _toString.call(object) == "[object Number]";
+    return _toString.call(object) === NUMBER_CLASS;
+  }
+
+  function isDate(object) {
+    return _toString.call(object) === DATE_CLASS;
   }
 
   function isUndefined(object) {
@@ -247,10 +346,10 @@ var Class = (function() {
   extend(Object, {
     extend:        extend,
     inspect:       inspect,
-    toJSON:        toJSON,
+    toJSON:        NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON,
     toQueryString: toQueryString,
     toHTML:        toHTML,
-    keys:          keys,
+    keys:          Object.keys || keys,
     values:        values,
     clone:         clone,
     isElement:     isElement,
@@ -259,6 +358,7 @@ var Class = (function() {
     isFunction:    isFunction,
     isString:      isString,
     isNumber:      isNumber,
+    isDate:        isDate,
     isUndefined:   isUndefined
   });
 })();
@@ -311,7 +411,7 @@ Object.extend(Function.prototype, (function() {
 
   function delay(timeout) {
     var __method = this, args = slice.call(arguments, 1);
-    timeout = timeout * 1000
+    timeout = timeout * 1000;
     return window.setTimeout(function() {
       return __method.apply(__method, args);
     }, timeout);
@@ -352,14 +452,28 @@ Object.extend(Function.prototype, (function() {
 })());
 
 
-Date.prototype.toJSON = function() {
-  return '"' + this.getUTCFullYear() + '-' +
-    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-    this.getUTCDate().toPaddedString(2) + 'T' +
-    this.getUTCHours().toPaddedString(2) + ':' +
-    this.getUTCMinutes().toPaddedString(2) + ':' +
-    this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
+
+(function(proto) {
+
+
+  function toISOString() {
+    return this.getUTCFullYear() + '-' +
+      (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+      this.getUTCDate().toPaddedString(2) + 'T' +
+      this.getUTCHours().toPaddedString(2) + ':' +
+      this.getUTCMinutes().toPaddedString(2) + ':' +
+      this.getUTCSeconds().toPaddedString(2) + 'Z';
+  }
+
+
+  function toJSON() {
+    return this.toISOString();
+  }
+
+  if (!proto.toISOString) proto.toISOString = toISOString;
+  if (!proto.toJSON) proto.toJSON = toJSON;
+
+})(Date.prototype);
 
 
 RegExp.prototype.match = RegExp.prototype.test;
@@ -418,6 +532,9 @@ Object.extend(String, {
 });
 
 Object.extend(String.prototype, (function() {
+  var NATIVE_JSON_PARSE_SUPPORT = window.JSON &&
+    typeof JSON.parse === 'function' &&
+    JSON.parse('{"test": true}').test;
 
   function prepareReplacement(replacement) {
     if (Object.isFunction(replacement)) return replacement;
@@ -484,8 +601,8 @@ Object.extend(String.prototype, (function() {
   }
 
   function extractScripts() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img'),
+        matchOne = new RegExp(Prototype.ScriptFragment, 'im');
     return (this.match(matchAll) || []).map(function(scriptTag) {
       return (scriptTag.match(matchOne) || ['', ''])[1];
     });
@@ -510,8 +627,9 @@ Object.extend(String.prototype, (function() {
 
     return match[1].split(separator || '&').inject({ }, function(hash, pair) {
       if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
+        var key = decodeURIComponent(pair.shift()),
+            value = pair.length > 1 ? pair.join('=') : pair[0];
+            
         if (value != undefined) value = decodeURIComponent(unescape(value).replace(/%/g,'%25'));
 
         if (key in hash) {
@@ -538,17 +656,9 @@ Object.extend(String.prototype, (function() {
   }
 
   function camelize() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
+    return this.replace(/-+(.)?/g, function(match, chr) {
+      return chr ? chr.toUpperCase() : '';
+    });
   }
 
   function capitalize() {
@@ -578,10 +688,6 @@ Object.extend(String.prototype, (function() {
     return "'" + escapedString.replace(/'/g, '\\\'') + "'";
   }
 
-  function toJSON() {
-    return this.inspect(true);
-  }
-
   function unfilterJSON(filter) {
     return this.replace(filter || Prototype.JSONFilter, '$1');
   }
@@ -589,29 +695,42 @@ Object.extend(String.prototype, (function() {
   function isJSON() {
     var str = this;
     if (str.blank()) return false;
-    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
-    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+    str = str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@');
+    str = str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
+    str = str.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+    return (/^[\],:{}\s]*$/).test(str);
   }
 
   function evalJSON(sanitize) {
-    var json = this.unfilterJSON();
+    var json = this.unfilterJSON(),
+        cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+    if (cx.test(json)) {
+      json = json.replace(cx, function (a) {
+        return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+      });
+    }
     try {
       if (!sanitize || json.isJSON()) return eval('(' + json + ')');
     } catch (e) { }
     throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
   }
 
+  function parseJSON() {
+    var json = this.unfilterJSON();
+    return JSON.parse(json);
+  }
+
   function include(pattern) {
     return this.indexOf(pattern) > -1;
   }
 
   function startsWith(pattern) {
-    return this.indexOf(pattern) === 0;
+    return this.lastIndexOf(pattern, 0) === 0;
   }
 
   function endsWith(pattern) {
     var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
+    return d >= 0 && this.indexOf(pattern, d) === d;
   }
 
   function empty() {
@@ -631,7 +750,7 @@ Object.extend(String.prototype, (function() {
     sub:            sub,
     scan:           scan,
     truncate:       truncate,
-    strip:          String.prototype.trim ? String.prototype.trim : strip,
+    strip:          String.prototype.trim || strip,
     stripTags:      stripTags,
     stripScripts:   stripScripts,
     extractScripts: extractScripts,
@@ -648,10 +767,9 @@ Object.extend(String.prototype, (function() {
     underscore:     underscore,
     dasherize:      dasherize,
     inspect:        inspect,
-    toJSON:         toJSON,
     unfilterJSON:   unfilterJSON,
     isJSON:         isJSON,
-    evalJSON:       evalJSON,
+    evalJSON:       NATIVE_JSON_PARSE_SUPPORT ? parseJSON : evalJSON,
     include:        include,
     startsWith:     startsWith,
     endsWith:       endsWith,
@@ -677,8 +795,9 @@ var Template = Class.create({
       var before = match[1] || '';
       if (before == '\\') return match[2];
 
-      var ctx = object, expr = match[3];
-      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+      var ctx = object, expr = match[3],
+          pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+
       match = pattern.exec(expr);
       if (match == null) return before;
 
@@ -943,6 +1062,7 @@ var Enumerable = (function() {
     find:       detect
   };
 })();
+
 function $A(iterable) {
   if (!iterable) return [];
   if ('toArray' in Object(iterable)) return iterable.toArray();
@@ -951,6 +1071,7 @@ function $A(iterable) {
   return results;
 }
 
+
 function $w(string) {
   if (!Object.isString(string)) return [];
   string = string.strip();
@@ -965,9 +1086,10 @@ Array.from = $A;
       slice = arrayProto.slice,
       _each = arrayProto.forEach; // use native browser JS 1.6 implementation if available
 
-  function each(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
+  function each(iterator, context) {
+    for (var i = 0, length = this.length >>> 0; i < length; i++) {
+      if (i in this) iterator.call(context, this[i], i, this);
+    }
   }
   if (!_each) _each = each;
 
@@ -1007,7 +1129,7 @@ Array.from = $A;
   }
 
   function reverse(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
+    return (inline === false ? this.toArray() : this)._reverse();
   }
 
   function uniq(sorted) {
@@ -1037,15 +1159,6 @@ Array.from = $A;
     return '[' + this.map(Object.inspect).join(', ') + ']';
   }
 
-  function toJSON() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (!Object.isUndefined(value)) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
-
   function indexOf(item, i) {
     i || (i = 0);
     var length = this.length;
@@ -1094,8 +1207,7 @@ Array.from = $A;
     clone:     clone,
     toArray:   clone,
     size:      size,
-    inspect:   inspect,
-    toJSON:    toJSON
+    inspect:   inspect
   });
 
   var CONCAT_ARGUMENTS_BUGGY = (function() {
@@ -1116,6 +1228,7 @@ var Hash = Class.create(Enumerable, (function() {
     this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
   }
 
+
   function _each(iterator) {
     for (var key in this._object) {
       var value = this._object[key], pair = [key, value];
@@ -1144,6 +1257,8 @@ var Hash = Class.create(Enumerable, (function() {
     return Object.clone(this._object);
   }
 
+
+
   function keys() {
     return this.pluck('key');
   }
@@ -1180,8 +1295,14 @@ var Hash = Class.create(Enumerable, (function() {
       var key = encodeURIComponent(pair.key), values = pair.value;
 
       if (values && typeof values == 'object') {
-        if (Object.isArray(values))
-          return results.concat(values.map(toQueryPair.curry(key)));
+        if (Object.isArray(values)) {
+          var queryValues = [];
+          for (var i = 0, len = values.length, value; i < len; i++) {
+            value = values[i];
+            queryValues.push(toQueryPair(key, value));
+          }
+          return results.concat(queryValues);
+        }
       } else results.push(toQueryPair(key, values));
       return results;
     }).join('&');
@@ -1193,10 +1314,6 @@ var Hash = Class.create(Enumerable, (function() {
     }).join(', ') + '}>';
   }
 
-  function toJSON() {
-    return Object.toJSON(this.toObject());
-  }
-
   function clone() {
     return new Hash(this);
   }
@@ -1216,7 +1333,7 @@ var Hash = Class.create(Enumerable, (function() {
     update:                 update,
     toQueryString:          toQueryString,
     inspect:                inspect,
-    toJSON:                 toJSON,
+    toJSON:                 toObject,
     clone:                  clone
   };
 })());
@@ -1241,10 +1358,6 @@ Object.extend(Number.prototype, (function() {
     return '0'.times(length - string.length) + string;
   }
 
-  function toJSON() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
-
   function abs() {
     return Math.abs(this);
   }
@@ -1266,7 +1379,6 @@ Object.extend(Number.prototype, (function() {
     succ:           succ,
     times:          times,
     toPaddedString: toPaddedString,
-    toJSON:         toJSON,
     abs:            abs,
     round:          round,
     ceil:           ceil,
@@ -1370,9 +1482,7 @@ Ajax.Base = Class.create({
 
     this.options.method = this.options.method.toLowerCase();
 
-    if (Object.isString(this.options.parameters))
-      this.options.parameters = this.options.parameters.toQueryParams();
-    else if (Object.isHash(this.options.parameters))
+    if (Object.isHash(this.options.parameters))
       this.options.parameters = this.options.parameters.toObject();
   }
 });
@@ -1388,22 +1498,21 @@ Ajax.Request = Class.create(Ajax.Base, {
   request: function(url) {
     this.url = url;
     this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
+    var params = Object.isString(this.options.parameters) ?
+          this.options.parameters :
+          Object.toQueryString(this.options.parameters);
 
     if (!['get', 'post'].include(this.method)) {
-      params['_method'] = this.method;
+      params += (params ? '&' : '') + "_method=" + this.method;
       this.method = 'post';
     }
 
-    this.parameters = params;
-
-    if (params = Object.toQueryString(params)) {
-      if (this.method == 'get')
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
+    if (params && this.method === 'get') {
+      this.url += (this.url.include('?') ? '&' : '?') + params;
     }
 
+    this.parameters = params.toQueryParams();
+
     try {
       var response = new Ajax.Response(this);
       if (this.options.onCreate) this.options.onCreate(response);
@@ -1472,11 +1581,12 @@ Ajax.Request = Class.create(Ajax.Base, {
 
   success: function() {
     var status = this.getStatus();
-    return !status || (status >= 200 && status < 300);
+    return !status || (status >= 200 && status < 300) || status == 304;
   },
 
   getStatus: function() {
     try {
+      if (this.transport.status === 1223) return 204;
       return this.transport.status || 0;
     } catch (e) { return 0 }
   },
@@ -1558,14 +1668,14 @@ Ajax.Response = Class.create({
     var transport  = this.transport  = request.transport,
         readyState = this.readyState = transport.readyState;
 
-    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+    if ((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
       this.status       = this.getStatus();
       this.statusText   = this.getStatusText();
       this.responseText = String.interpret(transport.responseText);
       this.headerJSON   = this._getHeaderJSON();
     }
 
-    if(readyState == 4) {
+    if (readyState == 4) {
       var xml = transport.responseXML;
       this.responseXML  = Object.isUndefined(xml) ? null : xml;
       this.responseJSON = this._getResponseJSON();
@@ -1705,7 +1815,6 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
 });
 
 
-
 function $(element) {
   if (arguments.length > 1) {
     for (var i = 0, elements = [], length = arguments.length; i < length; i++)
@@ -1730,7 +1839,7 @@ if (Prototype.BrowserFeatures.XPath) {
 
 /*--------------------------------------------------------------------------*/
 
-if (!window.Node) var Node = { };
+if (!Node) var Node = { };
 
 if (!Node.ELEMENT_NODE) {
   Object.extend(Node, {
@@ -1750,42 +1859,61 @@ if (!Node.ELEMENT_NODE) {
 }
 
 
-(function(global) {
 
-  var SETATTRIBUTE_IGNORES_NAME = (function(){
-    var elForm = document.createElement("form");
-    var elInput = document.createElement("input");
-    var root = document.documentElement;
-    elInput.setAttribute("name", "test");
-    elForm.appendChild(elInput);
-    root.appendChild(elForm);
-    var isBuggy = elForm.elements
-      ? (typeof elForm.elements.test == "undefined")
-      : null;
-    root.removeChild(elForm);
-    elForm = elInput = null;
-    return isBuggy;
+(function(global) {
+  function shouldUseCache(tagName, attributes) {
+    if (tagName === 'select') return false;
+    if ('type' in attributes) return false;
+    return true;
+  }
+
+  var HAS_EXTENDED_CREATE_ELEMENT_SYNTAX = (function(){
+    try {
+      var el = document.createElement('<input name="x">');
+      return el.tagName.toLowerCase() === 'input' && el.name === 'x';
+    }
+    catch(err) {
+      return false;
+    }
   })();
 
   var element = global.Element;
+
   global.Element = function(tagName, attributes) {
     attributes = attributes || { };
     tagName = tagName.toLowerCase();
     var cache = Element.cache;
-    if (SETATTRIBUTE_IGNORES_NAME && attributes.name) {
+
+    if (HAS_EXTENDED_CREATE_ELEMENT_SYNTAX && attributes.name) {
       tagName = '<' + tagName + ' name="' + attributes.name + '">';
       delete attributes.name;
       return Element.writeAttribute(document.createElement(tagName), attributes);
     }
+
     if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
+
+    var node = shouldUseCache(tagName, attributes) ?
+     cache[tagName].cloneNode(false) : document.createElement(tagName);
+
+    return Element.writeAttribute(node, attributes);
   };
+
   Object.extend(global.Element, element || { });
   if (element) global.Element.prototype = element.prototype;
+
 })(this);
 
-Element.cache = { };
 Element.idCounter = 1;
+Element.cache = { };
+
+Element._purgeElement = function(element) {
+  var uid = element._prototypeUID;
+  if (uid) {
+    Element.stopObserving(element);
+    element._prototypeUID = void 0;
+    delete Element.Storage[uid];
+  }
+}
 
 Element.Methods = {
   visible: function(element) {
@@ -1798,7 +1926,6 @@ Element.Methods = {
     return element;
   },
 
-
   hide: function(element) {
     element = $(element);
     element.style.display = 'none';
@@ -1844,6 +1971,21 @@ Element.Methods = {
       }
     })();
 
+    var LINK_ELEMENT_INNERHTML_BUGGY = (function() {
+      try {
+        var el = document.createElement('div');
+        el.innerHTML = "<link>";
+        var isBuggy = (el.childNodes.length === 0);
+        el = null;
+        return isBuggy;
+      } catch(e) {
+        return true;
+      }
+    })();
+
+    var ANY_INNERHTML_BUGGY = SELECT_ELEMENT_INNERHTML_BUGGY ||
+     TABLE_ELEMENT_INNERHTML_BUGGY || LINK_ELEMENT_INNERHTML_BUGGY;
+
     var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () {
       var s = document.createElement("script"),
           isBuggy = false;
@@ -1858,8 +2000,14 @@ Element.Methods = {
       return isBuggy;
     })();
 
+
     function update(element, content) {
       element = $(element);
+      var purgeElement = Element._purgeElement;
+
+      var descendants = element.getElementsByTagName('*'),
+       i = descendants.length;
+      while (i--) purgeElement(descendants[i]);
 
       if (content && content.toElement)
         content = content.toElement();
@@ -1876,7 +2024,7 @@ Element.Methods = {
         return element;
       }
 
-      if (SELECT_ELEMENT_INNERHTML_BUGGY || TABLE_ELEMENT_INNERHTML_BUGGY) {
+      if (ANY_INNERHTML_BUGGY) {
         if (tagName in Element._insertionTranslations.tags) {
           while (element.firstChild) {
             element.removeChild(element.firstChild);
@@ -1885,6 +2033,12 @@ Element.Methods = {
             .each(function(node) {
               element.appendChild(node)
             });
+        } else if (LINK_ELEMENT_INNERHTML_BUGGY && Object.isString(content) && content.indexOf('<link') > -1) {
+          while (element.firstChild) {
+            element.removeChild(element.firstChild);
+          }
+          var nodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts(), true);
+          nodes.each(function(node) { element.appendChild(node) });
         }
         else {
           element.innerHTML = content.stripScripts();
@@ -1967,19 +2121,26 @@ Element.Methods = {
     element = $(element);
     var result = '<' + element.tagName.toLowerCase();
     $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
+      var property = pair.first(),
+          attribute = pair.last(),
+          value = (element[property] || '').toString();
       if (value) result += ' ' + attribute + '=' + value.inspect(true);
     });
     return result + '>';
   },
 
-  recursivelyCollect: function(element, property) {
+  recursivelyCollect: function(element, property, maximumLength) {
     element = $(element);
+    maximumLength = maximumLength || -1;
     var elements = [];
-    while (element = element[property])
+
+    while (element = element[property]) {
       if (element.nodeType == 1)
         elements.push(Element.extend(element));
+      if (elements.length == maximumLength)
+        break;
+    }
+
     return elements;
   },
 
@@ -1998,13 +2159,17 @@ Element.Methods = {
   },
 
   immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
+    var results = [], child = $(element).firstChild;
+    while (child) {
+      if (child.nodeType === 1) {
+        results.push(Element.extend(child));
+      }
+      child = child.nextSibling;
+    }
+    return results;
   },
 
-  previousSiblings: function(element) {
+  previousSiblings: function(element, maximumLength) {
     return Element.recursivelyCollect(element, 'previousSibling');
   },
 
@@ -2019,9 +2184,10 @@ Element.Methods = {
   },
 
   match: function(element, selector) {
+    element = $(element);
     if (Object.isString(selector))
-      selector = new Selector(selector);
-    return selector.match($(element));
+      return Prototype.Selector.match(element, selector);
+    return selector.match(element);
   },
 
   up: function(element, expression, index) {
@@ -2029,7 +2195,7 @@ Element.Methods = {
     if (arguments.length == 1) return $(element.parentNode);
     var ancestors = Element.ancestors(element);
     return Object.isNumber(expression) ? ancestors[expression] :
-      Selector.findElement(ancestors, expression, index);
+      Prototype.Selector.find(ancestors, expression, index);
   },
 
   down: function(element, expression, index) {
@@ -2041,29 +2207,40 @@ Element.Methods = {
 
   previous: function(element, expression, index) {
     element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = Element.previousSiblings(element);
-    return Object.isNumber(expression) ? previousSiblings[expression] :
-      Selector.findElement(previousSiblings, expression, index);
+    if (Object.isNumber(expression)) index = expression, expression = false;
+    if (!Object.isNumber(index)) index = 0;
+
+    if (expression) {
+      return Prototype.Selector.find(element.previousSiblings(), expression, index);
+    } else {
+      return element.recursivelyCollect("previousSibling", index + 1)[index];
+    }
   },
 
   next: function(element, expression, index) {
     element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = Element.nextSiblings(element);
-    return Object.isNumber(expression) ? nextSiblings[expression] :
-      Selector.findElement(nextSiblings, expression, index);
+    if (Object.isNumber(expression)) index = expression, expression = false;
+    if (!Object.isNumber(index)) index = 0;
+
+    if (expression) {
+      return Prototype.Selector.find(element.nextSiblings(), expression, index);
+    } else {
+      var maximumLength = Object.isNumber(index) ? index + 1 : 1;
+      return element.recursivelyCollect("nextSibling", index + 1)[index];
+    }
   },
 
 
   select: function(element) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return Selector.findChildElements(element, args);
+    element = $(element);
+    var expressions = Array.prototype.slice.call(arguments, 1).join(', ');
+    return Prototype.Selector.select(expressions, element);
   },
 
   adjacent: function(element) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return Selector.findChildElements(element.parentNode, args).without(element);
+    element = $(element);
+    var expressions = Array.prototype.slice.call(arguments, 1).join(', ');
+    return Prototype.Selector.select(expressions, element.parentNode).without(element);
   },
 
   identify: function(element) {
@@ -2227,28 +2404,6 @@ Element.Methods = {
     return element;
   },
 
-  getDimensions: function(element) {
-    element = $(element);
-    var display = Element.getStyle(element, 'display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    if (originalPosition != 'fixed') // Switching fixed to absolute causes issues in Safari
-      els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
   makePositioned: function(element) {
     element = $(element);
     var pos = Element.getStyle(element, 'position');
@@ -2293,114 +2448,6 @@ Element.Methods = {
     return element;
   },
 
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (element.tagName.toUpperCase() == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p !== 'static') break;
-      }
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (Element.getStyle(element, 'position') == 'absolute') return element;
-
-    var offsets = Element.positionedOffset(element);
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-    return element;
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (Element.getStyle(element, 'position') == 'relative') return element;
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-    return element;
-  },
-
-  cumulativeScrollOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  getOffsetParent: function(element) {
-    if (element.offsetParent) return $(element.offsetParent);
-    if (element == document.body) return $(element);
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return $(element);
-
-    return $(document.body);
-  },
-
-  viewportOffset: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      if (element.offsetParent == document.body &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return Element._returnOffset(valueL, valueT);
-  },
-
   clonePosition: function(element, source) {
     var options = Object.extend({
       setLeft:    true,
@@ -2412,11 +2459,10 @@ Element.Methods = {
     }, arguments[2] || { });
 
     source = $(source);
-    var p = Element.viewportOffset(source);
+    var p = Element.viewportOffset(source), delta = [0, 0], parent = null;
 
     element = $(element);
-    var delta = [0, 0];
-    var parent = null;
+
     if (Element.getStyle(element, 'position') == 'absolute') {
       parent = Element.getOffsetParent(element);
       delta = Element.viewportOffset(parent);
@@ -2455,8 +2501,6 @@ if (Prototype.Browser.Opera) {
   Element.Methods.getStyle = Element.Methods.getStyle.wrap(
     function(proceed, element, style) {
       switch (style) {
-        case 'left': case 'top': case 'right': case 'bottom':
-          if (proceed(element, 'position') === 'static') return null;
         case 'height': case 'width':
           if (!Element.visible(element)) return null;
 
@@ -2492,47 +2536,6 @@ if (Prototype.Browser.Opera) {
 }
 
 else if (Prototype.Browser.IE) {
-  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
-    function(proceed, element) {
-      element = $(element);
-      try { element.offsetParent }
-      catch(e) { return $(document.body) }
-      var position = element.getStyle('position');
-      if (position !== 'static') return proceed(element);
-      element.setStyle({ position: 'relative' });
-      var value = proceed(element);
-      element.setStyle({ position: position });
-      return value;
-    }
-  );
-
-  $w('positionedOffset viewportOffset').each(function(method) {
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        try { element.offsetParent }
-        catch(e) { return Element._returnOffset(0,0) }
-        var position = element.getStyle('position');
-        if (position !== 'static') return proceed(element);
-        var offsetParent = element.getOffsetParent();
-        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
-          offsetParent.setStyle({ zoom: 1 });
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-  });
-
-  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
-    function(proceed, element) {
-      try { element.offsetParent }
-      catch(e) { return Element._returnOffset(0,0) }
-      return proceed(element);
-    }
-  );
-
   Element.Methods.getStyle = function(element, style) {
     element = $(element);
     style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
@@ -2576,10 +2579,9 @@ else if (Prototype.Browser.IE) {
 
   Element._attributeTranslations = (function(){
 
-    var classProp = 'className';
-    var forProp = 'for';
-
-    var el = document.createElement('div');
+    var classProp = 'className',
+        forProp = 'for',
+        el = document.createElement('div');
 
     el.setAttribute(classProp, 'x');
 
@@ -2622,10 +2624,9 @@ else if (Prototype.Browser.IE) {
           },
           _getEv: (function(){
 
-            var el = document.createElement('div');
+            var el = document.createElement('div'), f;
             el.onclick = Prototype.emptyFunction;
             var value = el.getAttribute('onclick');
-            var f;
 
             if (String(value).indexOf('{') > -1) {
               f = function(element, attribute) {
@@ -2753,7 +2754,7 @@ else if (Prototype.Browser.WebKit) {
       (value < 0.00001) ? 0 : value;
 
     if (value == 1)
-      if(element.tagName.toUpperCase() == 'IMG' && element.width) {
+      if (element.tagName.toUpperCase() == 'IMG' && element.width) {
         element.width++; element.width--;
       } else try {
         var n = document.createTextNode(' ');
@@ -2763,20 +2764,6 @@ else if (Prototype.Browser.WebKit) {
 
     return element;
   };
-
-  Element.Methods.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return Element._returnOffset(valueL, valueT);
-  };
 }
 
 if ('outerHTML' in document.documentElement) {
@@ -2793,8 +2780,8 @@ if ('outerHTML' in document.documentElement) {
     var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
 
     if (Element._insertionTranslations.tags[tagName]) {
-      var nextSibling = element.next();
-      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      var nextSibling = element.next(),
+          fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
       parent.removeChild(element);
       if (nextSibling)
         fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
@@ -2815,12 +2802,27 @@ Element._returnOffset = function(l, t) {
   return result;
 };
 
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-  if (t) {
-    div.innerHTML = t[0] + html + t[1];
-    t[2].times(function() { div = div.firstChild });
-  } else div.innerHTML = html;
+Element._getContentFromAnonymousElement = function(tagName, html, force) {
+  var div = new Element('div'),
+      t = Element._insertionTranslations.tags[tagName];
+
+  var workaround = false;
+  if (t) workaround = true;
+  else if (force) {
+    workaround = true;
+    t = ['', '', 0];
+  }
+
+  if (workaround) {
+    div.innerHTML = '&nbsp;' + t[0] + html + t[1];
+    div.removeChild(div.firstChild);
+    for (var i = t[2]; i--; ) {
+      div = div.firstChild;
+    }
+  }
+  else {
+    div.innerHTML = html;
+  }
   return $A(div.childNodes);
 };
 
@@ -2877,7 +2879,7 @@ Object.extend(Element, Element.Methods);
 
   div = null;
 
-})(document.createElement('div'))
+})(document.createElement('div'));
 
 Element.extend = (function() {
 
@@ -2885,8 +2887,8 @@ Element.extend = (function() {
     if (typeof window.Element != 'undefined') {
       var proto = window.Element.prototype;
       if (proto) {
-        var id = '_' + (Math.random()+'').slice(2);
-        var el = document.createElement(tagName);
+        var id = '_' + (Math.random()+'').slice(2),
+            el = document.createElement(tagName);
         proto[id] = 'x';
         var isBuggy = (el[id] !== 'x');
         delete proto[id];
@@ -2953,10 +2955,14 @@ Element.extend = (function() {
   return extend;
 })();
 
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
-};
+if (document.documentElement.hasAttribute) {
+  Element.hasAttribute = function(element, attribute) {
+    return element.hasAttribute(attribute);
+  };
+}
+else {
+  Element.hasAttribute = Element.Methods.Simulated.hasAttribute;
+}
 
 Element.addMethods = function(methods) {
   var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
@@ -2968,7 +2974,8 @@ Element.addMethods = function(methods) {
       "FORM":     Object.clone(Form.Methods),
       "INPUT":    Object.clone(Form.Element.Methods),
       "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
+      "TEXTAREA": Object.clone(Form.Element.Methods),
+      "BUTTON":   Object.clone(Form.Element.Methods)
     });
   }
 
@@ -3020,8 +3027,9 @@ Element.addMethods = function(methods) {
     klass = 'HTML' + tagName.capitalize() + 'Element';
     if (window[klass]) return window[klass];
 
-    var element = document.createElement(tagName);
-    var proto = element['__proto__'] || element.constructor.prototype;
+    var element = document.createElement(tagName),
+        proto = element['__proto__'] || element.constructor.prototype;
+
     element = null;
     return proto;
   }
@@ -3104,8 +3112,8 @@ Element.addMethods({
       uid = 0;
     } else {
       if (typeof element._prototypeUID === "undefined")
-        element._prototypeUID = [Element.Storage.UID++];
-      uid = element._prototypeUID[0];
+        element._prototypeUID = Element.Storage.UID++;
+      uid = element._prototypeUID;
     }
 
     if (!Element.Storage[uid])
@@ -3150,770 +3158,1808 @@ Element.addMethods({
       }
     }
     return Element.extend(clone);
-  }
-});
-/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
- * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
- * license.  Please see http://www.yui-ext.com/ for more information. */
-
-var Selector = Class.create({
-  initialize: function(expression) {
-    this.expression = expression.strip();
-
-    if (this.shouldUseSelectorsAPI()) {
-      this.mode = 'selectorsAPI';
-    } else if (this.shouldUseXPath()) {
-      this.mode = 'xpath';
-      this.compileXPathMatcher();
-    } else {
-      this.mode = "normal";
-      this.compileMatcher();
-    }
-
   },
 
-  shouldUseXPath: (function() {
+  purge: function(element) {
+    if (!(element = $(element))) return;
+    var purgeElement = Element._purgeElement;
 
-    var IS_DESCENDANT_SELECTOR_BUGGY = (function(){
-      var isBuggy = false;
-      if (document.evaluate && window.XPathResult) {
-        var el = document.createElement('div');
-        el.innerHTML = '<ul><li></li></ul><div><ul><li></li></ul></div>';
+    purgeElement(element);
 
-        var xpath = ".//*[local-name()='ul' or local-name()='UL']" +
-          "//*[local-name()='li' or local-name()='LI']";
+    var descendants = element.getElementsByTagName('*'),
+     i = descendants.length;
 
-        var result = document.evaluate(xpath, el, null,
-          XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    while (i--) purgeElement(descendants[i]);
 
-        isBuggy = (result.snapshotLength !== 2);
-        el = null;
+    return null;
+  }
+});
+
+(function() {
+
+  function toDecimal(pctString) {
+    var match = pctString.match(/^(\d+)%?$/i);
+    if (!match) return null;
+    return (Number(match[1]) / 100);
+  }
+
+  function getPixelValue(value, property, context) {
+    var element = null;
+    if (Object.isElement(value)) {
+      element = value;
+      value = element.getStyle(property);
+    }
+
+    if (value === null) {
+      return null;
+    }
+
+    if ((/^(?:-)?\d+(\.\d+)?(px)?$/i).test(value)) {
+      return window.parseFloat(value);
+    }
+
+    var isPercentage = value.include('%'), isViewport = (context === document.viewport);
+
+    if (/\d/.test(value) && element && element.runtimeStyle && !(isPercentage && isViewport)) {
+      var style = element.style.left, rStyle = element.runtimeStyle.left;
+      element.runtimeStyle.left = element.currentStyle.left;
+      element.style.left = value || 0;
+      value = element.style.pixelLeft;
+      element.style.left = style;
+      element.runtimeStyle.left = rStyle;
+
+      return value;
+    }
+
+    if (element && isPercentage) {
+      context = context || element.parentNode;
+      var decimal = toDecimal(value);
+      var whole = null;
+      var position = element.getStyle('position');
+
+      var isHorizontal = property.include('left') || property.include('right') ||
+       property.include('width');
+
+      var isVertical =  property.include('top') || property.include('bottom') ||
+        property.include('height');
+
+      if (context === document.viewport) {
+        if (isHorizontal) {
+          whole = document.viewport.getWidth();
+        } else if (isVertical) {
+          whole = document.viewport.getHeight();
+        }
+      } else {
+        if (isHorizontal) {
+          whole = $(context).measure('width');
+        } else if (isVertical) {
+          whole = $(context).measure('height');
+        }
       }
-      return isBuggy;
-    })();
 
-    return function() {
-      if (!Prototype.BrowserFeatures.XPath) return false;
-
-      var e = this.expression;
-
-      if (Prototype.Browser.WebKit &&
-       (e.include("-of-type") || e.include(":empty")))
-        return false;
-
-      if ((/(\[[\w-]*?:|:checked)/).test(e))
-        return false;
-
-      if (IS_DESCENDANT_SELECTOR_BUGGY) return false;
-
-      return true;
+      return (whole === null) ? 0 : whole * decimal;
     }
 
-  })(),
+    return 0;
+  }
 
-  shouldUseSelectorsAPI: function() {
-    if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
-
-    if (Selector.CASE_INSENSITIVE_CLASS_NAMES) return false;
-
-    if (!Selector._div) Selector._div = new Element('div');
-
-    try {
-      Selector._div.querySelector(this.expression);
-    } catch(e) {
-      return false;
+  function toCSSPixels(number) {
+    if (Object.isString(number) && number.endsWith('px')) {
+      return number;
     }
+    return number + 'px';
+  }
 
+  function isDisplayed(element) {
+    var originalElement = element;
+    while (element && element.parentNode) {
+      var display = element.getStyle('display');
+      if (display === 'none') {
+        return false;
+      }
+      element = $(element.parentNode);
+    }
     return true;
-  },
-
-  compileMatcher: function() {
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m, len = ps.length, name;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e];
-      return;
-    }
-
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i = 0; i<len; i++) {
-        p = ps[i].re;
-        name = ps[i].name;
-        if (m = e.match(p)) {
-          this.matcher.push(Object.isFunction(c[name]) ? c[name](m) :
-            new Template(c[name]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le, m, len = ps.length, name;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i = 0; i<len; i++) {
-        name = ps[i].name;
-        if (m = e.match(ps[i].re)) {
-          this.matcher.push(Object.isFunction(x[name]) ? x[name](m) :
-            new Template(x[name]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    var e = this.expression, results;
-
-    switch (this.mode) {
-      case 'selectorsAPI':
-        if (root !== document) {
-          var oldId = root.id, id = $(root).identify();
-          id = id.replace(/([\.:])/g, "\\$1");
-          e = "#" + id + " " + e;
-        }
-
-        results = $A(root.querySelectorAll(e)).map(Element.extend);
-        root.id = oldId;
-
-        return results;
-      case 'xpath':
-        return document._getElementsByXPath(this.xpath, root);
-      default:
-       return this.matcher(root);
-    }
-  },
-
-  match: function(element) {
-    this.tokens = [];
-
-    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
-    var le, p, m, len = ps.length, name;
-
-    while (e && le !== e && (/\S/).test(e)) {
-      le = e;
-      for (var i = 0; i<len; i++) {
-        p = ps[i].re;
-        name = ps[i].name;
-        if (m = e.match(p)) {
-          if (as[name]) {
-            this.tokens.push([name, Object.clone(m)]);
-            e = e.replace(m[0], '');
-          } else {
-            return this.findElements(document).include(element);
-          }
-        }
-      }
-    }
-
-    var match = true, name, matches;
-    for (var i = 0, token; token = this.tokens[i]; i++) {
-      name = token[0], matches = token[1];
-      if (!Selector.assertions[name](element, matches)) {
-        match = false; break;
-      }
-    }
-
-    return match;
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
   }
-});
 
-if (Prototype.BrowserFeatures.SelectorsAPI &&
- document.compatMode === 'BackCompat') {
-  Selector.CASE_INSENSITIVE_CLASS_NAMES = (function(){
-    var div = document.createElement('div'),
-     span = document.createElement('span');
-
-    div.id = "prototype_test_id";
-    span.className = 'Test';
-    div.appendChild(span);
-    var isIgnored = (div.querySelector('#prototype_test_id .test') !== null);
-    div = span = null;
-    return isIgnored;
-  })();
-}
-
-Object.extend(Selector, {
-  _cache: { },
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: function(m) {
-      m[1] = m[1].toLowerCase();
-      return new Template("[@#{1}]").evaluate(m);
-    },
-    attr: function(m) {
-      m[1] = m[1].toLowerCase();
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (Object.isFunction(h)) return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0)]",
-      'checked':     "[@checked]",
-      'disabled':    "[(@disabled) and (@type!='hidden')]",
-      'enabled':     "[not(@disabled) and (@type!='hidden')]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, v, len = p.length, name;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i = 0; i<len; i++) {
-            name = p[i].name
-            if (m = e.match(p[i].re)) {
-              v = Object.isFunction(x[name]) ? x[name](m) : new Template(x[name]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
+  var hasLayout = Prototype.K;
+  if ('currentStyle' in document.documentElement) {
+    hasLayout = function(element) {
+      if (!element.currentStyle.hasLayout) {
+        element.style.zoom = 1;
       }
-    }
-  },
+      return element;
+    };
+  }
 
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
-    className:    'n = h.className(n, r, "#{1}", c);    c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);           c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
-    },
-    pseudo: function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
+  function cssNameFor(key) {
+    if (key.include('border')) key = key + '-width';
+    return key.camelize();
+  }
 
-  patterns: [
-    { name: 'laterSibling', re: /^\s*~\s*/ },
-    { name: 'child',        re: /^\s*>\s*/ },
-    { name: 'adjacent',     re: /^\s*\+\s*/ },
-    { name: 'descendant',   re: /^\s/ },
+  Element.Layout = Class.create(Hash, {
+    initialize: function($super, element, preCompute) {
+      $super();
+      this.element = $(element);
 
-    { name: 'tagName',      re: /^\s*(\*|[\w\-]+)(\b|$)?/ },
-    { name: 'id',           re: /^#([\w\-\*]+)(\b|$)/ },
-    { name: 'className',    re: /^\.([\w\-\*]+)(\b|$)/ },
-    { name: 'pseudo',       re: /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/ },
-    { name: 'attrPresence', re: /^\[((?:[\w-]+:)?[\w-]+)\]/ },
-    { name: 'attr',         re: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/ }
-  ],
+      Element.Layout.PROPERTIES.each( function(property) {
+        this._set(property, null);
+      }, this);
 
-  assertions: {
-    tagName: function(element, matches) {
-      return matches[1].toUpperCase() == element.tagName.toUpperCase();
-    },
-
-    className: function(element, matches) {
-      return Element.hasClassName(element, matches[1]);
-    },
-
-    id: function(element, matches) {
-      return element.id === matches[1];
-    },
-
-    attrPresence: function(element, matches) {
-      return Element.hasAttribute(element, matches[1]);
-    },
-
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-      return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
-    }
-  },
-
-  handlers: {
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    mark: function(nodes) {
-      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = _true;
-      return nodes;
-    },
-
-    unmark: (function(){
-
-      var PROPERTIES_ATTRIBUTES_MAP = (function(){
-        var el = document.createElement('div'),
-            isBuggy = false,
-            propName = '_countedByPrototype',
-            value = 'x'
-        el[propName] = value;
-        isBuggy = (el.getAttribute(propName) === value);
-        el = null;
-        return isBuggy;
-      })();
-
-      return PROPERTIES_ATTRIBUTES_MAP ?
-        function(nodes) {
-          for (var i = 0, node; node = nodes[i]; i++)
-            node.removeAttribute('_countedByPrototype');
-          return nodes;
-        } :
-        function(nodes) {
-          for (var i = 0, node; node = nodes[i]; i++)
-            node._countedByPrototype = void 0;
-          return nodes;
-        }
-    })(),
-
-    index: function(parentNode, reverse, ofType) {
-      parentNode._countedByPrototype = Prototype.emptyFunction;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
+      if (preCompute) {
+        this._preComputing = true;
+        this._begin();
+        Element.Layout.PROPERTIES.each( this._compute, this );
+        this._end();
+        this._preComputing = false;
       }
     },
 
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (typeof (n = nodes[i])._countedByPrototype == 'undefined') {
-          n._countedByPrototype = Prototype.emptyFunction;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
+    _set: function(property, value) {
+      return Hash.prototype.set.call(this, property, value);
     },
 
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
+    set: function(property, value) {
+      throw "Properties of Element.Layout are read-only.";
     },
 
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
+    get: function($super, property) {
+      var value = $super(property);
+      return value === null ? this._compute(property) : value;
     },
 
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
+    _begin: function() {
+      if (this._prepared) return;
 
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    tagName: function(nodes, root, tagName, combinator) {
-      var uTagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() === uTagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-
-      if (root == document) {
-        if (!targetNode) return [];
-        if (!nodes) return [targetNode];
-      } else {
-        if (!root.sourceIndex || root.sourceIndex < 1) {
-          var nodes = root.getElementsByTagName('*');
-          for (var j = 0, node; node = nodes[j]; j++) {
-            if (node.id === id) return [node];
-          }
-        }
+      var element = this.element;
+      if (isDisplayed(element)) {
+        this._prepared = true;
+        return;
       }
 
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
+      var originalStyles = {
+        position:   element.style.position   || '',
+        width:      element.style.width      || '',
+        visibility: element.style.visibility || '',
+        display:    element.style.display    || ''
+      };
+
+      element.store('prototype_original_styles', originalStyles);
+
+      var position = element.getStyle('position'),
+       width = element.getStyle('width');
+
+      if (width === "0px" || width === null) {
+        element.style.display = 'block';
+        width = element.getStyle('width');
       }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
 
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
+      var context = (position === 'fixed') ? document.viewport :
+       element.parentNode;
 
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
+      element.setStyle({
+        position:   'absolute',
+        visibility: 'hidden',
+        display:    'block'
       });
-    },
 
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._countedByPrototype) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
+      var positionedWidth = element.getStyle('width');
+
+      var newWidth;
+      if (width && (positionedWidth === width)) {
+        newWidth = getPixelValue(element, 'width', context);
+      } else if (position === 'absolute' || position === 'fixed') {
+        newWidth = getPixelValue(element, 'width', context);
+      } else {
+        var parent = element.parentNode, pLayout = $(parent).getLayout();
+
+        newWidth = pLayout.get('width') -
+         this.get('margin-left') -
+         this.get('border-left') -
+         this.get('padding-left') -
+         this.get('padding-right') -
+         this.get('border-right') -
+         this.get('margin-right');
       }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
+
+      element.setStyle({ width: newWidth + 'px' });
+
+      this._prepared = true;
+    },
+
+    _end: function() {
+      var element = this.element;
+      var originalStyles = element.retrieve('prototype_original_styles');
+      element.store('prototype_original_styles', null);
+      element.setStyle(originalStyles);
+      this._prepared = false;
+    },
+
+    _compute: function(property) {
+      var COMPUTATIONS = Element.Layout.COMPUTATIONS;
+      if (!(property in COMPUTATIONS)) {
+        throw "Property not found.";
       }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
+
+      return this._set(property, COMPUTATIONS[property].call(this, this.element));
     },
 
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (node.tagName == '!' || node.firstChild) continue;
-        results.push(node);
-      }
-      return results;
+    toObject: function() {
+      var args = $A(arguments);
+      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
+       args.join(' ').split(' ');
+      var obj = {};
+      keys.each( function(key) {
+        if (!Element.Layout.PROPERTIES.include(key)) return;
+        var value = this.get(key);
+        if (value != null) obj[key] = value;
+      }, this);
+      return obj;
     },
 
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._countedByPrototype) results.push(node);
-      h.unmark(exclusions);
-      return results;
+    toHash: function() {
+      var obj = this.toObject.apply(this, arguments);
+      return new Hash(obj);
     },
 
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled && (!node.type || node.type !== 'hidden'))
-          results.push(node);
-      return results;
+    toCSS: function() {
+      var args = $A(arguments);
+      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
+       args.join(' ').split(' ');
+      var css = {};
+
+      keys.each( function(key) {
+        if (!Element.Layout.PROPERTIES.include(key)) return;
+        if (Element.Layout.COMPOSITE_PROPERTIES.include(key)) return;
+
+        var value = this.get(key);
+        if (value != null) css[cssNameFor(key)] = value + 'px';
+      }, this);
+      return css;
     },
 
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
-    '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
-    '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
-     '-').include('-' + (v || "").toUpperCase() + '-'); }
-  },
-
-  split: function(expression) {
-    var expressions = [];
-    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    return expressions;
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = $$(expression), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._countedByPrototype) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (Object.isNumber(expression)) {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    expressions = Selector.split(expressions.join(','));
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
-});
-
-if (Prototype.Browser.IE) {
-  Object.extend(Selector.handlers, {
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        if (node.tagName !== "!") a.push(node);
-      return a;
+    inspect: function() {
+      return "#<Element.Layout>";
     }
   });
+
+  Object.extend(Element.Layout, {
+    PROPERTIES: $w('height width top left right bottom border-left border-right border-top border-bottom padding-left padding-right padding-top padding-bottom margin-top margin-bottom margin-left margin-right padding-box-width padding-box-height border-box-width border-box-height margin-box-width margin-box-height'),
+
+    COMPOSITE_PROPERTIES: $w('padding-box-width padding-box-height margin-box-width margin-box-height border-box-width border-box-height'),
+
+    COMPUTATIONS: {
+      'height': function(element) {
+        if (!this._preComputing) this._begin();
+
+        var bHeight = this.get('border-box-height');
+        if (bHeight <= 0) {
+          if (!this._preComputing) this._end();
+          return 0;
+        }
+
+        var bTop = this.get('border-top'),
+         bBottom = this.get('border-bottom');
+
+        var pTop = this.get('padding-top'),
+         pBottom = this.get('padding-bottom');
+
+        if (!this._preComputing) this._end();
+
+        return bHeight - bTop - bBottom - pTop - pBottom;
+      },
+
+      'width': function(element) {
+        if (!this._preComputing) this._begin();
+
+        var bWidth = this.get('border-box-width');
+        if (bWidth <= 0) {
+          if (!this._preComputing) this._end();
+          return 0;
+        }
+
+        var bLeft = this.get('border-left'),
+         bRight = this.get('border-right');
+
+        var pLeft = this.get('padding-left'),
+         pRight = this.get('padding-right');
+
+        if (!this._preComputing) this._end();
+
+        return bWidth - bLeft - bRight - pLeft - pRight;
+      },
+
+      'padding-box-height': function(element) {
+        var height = this.get('height'),
+         pTop = this.get('padding-top'),
+         pBottom = this.get('padding-bottom');
+
+        return height + pTop + pBottom;
+      },
+
+      'padding-box-width': function(element) {
+        var width = this.get('width'),
+         pLeft = this.get('padding-left'),
+         pRight = this.get('padding-right');
+
+        return width + pLeft + pRight;
+      },
+
+      'border-box-height': function(element) {
+        if (!this._preComputing) this._begin();
+        var height = element.offsetHeight;
+        if (!this._preComputing) this._end();
+        return height;
+      },
+
+      'border-box-width': function(element) {
+        if (!this._preComputing) this._begin();
+        var width = element.offsetWidth;
+        if (!this._preComputing) this._end();
+        return width;
+      },
+
+      'margin-box-height': function(element) {
+        var bHeight = this.get('border-box-height'),
+         mTop = this.get('margin-top'),
+         mBottom = this.get('margin-bottom');
+
+        if (bHeight <= 0) return 0;
+
+        return bHeight + mTop + mBottom;
+      },
+
+      'margin-box-width': function(element) {
+        var bWidth = this.get('border-box-width'),
+         mLeft = this.get('margin-left'),
+         mRight = this.get('margin-right');
+
+        if (bWidth <= 0) return 0;
+
+        return bWidth + mLeft + mRight;
+      },
+
+      'top': function(element) {
+        var offset = element.positionedOffset();
+        return offset.top;
+      },
+
+      'bottom': function(element) {
+        var offset = element.positionedOffset(),
+         parent = element.getOffsetParent(),
+         pHeight = parent.measure('height');
+
+        var mHeight = this.get('border-box-height');
+
+        return pHeight - mHeight - offset.top;
+      },
+
+      'left': function(element) {
+        var offset = element.positionedOffset();
+        return offset.left;
+      },
+
+      'right': function(element) {
+        var offset = element.positionedOffset(),
+         parent = element.getOffsetParent(),
+         pWidth = parent.measure('width');
+
+        var mWidth = this.get('border-box-width');
+
+        return pWidth - mWidth - offset.left;
+      },
+
+      'padding-top': function(element) {
+        return getPixelValue(element, 'paddingTop');
+      },
+
+      'padding-bottom': function(element) {
+        return getPixelValue(element, 'paddingBottom');
+      },
+
+      'padding-left': function(element) {
+        return getPixelValue(element, 'paddingLeft');
+      },
+
+      'padding-right': function(element) {
+        return getPixelValue(element, 'paddingRight');
+      },
+
+      'border-top': function(element) {
+        return getPixelValue(element, 'borderTopWidth');
+      },
+
+      'border-bottom': function(element) {
+        return getPixelValue(element, 'borderBottomWidth');
+      },
+
+      'border-left': function(element) {
+        return getPixelValue(element, 'borderLeftWidth');
+      },
+
+      'border-right': function(element) {
+        return getPixelValue(element, 'borderRightWidth');
+      },
+
+      'margin-top': function(element) {
+        return getPixelValue(element, 'marginTop');
+      },
+
+      'margin-bottom': function(element) {
+        return getPixelValue(element, 'marginBottom');
+      },
+
+      'margin-left': function(element) {
+        return getPixelValue(element, 'marginLeft');
+      },
+
+      'margin-right': function(element) {
+        return getPixelValue(element, 'marginRight');
+      }
+    }
+  });
+
+  if ('getBoundingClientRect' in document.documentElement) {
+    Object.extend(Element.Layout.COMPUTATIONS, {
+      'right': function(element) {
+        var parent = hasLayout(element.getOffsetParent());
+        var rect = element.getBoundingClientRect(),
+         pRect = parent.getBoundingClientRect();
+
+        return (pRect.right - rect.right).round();
+      },
+
+      'bottom': function(element) {
+        var parent = hasLayout(element.getOffsetParent());
+        var rect = element.getBoundingClientRect(),
+         pRect = parent.getBoundingClientRect();
+
+        return (pRect.bottom - rect.bottom).round();
+      }
+    });
+  }
+
+  Element.Offset = Class.create({
+    initialize: function(left, top) {
+      this.left = left.round();
+      this.top  = top.round();
+
+      this[0] = this.left;
+      this[1] = this.top;
+    },
+
+    relativeTo: function(offset) {
+      return new Element.Offset(
+        this.left - offset.left,
+        this.top  - offset.top
+      );
+    },
+
+    inspect: function() {
+      return "#<Element.Offset left: #{left} top: #{top}>".interpolate(this);
+    },
+
+    toString: function() {
+      return "[#{left}, #{top}]".interpolate(this);
+    },
+
+    toArray: function() {
+      return [this.left, this.top];
+    }
+  });
+
+  function getLayout(element, preCompute) {
+    return new Element.Layout(element, preCompute);
+  }
+
+  function measure(element, property) {
+    return $(element).getLayout().get(property);
+  }
+
+  function getDimensions(element) {
+    element = $(element);
+    var display = Element.getStyle(element, 'display');
+
+    if (display && display !== 'none') {
+      return { width: element.offsetWidth, height: element.offsetHeight };
+    }
+
+    var style = element.style;
+    var originalStyles = {
+      visibility: style.visibility,
+      position:   style.position,
+      display:    style.display
+    };
+
+    var newStyles = {
+      visibility: 'hidden',
+      display:    'block'
+    };
+
+    if (originalStyles.position !== 'fixed')
+      newStyles.position = 'absolute';
+
+    Element.setStyle(element, newStyles);
+
+    var dimensions = {
+      width:  element.offsetWidth,
+      height: element.offsetHeight
+    };
+
+    Element.setStyle(element, originalStyles);
+
+    return dimensions;
+  }
+
+  function getOffsetParent(element) {
+    element = $(element);
+
+    if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
+      return $(document.body);
+
+    var isInline = (Element.getStyle(element, 'display') === 'inline');
+    if (!isInline && element.offsetParent) return $(element.offsetParent);
+
+    while ((element = element.parentNode) && element !== document.body) {
+      if (Element.getStyle(element, 'position') !== 'static') {
+        return isHtml(element) ? $(document.body) : $(element);
+      }
+    }
+
+    return $(document.body);
+  }
+
+
+  function cumulativeOffset(element) {
+    element = $(element);
+    var valueT = 0, valueL = 0;
+    if (element.parentNode) {
+      do {
+        valueT += element.offsetTop  || 0;
+        valueL += element.offsetLeft || 0;
+        element = element.offsetParent;
+      } while (element);
+    }
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function positionedOffset(element) {
+    element = $(element);
+
+    var layout = element.getLayout();
+
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (isBody(element)) break;
+        var p = Element.getStyle(element, 'position');
+        if (p !== 'static') break;
+      }
+    } while (element);
+
+    valueL -= layout.get('margin-top');
+    valueT -= layout.get('margin-left');
+
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function cumulativeScrollOffset(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function viewportOffset(forElement) {
+    element = $(element);
+    var valueT = 0, valueL = 0, docBody = document.body;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == docBody &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (element != docBody) {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+    return new Element.Offset(valueL, valueT);
+  }
+
+  function absolutize(element) {
+    element = $(element);
+
+    if (Element.getStyle(element, 'position') === 'absolute') {
+      return element;
+    }
+
+    var offsetParent = getOffsetParent(element);
+    var eOffset = element.viewportOffset(),
+     pOffset = offsetParent.viewportOffset();
+
+    var offset = eOffset.relativeTo(pOffset);
+    var layout = element.getLayout();
+
+    element.store('prototype_absolutize_original_styles', {
+      left:   element.getStyle('left'),
+      top:    element.getStyle('top'),
+      width:  element.getStyle('width'),
+      height: element.getStyle('height')
+    });
+
+    element.setStyle({
+      position: 'absolute',
+      top:    offset.top + 'px',
+      left:   offset.left + 'px',
+      width:  layout.get('width') + 'px',
+      height: layout.get('height') + 'px'
+    });
+
+    return element;
+  }
+
+  function relativize(element) {
+    element = $(element);
+    if (Element.getStyle(element, 'position') === 'relative') {
+      return element;
+    }
+
+    var originalStyles =
+     element.retrieve('prototype_absolutize_original_styles');
+
+    if (originalStyles) element.setStyle(originalStyles);
+    return element;
+  }
+
+  if (Prototype.Browser.IE) {
+    getOffsetParent = getOffsetParent.wrap(
+      function(proceed, element) {
+        element = $(element);
+
+        if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
+          return $(document.body);
+
+        var position = element.getStyle('position');
+        if (position !== 'static') return proceed(element);
+
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+
+    positionedOffset = positionedOffset.wrap(function(proceed, element) {
+      element = $(element);
+      if (!element.parentNode) return new Element.Offset(0, 0);
+      var position = element.getStyle('position');
+      if (position !== 'static') return proceed(element);
+
+      var offsetParent = element.getOffsetParent();
+      if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+        hasLayout(offsetParent);
+
+      element.setStyle({ position: 'relative' });
+      var value = proceed(element);
+      element.setStyle({ position: position });
+      return value;
+    });
+  } else if (Prototype.Browser.Webkit) {
+    cumulativeOffset = function(element) {
+      element = $(element);
+      var valueT = 0, valueL = 0;
+      do {
+        valueT += element.offsetTop  || 0;
+        valueL += element.offsetLeft || 0;
+        if (element.offsetParent == document.body)
+          if (Element.getStyle(element, 'position') == 'absolute') break;
+
+        element = element.offsetParent;
+      } while (element);
+
+      return new Element.Offset(valueL, valueT);
+    };
+  }
+
+
+  Element.addMethods({
+    getLayout:              getLayout,
+    measure:                measure,
+    getDimensions:          getDimensions,
+    getOffsetParent:        getOffsetParent,
+    cumulativeOffset:       cumulativeOffset,
+    positionedOffset:       positionedOffset,
+    cumulativeScrollOffset: cumulativeScrollOffset,
+    viewportOffset:         viewportOffset,
+    absolutize:             absolutize,
+    relativize:             relativize
+  });
+
+  function isBody(element) {
+    return element.nodeName.toUpperCase() === 'BODY';
+  }
+
+  function isHtml(element) {
+    return element.nodeName.toUpperCase() === 'HTML';
+  }
+
+  function isDocument(element) {
+    return element.nodeType === Node.DOCUMENT_NODE;
+  }
+
+  function isDetached(element) {
+    return element !== document.body &&
+     !Element.descendantOf(element, document.body);
+  }
+
+  if ('getBoundingClientRect' in document.documentElement) {
+    Element.addMethods({
+      viewportOffset: function(element) {
+        element = $(element);
+        if (isDetached(element)) return new Element.Offset(0, 0);
+
+        var rect = element.getBoundingClientRect(),
+         docEl = document.documentElement;
+        return new Element.Offset(rect.left - docEl.clientLeft,
+         rect.top - docEl.clientTop);
+      }
+    });
+  }
+})();
+window.$$ = function() {
+  var expression = $A(arguments).join(', ');
+  return Prototype.Selector.select(expression, document);
+};
+
+Prototype.Selector = (function() {
+
+  function select() {
+    throw new Error('Method "Prototype.Selector.select" must be defined.');
+  }
+
+  function match() {
+    throw new Error('Method "Prototype.Selector.match" must be defined.');
+  }
+
+  function find(elements, expression, index) {
+    index = index || 0;
+    var match = Prototype.Selector.match, length = elements.length, matchIndex = 0, i;
+
+    for (i = 0; i < length; i++) {
+      if (match(elements[i], expression) && index == matchIndex++) {
+        return Element.extend(elements[i]);
+      }
+    }
+  }
+
+  function extendElements(elements) {
+    for (var i = 0, length = elements.length; i < length; i++) {
+      Element.extend(elements[i]);
+    }
+    return elements;
+  }
+
+
+  var K = Prototype.K;
+
+  return {
+    select: select,
+    match: match,
+    find: find,
+    extendElements: (Element.extend === K) ? K : extendElements,
+    extendElement: Element.extend
+  };
+})();
+Prototype._original_property = window.Sizzle;
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+[0, 0].sort(function(){
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	var origContext = context = context || document;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context),
+		soFar = selector;
+
+	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
+		soFar = m[3];
+
+		parts.push( m[1] );
+
+		if ( m[2] ) {
+			extra = m[3];
+			break;
+		}
+	}
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] )
+					selector += parts.shift();
+
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+			var ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			var ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				var cur = parts.pop(), pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		throw "Syntax error, unrecognized expression: " + (cur || selector);
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context && context.nodeType === 1 ) {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set, match;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice(1,1);
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.match[ type ].exec( expr )) != null ) {
+				var filter = Expr.filter[ type ], found, item;
+				anyFound = false;
+
+				if ( curLoop == result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		if ( expr == old ) {
+			if ( anyFound == null ) {
+				throw "Syntax error, unrecognized expression: " + expr;
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part, isXML){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag && !isXML ) {
+				part = part.toUpperCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part, isXML){
+			var isPartStr = typeof part === "string";
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = isXML ? part : part.toUpperCase();
+
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName === part ? parent : false;
+					}
+				}
+			} else {
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( !/\W/.test(part) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context, isXML){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {
+						if ( !inplace )
+							result.push( elem );
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			for ( var i = 0; curLoop[i] === false; i++ ){}
+			return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+		},
+		CHILD: function(match){
+			if ( match[1] == "nth" ) {
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			match[0] = done++;
+
+			return match;
+		},
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return /h\d/i.test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";
+		},
+		input: function(elem){
+			return /input|select|textarea|button/i.test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 == i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 == i;
+		}
+	},
+	filter: {
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var i = 0, l = not.length; i < l; i++ ) {
+					if ( not[i] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+		},
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )  {
+						if ( node.nodeType === 1 ) return false;
+					}
+					if ( type == 'first') return true;
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )  {
+						if ( node.nodeType === 1 ) return false;
+					}
+					return true;
+				case 'nth':
+					var first = match[2], last = match[3];
+
+					if ( first == 1 && last == 0 ) {
+						return true;
+					}
+
+					var doneName = match[0],
+						parent = elem.parentNode;
+
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						}
+						parent.sizcache = doneName;
+					}
+
+					var diff = elem.nodeIndex - last;
+					if ( first == 0 ) {
+						return diff == 0;
+					} else {
+						return ( diff % first == 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value != check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source );
 }
 
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+
+	return array;
+};
+
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 );
+
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var i = 0, l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( var i = 0; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
 }
 
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( "sourceIndex" in document.documentElement ) {
+	sortOrder = function( a, b ) {
+		if ( !a.sourceIndex || !b.sourceIndex ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var ret = a.sourceIndex - b.sourceIndex;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( document.createRange ) {
+	sortOrder = function( a, b ) {
+		if ( !a.ownerDocument || !b.ownerDocument ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return 0;
+		}
+
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+(function(){
+	var form = document.createElement("div"),
+		id = "script" + (new Date).getTime();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	if ( !!document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) (function(){
+	var oldSizzle = Sizzle, div = document.createElement("div");
+	div.innerHTML = "<p class='TEST'></p>";
+
+	if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+		return;
+	}
+
+	Sizzle = function(query, context, extra, seed){
+		context = context || document;
+
+		if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+			try {
+				return makeArray( context.querySelectorAll(query), extra );
+			} catch(e){}
+		}
+
+		return oldSizzle(query, context, extra, seed);
+	};
+
+	for ( var prop in oldSizzle ) {
+		Sizzle[ prop ] = oldSizzle[ prop ];
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){
+	var div = document.createElement("div");
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	if ( div.getElementsByClassName("e").length === 0 )
+		return;
+
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 )
+		return;
+
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context, isXML) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	var sibDir = dir == "previousSibling" && !isXML;
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			if ( sibDir && elem.nodeType === 1 ){
+				elem.sizcache = doneName;
+				elem.sizset = i;
+			}
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	var sibDir = dir == "previousSibling" && !isXML;
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			if ( sibDir && elem.nodeType === 1 ) {
+				elem.sizcache = doneName;
+				elem.sizset = i;
+			}
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+var contains = document.compareDocumentPosition ?  function(a, b){
+	return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+	return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+		!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";
+};
+
+var posProcess = function(selector, context){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+
+window.Sizzle = Sizzle;
+
+})();
+
+;(function(engine) {
+  var extendElements = Prototype.Selector.extendElements;
+
+  function select(selector, scope) {
+    return extendElements(engine(selector, scope || document));
+  }
+
+  function match(element, selector) {
+    return engine.matches(selector, [element]).length == 1;
+  }
+
+  Prototype.Selector.engine = engine;
+  Prototype.Selector.select = select;
+  Prototype.Selector.match = match;
+})(Sizzle);
+
+window.Sizzle = Prototype._original_property;
+delete Prototype._original_property;
+
 var Form = {
   reset: function(form) {
     form = $(form);
@@ -3924,24 +4970,34 @@ var Form = {
   serializeElements: function(elements, options) {
     if (typeof options != 'object') options = { hash: !!options };
     else if (Object.isUndefined(options.hash)) options.hash = true;
-    var key, value, submitted = false, submit = options.submit;
+    var key, value, submitted = false, submit = options.submit, accumulator, initial;
 
-    var data = elements.inject({ }, function(result, element) {
+    if (options.hash) {
+      initial = {};
+      accumulator = function(result, key, value) {
+        if (key in result) {
+          if (!Object.isArray(result[key])) result[key] = [result[key]];
+          result[key].push(value);
+        } else result[key] = value;
+        return result;
+      };
+    } else {
+      initial = '';
+      accumulator = function(result, key, value) {
+        return result + (result ? '&' : '') + encodeURIComponent(key) + '=' + encodeURIComponent(value);
+      }
+    }
+
+    return elements.inject(initial, function(result, element) {
       if (!element.disabled && element.name) {
         key = element.name; value = $(element).getValue();
         if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
             submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          if (key in result) {
-            if (!Object.isArray(result[key])) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
+          result = accumulator(result, key, value);
         }
       }
       return result;
     });
-
-    return options.hash ? data : Object.toQueryString(data);
   }
 };
 
@@ -4008,7 +5064,8 @@ Form.Methods = {
 
   focusFirstElement: function(form) {
     form = $(form);
-    form.findFirstElement().activate();
+    var element = form.findFirstElement();
+    if (element) element.activate();
     return form;
   },
 
@@ -4115,67 +5172,77 @@ var $F = Form.Element.Methods.getValue;
 
 /*--------------------------------------------------------------------------*/
 
-Form.Element.Serializers = {
-  input: function(element, value) {
+Form.Element.Serializers = (function() {
+  function input(element, value) {
     switch (element.type.toLowerCase()) {
       case 'checkbox':
       case 'radio':
-        return Form.Element.Serializers.inputSelector(element, value);
+        return inputSelector(element, value);
       default:
-        return Form.Element.Serializers.textarea(element, value);
+        return valueSelector(element, value);
     }
-  },
+  }
 
-  inputSelector: function(element, value) {
-    if (Object.isUndefined(value)) return element.checked ? element.value : null;
+  function inputSelector(element, value) {
+    if (Object.isUndefined(value))
+      return element.checked ? element.value : null;
     else element.checked = !!value;
-  },
+  }
 
-  textarea: function(element, value) {
+  function valueSelector(element, value) {
     if (Object.isUndefined(value)) return element.value;
     else element.value = value;
-  },
+  }
 
-  select: function(element, value) {
+  function select(element, value) {
     if (Object.isUndefined(value))
-      return this[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    else {
-      var opt, currentValue, single = !Object.isArray(value);
-      for (var i = 0, length = element.length; i < length; i++) {
-        opt = element.options[i];
-        currentValue = this.optionValue(opt);
-        if (single) {
-          if (currentValue == value) {
-            opt.selected = true;
-            return;
-          }
+      return (element.type === 'select-one' ? selectOne : selectMany)(element);
+
+    var opt, currentValue, single = !Object.isArray(value);
+    for (var i = 0, length = element.length; i < length; i++) {
+      opt = element.options[i];
+      currentValue = this.optionValue(opt);
+      if (single) {
+        if (currentValue == value) {
+          opt.selected = true;
+          return;
         }
-        else opt.selected = value.include(currentValue);
       }
+      else opt.selected = value.include(currentValue);
     }
-  },
+  }
 
-  selectOne: function(element) {
+  function selectOne(element) {
     var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
+    return index >= 0 ? optionValue(element.options[index]) : null;
+  }
 
-  selectMany: function(element) {
+  function selectMany(element) {
     var values, length = element.length;
     if (!length) return null;
 
     for (var i = 0, values = []; i < length; i++) {
       var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
+      if (opt.selected) values.push(optionValue(opt));
     }
     return values;
-  },
-
-  optionValue: function(opt) {
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
   }
-};
+
+  function optionValue(opt) {
+    return Element.hasAttribute(opt, 'value') ? opt.value : opt.text;
+  }
+
+  return {
+    input:         input,
+    inputSelector: inputSelector,
+    textarea:      valueSelector,
+    select:        select,
+    selectOne:     selectOne,
+    selectMany:    selectMany,
+    optionValue:   optionValue,
+    button:        valueSelector
+  };
+})();
 
 /*--------------------------------------------------------------------------*/
 
@@ -4286,24 +5353,57 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
   var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl
     && 'onmouseleave' in docEl;
 
+
+
+  var isIELegacyEvent = function(event) { return false; };
+
+  if (window.attachEvent) {
+    if (window.addEventListener) {
+      isIELegacyEvent = function(event) {
+        return !(event instanceof window.Event);
+      };
+    } else {
+      isIELegacyEvent = function(event) { return true; };
+    }
+  }
+
   var _isButton;
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    _isButton = function(event, code) {
-      return event.button === buttonMap[code];
-    };
-  } else if (Prototype.Browser.WebKit) {
-    _isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
+
+  function _isButtonForDOMEvents(event, code) {
+    return event.which ? (event.which === code + 1) : (event.button === code);
+  }
+
+  var legacyButtonMap = { 0: 1, 1: 4, 2: 2 };
+  function _isButtonForLegacyEvents(event, code) {
+	try {
+    	return event.button === legacyButtonMap[code];
+	} catch(err) {
+		return false;
+	}
+  }
+
+  function _isButtonForWebKit(event, code) {
+    switch (code) {
+      case 0: return event.which == 1 && !event.metaKey;
+      case 1: return event.which == 2 || (event.which == 1 && event.metaKey);
+      case 2: return event.which == 3;
+      default: return false;
+    }
+  }
+
+  if (window.attachEvent) {
+    if (!window.addEventListener) {
+      _isButton = _isButtonForLegacyEvents;
+    } else {
+      _isButton = function(event, code) {
+        return isIELegacyEvent(event) ? _isButtonForLegacyEvents(event, code) :
+         _isButtonForDOMEvents(event, code);
       }
-    };
+    }
+  } else if (Prototype.Browser.WebKit) {
+    _isButton = _isButtonForWebKit;
   } else {
-    _isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
+    _isButton = _isButtonForDOMEvents;
   }
 
   function isLeftClick(event)   { return _isButton(event, 0) }
@@ -4333,9 +5433,14 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
 
   function findElement(event, expression) {
     var element = Event.element(event);
+
     if (!expression) return element;
-    var elements = [element].concat(element.ancestors());
-    return Selector.findElement(elements, expression, 0);
+    while (element) {
+      if (Object.isElement(element) && Prototype.Selector.match(element, expression)) {
+        return Element.extend(element);
+      }
+      element = element.parentNode;
+    }
   }
 
   function pointer(event) {
@@ -4369,49 +5474,59 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     event.stopped = true;
   }
 
-  Event.Methods = {
-    isLeftClick: isLeftClick,
-    isMiddleClick: isMiddleClick,
-    isRightClick: isRightClick,
 
-    element: element,
+  Event.Methods = {
+    isLeftClick:   isLeftClick,
+    isMiddleClick: isMiddleClick,
+    isRightClick:  isRightClick,
+
+    element:     element,
     findElement: findElement,
 
-    pointer: pointer,
+    pointer:  pointer,
     pointerX: pointerX,
     pointerY: pointerY,
 
     stop: stop
   };
 
-
   var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
     m[name] = Event.Methods[name].methodize();
     return m;
   });
 
-  if (Prototype.Browser.IE) {
+  if (window.attachEvent) {
     function _relatedTarget(event) {
       var element;
       switch (event.type) {
-        case 'mouseover': element = event.fromElement; break;
-        case 'mouseout':  element = event.toElement;   break;
-        default: return null;
+        case 'mouseover':
+        case 'mouseenter':
+          element = event.fromElement;
+          break;
+        case 'mouseout':
+        case 'mouseleave':
+          element = event.toElement;
+          break;
+        default:
+          return null;
       }
       return Element.extend(element);
     }
 
-    Object.extend(methods, {
+    var additionalMethods = {
       stopPropagation: function() { this.cancelBubble = true },
       preventDefault:  function() { this.returnValue = false },
       inspect: function() { return '[object Event]' }
-    });
+    };
 
     Event.extend = function(event, element) {
       if (!event) return false;
-      if (event._extendedByPrototype) return event;
 
+      if (!isIELegacyEvent(event)) return event;
+
+      if (event._extendedByPrototype) return event;
       event._extendedByPrototype = Prototype.emptyFunction;
+
       var pointer = Event.pointer(event);
 
       Object.extend(event, {
@@ -4421,12 +5536,18 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
         pageY:  pointer.y
       });
 
-      return Object.extend(event, methods);
+      Object.extend(event, methods);
+      Object.extend(event, additionalMethods);
+
+      return event;
     };
   } else {
+    Event.extend = Prototype.K;
+  }
+
+  if (window.addEventListener) {
     Event.prototype = window.Event.prototype || document.createEvent('HTMLEvents').__proto__;
     Object.extend(Event.prototype, methods);
-    Event.extend = Prototype.K;
   }
 
   function _createResponder(element, eventName, handler) {
@@ -4504,12 +5625,12 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     window.addEventListener('unload', Prototype.emptyFunction, false);
 
 
-  var _getDOMEventName = Prototype.K;
+  var _getDOMEventName = Prototype.K,
+      translations = { mouseenter: "mouseover", mouseleave: "mouseout" };
 
   if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) {
     _getDOMEventName = function(eventName) {
-      var translations = { mouseenter: "mouseover", mouseleave: "mouseout" };
-      return eventName in translations ? translations[eventName] : eventName;
+      return (translations[eventName] || eventName);
     };
   }
 
@@ -4525,7 +5646,7 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
         element.addEventListener("dataavailable", responder, false);
       else {
         element.attachEvent("ondataavailable", responder);
-        element.attachEvent("onfilterchange", responder);
+        element.attachEvent("onlosecapture", responder);
       }
     } else {
       var actualEventName = _getDOMEventName(eventName);
@@ -4543,46 +5664,44 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     element = $(element);
 
     var registry = Element.retrieve(element, 'prototype_event_registry');
+    if (!registry) return element;
 
-    if (Object.isUndefined(registry)) return element;
-
-    if (eventName && !handler) {
-      var responders = registry.get(eventName);
-
-      if (Object.isUndefined(responders)) return element;
-
-      responders.each( function(r) {
-        Element.stopObserving(element, eventName, r.handler);
-      });
-      return element;
-    } else if (!eventName) {
+    if (!eventName) {
       registry.each( function(pair) {
-        var eventName = pair.key, responders = pair.value;
-
-        responders.each( function(r) {
-          Element.stopObserving(element, eventName, r.handler);
-        });
+        var eventName = pair.key;
+        stopObserving(element, eventName);
       });
       return element;
     }
 
     var responders = registry.get(eventName);
+    if (!responders) return element;
 
-    if (!responders) return;
+    if (!handler) {
+      responders.each(function(r) {
+        stopObserving(element, eventName, r.handler);
+      });
+      return element;
+    }
 
-    var responder = responders.find( function(r) { return r.handler === handler; });
+    var i = responders.length, responder;
+    while (i--) {
+      if (responders[i].handler === handler) {
+        responder = responders[i];
+        break;
+      }
+    }
     if (!responder) return element;
 
-    var actualEventName = _getDOMEventName(eventName);
-
     if (eventName.include(':')) {
       if (element.removeEventListener)
         element.removeEventListener("dataavailable", responder, false);
       else {
         element.detachEvent("ondataavailable", responder);
-        element.detachEvent("onfilterchange",  responder);
+        element.detachEvent("onlosecapture", responder);
       }
     } else {
+      var actualEventName = _getDOMEventName(eventName);
       if (element.removeEventListener)
         element.removeEventListener(actualEventName, responder, false);
       else
@@ -4606,10 +5725,10 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     var event;
     if (document.createEvent) {
       event = document.createEvent('HTMLEvents');
-      event.initEvent('dataavailable', true, true);
+      event.initEvent('dataavailable', bubble, true);
     } else {
       event = document.createEventObject();
-      event.eventType = bubble ? 'ondataavailable' : 'onfilterchange';
+      event.eventType = bubble ? 'ondataavailable' : 'onlosecapture';
     }
 
     event.eventName = eventName;
@@ -4623,13 +5742,47 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     return Event.extend(event);
   }
 
+  Event.Handler = Class.create({
+    initialize: function(element, eventName, selector, callback) {
+      this.element   = $(element);
+      this.eventName = eventName;
+      this.selector  = selector;
+      this.callback  = callback;
+      this.handler   = this.handleEvent.bind(this);
+    },
+
+    start: function() {
+      Event.observe(this.element, this.eventName, this.handler);
+      return this;
+    },
+
+    stop: function() {
+      Event.stopObserving(this.element, this.eventName, this.handler);
+      return this;
+    },
+
+    handleEvent: function(event) {
+      var element = Event.findElement(event, this.selector);
+      if (element) this.callback.call(this.element, event, element);
+    }
+  });
+
+  function on(element, eventName, selector, callback) {
+    element = $(element);
+    if (Object.isFunction(selector) && Object.isUndefined(callback)) {
+      callback = selector, selector = null;
+    }
+
+    return new Event.Handler(element, eventName, selector, callback).start();
+  }
 
   Object.extend(Event, Event.Methods);
 
   Object.extend(Event, {
     fire:          fire,
     observe:       observe,
-    stopObserving: stopObserving
+    stopObserving: stopObserving,
+    on:            on
   });
 
   Element.addMethods({
@@ -4637,7 +5790,9 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
 
     observe:       observe,
 
-    stopObserving: stopObserving
+    stopObserving: stopObserving,
+
+    on:            on
   });
 
   Object.extend(document, {
@@ -4647,6 +5802,8 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
 
     stopObserving: stopObserving.methodize(),
 
+    on:            on.methodize(),
+
     loaded:        false
   });
 
@@ -4871,4 +6028,59 @@ Element.ClassNames.prototype = {
 
 Object.extend(Element.ClassNames.prototype, Enumerable);
 
-/*--------------------------------------------------------------------------*/
\ No newline at end of file
+/*--------------------------------------------------------------------------*/
+
+(function() {
+  window.Selector = Class.create({
+    initialize: function(expression) {
+      this.expression = expression.strip();
+    },
+
+    findElements: function(rootElement) {
+      return Prototype.Selector.select(this.expression, rootElement);
+    },
+
+    match: function(element) {
+      return Prototype.Selector.match(element, this.expression);
+    },
+
+    toString: function() {
+      return this.expression;
+    },
+
+    inspect: function() {
+      return "#<Selector: " + this.expression + ">";
+    }
+  });
+
+  Object.extend(Selector, {
+    matchElements: function(elements, expression) {
+      var match = Prototype.Selector.match,
+          results = [];
+
+      for (var i = 0, length = elements.length; i < length; i++) {
+        var element = elements[i];
+        if (match(element, expression)) {
+          results.push(Element.extend(element));
+        }
+      }
+      return results;
+    },
+
+    findElement: function(elements, expression, index) {
+      index = index || 0;
+      var matchIndex = 0, element;
+      for (var i = 0, length = elements.length; i < length; i++) {
+        element = elements[i];
+        if (Prototype.Selector.match(element, expression) && index === matchIndex++) {
+          return Element.extend(element);
+        }
+      }
+    },
+
+    findChildElements: function(element, expressions) {
+      var selector = expressions.toArray().join(', ');
+      return Prototype.Selector.select(selector, element || document);
+    }
+  });
+})();
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/css/prototype_colorpicker.css b/upload/public/js/3rd_party/prototype/colorpicker/css/prototype_colorpicker.css
new file mode 100644
index 00000000..83b0cc3a
--- /dev/null
+++ b/upload/public/js/3rd_party/prototype/colorpicker/css/prototype_colorpicker.css
@@ -0,0 +1,184 @@
+.colorpicker {
+	width: 356px;
+	height: 176px;
+	overflow: hidden;
+	position: absolute;
+	background: url(../images/colorpicker_background.png);
+	font-family: Helvetica, Arial, sans-serif;
+	color:#EAEAEA;
+	z-index: 110000;
+}
+.colorpicker_color {
+	width: 150px;
+	height: 150px;
+	left: 14px;
+	top: 13px;
+	position: absolute;
+	background: #f00;
+	overflow: hidden;
+	cursor: crosshair;
+}
+.colorpicker_color div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 150px;
+	height: 150px;
+	background: url(../images/colorpicker_overlay.png);
+}
+.colorpicker_color div div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 11px;
+	height: 11px;
+	overflow: hidden;
+	background: url(../images/colorpicker_select.gif);
+	margin: -5px 0 0 -5px;
+}
+.colorpicker_hue {
+	position: absolute;
+	top: 13px;
+	left: 171px;
+	width: 35px;
+	height: 150px;
+	cursor: n-resize;
+}
+.colorpicker_hue div {
+	position: absolute;
+	width: 35px;
+	height: 9px;
+	overflow: hidden;
+	background: url(../images/colorpicker_indic.gif) left top;
+	margin: -4px 0 0 0;
+	left: 0px;
+}
+.colorpicker_new_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 213px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker_current_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 283px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker input {
+	background-color: transparent;
+	border: 1px solid transparent;
+	position: absolute;
+	font-size: 10px;
+	color:#EAEAEA;
+	top: 4px;
+	right: 11px;
+	text-align: right;
+	margin: 0;
+	padding: 0;
+	height: 11px;
+}
+.colorpicker_hex {
+	position: absolute;
+	width: 72px;
+	height: 22px;
+	background: url(../images/colorpicker_hex.png) top;
+	left: 212px;
+	top: 142px;
+}
+.colorpicker_hex input {
+	right: 6px;
+}
+.colorpicker_field {
+	height: 22px;
+	width: 62px;
+	background-position: top;
+	position: absolute;
+}
+.colorpicker_field span {
+	position: absolute;
+	width: 12px;
+	height: 22px;
+	overflow: hidden;
+	top: 0;
+	right: 0;
+	cursor: n-resize;
+}
+.colorpicker_rgb_r {
+	background-image: url(../images/colorpicker_rgb_r.png);
+	top: 52px;
+	left: 212px;
+}
+.colorpicker_rgb_g {
+	background-image: url(../images/colorpicker_rgb_g.png);
+	top: 82px;
+	left: 212px;
+}
+.colorpicker_rgb_b {
+	background-image: url(../images/colorpicker_rgb_b.png);
+	top: 112px;
+	left: 212px;
+}
+.colorpicker_hsb_h {
+	background-image: url(../images/colorpicker_hsb_h.png);
+	top: 52px;
+	left: 282px;
+}
+.colorpicker_hsb_s {
+	background-image: url(../images/colorpicker_hsb_s.png);
+	top: 82px;
+	left: 282px;
+}
+.colorpicker_hsb_b {
+	background-image: url(../images/colorpicker_hsb_b.png);
+	top: 112px;
+	left: 282px;
+}
+.colorpicker_submit {
+	position: absolute;
+	width: 22px;
+	height: 22px;
+	background: url(../images/colorpicker_submit.png) top;
+	left: 322px;
+	top: 142px;
+	overflow: hidden;
+}
+.colorpicker_focus {
+	background-position: center;
+}
+.colorpicker_hex.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_submit.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_slider {
+	background-position: bottom;
+}
+.colorpicker_extra{
+	position: absolute;
+	width: 22px;
+	height: 22px;
+	background: url(../images/colorpicker_extra.png) top;
+	left: 292px;
+	top: 142px;
+	overflow: hidden;
+}
+.colorpicker_extrafill {
+	position: absolute;
+	width: 140px;
+	height: 110px;
+	padding:5px;
+	background: url(../images/colorpicker_extra_background.png) top;
+	right: 6px;
+	bottom: 34px;
+	overflow: hidden;
+	color:#FFF;
+}
+.colorpicker_extra.colorpicker_focus {
+	background-position: bottom;
+}
\ No newline at end of file
diff --git a/upload/admin/skin_cp/blank.gif b/upload/public/js/3rd_party/prototype/colorpicker/images/blank.gif
similarity index 100%
rename from upload/admin/skin_cp/blank.gif
rename to upload/public/js/3rd_party/prototype/colorpicker/images/blank.gif
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_background.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_background.png
new file mode 100644
index 00000000..8401572f
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_background.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra.png
new file mode 100644
index 00000000..c70c7ffb
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra_background.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra_background.png
new file mode 100644
index 00000000..b4c06c86
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_extra_background.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hex.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hex.png
new file mode 100644
index 00000000..4e532d7c
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hex.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_b.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_b.png
new file mode 100644
index 00000000..dfac595d
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_b.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_h.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_h.png
new file mode 100644
index 00000000..3977ed9f
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_h.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_s.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_s.png
new file mode 100644
index 00000000..a2a69973
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_hsb_s.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_indic.gif b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_indic.gif
new file mode 100644
index 00000000..f9fa95e2
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_indic.gif differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_overlay.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_overlay.png
new file mode 100644
index 00000000..561cdd9c
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_overlay.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_b.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_b.png
new file mode 100644
index 00000000..dfac595d
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_b.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_g.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_g.png
new file mode 100644
index 00000000..72b32760
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_g.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_r.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_r.png
new file mode 100644
index 00000000..4855fe03
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_rgb_r.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_select.gif b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_select.gif
new file mode 100644
index 00000000..599f7f13
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_select.gif differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_submit.png b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_submit.png
new file mode 100644
index 00000000..ffad1c9c
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/colorpicker_submit.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_background.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_background.png
new file mode 100644
index 00000000..cf55ffdd
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_background.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hex.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hex.png
new file mode 100644
index 00000000..888f4444
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hex.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_b.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_b.png
new file mode 100644
index 00000000..2f99dae8
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_b.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_h.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_h.png
new file mode 100644
index 00000000..a217e921
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_h.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_s.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_s.png
new file mode 100644
index 00000000..7826b415
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_hsb_s.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_indic.gif b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_indic.gif
new file mode 100644
index 00000000..222fb94c
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_indic.gif differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_b.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_b.png
new file mode 100644
index 00000000..80764e5d
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_b.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_g.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_g.png
new file mode 100644
index 00000000..fc9778be
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_g.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_r.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_r.png
new file mode 100644
index 00000000..91b0cd4c
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_rgb_r.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/custom_submit.png b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_submit.png
new file mode 100644
index 00000000..cd202cd9
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/custom_submit.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/select.png b/upload/public/js/3rd_party/prototype/colorpicker/images/select.png
new file mode 100644
index 00000000..21213bfd
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/select.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/select2.png b/upload/public/js/3rd_party/prototype/colorpicker/images/select2.png
new file mode 100644
index 00000000..2cd2cabe
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/select2.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/images/slider.png b/upload/public/js/3rd_party/prototype/colorpicker/images/slider.png
new file mode 100644
index 00000000..8b03da96
Binary files /dev/null and b/upload/public/js/3rd_party/prototype/colorpicker/images/slider.png differ
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/index.html b/upload/public/js/3rd_party/prototype/colorpicker/index.html
new file mode 100644
index 00000000..6c207e91
--- /dev/null
+++ b/upload/public/js/3rd_party/prototype/colorpicker/index.html
@@ -0,0 +1,215 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US">
+<head profile="http://purl.org/uF/hAtom/0.1/ http://purl.org/uF/2008/03/">
+	<title>Javascript Color Picker built on Prototype</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="shortcut icon" href="/images/favicon.ico" />
+	<link rel="apple-touch-icon" href="/images/iphone.png" />
+	<link rel="stylesheet" href="http://jamesroberts.name/css/style.css" type="text/css" media="screen, projection" />
+	
+	<link href="css/prototype_colorpicker.css" rel="stylesheet" type="text/css" />
+	<script src="http://jamesroberts.name/js/protoculous-1.1.js" type="text/javascript"></script>
+	<script src="js/prototype_colorpicker.js" type="text/javascript"></script>
+
+	<style>
+		.color-preview{
+			width:16px;
+			height:16px;
+			border:1px solid #000;
+		}
+		pre{
+			text-align:left;
+			padding:10px;
+			background:#EAEAEA;
+			border:1px solid #AAA;
+			width:800px;
+			overflow:auto;
+		}
+	</style>
+
+</head>
+<body id="dm-body">
+
+
+	<table width="800" class="centered">
+		<tr><td>
+		
+		<h1>A prototype color picker class</h1>
+		
+		Download the Zip file <a href="prototype_colorpicker.zip">here</a>.
+		
+		<p>The most simple, no options specified:</p>
+		<table cellspacing="0" cellpadding="0">
+			<tr>
+				<td>Select Your Color: </td>
+				<td>
+					#<input type="text" id="color1" name="color1" value="008a20" size="6"></td>
+				</td>
+			</tr>
+		</table>
+<pre>
+var cp1 = new colorPicker('color1');
+</pre>
+
+
+
+
+		<p>With a preview box:</p>
+		<table cellspacing="0" cellpadding="0">
+			<tr>
+				<td>Select Your Color: </td>
+				<td>
+					#<input type="text" id="color2" name="color2" value="008a20" size="6"></td>
+				</td>
+				<td>&nbsp;</td>
+				<td>
+					<div id="color2-preview" class="color-preview"></div>
+				</td>
+			</tr>
+		</table>
+<pre>
+var cp2 = new colorPicker('color2',{
+	color:'#008a20',
+	previewElement:'color2-preview'
+});
+</pre>
+
+
+
+		<p>Inline, no popup:</p>
+		<table cellspacing="0" cellpadding="0">
+			<tr>
+				<td valign="top":>Select Your Color: </td>
+				<td>&nbsp;</td>
+				<td>
+					#<input type="text" id="color3" name="color3" value="008a20" size="6">
+				</td>
+			</tr>
+		</table>
+<pre>
+var cp3 = new colorPicker('color3',{
+	color:'#008a20',
+	flat:true
+});
+</pre>
+
+
+		<p>With lots of other options:</p>
+		<table cellspacing="0" cellpadding="0">
+			<tr>
+				<td>Select Your Color: </td>
+				<td><span title="select a color" class="icon i-color-wheel" id="color4"></span></td>
+				<td>
+					#<input type="text" id="color4-input" name="color4" value="008a20" size="6">
+				</td>
+				<td>&nbsp;</td>
+				<td>
+					<div id="color4-preview" class="color-preview"></div>
+				</td>
+			</tr>
+		</table>
+<pre>
+var cp4 = new colorPicker('color4',{
+	color:'#008a20',
+	previewElement:'color4-preview',
+	inputElement:'color4-input',
+	eventName: 'click',
+	onShow:function(picker){
+		new Effect.Appear(picker.cp);
+		return false;
+	},
+	onHide:function(picker){
+		new Effect.Fade(picker.cp);
+		return false;
+	},
+	origColor:'#000000',
+	livePreview: true,
+	hideOnSubmit:false,
+	updateOnChange:false,
+	flat: false,
+	hasExtraInfo:true,
+	extraInfo:function(picker){
+		var colors = $A([
+			  '000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333',
+			  '800000', 'FF6600', '808000', '008000', '008080', '0000FF', '666699', '808080',
+			  'FF0000', 'FF9900', '99CC00', '339966', '33CCCC', '3366FF', '800080', '969696',
+			  'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF', '993366', 'C0C0C0',
+			  'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', '99CCFF', 'CC99FF', 'FFFFFF'
+		]);
+		
+		var div = Builder.node('DIV').setStyle({padding:'10px 12px'});
+		colors.each(function(color){
+			var div_inner = Builder.node('DIV').setStyle({backgroundColor:'#'+color,cursor:'pointer',width:'10px',height:'10px','float':'left',border:'2px solid #'+color,margin:'1px'});
+			div.insert(div_inner);
+			div_inner.observe('click',function(ev){picker.setColor(color);});
+			div_inner.observe('mouseover',function(ev){ev.element().setStyle({border:'2px solid #000'});});
+			div_inner.observe('mouseout',function(ev){ev.element().setStyle({border:'2px solid #'+color});});		
+		});
+		picker.extraInfo.update(div);
+	}
+});
+</pre>
+		
+		
+		</td></tr>
+	</table>
+
+<script>
+	
+	var cp1 = new colorPicker('color1');
+	
+	var cp2 = new colorPicker('color2',{
+		color:'#008a20',
+		previewElement:'color2-preview'
+	});
+
+	var cp3 = new colorPicker('color3',{
+		color:'#008a20',
+		flat:true
+	});
+	
+	
+	var cp4 = new colorPicker('color4',{
+		color:'#008a20',
+		previewElement:'color4-preview',
+		inputElement:'color4-input',
+		eventName: 'click',
+		onShow:function(picker){
+			new Effect.Appear(picker.cp);
+			return false;
+		},
+		onHide:function(picker){
+			new Effect.Fade(picker.cp);
+			return false;
+		},
+		origColor:'#000000',
+		livePreview: true,
+		hideOnSubmit:false,
+		updateOnChange:false,
+		flat: false,
+		hasExtraInfo:true,
+		extraInfo:function(picker){
+			var colors = $A([
+				  '000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333',
+				  '800000', 'FF6600', '808000', '008000', '008080', '0000FF', '666699', '808080',
+				  'FF0000', 'FF9900', '99CC00', '339966', '33CCCC', '3366FF', '800080', '969696',
+				  'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF', '993366', 'C0C0C0',
+				  'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', '99CCFF', 'CC99FF', 'FFFFFF'
+			]);
+			
+			var div = Builder.node('DIV').setStyle({padding:'10px 12px'});
+			colors.each(function(color){
+				var div_inner = Builder.node('DIV').setStyle({backgroundColor:'#'+color,cursor:'pointer',width:'10px',height:'10px','float':'left',border:'2px solid #'+color,margin:'1px'});
+				div.insert(div_inner);
+				div_inner.observe('click',function(ev){picker.setColor(color);});
+				div_inner.observe('mouseover',function(ev){ev.element().setStyle({border:'2px solid #000'});});
+				div_inner.observe('mouseout',function(ev){ev.element().setStyle({border:'2px solid #'+color});});		
+			});
+			picker.extraInfo.update(div);
+		}
+	});	
+	
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/prototype/colorpicker/js/prototype_colorpicker.js b/upload/public/js/3rd_party/prototype/colorpicker/js/prototype_colorpicker.js
new file mode 100644
index 00000000..82dbd6fd
--- /dev/null
+++ b/upload/public/js/3rd_party/prototype/colorpicker/js/prototype_colorpicker.js
@@ -0,0 +1,467 @@
+/**
+ * Color picker - http://jamesroberts.name/project-src/prototype-color-picker/
+ */
+var colorPicker=Class.create({
+	initialize:function(){
+		var args = $A(arguments);
+		this.el = $(args[0]);
+		this.options = Object.extend({
+			previewElement:false,
+			inputElement:false,
+			eventName: 'click',
+			onLoad:function(){return true;},
+			onShow:function(){return true;},
+			onBeforeShow:function(){return true;},
+			onHide:function(){return true;},
+			onChange:function(){return true;},
+			onSubmit:function(){return true;},
+			color: '000000',
+			origColor: false,
+			livePreview: true,
+			hideOnSubmit:true,
+			updateOnChange:true,
+			flat: false,
+			hasExtraInfo:false,
+			extraInfo:function(){return true;}
+		},args[1]);
+		this.ids = {};
+		this.fields = [];
+		this.current = {}
+		this.inAction = false;
+		this.charMin = 65;
+		this.visible = false;
+		this.time = new Date().getTime();
+		this.id = 'colorpicker_' + this.time;
+		var cp_tpl = '<div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div><div class="colorpicker_extra" style="display:none;"></div><div class="colorpicker_extrafill" style="display:none;"></div>';
+		this.cp = $(document.createElement('DIV'));
+		this.cp.writeAttribute('id',this.id).addClassName('colorpicker').setStyle({'display':'none'}).insert(cp_tpl);
+		if (typeof this.options.color == 'string') {
+			this.color = this.HexToHSB(this.options.color);
+		} else if (this.color.r != undefined && this.options.color.g != undefined && this.options.color.b != undefined) {
+			this.color = this.RGBToHSB(this.options.color);
+		} else if (this.options.color.h != undefined && this.options.color.s != undefined && this.options.color.b != undefined) {
+			this.color = this.fixHSB(this.options.color);
+		} else {
+			return this;
+		}
+		var color_picker = this;
+
+		this.options.origColor = this.options.color;
+		
+		if (this.options.flat) {
+			this.options.hideOnSubmit = false;
+			this.cp.setStyle({position: 'relative',display: 'block'});
+			this.el.insert({after:this.cp});
+			this.cp.show();
+		} else {
+			document.body.appendChild(this.cp);
+			$(this.el).observe(this.options.eventName, this.show.bind(this));
+		}
+		this.fields = $$('#'+this.id+' input')
+		this.fields.each(function(field){
+			field.observe('keyup', this.keyUp.bind(this));
+			field.observe('change', function(ev){this.change(ev.element());}.bind(this));
+			field.observe('blur', this.blur.bind(this));
+			field.observe('focus', this.focus.bind(this));
+		}.bind(this));
+		$$('#'+this.id+' span').each(function(span){span.observe('mousedown', this.downIncrement.bind(this));}.bind(this));
+		this.cp.down('div.colorpicker_current_color').observe('click', this.restoreOriginal.bind(this));
+		this.selector = this.cp.down('div.colorpicker_color');
+		this.selector.observe('mousedown', this.downSelector.bind(this));
+		this.selectorIndic = this.selector.down('div').down('div');
+		this.hue = this.cp.down('div.colorpicker_hue div');
+		this.cp.down('div.colorpicker_hue').observe('mousedown', this.downHue.bind(this));
+		this.newColor = this.cp.down('div.colorpicker_new_color');
+		this.currentColor = this.cp.down('div.colorpicker_current_color');
+		this.submit = this.cp.down('div.colorpicker_submit');
+		this.submit.observe('mouseenter', this.enterSubmit.bind(this));
+		this.submit.observe('mouseleave', this.leaveSubmit.bind(this));
+		this.submit.observe('click', this.clickSubmit.bind(this));
+		
+		this.extra = this.cp.down('div.colorpicker_extra');
+		this.extraInfo = this.cp.down('div.colorpicker_extrafill');
+		if(this.options.hasExtraInfo == true){
+			this.extra.show();
+			this.options.extraInfo(this);
+			this.extra.observe('mouseenter',function(ev){ev.element().addClassName('colorpicker_focus');});
+			this.extra.observe('mouseleave',function(ev){ev.element().removeClassName('colorpicker_focus');});
+			this.extra.observe('click', function(ev){
+				var el = this.extraInfo;
+				if(el.visible()) el.hide();
+				else el.show();
+			}.bind(this));
+		}
+		this.fillRGBFields(this.color);
+		this.fillHSBFields(this.color);
+		this.fillHexFields(this.color);
+		this.setHue(this.color);
+		this.setSelector(this.color);
+		this.setCurrentColor((this.options.origColor?this.options.origColor:this.color));
+		this.setNewColor(this.color);
+		if($(this.options.previewElement)) $(this.options.previewElement).setStyle({'backgroundColor':'#'+this.HSBToHex(this.color)});
+
+		//Event.observe(window, "scroll", this.repositionPicker.bindAsEventListener(this));
+		this.options.onLoad(this);
+		return this;
+		
+	},
+	fillRGBFields:function(hsb) {
+		var rgb = this.HSBToRGB(hsb);
+		this.fields[1].value = rgb.r;
+		this.fields[2].value = rgb.g;
+		this.fields[3].value = rgb.b;
+	},
+	fillHSBFields:function(hsb) {
+		this.fields[4].value = parseInt(hsb.h);
+		this.fields[5].value = parseInt(hsb.s);
+		this.fields[6].value = parseInt(hsb.b);
+	},
+	fillHexFields:function(hsb){
+		this.fields[0].value = this.HSBToHex(hsb).toUpperCase();
+	},
+	setSelector:function(hsb){
+		this.selector.setStyle({'backgroundColor':'#' + this.HSBToHex({h: hsb.h, s: 100, b: 100})});
+		this.selectorIndic.setStyle({
+			left: parseInt(150 * hsb.s/100, 10)+'px',
+			top: parseInt(150 * (100-hsb.b)/100, 10)+'px'
+		});
+	},
+	setHue:function(hsb){
+		this.hue.setStyle({'top':parseInt(150 - 150 * hsb.h/360, 10)+'px'});
+	},
+	setCurrentColor:function(hsb){
+		this.currentColor.setStyle({'backgroundColor':'#' + this.HSBToHex(hsb)});
+		if(!this.options.origColor) this.options.origColor = hsb;
+	},
+	setNewColor:function(hsb){
+		this.newColor.setStyle({'backgroundColor':'#' + this.HSBToHex(hsb)});
+	},
+	keyUp:function(ev){
+		var pressedKey = ev.charCode || ev.keyCode || -1;
+		if ((pressedKey > this.charMin && pressedKey <= 90) || pressedKey == 32) {
+			return false;
+		}
+		if (this.options.livePreview === true) {
+			this.change(ev.element());
+		}
+	},
+	change:function(el){
+		var col;
+		if (el.up().className.indexOf('_hex')!=-1) {
+			this.color = col = this.HexToHSB(this.fixHex(el.value));
+		} else if (el.up().className.indexOf('_rgb')!=-1) {
+			this.color = col = this.RGBToHSB(this.fixRGB({
+				r: parseInt(this.fields[1].value, 10),
+				g: parseInt(this.fields[2].value, 10),
+				b: parseInt(this.fields[3].value, 10)
+			}));
+		} else {
+			this.color = col = this.fixHSB({
+				h: parseInt(this.fields[4].value, 10),
+				s: parseInt(this.fields[5].value, 10),
+				b: parseInt(this.fields[6].value, 10)
+			});
+		}
+		this.setSelector(col);
+		this.setHue(col);
+		this.setNewColor(col);
+		this.options.onChange(this);
+		if(this.options.updateOnChange){
+			if(this.el.nodeName == 'INPUT') this.el.value = this.HSBToHex(col);
+			if($(this.options.inputElement)) $(this.options.inputElement).value = this.HSBToHex(col);
+			if($(this.options.previewElement)) $(this.options.previewElement).setStyle({'backgroundColor':'#'+this.HSBToHex(col)});
+		}
+	},
+	blur:function(ev){
+		ev.element().up().removeClassName('colorpicker_focus');
+	},
+	focus:function(ev){
+		this.charMin = ev.element().hasClassName('_hex') > 0 ? 70 : 65;
+		ev.element().addClassName('colorpicker_focus');
+	},
+	downIncrement:function(ev){
+		var parent = ev.element().up();
+		var field = parent.down('input');
+		field.focus();
+		
+		this.current = {
+			el: parent.addClassName('colorpicker_slider'),
+			max: (parent.className.indexOf('_hsb_h')!=-1)? 360 : ((parent.className.indexOf('_hsb')!=-1)? 100 : 255),
+			y: ev.pointerY(),
+			field: field,
+			val: parseInt(field.value, 10),
+			preview: this.options.livePreview					
+		};
+		this.eventUpIncrement = this.upIncrement.bindAsEventListener(this);
+		document.observe("mouseup", this.eventUpIncrement);
+		this.eventMoveIncrement = this.moveIncrement.bindAsEventListener(this);
+		document.observe("mousemove", this.eventMoveIncrement);
+	},
+	moveIncrement:function(ev){
+		this.current.field.value = Math.max(0, Math.min(this.current.max, parseInt(this.current.val + ev.pointerY() - this.current.y, 10)));
+		if(this.current.preview) {
+			this.change(this.current.field);
+		}
+		return false;
+	},
+	upIncrement:function(ev){
+		this.change(ev.element());
+		this.current.el.removeClassName('colorpicker_slider');
+		this.current.el.down('input').focus();
+		if(ev.element().up().className.indexOf('_hsb')!=-1) this.fillRGBFields(this.color);
+		else this.fillHSBFields(this.color);
+		this.fillHexFields(this.color);
+		Event.stopObserving(document, "mouseup", this.eventUpIncrement);
+		Event.stopObserving(document, "mousemove", this.eventMoveIncrement);
+		return false;
+	},
+	downHue:function(ev){
+		this.current = {
+			y: ev.element().cumulativeOffset().top,
+			preview: this.options.livePreview
+		};
+		this.eventUpHue = this.upHue.bindAsEventListener(this);
+		document.observe("mouseup", this.eventUpHue);
+		this.eventMoveHue = this.moveHue.bindAsEventListener(this);
+		document.observe("mousemove", this.eventMoveHue);
+	},
+	moveHue:function(ev){
+		this.fields[4].value = parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pointerY() - this.current.y))))/150, 10)
+		this.change(this.fields[4]);
+		return false;
+	},
+	upHue:function(ev){
+		this.fillRGBFields(this.color);
+		this.fillHexFields(this.color);
+		this.fields[4].value = parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pointerY() - this.current.y))))/150, 10)
+		this.change(this.fields[4]);
+		Event.stopObserving(document, "mouseup", this.eventUpHue);
+		Event.stopObserving(document, "mousemove", this.eventMoveHue);
+		return false;
+	},
+	downSelector:function(ev){
+		this.current = {
+			pos: ev.element().cumulativeOffset(),
+			preview:this.options.livePreview
+		};
+		this.eventUpSelector = this.upSelector.bindAsEventListener(this);
+		document.observe("mouseup", this.eventUpSelector);
+		this.eventMoveSelector = this.moveSelector.bindAsEventListener(this);
+		document.observe("mousemove", this.eventMoveSelector);
+	},
+	moveSelector:function(ev){
+		this.fields[6].value = parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pointerY() - this.current.pos.top))))/150, 10);
+		this.fields[5].value = parseInt(100*(Math.max(0,Math.min(150,(ev.pointerX() - this.current.pos.left))))/150, 10);
+		this.change(ev.element());
+		return false;
+	},
+	upSelector:function(ev){
+		this.moveSelector(ev);
+		this.fillRGBFields(this.color);
+		this.fillHexFields(this.color);
+		Event.stopObserving(document, "mouseup", this.eventUpSelector);
+		Event.stopObserving(document, "mousemove", this.eventMoveSelector);
+		return false;
+	},
+	enterSubmit:function(ev){
+		ev.element().addClassName('colorpicker_focus');
+	},
+	leaveSubmit:function(ev){
+		ev.element().removeClassName('colorpicker_focus');
+	},
+	clickSubmit:function(ev){
+		var col = this.color;
+		this.origColor = col;
+		this.setCurrentColor(col);
+		if(this.el.nodeName == 'INPUT') this.el.value = this.HSBToHex(col);
+		if($(this.options.inputElement)) $(this.options.inputElement).value = this.HSBToHex(col);
+		if($(this.options.previewElement)) $(this.options.previewElement).setStyle({'backgroundColor':'#'+this.HSBToHex(col)});
+		this.options.onSubmit(this);
+		if(this.options.hideOnSubmit) this.hidePicker();
+	},
+	show:function(ev){
+		this.options.onBeforeShow(this);
+		this.positionPicker(ev);
+		if(this.options.onShow(this)) this.cp.setStyle({display:'block'});
+		this.eventHide = this.hide.bindAsEventListener(this);
+		document.observe("mousedown", this.eventHide);
+		return false;
+	},
+	hide:function(ev){
+		var el = (typeof(ev) == 'object')?ev.element():$(document.body);
+		if (!this.isChildOf(this.cp, el)) {
+			if(this.options.onHide(this)) this.cp.setStyle({'display':'none'});
+			Event.stopObserving(document, "mousedown", this.eventHide);
+		}
+	},
+	isChildOf:function(parentEl, el) {
+		if (parentEl == el) {
+			return true;
+		}
+		return $(el).descendantOf(parentEl);
+	},
+	getViewport:function(){
+		return {
+			l : document.viewport.getScrollOffsets().left,
+			t : document.viewport.getScrollOffsets().top,
+			w : document.viewport.getWidth(),
+			h : document.viewport.getHeight()
+		};
+	},
+	positionPicker:function(ev){
+		var pos = ev.element().cumulativeOffset();
+		var viewPort = this.getViewport();
+		var top = pos.top + ev.element().getHeight();
+		var left = pos.left;
+		if (top + 176 > viewPort.t + viewPort.h) {
+			top -= ev.element().getHeight() + 176;
+		}
+		if (left + 356 > viewPort.l + viewPort.w) {
+			left -= (356-this.el.getWidth());
+		}
+		this.cp.setStyle({left: left + 'px', top: top + 'px'});
+		
+	},
+	fixHSB:function(hsb){
+		return {
+			h: Math.min(360, Math.max(0, hsb.h)),
+			s: Math.min(100, Math.max(0, hsb.s)),
+			b: Math.min(100, Math.max(0, hsb.b))
+		};
+	}, 
+	fixRGB:function(rgb){
+		return {
+			r: Math.min(255, Math.max(0, rgb.r)),
+			g: Math.min(255, Math.max(0, rgb.g)),
+			b: Math.min(255, Math.max(0, rgb.b))
+		};
+	},
+	fixHex:function(hex){
+		var len = 6 - hex.length;
+		if (len > 0) {
+			var o = [];
+			for (var i=0; i<len; i++) {
+				o.push('0');
+			}
+			o.push(hex);
+			hex = o.join('');
+		}
+		return hex;
+	}, 
+	HexToRGB:function(hex){
+		var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
+		return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
+	},
+	HexToHSB:function(hex){
+		return this.RGBToHSB(this.HexToRGB(hex));
+	},
+	RGBToHSB:function(rgb){
+		var hsb = {
+			h: 0,
+			s: 0,
+			b: 0
+		};
+		var min = Math.min(rgb.r, rgb.g, rgb.b);
+		var max = Math.max(rgb.r, rgb.g, rgb.b);
+		var delta = max - min;
+		hsb.b = max;
+		if (max != 0) {
+			
+		}
+		hsb.s = max != 0 ? 255 * delta / max : 0;
+		if (hsb.s != 0) {
+			if (rgb.r == max) {
+				hsb.h = (rgb.g - rgb.b) / delta;
+			} else if (rgb.g == max) {
+				hsb.h = 2 + (rgb.b - rgb.r) / delta;
+			} else {
+				hsb.h = 4 + (rgb.r - rgb.g) / delta;
+			}
+		} else {
+			hsb.h = -1;
+		}
+		hsb.h *= 60;
+		if (hsb.h < 0) {
+			hsb.h += 360;
+		}
+		hsb.s *= 100/255;
+		hsb.b *= 100/255;
+		return hsb;
+	},
+	HSBToRGB:function(hsb){
+		var rgb = {};
+		var h = Math.round(hsb.h);
+		var s = Math.round(hsb.s*255/100);
+		var v = Math.round(hsb.b*255/100);
+		if(s == 0) {
+			rgb.r = rgb.g = rgb.b = v;
+		} else {
+			var t1 = v;
+			var t2 = (255-s)*v/255;
+			var t3 = (t1-t2)*(h%60)/60;
+			if(h==360) h = 0;
+			if(h<60) {rgb.r=t1;	rgb.b=t2; rgb.g=t2+t3}
+			else if(h<120) {rgb.g=t1; rgb.b=t2;	rgb.r=t1-t3}
+			else if(h<180) {rgb.g=t1; rgb.r=t2;	rgb.b=t2+t3}
+			else if(h<240) {rgb.b=t1; rgb.r=t2;	rgb.g=t1-t3}
+			else if(h<300) {rgb.b=t1; rgb.g=t2;	rgb.r=t2+t3}
+			else if(h<360) {rgb.r=t1; rgb.g=t2;	rgb.b=t1-t3}
+			else {rgb.r=0; rgb.g=0;	rgb.b=0}
+		}
+		return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
+	},
+	RGBToHex:function(rgb){
+		var hex = [
+			rgb.r.toString(16),
+			rgb.g.toString(16),
+			rgb.b.toString(16)
+		];
+		hex.each(function(val,nr) {
+			if(val.length == 1){
+				hex[nr] = '0' + val;
+			}
+		});
+		return hex.join('');
+	},
+	HSBToHex:function(hsb){
+		return this.RGBToHex(this.HSBToRGB(hsb));
+	},
+	restoreOriginal:function(){
+		var col = this.options.origColor;
+		this.color = col;
+		this.fillRGBFields(col);
+		this.fillHexFields(col);
+		this.fillHSBFields(col);
+		this.setSelector(col);
+		this.setHue(col);
+		this.setNewColor(col);
+	},
+	showPicker: function() {
+		this.cp.show();
+	},
+	hidePicker: function() {
+		this.cp.hide();
+	},
+	setColor: function(col) {
+		if (typeof col == 'string') {
+			col = this.HexToHSB(col);
+		} else if (col.r != undefined && col.g != undefined && col.b != undefined) {
+			col = this.RGBToHSB(col);
+		} else if (col.h != undefined && col.s != undefined && col.b != undefined) {
+			col = fixHSB(col);
+		} else {
+			return this;
+		}
+		this.color = col;
+		this.origColor = col;
+		this.fillRGBFields(col);
+		this.fillHSBFields(col);
+		this.fillHexFields(col);
+		this.setHue(col);
+		this.setSelector(col);
+		this.setCurrentColor(col);
+		this.setNewColor(col);
+		
+		if($(this.options.previewElement)) $(this.options.previewElement).setStyle({'backgroundColor':'#'+this.HSBToHex(this.color)});
+	}
+});
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/scriptaculous/index.html b/upload/public/js/3rd_party/scriptaculous/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/scriptaculous/index.html
+++ b/upload/public/js/3rd_party/scriptaculous/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/swfupload/index.html b/upload/public/js/3rd_party/swfupload/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/swfupload/index.html
+++ b/upload/public/js/3rd_party/swfupload/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/swfupload/plugins/index.html b/upload/public/js/3rd_party/swfupload/plugins/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/3rd_party/swfupload/plugins/index.html
+++ b/upload/public/js/3rd_party/swfupload/plugins/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/3rd_party/swfupload/swfupload.js b/upload/public/js/3rd_party/swfupload/swfupload.js
index 1461f9f2..cab60c04 100644
--- a/upload/public/js/3rd_party/swfupload/swfupload.js
+++ b/upload/public/js/3rd_party/swfupload/swfupload.js
@@ -94,7 +94,7 @@ SWFUpload.WINDOW_MODE = {
 // Private: takes a URL, determines if it is relative and converts to an absolute URL
 // using the current site. Only processes the URL if it can, otherwise returns the URL untouched
 SWFUpload.completeURL = function(url) {
-	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+	if ( !url || typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
 		return url;
 	}
 	
diff --git a/upload/public/js/index.html b/upload/public/js/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/js/index.html
+++ b/upload/public/js/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/js/ipb.js b/upload/public/js/ipb.js
index 7db3a705..95044af3 100644
--- a/upload/public/js/ipb.js
+++ b/upload/public/js/ipb.js
@@ -15,9 +15,23 @@ var Debug = {
 		if( jsDebug && !Object.isUndefined(window.console) ){
 			console.log( text );
 		}
+		/*else if( jsDebug )
+		{
+			if( !$('_inline_debugging') ){
+				var _inline_debug =  new Element('div', { id: '_inline_debugging' }).setStyle('background: rgba(0,0,0,0.7); color: #fff; padding: 10px; width: 97%; height: 150px; position: absolute; bottom: 0; overflow: auto; z-index: 50000').show();
+				
+				if( !Object.isUndefined( $$('body')[0] ) ){
+					$$('body')[0].insert( _inline_debug );
+				}
+			}
+			
+			try {
+				$('_inline_debugging').innerHTML += "<br />" + text;
+			} catch(err){}
+		}*/
 	},
 	dir: function( values ){
-		if( jsDebug && !Object.isUndefined(window.console) ){
+		if( jsDebug && !Object.isUndefined(window.console) && ! Prototype.Browser.IE && ! Prototype.Browser.Opera ){
 			console.dir( values );
 		}
 	},
@@ -38,10 +52,59 @@ var Debug = {
 	}
 };
 
-/* ===================================================================================================== */
-/* OVERWRITE getOffsetParent TO CORRECT IE8 PROTOTYPE ISSUE */
+/* Set up version specifics */
+Prototype.Browser.IE6 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 6;
+Prototype.Browser.IE7 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 7;
+Prototype.Browser.IE8 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 8;
+Prototype.Browser.IE9 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 9;
 
-Event.observe( window, 'load', function(e){
+/* Add in stuff prototype does not include */
+Prototype.Browser.Chrome = Prototype.Browser.WebKit && ( navigator.userAgent.indexOf('Chrome/') > -1 );
+
+/* ===================================================================================================== */
+/* OVERWRITE getOffsetParent TO FIX TD ISSUE */
+
+function isBody(element) {
+  return element.nodeName.toUpperCase() === 'BODY';
+}
+
+function isHtml(element) {
+  return element.nodeName.toUpperCase() === 'HTML';
+}
+
+function isDocument(element) {
+  return element.nodeType === Node.DOCUMENT_NODE;
+}
+
+function isDetached(element) {
+  return element !== document.body &&
+   !Element.descendantOf(element, document.body);
+}
+
+Element.Methods.getOffsetParent = function(element) {
+	element = $(element);
+	
+	if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
+	return $(document.body);
+	
+	if( Prototype.Browser.IE ){
+		if (element.offsetParent && element.offsetParent != document.body && Element.getStyle( element.offsetParent, 'position' ) != 'static') return $(element.offsetParent);
+		if (element == document.body) return $(element);
+	} else {	
+		var isInline = (Element.getStyle(element, 'display') === 'inline');
+		if (!isInline && element.offsetParent && Element.getStyle(element.offsetParent,'position') != 'static') return $(element.offsetParent);
+	}
+
+	while ((element = element.parentNode) && element !== document.body) {
+		if (Element.getStyle(element, 'position') !== 'static') {
+			return isHtml(element) ? $(document.body) : $(element);
+		}
+	}
+
+	return $(document.body);
+}
+
+/*Event.observe( window, 'load', function(e){
 	Element.Methods.getOffsetParent = function( element ){
 		//alert( "Using overloaded getOffsetParent" );
 		if (element.offsetParent && element.offsetParent != document.body) return $(element.offsetParent);
@@ -61,20 +124,12 @@ function _getOffsetParent( element )
 	if (element.offsetParent && element.offsetParent != document.body) return $(element.offsetParent);
 	if (element == document.body) return $(element);
 
-	while ((element = element.parentNode) && element != document.body)
+	while ((element = element.parentNode) && element != document.body )
 	  if (Element.getStyle(element, 'position') != 'static')
 	    return $(element);
 
 	return $(document.body);
-}
-
-/* Set up version specifics */
-Prototype.Browser.IE6 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 6;
-Prototype.Browser.IE7 = Prototype.Browser.IE && parseInt(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE")+5)) == 7;
-Prototype.Browser.IE8 = Prototype.Browser.IE && !Prototype.Browser.IE6 && !Prototype.Browser.IE7;
-
-/* Add in stuff prototype does not include */
-Prototype.Browser.Chrome = Prototype.Browser.WebKit && ( navigator.userAgent.indexOf('Chrome/') > -1 );
+}*/
 
 /* ===================================================================================================== */
 /* MAIN ROUTINE */
@@ -86,21 +141,23 @@ window.IPBoard = Class.create({
 	lang: [],
 	templates: [],
 	editors: $A(),
-	notifications: null,
 	initDone: false,
 	
 	initialize: function()
 	{
-		Debug.write("IPBjs is loading...");
+		Debug.write("IPB js is loading...");
 		
 		document.observe("dom:loaded", function(){
 			
 			this.Cookie.init();
 			// Show a little loading graphic
 			Ajax.Responders.register({
-			  onLoading: function() {
-			    if( !$('ajax_loading') )
-				{
+			  onLoading: function( handler ) {
+				if( !Object.isUndefined( handler['options']['hideLoader'] ) && handler['options']['hideLoader'] != false ){
+					return;
+				}
+				
+			    if( !$('ajax_loading') ){
 					if( !ipb.templates['ajax_loading'] ){ return; }
 					$('ipboard_body').insert( ipb.templates['ajax_loading'] );
 				}
@@ -109,35 +166,53 @@ window.IPBoard = Class.create({
 			  },
 			  onComplete: function() {
 			
-				if( !$('ajax_loading') ){ return; }
+				if( !$('ajax_loading') || !$('ajax_loading').visible() ){ return; }
 			    var effect = new Effect.Fade( $('ajax_loading'), { duration: 0.2 } );
 			    
-			    if ( ! Object.isUndefined( ipb.hoverCard ) )
-				{
+			    if ( ! Object.isUndefined( ipb.hoverCard ) ){
+			    	ipb.hoverCardRegister.postAjaxInit();
+				}
+			    
+			    /* General links to functions */
+				$$("[data-clicklaunch]").invoke('clickLaunch');
+			  },
+			  onSuccess: function() {
+			    if ( ! Object.isUndefined( ipb.hoverCard ) ){
 			    	ipb.hoverCardRegister.postAjaxInit();
 				}
 			  },
-			  onSuccess: function() {
-										
-				    if ( ! Object.isUndefined( ipb.hoverCard ) )
-					{
-				    	ipb.hoverCardRegister.postAjaxInit();
-					}
+			  onFailure: function( t )
+			  {
+				 if( !$('ajax_loading') || !$('ajax_loading').visible() ){ return; }
+				 var effect = new Effect.Fade( $('ajax_loading'), { duration: 0.2 } );
+				  
+				 if ( ! Object.isUndefined( ipb.global ) )
+				 {
+					 ipb.global.showInlineNotification( ipb.lang['ajax_failure'] );
+				 }
+				  
+			  },
+			  onException: function( t, exception )
+			  {
+				  if( !$('ajax_loading') || !$('ajax_loading').visible() ){ return; }
+				  var effect = new Effect.Fade( $('ajax_loading'), { duration: 0.2 } );
+				  
+				  Debug.error( exception );
+				  
+				  if ( ! Object.isUndefined( ipb.global ) )
+				  {
+					  //ipb.global.showInlineNotification( ipb.lang['ajax_failure'] );
 				  }
+			  }
 			});
 			
 			// Initialize our delegation manager
-			ipb.delegate.initialize();
-			
+			ipb.delegate.initialize();			
 			ipb.initDone = true;
 			
-			if( $('user_notifications_link') )
-			{
-				$('user_notifications_link').observe( 'click', ipb.getNotifications );
-			}
-			
 		}.bind(this));
 	},
+	
 	positionCenter: function( elem, dir )
 	{
 		if( !$(elem) ){ return; }
@@ -180,97 +255,25 @@ window.IPBoard = Class.create({
 	createModal: function()
 	{
 		this.modal = new Element('div', { id: 'ipb_modal' } ).hide().addClassName('modal');
-		this.modal.setStyle("width: 100%; height: 100%; position: absolute; top: 0px; left: 0px; overflow: hidden; z-index: 1000; opacity: 0.2");
+		this.modal.setStyle("width: 100%; height: 100%; position: fixed; top: 0px; left: 0px; overflow: hidden; z-index: 1000; opacity: 0.2");
 		$('ipboard_body').insert({bottom: this.modal});
 	},
-	alert: function( message )
-	{
-		if( !$('ipb_alert') )
-		{
-			this.createAlert();
-		}
-		
-		this.showModal();
-		
-		$('ipb_alert_message').update( message );
-	},
-	createAlert: function()
-	{
-		wrapper = new Element('div', { id: 'ipb_alert' } );
-		icon = new Element('div', { id: 'ipb_alert_icon' } );
-		message = new Element('div', { id: 'ipb_alert_message' } );
-		ok_button = new Element('input', { 'type': 'button', 'value': "OK", id: 'ipb_alert_ok' });
-		cancel_button = new Element('input', { 'type': 'button', 'value': "Отмена", id: 'ipb_alert_cancel' });
-		
-		wrapper.insert( {bottom: icon} ).insert( {bottom: message} ).insert( {bottom: ok_button} ).insert( {bottom: cancel_button} ).setStyle('z-index: 1001');
-		
-		$('ipboard_body').insert({bottom: wrapper});
-		
-		this.positionCenter( wrapper, 'h' );
-	},
 	editorInsert: function( content, editorid )
 	{
 		// If no editor id supplied, lets use the first one
 		if( !editorid )	{
-			Debug.dir( ipb.editors );
-			var editor = $A( ipb.editors ).first();
-			
-			Debug.write( editor );
+			var editor = ipb.textEditor.getEditor();
 		} else {
-			var editor = ipb.editors[ editorid ];
+			var editor = ipb.textEditor.getEditor(editorid);
 		}
 		
 		if( Object.isUndefined( editor ) )
 		{
-			Debug.error( "Can't find any suitable editor" );
-			return;
+			/* Get current */
+			var editor = ipb.textEditor.getEditor();
 		}
 		
-		editor.insert_text( content );
-		editor.editor_check_focus();
-	},
-	getNotifications: function(e)
-	{
-		/*
-		 * Only run AJAX call once.  Cache and use the cache for subsequent requests.
-		 */
-		if( !ipb.notifications )
-		{
-			var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=notifications&do=getlatest';
-			
-			new Ajax.Request(	url,
-								{
-									method: 'post',
-									evalJSON: 'force',
-									parameters: {
-										secure_key: 	ipb.vars['secure_hash']
-									},
-									onSuccess: function(t)
-									{
-										/*
-										 * Get an error?
-										 */
-										if( t.responseJSON['error'] )
-										{
-											alert( t.responseJSON['error'] );
-										}
-										else
-										{
-											ipb.notifications	= true;
-											
-											$('user_notifications_link').addClassName('ipbmenu');
-											$('ipboard_body').insert( t.responseJSON['html'] );
-											
-											var _newMenu = new ipb.Menu( $('user_notifications_link'), $( "user_notifications_link_menucontent" ) );
-											_newMenu.doOpen();
-										}
-									}
-								}
-							);
-		}
-		
-		Event.stop(e);
-		return false;
+		editor.insert( content );
 	}
 });
 
@@ -462,11 +465,6 @@ IPBoard.prototype.validate = {
 			return false;
 		}
 	}
-	/*isURL: function( elem )
-	{
-		if( !$(elem) ){ return null; }		
-		return ( $F(elem).match( /^[A-Za-z]+:\/\/[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$/ ) == null ) ? true : false;
-	}*/
 };
 
 /* ===================================================================================================== */
@@ -488,10 +486,11 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			min_chars: 3,
 			multibox: false,
 			global_cache: false,
+			goToUrl: false,
 			classname: 'ipb_autocomplete',
 			templates: 	{ 
 							wrap: new Template("<ul id='#{id}'></ul>"),
-							item: new Template("<li id='#{id}'>#{itemvalue}</li>")
+							item: new Template("<li id='#{id}' data-url='#{url}'>#{itemvalue}</li>")
 						}
 		}, arguments[1] || {});
 		
@@ -518,7 +517,6 @@ IPBoard.prototype.Autocomplete = Class.create( {
 		$( this.obj ).observe('focus', this.timerEventFocus.bindAsEventListener( this ) );
 		$( this.obj ).observe('blur', this.timerEventBlur.bindAsEventListener( this ) );
 		$( this.obj ).observe('keypress', this.eventKeypress.bindAsEventListener( this ) );
-		
 	},
 	
 	eventKeypress: function(e)
@@ -546,7 +544,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			}
 			
 			Event.stop(e);
-		}	
+		}
 	},
 	
 	// MOUSE & KEYBOARD EVENT
@@ -560,8 +558,20 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			var itemid = $( current ).id.replace( this.id + '_ac_item_', '');
 			if( !itemid ){ return; }
 			
+			// Go to URL?
+			if( this.options.goToUrl && $( current ).readAttribute('data-url') )
+			{
+				window.location = $( current ).readAttribute('data-url');
+				return false;
+			}
+
 			// Get value
-			var value = this.items[ itemid ].replace('&amp;', '&').replace( /&#39;/g, "'" );
+			var value = this.items[ itemid ]
+				.replace('&amp;', '&')
+				.replace( /&#39;/g, "'" )
+				.replace( /&gt;/g, '>' )
+				.replace( /&lt;/g, '<' )
+				.replace( /&#33;/g, '!' );
 
 			if( this.options.multibox )
 			{
@@ -584,7 +594,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			{
 				$( this.obj ).value = value;
 				var effect = new Effect.Fade( $(this.list), { duration: 0.3 } );
-				this.observing = false;
+				//this.observing = false;
 			}			
 		}
 		
@@ -653,7 +663,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			{
 				this.selectFirstItem();
 			}
-		}				
+		}
 	},
 	
 	// INTERNAL CALL
@@ -662,7 +672,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 		if( !$( this.list ).visible() ){ return; }
 		this.unselectAll();
 		
-		$( this.list ).firstDescendant().addClassName('active');		
+		$( this.list ).firstDescendant().addClassName('active');
 	},
 	
 	// INTERNAL CALL
@@ -687,7 +697,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 	
 	// Ze goggles are blurry!
 	timerEventBlur: function(e)
-	{
+	{ 
 		window.clearTimeout( this.timer );
 		this.eventBlur.bind(this).delay( 0.6, e );
 	},
@@ -710,7 +720,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 	
 	eventFocus: function(e)
 	{
-		if( !this.observing ){ return; }
+		if( !this.observing ){ Debug.write("Not observing keypress"); return; }
 		this.objHasFocus = true;
 		
 		// Keep loop going
@@ -769,7 +779,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 										
 											// Seems to be OK!
 											this.cacheWrite( curValue, t.responseJSON );
-											this.updateAndShow( t.responseText.evalJSON() );
+											this.updateAndShow( t.responseJSON );
 										}
 									}.bind( this )
 								}
@@ -778,7 +788,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 		else
 		{
 			this.updateAndShow( json );
-		}				
+		}
 		
 		//Debug.write( curValue );
 	},
@@ -807,7 +817,7 @@ IPBoard.prototype.Autocomplete = Class.create( {
 		}
 		else
 		{
-			if( !Object.isUndefined( this.internal_cache.get( value  ) ) ){
+			if( !Object.isUndefined( this.internal_cache.get( value ) ) ){
 				Debug.write("Read from internal cache");
 				return this.internal_cache.get( value );
 			}
@@ -819,9 +829,9 @@ IPBoard.prototype.Autocomplete = Class.create( {
 	cacheWrite: function( key, value )
 	{
 		if( this.options.global_cache !== false ){
-			this.options.global_cache[ key ] = value;
+			this.options.global_cache.set( key, value );
 		} else {
-			this.internal_cache[ key ] = value;
+			this.internal_cache.set( key, value );
 		}
 		
 		return true;
@@ -902,7 +912,8 @@ IPBoard.prototype.Autocomplete = Class.create( {
 				 												itemvalue: item.value['showas'] || item.value['name'],
 				 												img: item.value['img'] || '',
 																img_w: item.value['img_w'] || '',
-																img_h: item.value['img_h'] || ''
+																img_h: item.value['img_h'] || '',
+																url: item.value['url'] || ''
 															});
 				this.items[ item.key ] = item.value['name'];
 	
@@ -922,48 +933,6 @@ IPBoard.prototype.Autocomplete = Class.create( {
 			this.selectFirstItem();
 		}
 	}
-				
-});
-
-/* ===================================================================================================== */
-/* Values for the IPB text editor */
-
-IPBoard.prototype.editor_values = $H({
-	'templates': 		$A(),
-	'colors_perrow': 	8,
-	'colors': [ 		'000000' , 'A0522D' , '556B2F' , '006400' , '483D8B' , '000080' , '4B0082' , '2F4F4F' ,
-						'8B0000' , 'FF8C00' , '808000' , '008000' ,	'008080' , '0000FF' , '708090' , '696969' ,
-						'FF0000' , 'F4A460' , '9ACD32' , '2E8B57' , '48D1CC' , '4169E1' , '800080' , '808080' ,
-						'FF00FF' , 'FFA500' , 'FFFF00' , '00FF00' ,	'00FFFF' , '00BFFF' , '9932CC' , 'C0C0C0' ,
-						'FFC0CB' , 'F5DEB3' , 'FFFACD' , '98FB98' ,	'AFEEEE' , 'ADD8E6' , 'DDA0DD' , 'FFFFFF'
-					],
-	
-	// You can add new fonts here if you wish, HOWEVER, if you use
-	// non-standard fonts, users without those fonts on their computer
-	// will not see them. The default list below has the generally accepted
-	// safe fonts; add others at your own risk! 
-	'primary_fonts': $H({ 	arial:					"Arial",
-							arialblack:				"Arial Black",
-							arialnarrow:			"Arial Narrow",
-							bookantiqua:			"Book Antiqua",
-							centurygothic:			"Century Gothic",
-							comicsansms:			"Comic Sans MS",
-							couriernew:				"Courier New",
-							franklingothicmedium:	"Franklin Gothic Medium",
-							garamond:				"Garamond",
-							georgia:				"Georgia",
-							impact:					"Impact",
-							lucidaconsole:			"Lucida Console",
-							lucidasansunicode:		"Lucida Sans Unicode",
-							microsoftsansserif:		"Microsoft Sans Serif",
-							palatinolinotype:		"Palatino Linotype",
-							tahoma:					"Tahoma",
-							timesnewroman:			"Times New Roman",
-							trebuchetms:			"Trebuchet MS",
-							verdana:				"Verdana"
-					}),
-	'font_sizes': $A([ 1, 2, 3, 4, 5, 6, 7 ])
-				
 });
 
 /* ===================================================================================================== */
@@ -1055,7 +1024,7 @@ var Loader = {
 		).each( 
 			function(s) {
   				var path = s.src.replace(/ipb\.js(\?.*)?$/,'');
-  				var includes = s.src.match(/\?.*load=([a-z0-9_,]*)/);
+  				var includes = s.src.match(/\?.*load=([a-zA-Z0-9_,]*)/);
 				if( ! Object.isUndefined(includes) && includes != null && includes[1] )
 				{
 					includes[1].split(',').each(
@@ -1072,6 +1041,190 @@ var Loader = {
 		);
 	}
 };
+var callback = { 
+	afterOpen: function( popup ){
+		try {
+			$( 'pj_' + $(elem).identify() + '_input').activate();
+		}
+		catch(err){ }
+	}
+};
+
+/* ==================================================================================================== */
+/* ELEMENT EXTENSIONS (tooltips, authorpane etc.) */
+
+Element.addMethods( {
+	
+	defaultize: function( element, lang )
+	{
+		if( ipb.global._supportsPlaceholder == null ){
+			ipb.global._supportsPlaceholder = (function(){
+				var i = document.createElement('input');
+				return 'placeholder' in i;
+			})();
+		}
+	
+		if( ipb.global._supportsPlaceholder ){
+			if( $F( element ) == lang || $F( element ).empty() ){
+				$(element).removeClassName('inactive').writeAttribute('placeholder', lang).value = '';
+			}
+		} else {
+			if( $F( element ) == lang || $F( element ).empty() ){
+				$(element).addClassName('inactive').value = lang;
+			}
+		
+			$(element).observe('focus', function(e){
+				if( $(element).hasClassName('inactive') && ( $F(element) == '' || $F(element) == lang ) ){
+					$(element).removeClassName('inactive').value = '';
+				} else {
+					$(element).removeClassName('inactive');
+				}
+			}).
+			observe('blur', function(e){
+				if( $F(element).empty() ){
+					$(element).addClassName('inactive').value = lang;
+				}
+			});
+			
+			// Try and find a form around the element
+			var form = $( element ).up('form');
+			if( !Object.isUndefined( form ) ){
+				$( form ).observe('submit', function(e){
+					if( $(element).hasClassName('inactive') ){
+						$(element).value = '';
+					}
+				});
+			}
+		}	
+	},
+	
+	clickLaunch: function( element )
+	{
+		var _callback = $( element ).readAttribute("data-clicklaunch");
+		var _scope    = 'global';
+		
+		try {
+			var _try = $( element ).readAttribute("data-scope");
+			_scope = ( _try ) ? _try.replace("ipb.", '') : _scope;
+		} catch(e) { };
+		
+		if( $(element).retrieve('clickevent') ){
+			try {
+		 		$(element).retrieve('clickevent').stop();
+			} catch(err){ };
+		}
+		
+		var click = $(element).on( 'click', function(e) {
+												Event.stop(e);
+												ipb[_scope][_callback]( element, e);
+											} );
+		$(element).store('clickevent', click);
+	},
+	
+	tooltip: function( element, options ){
+		
+		options = Object.extend( {
+			template: new Template("<div class='ipsTooltip' id='#{id}' style='display: none'><div class='ipsTooltip_inner'>#{content}</div></div>"),
+			position: 'auto',
+			content: $( element ).readAttribute("data-tooltip"),
+			animate: true,
+			overrideBrowser: true,
+			delay: 0.4
+		}, options);
+		
+		var show = function(e){
+			if( options.delay && !options._still_going ){
+				return; // Action has been cancelled
+			}
+			
+			var id = $(element).identify();
+
+			if( !$( id + '_tooltip' ) ){
+				$( document.body ).insert({ 'bottom': options.template.evaluate({ 'id': id + '_tooltip', 'content': options.content }) } );
+			}
+
+			if( options.overrideBrowser && $(element).hasAttribute('title') ){
+				$(element).writeAttribute("data-title", $(element).readAttribute('title')).writeAttribute("title", false);
+			}
+
+			var tooltip = $(id + '_tooltip').setStyle({position: 'absolute'});
+			
+			// Add word wrap for calculations
+			//$(tooltip).setStyle('white-space: nowrap');
+			
+			var layout = $(element).getLayout();
+			var position = $(element).cumulativeOffset();
+			var dims = $( id + '_tooltip' ).getDimensions();
+			var docDim = $( document.body ).getLayout();
+			
+			// Detect best position for tooltip
+			if( options.position == 'auto' ){
+				if( position.left + (layout.get('width')/2) - (dims.width/2) < 0 ){
+					options.position = 'right';
+				} else if( position.left + (dims.width/2) > docDim.get('width') ){
+					options.position = 'left';
+				} else {
+					options.position = 'top';
+				}				
+			}
+			
+			Debug.write( dims );
+			
+			// And now position
+			switch( options.position ){
+				case 'top':
+					$(tooltip).setStyle( { top: (position.top - dims.height - 1) + 'px', left: (position.left + (layout.get('width')/2) - (dims.width/2)) + 'px' } ).addClassName('top');
+				break;
+				case 'bottom':
+					$(tooltip).setStyle( { top: (position.top + layout.get('height') + 1) + 'px', left: (position.left + (layout.get('width')/2) - (dims.width/2)) + 'px' } ).addClassName('bottom');
+				break;
+				case 'left':
+					$(tooltip).setStyle( { top: (position.top - (layout.get('height') / 2)) + 'px', left: (position.left - dims.width -  3) + 'px' }).addClassName('left');
+				break;
+				case 'right':
+					$(tooltip).setStyle( { top: (position.top - (layout.get('height') / 2)) + 'px', left: (position.left + layout.get('width') - 3) + 'px' }).addClassName('right');
+				break;
+			}
+			
+			// Remove word wrap
+			//$(tooltip).setStyle('white-space: normal');
+
+			if( options.animate ){
+				new Effect.Appear( $(tooltip), { duration: 0.3, queue: 'end' } );
+			} else {
+				$(tooltip).show();
+			}
+		},
+		hide = function(e){
+			var id = $(element).identify();
+			if( !$(id + '_tooltip') ){ return; }
+			
+			if( options.animate ){
+				new Effect.Fade( $(id + '_tooltip'), { duration: 0.2, queue: 'end' });
+			} else {
+				$(id + '_tooltip').hide();
+			}
+		};
+		
+		$( element ).observe("mouseenter", function(e){
+			if( options.delay ){
+				options._still_going = true;
+				show.delay( options.delay, e );
+			} else {
+				show(e);
+			}
+		}).
+		observe("click", function(e){
+			options._still_going = false;
+			hide();
+		}).
+		observe("mouseleave", function(e)
+		{
+			options._still_going = false;
+			hide();				
+		});	
+	}
+});
 
 /************************************************/
 /* IPB3 Javascript								*/
@@ -1089,6 +1242,7 @@ _global.prototype.global = {
 	searchLastQuery: '',
 	rssItems: [],
 	reputation: {},
+	popups: {},
 	ac_cache: $H(),
 	pageJumps: $H(),
 	pageJumpMenus: $H(),
@@ -1097,6 +1251,8 @@ _global.prototype.global = {
 	tidPopOpen: 0,
 	activeTab: 'forums',
 	userCards: null,
+	inlineNotification: { timers: [] },
+	_supportsPlaceholder: null,
 	
 	/*------------------------------*/
 	/* Constructor 					*/
@@ -1111,94 +1267,608 @@ _global.prototype.global = {
 	initEvents: function()
 	{
 		// Delegate our user popup links/warn logs
-		ipb.delegate.register(".__user", ipb.global.userPopup);
 		ipb.delegate.register(".warn_link", ipb.global.displayWarnLogs);
 		ipb.delegate.register(".mini_friend_toggle", ipb.global.toggleFriend);
+		ipb.delegate.register(".__topic_preview", ipb.global.topicPreview);
+		ipb.delegate.register('.bbc_spoiler_show', ipb.global.toggleSpoiler);
+		ipb.delegate.register('a[rel~="external"]', ipb.global.openNewWindow );
+		ipb.delegate.register('._repLikeMore', ipb.global.repLikeMore);
+		ipb.delegate.register('a[rel~="quickNavigation"]', ipb.global.openQuickNavigation );
 		
-		// Fix up topic preview
-		$$('.__topic').each( function(i){
-			$(i).observe('mouseover', function(e){
-				ipb.global.topicPreviewShowIcon(e);
-			});
-			$(i).observe('mouseout', function(e){
-				ipb.global.topicPreviewHideIcon(e);
-			});
-			
-			ipb.global.topicPreviewSetUp(i);
-		});
+		if( $('sign_in') && !$('sign_in').hasClassName('no_ajax') ){
+			$('sign_in').on('click', ipb.global.inlineSignin);
+		}
 		
 		if( $('rss_feed') ){
 			ipb.global.buildRSSmenu();
 		}
 		
-		if( $('newSkin') || $('newLang') ){
-			ipb.global.setUpSkinLang();
-		}
-		
-		if( $('pm_notification') )
+		if ( ! Object.isUndefined( ipb.vars['notificationData'] ) )
 		{
-			/* Ensure pop-up isn't larger than viewport */
-			var _vph = document.viewport.getDimensions().height - 275;
-			
-			$('pm_notify_excerpt').setStyle( 'max-height:' + _vph + 'px; width:95%'  );
-			
-			new Effect.Parallel([
-				new Effect.Appear( $('pm_notification') ),
-				new Effect.BlindDown( $('pm_notification') )
-			], { duration: 0.5 } );
-			
-			if( $('close_pm_notification') ){
-				$('close_pm_notification').observe('click', ipb.global.closePMpopup );
-			}
-
-			if( $('ack_pm_notification') ){
-				$('ack_pm_notification').observe('click', ipb.global.markReadPMpopup );
-			}
-			
-			if( $('notification_go_forward') )
-			{
-				$('notification_go_forward').observe( 'click', ipb.global.getNextNotification );
-			}
-			
-			if( $('notification_go_back') )
-			{
-				$('notification_go_back').observe( 'click', ipb.global.getPreviousNotification );
-			}
+			new ipb.Popup( 'navigation_popup', { type: 'modal',
+											 	 initial: ipb.templates['notificationTemplate'].evaluate( ipb.vars['notificationData'] ),
+											 	 hideAtStart: false,
+												 w: '600px',
+											 	 h: 250} );
 		}
 		
 		/* This is needed for RTL - the generic anchoring isn't working on RTL for some reason */
-		if( $('backtotop') )
-		{
+		if( $('backtotop') ){
 			$('backtotop').observe( "click", function(e){ Event.stop(e); window.scroll( 0, 0 ); } );
 		}
 		
-		/* Global sign in */
-		if ( $('sign_in') )
-		{
-			wrapper = $('sign_in').down('.services');
-			
-			if ( wrapper )
-			{
-				wrapper.select('img').each( function(i) {
-					var _a = i.src.replace( /^.*loginmethods\/(\S+?)\.(png|gif).*$/, '$1' );
-					
-					if( _a == 'windows' )
-					{
-						_a = 'live';
-					}
+		ipb.global.buildPageJumps();		
+		ipb.global.initUserCards();
+		
+		/* Got an inline notification? */
+		if ( ! Object.isUndefined( ipb.templates['inlineMsg'] ) && ipb.templates['inlineMsg'] != '' ){
+			ipb.global.showInlineNotification( ipb.templates['inlineMsg'] );
+		}
+		
+		// Contextual search
+		if( $('search-box') ){
+			ipb.global.contextualSearch();
+		}
+		
+		// Global menus
+		if( $('user_link') ){
+			new ipb.Menu( $('user_link'), $('user_link_menucontent') );
+		}
+		
+		if( $('new_skin') ){
+			new ipb.Menu( $('new_skin'), $('new_skin_menucontent') );
+		}
 
-					i.observe( 'click', function(e) { Event.stop(e); window.location = ipb.vars['base_url'] + 'app=core&module=global&section=login&serviceClick=' + _a; } );
-				} );
-			}
+		if( $('new_language') ){
+			new ipb.Menu( $('new_language'), $('new_language_menucontent') );
+		}
+
+		if( $('mark_all_read') ){
+			new ipb.Menu( $('mark_all_read'), $('mark_all_read_menucontent') );
+		}
+		
+		// Tooltips
+		$$("[data-tooltip]").invoke('tooltip');
+		
+		// General click handlers
+		$$("[data-clicklaunch]").invoke('clickLaunch');
+		 
+		// Status updates
+		if( $('statusUpdateGlobal') ){
+			$('statusUpdateGlobal').defaultize( ipb.lang['global_status_update'] );
+			
+			$('statusSubmitGlobal').observe( 'click', ipb.global.statusUpdated );
+		}
+	},
+	
+	/* Updates a status where ever you are on the page. Differs from the ipb.status version slightly */
+	statusUpdated: function(e)
+	{
+		Event.stop(e);
+		
+		if ( $('statusUpdateGlobal' ).value.length < 2 || $('statusUpdateGlobal').value == ipb.lang['prof_update_default'] )
+		{
+			return false;
+		}
+		
+		/* Main status library loaded? */
+		if ( ! Object.isUndefined( ipb.status ) )
+		{
+			return ipb.status.updateSubmit( e, 'statusUpdateGlobal' );
+		}
+		
+		var su_Twitter  = $('su_TwitterGlobal') && $('su_TwitterGlobal').checked ? 1  : 0;
+		var su_Facebook = $('su_FacebookGlobal') && $('su_FacebookGlobal').checked ? 1 : 0;
+		
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=new&md5check=" + ipb.vars['secure_hash'] + "&return=json",
+						{
+							method: 'post',
+							evalJSON: 'force',
+							parameters: {
+								content: $('statusUpdateGlobal' ).value.encodeParam(),
+								su_Twitter: su_Twitter,
+								su_Facebook: su_Facebook
+							},
+							onSuccess: function(t)
+							{
+								if( Object.isUndefined( t.responseJSON ) )
+								{
+									alert( ipb.lang['action_failed'] );
+									return;
+								}
+								
+								if ( t.responseJSON['error'] )
+								{
+									alert( t.responseJSON['error'] );
+								}
+								else
+								{
+									try {
+										
+										ipb.global.showInlineNotification( ipb.lang['status_updated'] );
+										ipb.menus.closeAll(e);
+									}
+									catch(err)
+									{
+										Debug.error( 'Logging error: ' + err );
+									}
+								}
+							}
+						});
+	},
+	
+	/**
+	 * Displays the inbox drop down in header
+	 */
+	getInboxList: function(element, e)
+	{
+		/*
+		 * Only run AJAX call once.  Cache and use the cache for subsequent requests.
+		 */
+		if ( Object.isUndefined( ipb.global.popups['inbox'] ) )
+		{
+			ipb.global.popups['inbox'] = true;
+			ipb.menus.closeAll(e);
+			
+			$(element).identify();
+			
+			/* Create pop-up wrapper */
+			$(element).addClassName('ipbmenu');
+			
+			$('ipboard_body').insert( ipb.templates['header_menu'].evaluate( { id: 'user_inbox_link_menucontent' } ) );
+			
+			$('user_inbox_link_menucontent').setStyle('width: 300px').update( "<div class='ipsPad ipsForm_center'><img src='" + ipb.vars['loading_img'] + "' /></div>" );
+			
+			var _newMenu = new ipb.Menu( $(element), $( "user_inbox_link_menucontent" ) );
+			_newMenu.doOpen();			
+			
+			var url = ipb.vars['base_url'] + 'app=members&module=ajax&section=messenger&do=getInboxDropDown';
+			Debug.write( url );
+			new Ajax.Request(	url,
+								{
+									method: 'post',
+									evalJSON: 'force',
+									hideLoader: true,
+									parameters: {
+										secure_key: 	ipb.vars['secure_hash']
+									},
+									onSuccess: function(t)
+									{
+										/*
+										 * Get an error?
+										 */
+										if( t.responseJSON['error'] )
+										{
+											if ( t.responseJSON['__board_offline__'] )
+											{
+												ipb.global.errorDialogue( ipb.lang['board_offline'] );
+												ipb.menus.closeAll(e);
+											}
+										}
+										else
+										{										
+											$('user_inbox_link_menucontent').update( t.responseJSON['html'] );
+											
+											/* Clear counter */
+											try
+											{
+												$(element).down('.ipsHasNotifications').fade( { afterFinish: function() { $(element).down('.ipsHasNotifications').show().addClassName('ipsHasNotifications_blank'); } } );
+											} catch( acold ) { }
+										}
+									}
+								}
+							);
+		}
+		
+		Event.stop(e);
+		return false;
+	},
+	
+	/**
+	 * Displays the notifications drop down in header
+	 */
+	getNotificationsList: function(element, e)
+	{
+		Event.stop(e);
+		
+		/*
+		 * Only run AJAX call once.  Cache and use the cache for subsequent requests.
+		 */
+		if ( Object.isUndefined( ipb.global.popups['notification'] ) )
+		{
+			ipb.global.popups['notification'] = true;
+			
+			ipb.menus.closeAll(e);
+			
+			$(element).identify();
+			
+			/* Create pop-up wrapper */
+			$(element).addClassName('ipbmenu');
+			
+			$('ipboard_body').insert( ipb.templates['header_menu'].evaluate( { id: 'user_notifications_link_menucontent' } ) );
+			
+			$('user_notifications_link_menucontent').setStyle('width: 300px').update( "<div class='ipsPad ipsForm_center'><img src='" + ipb.vars['loading_img'] + "' /></div>" );
+			
+			var _newMenu = new ipb.Menu( $(element), $( "user_notifications_link_menucontent" ) );
+			_newMenu.doOpen();
+			
+			var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=notifications&do=getlatest';
+			Debug.write( url );
+			
+			new Ajax.Request(	url,
+								{
+									method: 'post',
+									evalJSON: 'force',
+									hideLoader: true,
+									parameters: {
+										secure_key: 	ipb.vars['secure_hash']
+									},
+									onSuccess: function(t)
+									{
+										/*
+										 * Get an error?
+										 */
+										if( t.responseJSON['error'] )
+										{
+											if ( t.responseJSON['__board_offline__'] )
+											{
+												ipb.global.errorDialogue( ipb.lang['board_offline'] );
+												ipb.menus.closeAll(e);
+											}
+										}
+										else
+										{										
+											$('user_notifications_link_menucontent').update( t.responseJSON['html'] );
+											
+											/* Clear counter */
+											try
+											{
+												$(element).down('.ipsHasNotifications').fade( { afterFinish: function() { $(element).down('.ipsHasNotifications').show().addClassName('ipsHasNotifications_blank'); } } );
+											} catch( acold ) { }
+										}
+									}
+								}
+							);
 		}
 		
 		
-		ipb.global.buildPageJumps();
+		return false;
+	},
+
+	
+	openQuickNavigation: function( e )
+	{
+		Event.stop(e);
 		
-		ipb.delegate.register('.bbc_spoiler_show', ipb.global.toggleSpoiler);
-		ipb.delegate.register('a[rel~="external"]', ipb.global.openNewWindow );
+		if( ipb.global.popups['quickNav'] ){
+			ipb.global.popups['quickNav'].show();
+		} else {
+			var url = ipb.vars['base_url'] + "app=core&module=ajax&section=navigation&secure_key=" + ipb.vars['secure_hash'] + "&inapp=" + ipb.vars['active_app'];
+			ipb.global.popups['quickNav'] = new ipb.Popup( 'navigation_popup', { type: 'modal',
+												 ajaxURL: url,
+												 hideAtStart: false,
+												 w: '600px',
+												 h: 460 } );
+
 		
-		ipb.global.initUserCards();
+			/* delegate */
+			ipb.delegate.register('a[rel~="ipsQuickNav"]', ipb.global.quickNavTabClick );
+		}
+		
+		return false;
+	},
+	
+	launchPhotoEditor: function( elem, e )
+	{
+		Event.stop(e);
+		
+		if ( ! Object.isUndefined( ipb.global.popups['photoEditor'] ) )
+		{
+			ipb.global.popups['photoEditor'].kill();
+		}
+		
+		var url = ipb.vars['base_url'] + "&app=members&module=ajax&section=photo&do=show&secure_key=" + ipb.vars['secure_hash'];		
+		ipb.global.popups['photoEditor'] = new ipb.Popup( 'photo_popup', {  type: 'pane',
+																				 modal: true,
+																				 ajaxURL: url,
+																				 hideAtStart: false,
+																				 evalJs: 'force',
+																				 w: '750px',
+																				 h: 500
+																				  } );
+		return false;
+	},
+	
+	quickNavTabClick: function( e, elem )
+	{
+		Event.stop(e);
+		app = elem.readAttribute( 'data-app' );
+		
+		var url = ipb.vars['base_url'] + "app=core&module=ajax&section=navigation&secure_key=" + ipb.vars['secure_hash'] + "&do=panel&inapp=" + app;
+		
+		new Ajax.Request(	url.replace(/&amp;/g, '&'),
+				{
+					method: 'get',
+					evalJSON: 'force',
+					hideLoader: true,
+					onSuccess: function(t)
+					{
+						$('ipsNav_content').update( t.responseText );
+						
+						$$('a[rel~="ipsQuickNav"]').each( function(link)
+						{
+							link.up('li').removeClassName('active');
+							var _app = link.readAttribute( 'data-app' );
+							
+							if ( _app == app )
+							{
+								link.up('li').addClassName('active');
+							}
+						} );
+					}
+				});
+		
+		return false;
+	},
+	
+	
+	ajaxPagination: function( element, url )
+	{
+		new Ajax.Request(	url.replace(/&amp;/g, '&'),
+							{
+								method: 'get',
+								evalJSON: 'force',
+								hideLoader: true,
+								onSuccess: function(t)
+								{
+									$(element).update( t.responseText );
+								}
+							});
+
+		return false;
+	},
+	
+	inlineSignin: function( e )
+	{
+		if( ipb.vars['is_touch'] ){ // Just go to normal form for touch devices
+			return;
+		}
+		
+		var elem = Event.findElement(e);
+		
+		Event.stop(e);
+		var url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=templates&amp;secure_key=" + ipb.vars['secure_hash'] + "&amp;template_group=login&amp;template_bit=inlineLogInForm&amp;lang_module=login&amp;lang_app=core";
+		
+		// Fetch template
+		new Ajax.Request(	url.replace(/&amp;/g, '&'),
+							{
+								method: 'get',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									if ( t.responseJSON['error'] )
+									{
+										window.location = elem.readAttribute('href');
+									}
+									else
+									{
+										new ipb.Popup( 'sign_in_popup', {	type: 'pane',
+																			initial: t.responseJSON['html'],
+																			hideAtStart: false,
+																			hideClose: false,
+																			defer: false,
+																			modal: true,
+																			w: '600px' },
+																		{
+																			afterShow: function(pop){
+																				try {
+																					$('ips_username').focus();
+																				} catch(err){}
+																			}
+																		});
+									}
+								}
+							});
+	},
+	
+	forumMarkRead: function(elem, e)
+	{
+		Event.stop(e);
+		
+		var id = $(elem).readAttribute("data-fid");
+		
+		if( !id ){ return; }
+		
+		var url    = ipb.vars['base_url'] + '&app=forums&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=forums&do=markRead&fid=' + id;
+	
+		// Send AJAX request
+		new Ajax.Request( 	url,
+			 				{
+								method: 'get',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									if( t.responseText == 'no_forum' || t.responseText == 'no_permission' ){
+										alert( ipb.lang['mark_read_forum'] );
+										return;
+									}
+									
+									/* Remove elements */
+									$$('.__topic').each( function( topic )
+									{
+										if ( $(topic).hasClassName('unread') )
+										{
+											var tid = $(topic).readAttribute("data-tid");
+											
+											if ( tid )
+											{
+												ipb.global.topicRemoveUnreadElements( tid );
+											}
+										}
+									} );
+								}
+							});
+		
+	},
+	
+	topicMarkRead: function(elem, e)
+	{
+		Event.stop(e);
+		
+		var id = $(elem).readAttribute("data-tid");
+		
+		if( !id ){ return; }
+		
+		var row    = $('trow_'+id);
+		var url    = ipb.vars['base_url'] + '&app=forums&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=topics&do=markRead&tid=' + id;
+	
+		// Send AJAX request
+		new Ajax.Request( 	url,
+			 				{
+								method: 'get',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									if( t.responseText == 'no_topic' || t.responseText == 'no_permission' ){
+										alert( ipb.lang['mark_read_topic'] );
+										return;
+									}
+									
+									/* Remove mark as read link */
+									$(elem).remove();
+									
+									/* Close preview */
+									ipb.global.topicPreview(e, row.down('.__topic_preview') );
+									
+									/* Remove elements */
+									ipb.global.topicRemoveUnreadElements( id );
+								}
+							});
+		
+	},
+	
+	topicRemoveUnreadElements: function( tid )
+	{
+		$('trow_' + tid).removeClassName('unread').down('.col_f_icon').select('a img').invoke('remove');
+	},
+	
+	topicPreview: function(e, elem)
+	{				
+		Event.stop(e);
+		
+		var toggle = $(elem).down(".expander");
+		var row = $(elem).up(".__topic");
+		var id = $(row).readAttribute("data-tid");
+		
+		if( !id ){ return; }
+		
+		// Stop multiple loads
+		if( $(row).readAttribute('loadingPreview') == 'yes' ){
+			return; // Just be patient!
+		}		
+		$( row ).writeAttribute('loadingPreview', 'yes');
+		
+		if( $("topic_preview_" + id) )
+		{
+			if( $("topic_preview_wrap_" + id).visible() )
+			{ 
+				new Effect.BlindUp( $("topic_preview_wrap_" + id), { duration: 0.3, afterFinish: function(){ $('topic_preview_' + id).hide(); } } );
+				row.removeClassName('highlighted');
+				$( toggle ).addClassName('closed').removeClassName('loading').removeClassName('open').writeAttribute('title', ipb.lang['open_tpreview']);
+			}
+			else
+			{
+				$('topic_preview_' + id).show();
+				new Effect.BlindDown( $("topic_preview_wrap_" + id), { duration: 0.3 } );
+				row.addClassName('highlighted');
+				$( toggle ).addClassName('open').removeClassName('loading').removeClassName('closed').writeAttribute('title', ipb.lang['close_tpreview']);
+			}
+			
+			$(row).writeAttribute('loadingPreview', 'no');
+		}
+		else
+		{
+			var url    = ipb.vars['base_url'] + '&app=forums&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=topics&do=preview&tid=' + id;
+			if ( ipb.global.searchResults[ id ] ){
+				url += '&pid=' + ipb.global.searchResults[ id ]['pid'] + '&searchTerm=' + ipb.global.searchResults[ id ]['searchterm'];
+			}
+			
+			$( toggle ).addClassName('loading').removeClassName('closed').removeClassName('open');
+			
+			// Send AJAX request
+			new Ajax.Request( 	url,
+				 				{
+									method: 'get',
+									evalJSON: 'force',
+									onSuccess: function(t)
+									{
+										if( t.responseText == 'no_topic' || t.responseText == 'no_permission' ){
+											alert( ipb.lang['no_permission_preview'] );
+											$( toggle ).addClassName('open').removeClassName('loading').removeClassName('closed').writeAttribute('title', ipb.lang['close_tpreview']);
+
+											$(row).writeAttribute('loadingPreview', 'no');
+											return;
+										}
+										
+										if( row.tagName == "TR" )
+										{
+											var count = row.childElements().size();
+											var newrow = new Element('tr', { 'class': 'preview', 'id': 'topic_preview_' + id });
+											var newcell = new Element('td', { 'colspan': count } );
+											var wrap = new Element('div', { 'id': 'topic_preview_wrap_' + id }).hide().update( new Element('div' ) );
+											
+											// Put all the bits inside each other
+											row.insert( { after: newrow.insert( newcell.insert( wrap ) ) } );
+										}
+										else
+										{
+											var wrap = new Element('div', { 'id': 'topic_preview_wrap_' + id }).hide().update( new Element('div') );
+											row.insert( { after: wrap } );
+										}										
+										
+										// Insert content
+										wrap.update( t.responseText ).relativize();
+										// display it
+										new Effect.BlindDown( wrap, { duration: 0.3 } );
+										// Update row & elem
+										row.addClassName('highlighted');
+										$( toggle ).addClassName('open').removeClassName('loading').removeClassName('closed').writeAttribute('title', ipb.lang['close_tpreview']);
+										
+										$(row).writeAttribute('loadingPreview', 'no');
+									}
+								});
+		}
+	},
+	
+	// Set up the main menu
+	activateMainMenu: function()
+	{
+		if( $("nav_other_apps") && $("community_app_menu") ){
+			var start = totalW = $("nav_other_apps").getWidth();
+			var menuWidth = $("community_app_menu").getWidth();
+			
+			$("community_app_menu").select("li:not(#nav_other_apps)").each( function(elem){
+				totalW += $(elem).measure('margin-box-width');
+				
+				if( totalW >= menuWidth )
+				{
+					if( !$("more_apps_menucontent") ){
+						$$("body")[0].insert("<ul class='ipbmenu_content' id='more_apps_menucontent'></ul>");
+					}
+					
+					$("more_apps_menucontent").insert( elem ); // Move item to menu
+				}
+			});
+			
+			// Do we have an app menu?
+			if( $("more_apps_menucontent" ) )
+			{
+				$("nav_other_apps").show();
+				new ipb.Menu( $('more_apps'), $('more_apps_menucontent') );
+			}
+			
+			Debug.write( menuWidth );
+		}
 	},
 	
 	/**
@@ -1207,13 +1877,103 @@ _global.prototype.global = {
 	initUserCards: function()
 	{
 		/* User cards */
-		if ( ! Object.isUndefined( ipb.hoverCard ) )
+		if ( ! Object.isUndefined( ipb.hoverCard ) && ipb.vars['is_touch'] === false && ipb.vars['member_group']['g_mem_info'] == 1 )
 		{
 			var ajaxUrl = ipb.vars['base_url'] + '&app=members&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=card';
-			ipb.hoverCardRegister.initialize( 'member', { 'w': '400px', 'delay': 750, 'position': 'auto', 'ajaxUrl': ajaxUrl, 'getId': true, 'setIdParam': 'mid' } );
+			if ( ipb.topic !== undefined && ipb.topic.forum_id !== undefined )
+			{
+				ajaxUrl += "&f=" + ipb.topic.forum_id;
+			}
+			
+			ipb.hoverCardRegister.initialize( 'member', { 'w': '500px', 'delay': 750, 'position': 'auto', 'ajaxUrl': ajaxUrl, 'getId': true, 'setIdParam': 'mid' } );
 		}
 	},
 	
+	/**
+	 * Display an inline notification
+	 * 
+	 */
+	showInlineNotification: function( content, options )
+	{
+		/* Fix options */
+		options					  = ( Object.isUndefined( options ) ) ? {} : options;
+		options.showClose 		  = ( Object.isUndefined( options.manualClose ) ) ? false : options.showClose;
+		options.neverClose 		  = ( Object.isUndefined( options.neverClose ) )  ? false : options.neverClose;
+		options.displayForSeconds = ( Object.isUndefined( options.displayForSeconds ) ) ? 5 : options.displayForSeconds;
+		
+		/* Already one open? */
+		if ( $('ipsGlobalNotification' ) )
+		{
+			var span = $('ipsGlobalNotification').down('span');
+			
+			/* fade out current content and fade in new */
+			new Effect.Fade( span, { duration: 0.8, afterFinish:
+				function() {
+					span.replace( new Element( 'span' ).update( content ) );
+					new Effect.Appear( $('ipsGlobalNotification').down('span'), { duration: 0.8 } );
+				}
+			} );
+		}
+		else
+		{
+			if( $('ipbwrapper') )
+			{
+				/* Front end */
+				$('ipbwrapper').insert( new Element('div', { id: 'ipsGlobalNotification' } ).update( ipb.templates['global_notify'].evaluate( { 'message': content } ) ) );
+			}
+			else
+			{
+				/* ACP */
+				$('ipboard_body').insert( new Element('div', { id: 'ipsGlobalNotification' } ).update( ipb.templates['global_notify'].evaluate( { 'message': content, 'close': ipb.templates['global_notify_close'] } ) ) );
+			}
+			
+			/* Add in content */			
+			new Effect.Appear( 'ipsGlobalNotification', { duration: 1.5 } );
+			
+			if ( options.showClose )
+			{
+				$('ipsGlobalNotification').insert( new Element( 'div', { id: 'ipsGlobalNotification_close' } ) );
+				$('ipsGlobalNotification_close').observe('click', ipb.global.closeInlineNotification );
+			}
+			else if( $('ipsGlobalNotification_close') )
+			{
+				$('ipsGlobalNotification_close').observe('click', ipb.global.closeInlineNotification );
+			}
+		}
+		
+		/* Listen on any a hrefs */
+		$('ipsGlobalNotification').on('click', 'span a', ipb.global.closeInlineNotification);
+		
+		/* Close */
+		if ( options.neverClose !== true )
+		{
+			try	{
+				clearTimeout( ipb.global.inlineNotification['timers']['close'] );
+			}
+			catch(e) {}
+			
+			ipb.global.inlineNotification['timers']['close'] = setTimeout( ipb.global.closeInlineNotification, options.displayForSeconds * 1000 );
+		}
+	},
+	
+	/**
+	 * Closes a notification
+	 */
+	closeInlineNotification: function()
+	{
+		if ( $('ipsGlobalNotification_close') ){
+			$('ipsGlobalNotification_close').stopObserving('click');
+		}
+		
+		try {
+			clearTimeout( ipb.global.inlineNotification['timers']['close'] );
+		}
+		catch(e) {}
+		
+		new Effect.Fade( 'ipsGlobalNotification', { duration: 1.0 } );
+		setTimeout( function() { $('ipsGlobalNotification').remove(); }, 2000 );
+	},
+	
 	/**
 	 * Show an error dialogue
 	 * @param string
@@ -1221,15 +1981,15 @@ _global.prototype.global = {
 	 */
 	errorDialogue: function( text )
 	{
-		content = "<h3>&nbsp;</h3><div class='row2 pad' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
+		errContent = "<h3>" + ipb.lang['error_occured'] + "</h3><div class='row2 ipsPad ipsForm_center'><p>" + text + "</p></div>";
 		
 		new ipb.Popup( 'generic__errorDialogue', {  type: 'pane',
-													initial: content,
+													initial: errContent,
 													stem: true,
 													hideAtStart: false,
 													hideClose: false,
 													defer: false,
-													warning: true,
+													warning: false,
 													w: 400 } );
 	},
 	
@@ -1240,10 +2000,10 @@ _global.prototype.global = {
 	 */
 	okDialogue: function( text )
 	{
-		content = "<h3>&nbsp;</h3><div class='row2 pad' style='height: 20px; text-align:center'><p>" + text + "</p></div>";
+		okContent = "<h3>" + ipb.lang['success'] + "</h3><div class='row2 ipsPad ipsForm_center'><p>" + text + "</p></div>";
 		
 		new ipb.Popup( 'generic__okDialogue', {  type: 'pane',
-												 initial: content,
+												 initial: okContent,
 												 stem: true,
 												 hideAtStart: false,
 												 hideClose: false,
@@ -1251,134 +2011,11 @@ _global.prototype.global = {
 												 w: 400 } );
 	},
 	
-	getNextNotification: function(e)
-	{
-		// Need our current latest id
-		var _currentId	= $('pm_notification').readAttribute( 'rel' );
-		
-		// Build URL
-		var url = ipb.vars['base_url'] + "app=core&section=notifications&module=ajax&do=getNextNotification&last=" + _currentId + "&md5check=" + ipb.vars['secure_hash'];
-		
-		// Send AJAX request
-		new Ajax.Request( 	url,
-			 				{
-								method: 'get',
-								evalJSON: 'force',
-								onSuccess: function(t)
-								{
-									if( t.responseJSON['error'] )
-									{
-										alert( t.responseJSON['error'] );
-									}
-									else
-									{
-										$('pm_notification').writeAttribute( 'rel', t.responseJSON['notify_id'] );
-										
-										$('pm_date').update( t.responseJSON['notify_date_formatted'] );
-										$('pm_notify_title').update( t.responseJSON['notify_title'] );
-										$('pm_notify_excerpt').update( t.responseJSON['notify_text'] );
-										
-										$('view_pm_notification').writeAttribute( 'href', t.responseJSON['notify_url'] );
-										$('ack_pm_notification').writeAttribute( 'href', $('ack_pm_notification').readAttribute('href').replace( /mark=(\d+)/, 'mark=' + t.responseJSON['notify_id'] ) );
-										
-										if( !t.responseJSON['has_more'] )
-										{
-											$('notification_go_forward').addClassName('hide');
-										}
-										else
-										{
-											$('notification_go_forward').removeClassName('hide');
-										}
-										
-										if( t.responseJSON['has_previous'] )
-										{
-											$('notification_go_back').removeClassName('hide');
-										}
-										else
-										{
-											$('notification_go_back').addClassName('hide');
-										}
-										
-										var _currentCount	= parseInt($('pm-count').innerHTML);
-										$('pm-count').update( _currentCount + 1 );
-									}
-								}
-							}
-						);
-						
-		Event.stop(e);
-		return false;
-	},
-	
-	getPreviousNotification: function(e)
-	{
-		// Need our current latest id
-		var _currentId	= $('pm_notification').readAttribute( 'rel' );
-		
-		// Build URL
-		var url = ipb.vars['base_url'] + "app=core&section=notifications&module=ajax&do=getLastNotification&last=" + _currentId + "&md5check=" + ipb.vars['secure_hash'];
-		
-		// Send AJAX request
-		new Ajax.Request( 	url,
-			 				{
-								method: 'get',
-								evalJSON: 'force',
-								onSuccess: function(t)
-								{
-									if( t.responseJSON['error'] )
-									{
-										alert( t.responseJSON['error'] );
-									}
-									else
-									{
-										$('pm_notification').writeAttribute( 'rel', t.responseJSON['notify_id'] );
-										
-										$('pm_date').update( t.responseJSON['notify_date_formatted'] );
-										$('pm_notify_title').update( t.responseJSON['notify_title'] );
-										$('pm_notify_excerpt').update( t.responseJSON['notify_text'] );
-										
-										$('view_pm_notification').writeAttribute( 'href', $('view_pm_notification').readAttribute('href').replace( /view=(\d+)/, 'view=' + t.responseJSON['notify_id'] ) );
-										$('ack_pm_notification').writeAttribute( 'href', $('ack_pm_notification').readAttribute('href').replace( /mark=(\d+)/, 'mark=' + t.responseJSON['notify_id'] ) );
-										
-										if( !t.responseJSON['has_previous'] )
-										{
-											$('notification_go_forward').addClassName('hide');
-										}
-										else
-										{
-											$('notification_go_forward').removeClassName('hide');
-										}
-										
-										if( t.responseJSON['has_more'] )
-										{
-											$('notification_go_back').removeClassName('hide');
-										}
-										else
-										{
-											$('notification_go_back').addClassName('hide');
-										}
-										
-										var _currentCount	= parseInt($('pm-count').innerHTML);
-										$('pm-count').update( _currentCount - 1 );
-									}
-								}
-							}
-						);
-		
-		Event.stop(e);
-		return false;
-	},
-	
 	contextualSearch: function()
 	{
 		if( !$('search_options') && !$('search_options_menucontent') ){ return; }
 		
-		$('main_search').addClassName('inactive').value = ipb.lang['search_default_value'];
-		$('main_search').observe('focus', function(e){
-			if( $('main_search').hasClassName('inactive') ){
-				$('main_search').removeClassName('inactive').value="";
-			}
-		});
+		$('main_search').defaultize( ipb.lang['search_default_value'] );
 		
 		// This removes the text for IE7
 		$('search').select('.submit_input').find( function(elem){ $(elem).value = ''; } );
@@ -1386,8 +2023,12 @@ _global.prototype.global = {
 		var update = function( noSelect )
 		{
 			var checked = $('search_options_menucontent').select('input').find( function(elem){ return $(elem).checked; } );
-			if( Object.isUndefined( checked ) ){ return; }
-			$('search_options').update( $( checked ).up('label').readAttribute('title') || '' );
+			if( Object.isUndefined( checked ) ){ 
+				checked = $('search_options_menucontent').select('input:first')[0];
+				if( !checked ){ return; }
+				checked.checked = true;
+			}
+			$('search_options').show().update( $( checked ).up('label').readAttribute('title') || '' );
 			
 			// Put cursor in search box
 			if( noSelect != true ){
@@ -1400,91 +2041,7 @@ _global.prototype.global = {
 		
 		$('search_options_menucontent').select('input').invoke('observe', 'click', update);
 	},
-	
-	initTabs: function()
-	{
-		$$('.tab_toggle').each( function(elem){
-			$(elem).observe('click', ipb.global.changeTabContent );
-		});
-	},
-	
-	changeTabContent: function(e)
-	{
-		Event.stop(e);
-		elem = Event.findElement(e, 'li');
-		if( !elem.hasClassName('tab_toggle') || !elem.id ){ return; }
-		ol = elem.up('ol');
-		id = elem.id.replace('tab_link_', '');
-		if( !id || id.blank() ){ return; }
-		if( !$('tab_content_' + id ) ){ return; }
-		
-		if( ipb.global.activeTab == id )
-		{
-			return;
-		}
-		
-		oldTab = ipb.global.activeTab;
-		ipb.global.activeTab = id;
-		
-		// OK, we should have an ID. Does it exist already?
-		if( !$('tab_' + id ) )
-		{
-			ol.select('.tab_toggle').each( function(otherelem){
-				_id = otherelem.id.replace('tab_link_', '');
-				if ( $('tab_content_' + _id ) )
-				{
-					$( $('tab_content_' + _id ) ).hide();
-				}
-			});
-			
-			$('tab_content_' + id ).show();
-		}
-		else
-		{
-			new Effect.Parallel( [
-				new Effect.BlindUp( $('tab_content_' + oldTab), { sync: true } ),
-				new Effect.BlindDown( $('tab_content_' + ipb.global.activeTab), { sync: true } )
-			], { duration: 0.4 } );
-		}
-		
-		ol.select('.tab_toggle').each( function(otherelem){
-			$(otherelem).removeClassName('active');
-		});
-		
-		$(elem).addClassName('active');
-		
-	},
-	
-	userPopup: function( e, elem )
-	{
-		Event.stop(e);
-		
-		var sourceid = elem.identify();
-		var user = $( elem ).className.match('__id([0-9]+)');
-		var fid  = $( elem ).className.match('__fid([0-9]+)');
 
-		if( user == null || Object.isUndefined( user[1] ) ){ Debug.error("Error showing popup"); return; }
-		var popid = 'popup_' + user[1] + '_user';
-		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=card&mid=' + user[1];
-		
-		Debug.write( fid );
-		
-		if ( fid != null && !Object.isUndefined( fid[1] ) && fid[1] )
-		{
-			_url += '&f=' + fid[1];
-		}
-
-		Debug.write( _url );
-		ipb.namePops[ user ]	 = new ipb.Popup( popid, {
-			 												type: 'balloon',
-			 												ajaxURL: _url,
-			 												stem: true,
-															hideAtStart: false,
-			 												attach: { target: elem, position: 'auto' },
-			 												w: '400px'
-														});
-	},
-	
 	fetchTid: function( e )
 	{
 		var elem = Event.element(e);
@@ -1507,141 +2064,7 @@ _global.prototype.global = {
 		
 		return tid;
 	},
-	
-	topicPreviewSetUp: function( id )
-	{
-		var m    = $(id).className.match('__tid([0-9]+)');
-		var tid  = m[1];
-		
-		if ( tid && $('tidPop_' + tid) )
-		{
-			$('tidPop_' + tid).setOpacity( 0.3 );
-			
-			$('tidPop_' + tid ).down('img').observe('mouseover', function(e){
-				ipb.global.topicPreviewMover(e);
-			});
-			$('tidPop_' + tid ).down('img').observe('mouseout', function(e){
-				ipb.global.topicPreviewMout(e);
-			});
-		}
-	},
-	
-	topicPreviewShowIcon: function( e )
-	{
-		tid = ipb.global.fetchTid( e );
-		
-		if ( tid )
-		{
-			/* kill all others */
-			if ( ! ipb.global.tidPopOpen )
-			{
-				$$('.__tpopup').invoke('hide');
-			}
-		
-			if( $('tidPop_' + tid ) )
-			{
-				$('tidPop_' + tid ).observe( 'click', ipb.global.topicPreviewPop );
-				$('tidPop_' + tid).setStyle( { 'cursor': 'pointer' } );
-				$('tidPop_' + tid).show();
-			}
-		}
-	},
-	
-	topicPreviewHideIcon: function( e )
-	{
-		tid = ipb.global.fetchTid( e );
-		
-		if ( ipb.global.tidPopOpen > 0 && ipb.global.tidPopOpen == tid )
-		{
-			return;
-		}
-		
-		if ( tid && $('tidPop_' + tid) )
-		{
-			$('tidPop_' + tid).hide();
-			$('tidPop_' + tid ).stopObserving();
-		}
-	},
-	
-	topicPreviewMover: function( e )
-	{
-		tid = ipb.global.fetchTid( e );
-		if ( tid )
-		{
-			$('tidPop_' + tid).setOpacity(1);
-		}
-	},
-	
-	topicPreviewMout: function( e )
-	{
-		tid = ipb.global.fetchTid( e );
-		
-		if ( ipb.global.tidPopOpen > 0 && ipb.global.tidPopOpen == tid )
-		{
-			return;
-		}
-		
-		if ( tid )
-		{
-			$('tidPop_' + tid).setOpacity(0.3);
-		}
-	},
-	
-	topicPreviewPop: function( e )
-	{
-		Event.stop(e);
-		
-		var tid = ipb.global.fetchTid(e);
-		
-		if ( ipb.global.tidPopOpen == tid )
-		{
-			return;
-		}
-		else if ( ipb.global.tidPopOpen > 0 )
-		{
-			if ( $('tid-' + ipb.global.tidPopOpen + '_popup' ) )
-			{
-				$$('#tid-' + ipb.global.tidPopOpen + '_popup' ).each( function( id ) { id.hide(); } );
-				
-				/* hide icon if open elsewhere */
-				$('tidPop_' + ipb.global.tidPopOpen).hide();
-				$('tidPop_' + ipb.global.tidPopOpen).stopObserving();
-			}
-		}
-		
-		var _url    = ipb.vars['base_url'] + '&app=forums&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=topics&do=preview&tid=' + tid;
-		
-		/* From search? */
-		if ( ipb.global.searchResults[ tid ] )
-		{
-			_url += '&pid=' + ipb.global.searchResults[ tid ]['pid'] + '&searchTerm=' + ipb.global.searchResults[ tid ]['searchterm'];
-		}
-		
-		ipb.topicPops[ 'tid-' + tid ]	 = new ipb.Popup( 'tid-' + tid, {
-			 												type: 'balloon',
-			 												ajaxURL: _url,
-			 												stem: true,
-															hideAtStart: false,
-			 												attach: { target: $('tidPop_' + tid), position: 'auto' },
-			 												w: '400px' }, { 'afterHide': ipb.global.topicPreviewHide } );
-			 												
-		ipb.global.tidPopOpen = tid;
-		
-	},
-	
-	topicPreviewHide: function(e)
-	{
-		if ( $('tidPop_' + ipb.global.tidPopOpen ) )
-		{
-			$('tidPop_' + ipb.global.tidPopOpen ).setOpacity(0.3);
-		}
-		
-		$$('.__tpopup').invoke('hide');
-		
-		ipb.global.tidPopOpen = 0;
-	},
-	
-	/* SKINNOTE: Needs cleaning up */
+
 	displayWarnLogs: function( e, elem )
 	{		
 		mid = elem.id.match('warn_link_([0-9a-z]+)_([0-9]+)')[2];
@@ -1653,8 +2076,8 @@ _global.prototype.global = {
 		
 		Event.stop(e);
 		
-		var _url 		= ipb.vars['base_url'] + '&app=members&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=warn&do=view&mid=' + mid;
-		warnLogs = new ipb.Popup( 'warnLogs', {type: 'pane', modal: false, w: '500px', h: '500px', ajaxURL: _url, hideAtStart: false, close: '.cancel' } );
+		var _url 		= ipb.vars['base_url'] + '&app=core&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=warn&do=view&mid=' + mid;
+		warnLogs = new ipb.Popup( 'warnLogs', {type: 'pane', modal: false, w: '500px', h: 500, ajaxURL: _url, hideAtStart: false, close: '.cancel' } );
 		
 	},
 	
@@ -1746,7 +2169,7 @@ _global.prototype.global = {
 					sid = ipb.topic.start_id;
 				}
 
-				window.location = ipb.vars['base_url'] + 'app=forums&module=moderate&section=moderate&do=setAsSpammer&member_id=' + memberId + '&t=' + tid + '&f=' + fid + '&st=' + sid + '&auth_key=' + ipb.vars['secure_hash'];
+				window.location = ipb.vars['base_url'] + 'app=core&module=modcp&section=editmember&do=setAsSpammer&member_id=' + memberId + '&t=' + tid + '&f=' + fid + '&st=' + sid + '&auth_key=' + ipb.vars['secure_hash'];
 				return false;
 			}
 			else
@@ -1773,50 +2196,13 @@ _global.prototype.global = {
 		
 		var returnvalue = $(button).up().down('.bbc_spoiler_wrapper').down('.bbc_spoiler_content').toggle();
 		
-		if( returnvalue.visible() )
-		{
+		if( returnvalue.visible() ){
 			$(button).value = ipb.lang['spoiler_hide'];
-		}
-		else
-		{
+		} else {
 			$(button).value = ipb.lang['spoiler_show'];
 		}
 	},
-	
-	/* ------------------------------ */
-	/**
-	 * Adds some events for skin/language changer
-	*/
-	setUpSkinLang: function()
-	{
-		if( $('newSkin') )
-		{
-			var form = $('newSkin').up('form');
-			if( form )
-			{
-				if( $('newSkinSubmit') ){ $('newSkinSubmit').hide(); }
-				$('newSkin').observe('change', function(e)
-				{
-					form.submit();
-					return true;
-				});
-			}
-		}
-		if( $('newLang') )
-		{
-			var form1 = $('newLang').up('form');
-			if( form1 )
-			{
-				if( $('newLangSubmit') ){ $('newLangSubmit').hide(); }
-				$('newLang').observe('change', function(e)
-				{
-					form1.submit();
-					return true;
-				});
-			}
-		}
-	},
-					
+
 	/* ------------------------------ */
 	/**
 	 * Builds the popup menu for RSS feeds
@@ -1844,6 +2230,28 @@ _global.prototype.global = {
 		}
 	},
 	
+	/* ------------------------------ */
+	/**
+	 * Reputation Popup Balloon
+	 */
+	repPopUp: function( e, repId, repApp, repType )
+	{
+		if( ipb.global.popups['rep_' + repId] ){
+			ipb.global.popups['rep_' + repId].kill();
+		}
+		
+		var _url = ipb.vars['base_url'] + '&app=core&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=reputation&do=view&repApp=' + repApp + '&repType=' + repType + '&repId=' + repId;
+		ipb.global.popups['rep_' + repId] = new ipb.Popup('rep_' + repId, {
+																type: 'balloon',
+																stem: true,
+																attach: { target: e, position: 'auto' },
+																hideAtStart: false,
+																ajaxURL: _url,
+																w: '300px',
+																h: 400
+															});
+	},
+	
 	/* ------------------------------ */
 	/**
 	 * Hides the PM notification box
@@ -1899,16 +2307,14 @@ _global.prototype.global = {
 	/**
 	 * Initializes GD image
 	 *
-	 * @param	{element}	elem	The GD image element
 	*/
-	initGD: function( elem )
+	initGD: function()
 	{
-		if( !$(elem) ){ return; }
-		$(elem).observe('click', ipb.global.generateNewImage);
+		$('gd-antispam').observe('click', ipb.global.generateNewImage);
 		
 		if( $('gd-image-link') )
 		{
-			$('gd-image-link').observe('click', ipb.global.generateNewImage);
+			$('gd-image-link').observe('click', ipb.global.generateNewImage );
 		}
 	},
 
@@ -1933,21 +2339,10 @@ _global.prototype.global = {
 	*/
 	generateNewImage: function(e)
 	{
-		img = Event.findElement( e, 'img' );
+		img	= $('gd-antispam');
+		
 		Event.stop(e);
-		if( img == document ){ return; }
-		
-		// Coming from the link?		
-		if( !img )
-		{
-			anchor	= Event.findElement( e, 'a' );
-			
-			if( anchor )
-			{
-				img		= anchor.up().down('img');
-			}
-		}
-		
+
 		oldSrc = img.src.toQueryParams();
 		oldSrc = $H( oldSrc ).toObject();
 		
@@ -1982,9 +2377,12 @@ _global.prototype.global = {
 		if( !$( id ) ){ return; }
 				
 		// Find rep up
-		var rep_up = $( id ).down('.rep_up');
-		var rep_down = $( id ).down('.rep_down');
-		var sendUrl = ipb.vars['base_url'] + '&app=core&module=ajax&section=reputation&do=add_rating&app_rate=' + url.app + '&type=' + url.type + '&type_id=' + url.typeid + '&secure_key=' + ipb.vars['secure_hash'];
+		var rep_up         = $( id ).down('.rep_up');
+		var rep_down       = $( id ).down('.rep_down');
+		
+		var domLikeStripId = ( $(url.domLikeStripId) ) ? $(url.domLikeStripId) : false;
+	
+		var sendUrl = ipb.vars['base_url'] + '&app=core&module=ajax&section=reputation&do=add_rating&app_rate=' + url.app + '&type=' + url.type + '&type_id=' + url.typeid + '&secure_key=' + ipb.vars['secure_hash'];		
 		
 		if( $( rep_up ) ){
 			$( rep_up ).observe( 'click', ipb.global.repRate.bindAsEventListener(this, 1, id) );
@@ -1994,7 +2392,7 @@ _global.prototype.global = {
 			$( rep_down ).observe( 'click', ipb.global.repRate.bindAsEventListener(this, -1, id) );
 		}
 		
-		ipb.global.reputation[ id ] = { obj: $( id ), url: url, sendUrl: sendUrl, currentRating: rating || 0 };
+		ipb.global.reputation[ id ] = { obj: $( id ), domLikeStripId: domLikeStripId, url: url, sendUrl: sendUrl, currentRating: rating || 0 };
 		Debug.write( "Registered reputation" );
 	},
 	
@@ -2016,6 +2414,8 @@ _global.prototype.global = {
 		} else {
 			var rep = ipb.global.reputation[ id ];
 		}
+
+		Debug.write( rep.sendUrl + '&rating=' + value );
 		
 		// Send ping
 		new Ajax.Request( rep.sendUrl + '&rating=' + value,
@@ -2023,13 +2423,24 @@ _global.prototype.global = {
 							method: 'get',
 							onSuccess: function( t )
 							{
-								if( t.responseText == 'done' )
+								if( t.responseJSON['status'] == 'ok' )
 								{
 									try {									
 										// It worked! Hide the rep buttons
-										rep.obj.down('.rep_up').hide();
-										rep.obj.down('.rep_down').hide();
-									} catch(err) { }
+										rep.obj.down('.rep_up').up('li').hide();
+										rep.obj.down('.rep_down').up('li').hide();
+										
+										/* Can we see some, though? */
+										if ( t.responseJSON['canRepUp'] === true )
+										{
+											rep.obj.down('.rep_up').up('li').show();
+										}
+										
+										if ( t.responseJSON['canRepDown']  === true )
+										{
+											rep.obj.down('.rep_down').up('li').show();
+										}										
+									} catch(err) { Debug.error( err ); }
 									
 									// Update the figure
 									var rep_display = rep.obj.down('.rep_show');
@@ -2037,7 +2448,7 @@ _global.prototype.global = {
 									{										
 										['positive', 'negative', 'zero'].each(function(c){ rep_display.removeClassName(c); });
 										
-										var newValue = rep.currentRating + value;
+										var newValue = parseInt( t.responseJSON['rating'] );
 										
 										if( newValue > 0 )
 										{
@@ -2052,18 +2463,31 @@ _global.prototype.global = {
 											rep_display.addClassName('zero');
 										}
 										
-										rep_display.update( parseInt( rep.currentRating + value ) );
+										rep_display.update( newValue );
+									}
+									
+									/* Got a like strip */
+									if ( $(rep.domLikeStripId.id) )
+									{
+										if ( t.responseJSON['likeData'].formatted !== false )
+										{
+											$(rep.domLikeStripId.id).update( t.responseJSON['likeData'].formatted ).show();
+										}
+										else
+										{
+											$(rep.domLikeStripId.id).update( '' ).hide();
+										}
 									}
 								}
 								else
 								{
-									if( t.responseText == 'nopermission' )
+									if( t.responseJSON['error'] == 'nopermission' || t.responseJSON['error'] == 'no_permission' )
 									{
-										alert( ipb.lang['no_permission'] );
+										ipb.global.errorDialogue( ipb.lang['no_permission'] );
 									}
 									else
 									{
-										alert(ipb.lang['action_failed'] + ": " + t.responseText );
+										ipb.global.errorDialogue( t.responseJSON['error'] );
 									}
 								}
 							}
@@ -2071,154 +2495,40 @@ _global.prototype.global = {
 	
 	 },
 	
-	/* ------------------------------ */
-	/**
-	 * Timer for live searching
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	timer_liveSearch: function(e)
+	 /**
+	 * Fetch 'more'pop-up
+	 */
+	repLikeMore: function(e, elem)
 	{
-		ipb.global.searchTimer['show'] = setTimeout( ipb.global.liveSearch, 400 );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * TImer for hiding live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	timer_hideLiveSearch: function(e)
-	{
-		ipb.global.searchTimer['hide'] = setTimeout( ipb.global.hideLiveSearch, 800 );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Actually hides live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	hideLiveSearch: function(e)
-	{
-		new Effect.Fade( $('live_search_popup'), { duration: 0.4, afterFinish: function(){
-			$('ajax_result').update('');
-		 } } );
+		Event.stop(e);
 		
-		ipb.global.searchLastQuery = '';
-		clearTimeout( ipb.global.searchTimer['show'] );
-		clearTimeout( ipb.global.searchTimer['hide'] );
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Live search routine
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	liveSearch: function(e)
-	{
-		// Keep loopy going
-		ipb.global.timer_liveSearch();
-		
-		// If too few chars, dont do anything
-		if( $F('main_search').length < ipb.vars['live_search_limit'] ){ return; }
-		
-		// Is the popup available?
-		if( !$('live_search_popup') )
+		try
 		{
-			Debug.write("Creating popup");
-			ipb.global.buildSearchPopup();
+			var id   = elem.readAttribute('data-id');
+			var app  = elem.readAttribute('data-app');
+			var type = elem.readAttribute('data-type');
 		}
-		else if( !$('live_search_popup').visible() )
+		catch( e )
 		{
-			new Effect.Appear( $('live_search_popup'), {duration: 0.4} );
+			Debug.error(e);
 		}
 		
-		// Is the text the same as last time?
-		if( $F('main_search') == ipb.global.searchLastQuery ){ return; } /* continue looping */
-		
-		// Refine search?
-		var refine_search = '';
-		
-		if( ipb.vars['active_app'] )
+		if ( ! Object.isUndefined( ipb.global.popups['likeMore'] ) )
 		{
-			refine_search += "&app_search=" + ipb.vars['active_app'];
+			ipb.global.popups['likeMore'].kill();
 		}
 		
-		if( ipb.vars['search_type'] && ipb.vars['search_type_id'] )
-		{
-			refine_search += '&search_type=' + ipb.vars['search_type'] + '&search_type_id=' + ipb.vars['search_type_id'];
-		}
+		var popid = 'setfave_' + ipb.like.relid;
+		var _url  = ipb.vars['base_url'] + '&app=core&module=ajax&section=reputation&do=more&secure_key=' + ipb.vars['secure_hash'] + '&f_app=' + app + '&f_type=' + type + '&f_id=' + id;
+		Debug.write( _url );
 		
-		if( ipb.vars['search_type_2'] && ipb.vars['search_type_id_2'] )
-		{
-			refine_search += '&search_type_2=' + ipb.vars['search_type_2'] + '&search_type_id_2=' + ipb.vars['search_type_id_2'];
-		}		
-
-		//Get hits
-		new Ajax.Request( 
-			ipb.vars['base_url'] + "app=core&module=ajax&section=livesearch&do=search&secure_key=" + ipb.vars['secure_hash'] + "&search_term=" + $F('main_search').encodeUrl() + refine_search ,
-			{
-				method: 'get',
-				onSuccess: function(t){
-					if( !$('ajax_result') ){ return; }
-								 
-					$('ajax_result').update( t.responseText );
-					//$('ajax_result').update( t.responseText.gsub( $F('main_search'), "<span class='hl'>" + $F('main_search') + "</span>" ) );
-				}
-			}
-		);
-				
-		/* Make sure we set this value so we don't run unnecessary ajax requests */
-		ipb.global.searchLastQuery = $F('main_search');
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Builds the popup for live search
-	 * 
-	 * @param	{event}		e	The event
-	*/
-	buildSearchPopup: function(e)
-	{
-		pos = $('main_search').cumulativeOffset();
-		finalPos = { 
-			top: pos.top + $('main_search').getHeight(),
-			left: ( pos.left + 45 )
-		};
-		
-		popup =	new Element('div', { id: 'live_search_popup' } ).hide().setStyle('top: ' + finalPos.top + 'px; left: ' + finalPos.left + 'px');
-		$('content').insert({ bottom: popup });
-
-		var refine_search	= '';
-		
-		if( ipb.vars['active_app'] )
-		{
-			refine_search += "&app_search=" + ipb.vars['active_app'];
-		}
-		
-		if( ipb.vars['search_type'] && ipb.vars['search_type_id'] )
-		{
-			refine_search += '&search_type=' + ipb.vars['search_type'] + '&search_type_id=' + ipb.vars['search_type_id'];
-		}
-		
-		if( ipb.vars['search_type_2'] && ipb.vars['search_type_id_2'] )
-		{
-			refine_search += '&search_type_2=' + ipb.vars['search_type_2'] + '&search_type_id_2=' + ipb.vars['search_type_id_2'];
-		}
-
-		//Get form
-		new Ajax.Request( ipb.vars['base_url'] + "app=core&module=ajax&section=livesearch&do=template&secure_key=" + ipb.vars['secure_hash'] + refine_search,
-		{
-			method: 'get',
-			onSuccess: function(t){
-				popup.update( t.responseText );
-				//ipb.global.liveSearch();
-			}
-		});		
-		
-		new Effect.Appear( $('live_search_popup'), {duration: 0.3} );
+		/* easy one this... */
+		ipb.global.popups['likeMore'] = new ipb.Popup( popid, { type: 'pane',
+																ajaxURL: _url,
+																stem: false,
+																hideAtStart: false,
+																h: 500,
+																w: '450px' });		
 	},
 
 	/* ------------------------------ */
@@ -2240,141 +2550,7 @@ _global.prototype.global = {
 		
 		return ( size / gb ).toFixed( 2 ) + " GB";
 	},
-	
-	/* ------------------------------ */
-	/**
-	 * Initializes stuff for image scaling
-	*/
-	initImageResize: function()
-	{
-		var dims = document.viewport.getDimensions();
-		 
-		ipb.global.screen_w 	= dims.width;
-		ipb.global.screen_h 	= dims.height;
-		ipb.global.max_w		= Math.ceil( ipb.global.screen_w * .8 ); //( ipb.vars['image_resize'] / 100 ) ); image_resize is always 0 or 1, so this was broke
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Find large images in the given wrapper
-	 * 
-	 * @param	{element}	wrapper		The wrapper to search in
-	*/
-	findImgs: function( wrapper )
-	{
-		
-		if( !$( wrapper ) ){ return; }
-		if( !ipb.vars['image_resize'] ){ return; }
-		if( $( wrapper ).hasClassName('imgsize_ignore') ){ Debug.write("Ignoring this post for image resizing..."); return; }
-		
-		// Resize images
-		$( wrapper ).select('img.bbc_img').each( function(elem){
-			
-			if( !ipb.global.screen_w )
-			{
-				ipb.global.initImageResize();
-			}
-			
-			ipb.global.resizeImage( elem );
-		});
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Resizes a large image
-	 * 
-	 * @param	{element}	elem	The image to resize
-	*/
-	resizeImage: function( elem )
-	{
-		if( elem.tagName != 'IMG' ){ return; }
-		if( elem.readAttribute('handled') ){ Debug.write("Handled..."); return; }
-		
-		// Check we have a cached post size
-		if( !ipb.global.post_width )
-		{
-			var post	= $( elem ).up('.post');
 
-			if( !Object.isUndefined( post ) )
-			{
-				var extra = parseInt( post.getStyle('padding-left') ) + parseInt( post.getStyle('padding-right') );
-				ipb.global.post_width = $( post ).getWidth() - ( extra * 2 );
-			}
-		}
-		
-		var quotewidth	= 0;
-		var quote	= $( elem ).up('.quote');
-		
-		if( !Object.isUndefined( quote ) )
-		{
-			var extra = parseInt( quote.getStyle('padding-left') ) + parseInt( quote.getStyle('padding-right') );
-			quotewidth = $( quote ).getWidth() - ( extra * 2 );
-		}
-		
-		// Uses post width if it can work it out, otherwise screen width
-		var widthCompare = ( ipb.vars['image_resize_force'] ) ? ipb.vars['image_resize_force'] : ( quotewidth ? quotewidth : ( ipb.global.post_width ? ipb.global.post_width : ipb.global.max_w ) );
-		var dims = elem.getDimensions();
-
-		if( dims.width > widthCompare )
-		{
-			// Remove center tags if they are there
-			if ( _parent = elem.up('.bbc_center') )
-			{
-				_parent.removeClassName('bbc_center');
-			}
-		
-			//elem.width = ipb.global.max_w;
-			var percent = Math.ceil( ( widthCompare / dims.width) * 100 );
-	
-			if( percent < 100 )
-			{
-				elem.height = dims.height * ( percent / 100 );
-				elem.width = dims.width * ( percent / 100 );
-			}
-			
-			var temp = ipb.templates['resized_img'];
-			
-			var wrap = $( elem ).wrap('div').addClassName('resized_img');
-			$( elem ).insert({ before: temp.evaluate({ percent: percent, width: dims.width, height: dims.height }) });
-			
-			$( elem ).addClassName('resized').setStyle('cursor: pointer;');
-			$( elem ).writeAttribute( 'origWidth', dims.width ).writeAttribute( 'origHeight', dims.height ).writeAttribute( 'shrunk', 1 );
-			$( elem ).writeAttribute( 'newWidth', elem.width ).writeAttribute( 'newHeight', elem.height ).writeAttribute( 'handled', 1 );
-			
-			// SKINNOTE: Add event handler
-			$( elem ).observe('click', ipb.global.enlargeImage);
-		}	
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Resizes a shrunk image back to normal
-	 * 
-	 * @param	{event}		e		The event
-	*/
-	enlargeImage: function(e)
-	{
-		var elem = Event.element(e);
-		if( !elem.hasClassName('resized') ){ elem = Event.findElement(e, '.resized'); }
-		
-		//var img = elem.down('img.resized');
-		var img = elem;
-		
-		if( !img ){ return; }
-		
-		if( $( img ).readAttribute( 'shrunk' ) == 1 )
-		{
-			$( img ).setStyle( 'width: ' + img.readAttribute('origWidth') + 'px; height: ' + img.readAttribute('origHeight') + 'px; cursor: pointer');
-			$( img ).writeAttribute( 'shrunk', 0 );
-		}
-		else
-		{
-			$( img ).setStyle( 'width: ' + img.readAttribute('newWidth') + 'px; height: ' + img.readAttribute('newHeight') + 'px; cursor: pointer');
-			$( img ).writeAttribute( 'shrunk', 1 );
-			Debug.write("width: " + img.readAttribute('newWidth'));
-		}
-	},
-	
 	/* ------------------------------ */
 	/**
 	 * Registers a page jump toggle
@@ -2401,7 +2577,7 @@ _global.prototype.global = {
 			// Find the pj ID
 			var classes = $( elem ).className.match(/pj([0-9]+)/);
 			
-			if( !classes[1] ){
+			if( Object.isUndefined( classes ) || !classes || !classes[1] ){
 				return;
 			}
 			
@@ -2475,23 +2651,38 @@ _global.prototype.global = {
 			pageNum = options.totalPages;
 		}*/
 		
-		if( ipb.vars['seo_enabled'] && document.location.toString().match( ipb.vars['seo_params']['start'] ) && document.location.toString().match( ipb.vars['seo_params']['end'] ) ){
-			if ( options.url.match( ipb.vars['seo_params']['varBlock'] ) )
-			{
-				var url = options.url + ipb.vars['seo_params']['varSep'] + options.stKey + ipb.vars['seo_params']['varSep'] + pageNum;
-			}
-			else
-			{
-				var url = options.url + ipb.vars['seo_params']['varBlock'] + options.stKey + ipb.vars['seo_params']['varSep'] + pageNum;
+		if( ipb.vars['seo_enabled'] ){
+			if( options.url.charAt( options.url.length - 1 ) == '=' ){
+				// Bug #31029
+				// SEO URLs ending with = don't work. Use non-seo urls in this case.
+				var url = options.url + '&amp;' + options.stKey + '=' + pageNum;
+			} else {
+				if( document.location.toString().match( ipb.vars['seo_params']['start'] ) && document.location.toString().match( ipb.vars['seo_params']['end'] ) ){
+					if ( options.url.match( ipb.vars['seo_params']['varBlock'] ) )
+					{
+						var url = options.url + ipb.vars['seo_params']['varSep'] + options.stKey + ipb.vars['seo_params']['varSep'] + pageNum;
+					}
+					else
+					{
+						var url = options.url + ipb.vars['seo_params']['varBlock'] + options.stKey + ipb.vars['seo_params']['varSep'] + pageNum;
+					}
+				} else {
+					var url = options.url + ipb.vars['seo_params']['varBlock'] + options.stKey + ipb.vars['seo_params']['varSep'] + pageNum;
+				}
 			}
 		} else {
 			var url = options.url + '&amp;' + options.stKey + '=' + pageNum;
 		}
+
+		if( options.anchor )
+		{
+			url = url + options.anchor;
+		}
 	
 		url = url.replace(/&amp;/g, '&');
 		// Without a negative lookbehind, http:// gets replaced with http:/ when we replace // with /
 		// @see http://blog.stevenlevithan.com/archives/mimic-lookbehind-javascript
-		url = url.replace(/(http:)?\/\//g, function($0, $1) { return $1 ? $0 : '/'; } );
+		url = url.replace(/(http:|https:)?\/\//g, function($0, $1) { return $1 ? $0 : '/'; } );
 		
 		document.location = url;
 		
@@ -2541,9 +2732,8 @@ _global.prototype.global = {
 	registerMarker: function( id, key, url )
 	{
 		if( !$(id) || key.blank() || url.blank() ){ return; }
-		if( Object.isUndefined( ipb.global.boardMarkers ) ){ return; }
 		Debug.write( "Marker INIT: " + id );
-		$( id ).observe('click', ipb.global.sendMarker.bindAsEventListener( this, id, key, url ) );		
+		$( id ).observe('click', ipb.global.sendMarker.bindAsEventListener( this, id, key, url ) );
 	},
 	
 	/* ------------------------------ */
@@ -2558,9 +2748,6 @@ _global.prototype.global = {
 	sendMarker: function( e, id, key, url )
 	{
 		Event.stop(e);
-	
-		// Check again that the replacement exists
-		if( !ipb.global.boardMarkers[ key ] ){ return; }
 		
 		new Ajax.Request( url + "&secure_key=" + ipb.vars['secure_hash'], 
 							{
@@ -2580,8 +2767,14 @@ _global.prototype.global = {
 										return false;
 									}
 									
+									if ( $(id + '_tooltip') ){
+										$(id + '_tooltip').hide();
+									}
+									
+									$( id ).up('tr').removeClassName('unread');
+									
 									// Update icon
-									$( id ).replace( ipb.global.boardMarkers[ key ] );
+									$( id ).replace( unreadIcon );
 									
 									// Update subforum icons
 									var _intId	= id.replace( /forum_img_/, '' );
@@ -2589,7 +2782,7 @@ _global.prototype.global = {
 									if( $("subforums_" + _intId ) )
 									{
 										$$("#subforums_" + _intId + " li" ).each( function(elem) {
-											$(elem).removeClassName('newposts');
+											$(elem).removeClassName('unread');
 										});
 									}
 								}
@@ -2686,9 +2879,9 @@ _global.prototype.global = {
 	// Checks a server response from an ajax request for 'nopermission'
 	checkPermission: function( text )
 	{
-		if( text == "nopermission")
+		if( text == "nopermission" || text == 'no_permission' )
 		{
-			alert( ipb.lang['nopermission'] );
+			alert( ipb.lang['no_permission'] );
 			return false;
 		}
 		
@@ -2715,6 +2908,31 @@ _global.prototype.global = {
 			
 			Event.stop(e);
 		}	
+	},
+
+	/**
+	 * Check for DST
+	 */
+	checkDST: function()
+	{
+		var memberHasDst	= ipb.vars['dst_in_use'];
+		var dstInEffect		= new Date().getDST();
+
+		if( memberHasDst - dstInEffect != 0 )
+		{
+			var url = ipb.vars['base_url'] + 'app=members&module=ajax&section=dst&md5check='+ipb.vars['secure_hash'];
+			
+			new Ajax.Request(	url,
+								{
+									method: 'get',
+									onSuccess: function(t)
+									{
+										// We don't need to do anything about this..
+										return true;
+									}
+								}
+							);
+		}
 	}
 };
 
@@ -2732,6 +2950,7 @@ _global.prototype.global = {
 var _menu = window.IPBoard;
 _menu.prototype.menus = {
 	registered: $H(),
+	closeCallBack: false,
 	
 	init: function()
 	{
@@ -2761,18 +2980,14 @@ _menu.prototype.menus = {
 		ipb.menus.registered.set( source, obj );
 	},
 	
+	registerCloseCallBack: function( callBack )
+	{
+		ipb.menus.closeCallBack = callBack;
+	},
+	
 	docCloseAll: function( e )
 	{
-		if( ( !Event.isLeftClick(e) || e.ctrlKey == true || e.keyCode == 91 ) && !Prototype.Browser.IE ) // IE handles this fine anyway
-		{
-			// This line caused the IPB3 preview to break spectacularly.
-			// Left here for the memories. Dont uncomment. Fair warning.
-			//Event.stop(e);
-		}
-		else
-		{
-			ipb.menus.closeAll( e );
-		}
+		ipb.menus.closeAll( e );
 	},
 	
 	closeAll: function( except )
@@ -2782,12 +2997,20 @@ _menu.prototype.menus = {
 			if( typeof( except ) == 'undefined' || ( except && menu.key != except ) )
 			{
 				try{
-					menu.value.doClose();
+					if( !(except.target && $(except.target).descendantOf( menu.value.target )) && except != menu.key ){
+						menu.value.doClose();
+					}
 				} catch(err) {
 					// Assume this menu gone byebye
 				}
 			}
 		});
+		
+		/* Could make this an array and chain events */
+		if ( Object.isFunction( ipb.menus.closeCallBack ) )
+		{
+			ipb.menus.closeCallBack();
+		}
 	}	
 };
 
@@ -2804,7 +3027,7 @@ _menu.prototype.Menu = Class.create({
 		
 		this.options = Object.extend( {
 			eventType: 'click',
-			stopClose: false,
+			stopClose: true,
 			offsetX: 0,
 			offsetY: 0
 		}, arguments[2] || {});
@@ -2833,7 +3056,7 @@ _menu.prototype.Menu = Class.create({
 		Debug.write("Menu open");
 		var pos = {};
 		
-		_source = ( this.options.positionSource ) ? this.options.positionSource : this.source;
+		var _source = ( this.options.positionSource ) ? this.options.positionSource : this.source;
 	
 		// This is the positioned offset of the source element
 		var sourcePos		= $( _source ).positionedOffset();
@@ -2854,7 +3077,26 @@ _menu.prototype.Menu = Class.create({
 		var screenDim		= document.viewport.getDimensions();
 		
 		// Target dimensions
-		var menuDim			= $( this.target ).getDimensions();
+		var menuDim			= { width: $( this.target ).measure('border-box-width'), height: $(this.target).measure('border-box-height') };
+		
+		var isFixed = $( _source ).ancestors().find( function(el){ return el.getStyle('position') == 'fixed'; } );
+		
+		/* RTL bug fixes */
+		if( isRTL )
+		{
+			if( sourcePos.top < 0 )
+			{
+				sourcePos.top	= realSourcePos.top;
+			}
+			
+			// Really really hacky RTL bug fix... :(
+			if( $(_source).id == 'user_link' )
+			{
+				//alert(sourcePos.left);
+				sourcePos.left = sourcePos.left - ( parseInt($(_source).getStyle('padding-left').replace( /px/, '' )) + parseInt($(_source).getStyle('margin-left').replace( /px/, '' )) );
+				//alert(sourcePos.left);
+			}
+		}
 		
 		// Some logging	
 		Debug.write( "realSourcePos: " + realSourcePos.top + " x " + realSourcePos.left );
@@ -2868,73 +3110,98 @@ _menu.prototype.Menu = Class.create({
 
 		// Ok, if it's a relative parent, do one thing, else be normal
 		// Getting fed up of this feature and IE bugs
-		if ( Prototype.Browser.IE7 )
-		{
-			_a = _source.getOffsetParent();
-			_b = this.target.getOffsetParent();
-		}
-		else
-		{
-			_a = _getOffsetParent( _source );
-			_b = _getOffsetParent( this.target );
-		}
+		_a = _source.getOffsetParent();
+		_b = this.target.getOffsetParent();
 		
-		if( _a != _b )
+		Debug.write("_a is " + _a );
+		Debug.write("_b is " + _b );
+		
+		if( isFixed )
 		{
-			// Left
-			if( ( realSourcePos.left + menuDim.width ) > screenDim.width ){
+			$( this.target ).setStyle('position: fixed');
+			
+			if( ( _sourcePos.left + menuDim.width ) > screenDim.width ){
 				diff = menuDim.width - sourceDim.width;
 				pos.left = _sourcePos.left - diff + this.options.offsetX;
 			} else {
-				if( Prototype.Browser.IE7 )
-				{
-					pos.left = (sourcePos.left) + this.options.offsetX;
-				}
-				else
-				{
-					pos.left = (_sourcePos.left) + this.options.offsetX;
-				}
-				//pos.left = _sourcePos.left + this.options.offsetX;
+				pos.left = (_sourcePos.left) + this.options.offsetX;
 			}
 			
-			// Top
-			/* If there's no space to open downwards, open upwards *unless*
-			/* it would go off the top of the screen (i.e. < 0px ) Bug #18270 */
-			if( 
-				( ( ( realSourcePos.top + sourceDim.height ) + menuDim.height ) > screenDim.height ) &&
-				( _sourcePos.top - menuDim.height + this.options.offsetY ) > 0 )
-			{
+			if( ( _sourcePos.top + menuDim.height ) > screenDim.height ){
 				pos.top = _sourcePos.top - menuDim.height + this.options.offsetY;
 			} else {
 				pos.top = _sourcePos.top + sourceDim.height + this.options.offsetY;
 			}
+			
+			
+			$( this.target ).setStyle( 'top: ' + (pos.top-1) + 'px; left: ' + pos.left + 'px;' );
 		}
 		else
 		{
-			// Left
-			if( ( realSourcePos.left + menuDim.width ) > screenDim.width ){
-				diff = menuDim.width - sourceDim.width;
-				pos.left = sourcePos.left - diff + this.options.offsetX;
-			} else {
-				pos.left = sourcePos.left + this.options.offsetX;
+			if( _a != _b )
+			{
+				// Left
+				if( ( realSourcePos.left + menuDim.width ) > screenDim.width ){
+					diff = menuDim.width - sourceDim.width;
+					pos.left = _sourcePos.left - diff + this.options.offsetX;
+				} else {
+					if( Prototype.Browser.IE7 ){
+						pos.left = (_sourcePos.left) + this.options.offsetX;
+					} else {
+						pos.left = (_sourcePos.left) + this.options.offsetX;
+					}
+				}
+			
+				// Top
+				/* If there's no space to open downwards, open upwards *unless*
+				/* it would go off the top of the screen (i.e. < 0px ) Bug #18270 */
+				if( 
+					( ( ( realSourcePos.top + sourceDim.height ) + menuDim.height ) > screenDim.height ) &&
+					( sourcePos.top - menuDim.height + this.options.offsetY ) > 0 )
+				{
+					pos.top = _sourcePos.top - menuDim.height + this.options.offsetY;
+				} else {
+					pos.top = _sourcePos.top + sourceDim.height + this.options.offsetY;
+				}
+			}
+			else
+			{
+				Debug.write("MENU: source offset EQUALS target offset");
+			
+				// Left
+				if( ( realSourcePos.left + menuDim.width ) > screenDim.width ){
+					diff = menuDim.width - sourceDim.width;
+					pos.left = sourcePos.left - diff + this.options.offsetX;
+				} else {
+					pos.left = sourcePos.left + this.options.offsetX;
+				}
+			
+				// Top
+				/* If there's no space to open downwards, open upwards *unless*
+				/* it would go off the top of the screen (i.e. < 0px ) Bug #18270 */
+				if( 
+					( ( ( realSourcePos.top + sourceDim.height ) + menuDim.height ) > screenDim.height ) &&
+					( _sourcePos.top - menuDim.height + this.options.offsetY ) > 0 )
+				{
+					pos.top = sourcePos.top - menuDim.height + this.options.offsetY;
+				} else {
+					pos.top = sourcePos.top + sourceDim.height + this.options.offsetY;
+				}
 			}
 			
-			// Top
-			/* If there's no space to open downwards, open upwards *unless*
-			/* it would go off the top of the screen (i.e. < 0px ) Bug #18270 */
-			if( 
-				( ( ( realSourcePos.top + sourceDim.height ) + menuDim.height ) > screenDim.height ) &&
-				( _sourcePos.top - menuDim.height + this.options.offsetY ) > 0 )
-			{
-				pos.top = sourcePos.top - menuDim.height + this.options.offsetY;
-			} else {
-				pos.top = sourcePos.top + sourceDim.height + this.options.offsetY;
-			}
+			$( this.target ).setStyle( 'top: ' + (pos.top-1) + 'px; left: ' + pos.left + 'px;' );
 		}
-	
+		
+		$( this.source ).addClassName('menu_active'); // Set active class on the source
+		
 		// Now set pos
 		Debug.write("Menu position: " + pos.top + " x " + pos.left );
-		$( this.target ).setStyle( 'top: ' + (pos.top-1) + 'px; left: ' + pos.left + 'px;' );
+		
+		
+		// If we have any fixed ancestors, then fix the menu too
+		/*if( isFixed ){
+			$( this.target ).setStyle('position: fixed');
+		}*/
 		
 		// And show
 		new Effect.Appear( $( this.target ), { duration: 0.2, afterFinish: function(e){
@@ -2966,25 +3233,35 @@ _menu.prototype.Menu = Class.create({
 					this.callbacks['afterClose']( this );
 				}
 		 }.bind( this ) } );
+		
+		//Debug.write( "Closing " + $( this.source ).id );
+		this.source.removeClassName('menu_active');
 	},
 	
 	targetClick: function(e)
 	{
-		try
+		if( !this.options.stopClose ){
+			this.doClose();
+		}
+		
+		/*try
 		{
-			//elem = Event.findElement(e);
+			var elem = Event.findElement(e);
 			
-			//if ( elem.tagName.toLowerCase() == 'input' )
-			//{
-				//Event.stop(e);
-			//}
+			if ( elem.hasClassName('_noCloseMenuUponClick') )
+			{
+				Event.stop(e);
+			}
 		}
 		catch(e) { }
 		
-		if( this.options.stopClose )
-		{
+		if( ( this.options.stopClose && !$(elem).match("input") || $(elem).match("input") ) ){
+			//if( $(e.target).match("[type=checkbox]")){
+			//	Debug.write( $(e.target).checked );
+			//	$(e.target).checked = true;
+			//}
 			Event.stop(e);
-		}
+		}*/
 	},
 	
 	eventClick: function(e)
@@ -3017,6 +3294,7 @@ _menu.prototype.Menu = Class.create({
 	}
 });
 
+
 /************************************************/
 /* IPB3 Javascript								*/
 /* -------------------------------------------- */
@@ -3076,6 +3354,7 @@ _popup.prototype.Popup = Class.create({
 			hideClose: 			false,
 			black:				false,
 			warning:			false,
+			evalJs:				true,
 			closeContents: 		ipb.templates['close_popup']		
 		}, arguments[1] || {});
 		
@@ -3103,9 +3382,25 @@ _popup.prototype.Popup = Class.create({
 	{
 		try {
 			Event.stopObserving( $( this.options.attach.target ), this.options.attach.event, this._defer );
+			
+			if ( $(this.options.attach.target) )
+			{
+				var toff = $( this.options.attach.target ).positionedOffset();
+				var menu = $(this.options.attach.target).up('.ipbmenu_content');
+				
+				if ( toff.top == 0 && toff.left == 0 || $(menu) )
+				{
+					/* make it a centered box */
+					this.options.type = 'modal';
+					this.options.attach = {};
+				}
+			}
+			
 		} catch(err) { }
 		
-		this.wrapper = new Element('div', { 'id': this.id + '_popup' } ).setStyle('z-index: 16000').hide().addClassName('popupWrapper');
+		
+		this.wrapper = new Element('div', { 'id': this.id + '_popup' } ).setStyle('z-index: 10001').hide().addClassName('popupWrapper');
+		
 		this.inner = new Element('div', { 'id': this.id + '_inner' } ).addClassName('popupInner');
 		
 		if ( this.options.black )
@@ -3120,13 +3415,6 @@ _popup.prototype.Popup = Class.create({
 		
 		if( this.options.w ){ this.inner.setStyle( 'width: ' + this.options.w ); }
 		
-		/* Ensure pop-up isn't larger than viewport */
-		var _vph = document.viewport.getDimensions().height - 25;
-		
-		this.options.h = ( this.options.h && _vph > this.options.h ) ? _vph : _vph;
-		
-		this.inner.setStyle( 'max-height: ' + this.options.h + 'px' );
-		
 		this.wrapper.insert( this.inner );
 		
 		if( this.options.hideClose != true )
@@ -3164,9 +3452,6 @@ _popup.prototype.Popup = Class.create({
 			this.ready = true;
 			this.continueInit();
 		}
-		
-		// Need to set a timeout for continue,
-		// in case ajax is still running
 	},
 	
 	continueInit: function()
@@ -3177,6 +3462,19 @@ _popup.prototype.Popup = Class.create({
 			return;
 		}
 		
+		/* Ensure pop-up isn't larger than viewport */
+		if( this.inner.select(".fixed_inner").size() )
+		{
+			Debug.write("Found fixed_inner");
+			this.inner.select(".fixed_inner")[0].setStyle( 'height: ' + this.options.h + 'px; max-height: ' + this.options.h + 'px; overflow: auto' );
+		}
+		else
+		{
+			var _vph = document.viewport.getDimensions().height - 25;
+			this.options.h = ( this.options.h && _vph > this.options.h ) ? this.options.h : _vph;
+			this.inner.setStyle( 'max-height: ' + this.options.h + 'px' );
+		}
+		
 		//Debug.write("Continuing...");
 		// What are we making?
 		if( this.options.type == 'balloon' ){
@@ -3217,16 +3515,36 @@ _popup.prototype.Popup = Class.create({
 	
 	updateAjax: function()
 	{
+		Debug.write( this.options.ajaxURL );
 		new Ajax.Request( this.options.ajaxURL,
 						{
 							method: 'get',
+							evalJS: this.options.evalJs,
 							onSuccess: function(t)
 							{
-								if( t.responseText != 'error' )
-								{
-									if( t.responseText == 'nopermission' )
+								if ( t.responseText != 'error' )
+								{ 
+									try
 									{
-										alert( ipb.lang['no_permission'] );
+										if ( ! Object.isUndefined( t.responseJSON ) && ! Object.isUndefined( t.responseJSON['error'] ) )
+										{
+											if ( t.responseJSON['__board_offline__'] )
+											{
+												ipb.global.errorDialogue( ipb.lang['board_offline'] );
+												ipb.menus.closeAll(e);
+											}
+											else
+											{
+												ipb.global.errorDialogue( t.responseJSON['error'] );
+											}
+											
+											return false;
+										}
+									} catch(e){}
+									
+									if ( t.responseText == 'nopermission' )
+									{
+										ipb.global.errorDialogue( ipb.lang['no_permission'] );
 										return;
 									}
 									
@@ -3234,11 +3552,10 @@ _popup.prototype.Popup = Class.create({
 									if ( t.responseText.match( "__session__expired__log__out__" ) )
 									{
 										this.update('');
-										alert( "Your session has expired, please refresh the page and log back in" );
+										alert( ipb.lang['session_timed_out'] );
 										return false;
 									}
 									
-									//Debug.write( t.responseText );
 									Debug.write( "AJAX done!" );
 									this.update( t.responseText );
 									this.ready = true;
@@ -3303,7 +3620,10 @@ _popup.prototype.Popup = Class.create({
 			clearTimeout( this.timer['show'] );
 		}
 		
-		$( this.wrapper ).remove();
+		if( $( this.wrapper ) )
+		{
+			$( this.wrapper ).remove();
+		}
 	},
 	
 	_show: function()
@@ -3335,7 +3655,7 @@ _popup.prototype.Popup = Class.create({
 				}
 			}.bind(this) } );
 			this.document_event = this.handleDocumentClick.bindAsEventListener(this);
-			Event.observe( document, 'click', this.document_event );
+			this.setDocumentEvent();
 		} else {
 			new Effect.Appear( $('document_modal'), { duration: 0.3, to: this.options.modalOpacity, afterFinish: function(){
 				new Effect.Appear( $( this.wrapper ), { duration: 0.4, afterFinish: function(){
@@ -3377,11 +3697,22 @@ _popup.prototype.Popup = Class.create({
 		}
 	},
 	
+	setDocumentEvent: function()
+	{		
+		if( !ipb.vars['is_touch'] ){
+			Event.observe( document, 'click', this.document_event );
+			return;
+		}
+		
+		// Touch event
+		Event.observe( document, 'touchstart', this.document_event );
+	},
+	
 	handleDocumentClick: function(e)
 	{
 		Debug.write( Event.element(e).id);
 		
-		if( !Event.element(e).descendantOf( this.wrapper ) && Event.element(e).id != this.options.attach.target.id )
+		if( !Event.element(e).descendantOf( this.wrapper ) && ( this.options.attach && ( Event.element(e).id != this.options.attach.target.id ) ) )
 		{
 			this._hide(e);
 		}
@@ -3389,7 +3720,11 @@ _popup.prototype.Popup = Class.create({
 	
 	update: function( content, evalScript )
 	{
-		this.inner.update( content );
+		if( Object.isElement( content ) ){
+			this.inner.insert( { bottom: content } );
+		} else {
+			this.inner.update( content );
+		}
 		
 		// Should this popup eval scripts? Default is YES
 		if( Object.isUndefined( evalScript ) || evalScript != false ){
@@ -3405,7 +3740,7 @@ _popup.prototype.Popup = Class.create({
 			var attach = this.options.attach;
 			
 			if( attach.target && $( attach.target ) )
-			{
+			{				
 				if( this.options.stem == true )
 				{
 					this.createStem();
@@ -3438,7 +3773,7 @@ _popup.prototype.Popup = Class.create({
 					
 					if (Element.getStyle( $( attach.target ), 'position') == 'absolute')
 					{
-						var parent = element.getOffsetParent();
+						var parent = attach.target.getOffsetParent();
 						delta = parent.viewportOffset();
 				    }
 				
@@ -3456,12 +3791,9 @@ _popup.prototype.Popup = Class.create({
 					// Need to figure out if it will be off-screen
 					var start 	= 'top';
 					
-					if( isRTL )
-					{
+					if( isRTL ){
 						var end 	= 'right';
-					}
-					else
-					{
+					} else {
 						var end 	= 'left';
 					}
 
@@ -3514,7 +3846,7 @@ _popup.prototype.Popup = Class.create({
 				}				
 			}
 		}
-
+		
 		if( isRTL )
 		{
 			Debug.write("Popup: Right: " + finalPos.right + "; Top: " + finalPos.top);
@@ -3623,17 +3955,24 @@ _popup.prototype.Popup = Class.create({
 	position: function( pos, v )
 	{
 		finalPos = {};
-		var toff			= $( v.target ).viewportOffset();
-		var tsize	 		= $( v.target ).getDimensions();
+		
+		v.target.identify();
+		
+		var toff			= $( v.target.id ).viewportOffset();
+		var tsize	 		= $( v.target.id ).getDimensions();
 		var wrapSize 		= $( v.content ).getDimensions();
 		var screenscroll 	= document.viewport.getScrollOffsets();
 		var offset 			= v.offset;
 		var delta			= [0,0];
 		
-		if (Element.getStyle( $( v.target ), 'position') == 'absolute')
+		if (Element.getStyle( $( v.target.id ), 'position') == 'absolute')
 		{
-			var parent = $( v.target ).getOffsetParent();
-			delta = parent.viewportOffset();
+			var parent = $( v.target.id ).getOffsetParent();
+			delta    = parent.viewportOffset();
+			
+			/* That above doesn't help */
+			delta = [0,0];
+		
 	    }
 		
 	    if( isRTL )
@@ -3644,16 +3983,13 @@ _popup.prototype.Popup = Class.create({
 		{
 			toff['left'] = toff[0] - delta[0];
 		}
-		toff['top'] = toff[1] - delta[1];
-
-		if( !Prototype.Browser.Opera ){
-			toff['top'] += screenscroll.top;
-		}
-		
+	    
+		toff['top'] = toff['top'] - delta[1] + screenscroll.top;
+				
 		switch( pos.toLowerCase() )
 		{
 			case 'topleft':
-				finalPos.top = ( toff.top - wrapSize.height - tsize.height ) - offset.top;
+				finalPos.top = ( toff.top - wrapSize.height - ( tsize.height / 2 ) ) - offset.top;
 				
 				if( isRTL )
 				{
@@ -3664,8 +4000,8 @@ _popup.prototype.Popup = Class.create({
 					finalPos.left = toff.left + offset.left;
 				}
 				break;
-			case 'topright':
-			 	finalPos.top = ( toff.top - wrapSize.height - tsize.height ) - offset.top;
+			case 'topright':			
+			 	finalPos.top = ( toff.top - wrapSize.height - ( tsize.height / 2 ) ) - offset.top;
 			 	
 			 	if( isRTL )
 			 	{
@@ -3701,7 +4037,7 @@ _popup.prototype.Popup = Class.create({
 				}
 				break;
 		}
-		
+	
 		return finalPos;
 	},
 	
@@ -3744,7 +4080,7 @@ _popup.prototype.Popup = Class.create({
 			var center = { 	left: ((window_s['width'] - elem_s['width']) / 2),
 						 	top: (((window_s['height'] - elem_s['height']) / 2)/2)
 						};
-						
+
 			if( center.top < 10 ){ center.top = 10; }
 						
 			$( this.wrapper ).setStyle('top: ' + center['top'] + 'px; left: ' + center['left'] + 'px; position: fixed;');
@@ -3753,13 +4089,14 @@ _popup.prototype.Popup = Class.create({
 			
 	createDocumentModal: function()
 	{
-		var pageSize = $('ipboard_body').getDimensions();
+		var pageLayout = $( document.body ).getLayout();
+		var pageSize = { width: pageLayout.get('width'), height: pageLayout.get('margin-box-height') };
 		var viewSize = document.viewport.getDimensions();
 		
 		var dims = [];
 		
-		//Debug.dir( pageSize );
-		//Debug.dir( viewSize );
+		Debug.dir( pageSize );
+		Debug.dir( viewSize );
 		
 		if( viewSize['height'] < pageSize['height'] ){
 			dims['height'] = pageSize['height'];
@@ -3775,13 +4112,10 @@ _popup.prototype.Popup = Class.create({
 		
 		var modal = new Element( 'div', { 'id': 'document_modal' } ).addClassName('modal').hide();
 		
-		if( isRTL )
-		{
-			modal.setStyle('width: ' + dims['width'] + 'px; height: ' + dims['height'] + 'px; position: absolute; top: 0px; right: 0px; z-index: 15000;');
-		}
-		else
-		{
-			modal.setStyle('width: ' + dims['width'] + 'px; height: ' + dims['height'] + 'px; position: absolute; top: 0px; left: 0px; z-index: 15000;');
+		if( isRTL ){
+			modal.setStyle('width: ' + dims['width'] + 'px; height: ' + dims['height'] + 'px; position: fixed; top: 0px; right: 0px; z-index: 10000;');
+		} else {
+			modal.setStyle('width: ' + dims['width'] + 'px; height: ' + dims['height'] + 'px; position: fixed; top: 0px; left: 0px; z-index: 10000;');
 		}
 		
 		$$('body')[0].insert( modal );
@@ -3793,6 +4127,70 @@ _popup.prototype.Popup = Class.create({
 	}
 });
 
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* ips.ticker.js - Popup creator				*/
+/* (c) IPS, Inc 2008							*/
+/* -------------------------------------------- */
+/* Author: Rikki Tissier						*/
+/************************************************/
+_ticker = window.IPBoard;
+_ticker.prototype.Ticker = Class.create({		
+	initialize: function( root, options, callbacks )
+	{
+		if( !$(root) ){
+			return;
+		}
+		this.root = $(root);
+		this.options = Object.extend({
+			duration: 4,
+			select: "li"
+		}, options || {});
+		
+		this.items = $( root ).select( this.options.select );
+		if( !this.items.length ){ return; }
+		
+		// Hide all items except first
+		this.items.invoke('hide').first().show();
+		
+		// Start timer
+		this.timer = this.nextItem.bind( this ).delay( this.options.duration );
+		
+		// Pause event
+		$( this.root ).observe('mouseenter', this.pauseTicker.bindAsEventListener( this ) );
+		$( this.root ).observe('mouseleave', this.unpauseTicker.bindAsEventListener( this ) );
+	},
+	pauseTicker: function(e)
+	{
+		clearTimeout( this.timer );
+	},
+	unpauseTicker: function(e)
+	{
+		this.timer = this.nextItem.bind(this).delay( this.options.duration );
+	},
+	nextItem: function()
+	{
+		// Find current item
+		var cur = this.items.find( function(elem){
+			return elem.visible();
+		});
+
+		var next = $( cur ).next( this.options.select );
+
+		if( Object.isUndefined( next ) ){
+			next = this.items.first();
+		}
+
+		// Fade current
+		new Effect.Fade( $( cur ), { duration: 0.4, queue: 'end', afterFinish: function(){
+			new Effect.Appear( $( next ), { duration: 0.8, queue: 'end' } );
+		} } );
+
+		// Reset timer
+		this.timer = this.nextItem.bind( this ).delay( this.options.duration );
+	}
+});
 
 ipb = new IPBoard;
 ipb.global.init();
diff --git a/upload/public/js/ips.attach.js b/upload/public/js/ips.attach.js
index f2c86fad..492b2453 100644
--- a/upload/public/js/ips.attach.js
+++ b/upload/public/js/ips.attach.js
@@ -14,6 +14,7 @@ var _attach = window.IPBoard;
 _attach.prototype.attach = {
 	uploaders: [],
 	template: '',
+	_doneJson: false,
 	
 	init: function()
 	{
@@ -32,9 +33,7 @@ _attach.prototype.attach = {
 	 * @param	{object}	options		Options to pass to object
 	*/
 	registerUploader: function( id, type, wrapper, options )
-	{
-		//if( !ipb.vars['use_swfupload'] ){ return false; }
-		
+	{		
 		if( Object.isUndefined( id ) || id == null )
 		{
 			Debug.error("ips.attach.js: Attachment manager already has that ID");
@@ -72,6 +71,65 @@ _attach.prototype.attach = {
 		}		
 	},
 	
+	switchUploadType: function( mode )
+	{
+		var url  = ipb.vars['base_url'] + "app=core&module=ajax&section=attach&do=setPref&pref=" + mode + '&secure_key=' + ipb.vars['secure_hash'];
+		var wLoc = window.location.toString();
+
+		new Ajax.Request( url,
+						{
+							method: 'post',
+							evalJSON: 'force',
+							hideLoader: true,
+							onSuccess: function(t)
+							{
+								if( Object.isUndefined( t.responseJSON ) ){ alert( ipb.lang['action_failed'] ); return; }
+								
+								if ( t.responseJSON['status'] == 'ok' )
+								{
+									/* Do some jazzy stuffs */
+									if ( $('postingform') )
+									{
+										/* Preserve poll
+											@link	http://community.invisionpower.com/tracker/issue-32853-poll-data-missing-after-change-the-uploader
+										*/
+										if( $('poll_wrap') && $('add_poll') )
+										{
+											try {
+												$('poll_wrap').hide();
+												$('add_poll').insert({ after: $('poll_wrap') });
+											} catch(err){ }
+										}
+
+										$('postingform').action += '&preview=1&uploadPref=' + mode;
+										$('postingform').submit();
+									}
+									else if( $('msgForm') )
+									{
+										var _key = 'preview';
+										
+										if( $('msgForm').action.match( /do=sendReply/ ) )
+										{
+											_key	= 'previewReply';
+										}
+										
+										$('msgForm').action += '&' + _key + '=1&uploadPref=' + mode;
+										$('msgForm').submit();
+									}
+									else
+									{
+										window.location = wLoc.replace("#", "").replace( new RegExp( /&uploadPref=\S+?(&|$)/ ), '' ) + '&uploadPref=' + mode + '&preview=1';
+									}
+								}
+								else
+								{
+									alert( ipb.lang['action_failed'] );
+									return;
+								}
+							}
+						});
+	},
+	
 	removeUpload: function(e)
 	{
 		elem = Event.findElement( e, 'li' );
@@ -172,33 +230,22 @@ _attach.prototype.attach = {
 		{
 			return ipb.lang['silly_server'];
 		}
-		
-		/*switch( msg )
-		{
-			case 'upload_no_file':
-				return ipb.lang['upload_no_file'];
-				break;
-			case 'invalid_mime_type':
-				return ipb.lang['invalid_mime_type'];
-				break;
-			case 'upload_too_big':
-				return ipb.lang['upload_too_big'];
-				break;
-			case 'upload_failed':
-				return ipb.lang['upload_failed'];
-				break;
-			default:
-				return ipb.lang['silly_server'];
-				break;
-		}	*/
 	},
 	
 	_jsonPass: function( id, json )
 	{
+		if( ipb.attach._doneJson ){ return; }
+
 		ipb.attach.uploaders[ 'attach_' + id ].json = json;
 		ipb.attach.uploaders[ 'attach_' + id ].isReady();
 		
+		// #33731: Opera would constantly call this function, causing the attachment
+		// list to break. As a workaround, we set this to true so that it only
+		// runs once.
+		ipb.attach._doneJson = true;
+		
 		Debug.write( "ips.attach.js: Got json back from iframe id " + id );
+		
 	},
 	
 	/**
@@ -282,15 +329,15 @@ _attach.prototype.attach = {
 		var fileindex = elem.readAttribute('attachid');
 		var filename = elem.down('.attach_name').innerHTML;
 		
-		fileindex = fileindex.replace('cur_', '');
+		fileindex = fileindex.toString().replace('cur_', '');
 		
 		if( fileindex && filename )
 		{
-			ipb.editorInsert( "[attachment=" + fileindex + ":" + filename.replace( /\[/, '' ).replace( /\]/, '' ) + "]", 'ed-0' );
+			ipb.editorInsert( "[attachment=" + fileindex + ":" + filename.replace( /\[/, '' ).replace( /\]/, '' ) + "]" );
 		}
 		else if( fileindex )
 		{
-			ipb.editorInsert( "[attachment=" + fileindex + "]", 'ed-0' );
+			ipb.editorInsert( "[attachment=" + fileindex + "]" );
 		}
 	}	
 };
@@ -315,18 +362,21 @@ _attach.prototype.attachTraditional = Class.create({
 												scrolling: 'no',
 												frameBorder: 'no',
 												border: '0',
-												className: '',
+												className: 'clearfix',
 												allowTransparency: true,
 												src: this.options.upload_url,
 												tabindex: '1'
 											}).setStyle({
 												width: '500px',
-												height: '50px',
+												height: '25px',
 												overflow: 'hidden',
 												backgroundColor: 'transparent'
 											});
 											
-		$( this.wrapper ).insert( { after: this.iframe } ).addClassName('traditional');
+		$('add_files_' + this.id ).insert( { before: this.iframe } );
+		$( wrapper ).addClassName('traditional');
+		
+		Debug.write("Init traditional");
 		
 		$('add_files_' + this.id ).observe('click', this.processUpload.bindAsEventListener( this ) );		
 	},
@@ -370,6 +420,11 @@ _attach.prototype.attachTraditional = Class.create({
 		var iFrameForm = window.frames[ 'iframeAttach_' + this.options['attach_rel_id'] ].document.getElementById('iframeUploadForm');
 		var box        = $('attach_' + this.options['attach_rel_id'] );
 		
+		window.frames[ 'iframeAttach_' + this.options['attach_rel_id'] ].document.getElementById('waitImg').style.display = 'inline-block';
+		
+		Debug.write( ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attachUploadiFrame&attach_rel_module=" +
+		 				   	this.options['attach_rel_module'] + "&attach_rel_id=" + this.options['attach_rel_id'] + "&attach_post_key=" + 
+						  	this.options['attach_post_key'] + "&forum_id=" + this.options['forum_id'] + '&fetch_all=1' );
 		iFrameForm.action = ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attachUploadiFrame&attach_rel_module=" +
 		 				   	this.options['attach_rel_module'] + "&attach_rel_id=" + this.options['attach_rel_id'] + "&attach_post_key=" + 
 						  	this.options['attach_post_key'] + "&forum_id=" + this.options['forum_id'] + '&fetch_all=1';
@@ -504,6 +559,7 @@ _attach.prototype.attachSWF = Class.create({
 							{
 								method: 'get',
 								evalJSON: 'force',
+								hideLoader: true,
 								onSuccess: function(t)
 								{
 									if( Object.isUndefined( t.responseJSON ) ){ alert( ipb.lang['action_failed'] ); return; }
@@ -516,7 +572,7 @@ _attach.prototype.attachSWF = Class.create({
 							});
 
 			this.obj.onmouseover	= $('SWFUpload_0').focus();
-
+			$('SWFUpload_0').writeAttribute("tabindex", "-1");
 			Debug.write( "ips.attach.js: (ID " + this.id + ") Created uploader");
 			return true;
 		}
diff --git a/upload/public/js/ips.attachajax.js b/upload/public/js/ips.attachajax.js
deleted file mode 100644
index e68aae48..00000000
--- a/upload/public/js/ips.attachajax.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.attachajax.js - Attachment manager			*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-/* -TRUE- MULTIPLE ATTACHMENTS!!!				*/
-/* -------------------------------------------- */
-
-var _attach = window.IPBoard;
-
-_attach.prototype.attachajax = {
-	uploaders: [],
-	template: '',
-
-	
-	init: function()
-	{
-		Debug.write("Initializing ips.attachAjax.js");
-		
-		document.observe("dom:loaded", function(){
-			//ipb.attachajax.initUploaders();
-		});
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Registers an upload object
-	 * 
-	 * @param	{int}		id			The uploader ID
-	 * @param	{object}	options		Options to pass to object
-	*/
-	registerUploader: function( id, wrapper, options )
-	{
-		/* Build iframe */
-		iframe_obj = document.createElement( 'IFRAME' );
-		
-		//iframe_obj.src	           = ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attachiFrame&attach_rel_module=" +
-		// 				   			 options['attach_rel_module'] + "&attach_rel_id=" + options['attach_rel_id'] + "&attach_post_key=" + 
-		//				  			 options['attach_post_key'] + "&forum_id=" + options['forum_id'] + "&attach_id=" + id + '&fetch_all=1';
-		iframe_obj.id              = 'iframeAttach_' + options['attach_rel_id'];
-		iframe_obj.name			   = 'iframeAttach_' + options['attach_rel_id'];
-		iframe_obj.scrolling       = 'no';
-		iframe_obj.frameBorder     = 'no';
-		iframe_obj.border          = '0';
-		iframe_obj.className       = '';
-		iframe_obj.style.width     = '300px';
-		iframe_obj.style.height    = '50px';
-		iframe_obj.style.overflow  = 'hidden';
-		iframe_obj.style.display   = '';
-		iframe_obj.style.backgroundColor = 'transparent';
-		iframe_obj.allowtransparency = true;
-		
-		$( wrapper ).appendChild( iframe_obj );
-		
-		this.options = options;
-		this.wrapper = wrapper;
-		
-		if( $(id) )
-		{
-			$(id).hide();
-		}
-		
-		$('add_files_attach_' + options['attach_rel_id'] ).observe('click', this.processUpload.bindAsEventListener( this ) );
-	},
-	
-	/**
-	* Processes upload
-	*/
-	processUpload: function( e )
-	{
-		var iFrameBox  = window.frames[ 'iframeAttach_' + this.options['attach_rel_id'] ].document.getElementById('iframeUploadBox');
-		var iFrameForm = window.frames[ 'iframeAttach_' + this.options['attach_rel_id'] ].document.getElementById('iframeUploadForm');
-		var box        = $('attach_' + this.options['attach_rel_id'] );
-		
-		iFrameForm.action = ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attachUploadiFrame&attach_rel_module=" +
-		 				   	this.options['attach_rel_module'] + "&attach_rel_id=" + this.options['attach_rel_id'] + "&attach_post_key=" + 
-						  	this.options['attach_post_key'] + "&forum_id=" + this.options['forum_id'] + '&fetch_all=1';
-		
-		iFrameForm.submit();
-	},
-	/**
-	* Iframe is ready
-	*/
-	isReady: function()
-	{
-		if ( this.json )
-		{
-			if ( this.json['is_error'] )
-			{
-				$('attach_error_box').update( ipb.lang['error'] + " <strong>" + this._determineServerError( this.json['msg'] ) + "</strong>" );
-				
-			}
-			
-			if ( this.json['current_items'] )
-			{
-				this.buildBoxes( this.json['current_items'] );
-			}
-			
-			if ( typeof( this.json['attach_rel_id']) !='undefined' )
-			{
-				if( $('space_info_attach_' + this.json['attach_rel_id'] ) )
-				{
-					$('space_info_attach_' + this.json['attach_rel_id'] ).update( "И�пользовано <strong>" + this.json.attach_stats.space_used_human + "</strong> из <strong>" + this.json.attach_stats.total_space_allowed_human + "</strong>" );
-				}
-			}
-		}
-		
-		Debug.write( "Attach: iFrame is ready" );
-	},
-	
-	/**
-	* Builds boxes
-	*/
-	buildBoxes: function( currentItems )
-	{
-		for( var i in currentItems )
-		{
-			id    = i;
-			index = currentItems[i][0];
-			name  = currentItems[i][1];
-			size  = currentItems[i][2];
-			temp = this.template.gsub(/\[id\]/, id + '_' + index).gsub(/\[name\]/, name);
-	
-			$( 'attachments' ).insert( temp );
-		
-			new Effect.Appear( $( 'ali_' + id + '_' + index ), { duration: 0.3 } );
-			
-			$( 'ali_' + id + '_' + index ).select('.info')[0].update( ipb.global.convertSize( size ) );
-			
-			// Add event handlers
-			$( 'ali_' + id + '_' + index ).select('.delete')[0].observe( 'click', ipb.attachajax.removeUpload );
-			
-			// Remove old statuses
-			['complete', 'in_progress', 'error'].each( function( cName ){ $( 'ali_' + id + '_' + index ).removeClassName( cName ); }.bind( this ) );
-
-			$( 'ali_' + id + '_' + index ).addClassName( 'complete' );
-			
-			if( currentItems[ i ][ 3 ] == 1 )
-			{
-				tmp = currentItems[ i ];
-
-				var width = tmp[5];
-				var height = tmp[6];
-
-				if( ( tmp[5] && tmp[5] > 30 ) )
-				{
-					width = 30;
-					factor = ( 30 / tmp[5] );
-					height = tmp[6] * factor;
-				}
-
-				if( ( tmp[6] && tmp[6] > 30 ) )
-				{
-					height = 30;
-					factor = ( 30 / tmp[5] );
-					width = tmp[5] * factor;
-				}
-
-				thumb = new Element('img', { src: ipb.vars['upload_url'] + '/' + tmp[4], 'width': width, 'height': height, 'class': 'thumb_img' } ).hide();
-
-				$( 'ali_' + id + '_' + index ).select('.img_holder')[0].insert( thumb );
-				new Effect.Appear( $( thumb ), { duration: 0.4 } );
-			}
-		}
-	},
-	
-	removeUpload: function(e)
-	{
-		elem = Event.findElement( e, 'li' );
-		elemid = elem.id.match( /^ali_(.+?)_([0-9]+)$/ );
-		
-		if( !elemid[1] ){ return; }
-		
-		// Send request to remove upload
-		new Ajax.Request( ipb.vars['base_url'] + "app=core&module=attach&section=attach&do=attach_upload_remove&attach_rel_module=" +
-		 				   ipb.attachajax.options['attach_rel_module'] + "&attach_rel_id=" + ipb.attachajax.options['attach_rel_id'] + "&attach_post_key=" + 
-						  ipb.attachajax.options['attach_post_key'] + "&forum_id=" + ipb.attachajax.options['forum_id'] + "&attach_id=" + elemid[1] + '&secure_key=' + ipb.vars['secure_hash'],
-						{
-							method: 'post',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( Object.isUndefined( t.responseJSON ) ){ alert( ipb.lang['action_failed'] ); return; }
-								
-								if( t.responseJSON.msg == 'attach_removed' )
-								{
-									$( elem.id ).hide();
-								}
-								else
-								{
-									alert( ipb.lang['action_failed'] );
-									return;
-								}
-							}
-						});
-		
-		Event.stop(e);
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Returns a human-readable string for errors
-	 * 
-	 * @param	{string}	msg		The msg code
-	 * @return	{string}			The human-readable message
-	*/
-	_determineServerError: function( msg )
-	{
-		if( msg.blank() ){ return ipb.lang['silly_server']; }
-		
-		switch( msg )
-		{
-			case 'upload_no_file':
-				return ipb.lang['upload_no_file'];
-				break;
-			case 'invalid_mime_type':
-				return ipb.lang['invalid_mime_type'];
-				break;
-			case 'upload_too_big':
-				return ipb.lang['upload_too_big'];
-				break;
-			case 'upload_failed':
-				return ipb.lang['upload_failed'];
-				break;
-			default:
-				return ipb.lang['silly_server'];
-				break;
-		}
-		
-	},
-	
-	startedUploading: function(handler)
-	{
-		
-	},
-	
-	finishedUploading: function(handler)
-	{
-		
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Fetches an uploader
-	 * 
-	 * @param	{int}	id		ID of uploader to get
-	 * @return	mixed			Object if exists, false if not
-	*/
-	getUploader: function( id )
-	{
-		if( ipb.attachajax.uploaders[ id ] )
-		{
-			return ipb.attachajax.uploaders[ id ];
-		}
-		else
-		{
-			return false;
-		}
-	}
-};
-
-ipb.attachajax.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.blog.js b/upload/public/js/ips.blog.js
deleted file mode 100644
index b697214a..00000000
--- a/upload/public/js/ips.blog.js
+++ /dev/null
@@ -1,1150 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.blog.js - Blog javascript				*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-var _blog = window.IPBoard;
-
-_blog.prototype.blog = {
-	
-	cblocks: {},
-	canPostDraft: 1,
-	canPublish: 1,
-	defStatusGlobal: 'published',
-	defStatus: 'published',
-	_updating: 0,
-	currentTags: {},
-	currentCats: {},
-	_newCats: $H(),
-	goComments: 0,
-	maxCats: 0,
-	updateLeft: false,
-	updateRight: false,
-	cton: false,
-	// Properties for sortable
-	props:  { 	tag: 'div', 				only: 'cblock_drag',
-	 			handle: 'draggable', 		containment: ['cblock_left', 'cblock_right'],
-	 			constraint: '', 			dropOnEmpty: true,
-	 		 	hoverclass: 'over'
-	 		},
-	popups: {},
-	cp1: null,
-	blogs: {},
-	
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		Debug.write("Initializing ips.blog.js");
-		
-		document.observe("dom:loaded", function(){
-			if( ipb.blog.inEntry && ipb.blog.ownerID == ipb.vars['member_id'] && ipb.blog.withBlocks )
-			{
-				ipb.blog.setUpDrags();
-				ipb.blog.setUpCloseLinks();
-				
-				if( $('change_header') )
-				{
-					$('change_header').observe('click', ipb.blog.changeHeader);
-				}
-				
-				if( $('add_theme') )
-				{
-					$('add_theme').observe('click', ipb.blog.changeTheme);
-				}
-			}
-			
-			// Resize images
-			$$('.entry', '.poll').each( function(elem){
-				ipb.global.findImgs( $( elem ) );
-			});
-			
-			ipb.delegate.register('a[rel="bookmark"]', ipb.blog.showLinkToEntry );
-			ipb.delegate.register('.delete_entry', ipb.blog.deleteEntry);
-			ipb.delegate.register('.delete_comment', ipb.blog.deleteComment );
-			
-			/* Jump to comments? */
-			if ( ipb.blog.goComments )
-			{
-				$('comments').scrollTo();
-			}
-			
-			ipb.delegate.register(".__delete", ipb.blog.deleteDialogue );
-			
-		});
-	},
-	
-	/* INIT recent items menu */
-	setUpRecentMenu: function()
-	{
-		Debug.write('setting up menu' );
-		ipb.delegate.register(".__rmenu", ipb.blog.recentMenu);
-	},
-	
-	recentMenu: function( e, elem )
-	{
-		Event.stop(e);
-		
-		var action = $( elem ).className.match('__x([a-z]+)');
-		if( action == null || Object.isUndefined( action[1] ) ){ Debug.error("Error showing popup"); return; }
-		
-		var newTitle = $( elem ).innerHTML;
-		var url = ipb.vars['base_url'] + "app=blog&amp;module=ajax&amp;section=sidebar&amp;do=" + action[1] + '&md5check=' + ipb.vars['secure_hash'];
-		
-		new Ajax.Request( url.replace(/&amp;/g, '&'),
-						{
-							method: 'get',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								$('recentajaxcontent').update( t.responseText );
-								$('ratitle').update( newTitle );
-							}
-						});
-		
-	},
-	
-	/* INIT blogs as table */
-	setUpBlogsAsTable: function()
-	{
-		Debug.write('setting up popups' );
-		ipb.delegate.register(".__preview", ipb.blog.previewPopup);
-	},
-	
-	previewPopup: function( e, elem )
-	{
-		Event.stop(e);
-		
-		var sourceid = elem.identify();
-		var preview = $( elem ).className.match('__id([0-9]+)');
-
-		if( preview == null || Object.isUndefined( preview[1] ) ){ Debug.error("Error showing popup"); return; }
-		var popid = 'popup_' + preview[1] + '_preview';
-		
-		ipb.namePops[ preview ]	 = new ipb.Popup( popid, {
-			 												type: 'balloon',
-			 												initial: $( '__preview_content' + preview[1] ).innerHTML,
-			 												stem: true,
-															hideAtStart: false,
-			 												attach: { target: elem, position: 'auto' },
-			 												w: '400px'
-														});
-	},
-	
-	/* FORM STUFFS */
-	
-	/**
-	* Form: Show recent tags
-	*/
-	formTogglePopularTags: function( e )
-	{
-		Event.stop(e);
-		
-		$('tags_container').show();
-		$('tagsToggle').hide();
-		
-		/* Parse tags */
-		ipb.blog.currentTags.each( function( t )
-		{
-			var tid = t.key;
-			var tag = t.value;
-			
-			var html = ipb.templates['tag_entry'].evaluate( { 'tid': tid, 'tag': tag } );
-			$('tags_container').insert( html );
-			
-			$('tag_' + tid + '_wrap').observe('click', ipb.blog.formAddTag.bindAsEventListener( this, tid ) );
-		} );
-	},
-	
-	/**
-	 * Add a tag into the field
-	 */
-	formAddTag: function( e, tid )
-	{
-		Event.stop(e);
-		
-		var tag = ipb.blog.currentTags.get( tid );
-		
-		if ( tag )
-		{
-			$('blogTags').value += ',' + tag;
-		}
-		
-		$('blogTags').value = $('blogTags').value.replace( new RegExp( /^,(\s+?)?/ ), '' );
-	},
-	
-	/**
-	 * Init MEOW
-	 */
-	formInitCats: function()
-	{
-		var _c = 0;
-		
-		$('formCats').update('');
-		
-		/* Display new cats first, that's the LAW */
-		if ( ipb.blog._newCats.size() )
-		{
-			ipb.blog._newCats.each( function( c )
-			{
-				var html = ipb.templates['cat_entry'].evaluate( { 'cid': c.key, 'cat': c.value['category_title'] } );
-				$('formCats').insert( html );
-				
-				$('cat_' + c.key).checked = ( c.value['_selected'] == 1 ) ? true : false;
-				$('cat_' + c.key).observe('click', ipb.blog.formCheckboxClicked.bindAsEventListener( this, c.key ) );
-				
-				_c++;
-			} );
-		}
-	
-		if ( ipb.blog.currentCats.size() )
-		{
-			ipb.blog.currentCats.each( function( c )
-			{
-				var html = ipb.templates['cat_entry'].evaluate( { 'cid': c.key, 'cat': c.value['category_title'] } );
-				$('formCats').insert( html );
-				
-				$('cat_' + c.key ).checked = ( c.value['_selected'] == 1 ) ? true : false;
-				$('cat_' + c.key).observe('click', ipb.blog.formCheckboxClicked.bindAsEventListener( this, c.key ) );
-				
-				_c++;
-			} );
-		}
-		
-		/* Add overflow */
-		if ( _c >= 6 )
-		{
-			$('formCats').className = 'formCatsList';
-		}
-		
-		/* Max cats reached */
-		if ( _c >= ipb.blog.maxCats )
-		{
-			$('categoryAddToggle').hide();
-		}
-	},
-	
-	/**
-	 * Check box handler
-	 */
-	formCheckboxClicked: function( e, key )
-	{
-		if ( key.match( /catNew/ ) )
-		{
-			var c = ipb.blog._newCats.get( key );
-		
-			ipb.blog._newCats.set( key, {'_selected' : ( $('cat_' + key).checked ) ? 1 : 0 , 'category_title': c.category_title } );
-		}
-		else
-		{
-			var c = ipb.blog.currentCats.get( key );
-			
-			ipb.blog.currentCats.set( key, {'_selected' : ( $('cat_' + key).checked ) ? 1 : 0 , 'category_title': c.category_title } );
-		}
-	},
-	
-	/**
-	 * Add meow
-	 */
-	formAddCat: function( e )
-	{
-		Event.stop(e);
-		
-		var _go = true;
-		
-		var newCatName = ipb.blog.cleanCategoryName($F('formCatAddInput'));
-		
-		if (newCatName)
-		{
-			/* Already got a meow by this name? */
-			if ( ipb.blog.currentCats.size() )
-			{
-				ipb.blog.currentCats.each( function( c )
-				{
-					if ( c.value['category_title'] == newCatName )
-					{
-						alert( ipb.lang['blog_cat_exists'] );
-						
-						$('formCatAddInput').value = '';
-						var _go = false;
-					}
-				} );
-			}
-			
-			if ( ipb.blog._newCats.size() )
-			{
-				ipb.blog._newCats.each( function( t )
-				{
-					if ( t.value == newCatName )
-					{
-						alert( ipb.lang['blog_cat_exists'] );
-						
-						$('formCatAddInput').value = '';
-						var _go = false;
-					}
-				} );
-			}
-			
-			if ( _go == true )
-			{
-				var _id   = 'catNew-' + parseInt( ipb.blog._newCats.size() + 1 );
-				var _name = newCatName;
-				
-				ipb.blog._newCats.set( _id, { 'category_title' : _name, '_selected' : 1 } );
-				
-				$('formCatAddInput').value = '';
-				
-				ipb.blog.formInitCats();
-			}
-		}
-	},
-	
-	cleanCategoryName: function(name)
-	{
-		name = name.replace('&#032;', ' ');
-		name = name.replace("\r", '');
-		name = name.replace("\n", '');
-
-		name = name.replace('&', '&amp;');
-		name = name.replace('<!--', '&#60;&#33;--');
-		name = name.replace('-->', '--&#62;');
-		name = name.replace('<script', '&#60;script');
-		name = name.replace('>', '&gt;');
-		name = name.replace('<', '&lt;');
-		name = name.replace('"', '&quot;');
-		name = name.replace('$', '&#036;');
-		name = name.replace('!', '&#33;');
-		name = name.replace('\'', '&#39;');
-		
-		return name;
-	},
-	
-	/* Form INIT */
-	initPostForm: function()
-	{
-		$('bf_timeToggle').observe('click', ipb.blog.pfTimeToggle.bindAsEventListener( this ) );
-		$('bf_timeCancel').observe('click', ipb.blog.pfTimeCancel.bindAsEventListener( this ) );
-		
-		$('bf_publish').observe('click', ipb.blog.pfTriggerSubmit.bindAsEventListener( this, 'publish' ) );
-		$('bf_draft').observe('click', ipb.blog.pfTriggerSubmit.bindAsEventListener( this, 'draft' ) );
-		
-		ipb.blog.defStatus = ( ! ipb.blog.defStatus ) ? ipb.blog.defStatusGlobal : ipb.blog.defStatus;
-		
-		if ( ! ipb.blog.canPostDraft )
-		{
-			$('bf_draft').hide();
-		}
-		else
-		{
-			if ( ! ipb.blog.canPublish )
-			{
-				$('bf_publish').hide();
-			}
-			else
-			{
-				if ( $('bfs_modOptions') && $F('bfs_modOptions') == 'published' )
-				{
-					$('bfs_submit').value = ipb.lang['blog_publish_now'];
-				}
-				else
-				{
-				
-					$('bfs_submit').value = ipb.lang['blog_save_draft'];
-				}
-			}
-		}
-		
-		$('bf_modWrapper').hide();
-		$('bf_timeOpts').hide();
-		$('bf_timeOpts2').hide();
-		
-		/* Blog choose */
-		if ( $('blog_chooser') )
-		{
-			$('blog_chooser').observe( 'change', ipb.blog.pfBlogChooser.bindAsEventListener( this ) );
-		}
-	},
-	
-	pfBlogChooser: function( e )
-	{
-		Event.stop(e);
-		
-		blogid = $('blog_chooser').options[ $('blog_chooser').selectedIndex ].value;
-		
-		var url = ipb.vars['base_url'] + "app=blog&amp;module=ajax&amp;section=post&do=getdata&amp;blogid=" + blogid + "&md5check=" + ipb.vars['secure_hash'];
-		
-		new Ajax.Request( url.replace(/&amp;/g, '&'),
-						{
-							method: 'get',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if ( Object.isUndefined( t.responseJSON ) )
-								{
-									alert( ipb.lang['action_failed'] + ": " + t.responseJSON['error'] );
-									return;
-								}
-								
-								ipb.blog.currentCats = $H( t.responseJSON.cats );
-								ipb.blog.currentTags = $H( t.responseJSON.tags );
-								
-								ipb.blog.formInitCats(e);
-								ipb.blog.formTogglePopularTags(e);
-								
-								if ( ipb.blog.currentTags.size() < 1 )
-								{
-									$('tags_container').hide();
-								}
-							}
-						});
-	},
-	
-	
-	pfTriggerSubmit: function( e, type )
-	{
-		Event.stop(e);
-		
-		if ( ! ipb.blog.canPostDraft )
-		{
-			try
-			{
-				ipb.editors['ed-0'].update_for_form_submit();
-			}
-			catch(e){}
-			
-			$('postingform').submit();
-		}
-		else if ( ! ipb.blog.canPublish )
-		{
-			try
-			{
-				ipb.editors['ed-0'].update_for_form_submit();
-			}
-			catch(e){}
-			
-			$('postingform').submit();
-		}
-		else
-		{
-			var draftId = ( $('bfs_modOptions').options[1].value == 'draft' ) ? 1 : 0;
-			
-			if ( type == 'draft' )
-			{
-				$('bfs_modOptions').selectedIndex = draftId;
-			}
-			else
-			{
-				$('bfs_modOptions').selectedIndex = ( draftId == 1 ) ? 0 : 1;
-			}
-			
-			try
-			{
-				ipb.editors['ed-0'].update_for_form_submit();
-			}
-			catch(e){}
-			
-			$('postingform').submit();
-		}
-	},
-	
-	pfTimeToggle: function(e)
-	{
-		Event.stop(e);
-		$('bf_timeToggle').hide();
-		$('bf_timeOpts').show();
-		$('bf_timeOpts2').show();
-	},
-	
-	pfTimeCancel: function(e)
-	{
-		Event.stop(e);
-		$('bf_timeToggle').show();
-		$('bf_timeOpts').hide();
-		$('bf_timeOpts2').hide();
-	},
-	
-	/* OTHER STUFFS */
-
-	showLinkToEntry: function(e, elem)
-	{
-		_t = prompt( ipb.lang['copy_entry_link'], $( elem ).readAttribute('href') );
-		Event.stop(e);
-	},
-	
-	deleteEntry: function(e, elem)
-	{
-		if( !confirm( ipb.lang['delete_confirm'] ) )
-		{
-			Event.stop(e);
-		}
-	},
-	
-	deleteComment: function( e, elem )
-	{
-		if( ! confirm( ipb.lang['delete_confirm'] ) )
-		{
-			Event.stop(e);
-		}
-	},
-	
-	changeTheme: function(e)
-	{
-		Event.stop(e);
-		
-		if( ipb.blog.popups['themes'] )
-		{
-			ipb.blog.popups['themes'].show();
-		}
-		else
-		{
-			// Set up content
-			var afterInit = function( popup )
-			{
-				/*$('color_editor').insert( { top: $('color_tmp') } );
-				$('color_tmp').show();
-				ipb.blog.cp1 = new Refresh.Web.ColorPicker('cp1',{startHex: 'ffcc00', startMode:'h', clientFilesPath:clientImagePath});*/
-				
-				$('theme_preview').observe('click', ipb.blog.previewTheme);
-				$('theme_save').observe('click', ipb.blog.saveTheme);
-				$('theme_color_picker').observe('click', ipb.blog.openPicker);
-			};
-			
-			ipb.blog.popups['themes'] = new ipb.Popup('theme_editor', { type: 'pane', modal: false, hideAtStart: true, initial: ipb.templates['add_theme'] }, { afterInit: afterInit } );
-			ipb.blog.popups['themes'].show();
-			
-			//ipb.blog.colorpickerRepos();
-		}
-	},
-	
-	openPicker: function(e)
-	{
-		Event.stop(e);
-		window.open( ipb.vars['board_url'] + "/blog/colorpicker.html", "colorpicker", "status=0,toolbar=0,width=500,height=400,scrollbars=0");
-	},
-	
-	saveTheme: function(e)
-	{
-		var url = ipb.vars['base_url'] + "app=blog&amp;module=ajax&amp;section=themes&amp;blogid=" + ipb.blog.blogID;
-		var content = $F( 'themeContent' );
-		
-		new Ajax.Request( url.replace(/&amp;/g, '&'),
-						{
-							method: 'post',
-							parameters: {
-								content: content.encodeParam(),
-								md5check: ipb.vars['secure_hash']
-							},
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( !Object.isUndefined( t.responseJSON ) )
-								{
-									alert( ipb.lang['action_failed'] + ": " + t.responseJSON['error'] );
-									return;
-								}
-								
-								ipb.blog.popups['themes'].update( ipb.templates['theme_saved'] );
-								//ipb.blog.popups['themes'].hide();
-								
-							}
-						});
-		
-	},
-	
-	previewTheme: function(e)
-	{
-		for( var i=0; i < document.styleSheets.length; i++ )
-		{
-			if( document.styleSheets[ i ].title == 'Theme' )
-			{
-				document.styleSheets[ i ].disabled = true;
-			}
-		}
-
-		var style = document.createElement( 'style' );
-		style.type = 'text/css';
-
-		var content = $F( 'themeContent' );
-
-		if( ! content )
-		{
-			return false;
-		}
-		
-		var h = document.getElementsByTagName("head");
-		h[0].appendChild( style );
-		
-		Debug.write( content );
-		
-		try
-		{
-	    	style.styleSheet.cssText = content;
-	  	}
-	  	catch(e)
-	  	{
-	  		try
-	  		{
-	    		style.appendChild( document.createTextNode( content ) );
-	    		style.innerHTML=content;
-	  		}
-	  		catch(e){}
-	  	}
-
-		return false;
-	},
-	
-	/*colorpickerRepos: function()
-	{
-		ipb.blog.cp1.show();
-		ipb.blog.cp1.updateMapVisuals();
-		ipb.blog.cp1.updateSliderVisuals();
-	},*/
-	
-	changeHeader: function(e)
-	{
-		Event.stop(e);
-		
-		if( ipb.blog.popups['header'] )
-		{
-			ipb.blog.popups['header'].show();
-		}
-		else
-		{
-			var html = ipb.templates['headers'];
-			
-			var afterInit = function( popup )
-			{
-				if( $('reset_header') )
-				{
-					$('reset_header').observe('click', function(e){
-						if( !confirm( ipb.lang['blog_revert_header'] ) )
-						{
-							Event.stop(e);
-						}
-						
-						window.location.href = ipb.blog.blogURL.replace(/&amp;/g, '&') + "changeHeader=0";
-					});
-				}
-			};
-			
-			ipb.blog.popups['header'] = new ipb.Popup('change_header', { type: 'pane', modal: true, hideAtStart: false, w: '600px', initial: html }, { afterInit: afterInit } );
-		}
-	},
-	
-	setUpCloseLinks: function()
-	{
-		ipb.delegate.register('.close_link', ipb.blog.closeBlock );
-		ipb.delegate.register('.configure_link', ipb.blog.configureBlock );
-		ipb.delegate.register('.block_control', ipb.blog.addBlock );
-		ipb.delegate.register('.delete_block', ipb.blog.deleteBlock );
-	},
-	
-	deleteBlock: function(e, elem)
-	{
-		if( !confirm( ipb.lang['blog_sure_delcblock'] ) )
-		{
-			Event.stop(e);
-		}
-	},
-	
-	configureBlock: function(e, elem)
-	{
-		Event.stop(e);
-		
-		// Get id
-		Debug.write( $(elem).id );
-		var elem = $( elem ).up( '.cblock_drag' );
-		var blockid = $( elem ).id.replace('cblock_', '');
-		var wrapper = $( elem ).down('.cblock_inner');
-		
-		if( !wrapper ){ return; }
-		
-		// Get block
-		new Ajax.Request( ipb.vars['base_url'] + "app=blog&module=ajax&section=cblocks&do=showcblockconfig&secure_key=" + ipb.vars['secure_hash'] + "&cblock_id=" + blockid + "&blogid=" + ipb.blog.blogID,
-							{
-								method: 'get',
-								evalJSON: 'force',
-								onSuccess: function(t)
-								{
-									if( t.responseText == 'error' )
-									{
-										alert( ipb.lang['action_failed'] );
-										return;
-									}
-									else
-									{
-										$( elem ).replace( t.responseText );
-										Sortable.create('cblock_right', ipb.blog.props );
-										Sortable.create('cblock_left', ipb.blog.props );
-									}
-								}
-							}
-						);
-	},
-	
-	addBlock: function(e, elem)
-	{		
-		if( $( elem ).id == 'new_cblock' )
-		{
-			return;
-		}
-		else
-		{
-			Event.stop(e);
-			
-			// Get id
-			Debug.write( $(elem).id );
-			var blockid = $( elem ).id.replace('enable_cblock_', '');
-			
-			if( $( elem ).hasClassName('enable') ){
-				var req = 'doenablecblock';
-			} else {
-				var req = 'doaddcblock';
-			}				
-			
-			// Get block
-			new Ajax.Request( ipb.vars['base_url'] + "app=blog&module=ajax&section=cblocks&do=" + req + "&secure_key=" + ipb.vars['secure_hash'] + "&cbid=" + blockid + "&blogid=" + ipb.blog.blogID,
-								{
-									method: 'get',
-									evalJSON: 'force',
-									onSuccess: function(t)
-									{
-										if( Object.isUndefined( t.responseJSON ) )
-										{
-											alert( ipb.lang['action_failed'] );
-											return;
-										}
-										
-										if( t.responseJSON['error'] )
-										{
-											alert( ipb.lang['action_failed'] + ": " + t.responseJSON['error'] );
-											return;
-										}
-										
-										if( t.responseJSON['cb_html'] )
-										{
-											// Figure out where to put it
-											if( $('cblock_right').visible() )
-											{
-												$('cblock_right').insert( { bottom: t.responseJSON['cb_html'] } );
-												Sortable.create('cblock_right', ipb.blog.props );
-												Sortable.create('cblock_left', ipb.blog.props );
-											}
-											else if( $('cblock_left').visible() )
-											{
-												$('cblock_left').insert( { bottom: t.responseJSON['cb_html'] } );
-												Sortable.create('cblock_right', ipb.blog.props );
-												Sortable.create('cblock_left', ipb.blog.props );
-											}
-											else
-											{
-												document.location.reload(true);
-											}
-											
-											// Remove it from the menu
-											if( $('enable_cblock_' + blockid) ){
-												$('enable_cblock_' + blockid).remove();
-											}
-										}
-									}
-								} );
-			
-		}
-	},
-
-	closeBlock: function(e, elem)
-	{
-		Event.stop(e);
-		
-		var elem = $( elem ).up( '.cblock_drag' );
-		var cblockid = $( elem ).id.replace('cblock_', '');
-		
-		if( Object.isUndefined( cblockid ) ){ return; }
-		if( !elem ){ return; }
-		
-		var url = ipb.vars['base_url'] + 'app=blog&module=ajax&section=cblocks&do=doremovecblock&blogid='+ipb.blog.blogID + '&cbid=' + cblockid + "&secure_key=" + ipb.vars['secure_hash'];
-		
-		new Ajax.Request( url.replace(/&amp;/, '&'),
-						{
-							method: 'post',
-							evalJSON: 'force',
-							onSuccess: function(t)
-							{
-								if( Object.isUndefined( t.responseJSON ) || t.responseText == 'error' )
-								{
-									Debug.write( "Error removing block" );
-								}
-								else
-								{
-									new Effect.Parallel( [
-										new Effect.BlindUp( $(elem), { sync: true } ),
-										new Effect.Fade( $(elem), { sync: true } )
-									], { duration: 0.5, afterFinish: function(){
-										// Get the name of the item
-									
-										var menu_item = ipb.templates['cblock_item'].evaluate( { 'id': cblockid, 'name': t.responseJSON['name'] } );
-									
-										$('content_blocks_menucontent').insert( menu_item );
-									
-										$(elem).remove();
-										ipb.blog.updatedBlocks('');
-									} } );
-								}
-							}
-						});	
-	},
-	
-	setUpDrags: function()
-	{
-		Debug.write("Here");
-		
-		if( !$('main_column') ){
-			Debug.error("No main column found, cannot create draggable blocks");
-		}
-		
-		var height_l = null;
-		var height_r = null;
-		var width_c = null;
-		
-		if( $('cblock_left') ){
-			height_l = $('cblock_left').getHeight();
-			width_c = $('cblock_left').getWidth();
-		}
-		
-		if( $('cblock_right') ){
-			height_r = $('cblock_right').getHeight();
-			if( width_c != null )
-			{
-				var n_width_c = $('cblock_right').getWidth();
-				width_c = ( n_width_c > width_c ) ? n_width_c : width_c;
-			}
-			else
-			{
-				width_c = $('cblock_right').getWidth();
-			}
-		}
-		
-		// Step one: if side column doesnt exist, create it
-		if( !$('cblock_left') )
-		{
-			var cblockleft = new Element('div', { id: 'cblock_left' } );
-			cblockleft.setStyle('width: ' + width_c + 'px; height: ' + height_r + 'px;').addClassName('cblock').addClassName('temp').hide();
-			$('sidebar_holder').insert( { before: cblockleft } );
-			ipb.blog.updateLeft = true;
-		}
-		
-		if( !$('cblock_right') )
-		{
-			var cblockright = new Element('div', { id: 'cblock_right' } );
-			cblockright.setStyle('width: ' + width_c + 'px; height: ' + height_l + 'px;').addClassName('cblock').addClassName('temp').hide();
-			$('sidebar_holder').insert( { after: cblockright } );
-			ipb.blog.updateRight = true;
-		}
-		
-		Sortable.create('cblock_right', ipb.blog.props );
-		Sortable.create('cblock_left', ipb.blog.props );
-		
-		// Add observer
-		Draggables.addObserver(
-			{
-				onStart: function( eventName, draggable, event )
-				{
-					$('cblock_left').show().addClassName('drop_zone');
-					$('cblock_right').show().addClassName('drop_zone');
-					
-					if( !Prototype.Browser.IE )
-					{
-						$('cblock_left').setStyle('opacity: 0.3');
-						$('cblock_right').setStyle('opacity: 0.3');
-					}
-				},
-				onEnd: function( eventName, draggable, event )
-				{
-					$('cblock_left').removeClassName('drop_zone').setStyle('opacity: 1');
-					$('cblock_right').removeClassName('drop_zone').setStyle('opacity: 1');
-					
-					ipb.blog._updated( draggable );
-				}
-			}
-		);
-	},
-	
-	_updated: function( draggable )
-	{
-		if( ipb.blog._updating ){ return; }
-		ipb.blog._updating = true;
-		
-		id = 0;
-		
-		// Get the ID
-		if( draggable.element )
-		{
-			id = $( draggable.element ).id.replace('cblock_', '');
-		}
-		
-		// Update classes
-		ipb.blog.updatedBlocks( id );
-		
-		// Update position by ajax
-		ipb.blog.updatePosition( id, draggable );
-	},
-	
-	updatePosition: function( id, draggable )
-	{
-		if( !$('cblock_' + id ) ){ return; }
-		
-		// Need to figure out which column it is in
-		if( $('cblock_' + id ).descendantOf('cblock_left') ){
-			var pos = 'l';
-		} else {
-			var pos = 'r';
-		}
-		
-		var nextid = 0;
-		
-		// Which block is next to it?
-		var nextelem = $('cblock_' + id).next('.cblock_drag');
-		
-		if( !Object.isUndefined( nextelem ) && $(nextelem).id )
-		{
-			nextid = $( nextelem ).id.replace('cblock_', '');
-		}
-		
-		var url = ipb.vars['base_url'] + "app=blog&module=ajax&section=cblocks&do=savecblockpos&oldid="+id+"&newid="+nextid+"&pos="+pos+"&blogid="+ipb.blog.blogID+"&secure_key="+ipb.vars['secure_hash'];
-		
-		// Ok, send the infos
-		new Ajax.Request( 	url.replace('&amp;', '&'),
-							{
-								method: 'get',
-								onSuccess: function(t){
-									Debug.write( t.responseText );
-								}
-							}
-						);
-		
-	},
-	
-	updatedBlocks: function( id )
-	{
-		var d_l = $('cblock_left').select('.cblock_drag');
-		var d_r = $('cblock_right').select('.cblock_drag');
-		
-		//var d_l = Sortable.sequence('cblock_left');
-		//var d_r = Sortable.sequence('cblock_right');
-		//Debug.dir( d_l );
-		
-		// Check for descendants
-		if( d_l.size() > 0 ){
-			$('main_blog_wrapper').addClassName('with_left');
-			$('cblock_left').removeClassName('temp');
-		} else {
-			$('main_blog_wrapper').removeClassName('with_left');
-			$('cblock_left').addClassName('temp').hide();
-			$('cblock_left').innerHTML += "&nbsp;"; // Force a redraw for safari
-		}
-		
-		if( d_r.size() > 0 ){
-			$('main_blog_wrapper').addClassName('with_right');
-			$('cblock_right').removeClassName('temp');
-		} else {
-			$('main_blog_wrapper').removeClassName('with_right');
-			$('cblock_right').addClassName('temp').hide();
-			$('cblock_right').innerHTML += "&nbsp;"; // Force a redraw for safari
-		}
-		
-		if( ipb.blog.updateLeft )
-		{
-			//$('cblock_left').setStyle('height: auto; position: static; top: auto; left: auto;');
-		}
-		
-		ipb.blog._updating = false;
-	},
-	
-	saveCblock: function( e, cblock, fields )
-	{
-		var save_fields = '';
-		
-		for( var i = 0; i < fields.length; i++ )
-		{
-			save_fields += '&' + 'cblock_config[' + fields[i] + ']' + '=' + $F( fields[i] );
-		}
-		
-		var url = ipb.vars['base_url'] + "app=blog&module=ajax&section=cblocks&do=savecblockconfig&cblock_id=" + cblock + "&blogid=" + ipb.blog.blogID + "&secure_key=" + ipb.vars['secure_hash'];
-		
-		new Ajax.Request( url.replace(/&amp;/g, '&' ) + save_fields,
-							{
-								method: 'get',
-								onSuccess: function(t)
-								{
-									if( t.responseText == 'error' )
-									{
-										alert( ipb.lang['action_failed'] );
-										return;
-									}
-									else if( t.responseText == 'refresh' )
-									{
-										document.location.reload(true);
-									}
-									else
-									{
-										$( 'cblock_' + cblock_id ).replace( t.responseText );
-										Sortable.create('cblock_right', ipb.blog.props );
-										Sortable.create('cblock_left', ipb.blog.props );
-									}
-									
-								}
-							}
-						);
-	},
-	
-	register: function( id, position )
-	{
-		if( !ipb.blog.inEntry ){ return; }
-		if( !$('cblock_' + id) ){ return; }
-		
-		//new Draggable( $('cblock_' + id), { handle: 'draggable', revert: true } );		
-	},
-	
-	/**
-	 * Sets the supplied post to hidden
-	 * 
-	 * @var		{int}	id		The ID of the post to hide
-	*/
-	setCommentHidden: function(id)
-	{
-		if( $( 'comment_id_' + id ).select('.post_wrap')[0] )
-		{
-			$( 'comment_id_' + id ).select('.post_wrap')[0].hide();
-
-			if( $('unhide_post_' + id ) )
-			{
-				$('unhide_post_' + id).observe('click', ipb.blog.showHiddenComment );
-			}
-		}
-	},
-	
-	/**
-	 * Unhides the supplied post
-	 * 
-	 * @var		{event}		e	The link event
-	*/
-	showHiddenComment: function(e)
-	{
-		link = Event.findElement(e, 'a');
-		id = link.id.replace('unhide_post_', '');
-		
-		if( $('comment_id_' + id ).select('.post_wrap')[0] )
-		{
-			elem = $('comment_id_' + id ).select('.post_wrap')[0];
-			new Effect.Parallel( [
-				new Effect.BlindDown( elem ),
-				new Effect.Appear( elem )
-			], { duration: 0.5 } );
-		}
-		
-		if( $('comment_id_' + id ).select('.post_ignore')[0] )
-		{
-			elem = $('comment_id_' + id ).select('.post_ignore')[0];
-			/*new Effect.BlindUp( elem, {duration: 0.2} );*/
-			elem.hide();
-		}
-		
-		Event.stop(e);
-	},
-	
-	/**
-	* Delete pop-up
-	*/
-	deleteDialogue: function(e, elem)
-	{
-		Event.stop(e);
-		
-		var id = elem.id.replace( 'blogDelete_', '' );
-		
-		if ( ipb.blog.popups[ 'del_' + id ] )
-		{
-			ipb.blog.popups[ 'del_' + id ].show(e);
-		}
-		else
-		{
-			ipb.blog.popups[ 'del_' + id ] = new ipb.Popup( 'd_e_l__' + id, {
-																			type: 'balloon',
-																			initial: ipb.templates['deleteDialogue'].evaluate( { 'id' : id } ),
-																			stem: true,
-																			hideAtStart: false,
-																			defer: false,
-																			warning: true,
-																			attach: { target: $('blog-' + id + '__mod_options'), position: 'auto', 'event': 'click' },
-																			w: '400px'
-																		});
-																		
-			/* Populate select box */
-			if ( ipb.blog.blogs.size() )
-			{
-				ipb.blog.blogs.each( function( b )
-				{
-					if ( b.key != id )
-					{
-						var _o = new Element( 'option' );
-						_o.value  = b.key;
-						_o.text   = b.value.replace( '&#39;', "'" ).replace( '&quot;', '"' );
-						
-						$('delselect_' + id).insert( _o );
-					}
-				} );
-			}
-				
-			$('delButton_' + id).observe('click', ipb.blog.ohJustDeleteItAlready.bindAsEventListener( this, id ) );
-			$('delMove_' + id).observe('change', ipb.blog.deleteMoveCheck.bindAsEventListener( this, id ) );
-		}
-	},
-	
-	/**
-	* YeAh
-	*/
-	ohJustDeleteItAlready: function( e, id )
-	{
-		Event.stop(e);
-		if ( ! $('delConfirm_' + id ).checked )
-		{
-			alert( 'If you want to delete this blog, you must check the box' );
-			return false;
-		}
-		
-		var url = $('blogDelete_' + id ).href;
-		
-		if ( $('delMove_' + id ) && $('delMove_' + id ).checked )
-		{
-			url += '&moveTo=' + $('delselect_' + id ).options[ $('delselect_' + id ).selectedIndex ].value;
-		}
-		
-		/* OG */
-		window.location = url;
-	},
-	
-	/**
-	 * <insert stuff>
-	 */
-	deleteMoveCheck: function( e, id )
-	{
-		Event.stop(e);
-		
-		if ( $('delMove_' + id).checked )
-		{
-			$('delMore_' + id).hide();
-		}
-		else
-		{
-			$('delMore_' + id).show();
-		}
-		
-		return true;
-	}
-};
-
-ipb.blog.init();
diff --git a/upload/public/js/ips.blogucp.js b/upload/public/js/ips.blogucp.js
deleted file mode 100644
index f1678223..00000000
--- a/upload/public/js/ips.blogucp.js
+++ /dev/null
@@ -1,327 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.blogucp.js - Blog javascript				*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-var _blogucp = window.IPBoard;
-
-_blogucp.prototype.blogucp = {
-	currentCats: {},
-	_newCats: $H(),
-	blogs: {},
-	imgs: {},
-	popups: [],
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function(){
-		
-		Debug.write("Initializing ips.blogucp.js");
-		
-		document.observe("dom:loaded", function()
-		{
-			if ( $('isBlogUcpForm') )
-			{
-				ipb.blogucp.updateForm();
-				
-				$$('.blogform').each( function(elem)
-				{
-					console.log( elem );
-					/*switch( elem.tagName )
-					{
-						case 'INPUT':
-						case 'LABEL':
-							$( elem ).observe('click', ipb.blogucp.updateForm);
-						break;
-						case 'SELECT':
-							$( elem ).observe('change', ipb.blogucp.updateForm);
-						break;
-					}*/
-				});
-			}
-			
-			/* Blog list */
-			if ( $('blogListTable') )
-			{
-				ipb.delegate.register(".__delete", ipb.blogucp.deleteDialogue );
-			}			
-		});
-	},
-	
-	/**
-	 * Stop importing RSS feed
-	 */
-	stopRssFeed: function( blogId )
-	{
-		if( confirm( ipb.lang['delete_confirm'] ) )
-		{
-			window.location = ipb.vars['base_url'] + "app=core&module=usercp&tab=blog&area=stopRssImport&do=custom&blogid=" + blogId + '&secure_key=' + ipb.vars['secure_hash'];
-		}
-	},
-	
-	/**
-	* Delete pop-up
-	*/
-	deleteDialogue: function(e, elem)
-	{
-		Event.stop(e);
-		
-		var id = elem.id.replace( 'blogDelete_', '' );
-		
-		if ( ipb.blogucp.popups[ 'del_' + id ] )
-		{
-			ipb.blogucp.popups[ 'del_' + id ].show(e);
-		}
-		else
-		{
-			ipb.blogucp.popups[ 'del_' + id ] = new ipb.Popup( 'd_e_l__' + id, {
-																			type: 'balloon',
-																			initial: ipb.templates['deleteDialogue'].evaluate( { 'id' : id } ),
-																			stem: true,
-																			hideAtStart: false,
-																			defer: false,
-																			attach: { target: $('blogLink_' + id ), position: 'auto', 'event': 'click' },
-																			w: '400px'
-																		});
-																		
-			/* Populate select box */
-			if ( ipb.blogucp.blogs.size() )
-			{
-				ipb.blogucp.blogs.each( function( b )
-				{
-					if ( b.key != id )
-					{
-						var _o = new Element( 'option' );
-						_o.value  = b.key;
-						_o.text   = b.value.replace( '&#39;', "'" ).replace( '&quot;', '"' );
-						
-						$('delselect_' + id).insert( _o );
-					}
-				} );
-			}
-				
-			$('delButton_' + id).observe('click', ipb.blogucp.ohJustDeleteItAlready.bindAsEventListener( this, id ) );
-			$('delMove_' + id).observe('change', ipb.blogucp.deleteMoveCheck.bindAsEventListener( this, id ) );
-		}
-	},
-	
-	/**
-	* YeAh
-	*/
-	ohJustDeleteItAlready: function( e, id )
-	{
-		Event.stop(e);
-		if ( ! $('delConfirm_' + id ).checked )
-		{
-			alert( 'If you want to delete this blog, you must check the box' );
-			return false;
-		}
-		
-		var url = $('blogDelete_' + id ).href;
-		
-		if ( $('delMove_' + id ) && $('delMove_' + id ).checked )
-		{
-			url += '&moveTo=' + $('delselect_' + id ).options[ $('delselect_' + id ).selectedIndex ].value;
-		}
-		
-		/* OG */
-		window.location = url;
-	},
-	
-	/**
-	 * <insert stuff>
-	 */
-	deleteMoveCheck: function( e, id )
-	{
-		Event.stop(e);
-		
-		if ( $('delMove_' + id).checked )
-		{
-			$('delMore_' + id).hide();
-		}
-		else
-		{
-			$('delMore_' + id).show();
-		}
-		
-		return true;
-	},
-	
-	/**
-	 * Cat form
-	 */
-	initCatForm: function()
-	{
-		var _c = 0;
-		$('main_comment_wrap').update('');
-		
-		if ( ipb.blogucp.currentCats.size() )
-		{
-			ipb.blogucp.currentCats.each( function( c )
-			{
-				var html = ipb.templates['cat_entry'].evaluate( { 'cid': c.key, 'cat': c.value['category_title'], 'count' : c.value['count'], 'img' : ( c.key != 0 ) ? ipb.blogucp.imgs['normal'] : ipb.blogucp.imgs['locked'] } );
-				$('main_comment_wrap').insert( html );
-				
-				if ( c.key == 0 )
-				{
-					$('cat_' + c.key ).disabled = true;
-				}
-				else
-				{
-					_c++;
-				}
-				
-				$('catClicker_' + c.key).observe('click', ipb.blogucp.editPop.bindAsEventListener( this, c.key ) );
-			} );
-		}
-	},
-	
-	/**
-	 * Edit Pop
-	 */
-	editPop: function(e, key)
-	{
-		Event.stop(e);
-	
-		var cat     = ipb.blogucp.currentCats.get( key );
-		var content = '';
-		
-		if ( key == 0 )
-		{
-			var content = ipb.templates['editCant'].evaluate( { 'cid': key, 'cat': cat.category_title, 'cidwq': key } );
-		}
-		else
-		{ 
-			var content = ipb.templates['editCatMeow'].evaluate( { 'cid': key, 'cat': cat.category_title, 'cidwq': key } );
-		}
-		
-		if ( ipb.blogucp.popups[ key ] )
-		{
-			ipb.blogucp.popups[ key ].show(e);
-		}
-		else
-		{
-			ipb.blogucp.popups[ key ] = new ipb.Popup( 'c_a_t__' + key, {
-																			type: 'balloon',
-																			initial: content,
-																			stem: true,
-																			hideAtStart: false,
-																			defer: false,
-																			attach: { target: $('catClicker_' + key ), position: 'auto', 'event': 'click' },
-																			w: '400px'
-																		});
-																		
-			$('catSubmit_' + key).observe('click', ipb.blogucp.editSave.bindAsEventListener( this, key ) );
-		}
-	},
-	
-	/**
-	 * Edit save
-	 */
-	editSave: function(e, key)
-	{
-		var cat = ipb.blogucp.currentCats.get( key );
-		
-		if ( cat.category_title && $F('catEditBox_' + key) && key != 0 )
-		{
-			var url = ipb.vars['base_url'] + "app=blog&amp;module=ajax&amp;section=categories&amp;blogid=" + ipb.blogucp.blogID + '&amp;category_id=' + key;
-			
-			new Ajax.Request( url.replace(/&amp;/g, '&'),
-							{
-								method: 'post',
-								parameters: {
-									category_title: $F('catEditBox_' + key).encodeParam(),
-									md5check: ipb.vars['secure_hash']
-								},
-								evalJSON: 'force',
-								onSuccess: function(t, e)
-								{
-									if ( Object.isUndefined( t.responseJSON ) )
-									{
-										alert( ipb.lang['action_failed'] + ": " + t.responseJSON['error'] );
-										return;
-									}
-									
-									ipb.blogucp.popups[ key ].hide(e);
-									
-									$( 'catName_' + key ).update( $F('catEditBox_' + key ).replace( "'", '&#039;' ) );
-								}
-							});
-		}
-	},
-	
-	/**
-	 * Add category
-	 */
-	addCat: function(e)
-	{
-		$('catAddInputForm').value = $F('catAddInput');
-		
-		if ( $('catAddInputForm').value )
-		{
-	  		$('catAddForm').submit();
-	  	}  
-	},
-	
-	/**
-	 * Settings form
-	 */
-	updateForm: function(e)
-	{
-		if( $F('blog_type') == 'external' ){
-			ipb.blogucp.hide( $('blog_local_settings') );
-			ipb.blogucp.hide( $('list_blog_view_level') );
-			ipb.blogucp.hide( $('blog_rss_settings') );
-			ipb.blogucp.hide( $('blog_customize_settings') );
-			ipb.blogucp.hide( $('blog_private_club') );
-			ipb.blogucp.hide( $('blog_editors') );
-			ipb.blogucp.show( $('blog_local_settings_hidden') );
-			ipb.blogucp.show( $('blog_external_settings') );
-		} else {
-			ipb.blogucp.show( $('blog_local_settings') );
-			ipb.blogucp.show( $('list_blog_view_level') );
-			ipb.blogucp.show( $('blog_rss_settings') );
-			ipb.blogucp.show( $('blog_customize_settings') );
-			ipb.blogucp.show( $('blog_private_club') );
-			ipb.blogucp.show( $('blog_editors') );
-			ipb.blogucp.hide( $('blog_local_settings_hidden') );
-			ipb.blogucp.hide( $('blog_external_settings') );
-		}
-		
-		if( $F('blog_view_level') == 'private' || $F('blog_view_level') == 'privateclub' ){
-			ipb.blogucp.hide( $('list_allowguest') );
-			ipb.blogucp.hide( $('list_allowguestcomments') );
-		} else {
-			ipb.blogucp.show( $('list_allowguest') );
-			ipb.blogucp.show( $('list_allowguestcomments') );
-		}
-		
-		if( $F('blog_view_level') == 'privateclub' ){
-			ipb.blogucp.show( $('blog_private_club' ) );
-		} else {
-			ipb.blogucp.hide( $('blog_private_club' ) );
-		}
-		
-		if( $('blog_allowguest').checked ){
-			ipb.blogucp.show( $('list_allowguestcomments') );
-		} else {
-			ipb.blogucp.hide( $('list_allowguestcomments') );
-		}
-		
-	},
-	
-	hide: function(elem)
-	{
-		if( $( elem ) ){ $( elem ).hide(); }
-	},
-	
-	show: function(elem)
-	{
-		if( $( elem ) ){ $( elem ).show(); }
-	}	
-};
-
-ipb.blogucp.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.board.js b/upload/public/js/ips.board.js
index 1b3dc3ce..0495e32e 100644
--- a/upload/public/js/ips.board.js
+++ b/upload/public/js/ips.board.js
@@ -12,6 +12,8 @@ var _idx = window.IPBoard;
 _idx.prototype.board = {
 	_statusClick: 0,
 	_statusDefaultValue: '',
+	count_sbars: 0,
+	count_hidden: 0,
 	
 	/*------------------------------*/
 	/* Constructor 					*/
@@ -27,7 +29,7 @@ _idx.prototype.board = {
 			if( $('updateStatusForm') ){
 				$('updateStatusForm').observe( 'submit', ipb.board.statusHookSubmit );
 			}
-			
+						
 		});
 	},
 	
@@ -39,10 +41,8 @@ _idx.prototype.board = {
 	{
 		if ( ! ipb.board._statusClick )
 		{
-			if( $('hookStatusTextField') )
-			{
+			if( $('hookStatusTextField') ){
 				$('hookStatusTextField').value = '';
-				//$('hookStatusTextField').setStyle( { color: 'black' } );
 			}
 			
 			ipb.board._statusClick = 1;
@@ -73,34 +73,22 @@ _idx.prototype.board = {
 	*/
 	setUpForumTables: function()
 	{
-		$$('.ipb_table').each( function(tab){
-			var tmp = $( tab ).wrap( 'div' );
-			$( tmp ).addClassName('table_wrap');
-		});
-		
-		$$('.category_block').each( function(cat){
-			$(cat).select('.toggle')[0].observe( 'click', ipb.board.toggleCat );			
-		});	
-		
-		cookie			= ipb.Cookie.get('toggleCats');
+		ipb.delegate.register(".category_block .toggle", ipb.board.toggleCat);
+		var cookie			= ipb.Cookie.get('toggleCats');
 		
 		if( cookie )
 		{
 			var cookies		= cookie.split( ',' );
 			var newCookies	= new Array();
 			var resetCookie	= false;
-			
-			//-------------------------
-			// Little fun for you...
-			//-------------------------
-			
+						
 			for( var abcdefg=0; abcdefg < cookies.length; abcdefg++ )
 			{
 				if( cookies[ abcdefg ] )
 				{
 					if( $( 'category_' + cookies[ abcdefg ] ) )
 					{
-						var wrapper	= $( 'category_' + cookies[ abcdefg ] ).up('.category_block').down('.table_wrap');
+						var wrapper	= $( 'category_' + cookies[ abcdefg ] ).down('.table_wrap');
 						
 						wrapper.hide();
 						$( 'category_' + cookies[ abcdefg ] ).addClassName('collapsed');
@@ -127,23 +115,20 @@ _idx.prototype.board = {
 	 * 
 	 * @var		{event}		e	The event
 	*/
-	toggleCat: function(e)
+	toggleCat: function(e, elem)
 	{
 		if( ipb.board.animating ){ return false; }
 		
-		
-		var click = Event.element(e);
 		var remove = $A();
-		var wrapper = $( click ).up('.category_block').down('.table_wrap');
-		Debug.write( wrapper );
+		var catname = $( elem ).up('.category_block');
+		var wrapper = $( catname ).down('.table_wrap');
 		$( wrapper ).identify(); // IE8 fix
-		catname = $( click ).up('h3');
 		var catid = catname.id.replace('category_', '');
 		
 		ipb.board.animating = true;
-		
+
 		// Get cookie
-		cookie = ipb.Cookie.get('toggleCats');
+		var cookie = ipb.Cookie.get('toggleCats');
 		if( cookie == null ){
 			cookie = $A();
 		} else {
@@ -151,6 +136,7 @@ _idx.prototype.board = {
 		}
 		
 		Effect.toggle( wrapper, 'blind', {duration: 0.4, afterFinish: function(){ ipb.board.animating = false; } } );
+		Effect.toggle( wrapper, 'appear', {duration: 0.3});
 		
 		if( catname.hasClassName('collapsed') )
 		{
@@ -179,73 +165,58 @@ _idx.prototype.board = {
 	*/
 	initSidebar: function()
 	{
-		if( !$('index_stats') )
+		if( $('toggle_sidebar') )
 		{
-			return false;
+			$('toggle_sidebar').on('click', ipb.board.toggleSidebar);
+			
+			if( $('index_stats').visible() ){
+				$('toggle_sidebar').update( $('toggle_sidebar').readAttribute("data-open") );
+			} else {
+				$('toggle_sidebar').update( $('toggle_sidebar').readAttribute("data-closed") );
+			}
 		}
-
+		
+		ipb.board.setUpSideBarBlocks();
+	},
+	
+	toggleSidebar: function(e){
 		if( $('index_stats').visible() )
 		{
-			Debug.write("Stats are visible");
-			$('open_sidebar').hide();
-			$('close_sidebar').show();
+			ipb.Cookie.set('hide_sidebar', 1, 1);
 			
-			ipb.board.setUpSideBarBlocks();
+			if( Prototype.Browser.WebKit ){
+				// Chrome utterly fails to animate our ipsLayout styling. So we have to refresh the page.
+				window.location.reload();
+			}
+			else
+			{
+				new Effect.Fade( $('index_stats'), { duration: 0.4, afterFinish: function(){
+					new Effect.Morph( $('board_index'), { duration: 0.3, style:'no_sidebar' });
+				} } );
+			}
+			
+			$('toggle_sidebar').update("&laquo;");
 		}
 		else
 		{
-			Debug.write("Stats aren't visible");
-			$('open_sidebar').show();
-			$('close_sidebar').hide();
+			ipb.Cookie.set('hide_sidebar', 0, 1);
+			
+			if( Prototype.Browser.WebKit ){
+				window.location.reload();
+			}
+			else
+			{
+				new Effect.Morph( $('board_index'), { duration: 0.3, style:'force_sidebar', afterFinish: function(){
+					new Effect.Appear( $('index_stats'), { duration: 0.4, afterFinish: function(){
+						$('board_index').removeClassName('no_sidebar').removeClassName('force_sidebar');
+					}});
+				} } );
+			}
+			
+			$('toggle_sidebar').update("&times;");
 		}
 		
-		ipb.board.animating = false;
-		
-		if( $('close_sidebar') )
-		{
-			$('close_sidebar').observe('click', function(e){
-				if( ipb.board.animating ){ Event.stop(e); return; }
-				
-				ipb.board.animating = true;		
-				new Effect.Fade( $('index_stats'), {duration: 0.4, afterFinish: function(){
-					new Effect.Morph( $('categories'), { style: 'no_sidebar', duration: 0.4, afterFinish: function(){
-						ipb.board.animating = false;
-					 } } );
-				} } );
-				
-				Event.stop(e);
-				$('close_sidebar').toggle();
-				$('open_sidebar').toggle();
-				ipb.Cookie.set('hide_sidebar', '1', 1);
-			});
-		}
-		if( $('open_sidebar') )
-		{
-			$('open_sidebar').observe('click', function(e){
-				if( ipb.board.animating ){ Event.stop(e); return; }
-				
-				ipb.board.animating = true;
-				
-				new Effect.Morph( $('categories'), { style: 'with_sidebar', duration: 0.4, afterFinish: function(){
-					$('categories').removeClassName('with_sidebar').removeClassName('no_sidebar');
-					new Effect.Appear( $('index_stats'), { duration: 0.4, queue: 'end', afterFinish: function(){
-						ipb.board.animating = false; $('index_stats').show(); ipb.board.setUpSideBarBlocks();
-				 	} } );
-				} } );
-				
-				Event.stop(e);
-				$('close_sidebar').toggle();
-				$('open_sidebar').toggle();
-				
-				/* Bug fix */
-				if ( Prototype.Browser.Chrome )
-				{
-					setTimeout( "\$('index_stats').show()", 300 );
-				}
-				
-				ipb.Cookie.set('hide_sidebar', '0', 1);
-			});
-		}
+		Event.stop(e);
 	},
 	
 	/**
@@ -253,12 +224,14 @@ _idx.prototype.board = {
 	 */
 	setUpSideBarBlocks: function()
 	{
-		if( $('index_stats').visible() && ! $$('.index_stats_collapse').length )
+		if ( $('index_stats').visible() )
 		{
 			$$('#index_stats h3').each( function(h3)
 			{
 				$( h3 ).identify();
 				
+				ipb.board.count_sbars++;
+				
 				/* Set title - fugly 
 				   Here we run through escape first to change foreign chars to %xx with xx being latin, and then we remove % after */
 				title = escape( $( h3 ).innerHTML.replace( /<(\/)?([^>]+?)>/g, '' ) ).replace( /%/g, '' );
@@ -267,7 +240,7 @@ _idx.prototype.board = {
 				$( h3 ).up('div').addClassName( '__xX' + title );
 				
 				/* insert the image */
-				$( h3 ).update( '<a href="#" class="index_stats_collapse open">-</a>' + h3.innerHTML );
+				$( h3 ).update( '<a href="#" class="ipsSidebar_trigger ipsType_smaller right desc mod_links">' + ipb.lang['hide'] + '</a>' + h3.innerHTML );
 			});
 			
 			cookie = ipb.Cookie.get('toggleSBlocks');
@@ -313,19 +286,19 @@ _idx.prototype.board = {
 									top._isAlt = true;
 									top.removeClassName('alt');
 								}
-					
+								
+								ipb.board.count_hidden++;
+								top.down('.ipsSidebar_trigger').update( ipb.lang['unhide'] );
 								wrapper.hide();
 							}
-							
-							top.down('.index_stats_collapse').removeClassName('open').addClassName('close');
 						}
 					}
 				}
 			}
 		}
 		
-		ipb.delegate.register(".index_stats_collapse", ipb.board.toggleSideBarBlock);
-		
+		ipb.delegate.register(".ipsSidebar_trigger", ipb.board.toggleSideBarBlock);
+		//ipb.board.resetSideBarHideOrNot(true);
 	},
 	
 	/**
@@ -390,8 +363,8 @@ _idx.prototype.board = {
 					$( top ).removeClassName('alt');
 				}
 				
-				top.down('.index_stats_collapse').removeClassName('open').addClassName('close');
-				
+				top.down('.ipsSidebar_trigger').update( ipb.lang['unhide'] );
+				ipb.board.count_hidden--;
 				Debug.write( "Adding " + topId );
 				cookie.push( topId );
 			}
@@ -402,7 +375,9 @@ _idx.prototype.board = {
 					$( top ).addClassName('alt');
 				}
 				
-				top.down('.index_stats_collapse').removeClassName('close').addClassName('open');
+				top.down('.ipsSidebar_trigger').update( ipb.lang['hide'] );
+				
+				ipb.board.count_hidden--;
 				
 				Debug.write( "Removing " + topId );
 				remove.push( topId );
@@ -414,33 +389,45 @@ _idx.prototype.board = {
 		cookie = "," + cookie.uniq().without( remove ).join(',') + ",";
 		
 		ipb.Cookie.set('toggleSBlocks', cookie, 1);
-
-	},
-	
-	/**
-	 * Check for DST
-	 */
-	checkDST: function()
-	{
-		var memberHasDst	= ipb.vars['dst_on'];
-		var dstInEffect		= new Date().getDST();
-
-		if( memberHasDst - dstInEffect != 0 )
-		{
-			var url = ipb.vars['base_url'] + 'app=members&module=ajax&section=dst&md5check='+ipb.vars['secure_hash'];
-			
-			new Ajax.Request(	url,
-								{
-									method: 'get',
-									onSuccess: function(t)
-									{
-										// We don't need to do anything about this..
-										return true;
-									}
-								}
-							);
-		}
+		//ipb.board.resetSideBarHideOrNot();
 	}
+	
+	/*resetSideBarHideOrNot: function( fromInit )
+	{
+		if ( ipb.board.count_hidden >= ipb.board.count_sbars )
+		{
+
+			if ( fromInit)
+			{
+				//$('index_stats').hide();
+			}
+			else
+			{
+				//$('index_stats').fade();
+			}
+			
+			//$('categories').addClassName('no_sidebar');
+			
+			if ( ! $('open_sidebar') )
+			{
+
+				
+			}
+		}
+		else
+		{
+			if ( fromInit)
+			{
+				//$('index_stats').show();
+			}
+			else
+			{
+				//$('index_stats').appear();
+			}
+			
+			//$('categories').removeClassName('no_sidebar');
+		}
+	}*/
 };
 
 ipb.board.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.calendar.js b/upload/public/js/ips.calendar.js
deleted file mode 100644
index d79820ae..00000000
--- a/upload/public/js/ips.calendar.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.calendar.js - Calendar code				*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-var _cal = window.IPBoard;
-
-_cal.prototype.calendar = {
-	inSection: 	'',
-	
-	/* ------------------------------ */
-	/**
-	 * Constructor
-	*/
-	init: function()
-	{
-		Debug.write("Initializing ips.calendar.js");
-		
-		document.observe("dom:loaded", function(){
-			ipb.calendar.initEvents();
-		});
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Set up page events
-	*/
-	initEvents: function()
-	{
-		//Sets up double click events
-		/*$$('#calendar_table td', '#week_list li.day').each( function(day){
-			if( day.hasClassName('blank') ){ return; } // Dont handle non-days
-			
-			day.observe('click', function(e){
-				ipb.calendar.highlightCell(e);
-			});
-			day.observe('dblclick', function(e){
-				ipb.calendar.addEvent(e);
-			});
-		});*/
-		
-		if( ipb.calendar.inSection == 'form' )
-		{
-			if( $('set_times') )
-			{
-				$('set_times').observe('click', function(e){
-					$$('.time_setting').invoke('toggle');
-				});
-			}
-		
-			if( $('e_groups') )
-			{
-				$('e_type').observe( 'change', ipb.calendar.hideAdminOptions );
-			}
-		
-			if( $('all_groups') )
-			{
-				$('all_groups').observe( 'click', ipb.calendar.checkAllGroups );
-			}
-		}
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Checks all groups on the add event form
-	 * 
-	 * @var		{event}		e	The event
-	*/
-	checkAllGroups: function(e)
-	{
-		if( $F('all_groups') == '1' )
-		{
-			for( var i=0; i< $('e_groups').options.length; i++){
-				$('e_groups').options[i].selected = true;
-			}
-			
-			$('e_groups').disable();
-		}
-		else
-		{
-			$('e_groups').enable();
-			
-			for( var i=0; i< $('e_groups').options.length; i++){
-				$('e_groups').options[i].selected = false;
-			}
-		}
-	},
-
-	/* ------------------------------ */
-	/**
-	 * Hides unused options on the add event form
-	 * 
-	 * @var		{event}		e	The event
-	*/	
-	hideAdminOptions: function(e)
-	{
-		if( $F('e_type') == 'public' )
-		{
-			$$('.type_setting').invoke('show');
-		}
-		else
-		{
-			$$('.type_setting').invoke('hide');
-		}
-	},
-	
-	/*------------------------------*/
-	/* Add new calendar event		*/
-	addEvent: function(e)
-	{
-		// Get cell id
-		id = Event.element(e).id;
-		if( !id.startsWith('day-') ){ return; }
-		
-		Debug.write("Adding event popup for " + id );
-		
-		popup = new ipb.popup(id, { h: '200px', modal: true});
-		ipb.positionCenter( $( popup.wrapper ) );
-		
-		//Get form
-		new Ajax.Request( ipb.baseURI + "ajax.php?v=event",
-		{
-			method: 'get',
-			onSuccess: function(t){
-				popup.update( t.responseText );
-				
-				//Hook up events
-				$( popup.inner ).select('.cancel').each( function(s){
-					s.observe('click', function(e){
-				 		popup.destroy();
-					});
-				});
-			}
-		});		
-		
-		ipb.showModal();
-		popup.show();
-		Event.stop(e);
-		
-		return false;
-	},
-	
-	/*------------------------------*/
-	/* Highlight a cell				*/
-	highlightCell: function(e)
-	{
-		id = Event.element(e).id;
-		if( !id.startsWith('day-') ){ return; }
-		if( ipb.calendar.selectedCell == id ){ return; }
-		
-		ipb.calendar.unselectAll();
-		$( id ).addClassName('selected');
-	},
-	
-	/* ------------------------------ */
-	/**
-	 * Unselects all cells
-	 * 
-	 * @var		{event}		e	The event
-	*/
-	unselectAll: function(e)
-	{
-		$$('#calendar_table td').each( function(cell){
-			cell.removeClassName('selected');
-		} );
-	}
-	
-};
-
-ipb.calendar.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.chat.js b/upload/public/js/ips.chat.js
deleted file mode 100644
index 326c840d..00000000
--- a/upload/public/js/ips.chat.js
+++ /dev/null
@@ -1,2537 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.ipb.chat.js - Chat javascript				*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Brandon Farber						*/
-/************************************************/
-
-/*
- * We have to override this code from ipb.js because we need 'g' flag
- */
-Object.extend( RegExp, { 
-	escape: function(text)
-	{
-		if (!arguments.callee.sRE)
-		{
-		   	var specials = [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^' ];
-		   	arguments.callee.sRE = new RegExp( '(\\' + specials.join('|\\') + ')', 'g' );
-		}
-		return text.replace(arguments.callee.sRE, '\\$1');
-	}
-});
-
-Object.extend( String, { 
-	reverse: function(text)
-	{
-		return text.split('').reverse().join('');
-	}
-});
-
-var _chat = window.IPBoard;
-
-_chat.prototype.chat = {
-	/*
-	 * Number of seconds between requests
-	 */
-	polling:		3,
-	
-	/*
-	 * Timestamp we last polled server
-	 */
-	lastpolled:		0,
-	
-	/*
-	 * The last message ID received
-	 */
-	lastMsgId:		0,
-	
-	/*
-	 * The last time we saw
-	 */
-	lastTime:		'',
-
-	/*
-	 * Only show times at 5 minute intervals instead of 1 minute
-	 */
-	condenseTime:	0,
-	
-	/*
-	 * Maximum number of li items within the chat window
-	 */
-	maxMessages:	0,
-	
-	/*
-	 * Flag if we are moderator
-	 */
-	moderator:		0,
-
-	/*
-	 * Flag if we are allowed to do private chats
-	 */
-	private:		0,
-	
-	/*
-	 * Kicked flag (stop calling to server)
-	 */
-	kicked:			false,
-
-	/*
-	 * Number of seconds between AJAX requests to update "who's chatting"
-	 */
-	chattingUpdate:	60,
-	
-	/*
-	 * Bypass userid check internally for adding messages
-	 */
-	bypassFlag:		false,
-
-	/*
-	 * Templates for the messages, setup in the skin
-	 */
-	templates:		[],
-	
-	/*
-	 * Emoticons hash
-	 */
-	emoticons:		{},
-	
-	/*
-	 * Sound on or off
-	 */
-	soundEnabled:	0,
-	
-	/*
-	 * Flag to indicate if sound object is ready
-	 */
-	soundReady:		false,
-	
-	/*
-	 * Sound enabled image
-	 */
-	soundOnImg:		'',
-	
-	/*
-	 * Sound disabled image
-	 */
-	soundOffImg:	'',
-	
-	/*
-	 * Name formatting hash
-	 */
-	nameFormatting:	$H(),
-	
-	/*
-	 * Group formatting info
-	 */
-	groups:			$H(),
-	
-	/*
-	 * Does window have focus?
-	 */
-	windowHasFocus:	true,
-
-	/*
-	 * Active chat tab
-	 */
-	activeTab:		'chatroom',
-
-	/*
-	 * Map forum id to chat user id
-	 */
-	forumIdMap:		$H(),
-	
-	/*
-	 * Forum user ids to ignore private chats from
-	 */
-	ignoreChats:	$H(),
-
-	/*
-	 * References for "send private chat" popup
-	 */
-	privateChats:	$H(),
-
-	/*
-	 * Stored typed private chat text for when tabs are switched
-	 */
-	typedChats:		$H(),
-
-	/*
-	 * Unread counts for tabs
-	 */
-	unreadTabs:		$H(),
-
-	/*
-	 * Number of unread items since last lost focus
-	 */
-	unreadCount:	0,
-	
-	/*
-	 * Bad words hash
-	 */
-	badwords:		$H(),
-	
-	/*
-	 * Initialization function
-	 */
-	init: function()
-	{
-		Debug.write("Initializing ips.chat.js");
-		
-		/*
-		 * Wait for the DOM to finish loading...
-		 */
-		document.observe("dom:loaded", function()
-		{
-			/*
-			 * Create the appropriate iframes
-			 */
-			ipb.chat.drawIframes();
-			
-			/*
-			 * Set observer for onMessage event
-			 */
-			Event.observe( window, 'message', function(e)
-			{
-				ipb.chat.handleMessageFromChild( e.data );
-			});
-
-			/*
-			 * Set an interval to poll ipb.chat.getMessages(), which initiates the AJAX request.
-			 */
-			new PeriodicalExecuter( ipb.chat.getMessages, ipb.chat.polling );
-
-			/*
-			 * When we submit the chat text, initiate the AJAX request to post it to the server
-			 */
-			$('chat-submit').observe( 'click', ipb.chat.sendChat );
-			
-			/*
-			 * Watch for "enter" key submissions
-			 */
-			Event.observe( 'message_textarea', 'keypress', ipb.chat.checkForSendChat );
-			
-			/*
-			 * Make sure we stay "online"
-			 */
-			ipb.chat.ping();
-			new PeriodicalExecuter( ipb.chat.ping, ipb.chat.chattingUpdate );
-			
-			/*
-			 * Sound notifications toggler
-			 */
-			$('sound_toggle').observe( 'click', function(e) {
-				if( ipb.chat.soundEnabled )
-				{
-					ipb.chat.soundEnabled	= 0;
-					ipb.Cookie.set( 'chat_sounds', 'off' );
-					Debug.write( "Chat sounds disabled" );
-					
-					$('sound_toggle_img').writeAttribute( 'src', ipb.chat.soundOffImg );
-				}
-				else
-				{
-					ipb.chat.soundEnabled	= 1;
-					ipb.Cookie.set( 'chat_sounds', 'on' );
-					Debug.write( "Chat sounds enabled" );
-					
-					$('sound_toggle_img').writeAttribute( 'src', ipb.chat.soundOnImg );
-				}
-				
-				Event.stop(e);
-				return false;
-			});
-			
-			/*
-			 * Kick user links
-			 */
-			ipb.chat.initKickLinks();
-			
-			/*
-			 * Enable sounds when sound object is ready
-			 */
-			soundManager.onready( function(oStatus) {
-				if( oStatus.success )
-				{
-					ipb.chat.soundReady	= true;
-				}
-			});
-			
-			/*
-			 * Monitor window focus...
-			 */
-			if( Prototype.Browser.IE )
-			{
-				document.onfocusin = function() { ipb.chat.cleanTitle(); ipb.chat.windowHasFocus = true; };
-				document.onfocusout = function() { ipb.chat.unreadCount = 0; ipb.chat.windowHasFocus = false; };
-			}
-			else
-			{
-				Event.observe( window, 'focus', function() { ipb.chat.cleanTitle(); ipb.chat.windowHasFocus = true; } );
-				Event.observe( window, 'blur', function() { ipb.chat.unreadCount = 0; ipb.chat.windowHasFocus = false; } );
-			}
-			
-			/*
-			 * Handle tabs
-			 */
-			$$('#chat-tab-bar a').each( function(elem) {
-				id = elem.identify();
-
-				if( $( id ) )
-				{
-					$( id ).observe( "click", ipb.chat.switchTab );
-				}
-			});
-			
-			/*
-			 * Manually setup menus so we can add our callback
-			 */
-			$$('.chatmodmenu').each( function(menu){
-				id = menu.identify();
-				if( $( id + "_menucontent" ) )
-				{
-					new ipb.Menu( menu, $( id + "_menucontent" ), {}, { afterOpen: ipb.chat.repositionModMenu } );
-				}
-			});
-		});
-	},
-	
-	/*
-	 * Swap out the tab content
-	 */
-	switchTab: function( e )
-	{
-		Event.stop(e);
-		
-		elem	= Event.findElement(e);
-		id		= elem.identify();
-
-		if( id.match( /close\-chat\-tab\-(.+?)/g ) )
-		{
-			ipb.chat.closePrivateTab( id );
-			return false;
-		}
-
-		rel		= $( id ).rel;
-		
-		/*
-		 * Already on the clicked tab
-		 */
-		if( rel == ipb.chat.activeTab )
-		{
-			Debug.write( "Clicked on active tab" );
-			return false;
-		}
-
-		/*
-		 * Swap out the active window with the storage window we need
-		 */
-		ipb.chat.switchToTab( rel );
-		
-		return false;
-	},
-	
-	/*
-	 * Actually switch to another tab
-	 */
-	switchToTab: function( rel )
-	{
-		if( $( 'storage_' + rel ) )
-		{
-			/*
-			 * Store current message we were typing
-			 */
-			if( $F('message_textarea').strip() )
-			{
-				ipb.chat.typedChats.set( ipb.chat.activeTab, $F('message_textarea') );
-
-				$('message_textarea').clear();
-			}
-
-			$( 'storage_container_' + ipb.chat.activeTab ).update( $('messages-display').innerHTML );
-			$( 'messages-display' ).update( $( 'storage_container_' + rel ).innerHTML ).addClassName('messages-list');
-			$( 'storage_container_' + rel ).update();
-			
-			$( 'tab-' + ipb.chat.activeTab ).removeClassName('active');
-			$( 'tab-' + rel ).addClassName('active');
-
-			ipb.chat.activeTab	= rel;
-
-			ipb.chat.updateTabUnreadCount();
-			
-			/*
-			 * Scroll to the bottom
-			 */
-			$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-
-			/*
-			 * Restore textarea if we have stored text for this tab
-			 */
-			if( ipb.chat.typedChats.get( ipb.chat.activeTab ) )
-			{
-				$('message_textarea').value	= ipb.chat.typedChats.get( ipb.chat.activeTab );
-				
-				ipb.chat.typedChats.unset( ipb.chat.activeTab );
-			}
-			
-			$('message_textarea').focus();
-		}
-	},
-	
-	/*
-	 * Build a new tab
-	 */
-	buildTab: function( id )
-	{
-		/*
-		 * Has this user left?
-		 */
-		if( !ipb.chat.nameFormatting.get( id ) )
-		{
-			return false;
-		}
-		
-		/*
-		 * Tab exists?
-		 */
-		if( $("tab-" + id ) )
-		{
-			if( !$("storage_" + id ) )
-			{
-				var newOuter	= new Element( 'div', { id: "storage_container_" + id } ).addClassName('storage-container');
-				var newStorage	= new Element( 'ul', { id: "storage_" + id } );
-				$('iframeContainer').insert( newOuter.insert( newStorage ) );
-				
-				ipb.chat.typedChats.unset( id );
-			}
-			
-			return true;
-		}
-
-		/*
-		 * Get name
-		 */
-		var name	= ipb.chat.nameFormatting.get( id )[2].stripTags();
-
-		/*
-		 * First - let's see if we have another tab with this name.  Because if so, that means user timed out/left, and then returned,
-		 * so we don't want two tabs from the same user.  We can just update the tab id in that case.
-		 */
-		var _existed	= false;
-		
-		$('chat-tab-holder').childElements().each( function(elem){
-			/*
-			 * This should be an <li>
-			 */
-			var _thisId	= $(elem).readAttribute('id').replace( /tab-/, '' );
-			var _name	= $(elem).innerHTML.stripTags().strip().replace( /&nbsp;/g, '' );
-			
-			/*
-			 * This is the same name as the new tab - just update existing tab
-			 */
-			if( name == _name )
-			{
-				$(elem).writeAttribute( 'id', 'tab-' + id );
-				$( "storage_container_" + _thisId ).writeAttribute( 'id', "storage_container_" + id );
-				$( "storage_" + _thisId ).writeAttribute( 'id', "storage_" + id );
-				
-				if( ipb.chat.activeTab == _thisId )
-				{
-					ipb.chat.activeTab	= id;
-				}
-				
-				_existed	= true;
-			}
-		});
-
-		/*
-		 * We did not, so build new tab
-		 */
-		if( !_existed )
-		{
-			var newTab	= new Element( 'li', { id: "tab-" + id } );
-			newTab.update( ipb.chat.templates['new-tab'].evaluate( { id: id, name: name } ) ).addClassName('left');//.addClassName('active');
-			$('chat-tab-holder').insert( { bottom: newTab } );
-		}
-
-		/*
-		 * Reset "active" tab
-		 * @see 	http://community.invisionpower.com/tracker/issue-21639-buffer-clearing/
-		 * We build tab and then switchToTab().  If we change active status of tab now, when we
-		 * do the switch it gets confused because it thinks the new tab is already active and clears old tab buffer
-		 */
-		//$( 'tab-' + ipb.chat.activeTab ).removeClassName('active');
-		//ipb.chat.activeTab	= id;
-		
-		/*
-		 * Handle click handlers
-		 */
-		$$('#chat-tab-bar a').each( function(elem) {
-
-			elem.stopObserving();
-			
-			_id = elem.identify();
-
-			if( $( _id ) )
-			{
-				$( _id ).observe( "click", ipb.chat.switchTab );
-			}
-		});
-
-		/*
-		 * Create storage container
-		 */
-		if( !$( "storage_" + id ) )
-		{
-			var newOuter	= new Element( 'div', { id: "storage_container_" + id } ).addClassName('storage-container');
-			var newStorage	= new Element( 'ul', { id: "storage_" + id } );
-			$('iframeContainer').insert( newOuter.insert( newStorage ) );
-		}
-		
-		return true;
-	},
-	
-	/*
-	 * Close a chat tab
-	 */
-	closePrivateTab: function( id )
-	{
-		_rel	= id.replace( /close-chat-tab-/, '' );
-
-		if( !_rel )
-		{
-			return false;
-		}
-
-		/*
-		 * If we are on this tab, switch to chatroom
-		 */
-		if( _rel == ipb.chat.activeTab )
-		{
-			ipb.chat.switchToTab( 'chatroom' );
-		}
-		
-		/*
-		 * Remove storage
-		 */
-		$( "storage_container_" + _rel ).remove();
-		$( "tab-" + _rel ).remove();
-		ipb.chat.typedChats.unset( _rel );
-		
-		return false;
-	},
-	
-	/*
-	 * Click handler for sending a new private chat
-	 */
-	sendPrivateChat: function( id )
-	{
-		/*
-		 * Make sure we have something to send
-		 */
-		var message	= $F( "priv_chat_text_" + id ).strip();
-		
-		if( message == '' )
-		{
-			return false;
-		}
-		
-		ipb.chat.privateChats.get( 'privchatwindow_' + id ).hide();
-		$( "priv_chat_text_" + id ).clear();
-		
-		/*
-		 * First, do we already have a tab for this user?
-		 */
-		if( $( 'storage_' + id ) )
-		{
-			/*
-			 * Switch to tab
-			 */
-			ipb.chat.switchToTab( id );
-
-			/*
-			 * We do, so we need to restore this "room" and switch tab
-			 */
-			$( 'storage_container_' + ipb.chat.activeTab ).update( $('messages-display').innerHTML );
-			$( 'messages-display' ).update( $( 'storage_container_' + id ).innerHTML ).addClassName('messages-list');
-			$( 'storage_container_' + id ).update();
-			
-			$( 'tab-' + ipb.chat.activeTab ).removeClassName('active');
-			$( 'tab-' + id ).addClassName('active');
-
-			ipb.chat.activeTab	= id;
-		}
-		
-		/*
-		 * No tab yet.  Build, then insert and send message.
-		 */
-		 
-		else
-		{
-			/*
-			 * Backup current tab
-			 */
-			$( 'storage_container_' + ipb.chat.activeTab ).update( $('messages-display').innerHTML );
-			
-			/*
-			 * Build tab
-			 */
-			ipb.chat.buildTab( id );
-			
-			/*
-			 * Switch to tab
-			 */
-			ipb.chat.switchToTab( id );
-			
-			/*
-			 * Switch to new tab
-			 */
-			$( 'messages-display' ).update( $( 'storage_container_' + id ).innerHTML ).addClassName('messages-list');
-			$( 'storage_container_' + id ).update();
-		}
-
-		/*
-		 * Clean the post for our use
-		 */
-		message	= ipb.chat.cleanMessage( message );
-
-		/*
-		 * Send it to the server
-		 */
-		if( ipb.chat.sendMessageToChild( "server=" + serverHost + "&path=" + serverPath + "&room=" + roomId + "&user=" + userId + "&access_key=" + accessKey + "&lmsg=" + ipb.chat.lastMsgId + "&action=private&message=" + message + '&toUser=' + id + '&charset=' + ipb.vars['charset'] ) )
-		{
-			/*
-			 * Scroll to the bottom
-			 */
-			$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-		
-			message	= message.escapeHTML();
-			
-			ipb.chat.bypassFlag	= true;
-			ipb.chat.updateMessages( "1,0~~||~~" + Math.round(new Date().getTime() / 1000) + ",1," + userName.replace( ',', '~~#~~' ) + "," + message + ",private=" + id + "," + userId + "~~||~~" );
-			ipb.chat.bypassFlag	= false;
-		}
-
-		Debug.write( "Sending private chat to " + name );
-		
-		return false;
-	},
-
-	/*
-	 * Draw the appropriate iframes
-	 */
-	drawIframes: function()
-	{
-		/*
-		 * We use one iframe to postMessage for window.postMessage browsers
-		 */
-		if( window.postMessage )
-		{
-			var iframe = new Element( 'iframe', { 'id': 'chatProxy' } );
-			
-			iframe.writeAttribute( 'src', 'http://' + serverHost + serverPath + 'web/postMessage.php?parent=' + ourUrl );
-			iframe.setStyle( 'position', 'absolute' );
-			iframe.setStyle( 'left', '-150px' );
-			iframe.setStyle( 'top', '0px' );
-			iframe.setStyle( 'display', 'none' );
-
-			$('iframeContainer').insert( iframe );
-		}
-		/*
-		 * Otherwise we use a 3-way iframe system
-		 */
-		else
-		{
-			var iframe = new Element( 'iframe', { 'id': 'chatProxy' } );
-
-			iframe.writeAttribute( 'src', 'http://' + serverHost + serverPath + 'web/iframeProxy.php?parent=' + ourUrl );
-			iframe.setStyle( 'position', 'absolute' );
-			iframe.setStyle( 'left', '-150px' );
-			iframe.setStyle( 'top', '0px' );
-			iframe.setStyle( 'display', 'none' );
-
-			$('iframeContainer').insert( iframe );
-		}
-	},
-	
-	/*
-	 * Clean the title tag upon refocusing
-	 */
-	cleanTitle: function()
-	{
-		if( document.title.match( /\(\d+\) (.+?)/gi ) )
-		{
-			document.title = document.title.replace( /\(\d+\) (.+?)/gi, "$1" );
-		}
-		
-		ipb.chat.unreadCount	= 0;
-	},
-
-	/*
-	 * New message sound
-	 */
-	triggerMessageSound: function()
-	{
-		/*
-		 * Don't play sound if it comes from our own chat message
-		 */
-		if( ipb.chat.soundEnabled && ipb.chat.soundReady && !ipb.chat.bypassFlag )
-		{
-			soundManager.play( 'message', ipb.vars['board_url'] + '/public/sounds/message.mp3' );
-			
-			/*
-			 * Originally we used scriptaculous for sound (with .wav files) however scriptaculous
-			 * embeds a player into the page to play the sounds, and this steals focus from the
-			 * browser window entirely every time a sound plays (even if you are looking at another tab).
-			 * As such we switched to .mp3 sounds via a flash interface.
-			 */
-			//Sound.play( ipb.vars['board_url'] + '/public/sounds/new_message.wav' );
-		}
-	},
-	
-	/*
-	 * Enter room sound
-	 */
-	triggerEnterSound: function()
-	{
-		if( ipb.chat.soundEnabled && ipb.chat.soundReady )
-		{
-			soundManager.play( 'enter', ipb.vars['board_url'] + '/public/sounds/enter.mp3' );
-			//Sound.play( ipb.vars['board_url'] + '/public/sounds/enter.wav' );
-		}
-	},
-	
-	/*
-	 * Leave room sound
-	 */
-	triggerLeaveSound: function()
-	{
-		if( ipb.chat.soundEnabled && ipb.chat.soundReady )
-		{
-			soundManager.play( 'leave', ipb.vars['board_url'] + '/public/sounds/leave.mp3' );
-			//Sound.play( ipb.vars['board_url'] + '/public/sounds/leave.wav' );
-		}
-	},
-
-	/*
-	 * Did the user just hit 'enter' key in a private chat textarea?
-	 */
-	checkForSendPrivateChat: function(e)
-	{
-		/*
-		 * Submit chat if we hit the enter key
-		 */
-		if( e.keyCode == Event.KEY_RETURN )
-		{
-			Event.stop(e);
-			
-			elem	= Event.findElement(e);
-			id		= elem.identify();
-			_id		= id.replace( /priv_chat_text_/, '' );
-
-			ipb.chat.sendPrivateChat( _id );
-			
-			return false;
-		}
-		
-		return true;
-	},
-	
-	/*
-	 * Did the user just hit 'enter' key in the chat textarea?
-	 */
-	checkForSendChat: function(e)
-	{
-		/*
-		 * Submit chat if we hit the enter key
-		 */
-		if( e.keyCode == Event.KEY_RETURN )
-		{
-			ipb.chat.sendChat( e );
-		}
-	},
-	
-	/*
-	 * Send a chat message to the server
-	 */
-	sendChat: function( e )
-	{
-		/*
-		 * Don't *really* submit the form..
-		 */
-		Event.stop(e);
-		
-		/*
-		 * Get form field value and strip whitespace
-		 */
-		var chatPost	= $F('message_textarea').strip();
-
-		/*
-		 * Make sure we have something to send
-		 */
-		if( chatPost == '' )
-		{
-			return false;
-		}
-
-		/*
-		 * Clean the post for our use
-		 */
-		chatPost	= ipb.chat.cleanMessage( chatPost );
-
-		/*
-		 * Private chat?
-		 */
-		if( ipb.chat.activeTab != 'chatroom' )
-		{
-			var _thisMessage	= "&action=private&toUser=" + ipb.chat.activeTab;
-			var _thisExtra		= "private=" + ipb.chat.activeTab;
-		}
-		else
-		{
-			var _thisMessage	= "&action=post";
-			var _thisExtra		= '0';
-		}
-
-		/*
-		 * Send it to the server
-		 */
-		if( ipb.chat.sendMessageToChild( "server=" + serverHost + "&path=" + serverPath + "&room=" + roomId + "&user=" + userId + "&access_key=" + accessKey + "&lmsg=" + ipb.chat.lastMsgId + _thisMessage + "&message=" + chatPost + '&charset=' + ipb.vars['charset'] ) )
-		{
-			/*
-			 * Scroll to the bottom
-			 */
-			$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-		
-			chatPost	= chatPost.escapeHTML();
-			
-			ipb.chat.bypassFlag	= true;
-			ipb.chat.updateMessages( "1,0~~||~~" + Math.round(new Date().getTime() / 1000) + ",1," + userName.replace( ',', '~~#~~' ) + "," + chatPost + "," + _thisExtra + "," + userId + "~~||~~" );
-			ipb.chat.bypassFlag	= false;
-		}
-		
-		/*
-		 * Clear the textarea
-		 */
-		$('message_textarea').clear();
-		
-		/*
-		 * Scroll to the bottom
-		 */
-		$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-		
-		/*
-		 * Return false to make sure form doesn't submit
-		 */
-		return false;
-	},
-	
-	/*
-	 * Sends a message to the remote server by changing the document.location
-	 * of an iframe for the other location.  We also change the width of the iframe
-	 * to trigger it's check for a changed location.  It's more resource efficient
-	 * to have an event handler monitor size change, than to manually poll the location
-	 * every x seconds
-	 */
-	sendMessageToChild: function( message )
-	{
-		/*
-		 * Don't do anything if we've been kicked
-		 */
-		if( ipb.chat.kicked )
-		{
-			return false;
-		}
-		
-		/*
-		 * Post message to remote iframe
-		 */
-		var elem = $('chatProxy').contentWindow;
-
-		if( window.postMessage )
-		{
-			Debug.write( "Using window.postMessage method" );
-			elem.postMessage( message, 'http://' + serverHost );
-		}
-		else
-		{
-			Debug.write( "Using iframe hash method" );
-			elem.location = 'http://' + serverHost + serverPath + '/web/iframeProxy.php?parent=' + ourUrl + '#' + message + '&timestamp=' + Math.round(new Date().getTime() / 1000);
-		}
-		
-		return true;
-	},
-	
-	/*
-	 * Deal with the response from the remote server
-	 */
-	handleMessageFromChild: function( message )
-	{
-		/*
-		 * Don't do anything if we've been kicked
-		 */
-		if( ipb.chat.kicked )
-		{
-			return false;
-		}
-
-		/*
-		 * Ignore height notifications
-		 */
-		if( message.substr( 0, 7 ) == 'height=' )
-		{
-			return false;
-		}
-
-		/*
-		 * Only if we have an actual response
-		 */
-		if ( message.length > 0 )
-		{
-			/*
-			 * If this is a response to a new submission or mod action, just get the messages
-			 */
-			if( message.substr( 0, 8 ) == '__post__' || message.substr( 0, 12 ) == '__moderate__' )
-			{
-				ipb.chat.getMessages();
-			}
-			
-			/*
-			 * Otherwise we need to update the displayed messages
-			 */
-			else
-			{
-				ipb.chat.updateMessages( message );
-			}
-		}
-	},
-
-	/*
-	 * Get messages from remote server
-	 */
-	getMessages: function( pe )
-	{
-		/*
-		 * If kicked, shut off executer
-		 */
-		if( ipb.chat.kicked )
-		{
-			pe.stop();
-			return false;
-		}
-		
-		/*
-		 * Generate a current timestamp
-		 */
-		curtime	= parseInt( new Date().getTime().toString().substring( 0, 10 ) );
-		
-		/*
-		 * If current time - last polled time is less than the polling timeperiod,
-		 * skip this iteration (prevent DOS when user submits many messages quickly)
-		 */
-		if( curtime - ipb.chat.lastpolled < ipb.chat.polling )
-		{
-			return false;
-		}
-
-		/*
-		 * Set last polled timestamp
-		 */
-		ipb.chat.lastpolled	= parseInt( new Date().getTime().toString().substring( 0, 10 ) );
-		
-		/*
-		 * Send the request to the remote server
-		 */
-		ipb.chat.sendMessageToChild( "server=" + serverHost + "&path=" + serverPath + "&room=" + roomId + "&user=" + userId + "&access_key=" + accessKey + "&msg=" + ipb.chat.lastMsgId + "&charset=" + ipb.vars['charset'] );
-	},
-
-	/*
-	 * Update the displayed messages on the page
-	 */
-	updateMessages: function( text )
-	{
-		/*
-		 * Do we have anything?
-		 */
-		if( !text )
-		{
-			return true;
-		}
-
-		/*
-		 * Messages are imploded on ~~||~~
-		 */
-		var messages = text.split( "~~||~~" );
-
-		/*
-		 * Determine if we need to scroll down when the messages are re-inserted.  We have to do this
-		 * now so that we can determine if the scrollbar is already scrolled down all the way.  That way
-		 * if a user scrolls up, we don't scroll down on them every 3 seconds - but if they are already
-		 * scrolled down all the way, we keep moving down as new messages are inserted.
-		 */
-		var scrollBottom	= false;
-		
-		/*
-		 * Everything vs IE, as per normal :P
-		 */
-		try
-		{
-			var _borderTop		= getComputedStyle( $('messages-display'), '' ).getPropertyValue('border-top-width').replace( 'px', '' );
-			var _borderBottom	= getComputedStyle( $('messages-display'), '' ).getPropertyValue('border-bottom-width').replace( 'px', '' );
-			var _padTop			= getComputedStyle( $('messages-display'), '' ).getPropertyValue('padding-top').replace( 'px', '' );
-			var _padBottom		= getComputedStyle( $('messages-display'), '' ).getPropertyValue('padding-bottom').replace( 'px', '' );
-		}
-		catch( e )
-		{
-			var _borderTop		= $('messages-display').currentStyle.borderWidth.replace( 'px', '' );
-			var _borderBottom	= $('messages-display').currentStyle.borderWidth.replace( 'px', '' );
-			var _padTop			= $('messages-display').currentStyle.paddingTop.replace( 'px', '' );
-			var _padBottom		= $('messages-display').currentStyle.paddingBottom.replace( 'px', '' );
-		}
-
-		var _totalOffset	= parseInt(_borderTop) + parseInt(_borderBottom) + parseInt(_padTop) + parseInt(_padBottom);
-		
-		/*
-		 * Commented out just to save resources in production
-		 */
-		//Debug.write( "Scrolltop: " + $('messages-display').scrollTop );			// 60
-		//Debug.write( "Scrollheight: " + $('messages-display').scrollHeight );		// 360
-		//Debug.write( "Offsetheight: " + $('messages-display').getHeight() );		// 306
-		//Debug.write( "Style offsets: " + _totalOffset );							// 6 (3px border top + bottom)
-
-		/*
-		 * See above example comments after Debug.write lines
-		 */
-		if( ( $('messages-display').getHeight() - _totalOffset + $('messages-display').scrollTop ) >= ( $('messages-display').scrollHeight - 10 ) )
-		{
-			scrollBottom	= true;
-		}
-
-		/*
-		 * Set some variables
-		 */
-		var _updatedCount	= 0;
-		var _showOwn		= false;
-		var _initialEmpty	= false;
-		var _startLMI		= ipb.chat.lastMsgId;
-		
-		/*
-		 * Loop over the messages
-		 */
-		for( var i=0; i < messages.length; i++ )
-		{
-			/*
-			 * Split message at comma
-			 */
-			messages[ i ]	= messages[ i ].replace( /%20/gi, ' ' );
-			messages[ i ]	= messages[ i ].replace( /%23/gi, '#' );
-			messages[ i ]	= messages[ i ].replace( /%22/gi, '&quot;' );
-			messages[ i ]	= messages[ i ].replace( /%3C/gi, '&lt;' );
-			messages[ i ]	= messages[ i ].replace( /%3E/gi, '&gt;' );
-			messages[ i ]	= messages[ i ].replace( /\</gi, '&lt;' );
-			messages[ i ]	= messages[ i ].replace( /\>/gi, '&gt;' );
-			messages[ i ]	= ipb.chat.manualDecode( messages[ i ] );
-
-			var msgDetails	= messages[ i ].split( ',' );
-			
-			/*
-			 * First iteration is meta data: code,lastMessageId
-			 */
-			if( i == 0 )
-			{
-				/*
-				 * Request failed
-				 */
-				if( msgDetails[0] != 1 )
-				{
-					/*
-					 * Show message in each window
-					 */
-					$$('.storage-container').each( function(elem) {
-						var _id		= $(elem).id.replace( /storage_container_/, '' );
-						var ulList	= ipb.chat.getStorageContainer( _id );
-						
-						ulList.insert( { bottom: ipb.chat.templates['msg-K'].evaluate() } );
-						
-						if( _id != ipb.chat.activeTab )
-						{
-							$( "storage_container_" + _id ).update( ulList );
-						}
-						else
-						{
-							$('messages-display').update( ulList ).addClassName('messages-list');
-						}
-					});
-
-					/*
-					 * And prevent future calls to server
-					 */
-					ipb.chat.kicked	= true;
-
-					/*
-					 * Jump to bottom of messages
-					 */
-					$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-					
-					return true;
-				}
-				else
-				{
-					/*
-					 * No new messages (only if not insta-posting)
-					 */
-					if( !ipb.chat.bypassFlag && msgDetails[1] == ipb.chat.lastMsgId )
-					{
-						if( ipb.chat.lastMsgId == 0 )
-						{
-							ipb.chat.bypassFlag	= true;
-							ipb.chat.lastMsgId	= 1;
-							_initialEmpty		= true;
-
-							msgDetails[1]		= 2;
-							msgDetails[2]		= userName;
-							msgDetails[3]		= '';
-							msgDetails[4]		= '1_' + userId;
-							msgDetails[5]		= userId;
-						}
-						else
-						{
-							return true;
-						}
-					}
-					
-					/*
-					 * Store last message ID for next request
-					 */
-					if( !ipb.chat.bypassFlag )
-					{
-						/*
-						 * If we refreshed the page, and all chat messages are being pulled,
-						 * we don't want to skip our own messages
-						 */
-						if( ipb.chat.lastMsgId == 0 )
-						{
-							_showOwn	= true;
-						}
-
-						ipb.chat.lastMsgId	= msgDetails[1];
-					}
-					
-					if( !_initialEmpty )
-					{
-						continue;
-					}
-				}
-			}
-
-			/*
-			 * We have a message!
-			 */
-			if( msgDetails[1] )
-			{
-				/*
-				 * Don't add our own messages since we do that automatically upon submit
-				 */
-				if( !ipb.chat.bypassFlag && msgDetails[5] == userId && ( msgDetails[1] == 1 || msgDetails[1] == 3 ) && !_showOwn )
-				{
-					continue;
-				}
-				
-				/*
-				 * Grab ulList handle
-				 */
-				var _thisRowId	= 'chatroom';
-				
-				if( msgDetails[1] == 1 )
-				{
-					/*
-					 * Is this a private chat?
-					 */
-					if( msgDetails[4] )
-					{
-						var userDetails = msgDetails[4].split( '=' );
-						
-						if( userDetails[1] )
-						{
-							var _user	= msgDetails[5] == userId ? userDetails[1] : msgDetails[5];
-							
-							if( !$( 'storage_' + _user ) )
-							{
-								var _forumUser	= ipb.chat.forumIdMap.get( _user );
-								
-								var _blocked	= 0;
-								
-								if( _forumUser )
-								{
-									_blocked	= ipb.chat.ignoreChats.get( _forumUser[0] );
-								}
-								
-								if( _blocked )
-								{
-									continue;
-								}
-
-								if( !ipb.chat.buildTab( _user ) )
-								{
-									continue;
-								}
-								
-								ipb.chat.switchToTab( _user );
-							}
-							
-							_thisRowId	= _user;
-						}
-					}
-				}
-
-				var ulList	= ipb.chat.getStorageContainer( _thisRowId );
-				var alsoTo	= null;
-
-				/*
-				 * Format date from timestamp
-				 */
-				var _itemDate	= new Date();
-				var _secs		= parseInt(msgDetails[0]) ? parseInt(msgDetails[0]) : parseInt(new Date().getTime());
-				
-				_itemDate.setTime( _secs * 1000 );
-				
-				var _hours		= _itemDate.getHours();
-				var _mins		= _itemDate.getMinutes() + "";
-				
-				/*
-				 * This makes sure we have leading 0
-				 */
-				if( _mins.length == 1 )
-				{
-					_mins	= "0" + _mins;
-				}
-				
-				/*
-				 * Showing times only at the "5's"
-				 */
-				if( ipb.chat.condenseTime )
-				{
-					var _minsLastChar	= _mins.charAt( _mins.length - 1 );
-					
-					if( _minsLastChar == 1 || _minsLastChar == 2 || _minsLastChar == 3 || _minsLastChar == 4 )
-					{
-						_mins	= _mins.charAt( 0 ) + "" + 0;
-					}
-					else if(  _minsLastChar == 6 || _minsLastChar == 7 || _minsLastChar == 8 || _minsLastChar == 9 )
-					{
-						_mins	= _mins.charAt( 0 ) + "" + 5;
-					}
-				}
-				
-				/*
-				 * Normalize dates for AM/PM instead of 24 hour
-				 */
-				if( _hours > 12 )
-				{
-					_itemDate		= ( _hours - 12 ) + ':' + _mins + ' ' + ipb.lang['time_pm'];
-				}
-				else if( _hours == 0 )
-				{
-					_itemDate		= 12 + ':' + _mins + ' ' + ipb.lang['time_am'];
-				}
-				else if( _hours == 12 )
-				{
-					_itemDate		= _hours + ':' + _mins + ' ' + ipb.lang['time_pm'];
-				}
-				else
-				{
-					_itemDate		= _hours + ':' + _mins + ' ' + ipb.lang['time_am'];
-				}
-
-				/*
-				 * If this is a new time, insert it
-				 */
-				if( _itemDate != ipb.chat.lastTime && !ipb.chat.bypassFlag )
-				{
-					var dateItem	= new Element( 'li' );
-					dateItem.update( "<label>&nbsp;</label> <div>" + _itemDate + "</div>" ).addClassName('chat-time');
-					ulList.insert( { bottom: dateItem } );
-				}
-				
-				/*
-				 * Create new list item
-				 */
-				var listItemVal	= '';
-
-				/*
-				 * Re-format newlines/commas from cleaning in sendChat()
-				 */
-				msgDetails[2]	= msgDetails[2].replace( '~~#~~', "," );
-				msgDetails[2]	= ipb.chat.unCleanMessage( msgDetails[2] );
-				
-				msgDetails[4]	= msgDetails[4].replace( '~~#~~', "," );
-				
-				msgDetails[3]	= msgDetails[3].replace( '~~#~~', "," );
-				msgDetails[3]	= ipb.chat.unCleanMessage( msgDetails[3] );
-				msgDetails[3]	= ipb.chat.parseEmoticonsAndBbcode( msgDetails[3] );
-
-				/*
-				 * Is this a /me command?
-				 */
-				if( msgDetails[1] == 1 )
-				{
-					if( msgDetails[3].match( /^\/me /gi ) )
-					{
-						msgDetails[1]	= 3;
-						msgDetails[3]	= msgDetails[3].replace( /^\/me /gi, '' );
-					}
-				}
-				
-				/*
-				 * This is a normal chat
-				 */
-				if( msgDetails[1] == 1 )
-				{
-					/*
-					 * Truncate username
-					 */
-					msgDetails[2]	= ipb.chat.formatName( msgDetails[5], msgDetails[2].truncate( 14 ) );
-
-					/*
-					 * This is here so we can color our own chats properly
-					 */
-					if( msgDetails[5] == userId )
-					{
-						listItemVal	= ipb.chat.templates['msg-1'].evaluate( { date: _itemDate, username: msgDetails[2], message: msgDetails[3], ownclass: 'chat-myown' } );
-					}
-					else
-					{
-						listItemVal	= ipb.chat.templates['msg-1'].evaluate( { date: _itemDate, username: msgDetails[2], message: msgDetails[3], ownclass: '' } );
-					}
-					
-					/*
-					 * Increment counter
-					 */
-					_updatedCount++;
-					ipb.chat.unreadCount++;
-					
-					if( _thisRowId != ipb.chat.activeTab )
-					{
-						if( ipb.chat.unreadTabs.get( _thisRowId ) )
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, ipb.chat.unreadTabs.get( _thisRowId ) + 1 );
-						}
-						else
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, 1 );
-						}
-					}
-				}
-				
-				/*
-				 * This is a "{user} has (entered|left) the room" message
-				 */
-				else if( msgDetails[1] == 2 )
-				{
-					/*
-					 * Details will be (1|2)_(userid).  1 means entered, 2 means left
-					 */
-					var details = msgDetails[4].split( '_' );
-
-					/*
-					 * Check if we've entered or left
-					 */
-					if( details[0] == 1 )
-					{
-						var _action	= ipb.lang['entered_room'];
-						
-						/*
-						 * We don't want to add/remove on initial load - the chatters cache should be accurate anyways
-						 */
-						if( _startLMI > 0 )
-						{
-							ipb.chat.addUserToList( details[1], msgDetails[2], details[2] );
-						}
-						
-						msgDetails[2]	= msgDetails[2].truncate( 14 );
-
-						var _details	= ipb.chat.groups.get( details[3] );
-
-						if( _details )
-						{
-							msgDetails[2]	= _details[0].replace( /__DBQ__/g, '"' ) + msgDetails[2] + _details[1].replace( /__DBQ__/g, '"' );
-						}
-						
-						/*
-						 * If user left and then returned, add message to private chat tab
-						 */
-						$('chat-tab-holder').childElements().each( function(elem){
-							/*
-							 * This should be an <li>
-							 */
-							var _thisId	= $(elem).readAttribute('id').replace( /tab-/, '' );
-							var _name	= $(elem).innerHTML.stripTags().strip().replace( /&nbsp;/g, '' );
-							
-							/*
-							 * This is the same name as the new tab - just update existing tab
-							 */
-							if( msgDetails[2] == _name )
-							{
-								$(elem).writeAttribute( 'id', 'tab-' + details[1] );
-								$( "storage_container_" + _thisId ).writeAttribute( 'id', "storage_container_" + details[1] );
-								$( "storage_" + _thisId ).writeAttribute( 'id', "storage_" + details[1] );
-								
-								if( ipb.chat.activeTab == _thisId )
-								{
-									ipb.chat.activeTab	= details[1];
-								}
-								
-								alsoTo	= details[1];
-							}
-						});
-					}
-					else if( details[0] == 2 )
-					{
-						var _action	= ipb.lang['left_room'];
-						
-						/*
-						 * We don't want to add/remove on initial load - the chatters cache should be accurate anyways
-						 */
-						if( _startLMI > 0 )
-						{
-							ipb.chat.removeUserFromList( details[1], msgDetails[2] );
-						}
-						
-						msgDetails[2]	= ipb.chat.formatName( details[1], msgDetails[2].truncate( 14 ) );
-						
-						/*
-						 * We also want to show the message on the private chat tab
-						 */
-						if( $('storage_container_' + details[1] ) )
-						{
-							alsoTo	= details[1];
-						}
-					}
-					
-					/*
-					 * Truncate username
-					 */
-					//msgDetails[2]	= ipb.chat.formatName( details[1], msgDetails[2].truncate( 14 ) );
-
-					listItemVal	= ipb.chat.templates['msg-2'].evaluate( { date: _itemDate, username: msgDetails[2], action: _action } );
-				}
-				
-				/*
-				 * This is a /me style command
-				 */
-				else if( msgDetails[1] == 3 )
-				{
-					/*
-					 * Truncate username
-					 */
-					msgDetails[2]	= ipb.chat.formatName( msgDetails[5], msgDetails[2].truncate( 14 ) );
-					
-					listItemVal	= ipb.chat.templates['msg-3'].evaluate( { username: msgDetails[2], message: msgDetails[3] } );
-					
-					/*
-					 * Increment counter
-					 */
-					_updatedCount++;
-					ipb.chat.unreadCount++;
-					
-					if( _thisRowId != ipb.chat.activeTab )
-					{
-						if( ipb.chat.unreadTabs.get( _thisRowId ) )
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, parseInt( ipb.chat.unreadTabs.get( _thisRowId ) ) + 1 );
-						}
-						else
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, 1 );
-						}
-					}
-				}
-				
-				/*
-				 * System message
-				 */
-				else if( msgDetails[1] == 4 )
-				{
-					listItemVal	= ipb.chat.templates['msg-4'].evaluate( { message: msgDetails[3] } );
-
-					/*
-					 * Show system messages in each window
-					 */
-					$$('.storage-container').each( function(elem) {
-						var _id		= $(elem).id.replace( /storage_/, '' );
-						
-						if( _id != 'chatroom' )
-						{
-							var _ulList	= ipb.chat.getStorageContainer( _id );
-
-							_ulList.insert( { bottom: ipb.chat.templates['msg-K'].evaluate() } );
-							$(elem).update( _ulList );
-						}
-					});
-					
-					$('messages-display').update( ipb.chat.getStorageContainer( ipb.chat.activeTab ) ).addClassName('messages-list');
-					
-					/*
-					 * Increment counter
-					 */
-					_updatedCount++;
-					ipb.chat.unreadCount++;
-					
-					if( _thisRowId != ipb.chat.activeTab )
-					{
-						if( ipb.chat.unreadTabs.get( _thisRowId ) )
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, parseInt( ipb.chat.unreadTabs.get( _thisRowId ) ) + 1 );
-						}
-						else
-						{
-							ipb.chat.unreadTabs.set( _thisRowId, 1 );
-						}
-					}
-				}
-				
-				/*
-				 * Mod action (currently only "kick")
-				 */
-				else if( msgDetails[1] == 5 )
-				{
-					/*
-					 * Remove kicked user from chat list
-					 */
-					ipb.chat.removeUserFromList( msgDetails[4], msgDetails[3] );
-					
-					/*
-					 * Truncate username
-					 */
-					msgDetails[2]	= ipb.chat.formatName( msgDetails[5], msgDetails[2].truncate( 14 ) );
-					msgDetails[3]	= ipb.chat.formatName( msgDetails[4], msgDetails[3] );
-					
-					listItemVal	= ipb.chat.templates['msg-5'].evaluate( { username: msgDetails[2], date: _itemDate, extra: msgDetails[3] } );
-				}
-
-				/*
-				 * Insert list item into list
-				 */
-				ulList.insert( { bottom: listItemVal } );
-
-				/*
-				 * Make sure new list has less li items than max allows
-				 */
-				if( ipb.chat.maxMessages > 0 )
-				{
-					/*
-					 * Got more than we're allowed?
-					 */
-					if( ulList.childElements().length > ipb.chat.maxMessages )
-					{
-						/*
-						 * Number to remove
-						 */
-						var _toRemove	= ulList.childElements().length - ipb.chat.maxMessages;
-						
-						/*
-						 * Remove _toRemove elements from BEGINNING of the list (oldest messages)
-						 */
-						for( var tr=0; tr < _toRemove; tr++ )
-						{
-							ulList.firstDescendant().remove();
-						}
-					}
-				}
-		
-				/*
-				 * Insert the ulList into the storage container
-				 */
-				if( ipb.chat.activeTab != _thisRowId )
-				{
-					$('storage_container_' + _thisRowId ).update( ulList );
-				}
-				else
-				{
-					$('messages-display').update( ulList ).addClassName('messages-list');
-				}
-				
-				/*
-				 * Need to insert anywhere else?
-				 */
-				if( alsoTo )
-				{
-					var otherUlList	= ipb.chat.getStorageContainer( alsoTo );
-					otherUlList.insert( { bottom: listItemVal } );
-					
-					if( ipb.chat.activeTab != alsoTo )
-					{
-						$('storage_container_' + alsoTo ).update( otherUlList );
-					}
-					else
-					{
-						$('messages-display').update( otherUlList ).addClassName('messages-list');
-					}
-				}
-				
-				/*
-				 * Update the last time
-				 */
-				if( !ipb.chat.bypassFlag )
-				{
-					ipb.chat.lastTime	= _itemDate;
-				}
-			}
-		}
-
-		/*
-		 * Update the messages-display div with the new list
-		 */ 
-		//$('messages-display').update( ipb.chat.getStorageContainer( ipb.chat.activeTab ).addClassName('messages-list') );
-
-		/*
-		 * Handle unread counts
-		 */
-		if( !ipb.chat.windowHasFocus && ipb.chat.unreadCount > 0 )
-		{
-			if( document.title.match( /\(\d+\) (.+?)/gi ) )
-			{
-				document.title = document.title.replace( /\(\d+\) (.+?)/gi, "(" + ipb.chat.unreadCount + ") $1" );
-			}
-			else
-			{
-				document.title = "(" + ipb.chat.unreadCount + ") " + document.title;
-			}
-		}
-		
-		/*
-		 * Update unread counts on tabs
-		 */
-		ipb.chat.updateTabUnreadCount();
-		
-		/*
-		 * Trigger sound if we have messages (not enter/leave room or mod kick notifications though)
-		 */
-		if( _updatedCount )
-		{
-			ipb.chat.triggerMessageSound();
-		}
-		
-		/*
-		 * Reset bypass flag if this was initial pull override
-		 */
-		if( _initialEmpty )
-		{
-			ipb.chat.bypassFlag	= false;
-		}
-		
-		/*
-		 * Make sure that if the only downloaded messages are private chats that we build the "chatroom" list properly too
-		 */
-		if( ipb.chat.getStorageContainer( 'chatroom' ).empty() )
-		{
-			var _whateverItWas	= ipb.chat.bypassFlag;
-			ipb.chat.bypassFlag = true;
-			ipb.chat.updateMessages( "1," + ipb.chat.lastMsgId + "~~||~~" + Math.round(new Date().getTime() / 1000) + ",2," + userName.replace( ',', '~~#~~' ) + ",,1_" + userId + "," + userId + "~~||~~" );
-			ipb.chat.bypassFlag = _whateverItWas;
-		}
-
-		/*
-		 * If we were at the bottom, let's make sure we're scrolled all the way down in case new items have
-		 * been inserted, making the scrollable div taller
-		 */
-		if( scrollBottom )
-		{
-			Debug.write( "Scrolling down to: " + $('messages-display').scrollHeight );
-			$('messages-display').scrollTop	= $('messages-display').scrollHeight + 500;
-		}
-		
-		return true;
-	},
-	
-	/*
-	 * Update the unread count displayed on each tab
-	 */
-	updateTabUnreadCount: function()
-	{
-		ipb.chat.unreadTabs.set( ipb.chat.activeTab, 0 );
-		
-		ipb.chat.unreadTabs.each( function( pair ){
-			if( pair.key == ipb.chat.activeTab )
-			{
-				var _thisHtml	= $('tab-' + pair.key ).innerHTML;
-
-				if( _thisHtml.match( /(.+?) \(\d+\)\<\/a\>/gi ) )
-				{
-					_thisHtml = _thisHtml.replace( /(.+?) \(\d+\)\<\/a\>/gi, "$1</a>" );
-				}
-				
-				$('tab-' + pair.key ).update( _thisHtml );
-			
-				return;
-			}
-			
-			if( !$('tab-' + pair.key ) || !pair.value )
-			{
-				return;
-			}
-			
-			var _thisHtml	= $('tab-' + pair.key ).innerHTML;
-
-			if( _thisHtml.match( /(.+?) \(\d+\)\<\/a\>/gi ) )
-			{
-				_thisHtml = _thisHtml.replace( /(.+?) \(\d+\)\<\/a\>/gi, "$1 (" + pair.value + ")</a>" );
-			}
-			else
-			{
-				_thisHtml = _thisHtml.replace( /\<\/a\>/i, '' ) + " (" + pair.value + ")</a>";
-			}
-			
-			$('tab-' + pair.key ).update( _thisHtml );
-		});
-		
-		/*
-		 * Reset click handlers
-		 */
-		$$('#chat-tab-bar a').each( function(elem) {
-			id = elem.identify();
-
-			if( $( id ) )
-			{
-				$( id ).stopObserving('click');
-				$( id ).observe( "click", ipb.chat.switchTab );
-			}
-		});
-	},
-	
-	/*
-	 * Get the appropriate storage container
-	 */
-	getStorageContainer: function( tab )
-	{
-		if( !$( 'storage_' + tab ) )
-		{
-			return new Element( 'ul', { id: 'storage_' + tab } );
-		}
-		else
-		{
-			return new Element( 'ul', { id: 'storage_' + tab } ).update( $( 'storage_' + tab ).innerHTML );
-		}
-	},
-	
-	/*
-	 * Add a user to the "Online chat users" list dynamically
-	 */
-	addUserToList: function( user_id, username, forum_user_id )
-	{
-		/*
-		 * Only add if it doesn't exist
-		 */
-		if( !$('user_' + user_id) && !$('link_' + forum_user_id) )
-		{
-			var htmlFragment	= new Element( 'li', { id: 'user_' + user_id } );
-			
-			/*
-			 * Initialize basic additions
-			 */
-			new Ajax.Request( 
-								ipb.vars['base_url'] + "&app=ipchat&module=ajax&section=adduser&md5check=" + ipb.vars['secure_hash'] + "&id=" + forum_user_id + "&user=" + user_id, 
-								{ 
-									method: 'get',
-									onSuccess: function(t)
-									{
-										/*
-										 * Insert the username into the li
-										 */
-										if( Object.isUndefined( t.responseJSON ) )
-										{
-											// Well, this is bad.
-											Debug.error("Invalid response returned from the server");
-											return;
-										}
-										
-										htmlFragment.update( t.responseJSON['html'] );
-
-										ipb.chat.nameFormatting.set( user_id, [ t.responseJSON['prefix'], t.responseJSON['suffix'], t.responseJSON['name'] ] );
-										ipb.chat.forumIdMap.set( user_id, [ forum_user_id, t.responseJSON['_canBeIgnored'] ] );
-
-										$('online-chat-count').innerHTML	= parseInt( $('online-chat-count').innerHTML ) + 1;
-
-										/*
-										 * Set up private chat, block user, and mod links
-										 */
-										var modMenu	= new Element( 'ul', { 'class': 'kickmenu', id: 'mod_link_' + user_id + '_menucontent' } );
-										
-										if( user_id != userId )
-										{
-											if( ipb.chat.moderator )
-											{
-												var modML	= new Element( 'li' );
-												var modLink	= new Element( 'a', { id: 'kick_user_' + user_id, 'class': 'kick_user', href: '#', title: ipb.lang['chat_kick_user'] } );
-												modMenu		= modMenu.update( modML.update( modLink.update( "<img src='" + ipb.vars['img_url'] + "/user_delete.png' /> " + ipb.lang['chat_kick_user'] ) ) );
-												
-												var modML	= new Element( 'li' );
-												var modLink	= new Element( 'a', { id: 'ban_user_' + user_id + '_' + forum_user_id, 'class': 'ban_user', href: '#', title: ipb.lang['chat_ban_user'] } );
-												modMenu		= modMenu.insert( { bottom: modML.update( modLink.update( "<img src='" + ipb.vars['img_url'] + "/user_delete.png' /> " + ipb.lang['chat_ban_user'] ) ) } );
-											}
-											
-											if( ipb.chat.private )
-											{
-												var modML	= new Element( 'li' );
-												var modLink	= new Element( 'a', { id: 'priv_user_' + user_id + '_' + forum_user_id, 'class': 'priv_user', href: '#', title: ipb.lang['chat_priv_user'] } );
-												modMenu		= modMenu.insert( { bottom: modML.update( modLink.update( "<img src='" + ipb.vars['img_url'] + "/user_comment.png' /> " + ipb.lang['chat_priv_user'] ) ) } );
-											}
-											
-											if( ipb.chat.ignoreChats.get( forum_user_id ) )
-											{
-												var modML	= new Element( 'li' );
-												var modLink	= new Element( 'a', { id: 'unblock_user_' + user_id + '_' + forum_user_id, 'class': 'block_user', href: '#', title: ipb.lang['unblock_priv_user'] } );
-												modMenu		= modMenu.insert( { bottom: modML.update( modLink.update( "<img src='" + ipb.vars['img_url'] + "/comments_ignore.png' /> " + ipb.lang['unblock_priv_user'] ) ) } );
-											}
-											else
-											{
-												var modML	= new Element( 'li' );
-												var modLink	= new Element( 'a', { id: 'block_user_' + user_id + '_' + forum_user_id, 'class': 'block_user', href: '#', title: ipb.lang['block_priv_user'] } );
-												modMenu		= modMenu.insert( { bottom: modML.update( modLink.update( "<img src='" + ipb.vars['img_url'] + "/comments_ignore.png' /> " + ipb.lang['block_priv_user'] ) ) } );												
-											}
-										}
-										else
-										{
-											var modML	= new Element( 'li' );
-											modMenu		= modMenu.update( modML.update( '<em>' + ipb.lang['cant_kick_self'] + '</em>' ) );
-										}
-										
-										$('mod-menu-container').insert( { bottom: modMenu } );
-							
-										/*
-										 * Insert the new list item into the online users list, alphabetically
-										 */
-										var _hasBeenInserted	= false;
-										
-										$$('#chatters-online > li').each( function(elem) {
-											if( !_hasBeenInserted )
-											{
-												if( ipb.chat.moderator )
-												{
-													var _name	= $(elem).firstDescendant().next().innerHTML.stripTags().replace( /\<\!--.+?--\>/ig, "" );
-
-													if( username.toLowerCase() < _name.toLowerCase() )
-													{
-														$(elem).insert( { before: htmlFragment } );
-														_hasBeenInserted	= true;
-													}
-												}
-												else
-												{
-													var _name	= $(elem).innerHTML.stripTags().replace( /\<\!--.+?--\>/ig, "" );
-
-													if( username.toLowerCase() < _name.toLowerCase() )
-													{
-														$(elem).insert( { before: htmlFragment } );
-														_hasBeenInserted	= true;
-													}
-												}
-											}
-										});
-										
-										/*
-										 * If hasn't been inserted, insert it at end of list
-										 */
-										if( !_hasBeenInserted )
-										{
-											$('chatters-online').insert( { bottom: htmlFragment } );
-										}
-
-										/*
-										 * If we are a moderator, initialize the menu and then re-initialize
-										 * the kick user links
-										 */
-										new ipb.Menu( $('mod_link_' + user_id ), $( 'mod_link_' + user_id + '_menucontent' ), {}, { afterOpen: ipb.chat.repositionModMenu } );
-										
-										ipb.chat.initKickLinks();
-										
-										/*
-										 * Trigger sound
-										 */
-										ipb.chat.triggerEnterSound();
-										
-										/*
-										 * Update count on tab
-										 */
-										if( $('chat-tab-count') )
-										{
-											var _curCount	= parseInt( $('chat-tab-count').innerHTML );
-											var _newCount	= _curCount + 1;
-											
-											$('chat-tab-count').update( _newCount );
-											$('chat-tab-count').writeAttribute( 'title', ipb.chat.templates['count-title'].evaluate({ count: _newCount }) );
-										}
-									}
-								}
-							);
-		}
-	},
-	
-	/*
-	 * Remove a user from the "Online chat users" list dynamically
-	 */
-	removeUserFromList: function( user_id, username )
-	{
-		if( $('user_' + user_id) )
-		{
-			$('user_' + user_id).remove();
-			
-			if( $('mod_link_' + user_id + '_menucontent' ) )
-			{
-				$('mod_link_' + user_id + '_menucontent' ).remove();
-			}
-			
-			$('online-chat-count').innerHTML	= parseInt( $('online-chat-count').innerHTML ) - 1;
-
-			/*
-			 * Trigger sound
-			 */
-			ipb.chat.triggerLeaveSound();
-
-			/*
-			 * Update count on tab
-			 */
-			if( $('chat-tab-count') )
-			{
-				var _curCount	= parseInt( $('chat-tab-count').innerHTML );
-				var _newCount	= _curCount - 1;
-				
-				$('chat-tab-count').update( _newCount );
-				$('chat-tab-count').writeAttribute( 'title', ipb.chat.templates['count-title'].evaluate({ count: _newCount }) );
-			}
-		}
-	},
-	
-	/*
-	 * Initialize the moderator kick user links
-	 */
-	initKickLinks: function()
-	{
-		/*
-		 * First let's unregister all the click observers 
-		 * since this will get built more than once per page load
-		 */
-		$$('.kick_user', '.ban_user', '.priv_user', '.block_user', '.unblock_user').each( function(elem) {
-			$(elem).stopObserving('click');
-		});
-		
-		/*
-		 * Now we register kick user link handler
-		 */
-		$$('.kick_user').each( function(elem) {
-			$(elem).observe( 'click', ipb.chat.kickUser );
-		});
-		
-		$$('.ban_user').each( function(elem) {
-			$(elem).observe( 'click', ipb.chat.banUser );
-		});
-		
-		$$('.priv_user').each( function(elem) {
-			$(elem).observe( 'click', ipb.chat.privateChat );
-		});
-		
-		$$('.block_user').each( function(elem) {
-			$(elem).observe( 'click', ipb.chat.blockPrivateChats );
-		});
-		
-		$$('.unblock_user').each( function(elem) {
-			$(elem).observe( 'click', ipb.chat.unblockPrivateChats );
-		});
-	},
-
-	/*
-	 * Unblock private chats from a particular user
-	 */
-	unblockPrivateChats: function(e)
-	{
-		Event.stop(e);
-		
-		/*
-		 * Get user id from element ID
-		 */
-		var elem	= Event.findElement( e, 'a' );
-		var elemId	= elem.id.replace( "block_user_", "" );
-		var elemP	= elemId.split( '_' );	// 0 is chat user id, 1 is forum user id
-		
-		/*
-		 * Close menu
-		 */
-		ipb.menus.closeAll();
-		
-		/*
-		 * Can't kick self
-		 */
-		if( elemId == userId )
-		{
-			alert( ipb.lang['cant_kick_self'] );
-			return false;
-		}
-		else
-		{
-			Debug.write( "Unblocked the user with id " + elemId );
-		}
-		
-		/*
-		 * Send block request to IPB
-		 */
-		new Ajax.Request( 
-							ipb.vars['base_url'] + "app=ipchat&module=ajax&section=block&md5check=" + ipb.vars['secure_hash'] + "&id=" + elemP[1] + "&block=0", 
-							{ method: 'post' }
-						);
-		
-		/*
-		 * And add to dynamic block list
-		 */
-		ipb.chat.ignoreChats.unset( elemP[1] );
-		
-		/*
-		 * And lastly, update the menu
-		 */
-		$(elem).removeClassName('unblock_user').addClassName('block_user');
-		$(elem).writeAttribute( { title: ipb.lang['block_priv_user'] } );
-		$(elem).update( "<img src='" + ipb.vars['img_url'] + "/comments_ignore.png' /> " + ipb.lang['block_priv_user'] );
-		
-		/*
-		 * Re-initialize kick links
-		 */
-		ipb.chat.initKickLinks();
-		
-		return false;
-	},
-
-	/*
-	 * Block private chats from a particular user
-	 */
-	blockPrivateChats: function(e)
-	{
-		Event.stop(e);
-		
-		/*
-		 * Get user id from element ID
-		 */
-		var elem	= Event.findElement( e, 'a' );
-		var elemId	= elem.id.replace( "block_user_", "" );
-		var elemP	= elemId.split( '_' );	// 0 is chat user id, 1 is forum user id
-		
-		var _forumUser	= ipb.chat.forumIdMap.get( elemP[0] );
-		
-		if( !_forumUser[1] )
-		{
-			alert( ipb.lang['cant_block_user'] );
-			return false;
-		}
-		
-		/*
-		 * Close menu
-		 */
-		ipb.menus.closeAll();
-		
-		/*
-		 * Can't kick self
-		 */
-		if( elemId == userId )
-		{
-			alert( ipb.lang['cant_kick_self'] );
-			return false;
-		}
-		else
-		{
-			Debug.write( "Blocked the user with id " + elemId );
-		}
-		
-		/*
-		 * Send block request to IPB
-		 */
-		new Ajax.Request( 
-							ipb.vars['base_url'] + "app=ipchat&module=ajax&section=block&md5check=" + ipb.vars['secure_hash'] + "&id=" + elemP[1] + "&block=1", 
-							{ method: 'post' }
-						);
-		
-		/*
-		 * And add to dynamic block list
-		 */
-		ipb.chat.ignoreChats.set( elemP[1], elemP[1] );
-		
-		/*
-		 * And lastly, update the menu
-		 */
-		$(elem).removeClassName('block_user').addClassName('unblock_user');
-		$(elem).writeAttribute( { title: ipb.lang['unblock_priv_user'] } );
-		$(elem).update( "<img src='" + ipb.vars['img_url'] + "/comments_ignore.png' /> " + ipb.lang['unblock_priv_user'] );
-		
-		/*
-		 * Re-initialize kick links
-		 */
-		ipb.chat.initKickLinks();
-		
-		return false;
-	},
-
-	/*
-	 * Initiate a private chat
-	 */
-	privateChat: function(e)
-	{
-		Event.stop(e);
-		
-		/*
-		 * Get user id from element ID
-		 */
-		var elem	= Event.findElement( e, 'a' );
-		var elemId	= elem.id.replace( "priv_user_", "" );
-		var elemP	= elemId.split( '_' );	// 0 is chat user id, 1 is forum user id
-		
-		/*
-		 * Close menu
-		 */
-		ipb.menus.closeAll();
-		
-		/*
-		 * Can't send a private chat to yourself
-		 */
-		if( elemId == userId )
-		{
-			alert( ipb.lang['cant_kick_self'] );
-			return false;
-		}
-		
-		if( ipb.chat.privateChats.get( 'privchatwindow_' + elemP[0] ) )
-		{
-			ipb.chat.privateChats.get( 'privchatwindow_' + elemP[0] ).show();
-		}
-		else
-		{
-			ipb.chat.privateChats.set( 'privchatwindow_' + elemP[0], new ipb.Popup( 'privchatwindow_' + elemP[0], {
-									type: 'balloon',
-									initial: ipb.chat.templates['send_private'].evaluate({ id: elemP[0] }),
-									stem: true,
-									hideAtStart: false,
-									attach: { target: $( 'mod_link_' + elemP[0] ), position: 'auto' },
-									w: '400px'
-							}) );
-							
-			ipb.chat.privateChats.get( 'privchatwindow_' + elemP[0] ).show();
-			
-			Event.observe( 'priv_chat_text_' + elemP[0], 'keypress', ipb.chat.checkForSendPrivateChat );
-
-			new ipb.Menu( $('mod_link_' + elemP[0] ), $( 'mod_link_' + elemP[0] + '_menucontent' ), {}, { afterOpen: ipb.chat.repositionModMenu } );
-			
-			ipb.chat.initKickLinks();
-		}
-		
-		return false;
-	},
-		
-	/*
-	 * Ban a user from the chat room
-	 */
-	banUser: function(e)
-	{
-		Event.stop(e);
-		
-		/*
-		 * Get user id from element ID
-		 */
-		var elem	= Event.findElement( e, 'a' );
-		var elemId	= elem.id.replace( "ban_user_", "" );
-		var elemP	= elemId.split( '_' );	// 0 is chat user id, 1 is forum user id
-		
-		/*
-		 * Close menu
-		 */
-		ipb.menus.closeAll();
-		
-		/*
-		 * Can't kick self
-		 */
-		if( elemId == userId )
-		{
-			alert( ipb.lang['cant_kick_self'] );
-			return false;
-		}
-		else
-		{
-			Debug.write( "Banned the user with id " + elemId );
-		}
-		
-		/*
-		 * Send ban request to IPB
-		 */
-		new Ajax.Request( 
-							ipb.vars['base_url'] + "app=ipchat&module=ajax&section=ban&md5check=" + ipb.vars['secure_hash'] + "&id=" + elemP[1], 
-							{ method: 'post' }
-						);
-		
-		/*
-		 * Send it to the server
-		 */
-		ipb.chat.sendMessageToChild( "server=" + serverHost + "&path=" + serverPath + "&room=" + roomId + "&user=" + userId + "&access_key=" + accessKey + "&action=kick&against=" + elemP[0] );
-		
-		return false;
-	},
-	
-	/*
-	 * Kick a user from the chat room
-	 */
-	kickUser: function(e)
-	{
-		Event.stop(e);
-		
-		/*
-		 * Get user id from element ID
-		 */
-		var elem	= Event.findElement( e, 'a' );
-		var elemId	= elem.id.replace( "kick_user_", "" );
-		
-		/*
-		 * Close menu
-		 */
-		ipb.menus.closeAll();
-		
-		/*
-		 * Can't kick self
-		 */
-		if( elemId == userId )
-		{
-			alert( ipb.lang['cant_kick_self'] );
-			return false;
-		}
-		else
-		{
-			Debug.write( "Kicked the user with id " + elemId );
-		}
-		
-		/*
-		 * Send it to the server
-		 */
-		ipb.chat.sendMessageToChild( "server=" + serverHost + "&path=" + serverPath + "&room=" + roomId + "&user=" + userId + "&access_key=" + accessKey + "&action=kick&against=" + elemId );
-		
-		return false;
-	},
-	
-	/*
-	 * "Clean" messages to preserve certain things
-	 */
-	cleanMessage: function( message )
-	{
-		message	= message.replace( /\r/g, '' );
-		message	= message.replace( /\n/g, "__N__" );
-		message	= message.replace( /,/g, "__C__" );
-		message	= message.replace( /=/g, "__E__" );
-		message	= message.replace( /\+/g, "__PS__" );
-		message	= message.replace( /&/g, "__A__" );
-		message	= message.replace( /%/g, "__P__" );
-		
-		return message;
-	},
-	
-	/*
-	 * "UN-Clean" messages to restore certain things
-	 */
-	unCleanMessage: function( message )
-	{
-		message	= message.replace( /__N__/g, "<br />" );
-		message	= message.replace( /__C__/g, "," );
-		message	= message.replace( /__E__/g, "=" );
-		message	= message.replace( /__A__/g, "&" );
-		message	= message.replace( /__P__/g, "%" );
-		message	= message.replace( /__PS__/g, "+" );
-
-		return message;
-	},
-				
-	/*
-	 * Verify a URL is valid
-	 */
-	isValidUrl: function( url )
-	{
-		Debug.write( "Checking url: " + url );
-		
-		var regexp = /(https?|ftp|file):\/\/([^<>\"\s]+|[a-z0-9/\._\- !&\#;,%\+\?:=])/i;
-
-		return regexp.test( url );
-	},
-	
-	/*
-	 * Parse bbcode and emoticons
-	 */
-	parseEmoticonsAndBbcode: function( text )
-	{
-		/*
-		 * First we have to parse out and store url bbcode tags, not replace
-		 */
-		var urlReplacements	= $H();
-		var iteration		= 0;
-		
-		while( text.match( /\[url\](.+?)\[\/url\]/gi ) )
-		{
-			var matches	= /\[url\](.+?)\[\/url\]/gi.exec( text );
-	
-			if( matches != null )
-			{
-				matches[1]	= matches[1].replace( /&quot;/g, '' );
-
-				if( ipb.chat.isValidUrl( matches[1] ) )
-				{
-					urlReplacements.set( "__URL" + iteration + "__", "<a target='_blank' class='bbc' href='" + matches[1] + "'>" + matches[1] + "</a>" );
-					text	= text.replace( matches[0], "__URL" + iteration + "__" );
-					iteration++;
-				}
-				else
-				{
-					text	= text.replace( matches[0], matches[1] );
-				}
-			}
-		}
-
-		while( text.match( /\[url=(.+?)\](.+?)\[\/url\]/gi ) )
-		{		
-			var matches	= /\[url=(.+?)\](.+?)\[\/url\]/gi.exec( text );
-	
-			if( matches != null )
-			{
-				matches[1]	= matches[1].replace( /&quot;/g, '' );
-
-				if( ipb.chat.isValidUrl( matches[1] ) )
-				{
-					urlReplacements.set( "__URL" + iteration + "__", "<a target='_blank' class='bbc' href='" + matches[1].replace( /"/gi, '' ).replace( /&quot;/gi, '' ) + "'>" + matches[2] + "</a>" );
-					text	= text.replace( matches[0], "__URL" + iteration + "__" );
-					iteration++;
-				}
-				else
-				{
-					text	= text.replace( matches[0], matches[1] );
-				}
-			}
-		}
-
-		/*
-		 * Now we parse the raw URLs
-		 */
-		var exp = /(\b(https?|ftp|file):\/\/([^<>\"\s]+|[a-z0-9/\._\- !&\#;,%\+\?:=]+))/ig;
-		text	= text.replace(exp,"<a target='_blank' class='bbc' href='$1'>$1</a>" ); 
-
-		/*
-		 * And lastly, loop through and replace stored bbcode url tags
-		 */
-		urlReplacements.each( function(pair)
-		{
-			text	= text.replace( pair.key, pair.value );
-		});
-		
-		/*
-		 * IMG tags
-		 * Images aren't very smooth - they redownload each time a new chat is inserted, and larger (slower)
-		 * images this becomes very noticeable for.  Shelving img tag support until a later version when we can
-		 * handle them differently.
-		 */
-		/*while( text.match( /\[img\](.+?)\[\/img\]/gi ) )
-		{		
-			var matches	= /\[img\](.+?)\[\/img\]/gi.exec( text );
-	
-			if( matches != null )
-			{
-				if( ipb.chat.isValidUrl( matches[1] ) )
-				{
-					var randId	= Math.floor(Math.random()*999999999);
-					
-					text	= text.replace( matches[0], "<img class='bbc_img' id='img_" + randId + "' src='" + matches[1] + "' />" );
-					
-					ipb.chat.resizeImage( randId );
-				}
-				else
-				{
-					text	= text.replace( matches[0], matches[1] );
-				}
-			}
-		}*/
-
-		/*
-		 * Other basics
-		 */
-		text	= text.replace( /\[b\](.+?)\[\/b\]/gi, "<strong class='bbc'>$1</strong>" );
-		text	= text.replace( /\[i\](.+?)\[\/i\]/gi, "<em class='bbc'>$1</em>" );
-		text	= text.replace( /\[u\](.+?)\[\/u\]/gi, "<u class='bbc'>$1</u>" );
-		
-		/*
-		 * Emoticons...
-		 */
-		text	= text.replace( '!', '&#33;' );
-		
-		ipb.chat.emoticons.each( function(emoticon) {
-			var _tmp	= emoticon.value.split(',');
-			
-			/*
-			 * We need to capture opening and closing space
-			 */
-			var img		= "$1<img src='" + ipb.vars['emoticon_url'] + '/' + _tmp[1] + "' class='bbc' />$2";
-			
-			var _regexp	= new RegExp( "(^|\\s)" + RegExp.escape(emoticon.key) + "(\\s|$)", "gi" );
-			
-			while( text.match( _regexp ) )
-			{
-				text	= text.replace( _regexp, img );
-			}
-		});
-		
-		/*
-		 * Bad words...
-		 */
-		var badwordReplacements	= $H();
-		var iteration			= 0;
-		
-		ipb.chat.badwords.each( function(badword) {
-			if( !badword.value[1] )
-			{
-				badword.value[1]	= '######';
-			}
-			
-			/*
-			 * Have to treat 'ass' special, due to HTML use of 'class'
-			 */
-			if( badword.key == 'ass' )
-			{
-				if( badword.value[0] )
-				{
-					var pattern	= '(\\b|!|\\?|\\.|,|$)' + RegExp.escape( String.reverse( badword.key ) ) + '(?!lc)(^|\\b|\\s)';
-				}
-				else
-				{
-					var pattern	= RegExp.escape( String.reverse( badword.key ) ) + '(?!lc)';
-				}
-
-				var _test	= String.reverse( text );
-				var _regexp	= new RegExp( pattern, "gi" );
-
-				while( matches = _regexp.exec( _test ) )
-				{
-					if( matches != null )
-					{
-						if( badword.value[0] )
-						{
-							badwordReplacements.set( "__BW" + iteration + "__", String.reverse( matches[2] ) + badword.value[1] + String.reverse( matches[1] ) );
-						}
-						else
-						{
-							badwordReplacements.set( "__BW" + iteration + "__", badword.value[1] );
-						}
-						
-						_test	= _test.replace( matches[0], "__" + iteration + "WB__" );
-
-						iteration++;
-					}
-				}
-				
-				text	= String.reverse( _test );
-				return;
-			}
-
-			if( badword.value[0] )
-			{
-				var pattern	= '(^|\\b|\\s)' + RegExp.escape(badword.key) + '(\\b|!|\\?|\\.|,|$)';
-			}
-			else
-			{
-				var pattern	= RegExp.escape(badword.key);
-			}
-			
-			var _regexp	= new RegExp( pattern, "gi" );
-			
-			while( matches = _regexp.exec( text ) )
-			{
-				if( matches != null )
-				{
-					if( badword.value[0] )
-					{
-						badwordReplacements.set( "__BW" + iteration + "__", matches[1] + badword.value[1] + matches[2] );
-					}
-					else
-					{
-						badwordReplacements.set( "__BW" + iteration + "__", badword.value[1] );
-					}
-					
-					text	= text.replace( matches[0], "__BW" + iteration + "__" );
-					iteration++;
-				}
-			}
-		});
-
-		badwordReplacements.each( function(pair)
-		{
-			text	= text.replace( pair.key, pair.value );
-		});
-
-		return text;
-	},
-	
-	/*
-	 * Format user name
-	 */
-	formatName: function( _user_id, _user_name )
-	{
-		var _details	= ipb.chat.nameFormatting.get( _user_id );
-
-		if( _details )
-		{
-			return _details[0].replace( /__DBQ__/g, '"' ) + _user_name + _details[1].replace( /__DBQ__/g, '"' );
-		}
-		
-		return _user_name;
-	},
-
-	/*
-	 * Ping the IPB installation in order to update "who's chatting"
-	 */
-	ping: function( pe )
-	{
-		/*
-		 * If kicked, shut off executer
-		 */
-		if( ipb.chat.kicked )
-		{
-			pe.stop();
-			return false;
-		}
-		
-		new Ajax.Request( 
-						ipb.vars['base_url'] + "app=ipchat&module=ajax&section=update&md5check="+ipb.vars['secure_hash'], 
-						{ method: 'get' }
-						);
-	},
-
-	/*
-	 * This is here mainly for Safari.  In Safari, it automatically encodes chars
-	 * and they are not valid for decodeURI/decodeURIComponent.
-	 * Example: teraßyte becomes tera%DFyte
-	 * This function will decode those characters
-	 */
-	manualDecode: function( string )
-	{
-		string	= string.replace( /\%([a-zA-Z0-9]{2})/gi, function( hex ) {
-						return String.fromCharCode( parseInt( hex.replace( '%', '' ), 16 ) );
-					});
-
-		return string;
-	},
-	
-	/*
-	 * Attempt to fix position of moderator menu *sigh*
-	 */
-	repositionModMenu: function( menu )
-	{
-		/*
-		 * Top position is only one we have trouble with >.<
-		 */
-		var _top	= $( menu.target ).getStyle('top').replace( /px/, '' );
-		var _cont	= $('chatters-online-wrap').scrollTop;
-		
-		Debug.write( "Online chatters current top pos: " + _top );
-		Debug.write( "Online chatters scroll offset: " + _cont );
-		Debug.write( "New top pos: " + (_top - _cont) );
-		
-		$( menu.target ).setStyle( 'top:'  + (_top - _cont) + 'px;' );
-	}
-};
-
-ipb.chat.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.comments.js b/upload/public/js/ips.comments.js
index 420bfe27..bd021f5d 100644
--- a/upload/public/js/ips.comments.js
+++ b/upload/public/js/ips.comments.js
@@ -37,141 +37,82 @@ _comments.prototype.comments = {
 	hc: '',
 	up: '',
 	_id: 0,
-	/*timer: [],
-	blockSizes: [],*/
 	
 	/*------------------------------*/
 	/* Constructor 					*/
 	init: function()
 	{
-		Debug.write("Initializing ips.gallery.js");
+		Debug.write("Initializing ips.comments.js");
 		
 		document.observe("dom:loaded", function(){
 			
 			ipb.comments.preCheckComments();
 			
-			ipb.delegate.register('a[rel="bookmark"]', ipb.comments.showLinkToComment );
+			ipb.delegate.register('.post_id a[rel="bookmark"]', ipb.comments.showLinkToComment );
 			
 			/* Comments */
 			ipb.delegate.register('.edit_comment'   , ipb.comments.editShow );
 			ipb.delegate.register('.delete_comment' , ipb.comments.deletePop );
 			ipb.delegate.register('.reply_comment'  , ipb.comments.reply );
+			ipb.delegate.register('a[rel="bookmark"]', ipb.comments.showCommentLink );
+			ipb.delegate.register('input.ipsComment_mod', ipb.comments.moderate );
 			
-			if ( $('commentPost') )
+			if ( $('commentPost') && !$('commentCaptcha') )
 			{
 				$('commentPost').observe( 'click', ipb.comments.add );
 			}
 			
-			/* Set up hovercard */
-			ipb.hoverCardRegister.initialize( 'comment_mod', { 'callback': ipb.comments.hCard, 'w': '250px', 'delay': 500, 'position': 'bottomLeft' } );
+			if ( $('reputation_filter') )
+			{
+				$('reputation_filter').hide();
+			}
+			
+			if( $('comment_name') )
+			{
+				$('comment_name').observe( 'focus', function() { 
+					if( $('commentCaptcha') )
+					{
+						$('commentCaptcha').show();
+					}
+				});
+			}
 		});
 	},
 	
-	uCard: function( e, id )
+	moderate: function(e, elem)
 	{
-		Event.stop(e);
-		var elem = Event.element(e);
-		
-		var sourceid = elem.identify();
-		var user = $( elem ).className.match('__id([0-9]+)');
-		var fid  = $( elem ).className.match('__fid([0-9]+)');
-
-		if( user == null || Object.isUndefined( user[1] ) ){ Debug.error("Error showing popup"); return; }
-		var popid = 'popup_' + user[1] + '_user';
-		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=card&mid=' + user[1];
-		
-		Debug.write( fid );
-		
-		if ( fid != null && !Object.isUndefined( fid[1] ) && fid[1] )
-		{
-			_url += '&f=' + fid[1];
+		// Count checked boxes that are visible
+		var count = $$(".ipsComment_mod:checked").findAll( function(el){ return el.up('.ipsComment').visible(); } );
+	
+		if( count.size() ){
+			if( !$('comment_moderate_box') ){
+				$$('body')[0].insert({'bottom': ipb.templates['comment_moderation'].evaluate({count: count.size()}) });
+				$('submitModAction').on('click', ipb.comments.doModerate);
+			} else {
+				$('comment_count').update( count.size() );
+			}
+			
+			if( !$('comment_moderate_box').visible() ){
+				new Effect.Appear( $('comment_moderate_box'), { duration: 0.3 } );
+			}
 		}
-
-		Debug.write( _url );
-		ipb.namePops[ user ]	 = new ipb.Popup( popid, {
-			 												type: 'balloon',
-			 												ajaxURL: _url,
-			 												stem: true,
-															hideAtStart: false,
-			 												attach: { target: elem, position: 'auto' },
-			 												w: '400px'
-														});
-	},
-	/**
-	 * Hover card callback
-	 */
-	hCard: function( e, id )
-	{
-		var count = 0;
-		
-		/* Store comment id for push */
-		ipb.comments.cCard = id.replace( /mod_comment_id_/, '' );
-		
-		count = ipb.comments.countChecked();
-		Debug.write( "here at the callback " + count);
-		/* Got a count? If not, skip it */
-		if ( ! count )
+		else
 		{
-			return false;
+			if( $('comment_moderate_box') ){
+				new Effect.Fade( $('comment_moderate_box'), { duration: 0.3 } );
+			}
 		}
-		
-		/* Fetch template and return */
-		return new Template( $('modPopUp').innerHTML ).evaluate( { 'count': count, 'id': ipb.comments.cCard } );
 	},
 	
-	/**
-	 * Count checked boxes.
-	 * @returns	int
-	 */
-	countChecked: function()
+	doModerate: function(e)
 	{
-		count = 0;
+		var doMod = $('commentModAction').value;
+		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=comments&do=moderate&parentId=' + ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'] + '&modact=' + doMod + '&secure_key=' + ipb.vars['secure_hash'];
 		
-		/* Fetch count of active checkboxes */
-		$$('.comment_mod').each( function(elem)
-		{
-			if ( elem.checked === true )
-			{
-				count++;
-				
-				if ( elem.id )
-				{
-					var _id = elem.id.replace( /mod_comment_id_/, '' );
-					
-					if ( $('comment_id_' + _id) )
-					{
-						if ( ! $('comment_id_' + _id).visible() )
-						{
-							count--;
-						}
-					}
-				}
-			}
-		} );
-		
-		return count;
-	},
-	
-	/**
-	 * Someone pushed the button!
-	 */
-	goModerate: function(e)
-	{
-		Event.stop(e);
-				
-		/* Fire ajax */
-		var act = $( 'modOptions_' + ipb.comments.cCard ).value;
-		
-		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=comments&do=moderate&parentId=' + ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'] + '&modact=' + act + '&secure_key=' + ipb.vars['secure_hash'];
-		var ids = new Array();
-
-		$$('.comment_mod').each( function(elem)
-		{
-			if ( elem.checked === true )
-			{
-				ids[ ids.length ] = elem.id.replace( /mod_comment_id_/, '' );
-			}
-		} );
+		// Get checked comment IDs
+		var ids = $$('.ipsComment_mod:checked').collect( function(item){
+			return item.up('.ipsComment').readAttribute('data-commentid');
+		});
 		
 		new Ajax.Request(	url,
 							{
@@ -181,68 +122,66 @@ _comments.prototype.comments = {
 								parameters: {
 									md5check: 			ipb.vars['secure_hash'],
 									"commentIds[]":		ids
-									},
+								},
 								onSuccess: function(t)
 								{
-									if ( t.responseJSON['error'] )
-									{
+									if ( t.responseJSON['error'] ){
 										alert( t.responseJSON['error'] );
-										
 										return false;
 									}
 									else
 									{
-										/* Untick checkboxes */
-										$$('.comment_mod').each( function(elem)
-										{
-											if ( elem.checked === true )
-											{
-												elem.checked = false;
-											}
-										} );
+										$$('.ipsComment_mod:checked').each( function(i){
+											i.checked = false;
+										});
 										
-										if ( act == 'delete')
-										{
-											/* Inc. deleted count */
-											ipb.comments.deleted += ids.length;
-											Debug.write( "Deleted - " + ipb.comments.deleted + ", on this page - " + ipb.comments.data['counts']['thisPageCount'] );
-
-											if ( ipb.comments.data['counts']['curStart'] )
-											{
-												/* How many posts are actually left? */
-												if ( ipb.comments.data['counts']['thisPageCount'] - ipb.comments.deleted < 1 )
-												{
-													/* redirect to the previous page */
-													window.location = ipb.vars['base_url'] + 'app=core&module=global&section=comments&do=findLastComment&parentId=' +ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'];
-
-													return false;
+										if( $('comment_moderate_box') ){
+											new Effect.Fade( $('comment_moderate_box'), { duration: 0.3 } );
+										}
+										
+										switch( doMod ){
+											case 'delete':
+												ipb.comments.deleted += ids.length;
+												Debug.write( "Deleted - " + ipb.comments.deleted + ", on this page - " + ipb.comments.data['counts']['thisPageCount'] );
+												if ( ipb.comments.data['counts']['curStart'] ){
+													if ( ipb.comments.data['counts']['thisPageCount'] - ipb.comments.deleted < 1 ){
+														window.location = ipb.vars['base_url'] + 'app=core&module=global&section=comments&do=findLastComment&parentId=' +ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'];
+														return false;
+													}
 												}
-											}
-											
-											/* Just go away if still here */
-											for( var i = 0 ; i <= ids.length ; i++ )
-											{
-												Effect.Fade( 'comment_id_' + ids[i], { 'duration': 0.8 } );
-											}
-										}
-										else if ( act == 'unapprove' )
-										{
-											for( var i = 0 ; i <= ids.length ; i++ )
-											{
-												ipb.comments.visibilityEffect( 'off', ids[i] );
-											}
-										}
-										else if ( act == 'approve' )
-										{
-											for( var i = 0 ; i <= ids.length ; i++ )
-											{
-												ipb.comments.visibilityEffect( 'on', ids[i] );
-											}
+												
+												Effect.multiple( 	ids.collect( function(i){ return $('comment_id_' + i); } ),
+																	Effect.Fade,
+																	{ duration: 0.8 }
+																);
+											break;
+											case 'unapprove':
+												for( var i = 0 ; i <= ids.length ; i++ ){
+													ipb.comments.visibilityEffect( 'off', ids[i] );
+												}
+											break;
+											case 'approve':
+												for( var i = 0 ; i <= ids.length ; i++ ){
+													ipb.comments.visibilityEffect( 'on', ids[i] );
+												}
+											break;
 										}
 									}
 								}
-							}
-						);
+							});
+		
+	},
+	
+	/* ------------------------------ */
+	/**
+	 * Shows a prompt allowing user to copy the URL
+	 * 
+	 * @var		{event}		e		The event
+	*/
+	showCommentLink: function(e, elem)
+	{
+		_t = prompt( ipb.lang['copy_topic_link'], $( elem ).readAttribute('href') );
+		Event.stop(e);
 	},
 	
 	/**
@@ -314,22 +253,24 @@ _comments.prototype.comments = {
 	{
 		Event.stop(e);
 		
-		var commentId = elem.id.replace( /delete_comment_/, '' );
+		var commentId = elem.up('.ipsComment').readAttribute('data-commentid');
 		if( !commentId ){ return; }
 		
-		/* store for use later */
-		ipb.comments.commentId = commentId;
-		
 		/* Create the pop-up */
 		var popid   = 'pop__delete_popup_' + commentId;
-		var content = new Template( $('delPopUp').innerHTML ).evaluate( { 'commentId': commentId } );
+		var content = ipb.templates['comment_delete'].evaluate( { 'commentId': commentId } );
 		
 		ipb.comments.deletePopUps = new ipb.Popup( popid, {  type: 'balloon',
 															 initial: content,
 															 stem: true,
 															 hideAtStart: false,
 															 attach: { target: $('delete_comment_' + commentId ), position: 'auto', 'event': 'click' },
-															 w: '200px' } );
+															 w: '350px' } );
+		
+		/* store for use later */
+		ipb.comments.commentId = commentId;
+		
+		
 	},
 	
 	
@@ -357,10 +298,8 @@ _comments.prototype.comments = {
 									},
 								onSuccess: function(t)
 								{
-									if ( t.responseJSON['error'] )
-									{
-										alert( t.responseJSON['error'] );
-										
+									if ( t.responseJSON['error'] ){
+										alert( ipb.lang['no_permission'] );									
 										return false;
 									}
 									else
@@ -449,9 +388,9 @@ _comments.prototype.comments = {
 										alert(ipb.lang['no_permission']);
 										return;
 									}
-									if( t.responseText == 'error' )
+									if( t.responseText == 'error' || t.responseText.match( /^Error / ) )
 									{
-										alert(ipb.lang['action_failed']);
+										alert(ipb.lang['no_permission']);
 										return;
 									}
 									
@@ -461,13 +400,6 @@ _comments.prototype.comments = {
 									edit['post'].update( t.responseText );
 									
 									edit['pid'] = 'e' + edit['pid'];
-									
-									// Init the editor
-									ipb.editors[ edit['pid'] ] = new ipb.editor( edit['pid'], USE_RTE );
-									
-									try {
-										ipb.editors[ edit['pid'] ].editor_window.focus();
-									} catch(err) { }
 
 									// Set up events
 									if( $('edit_save_' + edit['pid'] ) ){
@@ -493,24 +425,16 @@ _comments.prototype.comments = {
 		var elem = Event.element(e);
 		var postid = elem.id.replace('edit_save_e', '');
 		if( !postid ){ return; }
-		
-		try {
-			// Need to update for submit manually in this case
-			ipb.editors[ 'e' + postid ].update_for_form_submit();
-			var Post = $F( 'e' + postid + '_textarea' );
-		} catch(err) {
-			Debug.error( err );
-			Debug.dir( ipb.editors );
-			return;
-		}
 
+		var Post = ipb.textEditor.getEditor('edit-' + postid).getText();
+		
 		if( Post.blank() )
 		{
 			alert( ipb.lang['post_empty'] );
 			return;
 		}
 		
-		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=comments&do=saveEdit&parentId=' +ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'] + '&secure_key=' + ipb.vars['secure_hash'] + '&comment_id=' + postid;
+		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=comments&do=saveEdit&parentId=' + ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'] + '&secure_key=' + ipb.vars['secure_hash'] + '&comment_id=' + postid;
 		Debug.write( url );
 		new Ajax.Request(	url,
 							{
@@ -552,9 +476,9 @@ _comments.prototype.comments = {
 										{
 											new Effect.ScrollTo( $( 'comment_id_' + postid ).down('.comment_content'), { offset: -50 } );
 										}
-
-										ipb.global.findImgs( $( 'comment_id_' + postid ).down('.comment_content') );										
 										
+										ipb.textEditor.getEditor( 'edit-' + postid ).remove();
+
 										prettyPrint();
 									}
 								}
@@ -577,8 +501,9 @@ _comments.prototype.comments = {
 		
 		if( ipb.comments.commentCache[ postid ] ){
 			$( 'comment_id_' + postid ).down('.comment_content').update( ipb.comments.commentCache[ postid ] );
-			ipb.editors[ postid ] = null;
 			$('edit_comment_' + postid).writeAttribute('_editing', '0');
+			
+			ipb.textEditor.getEditor( 'edit-' + postid ).remove();
 		}
 		
 		return;
@@ -590,27 +515,19 @@ _comments.prototype.comments = {
 	add: function(e)
 	{
 		Event.stop(e);
-				
-		try {
-			// Need to update for submit manually in this case
-			ipb.editors[ 'fast-reply' ].update_for_form_submit();
-			var Post = $F( 'fast-reply_textarea' );
-		} catch(err) {
-			Debug.error( err );
-			Debug.dir( ipb.editors );
-			return;
-		}
 
-		if( Post.blank() )
+		var content = ipb.textEditor.getEditor().getText();
+		var isRte   = ipb.textEditor.getEditor().isRte();
+		
+		if( content.blank() )
 		{
 			alert( ipb.lang['post_empty'] );
 			return;
 		}
 		
 		/* Close editor */
-		$('fast-reply_textarea').value = '';
-		ipb.editors['fast-reply'].editor_set_content(false);
-		ipb.editors['fast-reply'].resize_to( 70 );
+		ipb.textEditor.getEditor().minimizeOpenedEditor();
+		
 		in_use = 0;
 		
 		var url = ipb.vars['base_url'] + 'app=core&module=ajax&section=comments&do=add&parentId=' + ipb.comments.parentId + '&fromApp=' + ipb.comments.data['fromApp'] + '&secure_key=' + ipb.vars['secure_hash'];
@@ -623,13 +540,21 @@ _comments.prototype.comments = {
 								encoding: ipb.vars['charset'],
 								parameters: {
 									md5check: 			ipb.vars['secure_hash'],
-									Post: 				Post.encodeParam()
+									Post: 				content.encodeParam(),
+									isRte:				isRte
 								},
 								onSuccess: function(t)
 								{
 									if ( t.responseJSON && t.responseJSON['error'] )
 									{
-										ipb.global.errorDialogue( ipb.lang['no_permission'] );
+										if( t.responseJSON['error'] == 'comment_requires_approval' )
+										{
+											ipb.global.okDialogue( ipb.lang['comment_requires_approval'] );
+										}
+										else
+										{
+											ipb.global.errorDialogue( ipb.lang['no_permission'] );
+										}
 									}
 									else if ( t.responseText && t.responseText != 'no_permission' )
 									{
@@ -671,16 +596,14 @@ _comments.prototype.comments = {
 											var endBorderColor = $('comment_id_' + latestId ).getStyle( 'border-top-color' );
 											
 											/* Remove light BG */
-											$('comment_id_' + latestId).removeClassName('row1').addClassName('row2').setStyle( { 'border-top-color': startColor, 'border-top-style': 'solid', 'border-top-width': '1px' } );
+											$('comment_id_' + latestId).removeClassName('row1').addClassName('row2');
 											
 											$('comment_id_' + latestId ).hide();
 											new Effect.BlindDown( 'comment_id_' + latestId, { duration: 1.0, queue: 'front' } );
 											new Effect.Morph( 'comment_id_' + latestId, { 'style': 'border-top-color:' + endBorderColor, queue: 'end' } );
 											new Effect.Morph( 'comment_id_' + latestId, { 'style': 'background-color:' + endColor, queue: 'end', afterFinish: function() { $('comment_id_' + latestId ).removeClassName('row2').addClassName( 'row1' ); } } );
 										}
-										
-										//ipb.global.findImgs( $( 'post_id_' + postid ).down('.post') );
-																				
+
 										prettyPrint();
 									}
 								}
@@ -707,6 +630,7 @@ _comments.prototype.comments = {
 		
 		Event.stop(e);
 		var edit = [];
+		Debug.write("Here");
 		
 		if ( ! elem ){ return; }
 		
@@ -737,9 +661,7 @@ _comments.prototype.comments = {
 										return;
 									}
 									
-									editorExpand( 'fast-reply' );
-									
-									ipb.editors['fast-reply'].insert_text( t.responseText );
+									ipb.textEditor.getEditor().insert( t.responseText );
 								}
 							}
 						);
@@ -754,20 +676,6 @@ _comments.prototype.comments = {
 		Event.stop(e);
 	},
 	
-	/**
-	 * Confirm they want to delete stuff
-	 * 
-	 * @var 	{event}		e	The event
-	*/
-	confirmSingleDelete: function(e, elem)
-	{
-		if( !confirm( ipb.lang['delete_post_confirm'] ) )
-		{
-			Event.stop(e);
-		}
-	},
-	
-	
 	/**
 	 * Toggles the multimod buttons in posts
 	 * 
@@ -903,51 +811,6 @@ _comments.prototype.comments = {
 		ipb.comments.updateModButton();
 	},
 	
-	/**
-	 * Check the files we've selected
-	 */
-	preCheckImages: function()
-	{
-		var topics = [];
-		
-		if( $('selectedimgids' ) ){
-			topics = $F('selectedimgids').split(',');
-		} 
-		
-		var checkboxesOnPage	= 0;
-		var checkedOnPage		= 0;
-
-		if( topics )
-		{
-			topics.each( function(check){
-				if( check != '' )
-				{
-					if( $('img_' + check ) )
-					{
-						checkedOnPage++;
-						$('img_' + check ).checked = true;
-					}
-					
-					ipb.comments.totalChecked++;
-				}
-			});
-		}
-
-		$$('.image_mod').each( function(check){
-			checkboxesOnPage++;
-		} );
-		
-		if( $('imgs_all') )
-		{
-			if( checkedOnPage == checkboxesOnPage )
-			{
-				$('imgs_all').checked = true;
-			}
-		}
-		
-		ipb.comments.updateModButton();
-	},
-	
 	/**
 	 * Update the moderation button
 	 */	
diff --git a/upload/public/js/ips.editor.js b/upload/public/js/ips.editor.js
index e6d18d88..df6a69b7 100644
--- a/upload/public/js/ips.editor.js
+++ b/upload/public/js/ips.editor.js
@@ -11,6 +11,47 @@ var _editor = window.IPBoard;
 
 var isRTL = ( isRTL ) ? isRTL : false;
 
+/* ===================================================================================================== */
+/* Values for the IPB text editor */
+
+IPBoard.prototype.editor_values = $H({
+	'templates': 		$A(),
+	'colors_perrow': 	8,
+	'colors': [ 		'000000' , 'A0522D' , '556B2F' , '006400' , '483D8B' , '000080' , '4B0082' , '2F4F4F' ,
+						'8B0000' , 'FF8C00' , '808000' , '008000' ,	'008080' , '0000FF' , '708090' , '696969' ,
+						'FF0000' , 'F4A460' , '9ACD32' , '2E8B57' , '48D1CC' , '4169E1' , '800080' , '808080' ,
+						'FF00FF' , 'FFA500' , 'FFFF00' , '00FF00' ,	'00FFFF' , '00BFFF' , '9932CC' , 'C0C0C0' ,
+						'FFC0CB' , 'F5DEB3' , 'FFFACD' , '98FB98' ,	'AFEEEE' , 'ADD8E6' , 'DDA0DD' , 'FFFFFF'
+					],
+	
+	// You can add new fonts here if you wish, HOWEVER, if you use
+	// non-standard fonts, users without those fonts on their computer
+	// will not see them. The default list below has the generally accepted
+	// safe fonts; add others at your own risk! 
+	'primary_fonts': $H({ 	arial:					"Arial",
+							arialblack:				"Arial Black",
+							arialnarrow:			"Arial Narrow",
+							bookantiqua:			"Book Antiqua",
+							centurygothic:			"Century Gothic",
+							comicsansms:			"Comic Sans MS",
+							couriernew:				"Courier New",
+							franklingothicmedium:	"Franklin Gothic Medium",
+							garamond:				"Garamond",
+							georgia:				"Georgia",
+							impact:					"Impact",
+							lucidaconsole:			"Lucida Console",
+							lucidasansunicode:		"Lucida Sans Unicode",
+							microsoftsansserif:		"Microsoft Sans Serif",
+							palatinolinotype:		"Palatino Linotype",
+							tahoma:					"Tahoma",
+							timesnewroman:			"Times New Roman",
+							trebuchetms:			"Trebuchet MS",
+							verdana:				"Verdana"
+					}),
+	'font_sizes': $A([ 1, 2, 3, 4, 5, 6, 7 ])
+				
+});
+
 // =============================================================================================================//
 // Class for RTE EDITOR which is inherited by main Editor class
 _editor_rte = Class.create({
@@ -2560,9 +2601,12 @@ if( Prototype.Browser.Opera && USE_RTE ){
 			Event.observe( this.editor_document, 'keypress', this.events.editor_document_onkeypress.bindAsEventListener( this ) );
 		
 			// Remove spellcheck button
-			$( this.id + '_cmd_spellcheck' ).hide();
-			this.hidden_objects[ this.id + '_cmd_spellcheck' ] = 1;
-		
+			if ( $( this.id + '_cmd_spellcheck' ) )
+			{
+				$( this.id + '_cmd_spellcheck' ).hide();
+				this.hidden_objects[ this.id + '_cmd_spellcheck' ] = 1;
+			}
+			
 			// Kill tags
 			if ( this.use_bbcode )
 			{
@@ -3244,7 +3288,7 @@ function editorExpand( key )
 		}
 	} );
 	
-	if ( x_expanded[key] == 0 )
+	if ( !x_expanded[key] || x_expanded[key] == 0 )
 	{
 		Debug.write(" expanding: " + key);
 		$(key + '_controls').appear();
diff --git a/upload/public/js/ips.embedded.js b/upload/public/js/ips.embedded.js
new file mode 100644
index 00000000..d99d3640
--- /dev/null
+++ b/upload/public/js/ips.embedded.js
@@ -0,0 +1,120 @@
+/**
+ * Embed IP.Board via iFrame
+ * Using old school JS, none of your fancy stuffs!
+ *
+ * (c) 2011 Invision Power Services, Inc.
+ * By Matt Mecham
+ */
+
+var _idx = window.IPBoard;
+
+_idx.prototype.embedded = {
+	curHeight: null,
+	remoteMsg: null,
+	inFrame:   ( top !== self ) ? true : false,
+	ajaxIsLoading: null,
+	
+	init: function()
+	{
+		if ( this.inFrame )
+		{
+			/* We need to do two things: set up a setLocation and setMessage functions
+			 * if we have everything > IE7 this is easy, see...
+			 * So lets pretent IE7 does NOT exist.
+			 */
+			if ( 'postMessage' in parent )
+			{
+				this.setMessage = function( message, target )
+				{
+					Debug.write("SENDING msg: " + message + " to " + target );
+					return parent.postMessage( message, target );
+				};
+				
+				this.setLocation = function( newLocation )
+				{
+					Debug.write( "Setting location to " + newLocation );
+					parent.window.frames[0].location.replace( newLocation );
+				};
+				
+				this.setHeight = function()
+				{
+			    	var newHeight = document.body.offsetHeight;
+			    	
+			    	if ( newHeight != this.curHeight )
+			    	{
+			            this.curHeight = newHeight;
+			            
+			            this.setMessage('height:' + this.curHeight, '*');
+			    	}
+				};
+				
+				this.checkAjaxStatus = function()
+				{
+					if ( $('ajax_loading') )
+					{
+						if ( $('ajax_loading').visible() )
+						{
+							this.ajaxIsLoading = true;
+							this.setMessage( 'ajaxLoading', '*' );
+						}
+						else if ( this.ajaxIsLoading && ! $('ajax_loading').visible() )
+						{
+							this.ajaxIsLoading = false;
+							this.setMessage( 'ajaxDone', '*' );
+						}
+					}
+				}
+				
+				this.aClicked = function( e, elem )
+				{
+					href   = elem.readAttribute('href');
+					rel    = '';
+					target = '';
+					
+					try
+					{
+						rel    = elem.readAttribute('rel');
+						target = elem.readAttribute('target');
+					} catch(e){}
+					
+					if ( ( href.substr(0, 4) == 'http' ) && rel != 'external' && target != '_blank' )
+					{
+						
+						/* One last check */
+						if ( ipb.vars['board_url'] == href.substr( 0, ipb.vars['board_url'].length ) )
+						{
+							Event.stop(e);
+							var path      = href.substr( ipb.vars['board_url'].length );
+							var hashIndex = path.indexOf('#');
+				            var hash      = '';
+				            
+				            if ( hashIndex > -1 )
+				            {
+				               hash = path.substr( hashIndex );
+				               path = path.substr( 0, hashIndex );
+				            }
+				            
+				            ipb.embedded.setMessage('location:' + path, '*');
+				            ipb.embedded.setLocation( ipb.vars['board_url'] + path + hash );
+						}
+					}
+					
+					return true;
+				};
+				
+				/* Intercept a links */
+				ipb.delegate.register( "a", this.aClicked );
+				
+				/* Routintely check height */
+				setInterval( this.setHeight.bindAsEventListener(this), 300 );
+				
+				/* And ajax status */
+				setInterval( this.checkAjaxStatus.bindAsEventListener(this), 300 );
+				
+				Event.observe( document, 'unload', function() { this.setMessage('unload', '*').bindAsEventListener(this); } );
+			}
+		}
+	}
+};
+
+ipb.embedded.init();
diff --git a/upload/public/js/ips.facebook.js b/upload/public/js/ips.facebook.js
deleted file mode 100644
index 05c3f0af..00000000
--- a/upload/public/js/ips.facebook.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.facebook.js - Facebook Connect code		*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Matt Mecham, Rikki Tissier			*/
-/************************************************/
-
-var _fb = window.IPBoard;
-
-_fb.prototype.facebook = {
-	api: '',
-	linkedMember: {},
-	mem_fb_uid: 0,
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		Debug.write("Initializing ips.facebook.js");
-		
-		//document.observe("dom:loaded", function(){
-			
-		//});
-	},
-	
-	/**
-	* Loads the URL to remove the app
-	*
-	*/
-	usercp_remove: function()
-	{
-		window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=members&area=facebookRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
-			}
-};
-
-ipb.facebook.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.forums.js b/upload/public/js/ips.forums.js
index c7d723cf..02ae2cec 100644
--- a/upload/public/js/ips.forums.js
+++ b/upload/public/js/ips.forums.js
@@ -12,9 +12,7 @@ var _forums = window.IPBoard;
 _forums.prototype.forums = {
 	totalChecked: 0,
 	showMod: [],
-	deletePerms: {},
-	deleteUrls: {},
-	deletePopUps: {},
+	fetchMore: {},
 	
 	init: function()
 	{
@@ -26,17 +24,9 @@ _forums.prototype.forums = {
 	},
 	initEvents: function()
 	{
-		// Find all moderation tools		
-		$$('ul.topic_moderation').each( function(mod){
-			ipb.forums.setUpModeration( mod );
-		});
-		
-		//$('forum_table').observe( 'mouseout', ipb.forums.hideAllModeration );
-		
-		if( $('show_filters') )
-		{
-			$('show_filters').observe('click', ipb.forums.toggleFilters );
-			$('filter_form').hide();
+		if( $('forum_load_more') ){
+			$('forum_load_more').observe('click', ipb.forums.loadMore);
+			$('more_topics').show();
 		}
 		
 		/* Set up mod checkboxes */
@@ -46,24 +36,54 @@ _forums.prototype.forums = {
 			$('tmod_all').observe( 'click', ipb.forums.checkAllTopics );
 		}
 		
-		$$('.topic_mod').each( function(check){
-			check.observe( 'click', ipb.forums.checkTopic );
-		} );
-		
-		if( $('showforumJump') )
+		if ( $("moderator_toggle") )
 		{
-			$('showforumJump').observe( "change", ipb.forums.jumpToForum );
-			$('forum_jump_submit').hide();
+			$("moderator_toggle").on( 'click', ipb.forums.openModPanel );
 		}
+		
+		ipb.delegate.register(".topic_mod", ipb.forums.checkTopic );
+		ipb.delegate.register(".t_rename", ipb.forums.topicRename );
 	},
 	
-	jumpToForum: function(e)
+	loadMore: function(e)
 	{
-		Event.stop(e);
+		Event.stop(e);		
+		if( !ipb.forums.fetchMore ){ return; }
+				
+		ipb.forums.fetchMore['st'] = parseInt(ipb.forums.fetchMore['st']) + parseInt(ipb.forums.fetchMore['max_topics']);
 		
-		$('forum_jump').submit();
-		
-		return false;
+		var url = ipb.vars['base_url'] + "app=forums&module=ajax&section=forums&do=getTopics&md5check="+ipb.vars['secure_hash'] + "&" + $H(ipb.forums.fetchMore).toQueryString();
+		Debug.write( url );
+		new Ajax.Request( url.replace(/&amp;/g, '&'),
+						{
+							method: 'get',
+							evalJSON: 'force',
+							onSuccess: function(t){
+								Debug.dir( t.responseJSON );
+								if( t.responseJSON['topics'] == '' )
+								{
+									$('forum_load_more').replace("<span class='desc lighter'>"+ipb.lang['no_more_topics']+"</span>");
+									return;
+								}
+								$$('tbody.dynamic_update').invoke("removeClassName", "dynamic_update");
+								var newtbody = new Element("tbody", {'class': 'dynamic_update'});
+								$('forum_table').select('tbody:last')[0].insert({ 'after': newtbody});
+								newtbody.update( t.responseJSON['topics'] );
+								$$('.pagination').invoke("replace", t.responseJSON['pages']);
+								
+								// Tooltips
+								$$("tbody.dynamic_update [data-tooltip]").invoke('tooltip');
+								
+								// General click handlers
+								$$("tbody.dynamic_update [data-clicklaunch]").invoke('clickLaunch');
+								
+								if( t.responseJSON['topics'] == '' || t.responseJSON['hasMore'] == false)
+								{
+									$('forum_load_more').replace("<span class='desc lighter'>"+ipb.lang['no_more_topics']+"</span>");
+									return;
+								}								
+							}
+						});
 	},
 	
 	submitModForm: function(e)
@@ -82,121 +102,8 @@ _forums.prototype.forums = {
 			}
 		}
 	},
-	
-	setUpModeration: function( mod )
-	{
-		cell = mod.up('td');
-		mod.hide();
-		mod.identify();
-		
-		$( cell ).observe('mouseover', ipb.forums.showModeration);
-		$( mod ).observe('mouseover', ipb.forums.moverModeration);
-		$( mod ).observe('mouseout', ipb.forums.moutModeration);
-		
-		$( mod ).observe('mouseover', function(e){
-			$(mod).setStyle( { 'cursor': 'pointer' } );
-			Event.stop(e);
-		});
-		$( mod ).observe('mouseout', function(e){
-			Event.stop(e);
-		});
-	},
-	
-	showModeration: function(e)
-	{
-		ipb.forums.hideAllModeration();
-		elem = Event.findElement(e, 'td');
-		
-		if( elem != document)
-		{
-			theUL = $( elem ).down('ul.topic_moderation');
-			theUL.show().setOpacity( 0.3 );
-			ipb.forums.showMod.push( theUL );
-			
-			if( theUL.down('.t_rename') ){ $( theUL.down('.t_rename') ).observe( 'click', ipb.forums.topicRename ); }
-			if( theUL.down('.t_delete') ){ $( theUL.down('.t_delete') ).observe( 'click', ipb.forums.topicDelete ); }
-		}
-		Event.stop(e);
-	},
-	
-	moverModeration: function(e)
-	{
-		elem = Event.element(e);
-		if( !elem.hasClassName('topic_moderation') )
-		{
-			elem = elem.up('.topic_moderation');
-		}
-		
-		if ( $$('.__topic') )
-		{
-			ipb.global.topicPreviewShowIcon(e);
-		}
-		
-		elem.setStyle( { 'cursor': 'pointer' } ).setOpacity(1); // Fix the cursor
-		//new Effect.Appear( $( elem ), {duration: 0.2} );
-	},
-	
-	moutModeration: function(e)
-	{
-		elem = Event.element(e);
-		if( !elem.hasClassName('topic_moderation') )
-		{
-			elem = elem.up('.topic_moderation');
-		}
-		
-		if ( $$('.__topic') )
-		{
-			ipb.global.topicPreviewHideIcon(e);
-		}
-		
-		elem.setOpacity( 0.3 );
-	},
-	
-	topicDelete: function(e)
-	{
-		/* Right then */
-		if ( ipb.forums.deletePerms['canDelete'] && ! ipb.forums.deletePerms['canSoftDelete'] )
-		{
-			/* Do the usual, sir */
-			if( !confirm( ipb.lang['delete_topic_confirm'] ) )
-			{
-				Event.stop(e);
-			}
-		}
-		else
-		{
-			Event.stop(e);
-			elem = Event.element(e);
-			
-			var topicid = elem.up().id.replace( /t_deletelink_/, '' );
-			
-			if( !topicid ){ return; }
-			
-			/* First off, fix URLs */
-			var _url_delete = ipb.forums.deleteUrls['hardDelete'].evaluate( { 'tid': topicid } ).replace(/&amp;/g, '&')  + '&nr=1';
-			var _url_soft   = ipb.forums.deleteUrls['softDelete'].evaluate( { 'tid': topicid } ).replace(/&amp;/g, '&')  + '&nr=1';
-			var _permaShow  = '';
-			
-			/* Can we hard delete? */
-			if ( ! ipb.forums.deletePerms['canDelete'] )
-			{
-				_permaShow = 'display:none;';
-			}
-			
-			/* Create the pop-up */
-			var popid   = 'pop__delete_popup_' + topicid;
-			var content = new Template( $('delPopUp').innerHTML ).evaluate( { removeUrl: _url_soft, permaDelete: _permaShow, permaUrl: _url_delete } );
-			
-			ipb.forums.deletePopUps = new ipb.Popup( popid, { type: 'balloon',
-															 initial: content,
-															 stem: true,
-															 hideAtStart: false,
-															 attach: { target: $('tid-link-' + topicid ), position: 'auto' },
-															 w: '450px' });
-		}
-	},
-	
-	topicRename: function(e)
+
+	topicRename: function(e, elem)
 	{
 		if( DISABLE_AJAX ){
 			return false;
@@ -205,7 +112,7 @@ _forums.prototype.forums = {
 		Event.stop(e);
 		
 		// We need to find the topic concerned
-		var link = Event.findElement(e, 'td').down('a.topic_title');
+		var link = $(elem).up('.__topic').down('a.topic_title');
 		if( $( link ).readAttribute('showingRename') == 'true' ){ return; }
 		
 		// Create elements
@@ -268,11 +175,6 @@ _forums.prototype.forums = {
 			tid = elem.up('tr').id.replace( 'trow_', '' );
 		} catch(err){ Debug.write( err ); return; }
 		
-		//$('tid-link-' + tid ).update( $F('tid-link-' + tid + '_input' ) );
-		//$('tid-link-' + tid + '_input').hide().remove();
-		//$('tid-link-' + tid + '_save').hide().remove();
-		//$('tid-link-' + tid).show();
-		
 		new Ajax.Request( ipb.vars['base_url'] + "app=forums&module=ajax&section=topics&do=saveTopicTitle&md5check="+ipb.vars['secure_hash']+'&tid='+tid,
 						{
 							method: 'post',
@@ -303,23 +205,11 @@ _forums.prototype.forums = {
 							}
 						});
 	},
-	
-	hideAllModeration: function()
-	{
-		//if( !ipb.forums.showMod || ipb.forums.showMod.length == 0 ){ return; }	
-		ipb.forums.showMod.invoke('hide');
-	},
-	
-	toggleFilters: function(e)
-	{
-		if( $('filter_form') )
-		{
-			Effect.toggle( $('filter_form'), 'blind', {duration: 0.2} );
-			Effect.toggle( $('show_filters'), 'blind', {duration: 0.2} );
-		}
-	},
+
 	preCheckTopics: function()
-	{
+	{	
+		if( !$('selectedtids') ){ return; }
+		
 		topics = $F('selectedtids').split(',');
 		
 		if( topics )
@@ -376,6 +266,7 @@ _forums.prototype.forums = {
 		$('selectedtids').value = selectedTopics;
 		
 		ipb.forums.updateTopicModButton();
+		ipb.forums.openModPanel();
 	},
 	checkTopic: function(e)
 	{
@@ -399,7 +290,19 @@ _forums.prototype.forums = {
 		
 		$('selectedtids').value = selectedTopics;
 
-		ipb.forums.updateTopicModButton();		
+		ipb.forums.updateTopicModButton();
+		ipb.forums.openModPanel();
+	},
+	openModPanel: function( e )
+	{
+		if( e ){
+			Event.stop(e);
+		}
+		
+		if( $('topic_mod') && $('moderator_toggle') && ! $('topic_mod').visible() ){
+			$('moderator_toggle').up('li').hide();
+			new Effect.BlindDown( $('topic_mod'), { duration: 0.3 } );
+		}
 	},
 	updateTopicModButton: function( )
 	{
@@ -419,6 +322,12 @@ _forums.prototype.forums = {
 				} else {
 					$('mod_submit').disabled = false;
 				}
+				
+				/* Make sure it can't say -1 */
+				if( ipb.forums.totalChecked < 1 )
+				{
+					ipb.forums.totalChecked	= 0;
+				}
 			
 				$('mod_submit').value = ipb.lang['with_selected'].replace('{num}', ipb.forums.totalChecked);
 			}
@@ -440,7 +349,7 @@ _forums.prototype.forums = {
 		}
 		
 		url = ipb.vars['base_url'] + "&app=forums&module=ajax&secure_key=" + ipb.vars['secure_hash'] + '&section=stats&do=who&t=' + tid;
-		popup = new ipb.Popup( 'whoPosted', { type: 'pane', modal: false, w: '500px', h: '400px', ajaxURL: url, hideAtStart: false, close: 'a[rel="close"]' } );
+		popup = new ipb.Popup( 'whoPosted', { type: 'pane', modal: false, w: '500px', h: 400, ajaxURL: url, hideAtStart: false, close: 'a[rel="close"]' } );
 		return false;
 	}
 };
diff --git a/upload/public/js/ips.hooks.js b/upload/public/js/ips.hooks.js
deleted file mode 100644
index dc3d62e4..00000000
--- a/upload/public/js/ips.hooks.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.forums.js - Forum view code				*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-var _hooks = window.IPBoard;
-
-_hooks.prototype.hooks = {
-	activeTab: 'forums',
-
-	init: function()
-	{
-		Debug.write("Initializing ips.hooks.js");
-		
-		document.observe("dom:loaded", function(){
-			ipb.hooks.initEvents();
-		});
-	},
-
-	initEvents: function()
-	{
-		ipb.global.initTabs();
-		
-		if( $('more-watched-forums') )
-		{
-			$('more-watched-forums').observe('click', ipb.hooks.toggleWatchedForums );
-		}
-		
-		if( $('more-watched-topics') )
-		{
-			$('more-watched-topics').observe('click', ipb.hooks.toggleWatchedTopics );
-		}
-	},
-	
-	toggleWatchedForums: function(e)
-	{
-		Event.stop(e);
-		
-		$('more-watched-forums-container').toggle();
-	},
-	
-	toggleWatchedTopics: function(e)
-	{
-		Event.stop(e);
-		
-		$('more-watched-topics-container').toggle();
-	}
-};
-
-ipb.hooks.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.hovercard.js b/upload/public/js/ips.hovercard.js
index a2d03887..0ab29173 100644
--- a/upload/public/js/ips.hovercard.js
+++ b/upload/public/js/ips.hovercard.js
@@ -88,6 +88,7 @@ IPBoard.prototype.hoverCard = Class.create( {
 										position: 		 'bottomLeft',
 										w:    			 '500px',
 										openOnClick:	 false,
+										openOnHover:	 true,
 										ajaxUrl:		 false,
 										delay:			 800,
 										ajaxCacheExpire: 0,
@@ -125,14 +126,18 @@ IPBoard.prototype.hoverCard = Class.create( {
 					$( elem.id ).down('a').writeAttribute( 'title', '' );
 				}
 				
-				$( elem.id ).down('img').writeAttribute( 'title', '' );
-				$( elem.id ).down('img').writeAttribute( 'alt', '' );
+				if( $( elem.id ).down('img') )
+				{
+					$( elem.id ).down('img').writeAttribute( 'title', '' );
+					$( elem.id ).down('img').writeAttribute( 'alt', '' );
+				}
 			}
 			catch (aBall){}
 			
-			$( elem.id ).observe( 'click'    , _hc.mClick.bindAsEventListener( _hc, elem.id ) );
-			$( elem.id ).observe( 'mouseover', _hc.mOver.bindAsEventListener( _hc, elem.id ) );
-			$( elem.id ).observe( 'mouseout' , _hc.mOut.bindAsEventListener( _hc, elem.id ) );
+			$( elem.id ).observe( 'contextmenu' , _hc.mContext.bindAsEventListener( _hc, elem.id ) );
+			$( elem.id ).observe( 'click'       , _hc.mClick.bindAsEventListener( _hc, elem.id ) );
+			$( elem.id ).observe( 'mouseover'   , _hc.mOver.bindAsEventListener( _hc, elem.id ) );
+			$( elem.id ).observe( 'mouseout'    , _hc.mOut.bindAsEventListener( _hc, elem.id ) );
 		} );
 	},
 	
@@ -141,7 +146,11 @@ IPBoard.prototype.hoverCard = Class.create( {
 	 */
 	mMove: function(e)
 	{
-		this.curEvent = e;
+		/* IE loses reference to event, so we need to copy it instead of use original reference */
+		var _newEvent	= {};
+		for( var i in e ) { _newEvent[i] = e[i]; }
+		
+		this.curEvent = _newEvent;
 	},
 	
 	/**
@@ -153,6 +162,31 @@ IPBoard.prototype.hoverCard = Class.create( {
 		{
 			this.close(id);
 		}
+		else
+		{
+			
+			if ( $(id).tagName.toLowerCase() == 'input' && $(id).type.toLowerCase() == 'checkbox' )
+			{
+				/* If this is a checkbox, and we're choosing to show on click then we probably only
+				 * want to show the card if we're clicking 'true'
+				 */
+				
+				if ( $(id).checked !== true )
+				{
+					return true;
+				}
+			}
+			
+			this.show(id);
+		}
+	},
+	
+	/**
+	 * ITEM Context menu
+	 */
+	mContext: function(e, id)
+	{
+		this.close(id);
 	},
 	
 	/**
@@ -167,6 +201,11 @@ IPBoard.prototype.hoverCard = Class.create( {
 			return false;
 		}
 		
+		if ( this.options.openOnHover !== true )
+		{
+			return false;
+		}
+		
 		this.debugWrite( "mover - setting time OVER " + id );
 		
 		if ( ! Object.isUndefined( this.timer[id + '_out'] ) )
@@ -237,7 +276,7 @@ IPBoard.prototype.hoverCard = Class.create( {
 		
 		if ( this.options.ajaxUrl )
 		{
-			content = "<div class='general_box pad' style='height: 20px; text-align:center'><img src='" + ipb.vars['loading_img'] + "' alt='' /></div>";
+			content = "<div class='general_box pad' style='height: 130px; padding-top: 130px; text-align:center'><img src='" + ipb.vars['loading_img'] + "' alt='' /></div>";
 		}
 		else
 		{
@@ -270,8 +309,12 @@ IPBoard.prototype.hoverCard = Class.create( {
 		
 		/* Pop up class dominates the mouseover class */
 		Event.stopObserving( $( id ), 'mouseout' );
-
-		$( id ).observe( 'mouseout' , this.mOut.bindAsEventListener( this, id ) );
+		Event.stopObserving( $( id ), 'contextmenu' );
+		Event.stopObserving( $( id ), 'click' );
+		
+		$( id ).observe( 'mouseout'    , this.mOut.bindAsEventListener( this, id ) );
+		$( id ).observe( 'contextmenu' , this.mContext.bindAsEventListener( this, id ) );
+		$( id ).observe( 'click'       , this.mClick.bindAsEventListener( this, id ) );
 		
 		if ( this.options.ajaxUrl )
 		{
@@ -425,7 +468,7 @@ IPBoard.prototype.hoverCard = Class.create( {
 		
 		if ( $( 'pu__' + id + '_stem').className.match( /top/ ) && ( aDims['height'] != bDims['height'] ) )
 		{
-			var _nt = bDims['top'] - ( aDims['height'] - bDims['height'] );
+			var _nt = bDims['top'] - ( aDims['height'] - bDims['height'] ) - 10;
 			
 			$( popup ).setStyle( { 'top': _nt + 'px' } );										
 		}		
@@ -446,12 +489,14 @@ IPBoard.prototype.hoverCard = Class.create( {
 	 */
 	overPopUp: function( id )
 	{
-		e = this.curEvent;
+		var myevent = this.curEvent;
+		
+		if( !id ){ return; }
 		
 		/* Moz chokes without try. */
 		try
 		{
-			if ( Event.element(e) && Event.element(e).descendantOf( $('pu__' + this.id + '_popup') ) )
+			if ( $(Event.findElement(myevent)) && $(Event.findElement(myevent)).descendantOf( $('pu__' + this.id + '_popup') ) )
 			{
 				this.debugWrite( "*** Over Pop Up ***" );
 				
diff --git a/upload/public/js/ips.idmportal.js b/upload/public/js/ips.idmportal.js
deleted file mode 100644
index 6bbb2c0e..00000000
--- a/upload/public/js/ips.idmportal.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.idmsubmit.js - File uploads		*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Brandon Farber						*/
-/* Original Author: Rikki Tissier				*/
-/* Largely based on ips.idmsubmit.js				*/
-/************************************************/
-/* -TRUE- MULTIPLE ATTACHMENTS!!!				*/
-/* -------------------------------------------- */
-
-var _idmportal = window.IPBoard;
-
-_idmportal.prototype.idmportal = {
-	
-	/*
-	 * Generic initialization function
-	 */
-	init: function()
-	{
-		Debug.write( "Initializing ips.idmportal.js" );
-		
-		// Menu toggle
-		ipb.delegate.register('.cat_toggle', ipb.idmportal.toggleCategory);
-	},
-	
-	toggleCategory: function(e, elem)
-	{
-		Event.stop(e);
-		
-		var group = $( elem ).up('li');
-		var subgroup = $( group ).down('.subforums');
-		
-		if( !$( group ) || !$( subgroup ) )
-		{
-			Debug.write("Can't find parent or subforums");
-			return;
-		}
-		
-		if( $( group ).hasClassName('closed') )
-		{
-			new Effect.BlindDown( $( subgroup ), { duration: 0.2 } );
-			$( group ).removeClassName('closed').addClassName('open');
-		}
-		else
-		{
-			new Effect.BlindUp( $( subgroup ), { duration: 0.2 } );
-			$( group ).removeClassName('open').addClassName('closed');
-		}
-		
-	},
-	
-	scroller: Class.create({
-		
-		initialize: function( id, total )
-		{
-			this.id = id;
-			this.total = total;
-			this.effect = Effect.Transitions.sinoidal;
-			this.current = 1;
-			
-			// Check for required elements
-			if( !$( this.id + '_wrap' ) || !$( this.id + '_l' ) || !$( this.id + '_r' ) )
-			{
-				Debug.error("Required element missing");
-				return false;
-			}
-			
-			// Set panel height
-			$( this.id + '_wrap' ).setStyle( 'height: ' + $( this.id + '_wrap' ).getHeight() + 'px' );
-			
-			// Set columns
-			var w = this.getPaneWidth();
-			$( this.id + '_' + this.current ).setStyle('position: absolute; width: ' + w + 'px;');
-			
-			if( w < 690 ){
-				$( this.id + '_wrap' ).removeClassName('three_column').addClassName('two_column');
-			} else {
-				$( this.id + '_wrap' ).addClassName('three_column').removeClassName('two_column');
-			}
-			
-			// Turn on the buttons
-			this.checkButtonDisable();	
-			
-			// Set events
-			$( this.id + '_l' ).observe( 'click', this.scrollLeft.bindAsEventListener(this) );
-			$( this.id + '_r' ).observe( 'click', this.scrollRight.bindAsEventListener(this) );
-			Event.observe( window, 'resize', this.windowResize.bindAsEventListener(this) );
-		},
-		
-		scrollLeft: function(e)
-		{
-			if( this.current != 1 )
-			{
-				var prev = $( this.id + '_' + (this.current - 1) );
-				var w = this.getPaneWidth();
-				var _t = this.current;
-				
-				$( prev ).setStyle('position: absolute; width: ' + w + 'px; left: ' + ( w * -1 ) + 'px;').show();
-				$( this.id + '_' + this.current ).setStyle('position: absolute; width: ' + w + 'px');
-				
-				new Effect.Parallel([
-					new Effect.Move( $( prev ), { x: 0, y: 0, mode: 'absolute' } ),
-					new Effect.Move( $( this.id + '_' + this.current ), { x: w, y: 0, mode: 'absolute' } )
-				], { duration: 1, transition: this.effect, afterFinish: function(){
-					$( this.id + '_' + _t ).hide();
-				}.bind(this) } );
-				
-				this.current = this.current - 1;
-			}
-			
-			this.checkButtonDisable();			
-			Event.stop(e);
-		},
-		
-		scrollRight: function(e)
-		{
-			if( this.current != this.total )
-			{	
-				var next = $( this.id + '_' + (this.current + 1) );
-				var w = this.getPaneWidth();
-				var _t = this.current;
-				
-				$( next ).setStyle('position: absolute; width: ' + w + 'px; left: ' + w + 'px').show();
-				$( this.id + '_' + this.current ).setStyle('position: absolute; width: ' + w + 'px;');
-
-				new Effect.Parallel([
-					new Effect.Move( $( next ), { x: 0, y: 0, mode: 'absolute' } ),
-					new Effect.Move( $( this.id + '_' + this.current ), { x: (w * -1), y: 0, mode: 'absolute' } )
-				], { duration: 1, transition: this.effect, afterFinish: function(){
-					$( this.id + '_' + _t ).hide();
-				}.bind(this) } );
-				
-				this.current = this.current + 1;
-			}
-			
-			this.checkButtonDisable();	
-			Event.stop(e);
-		},
-		
-		windowResize: function(e)
-		{
-			var w = this.getPaneWidth();
-			
-			if( w < 690 ){
-				$( this.id + '_wrap' ).removeClassName('three_column').addClassName('two_column');
-			} else {
-				$( this.id + '_wrap' ).addClassName('three_column').removeClassName('two_column');
-			}
-			
-			$( this.id + '_' + this.current ).setStyle('width: ' + w + 'px');
-		},
-		
-		getPaneWidth: function(e)
-		{
-			return $( this.id + '_wrap' ).getWidth();
-		},
-		
-		checkButtonDisable: function()
-		{
-			if( this.current == 1 ){
-				$( this.id + '_l' ).addClassName('disabled');
-				
-				if( this.total > 1 ){
-					$( this.id + '_r').removeClassName('disabled');
-				}
-			}
-			else if( this.current == this.total ){
-				$( this.id + '_r' ).addClassName('disabled');
-				
-				if( this.total > 1 ){
-					$( this.id + '_l').removeClassName('disabled');
-				}
-			}
-			else {
-				$( this.id + '_r' ).removeClassName('disabled');
-				$( this.id + '_l' ).removeClassName('disabled');
-			}	
-			
-		}
-	})	
-}
-
-ipb.idmportal.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.imagenotes.js b/upload/public/js/ips.imagenotes.js
deleted file mode 100644
index 1d86d708..00000000
--- a/upload/public/js/ips.imagenotes.js
+++ /dev/null
@@ -1,665 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.slideshow.js - Gallery image notes code	*/
-/* (c) IPS, Inc 2009							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-
-var _notes = window.IPBoard;
-
-_notes.prototype.imagenotes = Class.create({
-	
-	/* Image ID */
-	id: 0,
-	/* Notes already made */
-	notes: null,
-	/* Wrapper */
-	imageWrap: null,
-	/* Mouseover handlers */
-	mouseOvers: {},
-	/* Mouseover for image */
-	mainMouseover: null,
-	/* Are we dragging */
-	dragging: false,
-	/* Default sizing */
-	defaultSize: { 'width': 50, 'height': 50 },
-	/* Incrementor */
-	i: 0,
-	/* Resizer objects */
-	resizers: {},
-	/* Currently editing...*/
-	currentEdit: null,
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	initialize: function( image, notes, options )
-	{
-		Debug.write("Initializing ips.imagenotes.js");
-		if( !$( image ) ){ return; }
-		
-		this.id = $( image ).identify();
-		this.notes = notes;
-		this.options = Object.extend({
-			editable: false,
-			add_note: null
-		}, options || {} );
-		
-		this.initImage();
-	},
-	
-	/*------------------------------*/
-	/* Initialize image				*/
-	initImage: function()
-	{
-		if( !$( this.id ).complete )
-		{
-			this.initImage.bind( this ).delay( .2 );
-			return;
-		}
-		
-		var imageDims = $( this.id ).getDimensions();
-		
-		// Wrap the image
-		this.imageWrap = new Element( 'div', { id: this.id + '_wrap' } );
-		$( this.id ).wrap( this.imageWrap );
-		this.imageWrap.setStyle( { width: imageDims['width'] + 'px', height: imageDims['height'] + 'px' } ).addClassName('image_view_wrap');
-		this.imageWrap.setStyle( { background: "url(data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==)" } );
-		
-		// Build current notes
-		this.buildNotes();
-		
-		// Set events on image
-		$( this.imageWrap ).observe( 'mouseover', this.imageHover.bindAsEventListener( this ) );
-		$( this.imageWrap ).observe( 'mouseout', this.imageHoverOff.bindAsEventListener( this ) );
-		
-		// Add droppables if we can edit
-		if( this.options.editable ){
-			Droppables.add( this.id + '_wrap', { accept: 'note_wrap', containment: $( this.imageWrap ), onDrop: function(){ return false; }.bind(this) } );
-		}
-		
-		// Add note button
-		if( this.options.add_note ){
-			$( this.options.add_note ).observe('click', this.addNote.bindAsEventListener( this ));
-		}
-		
-		if ( $('notes_trigger') )
-		{
-			$('notes_trigger').setStyle( { cursor: 'pointer' } );
-			$('notes_trigger').observe( 'mouseover', this.imageHover.bindAsEventListener( this ) );
-			$('notes_trigger').observe( 'mouseout' , this.imageHoverOff.bindAsEventListener( this ) );
-		}
-		
-		// Set up body events
-		Event.observe( document.body, 'click', this.bodyClick.bindAsEventListener( this ) );
-		
-	},
-	
-	/*------------------------------*/
-	addNote: function( e )
-	{
-		Event.stop(e);
-		
-		if( this.currentEdit ){
-			return;
-		}
-		
-		ipb.menus.closeAll(e);
-		
-		this.i++;
-		
-		/* Cancel lightbox */
-		this._cancelLightbox();
-		
-		var wrapDims = $( this.imageWrap ).getDimensions();
-		
-		this.buildNote( this.id + '_new_' + this.i, { 	content: '',
-		 												width: this.defaultSize['width'], height: this.defaultSize['height'],
-														top: Math.ceil( wrapDims['height'] / 2 ), left: Math.ceil( wrapDims['width'] / 2 )
-													});
-													
-		// Show notes even if not mousing over
-		this.imageHover( e, function(){ 
-			this.noteSelect( e, this.id + '_new_' + this.i );
-		}.bind(this) );
-				
-	},
-	
-	/*------------------------------*/
-	/* image mouseover				*/
-	imageHover: function( e, afterFinish )
-	{
-		clearTimeout( this.mainMouseover );
-		
-		this.mainMouseover = setTimeout( function(){
-			$( this.imageWrap ).select('.note_wrap').each( function(item){
-				new Effect.Appear( $( item ), { duration: 0.2, afterFinish: afterFinish || null } );
-			});
-		}.bind(this), 300 );		
-	},
-	
-	/*------------------------------*/
-	/* image mouseoff				*/
-	imageHoverOff: function( e )
-	{
-		clearTimeout( this.mainMouseover );
-		
-		this.mainMouseover = setTimeout( function(){
-			$( this.imageWrap ).select('.note_wrap').each( function(item){
-				if( $( item ).readAttribute('editing') != 'yes' ){
-					new Effect.Fade( $( item ), { duration: 0.2 } );
-				}
-			});
-		}.bind( this ), 1000 );
-	},
-	
-	/*------------------------------*/
-	/* Build existing notes			*/
-	buildNotes: function()
-	{
-		
-		this.notes.each( function( item ){
-			this.buildNote( this.id + '_' + item.key, item.value );						
-		}.bind(this) );
-	},
-	
-	/*------------------------------*/
-	/* Builds a note				*/
-	buildNote: function( id, info )
-	{
-		/* Info should contain:
-		 * { content, left, top, width, height }
-		 */
-		
-		var note = noteTemplate.evaluate( { id: id, text: info['content'] } );
-		$( this.id + '_wrap' ).insert( note );
-		
-		/* IE won't recognize mouseover unless there's some kind of fill inside,
-		 * so we'll set a very transparent background on it */
-		if( Prototype.Browser.IE ){
-			$( 'note_fill_' + id ).setStyle('background: #fff; opacity: 0.01');
-		} 
-		
-		// Set the size
-		$('note_' + id ).setStyle( { left: info['left'] + 'px', top: info['top'] + 'px' } ).hide();
-		$('note_box_' + id ).setStyle( { width: info['width'] + 'px', height: info['height'] + 'px' } );
-		
-		// Set event
-		$( 'note_box_' + id ).observe('mouseover', this.noteHover.bindAsEventListener( this, id ));
-		$( 'note_box_' + id ).observe('mouseout', this.noteHoverOff.bindAsEventListener( this, id ));
-		
-		if( this.options.editable ){
-			$( 'note_' + id ).addClassName('editable');
-			$( 'note_box_' + id ).observe('click', this.noteSelect.bindAsEventListener( this, id ) );
-			
-			// Add draggable
-			new Draggable( $('note_' + id), { 
-				revert: 'failure',
-				onDrag: function(){
-					$('note_' + id ).addClassName('selected');
-					$('note_text_' + id ).hide();
-					this.dragging = true;
-				}.bind(this),
-				onEnd: function(){
-					this.updateCoords( id );					
-				}.bind(this)
-			});
-			
-			this.resizers[ id ] = new ipb.resizer( 
-				$('note_box_' + id ),
-				$('note_handle_' + id ),
-			 	{
-					onStart: function(drag){
-						$('note_' + id ).addClassName('selected');
-						$('note_text_' + id ).hide();
-						this.dragging = true;
-					}.bind(this),
-					onFinish: function(drag){
-						this.updateCoords( id );	
-					}.bind(this)							
-				 }
-			);
-		}	
-		
-		Debug.write( id );	
-	},
-	
-	updateCoords: function( id )
-	{
-		var realID = id.replace( this.id + '_', '');
-		
-		if( !this.notes.get( realID ) ){ return; } // This is a new, unsaved note
-		
-		var containerPos = $('note_' + id).positionedOffset();
-		var boxSize = $('note_box_' + id).getDimensions();
-		var noteId = this.notes.get( realID )['noteId'];
-		var content = this.notes.get( realID )['content'];
-
-		new Ajax.Request( ipb.vars['base_url'] + "app=gallery&module=ajax&section=image&do=edit-note&secure_key="+ipb.vars['secure_hash']+'&img='+ipb.gallery.imageID,
-						{
-							method: 'post',
-							parameters: {
-								'top': containerPos['top'],
-								'left': containerPos['left'],
-								'width': boxSize['width'],
-								'height': boxSize['height'],
-								'note': content,
-								'noteId': noteId
-							},
-							onSuccess: function(t)
-							{
-								Debug.write( t.responseText );
-								
-								switch( t.responseText )
-								{
-									case 'ok':
-										this.notes.get( realID )['top'] = containerPos['top'];
-										this.notes.get( realID )['left'] = containerPos['left'];
-										this.notes.get( realID )['width'] = boxSize['width'];
-										this.notes.get( realID )['height'] = boxSize['height'];
-										
-										Debug.write("Width: " + boxSize['width']);
-										Debug.write("height: " + boxSize['height']);
-									break;
-									case 'nopermission':
-										alert( ipb.lang['note_no_permission_e'] );
-									break;
-									case 'missing_data':
-										alert( ipb.lang['required_data_missing'] );
-									break;
-								}
-							}.bind( this )
-						});
-		
-		setTimeout( function(){
-			if( $('note_' + id).readAttribute('editing') != 'yes' ){
-				$('note_' + id ).removeClassName('selected');
-			}
-			this.dragging = false;
-		}.bind(this), 200);
-		
-	},
-	
-	/*------------------------------*/
-	/* Note select					*/
-	noteSelect: function( e, id )
-	{
-		Event.stop( e );
-		
-		/* Cancel it */
-		this._cancelLightbox();
-		
-		if( this.dragging ){ return; }	
-		
-		$( 'note_' + id ).addClassName('selected');
-		
-		if( !this.currentEdit )
-		{
-			this.currentEdit = id;
-			
-			$( 'note_' + id ).writeAttribute('editing', 'yes');
-			$( 'note_text_' + id).hide();
-
-			var realID = id.replace( this.id + '_', '');
-		
-			if( realID.startsWith('new_') && Object.isUndefined( this.notes.get( realID ) ) ){
-				var content = '';
-			} else {
-				var content = this.notes.get( realID )['content'];
-			}
-		
-			var noteForm = editTemplate.evaluate({ id: id, content: content });
-			$( 'note_' + id ).insert( noteForm );		
-			$('note_content_' + id).activate();
-			
-			if( realID.startsWith('new_') && Object.isUndefined( this.notes.get( realID ) ) ){
-				$('note_cancel_' + id).hide();
-			} else {
-				$('note_cancel_' + id).show();
-			}
-			
-			// Events
-			$( 'note_save_' + id ).observe( 'click', this.formSave.bindAsEventListener( this, id ) );
-			$( 'note_cancel_' + id ).observe( 'click', this.formCancel.bindAsEventListener( this, id ) );
-			$( 'note_delete_' + id ).observe( 'click', this.formDelete.bindAsEventListener( this, id ) );
-		}
-	},
-	
-	/*------------------------------*/
-	/* Save note					*/
-	formSave: function( e, id )
-	{
-		if( e ){ Event.stop(e); }
-		
-		if( $F('note_content_' + id).blank() ){
-			alert( ipb.lang['note_save_empty'] );
-			return;
-		}
-		
-		var realID = id.replace( this.id + '_', '');
-		var content = $F( 'note_content_' + id );
-		var newNote = false;
-		var containerPos = {};
-		var boxSize = {};
-		var type = '';
-		var noteId = null;
-		var done = false;
-		
-		// Is this a new note?
-		if( realID.startsWith('new_') && Object.isUndefined( this.notes.get( realID ) ) ){
-			containerPos = $('note_' + id).positionedOffset();
-			boxSize = $('note_box_' + id).getDimensions();
-			newNote = true;
-			type = 'add';	
-		} else {
-			containerPos = { 'left': this.notes.get( realID )['left'], 'top': this.notes.get( realID )['top'] };
-			boxSize = { 'width': this.notes.get( realID )['width'], 'height': this.notes.get( realID )['height'] };	
-			type = 'edit';
-			noteId = this.notes.get( realID )['noteId'];
-		}
-		
-		new Ajax.Request( ipb.vars['base_url'] + "app=gallery&module=ajax&section=image&do=" + type + "-note&secure_key="+ipb.vars['secure_hash']+'&img='+ipb.gallery.imageID,
-						{
-							method: 'post',
-							parameters: {
-								'top': containerPos['top'],
-								'left': containerPos['left'],
-								'width': boxSize['width'],
-								'height': boxSize['height'],
-								'note': content.encodeParam(),
-								'noteId': noteId
-							},
-							onSuccess: function(t)
-							{
-								Debug.write( t.responseText );
-								
-								/*** ADDING A NOTE ***/
-								if( type == 'add' )
-								{
-									if( t.responseText.startsWith('ok') )
-									{
-										noteId = t.responseText.replace('ok|', '');
-										this.notes.set( realID, {
-											'width': boxSize['width'],
-											'height': boxSize['height'],
-											'top': containerPos['top'],
-											'left': containerPos['left'],
-											'content': content,
-											'noteId': noteId
-										} );
-										done = true;
-									}
-									else
-									{
-										switch( t.responseText )
-										{			
-											case 'missing_data':
-												alert( ipb.lang['required_data_missing'] );
-											break;
-											case 'nopermission':
-												alert( ipb.lang['notes_no_permission_a'] );
-											break;
-											case 'max_notes_reached':
-												alert( ipb.lang['max_notes_reached'] );
-											break;
-										}
-									}
-								}
-								/*** EDITING A NOTE ***/
-								else
-								{
-									switch( t.responseText )
-									{
-										case 'ok':
-											this.notes.get( realID )['content'] = content;
-											done = true;											
-										break;
-										case 'missing_data':
-											alert( ipb.lang['required_data_missing'] );
-										break;
-										case 'nopermission':
-											alert( ipb.lang['notes_no_permission_e'] );
-										break;
-									}
-								}
-								
-								if( done ){
-									$('note_text_' + id).update( content );
-
-									this.finishEditing( id );
-
-									$('note_text_' + id).show();
-									this.noteHoverOff( null, id );
-								}					
-							}.bind(this)
-						});						
-		
-	},
-	
-	/*------------------------------*/
-	/* Cancel note					*/
-	formCancel: function( e, id )
-	{
-		if( e ){ Event.stop(e); }
-		this.finishEditing( id );		
-	},
-	
-	/*------------------------------*/
-	/* Delete note					*/
-	formDelete: function( e, id )
-	{
-		if( e ){ Event.stop(e); }
-		
-		if( confirm( ipb.lang['note_confirm_delete'] ) )
-		{
-			var realID = id.replace( this.id + '_', '');
-			
-			if( this.notes.get( realID ) )
-			{
-				new Ajax.Request( ipb.vars['base_url'] + "app=gallery&module=ajax&section=image&do=remove-note&secure_key="+ipb.vars['secure_hash']+'&img='+ipb.gallery.imageID,
-								{
-									method: 'post',
-									parameters: {
-										'noteId': this.notes.get( realID )['noteId']
-									},
-									onSuccess: function(t)
-									{
-										switch( t.responseText )
-										{
-											case 'ok':												
-												new Effect.Fade( $('note_' + id), { duration: 0.2, afterFinish: function(){
-														this.finishEditing( id );
-														$('note_' + id).remove();
-														this.notes.unset( realID );
-													}.bind( this )
-												});												
-											break;
-											case 'nopermission':
-												alert( ipb.lang['note_no_permission_d'] );
-											break;
-											case 'missing_data':
-												alert( ipb.lang['required_data_missing'] );
-											break;
-										}
-									}.bind( this )
-								});
-			}
-			else
-			{
-				new Effect.Fade( $('note_' + id), { duration: 0.2, afterFinish: function(){
-						this.finishEditing( id );
-						$('note_' + id).remove();
-					}.bind( this )
-				});
-			}				
-		}
-	},
-	
-	/*------------------------------*/
-	/* Completed editing			*/
-	finishEditing: function( id )
-	{
-		// Remove form
-		$( 'note_form_' + id ).remove();
-		$( 'note_' + id ).writeAttribute('editing', 'no').removeClassName('selected');
-		this.currentEdit = null;
-		
-		/* Restore lightbox */
-		this._restoreLightbox();
-	},
-	
-	/*------------------------------*/
-	/* Note mouseover				*/
-	noteHover: function(e, id)
-	{				
-		if( !this.dragging && $('note_' + id).readAttribute('editing') != 'yes' )
-		{
-			clearTimeout( this.mouseOvers[ id ] );
-		
-			this.mouseOvers[ id ] = setTimeout( function(){
-				new Effect.Appear( $( 'note_text_' + id ), { duration: 0.2 } );
-			}.bind( this ), 300 );
-		}
-	},
-	
-	/*------------------------------*/
-	/* Note mouseoff				*/
-	noteHoverOff: function(e, id)
-	{		
-		clearTimeout( this.mouseOvers[ id ] );
-		
-		if( $('note_text_' + id ).visible() )
-		{
-			this.mouseOvers[ id ] = setTimeout( function(){
-				new Effect.Fade( $( 'note_text_' + id ), { duration: 0.2 } );
-			}.bind( this ), 800 );
-		}
-	},
-	
-	/*------------------------------*/
-	/* Handles document click		*/
-	bodyClick: function( e )
-	{
-		// Get all notes inside the wrapper
-		$( this.imageWrap ).select('.note_wrap').each( function( elem ){
-			if( !Event.element(e).descendantOf( elem ) ){
-				if( $( elem ).readAttribute('editing') != 'yes' ){
-					$( elem ).removeClassName('selected');
-				}
-			}
-		});		
-	}
-	,
-	
-	/**
-	 * Cancel lightbox
-	 */
-	_cancelLightbox: function()
-	{
-		if ( $('ips_lightbox') )
-		{
-			$('ips_lightbox').writeAttribute('available', 'false');
-		}
-	},
-	
-	/**
-	 * Restore lightbox
-	 */
-	_restoreLightbox: function()
-	{
-		if ( $('ips_lightbox') )
-		{
-			$('ips_lightbox').writeAttribute('available', 'true');
-		}
-	}
-	
-});
-
-/************************************************/
-/* Element resizing class						*/
-/************************************************/
-var _resize = window.IPBoard;
-_resize.prototype.resizer = Class.create({
-	
-	container: null,
-	handler: null,
-	movePosition: {'x': 0, 'y': 0},
-	func: null,
-	
-	/*--------------------------*/
-	/* Constructor 				*/
-	initialize: function( container, handle, options )
-	{
-		if( !$( container ) || !$( handle ) ){
-			return false;
-		}
-		
-		this.container = $( container );
-		this.handle = $( handle );
-		this.options = Object.extend( {
-			onStart: null,
-			onFinish: null
-		}, options || {});
-		
-		new Draggable( $( this.handle ), { 
-			onStart: this.setUpResize.bindAsEventListener( this ),
-			change: this.mouseMoved.bindAsEventListener( this ),
-			onEnd: this.endResize.bindAsEventListener( this )
-		});
-		
-	},
-	
-	/*---------------------------*/
-	/* onStart event, gets sizes */			
-	setUpResize: function( draggable, e )
-	{
-		this.containerPos = $( this.container ).positionedOffset();	
-		this.handleSize = $( this.handle ).getDimensions();
-
-		$( this.container ).makePositioned();
-		$( this.handle ).makePositioned();
-		
-		// Set cursor
-		document.body.addClassName('resizing');
-		
-		if( Object.isFunction( this.options.onStart ) ){
-			this.options.onStart( draggable );
-		}
-	},
-	
-	/*--------------------------*/
-	/* Finish resizing			*/
-	endResize: function( draggable, e )
-	{
-		document.body.removeClassName('resizing');
-		
-		if( Object.isFunction( this.options.onFinish ) ){
-			this.options.onFinish( draggable );
-		}
-	},
-	
-	/*--------------------------*/
-	/* 'change' event			*/
-	mouseMoved: function( draggable, e )
-	{
-		// Get position
-		var pos = $( this.handle ).positionedOffset();
-	
-		var newWidth = ( pos['left'] - this.containerPos['left'] ) + this.handleSize['width'];
-		var newHeight = ( pos['top'] - this.containerPos['top'] ) + this.handleSize['height'];
-		
-		if( newWidth < 25 ){
-			newWidth = 25;
-			$( this.handle ).setStyle( { left: ( ( this.containerPos['left'] + 25 ) - this.handleSize['width'] ) + 'px' } );
-		}
-		
-		if( newHeight < 25 ){
-			newHeight = 25;
-			$( this.handle ).setStyle( { top: ( ( this.containerPos['top'] + 25 ) - this.handleSize['height'] ) + 'px' } );
-		}
-				
-		$( this.container ).setStyle( { width: newWidth + 'px', height: newHeight + 'px' } );		
-	}
-	
-});
\ No newline at end of file
diff --git a/upload/public/js/ips.inlineUploader.js b/upload/public/js/ips.inlineUploader.js
new file mode 100644
index 00000000..86fe49d5
--- /dev/null
+++ b/upload/public/js/ips.inlineUploader.js
@@ -0,0 +1,134 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* inlineUpload - Core javascript				*/
+/* (c) IPS, Inc 2011							*/
+/* -------------------------------------------- */
+/* Author: Matt "We're not jQueried Up" Mecham	*/
+/************************************************/
+
+var _inlineUploader = window.IPBoard;
+/**
+ * 
+ */
+_inlineUploader.prototype.inlineUploader = {
+	
+	formId: null,
+	fieldId: null,
+	callBack: null,
+	
+	/*------------------------------*/
+	/* Constructor 					*/
+	init: function()
+	{
+		Debug.write("Initializing ipb.inlineUploader.js");
+		
+		document.observe("dom:loaded", function(){
+		});
+	},
+	
+	/**
+	 * Set the inline uploader to watch a form/field
+	 * 
+	 * @param	string	ID of form element
+	 * @param	string	ID of input field element
+	 * @param	string	Function to pass AJAX back to when it has been gathered
+	 */
+	watch: function( formId, fieldId, callBack )
+	{
+		ipb.inlineUploader.formId   = formId;
+		ipb.inlineUploader.fieldId  = fieldId;
+		ipb.inlineUploader.callBack = callBack;
+		
+		if ( ! $( ipb.inlineUploader.formId ) )
+		{
+			Debug.error("formID doesn't exist");
+			return false;
+		}
+		
+		if ( ! $( ipb.inlineUploader.fieldId ) )
+		{
+			Debug.error("fieldID doesn't exist");
+			return false;
+		}
+		
+		/* Perform some set up */
+		$( ipb.inlineUploader.fieldId ).observe( 'change', ipb.inlineUploader.upload );
+	},
+	
+	/**
+	 * Upload has been triggered
+	 */
+	upload: function(e)
+	{
+		/* Disable form submit */
+		//$( ipb.inlineUploader.formId ).disable();
+		
+		/* Build target */
+		iFrame = new Element('iframe', { 'src': 'about:blank', 'style': 'background:transparent', 'name': 'ips_InlineUploader', 'id': 'ips_InlineUploader' } ).hide();
+		$( ipb.inlineUploader.formId ).insert( { after: iFrame } );
+		
+		$('ips_InlineUploader').observe( 'load', ipb.inlineUploader.complete );
+		
+		/* Add on a param so we know we're capturing JSON */
+		$( ipb.inlineUploader.formId ).action = $( ipb.inlineUploader.formId ).action + '&getJson=1'.replace( /&amp;/g, '&' );
+		
+		/* Submit form to iFrame then capture in complete */
+		$( ipb.inlineUploader.formId ).writeAttribute('target', 'ips_InlineUploader');
+		
+		var img = new Element( 'img', { 'id': 'ips_InlineUploader_img', 'src': ipb.vars['loading_img'] } );
+		
+		$( ipb.inlineUploader.fieldId ).insert( { before: img } );
+		$( ipb.inlineUploader.fieldId ).hide();
+		
+		$( ipb.inlineUploader.formId ).submit();
+	},
+	
+	/**
+	 * Upload complete. Hopefully
+	 *
+	 */
+	complete: function(e)
+	{
+		var iFrame = $('ips_InlineUploader');
+		var json   = iFrame.contentWindow.document.body.innerHTML.stripTags();
+		
+		if ( ! json )
+		{
+			return false;
+		}
+		
+		/* Reset */
+		ipb.inlineUploader.reset(e);
+		
+		/* Process JSON */
+		if ( json.isJSON() )
+		{
+			json = json.evalJSON();
+			Debug.dir( json );
+		}
+		else
+		{
+			Debug.error( "Not legal JSON\n" + json );
+		}
+		
+		/* pass it to the callback */
+		ipb.inlineUploader.callBack( json, e );
+	},
+	
+	/**
+	 * Resets form
+	 */
+	reset: function(e)
+	{
+		$( ipb.inlineUploader.formId ).enable();
+		$( ipb.inlineUploader.formId ).writeAttribute('target', '_self');
+		$( ipb.inlineUploader.formId ).stopObserving( 'submit' );
+		$( 'ips_InlineUploader_img' ).remove();
+		$( ipb.inlineUploader.fieldId ).show();
+		
+		setTimeout( function() { $('ips_InlineUploader').remove(); }, 500 );
+	}
+};
+	
+ipb.inlineUploader.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.like.js b/upload/public/js/ips.like.js
index dcdc0cd6..1935cdd5 100644
--- a/upload/public/js/ips.like.js
+++ b/upload/public/js/ips.like.js
@@ -43,7 +43,9 @@ _like.prototype.like = {
 	 */
 	resetEvents: function()
 	{
-		
+		if( ipb.like.wrap ){
+			ipb.like.wrap.select("[data-tooltip]").invoke("tooltip");
+		}
 	},
 	
 	/**
@@ -52,7 +54,7 @@ _like.prototype.like = {
 	clicked: function( e, elem )
 	{
 		Event.stop(e);
-		relem = elem.up('.ips_like');
+		relem = elem.up('.__like');
 		relem.identify();
 		
 		ipb.like.wrap = relem;
@@ -89,7 +91,7 @@ _like.prototype.like = {
 	more: function(e, elem)
 	{
 		Event.stop(e);
-		relem = elem.up('.ips_like');
+		relem = elem.up('.__like');
 		relem.identify();
 		
 		ipb.like.wrap = relem;
@@ -116,12 +118,14 @@ _like.prototype.like = {
 		Debug.write( _url );
 		
 		/* easy one this... */
-		ipb.like.popped = new ipb.Popup( popid, {  type: 'pane',
+		ipb.like.popped = new ipb.Popup( popid, {  type: 'balloon',
 														ajaxURL: _url,
-														stem: false,
+														stem: true,
 														hideAtStart: false,
-														h: '800px',
-														w: '450px' });		
+														hideClose: true,
+														attach: { target: elem, position: 'auto' },
+														h: 200,
+														w: '250px' });
 	},
 	
 	/**
@@ -235,6 +239,7 @@ _like.prototype.like = {
 		new Ajax.Request( _url,
 							{
 								method: 'get',
+								hideLoader: true,
 								onSuccess: function(t)
 								{
 									/* No Permission */
diff --git a/upload/public/js/ips.memberlist.js b/upload/public/js/ips.memberlist.js
index 5eab8a5f..04a11f70 100644
--- a/upload/public/js/ips.memberlist.js
+++ b/upload/public/js/ips.memberlist.js
@@ -22,13 +22,11 @@ _memberlist.prototype.mlist = {
 	},
 	initEvents: function()
 	{
-		if( $('use_filters') )
-		{
+		if( $('use_filters') ){
 			$('use_filters').observe( 'click', ipb.mlist.toggleFilters );
 		}
 		
-		if( $('close_filters') )
-		{
+		if( $('close_filters') ){
 			$('close_filters').observe( 'click', ipb.mlist.toggleFilters );
 		}
 		
@@ -54,6 +52,7 @@ _memberlist.prototype.mlist = {
 		Effect.toggle( $('member_filters'), 'blind', { duration: 0.4, afterFinish: function(e){
 			 	$('filters_1').addClassName('dummy'); $('filters_2').removeClassName('dummy'); // Forces a redraw
 		} } );
+		$('use_filters').toggle();
 		Event.stop(e);
 	}
 };
diff --git a/upload/public/js/ips.messenger.js b/upload/public/js/ips.messenger.js
index 6d941633..f963c56f 100644
--- a/upload/public/js/ips.messenger.js
+++ b/upload/public/js/ips.messenger.js
@@ -1,4 +1,4 @@
-/************************************************/
+/************************************************/
 /* IPB3 Javascript								*/
 /* -------------------------------------------- */
 /* ips.messenger.js - Messenger code			*/
@@ -7,13 +7,12 @@
 /* Author: Rikki Tissier						*/
 /************************************************/
 
-/* @TODO Lang Abstraction */
-
 var _msg = window.IPBoard;
 
 _msg.prototype.messenger = {
 	folderTemplate: '',
 	inviteInit: false,
+	disabled: 0,
 	editShown: 0,
 	
 	/*------------------------------*/
@@ -83,10 +82,18 @@ _msg.prototype.messenger = {
 		// Delegate for delete post
 		ipb.delegate.register('.delete_post', ipb.messenger.deleteReply);
 		
-		// Resize images
-		$$('.post', '.poll').each( function(elem){
-			ipb.global.findImgs( $( elem ) );
-		});
+		// Messenger disabled?
+		if ( ipb.messenger.disabled )
+		{
+			new ipb.Popup( 'pmdisabled', { type: 'modal',
+														 initial: $('pmDisabled').innerHTML,
+														 stem: true,
+														 hideAtStart: false,
+														 modal: true,
+														 modalOpacity: 0.8,
+														 hideClose: true,
+														 w: '450px' });
+		}
 	},
 	
 	/* ------------------------------ */
@@ -124,7 +131,7 @@ _msg.prototype.messenger = {
 								{
 									if( Object.isUndefined( t.responseJSON ) )
 									{
-										alert("An error occurred");
+										alert( ipb.lang['error_occured'] );
 										return;
 									}
 									
@@ -134,10 +141,9 @@ _msg.prototype.messenger = {
 										return;
 									}
 									
-									if ( t.responseJSON['msg'] && $('email_convo_text_' + id ) )
+									if ( t.responseJSON['msg'] )
 									{
-										$('email_convo_text_' + id ).update( t.responseJSON['msg'] );
-										Effect.Pulsate( $('email_convo_text_' + id ) );
+										ipb.global.showInlineNotification( t.responseJSON['msg'].toString() );
 									}
 								}
 							}
@@ -265,7 +271,7 @@ _msg.prototype.messenger = {
 								{
 									if( Object.isUndefined( t.responseJSON ) )
 									{
-										alert("Ошибка!");
+										alert( ipb.lang['error_occured'] );
 										return;
 									}
 									
@@ -279,7 +285,8 @@ _msg.prototype.messenger = {
 									if( $('f_' + id).select('.total')[0] )
 									{
 										$('f_' + id).select('.total')[0].update('0');
-										new Effect.Highlight( $('f_' + id) );
+										//new Effect.Highlight( $('f_' + id) );
+										ipb.global.showInlineNotification( ipb.lang['folder_emptied'] );
 									}
 									
 									if( !Object.isUndefined( ipb.messenger.curFolder ) && ipb.messenger.curFolder == id )
@@ -341,9 +348,6 @@ _msg.prototype.messenger = {
 											case 'cannotDeleteUndeletable':
 												alert( ipb.lang['cant_delete_folder'] );
 												break;
-											case 'cannotDeleteHasMessages':
-												/* SKINNOTE: let this function delete messages too */
-												break;
 											default:
 												alert( t.responseJSON['error'] );
 												break;
@@ -562,9 +566,7 @@ _msg.prototype.messenger = {
 	deletePM: function ( e, tid )
 	{
 		Event.stop(e);
-		
-		//var topicID = e.id.replace( 'pm_delete_', '' );
-		
+
 		if ( confirm( ipb.lang['delete_pm_confirm'] ) !== true )
 		{
 			Event.stop(e);
@@ -701,6 +703,28 @@ _msg.prototype.messenger = {
 								
 								$('f_' + t.responseJSON['newID']).select('.f_empty')[0].observe('click', ipb.messenger.emptyFolder );
 								$('f_' + t.responseJSON['newID']).select('.f_delete')[0].observe('click', ipb.messenger.deleteFolder );
+								
+								if( ipb.messenger.editShown ){
+									var elem = $('f_' + t.responseJSON['newID']).select("a[rel='folder_name']")[0];
+									var parent = $( elem ).up('.folder');
+									if( !$( parent ) ){ return; }
+									if( $( parent ).hasClassName('protected') ){ return; }
+									
+									// Create new textbox
+									var textbox = new Element('input', { type: 'text', 'class': 'input_text', value: $( elem ).innerHTML, size: '10', id: $(parent).id + '_rename' });
+									var submit = new Element('input', { type: 'submit', 'class': 'input_submit add_folder', value: ipb.lang['save_folder'], id: $(parent).id + '_save'});
+									
+									$(parent).select(".total")[0].hide();
+									$(parent).select(".edit_folders")[0].show();
+
+									$( elem ).insert( { before: submit } );
+									$( submit ).insert( { before: textbox } );
+									$( elem ).hide();
+
+									$( submit ).observe( 'click', ipb.messenger.saveFolderName.bindAsEventListener( this, $( parent ).id ) );
+									$( textbox ).observe( 'keypress', ipb.messenger.checkNameSubmit.bindAsEventListener( this, $( parent ).id ) );
+
+								}
 							}
 						}
 					);
diff --git a/upload/public/js/ips.modcp.js b/upload/public/js/ips.modcp.js
new file mode 100644
index 00000000..524c548e
--- /dev/null
+++ b/upload/public/js/ips.modcp.js
@@ -0,0 +1,37 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* ips.modcp.js - Modcp code					*/
+/* (c) IPS, Inc 2008							*/
+/* -------------------------------------------- */
+/* Author: Brandon Farber						*/
+/************************************************/
+
+var _modcp = window.IPBoard;
+
+_modcp.prototype.modcp = {
+	
+	initialtext: '',
+	
+	init: function()
+	{
+		Debug.write("Initializing ips.modcp.js");
+		
+		document.observe("dom:loaded", function(){
+			if( $('memberlookup') )
+			{
+				$('memberlookup').observe( 'focus', function(e) {
+					if( $('memberlookup').value == ipb.modcp.initialtext )
+					{
+						$('memberlookup').value	= '';
+					}
+				});
+				
+				var url	= ipb.vars['base_url'] + 'secure_key=' + ipb.vars['secure_hash'] + '&app=core&module=ajax&section=modcp&do=getmembers&name=';
+				var ac	= new ipb.Autocomplete( $('memberlookup'), { multibox: false, url: url, goToUrl: true, templates: { wrap: ipb.templates['autocomplete_wrap'], item: ipb.templates['autocomplete_item'] } } );
+			}
+		});
+	}
+};
+
+ipb.modcp.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.nexus.js b/upload/public/js/ips.nexus.js
deleted file mode 100644
index 02ffaf04..00000000
--- a/upload/public/js/ips.nexus.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.nexus.js - Javascript for nexus frontend	*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
-/************************************************/
-var _nexus = window.IPBoard;
-
-_nexus.prototype.nexus = {
-	currentTab: '',
-	
-	init: function()
-	{
-		document.observe("dom:loaded", function(){
-			ipb.delegate.register(".tab", ipb.nexus.toggleTab);
-		});
-		
-	},
-	
-	toggleTab: function( e, elem )
-	{
-		Event.stop(e);
-		var id = $( elem ).id.replace('t_', '');
-		Debug.write( id );
-		if( ipb.nexus.currentTab == id || !$('t_pane_' + id) ){ return; }
-		
-		$('t_pane_' + ipb.nexus.currentTab).hide();
-		$('t_pane_' + id).show();
-		
-		$( 't_' + ipb.nexus.currentTab ).removeClassName('active');
-		$( 't_' + id ).addClassName('active');
-		
-		ipb.nexus.currentTab = id;
-	},
-	
-	setUpAltContacts: function()
-	{
-		// Autocomplete
-		new ipb.Autocomplete( $('name'), { multibox: false, url: ipb.vars['base_url'] + 'app=core&module=ajax&section=findnames&do=get-member-names&secure_key=' + ipb.vars['secure_hash'] + '&name=', templates: { wrap: ipb.templates['autocomplete_wrap'], item: ipb.templates['autocomplete_item'] } } );
-		
-		$('add_new_contact').hide();
-		
-		$('add_new_toggle').observe('click', function(e){
-			Event.stop(e);
-			new Effect.BlindDown( $('add_new_contact'), { duration: 0.3 } );
-			$('add_new_toggle').hide();
-		});	 
-	},
-	
-	setUpReferrals: function()
-	{
-		$('refer_code_html').observe('focus', function(){ this.select(); });
-		$('refer_code_bbcode').observe('focus', function(){ this.select(); });
-	}	
-};
-
-ipb.nexus.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.photoEditor.js b/upload/public/js/ips.photoEditor.js
new file mode 100644
index 00000000..b25797da
--- /dev/null
+++ b/upload/public/js/ips.photoEditor.js
@@ -0,0 +1,466 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* ips.photoEditor.js				*/
+/* (c) IPS, Inc 2011							*/
+/* -------------------------------------------- */
+/* Author: Matt Mecham						*/
+/************************************************/
+
+/**
+* Returns the value of the selected radio button in the radio group, null if
+* none are selected, and false if the button group doesn't exist
+* @link  http://xavisys.com/using-prototype-javascript-to-get-the-value-of-a-radio-group/
+*
+* @param {radio Object} or {radio id} el
+* OR
+* @param {form Object} or {form id} el
+* @param {radio group name} radioGroup
+*/
+function $RF(el, radioGroup) {
+    if($(el).type && $(el).type.toLowerCase() == 'radio') {
+        var radioGroup = $(el).name;
+        var el = $(el).form;
+    } else if ($(el).tagName.toLowerCase() != 'form') {
+        return false;
+    }
+
+    var checked = $(el).getInputs('radio', radioGroup).find(
+        function(re) {return re.checked;}
+    );
+    return (checked) ? $F(checked) : null;
+}
+
+var _photoEditor = window.IPBoard;
+
+_photoEditor.prototype.photoEditor = {
+	cropPhoto: { 'cropper': false },
+		
+	init: function()
+	{
+		Debug.write("Initializing ips.photoEditor.js");
+		
+		/* inline loader loaded? */
+		if ( Object.isUndefined( ipb.inlineUploader ) )
+		{
+			Debug.write('not loaded');
+			setTimeout( ipb.photoEditor.init, 1000 );
+			return;
+		}
+		
+		/* Watch cropper init */
+		ipb.delegate.register('.cropperStart', ipb.photoEditor.photoCropStart );
+		
+		/* Activate ok/cancel linkies */
+		ipb.delegate.register('.cropperAccept', ipb.photoEditor.photoCropAccept );
+		ipb.delegate.register('.cropperCancel', ipb.photoEditor.photoCropCancel );
+		ipb.delegate.register('.ips_photoSubmit', ipb.photoEditor.photoDone );
+		ipb.delegate.register('.ips_photoRemove', ipb.photoEditor.photoRemove );
+		
+		/* Watch form */
+		ipb.inlineUploader.watch( 'photoEditorForm', 'upload_photo', ipb.photoEditor.photoUploaded );
+		
+		/* Watch for radio buttons */
+		new Array( 'upload_photo', 'gravatar', 'facebook', 'twitter' ).each( function(item)
+		{
+			if ( $(item ) )
+			{
+				$(item ).observe( 'click', ipb.photoEditor.rb );
+			}
+		} );
+		
+		if ( $('url_photo') )
+		{
+			$('url_photo').defaultize( ipb.lang['photo_editor_enterurl'] );
+			$('url_import').on( 'click', ipb.photoEditor.importUrl.bindAsEventListener(this) );
+		}
+	},
+	
+	/**
+	 * Import photie!
+	 */
+	importUrl: function( e )
+	{
+		/* fetch data */
+		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&section=photo&do=importUrl&secure_key=' + ipb.vars['secure_hash'];
+		Debug.write( _url );
+		
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								parameters: { 'url': $('url_photo').value },
+								onSuccess: function(t)
+								{										    	
+									/* Done! */
+									$('url_photo').value = '';
+									$('url_photo').defaultize( ipb.lang['photo_editor_enterurl'] );
+									
+									ipb.photoEditor.photoUploaded( t.responseJSON, e );									
+								}
+							}						
+						);	
+	},
+	
+	/**
+	 * Close pop up
+	 */
+	photoDone: function( e )
+	{
+		Event.stop(e);
+		
+		/* Still cropping? */
+		if ( ipb.photoEditor.cropPhoto['cropper'] !== false )
+		{
+			alert( ipb.lang['photo_editor_cropping_still'] );
+			return false;
+		}
+		
+		/* If we're not using custom, lets do some data mining */
+		if ( $('ips_ptype_custom').checked !== true )
+		{
+			var params = {};
+			
+			new Array( 'upload_photo', 'gravatar', 'facebook', 'twitter' ).each( function(item)
+			{
+				if ( $( 'ips_ptype_' + item ) && $( 'ips_ptype_' + item ).checked )
+				{
+					params['photoType'] = item;
+				}
+			} );
+			
+			/* Finish up */
+			params['gravatar'] = $F('gravatar');
+			
+			/* fetch data */
+			var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&section=photo&do=save&secure_key=' + ipb.vars['secure_hash'];
+			Debug.write( _url );
+			
+			new Ajax.Request( _url,
+								{
+									method: 'post',
+									evalJSON: 'force',
+									parameters: params,
+									onSuccess: function(t)
+									{										    	
+										/* No Permission */
+										if ( t.responseJSON && t.responseJSON['status'] == 'ok' )
+										{
+											ipb.photoEditor.updatePagePhotos( ipb.vars['member_id'], t.responseJSON['oldThumb'], t.responseJSON['thumb'], t.responseJSON['pp_main_photo'], [ t.responseJSON['pp_main_width'], t.responseJSON['pp_main_height'] ] );
+										}
+										
+										if ( ! Object.isUndefined( ipb.global.popups['photoEditor'] ) )
+										{
+											ipb.global.popups['photoEditor'].hide();
+										}
+									}
+								}						
+							);	
+			
+		}
+		else
+		{
+			if ( ! Object.isUndefined( ipb.global.popups['photoEditor'] ) )
+			{
+				ipb.global.popups['photoEditor'].hide();
+			}
+		}
+	},
+	
+	/**
+	 * Remove the photo
+	 * @param e
+	 */
+	photoRemove: function(e)
+	{
+		Event.stop(e);
+		
+		/* fetch data */
+		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&section=photo&do=remove&secure_key=' + ipb.vars['secure_hash'];		
+		Debug.write( _url );
+		
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{										    	
+									/* No Permission */
+									if ( t.responseJSON && t.responseJSON['status'] == 'deleted' )
+									{
+										ipb.photoEditor.updatePagePhotos( ipb.vars['member_id'], t.responseJSON['oldThumb'], t.responseJSON['thumb'], t.responseJSON['pp_main_photo'] );
+									}
+								}
+							}						
+						);	
+	},
+	
+	/**
+	 * Radio button changed
+	 * 
+	 */
+	rb: function(e)
+	{
+		elem = Event.findElement(e);
+		
+		switch ( elem.id )
+		{
+			case 'upload_photo':
+				$('ips_ptype_custom').checked = true;
+			break;
+			case 'gravatar':
+				$('ips_ptype_gravatar').checked = true;
+			break;
+			case 'facebook':
+				$('ips_ptype_facebook').checked = true;
+			break;
+			case 'twitter':
+				$('ips_ptype_twitter').checked = true;
+			break;
+		}
+	},
+	
+	/**
+	 * Init Cropper
+	 * 
+	 */
+	photoCropStart: function(e, elem)
+	{
+		var img    = $('ips_currentPhoto').down('img');
+		img.identify();
+		
+		/* Already cropping? */
+		if ( ipb.photoEditor.cropPhoto['cropper'] !== false )
+		{
+			return false;
+		}
+		
+		var height = parseInt( img.readAttribute('height') );
+		var width  = parseInt( img.readAttribute('width') );
+		var size   = height;
+		
+		if ( width < height )
+		{
+			size = width;
+		}
+		
+		/* Show ok/cancel */
+		$('ips_cropperStart').hide();
+		$('ips_cropperControls').show();
+		
+		/* Init cropper */
+		ipb.photoEditor.cropPhoto['cropper'] = new Cropper.Img(  img.id,  { ratioDim: { x: size, y: size }, 
+																	minWidth:  size,
+																	minHeight: size,
+																	maxWidth:  size,
+																	maxHeight: size,
+																	displayOnInit: true, 
+																	onEndCrop: ipb.photoEditor.photoOnEndCrop  } );
+		
+		
+	},
+	
+	/**
+	 * User lets go of cropper outline
+	 * @param coords
+	 * @param dimensions
+	 */
+	photoOnEndCrop: function( coords, dimensions )
+	{
+		ipb.photoEditor.cropPhoto['coords'] = coords;
+		ipb.photoEditor.cropPhoto['dims']   = dimensions;
+	},
+	
+	/**
+	 * Accept the cropping
+	 * @param e
+	 */
+	photoCropAccept: function(e)
+	{
+		/* fetch data */
+		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&section=photo&do=cropPhoto&secure_key=' + ipb.vars['secure_hash'];
+		Debug.write( _url );
+		
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								parameters: { x1: ipb.photoEditor.cropPhoto['coords'].x1,
+											  x2: ipb.photoEditor.cropPhoto['coords'].x2,
+											  y1: ipb.photoEditor.cropPhoto['coords'].y1,
+											  y2: ipb.photoEditor.cropPhoto['coords'].y2 },
+								onSuccess: function(t)
+								{										    	
+									/* No Permission */
+									if ( t.responseJSON && t.responseJSON['status'] == 'ok' )
+									{
+										/* Close down the pop-up */
+										ipb.photoEditor.photoCropCancel();
+										
+										ipb.photoEditor.updatePagePhotos( ipb.vars['member_id'], t.responseJSON['thumb'], t.responseJSON['thumb'], t.responseJSON['pp_main_photo'], [ t.responseJSON['pp_main_width'], t.responseJSON['pp_main_height'] ] );
+									}
+								}
+							}						
+						);	
+	},
+	
+	/**
+	 * Update photos on the page
+	 * @param oldThumb
+	 * @param newThumb
+	 * @param newFull
+	 */
+	updatePagePhotos: function( memberId, oldThumb, newThumb, newFull, newFullSize )
+	{
+		/* update images on the page */
+		$$('.ipsUserPhoto').each( function( elem )
+		{
+			try
+			{
+				if ( elem.readAttribute('id') != 'profile_photo' && elem.up('div').readAttribute('id') != 'ips_currentPhoto' && !elem.up('a').hasClassName('ipsUserPhotoLink') )
+				{
+					src  = elem.readAttribute('src');
+					rand = Math.round( Math.random() * 100000000 );
+					
+					if ( src == oldThumb )
+					{ 
+						elem.src    = newThumb + '?t=' + rand;
+						elem.width  = 50;
+						elem.height = 50;
+					}
+				}
+			} catch (err){}
+		} );
+		
+		/* update images on the page based on URL */
+		$$('.ipsUserPhotoLink').each( function( elem )
+		{
+			try
+			{
+				url  = elem.readAttribute('href');
+				
+				if ( url.match( new RegExp( "user/" + memberId + "-" ) ) )
+				{
+					img = elem.down('img');
+					src  = img.readAttribute('src');
+					rand = Math.round( Math.random() * 100000000 );
+					
+					if ( src.match( /-thumb/ ) )
+					{ 
+						img.src    = newThumb + '?t=' + rand;
+						img.width  = 50;
+						img.height = 50;
+					}
+					else
+					{
+						img.src    = newFull + '?t=' + rand;
+						img.width  = 50;
+						img.height = 50;
+					}
+				}
+			} catch (err){}
+		} );
+		
+		/* Update mini */
+		rand = Math.round( Math.random() * 100000000 );
+		$$('.ips_photoPreview._custom' ).first().down('img').writeAttribute( 'src', newThumb + '?t=' + rand );
+		$$('.ips_photoPreview._custom' ).first().down('img').writeAttribute( 'width', 100 );
+		$$('.ips_photoPreview._custom' ).first().down('img').writeAttribute( 'height', 100 );
+		
+		/* Update profile pic */
+		if ( $('ips_currentPhoto') )
+		{
+			$('ips_currentPhoto').down('img').writeAttribute( 'src', newFull + '?t=' + rand );
+			
+			if ( ! Object.isUndefined( newFullSize ) )
+			{
+				$('ips_currentPhoto').down('img').writeAttribute( 'width', newFullSize[0] );
+				$('ips_currentPhoto').down('img').writeAttribute( 'height', newFullSize[1] );
+			}
+			else
+			{
+				$('ips_currentPhoto').down('img').writeAttribute( 'width', 125 );
+				$('ips_currentPhoto').down('img').writeAttribute( 'height', 125 );
+			}
+		}
+		
+		if ( $('profile_photo') )
+		{
+			$('profile_photo').writeAttribute( 'src', newFull + '?t=' + rand );
+
+			if ( ! Object.isUndefined( newFullSize ) )
+			{
+				$('ips_currentPhoto').down('img').writeAttribute( 'width', newFullSize[0] );
+				$('ips_currentPhoto').down('img').writeAttribute( 'height', newFullSize[1] );
+			}
+			else
+			{
+				$('ips_currentPhoto').down('img').writeAttribute( 'width', 125 );
+				$('ips_currentPhoto').down('img').writeAttribute( 'height', 125 );
+			}
+		}
+	},
+	
+	/**
+	 * Cancel Cropper
+	 * 
+	 */
+	photoCropCancel: function(e, elem)
+	{
+		$('ips_cropperControls').hide();
+		$('ips_cropperStart').show();
+		ipb.photoEditor.cropPhoto['cropper'].remove();
+		
+		ipb.photoEditor.cropPhoto['cropper'] = false;
+	},
+	
+	/**
+	 * Used as a callback for the inlineuploader
+	 * @param json
+	 */
+	photoUploaded: function( json, e )
+	{
+		if ( Object.isUndefined( json['error'] ) )
+		{
+			var fullSize;
+			var thumbSize;
+			var rand = Math.round( Math.random() * 100000000 );
+			
+			if ( json['pp_main_photo'] )
+			{
+				if ( json['pp_main_photo'].match( /^http/ ) )
+				{
+					fullSize = json['pp_main_photo'] + '?t=' + rand;
+				}
+				else
+				{
+					fullSize = ipb.vars['upload_url'] + '/' + json['pp_main_photo'] + '?t=' + rand;
+				}
+				
+			}
+			
+			if ( json['pp_thumb_photo'] )
+			{
+				if ( json['pp_thumb_photo'].match( /^http/ ) )
+				{
+					thumbSize = json['pp_thumb_photo'] + '?t=' + rand;
+				}
+				else
+				{
+					thumbSize = ipb.vars['upload_url'] + '/' + json['pp_thumb_photo'] + '?t=' + rand;
+				}
+			}
+			
+			$('ips_type_custom_error').hide();
+			
+			ipb.photoEditor.updatePagePhotos( ipb.vars['member_id'], json['oldThumb'], thumbSize, fullSize, [ json['pp_main_width'], json['pp_main_height'] ] );
+		}
+		else
+		{
+			$('ips_type_custom_error').show();
+			$('ips_type_custom_error').update( json['error'] );
+		}
+	}
+};
+
+ipb.photoEditor.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.poll.js b/upload/public/js/ips.poll.js
index f133891e..53ecfc54 100644
--- a/upload/public/js/ips.poll.js
+++ b/upload/public/js/ips.poll.js
@@ -18,6 +18,7 @@ _poll.prototype.poll = {
 	_choices: $H(),
 	votes: $H(),
 	multi: $H(),
+	popup: false,
 	
 	effectDuration: 0.3,
 	
@@ -39,6 +40,19 @@ _poll.prototype.poll = {
 	*/
 	initPoll: function()
 	{
+		ipb.poll.popup = new ipb.Popup( 'poll_popup', {	type: 'pane',
+														initial: $('poll_wrap'),
+														modal: true,
+														hideAtStart: true,
+														hideClose: true,
+														defer: false,
+														w: '700px',
+														h: 300
+													 });
+													
+		//if( $('check_public_poll') ){ $('check_public_poll').tooltip(); }
+		//if( $('check_poll_only') ){ $('check_poll_only').tooltip(); }
+		
 		// Are there any questions so far?
 		if( ipb.poll.questions.size() > 0 )
 		{
@@ -71,6 +85,8 @@ _poll.prototype.poll = {
 				var html = ipb.templates['poll_question'].evaluate( { qid: qid, value: question } );
 				$( 'poll_container' ).insert( html );
 				
+				Debug.write( $('poll_container').innerHTML );
+				
 				// Allowing multiple choice?
 				if( ipb.poll.multi.get( qid ) == 1 ){
 					$('multi_' + qid).checked = true;
@@ -118,27 +134,17 @@ _poll.prototype.poll = {
 		ipb.poll.updateStatus();
 		
 		if( $('add_new_question') ){
-			$('add_new_question').observe('click', ipb.poll.addQuestion );
+			$('add_new_question').on('click', ipb.poll.addQuestion );
 		}
 		
-		// What should we show?
-		if( ipb.poll.showOnLoad ){
-			$('add_poll').hide();
-			$('poll_wrap').show();
-		} else {
-			$('poll_wrap').hide();
-			$('add_poll').show();
-		}
-		
-		$('add_poll').down('li').observe('click', ipb.poll.toggleForm);
+		$('add_poll').observe('click', ipb.poll.toggleForm);
 		$('close_poll').observe('click', ipb.poll.toggleForm);
 		
 		// We need to hook an event onto the form for this poll,
 		// so we can make sure they have entered enough choices
-		var form = $('poll_form').up('form');
+		var form = $('add_poll').up('form');
 		
-		if( !Object.isUndefined( form ) )
-		{
+		if( !Object.isUndefined( form ) ){
 			$( form ).observe('submit', ipb.poll.submitCheckPoll );
 		}
 	},
@@ -154,22 +160,41 @@ _poll.prototype.poll = {
 	{
 		var stop = false;
 			
-		if( ipb.poll._choices.size() > 1 )
+		if( ipb.poll._choices.size() > 0 )
 		{
 			ipb.poll._choices.each( function( q ){
 				if( q.value.size() < 2 ){
 					stop = true;
 					return;
 				}
+				
+				// Bug #31129 - check for filled values
+				var filled_values = q.value.select( function( c ){
+					if( $('poll_' + q.key + '_' + c.key) ){
+						return !$('poll_' + q.key + '_' + c.key).value.empty();
+					}
+				});
+				
+				if( filled_values.length < 2 ){
+					stop = true;
+					return;
+				}
 			});
 			
 			if( stop == true )
 			{
+				ipb.poll.popup.show();
 				alert( ipb.lang['poll_not_enough_choices'] );
 				Event.stop(e);
 				return false;
 			}
 		}
+		
+		// Move the popup contents back into the form
+		try {
+			$('poll_wrap').hide();
+			$('add_poll').insert({ after: $('poll_wrap') });
+		} catch(err){ }
 	},
 	
 	/* ------------------------------ */
@@ -197,25 +222,16 @@ _poll.prototype.poll = {
 	{
 		Event.stop(e);
 		
-		if( $('poll_wrap').visible() ){
-			$('add_poll').show();
-			
-			// No choices, so destroy poll
-			/*if( ipb.poll._choices.size() == 0 )
-			{
-				ipb.poll.destroyPoll( e );
-			}*/
+		if( ipb.poll.popup.getObj().visible() ){
+			ipb.poll.popup.hide();
 		} else {
-			$('add_poll').hide();
-			
 			// Add a default question
-			if( ipb.poll._choices.size() == 0 )
-			{
+			if( ipb.poll._choices.size() == 0 ){
 				ipb.poll.addQuestion( e, 1 );
 			}
+			
+			ipb.poll.popup.show();
 		}
-		
-		Effect.toggle( $('poll_wrap'), 'blind', { duration: ipb.poll.effectDuration } );
 	},
 	
 	/* ------------------------------ */
@@ -317,6 +333,7 @@ _poll.prototype.poll = {
 	*/
 	addQuestion: function(e, instant)
 	{
+		Debug.write("Here");
 		Event.stop(e);
 		
 		if( ipb.poll._choices.size() >= ipb.poll.maxQuestions ){
diff --git a/upload/public/js/ips.post.js b/upload/public/js/ips.post.js
index dc753c91..bc0812ae 100644
--- a/upload/public/js/ips.post.js
+++ b/upload/public/js/ips.post.js
@@ -24,7 +24,7 @@ _post.prototype.post = {
 		});
 	},
 	initEvents: function()
-	{
+	{		
 		// Form validation
 		if( $('postingform') ){
 			$('postingform').observe('submit', ipb.post.postFormSubmit);
@@ -52,19 +52,16 @@ _post.prototype.post = {
 		}
 		
 		if( $('post_preview' ) ){
-			// Resize images
-			ipb.global.findImgs( $( 'post_preview' ) );
 			ipb.post.externalizePreviewLinks( $('post_preview') );
 		}
-		
-		// Image resizing for topic summary
-		if( $('topic_summary') ){
-			ipb.global.findImgs( $('topic_summary') );
-		}
 
 		if( $('review_topic') ){
 			$('review_topic').observe('click', ipb.global.openNewWindow.bindAsEventListener( this, $('review_topic'), 1 ) );
 		}
+		
+		if( $('topic_title') ){
+			$('topic_title').focus();
+		}
 	},
 	
 	// Bug #16805
diff --git a/upload/public/js/ips.profile.js b/upload/public/js/ips.profile.js
index 13fc755e..3227239d 100644
--- a/upload/public/js/ips.profile.js
+++ b/upload/public/js/ips.profile.js
@@ -13,6 +13,8 @@ _profile.prototype.profile = {
 	activeTab: '',
 	viewingProfile: 0,
 	customization: 0,
+	defaultComment: '',
+	statusInit: false,
 	
 	init: function()
 	{
@@ -35,18 +37,6 @@ _profile.prototype.profile = {
 	*/
 	initEvents: function()
 	{
-		if( $('comment_text') && $('char_remain') ){
-			$('comment_text').observe('keyup', ipb.profile.checkCommentLength);
-		}
-	
-		$$('.tab_toggle').each( function(elem){
-			$(elem).observe('click', ipb.profile.changeTabContent );
-		});
-	
-		if( $('commentForm') ){
-			$('commentForm').observe('submit', ipb.profile.saveComment );
-		}
-	
 		if( $('friend_toggle') ){
 			$('friend_toggle').observe('click', ipb.profile.toggleFriendStatus );
 		}
@@ -55,15 +45,90 @@ _profile.prototype.profile = {
 			$('dname_history').observe('click', ipb.profile.showDNameHistory );
 		}
 		
-		if( $('view-all-friends') )
-		{
+		if( $('view-all-friends') ){
 			$('view-all-friends').observe('click', ipb.profile.retrieveFriends );
 		}
 		
 		ipb.delegate.register('.delete_comment', ipb.profile.deleteComment );
+		ipb.delegate.register('.tab_toggle', ipb.profile.changeTabContent );
+		
 		/*ipb.delegate.register('.bbc_spoiler_show', ipb.global.toggleSpoiler);*/
 	},
 	
+	changeTabContent: function(e, elem)
+	{
+		Event.stop(e);
+		var id = elem.id.replace('tab_link_', '');
+		if( !id || id.blank() ){ return; }
+		
+		if( !$('pane_' + id) )
+		{
+			new Ajax.Request( ipb.vars['base_url'] + 'app=members&section=load&module=ajax&member_id=' + ipb.profile.viewingProfile + '&tab=' + id + '&md5check=' + ipb.vars['secure_hash'],
+							{
+								method: 'post',
+								onSuccess: function(t)
+								{
+									if( t.responseText == 'nopermission' )
+									{
+										alert( ipb.lang['no_permission'] );
+										return;
+									}
+									
+									if( t.responseText != 'error' )
+									{
+										var newdiv = new Element('div', { 'id': 'pane_' + id } ).hide().update( t.responseText );
+										$('profile_panes_wrap').insert( newdiv );
+										
+										ipb.profile.togglePanes( id );
+										
+										if( id == 'members:status' && !ipb.profile.statusInit ){
+											ipb.status.initEvents();
+											ipb.profile.statusInit = true;
+										}
+									}
+									else
+									{
+										alert( ipb.lang['action_failed'] );
+										return;
+									}
+								}
+							});
+		}
+		else
+		{
+			ipb.profile.togglePanes( id );
+		}
+		
+	},
+	
+	togglePanes: function( newid )
+	{
+		var currentID = $('profile_tabs').select(".active")[0].id.replace('tab_link_', '');
+		var currentPane = $('pane_' + currentID);
+		
+		var newPane = $('pane_' + newid);
+		
+		var curHeight = $(currentPane).measure('height');
+		var newHeight = $(newPane).measure('height');
+		
+		// Hide current one
+		$('profile_panes_wrap').setStyle( { height: curHeight + "px" } );
+		$( currentPane ).absolutize();
+		new Effect.Fade( $( currentPane ), { duration: 0.2 } );
+		
+		// Resize container
+		new Effect.Morph( $('profile_panes_wrap'), { style: 'height: ' + newHeight + 'px', duration: 0.2, afterFinish: function(){
+			new Effect.Appear( newPane, { duration: 0.2, afterFinish: function(){
+				ipb.profile.executeJavascript( $( newPane ) );
+				$('profile_panes_wrap').setStyle( { height: 'auto' } );
+				$( currentPane ).setStyle( { position: 'static', height: 'auto' } );
+			} } );
+		} } );
+		
+		$('profile_tabs').select(".tab_toggle").invoke("removeClassName", "active");
+		$('tab_link_' + newid).addClassName('active');
+	},
+	
 	/**
 	 * Resize and set BG image
 	 */
@@ -71,16 +136,10 @@ _profile.prototype.profile = {
 	{
 		var main = $('main_profile_body');
 		
-		$('userBg').setStyle( { 'height': main.getHeight() + 'px' } );
-
-	},
-	
-	deleteComment: function(e, elem)
-	{
-		if( !confirm( ipb.lang['delete_confirm'] ) )
+		if ( $('userBg') )
 		{
-			Event.stop(e);
-		}		
+			$('userBg').setStyle( { 'height': main.getHeight() + 'px' } );
+		}
 	},
 	
 	/* ------------------------------ */
@@ -199,159 +258,7 @@ _profile.prototype.profile = {
 							}
 						});
 	},
-										
-	saveComment: function(e)
-	{
-		if( DISABLE_AJAX )
-		{
-			return false;
-		}
-		
-		if( !$('comment_text') ){ Event.stop(e); return; }
-		
-		// Check for comment
-		if( $F('comment_text').blank() )
-		{
-			alert( ipb.lang['prof_comment_empty'] );
-			Event.stop(e);
-			return;
-		}
-		
-		if( $('comment_submit') )
-		{
-			$('comment_submit').disabled = true;
-		}
-		
-		// Check we have a comment list; if not, we'll do a proper submit
-		if( !$('comment_list') ){
-			return;
-		} else {
-			Event.stop(e);
-		}
-		
-		new Ajax.Request( ipb.vars['base_url'] + 'app=members&section=comments&module=ajax&do=add&member_id=' + ipb.profile.viewingProfile + '&md5check=' + ipb.vars['secure_hash'],
-						{
-							method: 'post',
-							parameters: {
-								'comment': $F('comment_text').encodeParam()
-							},
-							onSuccess: function(t)
-							{
-								if( $('comment_submit') )
-								{
-									$('comment_submit').disabled = false;
-								}
-								
-								//Check for errors
-								if( t.responseText == 'nopermission' )
-								{
-									alert( ipb.lang['prof_comment_perm'] );
-									return;
-								}
-								else if( t.responseText == 'error-no-comment' )
-								{
-									alert(ipb.lang['prof_comment_empty']);
-									return;
-								}
-								else if( t.responseText == 'error' )
-								{
-									alert(ipb.lang['action_failed']);
-									return;
-								}
-								else if( t.responseText == 'pp_comment_added_mod' )
-								{
-									alert( ipb.lang['prof_comment_mod'] );
-									return;
-								}
-								else
-								{
-									$('comment_innerwrap').update( t.responseText );
-									$('commentForm').reset();
-									$('comment_wrap').scrollTo();
-									
-									if( $('comment_list').select(':first-child')[0] )
-									{
-										new Effect.Highlight( $('comment_list').select(':first-child')[0], { startcolor: ipb.vars['highlight_color'], delay: 0.3 } );
-									}
-									
-									ipb.profile.checkCommentLength();
-								}
-							}
-						});
-	},
-								
-	changeTabContent: function(e)
-	{
-		Event.stop(e);
-		elem = Event.findElement(e, 'li');
-		if( !elem.hasClassName('tab_toggle') || !elem.id ){ return; }
-		id = elem.id.replace('tab_link_', '');
-		if( !id || id.blank() ){ return; }
-		if( !$('tab_content') ){ return; }
-		
-		if( ipb.profile.activeTab == id )
-		{
-			return;
-		}
-		
-		oldTab = ipb.profile.activeTab;
-		ipb.profile.activeTab = id;
-		
-		// OK, we should have an ID. Does it exist already?
-		
-		if( !$('tab_' + id ) )
-		{
-			new Ajax.Request( ipb.vars['base_url'] + 'app=members&section=load&module=ajax&member_id=' + ipb.profile.viewingProfile + '&tab=' + id + '&md5check=' + ipb.vars['secure_hash'],
-							{
-								method: 'post',
-								onSuccess: function(t)
-								{
-									if( t.responseText == 'nopermission' )
-									{
-										alert( ipb.lang['no_permission'] );
-										return;
-									}
-									
-									if( t.responseText != 'error' )
-									{
-										newdiv = new Element('div', { 'id': 'tab_' + id } ).hide();
-										newdiv.addClassName( 'tab_' + id.replace( ':', '_' ) );
-										
-										newdiv.update( t.responseText );
-										
-										$('tab_content').insert( newdiv );
-										
-										new Effect.Parallel( [
-											new Effect.BlindUp( $('tab_' + oldTab), { sync: true } ),
-											new Effect.BlindDown( $('tab_' + ipb.profile.activeTab), { sync: true } )
-										], { duration: 0.4, afterFinish: function(){ 	// Re-execute JS for various things in posts
-											ipb.profile.executeJavascript( $( newdiv ) ); } } );
-									}
-									else
-									{
-										alert( ipb.lang['action_failed'] );
-										return;
-									}
-								}
-							});
-		}
-		else
-		{
-			Debug.write( "Just showing " + ipb.profile.activeTab );
-			new Effect.Parallel( [
-				new Effect.BlindUp( $('tab_' + oldTab), { sync: true } ),
-				new Effect.BlindDown( $('tab_' + ipb.profile.activeTab), { sync: true } )
-			], { duration: 0.4, afterFinish: function(){ 	// Re-execute JS for various things in posts
-				ipb.profile.executeJavascript( $( 'tab_' + id ) ); } } );
-		}
-		
-		$$('.tab_toggle').each( function(otherelem){
-			$(otherelem).removeClassName('active');
-		});
-		
-		$(elem).addClassName('active');
-	},
-	
+											
 	/* ------------------------------ */
 	/**
 	 * Executes IPBs post handling JS for the topic/post tabs
@@ -360,29 +267,10 @@ _profile.prototype.profile = {
 	*/
 	executeJavascript: function( wrapper )
 	{
-		// Image resize
-		ipb.global.findImgs( wrapper );
-		
 		//Code highlighting
 		//dp.SyntaxHighlighter.HighlightAll('bbcode_code');
 		prettyPrint();
 		
-		/* if we have an opaque bg, make it fit */
-		$('userBg').setStyle( { 'height': $('main_profile_body').getHeight() + 'px' } );
-		
-	},
-		
-	checkCommentLength: function(e)
-	{
-		newTotal = parseInt( ipb.vars['max_comment_length'] ) - parseInt( $F('comment_text').length );
-		
-		if( newTotal < 0 )
-		{
-			$('comment_text').value = $F('comment_text').truncate( ipb.vars['max_comment_length'], '' );
-			newTotal = 0;
-		}
-		
-		$('char_remain').update( newTotal );
 	}
 };
 
diff --git a/upload/public/js/ips.quickpm.js b/upload/public/js/ips.quickpm.js
index 05f2a881..eb17f364 100644
--- a/upload/public/js/ips.quickpm.js
+++ b/upload/public/js/ips.quickpm.js
@@ -217,8 +217,7 @@ _quickpm.prototype.quickpm = {
 
 									Event.stop(e);
 									
-									/* SKINNOTE: Make pretty */
-									alert( ipb.lang['message_sent'] );
+									ipb.global.showInlineNotification( ipb.lang['message_sent'] );
 									return;
 								}
 								else
diff --git a/upload/public/js/ips.register.js b/upload/public/js/ips.register.js
index b3cf1f27..ba15b465 100644
--- a/upload/public/js/ips.register.js
+++ b/upload/public/js/ips.register.js
@@ -20,42 +20,75 @@ _register.prototype.register = {
 		Debug.write("Initializing ips.register.js");
 		
 		document.observe("dom:loaded", function(){
-			if( ipb.register.inSection == 'mainform' )
-			{
+			if( ipb.register.inSection == 'mainform' ){
 				ipb.register.initFormEvents();
 			}
 			
-			if( ipb.register.inSection == 'completeReg' )
-			{
+			if( ipb.register.inSection == 'completeReg' ){
 				ipb.register.initCompleteRegFormEvents();
 			}
+			
+			if( $('auto_time_offset') ){
+				ipb.register.detectTimezone();
+			}
 		});
 	},
 	
+	detectTimezone: function()
+	{
+		var rightNow = new Date();
+		var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
+		var temp = jan1.toGMTString();
+		var jan2 = new Date(temp.substring(0, temp.lastIndexOf(" ")-1));
+		var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
+		
+		if( $('auto_time_offset') ){
+			$('auto_time_offset').value = std_time_offset;
+		}
+		
+		if( $('auto_dst') ){
+			$('auto_dst').value = new Date().getDST();
+		}
+	},
+	
 	initCompleteRegFormEvents: function()
 	{
 		if( $('display_name') ){
 			$('display_name').observe('blur', ipb.register.checkLoginName);
 		}
-		if( $('email_1') && $('email_2') )
+		if( $('email_1') )
 		{
 			$('email_1').observe('blur', ipb.register.checkEmailValid);
-			$('email_2').observe('blur', ipb.register.checkEmailMatch);
 		}
 	},
 	
 	initFormEvents: function()
 	{
+		if( $('tou') && $('tou_link') )
+		{
+			ipb.register.touPopup = new ipb.Popup( 'reg_tou', { type: 'pane',
+																initial: ipb.templates['registration_terms'].evaluate( { 'content': $('tou').value } ),
+																stem: false,
+																hideAtStart: true,
+																modal: true,
+																w: '600px' 
+															});
+			$('tou').remove();
+			$('tou_link').observe('click', function(e){
+				Event.stop(e);
+				ipb.register.touPopup.show();
+			});
+		}
+		
 		if( $('login_name') ){
 			$('login_name').observe('blur', ipb.register.checkLoginName);
 		}
 		if( $('display_name') ){
 			$('display_name').observe('blur', ipb.register.checkLoginName);
 		}
-		if( $('email_1') && $('email_2') )
+		if( $('email_1')  )
 		{
 			$('email_1').observe('blur', ipb.register.checkEmailValid);
-			$('email_2').observe('blur', ipb.register.checkEmailMatch);
 		}
 		if( $('password_1') && $('password_2') )
 		{
@@ -132,20 +165,6 @@ _register.prototype.register = {
 								
 	},
 	
-	checkEmailMatch: function(e)
-	{
-		email1 = $('email_1');
-		email2 = $('email_2');
-		
-		if( $F( email1 ).toLowerCase() != $F( email2 ).toLowerCase() )
-		{
-			ipb.register.showMessage( $( email2 ), ipb.lang['email_doesnt_match'], 1 );
-			return;
-		}
-		
-		ipb.register.removeMessage( $('email_2') );
-	},
-	
 	checkLoginName: function(e)
 	{
 		elem = $( Event.element(e) );
@@ -184,24 +203,26 @@ _register.prototype.register = {
 							{
 								method: 'post',
 								parameters: {
-									name: escape( name ),
+									name: encodeURIComponent( name ),
 									secure_key: ipb.vars['secure_hash']
 								},
 								onSuccess: function(t)
 								{
-									if( t.responseText == 'found' )
+									var _t = t.responseText.replace( /\s/, '', 'g' );
+									
+									if( _t == 'found' )
 									{
 										ipb.register.showMessage( $(elem), ipb.lang['not_available'], 1 );
 										return;
 									}
-									else if( t.responseText == 'notfound' )
+									else if( _t == 'notfound' )
 									{
 										ipb.register.showMessage( $(elem), ipb.lang['available'], 0 );
 										return;
 									}
-									else if( t.responseText )
+									else if( _t )
 									{
-										ipb.register.showMessage( $(elem), t.responseText, 1 );
+										ipb.register.showMessage( $(elem), _t, 1 );
 										return;										
 									}
 									else
diff --git a/upload/public/js/ips.reports.js b/upload/public/js/ips.reports.js
index c514d21d..dd0584bf 100644
--- a/upload/public/js/ips.reports.js
+++ b/upload/public/js/ips.reports.js
@@ -10,6 +10,7 @@
 var _report = window.IPBoard;
 
 _report.prototype.reports = {
+	prunePopup: null,
 	
 	init: function()
 	{
@@ -64,13 +65,21 @@ _report.prototype.reports = {
 			} );
 			
 			ipb.delegate.register('.change-status', ipb.reports.changeStatus);
-		});
-		
-		Event.observe( window, 'load', function(){
-			// Resize images
-			$$('.post').each( function(elem){
-				ipb.global.findImgs( $( elem ) );
-			});
+			
+			if( $('report_actions') )
+			{
+				if( $F('report_actions') != 'p' )
+				{
+					$('pruneDayLabel').hide();
+					$('pruneDayBox').hide();
+					$('pruneDayLang').hide();
+				}
+			}
+			
+			if( $('checkAllReports') )
+			{
+				ipb.global.registerCheckAll('checkAllReports', 'checkall');
+			}
 		});
 	},
 	
diff --git a/upload/public/js/ips.search.js b/upload/public/js/ips.search.js
index 9de573b1..96480068 100644
--- a/upload/public/js/ips.search.js
+++ b/upload/public/js/ips.search.js
@@ -12,6 +12,8 @@ var _search = window.IPBoard;
 _search.prototype.search = {
 	checks: [],
 	curApp: null,
+	updateFilters: false,
+	vncPopup: null,
 	
 	/*------------------------------*/
 	/* Constructor 					*/
@@ -69,9 +71,121 @@ _search.prototype.search = {
 					var ac = new ipb.Autocomplete( $('author'), { multibox: false, url: url, templates: { wrap: ipb.templates['autocomplete_wrap'], item: ipb.templates['autocomplete_item'] } } );
 				});
 			}
+			
+			if( $('vncForumFilter') )
+			{
+				$('vncForumFilter').observe('click', ipb.search.openVncForumFilter );
+			}
 		});
 	},
 	
+	openVncForumFilter: function( e )
+	{
+		Event.stop(e);
+		
+		var url = ipb.vars['base_url'] + "app=core&module=ajax&section=search&do=showForumsVncFilter&secure_key=" + ipb.vars['secure_hash'];
+
+		ipb.search.vncPopup	= new ipb.Popup( 'vnc_filter_popup', { type: 'modal',
+											 ajaxURL: url,
+											 hideAtStart: false,
+											 hideClose: true,
+											 w: '600px',
+											 h: 450 }, { 'afterInit': function() { 
+												$("save_vnc_filters").observe( 'click', ipb.search.saveVncFilters );
+												$("cancel_vnc_filters").observe( 'click', ipb.search.cancelVncFilters );
+											} } );
+		
+		/* delegate */
+		ipb.delegate.register('li[class~="clickable"]', ipb.search.clickVncFilters);
+		
+		return false;
+	},
+	
+	cancelVncFilters: function( e )
+	{
+		Event.stop(e);
+		ipb.search.vncPopup.kill();
+		return false;
+	},
+	
+	saveVncFilters: function( e )
+	{
+		ipb.search.setVncFilters(e);
+		
+		/* Only reset filters if we changed something */
+		if( ipb.search.updateFilters == false )
+		{
+			ipb.search.vncPopup.kill();
+			return false;
+		}
+		
+		var toSave	= '';
+		
+		$$('.search_filter_container ul li input').each( function( _elem ){
+			if( $(_elem).value == 1 )
+			{
+				toSave += $(_elem).id.replace( /^hf_/, '' ) + ',';
+			}
+		});
+		
+		if( toSave == '' )
+		{
+			toSave = 'all';
+		}
+		
+		var request = new Ajax.Request( ipb.vars['base_url'] + 'app=core&module=ajax&section=search&do=saveForumsVncFilter',
+							{
+								method: 'post',
+								parameters: {
+									secure_key: 	ipb.vars['secure_hash'],
+									saveVncFilters:	toSave
+								},
+								onSuccess: function(t)
+								{
+									window.location.reload( true );
+								}.bind( this )
+							}
+						);
+	},
+	
+	clickVncFilters: function(event, elem)
+	{
+		var id = $(elem).id;
+		if( !id ){ return false; }
+		id	= id.replace( /^forum_/, '' );
+		
+		if( id == 'all' ){
+			$$('.search_filter_container ul li.active').invoke('removeClassName', 'active');
+			$('forum_all').addClassName('active');
+		} else {
+			if( $('forum_all').hasClassName('active') ){
+				$('forum_all').removeClassName('active');
+			}
+			$(elem).toggleClassName('active');
+		}
+		
+		ipb.search.updateFilters = true;		
+	},
+	
+	setVncFilters: function( event, elem )
+	{
+		Event.stop(event);
+		
+		$$('.search_filter_container ul li input').invoke('setValue', 0);
+		
+		if( $('forum_all').hasClassName('active') ){
+			$('hf_all').value = 1;
+		} else {
+			$('hf_all').value = 0;
+			
+			$$('.search_filter_container ul li.active').each( function( _elem ){
+				$(_elem).down('input').value = 1;
+			});			
+		}
+		
+		return true;
+	},
+	
 	selectApp: function(e)
 	{
 		var elem = Event.element(e);
diff --git a/upload/public/js/ips.sharelinks.js b/upload/public/js/ips.sharelinks.js
index 906c4fc5..7ab80955 100644
--- a/upload/public/js/ips.sharelinks.js
+++ b/upload/public/js/ips.sharelinks.js
@@ -45,6 +45,7 @@ _sharelinks.prototype.sharelinks = {
 		var shareKey = elem.id.replace( /slink_/, '' );
 		var ok       = false;
 		var callback = null;
+		var h        = '190';
 		
 		if ( shareKey == 'twitter' )
 		{
@@ -52,15 +53,16 @@ _sharelinks.prototype.sharelinks = {
 			{
 				callback = ipb.sharelinks.twitterPostPop;
 				ok       = true;
+				h        = '110';
 			}
 		}
 		else if ( shareKey == 'facebook' )
 		{
-			if ( ipb.vars['member_id'] && ipb.vars['fb_uid'] )
-			{
+			//if ( ipb.vars['member_id'] && ipb.vars['fb_uid'] )
+			//{
 				callback = ipb.sharelinks.facebookPostPop;
 				ok       = true;
-			}
+			//}
 		}
 		
 		if ( ok === false || DISABLE_AJAX )
@@ -73,19 +75,26 @@ _sharelinks.prototype.sharelinks = {
 
 		var _url  = ipb.vars['base_url'] + '&app=core&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=sharelinks&do=' + shareKey + 'Form';
 		
-		var x = new ipb.Popup( 'shareKeyPop_' + Math.random(), { type: 'balloon',
-																    ajaxURL: _url,
-																    stem: true,
-																    hideAtStart: false,
-																    attach: { target: $('slink_' + shareKey), position: 'auto' },
-																    w: '400px' }, { 'afterAjax': callback, 'beforeAjax': ipb.sharelinks.resetPop } );
+		var x = new ipb.Popup( 'shareKeyPop_' + Math.random(), { type: 'modal',
+																 ajaxURL: _url,
+																 modal: true,
+																 stem: false,
+																 hideAtStart: false,
+																 w: '550px', h: h }, { 'afterAjax': callback, 'beforeAjax': ipb.sharelinks.resetPop } );
 	},
 	
 	/**
 	 * Post process twitter pop-up
 	 */
-	facebookPostPop: function( e )
+	facebookPostPop: function( e, responseText )
 	{
+		/* Issue with FB API? */
+		if( responseText == 'x' )
+		{
+			window.location = "http://www.facebook.com/sharer.php?u=" + ipb.sharelinks.url.encodeParam();
+			return false;
+		}
+		
 		$('fContent').update('');
 		$('fSubmit').observe('click', ipb.sharelinks.goFacebook);
 	},
@@ -93,12 +102,19 @@ _sharelinks.prototype.sharelinks = {
 	/**
 	 * Post process twitter pop-up
 	 */
-	twitterPostPop: function( e )
+	twitterPostPop: function( e, responseText )
 	{
+		/* Issue with Twitter API? */
+		if( responseText == 'x' )
+		{
+			window.location = "http://twitter.com/intent/tweet?status=" + ipb.sharelinks.title.encodeParam() + '%20-%20' + ipb.sharelinks.url.encodeParam();
+			return false;
+		}
+		
 		/* clean up title */
 		ipb.sharelinks.title = ipb.sharelinks.title.replace(/&#34;/g , '"');
 		ipb.sharelinks.title = ipb.sharelinks.title.replace(/&#33;/g , "!");
-		ipb.sharelinks.title = ipb.sharelinks.title.replace(/&quot;/g, '"');
+		ipb.sharelinks.title = ipb.sharelinks.title.replace(/&#39;/g, "'");
 		ipb.sharelinks.title = ipb.sharelinks.title.replace(/&quot;/g, '"');
 		
 		/* Clean up board name */
@@ -106,7 +122,7 @@ _sharelinks.prototype.sharelinks = {
 		ipb.sharelinks.bname = ipb.sharelinks.bname.replace(/&#33;/g , "!");
 		ipb.sharelinks.bname = ipb.sharelinks.bname.replace(/&#39;/g , "'");
 		ipb.sharelinks.bname = ipb.sharelinks.bname.replace(/&quot;/g, '"');
-		
+		Debug.write( ipb.sharelinks.title );
 		$('tContent').value = ipb.sharelinks.bname + ': ' + ipb.sharelinks.title;
 		$('tContent').observe('keyup', ipb.sharelinks.checkTwitterLength);
 		$('tSubmit').observe('click', ipb.sharelinks.goTwitter);
diff --git a/upload/public/js/ips.signin.js b/upload/public/js/ips.signin.js
index 3b304fff..897ae3c9 100644
--- a/upload/public/js/ips.signin.js
+++ b/upload/public/js/ips.signin.js
@@ -18,10 +18,13 @@ _signin.prototype.signin = {
 				$('live_close').observe('click', ipb.signin.toggleLive);
 			}
 			
-			if( $('login') )
-			{
+			if( $('login') ){
 				$('login').observe('submit', ipb.signin.validateLogin );
 			}
+			
+			if( $('ips_username') ){
+				$('ips_username').focus();
+			}
 		});
 	},
 	
@@ -35,17 +38,13 @@ _signin.prototype.signin = {
 	{
 		if( $('openid_signin').visible() )
 		{
-			new Effect.Parallel([
-				new Effect.BlindUp( $('openid_signin'), { sync: true } ),
-				new Effect.BlindDown( $('regular_signin'), { sync: true } )
-			]);
+			$('openid_signin').hide();
+			$('regular_signin').show();
 		}
 		else
 		{
-			new Effect.Parallel([
-				new Effect.BlindDown( $('openid_signin'), { sync: true } ),
-				new Effect.BlindUp( $('regular_signin'), { sync: true } )
-			]);
+			$('openid_signin').show();
+			$('regular_signin').hide();
 		}
 		
 		Event.stop(e);
@@ -61,17 +60,13 @@ _signin.prototype.signin = {
 	{
 		if( $('live_signin').visible() )
 		{
-			new Effect.Parallel([
-				new Effect.BlindUp( $('live_signin'), { sync: true } ),
-				new Effect.BlindDown( $('regular_signin'), { sync: true } )
-			]);
+			$('live_signin').hide();
+			$('regular_signin').show();
 		}
 		else
 		{
-			new Effect.Parallel([
-				new Effect.BlindDown( $('live_signin'), { sync: true } ),
-				new Effect.BlindUp( $('regular_signin'), { sync: true } )
-			]);
+			$('live_signin').show();
+			$('regular_signin').hide();
 		}
 		
 		Event.stop(e);
@@ -82,19 +77,19 @@ _signin.prototype.signin = {
 	 * Form validation for login
 	 * 
 	 * @param	{event}		e	The event
-	 * @return	void
+	 * @return	@e void
 	*/
 	validateLogin: function(e)
 	{
 		if( !$('openid_signin') || ( $F('openid') == '' || $F('openid') == 'http://') )
 		{
-			if( !ipb.signin.isFilled( $('username') ) )
+			if( !ipb.signin.isFilled( $('ips_username') ) )
 			{
 				alert( ipb.lang['signin_nosigninname'] );
 				Event.stop(e);
 				return;
 			}
-			if( !ipb.signin.isFilled( $('password') ) )
+			if( !ipb.signin.isFilled( $('ips_password') ) )
 			{
 				alert( ipb.lang['signin_nopassword'] );
 				Event.stop(e);
@@ -117,7 +112,7 @@ _signin.prototype.signin = {
 	 * Validate that content is filled
 	 * 
 	 * @param	{event}		e	The event
-	 * @return	void
+	 * @return	@e void
 	 * @SKINNOTE 	Stop using this duplicated code and use ipb.js validate object
 	*/
 	isFilled: function( obj )
@@ -137,7 +132,7 @@ _signin.prototype.signin = {
 	 * Validate the openid url is a valid url
 	 * 
 	 * @param	{event}		e	The event
-	 * @return	void
+	 * @return	@e void
 	 * @SKINNOTE 	Stop using this duplicated code and use ipb.js validate object
 	*/
 	isValidUrl: function( value )
diff --git a/upload/public/js/ips.skin_gen.js b/upload/public/js/ips.skin_gen.js
new file mode 100644
index 00000000..a3b8915d
--- /dev/null
+++ b/upload/public/js/ips.skin_gen.js
@@ -0,0 +1,1815 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* ips.skin_gen.js - VSE						*/
+/* (c) IPS, Inc 2011							*/
+/* -------------------------------------------- */
+/* Author: Rikki Tissier, Matt Mecham			*/
+/************************************************/
+
+var defaultTemplates = {
+	css_wrapper: new Template("#{selector} {\n#{contents}\n}"),
+	bg_color: new Template("\t\nbackground: #{value} !important;\tbackground-color: #{value} !important;\n"),
+	bgcolonly_color: new Template("\t\n\tbackground-color: #{value} !important;\n"),
+	font_color: new Template("\tcolor: #{value};\n"),
+	border_color: new Template("\tborder-color: #{value} !important;\n"),
+	box_shadow_color: new Template("\tbox-shadow: #{extra} #{value} !important;\n\t-moz-box-shadow: #{extra} #{value} !important;\n\n\t-webkit-box-shadow: #{extra} #{value} !important;")
+}
+
+var skingen = {
+	
+	currentClass: null,
+	showingLocations: false,
+	classList: [],
+	classStored: {},
+	updatedImages: $H(),
+	classBackup: null,
+	pickers: {},
+	
+	//------------------------------------------
+	// Initialize
+	//------------------------------------------
+	boot: function(){
+		if( !this.checkDB() ){
+			alert("�еобходимо чтобы ваш браузер поддерживал localStorage");
+			return;
+		}
+		
+		/* Fix image */
+		$('logo').down('img').writeAttribute('src', ipb.vars['img_url'] + "/logo_transparent.png" );
+		
+		this.dropper._parent = this.xray._parent = this.db._parent = this.cssManipulator._parent = this.imageEditor._parent = this.hueChanger._parent = this;
+		
+		this.loadStoredValues();
+		
+		if( this.db.load("storedImages") ){
+			this.loadStoredImages();
+		}
+		
+		this.buildEditor();
+		this.buildMasterClassList();
+		
+		this.cssManipulator.createInjectedStylesheet();
+	},
+	
+	//-----------------------------------------
+	// Get hex from selector value
+	//-----------------------------------------
+	getHexFromSelector: function( val, type )
+	{
+		if ( type == 'background-color' )
+		{
+			type = 'background';
+		}
+		
+		Debug.write( val + '-' + type );
+		
+		if ( ! Object.isUndefined( val ) )
+		{
+			if ( typeof( val ) == 'string' )
+			{
+				val = this.skinClasses.get( val )[3][ type ];
+				
+				if ( Object.isUndefined( val ) || Object.isUndefined( val[0] ) )
+				{
+					return false;
+				}
+				else
+				{
+					Debug.write( "Got " + val[0] + ' - ' + val[1] );
+				}
+			}
+			
+			if ( ! Object.isUndefined( val[0] ) )
+			{
+				return this._cleanHex( val[0] );
+			}
+		}
+		
+		return false;
+	},
+	
+	//------------------------------------------
+	// Builds the panel
+	//------------------------------------------
+	buildEditor: function(){
+		if( $('skingen_editor') ){ return; }
+		pushLater = new Array();
+		
+		this.body = $$('body')[0]; // quick reference to body
+		// Build list
+		var list = [];
+		if( this.skinClasses.size() && this.skinGroups.size() ){
+			this.skinGroups.each( function( group ){
+				var items = [];
+				if( group.value[1].length ){
+					$H(group.value[1]).each( function(item){
+						item = item[1];
+						if( this.skinClasses.get( item ) )
+						{
+							var bg = this.getHexFromSelector( item, 'background' );
+							var fc = this.getHexFromSelector( item, 'color' );
+							
+							items.push( this.templates.sectionItem.evaluate( { id: item, name: this.skinClasses.get( item )[1], style: 'background: ' + ( bg ? bg : fc ) } ) );
+						}
+					}.bind(this));
+					
+					if ( group.value[0].match( /^app: /i ) )
+					{
+						pushLater.push( this.templates.sectionGroup.evaluate( { id: group.key, title: group.value[0], content: items.join('') } ) );
+					}
+					else
+					{
+						list.push( this.templates.sectionGroup.evaluate( { id: group.key, title: group.value[0], content: items.join('') } ) );
+					}
+				}
+			}.bind(this));
+		}
+		
+		// Build HTML
+		$(this.body).insert({bottom: this.templates.editor.evaluate( { sections: list.join('') + pushLater.join('') } )});
+		
+		// Existing coords?
+		if( this.db.load('editorPos') ){
+			var newPos     = this.db.load('editorPos');
+			var screendims = document.viewport.getDimensions();
+			var wrapSize   = $('skingen_editor').getDimensions();
+			
+			if ( newPos.left > ( screendims.width - wrapSize.width ) )
+			{
+				newPos.left = ( ( screendims.width - wrapSize.width ) / 2 );
+			}
+			
+			$('skingen_editor').setStyle('left: ' + newPos.left + 'px; top: ' + newPos.top + 'px');
+		}
+		
+		if( this.db.load('editorState') && this.db.load('editorState') == 'hide' ){
+			$('skingen_content').hide();
+		}
+		
+		// Any pane loaded?
+		if( this.db.load('editorPane') ){
+			var current = this.db.load('editorPane');
+		} else {
+			var current = 'body';
+		}
+		
+		// Build the first pane
+		this.showPane( current );
+		
+		// Make draggable
+		new Draggable( 'skingen_editor', { handle: $('skingen_editor').down('h1'), onEnd: this.updateDragPos.bind(this) } );
+		
+		// Add Events
+		this.setUpEditorEvents();
+	},
+	
+	//------------------------------------------
+	// Builds a simple array of classnames from our
+	// customizable list. Used for matching.
+	//------------------------------------------
+	buildMasterClassList: function(){
+		this.classList = [];
+		this.skinClasses.each( function(item){
+			this.classList.push( item.value[0] );
+		}.bind(this));
+	},
+	
+	
+	//-----------------------------------------
+	// Get the template for CSS we'll need
+	//-----------------------------------------
+	getClassTemplate: function( classArray )
+	{
+		template = defaultTemplates.css_wrapper;
+		name     = classArray[0];
+		contents = '';
+		
+		if ( ! Object.isUndefined( classArray[3] ) )
+		{
+			$H(classArray[3]).each( function( dec )
+			{
+				switch( dec.key )
+				{
+					case 'background':
+						if ( classArray[1] == 'Search Button' )
+						{
+							contents += defaultTemplates.bgcolonly_color.evaluate( { value: dec.value[0], extra: dec.value[1] } );
+						}
+						else
+						{
+							contents += defaultTemplates.bg_color.evaluate( { value: dec.value[0], extra: dec.value[1] } );
+						}
+					break;
+					case 'color':
+						contents += defaultTemplates.font_color.evaluate( { value: dec.value[0], extra: dec.value[1] } );
+					break;
+					case 'border':
+						contents += defaultTemplates.border_color.evaluate( { value: dec.value[0], extra: dec.value[1] } );
+					break;
+					case 'boxshadow':
+						contents += defaultTemplates.box_shadow_color.evaluate( { value: dec.value[0], extra: dec.value[1] } );
+					break;
+				}
+			} );
+		}
+		
+		return template.evaluate( { 'selector': name, 'contents': contents } );
+	},
+	
+	
+	//------------------------------------------
+	// Events that make the editor work
+	//------------------------------------------
+	setUpEditorEvents: function(){
+		$('skingen_locate').on("click", this.showLocations.bind(this));
+		$('skingen_select').on("click", this.selectByClick.bind(this));
+		$('skingen_editor').on("dblclick", 'h1', this.toggleEditor.bind(this));
+		$('skingen_sections').on('click', 'li', this.showPaneEv.bind(this));
+		$('skingen_save').on('click', this.buildSkin.bind(this));
+		$('skingen_revert').on('click', this.revertSkin.bind(this));
+		$('skingen_sections').on('click', 'h3', this.toggleGroup.bind(this));
+		$('skingen_colorize').on('click', this.toggleColorizer.bind(this));
+		$('skingen_settings').on('click', this.toggleSettings.bind(this));
+		//$('skingen_images').on('click', this.imageEditor.toggleImageEditor.bind( this.imageEditor ));
+		
+		ipb.delegate.register(".sg_dropper", this.showDropper.bind(this) );
+	},
+	
+	//------------------------------------------
+	// This would build the skin CSS,
+	// but for now just we just pretend 
+	//------------------------------------------
+	buildSkin: function(e){
+		
+		Event.stop(e);
+		
+		if ( ! $('skingen_buildskin_editor') )
+		{
+			this.body.insert( { bottom: this.templates.buildSkin.evaluate() } );
+		
+			new Draggable( 'skingen_buildskin_editor', { handle: $("skingen_buildskin_editor").down('h1') } );
+			
+			$('skingen_buildskin_editor').hide();
+		}
+		
+		if ( $('skingen_buildskin_editor').visible() )
+		{
+			new Effect.Appear( $('skingen_editor'), { duration: 0.3 } );
+			new Effect.Fade( $('skingen_buildskin_editor'), { duration: 0.2 } );
+			
+			/* Click handlers */
+			$('skingen_buildskin_cancel').stopObserving('click');
+			$('skingen_buildskin_save').stopObserving('click');
+		}
+		else
+		{
+			/* Position correctly */
+			$('skingen_buildskin_editor').setStyle( { 'top': $('skingen_editor').getStyle('top'), 'left': $('skingen_editor').getStyle('left') } );
+		
+			new Effect.Appear( $('skingen_buildskin_editor'), { duration: 0.3 } );
+			new Effect.Fade( $('skingen_editor'), { duration: 0.2 } );
+			
+			/* Click handlers */
+			$('skingen_buildskin_cancel').on( 'click', this.buildSkin.bindAsEventListener(this) );
+			$('skingen_buildskin_save').on( 'click', this.buildSkinProcess.bindAsEventListener(this) );
+		}
+
+	},
+	
+	//------------------------------------------
+	// Throw everything back to PHP
+	//------------------------------------------
+	buildSkinProcess: function(e)
+	{
+		/* Fix form */
+		$('skingen_buildskin_save').writeAttribute('disabled', 'true' );
+		$('skingen_buildskin_save').update( 'Сохранение...' );
+		
+		var css = [];
+		
+		this.skinClasses.each( function(item){
+			css.push( this.buildRenderedRule( item.key ) );
+		}.bind(this) )
+		
+		output = css.join("\n\n");
+		
+		var settings = this.db.load("storedSettings");
+		var width    = ( Object.isUndefined( settings['width_value'] ) ) ? '87' : settings['width_value'];
+		var px_pc    = ( Object.isUndefined( settings['width_type'] ) )  ? '%' : settings['width_type'];
+		
+		output += '#content, .main_width { width: ' + width + px_pc + ' !important; }';
+		
+		output += ".topic_buttons li.non_button a {\
+		background: transparent !important;\
+		background-color: transparent !important;\
+		border: 0 !important;\
+		box-shadow: none !important;\
+		-moz-box-shadow: none !important;\
+		-webkit-box-shadow: none !important;\
+		text-shadow: none !important;\
+		min-width: 0px;\
+		color: #777777;\
+		font-weight: normal;\
+		}";
+
+		Debug.write( $H( this.db.load("storedClasses") ).toJSON() );
+		var params = { 'storedClasses' : JSON.stringify( this.db.load("storedClasses") ),
+					   'storedSettings': JSON.stringify( this.db.load("storedSettings") ),
+					   'css': output };
+					   
+		var url    = ipb.vars['base_url'] + 'app=core&section=skingen&module=ajax&do=save&md5check=' + ipb.vars['secure_hash'];
+		Debug.write( url );
+		new Ajax.Request( url,
+							{
+								method: 'post',
+								parameters: params,
+								onSuccess: function(t)
+								{
+									if ( t.responseJSON['status'] == 'ok' )
+									{
+										new Effect.Fade( $('skingen_buildskin_editor'), { duration: 0.1 } );
+										
+										/* Clear storage */
+										this.dropStoredValues();
+										
+										/* Reload yo */
+										document.location.reload();
+									}
+									else
+									{
+										alert( ipb.lang['action_failed'] );
+										return;
+									}
+								}.bind(this)
+							});
+	},
+	
+	//------------------------------------------
+	// Reverts a skin to the default values
+	// and drops the database
+	//------------------------------------------
+	revertSkin: function(e){
+		if( confirm("Вы дей�твительно хотите отменить в�е вне�енные изменени�?") ){
+			this.dropStoredValues();
+			this.dropStoredImages();
+			document.location.reload();
+		}		
+	},
+	
+	//------------------------------------------
+	// Toggles a style group
+	//------------------------------------------
+	toggleGroup: function(e, elem){
+		var group = $(elem).readAttribute('data-group');
+		
+		if( elem.hasClassName('open') && $('skingen_group_' + group).visible() ){
+			new Effect.BlindUp( $('skingen_group_' + group), { duration: 0.3, afterFinish: function(){
+				$(elem).removeClassName('open').addClassName('closed');
+			} } );
+		} else {
+			new Effect.BlindDown( $('skingen_group_' + group), { duration: 0.3, afterFinish: function(){
+				$(elem).addClassName('open').removeClassName('closed');
+			} } );
+		}
+	},
+	
+	//------------------------------------------
+	// Toggle the settings panel
+	//------------------------------------------
+	toggleSettings: function(e){
+		Event.stop(e);
+		
+		if( !$('skingen_settings_editor') ){
+			this.buildSettings();
+		}
+		
+		if ( $('skingen_settings_editor').visible() )
+		{
+			new Effect.Appear( $('skingen_editor'), { duration: 0.3 } );
+			new Effect.Fade( $('skingen_settings_editor'), { duration: 0.2 } );
+		}
+		else
+		{
+			new Effect.Appear( $('skingen_settings_editor'), { duration: 0.3 } );
+			new Effect.Fade( $('skingen_editor'), { duration: 0.2 } );
+		}
+	},
+	
+	//------------------------------------------
+	// Build the settings panel
+	//------------------------------------------
+	buildSettings: function(e){
+		settings = this.db.load("storedSettings");
+		
+		var width = ( Object.isUndefined( settings['width_value'] ) ) ? '87' : settings['width_value'];
+		var px_pc = ( Object.isUndefined( settings['width_type'] ) )  ? '%' : settings['width_type'];
+		
+		this.body.insert( { bottom: this.templates.settingsEditor.evaluate( { 'width': width } ) } );
+		
+		/* Set drop down up correctly */
+		if ( px_pc == 'px' )
+		{
+			$('skingen_setting_widthunit').options[0].selected = true;
+		}
+		else
+		{
+			$('skingen_setting_widthunit').options[1].selected = true;
+		}
+		
+		/* Position correctly */
+		$('skingen_settings_editor').setStyle( { 'top': $('skingen_editor').getStyle('top'), 'left': $('skingen_editor').getStyle('left') } );
+		
+		/* Click handlers */
+		$('skingen_settings_cancel').on( 'click', this.toggleSettings.bindAsEventListener(this) );
+		$('skingen_settings_save').on( 'click', this.saveSettings.bindAsEventListener(this) );
+		
+		$('skingen_settings_editor').hide();
+		
+		new Draggable( 'skingen_settings_editor', { handle: $("skingen_settings_editor").down('h1') } );
+	},
+	
+	//-----------------------------------------
+	// Save settings
+	//-----------------------------------------
+	saveSettings: function(e)
+	{
+		Event.stop(e);
+		
+		var width = $F('skingen_setting_width');
+		var px_pc = ( $F('skingen_setting_widthunit') == 'percent' ) ? '%' : 'px';
+		
+		if ( px_pc == 'px' && parseInt( width ) < 900 )
+		{
+			width = 900;
+		}
+		else if ( px_pc == 'pc' && parseInt( width ) < 60 )
+		{
+			width = 60;
+		}
+		
+		/* write */
+		this.db.write("storedSettings", { 'width_value': width, 'width_type': px_pc } );
+		
+		/* update stylesheet */
+		this.cssManipulator.updateWidth();
+		
+
+		this.toggleSettings(e);
+	},
+	
+	//------------------------------------------
+	// Shows the colorizer
+	//------------------------------------------
+	toggleColorizer: function(e){
+		Event.stop(e);
+		
+		if( !$('skingen_colorize_editor') ){
+			this.buildColorizer();			
+		}
+		
+		if( $('skingen_colorize_editor').visible() ){
+			new Effect.Appear( $('skingen_editor'), { duration: 0.3 } );
+			new Effect.Fade( $('skingen_colorize_editor'), { duration: 0.2 } );
+			$('skingen_colorize').removeClassName('active');
+			this.db.write("currentWindow", "main");
+			return;
+		} else {
+			// Back up our class values temporarily, so that
+			// we can cancel the change if necessary
+			var backup = {};
+			
+			this.skinClasses.each( function(item){
+				backup[ item.key ] = item.value[3];
+			}.bind(this));
+			
+			this.db.write("classBackup", backup);
+			
+			/* Position correctly */
+			$('skingen_colorize_editor').setStyle( { 'top': $('skingen_editor').getStyle('top'), 'left': $('skingen_editor').getStyle('left') } );
+			
+			// Fade main window/show colorizer
+			new Effect.Fade( $('skingen_editor'), { duration: 0.3 } );
+			new Effect.Appear( $('skingen_colorize_editor'), { duration: 0.2 } );
+			$('skingen_colorize').addClassName('active');
+			this.db.write("currentWindow", "colorize");
+			return;
+		}
+	},
+	
+	//-----------------------------------------
+	// Returns BG color of colourizer group
+	//-----------------------------------------
+	getFirstBackgroundColorOfColorizerGroup: function( group )
+	{
+		var hex 	   = this.getHexFromSelector( 'maintitle', 'background' );
+		var background = false;
+		var text	   = false;
+		
+		if ( ! Object.isUndefined(this.colorizeGroups.get( group )) )
+		{
+			this.colorizeGroups.get( group ).each( function(item)
+			{
+				if ( $H( this.skinClasses ).get( item ) )
+				{
+					$H(this.skinClasses.get( item )[3] ).each( function(property)
+					{ 
+						if ( background === false && property.key == 'background' )
+						{
+							background = this.getHexFromSelector( item, 'background' );
+						}
+						
+						if ( text === false && property.key == 'color' )
+						{
+							text = this.getHexFromSelector( item, 'color' );
+						}
+						
+					}.bind(this) );
+				}
+			}.bind(this) );
+		}
+		
+		/* Failsafe */
+		return ( background ) ? background : ( text ? text : hex );
+	},
+	
+	//------------------------------------------
+	// Builds the colorizer window
+	//------------------------------------------
+	buildColorizer: function(){
+		this.body.insert( { bottom: this.templates.colorizeEditor.evaluate() } );
+		$('skingen_colorize_editor').hide();
+		new Draggable( 'skingen_colorize_editor', { handle: $("skingen_colorize_editor").down('h1') } );
+		
+		// Set up pickers
+		['base', 'secondary', 'tertiary', 'text'].each( function(item){
+			new colorPicker( 'skingen_colorize_' + item, {
+					color: this.getFirstBackgroundColorOfColorizerGroup( item ),
+	 				livePreview: true,
+	 				previewElement: 'skingen_colorize_' + item,
+	 				onHide: this.updateColorizer.bind(this, item),
+					onSubmit: this.updateColorizer.bind(this, item)
+			});
+		}.bind(this));
+		
+		$('skingen_colorize_cancel').on('click', this.cancelColorizer.bind(this));
+		$('skingen_colorize_save').on('click', this.saveColorizer.bind(this));
+		return;
+	},
+	
+	//------------------------------------------
+	// Event handler for colorizer picker
+	// Updates all of our classes with a new color
+	//------------------------------------------
+	updateColorizer: function( type, picker ){
+		var newHue = picker.color['h'];
+		var newSat = picker.color['s'];
+		
+		if ( ! Object.isUndefined( this.colorizeGroups.get( type ) ) )
+		{
+			this.colorizeGroups.get( type ).each( function(item){
+				if( this.skinClasses.get( item )){
+					$H(this.skinClasses.get( item )[3]).each( function(property){
+						if( property.key == 'background' || property.key == 'color' || property.key == 'border'  || property.key == 'boxshadow'  ){
+							val = this.getHexFromSelector( item, property.key );
+							if ( val )
+							{
+								this.skinClasses.get( item )[3][ property.key ][0] = '#' + this.hueChanger.convertHex( val, newHue, newSat );
+							}
+						}
+					}.bind(this));
+					// Now manipulate the CSS for the full preview
+					this.cssManipulator.updateSelector( item );			
+				}
+			}.bind(this));
+		}
+	},
+	
+	//------------------------------------------
+	// Cancels a colorize change without saving
+	//------------------------------------------
+	cancelColorizer: function(e){
+		var backup = $H( this.db.load('classBackup') );
+
+		backup.each( function(item){
+			this.skinClasses.get( item.key )[3] = item.value;
+		}.bind(this));
+		
+		this.skinClasses.each( function(item){
+			this.cssManipulator.updateSelector( item.key );
+		}.bind(this));
+		
+		this.db.write('classBackup', false);
+		this.toggleColorizer( e );
+	},
+	
+	//------------------------------------------
+	// Save the changes that have been made
+	//------------------------------------------
+	saveColorizer: function(e){
+		this.updateStoredValues();
+		this.resetTextboxValues();
+		this.db.write('classBackup', false);
+		this.toggleColorizer( e );
+	},
+	
+	//------------------------------------------
+	// Updates all of the textbox pickers with current values
+	//------------------------------------------
+	resetTextboxValues: function( id ){
+		this.skinClasses.each( function(item){
+			if( Object.isUndefined( this.pickers[ item.key ] ) ){
+				return;
+			}
+			 
+			$H( item.value[3] ).each( function(style){
+				if( !Object.isUndefined( this.pickers[ item.key ][ style.key ] ) ){
+					var val = this.getHexFromSelector( style.value, style.key );
+					
+					this.pickers[ item.key ][ style.key ].setColor( val.replace('#', '') );
+					this.pickers[ item.key ][ style.key ].el.value = val.replace('#', '');
+					$( this.pickers[ item.key ][ style.key ].options.previewElement ).setStyle( { 'background-color': val } );
+				}
+			}.bind(this));
+		}.bind(this));			
+	},
+	
+	//------------------------------------------
+	// Shows an editor pane
+	//------------------------------------------
+	showPaneEv: function(e, elem){
+		this.showPane( elem.id.replace("section_", '') );
+	},	
+	showPane: function( id, otherClasses ){		
+		$$("#skingen_editor .skingen_pane").invoke("hide");
+		
+		if( $('skingen_pane_' + id ) ){
+			$('skingen_pane_' + id ).show();
+		} else {
+			this.buildPane( id );
+		}
+		
+		if ( ! Object.isUndefined( otherClasses ) )
+		{
+			$('skingen_pane_' + id + '_others').stopObserving('click');
+			$('skingen_pane_' + id + '_others').update( this.buildOtherClassesForPane( otherClasses ) ).show();
+			$('skingen_pane_' + id + '_others').on('click', 'li', this.showPaneEv.bind(this));
+		}
+		else
+		{
+			$('skingen_pane_' + id + '_others').hide();
+		}
+		
+		this.currentClass = id;
+		this.db.write("editorPane", id);
+	},
+	//-----------------------------------------
+	// Show others
+	//-----------------------------------------
+	buildOtherClassesForPane: function( otherClasses )
+	{
+		var items = [];
+		
+		$H(otherClasses).each( function(item){
+			item = item[1];
+			
+			if( this.skinClasses.get( item ) )
+			{
+				var bg = this.getHexFromSelector( item, 'background' );
+				var fc = this.getHexFromSelector( item, 'color' );
+				
+				items.push( this.templates.sectionItem.evaluate( { id: item, name: this.skinClasses.get( item )[1], style: 'background: ' + ( bg ? bg : fc ) } ) );
+			}
+		}.bind(this));
+		
+		return this.templates.otherClassesGroup.evaluate( { content: items.join('') } );
+	},
+	
+	//------------------------------------------
+	// Builds an editor pane
+	//------------------------------------------
+	buildPane: function( id ){
+		var content = [];
+		var colors = [];
+		var borders = [];
+		var classInfo = this.skinClasses.get( id );
+	
+		$H(classInfo[3]).each( function(item){
+			switch( item.key ){
+				case 'background':
+					colors.push( this.templates.widgetBackground.evaluate({ id: id, current: item.key }) );
+				break;
+				case 'color':
+					colors.push( this.templates.widgetForeground.evaluate({ id: id, current: item.key }) );
+				break;
+				case 'border':
+					borders.push( this.templates.widgetBorder.evaluate({ id: id, current: item.key }) );
+				break;
+				case 'boxshadow':
+					borders.push( this.templates.widgetBoxShadow.evaluate({ id: id, current: item.key }) );
+				break;
+			}
+		}.bind(this));
+		
+		if( colors.length ){
+			content.push( this.templates.sectionColors.evaluate({ id: id, content: colors.join('') }) );
+		}
+		
+		if( borders.length ){
+			content.push( this.templates.sectionBorders.evaluate({ id: id, content: borders.join('') }) );
+		}
+		
+		var pane = this.templates.paneWrap.evaluate({ id: id, selector: classInfo[0], name: classInfo[1], description: classInfo[2], content: content.join('') });
+		$('skingen_panes').insert({bottom: pane});
+
+		// Set up color pickers
+		[ 'background', 'color', 'border', 'boxshadow' ].each( function(item){
+			if( $( item + '_' + id ) ){
+				if( !this.pickers[ id ] ){
+					this.pickers[ id ] = {};
+				}
+
+				this.pickers[ id ][ item ] = this.activatePicker( id, item );
+			}
+		}.bind(this) );
+	},
+	
+	//------------------------------------------
+	// Creates a new color picker object
+	//------------------------------------------
+	activatePicker: function( id, type ){
+		var val = this.getHexFromSelector( id, type );
+		
+		return new colorPicker( type + '_' + id, {
+				color: val,
+ 				livePreview: true,
+ 				previewElement: type + '_preview_' + id,
+ 				onHide: this.updateColor.bind(this),
+				onSubmit: this.updateColor.bind(this),
+				onLoad: function(picker){
+					picker.el.value = val.replace('#', '')
+				}.bind(this)
+		});		
+	},
+	//-----------------------------------------
+	// Update picker from external source
+	//-----------------------------------------
+	updatePicker: function( id, type, color )
+	{
+		this.pickers[ id ][ type ].setColor( color );
+		
+		$( type + '_' + id ).value = color;
+		
+		this.updateColor( this.pickers[ id ][ type ] ); 
+	},
+	
+	//------------------------------------------
+	// Event handler for the picker
+	//------------------------------------------
+	updateColor: function(picker){
+		// Get the element
+		var elem = picker.el;
+		if( !elem.id.match( this.currentClass ) ){ return; }
+		
+		// Type
+		var type = $(elem).readAttribute('data-type');
+		var obj = {};
+		
+		if( type == 'background' || type == 'color' || type == 'border' || type == 'boxshadow' ){
+			elemValue = '#' + $(elem).value;
+		} else {
+			elemValue = $(elem).value;
+		}
+		
+		obj[ type ] = elemValue;
+		
+		this.updateClassList( this.currentClass, obj );
+		
+		this.updatePreview( this.currentClass, obj );
+		
+		// Now manipulate the CSS for the full preview
+		this.cssManipulator.updateSelector( this.currentClass );
+		
+		return true;
+	},
+	
+	//------------------------------------------
+	// Updates the preview boxes
+	//------------------------------------------
+	updatePreview: function( selector, values ){		
+		values = $H(values);
+		
+		if( values.size() ){
+			values.each( function(item){
+				$('section_' + selector).down('span').setStyle( { 'backgroundColor' : item.value + ' !important' } );
+			}.bind(this));
+		}
+	},
+	
+	//------------------------------------------
+	// Updates the master class list with new values
+	//------------------------------------------
+	updateClassList: function( selector, values ){		
+		values = $H(values);
+		if( values.size() ){
+			values.each( function(item){
+				this.skinClasses.get( selector )[3][ item.key ][0] = item.value;
+			}.bind(this));
+		}
+		
+		this.updateStoredValues();				
+	},
+	
+	//------------------------------------------
+	// Builds an object we can write to the database
+	// for cross-page styling
+	//------------------------------------------
+	updateStoredValues: function(){
+		this.classStored = {};
+		
+		this.skinClasses.each( function(item){
+			this.classStored[ item.key ] = item.value[3];
+		}.bind(this));
+		
+		this.db.write("storedClasses", this.classStored);		
+	},
+	
+	loadStoredValues: function(){
+		var storedValues   = this.db.load("storedClasses");
+		var storedSettings = this.db.load("storedSettings");
+		
+		if ( ! storedValues && typeof(IPS_SKIN_GEN_SAVED_DATA) != 'undefined' )
+		{
+			if ( ! Object.isUndefined( IPS_SKIN_GEN_SAVED_DATA['storedClasses'] ) )
+			{
+				storedValues = $H( IPS_SKIN_GEN_SAVED_DATA['storedClasses'] );
+			}
+		}
+		
+		if ( ! storedSettings && typeof(IPS_SKIN_GEN_SAVED_DATA) != 'undefined' )
+		{
+			if ( ! Object.isUndefined( IPS_SKIN_GEN_SAVED_DATA['storedSettings'] ) )
+			{
+				this.db.write("storedSettings", $H( IPS_SKIN_GEN_SAVED_DATA['storedSettings'] ) );
+			}
+		}
+		
+		$H(storedValues).each( function(item){
+			this.skinClasses.get( item.key )[3] = item.value;
+		}.bind(this));
+	},
+	
+	dropStoredValues: function(){
+		this.db.write("storedClasses", false);
+		this.db.write("storedSettings", false );
+	},
+	
+	updateStoredImages: function(){
+		this.db.write("storedImages", this.updatedImages);
+	},
+	
+	loadStoredImages: function(){
+		/*var storedImages = this.db.load("storedImages");
+		
+		$H( storedImages ).each( function(item){
+			this.imageEditor.updateImageReferences( item.value, item.key );
+		}.bind(this));*/
+	},
+	
+	dropStoredImages: function(){
+		this.db.write("storedImages", false);
+	},
+	
+	//------------------------------------------
+	// Start the XRay
+	//------------------------------------------
+	selectByClick: function(e){
+		Event.stop(e);
+		this.xray.start();
+	},
+	
+	//-----------------------------------------
+	// Do the dropper background_dropper_ setColor 
+	//-----------------------------------------
+	showDropper: function( e, elem )
+	{
+		Event.stop(e);
+		
+		var item = elem.id.replace( /^(.+?)_.*$/, "$1" );
+		var id   = elem.id.replace( /^(?:[^_]+?)_(?:[^_]+?)_(.+?)$/, "$1" );
+		
+		this.dropper.start( item, id );
+	},
+	
+	//------------------------------------------
+	// Highlight the current elements
+	//------------------------------------------
+	showLocations: function(e){
+		Event.stop(e);
+		
+		if( this.showingLocations ){
+			$('skingen_locate').removeClassName('active');
+			$$('.skingen_highlight').invoke("remove");
+			this.showingLocations = false;
+			return;
+		}
+		
+		// Find elements matching the selector
+		var elements = $$( this.skinClasses.get( this.currentClass )[0] );
+		
+		if( !elements.size() ){
+			alert("Данный �лемент от�ут�вует на �той �транице! Попробуйте пои�кать его на другой �транице");
+			return;
+		} 
+		
+		$('skingen_locate').addClassName('active');
+		
+		elements.each( function(item){
+			var offset = item.cumulativeOffset();
+			var dims = item.getLayout();
+			var newElem = new Element('div').addClassName('skingen_highlight').setStyle({
+							width: (dims.get('padding-box-width') + 2) + "px",
+							height: (dims.get('padding-box-height') + 2) + "px",
+							top: (offset.top - 2) + "px",
+							left: (offset.left - 2) + "px"
+						});
+						
+			this.body.insert({bottom: newElem});			
+		}.bind(this));
+		
+		this.showingLocations = true;
+	},
+	
+	//------------------------------------------
+	// Check whether localStorage is supported
+	//------------------------------------------
+	checkDB: function(){		
+		try {
+			return'localStorage' in window && window['localStorage'] !== null;
+		} catch (e) {
+			return false;
+		}
+	},
+	
+	//------------------------------------------
+	// Updates the position of the editor pane in the DB
+	//------------------------------------------
+	updateDragPos: function(e){
+		var pos = $('skingen_editor').cumulativeOffset();
+		this.db.write("editorPos", pos);
+	},
+	
+	//------------------------------------------
+	// Shows/hides the editor
+	//------------------------------------------
+	toggleEditor: function(e){
+		if( $('skingen_content').visible() ){
+			new Effect.BlindUp( $('skingen_content'), { duration: 0.3 } );
+			this.db.write("editorState", 'hide');
+		} else {
+			new Effect.BlindDown( $('skingen_content'), { duration: 0.3 } );
+			this.db.write("editorState", 'show');
+		}		
+	},
+	
+	//------------------------------------------
+	// Builds a fully-formed CSS rule
+	//------------------------------------------
+	buildRenderedRule: function( selector ){
+		return this.getClassTemplate( this.skinClasses.get( selector ) );
+	},
+	
+	//-----------------------------------------
+	// Clean up hex
+	//-----------------------------------------
+	_cleanHex: function( hex )
+	{
+		if ( hex.length == 4 )
+		{
+			hex = hex.replace( /#/, '' );
+			rbg = hex.split('');
+			
+			hex = '#' + rbg[0] + rbg[0] + rbg[1] + rbg[1] + rbg[2] + rbg[2];
+		}
+		
+		return hex;
+	},
+	
+	//============================================================
+	// HUE CHANGER
+	// Changes the hue of a class
+	//============================================================
+	hueChanger: {
+		_parent: null,
+		
+		//------------------------------------------
+		// Main function for changing the hue of a hex
+		//------------------------------------------
+		convertHex: function( hex, toHue, toSat ){
+			// Remove #
+			hex = hex.replace(/#/, '');
+			
+			// Check for shorthand hex
+			if( hex.length == 3 ){
+				hex = hex.slice(0,1) + hex.slice(0,1) + hex.slice(1,2) + hex.slice(1,2) + hex.slice(2,3) + hex.slice(2,3);
+			}
+			
+			if( hex.length != 6 ){
+				Debug.write("Not a valid hex");
+				return;
+			}
+			
+			Debug.write("Converting " + hex + " to hue " + toHue );
+			// Split the hex into pieces, convert to RGB, and create fraction
+			var r = ( this.hexToRGB( hex.slice(0,2) ) / 255 );
+			var g = ( this.hexToRGB( hex.slice(2,4) ) / 255 );
+			var b = ( this.hexToRGB( hex.slice(4,6) ) / 255 );
+			
+			// Convert to HSL
+			var hsl = this.RGBtoHSL( r, g, b );
+			
+			Debug.dir( hsl );
+			
+			// Change our hue to a fraction
+			hsl[0] = (1 / 360) * toHue;			
+			hsl[1] = (1 / 100) * toSat;
+			// Back to RGB
+			var rgb = this.HSLtoRGB( hsl[0], hsl[1], hsl[2] );
+			
+			return this.RGBtoHex( rgb[0], rgb[1], rgb[2] );
+		},
+		
+		//------------------------------------------
+		// Converts an HSL value to RGB
+		//------------------------------------------
+		HSLtoRGB: function( h, s, l ){			
+			var red = 0;
+			var green = 0;
+			var blue = 0;
+			
+			if( s == 0 ){
+				red = l * 255;
+				green = l * 255;
+				blue = l * 255;
+			} else {
+				if( l < 0.5 ){
+					var v2 = l * ( 1 + s );
+				} else {
+					var v2 = ( l + s ) - ( s * l );
+				}
+				
+				var v1 = 2 * l - v2;
+				
+				red = 255 * this.HueToRGB( v1, v2, (h + ( 1 / 3 ) ) );
+				green = 255 * this.HueToRGB( v1, v2, h );
+				blue = 255 * this.HueToRGB( v1, v2, (h - ( 1 / 3 ) ) );
+			}
+			
+			return [ Math.round( red ), Math.round( green ), Math.round( blue ) ];
+		},
+		
+		//------------------------------------------
+		// Converts a hue to an RGB decimal value
+		//------------------------------------------
+		HueToRGB: function( v1, v2, h ){
+			if( h < 0 ){ h += 1; }
+			if( h > 1 ){ h -= 1; }
+			
+			if( ( 6 * h ) < 1 ){
+				return ( v1 + ( v2 - v1 ) * 6 * h );
+			}			
+			if( ( 2 * h ) < 1 ){
+				return v2;
+			}			
+			if( ( 3 * h ) < 2 ){
+				return ( v1 + ( v2 - v1 ) * ( ( 2 / 3 ) - h ) * 6 );
+			}	
+			
+			return v1;
+		},
+		
+		//------------------------------------------
+		// Converts an RGB to a HSL value
+		//------------------------------------------
+		RGBtoHSL: function( r, g, b ){			
+			var lightness, hue, saturation = 0;
+			
+			var min = [ r, g, b ].min();
+			var max = [ r, g, b ].max();
+			var delta = max - min;
+			
+			lightness = ( max + min ) / 2;
+			
+			if( delta == 0 ){ 	// Grey
+				hue = 0;
+				saturation = 0;
+			} else {
+				if( lightness < 0.5 ){
+					saturation = delta / ( max + min );
+				} else {
+					saturation = delta / ( 2 - max - min );
+				}
+				
+				var delta_r = ( ( ( max - r ) / 6 ) + ( delta / 2 ) ) / delta;
+				var delta_g = ( ( ( max - g ) / 6 ) + ( delta / 2 ) ) / delta;
+				var delta_b = ( ( ( max - b ) / 6 ) + ( delta / 2 ) ) / delta;
+				
+				if( r == max ){
+					hue = delta_b - delta_g;
+				} else if( g == max ){
+					hue = ( 1 / 3 ) + delta_r - delta_b;
+				} else if( b == max ){
+					hue = ( 2 / 3 ) + delta_g - delta_r;
+				}
+				
+				if( hue < 0 ){
+					hue += 1;
+				}
+				
+				if( hue > 1 ){
+					hue -= 1;
+				}
+			}
+			
+			return [ hue, saturation, lightness ];
+		},
+		
+		//------------------------------------------
+		// Converts a hex to an RGB value
+		//------------------------------------------
+		hexToRGB: function( hex ){
+			return parseInt(hex,16);
+		},
+		
+		RGBtoHex: function( r, g, b ){
+			var hex = [ r.toString(16), g.toString(16), b.toString(16) ];
+			hex.each(function(val,nr) {
+				if(val.length == 1){
+					hex[nr] = '0' + val;
+				}
+			});
+			return hex.join('');
+		}
+	},
+	
+	//============================================================
+	// IMAGE EDITOR
+	// Accepts uploads of images
+	//============================================================
+	imageEditor: {
+		_parent: null,
+		
+		//------------------------------------------
+		// Shows/hides the image editor
+		//------------------------------------------
+		toggleImageEditor: function(e){
+			if( typeof FileReader === 'undefined' ){
+				alert("Ваш браузер не поддерживает работу � редактированием изображений");
+				return;
+			}
+			
+			if( !$('skingen_images_editor') ){
+				this.buildImageEditor();
+			}		
+		},
+		
+		//------------------------------------------
+		// Builds the image editor window
+		//------------------------------------------
+		buildImageEditor: function(e){
+			var content = [];
+			
+			// Build image entries
+			this._parent.imageReplacements.each( function(item){
+				content.push( this._parent.templates.imageEditorItem.evaluate( { 
+									id: item.key,
+									img: this.buildImage( item ),
+									upload: this.buildUploadControl( item ) } ) );				
+			}.bind(this));
+			
+			var imageEditor = this._parent.templates.imageEditor.evaluate( { content: content.join('') } );
+			$('skingen_editor').insert( { bottom: imageEditor } );
+			
+			$('skingen_images_editor').on('click', 'input[type=button][data-img]', this.uploadImage.bind(this));
+			
+			// Make draggable
+			new Draggable( 'skingen_images_editor', { handle: "#skingen_images_editor h1" } );
+		},
+		
+		//------------------------------------------
+		// Event handler for uploading an image
+		//------------------------------------------
+		uploadImage: function( e, elem ){
+			// Find upload control
+			var img = elem.readAttribute('data-img');
+			var thumb = $('img_' + img);
+			var uploader = $('skingen_images_content').select("input[type=file][data-img=" + img + "]")[0];
+			
+			if( !thumb || !uploader || !uploader.files[0] ){ return; }
+			
+			var file = uploader.files[0];
+			
+			if( !(/image/i).test( file.type ) ){
+				alert("Этот файл не �вл�ет�� файлом изображени�, поробуйте другой!");
+				return;
+			}
+			
+			var reader = new FileReader();
+			reader.onload = function(e) { 
+				this.updateImageReferences( e.target.result, img );
+			}.bind(this);
+			
+			reader.readAsDataURL( file );
+		},
+		
+		//------------------------------------------
+		// Updates all instances of an image on the page
+		// to use the data url returned by FileReader
+		//------------------------------------------
+		updateImageReferences: function( dataURL, img ){
+			// Update preview image first
+			if( $('img_' + img) ){
+				$('img_' + img).src = dataURL;
+			}
+			
+			var itemObj = this._parent.imageReplacements.get( img );
+			
+			// find all places the image is used
+			$$( itemObj[1] + " img" ).each( function( item ){
+				if( item.src.match( itemObj[0] ) || item.readAttribute('data-img') == img ){
+					item.src = dataURL;
+					item.writeAttribute('data-img', img);
+				}
+			});
+			
+			// Update customized image in the object
+			this._parent.updatedImages.set( img, dataURL );
+			this._parent.updateStoredImages();
+		},
+		
+		//------------------------------------------
+		// Returns an image tag
+		//------------------------------------------
+		buildImage: function( item ){
+			return "<img src='" + ipb.vars['img_url'] + item.value[2] + item.value[0] + "' id='img_" + item.key + "' />";
+		},
+		
+		//------------------------------------------
+		// Returns an upload control
+		//------------------------------------------
+		buildUploadControl: function(item){
+			return "<input type='file' id='upload_img_" + item.key + "' data-img='" + item.key + "'  /> <input type='button' id='upload_img_btn_" + item.key + "' data-img='" + item.key + "' value='Save' />";			
+		}
+	},
+	
+	//============================================================
+	// CSS MANIPULATOR
+	// Manipulates CSS in the stylesheet in order to preview styles
+	//============================================================
+	cssManipulator: {
+		_parent: null,
+		styleSheet: null,
+		
+		//------------------------------------------
+		// Update one selector in the injected stylesheet
+		//------------------------------------------
+		updateSelector: function( selector ){
+			if( !$('injected_stylesheet') ){
+				this.createInjectedStylesheet();
+				return;
+			}
+			
+			var getRules = '';
+			var styleSheet = this.fetchStyleSheet();
+			
+			// Build our rule
+			var newRule      = this._parent.buildRenderedRule( selector );
+			var realSelector = this._unifyRule( this._parent.skinClasses.get( selector )[0] );
+			
+			Debug.write( "Updating - " + selector + ' - :' + realSelector + ':' );
+			
+			// Compatibility issue		
+			getRules = ( styleSheet['cssRules'] ) ? 'cssRules' : 'rules';			
+
+			// Loop through rules
+			for ( rules = 0; rules < styleSheet[ getRules ].length; rules++ )
+			{
+				Debug.write( "Looking at... :" + styleSheet[ getRules ][ rules ].selectorText + ':' );
+				
+				if ( this._unifyRule( styleSheet[ getRules ][ rules ].selectorText ) == realSelector )
+				{
+					Debug.write( "Found it... :" + newRule  + ':');
+					
+					// Remove rule completely then readd it
+					styleSheet.deleteRule( rules );
+					styleSheet.insertRule( newRule, rules );
+				}
+			}
+		},
+		
+		updateWidth: function( selector ){
+			if( !$('injected_stylesheet') ){
+				this.createInjectedStylesheet();
+				return;
+			}
+			
+			var getRules = '';
+			var styleSheet = this.fetchStyleSheet();
+			
+			/* figure out width, etc */
+			var settings = this._parent.db.load("storedSettings");
+			var width    = ( Object.isUndefined( settings['width_value'] ) ) ? '87' : settings['width_value'];
+			var px_pc    = ( Object.isUndefined( settings['width_type'] ) )  ? '%' : settings['width_type'];
+			
+			// Build our rule
+			var newRule = '#content, .main_width { width: ' + width + px_pc + ' !important; }';
+			var realSelector = '#content, .main_width';
+			
+			// Compatibility issue		
+			getRules = ( styleSheet['cssRules'] ) ? 'cssRules' : 'rules';			
+
+			// Loop through rules
+			for( rules = 0; rules < styleSheet[ getRules ].length; rules++ ){
+				if( styleSheet[ getRules ][ rules ].selectorText == realSelector ){
+					// Remove rule completely then readd it
+					styleSheet.deleteRule( rules );
+					styleSheet.insertRule( newRule, rules );
+				}
+			}
+		},
+		
+		//------------------------------------------
+		// Finds and returns the injected stylesheet
+		//------------------------------------------
+		fetchStyleSheet: function(){
+			if( this.styleSheet ){
+				return this.styleSheet;
+			}
+			
+			var styleSheets = document.styleSheets;
+			
+			for( sheet = 0; sheet < styleSheets.length; sheet++ ){
+				if( styleSheets[ sheet ].ownerNode.id == 'injected_stylesheet' ){
+					this.styleSheet = styleSheets[ sheet ];
+					return this.styleSheet;
+				}
+			}
+			
+			return false;
+		},
+		
+		//------------------------------------------
+		// Build an injected stylesheet from scratch
+		//------------------------------------------
+		createInjectedStylesheet: function(){
+			var output = '';
+			
+			$H( this._parent.skinClasses ).each( function(item){
+				output += this._parent.getClassTemplate( this._parent.skinClasses.get( item.key ) );
+			}.bind(this));
+			
+			/* figure out width, etc */
+			var settings = this._parent.db.load("storedSettings");
+			var width    = ( Object.isUndefined( settings['width_value'] ) ) ? '87' : settings['width_value'];
+			var px_pc    = ( Object.isUndefined( settings['width_type'] ) )  ? '%' : settings['width_type'];
+			
+			output += '#content, .main_width { width: ' + width + px_pc + ' !important; }';
+			
+			output += ".topic_buttons li.non_button a {\
+		background: transparent !important;\
+		background-color: transparent !important;\
+		border: 0 !important;\
+		box-shadow: none !important;\
+		-moz-box-shadow: none !important;\
+		-webkit-box-shadow: none !important;\
+		text-shadow: none !important;\
+		min-width: 0px;\
+		color: #777777;\
+		font-weight: normal;\
+	}";
+	
+			Debug.write(output);
+			var stylesheet = new Element("style", { id: 'injected_stylesheet' }).update( output );
+			
+						
+			
+			$$('head')[0].insert( { bottom: stylesheet } );
+			
+		},
+		//-----------------------------------------
+		// Cleans rule to make sure spacing isn't an issue
+		//-----------------------------------------
+		_unifyRule: function( rule )
+		{
+			rule = rule.replace( /,\s{1,}/g, ',' );
+			
+			return rule;
+		}
+	},
+	
+	//============================================================
+	// DB OBJECT
+	// Simple DB wrapper with a few standard methods
+	//============================================================
+	db: {
+		_parent: null,
+		
+		write: function( saveTo, saveValue ){			
+			localStorage.setItem("skingen." + saveTo, JSON.stringify( saveValue ) );
+		},
+		
+		load: function( loadKey ){
+			if( localStorage.getItem("skingen." + loadKey) ){
+				return JSON.parse( localStorage.getItem("skingen." + loadKey) );
+			}
+			
+			return false;
+		}
+	},
+	/* ! xray */
+	//============================================================
+	// XRAY INSPECTOR
+	// Click to select elements, finds IP.Board classes that apply
+	//============================================================
+	xray: {
+		_parent: null,
+		matched: null,
+		e: {},
+		
+		//------------------------------------------
+		// Find eligible elements, and set events
+		//------------------------------------------
+		start: function(){
+			// All elements except the skingen_editor
+			this.exclude = $$("#skingen_editor, #skingen_editor *");
+			
+			$('skingen_select').addClassName('active');
+			
+			this.e['md'] = $(document).on('mousedown', this.doXray.bind(this));
+			this.e['mm'] = $(document).on('mousemove', this.doFalse.bind(this));
+			this.e['mo'] = $(document).on('mouseover', this.doFalse.bind(this));
+		},
+		
+		//------------------------------------------
+		// Unset events
+		//------------------------------------------
+		finish: function(){
+			$('skingen_select').removeClassName('active');
+			this.exclude = null;
+			this.e['md'].stop();
+			this.e['mm'].stop();
+			this.e['mo'].stop();
+			this._parent.body.removeClassName('selecting');
+		},
+		
+		//------------------------------------------
+		// mousedown handler; shows the xray flash box
+		//------------------------------------------
+		doXray: function(e){
+			Event.stop(e);
+			
+			var item = Event.findElement(e);
+			
+			if( this.exclude.include( item ) ){
+				return;
+			}
+						
+			var offset = item.cumulativeOffset();
+			var dims = item.getLayout();
+			var newElem = new Element('div', { id: 'skingen_xray' }).addClassName('skingen_xray').setStyle({
+							width: dims.get('padding-box-width') + "px",
+							height: dims.get('padding-box-height') + "px",
+							top: (offset.top ) + "px",
+							left: (offset.left) + "px"
+						}).writeAttribute('elem', id);
+						
+			this._parent.body.insert({bottom: newElem});
+			new Effect.Fade( newElem, { duration: 0.7, afterFinish: function(){ newElem.remove() } } );
+			
+			this.finish();
+			this.findMatchingSelectors( item );
+		},
+		
+		//------------------------------------------
+		// Simply return false and set the default cursor
+		//------------------------------------------
+		doFalse: function(e){
+			this._parent.body.addClassName('selecting');
+			Event.stop(e);
+		},
+		
+		//------------------------------------------
+		// Finds the nearest customizable selector
+		// to the clicked element
+		//------------------------------------------
+		findMatchingSelectors: function( item ){
+			// Get ancestors and add item itself to it
+			var ancestors = $(item).ancestors();
+			ancestors.unshift( item );
+			
+			var matchedClass = false;
+			var className	 = false;
+			var others       = new Array();
+			
+			// Double loop - go through ancestors, checking each class for a match
+			var matching = ancestors.find( function(n){
+				return this._parent.classList.find( function(m){
+					matchedClass = m;
+					return $(n).match( m );
+				}.bind(this));
+			}.bind(this));
+			
+			if ( ! matchedClass ) {
+				alert("�е найдено ни одного �тил� удовлетвор�ющего �лементу.");
+			}
+			
+			/* Look for any parents */
+			var matching = ancestors.find( function(n)
+			{
+				var gotIt = this._parent.classList.find( function(m)
+				{
+					className = m;
+					
+					if ( matchedClass == className )
+					{
+						return false;
+					}
+					else
+					{
+						return $(n).match( m );
+					}
+				}.bind(this) );
+				
+				if ( gotIt && className )
+				{
+					this._parent.skinClasses.find( function(c)
+					{
+						if ( c.value[0] == className )
+						{
+							others.push( c.key );
+						}
+					}.bind(this) );
+				}
+			}.bind(this));
+			
+			// So we know the real classname
+			// Now loop through our hash of customizable values
+			// and find the one that matches the classname
+			this._parent.skinClasses.find( function(c){
+				if( c.value[0] == matchedClass ){
+					this._parent.showPane( c.key, others );
+					return true;
+				} else {
+					return false;
+				}
+			}.bind(this));
+		}	
+	},
+	/* ! dropper */
+	//============================================================
+	// DROPPER
+	// Selects a hex from mouse position
+	//============================================================
+	dropper: {
+		_parent: null,
+		e: {},
+		item: null,
+		id: null,
+		
+		//------------------------------------------
+		// Find eligible elements, and set events
+		//------------------------------------------
+		start: function( item, id ){
+			// All elements except the skingen_editor
+			this.exclude = $$("#skingen_editor, #skingen_editor *");
+			this.item = item;
+			this.id   = id;
+			
+			this.e['md'] = $(document).on('mousedown', this.doDropper.bind(this));
+			this.e['mm'] = $(document).on('mousemove', this.doFalse.bind(this));
+			this.e['mo'] = $(document).on('mouseover', this.doFalse.bind(this));
+		},
+		
+		//------------------------------------------
+		// Unset events
+		//------------------------------------------
+		finish: function(){
+			this.exclude = null;
+			this.e['md'].stop();
+			this.e['mm'].stop();
+			this.e['mo'].stop();
+			this._parent.body.removeClassName('selecting');
+		},
+		
+		//------------------------------------------
+		// mousedown handler; shows the xray flash box
+		//------------------------------------------
+		doDropper: function(e){
+			Event.stop(e);
+			
+			var item = Event.findElement(e);
+			
+			if( this.exclude.include( item ) ){
+				return;
+			}
+						
+			var offset = item.cumulativeOffset();
+			var dims = item.getLayout();
+			var newElem = new Element('div', { id: 'skingen_dropper' }).addClassName('skingen_xray').setStyle({
+							width: dims.get('padding-box-width') + "px",
+							height: dims.get('padding-box-height') + "px",
+							top: (offset.top ) + "px",
+							left: (offset.left) + "px"
+						}).writeAttribute('elem', id);
+						
+			this._parent.body.insert({bottom: newElem});
+			new Effect.Fade( newElem, { duration: 0.3, afterFinish: function(){ newElem.remove() } } );
+			
+			this.finish();
+			this.setColorPickerFromKnownSelectors( item );
+		},
+		
+		//------------------------------------------
+		// Simply return false and set the default cursor
+		//------------------------------------------
+		doFalse: function(e){
+			this._parent.body.addClassName('selecting');
+			Event.stop(e);
+		},
+		
+		//------------------------------------------
+		// Sets the color picker
+		//------------------------------------------
+		setColorPickerFromKnownSelectors: function( item ){
+			// Get ancestors and add item itself to it
+			var ancestors = $(item).ancestors();
+			ancestors.unshift( item );
+			
+			var matchedClass = '';
+			
+			// Double loop - go through ancestors, checking each class for a match
+			var matching = ancestors.find( function(n){ 
+				return this._parent.classList.find( function(m){
+					matchedClass = m;
+					return $(n).match( m );
+				}.bind(this));
+			}.bind(this));
+			
+			if( !matchedClass ){
+				alert("�е найдено ни одного �тил� удовлетвор�ющего �лементу.");
+			} 
+			
+			// So we know the real classname
+			// Now loop through our hash of customizable values
+			// and find the one that matches the classname
+			this._parent.skinClasses.find( function(c){
+				if( c.value[0] == matchedClass ){
+					try
+					{
+						var bg = this._parent.getHexFromSelector( c.key, 'background' );
+						var fc = this._parent.getHexFromSelector( c.key, 'color' );
+						var hex = ( bg ) ? bg : fc;
+						
+						if ( hex !== false )
+						{
+							hex = hex.replace( '#', '' );
+							
+							this._parent.updatePicker( this.id, this.item, hex );
+						}
+					}
+					catch( e ) { }
+					
+					return true;
+				} else {
+					return false;
+				}
+			}.bind(this));
+		}	
+	},
+
+	
+	//============================================================
+	// TEMPLATES
+	// Various templates for the editor
+	//============================================================
+	templates: {
+		editor: new Template("<div id='skingen_editor' class='skingen_editor'>								\
+								<h1>Визуальный редактор �тил�</h1>													\
+								<div id='skingen_content' class='skingen_content'>							\
+									<div id='skingen_toolbar'>												\
+										<!--<a href='#' id='skingen_images'>Редактирование изображений</a>&nbsp;&nbsp;-->	\
+										<a href='#' id='skingen_settings'><img src='" + skingen_imgs + "/settings.png' />&nbsp; �а�тройки �тил�</a>&nbsp;&nbsp;		\
+										<a href='#' id='skingen_colorize'><img src='" + skingen_imgs + "/colorize.png' />&nbsp; Колорайзер</a>&nbsp;&nbsp; \
+										<a href='#' id='skingen_revert'><img src='" + skingen_imgs + "/delete.png' />&nbsp; Сбро�</a>&nbsp;&nbsp;		\
+										<a href='#' id='skingen_save'><img src='" + skingen_imgs + "/build.png' />&nbsp; Создать �тиль</a>&nbsp;&nbsp;			\
+										<a href='#' id='skingen_locate' class='right' title='�айти �лементы, и�пользующие выбранный �тиль на �той �транице'><img src='" + skingen_imgs + "/show_locations.png' /></a>&nbsp;&nbsp;\
+										<a href='#' id='skingen_select' class='right' title='Выбор �тил�, путем выбора �лемента на �транице'><img src='" + skingen_imgs + "/select_element.png' /></a>\
+									</div>																	\
+									<div id='skingen_sections' class='skingen_sections'>#{sections}</div>							\
+									<div id='skingen_panes'></div>											\
+								</div>																		\
+							</div>"),
+		otherClassesGroup: new Template("<h3 class='open'>Св�занные кла��ы</h3><ul>#{content}</ul>"),
+		sectionGroup: new Template("<h3 class='open' data-group='#{id}'><a href='#' class='skingen_toggle_group'>&nbsp;</a> #{title}</h3><ul id='skingen_group_#{id}' data-group='#{id}'>#{content}</ul>"),
+		sectionItem: new Template("<li id='section_#{id}' class='clearfix'><span style='#{style}' class='color'></span>#{name}</li>"),
+		paneWrap: new Template("<div id='skingen_pane_#{id}' class='skingen_pane'><p class='right skingen_selector' title='Данный �електор и�пользует�� дл� �тилизации �лемента в CSS'><span>#{selector}</span></p><h2>#{name}</h2><p>#{description}</p><div class='skingen_pane_contents'>#{content}</div><div id='skingen_pane_#{id}_others' class='skingen_sections otherClasses' style='display:none'></div></div>"),
+		sectionColors: new Template("<fieldset class='colors'><span class='legend'>Цвета</span>#{content}</fieldset>"),
+		sectionBorders: new Template("<fieldset class='border'><span class='legend'>Рамка</span>#{content}</fieldset>"),
+		widgetBackground: new Template("<span class='control' title='Цвет фона'><img src='" + skingen_imgs + "/background.png' /> <input type='text' class='' id='background_#{id}' data-type='background' /><span id='background_preview_#{id}' class='skingen_preview'></span> <a href='#' class='sg_dropper' title='Пипетка' id='background_dropper_#{id}'><img src='" + skingen_imgs + "/color-picker.png' /></a></span>"),
+		widgetForeground: new Template("<span class='control' title='Цвет тек�та'><img src='" + skingen_imgs + "/color.png' /> <input type='text' class='' id='color_#{id}' data-type='color' /><span id='color_preview_#{id}' class='skingen_preview'></span> <a href='#' class='sg_dropper' title='Пипетка' id='color_dropper_#{id}'><img src='" + skingen_imgs + "/color-picker.png' /></a></span>"),
+		widgetBorder: new Template("<span class='control' title='Цвет рамки'><img src='" + skingen_imgs + "/border-color.png' /> <input type='text' class='' id='border_#{id}' data-type='border' /><span id='border_preview_#{id}' class='skingen_preview'></span> <a href='#' class='sg_dropper' title='Пипетка' id='border_dropper_#{id}'><img src='" + skingen_imgs + "/color-picker.png' /></a></span>"),
+		widgetBoxShadow: new Template("<span class='control' title='Цвет тени'><img src='" + skingen_imgs + "/box-shadow.png' /> <input type='text' class='' id='boxshadow_#{id}' data-type='boxshadow' /><span id='boxshadow_preview_#{id}' class='skingen_preview'></span> <a href='#' class='sg_dropper' title='Пипетка' id='boxshadow_dropper_#{id}'><img src='" + skingen_imgs + "/color-picker.png' /></a></span>"),
+		settingsEditor: new Template("<div id='skingen_settings_editor' class='skingen_editor'>				\
+										<h1>�а�тройки �тил�</h1>												\
+										<div id='skingen_settings_content' class='skingen_content'>			\
+											<p class='skingen_desc'>О�новные на�тройки вашего �тил�.</p>	\
+												<br />														\
+												<table style='margin: 10px auto; width: 80%'>				\
+												<tr>														\
+													<td>Ширина</td>										\
+													<td><input type='text' id='skingen_setting_width' value='#{width}' /> <select id='skingen_setting_widthunit'><option value='px'>pixels</option><option value='percent'>%</option></select>										\
+													</td>													\
+												</tr>														\
+											</table>														\
+											<br />																				\
+											<p class='skingen_buttons'>															\
+												<a href='#' id='skingen_settings_cancel'>Отменить</a>&nbsp;&nbsp;&nbsp;<a href='#' id='skingen_settings_save'>Сохранить</a>\
+											</p>																				\
+										</div>																					\
+									</div>"),
+		buildSkin: new Template("<div id='skingen_buildskin_editor' class='skingen_editor'>				\
+										<h1>Создание �тил�</h1>												\
+										<div id='skingen_buildskin_content' class='skingen_content'>			\
+											<p class='skingen_desc'>Сохранение изменений и �оздание �тил�.</p>	\
+												<br />														\
+												<table style='margin: 10px auto; width: 80%'>				\
+												<tr>														\
+													<td><p>В�е изменени� будут вне�ены в �тиль. Редактор будет закрыт.</p>	</td>													\
+												</tr>															\
+											</table>														\
+											<br />																				\
+											<p class='skingen_buttons'>															\
+												<a href='#' id='skingen_buildskin_cancel'>Отмена</a>&nbsp;&nbsp;&nbsp;<a href='#' id='skingen_buildskin_save'>Создать</a>\
+											</p>																				\
+										</div>																					\
+									</div>"),
+		colorizeEditor: new Template("<div id='skingen_colorize_editor' class='skingen_editor' style='display: none'>			\
+										<h1>Ра�кра�ка �тил�</h1>																\
+										<div id='skingen_colorize_content' class='skingen_content'>								\
+											<p class='skingen_desc'>И�пользуйте ин�трумент дл� изменени� оттенка (цвета) в�ех �оответ�твующих �тилей в один прием. Затем можно редактировать отдельные �тили, и�пользу� главный редактор. В�ИМ��ИЕ: и�пользование ин�трумента приведет к перезапи�и любых изменений в �тил�х, которые вы уже на�трили.</p>																							\
+											<table style='margin: 10px 0'>													\
+												<tr>																			\
+													<td style='width: 50%'><p id='skingen_colorize_base' class='color' data-type='base'></p><br />Первичный цвет</td>\
+													<td style='width: 50%'><p id='skingen_colorize_secondary' class='color' data-type='secondary'></p><br />Вторичный цвет</td>\
+												</tr>																			\
+												<tr>																			\
+													<td><p id='skingen_colorize_tertiary' class='color' data-type='tertiary'></p><br />Третичный Color</td>\
+													<td><p id='skingen_colorize_text' class='color' data-type='text'></p><br />Цвет тек�та</td>\
+												</tr>																			\
+											</table>																			\
+											<br />																				\
+											<p class='skingen_buttons'>															\
+												<a href='#' id='skingen_colorize_cancel'>Отменить</a>&nbsp;&nbsp;&nbsp;<a href='#' id='skingen_colorize_save'>Применить</a>																													\
+											</p>																				\
+										</div>																					\
+									</div>"),				
+		imageEditor: new Template("<div id='skingen_images_editor' class='skingen_editor'><h1>Редактор изображений</h1><div id='skingen_images_content' class='skingen_content'>#{content}</div></div>"),
+		imageEditorItem: new Template("<div id='image_#{id}' class='skingen_image_item clearfix'>#{img}<p class='right'>#{upload}</p></div>")
+	},
+	
+	//============================================================
+	// SKIN CLASSES
+	// Our master hash of the classes that can be customized
+	//============================================================
+	skinClasses: $H( IPS_SKIN_GEN_DATA['classes'] ),
+	
+	//============================================================
+	// SKIN GROUPS
+	// This object groups the classes in the main display
+	//============================================================
+	skinGroups: $H( IPS_SKIN_GEN_DATA['skinGroups'] ),	
+	
+	//============================================================
+	// SKIN GROUPS
+	// This object defines which classes are altered when one of the colorize selectors is altered
+	//============================================================
+	colorizeGroups: $H( IPS_SKIN_GEN_DATA['colorizeGroups'] ),
+	
+	imageReplacements: $H({
+		logo: 	[	'logo.png',												// Filename
+					'#logo',												// Scope to find image in (default: *)
+					'/',													// Path to find this image in the skin folder
+					'Логотип �ообще�тва'								// Description
+				],
+				
+		defaultPhoto: [ 	'default_large.png',
+							'',
+							'/profile/',
+							'Фотографи� по умолчанию'
+					]
+	})
+};
+
+document.observe("dom:loaded", function(){
+	skingen.boot();
+});
\ No newline at end of file
diff --git a/upload/public/js/ips.status.js b/upload/public/js/ips.status.js
index dada8263..a6681cf5 100644
--- a/upload/public/js/ips.status.js
+++ b/upload/public/js/ips.status.js
@@ -11,9 +11,13 @@ var _status = window.IPBoard;
 
 _status.prototype.status = {
 	_updateClicked: false,
+	forMemberId: 0,
 	maxReplies: 0,
 	smallSpace: 0,
 	myLatest: 0,
+	skin_group: 'profile',
+	events: { 'page': false, 'normal': false },
+	
 	init: function()
 	{
 		Debug.write("Initializing ips.status.js");
@@ -59,28 +63,24 @@ _status.prototype.status = {
 		/* Delete status link */
 		ipb.delegate.register(".__sTO", ipb.status.hideFeedback);
 		
-		/* Can we update our status? */
-		if ( $('statusUpdate') )
+		if ( $('statusUpdate_page') && ipb.status.events['page'] === false )
 		{
-			ipb.status._updateClicked = false;
-			
-			$('statusUpdate').stopObserving( 'click' );
-			$('statusUpdate').stopObserving( 'keypress' );
-			$('statusSubmit').stopObserving( 'click' );
-			
-			$('statusUpdate').value = ipb.lang['prof_update_default'];
-			
-			$('statusUpdate').addClassName('status_inactive');
-			
-			if ( ! ipb.status.smallSpace )
+			try
 			{
-				$('statusSubmit').value = ipb.lang['prof_update_button'];
-				$('statusSubmit').addClassName('status_smallspace');
+				ipb.status.forMemberId = parseInt( $('statusUpdate_page').readAttribute('data-for-member-id') );
+			}
+			catch(e) {}
+			
+			if ( ! ipb.status.forMemberId )
+			{
+				$('statusUpdate_page').defaultize( ipb.lang['global_status_update'] );
+			}
+			else
+			{
+				$('statusUpdate_page').defaultize( ipb.lang['global_leave_msg'] );
 			}
 			
-			$('statusUpdate').observe( 'click', ipb.status.updateUpdateText.bindAsEventListener( this ) );
-			$('statusUpdate').observe( 'keypress', ipb.global.checkForEnter.bindAsEventListener( this, ipb.status.updateSubmit ) );
-			$('statusSubmit').observe( 'click', ipb.status.updateSubmit.bindAsEventListener( this ) );
+			ipb.status.events['page'] = $('statusSubmit_page').on( 'click', ipb.status.updateSubmit.bindAsEventListener( this, 'statusUpdate_page' ) );
 		}
 	},
 	
@@ -96,29 +96,16 @@ _status.prototype.status = {
 		$('statusText-' + id).focus();
 	},
 	
-	/*!! deleteStatus */
-	/* result of clicking "delete" on a status */
-	updateUpdateText: function(e)
-	{
-		if ( ipb.status._updateClicked )
-		{
-			return;
-		}
-		else
-		{
-			ipb.status._updateClicked = true;
-			$('statusUpdate').value = '';
-			$('statusUpdate').removeClassName('status_inactive');
-		}
-	},
 	
 	/*!! updateSubmit */
 	/* Add a sexy ajax status" */
-	updateSubmit: function(e)
+	updateSubmit: function(e, field)
 	{
 		Event.stop(e);
 		
-		if ( $('statusUpdate' ).value.length < 2 || $('statusUpdate').value == ipb.lang['prof_update_default'] )
+		$('statusSubmitGlobal').stopObserving( 'click' );
+		
+		if ( $( field ).value.length < 2 || $( field ).value == ipb.lang['prof_update_default'] )
 		{
 			return false;
 		}
@@ -126,12 +113,12 @@ _status.prototype.status = {
 		var su_Twitter  = $('su_Twitter') && $('su_Twitter').checked ? 1  : 0;
 		var su_Facebook = $('su_Facebook') && $('su_Facebook').checked ? 1 : 0;
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=new&md5check=" + ipb.vars['secure_hash'] + '&smallSpace=' + ipb.status.smallSpace,
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=new&md5check=" + ipb.vars['secure_hash'] + '&smallSpace=' + ipb.status.smallSpace + '&skin_group=' + ipb.status.skin_group + '&forMemberId=' + ipb.status.forMemberId,
 						{
 							method: 'post',
 							evalJSON: 'force',
 							parameters: {
-								content: $('statusUpdate' ).value.encodeParam(),
+								content: $( field ).value.encodeParam(),
 								su_Twitter: su_Twitter,
 								su_Facebook: su_Facebook
 							},
@@ -164,7 +151,10 @@ _status.prototype.status = {
 										/* Need to blur out of field
 											@link	http://community.invisionpower.com/tracker/issue-21358-small-input-field-behavior-issue-after-updating-status/
 										*/
-										$('statusUpdate' ).blur();
+										$( field ).blur();
+										$( field ).value = '';
+										
+										ipb.menus.closeAll(e);
 										
 										/* Re-init events */
 										ipb.status.initEvents();
@@ -274,7 +264,7 @@ _status.prototype.status = {
 		if( status == null || Object.isUndefined( status[1] ) ){ Debug.error("Error"); return; }
 		var status_id = status[1];
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=lockStatus&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash'],
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=lockStatus&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash'] + '&skin_group=' + ipb.status.skin_group,
 						{
 							method: 'get',
 							onSuccess: function(t)
@@ -310,7 +300,7 @@ _status.prototype.status = {
 		if( status == null || Object.isUndefined( status[1] ) ){ Debug.error("Error"); return; }
 		var status_id = status[1];
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=unlockStatus&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash'],
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=unlockStatus&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash']+ '&skin_group=' + ipb.status.skin_group,
 						{
 							method: 'get',
 							onSuccess: function(t)
@@ -346,7 +336,7 @@ _status.prototype.status = {
 		var status_id = status[1];
 		var reply_id  = status[2];
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=deleteReply&status_id=" + status_id + "&reply_id=" + reply_id + "&md5check=" + ipb.vars['secure_hash'],
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=deleteReply&status_id=" + status_id + "&reply_id=" + reply_id + "&md5check=" + ipb.vars['secure_hash']+ '&skin_group=' + ipb.status.skin_group,
 						{
 							method: 'get',
 							onSuccess: function(t)
@@ -375,7 +365,7 @@ _status.prototype.status = {
 		if( status == null || Object.isUndefined( status[1] ) ){ Debug.error("Error showing all comments"); return; }
 		var status_id = status[1];
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=showall&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash'],
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=showall&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash']+ '&skin_group=' + ipb.status.skin_group,
 						{
 							method: 'get',
 							onSuccess: function(t)
@@ -421,7 +411,7 @@ _status.prototype.status = {
 			return false;
 		}
 		
-		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=reply&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash'],
+		new Ajax.Request( ipb.vars['base_url'] + "app=members&section=status&module=ajax&do=reply&status_id=" + status_id + "&md5check=" + ipb.vars['secure_hash']+ '&skin_group=' + ipb.status.skin_group,
 						{
 							method: 'post',
 							evalJSON: 'force',
@@ -443,28 +433,12 @@ _status.prototype.status = {
 								else
 								{
 									try {
-										/* Already have replies, add them there so the overflow block looks correct */
-										if ( $('statusReplies-' + status_id ) )
-										{
-											$('statusReplies-' + status_id ).innerHTML += t.responseJSON['html'];
-										}
-										else
-										{
-											$( 'statusReplyBlank-' + status_id ).innerHTML += t.responseJSON['html'];
-										}
-										
+										$( 'statusReplyBlank-' + status_id ).show().innerHTML += t.responseJSON['html'];
 										$('statusText-' + status_id ).value = '';
-										
-										if ( t.responseJSON['status_replies'] && ipb.status.maxReplies && t.responseJSON['status_replies'] >= ipb.status.maxReplies )
-										{
-											$('statusMaxWrap-' + status_id ).show();
-											$('statusReply-' + status_id).hide();
-										}
-										
 									}
 									catch(err)
 									{
-										Debug.error( err );
+										Debug.write( err );
 									}
 								}
 							}
diff --git a/upload/public/js/ips.subscriptions.js b/upload/public/js/ips.subscriptions.js
deleted file mode 100644
index f5eadc3a..00000000
--- a/upload/public/js/ips.subscriptions.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.subscriptions.js - Subs Manager Public	*/
-/* (c) IPS, Inc 2009							*/
-/* -------------------------------------------- */
-/* Author: Matt Mecham, Rikki Tissier			*/
-/************************************************/
-
-var _subscriptions = window.IPBoard;
-
-_subscriptions.prototype.subscriptions = {
-	initDone: false,
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		document.observe("dom:loaded", function()
-		{
-			if ( ipb.subscriptions.initDone === false )
-			{
-				/* Set up submit handler */
-				$('register').observe( 'submit', ipb.subscriptions.formSubmit );
-				
-				ipb.subscriptions.initDone = true;
-				
-				Debug.write("Initializing ips.subscriptions.js");
-			}
-		});
-	},
-	
-	/**
-	 * handle a form submit
-	 */
-	formSubmit: function(e)
-	{
-		Event.stop(e);
-		
-		var _go = false;
-		
-		/* Did we check a radio button? */
-		$$('.sm__radio').each( function( element )
-		{
-			if ( element.checked )
-			{
-				_go = true;
-			}
-			
-		} );
-		
-		if ( _go !== true )
-		{
-			alert( 'Please choose a subscriptions package before continuing' );
-			return false;
-		}
-		else
-		{
-			$('register').submit();
-		}
-	}
-};
-
-ipb.subscriptions.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.tags.js b/upload/public/js/ips.tags.js
new file mode 100644
index 00000000..93b126ce
--- /dev/null
+++ b/upload/public/js/ips.tags.js
@@ -0,0 +1,466 @@
+/************************************************/
+/* IPB3 Javascript								*/
+/* -------------------------------------------- */
+/* ips.tags.js - Adds tokenizing tags to a textbox */
+/* (c) IPS, Inc 2011							*/
+/* -------------------------------------------- */
+/* Author: Rikki Tissier						*/
+/************************************************/
+
+var Tags = {};
+
+Element.addMethods( {
+	tagify: function( element, options )
+	{
+		options = Object.extend( {
+			existingTags: []
+		}, options);
+		
+		if( !options.isEnabled ){ return; }
+		
+		if( options.isOpenSystem ){
+			new Tags.Open( element, options );
+		} else {
+			new Tags.Closed( element, options );
+		}		
+	}
+});
+
+//==================================================
+// Base class for tag operations
+//==================================================
+Tags.Base = {
+	parentInit: function(){
+		// Set up prefixes
+		if( this.options.prefixesEnabled && $( this.id + '_prefix' ) ){
+			this.setUpPrefixes();
+		}
+		
+		// Store a reference to this on the tag box
+		this.element.store('obj', this);
+	},
+	
+	setUpPrefixes: function(){
+		var prefixCheck = $( this.id + '_prefix' );
+		
+		var prefixFunc = function(e){
+			if( $(prefixCheck).checked ){
+				$( this.tagWrapper ).addClassName('with_prefixes');
+			} else {
+				$( this.tagWrapper ).removeClassName('with_prefixes');
+			}
+		}.bind(this);
+		
+		prefixFunc();
+		
+		$( prefixCheck ).observe('click', prefixFunc);
+	},
+	
+	importTags: function(){
+		
+		if( this.options.existingTags && this.options.existingTags.size() ){
+			$A(this.options.existingTags).each( function(item){
+				if( !item.blank() )
+				{
+					this.addTag( item );
+				}
+			}.bind(this));
+		}
+	},
+	
+	buildWrapper: function(){
+		// The original textbox, which we'll remember
+		this.oldInput = $(this.element).observe('focus', function(e){ this.newInput.focus() }.bind(this))
+										.observe('blur', function(e){ this.newInput.blur() }.bind(this));
+
+		// The wrapper which holds our tags
+		this.tagWrapper = new Element("ul", { 'id': this.id + '_wrapper' })
+									.addClassName("ipsTagBox_wrapper")
+									.observe('click', this.eventClickWrapper.bindAsEventListener(this));
+
+		this.oldInput.insert({ 'before': this.tagWrapper }).hide();
+
+		// Create an item for the invisible textbox
+		this.inputItem = new Element("li", { 'id': this.id + '_inputItem' }).insert( this.newInput );
+		this.tagWrapper.insert({ 'bottom': this.inputItem });
+	},
+	
+	addTag: function( item ){
+		if( parseInt(this.options.forceLowercase) ){
+			item = item.toLowerCase();
+		}
+		
+		var closeTag = new Element("span")
+							.addClassName('ipsTagBox_closetag')
+							.update("&times;")
+							.observe('click', function(e){
+								this.deleteTag( Event.findElement(e, 'li') );
+							}.bind(this));
+		var newTag = new Element("li")
+						.writeAttribute("tValue", item)
+						.addClassName('ipsTagBox_tag')
+						.update( item )
+						.insert({'bottom': closeTag});
+						
+		this.inputItem.insert( { 'before': newTag } );
+		
+		// Add to hidden input
+		this.oldInput.value += item+',';
+		
+		if( Object.isFunction( this._afterAdd ) ){
+			this._afterAdd(item);
+		}
+	},
+	
+	selectTag: function( tag ){
+		this.deselectAll();
+		$( tag ).addClassName('selected');
+		this.selectedTag = $( tag );
+		
+		if( Object.isFunction( this._afterSelect ) ){
+			this._afterSelect(tag);
+		}
+	},
+	
+	deleteTag: function( tag ){
+		
+		if( this.selectedTag == $(tag) ){
+			this.selectedTag = null;
+		}
+		
+		var value = $(tag).readAttribute('tvalue');
+		$(tag).remove();
+		
+		// Add to hidden input
+		this.oldInput.value = this.oldInput.value.replace(value+',', '');
+		
+		if( Object.isFunction( this._afterDelete ) ){
+			this._afterDelete( value );
+		}
+	},
+	
+	deselectAll: function(){
+		$( this.tagWrapper ).select("li").invoke("removeClassName", 'selected');
+		this.selectedTag = null;
+	},
+	
+	calculateTotal: function(){
+		return $( this.tagWrapper ).select("li:not(#"+this.id+"_inputItem)").size();
+	},
+	
+	eventClickWrapper: function(e){
+		var elem = Event.findElement(e, 'li');
+		if( elem && $(elem) != $(this.id + '_inputItem') && $(elem).hasClassName('ipsTagBox_tag') ){
+			this.selectTag( $(elem) );
+		} else {
+			$( this.newInput ).focus();
+		}
+		return false;
+	},
+
+	//--------------------------------------------------------------
+	// Public Methods
+	//--------------------------------------------------------------
+	
+	getTagCount: function(){
+		return this.calculateTotal();
+	},
+	
+	serializeTags: function(){
+		var tags = $A();
+		$( this.tagWrapper ).select("li:not(#"+this.id+"_inputItem)").each(function(elem){
+			tags.push( $(elem).readAttribute('tvalue') );
+		});
+		return tags;
+	}
+}
+
+//==================================================
+// 'Closed' tagging (i.e. predefined tags)
+//==================================================
+Tags.Closed = Class.create( Object.extend( {
+	
+	initialize: function( element, options ){
+		this.element = $( element );
+		this.id = this.element.id;
+		this.options = options;
+		this.handlers = {};
+		
+		if( Object.isUndefined( this.options.predefinedTags ) || !this.options.predefinedTags || !this.options.predefinedTags.size() ){
+			Debug.write( "No predefined tags available" );
+			try {
+				$( this.element ).up('.tag_field').hide();
+			} catch(err){ }
+			return;
+		}
+		
+		this.newInput = new Element("a", { 'href': '#' })
+									.update( this.options.lang['tag_add_link'] )
+									.addClassName("ipsTagBox_addlink")
+									.observe('click', this.eventAddNewTag.bindAsEventListener(this));
+									
+		// Finish building wrapper
+		this.buildWrapper();
+		
+		// Build options dropdown
+		this.tagDropdown = new Element("div", { 'id': this.id + '_tagdropdown' })
+									.addClassName("ipsTagBox_dropdown")
+									.setStyle({
+										'width': $(this.tagWrapper).measure('padding-box-width') + 'px',
+										'position': 'absolute'
+									})
+									.hide();
+		
+		this.tagDropdown.insert( {'bottom' : new Element('ul') } );
+		
+		this.options.predefinedTags.each( function(item){
+			$( this.tagDropdown ).down('ul').insert({'bottom':	new Element('li')
+														.update(item)
+														.addClassName("ipsTagBox_dditem")
+														.writeAttribute("tvalue", item)
+														.observe('click', this.eventClickItem.bindAsEventListener(this))
+										});
+		}.bind(this));
+		$(this.tagWrapper).insert({'after': this.tagDropdown});
+		
+		this.importTags();
+		
+		// Do global init
+		this.parentInit();
+		
+		/* Is this a touch device? */
+		if ( ! Object.isUndefined( 'iScroll' ) )
+		{
+			this.myScroll = new iScroll( this.tagDropdown.id, { hideScrollbar: false, hScroll: true } );
+		}
+	},
+	
+	showDropdown: function(){
+		this.handlers['doc_click'] = $(document.body).on('click', function(e){
+			if( !$(e.target).descendantOf( $( this.tagDropdown ) ) && !$(e.target).descendantOf( $( this.tagWrapper ) ) ){
+				this.hideDropdown();
+			}
+		}.bindAsEventListener(this));
+		
+		this.handlers['doc_key'] =	$(document).on('keypress', function(e){
+			if( e.keyCode == Event.KEY_ESC ){
+				this.hideDropdown();
+			}
+		}.bindAsEventListener(this));
+		
+		new Effect.Appear( $( this.tagDropdown ), { duration: 0.2 } );
+		
+		/* Is this a touch device? */
+		if ( ! Object.isUndefined( 'iScroll' ) )
+		{
+			setTimeout(function () { this.myScroll.refresh(); }.bind(this), 300);
+		}
+	},
+	
+	hideDropdown: function(){
+		try {
+			this.handlers['doc_click'].stop();
+			this.handlers['doc_key'].stop();
+		} catch(err){ }
+		
+		new Effect.Fade( $( this.tagDropdown ), { duration: 0.3 } );
+		
+		if( this.options.maxTags && this.calculateTotal() < this.options.maxTags ){
+			this.newInput.show();
+		}
+	},
+	
+	//--------------------------------------------------------------
+	// Event Handlers
+	//--------------------------------------------------------------
+	
+	eventAddNewTag: function(e){
+		this.newInput.hide();
+		this.showDropdown();
+	},
+	
+	eventClickItem: function(e){
+		var elem = Event.findElement(e, 'li');
+		if( !elem.readAttribute('tvalue') ){ return; }
+		this.addTag( elem.readAttribute('tvalue') );
+		$(elem).hide();	
+		
+		// See if all options are used
+		if( !$( this.tagDropdown ).select('li').findAll(function(el) { return el.visible(); }).size() ){
+			this.hideDropdown();
+		}
+	},
+	
+	//--------------------------------------------------------------
+	// Internal callbacks
+	//--------------------------------------------------------------
+	
+	_afterSelect: function(tag){
+		new Effect.Fade( $(this.tagDropdown), { duration: 0.3 } );
+		
+		if( this.options.maxTags && this.calculateTotal() < this.options.maxTags ){
+			this.newInput.show();
+		}
+	},
+	
+	_afterAdd: function(item){
+		if( this.options.maxTags && this.calculateTotal() >= this.options.maxTags ){
+			this.tagDropdown.hide();
+			this.newInput.hide();
+		}
+	},
+	
+	_afterDelete: function(value){
+		if( this.options.maxTags && this.calculateTotal() < this.options.maxTags ){
+			$( this.tagDropdown ).select('li[tvalue="'+value+'"]')[0].show();
+		}
+	}
+}
+, Tags.Base));
+
+//==================================================
+// 'Open' tagging class (i.e. free choice)
+//==================================================
+Tags.Open = Class.create( Object.extend( {
+	
+	initialize: function( element, options ){
+		this.element = $( element );
+		this.id = this.element.id;
+		this.options = options;
+		this.handlers = {};
+		
+		// Create new textbox which will be our typable area
+		this.newInput = new Element("input", { 'type': 'text', 'autocomplete': 'off'})
+									.addClassName("ipsTagBox_hiddeninput")
+									.observe('keyup', this.eventKeyPress.bindAsEventListener(this))
+									.observe('blur', this.eventBlurTextbox.bindAsEventListener(this));
+									
+									/*.observe('focus', this.eventFocusTextbox.bindAsEventListener(this))*/
+
+		this.buildWrapper();
+		this.newInput.clear();
+		this.importTags();
+		
+		// Do global init
+		this.parentInit();
+		
+		// Prevents the browser going back a page if the textbox isn't focused
+		/*Event.observe( document, 'keydown', function(e){
+			if( e.which == Event.KEY_BACKSPACE )
+			{
+				if( document.activeElement != this.newInput && !this.selectedTag ){
+					
+				}
+				
+				Event.stop(e);
+			}
+		});*/
+		
+		// Set instructional text if there's no entries
+		if( !this.calculateTotal() && !$F( this.newInput )){
+			$( this.newInput ).addClassName('inactive').value = this.options.lang['tip_text'];
+			
+			this.handlers['text_focus'] = $( this.newInput ).on('focus', function(e){
+				$( this.newInput ).removeClassName('inactive').value = "";
+				if( this.options.maxLen ){
+					this.newInput.writeAttribute("maxlength", this.options.maxLen - 1); // -1 to leave room for comma
+				}
+				this.handlers['text_focus'].stop();
+			}.bindAsEventListener(this));
+		}
+	},
+	
+	//--------------------------------------------------------------
+	// Event Handlers
+	//--------------------------------------------------------------
+	
+	eventKeyPress: function(e){	
+		Debug.write( e.keyCode );
+		
+		switch( e.keyCode ){
+			case Event.KEY_BACKSPACE:
+				//alert( this.inputItem.previous().tagName );
+				if( !$F(this.newInput) )
+				{
+					if( this.selectedTag ){
+						this.deleteTag( this.selectedTag );
+					}
+					else
+					{
+						if( this.inputItem.previous() ){
+							this.selectTag( this.inputItem.previous() );
+						}
+					}
+				}				
+			break;
+			case Event.KEY_DELETE:
+				if( this.selectedTag ){
+					this.deleteTag( this.selectedTag );
+				}
+			break;	
+			case Event.KEY_RETURN:
+			case Event.KEY_TAB:
+			case 188: // comma				
+				// Bug #30286 - arabic/hebrew keyboards have a different character on
+				// key 188. We have to check that the last character is really a latin
+				// comma, and ignore it if not.
+				var lastChar = this.newInput.value.charAt( this.newInput.value.length - 1 );
+				
+				if( e.keyCode == 188 && lastChar != ',' ){
+					return;
+				}
+				
+				var value = this._stripHtml( this.newInput.value.replace(/\,/, '') );
+				if( !value ){
+					this.newInput.value = "";
+					return false;
+				}
+				this.addTag( value );
+				this.newInput.value = "";
+				Event.stop(e);
+			break;
+		}
+	},
+	
+	eventBlurTextbox: function(e){
+		if( this.newInput.value != '' && this.newInput.value != ',' )
+		{
+			var value = this.newInput.value.replace(/\,/, '');
+			this.addTag( value );
+			this.newInput.value = "";
+		}
+	},
+	
+	_stripHtml: function( value )
+	{
+		var remove = [ '<', '>', '"', "'" ];
+		
+		remove.each( function(item)
+		{
+			value = value.replace( new RegExp( item, 'g' ), '' );
+		} );
+		
+		return value;
+	},
+	
+	//--------------------------------------------------------------
+	// Internal callbacks
+	//--------------------------------------------------------------
+	
+	_afterSelect: function(tag){
+		$( this.newInput ).setValue("").focus();
+	},
+	
+	_afterAdd: function(item){
+		if( this.options.maxTags && this.calculateTotal() >= this.options.maxTags ){
+			this.newInput.hide();
+		}
+	},
+	
+	_afterDelete: function(tag){
+		if( this.options.maxTags && this.calculateTotal() < this.options.maxTags ){
+			this.newInput.show().focus();
+		}
+	}
+}
+, Tags.Base));
diff --git a/upload/public/js/ips.tags.mobile.js b/upload/public/js/ips.tags.mobile.js
new file mode 100644
index 00000000..c7bf59b4
--- /dev/null
+++ b/upload/public/js/ips.tags.mobile.js
@@ -0,0 +1,240 @@
+var Tags = {};
+
+Element.addMethods( {
+	mobileTagify: function( element, options )
+	{
+		document.observe("dom:loaded", function() 
+		{
+			options = Object.extend( {
+				existingTags: []
+			}, options);
+		
+			if( !options.isEnabled ){ return; }
+		
+			if( options.isOpenSystem ){
+				new Tags.Open( element, options );
+			} else {
+				new Tags.Closed( element, options );
+			}
+		});
+	}
+});
+
+//==================================================
+// Base class for tag operations
+//==================================================
+Tags.Base = {
+	parentInit: function(){
+		// Elements
+		this.launchButton = $( this.id + '_tag_button' );
+		this.tagPane = $(this.id + '_tag_pane');
+		this.shade = $('shade');
+		this.tagHolder = $(this.id + '_tags');
+		
+		// Events
+		$( this.launchButton ).observe('click', this.toggleTagBox.bindAsEventListener(this) );
+		$( this.id + '_close_pane').observe('click', this.toggleTagBox.bindAsEventListener(this) );
+		$( this.tagHolder ).on('click', 'li', this.selectTag.bind(this) );
+		$( this.id + '_tag_remove' ).observe('click', this.removeTags.bindAsEventListener(this) );
+		
+		// Store a reference to this on the tag box
+		this.element.store('obj', this);
+	},
+	
+	toggleTagBox: function(e){
+		if( this.tagPane.visible() ){
+			this.shade.hide();
+			this.tagPane.hide();
+		} else {
+			this.shade.show();
+			this.tagPane.show();
+		}
+	},
+	
+	buildTag: function( tag ){
+		
+		if( parseInt(this.options.forceLowercase) ){
+			tag = tag.toLowerCase();
+		}
+		
+		var newTag = new Element("li")
+					.writeAttribute("tValue", tag)
+					.update( tag );
+					
+		this.tagHolder.insert({bottom: newTag});
+		
+		// Add to hidden input
+		this.element.value += tag+',';
+		
+		if( Object.isFunction( this._afterAdd ) ){
+			this._afterAdd(tag);
+		}
+	},
+	
+	selectTag: function(e, elem){
+		if( $(elem).hasClassName('selected') ){
+			$(elem).removeClassName('selected');
+		} else {
+			$(elem).addClassName('selected');
+		}
+		
+		this.checkSelectedTags();	
+	},
+	
+	removeTags: function(e){
+		Event.stop(e);
+		
+		// How many selected?
+		var selected = $( this.tagHolder ).select('li.selected');
+		
+		if( !selected.size() ){
+			this.checkSelectedTags(); // Refresh the display
+			return;
+		}
+		
+		selected.each( function(item){
+			var value = $( item ).readAttribute('tValue');
+			$(item).remove();
+			this.element.value = this.element.value.replace(value+',', '');
+			
+			if( Object.isFunction( this._afterDelete ) ){
+				this._afterDelete( value );
+			}
+		}.bind(this));
+		this.checkSelectedTags(); // Refresh the display
+	},
+	
+	checkSelectedTags: function(){
+		var count = this.tagHolder.select("li.selected").size();
+		
+		if( count ){
+			this.tagHolder.addClassName('with_selected');
+			$( this.id + '_addwrap').hide();
+			$( this.id + '_removewrap').show();
+		} else {
+			this.tagHolder.removeClassName('with_selected');
+			$( this.id + '_addwrap').show();
+			$( this.id + '_removewrap').hide();
+		}
+	},
+	
+	calculateTotal: function(){
+		return this.tagHolder.select("li").size();		
+	},
+	
+	getExisting: function(){
+		if( this.options.existingTags && this.options.existingTags.size() ){
+			$A(this.options.existingTags).each( function(item){
+				if( !item.blank() ){
+					this.buildTag( item );
+				}
+			}.bind(this));
+		}
+	},
+	
+	updateEditorControls: function(){
+		if( this.options.maxTags && this.calculateTotal() >= this.options.maxTags ){
+			$( this.id + '_addwrap').setStyle('opacity: 0.4');
+			$( this.inputBox ).disable();
+		} else {
+			$( this.id + '_addwrap').setStyle('opacity: 1');
+			$( this.inputBox ).enable();
+		}
+	},
+};
+
+//==================================================
+// 'Open' tagging class (i.e. free choice)
+//==================================================
+Tags.Open = Class.create( Object.extend( {
+	
+	initialize: function( element, options ){
+		this.element = $( element );
+		this.id = this.element.id;
+		this.options = options;
+		this.handlers = {};
+		
+		this.inputBox = $( this.id + '_tag_input' );
+
+		$( this.id + '_tag_add' ).observe('click', this.submitTag.bindAsEventListener(this) );
+		
+		if( this.options.maxLen ){
+			this.inputBox.writeAttribute("maxlength", this.options.maxLen - 1); // -1 to leave room for comma
+		}
+		
+		this.parentInit();
+		this.getExisting();
+	},
+	
+	submitTag: function(e){
+		Event.stop(e);
+		
+		var value = this.inputBox.value.strip();
+		if( !value ){ return; }
+		
+		this.buildTag( value );
+		this.inputBox.value = '';		
+	},
+	
+	//--------------------------------------------------------------
+	// Internal callbacks
+	//--------------------------------------------------------------
+	
+	_afterAdd: function(item){
+		this.updateEditorControls();
+	},
+	
+	_afterDelete: function(item){
+		this.updateEditorControls();
+	}
+	
+}, Tags.Base));
+
+
+//==================================================
+// 'Closed' tagging class
+//==================================================
+Tags.Closed = Class.create( Object.extend( {
+	
+	initialize: function( element, options ){
+		this.element = $( element );
+		this.id = this.element.id;
+		this.options = options;
+		this.handlers = {};
+		
+		this.inputBox = $( this.id + '_tag_select' );
+
+		$( this.id + '_tag_add' ).observe('click', this.submitTag.bindAsEventListener(this) );
+		
+		this.parentInit();
+		this.getExisting();
+	},
+	
+	submitTag: function(e){
+		Event.stop(e);
+		var value = this.inputBox.value;
+		this.buildTag( value );		
+	},
+	
+	//--------------------------------------------------------------
+	// Internal callbacks
+	//--------------------------------------------------------------
+	
+	_afterAdd: function(item){
+		var option = this.inputBox.select("option[value=" + item + "]")[0];
+		
+		if( option ){
+			option.remove();
+		}
+		
+		this.updateEditorControls();
+	},
+	
+	_afterDelete: function(item){
+		var elem = new Element("option", { value: item }).update(item);
+		this.inputBox.insert({ bottom: elem });		
+		this.updateEditorControls();
+	}
+	
+}, Tags.Base));
+
diff --git a/upload/public/js/ips.textEditor.js b/upload/public/js/ips.textEditor.js
new file mode 100644
index 00000000..5bdbd597
--- /dev/null
+++ b/upload/public/js/ips.textEditor.js
@@ -0,0 +1,964 @@
+/**
+ * Wrapper for CKEditor based goodness
+ * Written by Matt Mecham for his sins.
+ * (c) 2011 IPS, Inc.
+ */
+
+IPSCKTools = {
+	/**
+	 * Get the selected HTML from the editor
+	 * @param	object
+	 */
+	getSelectionHtml: function( editor )
+	{
+		var selection = editor.getSelection();
+		
+		if ( CKEDITOR.env.ie )
+		{
+			try {
+				selection.unlock(true);
+			} catch(e){}
+			
+			var text = selection.getNative().createRange().htmlText;
+		
+			if ( text.toLowerCase().strip() == '<p>&nbsp;</p>' )
+			{
+				return false;
+			}
+			
+			return text;
+		}
+		else if ( CKEDITOR.env.opera )
+		{
+			var selection = selection.getNative();
+		
+			var range = selection ? selection.getRangeAt(0) : selection.createRange();
+			var div   = document.createElement('div');
+			div.appendChild( range.cloneContents() );
+			
+			return div.innerHTML.replace( /<p><\/p>/g, '<p><br /></p>' );
+		}
+		else
+		{
+			var range = selection.getNative().getRangeAt( selection.rangeCount -1 ).cloneRange();
+			var div   = document.createElement('div');
+			div.appendChild( range.cloneContents() );
+			
+			return div.innerHTML;
+		}
+	},
+	/**
+	 * Clean HTML for inserting between tags
+	 * @param	object
+	 */
+	cleanHtmlForTagWrap: function( html )
+	{
+		var text = html.replace( /<br( \/)?>$/, '' );
+		
+		return text;
+	}
+}
+
+/*
+ * This is just a wrapper class around the objects to give it a global interface
+ */
+IPBoard.prototype.textEditor = {
+		
+	mainStore: $H(),
+	lastSetUp: null,
+	_tmpContent: '',
+	IPS_TEXTEDITOR_POLLING:	10000,			/* 10 seconds */
+	IPS_NEW_POST_POLLING:	(2 * 60000),	/* 2 mins */
+	IPS_SAVED_MSG:			"<a href='javascript:void()' class='_as_explain desc'>" + ipb.lang['ck_auto_saved'] + "</a>",
+	IPS_AUTOSAVETEMPLATE:	"<a href='javascript:void()' class='_as_launch desc'>" + ipb.lang['ck_view_saved'] + "</a>",
+	IPS_AUTOSAVEVIEW:		"<div><h3>" + ipb.lang['ck_saved'] + "</h3><div class='row2' style='padding:4px'><div class='as_content'>#{content}</div><div class='as_buttons'><input type='button' class='input_submit _as_restore' value='" + ipb.lang['ck_restore'] + "' /></div>",
+	IPS_AUTOSAVEEXPLAIN:	"<div><h3>" + ipb.lang['ck_saved_title'] + "</h3><div class='row2' style='padding:8px'>" + ipb.lang['ck_saved_desc'] + "</div>",
+	ajaxUrl:				'',
+	
+	initialize: function( editorId, options )
+	{
+		if ( inACP )
+		{
+			ipb.textEditor.ajaxUrl  = ipb.vars['front_url']; 
+			ipb.vars['secure_hash'] = ipb.vars['md5_hash'];
+		}
+		else
+		{
+			ipb.textEditor.ajaxUrl  = ipb.vars['base_url'];
+		}
+		
+		/* Insert into main store */
+		if ( ! ipb.textEditor.mainStore.get( editorId ) )
+		{
+			newEditorObject = new ipb.textEditorObjects( editorId, options );
+			
+			ipb.textEditor.mainStore.set( editorId, newEditorObject );
+		}
+		
+		/* Set up */
+		ipb.textEditor.lastSetUp = editorId;
+	},
+	
+	/**
+	 * Switches an editor from rte to std or vice-versa
+	 */
+	switchEditor: function()
+	{
+		textObj = ipb.textEditor.getEditor();
+		isRte   = textObj.isRte();
+		ourcontent = textObj.getText();
+
+		var _url  = ipb.textEditor.ajaxUrl + '&app=core&module=ajax&section=editor&do=switch&secure_key=' + ipb.vars['secure_hash'];
+		Debug.write( _url );
+		Debug.write( 'Fetched editor content: ' + ourcontent );
+
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								parameters: { 'content' : ourcontent.encodeParam(),
+											  'isRte'   : isRte },
+								onSuccess: function(t)
+								{										    	
+									/* No Permission */
+									if ( t.responseText != 'nopermission' )
+									{
+										Debug.write( 'Converted to: ' + t.responseText );
+										
+										/* Switch the text editor around */
+										if ( textObj.isRte() )
+										{
+											/* Reset flag */
+											textObj.setIsRte( false );
+											
+											/* Hackery! Passing t.responseText through to .setData doesn't allow html entities to parse in the text area
+											 * literally, if you pass &#123; it will show &#123; - not good.
+											 */
+											$$('body').first().insert( new Element( 'code', { 'class': 'hide', 'id': 'xx-new-contents-xx' } ).update( t.responseText ) );
+											
+											/* Can it sister */
+											textObj.CKEditor.setMode( 'source' );
+											textObj.insert( $('xx-new-contents-xx').innerHTML, false, true );
+											
+											$('xx-new-contents-xx').remove();
+											
+											ipb.Cookie.set( 'rteStatus', 'std' );
+											
+											/* Update all other editors */
+											ipb.textEditor.toggleEditors( 'std' );
+											
+											/* Update text-direction, since CKE forces LTR in 'source' mode */
+											if( isRTL )
+											{
+												$$('.cke_contents > textarea').each( function(elem) {
+													$(elem).setStyle( { textAlign: 'right' } );
+												});
+											}
+										}
+										else
+										{
+											/* Reset flag */
+											textObj.setIsRte( true );
+											
+											try
+											{
+												textObj.CKEditor.setData( ipb.textEditor.ckPre( t.responseText ) );
+											}
+											catch( err )
+											{
+												Debug.write( "CKEditor error: " + err );
+											}
+
+											/* Init editor */
+											textObj.CKEditor.setMode( 'wysiwyg' );
+											
+											ipb.Cookie.set( 'rteStatus', 'rte' );
+
+											/* Update all other editors */
+											ipb.textEditor.toggleEditors( 'rte' );
+										}
+									}
+								}.bind(this),
+								onException: function (t)
+								{
+									Debug.dir( t );
+								}
+							} );
+		
+	},
+	
+	/*
+	 * Change all editor modes besides the current one
+	 * (current one is changed inside switchEditor)
+	 */
+	toggleEditors: function( mode )
+	{
+		ipb.textEditor.mainStore.each( function( instance ){ 
+			if( instance.key != ipb.textEditor.lastSetUp )
+			{
+				if( mode == 'std' )
+				{
+					instance.value.setIsRte( false );
+					instance.value.CKEditor.setMode( 'source' );
+				}
+				else
+				{
+					instance.value.setIsRte( true );
+					instance.value.CKEditor.setMode( 'wysiwyg' );
+				}
+			}
+		});
+	},
+	
+	/*
+	 * Fetches an editor by ID
+	 */
+	getEditor: function( editorId )
+	{
+		editorId = ( ! editorId ) ? ipb.textEditor.getCurrentEditorId() : editorId;
+
+		return ipb.textEditor.mainStore.get( editorId );
+	},
+	
+	/**
+	 * Fetches the current focused editor or the last one set up
+	 * @returns string	editor id
+	 */
+	getCurrentEditorId: function()
+	{
+		if( Object.isUndefined( CKEDITOR ) ){
+			return ipb.textEditor.lastSetUp;
+		} else {
+			if ( CKEDITOR.currentInstance && ipb.textEditor.mainStore.get( CKEDITOR.currentInstance.name ).CKEditor )
+			{
+				return CKEDITOR.currentInstance.name;
+			}
+		    else
+		    {
+		    	return ipb.textEditor.lastSetUp;
+		    }
+		}
+	},
+	
+	/**
+	 * Make safe for CKEditor
+	 */
+	ckPre: function( text )
+	{
+		text = text.replace( '<script', '&#60;script' );
+		text = text.replace( '</script', '&#60;/script' );
+		
+		// If the first content is text and not an HTML element, CKEditor throws an error
+		// Error: body.getFirst().hasAttribute is not a function
+		// Similar to: http://dev.ckeditor.com/ticket/6152
+		// We'll just wrap in a span tab to be safe if it doesn't look like HTML is there
+		if( text.charAt(0) != '<' )
+		{
+			// Disabled as we're not using BR mode
+			//text = '<p>' + text + '</p>';
+			
+		}
+		
+		return text;
+	},
+	
+	/**
+	 * Make safe for std editor
+	 */
+	stdPre: function( text )
+	{
+		/* &lt; / &gt; is made safe by CKEditor */
+		text = text.replace( /&lt;/g, '<' );
+		text = text.replace( /&gt;/g, '>' );
+		
+		/* Properly encoded HTML &amp;#39; isn't parsed in the text area */
+		text = text.replace( /&amp;/g, '&' );
+				
+		text = text.replace( /<br([^>]+?)?>(\n)?/g, '\n' );
+		
+		return text;
+	},
+	
+	/**
+	 * 0 pad times
+	 * @param n
+	 * @returns
+	 */
+	pad: function(n)
+	{
+		return ("0" + n).slice(-2);
+	}
+};
+
+/*
+ * Each CKEditor object is referenced via this class
+ */
+IPBoard.prototype.textEditorObjects = Class.create( {
+	
+	editorId: {},
+	popups: [],
+	cookie: 'rte',
+	timers: {},
+	options: {},
+	CKEditor: null,
+	EditorObj: null,
+	
+	/*------------------------------*/
+	/* Constructor 					*/
+	initialize: function( editorId, options )
+	{
+		this.editorId = editorId;
+		this.cookie   = ipb.Cookie.get('rteStatus');
+		
+		this.options  = Object.extend( { type: 	              'full',
+										 ips_AutoSaveKey:      false,
+										 height:			   0,
+										 minimize:             0,
+										 minimizeNowOpen:      0,
+										 isRte:				   1,
+										 bypassCKEditor:	   0,
+										 isTypingCallBack:     false,
+										 delayInit:			   false,
+										 ips_AutoSaveData:     {},
+										 ips_AutoSaveTemplate: new Template( ipb.textEditor.IPS_AUTOSAVETEMPLATE ) }, arguments[1] );
+		
+		/* Do we have an override? */
+		this.setIsRte( this.cookie == 'rte' ? 1 : ( this.cookie == 'std' ? 0 : 1 ) );
+		
+		/* Force STD if iDevice */
+		if ( ipb.vars['is_touch'] !== false )
+		{
+			this.setIsRte( 0 );
+			this.options.bypassCKEditor = 1;
+		}
+	
+		/* Create the CKEditor */
+		if ( ! this.options.delayInit )
+		{
+			this.initEditor();
+		}
+	},
+	
+	/**
+	 * Set RTe status of current editor
+	 */
+	setIsRte: function( value )
+	{
+		this.options.isRte = ( value ) ? 1 : 0;
+		
+		/* Set cookie */
+		ipb.Cookie.set( 'rteStatus', ( value ) ? 'rte' : 'std' );
+		
+		if ( $( 'isRte_' + this.editorId ) )
+		{
+			 $F( 'isRte_' + this.editorId ) = this.options.isRte;
+		}
+	},
+	
+	/**
+	 * Returns whether current editor is RTE (ckeditor)
+	 */
+	isRte: function()
+	{
+		return this.options.isRte ? 1 : 0;
+	},
+	
+	/**
+	 * Fetch editor contents 
+	 */
+	getText: function()
+	{		
+		if ( ! this.options.bypassCKEditor && this.CKEditor )
+		{
+			return this.CKEditor.getData();
+		}
+		else
+		{
+			/* If CKEditor isn't beingn used (iOS, etc) */
+			if( $( this.editorId ) )
+			{
+				return $( this.editorId ).value;
+			}
+
+			return '';	
+		}
+	},
+	
+	/**
+	 * Create the CKEditor
+	 */
+	initEditor: function(initContent)
+	{
+		/* Bypassing the CKEditor completely? Why so mean? */
+		if ( this.options.bypassCKEditor )
+		{
+			if ( this.options.minimize )
+			{
+				this.options.minimizeNowOpen = 1;
+			}
+			
+			if ( typeof( initContent ) == 'string' )
+			{
+				$( this.editorId ).value = initContent;
+			}
+
+			return;
+		}
+		
+		/* Start the process of initiating */
+		if ( $( this.editorId ).value && this.isRte() )
+		{
+			$( this.editorId ).value = ipb.textEditor.ckPre( $( this.editorId ).value );
+		}
+		
+		/* RTE init */
+		try
+		{
+			var config	= {
+							toolbar:			( this.options.type == 'mini' ? 'ipsmini' : 'ipsfull' ),
+							height:				( Object.isNumber( this.options.height ) && this.options.height > 0 ) ? this.options.height : ( this.options.type == 'mini' ? 150 : 300 ),
+							ips_AutoSaveKey:	this.options.ips_AutoSaveKey
+			};
+
+			/* STD editor? */
+			if ( ! this.isRte() )
+			{
+				config.startupMode	= 'source';
+			}
+			
+			/* Minimized - force ipsmini */
+			if ( this.options.minimize )
+			{
+				config.toolbarStartupExpanded = false;
+			}
+			
+			CKEDITOR.replace( this.editorId, config );
+		}
+		catch( err )
+		{
+			Debug.write( 'CKEditor error: ' + err );
+		}
+
+		this.CKEditor = CKEDITOR.instances[ this.editorId ];
+		
+		/* Bug in ckeditor init which treats initContent as event object inside an .on() */
+		ipb.textEditor._tmpContent = ( Object.isString(initContent) || Object.isNumber(initContent) ) ? initContent : '';
+		
+		/* Got any saved data to show? */
+		CKEDITOR.on( 'instanceReady', function( ev )
+		{
+			if ( ev.editor.name == this.editorId )
+			{
+				/* This is dumb and only way to access editor object */
+				this.EditorObj = ev;
+				
+				/* Quickly make some changes if minimized */
+				if ( this.options.minimize )
+				{
+					$('cke_top_' + this.editorId ).down('.cke_toolbox_collapser').hide();
+					$('cke_bottom_' + this.editorId ).hide();
+					
+					$('cke_' + this.editorId ).down('.cke_wrapper').addClassName('minimized');
+					
+					if ( ! this.isRte() )
+					{
+						$('cke_' + this.editorId ).down('.cke_wrapper').addClassName('std');
+					}
+					else
+					{
+						/* IE bug when clicking the text editor to expand and it also registers a toolbar click*/
+						if ( Prototype.Browser.IE9 )
+						{
+							$('cke_top_' + this.editorId ).down('.cke_toolbox').setStyle( { 'position': 'absolute', 'left': '-2000px' } );
+						}
+					}
+					
+					ev.editor.on('focus', function()
+					{
+						try
+						{
+							if ( ! this.options.minimizeNowOpen )
+							{ 
+								this.showEditor().bind(this);
+							}
+						}catch(e){}
+					}.bind(this) );
+				}
+				
+				/* Fix for some tags */
+				new Array( 'p', 'ul', 'li', 'blockquote', 'div' ).each( function ( tag )
+				{
+					ev.editor.dataProcessor.writer.setRules( tag, {
+																	indent : false,
+																	breakBeforeOpen : true,
+																	breakAfterOpen : false,
+																	breakBeforeClose : false,
+																	breakAfterClose : true
+																  } );
+				} );
+				
+				/* Insert */
+				if ( ipb.textEditor._tmpContent.length )
+				{
+					if ( ! this.isRte() )
+					{
+						ev.editor.setData( ipb.textEditor.stdPre( ipb.textEditor._tmpContent ) );
+					}
+					else
+					{
+						ev.editor.setData( ipb.textEditor.ckPre( ipb.textEditor._tmpContent ) );
+					}
+				}
+				
+				/* Clear tmp content */
+				ipb.textEditor._tmpContent = '';
+				
+				this.displayAutoSaveData();
+				
+				if ( this.options.isTypingCallBack !== false )
+				{
+					this.timers['dirty'] = setInterval( this.checkForInput.bind(this), ipb.textEditor.IPS_TEXTEDITOR_POLLING );
+				}
+				
+				/* Make sure our menus close */
+				if ( $('cke_contents_' + this.editorId ).down('iframe') )
+				{
+					try
+					{
+						$('cke_contents_' + this.editorId ).down('iframe').contentWindow.document.onclick = parent.ipb.menus.docCloseAll;
+					} catch( e ) { }
+				}				
+				
+				/* Some ACP styles conflict */
+				$$('.cke_top').each( function(elem) { elem.setStyle('background: transparent !important; padding: 0px !important'); } );
+				$$('.cke_bottom').each( function(elem) { elem.setStyle('background: transparent !important; padding: 0px !important'); } );
+				$$('.cke_contents').each( function(elem) { elem.setStyle('padding: 0px !important'); } );
+				
+				/* CKEditor tends to add a bunch of inline styles to cke_top_x which messes up custom styles */
+				$('cke_top_' + this.editorId ).writeAttribute( 'style', '' );
+				
+				/* Update text-direction, since CKE forces LTR in 'source' mode */
+				if( isRTL && !this.isRte() )
+				{
+					$$('.cke_contents > textarea').each( function(elem) {
+						$(elem).setStyle( { textAlign: 'right' } );
+					});
+				}
+			}
+		}.bind(this) );		
+	},
+	
+	/**
+	 * Init CKEditor
+	 */
+	showEditor: function( content )
+	{
+		if ( this.options.minimize )
+		{						
+			this.options.minimizeNowOpen = 1;					
+			
+			$('cke_top_' + this.editorId ).down('.cke_toolbox_collapser').show();
+			$('cke_bottom_' + this.editorId ).show();
+			$('cke_' + this.editorId ).down('.cke_wrapper').removeClassName('minimized');
+			
+			this.EditorObj.editor.execCommand('toolbarCollapse');
+			
+			/* IE bug when clicking the text editor to expand and it also registers a toolbar click*/
+			if ( Prototype.Browser.IE9 )
+			{
+				setTimeout( function() { $('cke_top_' + this.editorId ).down('.cke_toolbox').setStyle( { 'position': 'relative', 'left': '0px' } ) }.bind(this), 300 );
+			}
+			
+			/* Shift screen if need be */
+			try
+			{
+				var dims       = document.viewport.getDimensions();
+				var editorDims = $('cke_' + this.editorId).getDimensions();
+				var cOffset    = $('cke_' + this.editorId).cumulativeScrollOffset();
+				var pOffset    = $('cke_' + this.editorId).positionedOffset();
+				
+				var bottomOfEditor = pOffset.top + editorDims.height;
+				var bottomOfScreen = cOffset.top + dims.height;
+				
+				if ( bottomOfEditor > bottomOfScreen )
+				{
+					var diff = bottomOfEditor - bottomOfScreen;
+					
+					/* Scroll but with 100 extra pixels for comfort */
+					window.scrollTo( 0, cOffset.top + diff + 100 );
+				}
+			}
+			catch(e){ }
+		}
+	},
+	
+	/**
+	 * Check for dirty status and throw it to a callback then cancel timer
+	 */
+	checkForInput: function()
+	{
+		if ( this.options.minimize == 1 && this.options.minimizeNowOpen == 0 )
+		{
+			return false;
+		}
+
+		var content = this.getText();
+		
+		if ( content && content.length && Object.isFunction( this.options.isTypingCallBack ) )
+		{
+			/* We have content, so throw to call back */
+			this.options.isTypingCallBack();
+			
+			/* And cancel timer */
+			clearInterval( this.timers['dirty'] );
+			this.timers['dirty'] = '';
+		}
+	},
+	
+	/**
+	 * Close previously minimized editor
+	 */
+	minimizeOpenedEditor: function()
+	{
+		if ( this.options.minimize == 1 && this.options.minimizeNowOpen == 1 )
+		{ 
+			if ( ! this.options.bypassCKEditor && this.CKEditor )
+			{
+				if ( $('cke_' + CKEDITOR.plugins.ipsemoticon.editor.name + '_stray') )
+				{
+					$('cke_' + CKEDITOR.plugins.ipsemoticon.editor.name + '_stray').remove();
+					
+					if ( $('ips_x_smile_show_all') )
+					{
+						$('ips_x_smile_show_all').remove();
+					}
+				}
+				
+				/* Re-shrink editor */
+				this.EditorObj.editor.execCommand('toolbarCollapse');
+				$('cke_top_' + this.editorId ).down('.cke_toolbox_collapser').hide();
+				$('cke_bottom_' + this.editorId ).hide();
+				$('cke_' + this.editorId ).down('.cke_wrapper').addClassName('minimized');
+				
+				if ( this.isRte() )
+				{
+					this.EditorObj.editor.setData('<p></p>');
+					this.EditorObj.editor.focusManager.forceBlur();
+				}
+				else
+				{
+					this.EditorObj.editor.setData('');
+					
+					try
+					{
+						$('cke_' + this.editorId).down('textarea').blur();
+					}
+					catch(error){ Debug.write( error ); }
+					
+				}
+				
+				this.options.minimizeNowOpen = 0;
+			}
+			
+			if ( this.options.bypassCKEditor )
+			{
+				$( this.editorId ).value = '';
+			}
+			
+			try
+			{
+				if ( ! Object.isUndefined( $H( this.timers ) ) )
+				{
+					$H( this.timers ).each( function (timer)
+					{
+						var name = timer.key;
+						
+						if ( name.match( /^interval_/ ) )
+						{
+							clearInterval( this.timers[ name ] );
+							Debug.write( 'Cleared Interval ' + name );
+						}
+						else
+						{
+							clearTimeout( this.timers[ name ] );
+							Debug.write( 'Cleared Timeout ' + name );
+						}
+						
+						this.timers[ name ] = '';
+					}.bind(this) );
+				}
+			}
+			catch(e) { Debug.error(e); }
+		}
+	},
+	
+	/**
+	 * Make sure editor is in view
+	 * 
+	 */
+	scrollTo: function()
+	{
+		var dims = document.viewport.getDimensions();
+		var where = $( this.editorId ).positionedOffset();
+		var offsets = document.viewport.getScrollOffsets();
+
+		/* Is editor off the page? */
+		if ( offsets.top + dims.height < where.top )
+		{
+			window.scroll( 0, ( parseInt( where.top ) - 200 ) );
+		}
+	},
+	
+	/**
+	 * Remove editor completely
+	 */
+	remove: function()
+	{
+		this.CKEditor.destroy( true );
+		
+		this.CKEditor	= null;
+		
+		/* Remove object */
+		ipb.textEditor.mainStore.unset( this.editorId );
+		
+		/* Remove timers */
+		if ( ! Object.isUndefined( $H( this.timers ) ) )
+		{
+			$H( this.timers ).each( function (timer)
+			{
+				var name = timer.key;
+				
+				if ( name.match( /^interval_/ ) )
+				{
+					clearInterval( this.timers[ name ] );
+					Debug.write( 'Cleared Interval ' + name );
+				}
+				else
+				{
+					clearTimeout( this.timers[ name ] );
+					Debug.write( 'Cleared Timeout ' + name );
+				}
+				
+				this.timers[ name ] = '';
+			}.bind(this) );
+		}
+	},
+	
+	/**
+	 * Inserts content into the text editor
+	 */
+	insert: function( content, scrollOnInit, clearFirst )
+	{
+		/* Minimized... */
+		if ( this.options.minimize == 1 && this.options.minimizeNowOpen != 1 )
+		{
+			/* Scroll to editor when it loads? */
+			if( scrollOnInit )
+			{
+				$( this.editorId ).scrollTo();
+			}
+			
+			this.showEditor();
+		}
+		
+		if ( ! this.options.bypassCKEditor )
+		{
+			if ( this.isRte() )
+			{
+				// Using insertHtml() because if you have content in the editor and insert more (i.e. click reply on two posts in a topic),
+				// subsequent inserts will show the HTML instead of formatting it properly
+				this.CKEditor.insertHtml( content );
+			}
+			else
+			{
+				if ( this.CKEditor.getData() )
+				{
+					if ( clearFirst )
+					{
+						this.CKEditor.setData( ipb.textEditor.stdPre( content ) );
+					}
+					else
+					{
+						this.CKEditor.setData( this.CKEditor.getData() + ipb.textEditor.stdPre( content ) );
+					}
+				}
+				else
+				{
+					this.CKEditor.setData( ipb.textEditor.stdPre( content ) );
+				}				
+			}
+		}
+		else
+		{
+			$( this.editorId ).value = content;
+		}
+		
+	},
+	
+	/**
+	 * Show any display data we might have
+	 */
+	displayAutoSaveData: function()
+	{
+		if ( inACP )
+		{
+			return;
+		}
+		
+		/* Keep looping until editor is ready */
+		try
+		{
+			if ( Object.isUndefined( this.CKEditor ) || ! this.CKEditor.name || ! $('cke_' + this.editorId ) )
+			{
+				setTimeout( this.displayAutoSaveData.bind(this), 1000 );
+				return;
+			}
+		} catch(e) { }
+		
+		Debug.write( 'Ready to show saved data: ' + 'cke_' + this.editorId );
+	
+		var sd = this.options.ips_AutoSaveData;
+		
+		if ( sd.key )
+		{
+			html  = this.options.ips_AutoSaveTemplate.evaluate( sd );
+			
+			if ( $('cke_' + this.editorId ).down('.cke_bottom').select('.cke_path').length < 1 )
+			{
+				$('cke_' + this.editorId ).down('.cke_resizer').insert( { before: new Element('div').addClassName('cke_path').update(html) } );
+				
+				ipb.delegate.register('._as_launch', this.launchViewContent.bind(this) );
+			}
+		}
+	},
+	
+	/**
+	 * Show the saved content in a natty little windah
+	 */
+	launchViewContent: function(e)
+	{
+		Event.stop(e);
+		
+		if ( ! Object.isUndefined( this.popups['view'] ) )
+		{
+			this.popups['view'].show();
+		}
+		else
+		{			
+			/* easy one this... */
+			this.popups['view'] = new ipb.Popup( 'view', { type: 'modal',
+											               initial: new Template( ipb.textEditor.IPS_AUTOSAVEVIEW ).evaluate( { content: this.options.ips_AutoSaveData.parsed } ),
+											               stem: false,
+											               warning: false,
+											               hideAtStart: false,
+											               w: '600px' } );
+			
+			ipb.delegate.register('._as_restore', this.restoreAutoSaveData.bind(this) );
+		}
+	},
+	
+	/**
+	 * Show the about saved content in a natty little windah
+	 */
+	launchExplain: function(e)
+	{
+		Event.stop(e);
+		
+		var s = '__last_update_stamp_' + this.editorId;
+		
+		if ( ! Object.isUndefined( this.popups['explain'] ) )
+		{
+			this.popups['explain'].kill();
+		}
+					
+		/* easy one this... */
+		this.popups['explain'] = new ipb.Popup( 'explain', { type: 'balloon',
+											                 initial: ipb.textEditor.IPS_AUTOSAVEEXPLAIN,
+											                 stem: true,
+											                 warning: false,
+											                 hideAtStart: false,
+											                 attach: { target: $$('.' + s ).first() },
+											                 w: '300px' } );						
+		
+	},
+	
+	/**
+	 * Restore auto saved content
+	 */
+	restoreAutoSaveData: function(e)
+	{
+		Event.stop(e);
+		
+		this.popups['view'].hide();
+		
+		if ( this.isRte() )
+		{
+			setTimeout( function() { this.CKEditor.setData( ipb.textEditor.ckPre( this.options.ips_AutoSaveData.restore_rte ) ); }.bind(this), 500 );
+		}
+		else
+		{
+			setTimeout( function() { this.CKEditor.setData( this.options.ips_AutoSaveData.restore_std ); }.bind(this), 500 );
+		}
+	},
+	
+	/**
+	 * Save contents of the editor
+	 * @param	object	Current editor object (passed via plugin)
+	 * @param	object	Current command object (passed via plugin)
+	 */
+	save: function( editor, command )
+	{
+		if ( inACP )
+		{
+			return;
+		}
+		
+		var _url  = ipb.textEditor.ajaxUrl + '&app=core&module=ajax&section=editor&do=autoSave&secure_key=' + ipb.vars['secure_hash'] + '&autoSaveKey=' + this.options.ips_AutoSaveKey;
+		Debug.write( _url );
+		
+		/* Fetch data */
+		var content = this.CKEditor.getData();
+		
+		Debug.write( 'Fetched editor content: ' + content );
+		
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								hideLoader: true,
+								parameters: { 'content' : content.encodeParam() },
+								onSuccess: function(t)
+								{										    	
+									/* No Permission */
+									if ( t.responseJSON && t.responseJSON['status'] == 'ok' )
+									{
+										/* Reset 'dirty' */
+										editor.resetDirty();
+						
+										/* No longer busy */
+										command.setState( CKEDITOR.TRISTATE_OFF );
+										
+										this.updateSaveMessage();
+									}
+								}.bind(this)
+							} );	
+		
+	},
+	
+	/**
+	 * Display the time the post was last auto saved
+	 */
+	updateSaveMessage: function()
+	{
+		var s = '__last_update_stamp_' + this.editorId;
+		var d = new Date();
+		var c = new Template( ipb.textEditor.IPS_SAVED_MSG ).evaluate( { time: d.toLocaleTimeString() } );
+		
+		/* remove old */
+		$$('.' + s ).invoke('remove');
+		
+		/* Add new */
+		$('cke_' + this.editorId ).down('.cke_resizer').insert( { before: new Element('div').addClassName('cke_path ' + s).update(c) } );
+		
+		ipb.delegate.register('._as_explain', this.launchExplain.bind(this) );
+	}
+} );
\ No newline at end of file
diff --git a/upload/public/js/ips.topic.js b/upload/public/js/ips.topic.js
index 22c29195..7dab7f29 100644
--- a/upload/public/js/ips.topic.js
+++ b/upload/public/js/ips.topic.js
@@ -18,6 +18,12 @@ _topic.prototype.topic = {
 	deletePerms: {},
 	deleteUrls: {},
 	deletePopUps: [],
+	counts: {},
+	timers: {},
+	polling: { count: 0 },
+	mqBoxShowing: false,
+	fastReplyId: '',
+	isPosting: false,
 	
 	init: function()
 	{
@@ -32,11 +38,12 @@ _topic.prototype.topic = {
 					$('show_filters').observe('click', ipb.topic.toggleFilters );
 					$('filter_form').hide();
 				}
-			
+
 				ipb.topic.preCheckPosts();
 				
 				// Set up delegates
 				ipb.delegate.register('.multiquote', ipb.topic.toggleMultimod);
+				ipb.delegate.register('._ips_trigger_quote', ipb.topic.ajaxQuote);
 				
 				ipb.delegate.register('.edit_post', ipb.topic.ajaxEditShow);
 				ipb.delegate.register('.delete_post', ipb.topic.deletePopUp);
@@ -44,13 +51,49 @@ _topic.prototype.topic = {
 				ipb.delegate.register('.sd_content', ipb.topic.sDeletePostShow);
 				ipb.delegate.register('.sd_remove', ipb.topic.confirmSingleDelete);
 				ipb.delegate.register('input.post_mod', ipb.topic.checkPost);
-				ipb.delegate.register('a[rel="bookmark"]', ipb.topic.showLinkToTopic );
+				ipb.delegate.register('.post_id a[rel="bookmark"]', ipb.topic.showLinkToTopic );
 				
-				if( $('showforumJump') )
-				{
-					$('showforumJump').observe( "change", ipb.topic.jumpToForum );
-					$('forum_jump_submit').hide();
+				if ( $('submit_post') ){
+					$('submit_post').observe( "click", ipb.topic.ajaxFastReply );
 				}
+				
+				// Check for existing multi-quoted posts
+				try {
+					quoted = ipb.Cookie.get('mqtids').split(',').compact().without('').size();
+				} catch(err){
+					quoted = 0;
+				}
+
+				// Show button if we have quoted posts
+				if( quoted )
+				{
+					$('multiQuoteInsert').show();
+					ipb.topic.mqBoxShowing	= true;
+					
+					$('mqbutton').update( ipb.lang['mq_reply_swap'].replace( /#{num}/, quoted ) );
+				}
+				
+				// Set up MQ handler
+				if( $('multiQuoteInsert') ){
+					$('mqbutton').observe( 'click', ipb.topic.insertQuotedPosts );
+					
+					if( $('multiQuoteClear') ){
+						$('multiQuoteClear').on('click', ipb.topic.clearMultiQuote);
+					}
+				}
+				
+				if ( $('topic_mod') )
+				{
+					$('topic_mod').hide();
+				
+					$('moderator_toggle').up('div').show().observe('click', function(e){
+						Event.stop(e);
+						$('moderator_toggle').up('div').hide();
+						new Effect.BlindDown( $("topic_mod"), { duration: 0.3 } );
+						
+					});
+				}
+			
 			}
 			else if( ipb.topic.inSection == 'searchview' )
 			{
@@ -59,21 +102,121 @@ _topic.prototype.topic = {
 			}
 		});
 		
-		Event.observe( window, 'load', function(){
-			// Resize images
-			$$('.post', '.poll').each( function(elem){
-				ipb.global.findImgs( $( elem ) );
-			});
-		});
+		/* Do this regardless */
+		ipb.delegate.register('.hide_signature', ipb.topic.signatureCloseClick);
 	},
 	
-	jumpToForum: function(e)
+	/* ------------------------------ */
+	/**
+	 * Event handler for signature closing
+	 * 
+	 * @param	{event}		e		The event
+	*/
+	signatureCloseClick: function( e, elem )
 	{
+		postId = $(elem).up('.post_block').id.replace( /post_id_/, '' );
+		Debug.write( postId );
+		if ( ! postId )
+		{
+			return;
+		}
+		
 		Event.stop(e);
 		
-		$('forum_jump').submit();
+		$(elem).removeClassName('hide_signature').addClassName('sigIconStay');
+	
+		$(elem).identify();
 		
-		return false;
+		/* Create pop-up wrapper */
+		$(elem).addClassName('ipbmenu');
+		
+		url = ipb.vars['base_url'] + "app=forums&module=ajax&section=topics&do=sigCloseMenu&secure_key=" + ipb.vars['secure_hash'] + "&pid=" + postId;
+		
+		if ( ipb.topic.inSection == 'messenger' )
+		{
+			url = ipb.vars['base_url'] + "app=members&module=ajax&section=messenger&do=sigCloseMenu&secure_key=" + ipb.vars['secure_hash'] + "&msgid=" + postId;
+		}
+		
+		new Ajax.Request( url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									/*
+									 * Get an error?
+									 */
+									if( t.responseJSON && t.responseJSON['error'] )
+									{
+										alert( t.responseJSON['error'] );
+									}
+									else
+									{
+										var menuId = 'sigClose_' + postId + '_menucontent';
+		
+										$('ipboard_body').insert( new Element( 'div', { 'id': menuId } ) );
+		
+										$(menuId).update( "<div class='ipsPad ipsForm_center'><img src='" + ipb.vars['loading_img'] + "' /></div>" );
+		
+										var _newMenu = new ipb.Menu( $(elem), $(menuId), {}, { afterOpen: function(e) { Debug.write('adding'); $(elem).removeClassName('hide_signature').addClassName('sigIconStay'); } } );
+										_newMenu.doOpen();	
+		
+										ipb.topic.deletePopUps['sig_' + postId ] = true;
+										$(menuId).update( t.responseText );
+										
+										/* Register call back */
+										ipb.menus.registerCloseCallBack( ipb.topic.signatureCloseCleanUp );
+									}
+								}
+							}
+						);
+		
+	},
+	
+	signatureCloseCleanUp: function()
+	{
+		$$('.sigIconStay').invoke('removeClassName', 'sigIconStay').invoke('addClassName', 'hide_signature');
+	},
+	
+	/**
+	 * Registers a click for ignore users sig
+	 */
+	ignoreUsersSig: function( elem, e )
+	{ 
+		memberId = $(elem).readAttribute('data-id');
+		
+		ipb.menus.closeAll(e);
+		ipb.topic.signatureCloseCleanUp();
+		
+		new Ajax.Request(	ipb.vars['base_url'] + "app=forums&module=ajax&section=topics&do=ignoreSig&secure_key=" + ipb.vars['secure_hash'] + "&memberId=" + memberId,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									/*
+									 * Get an error?
+									 */
+									if ( t.responseJSON && t.responseJSON['status'] == 'ok' )
+									{
+										$$(".signature").each( function( element )
+										{
+											try {
+												_memberId = $(element).readAttribute('data-memberid');
+												
+												if ( _memberId && ( memberId == 'all' || _memberId == memberId ) )
+												{
+													new Effect.BlindUp( $(element), { duration: 1.0 } );
+												}
+											}
+											catch(e) { };
+										} );
+
+									}
+								}
+							}
+						);
+						
 	},
 	
 	/* ------------------------------ */
@@ -127,23 +270,27 @@ _topic.prototype.topic = {
 		
 		Event.stop(e);
 		
-		/* Can we hard delete? */
-		if ( ! ipb.topic.deletePerms[ postid ]['canDelete'] )
-		{
-			_permaShow = 'display:none;';
-		}
+		// Get popup contents
+		var url = ipb.vars['base_url'] + "app=core&amp;module=ajax&amp;section=templates&amp;secure_key=" + ipb.vars['secure_hash'] + "&amp;template_group=topic&amp;template_bit=deletePost&amp;lang_module=topic&amp;lang_app=forums";
 		
-		/* Create the pop-up */
-		var popid   = 'pop__delete_popup_' + postid;
-		var content = new Template( $('delPopUp').innerHTML ).evaluate( { removeUrl: _url_soft, permaDelete: _permaShow, permaUrl: _url_delete } );
-		
-		ipb.topic.deletePopUps = new ipb.Popup( popid, { type: 'balloon',
-														 initial: content,
-														 stem: true,
-														 hideAtStart: false,
-														 attach: { target: $('del_post_' + postid ), position: 'auto', 'event': 'click' },
-														 w: '450px' });
+		new Ajax.Request(	url.replace(/&amp;/g, '&'),
+							{
+								method: 'post',
+								evalJSON: 'force',
+								onSuccess: function(t)
+								{
+									/* Create the pop-up */
+									var popid   = 'pop__delete_popup_' + postid;
+									var content = new Template( t.responseJSON['html'] ).evaluate( { removeUrl: _url_soft, permaDelete: _permaShow, permaUrl: _url_delete } );
 		
+									ipb.topic.deletePopUps = new ipb.Popup( popid, { type: 'pane',
+																					 modal: true,
+																					 initial: content,
+																					 hideAtStart: false,
+																					 w: '550px' });
+								}
+							}
+						);		
 	},
 	
 	/**
@@ -152,7 +299,7 @@ _topic.prototype.topic = {
 	sDeletePostShow: function(e, elem)
 	{
 		Event.stop(e);
-		
+
 		var postid = elem.id.replace( /seeContent_/, '' );
 		if( !postid ){ return; }
 		
@@ -242,7 +389,7 @@ _topic.prototype.topic = {
 	*/
 	ajaxEditShow: function(e, elem)
 	{	
-		if( DISABLE_AJAX )
+		if( DISABLE_AJAX || ipb.vars['is_touch'] )
 		{
 			return false;
 		}
@@ -307,13 +454,9 @@ _topic.prototype.topic = {
 									
 									// Put it in
 									edit['button'].writeAttribute('_editing', '1');
-									
 									edit['post'].update( t.responseText );
 									
-									edit['pid'] = 'e' + edit['pid'];
-									
-									// Init the editor
-									ipb.editors[ edit['pid'] ] = new ipb.editor( edit['pid'], USE_RTE );
+									edit['pid'] = 'e' + edit['pid'];									
 									
 									// Set up events
 									if( $('edit_save_' + edit['pid'] ) ){
@@ -349,14 +492,7 @@ _topic.prototype.topic = {
 		if( !postid ){ return; }		
 		var url = ipb.vars['base_url'] + 'app=forums&module=post&section=post&do=edit_post&f=' + ipb.topic.forum_id + '&t=' + ipb.topic.topic_id + '&p=' + postid + '&st=' + ipb.topic.start_id + '&_from=quickedit';
 		
-		try {
-			// Need to update for submit manually in this case
-			ipb.editors[ 'e' + postid ].update_for_form_submit();
-			var Post = $F( 'e' + postid + '_textarea' );
-		} catch(err) {
-			Debug.error( err );
-			return;
-		}
+		var Post = ipb.textEditor.getEditor( 'edit-' + postid ).CKEditor.getData();
 
 		form = new Element('form', { action: url, method: 'post' } );
 		textarea = new Element('textarea', { name: 'Post' } );
@@ -367,7 +503,7 @@ _topic.prototype.topic = {
 		if( Prototype.Browser.Opera ){
 			textarea.value = Post;//.replace( /&/g, '&amp;' );
 		} else {
-			textarea.value = Post.replace( /&/g, '&amp;' );
+			textarea.value = Post;//.replace( /&/g, '&amp;' );
 		}
 		
 		reason.value = ( $('post_edit_reason') ) ? $('post_edit_reason').value : '';
@@ -380,93 +516,305 @@ _topic.prototype.topic = {
 	
 	/* ------------------------------ */
 	/**
-	 * Saves the contents of quick edit
+	 * Ajax fast reply baby!
 	*/
-	ajaxEditSave: function(e)
+	ajaxFastReply: function(e)
 	{
-		Event.stop(e);
-		var elem = Event.element(e);
-		var postid = elem.id.replace('edit_save_e', '');
-		if( !postid ){ return; }
-		
-		try {
-			// Need to update for submit manually in this case
-			ipb.editors[ 'e' + postid ].update_for_form_submit();
-			var Post = $F( 'e' + postid + '_textarea' );
-		} catch(err) {
-			Debug.error( err );
-			Debug.dir( ipb.editors );
-			return;
+		if ( DISABLE_AJAX )
+		{
+			return false;
 		}
-
+		
+		/* Guest? Just redirect to preview form */
+		if ( ! ipb.vars['member_id'] )
+		{
+			return false;
+		}
+		
+		// If user is holding ctrl or command, just submit since they
+		if( e.ctrlKey == true || e.metaKey == true || e.keyCode == 91 )
+		{
+			return false;
+		}
+		
+		Event.stop(e);
+				
+		/* Fetch post contents */
+		var Post  = ipb.textEditor.getEditor( ipb.topic.fastReplyId ).getText();
+		var isRte = ipb.textEditor.getEditor( ipb.topic.fastReplyId ).isRte();
+		
+		/* Quick check */
 		if( Post.blank() )
 		{
 			alert( ipb.lang['post_empty'] );
-			return;
+			return false;
 		}
 		
-		var add_edit    = null;
-		var edit_reason = '';
-		var post_htmlstatus = '';
+		// Lock the post buttons
+		var toggleEditorButtons = function( show ){
+			if( $('fast_reply_controls') ){
+				if( show ){
+					$('fast_reply_controls').select("#fast_reply_msg").invoke('remove');
+					$('fast_reply_controls').select("input").invoke("show");
+				} else {
+					$('fast_reply_controls').select("input").invoke("hide");
+					$('fast_reply_controls').insert( new Element('span', { id: 'fast_reply_msg' }).update( ipb.lang['saving_post'] ).addClassName('desc') );
+				}
+			}			
+		};
 		
-		if( $('add_edit') ){
-			add_edit = $F('add_edit');
-		}
+		toggleEditorButtons( false );
 		
-		if( $('post_edit_reason') ){
-			edit_reason = $F('post_edit_reason');
-		}	
-		
-		if( $('post_htmlstatus') ) {
-			post_htmlstatus = $F('post_htmlstatus');
-		}
-
-		var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=editBoxSave&p=' + postid + '&t=' + ipb.topic.topic_id + '&f=' + ipb.topic.forum_id;
+		ipb.topic.isPosting = true;
 		
+		var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=reply&t=' + ipb.topic.topic_id + '&f=' + ipb.topic.forum_id + '&pid=' + ipb.topic.topPid;
+		Debug.write(url);
 		new Ajax.Request(	url,
 							{
 								method: 'post',
-								evalJSON: 'force',
 								encoding: ipb.vars['charset'],
+								evalJSON: 'force',
 								parameters: {
-									md5check: 			ipb.vars['secure_hash'],
-									Post: 				Post.encodeParam(),
-									add_edit:			add_edit,
-									post_edit_reason:	edit_reason.encodeParam(),
-									post_htmlstatus: 	post_htmlstatus
+									md5check: 	ipb.vars['secure_hash'],
+									Post: 		Post.encodeParam(),
+									isRte: 		isRte
 								},
 								onSuccess: function(t)
-								{
-									if( t.responseJSON['error'] )
+								{ 
+									toggleEditorButtons( true );
+									
+									if (  t.responseJSON && t.responseJSON['error'] ){
+										ipb.global.errorDialogue( t.responseJSON['error'] );
+										return false;
+									}
+									else if( t.responseJSON && t.responseJSON['success'] )
 									{
-										if( $('error_msg_e' + postid) )
+										if( t.responseJSON['message'] )
 										{
-											$('error_msg_e' + postid).update( t.responseJSON['error'] );
-											new Effect.BlindDown( $('error_msg_e' + postid), { duration: 0.4 } );
+											ipb.global.okDialogue( t.responseJSON['message'] );
+										}
+										
+										if( t.responseJSON['post'] && t.responseJSON['postid'] )
+										{
+											/* Are we *NOT* on the last page? */
+											if ( ! Object.isUndefined( ipb.topic.counts ) && ! Object.isUndefined( ipb.topic.counts['perPage'] ) )
+											{
+												if ( ( ipb.topic.counts['postTotal'] ) && ( ( ipb.topic.counts['postTotal'] - ipb.topic.counts['curStart'] ) >= ipb.topic.counts['perPage'] ) )
+												{ 
+													/* http redirect */
+													window.location = ipb.vars['base_url'] + 'showtopic=' + ipb.topic.topic_id + '&view=getlastpost';
+													
+													return false;
+												}
+											}
+											
+											/* Should find a neater solution to this dumbo */
+											ipb.topic.topPid = t.responseJSON['postid'];
+											
+											if ( $( 'newContent-' + ipb.topic.topPid ) )
+											{
+												$( 'newContent-' + ipb.topic.topPid ).update( t.responseJSON['post'] );
+											}
+											else if( $( 'post_id_' + ipb.topic.topPid ) )
+											{
+												$( 'post_id_' + ipb.topic.topPid ).replace( t.responseJSON['post'] );
+											}
+											else
+											{
+												$('ips_Posts').insert( new Element('div', { id: 'newContent-' + ipb.topic.topPid } ).insert( t.responseJSON['post'] ) );
+											}
+											
+											if ( $( 'newContent-' + ipb.topic.topPid ) )
+											{
+												$( 'newContent-' + ipb.topic.topPid).hide();
+												new Effect.BlindDown( 'newContent-' + ipb.topic.topPid, { duration: 0.5, queue: 'front' } );
+
+												prettyPrint();
+											}
+										}
+										
+										ipb.topic.isPosting = false;
+										
+										ipb.textEditor.getEditor( ipb.topic.fastReplyId ).minimizeOpenedEditor();										
+										return false;
+									}
+									else if ( t.responseText && t.responseText != 'no_permission' )
+									{
+										/* Are we *NOT* on the last page? */
+										if ( ! Object.isUndefined( ipb.topic.counts ) && ! Object.isUndefined( ipb.topic.counts['perPage'] ) )
+										{
+											if ( ( ipb.topic.counts['postTotal'] ) && ( ( ipb.topic.counts['postTotal'] - ipb.topic.counts['curStart'] ) >= ipb.topic.counts['perPage'] ) )
+											{ 
+												/* http redirect */
+												window.location = ipb.vars['base_url'] + 'showtopic=' + ipb.topic.topic_id + '&view=getlastpost';
+												
+												return false;
+											}
+										}
+										
+										/* Should find a neater solution to this dumbo */
+										m = t.responseText.match( /<!--post:(\d+?)-->/ );
+										
+										if ( m && m[1] )
+										{
+											ipb.topic.topPid = m[1];
 										}
 										else
 										{
-											alert( t.responseJSON['error'] );
+											return false;
 										}
 										
-										return false;
-									}
-									else
-									{
-										// Update post; SKINNOTE: need to fix linked image sizes
-										// SKINNOTE: also need to reapply "code" javascript
-										$('edit_post_' + postid).writeAttribute('_editing', '0');
+										$('ips_Posts').insert( new Element('div', { id: 'newContent-' + ipb.topic.topPid } ).insert( t.responseText ) );
 										
-										$('post_id_' + postid).down('.post').update( t.responseJSON['successString'] );
+										if ( $( 'newContent-' + ipb.topic.topPid ) )
+										{
+											$( 'newContent-' + ipb.topic.topPid).hide();
+											new Effect.BlindDown( 'newContent-' + ipb.topic.topPid, { duration: 0.5, queue: 'front' } );
+											
+											/* Close editor */
+											ipb.textEditor.getEditor( ipb.topic.fastReplyId ).minimizeOpenedEditor();
+									
+											prettyPrint();
+										}
 										
-										ipb.global.findImgs( $( 'post_id_' + postid ).down('.post') );										
-										//dp.SyntaxHighlighter.HighlightAll('bbcode_code');
-										prettyPrint();
+										ipb.topic.isPosting = false;
 									}
 								}
 							}
 						);
 	},
+	
+	/* ------------------------------ */
+	/**
+	 * Retrieve quote via AJAX and insert into editor
+	*/
+	ajaxQuote: function(e, elem)
+	{
+		if ( DISABLE_AJAX )
+		{
+			return false;
+		}
+		
+		// If user is holding ctrl or command, just submit since they
+		if ( e.ctrlKey == true || e.metaKey == true || e.keyCode == 91 )
+		{
+			return false;
+		}
+		
+		Event.stop(e);
+		
+		pid = elem.readAttribute('pid');
+		
+		var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=quote&t=' + ipb.topic.topic_id + '&p=' + pid + '&md5check=' + ipb.vars['secure_hash'];
+		Debug.write( url );
+		
+		new Ajax.Request(	url,
+							{
+								method: 'get',
+								encoding: ipb.vars['charset'],
+								onSuccess: function(t)
+								{ 
+									if (  t.responseJSON && t.responseJSON['error'] )
+									{
+										ipb.global.errorDialogue( t.responseJSON['error'] );
+										
+										return false;
+									}
+									else if ( t.responseText && t.responseText != 'nopermission' )
+									{
+										editor	= ipb.textEditor.getEditor( ipb.topic.fastReplyId );
+										editor.insert( t.responseText, true );
+									}
+								}
+							}
+						);
+	},
+	
+	/* ------------------------------ */
+	/**
+	 * Saves the contents of quick edit
+	*/
+	ajaxEditSave: function(e)
+	{
+		try {
+			Event.stop(e);
+			var elem = Event.element(e);
+			var postid = elem.id.replace('edit_save_e', '');
+			if( !postid ){ alert("No post ID"); return; }
+
+			var Post = ipb.textEditor.getEditor( 'edit-' + postid ).getText();
+
+			if( Post.blank() )
+			{
+				alert( ipb.lang['post_empty'] );
+				//return;
+			}
+		
+			var add_edit    = null;
+			var edit_reason = '';
+			var post_htmlstatus = '';
+		
+			if( $('add_edit_' + postid ) ){
+				add_edit = $F('add_edit_' + postid );
+			}
+		
+			if( $('post_edit_reason_' + postid ) ){
+				edit_reason = $F('post_edit_reason_' + postid );
+			}	
+		
+			if( $('post_htmlstatus_' + postid ) ) {
+				post_htmlstatus = $F('post_htmlstatus_' + postid );
+			}
+
+			var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=editBoxSave&p=' + postid + '&t=' + ipb.topic.topic_id + '&f=' + ipb.topic.forum_id;
+		
+			new Ajax.Request(	url,
+								{
+									method: 'post',
+									evalJSON: 'force',
+									encoding: ipb.vars['charset'],
+									parameters: {
+										md5check: 			ipb.vars['secure_hash'],
+										Post: 				Post.encodeParam(),
+										add_edit:			add_edit,
+										post_edit_reason:	edit_reason.encodeParam(),
+										post_htmlstatus: 	post_htmlstatus
+									},
+									onSuccess: function(t)
+									{
+										if( t.responseJSON['error'] )
+										{
+											if( $('error_msg_e' + postid) )
+											{
+												$('error_msg_e' + postid).update( t.responseJSON['error'] );
+												new Effect.BlindDown( $('error_msg_e' + postid), { duration: 0.4 } );
+											}
+											else
+											{
+												alert( t.responseJSON['error'] );
+											}
+										
+											return false;
+										}
+										else
+										{
+											// Update post; SKINNOTE: need to fix linked image sizes
+											// SKINNOTE: also need to reapply "code" javascript
+											$('edit_post_' + postid).writeAttribute('_editing', '0');
+										
+											ipb.textEditor.getEditor( 'edit-' + postid ).remove();
+										
+											$('post_id_' + postid).down('.post').update( t.responseJSON['successString'] );
+
+											prettyPrint();
+										}
+									}
+								}
+							);
+		} catch(err) {
+			alert( err );
+		}
+	},
 									
 		
 	/* ------------------------------ */
@@ -482,15 +830,157 @@ _topic.prototype.topic = {
 		var postid = elem.id.replace('edit_cancel_e', '');
 		if( !postid ){ return; }
 		
-		if( ipb.topic.postcache[ postid ] ){
+		if( ipb.topic.postcache[ postid ] )
+		{
+			ipb.textEditor.getEditor( 'edit-' + postid ).remove();
+			
 			$('post_id_' + postid).down('.post').update( ipb.topic.postcache[ postid ] );
 			ipb.editors[ postid ] = null;
-			$('edit_post_' + postid).writeAttribute('_editing', '0');
+			$('edit_post_' + postid).writeAttribute('_editing', '0');			
 		}
 		
 		return;
 	},
 
+	/**
+	 * Callback for fast reply when typing has commenced
+	 */
+	isTypingCallBack: function()
+	{
+		/* Are we *NOT* on the last page? */
+		if ( ! Object.isUndefined( ipb.topic.counts ) && ! Object.isUndefined( ipb.topic.counts['perPage'] ) )
+		{
+			if ( ( ipb.topic.counts['postTotal'] ) && ( ( ipb.topic.counts['postTotal'] - ipb.topic.counts['curStart'] ) >= ipb.topic.counts['perPage'] ) )
+			{ 
+				return false;
+			}
+		}
+		
+		/* set off the timer */
+		ipb.textEditor.getEditor().timers['interval_hasContent'] = setInterval( ipb.topic.pollForReplies, ipb.textEditor.IPS_NEW_POST_POLLING );
+		
+		/* Starting timer */
+		ipb.topic.timers['_startPolling'] = new Date().getTime();
+		
+		Debug.write( "Starting timer for reply polling: " + ipb.topic.timers['_startPolling'] );
+	},
+	
+	/**
+	 * Poll for replies
+	 */
+	pollForReplies: function()
+	{
+		var timeNow  = new Date().getTime();
+		var timeDiff = ( timeNow - ipb.topic.timers['_startPolling'] ) / 1000;
+		
+		Debug.write( "I have been polling for : " + timeDiff + " seconds" );
+		
+		/* Race condition! */
+		if ( ipb.topic.isPosting === true )
+		{
+			return;
+		}
+		
+		/* Only poll for 1 hour. After that, cancel! */
+		if ( timeDiff / 3600 > 1 )
+		{
+			Debug.write( "I have stopped polling. Sorry." );
+			
+			clearInterval( ipb.textEditor.getEditor().timers['interval_hasContent'] );
+		}
+		else
+		{
+			/* poll away */
+			var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=pollForReplies&t=' + ipb.topic.topic_id + '&pid=' + ipb.topic.topPid + '&md5check=' + ipb.vars['secure_hash'];
+			Debug.write( url );
+			
+			new Ajax.Request(	url,
+								{
+									method: 'get',
+									evalJSON: 'force',
+									encoding: ipb.vars['charset'],
+									hideLoader: true,
+									onSuccess: function(t)
+									{
+										if ( t.responseJSON )
+										{
+											var count = parseInt( t.responseJSON['count'] );
+											
+											if ( count == ipb.topic.polling.count )
+											{
+												/* Nothing new, return */
+												return false;
+											}
+											
+											ipb.topic.polling.count = count;
+											
+											if ( count )
+											{
+												string = new Template( ipb.lang['topic_polling'] ).evaluate( { count: count, click: 'ipb.topic.insertNewPosts(event)' } );
+												ipb.global.showInlineNotification( string, { 'showClose': true, 'displayForSeconds': 20 } );
+											}
+										}
+									}
+								}
+							);
+		}
+	},
+	
+	/**
+	 * Insert new posts into the topic
+	 * 
+	 */
+	insertNewPosts: function(e)
+	{ 
+		Event.stop(e);
+		
+		/* Reset */
+		ipb.topic.polling.count = 0;
+		
+		/* poll away */
+		var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=getNewPosts&t=' + ipb.topic.topic_id + '&pid=' + ipb.topic.topPid + '&md5check=' + ipb.vars['secure_hash'];
+		Debug.write( url );
+		
+		new Ajax.Request(	url,
+							{
+								method: 'get',
+								evalJSON: 'force',
+								encoding: ipb.vars['charset'],
+								onSuccess: function(t)
+								{
+									if ( t.responseText )
+									{
+										/* Should find a neater solution to this dumbo */
+										m = t.responseText.match( /.*<!--post:(\d+?)-->/ );
+										
+										if ( m && m[1] )
+										{
+											ipb.topic.topPid = m[1];
+										}
+										else
+										{
+											return false;
+										}
+										
+										$('ips_Posts').insert( new Element('div', { id: 'newContent-' + ipb.topic.topPid } ).insert( t.responseText ) );
+										
+										if ( $( 'newContent-' + ipb.topic.topPid ) )
+										{
+											$( 'newContent-' + ipb.topic.topPid).hide();
+											new Effect.BlindDown( 'newContent-' + ipb.topic.topPid, { duration: 1.0, queue: 'front', afterFinish: function() { $('post_id_' + ipb.topic.topPid).scrollTo() } } );
+											
+											prettyPrint();
+										}
+										
+										/* Close notification */
+										ipb.global.closeInlineNotification();
+									}
+								}
+							}
+						);
+		return false;
+	},
+	
 	/* ------------------------------ */
 	/**
 	 * Reads the cookie and checks posts as necessary
@@ -555,6 +1045,12 @@ _topic.prototype.topic = {
 		ipb.Cookie.set('modpids', pids, 0);
 		$('selectedpidsJS').value = pids;
 		ipb.topic.updatePostModButton();
+		
+		if( $('moderator_toggle') ){
+			$('moderator_toggle').up('div').hide();
+			$("topic_mod").show();
+			$('topic_mod_2').show();
+		}
 	},
 	
 	/* ------------------------------ */
@@ -604,6 +1100,63 @@ _topic.prototype.topic = {
 		return true;
 	},
 	
+	/* ------------------------------ */
+	/**
+	 * Insert multiquoted posts into editor
+	 * 
+	 * @var 	{event}		e	The event
+	*/
+	insertQuotedPosts: function(e)
+	{
+		// Get quoted post ids
+		quoted = ipb.Cookie.get('mqtids');
+		
+		var url = ipb.vars['base_url'] + 'app=forums&module=ajax&section=topics&do=mqquote&t=' + ipb.topic.topic_id;
+		Debug.write( url );
+		
+		new Ajax.Request(	url,
+							{
+								method: 'post',
+								parameters: {
+									pids:		quoted,
+									md5check:	ipb.vars['secure_hash']
+								},
+								evalJSON: 'force',
+								encoding: ipb.vars['charset'],
+								onSuccess: function(t)
+								{ 
+									if (  t.responseJSON && t.responseJSON['error'] )
+									{
+										ipb.global.errorDialogue( t.responseJSON['error'] );
+										
+										return false;
+									}
+									else if ( t.responseText && t.responseText != 'nopermission' )
+									{
+										editor	= ipb.textEditor.getEditor( ipb.topic.fastReplyId )
+										editor.insert( t.responseText, true );
+									}
+								}
+							}
+						);
+		
+		
+		// Turn off
+		$('multiQuoteInsert').hide();
+		ipb.topic.mqBoxShowing	= false;
+		
+		$$('.multiquote').each( function(elem){
+			$(elem).removeClassName('selected');
+		});
+		
+		// Reset cookie
+		ipb.Cookie.set('mqtids', '', 0);
+
+		// And return
+		Event.stop(e);
+		return false;
+	},
+
 	/* ------------------------------ */
 	/**
 	 * Toggles the multimod buttons in posts
@@ -617,28 +1170,79 @@ _topic.prototype.topic = {
 		
 		// Get list of already quoted posts
 		try {
-			quoted = ipb.Cookie.get('mqtids').split(',').compact();
+			quoted = ipb.Cookie.get('mqtids').split(',').compact().without('');
 		} catch(err){
 			quoted = $A();
 		}
 		
-		id = elem.id.replace('multiq_', '');
+		id			= elem.id.replace('multiq_', '');
+		quotedItems	= 0;
 		
 		// Hokay, are we selecting/deselecting?
 		if( elem.hasClassName('selected') )
 		{
 			elem.removeClassName('selected');
-			quoted = quoted.uniq().without( id ).join(',');
+			quoted		= quoted.uniq().without( id );
+			quotedItems	= quoted.size();
+			quoted		= quoted.join(',');
 		}
 		else
 		{
 			elem.addClassName('selected');
 			quoted.push( id );
-			quoted = quoted.uniq().join(',');
+			quotedItems	= quoted.size();
+			quoted		= quoted.uniq().join(',');
 		}
 		
+		// If it's just a ',' then empty it
+		if( quoted == ',' ){
+			quoted = '';
+		}
+
+		// If we have quoted posts...
+		if( quoted ){
+			// And it's not already showing, then show it.  If it's already showing, no need to recreate
+			if( !ipb.topic.mqBoxShowing )
+			{
+				$('multiQuoteInsert').show();
+				ipb.topic.mqBoxShowing	= true;
+			}
+			
+			// Show nicer string
+			$('mqbutton').update( ipb.lang['mq_reply_swap'].replace( /#{num}/, quotedItems ) );
+		}
+		// If we don't, then we should remove the insert button
+		else
+		{
+			if( ipb.topic.mqBoxShowing )
+			{
+				$('multiQuoteInsert').hide();
+				ipb.topic.mqBoxShowing	= false;
+			}
+		}
+
 		// Save cookie
-		ipb.Cookie.set('mqtids', quoted, 0);			
+		ipb.Cookie.set('mqtids', quoted, 0);
+	},
+	
+	/* ------------------------------ */
+	/**
+	 * Clears selected multiquote posts
+	 * 
+	 * @param	{event}		e		The event
+	*/
+	clearMultiQuote: function(e){
+		Event.stop(e);
+		
+		// Empty the cookie
+		ipb.Cookie.set('mqtids', '', 0);
+		
+		if( $('multiQuoteInsert').visible() ){
+			$('multiQuoteInsert').hide();
+			ipb.topic.mqBoxShowing = false;
+		}
+		
+		$$('.multiquote.selected').invoke('removeClassName', 'selected');
 	},
 	
 	/* ------------------------------ */
@@ -692,15 +1296,13 @@ _topic.prototype.topic = {
 			new Effect.Parallel( [
 				new Effect.BlindDown( elem ),
 				new Effect.Appear( elem )
-			], { duration: 0.5, afterFinish: function(e){
-				 	ipb.global.findImgs( $( elem ) );
-			} } );
+			], { duration: 0.5 } );
 		}
 		
 		if( $('post_id_' + id ).select('.post_ignore')[0] )
 		{
 			ignoreElem = $('post_id_' + id ).select('.post_ignore')[0];
-			/*new Effect.BlindUp( elem, {duration: 0.2} );*/
+
 			ignoreElem.hide();
 		}
 		
@@ -724,42 +1326,17 @@ _topic.prototype.topic = {
 		Event.stop(e);
 		
 		if( !ipb.topic.poll[ qid ] || !ipb.topic.poll[ qid ][ cid ] ){ return; }
-		
-		/*if( ipb.topic.pollPopups[ qid+'_'+cid ] )
-		{
-			ipb.topic.pollPopups[ qid+'_'+cid ].show();
-		}
-		else
-		{*/
-			var content = ipb.templates['poll_voters'].evaluate( { title: ipb.topic.poll[ qid ][ cid ]['name'], content: ipb.topic.poll[ qid ][ cid ]['users'] } );
-		
-			ipb.topic.pollPopups[ qid+'_'+cid ] = new ipb.Popup( 'b_voters_' + qid + '_' + cid, {
-															type: 'balloon',
-															initial: content,
-															stem: true,
-															hideAtStart: false,
-															attach: { target: $('l_voters_' + qid + '_' + cid ), position: 'auto', 'event': 'click' },
-															w: '500px'
-														});
-		//}
-	},
+
+		var content = ipb.templates['poll_voters'].evaluate( { title: ipb.topic.poll[ qid ][ cid ]['name'], content: ipb.topic.poll[ qid ][ cid ]['users'] } );
 	
-	/* ------------------------------ */
-	/**
-	 * Reputation Popup Balloon
-	 */
-	repPopUp: function( e, postID )
-	{
-		var _url = ipb.vars['base_url'] + '&app=forums&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=topics&do=reputation&post=' + postID;
-		new ipb.Popup('rep_' + postID, {
-			type: 'balloon',
-			stem: true,
-			attach: { target: e, position: 'auto' },
-			hideAtStart: false,
-			ajaxURL: _url,
-			w: '300px',
-			h: '400px'
-			});
+		ipb.topic.pollPopups[ qid+'_'+cid ] = new ipb.Popup( 'b_voters_' + qid + '_' + cid, {
+														type: 'balloon',
+														initial: content,
+														stem: true,
+														hideAtStart: false,
+														attach: { target: $('l_voters_' + qid + '_' + cid ), position: 'auto', 'event': 'click' },
+														w: '500px'
+													});
 	}
 };
 
diff --git a/upload/public/js/ips.twitter.js b/upload/public/js/ips.twitter.js
deleted file mode 100644
index ccf6582d..00000000
--- a/upload/public/js/ips.twitter.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.twitter.js - Twitter Connect code		*/
-/* (c) IPS, Inc 2010							*/
-/* -------------------------------------------- */
-/* Author: Matt Mecham, Rikki Tissier			*/
-/************************************************/
-
-var _tw = window.IPBoard;
-
-_tw.prototype.twitter = {
-	_popUp: null,
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		Debug.write("Initializing ips.twitter.js");
-		
-		//document.observe("dom:loaded", function(){
-			
-		//});
-	},
-	
-	initUserCP: function()
-	{
-		$('tc_remove').observe( 'click', ipb.twitter.usercp_remove );
-	},
-	
-	/**
-	* Loads the URL to remove the app
-	*
-	*/
-	usercp_remove: function()
-	{
-		window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=members&area=twitterRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
-	}
-};
-
-ipb.twitter.init();
\ No newline at end of file
diff --git a/upload/public/js/ips.ucp.js b/upload/public/js/ips.ucp.js
index 0649a669..9d94c1e2 100644
--- a/upload/public/js/ips.ucp.js
+++ b/upload/public/js/ips.ucp.js
@@ -1,81 +1,327 @@
 /************************************************/
 /* IPB3 Javascript								*/
 /* -------------------------------------------- */
-/* ips.ucp.js - Topic view code				*/
-/* (c) IPS, Inc 2008							*/
+/* ips.photoEditor.js				*/
+/* (c) IPS, Inc 2011							*/
 /* -------------------------------------------- */
-/* Author: Rikki Tissier						*/
+/* Author: Matt Mecham						*/
 /************************************************/
 
+/**
+* Returns the value of the selected radio button in the radio group, null if
+* none are selected, and false if the button group doesn't exist
+* @link  http://xavisys.com/using-prototype-javascript-to-get-the-value-of-a-radio-group/
+*
+* @param {radio Object} or {radio id} el
+* OR
+* @param {form Object} or {form id} el
+* @param {radio group name} radioGroup
+*/
+function $RF(el, radioGroup) {
+    if($(el).type && $(el).type.toLowerCase() == 'radio') {
+        var radioGroup = $(el).name;
+        var el = $(el).form;
+    } else if ($(el).tagName.toLowerCase() != 'form') {
+        return false;
+    }
+
+    var checked = $(el).getInputs('radio', radioGroup).find(
+        function(re) {return re.checked;}
+    );
+    return (checked) ? $F(checked) : null;
+}
 
 var _ucp = window.IPBoard;
 
 _ucp.prototype.ucp = {
+	cropPhoto: { 'cropper': false },
+	aboutme_pop: null,
 	
 	init: function()
 	{
 		Debug.write("Initializing ips.ucp.js");
 		
 		document.observe("dom:loaded", function(){
-			if( $('avatarCategory') )
-			{
-				ipb.ucp.initAvatarGallery();
+			if ( $('userCPForm') && $('userCPForm').action.match( "area=photo" ) ){
+				ipb.ucp.setUpPhotoForm();
+			} 
+			
+			if( $('edit_aboutme') ){
+				$('edit_aboutme').observe('click', function(e){
+					Event.stop(e);
+					if( ipb.ucp.aboutme_pop ){
+						ipb.ucp.aboutme_pop.show();
+					} else {
+						ipb.ucp.aboutme_pop = new ipb.Popup( 'aboutme', {
+													type: 'pane',
+												 	modal: false,
+													initial: $('aboutme_editor').show(),
+													hideAtStart: false,
+													evalJs: 'force',
+													w: '750px',
+													h: 600 
+												} );
+						
+						setTimeout( ipb.ucp.initAboutMe, 200 );
+						
+						/* More jiggery pokery to get around pop-up confusion */
+						$('close_aboutme_editor').observe( 'click', ipb.ucp.saveAboutMe );
+					}
+				});
 			}
 			
-			if ( $('userCPForm') && $('userCPForm').action.match( "area=photo" ) )
+			if( $('auto_track') )
 			{
-				$('userCPForm').observe( 'submit', ipb.ucp.photoFormSubmit );
+				$('auto_track').observe('click', function(e){
+
+					if( $F('auto_track') )
+					{
+						if( $F('track_choice') == 'none' )
+						{
+							var myOpt	= $('track_choice').select('option[value="offline"]');
+							
+							if( myOpt && myOpt.length > 0 )
+							{
+								myOpt[0].selected	= true;
+							}
+						}
+					}
+				});
+			}	
+		} );
+	},
+	
+	/**
+	 * Init about me
+	 */
+	initAboutMe: function()
+	{
+		ipb.textEditor.getEditor().initEditor();
+		editorId = ipb.textEditor.getCurrentEditorId();
+		
+		if ( editorId )
+		{
+			ipb.textEditor.getEditor( editorId ).initEditor();
+			
+			$( ipb.textEditor.getCurrentEditorId() ).writeAttribute( 'name', 'Post_x' );
+			$('userCPForm').insert( new Element('input', { 'type': 'hidden', 'name': 'Post', 'id': 'Post_About_me' } ) );
+		}
+	},
+	
+	/**
+	 * Save about me
+	 */
+	saveAboutMe: function(e)
+	{
+		Event.stop(e);
+		ipb.ucp.aboutme_pop.hide();
+		
+		/* ensure text area is updated - do this manually 'cos normal triggers are confused by pop-up */
+		$('Post_About_me').value = ipb.textEditor.getEditor().getText();
+		
+		$('userCPForm').submit();
+	},
+	
+	/**
+	 * Set up the photo form
+	 */
+	setUpPhotoForm: function()
+	{	
+		/* Watch cropper init */
+		ipb.delegate.register('.cropperStart', ipb.ucp.photoCropStart );
+		
+		/* Activate ok/cancel linkies */
+		ipb.delegate.register('.cropperAccept', ipb.ucp.photoCropAccept );
+		ipb.delegate.register('.cropperCancel', ipb.ucp.photoCropCancel );
+		
+		/* Watch form */
+		ipb.inlineUploader.watch( 'userCPForm', 'upload_photo', ipb.ucp.photoUploaded );
+		
+		/* Watch for radio buttons */
+		new Array( 'upload_photo', 'gravatar' ).each( function(item)
+		{
+			if ( $(item ) )
+			{
+				$(item ).observe( 'click', ipb.ucp.rb );
 			}
 		} );
 	},
 	
 	/**
-	 * Photo form submit
+	 * Radio button changed
+	 * 
 	 */
-	photoFormSubmit: function(e)
+	rb: function(e)
 	{
-		/* Have we got a form value? */
-		if ( $('upload_photo') && ! $F('upload_photo') )
+		elem = Event.findElement(e);
+		
+		switch ( elem.id )
+		{
+			case 'upload_photo':
+				$('ips_ptype_custom').checked = true;
+			break;
+			case 'gravatar':
+				$('ips_ptype_gravatar').checked = true;
+			break;
+		}
+	},
+	
+	/**
+	 * Init Cropper
+	 * 
+	 */
+	photoCropStart: function(e, elem)
+	{
+		var img    = $('ips_currentPhoto').down('img');
+		img.identify();
+		
+		/* Already cropping? */
+		if ( ipb.ucp.cropPhoto['cropper'] !== false )
 		{
-			Event.stop(e);
-			alert( ipb.lang['usercp_photo_upload'] );
 			return false;
 		}
-	},
-	
-	initAvatarGallery: function()
-	{
-		// set event
-		$('avatarCategory').observe('change', ipb.ucp.updateAvatarGallery);
-	},
-	
-	updateAvatarGallery: function(e)
-	{
-		var catid = $F('avatarCategory');
-		if( Object.isUndefined( catid ) || catid.blank() || catid == 'none' ){ return; }
 		
-		var url = ipb.vars['base_url'] + "app=forums&module=ajax&section=usercp&do=get_avatar_images&cat=" + catid + "&secure_key=" + ipb.vars['secure_hash'];
+		var height = parseInt( img.readAttribute('height') );
+		var width  = parseInt( img.readAttribute('width') );
+		var size   = height;
 		
-		new Ajax.Request( url.replace(/&amp;/, '&'),
-		 				{
-							method: 'get',
-							onSuccess: function(t)
-							{
-								if( t.responseText != 'error' )
-								{
-									$('avatarImageContainer').update( t.responseText ).show();
-								}
-								
-							}
-						});
-	},
-	
-	deleteAnnouncement: function(e, id)
-	{
-		if( !confirm(ipb.lang['delete_confirm']) )
+		if ( width < height )
 		{
-			Event.stop(e);
+			size = width;
 		}
+		
+		/* Show ok/cancel */
+		$('ips_cropperControls').show();
+		$('ips_cropperControls').setStyle( 'margin-top: ' + ( height + 5 ) + 'px' );
+		
+		/* Init cropper */
+		ipb.ucp.cropPhoto['cropper'] = new Cropper.Img(  img.id,  { ratioDim: { x: size, y: size }, 
+																	minWidth:  size,
+																	minHeight: size,
+																	maxWidth:  size,
+																	maxHeight: size,
+																	displayOnInit: true, 
+																	onEndCrop: ipb.ucp.photoOnEndCrop  } );
+		
+		
+	},
+	
+	/**
+	 * User lets go of cropper outline
+	 * @param coords
+	 * @param dimensions
+	 */
+	photoOnEndCrop: function( coords, dimensions )
+	{
+		ipb.ucp.cropPhoto['coords'] = coords;
+		ipb.ucp.cropPhoto['dims']   = dimensions;
+	},
+	
+	/**
+	 * Accept the cropping
+	 * @param e
+	 */
+	photoCropAccept: function(e)
+	{
+		/* fetch data */
+		var _url  = ipb.vars['base_url'] + '&app=members&module=ajax&section=photo&do=cropPhoto&secure_key=' + ipb.vars['secure_hash'];
+		Debug.write( _url );
+		
+		new Ajax.Request( _url,
+							{
+								method: 'post',
+								evalJSON: 'force',
+								parameters: { x1: ipb.ucp.cropPhoto['coords'].x1,
+											  x2: ipb.ucp.cropPhoto['coords'].x2,
+											  y1: ipb.ucp.cropPhoto['coords'].y1,
+											  y2: ipb.ucp.cropPhoto['coords'].y2 },
+								onSuccess: function(t)
+								{										    	
+									/* No Permission */
+									if ( t.responseJSON && t.responseJSON['status'] == 'ok' )
+									{
+										/* Close down the pop-up */
+										ipb.ucp.photoCropCancel();
+										
+										/* Update mini */
+										rand = Math.round( Math.random() * 100000000 );
+										$$('.ips_photoPreview._custom' ).first().down('img').writeAttribute( 'src', t.responseJSON['thumb'] + '?t=' + rand );
+										
+										/* update images on the page */
+										$$('.photo').each( function( elem )
+										{
+											try
+											{
+												src  = elem.readAttribute('src');
+												rand = Math.round( Math.random() * 100000000 );
+												
+												if ( src == t.responseJSON['thumb'] )
+												{ 
+													elem.src = t.responseJSON['thumb'] + '?t=' + rand;
+												}
+											} catch (err){}
+										} );
+									}
+								}
+							}						
+						);	
+	},
+	
+	/**
+	 * Cancel Cropper
+	 * 
+	 */
+	photoCropCancel: function(e, elem)
+	{
+		$('ips_cropperControls').hide();
+		ipb.ucp.cropPhoto['cropper'].remove();
+		
+		ipb.ucp.cropPhoto['cropper'] = false;
+	},
+	
+	/**
+	 * Used as a callback for the inlineuploader
+	 * @param json
+	 */
+	photoUploaded: function( json )
+	{
+		var fullSize;
+		var thumbSize;
+		var rand = Math.round( Math.random() * 100000000 );
+		
+		if ( json['pp_main_photo'] )
+		{
+			fullSize = ipb.vars['upload_url'] + '/' + json['pp_main_photo'] + '?t=' + rand;
+		}
+		
+		if ( json['pp_thumb_photo'] )
+		{
+			thumbSize = ipb.vars['upload_url'] + '/' + json['pp_thumb_photo'] + '?t=' + rand;
+		}
+		
+		/* Update data */
+		$('ips_currentPhoto').down('img').writeAttribute( 'src', fullSize );
+		$('ips_currentPhoto').down('img').writeAttribute( 'width', json['pp_main_width'] );
+		$('ips_currentPhoto').down('img').writeAttribute( 'height', json['pp_main_height'] );
+		
+		/* Update mini */
+		$$('.ips_photoPreview._' + json['type'] ).first().down('img').writeAttribute( 'src', thumbSize );
+		
+		/* update images on the page */
+		$$('.photo').each( function( elem )
+		{
+			try
+			{
+				src  = elem.readAttribute('src');
+				
+				if ( src == ipb.vars['upload_url'] + '/' + json['pp_thumb_photo'] )
+				{
+					elem.src    = thumbSize;
+					elem.width  = 50;
+					elem.height = 50;
+				}
+			} catch (err){}
+		} );
 	}
 };
 
diff --git a/upload/public/js/ips.vkontakte.js b/upload/public/js/ips.vkontakte.js
deleted file mode 100644
index d8a6fc01..00000000
--- a/upload/public/js/ips.vkontakte.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/************************************************/
-/* IPB3 Javascript								*/
-/* -------------------------------------------- */
-/* ips.facebook.js - Facebook Connect code		*/
-/* (c) IPS, Inc 2008							*/
-/* -------------------------------------------- */
-/* Author: Matt Mecham, Rikki Tissier			*/
-/************************************************/
-
-var _vk = window.IPBoard;
-
-_vk.prototype.vkontakte = {
-
-	linkedMember: {},
-    vkMemberInfo: {},
-	
-	/*------------------------------*/
-	/* Constructor 					*/
-	init: function()
-	{
-		Debug.write("Initializing ips.vkontakte.js");
-    
-	},
-	
-    show_loginButton: function()
-    {
-        var content = $('vk-template-button').innerHTML;
-        $('vkUserBox').update( content );
-        
-        $('vk_login').observe( 'click', function() {
-            $('vk_frame').contentWindow.doLogin();
-        });
-        
-    },
-
-	
-	/**
-	* Updates the log in box
-	*
-	*/
-	login_updateBox: function()
-	{
-        
-		/* INIT */
-		var content       = $('vk-template-main').innerHTML;
-        
-        content = content + $('vk-template-linked').innerHTML;        
-        $('vkUserBox').update( content );
-
-        $('openapi_user').innerHTML = ipb.vkontakte.vkMemberInfo.name;
-        $('vk_linkForm').action = $('vk_linkForm').action + '?key=' + ipb.vkontakte.linkedMember['key'];
-        $('openapi_userlink').href = 'http://vkontakte.ru/id' + ipb.vkontakte.vkMemberInfo.id;
-        $('openapi_userphoto').src = ipb.vkontakte.vkMemberInfo.photo;
-
-		/* Set up handlers */
-        if ( $('vk_link') ) 
-        {  
-           $('vk_link').observe('click', ipb.vkontakte.login_linkAcc );
-        }
-        
-        if ( $('vk_complete') )
-        {
-            $('vk_complete').observe('click', ipb.vkontakte.login_complete );
-        }
-        
-        if ( $('vk_logout') )
-        {
-            $('vk_logout').observe( 'click', function() {
-                $('vk_frame').contentWindow.doLogout();
-            });
-        }
-	},
-	
-	initUserCP: function()
-	{
-		$('tc_remove').observe( 'click', ipb.vkontakte.usercp_remove );
-	},    
-    
-	/**
-	* Loads the URL to remove the app
-	*
-	*/
-	usercp_remove: function()
-	{
-		window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=members&area=vkRemove&do=custom&secure_key=' + ipb.vars['secure_hash'];
-	},
-		
-	/**
-	* Simply submits our form so PHP can do the final checks
-	*
-	*/
-	login_complete: function()
-	{
-		$('vk_linkForm').submit();
-	},
-	
-	/**
-	* Check, via AJAX for an existing account
-	*
-	*/
-	login_linkAcc: function()
-	{
-        window.location = ipb.vars['base_url'] + 'app=core&module=usercp&tab=members&area=vkLink&do=custom&secure_key=' + ipb.vars['secure_hash'];
-	},
-    
-	/**
-	 * Check to see if the facebook user is linked to an IPB account
-	 */
-	loadUser: function(data)
-	{
-		/* Already been here? */
-		if ( typeof( ipb.vkontakte.linkedMember['member_id'] ) != 'undefined' )
-		{
-			return;
-		}
-		
-		/* Fetch FB ID */
-		vkUserId = data.id;
-        ipb.vkontakte.vkMemberInfo = data;
-		
-		/* Got a linked member? */
-		new Ajax.Request( 	ipb.vars['base_url'] + '&app=core&module=ajax&secure_key=' + ipb.vars['secure_hash'] + '&section=vkontakte&do=getUserByVkId',
-							{
-								method: 'post',
-                                parameters: data,
-								evalJSON: 'force',
-								onSuccess: function(t)
-								{
-                                    ipb.vkontakte.linkedMember = t.responseJSON;
-									ipb.vkontakte.login_updateBox();
-								}
-							}
-						);
-	}
-}
-
-ipb.vkontakte.init();
\ No newline at end of file
diff --git a/upload/public/js/mobile_touch.js b/upload/public/js/mobile_touch.js
index 388db244..d2757ace 100644
--- a/upload/public/js/mobile_touch.js
+++ b/upload/public/js/mobile_touch.js
@@ -1,28 +1,91 @@
 document.observe("dom:loaded", function() 
 {
-	$$("#user_navigation a").each( function(e) { e.setStyle( { 'display' : 'block', 'font-size': '1.4em' } ); } );	
 	$$("#secondary_navigation a").each( function(e) { Event.observe(e, "click", loadUrl ); } );	
 	$$(".touch-row").each(function(e) { Event.observe(e, "click", touchRowClick); addArrow(e); });
+	$$("a.prev:not(.disabled), a.next:not(.disabled)").invoke("on", "click", loadUrl);
 	$$(".post").each(function(e) { Event.observe(e, "click", postClick); });
+	$$('.sd_content').invoke('on', 'click', '.sd_content', toggleDeletedContent);
 	Event.observe($('options-button'), "click", openNavigation);
 	if($('filter-option')) {Event.observe($('filter-option'), "click", openFilter);}
 	$('options-button').setStyle({'display': 'block'});
+	if( $('nav_markread') ){
+		$('nav_markread').down('a').observe('click', markAsRead);
+	};
+	
+	if( $('show_skins') ){
+		$('show_skins').on('click', function(e){
+			$('show_skins').hide();
+			$('show_skins_box').show();
+			Event.stop(e);
+			return false;
+		});
+	}
+	if( $('show_langs') ){
+		$('show_langs').on('click', function(e){
+			$('show_langs').hide();
+			$('show_langs_box').show();
+			Event.stop(e);
+			return false;
+		});
+	}
 	
 	/* Set this here to 'toggle' works later */
 	$('shade').setStyle({'display': 'none'});
 	
-	if ( $('filter-letters') )
-	{
+	if ( $('filter-letters') ){
 		$('filter-letters').toggleClassName('hidden');
 	}
+	
+	// Set up user nav box
+	var items = $("user_navigation").down("ul").select("li").size();
+	var diff = 3 - (items % 3);
+	
+	for(i=0; i<diff; i++){
+		$("user_navigation").down("ul").insert({bottom: new Element("li").addClassName("dummy").insert( new Element("span") ) });
+	}
 });
 
+function toggleDeletedContent(e, element)
+{
+	Event.stop(e);
+	
+	var id = element.id.replace('seeContent_', '');
+	
+	$('postsDelete-' + id).hide();
+	$('post-' + id).show();	
+}
+
+function markAsRead(e)
+{
+	if( !confirm( ipb.lang['clear_markboard'] ) ){
+		Event.stop(e);
+	}	
+}
+
+function mobileFilter( e, element )
+{
+	// Does the pane exist?
+	if( !$( element.id + '_pane' ) ){
+		return;
+	}
+	
+	$('shade').toggle();
+	$( element.id + '_pane' ).show();
+}
+
+function closePane( e, element )
+{
+	Event.stop(e);
+	$(element).up(".ipsFilterPane").hide();
+	$('shade').hide();
+}
+
 /**
  * Add the touch arrow */
 function addArrow(e)
 {
 	d = e.getDimensions();
-	t = ( d.height / 2 ) - 12;
+	t = ( d.height / 2 ) - 18;
 	
 	if ( ! e.inspect().match( '<h2' ) )
 	{
@@ -48,16 +111,18 @@ function loadUrl( e )
 
 function postClick()
 {
-	$(this.id + '-controls').toggleClassName('visible');
+	if( $(this.id + '-controls') ){
+		$(this.id + '-controls').toggleClassName('visible');
+	}
 }
 
 function openNavigation()
 {
-	vp = document.viewport.getDimensions();
+	//vp = document.viewport.getDimensions();
 	
+	var elem = $( document.body ).getLayout();
 	$('user_navigation').toggle();
-	$('user_navigation').setStyle( { 'position': 'absolute', 'width': ( vp.width - 20 ) + 'px' } );
-	$('options-button').update($('user_navigation').visible() ? '&laquo;' : '&raquo;');
+	$('user_navigation').setStyle( { 'position': 'absolute', 'width': elem.get('margin-box-width') + 'px' } );
 	$('shade').toggle();
 }
 
diff --git a/upload/public/min/builder/_index.js b/upload/public/min/builder/_index.js
index 8e5313a3..8f80ac3d 100644
--- a/upload/public/min/builder/_index.js
+++ b/upload/public/min/builder/_index.js
@@ -24,7 +24,7 @@ var MUB = {
     ,newLi : function () {
         return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' 
         + ' <button title="Remove">x</button> <button title="Include Earlier">&uarr;</button>'
-        + ' <button title="Include Later">&darr;</button> <span></span></li>';
+        + ' <button title="Include Later">&darr;</button> <span></span></li>';/*noLibHook*/
     }
     /**
      * Add new empty source LI and attach handlers to buttons
diff --git a/upload/public/min/builder/index.php b/upload/public/min/builder/index.php
index 1b209822..dfb64af6 100644
--- a/upload/public/min/builder/index.php
+++ b/upload/public/min/builder/index.php
@@ -8,7 +8,7 @@ if (phpversion() < 5) {
 $encodeOutput = (function_exists('gzdeflate')
                  && !ini_get('zlib.output_compression'));
 
-require dirname(__FILE__) . '/../config.php';
+require dirname(__FILE__) . '/../config.php';/*noLibHook*/
 
 if (! $min_enableBuilder) {
     header('Location: /');
@@ -171,7 +171,7 @@ ob_end_clean();
 
 set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path());
 
-require 'Minify.php';
+require 'Minify.php';/*noLibHook*/
 
 if (0 === stripos(PHP_OS, 'win')) {
     Minify::setDocRoot(); // we may be on IIS
diff --git a/upload/public/min/builder/ocCheck.php b/upload/public/min/builder/ocCheck.php
index 8cc19af8..978efe2d 100644
--- a/upload/public/min/builder/ocCheck.php
+++ b/upload/public/min/builder/ocCheck.php
@@ -8,7 +8,7 @@
 $_oc = ini_get('zlib.output_compression');
  
 // allow access only if builder is enabled
-require dirname(__FILE__) . '/../config.php';
+require dirname(__FILE__) . '/../config.php';/*noLibHook*/
 if (! $min_enableBuilder) {
     header('Location: /');
     exit();
@@ -20,7 +20,7 @@ if (isset($_GET['hello'])) {
     // try to prevent double encoding (may not have an effect)
     ini_set('zlib.output_compression', '0');
     
-    require $min_libPath . '/HTTP/Encoder.php';
+    require $min_libPath . '/HTTP/Encoder.php';/*noLibHook*/
     HTTP_Encoder::$encodeToIe6  = true; // just in case
     $he = new HTTP_Encoder(array(
         'content' => 'World!'
diff --git a/upload/public/min/config.php b/upload/public/min/config.php
index ace14a71..ffb00323 100644
--- a/upload/public/min/config.php
+++ b/upload/public/min/config.php
@@ -31,7 +31,7 @@ $min_errorLogger = false;
 /**
  * Allow use of the Minify URI Builder app. If you no longer need 
  * this, set to false.
- **/
+ */
 $min_enableBuilder = false;
 
 
@@ -113,7 +113,7 @@ if ( isset( $_GET['f'] ) )
  * Note: Despite this setting, if you include a number at the end of the
  * querystring, maxAge will be set to one year. E.g. /min/f=hello.css&123456
  */
-$min_serveOptions['maxAge'] = 31536000;
+$min_serveOptions['maxAge'] = 31536000;/*noLibHook*/
 
 
 /**
@@ -124,7 +124,7 @@ $min_serveOptions['maxAge'] = 31536000;
  * 
  * // = shortcut for DOCUMENT_ROOT 
  */
-//$min_serveOptions['minApp']['allowDirs'] = array('//js', '//css');
+//$min_serveOptions['minApp']['allowDirs'] = array('//js', '//css');/*noLibHook*/
 
 /**
  * Set to true to disable the "f" GET parameter for specifying files.
diff --git a/upload/public/min/groupsConfig.php b/upload/public/min/groupsConfig.php
index 9527ba40..a7804956 100644
--- a/upload/public/min/groupsConfig.php
+++ b/upload/public/min/groupsConfig.php
@@ -7,7 +7,7 @@
 /** 
  * You may wish to use the Minify URI Builder app to suggest
  * changes. http://yourdomain/min/builder/
- **/
+ */
 
 $min_serveOptions['encodeOutput'] =1;
 
diff --git a/upload/public/min/index.php b/upload/public/min/index.php
index 51c35256..6e565d4e 100644
--- a/upload/public/min/index.php
+++ b/upload/public/min/index.php
@@ -10,12 +10,12 @@
 define('MINIFY_MIN_DIR', dirname(__FILE__));
 
 // load config
-require MINIFY_MIN_DIR . '/config.php';
+require MINIFY_MIN_DIR . '/config.php';/*noLibHook*/
 
 // setup include path
-set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());
+set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());/*noLibHook*/
 
-require 'Minify.php';
+require 'Minify.php';/*noLibHook*/
 
 Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
 Minify::setCache(
@@ -36,9 +36,9 @@ if ($min_allowDebugFlag && isset($_GET['debug'])) {
 }
 
 if ($min_errorLogger) {
-    require_once 'Minify/Logger.php';
+    require_once 'Minify/Logger.php';/*noLibHook*/
     if (true === $min_errorLogger) {
-        require_once 'FirePHP.php';
+        require_once 'FirePHP.php';/*noLibHook*/
         Minify_Logger::setLogger(FirePHP::getInstance(true));
     } else {
         Minify_Logger::setLogger($min_errorLogger);
@@ -51,7 +51,7 @@ if (preg_match('/&\\d/', $_SERVER['QUERY_STRING'])) {
 }
 if (isset($_GET['g'])) {
     // well need groups config
-    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');
+    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');/*noLibHook*/
 }
 if (isset($_GET['f']) || isset($_GET['g'])) {
     // serve!   
diff --git a/upload/public/min/lib/FirePHP.php b/upload/public/min/lib/FirePHP.php
index 07369bf2..8f4f9659 100644
--- a/upload/public/min/lib/FirePHP.php
+++ b/upload/public/min/lib/FirePHP.php
@@ -202,7 +202,7 @@ class FirePHP {
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+    return array('options','objectFilters','enabled');/*noLibHook*/
   }
     
   /**
@@ -272,7 +272,7 @@ class FirePHP {
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+    $this->options = array_merge($this->options,$Options);/*noLibHook*/
   }
   
   /**
@@ -929,7 +929,7 @@ class FirePHP {
         // but exist in the object
         foreach( $members as $raw_name => $value ) {
           
-          $name = $raw_name;
+          $name = $raw_name;/*noLibHook*/
           
           if ($name{0} == "\0") {
             $parts = explode("\0", $name);
@@ -1065,7 +1065,7 @@ class FirePHP {
    * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
    * @author      Christoph Dorn <christoph@christophdorn.com>
    * @copyright   2005 Michal Migurski
-   * @version     CVS: $Id: FirePHP.php 5711 2010-01-14 20:33:50Z bfarber $
+   * @version     CVS: $Id: FirePHP.php 8229 2011-03-31 10:17:44Z ips_terabyte $
    * @license     http://www.opensource.org/licenses/bsd-license.php
    * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
    */
diff --git a/upload/public/min/lib/HTTP/index.html b/upload/public/min/lib/HTTP/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/HTTP/index.html
+++ b/upload/public/min/lib/HTTP/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/Minify.php b/upload/public/min/lib/Minify.php
index 25f0827a..294730f9 100644
--- a/upload/public/min/lib/Minify.php
+++ b/upload/public/min/lib/Minify.php
@@ -7,7 +7,7 @@
 /**
  * Minify_Source
  */
-require_once 'Minify/Source.php';
+require_once 'Minify/Source.php';/*noLibHook*/
  
 /**
  * Minify - Combines, minifies, and caches JavaScript and CSS files on demand.
@@ -77,7 +77,7 @@ class Minify {
     public static function setCache($cache = '', $fileLocking = true)
     {
         if (is_string($cache)) {
-            require_once 'Minify/Cache/File.php';
+            require_once 'Minify/Cache/File.php';/*noLibHook*/
             self::$_cache = new Minify_Cache_File($cache, $fileLocking);
         } else {
             self::$_cache = $cache;
@@ -164,7 +164,7 @@ class Minify {
             $class = 'Minify_Controller_' . $controller;
             if (! class_exists($class, false)) {
                 require_once "Minify/Controller/" 
-                    . str_replace('_', '/', $controller) . ".php";    
+                    . str_replace('_', '/', $controller) . ".php";/*noLibHook*/
             }
             $controller = new $class();
         }
@@ -207,7 +207,7 @@ class Minify {
                 $contentEncoding = self::$_options['encodeMethod'];
             } else {
                 // sniff request header
-                require_once 'HTTP/Encoder.php';
+                require_once 'HTTP/Encoder.php';/*noLibHook*/
                 // depending on what the client accepts, $contentEncoding may be 
                 // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling
                 // getAcceptedEncoding(false, false) leaves out compress and deflate as options.
@@ -218,7 +218,7 @@ class Minify {
         }
         
         // check client cache
-        require_once 'HTTP/ConditionalGet.php';
+        require_once 'HTTP/ConditionalGet.php';/*noLibHook*/
         $cgOptions = array(
             'lastModifiedTime' => self::$_options['lastModifiedTime']
             ,'isPublic' => self::$_options['isPublic']
@@ -266,7 +266,7 @@ class Minify {
             // the goal is to use only the cache methods to sniff the length and 
             // output the content, as they do not require ever loading the file into
             // memory.
-            $cacheId = 'minify_' . self::_getCacheId();
+            $cacheId = 'minify_' . self::_getCacheId();/*noLibHook*/
             $fullCacheId = (self::$_options['encodeMethod'])
                 ? $cacheId . '.gz'
                 : $cacheId;
@@ -376,7 +376,7 @@ class Minify {
             if ($unsetPathInfo) {
                 unset($_SERVER['PATH_INFO']);
             }
-            require_once 'Minify/Logger.php';
+            require_once 'Minify/Logger.php';/*noLibHook*/
             Minify_Logger::log("setDocRoot() set DOCUMENT_ROOT to \"{$_SERVER['DOCUMENT_ROOT']}\"");
         }
     }
@@ -478,7 +478,7 @@ class Minify {
         
         // do any post-processing (esp. for editing build URIs)
         if (self::$_options['postprocessorRequire']) {
-            require_once self::$_options['postprocessorRequire'];
+            require_once self::$_options['postprocessorRequire'];/*noLibHook*/
         }
         if (self::$_options['postprocessor']) {
             $content = call_user_func(self::$_options['postprocessor'], $content, $type);
diff --git a/upload/public/min/lib/Minify/Build.php b/upload/public/min/lib/Minify/Build.php
index e625165e..0b063082 100644
--- a/upload/public/min/lib/Minify/Build.php
+++ b/upload/public/min/lib/Minify/Build.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Source.php';
+require_once 'Minify/Source.php';/*noLibHook*/
 
 /**
  * Maintain a single last modification time for a group of Minify sources to
diff --git a/upload/public/min/lib/Minify/CSS.php b/upload/public/min/lib/Minify/CSS.php
index b2d8e0bf..ae458a39 100644
--- a/upload/public/min/lib/Minify/CSS.php
+++ b/upload/public/min/lib/Minify/CSS.php
@@ -50,12 +50,12 @@ class Minify_CSS {
      */
     public static function minify($css, $options = array()) 
     {
-        require_once 'Minify/CSS/Compressor.php';
+        require_once 'Minify/CSS/Compressor.php';/*noLibHook*/
         if (isset($options['preserveComments']) 
             && !$options['preserveComments']) {
             $css = Minify_CSS_Compressor::process($css, $options);
         } else {
-            require_once 'Minify/CommentPreserver.php';
+            require_once 'Minify/CommentPreserver.php';/*noLibHook*/
             $css = Minify_CommentPreserver::process(
                 $css
                 ,array('Minify_CSS_Compressor', 'process')
@@ -65,7 +65,7 @@ class Minify_CSS {
         if (! isset($options['currentDir']) && ! isset($options['prependRelativePath'])) {
             return $css;
         }
-        require_once 'Minify/CSS/UriRewriter.php';
+        require_once 'Minify/CSS/UriRewriter.php';/*noLibHook*/
         if (isset($options['currentDir'])) {
             return Minify_CSS_UriRewriter::rewrite(
                 $css
diff --git a/upload/public/min/lib/Minify/CSS/index.html b/upload/public/min/lib/Minify/CSS/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/Minify/CSS/index.html
+++ b/upload/public/min/lib/Minify/CSS/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/Minify/Cache/File.php b/upload/public/min/lib/Minify/Cache/File.php
index 2753e6b8..eb479279 100644
--- a/upload/public/min/lib/Minify/Cache/File.php
+++ b/upload/public/min/lib/Minify/Cache/File.php
@@ -9,7 +9,7 @@ class Minify_Cache_File {
     public function __construct($path = '', $fileLocking = false)
     {
         if (! $path) {
-            require_once 'Solar/Dir.php';
+            require_once 'Solar/Dir.php';/*noLibHook*/
             $path = rtrim(Solar_Dir::tmp(), DIRECTORY_SEPARATOR);
         }
         $this->_locking = $fileLocking;
diff --git a/upload/public/min/lib/Minify/Cache/index.html b/upload/public/min/lib/Minify/Cache/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/Minify/Cache/index.html
+++ b/upload/public/min/lib/Minify/Cache/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/Minify/Controller/Base.php b/upload/public/min/lib/Minify/Controller/Base.php
index 84889b3f..a223c955 100644
--- a/upload/public/min/lib/Minify/Controller/Base.php
+++ b/upload/public/min/lib/Minify/Controller/Base.php
@@ -60,7 +60,7 @@ abstract class Minify_Controller_Base {
             ,'postprocessor' => null
             // file to require to load preprocessor
             ,'postprocessorRequire' => null
-        );
+        );/*noLibHook*/
     }  
 
     /**
@@ -100,7 +100,7 @@ abstract class Minify_Controller_Base {
             && is_string($minifierCallback[0])
             && !class_exists($minifierCallback[0], false)) {
             
-            require str_replace('_', '/', $minifierCallback[0]) . '.php';
+            require str_replace('_', '/', $minifierCallback[0]) . '.php';/*noLibHook*/
         }
     }
     
@@ -196,7 +196,7 @@ abstract class Minify_Controller_Base {
      * @return null
      */
     protected function log($msg) {
-        require_once 'Minify/Logger.php';
+        require_once 'Minify/Logger.php';/*noLibHook*/
         Minify_Logger::log($msg);
     }
 }
diff --git a/upload/public/min/lib/Minify/Controller/Files.php b/upload/public/min/lib/Minify/Controller/Files.php
index 83f028ad..7b557834 100644
--- a/upload/public/min/lib/Minify/Controller/Files.php
+++ b/upload/public/min/lib/Minify/Controller/Files.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Controller/Base.php';
+require_once 'Minify/Controller/Base.php';/*noLibHook*/
 
 /**
  * Controller class for minifying a set of files
diff --git a/upload/public/min/lib/Minify/Controller/Groups.php b/upload/public/min/lib/Minify/Controller/Groups.php
index 1ac57703..1eef0202 100644
--- a/upload/public/min/lib/Minify/Controller/Groups.php
+++ b/upload/public/min/lib/Minify/Controller/Groups.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Controller/Base.php';
+require_once 'Minify/Controller/Base.php';/*noLibHook*/
 
 /**
  * Controller class for serving predetermined groups of minimized sets, selected
diff --git a/upload/public/min/lib/Minify/Controller/MinApp.php b/upload/public/min/lib/Minify/Controller/MinApp.php
index 9582d292..6e55f875 100644
--- a/upload/public/min/lib/Minify/Controller/MinApp.php
+++ b/upload/public/min/lib/Minify/Controller/MinApp.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Controller/Base.php';
+require_once 'Minify/Controller/Base.php';/*noLibHook*/
 
 /**
  * Controller class for requests to /min/index.php
diff --git a/upload/public/min/lib/Minify/Controller/Page.php b/upload/public/min/lib/Minify/Controller/Page.php
index fa4599ab..684bc750 100644
--- a/upload/public/min/lib/Minify/Controller/Page.php
+++ b/upload/public/min/lib/Minify/Controller/Page.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Controller/Base.php';
+require_once 'Minify/Controller/Base.php';/*noLibHook*/
 
 /**
  * Controller class for serving a single HTML page
@@ -73,8 +73,8 @@ class Minify_Controller_Page extends Minify_Controller_Base {
         if ($this->_loadCssJsMinifiers) {
             // Minify will not call for these so we must manually load
             // them when Minify/HTML.php is called for.
-            require_once 'Minify/CSS.php';
-            require_once 'JSMin.php';
+            require_once 'Minify/CSS.php';/*noLibHook*/
+            require_once 'JSMin.php';/*noLibHook*/
         }
         parent::loadMinifier($minifierCallback); // load Minify/HTML.php
     }
diff --git a/upload/public/min/lib/Minify/Controller/Version1.php b/upload/public/min/lib/Minify/Controller/Version1.php
index 1861aabc..88cbbb9b 100644
--- a/upload/public/min/lib/Minify/Controller/Version1.php
+++ b/upload/public/min/lib/Minify/Controller/Version1.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Controller/Base.php';
+require_once 'Minify/Controller/Base.php';/*noLibHook*/
 
 /**
  * Controller class for emulating version 1 of minify.php
diff --git a/upload/public/min/lib/Minify/Controller/index.html b/upload/public/min/lib/Minify/Controller/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/Minify/Controller/index.html
+++ b/upload/public/min/lib/Minify/Controller/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/Minify/ImportProcessor.php b/upload/public/min/lib/Minify/ImportProcessor.php
index 0d6d90a8..ad5f2581 100644
--- a/upload/public/min/lib/Minify/ImportProcessor.php
+++ b/upload/public/min/lib/Minify/ImportProcessor.php
@@ -99,7 +99,7 @@ class Minify_ImportProcessor {
             // protocol, leave in place for CSS, comment for JS
             return self::$_isCss
                 ? $m[0]
-                : "/* Minify_ImportProcessor will not include remote content */";
+                : "/* Minify_ImportProcessor will not include remote content */";/*noLibHook*/
         }
         if ('/' === $url[0]) {
             // protocol-relative or root path
diff --git a/upload/public/min/lib/Minify/Javascript.php b/upload/public/min/lib/Minify/Javascript.php
index c372f9e4..77f51232 100644
--- a/upload/public/min/lib/Minify/Javascript.php
+++ b/upload/public/min/lib/Minify/Javascript.php
@@ -4,7 +4,7 @@
  * @package Minify
  */
 
-require 'JSMin.php';
+require 'JSMin.php';/*noLibHook*/
 
 /**
  * Compress Javascript using Ryan Grove's JSMin class
diff --git a/upload/public/min/lib/Minify/Lines.php b/upload/public/min/lib/Minify/Lines.php
index 186e7019..4715c779 100644
--- a/upload/public/min/lib/Minify/Lines.php
+++ b/upload/public/min/lib/Minify/Lines.php
@@ -59,7 +59,7 @@ class Minify_Lines {
         
         // check for desired URI rewriting
         if (isset($options['currentDir'])) {
-            require_once 'Minify/CSS/UriRewriter.php';
+            require_once 'Minify/CSS/UriRewriter.php';/*noLibHook*/
             Minify_CSS_UriRewriter::$debugText = '';
             $content = Minify_CSS_UriRewriter::rewrite(
                  $content
diff --git a/upload/public/min/lib/Minify/Packer.php b/upload/public/min/lib/Minify/Packer.php
index 949c3eef..5e03b5b0 100644
--- a/upload/public/min/lib/Minify/Packer.php
+++ b/upload/public/min/lib/Minify/Packer.php
@@ -19,7 +19,7 @@ if (false === (@include 'class.JavaScriptPacker.php')) {
         'The script "class.JavaScriptPacker.php" is required. Please see: http:'
         .'//code.google.com/p/minify/source/browse/trunk/min/lib/Minify/Packer.php'
         ,E_USER_ERROR
-    );
+    );/*noLibHook*/
 }
 
 /**
diff --git a/upload/public/min/lib/Minify/index.html b/upload/public/min/lib/Minify/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/Minify/index.html
+++ b/upload/public/min/lib/Minify/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/Solar/Dir.php b/upload/public/min/lib/Solar/Dir.php
index e73a8af6..1e80c0f7 100644
--- a/upload/public/min/lib/Solar/Dir.php
+++ b/upload/public/min/lib/Solar/Dir.php
@@ -11,7 +11,7 @@
  * 
  * @license http://opensource.org/licenses/bsd-license.php BSD
  * 
- * @version $Id: Dir.php 5711 2010-01-14 20:33:50Z bfarber $
+ * @version $Id: Dir.php 8229 2011-03-31 10:17:44Z ips_terabyte $
  * 
  */
 class Solar_Dir {
diff --git a/upload/public/min/lib/Solar/index.html b/upload/public/min/lib/Solar/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/Solar/index.html
+++ b/upload/public/min/lib/Solar/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/lib/index.html b/upload/public/min/lib/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/min/lib/index.html
+++ b/upload/public/min/lib/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/min/utils.php b/upload/public/min/utils.php
index c7359415..1556bcd2 100644
--- a/upload/public/min/utils.php
+++ b/upload/public/min/utils.php
@@ -7,7 +7,7 @@
  * @package Minify
  */
 
-require_once 'Minify/Build.php';
+require_once 'Minify/Build.php';/*noLibHook*/
 
 
 /**
@@ -81,7 +81,7 @@ function _Minify_getBuild($group)
     static $builds = array();
     static $gc = false;
     if (false === $gc) {
-        $gc = (require dirname(__FILE__) . '/groupsConfig.php');
+        $gc = (require dirname(__FILE__) . '/groupsConfig.php');/*noLibHook*/
     }
     if (! isset($builds[$group])) {
         $builds[$group] = new Minify_Build($gc[$group]);
diff --git a/upload/public/resources/acpperms.xml b/upload/public/resources/acpperms.xml
deleted file mode 100644
index 2ab5d222..00000000
--- a/upload/public/resources/acpperms.xml
+++ /dev/null
@@ -1,857 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<permsexport exported="1168640949" versionid="2.1.0" type="master">
-	<permsgroup>
-		<perm>
-			<acpperm_bit>recache</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>admin</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>adminlog</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>stats</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>search</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>attach</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>bw-add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>bw-remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>bw-edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>bw-export</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>bw-import</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>ban-view</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>ban-add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>ban-remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>babw</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>bbcode</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>bbcode</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>bbcode</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>bbcode</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>bbcode</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>calendars</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>calendars</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>calendars</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recache</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>calendars</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>components</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>components</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>components</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>components</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>do</acpperm_bit>
-			<acpperm_main>help</acpperm_main>
-			<acpperm_child>diag</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>emailerror</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>emaillog</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>upload</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>emoticons</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>permedit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>reorder</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recount</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>empty</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>rules</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>skin</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>forum</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>group</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>group</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>group</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>perms</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>group</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>help</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>help</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>help</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>lang</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>lang</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>lang</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>lang</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>lang</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>loginauth</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>loginauth</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>diagnostics</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>loginauth</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>loginauth</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>loginauth</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>suspend</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>title-view</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>title-edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>title-add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>title-remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>ban</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mem</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>view</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mtools</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>mod</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mtools</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>mod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>modlog</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>multimod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>multimod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>multimod</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>install</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>msubs</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>msubs</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>msubs</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>msubs</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>search</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>msubs</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>portal</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>postoffice</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>postoffice</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>send</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>postoffice</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>postoffice</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>field</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>field</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>field</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recount</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>rebuild</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>rebuild</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>rebuild</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssexport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssexport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recache</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssexport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssexport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssimport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssimport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recache</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssimport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>content</acpperm_main>
-			<acpperm_child>rssimport</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>search</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>op</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>recache</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skintools</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>changemember</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skintools</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>search</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skintools</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>style</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>rundiff</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skindiff</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skindiff</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>skindiff</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>export</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>import</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>import</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>import</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>image</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>image</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>image</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>sets</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>sets</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>sets</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>rebuild</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>sets</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>templ</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>templ</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>templ</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>lookandfeel</acpperm_main>
-			<acpperm_child>wrap</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>spiderlog</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>show</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>stats</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>view</acpperm_bit>
-			<acpperm_main>help</acpperm_main>
-			<acpperm_child>support</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>edit</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>task</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>add</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>task</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>task</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>runnow</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>task</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>log</acpperm_bit>
-			<acpperm_main>tools</acpperm_main>
-			<acpperm_child>task</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>view</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>warnlog</acpperm_child>
-		</perm>
-
-		<perm>
-			<acpperm_bit>remove</acpperm_bit>
-			<acpperm_main>admin</acpperm_main>
-			<acpperm_child>warnlog</acpperm_child>
-		</perm>
-	</permsgroup>
-
-</permsexport>
\ No newline at end of file
diff --git a/upload/public/resources/index.html b/upload/public/resources/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/resources/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/resources/skins/index.html b/upload/public/resources/skins/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/resources/skins/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/resources/skins/replacements_mobile.xml b/upload/public/resources/skins/replacements_mobile.xml
deleted file mode 100644
index 50dc09ce..00000000
--- a/upload/public/resources/skins/replacements_mobile.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<replacements>
-  <replacement>
-    <replacement_key>blog_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:macro__unread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:macro__read}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_private_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:macro__unread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_private_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:macro__read}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_cat_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_read.png' alt='{lang:macro__readcat}' title='{lang:macro__readcat}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_cat_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_unread.png' alt='{lang:macro__unreadcat}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_locked</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_locked.png' alt='{lang:macro__readonly}' title='{lang:macro__readonly}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_pass_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_read.png' alt='{lang:macro__readpw}' title='{lang:macro__readpw}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_pass_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_unread.png' alt='{lang:macro__unreadpw}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_read.png' alt='{lang:macro__readf}' title='{lang:macro__readf}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_redirect</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_redirect.png' alt='{lang:macro__redirect}' title='{lang:macro__redirect}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_unread.png' alt='{lang:macro__unreadf}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_modoptions</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/wrench.png' alt='{lang:icon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_report</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/report.png' alt='{lang:icon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_deleted</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cross.png' title='{lang:macro__deletedmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/pm_nonew.png' title='{lang:macro__nonewmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_icon_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/pm_new.png' title='{lang:macro__newmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>openid_small</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/openid.gif' alt='{lang:macro__openidicon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>snapback</replacement_key>
-    <replacement_content><![CDATA[&nbsp;]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_closed</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_closed.png' alt='{lang:pm_locked}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_read.png' alt='{lang:pm_hot_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_read_dot.png' alt='*{lang:pm_hot_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_unread.png' alt='{lang:pm_hot_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_unread_dot.png' alt='*{lang:pm_hot_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_moved</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_moved.png' alt='{lang:pm_moved}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_read.png' alt='{lang:pm_poll_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_read_dot.png' alt='*{lang:pm_poll_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_unread.png' alt='{lang:pm_poll}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_unread_dot.png' alt='*{lang:pm_poll}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:pm_open_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read_dot.png' alt='*{lang:pm_open_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:pm_open_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread_dot.png' alt='*{lang:pm_open_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>mobile</replacement_master_key>
-  </replacement>
-</replacements>
diff --git a/upload/public/resources/skins/replacements_root.xml b/upload/public/resources/skins/replacements_root.xml
deleted file mode 100644
index 01d2f9e4..00000000
--- a/upload/public/resources/skins/replacements_root.xml
+++ /dev/null
@@ -1,1125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<replacements>
-  <replacement>
-    <replacement_key>add_folder</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder_add.png' alt='{lang:add_folder}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>add_friend</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_add.png' alt='{lang:add_friend}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>add_participants</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_add.png' title='{lang:part_add}' alt='{lang:part_add}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>add_poll_choice</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/add.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>add_poll_question</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/add.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>approve</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/accept.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_add_entry</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/book_add.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_add_fav</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/heart_add.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_banish</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_delete.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_blocks</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_add.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_blog</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_category</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_comments</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/comments.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_comments_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/comments_new.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_del_fav</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/heart_delete.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_editor</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_editor.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_email</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/email.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_entries</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/entries.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_external</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_moved.png' alt='{lang:macro__moved}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_go</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/go.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_group</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_group.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_header</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/layout_header.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_link</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/book_open.png' alt='{lang:view_blog}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_list_locked</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_closed.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_locked</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/lock.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:macro__unread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:macro__read}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_option</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/option.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_owner</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_owner.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_print</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/print.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_privateclub</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/blog_privateclub.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_private_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:macro__unread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_private_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:macro__read}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_rss_import</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/rss-import.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_tag</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/tag.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_theme</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/palette.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_views</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/views.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>blog_watch_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/blog/transmit_delete.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>cal_ranged</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cal_ranged.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>cal_recurring</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cal_recurring.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>cal_single</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cal_single.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>close_poll_form</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cross.png' alt='x' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>compose_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/note_add.png' alt='{lang:macro__compose}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>delete_msg_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='{lang:pc_delete}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>delete_post_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comment_delete.png' alt='{lang:macro__delete}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>deny</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>display_name</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/display_name.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>downloads_no_photo</replacement_key>
-    <replacement_content>--</replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>dropdown</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/dropdown.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>edit_folder</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder_edit.png' alt='{lang:edit_folders}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>edit_post_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comment_edit.png' alt='{lang:macro__edit}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>email_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/email.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>find_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/magnifier.png' alt='{lang:macro__compose}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>find_posts_link</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/page_white_magnify.png' alt='{lang:find_posts}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>find_topics_link</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/page_topic_magnify.png' alt='{lang:find_topics}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_delete</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='{lang:delete_folder_title}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_drafts</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_empty</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bin.png' alt='{lang:empty_folder_title}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_finished</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_generic</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder.png' alt='{lang:macro__folder}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_myconvo</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/email_go.png' alt='{lang:macro__myconvo}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder_page.png' alt='{lang:macro__new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>folder_trash</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bin.png' alt='{lang:macro__trash}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_cat_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_read.png' alt='{lang:macro__readcat}' title='{lang:macro__readcat}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_cat_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_cat_unread.png' alt='{lang:macro__unreadcat}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_lastpost</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/last_post.png' alt='' title='{lang:view_last_post}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_locked</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_locked.png' alt='{lang:macro__readonly}' title='{lang:macro__readonly}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_nav_sep</replacement_key>
-    <replacement_content><![CDATA[&gt;]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_newpost</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/new_post.png' alt='' title='{lang:first_unread_post}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_pass_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_read.png' alt='{lang:macro__readpw}' title='{lang:macro__readpw}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_pass_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_pass_unread.png' alt='{lang:macro__unreadpw}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_read.png' alt='{lang:macro__readf}' title='{lang:macro__readf}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_redirect</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_redirect.png' alt='{lang:macro__redirect}' title='{lang:macro__redirect}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>f_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/f_unread.png' alt='{lang:macro__unreadf}' title='{lang:macro__markread}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>galery_album_edit</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/folder_edit.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_add_note</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/add_note.png' alt='{lang:add_note}' title='{lang:add_note}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_album</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/photo_add.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_album_delete</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_album_view</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/magnifier.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_bulk</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/arrow_divide.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_comment</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comment_add.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_c_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/c_read.png' alt='{lang:macro__nonew}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_c_off_cat</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/c_read.png' alt='{lang:macro__nonew}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_c_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/c_unread.png' alt='{lang:macro__new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_c_on_cat</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/c_unread.png' alt='{lang:macro__new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_ecard</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/ecard.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_favorite</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/heart.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_friend_only_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/friend_only_off.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_friend_only_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/friend_only_on.png' title='{lang:friend_album_on}' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_image</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/image_add.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_link</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/picture.png' alt='{lang:view_gallery}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_media</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/media_add.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_modoptions</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/wrench.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_no_photo</replacement_key>
-    <replacement_content>--</replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_pinned</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/pin.png' alt='{lang:img_pinned}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_private_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/public_album.png' alt='' title='{lang:album_public}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_private_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/private_album.png' alt='' title='{lang:album_private}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_report</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/report.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_rotate_left</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/rotate_left.png' alt='{lang:rotate_left}' title='{lang:rotate_left}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_rotate_right</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/rotate_right.png' alt='{lang:rotate_right}' title='{lang:rotate_right}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_save_img</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/save.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_slideshow</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/pictures.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_watch</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_blue.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>gallery_zoom</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/zoom.png' alt='{lang:view_full_size}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>generic_cog</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cog.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>goto_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/page_white_go.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>help_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/help.png' alt='{lang:macro__help}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>ignore_user</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comments_ignore.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lim_vkontakte</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/vkontakte.png' alt='{lang:lim_vkontakte}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lim_facebook</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/facebook.png' alt='{lang:lim_facebook}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lim_openid</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/openid.png' alt='{lang:lim_openid}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lim_twitter</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/twitter.png' alt='{lang:lim_twitter}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lim_windows</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/loginmethods/windows.png' alt='{lang:lim_windows}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>live_large</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/live.gif' alt='{lang:macro__liveicon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>live_small</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/live.gif' alt='{lang:macro__liveicon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>lock_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/lock.png' alt='{lang:pm_locked}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>logo_img</replacement_key>
-    <replacement_content>{style_image_url}/logo.png</replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>mini_rate_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star_off.png' alt='-' class='mini_rate' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>mini_rate_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star.png' alt='*' class='mini_rate' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>mq_post_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comment_add.png' alt='{lang:macro__reply}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_deleted</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/cross.png' title='{lang:macro__deletedmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/pm_nonew.png' title='{lang:macro__nonewmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_icon_new</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/pm_new.png' title='{lang:macro__newmsg}' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_notify_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bell_off.png' title='{lang:macro__notifyoff}' alt='{lang:macro__notifyoff}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>msg_notify_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bell.png' title='{lang:macro__notifyon}' alt='{lang:macro__notifyon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>openid_large</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/openid_logo.png' alt='{lang:macro__openidlogo}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>openid_small</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/openid.gif' alt='{lang:macro__openidicon}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>pip_pip</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_black.png' alt='{lang:macro__pip}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>popular_post</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/star_big.png' alt='*' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>post_attach_link</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/attachicon.gif'	alt='{lang:macro__attachment}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>print_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/printer.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>profile_album_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/profile_album_off.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>profile_album_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/gallery/profile_album_on.png' title='{lang:profile_album_on}' alt='{lang:profile_album_on}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>rate_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star_off.png' alt='-' class='rate_img' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>rate_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star.png' alt='*' class='rate_img' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>register_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/paste_plain.png' alt='{lang:macro__register}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>remove_friend</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_delete.png' alt='{lang:remove_friend}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>remove_poll_choice</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_delete.png' alt='{lang:remove_choice}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>remove_poll_question</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>reply_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/arrow_rotate_clockwise.png' alt='{lang:topic_add_reply}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>reply_msg_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/arrow_rotate_clockwise.png' alt='{lang:pc_reply}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>reply_post_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/comment_add.png' alt='{lang:macro__reply}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>report_green_alert</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/reports/post_alert_3.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>report_post_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/report.png' alt='{lang:macro__report}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>report_red_alert</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/reports/post_alert_1.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>rep_down</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/delete.png' alt='-' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>rep_up</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/add.png' alt='+' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>send_msg</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/email_open.png' alt='{lang:pm_this_member}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>show_poll_form</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/chart_curve_add.png' alt='{lang:macro__show}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>signin_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/key.png' alt='{lang:macro__signin}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>snapback</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/snapback.png' alt='{lang:macro__view_post}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>sort_down</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_arrow_down.png' alt='V' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>sort_up</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_arrow_up.png' alt='^' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>spammer_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/spammer_off.png' alt='{lang:spm_off}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>spammer_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/spammer_on.png' alt='{lang:spm_on}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>topic_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/page_white_add.png' alt='{lang:topic_start}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>topic_popup</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/topicpreview.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_announcement</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_announcement.png' alt='{lang:announce_row}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_attach</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/attachicon.gif'	alt='{lang:attach_page_title}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_closed</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_closed.png' alt='{lang:pm_locked}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_read.png' alt='{lang:pm_hot_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_read_dot.png' alt='*{lang:pm_hot_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_unread.png' alt='{lang:pm_hot_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_hot_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_hot_unread_dot.png' alt='*{lang:pm_hot_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_moved</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_moved.png' alt='{lang:pm_moved}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_read.png' alt='{lang:pm_poll_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_read_dot.png' alt='*{lang:pm_poll_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_unread.png' alt='{lang:pm_poll}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_poll_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_poll_unread_dot.png' alt='*{lang:pm_poll}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read.png' alt='{lang:pm_open_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_read_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_read_dot.png' alt='*{lang:pm_open_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_threaded_read</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/threaded_read.png' alt='{lang:pm_open_no}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_threaded_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/threaded_unread.png' alt='{lang:pm_open_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_unread</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread.png' alt='{lang:pm_open_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>t_unread_dot</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/t_unread_dot.png' alt='*{lang:pm_open_new}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_edit_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_edit.png' alt='{lang:macro__useredit}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_icon</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user.png' alt='{lang:macro__user}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_offline</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_off.png' alt='{lang:macro__useroffline}' title='{lang:macro__useroffline}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_online</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_green.png' alt='{lang:macro__useronline}' title='{lang:macro__useronline}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_popup</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_popup.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>user_status</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/user_comment.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>watch_forum_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_blue.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>watch_forum_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_blue.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>watch_small</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_small.png' alt='{lang:macro__tracking}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>watch_topic_off</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_blue.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>watch_topic_on</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/transmit_blue.png' alt='' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-  <replacement>
-    <replacement_key>your_vote</replacement_key>
-    <replacement_content><![CDATA[<img src='{style_image_url}/bullet_star_rated.png' alt='{lang:macro__voted}' />]]></replacement_content>
-    <replacement_set_id>0</replacement_set_id>
-    <replacement_master_key>root</replacement_master_key>
-  </replacement>
-</replacements>
diff --git a/upload/public/resources/skins/replacements_xmlskin.xml b/upload/public/resources/skins/replacements_xmlskin.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/upload/public/resources/skins/setsData.xml b/upload/public/resources/skins/setsData.xml
deleted file mode 100644
index 5d39451d..00000000
--- a/upload/public/resources/skins/setsData.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<skinsets>
-  <set>
-    <set_id>1</set_id>
-    <set_name>IP.Board</set_name>
-    <set_key>default</set_key>
-    <set_parent_id>0</set_parent_id>
-    <set_parent_array>a:0:{}</set_parent_array>
-    <set_child_array>a:0:{}</set_child_array>
-    <set_permissions>*</set_permissions>
-    <set_is_default>1</set_is_default>
-    <set_author_name>Invision Power Services, Inc</set_author_name>
-    <set_author_url>http://www.betscms.ws</set_author_url>
-    <set_image_dir>master</set_image_dir>
-    <set_emo_dir>default</set_emo_dir>
-    <set_css_inline>1</set_css_inline>
-    <set_css_groups><![CDATA[a:25:{s:6:"1.7277";a:2:{s:9:"css_group";s:15:"calendar_select";s:12:"css_position";s:1:"1";}s:6:"1.7291";a:2:{s:9:"css_group";s:6:"ipblog";s:12:"css_position";s:1:"1";}s:6:"2.7292";a:2:{s:9:"css_group";s:12:"ipblog.print";s:12:"css_position";s:1:"2";}s:6:"1.7278";a:2:{s:9:"css_group";s:12:"ipb_calendar";s:12:"css_position";s:1:"1";}s:6:"1.7279";a:2:{s:9:"css_group";s:10:"ipb_common";s:12:"css_position";s:1:"1";}s:6:"1.7280";a:2:{s:9:"css_group";s:10:"ipb_editor";s:12:"css_position";s:1:"1";}s:6:"0.7281";a:2:{s:9:"css_group";s:8:"ipb_help";s:12:"css_position";s:1:"0";}s:6:"0.7282";a:2:{s:9:"css_group";s:6:"ipb_ie";s:12:"css_position";s:1:"0";}s:6:"1.7283";a:2:{s:9:"css_group";s:18:"ipb_login_register";s:12:"css_position";s:1:"1";}s:6:"1.7284";a:2:{s:9:"css_group";s:13:"ipb_messenger";s:12:"css_position";s:1:"1";}s:6:"1.7285";a:2:{s:9:"css_group";s:9:"ipb_mlist";s:12:"css_position";s:1:"1";}s:6:"1.7286";a:2:{s:9:"css_group";s:9:"ipb_print";s:12:"css_position";s:1:"1";}s:6:"1.7287";a:2:{s:9:"css_group";s:11:"ipb_profile";s:12:"css_position";s:1:"1";}s:6:"2.7288";a:2:{s:9:"css_group";s:10:"ipb_search";s:12:"css_position";s:1:"2";}s:6:"1.7289";a:2:{s:9:"css_group";s:10:"ipb_styles";s:12:"css_position";s:1:"1";}s:6:"1.7290";a:2:{s:9:"css_group";s:7:"ipb_ucp";s:12:"css_position";s:1:"1";}s:6:"1.7293";a:2:{s:9:"css_group";s:6:"ipchat";s:12:"css_position";s:1:"1";}s:6:"1.7294";a:2:{s:9:"css_group";s:9:"ipcontent";s:12:"css_position";s:1:"1";}s:6:"2.7295";a:2:{s:9:"css_group";s:15:"ipcontent_print";s:12:"css_position";s:1:"2";}s:6:"1.7296";a:2:{s:9:"css_group";s:11:"ipdownloads";s:12:"css_position";s:1:"1";}s:6:"1.7297";a:2:{s:9:"css_group";s:9:"ipgallery";s:12:"css_position";s:1:"1";}s:6:"1.7298";a:2:{s:9:"css_group";s:16:"ipgallery_albums";s:12:"css_position";s:1:"1";}s:6:"1.7299";a:2:{s:9:"css_group";s:18:"ipgallery_lightbox";s:12:"css_position";s:1:"1";}s:6:"1.7300";a:2:{s:9:"css_group";s:19:"ipgallery_slideshow";s:12:"css_position";s:1:"1";}s:6:"1.7301";a:2:{s:9:"css_group";s:7:"ipnexus";s:12:"css_position";s:1:"1";}}]]></set_css_groups>
-    <set_added>1290080684</set_added>
-    <set_updated>1290080684</set_updated>
-    <set_output_format>html</set_output_format>
-    <set_locked_uagent/>
-    <set_hide_from_list>0</set_hide_from_list>
-    <set_master_key>root</set_master_key>
-  </set>
-  <set>
-    <set_id>3</set_id>
-    <set_name>IP.Board XML</set_name>
-    <set_key>xmlskin</set_key>
-    <set_parent_id>0</set_parent_id>
-    <set_parent_array>a:0:{}</set_parent_array>
-    <set_child_array>a:0:{}</set_child_array>
-    <set_permissions>*</set_permissions>
-    <set_is_default>1</set_is_default>
-    <set_author_name>Invision Power Services, Inc</set_author_name>
-    <set_author_url>http://www.betscms.ws</set_author_url>
-    <set_image_dir>master</set_image_dir>
-    <set_emo_dir>default</set_emo_dir>
-    <set_css_inline>1</set_css_inline>
-    <set_css_groups><![CDATA[a:11:{s:6:"1.7302";a:2:{s:9:"css_group";s:15:"calendar_select";s:12:"css_position";s:1:"1";}s:6:"1.7309";a:2:{s:9:"css_group";s:6:"ipblog";s:12:"css_position";s:1:"1";}s:6:"1.7303";a:2:{s:9:"css_group";s:10:"ipb_bbcode";s:12:"css_position";s:1:"1";}s:6:"1.7304";a:2:{s:9:"css_group";s:10:"ipb_editor";s:12:"css_position";s:1:"1";}s:6:"0.7305";a:2:{s:9:"css_group";s:6:"ipb_ie";s:12:"css_position";s:1:"0";}s:6:"1.7306";a:2:{s:9:"css_group";s:9:"ipb_print";s:12:"css_position";s:1:"1";}s:6:"0.7307";a:2:{s:9:"css_group";s:9:"ipb_reset";s:12:"css_position";s:1:"0";}s:6:"1.7308";a:2:{s:9:"css_group";s:10:"ipb_styles";s:12:"css_position";s:1:"1";}s:6:"1.7310";a:2:{s:9:"css_group";s:11:"ipdownloads";s:12:"css_position";s:1:"1";}s:6:"1.7311";a:2:{s:9:"css_group";s:9:"ipgallery";s:12:"css_position";s:1:"1";}s:6:"1.7312";a:2:{s:9:"css_group";s:8:"lightbox";s:12:"css_position";s:1:"1";}}]]></set_css_groups>
-    <set_added>1290080684</set_added>
-    <set_updated>1290080684</set_updated>
-    <set_output_format>xml</set_output_format>
-    <set_locked_uagent/>
-    <set_hide_from_list>0</set_hide_from_list>
-    <set_master_key>xmlskin</set_master_key>
-  </set>
-  <set>
-    <set_id>2</set_id>
-    <set_name>IP.Board Mobile</set_name>
-    <set_key>mobile</set_key>
-    <set_parent_id>0</set_parent_id>
-    <set_parent_array>a:0:{}</set_parent_array>
-    <set_child_array>a:0:{}</set_child_array>
-    <set_permissions>*</set_permissions>
-    <set_is_default>1</set_is_default>
-    <set_author_name>Invision Power Services, Inc</set_author_name>
-    <set_author_url>http://www.betscms.ws</set_author_url>
-    <set_image_dir>mobile</set_image_dir>
-    <set_emo_dir>default</set_emo_dir>
-    <set_css_inline>1</set_css_inline>
-    <set_css_groups><![CDATA[a:12:{s:6:"1.7313";a:2:{s:9:"css_group";s:15:"calendar_select";s:12:"css_position";s:1:"1";}s:6:"1.7321";a:2:{s:9:"css_group";s:6:"ipblog";s:12:"css_position";s:1:"1";}s:6:"1.7314";a:2:{s:9:"css_group";s:10:"ipb_bbcode";s:12:"css_position";s:1:"1";}s:6:"1.7315";a:2:{s:9:"css_group";s:10:"ipb_editor";s:12:"css_position";s:1:"1";}s:6:"0.7316";a:2:{s:9:"css_group";s:6:"ipb_ie";s:12:"css_position";s:1:"0";}s:6:"1.7317";a:2:{s:9:"css_group";s:9:"ipb_print";s:12:"css_position";s:1:"1";}s:6:"0.7318";a:2:{s:9:"css_group";s:9:"ipb_reset";s:12:"css_position";s:1:"0";}s:6:"0.7319";a:2:{s:9:"css_group";s:7:"ipb_rtl";s:12:"css_position";s:1:"0";}s:6:"1.7320";a:2:{s:9:"css_group";s:10:"ipb_styles";s:12:"css_position";s:1:"1";}s:6:"1.7322";a:2:{s:9:"css_group";s:11:"ipdownloads";s:12:"css_position";s:1:"1";}s:6:"1.7323";a:2:{s:9:"css_group";s:9:"ipgallery";s:12:"css_position";s:1:"1";}s:6:"1.7324";a:2:{s:9:"css_group";s:8:"lightbox";s:12:"css_position";s:1:"1";}}]]></set_css_groups>
-    <set_added>1290080684</set_added>
-    <set_updated>1290080684</set_updated>
-    <set_output_format>html</set_output_format>
-    <set_locked_uagent><![CDATA[a:2:{s:6:"groups";a:0:{}s:7:"uagents";a:10:{s:10:"blackberry";s:0:"";s:6:"iphone";s:0:"";s:9:"ipodtouch";s:0:"";s:12:"sonyericsson";s:0:"";s:5:"nokia";s:0:"";s:8:"motorola";s:0:"";s:7:"samsung";s:0:"";s:3:"htc";s:0:"";s:2:"lg";s:0:"";s:4:"palm";s:0:"";}}]]></set_locked_uagent>
-    <set_hide_from_list>0</set_hide_from_list>
-    <set_master_key>mobile</set_master_key>
-  </set>
-</skinsets>
diff --git a/upload/public/resources/version_history.php b/upload/public/resources/version_history.php
deleted file mode 100644
index e97e9329..00000000
--- a/upload/public/resources/version_history.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-$import_versions = array(
-						 '10001' => '1.1.0',
-						 '10002' => '1.2.0',
-						 '10003' => '1.3.0',
-						 '10004' => '1.3.1',
-						 '20001' => '2.0.0 PDR 1',
-						 '20002' => '2.0.0 PDR 2',
-						 '20003' => '2.0.0 PDR 3',
-						 '20004' => '2.0.0 PDR 4',
-						 '20005' => '2.0.0 PDR 5',
-						 '20006' => '2.0.0 PF 1',
-						 '20007' => '2.0.0 PF 2',
-						 '20008' => '2.0.0 PF 3',
-						 '20009' => '2.0.0 PF 4',
-						 '20010' => '2.0.0 FINAL',
-						 '20011' => '2.0.1 FINAL',
-						 '20012' => '2.0.2 FINAL',
-						 '20013' => '2.0.3 FINAL',
-						 '20014' => '2.0.4 FINAL',
-						 '21003' => '2.1.0 BETA 5',
-						 '21004' => '2.1.0 RC 1',
-						 '21005' => '2.1.0 RC 2',
-						 '21006' => '2.1.0 FINAL',
-						 '21007' => '2.1.1',
-						 '21008' => '2.1.2',
-						 '21009' => '2.1.3',
-						 '21010' => '2.1.4',
-						 '21011' => '2.1.5',
-						 '21012' => '2.1.6',
-						 '21013' => '2.1.7',
-						 '22005' => '2.2.0 Public Beta 2',
-						 '22006' => '2.2.0 RC 1',
-						 '22007' => '2.2.0 RC 2',
-						 '22008' => '2.2.0 RC 3',
-						 '22009' => '2.2.0',
-						 '22010' => '2.2.1',
-						 '22011' => '2.2.2',
-						 '23000' => '2.3.0 BETA 1',
-						 '23001' => '2.3.0 RC 1',
-						 '23002' => '2.3.0 RC 2',
-						 
-						 '23003' => '2.3.0',
-						 '23004' => '2.3.1',
-						 '23005' => '2.3.2',
-						 '23006' => '2.3.3',
-						 '23007' => '2.3.4',
-					   );
-					   
-
-?>
\ No newline at end of file
diff --git a/upload/public/sounds/Credits.txt b/upload/public/sounds/Credits.txt
deleted file mode 100644
index 4001a45d..00000000
--- a/upload/public/sounds/Credits.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Invision Power Services, Inc. is grateful to the following projects, whose work
-has been used in IP.Chat to add style, flair and functionality to our product.
-
-SoundManager 2		
-	Javascript/flash library for MP3 sounds
-	Scott Schiller (schillmania.com)
-	BSD License: http://www.schillmania.com/projects/soundmanager2/license.txt
-
-PacDV.com
-	MP3 sound effects
-	Hugh Burns (PacDV.com)
-	Proprietary: PacDV.com has graciously given us permission to use their sound effects in
-	IP.Chat, however the MP3 sound files are not available for public redistribution
\ No newline at end of file
diff --git a/upload/public/sounds/enter.mp3 b/upload/public/sounds/enter.mp3
deleted file mode 100644
index d3a4f76b..00000000
Binary files a/upload/public/sounds/enter.mp3 and /dev/null differ
diff --git a/upload/public/sounds/index.html b/upload/public/sounds/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/sounds/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/sounds/leave.mp3 b/upload/public/sounds/leave.mp3
deleted file mode 100644
index 49e22629..00000000
Binary files a/upload/public/sounds/leave.mp3 and /dev/null differ
diff --git a/upload/public/sounds/license.txt b/upload/public/sounds/license.txt
deleted file mode 100644
index 4aebf4cf..00000000
--- a/upload/public/sounds/license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2007, Scott Schiller (schillmania.com)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this 
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-* Neither the name of schillmania.com nor the names of its contributors may be
-  used to endorse or promote products derived from this software without
-  specific prior written permission from schillmania.com.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/upload/public/sounds/message.mp3 b/upload/public/sounds/message.mp3
deleted file mode 100644
index fda88158..00000000
Binary files a/upload/public/sounds/message.mp3 and /dev/null differ
diff --git a/upload/public/sounds/soundmanager2-nodebug-jsmin.js b/upload/public/sounds/soundmanager2-nodebug-jsmin.js
deleted file mode 100644
index aa907be4..00000000
--- a/upload/public/sounds/soundmanager2-nodebug-jsmin.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-   SoundManager 2: Javascript Sound for the Web
-   --------------------------------------------
-   http://schillmania.com/projects/soundmanager2/
-
-   Copyright (c) 2008, Scott Schiller. All rights reserved.
-   Code licensed under the BSD License:
-   http://schillmania.com/projects/soundmanager2/license.txt
-
-   V2.95a.20090717
-*/
-var soundManager=null;function SoundManager(b,a){this.flashVersion=8;this.debugMode=true;this.useConsole=true;this.consoleOnly=false;this.waitForWindowLoad=false;this.nullURL="null.mp3";this.allowPolling=true;this.useFastPolling=false;this.useMovieStar=false;this.bgColor="#ffffff";this.useHighPerformance=false;this.flashLoadTimeout=1000;this.wmode=null;this.allowFullScreen=true;this.defaultOptions={autoLoad:false,stream:true,autoPlay:false,onid3:null,onload:null,whileloading:null,onplay:null,onpause:null,onresume:null,whileplaying:null,onstop:null,onfinish:null,onbeforefinish:null,onbeforefinishtime:5000,onbeforefinishcomplete:null,onjustbeforefinish:null,onjustbeforefinishtime:200,multiShot:true,multiShotEvents:false,position:null,pan:0,volume:100};this.flash9Options={isMovieStar:null,usePeakData:false,useWaveformData:false,useEQData:false,onbufferchange:null,ondataerror:null};this.movieStarOptions={onmetadata:null,useVideo:false,bufferTime:null};var f=null;var e=this;this.version=null;this.versionNumber="V2.95a.20090717";this.movieURL=null;this.url=null;this.altURL=null;this.swfLoaded=false;this.enabled=false;this.o=null;this.id=(a||"sm2movie");this.oMC=null;this.sounds={};this.soundIDs=[];this.muted=false;this.isFullScreen=false;this.isIE=(navigator.userAgent.match(/MSIE/i));this.isSafari=(navigator.userAgent.match(/safari/i));this.debugID="soundmanager-debug";this.debugURLParam=/([#?&])debug=1/i;this.specialWmodeCase=false;this._onready=[];this._debugOpen=true;this._didAppend=false;this._appendSuccess=false;this._didInit=false;this._disabled=false;this._windowLoaded=false;this._hasConsole=(typeof console!="undefined"&&typeof console.log!="undefined");this._debugLevels=["log","info","warn","error"];this._defaultFlashVersion=8;this._oRemoved=null;this._oRemovedHTML=null;var g=function(h){return document.getElementById(h)};this.filePatterns={flash8:/\.mp3(\?.*)?$/i,flash9:/\.mp3(\?.*)?$/i};this.netStreamTypes=["aac","flv","mov","mp4","m4v","f4v","m4a","mp4v","3gp","3g2"];this.netStreamPattern=new RegExp("\\.("+this.netStreamTypes.join("|")+")(\\?.*)?$","i");this.filePattern=null;this.features={buffering:false,peakData:false,waveformData:false,eqData:false,movieStar:false};this.sandbox={type:null,types:{remote:"remote (domain-based) rules",localWithFile:"local with file access (no internet access)",localWithNetwork:"local with network (internet access only, no local access)",localTrusted:"local, trusted (local + internet access)"},description:null,noRemote:null,noLocal:null};this._setVersionInfo=function(){if(e.flashVersion!=8&&e.flashVersion!=9){alert('soundManager.flashVersion must be 8 or 9. "'+e.flashVersion+'" is invalid. Reverting to '+e._defaultFlashVersion+".");e.flashVersion=e._defaultFlashVersion}e.version=e.versionNumber+(e.flashVersion==9?" (AS3/Flash 9)":" (AS2/Flash 8)");if(e.flashVersion>8){e.defaultOptions=e._mergeObjects(e.defaultOptions,e.flash9Options);e.features.buffering=true}if(e.flashVersion>8&&e.useMovieStar){e.defaultOptions=e._mergeObjects(e.defaultOptions,e.movieStarOptions);e.filePatterns.flash9=new RegExp("\\.(mp3|"+e.netStreamTypes.join("|")+")(\\?.*)?$","i");e.features.movieStar=true}else{e.useMovieStar=false;e.features.movieStar=false}e.filePattern=e.filePatterns[(e.flashVersion!=8?"flash9":"flash8")];e.movieURL=(e.flashVersion==8?"soundmanager2.swf":"soundmanager2_flash9.swf");e.features.peakData=e.features.waveformData=e.features.eqData=(e.flashVersion>8)};this._overHTTP=(document.location?document.location.protocol.match(/http/i):null);this._waitingforEI=false;this._initPending=false;this._tryInitOnFocus=(this.isSafari&&typeof document.hasFocus=="undefined");this._isFocused=(typeof document.hasFocus!="undefined"?document.hasFocus():null);this._okToDisable=!this._tryInitOnFocus;this.useAltURL=!this._overHTTP;var d="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html";this.strings={notReady:"Not loaded yet - wait for soundManager.onload() before calling sound-related methods",appXHTML:"soundManager._createMovie(): appendChild/innerHTML set failed. May be app/xhtml+xml DOM-related.",localFail:'soundManager: Loading this page from local/network file system (not over HTTP?) Flash security likely restricting JS-Flash access. Consider adding current URL to "trusted locations" in the Flash player security settings manager at '+d+", or simply serve this content over HTTP.",waitFocus:"soundManager: Special case: Waiting for focus-related event..",waitImpatient:"soundManager: Getting impatient, still waiting for Flash.. ;)",waitForever:"soundManager: Waiting indefinitely for Flash...",needFunction:"soundManager.onready(): Function object expected"};this.supported=function(){return(e._didInit&&!e._disabled)};this.getMovie=function(h){return e.isIE?window[h]:(e.isSafari?g(h)||document[h]:g(h))};this.loadFromXML=function(h){try{e.o._loadFromXML(h)}catch(i){e._failSafely();return true}};this.createSound=function(i){var l="soundManager.createSound(): ";if(!e._didInit){throw e._complain(l+e.strings.notReady,arguments.callee.caller)}if(arguments.length==2){i={id:arguments[0],url:arguments[1]}}var j=e._mergeObjects(i);var h=j;if(h.id.toString().charAt(0).match(/^[0-9]$/)){var k=l+'Warning: Sound ID "'+h.id+'" should be a string, starting with a non-numeric character'}if(e._idCheck(h.id,true)){return e.sounds[h.id]}if(e.flashVersion>8&&e.useMovieStar){if(h.isMovieStar===null){h.isMovieStar=(h.url.match(e.netStreamPattern)?true:false)}if(h.isMovieStar&&(h.usePeakData||h.useWaveformData||h.useEQData)){h.usePeakData=false;h.useWaveformData=false;h.useEQData=false}}e.sounds[h.id]=new f(h);e.soundIDs[e.soundIDs.length]=h.id;if(e.flashVersion==8){e.o._createSound(h.id,h.onjustbeforefinishtime)}else{e.o._createSound(h.id,h.url,h.onjustbeforefinishtime,h.usePeakData,h.useWaveformData,h.useEQData,h.isMovieStar,(h.isMovieStar?h.useVideo:false),(h.isMovieStar?h.bufferTime:false))}if(h.autoLoad||h.autoPlay){if(e.sounds[h.id]){e.sounds[h.id].load(h)}}if(h.autoPlay){e.sounds[h.id].play()}return e.sounds[h.id]};this.createVideo=function(h){if(arguments.length==2){h={id:arguments[0],url:arguments[1]}}if(e.flashVersion>=9){h.isMovieStar=true;h.useVideo=true}else{return false}return e.createSound(h)};this.destroySound=function(j,h){if(!e._idCheck(j)){return false}for(var k=0;k<e.soundIDs.length;k++){if(e.soundIDs[k]==j){e.soundIDs.splice(k,1);continue}}e.sounds[j].unload();if(!h){e.sounds[j].destruct()}delete e.sounds[j]};this.destroyVideo=this.destroySound;this.load=function(h,i){if(!e._idCheck(h)){return false}e.sounds[h].load(i)};this.unload=function(h){if(!e._idCheck(h)){return false}e.sounds[h].unload()};this.play=function(h,i){if(!e._didInit){throw e._complain("soundManager.play(): "+e.strings.notReady,arguments.callee.caller)}if(!e._idCheck(h)){if(typeof i!="Object"){i={url:i}}if(i&&i.url){i.id=h;e.createSound(i)}else{return false}}e.sounds[h].play(i)};this.start=this.play;this.setPosition=function(h,i){if(!e._idCheck(h)){return false}e.sounds[h].setPosition(i)};this.stop=function(h){if(!e._idCheck(h)){return false}e.sounds[h].stop()};this.stopAll=function(){for(var h in e.sounds){if(e.sounds[h] instanceof f){e.sounds[h].stop()}}};this.pause=function(h){if(!e._idCheck(h)){return false}e.sounds[h].pause()};this.pauseAll=function(){for(var h=e.soundIDs.length;h--;){e.sounds[e.soundIDs[h]].pause()}};this.resume=function(h){if(!e._idCheck(h)){return false}e.sounds[h].resume()};this.resumeAll=function(){for(var h=e.soundIDs.length;h--;){e.sounds[e.soundIDs[h]].resume()}};this.togglePause=function(h){if(!e._idCheck(h)){return false}e.sounds[h].togglePause()};this.setPan=function(h,i){if(!e._idCheck(h)){return false}e.sounds[h].setPan(i)};this.setVolume=function(i,h){if(!e._idCheck(i)){return false}e.sounds[i].setVolume(h)};this.mute=function(h){if(typeof h!="string"){h=null}if(!h){for(var j=e.soundIDs.length;j--;){e.sounds[e.soundIDs[j]].mute()}e.muted=true}else{if(!e._idCheck(h)){return false}e.sounds[h].mute()}};this.muteAll=function(){e.mute()};this.unmute=function(h){if(typeof h!="string"){h=null}if(!h){for(var j=e.soundIDs.length;j--;){e.sounds[e.soundIDs[j]].unmute()}e.muted=false}else{if(!e._idCheck(h)){return false}e.sounds[h].unmute()}};this.unmuteAll=function(){e.unmute()};this.toggleMute=function(h){if(!e._idCheck(h)){return false}e.sounds[h].toggleMute()};this.getMemoryUse=function(){if(e.flashVersion==8){return 0}if(e.o){return parseInt(e.o._getMemoryUse(),10)}};this.disable=function(j){if(typeof j=="undefined"){j=false}if(e._disabled){return false}e._disabled=true;for(var h=e.soundIDs.length;h--;){e._disableObject(e.sounds[e.soundIDs[h]])}e.initComplete(j)};this.canPlayURL=function(h){return(h?(h.match(e.filePattern)?true:false):null)};this.getSoundById=function(i,j){if(!i){throw new Error("SoundManager.getSoundById(): sID is null/undefined")}var h=e.sounds[i];return h};this.onready=function(i,h){if(i&&i instanceof Function){if(!h){h=window}e._addOnReady(i,h);e._processOnReady();return true}else{throw e.strings.needFunction}};this.oninitmovie=function(){};this.onload=function(){soundManager._wD("soundManager.onload()",1)};this.onerror=function(){};this._idCheck=this.getSoundById;this._complain=function(i,k){var j="Error: ";if(!k){return new Error(j+i)}var m=new Error("");var n=null;if(m.stack){try{var o="@";var p=m.stack.split(o);n=p[4]}catch(l){n=m.stack}}if(typeof console!="undefined"&&typeof console.trace!="undefined"){console.trace()}var h=j+i+". \nCaller: "+k.toString()+(m.stack?" \nTop of stacktrace: "+n:(m.message?" \nMessage: "+m.message:""));return new Error(h)};var c=function(){return false};c._protected=true;this._disableObject=function(i){for(var h in i){if(typeof i[h]=="function"&&typeof i[h]._protected=="undefined"){i[h]=c}}h=null};this._failSafely=function(h){if(typeof h=="undefined"){h=false}if(!e._disabled||h){e.disable(h)}};this._normalizeMovieURL=function(h){var i=null;if(h){if(h.match(/\.swf(\?.*)?$/i)){i=h.substr(h.toLowerCase().lastIndexOf(".swf?")+4);if(i){return h}}else{if(h.lastIndexOf("/")!=h.length-1){h=h+"/"}}}return(h&&h.lastIndexOf("/")!=-1?h.substr(0,h.lastIndexOf("/")+1):"./")+e.movieURL};this._getDocument=function(){return(document.body?document.body:(document.documentElement?document.documentElement:document.getElementsByTagName("div")[0]))};this._getDocument._protected=true;this._setPolling=function(h,i){if(!e.o||!e.allowPolling){return false}e.o._setPolling(h,i)};this._createMovie=function(w,m){var r=null;var v=(m?m:e.url);var q=(e.altURL?e.altURL:v);if(e.debugURLParam.test(window.location.href.toString())){e.debugMode=true}if(e._didAppend&&e._appendSuccess){return false}e._didAppend=true;e._setVersionInfo();e.url=e._normalizeMovieURL(e._overHTTP?v:q);m=e.url;if(e.useHighPerformance&&e.useMovieStar&&e.defaultOptions.useVideo===true){r="soundManager note: disabling highPerformance, not applicable with movieStar mode + useVideo";e.useHighPerformance=false}e.wmode=(!e.wmode&&e.useHighPerformance&&!e.useMovieStar?"transparent":e.wmode);if(e.wmode!==null&&e.flashLoadTimeout!==0&&!e.useHighPerformance&&!e.isIE&&navigator.platform.match(/win32/i)){e.specialWmodeCase=true;e.wmode=null}if(e.flashVersion==8){e.allowFullScreen=false}var A={name:w,id:w,src:m,width:"100%",height:"100%",quality:"high",allowScriptAccess:"always",bgcolor:e.bgColor,pluginspage:"http://www.macromedia.com/go/getflashplayer",type:"application/x-shockwave-flash",wmode:e.wmode,allowfullscreen:(e.allowFullScreen?"true":"false")};if(!e.wmode){delete A.wmode}var n=null;var z=null;if(e.isIE){n=document.createElement("div");var t='<object id="'+w+'" data="'+m+'" type="application/x-shockwave-flash" width="100%" height="100%"><param name="movie" value="'+m+'" /><param name="AllowScriptAccess" value="always" /><param name="quality" value="high" />'+(e.wmode?'<param name="wmode" value="'+e.wmode+'" /> ':"")+'<param name="bgcolor" value="'+e.bgColor+'" /><param name="allowFullScreen" value="'+(e.allowFullScreen?"true":"false")+'" /><!-- --></object>'}else{n=document.createElement("embed");for(z in A){if(A.hasOwnProperty(z)){n.setAttribute(z,A[z])}}}var i=document.createElement("div");i.id=e.debugID+"-toggle";var j={position:"fixed",bottom:"0px",right:"0px",width:"1.2em",height:"1.2em",lineHeight:"1.2em",margin:"2px",textAlign:"center",border:"1px solid #999",cursor:"pointer",background:"#fff",color:"#333",zIndex:10001};i.appendChild(document.createTextNode("-"));i.onclick=e._toggleDebug;i.title="Toggle SM2 debug console";if(navigator.userAgent.match(/msie 6/i)){i.style.position="absolute";i.style.cursor="hand"}for(z in j){if(j.hasOwnProperty(z)){i.style[z]=j[z]}}var u=e._getDocument();if(u){e.oMC=g("sm2-container")?g("sm2-container"):document.createElement("div");if(!e.oMC.id){e.oMC.id="sm2-container";e.oMC.className="movieContainer";var o=null;var p=null;if(e.useHighPerformance){o={position:"fixed",width:"8px",height:"8px",bottom:"0px",left:"0px",overflow:"hidden"}}else{o={position:"absolute",width:"8px",height:"8px",top:"-9999px",left:"-9999px"}}var k=null;for(k in o){if(o.hasOwnProperty(k)){e.oMC.style[k]=o[k]}}try{if(!e.isIE){e.oMC.appendChild(n)}u.appendChild(e.oMC);if(e.isIE){p=e.oMC.appendChild(document.createElement("div"));p.className="sm2-object-box";p.innerHTML=t}e._appendSuccess=true}catch(y){throw new Error(e.strings.appXHTML)}}else{e.oMC.appendChild(n);if(e.isIE){p=e.oMC.appendChild(document.createElement("div"));p.className="sm2-object-box";p.innerHTML=t}e._appendSuccess=true}if(!g(e.debugID)&&((!e._hasConsole||!e.useConsole)||(e.useConsole&&e._hasConsole&&!e.consoleOnly))){var l=document.createElement("div");l.id=e.debugID;l.style.display=(e.debugMode?"block":"none");if(e.debugMode&&!g(i.id)){try{u.appendChild(i)}catch(h){throw new Error(e.strings.appXHTML)}u.appendChild(l)}}u=null}};this._writeDebug=function(i,p,k){if(!e.debugMode){return false}if(typeof k!="undefined"&&k){i=i+" | "+new Date().getTime()}if(e._hasConsole&&e.useConsole){var h=e._debugLevels[p];if(typeof console[h]!="undefined"){console[h](i)}else{console.log(i)}if(e.useConsoleOnly){return true}}var n="soundmanager-debug";try{var m=g(n);if(!m){return false}var l=document.createElement("div");if(++e._wdCount%2===0){l.className="sm2-alt"}if(typeof p=="undefined"){p=0}else{p=parseInt(p,10)}l.appendChild(document.createTextNode(i));if(p){if(p>=2){l.style.fontWeight="bold"}if(p==3){l.style.color="#ff3333"}}m.insertBefore(l,m.firstChild)}catch(j){}m=null};this._writeDebug._protected=true;this._wdCount=0;this._wdCount._protected=true;this._wD=this._writeDebug;this._wDAlert=function(h){alert(h)};if(window.location.href.indexOf("debug=alert")+1&&e.debugMode){e._wD=e._wDAlert}this._toggleDebug=function(){var i=g(e.debugID);var h=g(e.debugID+"-toggle");if(!i){return false}if(e._debugOpen){h.innerHTML="+";i.style.display="none"}else{h.innerHTML="-";i.style.display="block"}e._debugOpen=!e._debugOpen};this._toggleDebug._protected=true;this._debug=function(){for(var k=0,h=e.soundIDs.length;k<h;k++){e.sounds[e.soundIDs[k]]._debug()}};this._debugTS=function(k,h,i){if(typeof sm2Debugger!="undefined"){try{sm2Debugger.handleEvent(k,h,i)}catch(j){}}};this._debugTS._protected=true;this._mergeObjects=function(j,h){var m={};for(var k in j){if(j.hasOwnProperty(k)){m[k]=j[k]}}var l=(typeof h=="undefined"?e.defaultOptions:h);for(var n in l){if(l.hasOwnProperty(n)&&typeof m[n]=="undefined"){m[n]=l[n]}}return m};this.createMovie=function(h){if(h){e.url=h}e._initMovie()};this.go=this.createMovie;this._initMovie=function(){if(e.o){return false}e.o=e.getMovie(e.id);if(!e.o){if(!e.oRemoved){e._createMovie(e.id,e.url)}else{if(!e.isIE){e.oMC.appendChild(e.oRemoved)}else{e.oMC.innerHTML=e.oRemovedHTML}e.oRemoved=null;e._didAppend=true}e.o=e.getMovie(e.id)}if(typeof e.oninitmovie=="function"){setTimeout(e.oninitmovie,1)}};this.waitForExternalInterface=function(){if(e._waitingForEI){return false}e._waitingForEI=true;if(e._tryInitOnFocus&&!e._isFocused){return false}if(e.flashLoadTimeout>0){if(!e._didInit){}setTimeout(function(){if(!e._didInit&&e._okToDisable){e._failSafely(true)}},e.flashLoadTimeout)}};this.handleFocus=function(){if(e._isFocused||!e._tryInitOnFocus){return true}e._okToDisable=true;e._isFocused=true;if(e._tryInitOnFocus){window.removeEventListener("mousemove",e.handleFocus,false)}e._waitingForEI=false;setTimeout(e.waitForExternalInterface,500);if(window.removeEventListener){window.removeEventListener("focus",e.handleFocus,false)}else{if(window.detachEvent){window.detachEvent("onfocus",e.handleFocus)}}};this.initComplete=function(h){if(e._didInit){return false}e._didInit=true;if(e._disabled||h){e._processOnReady();e._debugTS("onload",false);e.onerror.apply(window);return false}else{e._debugTS("onload",true)}if(e.waitForWindowLoad&&!e._windowLoaded){if(window.addEventListener){window.addEventListener("load",e._initUserOnload,false)}else{if(window.attachEvent){window.attachEvent("onload",e._initUserOnload)}}return false}else{e._initUserOnload()}};this._addOnReady=function(i,h){e._onready.push({method:i,scope:(h||null),fired:false})};this._processOnReady=function(){if(!e._didInit){return false}var k={success:(!e._disabled)};var h=[];for(var m=0,l=e._onready.length;m<l;m++){if(e._onready[m].fired!==true){h.push(e._onready[m])}}if(h.length){for(m=0,l=h.length;m<l;m++){if(h[m].scope){h[m].method.apply(h[m].scope,[k])}else{h[m].method(k)}h[m].fired=true}}};this._initUserOnload=function(){window.setTimeout(function(){e._processOnReady();e.onload.apply(window)})};this.init=function(){e._initMovie();if(e._didInit){return false}if(window.removeEventListener){window.removeEventListener("load",e.beginDelayedInit,false)}else{if(window.detachEvent){window.detachEvent("onload",e.beginDelayedInit)}}try{e.o._externalInterfaceTest(false);e._setPolling(true,e.useFastPolling?true:false);if(!e.debugMode){e.o._disableDebug()}e.enabled=true;e._debugTS("jstoflash",true)}catch(h){e._debugTS("jstoflash",false);e._failSafely(true);e.initComplete();return false}e.initComplete()};this.beginDelayedInit=function(){e._windowLoaded=true;setTimeout(e.waitForExternalInterface,500);setTimeout(e.beginInit,20)};this.beginInit=function(){if(e._initPending){return false}e.createMovie();e._initMovie();e._initPending=true;return true};this.domContentLoaded=function(){if(document.removeEventListener){document.removeEventListener("DOMContentLoaded",e.domContentLoaded,false)}e.go()};this._externalInterfaceOK=function(){if(e.swfLoaded){return false}e._debugTS("swf",true);e._debugTS("flashtojs",true);e.swfLoaded=true;e._tryInitOnFocus=false;if(e.isIE){setTimeout(e.init,100)}else{e.init()}};this._setSandboxType=function(h){var i=e.sandbox;i.type=h;i.description=i.types[(typeof i.types[h]!="undefined"?h:"unknown")];if(i.type=="localWithFile"){i.noRemote=true;i.noLocal=false}else{if(i.type=="localWithNetwork"){i.noRemote=false;i.noLocal=true}else{if(i.type=="localTrusted"){i.noRemote=false;i.noLocal=false}}}};this.reboot=function(){for(var h=e.soundIDs.length;h--;){e.sounds[e.soundIDs[h]].destruct()}try{if(e.isIE){e.oRemovedHTML=e.o.innerHTML}e.oRemoved=e.o.parentNode.removeChild(e.o)}catch(j){}e.enabled=false;e._didInit=false;e._waitingForEI=false;e._initPending=false;e._didAppend=false;e._appendSuccess=false;e._disabled=false;e._waitingforEI=true;e.swfLoaded=false;e.soundIDs={};e.sounds=[];e.o=null;for(h=e._onready.length;h--;){e._onready[h].fired=false}window.setTimeout(soundManager.beginDelayedInit,20)};this.destruct=function(){e.disable(true)};f=function(h){var i=this;this.sID=h.id;this.url=h.url;this.options=e._mergeObjects(h);this.instanceOptions=this.options;this._iO=this.instanceOptions;this.pan=this.options.pan;this.volume=this.options.volume;this._lastURL=null;this._debug=function(){if(e.debugMode){var l=null;var n=[];var k=null;var m=null;var j=64;for(l in i.options){if(i.options[l]!==null){if(i.options[l] instanceof Function){k=i.options[l].toString();k=k.replace(/\s\s+/g," ");m=k.indexOf("{");n[n.length]=" "+l+": {"+k.substr(m+1,(Math.min(Math.max(k.indexOf("\n")-1,j),j))).replace(/\n/g,"")+"... }"}else{n[n.length]=" "+l+": "+i.options[l]}}}}};this._debug();this.id3={};this.resetProperties=function(j){i.bytesLoaded=null;i.bytesTotal=null;i.position=null;i.duration=null;i.durationEstimate=null;i.loaded=false;i.playState=0;i.paused=false;i.readyState=0;i.muted=false;i.didBeforeFinish=false;i.didJustBeforeFinish=false;i.isBuffering=false;i.instanceOptions={};i.instanceCount=0;i.peakData={left:0,right:0};i.waveformData={left:[],right:[]};i.eqData=[]};i.resetProperties();this.load=function(j){if(typeof j!="undefined"){i._iO=e._mergeObjects(j);i.instanceOptions=i._iO}else{j=i.options;i._iO=j;i.instanceOptions=i._iO;if(i._lastURL&&i._lastURL!=i.url){i._iO.url=i.url;i.url=null}}if(typeof i._iO.url=="undefined"){i._iO.url=i.url}if(i._iO.url==i.url&&i.readyState!==0&&i.readyState!=2){return false}i.url=i._iO.url;i._lastURL=i._iO.url;i.loaded=false;i.readyState=1;i.playState=0;try{if(e.flashVersion==8){e.o._load(i.sID,i._iO.url,i._iO.stream,i._iO.autoPlay,(i._iO.whileloading?1:0))}else{e.o._load(i.sID,i._iO.url,i._iO.stream?true:false,i._iO.autoPlay?true:false);if(i._iO.isMovieStar&&i._iO.autoLoad&&!i._iO.autoPlay){i.pause()}}}catch(k){e._debugTS("onload",false);e.onerror();e.disable()}};this.unload=function(){if(i.readyState!==0){if(i.readyState!=2){i.setPosition(0,true)}e.o._unload(i.sID,e.nullURL);i.resetProperties()}};this.destruct=function(){e.o._destroySound(i.sID);e.destroySound(i.sID,true)};this.play=function(k){if(!k){k={}}i._iO=e._mergeObjects(k,i._iO);i._iO=e._mergeObjects(i._iO,i.options);i.instanceOptions=i._iO;if(i.playState==1){var j=i._iO.multiShot;if(!j){return false}}if(!i.loaded){if(i.readyState===0){i._iO.stream=true;i._iO.autoPlay=true;i.load(i._iO)}else{if(i.readyState==2){return false}}}if(i.paused){i.resume()}else{i.playState=1;if(!i.instanceCount||e.flashVersion>8){i.instanceCount++}i.position=(typeof i._iO.position!="undefined"&&!isNaN(i._iO.position)?i._iO.position:0);if(i._iO.onplay){i._iO.onplay.apply(i)}i.setVolume(i._iO.volume,true);i.setPan(i._iO.pan,true);e.o._start(i.sID,i._iO.loop||1,(e.flashVersion==9?i.position:i.position/1000))}};this.start=this.play;this.stop=function(j){if(i.playState==1){i.playState=0;i.paused=false;if(i._iO.onstop){i._iO.onstop.apply(i)}e.o._stop(i.sID,j);i.instanceCount=0;i._iO={}}};this.setPosition=function(k,j){if(typeof k=="undefined"){k=0}var l=Math.min(i.duration,Math.max(k,0));i._iO.position=l;e.o._setPosition(i.sID,(e.flashVersion==9?i._iO.position:i._iO.position/1000),(i.paused||!i.playState))};this.pause=function(){if(i.paused||i.playState===0){return false}i.paused=true;e.o._pause(i.sID);if(i._iO.onpause){i._iO.onpause.apply(i)}};this.resume=function(){if(!i.paused||i.playState===0){return false}i.paused=false;e.o._pause(i.sID);if(i._iO.onresume){i._iO.onresume.apply(i)}};this.togglePause=function(){if(i.playState===0){i.play({position:(e.flashVersion==9?i.position:i.position/1000)});return false}if(i.paused){i.resume()}else{i.pause()}};this.setPan=function(k,j){if(typeof k=="undefined"){k=0}if(typeof j=="undefined"){j=false}e.o._setPan(i.sID,k);i._iO.pan=k;if(!j){i.pan=k}};this.setVolume=function(j,k){if(typeof j=="undefined"){j=100}if(typeof k=="undefined"){k=false}e.o._setVolume(i.sID,(e.muted&&!i.muted)||i.muted?0:j);i._iO.volume=j;if(!k){i.volume=j}};this.mute=function(){i.muted=true;e.o._setVolume(i.sID,0)};this.unmute=function(){i.muted=false;var j=typeof i._iO.volume!="undefined";e.o._setVolume(i.sID,j?i._iO.volume:i.options.volume)};this.toggleMute=function(){if(i.muted){i.unmute()}else{i.mute()}};this._whileloading=function(j,k,l){if(!i._iO.isMovieStar){i.bytesLoaded=j;i.bytesTotal=k;i.duration=Math.floor(l);i.durationEstimate=parseInt((i.bytesTotal/i.bytesLoaded)*i.duration,10);if(i.durationEstimate===undefined){i.durationEstimate=i.duration}if(i.readyState!=3&&i._iO.whileloading){i._iO.whileloading.apply(i)}}else{i.bytesLoaded=j;i.bytesTotal=k;i.duration=Math.floor(l);i.durationEstimate=i.duration;if(i.readyState!=3&&i._iO.whileloading){i._iO.whileloading.apply(i)}}};this._onid3=function(n,k){var o=[];for(var m=0,l=n.length;m<l;m++){o[n[m]]=k[m]}i.id3=e._mergeObjects(i.id3,o);if(i._iO.onid3){i._iO.onid3.apply(i)}};this._whileplaying=function(k,l,n,j,m){if(isNaN(k)||k===null){return false}if(i.playState===0&&k>0){k=0}i.position=k;if(i._iO.usePeakData&&typeof l!="undefined"&&l){i.peakData={left:l.leftPeak,right:l.rightPeak}}if(i._iO.useWaveformData&&typeof n!="undefined"&&n){i.waveformData={left:n.split(","),right:j.split(",")}}if(i._iO.useEQData&&typeof m!="undefined"&&m){i.eqData=m}if(i.playState==1){if(i.isBuffering){i._onbufferchange(0)}if(i._iO.whileplaying){i._iO.whileplaying.apply(i)}if(i.loaded&&i._iO.onbeforefinish&&i._iO.onbeforefinishtime&&!i.didBeforeFinish&&i.duration-i.position<=i._iO.onbeforefinishtime){i._onbeforefinish()}}};this._onload=function(j){j=(j==1?true:false);i.loaded=j;i.readyState=j?3:2;if(i._iO.onload){i._iO.onload.apply(i)}};this._onbeforefinish=function(){if(!i.didBeforeFinish){i.didBeforeFinish=true;if(i._iO.onbeforefinish){i._iO.onbeforefinish.apply(i)}}};this._onjustbeforefinish=function(j){if(!i.didJustBeforeFinish){i.didJustBeforeFinish=true;if(i._iO.onjustbeforefinish){i._iO.onjustbeforefinish.apply(i)}}};this._onfinish=function(){if(i._iO.onbeforefinishcomplete){i._iO.onbeforefinishcomplete.apply(i)}i.didBeforeFinish=false;i.didJustBeforeFinish=false;if(i.instanceCount){i.instanceCount--;if(!i.instanceCount){i.playState=0;i.paused=false;i.instanceCount=0;i.instanceOptions={}}if(!i.instanceCount||i._iO.multiShotEvents){if(i._iO.onfinish){i._iO.onfinish.apply(i)}}}else{if(i.useVideo){}}};this._onmetadata=function(j){if(!j.width&&!j.height){j.width=320;j.height=240}i.metadata=j;i.width=j.width;i.height=j.height;if(i._iO.onmetadata){i._iO.onmetadata.apply(i)}};this._onbufferchange=function(j){if(i.playState===0){return false}if(j==i.isBuffering){return false}i.isBuffering=(j==1?true:false);if(i._iO.onbufferchange){i._iO.onbufferchange.apply(i)}};this._ondataerror=function(j){if(i.playState>0){if(i._iO.ondataerror){i._iO.ondataerror.apply(i)}}}};this._onfullscreenchange=function(h){e.isFullScreen=(h==1?true:false);if(!e.isFullScreen){try{window.focus()}catch(i){}}};if(window.addEventListener){window.addEventListener("focus",e.handleFocus,false);window.addEventListener("load",e.beginDelayedInit,false);window.addEventListener("unload",e.destruct,false);if(e._tryInitOnFocus){window.addEventListener("mousemove",e.handleFocus,false)}}else{if(window.attachEvent){window.attachEvent("onfocus",e.handleFocus);window.attachEvent("onload",e.beginDelayedInit);window.attachEvent("unload",e.destruct)}else{e._debugTS("onload",false);soundManager.onerror();soundManager.disable()}}if(document.addEventListener){document.addEventListener("DOMContentLoaded",e.domContentLoaded,false)}}if(typeof SM2_DEFER=="undefined"||!SM2_DEFER){soundManager=new SoundManager()};
\ No newline at end of file
diff --git a/upload/public/sounds/soundmanager2.swf b/upload/public/sounds/soundmanager2.swf
deleted file mode 100644
index 8a9711c6..00000000
Binary files a/upload/public/sounds/soundmanager2.swf and /dev/null differ
diff --git a/upload/public/sounds/soundmanager2_flash9.swf b/upload/public/sounds/soundmanager2_flash9.swf
deleted file mode 100644
index 7ede2be8..00000000
Binary files a/upload/public/sounds/soundmanager2_flash9.swf and /dev/null differ
diff --git a/upload/public/style_avatars/Abu.gif b/upload/public/style_avatars/Abu.gif
deleted file mode 100644
index 56d463d8..00000000
Binary files a/upload/public/style_avatars/Abu.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Aladdin.gif b/upload/public/style_avatars/Aladdin.gif
deleted file mode 100644
index f62dfcc8..00000000
Binary files a/upload/public/style_avatars/Aladdin.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Alfred.gif b/upload/public/style_avatars/Alfred.gif
deleted file mode 100644
index e56930e1..00000000
Binary files a/upload/public/style_avatars/Alfred.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Ares.gif b/upload/public/style_avatars/Ares.gif
deleted file mode 100644
index f27884b2..00000000
Binary files a/upload/public/style_avatars/Ares.gif and /dev/null differ
diff --git a/upload/public/style_avatars/ArmondoGuitierrez.gif b/upload/public/style_avatars/ArmondoGuitierrez.gif
deleted file mode 100644
index e9e70df4..00000000
Binary files a/upload/public/style_avatars/ArmondoGuitierrez.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Arthur.gif b/upload/public/style_avatars/Arthur.gif
deleted file mode 100644
index 43f97129..00000000
Binary files a/upload/public/style_avatars/Arthur.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Atta.gif b/upload/public/style_avatars/Atta.gif
deleted file mode 100644
index 5f08518e..00000000
Binary files a/upload/public/style_avatars/Atta.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Batman.gif b/upload/public/style_avatars/Batman.gif
deleted file mode 100644
index 650d5eaf..00000000
Binary files a/upload/public/style_avatars/Batman.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Batman2.gif b/upload/public/style_avatars/Batman2.gif
deleted file mode 100644
index 2f300d5e..00000000
Binary files a/upload/public/style_avatars/Batman2.gif and /dev/null differ
diff --git a/upload/public/style_avatars/BlackWidow.gif b/upload/public/style_avatars/BlackWidow.gif
deleted file mode 100644
index f5019323..00000000
Binary files a/upload/public/style_avatars/BlackWidow.gif and /dev/null differ
diff --git a/upload/public/style_avatars/BruceWayne.gif b/upload/public/style_avatars/BruceWayne.gif
deleted file mode 100644
index 2de1be11..00000000
Binary files a/upload/public/style_avatars/BruceWayne.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Catwoman2.gif b/upload/public/style_avatars/Catwoman2.gif
deleted file mode 100644
index c4f65721..00000000
Binary files a/upload/public/style_avatars/Catwoman2.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Flik.gif b/upload/public/style_avatars/Flik.gif
deleted file mode 100644
index f88dd933..00000000
Binary files a/upload/public/style_avatars/Flik.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Aeroplane.gif b/upload/public/style_avatars/IPB_Community_Pack/Aeroplane.gif
deleted file mode 100644
index 004298c1..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Aeroplane.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Crazyman.jpg b/upload/public/style_avatars/IPB_Community_Pack/Crazyman.jpg
deleted file mode 100644
index 660f6b0d..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Crazyman.jpg and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Dolphin.jpg b/upload/public/style_avatars/IPB_Community_Pack/Dolphin.jpg
deleted file mode 100644
index bedbca2d..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Dolphin.jpg and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Fish.gif b/upload/public/style_avatars/IPB_Community_Pack/Fish.gif
deleted file mode 100644
index 566f66c6..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Fish.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Golfball.gif b/upload/public/style_avatars/IPB_Community_Pack/Golfball.gif
deleted file mode 100644
index ce3d6efb..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Golfball.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Green-haze.gif b/upload/public/style_avatars/IPB_Community_Pack/Green-haze.gif
deleted file mode 100644
index 56ce8a9e..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Green-haze.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Hammer-man.jpg b/upload/public/style_avatars/IPB_Community_Pack/Hammer-man.jpg
deleted file mode 100644
index 61aa802f..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Hammer-man.jpg and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/IBFstars.jpg b/upload/public/style_avatars/IPB_Community_Pack/IBFstars.jpg
deleted file mode 100644
index 6942e28b..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/IBFstars.jpg and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Leaf.gif b/upload/public/style_avatars/IPB_Community_Pack/Leaf.gif
deleted file mode 100644
index d309b489..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Leaf.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Melon.gif b/upload/public/style_avatars/IPB_Community_Pack/Melon.gif
deleted file mode 100644
index af287c5d..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Melon.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Meow.gif b/upload/public/style_avatars/IPB_Community_Pack/Meow.gif
deleted file mode 100644
index e81e027a..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Meow.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Orange-sticks.gif b/upload/public/style_avatars/IPB_Community_Pack/Orange-sticks.gif
deleted file mode 100644
index 1dedbb64..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Orange-sticks.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Pink-sea.gif b/upload/public/style_avatars/IPB_Community_Pack/Pink-sea.gif
deleted file mode 100644
index 5e7dff6e..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Pink-sea.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Pow.gif b/upload/public/style_avatars/IPB_Community_Pack/Pow.gif
deleted file mode 100644
index 62a5e787..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Pow.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Radioactive.gif b/upload/public/style_avatars/IPB_Community_Pack/Radioactive.gif
deleted file mode 100644
index 0255565e..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Radioactive.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Whale.jpg b/upload/public/style_avatars/IPB_Community_Pack/Whale.jpg
deleted file mode 100644
index bf3883d8..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Whale.jpg and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Woof.gif b/upload/public/style_avatars/IPB_Community_Pack/Woof.gif
deleted file mode 100644
index 545f9f67..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Woof.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/Wub.gif b/upload/public/style_avatars/IPB_Community_Pack/Wub.gif
deleted file mode 100644
index 5365326f..00000000
Binary files a/upload/public/style_avatars/IPB_Community_Pack/Wub.gif and /dev/null differ
diff --git a/upload/public/style_avatars/IPB_Community_Pack/avatar-readme.txt b/upload/public/style_avatars/IPB_Community_Pack/avatar-readme.txt
deleted file mode 100644
index 8ed64db0..00000000
--- a/upload/public/style_avatars/IPB_Community_Pack/avatar-readme.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Readme for Avatars Distributed with Invisionboard
--------------------------------------------------
-
-The avatars distributed with Invisionboard were created by members of the Invisionboard
-community. As such, the creator of each avatar is responsible for the copyright of each image.
-Invisionboard does not claim to own any of the images, and any questions regarding individual
-avatars should be directed to the original creator.
-
-
-Author of each Avatar
-----------------------
-
-IBFstars.jpg             - chrishanke
-Whale.jpg               - Jay144
-Hammer-man.jpg      - Jay144
-Dolphin.jpg              - Jay144
-Crazyman.jpg          - Jay144
-Meow.gif                - SoftwareX
-Woof.gif                 - SoftwareX
-Melon.gif                - Adam
-Leaf.gif                  - Adam
-Golfball.gif              - Adam
-Fish.gif                  - Adam
-Aeroplane.gif           - Adam
-No-Avatar.gif          - //n2
-Pow.gif                  - //n2
-Radioactive             - //n2
-Wub.gif                  - //n2
-Pink-sea.gif            - Xerro
-Orange-sticks.gif     - Xerro
-Green-haze.gif        - Xerro
\ No newline at end of file
diff --git a/upload/public/style_avatars/IPB_Community_Pack/index.html b/upload/public/style_avatars/IPB_Community_Pack/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/style_avatars/IPB_Community_Pack/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/style_avatars/Smiley_Avatars/index.html b/upload/public/style_avatars/Smiley_Avatars/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/style_avatars/Smiley_Avatars/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-aloof.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-aloof.gif
deleted file mode 100644
index 2bbfd94d..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-aloof.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-biggrin.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-biggrin.gif
deleted file mode 100644
index 561fef68..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-biggrin.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-blunder.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-blunder.gif
deleted file mode 100644
index d7d5e145..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-blunder.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-evil.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-evil.gif
deleted file mode 100644
index 10ac922c..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-evil.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-grimmace.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-grimmace.gif
deleted file mode 100644
index c14b8924..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-grimmace.gif and /dev/null differ
diff --git a/upload/public/style_avatars/Smiley_Avatars/smiley-punched.gif b/upload/public/style_avatars/Smiley_Avatars/smiley-punched.gif
deleted file mode 100644
index a46c23cf..00000000
Binary files a/upload/public/style_avatars/Smiley_Avatars/smiley-punched.gif and /dev/null differ
diff --git a/upload/public/style_avatars/abra1.gif b/upload/public/style_avatars/abra1.gif
deleted file mode 100644
index afd1c9b6..00000000
Binary files a/upload/public/style_avatars/abra1.gif and /dev/null differ
diff --git a/upload/public/style_avatars/arbok.gif b/upload/public/style_avatars/arbok.gif
deleted file mode 100644
index 4f4a7c81..00000000
Binary files a/upload/public/style_avatars/arbok.gif and /dev/null differ
diff --git a/upload/public/style_avatars/artistbirdie.gif b/upload/public/style_avatars/artistbirdie.gif
deleted file mode 100644
index fefbfdc4..00000000
Binary files a/upload/public/style_avatars/artistbirdie.gif and /dev/null differ
diff --git a/upload/public/style_avatars/avengers.gif b/upload/public/style_avatars/avengers.gif
deleted file mode 100644
index 38492c05..00000000
Binary files a/upload/public/style_avatars/avengers.gif and /dev/null differ
diff --git a/upload/public/style_avatars/index.html b/upload/public/style_avatars/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/style_avatars/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/style_captcha/captcha_backgrounds/index.html b/upload/public/style_captcha/captcha_backgrounds/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_captcha/captcha_backgrounds/index.html
+++ b/upload/public/style_captcha/captcha_backgrounds/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_captcha/captcha_fonts/DejaVuSans.ttf b/upload/public/style_captcha/captcha_fonts/DejaVuSans.ttf
new file mode 100644
index 00000000..27cff476
Binary files /dev/null and b/upload/public/style_captcha/captcha_fonts/DejaVuSans.ttf differ
diff --git a/upload/public/style_captcha/captcha_fonts/DejaVuSans_license.txt b/upload/public/style_captcha/captcha_fonts/DejaVuSans_license.txt
new file mode 100644
index 00000000..886120ad
--- /dev/null
+++ b/upload/public/style_captcha/captcha_fonts/DejaVuSans_license.txt
@@ -0,0 +1,24 @@
+Bitstream Vera Fonts Copyright 
+-------------------------------
+
+http://dejavu-fonts.org/wiki/License
+
+DejaVu changes are in public domain.
+
+
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. 
\ No newline at end of file
diff --git a/upload/public/style_captcha/captcha_fonts/index.html b/upload/public/style_captcha/captcha_fonts/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_captcha/captcha_fonts/index.html
+++ b/upload/public/style_captcha/captcha_fonts/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_captcha/index.html b/upload/public/style_captcha/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_captcha/index.html
+++ b/upload/public/style_captcha/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_css/index.html b/upload/public/style_css/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_css/index.html
+++ b/upload/public/style_css/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_css/ipb_rtl.css b/upload/public/style_css/ipb_rtl.css
index 030d5529..cd541e5a 100644
--- a/upload/public/style_css/ipb_rtl.css
+++ b/upload/public/style_css/ipb_rtl.css
@@ -1,1221 +1,2105 @@
-
-
-/************************************************************************/
-/* IP.Board 3 CSS RTL - By Vadim Vincent Gabriel                        */
-/************************************************************************/
-/* ipb_rtl.css                                                          */
-/************************************************************************/
-
-body { text-align:right; direction: rtl; }
-
-/* Common */
-
-h2 {text-align:right;}
-
-h1, #content_jump {display: none; text-indent: 0px;}
-
-a.toggle {text-decoration: none; text-indent: -5000px;}
-
-#copyright {float:left;}
-
-/* Navigation */
-#primary_nav {
-padding-right: 10px;
-}
-
-
-#primary_nav ul li {
-padding: 8px 8px;
-margin-right: 6px;
-}
-#primary_nav ul li.active a {
-padding: 10px 15px 10px 10px;
-margin-right: 6px;      
-}
-
-#user_navigation .photo {
-margin: 6px 10px 6px 6px;
-float: left;
-}
-
-#user_info {
-margin-left: 60px;
-margin-right: 15px;
-}
-
-#user_navigation #new_msg_count {
-left: 45px;
-right: auto;
-}
-
-#user_navigation ul#user_other {        
-margin-left: 5px;
-}
-
-#user_navigation ul#user_other li {
-float: left;
-padding: 0 4px;
-}
-
-#user_navigation ul#user_link_menucontent {
-float: left;
-}
-
-#user_navigation #user_link { 
-	text-align: right; 
-	padding: 3px 8px 3px 26px;
-	margin: 6px 8px 0px 5px;
-}
-
-#user_navigation #user_notifications_link { 
-	text-align: right; 
-	padding: 3px 5px 3px 17px;
-}
-
-/** Logo & User Navigation Align **/
-#user_navigation { left: 10px;right: auto;float: left; }
-
-#user_navigation #user_link img, #user_navigation #user_notifications_link img#notify-down-arrow {left: 5px; right: auto;}
-
-/*** COMMENT THE FOLLOWING TO ALIGN THE LOGO TO THE RIGHT SIDE AND THE MENU TO THE LEFT  ***/
-#branding { text-align: left; direction: ltr; }
-#user_navigation.not_logged_in {text-align: right; float: right;}
-#user_navigation { left: auto;right: 10px;float: right; }
-/*** COMMENT THE FOLLOWING TO ALIGN THE LOGO TO THE RIGHT SIDE AND THE MENU TO THE LEFT  ***/
-
-#user_notifications_link_menucontent img {
-	float:right;
-	margin:5px 0 0 7px;
-}
-
-#search_wrap {
-float:right;
-}
-
-#adv_search {
-font-size: 0em;
-}
-#search {
-right: 0px;
-float: left;
-}
-
-#search .submit_input { float:right; }
-
-#search input#main_search {
-margin-right: 5px;
-}
-
-#search label,
-#search input,
-#search #adv_search {
-float: right;
-}
-
-#secondary_nav {
-padding: 12px 15px 12px 25px;
-clear: both;
-}
-
-#secondary_nav li {
-padding-right: 7px;
-float: right;
-}
-
-
-
-
-#pm_notification .photo {
-float: right;
-margin: 0 15px;
-}
-
-/************************************************************************/
-/* FOOTER */
-
-#board_footer ul#utility_links li {
-float: left;
-padding-right: 8px;
-}
-
-#board_footer p {
-        text-align:left; 
-        direction: ltr;
-}
-
-#footer_utilities li {
-float: right;
-}
-
-/************************************************************************/
-/* GENERAL CONTENT */
-
-.topic_options li {
-float: right;
-}
-
-#update_status_form p span img {
-        margin: -2px 0 0 5px;
-}
-
-/************************************************************************/
-/* GENERIC REPEATED STYLES */
-
-/* Floats */
-.right { float: left; }
-.left { float: right; }
-
-/* Bullets */
-.bullets ul, .bullets ol,
-ul.bullets, ol.bullets {
-margin-right: 30px;
-}
-
-
-/************************************************************************/
-/* COLUMN WIDTHS FOR TABLES */
-.col_f_topic, .col_m_subject {
-text-align:right;
-}
-.col_f_post, .col_m_date,
-.col_r_updated, .col_r_section {
-text-align:right;
-}
-.col_c_post {
-text-align:right;
-}
-.col_c_forum {
-text-align:right;
-}
-
-/************************************************************************/
-/* TABLE STYLES */
-
-
-table.ipb_table tr .stats {
-text-align: right;
-}
-
-table.ipb_table ol.subforums li {       
-float: right;
-}
-
-table.ipb_table ol.subforums li.newposts {              
-float: right;
-}
-
-/************************************************************************/
-/* MENU & POPUP STYLES */
-
-.ipbmenu_content a {
-text-decoration: none;
-text-align: left;
-}
-
-.popupClose {
-position: absolute;
-left: 12px;
-top: 12px;
-}
-
-.popup_footer {
-padding: 15px;
-position: absolute;
-bottom: 0px;
-right: 0px;
-}
-
-.userpopup { max-width: 400px; }
-
-.userpopup .photo { right: auto; left: 0;}
-
-.userpopup .user_controls {
-right: 10px;
-left: auto;
-}
-
-.userpopup .reputation {
-left: 4px;
-right: auto;
-}
-
-.other_contact dt, .about_contact dt, .info dt, .user_info dt {
-float: right;
-white-space: nowrap;
-width: 37%;
-
-}
-.other_contact dd, .about_contact dd, .info dd, .user_info dd {
-margin-right: 40%;
-width: 53%;
-
-}
-
-.other_contact dt, .about_contact dt, .user_info dt {
-padding: 0px 0px 10px 0px;
-margin: 0px;
-}
-
-.other_contact dd, .about_contact dd, .user_info dd {
-padding: 3px 13px;
-margin: 0px;
-}
-
-
-/************************************************************************/
-/* TOPIC/POST BUTTONS STYLES */
-
-.post_form .topic_controls {
-        float: left;
-}
-
-.topic_buttons li {
-float: left;
-}
-
-.topic_buttons li a img,
-.topic_buttons li span img {
-margin: -1px 0px 1px 5px;
-}
-
-ul.post_controls {
-text-align: right;
-}
-
-ul.post_controls li {
-float: left;
-}
-
-ul.post_controls li.report,
-ul.post_controls.left li {
-float: right;
-}
-
-ul.post_controls a {    
-margin-left: 4px;
-}
-
-/************************************************************************/
-/* PAGINATION STYLES */
-
-ul.pagination {
-        float: right;
-}
-
-ul.pagination li {
-float: right;
-}
-
-ul.pagination li.total,
-ul.pagination li.active {
-margin-left: 0px;
-}
-
-ul.mini_pagination {
-margin-left: 7px;
-}
-
-/************************************************************************/
-/* MODERATION & FILTER STYLES */
-
-.moderation_bar {
-text-align: left;
-}
-
-#topic_mod #forum_mod_options_menucontent {
-text-align: right;
-}
-
-.filter_bar select {
-margin-right: 10px;
-}
-
-
-/************************************************************************/
-/* TAB BAR STYLES */
-
-
-.tab_bar li {
-float: right;
-}
-
-/************************************************************************/
-/* AUTHOR INFO (& RELATED) STYLES */
-
-.author_info {
-text-align: right;
-border-right: none;
-border-left: 1px solid #e4ebf3;
-margin:15px -5px 10px 0;
-width: 250px;
-float: right;
-padding-bottom: 20px;
-}
-
-.author_info.no_rep {
-margin-bottom: 15px;
-}
-
-.author_info ul.user_fields li span.ft,
-.author_info ul.user_fields li span.fc {
-        float: right;
-}
-
-.author_info ul.user_fields li span.ft {
-        text-align: left;
-}
-
-.author_info .title {
-margin-top: 4px;
-}       
-
-.user_controls {
-text-align: center;
-margin: 6px 0;
-}
-
-.user_controls li {
-margin: 0 2px;
-display: inline;
-}
-
-.warn_panel {
-text-align: right;
-padding: 0px;
-margin: 0px 0px 10px 10px;
-}
-.warn_panel .warn_link {
-padding-right: 10%;
-}
-
-.warn_panel .warn_edit {
-float: left;
-}
-
-.warn_panel .warn_edit.up {
-margin-left: 10%;
-margin-right: auto;
-}
-
-/************************************************************************/
-/* BOARD INDEX STYLES */
-
-div#categories {
-width: 76%;
-float: right;
-}
-
-div#categories.no_sidebar {
-width: 99%;
-float: none;
-}
-
-
-.sidebar_toggle {
-left:5px;
-right:auto;
-}
-
-#open_sidebar.sidebar_toggle {left: 5px; right: auto;}
-
-
-body .stats_list {
-padding: 10px 5px 0 0;
-float: right;
-}
-
-.stats_list li,
-.active_users li {
-float: right;
-padding: 0 5px 0 0;
-}
-
-.stats_list ul, .stats_list p {
-margin-left: 15px;
-}
-
-.active_users p {
-margin-left: 15px;
-}
-
-#stats {
-padding-left: 20px;
-float: left;
-}
-#stats dl {
-margin-left: 10px;
-}
-
-#stats dt,
-#stats dd {
-float: right;
-}
-
-
-.friend_list ul li,
-#top_posters li {
-float: left;
-}
-
-
-/************************************************************************/
-/* FORUM VIEW (& RELATED) STYLES */
-
-
-ul.topic_moderation li {
-float: left;
-}
-
-ul.topic_moderation li a {
-float: left;
-}
-
-span.mini_rate {
-margin-right: 12px;
-}
-
-img.mini_rate {
-margin-right: -5px;
-}
-
-.topic_prefix {
-float: right;
-}
-
-
-#forum_legend dt,
-#forum_legend dd {
-float: right;
-}
-
-#forum_table .maintitle .main_forum_title {
-float: right;
-}
-
-#forum_table .maintitle .desc {
-float: left;
-}
-
-/************************************************************************/
-/* TOPIC VIEW (& RELATED) STYLES */
-
-ul.topic_jump li {
-float: right;
-}
-
-body .ip {
-margin-left: 10px;
-margin-right: 15px;
-}
-
-span.post_id {
-float: left;
-}
-
-input.post_mod {
-float: left;
-margin: 0px 6px 0 15px;
-}
-
-.post_block.topic_summary .posted_info {
-margin-right: 10px;
-}
-
-.post_block.with_rep .post_body {
-margin-bottom: 25px;
-}
-
-
-.post_body {
-margin-right: 250px;
-margin-left: 0;
-}
-
-.rep_bar {
-position: absolute;
-left: 0px;
-right: auto;
-bottom: 32px;
-padding: 1px 10px;
-border-radius-top-left: 0px;
--moz-border-radius-topleft: 0px;
--webkit-border-top-left-radius: 0px;
-border-radius-top-right: 5px;
--moz-border-radius-topright: 5px;
--webkit-border-top-right-radius: 5px;
-}
-
-p.rep_highlight {
-        float: left;
-        display: inline-block;
-}
-
-p.posted_info {
-margin-right: -3px;
-}
-
-
-div.threaded_view ul ul {
-margin-left: -25px;
-}
-
-
-.topic_share li {
-float: left;
-margin: 0 5px;
-}
-
-
-.poll_question .votes {
-margin-left: 5px;
-}
-
-.snapback { 
-margin-right: 5px;
-}
-
-.topic .main_topic_title {
-float: right;
-}
-
-.maintitle .rating {
-float: left;
-}
-
-
-/************************************************************************/
-/* POSTING FORM (& RELATED) STYLES */
-
-div.post_form label {
-text-align: left;
-padding-right: 15px;
-float: right;
-margin-left: 15px;
-}
-
-div.post_form span.desc,
-fieldset#poll_wrap span.desc {
-margin-right:0;
-}
-
-div.post_form .checkbox input.input_check,
-#mod_form .checkbox input.input_check {
-        margin-left:auto;
-        margin-right:0;
-}
-
-div.post_form .antispam_img {
-margin-right: 290px;
-}
-
-div.post_form .captcha .input_text {
-float: right;
-}
-
-
-fieldset.with_subhead ul {
-margin-right: 320px;
-margin-left: 15px;
-}
-fieldset.with_subhead h4 {
-text-align: right;      
-float: right;
-margin-right: 10px;
-}
-
-fieldset.with_subhead #post_icons {
-margin-right: 326px;
-}
-
-fieldset.with_subhead #post_icons li {
-margin-right: 15px;
-float: right;
-}
-
-fieldset.with_subhead .checkbox input.input_check {
-margin-left: auto;
-}
-
-
-.post_form #poll_wrap .question .wrap {
-margin-right: 290px;
-margin-left: 12px;
-}
-
-.post_form #poll_wrap .question .wrap ol {
-margin-right: 25px;
-}
-
-.post_form #poll_wrap .question .wrap input.input_check,
-.post_form #poll_wrap .question .wrap label,
-.post_form #poll_wrap .question .wrap span.desc {
-text-align: right;
-margin-right: 0px;
-
-}
-
-.post_form #poll_wrap .question ul.post_controls {
-text-align: right;
-}
-
-
-.post_form #poll_form .topic_buttons {
-right: 315px !important;
-position: absolute;
-margin-left: 0;
-}
-
-.post_form #poll_form .topic_buttons li,
-.post_form #poll_form .post_controls li {
-float: right;
-}
-
-.post_form #poll_form #poll_stats.desc {
-margin-left: 320px;
-margin-bottom: 8px;
-}
-
-
-li.field {
-        padding: 5px;
-        margin-left: 27px;
-}
-
-li.field.checkbox {
-        margin-right: 0;
-}
-
-li.field.checkbox .input_check,
-li.field.checkbox .input_radio {
-        margin-right: 10px;
-        vertical-align: middle;
-}
-
-        li.field label {
-                text-align: left;
-                margin-left: 10px;
-        }
-        
-        li.field label strong {
-                text-align: left;
-                margin-left: 10px;
-        }
-
-        li.field.checkbox label.desc {
-                padding-left: 27px;
-                margin-left: auto;
-                display: block;
-        }
-        
-        .wrap label.desc {text-align: left;}
-
-body#ipboard_body fieldset.submit .left-align {
-	text-align: right;
-}
-
-/************************************************************************/
-/* ATTACHMENT MANAGER (& RELATED) STYLES */
-
-#attachments li.complete .links {
-margin-left: 40px;
-right: auto;
-left: 0px;
-}
-
-.attach_name {
-margin-right: 30px;
-}
-
-#attachments li.complete .info { margin-right: 30px; }
-
-#attachments li .progress_bar {
-right: auto;
-left: 0px;
-}
-
-#attachments li .thumb_img {
-right: 6px;
-}
-
-fieldset.attachments .input_submit, fieldset.attachments .swfupload, fieldset.attachments .input_upload {
-margin-right: 50px;
-}
-
-
-#attach_wrap li {
-margin: 5px 6px;
-float: left;
-}
-
-#attach_wrap .desc.info {
-margin-left: 24px;
-}
-
-
-/************************************************************************/
-/* COMMENTS (& RELATED) STYLES */
-
-#comment_list {
-margin-top: 10px;
-}
-
-.comment_wrap .comment {
-line-height: 150%;
-padding: 5px;
-margin: 8px;
-}
-
-.comment_wrap .comment .photo {
-float: right;
-margin: 0 10px 10px;
-}
-
-.comment_wrap .comment h4,
-.comment_wrap .posted_date,
-.comment_wrap .comment .comment_content {
-margin-left: 65px;
-}
-
-
-.comment_options {
-float: left;
-}
-
-.comment_options li {
-float: left;
-}
-
-/************************************************************************/
-/* REPUTATION STYLES */
-
-.reputation,
-.post_block .rep_highlight {
-float: right;
-}
-
-body .post_block .rep_highlight {       
-font-size: 1.1em;
-float: left;
-}
-
-
-/************************************************************************/
-/* LIGHTBOX STYLES */
-
-#lightbox{ right: 0;}
-#loading{ right: 0;}
-#hoverNav{ right: 0; }
-#imageContainer>#hoverNav{ right: 0;}
-#prevLink { right: 0; float: right;}
-#nextLink { left: 0; float: left;}
-#imageData #imageDetails{ float: left; text-align: right; }     
-#imageData #numberDisplay{ clear: right;        }                       
-#imageData #bottomNavClose{ float: left; }
-#overlay{ right: 0; }
-
-/************************************************************************/
-/*  BBCODE STYLES */
-pre.prettyprint                 { padding: 5px; background: #f8f8f8; border: 1px solid #c9c9c9; overflow: auto; margin-left: 10px; font-size: 11px; line-height: 110%; direction: ltr; text-align: left; }
-
-/* Quote boxes */
-
-div.quote {
-padding: 12px;
-} 
-
-div.quote p.blockquote {
-margin-left: -12px;
-}
-
-p.citation {background-position: left;}
-
-ul.bbc {
-margin-left: 0;
-margin-right: 30px;
-}
-ul.bbcol.decimal {
-margin-left: 0; 
-margin-right: 30px;
-}
-
-/************************************************************************/
-/*  HELP & PORTAL STYLES */
-
-#portal_articles {
-	margin-left:2%;
-	margin-right:6px;
-	width:74%;
-}
-
-#portal_active_users ul,
-#portal_active_users li {
-	float: left;
-	padding: 3px;
-}
-
-.message {
-        background-position: 99.5% 10px;
-        padding:10px 3% 10px 20px;
-        text-align:right;
-}
-
-#toggle_post_options {
-        background-position: center right;
-        padding: 2px 20px 2px 22px;
-}
-
-#post_options_options {
-margin-right: 5px;
-
-}
-
-#post_options_options ul {
-left: 0;
-
-}
-
-#post_options_options ul li .desc {
-float: none;
-margin-right: 10px;
-display:inline;
-}
-
-#post_options_options ul li.field .input_text {
-float: right;
-}
-
-#post_options_options ul li.field .input_check {
-float: right;
-}
-
-#post_options_options h4 .desc { margin-right:auto; }
-
-#post_options_options h4 { margin-right:5px; float: right; }
-
-/* Search */
-#search_info fieldset label {
-                float: right;
-}
-
-/* Other */
-.ipb_autocomplete {left: auto; right: 262px;}
-
-caption, th { text-align: right; }
-
-/* Mlist */
-div#member_filters label {      
-                float: right;
-        }
-        
-.members li .info {
-        right: 90px; 
-        left: auto;
-        border-right:none;
-        border-left:1px solid #D5DDE5;
-}       
-
-.members li .user_controls 
-{
-        text-align:right;
-        right:450px;
-        left:auto;
-}
-        
-/* Calendar */
-#calendar_list li {
-        text-align: right;
-}
-#current_calendar .topic_controls ul.pagination { float: right; }
-#current_calendar ul.pagination { float: right; }
-
-/* Profile */
-
-.personal_info li a { text-align: right; }
-.about_contact dt, .info dt, .about_info dt, .user_info dt { text-align: right; float: right; }
-
-
-/* User CP */
-
-#usercp_menu {
-                float: right;
-                border-left:3px solid #528F6C;
-                border-right: none;
-}
-
-#usercp_content {
-
-        margin-left: 0;
-        border-left: none;
-        margin-right: 190px;
-        border-right: 3px solid #528f6c;
-        
-}
-
-#usercp_menu li { margin:0 0 4px 8px; padding:6px 5px; }
-
-#usercp_menu li.active {
-                -webkit-border-top-right-radius: 4px;
-                -webkit-border-bottom-right-radius: 4px;
-                -webkit-border-top-left-radius: auto;
-                -webkit-border-bottom-left-radius: auto;
-                margin-left: 0px;
-                -moz-border-radius: 0 4px 4px 0;
-                border-radius: 0 4px 4px 0;
-        }
-        
-#usercp_content li.field {margin-left:auto; margin-right:27px;}
-
-#usercp_content li.field.checkbox {margin-left:auto; margin-right:auto;}
-
-#usercp_content li.field label {margin-left:auto; margin-right:10px; text-align:right; }
-
-#usercp_content p {margin-right: 5px;}
-
-
-/** Messenger **/
-#folder_list li {
-        margin-left: auto;
-        margin-right: 6px;
-}
-
-#folder_list .total {
-        margin-right: auto;
-        margin-left: 10px;
-        right: auto;
-        left: 0;
-}
-
-#message_compose ul li label { 
-margin-left:auto;
-text-align:right;
-margin-right:10px;
-}
-
-/** Editor **/ 
-
-#ipboard_body .ips_editor .toolbar li.left {float: right;}
-
-#ipboard_body .ips_editor .toolbar li.right {float: left;}
-
-#ipboard_body .ips_editor .toolbar li {float: right;}
-
-#ipboard_body .input_rte {direction: rtl; text-align: right;}
-
-#ipboard_body .ipb_palette label {
-	text-align: right !important;
-}
-
-#ipboard_body .ipb_palette input {
-	margin-left: 6px !important;
-	margin-right: 0px;
-}
-
-#ipboard_body .ipb_palette input[type="submit"], 
-#ipboard_body .input_submit.emoticons {
-	float: right;
-}
-
-/* Sign In */
-#regular_signin ul li label {
-margin-left:auto;
-text-align:right;
-margin-right:10px;
-}
-
-#openid_signin ul li label {
-margin-left:auto;
-text-align:right;
-margin-right:10px;
-}
-
-#login_form ul li.field.checkbox span.desc {
-display:inline;
-}
-
-div#member_login .extra {float: left;margin-left:10px;margin-right:auto;}
-
-/* Register */
-div#register_form label { float: right; }
-
-div#register_form input { float: right; }
-
-div#register_form ul li.field label { text-align: left; }
-
-div#register_form .checkbox input { margin-right:245px; margin-left:auto; }
-
-/* Help */
-#help_topics li {background-position:99.5% 50%;text-align:right;}
-
-/** RTE **/
-.withRTL {direction: rtl; text-align: right;}
-
-#ipboard_body .ips_editor.with_sidebar .sidebar { left: 0px; right: auto; }
-
-#ipboard_body .ips_editor.with_sidebar .controls,
-#ipboard_body .ips_editor.with_sidebar .editor{
-        margin-right: auto;
-        margin-left: 200px;
-}
-
-#ipboard_body .ips_editor.with_sidebar .sidebar h4 img {
-        float: left;
-        margin-left: 6px;
-}
-
-/** Post Body **/
-.post_body .post {margin-right: 10px;}
-
-/** Mlist **/
-.members li .photo {float: right;}
-.reputation, .post_block .rep_highlight {float: left;}
-.members li p.rating {left: 0; right: auto;}
-
-/** Profile **/
-.friend_list ul li, #top_posters li {float: right;}
-
-/** Popup **/
-.popupInner .row1 .field {margin-left:auto; margin-right:40px;}
-
-.popupInner .row1 .field label {text-align: right;}
-
-/**Messenger **/
-.edit_folders {right: auto; left: 5px;}
-
-
-/** This causes the popup box to go way right **/
-/*.popupWrapper {left: auto !important; right: 80px !important;}*/
-
-
-	.stem.topleft {
-		background-image: url(../style_images/master/stems/topright.png);
-	}
-	.stem.topright {
-		background-image: url(../style_images/master/stems/topleft.png);
-	}
-	.stem.bottomleft {
-		background-image: url(../style_images/master/stems/bottomright.png);
-	}
-	.stem.bottomright {
-		background-image: url(../style_images/master/stems/bottomleft.png);
-	}
-	
-#tab_topics .post_body {margin-right:10px; width:95%;}
-
-/** IPB 3 **/
-.status_profile_page  {
-	float:right;
-	margin-right:0px;
-	margin-left:10px;
-}
-
-.index_stats_collapse  {
-	float:left;
-	text-indent: -100px;
-}
-
-/* Search */
-#date_start_icon {
-	padding-left: 10px;
-}
-
-.status_main_photo {
-	float:right;
-}
-
-#latest_visitors li  .photo {float:right;margin:2px 0 0  10px;}
-
-#notificationlog
-{
-	padding-right:10px;
-}
-
-#search_options_menucontent  li input {margin-left:5px;margin-right:0;}
-
-#search_options_menucontent li.app {
-	clear: both;
-}
-
-#search_options_menucontent {
-	padding-bottom: 6px;
-}
-
-#search .choice {
-	background: url({style_images_url}/search_expand.png) no-repeat left;
-	border-right:1px solid #AFAFAF;border-left: 0px;
-	padding: 0 7px 0 9px;
-}
-
-.printpreview .post_block {
-	clear: both;
-}
-.printpreview .post_block h3 {
-	float:right;
-}
-
-.printpreview p.posted_info {
-	float:left;
-}
-
-.printpreview .post_body {
-	margin-right: 0px;
-	padding-right: 0px;
-}
-
-.tab_forums_topics div.post_body, .tab_forums_posts div.post_body {
-	clear: both;
-	margin-right: 0px;
-	right: 0;
-}
-
-.tab_forums_topics h4, .tab_forums_posts h4,
-.tab_forums_topics p.posted_info, .tab_forums_posts p.posted_info {
-	padding-right: 4px;
-}
-
-.facebook-like {
-	float: right;
-}
-
-#index_stats .block_list li img {
-	float: right !important;
-}
-
-#index_stats .block_list li .nexttophoto {
-	margin-right: 35px !important;
-	margin-left: auto !important;
-}
-
-.status_main_content  {margin-left:0;margin-right:65px;}
-
-.status_mini_photo {float:right;}
-.status_mini_content  {margin-left:0;margin-right:35px;}
-
-.status_action_left {float:right;margin-left:0;margin-right:4px;}
-
-.status_action_right  {margin-left:0;margin-right:35px;}
-
-.status_profile_actions  {float:right;}
-
-/************************************************************************/
-/* Blog RTL  by Ajouz */
- 
-.blog_rating {float:left;margin-left:10px;margin-right:0;}
-
-#main_column  .entry_options {
-float:left;}
-#main_column  .entry_meta .entry_tags {float:left;}
-#main_blog_wrapper  .cblock .close_link {left:0;right:auto;}
-
-#main_blog_wrapper  .cblock .configure_link {
-left:18px;right:auto;}
-
-li.blog_row_off  .photo, li.row2 .photo, li.row1 .photo {float:right;}
-li.blog_row_off .nexttophoto, li.row2 .nexttophoto,  li.row1 .nexttophoto {margin-left:0;margin-right:40px;}
-.baby_go_back.alt {margin:0 0 0 10px;}
-
-.baby_go_back {float:left;}
-
-.blog_top_tab.left {direction:ltr;float:right;left:auto;right:0;}
-#main_column  .entry_footer p.cats {
-float:left;}
-
+/************************************************************************/
+/* IP.Board 3.2 alpha RTL CSS - By Ajouz 	last update 16-7-2011*/
+/************************************************************************/
+/* ipb_rtl.css														*/
+/************************************************************************/
+
+/* CORE ELEMENT STYLES */
+
+body {
+    direction: rtl;
+	text-align:right;
+}
+ #ipbwrapper {
+ direction:rtl ;
+ }
+
+	
+/************************************************************************/
+/* LISTS */
+
+	.ipsList_inline > li:first-child { margin-right: 0; margin-left: 3px; }
+	.ipsList_inline > li:last-child { margin-left: 0; margin-right: 3px; }
+.ipsList_withminiphoto > li .list_content { margin-right: 40px; margin-left:0px;}
+.ipsList_withtinyphoto > li .list_content { margin-right: 30px; margin-left:0px ;}
+
+.ipsList_data .row_title, .ipsList_data .ft {
+	float: right;
+	text-align: left;
+	padding-left: 10px;
+	padding-right:0px ;
+}
+
+/************************************************************************/
+/* TYPOGRAPHY */
+
+/************************************************************************/
+/* LAYOUT */
+
+/************************************************************************/
+
+/* HEADER */
+#header_bar {
+   -moz-box-shadow: 0 0;
+ 
+}
+
+#sign_in{ margin-left:10px; }
+
+#user_link {
+	margin-left: 15px;
+	margin-right:0px ;	
+}
+
+	
+#user_link_menucontent {
+	left: 100px;
+    right:auto;
+}
+
+#user_link_menucontent #links li {
+    float: right;
+}	
+	#user_link_menucontent > div {
+		margin-right: 15px;
+        margin-left:0px ;
+		text-align: right;
+	}
+
+#notify_link, #inbox_link {
+	padding: 13px 12px 9px 24px;
+}
+
+	
+	#primary_nav li { margin: 0px 0 0 3px; }
+
+	#primary_nav a {
+		padding: 6px 15px 8px;
+
+	}
+
+
+#more_apps_menucontent {
+	-moz-border-radius: 0 4px 4px 0;
+	-webkit-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+}
+	
+	
+
+	.breadcrumb li .nav_sep { margin: 0 0 0 5px; }
+	.breadcrumb li:first-child{ margin-right: 0 ; }
+
+
+/************************************************************************/
+/* SEARCH */
+/************************************************************************/
+
+#search_wrap {
+	padding: 0 4px 0 26px;
+	-moz-border-radius: 3px 3px 4px 4px;
+	-webkit-border-radius: 3px 3px 4px 4px;
+	border-radius: 3px 3px 4px 4px;
+}
+
+#adv_search {
+    background-position: left 50%;
+    font-size: 0;
+    margin: 4px 4px 4px 0;
+    text-indent: -3000em;
+	overflow: hidden;
+}
+
+#search .submit_input {
+	left: 0; 
+	right:auto ;
+	-moz-border-radius: 3px 0 0 3px;
+	-webkit-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+
+#search_options {
+	margin: 3px 0 3px 3px;
+	float: left;
+}
+
+
+	#search_options_menucontent input { margin-left: 10px; margin-right:0px ; }
+	div#search_results div.result_info {
+                float: right;
+                                           }
+                                           
+div#search_results .result_details {
+    border-left: 0 ;
+    border-right: 1px solid #B5C0CF;
+    float: left;
+    padding-right: 15px;
+    padding-left:0px;
+}
+	
+/************************************************************************/
+/* FOOTER */	
+
+#backtotop {
+	right: 50%;
+	left:auto;
+	margin-right: -20px;
+	margin-left:0px;
+}
+
+
+	
+	#copyright {
+		text-align: left;
+	}
+
+#ipsDebug_footer {
+	margin: 8px auto 0px auto;
+}
+	
+/************************************************************************/
+/* GENERAL CONTENT */
+
+
+
+
+	.ipsBox_withphoto { margin-right: 65px;margin-left:0px; }
+	.ipsBox_container .ipsBox_notice {	margin: -10px -10px 10px -10px;	}	
+.ipsPad_left { padding-right: 9px;padding-left:0px ; }
+
+
+.ipsModMenu {
+	margin-left: 5px;
+    margin-right:0px;
+}
+	
+#ajax_loading {
+	right: 46%;
+	left:auto;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+}
+
+#ipboard_body.redirector {
+	margin: 150px auto 0 auto;
+}
+	
+
+	.progress_bar span {
+		background-position: right 50%;
+	}
+
+
+.antispam_img {
+	margin-right: 215px;
+	margin-left:0px ;
+}
+
+/************************************************************************/
+/* GENERIC REPEATED STYLES */
+/* Inline lists */
+
+/* Utility styles */
+.right { float: left; }
+.left { float: right; }
+
+
+
+/* Bullets */
+.bullets ul, .bullets ol,
+ul.bullets, ol.bullets {
+	margin-right: 30px;
+	margin-left:0px;
+
+}
+
+	
+/************************************************************************/
+/* COLUMN WIDTHS FOR TABLES */
+/* col_f = forums; col_c = categories; col_m = messenger; col_n = notifications */
+	
+.col_f_views, .col_m_replies {
+	text-align: left;
+}
+
+.col_f_mod, .col_m_mod, .col_n_mod { width: 40px; text-align: left; }
+.col_f_preview { 
+	text-align: left;
+}
+
+.col_c_icon { padding: 10px 5px 10px 5px !important;  }
+.col_m_mod { text-align: left; }
+.col_c_stats {  text-align: left; }
+
+
+/************************************************************************/
+/* TABLE STYLES */
+
+
+.last_post { margin-right: 45px;margin-left:0px; }
+
+.forum_data {
+	margin: 0px 8px 0 0;
+}
+
+
+table.ipb_table .subforums {
+	margin: 2px 5px 3px 0;
+	padding-right: 20px;
+	padding-left:0px;
+	background-position:  right 4px;
+}
+
+table.ipb_table .preview td {
+	padding: 20px 29px 20px 10px;
+}
+
+.preview_col {
+	margin-right: 80px;
+}
+
+table.ipb_table tr.header th {
+	text-align: right;
+}
+
+/************************************************************************/
+/* LAYOUT SYSTEM */
+
+.ipsLayout.ipsLayout_withleft { padding-right: 210px; padding-left:0px; }
+.ipsLayout.ipsLayout_withright { padding-left: 210px; padding-right:0px; clear: right; }
+/* Panes */
+.ipsLayout_content {  float: right; }
+.ipsLayout .ipsLayout_left { margin-right: -210px;margin-left:0px; float: right; }
+.ipsLayout .ipsLayout_right { margin-left: -210px;margin-right:0px; float: left; }
+
+/* Wider sidebars */
+.ipsLayout_largeleft.ipsLayout_withleft { padding-right: 290px; }
+.ipsLayout_largeleft.ipsLayout .ipsLayout_left { margin-right: -290px; margin-left:0}
+.ipsLayout_largeright.ipsLayout_withright { padding-left: 290px; padding-right:0px;}
+.ipsLayout_largeright.ipsLayout .ipsLayout_right { margin-left: -290px; margin-right:0;}
+.ipsLayout_largeright.ipsLayout_withright.ipsLayout_withleft {padding-right:290px;} 
+.ipsLayout_largeleft.ipsLayout_withleft.ipsLayout_withright {padding-left:290px;} 
+/* Narrow sidebars */
+.ipsLayout_smallleft.ipsLayout_withleft { padding-right: 150px; padding-left:0px;}
+.ipsLayout_smallleft.ipsLayout .ipsLayout_left {  margin-right: -150px; margin-left:0px;}
+.ipsLayout_smallright.ipsLayout_withright { padding-left: 150px; padding-right:0px;}
+.ipsLayout_smallright.ipsLayout .ipsLayout_right {  margin-left: -150px; margin-right:0px;}
+
+/* Tiny sidebar */
+.ipsLayout_tinyleft.ipsLayout_withleft { padding-right: 50px; padding-left: 0; }
+.ipsLayout_tinyleft.ipsLayout .ipsLayout_left {margin-right: -40px; margin-left:0px;}
+.ipsLayout_tinyright.ipsLayout_withright { padding-left: 50px;padding-right:0px; }
+.ipsLayout_tinyright.ipsLayout .ipsLayout_right { margin-left: -40px;margin-right:0px; }
+
+/* Big and huge  */
+.ipsLayout_bigleft.ipsLayout_withleft{padding-left:0px ; padding-right:330px}
+.ipsLayout_bigleft.ipsLayout .ipsLayout_left{width:320px;margin-left: 0px ;margin-right:-330px}
+.ipsLayout_bigright.ipsLayout_withright{padding-right:0px ;padding-left:330px}
+.ipsLayout_bigright.ipsLayout .ipsLayout_right{width:320px;margin-right: 0px ;margin-left:-330px}
+.ipsLayout_hugeleft.ipsLayout_withleft{padding-left:380px ;padding-right:0px}
+.ipsLayout_hugeleft.ipsLayout .ipsLayout_left{width:370px;margin-left: 0px ;margin-right:-380px;}
+.ipsLayout_hugeright.ipsLayout_withright{padding-right:0px ; padding-left:380px}
+.ipsLayout_hugeright.ipsLayout .ipsLayout_right{width:370px;margin-right: 0px ;margin-left:-380px}
+
+/************************************************************************/
+/* NEW FORMS */
+
+.ipsForm_horizontal .ipsField_title {
+	float: right;
+	padding-left: 15px;
+	padding-right:0px;
+	text-align: left;
+}
+
+.ipsForm_horizontal .ipsField_content, .ipsForm_horizontal .ipsField_submit { margin-right: 200px; margin-left:0px;}
+.ipsForm_horizontal .ipsField_checkbox { margin: 0 200px 5px 0; }
+.ipsForm .ipsField_checkbox .ipsField_content { margin-right: 25px; }
+.ipsForm .ipsField_checkbox input { float: right; }
+
+
+.ipsForm_submit {
+	text-align: left;
+}
+
+.ipsForm_right { text-align: left; }
+.ipsForm_left { text-align: right; }
+
+	
+/************************************************************************/
+/* AlertFlag */
+
+.ipsHasNotifications {
+	right: 3px;
+	left:auto;
+}
+
+/************************************************************************/
+/* SIDEBAR STYLE */
+
+.ipsSideMenu { padding: 10px 0; }
+.ipsSideMenu h4 { 
+	margin: 0 25px 5px 10px;
+}
+
+.ipsSideMenu ul li a {
+	padding: 5px 25px 5px 10px;
+}
+
+	.ipsSideMenu ul li.active a
+	{
+		background-position: 160px 8px;
+	}
+
+
+/***************************************************************************/
+/* WIZARDS */
+
+	.ipsSteps ul li {
+		float: right;
+		padding: 11px 18px 11px 33px;
+		background-position: bottom left;
+	}
+	
+	.ipsSteps .ipsSteps_active {
+		background-position: top left;
+	}
+	
+	
+	.ipsSteps_active .ipsSteps_arrow {
+		right: -23px;
+		left:auto;
+
+	}
+	
+/************************************************************************/
+/* VERTICAL TABS (profile etc.) */
+
+	.ipsVerticalTabbed_tabs > ul {
+	    border-left:0px;
+		border-right: 1px solid #DBE4EF;
+	}
+		
+			
+	
+			
+				.ipsVerticalTabbed_tabs li.active a {
+	                border_right:0px;
+					border-left: 1px solid #fff;			
+				}
+				
+#user_utility_links {
+    text-align: left;
+}
+/************************************************************************/
+/* 'LIKE' FUNCTIONS */
+
+	
+/*.ipsLikeButton {
+	padding: 0 24px 0 6px;
+}
+
+	
+	.ipsLikeButton.ipsLikeButton_enabled {
+		background-position: top right;
+	}
+	
+	.ipsLikeButton.ipsLikeButton_disabled {
+		background-position: bottom right;
+	}*/
+
+/************************************************************************/
+/* TAG LIST */
+
+.ipsTag {
+
+	margin: 5px 0 0 5px;
+	border-radius: 0 0 3px 3px;
+    -moz-transform: rotate(180deg);
+	-webkit-transform: rotate(180deg);
+	-o-transform: rotate(180deg);
+	transform: rotate(180deg);
+	filter: fliph; /*IE*/
+}
+
+	.ipsTag span {
+	    -moz-transform: rotate(180deg);
+		-webkit-transform: rotate(180deg);
+		-o-transform: rotate(180deg);
+		transform: rotate(180deg);
+		filter: fliph; /*IE*/	
+	}
+
+/************************************************************************/
+/* TAG EDITOR STYLES */
+
+	.ipsTagBox_tag {
+		padding: 2px 4px 2px 1px;
+		margin: 0 0 2px 3px;
+	}
+	
+		
+	.ipsTagBox_closetag {
+		margin-right: 2px;
+		margin-left:0px;
+
+	}
+		
+	.ipsTagBox_addlink {
+		margin-right: 3px;
+        margin-left:0px;
+	}
+	
+/************************************************************************/
+/* NEW FILTER BAR */
+
+.ipsFilterbar li {
+	margin: 0px 0 0px 15px;
+}
+	
+/************************************************************************/
+/* POSTING FORM STYLES */
+/* Additional form styles for posting forms */
+
+  .ipsLayout_smallleft.ipsPostForm.ipsLayout_withright {padding-right: 150px;}
+	
+	.ipsPostForm.ipsLayout_withright {
+		padding-left: 260px;
+		padding-right:inherit !important;
+	}
+	
+	.ipsPostForm .ipsLayout_right {
+		margin-left: -251px;
+		margin-right:0px ;
+		border-right: 0px none;
+		border-left: 1px solid #DBE4EF;
+	}
+	
+	.ipsPostForm .ipsLayout_content
+	{
+		box-shadow: -2px 0 4px rgba(0, 0, 0, 0.1);
+	}
+	
+	.ipsPostForm_sidebar .ipsPostForm_sidebar_block.closed h3 {
+		background-position: 10px 9px;
+		padding-right: 26px;
+		padding-left:0px;
+	}
+
+/************************************************************************/
+/* MEMBER LIST STYLES */
+.ipsMemberList li .reputation { margin: 5px 0 0 10px; }
+
+/*************************/
+/* Member List RTL by Ziv */
+/************************************************************************/
+ 
+ div#member_filters ul {
+  margin-bottom: 12px;
+  margin-top: 8px;
+  width: 49%;
+  float: right;
+ }
+ 
+ div#member_filters li {
+  border-bottom: 1px solid #d5dde5;
+  margin-left: 20px;
+  padding: 8px 0 8px 0;
+  clear: both;
+ }
+ 
+ div#member_filters label { 
+  text-align: right;
+  margin-left: 15px;
+  width: 150px;
+  display: block;
+  float: right;
+ }
+
+/************************************************************************/
+/* FORM STYLES */
+
+
+body#ipboard_body fieldset.submit .left-align {
+	text-align: right;
+}
+	
+li.field {
+	margin-right: 5px;
+	margin-left:0px;
+}
+
+li.field.checkbox, li.field.cbox {
+	margin-right: 0;
+}
+
+li.field.checkbox .input_check,
+li.field.checkbox .input_radio,
+li.field.cbox .input_check,
+li.field.cbox .input_radio {
+	margin-left: 10px;
+    margin-right:0px;
+}
+
+	
+	li.field.checkbox p,
+	li.field.cbox p {
+		right: 245px;
+        left:auto;
+	}
+
+	li.field.checkbox span.desc,
+	li.field.cbox span.desc {
+		padding-right: 27px;
+		padding-left:0px;
+		margin-right: auto;
+		display: block;
+	}
+	
+/************************************************************************/
+/* MESSAGE STYLES */
+	
+	.message.error.usercp {
+		float: left;
+	}
+	
+	.message.unspecific {
+		margin: 0 0 10px 0;
+	}
+	
+#folder_list .total {
+	right: auto;
+	left: 0;
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+/************************************************************************/
+/* UserCP */
+
+.ipsSettings_section h3.ipsSettings_sectiontitle {
+	float: right;
+	padding-right: 10px;
+	padding-left:0px;
+}
+
+.ipsSettings_section > div {
+	margin-left: 0;
+	margin-right: 175px;
+}
+
+.ipsSettings_fieldtitle {
+	margin-right: 0px;
+	margin-left: 10px;
+}
+
+	
+/************************************************************************/
+/* MENU & POPUP STYLES */
+
+	.ipbmenu_content a { 
+		text-align: right;
+	}
+
+
+.popupClose {
+	position: absolute;
+	left: 16px;
+    right:auto ;
+}
+
+.popupClose.light_close_button {
+	background-position:top right;
+    left:auto;
+	right: 16px;
+}
+
+.popup_footer {
+    right:auto;
+	left: 0px;
+}
+
+.userpopup h3, .userpopup .side + div { padding-right: 110px; padding-left:0px;}
+.userpopup .user_controls { text-align: right; }
+.info dt {
+	float: right;
+	clear: left;
+}
+
+.info dd {
+	margin-right: 35%;
+	margin-left:0px;
+}
+
+/************************************************************************/
+/* BUTTONS STYLES */
+
+.topic_buttons li {
+	float: left;
+	margin: 0 10px 10px 0;
+}
+
+.topic_buttons li.important a, .topic_buttons li.important span, .ipsButton .important,
+.topic_buttons li a, .topic_buttons li span, .ipsButton {
+	border-width: 1px 1px 0 1px;
+}
+		
+	
+.ipsButton_extra {
+	margin-right: 5px;
+	margin-left:0px
+}
+
+
+ul.post_controls {
+	padding: 6px 6px 28px 0px;
+}
+
+		ul.post_controls li {
+			float: left;
+		}
+
+
+		ul.post_controls a {	
+			margin-right: 4px;
+            margin-left:0px;
+		}
+
+.hide_signature, .sigIconStay { float: left; }
+.post_block:hover .signature a.hide_signature, .sigIconStay {
+	background-position: top left;
+	left:0 ;
+	right:auto;
+}
+
+/************************************************************************/
+/* PAGINATION STYLES */
+.pagination .back { margin-left: 6px; }
+	.pagination .back li { margin: 0 0 0 2px; }
+.pagination .forward { margin-right: 6px; }
+	.pagination .forward li { margin: 0 2px 0 0; }
+
+ul.mini_pagination {
+    margin-left:0px;
+	margin-right: 7px;
+}
+
+
+/************************************************************************/
+/* MODERATION & FILTER STYLES */
+
+.moderation_bar {
+	text-align: left;
+}
+
+	.moderation_bar.with_action {
+		background-position: left center;
+		padding-left: 35px;
+		padding-right:0px;
+	}
+
+/************************************************************************/
+/* TAB BAR STYLES */
+
+.tab_bar {
+	-moz-border-radius: 6px 0 0 6px;
+	-webkit-border-radius: 6px 0 0 6px;
+	border-radius: 6px 0 0 6px;
+	padding: 7px 15px 25px 15px;
+}
+
+	.tab_bar.no_title {
+		padding: 7px 15px 56px 15px;
+	}
+		
+		.tab_bar.no_title.mini {
+			padding: 7px 15px 25px 15px;
+		}
+		
+	.tab_bar li {
+		float: right;
+	}
+		
+		.tab_bar li.active {
+			-moz-border-radius: 4px 0 0 4px;
+			-webkit-border-radius: 4px 0 0 4px;
+			border-radius: 4px 0 0 4px;
+			margin: -2px 10px 0 10px;
+		}
+		
+
+		
+/************************************************************************/
+/* AUTHOR INFO (& RELATED) STYLES */
+
+.author_info {
+	float: right;
+}
+	
+
+/************************************************************************/
+/* BOARD INDEX STYLES */
+
+
+.status_list .status_list { margin: 10px 50px 0 0; }
+
+/* board stats */
+
+	#board_stats li { margin-left: 20px; margin-right:0px;}
+	#board_stats .value {
+		margin-left: 3px;
+	}
+
+.statistics {
+	margin: 20px 0 0 0;
+}
+
+.friend_list ul li,
+#top_posters li {
+	float: right;
+}
+#board_index.no_sidebar {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+	#board_index.force_sidebar { padding-left: 290px; padding-right: 0px; }
+
+#toggle_sidebar {
+    left: -5px;
+    right:auto;
+}
+/************************************************************************/
+/* FORUM VIEW (& RELATED) STYLES */
+
+
+	ul.topic_moderation li {
+		float: right;
+	}
+	
+	.topic_preview a,
+	ul.topic_moderation li a {
+		float: right;
+	}
+
+img.mini_rate {
+	margin-left: -5px;
+	margin-right:-5px;
+}
+
+/************************************************************************/
+/* TOPIC VIEW (& RELATED) STYLES */
+
+
+span.post_id { margin-right: 15px;margin-left:0px; }
+input.post_mod { margin:12px 10px 0px 5px; }
+
+.signature {
+	clear: left;
+}
+.hide_signature,.sigIconStay {
+
+ float:left;
+
+}
+
+.post_body {
+	margin: 0 185px 0 10px;
+}
+	
+	
+	.post_block.no_sidebar .post_body { margin-right: 10px; margin-left:0px;}
+	
+.posted_info {
+	padding: 0 0 10px 0;
+}
+
+
+		
+p.rep_highlight {
+	float: left;
+	margin: 5px 10px 10px 10px;
+}
+
+	
+
+.edit {
+	padding: 2px 24px 0 0;
+	background-position:  right 4px;
+	font-size: 12px;
+}
+
+
+.poll_question {
+	margin: 10px 20px 10px 10px;
+}
+
+	
+	.poll_question .votes {
+		margin-right: 5px;
+		margin-left:0px;
+	}
+	
+.snapback { 
+	margin-left: 5px;
+	margin-right;0px;
+	padding: 1px 1px 1px 0;
+}
+
+
+#rating_text { margin-right: 4px;margin-left:0px; }
+	
+/************************************************************************/
+/* POSTING FORM (& RELATED) STYLES */
+
+div.post_form label {
+	text-align: left;
+	padding-left: 15px;
+	padding-right:0px;
+	float: right;
+}
+
+	div.post_form .checkbox input.input_check,
+	#mod_form .checkbox input.input_check {
+		margin-right: 295px;
+		margin-left:0px;
+	}
+	
+	div.post_form .antispam_img {
+		margin-right: 290px;
+		margin-left:0px;
+	}
+	
+	div.post_form .captcha .input_text {
+		float: right;
+	}
+	
+
+	fieldset.with_subhead h4 {
+		text-align: left;	
+		float: right;
+	}
+
+	fieldset.with_subhead ul {
+		margin: 0 320px 6px 15px;
+	}
+
+
+	fieldset.with_subhead #post_icons {
+		border: 0;
+		margin-right: 326px;
+		margin-left:0px;
+	}
+
+	fieldset.with_subhead #post_icons li {
+		margin-left: 15px;
+		margin-bottom: 6px;
+		float: right;
+	}
+
+	fieldset.with_subhead .checkbox input.input_check {
+		margin-right: 0px;
+	}
+
+#toggle_post_options {
+	padding: 2px 22px 2px 0;
+
+}
+
+
+		#poll_wrap .question .wrap ol {
+			margin-right: 25px; 
+		}
+		
+	
+.question_title { margin-right: 30px; margin-left: 0; }
+
+.poll_control { margin-right: 20px; margin-left: 0;}
+.post_form .tag_field ul { margin-right: 290px; margin-left: 0;}
+
+/************************************************************************/
+/* ATTACHMENT MANAGER (& RELATED) STYLES */
+
+
+	#attachments li {
+
+		padding: 6px 62px 6px 0px;
+	}
+	
+	#attachments li.complete {
+		background-position: 98%;
+	}
+			
+			#attachments li.complete .links {
+				margin-left: 15px;
+				margin-right:0px;
+				left: 0px;
+				right:auto;
+			}
+			
+		#attachments li .progress_bar {
+			margin-left: 15px;
+            margin-right:0px;
+			left: 0px;
+	        right:auto;
+		}
+	
+		
+		#attachments li .thumb_img {
+			right: 6px;
+	        left:auto;
+		}
+
+
+
+.attach_controls {
+	padding-right: 35px;
+	padding-left:0px;
+}
+
+	
+	
+	#attach_wrap li {
+		float: right;
+	}
+		
+		#attach_wrap .desc.info {
+			margin-right: 24px;
+			margin-left:0px;
+		}
+
+
+/************************************************************************/
+/* COMMENTS (& RELATED) STYLES */
+
+		.comment_wrap .rep_bar {
+
+			margin: -10px 0 -5px -5px;
+			
+		}
+	
+	
+	.comment_wrap .comment .photo {
+		float: right;
+		margin: 0 0 10px 10px;
+	}
+	
+	.comment_wrap .comment h4,
+	.comment_wrap .posted_date,
+	.comment_wrap .comment .comment_content {
+		margin-right: 65px;
+		margin-left:0px;
+	}
+
+.comment_options {
+	float: left;
+}
+
+	.comment_options li {
+		float: right;
+	}
+	
+	
+
+
+#commentUser {
+	padding-right: 10px;
+	padding-left:0px;
+	float: right;
+}
+
+#commentButtons {
+	margin: 0px 0px 10px 0px;
+	text-align: left;
+}
+	
+/* New comment styles */
+.comment .post_wrap .cleft {
+	float: right;
+	margin-right: 65px;
+	margin-left:0px;
+	padding-right: 5px;
+	padding-left:0px;
+
+}
+
+.comment_wrap .comment.gallery_row_off,
+.comment_wrap .comment.row1,
+.comment_wrap .comment.row2 {
+	margin-right: 0px;
+	padding-right: 0px;
+}
+
+
+.comment_content {
+	padding: 10px 0px 10px 0px;
+}
+
+
+.ipsComment_comment {
+    margin-right: 190px;
+    margin-left:0px;
+}
+/************************************************************************/
+/* REPUTATION STYLES */
+
+
+.status_main_content p {
+	padding: 6px 0px 6px 0px;
+}
+.status_mini_photo {
+	float: right;
+}
+
+	.status_feedback { margin: 10px -10px 0 0; }
+
+
+/* Favorites */
+
+.ips_like a.ftoggle {
+	float: left;
+}
+
+.ips_like a.ftoggle._newline,
+.ips_like a.ftoggle.on._newline {
+	margin-right: auto;
+	margin-left: 0;
+}
+
+
+/* New notification panel */
+#ipsGlobalNotification {
+	right: 50%;
+	left:auto;
+	margin-right: -250px;
+	margin-left:0px;
+}
+
+#ips_NotificationCloseButton {
+	background-position: top right;
+	right: 5px;
+	left:auto;
+
+}
+
+.status_list .mod_links {
+float:right;
+}
+/************************************************************************/
+/* SHARED MEDIA STYLES */
+
+#mymedia_inserted {
+    right: 50%;
+	left:auto;
+	margin-right: -200px;
+	margin-left:0px;
+	
+}
+
+#mymedia_toolbar { 
+	position: absolute;
+	bottom: 0; right: 0;	left: 0;
+}
+
+#mymedia_finish { position: absolute; left: 5px; right:auto; }
+
+.media_results li.result {
+	float: right;
+}
+
+	
+
+
+
+
+/* Multiquote insert button */
+#multiQuoteInsert {
+	left: 30px;
+    right:auto;
+}
+
+
+/*** user_navigation **/
+#user_navigation {
+float:left;
+}
+
+#user_link_menucontent #links li {
+    float: right;
+}
+
+
+/************************************************************************/
+/* ipb_common.css														*/
+/************************************************************************/
+
+	
+/************************************************************************/
+/* LIGHTBOX STYLES */
+
+#lightbox{	position: absolute;	right: 0;left:auto; }
+#loading{ position: absolute; right: 0%; left:auto; }
+#hoverNav{ position: absolute; right: 0;left:auto; }
+#imageContainer>#hoverNav{ right: 0;left:auto;}
+#prevLink { right: 0;left:auto; float: right;}
+#nextLink { left: 0;right:auto; float: left;}
+#imageData #imageDetails{ float: right; text-align: right; }			
+#imageData #bottomNavClose{ float: left;  }
+/************************************************************************/
+/*  BBCODE STYLES */
+/* 	NOTE: These selectors style bbcodes throughout IPB. It is recommended that you DO NOT change these 
+	styles if you are creating a skin since it may interfere with user expectation
+	of what certain BBCodes look like (quote boxes are an exception to this). */
+span.bbc_left, div.bbc_left		{	text-align: left; display: block; }
+span.bbc_right , div.bbc_right	{	text-align: right; display: block; }
+div.bbc_indent 			{	margin-right: 50px; margin-left:0px;}
+ul.bbc 					{	 margin: 12px 40px 12px 0; }
+ul.bbcol.decimal 				{ margin: 12px 40px 12px 0;  }
+	ul.bbcol.lower-alpha		{ margin-right: 40px; margin-left:0px; }
+	ul.bbcol.upper-alpha		{ margin-right: 40px; margin-left:0px; }
+	ul.bbcol.lower-roman		{ margin-right: 40px; margin-left:0px;}
+	ul.bbcol.upper-roman		{ margin-right: 40px; margin-left:0px; }
+
+pre.prettyprint 		{  text-align: left; direction: ltr; }
+/* Quote boxes */
+
+p.citation {
+    background-position: right center;
+    border-left: 1px solid #E2E2E2;
+    border-right: 3px solid #414141;
+    text-align: right;
+}
+
+div.blockquote {
+	border-right: 3px solid #414141;
+	border-left: 1px solid #e2e2e2;
+        text-align: right;
+}
+
+div.blockquote div.blockquote {
+	margin: 0 0 0 10px;
+}
+
+div.blockquote p.citation {
+	margin: 6px 0 0 10px;
+}
+
+._sharedMediaBbcode
+{
+	margin-left: 15px;
+	margin-right:15px ;
+
+}
+
+.bbcode_mediaWrap
+{
+
+	margin-left: 5px;
+}
+
+.bbcode_mediaWrap .details
+{
+	float: right;
+	margin-right: 80px;
+	margin-left:0px ;
+}
+
+
+
+
+.bbcode_mediaWrap img.sharedmedia_image
+{
+	float: right;
+	position: relative;
+	right: 40px;
+	left:auto;
+}
+
+.bbcode_mediaWrap img.sharedmedia_screenshot
+{
+	float: right;
+	position: relative;
+	right: 10px;
+	left:auto;
+
+}
+
+/************************************************************************/
+/** ipb common rtl css **/   
+/************************************************************************/
+.ipsComment_author, .ipsComment_reply_user {
+    float: right;
+	text-align: left;
+}
+
+#user_latest_status {
+    background-position: left 50% ;
+    /*padding-right: 11px;
+    padding-left:0px ;*/
+    -moz-transform: rotate(180deg);
+	-webkit-transform: rotate(180deg);
+	-o-transform: rotate(180deg);
+	transform: rotate(180deg);
+	filter: fliph; /*IE*/
+}
+
+	#user_latest_status > div {
+	    -moz-transform: rotate(180deg);
+		-webkit-transform: rotate(180deg);
+		-o-transform: rotate(180deg);
+		transform: rotate(180deg);
+		filter: fliph; /*IE*/
+	}
+
+/************************************************************************/
+/* ipb_calendar.css - Calendar specific styles							*/
+/************************************************************************/
+
+.calendar_title { float: right; }
+
+/* Mini calendars */
+#mini_calendars.three_wide > div.left:first-child { margin-left: 2%; margin-right:0;}
+#mini_calendars.three_wide > div.right { margin-right: 2%; margin-left:0;}
+
+
+	.mini_cal_wrap h3 { margin: 10px 15px 0 0; }	
+	.post_wrap.vevent h3 .ipsUserPhoto { margin-left: 10px;margin-right:0px; }
+	
+/* RSVPing */
+
+.calendar_jump { 
+	margin: 6px 10px 0 0;
+}
+
+
+/* Week view */
+	
+	div#current_calendar ol#week_view li.day div {
+		padding: 4px 75px 4px 10px;
+	}
+	
+	div#current_calendar ol#week_view li.day .date {
+		right: 0px;
+		left:auto;
+	}
+	
+
+.cal_color {
+	margin-left: 8px;
+	margin-right:0px;
+
+}
+
+
+
+.input_check.event_options {
+	margin-right: 12px !important;
+	margin-left:auto;
+}
+/************************************************************************/
+/*** IP.content RTL   ***/
+/************************************************************************/
+
+.articles-layout {
+	width: 100%;
+}
+
+.articles {
+	float: right;
+}
+		
+
+
+.articles .type-1x2x2 .block-2,
+.articles .type-1x2x2 .block-3 {
+
+	float: right;
+}
+
+
+.articles .article_title {
+	clear: left;
+}
+
+.articles .type-1x1x1 .photo {
+	float: left;
+	margin-right: 15px;
+       margin-left:0px;
+}
+
+.articles .type-1x2x2 .photo {
+	margin-left: 15px;
+margin-right: 0px;
+	float: right;
+}
+
+
+.articles .type-1x2x2 .block-1 .overview {
+	float: right;
+}
+
+.articles .type-1x2x2 .block-2 .links,
+.articles .type-1x2x2 .block-3 .links {
+	margin-right: 0px;
+       margin-left:0px;
+}
+
+#previous_bar {
+	text-align: left;
+}
+	
+
+.articles .archives h3,
+.articles .categories h3 {
+	padding-right: 0px;
+}
+
+
+	
+	.articles .subcat h2 {
+		float: right;
+	}
+	
+	
+
+.articles .archives .photo,
+.articles .categories .photo {
+	float: left;
+	margin-right: 15px;
+        margin-left:0px;
+}
+
+.sort_bar {
+	text-align: left;
+}
+
+	
+	.sort_bar li {
+		margin: 0 10px 0 0;
+	}
+
+
+.articles .children {
+	float: right;
+	clear: right;
+	margin-right: 20px;
+        margin-left:0px;
+}
+
+
+	.articles .last_article {
+		margin-right: 200px;
+               margin-left:0px;
+	}
+	
+		.articles .last_article h3 {
+			padding-right: 0px;
+                   
+		}
+
+
+
+/**
+ * Article view
+ */
+
+	.articles .article_body .photo {
+		float: left;
+		margin: 0 15px 15px 0;
+	}
+
+
+.topic_share li {
+	float: right;
+	margin: 4px 0 0 8px !important;
+}
+
+.articles .view .rating {
+	float: left;
+}
+
+	.articles .view ul.shareButtons {
+		float: left;
+	}
+
+
+	/* Move comments down */
+	
+/** 
+ *	Sidebar styles
+ */
+
+#article_sidebar {
+	float: left;
+	margin-right: 5px;
+        margin-left:0px;
+}
+
+
+		#category_list h3 a {
+			float: left;
+		}
+
+	#category_list ul a {
+		border-left: 10px solid #1d3652;
+                border-right:0px;
+	}
+
+		#category_list ul a:hover {
+			border-left: 10px solid #1d3652;
+                        border-right:0px;
+		}
+
+
+
+			#category_list ul ul li a {
+				padding: 6px 25px 6px 12px;
+			}
+
+
+		#recent_articles .block_list li {
+			padding-left: 10px;
+                        paddin-right:0px;
+		}
+
+	#recent_comments .photo {
+		float: right;
+		margin-left: 8px;
+              margin-right:0px;
+	}
+
+
+/**
+ * Some misc/global styles
+ */
+ 
+
+/* Videos system */
+
+
+	#videos_latest h2, #videos_recent h2 {
+		text-align: right;
+	}
+
+
+
+	.video_thumb {
+		float: right;
+	}
+
+/*** print rtl ***/
+.article_body img.photo {
+float: right;
+}
+	
+/************************************************************************/
+/** ipb download rtl css **/   
+/************************************************************************/
+	
+#downloads #file_block {
+	float: right;
+	margin-right: 2%;
+        margin-left:0px;
+}
+
+
+	.file_options li {
+		float: left;
+		margin-right: 15px;
+                margin-left:0px;
+	}
+	
+
+/*****************************************************/
+/* IDM 2.3 */
+
+#panel_screenshots #ss_list li {
+	float: right;
+
+}
+	
+	
+	#panel_screenshots #ss_list .links {
+		text-align: left;
+	}
+	
+
+	
+	#ss_linked .links {
+		margin-right: 10px;
+                margin-left:0px;
+	}
+
+#iframeAttach_files, #iframeAttach_ss {
+	margin-right: 8px !important;
+        margin-left:0px;
+}
+
+
+/* view file */
+
+	
+	h1 .download_button {	
+		margin-right: 10px;
+                margin-left:0px;
+	}
+
+
+	.screenshot.primary {
+		margin-right: 10px;
+                margin-left:0px;
+		float: left;
+	}
+
+	
+	#file_screenshots .screenshot {
+		margin-left: 5px;
+                margin-right:0px;
+	}
+	
+	
+/* portal */
+
+#idm_categories a.cat_toggle {
+	right: 8px;
+	left:auto;
+}
+	
+		#idm_categories > li > a {
+			padding: 10px 25px 10px 10px;
+		}
+		
+	
+		
+	#idm_categories .file_count {
+		margin: 11px 0 0 8px;
+	}
+	
+	#idm_categories ul.subforums {
+		margin: 0px 35px 10px 0;
+	}
+
+
+/* - fin - */
+
+
+	.download_pane li {
+		padding-right: 1%;
+                padding-left:0;
+	}
+	
+		.download_pane li .ipsBadge {
+			position: absolute;
+			right: 0px;
+                        left:auto;
+		}
+		
+
+	.download_pane .mini.screenshot {
+		margin-left: 10px;
+                margin-right:0px;
+	}
+	
+	
+		
+	#featured_pane .screenshot {
+		margin-left: 10px;
+                margin-right:0px;
+	}
+	
+
+	#featured_pane .ipsBadge {
+		right: 0px;
+                left:auto;
+	}
+
+
+/* category view */
+.pagination {
+	padding-right: 0 !important;
+}
+
+#idm_category { }
+	
+	#idm_category.no_screenshots .ipsBadge {
+		margin-left: 10px;
+                margin-right:0px;
+	}
+	
+	#idm_category.with_screenshots .ipsBadge, #idm_category.with_screenshots .ipsBadge.ipsBadge_green {
+		right: 60px;
+		left:auto;
+	}
+	
+
+	#idm_category .screenshot {
+		float: right;
+		margin-left: 15px;
+                margin-right:0px;
+	}
+
+		
+		#idm_category .cat_name {
+			margin-right: 6px;
+                        margin-left:0px;
+		}
+		
+	
+	#idm_category .file_info {
+		padding-right: 10px;
+                padding-left:0px;
+		border-right: 1px solid #dfdfdf;
+                border_left:0px;
+	}
+
+		
+	#idm_category .topic_prefix {
+		float: left;
+		margin-left: 10px;
+                margin-right:0px;
+	}
+
+
+	
+	.filters li.dropdown a {
+		padding-left: 17px;
+                padding-right:0px;
+		background-position: left 10px;
+	}
+	
+
+
+/************************************************************************/
+/** ips nexus rtl css **/   
+/************************************************************************/
+
+
+#store_wrapper #main_column,
+#store_wrapper #sidebar_left,
+#store_wrapper #sidebar_right {
+	float: right;
+}
+
+#store_wrapper {
+	padding-left: 275px;
+	padding-right: 0;
+}
+
+#store_wrapper.with_left {
+	padding-right: 200px;
+	padding-left: 0;
+}
+
+
+#store_wrapper #sidebar_left {
+	left: 200px; /* Left width */
+        right:auto;
+	margin-right: -100%;
+        margin-left:0px;
+}
+
+#store_wrapper #sidebar_right {
+	margin-left: -275px; /* Right width */
+        margin-right:0px;
+}
+
+	
+	.block_inner span.pagination.no_pages {
+		padding-right: 0;
+	}
+
+
+
+.add_to_cart {
+	margin-right: 30px;
+        margin-left:0px;
+	float: left;
+}
+
+
+
+#store_wrapper .filter {
+	text-align: left;
+}
+
+
+#mini_cart .item_detail { 
+	float: right;
+}
+
+#mini_cart .item_price {
+	float: left;
+	text-align: left;
+}
+
+
+#store_wrapper .fields .field {
+	margin-right: 0px;
+	padding-right: 0px;
+}
+
+.required {
+	margin-right: 15px;
+        margin-left:0px;
+}
+
+#cart_totals td {
+	text-align: left;
+}
+	
+
+
+#confirm {
+	text-align: left;
+
+}
+
+
+.desctext {
+	margin-right: 195px;
+        margin-left:0px;
+
+}
+
+.input_checkbox {
+	margin-right: 225px;
+        margin-left:0px;
+}
+
+
+
+	.ship_select select {
+		float: left;
+	}
+	
+
+.payment_fields li {
+	margin-right: 0;
+        
+}
+
+
+	#wizard_progress li {
+		float: right;
+
+	}
+	
+
+/************************************************************************/
+/* Client area */
+/************************************************************************/
+
+.menu li a {
+
+	padding: 12px 15px 12px 10px;
+}
+	
+
+	
+	.menu li img {
+		margin-left: 10px;
+	}
+
+
+
+
+#package_change .toggle {
+	padding-right: 15px;
+        padding-left:0px;
+	float: right;
+}
+
+
+
+	
+	#support_ticket .author_info .photo {
+		margin-right: 15px;
+                margin-left:0px;
+	}
+	
+	
+	#support_ticket .post_body {
+		margin-right: 90px;
+                margin-left:0px;
+	}
+	
+	#support_ticket p.posted_info {
+		padding-right: 10px;
+                padding-left:0px;
+		margin-right: 0;
+	}
+	
+
+
+#purchase_downloads_menucontent {
+	float: left;
+}
+
+
+
+#purchase_downloads_menucontent a {
+
+	padding: 5px 15px 5px 5px;
+}
+
+
+
+
+/************************************************************************/
+/** ips blog rtl css **/   
+/************************************************************************/
+
+/* TRACKBACKS */
+#trackbacks {
+	margin-right: 15px;
+	margin-left: 10px;
+}
+
+
+.trackback_options {
+	float: left;
+}
+
+.trackback_options li {
+	float: right;
+}
+
+/* CUSTOMIZATION */
+	
+#theme_editor strong {
+	float: right;
+}
+
+	#theme_editor img.input_submit {
+		float: left;
+		margin-left: 3%;
+		margin-right:0px;
+	}
+
+/* Form */
+#blogEditor
+{
+	margin-left: 245px;
+	margin-right:0px;
+}
+
+#blogEditorExtra
+{
+	float: left;
+	margin-left: 6px;
+    margin-right:0px;
+}
+
+#no_bid_warn {
+	margin-left: 3px;
+	margin-right:0px;
+
+}
+
+/** Blog entry views **/
+
+
+	.teaser_left,
+	.teaser_right {
+		float: left;
+	}
+	
+	.teaser_left
+	{
+		float:right;
+	}
+	
+
+/* New CSS IP.Blog 2.4 CSS */
+
+.entry_header .ipsBadge {
+	float: left;
+}
+
+	.entry.featured .entry_header .ipsBadge,
+	.entry.moderated .entry_header .ipsBadge,
+	#entry_data .entry_header .ipsBadge {
+		margin-left: 10px;
+		margin-right:0px;
+	}
+
+/************************************************************************/
+/* IP.Chat CSS */
+/************************************************************************/
+
+.messages-list div {
+	border-left: 0 ;
+	border-right: 1px solid #D3D3D3;
+	margin-right: 103px;
+    margin-left:0px ;
+	padding-right: 5px;
+	padding-left:0px ;
+}
+
+.messages-list label {
+	float: right;
+	margin-left: 5px;
+	margin-right:0px ;
+	text-align: left;
+}
+
+#ipboard_body .ipb_palette input {
+	margin-left: 7px;
+	margin-right:0px ;
+}
+
+#ipboard_body .ipb_palette label {
+	text-align: right !important;
+}
+
+
+/************************************************************************/
+/*****ips gallery rtl ****/
+/************************************************************************/
+#ipg_category .galattach {
+  float: right;
+  margin-left: 15px;
+        margin-right:0px;
+}
+#ipg_category .cat_name {
+        margin-right: 6px;
+   margin-left: 0px;
+}
+/* Gallery view image */
+.image_info li { padding: 5px 2px 5px 0px; }
+.image_info li STRONG {
+  float: right;
+}
+/* Others... */
+em.inline-moderated {
+margin-right: 5px;
+margin-left: 0px;
+}
+/***********************************************/
+/* Image notes */
+.note_wrap.editable .handle {
+left: 0;
+        right:auto;
+}
+.note_text, .note_form {
+text-align: right;
+}
+/******************************************/
+.album.horizontal img { float: right; }
+.album.horizontal.showMore {
+text-align: left;
+margin-right: -5px;
+margin-left: 0px;
+}
+.album.horizontal .sub_album_children {
+padding-left:16px;
+}
+/*DD*/
+.album.horizontal .sub_album_children span.desc{
+float: right;
+}
+.album.horizontal.mini img {
+  margin-left: 3px;
+  margin-right:0px;
+}
+
+.gas_entry img
+{
+  float: right;
+}
+/* Photo strip */
+ul#strip li
+{
+float: right;
+margin: -2px 0px 0px 1px;
+}
+#photostrip {
+margin-right: 10px;
+margin-left: 0px;
+}
+.photoStipNav {
+right: 0px;
+left:auto;
+}
+.image_is_hidden_box
+{
+margin: 0px 3px 0px 0px !important;
+}
+input[type="checkbox"].albumModBox {
+margin: 90px 90px 0px 0px !important;
+}
+/* NEW IP.Gallery 4.1.0 CSS */
+/* HOME */
+/* ALBUMS + MISC */
+.imageDescription {
+right: 0;
+left:auto;
+}
+ul.wrap li .small
+{
+  margin-right:90px;
+  margin-left:0px;
+}
+/* Next/previous links in image view */
+#image_nav_links li {
+  padding: 0px 5px 0px 0px;
+}
+/************************************************************************/
+/********* slide show rtl *********/
+/************************************************************************/
+#image_info .info {
+  right: 0;
+  left:auto;
+}
+  #image_info .info .photo {
+   float: right;
+  }
+
+  #image_info .info .info_body {
+   margin-right: 65px;
+   margin-left:0px;
+  }
+#thumbnail_wrap {
+  right: 30px;
+  left:auto;
+}
+#thumbnail_bar #thumbnails #thumbnail_wrap > div {
+  float: right;
+}
+  #thumbnail_bar img {
+   right: -50%;
+   left:auto;
+  }
+
+#slideshow_controls {
+right: 1%;
+left:auto;
+}
+#slideshow_controls #controls {
+  right: 50%;
+  left:auto;
+  margin-right: -104px;
+  margin-left:0px;
+}
+#slideshow_controls .control {
+  float: right;
+}
+#loading {
+  left: 15px;
+        right:auto;
+}
+
+#close_slideshow {
+left: 15px;
+right:auto;
+}
+/*** editor related rtl ***/
+.cke_skin_ips .cke_editor {
+        width: auto;
+}
+
+
+/* Uploading */
+#iframeUploadForm {
+	text-align: right;
+}
\ No newline at end of file
diff --git a/upload/public/style_css/ipb_rtl_ie.css b/upload/public/style_css/ipb_rtl_ie.css
index 6187fa40..30705a92 100644
--- a/upload/public/style_css/ipb_rtl_ie.css
+++ b/upload/public/style_css/ipb_rtl_ie.css
@@ -1,144 +1,13 @@
-#search label,
-#search input,
-#search #adv_search {
-float: none !important;
-vertical-align: middle;
-}
-
-.info {
-        height: 1%;
-}
-
-.info dd {
-        float: right;
-        margin-left: 0;
-        margin-right: 0;
-}
-.info dt {
-        float: right;
-        clear: none;
-}
-
-ul.pagination li {
-        float: left;
-}
-
-/* Hack to fix RTL breadcrumbs in IE7 */
-#secondary_nav #breadcrumb {
-        direction: rtl;
-        text-align:right; 
-        padding: 0;
-        padding-right: 5px;
-        margin: 0;
-        float: left;
-}
-#secondary_nav {
-        padding-left: 0px;
-        padding-right: 5px;
-}
-
-
-#secondary_nav li a {
-        direction: rtl;
-        text-align:right; 
-}
-#secondary_nav #section_links {
-        float: left;
-}
-#secondary_nav #section_links li {
-        float: left;
-}
-#secondary_nav #breadcrumb .first {
-        text-align: right;
-}
-/******************/
-
-/* Similar fix for pagination */
-ul.pagination li {
-        float: left;
-        zoom: 1;
-}
-
-ul.pagination li.next a,
-ul.pagination li.prev a {
-        zoom: 1;
-}
-
-ul.pagination {
-}
-/*****************/
-
-#ipboard_body .members li p.rating {
-        margin-right: auto;
-        margin-left: 10px;
-        left: 10px;
-}
-
-#folder_list, #space_allowance {
-        zoom: 1;
-}
-
-#folder_list .total {
-        left: 10px;
-}
-
-#ipboard_body.redirector {
-        text-align: center;
-        width: 100%;
-        margin: 0;
-        padding: 150px 0 0 0;
-}
-
-        #ipboard_body.redirector #ipbwrapper {
-                width: 500px;
-                text-align: right;
-        }
-        
-/*ul.topic_jump {
-        float: left !important;
-        width: 300px;
-}*/
-
-ul.topic_jump li {
-        float: left;
-}
-
-#footer_utilities li {
-        float: left;
-}
-
-#tab_posts .post_body,
-#tab_topics .post_body {
-        margin-right: 0;
-        margin-left: 0;
-}
-
-.userpopup dl {
-        margin-bottom: 10px;
-        overflow: hidden;
-}
-
-.user_status.message #update_status {
-        margin-left: 0px;
-}
-
-.post_form #poll_form .topic_buttons {
-        position: static;
-        margin-right: 315px;
-}
-
-#search {
-	text-align:left;
-}
-#search_wrap {
-	float:none;
-}
-
-#user_navigation #user_notifications.no-new small {
-	right:180px;
-	float:right;
-}
-
-ul#user_other  {
-	right:18px;
+/* IE7 specific RTL fixes */
+/* Utility styles */
+#notify_link, #inbox_link {
+ position:static;
+
+}
+#search{ 
+ float:left;
+ margin-left:23%;
+}
+#logo{ 
+ float:right;
 }
\ No newline at end of file
diff --git a/upload/public/style_css/mobile_touch.css b/upload/public/style_css/mobile_touch.css
deleted file mode 100644
index fcb80c6a..00000000
--- a/upload/public/style_css/mobile_touch.css
+++ /dev/null
@@ -1,406 +0,0 @@
-body
-{
-	font-size: 13px;
-	font-family: Helvetica, Sans-serif;
-}
-
-body h1 a:active, body h1 a:hover,
-body h2 a:active, body h2 a:hover,
-body #user_navigation a:active, body #user_navigation a:hover
-{
-	text-decoration: none !important;
-}
-
-	h1 a 
-	{ 
-		background: #1D3652;
-		background: -webkit-gradient(linear, left top, left bottom, from(#1D3652), to(#192B40));
-		border-bottom: 1px solid #111;
-		font-size: 1.2em; 
-		font-weight: bold; 
-		padding: 12px 10px; 
-		text-align: left;
-		text-shadow: -1px -2px 0 #000;
-	}
-	
-	
-	
-	#options-button
-	{
-		background: #B6C7DB;
-		background-image: -webkit-gradient(linear, left top, left bottom, from(#8EA3BC), to(#62758B), color-stop(0.5, #8EA3BC));
-		border: 1px solid rgba(255,255,255,0.1);
-		color: #fff;
-		display: none;
-		padding: 5px 20px;
-		position: absolute;
-		right: 10px;
-		text-shadow: -1px -1px 0 #000;
-		top: 8px;
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-o-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-	#user_navigation
-	{
-		background: #1D3652;
-		z-index: 3;
-	}
-	
-	.hidden
-	{
-		display: none;		
-	}
-	
-	#user_navigation a
-	{
-		background: #1D3652;
-		background: -webkit-gradient(linear, left top, left bottom, from(#1D3652), to(#192B40));
-		background: -moz-linear-gradient(left, from(#1D3652), to(#192B40));
-		
-		border: 1px solid #192B40;
-		
-		font-size: 1.0em;
-		margin: 2px;
-		padding: 10px 10px;
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-o-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-.master_list .title, .master_list h2 { font-size: 1em; }
-
-.master_list h2
-{
-}
-
-.master_list .topic_reply
-{
-	background: #fff;
-	border: 1px solid #aaa;	
-	-webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.25);
-}
-
-	.master_list .topic_reply .secondary
-	{
-		background: #fff;
-		background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0.5)), to(rgba(190, 203, 219, 1.0)), color-stop(0.5, rgba(190, 203, 219, 1)));
-		background: -moz-linear-gradient(left, rgba(190, 203, 219, 0.5), rgba(190, 203, 219, 1.0));
-	}
-	
-	.topic_reply .post_controls
-	{
-		background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0)), to(rgba(190, 203, 219, 0.5)));
-		background: -moz-linear-gradient(left, rgba(190, 203, 219, 0), rgba(190, 203, 219, 0.5));
-	}
-
-	.topic_reply .post_controls a
-	{
-		background: #BECBDB;
-		background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0.5)), to(rgba(190, 203, 219, 1.0)), color-stop(0.5, rgba(190, 203, 219, 1)));
-		background: -moz-linear-gradient(left, rgba(190, 203, 219, 0.5), rgba(190, 203, 219, 1.0));
-		
-		border: 1px solid rgba(0,0,0,0.3);
-		color: #222;
-		text-shadow: 0px -1px 0px rgba(255, 255, 255, 0.9);
-		display: inline-block;
-		margin: 2px;
-		padding: 7px 20px;
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-o-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-.buttons 
-{
-	padding: 0;
-	text-align: center;
-}
-
-.post img
-{
-	max-width: 100%;
-}
-
-.topic_reply img.photo
-{
-	border: 0;
-	border-left: 0px solid #aaa;
-	border-right: 2px solid #aaa;
-	float: left;
-	margin: 0;
-	position: relative;
-	top: -10px;
-	left: -15px;
-}
-
-.master_list .topic_reply .post
-{ 
-	clear: both; 
-	border-top: 0; 
-}
-
-.topic_reply h2 
-{ 
-	padding: 10px 0 9px 15px; 
-	border-bottom: 1px solid #aaa; 
-}
-.topic_reply h2 span 
-{ 
-	display: block; 
-}
-
-.buttons .button
-{
-	background: -webkit-gradient(linear, left top, left bottom, from(rgba(46, 100, 159, 0.8)), to(rgba(46, 100, 159, 1)), color-stop(0.5, rgba(46, 100, 159, 1)));
-	background: -moz-linear-gradient(left, rgba(46, 100, 159, 0.8), rgba(46, 100, 159, 1));
-	font-size: 1.1em;
-	margin: 0;
-	padding: 8px 0;
-	width: 48%;
-}
-
-.editor textarea
-{
-	height: 125px;
-	width: 100%;
-}
-
-#user_navigation
-{
-
-}
-
-.input_submit,
-#content .master_list a.input_submit
-{
-		background: #BECBDB;
-		
-		background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0.5)), to(rgba(190, 203, 219, 1.0)), color-stop(0.5, rgba(190, 203, 219, 1)));
-		background: -moz-linear-gradient(left, rgba(190, 203, 219, 0.5), rgba(190, 203, 219, 1.0));
-		
-		border: 1px solid rgba(0,0,0,0.3);
-		color: #222;
-		display: inline-block;
-		font-weight: normal;
-		margin: 2px;
-		padding: 7px 20px;
-		font-size: 0.9em;
-		text-decoration: none;
-		text-shadow: 0px -1px 0px rgba(255, 255, 255, 0.9);
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-o-border-radius: 5px;
-		-webkit-border-radius: 5px;	
-}
-
-#content .master_list a.input_submit
-{
-	padding: 5px 20px !important;
-}
-
-div.touch-row a.title
-{
-	font-size: 1.2em;
-}
-
-
-.buttons .page-button { 	
-	
-	background: #BECBDB;
-	background: -webkit-gradient(linear, left top, left bottom, from(rgba(190, 203, 219, 0.5)), to(rgba(190, 203, 219, 1.0)), color-stop(0.5, rgba(190, 203, 219, 1)));
-	background: -moz-linear-gradient(left, rgba(190, 203, 219, 0.5), rgba(190, 203, 219, 1.0));
-	
-	border: 1px solid rgba(0,0,0,0.3);
-	color: #222;
-	text-shadow: 0px -1px 0px rgba(255, 255, 255, 0.9);
-	
-	width: 24%;
-}
-
-.buttons .disabled
-{
-	background: #CCC;
-	background: -webkit-gradient(linear, left top, left bottom, from(#CCC), to(#AAA), color-stop(0.5, #AAA));
-	background: -moz-linear-gradient(left, #CCC, #AAA);
-	
-	cursor: default;
-	text-shadow: none;
-}
-
-.pagination
-{
-	float: right;
-	margin-left: 10px;
-	padding: 2px 0;
-	width: 49%;
-}
-
-.master_list .pagination span.page a { padding: 15px;}
-
-.post_controls 
-{
-	display: none;
-}
-
-.visible { display: block;}
-
-
-#filter-option
-{
-	display: inline-block; 
-	margin: 5px 0; 
-	text-decoration: none !important;
-	text-align: center;
-}
-
-.letter-page strong, .letter-page a, .letter-page a:hover 
-{ 
-	background: #fff; 
-	border: 1px solid #ccc; 
-	color: #222;
-	display: inline-block; 
-	margin: 5px 0; 
-	padding: 10px; 
-	text-decoration: none !important;
-	width: 8px;
-	text-align: center;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	-o-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.letter-page { margin: 0; }
-.letter-page.all strong, .letter-page.all a { width: 30px; }
-.letter-page.active strong { background: #ddd; }
-
-.controls
-{
-	background: #ddd;
-	background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(rgba(190, 203, 219, 1.0))) !important;
-	background: -moz-linear-gradient(left, #fff, rgba(190, 203, 219, 1.0));
-	
-	border-bottom: 1px solid #888 !important;
-	text-align: center;
-}
-
-.controls .buttons { background: transparent !important;}
-
-.status_updates .row 
-{
-	background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
-	border-bottom: 1px solid #ddd;
-	border-top: 0;
-	color: #777;
-	padding: 5px;
-}
-
-.status_updates .row img
-{
-	float: left;
-	margin-right: 15px;
-}
-
-.status_updates .row p
-{
-	margin-left: 67px;
-	margin-top: 5px;
-}
-
-#secondary_navigation
-{
-	background: #F6F6F6;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ccc));
-}
-
-#secondary_navigation a
-{
-	background: transparent;
-	display: block;
-	font-size: 1em;
-	padding: 10px;
-}
-
-h2.touch-row
-{
-	background: #B6C7DB;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#8EA3BC), to(#62758B), color-stop(0.5, #8EA3BC));
-	border-bottom: 1px solid #62758B;
-	border-top: 1px solid #62758B;
-}
-
-.master_list .row .icon
-{
-	margin-right:5px;
-}
-
-.touch-row .rowContent
-{
-	margin-left: 30px;
-}
-
-.touch-row-arrow
-{
-	opacity: 0.4;
-	width: 12px;
-	height: 18px;
-	background: transparent url(../style_images/mobile/rarrow.png) no-repeat !important;
-	float: right;
-	display: block;
-	position: relative;
-}
-
-#shade {
-    position: absolute;
-    top: 43px;
-    width: 100%;
-    min-height: 468px;
-    z-index: 2;
-    background: rgba(0, 0, 0, 0.8);
-    padding: 0;
-}
-
-#loadingBox {
-	position: absolute;
-	width: 300px;
-	height: 100px;
-	margin: 0px;
-	z-index: 2;
-    background: rgba(0, 0, 0, 0.75);
-    -webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	-o-border-radius: 5px;
-	border-radius: 5px;
-}
-	#loadingBox img
-	{
-		margin-top: 30px;
-		margin-left: 75px;
-		float: left;
-	}
-	
-	#loadingBox span
-	{
-		letter-spacing: 0.2em;
-		color: #BBBBBB;
-		font-weight: bold;
-		margin-top: 40px;
-		margin-left: 20px;
-		float: left;
-		text-shadow: -1px -2px 0 #000;
-	}
-
-/* Enforce a smaller recaptcha */
-#recaptcha_area {
-	zoom: 86%;
-}
\ No newline at end of file
diff --git a/upload/public/style_css/skin_creator.css b/upload/public/style_css/skin_creator.css
new file mode 100644
index 00000000..74836de4
--- /dev/null
+++ b/upload/public/style_css/skin_creator.css
@@ -0,0 +1,290 @@
+body#ipboard_body.selecting, body#ipboard_body.selecting a {					
+	cursor: crosshair !important;	
+}
+
+#skingen_pane_a_others {
+	height: 170px !important;
+}
+									
+.skingen_editor	{					
+	background: #515151;			
+	color: #fff;					
+	position: fixed;				
+	z-index: 100000;				
+	border-radius: 6px; 			
+	box-shadow: 0px 4px 20px rgba(0,0,0,0.7);
+	-webkit-box-shadow: 0px 4px 20px rgba(0,0,0,0.7);
+}									
+									
+#skingen_editor { 					
+	width: 650px;					
+	top: 50px;						
+	right: 100px;					
+}									
+									
+	#skingen_editor a {				
+		color: #fff !important;		
+		text-decoration: underline;	
+	}								
+									
+.skingen_editor h1 { 				
+	background: #2d2d2d;			
+	padding: 7px 0;					
+	text-align: center;				
+	border-radius: 6px 6px 0 0;		
+	cursor: move;
+	font-weight: 300;					
+}									
+									
+.skingen_content {					
+	position: relative;	
+	height: 350px;			
+}									
+	
+.skingen_desc {
+	margin: 10px;
+	font-size: 12px;
+	line-height: 1.6;
+	color: #d7d7d7;
+	text-align: center;
+}
+
+.skingen_buttons {
+	margin: 10px;
+	text-align: center;
+}
+	
+	.skingen_buttons a {
+		font-size: 12px !important;
+	}
+
+#skingen_colorize_editor, #skingen_settings_editor, #skingen_buildskin_editor { 					
+	width: 450px;					
+	top: 50px;						
+	right: 100px;					
+}
+
+	#skingen_colorize_editor .skingen_content {
+		height: auto;
+	}
+	
+	#skingen_colorize_editor table td {
+		text-align: center;
+		padding: 10px 0;
+	}
+
+	#skingen_colorize_editor .color {
+		height: 40px;
+		width: 80px;
+		margin-bottom: 5px;
+		border-radius: 50px;
+		cursor: pointer;
+		background: red;
+		display: inline-block;
+		box-shadow: 0px 0px 8px rgba(0,0,0,0.3);
+		-webkit-box-shadow: 0px 0px 8px rgba(0,0,0,0.3);
+	}
+
+.skingen_sections {										
+	width: 200px;
+	position: absolute;
+	right: 0px;
+	bottom: 0px;
+	top: 36px;
+	overflow: auto;					
+	background: #484848;			
+	border: 1px solid #414141;		
+}									
+
+.skingen_sections.otherClasses {
+	position: relative;
+	width: 100%;
+	top: 5px;
+}
+
+	.skingen_sections h3 {
+		padding: 4px 6px;
+		background: #414141;
+		font-size: 14px;
+		font-weight: 300;
+	}
+	
+	.skingen_toggle_group {
+		width: 12px; height: 12px;
+		display: inline-block;
+		text-decoration: none !important;
+	}
+	
+	.skingen_sections h3.closed .skingen_toggle_group {
+		background: url( ../style_extra/skin_creator/group_closed.png ) no-repeat !important;
+	}
+	.skingen_sections h3.open .skingen_toggle_group {
+		background: url( ../style_extra/skin_creator/group_open.png ) no-repeat !important;
+	}
+	
+.skingen_sections li {				
+	padding: 6px 6px 6px 22px;					
+	margin-bottom: 3px;						
+	cursor: pointer;
+	font-size: 11px;
+	color: #d2d2d2;				
+}									
+									
+	.skingen_sections li:hover{		
+		background: #7b7b7b;		
+	}								
+									
+	.skingen_sections .color {		
+		display: block;				
+		width: 12px;				
+		height: 12px;				
+		margin-right: 8px;			
+		float: right;				
+	}								
+									
+#skingen_toolbar {					
+	padding: 5px 10px;					
+	background: #45484d; /* Old browsers */
+	background: -moz-linear-gradient(top, #45484d 0%, #2b2b2b 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#45484d), color-stop(100%,#2b2b2b)); /* Chrome,Safari4+ */					
+}
+
+	#skingen_toolbar a, .skingen_buttons a {
+		display: inline-block;
+		height: 24px; line-height: 24px;
+		font-size: 11px;
+		color: #d3d3d3 !important;
+		border: 1px solid #2e2e2e;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+		border-radius: 4px;
+		text-decoration: none;
+		padding: 0 10px;
+		background: #45484d; /* Old browsers */
+		background: -moz-linear-gradient(top, #45484d 0%, #2b2b2b 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#45484d), color-stop(100%,#2b2b2b)); /* Chrome,Safari4+ */
+		box-shadow: 0px 1px 0px rgba(255,255,255,0.1) inset;
+		-webkit-box-shadow: 0px 1px 0px rgba(255,255,255,0.1) inset;
+	}
+		#skingen_toolbar a img { position: relative; top: -2px; }
+		#skingen_toolbar a.right { margin-left: 10px; }		
+		#skingen_toolbar a:hover, .skingen_buttons a:hover {
+			color: #fff !important;
+			border-color: 1px solid #202020;
+			box-shadow: 0px 0px 3px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+			-webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.3), 0px 1px 0px rgba(255,255,255,0.1) inset;
+		}
+		
+		#skingen_toolbar a.active {
+			background: #45484d; /* Old browsers */
+			background: -moz-linear-gradient(top, #2b2b2b 0%, #45484d 100%); /* FF3.6+ */
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2b2b2b), color-stop(100%,#45484d)); /* Chrome,Safari4+ */
+			box-shadow: 0px 0px 5px rgba(135,190,239, 0.9);
+			-webkit-box-shadow: 0px 0px 5px rgba(135,190,239, 0.9);
+		}
+									
+.skingen_highlight {				
+	background: rgba(164,57,160,0.5);
+	border: 2px dashed #a439a0;		
+	position: absolute;				
+	z-index: 99999;					
+}									
+									
+.skingen_xray {						
+	border: 1px solid #a43954;		
+	background: rgba(164,57,84,0.4);
+	position: absolute;				
+	z-index: 99999;					
+	box-shadow: 0px 2px 15px rgba(164,57,84,0.4);
+	-webkit-box-shadow: 0px 2px 15px rgba(164,57,84,0.4);
+}									
+
+#skingen_panes {
+	position: absolute;
+	top: 45px;
+	right: 210px; left: 10px;		
+	height: 120px;
+}									
+	.skingen_pane fieldset {		
+		padding: 10px 10px 10px 10px;				
+		background: #434343;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+		border-radius: 5px;
+		position: relative;
+		margin-top: 5px;
+		/*margin-top: 25px;*/
+	}		
+		.skingen_pane fieldset span.legend {
+			display: inline-block;
+			float: left;
+			color: #fff;
+			background: #3a3a3a;
+			padding: 7px 15px;
+			border-radius: 5px;
+			font-size: 11px;
+			width: 50px;
+			text-align: center;
+
+		}
+	
+	.control {
+		margin: 2px 10px;
+	}
+	
+	.skingen_pane h2 {				
+		font-size: 18px;			
+		font-weight: 300;
+	}								
+	.skingen_pane p {				
+		font-size: 12px;			
+		color: #c6c6c6;				
+		margin-bottom: 20px;		
+	}								
+	
+	p.skingen_selector {
+		font-style: italic;
+		font-family: arial, monospace;
+		font-size: 11px;
+		color: #b2b2b2;
+		cursor: help;
+	}
+	
+	.skingen_pane label {
+		font-size: 11px;
+	}
+	
+.skingen_editor input[type=text] {
+	border: 1px solid #000;
+	padding: 2px;
+	border-radius: 2px;
+	width: 90px;
+}
+								
+.skingen_preview {					
+	display: inline-block;			
+	width: 10px; height: 19px;					
+	margin-left: -11px;
+	margin-top: -4px;
+	border-radius: 1px;
+	vertical-align: middle;
+}									
+									
+#skingen_images_editor {			
+	width: 750px;					
+	top: 50px;						
+	right: 100px;					
+}									
+									
+.skingen_image_item {				
+	padding: 10px;					
+	color: #fff;					
+}									
+									
+	.skingen_image_item img {		
+		max-width: 250px;			
+		max-height: 250px;			
+	}								
+	.skingen_image_item input[type=file] {
+		color: #fff;				
+	}								
\ No newline at end of file
diff --git a/upload/public/style_emoticons/default/angry.gif b/upload/public/style_emoticons/default/angry.gif
deleted file mode 100644
index 43d13164..00000000
Binary files a/upload/public/style_emoticons/default/angry.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/angry.png b/upload/public/style_emoticons/default/angry.png
new file mode 100644
index 00000000..98b6c083
Binary files /dev/null and b/upload/public/style_emoticons/default/angry.png differ
diff --git a/upload/public/style_emoticons/default/biggrin.gif b/upload/public/style_emoticons/default/biggrin.gif
deleted file mode 100644
index 15174c49..00000000
Binary files a/upload/public/style_emoticons/default/biggrin.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/biggrin.png b/upload/public/style_emoticons/default/biggrin.png
new file mode 100644
index 00000000..614aee56
Binary files /dev/null and b/upload/public/style_emoticons/default/biggrin.png differ
diff --git a/upload/public/style_emoticons/default/blink.gif b/upload/public/style_emoticons/default/blink.gif
deleted file mode 100644
index 40651db7..00000000
Binary files a/upload/public/style_emoticons/default/blink.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/blink.png b/upload/public/style_emoticons/default/blink.png
new file mode 100644
index 00000000..ea4841dd
Binary files /dev/null and b/upload/public/style_emoticons/default/blink.png differ
diff --git a/upload/public/style_emoticons/default/blush.gif b/upload/public/style_emoticons/default/blush.gif
deleted file mode 100644
index 2e6c5162..00000000
Binary files a/upload/public/style_emoticons/default/blush.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/blush.png b/upload/public/style_emoticons/default/blush.png
new file mode 100644
index 00000000..8242f09b
Binary files /dev/null and b/upload/public/style_emoticons/default/blush.png differ
diff --git a/upload/public/style_emoticons/default/cool.gif b/upload/public/style_emoticons/default/cool.gif
deleted file mode 100644
index 46016dfe..00000000
Binary files a/upload/public/style_emoticons/default/cool.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/cool.png b/upload/public/style_emoticons/default/cool.png
new file mode 100644
index 00000000..6d1612a4
Binary files /dev/null and b/upload/public/style_emoticons/default/cool.png differ
diff --git a/upload/public/style_emoticons/default/dry.gif b/upload/public/style_emoticons/default/dry.gif
deleted file mode 100644
index c42e4b55..00000000
Binary files a/upload/public/style_emoticons/default/dry.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/dry.png b/upload/public/style_emoticons/default/dry.png
new file mode 100644
index 00000000..ff27c444
Binary files /dev/null and b/upload/public/style_emoticons/default/dry.png differ
diff --git a/upload/public/style_emoticons/default/excl.gif b/upload/public/style_emoticons/default/excl.gif
deleted file mode 100644
index 1a8550d0..00000000
Binary files a/upload/public/style_emoticons/default/excl.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/excl.png b/upload/public/style_emoticons/default/excl.png
new file mode 100644
index 00000000..f488bb53
Binary files /dev/null and b/upload/public/style_emoticons/default/excl.png differ
diff --git a/upload/public/style_emoticons/default/happy.gif b/upload/public/style_emoticons/default/happy.gif
deleted file mode 100644
index e2f8b614..00000000
Binary files a/upload/public/style_emoticons/default/happy.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/happy.png b/upload/public/style_emoticons/default/happy.png
new file mode 100644
index 00000000..1786b977
Binary files /dev/null and b/upload/public/style_emoticons/default/happy.png differ
diff --git a/upload/public/style_emoticons/default/huh.gif b/upload/public/style_emoticons/default/huh.gif
deleted file mode 100644
index cd0519e4..00000000
Binary files a/upload/public/style_emoticons/default/huh.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/huh.png b/upload/public/style_emoticons/default/huh.png
new file mode 100644
index 00000000..2dacd73d
Binary files /dev/null and b/upload/public/style_emoticons/default/huh.png differ
diff --git a/upload/public/style_emoticons/default/index.html b/upload/public/style_emoticons/default/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_emoticons/default/index.html
+++ b/upload/public/style_emoticons/default/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_emoticons/default/laugh.gif b/upload/public/style_emoticons/default/laugh.gif
deleted file mode 100644
index a47e1a2d..00000000
Binary files a/upload/public/style_emoticons/default/laugh.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/laugh.png b/upload/public/style_emoticons/default/laugh.png
new file mode 100644
index 00000000..ebe09879
Binary files /dev/null and b/upload/public/style_emoticons/default/laugh.png differ
diff --git a/upload/public/style_emoticons/default/mad.gif b/upload/public/style_emoticons/default/mad.gif
deleted file mode 100644
index 09f9e99a..00000000
Binary files a/upload/public/style_emoticons/default/mad.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/mellow.gif b/upload/public/style_emoticons/default/mellow.gif
deleted file mode 100644
index ed26ebfa..00000000
Binary files a/upload/public/style_emoticons/default/mellow.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/mellow.png b/upload/public/style_emoticons/default/mellow.png
new file mode 100644
index 00000000..696fbde2
Binary files /dev/null and b/upload/public/style_emoticons/default/mellow.png differ
diff --git a/upload/public/style_emoticons/default/ohmy.gif b/upload/public/style_emoticons/default/ohmy.gif
deleted file mode 100644
index c591a683..00000000
Binary files a/upload/public/style_emoticons/default/ohmy.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/ohmy.png b/upload/public/style_emoticons/default/ohmy.png
new file mode 100644
index 00000000..1a887869
Binary files /dev/null and b/upload/public/style_emoticons/default/ohmy.png differ
diff --git a/upload/public/style_emoticons/default/ph34r.gif b/upload/public/style_emoticons/default/ph34r.gif
deleted file mode 100644
index 7569ee16..00000000
Binary files a/upload/public/style_emoticons/default/ph34r.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/ph34r.png b/upload/public/style_emoticons/default/ph34r.png
new file mode 100644
index 00000000..5d562b30
Binary files /dev/null and b/upload/public/style_emoticons/default/ph34r.png differ
diff --git a/upload/public/style_emoticons/default/sad.gif b/upload/public/style_emoticons/default/sad.gif
deleted file mode 100644
index f6976c70..00000000
Binary files a/upload/public/style_emoticons/default/sad.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/sad.png b/upload/public/style_emoticons/default/sad.png
new file mode 100644
index 00000000..9fa63774
Binary files /dev/null and b/upload/public/style_emoticons/default/sad.png differ
diff --git a/upload/public/style_emoticons/default/sleep.gif b/upload/public/style_emoticons/default/sleep.gif
deleted file mode 100644
index 238a93e3..00000000
Binary files a/upload/public/style_emoticons/default/sleep.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/sleep.png b/upload/public/style_emoticons/default/sleep.png
new file mode 100644
index 00000000..c9b00808
Binary files /dev/null and b/upload/public/style_emoticons/default/sleep.png differ
diff --git a/upload/public/style_emoticons/default/smile.gif b/upload/public/style_emoticons/default/smile.gif
deleted file mode 100644
index df1ea285..00000000
Binary files a/upload/public/style_emoticons/default/smile.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/smile.png b/upload/public/style_emoticons/default/smile.png
new file mode 100644
index 00000000..cc965e8c
Binary files /dev/null and b/upload/public/style_emoticons/default/smile.png differ
diff --git a/upload/public/style_emoticons/default/tongue.gif b/upload/public/style_emoticons/default/tongue.gif
deleted file mode 100644
index 5429ec12..00000000
Binary files a/upload/public/style_emoticons/default/tongue.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/tongue.png b/upload/public/style_emoticons/default/tongue.png
new file mode 100644
index 00000000..dd1ac788
Binary files /dev/null and b/upload/public/style_emoticons/default/tongue.png differ
diff --git a/upload/public/style_emoticons/default/unsure.gif b/upload/public/style_emoticons/default/unsure.gif
deleted file mode 100644
index 049cfc17..00000000
Binary files a/upload/public/style_emoticons/default/unsure.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/unsure.png b/upload/public/style_emoticons/default/unsure.png
new file mode 100644
index 00000000..50ee79e5
Binary files /dev/null and b/upload/public/style_emoticons/default/unsure.png differ
diff --git a/upload/public/style_emoticons/default/wacko.gif b/upload/public/style_emoticons/default/wacko.gif
deleted file mode 100644
index c293c4c8..00000000
Binary files a/upload/public/style_emoticons/default/wacko.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/wacko.png b/upload/public/style_emoticons/default/wacko.png
new file mode 100644
index 00000000..6505635d
Binary files /dev/null and b/upload/public/style_emoticons/default/wacko.png differ
diff --git a/upload/public/style_emoticons/default/wink.gif b/upload/public/style_emoticons/default/wink.gif
deleted file mode 100644
index 7d7745ce..00000000
Binary files a/upload/public/style_emoticons/default/wink.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/wink.png b/upload/public/style_emoticons/default/wink.png
new file mode 100644
index 00000000..817ab1ab
Binary files /dev/null and b/upload/public/style_emoticons/default/wink.png differ
diff --git a/upload/public/style_emoticons/default/wub.gif b/upload/public/style_emoticons/default/wub.gif
deleted file mode 100644
index 754fa21c..00000000
Binary files a/upload/public/style_emoticons/default/wub.gif and /dev/null differ
diff --git a/upload/public/style_emoticons/default/wub.png b/upload/public/style_emoticons/default/wub.png
new file mode 100644
index 00000000..71423d11
Binary files /dev/null and b/upload/public/style_emoticons/default/wub.png differ
diff --git a/upload/public/style_emoticons/index.html b/upload/public/style_emoticons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_emoticons/index.html
+++ b/upload/public/style_emoticons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/app_icons/index.html b/upload/public/style_extra/app_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/app_icons/index.html
+++ b/upload/public/style_extra/app_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/bbcode_icons/index.html b/upload/public/style_extra/bbcode_icons/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/style_extra/bbcode_icons/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_extra/bbcode_icons/twitter.png b/upload/public/style_extra/bbcode_icons/twitter.png
new file mode 100644
index 00000000..7f392f13
Binary files /dev/null and b/upload/public/style_extra/bbcode_icons/twitter.png differ
diff --git a/upload/public/style_extra/blog_bookmarks/index.html b/upload/public/style_extra/blog_bookmarks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/blog_bookmarks/index.html
+++ b/upload/public/style_extra/blog_bookmarks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/cprofile_icons/index.html b/upload/public/style_extra/cprofile_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/cprofile_icons/index.html
+++ b/upload/public/style_extra/cprofile_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/downloads_traffic_images/browser_chrome.png b/upload/public/style_extra/downloads_traffic_images/browser_chrome.png
new file mode 100644
index 00000000..f594eda6
Binary files /dev/null and b/upload/public/style_extra/downloads_traffic_images/browser_chrome.png differ
diff --git a/upload/public/style_extra/downloads_traffic_images/index.html b/upload/public/style_extra/downloads_traffic_images/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/downloads_traffic_images/index.html
+++ b/upload/public/style_extra/downloads_traffic_images/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/gallery_media_types/index.html b/upload/public/style_extra/gallery_media_types/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/gallery_media_types/index.html
+++ b/upload/public/style_extra/gallery_media_types/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/index.html b/upload/public/style_extra/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/index.html
+++ b/upload/public/style_extra/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/mime_types/index.html b/upload/public/style_extra/mime_types/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/mime_types/index.html
+++ b/upload/public/style_extra/mime_types/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/post_icons/index.html b/upload/public/style_extra/post_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/post_icons/index.html
+++ b/upload/public/style_extra/post_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/report_icons/index.html b/upload/public/style_extra/report_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/report_icons/index.html
+++ b/upload/public/style_extra/report_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/reputation_icons/index.html b/upload/public/style_extra/reputation_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/reputation_icons/index.html
+++ b/upload/public/style_extra/reputation_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/sharelinks/googleplusone.png b/upload/public/style_extra/sharelinks/googleplusone.png
new file mode 100644
index 00000000..db54773a
Binary files /dev/null and b/upload/public/style_extra/sharelinks/googleplusone.png differ
diff --git a/upload/public/style_extra/sharelinks/index.html b/upload/public/style_extra/sharelinks/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/sharelinks/index.html
+++ b/upload/public/style_extra/sharelinks/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/signin/index.html b/upload/public/style_extra/signin/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/signin/index.html
+++ b/upload/public/style_extra/signin/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_extra/skin_creator/background.png b/upload/public/style_extra/skin_creator/background.png
new file mode 100644
index 00000000..fe618fc9
Binary files /dev/null and b/upload/public/style_extra/skin_creator/background.png differ
diff --git a/upload/public/style_extra/skin_creator/border-color.png b/upload/public/style_extra/skin_creator/border-color.png
new file mode 100644
index 00000000..04113f0d
Binary files /dev/null and b/upload/public/style_extra/skin_creator/border-color.png differ
diff --git a/upload/public/style_extra/skin_creator/box-shadow.png b/upload/public/style_extra/skin_creator/box-shadow.png
new file mode 100644
index 00000000..8810d192
Binary files /dev/null and b/upload/public/style_extra/skin_creator/box-shadow.png differ
diff --git a/upload/public/style_extra/skin_creator/build.png b/upload/public/style_extra/skin_creator/build.png
new file mode 100644
index 00000000..7b9622ac
Binary files /dev/null and b/upload/public/style_extra/skin_creator/build.png differ
diff --git a/upload/public/style_extra/skin_creator/color-picker.png b/upload/public/style_extra/skin_creator/color-picker.png
new file mode 100644
index 00000000..290baf6a
Binary files /dev/null and b/upload/public/style_extra/skin_creator/color-picker.png differ
diff --git a/upload/public/style_extra/skin_creator/color.png b/upload/public/style_extra/skin_creator/color.png
new file mode 100644
index 00000000..98bca057
Binary files /dev/null and b/upload/public/style_extra/skin_creator/color.png differ
diff --git a/upload/public/style_extra/skin_creator/colorize.png b/upload/public/style_extra/skin_creator/colorize.png
new file mode 100644
index 00000000..0476be66
Binary files /dev/null and b/upload/public/style_extra/skin_creator/colorize.png differ
diff --git a/upload/public/style_extra/skin_creator/delete.png b/upload/public/style_extra/skin_creator/delete.png
new file mode 100644
index 00000000..f37cf418
Binary files /dev/null and b/upload/public/style_extra/skin_creator/delete.png differ
diff --git a/upload/public/style_extra/skin_creator/group_closed.png b/upload/public/style_extra/skin_creator/group_closed.png
new file mode 100644
index 00000000..acad3e27
Binary files /dev/null and b/upload/public/style_extra/skin_creator/group_closed.png differ
diff --git a/upload/public/style_extra/skin_creator/group_open.png b/upload/public/style_extra/skin_creator/group_open.png
new file mode 100644
index 00000000..21bb7135
Binary files /dev/null and b/upload/public/style_extra/skin_creator/group_open.png differ
diff --git a/upload/public/style_extra/skin_creator/select_element.png b/upload/public/style_extra/skin_creator/select_element.png
new file mode 100644
index 00000000..7bd5830a
Binary files /dev/null and b/upload/public/style_extra/skin_creator/select_element.png differ
diff --git a/upload/public/style_extra/skin_creator/settings.png b/upload/public/style_extra/skin_creator/settings.png
new file mode 100644
index 00000000..b0d60620
Binary files /dev/null and b/upload/public/style_extra/skin_creator/settings.png differ
diff --git a/upload/public/style_extra/skin_creator/show_locations.png b/upload/public/style_extra/skin_creator/show_locations.png
new file mode 100644
index 00000000..44bc6cb8
Binary files /dev/null and b/upload/public/style_extra/skin_creator/show_locations.png differ
diff --git a/upload/public/style_extra/team_icons/index.html b/upload/public/style_extra/team_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_extra/team_icons/index.html
+++ b/upload/public/style_extra/team_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/index.html b/upload/public/style_images/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/index.html
+++ b/upload/public/style_images/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/ajax_loading.gif b/upload/public/style_images/master/ajax_loading.gif
new file mode 100644
index 00000000..2d841702
Binary files /dev/null and b/upload/public/style_images/master/ajax_loading.gif differ
diff --git a/upload/public/style_images/master/branding_bg.png b/upload/public/style_images/master/branding_bg.png
index d6ca52ff..1b9fce42 100644
Binary files a/upload/public/style_images/master/branding_bg.png and b/upload/public/style_images/master/branding_bg.png differ
diff --git a/upload/public/style_images/master/chat/index.html b/upload/public/style_images/master/chat/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/style_images/master/chat/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/chat/window_open.png b/upload/public/style_images/master/chat/window_open.png
new file mode 100644
index 00000000..647592f2
Binary files /dev/null and b/upload/public/style_images/master/chat/window_open.png differ
diff --git a/upload/public/style_images/master/cross_sml.png b/upload/public/style_images/master/cross_sml.png
new file mode 100644
index 00000000..4e57006b
Binary files /dev/null and b/upload/public/style_images/master/cross_sml.png differ
diff --git a/upload/public/style_images/master/desc_more.png b/upload/public/style_images/master/desc_more.png
new file mode 100644
index 00000000..1a165dba
Binary files /dev/null and b/upload/public/style_images/master/desc_more.png differ
diff --git a/upload/public/style_images/master/download.png b/upload/public/style_images/master/download.png
new file mode 100644
index 00000000..e49ba073
Binary files /dev/null and b/upload/public/style_images/master/download.png differ
diff --git a/upload/public/style_images/master/editor/index.html b/upload/public/style_images/master/editor/index.html
new file mode 100644
index 00000000..bae2d5ed
--- /dev/null
+++ b/upload/public/style_images/master/editor/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com/">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/editor/next.png b/upload/public/style_images/master/editor/next.png
new file mode 100644
index 00000000..0e7104da
Binary files /dev/null and b/upload/public/style_images/master/editor/next.png differ
diff --git a/upload/public/style_images/master/editor/prev.png b/upload/public/style_images/master/editor/prev.png
new file mode 100644
index 00000000..067178fc
Binary files /dev/null and b/upload/public/style_images/master/editor/prev.png differ
diff --git a/upload/public/style_images/master/editor/toolbar_bg.png b/upload/public/style_images/master/editor/toolbar_bg.png
new file mode 100644
index 00000000..2e264b02
Binary files /dev/null and b/upload/public/style_images/master/editor/toolbar_bg.png differ
diff --git a/upload/public/style_images/master/f_cat_read.png b/upload/public/style_images/master/f_cat_read.png
deleted file mode 100644
index 9a6ce7f0..00000000
Binary files a/upload/public/style_images/master/f_cat_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_cat_unread.png b/upload/public/style_images/master/f_cat_unread.png
deleted file mode 100644
index 4be2951f..00000000
Binary files a/upload/public/style_images/master/f_cat_unread.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_icon.png b/upload/public/style_images/master/f_icon.png
new file mode 100644
index 00000000..d324351d
Binary files /dev/null and b/upload/public/style_images/master/f_icon.png differ
diff --git a/upload/public/style_images/master/f_icon_read.png b/upload/public/style_images/master/f_icon_read.png
new file mode 100644
index 00000000..30024698
Binary files /dev/null and b/upload/public/style_images/master/f_icon_read.png differ
diff --git a/upload/public/style_images/master/f_locked.png b/upload/public/style_images/master/f_locked.png
deleted file mode 100644
index 0d743acd..00000000
Binary files a/upload/public/style_images/master/f_locked.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_pass_read.png b/upload/public/style_images/master/f_pass_read.png
deleted file mode 100644
index ff17c25c..00000000
Binary files a/upload/public/style_images/master/f_pass_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_pass_unread.png b/upload/public/style_images/master/f_pass_unread.png
deleted file mode 100644
index 73795be9..00000000
Binary files a/upload/public/style_images/master/f_pass_unread.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_read.png b/upload/public/style_images/master/f_read.png
deleted file mode 100644
index eb1437f0..00000000
Binary files a/upload/public/style_images/master/f_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/f_redirect.png b/upload/public/style_images/master/f_redirect.png
index 9d4b1ce1..ed9e649d 100644
Binary files a/upload/public/style_images/master/f_redirect.png and b/upload/public/style_images/master/f_redirect.png differ
diff --git a/upload/public/style_images/master/f_unread.png b/upload/public/style_images/master/f_unread.png
deleted file mode 100644
index 6afe2bb7..00000000
Binary files a/upload/public/style_images/master/f_unread.png and /dev/null differ
diff --git a/upload/public/style_images/master/header_dropdown.png b/upload/public/style_images/master/header_dropdown.png
new file mode 100644
index 00000000..37cf3f57
Binary files /dev/null and b/upload/public/style_images/master/header_dropdown.png differ
diff --git a/upload/public/style_images/master/icon_attach.png b/upload/public/style_images/master/icon_attach.png
new file mode 100644
index 00000000..da50cf1d
Binary files /dev/null and b/upload/public/style_images/master/icon_attach.png differ
diff --git a/upload/public/style_images/master/icon_chat.png b/upload/public/style_images/master/icon_chat.png
new file mode 100644
index 00000000..70eaebef
Binary files /dev/null and b/upload/public/style_images/master/icon_chat.png differ
diff --git a/upload/public/style_images/master/icon_check.png b/upload/public/style_images/master/icon_check.png
new file mode 100644
index 00000000..9e7fbbd5
Binary files /dev/null and b/upload/public/style_images/master/icon_check.png differ
diff --git a/upload/public/style_images/master/icon_check_white.png b/upload/public/style_images/master/icon_check_white.png
new file mode 100644
index 00000000..eaf0ac47
Binary files /dev/null and b/upload/public/style_images/master/icon_check_white.png differ
diff --git a/upload/public/style_images/master/icon_clock_lrg.png b/upload/public/style_images/master/icon_clock_lrg.png
new file mode 100644
index 00000000..bd00e1e9
Binary files /dev/null and b/upload/public/style_images/master/icon_clock_lrg.png differ
diff --git a/upload/public/style_images/master/icon_day.png b/upload/public/style_images/master/icon_day.png
new file mode 100644
index 00000000..f2a00830
Binary files /dev/null and b/upload/public/style_images/master/icon_day.png differ
diff --git a/upload/public/style_images/master/icon_expand_close.png b/upload/public/style_images/master/icon_expand_close.png
new file mode 100644
index 00000000..9c346ad9
Binary files /dev/null and b/upload/public/style_images/master/icon_expand_close.png differ
diff --git a/upload/public/style_images/master/icon_follow_anon.png b/upload/public/style_images/master/icon_follow_anon.png
new file mode 100644
index 00000000..75a41ac3
Binary files /dev/null and b/upload/public/style_images/master/icon_follow_anon.png differ
diff --git a/upload/public/style_images/master/icon_follow_freq.png b/upload/public/style_images/master/icon_follow_freq.png
new file mode 100644
index 00000000..002850b9
Binary files /dev/null and b/upload/public/style_images/master/icon_follow_freq.png differ
diff --git a/upload/public/style_images/master/icon_follow_freq_none.png b/upload/public/style_images/master/icon_follow_freq_none.png
new file mode 100644
index 00000000..0398554f
Binary files /dev/null and b/upload/public/style_images/master/icon_follow_freq_none.png differ
diff --git a/upload/public/style_images/master/icon_inbox.png b/upload/public/style_images/master/icon_inbox.png
new file mode 100644
index 00000000..cbc7c0bf
Binary files /dev/null and b/upload/public/style_images/master/icon_inbox.png differ
diff --git a/upload/public/style_images/master/icon_lock.png b/upload/public/style_images/master/icon_lock.png
new file mode 100644
index 00000000..27b354c4
Binary files /dev/null and b/upload/public/style_images/master/icon_lock.png differ
diff --git a/upload/public/style_images/master/icon_month.png b/upload/public/style_images/master/icon_month.png
new file mode 100644
index 00000000..79fb12bc
Binary files /dev/null and b/upload/public/style_images/master/icon_month.png differ
diff --git a/upload/public/style_images/master/icon_moved.png b/upload/public/style_images/master/icon_moved.png
new file mode 100644
index 00000000..2482409f
Binary files /dev/null and b/upload/public/style_images/master/icon_moved.png differ
diff --git a/upload/public/style_images/master/icon_notify.png b/upload/public/style_images/master/icon_notify.png
new file mode 100644
index 00000000..b3918ae9
Binary files /dev/null and b/upload/public/style_images/master/icon_notify.png differ
diff --git a/upload/public/style_images/master/icon_notify_types.png b/upload/public/style_images/master/icon_notify_types.png
new file mode 100644
index 00000000..1ea9aea9
Binary files /dev/null and b/upload/public/style_images/master/icon_notify_types.png differ
diff --git a/upload/public/style_images/master/icon_quicknav.png b/upload/public/style_images/master/icon_quicknav.png
new file mode 100644
index 00000000..d33b1ff4
Binary files /dev/null and b/upload/public/style_images/master/icon_quicknav.png differ
diff --git a/upload/public/style_images/master/icon_refresh.png b/upload/public/style_images/master/icon_refresh.png
new file mode 100644
index 00000000..03c63ed3
Binary files /dev/null and b/upload/public/style_images/master/icon_refresh.png differ
diff --git a/upload/public/style_images/master/icon_search.png b/upload/public/style_images/master/icon_search.png
new file mode 100644
index 00000000..b5dce796
Binary files /dev/null and b/upload/public/style_images/master/icon_search.png differ
diff --git a/upload/public/style_images/master/icon_star.png b/upload/public/style_images/master/icon_star.png
new file mode 100644
index 00000000..6c72f6c4
Binary files /dev/null and b/upload/public/style_images/master/icon_star.png differ
diff --git a/upload/public/style_images/master/icon_stat.png b/upload/public/style_images/master/icon_stat.png
new file mode 100644
index 00000000..710b2006
Binary files /dev/null and b/upload/public/style_images/master/icon_stat.png differ
diff --git a/upload/public/style_images/master/icon_tag.png b/upload/public/style_images/master/icon_tag.png
new file mode 100644
index 00000000..dd8eface
Binary files /dev/null and b/upload/public/style_images/master/icon_tag.png differ
diff --git a/upload/public/style_images/master/icon_timewarning.png b/upload/public/style_images/master/icon_timewarning.png
new file mode 100644
index 00000000..5cd093a1
Binary files /dev/null and b/upload/public/style_images/master/icon_timewarning.png differ
diff --git a/upload/public/style_images/master/icon_user.png b/upload/public/style_images/master/icon_user.png
new file mode 100644
index 00000000..49f93407
Binary files /dev/null and b/upload/public/style_images/master/icon_user.png differ
diff --git a/upload/public/style_images/master/icon_users.png b/upload/public/style_images/master/icon_users.png
new file mode 100644
index 00000000..de86742f
Binary files /dev/null and b/upload/public/style_images/master/icon_users.png differ
diff --git a/upload/public/style_images/master/icon_warning.png b/upload/public/style_images/master/icon_warning.png
new file mode 100644
index 00000000..5df5cf01
Binary files /dev/null and b/upload/public/style_images/master/icon_warning.png differ
diff --git a/upload/public/style_images/master/icon_week.png b/upload/public/style_images/master/icon_week.png
new file mode 100644
index 00000000..cd4fadee
Binary files /dev/null and b/upload/public/style_images/master/icon_week.png differ
diff --git a/upload/public/style_images/master/icons/index.html b/upload/public/style_images/master/icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/icons/index.html
+++ b/upload/public/style_images/master/icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/index.html b/upload/public/style_images/master/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/index.html
+++ b/upload/public/style_images/master/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/lightbox/index.html b/upload/public/style_images/master/lightbox/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/lightbox/index.html
+++ b/upload/public/style_images/master/lightbox/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/like_button.png b/upload/public/style_images/master/like_button.png
new file mode 100644
index 00000000..687bd88c
Binary files /dev/null and b/upload/public/style_images/master/like_button.png differ
diff --git a/upload/public/style_images/master/likes/calendar.png b/upload/public/style_images/master/likes/calendar.png
new file mode 100644
index 00000000..39b0ba4a
Binary files /dev/null and b/upload/public/style_images/master/likes/calendar.png differ
diff --git a/upload/public/style_images/master/likes/forums.png b/upload/public/style_images/master/likes/forums.png
new file mode 100644
index 00000000..daf24e05
Binary files /dev/null and b/upload/public/style_images/master/likes/forums.png differ
diff --git a/upload/public/style_images/master/likes/index.html b/upload/public/style_images/master/likes/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/likes/index.html
+++ b/upload/public/style_images/master/likes/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/loginmethods/index.html b/upload/public/style_images/master/loginmethods/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/loginmethods/index.html
+++ b/upload/public/style_images/master/loginmethods/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/logo.png b/upload/public/style_images/master/logo.png
index 52e7c646..ba8b05b4 100644
Binary files a/upload/public/style_images/master/logo.png and b/upload/public/style_images/master/logo.png differ
diff --git a/upload/public/style_images/master/logo_transparent.png b/upload/public/style_images/master/logo_transparent.png
new file mode 100644
index 00000000..ee29cc9f
Binary files /dev/null and b/upload/public/style_images/master/logo_transparent.png differ
diff --git a/upload/public/style_images/master/maintitle.png b/upload/public/style_images/master/maintitle.png
new file mode 100644
index 00000000..63bbc747
Binary files /dev/null and b/upload/public/style_images/master/maintitle.png differ
diff --git a/upload/public/style_images/master/moderation_cog.png b/upload/public/style_images/master/moderation_cog.png
new file mode 100644
index 00000000..4ed601bd
Binary files /dev/null and b/upload/public/style_images/master/moderation_cog.png differ
diff --git a/upload/public/style_images/master/new_post.png b/upload/public/style_images/master/new_post.png
index 0ee1415e..d4627a8b 100644
Binary files a/upload/public/style_images/master/new_post.png and b/upload/public/style_images/master/new_post.png differ
diff --git a/upload/public/style_images/master/nexus/cards/_visa.png b/upload/public/style_images/master/nexus/cards/_visa.png
new file mode 100644
index 00000000..9f401d8f
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/_visa.png differ
diff --git a/upload/public/style_images/master/nexus/cards/americanexpress.png b/upload/public/style_images/master/nexus/cards/americanexpress.png
new file mode 100644
index 00000000..b38c687c
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/americanexpress.png differ
diff --git a/upload/public/style_images/master/nexus/cards/dinersclub.png b/upload/public/style_images/master/nexus/cards/dinersclub.png
new file mode 100644
index 00000000..9f82e8fa
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/dinersclub.png differ
diff --git a/upload/public/style_images/master/nexus/cards/discover.png b/upload/public/style_images/master/nexus/cards/discover.png
new file mode 100644
index 00000000..80f45c83
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/discover.png differ
diff --git a/upload/public/style_images/master/nexus/cards/index.html b/upload/public/style_images/master/nexus/cards/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/style_images/master/nexus/cards/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/nexus/cards/jcb.png b/upload/public/style_images/master/nexus/cards/jcb.png
new file mode 100644
index 00000000..3614a295
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/jcb.png differ
diff --git a/upload/public/style_images/master/nexus/cards/maestroswitch.png b/upload/public/style_images/master/nexus/cards/maestroswitch.png
new file mode 100644
index 00000000..74dbfea5
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/maestroswitch.png differ
diff --git a/upload/public/style_images/master/nexus/cards/mastercard.png b/upload/public/style_images/master/nexus/cards/mastercard.png
new file mode 100644
index 00000000..b8558403
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/mastercard.png differ
diff --git a/upload/public/style_images/master/nexus/cards/solo.png b/upload/public/style_images/master/nexus/cards/solo.png
new file mode 100644
index 00000000..b20d5186
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/solo.png differ
diff --git a/upload/public/style_images/master/nexus/cards/visa.png b/upload/public/style_images/master/nexus/cards/visa.png
new file mode 100644
index 00000000..7db3b45a
Binary files /dev/null and b/upload/public/style_images/master/nexus/cards/visa.png differ
diff --git a/upload/public/style_images/master/nexus/cross.png b/upload/public/style_images/master/nexus/cross.png
new file mode 100644
index 00000000..4e57006b
Binary files /dev/null and b/upload/public/style_images/master/nexus/cross.png differ
diff --git a/upload/public/style_images/master/nexus/dropdown.png b/upload/public/style_images/master/nexus/dropdown.png
new file mode 100644
index 00000000..c90d4a16
Binary files /dev/null and b/upload/public/style_images/master/nexus/dropdown.png differ
diff --git a/upload/public/style_images/master/nexus/gateways/index.html b/upload/public/style_images/master/nexus/gateways/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/nexus/gateways/index.html
+++ b/upload/public/style_images/master/nexus/gateways/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/nexus/index.html b/upload/public/style_images/master/nexus/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/nexus/index.html
+++ b/upload/public/style_images/master/nexus/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/nexus/lkey.png b/upload/public/style_images/master/nexus/lkey.png
new file mode 100644
index 00000000..9143cb29
Binary files /dev/null and b/upload/public/style_images/master/nexus/lkey.png differ
diff --git a/upload/public/style_images/master/nexus/print.png b/upload/public/style_images/master/nexus/print.png
new file mode 100644
index 00000000..35414155
Binary files /dev/null and b/upload/public/style_images/master/nexus/print.png differ
diff --git a/upload/public/style_images/master/nexus/support_pips/index.html b/upload/public/style_images/master/nexus/support_pips/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/nexus/support_pips/index.html
+++ b/upload/public/style_images/master/nexus/support_pips/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/notifications/index.html b/upload/public/style_images/master/notifications/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/notifications/index.html
+++ b/upload/public/style_images/master/notifications/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/notifications/notify_calendar.png b/upload/public/style_images/master/notifications/notify_calendar.png
new file mode 100644
index 00000000..39b0ba4a
Binary files /dev/null and b/upload/public/style_images/master/notifications/notify_calendar.png differ
diff --git a/upload/public/style_images/master/notifications/notify_nexus_commission.png b/upload/public/style_images/master/notifications/notify_nexus_commission.png
index 42c52d05..94608c2b 100644
Binary files a/upload/public/style_images/master/notifications/notify_nexus_commission.png and b/upload/public/style_images/master/notifications/notify_nexus_commission.png differ
diff --git a/upload/public/style_images/master/notifications/notify_nexus_invoice.png b/upload/public/style_images/master/notifications/notify_nexus_invoice.png
index d0000dfc..f4b3cc69 100644
Binary files a/upload/public/style_images/master/notifications/notify_nexus_invoice.png and b/upload/public/style_images/master/notifications/notify_nexus_invoice.png differ
diff --git a/upload/public/style_images/master/notifications/notify_nexus_invoice_expire.png b/upload/public/style_images/master/notifications/notify_nexus_invoice_expire.png
index 336442d4..f4b3cc69 100644
Binary files a/upload/public/style_images/master/notifications/notify_nexus_invoice_expire.png and b/upload/public/style_images/master/notifications/notify_nexus_invoice_expire.png differ
diff --git a/upload/public/style_images/master/notifications/notify_nexus_shipped.png b/upload/public/style_images/master/notifications/notify_nexus_shipped.png
index 02b4e87e..e85f260a 100644
Binary files a/upload/public/style_images/master/notifications/notify_nexus_shipped.png and b/upload/public/style_images/master/notifications/notify_nexus_shipped.png differ
diff --git a/upload/public/style_images/master/notifications/notify_nexus_support.png b/upload/public/style_images/master/notifications/notify_nexus_support.png
index c879e1a6..2fb98bf5 100644
Binary files a/upload/public/style_images/master/notifications/notify_nexus_support.png and b/upload/public/style_images/master/notifications/notify_nexus_support.png differ
diff --git a/upload/public/style_images/master/post_button_left.png b/upload/public/style_images/master/post_button_left.png
deleted file mode 100644
index d9028ccc..00000000
Binary files a/upload/public/style_images/master/post_button_left.png and /dev/null differ
diff --git a/upload/public/style_images/master/post_button_right.png b/upload/public/style_images/master/post_button_right.png
deleted file mode 100644
index 8adcb6de..00000000
Binary files a/upload/public/style_images/master/post_button_right.png and /dev/null differ
diff --git a/upload/public/style_images/master/profile/default_large.png b/upload/public/style_images/master/profile/default_large.png
index edffc4b7..f331a69d 100644
Binary files a/upload/public/style_images/master/profile/default_large.png and b/upload/public/style_images/master/profile/default_large.png differ
diff --git a/upload/public/style_images/master/profile/index.html b/upload/public/style_images/master/profile/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/profile/index.html
+++ b/upload/public/style_images/master/profile/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/rep_down.png b/upload/public/style_images/master/rep_down.png
new file mode 100644
index 00000000..7c85ca4d
Binary files /dev/null and b/upload/public/style_images/master/rep_down.png differ
diff --git a/upload/public/style_images/master/rep_up.png b/upload/public/style_images/master/rep_up.png
new file mode 100644
index 00000000..d8a6f88f
Binary files /dev/null and b/upload/public/style_images/master/rep_up.png differ
diff --git a/upload/public/style_images/master/reports/index.html b/upload/public/style_images/master/reports/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/reports/index.html
+++ b/upload/public/style_images/master/reports/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/rte_icons/index.html b/upload/public/style_images/master/rte_icons/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/rte_icons/index.html
+++ b/upload/public/style_images/master/rte_icons/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/sharedmedia/entries.png b/upload/public/style_images/master/sharedmedia/entries.png
new file mode 100644
index 00000000..a936d4b1
Binary files /dev/null and b/upload/public/style_images/master/sharedmedia/entries.png differ
diff --git a/upload/public/style_images/master/sharedmedia/events.png b/upload/public/style_images/master/sharedmedia/events.png
new file mode 100644
index 00000000..96bebd1e
Binary files /dev/null and b/upload/public/style_images/master/sharedmedia/events.png differ
diff --git a/upload/public/style_images/master/sharedmedia/index.html b/upload/public/style_images/master/sharedmedia/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/style_images/master/sharedmedia/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/star_off.png b/upload/public/style_images/master/star_off.png
new file mode 100644
index 00000000..3588a5d2
Binary files /dev/null and b/upload/public/style_images/master/star_off.png differ
diff --git a/upload/public/style_images/master/star_rated.png b/upload/public/style_images/master/star_rated.png
new file mode 100644
index 00000000..5b0fc59e
Binary files /dev/null and b/upload/public/style_images/master/star_rated.png differ
diff --git a/upload/public/style_images/master/stems/index.html b/upload/public/style_images/master/stems/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/master/stems/index.html
+++ b/upload/public/style_images/master/stems/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/stems/profile_status_stem.png b/upload/public/style_images/master/stems/profile_status_stem.png
new file mode 100644
index 00000000..01e73eb1
Binary files /dev/null and b/upload/public/style_images/master/stems/profile_status_stem.png differ
diff --git a/upload/public/style_images/master/stems/profile_status_stem_r.png b/upload/public/style_images/master/stems/profile_status_stem_r.png
new file mode 100644
index 00000000..85131be8
Binary files /dev/null and b/upload/public/style_images/master/stems/profile_status_stem_r.png differ
diff --git a/upload/public/style_images/master/stems/tooltip_bottom.png b/upload/public/style_images/master/stems/tooltip_bottom.png
new file mode 100644
index 00000000..652132a0
Binary files /dev/null and b/upload/public/style_images/master/stems/tooltip_bottom.png differ
diff --git a/upload/public/style_images/master/stems/tooltip_left.png b/upload/public/style_images/master/stems/tooltip_left.png
new file mode 100644
index 00000000..62efa6d4
Binary files /dev/null and b/upload/public/style_images/master/stems/tooltip_left.png differ
diff --git a/upload/public/style_images/master/stems/tooltip_right.png b/upload/public/style_images/master/stems/tooltip_right.png
new file mode 100644
index 00000000..19699131
Binary files /dev/null and b/upload/public/style_images/master/stems/tooltip_right.png differ
diff --git a/upload/public/style_images/master/stems/tooltip_top.png b/upload/public/style_images/master/stems/tooltip_top.png
new file mode 100644
index 00000000..48dbeb5f
Binary files /dev/null and b/upload/public/style_images/master/stems/tooltip_top.png differ
diff --git a/upload/public/style_images/master/subforum_stem.png b/upload/public/style_images/master/subforum_stem.png
new file mode 100644
index 00000000..cadcdd24
Binary files /dev/null and b/upload/public/style_images/master/subforum_stem.png differ
diff --git a/upload/public/style_images/master/subscriptions/gateway_2checkout.png b/upload/public/style_images/master/subscriptions/gateway_2checkout.png
deleted file mode 100644
index 0762b5a3..00000000
Binary files a/upload/public/style_images/master/subscriptions/gateway_2checkout.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/gateway_default.png b/upload/public/style_images/master/subscriptions/gateway_default.png
deleted file mode 100644
index 89207350..00000000
Binary files a/upload/public/style_images/master/subscriptions/gateway_default.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/gateway_manual.png b/upload/public/style_images/master/subscriptions/gateway_manual.png
deleted file mode 100644
index 92ac2e40..00000000
Binary files a/upload/public/style_images/master/subscriptions/gateway_manual.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/gateway_paypal.png b/upload/public/style_images/master/subscriptions/gateway_paypal.png
deleted file mode 100644
index 8d3711bf..00000000
Binary files a/upload/public/style_images/master/subscriptions/gateway_paypal.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/gateway_safshop.png b/upload/public/style_images/master/subscriptions/gateway_safshop.png
deleted file mode 100644
index 71434843..00000000
Binary files a/upload/public/style_images/master/subscriptions/gateway_safshop.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/index.html b/upload/public/style_images/master/subscriptions/index.html
deleted file mode 100644
index dfdb4ca9..00000000
--- a/upload/public/style_images/master/subscriptions/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/upload/public/style_images/master/subscriptions/subs_current.png b/upload/public/style_images/master/subscriptions/subs_current.png
deleted file mode 100644
index bfed1370..00000000
Binary files a/upload/public/style_images/master/subscriptions/subs_current.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/subs_error.png b/upload/public/style_images/master/subscriptions/subs_error.png
deleted file mode 100644
index 7a4266d1..00000000
Binary files a/upload/public/style_images/master/subscriptions/subs_error.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/subs_expired.png b/upload/public/style_images/master/subscriptions/subs_expired.png
deleted file mode 100644
index 1ff9b8be..00000000
Binary files a/upload/public/style_images/master/subscriptions/subs_expired.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/subs_new.png b/upload/public/style_images/master/subscriptions/subs_new.png
deleted file mode 100644
index 46477155..00000000
Binary files a/upload/public/style_images/master/subscriptions/subs_new.png and /dev/null differ
diff --git a/upload/public/style_images/master/subscriptions/subs_upgrade.png b/upload/public/style_images/master/subscriptions/subs_upgrade.png
deleted file mode 100644
index 895336b3..00000000
Binary files a/upload/public/style_images/master/subscriptions/subs_upgrade.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_announcement.png b/upload/public/style_images/master/t_announcement.png
index 83c8fd34..22d522ea 100644
Binary files a/upload/public/style_images/master/t_announcement.png and b/upload/public/style_images/master/t_announcement.png differ
diff --git a/upload/public/style_images/master/t_closed.png b/upload/public/style_images/master/t_closed.png
deleted file mode 100644
index eb23837d..00000000
Binary files a/upload/public/style_images/master/t_closed.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_hot_read.png b/upload/public/style_images/master/t_hot_read.png
deleted file mode 100644
index 4814b571..00000000
Binary files a/upload/public/style_images/master/t_hot_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_hot_read_dot.png b/upload/public/style_images/master/t_hot_read_dot.png
deleted file mode 100644
index d9a8b697..00000000
Binary files a/upload/public/style_images/master/t_hot_read_dot.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_hot_unread.png b/upload/public/style_images/master/t_hot_unread.png
deleted file mode 100644
index a500db18..00000000
Binary files a/upload/public/style_images/master/t_hot_unread.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_hot_unread_dot.png b/upload/public/style_images/master/t_hot_unread_dot.png
deleted file mode 100644
index a3cf2081..00000000
Binary files a/upload/public/style_images/master/t_hot_unread_dot.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_locked.png b/upload/public/style_images/master/t_locked.png
new file mode 100644
index 00000000..61aa8c7f
Binary files /dev/null and b/upload/public/style_images/master/t_locked.png differ
diff --git a/upload/public/style_images/master/t_moved.png b/upload/public/style_images/master/t_moved.png
index 07eb78af..2482409f 100644
Binary files a/upload/public/style_images/master/t_moved.png and b/upload/public/style_images/master/t_moved.png differ
diff --git a/upload/public/style_images/master/t_new.png b/upload/public/style_images/master/t_new.png
new file mode 100644
index 00000000..22bdc81c
Binary files /dev/null and b/upload/public/style_images/master/t_new.png differ
diff --git a/upload/public/style_images/master/t_poll_read.png b/upload/public/style_images/master/t_poll_read.png
deleted file mode 100644
index 21b9cf8d..00000000
Binary files a/upload/public/style_images/master/t_poll_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_poll_read_dot.png b/upload/public/style_images/master/t_poll_read_dot.png
deleted file mode 100644
index 7dd81adc..00000000
Binary files a/upload/public/style_images/master/t_poll_read_dot.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_poll_unread.png b/upload/public/style_images/master/t_poll_unread.png
deleted file mode 100644
index 3e4d4030..00000000
Binary files a/upload/public/style_images/master/t_poll_unread.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_poll_unread_dot.png b/upload/public/style_images/master/t_poll_unread_dot.png
deleted file mode 100644
index e414447b..00000000
Binary files a/upload/public/style_images/master/t_poll_unread_dot.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_posted.png b/upload/public/style_images/master/t_posted.png
new file mode 100644
index 00000000..d666a25e
Binary files /dev/null and b/upload/public/style_images/master/t_posted.png differ
diff --git a/upload/public/style_images/master/t_read.png b/upload/public/style_images/master/t_read.png
deleted file mode 100644
index 32aa0297..00000000
Binary files a/upload/public/style_images/master/t_read.png and /dev/null differ
diff --git a/upload/public/style_images/master/t_read_dot.png b/upload/public/style_images/master/t_read_dot.png
index 000da9cb..6059d837 100644
Binary files a/upload/public/style_images/master/t_read_dot.png and b/upload/public/style_images/master/t_read_dot.png differ
diff --git a/upload/public/style_images/master/t_unread.png b/upload/public/style_images/master/t_unread.png
index 72584f4d..ed5dd20a 100644
Binary files a/upload/public/style_images/master/t_unread.png and b/upload/public/style_images/master/t_unread.png differ
diff --git a/upload/public/style_images/master/t_unread_dot.png b/upload/public/style_images/master/t_unread_dot.png
index 8421184f..b323b233 100644
Binary files a/upload/public/style_images/master/t_unread_dot.png and b/upload/public/style_images/master/t_unread_dot.png differ
diff --git a/upload/public/style_images/master/tag_bg.png b/upload/public/style_images/master/tag_bg.png
new file mode 100644
index 00000000..09ea8136
Binary files /dev/null and b/upload/public/style_images/master/tag_bg.png differ
diff --git a/upload/public/style_images/master/tick.png b/upload/public/style_images/master/tick.png
new file mode 100644
index 00000000..a9925a06
Binary files /dev/null and b/upload/public/style_images/master/tick.png differ
diff --git a/upload/public/style_images/master/top.png b/upload/public/style_images/master/top.png
new file mode 100644
index 00000000..cec58ae0
Binary files /dev/null and b/upload/public/style_images/master/top.png differ
diff --git a/upload/public/style_images/master/topic_button.png b/upload/public/style_images/master/topic_button.png
new file mode 100644
index 00000000..637d62d6
Binary files /dev/null and b/upload/public/style_images/master/topic_button.png differ
diff --git a/upload/public/style_images/master/topic_button_closed.png b/upload/public/style_images/master/topic_button_closed.png
new file mode 100644
index 00000000..d80e2d26
Binary files /dev/null and b/upload/public/style_images/master/topic_button_closed.png differ
diff --git a/upload/public/style_images/master/topic_button_left.png b/upload/public/style_images/master/topic_button_left.png
deleted file mode 100644
index 4f7406b6..00000000
Binary files a/upload/public/style_images/master/topic_button_left.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_left_closed.png b/upload/public/style_images/master/topic_button_left_closed.png
deleted file mode 100644
index 66f66d89..00000000
Binary files a/upload/public/style_images/master/topic_button_left_closed.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_left_disabled.png b/upload/public/style_images/master/topic_button_left_disabled.png
deleted file mode 100644
index 9a5d051a..00000000
Binary files a/upload/public/style_images/master/topic_button_left_disabled.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_left_hover.png b/upload/public/style_images/master/topic_button_left_hover.png
deleted file mode 100644
index fd3796fa..00000000
Binary files a/upload/public/style_images/master/topic_button_left_hover.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_right.png b/upload/public/style_images/master/topic_button_right.png
deleted file mode 100644
index a5ac876e..00000000
Binary files a/upload/public/style_images/master/topic_button_right.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_right_closed.png b/upload/public/style_images/master/topic_button_right_closed.png
deleted file mode 100644
index 9552f704..00000000
Binary files a/upload/public/style_images/master/topic_button_right_closed.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_right_disabled.png b/upload/public/style_images/master/topic_button_right_disabled.png
deleted file mode 100644
index 3dc1cf65..00000000
Binary files a/upload/public/style_images/master/topic_button_right_disabled.png and /dev/null differ
diff --git a/upload/public/style_images/master/topic_button_right_hover.png b/upload/public/style_images/master/topic_button_right_hover.png
deleted file mode 100644
index c095fa0f..00000000
Binary files a/upload/public/style_images/master/topic_button_right_hover.png and /dev/null differ
diff --git a/upload/public/style_images/master/user_navigation.png b/upload/public/style_images/master/user_navigation.png
new file mode 100644
index 00000000..5b64bb2a
Binary files /dev/null and b/upload/public/style_images/master/user_navigation.png differ
diff --git a/upload/public/style_images/master/vkontakte_login.png b/upload/public/style_images/master/vkontakte_login.png
index 19c371a0..5b4fe229 100644
Binary files a/upload/public/style_images/master/vkontakte_login.png and b/upload/public/style_images/master/vkontakte_login.png differ
diff --git a/upload/public/style_images/master/wizard_step_extra.png b/upload/public/style_images/master/wizard_step_extra.png
new file mode 100644
index 00000000..d0e133ef
Binary files /dev/null and b/upload/public/style_images/master/wizard_step_extra.png differ
diff --git a/upload/public/style_images/master/wizard_step_large.png b/upload/public/style_images/master/wizard_step_large.png
new file mode 100644
index 00000000..28f3963d
Binary files /dev/null and b/upload/public/style_images/master/wizard_step_large.png differ
diff --git a/upload/public/style_images/mobile/app_icon_sprite.png b/upload/public/style_images/mobile/app_icon_sprite.png
new file mode 100644
index 00000000..57888bff
Binary files /dev/null and b/upload/public/style_images/mobile/app_icon_sprite.png differ
diff --git a/upload/public/style_images/mobile/f_cat_read.png b/upload/public/style_images/mobile/f_cat_read.png
deleted file mode 100644
index 32dfe371..00000000
Binary files a/upload/public/style_images/mobile/f_cat_read.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/f_cat_unread.png b/upload/public/style_images/mobile/f_cat_unread.png
deleted file mode 100644
index 837f5d28..00000000
Binary files a/upload/public/style_images/mobile/f_cat_unread.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/f_locked.png b/upload/public/style_images/mobile/f_locked.png
deleted file mode 100644
index 33cfbe21..00000000
Binary files a/upload/public/style_images/mobile/f_locked.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/f_pass_read.png b/upload/public/style_images/mobile/f_pass_read.png
deleted file mode 100644
index ea0f277e..00000000
Binary files a/upload/public/style_images/mobile/f_pass_read.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/f_pass_unread.png b/upload/public/style_images/mobile/f_pass_unread.png
deleted file mode 100644
index e906e2d6..00000000
Binary files a/upload/public/style_images/mobile/f_pass_unread.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/f_read.png b/upload/public/style_images/mobile/f_read.png
index c71a8f62..0298b116 100644
Binary files a/upload/public/style_images/mobile/f_read.png and b/upload/public/style_images/mobile/f_read.png differ
diff --git a/upload/public/style_images/mobile/f_redirect.png b/upload/public/style_images/mobile/f_redirect.png
index fbb26e3d..5748f0a8 100644
Binary files a/upload/public/style_images/mobile/f_redirect.png and b/upload/public/style_images/mobile/f_redirect.png differ
diff --git a/upload/public/style_images/mobile/f_unread.png b/upload/public/style_images/mobile/f_unread.png
index b3dd7021..f38f87e1 100644
Binary files a/upload/public/style_images/mobile/f_unread.png and b/upload/public/style_images/mobile/f_unread.png differ
diff --git a/upload/public/style_images/mobile/facebook_login.png b/upload/public/style_images/mobile/facebook_login.png
new file mode 100644
index 00000000..4e7766bc
Binary files /dev/null and b/upload/public/style_images/mobile/facebook_login.png differ
diff --git a/upload/public/style_images/mobile/gallery/index.html b/upload/public/style_images/mobile/gallery/index.html
new file mode 100644
index 00000000..b09595ca
--- /dev/null
+++ b/upload/public/style_images/mobile/gallery/index.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/upload/public/style_images/mobile/gallery/media_nothumb.png b/upload/public/style_images/mobile/gallery/media_nothumb.png
new file mode 100644
index 00000000..9b774960
Binary files /dev/null and b/upload/public/style_images/mobile/gallery/media_nothumb.png differ
diff --git a/upload/public/style_images/mobile/gallery/missingphotothumb.png b/upload/public/style_images/mobile/gallery/missingphotothumb.png
new file mode 100644
index 00000000..49a2f6ed
Binary files /dev/null and b/upload/public/style_images/mobile/gallery/missingphotothumb.png differ
diff --git a/upload/public/style_images/mobile/gallery/nophotothumb.png b/upload/public/style_images/mobile/gallery/nophotothumb.png
new file mode 100644
index 00000000..2d610de1
Binary files /dev/null and b/upload/public/style_images/mobile/gallery/nophotothumb.png differ
diff --git a/upload/public/style_images/mobile/gallery/nopicstrip.png b/upload/public/style_images/mobile/gallery/nopicstrip.png
new file mode 100644
index 00000000..5a26c3dd
Binary files /dev/null and b/upload/public/style_images/mobile/gallery/nopicstrip.png differ
diff --git a/upload/public/style_images/mobile/icon_check.png b/upload/public/style_images/mobile/icon_check.png
new file mode 100644
index 00000000..9e7fbbd5
Binary files /dev/null and b/upload/public/style_images/mobile/icon_check.png differ
diff --git a/upload/public/style_images/mobile/index.html b/upload/public/style_images/mobile/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/mobile/index.html
+++ b/upload/public/style_images/mobile/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/mobile/like_unlike.png b/upload/public/style_images/mobile/like_unlike.png
new file mode 100644
index 00000000..a79b9ca7
Binary files /dev/null and b/upload/public/style_images/mobile/like_unlike.png differ
diff --git a/upload/public/style_images/mobile/mobile_nav.png b/upload/public/style_images/mobile/mobile_nav.png
new file mode 100644
index 00000000..29a55744
Binary files /dev/null and b/upload/public/style_images/mobile/mobile_nav.png differ
diff --git a/upload/public/style_images/mobile/profile/default_large.png b/upload/public/style_images/mobile/profile/default_large.png
new file mode 100644
index 00000000..f331a69d
Binary files /dev/null and b/upload/public/style_images/mobile/profile/default_large.png differ
diff --git a/upload/public/style_images/mobile/profile/index.html b/upload/public/style_images/mobile/profile/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_images/mobile/profile/index.html
+++ b/upload/public/style_images/mobile/profile/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/public/style_images/mobile/share_facebook.png b/upload/public/style_images/mobile/share_facebook.png
new file mode 100644
index 00000000..3e5dd39c
Binary files /dev/null and b/upload/public/style_images/mobile/share_facebook.png differ
diff --git a/upload/public/style_images/mobile/share_twitter.png b/upload/public/style_images/mobile/share_twitter.png
new file mode 100644
index 00000000..b7a687b9
Binary files /dev/null and b/upload/public/style_images/mobile/share_twitter.png differ
diff --git a/upload/public/style_images/mobile/t_announcement.png b/upload/public/style_images/mobile/t_announcement.png
new file mode 100644
index 00000000..22d522ea
Binary files /dev/null and b/upload/public/style_images/mobile/t_announcement.png differ
diff --git a/upload/public/style_images/mobile/t_closed.png b/upload/public/style_images/mobile/t_closed.png
deleted file mode 100644
index 4f760c82..00000000
Binary files a/upload/public/style_images/mobile/t_closed.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_hot_read.png b/upload/public/style_images/mobile/t_hot_read.png
deleted file mode 100644
index aaf8a5d9..00000000
Binary files a/upload/public/style_images/mobile/t_hot_read.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_hot_read_dot.png b/upload/public/style_images/mobile/t_hot_read_dot.png
deleted file mode 100644
index afa2c5f2..00000000
Binary files a/upload/public/style_images/mobile/t_hot_read_dot.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_hot_unread.png b/upload/public/style_images/mobile/t_hot_unread.png
deleted file mode 100644
index b7c6d1b5..00000000
Binary files a/upload/public/style_images/mobile/t_hot_unread.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_hot_unread_dot.png b/upload/public/style_images/mobile/t_hot_unread_dot.png
deleted file mode 100644
index 469ef065..00000000
Binary files a/upload/public/style_images/mobile/t_hot_unread_dot.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_locked.png b/upload/public/style_images/mobile/t_locked.png
new file mode 100644
index 00000000..61aa8c7f
Binary files /dev/null and b/upload/public/style_images/mobile/t_locked.png differ
diff --git a/upload/public/style_images/mobile/t_moved.png b/upload/public/style_images/mobile/t_moved.png
index 07eb78af..2482409f 100644
Binary files a/upload/public/style_images/mobile/t_moved.png and b/upload/public/style_images/mobile/t_moved.png differ
diff --git a/upload/public/style_images/mobile/t_poll_read.png b/upload/public/style_images/mobile/t_poll_read.png
deleted file mode 100644
index faf153cb..00000000
Binary files a/upload/public/style_images/mobile/t_poll_read.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_poll_read_dot.png b/upload/public/style_images/mobile/t_poll_read_dot.png
deleted file mode 100644
index 8f120382..00000000
Binary files a/upload/public/style_images/mobile/t_poll_read_dot.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_poll_unread.png b/upload/public/style_images/mobile/t_poll_unread.png
deleted file mode 100644
index f74a8ca4..00000000
Binary files a/upload/public/style_images/mobile/t_poll_unread.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_poll_unread_dot.png b/upload/public/style_images/mobile/t_poll_unread_dot.png
deleted file mode 100644
index 1a2b7987..00000000
Binary files a/upload/public/style_images/mobile/t_poll_unread_dot.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_read.png b/upload/public/style_images/mobile/t_read.png
deleted file mode 100644
index c9450938..00000000
Binary files a/upload/public/style_images/mobile/t_read.png and /dev/null differ
diff --git a/upload/public/style_images/mobile/t_read_dot.png b/upload/public/style_images/mobile/t_read_dot.png
index deecf4ee..6059d837 100644
Binary files a/upload/public/style_images/mobile/t_read_dot.png and b/upload/public/style_images/mobile/t_read_dot.png differ
diff --git a/upload/public/style_images/mobile/t_unread.png b/upload/public/style_images/mobile/t_unread.png
index 484035f8..ed5dd20a 100644
Binary files a/upload/public/style_images/mobile/t_unread.png and b/upload/public/style_images/mobile/t_unread.png differ
diff --git a/upload/public/style_images/mobile/t_unread_dot.png b/upload/public/style_images/mobile/t_unread_dot.png
index 7701314f..b323b233 100644
Binary files a/upload/public/style_images/mobile/t_unread_dot.png and b/upload/public/style_images/mobile/t_unread_dot.png differ
diff --git a/upload/public/style_images/mobile/twitter_login.png b/upload/public/style_images/mobile/twitter_login.png
new file mode 100644
index 00000000..87f28232
Binary files /dev/null and b/upload/public/style_images/mobile/twitter_login.png differ
diff --git a/upload/public/style_status/index.html b/upload/public/style_status/index.html
index dfdb4ca9..b09595ca 100644
--- a/upload/public/style_status/index.html
+++ b/upload/public/style_status/index.html
@@ -5,6 +5,6 @@
 <hr>
 You have reached this page in error, please use your back button to return to the forum.
 <hr>
-<a href="http://www.invisionboard.com/">IP.Board</a>
+<a href="http://www.invisionpower.com">IP.Board</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/upload/xml.php b/upload/xml.php
deleted file mode 100644
index 33ad1903..00000000
--- a/upload/xml.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.1.4
- * XML gateway file
- * Last Updated: $Date: 2010-01-15 10:18:44 -0500 (Fri, 15 Jan 2010) $
- * </pre>
- *
- * @author 		$Author: bfarber $
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
- * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 5713 $
- *
- */
-
-/**
-* Turn off 'friendly' URLs
-*/
-define( 'ALLOW_FURLS', FALSE );
-
-require_once( './initdata.php' );
-
-require_once( IPS_ROOT_PATH . 'sources/base/ipsRegistry.php' );
-require_once( IPS_ROOT_PATH . 'sources/base/ipsController.php' );
-
-ipsController::run();
-
-exit();
\ No newline at end of file